diff --git a/scripts/$PBOPREFIX$.txt b/scripts/$PBOPREFIX$.txt
new file mode 100644
index 0000000000000000000000000000000000000000..11b1a611c15e47e4817eec58039e34b684dba6f7
--- /dev/null
+++ b/scripts/$PBOPREFIX$.txt
@@ -0,0 +1,6 @@
+//<'scripts.pbo' properties via Mikero's dos tools, dll version 9.36>
+product=dayz;
+prefix=scripts;
+version=105080;
+//PboType=Arma Addon;
+//</properties>
diff --git a/scripts/1_Core/DayZ/constants.c b/scripts/1_Core/DayZ/constants.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f21a24b511614a80354af2228f8662be510c9f8
--- /dev/null
+++ b/scripts/1_Core/DayZ/constants.c
@@ -0,0 +1,106 @@
+/**
+ * \defgroup Constants Constants
+ * \desc static script constants
+ * @{
+ */
+
+
+/**
+ * \defgroup InputDevice InputDevice
+ * \desc constants for input device - inputInterfaceDef.h
+ * @{
+ */
+const int INPUT_MODULE_TYPE_MASK	= 0x00700000;
+const int INPUT_KEY_MASK			= 0x000000ff;
+const int INPUT_ACTION_TYPE_MASK	= 0x00000f00;
+const int INPUT_AXIS				= 0x00010000;
+const int INPUT_POV					= 0x00020000;
+const int INPUT_COMBO_MASK			= 0xff000000;
+const int INPUT_COMBO_AXIS			= 0x00800000;
+const int INPUT_COMBO_AXIS_OFFSET	= 0x00000080;
+const int INPUT_COMBO_KEY_OFFSET	= 0x01000000;
+
+const int INPUT_DEVICE_KEYBOARD   	= 0x00000000;
+const int INPUT_DEVICE_MOUSE      	= 0x00100000; // mouse button
+const int INPUT_DEVICE_STICK		= 0x00200000;
+const int INPUT_DEVICE_XINPUT     	= 0x00300000; // XInput device
+const int INPUT_DEVICE_TRACKIR		= 0x00400000;
+const int INPUT_DEVICE_GAMEPAD  	= 0x00500000;
+const int INPUT_DEVICE_CHEAT		= 0x00600000;
+
+const int INPUT_ACTION_TYPE_NONE			= 0x00000000;
+const int INPUT_ACTION_TYPE_STATE			= 0x00000100;
+const int INPUT_ACTION_TYPE_DOWN_EVENT		= 0x00000200;
+const int INPUT_ACTION_TYPE_UP_EVENT		= 0x00000300;
+const int INPUT_ACTION_TYPE_SHORTCLICK_EVENT= 0x00000400;
+const int INPUT_ACTION_TYPE_HOLD_EVENT		= 0x00000500;
+		
+const int INPUT_ACTION_TYPE_COMBO			= 0x00002000;
+const int INPUT_ACTION_TYPE_SPECIALCOMBO	= 0x00004000;
+const int INPUT_ACTION_TYPE_DOUBLETAP		= 0x00008000;
+
+const int INPUT_DEVICE_MOUSE_AXIS 		= (INPUT_DEVICE_MOUSE | INPUT_AXIS);
+const int INPUT_DEVICE_STICK_AXIS		= (INPUT_DEVICE_STICK | INPUT_AXIS);
+const int INPUT_DEVICE_STICK_POV		= (INPUT_DEVICE_STICK | INPUT_POV);
+const int INPUT_DEVICE_GAMEPAD_AXIS		= (INPUT_DEVICE_GAMEPAD | INPUT_AXIS);
+
+/** @}*/
+
+/**
+ * \defgroup StringConstants String constants
+ * \desc String constants
+ * @{
+ */
+const string STRING_EMPTY = "";
+/** @}*/
+
+
+/**
+
+ * \defgroup Colors Colors
+ * @{
+ */
+const int COLOR_WHITE = 0xFFFFFFFF;
+const int COLOR_RED = 0xFFF22613;
+const int COLOR_GREEN = 0xFF2ECC71;
+const int COLOR_BLUE = 0xFF4B77BE;
+const int COLOR_YELLOW = 0xFFF7CA18;
+
+const int COLOR_RED_A = 0x1fF22613;
+const int COLOR_GREEN_A = 0x1f2ECC71;
+const int COLOR_BLUE_A = 0x1f4B77BE;
+const int COLOR_YELLOW_A = 0x1fF7CA18;
+
+/** @}*/
+	
+/**
+
+ * \defgroup Materials Materials
+ * @{
+ */
+
+/****************************************************************************
+ *	MATERIALS LIST
+ *	
+ *	Note: If you add new materials here, don't forget to add physics
+ *	parameters to them in physics/materials.xml
+ ***************************************************************************/
+const int MATERIAL_DEFAULT			= 0;
+const int MATERIAL_METAL			= 1;	//full steel
+const int MATERIAL_IRON				= 2;	//iron
+const int MATERIAL_GLASS			= 3;	//glass pane
+const int MATERIAL_PLASTIC			= 4;	//plastic object
+const int MATERIAL_LIQUID			= 5;	//liquids, water
+const int MATERIAL_SLIME			= 6;	//slime, oil etc
+const int MATERIAL_BETON			= 7;	//concrete
+const int MATERIAL_RUBBER			= 8;	//rubber, linoeum
+const int MATERIAL_FLESH			= 9;	//flesh, humanoids
+const int MATERIAL_GRASS			= 10;	//grass
+const int MATERIAL_WOOD				= 11;	//wood
+const int MATERIAL_SNOW				= 12;	//snow
+const int MATERIAL_SAND				= 13;	//soft sand
+const int MATERIAL_DIRT				= 14;	//super-soft dirt
+const int MATERIAL_GRAVEL			= 15;	//gravel
+const int MATERIAL_STONE			= 16;	//rocks, cliffs
+
+/** @}*/
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/defines.c b/scripts/1_Core/DayZ/defines.c
new file mode 100644
index 0000000000000000000000000000000000000000..3a6edaaa874ac3796c4234f9f63ef878fc99d2e1
--- /dev/null
+++ b/scripts/1_Core/DayZ/defines.c
@@ -0,0 +1,139 @@
+// All defines in this file are added from C++ side
+// It simply exists for documentation purposes
+#ifdef DOXYGEN
+
+/**
+ * \defgroup Defines Defines
+ * \desc static defines
+ * @{
+ */
+
+/*!
+	\brief Define filled in with the current Major and Minor version (e.g. DAYZ_1_16)
+*/
+#define DAYZ_X_XX
+
+/*!
+	\brief Enabled when game is in Buldozer mode
+*/
+#define BULDOZER
+
+/*!
+	\brief Enabled when script is compiled for Workbench
+*/
+#define WORKBENCH
+
+/*!
+	\note Present for server builds
+*/
+#define NO_GUI
+
+/*!
+	\note Present for server builds
+*/
+#define NO_GUI_INGAME
+
+/*!
+	\note Work in progress feature flag to prevent cursor from being hijacked by the game. Original intention was only DEVELOPER_DIAG but the fix later introduced problems in retail.
+*/
+#define FEATURE_CURSOR
+
+
+
+/**
+ * \defgroup BuildDefines Build defines
+ * \desc Defines for different builds
+ * @{
+ */
+
+	/*!
+		\brief Define present in Diag builds
+	*/
+	#define DIAG
+	
+	/*!
+		\note A build is always either DEVELOPER or RELEASE, one is always active
+	*/
+	#define DEVELOPER
+	
+	/*!
+		\note includes Diag
+	*/
+	#define RELEASE
+	
+	/*!
+		\brief DIAG || DEVELOPER
+	*/
+	#define DIAG_DEVELOPER
+	
+	/*!
+		\brief Define present in Experimental builds
+	*/
+	#define BUILD_EXPERIMENTAL
+
+/** @}*/
+
+
+
+/**
+ * \defgroup ServerDefines Server defines
+ * \desc Defines for dedicated server code
+ * \note Only defined when CGame.IsDedicatedServer equals true
+ * \note The platforms mentioned are the client platform, for game platform use PLATFORM defines
+ * @{
+ */
+
+	/*!
+		\brief Define always present on dedicated servers
+		\note Should be preferred over using CGame.IsDedicatedServer when possible
+	*/
+	#define SERVER
+	
+	/*!
+		\warning This is defined for Linux servers as well, as it targets Windows clients
+		\note A server is always either FOR_WINDOWS, FOR_X1 or FOR_PS4
+	*/
+	#define SERVER_FOR_WINDOWS
+	
+	/*!
+		\note A server is always either FOR_WINDOWS, FOR_X1 or FOR_PS4
+	*/
+	#define SERVER_FOR_X1
+	
+	/*!
+		\note A server is always either FOR_WINDOWS, FOR_X1 or FOR_PS4
+	*/
+	#define SERVER_FOR_PS4
+	
+	/*!
+		\brief SERVER_FOR_X1 || SERVER_FOR_PS4
+	*/
+	#define SERVER_FOR_CONSOLE
+
+/** @}*/
+
+
+
+/**
+ * \defgroup PlatformDefines Platform defines
+ * \desc Defines for platform the build is built for
+ * @{
+ */
+
+	#define PLATFORM_LINUX
+
+	#define PLATFORM_WINDOWS
+	
+	#define PLATFORM_XBOX
+	
+	#define PLATFORM_PS4
+	
+	/*!
+		\brief PLATFORM_XBOX || PLATFORM_PS4
+	*/
+	#define PLATFORM_CONSOLE
+
+/** @}*/
+
+/** @}*/
+#endif
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/param.c b/scripts/1_Core/DayZ/param.c
new file mode 100644
index 0000000000000000000000000000000000000000..72bd6a47f33204ef1b7f91bf1a7bf267af78b1a5
--- /dev/null
+++ b/scripts/1_Core/DayZ/param.c
@@ -0,0 +1,357 @@
+/**
+ * \defgroup Tools Tools
+ * \desc Helpful functions & classes
+ * @{
+ */
+
+//-----------------------------------------------------------------------------
+/**
+\brief Base Param Class with no parameters. Used as general purpose parameter overloaded with Param1 to Param4 templates
+ */
+class Param: Managed
+{
+	bool Serialize(Serializer ctx)
+	{
+		return false;
+	}
+		
+	bool Deserializer(Serializer ctx)
+	{
+		return false;
+	}
+};
+
+/**
+ \brief Param Class Template with one parameter.
+ \n usage:
+ @code
+ Param paramA = new Param1<int>(55); 
+ Param paramB = new Param1<string>("Hello");
+ @endcode
+ */
+class Param1<Class T1> extends Param
+{
+	T1 param1;
+
+	void Param1(T1 p1)
+	{
+		param1 = p1;
+	}
+		
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(param1);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(param1);
+	}
+};
+
+/**
+ \brief Param Class Template with two parameters.
+ \n usage:
+ @code
+ Param param = new Param2<float, string>(3.14, "Pi");
+ @endcode
+ */
+class Param2<Class T1, Class T2> extends Param
+{
+	T1 param1;
+	T2 param2;
+
+	void Param2(T1 p1, T2 p2)
+	{
+		param1 = p1;
+		param2 = p2;
+	}
+		
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(param1) && ctx.Write(param2);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(param1) && ctx.Read(param2);
+	}
+};
+
+/**
+ \brief Param Class Template with three parameters.
+ \n usage:
+ @code
+ Param param = new Param3<float, string, bool>(2.89, "Lala", true);
+ @endcode
+ */
+class Param3<Class T1, Class T2, Class T3> extends Param
+{
+	T1 param1;
+	T2 param2;
+	T3 param3;
+
+	void Param3(T1 p1, T2 p2, T3 p3)
+	{
+		param1 = p1;
+		param2 = p2;
+		param3 = p3;
+	}
+		
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3);
+	}
+};
+
+/**
+ \brief Param Class Template with four parameters.
+ \n usage:
+ @code
+ Param param = new Param4<int, bool, float, string>(100, false, 79.9, "Test");
+ @endcode
+ */
+class Param4<Class T1, Class T2, Class T3, Class T4> extends Param
+{
+	T1 param1;
+	T2 param2;
+	T3 param3;
+	T4 param4;
+
+	void Param4(T1 p1, T2 p2, T3 p3, T4 p4)
+	{
+		param1 = p1;
+		param2 = p2;
+		param3 = p3;
+		param4 = p4;
+	}
+		
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4);
+	}
+};
+
+/**
+ \brief Param Class Template with five parameters.
+ */
+class Param5<Class T1, Class T2, Class T3, Class T4, Class T5> extends Param
+{
+	T1 param1;
+	T2 param2;
+	T3 param3;
+	T4 param4;
+	T5 param5;
+
+	void Param5(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5)
+	{
+		param1 = p1;
+		param2 = p2;
+		param3 = p3;
+		param4 = p4;
+		param5 = p5;
+	}
+		
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4) && ctx.Write(param5);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4) && ctx.Read(param5);
+	}
+};
+
+/**
+ \brief Param Class Template with six parameters.
+ */
+class Param6<Class T1, Class T2, Class T3, Class T4, Class T5, Class T6> extends Param
+{
+	T1 param1;
+	T2 param2;
+	T3 param3;
+	T4 param4;
+	T5 param5;
+	T6 param6;
+
+	void Param6(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6)
+	{
+		param1 = p1;
+		param2 = p2;
+		param3 = p3;
+		param4 = p4;
+		param5 = p5;
+		param6 = p6;
+	}
+		
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4) && ctx.Write(param5) && ctx.Write(param6);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4) && ctx.Read(param5) && ctx.Read(param6);
+	}
+};
+
+/**
+ \brief Param Class Template with seven parameters.
+ */
+class Param7<Class T1, Class T2, Class T3, Class T4, Class T5, Class T6, Class T7>: Param
+{
+    T1 param1;
+    T2 param2;
+    T3 param3;
+    T4 param4;
+    T5 param5;
+    T6 param6;
+    T7 param7;
+
+    void Param7(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7)
+    {
+        param1 = p1;
+        param2 = p2;
+        param3 = p3;
+        param4 = p4;
+        param5 = p5;
+        param6 = p6;
+        param7 = p7;
+    }
+        
+    override bool Serialize(Serializer ctx)
+    {
+        return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4) && ctx.Write(param5) && ctx.Write(param6) && ctx.Write(param7);
+    }
+        
+    override bool Deserializer(Serializer ctx)
+    {
+        return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4) && ctx.Read(param5) && ctx.Read(param6) && ctx.Read(param7);
+    }
+};
+/**
+ \brief Param Class Template with eight parameters.
+ */
+class Param8<Class T1, Class T2, Class T3, Class T4, Class T5, Class T6, Class T7, Class T8>: Param
+{
+    T1 param1;
+    T2 param2;
+    T3 param3;
+    T4 param4;
+    T5 param5;
+    T6 param6;
+    T7 param7;
+    T8 param8;
+
+    void Param8(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8)
+    {
+        param1 = p1;
+        param2 = p2;
+        param3 = p3;
+        param4 = p4;
+        param5 = p5;
+        param6 = p6;
+        param7 = p7;
+        param8 = p8;
+    }
+        
+    override bool Serialize(Serializer ctx)
+    {
+        return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4) && ctx.Write(param5) && ctx.Write(param6) && ctx.Write(param7) && ctx.Write(param8);
+    }
+        
+    override bool Deserializer(Serializer ctx)
+    {
+        return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4) && ctx.Read(param5) && ctx.Read(param6) && ctx.Read(param7) && ctx.Read(param8);
+    }
+};
+/**
+ \brief Param Class Template with nine parameters.
+ */
+class Param9<Class T1, Class T2, Class T3, Class T4, Class T5, Class T6, Class T7, Class T8, Class T9>: Param
+{
+    T1 param1;
+    T2 param2;
+    T3 param3;
+    T4 param4;
+    T5 param5;
+    T6 param6;
+    T7 param7;
+    T8 param8;
+    T9 param9;
+
+    void Param9(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8, T9 p9)
+    {
+        param1 = p1;
+        param2 = p2;
+        param3 = p3;
+        param4 = p4;
+        param5 = p5;
+        param6 = p6;
+        param7 = p7;
+        param8 = p8;
+        param9 = p9;
+    }
+        
+    override bool Serialize(Serializer ctx)
+    {
+        return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4) && ctx.Write(param5) && ctx.Write(param6) && ctx.Write(param7) && ctx.Write(param8) && ctx.Write(param9);
+    }
+        
+    override bool Deserializer(Serializer ctx)
+    {
+        return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4) && ctx.Read(param5) && ctx.Read(param6) && ctx.Read(param7) && ctx.Read(param8) && ctx.Read(param9);
+    }
+};
+/**
+ \brief Param Class Template with ten parameters.
+ */
+class Param10<Class T1, Class T2, Class T3, Class T4, Class T5, Class T6, Class T7, Class T8, Class T9, Class T10>: Param
+{
+    T1 param1;
+    T2 param2;
+    T3 param3;
+    T4 param4;
+    T5 param5;
+    T6 param6;
+    T7 param7;
+    T8 param8;
+    T9 param9;
+	T10 param10;
+
+    void Param10(T1 p1, T2 p2, T3 p3, T4 p4, T5 p5, T6 p6, T7 p7, T8 p8, T9 p9, T10 p10)
+    {
+        param1 = p1;
+        param2 = p2;
+        param3 = p3;
+        param4 = p4;
+        param5 = p5;
+        param6 = p6;
+        param7 = p7;
+        param8 = p8;
+        param9 = p9;
+        param10 = p10;
+    }
+        
+    override bool Serialize(Serializer ctx)
+    {
+        return ctx.Write(param1) && ctx.Write(param2) && ctx.Write(param3) && ctx.Write(param4) && ctx.Write(param5) && ctx.Write(param6) && ctx.Write(param7) && ctx.Write(param8) && ctx.Write(param9) && ctx.Write(param10);
+    }
+        
+    override bool Deserializer(Serializer ctx)
+    {
+        return ctx.Read(param1) && ctx.Read(param2) && ctx.Read(param3) && ctx.Read(param4) && ctx.Read(param5) && ctx.Read(param6) && ctx.Read(param7) && ctx.Read(param8) && ctx.Read(param9) && ctx.Read(param10);
+    }
+};
+/** @}*/
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/proto/DbgUI.c b/scripts/1_Core/DayZ/proto/DbgUI.c
new file mode 100644
index 0000000000000000000000000000000000000000..2f67707a02d8ddb30ff65ab45a6bf107ac9fb03c
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/DbgUI.c
@@ -0,0 +1,94 @@
+/** @addtogroup Debug
+@{*/
+
+/**
+ * \defgroup DebugUI Debug UI API
+	\brief Immediate mode debug UI API
+ * @{
+	Per frame usage example:
+	@code
+	bool m_ShowDbgUI = false;
+	int m_DbgListSelection = 0;
+	float m_DbgSliderValue = 0.0;
+	autoptr array<string> m_DbgOptions = {"jedna", "dva", "tri"};
+	
+	void OnUpdate(float timeslice)
+	{	
+		DbgUI.Begin("Test");
+		DbgUI.Check("Show DbgUI", m_ShowDbgUI);
+		if (m_ShowDbgUI)
+		{
+			DbgUI.Text("DbgUI Test");		
+	
+			string name = "";
+			DbgUI.InputText("name", name);		
+			
+			if (DbgUI.Button("Print name"))
+			{
+				Print(name);		
+			}
+			
+			DbgUI.List("test list", m_DbgListSelection, m_DbgOptions);
+			
+			DbgUI.Text("Choice = " + m_DbgListSelection.ToString());	
+			
+			DbgUI.Spacer(10);
+			DbgUI.SliderFloat("slider", m_DbgSliderValue, 0, 100);
+			DbgUI.Text("Slider value = " + ftoa(m_DbgSliderValue));	
+		}
+		DbgUI.End();
+	}
+	@endcode
+
+	For non-per frame usage example:
+	@code
+	int m_DbgEventCount = 0;
+	void OnEvent(EventType eventTypeId, Param params)
+	{
+		m_DbgEventCount++;
+
+		DbgUI.BeginCleanupScope();		
+		DbgUI.Begin("events", 300, 0);
+		DbgUI.Text("Events count = " + m_DbgEventCount.ToString());
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+	@endcode
+*/
+
+class DbgUI
+{
+	private void DbgUI() {}
+	private void ~DbgUI() {}
+	
+	static proto native void DoUnitTest(); ///< Creates all possible DbgUI widgets. Just for the testing purposes.
+	static proto native void Text(string label);
+	static proto native void ColoredText(int color, string label);
+	static proto void Check(string label, out bool checked);
+	static proto void Combo(string label, out int selection, TStringArray elems);
+	static proto void List(string label, out int selection, TStringArray elems);
+	static proto void SliderFloat(string label, out float value, float min, float max, int pxWidth = 150);
+	static proto native void Spacer(int height);
+	static proto native void Panel(string label, int width, int height, int color = 0xaa555555);
+	static proto native bool Button(string txt, int minWidth = 0);
+	static proto void InputText(string txt, out string value, int pxWidth = 150);
+	static proto void InputInt(string txt, out int value, int pxWidth = 150);
+	static proto void InputFloat(string txt, out float value, int pxWidth = 150);
+			
+	static proto native void PlotLive(string label, int sizeX, int sizeY, float val, int timeStep = 100, int historySize = 30, int color = 0xFFFFFFFF);
+	
+	static proto native void SameLine();
+	static proto native void SameSpot();
+	
+	static proto native void PushID_Int(int int_id);
+	static proto native void PushID_Str(string str_id);
+	static proto native void PopID();
+	
+	static proto void BeginCleanupScope();
+    static proto native void EndCleanupScope();
+	
+	static proto native void Begin(string windowTitle, float x = 0, float y = 0);
+    static proto native void End();
+};
+//@}
+//@}
diff --git a/scripts/1_Core/DayZ/proto/EnAudio.c b/scripts/1_Core/DayZ/proto/EnAudio.c
new file mode 100644
index 0000000000000000000000000000000000000000..b02040989325976607d04331bdf502244e45b39a
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnAudio.c
@@ -0,0 +1,9 @@
+typedef int[] AudioHandle;
+
+class AudioSystem
+{
+	proto native static AudioHandle BankLoad(string path);
+	proto native static AudioHandle ShaderLoad(string path);
+	proto native static AudioHandle SoundPlay(AudioHandle bank, AudioHandle shader);
+	proto native static void SoundDestroy(AudioHandle handle);
+};
diff --git a/scripts/1_Core/DayZ/proto/EnConvert.c b/scripts/1_Core/DayZ/proto/EnConvert.c
new file mode 100644
index 0000000000000000000000000000000000000000..80b231f3dd29f04a99eacee410d863a1ede0e2a5
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnConvert.c
@@ -0,0 +1,653 @@
+class bool
+{
+	string ToString()
+	{
+		if (value) return "true";
+		else return "false";
+	}
+};
+
+class func
+{
+	//! For internal usage of VM 
+	private proto void SetInstance(Class inst);
+};
+
+enum EBool
+{
+	NO = 0,
+	YES = 1	
+}
+
+class int
+{
+	protected const int ZERO_PAD_SIZE = 8;
+	protected static string m_ZeroPad[ZERO_PAD_SIZE] = {"", "0", "00", "000", "0000", "00000", "000000", "0000000"};
+	
+	const int MAX = 2147483647;
+	const int MIN = -2147483648;
+	
+	proto string ToString();
+	
+	/**
+	\brief Converts ASCII code to string
+		\param ascii ASCII code for convert to \p string.
+		\return \p string - Converted \p int.
+		@code
+			int ascii_code = 77;
+			string str = ascii_code.AsciiToString();
+			Print(str);
+
+			>> str = 'M'
+		@endcode
+	*/
+	proto string AsciiToString();
+	
+	/**
+	\brief Integer to string with fixed length, padded with zeroes
+		\param num \p int integer to convert
+		\param len \p int fixed length
+		\return \p vector Converted s as vector
+		@code
+			int num = 123;
+			string s = num.ToStringLen(5);
+			Print(s);
+
+			>> s = '00123'
+		@endcode
+	*/
+	string ToStringLen(int len)
+	{
+		string str = value.ToString();
+
+		int l = len - str.Length();
+
+		if (l > 0 && l < ZERO_PAD_SIZE )
+			return m_ZeroPad[l] + str;
+
+		return str;
+	}
+	
+	/**
+	\brief Check whether integer falls into an inclusive range
+		\param min \p int low end of range
+		\param max \p int high end of range
+		\return \p bool True if this value is withing the set range
+		@code
+			int num = 123;
+			bool test = num.InRange( 100, 150 );
+			Print(test);
+
+			>> s = true
+		@endcode
+	*/
+	bool InRange( int min, int max, bool inclusive_min = true, bool inclusive_max = true )
+	{
+		if( ( !inclusive_min && value <= min ) || value < min )
+			return false;
+		
+		if( ( !inclusive_max && value >= max ) || value > max )
+			return false;
+		
+		return true;
+	}
+};
+
+class float
+{
+	const float MIN = FLT_MIN;
+	const float MAX = FLT_MAX;
+	const float LOWEST = -FLT_MAX;
+	
+	proto string ToString();
+};
+
+class vector
+{
+	static const vector Up = "0 1 0";
+	static const vector Aside = "1 0 0";
+	static const vector Forward = "0 0 1";
+	static const vector Zero = "0 0 0";
+	
+	/**
+	\brief Vector to  string
+		\param beautify If true verbose vector in more human readable form "<1, 1, 1>" instead of simple form "1 1 1"
+		\return \p string Converted vector as parsed string
+		@code
+			vector v = "1 0 1";
+			Print( v.ToString() );
+			Print( v.ToString(false) );
+
+			>> '<1, 0, 1>'
+			>> '1 0 1'
+		@endcode
+	*/
+	proto string ToString(bool beautify = true);
+	
+	/**
+	\brief Normalizes vector. Returns length
+		\return \p float Length of origin vector
+		@code
+			vector vec = "1 0 1";
+			float length = vec.Normalize();
+			Print( vec );
+			Print( length );
+
+			>> vec = <0.707107,0,0.707107>
+			>> length = 1.41421
+		@endcode
+	*/
+	proto float Normalize();
+
+	//! return normalized vector (keeps orginal vector untouched)
+	proto vector Normalized();
+	
+	/**
+	\brief Returns length of vector (magnitude)
+		\return \p float Length of vector
+		@code
+			vector vec = "1 0 1";
+			float length = vec.Length();
+			Print( length );
+
+			>> length = 1.41421
+		@endcode
+	*/
+	proto native float Length();
+
+	/**
+	\brief Returns squared length (magnitudeSqr)
+		\return \p float Length of vector
+		@code
+			vector vec = "1 1 0";
+			float length = vec.LengthSq();
+			Print( length );
+
+			>> length = 2
+		@endcode
+	*/
+	proto native float LengthSq();
+	
+	/**
+	\brief Returns the distance between tips of two 3D vectors.
+		\param v1 \p vector 3D Vector 1
+		\param v2 \p vector 3D Vector 2
+		\return \p float Distance
+		@code
+			float dist = vector.Distance( "1 2 3", "4 5 6" );
+			Print( dist );
+
+			>> dist = 5.19615
+		@endcode
+	*/
+	proto static native float Distance(vector v1, vector v2);
+	
+	/**
+	\brief Returns the square distance between tips of two 3D vectors.
+		\param v1 \p vector 3D Vector 1
+		\param v2 \p vector 3D Vector 2
+		\return \p float Squere distance
+		@code
+			float dist = vector.DistanceSq( "0 0 0", "0 5 0" );
+			Print( dist );
+
+			>> dist = 25
+		@endcode
+	*/
+	proto static native float DistanceSq(vector v1, vector v2);
+
+	/**
+	\brief Returns perpendicular vector. Perpendicular vector is computed as cross product between input vector and up vector (0, 1, 0).
+	    \return \p vector perpendicular vector
+		@code
+			vector vec = "1 0 0";
+			Print( vec.Perpend() );
+
+			>> <0,0,1>
+		@endcode
+	*/
+	vector Perpend()
+	{
+		return value * vector.Up;
+	}
+	
+	/**
+	\brief Returns direction vector from point p1 to point p2
+	    \param p1 \p vector point from
+		\param p2 \p vector point to
+		\return \p vector direction vector
+	*/
+	static vector Direction(vector p1, vector p2)
+	{
+		vector dir_vec;
+		
+		dir_vec[0] = p2[0] - p1[0];
+		dir_vec[1] = p2[1] - p1[1];
+		dir_vec[2] = p2[2] - p1[2];
+		
+		return dir_vec;
+	}
+	
+	/**
+	\brief Returns randomly generated unit vector
+	    \return \p randomly generated unit vector
+		@code
+			vector vec = vector.RandomDir();
+			Print(vec);
+			Print(vec.Length());
+
+			>> <-0.179424,0.966825,0.181816>
+			>> 1
+		@endcode
+	*/
+	static vector RandomDir()
+	{
+		return Vector(Math.RandomFloatInclusive(-1,1),Math.RandomFloatInclusive(-1,1),Math.RandomFloatInclusive(-1,1)).Normalized();
+	}
+
+	/**
+	\brief Returns randomly generated XZ unit vector with the Y(up) axis set to 0
+	    \return \p randomly generated XZ unit vector
+		@code
+			vector vec = vector.RandomDir();
+			Print(vec);
+			Print(vec.Length());
+
+			>> <0.631697,0,0.775216>
+			>> 1
+		@endcode
+	*/
+	static vector RandomDir2D()
+	{
+		return Vector(Math.RandomFloatInclusive(-1,1),0,Math.RandomFloatInclusive(-1,1)).Normalized();
+	}
+	
+	/**
+	\brief Returns Dot product of vector v1 and vector v2
+	    \param v1 \p vector input vector
+		\param v2 \p vector input vector
+		\return \p vector direction vector
+	*/
+	static float Dot(vector v1, vector v2)
+	{
+		return ((v1[0] * v2[0]) + (v1[1] * v2[1]) + (v1[2] * v2[2]));
+	}
+
+	/**
+	\brief Returns relative angles between -180 and 180, not 0 to 360
+		\return \p float Relative angles
+		@code
+			vector angles = "-45 190 160";
+			Print( angles.GetRelAngles() );
+	
+			>> <-45,-170,160>
+		@endcode
+	*/
+	vector GetRelAngles()
+	{
+		for(int i = 0; i < 3; i++) {
+			if(value[i] > 180)
+				value[i] = value[i] - 360;
+			if(value[i] < -180)
+				value[i] = value[i] + 360;
+		}
+		return value;
+	}
+	
+	/**
+	\brief Returns yaw of vector
+		\param vec \p vector Vector to convert yaw
+		\return \p float Yaw of vector
+		@code
+			vector v1 = "0 1 0";
+			vector v2 = "0.7 0.7 0";
+			Print( v1.ToYaw() );
+			Print( v2.ToYaw() );
+
+			>> 90
+			>> 45
+		@endcode
+	*/
+	proto float VectorToYaw();
+
+	/**
+	\brief Returns vector of yaw
+		\param yaw \p float Value of yaw
+		\return \p vector Yaw converted in vector
+		@code
+			Print( vector.Yaw2Vector(90) );
+			Print( vector.Yaw2Vector(45) );
+
+			>> <0,1,0>
+			>> <0.707107,0.707107,0>
+		@endcode
+	*/
+	proto native static vector YawToVector(float yaw);
+
+	/**
+	\brief Converts vector to spherical coordinates with radius = 1
+		\return \p vector spherical coordinates (yaw, pitch, roll in degrees)
+		@code
+			vector v1 = "1 0 1";
+			vector v2 = "1 1 1";
+			Print( v1.VectorToAngles() );
+			Print( v2.VectorToAngles() );
+
+			>> <45,-0,0>
+			>> <45,35.2644,0>
+		@endcode
+	*/
+	proto vector VectorToAngles();
+
+	/**
+	\brief Converts spherical coordinates (yaw, pitch, roll in degrees) to unit length vector
+		\return \p normalized direction vector
+		@code
+			vector v1 = "45 0 0";
+			vector v2 = "15 60 0";
+			Print( v1.AnglesToVector() );
+			Print( v2.AnglesToVector() );
+
+			>> <0.707107,0,0.707107>
+			>> <0.12941,0.866025,0.482963>
+		@endcode
+	*/
+	proto vector AnglesToVector();
+
+	/**
+	\brief Creates rotation matrix from angles
+		\param ang \p vector which contains angles
+	    \param[out] mat \p vector created rotation matrix
+		@code
+	        vector mat[3];
+			vector ang = "70 15 45";
+	    	ang.RotationMatrixFromAngles( mat );
+	    	Print( mat );
+
+			>> <0.330366,0.0885213,-0.939693>,<0.458809,0.854988,0.241845>,<0.824835,-0.511037,0.241845>
+		@endcode
+	*/
+	proto void RotationMatrixFromAngles(out vector mat[3]);
+	
+	/**
+	\brief Transforms position
+		\param mat \p vector[4] transformation matrix
+		\param vec \p vector position to transform
+		\return \p vector transformed position
+		@code
+			vector mat[4] = { "1 0 0 0", "0 1 0 0", "0 0 1 1", "3 1 2 1" }; // translation matrix
+			vector pos = "1 1 1";
+			Print( pos.Multiply4(mat) );
+
+			>> <4,2,3>
+		@endcode
+	*/
+	proto vector Multiply4(vector mat[4]);
+
+	/**
+	\brief Transforms vector
+		\param mat \p vector[3] transformation matrix
+		\param vec \p vector vector to transform
+		\return \p vector transformed vector
+		@code
+			vector mat[3] = { "2 0 0", "0 3 0", "0 0 1" }; // scale matrix
+			vector vec = "1 1 1";
+			Print( vec.Multiply3(mat) );
+
+			>> <2,3,1>
+		@endcode
+	*/
+	proto vector Multiply3(vector mat[3]);
+
+	/**
+	\brief Invert-transforms position
+		\param mat \p vector[4] transformation matrix
+		\param vec \p vector position to transform
+		\return \p vector transformed position
+		@code
+			vector mat[4] = { "1 0 0 0", "0 1 0 0", "0 0 1 1", "3 1 2 1" }; // translation matrix
+			vector pos = "1 1 1";
+			Print( pos.InvMultiply4(mat) );
+
+			>> <-2,0,-1>
+		@endcode
+	*/
+	proto vector InvMultiply4(vector mat[4]);
+
+	/**
+	\brief Invert-transforms vector
+		\param mat \p vector[3] transformation matrix
+		\param vec \p vector vector to transform
+		\return \p vector transformed vector
+		@code
+			vector mat[3] = { "1.5 2.5 0", "0.1 1.3 0", "0 0 1" }; // rotation matrix
+			vector vec = "1 1 1";
+			Print( vec.InvMultiply3(mat) );
+
+			>> <4,1.4,1>
+		@endcode
+	*/
+	proto vector InvMultiply3(vector mat[3]);
+	
+	/**
+	\brief Lerp between two vectors
+		@code
+			vector v1 = Vector(0,0,0);
+			vector v2 = Vector(5,6,1);
+			Print( vector.Lerp(v1, v2, 0.5) );
+		@endcode
+	*/
+	proto static native vector Lerp(vector v1, vector v2, float t);
+	
+	/**
+	\brief Rotate a vector around 0,0,0 by an angle in degrees
+		\param vec \p vector to rotate
+		\param axis \p axis to rotate around
+		\param cosAngle \p angle in degrees
+		\return \p vector transformed vector
+	*/
+	
+	static vector RotateAroundZeroDeg(vector vec, vector axis, float angle)
+	{
+		return (vec * Math.Cos(angle * Math.DEG2RAD)) + ((axis * vec) * Math.Sin(angle * Math.DEG2RAD)) + (axis * vector.Dot(axis, vec)) * (1 - Math.Cos(angle * Math.DEG2RAD));
+	}
+	
+	/**
+	\brief Rotate a vector around 0,0,0 by an angle in radians
+		\param vec \p vector to rotate
+		\param axis \p axis to rotate around
+		\param cosAngle \p angle in radians
+		\return \p vector transformed vector
+	*/
+	
+	static vector RotateAroundZeroRad(vector vec, vector axis, float angle)
+	{
+		return (vec * Math.Cos(angle)) + ((axis * vec) * Math.Sin(angle)) + (axis * vector.Dot(axis, vec)) * (1 - Math.Cos(angle));
+	}
+	
+	/**
+	\brief Rotate a vector around 0,0,0
+		\param pos \p vector to rotate
+		\param axis \p axis to rotate around
+		\param cosAngle \p cos of angle
+		\param sinAngle \p sin of angle
+		\return \p vector transformed vector
+	*/
+	
+	static vector RotateAroundZero(vector pos, vector axis, float cosAngle, float sinAngle)
+	{
+		return (pos * cosAngle) + ((axis * pos) * sinAngle) + (axis * vector.Dot(axis, pos)) * (1 - cosAngle);
+	}
+	
+	/**
+	\brief Rotate a vector around point
+		\param point \p point to rotate around
+		\param pos \p vector to rotate
+		\param axis \p axis to rotate around
+		\param cosAngle \p cos of angle
+		\param sinAngle \p sin of angle
+		\return \p vector transformed vector
+	*/
+	static vector RotateAroundPoint(vector point, vector pos, vector axis, float cosAngle, float sinAngle)
+	{
+		vector offsetPos = pos - point;
+		return RotateAroundZero(offsetPos, axis, cosAngle, sinAngle) + point;
+	}
+	
+	/**
+	\brief Convert static array of floats into a vector
+	    \param arr \p vector in array format
+		\return \p vector resulting vector
+	*/
+	static vector ArrayToVec(float arr[])
+	{
+		return Vector(arr[0], arr[1], arr[2]);
+	}
+};
+
+class typename
+{
+	/**
+	\brief Dynamic variant to 'new' keyword. It creates new instance of class
+		\returns \p volatile instance of class
+		@code
+			???
+		@endcode
+	*/
+	proto volatile Class Spawn();
+	
+	/**
+	\brief Get the name of the module the typename belongs to
+		\returns \p string Name of parent module (1_Core)
+	*/
+	proto owned string GetModule();
+	
+	//!Returns type name of variable as string
+	proto native owned string ToString();
+	
+	/**
+	\brief Returns true when type is the same as 'baseType', or inherited one.
+		\param baseType typename
+		\returns \p bool true when type is the same as 'baseType', or inherited one.
+		@code
+			???
+		@endcode
+	*/
+	proto native bool IsInherited(typename baseType);
+	
+	proto native int GetVariableCount();
+	proto native owned string GetVariableName(int vIdx);
+	proto native typename GetVariableType(int vIdx);
+	proto bool GetVariableValue(Class var, int vIdx, out void val);
+	
+	/**
+	\brief Return string name of enum value
+	@code
+		DialogPriority prio = DialogPriority.WARNING;
+		Print( typename.EnumToString(DialogPriority, prio) );
+	@endcode
+	*/
+	static string EnumToString(typename e, int enumValue)
+	{
+		int cnt = e.GetVariableCount();
+		int val;
+
+		for (int i = 0; i < cnt; i++)
+		{
+			if (e.GetVariableType(i) == int && e.GetVariableValue(null, i, val) && val == enumValue)
+			{
+				return e.GetVariableName(i);
+			}
+		}
+				
+		return "unknown";
+	}
+	
+	/**
+	\brief Return enum value from string name
+	@code
+		Print( typename.StringToEnum(DialogPriority, "WARNING") );
+	@endcode
+	*/
+	static int StringToEnum(typename e, string enumName)
+	{
+	    int count = e.GetVariableCount();
+	    int value;
+	   
+	    for (int i = 0; i < count; i++)
+	    {
+	        if (e.GetVariableType(i) == int && e.GetVariableValue(null, i, value) && e.GetVariableName(i) == enumName)
+	        {
+	            return value;
+	        }
+	    }
+		
+	    return -1;
+	}
+};
+
+class EnumTools
+{
+	private void EnumTools();
+	private void ~EnumTools();
+	
+	/**
+	\brief Return string name of enum value
+	@code
+		DialogPriority prio = DialogPriority.WARNING;
+		Print( EnumTools.EnumToString(DialogPriority, prio) );
+	@endcode
+	*/
+	static string EnumToString(typename e, int enumValue)
+	{
+		return typename.EnumToString(e, enumValue);
+	}
+	
+	/**
+	\brief Return enum value from string name
+	@code
+		Print( EnumTools.StringToEnum(DialogPriority, "WARNING") );
+	@endcode
+	*/
+	static int StringToEnum(typename e, string enumName)
+	{
+		return typename.StringToEnum(e, enumName);
+	}
+	
+	/**
+	\brief Return amount of values in enum
+	@code
+		Print( EnumTools.GetEnumSize(DialogPriority) );
+	@endcode
+	*/
+	static int GetEnumSize(typename e)
+	{
+		return e.GetVariableCount();
+	}
+	
+	/**
+	\brief Return the nth value in the enum
+	@code
+		Print( EnumTools.GetEnumValue(DialogPriority, 1) );
+	@endcode
+	*/
+	static int GetEnumValue(typename e, int idx)
+	{
+		int value;
+		e.GetVariableValue(null, idx, value);		
+		return value;
+	}
+	
+	/**
+	\brief Return amount of values in enum
+	@code
+		Print( EnumTools.GetLastEnumValue(DialogPriority) );
+	@endcode
+	*/
+	static int GetLastEnumValue(typename e)
+	{
+		int lastValue;
+		e.GetVariableValue(null, e.GetVariableCount() - 1, lastValue);		
+		return lastValue;
+	}
+}
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/proto/EnDebug.c b/scripts/1_Core/DayZ/proto/EnDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..debda50039877a33472eb327e33b55e14a5c3e9f
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnDebug.c
@@ -0,0 +1,341 @@
+/**
+ * \defgroup Debug Debug utilities
+ * @{
+ */
+
+/**
+\brief Prints current call stack (stack trace)
+	\return \p void
+	@code
+		DumpStack();
+
+	@endcode
+
+	\verbatim
+	Output:
+		-- Stack trace --
+	   SaveFile() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler.c : 51
+	   SaveConfigToFile() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile.c : 114
+	   SaveParameterArray() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile.c : 133
+	   SetParameterArray() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile.c : 231
+	   PresetAdd() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile\ModuleLocalProfileUI.h : 46
+	   OnKeyPress() Scripts/mission/missionGameplay.c : 215
+	   OnKeyPress() Scripts/DayZGame.c : 334
+	   -----------------
+	\endverbatim
+*/
+proto void DumpStack();
+
+/**
+\brief Prints current call stack (stack trace) to given output
+	\return \p void
+	@code
+    string tmp;
+		DumpStackString(tmp);
+    Print(tmp);
+
+	@endcode
+
+	\verbatim
+	Output:
+	  SaveFile() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler.c : 51
+	  SaveConfigToFile() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile.c : 114
+	  SaveParameterArray() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile.c : 133
+	  SetParameterArray() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile.c : 231
+	  PresetAdd() Scripts\Entities\Modules\ModuleBase\ModuleFileHandler\ModuleLocalProfile\ModuleLocalProfileUI.h : 46
+	  OnKeyPress() Scripts/mission/missionGameplay.c : 215
+	  OnKeyPress() Scripts/DayZGame.c : 334
+	\endverbatim
+*/
+proto void DumpStackString(out string stack);
+
+//! Triggers breakpoint in C++ in run time(when app is running in debug enviroment)
+proto void DebugBreak(bool condition = true, void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);
+
+//! Triggers breakpoint in C++ in compile time(when app is running in debug enviroment)
+void CompileBreak();
+
+//! Prints content of variable to console/log. Should be used for critical messages so it will appear in debug log
+proto void DPrint(string var);
+
+enum ErrorExSeverity
+{
+	INFO,
+	WARNING,
+	ERROR,
+}
+
+/**
+\brief Error message, prefixed by method name, above 'INFO' will show a messagebox
+	\note Format: [%className%::%methodName%] :: [%severity%] :: %errString%
+	\param \p string Error message to use
+	@code
+	class ErrorExTest
+	{
+		void ThrowWarning()
+		{
+			// [ErrorExTest::ThrowWarning] :: [WARNING] :: This is a warning.
+			ErrorEx("This is a warning.", ErrorExSeverity.WARNING);		
+		}
+	}
+	@endcode
+*/
+proto void ErrorEx(string err, ErrorExSeverity severity = ErrorExSeverity.ERROR);
+proto void ErrorExString(string err, out string str, ErrorExSeverity severity = ErrorExSeverity.ERROR);
+
+//! Messagebox with error message
+proto native void Error2(string title, string err);
+
+//! Messagebox with error message
+void Error(string err)
+{
+	Error2("", err);
+}
+
+//!Prints content of variable to console/log
+proto void Print(void var);
+
+//!Prints content of variable to RPT file (performance warning - each write means fflush! use with care)
+proto void PrintToRPT(void var);
+	
+/**
+\brief Prints formated text to console/log
+	@code
+		string c = "Peter";
+		PrintFormat("Hello %1, how are you?", c); // prints "Hello 'Peter', how are you?"
+	@endcode
+*/	
+proto void PrintFormat(string fmt, void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);
+
+	//------------------------------------------
+/**
+ * \defgroup DebugShape Debug Shape API definition
+ * @{
+ */
+enum ShapeType
+{
+	BBOX,			//<	Just box
+	LINE,			//<	One or more lines
+	SPHERE,		//<	Sphere represented by triangle mesh
+	CYLINDER,	//<	Cylinder represented by triangle mesh
+	DIAMOND,	//< Eight faced pyramid. Defined by bound-box, where middle part is  equal to horizontal extents of box and top/bottom apogees lies on top/bottom side of box.
+	PYRAMID	//< Four sided pyramid. Defined by bound-box, where base is equal to bottom side of box.
+};
+
+enum ShapeFlags
+{
+	NOZBUFFER,	//< Do not compare z-buffer when render
+	NOZWRITE,		//< Do not update z-buffer when render
+	WIREFRAME,	//< Render just wire-frame outline. No solid faces
+	TRANSP,			//< Is translucent
+	DOUBLESIDE,	//< Double-sided (do not cull back-faces)
+	ONCE,				//< Rendered just once and then it's automatically destroyed. Do not keep pointer to these!!
+	NOOUTLINE,	//< Render just solid faces. No wire-frame outline.
+	BACKFACE,		//< Render just back faces
+	NOCULL,			//< Do not cull shapes by view frustum
+	VISIBLE,		//< Make it visible. Set by default
+	ADDITIVE		//< Additive blending (works with ShapeFlags.TRANSP)
+};
+
+enum CollisionFlags
+{
+	FIRSTCONTACT,	//<In many cases only collided=true/false is enough
+	NEARESTCONTACT	//<We want only one, the nearest contact
+	ONLYSTATIC		//<Only static objects
+	ONLYDYNAMIC		//<Only dynamic objects
+	ONLYWATER		//<Only water components (legacy support for "walk on geometry")
+	ALLOBJECTS		//<Valid when CF_FIRST_CONTACT, we get first contact for each object
+}
+		
+/*!
+Instance of created debug visualizer
+*/
+class Shape
+{
+	//!don't call destructor directly. Use Destroy() instead
+	proto private void ~Shape();
+
+	proto native void GetMatrix(out vector mat[4]);
+	proto native void SetMatrix(vector mat[4]);
+	proto native void SetDirection(vector direction);
+	proto native void SetPosition(vector position);
+	proto native void SetColor(int color);
+	proto native void SetFlags(ShapeFlags flags);
+	proto native void Destroy();
+
+	proto static native Shape Create(ShapeType type, int color, ShapeFlags flags, vector p1, vector p2);
+	proto static native Shape CreateLines(int color, ShapeFlags flags, vector p[], int num);
+	proto static native Shape CreateTris(int color, ShapeFlags flags, vector p[], int num);
+	proto static native Shape CreateSphere(int color, ShapeFlags flags, vector origin, float radius);
+	proto static native Shape CreateFrustum(float horizontalAngle, float verticalAngle, float length, int color, ShapeFlags flags);
+	proto static native Shape CreateCylinder(int color, ShapeFlags flags, vector origin, float radius, float length);
+
+	static Shape CreateArrow(vector from, vector to, float size, int color, ShapeFlags flags)
+	{
+		vector dir = to - from;
+		dir.Normalize();
+		vector dir1 = dir * size;
+		size = size * 0.5;
+	
+		vector dir2 = dir.Perpend() * size;
+	
+		vector pts[5];
+		pts[0] = from;
+		pts[1] = to;
+		pts[2] = to - dir1 - dir2;
+		pts[3] = to - dir1 + dir2;
+		pts[4] = to;
+	
+		return CreateLines(color, flags, pts, 5);
+	}
+
+	static Shape CreateBridgeArrow(vector from, vector to, float size, int color, ShapeFlags flags)
+	{
+		vector dir = to - from;
+		dir.Normalize();
+	
+		vector dir1 = Vector(0, 0, -size);
+		size = size * 0.5;
+	
+		vector dir2 = dir.Perpend() * size;
+	
+		vector pts[7];
+		pts[0] = from;
+		pts[1] = from + "0 0 1";
+		pts[2] = to + "0 0 1";
+		pts[3] = to;
+		pts[4] = to - dir1 - dir2;
+		pts[5] = to - dir1 + dir2;
+		pts[6] = to;
+	
+		return CreateLines(color, flags, pts, 7);
+	}
+
+	static void CreateMatrix(vector mat[4])
+	{
+		vector org = mat[3];
+		int flags = ShapeFlags.NOZWRITE|ShapeFlags.DOUBLESIDE|ShapeFlags.TRANSP|ShapeFlags.ONCE;
+		Create(ShapeType.LINE, 0xffff0000, flags, org, mat[0] * 0.5 + org);
+		Create(ShapeType.LINE, 0xff00ff00, flags, org, mat[1] * 0.5 + org);
+		Create(ShapeType.LINE, 0xff0000ff, flags, org, mat[2] * 0.5 + org);
+	}
+};
+
+//@}
+
+
+//------------------------------------------
+/**
+ * \defgroup DiagMenu Diag menu API definition
+ * @{
+ */
+class DiagMenu
+{
+	//! Checks if DiagMenu is initialized
+	static proto bool IsInitialized();
+	
+	//! To be used before registering scripted diags
+	static proto void InitScriptDiags();
+	//! To be used when scripted diags should not be present
+	static proto void ClearScriptDiags();
+	
+	/**
+	\brief Register a new menu
+		\param id \p int The unique ID of the menu in the range [0,512]
+		\param name \p string The name of the menu
+		\param parent \p int The index of the parent of the menu
+	*/
+	static proto void RegisterMenu(int id, string name, int parent);
+	
+	/**
+	\brief Register a new item
+		\param id \p int The unique ID of the item in the range [0,512]
+		\param shortcut \p string The keyboard shortcut of the item
+		\param name \p string The name of the item
+		\param parent \p int The index of the parent of the item
+		\param values \p string The values of the item separated by commas, internally this will be an int starting at 0 for the first item
+		\param callback \p func Callback to call when the value is changed (OPTIONAL) (Also read BindCallback)
+	*/
+	static proto void RegisterItem(int id, string shortcut, string name, int parent, string values, func callback = null);
+	
+	/**
+	\brief Register a new bool item
+	\note This is just a RegisterItem with value="true,false" or when reversed value="false,true"
+		\param id \p int The unique ID of the item in the range [0,512]
+		\param shortcut \p string The keyboard shortcut of the item
+		\param name \p string The name of the item
+		\param parent \p string The index of the parent of the item
+		\param values \p string The values of the item, separated by commas
+		\param reverse \p bool Whether to reverse the bool (OPTIONAL)
+		\param callback \p func Callback to call when the value is changed (OPTIONAL) (Also read BindCallback)
+	*/
+	static proto void RegisterBool(int id, string shortcut, string name, int parent, bool reverse = false, func callback = null);
+
+	/**
+	\brief Register a new range item
+		\param id \p int The unique ID of the item in the range [0,512]
+		\param shortcut \p string The keyboard shortcut of the item
+		\param name \p string The name of the item
+		\param parent \p int The index of the parent of the item
+		\param values \p string Range specification in format "min,max,startValue,step"
+		\param callback \p func Callback to call when the value is changed (OPTIONAL) (Also read BindCallback)
+	*/
+	static proto void RegisterRange(int id, string shortcut, string name, int parent, string valuenames, func callback = null);
+	
+	//! Unregister the item at given id
+	static proto void Unregister(int id);
+	
+	//! Check if the item at given id has been registered
+	static proto bool IsRegistered(int id);
+	
+	/**
+	*\brief Bind a callback to the given id
+	*	\note Only one callback can be registered, so when attempting to registering multiple, only the last one will be present
+	*	\note The callbacks are required to have one of following signatures
+	*		- All Register... support:
+	*			o static void Callback();
+	*		- RegisterItem & RegisterBool:
+	*			o static void Callback(int value);
+	*			o static void Callback(int value, int id);
+	*			o static void Callback(bool value);
+	*			o static void Callback(bool value, int id);
+	*		- RegisterRange:
+	*			o static void Callback(float value);
+	*			o static void Callback(float value, int id);
+	*			o static void Callback(int value);
+	*			o static void Callback(int value, int id);
+	*	\note Keep in mind that bool and int are interchangeable, so 'bool value' is possible for RegisterRange too
+	*/
+	static proto bool BindCallback(int id, func callback);
+	//! Unbind the callback from the given id
+	static proto void UnbindCallback(int id);
+	
+	//! Get value as bool from the given script id
+	static proto bool GetBool(int id, bool reverse = false);
+	//! Get value as int from the given script id
+	static proto int GetValue(int id);
+	//! Set value at the given script id
+	static proto void SetValue(int id, int value);
+	
+	//! Get range value at the given script id 
+	static proto float GetRangeValue(int id);
+	//! Set range value at the given script id
+	static proto void SetRangeValue(int id, float value);
+	
+	//! Get value at the given engine id
+	static proto int GetEngineValue(int id);
+	//! Set value at the given engine id
+	static proto void SetEngineValue(int id, int value);
+	
+	//! Get range value at the given engine id
+	static proto float GetEngineRangeValue(int id);
+	//! Set range value at the given engine id
+	static proto void SetEngineRangeValue(int id, float value);
+	
+	//! Check if a menu with supplied name already exists
+	static proto bool MenuExists(string name);	
+};
+
+//@}
+
+//@}
diff --git a/scripts/1_Core/DayZ/proto/EnEntity.c b/scripts/1_Core/DayZ/proto/EnEntity.c
new file mode 100644
index 0000000000000000000000000000000000000000..51a61f1a6bf414b43775fd715a332edfd087bb6f
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnEntity.c
@@ -0,0 +1,870 @@
+typedef int[] BaseContainer;		
+typedef int[] IEntitySource;
+typedef int[] WidgetSource;
+	
+class BaseContainer	
+{
+	proto native owned string GetClassName();
+	proto native owned string GetName();
+	proto native int VarIndex(string varName);
+	proto native bool IsVariableSet(int varIndex);
+	proto bool IsType(int varIndex, typename type);
+	proto bool Get(int varIndex, out void val);
+};
+
+class IEntitySource: BaseContainer
+{
+	proto native IEntitySource GetChildren();
+	proto native IEntitySource GetSibling();
+	proto native IEntitySource GetParent();
+};
+
+class WidgetSource: BaseContainer
+{
+	proto native WidgetSource GetChildren();
+	proto native WidgetSource GetSibling();
+	proto native WidgetSource GetParent();
+};
+
+/**
+ * \defgroup EntityAPI Entity system
+ * @{
+ */
+
+/**
+ * \defgroup EntityAttributes Entity editor attribute system
+ * @{
+ */
+
+		
+		
+//@}
+	
+ //!Entity events for event-mask, or throwing event from code
+enum EntityEvent
+{
+	//! entity was touched by other entity
+	TOUCH,
+
+	/*!
+	entity is visible, so part of the rendering
+	other		WorldClass
+	extra		frame index
+	result	false should be rendered, true shoudn't be rendered
+	*/
+	VISIBLE, 
+	
+	/*!
+	entity is not visible, will not be part of rendering
+	other		WorldClass
+	extra		frame index
+	*/
+	NOTVISIBLE, 
+
+	/*!
+	new frame event, called each frame
+	other		WorldClass
+	extra		frame index
+	*/
+	FRAME,
+
+	/*!
+	event at the end of each frame or when entity is moved during the frame
+	other		WorldClass
+	*/
+	POSTFRAME,
+
+	/*!
+	event called after the world is created, including all entities
+	other		WorldClass
+	*/
+	INIT,      	
+
+//Only with MeshObject
+//ANIMEND	- End of AF_ONCE animation, extra = slot number 0...11
+//ANIMBLEND - Animation blended from previous one, extra = slot number 0...11
+
+
+//SOUNDEND	- playing of SFL_ONCE sound has ended
+// extra		= pointer to a sound handle
+
+//USER
+
+	JOINTBREAK,
+	SIMULATE,
+	POSTSIMULATE,
+	PHYSICSMOVE,
+	CONTACT,
+	EXTRA,
+	ANIMEVENT,
+	SOUNDEVENT,
+	PHYSICSSTEADY,
+	USER,
+	
+	//! Object entered Trigger
+	ENTER,
+	//! Object left Trigger
+	LEAVE,
+	
+	//!Mask of all events
+	ALL
+};
+
+//!Entity flags
+enum EntityFlags
+{
+/*!
+Entity is visible. Is rendered if there is some attached object
+and event EntityEvent.VISIBLE is invoked, when event mask is set.
+*/
+	VISIBLE,
+
+
+	SOLID,	///<Is collidable by various trace methods
+	TRIGGER,	///<Is not collidable, but invokes touch events.
+	TOUCHTRIGGERS,	///<Interacts with triggers
+	SYNCHRONIZATION_DIRTY,	///<Entity wants to synchronize (network)
+
+	FEATURE,	///<Scene rendering hint for dominant objects that are not culled by standard way
+/*!
+Used by tracing methods. When tracing with TraceFlags.PASSTRANSLUCENT,
+then this entity is ignored. Used for glass for example.
+*/
+	TRANSLUCENT,
+
+//!Used by tracing methods. Traceable only with flag TraceFlags.WATER
+	WATER,
+
+/*!
+Tells that this entity has to be actively updated by engine, its
+EntityEvent.FRAME has to be called etc.
+*/
+	ACTIVE,
+
+/*!
+Tells that this entity will represent mostly static object, so
+we can use more precise but slower methods for scene-tree linking.
+Also it tells to scene tree that he can count with this entity as
+tree-split hint.
+*/
+	STATIC,
+
+//!Flags for custom usage and filterings.
+	USER1,
+	USER2,
+	USER3,
+	USER4,
+	USER5,
+	USER6
+};
+
+/*!
+Internal ancestor of all Entity implementations.
+*/
+class IEntity: Managed
+{
+//DO NOT INSERT ANYTHING BELOW - order of event methods matters!
+/** \name Event methods
+ Event method stubs. Reimplement these in inherited entities to receive event calls			
+*/
+//@{
+	event protected void EOnTouch(IEntity other, int extra) //!EntityEvent.TOUCH
+	{
+	}
+	event protected void EOnInit(IEntity other, int extra) //!EntityEvent.INIT
+	{
+	}
+	event protected void EOnExtra(IEntity other, int extra)	//!EntityEvent.EXTRA
+	{
+	}
+	event protected void EOnNotVisible(IEntity other, int extra) //!EntityEvent.NOTVISIBLE
+	{
+	}
+	event protected void EOnFrame(IEntity other, float timeSlice) //!EntityEvent.FRAME
+	{
+	}
+	event protected int  EOnVisible(IEntity other, int extra) //!EntityEvent.VISIBLE
+	{
+	}
+	event protected void EOnPostFrame(IEntity other, int extra) //!EntityEvent.POSTFRAME
+	{
+	}
+	event protected void EOnWorldProcess(IEntity other, int extra) //!EntityEvent.WORLDPROCESS
+	{
+	}
+	event protected void EOnAnimEvent(IEntity other, AnimEvent extra) //!EntityEvent.ANIMEVENT
+	{
+	}
+	event protected void EOnSoundEvent(IEntity other, SoundEvent extra) //!EntityEvent.SOUNDEVENT
+	{
+	}
+	event protected void EOnSimulate(IEntity other, float dt) //!EntityEvent.SIMULATE
+	{
+	}
+	event protected void EOnPostSimulate(IEntity other, float timeSlice)	//!EntityEvent.POSTSIMULATE
+	{
+	}
+	event protected void EOnJointBreak(IEntity other, int extra) //!EntityEvent.JOINTBREAK
+	{
+	}
+	event protected void EOnPhysicsMove(IEntity other, int extra) //!EntityEvent.PHYSICSMOVE
+	{
+	}
+	event protected void EOnContact(IEntity other, Contact extra) //!EntityEvent.CONTACT
+	{
+	}
+	protected void EOnUser0(IEntity other, int extra) //!EntityEvent.EV_USER+0
+	{
+	}
+	protected void EOnUser1(IEntity other, int extra) //!EntityEvent.EV_USER+1
+	{
+	}
+	event protected void EOnEnter(IEntity other, int extra) //!EntityEvent.ENTER
+	{
+	}
+	event protected void EOnLeave(IEntity other, int extra) //!EntityEvent.LEAVE
+	{
+	}
+	protected void EOnUser4(IEntity other, int extra) //!EntityEvent.EV_USER+4
+	{
+	}
+	protected void EOnDummy020(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy021(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy022(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy023(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy024(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy025(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy026(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy027(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy028(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy029(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy030(IEntity other, int extra)	//!Placeholder
+	{
+	}
+	protected void EOnDummy031(IEntity other, int extra)	//!Placeholder
+	{
+	}
+//@}
+//DO NOT INSERT ANYTHING ABOVE - order of event methods matters!
+
+	/** \name Transformation methods
+		Setting and getting of entity transformation
+	*/
+	//@{
+
+	/**
+	\brief Returns transformation of Entity. It returns only so much vectors as array is big
+		\param mat \p vector[1...4] matrix to be get
+		@code
+			Man player = g_Game.GetPlayer();
+	
+			vector mat[4];
+			player.GetTransform(mat);
+			Print( mat );
+	
+			>> <0.989879,-0,0.141916>,<0,1,0>,<-0.141916,0,0.989879>,<2545.08,15.6754,2867.49>
+		@endcode
+	*/
+	proto external void GetTransform(out vector mat[]);
+
+	/**
+	\brief Returns render transformation of Entity. Must pass in vector array size of 4
+		\param mat \p vector[4] matrix to be get
+		@code
+			Man player = g_Game.GetPlayer();
+	
+			vector mat[4];
+			player.GetRenderTransform(mat);
+			Print( mat );
+	
+			>> <0.989879,-0,0.141916>,<0,1,0>,<-0.141916,0,0.989879>,<2545.08,15.6754,2867.49>
+		@endcode
+	*/
+	proto external void GetRenderTransform(out vector mat[]);
+
+	/**
+	\brief Returns local transformation of Entity. It returns only so much vectors as array is big
+		\param mat \p vector[1...4] matrix to be get
+		@code
+			Man player = g_Game.GetPlayer();
+	
+			vector mat[4];
+			player.GetTransform(mat);
+			Print( mat );
+	
+			>> <0.989879,-0,0.141916>,<0,1,0>,<-0.141916,0,0.989879>,<2545.08,15.6754,2867.49>
+		@endcode
+	*/
+	proto external void GetLocalTransform(out vector mat[]);
+
+	/**
+	\brief Returns one row of Entity transformation matrix
+		\param axis \p int matrix axis. Can be 0..3
+		\return \p vector axis row of Entity matrix
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetTransformAxis(0) );
+			Print( player.GetTransformAxis(1) );
+			Print( player.GetTransformAxis(2) );
+			Print( player.GetTransformAxis(3) );
+	
+			>> <-0.386781,0,0.922171>
+			>> <0,1,0>
+			>> <-0.922171,0,-0.386782>
+			>> <2551.34,15.6439,2856.72>
+		@endcode
+	*/
+	proto native external vector GetTransformAxis(int axis);
+
+	/**
+	\brief Sets entity transformation
+		\param mat \p vector[4] matrix to be set
+		@code
+			vector mat[4];
+			Math3D.MatrixIdentity( mat )
+	
+			Man player = g_Game.GetPlayer();
+			player.SetTransform( mat );
+	
+			vector outmat[4];
+			player.GetTransform(outmat );
+			Print( outmat );
+	
+			>> <1,0,0>,<0,1,0>,<0,0,1>,<0,0,0>
+		@endcode
+	*/
+	proto native external void SetTransform(vector mat[4]);
+
+	/**
+	\brief Returns origin of Entity
+		\return \p vector entity origin
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetOrigin() );
+	
+			>> <2577.02,15.6837,2924.27>
+		@endcode
+	*/
+	proto native external vector GetOrigin();
+	
+	/**
+	\brief Returns local position of Entity
+		\return \p vector entity local position
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetOrigin() );
+	
+			>> <2577.02,15.6837,2924.27>
+		@endcode
+	*/
+	proto external vector GetLocalPosition();
+	
+	/**
+	\brief Returns orientation of Entity in world space (Yaw, Pitch, Roll)
+		\return \p vector entity orientation
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetYawPitchRoll() );
+	
+			>> <180,-76.5987,180>
+		@endcode
+	*/
+	proto native external vector GetYawPitchRoll();
+
+	/**
+	\brief Same as GetYawPitchRoll, but returns rotation vector around X, Y and Z axis.
+	*/
+	proto native external vector GetAngles();
+
+	/**
+	\brief Returns local orientation when it's in hierarchy (Yaw, Pitch, Roll)
+		\return \p vector local orientation
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetLocalYawPitchRoll() );
+	
+			>> <180,-57.2585,180>
+		@endcode
+	*/
+	proto native external vector GetLocalYawPitchRoll();
+
+	/**
+	\brief Same as GetLocalYawPitchRoll, but returns rotation vector around X, Y and Z axis.
+	*/
+	proto native external vector GetLocalAngles();
+
+	/**
+	\brief Sets angles for entity (Yaw, Pitch, Roll)
+		\param angles \p vector angles to be set
+		@code
+			Man player = g_Game.GetPlayer();
+			player.SetYawPitchRoll("180 50 180" );
+			Print( player.GetYawPitchRoll() );
+	
+			>> <-180,50,-180>
+		@endcode
+	*/
+	proto native external void SetYawPitchRoll(vector angles);
+
+	/**
+	\brief Same as SetYawPitchRoll, but sets rotation around X, Y and Z axis.
+	*/
+	proto native external void SetAngles(vector angles);
+	
+	/**
+	\brief Sets origin for entity
+		\param orig \p vector origin to be set
+		@code
+			Man player = g_Game.GetPlayer();
+			player.SetOrigin("2550 10 2900" );
+			Print( player.GetOrigin() );
+	
+			>> <2550,10,2900>
+		@endcode
+	*/
+	proto native external void SetOrigin(vector orig);
+
+	proto native external float GetScale();
+	proto native external void SetScale(float scale);
+	/**
+	\brief Transforms local vector to world space
+	    \param vec \p vector local space vector to transform
+		\return \p vector world space vector
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.VectorToParent("1 2 3") );
+
+			>> <2.89791,2,1.26575>
+		@endcode
+	*/
+	proto native external vector VectorToParent(vector vec);
+
+	/**
+	\brief Transforms local position to world space
+		\param coord \p vector local position to transform
+		\return \p vector position in world space
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.CoordToParent("1 2 3") );
+
+			>> <2549,17.6478,2857>
+		@endcode
+	*/
+	proto native external vector CoordToParent(vector coord);
+
+	/**
+	\brief Transforms world space vector to local space
+		\param vec \p vector world space vector to transform
+		\return \p vector local space vector
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.VectorToLocal("2 1 5") );
+
+			>> <-0.166849,1,5.38258>
+		@endcode
+	*/
+	proto native external vector VectorToLocal(vector vec);
+
+	/**
+	\brief Transforms world space position to local space
+		\param coord \p vector world space position to transform
+		\return \p vector position in local space
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.CoordToLocal("500 10 155") );
+
+			>> <15254,-54.2004,8745.53>
+		@endcode
+	*/
+	proto native external vector CoordToLocal(vector coord);
+
+	//@}
+
+
+	/** \name Name/ID methods		
+	*/
+	//@{
+
+	/**
+	\brief Return unique entity ID
+		\return \p int unique entity ID
+		@code
+			ItemBase apple = g_Game.CreateObject( "FruitApple", String2Vector("0 10 0"), false );
+			Print( apple.GetID() );
+
+			>> 0
+		@endcode
+	*/
+	proto native int GetID();
+
+	/**
+	\brief Set unique entity ID
+		\param id \p int unique entity ID to be set
+		@code
+			ItemBase apple = g_Game.CreateObject( "Fruit_Apple", String2Vector("0 10 0"), false );
+			apple.SetID(101);
+			Print( apple.GetID() );
+
+			>> 101
+		@endcode
+	*/
+	proto native void SetID(int id);
+	
+	proto native void SetName(string name);
+	proto native external owned string GetName();
+	//@}
+	
+
+	/** \name Hierarchy methods
+		Scene hierarchy management
+	*/
+	//@{
+
+	/**
+	\brief Adds child entity to this entity.
+		\note Make sure the parent is not ToDelete
+		\param child \p IEntity Pointer to entity which become our child
+		\param pivot \p int Pivot is pivot index, or -1 for center of parent.
+		\param positionOnly \p bool When set to true, the orientation will still be in WS.
+		\return \p bool True when entity has been attached. False otherwise.
+	*/
+	proto native external bool AddChild(notnull IEntity child, int pivot, bool positionOnly = false);
+	
+	/**
+	\brief Removes child entity from hierarchy.
+		\note Make sure the child is not ToDelete
+		\param child \p IEntity Pointer to child entity we want to remove.
+		\param keepTransform \p bool When set to true, Entity is kept on her world position. Otherwise it's local transform is used as world-space one.
+		\return \p bool True if it was removed, false when this entity is not our child.
+	*/
+	proto native external bool RemoveChild(notnull IEntity child, bool keepTransform = false);
+	
+	//! Returns if the hierarchy component was created with positionOnly
+	proto native bool IsHierarchyPositionOnly();
+
+	//! Returns the hierarchy component pivot
+	proto native int GetHierarchyPivot();
+
+	//! Returns pointer to parent Entity in hierarchy
+	proto native IEntity GetParent();
+	//! Returns pointer to first child Entity in hierarchy
+	proto native IEntity GetChildren();
+	//! Returns pointer to next child Entity on the same hierarchy
+	proto native IEntity GetSibling();
+	//@}
+
+	/**
+	\brief Returns local bounding box of model on Entity
+		\param[out] mins \p vector minimum point of bounding box
+		\param[out] maxs \p vector maximum point of bounding box
+		@code
+			Man player = g_Game.GetPlayer();
+	
+			vector mins, maxs;
+			player.GetBounds(mins, maxs );
+	
+			Print( mins );
+			Print( maxs );
+	
+			>> <0,0,0>
+			>> <0,0,0>
+		@endcode
+	*/
+	proto external void GetBounds(out vector mins, out vector maxs);
+	
+	/**
+	\brief Returns quantized world-bound-box of Entity
+		\param[out] mins \p vector minimum point of bounding box
+		\param[out] maxs \p vector maximum point of bounding box
+		@code
+			Man player = g_Game.GetPlayer();
+	
+			vector mins, maxs;
+			player.GetWorldBounds( mins, maxs );
+	
+			Print( mins );
+			Print( maxs );
+	
+			>> <2547.2,15.5478,2852.85>
+			>> <2548.8,17.5478,2855.05>
+		@endcode
+	*/
+	proto external void GetWorldBounds(out vector mins, out vector maxs);
+	
+	/** \name Simulation/handling properties
+	Flags that affects simulation and entity handling behavior
+	*/
+	//@{
+	/**
+	\brief Returns Entity flags
+		\return \p EntityFlags entity flags
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetFlags() );
+	
+			>> 1610612745
+		@endcode
+	*/
+	proto native external EntityFlags GetFlags();
+	
+	/**
+	\brief Test if one or more of specified flags are set
+		\return \p bool True if is set, false otherwise.
+		@code
+			Man player = g_Game.GetPlayer();
+			player.SetFlags(EntityFlags.VISIBLE);
+			Print( player.IsFlagSet(EntityFlags.VISIBLE) );
+	
+			>> true
+		@endcode
+	*/
+	proto native external bool IsFlagSet(EntityFlags flags);
+
+	/**
+	\brief Sets Entity flags. It's OR operation, not rewrite. Returns previous flags
+		\param flags \p int flags to be set
+		\param recursively flags will be recursively applied to children of hierarchy too
+		\return \p int previous flags
+		@code
+			Man player = g_Game.GetPlayer();
+			player.SetFlags(EntityFlags.VISIBLE|EntityFlags.SOLID );
+			Print( player.GetFlags() );
+	
+			>> 1610612747
+		@endcode
+	*/
+	proto native external EntityFlags SetFlags(EntityFlags flags, bool recursively);
+
+	/**
+	\brief Clear Entity flags. Returns cleared flags
+		\param flags \p int flags to be set
+		\param recursively flags will be recursively applied to children of hierarchy too
+		\return \p int cleared flags
+		@code
+			Man player = g_Game.GetPlayer();
+			player.ClearFlags(EntityFlags.VISIBLE|EntityFlags.SOLID );
+			Print( player.GetFlags() );
+	
+			>> 1610612744
+		@endcode
+	*/
+	proto native external EntityFlags ClearFlags(EntityFlags flags, bool recursively);
+
+
+	/**
+	\brief Returns current event mask
+		\return \p int current event mask
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetEventMask() );
+	
+			>> 0
+		@endcode
+	*/
+	proto native external EntityEvent GetEventMask();
+
+	/**
+	\brief Sets event mask
+		\param e combined mask of one or more members of EntityEvent enum
+		@code
+			Man player = g_Game.GetPlayer();
+			Print( player.GetEventMask() );
+			player.SetEventMask( EntityEvent.VISIBLE );
+			Print( player.GetEventMask() );
+	
+			>> 0
+			>> 128
+		@endcode
+	*/
+	proto native external EntityEvent SetEventMask(EntityEvent e );
+
+	/**
+	\brief Clears event mask
+		\param e \p int event mask
+		\return \p int event mask
+		@code
+			Man player = g_Game.GetPlayer();
+			player.SetEventMask(EntityEvent.VISIBLE );
+			Print( player.GetEventMask() );
+			player.ClearEventMask(EntityEvent.ALL );
+			Print( player.GetEventMask() );
+	
+			>> 128
+			>> 0
+		@endcode
+	*/
+	proto native external EntityEvent ClearEventMask(EntityEvent e);
+	
+	//!Dynamic event invokation. Parameters are the same as in IEntity::EOnXXXX() methods
+	proto external volatile void SendEvent(notnull IEntity actor, EntityEvent e, void extra);
+
+//@}
+
+/** \name Visual component methods
+ Manipulation with visual component - model, particle effect etc			
+*/
+//@{
+
+	/**
+	\brief Sets the visual object to this entity. Reference is added and released upon entity destruction
+	\param object handle to object got by GetObject()
+	\param options String, dependant on object type.
+	//Only supported one for XOB objects:
+	//$remap 'original material name' 'new material'; [$remap 'another original material name' 'anothernew material']
+	*/
+	proto native external void SetObject(vobject object, string options);
+	
+	/**
+	\brief Returns visual object set to this Entity. No reference is added
+	*/
+	proto native vobject GetVObject();
+
+	//!Updates animation (either xob, or particle, whatever)
+	proto native external int Animate(float speed, int loop);
+	//!Updates animation (either xob, or particle, whatever)
+	proto native external int AnimateEx(float speed, int loop, out vector lin, out vector ang);
+
+	//!Sets visibility mask for cameras, where Entity will be rendered
+	proto native external int SetCameraMask(int mask);	
+//@}
+
+	/**
+	\brief When called, the Entity is excluded from consequent TraceMove/TraceLine
+	*/
+	proto native external void FilterNextTrace();
+
+	/*!
+	Updates entity state/position. Should be called when you want to manually commit position changes etc
+	before trace methods etc. Entity is updated automatically at the end and the beginning of simulation step,
+	when it has EntityFlags.TFL_ACTIVE flag set.
+	\returns mask with flags
+	//	EntityFlags.UPDATE - hierarchy has been updated
+	//	EntityFlags.UPDATE_MDL - model hierarchy has been updated
+	*/
+	proto native external int Update();
+		
+#ifdef COMPONENT_SYSTEM		
+	//! Constructor
+	protected void IEntity(IEntitySource src, IEntity parent);	
+#endif		
+};
+
+#ifdef ENF_DONE
+// Set fixed LOD. -1 for non-fixed LOD
+proto native void SetFixedLOD(IEntity ent, int lod);
+//Sets the texture that can be referenced from material as $renderview
+//and connects it with camera cam_index. Size iz recommended size of
+//rendertarget (0 is default)
+proto native void SetRenderView(IEntity ent, int cam_index, int width, int height);
+proto void GetRenderView(IEntity ent, out int cam_index, out int width, out int height);
+#endif
+
+
+/**
+ * \defgroup EntityAttributes Entity editor attribute system
+ * @{
+ */
+
+class ParamEnum: Managed
+{
+	string m_Key;
+	string m_Value;
+	string m_Desc;
+	
+	void ParamEnum(string key, string value, string desc = "")
+	{
+		m_Key = key;
+		m_Value = value;
+		m_Desc = desc;
+	}
+}
+
+class ParamEnumArray: array<ref ParamEnum>
+{
+	static ParamEnumArray FromEnum(typename e)
+	{
+		ParamEnumArray params = new ParamEnumArray();	
+		int cnt = e.GetVariableCount();
+		int val;
+
+		for (int i = 0; i < cnt; i++)
+		{
+			if (e.GetVariableType(i) == int && e.GetVariableValue(NULL, i, val))
+			{
+				params.Insert(new ParamEnum(e.GetVariableName(i), val.ToString()));
+			}
+		}
+				
+		return params;
+	}	
+}
+
+// -------------------------------------------------------------------------
+class Attribute
+{
+	string m_DefValue;
+	string m_UiWidget; ///< can be "editbox", "combobox", "spinbox", "slider", "font", "fileeditbox", "colorPicker", "flags", "resourceNamePicker"
+	string m_RangeScale; ///< defined as "MIN_VALUE MAX_VALUE STEP" eg. "1 100 0.5"
+	string m_Desc;
+	ref ParamEnumArray m_Enums; ///< Only ints and floats are currently supported. Array can be defined this way: { ParamEnum("Choice 1", "1"), ParamEnum("Choicen 2", "2") }
+	
+	void Attribute(string defvalue, string uiwidget, string desc = "", string rangescale = "", ParamEnumArray enums = NULL)
+	{
+		m_DefValue = defvalue;
+		m_UiWidget = uiwidget;
+		m_RangeScale = rangescale;
+		m_Desc = desc;
+		m_Enums = enums;
+	}
+}
+
+class EditorAttribute
+{
+	string m_Style; ///< can be "box", "sphere", "cylinder", "pyramid", "diamond" or custom style name
+	string m_Category; ///< folder structure eg. StaticEntities/Walls
+	string m_Description; ///< class purpose description
+	vector m_SizeMin; ///< min vector of a bounding box
+	vector m_SizeMax; ///< max vector of a bounding box
+	string m_Color;
+	string m_Color2;
+	bool m_Visible;
+	bool m_Insertable;
+	bool m_DynamicBox;
+	
+	void EditorAttribute(string style, string category, string description, vector sizeMin, vector sizeMax, string color, string color2 = "0 0 0 0", bool visible = true, bool insertable = true, bool dynamicBox = false)
+	{
+		m_Style = style;
+		m_Category = category;
+		m_Description = description;
+		m_SizeMin = sizeMin;
+		m_SizeMax = sizeMax;
+		m_Color = color;
+		m_Color2 = color2;
+		m_Visible = visible;
+		m_Insertable = insertable;
+		m_DynamicBox = dynamicBox;
+	}
+}
+//@}
+
+//@}
diff --git a/scripts/1_Core/DayZ/proto/EnMath.c b/scripts/1_Core/DayZ/proto/EnMath.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f048ef75e6e5b07a97deccff7d99fcc215300a6
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnMath.c
@@ -0,0 +1,704 @@
+/**
+ * \defgroup Math Math library
+ * @{
+ */
+
+class Math
+{
+	private void Math() {}
+	private void ~Math() {}
+	
+	static const float EULER = 2.7182818284590452353;
+	static const float PI = 3.14159265358979;
+	static const float PI2 = 6.28318530717958;
+	static const float PI_HALF = 1.570796326794;
+
+	static const float RAD2DEG = 57.2957795130823208768;
+	static const float DEG2RAD = 0.01745329251994329577;
+
+	//! returns the number of bits set in a bitmask i
+	proto static int GetNumberOfSetBits(int i);
+	
+	//! returns the the index of n-th bit set in a bit mask counting from the right, for instance, in a mask ..0110 1000 , the 0th set bit(right-most bit set to 1) is at 3th position(starting at 0), 1st bit is at 5th position, 2nd bit is at 6th position etc..
+	proto static int GetNthBitSet(int value, int n);
+	
+	/**
+	\brief Returns a random \p int number between and min [inclusive] and max [exclusive].
+		\param min \p int Range starts [inclusive]
+		\param max \p int Range ends [exclusive]
+		\return \p int - Random number in range
+		@code
+			Print( Math.RandomInt(0, 1) );	// only 0
+			Print( Math.RandomInt(0, 2) );	// 0 or 1
+
+			>> 0
+			>> 1
+		@endcode
+	*/
+	proto static int RandomInt(int min, int max);
+	
+	/**
+	\brief Returns a random \p int number between and min [inclusive] and max [inclusive].
+		\param min \p int Range starts [inclusive]
+		\param max \p int Range ends [inclusive]
+		\return \p int - Random number in range
+		@code
+			Print( Math.RandomIntInclusive(0, 1) );	// 0 or 1
+			Print( Math.RandomIntInclusive(0, 2) );	// 0, 1, 2
+
+			>> 1
+			>> 2
+		@endcode
+	*/
+	
+	static int RandomIntInclusive(int min, int max)
+	{
+		return Math.RandomInt(min, max+1);
+	}
+	
+	/**
+	\brief Returns a random \p bool .
+		\return \p bool - Random bool either 0 or 1
+		@code
+			Print( Math.RandomBool() );
+			Print( Math.RandomBool() );
+			Print( Math.RandomBool() );
+	
+			>> true
+			>> true
+			>> false
+		@endcode
+	*/
+	
+	static bool RandomBool()
+	{
+		return RandomIntInclusive(0,1);
+	}
+	
+	/**
+	\brief Returns a random \p float number between and min[inclusive] and max[exclusive].
+		\param min \p float Range starts [inclusive]
+		\param max \p float Range ends [exclusive]
+		\return \p float - Random number in range
+		@code
+			Print( Math.RandomFloat(0,1) );
+			Print( Math.RandomFloat(0,2) );
+
+			>> 0.597561
+			>> 1.936456
+		@endcode
+	*/
+	proto static float RandomFloat(float min, float max);
+
+	/**
+	\brief Returns a random \p float number between and min [inclusive] and max [inclusive].
+		\param min \p float Range starts [inclusive]
+		\param max \p float Range ends [inclusive]
+		\return \p float - Random number in range
+		@code
+			Print( Math.RandomFloatInclusive(0, 1) );	// 0.0 .. 1.0
+			Print( Math.RandomFloatInclusive(1, 2) );	// 1.0 .. 2.0
+
+			>> 0.3
+			>> 2.0
+		@endcode
+	*/
+	static float RandomFloatInclusive(float min, float max)
+	{
+		int max_range = Math.Pow(2, 30); //max range
+		int random_int = Math.RandomInt(0, max_range);
+		float rand_float = (float)random_int / (float)max_range;
+		float range = max - min;
+
+		return min + (rand_float * range); //rand float
+	}
+
+	/**
+	\brief Returns a random \p float number between and min [inclusive] and max [inclusive].
+		\return \p float - Random number in range 0.0 .. 1.0
+		@code
+			Print( Math.RandomFloat01() );	// 0.0 .. 1.0
+
+			>> 0.3
+			>> 1.0
+		@endcode
+	*/
+	static float RandomFloat01()
+	{
+		return RandomFloatInclusive(0, 1);
+	}
+	
+	/**
+	\brief Sets the seed for the random number generator.
+		\param seed \p int New seed for the random number generator, -1 will use time
+		\return \p int - Returns new seed
+		@code
+			Print( Math.Randomize(5) );
+
+			>> 5
+		@endcode
+	*/
+	proto static int Randomize(int seed);
+	
+	/**
+	\brief Normalizes the angle (0...360)
+		\param ang \p float Angle for normalizing
+		\return \p float - Normalized angle
+		@code
+			Print( Math.NormalizeAngle(390) );
+			Print( Math.NormalizeAngle(-90) );
+
+			>> 30
+			>> 270
+		@endcode
+	*/
+	proto static float NormalizeAngle(float ang);
+
+	/**
+	\brief Return relative difference between angles
+		\param angle1 \p float 
+		\param angle2 \p float
+		\return \p float Difference between angles (angle1 - angle2)
+		@code
+			Print( Math.DiffAngle(-45, 45) );
+			Print( Math.DiffAngle(90, 80) );
+
+			>> -90
+			>> 10
+		@endcode
+	*/
+	proto static float DiffAngle(float angle1, float angle2);
+	
+	/**
+	\brief Return power of v ^ power
+		\param v \p float Value
+		\param power \p float Power
+		\return \p float - The result of raising v to the given power
+		@code
+			Print( Math.Pow(2, 4) ); // (2*2*2*2)=16
+
+			>> 16
+		@endcode
+	*/
+	proto static float Pow(float v, float power);
+
+	/**
+	\brief Returns the floating-point remainder of x/y rounded towards zero
+		\param x \p float Value of the quotient numerator
+		\param y \p float Value of the quotient denominator
+		\return \p float - The remainder of dividing the arguments
+		@code
+			Print( Math.ModFloat(5.3, 2) );
+			Print( Math.ModFloat(18.5, 4.2) );
+
+			>> 1.3
+			>> 1.7
+		@endcode
+	*/
+	proto static float ModFloat(float x, float y);
+
+	/**
+	\brief Returns the floating-point remainder of x/y rounded to nearest
+		\param x \p float Value of the quotient numerator
+		\param y \p float Value of the quotient denominator
+		\return \p float - The remainder of dividing the arguments
+		@code
+			Print( Math.RemainderFloat(5.3, 2) );
+			Print( Math.RemainderFloat(18.5, 4.2) );
+
+			>> -0.7
+			>> 1.7
+		@endcode
+	*/
+	proto static float RemainderFloat(float x, float y);
+	
+	/**
+	\brief Returns absolute value
+		\param f \p float Value
+		\return \p float - Absolute value
+		@code
+			Print( Math.AbsFloat(-12.5) );
+
+			>> 12.5
+		@endcode
+	*/
+	proto static float AbsFloat(float f);
+
+	/**
+	\brief Returns absolute value
+		\param i \p int Value
+		\return \p int - Absolute value
+		@code
+			Print( Math.AbsInt(-12) );
+
+			>> 12
+		@endcode
+	*/
+	proto static int AbsInt(int i);
+
+	/**
+	\brief Returns sign of given value
+		\param f \p float Value
+		\return \p float - Sign of given value
+		@code
+			Print( Math.SignFloat(-12.0) );
+			Print( Math.SignFloat(0.0) );
+			Print( Math.SignFloat(12.0) );
+
+			>> -1.0
+			>> 0
+			>> 1.0
+		@endcode
+	*/
+	proto static float SignFloat(float f);
+
+	/**
+	\brief Returns sign of given value
+		\param i \p int Value
+		\return \p int - Sign of given value
+		@code
+			Print( Math.SignFloat(-12) );
+			Print( Math.SignFloat(0) );
+			Print( Math.SignFloat(12) );
+
+			>> -1
+			>> 0
+			>> 1
+		@endcode
+	*/
+	proto static int SignInt(int i);
+	
+	/**
+	\brief Returns squared value
+		\param f \p float Value
+		\return \p float - Squared value
+		@code
+			Print( Math.SqrFloat(12.5) );
+
+			>> 156.25
+		@endcode
+	*/
+	proto static float SqrFloat(float f);
+
+	/**
+	\brief Returns squared value
+		\param i \p int Value
+		\return \p int - Squared value
+		@code
+			Print( Math.SqrInt(12) );
+
+			>> 144
+		@endcode
+	*/
+	proto static int SqrInt(int i);
+	
+	/**
+	\brief Returns square root
+		\param val \p float Value
+		\return \p float - Square of value
+		@code
+			Print( Math.Sqrt(25));
+
+			>> 5
+		@endcode
+	*/
+	proto static float Sqrt(float val);
+	
+	/**
+	\brief Returns the binary (base-2) logarithm of x.
+		\param x \p float Value whose logarithm is calculated.
+		\return \p float The binary logarithm of x: log2x.
+				\n If x is negative, it causes a domain error:
+				\n If x is zero, it may cause a pole error (depending on the library implementation).
+		@code
+			Print( Math.Log2(1.0) ); 
+	
+			>> 0.0
+		@endcode
+	*/
+	proto static float Log2(float x);
+
+	/**
+	\brief Returns sinus of angle in radians
+		\param angle \p float Angle in radians
+		\return \p float - Sinus of angle
+		@code
+			Print( Math.Sin(0.785398) ); // (45)
+
+			>> 0.707107
+		@endcode
+	*/
+	proto static float Sin(float angle);
+
+	/**
+	\brief Returns cosinus of angle in radians
+		\param angle \p float Angle in radians
+		\return \p float - Cosinus of angle
+		@code
+			Print( Math.Cos(0.785398) ); // (45)
+
+			>> 0.707107
+		@endcode
+	*/
+	proto static float Cos(float angle);
+
+	/**
+	\brief Returns tangent of angle in radians
+		\param angle \p float Angle in radians
+		\return \p float - Tangens of angle
+		@code
+			Print( Math.Tan(0.785398) ); // (45)
+
+			>> 1
+		@endcode
+	*/
+	proto static float Tan(float angle);
+
+	/**
+	\brief Returns angle in radians from sinus
+		\param s \p float Sinus
+		\return \p float - Angle in radians
+		@code
+			Print( Math.Asin(0.707107) ); // (sinus 45)
+
+			>> 0.785398
+		@endcode
+	*/
+	proto static float Asin(float s);
+
+	/**
+	\brief Returns angle in radians from cosinus
+		\param c \p float Cosinus
+		\return \p float - Angle in radians
+		@code
+			Print( Math.Acos(0.707107) ); // (cosinus 45)
+
+			>> 0.785398
+		@endcode
+	*/
+	proto static float Acos(float c);
+	
+	/**
+	\brief Returns angle in radians from tangent
+		\param x \p float Tangent
+		\return \p float - Angle in radians
+	*/
+	proto static float Atan(float x);
+
+	/**
+	\brief Returns angle in radians from tangent
+		\param y \p float Tangent
+		\param x \p float Tangent
+		\return \p float - Angle in radians
+		@code
+			Print ( Math.Atan2(1, 1) );
+
+			>> 0.785398
+		@endcode
+	*/
+	proto static float Atan2(float y, float x);
+
+	/**
+	\brief Returns mathematical round of value
+		\param f \p float Value
+		\return \p float - closest whole number to 'f'
+		@code
+			Print( Math.Round(5.3) );
+			Print( Math.Round(5.8) );
+
+			>> 5
+			>> 6
+		@endcode
+	*/
+	proto static float Round(float f);
+		
+	/**
+	\brief Returns floor of value
+		\param f \p float Value
+		\return \p float - Floor of value
+		@code
+			Print( Math.Floor(5.3) );
+			Print( Math.Floor(5.8) );
+
+			>> 5
+			>> 5
+		@endcode
+	*/
+	proto static float Floor(float f);
+
+	/**
+	\brief Returns ceil of value
+		\param f \p float Value
+		\return \p float - Ceil of value
+		@code
+			Print( Math.Ceil(5.3) );
+			Print( Math.Ceil(5.8) );
+
+			>> 6
+			>> 6
+		@endcode
+	*/
+	proto static float Ceil(float f);
+	
+	/**
+	\brief Returns wrap number to specified interval [min, max[
+		\param f \p float Value
+		\param min \p float Minimum
+		\param max \p float Maximum
+		\return \p float - number in specified interval [min, max[
+		@code
+			Print( Math.WrapFloat(9.0, 1.0, 9.0) );
+
+			>> 1.0
+		@endcode
+	*/
+	proto static float WrapFloat(float f, float min, float max);
+	
+	/**
+	\brief Returns wrap number to specified interval [min, max]
+		\param f \p float Value
+		\param min \p float Minimum
+		\param max \p float Maximum
+		\return \p float - number in specified interval [min, max]
+		@code
+			Print( Math.WrapFloatInclusive(9.0, 1.0, 9.0) );
+
+			>> 9.0
+		@endcode
+	*/
+	proto static float WrapFloatInclusive(float f, float min, float max);
+	
+	/**
+	\brief Returns wrap number to specified interval [0, max[
+		\param f \p float Value
+		\param max \p float Maximum
+		\return \p float - number in specified interval [0, max[
+		@code
+			Print( Math.WrapFloat0X(9.0, 9.0) );
+
+			>> 0.0
+		@endcode
+	*/
+	proto static float WrapFloat0X(float f, float max);
+	
+	/**
+	\brief Returns wrap number to specified interval [0, max]
+		\param f \p float Value
+		\param max \p float Maximum
+		\return \p float - number in specified interval [0, max]
+		@code
+			Print( Math.WrapFloat0X(9.0, 9.0) );
+
+			>> 9.0
+		@endcode
+	*/
+	proto static float WrapFloat0XInclusive(float f, float max);
+	
+	/**
+	\brief Returns wrap number to specified interval [min, max[
+		\param i \p int Value
+		\param min \p float Minimum
+		\param max \p int Maximum
+		\return \p int - number in specified interval [min, max[
+		@code
+			Print( Math.WrapInt(9, 1, 9) );
+
+			>> 1
+		@endcode
+	*/
+	proto static int WrapInt(int i, int min, int max);
+	
+	/**
+	\brief Returns wrap number to specified interval [0, max[
+		\param i \p int Value
+		\param max \p int Maximum
+		\return \p int - number in specified interval [0, max[
+		@code
+			Print( Math.WrapInt0X(9, 9) );
+
+			>> 0
+		@endcode
+	*/
+	proto static int WrapInt0X(int i, int max);
+
+	/**
+	\brief Clamps 'value' to 'min' if it is lower than 'min', or to 'max' if it is higher than 'max'
+		\param value \p float Value
+		\param min \p float Minimum value
+		\param max \p float Maximum value
+		\return \p float - Clamped value
+		@code
+			Print( Math.Clamp(-0.1, 0, 1) );
+			Print( Math.Clamp(2, 0, 1) );
+			Print( Math.Clamp(0.5, 0, 1) );
+	
+			>> 0
+			>> 1
+			>> 0.5
+		@endcode
+	*/
+	proto static float Clamp(float value, float min, float max);
+		
+	/**
+	\brief Returns smaller of two given values
+		\param x \p float Value
+		\param y \p float Value
+		\return \p float  - min value
+		@code
+			Print( Math.Min(5.3, 2.8) );
+
+			>> 2.8
+		@endcode
+	*/
+	proto static float Min(float x, float y);
+	
+	/**
+	\brief Returns bigger of two given values
+		\param x \p float Value
+		\param y \p float Value
+		\return \p float  - max value
+		@code
+			Print( Math.Max(5.3, 2.8) );
+
+			>> 5.3
+		@endcode
+	*/
+	proto static float Max(float x, float y);	
+	
+	/**
+	\brief Returns if value is between min and max (inclusive)
+		\param v \p float Value
+		\param min \p float Minimum value
+		\param max \p float Maximum value
+		\return \p bool  - if value is within range [min,max]
+		@code
+			Print( Math.IsInRange(6.9, 3.6, 9.3) );
+
+			>> true
+		@endcode
+	*/
+	proto static bool IsInRange(float v, float min, float max);
+	
+	/**
+	\brief Returns if value is between min and max (inclusive)
+		\param v \p int Value
+		\param min \p int Minimum value
+		\param max \p int Maximum value
+		\return \p bool  - if value is within range [min,max]
+		@code
+			Print( Math.IsInRangeInt(6, 3, 9) );
+
+			>> true
+		@endcode
+	*/
+	proto static bool IsInRangeInt(int v, int min, int max);
+	
+	/**
+	\brief Linearly interpolates between 'a' and 'b' given 'time'.
+		\param a \p float Start
+		\param b \p float End
+		\param time \p float Time [value needs to be between 0..1 for correct results, no auto clamp applied]
+		\return \p float - The interpolated result between the two float values. 
+		@code
+			Print( Math.Lerp(3, 7, 0.5) );
+	
+			>> 5
+		@endcode
+	*/ 
+	proto static float Lerp(float a, float b, float time);
+
+	/**
+	\brief Calculates the linear value that produces the interpolant value within the range [a, b], it's an inverse of Lerp.
+		\param a \p float Start
+		\param b \p float End
+		\param value \p float value
+		\return \p float - the time given the position between 'a' and 'b' given 'value', there is no clamp on 'value', to stay between [0..1] use 'value' between 'a' and 'b'
+		@code
+			Print( Math.InverseLerp(3, 7, 5) );
+	
+			>> 0.5
+		@endcode
+	*/
+	proto static float InverseLerp(float a, float b, float value);
+	
+	/**
+	\brief Returns area of a right triangle
+		\param s \p float Length of adjacent leg
+		\param a \p float Angle of corner bordering adjacent which is not the right corner (in radians)
+		\return \p float - Area
+	*/
+	proto static float AreaOfRightTriangle(float s, float a);
+	
+	/**
+	\brief Returns hypotenus of a right triangle
+		\param s \p float Length of adjacent leg
+		\param a \p float Angle of corner bordering adjacent which is not the right corner (in radians)
+		\return \p float - hypotenus
+	*/
+	proto static float HypotenuseOfRightTriangle(float s, float a);
+	
+	/**
+	\brief Returns if point is inside circle
+		\param c \p vector Center of circle ([0] and [2] will be used, as a circle is 2D)
+		\param r \p float Radius of circle
+		\param p \p vector Point ([0] and [2] will be used, as a circle is 2D)
+		\return \p bool - True when point is in circle
+	*/
+	proto static bool IsPointInCircle(vector c, float r, vector p);
+	
+	/**
+	\brief Returns if point is inside rectangle
+		\param mi \p vector Minimums of rectangle ([0] and [2] will be used, as a rectangle is 2D)
+		\param ma \p vector Maximums of rectangle ([0] and [2] will be used, as a rectangle is 2D)
+		\param p \p vector Point ([0] and [2] will be used, as a rectangle is 2D)
+		\return \p bool - True when point is in rectangle
+	*/
+	proto static bool IsPointInRectangle(vector mi, vector ma, vector p);
+	
+	//--------------------------------------------------------------------------
+	//-------------------------------- filters ---------------------------------
+	//--------------------------------------------------------------------------
+
+	/**
+	\brief Does the CD smoothing function - easy in | easy out / S shaped smoothing 
+		\param val \p actual value 
+		\param target \p value we are reaching for -> Target
+		\param velocity \p float[1] - array of ONE member - some kind of memory and actual accel/decel rate, need to be zeroed when filter is about to be reset
+		\param smoothTime \p smoothing parameter, 0.1 .. 0.4 are resonable values, 0.1 is sharp, 0.4 is very smooth
+		\param maxVelocity \p maximal value change when multiplied by dt
+		\param dt \p delta time 
+
+		\return \p float smoothed/filtered value 
+
+		@code
+			val = EnfMath.SmoothCD(val, varTarget, valVelocity, 0.3, 1000, dt);
+		@endcode
+	*/
+
+	proto static float SmoothCD(float val, float target, inout float velocity[], float smoothTime, float maxVelocity, float dt);
+	
+	//! occurences values above '12' will cause Factorial to overflow int.
+	static float Poisson(float mean, int occurences)
+	{
+		return Pow(mean, occurences) * Pow(EULER,-mean) / Factorial(occurences);
+	}
+	
+	//! values above '12' will cause int overflow
+	static int Factorial(int val)
+	{
+		if (val > 12)
+		{
+			ErrorEx("Values above '12' cause int overflow! Returning '1'");
+			return 1;
+		}
+		
+		int res = 1;
+		while (val > 1)
+		{
+			res *= val--;
+		}
+		return res;
+	}
+};
+
+//@}
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/proto/EnMath3D.c b/scripts/1_Core/DayZ/proto/EnMath3D.c
new file mode 100644
index 0000000000000000000000000000000000000000..61ece3c65c9360ed8bf2ad67065621dbbe1fea65
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnMath3D.c
@@ -0,0 +1,474 @@
+/**
+ * \defgroup Math3DAPI Math3D library
+ * @{
+ */
+
+/**
+\brief Vector constructor from components
+    \param x \p float x component
+	\param y \p float y component
+	\param z \p float z component
+	\return \p vector resulting vector
+	@code
+		Print( Vector(1, 2, 3) );
+
+		>> <1,2,3>
+	@endcode
+*/
+proto native vector Vector(float x, float y, float z);
+
+enum ECurveType
+{
+	CatmullRom,
+	NaturalCubic,
+	UniformCubic
+};
+
+class Math3D
+{
+	private void Math3D() {}
+	private void ~Math3D() {}
+	
+	//-----------------------------------------------------------------
+	proto static vector ClipLine(vector start, vector end, vector norm, float d);
+
+	/**
+	\brief Tests whether ray is intersecting sphere.
+		\param raybase \p vector Start of ray
+		\param raycos \p vector End of ray
+		\param center \p vector Center of sphere
+		\param radius \p float Radius of sphere
+		\return \p float -1 when not intersecting, else the fraction of ray
+	*/
+	proto static float IntersectRaySphere(vector raybase, vector raycos, vector center, float radius);
+	
+	/**
+	\brief Tests whether ray is intersecting axis aligned box.
+		\param start \p vector Start of ray
+		\param end \p vector End of ray
+		\param mins \p vector Minimums of bound box
+		\param maxs \p vector Maximums of bound box
+		\return \p float -1 when not intersecting, else the fraction of ray
+	*/
+	proto static float IntersectRayBox(vector start, vector end, vector mins, vector maxs);
+	
+	/**
+	\brief Tests whether sphere is intersecting axis aligned box.
+		\param origin \p vector Origin of sphere
+		\param radius \p float Radius of sphere
+		\param mins \p vector Minimums of bound box
+		\param maxs \p vector Maximums of bound box
+		\return \p bool True when intersects
+	*/
+	proto static bool IntersectSphereBox(vector origin, float radius, vector mins, vector maxs);
+	
+	/**
+	\brief Tests whether sphere is intersecting cone.
+		\param origin \p vector Origin of sphere
+		\param radius \p float Radius of sphere
+		\param conepos \p vector Position of top of cone
+		\param axis \p vector Orientation of cone in direction from top to bottom
+		\param angle \p float Angle of cone in radians
+		\return \p bool True when sphere is intersecting cone
+	*/
+	proto static bool IntersectSphereCone(vector origin, float radius, vector conepos, vector axis, float angle);
+	
+	/**
+	\brief Tests whether sphere is fully inside cone.
+		\param origin \p vector Origin of sphere
+		\param radius \p float Radius of sphere
+		\param conepos \p vector Position of top of cone
+		\param axis \p vector Orientation of cone in direction from top to bottom
+		\param angle \p float Angle of cone in radians
+		\return \p bool True when sphere is fully inside cone
+	*/
+	proto static bool IntersectWholeSphereCone(vector origin, float radius, vector conepos, vector axis, float angle);
+	
+	/**
+	\brief Tests whether cylinder is intersecting oriented box.
+		\param mins \p vector Minimums of bound box
+		\param maxs \p vector Maximums of bound box
+		\param obbMat \p vector Transform of box
+		\param cylMat \p vector Transform of cylinder
+		\param cylinderRadius \p float Radius of cylinder
+		\param cylinderHeight \p float Height of cylinder
+		\return \p bool True when cylinder is intersecting oriented box
+	*/
+	proto static bool IntersectCylinderOBB(vector mins, vector maxs, vector obbMat[4], vector cylMat[4], float cylinderRadius, float cylinderHeight);
+	
+	/**
+	\brief Tests whether ray is intersecting cylinder.
+		\param rayStart \p vector Start of ray
+		\param rayEnd \p vector End of ray
+		\param center \p vector Center of cylinder
+		\param radius \p float Radius of cylinder
+		\param height \p float Height of cylinder
+		\return \p bool True when ray is intersecting cylinder
+	*/
+	proto static bool IntersectRayCylinder(vector rayStart, vector rayEnd, vector center, float radius, float height);
+	
+	/**
+	\brief Creates rotation matrix from angles
+		\param ang \p vector which contains angles
+		\param[out] mat \p vector created rotation matrix
+		@code
+			vector mat[3];
+			YawPitchRollMatrix( "70 15 45", mat );
+			Print( mat );
+
+			>> <0.330366,0.0885213,-0.939693>,<0.458809,0.854988,0.241845>,<0.824835,-0.511037,0.241845>
+		@endcode
+	*/
+	proto static void YawPitchRollMatrix(vector ang, out vector mat[3]);
+
+	/**
+	\brief Creates rotation matrix from direction and up vector
+		\param dir \p vector direction vector
+		\param up \p vector up vector
+		\param[out] mat \p vector[4] created rotation matrix
+		@code
+			vector mat[4];
+			vector dir = "1 0 1";
+			vector up = "0 1 0";
+			DirectionAndUpMatrix( dir, up, mat );
+			Print( mat );
+
+			>> <0.707107,0,-0.707107>,<0,1,0>,<0.707107,0,0.707107>,<0,0,0>
+		@endcode
+	*/
+	proto static void DirectionAndUpMatrix(vector dir, vector up, out vector mat[4]);
+
+	/**
+	\brief Transforms matrix
+		\param mat0 \p vector[4] first matrix
+		\param mat1 \p vector[4] second matrix
+		\param[out] res \p vector[4] result of first and second matrix multiplication
+		@code
+			vector mat0[4] = { "2 0 0 0", "0 3 0 0", "0 1 0 0", "0 0 0 1" }; // scale matrix
+			vector mat1[4] = { "1 0 0 0", "0 1 0 0", "0 1 0 0", "2 4 1 3" }; // translation matrix
+			vector res[4];
+			Math3D.MatrixMultiply4(mat0, mat1, res)
+			Print( res );
+
+			>> <2,0,0>,<0,3,0>,<0,3,0>,<4,13,0>
+		@endcode
+	*/
+	proto static void MatrixMultiply4(vector mat0[4], vector mat1[4], out vector res[4]);
+
+	/**
+	\brief Transforms rotation matrix
+		\param mat0 \p vector[3] first matrix
+		\param mat1 \p vector[3] second matrix
+		\param[out] res \p vector[3] result of first and second matrix multiplication
+		@code
+			vector mat0[3] = { "1.5 2.5 0", "0.1 1.3 0", "0 0 1" }; // rotation matrix
+			vector mat1[3] = { "1 0.4 0", "0 1 0", "0 1.3 2.7" }; // rotation matrix
+			vector res[3];
+			Math3D.MatrixMultiply3(mat0, mat1, res)
+			Print( res );
+
+			>> <1.54,3.02,0>,<0.1,1.3,0>,<0.13,1.69,2.7>
+		@endcode
+	*/
+	proto static void MatrixMultiply3(vector mat0[3], vector mat1[3], out vector res[3]);
+
+	/**
+	\brief Invert-transforms matrix
+		\param mat0 \p vector[4] first matrix
+		\param mat1 \p vector[4] second matrix
+		\param[out] res \p vector[4] inverse result of first and second matrix multiplication
+		@code
+			vector mat0[4] = { "2 0 0", "0 3 0", "0 0 1", "0 0 0" }; // scale matrix
+			vector mat1[4] = { "1 0 0", "0 1 0", "0 0 1", "2 4 1" }; // translation matrix
+			vector res[4];
+			Math3D.MatrixInvMultiply4(mat0, mat1, res)
+			Print( res );
+
+			>> <2,0,0>,<0,3,1>,<0,3,1>,<4,12,4>
+		@endcode
+	*/
+	proto static void MatrixInvMultiply4(vector mat0[4], vector mat1[4], out vector res[4]);
+
+	/**
+	\brief Invert-transforms rotation matrix
+		\param mat0 \p vector[3] first matrix
+		\param mat1 \p vector[3] second matrix
+		\param[out] res \p vector[3] result of first and second matrix multiplication
+		@code
+			vector mat0[3] = { "1.5 2.5 0", "0.1 1.3 0", "0 0 1" }; // rotation matrix
+			vector mat1[3] = { "1 0.4 0", "0 1 0", "0 1.3 2.7" }; // rotation matrix
+			vector res[3];
+			Math3D.MatrixInvMultiply3(mat0, mat1, res)
+			Print( res );
+
+			>> <2.5,0.62,0>,<2.5,1.3,0>,<3.25,1.69,2.7>
+		@endcode
+	*/
+	proto static void MatrixInvMultiply3(vector mat0[3], vector mat1[3], out vector res[3]);
+
+	/**
+	\brief Orthogonalizes matrix
+	    \param[it] mat \p matrix which should be orthogonalized
+	*/
+	proto static void MatrixOrthogonalize4(vector mat[4]);
+	
+	/**
+	\brief Orthogonalizes matrix
+	    \param[it] mat \p matrix which should be orthogonalized
+	*/
+	proto static void MatrixOrthogonalize3(vector mat[3]);
+	
+	/**
+	\brief Creates identity matrix
+	    \param[out] mat \p created identity matrix
+		@code
+	        vector mat[4];
+	    	Math3D.MatrixIdentity4( mat );
+	    	Print( mat );
+
+			>> <1,0,0>,<0,1,0>,<0,0,1>,<0,0,0>
+		@endcode
+	*/
+	
+	static void MatrixIdentity4(out vector mat[4])
+	{
+		mat[0] = "1 0 0";
+		mat[1] = "0 1 0";
+		mat[2] = "0 0 1";
+		mat[3] = vector.Zero;
+	}
+	
+	/**
+	\brief Creates identity matrix
+	    \param[out] mat \p created identity matrix
+		@code
+	        vector mat[3];
+	    	Math3D.MatrixIdentity3( mat );
+	    	Print( mat );
+
+			>> <1,0,0>,<0,1,0>,<0,0,1>
+		@endcode
+	*/
+	static void MatrixIdentity3(out vector mat[3])
+	{
+		mat[0] = "1 0 0";
+		mat[1] = "0 1 0";
+		mat[2] = "0 0 1";
+	}
+
+	/**
+	\brief Creates scale matrix
+	    \param scale \p scale coeficient
+	    \param[out] mat \p created scale matrix
+		@code
+	        vector mat[3];
+	    	Math3D.ScaleMatrix( 2.5, mat );
+	    	Print( mat );
+
+			>> <2.5,0,0>,<0,2.5,0>,<0,0,2.5>
+		@endcode
+	*/
+	static void ScaleMatrix(float scale, out vector mat[3])
+	{
+		vector v0, v1, v2;
+		v0[0] = scale;
+		v1[1] = scale;
+		v2[2] = scale;
+		mat[0] = v0;
+		mat[1] = v1;
+		mat[2] = v2;
+	}
+
+	/**
+	\brief Creates identity quaternion
+		\param[out] q \p float[4] created identity quaternion
+		@code
+			float q[4];
+			Math3D.QuatIdentity( q );
+			Print( q );
+
+			>> {0,0,0,1}
+		@endcode
+	*/
+	static void QuatIdentity(out float q[4])
+	{
+		q[0] = 0;
+		q[1] = 0;
+		q[2] = 0;
+		q[3] = 1;
+	}
+
+	/**
+	\brief Copies quaternion
+	    \param s \p float[4] quaternion to copy
+		\param[out] d \p float[4] created quaternion copy
+		@code
+			float s[4] = { 2, 3, 4, 1 };
+			float d[4];
+			Math3D.QuatCopy( s, d );
+			Print( d );
+
+			>> {2,3,4,1}
+		@endcode
+	*/
+	static void QuatCopy(float s[4], out float d[4])
+	{
+		d[0] = s[0];
+		d[1] = s[1];
+		d[2] = s[2];
+		d[3] = s[3];
+	}
+
+	/**
+	\brief Converts rotation matrix to quaternion
+	    \param mat \p vector[3] rotation matrix
+		\param[out] d \p float[4] created quaternion copy
+		@code
+			vector mat[3];
+			vector rot = "70 15 45";
+			rot.RotationMatrixFromAngles( mat );
+			float d[4];
+			Math3D.MatrixToQuat( mat, d );
+			Print( d );
+
+			>> {0.241626,0.566299,-0.118838,0.778973}
+		@endcode
+	*/
+	proto static void MatrixToQuat(vector mat[3], out float d[4]);
+
+	
+	//! Converts quaternion to rotation matrix
+	proto static void QuatToMatrix(float q[4], out vector mat[3]);
+
+	/**
+	\brief Returns angles of rotation matrix
+		\param mat \p vector[3] rotation matrix
+		\return \p vector roll, pitch, yaw angles
+		@code
+			vector mat[3];
+			Math3D.RollPitchYawMatrix( "70 15 45", mat );
+			vector ang = Math3D.MatrixToAngles( mat );
+			Print( ang );
+
+			>> <70,15,-45>
+		@endcode
+	*/
+	proto static vector MatrixToAngles(vector mat[3]);
+	
+	/**
+	\brief Linear interpolation between q1 and q2 with weight 'frac' (0...1)
+	    \param[out] qout \p float[4] result quaternion
+		\param q1 \p float[4] first quaternion
+		\param q2 \p float[4] second quaternion
+		\param frac \p float interpolation weight
+		@code
+			float q1[4] = { 1, 1, 1, 1 };
+			float q2[4] = { 2, 2, 2, 1 };
+			float qout[4];
+			Math3D.QuatLerp( qout, q1, q2, 0.5 );
+			Print( qout );
+
+			>> {1.5,1.5,1.5,1}
+		@endcode
+	*/
+	proto static void QuatLerp(out float qout[4], float q1[4], float q2[4], float frac);
+
+	/**
+	\brief Multiplies quaternions
+	    \param[out] qout \p float[4] result quaternion
+		\param q1 \p float[4] first quaternion
+		\param q2 \p float[4] second quaternion
+		@code
+			float q1[4] = { 1, 2, 3, 1 };
+			float q2[4] = { 2, 2, 2, 1 };
+			float qout[4];
+			Math3D.QuatMultiply( qout, q1, q2 );
+			Print( qout );
+
+			>> {2,4,6,1}
+		@endcode
+	*/
+	proto static void QuatMultiply(out float qout[4], float q1[4], float q2[4]);
+
+	//! Returns Angles vector from quaternion
+	proto static vector QuatToAngles(float q[4]);
+	
+	/**
+	\brief Returns 1, when bounding boxes intersects
+	    \param mins1 \p vector minimum point of first bounding box
+		\param maxs1 \p vector maximum point of first bounding box
+		\param mins2 \p vector minimum point of second bounding box
+		\param maxs2 \p vector maximum point of second bounding box
+		\return \p int 1 if boundig boxes intersects, otherwise 0
+		@code
+			vector mins1 = "1 1 1";
+			vector maxs1 = "3 3 3";
+			vector mins2 = "2 2 2";
+			vector maxs2 = "4 4 4";
+			Print( Math3D.CheckBoundBox(mins1, maxs1, mins2, maxs2) );
+
+			>> 1
+		@endcode
+	*/
+	proto static int CheckBoundBox(vector mins1, vector maxs1, vector mins2, vector maxs2);
+	
+	/**
+	\brief Returns randon normalized direction
+	    \return \p vector 
+		@code
+			Print( Math3D.GetRandomDir() );
+
+			>>vector ret =  0x0000000007c1a1c0 {<0.422565,0,-0.906333>}
+		@endcode
+	*/
+	static vector GetRandomDir()
+	{
+		float x = Math.RandomFloatInclusive(-1, 1);
+		float y = Math.RandomFloatInclusive(-1, 1);
+		float z = Math.RandomFloatInclusive(-1, 1);
+			
+		return Vector(x, y, z).Normalized();
+	}
+	
+	
+	/**
+	\brief Computes curve
+		\return \p vector 
+		@code
+			auto points = new array<vector>();
+			points.Insert( Vector( 0, 0, 0) );
+	    	points.Insert( Vector( 5, 0, 0) );
+	    	points.Insert( Vector( 8, 3, 0) );
+	    	points.Insert( Vector( 6, 1, 0) );
+		
+			float t = 0.5;
+			vector result = Math3D.Curve(ECurveType.CatmullRom, t, points);
+		@endcode
+	*/
+	proto static native vector Curve(ECurveType type, float param, notnull array<vector> points);
+	
+	
+	/**
+	\brief Point on line beg .. end nearest to pos
+		\return \p vector
+	*/
+	proto static vector NearestPoint(vector beg, vector end, vector pos);
+	
+	/**
+	\brief Angle that a target is from the direction of an origin
+		\return \p float Angle in radians
+	*/
+	proto static float AngleFromPosition(vector origin, vector originDir, vector target);
+	
+	/**
+	\brief Calculates the points of a right 2D cone in 3D space
+		\param origin \p vector Origin of cone
+		\param length \p float Length of the cone
+		\param halfAngle \p float Half of the angle of the cone in radians
+		\param angleOffset \p float Angle offset of the cone in radians (handy for rotating it along with something in the world)
+		\param[out] leftPoint \p vector Left point of the cone
+		\param[out] rightPoint \p vector Right point of the cone
+	*/
+	proto static void ConePoints(vector origin, float length, float halfAngle, float angleOffset, out vector leftPoint, out vector rightPoint);
+};
+//@}
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/proto/EnPhysics.c b/scripts/1_Core/DayZ/proto/EnPhysics.c
new file mode 100644
index 0000000000000000000000000000000000000000..9368a4f8f44802c83ec209aa283f4e2cbf50b532
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnPhysics.c
@@ -0,0 +1,327 @@
+/**
+ * \defgroup Physics Physics system
+ * @{
+ */
+
+typedef int[] dGeom;
+typedef int[] dJoint;
+typedef int[] dBlock;
+
+proto native int dGetNumDynamicBodies(notnull IEntity worldEnt);
+proto native IEntity dGetDynamicBody(notnull IEntity worldEnt, int index);
+proto native void dSetInteractionLayer(notnull IEntity worldEntity, int mask1, int mask2, bool enable);
+proto native bool dGetInteractionLayer(notnull IEntity worldEntity, int mask1, int mask2);
+
+//!Gets global gravity
+proto native vector dGetGravity(notnull IEntity worldEntity);
+//!Changes global gravity
+proto native void dSetGravity(notnull IEntity worldEntity, vector g);
+//!Changes fixed time-slice. Default is 1/40, thus simulation runs on 40fps. With smaller values, there is more precise simulation
+proto native void dSetTimeSlice(notnull IEntity worldEntity, float timeSlice);
+
+/**
+ * \defgroup RigidBody RigidBody API
+ * @{
+ */
+
+//proto native int dMaterialClone(string target, string source, int material_index)
+//proto native int dMaterialGetType(string source)
+//proto native int dMaterialSetType(string source, int material_index)
+
+class PhysicsGeomDef: Managed
+{
+	string	Name;
+	dGeom		Geometry;
+	vector	Frame[4] = {Vector(1, 0, 0), Vector(0, 1, 0), Vector(0, 0, 1), Vector(0, 0, 0)};
+	int			ParentNode = -1;
+	string	MaterialName;
+	int			LayerMask; //<Bit mask of layers we are in
+
+	
+	void PhysicsGeomDef(string name, dGeom geom, string materialName, int layerMask)
+	{
+		Name = name;
+		Geometry = geom;
+		MaterialName = materialName;
+		LayerMask = layerMask;	
+	}	
+};
+
+/*!
+Creates RigidBody from custom made geometries. The geometries are deleted when rigid body is destroyed
+\param geoms array of custom made geometries
+@code
+	autoptr PhysicsGeomDef geoms[] = {PhysicsGeomDef("", dGeomCreateBox(size), "material/default", 0xffffffff)};
+	dBodyCreateStaticEx(this, geoms);
+@endcode
+*/
+proto bool dBodyCreateStaticEx(notnull IEntity ent, PhysicsGeomDef geoms[]);
+proto bool dBodyCreateGhostEx(notnull IEntity ent, PhysicsGeomDef geoms[]);
+
+/*!
+Creates RigidBody from custom made geometries. The geometries are deleted when rigid body is destroyed
+\param centerOfMass Offset from object-pivot to center of mass
+\param mass Body mass
+\param geoms array of custom made geometries
+@code
+	autoptr PhysicsGeomDef geoms[] = {PhysicsGeomDef("", dGeomCreateBox(size), "material/default", 0xffffffff)};
+	dBodyCreateDynamicEx(this, center, 1.0, geoms);
+@endcode
+*/
+proto bool dBodyCreateDynamicEx(notnull IEntity ent, vector centerOfMass, float mass, PhysicsGeomDef geoms[]);
+
+//!Destroys attached physics body
+proto native void dBodyDestroy(notnull IEntity ent);
+
+//!Has the entity attached physics body?
+proto native bool dBodyIsSet(notnull IEntity ent);
+
+proto native void dBodySetInteractionLayer(notnull IEntity ent, int mask);
+proto native int dBodyGetInteractionLayer(notnull IEntity ent);
+proto native void dBodySetGeomInteractionLayer(notnull IEntity ent, int index, int mask);
+proto native int dBodyGetGeomInteractionLayer(notnull IEntity ent, int index);
+
+//! state of a rigidbody
+enum ActiveState
+{
+	ACTIVE,
+	INACTIVE,
+	ALWAYS_ACTIVE
+};
+	
+proto native void dBodyActive(notnull IEntity ent, ActiveState activeState);
+proto native void dBodyDynamic(notnull IEntity ent, bool dynamic);
+proto native bool dBodyIsDynamic(notnull IEntity ent);
+
+proto native bool dBodyIsActive(notnull IEntity ent);
+proto native bool dBodyEnableGravity(notnull IEntity ent, bool enable);
+proto native void dBodySetDamping(notnull IEntity ent, float linearDamping, float angularDamping);
+proto native void dBodySetSleepingTreshold(notnull IEntity body, float linearTreshold, float angularTreshold);
+
+proto native bool dBodyIsSolid(notnull IEntity ent);
+proto native void dBodySetSolid(notnull IEntity ent, bool solid);
+
+/*!
+If both maxMotion and shapeCastRadius is >=0 then the continuous collision detection is enabled.
+If you want to disable it, use -1
+\param maxMotion max motion threshold when sphere-cast is performed, to find time of impact. It should be
+little bit less than size of the geometry to catch the situation when tunelling can happen
+\param sphereCastRadius The radius of the largest possible sphere, that is completelly inside the body geometry.
+*/
+proto native void dBodyEnableCCD(notnull IEntity body, float maxMotion, float sphereCastRadius);
+/*!
+Sets scale factor for all impulses/velocities/forces. Default is <1,1,1>. Zero any axis if you want to do 2D physics
+*/
+proto native void dBodySetLinearFactor(notnull IEntity body, vector linearFactor);
+
+//!returns center of mass offset
+proto native vector dBodyGetCenterOfMass(notnull IEntity body);
+
+/**
+\brief Returns linear velocity
+	\param ent \p IEntity entity which origin will be set
+	\param mat \p vector[4] matrix to be set
+	\return \p vector linear velocity
+	@code
+		Man player = g_Game.GetPlayer();
+		Print( GetVelocity(player) );
+
+		>> <0,0,0>
+	@endcode
+*/
+proto native vector GetVelocity(notnull IEntity ent);
+
+/**
+\brief Sets linear velocity (for Rigid bodies)
+	\param ent \p entity which velocity will be set
+	\param vel \p velocity vector to be set
+*/
+proto native void SetVelocity(notnull IEntity ent, vector vel);
+
+/**
+\brief Disables collisions between two entities
+*/
+proto native dBlock dBodyCollisionBlock(notnull IEntity ent1, notnull IEntity ent2);
+proto native void dBodyRemoveBlock(notnull IEntity worldEntity, dBlock block);
+
+proto native void dBodySetInertiaTensorV(notnull IEntity body, vector v);
+proto native void dBodySetInertiaTensorM(notnull IEntity body, vector m[3]);
+
+proto native float dBodyGetMass(notnull IEntity ent);
+proto native void dBodySetMass(notnull IEntity body, float mass);
+
+proto native void dBodyApplyTorqueImpulse(notnull IEntity ent, vector torqueImpulse);
+proto native vector dBodyGetInvInertiaDiagLocal(notnull IEntity ent);
+proto native float dBodyComputeImpulseDenominator(notnull IEntity ent, vector position, vector normal);
+proto native float dBodyComputeAngularImpulseDenominator(notnull IEntity ent, vector axis);
+proto native vector dBodyGetLocalInertia(notnull IEntity ent);
+
+proto void dBodyGetInvInertiaTensorWorld(notnull IEntity body, out vector inertiaTensorWS[3]);
+
+/**
+\brief Applies impuls on a pos position in world coordinates
+*/
+proto void dBodyApplyImpulseAt(notnull IEntity body, vector impulse, vector pos);
+
+/**
+\brief Applies impuls on a rigidbody (origin)
+*/
+proto void dBodyApplyImpulse(notnull IEntity body, vector impulse);
+
+/**
+\brief Applies constant force on a rigidbody (origin)
+*/
+proto void dBodyApplyForce(notnull IEntity body, vector force);
+
+/**
+\brief Applies constant force on a position
+*/
+proto void dBodyApplyForceAt(notnull IEntity body, vector pos, vector force);
+
+proto native void dBodyApplyTorque(notnull IEntity body, vector torque);
+
+/**
+\brief Gets angular velocity for a rigidbody
+*/
+proto vector dBodyGetAngularVelocity(notnull IEntity body);
+
+/**
+\brief Changed an angular velocity
+	\param body \p Rigid body
+	\param angvel \p Angular velocity, rotation around x, y and z axis (not yaw/pitch/roll)
+*/
+proto void dBodySetAngularVelocity(notnull IEntity body, vector angvel);
+
+/**
+\brief Sets target transformation. If timeslice == dt (simulation step delta time), it will happen in next step, otherwise in time = timeslice
+*/
+proto native void dBodySetTargetMatrix(notnull IEntity body, vector matrix[4], float timeslice);
+proto native float dBodyGetKineticEnergy(notnull IEntity body);
+
+proto native vector dBodyGetVelocityAt(notnull IEntity body, vector globalpos);
+//@}
+
+/**
+ * \defgroup Geometry Geometry API definition
+ * @{
+ */
+
+//! Creates box geometry
+proto native dGeom dGeomCreateBox(vector size);
+
+//! Creates sphere geometry
+proto native dGeom dGeomCreateSphere(float radius);
+
+//! Creates capsule geometry
+proto native dGeom dGeomCreateCapsule(float radius, vector extent);
+
+//! Creates cylinder geometry
+proto native dGeom dGeomCreateCylinder(float radius, vector extent);
+
+//! Destroys geometry
+proto native void dGeomDestroy(dGeom geom);
+
+//proto native int dBodyAddGeom(notnull IEntity body, dGeom geom, vector frame[4], string material, int interactionLayer);
+// find a geometry by its name and returns its index or -1 if the geometry wasn't found
+proto native int dBodyGetGeom(notnull IEntity ent, string name);
+// returns number of geometries of the entity
+proto native int dBodyGetNumGeoms(notnull IEntity ent);
+//@}
+
+/**
+ * \defgroup Constraints Constraints API definition
+ * @{
+ */
+
+proto native dJoint dJointCreateHinge(notnull IEntity ent1, notnull IEntity ent2, vector point1, vector axis1, vector point2, vector axis2, bool block, float breakThreshold);
+proto native dJoint dJointCreateHinge2(notnull IEntity ent1, notnull IEntity ent2, vector matrix1[4], vector matrix2[4], bool block, float breakThreshold);
+proto native dJoint dJointCreateSlider(notnull IEntity ent1, notnull IEntity ent2, vector matrix1[4], vector matrix2[4], bool block, float breakThreshold);
+proto native dJoint dJointCreateBallSocket(notnull IEntity ent1, notnull IEntity ent2, vector point1, vector point2, bool block, float breakThreshold);
+proto native dJoint dJointCreateFixed(notnull IEntity ent1, notnull IEntity ent2, vector point1, vector point2, bool block, float breakThreshold);
+proto native dJoint dJointCreateConeTwist(notnull IEntity ent1, notnull IEntity ent2, vector matrix1[4], vector matrix2[4], bool block, float breakThreshold);
+proto native dJoint dJointCreate6DOF(notnull IEntity ent1, notnull IEntity ent2, vector matrix1[4], vector matrix2[4], bool block, float breakThreshold);
+proto native dJoint dJointCreate6DOFSpring(notnull IEntity ent1, notnull IEntity ent2, vector matrix1[4], vector matrix2[4], bool block, float breakThreshold);
+proto native void dJointDestroy(dJoint joint);
+
+//only hinge joint
+proto native void dJointHingeSetLimits(dJoint joint, float low, float high, float softness, float biasFactor, float relaxationFactor);
+proto native void dJointHingeSetAxis(dJoint joint, vector axis);
+proto native void dJointHingeSetMotorTargetAngle(dJoint joint, float angle, float dt, float maxImpulse);
+
+//only cone-twist joint
+proto native void dJointConeTwistSetAngularOnly(dJoint joint, bool angularOnly);
+// setLimit(), a few notes:
+// _softness:
+//		0->1, recommend ~0.8->1.
+//		describes % of limits where movement is free.
+//		beyond this softness %, the limit is gradually enforced until the "hard" (1.0) limit is reached.
+// _biasFactor:
+//		0->1?, recommend 0.3 +/-0.3 or so.
+//		strength with which constraint resists zeroth order (angular, not angular velocity) limit violation.
+// __relaxationFactor:
+//		0->1, recommend to stay near 1.
+//		the lower the value, the less the constraint will fight velocities which violate the angular limits.
+proto native void dJointConeTwistSetLimit(dJoint joint, int limitIndex, float limitValue);
+proto native void dJointConeTwistSetLimits(dJoint joint, float _swingSpan1, float _swingSpan2, float _twistSpan, float _softness, float _biasFactor, float _relaxationFactor);
+
+//only 6DOF & 6DOFSpring.
+/*!
+    - free means upper < lower,
+    - locked means upper == lower
+    - limited means upper > lower
+    - axis: first 3 are linear, next 3 are angular
+*/
+proto native void	dJoint6DOFSetLinearLimits(dJoint joint, vector linearLower, vector linearUpper);
+proto native void	dJoint6DOFSetAngularLimits(dJoint joint, vector angularLower, vector angularUpper);
+proto native void dJoint6DOFSetLimit(dJoint joint, int axis, float lo, float hi);
+
+//when stiffness == -1 && damping == -1, spring is disabled
+proto native void dJoint6DOFSpringSetSpring(dJoint joint, int axis, float stiffness, float damping);
+
+//only slider joint
+proto native void dJointSliderSetLinearLimits(dJoint joint, float lowerLimit, float upperLimit);
+proto native void dJointSliderSetAngularLimits(dJoint joint, float lowerLimit, float upperLimit);
+proto native void dJointSliderSetDirLinear(dJoint joint, float softness, float restitution, float damping);
+proto native void dJointSliderSetDirAngular(dJoint joint, float softness, float restitution, float damping);
+proto native void dJointSliderSetLimLinear(dJoint joint, float softness, float restitution, float damping);
+proto native void dJointSliderSetLimAngular(dJoint joint, float softness, float restitution, float damping);
+proto native void dJointSliderSetOrthoLinear(dJoint joint, float softness, float restitution, float damping);
+proto native void dJointSliderSetOrthoAngular(dJoint joint, float softness, float restitution, float damping);
+//if force == 0, motor is off
+proto native void dJointSliderSetLinearMotor(dJoint joint, float velocity, float force);
+proto native void dJointSliderSetAngularMotor(dJoint joint, float velocity, float force);
+proto native float dJointSliderGetLinearPos(dJoint joint);
+proto native float dJointSliderGetAngularPos(dJoint joint);
+//@}
+
+//-----------------------------------------------------------------
+typedef int[] dMaterial;
+
+class Contact
+{
+	private void Contact() {}
+	private void ~Contact() {}
+	
+	dMaterial	Material1;
+	dMaterial	Material2;
+	int			MaterialIndex1;
+	int			MaterialIndex2;
+	int			Index1;
+	int			Index2;
+
+	float		PenetrationDepth;
+
+	float		Impulse;
+	float		RelativeNormalVelocityBefore;
+	float		RelativeNormalVelocityAfter;
+
+	vector		Normal;
+	vector		Position;
+	vector		RelativeVelocityBefore;
+	vector		RelativeVelocityAfter;
+
+	proto native vector GetNormalImpulse();
+	proto native float GetRelativeVelocityBefore(vector vel);
+	proto native float GetRelativeVelocityAfter(vector vel);
+};
+//@}
diff --git a/scripts/1_Core/DayZ/proto/EnProfiler.c b/scripts/1_Core/DayZ/proto/EnProfiler.c
new file mode 100644
index 0000000000000000000000000000000000000000..ac4b778733601e56d9c36609eed0d210b553da4e
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnProfiler.c
@@ -0,0 +1,762 @@
+/**
+ * \defgroup Profiler Enforce Script profiling API
+ *	\warning Only available on developer and diag builds
+ * @{
+ */
+
+//! Flags that influences the behaviour of the EnProfiler API, applied through ...Flags functions
+enum EnProfilerFlags
+{
+	//! No flags
+	NONE,
+	//! When present, will reset [PD] on sorting, otherwise will accumulate on top of it
+	RESET,
+	//! Whether to profile child modules
+	RECURSIVE,
+	//! All flags enabled
+	ALL
+};
+
+//! Current base scripted modules 
+enum EnProfilerModule
+{
+	//! 1_Core
+	CORE,
+	//! 2_GameLib
+	GAMELIB,
+	//! 3_Game
+	GAME,
+	//! 4_World
+	WORLD,
+	//! 5_Mission
+	MISSION,
+	//! init.c
+	MISSION_CUSTOM,
+	//! Can be returned from some methods
+	ERROR,
+};
+
+/**
+*\brief There are 3 states which can be toggled that governs whether script profiling is enabled or not
+*	\note The reason for this is because when it is enabled in debug menu, or through this API without 'immediate', it will only be enabled the next frame
+*/
+enum EnProfilerEnabledFlags
+{
+	//! No flags, has value 0, so will count as false in conditions
+	NONE,
+	//! Script profiling UI is enabled in WIN+ALT debug menu, when this is true, it will override SCRP
+	DIAG,
+	//! It has been set to being always enabled through EnProfiler (SCRipt Profiler)
+	SCRP,
+	//! Whether profiling is currently truly happening (SCRipt Context)
+	SCRC,
+};
+
+typedef Param2<float, typename> EnProfilerTimeClassPair;
+typedef Param2<int, typename> EnProfilerCountClassPair;
+
+typedef Param2<float, string> EnProfilerTimeFuncPair;
+typedef Param2<int, string> EnProfilerCountFuncPair;
+
+/**
+*\brief Set of methods for accessing script profiling data
+*	\note To enable profiling on game launch, use parameter "-profile"
+*	\note Any mention of "[DM]" in this context will mean the WIN+ALT debug menu
+*	\note Any mention of "[CI]" in this context will mean Class Instances count
+*	\note Any mention of "[SR]" in this context will mean a Session Reset (See ResetSession for more information)
+*	\note Any mention of "[SD]" in this context will mean a Sorted Data, which is the data which supplies Get...Per... functions (the ones that give an array)
+*	\note Any mention of "[PD]" in this context will mean a Profiling Data, which is the time, count and allocation information which is stored on the class/func itself
+*	\warning [PD] is only calculated AFTER a function call is finished, there is no continuous timer running
+*	\note 'proto' methods are not tracked, but will contribute to a script methods total time
+*/
+class EnProfiler
+{
+	/**
+	\brief Enable the gathering of script profiling data
+	\note DEFAULT: disabled (unless launched with "-profile", then it is default enabled)
+	\note This is separate from the one in [DM], so toggling it in [DM] will not affect this, and toggling it here will not affect [DM]
+	\note It will ignore the call if trying to set the current state, except when "immediate" is used
+		\param enable \p bool Whether to enable or disable, if it was previously not enabled, it will cause [SR]
+			\note Disabling does not cause [SR], so all data will stay intact
+		\param immediate \p bool When true will instantly start/stop profiling, otherwise it will apply it at the end of the frame (to have one stable point in time)
+			\warning Keep in mind that when using immediate, it will not be the data of the entire frame, which can skew data if not kept in mind		
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+	
+	@code
+		// Simple enable, will start profiling the next frame
+		// Will cause [SR] if !IsEnabledP() before this call
+		EnProfiler.Enable(true);
+
+		// Immediate enable, will start profiling immediately
+		// Will cause [SR] if !IsEnabledP() before this call
+		EnProfiler.Enable(true, true);
+
+		// Immediate disable, will stop profiling immediately
+		// Disabling will never cause [SR], preserving data
+		EnProfiler.Enable(false, true);
+
+		// Simple disable, will not profile the next frame (but still finish profiling the current one)
+		// Disabling will never cause [SR], preserving data
+		EnProfiler.Enable(false);
+	@endcode
+	*/
+	static proto void Enable(bool enable, bool immediate = false, bool sessionReset = true);
+	
+	/**
+	\brief Return if script profiling is enabled
+	\note Helper methods below
+		\return \p int Flags regarding the current state
+
+	@code
+		int isScriptProfilingEnabled = EnProfiler.IsEnabled();
+	@endcode
+	*/
+	static proto int IsEnabled();
+	
+	/**
+	\brief Return if script profiling is enabled through [DM]
+		\return \p bool Whether script profiling is enabled through [DM]
+	
+	@code
+		bool isScriptProfilingDiagEnabled = EnProfiler.IsEnabledD();
+	@endcode
+	*/
+	static bool IsEnabledD()
+	{
+		return (IsEnabled() & EnProfilerEnabledFlags.DIAG);
+	}
+	
+	/**
+	\brief Return if script profiling is enabled through EnProfiler
+	\note When using "-profile" launch parameter, it will enable it through EnProfiler, so this will return true
+		\return \p bool Whether script profiling is enabled through script profiler
+	
+	@code
+		bool isScriptProfilingToggleEnabled = EnProfiler.IsEnabledP();
+	@endcode
+	*/
+	static bool IsEnabledP()
+	{
+		return (IsEnabled() & EnProfilerEnabledFlags.SCRP);
+	}
+	
+	/**
+	\brief Return if script profiling is actually turned on inside of the script context
+	\note When using "-profile" launch parameter, it will enable it through EnProfiler, so this will return true
+		\return \p bool Whether script is being profiled as of this moment
+	
+	@code
+		bool isScriptProfilingEnabled = EnProfiler.IsEnabledC();
+	@endcode
+	*/
+	static bool IsEnabledC()
+	{
+		return (IsEnabled() & EnProfilerEnabledFlags.SCRC);
+	}
+	
+	/**
+	\brief The internal sorting that happens at the end of the frame (so it is NOT necessary to call this manually) to supply Get...Per... functions 
+	\note This will clear the previous [SD] and sort the [PD] currently available at this moment
+	\note Flags apply to this
+	\warning Keep in mind that EnProfilerFlags.RESET will clear all [PD] after this is called
+	
+	@code
+		// Sorting all the currently available [PD], populating [SD]
+		EnProfiler.SortData();
+
+		// If flag EnProfilerFlags.RESET is enabled, then this will return 0 now even if it has been called, as [PD] has been cleared
+		// This goes for any Get...Of... function (Except for [CI], the counter persists)
+		EnProfiler.GetTimeOfFunc("Sleep", EnProfilerTests, true);
+	@endcode
+	*/
+	static proto void SortData();
+	
+	/**
+	\brief Perform [SR], clearing SessionFrame, ProfiledSessionFrames, [SD] and [PD] (except for [CI])
+	\note Can also be triggered by a variety of other functions in this API
+	\note When triggered by the other functions, it will call with fullReset = false
+		\param fullReset \p bool Whether to clear [PD] of all modules, when false it will only clear the [PD] according to current settings
+	
+	@code
+		// Considering the settings: SetFlags(EnProfilerFlags.NONE) and SetModule(EnProfilerModule.GAME)
+		// The following call will only clear [PD] of 3_Game
+		EnProfiler.ResetSession();
+
+		// Considering the settings: SetFlags(EnProfilerFlags.RECURSIVE) and SetModule(EnProfilerModule.WORLD)
+		// The following call will clear [PD] of 3_Game, 4_World, 5_Mission and their children
+		EnProfiler.ResetSession();
+
+		// The following call resets [PD] across all modules
+		EnProfiler.ResetSession(true);
+	@endcode
+	*/
+	static proto void ResetSession(bool fullReset = false);
+	
+	
+	
+	/** \name EnProfilerFlags
+		Set of functions to configure the currently active EnProfilerFlags
+	*/
+	//@{
+	
+	/**
+	\brief Override the currently used set of EnProfilerFlags across the API
+	\note DEFAULT: EnProfilerFlags.ALL
+		\param flags \p int The combination of desired EnProfilerFlags to override the currently used set
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+		\return \p int The currently used set of EnProfilerFlags after the function call
+	
+	@code
+		// No RESET flag, [PD] will be accumulated across frames
+		// No RECURSIVE flag, only the curently profiled module will be sorted
+		EnProfiler.SetFlags(EnProfilerFlags.NONE);
+
+		// RESET flag, [PD] will be reset after sorting
+		// No RECURSIVE flag, only the curently profiled module will be sorted
+		EnProfiler.SetFlags(EnProfilerFlags.RESET);
+
+		// RESET flag, [PD] will be reset after sorting
+		// RECURSIVE flag, all modules will be sorted
+		EnProfiler.SetFlags(EnProfilerFlags.ALL);
+	@endcode
+	*/
+	static proto int SetFlags(int flags, bool sessionReset = true);
+	
+	/**
+	\brief Get the currently used flags across the API
+		\return \p int The currently used set of EnProfilerFlags
+	
+	@code
+		int flags = EnProfiler.GetFlags();
+
+		if (flags & EnProfilerFlags.RECURSIVE)
+		{
+			Print("Currently profiling all modules.");
+		}
+	@endcode
+	*/
+	static proto int GetFlags();
+	
+	/**
+	\brief Check if the flags are set
+	\note Is effectively the same as the code displayed in GetFlags example, but without the bitwise operation
+		\param flags \p int The combination of EnProfilerFlags to check if present
+		\return \p bool If the flags are set
+	
+	@code
+		if (EnProfiler.IsFlagsSet(EnProfilerFlags.ALL))
+		{
+			Print("Currently all flags are enabled.");
+		}
+
+		if (EnProfiler.IsFlagsSet(EnProfilerFlags.RECURSIVE))
+		{
+			Print("Currently profiling all modules.");
+		}
+	@endcode
+	*/
+	static proto bool IsFlagsSet(int flags);
+	
+	/**
+	\brief Add flags to the currently used set of EnProfilerFlags across the API
+	\note Simply a helper method to quickly add EnProfilerFlags
+		\param flags \p int The combination of desired EnProfilerFlags to be added to the currently used set
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+		\return \p int The currently used set of EnProfilerFlags after the function call
+	
+	@code
+		// In the case where the current set of EnProfilerFlags is EnProfilerFlags.RESET
+		EnProfiler.AddFlags(EnProfilerFlags.RECURSIVE);
+		// The resulting set of flags now will be EnProfilerFlags.RESET | EnProfilerFlags.RECURSIVE
+		// As the above is pretty much the same as the following
+		// EnProfiler.SetFlags(EnProfiler.GetFlags() | EnProfilerFlags.RECURSIVE);
+		// But a much cleaner and faster alternative (bitwise operations in script is ~10x slower than C++)
+	@endcode
+	*/
+	static proto int AddFlags(int flags, bool sessionReset = true);
+	
+	/**
+	\brief Remove flags from the currently used set of EnProfilerFlags across the API
+	\note Simply a helper method to quickly remove EnProfilerFlags
+		\param flags \p int The combination of desired EnProfilerFlags to be added to the currently used set
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+		\return \p int The currently used set of EnProfilerFlags after the function call
+	
+	@code
+		// In the case where the current set of EnProfilerFlags is EnProfilerFlags.RESET
+		EnProfiler.RemoveFlags(EnProfilerFlags.RESET);
+		// The resulting set of flags now will be EnProfilerFlags.NONE
+		// As the above is pretty much the same as the following
+		// EnProfiler.SetFlags(EnProfiler.GetFlags() & ~EnProfilerFlags.RECURSIVE);
+		// But a much cleaner and faster alternative (bitwise operations in script is ~10x slower than C++)
+	@endcode
+	*/
+	static proto int RemoveFlags(int flags, bool sessionReset = true);
+	
+	/**
+	\brief Remove all flags from the currently used set of EnProfilerFlags across the API
+	\note Simply a helper method to quickly remove all EnProfilerFlags
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+		\return \p int The currently used set of EnProfilerFlags after the function call
+	
+	@code
+		// In the case where the current set of EnProfilerFlags is EnProfilerFlags.RESET
+		EnProfiler.ClearFlags();
+		// The resulting set of flags now will be EnProfilerFlags.NONE
+		// As the above is pretty much the same as the following
+		// EnProfiler.SetFlags(EnProfilerFlags.NONE);
+		// But a much cleaner and implicit alternative
+	@endcode
+	*/
+	static proto int ClearFlags(bool sessionReset = true);
+	
+	//@}
+	
+	
+	
+	/** \name EnProfilerModule
+		Set of functions to configure the currently profiled EnProfilerModule
+	*/
+	//@{
+	
+	/**
+	\brief Set the module to be profiled
+	\note DEFAULT: EnProfilerModule.CORE
+	\note When session reset is enabled, it will only reset the module which it is currently being set to, previous module data will be untouched
+		\param module \p EnProfilerModule The module to profile
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+	
+	@code
+		EnProfiler.SetModule(EnProfilerModule.WORLD);
+	@endcode
+	*/
+	static proto void SetModule(EnProfilerModule module, bool sessionReset = true);
+	
+	/**
+	\brief Get the currently profiled module
+		\return \p EnProfilerModule The currently profiled module
+	
+	@code
+		EnProfilerModule module = EnProfiler.GetModule();
+	@endcode
+	*/
+	static proto EnProfilerModule GetModule();
+	
+	/**
+	\brief Helper to convert EnProfilerModule to string
+		\param module \p EnProfilerModule The module to get the name of
+		\return \p string The name of the module
+	
+	@code
+		string moduleName = EnProfiler.ModuleToName(EnProfilerModule.GAME);
+	@endcode
+	*/
+	static proto owned string ModuleToName(EnProfilerModule module);
+	
+	/**
+	\brief Convert string to EnProfilerModule
+		\param moduleName \p string The name of the module
+		\param module \p EnProfilerModule The enum value of the module or EnProfilerModule.ERROR if not found
+		\return \p bool Whether the module was found 
+	
+	@code
+		// Get the name of the module of the current class
+		string nameOfCurrentModule = Type().GetModule();
+		EnProfilerModule module;
+
+		// Convert it to the enum value
+		if (EnProfiler.NameToModule(nameOfCurrentModule, module))
+		{
+			EnProfiler.SetModule(module);
+		}
+		else
+		{
+			ErrorEx(string.Format("Could not find EnProfilerModule: %1", nameOfCurrentModule));
+		}
+	@endcode
+	*/
+	static proto bool NameToModule(string moduleName, out EnProfilerModule module);
+	
+	//@}
+	
+	
+	
+	/**
+	\brief Set the interval for the [SD] to update
+	\note DEFAULT: 0
+	\note [DM] has the following values: {0, 5, 10, 20, 30, 50, 60, 120, 144}; When an interval not part of this list is set, [DM] will be set to "CUSTOM_INTERVAL"
+	\note Does not affect the gathering of [PD], this will happen continuously as the profiling is enabled
+	\note This also delays the [SR] caused by EnProfilerFlags.RESET
+		\param interval \p int Amount of frames to wait before [SD] is updated
+		\param sessionReset \p bool When set to false, no [SR] will trigger, regardless of situation
+	
+	@code
+		// This will make it so that [SD] is updated every 60 frames
+		EnProfiler.SetInterval(60);
+	@endcode
+	*/
+	static proto void SetInterval(int interval, bool sessionReset = true);
+	
+	/**
+	\brief Get the currently set interval
+		\return \p int The currently set interval
+	
+	@code
+		int currentInterval = EnProfiler.GetInterval();
+	@endcode
+	*/
+	static proto int GetInterval();
+	
+	
+	
+	/**
+	\brief Set the resolution of the fetched Time data
+	\note DEFAULT: 100000
+	\note [DM] has the following values: {100000, 1000000, 1, 10, 100, 1000, 10000}; These are the only values available, otherwise it will round up to one in the list
+	\note Does not affect any data itself, only the fetching and displaying of it (therefore, no [SR] is ever triggered by this method)
+		\param resolution \p int The nth resolution of a second
+	
+	@code
+		// Have all time being reported in 1 second
+		EnProfiler.SetTimeResolution(1);
+
+		// Have all time being reported in 1000th of a second (ms)
+		EnProfiler.SetTimeResolution(1000);
+	@endcode
+	*/
+	static proto void SetTimeResolution(int resolution);
+	
+	/**
+	\brief Get the currently set time resolution
+		\return \p int The currently set resolution
+	
+	@code
+		int currentTimeResolution = EnProfiler.GetTimeResolution();
+	@endcode
+	*/
+	static proto int GetTimeResolution();
+	
+	
+	
+	/**
+	\brief Enable/disable returning calculated averages
+	\note DEFAULT: false
+	\note When EnProfilerFlags.RESET flag is not present, it will divide by the session frame
+	\note When an interval is set, it will divide by the interval
+	\note Does not affect any data itself, only the fetching and displaying of it (therefore, no [SR] is ever triggered by this method)
+	\note [CI] will never be an average, it will always be the current count of the instance (allocations will be the value of how many times an instance is created)
+		\param enable \p bool Whether to enable or disable
+	
+	@code
+		// For example, take the situation where we only reset every 60 frames
+		EnProfiler.AddFlags(EnProfilerFlags.RESET);
+		EnProfiler.SetInterval(60);
+		EnProfiler.EnableAverage(true);
+
+		// And a method is called once per frame, gathering the count of that function will be 1
+		// Or if a method is called twice per frame, gathering the count of that function will be 2
+		// Or if a method is 3 times every 3 frames, gathering the count of that function will be 1
+		// ...
+		// So you get the average amount of times the method is called per frame, out of the sample of 60 frames
+	@endcode
+	*/
+	static proto void EnableAverage(bool enable);
+	
+	/**
+	\brief Check if returning of average data is enabled
+		\return \p bool Whether returning of average data is enabled
+	
+	@code
+		bool isDataAverage = EnProfiler.IsAverage();
+	@endcode
+	*/
+	static proto bool IsAverage();
+	
+	
+	
+	/**
+	\brief Print out [SD] to script log
+	
+	@code
+		EnProfiler.Dump();
+	@endcode
+	*/
+	static proto void Dump();
+	
+	
+	
+	/** \name Frame data
+		Set of functions to obtain information about frame counts
+	*/
+	//@{
+	
+	/**
+	\brief Get the total amount of frames passed
+		\return \p int The total amount of frames passed
+	
+	@code
+		int gameFrame = EnProfiler.GetGameFrame();
+	@endcode
+	*/
+	static proto int GetGameFrame();
+	
+	/**
+	\brief Get the total amount of frames in this profiling session
+	\note This will only differ from GetProfiledSessionFrames when there is an Interval set
+		\return \p int The total amount of frames in this profiling session
+	
+	@code
+		int sessionFrame = EnProfiler.GetSessionFrame();
+	@endcode
+	*/
+	static proto int GetSessionFrame();
+	
+	/**
+	\brief Get the total amount of frames across all profiling session
+	\note This will only differ from GetProfiledFrames when there was an Interval set at some point
+		\return \p int The total amount of frames across all profiling session
+	
+	@code
+		int totalFrames = EnProfiler.GetTotalFrames();
+	@endcode
+	*/
+	static proto int GetTotalFrames();
+	
+	/**
+	\brief Get the total amount of frames profiled in this profiling session
+	\note This will only differ from GetSessionFrame when there is an Interval set
+		\return \p int The total amount of frames profiled in this profiling session
+	
+	@code
+		int profiledSessionFrames = EnProfiler.GetProfiledSessionFrames();
+	@endcode
+	*/
+	static proto int GetProfiledSessionFrames();
+	
+	/**
+	\brief Get the total amount of frames profiled across all profiling session
+	\note This will only differ from GetTotalFrames when there was an Interval set at some point
+		\return \p int The total amount of frames profiled across all profiling session
+	
+	@code
+		int totalProfiledFrames = EnProfiler.GetProfiledFrames();
+	@endcode
+	*/
+	static proto int GetProfiledFrames();
+	
+	//@}
+	
+
+	
+	/** \name Sorted data
+		Set of functions to obtain [SD]
+		\warning Data is appended to the array, it will not clear any previous data already existing in the array
+		\note Read SortData as well for more information regarding [SD]
+	*/
+	//@{
+	
+	/**
+	\brief Obtain [SD] for Time Per Class
+		\param outArr \p array<ref EnProfilerTimeClassPair> Array sorted by time consumed by a class
+		\param count \p int The maximum amount of entries wanted
+	
+	@code
+		// In this example the array will be filled with the 20 most time intensive classes
+		// If there are less than 20 classes which consumed time, it will output that number of classes instead
+		array<ref EnProfilerTimeClassPair> timePerClass = {};
+		EnProfiler.GetTimePerClass(timePerClass, 20);
+
+		// In this example the array will be filled with all classes sorted by time
+		array<ref EnProfilerTimeClassPair> timePerClass2 = {};
+		EnProfiler.GetTimePerClass(timePerClass2);
+	@endcode
+	*/
+	static proto void GetTimePerClass(notnull out array<ref EnProfilerTimeClassPair> outArr, int count = int.MAX);
+	
+	/**
+	\brief Obtain [SD] for Allocations Per Class
+		\param outArr \p array<ref EnProfilerCountClassPair> Array sorted by number of allocations of a class
+		\param count \p int The maximum amount of entries wanted
+	
+	@code
+		array<ref EnProfilerCountClassPair> allocPerClass = {};
+		EnProfiler.GetAllocationsPerClass(allocPerClass, 20);
+	@endcode
+	*/
+	static proto void GetAllocationsPerClass(notnull out array<ref EnProfilerCountClassPair> outArr, int count = int.MAX);
+	
+	/**
+	\brief Obtain [SD] for Instances Per Class
+		\param outArr \p array<ref EnProfilerCountClassPair> Array sorted by number of instances of a class
+		\param count \p int The maximum amount of entries wanted
+	
+	@code
+		array<ref EnProfilerCountClassPair> instancesPerClass = {};
+		EnProfiler.GetInstancesPerClass(instancesPerClass, 20);
+	@endcode
+	*/
+	static proto void GetInstancesPerClass(notnull out array<ref EnProfilerCountClassPair> outArr, int count = int.MAX);
+	
+	/**
+	\brief Obtain [SD] for Time Per Function
+		\param outArr \p array<ref EnProfilerTimeFuncPair> Array sorted by time consumed by a function
+		\param count \p int The maximum amount of entries wanted
+	
+	@code
+		array<ref EnProfilerTimeFuncPair> timePerFunc = {};
+		EnProfiler.GetTimePerFunc(timePerFunc, 20);
+	@endcode
+	*/
+	static proto void GetTimePerFunc(notnull out array<ref EnProfilerTimeFuncPair> outArr, int count = int.MAX);
+	
+	/**
+	\brief Obtain [SD] for Count Per Function
+		\param outArr \p array<ref EnProfilerCountFuncPair> Array sorted by amount of times a function was called
+		\param count \p int The maximum amount of entries wanted
+	
+	@code
+		array<ref EnProfilerCountFuncPair> countPerFunc = {};
+		EnProfiler.GetCountPerFunc(countPerFunc, 20);
+	@endcode
+	*/
+	static proto void GetCountPerFunc(notnull out array<ref EnProfilerCountFuncPair> outArr, int count = int.MAX);
+	
+	//@}
+	
+	
+	
+	/** \name Specific data
+		Set of functions to obtain specific data
+	*/
+	//@{
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the time a specific class consumed
+		\param clss \p typename Typename of desired class
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p float Time consumed by the specified class
+	
+	@code
+		// Consider the class
+		EPTHelperClass clss = new EPTHelperClass();
+
+		// Some functions being called here...
+	
+		// Gathering of data can be done through
+		float timeOfClass = EnProfiler.GetTimeOfClass(clss.Type(), true);
+
+		// Or when you have no variable/reference
+		float timeOfClass2 = EnProfiler.GetTimeOfClass(StaticGetType(EPTHelperClass), true);
+	@endcode
+	*/
+	static proto float GetTimeOfClass(typename clss, bool immediate = false);
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the allocations of a specific class
+		\param clss \p typename Typename of desired class
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p int Allocations of the specified class
+	
+	@code
+		int allocationsOfClass = EnProfiler.GetAllocationsOfClass(StaticGetType(EPTHelperClass), true);
+	@endcode
+	*/
+	static proto int GetAllocationsOfClass(typename clss, bool immediate = false);
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the [CI] of a specific class
+		\param clss \p typename Typename of desired class
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p int [CI] of the specified class
+	
+	@code
+		int instancesOfClass = EnProfiler.GetInstancesOfClass(StaticGetType(EPTHelperClass), true);
+	@endcode
+	*/
+	static proto int GetInstancesOfClass(typename clss, bool immediate = false);
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the time consumed by a specific function
+		\param funct \p string Function name
+		\param clss \p typename Typename of class the function belongs to
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p float Time consumed by the specified function or -1 when function was not found
+	
+	@code
+		float timeOfFunc = EnProfiler.GetTimeOfFunc("StringFormat", StaticGetType(EnProfilerTests), true);
+	@endcode
+	*/
+	static proto float GetTimeOfFunc(string funct, typename clss, bool immediate = false);
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the time consumed by a specific global function
+		\param funct \p string Function name
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p float Time consumed by the specified function or -1 when function was not found
+	
+	@code
+		float timeOfFunc = EnProfiler.GetTimeOfFuncG("ErrorEx", true);
+	@endcode
+	*/
+	static proto float GetTimeOfFuncG(string funct, bool immediate, bool immediate = false);
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the amount of times a specific function was called
+		\param funct \p string Function name
+		\param clss \p typename Typename of class the function belongs to
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p int Amount of calls to the specified function or -1 when function was not found
+	
+	@code
+		int callCountOfFunc = EnProfiler.GetCountOfFunc("StringFormat", StaticGetType(EnProfilerTests), true);
+	@endcode
+	*/
+	static proto int GetCountOfFunc(string funct, typename clss, bool immediate = false);
+	
+	/**
+	\brief Obtain [SD] or [PD] regarding the amount of times a specific function was called
+		\param funct \p string Function name
+		\param immediate \p bool When true, it will pull from [SD], when false it will pull from [PD]
+		\return \p int Amount of calls to the specified function or -1 when function was not found
+	
+	@code
+		int callCountOfFunc = EnProfiler.GetCountOfFuncG("ErrorEx", true);
+	@endcode
+	*/
+	static proto int GetCountOfFuncG(string funct, bool immediate = false);
+	
+	//@}
+	
+	
+	
+	/** \name Misc
+		Set of helper functions
+	*/
+	//@{
+	
+	/**
+	\brief Helper method to ascertain the profiler will record [PD] right after this call
+		\return \p bool Whether it was enabled before or not
+	
+	@code
+		bool wasEnabled = EnProfiler.RequestImmediateData();
+	@endcode
+	*/
+	static bool RequestImmediateData()
+	{
+		// I only care if it is actually profiling right now, so C
+		bool wasEnabled = IsEnabledC();
+		
+		if (!wasEnabled)
+		{
+			// I want the data, and I want it now, so immediate
+			Enable(true, true);
+		}
+		
+		return wasEnabled;
+	}
+	
+	//@}
+};
+
+ //@}
diff --git a/scripts/1_Core/DayZ/proto/EnScript.c b/scripts/1_Core/DayZ/proto/EnScript.c
new file mode 100644
index 0000000000000000000000000000000000000000..048072e56db390d9103575b2f5fec4923d6d7f6a
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnScript.c
@@ -0,0 +1,1003 @@
+/**
+ * \defgroup Enforce Enforce script essentials
+ * \note \p float ftime; The deltaTime since last frame
+ * \note \p float FLT_MAX; The maximum value for float
+ * \note \p float FLT_MIN; The minimum value for float
+ * @{
+ */
+
+ //! Super root of all classes in Enforce script
+class Class
+{
+	/**
+	\brief Returns true when instance is of the type, or inherited one.
+	\param type Class type
+	\returns \p bool true when 'clType' is the same as 'type', or inherited one.
+	@code
+		if (inst && inst.IsInherited(Widget))
+		{
+			Print("inst is inherited from Widget class!");		
+		}
+	@endcode
+	*/
+	proto native external bool IsInherited(typename type);
+	
+	/**
+	\brief Returns name of class-type
+		\param inst Class
+		\returns \p string class-type
+		@code
+			Man player = g_Game.GetPlayer();
+			string className = player.ClassName();
+			Print(className);
+
+			>> className = 'Man'
+		@endcode
+	*/
+	proto native owned external string ClassName();
+	
+	string GetDebugName() { return ClassName(); }
+	
+	/**
+	\brief Returns typename of object's class
+		\returns \p typename class-type
+		@code
+			Man player = g_Game.GetPlayer();
+			typename type = player.Type();
+			Print(type.ToString());
+
+			>> 'Man'
+		@endcode
+	*/
+	proto native external typename Type();
+	
+	/**
+	\brief Returns typename of object's reference
+		\returns \p typename class-type
+		@code
+			EntityAI e;
+			Print(e.StaticType());
+
+			>> 'EntityAI'
+		@endcode
+	*/	
+	proto external static typename StaticType();
+	
+	/**
+	\brief Returns typename of class even without a variable or instance
+		\returns \p typename class-type
+		@code
+			typename eAITypename = StaticGetType(EntityAI);
+		@endcode
+	*/
+	static typename StaticGetType(typename t)
+	{
+		return t;
+	}
+	
+	proto external string ToString();
+	
+	/**
+	\brief Try to safely down-cast base class to child class.
+		\returns down-casted 'from' pointer when cast is successfull (classes are related), or null if casting is invalid
+		@code
+			// assume that Man inheites from Object
+			Object obj = g_Game.GetPlayer();
+			Man player = Man.Cast(obj);
+			
+			if (player)
+			{
+				// horay!
+			}
+		@endcode
+	*/		
+	proto static Class Cast(Class from);
+	
+	/**
+	\brief Try to safely down-cast base class to child class.
+		\returns \p bool true when 'from' is not null and cast successfull, false when casting is not valid or 'from' is null
+		@code
+			// assume that Man inheites from Object
+			Object obj = g_Game.GetPlayer();
+			Man player;
+			
+			if (Class.CastTo(player, obj))
+			{
+				// horay!
+			}
+		@endcode
+	*/	
+	proto static bool CastTo(out Class to, Class from);
+	
+	//! This function is for internal script usage
+	private proto static bool SafeCastType(Class type, out Class to, Class from);
+};
+
+ //! TODO doc
+class Managed
+{
+};
+
+//! TODO doc
+class NonSerialized
+{
+};
+
+//! script representation for C++ RTTI types
+typedef int[] TypeID;
+
+//! Module containing compiled scripts.
+class ScriptModule
+{
+	private void ~ScriptModule();
+
+	/*!dynamic call of function
+	when inst == NULL, it's global function call, otherwise it's method of class
+	returns true, when success
+	The call creates new thread, so it's legal to use sleep/wait
+  */
+	proto volatile int Call(Class inst, string function, void parm);
+
+	/*!dynamic call of function
+	when inst == NULL, it's global function call, otherwise it's method of class
+	returns true, when success
+	The call do not create new thread!!!!
+  */
+	proto volatile int CallFunction(Class inst, string function, out void returnVal, void parm);
+	proto volatile int CallFunctionParams(Class inst, string function, out void returnVal, Class parms);
+	proto native void Release();
+	
+	/**
+	\brief Do load script and create ScriptModule for it
+		\param parentModule Module
+		\param scriptFile Script path
+		\param listing ??
+		\returns \p ScriptModule Loaded scripted module
+		@code
+			???
+		@endcode
+	*/
+	static proto native ScriptModule LoadScript(ScriptModule parentModule, string scriptFile, bool listing);
+};
+
+//main script module (contains script.c and this file)
+//ScriptModule g_Script;
+
+class EnScript
+{
+	private void EnScript() {}
+	private void ~EnScript() {}
+	
+	/**
+	\brief Dynamic read of variable value by its name
+		\param inst When inst == NULL, it's for global variable, otherwise it's class member
+		\param index Is index when variable is array
+		\param[out] result Variable must be of the same type!
+		\returns \p int true when success
+		@code
+			float count = 0;
+
+			bool success = EnScript.GetClassVar(myClass, "m_Counter", 0, count);
+			Print(count);
+			Print(success);
+
+			>> count = 5
+			>> success = 1
+		@endcode
+	*/
+	static proto int GetClassVar(Class inst, string varname,int index, out void result);
+
+	/**
+	\brief Dynamic write to variable by its name
+		\param inst when inst == NULL, it's for global variable, otherwise it's class member
+		\param varname
+		\param index Is index when variable is array
+		\param input Input variable must be of the same type!
+		\returns \p int Returns true(1) when success
+		@code
+			Print(myClass.m_Counter);
+
+			>> m_Counter = 0
+
+			bool success = EnScript.SetClassVar(myClass, "m_Counter", 0, 5.0);
+
+			Print(myClass.m_Counter);
+			Print(success);
+
+			>> m_Counter = 5
+			>> success = 1
+		@endcode
+	*/
+	static proto int SetClassVar(Class inst, string varname, int index, void input);
+	
+	/**
+	\brief Sets variable value by value in string
+		\param[out] var
+		\param value
+		\returns int
+		@code
+			???
+		@endcode
+	*/
+	static proto int SetVar(out void var, string value);
+
+	/**
+	\brief Debug tool for watching certain variable. Invokes debugger whenever is variable used
+		\param var Certain variable for watching
+		\param flags = 1 means it will break even when not modified
+		\return \p void
+	*/
+	static proto void Watch(void var, int flags);
+};
+
+
+
+/**
+\brief Sorts static array of integers(ascendically) / floats(ascendically) / strings(alphabetically)
+	\param param_array \p array Array to sort
+	\param num \p int How many items will be sorted in array
+	\return \p void
+	@code
+		string	arrStr[3] = {"Dog", "Car", "Apple"};
+		Sort(arrStr, 2)
+		for ( int x = 0; x < 3; x++ )
+		{
+			Print( arrStr[x] );
+		}
+
+		>> 'Car'
+		>> 'Dog'
+		>> 'Apple'
+	@endcode
+*/
+proto void Sort(void param_array[], int num);
+proto void reversearray(void param_array);
+proto void copyarray(void destArray, void srcArray);
+
+/**
+\brief Parses one token from input string. Result is put into token string, and type of token is returned. Input string is left-truncated by the resulting token length.
+	\param[in,out] input \p string String for parse\ Output is without founded token
+	\param[out] token \p string Founded string token
+	\return \p int Type of token
+	\verbatim
+Token types:
+ 0 - error, no token
+ 1 - defined token (special characters etc. . / * )
+ 2 - quoted string. Quotes are removed -> TODO
+ 3 - alphabetic string
+ 4 - number
+ 5 - end of line -> TODO
+	\endverbatim
+	@code
+		string input = "Hello*World";
+		string token1;
+		string token2;
+
+		int result1 = ParseStringEx(input, token1);
+		int result2 = ParseStringEx(input, token2);
+
+		Print( String( "Token1 = '" + token1 + "' Type = " + result1.ToString() ) );
+		Print( String( "Token2 = '" + token2 + "' Type = " + result2.ToString() ) );
+		Print( input );
+
+		>> 'Toke1 = 'Hello' Type = 3'
+		>> 'Toke1 = '*' Type = 1'
+	@endcode
+*/
+proto int ParseStringEx(inout string input, string token);
+
+/**
+\brief Parses string into array of tokens returns number of tokens
+	\param input \p string String for parse
+	\param[out] tokens \p array[] Parsed string in array
+	\return \p int Number of tokens
+	@code
+		string token[2];
+		int result = ParseString("Hello World", token);
+
+		for( int i = 0; i < 2; i++ )
+		{
+			Print(token[i]);
+		}
+
+		>> 'Hello'
+		>> 'World'
+	@endcode
+*/
+proto int ParseString(string input, out string tokens[]);
+
+/**
+\brief Kills thread.
+	\param owner Can be NULL for global threads.
+	\param name Name of the first function on stack
+	\return \p int ???
+	@code
+		???
+	@endcode
+*/
+proto native int KillThread(Class owner, string name);
+
+/**
+Yiels execution to other threads and then it continues. Obsolete...
+*/
+proto volatile void Idle();
+
+/**
+\brief Debug function. Returns current function on stack of the thread
+	\param owner Can be NULL for global threads
+	\param name Name of the first function on stack
+	\param backtrace ???
+	\param linenumber ???
+	\return \p string ???
+	@code
+		???
+	@endcode
+*/
+proto owned string ThreadFunction(Class owner, string name, int backtrace, out int linenumber);
+
+//!Helper for passing string expression to functions with void parameter. Example: Print(String("Hello " + var));
+string String(string s)
+{
+	return s;
+}
+
+//!Helper for printing out string expression. Example: PrintString("Hello " + var);
+void PrintString(string s)
+{
+	Print(s);
+}
+
+class array<Class T>
+{
+	/*!
+	O(1) complexity.
+	\return Number of elements of the array
+	*/
+	proto native int Count();
+	/*!
+	Destroyes all elements of the array and sets the Count to 0.
+	The underlying memory of the array is not freed.
+	*/
+	proto native void Clear();
+	/*!
+	Sets n-th element to given value.
+	*/
+	proto void Set(int n, T value);
+	/*!
+	Tries to find the first occurance of given value in the array.
+	\return Index of the first occurance of `value` if found, -1 otherwise
+	*/
+	proto int Find(T value);
+	/*!
+	\return Element at the index `n`
+	*/
+
+	proto T Get(int n);
+	/*!
+	Inserts element at the end of array.
+	\param value
+	Element to be inserted
+	\return
+	Position at which element is inserted
+	*/
+	proto int Insert(T value);
+	/*!
+	Inserts element at certain position and moves all elements behind
+	this position by one.
+	\param value
+	Element to be inserted
+	\param index
+	Position at which element is inserted. Must be less than Array::GetCardinality()
+	\return
+	Number of elements after insertion
+	*/
+	proto int InsertAt(T value, int index);
+	/**
+	\brief Inserts all elements from array
+		\param from \p array<T> array from which all elements will be added
+		@code
+			TStringArray arr1 = new TStringArray;
+			arr1.Insert( "Dave" );
+			arr1.Insert( "Mark" );
+			arr1.Insert( "John" );
+			
+			TStringArray arr2 = new TStringArray;
+			arr2.Insert( "Sarah" );
+			arr2.Insert( "Cate" );
+			
+			arr1.InsertAll(arr2);
+			
+			for ( int i = 0; i < arr1.Count(); i++ )
+			{
+				Print( arr1.Get(i) );
+			}
+			
+			delete arr2;
+			delete arr1;
+
+			>> "Dave"
+			>> "Mark"
+			>> "John"
+			>> "Sarah"
+			>> "Cate"
+		@endcode
+	*/
+	void InsertAll(notnull array<T> from)
+	{
+		for ( int i = 0; i < from.Count(); i++ )
+		{
+			Insert( from.Get(i) );
+		}
+	}
+	/*!
+	Removes element from array. The empty position is replaced by
+	last element, so removal is quite fast but do not retain order.
+	\param index
+	Index of element to be removed
+	*/
+	proto native void Remove(int index);
+	/*!
+	Removes element from array, but retain all elements ordered. It's
+	slower than Remove
+	\param index
+	Index of element to be removed
+	*/
+	proto native void RemoveOrdered(int index);
+	/*!
+	Resizes the array to given size.
+	If the `newSize` is lower than current Count overflowing objects are destroyed.
+	If the `newSize` is higher than current Count missing elements are initialized to zero (null).
+	*/
+	proto native void Resize(int newSize);
+	
+	/*!
+	Resizes the array to given size internally.
+	Is used for optimization purposes when the approx. size is known beforehand
+	*/
+	proto native void Reserve(int newSize);
+
+	/*!
+	Swaps the contents of this and `other` arrays.
+	Does not involve copying of the elements.
+	*/
+	proto native void Swap(notnull array<T> other);
+
+	/*!
+	Sorts elements of array, depends on underlaying type.
+	*/
+	proto native void Sort(bool reverse = false);
+	/*!
+	Copes contents of `from` array to this array.
+	\return How many elements were copied
+	*/
+
+	proto int Copy(notnull array<T> from);
+	proto int Init(T init[]);
+
+	void RemoveItem(T value)
+	{
+		int remove_index = Find(value);
+
+		if ( remove_index >= 0 )
+		{
+			RemoveOrdered(remove_index);
+		}
+	}
+	
+	void RemoveItemUnOrdered(T value)
+	{
+		int remove_index = Find(value);
+
+		if ( remove_index >= 0 )
+		{
+			Remove(remove_index);
+		}
+	}
+	
+	bool IsValidIndex( int index )
+	{
+		return ( index > -1 && index < Count() );
+	}
+	
+	/*
+	T GetChecked( int index )
+	{
+		if( IsValidIndex( index ) )
+			return Get( index );
+		else
+			return null;
+	}
+	*/
+
+	/**
+	\brief Print all elements in array
+		\return \p void
+		@code
+			my_array.Debug();
+
+			>> "One"
+			>> "Two"
+			>> "Three"
+		@endcode
+	*/
+	void Debug()
+	{
+		Print(string.Format("Array count: %1", Count()));
+		for (int i = 0; i < Count(); i++)
+		{
+			T item = Get(i);
+			Print(string.Format("[%1] => %2", i, item));
+		}
+	}
+
+	/**
+	\brief Returns a random index of array. If Count is 0, return index is -1 .
+		\return \p int Random index of array
+		@code
+			Print( my_array.GetRandomIndex() );
+
+			>> 2
+		@endcode
+	*/
+	int GetRandomIndex()
+	{
+		if ( Count() > 0 )
+		{
+			return Math.RandomInt(0, Count());
+		}
+		
+		return -1;	
+	}
+
+	/**
+	\brief Returns a random element of array
+		\return \p int Random element of array
+		@code
+			Print( my_array.GetRandomElement() );
+
+			>> "Three"
+		@endcode
+	*/
+	T GetRandomElement()
+	{
+		return Get(GetRandomIndex());
+	}
+
+	void SwapItems(int item1_index, int item2_index)
+	{
+		T item1 = Get(item1_index);
+		Set(item1_index, Get(item2_index));
+		Set(item2_index, item1);
+	}
+	
+	void InsertArray(array<T> other)
+	{
+		for (int i = 0; i < other.Count(); i++)
+		{
+			T item = other.Get(i);
+			Insert(item);
+		}
+	}
+	
+	void Invert()
+	{
+		int left = 0;
+		int right = Count() - 1;
+		if (right > 0)
+		{
+			while (left < right)
+			{
+				T temp = Get(left);
+				Set(left++, Get(right));
+				Set(right--, temp);
+			}
+		}
+	}
+	
+	/**
+	\brief Returns a index in array moved by specific number
+		\return \p int Moved index in this array
+		@code
+			Print( "Count: "+ my_array.Count() );
+			Print( "Moved 1:"+ my_array.MoveIndex(2, 1) );
+			Print( "Moved 3:"+ my_array.MoveIndex(2, 2) );
+
+			>> "Count: 4"
+			>> "Moved index 2 by 1: 3";
+			>> "Moved index 2 by 2: 0";
+		@endcode
+	*/
+	int MoveIndex(int curr_index, int move_number)
+	{
+		int count = Count();
+		int new_index = curr_index;
+		
+		if ( move_number > 0 )
+		{
+			new_index = curr_index + move_number;
+		}
+		
+		if ( move_number < 0 )
+		{
+			new_index = curr_index - move_number;
+			
+			if ( new_index < 0 )
+			{
+				if ( new_index <= -count )
+				{
+					new_index = (new_index % count);
+				}
+				
+				new_index = new_index + count;
+			}
+		}
+		
+		if ( new_index >= count )
+		{
+			new_index = (new_index % count);
+		}
+		
+		// move_number is 0
+		return new_index;
+	}
+	
+	void ShuffleArray()
+	{
+		for (int i = 0; i < Count(); i++)
+		{
+			SwapItems(i,GetRandomIndex());
+		}
+	}
+	
+	/**
+	\brief Returns an index where 2 arrays start to differ from each other
+		\return \p int Index from where arrays differ
+		@code
+			array<int> arr1 = {0,1,2,3};
+			array<int> arr2 = {0,1,3,2};
+			int differsAt = arr1.DifferentAtPosition(arr2);
+			Print(differsAt);
+	
+			>> 2
+		@endcode
+	*/
+	int DifferentAtPosition(array<T> pOtherArray)
+	{
+		if (Count() != pOtherArray.Count())
+		{
+			ErrorEx("arrays are not the same size");
+			return -1;
+		}
+
+		for (int i = 0; i < pOtherArray.Count(); ++i)
+		{
+			if (Get(i) != pOtherArray.Get(i))
+			{
+				return i;
+			}
+		}
+		
+		return -1;
+	}
+};
+
+//force these to compile so we can link C++ methods to them
+typedef array<string> TStringArray;
+typedef array<float> TFloatArray;
+typedef array<int> TIntArray;
+typedef array<bool> TBoolArray;
+typedef array<Class> TClassArray;
+typedef array<Managed> TManagedArray;
+typedef array<ref Managed> TManagedRefArray;
+typedef array<vector> TVectorArray;
+typedef array<typename> TTypenameArray;
+
+class set<Class T>
+{
+	proto native int Count();
+	proto native void Clear();
+	/*!
+	Tries to find the first occurance of given value in the set.
+	\return Index of the first occurance of `value` if found, -1 otherwise
+	*/
+	proto int Find(T value);
+	proto T Get(int n);
+	/*!
+	Inserts element at the end of array.
+	\param value
+	Element to be inserted
+	\return
+	Position at which element is inserted
+	*/
+	proto int Insert(T value);
+	/*!
+	Inserts element at certain position and moves all elements behind
+	this position by one.
+	\param value
+	Element to be inserted
+	\param index
+	Position at which element is inserted. Must be less than Array::GetCardinality()
+	\return
+	Number of elements after insertion
+	*/
+	proto int InsertAt(T value, int index);
+	/*!
+	Removes element from array, but retain all elements ordered.
+	\param index
+	Index of element to be removed
+	*/
+	proto native void Remove(int index);
+	proto int Copy(set<T> from);
+	proto native void Swap(set<T> other);
+	proto int Init(T init[]);
+	
+	void InsertSet(set<T> other)
+	{
+		int count = other.Count();
+		for (int i = 0; i < count; i++)
+		{
+			T item = other[i];
+			Insert(item);
+		}
+	}
+	
+	void RemoveItem(T value)
+	{
+		int remove_index = Find(value);
+		if (remove_index >= 0)
+		{
+			Remove(remove_index);
+		}
+	}
+	
+	void RemoveItems(set<T> other)
+	{
+		int count = other.Count();
+		for (int i = 0; i < count; i++)
+		{
+			T item = other[i];
+			RemoveItem(item);
+		}
+	}
+	
+	void Debug()
+	{
+		Print(string.Format("Set count: %1", Count()));
+		for (int i = 0; i < Count(); i++)
+		{
+			T item = Get(i);
+			Print(string.Format("[%1] => %2", i, item));
+		}
+	}
+};
+
+//force these to compile so we can link C++ methods to them
+typedef set<string> TStringSet;
+typedef set<float> TFloatSet;
+typedef set<int> TIntSet;
+typedef set<Class> TClassSet;
+typedef set<Managed> TManagedSet;
+typedef set<ref Managed> TManagedRefSet;
+typedef set<typename> TTypenameSet;
+
+typedef int MapIterator;
+/**
+ \brief Associative array template
+ \n usage:
+ @code
+ autoptr map<string, int> prg_count = new map<string, int>;
+
+ // fill
+ project_locations.Insert("dayz", 10);
+ project_locations.Insert("arma", 20);
+ project_locations.Insert("tkom", 1);
+
+ Print(project_locations.Get("arma")); // prints '20'
+
+ @endcode
+
+ */
+class map<Class TKey,Class TValue>
+{
+	/*!
+		\return
+		The number of elements in the hashmap.
+	*/
+	proto native int Count();
+
+	/*!
+		Clears the hash map.
+	*/
+	proto native void Clear();
+	/*!
+		Search for an element with the given key.
+			
+		\param key
+		The key of the element to find
+		\return
+		Pointer to element data if found, NULL otherwise.
+	*/
+	proto TValue Get(TKey key);
+	/*!
+		Search for an element with the given key.
+			
+		\param key
+		The key of the element to find
+		\param val
+		result is stored to val
+		\return
+		returns True if given key exist.
+	*/
+	proto bool Find(TKey key, out TValue val);
+	/*!
+	Return the i:th element in the map.
+	Note: This operation is O(n) complexity. Use with care!
+
+	\param index
+	The position of the element in the map
+	\return
+	The element on the i:th position
+	*/
+	proto TValue GetElement(int index);
+	/*!
+	Return the i:th element key in the map.
+	Note: This operation is O(n) complexity. Use with care!
+
+	\param i
+	The position of the element key in the map
+	\return
+	Return key of i-th element
+	*/
+	proto TKey GetKey(int i);
+	/*!
+	Sets value of element with given key. If element with key not exists, it is created.
+	Note: creating new elements is faster using Insert function.
+	*/
+	proto void Set(TKey key, TValue value);
+	/*!
+	Removes element with given key.
+	*/
+	proto void Remove(TKey key);
+	/*!
+	Removes i:th element with given key.
+	Note: This operation is O(n) complexity. Use with care!
+	\param i
+	The position of the element key in the map
+	*/
+	proto void RemoveElement(int i);
+	/*!
+	Returns if map contains element with given key.
+	*/
+	proto bool Contains(TKey key);
+	/*!
+	Insert new element into hash map.
+		
+	\param key
+	Key of element to be inserted.
+	\param value
+	Data of element to be inserted.
+	*/
+	proto bool Insert(TKey key, TValue value);
+	proto int Copy(map<TKey,TValue> from);
+	
+	array<TKey> GetKeyArray()
+	{
+		array<TKey> keys = new array<TKey>;
+		for (int i = 0; i < Count(); i++)
+		{
+			keys.Insert( GetKey( i ) );
+		}
+		return keys;
+	}
+	
+	array<TValue> GetValueArray()
+	{
+		array<TValue> elements = new array<TValue>;
+		for (int i = 0; i < Count(); i++)
+		{
+			elements.Insert( GetElement( i ) );
+		}
+		return elements;
+	}
+	
+	bool ReplaceKey(TKey old_key, TKey new_key)
+	{
+		if (Contains(old_key))
+		{
+			Set(new_key, Get(old_key));
+			Remove(old_key);
+			return true;
+		}	
+		return false;
+	}
+	
+	TKey GetKeyByValue(TValue value)
+	{
+		TKey ret;
+		for (int i = 0; i < Count(); i++)
+		{
+			if (GetElement(i) == value) 
+			{
+				ret = GetKey(i);
+				break;
+			}
+		}
+
+		return ret;
+	}
+	
+	bool GetKeyByValueChecked(TValue value, out TKey key)
+	{
+		for (int i = 0; i < Count(); i++)
+		{
+			if (GetElement(i) == value) 
+			{
+				key = GetKey(i);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	proto native MapIterator Begin();
+	proto native MapIterator End();
+	proto native MapIterator Next(MapIterator it);
+	proto TKey GetIteratorKey(MapIterator it);
+	proto TValue GetIteratorElement(MapIterator it);
+};
+
+typedef map<int, float>				TIntFloatMap;
+typedef map<int, int>					TIntIntMap;
+typedef map<int, string>			TIntStringMap;
+typedef map<int, Class>				TIntClassMap;
+typedef map<int, Managed>			TIntManagedMap;
+typedef map<int, ref Managed>	TIntManagedRefMap;
+typedef map<int, typename>		TIntTypenameMap;
+typedef map<int, vector>			TIntVectorMap;
+
+typedef map<string, float>		TStringFloatMap;
+typedef map<string, int>			TStringIntMap;
+typedef map<string, string>		TStringStringMap;
+typedef map<string, Class>		TStringClassMap;
+typedef map<string, Managed>	TStringManagedMap;
+typedef map<string, ref Managed>	TStringManagedRefMap;
+typedef map<string, typename>	TStringTypenameMap;
+typedef map<string, vector>		TStringVectorMap;
+
+typedef map<Class, float>		TClassFloatMap;
+typedef map<Class, int>			TClassIntMap;
+typedef map<Class, string>		TClassStringMap;
+typedef map<Class, Class>		TClassClassMap;
+typedef map<Class, Managed>		TClassManagedMap;
+typedef map<Class, ref Managed>		TClassManagedRefMap;	
+typedef map<Class, typename>	TClassTypenameMap;
+typedef map<Class, vector>		TClassVectorMap;
+
+typedef map<typename, float>		TTypeNameFloatMap;
+typedef map<typename, int>			TTypeNameIntMap;
+typedef map<typename, string>		TTypeNameStringMap;
+typedef map<typename, Class>		TTypeNameClassMap;
+typedef map<typename, Managed>		TTypeNameManagedMap;
+typedef map<typename, ref Managed>	TTypeNameManagedRefMap;
+typedef map<typename, typename>		TTypeNameTypenameMap;
+typedef map<typename, vector>		TTypeNameVectorMap;
+
+typedef map<Managed, float>		TManagedFloatMap;
+typedef map<Managed, int>		TManagedIntMap;
+typedef map<Managed, string>	TManagedStringMap;
+typedef map<Managed, Class>		TManagedClassMap;
+typedef map<Managed, Managed>	TManagedManagedMap;
+typedef map<Managed, ref Managed>	TManagedManagedRefMap;
+typedef map<Managed, typename>	TManagedTypenameMap;
+typedef map<Managed, vector>	TManagedVectorMap;
+
+typedef map<ref Managed, float>	TManagedRefFloatMap;
+typedef map<ref Managed, int>		TManagedRefIntMap;
+typedef map<ref Managed, string>	TManagedRefStringMap;
+typedef map<ref Managed, Class>		TManagedRefClassMap;
+typedef map<ref Managed, Managed>	TManagedRefManagedMap;
+typedef map<ref Managed, ref Managed>	TManagedRefManagedRefMap;
+typedef map<ref Managed, typename>	TManagedRefTypenameMap;
+typedef map<ref Managed, vector>	TManagedRefVectorMap;
+
+ //@}
diff --git a/scripts/1_Core/DayZ/proto/EnString.c b/scripts/1_Core/DayZ/proto/EnString.c
new file mode 100644
index 0000000000000000000000000000000000000000..b7ef3b7ce58cd697c1aff5cde3076ef226c36b45
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnString.c
@@ -0,0 +1,529 @@
+/**
+ * \defgroup Strings Strings
+ * @{
+ */
+class string
+{
+	static const string Empty;
+			
+	/**
+	\brief Converts string to integer
+		\return \p int - Converted \p string.
+		@code
+			string str = "56";
+			int i = str.ToInt();
+			Print(i);
+
+			>> i = 56
+		@endcode
+	*/
+	proto native int ToInt();
+	
+	/**
+	\brief Converts string to integer
+		\return \p int - Converted \p string.
+		@code
+			string str = "0xFF";
+			int i = str.HexToInt();
+			Print(i);
+
+			>> i = 255
+		@endcode
+	*/
+	proto native int HexToInt();
+	
+	/**
+	\brief Converts string to float
+		\return \p float - Converted \p string \p in float.
+		@code
+			string str = "56.6";
+			float f = str.ToFloat();
+			Print(f);
+
+			>> f = 56.6
+		@endcode
+	*/
+	proto native float ToFloat();
+			
+	/**
+	\brief Returns a vector from a string
+		\return \p vector Converted s as vector
+		@code
+			string str = "1 0 1";
+			vector v = str.ToVector();
+			Print(v);
+
+			>> v = <1,0,1>
+		@endcode
+	*/
+	proto vector ToVector();
+		
+	
+	/**
+	\brief Convert beautified string into a vector
+	    \param vec \p beautified string
+		\return \p vector resulting vector
+	*/
+	vector BeautifiedToVector()
+	{
+		string copy = value;
+		copy.Replace("<", "");
+		copy.Replace(">", "");
+		copy.Replace(",", " ");
+		return copy.ToVector();
+	}
+	/**
+	\brief Converts string's first character to ASCII code
+		\param str String for convert to ASCII code
+		\return \p ascii code \p int.
+		@code
+			int ascii = "M".ToAscii();
+			Print(ascii);
+
+			>> ascii = 77
+		@endcode
+	*/
+	proto native int ToAscii();
+	
+	/**
+	\brief Returns internal type representation. Can be used in runtime, or cached in variables and used for faster inheritance checking
+		\returns \p typename Type of class
+		@code
+			???
+		@endcode
+	*/
+	proto native typename ToType();
+
+	//! Return string representation of variable
+	static proto string ToString(void var, bool type = false, bool name = false, bool quotes = true);
+	
+	/**
+	\brief Substring of 'str' from 'start' position 'len' number of characters
+		\param start Position in \p str
+		\param len Count of characters
+		\return \p string - Substring of \p str
+		@code
+			string str = "Hello World";
+			string strSub = str.Substring(2, 5);
+			Print(strSub);
+
+			>> strSub = llo W
+		@endcode
+	*/
+	proto string Substring(int start, int len);
+	
+	//! Inverted SubString. This deletes everything in between position_start and position_end.
+	string SubstringInverted( string string_to_split, int position_start, int position_end )
+	{
+		string first_half = string_to_split.Substring(0, position_start);
+		string second_half = string_to_split.Substring( position_end, string_to_split.Length() - position_end );
+		string result = first_half + second_half;
+		return result;
+	}
+	
+	/**
+	\brief Substring of 'str' from 'startChar' position 'len' number of characters for UTF8 strings with multibyte chars
+		\param startChar Position in \p str.
+		\param len Count of characters
+		\return \p string - Substring of \p str with \p startChar character and \p len characters
+		@code
+			string str = "こんにちは世界";
+			string strSub = str.SubstringUtf8(2, 4);
+			Print(strSub);
+
+			>> strSub = にちは世
+		@endcode
+	*/
+	proto string SubstringUtf8(int startChar, int len);
+
+	/**
+	\brief Replace all occurrances of 'sample' in 'str' by 'replace'
+		\param sample string to search in \p str
+		\param replace string which replace \p sample in \p str
+		\return \p int - number of occurrances of 'sample' in 'str' 
+		@code
+		string test = "If the length of the C string in source is less than num, only the content up to the terminating null-character is copied.";
+		Print(test);
+		int count = test.Replace("the", "*");
+		Print(count);
+		Print(test);
+
+		>> string test = 'If the length of the C string in source is less than num, only the content up to the terminating null-character is copied.';
+		>> int count =   4
+		>> string test = 'If * length of * C string in source is less than num, only * content up to * terminating null-character is copied.'
+		@endcode
+	*/
+	proto int Replace(string sample, string replace);
+
+	/**
+	\brief Changes string to lowercase. Returns length
+		\return \p int - Length of changed string
+		@code
+			string str = "Hello World";
+			int i = str.ToLower();
+			Print(str);
+			Print(i);
+
+			>> str = hello world
+			>> i = 11
+		@endcode
+	*/
+	proto int ToLower();
+
+	/**
+	\brief Changes string to uppercase. Returns length
+		\return \p int - Length of changed string
+		@code
+			string str = "Hello World";
+			int i = str.ToUpper();
+			Print(str);
+			Print(i);
+
+			>> str = HELLO WORLD
+			>> i = 11
+		@endcode
+	*/
+	proto int ToUpper();
+
+	/**
+	\brief Returns length of string
+		\return \p int - Length of string
+		@code
+			string str = "Hello World";
+			int i = str.Length();
+			Print(i);
+
+			>> i = 11
+		@endcode
+	*/
+	proto native int Length();
+	
+	/**
+	\brief Returns number of characters in UTF8 string
+		\return \p int - Number of characters in UTF8 string
+		@code
+			string str = "こんにちは世界";
+			int i = str.LengthUtf8();
+			Print(i);
+
+			>> i = 7
+		@endcode
+	*/
+	proto native int LengthUtf8();
+
+	/**
+	\brief Returns hash of string
+		\return \p int - Hash of string
+		@code
+			string str = "Hello World";
+			int hash = str.Hash();
+			Print(hash);
+		@endcode
+	*/
+	proto native int Hash();
+	
+	/**
+	\brief Finds 'sample' in 'str'. Returns -1 when not found
+		\param sample \p string Finding string
+		\return \p int - Returns position where \p sample starts, or -1 when \p sample not found
+		@code
+			string str = "Hello World";
+			Print( str.IndexOf( "H" ) );
+			Print( str.IndexOf( "W" ) );
+			Print( str.IndexOf( "Q" ) );
+
+			>> 0
+			>> 6
+			>> -1
+		@endcode
+	*/
+	proto native int IndexOf(string sample);
+	
+	/**
+	\brief Finds last 'sample' in 'str'. Returns -1 when not found
+		\param sample \p string Finding string
+		\return \p int - Returns position where \p sample starts, or -1 when \p sample not found
+		@code
+			string str = "Hello World";
+			Print( str.IndexOf( "l" ) );
+			
+			>> 9
+		@endcode
+	*/
+	proto native int LastIndexOf(string sample);
+
+	/**
+	\brief Finds 'sample' in 'str' from 'start' position. Returns -1 when not found
+		\param start \p int Start from position
+		\param sample \p string Finding string expression
+		\return \p int - Length of string \p s
+		@code
+			string str = "Hello World";
+			Print( str.IndexOfFrom( 3, "H" ) );
+			Print( str.IndexOfFrom( 3, "W" ) );
+			Print( str.IndexOfFrom( 3, "Q" ) );
+
+			>> -1
+			>> 6
+			>> -1
+		@endcode
+	*/
+	proto native int IndexOfFrom(int start, string sample);
+
+	/**
+	\brief Returns true if sample is substring of string
+		\param sample \p string Finding string expression
+		\return \p bool true if sample is substring of string
+		@code
+			string str = "Hello World";
+			Print( str.IndexOfFrom( 3, "Hello" ) );
+			Print( str.IndexOfFrom( 3, "Mexico" ) );
+			
+			>> true
+			>> false
+		@endcode
+	*/
+	bool Contains(string sample)
+	{
+		return value.IndexOf(sample) != -1;
+	}
+
+	/**
+	\brief Returns trimmed string with removed leading and trailing whitespaces
+		\return \p string - Trimmed string
+		@code
+			string str = " Hello World "
+			Print( str );
+			Print( str.Trim() );
+
+			>> ' Hello World '
+			>> 'Hello World'
+		@endcode
+
+	*/
+	proto string Trim();
+
+	/**
+	\brief Removes leading and trailing whitespaces in string. Returns length
+		\return \p int - Count of chars
+		@code
+			string str = " Hello World ";
+			int i = str.TrimInPlace();
+			Print(str);
+			Print(i);
+
+			>> str = 'Hello World'
+			>> i = 11
+		@endcode
+	*/
+	proto int TrimInPlace();
+	
+	/**
+	\brief Parses one token from input string. Result is put into token string, and type of token is returned. Input string is left-truncated by the resulting token length.
+		\param[out] token \p string Founded string token
+		\return \p int Type of token
+		\verbatim
+	Token types:
+	 0 - error, no token
+	 1 - defined token (special characters etc. . / * )
+	 2 - quoted string. Quotes are removed -> TODO
+	 3 - alphabetic string
+	 4 - number
+	 5 - end of line -> TODO
+		\endverbatim
+		@code
+			string input = "Hello*World";
+			string token1;
+			string token2;
+
+			int result1 = input.ParseStringEx(token1);
+			int result2 = input.ParseStringEx(token2);
+
+			Print( "Token1 = '" + token1 + "' Type = " + result1.ToString() ) );
+			Print( "Token2 = '" + token2 + "' Type = " + result2.ToString() ) );
+			
+			>> 'Toke1 = 'Hello' Type = 3'
+			>> 'Toke1 = '*' Type = 1'
+		@endcode
+	*/
+	proto int ParseStringEx(out string token);
+
+	/**
+	\brief Parses string into array of tokens returns number of tokens
+		\param[out] tokens \p array[] Parsed string in array
+		\return \p int Number of tokens
+		@code
+			string token[2];
+			string str = "Hello World";
+			int result = str.ParseString(token);
+
+			for (int i = 0; i < 2; i++)
+			{
+				Print(token[i]);
+			}
+
+			>> 'Hello'
+			>> 'World'
+		@endcode
+	*/
+	proto int ParseString(out string tokens[]);
+	
+	/**
+	\brief Splits string into array of strings separated by 'sample'
+		\param sample \p string Strings separator
+		\return \p TStringArray Array with strings
+		@code
+			string example = "The quick brown fox jumps over the lazy dog";
+			TStringArray strs = new TStringArray;
+			example.Split(" ", strs);
+			
+			for (int i = 0; i < strs.Count(); i++)
+			{
+				Print(strs.Get(i));
+			}
+
+			>> 'The'
+			>> 'quick'
+			>> 'brown'
+			>> 'fox'
+			>> 'jumps'
+			>> 'over'
+			>> 'the'
+			>> 'lazy'
+			>> 'dog'
+		@endcode
+	*/
+	void Split(string sample, out array<string> output)
+	{
+		int txt_len	= 0;
+		int sep_pos	= -1;
+		int nxt_sep_pos = 0;
+		string text = "";
+
+		bool line_end = false;
+		while (line_end == false)
+		{
+			sep_pos = sep_pos + txt_len + 1;
+			nxt_sep_pos = value.IndexOfFrom(sep_pos, sample);
+			if ( nxt_sep_pos == -1 )
+			{
+				nxt_sep_pos = value.Length();
+				line_end = true;
+			}
+
+			txt_len = nxt_sep_pos - sep_pos;
+			if ( txt_len > 0 )
+			{
+				text = value.Substring(sep_pos, txt_len);
+				output.Insert(text);
+			}
+		}
+	}
+
+	// !Joins array of strings into a single string, separated by 'separator'. Inverse of Split
+	static string Join(string separator, notnull TStringArray tokens)
+	{
+		string output;
+		foreach (int i, string s: tokens)
+		{
+			if (i != 0)
+				output += separator;
+			output += s;
+		}
+		return output;
+	}
+
+	/**
+	\brief Gets n-th character from string
+		\param index character index
+		\return \p string character on index-th position in string
+		\warning VME When index less than 0 or greater than string length  
+		@code
+			string str = "Hello World";
+			Print( str[4] ); // Print( str.Get(4) );
+
+			>> 'o'
+		@endcode
+	*/ 			
+	proto string Get(int index);
+	
+	/**
+	\brief Sets the n-th character in string with the input, replacing previous value
+		\param index index to be replaced
+		\param input single non-terminated character value to replace with
+		\warning VME When index less than 0 or greater than string length  
+		\warning (Diag)		VME When string is empty or greater than length of 1
+				 (Retail)	Calls 'string.Insert' except it replaces only the initial character
+		@code
+			string str = "Hello World";
+			str[4] = "O";
+			Print( str );
+	
+			>> 'HellO World'
+		@endcode
+		
+		@code
+			string str = "Hello World";
+			str[6] = "Test ";
+			Print( str );
+	
+			>> 'Hello Test orld'
+		@endcode
+	*/ 
+	proto void Set(int index, string input);
+
+#ifdef DIAG_DEVELOPER
+	/**
+	\brief Do not use. Re-implemented for verification of new function due to design of previous function allowing for unexpected behavior that modders may depend on.
+		\see string.Set warnings for handling existing mods in Retail 
+		@code
+			string str = "Hello World";
+			str.OldSet(6, "Test ");
+			Print( str );
+	
+			>> 'Hello Test orld'
+		@endcode
+	 */
+	void OldSet(int n, string _value)
+	{
+		string pre = value.Substring(0, n);
+		n += 1;
+		int length = value.Length() - n;
+		string post = value.Substring(n, length);
+		value = pre + _value + post;
+	}
+#endif
+	
+	/**
+	\brief Inserts a string into the n-th index, increasing the string length by the size of the input
+		\param index index to insert at
+		\param input string value to insert with
+		\warning VME When index less than 0 or greater than string length  
+		\warning VME When string is empty
+		@code
+			string str = "Hello World";
+			str.Insert(6, "Test ");
+			Print( str );
+	
+			>> 'Hello Test World'
+		@endcode
+	*/ 
+	proto void Insert(int index, string input);
+	
+	/**
+	\brief Gets n-th character from string
+		\param index character index
+		\return \p string character on index-th position in string
+		@code
+		int a = 5;
+		float b = 5.99;
+		string c = "beta";
+		string 	test = string.Format("Ahoj %1 = %3 , %2", a, b, c);
+		Print(test);	
+		>> 'Ahoj 5 = 'beta' , 5.99'
+		@endcode
+	*/ 			
+	static proto string Format(string fmt, void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);
+};
+
+//@}
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/proto/EnSystem.c b/scripts/1_Core/DayZ/proto/EnSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8b04473d45c1bc4e5e1250bbb0f5b031227eec8
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnSystem.c
@@ -0,0 +1,534 @@
+/**
+ * \defgroup System System
+ * @{
+ */
+
+/**
+\brief Returns world time
+	\param[out] hour \p int Hour
+	\param[out] minute \p int Minute
+	\param[out] second \p int Second
+	\return \p void
+	@code
+		int hour = 0;
+		int minute = 0;
+		int second = 0;
+
+		GetHourMinuteSecondUTC(hour, minute, second);
+
+		Print(hour);
+		Print(minute);
+		Print(second);
+
+		>> hour = 16
+		>> minute = 38
+		>> second = 7
+	@endcode
+*/
+proto void GetHourMinuteSecond(out int hour, out int minute, out int second);
+
+/**
+\brief Returns world date
+	\param[out] year \p int Year
+	\param[out] month \p int Month
+	\param[out] day \p int Day
+	\return \p void
+	@code
+		int year = 0;
+		int month = 0;
+		int day = 0;
+
+		GetYearMonthDay(year, month, day);
+
+		Print(year);
+		Print(month);
+		Print(day);
+
+		>> year = 2015
+		>> month = 3
+		>> day = 24
+	@endcode
+*/
+proto void GetYearMonthDay(out int year, out int month, out int day);
+
+/**
+\brief Returns UTC world time
+	\param[out] hour \p int Hour
+	\param[out] minute \p int Minute
+	\param[out] second \p int Second
+	\return \p void
+	@code
+		int hour = 0;
+		int minute = 0;
+		int second = 0;
+
+		GetHourMinuteSecondUTC(hour, minute, second);
+
+		Print(hour);
+		Print(minute);
+		Print(second);
+
+		>> hour = 15
+		>> minute = 38
+		>> second = 7
+	@endcode
+*/
+proto void GetHourMinuteSecondUTC(out int hour, out int minute, out int second);
+
+/**
+\brief Returns UTC world date
+	\param[out] year \p int Year
+	\param[out] month \p int Month
+	\param[out] day \p int Day
+	\return \p void
+	@code
+		int year = 0;
+		int month = 0;
+		int day = 0;
+
+		GetYearMonthDayUTC(year, month, day);
+
+		Print(year);
+		Print(month);
+		Print(day);
+
+		>> year = 2015
+		>> month = 3
+		>> day = 24
+	@endcode
+*/
+proto void GetYearMonthDayUTC(out int year, out int month, out int day);
+
+proto string GetProfileName();
+proto string GetMachineName();
+
+//! performance counter. Returns number of CPU ticks between 'prev' and 'now'
+proto native int TickCount(int prev);
+
+/**
+\brief Switches memory validation (huge slowdown! Use with care only for certain section of code!)
+	\param enable \p bool Enable
+	\return \p void
+	@code
+		???
+	@endcode
+*/
+proto native void MemoryValidation(bool enable);
+
+/**
+\brief Returns command line argument
+	\param name of a command line argument
+	\param val \p string value of the param or empty string if the param hasn't been found
+	\return True if param is present, False if hasn't been found
+	@code
+		string param;
+		GetCLIParam("world", param); // return a value when program executed with param -world something
+	@endcode
+*/
+proto bool GetCLIParam(string param, out string val);	
+	
+/**
+\brief Returns if command line argument is present
+	\param name of a command line argument
+	\return True if param is present, False if hasn't been found
+	@code
+		if (IsCLIParam("verbose")) // Prints "something" when program executed with param -verbose
+		{ 
+			Print("something");
+		}
+	@endcode
+*/
+proto native bool IsCLIParam(string param);		
+	
+#ifdef ENF_DONE
+
+//! developer tool - start video grabber
+proto native void StartVideo(string name);
+//! developer tool - stop video grabber
+proto native void StopVideo();
+#endif
+
+
+/**
+ * \defgroup Keyboard Keyboard input API
+ * @{
+ */
+enum KeyCode
+{
+	KC_ESCAPE,
+	KC_1,
+	KC_2,
+	KC_3,
+	KC_4,
+	KC_5,
+	KC_6,
+	KC_7,
+	KC_8,
+	KC_9,
+	KC_0,
+	KC_MINUS,   ///< - on main keyboard 
+	KC_EQUALS,
+	KC_BACK,    ///< backspace 
+	KC_TAB,
+	KC_Q,
+	KC_W,
+	KC_E,
+	KC_R,
+	KC_T,
+	KC_Y,
+	KC_U,
+	KC_I,
+	KC_O,
+	KC_P,
+	KC_LBRACKET,
+	KC_RBRACKET,
+	KC_RETURN,   ///< Enter on main keyboard 
+	KC_LCONTROL,
+	KC_A,
+	KC_S,
+	KC_D,
+	KC_F,
+	KC_G,
+	KC_H,
+	KC_J,
+	KC_K,
+	KC_L,
+	KC_SEMICOLON,
+	KC_APOSTROPHE,
+	KC_GRAVE,    ///< accent grave 
+	KC_LSHIFT,
+	KC_BACKSLASH,
+	KC_Z,
+	KC_X,
+	KC_C,
+	KC_V,
+	KC_B,
+	KC_N,
+	KC_M,
+	KC_COMMA,
+	KC_PERIOD,   ///< . on main keyboard 
+	KC_SLASH,    ///< / on main keyboard 
+	KC_RSHIFT,
+	KC_MULTIPLY,    ///< * on numeric keypad 
+	KC_LMENU,    ///< left Alt 
+	KC_SPACE,
+	KC_CAPITAL,
+	KC_F1,
+	KC_F2,
+	KC_F3,
+	KC_F4,
+	KC_F5,
+	KC_F6,
+	KC_F7,
+	KC_F8,
+	KC_F9,
+	KC_F10,
+	KC_NUMLOCK,
+	KC_SCROLL,    ///< Scroll Lock 
+	KC_NUMPAD7,
+	KC_NUMPAD8,
+	KC_NUMPAD9,
+	KC_SUBTRACT,    ///< - on numeric keypad 
+	KC_NUMPAD4,
+	KC_NUMPAD5,
+	KC_NUMPAD6,
+	KC_ADD,    ///< + on numeric keypad 
+	KC_NUMPAD1,
+	KC_NUMPAD2,
+	KC_NUMPAD3,
+	KC_NUMPAD0,
+	KC_DECIMAL,   ///< . on numeric keypad 
+	KC_OEM_102,    ///< < > | on UK/Germany keyboards 
+	KC_F11,
+	KC_F12,
+	KC_NUMPADEQUALS,    ///< = on numeric keypad (NEC PC98) 
+	KC_PREVTRACK,    ///< Previous Track (DIKC_CIRCUMFLEX on Japanese keyboard) 
+	KC_AT,    ///<                     (NEC PC98) 
+	KC_COLON,    ///<                     (NEC PC98) 
+	KC_UNDERLINE,    ///<                     (NEC PC98) 
+	KC_STOP,    ///<                     (NEC PC98) 
+	KC_AX,    ///<                     (Japan AX) 
+	KC_UNLABELED,    ///<                        (J3100) 
+	KC_NEXTTRACK,    ///< Next Track 
+	KC_NUMPADENTER,    ///< Enter on numeric keypad 
+	KC_RCONTROL,
+	KC_MUTE,    ///< Mute 
+	KC_CALCULATOR,    ///< Calculator 
+	KC_PLAYPAUSE,    ///< Play / Pause 
+	KC_MEDIASTOP,    ///< Media Stop 
+	KC_VOLUMEDOWN,    ///< Volume - 
+	KC_VOLUMEUP,    ///< Volume + 
+	KC_WEBHOME,    ///< Web home 
+	KC_NUMPADCOMMA,    ///< , on numeric keypad (NEC PC98) 
+	KC_DIVIDE,    ///< / on numeric keypad 
+	KC_SYSRQ,
+	KC_RMENU,    ///< right Alt 
+	KC_PAUSE,    ///< Pause 
+	KC_HOME,    ///< Home on arrow keypad 
+	KC_UP,    ///< UpArrow on arrow keypad 
+	KC_PRIOR,    ///< PgUp on arrow keypad 
+	KC_LEFT,    ///< LeftArrow on arrow keypad 
+	KC_RIGHT,    ///< RightArrow on arrow keypad 
+	KC_END,    ///< End on arrow keypad 
+	KC_DOWN,    ///< DownArrow on arrow keypad 
+	KC_NEXT,    ///< PgDn on arrow keypad 
+	KC_INSERT,    ///< Insert on arrow keypad 
+	KC_DELETE,    ///< Delete on arrow keypad 
+	KC_LWIN,    ///< Left Windows key 
+	KC_RWIN,    ///< Right Windows key 
+	KC_APPS,    ///< AppMenu key 
+	KC_POWER,    ///< System Power 
+	KC_SLEEP,    ///< System Sleep 
+	KC_WAKE,    ///< System Wake 
+	KC_MEDIASELECT   ///< Media Select 
+};
+
+/*!
+Gets key state
+\param key	Key code
+\returns 0 when not pressed, 15. bit set when pressed, 0.-14. bit pressed count 
+*/
+proto native int KeyState(KeyCode key);
+
+/*!
+Clears the key state.
+Call this function if you want to overcome autorepeating in reporting key state. If called, the KeyState returns pressed only after the key is released and pressed again.
+*/
+proto native void ClearKey(KeyCode key);
+/** @}*/
+
+//! returns index of defined key in InputDevice by its name
+//proto native int GetDefKey(string name);
+//proto native int DefKeyState(int defkey, bool clear);
+
+
+/**
+ * \defgroup Mouse Mouse API
+ * @{
+ */
+
+enum MouseState
+{
+	LEFT,
+	RIGHT,
+	MIDDLE,
+	X,
+	Y,
+	WHEEL
+};
+//const int MB_PRESSED_MASK
+
+/*!
+Returns state of mouse button. It's combination of number of release/pressed edges and mask MB_PRESSED_MASK
+that is set when button is pressed.
+If you want just to check if button is pressed, use this: if(GetMouseState(MouseState.LEFT) & MB_PRESSED_MASK)) Print("left button pressed");
+*/	
+proto native int GetMouseState(MouseState index);
+
+// Gets current mouse position
+proto void GetMousePos(out int x, out int y);
+// Gets current screen size (resolution)
+proto void GetScreenSize(out int x, out int y);
+
+/** @}*/
+
+/**
+ * \defgroup Gamepad API
+ * @{
+ */
+
+enum GamepadButton
+{
+	BUTTON_NONE,
+	MENU,
+	VIEW,
+	A,
+	B,
+	X,
+	Y,
+	PAD_UP,
+	PAD_DOWN,
+	PAD_LEFT,
+	PAD_RIGHT,
+	SHOULDER_LEFT,
+	SHOULDER_RIGHT,
+	THUMB_LEFT,
+	THUMB_RIGHT
+};
+
+enum GamepadAxis
+{
+	LEFT_THUMB_HORIZONTAL,
+	LEFT_THUMB_VERTICAL,
+	RIGHT_THUMB_HORIZONTAL,
+	RIGHT_THUMB_VERTICAL,
+	LEFT_TRIGGER,
+	RIGHT_TRIGGER,
+};
+
+//! return if the button is pressed or not
+proto native int GetGamepadButton(GamepadButton button);
+//! return value in gamepad axis <-1000; 1000>
+proto native float GetGamepadAxis(GamepadAxis axis);
+
+/** @}*/
+
+//----------------------------------------------
+/**
+ * \defgroup File FileIO API
+ * @{
+ */
+
+enum FileMode
+{
+	READ,
+	WRITE,
+	APPEND
+};
+	
+typedef int[] ParseHandle;
+typedef int[] FileHandle;
+
+proto native ParseHandle BeginParse(string filename);
+proto int ParseLine(ParseHandle tp, int num, string tokens[]);
+proto native void EndParse(ParseHandle file);
+
+//!Check existence of file
+proto bool FileExist(string name);
+
+/**
+\brief Opens File
+	@param name of a file to open, (you can use filesystem prefixes ('$profile','$saves','$mission'). For accessing profile dir use '$profile', e.g. '$profile:myfilename.txt')
+	@param mode constants FileMode.WRITE, FileMode.READ or FileMode.APPEND flag can be used
+	\return file handle ID or 0 if fails
+	\n usage :
+	@code
+	FileHandle file = OpenFile("$profile:testiik.txt", FileMode.WRITE);
+	//FileHandle file = OpenFile("$profile:testiik.txt", FileMode.APPEND);
+	if (file != 0)
+	{
+		FPrintln(file, "line1");
+		FPrintln(file, "line2");
+		FPrintln(file, "line3");
+		CloseFile(file);
+	}
+	@endcode
+*/
+proto FileHandle		OpenFile(string name, FileMode mode);
+
+/**
+Reads raw data from file.
+\param param_array Receiving array for the data. Valid types are int[] or string
+\param length Length of data
+\returns number of read bytes
+*/
+proto int ReadFile(FileHandle file, void param_array, int length);
+
+/**
+\brief Close the File
+	@param file File handle ID of a opened file
+	\return void
+	\n usage :
+	@code
+	FileHandle file = OpenFile("$profile:testiik.txt", FileMode.WRITE);
+	if (file != 0)
+	{
+		FPrintln(file, "line1");
+		FPrintln(file, "line2");
+		FPrintln(file, "line3");
+		CloseFile(file);
+	}
+	@endcode
+*/
+proto void		CloseFile(FileHandle file);
+
+/**
+\brief Write to file
+	@param file File handle ID of a opened file
+	@param var Value to write
+	\return void
+	\n usage :
+	@code
+	FileHandle file = OpenFile("$profile:testiik.txt", FileMode.WRITE);
+	if (file != 0)
+	{
+		FPrint(file, "A");
+		FPrint(file, "B");
+		FPrint(file, "C");
+		CloseFile(file);
+	}
+	@endcode
+*/
+proto void		FPrint(FileHandle file, void var);
+
+/**
+\brief Write to file and add new line
+	@param file File handle ID of a opened file
+	@param var Value to write
+	\return void
+	\n usage :
+	@code
+	FileHandle file = OpenFile("$profile:testiik.txt", FileMode.WRITE);
+	if (file != 0)
+	{
+		FPrintln(file, "line1");
+		FPrintln(file, "line2");
+		FPrintln(file, "line3");
+		CloseFile(file);
+	}
+	@endcode
+*/
+proto void		FPrintln(FileHandle file, void var);
+
+/**
+\brief Get line from file, every next call of this function returns next line
+	@param file File handle ID of a opened file
+	@param var Value to write
+	\return int Count of chars or -1 if is not any for read (end of file is EMPTY line)
+	\n usage :
+	@code
+		FileHandle file_handle = OpenFile("$profile:testiik.txt", FileMode.READ);
+		string line_content;
+
+		while ( FGets( file_handle,  line_content ) > 0 )
+		{
+			Print(line_content);
+		}
+
+		CloseFile(file_handle);
+	@endcode
+*/
+proto int		FGets(FileHandle file, string var);
+
+typedef int[] FindFileHandle;
+
+enum FileAttr
+{
+	DIRECTORY, ///<File is directory
+	HIDDEN, ///<File is hidden
+	READONLY, ///<File is read-only
+	INVALID ///<Invalid file
+};
+
+enum FindFileFlags
+{
+	DIRECTORIES, ///<Looks for files in fs directories only.
+	ARCHIVES,	///<Looks for files in archive only. (.pak)
+	ALL ///<Looks in archives and fs directories.
+}
+
+proto FindFileHandle FindFile(string pattern, out string fileName, out FileAttr fileAttributes, FindFileFlags flags);
+proto bool FindNextFile(FindFileHandle handle, out string fileName, out FileAttr fileAttributes);
+proto native void CloseFindFile(FindFileHandle handle);
+
+//!Makes a directory
+proto native bool MakeDirectory(string name);
+
+//!delete file. Works only on "$profile:" and "$saves:" locations
+proto native bool DeleteFile(string name);
+
+//! copy file. destName must be "$profile:" or "$saves:" location
+proto native bool CopyFile(string sourceName, string destName);
+/** @}*/
+
+ //@}
diff --git a/scripts/1_Core/DayZ/proto/EnVRDevice.c b/scripts/1_Core/DayZ/proto/EnVRDevice.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e804139ebd6dcadcff172ac5d99500d37473efc
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnVRDevice.c
@@ -0,0 +1,281 @@
+#ifdef GAME_TEMPLATE
+
+/**
+* \defgroup VRDeviceAPI generic and platform specific devices
+* @{
+*/
+
+enum VRDeviceType
+{
+	DEVICE_TYPE_OCULUS,
+	DEVICE_TYPE_PS4
+}
+
+enum VRStatus
+{
+	VR_STATUS_UNKNOWN,					//< Unknown state, probably uninitialized.
+	VR_STATUS_VISIBLE,					//< The HMD is being used for rendering.
+	VR_STATUS_PRESENT,					//< The HMD port is open.
+	VR_STATUS_MOUNTED,					//<	The HMD is mounted on users head.
+	VR_STATUS_DISPLAY_LOST,			//< The HMD was present and disappeared.
+	VR_STATUS_SHOULD_QUIT,			//< Application requested exit.
+	VR_STATUS_SHOULD_RECENTER,	//< The HMD Recenter request event was triggered. 
+	VR_STATUS_TRACKED,					//< The tracking data for the HMD are up to date.
+	VR_STATUS_CALIBRATING,			//< The HMD is being calibrated.
+}
+
+enum VRHandEnum
+{
+	VR_HAND_LEFT, //< HMD controller left hand.
+	VR_HAND_RIGHT //< HMD controller right hand.
+}
+
+enum VREye
+{
+	VR_EYE_LEFT, // HMD left eye.
+	VR_EYE_RIGHT // HMD right eye.
+}
+
+/*!
+	VRDevice interface common for all VR implementations.
+
+	DO NOT INHERIT FROM THIS CLASS!
+*/
+class VRDevice : Managed
+{
+	/*!
+		\brief returns VRDevice instance.
+		\return device instance.
+	*/
+	proto native static VRDevice GetInstance();
+
+	/*!
+		\brief returns status flags.
+
+		\return current device state flags.
+	*/
+	proto native VRStatus 				GetStatusFlags();
+	/*!
+		\brief returns device name.
+		\return device brand name.
+	*/
+	proto native owned string	GetName();
+	/*!
+		\brief returns device type. 
+		\return device type enum.
+	*/
+	proto native VRDeviceType GetDeviceType();
+	/*!
+		\brief Forces immediate head recenter.
+
+		Uses the current scene position and orientation
+		as the new camera origin.
+	*/
+	proto native void 								RecenterHeadTracking();
+	/*!
+		\brief returns HMD head position .
+		\return position in world space.
+	*/
+	proto native vector 						GetHeadPosition();
+	/*!
+		\brief returns HMD head orientation. 
+		\return Euler angles in device space. (Yaw, Pitch, Roll)
+	*/
+	proto native vector 						GetHeadOrientation();
+	/*!
+		\brief returns HMD controller's position.
+
+		\param hand left/right hand enum.
+		\return position in world space.
+	*/
+	proto native vector 						GetHandPosition(VRHand hand);
+	/*!
+		\brief returns HMD controller's orientation.
+
+		\param hand left/right hand enum.
+		\return Euler angles in device space. (Yaw, Pitch, Roll)
+	*/
+	proto native vector 						GetHandOrientation(VRHand hand);
+	/*!
+		\brief returns HMD Eye's position.
+
+		\param eye left/right eye enum.
+		\return position in world space.
+	*/
+	proto native vector 						GetEyePosition(VREye eye);
+	/*!
+		\brief returns HMD Eye's orientation.
+		
+		\param eye left/right eye enum.
+		\return Euler angles in device space. (Yaw, Pitch, Roll)
+	*/
+	proto native vector							GetEyeOrientation(VREye eye);
+	/*!
+		\brief Sets up current vr scale.
+		
+		All translations will get scaled by this value.
+		With higher scale values will the world around look smaller.
+
+		"Warning: The tracking errors will render more visible with high scale."
+		\param scale the scale amount.
+	*/
+	proto native void 								SetScale(float scale);
+	/*!
+		\brief returns current vr scale.
+		\return the scale amount. 
+	*/
+	proto native float 							GetScale();
+
+	/*!
+		\brief returns current FOV's tangent values.
+
+		In VR mode the FOV should be asymmetric.
+		\returns tangent values of asymetric FOV.
+	*/
+	proto external void 						GetEyeFOV(VREye eye, out float leftTan, out float rightTan, out float upTan, out float downTan);
+};
+
+enum PSVrHeadRecenterFlagsEnum
+{
+	VR_RECENTER_POSITION,
+	VR_RECENTER_ORIENTATION
+}
+
+enum PSVrBrightnessRiskEnum
+{
+	VR_BRIGHTNESS_RISK_LOW,
+	VR_BRIGHTNESS_RISK_HIGH,
+	VR_BRIGHTNESS_RISK_MAX
+}
+
+enum PSVrTrackingQualityEnum
+{
+	VR_TRACKING_QUALITY_NONE,
+	VR_TRACKING_QUALITY_NOT_VISIBLE,
+	VR_TRACKING_QUALITY_PARTIAL,
+	VR_TRACKING_QUALITY_FULL
+}
+
+enum PSVrDialogStatusEnum
+{
+	VR_DIALOG_UNKNOWN,
+	VR_DIALOG_OK,
+	VR_DIALOG_CANCELED,
+	VR_DIALOG_RUNNING	
+}
+
+/*!
+	PS4 specific VR interface.
+*/
+class VRDevice_PS4 : VRDevice
+{
+	/*!
+		\brief Switches VR device into 2D "theater" mode.
+
+		Don't forget to set appropriate FOV.
+
+		At the moment the device uses the render targets of the
+		left eye. These render targets are 8:9 and we are still rendering
+		both eyes. If the feature gets used in a actual gameplay we can
+		extend it to separate set of 16:9 render targets.
+
+		\param enabled enable/disable flag.
+	*/
+	proto native void Set2D(bool enabled);
+	/*!
+		\brief Pops up HMD service dialog.
+		\return true when dialog was opened and his state was resolved as OK.
+	*/
+	proto native bool ShowHmdServiceDialog();
+	/*!
+		\brief Pops up HMD setup dialog.
+		\return true when dialog was opened and closed successfully.
+	*/
+	proto native bool ShowHmdSetupDialog();
+	/*!
+		\brief Returns current setup dialog state.
+		\return dialog state enum.
+	*/
+	proto native PSVrDialogStatusEnum GetSetupDialogStatus();
+	/*!
+		\brief Returns current service dialog state.
+		\return dialog state enum.
+	*/
+	proto native PSVrDialogStatusEnum GetServiceDialogStatus();
+
+	/*!
+		\brief HMD recentering hint flags setup.
+	*/
+	proto native void SetRecenterHeadFlags(PSVrHeadRecenterFlagsEnum flags);
+	/*!
+		\brief Returns HMD recentering flags.
+		\return recentering enum.
+	*/
+	proto native PSVrHeadRecenterFlagsEnum GetRecenterHeadFlags();
+	/*!
+		\brief Returns the eye offset in device space.
+		\return 3D position centered around device space center.
+	*/
+	proto native vector GetEyeOffset(VREye eye);
+	/*!
+		\brief Sets up the minimal displayable color.
+
+		Setup this value when smears start appearing in 
+		dark environments.
+	*/
+	proto native void SetMinOutputColor(int color);
+	/*!
+		\brief Per eye FOV setup.
+
+		Keep in mind that changing the values from device presets
+		may cause user discomfort.
+	*/
+	proto native void SetEyeFOV(VREye eye, float leftTan, float rightTan, float upTan, float downTan);
+	/*!
+		\brief Resets the FOV settings to device preset value.
+	*/
+	proto native void ResetToDeviceFOV(VREye eye);
+	/*!
+		\brief Sets up the render target size multiplier.
+
+		Set this value before the device gets initialized.
+	*/
+	proto native void SetOversamplingFactor(float factor);
+	/*!
+		\brief Returns HMD tracking status.
+		\param bRisk tracked scene brightness risk.
+		\param posQuality precision of the HMD position.
+		\param orQuality precision of tthe HMD orientation.
+		\return false when the HMD port is not open.
+	*/
+	proto bool GetHmdTrackingStatus(	out PSVrBrightnessRiskEnum bRisk, 
+																		out PSVrTrackingQualityEnum posQuality, 
+																		out PSVrTrackingQualityEnum orQuality);
+	/*!
+		\brief Returns Move controller tracking status.
+
+		\param hand identifier of the contoller.
+		\param bRisk tracked scene brightness risk.
+		\param posQuality precision of the controllers position.
+		\param orQuality precision of the controllers orientation.
+		\return false when the Move port is not open.
+	*/
+	proto bool GetMoveTrackingStatus(	VRHand hand, 
+																						out PSVrBrightnessRiskEnum bRisk, 
+																						out PSVrTrackingQualityEnum posQuality, 
+																						out PSVrTrackingQualityEnum orQuality);
+}				
+
+/*!
+	Oculus specific VR interface.
+*/
+class Oculus : VRDevice
+{
+	// TODO:
+}
+
+/*
+* @}
+*/
+
+#endif
\ No newline at end of file
diff --git a/scripts/1_Core/DayZ/proto/EnVisual.c b/scripts/1_Core/DayZ/proto/EnVisual.c
new file mode 100644
index 0000000000000000000000000000000000000000..debac97a2db88df09de6c9d4989bf2956f4b9943
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnVisual.c
@@ -0,0 +1,244 @@
+/**
+ * \defgroup Visual Visual objects
+ * @{
+ */
+
+//! Loads object from data, or gets it from cache. Object must be released when not used
+proto native vobject GetObject(string name);
+
+/*!
+Release object. When there are not any other references, object is stored into cache and ready to be victed if necessary.
+\param object Object handle
+\param flag If RF_RELEASE is used, the object is evicted immediatelly, if not used by anyone else
+*/
+proto native void ReleaseObject(vobject object, int flag = 0);
+
+//! Returns number of frames, if the object is animation
+proto native int GetNumAnimFrames(vobject anim);
+
+//! Returns name of visual object
+proto string vtoa(vobject vobj);
+
+/**
+ * \defgroup MeshObject Mesh object (XOB)
+ * @{
+ */
+
+proto int GetObjectMaterials(vobject object, string materials[]);
+
+// dynamic model creation (for dynamic aabb triggers)
+//proto void CreateModel(IEntity ent, vector mins, vector maxs);
+//proto void RemoveModel(IEntity ent);
+
+//! Dynamic MeshObject
+proto vobject CreateXOB(int nsurfaces, int nverts[], int numindices[], string materials[]);
+proto void UpdateVertsEx(notnull IEntity ent, int surf, vector verts[], float uv[]);
+proto void UpdateIndices(vobject obj, int surf, int indices[]);
+
+proto native void	SetBone(notnull IEntity ent, int bone, vector angles, vector trans, float scale);
+proto native bool	SetBoneMatrix(notnull IEntity ent, int bone, vector mat[4]);
+proto native void	SetBoneGlobal(notnull IEntity ent, int bone, vector mat[4]);
+proto native bool	GetBoneMatrix(notnull IEntity ent, int bone, vector mat[4]);
+proto native bool	GetBoneLocalMatrix(notnull IEntity ent, int bone, vector mat[4]);
+
+proto native void	SetAnimFrame(notnull IEntity ent, int slot, float frame);
+
+//! BoneMask == NULL means that all bits are set
+//! WARNING: Non-managed, needs manual delete call, should not be ref'd
+class BoneMask
+{
+	int Mask[8]
+}
+
+enum AnimFlags
+{
+	//! animation is played only once and then if freezes at the last frame. EntityEvent.ANIMEND is called
+	ONCE,
+/*! defaultne zustava animace pri prehravani a AF_ONCE po skonceni na posledni frame "zamrzla", dokud neni nahrazena jinou,
+ nebo neni kanal vynulovan. Pokud se nastavi AF_BLENDOUT, postara se engine o vyhozeni animace sam a pro preblendovani pouzije hodnotu
+ blendout. Pokud je odchycen EOnAnimEnd a byla zmenena animace na jinou, nebo byl kanal rucne vynulovan, tak se tato
+ funkcnost neprovede. */
+	BLENDOUT,
+
+//! animation waits on the first frame. Frame is set by calling SetFrame()
+	USER,
+
+//! forces animation to start from begining (including blending)
+	RESET,
+
+/*! defaul framerate is from anim.def. If it is missing, parametr fps applies
+It is possible to use fps parameter even when the framerate is defined in the anim.def, is using this flag
+*/
+	FORCEFPS,
+
+//! EntityEvent.ANIMEND will not be called
+	NOANIMEND,
+
+//! Animhooks will not be called
+	NOANIMHOOKS
+};
+
+proto native void	SetAnimSlot(notnull IEntity ent, int slot, vobject anim, float blendin, float blendout, BoneMask mask, int fps, AnimFlags flags);
+
+// changes a mask and does the blending if the blendin is set
+proto native void ChangeAnimSlotMask(notnull IEntity ent, int slot, float blendin, BoneMask mask);
+
+// changes animation framerate to fps param
+proto native void ChangeAnimSlotFPS(notnull IEntity ent, int slot, int fps);
+
+// set mask for a channel. There are 12 chanels and mask is using first for bits 0..3
+proto native void	SetAnimMask(notnull IEntity ent, int mask);
+
+// clears chanal mask, return bits which were cleared
+proto native int	ClearAnimMask(notnull IEntity ent, int mask);
+
+//vrati nastavene bity tech kanalu, ktere maji nastavenou animaci, nejsou na konci
+// a pro ktere byla nastavena vstupni maska.
+//Je tim mozno se dotazat na stav vice slotu najednou
+proto native int IsAnimSlotPlaying(notnull IEntity ent, int mask);
+//mask - 16bitu, pro 16 anim slotu. Maximalni hodnota je tedy 0xffff!
+
+//sets how much this morph affect object
+proto native bool SetMorphState(notnull IEntity ent, string morph, float value);
+//morph name
+//value 0...1
+//@}
+
+
+/**
+ * \defgroup ParticleEffect Particle effect API
+ * @{
+ */
+
+enum EmitorParam
+{
+	//! Vector3 R/W
+	CONEANGLE,
+	
+	//! Vector3 R/W
+	EMITOFFSET,
+	
+	//! Float R/W
+	VELOCITY,
+	
+	//! Float R/W
+	VELOCITY_RND,
+	
+	//! Float R/W
+	AVELOCITY,
+	
+	//! Float R/W
+	SIZE,
+	
+	//! Float R/W
+	STRETCH,
+
+	//! begin with random rotation. Bool R/W
+	RANDOM_ANGLE,
+	
+	//! rotate in random direction. Bool R/W
+	RANDOM_ROT,
+
+	//! Float R/W
+	AIR_RESISTANCE,
+	
+	//! Float R/W
+	AIR_RESISTANCE_RND,
+
+	//! Float R/W
+	GRAVITY_SCALE,
+
+	//! Float R/W
+	GRAVITY_SCALE_RND,
+	
+	//! Float R/W
+	BIRTH_RATE,
+
+	//! Float R/W
+	BIRTH_RATE_RND,
+
+	//! Float R/W
+	LIFETIME,
+
+	//! Float R/W
+	LIFETIME_RND,
+
+	//! Bool R/W
+	LIFETIME_BY_ANIM,
+
+	//! Bool R/W
+	ANIM_ONCE,
+
+	//! Bool R/W
+	RAND_FRAME,
+
+	//! efector's total time. Float R/W
+	EFFECT_TIME,
+
+	//! should efector repeate after time up? Bool R/W
+	REPEAT,
+
+	//! current efector's time. Float R/W
+	CURRENT_TIME,
+
+	//! number of active particles. Int R
+	ACTIVE_PARTICLES,
+
+	//! Bool R/W
+	SORT,
+
+	//! Bool R/W
+	WIND,
+
+	//! Float R/W
+	SPRING
+};
+
+// return total count of active particles in all emitors
+// internally does a sum
+// HasActiveParticles is better when just needing to check if there are any active
+proto native int GetParticleCount(notnull IEntity ent);
+
+// return if there are any active particles
+proto bool HasActiveParticle(notnull IEntity ent);
+
+int ParticleGetCount(IEntity ent)
+{
+	return GetParticleCount(ent);
+}
+
+bool ParticleHasActive(IEntity ent)
+{
+	return HasActiveParticle(ent);
+}
+
+// gets name of defined emitors in a particle effect
+// return number of emitors and their names in an array (max defines max. emitors to return)
+proto int GetParticleEmitors(notnull IEntity ent, out string emitors[], int max);
+
+// return number of emitors
+proto int GetParticleEmitorCount(notnull IEntity ent);
+
+// sets a parametr of the particle emitor
+// if the emitor == - 1, it sets the parameter for all emitors
+proto void SetParticleParm(notnull IEntity ent, int emitor, EmitorParam parameter, void value);
+
+//gets parameter of particle emitor
+proto void GetParticleParm(notnull IEntity ent, int emitor, EmitorParam parameter, out void value);
+
+//gets original parameter of particle emitor
+proto void GetParticleParmOriginal(notnull IEntity ent, int emitor, EmitorParam parameter, out void value);
+
+//Force-changes particle emitor position to the current one.
+//Used for sudden changes of particle position to avoid spreading emitted
+//particles between previous and the new one position
+proto native void ResetParticlePosition(notnull IEntity ent);
+
+//Restart particle effect to its default state. This means no 
+//particles, timer reset and so on. Usefull for implementing
+//particle cache.
+proto native void RestartParticle(notnull IEntity ent);
+//@}
+
+
+//@}
diff --git a/scripts/1_Core/DayZ/proto/EnWidgets.c b/scripts/1_Core/DayZ/proto/EnWidgets.c
new file mode 100644
index 0000000000000000000000000000000000000000..c765a004525070ad9d680ced86d99fd0fc349b76
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnWidgets.c
@@ -0,0 +1,712 @@
+/**
+ * \defgroup WidgetAPI Widget UI system
+ * @{
+ */
+
+#ifdef DOXYGEN
+/** @name WidgetType
+ *  Following WidgetType constants are available to script 
+ */
+///@{
+
+	//!Single-line text. See enf::TextWidget
+	TextWidgetTypeID,
+	//!Multi-line text. See enf::MultilineTextWidget
+	MultilineTextWidgetTypeID,
+	//!Multi-line edit box. See enf::MultilineTextWidget
+	MultilineEditBoxWidgetTypeID,
+	//!Multi-line text with images in text. See enf::RichTextWidget
+	RichTextWidgetTypeID,
+	//! Render target for enf::BaseWorld. See enf::RenderTargetWidget
+	RenderTargetWidgetTypeID,
+	//! Picture, or multiple picture. See enf::ImageWidget
+	ImageWidgetTypeID,
+	//!Console. See enf::ConsoleWidget
+	ConsoleWidgetTypeID,
+	//!Video player. See enf::VideoWidget
+	VideoWidgetTypeID,
+	//! Texture used as render target for children widgets. See enf::RTTextureWidget
+	RTTextureWidgetTypeID,
+	//! Dummy frame, used as hierarchy node and clipper
+	FrameWidgetTypeID,
+	//! Dummy frame, used for embedding another layout and as hierarchy node and clipper
+	EmbededWidgetTypeID,
+	ButtonWidgetTypeID,
+	CheckBoxWidgetTypeID,
+	WindowWidgetTypeID,
+	ComboBoxWidgetTypeID,
+	SimpleProgressBarWidgetTypeID,
+	ProgressBarWidgetTypeID,
+	SliderWidgetTypeID,
+	BaseListboxWidgetTypeID,
+	TextListboxWidgetTypeID,
+	GenericListboxWidgetTypeID,
+	EditBoxWidgetTypeID,
+	PasswordEditBoxWidgetTypeID,
+	WorkspaceWidgetTypeID,
+	GridSpacerWidgetTypeID,
+	WrapSpacerWidgetTypeID,
+	ScrollWidgetTypeID,	
+///@}
+#else
+	typedef TypeID WidgetType;
+#endif
+
+typedef TypeID EventType;
+
+enum WidgetFlags
+{
+	SOURCEALPHA, //< takes alpha from texture * alpha from color. If not set, considers texture as non-transparent and transparency is set only by color
+	BLEND,	//< texture is blended with a surface base on alpha
+	ADDITIVE,	//< texture is added to a surface based on alpha
+	VISIBLE,	//<Widget is visible - ShowWidget(w, true)
+	NOWRAP,	//< Do not do texture wrapping
+	CENTER,	//< Centers TextWidgetTypeID
+	VCENTER,	//< Centers TextWidgetTypeID verticaly
+	HEXACTPOS,
+	VEXACTPOS,
+	EXACTPOS,	//< Uses physical resolution (g_iWidth, h_iHeight)
+	HEXACTSIZE,	//< Uses physical resolution (g_iWidth)
+	VEXACTSIZE,	//< Uses physical resolution (h_iHeight)
+	EXACTSIZE,	//< Uses physical resolution
+	NOFILTER,	//< no texture filtering (no blur)
+	RALIGN,	//< Right alignment TextWidgetTypeID
+	STRETCH,	//< Stretch texture to a full size
+	FLIPU,	//< Flips texture in U axis
+	FLIPV,	//< Flips texture in V axis
+	CUSTOMUV,	//< ignores STRETCH/FLIPU/FLIPV and take custom UV set by SetWidgetUV()
+	IGNOREPOINTER,
+	DISABLED,
+	NOFOCUS,
+	CLIPCHILDREN,
+	RENDER_ALWAYS,
+	NOCLEAR,
+	DRAGGABLE
+};
+
+//------------------------------------------
+enum WidgetAlignment
+{
+	WA_LEFT			= 0,
+	WA_RIGHT		= 1,
+	WA_CENTER		= 2,
+	WA_TOP			= 0,
+	WA_BOTTOM		= 1,
+}
+
+//------------------------------------------
+//! Defined in code
+/*enum LinebreakOverrideMode
+{
+	LINEBREAK_DEFAULT,
+	LINEBREAK_WESTERN,
+	LINEBREAK_ASIAN
+};*/
+
+//------------------------------------------
+class Widget: Managed
+{
+	proto void ~Widget();
+	proto private void Widget();
+	
+	proto static string TranslateString(string stringId);
+	
+	//! Set global LV of widgets, value between [-15, 0], default: 0, lower value is less bright
+	proto static void SetLV(float lv);
+	//! Set global LV of the text in widgets, value between [-15, 0], default: 0, lower value is less bright
+	proto static void SetTextLV(float lv);
+	//! Set global lighting of objects in widgets, value between [0, 1], default: 1, lower value is less bright
+	proto static void SetObjectLighting(float lighting);
+	
+	proto native owned string GetName();
+	proto native void SetName(string name);
+	proto native owned string GetTypeName();
+	proto native WidgetType GetTypeID();
+	proto native void Show(bool show, bool immedUpdate = true);
+	proto native void Enable(bool enable);
+	proto native int GetFlags();
+	proto native int SetFlags(int flags, bool immedUpdate = true);
+	proto native int GetSort();
+	proto native void SetSort(int sort, bool immedUpdate = true);
+	proto native int ClearFlags(int flags, bool immedUpdate = true);
+	proto native bool IsControlClass();
+	proto native owned string GetStyleName();
+	proto void GetUserData(out Class data);
+	proto native void SetUserData(Class data);
+	proto native int GetUserID();
+	proto native void SetUserID(int id);
+	proto native bool IsVisible();
+	proto native bool IsVisibleHierarchy();
+	proto native void SetPos(float x, float y, bool immedUpdate = true);
+	proto native void SetSize(float w, float h, bool immedUpdate = true);
+	proto native void SetScreenPos(float x, float y, bool immedUpdate = true);
+	proto native void SetScreenSize(float w, float h, bool immedUpdate = true);
+	proto native void SetColor(int color);
+	proto native int GetColor();
+	proto native void SetRotation(float roll, float pitch, float yaw, bool immedUpdate = true);
+	//! returns rotation of widget in order roll, pitch, yaw
+	proto native vector GetRotation();
+	proto native void SetAlpha(float alpha);
+	proto native float GetAlpha();
+	proto void GetPos(out float x, out float y);
+	proto void GetSize(out float width, out float height);
+	proto void GetScreenPos(out float x, out float y);
+	proto void GetScreenSize(out float width, out float height);
+
+  proto native void SetTransform(vector mat[4], bool immedUpdate = true);
+
+  proto native Widget GetParent();
+	proto native Widget GetChildren();
+	proto native Widget GetSibling();
+	proto native void AddChild(Widget child, bool immedUpdate = true);
+	proto native void RemoveChild(Widget child);
+
+	proto native volatile void Update();
+
+	proto void GetScript(out Class data);
+
+	proto native Widget FindWidget(string pathname);	//find Widget by path. e.g FindWidget("widget1.widget2.widget3.mywidget")
+	proto native Widget FindAnyWidget(string pathname);	//find Widget by name e.g. FindWidget("widget1")
+	proto native Widget FindAnyWidgetById(int user_id);	//find Widget by userID
+
+	proto native void SetHandler(ScriptedWidgetEventHandler eventHandler);
+	proto native void Unlink(); //destroys widget and all its children
+};
+
+class WorkspaceWidget: Widget
+{
+	//!Create widgets by \ref WidgetType
+	proto native external Widget CreateWidget(WidgetType type, int left, int top, int width, int height, WidgetFlags flags, int color, int sort, Widget parentWidget = NULL);
+	//!Create widgets from *.layout file
+	proto native external Widget CreateWidgets(string layout, Widget parentWidget = NULL, bool immedUpdate = true);	
+};
+
+proto native Widget GetWidgetUnderCursor();
+proto native Widget CancelWidgetDragging();
+proto native Widget GetDragWidget();
+proto native void ReportMouse(int mousex, int mousey, Widget rootWidget);
+
+class TextWidget extends Widget
+{
+  	proto native void SetTextSpacing(int horiz, int vert);
+	//! set text exact size. Exact Text flag must be enabled. 0 equals original size.
+	proto native void SetTextExactSize(int size);
+  	proto native void SetTextOffset(int left, int top);
+	proto native void SetText(string text, bool immedUpdate = true);
+	proto native void SetOutline(int outlineSize, int argb = 0xFF000000);
+	proto native int GetOutlineSize();
+	proto native int GetOutlineColor();
+	proto native void SetShadow(int shadowSize, int shadowARGB = 0xFF000000, float shadowOpacity = 1, float shadowOffsetX = 0, float shadowOffsetY = 0);
+	proto native int GetShadowSize();
+	proto native int GetShadowColor();
+	proto native float GetShadowOpacity();
+	proto void GetShadowOffset(out float sx, out float sy);
+	proto native void SetItalic(bool italic);
+	proto native bool GetItalic();
+	proto native void SetBold(bool bold);
+	proto native bool GetBold();
+	
+	//! Returns text size in pixels
+	proto void GetTextSize(out int sx, out int sy);
+	proto void SetTextFormat(string text, void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);
+	
+	//! Get text proportion - ratio between button height and button text height in interval <0,1>
+	proto native float GetTextProportion();
+	//! Set text proportion - ratio between button height and button text height in interval <0,1>
+	proto native void SetTextProportion(float val);
+};
+
+class MultilineTextWidget extends TextWidget
+{
+	proto native float SetLineBreakingOverride(int mode);
+};
+
+class RichTextWidget extends TextWidget
+{
+	proto native float GetContentHeight();
+	proto native float GetContentOffset();
+	proto native void  SetContentOffset(float offset, bool snapToLine = false);
+	proto native void  ElideText(int line, float maxWidth, string str);
+	proto native int   GetNumLines();
+	proto native void  SetLinesVisibility(int lineFrom, int lineTo, bool visible);
+	proto native float GetLineWidth(int line);
+	proto native float SetLineBreakingOverride(int mode);
+};
+
+class RenderTargetWidget extends Widget
+{
+//!when period > 1 then every n-th frame will be rendered. Offset is initial counter.
+	proto native void SetRefresh(int period, int offset);
+	proto native void SetResolutionScale(float xscale, float ycale);
+};
+
+class RTTextureWidget extends Widget
+{
+};
+
+class ImageWidget extends Widget
+{
+	/*!
+	Loads image. When image of this 'num' is already loaded, then is replaced
+	by new one.
+	\param num Number of image (0...7)
+	\param name Name of image file
+	\param noCache Do not cache the texture
+	\return True when image is loaded, false otherwise
+	*/
+	proto native bool LoadImageFile(int num, string name, bool noCache = false);
+	proto native void SetImageTexture(int image, RTTextureWidget texture);
+	//! returns size of image
+	proto void GetImageSize(int image, out int sx, out int sy);
+	
+	/*!
+	Switches to another image, if it's loaded
+	\param num Number of image.
+	\return True when there is such image, false otherwise.
+	*/
+	proto native bool SetImage(int num);
+	//!Returns active image
+	proto native int GetImage();
+	/*!
+	When WF_CUSTOMUV is set, we can supply our own UV coords instead of computed ones.
+	\param uv
+	Pointer to array of at least 8 floats (4 corners * 2 floats for u/v)
+	*/
+	proto native void SetUV(float uv[4][2]);
+	
+	/*!
+	Loads texture as mask used for alpha masking.
+	\param resource Resource name of the texture to load
+	\return True if texture was successfully loaded, false otherwise
+	*/
+	proto native bool LoadMaskTexture(string resource);
+	
+	/*!
+	Progress determines which alpha values are opaque using the mask. For progress x, 
+	pixels with alpha in mask < x will be opaque and alpha in mask > x will be transparent.
+	For smooth transition see GetMaskTransitionWidth.
+	\return Progress from 0 to 1 representing alpha range which is visible in the mask
+	*/
+	proto native float GetMaskProgress();
+	
+	/*!
+	See GetMaskProgress for explanation.
+	\param value Expected in range [0; 1]
+	*/
+	proto native void SetMaskProgress(float value);
+	
+	/*!
+	Transition width 0.1 and progress 0.2 mean that values in mask lower than progress will be opaque.
+	Values higher than (progress + width) will be transparent and values between progress and (progress + width)
+	will be smoothly transitioned.
+	\return Width of the alpha mask transition representing softness of the transition.
+	*/
+	proto native float GetMaskTransitionWidth();
+
+	/*!
+	See GetMaskTransitionWidth for transition width explanation.
+	\param value Expected in range [0; 1]
+	*/
+	proto native void SetMaskTransitionWidth(float value);
+};
+
+class MultilineEditBoxWidget extends TextWidget
+{
+	proto native int GetLinesCount();
+	proto native int GetCarriageLine();
+	proto native int GetCarriagePos();
+	proto void GetText(out string text);
+	proto native void SetLine(int line, string text);
+	proto void GetLine(int line, out string text);
+};
+
+class UIWidget extends Widget
+{
+	proto native void SetTextColor(int color);
+	proto native void SetTextOutline(int outlineSize, int argb = 0xFF000000);
+	proto native int GetTextOutlineSize();
+	proto native int GetTextOutlineColor();
+	proto native void SetTextShadow(int shadowSize, int shadowARGB = 0xFF000000, float shadowOpacity = 1.0, float shadowOffsetX = 0.0, float shadowOffsetY = 0.0);
+	proto native int GetTextShadowSize();
+	proto native int GetTextShadowColor();
+	proto native float GetTextShadowOpacity();
+	proto native float GetTextShadowOffsetX();
+	proto native float GetTextShadowOffsetY();
+	proto native void SetTextItalic(bool italic);
+	proto native bool GetTextItalic();
+	proto native void SetTextBold(bool bold);
+	proto native bool GetTextBold();
+};
+
+class CanvasWidget extends Widget
+{
+	proto native void DrawLine(float x1, float y1, float x2, float y2, float width, int color);
+	proto native void Clear();
+};
+
+class EditBoxWidget extends UIWidget
+{
+	proto string GetText();
+	proto native void SetText(string str);
+};
+
+class PasswordEditBoxWidget extends EditBoxWidget
+{
+	proto native void SetHideText(bool hide);
+};
+
+class SliderWidget extends UIWidget
+{
+	proto native void SetMinMax(float minimum, float maximum);
+	proto native float GetMin();
+	proto native float GetMax();
+	proto native float GetCurrent();
+	proto native void SetCurrent(float curr);
+	proto native float GetStep();
+	proto native void SetStep(float step);
+};
+
+class SimpleProgressBarWidget extends UIWidget
+{
+	proto native float GetMin();
+	proto native float GetMax();
+	proto native float GetCurrent();
+	proto native void SetCurrent(float curr);
+};
+
+class ProgressBarWidget extends SimpleProgressBarWidget
+{
+};
+
+class ButtonWidget extends UIWidget
+{
+	proto native bool GetState();
+ 
+	proto native bool SetState(bool state);
+
+	proto native void SetText(string text);
+
+	proto void GetText(out string text);
+
+	proto native void SetTextOffset(float xoffset, float yoffset);
+/**
+\param align ALIGN_CENTER, ALIGN_LEFT, ALIGN_RIGHT
+*/
+	proto native void SetTextHorizontalAlignment(int align);
+/**
+\param align ALIGN_CENTER, ALIGN_TOP, ALIGN_BOTTOM
+*/
+	proto native void SetTextVerticalAlignment(int align);
+
+	//! Get text proportion - ratio between button height and button text height in interval <0,1>
+	proto native float GetTextProportion();
+	//! Set text proportion - ratio between button height and button text height in interval <0,1>
+	proto native void SetTextProportion(float val);
+};
+
+class XComboBoxWidget extends UIWidget
+{
+	proto native int AddItem(string item);
+	proto native void ClearAll();
+	proto native void SetItem(int item, string value);
+	proto native void RemoveItem(int item);
+	proto native int GetNumItems();
+	proto native int SetCurrentItem(int n);
+	proto native int GetCurrentItem();
+};
+
+class CheckBoxWidget extends UIWidget
+{
+	proto native void SetText(string str);
+	proto native bool IsChecked();
+	proto native void SetChecked(bool checked);
+};
+
+class BaseListboxWidget extends UIWidget
+{
+	proto native void ClearItems();
+	proto native int GetNumItems();
+	proto native void SelectRow(int row);
+	proto native int GetSelectedRow();
+	proto native void RemoveRow(int row);
+	proto native void EnsureVisible(int row);
+};
+
+class SimpleListboxWidget extends BaseListboxWidget
+{
+};
+
+class TextListboxWidget extends SimpleListboxWidget
+{
+	//! Insert new Row, if row = -1, new Row is inserted at the end otherwise at row index.
+	proto native int AddItem(string text, Class userData, int column, int row = -1);
+	proto native void SetItem(int position, string text, Class userData, int column);
+/**
+\brief Get item
+	\param row \p int Index of row
+	\param column \p int Index of column
+	\return \p string Value in widget on row and column
+	@code
+		string value;
+		textListboxWidg.GetItemText(2, 0, value);
+	@endcode
+*/
+	proto bool GetItemText(int row, int column, out string text);
+	proto void GetItemData(int row, int column, out Class data);
+	
+	proto native void SetItemColor(int row, int column, int color );
+};
+
+class SpacerBaseWidget extends UIWidget
+{
+	proto native void AddChildAfter(Widget child,Widget after, bool immedUpdate = true);
+}
+
+class SpacerWidget extends SpacerBaseWidget
+{
+	proto native WidgetAlignment GetContentAlignmentH();
+	proto native void SetContentAlignmentH(WidgetAlignment alignment);
+	proto native WidgetAlignment GetContentAlignmentV();
+	proto native void SetContentAlignmentV(WidgetAlignment alignment);
+}
+
+class GridSpacerWidget extends SpacerWidget
+{
+}
+
+class WrapSpacerWidget extends SpacerWidget
+{
+}
+
+class ScrollWidget extends SpacerBaseWidget
+{
+	proto native float GetScrollbarWidth();
+	proto native bool IsScrollbarVisible(); //reflects native C++ side scrollbar state
+
+	proto native float GetContentWidth();
+	proto native float GetContentHeight();
+	
+	proto native float GetHScrollPos();
+	proto native float GetHScrollPos01();
+	proto native bool HScrollStep(int steps);
+	proto native void HScrollToPos(float pos);
+	proto native void HScrollToPos01(float pos01);
+	proto native void HScrollToWidget(Widget child);
+
+	proto native float GetVScrollPos();
+	proto native float GetVScrollPos01();
+	proto native bool VScrollStep(int steps);
+	proto native void VScrollToPos(float pos);
+	proto native void VScrollToPos01(float pos01);
+	proto native void VScrollToWidget(Widget child);
+};
+
+//! Legacy, do not use
+enum VideoCommand
+{
+	PLAY,
+	STOP,
+	REWIND,
+	POSITION,
+	REPEAT,
+	ISPLAYING,
+	KILL
+};
+
+enum VideoState
+{
+	//! There is no video
+	NONE,
+	//! The video is playing
+	PLAYING,
+	//! The video is paused
+	PAUSED,
+	//! The video is paused at the beginning of the video
+	STOPPED,
+	//! The video is paused at the end of the video
+	FINISHED,
+};
+
+enum VideoCallback
+{
+	ON_PLAY,
+	ON_PAUSE,
+	ON_STOP,
+	ON_END,
+	ON_LOAD,
+	ON_SEEK,
+	ON_BUFFERING_START,
+	ON_BUFFERING_END,
+};
+
+class VideoWidget extends Widget
+{
+	//! Load a video file
+	proto native bool Load(string name, bool looping = false, int startTime = 0);
+	//! Unload the video, freeing up all resources
+	proto native void Unload();
+	
+	//! Starts video playback
+	proto native bool Play();
+	//! Pauses video playback
+	proto native bool Pause();
+	//! Stop video playback (cancels everything and sets it back at time 0)
+	proto native bool Stop();
+	
+	//! Set the desired time for the video (preload decides whether it will already load the next frames too)
+	proto native bool SetTime(int time, bool preload);	
+	//! Get the current time of the video
+	proto native int GetTime();
+	//! Get the total time of the video
+	proto native int GetTotalTime();
+	
+	//! Set whether the video should loop
+	proto native void SetLooping(bool looping);	
+	//! Whether looping is enabled
+	proto native bool IsLooping();
+	
+	//! QoL direct method to check for playing state (buffering while playing will still return true)
+	proto native bool IsPlaying();
+	//! Get the current state of the video
+	proto native VideoState GetState();
+	
+	/**
+	\brief Enable/Disable subtitles
+	\warning Subtitles need font to be assigned to VideoWidget in layout to work
+	\note Subtitles are in the format "videoName_Language.srt"
+	\note It is best to have the English one without language specified "videoName.srt"
+	*/
+	proto native void DisableSubtitles(bool disable);
+	//! Check if subtitles are disabled (enabled by default if available, so it will return false even if there are none)
+	proto native bool IsSubtitlesDisabled();
+	
+	//! Set a callback for a certain video event
+	proto void SetCallback(VideoCallback cb, func fn);
+	
+	//! Legacy, preferably not used, left for backwards compat
+	int Play(VideoCommand cmd)
+	{
+		// Yes, some things here do not do what the name implies
+		// And it returns 0 whether successful or not
+		// But this is what the old functionality looked like
+		// So for true backwards compat, it will be left like this
+		switch (cmd)
+		{
+			case VideoCommand.PLAY:
+				Play();
+				break;
+			case VideoCommand.STOP:
+				Pause();
+				break;
+			case VideoCommand.REWIND:
+				SetTime(0, true);
+				break;		
+			case VideoCommand.POSITION:
+				return GetTime();
+			case VideoCommand.REPEAT:
+				SetLooping(true);
+				break;
+			case VideoCommand.ISPLAYING:
+				return IsPlaying();
+			case VideoCommand.KILL:
+				Unload();
+				break;
+			default:
+				return 0;
+		}
+		
+		return 0;
+	}
+	
+	//! Legacy, preferably not used, left for backwards compat
+	bool LoadVideo(string name, int soundScene)
+	{
+		return Load(name);
+	}
+};
+
+/*! sets Widget typu RTTextureWidgetTypeID, to which it is possible to reference in shader as $rendertarget
+it is posible to use only after object selection. When selecting another object, it is necessary to set GUI widget again
+*/
+proto native void SetGUIWidget(IEntity ent, int index, RTTextureWidget w);
+
+enum ControlID
+{
+	CID_NONE = 0,
+	CID_SELECT = 1,//select/use focused
+	CID_BACK,
+	CID_LEFT, //navigation
+	CID_RIGHT,
+	CID_UP,
+	CID_DOWN,
+	CID_MENU, //get to main menu
+	CID_DRAG, //probably needed only for consoles
+	CID_TABLEFT,
+	CID_TABRIGHT,
+	CID_RADIALMENU,
+	CID_COUNT
+};
+
+class ScriptedWidgetEventHandler: Managed
+{
+	bool OnClick(Widget w, int x, int y, int button);
+	bool OnModalResult(Widget w, int x, int y, int code, int result);
+	bool OnDoubleClick(Widget w, int x, int y, int button);
+	bool OnSelect(Widget w, int x, int y);
+	bool OnItemSelected(Widget w, int x, int y, int row, int column, int oldRow, int oldColumn);
+	bool OnFocus(Widget w, int x, int y);
+	bool OnFocusLost(Widget w, int x, int y);
+	bool OnMouseEnter(Widget w, int x, int y);
+	bool OnMouseLeave(Widget w, Widget enterW, int x, int y);
+	bool OnMouseWheel(Widget w, int x, int y, int wheel);
+	bool OnMouseButtonDown(Widget w, int x, int y, int button);
+	bool OnMouseButtonUp(Widget w, int x, int y, int button);
+	//! control is one of ControlID 
+	bool OnController(Widget w, int control, int value);
+	bool OnKeyDown(Widget w, int x, int y, int key);
+	bool OnKeyUp(Widget w, int x, int y, int key);
+	bool OnKeyPress(Widget w, int x, int y, int key);
+	bool OnChange(Widget w, int x, int y, bool finished);
+	bool OnDrag(Widget w, int x, int y);
+	bool OnDragging(Widget w, int x, int y, Widget reciever);
+	bool OnDraggingOver(Widget w, int x, int y, Widget reciever);
+	bool OnDrop(Widget w, int x, int y, Widget reciever);
+	bool OnDropReceived(Widget w, int x, int y, Widget reciever);
+	bool OnResize(Widget w, int x, int y);
+	bool OnChildAdd(Widget w, Widget child);
+	bool OnChildRemove(Widget w, Widget child);
+	bool OnUpdate(Widget w);
+	bool OnEvent(EventType eventType, Widget target, int parameter0, int parameter1);
+};
+
+//Common Widget API
+proto native void SetCursorWidget(Widget cursor);
+//! direct mouse cursor visibility control
+proto native void ShowCursorWidget(bool show);
+proto native bool LoadWidgetImageSet(string filename);
+proto native void LoadWidgetStyles(string filename);
+// sets active window (widget which owns some control inputs like buttons, listboxes etc.). Necessary for controlling the focus by keyboard/joypad. In case when setFocus is set to true, it sets focus on a first child Widget, which may receive the focus (is not disabled, set as NoFocus etc.)
+proto native bool SetActiveWindow(Widget w, bool resetFocus);
+
+// sets focus (necessary when using keyboard/joyped) to a particular widget. Widget must have some inputs like button, listbox, checkbox, combobox etc.
+proto native void SetFocus(Widget w);
+
+proto native void SetModal(Widget w);
+
+proto native Widget GetFocus();
+
+//RenderTargetWidgetTypeID
+proto native void SetWidgetWorld(RenderTargetWidget w, IEntity wrldEntity, int camera);
+
+
+#ifdef PS3
+	/*!
+	circle and cross can be swapped when license area is japan/asia
+	*/
+	proto native bool IsCircleToCrossSwapped();
+#endif
+
+proto native bool ReloadTexture(string path);
+
+
+//@}
diff --git a/scripts/1_Core/DayZ/proto/EnWorld.c b/scripts/1_Core/DayZ/proto/EnWorld.c
new file mode 100644
index 0000000000000000000000000000000000000000..b313fc8b293689dab2e1112f1709273245cbab4a
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/EnWorld.c
@@ -0,0 +1,436 @@
+/**																																											 /**
+ * \defgroup World World
+ * @{
+ */
+
+//----------------------------------------------
+/**
+ * \defgroup WorldCommon World
+ * @{
+ */
+
+typedef int[] WorldHandle;
+
+proto native float GetWorldTime();
+
+/*! Sets current world. It allows to work with entities outside world processing
+// return previous world
+*/
+proto native WorldHandle SetCurrentWorld(WorldHandle world);
+
+//proto native void SchedulePreload(vector pos, float radius);
+
+proto native IEntity FindEntityByName(IEntity worldEnt, string name);
+proto native IEntity FindEntityByID(IEntity worldEnt, int ID);
+
+//!returns number of active (simulated) Entities in the world
+proto native int GetNumActiveEntities(IEntity worldEntity);
+//!returns active entity
+proto native IEntity GetActiveEntity(IEntity worldEntity, int index);
+//@}
+
+//----------------------------------------------
+/**
+ * \defgroup Camera Camera
+ * @{
+ */
+
+enum CameraType
+{
+	PERSPECTIVE,
+	ORTHOGRAPHIC
+};
+
+//! sets which camera will be a listener (for sound engine)
+proto native void SetListenerCamera(int camera);
+
+/*!
+Changes camera position
+\param cam Index of camera
+\param origin	position
+\param angle	orientation
+*/
+proto native void SetCamera(int cam, vector origin, vector angle);
+
+//! Changes camera matrix
+proto native void SetCameraEx(int cam, const vector mat[4]);
+
+//!Returns current camera transformation
+proto native void GetCamera(int cam, out vector mat[4]);
+
+proto native void SetCameraVerticalFOV(int cam, float fovy);
+proto native void SetCameraFarPlane(int cam, float farplane);		//default 160000 units
+proto native void SetCameraNearPlane(int cam, float nearplane);	//default 5 units
+
+proto native void SetCameraType(int cam, CameraType type);
+
+/*! 
+\brief Post-process effect type.
+\attention Keep enum names in synch with post-process effect material class names. Postfix "Effect" is appended automatically.
+*/
+enum PostProcessEffectType
+{
+	None,
+	UnderWater,
+	SSAO,
+	DepthOfField,
+	HBAO,
+	RotBlur,
+	GodRays,
+	Rain,
+	FilmGrain,
+	RadialBlur,
+	ChromAber,
+	WetDistort,
+	DynamicBlur,
+	ColorGrading,
+	Colors,
+	Glow,
+	SMAA,
+	FXAA,
+	Median,//unused?
+	SunMask,
+	GaussFilter,
+	SSR //not available
+};
+/*!
+set postprocess effect to camera
+To disable effect in some prioroty ppEffect, just set effectName or name to NULL
+\param cam 		number of camera
+\param priority		priority of effect
+\param type	type of effect
+\param materialPath 		material
+*/
+proto native void SetCameraPostProcessEffect(int cam, int priority, PostProcessEffectType type, string materialPath);
+		
+//ent can be NULL for world-space coords
+proto vector	ProjectVector(int cam, IEntity ent, vector vec);
+proto vector	UnprojectVector(int cam, float x, float y, vector dir);
+
+//@}
+
+//----------------------------------------------
+/**
+ * \defgroup Light Light API
+ * @{
+ */
+
+//!Light handle
+typedef int[] HLIGHT;
+
+enum LightType
+{
+	POINT, //< point light, all directional light
+	SPOT,	//<	spot light, direction is determined by owner (entity)
+	DIRECTIONAL,
+	AMBIENT
+};
+
+enum LightFlags
+{
+/*!
+Dynamic light. There is limit 512 dynamic lights per world and
+32 per camera view. They are faster when moving and changing shape.
+Also they are always attached to owner entity
+*/
+	DYNAMIC, 
+	CASTSHADOW,
+//! for cheaper dynamic lights, like muzzle flashes (might use cheaper rendering method)
+	CHEAP
+};
+
+/*!
+creates light
+*/
+proto HLIGHT AddLight(IEntity owner, LightType type, LightFlags flags, float radius, vector color);
+//!removes light
+proto native bool RemoveLight(HLIGHT light);
+proto native bool SetLightEx(HLIGHT light, float radius, vector color);
+//!sets lookup texture for projection lights
+proto native bool SetLightTexture(HLIGHT light, string cubemap);
+proto native int SetLightFlags(HLIGHT light, LightFlags flags);
+proto native int ClearLightFlags(HLIGHT light, LightFlags flags);
+//!Sets light cone in degrees (for LightType.SPOT).
+proto native bool SetLightCone(HLIGHT light, float cone);
+
+/*!
+scene multiplicator of light (based on measured scene light levels) - preexposure of light
+*/
+proto native float GetSceneHDRMul(int camera);
+//@}
+
+
+
+//----------------------------------------------
+/**
+ * \defgroup WorldTrace Trace&Visibility API
+ * @{
+ */
+
+enum TraceFlags
+{
+	BONES, //< tests collision geometries around bones of animated objects
+	ENTS, //< tests entities
+	WORLD, //< tests world bounding box
+	ONLY_PHYSICS,
+	WATER, //< tests collision with water surface
+	PASSTRANSLUCENT,//< Do not intersects with entities with EntityFlags.TRANSLUCENT set
+	RAGDOLLS, //< tests ragdolls
+	VISTEST, //< performs visibility test first. Not necessary for entities receiving EntityEvent.VISIBLE, because there is a certainty that a camera will see them
+	NOTRACE,
+	TRANSPARENT_OCCLUDERS
+};
+
+enum TraceShape
+{
+  LINE,
+  BOX,
+  OBB,
+  SPHERE
+};
+
+//! collision and tracing
+//! WARNING: Non-managed, needs manual delete call, should not be ref'd
+class TraceContact
+{
+	float	Fraction;
+	int		Content;
+	int		Surfparm;
+	int		MaterialFlags;
+	int		Triangle;
+	int		SurfaceID;
+	owned string	MaterialName;
+	owned string	OriginalMaterialName;
+	float		Plane[4];
+	vector	Point;
+}
+
+proto native bool TraceLineToEntity(IEntity ent, vector start, vector end, out TraceContact contact);
+
+//bool FilterCallback(Class target [, vector rayorigin, vector raydirection])
+
+class TraceParam: Managed
+{
+	vector		Start;
+	vector		End;
+	int			LayerMask = 0xffffffff;
+	TraceFlags	Flags;
+	IEntity		Exclude;
+	
+};
+
+class TraceSphere: TraceParam
+{
+	float			Radius;	
+};
+
+class TraceBox: TraceParam
+{
+	vector		Mins;
+	vector		Maxs;
+};
+
+class TraceOBB: TraceBox
+{
+	vector		Mat[3];
+};
+
+/*!
+traces line start->end, return 0..1 if trace was sucessfull.
+// It take bboux from ent
+// flag like in P2PVisibilityEx will be added
+//OUTPUT:
+\param cent		[out] traced entity
+\param plane	[out] traced polygon plane (X,Y,Z,D)
+\param surfparm	 [out] traced surface parameters
+\returns	value 0...1, percentage of a path traveled
+*/
+proto volatile float TraceMove(TraceParam param, out IEntity cent, out float plane[4], out int surfparm, func filtercallback);
+
+
+/*!
+tests visibility
+\param from
+\param to
+\param flags
+//TraceFlags.VISTEST	- 
+//TraceFlags.DETAIL		- test agains detail brushes
+//TraceFlags.ENT			- test against brush entities
+//TraceFlags.NOTRACE	- doesn't test geometry (has meaning in conjuction with s TraceFlags.VISTEST)
+\returns		true is visible/false not visibel
+*/
+proto native int P2PVisibilityEx(vector from, vector to,int flags);
+
+//! finds all entities in a radius
+proto int SphereQuery(vector origin, float radius, out IEntity visents[], int ents, int fmask);
+
+/*!tests if bbox is visible according to view-frustum and PVS
+\param flags & 1 - test also PVS
+\returns true/false is/isn't visible
+*/
+proto native bool IsBoxVisible(vector mins, vector maxs, int flags);
+
+/*!finds all visible entities (rought, according to a visibility. It is convinient for entitie selection where we want to do more precise visibility test)
+\param origin		-		position it is looked from
+\param look		-		look direction
+\param angle		-		view angle (usuably 90). -1 if we do not care about the view angle
+\param ents		-		array to which entities will be stored
+\param maxents	-		length of the array (prevents overflowing the array)
+\param fmask		-		flag mask (SetFlags()). Entity must have all flags set.
+						it is possible to use reserved flags like EntityFlags.USER1, EntityFlags.USER2, EntityFlags.USER6 for fast finding of entities in custom categories
+*/
+proto int		VisEntities(vector origin, vector look, float angle, float radius, out IEntity ents[2], int maxents, int fmask);
+
+/*!
+Object that handles visibility on GPU. Used for coronas etc.
+*/
+class OcclusionQuery
+{
+	proto private void ~OcclusionQuery();
+
+	/*!
+	return Query result
+	\returns  -1 result is not ready yet, try it later.
+  >0 point is visible
+ ==0 point is not visible
+	*/
+	proto native int GetResult();
+
+	//!Sets world position
+	proto native void SetPosition(vector pos);
+	//!Destroys the object
+	proto native void Destroy();
+};
+
+//@}
+
+//----------------------------------------------
+/**
+ * \defgroup Decals Decals API
+ * @{
+ */
+typedef int[] hDecal;
+
+/*!
+Creates single visual mark, e.g. from shots
+//when lifetime=0, pointer to decal is returned, that can be removed by RemoveDecal then
+\param entity		entity where the landmark should be created
+\param origin		first point of the decal, nothing is done now
+\param project	projection direction (length is far clipping distance)
+\param nearclip	near clipping distance
+\param materialName Material used for decal
+\param lifetime	Lifetime in seconds
+\param flags Not used ATM
+\return Decal pointer or null
+*/
+proto native hDecal CreateDecal(IEntity entity, vector origin, vector project, float nearclip, float angle, float size, string materialName, float lifetime, int flags);
+
+proto native void RemoveDecal(hDecal decal);
+
+/*!
+Creates continous visual mark, e.g. from wheel when a car is moving on the ground
+\param entity		entity where the landmark should be created (only terrain is supported ATM)
+\param origin		first point of the decal, nothing is done now
+\param normal		normal of surface
+\param edgesize	Edge size of decal
+\param lifetime	Lifetime in seconds
+\param materialName Material used for decal
+\param prev			Previous decal, we are connecting to
+\param alpha		translucency of point
+\return Decal pointer or null
+*/
+proto native hDecal CreateLandMarkDecal(IEntity entity, vector origin, vector normal, float edgeSize, float lifeTime, string materialName, hDecal prevDecal, float alpha);
+
+
+/*!
+is it possible to add new point to landmark decal?
+\param lmDecal		entity to add new landmark point
+\param entity		entity to add new landmark point
+\param mat			material of decal
+\param newpoint 	new point to add
+\return
+	LMD_ERROR 	= error when adding new point (invalid decal)
+	LMD_VALID 	= can add new point
+	LMD_DIFF_ENT 	= new point is on different entity
+	LMD_TOO_FAR	= new point is too far from previous point
+*/
+proto native int CanAddToLandMarkDecal(hDecal lmDecal, IEntity entity, string mat, vector newPoint);
+
+/*!
+add new point to decal, internally, new point is added when previous point is in some
+distance or the angle is more than some threshold
+\param lmDecal		entity to add new landmark point
+\param point		contact point
+\param normal		normal of contact
+\param alpha		translucency in point
+\return true if everything was OK, false if not. In this case, the application MUST not used later the pointer to decal, it's finalized internally !
+*/
+proto native bool AddPointToLandMarkDecal(hDecal lmDecal, vector point, vector normal, float alpha);
+
+/*!
+finalize landmark adding, e.g. when entity lose contact with ground -> the pointer to decal
+should have only world and entity if it has something to render, otherwise it's destroyed here
+\param lmDecal		entity to add new landmark point
+\param addAlpha	if to add last point with transition to zero alpha
+\param alphaDist	distance to add last point
+*/
+proto native void FinalizeLandMarkDecal(hDecal lmDecal, bool addAlpha, float alphaDist);
+
+/*!
+return if landmark was finalized
+\param lmDecal		decal to test
+*/
+proto native bool IsLandMarkFinalized(hDecal lmDecal);
+
+/*!
+return last landmark point or -65535.0 in all components
+\param lmDecal		decal to test
+*/
+proto native vector GetLastLandMarkPoint(hDecal lmDecal);
+
+/*!
+set global parameters for landmark generation
+\param minSegmentLength		minimum length segment, when new point is added (4 default), when is less, just the end position is on the fly updated
+\param maxSegmentLength		maximum segment length, when length is bigger, the path is finished
+\param degAngle				angle in degrees, when is more, the path is finished
+*/
+proto native void SetGlobalLandMarkParams(float minSegmentLength, float maxSegmentLength, float degAngle);
+
+
+//@}
+
+
+//----------------------------------------------
+/**
+ * \defgroup Ocean Ocean API
+ * @{
+ */
+
+/*!
+Is ocean availabled
+*/
+proto native bool IsOcean();
+
+/*!
+Get water ocean height at given point
+\param worldX		world x position
+\param worldZ		world z position
+*/
+proto native float GetOceanHeight(float worldX, float worldZ);
+
+
+/*!
+Get water ocean height and displacement at given point, returns vector(displaceX, height, displaceZ)
+\param worldX		world x position
+\param worldZ		world z position
+*/
+proto native vector GetOceanHeightAndDisplace(float worldX, float worldZ);
+
+
+
+//@}
+
+
+
+//@}
+ 
diff --git a/scripts/1_Core/DayZ/proto/Serializer.c b/scripts/1_Core/DayZ/proto/Serializer.c
new file mode 100644
index 0000000000000000000000000000000000000000..5aba653b73508b73ade0d4cbb1587d00a8253057
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/Serializer.c
@@ -0,0 +1,112 @@
+//-----------------------------------------------------------------------------
+/**
+ \brief Serialization general interface. Serializer API works with:
+	- primitive types: int, float, string, bool, vector
+	- dynamic containers: array, set, map
+	- static arrays
+	- complex types: classes
+ \note Serializer provides deep serialization (it serialize class memebers and their members etc). To avoid serialization of certain class variable, use NonSerialized attribute.
+ \par usage:
+ @code
+	class MyData
+	{
+		int m_id;
+		autoptr map<string, float> m_values;
+	
+		[NonSerialized()]
+		string m_dbg; // I don't want to serialize this variable
+	}
+
+	void Serialize(Serializer s)
+	{
+		int statArray[4] = {6,9,2,3};
+		array<int> dynArray = {8,5,6,4};
+		autoptr MyData data = new MyData();
+	
+		data.m_id = 965;
+		data.m_values = map<string, float>;
+		data.m_values.Insert("value1", 5.98);
+		data.m_values.Insert("value2", 4.36);
+	
+		s.Write(10);
+		s.Write("Hello");
+		s.Write(statArray);
+		s.Write(dynArray);
+		s.Write(data);
+	}
+
+	void Deserialize(Serializer s)
+	{
+		int statArray[4];
+		array<int> dynArray;
+		MyData data;
+		int someInt;
+		string someString;	
+	
+		s.Read(someInt);
+		s.Read(someString);
+		s.Read(statArray);
+		s.Read(dynArray);
+		s.Read(data);
+	}
+ 
+ @endcode
+ */
+class Serializer: Managed
+{
+	proto bool Write(void value_out);
+	proto bool Read(void value_in);
+
+	proto native bool CanWrite();
+	proto native bool CanRead();
+	
+	protected void Serializer() {}
+	protected void ~Serializer() {}
+};
+
+/**
+ \brief Serializer API implementation for File IO. See Serializer for more info.
+ \n usage:
+ @code
+void TestSave()
+{
+	FileSerializer file = new FileSerializer();
+	string names[3] = {"alpha", "beta", "gama"};
+	
+	if (file.Open("test.save", FileMode.WRITE))
+	{
+		file.Write(10);
+		file.Write("lalala");
+		file.Write(name);
+		file.Close();
+	}
+}
+	
+void TestLoad()
+{
+	FileSerializer file = new FileSerializer();
+	int intVal;
+	string stringVal;
+	string names[3];
+		
+	if (file.Open("test.save", FileMode.READ))
+	{
+		file.Read(intVal);
+		file.Read(stringVal);
+		file.Read(names);
+		file.Close();
+	}
+}	
+ 
+ @endcode
+ */
+class FileSerializer: Serializer
+{
+	void FileSerializer() {}
+	void ~FileSerializer() {}
+	
+	proto native bool Open(string path, FileMode mode = FileMode.READ);
+	proto native bool IsOpen();
+	proto native void Close();
+}
+	
diff --git a/scripts/1_Core/DayZ/proto/proto.c b/scripts/1_Core/DayZ/proto/proto.c
new file mode 100644
index 0000000000000000000000000000000000000000..20323d4f015f283437a3be2afc376c30124de666
--- /dev/null
+++ b/scripts/1_Core/DayZ/proto/proto.c
@@ -0,0 +1,390 @@
+/** @file */
+
+
+/*
+Function/method modifiers:
+proto	- prototyping of internal function (C++ side)
+native - native call convention of internal function (C++ side)
+volatile - internal function that may call back to script (hint for
+  compiler that context need to be saved on stack)
+private - function may not be called from script
+event - hint for tools that the function should be exposed as
+ Entity script event.
+
+Variable modifiers:
+owned - modifier for returing internal functions. Tells to script-VM,
+that returning variable (string or array) must not be released
+out - modifier for function parameters. It tells that variable will
+ be changed by function call (used mainly by internal functions)
+inout - modifier for function parameters. It tells that variable will
+ be used and then changed by function call (used mainly by internal functions)
+
+const - constants. May not be modified.
+reference - hint for tools (Material editor), that the variable may be used
+ as parameter in material
+*/
+
+
+/*===================================================================*/
+/*							Enforce engine API						 */
+/*===================================================================*/
+
+//placeholder
+class AnimEvent
+{
+	int type;
+	int slot;
+};
+
+class SoundEvent
+{
+	int type;
+	int handle;
+};
+
+
+typedef int[] vobject;
+
+class vobject
+{
+	proto native IEntitySource ToEntitySource();
+}
+
+#ifdef ENF_DONE
+
+//------------------------------------------
+// SOUND API
+//------------------------------------------
+//TODO:
+typedef int[] HSOUND;
+
+//flags
+//!Play once and invoke EntityEvent.SOUNDEND event
+//SFX_ONCE
+//!Music. Has separate volume control, can be replaced by custom music
+//SFX_MUSIC
+//!Ambient, not positional sound
+//SFX_AMBIENT
+//!Positional sound
+//SFX_3D
+//!Don't even start if not hearable. Valid only together with SFX_3D!
+//SFX_DISCARDABLE
+//!Sound is positional. XSoundSource::GetSoundOrientation is called. Valid only together with SFX_3D!
+//SFX_DIRECTIONAL
+////!Sound is moveable. XSoundSource::GetSoundVelocity is called. Valid only together with SFX_3D!
+//SFX_DOPPLER
+//!Position is not changing, XSoundSource::GetSoundPosition/GetSoundOrientation is called only once upon start! Valid only together with SFX_3D!
+//SFX_STATIC
+//!Don't test hearability. Valid only together with SFX_3D!
+//SFX_NOTEST
+
+//proto volatile HSOUND PlaySound(int soundScene, IEntity source, string sshader, int flags);
+proto volatile native void EndSound(HSOUND snd);
+
+//volume 0...1. Logaritmic scale
+proto native int SetSoundVolume(HSOUND sound, float volume)
+proto native int SetSoundFrequency(HSOUND sound, int freq)
+
+
+//returns 0, if soundid is not valid
+proto native int GetSoundLength(HSOUND sound)
+
+//returns -1, if soundid is not valid
+proto native int GetSoundPosition(HSOUND sound)
+
+//defaultne se pouziva EAX prostredi nadefinovane v mape, ale lze ho prebit touto fci.
+// Mohou se michat dve ruzna prostredi v pomeru danem hodnotou fade (fade==0 -> 100% env1, fade==1 -> 100% env2).
+//pokud chceme michat aktualni prostredi s nejakym jinym, lze pouzit zastupny nazev "$current".
+//Tim lze dosahnout nafadovani vlastniho prostredi, kdyz fci postupne volame napr. takto:
+//SetEAXEnvironment("$current", "Drugged", fade)
+//pricemz hodnota fade postupne narusta od nuly do jedne
+//proto native bool SetEAXEnvironment(string env1, string env2, float fade)
+#endif
+
+class PacketOutputAdapter
+{
+	proto native void WriteBool(bool value);			//size: 1 byte
+	proto native void WriteInt(int value);				//size: 4 bytes
+	proto native void WriteFloat(float value);		//size: 4 bytes
+	proto native void WriteString(string value);		//size: n bytes (string length)
+	proto native void WriteVector(vector value);		//size: 12 bytes
+	proto native void WriteMatrixAsQuaternionVector(vector mat[4]);	//size: 28 bytes
+	proto native void WriteIntAsByte(int value);		//write int in range <-128, 127>			size: 1 byte
+	proto native void WriteIntAsUByte(int value);	//write int in range <0, 255>				size: 1 byte
+	proto native void WriteIntAsHalf(int value);		//write int in range <-32768, 32768>	size: 2 bytes
+	proto native void WriteIntAsUHalf(int value);	//write int in range <0, 65535>			size: 2 bytes
+	proto native void WriteFloatAsByte(float value, float min, float max);	//					size: 1 byte
+	proto native void WriteFloatAsHalf(float value, float min, float max);	//					size: 2 bytes
+};
+
+class PacketInputAdapter
+{
+	proto native bool ReadBool();
+	proto native int ReadInt();
+	proto native float ReadFloat();
+	proto string ReadString();
+	proto native vector ReadVector();
+	proto void ReadMatrixAsQuaternionVector(vector mat[4]);
+	proto native int ReadIntAsByte();
+	proto native int ReadIntAsUByte();
+	proto native int ReadIntAsHalf();
+	proto native int ReadIntAsUHalf();
+	proto native float ReadFloatAsByte(float min, float max);
+	proto native float ReadFloatAsHalf(float min, float max);
+};
+
+/*!
+makes screenshot and stores it in to a DDS format file
+if the name begins with '$' the screenshot in stored in the fullpath according to the name parameter
+otherwise the screenshot is stored in "$profile:ScreenShotes/DATE TIME-NAME.dds" where DATE, TIME AND NAME are replaced by actual values
+\param name name of the screenshot
+*/
+proto native void MakeScreenshot(string name);
+
+/*!
+Returns actual fps (average in last 10 frames)
+*/
+proto native int GetFPS();
+
+//----------------------------------------------
+/** \name SkyDome API */
+//@{
+
+/*!
+load all sky presets from xml file
+\param presetFile	name of XML file with presets
+*/
+proto native int LoadSkyPresets(string presetsFile);
+
+/*!
+initialize sky with preset, must be called to set the global planets setting
+\param presetName	name of preset to be set (one of presets from file loaded using LoadSkyPresets)
+*/
+proto native int InitSky(string presetName);
+
+/*!
+set sky preset to day time and stormy parameter
+\param presetName	name of preset to be set (one of presets from file loaded using LoadSkyPresets)
+\param stormy		stormy parameter <0, 1>
+\param dayTime		day of time <0, 1>
+*/
+proto native int SetSkyPreset(string presetName, float stormy, float dayTime);
+
+/*!
+lerp two sky presets and set the result using day time
+\param presetName1	name of preset1 to be set (one of presets from file loaded using LoadSkyPresets)
+\param presetName2	name of preset2 to be set (one of presets from file loaded using LoadSkyPresets)
+\param dayTime		day of time <0, 1>
+\param stormy1		stormy parameter for preset1 <0, 1>
+\param stormy2		stormy parameter for preset2 <0, 1>
+\param lerpVal		lerp value between two presets
+*/
+proto native int LerpSkyPreset(string presetName1, string presetName2, float dayTime, float stormy1, float stormy2, float lerpVal);
+
+/*!
+lerp three sky presets using barycentric coordinates and set the result using day time
+\param presetName1	name of preset1 to be set (one of presets from file loaded using LoadSkyPresets)
+\param presetName2	name of preset2 to be set (one of presets from file loaded using LoadSkyPresets)
+\param presetName2	name of preset3 to be set (one of presets from file loaded using LoadSkyPresets)
+\param dayTime		day of time <0, 1>
+\param stormy1		stormy parameter for preset1 <0, 1>
+\param stormy2		stormy parameter for preset2 <0, 1>
+\param stormy3		stormy parameter for preset3 <0, 1>
+\param w1		weight for preset1
+\param w2		weight for preset2
+\param w3		weight for preset3
+*/
+proto native int LerpSkyPreset3(string presetName1, string presetName2, string presetName3, float dayTime, float stormy1, float stormy2, float stormy3, float w1, float w2, float w3);
+
+/*!
+user can set planets to its own positions on skydome using SetSkyPresetPlanet function,
+if disabled, the planets are positioned automatically using sky preset setting
+\param enabled 	enable/disable
+*/
+proto native void SetSkyUserPlanets(bool enabled);
+
+/*!
+set planet position
+\param index		index of planet, 0 = sun usually
+\param azimuthDeg	azimuth position in degrees
+\param zenithDeg	zenith position in degrees
+*/
+proto native bool SetSkyPlanet(int index, float azimuthDeg, float zenithDeg);
+
+/*!
+set planet size in degrees
+\param index		index of planet, 0 = sun usually
+\param angleDeg		angle size in degrees
+*/
+proto native bool SetSkyPlanetSize(int index, float angleDeg);
+
+/*!
+set UTC time for real time stars
+\param year
+\param month
+\param day
+\param hour
+\param minute
+\param sec
+\param offsetSec	to take into account time difference between Greenwich and local time (position dependency, summer/winter time)
+*/
+proto native void SetStarsObserverTime(int year, int month, int day, int hour, int minute, float sec, int offsetSec);
+
+/*!
+set observer position
+\param latitudeDeg	latitude in degrees
+\param longitudeDeg	longitude in degrees
+*/
+proto native void SetStarsObserverPosition(float latitudeDeg, float longitudeDeg);
+
+/*!
+update of stars
+\param update 	true = automatic stars update, false = update is on user by SetStarsRotMatrix
+*/
+proto native void  SetRealStarAutoUpdate(bool update);
+
+
+/*!
+night sky layer rotation matrix
+\param mat	rotation matrix
+*/
+proto native void SetNightLayerRotMatrix(vector mat[3]);
+
+/*!
+stars rotation matrix, is different from night rotation matrix
+because we don't know the time when night layers was captured
+\param mat	rotation matrix
+*/
+proto native void SetStarsRotMatrix(vector mat[3]);
+
+//@}
+
+//----------------------------------------------
+/** \name Materials API */
+//@{
+typedef int[] Material;
+
+class Material
+{
+	/*!
+	set parametr of material by string name
+	\param paramName	name of parameter
+	\param value		value
+	*/
+	proto bool SetParam(string propertyName, void value);
+
+	/*!
+	reset parametr of material to default value
+	\param paramName	name of parameter
+	*/
+	proto native void ResetParam(string propertyName);
+
+	/*!
+	set parametr index for faster access to material properties
+	\param paramName	name of parameter
+	\return parameter index
+	*/
+	proto native int GetParamIndex(string paramName);
+
+	/*!
+	set parametr of material by index
+	\param paramName	name of parameter
+	\param value		value
+	*/
+	proto void SetParamByIndex(int paramIndex, void value);
+};
+//@}
+
+int VectortoRGBA( vector vec, float h)
+{
+float x,y,z;
+int r,g,b,a,rgba;
+
+	x = vec[0];
+	y = vec[1];
+	z = vec[2];
+
+	x = x * 127.0 + 128.0;
+	y = y * 127.0 + 128.0;
+	z = z * 127.0 + 128.0;
+	h = h * 255.0;
+
+	a = (int)h << 24;
+	r = (int)x << 16;
+	g = (int)y << 8;
+	b = z;
+
+	return r | g | b | a;
+}
+
+
+//-----------------------------------------------------------------
+int ARGB(int a, int r, int g, int b)
+{
+	a = a << 24;
+	r = r << 16;
+	g = g << 8;
+	return a | r | g | b;
+}
+
+//-----------------------------------------------------------------
+//! Converts <0.0, 1.0> ARGB into color
+int ARGBF(float fa, float fr, float fg, float fb)
+{
+	return ARGB((float)(fa * 255.0), (float)(fr * 255.0), (float)(fg * 255.0), (float)(fb * 255.0));
+}
+
+//-----------------------------------------------------------------
+int AWHITE(int a)
+{
+	return a << 24 | 0xffffff;
+}
+
+//-----------------------------------------------------------------
+int LerpARGB(int c1, int c2)
+{
+	int cb1, cb2;
+	const int cmask = 0x00ff00ff;
+
+	cb1 = c1 >> 8 & cmask;
+	cb2 = c2 >> 8 & cmask;
+	cb1 = cb1 + cb2 >> 1;
+
+	c1 = c1 & cmask;
+	c2 = c2 & cmask;
+	c1 = c1 + c2 >> 1;
+
+	return cb1 << 8 | c1;
+}
+
+//-------------------------------------------------------------------------
+class Link<Class T>
+{
+	proto private native void Init(T init);
+	proto private native Object Get();	
+
+	void Release()
+	{
+		T obj = Get();
+		if(obj)
+			obj.Release();
+	}	 
+	void Link(T init)
+	{
+		Init(init);
+	}
+	
+	T Ptr()
+	{
+		return Get();
+	}
+
+	bool IsNull()
+	{
+		if(!Get())
+			return true;
+		
+		return false;
+	}
+};
+
diff --git a/scripts/1_Core/DayZ/script.c b/scripts/1_Core/DayZ/script.c
new file mode 100644
index 0000000000000000000000000000000000000000..1662af5e745d5e87d65cf10bb991a18a80851150
--- /dev/null
+++ b/scripts/1_Core/DayZ/script.c
@@ -0,0 +1,12 @@
+//some example "reference" variables for use in material editor
+reference float g_testVariable1;
+reference float g_testVariable2;
+reference float g_testVariable3;
+
+class TestClass
+{
+	//some example "reference" variables for use in material editor
+	reference float testVar1;
+	reference float testVar2;
+	reference float testVar3;
+}
diff --git a/scripts/1_Core/DayZ/workbenchApi.c b/scripts/1_Core/DayZ/workbenchApi.c
new file mode 100644
index 0000000000000000000000000000000000000000..aa6227bc5e149ec260336e462b78293c6f52a936
--- /dev/null
+++ b/scripts/1_Core/DayZ/workbenchApi.c
@@ -0,0 +1,151 @@
+typedef int[] WBModuleDef;
+typedef int[] ScriptEditor;
+typedef int[] ResourceBrowser;
+typedef int[] WorldEditor;
+
+class Workbench
+{
+	static proto native WBModuleDef GetModule(string type);
+	static proto native bool OpenModule(string type);
+	static proto native bool CloseModule(string type);
+	static proto native void Dialog(string caption, string text);
+	static proto int ScriptDialog(string caption, string text, Class data);
+	static proto bool SearchResources(string filter, func callback);
+	static proto native int RunCmd(string command, bool wait = false);
+	static proto void GetCwd(out string currentDir);
+	static proto bool GetAbsolutePath(string relativePath, out string absPath);
+};
+
+class WBModuleDef
+{
+	proto native external bool SetOpenedResource(string filename);
+	proto native external int GetNumContainers();
+	proto native external BaseContainer GetContainer(int index = 0);
+	proto external bool GetCmdLine(string name, out string value);
+	proto native external bool Save();
+	proto native external bool Close();
+};
+
+class ScriptEditor: WBModuleDef
+{
+	proto external bool GetCurrentFile(out string filename);
+	proto native external int GetCurrentLine();
+};
+
+class ResourceBrowser: WBModuleDef
+{
+	proto external bool GetCurrentFile(out string filename);
+};
+
+class WorldEditor: WBModuleDef
+{
+	proto native external WorldEditorAPI GetAPI();
+};
+
+class WorldEditorAPI
+{
+	proto native bool BeginTerrainAction(string historyPointName = "", string historyPointIcon = "");
+	proto native void EndTerrainAction(string historyPointName = "");
+	proto native bool BeginEntityAction(string historyPointName = "", string historyPointIcon = "");	//begin of logical edit action
+	proto native bool EndEntityAction(string historyPointName = "");	//end of edit action
+	proto native bool IsDoingEditAction();	//true, if code stay betwen BeginEntityAction() and EndEntityAction()
+	proto native bool UndoOrRedoIsRestoring();		//true, if editor is restoring undo or redo state
+	proto native bool IsModifyingData();
+	proto native IEntity SourceToEntity(IEntitySource entSrc);
+	proto native IEntitySource EntityToSource(IEntity ent);
+	proto native IEntitySource FindEntityByName(string name);
+	
+	proto native external void SetEntitySelection(IEntity ent);
+	proto native external void AddToEntitySelection(IEntity ent);
+	proto native void ClearEntitySelection();
+	proto native void RemoveFromEntitySelection(IEntity ent);
+	proto native void SetPropertySelection(string id);
+	
+	proto native external bool ModifyEntityKey(IEntity ent, string key, string value);
+	proto native external bool ModifyEntityTemplateKey(IEntitySource tmpl, string key, string value);
+		
+	proto native external IEntity CreateEntity(string className, string name, int layerId, vector coords, vector angles);
+	proto native external IEntity CreateClonedEntity(IEntity ent, string name);
+	proto native external bool DeleteEntity(IEntity ent);
+	proto native bool DeleteEntities(out array<IEntity> ents);
+	proto native IEntity GetEntityUnderCursor();
+	
+	proto native external bool TraceWorldPos(int x, int y, int traceFlags, out vector traceStart, out vector traceEnd, out vector traceDir);
+
+	proto native int GetSelectedEntitiesCount();
+	proto native IEntity GetSelectedEntity(int n = 0);
+	
+	private void WorldEditorAPI() {}
+	private void ~WorldEditorAPI() {}	
+};
+
+class WorldEditorTool
+{
+	//! Filled by workbench
+	WorldEditorAPI m_API;
+	
+	void OnKeyPressEvent(int key) {}
+	void OnKeyReleaseEvent(int key) {}
+	void OnEnterEvent() {}
+	void OnLeaveEvent() {}
+	void OnMouseMoveEvent(float x, float y) {}
+	void OnMouseDoubleClickEvent(float x, float y) {}
+	void OnMousePressEvent(float x, float y) {}
+	void OnMouseReleaseEvent(float x, float y) {}
+	void OnWheelEvent(int delta) {}
+	
+	private void WorldEditorTool() {}
+	private void ~WorldEditorTool() {}
+};
+
+class WorkbenchPlugin
+{
+	void Run() {}
+	void RunCommandline() {}
+	void Configure() {}
+};
+
+class ButtonAttribute
+{
+	string m_Label;
+	bool m_Focused;
+	
+	void ButtonAttribute(string label = "ScriptButton", bool focused = false)
+	{
+		m_Label = label;
+		m_Focused = focused;
+	}
+};
+
+/*!
+Attribute for Workbench plugin definition:
+	name - ui name in Script Tools menu
+	description - tooltip
+	shortcut - shortcut in simple text form e.g. "ctrl+g"
+	icon - relative path to icon file (32x32 png)
+	wbModules - list of strings representing Workbench modules where this tool should be avalaible (e.g. {"ResourceManager", "ScriptEditor"}). Leave null or empty array for any module.
+*/
+class WorkbenchPluginAttribute
+{
+	string m_Name;
+	string m_Icon;
+	string m_Shortcut;
+	string m_Description;
+	ref array<string> m_WBModules;
+		
+	void WorkbenchPluginAttribute(string name, string description = "", string shortcut = "", string icon = "", array<string> wbModules = null)
+	{
+		m_Name = name;
+		m_Icon = icon;
+		m_Shortcut = shortcut;
+		m_Description = description;
+		m_WBModules = wbModules;
+	}
+};
+
+/*!
+Attribute for Workbench tool definition
+*/
+class WorkbenchToolAttribute: WorkbenchPluginAttribute
+{
+}
diff --git a/scripts/2_GameLib/DayZ/components/gameLibComponents.c b/scripts/2_GameLib/DayZ/components/gameLibComponents.c
new file mode 100644
index 0000000000000000000000000000000000000000..116d97f65c0eeef8d80bd72f10b0e46c4b82a024
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/components/gameLibComponents.c
@@ -0,0 +1,276 @@
+#ifdef COMPONENT_SYSTEM
+//Generic components from GameLib (script side of c++ classes)
+
+typedef int[] IEntityComponentSource;
+class IEntityComponentSource: BaseContainer
+{
+};
+
+//!Entity touch event types
+enum TouchEvent
+{
+	ON_ENTER,
+	ON_STAY,
+	ON_EXIT
+};
+
+//!Builtin component types
+//TypeID MeshObjectTypeID;
+//TypeID HierarchyTypeID;
+//TypeID RigidBodyTypeID;
+//TypeID SphereGeometryTypeID;
+//TypeID BoxGeometryTypeID;
+
+
+class GenericComponent : Managed
+{
+	/**
+	* Gets current eventmask of the component.
+	* \return Returns bitmask of events the component accepts
+	*/
+	proto native int GetEventMask();
+	
+	/**
+	* Sets eventmask. Component accepts only events which has set bits in eventmask.
+	* Bits are or'ed with existing bitmask. See enf::EntityEvents.
+	* When this method is called in the constructor of the component, it will not properly set the eventmask to the parent entity. You may consider OnComponentInsert event.
+	* \param mask Mask of those bits, which will be set.
+	* \return Returns bitmask of events the component accepts (result of mask|GetEventMask())
+	*/
+	proto native int SetEventMask(IEntity owner, int mask);
+	
+	/**
+	* Clears bitmask. Component accepts only events which has set bits in eventmask.
+	* Only bits set in the mask are cleared. See enf::EntityEvents
+	* \param mask Mask of those bits, which will be cleared.
+	* \return returns these bits that were set before and now are cleared.
+	*/
+	proto native int ClearEventMask(IEntity owner, int mask);
+
+	/**
+	* Activate component and calls EOnActivate().
+	*/
+	proto native void Activate(IEntity owner);
+
+	/**
+	* Deactivate component and calls EOnDectivate().
+	*/
+	proto native void Deactivate(IEntity owner);
+
+	/**
+	* Returns activity state.
+	* \return Returns true, if component is active.
+	*/
+	proto native bool IsActive();
+	
+	//! Constructor
+	protected void GenericComponent(IEntityComponentSource src, IEntity ent);	
+}
+
+class GenericComponentClass
+{
+	bool DependsOn(typename otherClass, TypeID otherTypeID) {}
+}
+
+/**
+* Parent class for all components created in script.
+* Every ScriptComponent is being created in Entity's constructor and may receive following events
+* 1. OnComponentInsert is being called when component is created. This is last event Workbench sends in World Editor edit mode.
+* 2. EOnInit is being called after all components have been inserted and if the component registered event mask EV_INIT
+* 3. EOnActivate is being called if the entity was flagged as TFL_ACTIVE and if the component is active. The component is active by default.
+* 4. EOnXXXs are being called base on event mask component registered
+* 5. EOnDeactivate is being called when Deactivate is called or when the component is being to be removed. Component must be active to be deactivated.
+* 6. OnComponentRemove is being called after a component is removed.
+* 7. EOnDelete is being called after entity is going to be destroyed.
+*/
+class ScriptComponent : GenericComponent
+{
+	/*
+	Event when owner entity is touched
+	\param owner
+	Touched entity
+	\param extra
+	Bitmask of touch types TODO
+	*/
+	protected void EOnTouch(IEntity owner, int extra);
+
+	/*!
+	Event after component is initialized. At this point all entity's components have recieved OnComponentInsert.
+	\param owner
+	\param extra
+	Number of entity
+	*/
+	protected void EOnInit(IEntity owner, int extra);
+
+	/*!
+	Extra event of various functional extensions. ATM it's used
+	by Trigger when some insider is leaving
+	\param owner
+	owner actor of event
+	\param extra
+	Extra value of event
+	*/
+	protected void EOnExtra(IEntity owner, int extra);
+
+	/*!
+	Event when we are out of visibility
+	\param owner
+	\param extra
+	Frame number
+	*/
+	protected void EOnNotVisible(IEntity owner, int extra);
+
+	/*!
+	Event when we are visible
+	\param owner
+	\param extra
+	Frame number
+	*/
+	protected void EOnVisible(IEntity owner, int extra);
+
+	/*!
+	Event every frame
+	\param owner
+	\param timeSlice
+	Time passed since last frame
+	*/
+	protected void EOnFrame(IEntity owner, float timeSlice);
+
+	/*!
+	Even after physics update
+	\param owner
+	\param extra
+	Frame number
+	*/
+	protected void EOnPostFrame(IEntity owner, int extra);
+
+	/*!
+	Event from animation system
+	\param owner
+	\param extra
+	extra data
+	*/
+	protected void EOnAnimEvent(IEntity owner, AnimEvent extra);
+
+	/*!
+	Event from sound system
+	\param owner
+	\param extra
+	extra data
+	*/
+	protected void EOnSoundEvent(IEntity owner, SoundEvent extra);
+
+	/*!
+	Event after simulated by physics engine (once per frame)
+	\param owner
+	\param timeslice
+	Time slice of simulation step
+	*/
+	protected void EOnPostSimulate(IEntity owner, float timeslice);
+
+	/*!
+	Event before simulated by physics engine (called from sub-iterations!
+	\param owner
+	\param timeslice
+	Time slice of simulation step
+	*/
+	protected void EOnSimulate(IEntity owner, float timeslice);
+
+	/*!
+	Event when joint attached to RigidBody of this entity is broken
+	\param owner
+	owner Entity attached to the joint
+	\param extra
+	Not used ATM
+	*/
+	protected void EOnJointBreak(IEntity owner, int extra);
+	/*!
+	Event when physics engine has moved with this Entity
+	\param owner
+	World Entity
+	\param extra
+	Not used ATM
+	*/
+	protected void EOnPhysicsMove(IEntity owner, int extra);
+
+	/*!
+	Event when physics engine registered contact with owner RigidBody
+	\param owner
+	\param contact
+	Structure describing the contact
+	*/
+	protected void EOnContact(IEntity owner, Contact extra);
+
+	/**
+    * Event when component is activated.
+    */
+    protected void EOnActivate(IEntity owner);
+
+    /**
+    * Event when component is deactivated.
+    */
+    protected void EOnDeactivate(IEntity owner);
+
+	/*!
+	Event when a component is created and added to Entity.
+	\param owner Entity into which component is added
+	\param other Component which is being added into Entity
+	*/
+	protected void OnComponentInsert(IEntity owner, ScriptComponent other);
+
+	/*!
+	Event when a component is being removed from Entity.
+	\param owner Entity from which component is being removed
+	\param other Component which is being removed from the Entity
+	*/
+	protected void OnComponentRemove(IEntity owner, ScriptComponent other);
+
+	/*!
+	Called when Entity is being to be destroyed (deleted) or component to be deleted (see Game::DeleteScriptComponent).
+	\param owner Entity which owns the component
+	*/
+	protected void OnDelete(IEntity owner);
+}
+
+typedef int[] SoundHandle;
+
+class SignalInput
+{
+	string m_name;
+	float m_value;
+	
+	void SignalInput()
+	{
+		m_value = 0;
+	}
+};	
+
+class BaseSoundComponent : GenericComponent
+{
+	/* Get list of 'events'. */
+	proto native int GetEventNames(out array<string> events);
+	/* Get list of 'signals. '*/
+	proto native int GetSignalNames(out array<string> signals);
+	/* Convert signal name to index. */
+	proto native int GetSignalIndex(string name);
+	/* Set signal value by 'name'. */
+	proto native void SetSignalValueName(string signal, float value);
+	/* Set signal value by 'index'. */
+	proto native void SetSignalValue(int index, float value);
+	/* Play 'event'. */
+	proto native SoundHandle Play(string name);
+	/* Play sounds based on triggers. */
+	proto native SoundHandle Update();
+	/* Terminate 'sound'. */
+	proto native void Terminate(SoundHandle handle);
+	/* Check if 'sound' is played. */
+	proto native bool IsPlayed(SoundHandle handle);
+	/* Validate handle. */
+	proto native bool IsHandleValid(SoundHandle handle);
+	/* Set sound position. */
+	proto native void SetTransform(vector[] transf);
+	/* Enable debug mode. */
+	proto native void SetDebug(bool value);
+};
+
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/entities/RenderTarget.c b/scripts/2_GameLib/DayZ/entities/RenderTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d20a619750c70e465fb618e8967cc4dad8acda6
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/entities/RenderTarget.c
@@ -0,0 +1,79 @@
+#ifdef GAME_TEMPLATE
+
+[EditorAttribute("box", "GameLib/Scripted", "Render target", "-0.25 -0.25 -0.25", "0.25 0.25 0.25", "255 0 0 255")]
+class RenderTargetClass
+{
+
+}
+
+RenderTargetClass RenderTargetSource;
+
+class RenderTarget: GenericEntity
+{
+	[Attribute("0", "slider", "Camera index", "0 31 1")]
+	int CameraIndex;
+	[Attribute("0", "editbox", "Position X <0, 1>")]
+	float X;
+	[Attribute("0", "editbox", "Position Y <0, 1>")]
+	float Y;
+	[Attribute("1", "editbox", "Render target width <0, 1>")]
+	float Width;
+	[Attribute("1", "editbox", "Render target height <0, 1>")]
+	float Height;
+	[Attribute("-1", "editbox", "Sort index (the lesser the more important)")]
+	int Sort;
+	[Attribute("0", "combobox", "Autoinit", "", { ParamEnum("No", "0"), ParamEnum("Yes", "1") } )]
+	int AutoInit;
+	[Attribute("0", "combobox", "Forcing creation of render target for camera #0 in Workbench", "", { ParamEnum("No", "0"), ParamEnum("Yes", "1") } )]
+	bool ForceCreation;
+	bool m_Show = true; // when autoinit, wait with showing the render target after all entities are created (EOnInit)
+	ref RenderTargetWidget m_RenderWidget;
+	
+	void RenderTarget(IEntitySource src, IEntity parent)
+	{
+		SetFlags(EntityFlags.ACTIVE, false);
+
+		if (AutoInit)
+		{
+			m_Show = false;
+			SetEventMask(EntityEvent.INIT);
+			Init();
+		}
+	}
+
+	void ~RenderTarget()
+	{
+		delete m_RenderWidget;
+	}
+	
+	void Init()
+	{
+		#ifdef WORKBENCH // Workbench is using its own renderer for main camera, it is not using render target widget.
+			if (!ForceCreation && CameraIndex == 0)
+				return;
+		#endif
+
+		int screenW, screenH;
+		GetScreenSize(screenW, screenH);
+
+		int posX = (float)(screenW * X);
+		int posY = (float)(screenH * Y);
+		int widthPix = (float)(screenW * Width);
+		int heightPix = (float)(screenH * Height);
+		if (Class.CastTo(m_RenderWidget, GetGame().GetWorkspace().CreateWidget(RenderTargetWidgetTypeID, posX, posY, widthPix, heightPix, WidgetFlags.VISIBLE | WidgetFlags.HEXACTSIZE | WidgetFlags.VEXACTSIZE | WidgetFlags.HEXACTPOS | WidgetFlags.VEXACTPOS, 0xffffffff, Sort)))
+		{	
+			m_RenderWidget.Show(m_Show);	
+			SetWidgetWorld(m_RenderWidget, GetGame().GetWorldEntity(), CameraIndex);
+		}
+	}
+	override void EOnInit(IEntity other, int extra) //!EntityEvent.INIT
+	{
+		if (m_RenderWidget)
+		{
+			m_Show = true;
+			m_RenderWidget.Show(m_Show);
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/entities/ScriptCamera.c b/scripts/2_GameLib/DayZ/entities/ScriptCamera.c
new file mode 100644
index 0000000000000000000000000000000000000000..b75f509c8e7ef1e1f1fe7cd1623409748601124c
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/entities/ScriptCamera.c
@@ -0,0 +1,172 @@
+#ifdef GAME_TEMPLATE
+
+[EditorAttribute("box", "GameLib/Scripted", "Script camera", "-0.25 -0.25 -0.25", "0.25 0.25 0.25", "255 0 0 255")]
+class ScriptCameraClass
+{
+
+}
+
+ScriptCameraClass ScriptCameraSource;
+
+class ScriptCamera: GenericEntity
+{
+	[Attribute("60", "slider", "Field of view", "0 180 1")]
+	float FOV;
+	[Attribute("1", "editbox", "Near plane clip")]
+	float NearPlane;
+	[Attribute("4000", "editbox", "Far plane clip")]
+	float FarPlane;
+	
+	[Attribute("1", "combobox", "Projection type", "", ParamEnumArray.FromEnum(CameraType) )]
+	int Type;
+	[Attribute("5", "slider", "Camera speed", "0 20 1")]
+	float Speed;
+	[Attribute("1", "combobox", "Free Fly", "", ParamEnumArray.FromEnum(EBool) )]
+	bool FreeFly;
+	[Attribute("0", "combobox", "Invert vertical", "", ParamEnumArray.FromEnum(EBool) )]
+	bool Inverted;
+	[Attribute("0", "slider", "Camera index", "0 31 1")]
+	int Index;
+	float m_MouseSensitivity = 0.001; // should be somewhere else.
+	float m_GamepadSensitivity = 0.2; // should be somewhere else.
+	int m_GamepadFreeFly;
+
+	// debug variables
+	int m_DbgListSelection = 0;
+	ref array<string> m_DbgOptions = {"Perspective", "Orthographic"};
+
+	void ScriptCamera(IEntitySource src, IEntity parent)
+	{
+		SetFlags(EntityFlags.ACTIVE, false);
+		SetEventMask(EntityEvent.FRAME);
+
+		SetCameraVerticalFOV(Index, FOV);
+		SetCameraFarPlane(Index, FarPlane);
+		SetCameraNearPlane(Index, NearPlane);
+		SetCameraType(Index, Type);
+		m_DbgListSelection = Type - 1;
+		SetCamera(Index, GetOrigin(), GetYawPitchRoll());
+
+		vector camMat[4];
+		GetTransform(camMat);
+		SetCameraEx(Index, camMat);
+		m_GamepadFreeFly = FreeFly;
+	}
+
+	override protected void EOnFrame(IEntity other, float timeSlice) //EntityEvent.FRAME
+	{
+		GetGame().GetInputManager().ActivateContext("ScriptCameraContext");
+		
+		if (GetGame().GetInputManager().GetActionTriggered("CamFreeFly"))
+		{
+			FreeFly = !FreeFly;
+		}
+		
+		if (FreeFly)
+		{
+			FreeFly(timeSlice);
+		}
+		else
+		{
+			vector camMat[4]; // matrix can be set outside the class
+			GetTransform(camMat);
+			SetCameraEx(Index, camMat);
+		}
+		
+		if (GameSettings.Debug)
+		{
+			DebugInfo();
+		}
+	}
+
+	protected void FreeFly(float timeSlice)
+	{
+		vector camPosition = GetOrigin();
+		vector angles = GetYawPitchRoll();
+		vector camMat[4];
+		GetTransform(camMat);	
+		InputManager imanager = GetGame().GetInputManager();
+		imanager.ActivateContext("ScriptCameraFreeFlyContext");
+		
+		// get input
+		float turnX 		= imanager.LocalValue("CamTurnRight") * 20.0 * timeSlice;
+		float turnY 		= imanager.LocalValue("CamTurnUp") * 20.0 * timeSlice;
+		float turnZ			= imanager.LocalValue("CamRotate") * 20.0 * timeSlice;
+		float moveForward	= imanager.LocalValue("CamForward");
+		float moveRight 	= imanager.LocalValue("CamRight");
+		float moveAscend 	= imanager.LocalValue("CamAscend");
+		float speedDelta   	= imanager.LocalValue("CamSpeedDelta") * timeSlice;
+		bool speedBoostHigh   	= imanager.GetActionTriggered("CamSpeedBoostHigh");
+		bool speedBoostLow  = imanager.GetActionTriggered("CamSpeedBoostLow");
+
+		Speed = Math.Clamp(Speed + speedDelta * Speed * 0.25, 0.1, 1000.0);
+		
+		float finalSpeed = Speed;
+		if (speedBoostLow)
+			finalSpeed *= 25;
+		else if (speedBoostHigh)
+			finalSpeed *= 5;
+
+		// rotation
+		angles[0] = turnX + angles[0];
+		if (Inverted)
+			angles[1] = turnY + angles[1];
+		else
+			angles[1] = -turnY + angles[1];
+
+		angles[2] = turnZ + angles[2];
+		
+		// movement
+		vector move = vector.Zero;
+		vector forward = camMat[2];
+		vector up = camMat[1];
+		vector side = camMat[0];
+		
+		move += forward * moveForward;
+		move += side    * moveRight;
+		move += up      * moveAscend;
+		
+		// ------------		
+		camPosition = (move * timeSlice * finalSpeed) + camPosition;
+		
+		Math3D.YawPitchRollMatrix(angles, camMat);
+		camMat[3] = camPosition;
+		SetTransform(camMat);
+		SetCameraEx(Index, camMat);
+	}
+
+	protected void DebugInfo()
+	{
+		InputManager imanager = GetGame().GetInputManager();
+		DbgUI.Begin(String("Camera #" + Index.ToString()), 0, Index * 300);
+
+		DbgUI.Text(String("Position : " + GetOrigin().ToString()));
+		DbgUI.Text(String("Orientation (Y, P, R): " + GetYawPitchRoll().ToString()));
+		DbgUI.Text(String("Speed : " + Speed.ToString()));
+		DbgUI.Text(String("Mouse sensitivity : " + (2000 - (1 / m_MouseSensitivity)).ToString()));
+		DbgUI.Check("Select Free fly", FreeFly);
+		DbgUI.List("Camera type", m_DbgListSelection, m_DbgOptions);
+		if (m_DbgListSelection + 1 != Type)
+		{
+			Type = m_DbgListSelection + 1;
+			SetCameraType(Index, Type);
+		}
+		
+		float sensitivity = 2000 - (1 / m_MouseSensitivity);
+		DbgUI.SliderFloat("Mouse sensitivity", sensitivity, 1, 1999);
+		m_MouseSensitivity = 1 / (2000 - sensitivity);
+		
+		DbgUI.Text("CamTurnRight: " + imanager.LocalValue("CamTurnRight"));
+		DbgUI.Text("CamTurnUp: " + imanager.LocalValue("CamTurnUp"));
+		DbgUI.Text("CamSpeedDelta: " + imanager.LocalValue("CamSpeedDelta"));
+		DbgUI.Text("CamForward: " + imanager.LocalValue("CamForward"));
+		DbgUI.Text("CamRight: " +imanager.LocalValue("CamRight"));
+		DbgUI.Text("CamAscend: " + imanager.LocalValue("CamAscend"));
+		DbgUI.Text("CamSpeedBoostHigh: " + imanager.GetActionTriggered("CamSpeedBoostHigh"));
+		DbgUI.Text("CamSpeedBoostLow:" + imanager.GetActionTriggered("CamSpeedBoostLow"));		
+		
+		DbgUI.End();
+	}
+}
+
+#endif
diff --git a/scripts/2_GameLib/DayZ/entities/ScriptLight.c b/scripts/2_GameLib/DayZ/entities/ScriptLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..29141b76ac57a959d3cac77765b372f11db29b81
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/entities/ScriptLight.c
@@ -0,0 +1,40 @@
+#ifdef GAME_TEMPLATE
+
+[EditorAttribute("box", "GameLib/Scripted", "Script light", "-0.25 -0.25 -0.25", "0.25 0.25 0.25", "255 0 0 255")]
+class ScriptLightClass
+{
+
+}
+
+ScriptLightClass ScriptLightSource;
+
+class ScriptLight: GenericEntity
+{
+	[Attribute("1", "flags", "Flags", "", { ParamEnum("Point", "1"), ParamEnum("Spot", "2"), ParamEnum("Directional", "4") } )]
+	int Flags;
+	[Attribute("1", "combobox", "Type", "", { ParamEnum("Point", "1"), ParamEnum("Spot", "2"), ParamEnum("Directional", "3") } )]
+	int Type;
+	[Attribute("1", "editbox", "Radius", "", NULL )]
+	float Radius;
+	[Attribute("1 1 1", "color", "Color", "", NULL )]
+	vector Color;
+	[Attribute("1", "editbox", "Intensity", "", NULL )]
+	float Intensity;
+	HLIGHT m_light;
+	
+	void ScriptLight(IEntitySource src, IEntity parent)
+	{
+		//SetFlags(this, EntityFlags.ACTIVE | EntityFlags.SOLID | EntityFlags.VISIBLE);
+		m_light = AddLight(this, LightType.POINT, LightFlags.DYNAMIC|LightFlags.CASTSHADOW, Radius, Color * Intensity);
+	}
+
+	void ~ScriptLight()
+	{
+		if(m_light)
+		{
+			RemoveLight(m_light);
+		}
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/entities/ScriptModel.c b/scripts/2_GameLib/DayZ/entities/ScriptModel.c
new file mode 100644
index 0000000000000000000000000000000000000000..4fcf8a2cccdef63df871d99afb90f9257dced23d
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/entities/ScriptModel.c
@@ -0,0 +1,62 @@
+#ifdef GAME_TEMPLATE
+
+[EditorAttribute("box", "GameLib/Scripted", "Script model", "-0.25 -0.25 -0.25", "0.25 0.25 0.25", "255 0 0 255", "0 0 0 0", true, true, true)]
+class ScriptModelClass
+{
+
+}
+
+ScriptModelClass ScriptModelSource;
+
+class ScriptModel: GenericEntity
+{
+	[Attribute("", "resourceNamePicker", "Model", "xob")]
+	string Model;
+	[Attribute("1", "combobox", "Physics", "", { ParamEnum("None", "2"), ParamEnum("Static", "1"), ParamEnum("Dynamic", "0") } )]
+	int Type;
+
+	void ScriptModel(IEntitySource src, IEntity parent)
+	{
+		if (Model== "")
+			return;
+
+		SetFlags(EntityFlags.ACTIVE | EntityFlags.SOLID | EntityFlags.VISIBLE, false);
+		
+		vobject vobj = GetObject(Model);
+		SetObject(vobj, "");
+		ReleaseObject(vobj, false);
+
+		if (Type == 1)
+		{
+			dBodyCreateStatic(this, 0xffffffff); // todo - defines for layer mask			
+		}
+		else if (Type == 0)
+		{
+			if(!dBodyCreateDynamic(this, 1.0, 0xffffffff))
+			{
+				//create implicit box
+				vector mins, maxs;
+				GetBounds(mins, maxs);
+				vector center = (mins + maxs) * 0.5;
+				vector size = maxs - mins;
+								
+				PhysicsGeomDef geoms[] = {PhysicsGeomDef("", dGeomCreateBox(size), "material/default", 0xffffffff)};
+				dBodyCreateDynamicEx(this, center, 1, geoms);
+			}
+			if(dBodyIsSet(this))
+			{
+				dBodySetMass(this, 1.0);
+				dBodyActive(this, ActiveState.ACTIVE);
+				dBodyDynamic(this, true);
+			}
+		}
+	}
+
+	void ~ScriptModel()
+	{
+		if(dBodyIsSet(this))
+			dBodyDestroy(this);
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/entities/WorldsMenu.c b/scripts/2_GameLib/DayZ/entities/WorldsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..d837670e64b05ab8bb9c2458726364a4ebe1d23f
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/entities/WorldsMenu.c
@@ -0,0 +1,97 @@
+#ifdef GAME_TEMPLATE
+
+[EditorAttribute("box", "GameLib/Scripted", "Worlds menu", "-0.25 -0.25 -0.25", "0.25 0.25 0.25", "255 0 0 255")]
+class WorldsMenuClass
+{
+
+}
+
+WorldsMenuClass WorldsMenuSource;
+
+class WorldsMenu: GenericEntity
+{
+	int m_DbgListSelection = 0;
+	int m_WorldsCount = 0;
+	string DEFAULT_WORLD = "worlds/default.ent";
+	ref array<string> m_DbgOptions = {};
+	ref ImageWidget m_MouseWidget;
+	
+	void WorldsMenu(IEntitySource src, IEntity parent)
+	{
+		SetFlags(EntityFlags.ACTIVE, false);
+		SetEventMask(EntityEvent.POSTFRAME);
+		
+		Class.CastTo(m_MouseWidget, GetGame().GetWorkspace().CreateWidgets("gui/layouts/mouse.layout"));
+		m_MouseWidget.SetSort(1024);
+		SetCursorWidget(m_MouseWidget);
+		
+		LoadWorlds();
+	}
+	
+	void ~WorldsMenu()
+	{
+		delete m_MouseWidget;
+	}
+
+	array<string> GetWorldList()
+	{
+		return m_DbgOptions;
+	}
+
+	override void EOnPostFrame(IEntity other, int extra) //EntityEvent.POSTFRAME
+	{
+		InputManager im = GetGame().GetInputManager();
+		im.ActivateContext("MenuContext");
+		bool menuSelect = im.GetActionTriggered("MenuSelect");
+		bool menuBack = im.GetActionTriggered("MenuBack");
+		
+		DbgUI.Begin("Load world", 400, 100);
+
+		DbgUI.Text("Select world to load from worlds directory");
+
+		if (m_DbgOptions.Count() > 0)
+		{
+			DbgUI.List("Worlds", m_DbgListSelection, m_DbgOptions);
+			if (DbgUI.Button("Start") || menuSelect)
+			{
+				string worldToLoad = m_DbgOptions.Get(m_DbgListSelection);
+				GetGame().SetWorldFile(worldToLoad, true);
+			}
+		}
+		if (DbgUI.Button("Exit") || menuBack)
+		{
+			GetGame().RequestClose();
+		}		
+		DbgUI.End();
+	}
+
+	void LoadWorlds()
+	{
+		string fileName;
+		FileAttr fileAttr;
+		FindFileHandle worlds = FindFile("worlds/*.ent", fileName, fileAttr, 0);
+		
+		if (!worlds)
+			return;
+
+		InsertWorldToList(fileName);
+
+		while(FindNextFile(worlds, fileName, fileAttr))
+		{
+			InsertWorldToList(fileName);
+		}
+
+		CloseFindFile(worlds);
+
+		m_WorldsCount = m_DbgOptions.Count();
+	}
+
+	void InsertWorldToList(string fileName)
+	{
+		string path = String("worlds/" + fileName);
+		if (path != DEFAULT_WORLD)
+			m_DbgOptions.Insert(String(path));
+	}
+}
+
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/entities/gameLibEntities.c b/scripts/2_GameLib/DayZ/entities/gameLibEntities.c
new file mode 100644
index 0000000000000000000000000000000000000000..e096760ba29519fb850d242624b2e4cb7e305fbd
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/entities/gameLibEntities.c
@@ -0,0 +1,141 @@
+//Generic entities from GameLib (script side of c++ classes)
+
+#ifdef COMPONENT_SYSTEM
+class GenericEntity extends IEntity
+{
+	//native method implemented on c++ side
+	proto native void Show(bool show);
+	
+	/*!
+	Finds first occurance of the coresponding component.
+	\param typeName type of the component
+	*/
+	proto native GenericComponent FindComponent(typename typeName);
+	
+	/*!
+	inserts instance of the script component to the entity.
+	Calls OnComponentInsert on all entity's components to inform that this new component was inserted. The new instance have to FindScriptComponents in order to work with them.
+	Calls EOnInit on the component if component sets EV_INIT mask.
+	Calls EOnActivate on the component if the component is active (default)
+	\param component instance
+	*/
+	proto native void InsertComponent(GenericComponent component);
+	
+	/*!
+	Removes component from entity. Doesn't delete the entity.
+	Calls EOnDeactivate on the component.
+	Calls OnComponentRemove on all entity's components to inform that this new component was removed.
+	\param component instance
+	*/
+	proto native void RemoveComponent(GenericComponent component);
+	
+	/*!
+	Removes and deletes component from entity.
+	Calls EOnDeactivate on the component.
+	Calls OnComponentRemove on all entity's components to inform that this new component was removed.
+	Calls OnDelete on the component.
+	\param component instance
+	*/
+	proto native void DeleteComponent(GenericComponent component);
+
+#ifdef WORKBENCH
+	/*!
+	Called after updating world in Workbench. The entity must be selected.
+	*/
+	void _WB_AfterWorldUpdate(float timeSlice) {};
+#endif
+}
+
+class GenericWorldEntity extends GenericEntity
+{
+}
+
+class GenericTerrainEntity extends GenericEntity
+{
+}
+
+class LightEntity extends GenericEntity
+{
+	/*!
+	Sets diffuse part of light.
+	\param color Color of light
+	*/
+	proto native external void SetDiffuseColor(int color);
+	proto native external int GetDiffuseColor();
+	
+	proto native external void SetRadius(float radius);
+	proto native external float GetRadius();
+	
+	/*!
+	Sets cone of light. It's meaningful for LT_SPOT only!
+	\param angle
+	*/
+	proto native external void SetConeAngle(float angle);
+	/*!
+	Gets cone of light. It's meaningful for LT_SPOT only!
+	\return Cone of light
+	*/
+	proto native external float GetConeAngle();
+	
+	proto native external void SetCastShadow(bool enable);
+	proto native external bool IsCastShadow(bool enable);
+}
+
+class GenericWorldLightEntity extends GenericEntity
+{
+}
+
+class GenericWorldFogEntity extends GenericEntity
+{
+}
+
+class BasicEntity extends GenericEntity
+{
+}
+
+class WorldEntityClass
+{
+}
+
+class WorldEntity extends GenericWorldEntity
+{
+}
+
+class ModelEntity extends BasicEntity
+{
+}
+
+enum CharacterMovement
+{
+	MOVEMENTTYPE_IDLE,
+	MOVEMENTTYPE_WALK,
+	MOVEMENTTYPE_RUN,
+	MOVEMENTTYPE_SPRINT
+};
+
+enum CharacterStance
+{
+	STANCE_ERECT,
+	STANCE_CROUCH,
+	STANCE_PRONE,
+	STANCE_ERECT_RAISED,
+	STANCE_CROUCH_RAISED,
+	STANCE_PRONE_RAISED
+};
+
+class CharacterEntity extends BasicEntity
+{
+	proto native void Teleport(vector transform[4]);
+	proto native CharacterMovement GetCurrentMovement();
+	proto native CharacterStance GetCurrentStance();
+}
+
+class BasicCamera extends BasicEntity
+{
+}
+
+class VRHandEntity extends GenericEntity
+{
+}
+
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/gameLib.c b/scripts/2_GameLib/DayZ/gameLib.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a1273ab4c4b37f0648aadad2d2b12e7f7f2be7a
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/gameLib.c
@@ -0,0 +1,158 @@
+#ifdef GAME_TEMPLATE
+Game g_Game;
+
+Game GetGame()
+{
+	return g_Game;
+}
+
+class Game
+{
+	ScriptModule GameScript;
+	
+	ScriptModule GetScriptModule()
+	{
+		return GameScript;
+	}
+	
+	void SetDebug(bool isDebug) {}
+	//! 
+	/**
+  	\brief Called when some system event occur.
+  	@param eventTypeId event type.
+	@param params Param object, cast to specific param class to get parameters for particular event.
+	*/
+	void OnEvent(EventType eventTypeId, Param params)
+	{
+		Print("OnEvent");
+	}
+
+	/**
+	\brief Called after full initialization of Game instance
+	*/
+	void OnAfterInit()
+	{
+		Print("OnAfterInit");
+	}
+	
+	/**
+  	\brief Called on World update
+	@param timeslice time elapsed from last call
+	*/
+	void OnUpdate(float timeslice) 
+	{
+
+	}
+
+	/**
+  	\brief Sets world file to be loaded. Returns false if file doesn't exist.
+	@param path Path to the ent file
+	@param reload Force reload the world
+	*/
+	proto native bool SetWorldFile(string path, bool reload);
+
+	/**
+  	\brief Returns path of world file loaded
+	*/
+	proto native owned string GetWorldFile();
+
+	/**
+  	\brief Event which is called right before game starts (all entities are created and initialized). Returns true if the game can start.
+	*/
+	bool OnGameStart()
+	{
+		return true;
+	}
+
+	/**
+  	\brief Event which is called right before game end.
+	*/
+	void OnGameEnd()
+	{
+	}
+
+	/**
+  	\brief Creates loading screen
+	*/
+	void ShowLoadingAnim()
+	{
+	}
+
+	/**
+  	\brief Hides loading screen
+	*/
+	void HideLoadingAnim()
+	{
+	}
+
+	/**
+  	\brief Used for updating the loading screen
+	@param timeslice
+	@param progress loading progress between 0 and 1
+	*/
+	void UpdateLoadingAnim(float timeslice, float progress)
+	{
+	}
+
+	/**
+	\brief Safely instantiate the entity and calls EOnInit if the entity sets event mask EntityEvent.INIT.
+	@param typename Name of entity's type to instantiate.
+	@return instantiated entity
+	*/
+	proto native IEntity SpawnEntity(typename typeName);
+
+	/**
+	\brief Safely instantiate the entity from template (with all components) and calls EOnInit if the entity sets event mask EntityEvent.INIT.
+	@param templateResource Template resource of the entity to instantiate.
+	@return instantiated entity
+	*/
+	proto native IEntity SpawnEntityTemplate(vobject templateResource);
+
+	/**
+	\brief Safely instantiate the component from template, insert it to entity and calls EOnInit if the component sets event mask EntityEvent.INIT.
+	@param owner Entity which will own the component
+	@param templateResource Template resource of the component to instantiate.
+	@return instantiated component
+	*/
+	proto native GenericComponent SpawnComponentTemplate(IEntity owner, vobject templateResource);
+
+	proto native IEntity FindEntity(string name);
+
+	proto native WorkspaceWidget GetWorkspace();
+
+	/**
+	\brief Setting request flag for engine to exit the game
+	*/
+	proto native void RequestClose();
+
+	/**
+	\brief Setting request flag for the engine to reinitialize the game
+	* Doesn't do anything in Workbench
+	*/
+	proto native void RequestReload();
+
+	/**
+	\brief Returns version of the game
+	*/
+	proto native owned string GetBuildVersion();
+
+	/**
+	\brief Returns date and time when the game was built
+	*/
+	proto native owned string GetBuildTime();
+
+	/**
+  	\brief Returns World entity when in game or in play mode in WE. NULL otherwise.
+	*/
+	proto native GenericWorldEntity GetWorldEntity();
+	
+	proto native InputManager GetInputManager();
+	proto native MenuManager GetMenuManager();
+	proto native int GetTickCount();
+}
+
+void GameLibInit()
+{
+
+}
+#endif
\ No newline at end of file
diff --git a/scripts/2_GameLib/DayZ/inputManager.c b/scripts/2_GameLib/DayZ/inputManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d175b504cddcdd50e58d631dbe7090159b571b5
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/inputManager.c
@@ -0,0 +1,46 @@
+#ifdef GAME_TEMPLATE
+
+enum InputTrigger
+{
+	UP, 			///< call listener when button/key is released
+	DOWN,		 	///< call listener when button/key is pressed
+	PRESSED, 		///< call listener in each tick when button/key is pressed
+	VALUE		 	///< call listener in each tick with current value
+};
+
+class ActionManager
+{
+	void ActionManager(ActionManager parent);
+	proto native external bool RegisterAction(string actionName);
+	proto native external bool RegisterContext(string contextName);
+	
+	proto native external float LocalValue(string actionName);
+	proto native external bool GetActionTriggered(string actionName);
+	
+	proto native external bool ActivateAction(string actionName, int duration = 0);	
+	proto native external bool IsActionActive(string actionName);
+	
+	proto native external bool ActivateContext(string contextName, int duration = 0);	
+	proto native external bool IsContextActive(string contextName);
+	
+	proto external void AddActionListener(string actionName, InputTrigger trigger,  func callback);
+	
+	proto native external void SetContextDebug(string contextName, bool bDebug);
+	
+	proto native void SetParent(ActionManager parent);
+	proto native void SetDebug(bool bDebug);
+};
+
+class InputManager: ActionManager
+{
+	private void InputManager(ActionManager parent) {};
+	private void ~InputManager() {};
+	
+	proto native external void ResetAction(string actionName);
+	proto native void SetCursorPosition(int x, int y);
+	proto native external bool RegisterActionManager(ActionManager pManager);
+	proto native external bool UnregisterActionManager(ActionManager pManager);
+};
+
+#endif
+
diff --git a/scripts/2_GameLib/DayZ/menuManager.c b/scripts/2_GameLib/DayZ/menuManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..b2492846ce9469dc23a1a961e97d7016f1950a9d
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/menuManager.c
@@ -0,0 +1,95 @@
+#ifdef GAME_TEMPLATE
+
+enum DialogPriority
+{
+	INFORMATIVE,
+	WARNING,
+	CRITICAL	
+};
+
+enum DialogResult
+{
+	PENDING,
+	OK,
+	YES,
+	NO,
+	CANCEL,
+};
+
+enum ScriptMenuPresetEnum
+{
+	
+};
+
+class MenuManager
+{
+	proto native MenuBase OpenMenu(ScriptMenuPresetEnum preset, int userId = 0, bool unique = false);
+	proto native MenuBase OpenDialog(ScriptMenuPresetEnum preset, int priority = DialogPriority.INFORMATIVE, int iUserId = 0, bool unique = false);
+	proto native MenuBase FindMenuByPreset(ScriptMenuPresetEnum preset);
+	proto native MenuBase FindMenuByUserId(int userId);
+	proto native MenuBase GetTopMenu();
+	
+	proto native bool IsAnyMenuOpen();	
+	proto native bool IsAnyDialogOpen();
+
+	proto native bool CloseMenuByPreset(ScriptMenuPresetEnum preset);
+	proto native bool CloseMenuByUserId(int userId);
+	proto native bool CloseMenu(MenuBase menu);
+	
+	protected void MenuManager();
+	protected void ~MenuManager();
+};
+
+class MenuBindAttribute
+{
+	string m_MenuItemName;
+	
+	void MenuBindAttribute(string menuItemName = "")
+	{
+		m_MenuItemName = menuItemName;
+	}
+}
+
+class MenuBase: ScriptedWidgetEventHandler
+{
+	proto native int GetUserId();
+	proto native Widget GetRootWidget();
+	proto external MenuBase BindItem(string menuItemName, func callback);
+	proto native MenuBase SetLabel(string menuItemName, string text);
+	proto native Widget GetItemWidget(string menuItemName);
+	proto native MenuManager GetManager();
+	proto native void Close();
+	
+	void	OnMenuFocusGained() {}
+	void	OnMenuFocusLost() {}
+	void	OnMenuShow() {}
+	void	OnMenuHide() {}
+	void	OnMenuOpen() {}
+	void	OnMenuClose() {}
+	void	OnMenuInit() {}
+	void	OnMenuUpdate(float tDelta) {}
+	void	OnMenuItem(string menuItemName, bool changed, bool finished) {}
+	
+	protected void MenuBase();
+	protected void ~MenuBase();
+};
+
+class MessageBox: MenuBase
+{
+	[MenuBindAttribute()]
+	void Ok()
+	{
+		Close();
+	}
+}
+
+#ifdef PLATFORM_WINDOWS
+class WorldEditorIngame: MenuBase
+{
+	proto native bool LoadWorld(string worldFilePath);
+	proto native bool SaveWorld();
+};
+#endif
+
+#endif
+
diff --git a/scripts/2_GameLib/DayZ/settings.c b/scripts/2_GameLib/DayZ/settings.c
new file mode 100644
index 0000000000000000000000000000000000000000..c5cd3683920ffdde89b61562e6a42dc2ec37b2ca
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/settings.c
@@ -0,0 +1,38 @@
+#ifdef GAME_TEMPLATE
+
+class Settings
+{
+	static void		OnChange(string variableName) {}
+	static void 	OnAnyChange() {}	
+	static void 	OnLoad() {}
+	static void 	OnSave() {}
+	static void 	OnReset() {}
+	static void 	OnRevert() {}
+	static void 	OnApply() {}
+	
+	private void Settings() {}
+	private void ~Settings() {}
+};
+
+class GameSettings: Settings
+{
+	[Attribute("false", "checkbox", "Is debug mode enabled")]
+	static bool Debug;
+	
+	override static void OnAnyChange() 
+	{
+		GetGame().SetDebug(Debug);
+	}
+}
+
+class SettingsMenu: MenuBase
+{
+	proto native external bool AddSettings(typename settingsClass);	
+	proto native void Save();	
+	proto native void Reset();
+	proto native void Revert();
+	proto native void Apply();
+	proto native void Back();
+};
+#endif
+
diff --git a/scripts/2_GameLib/DayZ/tools.c b/scripts/2_GameLib/DayZ/tools.c
new file mode 100644
index 0000000000000000000000000000000000000000..e8be2e0a643921aedfd8c91c5528b3184b8b4dad
--- /dev/null
+++ b/scripts/2_GameLib/DayZ/tools.c
@@ -0,0 +1,216 @@
+/**
+ \brief ScriptCallQueue Class provide "lazy" calls - when we don't want to execute function immediately but later during frame update (used mainly in UI)
+ \n usage:
+ @code
+	class Arkanoid extends Game
+	{
+		ref ScriptCallQueue m_CallQueue = new ScriptCallQueue();
+	
+		ScriptCallQueue GetCallQueue() { 
+			return m_CallQueue;
+		}
+	
+		override void OnUpdate(float timeslice)
+		{
+			m_CallQueue.Tick(timeslice);
+			...
+		}
+		...
+	}
+
+	class MyObject
+	{
+		int m_cnt = 0;
+	
+		void Hello(int p1, string p2)
+		{
+			Print("Hello( " + p1 + " , " + p2 + ")");
+		}
+	
+		void Test()
+		{
+			Print(m_cnt);
+			m_cnt++;
+			
+			if (m_cnt > 10)
+			{
+				ScriptCallQueue queue = GetGame().GetCallQueue();
+				queue.Remove(Test);
+			}
+		}
+	}
+
+	void Test(MyObject obj)
+	{
+		ScriptCallQueue queue = GetGame().GetCallQueue(); 
+		queue.CallLater(obj.Hello, 5000, false, 65, "world"); // adds call 'obj.Hello(65, "world")' into queue, and it will be executed once after 5s
+		queue.CallLater(obj.Test, 3000, true); // adds call 'obj.Test()' into queue, and it will be executed each 3s
+		queue.Call(obj.Hello, 72, "world 2"); // adds call 'obj.Hello(72, "world 2")' into queue, and it will be executed next frame (on next call of ScriptCallQueue.Tick)
+	}
+ @endcode
+ */
+class ScriptCallQueue
+{
+	//! executes calls on queue if their time is already elapsed, if 'repeat = false' call is removed from queue
+	proto native void Tick(float timeslice);
+	//! adds call into the queue with given parameters and arguments (arguments are held in memory until the call is executed/removed or ScriptCallQueue is destroyed)
+	proto void Call(func fn, void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);
+	//! adds call into the queue with given parameters and arguments (arguments are held in memory until the call is executed/removed or ScriptCallQueue is destroyed)
+	proto void CallByName(Class obj, string fnName , Param params = NULL);
+	//! adds call into the queue with given parameters and arguments (arguments are held in memory until the call is executed/removed or ScriptCallQueue is destroyed)
+	proto void CallLater(func fn, int delay = 0, bool repeat = false, void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);	
+	//! adds call into the queue with given parameters and arguments (arguments are held in memory until the call is executed/removed or ScriptCallQueue is destroyed)
+	proto void CallLaterByName(Class obj, string fnName, int delay = 0, bool repeat = false, Param params = NULL);	
+	//! remove specific call from queue	
+	proto void Remove(func fn);
+	//! return Remaining time to the call execution (in miliseconds)
+	proto int GetRemainingTime(func fn);
+	//! remove specific call from queue	
+	proto void RemoveByName(Class obj, string fnName);
+	//! return Remaining time to the call execution (in miliseconds)
+	proto int GetRemainingTimeByName(Class obj, string fnName);
+	//! remove all calls from queue
+	proto native void Clear();
+};
+
+/**
+ \brief ScriptInvoker Class provide list of callbacks
+ \n usage:
+ @code
+	class Player
+	{
+		ref ScriptInvoker m_DeathInvoker	= new ScriptInvoker();
+	
+		void OnKilled()
+		{
+			m_DeathInvoker.Invoke(this);		
+		}
+	}
+
+	void LogPlayerDeath(p)
+	{
+		Print("RIP " + p);
+	}		
+
+	class Game
+	{
+		void RemovePlayer(Player p)
+		{
+		}
+
+		void GameOver()
+		{
+		}
+	}
+
+	void OnPlayerSpaned(Player p)
+	{
+		Game game = GetGame();
+		p.m_DeathInvoker.Insert(LogPlayerDeath);
+		p.m_DeathInvoker.Insert(game.RemovePlayer);
+		p.m_DeathInvoker.Insert(game.GameOver);
+	}
+ @endcode
+ */
+class ScriptInvoker
+{
+	//! invoke call on all inserted methods with given arguments
+	proto void Invoke(void param1 = NULL, void param2 = NULL, void param3 = NULL, void param4 = NULL, void param5 = NULL, void param6 = NULL, void param7 = NULL, void param8 = NULL, void param9 = NULL);
+	//! insert method to list
+	proto bool Insert(func fn, int flags = EScriptInvokerInsertFlags.IMMEDIATE);	
+	//! remove specific call from list
+	proto bool Remove(func fn, int flags = EScriptInvokerRemoveFlags.ALL);
+	//! count how many times this fn is actively present in the Invoker
+	proto int Count(func fn);
+	//! remove all calls from list
+	proto native void Clear();
+};
+
+enum EScriptInvokerInsertFlags
+{
+	NONE,
+	/**
+	\brief It gets added in immediately, which means that when called while an invoker is running, it will call this newly added call in the same run
+		\note Default flag, as that is the original behaviour, although it might cause endless Insert chain now... (still better than undefined behaviour)
+		\note In case of "Possible endless Insert detected" VME, either create an exit, remove the IMMEDIATE flag or make the insert UNIQUE
+		\note The Endless Insert is detected by seeing if "amount of calls > initial size + 128"
+	*/
+	IMMEDIATE,
+	/**
+	\brief Only one call to this instance+method is ever expected
+		\note Will throw a VME when a second one is attempted to be added
+		\note If it was already added without the flag, it will also throw a VME and keep the first of all previously inserted
+	*/
+	UNIQUE,
+}
+
+enum EScriptInvokerRemoveFlags
+{
+	NONE,
+	/**
+	\brief Default flag
+		\note Don't use this if you want it to remove only the last insert instead of all of them
+	*/
+	ALL,
+}
+
+/**
+ \brief Designed to hold 1 valid call
+*/
+class ScriptCaller
+{
+	//! ScriptCaller is meant to be created through Create
+	private void ScriptCaller();
+	//! Creates a ScriptCaller
+	static proto ScriptCaller Create(func fn);
+	//! Replaces the current registered func with the new one, throws errors if unsuccessful
+	proto void Init(func fn);	
+	//! Invoke call on the registered func, throws errors if unsuccessful
+	proto void Invoke(void param1 = null, void param2 = null, void param3 = null, void param4 = null, void param5 = null, void param6 = null, void param7 = null, void param8 = null, void param9 = null);
+
+	//! Checks if the ScriptCaller is valid
+	proto bool IsValid();
+
+	/**
+	\brief Compares this script caller against another script caller
+		\note May return true even if either one is invalid
+
+	@code
+		class SomeClass
+		{
+			void SomeMethod()
+			{
+			}
+		}
+
+		void Test()
+		{
+			SomeClass instanceA = new SomeClass();
+			SomeClass instanceB = new SomeClass();
+
+			ScriptCaller callerA;
+			ScriptCaller callerB;
+
+			//! Two methods that are to the same instance
+			callerA = ScriptCaller.Create(instanceA.SomeMethod);
+			callerB = ScriptCaller.Create(instanceA.SomeMethod);
+
+			Print(callerA.Equals(callerB)); //! "1"
+			Print(callerA == callerB); //! "0"
+			Print(callerA); //! "ScriptCaller callerA = ScriptCaller<87bc2d40>"
+			Print(callerB); //! "ScriptCaller callerB = ScriptCaller<87bc3600>"
+
+			//! Two methods belonging to different instances
+			callerA = ScriptCaller.Create(instanceA.SomeMethod);
+			callerB = ScriptCaller.Create(instanceB.SomeMethod);
+
+			Print(callerA.Equals(callerB)); //! "0"
+			Print(callerA == callerB); //! "0"
+			Print(callerA); //! "ScriptCaller callerA = ScriptCaller<87bc3c40>"
+			Print(callerB); //! "ScriptCaller callerB = ScriptCaller<87bc2d40>"
+		}
+	@endcode
+	*/
+	proto bool Equals(notnull ScriptCaller other);
+
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/AI/AIAgent.c b/scripts/3_Game/DayZ/AI/AIAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..66ebc6e7a956c307095cabcbf6e4b82fcbc96d70
--- /dev/null
+++ b/scripts/3_Game/DayZ/AI/AIAgent.c
@@ -0,0 +1,8 @@
+class AIAgent : Managed
+{
+	private void AIAgent();
+	private void ~AIAgent();
+	
+	proto native void SetKeepInIdle(bool enable);
+	proto native AIGroup GetGroup();
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/AI/AIGroup.c b/scripts/3_Game/DayZ/AI/AIGroup.c
new file mode 100644
index 0000000000000000000000000000000000000000..475c0e4ede4494358b7b7b49d3baeba88a6ceb23
--- /dev/null
+++ b/scripts/3_Game/DayZ/AI/AIGroup.c
@@ -0,0 +1,15 @@
+class AIGroup : Managed
+{
+	private void AIGroup();
+	private void ~AIGroup();
+	
+	/*!
+	Manual group management - add / remove agents from group.
+	Don't forget to remove agent from old group.
+	Caution! Empty groups are deleted on the next frame.
+	*/
+ 	proto native void AddAgent(notnull AIAgent agent);
+ 	proto native void RemoveAgent(notnull AIAgent agent);
+	
+	proto native AIGroupBehaviour GetBehaviour();
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/AI/AIGroupBehaviour.c b/scripts/3_Game/DayZ/AI/AIGroupBehaviour.c
new file mode 100644
index 0000000000000000000000000000000000000000..399a6aa13390f5c8fb6b5ca75671adb1e0df3637
--- /dev/null
+++ b/scripts/3_Game/DayZ/AI/AIGroupBehaviour.c
@@ -0,0 +1,32 @@
+class AIGroupBehaviour : Managed
+{
+	private void AIGroupBehaviour();
+	private void ~AIGroupBehaviour();
+}
+
+class BehaviourGroupInfectedPackWaypointParams
+{
+	vector m_CenterPosition;
+	float m_Radius;
+	
+	void BehaviourGroupInfectedPackWaypointParams(vector pos, float radius)
+	{
+		m_CenterPosition = pos;
+		m_Radius = radius;
+	}
+}
+
+class BehaviourGroupInfectedPack : AIGroupBehaviour
+{
+	/*!
+	Group waypoints initialization
+	/param 	[in] 	waypointDefaultIndex 		Starting waypoint. Index to array of waypoints specified by waypointParams. Acceptable range is [0, waypointParams.Count() - 1]
+	/param 	[in]	forwardDirection			Waypoints traverse order.
+	/param 	[in]	loop						Specifies what happens after last waypoint is reached. true - cycle waypoints, false - patrol waypoints
+	*/
+	proto native void SetWaypoints(array<ref BehaviourGroupInfectedPackWaypointParams> waypointParams, int waypointDefaultIndex, bool forwardDirection, bool loop);
+
+	proto native void SetWaypointsTraverseDirection(bool forwardDirection);
+	proto native void SetWaypointsLoop(bool loop);
+	proto native void SetCurrentWaypoint(int waypointIndex);
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/AI/AIWorld.c b/scripts/3_Game/DayZ/AI/AIWorld.c
new file mode 100644
index 0000000000000000000000000000000000000000..3dad342d7500b249174b2e3db866744ff55eb2f5
--- /dev/null
+++ b/scripts/3_Game/DayZ/AI/AIWorld.c
@@ -0,0 +1,123 @@
+enum PGPolyFlags
+{
+	NONE,
+
+	WALK,			// Ability to walk (ground, grass, road)
+	DISABLED,		// Disabled polygon
+	DOOR,			// Ability to move through doors
+	INSIDE,			// Ability to move inside buildings
+
+	SWIM,			// Ability to swim (water)
+	SWIM_SEA,		// Ability to swim (sea water)
+
+	LADDER,			// Ability to climb on ladders
+	JUMP_OVER,		// Ability to do jumps overs
+	JUMP_DOWN,		// Ability to jump down
+	CLIMB,			// Ability to climb up
+	CRAWL,			// Ability to crawl
+	CROUCH,			// Ability to crouch
+
+	UNREACHABLE,
+
+	ALL,
+
+	JUMP,			// JUMP_OVER | JUMP_DOWN
+	SPECIAL			// JUMP | CLIMB | CRAWL | CROUCH
+}
+
+enum PGAreaType
+{
+	NONE,
+
+	TERRAIN,
+
+	WATER,
+	WATER_DEEP,
+	WATER_SEA,
+	WATER_SEA_DEEP,
+	OBJECTS_NOFFCON,
+
+	OBJECTS,
+	BUILDING,
+	ROADWAY,
+	TREE,
+	ROADWAY_BUILDING,
+
+	DOOR_OPENED,
+	DOOR_CLOSED,
+
+	LADDER,
+	CRAWL,
+	CROUCH,
+	FENCE_WALL,
+	JUMP
+}
+
+/*!
+Filter for FindPath, RaycastNavMesh, SampleNavmeshPosition
+*/
+class PGFilter : Managed
+{
+	// Uses PGPolyFlags bitmasks
+	proto native int GetIncludeFlags();
+	proto native int GetExcludeFlags();
+	proto native int GetExlusiveFlags();
+	proto native void SetFlags(int includeFlags, int excludeFlags, int exclusiveFlags);
+
+	proto native void SetCost(PGAreaType areaType, float cost);
+}
+
+class AIWorld : Managed
+{
+	private void AIWorld();
+	private void ~AIWorld();
+
+	/*!
+	Creates group with group behaviour specified by templateName param.
+	AIGroups lifetime is managed by AIWorld, e.g. empty groups are deleted automatically.
+	*/
+	proto native AIGroup CreateGroup(string templateName);
+	/*!
+	Creates group with no group behaviour
+	*/
+	proto native AIGroup CreateDefaultGroup();
+	/*!
+	Destroys group and all AIAgents attached
+	*/
+	proto native void DeleteGroup(notnull AIGroup group);
+	
+	/*!
+	Finds path on navmesh using path graph filter. 
+	
+	/param 	[in]	from 			starting position
+	/param 	[in] 	to 				ending position
+	/param 	[in] 	pgFilter 		filter used for searching
+	/param 	[out] 	waypoints		waypoints array including starting and ending position
+	/returns	true - if path has been found
+	*/
+	proto native bool FindPath(vector from, vector to, PGFilter pgFilter, out TVectorArray waypoints);
+	
+	/*!
+	Raytest in navmesh
+	
+	/param 	[in]	from 			starting position
+	/param 	[in] 	to 				ending position
+	/param 	[in] 	pgFilter 		filter used for searching
+	/param 	[out] 	hitPos			hit position
+	/param 	[out] 	hitNormal		hit normal
+	/returns	true - if ray hits navmesh edge
+	*/
+	proto native bool RaycastNavMesh(vector from, vector to, PGFilter pgFilter, out vector hitPos, out vector hitNormal);
+	
+	/*!
+	Finds closest point on navmesh within maxDistance radius using path graph filter. 
+	
+	/param 	[in]	position 			position wanted
+	/param 	[in] 	maxDistance 		search radius
+	/param 	[in] 	pgFilter 		filter used for searching
+	/param 	[out] 	sampledPosition		closest position on navmesh to position
+	/returns	true - function succeedes and found position is written to output paramter "sampledPosition"
+	/returns	false - function failed to find position on navmesh within given radius, output paramter is left intact
+	*/
+	proto native bool SampleNavmeshPosition(vector position, float maxDistance, PGFilter pgFilter, out vector sampledPosition);	
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/AIBehaviour.c b/scripts/3_Game/DayZ/AIBehaviour.c
new file mode 100644
index 0000000000000000000000000000000000000000..243f77172b81de19bb18a76fffacf7a8dd4c6701
--- /dev/null
+++ b/scripts/3_Game/DayZ/AIBehaviour.c
@@ -0,0 +1,147 @@
+/** @file 
+
+  this file is interface to AI Behaviour
+
+*/
+
+/*
+class AIMessage: Managed
+
+{
+	Param m_Parameters;
+	int m_CrcMessage;
+	Param GetParameters();
+	int GetTypeNameCRC();
+}
+
+class AIMessageTest : AIMessage
+{
+	int GetTypeNameCRC() {return testCRC;}
+	//static int testCRC = 5;	
+}
+
+*/
+
+
+class AIBehaviourHLData
+{
+	private void AIBehaviourHLData() {}
+	private void ~AIBehaviourHLData() {}
+	
+	//void ParseConfig(ParamEntryPar param, AIWorld* world, AIAgentTemplate* agentTemplate) {};
+	void OnParseConfig();	
+	
+	//Can be use only inside OnParseConfig function
+	proto native void ParseBehaviourSlot(string name);
+	proto native void ParseAlertLevel(string name);
+	proto native float ReadParamValue(string paramName, float defValue);
+	
+}
+
+
+class AIBehaviourHL
+{
+	private void AIBehaviourHL() {}
+	private void ~AIBehaviourHL() {}
+	
+	proto native AIBehaviourHLData GetTemplateData();
+	
+	void OnInit(){};
+	//private void AIBehaviourHL_script() {};
+	//private void ~AIBehaviourHL_script() {};
+
+	void Simulate (float timeDelta)
+	{
+		//time = time + timeDelta; 
+		//Print("A2");
+	}
+	
+	
+	//void OnNoise(AINoiseInfo noise, EntityAI source){}
+	void OnDamage(float damage, EntityAI source){}
+
+	void OnDamageInflicted(){}
+	void OnAnimationEvent(int nameCrc){}
+	//void OnMessage(AIMessage message){}
+	//void OnBehaviourSwitched(AIBehaviour* behaviour){}
+	proto native void SetNextBehaviour(int BehaviourCrc);
+	proto native void SwitchToNextBehaviour();
+	
+	static proto void RegAIBehaviour(string behname,typename behClass, typename behClassData);
+};
+
+
+class AIBehaviourHLZombie2 : AIBehaviourHL
+{
+	//AIBehaviourHLDataZombie2 data;
+	//int state;
+	//float time;
+	AIBehaviourHLDataZombie2 GetData()
+	{
+		return AIBehaviourHLDataZombie2.Cast( GetTemplateData() );
+	}
+	
+	private void AIBehaviourHLZombie2() {}
+	private void ~AIBehaviourHLZombie2() {}
+	
+	override void OnInit()
+	{
+		SetNextBehaviour(0x7b9a4ee9);
+		SwitchToNextBehaviour();
+		//Print("OnInit");
+		//data = GetData();
+		//float a = data.m_fDamageToCrawl;
+		//Print(a);
+	}
+	
+	override void Simulate (float timeDelta)
+	{
+		//time = time + timeDelta; 
+		//Print("B2");
+	}
+	
+	void ShowDebugInfo() 
+	{
+		//Print(time);
+	};
+	
+	//void OnMessage(AIMessage message)
+	//{
+		//int ID = message.GetTypeNameCRC();
+		//Print(ID);
+		
+	//}
+};
+
+class AIBehaviourHLDataZombie2 : AIBehaviourHLData
+{
+	float m_fDamageToCrawl;
+	float m_fCrawlProbability;
+
+	private void AIBehaviourHLDataZombie2() {}
+	private void ~AIBehaviourHLDataZombie2() {}
+	
+	override void OnParseConfig()
+	{
+		Print("zombie data parse config start");
+		
+		ParseBehaviourSlot("Calm");
+		ParseBehaviourSlot("Attracted");
+		ParseBehaviourSlot("Disturbed");
+		ParseBehaviourSlot("Alerted");
+		
+		ParseAlertLevel("Calm");
+		ParseAlertLevel("Disturbed");
+		ParseAlertLevel("Attracted");
+		ParseAlertLevel("Alerted");
+		
+		m_fDamageToCrawl = ReadParamValue("damageToCrawl",0.01);
+		m_fCrawlProbability = ReadParamValue("crawlProbability",0.01);
+		
+		Print("zombie data parse config end");
+	}
+};
+
+//NewNPC(model,behname,....)
+
+
diff --git a/scripts/3_Game/DayZ/AmmoCamParams.c b/scripts/3_Game/DayZ/AmmoCamParams.c
new file mode 100644
index 0000000000000000000000000000000000000000..19aed3d121aaf33ae04e467f097368886d2f0552
--- /dev/null
+++ b/scripts/3_Game/DayZ/AmmoCamParams.c
@@ -0,0 +1,17 @@
+class AmmoCamParams
+{
+	void Load(string ammoType)
+	{
+		string cfgPath = "CfgAmmo " + ammoType + " Effects" + " CameraShake ";
+		
+		m_Radius				= GetGame().ConfigGetFloat(cfgPath + "radius");
+		m_Strength				= GetGame().ConfigGetFloat(cfgPath + "strength");
+		m_ModifierClose			= GetGame().ConfigGetFloat(cfgPath + "modifierClose");
+		m_ModifierFar			= GetGame().ConfigGetFloat(cfgPath + "modifierFar");
+	}
+	
+	float m_Radius = 40;//the max distance at which the cam shake is triggered
+	float m_Strength = 4;//strength of the cam shake
+	float m_ModifierClose = 1;//shake 'strength' modifier when the player is at distance 0 from the source of explosion
+	float m_ModifierFar = 0;//shake 'strength' modifier when the player is at distance 'radius' from the source of explosion
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/AmmoEffects.c b/scripts/3_Game/DayZ/AmmoEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..a5e1a25d294e7ff0b3601f4e464446bf36186362
--- /dev/null
+++ b/scripts/3_Game/DayZ/AmmoEffects.c
@@ -0,0 +1,137 @@
+/**
+\brief Static data holder for certain ammo config values
+	\note Kept the names similar to what is in config, but it might be a little deceiving as this is mainly used for explosives
+*/
+class AmmoEffects
+{	
+	//! Key: Ammo class name; Data: ParticleList ID
+	static ref map<string, int> m_AmmoParticles;
+	
+	//! Key: Ammo class name; Data: ParticleList ID
+	static ref map<string, typename> m_AmmoEffects;
+	
+	
+	
+	/** \name Ammo particles
+ 		Methods regarding getting/playing ammo particle
+	*/
+	//@{
+	
+	//! Get the ParticleList ID for the particle for this ammoType
+	static int GetAmmoParticleID(string ammoType)
+	{
+		int particleID;
+		
+		// Search for it in the static map
+		if ( !m_AmmoParticles.Find(ammoType, particleID) )
+		{
+			// Load it in when we can't find it
+			string particleFileName;
+			GetGame().ConfigGetText(string.Format("cfgAmmo %1 particle", ammoType), particleFileName);
+			
+			// If we found a valid entry, try looking for it in ParticleList
+			if ( particleFileName != "" )
+			{
+				particleID = ParticleList.GetParticleIDByName(particleFileName);
+			}
+			
+			// Store it for next search
+			m_AmmoParticles.Insert(ammoType, particleID);
+		}
+		
+		return particleID;
+	}
+	
+	//! Attempt to play the ammo particle at pos if found, returns true on success
+	static bool PlayAmmoParticle(string ammoType, vector pos)
+	{
+		int particleID = GetAmmoParticleID(ammoType);
+		
+		if (ParticleList.IsValidId(particleID))
+		{
+			return ParticleManager.GetInstance().PlayInWorld(particleID, pos) != null;
+		}
+		
+		return false;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Ammo effects
+ 		Methods regarding getting/playing ammo effect
+	*/
+	//@{
+	
+	//! Get the typename for the effect for this ammoType
+	static typename GetAmmoEffectTypename(string ammoType)
+	{
+		typename typeName;
+		
+		// Search for it in the static map
+		if ( !m_AmmoEffects.Find(ammoType, typeName) )
+		{
+			// Load it in when we can't find it
+			string effectName;
+			GetGame().ConfigGetText(string.Format("cfgAmmo %1 effect", ammoType), effectName);
+			
+			// If we found a valid entry, try looking for it in ParticleList
+			if ( effectName != "" )
+			{
+				typeName = effectName.ToType();
+			}
+			
+			// Store it for next search
+			m_AmmoEffects.Insert(ammoType, typeName);
+		}
+		
+		return typeName;
+	}
+	
+	//! Attempt to play the ammo effect at pos if found, returns true on success
+	static bool PlayAmmoEffect(string ammoType, vector pos)
+	{
+		typename typeName = GetAmmoEffectTypename(ammoType);
+		
+		if ( typeName )
+		{
+			Effect eff = Effect.Cast(typeName.Spawn());
+			
+			if ( eff )
+			{
+				eff.SetAutodestroy(true);
+				return SEffectManager.PlayInWorld( eff, pos );
+			}
+		}
+		
+		return false;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Lifetime
+ 		Creation and cleanup
+	*/
+	//@{
+	
+	//! Initialize the containers: this is done this way, to have these not exist on server
+	static void Init()
+	{
+		m_AmmoParticles = new map<string, int>();
+		m_AmmoEffects = new map<string, typename>();
+	}
+	
+	//! Clean up the data
+	static void Cleanup()
+	{
+		/* These ain't containing no refs, so whatever
+		m_AmmoParticles.Clear();
+		m_AmmoEffects.Clear();
+		*/
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Analytics/AnalyticsManagerClient.c b/scripts/3_Game/DayZ/Analytics/AnalyticsManagerClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..50917af1f8bf6abcf7d3114997249aac94ff9745
--- /dev/null
+++ b/scripts/3_Game/DayZ/Analytics/AnalyticsManagerClient.c
@@ -0,0 +1,180 @@
+class AnalyticsManagerClient
+{
+	static const int GEAR_COUNT = 3; 
+	static string m_FullGear[GEAR_COUNT] = {"Shoulder","Melee","Back"};
+	
+	void RegisterEvents()
+	{
+		ClientData.SyncEvent_OnEntityKilled.Insert(Event_OnEntityKilled);
+		ClientData.SyncEvent_OnPlayerIgnitedFireplace.Insert(Event_OnPlayerIgnitedFireplace);
+	}
+	
+	void UnregisterEvents()
+	{
+		ClientData.SyncEvent_OnEntityKilled.Remove(Event_OnEntityKilled);
+		ClientData.SyncEvent_OnPlayerIgnitedFireplace.Remove(Event_OnPlayerIgnitedFireplace);
+	}
+	
+	//===================================
+	// OnActionEat
+	//===================================
+	void OnActionEat()
+	{
+		Achievements.OnActionEat();
+	}
+	
+	//===================================
+	// OnActionDrink
+	//===================================
+	void OnActionDrink()
+	{
+		Achievements.OnActionDrink();
+	}
+	
+	//===================================
+	// OnActionCookedSteak - not implemented
+	//===================================
+	void OnActionCookedSteak()
+	{
+		Achievements.OnCookedSteak();
+	}
+	
+	//===================================
+	// OnActionFinishedShaveSelf
+	//===================================
+	void OnActionFinishedShaveSelf()
+	{
+		Achievements.OnActionShave();
+	}
+	
+	//===================================
+	// OnActionFinishedGutDeer
+	//===================================
+	void OnActionFinishedGutDeer()
+	{
+		Achievements.OnActionGutDeer();
+	}
+	
+	//===================================
+	// OnActionRestrain
+	//===================================
+	void OnActionRestrain()
+	{		
+		Achievements.OnActionHandcuff();
+	}
+	
+	//===================================
+	// OnActionBandageTarget
+	//===================================
+	void OnActionBandageTarget()
+	{	
+		Achievements.OnActionMedsSurvivor();
+	}
+	
+	//===================================
+	// OnItemAttachedAtPlayer
+	//===================================
+	void OnItemAttachedAtPlayer(EntityAI item, string slot_name)
+	{
+		bool weapon_present;
+		bool melee_present;
+		bool backpack_present;
+		HumanInventory inventory;
+
+		if ( GetDayZGame().GetGameState() != DayZGameState.IN_GAME )
+		{
+			return;
+		}
+		
+		Man player = GetGame().GetPlayer();
+		if (!player)
+		{
+			return;
+		}
+		
+		inventory = player.GetHumanInventory();
+			
+		if ( player && inventory )
+		{
+			for ( int i = 0; i < GEAR_COUNT; ++i )
+			{
+				int slot_id = InventorySlots.GetSlotIdFromString(m_FullGear[i]);
+				EntityAI att_item = inventory.FindAttachment( slot_id ); // Boris V [27.2.2019]: Consider using player.GetItemOnSlot(m_FullGear[i]) instead.
+					
+				if ( !att_item )
+				{
+					//Print("index: "+ i +" slot_id: "+ slot_id +" = "+ att_item + " EMPTY");
+					continue;
+				}
+				
+				//checks for firearm
+				if (att_item.IsWeapon())
+					weapon_present = true;
+				//checks for melee weapon
+				else if (!att_item.IsWeapon() && att_item.GetInventory().HasInventorySlot(InventorySlots.GetSlotIdFromString("Melee")))
+					melee_present = true;
+				//checks for backpack
+				else if (!att_item.IsWeapon() && att_item.GetInventory().HasInventorySlot(InventorySlots.GetSlotIdFromString("Back")))
+					backpack_present = true;
+				//Print("index: "+ i +" slot_id: "+ slot_id +" = "+ att_item + " ATTACHED");
+			}
+				
+			//separate check for hand slot; TODO remove duplicates
+			att_item = inventory.GetEntityInHands();
+			if ( att_item )
+			{
+				//checks for firearm
+				if (att_item.IsWeapon())
+					weapon_present = true;
+				//checks for melee weapon
+				else if (!att_item.IsWeapon() && att_item.GetInventory().HasInventorySlot(InventorySlots.GetSlotIdFromString("Melee")) )
+					melee_present = true;
+				//checks for backpack
+				else if (!att_item.IsWeapon() && att_item.GetInventory().HasInventorySlot(InventorySlots.GetSlotIdFromString("Back")))
+					backpack_present = true;
+			}
+				
+			if (weapon_present && melee_present && backpack_present)
+			{
+				//Print("---EAchievementActionId.ACTION_EQUIP_GEAR");
+				Achievements.OnEquippedFullGear();
+			}
+		}
+	}
+	
+	//===================================
+	// Event_OnPlayerIgnitedFireplace
+	//===================================
+	void Event_OnPlayerIgnitedFireplace( EFireIgniteType ignite_type )
+	{
+		switch ( ignite_type )
+		{
+			case EFireIgniteType.Matchbox:
+			{
+				Achievements.OnActionIgniteMatchbox();
+				break;
+			}
+			case EFireIgniteType.Roadflare:
+			{
+				Achievements.OnActionIgniteRoadflare();
+				break;
+			}
+			case EFireIgniteType.HandDrill:
+			{
+				Achievements.OnActionIgniteDrill();
+				break;
+			}
+		}
+	}
+	
+	//===================================
+	// Event_OnEntityKilled
+	//===================================
+	void Event_OnEntityKilled(EntityAI victim, EntityAI killer, EntityAI source, bool is_headshot)
+	{
+		if ( killer != null && killer.IsPlayer() && killer.GetID() == GetGame().GetPlayer().GetID() )
+		{
+			Achievements.OnPlayerKilled(victim, killer, source, is_headshot);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Analytics/AnalyticsManagerServer.c b/scripts/3_Game/DayZ/Analytics/AnalyticsManagerServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..7f66376eb5598706f57e635bdcf067570a3d07ff
--- /dev/null
+++ b/scripts/3_Game/DayZ/Analytics/AnalyticsManagerServer.c
@@ -0,0 +1,73 @@
+class AnalyticsManagerServer
+{
+	const string STAT_DISTANCE 				= "dist";
+	const string STAT_PLAYTIME 				= "playtime";
+	const string STAT_PLAYERS_KILLED 		= "players_killed";
+	const string STAT_INFECTED_KILLED 		= "infected_killed";
+	const string STAT_LONGEST_SURVIVOR_HIT 	= "longest_survivor_hit";
+	
+	void OnPlayerConnect(Man player)
+	{
+		player.StatRegister(STAT_DISTANCE);
+		player.StatRegister(STAT_PLAYTIME);
+		player.StatRegister(STAT_PLAYERS_KILLED);
+		player.StatRegister(STAT_INFECTED_KILLED);
+		player.StatRegister(STAT_LONGEST_SURVIVOR_HIT);
+	}
+		
+	void OnPlayerDisconnect(Man player)
+	{
+		player.StatUpdateByPosition(STAT_DISTANCE);
+		player.StatUpdateByTime(STAT_PLAYTIME);
+	}
+	
+	//Entity-Entity hit
+	void OnEntityHit(EntityAI source, Man target)
+	{
+		if (source)
+		{
+			Man survivor = source.GetHierarchyRootPlayer();
+			if (survivor && source.IsWeapon())
+				OnPlayerToPlayerHit(survivor, target);
+		}
+	}
+	
+	protected void OnPlayerToPlayerHit(Man shooter, Man target)
+	{
+		float longestHitDistance = shooter.StatGet(STAT_LONGEST_SURVIVOR_HIT);
+		float currentDistance = vector.Distance(shooter.GetPosition(), target.GetPosition());
+		float distanceUpdate;
+		
+		if (longestHitDistance < currentDistance)
+			distanceUpdate = currentDistance - longestHitDistance;
+		
+		shooter.StatUpdate(STAT_LONGEST_SURVIVOR_HIT, distanceUpdate);
+	}
+	
+	//Entity-Entity kill
+	void OnEntityKilled(Object killer, EntityAI target)
+	{
+		EntityAI killerEntity = EntityAI.Cast(killer);
+		if (killerEntity)
+		{
+			Man killerSurvivor = killerEntity.GetHierarchyRootPlayer();
+			if (killerSurvivor)
+			{
+				if (target.IsPlayer())
+					OnPlayerKilled(killerSurvivor, target);
+				else if (target.IsZombie())
+					OnInfectedKilled(killerSurvivor, target);
+			}
+		}
+	}
+	
+	protected void OnPlayerKilled(Man killer, EntityAI target)
+	{
+		killer.StatUpdate(STAT_PLAYERS_KILLED, 1);
+	}
+	
+	protected void OnInfectedKilled(Man killer, EntityAI target)
+	{
+		killer.StatUpdate(STAT_INFECTED_KILLED, 1);
+	}
+}
diff --git a/scripts/3_Game/DayZ/Analytics/ScriptAnalytics.c b/scripts/3_Game/DayZ/Analytics/ScriptAnalytics.c
new file mode 100644
index 0000000000000000000000000000000000000000..6688ab8880c7ce071e4ee0e9d7c69ae9aa015e7b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Analytics/ScriptAnalytics.c
@@ -0,0 +1,176 @@
+// class binded to engine
+class StatsEventMeasuresData
+{
+	string m_CharacterId;		//!< character ID
+	int m_TimeInterval;			//!< amount of real time in seconds covered by this event
+	int m_DaytimeHour;			//!< current daytime in gameplay (hour in 24h format)
+	vector m_PositionStart;		//!< player world position at the start of interval
+	vector m_PositionEnd;		//!< player world position at the end of interval
+	float m_DistanceOnFoot;		//!< traveled distance on foot (meters) during interval
+	
+	float m_DistanceVehicle;	//!< traveled distance (meters) in vehicle during interval
+	float m_TimeVONIn;			//!< amount of time in seconds with inbound VON during interval
+	float m_TimeVONOut;			//!< amount of time in seconds with outbound VON during interval
+	int m_CntLootAny;			//!< count of any loot collected during interval
+	int m_CntLootFood;			//!< count of any food or consumables collected during interval
+	int m_CntLootCloth;			//!< count of cloth collected during interval
+	int m_CntLootFirearm;		//!< count of firearms collected during interval
+	int m_CntLootAmmo;			//!< count of ammo collected during interval
+	int m_CntKillInfected;		//!< count of infected kills during interval
+	int m_CntConsumedFood;		//!< count of consumed food during interval
+	int m_CntConsumedWater;		//!< count of consumed water during interval
+	int m_HealthRestored;		//!< number of health point restored during interval
+	int m_CntFiredAmmo;			//!< firearm rounds fired during interval
+	int m_CntCraftedItem;		//!< number of items crafted during interval
+	
+	// listStatus				// state metric of health, hunger, thirst, etc... when event is created/send
+	int m_HealthStatus;			//!< state of health (current state)
+	int m_BloodStatus;			//!< state of blood (current state)
+	int m_SicknessStatus;		//!< state of sickness (current state)
+	int m_TemperatureStatus;	//!< state of temperature (current state)
+	int m_FoodStatus;			//!< state of food (hunger) (current state)
+	int m_HydrationStatus;		//!< state of hydration (thirst) (current state)
+};
+
+// class binded to engine
+class StatsEventDeathData
+{
+	string		m_CharacterId;			//!< character ID
+	int			m_CharacterLifetime;	//!< lifetime of character in seconds
+	string		m_Cause;				//!< cause of death (hunger, sickness, player-killed, zombie-killed...)
+	string		m_WeaponName;			//!< name of weapon which caused death
+	float		m_Distance;				//!< distance in meters (rounded) from spawn position to death position
+	vector		m_Position;				//!< position of player when died
+	
+	int			m_ListDamages[5];		//!< list of damages (5 values) during last n sec. For example: {20, 80, 0, 0, 0}
+};
+
+// class binded to engine
+class StatsEventScoredKillData
+{
+	string		m_CharacterId;		//!< character ID
+	string		m_WeaponName;		//!< name of weapon which killed player (victim)
+	int			m_KillDistance;		//!< distance in meters (rounded) between killer and victim
+	vector		m_PositionKiller;	//!< position of killer
+	vector		m_PositionVictim;	//!< position of victim
+};
+
+// class binded to engine
+class StatsEventDisconnectedData
+{
+	string		m_CharacterId;	//!< character ID
+	string		m_Reason;		//!< reason of disconnect (quit, kick, ban, sign-out...)
+};
+
+// class binded to engine
+class StatsEventSpawnedData
+{
+	string		m_CharacterId;	//!< character ID
+	int			m_Lifetime;		//!< lifetime of character in seconds
+	vector		m_Position;		//!< position of spawn
+	int			m_Population;	//!< population of current gameplay (server)
+	int			m_DaytimeHour;	//!< current time in hour (hour in 24h)
+};
+
+// class binded to engine
+class StatsEventData
+{
+	void StatsEventData(string eventName)
+	{
+		m_eventName = eventName;
+		m_valuesBool = new map<string, int>();
+		m_valuesInt = new map<string, int>();
+		m_valuesFloat = new map<string, float>();
+		m_valuesString = new map<string, string>();
+		m_valuesVector = new map<string, vector>();
+	}
+	
+	void AddBool(string key, bool value)
+	{
+		m_valuesBool.Insert(key, (int)value);
+	}
+	
+	void AddInt(string key, int value)
+	{
+		m_valuesInt.Insert(key, value);
+	}
+	
+	void AddFloat(string key, float value)
+	{
+		m_valuesFloat.Insert(key, value);
+	}
+	
+	void AddString(string key, string value)
+	{
+		m_valuesString.Insert(key, value);
+	}
+	
+	void AddVector(string key, vector value)
+	{
+		m_valuesVector.Insert(key, value);
+	}
+	
+	private string m_eventName;
+	private autoptr map<string, int> m_valuesBool;//TODO: use bool instead of int (problem with engine type binding)
+	private autoptr map<string, int> m_valuesInt;
+	private autoptr map<string, float> m_valuesFloat;
+	private autoptr map<string, string> m_valuesString;
+	private autoptr map<string, vector> m_valuesVector;
+}
+
+
+class ScriptAnalytics
+{
+	//! send event about death to statistic DB
+	static proto native void SendPlayerDeath(StatsEventDeathData data);
+	
+	//! send event about kill to statistic DB
+	static proto native void SendPlayerScoredKill(StatsEventScoredKillData data);
+	
+	//! send event to statistic DB
+	static proto native void SendPlayerDisconnected(StatsEventDisconnectedData data);
+	
+	//! send event about player status to statistic DB
+	static proto native void SendPlayerMeasures(StatsEventMeasuresData data);
+	
+	//! send event about spawning to statistic DB
+	static proto native void SendPlayerSpawned(StatsEventSpawnedData data);
+	
+	//! universal analytics event
+	static proto native void SendEvent(StatsEventData data);
+};
+
+
+
+class Analytics
+{
+	// send stats data with log
+	static void PlayerDeath(StatsEventDeathData data)
+	{
+		ScriptAnalytics.SendPlayerDeath(data);
+	}
+	
+	// send stats data with log
+	static void PlayerScoredKill(StatsEventScoredKillData data)
+	{
+		ScriptAnalytics.SendPlayerScoredKill(data);
+	}
+	
+	// send stats data with log
+	static void PlayerDisconnected(StatsEventDisconnectedData data)
+	{
+		ScriptAnalytics.SendPlayerDisconnected(data);
+	}
+	
+	// send stats data with log
+	static void PlayerMeasures(StatsEventMeasuresData data)
+	{
+		ScriptAnalytics.SendPlayerMeasures(data);
+	}
+	
+	// send stats data with log
+	static void PlayerSpawned(StatsEventSpawnedData data)
+	{
+		ScriptAnalytics.SendPlayerSpawned(data);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Anim/AnimCommand.c b/scripts/3_Game/DayZ/Anim/AnimCommand.c
new file mode 100644
index 0000000000000000000000000000000000000000..3a24e92341a63c57a6705369d1e966962338f8aa
--- /dev/null
+++ b/scripts/3_Game/DayZ/Anim/AnimCommand.c
@@ -0,0 +1,35 @@
+//! base class of all commands exposed to script to provide common functionality over animations
+class AnimCommandBase
+{
+	// These would be private if not for the scripted commands
+	// As other commands lifetime are handled internally
+	protected void AnimCommandBase() {}
+	protected void ~AnimCommandBase() {}
+	
+	//! returns entity that this command is bount to
+	proto native IEntity GetEntity();
+
+	//! called when command starts
+	void OnActivate() {}
+
+	//! called when command ends
+	void OnDeactivate() {}
+
+	//! called before any animation is processed
+	//! here change animation values, add animation commands
+	void PreAnimUpdate(float pDt) {}
+
+	//! after animation is processed, before physics is processed
+	//! here you can listen to various events
+	void PrePhysUpdate(float pDt) {}
+
+	//! functions usable only from OnActivate or PreAnimUpdate
+	proto native void PreAnim_CallCommand(int pCommand, int pParamInt, float pParamFloat);
+	proto native void PreAnim_SetFloat(int pVar, float pFlt);
+	proto native void PreAnim_SetInt(int pVar, int pInt);
+	proto native void PreAnim_SetBool(int pVar, bool pBool);
+
+	//! functions usable in PrePhysUpdate
+	proto native bool PrePhys_IsEvent(int pEvent);
+	proto native bool PrePhys_IsTag(int pTag);
+}
diff --git a/scripts/3_Game/DayZ/BillboardSet.c b/scripts/3_Game/DayZ/BillboardSet.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b265eaa5c9ae523de914d30e7633de1e42738e6
--- /dev/null
+++ b/scripts/3_Game/DayZ/BillboardSet.c
@@ -0,0 +1,120 @@
+class BillboardSetHandler
+{
+	protected bool 							m_BillboardSetIndex 	= -1;
+	protected ref array<ref BillboardSet> 	m_BillboardSets;
+	protected static const string 			ROOT_CLASS = "BillboardPresets";
+	protected static int 					m_SetIndexCached = -1;//once we resolve the name into an index, we cache it(this disallows dynamic index swapping during mission's runtime)
+	
+	string GetTextureByType(string type)
+	{
+		if (m_BillboardSetIndex == -1)
+			return "";
+		BillboardSet bbset = m_BillboardSets.Get(m_BillboardSetIndex);
+		return bbset.GetTextureByType(type);
+	}
+
+	void OnRPCIndex(int index)
+	{
+		if (!m_BillboardSets)
+			LoadBillboardConfigs();
+						
+		if (m_BillboardSets && m_BillboardSets.IsValidIndex(index))
+		{
+			m_BillboardSetIndex = index;
+		}
+	}
+	
+	protected bool LoadBillboardConfigs()
+	{
+		m_BillboardSets = new array<ref BillboardSet>();
+		
+		int setCount = g_Game.ConfigGetChildrenCount(ROOT_CLASS);
+
+		for (int setIndex = 0; setIndex < setCount; setIndex++)
+		{
+			string setName;
+			GetGame().ConfigGetChildName(ROOT_CLASS, setIndex, setName);
+			string path = ROOT_CLASS + " " + setName;
+			m_BillboardSets.Insert(new BillboardSet(path));
+		}
+		
+		return true; 
+	}
+	
+	static bool ActivateBillboardSet(string setClassName, PlayerIdentity identity)
+	{
+		if (!g_Game)
+			return false;
+		
+		if (m_SetIndexCached == -1)
+		{
+			int setCount = g_Game.ConfigGetChildrenCount(ROOT_CLASS);
+			for (int setIndex = 0; setIndex < setCount; setIndex++)
+			{
+				string setName;
+				GetGame().ConfigGetChildName(ROOT_CLASS, setIndex, setName);
+				
+				if (setName == setClassName)
+				{
+					m_SetIndexCached = setIndex;
+					break
+				}
+			}
+		}
+		
+		if (m_SetIndexCached != -1)
+		{
+			auto param = new Param1<int>(m_SetIndexCached);
+			GetGame().RPCSingleParam( identity.GetPlayer(), ERPCs.RPC_SET_BILLBOARDS, param, true, identity );
+			return true;
+		}
+		return false;
+	}
+}
+
+
+class BillboardSet
+{
+	protected ref map<string, string> m_TypeTextureMapping = new map<string, string>();
+	
+	void BillboardSet(string path)
+	{
+		LoadConfig(path);
+	}
+	
+	string GetTextureByType(string type)
+	{
+		return m_TypeTextureMapping.Get(type);
+	}
+
+	protected void LoadConfig(string path)
+	{
+		int count = g_Game.ConfigGetChildrenCount(path);
+		for ( int i = 0; i < count; i++ )
+		{
+			string itemName;
+			GetGame().ConfigGetChildName(path, i, itemName);
+			
+			string typesPath = path + " " + itemName + " types";
+			string texturePath = path + " " + itemName + " texture";
+			
+			if (GetGame().ConfigIsExisting(typesPath) && GetGame().ConfigIsExisting(texturePath))
+			{
+				TStringArray types = new TStringArray();
+				string texture;
+				GetGame().ConfigGetText(texturePath, texture);
+				GetGame().ConfigGetTextArray(typesPath, types);
+				
+				foreach (string s: types)
+				{
+					m_TypeTextureMapping.Insert(s,texture);
+				}
+			}
+			else
+			{
+				ErrorEx("Billboard set incorrect configuration, type or texture param missing: " + path);
+			}
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/BleedChanceData.c b/scripts/3_Game/DayZ/BleedChanceData.c
new file mode 100644
index 0000000000000000000000000000000000000000..09dc618f8db61e89b09eb0e7a7905c5888e298a4
--- /dev/null
+++ b/scripts/3_Game/DayZ/BleedChanceData.c
@@ -0,0 +1,131 @@
+typedef map<int,float> BleedChanceMaxMap; //<bloodDamageReceived,chanceMax>
+
+//! Static data of bleeding chance probabilities; currently used for melee only
+class BleedChanceData : Managed
+{
+	private static const float BLOOD_HITPOINTS_UNIVERSAL = 100.0;
+	
+	private static ref map<string, ref BleedChanceMaxMap> m_DamageTypeMap;
+	
+	static void InitBleedChanceData()
+	{
+		m_DamageTypeMap = new map<string,ref BleedChanceMaxMap>();
+		
+		InitMeleeChanceMap();
+		InitInfectedChanceMap();
+	}
+	
+	static void InitMeleeChanceMap()
+	{
+		if (m_DamageTypeMap.Contains("Melee"))
+			ErrorEx("'Melee' damage type bleed chances already initialized!");
+		
+		BleedChanceMaxMap bleedChanceMaxMap = new BleedChanceMaxMap();
+		
+		//keys have to be integers, recalculated later
+		bleedChanceMaxMap.Set(0,0.0);
+		bleedChanceMaxMap.Set(10,5.0);
+		bleedChanceMaxMap.Set(20,15.0);
+		bleedChanceMaxMap.Set(30,23.4);
+		bleedChanceMaxMap.Set(40,31.2);
+		bleedChanceMaxMap.Set(50,39.0);
+		bleedChanceMaxMap.Set(60,46.8);
+		bleedChanceMaxMap.Set(70,54.6);
+		bleedChanceMaxMap.Set(80,62.4);
+		bleedChanceMaxMap.Set(90,70.2);
+		bleedChanceMaxMap.Set(BLOOD_HITPOINTS_UNIVERSAL,100.0);
+		
+		m_DamageTypeMap.Set("Melee",bleedChanceMaxMap);
+	}
+	
+	static void InitInfectedChanceMap()
+	{
+		if (m_DamageTypeMap.Contains("Infected"))
+			ErrorEx("'Infected' damage type bleed chances already initialized!");
+		
+		BleedChanceMaxMap bleedChanceMaxMap = new BleedChanceMaxMap();
+		
+		//keys have to be integers, recalculated later
+		bleedChanceMaxMap.Set(0,0.0);
+		bleedChanceMaxMap.Set(10,5.0);
+		bleedChanceMaxMap.Set(20,15.0);
+		bleedChanceMaxMap.Set(30,27.5);
+		bleedChanceMaxMap.Set(40,40.0);
+		bleedChanceMaxMap.Set(50,55.0);
+		bleedChanceMaxMap.Set(60,60.0);
+		bleedChanceMaxMap.Set(70,70.0);
+		bleedChanceMaxMap.Set(80,75.0);
+		bleedChanceMaxMap.Set(90,85.0);
+		bleedChanceMaxMap.Set(BLOOD_HITPOINTS_UNIVERSAL,100.0);
+		
+		m_DamageTypeMap.Set("Infected",bleedChanceMaxMap);
+	}
+	
+	static void Cleanup()
+	{
+		delete m_DamageTypeMap;
+	}
+	
+	//! returns 'false' when damageType is unhandled
+	static bool CalculateBleedChance(string damageType, float bloodDamage, float bleedThreshold, out float bleedChance)
+	{
+		map<int,float> bleedChanceMap = m_DamageTypeMap.Get(damageType);
+		if (!bleedChanceMap)
+			return false;
+		
+		float armor = bloodDamage / BLOOD_HITPOINTS_UNIVERSAL;
+		float valueHigher = Math.Max(bleedThreshold,armor) * BLOOD_HITPOINTS_UNIVERSAL;
+		float valueLower = Math.Min(bleedThreshold,armor) * BLOOD_HITPOINTS_UNIVERSAL;
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsBleedingChancesLogEnable())
+		{	
+			Debug.BleedingChancesLog(armor.ToString(), "BleedChanceData" , "n/a", "armor:");
+			Debug.BleedingChancesLog(bleedThreshold.ToString(), "BleedChanceData" , "n/a", "bleedThreshold:");
+		}
+		#endif
+		
+		//unexpected values, unhandled
+		if (valueLower > BLOOD_HITPOINTS_UNIVERSAL)
+		{
+			bleedChance = 1.0;
+			
+			#ifdef DEVELOPER
+			if (LogManager.IsBleedingChancesLogEnable())
+			{	
+				Debug.BleedingChancesLog(bleedChance.ToString(), "BleedChanceData" , "n/a", "Unhandleed values, default bleeding chance used:");
+			}
+			#endif
+			
+			return true;
+		}
+		
+		if (bleedChanceMap.Contains(valueLower))
+		{
+			bleedChance = bleedChanceMap.Get(valueLower) * valueHigher / 10000;
+		}
+		else
+		{
+			float chanceMaxActual;
+			
+			float floor = Math.Floor(valueLower / 10) * 10;
+			float ceil = Math.Ceil(valueLower / 10) * 10;
+			float pos = Math.InverseLerp(floor,ceil,valueLower);
+			
+			float chanceMin = bleedChanceMap.Get(floor);
+			float chanceMax = bleedChanceMap.Get(ceil);
+			
+			chanceMaxActual = Math.Lerp(chanceMin,chanceMax,pos);
+			bleedChance = valueHigher * chanceMaxActual / 10000;
+		}
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsBleedingChancesLogEnable())
+		{	
+			Debug.BleedingChancesLog(bleedChance.ToString(), "BleedChanceData" , "n/a", "bleeding chance:");
+		}
+		#endif
+		
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/CE/CentralEconomy.c b/scripts/3_Game/DayZ/CE/CentralEconomy.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bd083e6904b4c0ccf460be792d32448dafd8352
--- /dev/null
+++ b/scripts/3_Game/DayZ/CE/CentralEconomy.c
@@ -0,0 +1,768 @@
+
+/** @file */
+
+// -------------------------------------------------------------------------
+// object (SF) Spawn Flags (use to setup behavior and/ or trigger functionality)
+//
+const int ECE_NONE							= 0;
+	
+const int ECE_SETUP							= 2;	// process full entity setup (when creating NEW entity)
+const int ECE_TRACE							= 4;	// trace under entity when being placed (from the point of creation)
+const int ECE_CENTER						= 8;	// use center from shape (model) for placement
+
+const int ECE_UPDATEPATHGRAPH				= 32;	// update navmesh when object placed upon it
+
+const int ECE_ROTATIONFLAGS					= 512;	// enable rotation flags for object placement
+const int ECE_CREATEPHYSICS					= 1024;	// create collision envelope and related physics data (if object has them)
+const int ECE_INITAI						= 2048; // init ai
+const int ECE_AIRBORNE						= 4096;	// create flying unit in the air
+
+const int ECE_EQUIP_ATTACHMENTS				= 8192;		// equip with configured ATTACHMENTS
+const int ECE_EQUIP_CARGO					= 16384;	// equip with configured CARGO
+const int ECE_EQUIP							= 24576;	// equip with configured (ATTACHMENTS + CARGO)
+const int ECE_EQUIP_CONTAINER				= 2097152;	// populate DE/ group CONTAINER during spawn
+const int ECE_LOCAL							= 1073741824; // create object locally
+
+const int ECE_NOSURFACEALIGN				= 262144;	// do not align object on surface/ terrain
+const int ECE_KEEPHEIGHT					= 524288;	// keep height when creating object (do not use trace or placement on surface)
+
+const int ECE_NOLIFETIME					= 4194304;	// do not set lifetime when creating the object
+const int ECE_NOPERSISTENCY_WORLD			= 8388608;	// do not save this object in world
+const int ECE_NOPERSISTENCY_CHAR			= 16777216;	// do not save this object in character
+const int ECE_DYNAMIC_PERSISTENCY			= 33554432;	// spawns in without persistency, once player takes it, persistency will be enabled if available
+
+// note: use predefined combination when not solving something specific
+//
+const int ECE_IN_INVENTORY					= 787456;	// ECE_CREATEPHYSICS|ECE_KEEPHEIGHT|ECE_NOSURFACEALIGN
+const int ECE_PLACE_ON_SURFACE				= 1060;		// ECE_CREATEPHYSICS|ECE_UPDATEPATHGRAPH|ECE_TRACE
+const int ECE_OBJECT_SWAP					= 787488;	// ECE_CREATEPHYSICS|ECE_UPDATEPATHGRAPH|ECE_KEEPHEIGHT|ECE_NOSURFACEALIGN
+
+const int ECE_FULL							= 25126;	// ECE_SETUP|ECE_TRACE|ECE_ROTATIONFLAGS|ECE_UPDATEPATHGRAPH|ECE_EQUIP
+
+// -------------------------------------------------------------------------
+// object (RF) Rotation Flags (use to force and/ or invoke placement rotation)
+//
+const int	RF_NONE					= 0;
+
+const int	RF_FRONT				= 1;	// front side placement
+const int	RF_TOP					= 2;	// top side placement
+const int	RF_LEFT					= 4;	// left side placement
+const int	RF_RIGHT				= 8;	// right side placement
+const int	RF_BACK					= 16;	// back side placement
+const int	RF_BOTTOM				= 32;	// bottom side placement
+
+const int	RF_ALL					= 63;	// RF_FRONT|RF_TOP|RF_LEFT|RF_RIGHT|RF_BACK|RF_BOTTOM
+
+const int	RF_IGNORE				= 64;	// ignore placement RF flags - object will spawn as model was created
+
+const int	RF_TOPBOTTOM			= 34;	// RF_TOP|RF_BOTTOM
+const int	RF_LEFTRIGHT			= 12;	// RF_LEFT|RF_RIGHT
+const int	RF_FRONTBACK			= 17;	// RF_FRONT|RF_BACK
+
+const int	RF_RANDOMROT			= 64;	// allow random rotation around axis when placing
+const int	RF_ORIGINAL				= 128;	// use default placement setuped on object in config
+const int	RF_DECORRECTION			= 256;	// angle correction when spawning InventoryItem at Building angle
+const int	RF_DEFAULT				= 512;	// use default placement setuped on object in config
+
+// -------------------------------------------------------------------------
+//! Categories for CEApi.EconomyLog
+class EconomyLogCategories
+{
+	private void EconomyLogCategories();
+	private void ~EconomyLogCategories();
+	
+	const string Economy				= "economy";
+	const string EconomyRespawn			= "economy_respawn";
+	const string RespawnQueue			= "respawn_queue";
+	const string Container				= "container";
+	const string Matrix					= "matrix";
+	const string UniqueLoot				= "uniqueloot";
+	const string Bind					= "bind";
+	const string SetupFail				= "setupfail";
+	const string Storage				= "storage";
+	const string Classes				= "class";
+	const string Category				= "category";
+	const string Tag					= "tag";
+	const string SCategory				= "s_category";
+	const string STag					= "s_tag";
+	const string SAreaflags				= "s_areaflags";
+	const string SCrafted				= "s_crafted";
+	const string MapGroup				= "map_group";
+	const string MapComplete			= "map_complete";
+	const string InfectedZone			= "infected_zone";
+}
+
+// -------------------------------------------------------------------------
+//! Special strings for CEApi.EconomyMap
+class EconomyMapStrings
+{
+	private void EconomyMapStrings();
+	private void ~EconomyMapStrings();
+	
+	/**
+	\brief Generates string that will make CEApi.EconomyMap use all items with this category
+	\note This is refering to the CE categories of loot defined in cfglimitsdefinition.xml
+	\warning This is persistent per session, when you set it, it will persist until it is set to something else
+		\param category \p string The desired loot category
+		\return \p string The string to pass into CEApi.EconomyMap
+	@code
+		GetCEApi().EconomyMap(EconomyMapStrings.Category("food"));
+	@endcode
+	*/
+	static string Category(string category)
+	{
+		return string.Format("category:%1", category);
+	}
+	
+	/**
+	\brief Generates string that will make CEApi.EconomyMap use all items with this tag
+	\note This is refering to the CE tags of loot defined in cfglimitsdefinition.xml
+	\warning This is persistent per session, when you set it, it will persist until it is set to something else
+		\param category \p string The desired loot tag
+		\return \p string The string to pass into CEApi.EconomyMap
+	@code
+		GetCEApi().EconomyMap(EconomyMapStrings.Tag("floor"));
+	@endcode
+	*/
+	static string Tag(string tag)
+	{
+		return string.Format("tag:%1", tag);
+	}
+
+	
+	
+	//! Everything
+	const string ALL_ALL = "all:all";
+	//! All loot
+	const string ALL_LOOT = "all:loot";
+	//! All vehicles
+	const string ALL_VEHICLE = "all:vehicle";
+	//! All infected
+	const string ALL_INFECTED = "all:infected";
+	//! All animals
+	const string ALL_ANIMAL = "all:animal";
+	//! All players
+	const string ALL_PLAYER = "all:player";
+	//! All proxies
+	const string ALL_PROXY = "all:proxy";
+	//! All static loot spawns
+	const string ALL_PROXY_STATIC = "all:proxystatic";
+	//! All dynamic loot spawns
+	const string ALL_PROXY_DYNAMIC = "all:proxydynamic";
+	//! All abandoned loot spawns
+	const string ALL_PROXY_ABANDONED = "all:proxyabandoned";
+}
+
+// -------------------------------------------------------------------------
+//! Special strings for CEApi.EconomyOutput
+class EconomyOutputStrings
+{
+	private void EconomyOutputStrings();
+	private void ~EconomyOutputStrings();
+	
+	/**
+	\brief Lists stats regarding which loot spawn) that are linked together and how many there are
+		\note In logs: "[linked_groups]"
+	*/
+	const string LINKS = "links";
+	/**
+	\brief Lists loot spawns that have more loot than their maximum + 4
+		\note In logs: "[autotest:ListSuspiciousGroups]"
+	*/
+	const string SUSPICIOUS = "suspicious";
+	/**
+	\brief Lists DE spawns that have positions that are within supplied range (< fRange, not equal)
+		\note In logs: "[ClosePosition]"
+	*/
+	const string DE_CLOSE_POINT = "declosepoint";
+	/**
+	\brief Lists loot spawns that have been marked as abandoned
+		\note In logs: "[autotest:ListAbandonedGroups]"
+	*/ 
+	const string ABANDONED = "abandoned";
+	/**
+	\brief Lists loot spawns that are not abandoned but have no loot
+		\note In logs: "[autotest:ListEmptyGroups]"
+	*/  
+	const string EMPTY = "empty";
+	/**
+	\brief Lists loot spawns that are not abandoned and within the supplied range  (< fRange, not equal)
+		\note In logs: "[autotest:ListCloseGroups]"
+		\note Is the same as CEApi.ListCloseProxy
+	*/
+	const string CLOSE = "close";
+	/**
+	\brief Lists the number of objects inside of categories
+		\note In logs: "[autotest:ProcessDebugLog]"
+	*/
+	const string WORLD = "world";
+	/**
+	\brief Lists overall CE stats
+		\note In logs: "[autotest:OverallStatus]"
+	*/
+	const string STATUS = "status";
+	/**
+	\brief Lists the maxlootsize of all CE items
+		\note In logs: "[autotest:ListLootSize]"
+	*/
+	const string LOOT_SIZE = "lootsize";
+}
+
+// -------------------------------------------------------------------------
+enum ESpawnVolumeVis
+{
+	OFF = 0,
+	ADAPTIVE,
+	VOLUME,
+	OCCUPIED,
+}
+
+// -------------------------------------------------------------------------
+/**
+	\brief API to interact with Central Economy
+	\note Accessible through GetCEApi, make sure to read the documentation for that as well
+	\note Any mention of 'storage/' means the '$mission:storage_#' folder
+*/
+class CEApi
+{
+	private void CEApi() {}
+	private void ~CEApi() {}
+	
+	/**
+	\brief Regenerates "storage/spawnpoints.bin" if necessary
+	\note Already happens automatically when server starts before it is loaded in
+	@code
+		GetCEApi().ExportSpawnData();
+	@endcode
+	*/
+	proto native void ExportSpawnData();
+	/**
+	\brief Generates "storage/export/mapgrouppos.xml"
+		\param vCenter \p vector Center of area to generate from
+			\note When using a zero vector, this will automatically get the world center
+		\param fRadius \p float Radius in meters of area to generate from
+			\note When 0, this will automatically get a radius covering the map
+	@code
+		// Export for whole map
+		GetCEApi().ExportProxyData();
+	@endcode
+	*/
+	proto native void ExportProxyData( vector vCenter = vector.Zero, float fRadius = 0 );
+	/**
+	\brief Generates "storage/export/mapgroupcluster.xml"
+	@code
+		GetCEApi().ExportClusterData();
+	@endcode
+	*/
+	proto native void ExportClusterData();
+	/**
+	\brief Generates "storage/export/mapgroupproto.xml"
+	@code
+		GetCEApi().ExportProxyProto();
+	@endcode
+	*/
+	proto native void ExportProxyProto();
+	/**
+	\brief Invalidates loot spawn points which are closer than the radius supplied
+		\note Will output a message indicating how many points were invalidated
+		\param fRadius \p float The minimum desired distance in meters between loot spawn points
+			\note When 0 it will use a radius of 0.5
+		\param bAllSelections \p bool When false, will only check the points within a container against each other, when true will against all points
+	@code
+		// Example: I want there to be a minimum distance of 0.3m between any loot spawn point
+		GetCEApi().MarkCloseProxy(0.3, true);
+	@endcode
+	*/
+	proto native void MarkCloseProxy( float fRadius, bool bAllSelections );
+	/**
+	\brief Removes all invalid points
+		\note Is best paired with a MarkCloseProxy call first to invalidate unwanted points
+		\note Will output a message indicating the amount of deleted points
+	@code
+		GetCEApi().RemoveCloseProxy();
+	@endcode
+	*/
+	proto native void RemoveCloseProxy();
+	/**
+	\brief Outputs a list of all loot points closer than specified radius
+	\note This will automatically be checking all points against all points
+	\note This is a better way of handling it than the above two methods, as it can be then be removed manually from the xmls
+	\note Is the same as CEApi.EconomyOutput(EconomyOutputStrings.CLOSE, fRadius)
+		\param fRadius \p float The minimum desired distance in meters between loot spawn points
+	@code
+		GetCEApi().ListCloseProxy(0.3);
+	@endcode
+	*/
+	proto native void ListCloseProxy( float fRadius );
+
+	/**
+	\brief Will emulate the spawning of the item which is being looked at and generate images (.tga) in storage/lmap and output logs
+	\note DEVELOPER/DIAG ONLY
+	\note This will only work if the loot spawner is active
+		\param sClassName \p string The class name of the desired item to analyze
+			\note When using "*" as class name, instead of generating images, it will generate a .csv in storage/log containing the output of all spawnable items
+		\return \p bool Whether the operation was successful, it might fail in certain scenarios if the CE doesn't update in time
+	@code
+		GetCEApi().SpawnAnalyze("FlatCap_Grey");
+	@endcode
+	*/
+	proto native bool SpawnAnalyze( string sClassName );
+
+	/**
+	\brief Subtracts the supplied value from the current lifetime of all items in the world
+	\note Uses RadiusLifetimeDecrease under the hood and then calculates the parameters to fit the world
+	\note Will automatically clamp result between min and max lifetime  [3, 316224000] (3 seconds to 10 years)
+		\param fShift \p float The value in seconds which will be subtracted from the current lifetimes
+	@code
+		// Shortens the lifetimes of all items in the world by 3 seconds
+		GetCEApi().TimeShift(3);
+	@endcode
+	*/
+	proto native void TimeShift( float fShift );
+	/**
+	\brief Fills in the Debug Lifetime, which will be used for any new DE spawned
+		\param fLifeTime \p float The lifetime for any DE spawned after this call
+			\note When this is set back to 0, it will stop using the Debug Lifetime
+	@code
+		// Any DE spawned after this call will have a lifetime of 300 seconds
+		GetCEApi().OverrideLifeTime(300);
+	@endcode
+	*/
+	proto native void OverrideLifeTime( float fLifeTime );
+
+	/**
+	\brief Force spawn specific prototype group + loot at position
+	\note DEVELOPER/DIAG ONLY
+	\note This can also spawn in other CE & DE related objects, but is best used exclusively for testing prototype groups
+		\param sGroupName \p string The group name to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\param fAngle \p float Angle to spawn the Entity with in degrees [0, 360]
+			\note When a negative value, will pick a random one
+		\return \p Entity The spawned Entity or null if unsuccessful
+	@code
+		GetCEApi().SpawnGroup("Land_Shed_M1", Vector(5, 10, 5));
+	@endcode
+	*/
+	proto native Entity SpawnGroup( string sGroupName, vector vPos, float fAngle = -1 );
+	/**
+	\brief Force spawn specific dynamic event
+	\note DEVELOPER/DIAG ONLY
+	\note Versatile, can be used for Animal, Infected, Static, Item and Vehicle
+	\note Is the only one capable of spawning DE's that have DE Groups
+	\note Is the same as the next one, but has ECE_FULL flags and a hidden flag which overrides herd limit
+	\note This is also FORCE spawn, so it will bypass any limit and avoidance checks
+		\param sEvName \p string The DE to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\param fAngle \p float Angle to spawn the Entity with in degrees [0, 360]
+			\note When a negative value, will pick a random one
+		\return \p bool Whether the spawn was successful
+	@code
+		GetCEApi().SpawnDE("StaticHeliCrash", Vector(5, 10, 5));
+	@endcode
+	*/
+	proto native void SpawnDE( string sEvName, vector vPos, float fAngle = -1 );
+	/**
+	\brief Force spawn specific dynamic event
+	\note DEVELOPER/DIAG ONLY
+	\note Is the same one as above but with the possibility of custom flags
+		\param sEvName \p string The DE to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\param fAngle \p float Angle to spawn the Entity with in degrees [0, 360]
+			\note When a negative value, will pick a random one
+		\param uFlags \p int ECE flags to apply while spawning the DE
+		\return \p bool Whether the spawn was successful
+	@code
+		GetCEApi().SpawnDEEx("StaticHeliCrash", Vector(5, 10, 5), ECE_FULL);
+	@endcode
+	*/
+	proto native void SpawnDEEx( string sEvName, vector vPos, float fAngle, int uFlags );
+	/**
+	\brief Spawn an item through CE
+	\note DEVELOPER/DIAG ONLY
+		\param sEvName \p string The DE to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\param fAngle \p float Angle to spawn the Entity with in degrees [0, 360]
+			\note When a negative value, will pick a random one
+		\param iCount \p int The amount of items
+		\param fRange \p float Circle radius
+			\note When iCount is larger than 1, changing this will make it so that they are spawned in a circle around vPos
+	@code
+		GetCEApi().SpawnLoot("Deagle", Vector(5, 10, 5), 0, 9, 1);
+	@endcode
+	*/
+	proto native void SpawnLoot( string sEvName, vector vPos, float fAngle, int iCount = 1, float fRange = 1 );
+
+	/**
+	\brief Spawn all entities with dynamic category through CE
+	\note DEVELOPER/DIAG ONLY
+	\note Will print additional logs to RPT
+		\param vPos \p vector The position to spawn the Entities at
+			\note This will be the starting position, the items will be split into segments by CE BBox size (smallest to largest)
+		\param bShowCylinders \p bool Whether to draw the CE BBox with debug shapes
+			\note Red: Invalid BBox; Yellow: Not in DB; Green: All ok
+		\param fDefaultDistance \p float The default distance to use when the entity does not have a CE BBox
+			\note This means that all the ones with invalid CE BBoxes will be piled up at the starting position when this is 0
+	@code
+		GetCEApi().SpawnDynamic(Vector(5, 10, 5), true);
+	@endcode
+	*/
+	proto native void SpawnDynamic( vector vPos, bool bShowCylinders = true, float fDefaultDistance = 0 );
+	/**
+	\brief Spawn all entities with vehicles category through CE
+	\note DEVELOPER/DIAG ONLY
+	\note Will print additional logs to RPT
+		\param vPos \p vector The position to spawn the Entities at
+			\note This will be the starting position, vehicles spawn with 20m spacing
+			\note Make sure you do it on a surface as flat and open as possible, they need a lot of space
+		\param bShowCylinders \p bool Does nothing for Vehicles, left for backwards compat
+		\param fDefaultDistance \p float The default distance to use when the entity does not have a CE BBox
+			\note This means that all the ones with invalid CE BBoxes will be piled up at the starting position when this is 0
+	@code
+		GetCEApi().SpawnVehicles(Vector(5, 10, 5));
+	@endcode
+	*/
+	proto native void SpawnVehicles( vector vPos, bool bShowCylinders = false, float fDefaultDistance = 20 );
+	/**
+	\brief Spawn all entities with building category through CE
+	\note DEVELOPER/DIAG ONLY
+	\note Will print additional logs to RPT
+		\param vPos \p vector The position to spawn the Entities at
+			\note This will be the starting position, the items will be split into segments by CE BBox size (smallest to largest)
+		\param bShowCylinders \p bool Whether to draw the CE BBox with debug shapes
+			\note Red: Invalid BBox; Yellow: Not in DB; Green: All ok
+			\note These will most likely just always be red
+		\param fDefaultDistance \p float The default distance to use when the entity does not have a CE BBox
+			\note This means that all the ones with invalid CE BBoxes will be piled up at the starting position when this is 0
+	@code
+		GetCEApi().SpawnBuilding(Vector(5, 10, 5), true);
+	@endcode
+	*/
+	proto native void SpawnBuilding( vector vPos, bool bShowCylinders = false, float fDefaultDistance = 20 );
+
+	/**
+	\brief Spawn an entity through CE
+	\note DEVELOPER/DIAG ONLY
+	\note Is similar to SpawnLoot, but works better on Animal/Infected/Vehicle
+		\param sClassName \p string The entity to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\param fRange \p float Circle radius
+			\note When iCount is larger than 1, changing this will make it so that they are spawned in a circle around vPos
+		\param iCount \p int The amount of items
+	@code
+		GetCEApi().SpawnEntity("Deagle", Vector(5, 10, 5), 1, 9);
+	@endcode
+	*/
+	proto native void SpawnEntity( string sClassName, vector vPos, float fRange, int iCount );
+	/**
+	\brief Spawn an entity through CE
+	\note DEVELOPER/DIAG ONLY
+	\note Is the same as SpawnEntity, but spawns only one and returns the spawned Object
+		\param sClassName \p string The entity to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\return \p Object The spawned Object
+	@code
+		GetCEApi().SpawnSingleEntity("Deagle", Vector(5, 10, 5));
+	@endcode
+	*/
+	proto native Object SpawnSingleEntity( string sClassName, vector vPos );
+	/**
+	\brief Spawn an entity through CE
+	\note DEVELOPER/DIAG ONLY
+	\note Is the same as SpawnEntity, under the hood it just defaults to RF_ORIGINAL
+		\param sClassName \p string The entity to spawn
+		\param vPos \p vector The position to spawn the Entity at
+		\param fRange \p float Circle radius
+			\note When iCount is larger than 1, changing this will make it so that they are spawned in a circle around vPos
+		\param iCount \p int The amount of items
+		\param iFlags \p int The rotation flags to apply
+	@code
+		GetCEApi().SpawnRotation("Deagle", Vector(5, 10, 5), 1, 9, RF_ALL);
+	@endcode
+	*/
+	proto native void SpawnRotation( string sClassName, vector vPos, float fRange, int iCount, int iFlags );
+	/**
+	\brief Spawn an entity through CE, x amount of times in a grid
+	\note DEVELOPER/DIAG ONLY
+	\note The name may imply it does something else, but a profiler is needed to actually benchmark it
+	\note The position starts at 0 0 0
+		\param sClassName \p string The entity to spawn
+		\param iCount \p int The amount of items
+	@code
+		GetCEApi().SpawnPerfTest("Deagle", 30);
+	@endcode
+	*/
+	proto native void SpawnPerfTest( string sClassName, int iCount );
+	
+	/**
+	\brief Queue up the depleting of lifetime of everything in the world
+	\note DEVELOPER/DIAG ONLY
+	@code
+		GetCEApi().CleanMap();
+	@endcode
+	*/
+	proto native void CleanMap();
+
+	/**
+	\brief Outputs debug file to storage/log/*.csv
+	\note DEVELOPER/DIAG ONLY
+		\param sLogType \p string The type of log (EconomyLogCategories)
+	@code
+		GetCEApi().EconomyLog(EconomyLogCategories.Economy);
+	@endcode
+	*/
+	proto native void EconomyLog( string sLogType );
+	
+	/**
+	\brief Outputs debug file to storage/lmap/*.tga showing the current places this is spawned
+	\note DEVELOPER/DIAG ONLY
+	\note This works best when you have an image of the map to overlay the tga with afterwards
+		\param sMapType \p string The type of lmap, can be just a class name or a special string
+			\note There are several prefixes and sets of strings that can be passed in here, see EconomyMapStrings
+	@code
+		// To check only a specific item
+		GetCEApi().EconomyMap("Deagle");
+	@endcode
+	*/
+	proto native void EconomyMap( string sMapType );
+	/**
+	\brief Outputs debug logs into server log or rpt
+	\note DEVELOPER/DIAG ONLY
+		\param sOutputType \p string One of the strings specified in EconomyOutputStrings
+		\param fRange \p float Range parameter used for some of the options
+	@code
+		GetCEApi().EconomyOutput(EconomyOutputStrings.CLOSE, 3);
+	@endcode
+	*/
+	proto native void EconomyOutput( string sOutputType, float fRange );
+
+	/**
+	\brief Process lifetime increase within radius by value (sec)
+	\note Will automatically clamp result between min and max lifetime  [3, 316224000] (3 seconds to 10 years)
+		\param vCenter \p vector The center point
+		\param fRadius \p float The radius around the center point
+		\param fValue \p float The value to increase the lifetime by
+			\note When 0, this will reset it to default instead (but it's better to use RadiusLifetimeReset still)
+	@code
+		GetCEApi().RadiusLifetimeIncrease(Vector(500, 0, 500), 3, 500);
+	@endcode
+	*/
+	proto native void RadiusLifetimeIncrease( vector vCenter, float fRadius, float fValue );
+	/**
+	\brief Process lifetime decrease within radius by value (sec)
+	\note Will automatically clamp result between min and max lifetime  [3, 316224000] (3 seconds to 10 years)
+		\param vCenter \p vector The center point
+		\param fRadius \p float The radius around the center point
+		\param fValue \p float The value to decrease the lifetime by
+	@code
+		GetCEApi().RadiusLifetimeDecrease(Vector(500, 0, 500), 3, 500);
+	@endcode
+	*/
+	proto native void RadiusLifetimeDecrease( vector vCenter, float fRadius, float fValue );
+	/**
+	\brief Process lifetime reset to default value from DB within radius
+		\param vCenter \p vector The center point
+		\param fRadius \p float The radius around the center point
+	@code
+		GetCEApi().RadiusLifetimeReset(Vector(500, 0, 500), 3);
+	@endcode
+	*/
+	proto native void RadiusLifetimeReset( vector vCenter, float fRadius );
+	
+	
+	
+	/** \name Globals API
+		Get values from globals.xml
+	*/
+	//@{
+	
+	/**
+	\brief Get int from globals.xml
+	\note type="0"
+		\param varName \p string The name of the entry
+		\return \p int The value or int.MIN if not found/not an int
+	*/
+	proto native int GetCEGlobalInt(string varName);
+	/**
+	\brief Get float from globals.xml
+	\note type="1"
+		\param varName \p string The name of the entry
+		\return \p float The value or float.MIN if not found/not a float
+	*/
+	proto native float GetCEGlobalFloat(string varName);
+	/**
+	\brief Get string from globals.xml
+	\note type="2"
+		\param varName \p string The name of the entry
+		\return \p string The value or empty string if not found/not a string
+	*/
+	proto native string GetCEGlobalString(string varName);
+	
+	//@}
+	
+	
+	
+	/** \name Avoidance API
+		Optimized internal methods that the CE uses to avoid spawning DE within certain distances
+	*/
+	//@{
+	
+	/**
+	\brief Check if there is a player within a radius
+		\param vPos \p vector The center point
+		\param fDistance \p float The radius around the center point
+		\return \p bool Returns false when there is a player inside supplied area, true when it successfully avoided players
+	@code
+		GetCEApi().AvoidPlayer(Vector(500, 0, 500), 20);
+	@endcode
+	*/
+	proto native bool AvoidPlayer(vector vPos, float fDistance); // return false when there is a player
+	/**
+	\brief Check if there is a vehicle within a radius
+		\param vPos \p vector The center point
+		\param fDistance \p float The radius around the center point
+		\param sDEName \p string A specific DE to avoid, if left empty, will avoid all vehicles
+		\return \p bool Returns false when there is a vehicle inside supplied area, true when it successfully avoided vehicles
+	@code
+		GetCEApi().AvoidVehicle(Vector(500, 0, 500), 500, "VehicleCivilianSedan");
+	@endcode
+	*/
+	proto native bool AvoidVehicle(vector vPos, float fDistance, string sDEName = "");
+	/**
+	\brief Check if there is a vehicle within a radius
+		\param vPos \p vector The center point
+		\param fRange \p float The radius around the center point
+		\return \p int The amoutn of players inside supplied area
+	@code
+		GetCEApi().CountPlayersWithinRange(Vector(500, 0, 500), 500);
+	@endcode
+	*/
+	proto native int CountPlayersWithinRange(vector vPos, float fRange);
+	
+	//@}
+	
+	
+	
+	/** \name CE Debug menu Script API
+		DIAG ONLY: These options are available from the in-game debug menu on Diag exe (Game > Central Economy), documentation can be found on wiki
+	*/
+	//@{
+	
+	// "Loot Spawn Edit"
+	//{	
+		//! "Spawn Volume Vis"
+		proto native void LootSetSpawnVolumeVisualisation(ESpawnVolumeVis mode);
+		//! "Setup Vis"
+		proto native void LootToggleSpawnSetup(bool mode);
+		//! "Edit Volume"
+		proto native void LootToggleVolumeEditing(bool mode);
+		//! "Re-Trace Group Points"
+		proto native void LootRetraceGroupPoints();
+		//! "Export Group >>"
+		proto native void LootExportGroup();
+		//! "Export All Groups >>>>" / GetCEApi.ExportProxyProto();
+		proto native void LootExportAllGroups();
+		//! "<<< Export Map" / GetCEApi.ExportProxyData(vector.Zero, 0);
+		proto native void LootExportMap();
+		//! "<<< Export Clusters" / GetCEApi().ExportClusterData()
+		proto native void LootExportClusters();
+	//}
+
+	// "Loot Tool"
+	//{
+		//! "Deplete Lifetime"
+		proto native void LootDepleteLifetime();
+		//! "Set Damage = 1.0"
+		proto native void LootSetDamageToOne();
+		//! "Damage + Deplete"
+		proto native void LootDepleteAndDamage();
+	//}
+
+	// "Infected"
+	//{
+		//! "Infected Vis"
+		proto native void InfectedToggleVisualisation(bool mode);
+		//! "Infected Zone Info"
+		proto native void InfectedToggleZoneInfo(bool mode);
+		//! "Infected Spawn"
+		proto native void InfectedSpawn();
+		//! "Reset Cleanup"
+		proto native void InfectedResetCleanup();
+	//}
+
+	// "Animal"
+	//{
+		//! "Animal Vis"
+		proto native void AnimalToggleVisualisation(bool mode);
+		//! "Animal Spawn"
+		proto native void AnimalSpawn();
+		//! "Ambient Spawn"
+		proto native void AnimalAmbientSpawn();
+	//}
+
+	//! "Vehicle&Wreck Vis"
+	proto native void ToggleVehicleAndWreckVisualisation(bool mode);
+	//! "Loot Vis"
+	proto native void ToggleLootVisualisation(bool mode);
+	//! "Cluster Vis"
+	proto native void ToggleClusterVisualisation(bool mode);
+
+	//! "Dynamic Events Status"
+	proto native void ToggleDynamicEventStatus(bool mode);
+	//! "Dynamic Events Vis"
+	proto native void ToggleDynamicEventVisualisation(bool mode);
+	//! "Dynamic Events Spawn"
+	proto native void DynamicEventSpawn();
+	//! "Export Dyn Event >>"
+	proto native void DynamicEventExport();
+	
+	//! "Overall Stats"
+	proto native void ToggleOverallStats(bool mode);
+	
+	//@}
+	
+	
+	
+	/** \name DEPRECATED/LEGACY
+		These don't do anything anymore but are left for backwards compatibility
+	*/
+	//@{
+
+	proto native void PlatformStatTest();
+	
+	proto native void LootToggleProxyEditing(bool mode);
+	
+	proto native void OnUpdate();
+	
+	//@}
+};
+
+/**
+	\brief Get the CE API
+	\warning Only exists when the game has CE enabled
+	\note This means that this will work on anything which is running a mission with an initialized Hive
+	\note Client does not have Hive when connected to a server, only the server does if it was set up in the init.c
+*/
+proto native CEApi GetCEApi();
+
+// -------------------------------------------------------------------------
+class CEItemProfile
+{
+	private void CEItemProfile() {}
+	private void ~CEItemProfile() {}
+	
+	proto native int GetNominal(); // nominal - how many items should be aproximately in map
+	proto native int GetMin(); // min - minimal count should be available in map
+
+	proto native float GetQuantityMin(); // min quantity (0.0 - 1.0) (like ammobox - this determine how many bullets are there, or water bottle)
+	proto native float GetQuantityMax(); // max quantity (0.0 - 1.0) (like ammobox - this determine how many bullets are there, or water bottle)
+
+	proto native float GetQuantity(); // random quantity (0.0 - 1.0)
+
+	proto native float GetLifetime(); // maximum lifetime in (seconds) - what is the idle before item abandoned at ground gets deleted
+	proto native float GetRestock(); // restock is oposite of lifetime - idle before item is allowed to respawn when required
+
+	proto native int GetCost(); // cost of item determines its 'value' for players (this serve as priority during respawn and cleanup operation)
+
+	proto native int GetUsageFlags(); // area usage flags (each bit has assigned group - which as part of map overlay effectively affects spawning)
+	proto native int GetValueFlags(); // area value flags (each bit has assigned group - which as part of map overlay effectively affects spawning)
+};
diff --git a/scripts/3_Game/DayZ/Canvas.c b/scripts/3_Game/DayZ/Canvas.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ebddb8ff1275f3c9610c1086e669b0ed7918d32
--- /dev/null
+++ b/scripts/3_Game/DayZ/Canvas.c
@@ -0,0 +1,90 @@
+/*!
+Simple debug painting canvas with 0/1 pixel representation.
+Usage:
+	Canvas c = new Canvas(100,100);
+	for(int i = 0; i < 100;i++)
+	{
+		float val = i/100;
+		float y = Easing.EaseInOutExpo(val);
+		c.DrawPixel(i,y*100);
+	}
+	c.SaveToFile("output");
+*/
+
+typedef bool PIXEL;
+class Canvas
+{
+	int m_SizeX; int m_SizeY;
+	
+	ref array<ref array<PIXEL>> m_Pixels = new array<ref array<PIXEL>>;
+	
+	void Canvas(int size_x, int size_y)
+	{
+		m_SizeX = size_x;
+		m_SizeY = size_y;
+		for(int i = 0; i < size_y; i++)
+		{
+			array<PIXEL> x_line = new array<PIXEL>;
+			for(int z = 0; z < size_x;z++)
+			{
+				x_line.Insert(false);
+			}
+			m_Pixels.Insert(x_line);
+			
+		}
+	}
+	
+	void DrawPixel(int x, int y)
+	{
+		if((x > m_SizeX - 1) || (y > m_SizeY - 1))
+			return;
+		//Print("x:" +x+",y:"+y);
+		m_Pixels.Get(y).InsertAt(true, x);
+	}
+	
+	void PrintOut()
+	{
+		string line = "";
+		int y_lines = m_SizeY - 1;
+		for(int i = y_lines; i >= 0; i--)
+		{
+			line = "";
+			for(int z = 0; z < m_SizeX;z++)
+			{
+				if(m_Pixels.Get(i).Get(z))
+				{
+					line += "X";
+				}
+				else
+				{
+					line += " ";
+				}
+			}
+			Print(line);
+		}
+	}
+	
+	void SaveToFile(string filename)
+	{
+		FileHandle file = OpenFile("$profile:"+filename, FileMode.WRITE);
+		
+		string line = "";
+		int y_lines = m_SizeY - 1;
+		for(int i = y_lines; i >= 0; i--)
+		{
+			line = "";
+			for(int z = 0; z < m_SizeX;z++)
+			{
+				if(m_Pixels.Get(i).Get(z))
+				{
+					line += "X";
+				}
+				else
+				{
+					line += " ";
+				}
+			}
+			FPrintln(file, line);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/CfgGameplayDataJson.c b/scripts/3_Game/DayZ/CfgGameplayDataJson.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a68d408f5111c8d46021045a4e97a193622da83
--- /dev/null
+++ b/scripts/3_Game/DayZ/CfgGameplayDataJson.c
@@ -0,0 +1,353 @@
+//!contents of this class will be transfered to client upon connecting, with the variables in either initial state as set through the 'InitServer..()' call, or replaced with contents of the json configuration file if such file is both present and reading is enabled in server.cfg
+class CfgGameplayJson
+{
+	int version = -1;
+	
+	//! Obsolete, 'InitServer' on individual json items is now called centrally
+	void InitServer()
+	{
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	
+	
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	ref ITEM_GeneralData GeneralData			= new ITEM_GeneralData;
+	ref ITEM_PlayerData PlayerData 				= new ITEM_PlayerData;
+	ref ITEM_WorldData WorldsData 				= new ITEM_WorldData;
+	ref ITEM_BaseBuildingData BaseBuildingData 	= new ITEM_BaseBuildingData;
+	ref ITEM_UIData UIData 						= new ITEM_UIData;
+	ref ITEM_MapData MapData 					= new ITEM_MapData;
+	
+};
+
+class ITEM_DataBase
+{
+	void ITEM_DataBase()
+	{
+		#ifdef SERVER
+		CfgGameplayHandler.RegisterItem(this);
+		#endif
+	}
+	
+	bool ValidateServer()
+	{
+		return true;
+	}
+	
+	void InitServer();
+}
+
+class ITEM_GeneralData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+		disableBaseDamage = GetGame().ServerConfigGetInt( "disableBaseDamage" );
+		disableContainerDamage = GetGame().ServerConfigGetInt( "disableContainerDamage" );
+		disableRespawnDialog = GetGame().ServerConfigGetInt("disableRespawnDialog");
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	bool disableBaseDamage;
+	bool disableContainerDamage;
+	bool disableRespawnDialog;
+	bool disableRespawnInUnconsciousness;
+
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_PlayerData : ITEM_DataBase
+{
+	ref ITEM_StaminaData StaminaData			 	= new ITEM_StaminaData;
+	ref ITEM_ShockHandlingData ShockHandlingData 	= new ITEM_ShockHandlingData;
+	ref ITEM_MovementData MovementData 				= new ITEM_MovementData;
+	ref ITEM_DrowningData DrowningData 				= new ITEM_DrowningData;
+	
+	override void InitServer()
+	{
+		disablePersonalLight = GetGame().ServerConfigGetInt( "disablePersonalLight" );
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	bool disablePersonalLight;
+	bool disable2dMap;
+	ref TStringArray spawnGearPresetFiles;
+
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_ShockHandlingData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	float shockRefillSpeedConscious = PlayerConstants.SHOCK_REFILL_CONSCIOUS_SPEED;
+	float shockRefillSpeedUnconscious = PlayerConstants.SHOCK_REFILl_UNCONSCIOUS_SPEED;
+	bool allowRefillSpeedModifier = true;
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_StaminaData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	float staminaWeightLimitThreshold = GameConstants.STAMINA_WEIGHT_LIMIT_THRESHOLD;
+	float staminaMax = GameConstants.STAMINA_MAX;
+	float staminaKgToStaminaPercentPenalty = GameConstants.STAMINA_KG_TO_STAMINAPERCENT_PENALTY;
+	float staminaMinCap = GameConstants.STAMINA_MIN_CAP;
+	float sprintStaminaModifierErc = 1;//consumption of stamina during standing sprint modification
+	float sprintStaminaModifierCro = 1;//consumption of stamina during crouched sprint modification
+	float sprintSwimmingStaminaModifier = 1;//consumption of stamina during swimming sprint modification
+	float sprintLadderStaminaModifier = 1;//consumption of stamina during climbing sprint modification
+	float meleeStaminaModifier = 1;//consumption of stamina during melee attacks and evasion modification
+	float obstacleTraversalStaminaModifier = 1;// vaulting and climbing stamina consumption modification
+	float holdBreathStaminaModifier = 1;// hold breath  stamina consumption modification
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_MovementData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	float timeToStrafeJog  		= 0.1;
+	float rotationSpeedJog   	= 0.15;
+	float timeToSprint			= 0.45;
+	float timeToStrafeSprint 	= 0.3;
+	float rotationSpeedSprint	= 0.15;
+	bool allowStaminaAffectInertia = 1;
+}
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_WorldData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+		lightingConfig = GetGame().ServerConfigGetInt( "lightingConfig" );
+		wetnessWeightModifiers = {GameConstants.WEIGHT_DRY,GameConstants.WEIGHT_DAMP,GameConstants.WEIGHT_WET,GameConstants.WEIGHT_SOAKING_WET,GameConstants.WEIGHT_DRENCHED};
+	}
+	
+	override bool ValidateServer()
+	{
+		if (!wetnessWeightModifiers || wetnessWeightModifiers.Count() != 5)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	int lightingConfig;
+	
+	ref array<string> objectSpawnersArr;
+	ref array<float> environmentMinTemps;
+	ref array<float> environmentMaxTemps;
+	ref array<float> wetnessWeightModifiers = {GameConstants.WEIGHT_DRY,GameConstants.WEIGHT_DAMP,GameConstants.WEIGHT_WET,GameConstants.WEIGHT_SOAKING_WET,GameConstants.WEIGHT_DRENCHED};
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_BaseBuildingData : ITEM_DataBase
+{
+	
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	ref ITEM_HologramData HologramData = new ITEM_HologramData;
+	ref ITEM_ConstructionData ConstructionData = new ITEM_ConstructionData;
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_HologramData : ITEM_DataBase
+{
+	
+	override void InitServer()
+	{
+		disallowedTypesInUnderground = new TStringSet();
+		disallowedTypesInUnderground.Insert("FenceKit");
+		disallowedTypesInUnderground.Insert("TerritoryFlagKit");
+		disallowedTypesInUnderground.Insert("WatchtowerKit");
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	bool disableIsCollidingBBoxCheck;
+	bool disableIsCollidingPlayerCheck;
+	bool disableIsClippingRoofCheck;
+	bool disableIsBaseViableCheck;
+	bool disableIsCollidingGPlotCheck;
+	bool disableIsCollidingAngleCheck;
+	bool disableIsPlacementPermittedCheck;
+	bool disableHeightPlacementCheck;
+	bool disableIsUnderwaterCheck;
+	bool disableIsInTerrainCheck;
+	ref TStringSet disallowedTypesInUnderground;
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_ConstructionData : ITEM_DataBase
+{
+	
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	bool disablePerformRoofCheck;
+	bool disableIsCollidingCheck;
+	bool disableDistanceCheck;
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+//! data for UI, in-game HUD, and similar
+class ITEM_UIData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+		HitIndicationData.InitServer();
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	ref ITEM_HitIndicationData HitIndicationData = new ITEM_HitIndicationData;
+	bool use3DMap = false;
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_HitIndicationData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+		hitDirectionOverrideEnabled = false;
+		hitIndicationPostProcessEnabled = false;
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	//!!! all member variables must be defined in the .json file, otherwise they are treated as '0' value (unless that's what you want..)
+	bool hitDirectionOverrideEnabled = false;
+	int hitDirectionBehaviour = HitDirectionModes.STATIC;
+	int hitDirectionStyle = HitIndicatorType.SPLASH;
+	string hitDirectionIndicatorColorStr;
+	float hitDirectionMaxDuration = HitDirectionConstants.DURATION_BASE;
+	float hitDirectionBreakPointRelative = HitDirectionConstants.BREAKPOINT_BASE;
+	float hitDirectionScatter = HitDirectionConstants.SCATTER;
+	bool hitIndicationPostProcessEnabled = false;
+};
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_MapData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	bool ignoreMapOwnership 		= false;
+	bool ignoreNavItemsOwnership  	= false;
+	bool displayPlayerPosition		= false;
+	bool displayNavInfo				= true;
+}
+
+//--------------------------------------------------------------------------------------------------------------------------------------------------
+
+class ITEM_DrowningData : ITEM_DataBase
+{
+	override void InitServer()
+	{
+	}
+	
+	override bool ValidateServer()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------------------------------------------
+	//!!! all member variables must correspond with the cfggameplay.json file contents !!!!
+	float staminaDepletionSpeed = 10;
+	float healthDepletionSpeed = 10;
+	float shockDepletionSpeed = 10;
+}
diff --git a/scripts/3_Game/DayZ/CfgGameplayHandler.c b/scripts/3_Game/DayZ/CfgGameplayHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..27d53bd0fc5c02f3df909b219facf35951f1a363
--- /dev/null
+++ b/scripts/3_Game/DayZ/CfgGameplayHandler.c
@@ -0,0 +1,443 @@
+class CfgGameplayHandler
+{
+	private static string m_Path = "$mission:cfggameplay.json";
+	private static ref array<ref ITEM_DataBase> m_Items = new array<ref ITEM_DataBase>();
+	
+	static ref CfgGameplayJson m_Data = new CfgGameplayJson();
+	
+	//---------------------------------------------------------------------------------------
+	static void RegisterItem(ITEM_DataBase item)
+	{
+		m_Items.Insert(item);
+	}
+	//---------------------------------------------------------------------------------------
+	private static void ValidateItems()
+	{
+		foreach (ITEM_DataBase item : m_Items)
+		{
+			if (!item.ValidateServer())
+			{
+				string itemName = item.Type().ToString();
+				itemName.Replace("ITEM_", "");
+				PrintToRPT("Validation failed during loading of 'cfggameplay.json' for " + itemName);
+				item.InitServer();
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------------------------------
+	private static void InitData()
+	{
+		foreach (ITEM_DataBase item:m_Items)
+		{
+			item.InitServer();
+		}
+	}
+	#ifdef DEVELOPER
+	//---------------------------------------------------------------------------------------
+	static void Output()
+	{
+		Print(m_Items.Count());
+	}
+	#endif
+	//---------------------------------------------------------------------------------------
+	static bool LoadData()
+	{
+		if (!FileExist(m_Path))
+		{
+			m_Path = "";
+			GetGame().GetWorldName(m_Path);
+			m_Path = string.Format("dz/worlds/%1/ce/cfggameplay.json", m_Path);
+		}
+
+		bool cfgGameplayFileEnabled = GetGame().ServerConfigGetInt( "enableCfgGameplayFile" );
+
+		#ifdef DIAG_DEVELOPER
+		if (!GetGame().IsDedicatedServer())
+		{
+			cfgGameplayFileEnabled = true;
+		}
+		#endif
+		
+		if (!cfgGameplayFileEnabled || !FileExist(m_Path))
+		{
+			m_Data.InitServer();//legacy call
+			InitData();
+			OnLoaded();
+			return false;
+		}
+		
+		string errorMessage;
+		if (!JsonFileLoader<CfgGameplayJson>.LoadFile(m_Path, m_Data, errorMessage)) //! we are allowed to read the file, so we replace the default data with data from json
+			ErrorEx(errorMessage);
+
+		ValidateItems();
+		OnLoaded();
+		
+		return true;
+	}
+	
+	//---------------------------------------------------------------------------------------
+	static void OnLoaded()
+	{
+		GetGame().GetMission().OnGameplayDataHandlerLoad();
+		DayZGame.Cast(GetGame()).OnGameplayDataHandlerLoad();
+	}
+	
+	//---------------------------------------------------------------------------------------
+	static void SyncDataSend(notnull Man player)
+	{
+		GetGame().RPCSingleParam(player, ERPCs.RPC_CFG_GAMEPLAY_SYNC, new Param1<CfgGameplayJson>(m_Data), true, player.GetIdentity());
+	}
+	
+	//---------------------------------------------------------------------------------------
+	static void SyncDataSendEx(notnull PlayerIdentity identity)
+	{
+		//Debug.Log("SyncDataSendEx");
+		GetGame().RPCSingleParam(null, ERPCs.RPC_CFG_GAMEPLAY_SYNC, new Param1<CfgGameplayJson>(m_Data), true, identity);
+	}
+	
+	//---------------------------------------------------------------------------------------
+	
+	static void OnRPC(Man player, ParamsReadContext ctx)
+	{
+		Param1<CfgGameplayJson> data = new Param1<CfgGameplayJson>(null);
+		
+		if ( ctx.Read(data) )
+		{
+			m_Data = data.param1;
+		}
+		else
+		{
+			ErrorEx("CfgGameplayHandler - client failed to read incoming data");
+		}
+	}
+
+	
+	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	//!! =====================================================================================
+	//!!! the naming convention for static functions in this file is Get+MemberVariableName !!
+	//!! =====================================================================================
+	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!	
+	
+	//========================
+	// !!! ONLY GETTERS BELLOW
+	//========================
+		
+	
+	//----------------------------------------------------------------------------------
+	static bool GetDisablePersonalLight()
+	{
+		return m_Data.PlayerData.disablePersonalLight;
+	}
+	//----------------------------------------------------------------------------------
+
+	//-------------------------------   WorldsData   -----------------------------------
+	static int GetLightingConfig()
+	{
+		return m_Data.WorldsData.lightingConfig;
+	}
+
+	static TStringArray GetObjectSpawnersArr()
+	{
+		return m_Data.WorldsData.objectSpawnersArr;
+	}
+
+	static array<float> GetEnvironmentMinTemps()
+	{
+		return m_Data.WorldsData.environmentMinTemps;
+	}
+
+	static array<float> GetEnvironmentMaxTemps()
+	{
+		return m_Data.WorldsData.environmentMaxTemps;
+	}
+	static array<float> GetWetnessWeightModifiers()
+	{
+		return m_Data.WorldsData.wetnessWeightModifiers;
+	}
+	//----------------------------------------------------------------------------------
+
+	
+	static bool GetDisableBaseDamage()
+	{
+		return m_Data.GeneralData.disableBaseDamage;
+	}
+	//----------------------------------------------------------------------------------
+	
+	static bool GetDisableContainerDamage()
+	{
+		return m_Data.GeneralData.disableContainerDamage;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableRespawnDialog()
+	{
+		return m_Data.GeneralData.disableRespawnDialog;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableRespawnInUnconsciousness()
+	{
+		return m_Data.GeneralData.disableRespawnInUnconsciousness;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetSprintStaminaModifierErc()
+	{
+		return m_Data.PlayerData.StaminaData.sprintStaminaModifierErc;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetSprintStaminaModifierCro()
+	{
+		return m_Data.PlayerData.StaminaData.sprintStaminaModifierCro;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetSprintSwimmingStaminaModifier()
+	{
+		return m_Data.PlayerData.StaminaData.sprintSwimmingStaminaModifier;
+	}//----------------------------------------------------------------------------------
+	static float GetSprintLadderStaminaModifier()
+	{
+		return m_Data.PlayerData.StaminaData.sprintLadderStaminaModifier;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetStaminaWeightLimitThreshold()
+	{
+		return m_Data.PlayerData.StaminaData.staminaWeightLimitThreshold;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetStaminaMax()
+	{
+		return m_Data.PlayerData.StaminaData.staminaMax;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetStaminaKgToStaminaPercentPenalty()
+	{
+		return m_Data.PlayerData.StaminaData.staminaKgToStaminaPercentPenalty;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetStaminaMinCap()
+	{
+		return m_Data.PlayerData.StaminaData.staminaMinCap;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetMeleeStaminaModifier()
+	{
+		return m_Data.PlayerData.StaminaData.meleeStaminaModifier;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetObstacleTraversalStaminaModifier()
+	{
+		return m_Data.PlayerData.StaminaData.obstacleTraversalStaminaModifier;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetHoldBreathStaminaModifier()
+	{
+		return m_Data.PlayerData.StaminaData.holdBreathStaminaModifier;
+	}
+	//----------------------------------------------------------------------------------	
+	static float GetMovementTimeToStrafeJog()
+	{
+		return Math.Max(0.01, m_Data.PlayerData.MovementData.timeToStrafeJog);
+	}
+	//----------------------------------------------------------------------------------
+	static float GetMovementTimeToSprint()
+	{
+		return Math.Max(0.01, m_Data.PlayerData.MovementData.timeToSprint);
+	}
+	//----------------------------------------------------------------------------------
+	static float GetMovementTimeToStrafeSprint()
+	{
+		return Math.Max(0.01, m_Data.PlayerData.MovementData.timeToStrafeSprint);
+	}
+	//----------------------------------------------------------------------------------
+	static float GetMovementRotationSpeedJog()
+	{
+		return Math.Max(0.01, m_Data.PlayerData.MovementData.rotationSpeedJog);
+	}
+	//----------------------------------------------------------------------------------
+	static float GetMovementRotationSpeedSprint()
+	{
+		return Math.Max(0.01, m_Data.PlayerData.MovementData.rotationSpeedSprint);
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisable2dMap()
+	{
+		return m_Data.PlayerData.disable2dMap;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsCollidingBBoxCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsCollidingBBoxCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsCollidingPlayerCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsCollidingPlayerCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsClippingRoofCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsClippingRoofCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsBaseViableCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsBaseViableCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsInTerrainCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsInTerrainCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsUnderwaterCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsUnderwaterCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableHeightPlacementCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableHeightPlacementCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsPlacementPermittedCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsPlacementPermittedCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsCollidingAngleCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsCollidingAngleCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableIsCollidingGPlotCheck()
+	{
+		return m_Data.BaseBuildingData.HologramData.disableIsCollidingGPlotCheck;
+	}
+	//----------------------------------------------------------------------------------	
+	static bool GetDisableIsCollidingCheck()
+	{
+		return m_Data.BaseBuildingData.ConstructionData.disableIsCollidingCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisablePerformRoofCheck()
+	{
+		return m_Data.BaseBuildingData.ConstructionData.disablePerformRoofCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetDisableDistanceCheck()
+	{
+		return m_Data.BaseBuildingData.ConstructionData.disableDistanceCheck;
+	}
+	//----------------------------------------------------------------------------------
+	static TStringSet GetDisallowedTypesInUnderground()
+	{
+		return m_Data.BaseBuildingData.HologramData.disallowedTypesInUnderground;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetHitIndicationOverrideEnabled() //TODO - ?
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionOverrideEnabled;
+	}
+	//----------------------------------------------------------------------------------
+	static int GetHitIndicationMode()
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionBehaviour;
+	}
+	//----------------------------------------------------------------------------------
+	static int GetHitIndicationTypeID()
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionStyle;
+	}
+	//----------------------------------------------------------------------------------
+	static int GetHitIndicationIndicatorColor()
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionIndicatorColorStr.HexToInt();
+	}
+	//----------------------------------------------------------------------------------
+	static float GetHitIndicationMaxDuration()
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionMaxDuration;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetHitIndicationBreakPoint()
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionBreakPointRelative;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetHitIndicationScatter()
+	{
+		return m_Data.UIData.HitIndicationData.hitDirectionScatter;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetHitIndicationPPEEnabled()
+	{
+		return m_Data.UIData.HitIndicationData.hitIndicationPostProcessEnabled;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetUse3DMap()
+	{
+		return m_Data.UIData.use3DMap;
+	}
+	//----------------------------------------------------------------------------------	
+	static float GetShockRefillSpeedConscious()
+	{
+		return m_Data.PlayerData.ShockHandlingData.shockRefillSpeedConscious;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetShockRefillSpeedUnconscious()
+	{
+		return m_Data.PlayerData.ShockHandlingData.shockRefillSpeedUnconscious;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetAllowRefillSpeedModifier()
+	{
+		return m_Data.PlayerData.ShockHandlingData.allowRefillSpeedModifier;
+	}
+
+	//--- MapData ----------------------------------------------------------------------
+	static bool GetMapIgnoreMapOwnership()
+	{
+		return m_Data.MapData.ignoreMapOwnership;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetMapIgnoreNavItemsOwnership()
+	{
+		return m_Data.MapData.ignoreNavItemsOwnership;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetMapDisplayPlayerPosition()
+	{
+		return m_Data.MapData.displayPlayerPosition;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetMapDisplayNavigationInfo()
+	{
+		return m_Data.MapData.displayNavInfo;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetStaminaDepletionSpeed()
+	{
+		return m_Data.PlayerData.DrowningData.staminaDepletionSpeed;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetHealthDepletionSpeed()
+	{
+		return m_Data.PlayerData.DrowningData.healthDepletionSpeed;
+	}
+	//----------------------------------------------------------------------------------
+	static float GetShockDepletionSpeed()
+	{
+		return m_Data.PlayerData.DrowningData.shockDepletionSpeed;
+	}
+	//----------------------------------------------------------------------------------
+	static bool GetAllowStaminaAffectInertia()
+	{
+		return m_Data.PlayerData.MovementData.allowStaminaAffectInertia;
+	}
+	//----------------------------------------------------------------------------------
+	static TStringArray GetPlayerSpawnGearPresetFiles()
+	{
+		return m_Data.PlayerData.spawnGearPresetFiles;
+	}
+	//----------------------------------------------------------------------------------
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/ClientData.c b/scripts/3_Game/DayZ/Client/ClientData.c
new file mode 100644
index 0000000000000000000000000000000000000000..bc33ce24ebb9eebff6277b9ea1019937221f4474
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/ClientData.c
@@ -0,0 +1,131 @@
+class ClientData
+{
+	static ref ScriptInvoker SyncEvent_OnPlayerListUpdate = new ScriptInvoker();
+	static ref ScriptInvoker SyncEvent_OnEntityKilled = new ScriptInvoker();
+	static ref ScriptInvoker SyncEvent_OnPlayerIgnitedFireplace = new ScriptInvoker();
+	
+	static ref array<Man>			m_PlayerBaseList = new array<Man>;
+	static ref SyncPlayerList		m_PlayerList;
+	static ref SyncPlayerList		m_LastNewPlayers;
+	
+	static ref OnlineServices		m_OnlineServices;
+	
+	static void ResetClientData()
+	{
+		if ( m_PlayerBaseList )
+			m_PlayerBaseList.Clear();
+		if ( m_PlayerList && m_PlayerList.m_PlayerList )
+			m_PlayerList.m_PlayerList.Clear();
+		if ( m_LastNewPlayers && m_LastNewPlayers.m_PlayerList )
+			m_LastNewPlayers.m_PlayerList.Clear();
+	}
+	
+	static void AddPlayerBase( Man player )
+	{
+		if ( m_PlayerBaseList && player != GetGame().GetPlayer() )
+			m_PlayerBaseList.Insert( player );
+	}
+	
+	static void RemovePlayerBase( Man player )
+	{
+		if ( m_PlayerBaseList )
+			m_PlayerBaseList.RemoveItem( player );
+	}
+	
+	static void SyncEvent_PreprocessPlayerList(SyncPlayerList player_list)
+	{
+		foreach (auto sync_player : player_list.m_PlayerList)
+		{
+			PlayerIdentity identity = sync_player.m_Identity;
+			if (!identity)
+			{
+				ErrorEx("PlayerIdentity not synchronized before SyncPlayer", ErrorExSeverity.WARNING);
+				continue;
+			}
+
+			sync_player.m_UID = identity.GetPlainId();
+			sync_player.m_PlayerName = identity.GetPlainName();
+		}
+	}
+
+	static void SyncEvent_OnRecievedPlayerList( SyncPlayerList player_list )
+	{
+		if (m_PlayerList && m_PlayerList.m_PlayerList)
+		{
+			//Print("SyncEvent_OnRecievedPlayerList | " + m_PlayerList.m_PlayerList.Count());
+		}
+		
+		SyncPlayerList new_players = SyncPlayerList.Compare(m_PlayerList, player_list);
+		
+		if ( !m_LastNewPlayers )
+		{
+			m_LastNewPlayers = player_list;
+		}
+		else
+		{
+			m_LastNewPlayers = SyncPlayerList.Compare( m_LastNewPlayers, new_players );
+		}
+		
+		m_PlayerList = SyncPlayerList.Compare(player_list, null);
+		
+		#ifdef PLATFORM_CONSOLE
+			#ifndef PLATFORM_WINDOWS // if app is not on Windows with -XBOX parameter
+				array<string> newPlayersSimple = GetSimplePlayerList( new_players );
+				OnlineServices.LoadPermissions( newPlayersSimple );
+				OnlineServices.m_ClientServices.GetSessionService().OnSessionPlayerListUpdate(newPlayersSimple);
+				
+				if ( new_players.m_PlayerList.Count() > 0 )
+				{
+					OnlineServices.LoadFriends();
+				}
+		
+				if ( g_Game.GetGameState() == DayZGameState.IN_GAME )
+				{
+					OnlineServices.SetMultiplayState(OnlineServices.GetMultiplayState());
+				}
+			#endif
+		#endif
+		
+		SyncEvent_OnPlayerListUpdate.Invoke( player_list );
+	}
+	
+	static array<string> GetSimplePlayerList()
+	{
+		array<string> ids = new array<string>;
+		if ( m_PlayerList && m_PlayerList.m_PlayerList )
+		{
+			for ( int i = 0; i < m_PlayerList.m_PlayerList.Count(); i++ )
+			{
+				SyncPlayer player = m_PlayerList.m_PlayerList.Get( i );
+				ids.Insert( player.m_UID );
+			}
+		}
+		
+		return ids;
+	}
+	
+	static array<string> GetSimplePlayerList( SyncPlayerList list )
+	{
+		array<string> ids = new array<string>;
+		if ( list )
+		{
+			for ( int i = 0; i < list.m_PlayerList.Count(); i++ )
+			{
+				SyncPlayer player = list.m_PlayerList.Get( i );
+				ids.Insert( player.m_UID );
+			}
+		}
+		
+		return ids;
+	}
+	
+	static void SyncEvent_OnEntityKilled( SyncEntityKillInfo entity_killed_data )
+	{
+		SyncEvent_OnEntityKilled.Invoke(entity_killed_data.m_EntityVictim, entity_killed_data.m_EntityKiller, entity_killed_data.m_EntitySource, entity_killed_data.m_IsHeadShot );
+	}
+	
+	static void SyncEvent_OnPlayerIgnitedFireplace( EFireIgniteType igante_type )
+	{
+		SyncEvent_OnPlayerIgnitedFireplace.Invoke(igante_type);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/Mods/ModLoader.c b/scripts/3_Game/DayZ/Client/Mods/ModLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f7716ae0130b5f21ae256999468ef8e2cdd4a3f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/Mods/ModLoader.c
@@ -0,0 +1,26 @@
+class ModLoader
+{
+	protected static bool							m_Loaded;
+	protected static ref array<ref ModStructure>	m_Mods;
+	
+	static array<ref ModStructure> GetMods()
+	{
+		//if( !m_Loaded )
+			LoadMods();
+		return m_Mods;
+	}
+	
+	static void LoadMods()
+	{
+		m_Mods = new array<ref ModStructure>;
+		
+		int mod_count = GetGame().ConfigGetChildrenCount( "CfgMods" );
+		
+		for( int i = 2; i < mod_count; i++ )
+		{
+			string mod_name;
+			GetGame().ConfigGetChildName( "CfgMods", i, mod_name );
+			m_Mods.Insert( new ModStructure( i, "CfgMods " + mod_name ) );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/Mods/ModStructure.c b/scripts/3_Game/DayZ/Client/Mods/ModStructure.c
new file mode 100644
index 0000000000000000000000000000000000000000..e479b08756dc1dec8ba6b32b7c5404fb729721e3
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/Mods/ModStructure.c
@@ -0,0 +1,68 @@
+class ModStructure
+{
+	protected int		m_ModIndex;
+	protected string	m_ModPath;
+	protected string	m_ModName;
+	protected string	m_ModLogo;
+	protected string	m_ModLogoSmall;
+	protected string	m_ModLogoOver;
+	protected string	m_ModActionURL;
+	protected string	m_ModTooltip;
+	protected string	m_ModOverview;
+	
+	void ModStructure( int index, string path )
+	{
+		m_ModIndex	= index;
+		m_ModPath	= path;
+		LoadData();
+	}
+	
+	void LoadData()
+	{
+		if( GetGame().ConfigIsExisting( m_ModPath ) )
+		{
+			GetGame().ConfigGetText( m_ModPath + " name", m_ModName );
+			GetGame().ConfigGetText( m_ModPath + " picture", m_ModLogo );
+			GetGame().ConfigGetText( m_ModPath + " logo", m_ModLogoSmall );
+			GetGame().ConfigGetText( m_ModPath + " logoSmall", m_ModLogoOver );
+			GetGame().ConfigGetText( m_ModPath + " logoOver", m_ModActionURL );
+			GetGame().ConfigGetText( m_ModPath + " tooltip", m_ModTooltip );
+			GetGame().ConfigGetText( m_ModPath + " overview", m_ModOverview );
+		}
+	}
+	
+	string GetModName()
+	{
+		return m_ModName;
+	}
+	
+	string GetModLogo()
+	{
+		return m_ModName;
+	}
+	
+	string GetModLogoSmall()
+	{
+		return m_ModName;
+	}
+	
+	string GetModLogoOver()
+	{
+		return m_ModName;
+	}
+	
+	string GetModActionURL()
+	{
+		return m_ModName;
+	}
+	
+	string GetModToltip()
+	{
+		return m_ModName;
+	}
+	
+	string GetModOverview()
+	{
+		return m_ModName;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/Notifications/NotificationData.c b/scripts/3_Game/DayZ/Client/Notifications/NotificationData.c
new file mode 100644
index 0000000000000000000000000000000000000000..b5e69f55b92cb2a1f7c1a06c0d57e5cd0b6a4b34
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/Notifications/NotificationData.c
@@ -0,0 +1,14 @@
+class NotificationData
+{
+	string m_Icon;
+	string m_TitleText;
+	string m_DescriptionText;
+	
+	void NotificationData(string icon, string title_text, string desc_text = "")
+	{
+		m_Icon = icon;
+		m_TitleText = title_text;
+		if (desc_text != "")
+			m_DescriptionText = desc_text;
+	}
+}
diff --git a/scripts/3_Game/DayZ/Client/Notifications/NotificationSystem.c b/scripts/3_Game/DayZ/Client/Notifications/NotificationSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..ca585215265a61e207fafbc5c0f7c992e0a39604
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/Notifications/NotificationSystem.c
@@ -0,0 +1,320 @@
+const static float NOTIFICATION_FADE_TIME = 3.0; //! DEPRECATED (moved into NotificationSystem)
+
+enum NotificationType
+{
+	FRIEND_CONNECTED,
+	INVITE_FAIL_SAME_SERVER,
+	JOIN_FAIL_GET_SESSION,
+	CONNECT_FAIL_GENERIC,
+	DISCONNECTED,
+	GENERIC_ERROR,
+	//Please add types before this item
+	NOTIFICATIONS_END
+}
+
+class NotificationRuntimeData
+{
+	ref NotificationData	m_StaticData;
+	
+	float					m_NotificationTime;
+	float					m_TimeRemaining;
+	string					m_DetailText;
+	
+	void NotificationRuntimeData(float time, NotificationData data, string detail_text)
+	{
+		m_NotificationTime	= time;
+		m_TimeRemaining		= time;
+		m_StaticData		= data;
+
+		if (detail_text != "")
+			m_DetailText	= detail_text;
+		else
+			m_DetailText	= m_StaticData.m_DescriptionText;
+	}
+
+	float GetTime()
+	{
+		return m_NotificationTime;
+	}
+	
+	float GetRemainingTime()
+	{
+		return m_TimeRemaining;
+	}
+	
+	string GetIcon()
+	{
+		return m_StaticData.m_Icon;
+	}
+	
+	string GetTitleText()
+	{
+		return m_StaticData.m_TitleText;
+	}
+	
+	string GetDetailText()
+	{
+		return m_DetailText;
+	}
+	
+	void UpdateRemainingTime(float updateInterval)
+	{
+		m_TimeRemaining -= updateInterval;
+	}
+	
+	//! DEPRECATED
+	void SetTime(float time);
+}
+
+class NotificationSystem
+{
+	const int DEFAULT_TIME_DISPLAYED 	= 10;
+	const float NOTIFICATION_FADE_TIME 	= 3.0;
+
+	protected static const string JSON_FILE_PATH = "scripts/data/notifications.json";					
+	protected static const int MAX_NOTIFICATIONS = 5;
+
+	private static const float UPDATE_INTERVAL_THRESHOLD = 1.0;
+	
+	protected static ref NotificationSystem						m_Instance;
+	
+	protected ref array<ref NotificationRuntimeData>			m_TimeArray;
+	protected ref array<ref NotificationRuntimeData>			m_DeferredArray;
+	protected ref map<NotificationType, ref NotificationData>	m_DataArray;
+	
+	protected float m_TimeElapsed;
+	
+	ref ScriptInvoker m_OnNotificationAdded = new ScriptInvoker();
+	ref ScriptInvoker m_OnNotificationRemoved = new ScriptInvoker();
+	
+	static void InitInstance()
+	{
+		if (!m_Instance)
+		{
+			m_Instance = new NotificationSystem();
+			m_Instance.LoadNotificationData();
+		}
+	}
+	
+	static void CleanupInstance()
+	{
+		m_Instance = null;
+	}
+	
+	static NotificationSystem GetInstance()
+	{
+		return m_Instance;
+	}
+	
+	void NotificationSystem()
+	{
+		m_TimeElapsed 	= 0.0;
+
+		m_TimeArray 	= new array<ref NotificationRuntimeData>();
+		m_DeferredArray = new array<ref NotificationRuntimeData>();
+	}
+	
+	/**
+	\brief Send custom notification to player from server
+	@param player the target player to send notification to
+	@param show_time amount of time this notification is displayed
+	@param title_text the title text that is displayed in the notification
+	@param detail_text additional text that can be added to the notification under the title - will not display additional text if not set
+	@param icon the icon that is displayed in the notification - will use default icon if not set
+	*/
+	static void SendNotificationToPlayerExtended(Man player, float show_time, string title_text, string detail_text = "", string icon = "")
+	{
+		if (player)
+		{
+			SendNotificationToPlayerIdentityExtended(player.GetIdentity(), show_time, title_text, detail_text, icon);
+		}
+	}
+	
+	/**
+	\brief Send custom notification to player identity from server
+	@param player the target player to send notification to - if null, will send to all players
+	@param show_time amount of time this notification is displayed
+	@param title_text the title text that is displayed in the notification
+	@param detail_text additional text that can be added to the notification under the title - will not display additional text if not set
+	@param icon the icon that is displayed in the notification - will use default icon if not set
+	*/
+	static void SendNotificationToPlayerIdentityExtended(PlayerIdentity player, float show_time, string title_text, string detail_text = "", string icon = "")
+	{
+		ScriptRPC rpc = new ScriptRPC();
+		
+		rpc.Write(show_time);
+		rpc.Write(title_text);
+		rpc.Write(detail_text);
+		rpc.Write(icon);
+
+		rpc.Send(null, ERPCs.RPC_SEND_NOTIFICATION_EXTENDED, true, player);
+	}
+	
+	/**
+	\brief Send notification from default types to player from server
+	@param player the target player to send notification to
+	@param type the type of notification to send - these can be viewed in /Scripts/Data/Notifications.json
+	@param show_time amount of time this notification is displayed
+	@param detail_text additional text that can be added to the notification under the title - will not display additional text if not set
+	*/
+	static void SendNotificationToPlayer(Man player, NotificationType type, float show_time, string detail_text = "")
+	{
+		if (player)
+		{
+			SendNotificationToPlayerIdentity(player.GetIdentity(), type, show_time, detail_text);
+		}
+	}
+	
+	/**
+	\brief Send notification from default types to player identity from server
+	@param player the target player to send notification to - if null, will send to all players
+	@param type the type of notification to send - these can be viewed in /Scripts/Data/Notifications.json
+	@param show_time amount of time this notification is displayed
+	@param detail_text additional text that can be added to the notification under the title - will not display additional text if not set
+	*/
+	static void SendNotificationToPlayerIdentity( PlayerIdentity player, NotificationType type, float show_time, string detail_text = "" )
+	{
+		ScriptRPC rpc = new ScriptRPC();
+		
+		rpc.Write(type);
+		rpc.Write(show_time);
+		rpc.Write(detail_text);
+
+		rpc.Send(null, ERPCs.RPC_SEND_NOTIFICATION, true, player);
+	}
+	
+	/**
+	\brief Send notification from default types to local player
+	@param type the type of notification to send - these can be viewed in /Scripts/Data/Notifications.json
+	@param show_time amount of time this notification is displayed
+	@param detail_text additional text that can be added to the notification under the title - will not display additional text if not set
+	*/
+	static void AddNotification(NotificationType type, float show_time, string detail_text = "")
+	{
+		if (m_Instance.m_TimeArray.Count() < MAX_NOTIFICATIONS)
+		{
+			NotificationRuntimeData data = new NotificationRuntimeData(show_time, m_Instance.GetNotificationData(type), detail_text);
+			
+			m_Instance.m_TimeArray.Insert(data);
+			m_Instance.m_OnNotificationAdded.Invoke(data);
+		}
+		else
+		{
+			NotificationRuntimeData dataDeferred = new NotificationRuntimeData(show_time, m_Instance.GetNotificationData(type), detail_text);
+			m_Instance.m_DeferredArray.Insert(dataDeferred);
+		}
+	}
+	
+	/**
+	\brief Send custom notification from to local player
+	@param show_time amount of time this notification is displayed
+	@param title_text the title text that is displayed in the notification
+	@param detail_text additional text that can be added to the notification under the title - will not display additional text if not set
+	@param icon the icon that is displayed in the notification - will use default icon if not set
+	*/
+	static void AddNotificationExtended(float show_time, string title_text, string detail_text = "", string icon = "")
+	{
+		if (m_Instance.m_TimeArray.Count() < MAX_NOTIFICATIONS)
+		{
+			NotificationData tempData = new NotificationData(icon, title_text);
+			NotificationRuntimeData data = new NotificationRuntimeData(show_time, tempData, detail_text);
+			
+			m_Instance.m_TimeArray.Insert(data);
+			m_Instance.m_OnNotificationAdded.Invoke(data);
+		}
+		else
+		{
+			NotificationData tempDataDeferred = new NotificationData(icon, title_text);
+			NotificationRuntimeData dataDeferred = new NotificationRuntimeData(show_time, tempDataDeferred, detail_text);
+			m_Instance.m_DeferredArray.Insert(dataDeferred);
+		}
+	}
+	
+	static void Update(float timeslice)
+	{
+		if (m_Instance)
+		{
+			if (g_Game.GetGameState() != DayZGameState.IN_GAME && g_Game.GetGameState() != DayZGameState.MAIN_MENU)
+				return;
+	
+			m_Instance.m_TimeElapsed += timeslice;
+			if (m_Instance.m_TimeElapsed >= UPDATE_INTERVAL_THRESHOLD)
+			{
+				array<NotificationRuntimeData> expiredNotifications = new array<NotificationRuntimeData>();
+				foreach (NotificationRuntimeData visibleNotificationData : m_Instance.m_TimeArray)
+				{
+					if (visibleNotificationData.GetRemainingTime() <= 0.0)
+						expiredNotifications.Insert(visibleNotificationData);
+					else
+						visibleNotificationData.UpdateRemainingTime(UPDATE_INTERVAL_THRESHOLD);
+				}
+				
+				foreach (NotificationRuntimeData expiredNotificationData : expiredNotifications)
+				{
+					m_Instance.m_OnNotificationRemoved.Invoke(expiredNotificationData);
+					m_Instance.m_TimeArray.RemoveItem(expiredNotificationData);
+					
+					if (m_Instance.m_DeferredArray.Count() > 0)
+					{
+						int count = m_Instance.m_DeferredArray.Count();
+						NotificationRuntimeData deferredNotificationData = m_Instance.m_DeferredArray.Get(count - 1);
+						m_Instance.m_TimeArray.Insert(deferredNotificationData);
+						m_Instance.m_OnNotificationAdded.Invoke(deferredNotificationData);
+						m_Instance.m_DeferredArray.Remove(count - 1);
+					}
+				}
+	
+				m_Instance.m_TimeElapsed = 0;
+			}
+		}
+	}
+	
+	protected NotificationData GetNotificationData(NotificationType type)
+	{
+		if (m_DataArray.Contains(type))
+			return m_DataArray.Get(type);
+		
+		return null;
+	}
+	
+	static void LoadNotificationData()
+	{
+		map<NotificationType, NotificationData> dataArray;
+		m_Instance.m_DataArray = new map<NotificationType, ref NotificationData>();
+		string errorMessage;
+		if (!JsonFileLoader<map<NotificationType, NotificationData>>.LoadFile(JSON_FILE_PATH, dataArray, errorMessage))
+			ErrorEx(errorMessage);
+		
+		m_Instance.m_DataArray.Copy(dataArray);
+		
+		array<int> notificationTypes = new array<int>();
+		NotificationType notificationType = 0;
+		while (notificationType != NotificationType.NOTIFICATIONS_END)
+		{
+			notificationTypes.Insert(notificationType);
+			notificationType++;
+		}
+		
+		for (int i = 0; i < m_Instance.m_DataArray.Count(); ++i)
+		{
+			notificationTypes.RemoveItem(m_Instance.m_DataArray.GetKey(i));
+		}
+		
+		if (notificationTypes.Count() > 0)
+		{
+			foreach (NotificationType notificationType2 : notificationTypes)
+			{
+				NotificationData notificationData = new NotificationData(
+					"please_add_an_icon",
+					"please_add_a_title",
+					"optional_description",
+				);
+
+				m_Instance.m_DataArray.Insert(notificationType2, notificationData);
+			}
+
+			if (!JsonFileLoader<map<NotificationType, ref NotificationData>>.SaveFile(JSON_FILE_PATH, m_Instance.m_DataArray, errorMessage))
+				ErrorEx(errorMessage);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/Notifications/NotificationUI.c b/scripts/3_Game/DayZ/Client/Notifications/NotificationUI.c
new file mode 100644
index 0000000000000000000000000000000000000000..35c9c9aee96021f27c26b4f0189195364cc725ef
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/Notifications/NotificationUI.c
@@ -0,0 +1,231 @@
+class NotificationUI
+{
+	protected ref Widget	m_Root;
+	protected ref Widget	m_Spacer;
+	protected ref Widget	m_VoiceContent;
+	protected ref Widget	m_NotificationContent;
+	
+	protected ref map<NotificationRuntimeData, Widget>	m_Notifications;
+	protected ref map<string, Widget>					m_VoiceNotifications;
+	
+	protected float										m_Width;
+	protected float										m_CurrentHeight;
+	protected float										m_TargetHeight;
+	protected float										m_BackupPosX;
+	protected float										m_BackupPosY;
+	protected ref map<string, Widget>					m_WidgetTimers;
+	
+	protected bool										m_OffsetEnabled;;
+	
+	void NotificationUI()
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/notifications/notifications.layout");
+		m_Spacer				= m_Root.FindAnyWidget( "NotificationSpacer" );
+		m_VoiceContent			= m_Root.FindAnyWidget( "VoiceContent" );
+		m_NotificationContent	= m_Root.FindAnyWidget( "NotificationContent" );
+		m_Notifications			= new map<NotificationRuntimeData, Widget>;
+		m_VoiceNotifications	= new map<string, Widget>;
+		m_WidgetTimers			= new map<string, Widget>;
+		
+		NotificationSystem ntfSys = NotificationSystem.GetInstance();
+		if (ntfSys)
+		{
+			ntfSys.m_OnNotificationAdded.Insert( AddNotification );
+			ntfSys.m_OnNotificationRemoved.Insert( RemoveNotification );
+		}
+	}
+	
+	void ~NotificationUI()
+	{
+		NotificationSystem ntfSys = NotificationSystem.GetInstance();
+		if (ntfSys)
+		{
+			ntfSys.m_OnNotificationAdded.Remove( AddNotification );
+			ntfSys.m_OnNotificationRemoved.Remove( RemoveNotification );
+		}
+	}
+	
+	void AddNotification( NotificationRuntimeData data )
+	{
+		Widget notification			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/notifications/notification_element.layout", m_NotificationContent);
+		
+		ImageWidget icon			= ImageWidget.Cast( notification.FindAnyWidget( "Image" ) );
+		RichTextWidget title		= RichTextWidget.Cast( notification.FindAnyWidget( "Title" ) );
+		
+		if ( data.GetIcon() != "" )
+			icon.LoadImageFile( 0, data.GetIcon() );
+		title.SetText( data.GetTitleText() );
+		
+		if ( data.GetDetailText() != "" )
+		{
+			Widget bottom_spacer	= notification.FindAnyWidget( "BottomSpacer" );
+			RichTextWidget detail	= RichTextWidget.Cast( notification.FindAnyWidget( "Detail" ) );
+			bottom_spacer.Show(true);
+			detail.SetText( data.GetDetailText() );
+			detail.Update();
+			bottom_spacer.Update();
+			notification.Update();
+		}
+		
+		m_Notifications.Insert( data, notification );
+		UpdateTargetHeight();
+	}
+	
+	void RemoveNotification( NotificationRuntimeData data )
+	{
+		if ( m_Notifications.Contains( data ) )
+		{
+			Widget notification = m_Notifications.Get( data );
+			m_WidgetTimers.Insert( m_WidgetTimers.Count().ToString() + data.GetTime().ToString(), notification );
+			m_Notifications.Remove( data );
+			UpdateTargetHeight();
+		}
+	}
+	
+	void AddVoiceNotification(string player, string name)
+	{
+		if (!m_VoiceNotifications.Contains(player))
+		{
+			Widget notification;
+			if (!m_WidgetTimers.Contains(player))
+			{
+				notification = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/notifications/notification_voice_element.layout", m_VoiceContent);
+			}
+			else
+			{
+				notification = m_WidgetTimers.Get(player);
+				m_WidgetTimers.Remove(player);
+				notification.SetAlpha( 120 / 255 );
+				Widget w_c = notification.FindAnyWidget( "Name" );
+				if ( w_c )
+				{
+					w_c.SetAlpha( 1 );
+				}
+			}
+
+			RichTextWidget title = RichTextWidget.Cast(notification.FindAnyWidget("Name"));
+			m_VoiceNotifications.Insert(player, notification);
+			title.SetText(name);
+			UpdateTargetHeight();
+		}
+	}
+	
+	void RemoveVoiceNotification( string player )
+	{
+		if ( m_VoiceNotifications.Contains( player ) )
+		{
+			Widget notification = m_VoiceNotifications.Get( player );
+			m_WidgetTimers.Insert( player, notification );
+			m_VoiceNotifications.Remove( player );
+			UpdateTargetHeight();
+		}
+	}
+	
+	void ClearVoiceNotifications()
+	{
+		for ( int i = 0; i < m_VoiceNotifications.Count(); i++ )
+		{
+			Widget w = m_VoiceNotifications.GetElement( i );
+			delete w;
+		}
+		m_VoiceNotifications.Clear();
+		UpdateTargetHeight();
+	}
+	
+	void UpdateTargetHeight()
+	{
+		m_VoiceContent.Update();
+		m_NotificationContent.Update();
+		m_Spacer.Update();
+		
+		float x;
+		m_Spacer.GetScreenSize( x, m_TargetHeight );
+		m_Root.GetScreenSize( m_Width, m_CurrentHeight );
+		
+		UpdateOffset();
+	}
+	
+	void UpdateOffset()
+	{
+		UIScriptedMenu menu = UIScriptedMenu.Cast(GetGame().GetUIManager().GetMenu());
+		if (menu)
+		{
+			Widget expNotification = menu.GetLayoutRoot().FindAnyWidget("notification_root");
+			if (expNotification && expNotification.IsVisible())
+			{
+				if (!m_OffsetEnabled)
+				{
+					m_Root.GetPos(m_BackupPosX, m_BackupPosY);
+					
+					float x, y, w, h;
+					m_Root.GetScreenPos(x, y);
+					expNotification.GetScreenSize(w, h);
+					
+					m_Root.SetScreenPos(x, h);
+					m_OffsetEnabled = true;
+				}
+			}
+			else if (m_OffsetEnabled)
+			{
+				m_Root.SetPos(m_BackupPosX, m_BackupPosY);
+				m_OffsetEnabled = false;
+			}
+		}
+	}
+	
+	static float m_VelArr[1];
+	void Update( float timeslice )
+	{
+		UpdateOffset();
+		
+		float x;
+		m_Spacer.GetScreenSize( x, m_TargetHeight );
+		bool is_near = ( m_CurrentHeight + 0.01 < m_TargetHeight || m_CurrentHeight - 0.01 > m_TargetHeight );
+		if ( is_near )
+		{
+			m_CurrentHeight = Math.SmoothCD(m_CurrentHeight, m_TargetHeight, m_VelArr, 0.2, 10000, timeslice);
+			m_Root.SetSize( m_Width, m_CurrentHeight );
+		}
+		else if ( m_TargetHeight != m_CurrentHeight )
+		{
+			m_CurrentHeight = m_TargetHeight;
+			m_Root.SetSize( m_Width, m_CurrentHeight );
+			m_VelArr[0] = 0;
+		}
+		
+		for ( int i = 0; i < m_WidgetTimers.Count(); )
+		{
+			Widget w		= m_WidgetTimers.GetElement( i );
+			float new_alpha	= Math.Clamp( w.GetAlpha() - timeslice / NotificationSystem.NOTIFICATION_FADE_TIME, 0, 1 );
+			if ( new_alpha > 0 )
+			{
+				w.SetAlpha( new_alpha );
+				Widget w_c = w.FindAnyWidget( "TopSpacer" );
+				Widget w_c2 = w.FindAnyWidget( "BottomSpacer" );
+				Widget w_c3 = w.FindAnyWidget( "Title" );
+				Widget w_c4 = w.FindAnyWidget( "Detail" );
+				Widget w_c5 = w.FindAnyWidget( "Name" );
+				if ( w_c && w_c2 )
+				{
+					float new_alpha_cont	= Math.Clamp( w_c.GetAlpha() - timeslice / NotificationSystem.NOTIFICATION_FADE_TIME, 0, 1 );
+					w_c.SetAlpha( new_alpha_cont );
+					w_c2.SetAlpha( new_alpha_cont );
+					w_c3.SetAlpha( new_alpha_cont );
+					w_c4.SetAlpha( new_alpha_cont );
+				}
+				if ( w_c5 )
+				{
+					float new_alpha_voice	= Math.Clamp( w_c5.GetAlpha() - timeslice / NotificationSystem.NOTIFICATION_FADE_TIME, 0, 1 );
+					w_c5.SetAlpha(new_alpha_voice);
+				}
+				i++;
+			}
+			else
+			{
+				delete w;
+				m_WidgetTimers.RemoveElement( i );
+				UpdateTargetHeight();
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/OnlineServices.c b/scripts/3_Game/DayZ/Client/OnlineServices.c
new file mode 100644
index 0000000000000000000000000000000000000000..b16b2357258a4915c00b4f452b31695cc845067c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/OnlineServices.c
@@ -0,0 +1,747 @@
+class OnlineServices
+{
+	static ref ScriptInvoker												m_FriendsAsyncInvoker		= new ScriptInvoker();
+	static ref ScriptInvoker												m_PermissionsAsyncInvoker	= new ScriptInvoker();
+	static ref ScriptInvoker												m_ServersAsyncInvoker		= new ScriptInvoker();
+	static ref ScriptInvoker												m_ServerAsyncInvoker		= new ScriptInvoker();
+	static ref ScriptInvoker												m_MuteUpdateAsyncInvoker	= new ScriptInvoker(); // DEPRECATED
+	static ref ScriptInvoker												m_ServerModLoadAsyncInvoker	= new ScriptInvoker();
+	
+	static ref BiosClientServices											m_ClientServices;
+	static ref TrialService													m_TrialService;
+	
+	protected static string													m_InviteServerIP;
+	protected static int													m_InviteServerPort;
+	protected static string													m_CurrentServerIP;
+	protected static int													m_CurrentServerPort;
+	protected static ref GetServersResultRow								m_CurrentServerInfo;
+	
+	
+	protected static ref map<string, ref BiosFriendInfo>					m_FriendsList;
+	protected static ref map<string, bool>									m_MuteList;
+	protected static ref map<string, ref BiosPrivacyPermissionResultArray>	m_PermissionsList;
+	
+	protected static bool													m_FirstFriendsLoad			= true;
+	protected static bool													m_MultiplayState			= false;
+	protected static ref array<string>										m_PendingInvites;
+
+	protected static ref BiosUser											m_BiosUser;
+	
+	static void Init()
+	{
+		#ifdef PLATFORM_CONSOLE
+			#ifndef PLATFORM_WINDOWS // if app is not on Windows with -XBOX parameter
+			if ( !m_TrialService )
+				m_TrialService = new TrialService;
+			if ( !m_FriendsList )
+				m_FriendsList = new map<string, ref BiosFriendInfo>;
+			if ( !m_MuteList )
+				m_MuteList = new map<string, bool>;
+			if ( !m_PermissionsList )
+				m_PermissionsList = new map<string, ref BiosPrivacyPermissionResultArray>;
+			
+			m_FriendsList.Clear();
+			m_PermissionsList.Clear();
+			m_MuteList.Clear();
+			#endif
+		#endif
+		
+		GetClientServices();
+	}
+	
+	static bool IsInitialized()
+	{
+		return ( m_ClientServices != null );
+	}
+	
+	static void GetClientServices()
+	{
+		BiosUserManager user_manager = GetGame().GetUserManager();
+		if ( user_manager )
+		{
+			BiosUser selected_user = user_manager.GetSelectedUser();
+			if ( selected_user )
+			{
+				m_ClientServices = selected_user.GetClientServices();
+			}
+			#ifdef PLATFORM_WINDOWS
+				array<ref BiosUser> user_list = new array<ref BiosUser>;
+				user_manager.GetUserList( user_list );
+				if ( user_list.Count() > 0 )
+				{
+					m_ClientServices = user_list.Get( 0 ).GetClientServices();
+				}
+			#endif
+		}
+		else
+		{
+			Error( "BiosClientServices Error: Usermanager does not exist." );
+		}
+	}
+	
+	static bool ErrorCaught( EBiosError error )
+	{
+		switch ( error )
+		{
+			case EBiosError.OK:
+			{
+				return false;
+			}
+		}
+
+		DebugPrint.LogErrorAndTrace( string.Format("BiosClientServices Error: %1", ErrorModuleHandler.GetClientMessage(ErrorCategory.BIOSError, error)) );
+		return true;
+	}
+	
+	static void LoadServers( notnull GetServersInput inputValues )
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetLobbyService().GetServers( inputValues );
+		}
+		else
+		{
+			DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+		}
+	}
+
+	static void GetFavoriteServers(TStringArray favServers)
+	{
+		m_ClientServices.GetLobbyService().GetFavoriteServers(favServers);
+	}
+	
+	static void GetCachedFavServerInfo(array<ref CachedServerInfo> favServersInfoCache)
+	{
+		m_ClientServices.GetLobbyService().GetCachedFavoriteServerInfo(favServersInfoCache);
+	}
+	
+	static void SetServerFavorited(string ipAddress, int port, int steamQueryPort, bool is_favorited )
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			if ( is_favorited )
+			{
+				m_ClientServices.GetLobbyService().AddServerFavorite( ipAddress, port, steamQueryPort );
+			}
+			else
+			{
+				m_ClientServices.GetLobbyService().RemoveServerFavorite( ipAddress, port, steamQueryPort );
+			}
+		}
+		else
+		{
+			DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+		}
+	}
+	
+	static void GetCurrentServerInfo( string ip, int port )
+	{
+		GetClientServices();
+		
+		m_CurrentServerIP = ip;
+		m_CurrentServerPort = port;
+		
+		GetServersInput inputValues = new GetServersInput;
+		
+		inputValues.SetHostIp( ip );
+		inputValues.SetHostPort( port );
+		inputValues.m_Page = 0;
+		inputValues.m_RowsPerPage = 10;
+		inputValues.m_Platform = 1;
+
+		#ifdef PLATFORM_XBOX
+			inputValues.m_Platform = 2;
+		#endif
+		#ifdef PLATFORM_PS4
+			inputValues.m_Platform = 3;
+		#endif
+		
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetLobbyService().GetServers( inputValues );
+		}
+	}
+	
+	static GetServersResultRow GetCurrentServerInfo()
+	{
+		if (m_CurrentServerInfo)
+			return m_CurrentServerInfo;
+		else
+			return g_Game.GetHostData();
+	}
+	
+	static void ClearCurrentServerInfo()
+	{
+		m_CurrentServerInfo	= null;
+		m_CurrentServerIP	= "";
+		m_CurrentServerPort	= 0;
+	}
+	
+	static void SetInviteServerInfo( string ip, int port )
+	{
+		m_InviteServerIP = ip;
+		m_InviteServerPort = port;
+	}
+	
+	static void GetInviteServerInfo( out string ip, out int port )
+	{
+		ip = m_InviteServerIP;
+		port = m_InviteServerPort;
+	}
+	
+	static void OnLoadServersAsync( GetServersResult result_list, EBiosError error, string response )
+	{
+		if ( !ErrorCaught( error ) )
+		{
+			if ( m_CurrentServerIP != "" && m_CurrentServerPort > 0 )
+			{
+				foreach ( GetServersResultRow result : result_list.m_Results )
+				{
+					if ( result.m_HostIp == m_CurrentServerIP && result.m_HostPort == m_CurrentServerPort )
+					{
+						m_CurrentServerInfo	= result;
+						m_CurrentServerIP	= "";
+						m_CurrentServerPort	= 0;
+					}
+				}
+			}
+			
+			// todo: remove
+			//foreach( GetServersResultRow res : result_list.m_Results )
+			//{
+			//	Print("OnLoadServersAsync: result id: " + res.m_Id + "modded: " + res.m_Modded);
+			//}
+			
+			// just for example execute the retrieving of extended info for the first server entry in the list
+			//if (result_list.m_Results.Count() > 0)
+			//{
+				//GetServersResultRow re = result_list.m_Results[0];
+				//EBiosError er = m_ClientServices.GetLobbyService().GetServerModList(re.m_Id);
+				//Print("OnLoadServersAsync GetServerModList returns:" + er);
+			//}
+			
+			m_ServersAsyncInvoker.Invoke( result_list, error, response );
+		}
+		else
+		{
+			m_ServersAsyncInvoker.Invoke( null, error, "" );
+		}
+	}
+
+	
+	static void LoadFriends()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetSocialService().GetFriendsAsync();
+		}
+		else
+		{
+			DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+		}
+	}
+	
+	static void ShowUserProfile( string uid )
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetSocialService().ShowUserProfileAsync( uid );
+		}
+		else
+		{
+			DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+		}
+	}
+	
+	static void OnUserProfileAsync(EBiosError error)
+	{
+		ErrorCaught( error );
+	}
+	
+	static void OnFriendsAsync( BiosFriendInfoArray friend_list, EBiosError error )
+	{
+		if ( !ErrorCaught( error ) )
+		{
+			m_FriendsAsyncInvoker.Invoke( friend_list );
+			
+			array<string> friends_simple = new array<string>;
+			for ( int i = 0; i < friend_list.Count(); ++i )
+			{
+				string uid = friend_list[i].m_Uid;
+				BiosFriendInfo storedBfi = m_FriendsList[uid];
+				BiosFriendInfo newBfi = friend_list[i];
+				
+				if (storedBfi)
+				{
+					if ( !BiosFriendInfo.Compare( storedBfi, newBfi ) )
+					{
+						friends_simple.Insert( newBfi.m_Uid );
+					}
+					m_FriendsList.Set( uid, newBfi );
+				}
+				else
+				{
+					m_FriendsList.Insert( uid, newBfi );
+					friends_simple.Insert( newBfi.m_Uid );
+				}
+			}
+			
+			if ( !m_FirstFriendsLoad )
+			{
+				if ( ClientData.m_LastNewPlayers && ClientData.m_LastNewPlayers.m_PlayerList.Count() > 0 )
+				{
+					foreach ( SyncPlayer player : ClientData.m_LastNewPlayers.m_PlayerList )
+					{
+						if ( m_FriendsList.Contains( player.m_UID ) )
+						{
+							NotificationSystem.AddNotification( NotificationType.FRIEND_CONNECTED, NotificationSystem.DEFAULT_TIME_DISPLAYED, player.m_PlayerName + " " + "#ps4_invite_has_joined_your_session" );
+						}
+					}
+					ClientData.m_LastNewPlayers.m_PlayerList.Clear();
+				}
+			}
+			m_FirstFriendsLoad = false;
+		}
+	}
+	
+	static void LoadPermissions( array<string> player_list )
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			array<EBiosPrivacyPermission> perms = new array<EBiosPrivacyPermission>;
+			perms.Insert( EBiosPrivacyPermission.COMMUNICATE_VOICE );
+			
+			ErrorCaught( m_ClientServices.GetPrivacyService().GetPermissionsAsync( player_list, perms ) );
+		}
+		else
+		{
+			DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+		}
+	}
+	
+	static void OnPermissionsAsync( BiosPrivacyUidResultArray result_list, EBiosError error )
+	{
+		if ( !ErrorCaught( error ) )
+		{
+			BiosPrivacyUidResultArray new_list = new BiosPrivacyUidResultArray;
+			
+			for ( int i = 0; i < result_list.Count(); i++ )
+			{
+				BiosPrivacyUidResult result = result_list.Get( i );
+				string uid = result.m_Uid;
+				BiosPrivacyPermissionResultArray result_array = m_PermissionsList.Get( uid );
+				BiosPrivacyPermissionResultArray result_array2 = result.m_Results;
+				if ( result_array && result_array2 )
+				{
+					if ( !BiosPrivacyPermissionResult.Compare( result_array.Get( 0 ), result_array2.Get( 0 ) ) )
+					{
+						new_list.Insert( result );
+						m_PermissionsList.Set( uid, result_array2 );
+					}
+				}
+				else
+				{
+					m_PermissionsList.Insert( uid, result_array2 );
+					new_list.Insert( result );
+				}
+			}
+			m_PermissionsAsyncInvoker.Invoke( new_list );
+		}
+	}
+	
+	static bool IsPlayerMuted( string id )
+	{
+		if ( m_MuteList.Contains( id ) )
+		{
+			return m_MuteList.Get( id );
+		}
+		return false;
+	}
+	
+	static bool MutePlayer( string id, bool mute )
+	{
+		if ( m_MuteList.Contains( id ) )
+		{
+			m_MuteList.Set( id, mute );
+		}
+		else
+		{
+			m_MuteList.Insert( id, mute );
+		}
+		
+		// notify server
+		ScriptInputUserData ctx = new ScriptInputUserData();
+		ctx.Write( INPUT_UDT_USER_MUTE_XBOX );
+		ctx.Write( id );
+		ctx.Write( mute );
+		ctx.Send();
+		
+		return true;
+	}
+	
+	static map<string, bool> GetMuteList()
+	{
+		return m_MuteList;
+	}
+	
+	static void ShowInviteScreen()
+	{
+		#ifdef PLATFORM_CONSOLE
+			GetClientServices();
+			if ( m_ClientServices )
+			{
+				string addr;
+				int port;
+				if ( GetGame().GetHostAddress( addr, port ) )
+				{
+					ErrorCaught( m_ClientServices.GetSessionService().ShowInviteToGameplaySessionAsync( addr, port ) );
+				}
+			}
+			else
+			{
+				DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+			}
+		#endif
+	}
+	
+	static void LoadMPPrivilege()
+	{
+		#ifdef PLATFORM_CONSOLE
+			GetClientServices();
+			if ( m_ClientServices )
+			{
+				ErrorCaught( m_ClientServices.GetPrivacyService().GetPrivilegeAsync( EBiosPrivacyPrivilege.MULTIPLAYER_GAMEPLAY, true ) );
+			}
+			else
+			{
+				DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+			}
+		#else
+			OnLoadMPPrivilege( EBiosError.OK );
+		#endif
+	}
+	
+	static void LoadVoicePrivilege()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			ErrorCaught( m_ClientServices.GetPrivacyService().GetPrivilegeAsync( EBiosPrivacyPrivilege.COMMUNICATE_VOICE, true ) );
+		}
+		else
+		{
+			DebugPrint.LogErrorAndTrace( "BiosClientServices Error: Service reference does not exist." );
+		}
+	}
+	
+	static void OnLoadMPPrivilege( EBiosError err )
+	{
+		if ( !ErrorCaught( err ) )
+		{
+			g_Game.TryConnect();
+		}
+		else
+		{
+			if ( g_Game.GetGameState() != DayZGameState.MAIN_MENU )
+			{
+				g_Game.MainMenuLaunch();
+			}
+			else
+			{
+				g_Game.SetLoadState( DayZLoadState.MAIN_MENU_START );
+				g_Game.GamepadCheck();
+			}
+		}
+	}
+	
+	static void OnLoadVoicePrivilege( EBiosError err )
+	{
+		if ( g_Game.GetGameState() == DayZGameState.IN_GAME )
+		{
+			#ifdef PLATFORM_PS4
+			GetGame().GetWorld().DisableReceiveVoN( ErrorCaught( err ) );
+			#endif
+			GetGame().GetWorld().DisableTransmitVoN( ErrorCaught( err ) );
+		}
+	}
+	
+	static void SetSessionHandle( string handle )
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetSessionService().m_CurrentHandle = handle;
+		}
+	}
+	
+	static string GetSessionHandle()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			return m_ClientServices.GetSessionService().m_CurrentHandle;
+		}
+		return "";
+	}
+	
+	static void GetSession()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetSessionService().TryGetSession( GetSessionHandle() );
+		}
+	}
+
+	static BiosUser GetBiosUser()
+	{
+		return m_BiosUser;
+	}
+
+	static void SetBiosUser(BiosUser user)
+	{
+		m_BiosUser = user;
+	}
+
+	
+	static bool GetMultiplayState()
+	{
+		return m_MultiplayState;
+	}
+	
+	static void SetMultiplayState( bool state )
+	{
+		m_MultiplayState = state;
+		bool is_multiplay;
+		if ( ClientData.GetSimplePlayerList() )
+			is_multiplay = state && ( ClientData.GetSimplePlayerList().Count() > 1 );
+
+		if ( m_ClientServices )
+			m_ClientServices.GetSessionService().SetMultiplayState(is_multiplay);
+	}
+	
+	static void EnterGameplaySession()
+	{
+		string addr;
+		int port;
+		if ( GetGame().GetHostAddress( addr, port ) )
+		{
+			GetClientServices();
+			if ( m_ClientServices )
+			{
+				m_ClientServices.GetSessionService().EnterGameplaySessionAsync( addr, port );
+				SetMultiplayState(true);
+			}
+		}
+	}
+	
+	static void LeaveGameplaySession()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			GetServersResultRow currentServerInfo = GetCurrentServerInfo();
+			
+			if ( currentServerInfo )
+				m_ClientServices.GetSessionService().LeaveGameplaySessionAsync(currentServerInfo.m_HostIp, currentServerInfo.m_HostPort);
+			else if ( m_CurrentServerIP != "" )
+				m_ClientServices.GetSessionService().LeaveGameplaySessionAsync(m_CurrentServerIP, m_CurrentServerPort);
+				
+			SetMultiplayState(false);
+			m_FirstFriendsLoad = true;
+			
+			if ( m_FriendsList )
+				m_FriendsList.Clear();
+		}
+	}
+	
+	static void SetGameplayActivity()
+	{
+		string addr;
+		int port;
+		if ( GetGame().GetHostAddress( addr, port ) )
+		{
+			GetClientServices();
+			if ( m_ClientServices )
+			{
+				m_ClientServices.GetSessionService().SetGameplayActivityAsync( addr, port );
+			}
+		}
+	}
+	
+	static void SetPendingInviteList( array<string> invitees )
+	{
+		string addr;
+		int port;
+		if ( GetGame().GetHostAddress( addr, port ) )
+		{
+			GetClientServices();
+			if ( m_ClientServices )
+			{
+				m_PendingInvites = invitees;
+				m_ClientServices.GetSessionService().InviteToGameplaySessionAsync( addr, port, GetPendingInviteList() );
+			}
+		}
+		else
+		{
+			m_PendingInvites = invitees;
+		}
+	}
+	
+	static array<string> GetPendingInviteList()
+	{
+		array<string> already_on_server = ClientData.GetSimplePlayerList();
+		if ( already_on_server && m_PendingInvites )
+		{
+			array<string> new_to_server = new array<string>;
+			foreach ( string invitee : m_PendingInvites )
+			{
+				if ( already_on_server.Find( invitee ) == -1 )
+				{
+					new_to_server.Insert( invitee );
+				}
+			}
+			return new_to_server;
+		}
+		else
+		{
+			return m_PendingInvites;
+		}
+	}
+	
+	static void ClearPendingInviteList( array<string> invitees )
+	{
+		delete m_PendingInvites;
+	}
+	
+	static int m_AutoConnectTries = 0;
+	static void AutoConnectToEmptyServer()
+	{
+		GetClientServices();
+		if ( m_ClientServices && m_AutoConnectTries == 0 )
+		{
+			m_AutoConnectTries = 1;
+			GetFirstServerWithEmptySlotInput input = new GetFirstServerWithEmptySlotInput;
+			input.SetOfficial( true );
+			m_ClientServices.GetLobbyService().GetFirstServerWithEmptySlot( input );
+		}
+	}
+	
+	static GetServersResultRow GetRandomFreeResult( GetFirstServerWithEmptySlotResult results )
+	{
+		GetServersResultRow result;
+		array<ref GetServersResultRow> results_free = new array<ref GetServersResultRow>;
+		
+		if ( results && results.m_Result && results.m_Result.m_Results && results.m_Result.m_Results.Count() > 0 )
+		{
+			foreach ( GetServersResultRow result_temp : results.m_Result.m_Results )
+			{
+				if ( result_temp.m_FreeSlots > 0 )
+				{
+					results_free.Insert( result_temp );
+				}
+			}
+		}
+		
+		return results_free.GetRandomElement();
+	}
+	
+	static void OnAutoConnectToEmptyServer( GetFirstServerWithEmptySlotResult result_list, EBiosError error )
+	{
+		if ( !ErrorCaught( error ) )
+		{
+			GetServersResultRow result = GetRandomFreeResult( result_list );
+			if ( result )
+			{
+				g_Game.ConnectFromServerBrowser( result.m_HostIp, result.m_HostPort );
+				m_AutoConnectTries = 0;
+				return;
+			}
+			else
+			{
+				GetGame().GetUIManager().ShowDialog( "#str_xbox_authentification_fail_title", "#str_xbox_authentification_fail", 232, DBT_OK, DBB_NONE, DMT_INFO, GetGame().GetUIManager().GetMenu() );
+			}
+		}
+		
+		if ( m_AutoConnectTries < 3 )
+		{
+			m_AutoConnectTries++;
+			GetFirstServerWithEmptySlotInput input = new GetFirstServerWithEmptySlotInput;
+			input.SetOfficial( true );
+			m_ClientServices.GetLobbyService().GetFirstServerWithEmptySlot( input );
+		}
+		else
+		{
+			GetGame().GetUIManager().ShowDialog( "#str_xbox_authentification_fail_title", "#xbox_authentification_fail", 232, DBT_OK, DBB_NONE, DMT_INFO, GetGame().GetUIManager().GetMenu() );
+		}
+	}
+	
+	static void GetServerModList( string server_id )
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetLobbyService().GetServerModList( server_id );
+		}
+	}
+	
+	static void OnGetServerModList( GetServerModListResult result_list, EBiosError error )
+	{
+		if ( !ErrorCaught( error ) )
+		{
+			m_ServerModLoadAsyncInvoker.Invoke( result_list );
+		}
+	}
+	
+	static bool IsGameTrial( bool sim )
+	{
+		#ifdef PLATFORM_XBOX
+		#ifndef PLATFORM_WINDOWS
+		if ( m_TrialService )
+			return m_TrialService.IsGameTrial( sim );
+		#endif
+		#endif
+		return false;
+	}
+	
+	static bool IsGameActive( bool sim )
+	{
+		#ifdef PLATFORM_XBOX
+		#ifndef PLATFORM_WINDOWS
+		if ( m_TrialService )
+			return m_TrialService.IsGameActive( sim );
+		#endif
+		#endif
+		return false;
+	}
+	
+	static bool CheckUpdate()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			EBiosError error = m_ClientServices.GetPackageService().CheckUpdateAsync();
+			
+			if ( !error )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	static void PromptUpdate()
+	{
+		GetClientServices();
+		if ( m_ClientServices )
+		{
+			m_ClientServices.GetPackageService().PromptUpdateAsync();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/SyncData.c b/scripts/3_Game/DayZ/Client/SyncData.c
new file mode 100644
index 0000000000000000000000000000000000000000..82b0620a5ad26e40fdf4e5233758af027d2fb7f5
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/SyncData.c
@@ -0,0 +1,6 @@
+class SyncData
+{
+	int m_SyncInt;
+	ref SyncPlayerList m_ServerPlayerList;
+	ref SyncEntityKillInfo m_EntityKill;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/SyncEntityKill.c b/scripts/3_Game/DayZ/Client/SyncEntityKill.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cb862b542ee9b3b15eca6529d785ecacdc98634
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/SyncEntityKill.c
@@ -0,0 +1,7 @@
+class SyncEntityKillInfo
+{
+	EntityAI	m_EntityVictim;
+	EntityAI	m_EntityKiller;
+	EntityAI	m_EntitySource;
+	bool		m_IsHeadShot;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/SyncPlayer.c b/scripts/3_Game/DayZ/Client/SyncPlayer.c
new file mode 100644
index 0000000000000000000000000000000000000000..f281ed433bce7a1949eab2e1a5517b29fd626343
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/SyncPlayer.c
@@ -0,0 +1,12 @@
+class SyncPlayer
+{
+	PlayerIdentity m_Identity;
+
+	//! Keeping for backwards compatability with mods. 
+
+	[NonSerialized()]
+	string m_UID;
+
+	[NonSerialized()]
+	string m_PlayerName;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Client/SyncPlayerList.c b/scripts/3_Game/DayZ/Client/SyncPlayerList.c
new file mode 100644
index 0000000000000000000000000000000000000000..94b8b1a7e3cfbab90a59fce9806929028855821d
--- /dev/null
+++ b/scripts/3_Game/DayZ/Client/SyncPlayerList.c
@@ -0,0 +1,69 @@
+class SyncPlayerList
+{
+	ref array<ref SyncPlayer> m_PlayerList;
+
+	void CreatePlayerList()
+	{
+		if (GetGame().IsServer())
+		{
+			m_PlayerList = new array<ref SyncPlayer>();
+			
+			array<PlayerIdentity> identities = new array<PlayerIdentity>();
+			GetGame().GetPlayerIndentities(identities);
+
+			foreach (auto identity : identities)
+			{
+				SyncPlayer sync_player = new SyncPlayer;
+				sync_player.m_Identity = identity;
+				sync_player.m_UID = identity.GetPlainId();
+				sync_player.m_PlayerName = identity.GetPlainName();
+				m_PlayerList.Insert(sync_player);
+			}
+		}
+	}
+
+	static SyncPlayerList Compare(SyncPlayerList a, SyncPlayerList b)
+	{
+		SyncPlayerList new_list = new SyncPlayerList;
+		new_list.m_PlayerList = new array<ref SyncPlayer>;
+
+		if (!a && b && b.m_PlayerList)
+		{
+			foreach (SyncPlayer player3 : b.m_PlayerList)
+			{
+				new_list.m_PlayerList.Insert(player3);
+			}
+		}
+		else if (a && a.m_PlayerList && !b)
+		{
+			foreach (SyncPlayer player4 : a.m_PlayerList)
+			{
+				new_list.m_PlayerList.Insert(player4);
+			}
+		}
+		else if (a && a.m_PlayerList && b && b.m_PlayerList)
+		{
+			array<ref SyncPlayer> array_a = a.m_PlayerList;
+			array<ref SyncPlayer> array_b = b.m_PlayerList;
+
+			foreach (SyncPlayer player : array_b)
+			{
+				bool found = false;
+				foreach (SyncPlayer player2 : array_a)
+				{
+					if (player.m_UID == player2.m_UID)
+					{
+						found = true;
+						break;
+					}
+				}
+
+				if (!found)
+				{
+					new_list.m_PlayerList.Insert(player);
+				}
+			}
+		}
+		return new_list;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Colors.c b/scripts/3_Game/DayZ/Colors.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2a2fe05319a0bdfd1657a7c21145768207d6ed4
--- /dev/null
+++ b/scripts/3_Game/DayZ/Colors.c
@@ -0,0 +1,61 @@
+//color values and names taken from https://en.wikipedia.org/wiki/X11_color_names
+
+class Colors
+{
+	const int RED					= 0xFF0000;
+	const int CYAN					= 0x00FFFF;
+	const int GRAY					= 0xBEBEBE;
+	const int GREEN					= 0x00FF00;
+	const int PURPLE				= 0xA020F0;
+	const int YELLOW				= 0xFFFF00;
+	const int ORANGE				= 0xFFA500;
+	const int BLUE					= 0x0000FF;
+	const int BLACK					= 0x000000;
+	const int BROWN					= 0xA52A2A;
+	const int WHITE					= 0xFFFFFF;
+	const int WHITEGRAY				= 0xA0A1A1;
+	
+	const int COLOR_DEFAULT			= 0x64000000;
+
+	const int COLOR_RUINED			= 0x00FF0000;
+	const int COLOR_BADLY_DAMAGED	= 0x00FFBF00;
+	const int COLOR_DAMAGED			= 0x00FFFF00;
+	const int COLOR_WORN			= 0x00BFFF00;
+	const int COLOR_PRISTINE		= 0x0040FF00;
+
+	const int COLOR_DRENCHED		= 0x000000FF;
+	const int COLOR_SOAKING_WET 	= 0x003030FF;
+	const int COLOR_WET 			= 0x006060FF;
+	const int COLOR_DAMP 			= 0x009090FF;
+
+	const int COLOR_LIQUID 			= 0x0000EEFF;
+	
+	const int COLOR_RAW				= 0x00BF4242;
+	const int COLOR_BAKED			= 0x00A56D28;
+	const int COLOR_BOILED			= 0x00AF9442;
+	const int COLOR_DRIED			= 0x00FFEB48;
+	const int COLOR_BURNED			= 0x00888888;
+	const int COLOR_ROTTEN			= 0x00A93F15;
+	
+	const int COLOR_DAYZ_RED 				= 0xffd70d11;
+	const int COLOR_DAYZ_DARK_BLUE 			= 0xff13151b;
+	const int COLOR_DAYZ_SMOKY_BLUE 		= 0xff262a33;
+	const int COLOR_DAYZ_WHITE_BLUE 		= 0xfff9fcfe;
+	const int COLOR_DAYZ_LIGHT_SHADE 		= 0xff7d7f85;
+	const int COLOR_DAYZ_WASHOUT 			= 0xffcfd2d6;
+	
+	const int COLOR_LIVONIA_EMERALD_GREEN 	= 0xff4a8765;
+	const int COLOR_LIVONIA_FOREST_GREEN 	= 0xff47533e;
+	const int COLOR_LIVONIA_DARK_GREEN 		= 0xff1c2118;
+	const int COLOR_LIVONIA_BLACK_GREEN 	= 0xff0b100a;
+	const int COLOR_LIVONIA_OLIVE 			= 0xff8e8045;
+}
+
+class FadeColors
+{
+	const int WHITE			= 0xFFFFFFFF;
+	const int LIGHT_GREY	= 0xFFD7D7D7;
+	const int BLACK 		= 0xFF000000;
+	const int RED 			= 0xFFFF0000;
+	const int DARK_RED 		= 0xFF3f0000;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/ControlSchemeManager.c b/scripts/3_Game/DayZ/ControlSchemeManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..b90a17d987c1cd92887c5942b5ed785535215172
--- /dev/null
+++ b/scripts/3_Game/DayZ/ControlSchemeManager.c
@@ -0,0 +1,8 @@
+class ControlSchemeManager
+{
+	//! leaving it here in case that someone using it inside a mod
+	static void SetControlScheme( EControlSchemeState state )
+	{
+		return;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/DamageSystem.c b/scripts/3_Game/DayZ/DamageSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..23ec7abfdce4a361e7ae2956335e735969c47a0a
--- /dev/null
+++ b/scripts/3_Game/DayZ/DamageSystem.c
@@ -0,0 +1,157 @@
+class TotalDamageResult: Managed
+{
+	proto native float GetDamage(string zoneName, string healthType);
+	proto native float GetHighestDamage(string healthType);
+};
+
+//-----------------------------------------------------------------------------
+
+//! exposed from C++ (do not change)
+enum DamageType
+{
+	CLOSE_COMBAT,	// 0
+	FIRE_ARM,		// 1
+	EXPLOSION,
+	STUN,
+	CUSTOM
+}
+
+//-----------------------------------------------------------------------------
+class DamageSystem
+{
+	static proto native void CloseCombatDamage(EntityAI source, Object targetObject, int targetComponentIndex, string ammoTypeName, vector worldPos, int directDamageFlags = ProcessDirectDamageFlags.ALL_TRANSFER);
+	static proto native void CloseCombatDamageName(EntityAI source, Object targetObject, string targetComponentName, string ammoTypeName, vector worldPos, int directDamageFlags = ProcessDirectDamageFlags.ALL_TRANSFER);
+
+	static proto native void ExplosionDamage(EntityAI source, Object directHitObject, string ammoTypeName, vector worldPos, int damageType);
+	
+	static bool GetDamageZoneMap(EntityAI entity, out DamageZoneMap zoneMap)
+	{
+		string path_base;
+		string path;
+		
+		if (entity.IsWeapon())
+		{
+			path_base = CFG_WEAPONSPATH;
+		}
+		else if (entity.IsMagazine())
+		{
+			path_base = CFG_MAGAZINESPATH;
+		}
+		else
+		{
+			path_base = CFG_VEHICLESPATH;
+		}
+		
+		path_base = string.Format("%1 %2 DamageSystem DamageZones", path_base, entity.GetType());
+		
+		if (!GetGame().ConfigIsExisting(path_base))
+		{
+			return false;
+		}
+		else
+		{
+			string zone;
+			array<string> zone_names = new array<string>;
+			array<string> component_names;
+			
+			entity.GetDamageZones(zone_names);
+			for (int i = 0; i < zone_names.Count(); i++)
+			{
+				component_names = new array<string>;
+				zone = zone_names.Get(i);
+				
+				path =  string.Format("%1 %2 componentNames ", path_base, zone);
+				if (GetGame().ConfigIsExisting(path))
+				{
+					GetGame().ConfigGetTextArray(path,component_names);
+				}
+				zoneMap.Insert(zone,component_names);
+			}
+			
+			return true;
+		}
+	}
+	
+	//! Returns damage zone to which the named component belongs
+	static bool  GetDamageZoneFromComponentName(notnull EntityAI entity, string component, out string damageZone)
+	{
+		DamageZoneMap zoneMap = entity.GetEntityDamageZoneMap();
+		array<array<string>> components;
+		components = zoneMap.GetValueArray();
+		for (int i = 0; i < components.Count(); i++)
+		{
+			array<string> inner = components.Get(i);
+			for (int j = 0; j < inner.Count(); j++)
+			{
+				string innerComponentName = inner.Get(j);
+				innerComponentName.ToLower();
+				
+				//We don't have a component name, no need to proceed
+				if ( innerComponentName == "" )
+					break;
+				
+				if (innerComponentName == component)
+				{
+					damageZone = zoneMap.GetKey(i);
+					return true;
+				}
+			}
+		}
+		damageZone = "";
+		return false;
+	}
+	
+	static bool GetComponentNamesFromDamageZone(notnull EntityAI entity, string damageZone, out array<string> componentNames)
+	{
+		string path;
+		
+		if (entity.IsWeapon())
+		{
+			path = CFG_WEAPONSPATH;
+		}
+		else if (entity.IsMagazine())
+		{
+			path = CFG_MAGAZINESPATH;
+		}
+		else
+		{
+			path = CFG_VEHICLESPATH;
+		}
+		
+		path = string.Format("%1 %2 DamageSystem DamageZones %3 componentNames", path, entity.GetType(), damageZone);
+		if (GetGame().ConfigIsExisting(path))
+		{
+			GetGame().ConfigGetTextArray(path,componentNames);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	static string GetDamageDisplayName(EntityAI entity, string zone)
+	{
+		string component_name;
+		entity.GetEntityDamageDisplayNameMap().Find(zone.Hash(), component_name);
+		component_name = Widget.TranslateString(component_name);
+		return component_name;
+	}
+	
+	static void ResetAllZones(EntityAI entity)
+	{
+		DamageZoneMap zonesMap = new DamageZoneMap();
+		DamageSystem.GetDamageZoneMap(entity, zonesMap);
+		array<string> zones = zonesMap.GetKeyArray();
+		entity.SetHealth("", "Health", entity.GetMaxHealth("","Health"));
+		entity.SetHealth("", "Shock", entity.GetMaxHealth("","Shock"));
+		entity.SetHealth("", "Blood", entity.GetMaxHealth("","Blood"));
+		
+		foreach (string zone : zones)
+		{
+			entity.SetHealth(zone, "Health", entity.GetMaxHealth(zone,"Health"));
+			entity.SetHealth(zone, "Shock", entity.GetMaxHealth(zone,"Shock"));
+			entity.SetHealth(zone, "Blood", entity.GetMaxHealth(zone,"Blood"));
+		}	
+	}
+}
+
+typedef map<string,ref array<string>> DamageZoneMap; //<zone_name,<components>>
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/DayZAnimEventMaps.c b/scripts/3_Game/DayZ/DayZAnimEventMaps.c
new file mode 100644
index 0000000000000000000000000000000000000000..647f8cf2541641ccc1a90c97eb48352ed244ab14
--- /dev/null
+++ b/scripts/3_Game/DayZ/DayZAnimEventMaps.c
@@ -0,0 +1,238 @@
+//individual sound table consisting of map of parameter hashes as keys and soundbuilder array as values
+class SoundLookupTable
+{
+	void SoundLookupTable()
+	{
+		m_soundBuilders = new map<int, ref array<SoundObjectBuilder>>();
+	}
+	
+	void InitTable(string tableCategoryName, string parameterName)
+	{
+		m_tableCategoryName = tableCategoryName;
+		m_parameterName = parameterName;
+	}
+	
+	void LoadTable(string soundLookupTableName)
+	{
+		string path = "CfgSoundTables " + m_tableCategoryName + " " + soundLookupTableName;
+		
+		//load all classes names
+		int soundCount = GetGame().ConfigGetChildrenCount(path);
+
+		for(int i = 0; i < soundCount; i++)
+		{
+			string soundClassName;
+			GetGame().ConfigGetChildName(path, i, soundClassName);
+			string soundClassPath = path + " " + soundClassName + " ";
+
+			string parameter;
+			GetGame().ConfigGetText(soundClassPath + m_parameterName, parameter);
+
+			array<string> soundSetNames = new array<string>;
+			GetGame().ConfigGetTextArray(soundClassPath + "soundSets", soundSetNames);
+
+			//TODO create SoundObject for every entry, save in Game?
+			array<SoundObjectBuilder> soundObjectBuilders = new array<SoundObjectBuilder>;
+			for(int j = 0; j < soundSetNames.Count(); j++)
+			{
+				AnimSoundObjectBuilderBank bank = AnimSoundObjectBuilderBank.GetInstance();
+				SoundObjectBuilder soundObjectBuilder = bank.GetBuilder(soundSetNames.Get(j));
+
+				if(soundObjectBuilder != NULL)
+					soundObjectBuilders.Insert(soundObjectBuilder);
+			}
+
+			if(soundObjectBuilders.Count() > 0)
+			{
+				//Print("SoundLookupTable::LoadTable: path: " + path + " param:" + parameter + " param#:" + parameter.Hash() + " objBuildersCount: " + soundObjectBuilders.Count());
+				m_soundBuilders.Insert(parameter.Hash(), soundObjectBuilders);
+			}
+		}
+	}
+	
+	SoundObjectBuilder GetSoundBuilder(int parameterHash)
+	{
+		array<SoundObjectBuilder> soundObjects = m_soundBuilders.Get(parameterHash);
+
+		if(soundObjects == NULL || soundObjects.Count() == 0)
+		{
+			return NULL;
+		}
+		else if (soundObjects.Count() == 1)
+		{
+			return soundObjects.Get(0);
+		}
+		else
+		{
+			int index = Math.RandomInt(0, soundObjects.Count());
+			return soundObjects.Get(index);
+		}
+	}
+	
+	
+	private string m_tableCategoryName;
+	private string m_parameterName;
+	private ref map<int, ref array<SoundObjectBuilder>> m_soundBuilders;
+}
+
+
+class StepSoundLookupTable extends SoundLookupTable
+{
+	void StepSoundLookupTable()
+	{
+		InitTable("CfgStepSoundTables", "surface");
+	}
+}
+
+class AttachmentSoundLookupTable extends SoundLookupTable
+{
+	void AttachmentSoundLookupTable()
+	{
+		InitTable("CfgAttachmentSoundTables", "category");
+	}
+}
+
+class PlayerVoiceLookupTable extends SoundLookupTable
+{
+	ref NoiseParams m_NoiseParams;
+	
+	void PlayerVoiceLookupTable()
+	{
+		InitTable("CfgVoiceSoundTables", "category");
+	}
+	
+	void SetNoiseParam(NoiseParams param)
+	{
+		m_NoiseParams = param;
+	}
+	
+	NoiseParams GetNoiseParam()
+	{
+		return m_NoiseParams;
+	}
+}
+
+
+class ImpactSoundLookupTable extends SoundLookupTable
+{
+	void ImpactSoundLookupTable()
+	{
+		InitTable("CfgImpactSoundTables", "surface");
+	}
+}
+
+class ActionSoundLookupTable extends SoundLookupTable
+{
+	void ActionSoundLookupTable()
+	{
+		InitTable("CfgActionsSoundTables", "category");
+	}
+}
+
+
+class AnimSoundObjectBuilderBank
+{
+	void AnimSoundObjectBuilderBank()
+	{
+		m_pBuilders = new map<int, ref SoundObjectBuilder>();
+	}
+
+
+	static AnimSoundObjectBuilderBank GetInstance()
+	{
+		if(m_instance == NULL)
+			m_instance = new AnimSoundObjectBuilderBank();
+
+		return m_instance;
+	}
+
+
+	SoundObjectBuilder GetBuilder(string soundSetName)
+	{
+		int soundSetNameHash = soundSetName.Hash();
+
+		SoundObjectBuilder builder = m_pBuilders.Get(soundSetNameHash);
+		if(builder == NULL)
+		{
+			SoundParams params = new SoundParams(soundSetName);
+			if(params.IsValid())
+			{
+				builder = new SoundObjectBuilder(params);
+				m_pBuilders.Insert(soundSetNameHash, builder);
+			}
+			else
+			{
+				Print("AnimSoundObjectBuilderBank: Invalid sound set \"" + soundSetName + "\".");
+				return NULL;
+			}
+		}
+		return builder;
+	}
+
+	private static ref AnimSoundObjectBuilderBank m_instance;
+	private autoptr map<int, ref SoundObjectBuilder> m_pBuilders;
+}
+
+
+class AnimSoundLookupTableBank
+{
+	void AnimSoundLookupTableBank()
+	{
+		m_pTables = new map<int, ref SoundLookupTable>();
+	}
+
+
+	static AnimSoundLookupTableBank GetInstance()
+	{
+		if(m_instance == NULL)
+			m_instance = new AnimSoundLookupTableBank();
+
+		return m_instance;
+	}
+
+
+	SoundLookupTable GetStepTable(string tableName)
+	{
+		int tableNameHash = tableName.Hash();
+
+		SoundLookupTable table = m_pTables.Get(tableNameHash);
+		if(table == NULL)
+		{
+			table = new StepSoundLookupTable();
+			table.LoadTable(tableName);
+			m_pTables.Insert(tableNameHash, table);
+		}
+		return table;
+	}
+	
+	SoundLookupTable GetImpactTable(string tableName)
+	{
+		int tableNameHash = tableName.Hash();
+
+		SoundLookupTable table = m_pTables.Get(tableNameHash);
+		if(table == NULL)
+		{
+			table = new ImpactSoundLookupTable();
+			table.LoadTable(tableName);
+			m_pTables.Insert(tableNameHash, table);
+		}
+		return table;
+	}
+	
+	SoundLookupTable GetActionTable(string tableName)
+	{
+		int tableNameHash = tableName.Hash();
+
+		SoundLookupTable table = m_pTables.Get(tableNameHash);
+		if(table == NULL)
+		{
+			table = new ActionSoundLookupTable();
+			table.LoadTable(tableName);
+			m_pTables.Insert(tableNameHash, table);
+		}
+		return table;
+	}
+
+	private static ref AnimSoundLookupTableBank m_instance;
+	private autoptr map<int, ref SoundLookupTable> m_pTables;
+}
diff --git a/scripts/3_Game/DayZ/DayZAnimEvents.c b/scripts/3_Game/DayZ/DayZAnimEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..9a245ff7e3d4dde220e0cb20e4602c93da4aa742
--- /dev/null
+++ b/scripts/3_Game/DayZ/DayZAnimEvents.c
@@ -0,0 +1,366 @@
+/*enum AnimSurfaces
+{
+	cp_concrete1,
+	cp_concrete2,
+
+	cp_dirt,
+
+	cp_broadleaf_dense1,
+	cp_broadleaf_dense2,
+	cp_broadleaf_sparse1,
+	cp_broadleaf_sparse2,
+
+	cp_conifer_common1,
+	cp_conifer_common2,
+	cp_conifer_moss1,
+	cp_conifer_moss2,
+
+	cp_grass,
+	cp_grass_tall,
+
+	cp_gravel,
+	cp_rock,
+
+	asphalt_ext,
+	asphalt_int,
+
+	asphalt_destroyed_ext,
+	asphalt_destroyed_int,
+
+	concrete_ext,
+	concrete_int,
+
+	stone_ext,
+	stone_int,
+
+	gravel_large_ext,
+	gravel_large_int,
+
+	gravel_small_ext,
+	gravel_small_int,
+
+	sand_ext,
+	sand_int,
+
+	dirt_ext,
+	dirt_int,
+
+	rubble_large_ext,
+	rubble_large_int,
+
+	rubble_small_ext,
+	rubble_small_int,
+
+	trash_ext,
+	trash_int,
+
+	grass_dry_ext,
+	grass_dry_int,
+
+	metal_thick_ext,
+	metal_thick_int,
+
+	metal_thin_ext,
+	metal_thin_int,
+
+	metal_thin_mesh_ext,
+	metal_thin_mesh_int,
+
+	asphalt_felt_ext,
+	asphalt_felt_int,
+
+	ceramic_tiles_ext,
+	ceramic_tiles_int,
+
+	lino_ext,
+	lino_int,
+
+	textile_carpet_ext,
+	textile_carpet_int,
+
+	wood_parquet_ext,
+	wood_parquet_int,
+
+	wood_planks_ext,
+	wood_planks_int,
+
+	concrete_stairs_ext,
+	concrete_stairs_int,
+
+	metal_stairs_ext,
+	metal_stairs_int,
+
+	wood_planks_stairs_ext,
+	wood_planks_stairs_int
+}*/
+
+enum AnimBootsType
+{
+	None,
+	Sneakers,
+	Boots
+}
+
+enum AnimUpperBodyType
+{
+	None 				= 4107064,//string hash, because we can't make compile time constant
+	NylonJacket			= 1228024514,
+	TShirt				= 1690896446,
+	WoolShirt			= 1060939383,
+	HeavyJacket			= 1544363355,
+	LeatherJacket		= 2008520095,
+	Coat				= 3549415,
+	ChemlonDress		= -1491825621,
+	Ghillie				= 602194810,
+	Chainmail			= -563873622,
+}
+
+enum AnimBackType
+{
+	None 				= -1,
+	Small 				= 161213437,
+	Military 			= 1935514591,
+	Outdoor				= 574855932,
+	Ghillie				= 602194810
+}
+
+enum AnimRangedWeaponType
+{
+	None 		= 5727960,
+	Rifle 		= 219116654,
+	Shotgun 	= 1836650908
+}
+
+class AnimSoundEvent
+{
+	int m_iID;
+	ref SoundObjectBuilder 			m_SoundObjectBuilder;
+	ref SoundParams 				m_SoundParams;
+	autoptr NoiseParams 			m_NoiseParams;
+	bool 							m_IsValid = false;
+	SoundLookupTable 				m_Table;
+	
+	
+	void AnimSoundEvent(string soundPath)
+	{
+		m_iID = GetGame().ConfigGetInt(soundPath + "id");
+
+		#ifndef SERVER
+
+		string soundSetName;
+		if (GetGame().ConfigGetText(soundPath + "soundSet", soundSetName))
+		{
+			m_SoundParams = new SoundParams(soundSetName);
+			if (m_SoundParams.IsValid())
+			{
+				m_SoundObjectBuilder = new SoundObjectBuilder(m_SoundParams);
+				m_IsValid = true;
+			}
+		}
+		
+		string tableName;
+		if (GetGame().ConfigGetText(soundPath + "soundLookupTable", tableName))
+		{
+			m_Table = AnimSoundLookupTableBank.GetInstance().GetActionTable(tableName);
+			if (m_Table)
+			{
+				m_IsValid = true;
+				//Print("Found lookup table '"+tableName +"' for anim event-----------------------------------------> " + m_iID);
+			}
+		}
+		#endif
+
+		
+		
+		
+		if ( GetGame().IsServer() )
+		{
+			string noiseName;
+			if (GetGame().ConfigGetText(soundPath + "noise", noiseName))
+			{
+				m_NoiseParams = new NoiseParams();
+				m_NoiseParams.Load(noiseName);
+				m_IsValid = true;
+			}
+			else
+			{
+				//Print("AnimSoundEvent: \"" + soundPath + "\" doesn't have defined \"noise\"");
+			}
+		}
+	}
+	
+	bool IsValid()
+	{
+		return m_IsValid;
+	}
+	
+	SoundObjectBuilder GetSoundBuilder()
+	{
+		return m_SoundObjectBuilder;
+	}
+	
+	SoundObjectBuilder GetSoundBuilderEx(int paramHash = 0)
+	{
+		if (m_Table && paramHash)
+		{
+			return m_Table.GetSoundBuilder(paramHash);
+		}
+		return m_SoundObjectBuilder;
+	}
+
+	SoundObject GetSoundObject(vector position)
+	{
+		GetSoundBuilderEx().AddEnvSoundVariables(position);
+		return GetSoundBuilderEx().BuildSoundObject();
+	}
+}
+
+class AnimSoundVoiceEvent
+{
+	int m_iID;
+	ref SoundObjectBuilder m_SoundObjectBuilder;
+	ref SoundParams m_SoundParams;
+	autoptr NoiseParams m_NoiseParams;
+	bool m_IsValid = false;
+
+	void AnimSoundVoiceEvent(string soundPath)
+	{
+		m_iID = GetGame().ConfigGetInt(soundPath + "id");
+
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			string soundSetName;
+			GetGame().ConfigGetText(soundPath + "soundSet", soundSetName);
+			m_SoundParams = new SoundParams(soundSetName);
+			if ( m_SoundParams.IsValid() )
+			{
+				m_SoundObjectBuilder = new SoundObjectBuilder(m_SoundParams);
+				m_IsValid = true;
+			}
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			string noiseName;
+			if (GetGame().ConfigGetText(soundPath + "noise", noiseName))
+			{
+				m_NoiseParams = new NoiseParams();
+				m_NoiseParams.Load(noiseName);
+				m_IsValid = true;
+			}
+			else
+			{
+				//Print("AnimSoundVoiceEvent: \"" + soundPath + "\" doesn't have defined \"noise\"");
+			}
+		}
+	}
+	
+	bool IsValid()
+	{
+		return m_IsValid;
+	}
+	
+	SoundObjectBuilder GetSoundBuilder()
+	{
+		return m_SoundObjectBuilder;
+	}
+
+	SoundObject GetSoundObject(vector position)
+	{
+		m_SoundObjectBuilder.AddEnvSoundVariables(position);
+		return m_SoundObjectBuilder.BuildSoundObject();
+	}
+}
+
+class AnimStepEvent
+{
+	int m_iID;
+	string m_sSoundLookupTableName;
+	StepSoundLookupTable m_soundLookupTable;
+	autoptr NoiseParams m_NoiseParams;
+
+	void AnimStepEvent(string stepPath)
+	{
+		m_iID = GetGame().ConfigGetInt(stepPath + "id");
+
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			GetGame().ConfigGetText(stepPath + "soundLookupTable", m_sSoundLookupTableName);
+			m_soundLookupTable = StepSoundLookupTable.Cast( AnimSoundLookupTableBank.GetInstance().GetStepTable(m_sSoundLookupTableName) );
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			string noiseName;
+			if (GetGame().ConfigGetText(stepPath + "noise",noiseName))
+			{
+				m_NoiseParams = new NoiseParams();
+				m_NoiseParams.Load(noiseName);
+			}
+		}
+	}
+	
+	SoundObjectBuilder GetSoundBuilder(int surfaceHash)
+	{
+		return m_soundLookupTable.GetSoundBuilder(surfaceHash);
+	}
+}
+
+class AnimDamageEvent
+{
+	int m_iID;
+	autoptr AnimDamageParams m_DamageParams;
+
+	void AnimDamageEvent(string damagePath)
+	{
+		m_iID = GetGame().ConfigGetInt(damagePath + "id");
+		
+		string damageName;
+		GetGame().ConfigGetText(damagePath + "damage", damageName);
+		m_DamageParams = new AnimDamageParams(damageName);
+	}
+}
+
+class AnimDamageParams
+{
+	string m_sName;
+	string m_sBoneName;
+	string m_sAmmoName;	
+	float m_fRadius;
+	float m_fDuration;
+	bool m_bInvertTeams;
+
+	static const string DAMAGE_CFG_CLASS = "CfgDamages ";
+	void AnimDamageParams(string damageName)
+	{
+		m_sName = damageName;
+		string damagePath = DAMAGE_CFG_CLASS + damageName + " ";
+
+		GetGame().ConfigGetText(damagePath + "bone", m_sBoneName);
+		GetGame().ConfigGetText(damagePath + "ammo", m_sAmmoName);
+		m_fRadius = GetGame().ConfigGetFloat(damagePath + "radius");
+		m_fDuration = GetGame().ConfigGetFloat(damagePath + "duration");
+		
+		m_bInvertTeams = false;
+		string str_invert_teams_cfg;
+		GetGame().ConfigGetText(damagePath + "invertTeams", str_invert_teams_cfg);
+		str_invert_teams_cfg.ToLower();
+		if (str_invert_teams_cfg == "true")
+		{
+			m_bInvertTeams = true;
+		}
+	}
+}
+
+class AnimEffectParams
+{
+	string m_sName;
+
+	static const string EFFECT_CFG_CLASS = "CfgEffects ";
+	void AnimEffectParams(string effectName)
+	{
+		m_sName = effectName;
+		string effectPath = EFFECT_CFG_CLASS + effectName + " ";
+		//TODO load params
+	}
+}
diff --git a/scripts/3_Game/DayZ/DayZCreature.c b/scripts/3_Game/DayZ/DayZCreature.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d3f38a10897ff8d32f43141f571870c110579ea
--- /dev/null
+++ b/scripts/3_Game/DayZ/DayZCreature.c
@@ -0,0 +1,6 @@
+enum DayZCreatureAnimScriptDebugVarType
+{
+	INT,
+	FLOAT,
+	BOOL,
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/DayZCreatureAI.c b/scripts/3_Game/DayZ/DayZCreatureAI.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d6020ed9b2f06cb0d0d2338c6d758c6fcdf9f0a
--- /dev/null
+++ b/scripts/3_Game/DayZ/DayZCreatureAI.c
@@ -0,0 +1,4 @@
+enum DayZCreatureAIConstants
+{
+	DEBUG_SHOWDEBUGPLUGIN
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/DayZGame.c b/scripts/3_Game/DayZ/DayZGame.c
new file mode 100644
index 0000000000000000000000000000000000000000..50d93b1092e45d8f2740864bf421f6dbdfa97efa
--- /dev/null
+++ b/scripts/3_Game/DayZ/DayZGame.c
@@ -0,0 +1,3732 @@
+enum DisconnectSessionFlags
+{
+	NONE = 0,
+	JOIN_ERROR_ENABLED = 1,
+	JOIN_ERROR_CHECK = 2,
+	DISCONNECT_ERROR_ENABLED = 4,
+	SELECT_USER = 8,
+	CLOSE_MENUS = 16,
+	IGNORE_WHEN_IN_GAME = 32,
+	ALWAYS_FORCE = 64,
+}
+
+const int DISCONNECT_SESSION_FLAGS_FORCE = int.MAX & ~DisconnectSessionFlags.IGNORE_WHEN_IN_GAME;
+const int DISCONNECT_SESSION_FLAGS_JOIN = int.MAX & ~DisconnectSessionFlags.JOIN_ERROR_CHECK;
+const int DISCONNECT_SESSION_FLAGS_ALL = int.MAX;
+
+class ProjectileStoppedInfo : Managed
+{
+	proto native Object GetSource();
+	proto native vector GetPos();
+	proto native vector GetInVelocity();
+	proto native string GetAmmoType();
+	proto native float GetProjectileDamage();
+}
+
+class CollisionInfoBase: ProjectileStoppedInfo
+{
+	proto native vector GetSurfNormal();
+}
+
+class ObjectCollisionInfo: CollisionInfoBase
+{
+	proto native Object GetHitObj();
+	proto native vector GetHitObjPos();
+	proto native vector GetHitObjRot();
+	proto native int GetComponentIndex();
+}
+
+class TerrainCollisionInfo: CollisionInfoBase
+{
+	proto native bool GetIsWater();
+}
+
+class CrashSoundSets
+{
+	static ref map<int, string> m_Mappings = new map<int, string>;
+	
+	static void RegisterSoundSet(string sound_set)
+	{
+		m_Mappings.Set(sound_set.Hash(), sound_set);
+	}
+	
+	static string GetSoundSetByHash(int hash)
+	{
+		string sound_set;
+		if (m_Mappings)
+			m_Mappings.Find(hash,sound_set);
+		return sound_set;
+	}
+};
+
+
+class LoginScreenBase extends UIScriptedMenu
+{
+	protected ref UiHintPanelLoading m_HintPanel;
+	protected bool m_IsStatic;
+	protected float m_HintTimeAccu;
+	
+	override void Update(float timeslice)
+	{
+		if (m_HintPanel)
+		{
+			m_HintTimeAccu += timeslice;
+			if (CanChangeHintPage(m_HintTimeAccu))
+			{
+				m_HintPanel.ShowRandomPage();
+				m_HintTimeAccu = 0;
+			}
+		}
+		
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Leave();
+		}
+	}
+	
+	protected void Leave()
+	{
+		g_Game.SetGameState(DayZGameState.MAIN_MENU);
+		g_Game.SetLoadState(DayZLoadState.MAIN_MENU_START);
+		
+		g_Game.GetCallQueue(CALL_CATEGORY_SYSTEM).Call(GetGame().DisconnectSessionForce);
+		
+		Close();
+	}
+	
+	protected bool CanChangeHintPage(float timeAccu);
+	
+	bool IsStatic()
+	{
+		return m_IsStatic;
+	}
+}
+
+class LoginQueueBase extends LoginScreenBase
+{
+	protected TextWidget m_txtPosition;
+	protected TextWidget m_txtNote;
+	protected ButtonWidget m_btnLeave;
+	protected int m_iPosition = -1;
+	
+	void LoginQueueBase()
+	{		
+		g_Game.SetKeyboardHandle(this);	
+	}
+
+	void ~LoginQueueBase()
+	{
+		g_Game.SetKeyboardHandle(NULL);	
+	}
+	
+	override Widget Init()
+	{		
+		layoutRoot 		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/dialog_queue_position.layout");
+		m_HintPanel	= new UiHintPanelLoading(layoutRoot.FindAnyWidget("hint_frame0"));
+		m_txtPosition	= TextWidget.Cast(layoutRoot.FindAnyWidget("txtPosition"));
+		m_txtNote 		= TextWidget.Cast(layoutRoot.FindAnyWidget("txtNote"));
+		m_btnLeave 		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btnLeave"));
+		m_txtNote.Show(true);
+		layoutRoot.FindAnyWidget("notification_root").Show(false);
+		
+		#ifdef PLATFORM_CONSOLE
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(true);
+		RichTextWidget toolbar_b = RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		toolbar_b.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		#ifdef PLATFORM_XBOX
+		#ifdef BUILD_EXPERIMENTAL
+		layoutRoot.FindAnyWidget("notification_root").Show(true);
+		#endif
+		#endif
+		#endif
+
+		return layoutRoot;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		if (w == m_btnLeave)
+		{
+			Leave();
+			return true;
+		}
+		return false;
+	}
+	
+	void Show()
+	{
+		if (layoutRoot)
+		{
+			layoutRoot.Show(true);
+		}
+	}
+	
+	void Hide()
+	{
+		if (layoutRoot)
+			layoutRoot.Show(false);
+		m_HintPanel = null;
+	}
+	
+	void SetPosition(int position)
+	{
+		if (position != m_iPosition)
+		{
+			m_iPosition = position;
+			m_txtPosition.SetText(position.ToString());
+		}
+	}
+	
+	override protected bool CanChangeHintPage(float timeAccu)
+	{
+		return timeAccu >= GameConstants.LOADING_SCREEN_HINT_INTERVAL;
+	}
+};
+
+
+//! LoginQueue position when using -connect since mission is not created yet 
+class LoginQueueStatic extends LoginQueueBase
+{
+	void LoginQueueStatic()
+	{
+		Init();
+		
+		m_IsStatic = true;
+	}
+};
+
+class LoginTimeBase extends LoginScreenBase
+{
+	protected TextWidget m_txtDescription;
+	protected TextWidget m_txtLabel;
+	protected ButtonWidget m_btnLeave;
+	
+	protected bool m_IsRespawn;
+	
+	private ref FullTimeData m_FullTime;
+	
+	void LoginTimeBase()
+	{
+		g_Game.SetKeyboardHandle(this);
+		m_IsRespawn = false;
+		
+		m_FullTime = new FullTimeData();
+	}
+
+	void ~LoginTimeBase()
+	{
+		if (g_Game)
+			g_Game.SetKeyboardHandle(null);
+		m_FullTime = null;
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot 			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/dialog_login_time.layout");
+		
+		m_txtDescription 	= TextWidget.Cast(layoutRoot.FindAnyWidget("txtDescription"));
+		m_txtLabel 			= TextWidget.Cast(layoutRoot.FindAnyWidget("txtLabel"));
+		m_btnLeave 			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btnLeave"));
+		m_txtDescription.Show(true);
+		layoutRoot.FindAnyWidget("notification_root").Show(false);
+		
+		#ifdef PLATFORM_CONSOLE
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(true);
+		RichTextWidget toolbar_b = RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		toolbar_b.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		#ifdef PLATFORM_XBOX
+		#ifdef BUILD_EXPERIMENTAL
+		layoutRoot.FindAnyWidget("notification_root").Show(true);
+		#endif
+		#endif
+		#endif
+
+		return layoutRoot;
+	}
+		
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		if (w == m_btnLeave)
+		{
+			Leave();
+			return true;
+		}
+		return false;
+	}
+		
+	void Show()
+	{
+		if (layoutRoot)
+		{
+			layoutRoot.Show(true);
+			m_HintPanel	= new UiHintPanelLoading(layoutRoot.FindAnyWidget("hint_frame0"));
+		}
+	}
+	
+	void Hide()
+	{
+		if (layoutRoot)
+			layoutRoot.Show(false);
+		m_HintPanel = null;
+	}
+	
+	void SetTime(int time)
+	{
+		string text = "";
+		TimeConversions.ConvertSecondsToFullTime(time, m_FullTime);
+		if (!m_IsRespawn)
+			text = "#menu_loading_in_";
+		else
+			text = "#dayz_game_spawning_in_";
+		
+		if (m_FullTime.m_Days > 0)
+			text += "dhms";
+		else if (m_FullTime.m_Hours > 0)
+			text += "hms";
+		else if (m_FullTime.m_Minutes > 0)
+			text += "ms";
+		else
+			text += "s";
+		
+		text = Widget.TranslateString(text);
+		text = string.Format(text, m_FullTime.m_Seconds, m_FullTime.m_Minutes, m_FullTime.m_Hours, m_FullTime.m_Days);
+		m_txtLabel.SetText(text);
+		
+		if (m_IsRespawn && time <= 1)
+			GetGame().SetLoginTimerFinished();
+	}
+		
+	void SetStatus(string status)
+	{
+		m_txtDescription.SetText(status);
+	}
+	
+	void SetRespawn(bool value)
+	{
+		m_IsRespawn = value;
+	}
+	
+	bool IsRespawn()
+	{
+		return m_IsRespawn;
+	}
+	
+	override protected bool CanChangeHintPage(float timeAccu)
+	{
+		return timeAccu >= GameConstants.LOADING_SCREEN_HINT_INTERVAL && m_FullTime.m_Seconds >= GameConstants.LOADING_SCREEN_HINT_INTERVAL_MIN;
+	}
+};
+
+//! LoginTime when using -connect since mission is not created yet 
+class LoginTimeStatic extends LoginTimeBase
+{
+	void LoginTimeStatic()
+	{
+		Init();
+		
+		m_IsStatic = true;
+	}
+	
+	void ~LoginTimeStatic()
+	{
+	}
+};
+
+
+
+class ConnectionLost
+{
+	private ref Widget m_WidgetRoot;
+	private TextWidget m_TextWidgetTitle;
+	private float m_duration;
+		
+	void ConnectionLost(DayZGame game)
+	{		
+		m_WidgetRoot = game.GetWorkspace().CreateWidgets("gui/layouts/day_z_connection_lost.layout");
+		m_WidgetRoot.Show(false);
+		
+		Class.CastTo(m_TextWidgetTitle, m_WidgetRoot.FindAnyWidget("TextWidget"));
+		m_duration = 0.0;
+	}
+	
+	void Show()
+	{
+		if (!m_WidgetRoot.IsVisible())
+		{
+			if (g_Game.GetUIManager().IsDialogVisible())
+			{
+				g_Game.GetUIManager().HideDialog();
+			}
+			
+			m_WidgetRoot.Show(true);
+			m_TextWidgetTitle.SetText("");
+		}
+	}
+	
+	void Hide()
+	{
+		if (m_WidgetRoot.IsVisible())
+		{
+			m_WidgetRoot.Show(false);
+		}
+	}
+	
+	void SetText(string text)
+	{
+		m_TextWidgetTitle.SetText(text);
+	}
+	
+	float GetDuration()
+	{
+		return m_duration;
+	}
+	
+	void SetDuration(float duration)
+	{
+		m_duration = duration;
+	}
+};
+
+typedef Param3<string, bool, bool> DayZProfilesOption;
+typedef DayZProfilesOption DayZProfilesOptionBool;
+typedef Param3<string, int, int> DayZProfilesOptionInt;
+typedef Param3<string, float, float> DayZProfilesOptionFloat;
+
+class DayZProfilesOptions
+{
+	private ref map<EDayZProfilesOptions, ref DayZProfilesOptionBool> m_DayZProfilesOptionsBool;
+	private ref map<EDayZProfilesOptions, ref DayZProfilesOptionInt> m_DayZProfilesOptionsInt;
+	private ref map<EDayZProfilesOptions, ref DayZProfilesOptionFloat> m_DayZProfilesOptionsFloat;
+	private DayZGame m_Game
+	
+	void DayZProfilesOptions()
+	{
+		m_DayZProfilesOptionsBool 	= new map<EDayZProfilesOptions, ref DayZProfilesOptionBool>();
+		m_DayZProfilesOptionsInt 	= new map<EDayZProfilesOptions, ref DayZProfilesOptionInt>();
+		m_DayZProfilesOptionsFloat 	= new map<EDayZProfilesOptions, ref DayZProfilesOptionFloat>();
+	}
+
+	void RegisterProfileOption(EDayZProfilesOptions option, string profileOptionName, bool def = true)
+	{
+		if (!m_DayZProfilesOptionsBool.Contains(option))
+		{
+			//! init of DayZProfilesOption - profileOptionName, value from Profiles files, or use default value
+			bool profileVal = GetProfileValueBool(profileOptionName, def);
+
+			m_DayZProfilesOptionsBool.Set(option, new DayZProfilesOptionBool(profileOptionName, profileVal, def));
+			SetProfileOptionBool(option, profileVal);
+		}
+	}
+	
+	void RegisterProfileOptionBool(EDayZProfilesOptions option, string profileOptionName, bool defaultValue = true)
+	{
+		RegisterProfileOption(option, profileOptionName, defaultValue);
+	}
+	
+	void RegisterProfileOptionInt(EDayZProfilesOptions option, string profileOptionName, int defaultValue = 0)
+	{
+		if (!m_DayZProfilesOptionsInt.Contains(option))
+		{
+			//! init of DayZProfilesOption - profileOptionName, value from Profiles files, or use default value
+			string outValue;
+			GetGame().GetProfileString(profileOptionName, outValue);
+			int value = outValue.ToInt();
+
+			m_DayZProfilesOptionsInt.Set(option, new DayZProfilesOptionInt(profileOptionName, value, defaultValue));
+			SetProfileOptionInt(option, value);
+		}
+	}
+	
+	void RegisterProfileOptionFloat(EDayZProfilesOptions option, string profileOptionName, float defaultValue = 0.0)
+	{
+		if (!m_DayZProfilesOptionsFloat.Contains(option))
+		{
+			//! init of DayZProfilesOption - profileOptionName, value from Profiles files, or use default value
+			string outValue;
+			GetGame().GetProfileString(profileOptionName, outValue);
+			float value = outValue.ToFloat();
+
+			m_DayZProfilesOptionsFloat.Set(option, new DayZProfilesOptionFloat(profileOptionName, value, defaultValue));
+			SetProfileOptionFloat(option, value);
+		}
+	}
+
+	void ResetOptionsBool()
+	{
+		if (!m_DayZProfilesOptionsBool)
+		{
+			m_DayZProfilesOptionsBool = new map<EDayZProfilesOptions, ref DayZProfilesOptionBool>();
+		}
+
+		foreach (EDayZProfilesOptions e_opt, DayZProfilesOptionBool r_opt : m_DayZProfilesOptionsBool)
+		{
+			bool profileVal = GetProfileValueBool(r_opt.param1, r_opt.param3);
+			SetProfileOptionBool(e_opt, profileVal);
+		}	
+	}
+	
+	void ResetOptions()
+	{
+		ResetOptionsBool();
+	}
+	
+	void ResetOptionsInt()
+	{
+		if (!m_DayZProfilesOptionsInt)
+		{
+			m_DayZProfilesOptionsInt = new map<EDayZProfilesOptions, ref DayZProfilesOptionInt>();
+		}
+
+		foreach (EDayZProfilesOptions e_opt, DayZProfilesOptionInt r_opt : m_DayZProfilesOptionsInt)
+		{
+			string outValue;
+			GetGame().GetProfileString(r_opt.param1, outValue);
+			int value = outValue.ToInt();
+			SetProfileOptionInt(e_opt, value);
+		}	
+	}
+	
+	void ResetOptionsFloat()
+	{
+		if (!m_DayZProfilesOptionsFloat)
+		{
+			m_DayZProfilesOptionsFloat = new map<EDayZProfilesOptions, ref DayZProfilesOptionFloat>();
+		}
+
+		foreach (EDayZProfilesOptions e_opt, DayZProfilesOptionFloat r_opt : m_DayZProfilesOptionsFloat)
+		{
+			string outValue;
+			GetGame().GetProfileString(r_opt.param1, outValue);
+			float value = outValue.ToFloat();
+			SetProfileOptionFloat(e_opt, value);
+		}	
+	}
+	
+	void SetProfileOption(EDayZProfilesOptions option, bool value)
+	{
+		if (m_DayZProfilesOptionsBool && m_DayZProfilesOptionsBool.Contains(option))
+		{
+			DayZProfilesOptionBool po = m_DayZProfilesOptionsBool.Get(option);
+			
+			po.param2 = value;
+			GetGame().SetProfileString(po.param1, value.ToString());
+			GetGame().SaveProfile();
+		}	
+	}
+
+	void SetProfileOptionBool(EDayZProfilesOptions option, bool value)
+	{
+		SetProfileOption(option, value);
+	}
+	
+	void SetProfileOptionInt(EDayZProfilesOptions option, int value)
+	{
+		if (m_DayZProfilesOptionsInt && m_DayZProfilesOptionsInt.Contains(option))
+		{
+			DayZProfilesOptionInt po = m_DayZProfilesOptionsInt.Get(option);
+			
+			po.param2 = value;
+			GetGame().SetProfileString(po.param1, value.ToString());
+			GetGame().SaveProfile();
+		}	
+	}
+	
+	void SetProfileOptionFloat(EDayZProfilesOptions option, float value)
+	{
+		if (m_DayZProfilesOptionsFloat && m_DayZProfilesOptionsFloat.Contains(option))
+		{
+			DayZProfilesOptionFloat po = m_DayZProfilesOptionsFloat.Get(option);
+			
+			po.param2 = value;
+			GetGame().SetProfileString(po.param1, value.ToString());
+			GetGame().SaveProfile();
+		}	
+	}
+
+	bool GetProfileOption(EDayZProfilesOptions option)
+	{
+		if (m_DayZProfilesOptionsBool && m_DayZProfilesOptionsBool.Contains(option))
+		{
+			DayZProfilesOptionBool po = m_DayZProfilesOptionsBool.Get(option);
+			return po.param2;
+		}
+		
+		return true;
+	}
+	
+	bool GetProfileOptionBool(EDayZProfilesOptions option)
+	{
+		return GetProfileOption(option);
+	}
+	
+	int GetProfileOptionInt(EDayZProfilesOptions option)
+	{
+		if (m_DayZProfilesOptionsInt && m_DayZProfilesOptionsInt.Contains(option))
+		{
+			DayZProfilesOptionInt po = m_DayZProfilesOptionsInt.Get(option);
+			return po.param2;
+		}
+		
+		return 0;
+	}
+	
+	float GetProfileOptionFloat(EDayZProfilesOptions option)
+	{
+		if (m_DayZProfilesOptionsFloat && m_DayZProfilesOptionsFloat.Contains(option))
+		{
+			DayZProfilesOptionFloat po = m_DayZProfilesOptionsFloat.Get(option);
+			return po.param2;
+		}
+		
+		return 0.0;
+	}
+	
+	bool GetProfileOptionDefault(EDayZProfilesOptions option)
+	{
+		return GetProfileOptionDefaultBool(option);
+	}
+	
+	bool GetProfileOptionDefaultBool(EDayZProfilesOptions option)
+	{
+		if (m_DayZProfilesOptionsBool && m_DayZProfilesOptionsBool.Contains(option))
+		{
+			DayZProfilesOptionBool po = m_DayZProfilesOptionsBool.Get(option);
+			return po.param3;
+		}
+		
+		ErrorEx("Invalid profile option id! Returning 'true'.", ErrorExSeverity.WARNING);
+		return true;
+	}
+	
+	int GetProfileOptionDefaultInt(EDayZProfilesOptions option)
+	{
+		if (m_DayZProfilesOptionsInt && m_DayZProfilesOptionsInt.Contains(option))
+		{
+			DayZProfilesOptionInt po = m_DayZProfilesOptionsInt.Get(option);
+			return po.param3;
+		}
+		
+		ErrorEx("Invalid profile option id! Returning '0'.", ErrorExSeverity.WARNING);
+		return 0;
+	}
+	
+	float GetProfileOptionDefaultFloat(EDayZProfilesOptions option)
+	{
+		if (m_DayZProfilesOptionsFloat && m_DayZProfilesOptionsFloat.Contains(option))
+		{
+			DayZProfilesOptionFloat po = m_DayZProfilesOptionsFloat.Get(option);
+			return po.param3;
+		}
+		
+		ErrorEx("Invalid profile option id! Returning '0.0'.", ErrorExSeverity.WARNING);
+		return 0.0;
+	}
+	
+	map<EDayZProfilesOptions, ref DayZProfilesOptionBool> GetProfileOptionMap()
+	{
+		if (m_DayZProfilesOptions)
+			return m_DayZProfilesOptions;
+
+		return null;
+	}
+
+	//!
+	//! DEPRECATED
+	private ref map<EDayZProfilesOptions, ref DayZProfilesOption> m_DayZProfilesOptions;
+}
+
+enum DayZGameState
+{
+	UNDEFINED,
+	MAIN_MENU,
+	JOIN,
+	PARTY,
+	CONNECT,
+	CONNECTING,
+	IN_GAME
+}
+
+enum DayZLoadState
+{
+	UNDEFINED,
+	MAIN_MENU_START,
+	MAIN_MENU_CONTROLLER_SELECT,
+	MAIN_MENU_USER_SELECT,
+	JOIN_START,
+	JOIN_CONTROLLER_SELECT,
+	JOIN_USER_SELECT,
+	PARTY_START,
+	PARTY_CONTROLLER_SELECT,
+	PARTY_USER_SELECT,
+	CONNECT_START,
+	CONNECT_USER_SELECT,
+	CONNECT_CONTROLLER_SELECT,
+	MISSION_START,
+	MISSION_USER_SELECT,
+	MISSION_CONTROLLER_SELECT
+}
+
+class LoadingScreen
+{
+	ref Widget m_WidgetRoot;
+	TextWidget m_TextWidgetTitle;
+	TextWidget m_TextWidgetStatus;
+	TextWidget m_ModdedWarning;
+	ImageWidget m_ImageWidgetBackground;
+	DayZGame m_DayZGame;
+	float m_LastProgressUpdate;
+	
+	ImageWidget m_ImageLogoMid;
+	ImageWidget m_ImageLogoCorner;
+	ImageWidget m_ImageLoadingIcon;
+	ImageWidget m_ImageBackground;
+	ProgressBarWidget m_ProgressLoading;
+	float m_ImageLoadingIconRotation;
+	TextWidget m_ProgressText;
+	
+	int m_Counter;
+	ref Timer m_Timer;
+	ref UiHintPanelLoading m_HintPanel;
+	void LoadingScreen(DayZGame game)
+	{
+		m_DayZGame = game;
+		
+		m_WidgetRoot = game.GetLoadingWorkspace().CreateWidgets("gui/layouts/loading.layout");
+		Class.CastTo(m_ImageLogoMid, m_WidgetRoot.FindAnyWidget("ImageLogoMid"));
+		Class.CastTo(m_ImageLogoCorner, m_WidgetRoot.FindAnyWidget("ImageLogoCorner"));
+		
+		Class.CastTo(m_TextWidgetTitle, m_WidgetRoot.FindAnyWidget("TextWidget"));
+		Class.CastTo(m_TextWidgetStatus, m_WidgetRoot.FindAnyWidget("StatusText"));
+		Class.CastTo(m_ImageWidgetBackground, m_WidgetRoot.FindAnyWidget("ImageBackground"));
+		Class.CastTo(m_ImageLoadingIcon, m_WidgetRoot.FindAnyWidget("ImageLoadingIcon"));
+		Class.CastTo(m_ModdedWarning, m_WidgetRoot.FindAnyWidget("ModdedWarning"));
+
+		m_ImageBackground = ImageWidget.Cast(m_WidgetRoot.FindAnyWidget("ImageBackground"));
+		m_ProgressLoading = ProgressBarWidget.Cast(m_WidgetRoot.FindAnyWidget("LoadingBar"));
+		
+		string tmp;
+		m_ProgressText = TextWidget.Cast(m_WidgetRoot.FindAnyWidget("ProgressText"));
+		if (GetGame())
+		{
+			m_ProgressText.Show(GetGame().CommandlineGetParam("loadingTest", tmp));
+		}
+		m_WidgetRoot.FindAnyWidget("notification_root").Show(false);
+		
+		#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_XBOX
+		#ifdef BUILD_EXPERIMENTAL
+			Widget expNotification = m_WidgetRoot.FindAnyWidget("notification_root");
+			if (expNotification)
+			{
+				expNotification.Show(true);
+			}
+		#endif
+		#endif
+		#endif
+		
+		m_ModdedWarning.Show(g_Game.ReportModded());
+		m_ImageLogoMid.Show(true);
+		m_ImageLogoCorner.Show(false);
+		
+		m_ImageWidgetBackground.Show(true);		
+		m_Counter = 0;
+				
+		// lighten up your desktop
+		game.GetBacklit().LoadingAnim();
+		
+		ProgressAsync.SetProgressData(m_ProgressLoading);
+		ProgressAsync.SetUserData(m_ImageBackground);
+	}
+
+	//! DEPRECATED
+	void OnTimer();
+	
+	void Inc()
+	{
+		m_LastProgressUpdate = m_DayZGame.GetTickTime();
+		m_Counter++;
+		if (m_Counter == 1)
+		{
+			Show();
+		}
+	}
+	
+	void Dec()
+	{
+		m_Counter = m_Counter - 1;
+	
+		if (m_Counter <= 0)
+		{
+			m_Counter = 0;
+			EndLoading();
+			m_HintPanel = null;
+		}
+	}
+	
+	void EndLoading()
+	{
+		ProgressAsync.SetProgressData(null);
+		ProgressAsync.SetUserData(null);
+		m_WidgetRoot.Show(false);
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(g_Game.CheckDialogs);
+	}
+	
+	bool IsLoading()
+	{
+		return m_WidgetRoot.IsVisible();
+	}
+	
+	void SetTitle(string title)
+	{
+		m_TextWidgetTitle.SetText(title);
+	}
+	
+	void SetStatus(string status)
+	{
+		m_TextWidgetStatus.SetText(status);
+	}
+	
+	void SetProgress(float val)
+	{
+		float time_delta = m_DayZGame.GetTickTime() - m_LastProgressUpdate;
+		
+		m_LastProgressUpdate = m_DayZGame.GetTickTime();
+	}
+	
+	void OnUpdate(float timeslice)
+	{
+
+	}
+	
+	void ShowEx(DayZGame game)
+	{
+		if (!m_HintPanel)
+		{
+			m_HintPanel					= new UiHintPanelLoading(m_WidgetRoot.FindAnyWidget("hint_frame"));
+			m_HintPanel.Init(game);
+		}
+
+		Show();
+	}
+	
+	void Show()
+	{
+		Widget lIcon = m_ImageBackground;
+		Widget pText = m_ProgressLoading;
+		m_ProgressText.SetText("");
+		m_ProgressLoading.SetCurrent(0.0);
+		m_ImageBackground.SetMaskProgress(0.0);
+		
+		if (!m_WidgetRoot.IsVisible())
+		{
+			if (m_DayZGame.GetUIManager().IsDialogVisible())
+			{
+				m_DayZGame.GetUIManager().HideDialog();
+			}
+			
+			if (m_DayZGame.GetMissionState() == DayZGame.MISSION_STATE_MAINMENU)
+			{
+				m_ImageLogoMid.Show(false);
+				m_ImageLogoCorner.Show(false);				
+				m_ImageWidgetBackground.Show(true);		
+				m_TextWidgetStatus.Show(true);
+			}
+			else
+			{
+				m_ImageLogoMid.Show(true);
+				m_ImageLogoCorner.Show(false);
+				m_ImageWidgetBackground.Show(true);
+				m_TextWidgetStatus.Show(false);
+			}
+			
+			m_WidgetRoot.Show(true);
+			m_TextWidgetTitle.SetText("");
+			m_TextWidgetStatus.SetText("");
+		}
+		
+		ProgressAsync.SetProgressData(pText);
+		ProgressAsync.SetUserData(lIcon);
+	}
+	
+	void Hide(bool force)
+	{
+		if (force)
+		{
+			while (m_Counter > 0)
+			{
+				Dec();
+			}
+		}
+
+		if (m_Counter <= 0)
+		{
+			m_WidgetRoot.Show(false);
+			ProgressAsync.SetUserData(null);
+			ProgressAsync.SetProgressData(null);
+			m_HintPanel = null;
+		}
+	}
+};
+
+
+class DayZGame extends CGame
+{
+	protected ref BillboardSetHandler m_BillboardSetHandler;
+	
+	const int MISSION_STATE_MAINMENU = 0;
+	const int MISSION_STATE_GAME = 1;
+	const int MISSION_STATE_FINNISH = 2;
+	
+	private const int STATS_COUNT = EConnectivityStatType.COUNT;
+	private EConnectivityStatLevel m_ConnectivityStatsStates[STATS_COUNT];
+	
+	private int m_MissionState;
+	
+	//HK stuff
+	protected DayZGameState						m_GameState;
+	protected DayZLoadState						m_LoadState;
+	protected ref NotificationUI				m_Notifications;
+	protected bool								m_FirstConnect = true;
+	//End HK stuff
+	
+	ref LoadingScreen m_loading;
+	private ref LoginTimeBase m_LoginTimeScreen;
+	private ref LoginQueueBase m_LoginQueue;
+	private int m_LoginTime;
+	
+	private ref ConnectionLost m_connectionLost;
+	private ref TimerQueue m_timerQueue[CALL_CATEGORY_COUNT];
+	private ref ScriptCallQueue m_callQueue[CALL_CATEGORY_COUNT];
+	private ref ScriptInvoker m_updateQueue[CALL_CATEGORY_COUNT];
+	private ref ScriptInvoker m_postUpdateQueue[CALL_CATEGORY_COUNT];
+	private ref DragQueue m_dragQueue;
+	private ref DayZProfilesOptions m_DayZProfileOptions;
+	private bool m_early_access_dialog_accepted;
+	private UIScriptedMenu m_keyboard_handler;
+	private ScriptModule m_mission_module;
+	private string 	m_MissionPath;
+	private string 	m_MissionFolderPath;
+	private bool	m_IsCtrlHolding;
+	private bool	m_IsWinHolding;
+	private bool	m_IsLeftAltHolding;
+	private bool	m_IsRightAltHolding;
+	
+	private bool	m_IsWorldWetTempUpdateEnabled = true;
+	private bool	m_IsFoodDecayEnabled = true;
+	private float	m_FoodDecayModifier;
+	
+	static bool		m_ReportModded;
+	private bool	m_IsStressTest;
+	private bool 	m_AimLoggingEnabled;
+	int 			m_OriginalCharactersCount;
+	private string 	m_PlayerName;
+	private bool 	m_IsNewCharacter;
+	private bool 	m_IsConnecting;
+	private bool	m_ConnectFromJoin;
+	private bool	m_ShouldShowControllerDisconnect;
+	private bool	m_CursorDesiredVisibilityScript = true;
+	private int		m_PreviousGamepad;
+	private float	m_UserFOV;
+
+	private float	m_DeltaTime;
+
+	float 	m_volume_sound;
+	float 	m_volume_speechEX;
+	float 	m_volume_music;
+	float 	m_volume_VOIP;
+	float 	m_volume_radio;
+	
+	float 	m_PreviousEVValue;
+	float 	m_EVValue = 0;
+	
+	#ifdef DIAG_DEVELOPER
+	private static ref ServerFpsStatsUpdatedEventParams m_ServerFpsStatsParams; 
+	#endif
+	
+	static ref AmmoCamParams m_AmmoShakeParams = new AmmoCamParams();//TODO: make static, reuse
+	
+	static ref ScriptInvoker Event_OnRPC = new ScriptInvoker();
+	
+	private ref Backlit m_Backlit;
+	
+	private ref array<string> m_CharClassNames = new array<string>();
+	private ref array<int> m_ConnectedInputDeviceList; //has to be owned here, 'Input' is a native class
+	
+	//Used for helicrash sound
+	private ref EffectSound m_CrashSound;
+	
+	//Used for Artillery sound
+	private ref EffectSound m_ArtySound;
+	private const int MIN_ARTY_SOUND_RANGE = 300; // The distance under which sound is no longer heard
+	
+	static ref NoiseParams m_NoiseParams = new NoiseParams();
+	#ifdef DEVELOPER
+	static bool m_IsPreviewSpawn;//! we set this to 'true' when spawning item through Script Console only for item preview purposes
+	#endif
+	#ifdef DIAG_DEVELOPER
+	ref CameraToolsMenuServer m_CameraToolsMenuServer;
+	#endif
+	// CGame override functions
+	void DayZGame()
+	{
+		PPEManagerStatic.CreateManagerStatic();
+		
+#ifdef PLATFORM_CONSOLE
+		SetMainMenuWorld("MainMenuSceneXbox");
+#endif
+		m_MissionState = MISSION_STATE_GAME;
+		
+		m_keyboard_handler = null;
+		
+		#ifdef DEVELOPER
+		m_early_access_dialog_accepted = true;
+		#endif
+		
+		for (int i = 0; i < CALL_CATEGORY_COUNT; i++)
+		{
+			m_callQueue[i] 		= new ScriptCallQueue();
+			m_updateQueue[i] 	= new ScriptInvoker();
+			m_timerQueue[i] 	= new TimerQueue();
+			
+			m_postUpdateQueue[i] = new ScriptInvoker();
+		}
+		
+		m_dragQueue = new DragQueue;
+		
+		m_LoginTime 		 = 0;
+		
+		string tmp;
+		if (CommandlineGetParam("stresstest", tmp))
+		{
+			m_IsStressTest = true;
+		}
+
+		if (CommandlineGetParam("doAimLogs", tmp))
+		{
+			m_AimLoggingEnabled = true;
+		}
+		
+		// initialize backlit effects
+		m_Backlit = new Backlit();
+		m_Backlit.OnInit(this);
+		
+		m_ReportModded = GetModToBeReported();
+
+	#ifndef NO_GUI
+		if (m_loading == null)
+		{
+			m_loading = new LoadingScreen(this);
+		}
+
+		if (m_loading)
+		{
+			m_loading.ShowEx(this);
+		}
+
+		RefreshMouseCursorVisibility();
+	#endif
+			
+		Debug.Init();
+		Component.Init();
+		CachedObjectsParams.Init();
+		CachedObjectsArrays.Init();
+		BleedChanceData.InitBleedChanceData();
+		GetUApi().PresetSelect(GetUApi().PresetCurrent());
+
+		m_DayZProfileOptions = new DayZProfilesOptions();
+		
+		GetCallQueue(CALL_CATEGORY_GUI).Call(DeferredInit);
+		GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(GlobalsInit);
+		
+		string path = "cfgVehicles";
+		string child_name = "";
+		int count = ConfigGetChildrenCount(path);
+		
+		for (int p = 0; p < count; ++p)
+		{
+			ConfigGetChildName(path, p, child_name);
+			
+			if (ConfigGetInt(path + " " + child_name + " scope") == 2 && IsKindOf(child_name, "SurvivorBase"))
+				m_CharClassNames.Insert(child_name);
+		}
+		
+		m_IsConnecting = false;
+		m_ConnectFromJoin = false;
+	}
+	
+	// ------------------------------------------------------------
+	private void ~DayZGame()
+	{
+		PPEManagerStatic.DestroyManagerStatic();
+		BleedChanceData.Cleanup();
+		NotificationSystem.CleanupInstance();
+		
+		g_Game = null;
+		SetDispatcher(null);
+		Print("~DayZGame()");
+	}
+	
+	// ------------------------------------------------------------
+	void DeferredInit()
+	{
+		GameOptions opt = new GameOptions();
+		opt.Initialize();
+		
+		GetInput().UpdateConnectedInputDeviceList();
+
+		m_UserFOV = GetUserFOVFromConfig();
+		
+		m_volume_sound 		= GetSoundScene().GetSoundVolume();
+		m_volume_speechEX 	= GetSoundScene().GetSpeechExVolume();
+		m_volume_music 		= GetSoundScene().GetMusicVolume();
+		m_volume_VOIP 		= GetSoundScene().GetVOIPVolume();
+		m_volume_radio 		= GetSoundScene().GetRadioVolume();
+		
+		PPEManagerStatic.GetPPEManager().Init();
+		GetMenuDefaultCharacterData();
+	}
+	
+	// ------------------------------------------------------------
+	void GlobalsInit()
+	{
+		if (GetCEApi())
+		{
+			m_IsWorldWetTempUpdateEnabled = (GetCEApi().GetCEGlobalInt("WorldWetTempUpdate") == 1);
+			
+			m_FoodDecayModifier = GetCEApi().GetCEGlobalFloat("FoodDecay");
+			
+			//check for legacy INT format, if value == float.MIN when read as FLOAT, it is of type INT, so we read it as such below	
+			if (m_FoodDecayModifier == float.MIN)
+			{
+				m_FoodDecayModifier = GetCEApi().GetCEGlobalInt("FoodDecay");
+			}
+		}
+		
+		//we need to perform the load here as some objects behaving correctly after spawn is dependent on CE being initialized before spawning them
+		ObjectSpawnerHandler.OnGameplayDataHandlerLoad();
+	}
+	
+	// ------------------------------------------------------------
+	void RegisterProfilesOptions()
+	{
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.CROSSHAIR, SHOW_CROSSHAIR);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.HUD, SHOW_HUD);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.QUICKBAR, SHOW_QUICKBAR);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.SERVER_MESSAGES, SYSTEM_CHAT_MSG);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.USERS_CHAT, DIRECT_CHAT_MSG);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.RADIO_CHAT, RADIO_CHAT_MSG);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.GAME_MESSAGES, GAME_CHAT_MSG, false);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.ADMIN_MESSAGES, ADMIN_CHAT_MSG, false);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.PLAYER_MESSAGES, PLAYER_CHAT_MSG, false);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.SERVERINFO_DISPLAY, SHOW_SERVERINFO, true);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.BLEEDINGINDICATION, ENABLE_BLEEDINGINDICATION, true);
+		m_DayZProfileOptions.RegisterProfileOptionBool(EDayZProfilesOptions.CONNECTIVITY_INFO, SHOW_CONNECTIVITYINFO, true);
+		
+		m_DayZProfileOptions.RegisterProfileOptionFloat(EDayZProfilesOptions.HUD_BRIGHTNESS, HUD_BRIGHTNESS, 0.0);
+	}
+	
+	void ResetProfileOptions()
+	{
+		m_DayZProfileOptions.ResetOptionsBool();
+		m_DayZProfileOptions.ResetOptionsInt();
+		m_DayZProfileOptions.ResetOptionsFloat();
+	}
+	
+	//! Called from C++
+	void SetMissionPath(string path)
+	{
+		m_MissionPath = path;
+		
+		int pos_end = 0;
+		int pos_cur = 0;
+				
+		while (pos_cur != -1)
+		{
+			pos_end = pos_cur;
+			pos_cur = path.IndexOfFrom(pos_cur + 1 , "\\");
+		}
+		
+		m_MissionFolderPath = path.Substring(0, pos_end);	
+	}
+	
+	string GetMissionPath()
+	{
+		return m_MissionPath;
+	}
+	
+	string GetMissionFolderPath()
+	{
+		return m_MissionFolderPath;
+	}
+	
+	override ScriptCallQueue GetCallQueue(int call_category)
+	{
+		return m_callQueue[call_category];
+	}
+
+	override ScriptInvoker GetUpdateQueue(int call_category)
+	{
+		return m_updateQueue[call_category];
+	}
+
+	override ScriptInvoker GetPostUpdateQueue(int call_category)
+	{
+		return m_postUpdateQueue[call_category];
+	}
+	
+	override TimerQueue GetTimerQueue(int call_category)
+	{
+		return m_timerQueue[call_category];
+	}
+
+	override DragQueue GetDragQueue()
+	{
+		return m_dragQueue;
+	}
+	
+	// ------------------------------------------------------------
+	void OnGameplayDataHandlerLoad()
+	{
+	
+	}
+	
+
+	// ------------------------------------------------------------
+	int GetMissionState()
+	{
+		return m_MissionState;
+	}
+	
+	// ------------------------------------------------------------
+	void SetMissionState(int state)
+	{
+		m_MissionState = state;
+	}
+	
+	// ------------------------------------------------------------
+	bool GetProfileOption(EDayZProfilesOptions option)
+	{
+		return m_DayZProfileOptions.GetProfileOption(option);
+	}
+	 	
+	bool GetProfileOptionBool(EDayZProfilesOptions option)
+	{
+		return GetProfileOption(option);
+	}
+	
+	int GetProfileOptionInt(EDayZProfilesOptions option)
+	{
+		return m_DayZProfileOptions.GetProfileOptionInt(option);
+	}
+	
+	float GetProfileOptionFloat(EDayZProfilesOptions option)
+	{
+		return m_DayZProfileOptions.GetProfileOptionFloat(option);
+	}
+	
+	bool GetProfileOptionDefault(EDayZProfilesOptions option)
+	{
+		return m_DayZProfileOptions.GetProfileOptionDefaultBool(option);
+	}
+	
+	bool GetProfileOptionDefaultBool(EDayZProfilesOptions option)
+	{
+		return GetProfileOptionDefault(option);
+	}
+	
+	int GetProfileOptionDefaultInt(EDayZProfilesOptions option)
+	{
+		return m_DayZProfileOptions.GetProfileOptionDefaultInt(option);
+	}
+	
+	float GetProfileOptionDefaultFloat(EDayZProfilesOptions option)
+	{
+		return m_DayZProfileOptions.GetProfileOptionDefaultFloat(option);
+	}
+	
+	void SetProfileOption(EDayZProfilesOptions option, bool value)
+	{
+		m_DayZProfileOptions.SetProfileOptionBool(option, value);
+	}
+	
+	void SetProfileOptionBool(EDayZProfilesOptions option, bool value)
+	{
+		SetProfileOption(option, value);
+	}
+	
+	void SetProfileOptionInt(EDayZProfilesOptions option, int value)
+	{
+		m_DayZProfileOptions.SetProfileOptionInt(option, value);
+	}
+	
+	void SetProfileOptionFloat(EDayZProfilesOptions option, float value)
+	{
+		m_DayZProfileOptions.SetProfileOptionFloat(option, value);
+	}
+	
+	map<EDayZProfilesOptions, ref DayZProfilesOption> GetProfileOptionMap()
+	{
+		return m_DayZProfileOptions.GetProfileOptionMap();
+	}
+	
+	bool IsStressTest()
+	{
+		return m_IsStressTest;
+	}
+	
+	bool IsAimLogEnabled()
+	{
+		return m_AimLoggingEnabled;
+	}
+	
+	void SetGameState(DayZGameState state)
+	{
+		m_GameState = state;
+	}
+	
+	DayZGameState GetGameState()
+	{
+		return m_GameState;
+	}
+	
+	void SetLoadState(DayZLoadState state)
+	{
+		m_LoadState = state;
+	}
+	
+	DayZLoadState GetLoadState()
+	{
+		return m_LoadState;
+	}
+	
+	static bool ReportModded()
+	{
+		return m_ReportModded;
+	}
+	
+	Backlit GetBacklit()
+	{
+		return m_Backlit;
+	}
+	
+	// ------------------------------------------------------------
+	override bool IsInventoryOpen()
+	{
+#ifndef NO_GUI
+		if (GetUIManager().FindMenu(MENU_INVENTORY) != NULL)
+		{
+			return true;
+		}
+#endif
+		return false;
+	}
+	
+	// ------------------------------------------------------------
+	void EarlyAccessDialog(UIScriptedMenu parent)
+	{
+		if (!m_early_access_dialog_accepted)
+		{
+			g_Game.GetUIManager().EnterScriptedMenu(MENU_EARLYACCESS, parent);
+			m_early_access_dialog_accepted = true;
+		}
+	}
+	
+	// ------------------------------------------------------------
+	//! create custom main menu part (submenu)
+	override UIScriptedMenu CreateScriptedMenu(int id)
+	{
+	#ifndef NO_GUI
+		Mission mission = GetMission();
+		if (mission)
+		{
+			return mission.CreateScriptedMenu(id);
+		}
+	#endif
+		return NULL;
+	}
+		
+	// ------------------------------------------------------------
+	void ReloadMission()
+	{
+	#ifdef DEVELOPER
+		Print("Reloading mission module!");
+		CreateMission(m_MissionPath);
+	#endif
+	}
+	
+		// ------------------------------------------------------------
+	void CancelLoginQueue()
+	{
+		if (m_LoginQueue)
+		{
+			if (m_LoginQueue.IsStatic())
+			{
+				m_LoginQueue.Hide();
+				delete m_LoginQueue;
+			}
+			else
+			{
+				m_LoginQueue.Close();
+			}
+		}
+	}
+	// ------------------------------------------------------------
+	void CancelLoginTimeCountdown()
+	{
+		GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(this.LoginTimeCountdown);
+		
+		if (m_LoginTimeScreen)
+		{
+			if (m_LoginTimeScreen.IsStatic())
+			{
+				m_LoginTimeScreen.Hide();
+				delete m_LoginTimeScreen;
+			}
+			else
+			{
+				m_LoginTimeScreen.Close();
+			}
+		}
+	}
+	// ------------------------------------------------------------
+	private void ClearConnectivityStates()
+	{
+		for (int i = 0; i < STATS_COUNT; i++)
+			m_ConnectivityStatsStates[i] = 0;
+	}
+	
+	
+	// ------------------------------------------------------------
+	override void OnEvent(EventType eventTypeId, Param params)
+	{
+		string address;
+		int port;
+		int high, low;
+		
+		switch (eventTypeId)
+		{
+			case StartupEventTypeID:
+			{
+				#ifndef SERVER
+				// Just call it, to create the global instance if it doesn't exist yet
+				ParticleManager.GetInstance();
+				#endif
+				break;
+			}
+			case MPSessionStartEventTypeID:
+			{
+				#ifndef SERVER
+				ClearConnectivityStates();
+				#endif
+				m_FirstConnect = true;
+				ClientData.ResetClientData();
+				break;
+			}
+			case MPSessionEndEventTypeID:
+			{
+				LoadingHide();
+				CancelLoginTimeCountdown();
+				SetConnecting(false);
+				SetGameState(DayZGameState.MAIN_MENU);
+				m_FirstConnect = true;
+				#ifdef PLATFORM_CONSOLE
+				if (GetUserManager().GetSelectedUser())
+				{
+					OnlineServices.LeaveGameplaySession();
+					OnlineServices.ClearCurrentServerInfo();
+					if (GetGameState() == DayZGameState.IN_GAME)
+					{
+						SetLoadState(DayZLoadState.MAIN_MENU_START);
+					}
+				}
+				m_Notifications.ClearVoiceNotifications();
+				#endif
+
+				// analytics - disconnected player
+				StatsEventDisconnectedData discData = new StatsEventDisconnectedData();
+				discData.m_CharacterId = g_Game.GetDatabaseID();
+				discData.m_Reason = "quit";
+				Analytics.PlayerDisconnected(discData);
+				break;
+			}
+			case MPSessionFailEventTypeID:
+			{
+				CancelLoginQueue();
+				LoadingHide(true);
+				SetConnecting(false);
+				ProgressAsync.DestroyAllPendingProgresses();
+				
+				if (GetGameState() == DayZGameState.CONNECTING)
+				{
+					SetGameState(DayZGameState.MAIN_MENU);
+				}
+				
+				break;
+			}
+			case MPSessionPlayerReadyEventTypeID:
+			{
+				LoadingHide(true);
+				ProgressAsync.DestroyAllPendingProgresses();
+				
+				SetGameState(DayZGameState.IN_GAME);
+				
+				// analytics - spawned
+				StatsEventSpawnedData spawnData = new StatsEventSpawnedData();
+				spawnData.m_CharacterId = g_Game.GetDatabaseID();
+				spawnData.m_Lifetime = 0;
+				spawnData.m_Position = vector.Zero;
+				if (GetPlayer())
+				{
+					spawnData.m_Position = GetPlayer().GetPosition();
+				}
+				spawnData.m_DaytimeHour = 0;
+				spawnData.m_Population = 0;
+				Analytics.PlayerSpawned(spawnData);
+				
+				#ifdef PLATFORM_CONSOLE
+				m_Notifications.ClearVoiceNotifications();
+				OnlineServices.SetMultiplayState(true);
+				#endif
+				if (m_FirstConnect)
+				{
+					m_FirstConnect = false;
+					if (GetHostAddress(address, port))
+					{
+						AddVisitedServer(address, port);
+					}
+					
+					#ifdef PLATFORM_CONSOLE
+						#ifndef PLATFORM_WINDOWS // if app is not on Windows with -XBOX parameter
+							if (null != GetUserManager().GetSelectedUser())
+							{
+								OnlineServices.EnterGameplaySession();
+								OnlineServices.LoadVoicePrivilege();
+							}
+						#endif
+					#endif
+				}
+				
+				UpdateInputDeviceDisconnectWarning();
+				
+				break;
+			}
+			case MPConnectionLostEventTypeID:
+			{
+				MPConnectionLostEventParams conLost_params;
+				if (Class.CastTo(conLost_params, params))
+				{
+					int duration = conLost_params.param1;
+					OnMPConnectionLostEvent(duration);
+				}
+				break;
+			}
+			case WorldCleaupEventTypeID:
+			{
+				LoadingShow();
+				break;
+			}
+			case DialogQueuedEventTypeID:
+			{
+				GetCallQueue(CALL_CATEGORY_SYSTEM).Call(g_Game.CheckDialogs);
+				break;
+			}
+			case ChatMessageEventTypeID:
+			{
+				ChatMessageEventParams chat_params;
+				if (Class.CastTo(chat_params, params))
+				{
+					
+				}
+				break;
+			}
+			case ProgressEventTypeID:
+			{
+				ProgressEventParams prog_params;
+				if (Class.CastTo(prog_params, params))
+					LoadProgressUpdate(prog_params.param1, prog_params.param2, prog_params.param3);
+				break;
+			}
+			case LoginTimeEventTypeID:
+			{
+				LoginTimeEventParams loginTimeParams;
+				if (Class.CastTo(loginTimeParams, params))
+				{
+					OnLoginTimeEvent(loginTimeParams.param1);
+				}
+				break;
+			}	
+			case RespawnEventTypeID:
+			{
+				RespawnEventParams respawnParams;
+				if (Class.CastTo(respawnParams, params))
+				{
+					OnRespawnEvent(respawnParams.param1);
+				}	
+				break;
+			}
+			case PreloadEventTypeID:
+			{
+				PreloadEventParams preloadParams;
+				if (Class.CastTo(preloadParams, params))
+				{
+					OnPreloadEvent(preloadParams.param1);
+				}	
+				break;
+			}
+			case LogoutEventTypeID:
+			{
+				LogoutEventParams logoutParams;
+				if (Class.CastTo(logoutParams, params))
+				{
+					GetCallQueue(CALL_CATEGORY_GUI).Call(GetMission().StartLogoutMenu, logoutParams.param1);						
+				}
+				break;
+			}
+			case SelectedUserChangedEventTypeID:
+			{
+				OnlineServices.Init();
+				break;
+			}
+			case LoginStatusEventTypeID:
+			{
+				LoginStatusEventParams loginStatusParams;
+				Class.CastTo(loginStatusParams, params);
+	
+				string msg1 = loginStatusParams.param1;
+				string msg2 = loginStatusParams.param2;
+				string finalMsg;
+					
+				// write either to login time screen or loading screen
+				if (m_LoginTimeScreen)
+				{
+					finalMsg = msg1;
+					// login time screen supports two lines
+					if (msg2.Length() > 0)
+						finalMsg += "\n" + msg2;
+						
+					m_LoginTimeScreen.SetStatus(finalMsg);
+				}
+				else if (m_loading)
+				{
+					// loading only one line, but it's a long one
+					finalMsg = msg1 + " " + msg2;
+					m_loading.SetStatus(finalMsg);
+				}
+				break;
+			}
+			case ConnectingStartEventTypeID:
+			{
+				g_Game.SetGameState(DayZGameState.CONNECTING);
+				SetConnecting(true);
+				break;
+			}
+			case ConnectingAbortEventTypeID:
+			{
+				g_Game.SetGameState(DayZGameState.MAIN_MENU);
+				SetConnecting(false);
+				if (m_ConnectFromJoin)
+				{
+					m_ConnectFromJoin = false;
+					AbortMission();
+				}
+				break;
+			}
+			case DLCOwnerShipFailedEventTypeID:
+			{
+				DLCOwnerShipFailedParams dlcParams;
+				if (Class.CastTo(dlcParams, params))
+				{
+					Print("### DLC Ownership failed !!! Map: " + dlcParams.param1);
+				}
+				break;
+			}
+			case ConnectivityStatsUpdatedEventTypeID:
+			{
+				ConnectivityStatsUpdatedEventParams connectivityStatsParams; 
+				if (Class.CastTo(connectivityStatsParams, params))
+				{
+					PlayerIdentity playerIdentity = connectivityStatsParams.param1;
+					
+					int pingAvg = playerIdentity.GetPingAvg();
+					if (pingAvg < GetWorld().GetPingWarningThreshold())
+					{
+						SetConnectivityStatState(EConnectivityStatType.PING, EConnectivityStatLevel.OFF);
+					}
+					else if (pingAvg < GetWorld().GetPingCriticalThreshold())
+					{
+						SetConnectivityStatState(EConnectivityStatType.PING, EConnectivityStatLevel.LEVEL1);
+					}
+					else
+					{
+						SetConnectivityStatState(EConnectivityStatType.PING, EConnectivityStatLevel.LEVEL2);
+					}
+				}
+				break;
+			}
+			case ServerFpsStatsUpdatedEventTypeID:
+			{
+				ServerFpsStatsUpdatedEventParams serverFpsStatsParams; 
+				if (Class.CastTo(serverFpsStatsParams, params))
+				{
+					#ifdef DIAG_DEVELOPER
+					m_ServerFpsStatsParams = serverFpsStatsParams;
+					#endif
+					float fps = serverFpsStatsParams.param1;
+					if (fps > GetWorld().GetServerFpsWarningThreshold())
+					{
+						SetConnectivityStatState(EConnectivityStatType.SERVER_PERF, EConnectivityStatLevel.OFF);
+					}
+					else if (fps > GetWorld().GetServerFpsCriticalThreshold())
+					{
+						SetConnectivityStatState(EConnectivityStatType.SERVER_PERF, EConnectivityStatLevel.LEVEL1);
+					}
+					else
+					{
+						SetConnectivityStatState(EConnectivityStatType.SERVER_PERF, EConnectivityStatLevel.LEVEL2);
+					}
+				}
+				break;
+			}
+		}
+		
+		VONManager.GetInstance().OnEvent(eventTypeId, params);
+
+		Mission mission = GetMission();
+		if (mission)
+		{
+			mission.OnEvent(eventTypeId, params);
+		}
+		
+		ErrorModuleHandler emh = ErrorModuleHandler.GetInstance();
+		if (emh)
+			emh.OnEvent(eventTypeId, params);
+	}
+	
+	protected void SetConnectivityStatState(EConnectivityStatType type, EConnectivityStatLevel level)
+	{
+		if (level != m_ConnectivityStatsStates[type])
+		{
+			if (OnConnectivityStatChange(type, level, m_ConnectivityStatsStates[type]))//before setting the prev. level to be the current level, we need to make sure we successfully set the icon
+			{
+				m_ConnectivityStatsStates[type] = level;
+			}
+		}
+	}
+	
+	protected bool OnConnectivityStatChange(EConnectivityStatType type, EConnectivityStatLevel newLevel, EConnectivityStatLevel oldLevel)
+	{
+		if (!GetGame() || !GetGame().GetMission())
+			return false;
+		Hud hud = GetGame().GetMission().GetHud();
+		if (!hud) 
+			return false;
+
+		hud.SetConnectivityStatIcon(type, newLevel);
+		return true;
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	private void DrawPerformaceStats(float pingAct, float pingAvg)
+	{
+		DbgUI.Begin("Performance Stats", 10, 520);
+		DbgUI.Text("pingAct:" + pingAct );
+		int color = COLOR_WHITE;
+		if ( pingAvg >= GetWorld().GetPingCriticalThreshold())
+			color = COLOR_RED;
+		else if ( pingAvg >= GetWorld().GetPingWarningThreshold())
+			color = COLOR_YELLOW;
+
+		DbgUI.ColoredText(color, "pingAvg:" + pingAvg);
+		DbgUI.Text("Ping Warning Threshold:" + GetWorld().GetPingWarningThreshold());
+		DbgUI.Text("Ping Critical Threshold:" + GetWorld().GetPingCriticalThreshold());
+		DbgUI.PlotLive("pingAvg history:", 300,150, pingAvg, 2000, 100 );
+		DbgUI.Text("Server Fps Warning Threshold:" + GetWorld().GetServerFpsWarningThreshold());
+		DbgUI.Text("Server Fps Critical Threshold:" + GetWorld().GetServerFpsCriticalThreshold());
+		if (m_ServerFpsStatsParams)// SERVER FPS
+		{
+			color = COLOR_WHITE;
+			if ( m_ServerFpsStatsParams.param1 <= GetWorld().GetServerFpsCriticalThreshold())
+				color = COLOR_RED;
+			else if ( m_ServerFpsStatsParams.param1 <= GetWorld().GetServerFpsWarningThreshold())
+				color = COLOR_YELLOW;
+			DbgUI.ColoredText(color, "serverFPS:" + m_ServerFpsStatsParams.param1.ToString() );
+			DbgUI.PlotLive("serverFPS history:", 300,150, m_ServerFpsStatsParams.param1, 6000, 100 );
+		}
+		DbgUI.End();
+	}
+	#endif
+	
+	void AddVoiceNotification(VONStopSpeakingEventParams vonStartParams)
+	{
+		m_Notifications.AddVoiceNotification(vonStartParams.param2, vonStartParams.param1);
+	}
+	
+	void RemoveVoiceNotification(VONStopSpeakingEventParams vonStopParams)
+	{
+		m_Notifications.RemoveVoiceNotification(vonStopParams.param2);
+	}
+	
+	// ------------------------------------------------------------	
+	void UpdateLoginQueue(float timeslice)
+	{
+		int pos = GetUIManager().GetLoginQueuePosition();
+		
+		//! Display login queue position dialog
+		if (!m_LoginQueue && pos > 0)
+		{	
+			GetUIManager().CloseAll();
+			
+			if (GetMission())
+			{
+				UIScriptedMenu parent = GetUIManager().GetMenu();
+				EnterLoginQueue(parent);
+			}
+			else
+			{
+				m_LoginQueue = new LoginQueueStatic();
+				GetUIManager().ShowScriptedMenu(m_LoginQueue, null);
+			}
+		}
+		if (m_LoginQueue)
+		{
+			m_LoginQueue.SetPosition(pos);
+
+			//! manually update static login queue dialog
+			LoginQueueStatic loginQueue;
+			if (LoginQueueBase.CastTo(loginQueue, m_LoginQueue))
+			{
+				loginQueue.Update(timeslice);
+			}
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void OnLoginTimeEvent(int loginTime)
+	{
+#ifndef NO_GUI
+		// remove login queue if exits	
+		CancelLoginQueue();	
+		
+		GetUserManager().GetUserDatabaseIdAsync();
+		
+		m_LoginTime = loginTime;
+		
+		// timer for login
+		if (m_LoginTime > 0)
+		{	
+			if (!m_LoginTimeScreen)
+			{
+				GetUIManager().CloseAll();
+				
+				if (GetMission())
+				{
+					UIScriptedMenu parent = GetUIManager().GetMenu();
+					EnterLoginTime(parent);
+				}
+				else
+				{
+					m_LoginTimeScreen = new LoginTimeStatic();
+					GetUIManager().ShowScriptedMenu(m_LoginTimeScreen, null);
+				}
+			}
+			
+			m_LoginTimeScreen.SetTime(m_LoginTime);
+			m_LoginTimeScreen.Show();
+			
+			GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(this.LoginTimeCountdown, 1000, true);
+		}
+#endif
+	}
+	
+	// ------------------------------------------------------------
+	void LoginTimeCountdown()
+	{
+		if (m_LoginTime > 0)
+		{
+			if (m_LoginTimeScreen)
+				m_LoginTimeScreen.SetTime(m_LoginTime);
+
+			m_LoginTime--;
+		}
+		else
+		{
+			// stop the call loop
+			CancelLoginTimeCountdown();
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void OnRespawnEvent(int time)
+	{	
+		// use login time screen for respawn timer
+		if (time >= 0)
+		{	
+			m_LoginTime = time;
+			if (!m_LoginTimeScreen)
+			{
+				GetUIManager().CloseAll();
+				
+				UIScriptedMenu parent = GetUIManager().GetMenu();
+				EnterLoginTime(parent);
+			}
+			
+			m_LoginTimeScreen.SetRespawn(true);
+			m_LoginTimeScreen.SetTime(m_LoginTime);
+			m_LoginTimeScreen.Show();
+			
+			GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(this.LoginTimeCountdown, 1000, true);
+		}
+
+		if (GetPlayer())
+			GetPlayer().StopDeathDarkeningEffect();
+
+		PPERequesterBank.GetRequester(PPERequester_DeathDarkening).Start(new Param1<float>(1.0));
+	}
+	
+	// ------------------------------------------------------------
+	void OnPreloadEvent(vector pos)
+	{
+		// cancel only login time (respawn time is parallel with preload, but login time is not)
+		if (m_LoginTimeScreen && !m_LoginTimeScreen.IsRespawn())
+			CancelLoginTimeCountdown();
+		
+		// tell game to continue
+		StoreLoginDataPrepare();
+	}
+		
+	// ------------------------------------------------------------
+	// Serialize and send default character information to server (must be called)
+	void StoreLoginDataPrepare()
+	{
+		ScriptReadWriteContext ctx = new ScriptReadWriteContext;
+		
+		//GetMenuData().RequestGetDefaultCharacterData();
+		GetMenuDefaultCharacterData().SerializeCharacterData(ctx.GetWriteContext());
+		StoreLoginData(ctx.GetWriteContext());
+	}
+	
+	// ------------------------------------------------------------
+	void EnterLoginQueue(UIMenuPanel parent)
+	{
+		m_LoginQueue = LoginQueueBase.Cast(GetUIManager().EnterScriptedMenu(MENU_LOGIN_QUEUE, parent)); 		
+	}
+	
+	// ------------------------------------------------------------
+	void EnterLoginTime(UIMenuPanel parent)
+	{			 	
+		m_LoginTimeScreen = LoginTimeBase.Cast(GetUIManager().EnterScriptedMenu(MENU_LOGIN_TIME, parent)); 		
+	}
+	
+	// ------------------------------------------------------------
+	void OnMPConnectionLostEvent(int duration)
+	{
+		if (duration >= 0)//(-1 means conn. reestablished)
+			SetConnectivityStatState(EConnectivityStatType.CONN_LOST, EConnectivityStatLevel.LEVEL1);
+		else
+			SetConnectivityStatState(EConnectivityStatType.CONN_LOST, EConnectivityStatLevel.OFF);
+		
+		#ifdef PLATFORM_PS4
+		//PSN Set multiplay state	
+		if (duration < 0 && GetGameState() == DayZGameState.IN_GAME)
+		{
+			OnlineServices.SetMultiplayState(true);
+		}
+		else
+		{
+			OnlineServices.SetMultiplayState(false);
+		}
+		#endif
+	}
+	
+	// ------------------------------------------------------------
+	void LoadProgressUpdate(int progressState, float progress, string title)
+	{
+	#ifndef NO_GUI
+		switch (progressState)
+		{
+		case PROGRESS_START:
+			{
+			#ifndef NO_GUI	
+				// get out of the black screen immediately
+				GetUIManager().ScreenFadeOut(0);
+			#endif
+				m_loading.Inc();
+				m_loading.SetTitle(title);
+				if (m_loading.m_HintPanel)
+					m_loading.m_HintPanel.ShowRandomPage();
+				
+			}
+			break;
+	
+		case PROGRESS_FINISH:
+			{
+				m_loading.Dec();
+			}
+			break;
+	
+		case PROGRESS_PROGRESS:
+			{
+				m_loading.SetProgress(progress);
+				
+			}
+			break;
+	
+		case PROGRESS_UPDATE:
+			{
+				m_loading.SetProgress(0);
+			}
+			break;
+		}
+	#endif
+	}
+	
+	// ------------------------------------------------------------
+	override void OnAfterCreate()
+	{
+		Math.Randomize(-1);
+	}
+	
+	// ------------------------------------------------------------
+	override void OnActivateMessage()
+	{
+		RefreshMouseCursorVisibility();
+	}
+
+	// ------------------------------------------------------------
+	override void OnDeactivateMessage()
+	{
+		RefreshMouseCursorVisibility();
+	}
+	
+	// ------------------------------------------------------------
+	override bool OnInitialize()
+	{
+		ParticleList.PreloadParticles();
+		
+		RegisterProfilesOptions();
+		SetHudBrightness(GetHUDBrightnessSetting());
+		
+		InitNotifications();
+		m_Visited = new TStringArray;
+		GetProfileStringList("SB_Visited", m_Visited);
+		
+		if (GetLoadState() == DayZLoadState.UNDEFINED)
+		{
+			string param;
+			
+			if (GetCLIParam("join", param))
+			{
+				JoinLaunch();
+				#ifndef PLATFORM_PS4
+				CreateTitleScreen();
+				#endif
+			}
+			else if (GetCLIParam("connect", param))
+			{
+				ConnectLaunch();
+			}
+			else if (GetCLIParam("mission", param))
+			{
+				MissionLaunch();
+			}
+			else if (GetCLIParam("party", param))
+			{
+				PartyLaunch();
+			}
+			else
+			{
+				MainMenuLaunch();
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void InitNotifications()
+	{
+		NotificationSystem.InitInstance();
+		m_Notifications = new NotificationUI();
+	}
+	
+	protected ref Widget		m_IntroMenu;
+	protected ref Widget		m_GamepadDisconnectMenu; //DEPRECATED
+	protected int				m_PrevBlur;
+	
+	protected string			m_DatabaseID;
+	
+	protected string			m_ConnectAddress;
+	protected int				m_ConnectPort;
+	protected string			m_ConnectPassword;
+	
+	protected const int			MAX_VISITED = 50;
+	protected ref TStringArray	m_Visited;
+	
+	string GetDatabaseID()
+	{
+		return m_DatabaseID;
+	}
+	
+	void SetDatabaseID(string id)
+	{
+		m_DatabaseID = id;
+		if (GetUIManager().GetMenu())
+		{
+			GetUIManager().GetMenu().Refresh();
+		}
+	}
+	
+	void CreateTitleScreen()
+	{
+		DeleteTitleScreen();
+		m_IntroMenu = GetWorkspace().CreateWidgets("gui/layouts/xbox/day_z_title_screen.layout");
+		RichTextWidget text_widget = RichTextWidget.Cast(m_IntroMenu.FindAnyWidget("InputPromptText"));
+		m_IntroMenu.FindAnyWidget("notification_root").Show(false);
+		if (text_widget)
+		{
+			string text = Widget.TranslateString("#console_start_game");
+			#ifdef PLATFORM_XBOX
+				BiosUserManager user_manager = GetGame().GetUserManager();
+				if (user_manager && user_manager.GetSelectedUser())
+					text_widget.SetText(string.Format(text, "<image set=\"xbox_buttons\" name=\"A\" />"));
+				else
+					text_widget.SetText(string.Format(text, "<image set=\"xbox_buttons\" name=\"A\" />"));
+			#endif
+					
+			#ifdef PLATFORM_PS4
+				string confirm = "cross";
+				if (GetGame().GetInput().GetEnterButton() == GamepadButton.A)
+				{
+					confirm = "cross";
+				}
+				else
+				{
+					confirm = "circle";
+				}
+				text_widget.SetText(string.Format(text, "<image set=\"playstation_buttons\" name=\"" + confirm + "\" />"));
+			#endif
+		}
+		
+		#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_XBOX
+		#ifdef BUILD_EXPERIMENTAL
+			m_IntroMenu.FindAnyWidget("notification_root").Show(true);
+		#endif
+		#endif
+		#endif
+	}
+	
+	void DeleteTitleScreen()
+	{
+		if (m_IntroMenu)
+		{
+			delete m_IntroMenu;
+		}
+	}
+	
+	bool ShouldShowControllerDisconnect()
+	{
+		return m_ShouldShowControllerDisconnect;
+	}
+	
+	void UpdateInputDeviceDisconnectWarning()
+	{
+		#ifdef PLATFORM_CONSOLE
+		if (!GetUIManager().IsMenuOpen(MENU_WARNING_INPUTDEVICE_DISCONNECT))
+		{
+			m_ShouldShowControllerDisconnect = !GetInput().AreAllAllowedInputDevicesActive();
+			if (m_ShouldShowControllerDisconnect)
+			{
+				GetCallQueue(CALL_CATEGORY_GUI).Call(GetUIManager().EnterScriptedMenu,MENU_WARNING_INPUTDEVICE_DISCONNECT,GetUIManager().GetMenu());
+			}
+		}
+		#endif
+	}
+	
+	void JoinLaunch()
+	{
+		SetGameState(DayZGameState.JOIN);
+		SetLoadState(DayZLoadState.JOIN_START);
+		
+		#ifdef PLATFORM_CONSOLE
+			string join_param;
+			if (GetCLIParam("join", join_param))
+			{
+				BiosUserManager user_manager = GetUserManager();
+				user_manager.ParseJoinAsync(join_param);
+			}
+		#endif
+	}
+	
+	void ConnectLaunch()
+	{
+		BiosUserManager user_manager = GetUserManager();
+		if (user_manager.GetTitleInitiator())
+		{
+			user_manager.SelectUserEx(user_manager.GetTitleInitiator());
+		}
+		
+		SetGameState(DayZGameState.CONNECT);
+		SetLoadState(DayZLoadState.CONNECT_START);
+		
+		#ifndef PLATFORM_WINDOWS
+			#ifdef PLATFORM_CONSOLE
+				CreateTitleScreen();
+				GamepadCheck();
+			#endif
+		#else
+			ConnectFromCLI();
+		#endif
+	}
+	
+	void PartyLaunch()
+	{
+		SetGameState(DayZGameState.PARTY);
+		SetLoadState(DayZLoadState.PARTY_START);
+		BiosUserManager user_manager = GetGame().GetUserManager();
+		
+		string param;
+		if (GetCLIParam("party", param))
+		{
+			user_manager.ParsePartyAsync(param);
+			StartRandomCutscene(GetMainMenuWorld());
+		}
+	}
+	
+	void MainMenuLaunch()
+	{
+#ifdef PLATFORM_WINDOWS
+		BiosUserManager user_manager = GetUserManager();
+		if (user_manager)
+		{
+			if (user_manager.GetTitleInitiator())
+			{
+				user_manager.SelectUserEx(user_manager.GetTitleInitiator());
+			}
+		}
+#endif
+		
+		SetGameState(DayZGameState.MAIN_MENU);
+		SetLoadState(DayZLoadState.MAIN_MENU_START);		
+		StartRandomCutscene(GetMainMenuWorld());		
+		DeleteTitleScreen();
+	}
+	
+	void MissionLaunch()
+	{
+		BiosUserManager user_manager = GetUserManager();
+		if (user_manager)
+		{
+			if (user_manager.GetTitleInitiator())
+			{
+				user_manager.SelectUserEx(user_manager.GetTitleInitiator());
+			}
+		}
+		
+		SetGameState(DayZGameState.IN_GAME);
+		SetLoadState(DayZLoadState.MISSION_START);
+		
+
+		#ifndef PLATFORM_WINDOWS
+			#ifdef PLATFORM_CONSOLE			
+				#ifndef DEVELOPER
+					CreateTitleScreen();
+					GamepadCheck();
+					return;
+				#endif
+			#endif
+		#endif
+
+		string mission;
+		GetCLIParam("mission", mission);
+		PlayMission(mission);
+	}
+	
+	void SelectUser(int gamepad = -1)
+	{
+		BiosUserManager user_manager = GetUserManager();
+		if (user_manager)
+		{
+			BiosUser selected_user;
+			if (gamepad > -1)
+			{
+				GetInput().GetGamepadUser(gamepad, selected_user);
+				#ifdef PLATFORM_PS4
+				if (selected_user)
+				#endif
+				{
+					if (user_manager.SelectUserEx(selected_user))
+					{
+						GetGame().GetInput().IdentifyGamepad(GamepadButton.BUTTON_NONE);
+						GetInput().SelectActiveGamepad(gamepad);
+					}
+					else
+					{
+						selected_user = user_manager.GetSelectedUser();
+					}
+					
+					#ifdef PLATFORM_PS4
+					if (!selected_user.IsOnline())
+					{
+						user_manager.LogOnUserAsync(selected_user); 
+						return;
+					}
+					#endif
+				}
+				#ifdef PLATFORM_PS4
+				else
+				{
+					GetInput().ResetActiveGamepad();
+					GamepadCheck();
+				}
+				#endif
+			}
+			
+			if (!selected_user)
+				selected_user = user_manager.GetSelectedUser();
+			
+			if (!selected_user)
+			{
+				user_manager.PickUserAsync();
+				return;
+			}
+			
+			user_manager.SelectUserEx(selected_user);
+			
+			switch (GetLoadState())
+			{
+				case DayZLoadState.JOIN_START:
+				{
+					SetLoadState(DayZLoadState.JOIN_USER_SELECT);				
+					break;
+				}
+				case DayZLoadState.PARTY_START:
+				{
+					SetLoadState(DayZLoadState.PARTY_USER_SELECT);
+					break;
+				}
+				case DayZLoadState.MAIN_MENU_START:
+				{
+					SetLoadState(DayZLoadState.MAIN_MENU_USER_SELECT);
+					break;
+				}
+				case DayZLoadState.CONNECT_START:
+				{
+					SetLoadState(DayZLoadState.CONNECT_USER_SELECT);
+					break;
+				}
+				case DayZLoadState.MISSION_START:
+				{
+					SetLoadState(DayZLoadState.MISSION_USER_SELECT);
+					break;
+				}
+				default:
+					break;
+			}
+			
+			SelectGamepad();
+			g_Game.SetHudBrightness(g_Game.GetHUDBrightnessSetting());
+		}
+	}
+	
+	void SetPreviousGamepad(int gamepad)
+	{
+		m_PreviousGamepad = gamepad;
+	}
+	
+	int GetPreviousGamepad()
+	{
+		return m_PreviousGamepad;
+	}
+	
+	void GamepadCheck()
+	{
+#ifndef AUTOTEST
+		if (GetInput().IsActiveGamepadSelected())
+		{
+#endif
+			DeleteTitleScreen();
+			SelectUser();
+#ifndef AUTOTEST
+		}
+		else
+		{
+	#ifdef PLATFORM_CONSOLE
+		#ifndef PLATFORM_WINDOWS
+			#ifdef PLATFORM_PS4
+			if (GetUserManager().GetSelectedUser())
+			{
+				int gamepad = GetInput().GetUserGamepad(GetUserManager().GetSelectedUser());
+				if (gamepad > -1)
+				{
+					SelectUser(gamepad);
+				}
+				else
+				{
+					if (!m_IntroMenu && !(GetGame().GetUIManager().GetMenu() && GetGame().GetUIManager().GetMenu().GetID() == MENU_TITLE_SCREEN))
+						CreateTitleScreen();
+					GetGame().GetInput().IdentifyGamepad(GetGame().GetInput().GetEnterButton());
+				}
+			}
+			else
+			#endif
+			{
+				if (!m_IntroMenu && !(GetUIManager().GetMenu() && GetUIManager().GetMenu().GetID() == MENU_TITLE_SCREEN))
+					CreateTitleScreen();
+				GetInput().IdentifyGamepad(GetInput().GetEnterButton());
+			}
+		#endif
+	#endif
+		}
+#endif
+	}
+	
+	void SelectGamepad()
+	{
+		ResetProfileOptions();
+		BiosUserManager user_manager = GetUserManager();
+		
+		if (user_manager)
+		{
+			BiosUser selected_user = user_manager.GetSelectedUser();
+			if (selected_user)
+			{
+				OnlineServices.SetBiosUser(selected_user);
+				SetPlayerName(selected_user.GetName());
+				SetUserFOV(GetUserFOVFromConfig());
+				#ifdef PLATFORM_CONSOLE
+				SetPlayerGameName(selected_user.GetName());
+				user_manager.GetUserDatabaseIdAsync();
+				#endif
+			}
+			
+			if (GetUIManager().GetMenu())
+			{
+				GetUIManager().GetMenu().Refresh();
+			}
+		}
+		
+		switch (GetLoadState())
+		{
+			case DayZLoadState.JOIN_USER_SELECT:
+			{
+				SetLoadState(DayZLoadState.JOIN_CONTROLLER_SELECT);
+				OnlineServices.LoadMPPrivilege();
+				break;
+			}
+			case DayZLoadState.PARTY_USER_SELECT:
+			{
+				SetLoadState(DayZLoadState.PARTY_CONTROLLER_SELECT);
+				DeleteTitleScreen();
+				GetUIManager().EnterScriptedMenu(MENU_SERVER_BROWSER, GetUIManager().GetMenu());
+				break;
+			}
+			case DayZLoadState.CONNECT_USER_SELECT:
+			{
+				SetLoadState(DayZLoadState.CONNECT_CONTROLLER_SELECT);
+				OnlineServices.LoadMPPrivilege();
+				break;
+			}
+			case DayZLoadState.MAIN_MENU_USER_SELECT:
+			{
+				SetLoadState(DayZLoadState.MAIN_MENU_CONTROLLER_SELECT);
+				DeleteTitleScreen();
+				GetUIManager().EnterScriptedMenu(MENU_MAIN, GetUIManager().GetMenu());
+				break;
+			}
+			case DayZLoadState.MISSION_USER_SELECT:
+			{
+				SetLoadState(DayZLoadState.MISSION_CONTROLLER_SELECT);
+				DeleteTitleScreen();
+				string mission;
+				GetCLIParam("mission", mission);
+				PlayMission(mission);
+				break;
+			}
+		}
+	}
+	
+	void TryConnect()
+	{
+		if (GetLoadState() == DayZLoadState.JOIN_CONTROLLER_SELECT)
+		{
+			SetGameState(DayZGameState.CONNECTING);
+			OnlineServices.GetSession();
+		}
+		else
+		{
+			if (GetGameState() != DayZGameState.CONNECTING)
+			{
+				switch (GetLoadState())
+				{
+					case DayZLoadState.CONNECT_CONTROLLER_SELECT:
+					{
+						SetGameState(DayZGameState.CONNECTING);
+						ConnectFromCLI();
+						break;
+					}
+					case DayZLoadState.PARTY_CONTROLLER_SELECT:
+					{
+						SetGameState(DayZGameState.CONNECTING);
+						Connect();
+						break;
+					}
+					case DayZLoadState.MAIN_MENU_CONTROLLER_SELECT:
+					{
+						SetGameState(DayZGameState.CONNECTING);
+						Connect();
+						break;
+					}
+				}
+			}
+			else
+			{
+				string address;
+				int port;
+				if (GetHostAddress(address, port))
+				{
+					if (m_ConnectAddress == address && m_ConnectPort == port)
+						ErrorModuleHandler.ThrowError(ErrorCategory.ConnectErrorScript, EConnectErrorScript.ALREADY_CONNECTING_THIS);
+					else
+						ErrorModuleHandler.ThrowError(ErrorCategory.ConnectErrorScript, EConnectErrorScript.ALREADY_CONNECTING, string.Format("%1:%2", address, port));
+				}
+				else	
+				{
+					DisconnectSessionForce();
+					DisconnectSessionScript();
+					TryConnect();
+				}
+			}
+		}
+	}
+	
+	bool GetLastVisitedServer(out string ip, out int port)
+	{
+		if (m_Visited)
+		{
+			if (m_Visited.Count() > 0)
+			{
+				string uid = m_Visited.Get(m_Visited.Count() - 1);
+				TStringArray output = new TStringArray;
+				uid.Split(":", output);
+				ip = output[0];
+				port = output[1].ToInt();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	void AddVisitedServer(string ip, int port)
+	{
+		string uid = ip + ":" + port;
+		if (m_Visited)
+		{
+			int pos = m_Visited.Find(uid);
+			 
+			if (pos < 0)
+			{
+				if (m_Visited.Count() == MAX_VISITED)
+					m_Visited.Remove(0);
+				m_Visited.Insert(uid);
+			}
+			else
+			{
+				// if item is not saved as last server, move it
+				if (pos != (m_Visited.Count() - 1))
+				{
+					m_Visited.Remove(pos);
+					m_Visited.Insert(uid);
+				}
+			}
+			SetProfileStringList("SB_Visited", m_Visited);
+			SaveProfile();
+		}
+	}
+	
+	bool IsVisited(string ip, int port)
+	{
+		string uid = ip + ":" + port;
+		int index = m_Visited.Find(uid);
+		return (index >= 0);
+	}
+	
+	void RefreshCurrentServerInfo()
+	{
+		string addr;
+		int port;
+		if (GetHostAddress(addr, port))
+		{
+			m_ConnectAddress = addr;
+			m_ConnectPort = port;
+		}
+		OnlineServices.GetCurrentServerInfo(m_ConnectAddress, m_ConnectPort);
+	}
+
+	void Connect()
+	{
+		SetConnecting(true);
+		
+		DeleteTitleScreen();
+		string addr;
+		int port;
+		if (GetHostAddress(addr, port))
+		{
+			if (m_ConnectAddress == addr && m_ConnectPort == port)
+				return;
+		}
+
+		if (Connect(GetUIManager().GetMenu(), m_ConnectAddress, m_ConnectPort, m_ConnectPassword) != 0)
+			DisconnectSessionScript(true);
+	}
+	
+	void DisconnectSessionScript(bool displayJoinError = false)
+	{
+		DisconnectSessionFlags flags = DisconnectSessionFlags.SELECT_USER | DisconnectSessionFlags.IGNORE_WHEN_IN_GAME;
+		if (displayJoinError)
+		{
+			flags |= DisconnectSessionFlags.JOIN_ERROR_ENABLED;
+			flags |= DisconnectSessionFlags.JOIN_ERROR_CHECK;
+		}
+		
+		DisconnectSessionEx(flags);
+	}
+	
+	void DisconnectSessionEx(DisconnectSessionFlags flags)
+	{
+		if (flags & DisconnectSessionFlags.SELECT_USER && OnlineServices.GetBiosUser())
+		{
+			GetGame().GetUserManager().SelectUserEx(OnlineServices.GetBiosUser());
+		}
+		
+		if (flags & DisconnectSessionFlags.JOIN_ERROR_ENABLED)
+		{
+			if (!(flags & DisconnectSessionFlags.JOIN_ERROR_CHECK) || GetGameState() == DayZGameState.JOIN)
+			{
+				NotificationSystem.AddNotification(NotificationType.JOIN_FAIL_GET_SESSION, NotificationSystem.DEFAULT_TIME_DISPLAYED);
+			}
+		}
+		
+		if (flags & DisconnectSessionFlags.IGNORE_WHEN_IN_GAME && GetGameState() == DayZGameState.IN_GAME)
+		{
+			return;
+		}
+		
+		if (flags & DisconnectSessionFlags.CLOSE_MENUS && GetGame().GetUIManager())
+		{
+			GetGame().GetUIManager().CloseAllSubmenus();
+			
+			if ( GetGame().GetUIManager().IsDialogVisible() )
+			{
+				GetGame().GetUIManager().CloseDialog();
+			}
+		}
+			
+		if (flags & DisconnectSessionFlags.ALWAYS_FORCE)
+		{
+			DisconnectSessionForce();
+		}
+		
+		if (GetGame().GetMission())
+		{
+			if (g_Game.GetGameState() != DayZGameState.MAIN_MENU)
+			{	
+				if (flags & DisconnectSessionFlags.DISCONNECT_ERROR_ENABLED)
+				{
+					NotificationSystem.AddNotification(NotificationType.DISCONNECTED, NotificationSystem.DEFAULT_TIME_DISPLAYED);
+				}
+				
+				GetGame().GetMission().AbortMission();
+
+				SetGameState(DayZGameState.MAIN_MENU);
+				SetLoadState(DayZLoadState.MAIN_MENU_CONTROLLER_SELECT);
+				
+				GamepadCheck();
+			}
+		}
+		
+		else
+		{
+			MainMenuLaunch();
+		}
+	}
+	
+	void ConnectFromServerBrowser(string ip, int port, string password = "")
+	{
+		m_ConnectAddress	= ip;
+		m_ConnectPort		= port;
+		m_ConnectPassword	= password;
+		m_ConnectFromJoin	= false;
+		OnlineServices.LoadMPPrivilege();
+	}
+	
+	void ConnectFromJoin(string ip, int port)
+	{
+		m_ConnectAddress	= ip;
+		m_ConnectPort		= port;
+		m_ConnectFromJoin	= true;
+		Connect();
+	}
+	
+	void ConnectFromCLI()
+	{
+		string port;
+		if (GetCLIParam("connect", m_ConnectAddress))
+		{
+			GetCLIParam("port", port);
+			m_ConnectPort = port.ToInt();
+			
+			GetCLIParam("password", m_ConnectPassword);
+			
+			m_ConnectFromJoin = false;
+			Connect();
+		}
+	}
+	
+	bool IsLeftCtrlDown()
+	{
+		return m_IsCtrlHolding;
+	}
+	
+	// ------------------------------------------------------------
+	override void OnKeyPress(int key)
+	{
+	
+		if (key == KeyCode.KC_LCONTROL) 
+		{
+			m_IsCtrlHolding = true;
+		}
+
+		if (key == KeyCode.KC_LMENU)
+		{
+			m_IsLeftAltHolding = true;
+		}
+			
+		if (key == KeyCode.KC_RMENU)
+		{
+			m_IsRightAltHolding = true;
+		}
+	
+		if (m_keyboard_handler)
+		{
+			m_keyboard_handler.OnKeyDown(NULL, 0, 0, key);
+		}
+		
+		Mission mission = GetMission();
+		if (mission)
+		{
+			mission.OnKeyPress(key);
+		}
+	
+#ifdef DEVELOPER
+		if ((m_IsLeftAltHolding || m_IsLeftAltHolding) && key == KeyCode.KC_F4)
+		{
+			RequestExit(0);
+		}
+#endif
+		
+	}
+	
+	// ------------------------------------------------------------
+	override void OnKeyRelease(int key)
+	{
+		if (key == KeyCode.KC_LCONTROL) 
+		{
+			m_IsCtrlHolding = false;
+		}
+		
+		if (key == KeyCode.KC_LWIN) 
+		{
+			m_IsWinHolding = false;
+		}
+
+		if (key == KeyCode.KC_LMENU || key == KeyCode.KC_RMENU)
+		{
+			m_IsLeftAltHolding = false;
+		}
+
+		if (key == KeyCode.KC_RMENU)
+		{
+			m_IsRightAltHolding  = false;
+		}
+
+		if (m_keyboard_handler)
+		{
+			m_keyboard_handler.OnKeyUp(NULL, 0, 0, key);
+		}
+	
+		Mission mission = GetMission();
+		if (mission)
+		{
+			mission.OnKeyRelease(key);
+		}
+	}
+	
+	// ------------------------------------------------------------	
+	override void OnMouseButtonPress(int button)
+	{
+		Mission mission = GetMission();
+		if (mission)
+		{
+			mission.OnMouseButtonPress(button);
+		}
+	}
+	
+	// ------------------------------------------------------------
+	override void OnMouseButtonRelease(int button)
+	{
+		Mission mission = GetMission();
+		if (mission)
+		{
+			mission.OnMouseButtonRelease(button);
+		}
+	}
+	
+	// ------------------------------------------------------------
+	override void OnDeviceReset()
+	{
+		m_IsCtrlHolding = false;
+		m_IsWinHolding = false;
+		m_IsLeftAltHolding = false;
+		m_IsRightAltHolding  = false;
+	}
+
+	// ------------------------------------------------------------
+	float GetDeltaT()
+	{
+		return m_DeltaTime;
+	}
+	
+	// ------------------------------------------------------------
+	override void OnUpdate(bool doSim, float timeslice)
+	{
+		m_DeltaTime = timeslice;
+
+		Mission mission = GetMission();
+		bool gameIsRunning = false;
+	
+		if (doSim && mission && !mission.IsPaused())
+		{
+			gameIsRunning = true;
+		}
+	
+		if (doSim && mission)
+		{
+			mission.OnUpdate(timeslice);
+		}
+	
+		// queues and timers update
+		GetCallQueue(CALL_CATEGORY_SYSTEM).Tick(timeslice);
+		GetUpdateQueue(CALL_CATEGORY_SYSTEM).Invoke(timeslice);
+		GetTimerQueue(CALL_CATEGORY_SYSTEM).Tick(timeslice);
+	
+	#ifndef NO_GUI	
+		if (m_IsConnecting)
+			UpdateLoginQueue(timeslice);
+		
+		if (m_loading && m_loading.IsLoading())
+		{
+			m_loading.OnUpdate(timeslice);
+		}
+		else if (m_LoginTimeScreen && m_LoginTimeScreen.IsStatic())
+		{
+			m_LoginTimeScreen.Update(timeslice);
+		}
+		else
+		{
+			GetCallQueue(CALL_CATEGORY_GUI).Tick(timeslice);
+			GetUpdateQueue(CALL_CATEGORY_GUI).Invoke(timeslice);
+			GetTimerQueue(CALL_CATEGORY_GUI).Tick(timeslice);
+			GetDragQueue().Tick();
+		}
+		
+		NotificationSystem.Update(timeslice);
+		if (m_Notifications)
+		{
+			m_Notifications.Update(timeslice);
+		}
+		
+		#ifndef SERVER
+		#ifdef DIAG_DEVELOPER
+		if (GetGame().IsMultiplayer() && GetPlayer() && DiagMenu.GetBool(DiagMenuIDs.MISC_CONNECTION_STATS))
+		{
+			PlayerIdentity playerIdentity = GetPlayer().GetIdentity();
+			
+			if (playerIdentity)
+			{
+				int pingAct = playerIdentity.GetPingAct();
+				int pingAvg = playerIdentity.GetPingAvg();
+			}
+			
+			DrawPerformaceStats(pingAct, pingAvg);
+		}
+		#endif
+		#endif
+		
+	#endif
+	
+		if (gameIsRunning)
+		{
+			GetCallQueue(CALL_CATEGORY_GAMEPLAY).Tick(timeslice);
+			GetUpdateQueue(CALL_CATEGORY_GAMEPLAY).Invoke(timeslice);
+			GetTimerQueue(CALL_CATEGORY_GAMEPLAY).Tick(timeslice);
+		}
+	}
+	
+	// ------------------------------------------------------------
+	override void OnPostUpdate(bool doSim, float timeslice)
+	{
+		Mission mission = GetMission();
+		bool gameIsRunning = false;
+	
+		if (doSim && mission && !mission.IsPaused())
+		{
+			gameIsRunning = true;
+		}
+		
+		GetPostUpdateQueue(CALL_CATEGORY_SYSTEM).Invoke(timeslice);
+	
+	#ifndef NO_GUI	
+		if (m_loading && m_loading.IsLoading())
+		{
+		}
+		else if (m_LoginTimeScreen && m_LoginTimeScreen.IsStatic())
+		{
+		}
+		else
+		{
+			GetPostUpdateQueue(CALL_CATEGORY_GUI).Invoke(timeslice);
+		}
+	#endif
+	
+		if (gameIsRunning)
+		{
+			GetPostUpdateQueue(CALL_CATEGORY_GAMEPLAY).Invoke(timeslice);
+		}
+	}
+	
+	// ------------------------------------------------------------
+	override void OnRPC(PlayerIdentity sender, Object target, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(sender, target, rpc_type, ctx);
+		Event_OnRPC.Invoke(sender, target, rpc_type, ctx);
+		
+		//Print("["+ GetGame().GetTime().ToString() +"] => DayZGame::OnRPC = "+ EnumTools.EnumToString(ERPCs,rpc_type));
+		
+		if (target)
+		{
+			// call rpc on target
+			target.OnRPC(sender, rpc_type, ctx);
+		}
+		else
+		{
+			switch (rpc_type)
+			{
+				#ifndef SERVER
+				#ifndef NO_GUI
+				case ERPCs.RPC_CFG_GAMEPLAY_SYNC:
+				{
+					CfgGameplayHandler.OnRPC(null, ctx);
+					break;
+				}
+				case ERPCs.RPC_UNDERGROUND_SYNC:
+				{
+					UndergroundAreaLoader.OnRPC(ctx);
+					break;
+				}
+				case ERPCs.RPC_SEND_NOTIFICATION:
+				{
+					NotificationType type;
+					float show_time;
+					string detail_text;
+					
+					ctx.Read(type);
+					ctx.Read(show_time);
+					ctx.Read(detail_text);
+					
+					NotificationSystem.AddNotification(type, show_time, detail_text);
+					break;
+				}
+				case ERPCs.RPC_SEND_NOTIFICATION_EXTENDED:
+				{
+					float show_time_ext;
+					string title_text_ext;
+					string detail_text_ext;
+					string icon_ext;
+					
+					ctx.Read(show_time_ext);
+					ctx.Read(title_text_ext);
+					ctx.Read(detail_text_ext);
+					ctx.Read(icon_ext);
+					
+					NotificationSystem.AddNotificationExtended(show_time_ext, title_text_ext, detail_text_ext, icon_ext);
+					break;
+				}
+				
+				
+				case ERPCs.RPC_SOUND_HELICRASH:
+				{
+					bool playSound;
+					vector pos;
+					string sound_set;
+					
+					//Helicrash is a world event, we want anyone to be able to hear it
+					Param3<bool, vector, int> playCrashSound = new Param3<bool, vector, int>(false, "0 0 0",0);
+					if (ctx.Read(playCrashSound))
+					{
+						playSound = playCrashSound.param1;
+						pos = playCrashSound.param2;
+						sound_set = CrashSoundSets.GetSoundSetByHash(playCrashSound.param3);
+					}
+					
+					if (playSound)
+					{
+						m_CrashSound = SEffectManager.PlaySound(sound_set, pos, 0.1, 0.1);
+						m_CrashSound.SetAutodestroy(true);
+					}
+				
+				break;
+				}
+				//Random off map artillery barrage
+				case ERPCs.RPC_SOUND_ARTILLERY:
+				{
+					vector position;
+					Param1<vector> playArtySound = new Param1<vector>(vector.Zero);
+					if (ctx.Read(playArtySound))
+					{
+						position = playArtySound.param1;
+						if (position == vector.Zero)
+							break;
+					}
+					else
+						break;
+					
+					if (!GetGame().GetPlayer())
+						break;
+					
+					if (vector.DistanceSq(GetGame().GetPlayer().GetPosition(), position) <= (MIN_ARTY_SOUND_RANGE * MIN_ARTY_SOUND_RANGE))
+						break;
+					
+					m_ArtySound = SEffectManager.PlaySound("Artillery_Distant_Barrage_SoundSet", position, 0.1, 0.1);
+					m_ArtySound.SetAutodestroy(true);
+				
+				break;
+				}
+				case ERPCs.RPC_SOUND_CONTAMINATION:
+				{
+					vector soundPos;
+					
+					Param1<vector> playContaminatedSound = new Param1<vector>(vector.Zero);
+					if (ctx.Read(playContaminatedSound))
+					{
+						soundPos = playContaminatedSound.param1;
+						if (soundPos == vector.Zero)
+							break;
+					}
+					else
+						break;
+					
+					if (!GetGame().GetPlayer())
+						break;
+					
+					EffectSound closeArtySound = SEffectManager.PlaySound("Artillery_Close_SoundSet", soundPos);
+					closeArtySound.SetAutodestroy(true);
+					
+					// We add camera shake upon shell detonation
+					float distance_to_player = vector.DistanceSq(soundPos, GetGame().GetPlayer().GetPosition());
+					if (distance_to_player <= GameConstants.CAMERA_SHAKE_ARTILLERY_DISTANCE2)
+					{
+						float strength_factor = Math.InverseLerp(GameConstants.CAMERA_SHAKE_ARTILLERY_DISTANCE, 0, Math.Sqrt(distance_to_player));
+						DayZPlayerCamera camera = GetGame().GetPlayer().GetCurrentCamera();
+						if (camera)
+							camera.SpawnCameraShake(strength_factor * 4);
+					}
+					
+					ParticleManager.GetInstance().PlayInWorld(ParticleList.CONTAMINATED_AREA_GAS_SHELL, soundPos);
+					break;
+				}
+				// Single artillery shot to announce dynamic contaminated area
+				case ERPCs.RPC_SOUND_ARTILLERY_SINGLE:
+				{
+					vector soundPosition;
+					vector delayedSoundPos;
+					float soundDelay;
+					
+					Param3<vector, vector, float> playArtyShotSound = new Param3<vector, vector, float>(vector.Zero, vector.Zero, 0);
+					if (ctx.Read(playArtyShotSound))
+					{
+						soundPosition = playArtyShotSound.param1;
+						delayedSoundPos = playArtyShotSound.param2;
+						soundDelay = playArtyShotSound.param3;
+						if (soundPosition == vector.Zero)
+							break;
+					}
+					else
+						break;
+					
+					if (!GetGame().GetPlayer())
+						break;
+					
+					m_ArtySound = SEffectManager.PlaySound("Artillery_Distant_SoundSet", soundPosition, 0.1, 0.1);
+					m_ArtySound.SetAutodestroy(true);
+					
+					// We remove the amount of time the incoming sound lasts
+					soundDelay -= 5;
+					// We convert to milliseconds
+					soundDelay *= 1000;
+					GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(DelayedMidAirDetonation, soundDelay, false, delayedSoundPos[0], delayedSoundPos[1], delayedSoundPos[2]);
+					break;
+				}
+				case ERPCs.RPC_SET_BILLBOARDS:
+				{
+					if (!m_BillboardSetHandler)
+						m_BillboardSetHandler = new BillboardSetHandler();
+					
+					Param1<int> indexP = new Param1<int>(-1);
+					if (ctx.Read(indexP))
+					{
+						int index = indexP.param1;
+						m_BillboardSetHandler.OnRPCIndex(index);
+					}
+					break;
+				}
+				#endif
+				#endif
+
+				case ERPCs.RPC_USER_SYNC_PERMISSIONS:
+				{
+					map<string, bool> mute_list;
+					if (ctx.Read(mute_list))
+					{
+						for (int i = 0; i < mute_list.Count(); i++)
+						{
+							string uid = mute_list.GetKey(i);
+							bool mute = mute_list.GetElement(i);
+							MutePlayer(uid, sender.GetPlainId(), mute);
+						}
+					}
+					break;
+				}
+				
+				/*
+				case ERPCs.RPC_SERVER_RESPAWN_MODE:
+				{
+					int mode;
+					if (ctx.Read(mode) && !IsServer())
+					{
+						GetMission().SetRespawnModeClient(mode);
+					}
+				}
+				*/
+
+				#ifdef DEVELOPER
+				case ERPCs.DEV_SET_WEATHER:
+				{
+					Param1<DebugWeatherRPCData> p1data = new Param1<DebugWeatherRPCData>(null);
+					
+					if ( ctx.Read(p1data) )
+					{
+						DebugWeatherRPCData data = p1data.param1;
+						
+						if (data.m_FogValue >= 0)
+							GetGame().GetWeather().GetFog().Set(data.m_FogValue, data.m_FogInterpolation, data.m_FogDuration);
+						
+						if (data.m_OvercastValue >= 0)
+							GetGame().GetWeather().GetOvercast().Set(data.m_OvercastValue, data.m_OvercastInterpolation, data.m_OvercastDuration);
+						
+						if (data.m_RainValue >= 0)
+							GetGame().GetWeather().GetRain().Set(data.m_RainValue, data.m_RainInterpolation, data.m_RainDuration);
+						
+					}
+					else
+					{
+						ErrorEx("Failed to read weather debug data");
+					}
+					break;
+				}
+				#endif
+				
+				
+				#ifdef DIAG_DEVELOPER
+				#ifdef SERVER
+				case ERPCs.DIAG_CAMERATOOLS_CAM_DATA:
+				{
+					if (!m_CameraToolsMenuServer)
+					{
+						m_CameraToolsMenuServer = new CameraToolsMenuServer;
+					}
+					m_CameraToolsMenuServer.OnRPC(rpc_type, ctx);
+					break;
+				}
+				
+				case ERPCs.DIAG_CAMERATOOLS_CAM_SUBSCRIBE:
+				{
+					if (!m_CameraToolsMenuServer)
+					{
+						m_CameraToolsMenuServer = new CameraToolsMenuServer;
+					}
+					m_CameraToolsMenuServer.OnRPC(rpc_type, ctx);
+					break;
+				}
+
+				#endif
+				#endif
+
+			}
+			// global rpc's handling
+		}
+	}
+	
+	void DelayedMidAirDetonation(float x, float y, float z)
+	{
+		EffectSound artilleryFallSound = SEffectManager.PlaySound("Artillery_Fall_SoundSet", Vector(x, y, z));
+		artilleryFallSound.SetAutodestroy(true);
+	}
+	
+	// ------------------------------------------------------------
+	void CheckDialogs()
+	{
+		#ifndef NO_GUI	
+		Mission mission = GetMission();
+		if (mission && !m_loading.IsLoading() && GetUIManager().IsDialogQueued())
+		{
+			mission.Pause();
+			GetUIManager().ShowQueuedDialog();
+		}
+		#endif
+	}
+	
+	//! Returns true when connecting to server
+	void SetConnecting(bool value)
+	{
+		m_IsConnecting = value;
+	}
+	
+	bool IsConnecting()
+	{
+		return m_IsConnecting;
+	}
+	
+	// ------------------------------------------------------------
+	bool IsLoading()
+	{
+		return m_loading && m_loading.IsLoading();
+	}
+	
+	// ------------------------------------------------------------
+	void SetKeyboardHandle(UIScriptedMenu handler)
+	{
+		m_keyboard_handler = handler;
+	}
+	
+	// ------------------------------------------------------------
+	void LoadingShow()
+	{
+		#ifndef NO_GUI	
+		m_loading.ShowEx(this);
+		#endif
+	}
+	
+	// ------------------------------------------------------------
+	void LoadingHide(bool force = false)
+	{
+		#ifndef NO_GUI
+			m_loading.Hide(force);
+			// turn the lights back on
+			PPEManagerStatic.GetPPEManager().StopAllEffects();
+			#ifdef PLATFORM_CONSOLE
+			if (!IsLoading())
+			{
+				if (m_LoadState != DayZLoadState.MAIN_MENU_START && m_LoadState != DayZLoadState.MAIN_MENU_USER_SELECT)
+				{
+					UpdateInputDeviceDisconnectWarning();
+				}
+			}
+			#endif
+		#endif
+	}
+
+	// ------------------------------------------------------------
+	override string CreateDefaultPlayer()
+	{				
+		if (m_CharClassNames.Count() > 0)
+			return m_CharClassNames[0];
+
+		return "";
+	}
+	
+	// ------------------------------------------------------------
+	override string CreateRandomPlayer()
+	{
+		return m_CharClassNames.GetRandomElement();
+	}
+	
+	// ------------------------------------------------------------
+	override TStringArray ListAvailableCharacters()
+	{
+		return m_CharClassNames;
+	}
+	
+	// ------------------------------------------------------------
+	void ExplosionEffectsEx(Object source, Object directHit, int componentIndex, float energyFactor, float explosionFactor, HitInfo hitInfo)
+	{
+		vector pos = hitInfo.GetPosition();
+		string ammoType = hitInfo.GetAmmoType();
+		
+		// Call legacy method
+		ExplosionEffects(source, directHit, componentIndex, hitInfo.GetSurface(), pos, hitInfo.GetSurfaceNormal(), energyFactor, explosionFactor, hitInfo.IsWater(), ammoType);
+		
+		// add explosion noise
+		if (IsServer())
+		{
+			//NoiseParams npar = new NoiseParams();
+			m_NoiseParams.LoadFromPath(string.Format("cfgAmmo %1 NoiseExplosion", ammoType));
+			
+			GetNoiseSystem().AddNoiseTarget(pos, 21, m_NoiseParams, hitInfo.GetSurfaceNoiseMultiplier());
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void ExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal,
+		float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+		#ifndef SERVER
+		if (source)
+		{
+			source.OnExplosionEffects(source, directHit, componentIndex, surface, pos, surfNormal, energyFactor, explosionFactor, isWater, ammoType);
+			
+			if (source.ShootsExplosiveAmmo() && ammoType == "Explosion_40mm_Ammo")
+				ParticleManager.GetInstance().PlayInWorld(ParticleList.EXPLOSION_LANDMINE, pos);
+			
+			float distance_to_player = vector.Distance(pos, GetGame().GetPlayer().GetPosition());
+			m_AmmoShakeParams.Load(ammoType);
+			
+			if (distance_to_player < m_AmmoShakeParams.m_Radius)
+			{
+				float dist01 = Math.InverseLerp(0, m_AmmoShakeParams.m_Radius, distance_to_player);
+				float modifier = Math.Lerp(m_AmmoShakeParams.m_ModifierClose, m_AmmoShakeParams.m_ModifierFar,dist01);
+				
+				GetGame().GetPlayer().GetCurrentCamera().SpawnCameraShake(modifier * m_AmmoShakeParams.m_Strength);
+			}
+		}
+		#endif
+	}
+	
+	// ------------------------------------------------------------
+	void OnProjectileStopped(ProjectileStoppedInfo info)
+	{
+		string simulation;
+		
+		GetGame().ConfigGetText("cfgAmmo " + info.GetAmmoType() + " simulation", simulation);	
+
+		if (simulation == "shotArrow")
+		{
+			string pile;
+			
+			GetGame().ConfigGetText("cfgAmmo " + info.GetAmmoType() + " spawnPileType", pile);
+			
+			EntityAI arrow = EntityAI.Cast(GetGame().CreateObjectEx(pile, info.GetPos(), ECE_DYNAMIC_PERSISTENCY));
+			arrow.PlaceOnSurface();	
+			arrow.SetFromProjectile(info);
+		}
+	}
+	
+	const float ARROW_PIERCE_DEPTH = 0.05;
+	
+	// ------------------------------------------------------------
+	void OnProjectileStoppedInTerrain(TerrainCollisionInfo info)
+	{
+		string simulation;
+		
+		if (info.GetIsWater())
+			return;
+		
+		GetGame().ConfigGetText("cfgAmmo " + info.GetAmmoType() + " simulation", simulation);
+		if (simulation == "shotArrow")
+		{
+			string pile;
+			GetGame().ConfigGetText("cfgAmmo " + info.GetAmmoType() + " spawnPileType", pile);
+			vector pos = info.GetPos();
+			vector dir = -info.GetInVelocity();
+			
+			dir.Normalize();
+			pos -= dir * ARROW_PIERCE_DEPTH;
+			
+			EntityAI arrow = EntityAI.Cast(GetGame().CreateObjectEx(pile, pos, ECE_KEEPHEIGHT|ECE_DYNAMIC_PERSISTENCY));
+			arrow.SetDirection(dir);
+			arrow.SetFromProjectile(info);
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void OnProjectileStoppedInObject(ObjectCollisionInfo info)
+	{
+		string simulation;
+		
+		GetGame().ConfigGetText("cfgAmmo " + info.GetAmmoType() + " simulation", simulation);	
+		if (simulation == "shotArrow")
+		{
+			string pile;
+			GetGame().ConfigGetText("cfgAmmo " + info.GetAmmoType() + " spawnPileType", pile);
+			
+			EntityAI arrow = null;
+			EntityAI ent = EntityAI.Cast(info.GetHitObj());
+			if (ent)
+			{
+				EntityAI parent = ent.GetHierarchyParent();
+				if (parent && parent.IsPlayer())
+				{
+					arrow = EntityAI.Cast(GetGame().CreateObjectEx(pile, parent.GetPosition(), ECE_DYNAMIC_PERSISTENCY));
+					arrow.PlaceOnSurface();	
+					arrow.SetFromProjectile(info);
+	
+					return;
+				}
+			}
+			
+			vector pos = info.GetPos();
+			vector dir = -info.GetInVelocity();
+			
+			dir.Normalize();
+			pos -= dir * ARROW_PIERCE_DEPTH;
+			
+			arrow = EntityAI.Cast(GetGame().CreateObjectEx(pile, pos, ECE_KEEPHEIGHT|ECE_DYNAMIC_PERSISTENCY));
+			arrow.SetDirection(dir);
+			arrow.SetFromProjectile(info);
+			
+			info.GetHitObj().AddArrow(arrow, info.GetComponentIndex(), info.GetHitObjPos(), info.GetHitObjRot());
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void FirearmEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal,
+		 vector exitPos, vector inSpeed, vector outSpeed, bool isWater, bool deflected, string ammoType) 
+	{
+		#ifndef SERVER
+		ImpactEffectsData impactEffectsData = new ImpactEffectsData();
+		impactEffectsData.m_DirectHit 		= directHit;
+		impactEffectsData.m_ComponentIndex 	= componentIndex;
+		impactEffectsData.m_Surface 		= surface;
+		impactEffectsData.m_Position		= pos;
+		impactEffectsData.m_ImpactType		= ImpactTypes.UNKNOWN;
+		impactEffectsData.m_SurfaceNormal	= surfNormal;
+		impactEffectsData.m_ExitPosition	= exitPos;
+		impactEffectsData.m_InSpeed			= inSpeed;
+		impactEffectsData.m_OutSpeed		= outSpeed;
+		impactEffectsData.m_IsDeflected		= deflected;
+		impactEffectsData.m_AmmoType		= ammoType;
+		impactEffectsData.m_IsWater			= isWater;
+
+		if (directHit)
+		{
+			directHit.OnReceivedHit(impactEffectsData);
+		}
+
+		ImpactMaterials.EvaluateImpactEffectEx(impactEffectsData);
+		#endif
+		
+		
+		if (IsServer())
+		{
+			if (source && source.ShootsExplosiveAmmo() && !deflected && outSpeed == vector.Zero)
+			{
+				if (ammoType == "Bullet_40mm_ChemGas")
+				{
+					GetGame().CreateObject("ContaminatedArea_Local", pos);
+				}
+				else if (ammoType == "Bullet_40mm_Explosive")
+				{
+					DamageSystem.ExplosionDamage(EntityAI.Cast(source), null, "Explosion_40mm_Ammo", pos, DamageType.EXPLOSION);
+				}
+			}
+			
+			// add hit noise
+			m_NoiseParams.LoadFromPath("cfgAmmo " + ammoType + " NoiseHit");
+			
+			float surfaceCoef = SurfaceGetNoiseMultiplier(directHit, pos, componentIndex);
+			float coefAdjusted = surfaceCoef * inSpeed.Length() / ConfigGetFloat("cfgAmmo " + ammoType + " initSpeed");
+			GetNoiseSystem().AddNoiseTarget(pos, 10, m_NoiseParams, coefAdjusted); // Leave a ping for 5 seconds
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void CloseCombatEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal,
+		 bool isWater, string ammoType) 
+	{
+		#ifndef SERVER
+		ImpactEffectsData impactEffectsData = new ImpactEffectsData();
+		impactEffectsData.m_DirectHit 		= directHit;
+		impactEffectsData.m_ComponentIndex 	= componentIndex;
+		impactEffectsData.m_Surface 		= surface;
+		impactEffectsData.m_Position		= pos;
+		impactEffectsData.m_ImpactType		= ImpactTypes.MELEE;
+		impactEffectsData.m_SurfaceNormal	= Vector(Math.RandomFloat(-1,1), Math.RandomFloat(-1,1), Math.RandomFloat(-1,1));
+		impactEffectsData.m_ExitPosition	= "0 0 0";
+		impactEffectsData.m_InSpeed			= "0 0 0";
+		impactEffectsData.m_OutSpeed		= "0 0 0";
+		impactEffectsData.m_IsDeflected		= false;
+		impactEffectsData.m_AmmoType		= ammoType;
+		impactEffectsData.m_IsWater			= isWater;
+
+		if (directHit)
+			directHit.OnReceivedHit(impactEffectsData);
+		
+		ImpactMaterials.EvaluateImpactEffectEx(impactEffectsData);
+		#endif
+		
+		// add hit noise
+		if (IsServer())
+		{
+			m_NoiseParams.LoadFromPath("cfgAmmo " + ammoType + " NoiseHit");
+			
+			float surfaceCoef = SurfaceGetNoiseMultiplier(directHit, pos, componentIndex);
+			GetNoiseSystem().AddNoisePos(EntityAI.Cast(source), pos, m_NoiseParams, surfaceCoef);
+		}
+	}
+	
+	void UpdateVoiceLevel(int level)
+	{
+		GetMission().UpdateVoiceLevelWidgets(level);	
+	}
+	
+	void InitCharacterMenuDataInfo(int menudata_count)
+	{
+		m_OriginalCharactersCount = menudata_count;
+	}
+	
+	void SetPlayerGameName(string name)
+	{
+		m_PlayerName = name;
+	}
+	
+	string GetPlayerGameName()
+	{
+		return m_PlayerName;
+	}
+	
+	void SetNewCharacter(bool state)
+	{
+		m_IsNewCharacter = state;
+	}
+	
+	bool IsNewCharacter()
+	{
+		return m_IsNewCharacter;
+	}
+	
+	void SetUserFOV(float pFov)
+	{
+		if (pFov < OPTIONS_FIELD_OF_VIEW_MIN)
+			pFov = OPTIONS_FIELD_OF_VIEW_MIN;
+
+		if (pFov > OPTIONS_FIELD_OF_VIEW_MAX)
+			pFov = OPTIONS_FIELD_OF_VIEW_MAX;
+		
+		m_UserFOV = pFov;
+	}
+	
+	float GetUserFOV()
+	{
+		return m_UserFOV;
+	}
+	
+	static float GetUserFOVFromConfig()
+	{
+		GameOptions gameOptions = new GameOptions;
+		NumericOptionsAccess noa;
+		if (gameOptions && Class.CastTo(noa,gameOptions.GetOptionByType(OptionAccessType.AT_OPTIONS_FIELD_OF_VIEW)))
+		{
+			return noa.ReadValue();
+		}
+		return 1.0;
+	}
+	
+	float GetFOVByZoomType(ECameraZoomType type)
+	{
+		switch (type)
+		{
+			case ECameraZoomType.NONE:
+				return GetUserFOV();
+			case ECameraZoomType.NORMAL:
+				return Math.Min(GetUserFOV(), GameConstants.DZPLAYER_CAMERA_FOV_EYEZOOM);
+			case ECameraZoomType.SHALLOW:
+				return Math.Min(GetUserFOV(),GameConstants.DZPLAYER_CAMERA_FOV_EYEZOOM_SHALLOW);
+			default:
+				return GetUserFOV();
+		}
+		return GetUserFOV();
+	}
+	
+	void SetHudBrightness(float value)
+	{
+		Widget.SetLV(value);
+		Widget.SetTextLV(value);
+	}
+	
+	float GetHUDBrightnessSetting()
+	{
+		return g_Game.GetProfileOptionFloat(EDayZProfilesOptions.HUD_BRIGHTNESS);
+	}
+	
+	// Check if ammo is compatible with a weapon in hands 
+	static bool CheckAmmoCompability(EntityAI weaponInHand, EntityAI ammo)
+	{	
+		TStringArray ammo_names = new TStringArray;										// Array of ammo types (their name) that can be used with weapon in hand
+		
+		string cfg_path = "CfgWeapons " + weaponInHand.GetType() + " chamberableFrom";	// Create config path 
+		GetGame().ConfigGetTextArray(cfg_path, ammo_names);								// Get ammo types 
+			
+		foreach (string ammo_name : ammo_names)				// for every ammo in ammo string compare passed ammo 
+		{
+			if (ammo.GetType() == ammo_name)					
+			{
+				return true;			
+			}
+		}
+		
+		// if no ammo from the array matches with ammo passed, return false 
+		return false;
+	}
+	
+	void SetEVValue(float value)
+	{
+		m_PreviousEVValue = m_EVValue;
+		SetEVUser(value);
+		m_EVValue = value;
+	}
+	
+	float GetCurrentEVValue()
+	{
+		return m_EVValue;
+	}
+	
+	float GetPreviousEVValue()
+	{
+		return m_PreviousEVValue;
+	}
+	
+	int GetCurrentDisplayLanguageIdx()
+	{
+		ListOptionsAccess	language_option;
+		GameOptions options = new GameOptions();
+		language_option = ListOptionsAccess.Cast(options.GetOptionByType(OptionAccessType.AT_OPTIONS_LANGUAGE));
+		int idx = -1;
+		if (language_option)
+		{
+			idx = language_option.GetIndex();
+		}
+		
+		return idx;
+	}
+	
+	bool IsWorldWetTempUpdateEnabled()
+	{
+		return m_IsWorldWetTempUpdateEnabled;
+	}
+	
+	bool IsFoodDecayEnabled()
+	{
+		return (GetFoodDecayModifier() != 0);
+	}	
+	
+	float GetFoodDecayModifier()
+	{
+		#ifdef DIAG_DEVELOPER
+		
+		if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.FOOD_DECAY))
+		{
+			return m_FoodDecayModifier * FeatureTimeAccel.GetFeatureTimeAccelValue();
+		}
+		#endif
+		return m_FoodDecayModifier;
+	}
+	
+	array<int> GetConnectedInputDeviceList()
+	{
+		if (!m_ConnectedInputDeviceList)
+		{
+			m_ConnectedInputDeviceList = new array<int>;
+		}
+		return m_ConnectedInputDeviceList;
+	}
+	
+	void SetMouseCursorDesiredVisibility(bool visible)
+	{
+		m_CursorDesiredVisibilityScript = visible;
+
+		RefreshMouseCursorVisibility();
+	}
+	
+	bool GetMouseCursorDesiredVisibility()
+	{
+		return m_CursorDesiredVisibilityScript;
+	}
+	
+	//! extend as needed, only game focus and M&K setting (consoles only!) are checked natively
+	bool CanDisplayMouseCursor()
+	{
+		//! Only checking on console because while loading on PC, the mouse might not be detected
+#ifdef PLATFORM_CONSOLE
+		if (GetInput())
+		{
+			return GetInput().IsMouseConnected();
+		}
+#endif
+
+		//! Platform defaults
+#ifdef PLATFORM_CONSOLE
+		return false;
+#else
+		return true;
+#endif
+	}
+	
+	void RefreshMouseCursorVisibility()
+	{
+#ifndef NO_GUI
+#ifdef FEATURE_CURSOR
+		if (!IsAppActive())
+		{
+			ShowCursorWidget(true);
+		}
+		else
+#endif
+		{
+			bool showCursor = m_CursorDesiredVisibilityScript && CanDisplayMouseCursor();
+			
+			UIManager ui = GetUIManager();
+			if (ui)
+			{
+				//! Handles app active-ness
+				ui.ShowCursor(showCursor);
+			}
+			else
+			{
+				//! Fallback, just in-case
+				ShowCursorWidget(showCursor);
+			}
+		}
+#endif
+	}
+
+	BillboardSetHandler GetBillboardHandler()
+	{
+		return m_BillboardSetHandler;
+	}
+	
+	///////////////
+	//DEPRECATED//
+	//////////////
+	void CreateGamepadDisconnectMenu();
+	void DeleteGamepadDisconnectMenu();
+};
+
+DayZGame g_Game;
+
+DayZGame GetDayZGame()
+{
+	return g_Game;
+}
diff --git a/scripts/3_Game/DayZ/DebugWeatherRPCData.c b/scripts/3_Game/DayZ/DebugWeatherRPCData.c
new file mode 100644
index 0000000000000000000000000000000000000000..d823302f178bb49525fa3fac693b9b5ca8cd2894
--- /dev/null
+++ b/scripts/3_Game/DayZ/DebugWeatherRPCData.c
@@ -0,0 +1,14 @@
+class DebugWeatherRPCData
+{
+	float m_FogValue 				= -1;
+	float m_OvercastValue 			= -1;
+	float m_RainValue 				= -1;
+	
+	float m_FogInterpolation 		= 0;
+	float m_OvercastInterpolation 	= -1;
+	float m_RainInterpolation 		= -1;
+	
+	float m_FogDuration 			= -1;
+	float m_OvercastDuration		= -1;
+	float m_RainDuration 			= -1;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/EControlSchemeState.c b/scripts/3_Game/DayZ/EControlSchemeState.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e39f027171d1eeaa51ac7defc7046f052cce216
--- /dev/null
+++ b/scripts/3_Game/DayZ/EControlSchemeState.c
@@ -0,0 +1,9 @@
+enum EControlSchemeState
+{
+	None,
+	WeaponIronSight,
+	WeaponGun,
+	WeaponMelee,
+	VehicleDriver,
+	UI
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/EFireIgniteType.c b/scripts/3_Game/DayZ/EFireIgniteType.c
new file mode 100644
index 0000000000000000000000000000000000000000..7112c25a637fff91d04f2c40a9c5e4423ff21ab0
--- /dev/null
+++ b/scripts/3_Game/DayZ/EFireIgniteType.c
@@ -0,0 +1,7 @@
+enum EFireIgniteType
+{
+	Unknow,
+	Matchbox,
+	Roadflare,
+	HandDrill,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effect.c b/scripts/3_Game/DayZ/Effect.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e01a97a585af67b7a26e4feff652626adf3c0d2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effect.c
@@ -0,0 +1,617 @@
+//! Enum to determine what type of effect the Effect is
+enum EffectType
+{
+	//! Plain Effect base
+	NONE,
+	//! EffectSound
+	SOUND,
+	//! EffectParticle
+	PARTICLE,
+}
+
+/**
+\brief Base wrapper class for managing effects (Particles, Sound) through SEffectManager
+	\note This is just a base class, not intended for direct usage
+*/
+class Effect : Managed
+{
+	/** \name Event invokers
+	*	ScriptInvonkers for certain events
+	*/
+	//@{
+	ref ScriptInvoker Event_OnStarted		= new ScriptInvoker();
+	ref ScriptInvoker Event_OnStopped		= new ScriptInvoker();
+	ref ScriptInvoker Event_OnEffectStarted		= new ScriptInvoker();
+	ref ScriptInvoker Event_OnEffectEnded		= new ScriptInvoker();
+	//@}
+	
+	/** \name Generic data
+	*	Generic data for the Effect
+	*/
+	//@{
+	//! Whether the Effect cleans up after itself when stopped
+	protected bool				m_IsAutodestroy;
+	//! Whether the Destroy process has already been called
+	protected bool				m_IsPendingDeletion;
+	//! Whether the Effect is currently playing
+	protected bool				m_IsPlaying;
+	//! Cached parent
+	protected Object 			m_ParentObject;
+	//! Cached world position
+	protected vector    		m_Position;
+	//@}
+	
+	/** \name SEffectManager data
+	*	Data filled in by SEffectManager to identify it when it is registered
+	*/
+	//@{
+	//! ID of effect, given by SEffectManager when registered (automatically done when playing through it)
+	protected int				m_ID;
+	//! Whether the effect is registered in SEffectManager
+	protected bool				m_IsRegistered;
+	//@}
+	
+	/** \name Attachment data
+	*	Cached settings set through 'SetAttachment...' methods
+	*	Does not necessarily reflect the current state when EffectParticle
+	*/
+	//@{	
+	//! Cached local pos
+	protected vector    		m_LocalPos;
+	//! Local orientation set by SetAttachedLocalOri, only used by EffectParticle
+	protected vector    		m_LocalOri;
+	//@}
+	
+	
+	
+	/**
+	\brief ctor
+	*/
+	void Effect()
+	{
+		if (GetGame().IsDedicatedServer())
+		{
+			ErrorEx("Created Effect on server.", ErrorExSeverity.WARNING);
+		}
+		
+		InitEffect();
+	}
+	
+	/**
+	\brief dtor
+	*/
+	void ~Effect()
+	{
+		// Safety
+		if ( IsRegistered() )
+			SEffectManager.EffectUnregister(GetID());
+		
+		// Certain effects need to be stopped to clean up properly
+		Stop();
+		
+		// Another safety
+		SetEnableEventFrame(false);
+	}
+	
+	/**
+	\brief init
+	*/
+	void InitEffect()
+	{
+		Event_OnStarted.Insert(Event_OnEffectStarted);
+		Event_OnStarted.Insert(ValidateStart);
+		Event_OnStopped.Insert(Event_OnEffectEnded);
+	}
+	
+	
+	/** \name EffectType
+		Information about what type of effect the Effect is, without the need for casting
+	*/
+	//@{
+	
+	/**
+	\brief Get what type of effect the Effect is
+		\return \p EffectType What type of effect the Effect is
+	*/
+	EffectType GetEffectType()
+	{
+		return EffectType.NONE;
+	}
+	
+	/**
+	\brief Check whether the Effect is EffectSound without casting
+		\return \p bool Whether the Effect is EffectSound
+	*/
+	bool IsSound()
+	{
+		return false;
+	}
+	
+	/**
+	\brief Check whether the Effect is EffectParticle without casting
+		\return \p bool Whether the Effect is EffectParticle
+	*/
+	bool IsParticle()
+	{
+		return false;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Playback
+	*	Methods to Play/Stop Effect
+	*	Generally, SEffectManager.Play methods are used instead of Start
+	*/
+	//@{
+	
+	/**
+	\brief Plays all elements this effects consists of
+		\note Is called by SEffectManager.Play methods
+	*/
+    void Start()
+    {
+		// It is already playing!
+		if (IsPlaying())
+			return;
+		
+		Event_OnStarted();
+		// I can't call this from inside the method with same name
+		// because that method is often overriden without super......
+		Event_OnStarted.Invoke(this);		
+	}
+	
+	/**
+	\brief Validation whether an effect truly started playing or if the Effect should stop as none is present
+		\note Override this when inheriting to create own validation check
+		\note Is called from Event_OnStarted invoker after Event_OnStarted has been performed
+	*/
+	void ValidateStart()
+	{
+		
+	}
+	
+	/**
+	\brief Stops all elements this effect consists of
+		\note Alternatively use SEffectManager.Stop( effect_id )
+	*/
+    void Stop()
+    {
+		// It is not playing!
+		if (!IsPlaying())
+			return;
+		
+		Event_OnStopped();
+		// Yes, that event is new, but let's keep up some consistency
+		Event_OnStopped.Invoke(this);		
+    }
+	
+	/**
+	\brief Returns true when the Effect is playing, false otherwise
+	*/
+	bool IsPlaying()
+	{
+		return m_IsPlaying;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Destroy
+		Methods regarding automatic cleanup
+	*/
+	//@{
+	
+	/**
+	\brief Cleans up the Effect, including unregistering if needed
+		\note Will stop the Effect and queue up the deletion in the callqueue
+		\note Is intended for usage from within the Effect itself, use SEffectManager.DestroyEffect when working from a pointer
+	*/
+	protected void Destroy()
+	{
+		// Already queued
+		if (IsPendingDeletion())
+			return;
+		
+		// Mark it to prevent queuing it up multiple times or get stuck in a call loop
+		m_IsPendingDeletion = true;
+		
+		// Stop it, so that the effects can clean up themselves
+		// Since if for example this is EffectParticle and the particle is looping
+		// It NEEDS to be stopped to clean up the Particle
+		Stop();
+		
+		// Queue up the destroying, as we should not do it while we are accessing it here
+		if (GetGame())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(SEffectManager.DestroyEffect, this);
+		}
+	}
+	
+	/**
+	\brief Sets whether Effect automatically cleans up when it stops
+		\note This means that it will be unregistered from SEffectManager as well
+		\param auto_destroy \p bool Whether Effect automatically cleans up when it stops
+	*/
+	void SetAutodestroy(bool auto_destroy)
+	{
+		m_IsAutodestroy = auto_destroy;
+	}
+	
+	/**
+	\brief Get whether Effect automatically cleans up when it stops
+		\return \p bool Whether Effect automatically cleans up when it stops
+	*/
+	bool IsAutodestroy()
+	{
+		return m_IsAutodestroy;
+	}
+	
+	/**
+	\brief Get whether the Effect is queued up for being cleaned up
+		\return \p bool Whether the Effect is queued up for being cleaned up
+	*/
+	bool IsPendingDeletion()
+	{
+		return m_IsPendingDeletion;
+	}
+	
+	/**
+	\brief Get whether the Effect can be destroyed right now
+		\return \p bool Whether the Effect can be destroyed right now
+	*/
+	bool CanDestroy()
+	{
+		return true;
+	}
+	
+	//@}
+	
+	
+	
+	/**
+	\brief Enable Event_OnFrameUpdate for the effect
+		\note Read SEffectManager.Event_OnFrameUpdate for more info
+	*/
+	void SetEnableEventFrame(bool enable)
+	{
+		if ( enable )
+		{
+			SEffectManager.Event_OnFrameUpdate.Insert(Event_OnFrameUpdate);			
+		}
+		else
+		{
+			SEffectManager.Event_OnFrameUpdate.Remove(Event_OnFrameUpdate);
+		}
+	}
+	
+	
+	
+	/** \name Events
+		Various events that can be overriden for custom behaviour
+	*/
+	//@{
+	
+	/**
+	\brief Event used when Start was called
+	*/
+	void Event_OnStarted()
+	{
+		// Override this method for own use
+	}
+	
+	/**
+	\brief Event used when Stop was called
+	*/
+	void Event_OnStopped()
+	{
+		// Override this method for own use
+	}
+	
+	/**
+	\brief Event used when the actual effect started playing
+	*/
+	void Event_OnEffectStarted()
+	{
+		m_IsPlaying = true;
+		
+		Event_OnEffectStarted.Invoke(this);
+	}
+	
+	/**
+	\brief Event used when the actual effect stopped playing
+	*/
+	void Event_OnEffectEnded()
+	{
+		m_IsPlaying = false;
+		
+		Event_OnEffectEnded.Invoke(this);
+		
+		if ( IsAutodestroy() )
+		{
+			Destroy();
+		}
+	}
+	
+	/**
+	\brief Event called on frame when enabled by SetEnableEventFrame(true)
+		\note Called from SEffectManager.Event_OnFrameUpdate in MissionGameplay.OnUpdate
+		\param time_delta \p float Time passed since the previous frame
+	*/
+	void Event_OnFrameUpdate(float time_delta)
+	{
+		// Override this method for own use
+	}
+	
+	/**
+	\brief Event called from SEffectManager when the Effect is registered
+		\note Should only ever be called by SEffectManager!
+		\param id \p int ID registered in SEffectManager
+	*/
+	void Event_OnRegistered(int id)
+	{
+		SetID(id);
+		m_IsRegistered = true;
+	}
+	
+	/**
+	\brief Event called from SEffectManager when the Effect is unregistered
+		\note Should only ever be called by SEffectManager!
+	*/
+	void Event_OnUnregistered()
+	{
+		SetID(SEffectManager.INVALID_ID);
+		m_IsRegistered = false;
+	}
+	
+	/**
+	\brief Event used when EffectParticle.CheckLifeSpan was called (DEPRECATED)
+		\note So this is EffectParticle specific...
+		\note EffectParticle.CheckLifeSpan is currently not in use
+	*/
+	void OnCheckUpdate()
+	{
+
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Generic API
+		Setters and getters for generic data and properties
+	*/
+	//@{
+	
+	/**
+	\brief Set parent of the Effect
+		\note Same as SetAttachmentParent, but more generic name
+		\warning Only sets the cached variable, for immediate effect use SetCurrent variant
+		\param parent_obj \p Object The parent for the Effect
+	*/
+	void SetParent(Object parent_obj)
+	{
+		m_ParentObject = parent_obj;
+	}
+	
+	/**
+	\brief Get parent of the Effect
+		\note Same as GetAttachmentParent, but more generic name
+		\warning Only gets the cached variable, for immediate effect use GetCurrent variant
+		\return \p Object The parent of the Effect
+	*/
+	Object GetParent()
+	{
+		return m_ParentObject;
+	}
+	
+	/**
+	\brief Set current parent of the managed effect
+		\note Same as SetAttachmentParent, but more generic name
+		\param parent_obj \p Object The parent for the Effect
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	void SetCurrentParent( Object parent_obj, bool updateCached = true )
+	{
+		if (updateCached)
+			SetParent(parent_obj);
+	}
+	
+	/**
+	\brief Get the current parent of the managed Effect
+		\return \p Object The current parent of the managed Effect
+	*/
+	Object GetCurrentParent()
+	{
+		return null;
+	}
+	
+	/**
+	\brief Set the world position of the Effect
+		\warning Only sets the cached variable, for immediate effect use SetCurrent variant
+		\param pos \p vector The world position for the Effect
+	*/
+	void SetPosition( vector pos )
+    {
+        m_Position = pos;
+    }
+
+	/**
+	\brief Get the world position of the Effect
+		\warning Only gets the cached variable, for immediate effect use GetCurrent variant
+		\return \p vector The world position of the Effect
+	*/
+	vector GetPosition()
+	{
+		return m_Position;
+	}
+	
+	/**
+	\brief Set the current world position of the managed effect
+		\param pos \p vector The current world position for the Effect
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	void SetCurrentPosition( vector pos, bool updateCached = true )
+    {
+		if (updateCached)
+        	SetPosition(pos);
+    }
+	
+	/**
+	\brief Get the current world position of the managed effect
+		\return \p vector The current world position of the managed effect
+	*/
+	vector GetCurrentPosition()
+	{
+		return vector.Zero;
+	}
+	
+	/**
+	\brief Set the local position of the Effect
+		\warning Only sets the cached variable, for immediate effect use SetCurrent variant
+		\param pos \p vector The local position for the Effect
+	*/
+	void SetLocalPosition( vector pos )
+    {
+		m_LocalPos = pos;
+    }
+
+	/**
+	\brief Get the local position of the Effect
+		\warning Only gets the cached variable, for immediate effect use GetCurrent variant
+		\return \p vector The lcoal position of the Effect
+	*/
+	vector GetLocalPosition()
+	{
+		return m_LocalPos;
+	}
+	
+	/**
+	\brief Set the current local position of the managed effect
+		\param pos \p vector The current local position for the managed effect
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	void SetCurrentLocalPosition( vector pos, bool updateCached = true )
+    {
+		if (updateCached)
+        	SetLocalPosition(pos);
+    }
+
+	/**
+	\brief Get the current local position of the managed effect
+		\return \p vector The current local position of the managed effect
+	*/
+	vector GetCurrentLocalPosition()
+	{
+		return vector.Zero;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Effect ID
+		The ID of the effect when registered in SEffectManager
+	*/
+	//@{
+	
+	/**
+	\brief Set the ID registered in SEffectManager
+		\note Should only ever be called by Event_OnRegistered!
+		\param id \p int ID registered in SEffectManager
+	*/
+	protected void SetID(int id)
+	{
+		m_ID = id;
+	}
+	
+	/**
+	\brief Get the ID registered in SEffectManager
+		\return \p int ID registered in SEffectManager, or 0 (SEffectManager.INVALID_ID) when not registered
+	*/
+	int GetID()
+	{
+		return m_ID;
+	}
+	
+	/**
+	\brief Get whether this Effect is registered in SEffectManager
+		\return \p bool Whether this Effect is registered in SEffectManager
+	*/
+	bool IsRegistered()
+	{
+		return m_IsRegistered;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Attachment API
+	*	Data to attach an Effect to a parent
+	*	Mostly replaced by equivalents without 'Attachment' in name
+	*	Mildly deprecated, exist for backwards compatibility
+	*/
+	//@{
+	
+	/**
+	\brief Set parent for the Effect
+		\param obj \p Object The parent for the Effect
+	*/
+	void SetAttachmentParent(Object obj)
+	{
+		SetParent(obj);
+	}
+		
+	/**
+	\brief Get the parent set by SetAttachmentParent
+		\return \p Object The parent set by SetAttachmentParent
+	*/
+	Object GetAttachmentParent()
+	{
+		return GetParent();
+	}
+	
+	/**
+	\brief Set local pos for the Effect relative to the parent
+		\param pos \p vector The local pos relative to the parent
+	*/
+	void SetAttachedLocalPos(vector pos)
+	{
+		SetLocalPosition(pos);
+	}
+	
+	/**
+	\brief Get the local pos set by SetAttachedLocalPos
+		\return \p vector The local pos set by SetAttachedLocalPos
+	*/
+	vector GetAttachedLocalPos()
+	{
+		return GetLocalPosition();
+	}
+	
+	/**
+	\brief Set local orientation for the Effectparticle to attach to when the Effect is started
+		\warning Only caches it into a variable to be used by Start, does not live update when called afterwards
+		\note Overrides the orientation set by EffectParticle.SetOrientation
+		\param ori \p vector The local orientation to use on Start
+	*/
+	void SetAttachedLocalOri(vector ori)
+	{
+		m_LocalOri = ori;
+	}
+	
+	/**
+	\brief Get the local orientation set by SetAttachedLocalOri
+		\warning Is not necessarily the current local orientation
+		\return \p vector The local orientation set by SetAttachedLocalOri
+	*/
+	vector GetAttachedLocalOri()
+	{
+		return m_LocalOri;
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/EffectManager.c b/scripts/3_Game/DayZ/EffectManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2751c12ef12973ed8d1b822fd6058ec02a65097
--- /dev/null
+++ b/scripts/3_Game/DayZ/EffectManager.c
@@ -0,0 +1,541 @@
+/**
+\brief Manager class for managing Effect (EffectParticle, EffectSound)
+	\warning Keeps a ref to any Effect registered (Created/Played), make sure to perform the necessary cleanup
+*/
+class SEffectManager
+{
+	//! Static map of all registered effects <id, Effect>
+	protected static ref map<int, ref Effect> m_EffectsMap;
+	//! Static array of IDs that were previously used, but freed up by unregistering
+	protected static ref array<int> m_FreeEffectIDs;
+	//! Counter for quickly getting the next ID if FreeEffectIDs array is empty
+	protected static int m_HighestFreeEffectID = 1;
+	//! As the counter starts at 1, Effect ID can never be 0
+	static const int INVALID_ID = 0;
+	//! Bool to check whether Cleanup is happening, which means that the maps should no longer be accessed
+	protected static bool m_IsCleanup;
+	//! Bool to check whether Init was called
+	protected static bool m_IsInitialized;
+	
+	//! Static map of cached sound params, to prevent having to recreate them
+	protected static ref map<string, ref SoundParams> m_ParamsMap;
+	
+	//! Static invoker for the SEffectManager.Event_OnFrameUpdate called form MissionGameplay.OnUpdate
+	static ref ScriptInvoker Event_OnFrameUpdate;
+	
+	
+	
+	/** \name Generic playback
+ 		Methods for playing Effect
+		\note Since 1.15, these should work on EffectSound as well
+	*/
+	//@{
+	
+	/**
+	*\brief Play an Effect
+	*	\warning As the Effect is automatically registered, it will not be freed automatically (because of the ref)
+	*				Unless 'SetAutodestroy(true)' is called on the created 'Effect', which will clean it up when the sound stop
+	*				Alternatively, SEffectManager.DestroyEffect can be called manually, which will also unregister and cleanup
+	*	\param eff \p Effect The Effect to play
+	*	\param pos \p vector The position to play the Effect
+	*	\return \p int The registered ID of the Effect
+	*/
+	static int PlayInWorld(notnull Effect eff, vector pos)
+	{
+		// Stop the effect first, just in case
+		eff.Stop();
+		
+		int id = EffectRegister(eff);
+		
+		eff.SetPosition( pos );
+		eff.Start();	
+		
+		return id;
+	}
+	
+	/**
+	*\brief Play an Effect
+	*	\warning Read PlayInWorld warning
+	*	\param eff \p Effect The Effect to play
+	*	\param obj \p Object The parent of the Effect
+	*	\param local_pos \p vector The local position to play the Effect in relation to the parent (Optional)
+	*	\param local_ori \p vector The local orientation to play the Effect in relation to the parent (Optional)
+	*	\param force_rotation_relative_to_world \p bool Whether to force the orientation to stay in WS (Optional)
+	*	\return \p int The registered ID of the Effect
+	*/
+	static int PlayOnObject(notnull Effect eff, Object obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_rotation_relative_to_world = false)
+	{
+		// Stop the effect first, just in case
+		eff.Stop();
+		
+		int id = EffectRegister(eff);
+		
+		if (!obj)
+		{
+			ErrorEx("Parent object is null.", ErrorExSeverity.WARNING);
+			eff.SetPosition(local_pos);
+		}
+		else
+		{
+			eff.SetPosition(obj.GetPosition());
+		}
+			
+		eff.SetParent(obj);
+		eff.SetLocalPosition(local_pos);
+		eff.SetAttachedLocalOri(local_ori);
+		
+		if (force_rotation_relative_to_world)
+		{
+			EffectParticle eff_particle = EffectParticle.Cast(eff);
+			
+			if (eff_particle)
+			{
+				eff_particle.ForceParticleRotationRelativeToWorld(force_rotation_relative_to_world);
+			}
+		}
+		
+		eff.Start();
+		
+		return id;
+	}
+	
+	/**
+	\brief Stops the Effect
+		\param effect_id \p int The ID of the Effect to Stop
+	*/
+	static void Stop(int effect_id)
+	{
+		Effect eff = m_EffectsMap.Get(effect_id);
+		
+		if (eff)
+		{
+			eff.Stop();
+		}
+		else
+		{
+			ErrorEx(string.Format("Failed to stop Effect with ID %1. The ID is not registered in m_EffectsMap!", effect_id));
+		}
+	}
+	
+	//@}
+	
+
+	
+	/** \name Create/Play sound
+ 		Methods for playing/creating sound
+	*/
+	//@{
+	
+	/**
+	*\brief Create an EffectSound
+	*	\warning Read PlayInWorld warning
+	*	\param sound_set \p string The sound set name of the sound
+	*	\param position \p vector The position to play the sound
+	*	\param play_fade_in \p float The fade in duration of the sound (Optional)
+	*	\param stop_fade_out \p float The fade out duration of the sound (Optional)
+	*	\param loop \p bool Whether the sound should loop (Optional)
+	*	\param enviroment \p bool Whether to set environment variables (Optional)
+	*	\return \p EffectSound The created EffectSound
+	*/
+	static EffectSound CreateSound(string sound_set, vector position, float play_fade_in = 0, float stop_fade_out = 0, bool loop = false, bool enviroment = false)
+	{
+		EffectSound effect_sound = new EffectSound();
+		effect_sound.SetSoundSet(sound_set);
+		effect_sound.SetPosition(position);
+		effect_sound.SetSoundFadeIn(play_fade_in);
+		effect_sound.SetSoundFadeOut(stop_fade_out);
+		effect_sound.SetSoundLoop(loop);
+		effect_sound.SetEnviromentVariables(enviroment);
+		
+		EffectRegister( effect_sound );
+		
+		return effect_sound;
+	}
+	
+	/**
+	*\brief Create and play an EffectSound
+	*	\warning Calls CreateSound, read CreateSound warning
+	*	\param sound_set \p string The sound set name of the sound
+	*	\param position \p vector The position to play the sound
+	*	\param play_fade_in \p float The fade in duration of the sound (Optional)
+	*	\param stop_fade_out \p float The fade out duration of the sound (Optional)
+	*	\param loop \p bool Whether the sound should loop (Optional)
+	*	\return \p EffectSound The created EffectSound
+	*/
+	static EffectSound PlaySound(string sound_set, vector position, float play_fade_in = 0, float stop_fade_out = 0, bool loop = false)
+	{
+		EffectSound effect_sound = CreateSound(sound_set, position, play_fade_in, stop_fade_out, loop, false);
+				
+		effect_sound.SoundPlay();
+		
+		return effect_sound;
+	}
+	
+	/**
+	*\brief Create and play an EffectSound
+	*	\warning Calls CreateSound, read CreateSound warning
+	*	\param params \p SoundParams Params to create the sound with
+	*	\param position \p vector The position to play the sound
+	*	\param play_fade_in \p float The fade in duration of the sound (Optional)
+	*	\param stop_fade_out \p float The fade out duration of the sound (Optional)
+	*	\param loop \p bool Whether the sound should loop (Optional)
+	*	\return \p EffectSound The created EffectSound
+	*/
+	static EffectSound PlaySoundParams(notnull SoundParams params, vector position, float play_fade_in = 0, float stop_fade_out = 0, bool loop = false)
+	{
+		EffectSound effect_sound = CreateSound(params.GetName(), position, play_fade_in, stop_fade_out, loop, false);
+
+		effect_sound.SoundPlayEx(params);
+		
+		return effect_sound;
+	}
+	
+	/**
+	*\brief Create and play an EffectSound, using or creating cached SoundParams
+	*	\warning Calls CreateSound, read CreateSound warning
+	*	\param sound_set \p string The sound set name of the sound
+	*	\param position \p vector The position to play the sound
+	*	\param play_fade_in \p float The fade in duration of the sound (Optional)
+	*	\param stop_fade_out \p float The fade out duration of the sound (Optional)
+	*	\param loop \p bool Whether the sound should loop (Optional)
+	*	\return \p EffectSound The created EffectSound
+	*/
+	static EffectSound PlaySoundCachedParams(string sound_set, vector position, float play_fade_in = 0, float stop_fade_out = 0, bool loop = false)
+	{
+		SoundParams params = GetCachedSoundParam(sound_set);
+		
+		EffectSound effect_sound = CreateSound(params.GetName(), position, play_fade_in, stop_fade_out, loop, false);
+
+		effect_sound.SoundPlayEx(params);
+		
+		return effect_sound;
+	}
+	
+	/**
+	*\brief Create and play an EffectSound, updating environment variables
+	*	\warning Calls CreateSound, read CreateSound warning
+	*	\param sound_set \p string The sound set name of the sound
+	*	\param position \p vector The position to play the sound
+	*	\param play_fade_in \p float The fade in duration of the sound (Optional)
+	*	\param stop_fade_out \p float The fade out duration of the sound (Optional)
+	*	\param loop \p bool Whether the sound should loop (Optional)
+	*	\return \p EffectSound The created EffectSound
+	*/
+	static EffectSound PlaySoundEnviroment(string sound_set, vector position, float play_fade_in = 0, float stop_fade_out = 0, bool loop = false)
+	{
+		EffectSound effect_sound = CreateSound(sound_set, position, play_fade_in, stop_fade_out, loop, true);
+				
+		effect_sound.SoundPlay();
+		
+		return effect_sound;
+	}
+	
+	/**
+	*\brief Create and play an EffectSound
+	*	\warning Calls CreateSound, read CreateSound warning
+	*	\param sound_set \p string The sound set name of the sound
+	*	\param parent_object \p Object The parent Object for the sound to follow
+	*	\param play_fade_in \p float The fade in duration of the sound (Optional)
+	*	\param stop_fade_out \p float The fade out duration of the sound (Optional)
+	*	\param loop \p bool Whether the sound should loop (Optional)
+	*	\return \p EffectSound The created EffectSound
+	*/
+	static EffectSound PlaySoundOnObject(string sound_set, Object parent_object, float play_fade_in = 0, float stop_fade_out = 0, bool loop = false)
+	{
+		EffectSound effect_sound = CreateSound(sound_set, parent_object.GetPosition(), play_fade_in, stop_fade_out, loop);
+		
+		effect_sound.SetParent( parent_object );
+		effect_sound.SetLocalPosition( vector.Zero );
+		effect_sound.SoundPlay();
+		
+		return effect_sound;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Generic API
+		General methods used for SEffectManager
+	*/
+	//@{
+	
+	/**
+	\brief Unregisters, stops and frees the Effect
+		\param effect_sound \p EffectSound The EffectSound to free
+	*/
+	static void DestroyEffect(Effect effect)
+	{
+		if (effect)
+		{
+			if (effect.CanDestroy())
+			{
+				// Functionality already happens in dtor of Effect to be safe
+				delete effect;
+			}
+			else
+			{
+				// Make it clean up itself when done
+				effect.SetAutodestroy(true);
+				effect.Stop();
+			}
+		}
+	}
+	
+	/**
+	\brief Checks whether an Effect ID is registered in SEffectManager
+		\param effect_id \p int The Effect ID to check
+		\return \p bool Whether there is an Effect registered for this ID
+	*/
+	static bool IsEffectExist( int effect_id )
+	{
+		if (!m_IsCleanup)
+			return m_EffectsMap[effect_id] != null;
+		else
+			return false;
+	}
+			
+	/**
+	\brief Gets the Effect with the given registered Effect ID
+		\param effect_id \p int The Effect ID
+		\return \p Effect The Effect registered to the ID or null
+	*/
+	static Effect GetEffectByID(int effect_id)
+	{
+		if (!m_IsCleanup)
+			return m_EffectsMap[effect_id];
+		else
+			return null;
+	}
+	
+	/**
+	\brief Registers Effect in SEffectManager
+		\note Already handled in SEffectManager Create/Play methods
+		\note This will make SEffectManager hold a strong ref for the Effect
+		\param effect \p Effect The Effect to register
+		\return \p int The Effect ID
+	*/
+	static int EffectRegister(Effect effect)
+	{
+		if (effect.IsRegistered())
+		{
+			ErrorEx(string.Format("Attempted to register Effect '%1' which was already registered.", effect.GetDebugName()), ErrorExSeverity.INFO);			
+			return effect.GetID();
+		}
+		
+		int id;
+		
+		if (!m_IsCleanup)
+		{
+			id = GetFreeEffectID();
+			m_EffectsMap.Insert(id, effect);
+			effect.Event_OnRegistered(id);
+		}
+		else
+			ErrorEx("Attempted to register Effect while SEffectManager is cleaning up, request ignored.", ErrorExSeverity.WARNING);
+		
+		return id;
+	}
+	
+	/**
+	\brief Unregisters Effect in SEffectManager
+		\note Will automatically occur on stop when the Effect is AutoDestroy
+		\note ID can be gotten from the Effect by calling Effect.GetID
+		\note Generic Play methods will also return the ID
+		\param id \p int The ID of the Effect to unregister
+	*/
+	static void EffectUnregister(int id)
+    {
+		if (m_IsCleanup)
+			return; // No error needed, since it will have been unregistered anyways after cleanup is finished
+		
+		Effect effect;
+		if ( m_EffectsMap.Find(id, effect) )
+		{
+			effect.Event_OnUnregistered();
+			m_EffectsMap.Remove(id);
+		}		
+		
+		if ( m_FreeEffectIDs.Find(id) == -1 )
+		{
+			m_FreeEffectIDs.Insert(id);
+		}
+    }
+	
+	/**
+	\brief Unregisters Effect in SEffectManager
+		\param effect \p Effect The Effect to unregister
+	*/
+	static void EffectUnregisterEx(Effect effect)
+    {
+		EffectUnregister(effect.GetID());
+    }
+	
+	/**
+	\brief Helper function for EffectRegister to decide an Effect ID
+		\return \p int A currently unused Effect ID
+	*/
+	protected static int GetFreeEffectID()
+	{
+		int return_id;
+		
+		if (m_FreeEffectIDs.Count() > 0)
+		{
+			return_id = m_FreeEffectIDs.Get(0);
+			m_FreeEffectIDs.Remove(0);
+		}
+		else
+		{
+			return_id = m_HighestFreeEffectID;
+			++m_HighestFreeEffectID;
+		}
+		
+		return return_id;		
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Sound helpers
+ 		Sound specific helper methods
+	*/
+	//@{
+	
+	/**
+	\brief Legacy, backwards compatibility
+		\param sound_effect \p EffectSound The EffectSound to free
+		\return \p bool A bool which is always true
+	*/
+	static bool DestroySound(EffectSound sound_effect)
+	{
+		DestroyEffect(sound_effect);		
+		return true;
+	}
+	
+	/**
+	\brief Get or create a cached SoundParams object
+		\param soundset \p string The sound set name of the sound
+		\return \p SoundParams The cached SoundParams for the given soundset
+	*/
+	static SoundParams GetCachedSoundParam(string soundset)
+	{
+		SoundParams params;
+		if (!m_ParamsMap.Find(soundset, params))
+		{
+			params = new SoundParams(soundset);
+			m_ParamsMap.Insert(soundset, params);
+		}
+		return params;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Events
+		Various events that can be overriden for custom behaviour
+	*/
+	//@{
+	
+	/**
+	\brief Event called from EffectSound.Event_OnSoundWaveEnded
+		\note Every registered sound is registered to call this
+		\param effect_sound \p EffectSound The EffectSound calling the event
+	*/
+	static void Event_OnSoundWaveEnded(EffectSound effect_sound)
+	{
+		
+	}
+	
+	/**
+	\brief Event called on frame
+		\note Called from MissionGameplay.OnUpdate
+		\note Effects register themselves by Effect.SetEnableEventFrame(true)
+		\note EffectSound is automatically registered
+		\param time_delta \p float Time passed since the previous frame
+	*/
+	static void Event_OnFrameUpdate(float time_delta)
+	{
+		Event_OnFrameUpdate.Invoke(time_delta);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Lifetime
+ 		Creation and cleanup
+	*/
+	//@{
+	
+	/**
+	\brief Initialize the containers
+		\note This is done this way, to have these not exist on server
+	*/
+	static void Init()
+	{
+		m_EffectsMap = new map<int, ref Effect>;
+		m_FreeEffectIDs = new array<int>;
+		m_ParamsMap = new map<string, ref SoundParams>;
+		Event_OnFrameUpdate = new ScriptInvoker();
+		
+		m_IsInitialized = true;
+	}
+	
+	/**
+	\brief Cleanup method to properly clean up the static data
+		\note Will be called when MissionBase is destroyed
+	*/
+	static void Cleanup()
+	{
+		// Nothing to clean
+		if (!m_IsInitialized)
+			return;		
+		
+		m_IsCleanup = true;
+		
+		// There should not be anything in here on server
+		if (GetGame() && GetGame().IsDedicatedServer())
+		{
+			if (m_ParamsMap.Count() > 0)
+				ErrorEx(string.Format("SEffectManager containing SoundParams on server."), ErrorExSeverity.WARNING);
+			
+			if (m_EffectsMap.Count() > 0)
+				ErrorEx(string.Format("SEffectManager containing Effect on server."), ErrorExSeverity.WARNING);
+		}
+		
+		// These are intentionally cached, just clear them
+		m_ParamsMap.Clear();
+		
+		// These might not be intentionally still here, so log how many there are
+		#ifdef DEVELOPER
+		Print("--- SEffectManager Cleanup dump - Begin ------------------------");
+		Print(string.Format("Effect count: %1", m_EffectsMap.Count()));
+		#endif
+		
+		// Best to call the unregister event before clearing the map
+		// In case some ref is still being held elsewhere and will still be kept alive
+		foreach (int id, Effect eff : m_EffectsMap)
+		{
+			eff.Event_OnUnregistered();
+			#ifdef SFXM_DUMP
+			Print(string.Format( "%1 :: %2 :: %3", eff, typename.EnumToString(EffectType, eff.GetEffectType()), eff.GetDebugName() ));
+			#endif
+		}
+		
+		#ifdef DEVELOPER
+		Print("--- SEffectManager Cleanup dump - End --------------------------");
+		#endif
+		
+		// Now we can clear it
+		m_EffectsMap.Clear();
+		
+		// Reset the state
+		m_HighestFreeEffectID = 1;		
+		Event_OnFrameUpdate.Clear();
+		m_IsCleanup = false;
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/Backlit/Backlit.c b/scripts/3_Game/DayZ/Effects/Backlit/Backlit.c
new file mode 100644
index 0000000000000000000000000000000000000000..085cede00a0e57bbb88951c420f04165fe564c32
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/Backlit/Backlit.c
@@ -0,0 +1,456 @@
+
+// Purpose of this file is to encapsulate Backlit Effects
+// Basic implementatoin is for Razer Chroma devices, but API is made to remain universal for future purposes
+//
+// for specific method - watch UAInputAPI/ UAInput class
+//
+//
+
+
+//-----------------------------------------------------------------------------
+//! Input layer type
+const int EUABLAYER_ALL				= 0;	// all layers
+const int EUABLAYER_HINTKEY			= 1;	// showing hints
+const int EUABLAYER_VISKEY			= 2;	// visualisation
+const int EUABLAYER_3				= 3;	// 
+const int EUABLAYER_CAR				= 4;	// 
+const int EUABLAYER_HUMAN			= 5;	// 
+const int EUABLAYER_6				= 6;	// 
+const int EUABLAYER_CUSTOM			= 7;	// custom
+const int EUABLAYER_LOADING			= 8;	// keys during loading sequence
+const int EUABLAYER_MENU			= 9;	// keys during menu
+
+
+//-----------------------------------------------------------------------------
+//! Input backlit type
+const int EUABACKLIT_NONE				= 0;	// turn off
+const int EUABACKLIT_ON					= 1;	// permanent ilumination
+const int EUABACKLIT_2					= 2;
+const int EUABACKLIT_3					= 3;
+const int EUABACKLIT_FADEOUT_SLOW		= 4;	// slow fadeout
+const int EUABACKLIT_FADEOUT_FAST		= 5;	// fast fadeout
+const int EUABACKLIT_FADEIN_SLOW		= 6;	// slow in -> then stay on
+const int EUABACKLIT_FADEIN_FAST		= 7;	// fast in -> then stay on
+
+
+// note: there should be states like:
+//
+//
+//		LOADING/ MAIN MENU/ CONNECTING/ KEYBINDING/ OPTIONS - continuous
+//		CHARACTER/ CAR/ "HELI"/ SPECTATOR/ INFECTED - continuous BASE
+//		SWIMMING/ CRAWLING/ SPRINTING/ FIGHTING/ FLARE/ FLASHLIGHT - continuous CHARACTER
+//
+//	DoorOpen/ HitTaken/ CarCrashed/ etc. - event based
+//
+
+
+const int EUAB_OFF						= 0;	// all off
+
+// logos :: anims
+const int EUAB_LOGO_DAYZ				= 10;
+const int EUAB_LOGO_CONNECTING			= 11;
+
+// menus :: anims
+const int EUAB_MENU_BROWSER				= 20;
+const int EUAB_MENU_MAIN				= 21;
+const int EUAB_MENU_KEYBINDING			= 22;
+const int EUAB_MENU_OPTIONS				= 23;
+
+// car :: basic background colour + overlay + transition anims
+const int EUAB_CAR_OFF					= 100;	// sitting in car with engine off
+const int EUAB_CAR_ON_NOLIGHTS			= 101;	// driving w/o lights (day)
+const int EUAB_CAR_ON_LIGHTS			= 102;	// driving with headlights (night)
+const int EUAB_CAR_STARTING				= 103;	// short starting animation
+const int EUAB_CAR_ENTER				= 104;	// entering car
+const int EUAB_CAR_LEAVE				= 105;	// leaving car
+const int EUAB_CAR_CRASH				= 106;	// crashed
+
+// character :: basic background colour + overlay + transition anims
+const int EUAB_PLR_WALK					= 200;
+const int EUAB_PLR_RUN					= 201;
+const int EUAB_PLR_SPRINT				= 202;
+const int EUAB_PLR_SWIM					= 203;
+const int EUAB_PLR_HITBY				= 204;
+const int EUAB_PLR_CONSUME				= 205;
+const int EUAB_PLR_CRAFTING				= 206;
+const int EUAB_PLR_EMOTE				= 207;	// playing emote
+const int EUAB_PLR_UNCONSCIOUS			= 208;
+const int EUAB_PLR_DEAD					= 209;
+
+// modes :: these are set of background colours
+const int EUAB_MODE_NIGHT				= 300;
+const int EUAB_MODE_MORNING_BAD			= 301;
+const int EUAB_MODE_MORNING_GOOD		= 302;
+const int EUAB_MODE_DAY_FOGGY			= 303;
+const int EUAB_MODE_DAY_OVERCAST		= 304;
+const int EUAB_MODE_DAY_NICE			= 305;
+const int EUAB_MODE_EVENING_BAD			= 306;
+const int EUAB_MODE_EVENING_GOOD		= 307;
+
+const int EUAB_MODE_FLASHLIGHT			= 320;
+const int EUAB_MODE_CHEMLIGHT			= 321;
+
+
+// overlay types
+const int EUAB_OVERLAY_NONE				= 400;	// no overlay
+const int EUAB_OVERLAY_CONTROLS			= 401;	// highlighted controls
+const int EUAB_OVERLAY_STATUS			= 402;	// numpad + mouse used for health/ blood level visualisation
+const int EUAB_OVERLAY_VON				= 403;	// VON status
+
+
+//-----------------------------------------------------------------------------
+//! Backlit effect class
+
+class Backlit
+{
+//	private void ~Backlit(); // raist todo: turn lights off there?
+
+	bool m_BacklitActive;
+
+	void OnInit( DayZGame game )
+	{
+		// enable only on client/ standalone!
+		if( game.IsClient() || !game.IsMultiplayer() )
+			m_BacklitActive = true;
+			
+		if( m_BacklitActive )
+			Print("... Backlit Effects Enabled");
+	}
+
+	// start infinite loading animation
+	void LoadingAnim()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		// lighten up your desktop
+		GetUApi().Backlit_KeyByName("kD",EUABLAYER_LOADING,EUABACKLIT_ON,0xffff0000);
+		GetUApi().Backlit_KeyByName("kA",EUABLAYER_LOADING,EUABACKLIT_ON,0xffcf0000);
+		GetUApi().Backlit_KeyByName("kY",EUABLAYER_LOADING,EUABACKLIT_ON,0xffaf0000);
+		GetUApi().Backlit_KeyByName("kZ",EUABLAYER_LOADING,EUABACKLIT_ON,0xff8f0000);
+		GetUApi().Backlit_Animation("Loading/",2,0xffc8c8c8,0xff080808);
+		GetUApi().Backlit_ForceUpdate();
+	}
+
+	// ...
+	void MainMenu_OnShow()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		// lighten up your desktop
+		GetUApi().Backlit_Remove(EUABLAYER_ALL);
+		GetUApi().Backlit_Animation("MainMenu/",2,0xffff0000,0xff080000);
+		GetUApi().Backlit_ForceUpdate();
+	}
+	
+	// ...
+	void MainMenu_OnHide()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		GetUApi().Backlit_Remove(EUABLAYER_ALL);	
+		GetUApi().Backlit_Background(0,0xff220000,0xff222222);		
+	}
+
+	// ...
+	void OnEnterCar()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		GetUApi().Backlit_Remove(EUABLAYER_ALL);
+		GetUApi().Backlit_Background(0,0xff211202,0xff110800);
+	}
+
+	// ...
+	void OnLeaveCar()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		// force update player
+		if( GetGame().GetMission().GetHud() )
+		{
+			GetUApi().Backlit_Remove(EUABLAYER_ALL);
+			GetUApi().Backlit_Background(0,0xff220000,0xff222222);
+
+			UpdatePlayer(true);
+		}
+	}
+
+	// ...
+	void OnSwimmingStart()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		// reset queue
+		GetUApi().Backlit_EmptyQueue();
+		// play hit animation
+		GetUApi().Backlit_Animation("Water/",0,0xff00ffff,0xffffffff);
+	}
+
+	// ...
+	void OnSwimmingStop()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		if( GetGame().GetMission().GetHud() )
+		{		
+			// enqueue background
+			GetUApi().Backlit_Background(0,0xff220000,0xff222222);
+			// force update player
+			UpdatePlayer(true);
+		}
+	}
+
+	// clear tutorial/ hint keys
+	void HintClear()
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		// remove previous backlit
+		GetUApi().Backlit_Remove(EUABLAYER_HINTKEY);				
+	}
+
+	// highlight tutorial/ hint keys
+	void HintShow( UAInput action )
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		action.Backlit_Override(EUABLAYER_HINTKEY,0xffafafff);
+	}
+
+	// clear keybinding keys
+	void KeybindingClear( )
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		GetUApi().Backlit_Remove(EUABLAYER_ALL);
+	}
+
+	// clear keybinding keys
+	void KeybindingShow( int keyHash )
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		GetUApi().Backlit_KeyByHash(keyHash,EUABLAYER_VISKEY,EUABACKLIT_FADEOUT_SLOW,0xff0000ff);
+	}
+
+
+	void VisualiseHealth( int iLevel )
+	{
+		UAInputAPI ua_api = GetUApi();
+			
+		int aColor = 0xff1fff1f;
+		int dColor = 0xff001f00;
+				
+		if( iLevel > 0 )
+			ua_api.Backlit_KeyByName("kF1",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF1",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+		if( iLevel > 1 )
+			ua_api.Backlit_KeyByName("kF2",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF2",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+		if( iLevel> 2 )
+			ua_api.Backlit_KeyByName("kF3",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF3",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+		if( iLevel > 3 )
+			ua_api.Backlit_KeyByName("kF4",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF4",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+
+/*		int lc = 0xff001f00;
+		if( iLevel > 0 )
+			lc = 0xff003f00;
+		else if( iLevel > 1 )
+			lc = 0xff007f00;
+		else if( iLevel > 2 )
+			lc = 0xff00af00;
+		else if( iLevel > 3 )
+			lc = 0xff00ff00;
+			
+		ua_api.Backlit_KeyByName("mBMiddle",EUABLAYER_HUMAN,EUABACKLIT_ON,lc);*/
+		
+	}
+	
+	void VisualiseBlood( int iLevel )
+	{
+		UAInputAPI ua_api = GetUApi();
+				
+		int aColor = 0xffff1f1f;
+		int dColor = 0xff1f0000;
+				
+		if( iLevel > 0 )
+			ua_api.Backlit_KeyByName("kF5",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF5",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+		if( iLevel > 1 )
+			ua_api.Backlit_KeyByName("kF6",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF6",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+		if( iLevel > 2 )
+			ua_api.Backlit_KeyByName("kF7",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF7",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+		if( iLevel > 3 )
+			ua_api.Backlit_KeyByName("kF8",EUABLAYER_HUMAN,EUABACKLIT_ON,aColor);
+		else
+			ua_api.Backlit_KeyByName("kF8",EUABLAYER_HUMAN,EUABACKLIT_ON,dColor );
+				
+/*		int lc = 0xff1f0000;
+		if( iLevel > 0 )
+			lc = 0xff3f0000;
+		else if( iLevel > 1 )
+			lc = 0xff7f0000;
+		else if( iLevel > 2 )
+			lc = 0xffaf0000;
+		else if( iLevel > 3 )
+			lc = iLevel;
+				
+		ua_api.Backlit_KeyByName("mBRight",EUABLAYER_HUMAN,EUABACKLIT_ON,lc);*/
+		
+	}
+
+	int m_HealthBefore = -1;
+	int m_BloodBefore = -1;
+
+	int m_HealthNew = 0;
+	int m_BloodNew = 0;
+
+	void SetHealth( float fHealth ) // range 0 .. 100
+	{
+		float health = fHealth * 0.01; // div 100
+		m_HealthNew = health*4; // 4 stages
+	}
+
+	void SetBlood( float fBlood ) // range 0 .. 5000
+	{
+		float blood = fBlood * 0.0002; // div 5000
+		m_BloodNew = blood*4; // 4 stages
+	}
+
+	void UpdatePlayer( bool bForce )
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		// force update
+		if( bForce )
+		{
+			m_HealthBefore = -1;
+			m_BloodBefore = -1;
+		}
+	
+		// do not update
+		if( m_HealthNew == m_HealthBefore && m_BloodNew == m_BloodBefore )
+			return;
+
+		// remove previous layers
+		GetUApi().Backlit_Remove(EUABLAYER_ALL);
+
+		// set keys to layer CUSTOM
+		GetUApi().Backlit_KeyByName("kW",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff0000ff);
+		GetUApi().Backlit_KeyByName("kA",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff0000cf);
+		GetUApi().Backlit_KeyByName("kS",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff0000af);
+		GetUApi().Backlit_KeyByName("kD",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff00008f);
+
+		GetUApi().Backlit_KeyByName("kX",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff3f3f3f);
+		GetUApi().Backlit_KeyByName("kC",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff3f3f3f);
+
+		GetUApi().Backlit_KeyByName("kQ",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff7f7f0f);
+		GetUApi().Backlit_KeyByName("kE",EUABLAYER_CUSTOM,EUABACKLIT_ON,0xff7f7f0f);
+
+		// health
+		VisualiseHealth(m_HealthNew);
+		// blood
+		VisualiseBlood(m_BloodNew);
+
+		// animation
+		GetUApi().Backlit_Background(0,0xff220000,0xff222222);
+		
+		// save level
+		m_BloodBefore = m_BloodNew;
+		m_HealthBefore = m_HealthNew;
+	}
+
+
+	int m_GearBefore = 0;
+	bool m_CELBefore = false;
+
+	void RefreshVehicleLayout( int iGear, bool bCEL )
+	{
+		if( !m_BacklitActive )
+			return;	// always return when backlit not present!
+	
+		UAInputAPI ua_api = GetUApi();
+
+		if( m_GearBefore != iGear )
+		{
+			m_GearBefore = iGear;
+			
+			int activeColor = 0xff3fff3f;
+			int dimmColor = 0xff0f3f0f;
+				
+			if( iGear == CarGear.REVERSE )
+				ua_api.Backlit_KeyByName("kR",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("kR",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+			if( iGear == CarGear.NEUTRAL )
+				ua_api.Backlit_KeyByName("kN",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("kN",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+			if( iGear == CarGear.FIRST )
+				ua_api.Backlit_KeyByName("k1",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("k1",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+			if( iGear == CarGear.SECOND )
+				ua_api.Backlit_KeyByName("k2",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("k2",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+			if( iGear == CarGear.THIRD )
+				ua_api.Backlit_KeyByName("k3",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("k3",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+			if( iGear == CarGear.FOURTH )
+				ua_api.Backlit_KeyByName("k4",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("k4",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+			if( iGear == CarGear.FIFTH )
+				ua_api.Backlit_KeyByName("k5",EUABLAYER_CAR,EUABACKLIT_ON,activeColor);
+			else
+				ua_api.Backlit_KeyByName("k5",EUABLAYER_CAR,EUABACKLIT_ON,dimmColor);
+
+		}
+
+		if( bCEL != m_CELBefore )
+		{		
+			m_CELBefore = bCEL;
+
+			if( bCEL )
+				ua_api.Backlit_KeyByName("kC",EUABLAYER_CAR,EUABACKLIT_ON,0xffff0f0f);
+			else
+				ua_api.Backlit_KeyByName("kC",EUABLAYER_CAR,EUABACKLIT_NONE,0xff000000);
+		}
+
+	}
+
+};
+
+
+
diff --git a/scripts/3_Game/DayZ/Effects/DestructionEffects/DestructionEffectBase.c b/scripts/3_Game/DayZ/Effects/DestructionEffects/DestructionEffectBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a04ec6b32747b0354b38c64e8580c0ca48b833f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/DestructionEffects/DestructionEffectBase.c
@@ -0,0 +1,160 @@
+class DestructionEffectBase
+{
+	EntityAI 		m_Entity;
+	
+	bool 			m_EntityIsTakeable;
+	
+	ParticleSource 	m_POneTime;
+	ParticleSource 	m_PPersistent;
+	
+	int 			m_ParticleOneTime;
+	int 			m_ParticlePersistent;
+	
+	EffectSound 	m_SOneTime;
+	EffectSound 	m_SPersistent;
+	
+	string 			m_SoundSetOneTime;
+	string 			m_SoundSetPersistent;
+
+	bool 			m_KeepHealthOnReplace;
+	string 			m_ReplaceWithEntity;
+	int 			m_ReplaceDelay;
+		
+	bool 			m_HasExplosionDamage;
+	DamageType		m_DamageType;
+	string 			m_AmmoType;
+	
+	
+	void ~DestructionEffectBase()
+	{
+		if (m_POneTime)
+		{
+			m_POneTime.Stop();
+		}
+		if (m_PPersistent)
+		{
+			m_PPersistent.Stop();
+		}
+		
+		SEffectManager.DestroyEffect(m_SOneTime);
+		SEffectManager.DestroyEffect(m_SPersistent);
+	}
+	
+	private void Init();
+	
+	bool HasExplosionDamage()
+	{
+		return (m_HasExplosionDamage && m_AmmoType);
+	}
+	
+	private void DealExplosionDamage()
+	{
+		DamageSystem.ExplosionDamage(m_Entity, null, m_AmmoType, m_Entity.GetPosition(), m_DamageType);
+	}
+	
+	void OnHealthLevelChanged(notnull EntityAI entity, int oldLevel, int newLevel, string zone)
+	{
+		m_Entity = entity;
+		Init();
+		
+		if (GetGame().IsServer())
+		{
+			entity.SetTakeable(m_EntityIsTakeable);
+			
+			if (oldLevel != -1 || entity.m_Initialized)
+			{
+				if (m_ReplaceWithEntity)
+				{
+					GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(ReplaceEntityServer, m_ReplaceDelay, false);
+				}
+				if (HasExplosionDamage())
+				{
+					DealExplosionDamage();
+				}
+				OnEntityDestroyedOneTimeServer(entity, oldLevel, zone);
+			}
+			OnEntityDestroyedPersistentServer(entity, zone);
+		}
+		#ifndef SERVER//client OR single
+		{
+			if (oldLevel != -1 || entity.m_Initialized)//one time
+			{
+				m_POneTime = PlayParticle(m_ParticleOneTime);
+				
+				if (m_POneTime)
+				{
+					m_POneTime.SetOwner(this);
+				}
+								
+				OnEntityDestroyedOneTimeClient(entity, oldLevel, zone);
+				
+				m_Entity.PlaySoundSet(m_SOneTime, m_SoundSetOneTime, 0, 0 );
+				m_Entity.PlaySoundSetLoop(m_SPersistent, m_SoundSetPersistent, 0, 0 );
+			}
+			else//Persistent
+			{
+				OnEntityDestroyedPersistentClient(entity, zone);
+				m_Entity.PlaySoundSetLoop(m_SPersistent, m_SoundSetPersistent, 0, 0 );
+			}
+			
+			m_PPersistent = PlayParticle(m_ParticlePersistent, true);
+			
+			if (m_PPersistent)
+			{
+				m_PPersistent.SetOwner(this);
+			}
+		}
+		#endif
+	}
+	
+	private void ReplaceEntityServer()
+	{
+		EntityAI dead_entity = EntityAI.Cast(GetGame().CreateObjectEx(m_ReplaceWithEntity, m_Entity.GetPosition(), ECE_OBJECT_SWAP, RF_ORIGINAL));
+		dead_entity.SetOrientation(m_Entity.GetOrientation());
+		if (m_KeepHealthOnReplace)
+		{
+			dead_entity.SetHealth(m_Entity.GetHealth());
+		}
+		m_Entity.Delete();
+	}
+	
+	private ParticleSource PlayParticle(int particleType, bool attach = false)
+	{
+		if (!m_Entity)
+		{
+			ErrorEx("Missing entity - something went wrong");
+			return null;
+		}
+		if (particleType)
+		{
+			ParticleSource p = ParticleManager.GetInstance().PlayInWorld(particleType, m_Entity.GetPosition());
+			if (attach && p)
+			{
+				p.AddAsChild(m_Entity);//Note: it's also possible to directly play on object: Particle.PlayOnObject
+			}
+			return p;
+		}
+		return null;
+	}
+	
+	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	// !!!!!!!!!! Override methods bellow !!!!!!!!!!!!!
+	// !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+	
+	// ! Client Event called the moment the entity is destroyed, best for explosion and other one-time effects
+	void OnEntityDestroyedOneTimeClient(EntityAI entity, int oldLevel,string zone);
+
+	// ! Server Event called the moment the entity is destroyed
+	void OnEntityDestroyedOneTimeServer(EntityAI entity, int oldLevel, string zone);
+
+	// ! Client Event called at the same moment as the one-time event, but also when the entity is loaded/spawned on client, typically as the player connects to the server or moves close enough so that previously non-existent client entity is now spawned in
+	void OnEntityDestroyedPersistentClient(EntityAI entity, string zone);
+
+	// ! Server Event called at the same moment as the one time event, but also when the entity is loaded/spawned on Server, typically as the server is starting up
+	void OnEntityDestroyedPersistentServer(EntityAI entity, string zone);
+
+	// !Relayed from entity when explosion happens
+	void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType);
+
+}
+
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle.c b/scripts/3_Game/DayZ/Effects/EffectParticle.c
new file mode 100644
index 0000000000000000000000000000000000000000..37069fc298eaa283c7dbf9fc75d9ab8fedd05f9c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle.c
@@ -0,0 +1,568 @@
+/**
+\brief Wrapper class for managing particles through SEffectManager
+*/
+class EffectParticle : Effect
+{
+	//! The main Particle effect that this Effect wrapper manages
+	protected Particle 			m_ParticleObj;
+	
+	/** \name Generic data
+	*	Generic data for the particle
+	*/
+	//@{
+	//! The ID in the ParticleList to create Particle from
+	protected int				m_ParticleID;
+	//! Orientation set by SetOrientation
+	protected vector			m_Orientation;
+	//! Orientation setting to be used by the effect when the Effect starts
+	protected bool    			m_ForceRotationRelativeToWorld;
+	//@}
+		
+	/** \name DEPRECATED
+	*	Simply exist because of backwards compatibility, might have never been used
+	*/
+	//@{
+	protected vector    		m_ParticleOrientation;
+	protected Object 			m_Object;
+	//@}
+	
+	
+	
+	/**
+	\brief ctor
+	*/
+	void EffectParticle()
+	{
+		
+	}
+	
+	/**
+	\brief dtor
+	*/
+	void ~EffectParticle()
+	{
+
+	}
+		
+	/**
+	\brief init
+	*/
+	override void InitEffect()
+	{
+		super.InitEffect();
+		
+		// Would be neat, but since particles are often already playing
+		// BEFORE they are even registered as the particle for the Effect
+		// Better to just keep that one I guess..
+		// Event_OnStarted.Remove(Event_OnEffectStarted);
+		
+		// Will be called by the particle events
+		Event_OnStopped.Remove(Event_OnEffectEnded);
+	}
+	
+	
+	/**
+	\brief Override when getting debug information
+	*/
+	override string GetDebugName()
+	{
+		string identifier;
+		if (GetParticle())
+		{
+			identifier = GetParticle().GetDebugNameNative();
+		}
+		else
+		{
+			identifier = "NO_PARTICLE";
+		}
+		
+		return string.Format("%1:%2:%3", super.GetDebugName(), m_ParticleID, identifier);
+	}
+	
+	/**
+	\brief Validation whether an effect truly started playing or if the Effect should stop as none is present
+		\note Override this when inheriting to create own validation check
+		\note Is called from Event_OnStarted invoker after Event_OnStarted has been performed
+	*/
+	override void ValidateStart()
+	{
+		if (!GetParticle())
+		{
+			ErrorEx(string.Format("No Particle started playing, stopping EffectParticle: %1", GetDebugName()), ErrorExSeverity.WARNING);
+			Stop();
+		}
+	}
+	
+	
+	
+	/** \name EffectType
+		Information about what type of effect the Effect is, without the need for casting
+	*/
+	//@{
+	
+	/**
+	\brief Get what type of effect the Effect is
+		\return \p EffectType What type of effect the Effect is
+	*/
+	override EffectType GetEffectType()
+	{
+		return EffectType.PARTICLE;
+	}
+	
+	/**
+	\brief Check whether the Effect is EffectParticle without casting
+		\return \p bool Whether the Effect is EffectParticle
+	*/
+	override bool IsParticle()
+	{
+		return true;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Main particle
+		Set or get the main particle which this Effect will manage
+	*/
+	//@{
+	
+	/**
+	\brief Sets the main particle which this Effect will manage
+		\param p \p Particle Main particle which this Effect will manage
+	*/
+	void SetParticle(Particle p)
+	{
+		// Unregister the events on the old
+		if (m_ParticleObj)
+		{
+			ParticleEvents ope = m_ParticleObj.GetEvents();
+			ope.Event_OnParticleStart.Remove(Event_OnEffectStarted);
+			ope.Event_OnParticleStop.Remove(Event_OnEffectEnded);
+		}
+		
+		// Assign the new main Particle
+		m_ParticleObj = p;
+		
+		// Register the events on the new
+		if (m_ParticleObj)
+		{
+			ParticleEvents npe = m_ParticleObj.GetEvents();
+			npe.Event_OnParticleStart.Insert(Event_OnEffectStarted);
+			// We will use Stop instead of End, as old particles were destroyed when they stopped
+			// And this system kinda relies on that
+			npe.Event_OnParticleStop.Insert(Event_OnEffectEnded);
+		}
+	}
+	
+	/**
+	\brief Gets the main particle which this Effect is managing
+		\return \p Particle Main particle which this Effect is managing
+	*/
+	Particle GetParticle()
+	{
+		return m_ParticleObj;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Playback
+	*	Methods to Play/Stop Effect
+	*	Generally, SEffectManager.Play methods are used instead of Start
+	*/
+	//@{
+	
+	/**
+	\brief Plays all elements this effect consists of
+		\note Is called by SEffectManager.Play methods
+	*/
+    override void Start()
+    {		
+		if (m_ParticleID > 0)
+		{
+			vector pos = GetPosition();			
+			vector ori = GetOrientation();
+			
+			if (m_ParentObject)
+			{
+				pos = GetLocalPosition();
+				ori = GetAttachedLocalOri();
+			}		
+			
+			SetParticle(ParticleManager.GetInstance().CreateParticle(m_ParticleID, pos, true, GetParent(), ori, IsParticleRotationRelativeToWorld()));
+		}
+
+		super.Start();
+	}
+	
+	/**
+	\brief Stops all elements this effect consists of
+		\note Alternatively use SEffectManager.Stop( effect_id )
+	*/
+    override void Stop()
+    {
+		if ( GetParticle() )
+		{
+			GetParticle().Stop();
+			SetParticle(null);
+		}
+		
+		super.Stop();
+    }
+	
+	//@}
+	
+	
+	
+	/** \name Attach
+		Helper methods for attaching to prent
+	*/
+	//@{
+	
+	/**
+	\brief Read Particle.AddAsChild
+	*/
+	void AttachTo(Object obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_rotation_to_world = false)
+	{
+		// Update the cached variables...
+		SetParent(obj);
+		SetLocalPosition(local_pos);
+		SetAttachedLocalOri(local_ori);
+		ForceParticleRotationRelativeToWorld(force_rotation_to_world);
+		
+		// Now attach it
+		AddAsChild(obj, local_pos, local_ori, force_rotation_to_world);
+	}
+	
+	/**
+	\brief Helper method to attach to parent using stored settings
+	*/
+	void ReAttach()
+	{
+		// Skip the updating, as we are going to reuse what was set before
+		AddAsChild( GetParent(), GetLocalPosition(), GetAttachedLocalOri(), IsParticleRotationRelativeToWorld());
+	}
+	
+	/**
+	\brief Helper method to attach to parent
+	*/
+	protected void AddAsChild(Object obj, vector local_pos, vector local_ori, bool force_rotation_to_world)
+	{
+		Particle p = GetParticle();		
+		if (p)
+		{
+			p.AddAsChild(obj, local_pos, local_ori, force_rotation_to_world);
+		}
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Events
+		Various events that can be overriden for custom behaviour
+	*/
+	//@{
+	
+	/**
+	\brief Event which just simply exists (DEPRECATED)
+		\warning Never called or used
+		\note Use Event_OnStarted instead
+	*/
+	void Event_OnPlayStart()
+	{
+		
+	}
+	
+	/**
+	\brief Event which just simply exists (DEPRECATED)
+		\warning Never called or used
+		\note Use Event_OnStarted instead
+	*/
+	void Event_OnPlayStarted()
+	{
+
+	}
+
+	//@}
+	
+	
+	
+	/** \name Generic API
+		Setters and getters for generic data and properties
+	*/
+	//@{
+	
+	/**
+	\brief Sets the id of the particle to be used
+		\note Only changes the cached variable, for immediate, use SetCurrentParticleID
+		\param id \p int Particle ID registered in ParticleList
+	*/
+	void SetParticleID( int id )
+    {
+        m_ParticleID = id;
+    }
+	
+	/**
+	\brief Gets the id of the particle to be used
+		\warning Only gets the cached variable, for immediate effect use GetCurrent variant
+		\return \p int Particle ID registered in ParticleList
+	*/
+	int GetParticleID()
+    {
+        return m_ParticleID;
+    }
+	
+	/**
+	\brief Sets the id of the particle to be used
+		\note Particle will not update immediately, but ParticleSource will
+		\param id \p int Particle ID registered in ParticleList
+	*/
+	void SetCurrentParticleID( int id )
+    {
+        m_ParticleID = id;
+		
+		Particle p = GetParticle();
+		if (p)
+		{
+			p.SetSource(id);
+		}
+    }
+	
+	/**
+	\brief Gets the current id of the managed Particle
+		\return \p int Particle ID registered in ParticleList
+	*/
+	int GetCurrentParticleID()
+    {
+		Particle p = GetParticle();
+		if (p)
+		{
+			return p.GetParticleID();
+		}
+		else
+		{
+			return ParticleList.INVALID;
+		}
+    }
+	
+	/**
+	\brief Set current parent of the managed Particle
+		\param parent_obj \p Object The parent for the Particle
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	override void SetCurrentParent( Object parent_obj, bool updateCached = true )
+	{
+		super.SetCurrentParent(parent_obj, updateCached);
+		
+		ReAttach();
+	}
+	
+	/**
+	\brief Get the current parent of the managed Particle
+		\return \p Object The currrent parent of the Particle
+	*/
+	override Object GetCurrentParent()
+	{
+		Particle p = GetParticle();
+			
+		if (p)
+			return Object.Cast(p.GetParent());
+		else
+			return super.GetParent();
+	}
+	
+	/**
+	\brief Set the current world position of the managed Particle
+		\param pos \p vector The current world position for the Particle
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	override void SetCurrentPosition( vector pos, bool updateCached = true )
+	{
+		super.SetCurrentPosition(pos, updateCached);
+		
+		Particle p = GetParticle();
+		
+		if (p)
+			p.SetPosition(pos);
+	}
+	
+	/**
+	\brief Get the current world position of the managed Particle
+		\return \p vector The current world position of the managed Particle
+	*/
+	override vector GetCurrentPosition()
+	{
+		Particle p = GetParticle();	
+		
+		if (p)
+			return p.GetPosition();
+		else
+			return super.GetPosition();
+	}
+	
+	/**
+	\brief Set the current local position of the managed Particle
+		\param pos \p vector The current local position for the managed Particle
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	override void SetCurrentLocalPosition( vector pos, bool updateCached = true )
+    {
+		super.SetCurrentLocalPosition(pos, updateCached);
+		
+		Particle p = GetParticle();			
+		if (p)
+		{
+			Object parent = GetParent();
+			
+			if (parent)
+				ReAttach();
+			else
+				p.SetPosition(pos);
+		}
+    }
+
+	/**
+	\brief Get the current local position of the managed Particle
+		\return \p vector The current local position of the managed Particle
+	*/
+	override vector GetCurrentLocalPosition()
+	{
+		Particle p = GetParticle(); 
+		
+		if (p)
+		{
+			Object parent = GetParent();
+			
+			if (parent)
+				return parent.WorldToModel(p.GetPosition());
+			else
+				return p.GetPosition();
+		}
+		else
+			return super.GetLocalPosition();
+	}
+	
+	/**
+	\brief Set orientation of the EffectParticle
+		\warning Only sets the cached variable, for immediate effect use SetCurrent variant
+		\param ori \p vector Orientation in degrees (yaw, pitch, roll)
+	*/
+	void SetOrientation( vector ori )
+	{
+		m_Orientation = ori;
+	}
+	
+	/**
+	\brief Get the orientation of the EffectParticle
+		\warning Only gets the cached variable, for immediate effect use GetCurrent variant
+		\return \p vector The orientation of EffectParticle
+	*/
+	vector GetOrientation()
+	{
+		return m_Orientation;
+	}
+	
+	/**
+	\brief Set the current orientation of the managed Particle
+		\param ori \p vector Orientation in degrees (yaw, pitch, roll)
+	*/
+	void SetCurrentOrientation( vector ori, bool updateCached = true )
+	{
+		if ( updateCached)
+			SetOrientation(ori);
+		
+		Particle p = GetParticle();	
+				
+		if (p)
+			p.SetOrientation(ori);
+	}
+	
+	/**
+	\brief Get the current orientation of the managed Particle
+		\return \p vector The current orientation of the managed Particle
+	*/
+	vector GetCurrentOrientation()
+	{
+		Particle p = GetParticle();	
+		
+		if (p)
+			return p.GetOrientation();
+		else
+			return vector.Zero;
+	}
+	
+	/**
+	\brief Set orientation setting to be used by the effect when the Effect starts
+		\warning Only caches it into a variable to be used by Start, does not live update when called afterwards
+		\note There is no way to update this immediately
+		\param state \p bool Whether to keep WS orientation when attaching it to parent
+	*/
+	void ForceParticleRotationRelativeToWorld(bool state)
+	{
+		m_ForceRotationRelativeToWorld = state;
+	}
+	
+	/**
+	\brief Get the orientation setting to be used by the effect when the Effect starts
+		\warning Only gets the cached variable, for immediate effect use IsParticleCurrentRotationRelativeToWorld
+		\return \p bool Whether to keep WS orientation when attaching it to parent
+	*/
+	bool IsParticleRotationRelativeToWorld()
+	{
+		Particle p = GetParticle();	
+		
+		if (p)
+			return p.IsHierarchyPositionOnly();
+		else
+			return m_ForceRotationRelativeToWorld;
+	}
+	
+	/**
+	\brief Get the current orientation setting to be used by the managed Particle
+		\return \p bool Whether the managed Particle is only updating position from parent
+	*/
+	bool IsParticleCurrentRotationRelativeToWorld()
+	{
+		Particle p = GetParticle();	
+		
+		if (p)
+			return p.IsHierarchyPositionOnly();
+		else
+			return false;
+	}
+	
+	//@}
+
+	
+	
+	/** \name DEPRECATED
+		Methods which exist for backwards compatibility and are no longer in use or have never been in use
+	*/
+	//@{
+	
+	/**
+	\brief Was never called and probably should never be called
+		\warning Emptied the functionality as it is relatively unsafe...
+	*/
+	void CheckLifeSpan()
+	{
+		/*
+		if ( !m_ParticleObj )
+		{
+			delete this;
+		}
+		
+		OnCheckUpdate();
+		*/
+	}
+
+	void SetDecalOwner(Object o)
+	{
+		m_Object = o;
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BleedingSource.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BleedingSource.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f3e2050bcca9d38ad3d3d4b5271d6238cec61ab
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BleedingSource.c
@@ -0,0 +1,15 @@
+class BleedingSourceEffect : EffectParticle
+{
+	void BleedingSourceEffect()
+	{
+		SetParticleID(ParticleList.BLEEDING_SOURCE);
+	}
+}
+
+class BleedingSourceEffectLight : EffectParticle
+{
+	void BleedingSourceEffectLight()
+	{
+		SetParticleID(ParticleList.BLEEDING_SOURCE_LIGHT);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BloodSplatter.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BloodSplatter.c
new file mode 100644
index 0000000000000000000000000000000000000000..b634ae490ed81faacc0b06e9d287fa4da3697e91
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BloodSplatter.c
@@ -0,0 +1,7 @@
+class BloodSplatter : EffectParticle
+{
+	void BloodSplatter()
+	{
+		SetParticleID(ParticleList.BLOOD_SURFACE_DROPS);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..24d27d4e891b2007a76383fb5b3768f6d0a77e66
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase.c
@@ -0,0 +1,341 @@
+class EffBulletImpactBase : EffectParticle
+{
+	static const int	SURVIVOR_HEAD = 0; // Head component
+	static const int	INFECTED_HEAD = 3; // Head component
+	static float		DEFAULT_PROJECTILE_WEIGHT = 0.015;
+	
+	float				MIN_SCALING_PARAM = 0.1;
+	
+	Object 				m_DirectHit;
+	float 				m_StoppingForce;
+	float 				m_Weight; // projectile weight in kg
+	int 				m_ImpactType;
+	int 				m_ComponentIndex;
+	vector 				m_Pos;
+	vector 				m_SurfNormal;
+	vector 				m_ExitPos;
+	vector 				m_InSpeed;
+	vector 				m_OutSpeed;
+	string 				m_AmmoType;
+	
+	static vector INVALID = "0 0 0";
+	
+	// Particle Effects
+	int m_ParticleEnter = -1;
+	int m_ParticleExit = -1;
+	int m_ParticleRicochet = -1;
+	
+	// Calculations
+	float m_EnterSplashCoef = 0.003;
+	float m_ExitSplashCoef = 0.002;
+	float m_RicochetSplashCoef = 0.002;
+	float m_EnterAngledSplashCoef = 0.01;
+	float m_AngledEnter = 0.40;
+	
+	void EffBulletImpactBase()
+	{
+		
+	}
+	
+	override void OnCheckUpdate()
+	{
+		//DbgUI.Text( m_ammoType );
+	}
+	
+	void SetEnterParticle(int id)
+	{
+		m_ParticleEnter = id;
+	}
+	
+	void SetExitParticle(int id)
+	{
+		m_ParticleExit = id;
+	}
+	
+	void SetRicochetParticle(int id)
+	{
+		m_ParticleRicochet = id;
+	}
+	
+	void SetSingleParticle(int id)
+	{
+		SetEnterParticle(id);
+		SetExitParticle(id);
+		SetRicochetParticle(id);
+	}
+	
+	void SetAngledEnterValue(float f)
+	{
+		m_AngledEnter = f;
+	}
+	
+	void EvaluateEffect(Object directHit, int componentIndex, vector pos, int impact_type, vector surfNormal, vector exitPos, vector inSpeed, vector outSpeed, string ammoType)
+	{
+		m_DirectHit 		= directHit;
+		m_Pos 				= pos;
+		m_ImpactType 		= impact_type;
+		m_ComponentIndex 	= componentIndex;
+		m_SurfNormal 		= surfNormal;
+		m_ExitPos 			= exitPos;
+		m_InSpeed 			= inSpeed;
+		m_OutSpeed 			= outSpeed;
+		m_AmmoType 			= ammoType;
+		m_Weight			= GetGame().ConfigGetFloat("CfgAmmo " + ammoType + " weight");
+		
+		m_StoppingForce 	= CalculateStoppingForce(m_InSpeed.Length(), m_OutSpeed.Length(), ammoType, m_Weight);
+	}
+	
+	float CalculateStoppingForce(float in_speedf, float out_speedf, string ammoType, float weight)
+	{
+		if ( m_ImpactType == ImpactTypes.MELEE )
+		{
+			return Math.RandomFloat(50, 100);
+		}
+		
+		float projectile_weight_coef = weight / DEFAULT_PROJECTILE_WEIGHT;
+		
+		float stopping_force = (in_speedf - out_speedf) * projectile_weight_coef;
+		
+		return stopping_force;
+	}
+	
+	void OnEnterCalculations( Particle p )
+	{
+		// All values represent scale
+		float velocity_min 		= (m_StoppingForce * m_EnterSplashCoef);
+		float velocity_max 		= (m_StoppingForce * m_EnterSplashCoef);
+		float size 				= (m_StoppingForce * m_EnterSplashCoef);
+		float birth_rate 		= (m_StoppingForce * m_EnterSplashCoef);
+		float air_resistance 	= velocity_min;
+		float lifetime 			= (m_StoppingForce * m_EnterSplashCoef);
+		float lifetime_rnd		= (m_StoppingForce * m_EnterSplashCoef);
+		
+		if ( m_AmmoType == "Bullet_12GaugePellets" )
+		{
+			birth_rate *= 0.5;
+			velocity_min *= 2;
+			velocity_max *= 2;
+		}
+		
+		
+		if (velocity_min < 0.75)
+			velocity_min = 0.75;
+		
+		if (size < 0.75)
+			size = 0.75;
+		
+		if (lifetime < 0.5)
+			lifetime = 0.5;
+		
+		if (lifetime_rnd < 0.5)
+			lifetime_rnd = 0.5;
+		
+		if (velocity_max < 1)
+			velocity_max = 1;
+		
+		/*Print("===============");
+		Print(velocity_min);
+		Print(velocity_max);
+		Print(size);
+		Print(birth_rate);
+		Print(air_resistance);
+		Print(lifetime);
+		Print(lifetime_rnd);*/
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+		p.ScaleParticleParam(EmitorParam.AIR_RESISTANCE, air_resistance);
+		p.ScaleParticleParam(EmitorParam.AIR_RESISTANCE_RND, air_resistance);
+		p.ScaleParticleParam(EmitorParam.LIFETIME, lifetime);
+		p.ScaleParticleParam(EmitorParam.LIFETIME_RND, lifetime_rnd);
+	}
+	
+	void OnExitCalculations(Particle p, float outSpeedf)
+	{
+		float velocity_min = 1 + (outSpeedf * m_ExitSplashCoef);
+		float velocity_max = 1 + (outSpeedf * m_ExitSplashCoef);
+		float size = 1 + ( outSpeedf * m_ExitSplashCoef);
+		float birth_rate = 1 + (outSpeedf * m_ExitSplashCoef);
+		
+		if (velocity_min < MIN_SCALING_PARAM)
+			velocity_min = MIN_SCALING_PARAM;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (birth_rate < MIN_SCALING_PARAM)
+			birth_rate = MIN_SCALING_PARAM;
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+	}
+	
+	void OnRicochetCalculations(Particle p, float outspeedf)
+	{
+		float velocity_min = MIN_SCALING_PARAM + (m_StoppingForce * m_RicochetSplashCoef);
+		float velocity_max = MIN_SCALING_PARAM + (m_StoppingForce * m_RicochetSplashCoef);
+		float size = MIN_SCALING_PARAM + ( m_StoppingForce * m_RicochetSplashCoef);
+		float birth_rate = MIN_SCALING_PARAM + (m_StoppingForce * m_RicochetSplashCoef);
+		
+		if (velocity_min < MIN_SCALING_PARAM)
+			velocity_min = MIN_SCALING_PARAM;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (birth_rate < MIN_SCALING_PARAM)
+			birth_rate = MIN_SCALING_PARAM;
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+	}
+	
+	void OnEnterAngledCalculations(Particle p)
+	{
+		float velocity_min = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterAngledSplashCoef);
+		float velocity_max = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterAngledSplashCoef);
+		float size = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterAngledSplashCoef);
+		float birth_rate = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterAngledSplashCoef);
+		
+		if (velocity_min < MIN_SCALING_PARAM)
+			velocity_min = MIN_SCALING_PARAM;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (birth_rate < MIN_SCALING_PARAM)
+			birth_rate = MIN_SCALING_PARAM;
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+	}
+	
+	override void Event_OnStarted()
+	{
+		Particle p;
+		vector particle_orientation;
+		float outSpeedf = m_OutSpeed.Length();
+		
+		ParticleManager gPM = ParticleManager.GetInstance();
+		
+		if ( m_ImpactType == ImpactTypes.RICOCHET )
+		{
+			p = gPM.PlayInWorld(m_ParticleRicochet, m_Pos);
+			
+			if (p)
+			{
+				particle_orientation = m_OutSpeed.VectorToAngles();
+				particle_orientation = particle_orientation + "0 -90 0";
+				p.SetOrientation(particle_orientation);
+				
+				OnRicochetCalculations(p, outSpeedf);
+			}
+		}
+		else
+		{
+			p = gPM.PlayInWorld(m_ParticleEnter, m_Pos );
+			
+			if (p)
+			{
+				if (m_SurfNormal != INVALID)
+				{
+					particle_orientation = m_SurfNormal.VectorToAngles();
+					particle_orientation = particle_orientation + "0 270 0";
+				}
+				else
+				{
+					particle_orientation = "0 0 0"; // This vector is in angles
+				}
+				
+				p.SetOrientation(particle_orientation);
+			
+				OnEnterCalculations(p);
+			}
+			
+			if (outSpeedf > 0  &&  m_SurfNormal != INVALID)
+			{
+				p = gPM.PlayInWorld(m_ParticleExit, m_ExitPos);
+				
+				if (p)
+				{
+					particle_orientation = m_OutSpeed.VectorToAngles();
+					particle_orientation = particle_orientation + "0 -90 0";
+					p.SetOrientation(particle_orientation);
+					
+					OnExitCalculations(p, outSpeedf);
+				}
+			}
+			else
+			{
+				if (m_SurfNormal != INVALID)
+				{
+					vector surfNormalN = m_SurfNormal.Normalized();
+					vector inSpeedN = m_InSpeed.Normalized();
+					vector bounce_ori = surfNormalN + inSpeedN;
+					
+					float dot = vector.Dot(bounce_ori, surfNormalN);
+					
+					if ( dot > m_AngledEnter )
+					{
+						p = gPM.PlayInWorld(m_ParticleRicochet, m_Pos);
+			
+						if (p)
+						{
+							particle_orientation = bounce_ori.VectorToAngles();
+							particle_orientation = particle_orientation + "0 -90 0";
+							p.SetOrientation(particle_orientation);
+							
+							OnEnterAngledCalculations(p);
+						}
+					}
+				}
+			}
+		}
+		
+		if (p)
+		{
+			SetParticle(p);
+		}
+		
+		
+		// Additional impact particle over long ranges. It shows players where their bullets land
+		
+		if ( Type() != Hit_MeatBones )
+		{
+			vector camera_pos = GetGame().GetCurrentCameraPosition();
+			float distance = vector.Distance(camera_pos, m_Pos);
+						
+			// Additional size increase by distance from camera
+			float scaling_by_distance = distance * 0.01;
+			
+			// Now scale down the above size increase by player's zoom-in value
+			float current_FOV = Camera.GetCurrentFOV();
+			float config_FOV = GetDayZGame().GetUserFOVFromConfig();
+			float FOV_scale = current_FOV / config_FOV;
+			scaling_by_distance = 1 + scaling_by_distance * FOV_scale;
+			
+			if (scaling_by_distance > 1.1)
+			{
+				Particle p_distant = gPM.PlayInWorld(ParticleList.IMPACT_DISTANT_DUST, m_Pos);
+				
+				particle_orientation = m_SurfNormal.VectorToAngles();
+				particle_orientation[1] = particle_orientation[1] + 270;
+				p_distant.SetOrientation(particle_orientation);
+				
+				p_distant.ScaleParticleParam(EmitorParam.SIZE, scaling_by_distance - 0.5);
+				p_distant.ScaleParticleParam(EmitorParam.BIRTH_RATE, scaling_by_distance * 0.1);
+				p_distant.ScaleParticleParam(EmitorParam.BIRTH_RATE_RND, scaling_by_distance * 0.1);
+				p_distant.ScaleParticleParam(EmitorParam.LIFETIME, scaling_by_distance * 0.3);
+				p_distant.ScaleParticleParam(EmitorParam.LIFETIME_RND, scaling_by_distance * 0.3);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Concrete.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Concrete.c
new file mode 100644
index 0000000000000000000000000000000000000000..8bfc0bdc5b65078c21e641896df45758023b6310
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Concrete.c
@@ -0,0 +1,11 @@
+class Hit_Concrete : EffBulletImpactBase
+{
+	void Hit_Concrete()
+	{
+		SetEnterParticle(ParticleList.IMPACT_CONCRETE_ENTER);
+		SetExitParticle(ParticleList.IMPACT_CONCRETE_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_CONCRETE_RICOCHET);
+		
+		m_AngledEnter = 0.50;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Dirt.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Dirt.c
new file mode 100644
index 0000000000000000000000000000000000000000..5583a40a9c84e903a56d39c0d8f6cdcf54dca59f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Dirt.c
@@ -0,0 +1,9 @@
+class Hit_Dirt : EffBulletImpactBase
+{
+	void Hit_Dirt()
+	{
+		SetEnterParticle(ParticleList.IMPACT_DIRT_ENTER);
+		SetExitParticle(ParticleList.IMPACT_DIRT_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_DIRT_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Error.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Error.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b4ac7aedd44ec35933ba0c4c0f0f20bd437909e
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Error.c
@@ -0,0 +1,11 @@
+class Hit_ErrorNoMaterial : EffBulletImpactBase
+{
+	void Hit_ErrorNoMaterial()
+	{
+		#ifdef DEVELOPER
+		SetSingleParticle(ParticleList.IMPACT_TEST_NO_MATERIAL_ERROR);
+		#else
+		SetSingleParticle(ParticleList.IMPACT_TEST);
+		#endif
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Foliage.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Foliage.c
new file mode 100644
index 0000000000000000000000000000000000000000..65ffbd4e4a744378476b185f5ac372cc2cdd172d
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Foliage.c
@@ -0,0 +1,23 @@
+class Hit_Foliage : EffBulletImpactBase
+{
+	void Hit_Foliage()
+	{
+		SetEnterParticle(ParticleList.IMPACT_FOLIAGE_ENTER);
+		SetExitParticle(ParticleList.IMPACT_FOLIAGE_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_FOLIAGE_RICOCHET);
+	}
+	
+	override float CalculateStoppingForce(float in_speedf, float out_speedf, string ammoType, float weight)
+	{
+		if ( m_ImpactType == ImpactTypes.MELEE )
+		{
+			return 500;
+		}
+		
+		float projectile_weight_coef = weight / DEFAULT_PROJECTILE_WEIGHT;
+		
+		float stopping_force = in_speedf * projectile_weight_coef * 0.5;
+				
+		return stopping_force;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Glass.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Glass.c
new file mode 100644
index 0000000000000000000000000000000000000000..ee31f7f1392aaa8dec4611acd8ba72acda992f80
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Glass.c
@@ -0,0 +1,9 @@
+class Hit_Glass : EffBulletImpactBase
+{
+	void Hit_Glass()
+	{
+		SetEnterParticle(ParticleList.IMPACT_GLASS_ENTER);
+		SetExitParticle(ParticleList.IMPACT_GLASS_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_GLASS_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Glass_Thin.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Glass_Thin.c
new file mode 100644
index 0000000000000000000000000000000000000000..fff5a731c2cbb88f62ca61250350b4520e281e56
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Glass_Thin.c
@@ -0,0 +1,9 @@
+class Hit_Glass_Thin : EffBulletImpactBase
+{
+	void Hit_Glass_Thin()
+	{
+		SetEnterParticle(ParticleList.IMPACT_GLASS_ENTER);
+		SetExitParticle(ParticleList.IMPACT_GLASS_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_GLASS_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Grass.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Grass.c
new file mode 100644
index 0000000000000000000000000000000000000000..fd68f6e0505b53e46ba647c897c12fd12dd9b893
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Grass.c
@@ -0,0 +1,11 @@
+class Hit_Grass : EffBulletImpactBase
+{
+	void Hit_Grass()
+	{
+		SetEnterParticle(ParticleList.IMPACT_GRASS_ENTER);
+		SetExitParticle(ParticleList.IMPACT_GRASS_ENTER);
+		SetRicochetParticle(ParticleList.IMPACT_GRASS_RICOCHET);
+		
+		m_AngledEnter = 0.6;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Gravel.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Gravel.c
new file mode 100644
index 0000000000000000000000000000000000000000..64221af70785275ae9fda24835447a58fc701b16
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Gravel.c
@@ -0,0 +1,9 @@
+class Hit_Gravel : EffBulletImpactBase
+{
+	void Hit_Gravel()
+	{
+		SetEnterParticle(ParticleList.IMPACT_GRAVEL_ENTER);
+		SetExitParticle(ParticleList.IMPACT_GRAVEL_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_GRAVEL_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3df768a4b47d99d6a11c2056c227b7c4a437021
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones.c
@@ -0,0 +1,201 @@
+class Hit_MeatBones : EffBulletImpactBase
+{
+	float m_ScalingByDistance;
+	
+	void Hit_MeatBones()
+	{
+		SetEnterParticle(ParticleList.IMPACT_MEATBONES_ENTER);
+		SetExitParticle(ParticleList.IMPACT_MEATBONES_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_MEATBONES_RICOCHET);
+		
+		m_AngledEnter = 10;
+		m_EnterSplashCoef = 0.002;
+		m_ExitSplashCoef = 0.006;
+		m_ScalingByDistance = 0.05;
+		
+		MIN_SCALING_PARAM = 0.2;
+	}
+	
+	override float CalculateStoppingForce(float in_speedf, float out_speedf, string ammoType, float weight)
+	{
+		if ( m_ImpactType == ImpactTypes.MELEE )
+		{
+			return 400;
+		}
+		
+		float projectile_weight_coef = weight / DEFAULT_PROJECTILE_WEIGHT;
+		
+		float stopping_force = in_speedf * projectile_weight_coef;
+		
+		if (m_DirectHit)
+		{
+			/*
+			// TO DO: Doesn't work because IsAlive() is false, even when it shouldn't be.
+			if ( m_DirectHit.IsMan()  &&  m_componentIndex == SURVIVOR_HEAD  &&  m_DirectHit.IsAlive() ) // Is the victim a survivor?
+			{
+				stopping_force = stopping_force * 2;
+			}
+			*/
+			
+			/*
+			// TO DO: Doesn't work. Need to recognize a zombie somehow
+			else if ( m_DirectHit.IsInherited(DayZCreatureAIType)  &&  m_componentIndex == INFECTED_HEAD ) // Is the victim a survivor that's hit in the head?
+			{
+				stopping_force = stopping_force * 2;
+			}*/
+		}
+		
+		return stopping_force;
+	}
+
+	override void Event_OnStarted()
+	{
+		super.Event_OnStarted();
+		
+		if (m_ImpactType != ImpactTypes.MELEE)
+		{
+			vector in_speed = m_InSpeed * (-1); // Compiler demands to have this variable
+			
+			BloodSplatGround( GetPosition(), in_speed , 0.5 );
+			
+			if (m_OutSpeed.Length() > 0)
+			{
+				BloodSplatGround( m_ExitPos, m_OutSpeed, 0.8  );
+			}
+		}
+	}
+	
+	void BloodSplatGround( vector start_pos, vector speed_vector, float decay_coef )
+	{
+		vector pos = start_pos;
+		float power = m_StoppingForce;
+		float upscale = 1;
+		float rnd_offset = 0.5;
+		float rnd_offset_2 = rnd_offset * 0.5;
+		
+		while (power > 200)
+		{
+			pos = pos + ( speed_vector * 0.001 );
+			pos = pos + Vector( rnd_offset_2 - Math.RandomFloat( 0, rnd_offset ), 0, rnd_offset_2 - Math.RandomFloat( 0, rnd_offset ) );
+			pos[1] = GetGame().SurfaceY(pos[0], pos[2]);
+			
+			EffectParticle eff = new BloodSplatter();
+			eff.SetAutodestroy(true);
+			SEffectManager.PlayInWorld(eff, pos);
+			
+			Particle blood = eff.GetParticle(); // TO DO: Handle particle changes inside the Effect instance itself! Not here!
+
+			vector ori = GetGame().GetSurfaceOrientation(pos[0], pos[2]);
+						
+			blood.SetOrientation(ori);
+			blood.ScaleParticleParam(EmitorParam.SIZE, upscale);
+			
+			Particle blood_chunks = ParticleManager.GetInstance().PlayInWorld(ParticleList.BLOOD_SURFACE_CHUNKS, pos);
+			blood_chunks.SetOrientation(ori);
+			
+			power = power * decay_coef;
+			upscale = upscale + Math.RandomFloat(0.1, 1);			
+			
+			BloodSplatWall();
+		}
+	}
+	
+	void BloodSplatWall()
+	{
+		// Commented out due to age rating process :(
+		
+		/*
+		if (m_OutSpeed.Length() > 0)
+		{
+			Object projected_surface;
+			vector hit_pos;
+			vector hit_normal;
+			float hit_fraction; 
+			DayZPhysics.RayCastBullet(m_ExitPos, m_ExitPos + m_OutSpeed, PhxInteractionLayers.BUILDING, m_Object, projected_surface, hit_pos, hit_normal, hit_fraction);
+			
+			hit_normal = hit_normal.VectorToAngles();
+			hit_normal[1] = hit_normal[1] + 90;
+			
+			EffectParticle eff = new BloodSplatter();
+			eff.SetAutodestroy(true);
+			SEffectManager.PlayInWorld(eff, hit_pos);
+			Particle blood = eff.GetParticle();
+			blood.SetOrientation(hit_normal);
+		}
+		*/
+	}
+	
+	override void OnEnterCalculations( Particle p )
+	{
+		// Calculate particle's size based on bullet's speed
+		float velocity_min = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterSplashCoef);
+		float velocity_max = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterSplashCoef);
+		float size = MIN_SCALING_PARAM + ( m_StoppingForce * m_EnterSplashCoef);
+		float birth_rate = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterSplashCoef/2);
+		
+		if ( m_AmmoType == "Bullet_12GaugePellets" )
+		{
+			birth_rate *= 0.5;
+			velocity_min *= 2;
+			velocity_max *= 2;
+		}
+		
+		// Additional size increase by distance from camera
+		vector camera_pos = GetGame().GetCurrentCameraPosition();
+		float distance = vector.Distance(camera_pos, m_Pos);
+		float scaling_by_distance = (distance*1.2) * m_ScalingByDistance;
+		
+		// Now scale down the above size increase by player's zoom-in value
+		float current_FOV = Camera.GetCurrentFOV();
+		float config_FOV = GetDayZGame().GetUserFOVFromConfig();
+		float FOV_scale = current_FOV / config_FOV;
+		scaling_by_distance = scaling_by_distance * FOV_scale;
+
+		if (scaling_by_distance > 5)
+			scaling_by_distance = 5;
+		
+		size = size + scaling_by_distance;
+		velocity_min = velocity_min + scaling_by_distance;
+		velocity_max = velocity_max + scaling_by_distance;
+		
+		if (velocity_min < MIN_SCALING_PARAM)
+			velocity_min = MIN_SCALING_PARAM;
+		
+		if (velocity_max < MIN_SCALING_PARAM * 2)
+			velocity_max = MIN_SCALING_PARAM * 2;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (birth_rate < MIN_SCALING_PARAM)
+			birth_rate = MIN_SCALING_PARAM;
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+	}
+	
+	override void OnExitCalculations(Particle p, float outSpeedf)
+	{
+		float velocity_rnd = outSpeedf * m_ExitSplashCoef;
+		float birth_rate_rnd_def = outSpeedf * m_ExitSplashCoef;
+		float size = outSpeedf * m_ExitSplashCoef;
+		
+		if (velocity_rnd < MIN_SCALING_PARAM)
+			velocity_rnd = MIN_SCALING_PARAM;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (size > 1)
+			size = 1;
+		
+		if (birth_rate_rnd_def < MIN_SCALING_PARAM)
+			birth_rate_rnd_def = MIN_SCALING_PARAM;
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_rnd);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate_rnd_def);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeFist.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeFist.c
new file mode 100644
index 0000000000000000000000000000000000000000..4fc9d73a22e13363da919bdf73be526e0d81a07c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeFist.c
@@ -0,0 +1,7 @@
+class Hit_MeatBones_MeleeFist : Hit_MeatBones
+{
+	void Hit_MeatBones_MeleeFist()
+	{
+		SetSingleParticle(ParticleList.INVALID);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleePipeWrench.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleePipeWrench.c
new file mode 100644
index 0000000000000000000000000000000000000000..2eb0b63f0902aadb38b24d45a7d17b4398831d01
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleePipeWrench.c
@@ -0,0 +1,7 @@
+class Hit_MeatBones_MeleePipeWrench : Hit_MeatBones
+{
+	void Hit_MeatBones_MeleePipeWrench()
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeShovel.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeShovel.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b9b67ab7ca189b6dde848e6690395c5fb1327c5
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeShovel.c
@@ -0,0 +1,7 @@
+class Hit_MeatBones_MeleeShovel : Hit_MeatBones
+{
+	void Hit_MeatBones_MeleeShovel()
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeWrench.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeWrench.c
new file mode 100644
index 0000000000000000000000000000000000000000..020cf19a7fb2cc3c70be87a43b7360a578992c97
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_MeatBones/Hit_MeatBones_MeleeWrench.c
@@ -0,0 +1,7 @@
+class Hit_MeatBones_MeleeWrench : Hit_MeatBones
+{
+	void Hit_MeatBones_MeleeWrench()
+	{
+
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Metal.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Metal.c
new file mode 100644
index 0000000000000000000000000000000000000000..8d28a651ca72226d2e48b494fa84d8b0d8670d13
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Metal.c
@@ -0,0 +1,9 @@
+class Hit_Metal : EffBulletImpactBase
+{
+	void Hit_Metal()
+	{
+		SetEnterParticle(ParticleList.IMPACT_METAL_ENTER);
+		SetExitParticle(ParticleList.IMPACT_METAL_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_METAL_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Plaster.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Plaster.c
new file mode 100644
index 0000000000000000000000000000000000000000..0016501681c79f2ee35f8ed8498665573ee1bbc2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Plaster.c
@@ -0,0 +1,9 @@
+class Hit_Plaster : EffBulletImpactBase
+{
+	void Hit_Plaster()
+	{
+		SetEnterParticle(ParticleList.IMPACT_PLASTER_ENTER);
+		SetExitParticle(ParticleList.IMPACT_PLASTER_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_PLASTER_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Plastic.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Plastic.c
new file mode 100644
index 0000000000000000000000000000000000000000..23ead7ee6119e45ba67b939204221f8476fdcc77
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Plastic.c
@@ -0,0 +1,9 @@
+class Hit_Plastic : EffBulletImpactBase
+{
+	void Hit_Plastic()
+	{
+		SetEnterParticle(ParticleList.IMPACT_PLASTIC_ENTER);
+		SetRicochetParticle(ParticleList.IMPACT_PLASTIC_ENTER);
+		SetExitParticle(ParticleList.IMPACT_PLASTIC_ENTER);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Rubber.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Rubber.c
new file mode 100644
index 0000000000000000000000000000000000000000..d06a828d7694f35be2925cc53fb038ca15aadbe3
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Rubber.c
@@ -0,0 +1,9 @@
+class Hit_Rubber : EffBulletImpactBase
+{
+	void Hit_Rubber()
+	{
+		SetEnterParticle(ParticleList.IMPACT_RUBBER_ENTER);
+		SetExitParticle(ParticleList.IMPACT_RUBBER_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_RUBBER_RICOCHET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Sand.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Sand.c
new file mode 100644
index 0000000000000000000000000000000000000000..be299c6403927aebe1fbdb2add61a977229f420f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Sand.c
@@ -0,0 +1,9 @@
+class Hit_Sand : EffBulletImpactBase
+{
+	void Hit_Sand()
+	{
+		SetEnterParticle(ParticleList.IMPACT_SAND_ENTER);
+		SetRicochetParticle(ParticleList.IMPACT_SAND_ENTER);
+		SetExitParticle(ParticleList.IMPACT_SAND_ENTER);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Textile.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Textile.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3c00c13fd322ca114ed909f66d3ee8cb037dc4b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Textile.c
@@ -0,0 +1,9 @@
+class Hit_Textile : EffBulletImpactBase
+{
+	void Hit_Textile()
+	{
+		SetEnterParticle(ParticleList.IMPACT_TEXTILE_ENTER);
+		SetRicochetParticle(ParticleList.IMPACT_TEXTILE_ENTER);
+		SetExitParticle(ParticleList.IMPACT_TEXTILE_EXIT);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Undefined.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Undefined.c
new file mode 100644
index 0000000000000000000000000000000000000000..2fead6668af81d0ac53d528680cad3bb474f4ddb
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Undefined.c
@@ -0,0 +1,7 @@
+class Hit_Undefined : EffBulletImpactBase
+{
+	void Hit_Undefined()
+	{
+		SetSingleParticle(ParticleList.IMPACT_TEST);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Water.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Water.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bd4ce53cc18d0de83266ec6c421c6bae5d8eb4d
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Water.c
@@ -0,0 +1,54 @@
+class Hit_Water : EffBulletImpactBase
+{
+	void Hit_Water()
+	{
+		SetSingleParticle(ParticleList.IMPACT_WATER_SMALL_ENTER);
+		
+		m_AngledEnter = 10;
+	}
+	
+	override void EvaluateEffect(Object directHit, int componentIndex, vector pos, int impact_type, vector surfNormal, vector exitPos, vector inSpeed, vector outSpeed, string ammoType)
+	{
+		super.EvaluateEffect(directHit, componentIndex, pos, impact_type, surfNormal, exitPos, inSpeed, outSpeed, ammoType);
+		
+		m_SurfNormal = "0 0 0";
+	}
+	
+	override float CalculateStoppingForce(float in_speedf, float out_speedf, string ammoType, float weight)
+	{
+		float projectile_weight_coef = weight / DEFAULT_PROJECTILE_WEIGHT;
+		
+		float stopping_force = (in_speedf - out_speedf) * projectile_weight_coef;
+		
+		if ( stopping_force < 350 )
+			SetEnterParticle(ParticleList.IMPACT_WATER_SMALL_ENTER);
+		
+		if ( stopping_force >= 350  &&  stopping_force < 750 )
+			SetEnterParticle(ParticleList.IMPACT_WATER_MEDIUM_ENTER);
+		
+		if ( stopping_force >= 750 )
+			SetEnterParticle(ParticleList.IMPACT_WATER_LARGE_ENTER);
+		
+		return stopping_force;
+	}
+	
+	override void OnEnterCalculations( Particle p )
+	{
+		// no particle scaling
+	}
+	
+	override void OnExitCalculations(Particle p, float outSpeedf)
+	{
+		// no particle scaling
+	}
+	
+	override void OnRicochetCalculations(Particle p, float outspeedf)
+	{
+		// no particle scaling
+	}
+	
+	override void OnEnterAngledCalculations(Particle p)
+	{
+		// no particle scaling
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Wood.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Wood.c
new file mode 100644
index 0000000000000000000000000000000000000000..92f86640e83f66eb2b95fe0400f991276bb9f824
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactBase/Hit_Wood.c
@@ -0,0 +1,56 @@
+class Hit_Wood : EffBulletImpactBase
+{
+	void Hit_Wood()
+	{
+		SetEnterParticle(ParticleList.IMPACT_WOOD_ENTER);
+		SetExitParticle(ParticleList.IMPACT_WOOD_EXIT);
+		SetRicochetParticle(ParticleList.IMPACT_WOOD_RICOCHET);
+	}
+	
+	override void OnEnterCalculations( Particle p )
+	{
+		// All values represent scale
+		float velocity_min = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterSplashCoef);
+		float velocity_max = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterSplashCoef);
+		float size = MIN_SCALING_PARAM + ( m_StoppingForce * m_EnterSplashCoef)*0.5;
+		float birth_rate = MIN_SCALING_PARAM + (m_StoppingForce * m_EnterSplashCoef)*0.5;
+		
+		if (velocity_min < MIN_SCALING_PARAM)
+			velocity_min = MIN_SCALING_PARAM;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (birth_rate < MIN_SCALING_PARAM)
+			birth_rate = MIN_SCALING_PARAM;
+		
+		
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+	}
+	
+	override void OnExitCalculations(Particle p, float outSpeedf)
+	{
+		float velocity_min = 1 + (outSpeedf * m_ExitSplashCoef);
+		float velocity_max = 1 + (outSpeedf * m_ExitSplashCoef);
+		float size = 1 + ( outSpeedf * m_ExitSplashCoef)*0.5;
+		float birth_rate = 1 + (outSpeedf * m_ExitSplashCoef)*0.5;
+		
+		if (velocity_min < MIN_SCALING_PARAM)
+			velocity_min = MIN_SCALING_PARAM;
+		
+		if (size < MIN_SCALING_PARAM)
+			size = MIN_SCALING_PARAM;
+		
+		if (birth_rate < MIN_SCALING_PARAM)
+			birth_rate = MIN_SCALING_PARAM;
+		
+		p.ScaleParticleParam(EmitorParam.VELOCITY, velocity_min);
+		p.ScaleParticleParam(EmitorParam.VELOCITY_RND, velocity_max);
+		p.ScaleParticleParam(EmitorParam.SIZE, size);
+		p.ScaleParticleParam(EmitorParam.BIRTH_RATE, birth_rate);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactTest.c b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactTest.c
new file mode 100644
index 0000000000000000000000000000000000000000..6611e7fe826255aebf1d41f147b9d643f6b8f5d6
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/BulletImpactTest.c
@@ -0,0 +1,7 @@
+class EffBulletImpactTest : EffectParticle
+{
+	void EffBulletImpactTest()
+	{
+		SetParticleID(ParticleList.IMPACT_TEST);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/GeneratorSmoke.c b/scripts/3_Game/DayZ/Effects/EffectParticle/GeneratorSmoke.c
new file mode 100644
index 0000000000000000000000000000000000000000..4293b8474296cbbd80dcacbd7f4213f54ebcbd95
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/GeneratorSmoke.c
@@ -0,0 +1,7 @@
+class EffGeneratorSmoke : EffectParticle
+{
+	void EffGeneratorSmoke()
+	{
+		SetParticleID(ParticleList.POWER_GENERATOR_SMOKE);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/LandmineExplosion.c b/scripts/3_Game/DayZ/Effects/EffectParticle/LandmineExplosion.c
new file mode 100644
index 0000000000000000000000000000000000000000..1050069492a39f9da29d0c2168538dae526daa33
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/LandmineExplosion.c
@@ -0,0 +1,7 @@
+class LandmineExplosion : EffectParticle
+{
+	void LandmineExplosion()
+	{
+		SetParticleID(ParticleList.EXPLOSION_LANDMINE);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/MenuCarEngineSmoke.c b/scripts/3_Game/DayZ/Effects/EffectParticle/MenuCarEngineSmoke.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d12818ab3bb7fdddb7e655678f60387b7d7e1a4
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/MenuCarEngineSmoke.c
@@ -0,0 +1,7 @@
+class MenuCarEngineSmoke : EffectParticle
+{
+	void MenuCarEngineSmoke()
+	{
+		SetParticleID(ParticleList.SMOKING_CAR_ENGINE);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/MenuEvaporation.c b/scripts/3_Game/DayZ/Effects/EffectParticle/MenuEvaporation.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd394621735cfd0dae0f91ad6ba358a75f642ba4
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/MenuEvaporation.c
@@ -0,0 +1,7 @@
+class MenuEvaporation : EffectParticle
+{
+	void MenuEvaporation()
+	{
+		SetParticleID(ParticleList.EVAPORATION);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourHeavy.c b/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourHeavy.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb9718aec534061dd5adc1541c0f508b92c3be96
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourHeavy.c
@@ -0,0 +1,7 @@
+class EffBreathVapourHeavy : EffectParticle
+{
+	void EffBreathVapourHeavy()
+	{
+		SetParticleID(ParticleList.BREATH_VAPOUR_HEAVY);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourLight.c b/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b3dae1165ddf9a8139983f1f4ee7b1165bc9b45
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourLight.c
@@ -0,0 +1,7 @@
+class EffBreathVapourLight : EffectParticle
+{	
+	void EffBreathVapourLight()
+ 	{
+		SetParticleID(ParticleList.BREATH_VAPOUR_LIGHT);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourMedium.c b/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourMedium.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f582e8b77c9e0ee2ffc67f223f0fb24fd0a4b9f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/Player/EffBreathVapourMedium.c
@@ -0,0 +1,7 @@
+class EffBreathVapourMedium : EffectParticle
+{	
+	void EffBreathVapourMedium()
+	{
+		SetParticleID(ParticleList.BREATH_VAPOUR_MEDIUM);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/SwarmingFlies.c b/scripts/3_Game/DayZ/Effects/EffectParticle/SwarmingFlies.c
new file mode 100644
index 0000000000000000000000000000000000000000..e218b7a35b0413d65562fd78294f4dda26447dcf
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/SwarmingFlies.c
@@ -0,0 +1,7 @@
+class EffSwarmingFlies : EffectParticle
+{
+	void EffSwarmingFlies()
+ 	{
+		SetParticleID(ParticleList.ENV_SWARMING_FLIES);
+	}
+}
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke.c b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke.c
new file mode 100644
index 0000000000000000000000000000000000000000..25ef4c8694dab09b8a63f1e037d3be7105f20dae
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke.c
@@ -0,0 +1,33 @@
+class EffVehicleSmoke : EffectParticle
+{
+	void EffVehicleSmoke()
+	{
+		SetParticleStateLight();
+	}
+	
+	
+	void SetParticleStateLight()
+	{
+		SetParticleState( ParticleList.HATCHBACK_COOLANT_OVERHEATING );
+	}
+	
+	
+	void SetParticleStateHeavy()
+	{
+		SetParticleState( ParticleList.HATCHBACK_COOLANT_OVERHEATED );
+	}
+	
+	void SetParticleState( int state )
+	{
+		bool was_playing = IsPlaying();
+	
+		Stop();
+		
+		SetParticleID(state);
+		
+		if (was_playing)
+		{
+			Start(); // resume effect
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/CoolantSteam.c b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/CoolantSteam.c
new file mode 100644
index 0000000000000000000000000000000000000000..478672e6b02451b9a689231fe233e9ea6bc4e062
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/CoolantSteam.c
@@ -0,0 +1,51 @@
+class EffCoolantSteam : EffVehicleSmoke
+{
+	override void SetParticleStateLight()
+	{
+		SetParticleState( ParticleList.HATCHBACK_COOLANT_OVERHEATING );
+		UpdateParticle();
+	}
+	
+	override void SetParticleStateHeavy()
+	{
+		SetParticleState( ParticleList.HATCHBACK_COOLANT_OVERHEATED );
+		UpdateParticle();
+	}
+	
+	void UpdateParticle()
+	{
+		Car parent = Car.Cast( GetAttachmentParent() );
+		Particle p = GetParticle();
+		
+		if (parent && p)
+		{
+			float speed = parent.GetSpeedometerAbsolute();
+				
+			float lifetime_scale = (100 - speed) / 100;
+			if (lifetime_scale < 0.1)
+				lifetime_scale = 0.1;
+				
+			float birthrate_scale = 1 + (speed * 0.02 );
+				
+			float speed_scale = 1 + (speed * 0.2 );
+			if (speed_scale > 10)
+				speed_scale = 10;
+				
+			float size_scale = 1 + (speed * 0.05 );
+				
+			if (size_scale > 2.5)
+				size_scale = 2.5;
+				
+			float gravity_add = speed * 0.005 ;
+				
+			p.ScaleParticleParamFromOriginal( EmitorParam.LIFETIME, lifetime_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.LIFETIME_RND, lifetime_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.BIRTH_RATE, birthrate_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.BIRTH_RATE_RND, birthrate_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.VELOCITY, speed_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.VELOCITY_RND, speed_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.SIZE, size_scale );
+			p.SetParticleParam				( EmitorParam.GRAVITY_SCALE, gravity_add );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/EngineSmoke.c b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/EngineSmoke.c
new file mode 100644
index 0000000000000000000000000000000000000000..33bb5ef31ea2247a616c9e985930d951488159cf
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/EngineSmoke.c
@@ -0,0 +1,56 @@
+class EffEngineSmoke : EffVehicleSmoke
+{
+	private float m_Time;
+	static private float m_UpdateInterval = 2;
+	
+	void EffEngineSmoke()
+	{
+		SetEnableEventFrame(true);
+	}
+	
+	override void SetParticleStateLight()
+	{
+		SetParticleState( ParticleList.HATCHBACK_ENGINE_OVERHEATING );
+	}
+	
+	override void SetParticleStateHeavy()
+	{
+		SetParticleState( ParticleList.HATCHBACK_ENGINE_OVERHEATED );
+	}
+	
+	override void Event_OnFrameUpdate(float time_delta)
+	{
+		m_Time += time_delta;
+		
+		if (m_Time >= m_UpdateInterval)
+		{
+			m_Time = 0;
+			
+			Car parent = Car.Cast( GetAttachmentParent() );
+				
+			if (parent)
+			{
+				Particle p = GetParticle();
+				if (p)
+				{
+					SetParticleState( p.GetParticleID() );
+					
+					float speed = parent.GetSpeedometerAbsolute();
+					float lifetime_scale;
+						
+					if (speed < 100)
+						lifetime_scale = (100 - speed) / 100;
+					else
+						lifetime_scale = 0.1;
+						
+					float birthrate_scale = 1 + (speed * 0.02 );
+						
+					p.ScaleParticleParamFromOriginal( EmitorParam.LIFETIME, lifetime_scale );
+					p.ScaleParticleParamFromOriginal( EmitorParam.LIFETIME_RND, lifetime_scale );
+					p.ScaleParticleParamFromOriginal( EmitorParam.BIRTH_RATE, birthrate_scale );
+					p.ScaleParticleParamFromOriginal( EmitorParam.BIRTH_RATE_RND, birthrate_scale );
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/ExhaustSmoke.c b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/ExhaustSmoke.c
new file mode 100644
index 0000000000000000000000000000000000000000..81c76cac1cd914628040e92c578a38d134640fe3
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/VehicleSmoke/ExhaustSmoke.c
@@ -0,0 +1,28 @@
+class EffExhaustSmoke : EffVehicleSmoke
+{
+	override void SetParticleStateLight()
+	{
+		SetParticleState( ParticleList.HATCHBACK_EXHAUST_SMOKE );
+		
+		Car parent = Car.Cast( GetAttachmentParent() );
+		Particle p = GetParticle();
+		
+		if ( parent && p )
+		{
+			float speed = parent.GetSpeedometerAbsolute();
+			float lifetime_scale;
+				
+			if (speed < 100)
+				lifetime_scale = (100 - speed) / 100;
+			else
+				lifetime_scale = 0.1;
+				
+			float birthrate_scale = 1 + (speed * 0.1 );
+
+			p.ScaleParticleParamFromOriginal( EmitorParam.LIFETIME, lifetime_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.LIFETIME_RND, lifetime_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.BIRTH_RATE, birthrate_scale );
+			p.ScaleParticleParamFromOriginal( EmitorParam.BIRTH_RATE_RND, birthrate_scale );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/Vomit.c b/scripts/3_Game/DayZ/Effects/EffectParticle/Vomit.c
new file mode 100644
index 0000000000000000000000000000000000000000..21e214748e11a9cf158e1efd26eb462c09d48cfe
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/Vomit.c
@@ -0,0 +1,7 @@
+class EffVomit : EffectParticle
+{
+	void EffVomit()
+	{
+		SetParticleID(ParticleList.VOMIT);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectParticle/VomitBlood.c b/scripts/3_Game/DayZ/Effects/EffectParticle/VomitBlood.c
new file mode 100644
index 0000000000000000000000000000000000000000..b86565f3c22f02fb1c5e1c4994e6032a8b96fb1c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectParticle/VomitBlood.c
@@ -0,0 +1,7 @@
+class EffVomitBlood : EffectParticle
+{
+	void EffVomitBlood()
+	{
+		SetParticleID(ParticleList.VOMIT_BLOOD);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Effects/EffectSound.c b/scripts/3_Game/DayZ/Effects/EffectSound.c
new file mode 100644
index 0000000000000000000000000000000000000000..97567c3673a6944e03c19c8cc1f383ec8eb76c94
--- /dev/null
+++ b/scripts/3_Game/DayZ/Effects/EffectSound.c
@@ -0,0 +1,915 @@
+/**
+\brief Wrapper class for managing sound through SEffectManager
+*/
+class EffectSound : Effect
+{
+	/** \name Event invokers
+	*	ScriptInvonkers for certain events
+	*/
+	//@{
+	ref ScriptInvoker Event_OnSoundWaveStarted		= new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundWaveEnded		= new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundFadeInStopped	= new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundFadeOutStarted	= new ScriptInvoker();
+	//@}
+	
+	/** \name Sound objects and structures
+	*	Objects and structures for the sound
+	*/
+	//@{
+	protected ref SoundParams			m_SoundParams;
+	protected ref SoundObjectBuilder	m_SoundObjectBuilder;
+	protected ref SoundObject			m_SoundObject;
+	protected AbstractWave				m_SoundWaveObject;
+	//@}
+	
+	/** \name Generic data
+	*	Generic data for the sound
+	*/
+	//@{
+	protected WaveKind					m_SoundWaveKind;
+	protected string					m_SoundSetName;	
+	protected bool						m_SoundLoop;
+	protected bool						m_SetEnvVariables;
+	protected bool						m_SoundAutodestroy;
+	protected bool						m_SoundWaveIsPlaying;
+	protected float						m_SoundWaveLenght;
+	protected float						m_SoundWaveVolume;
+	protected float						m_SoundWaveVolumeMax;
+	protected float						m_SoundWaveTime;
+	protected int						m_SoundDoppler;
+	//@}
+	
+	/** \name Fading data
+	*	Data for fadein/fadeout for the sound
+	*/
+	//@{
+	protected bool						m_SoundWaveStarting;
+	protected bool						m_SoundWaveStopping;
+	protected bool						m_SoundFadedOut;
+	
+	protected float						m_SoundFadeInDuration;
+	
+	protected float						m_SoundFadeOutStartTime;
+	protected float						m_SoundFadeOutDuration;
+	protected float						m_SoundFadeOutInitVolume;
+	//@}
+	
+	
+	
+	/**
+	\brief ctor
+	*/
+	void EffectSound()
+	{
+		m_SoundWaveKind = WaveKind.WAVEEFFECTEX;
+		m_SoundWaveVolume = 0;
+		m_SoundWaveVolumeMax = 1;
+		m_SoundAutodestroy = false;
+		m_SoundWaveStopping = false;
+		m_SoundFadedOut = false;
+		m_SoundDoppler = -1;
+	}
+	
+	/**
+	\brief dtor
+	*/
+	void ~EffectSound()
+	{
+
+	}
+	
+	/**
+	\brief init
+	*/
+	override void InitEffect()
+	{
+		super.InitEffect();
+		
+		// These will be called by the sound events
+		Event_OnStarted.Remove(Event_OnEffectStarted);
+		Event_OnStopped.Remove(Event_OnEffectEnded);
+	}
+	
+	/**
+	\brief Override when getting debug information
+	*/
+	override string GetDebugName()
+	{
+		string identifier;
+		if (m_SoundSetName != "")
+		{
+			identifier = m_SoundSetName;
+		}
+		else
+		{
+			identifier = "NO_SOUNDSET";
+		}
+		
+		return string.Format("%1:%2", super.GetDebugName(), identifier);
+	}
+	
+	
+	
+	/** \name EffectType
+		Information about what type of effect the Effect is, without the need for casting
+	*/
+	//@{
+	
+	/**
+	\brief Get what type of effect the Effect is
+		\return \p EffectType What type of effect the Effect is
+	*/
+	override EffectType GetEffectType()
+	{
+		return EffectType.SOUND;
+	}
+	
+	/**
+	\brief Check whether the Effect is EffectSound without casting
+		\return \p bool Whether the Effect is EffectSound
+	*/
+	override bool IsSound()
+	{
+		return true;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Playback
+	*	Methods to Play/Stop sound
+	*	Generally, SEffectManager.PlaySound methods are used instead of SoundPlay
+	*/
+	//@{
+	
+	/**
+	\brief Plays sound
+		\param params \p SoundParams Sound Parameters for the sound
+		\return \p bool Whether the sound will start playing
+	*/
+	bool SoundPlayEx(out SoundParams params)
+	{
+		super.Start();
+		
+		if (m_SoundSetName != "")
+		{
+			vector position = GetCurrentLocalPosition();
+
+			if ( SoundLoadEx(params) )
+			{
+				if (m_SetEnvVariables && m_SoundParams)
+				{
+					m_SoundObjectBuilder.AddEnvSoundVariables(GetPosition());
+					m_SoundObject = m_SoundObjectBuilder.BuildSoundObject();
+					m_SoundObject.SetKind( m_SoundWaveKind );
+					m_SoundObject.SetParent( m_ParentObject );
+				}
+				
+				if ( m_SoundObject )
+				{
+					SetCurrentLocalPosition(position, false);
+					m_SoundWaveObject = GetGame().GetSoundScene().Play3D( m_SoundObject, m_SoundObjectBuilder );
+					if ( !m_SoundWaveObject )
+						return false;
+
+					// Wait for header to be loaded before asking for its length, else we block the main thread
+					if (m_SoundWaveObject.IsHeaderLoaded())
+						ValidateSoundWave();
+					else
+						m_SoundWaveObject.GetEvents().Event_OnSoundWaveHeaderLoaded.Insert(ValidateSoundWave);					
+					
+					return true;
+				}
+				else
+				{
+					SoundError("m_SoundObject is null.");
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	\brief Plays sound
+		\return \p bool Whether the sound will start playing
+	*/
+	bool SoundPlay()
+	{
+		SoundParams params;
+		return SoundPlayEx(params);
+	}
+	
+	/**
+	\brief Plays sound
+	*/
+	override void Start()
+    {		
+		SoundPlay();
+	}
+	
+	/**
+	\brief Stops sound
+		\note Will not be immediately if a SoundFadeOutDuration was set
+	*/
+	void SoundStop()
+	{
+		super.Stop();
+		
+		if ( IsSoundPlaying() )
+		{
+			if ( m_SoundFadeOutDuration > 0 && !m_SoundWaveStopping )
+			{
+				m_SoundWaveStopping = true;
+				m_SoundFadedOut = false;
+				m_SoundWaveStarting = false;
+				m_SoundFadeOutStartTime = m_SoundWaveTime;
+			}
+			else
+			{
+				m_SoundWaveObject.Stop();
+			}
+		}
+		else
+		{
+			SoundReset();
+		}	
+	}
+	
+	/**
+	\brief Stops sound
+	*/
+	override void Stop()
+    {
+		SoundStop();		
+	}
+	
+	/**
+	\brief Resets EffectSound
+	*/
+	protected void SoundReset()
+	{
+		m_IsPlaying					= false;
+		m_SoundWaveIsPlaying		= false;
+		m_SoundWaveStopping 		= false;
+		m_SoundFadedOut				= false;
+		m_SoundWaveVolume			= m_SoundWaveVolumeMax;
+		m_SoundWaveTime				= 0;
+		m_SoundFadeOutInitVolume	= 0;
+		m_SoundFadeOutStartTime		= 0;
+		
+		if ( m_SoundWaveObject )
+		{
+			m_SoundWaveObject.Stop();
+			m_SoundWaveObject.SetVolumeRelative( m_SoundWaveVolumeMax );
+		}
+	}
+	
+	/**
+	\brief Get whether EffectSound is currently playing
+		\return \p bool Whether EffectSound is currently playing
+	*/
+	bool IsSoundPlaying()
+	{
+		return m_SoundWaveIsPlaying;
+	}
+	
+	/**
+	\brief Returns true when the effect is playing, false otherwise
+	*/
+	override bool IsPlaying()
+	{
+		return IsSoundPlaying(); // Just in case, as that's what used to be the actual way to check
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Sound load
+		Methods regarding the loading of the sound, used in SoundPlay
+	*/
+	//@{
+	
+	/**
+	\brief Loads in the sound when it is requested for playing through 'SoundPlayEx'
+		\param params \p SoundParams Possibility of passing in an already existing SoundParams, else one will get created
+	*/
+	bool SoundLoadEx(out SoundParams params)
+	{		
+		if ( !m_SoundParams || !m_SoundParams.IsValid() )
+		{
+			if (!params)
+			{
+				params = new SoundParams( m_SoundSetName );
+			}
+			
+			//Print("SoundLoad is loading..");
+			m_SoundParams = params;
+			if ( !m_SoundParams.IsValid() )
+			{
+				SoundError("Invalid sound set.");
+				return false;
+			}
+			
+			m_SoundObjectBuilder = new SoundObjectBuilder( m_SoundParams );
+			if (m_SetEnvVariables)
+			{
+				m_SoundObjectBuilder.AddEnvSoundVariables(GetPosition());
+			}
+			
+			m_SoundObject = m_SoundObjectBuilder.BuildSoundObject();
+			
+			if ( m_SoundObject )
+			{
+				m_SoundObject.SetKind( m_SoundWaveKind );
+				m_SoundObject.SetParent( m_ParentObject );
+			}
+			else
+			{
+				SoundError("m_SoundObject is null.");
+			}
+		}
+		else
+		{
+			//Print("SoundLoad is loaded.");
+		}
+		
+		return true;
+	}
+
+	/**
+	\brief Loads in the sound when it is requested for playing
+		\note Legacy, backwards compatibility
+	*/
+	bool SoundLoad()
+	{
+		SoundParams params;
+		return SoundLoadEx(params);
+	}
+	
+	/**
+	\brief Helper for checking if params are valid
+	*/
+	bool IsSoundValid()
+	{
+		return m_SoundParams.IsValid();
+	}
+
+	/**
+	\brief Gets called to fill in the necessary data when the header has finished loading
+		\note Called from 'SoundPlayEx'
+	*/
+	protected void ValidateSoundWave()
+	{
+		m_SoundWaveLenght = m_SoundWaveObject.GetLength();
+					
+		if ( SoundWaveValidation() )
+		{
+			if ( m_SoundFadeInDuration > 0 )
+			{
+				m_SoundWaveObject.SetVolumeRelative( 0 );
+				m_SoundFadeOutStartTime = m_SoundWaveLenght - m_SoundFadeInDuration;
+			}
+						
+			SetSoundLoop( m_SoundLoop );
+						
+			m_SoundWaveStarting = true;
+						
+			AbstractWaveEvents events = m_SoundWaveObject.GetEvents();
+			events.Event_OnSoundWaveStarted.Insert( Event_OnSoundWaveStarted );
+			events.Event_OnSoundWaveEnded.Insert( Event_OnSoundWaveEnded );
+						
+			UpdateEvents();
+		}
+		else
+		{
+			m_SoundWaveObject.Stop();
+		}
+	}
+
+	/**
+	\brief Validation of fade settings
+		\note Called from 'ValidateSoundWave'
+	*/
+	protected bool SoundWaveValidation()
+	{
+		bool valid = true;
+		
+		if ( m_SoundFadeInDuration > GetSoundWaveLength() )
+		{
+			SoundError("FadeIn is longer than sound wave length.");
+			valid = false;
+		}
+		
+		if ( m_SoundFadeOutDuration > GetSoundWaveLength() )
+		{
+			SoundError("FadeOut is longer than sound wave length.");
+			valid = false;
+		}
+		
+		if ( m_SoundFadeOutDuration + m_SoundFadeInDuration > GetSoundWaveLength() )
+		{
+			SoundError("FadeIn & FadeOut are longer than sound wave length.");
+			valid = false;
+		}
+		
+		return valid;
+	}
+
+	/**
+	\brief Enables the frame event on the EffectSound
+		\note Called from 'ValidateSoundWave' when all is successful
+		\note So this is effectively enabling frame event on all valid EffectSound
+	*/
+	protected void UpdateEvents()
+	{
+		if ( m_SoundWaveObject )
+		{
+			SetEnableEventFrame(true);
+		}
+		else
+		{
+			SetEnableEventFrame(false);
+		}
+	}
+
+	//@}
+	
+	
+	
+	/** \name Events
+		Various events that can be overriden for custom behaviour
+	*/
+	//@{
+	
+	/**
+	\brief Event called on frame when enabled by SetEnableEventFrame(true)
+		\note Is always enabled on sound
+		\note Called from SEffectManager.Event_OnFrameUpdate in MissionGameplay.OnUpdate
+		\param time_delta \p float Time passed since the previous frame
+	*/
+	override void Event_OnFrameUpdate(float time_delta)
+	{
+		if ( IsSoundPlaying() )
+		{
+			if (m_SoundDoppler != -1)
+			{
+				m_SoundWaveObject.SetDoppler(m_SoundDoppler);
+			}	
+			// FadeIn
+			if ( m_SoundWaveStarting )
+			{
+				if ( m_SoundFadeInDuration > 0 )
+				{
+					SetSoundVolume( GetSoundVolume() + (time_delta / m_SoundFadeInDuration) );
+					
+					if ( GetSoundVolume() >= m_SoundWaveVolumeMax )
+					{
+						Event_OnSoundFadeInStopped();
+						SetSoundVolume( m_SoundWaveVolumeMax );
+						m_SoundWaveStarting = false;
+					}
+				}
+				else
+				{
+					SetSoundVolume( m_SoundWaveVolumeMax );
+					m_SoundWaveStarting = false;
+				}
+			}
+			
+			// FadeOut
+			if ( m_SoundWaveStopping )
+			{
+				if ( m_SoundFadeOutDuration > 0 )
+				{
+					if ( m_SoundFadeOutInitVolume == 0 )
+					{
+						m_SoundFadeOutInitVolume = GetSoundVolume();
+						Event_OnSoundFadeOutStarted();
+					}
+					SetSoundVolume( GetSoundVolume() - (m_SoundFadeOutInitVolume / m_SoundFadeOutDuration * time_delta) );
+				}
+				else
+				{
+					SetSoundVolume( 0 );
+				}
+				
+				if ( GetSoundVolume() <= 0 )
+				{		
+					if ( m_SoundWaveObject )
+					{
+						m_SoundWaveObject.Stop();
+						m_SoundWaveStopping = false;
+						m_SoundFadedOut = true;
+					}
+				}
+			}
+			
+			// Counting timer here because loop play
+			m_SoundWaveTime += time_delta;
+		}
+	}
+	
+	/**
+	\brief Event called from SEffectManager when the Effect is registered
+		\note Should only ever be called by SEffectManager!
+		\param id \p int ID registered in SEffectManager
+	*/
+	override void Event_OnRegistered(int id)
+	{
+		super.Event_OnRegistered(id);
+		
+		Event_OnSoundWaveEnded.Insert( SEffectManager.Event_OnSoundWaveEnded );
+	}
+	
+	/**
+	\brief Event called from SEffectManager when the Effect is unregistered
+		\note Should only ever be called by SEffectManager!
+	*/
+	override void Event_OnUnregistered()
+	{
+		super.Event_OnUnregistered();
+		
+		Event_OnSoundWaveEnded.Remove( SEffectManager.Event_OnSoundWaveEnded );
+	}
+	
+	/**
+	\brief Event called when sound starts playing
+		\note Inserted into events of m_SoundWaveObject
+	*/
+	void Event_OnSoundWaveStarted()
+	{
+		m_SoundWaveIsPlaying = true;
+		
+		Event_OnSoundWaveStarted.Invoke(this);
+		
+		Event_OnEffectStarted();
+	}
+	
+	/**
+	\brief Event called when sound stops playing
+		\note Inserted into events of m_SoundWaveObject
+	*/
+	void Event_OnSoundWaveEnded()
+	{
+		m_SoundWaveIsPlaying = false;
+		
+		Event_OnSoundWaveEnded.Invoke(this);
+		
+		Event_OnEffectEnded();
+	}
+	
+	/**
+	\brief Event called when sound fade in stops
+		\note Called from Event_OnFrameUpdate
+	*/
+	void Event_OnSoundFadeInStopped()
+	{
+		Event_OnSoundFadeInStopped.Invoke(this);
+	}
+	
+	/**
+	\brief Event called when sound fade out starts
+		\note Called from Event_OnFrameUpdate
+	*/
+	void Event_OnSoundFadeOutStarted()
+	{
+		Event_OnSoundFadeOutStarted.Invoke(this);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name AutoDestroy
+		Methods regarding automatic cleanup on stop
+	*/
+	//@{
+	
+	/**
+	\brief Sets whether Effect automatically cleans up when it stops
+		\note This means that it will be unregistered from SEffectManager as well
+		\param auto_destroy \p bool Whether Effect automatically cleans up when it stops
+	*/
+	override void SetAutodestroy(bool auto_destroy)
+	{
+		super.SetAutodestroy(auto_destroy);
+		m_SoundAutodestroy = auto_destroy;		
+	}
+	
+	/**
+	\brief Get whether Effect automatically cleans up when it stops
+		\return \p bool Whether Effect automatically cleans up when it stops
+	*/
+	override bool IsAutodestroy()
+	{
+		return IsSoundAutodestroy();
+	}
+	
+	/**
+	\brief Sets whether EffectSound automatically cleans up when sound stops
+		\param auto_destroy \p bool Whether EffectSound automatically cleans up when sound stops
+	*/
+	void SetSoundAutodestroy(bool auto_destroy)
+	{
+		SetAutodestroy(auto_destroy);
+	}
+	
+	/**
+	\brief Get whether EffectSound automatically cleans up when sound stops
+		\return \p bool Whether EffectSound automatically cleans up when sound stops
+	*/
+	bool IsSoundAutodestroy()
+	{
+		return m_SoundAutodestroy;
+	}
+	
+	override bool CanDestroy()
+	{
+		return m_SoundFadeOutDuration <= 0 || m_SoundFadedOut;
+	}
+	
+	//@}
+
+	
+	
+	/** \name Generic API
+		Setters and getters for generic data and properties
+	*/
+	//@{
+	
+	/**
+	\brief Set parent for the sound to follow
+		\param parent_obj \p Object The parent for the sound to follow
+	*/
+	override void SetParent(Object parent_obj)
+	{
+		super.SetParent(parent_obj); // ...
+
+		if (m_SoundObject)
+		{
+			m_SoundObject.SetParent(parent_obj);
+		}
+	}
+	
+	/**
+	\brief Get parent for the EffectSound
+		\return \p Object The parent for the EffectSound
+	*/
+	override Object GetParent()
+	{
+		if (m_SoundObject)
+			return Object.Cast(m_SoundObject.GetParent());
+		else
+			return super.GetParent();
+	}
+	
+	/**
+	\brief Get parent for the EffectSound
+		\note There is no real parenting with sound, so the setters and getters for parents do the exact same
+		\return \p Object The parent for the EffectSound
+	*/
+	override Object GetCurrentParent()
+	{
+		if (m_SoundObject)
+			return Object.Cast(m_SoundObject.GetParent());
+		else
+			return super.GetParent(); // Yes, intentionally this one
+	}
+	
+	/**
+	\brief Set the world position of the managed sound
+		\param pos \p vector The world position of the managed sound
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	override void SetCurrentPosition( vector pos, bool updateCached = true )
+	{
+		super.SetCurrentPosition(pos, updateCached);
+		
+		if (m_SoundObject)
+		{
+			Object parent = GetParent();
+			
+			if (parent)
+				pos = parent.WorldToModel(pos);
+
+			m_SoundObject.SetPosition(pos);
+		}
+	}
+	
+	/**
+	\brief Get the current world position of the managed sound
+		\return \p vector The current world position of the managed sound
+	*/
+	override vector GetCurrentPosition()
+	{
+		if (m_SoundObject)
+			return m_SoundObject.GetPosition();
+		
+		if (m_ParentObject)
+			return m_ParentObject.ModelToWorld(GetPosition());
+
+		return GetPosition();
+	}
+	
+	/**
+	\brief Set the current local position of the managed sound
+		\param pos \p vector The current local position for the managed sound
+		\param updateCached \p bool Whether to update the cached variable
+	*/
+	override void SetCurrentLocalPosition( vector pos, bool updateCached = true )
+    {
+		super.SetCurrentLocalPosition(pos, updateCached);
+				
+		if (m_SoundObject)
+		{
+			m_SoundObject.SetPosition(pos);
+		}
+    }
+
+	/**
+	\brief Get the current local position of the managed sound
+		\return \p vector The current local position of the managed sound
+	*/
+	override vector GetCurrentLocalPosition()
+	{
+		Object parent = GetParent();
+		
+		if (m_SoundObject)
+		{
+			//TODO(kumarjac): Create and expose 'SoundObject.GetLocalPosition'
+			if (parent)
+				return parent.WorldToModel(m_SoundObject.GetPosition());
+			else
+				return m_SoundObject.GetPosition();
+		}
+		else
+		{
+			if (parent)
+				return GetLocalPosition();
+			else
+				return GetPosition();
+		}
+		
+		return vector.Zero;
+	}
+	
+	/**
+	\brief Set WaveKind for the sound
+		\note Needs to be set before playing
+		\param wave_kind \p WaveKind The WaveKind for the sound
+	*/
+	void SetSoundWaveKind(WaveKind wave_kind)
+	{
+		m_SoundWaveKind = wave_kind;
+	}
+	
+	/**
+	\brief Set soundset for the sound
+		\note Needs to be set before playing
+		\param snd \p string Name of the soundset to play
+	*/
+	void SetSoundSet(string snd)
+	{
+		m_SoundSetName = snd;
+	}
+	
+	/**
+	\brief Get soundset for the sound
+		\return \p string Name of the soundset
+	*/
+	string GetSoundSet()
+	{
+		return m_SoundSetName;
+	}
+	
+	/**
+	\brief Set if the sound loops
+		\param loop \p bool Whether the sound should loop
+	*/
+	void SetSoundLoop(bool loop)
+	{
+		m_SoundLoop = loop;
+		
+		if ( m_SoundWaveObject )
+			m_SoundWaveObject.Loop( loop );
+	}
+	
+	/**
+	\brief Sets whether AddEnvSoundVariables needs to be called during Loading
+		\param setEnvVariables \p bool Whether AddEnvSoundVariables is called
+	*/
+	void SetEnviromentVariables(bool setEnvVariables)
+	{
+		m_SetEnvVariables = setEnvVariables;
+	}	
+
+	/**
+	\brief Get the sound wave length
+		\note Legacy, exists for backwards compatibility
+		\return \p float The sound wave length
+	*/
+	float GetSoundWaveLenght()
+	{
+		return GetSoundWaveLength();
+	}
+	
+	/**
+	\brief Get the sound wave length
+		\return \p float The sound wave length
+	*/
+	float GetSoundWaveLength()
+	{
+		return m_SoundWaveLenght;
+	}
+	
+	/**
+	\brief Set the RELATIVE volume for the sound
+		\param volume \p float The relative volume for the sound
+	*/
+	void SetSoundVolume(float volume)
+	{
+		m_SoundWaveVolume = volume;
+		if ( m_SoundWaveObject )
+			m_SoundWaveObject.SetVolumeRelative( volume );
+	}
+	
+	/**
+	\brief Get the RELATIVE volume set by 'SetSoundVolume'
+		\return \p float The relative volume for the sound set by 'SetSoundVolume'
+	*/
+	float GetSoundVolume()
+	{
+		return m_SoundWaveVolume;
+	}
+	
+	/**
+	\brief Set the sound max volume
+		\warning Seems to purely be used for fade in effect, rather than really setting the max volume...
+		\warning Adjusts the current volume to this value as well
+		\param volume \p float The maximum volume for the sound
+	*/
+	void SetSoundMaxVolume(float volume)
+	{
+		m_SoundWaveVolumeMax = volume;
+		if ( m_SoundWaveObject )
+			m_SoundWaveObject.SetVolumeRelative( m_SoundWaveVolume );
+	}
+
+	/**
+	\brief Get the time since EffectSound started playing
+		\warning May not reflect the actual time of the sound, as it can start at negative time to simulate speed of sound
+		\return \p float The time since EffectSound started playing
+	*/
+	float GetSoundWaveTime()
+	{
+		return m_SoundWaveTime;
+	}
+	
+	/**
+	\brief Set the sound fade in duration
+		\param fade_in \p float The fade in duration
+	*/
+	void SetSoundFadeIn(float fade_in)
+	{
+		m_SoundFadeInDuration = fade_in;
+	}
+	
+	/**
+	\brief Set the sound fade out duration
+		\param fade_out \p float The fade out duration
+	*/
+	void SetSoundFadeOut(float fade_out)
+	{
+		m_SoundFadeOutDuration = fade_out;
+	}
+
+	/**
+	\brief Set if the sound has the doppler effect enabled
+		\param setDoppler \p float If the doppler effect is enabled
+	*/
+	void SetDoppler(bool setDoppler)
+	{
+		//! bool is a fancy int, ensure the bool is 0 or 1 and don't allow -1 here since resetting isn't supported
+		m_SoundDoppler = 0;
+		if (setDoppler)
+		{
+			m_SoundDoppler = 1;
+		}
+	}
+	
+	//@}
+	
+	
+	
+	/**
+	\brief Helper for throwing sound errors
+	*/
+	protected void SoundError(string err_msg)
+	{
+		ErrorEx(string.Format("%1: SoundSetName: '%2' :: %3", this, m_SoundSetName, err_msg));
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/Building.c b/scripts/3_Game/DayZ/Entities/Building.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b71fbb4a03e3d73d2df4ef65848cc36ddea5f2b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/Building.c
@@ -0,0 +1,238 @@
+typedef Param1<int> DoorStartParams;
+typedef Param2<int, bool> DoorFinishParams;
+typedef Param1<int> DoorLockParams;
+
+class Building extends EntityAI
+{
+	proto native int GetLaddersCount();
+	proto native vector GetLadderPosTop(int ladderIndex);
+	proto native vector GetLadderPosBottom(int ladderIndex);
+
+	//! Gets the index of the door based on the view geometry component index
+	proto native int GetDoorIndex(int componentIndex);
+
+	//! Returns the number of the doors in the building
+	proto native int GetDoorCount();
+
+	//! When the door is requested to be fully open (animation wanted phase is greater than 0.5)
+	proto native bool IsDoorOpen(int index);
+	
+	//! When the wanted phase is at the open phase target (1.0)
+	proto native bool IsDoorOpening(int index);
+	
+	//! When the wanted phase is at the ajar phase target (0.2)
+	proto native bool IsDoorOpeningAjar(int index);
+	
+	//! When the wanted phase is at the close phase target (0.0)
+	proto native bool IsDoorClosing(int index);
+	
+	//! When the phase is at the open phase target (1.0)
+	proto native bool IsDoorOpened(int index);
+	
+	//! When the phase is at the ajar phase target (0.2)
+	proto native bool IsDoorOpenedAjar(int index);
+	
+	//! When the phase is at the close phase target (0.0)
+	proto native bool IsDoorClosed(int index);
+
+	//! When the door is locked
+	proto native bool IsDoorLocked(int index);
+
+	//! Plays the appropriate sound at the door, based on animation phase and state
+	proto native void PlayDoorSound(int index);
+
+	//! Attempts to open the door
+	proto native void OpenDoor(int index);
+
+	//! Attempts to close the door
+	proto native void CloseDoor(int index);
+
+	//! Locks the door if not already locked, resets the door health. 'force = true' will close the door if open
+	proto native void LockDoor(int index, bool force = false);
+
+	//! Unlocks the door if locked
+	proto native void UnlockDoor(int index);
+
+	//! Position in world space for where the door sounds are played from
+	proto native vector GetDoorSoundPos(int index);
+
+	//! Audible distance for the door sound
+	proto native float GetDoorSoundDistance(int index);
+
+	//! Requires special build as logging is disabled even on internal builds due to memory usage. Used for checking of possible causes of navmesh desync
+	proto native void OutputDoorLog();
+
+	//! Gets the nearest door based on the sound position (quick and dirty function for debugging)
+	int GetNearestDoorBySoundPos(vector position)
+	{
+		float smallestDist = float.MAX;
+		int nearestDoor = -1;
+
+		int count = GetDoorCount();
+		for (int i = 0; i < count; i++)
+		{
+			float dist = vector.DistanceSq(GetDoorSoundPos(i), position);
+			if (dist < smallestDist)
+			{
+				nearestDoor = i;
+				smallestDist = dist;
+			}
+		}
+
+		return nearestDoor;
+	}
+
+	//! Event for when the door starts opening
+	void OnDoorOpenStart(DoorStartParams params)
+	{
+	}
+
+	//! Event for when the door finishes opening
+	void OnDoorOpenFinish(DoorFinishParams params)
+	{
+	}
+
+	//! Event for when the door starts opening ajarred (usually after unlock)
+	void OnDoorOpenAjarStart(DoorStartParams params)
+	{
+	}
+
+	//! Event for when the door finishes opening ajarred (usually after unlock)
+	void OnDoorOpenAjarFinish(DoorFinishParams params)
+	{
+	}
+
+	//! Event for when the door starts closing
+	void OnDoorCloseStart(DoorStartParams params)
+	{
+	}
+
+	//! Event for when the door finishes closing
+	void OnDoorCloseFinish(DoorFinishParams params)
+	{
+	}
+
+	//! Event for when the door is locked
+	void OnDoorLocked(DoorLockParams params)
+	{
+	}
+
+	//! Event for when the door is unlocked
+	void OnDoorUnlocked(DoorLockParams params)
+	{
+	}
+	
+	bool CanDoorBeOpened(int doorIndex, bool checkIfLocked = false)
+	{
+		if (IsDoorOpen(doorIndex))
+			return false;
+
+		if (checkIfLocked)
+		{
+			if (IsDoorLocked(doorIndex))
+				return false;
+		}
+		else
+		{
+			if (!IsDoorLocked(doorIndex))
+				return false;
+		}
+		return true;
+	}
+	
+	bool CanDoorBeClosed(int doorIndex)
+	{
+		return IsDoorOpen(doorIndex);
+	}
+	
+	//! Check if the door is closed and if the door is unlocked
+	bool CanDoorBeLocked(int doorIndex)
+	{
+		return (!IsDoorOpen(doorIndex) && !IsDoorLocked(doorIndex));
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BUILDING_OUTPUT_LOG, "Output Door Log", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, " --- ", FadeColors.LIGHT_GREY));
+
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BUILDING_PLAY_DOOR_SOUND, "Play Door Sound", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BUILDING_OPEN_DOOR, "Open Door", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BUILDING_CLOSE_DOOR, "Close Door", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BUILDING_LOCK_DOOR, "Lock Door", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BUILDING_UNLOCK_DOOR, "Unlock Door", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, " --- ", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+
+		switch (action_id)
+		{
+		case EActions.BUILDING_PLAY_DOOR_SOUND:
+			PlayDoorSound(GetNearestDoorBySoundPos(player.GetPosition()));
+			return true;
+		}
+
+		if (!GetGame().IsServer())
+			return false;
+
+		switch (action_id)
+		{
+		case EActions.BUILDING_OUTPUT_LOG:
+			OutputDoorLog();
+			return true;
+		case EActions.BUILDING_OPEN_DOOR:
+			OpenDoor(GetNearestDoorBySoundPos(player.GetPosition()));
+			return true;
+		case EActions.BUILDING_CLOSE_DOOR:
+			CloseDoor(GetNearestDoorBySoundPos(player.GetPosition()));
+			return true;
+		case EActions.BUILDING_LOCK_DOOR:
+			LockDoor(GetNearestDoorBySoundPos(player.GetPosition()));
+			return true;
+		case EActions.BUILDING_UNLOCK_DOOR:
+			UnlockDoor(GetNearestDoorBySoundPos(player.GetPosition()));
+			return true;
+		}
+
+		return false;
+	}
+	
+	override bool IsBuilding()
+	{
+		return true;
+	}
+	
+	override bool CanObstruct()
+	{
+		return true;
+	}
+	
+	override bool IsHealthVisible()
+	{
+		return false;
+	}
+
+	ref TIntArray m_InteractActions;
+	
+	void Building()
+	{
+		m_InteractActions = new TIntArray;
+		g_Game.ConfigGetIntArray("cfgVehicles " +GetType() + " InteractActions", m_InteractActions);
+	}
+
+	override bool IsInventoryVisible()
+	{
+		return false;
+	}
+
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+};
diff --git a/scripts/3_Game/DayZ/Entities/BulletTypes.c b/scripts/3_Game/DayZ/Entities/BulletTypes.c
new file mode 100644
index 0000000000000000000000000000000000000000..90dff57e2645f95b0db91391a6f80a4bdf6d2d58
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/BulletTypes.c
@@ -0,0 +1,4 @@
+
+//! base "helper" class for nonlethal ammo handling
+class Nonlethal_Base {};
+class Bullet_12GaugeRubberSlug: Nonlethal_Base {};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/Camera.c b/scripts/3_Game/DayZ/Entities/Camera.c
new file mode 100644
index 0000000000000000000000000000000000000000..bae228cf78a1f71f18ed1b8b90731dca563d3546
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/Camera.c
@@ -0,0 +1,94 @@
+class Camera extends Entity
+{
+	/**
+	\brief Returns active Camera instance (note: player's camera is not Camera instance - thus it return null)
+	\return Camera \p active Camera instance
+	*/
+	static proto native Camera GetCurrentCamera();
+
+	/**
+	\brief Returns FOV of current camera object
+	\return float \p FOV of current camera object
+	*/
+	static proto native float GetCurrentFOV();
+
+	/**
+	\brief Interpolation between camera instances (current camera becomes targetCamera at the end of interpolation)
+	\param targetCamera \p to which camera we want to interpolate
+	\param time \p true interpolation time
+	\param type \p 
+		0 = without dynamics
+		1 = first half - acceleration, second half deceleration
+		2 = first third - acceleration, second third - linear movement, last third - deceleration
+	*/
+	static proto native void InterpolateTo(Camera targetCamera, float time, int type);
+
+	/*!
+	set near plane of camera
+	\param nearPlane clamped internally to 0.01m
+	*/
+	proto native void SetNearPlane(float nearPlane);
+
+	/*!
+	get near plane of camera
+	*/
+	proto native float GetNearPlane();
+
+	/**
+	\brief Sets this camera as active
+	*/
+	proto native void SetActive(bool active);
+
+	/**
+	\brief Is this camera active?
+	\return bool \p true if this camera is active
+	*/
+	proto native bool IsActive();
+	
+	/**
+	\brief Field of View settings
+	\param fov \p FOV angle in radians
+	*/
+	proto native void SetFOV(float fov);
+
+	/**
+	\brief Depth of Field settings
+	\param distance \p DOF distance parameter
+	\param blur \p DOF blur parameter
+	*/
+	proto native void SetFocus(float distance, float blur);
+
+	/**
+	\brief Orientation change by lookAt point
+	\param targetPos \p where to look at
+	*/
+	proto native void LookAt(vector targetPos);
+};
+
+//-----------------------------------------------------------------------------
+class FreeDebugCamera extends Camera
+{
+	/**
+	\brief Returns reference to FreeDebugCamera (it's singleton, thus only one instance is present)
+	\return FreeDebugCamera \p reference to FreeDebugCamera instance
+	*/
+	static proto native FreeDebugCamera GetInstance();
+	
+	/**
+	\brief Sets cameras freeze state
+	\param freezed \p true = don't allow camera movement
+	*/
+	proto native void SetFreezed(bool freezed);
+
+	/**
+	\brief Returns if camera is freezed (you can't move it)
+	\return bool \p true if camera is freezed
+	*/
+	proto native bool IsFreezed();
+	
+	/**
+	\brief Gets object that free camera is currently pointing at
+	\return Object \p reference to Object that FreeDebugCamera is pointing to 
+	*/
+	proto native Object GetCrosshairObject();
+};
diff --git a/scripts/3_Game/DayZ/Entities/DayZAIHitComponents.c b/scripts/3_Game/DayZ/Entities/DayZAIHitComponents.c
new file mode 100644
index 0000000000000000000000000000000000000000..979325e199c45908c933c551d1751dbef479aa63
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZAIHitComponents.c
@@ -0,0 +1,80 @@
+//! holds hit components and its weights for attack from AI (used on each type - DayZPlayerType, DayZAnimalType, etc.)
+class DayZAIHitComponent
+{
+	string m_Name; 			//! "Head", "Torso", etc.
+	int m_Weight;			//! [0..1]
+};
+
+class DayZAIHitComponentHelpers
+{
+	/**
+	 * @fn		RegisterHitComponent
+	 * @brief	Register Hit Component for AI targeting
+	 *
+	 * Register Hit Component for AI targeting to array defined on entity's Type (DayZPlayerType, DayZInfectedType, etc.)
+	 * Uses component name from damage system (zone) and its weight.
+	 *
+	 * @param[in]	pHitComponents	\p		array that keeps registered compoenents
+	 * @param[in]	pName			\p		component name (zone in Damage System)
+	 * @param[in]	pWeight			\p		weight of the component (probability)
+	 **/
+	static void RegisterHitComponent(array<ref DayZAIHitComponent> pHitComponents, string pName, float pWeight)
+	{
+		DayZAIHitComponent newComponent = new DayZAIHitComponent();
+		
+		newComponent.m_Name = pName;
+		newComponent.m_Weight = pWeight;
+
+		pHitComponents.Insert(newComponent);
+	}
+
+	/**
+	 * @fn		ComputeHitComponentProbability
+	 * @brief	Computes hit component probability based on weights
+	 *
+	 * @param[in]	pHitComponents	\p		array that keeps registered compoenents
+	 * @param[out]	pHitComponent	\p		selected component name (can be passed to Damage System)
+	 *
+	 * @return	true if found, false otherwise
+	 **/
+	static bool SelectMostProbableHitComponent(array<ref DayZAIHitComponent> pHitComponents, out string pHitComponent)
+	{
+		int weights = SumOfWeights(pHitComponents);
+		float rnd = Math.RandomInt(0, weights);
+
+		for ( int i = 0; i < pHitComponents.Count(); ++i )
+		{
+			DayZAIHitComponent hitComp = pHitComponents.Get(i);
+			rnd -= hitComp.m_Weight;
+			
+			if (rnd <= 0)
+			{
+				pHitComponent = hitComp.m_Name;
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	/**
+	 * @fn		SumOfWeights
+	 * @brief	Calculates the sum of all entries in DayZAIHitComponent array
+	 *
+	 * @param[in]	pHitComponents	\p		array that keeps registered compoenents
+	 *
+	 * @return	Sum of weights of all entries in array
+	 **/
+	static int SumOfWeights(array<ref DayZAIHitComponent> pHitComponents)
+	{
+		int sum = 0;
+
+		for( int i = 0; i < pHitComponents.Count(); ++i )
+		{
+			DayZAIHitComponent hitComp = pHitComponents.Get(i);
+			sum += hitComp.m_Weight;
+		}
+		
+		return sum;
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/DayZAnimal.c b/scripts/3_Game/DayZ/Entities/DayZAnimal.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3598e9bf2dbecd2818bc3d1eb7c8053ae8d6318
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZAnimal.c
@@ -0,0 +1,962 @@
+class DayZCreatureAnimInterface
+{
+	private void DayZCreatureAnimInterface() {}
+	private void ~DayZCreatureAnimInterface() {}
+	
+	//-----------------------------------------------------
+	// Binds, returns -1 when error, otherwise if ok
+
+	//! returns command index - 	
+	proto native TAnimGraphCommand		BindCommand(string pCommandName);
+
+	//!
+	proto native TAnimGraphVariable 	BindVariableFloat(string pVariable);
+	proto native TAnimGraphVariable 	BindVariableInt(string pVariable);
+	proto native TAnimGraphVariable 	BindVariableBool(string pVariable);
+
+	//!
+	proto native TAnimGraphTag 			BindTag(string pTagName);
+
+	//!
+	proto native TAnimGraphEvent		BindEvent(string pEventName);
+}
+
+class DayZCreature extends EntityAI 
+{
+	#ifdef _DAYZ_CREATURE_DEBUG_SHADOW
+	proto native void DebugSetShadow(DayZCreature creature);
+	#endif
+	
+	proto native bool RegisterAnimationEvent(string event_name, string function_name);
+	
+	proto native void SetAnimationInstanceByName(string animation_instance_name, int instance_uuid, float duration);
+	proto native int GetCurrentAnimationInstanceUUID();
+	
+	proto native DayZCreatureAnimInterface GetAnimInterface();
+
+	
+	proto native void UpdateSimulationPrecision(int simLOD);
+
+	//---------------------------------------------------------
+	// helper functions for disabling simulation upon death
+	proto native void StartDeath();
+	proto native void ResetDeath();
+
+	proto native void ResetDeathCooldown();
+	proto native bool IsDeathProcessed();
+	proto native bool IsDeathConditionMet();
+	
+	//---------------------------------------------------------
+	// bone transforms 
+
+	//! returns bone index for a name (-1 if pBoneName doesn't exist)
+	proto native 	int 		GetBoneIndexByName(string pBoneName);
+	
+	override bool IsDayZCreature()
+	{
+		return true;
+	}
+	
+	override bool CanBeSkinned()
+	{
+		return true;
+	}
+	
+	override bool IsIgnoredByConstruction()
+	{
+		return IsRuined();
+	}
+	
+	override bool IsManagingArrows()
+	{
+		return true;
+	}	
+	
+	override void AddArrow(Object arrow, int componentIndex, vector closeBonePosWS, vector closeBoneRotWS)
+	{
+		CachedObjectsArrays.ARRAY_STRING.Clear();
+		GetActionComponentNameList(componentIndex, CachedObjectsArrays.ARRAY_STRING, "fire");
+		
+		int pivot = -1;
+		
+		
+		for (int i = 0; i < CachedObjectsArrays.ARRAY_STRING.Count() && pivot == -1; i++)
+		{
+			pivot = GetBoneIndexByName(CachedObjectsArrays.ARRAY_STRING.Get(i));
+		}
+		
+		vector parentTransMat[4];
+		vector arrowTransMat[4];
+		
+		if (pivot == -1)
+		{
+			GetTransform(parentTransMat);
+		}
+		else
+		{
+			vector rotMatrix[3];
+			Math3D.YawPitchRollMatrix(closeBoneRotWS * Math.RAD2DEG,rotMatrix);
+			
+			parentTransMat[0] = rotMatrix[0];
+			parentTransMat[1] = rotMatrix[1];
+			parentTransMat[2] = rotMatrix[2];
+			parentTransMat[3] = closeBonePosWS;
+		}
+		
+		arrow.GetTransform(arrowTransMat);
+		Math3D.MatrixInvMultiply4(parentTransMat, arrowTransMat, arrowTransMat);
+		// orthogonalize matrix - parent might be skewed
+		Math3D.MatrixOrthogonalize4(arrowTransMat);
+		arrow.SetTransform(arrowTransMat);
+		
+		AddChild(arrow, pivot);
+	}
+	
+	override bool HasFixedActionTargetCursorPosition()
+	{
+		return true;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! ModOverrides
+	//! 
+	// these functions are for modded overide in script command mods 
+
+	bool	ModCommandHandlerBefore(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		return false;
+	}
+
+	bool	ModCommandHandlerInside(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		return false;
+	}
+	
+	bool	ModCommandHandlerAfter(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		return false;
+	}
+}
+
+class DayZCreatureAI extends DayZCreature 
+{
+	proto native AIAgent GetAIAgent();
+
+	proto native bool IsSoundInsideBuilding();
+#ifdef DIAG_DEVELOPER
+	proto native void DebugDisableAIControl();
+	proto native void DebugRestoreAIControl();
+#endif
+	proto native void AddDamageSphere(string bone_name, string ammo_name, float radius, float duration, bool invertTeams);
+	
+	proto native DayZCreatureAIType GetCreatureAIType();
+	/*!
+	AIAgent initialization.
+	Manual ai initialization for creatures created with CreateObject(... init_ai = false...).
+	*/
+	proto native void InitAIAgent(AIGroup group);
+	proto native void DestroyAIAgent();
+	
+	int m_EffectTriggerCount;//how many effect triggers is this AI inside of(overlapping triggers)
+	
+	protected DayZPlayer m_CinematicPlayer;
+	
+
+	void DayZCreatureAI()
+	{
+		RegisterAnimEvents();
+		SetFlags(EntityFlags.TOUCHTRIGGERS, false);
+	}
+	
+	
+	void IncreaseEffectTriggerCount()
+	{
+		m_EffectTriggerCount++;
+	}
+	
+	void DecreaseEffectTriggerCount()
+	{
+		m_EffectTriggerCount--;
+	}
+	
+	void AddDamageSphere(AnimDamageParams damage_params)
+	{ 
+		AddDamageSphere(damage_params.m_sBoneName, damage_params.m_sAmmoName, damage_params.m_fRadius, damage_params.m_fDuration, damage_params.m_bInvertTeams); 
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		CreateComponent(COMP_TYPE_BODY_STAGING); // TO DO: This is never called on clients in multiplayer! That's why skinning doesn't work properly in MP. DAYZ-28269
+	}
+	
+	AnimBootsType GetBootsType()
+	{
+		return AnimBootsType.None;
+	}
+	
+	AbstractWave PlaySound(SoundObject so, SoundObjectBuilder sob)
+	{
+		if(so == NULL)
+		{
+			return NULL;
+		}
+		
+		so.SetPosition(GetPosition());
+		AbstractWave wave = GetGame().GetSoundScene().Play3D(so, sob);
+		return wave;
+	}
+	
+	void OnSoundEvent(int event_id, string event_user_string) 
+	{
+		AnimSoundEvent sound_event = GetCreatureAIType().GetSoundEvent(event_id);
+		if(sound_event != NULL)
+		{
+			ProcessSoundEvent(sound_event);
+		}
+	}
+
+	void OnSoundVoiceEvent(int event_id, string event_user_string)
+	{
+		AnimSoundVoiceEvent voice_event = GetCreatureAIType().GetSoundVoiceEvent(event_id);
+		if(voice_event != NULL)
+		{
+			ProcessSoundVoiceEvent(voice_event);
+		}
+	}
+	
+	void OnStepEvent(int event_id, string event_user_string) 
+	{
+		AnimStepEvent step_event = GetCreatureAIType().GetStepEvent(event_id);
+		if(step_event != NULL)
+		{
+			ProcessStepEvent(step_event);
+		}
+	}
+	
+	void OnDamageEvent(int event_id, string event_user_string)
+	{
+		AnimDamageEvent damage_event = GetCreatureAIType().GetDamageEvent(event_id);
+		if(damage_event != NULL)
+		{
+			ProcessDamageEvent(damage_event);
+		}
+	}
+	
+	protected void RegisterAnimEvents()
+	{
+		if(!RegisterAnimationEvent("Sound", "OnSoundEvent"))
+		{
+			Print("Error registering anim. event (Sound)");
+		}
+
+		if(!RegisterAnimationEvent("SoundVoice", "OnSoundVoiceEvent"))
+		{
+			Print("Error registering anim. event (SoundVoice)");
+		}
+
+		if(!GetGame().IsDedicatedServer())
+		{
+			if(!RegisterAnimationEvent("Step", "OnStepEvent"))
+			{
+				Print("Error registering anim. event (Step)");
+			}
+		}
+		
+		if(!RegisterAnimationEvent("Damage", "OnDamageEvent"))
+		{
+			Print("Error registering anim. event (Damage)");
+		}
+	}
+	
+	private void ProcessSoundEvent(AnimSoundEvent sound_event)
+	{
+		if(!GetGame().IsDedicatedServer())
+		{
+			SoundObjectBuilder objectBuilder = sound_event.GetSoundBuilder();
+			if(NULL != objectBuilder)
+			{
+				objectBuilder.AddEnvSoundVariables(GetPosition());
+				SoundObject soundObject = objectBuilder.BuildSoundObject();
+				PlaySound(soundObject, objectBuilder);
+			}
+		}
+		
+		if(GetGame().IsServer())
+		{
+			if(sound_event.m_NoiseParams != NULL)
+				GetGame().GetNoiseSystem().AddNoise(this, sound_event.m_NoiseParams);
+		}
+	}
+
+	private void ProcessSoundVoiceEvent(AnimSoundVoiceEvent sound_event)
+	{
+		if(!GetGame().IsDedicatedServer())
+		{
+			SoundObjectBuilder objectBuilder = sound_event.GetSoundBuilder();
+			if(NULL != objectBuilder)
+			{
+				objectBuilder.AddEnvSoundVariables(GetPosition());
+				SoundObject soundObject = objectBuilder.BuildSoundObject();
+				AttenuateSoundIfNecessary(soundObject);
+				PlaySound(soundObject, objectBuilder);
+			}
+		}
+		
+		if(GetGame().IsServer())
+		{
+			if(sound_event.m_NoiseParams != NULL)
+				GetGame().GetNoiseSystem().AddNoise(this, sound_event.m_NoiseParams);
+		}
+	}
+
+	private void ProcessStepEvent(AnimStepEvent step_event)
+	{
+		SoundObjectBuilder soundBuilder = step_event.GetSoundBuilder(GetSurfaceType().Hash());
+		if(soundBuilder == NULL)
+			return;
+		
+		soundBuilder.AddEnvSoundVariables(GetPosition());
+		SoundObject soundObject = soundBuilder.BuildSoundObject();
+		AttenuateSoundIfNecessary(soundObject);
+		PlaySound(soundObject, soundBuilder);
+		
+		//TODO effects
+	}
+	
+	private void ProcessDamageEvent(AnimDamageEvent damage_event)
+	{
+		AddDamageSphere(damage_event.m_DamageParams);
+	}
+	
+	protected void AttenuateSoundIfNecessary(SoundObject soundObject)
+	{
+		if (GetGame().GetPlayer() != NULL && (IsSoundInsideBuilding() != GetGame().GetPlayer().IsSoundInsideBuilding() || GetGame().GetPlayer().IsCameraInsideVehicle()))
+		{
+			soundObject.SetKind(WaveKind.WAVEATTALWAYS);
+		}
+		else
+		{
+			soundObject.SetKind(WaveKind.WAVEEFFECTEX);
+		}
+	}
+	
+	bool ResistContaminatedEffect()
+	{
+		return false;
+	}
+	
+	// ================
+	// EASTER EGG
+	// ================
+	
+	//Used for easter egg sound selection
+	bool IsDanger()
+	{
+		return false;
+	}
+	
+	string CaptureSound()
+	{
+		return "";
+	}
+	
+	string ReleaseSound()
+	{
+		return "";
+	}
+	
+	// ================
+	// CINEMATIC CONTROLLER
+	// ================
+	
+	void CinematicTakeControl(DayZPlayer player)
+	{
+		m_CinematicPlayer = player;
+	}
+
+	bool CinematicCanJump()
+	{
+		return true;
+	}
+	
+	override bool ModCommandHandlerBefore(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		if (!m_CinematicPlayer)
+		{
+			return super.ModCommandHandlerBefore(pDt, pCurrentCommandID, pCurrentCommandFinished);
+		}
+		
+		UAInterface input = m_CinematicPlayer.GetInputInterface();
+			
+		DayZCreatureAIInputController controller;
+		GetGame().GameScript.CallFunction(this, "GetInputController", controller, 0);
+			
+		if (!input || !controller)
+		{
+			return super.ModCommandHandlerBefore(pDt, pCurrentCommandID, pCurrentCommandFinished);
+		}
+		
+		float movementX = input.SyncedValue_ID(UAAimRight) - input.SyncedValue_ID(UAAimLeft);
+		
+		float maxTurnSpeed = 100.0;
+		movementX = Math.Clamp(movementX * maxTurnSpeed * pDt, -180, 180);
+		
+		if (input.SyncedValue_ID(UALookAround) > 0)
+		{
+			movementX = 0;
+		}
+		
+		bool isJump = input.SyncedValue_ID(UAGetOver) > 0;
+		bool isMove = input.SyncedValue_ID(UAMoveForward) > 0;
+		
+		bool isRest = input.SyncedValue_ID(UAMoveBack) > 0;
+		bool isSleep = input.SyncedValue_ID(UAReloadMagazine) > 0;
+
+		float heading = GetOrientation()[0] + movementX;
+		
+		int iAlert = 0;
+		float fAlert = 0;
+		int iSpeed = 0;
+		float fSpeed = 0;
+		
+		if (isMove)
+		{
+			iAlert = 1;
+			fAlert = 0.2;
+			
+			bool isSprint = input.SyncedValue_ID(UATurbo) > 0;
+			bool isJog = input.SyncedValue_ID(UAWalkRunTemp) > 0;
+			bool isWalk = !isSprint && !isJog;
+			if (isSprint)
+			{
+				//! sprint
+				iSpeed = 3;
+			}
+			else if (isJog)
+			{
+				//! jog
+				iSpeed = 2;
+			}
+			else if (isWalk)
+			{
+				//! walk
+				iSpeed = 1;
+			}
+		}
+		
+		DayZAnimalInputController animalController;
+		if (Class.CastTo(animalController, controller))
+		{
+			animalController.OverrideBehaviourSlot(true, DayZAnimalBehaviourSlot.NON_SPECIFIC_THREAT);
+			animalController.OverrideBehaviourAction(true, DayZAnimalBehaviourAction.TRAVELING_INPUT);
+			
+			if (!isMove)
+			{
+				if (isRest)
+				{
+					iSpeed = 0;
+					animalController.OverrideBehaviourAction(true, DayZAnimalBehaviourAction.IDLE1_INPUT);
+				}
+				
+				if (isSleep)
+				{
+					iSpeed = 0;
+					animalController.OverrideBehaviourAction(true, DayZAnimalBehaviourAction.WALKING_INPUT);
+				}
+			}
+		}
+			
+		bool lowVel = GetVelocity(this).Length() < 0.5;
+		if (iSpeed > 0 && lowVel)
+		{
+			iAlert = 4;
+			fAlert = 1.0;
+			
+			iSpeed = 3;
+		}
+		
+		if (animalController)
+		{
+			switch (iSpeed)
+			{
+			case 0:
+				fSpeed = 0;
+				break;
+			case 1:
+				fSpeed = 2;
+				break;
+			case 2:
+				fSpeed = 3;
+				break;
+			case 3:
+				fSpeed = 5;
+				break;
+			}
+		}
+		
+		controller.OverrideTurnSpeed(true, Math.PI2 / pDt);
+		controller.OverrideMovementSpeed(true, fSpeed);
+		controller.OverrideHeading(true, heading * Math.DEG2RAD);
+		controller.OverrideAlertLevel(true, true, iAlert, fAlert);
+		
+		if (CinematicCanJump() && isJump)
+		{
+			controller.OverrideJump(true, 101, 2.0);
+		}
+
+		return true;
+	}
+}
+
+enum DayZAnimalConstants
+{
+	COMMANDID_MOVE,
+	COMMANDID_JUMP,
+	COMMANDID_DEATH,
+	COMMANDID_HIT,
+	COMMANDID_ATTACK,
+	COMMANDID_SCRIPT,
+};
+
+class DayZAnimalCommandMove extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandAttack extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandJump extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandLookAt extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandBehaviourModifier extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandHit extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandDeath extends AnimCommandBase
+{
+
+}
+
+class DayZAnimalCommandAnimCallback extends AnimCommandBase
+{
+
+}
+
+/**
+*\brief DayZAnimalCommandScript fully scriptable command
+*	\warning NON-MANAGED, will be managed by C++ once it is sent to the CommandHandler through DayZAnimal.StartCommand_Script
+*	\note So ideally, it is best to set up the DayZAnimalCommandScript, not create any instances and start it through DayZAnimal.StartCommand_ScriptInst
+*			In case an instance needs to be created, it needs manual deletion if not sent to the CommandHandler
+*			But deleting it while it is in the CommandHandler will cause crashes
+*/
+class DayZAnimalCommandScript extends AnimCommandBase
+{
+	//! constructor must have 1st parameter to be DayZAnimal
+	//void DayZAnimalCommandScript(DayZAnimal pAnimal)
+
+	//---------------------------------------------------------------
+	// usable everywhere
+
+	//! this terminates command script and shows CommandHandler(  ... pCurrentCommandFinished == true );
+	proto native void 	SetFlagFinished(bool pFinished);
+
+	//---------------------------------------------------------------
+	// PrePhys Update 
+
+	//! script function usable in PrePhysUpdate
+	proto native 	bool	PrePhys_GetTranslation(out vector pOutTransl);		// vec3 in local space !
+	proto native 	bool	PrePhys_GetRotation(out float pOutRot[4]);         	// quaternion in local space !
+	proto native 	void	PrePhys_SetTranslation(vector pInTransl); 			// vec3 in local space !
+	proto native 	void	PrePhys_SetRotation(float pInRot[4]);				// quaternion in local space !
+
+	//---------------------------------------------------------------
+	// PostPhys Update 
+
+	//! override this !
+	//! final adjustment of physics state (after physics was applied)
+	//! returns true if command continues running / false if command should end (or you can use SetFlagFinished(true))
+	bool	PostPhysUpdate(float pDt);
+
+	//! script function usable in PostPhysUpdate
+	proto native 	void	PostPhys_GetPosition(out vector pOutTransl);		//! vec3 in world space
+	proto native 	void	PostPhys_GetRotation(out float pOutRot[4]);        	//! quaternion in world space
+	proto native 	void	PostPhys_SetPosition(vector pInTransl);				//! vec3 in world space
+	proto native 	void	PostPhys_SetRotation(float pInRot[4]);				//! quaternion in world space
+	proto native 	void	PostPhys_LockRotation();							//! do not process rotations !
+}
+
+class DayZAnimal extends DayZCreatureAI
+{
+
+	//! Melee hit components (AI targeting)	
+	protected ref array<ref DayZAIHitComponent> m_HitComponentsForAI;
+	protected string m_DefaultHitComponent;
+	protected string m_DefaultHitPositionComponent;
+	protected vector m_DefaultHitPosition;
+
+	proto native DayZAnimalInputController GetInputController();
+
+	proto native void StartCommand_Death(int pType, int pDirection);
+	proto native void StartCommand_Move();
+	proto native void StartCommand_Jump();
+	proto native void StartCommand_Attack();
+	proto native void StartCommand_Hit(int pType, int pDirection);
+	
+	//! scripted commands
+	proto native DayZAnimalCommandScript StartCommand_Script(DayZAnimalCommandScript pInfectedCommand);
+	proto native DayZAnimalCommandScript StartCommand_ScriptInst(typename pCallbackClass);
+	proto native DayZAnimalCommandScript GetCommand_Script();
+	
+	proto native void SignalAIAttackStarted();
+	proto native void SignalAIAttackEnded();
+	
+	void DayZAnimal()
+	{
+		// testing: animals have no inventory by default
+		//GetInventory().LockInventory(LOCK_FROM_SCRIPT); // Hides animals from vicinity in inventory. Remove this if wanted otherwise.
+		
+		m_HitComponentsForAI = new array<ref DayZAIHitComponent>;
+
+		RegisterHitComponentsForAI();
+		
+		//! sets default hit position and cache it here (mainly for impact particles)
+		m_DefaultHitPosition = SetDefaultHitPosition(GetDefaultHitPositionComponent());
+	}
+	
+	override bool IsHealthVisible()
+	{
+		return false;
+	}	
+	
+	override bool IsAnimal()
+	{
+		return true;
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		return false;
+	}
+	
+	override int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.HIDE_VICINITY;
+		/*
+		if (IsAlive())
+		{
+			return EInventoryIconVisibility.HIDE_VICINITY;
+		}
+		return super.GetHideIconMask();
+		*/
+	}
+	
+	void CommandHandler(float dt, int currentCommandID, bool currentCommandFinished)
+	{
+		DayZAnimalInputController inputController = GetInputController();
+		
+		//! for mods
+		if( ModCommandHandlerBefore(dt, currentCommandID, currentCommandFinished) )
+		{
+			return;
+		}
+
+		if (HandleDeath(currentCommandID, inputController))
+		{
+			return;
+		}
+		
+		if (currentCommandFinished)
+		{
+			if (currentCommandID == DayZAnimalConstants.COMMANDID_ATTACK)
+			{
+				SignalAIAttackEnded();
+			}
+	
+			StartCommand_Move();
+	
+			return;
+		}
+		
+		//! for mods
+		if( ModCommandHandlerInside(dt, currentCommandID, currentCommandFinished) )
+		{
+			return;
+		}
+	
+		if (HandleDamageHit(currentCommandID))
+		{
+			if (currentCommandID  == DayZAnimalConstants.COMMANDID_ATTACK)
+			{
+				SignalAIAttackEnded();
+			}
+			return;
+		}
+	
+		if (currentCommandID == DayZAnimalConstants.COMMANDID_MOVE)
+		{
+			if (inputController.IsJump())
+			{
+				StartCommand_Jump();
+				return;
+			}
+	
+			if (inputController.IsAttack())
+			{
+				StartCommand_Attack();
+				SignalAIAttackStarted();
+				return;
+			}
+		}
+		
+		//!
+		if( ModCommandHandlerAfter(dt, currentCommandID, currentCommandFinished) )
+		{
+			return;
+		}
+	}
+	
+	bool m_DamageHitToProcess = false;
+	int m_DamageHitType = 0;
+	int m_DamageHitDirection = 0;
+	
+	bool HandleDeath(int currentCommandID, DayZAnimalInputController inputController)
+	{
+		if (inputController.IsDead())
+		{
+			if (currentCommandID == DayZAnimalConstants.COMMANDID_DEATH)
+			{
+				return true;
+			}
+	
+			if (m_DamageHitToProcess)
+			{
+				m_DamageHitToProcess = false;
+				
+				StartCommand_Death(m_DamageHitType, m_DamageHitDirection);
+			}
+			else
+			{
+				StartCommand_Death(0, 0);
+			}
+	
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool HandleDamageHit(int currentCommandID)
+	{
+		if (m_DamageHitToProcess)
+		{
+			m_DamageHitToProcess = false;
+			
+			if (currentCommandID != DayZAnimalConstants.COMMANDID_HIT)
+			{
+				StartCommand_Hit(m_DamageHitType, m_DamageHitDirection);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		m_TransportHitRegistered = false;
+
+		int transferShockToDamageCoef = g_Game.ConfigGetInt(string.Format("%1 %2 DamageApplied transferShockToDamage", CFG_AMMO, ammo));
+		if (transferShockToDamageCoef == 1)
+		{
+			//Print("DayZAnimal | EEHitBy | nonlethal hit");
+			AddHealth("", "Health", -ConvertNonlethalDamage(damageResult.GetDamage(dmgZone, "Shock"), damageType));
+		}
+		else
+		{
+			ComponentAnimalBleeding animal_bleeding = ComponentAnimalBleeding.Cast( GetComponent( COMP_TYPE_ANIMAL_BLEEDING ) );
+			animal_bleeding.CreateWound( damageResult, dmgZone, ammo );
+		}
+		
+		int type = 0;
+		int direction = 0;
+		if (ComputeDamageHitParams(source, dmgZone, ammo, type, direction) == true)
+		{
+			QueueDamageHit(type, direction);
+		}
+		
+	}
+	
+	void QueueDamageHit(int type, int direction)
+	{
+		m_DamageHitToProcess = true;
+		m_DamageHitType = type;
+		m_DamageHitDirection = direction;
+	}
+	
+	bool ComputeDamageHitParams(EntityAI source, string dmgZone, string ammo, out int type, out int direction)
+	{
+		type = 0; // not used right now
+		
+		float angleDeg = ComputeHitDirectionAngleDeg(source);
+		direction = TranslateHitAngleDegToDirectionIndex(angleDeg);
+		
+		direction += FindComponentDirectionOffset(dmgZone);
+		
+		return true;	
+	}
+	
+	float ComputeHitDirectionAngleDeg(EntityAI source)
+	{
+		vector targetDirection = GetDirection();
+		vector toSourceDirection = (source.GetPosition() - GetPosition());
+
+		targetDirection[1] = 0;
+		toSourceDirection[1] = 0;
+
+		targetDirection.Normalize();
+		toSourceDirection.Normalize();
+
+		float cosFi = vector.Dot(targetDirection, toSourceDirection);
+		vector cross = targetDirection * toSourceDirection;
+
+		float dirAngleDeg = Math.Acos(cosFi) * Math.RAD2DEG;
+		if ( cross[1] < 0 )
+			dirAngleDeg = -dirAngleDeg;
+		
+		return dirAngleDeg;
+	}
+	
+	int TranslateHitAngleDegToDirectionIndex(float angleDeg)
+	{
+		if (angleDeg >= -20 && angleDeg <= 20) // front
+		{
+			return 1; 
+		}
+		else if (angleDeg < 0) // left
+		{
+			return 2;
+		}
+		
+		return 3; // right
+	}
+	
+	int FindComponentDirectionOffset(string component)
+	{
+		const int directionCount = 4;
+		
+		int offset = 0;
+		if (component.Length() == 0)
+		{
+			offset = 0;
+		}
+		else if (component == "Zone_Head")
+		{
+			offset = directionCount;
+		}
+		else if (component == "Zone_Chest" || component == "Zone_Legs_Front" || component == "Zone_Spine_Front" || component == "Zone_Neck")
+		{
+			offset = 2 * directionCount;
+		}
+		else
+		{
+			offset = 3 * directionCount;
+		}
+		
+		return offset;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Phx contact event
+	//! 
+	
+	override protected void EOnContact(IEntity other, Contact extra)
+	{
+		if( !IsAlive() )
+			return;
+		
+		Transport transport = Transport.Cast(other);
+		if( transport )
+		{
+			if ( GetGame().IsServer() )
+			{
+				RegisterTransportHit(transport);
+			}			
+		}
+	}
+
+	//! register hit components for AI melee (used by attacking AI)
+	void RegisterHitComponentsForAI()
+	{
+		//! registers default hit compoent for the entity
+		m_DefaultHitComponent = "Zone_Chest";
+		//! registers default hit position component for entity
+		m_DefaultHitPositionComponent = "Pelvis";
+
+		//! register hit components that are selected by probability
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+	}
+	
+	override string GetHitComponentForAI()
+	{
+		string hitComp;
+		
+		if (DayZAIHitComponentHelpers.SelectMostProbableHitComponent(m_HitComponentsForAI, hitComp))
+		{
+			return hitComp;
+		}	
+		
+		return GetDefaultHitComponent();
+	}
+	
+	override string GetDefaultHitComponent()
+	{
+		return m_DefaultHitComponent;
+	}
+	
+	override string GetDefaultHitPositionComponent()
+	{
+		return m_DefaultHitPositionComponent;
+	}
+
+	override vector GetDefaultHitPosition()
+	{
+		return m_DefaultHitPosition;
+	}
+
+	protected vector SetDefaultHitPosition(string pSelection)
+	{
+		return GetSelectionPositionMS(pSelection);
+	}
+	
+	override protected float ConvertNonlethalDamage(float damage, DamageType damageType)
+	{
+		switch (damageType)
+		{
+			case DamageType.CLOSE_COMBAT:
+				return damage * GameConstants.NL_DAMAGE_CLOSECOMBAT_CONVERSION_ANIMALS;
+			case DamageType.FIRE_ARM:
+				return damage * GameConstants.NL_DAMAGE_FIREARM_CONVERSION_ANIMALS;
+		}
+		
+		return super.ConvertNonlethalDamage(damage, damageType);
+	}
+}
diff --git a/scripts/3_Game/DayZ/Entities/DayZAnimalInputController.c b/scripts/3_Game/DayZ/Entities/DayZAnimalInputController.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f67f8d69603eb7380b2b04e1aab3175bfc75baf
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZAnimalInputController.c
@@ -0,0 +1,68 @@
+//! defined in C++
+enum DayZAnimalBehaviourSlot
+{
+	NONE,
+    CALM,
+    CALM_RESTING,
+    CALM_GRAZING,
+    CALM_TRAVELLING,
+    DRINKING,
+    NON_SPECIFIC_THREAT,
+    SPECIFIC_THREAT,
+    ALERTED,
+    ATTRACTED,
+    SCARED,
+    HUNTING,
+    EATING,
+    SIEGE,
+    FIREPLACE,
+    ENRAGED,
+    ENRAGED_TARGETLOST,
+    PREATTRACTED,
+    INTIMIDATE,
+};
+
+//! defined in C++
+enum DayZAnimalBehaviourAction
+{
+    NONE_INPUT,
+    SAFETY_INPUT,
+    GRAZE_WALKING_INPUT,
+    GRAZE_ON_SPOT_INPUT,
+    RESTING_INPUT,
+    TRAVELING_INPUT,
+    EATING_INPUT,
+    DRINKING_INPUT,
+    CHARGING,
+    APPROACHING_INPUT,
+    REACH_INPUT,
+    WALKING_INPUT,
+    IDLE1_INPUT,
+    IDLE2_INPUT,
+    IDLE3_INPUT,
+    THREAT_WALK_AWAY,
+    THREAT_WALK_TO,
+    THREAT_STAY_LOOKAT,
+    THREAT_STAY,
+};
+
+class DayZAnimalInputController : DayZCreatureAIInputController
+{
+	proto native bool IsDead();
+	proto native bool IsAttack();
+
+    proto native void OverrideBehaviourAction(bool state, int action);
+	proto native int GetBehaviourAction();
+	
+	//--------------------------------------------------------------
+
+	//! never created by script
+	private void DayZAnimalInputController()
+	{
+	}
+
+	//! never destroyed by script
+	private void ~DayZAnimalInputController()
+	{
+	}	
+};
diff --git a/scripts/3_Game/DayZ/Entities/DayZAnimalType.c b/scripts/3_Game/DayZ/Entities/DayZAnimalType.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1daec472a451aced28be4e28767dbf30bf52449
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZAnimalType.c
@@ -0,0 +1,4 @@
+class DayZAnimalType extends DayZCreatureAIType
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/DayZCreatureAIInputController.c b/scripts/3_Game/DayZ/Entities/DayZCreatureAIInputController.c
new file mode 100644
index 0000000000000000000000000000000000000000..fee671689844c50ad9dfee0bdf3ab19439550fcc
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZCreatureAIInputController.c
@@ -0,0 +1,39 @@
+class DayZCreatureAIInputController
+{
+	proto native void OverrideMovementSpeed(bool state, float movementSpeed);
+	proto native float GetMovementSpeed();
+
+    proto native void OverrideTurnSpeed(bool state, float turnSpeed);
+    proto native float GetTurnSpeed();
+
+    proto native void OverrideHeading(bool state, float heading);
+    proto native float GetHeading();
+
+    proto native void OverrideJump(bool state, int jumpType, float jumpHeight = 0);
+    proto native bool IsJump();
+    proto native int GetJumpType();
+    proto native float GetJumpHeight();
+
+    proto native void OverrideLookAt(bool state, vector direction);
+	proto native bool IsLookAtEnabled();
+	proto native vector GetLookAtDirectionWS();
+
+    proto native void OverrideAlertLevel(bool state, bool alerted, int level, float inLevel);
+	proto native int GetAlertLevel();
+	proto native float GetAlertInLevel();
+	proto native bool IsAlerted();
+
+    proto native void OverrideBehaviourSlot(bool state, int slot);
+	proto native int GetBehaviourSlot();
+	
+	//--------------------------------------------------------------
+	//! never created by script
+	private void DayZCreatureAIInputController()
+	{
+	}
+
+	//! never destroyed by script
+	private void ~DayZCreatureAIInputController()
+	{
+	}
+};
diff --git a/scripts/3_Game/DayZ/Entities/DayZCreatureAIType.c b/scripts/3_Game/DayZ/Entities/DayZCreatureAIType.c
new file mode 100644
index 0000000000000000000000000000000000000000..8db1986e54b9c8c2a421d363ccca7e11cb8d4f6a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZCreatureAIType.c
@@ -0,0 +1,157 @@
+class DayZCreatureAIType
+{
+	ref array<ref AnimSoundEvent> 		m_animSoundEvents;
+	ref array<ref AnimSoundVoiceEvent> 	m_animSoundVoiceEvents;
+	ref array<ref AnimStepEvent> 		m_animStepEvents;
+	ref array<ref AnimDamageEvent> 		m_animDamageEvents;
+
+	string m_CfgPath;
+	string m_AnimEventsCfgPath;
+
+	private void DayZCreatureAIType()
+	{
+		m_CfgPath = "CfgVehicles " + GetName() + " ";
+		m_AnimEventsCfgPath = m_CfgPath	+ "AnimEvents ";
+		LoadParams();
+	}
+	
+	private void ~DayZCreatureAIType()
+	{
+		
+	}
+	
+	void LoadAnimSoundEvents()
+	{
+		m_animSoundEvents = new array<ref AnimSoundEvent>;
+		
+		string soundsCfgPath = m_AnimEventsCfgPath + "Sounds ";
+
+		int soundCount = GetGame().ConfigGetChildrenCount(soundsCfgPath);
+		for (int i = 0; i < soundCount; i++)
+		{
+			string soundName;
+			GetGame().ConfigGetChildName(soundsCfgPath, i, soundName);			
+			string soundPath = soundsCfgPath + soundName + " ";
+			AnimSoundEvent soundEvent = new AnimSoundEvent(soundPath);
+			if (soundEvent.IsValid())
+				m_animSoundEvents.Insert(soundEvent);
+		}
+	}
+
+	void LoadAnimSoundVoiceEvents()
+	{
+		m_animSoundVoiceEvents = new array<ref AnimSoundVoiceEvent>;
+		
+		string soundsCfgPath = m_AnimEventsCfgPath + "SoundVoice ";
+
+		int soundCount = GetGame().ConfigGetChildrenCount(soundsCfgPath);
+		for (int i = 0; i < soundCount; i++)
+		{
+			string soundName;
+			GetGame().ConfigGetChildName(soundsCfgPath, i, soundName);			
+			string soundPath = soundsCfgPath + soundName + " ";
+			AnimSoundVoiceEvent soundEvent = new AnimSoundVoiceEvent(soundPath);
+			if (soundEvent.IsValid())
+				m_animSoundVoiceEvents.Insert(soundEvent);
+		}
+	}
+	
+	void LoadAnimStepEvents()
+	{
+		m_animStepEvents = new array<ref AnimStepEvent>;	
+		string stepsCfgPath = m_AnimEventsCfgPath + "Steps ";
+		int stepsCount = GetGame().ConfigGetChildrenCount(stepsCfgPath);
+
+		for (int i = 0; i < stepsCount; i++)
+		{
+			string stepName;
+			GetGame().ConfigGetChildName(stepsCfgPath, i, stepName);			
+			string stepPath = stepsCfgPath + stepName + " ";
+			AnimStepEvent stepEvent = new AnimStepEvent(stepPath);
+			m_animStepEvents.Insert(stepEvent);
+		}
+	}
+	
+	void LoadAnimDamageEvents()
+	{
+		m_animDamageEvents = new array<ref AnimDamageEvent>;
+
+		string damagesCfgPath = m_AnimEventsCfgPath + "Damages ";
+		int damagesCount = GetGame().ConfigGetChildrenCount(damagesCfgPath);
+
+		for (int i = 0; i < damagesCount; i++)
+		{
+			string damageName;
+			GetGame().ConfigGetChildName(damagesCfgPath, i, damageName);			
+			string damagePath = damagesCfgPath + damageName + " ";
+			AnimDamageEvent damageEvent = new AnimDamageEvent(damagePath);
+			m_animDamageEvents.Insert(damageEvent);
+		}
+	}
+
+	private void LoadParams()
+	{
+		LoadAnimSoundEvents();
+		LoadAnimSoundVoiceEvents();
+		LoadAnimStepEvents();
+		LoadAnimDamageEvents();
+	}
+
+	AnimStepEvent GetStepEvent(int event_id)
+	{
+		for (int i = 0; i < m_animStepEvents.Count(); i++)
+		{
+			AnimStepEvent stepEvent = m_animStepEvents.Get(i);
+			if (stepEvent.m_iID == event_id)
+			{
+				return stepEvent;
+			}
+		}
+
+		return null;
+	}
+
+	AnimSoundEvent GetSoundEvent(int event_id)
+	{
+		for (int i = 0; i < m_animSoundEvents.Count(); i++)
+		{
+			AnimSoundEvent soundEvent = m_animSoundEvents.Get(i);
+			if (soundEvent.m_iID == event_id)
+			{
+				return soundEvent;
+			}
+		}
+
+		return null;
+	}
+	
+	AnimSoundVoiceEvent GetSoundVoiceEvent(int event_id)
+	{
+		for (int i = 0; i < m_animSoundVoiceEvents.Count(); i++)
+		{
+			AnimSoundVoiceEvent voiceEvent = m_animSoundVoiceEvents.Get(i);
+			if (voiceEvent.m_iID == event_id)
+			{
+				return voiceEvent;
+			}
+		}
+
+		return null;
+	}
+
+	AnimDamageEvent GetDamageEvent(int event_id)
+	{
+		for (int i = 0; i < m_animDamageEvents.Count(); i++)
+		{
+			AnimDamageEvent damageEvent = m_animDamageEvents.Get(i);
+			if (damageEvent.m_iID == event_id)
+			{
+				return damageEvent;
+			}
+		}
+
+		return null;
+	}
+
+	proto native owned string GetName();
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/DayZInfected.c b/scripts/3_Game/DayZ/Entities/DayZInfected.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b4f9d92a8548654db327068d43cd7890658cbec
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZInfected.c
@@ -0,0 +1,208 @@
+enum DayZInfectedConstants
+{
+	//! anim commands
+	COMMANDID_MOVE,
+	COMMANDID_VAULT,
+	COMMANDID_DEATH,
+	COMMANDID_HIT,
+	COMMANDID_ATTACK,
+	COMMANDID_CRAWL,
+	COMMANDID_SCRIPT,
+	
+	//! mind states
+	MINDSTATE_CALM,
+	MINDSTATE_DISTURBED,
+	MINDSTATE_ALERTED,
+	MINDSTATE_CHASE,
+	MINDSTATE_FIGHT,
+}
+
+enum DayZInfectedConstantsMovement
+{
+	MOVEMENTSTATE_IDLE = 0,
+	MOVEMENTSTATE_WALK,
+	MOVEMENTSTATE_RUN,
+	MOVEMENTSTATE_SPRINT
+}
+
+enum DayZInfectedDeathAnims
+{
+	ANIM_DEATH_DEFAULT = 0,
+	ANIM_DEATH_IMPULSE = 1,
+	ANIM_DEATH_BACKSTAB = 2,
+	ANIM_DEATH_NECKSTAB = 3
+}
+
+class DayZInfectedCommandMove extends AnimCommandBase
+{
+	proto native void SetStanceVariation(int pStanceVariation);
+	proto native void SetIdleState(int pIdleState);
+	proto native void StartTurn(float pDirection, int pSpeedType);
+	proto native bool IsTurning();
+}
+
+class DayZInfectedCommandDeath extends AnimCommandBase {}
+
+class DayZInfectedCommandHit extends AnimCommandBase {}
+
+class DayZInfectedCommandAttack extends AnimCommandBase
+{
+	proto native bool WasHit();
+}
+class DayZInfectedCommandVault extends AnimCommandBase
+{
+	proto native bool WasLand();
+}
+
+class DayZInfectedCommandCrawl extends AnimCommandBase {}
+
+/**
+*\brief DayZInfectedCommandScript fully scriptable command
+*	\warning NON-MANAGED, will be managed by C++ once it is sent to the CommandHandler through DayZInfected.StartCommand_Script
+*	\note So ideally, it is best to set up the DayZInfectedCommandScript, not create any instances and start it through DayZInfected.StartCommand_ScriptInst
+*			In case an instance needs to be created, it needs manual deletion if not sent to the CommandHandler
+*			But deleting it while it is in the CommandHandler will cause crashes
+*/
+class DayZInfectedCommandScript extends AnimCommandBase
+{
+	//! constructor must have 1st parameter to be DayZInfected
+	void DayZInfectedCommandScript(DayZInfected pInfected) {}
+	void ~DayZInfectedCommandScript() {}
+
+	//---------------------------------------------------------------
+	// usable everywhere
+
+	//! this terminates command script and shows CommandHandler(  ... pCurrentCommandFinished == true );
+	proto native void 	SetFlagFinished(bool pFinished);
+
+	//---------------------------------------------------------------
+	// PrePhys Update 
+
+	//! script function usable in PrePhysUpdate
+	proto native 	bool	PrePhys_GetTranslation(out vector pOutTransl);		// vec3 in local space !
+	proto native 	bool	PrePhys_GetRotation(out float pOutRot[4]);         	// quaternion in local space !
+	proto native 	void	PrePhys_SetTranslation(vector pInTransl); 			// vec3 in local space !
+	proto native 	void	PrePhys_SetRotation(float pInRot[4]);				// quaternion in local space !
+
+	//---------------------------------------------------------------
+	// PostPhys Update 
+
+	//! override this !
+	//! final adjustment of physics state (after physics was applied)
+	//! returns true if command continues running / false if command should end (or you can use SetFlagFinished(true))
+	bool	PostPhysUpdate(float pDt);
+
+	//! script function usable in PostPhysUpdate
+	proto native 	void	PostPhys_GetPosition(out vector pOutTransl);		//! vec3 in world space
+	proto native 	void	PostPhys_GetRotation(out float pOutRot[4]);        	//! quaternion in world space
+	proto native 	void	PostPhys_SetPosition(vector pInTransl);				//! vec3 in world space
+	proto native 	void	PostPhys_SetRotation(float pInRot[4]);				//! quaternion in world space
+	proto native 	void	PostPhys_LockRotation();							//! do not process rotations !
+}
+
+class DayZInfected extends DayZCreatureAI
+{	
+	proto native DayZInfectedType GetDayZInfectedType();
+	proto native DayZInfectedInputController GetInputController();	
+	proto native DayZInfectedCommandMove StartCommand_Move();	
+	proto native DayZInfectedCommandVault StartCommand_Vault(int pType);	
+	proto native void StartCommand_Death(int pType, float pDirection);
+	proto native void StartCommand_Hit(bool pHeavy, int pType, float pDirection);
+	proto native DayZInfectedCommandAttack StartCommand_Attack(EntityAI pTarget, int pType, float pSubtype);
+	proto native void StartCommand_Crawl(int pType);
+	
+	proto native bool CanAttackToPosition(vector pTargetPosition);
+	
+	proto native DayZInfectedCommandMove GetCommand_Move();
+	proto native DayZInfectedCommandVault GetCommand_Vault();
+	proto native DayZInfectedCommandAttack GetCommand_Attack();
+	
+	//! scripted commands
+	proto native DayZInfectedCommandScript StartCommand_Script(DayZInfectedCommandScript pInfectedCommand);
+	proto native DayZInfectedCommandScript StartCommand_ScriptInst(typename pCallbackClass);
+	proto native DayZInfectedCommandScript GetCommand_Script();
+	
+	//! gets transform in World Space
+	proto native	void 		GetTransformWS(out vector pTm[4]);
+	
+	const float LEG_CRIPPLE_THRESHOLD = 74.0;
+
+	bool 		m_HeavyHitOverride;
+
+	//-------------------------------------------------------------
+	void DayZInfected();
+	void ~DayZInfected();
+	
+	//-------------------------------------------------------------
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+
+		int transferShockToDamageCoef = g_Game.ConfigGetInt(string.Format("%1 %2 DamageApplied transferShockToDamage", CFG_AMMO, ammo));		
+		if (transferShockToDamageCoef == 1)
+		{
+			float damage = damageResult.GetDamage(dmgZone, "Shock");
+			HandleSpecialZoneDamage(dmgZone, damage);
+			AddHealth("", "Health", -ConvertNonlethalDamage(damage, damageType));
+		}
+		
+		if (!IsAlive())
+		{
+			if (!m_DeathSyncSent) //to be sent only once on hit/death
+			{
+				Man killer = source.GetHierarchyRootPlayer();
+				
+				if (!m_KillerData) //only one player is considered killer in the event of crossfire
+				{
+					m_KillerData = new KillerData();
+					m_KillerData.m_Killer = killer;
+					m_KillerData.m_MurderWeapon = source;
+				}
+				
+				if (killer && killer.IsPlayer())
+				{
+					// was infected killed by headshot?
+					if (dmgZone == "Head") //no "Brain" damage zone defined (nor can it be caught like on player, due to missing command handler), "Head" is sufficient
+					{
+						m_KilledByHeadshot = true;
+						if (m_KillerData.m_Killer == killer)
+							m_KillerData.m_KillerHiTheBrain = true;
+					}
+				}
+
+				SyncEvents.SendEntityKilled(this, m_KillerData.m_Killer, m_KillerData.m_MurderWeapon, m_KillerData.m_KillerHiTheBrain);
+				m_DeathSyncSent = true;
+			}
+		}
+	}
+
+	override protected float ConvertNonlethalDamage(float damage, DamageType damageType)
+	{
+		switch (damageType)
+		{
+			case DamageType.CLOSE_COMBAT:
+				return damage * GameConstants.NL_DAMAGE_CLOSECOMBAT_CONVERSION_INFECTED;
+			case DamageType.FIRE_ARM:
+				return damage * GameConstants.NL_DAMAGE_FIREARM_CONVERSION_INFECTED;
+		}
+		
+		return super.ConvertNonlethalDamage(damage, damageType);
+	}
+	
+	void HandleSpecialZoneDamage(string dmgZone, float damage)
+	{
+		if (damage < LEG_CRIPPLE_THRESHOLD)
+			return;
+		
+		if (dmgZone == "LeftLeg" || dmgZone == "RightLeg")
+			SetHealth(dmgZone,"Health",0.0);
+
+		if (dmgZone == "Torso" || dmgZone == "Head")
+			m_HeavyHitOverride = true;
+	}
+	
+	override int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.HIDE_VICINITY;
+	}
+}
diff --git a/scripts/3_Game/DayZ/Entities/DayZInfectedInputController.c b/scripts/3_Game/DayZ/Entities/DayZInfectedInputController.c
new file mode 100644
index 0000000000000000000000000000000000000000..aa60573e58e9c6334d094b937a4e30c1e99d176e
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZInfectedInputController.c
@@ -0,0 +1,22 @@
+class DayZInfectedInputController : DayZCreatureAIInputController
+{
+	//! Same as 'DayZCreatureAIInputController::IsJump'
+	proto native bool IsVault();
+
+	//! Same as 'DayZCreatureAIInputController::GetJumpHeight'
+	proto native float GetVaultHeight();
+	
+	proto native int GetMindState();
+	proto native EntityAI GetTargetEntity();
+	
+	//--------------------------------------------------------------
+	//! never created by script
+	private void DayZInfectedInputController()
+	{
+	}
+
+	//! never destroyed by script
+	private void ~DayZInfectedInputController()
+	{
+	}	
+};
diff --git a/scripts/3_Game/DayZ/Entities/DayZInfectedType.c b/scripts/3_Game/DayZ/Entities/DayZInfectedType.c
new file mode 100644
index 0000000000000000000000000000000000000000..81f091fe3f24085215eb49a2093bd4a7dbee5d5e
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/DayZInfectedType.c
@@ -0,0 +1,226 @@
+class DayZInfectedAttackType
+{
+	float m_Distance; // [m]
+	int m_Pitch; // 1 = up, 0 = center, -1 = down
+	int m_Type; // int argument for attack command
+	float m_Subtype; // float argument for attack command
+	string m_AmmoType; // ammotype from config
+	int m_IsHeavy; // 0 - light attack; 1 - heavy attack;  -> Heavy attack is not blockable
+	float m_Cooldown; // [s]
+	float m_Probability; // [0..1]
+};
+
+enum DayZInfectedAttackGroupType
+{
+	CHASE,
+	FIGHT
+}
+
+class DayZInfectedType extends DayZCreatureAIType
+{
+	//--------------------------------------------------------
+	// Public
+	//--------------------------------------------------------
+	//! register hit components for AI melee (used by attacking AI)
+	void RegisterHitComponentsForAI()
+	{
+		m_HitComponentsForAI = new array<ref DayZAIHitComponent>;
+
+		//! registers default hit compoent for the entity
+		m_DefaultHitComponent = "Torso";
+		//! registers default hit position component for entity
+		m_DefaultHitPositionComponent = "Spine1";
+		
+		//! list of components suitable for melee finisher attacks (used in fight logic)
+		m_SuitableFinisherHitComponents = new array<string>;
+		m_SuitableFinisherHitComponents.Insert("Head");
+		m_SuitableFinisherHitComponents.Insert("Neck");
+		m_SuitableFinisherHitComponents.Insert("Torso");
+
+		//! register hit components that are selected by probability
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Head", 2);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "LeftArm", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Torso", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "RightArm", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "LeftLeg", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "RightLeg", 50);
+	}
+
+	void RegisterAttacks()
+	{
+		//! --------------------------------------------------------------------------------
+		//!
+		//! RegisterAttack(Group Type, Distance, Pitch, Type, Subtype, AmmoType, heavyFlag, Cooldown, Probability);
+		//!
+		//! --------------------------------------------------------------------------------
+		
+		string lightAttPath = string.Format("cfgVehicles %1 AttackActions AttackShort ammoType", GetName());
+		string heavyAttPath = string.Format("cfgVehicles %1 AttackActions AttackLong ammoType", GetName());
+		string chaseAttPath = string.Format("cfgVehicles %1 AttackActions AttackRun ammoType", GetName());
+		
+		string lightAttAmmo;
+		GetGame().ConfigGetText(lightAttPath, lightAttAmmo);
+		string heavyAttAmmo;
+		GetGame().ConfigGetText(heavyAttPath, heavyAttAmmo);
+		string chaseAttAmmo;
+		GetGame().ConfigGetText(chaseAttPath, chaseAttAmmo);
+		
+		//! chase group
+		m_ChaseAttacksGroup = new array<ref DayZInfectedAttackType>;
+
+		//! center attack
+		RegisterAttack(DayZInfectedAttackGroupType.CHASE, /*3.0*/2.4,  -1, 0, 1, chaseAttAmmo, 0, 0.3, 1.0); // center left & light
+		RegisterAttack(DayZInfectedAttackGroupType.CHASE, /*3.0*/2.4,  -1, 1, 1, chaseAttAmmo, 0, 0.4, 1.0); // center right & light
+
+		//! --------------------------------------------------------------------------------
+		//! fight group
+		m_FightAttacksGroup = new array<ref DayZInfectedAttackType>;
+
+		//! up attack
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.0*/1.7,  1, 0, 0, lightAttAmmo, 0, 0.3, 0.7); // up left & light
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.0*/1.7,  1, 1, 0, lightAttAmmo, 0, 0.4, 0.7); // up right & light
+		
+		//! center attack
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.0*/1.7,  0, 0, 1, lightAttAmmo, 0, 0.1, 0.9); // center left & light
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.0*/1.7,  0, 1, 1, lightAttAmmo, 0, 0.2, 0.9); // center right & light
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.5*/1.4,  0, 2, 1, heavyAttAmmo, 0/*1*/, 0.3, 0.6); // center left & heavy
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.5*/1.4,  0, 3, 1, heavyAttAmmo, 0/*1*/, 0.4, 0.6); // center right & heavy
+		
+		//! down attack
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.0*/1.7,  -1, 0, 2, lightAttAmmo, 0, 0.2, 0.5); // down left & light
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.0*/1.7,  -1, 1, 2, lightAttAmmo, 0, 0.3, 0.4); // down right & light
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.5*/1.4,  -1, 2, 2, heavyAttAmmo, 0/*1*/, 0.5, 0.8); // down left & heavy
+		RegisterAttack(DayZInfectedAttackGroupType.FIGHT, /*2.5*/1.4,  -1, 3, 2, heavyAttAmmo, 0/*1*/, 0.6, 0.8); // down right & heavy
+	}
+	
+	DayZInfectedAttackType ChooseAttack(DayZInfectedAttackGroupType pAttackGroupType, float pDistance, int pPitch)
+	{
+		array<ref DayZInfectedAttackType> attackGroup = GetAttackGroup(pAttackGroupType);
+		float rnd;
+		float highestUtility = -1;
+		DayZInfectedAttackType mostSuitableAttack = null;
+		
+		Math.Randomize(GetWorldTime() + (int)pDistance);
+		
+		for (int i = 0; i < attackGroup.Count(); ++i)
+		{
+			rnd = Math.RandomFloat01();
+			DayZInfectedAttackType attackType = attackGroup.Get(i);
+			float utility = ComputeAttackUtility(attackType, pDistance, pPitch, rnd);
+			if (utility <= 0)
+				continue;
+			
+			if (utility > highestUtility)
+			{
+				mostSuitableAttack = attackType;
+				highestUtility = utility;
+			}
+		}
+		
+		//Print("Most sutable attack selected: " + mostSuitableAttack);
+		return mostSuitableAttack;
+	}
+
+	string GetHitComponentForAI()
+	{
+		string hitComp;
+		
+		if (DayZAIHitComponentHelpers.SelectMostProbableHitComponent(m_HitComponentsForAI, hitComp))
+		{
+			return hitComp;
+		}	
+		
+		return GetDefaultHitComponent();
+	}
+	
+	string GetDefaultHitComponent()
+	{
+		return m_DefaultHitComponent;
+	}
+	
+	string GetDefaultHitPositionComponent()
+	{
+		return m_DefaultHitPositionComponent;
+	}
+
+	array<string> GetSuitableFinisherHitComponents()
+	{
+		return m_SuitableFinisherHitComponents;
+	}
+	
+	//--------------------------------------------------------
+	// Protected
+	//--------------------------------------------------------
+	
+	protected void RegisterAttack(DayZInfectedAttackGroupType pAttackGroupType, float pDistance, int pPitch, int pType, float pSubtype, string pAmmoType, int pIsHeavy, float pCooldown, float pProbability)
+	{
+		DayZInfectedAttackType newType = new DayZInfectedAttackType();
+		
+		newType.m_Distance = pDistance;
+		newType.m_Pitch = pPitch;
+		newType.m_Type = pType; //If attack is left or right
+		newType.m_Subtype = pSubtype; //If attack is center, down, up or run
+		newType.m_AmmoType = pAmmoType;
+		newType.m_IsHeavy = pIsHeavy;
+		newType.m_Cooldown = pCooldown;
+		newType.m_Probability = pProbability;
+		
+		GetAttackGroup(pAttackGroupType).Insert(newType);
+	}
+	
+	protected float ComputeAttackUtility(DayZInfectedAttackType pAttackType, float pTargetDistance, int pPitch, float pProbability)
+	{
+		// pitch
+		if (pAttackType.m_Pitch != pPitch)
+			return 0;
+
+		// distance
+		float distDiff = pAttackType.m_Distance - pTargetDistance;
+		if (distDiff < 0)
+			return 0;
+
+		float distDiffFrac = distDiff / 10;
+		float utilityDistance = (1 - distDiffFrac) * 100; // distance is most important
+		
+		// probability
+		float probDiff = pAttackType.m_Probability - pProbability;
+		if (probDiff < 0)
+			return 0;
+
+		float utilityProbability = (1 - probDiff) * 10; // distance is most important
+		
+		// total
+		float util = utilityDistance + utilityProbability;
+		//Print("Attack Utility " + util);
+
+		return util;
+	}
+
+	protected array<ref DayZInfectedAttackType> GetAttackGroup(DayZInfectedAttackGroupType pType)
+	{
+		switch (pType)
+		{
+			case DayZInfectedAttackGroupType.CHASE:
+				return m_ChaseAttacksGroup;
+				
+			case DayZInfectedAttackGroupType.FIGHT:
+				return m_FightAttacksGroup;
+		}
+		
+		return NULL;
+	}
+	
+	//--------------------------------------------------------
+	// Members
+	//--------------------------------------------------------
+	
+	//! selected & sorted targets by utility function
+	private ref array<ref DayZInfectedAttackType> m_ChaseAttacksGroup;
+	private ref array<ref DayZInfectedAttackType> m_FightAttacksGroup;
+
+	//! Melee hit components (AI targeting)	
+	protected ref array<ref DayZAIHitComponent> m_HitComponentsForAI;
+	protected string m_DefaultHitComponent;
+	protected string m_DefaultHitPositionComponent;
+	protected ref array<string> m_SuitableFinisherHitComponents;
+}
diff --git a/scripts/3_Game/DayZ/Entities/Entity.c b/scripts/3_Game/DayZ/Entities/Entity.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cf657164bcff28f50206fd594b63c1342f41c80
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/Entity.c
@@ -0,0 +1,62 @@
+class Entity extends ObjectTyped
+{
+	proto native void DisableSimulation(bool disable);
+
+	//! Returns whether simulation is disabled
+	proto native bool GetIsSimulationDisabled();
+	
+	//! Returns simulation timestamp
+	proto native int GetSimulationTimeStamp();
+
+	//! Return animation phase of animation on object.
+	proto native float GetAnimationPhase(string animation);
+	
+	//! Process animation on object. Animation is defined in config file. Wanted animation phase is set to phase.
+	proto native void SetAnimationPhase(string animation, float phase);
+	
+	//! Same as SetAnimationPhase, only ignores any animation and sets the phase immediately
+	void SetAnimationPhaseNow(string animation, float phase)
+	{
+		ResetAnimationPhase(animation, phase);
+		SetAnimationPhase(animation, phase);
+	}
+		
+	proto native void ResetAnimationPhase(string animation, float phase);
+	
+	/**
+	\brief callback called from C++ when AnimationPhase has started
+	*/
+	void OnAnimationPhaseStarted(string animSource, float phase);
+
+	//! Returns skeleton's bone index of named proxy selection.
+	proto native int GetBoneIndex( string proxySelectionName );
+
+	//! Returns proxy object that corresponds given bone inside skeleton.
+	proto native Object GetBoneObject( int boneIndex );
+	
+	//! Turns on/off invisibility
+	proto native void SetInvisible(bool invisible);
+	
+	//! event
+	void OnInvisibleSet(bool invisible);
+	/**
+	\brief On server, entity's transformation is directly changed to targetTransform, on client entity's transformation is interpolated to targetTransform in time deltaT
+	@param targetTransform
+	@param deltaT, interpolation time between current transformation and target transformation 
+	\note it's not recommended to call this on client as it can break interpolation process if called on server previously
+	*/	
+	proto        void MoveInTime(vector targetTransform[4], float deltaT);
+	
+	/**
+	\brief callback called when entity is moved to world and creating its physics representation
+	*/
+	void OnCreatePhysics();
+	
+	/**
+	\brief Client event on transformation update from network
+	@param pos, world space position
+	@param ypr, world space orientation in radians in form of Yaw/Pitch/Roll
+	@return true if visual cut (won't do any interpolation) should be done after calling this callback
+	*/
+	bool OnNetworkTransformUpdate(out vector pos, out vector ypr);
+};
diff --git a/scripts/3_Game/DayZ/Entities/EntityAI.c b/scripts/3_Game/DayZ/Entities/EntityAI.c
new file mode 100644
index 0000000000000000000000000000000000000000..220b9f31710efb6e127c8eae2bf87daca7826c93
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/EntityAI.c
@@ -0,0 +1,3711 @@
+enum EWetnessLevel
+{
+	DRY,
+	DAMP,
+	WET,
+	SOAKING,
+	DRENCHED
+}
+
+enum SurfaceAnimationBone
+{
+	LeftFrontLimb = 0,
+	RightFrontLimb,
+	LeftBackLimb,
+	RightBackLimb
+}
+
+enum PlantType
+{
+	TREE_HARD		= 1000,
+	TREE_SOFT		= 1001,
+	BUSH_HARD		= 1002,	
+	BUSH_SOFT		= 1003,
+}
+
+enum WeightUpdateType
+{
+	FULL = 0,
+	ADD,
+	REMOVE,
+	RECURSIVE_ADD,
+	RECURSIVE_REMOVE
+}
+
+enum EItemManipulationContext
+{
+	UPDATE, //generic operation
+	ATTACHING,
+	DETACHING,
+}
+
+//! icon visibility, meant to be used in a bitmask
+enum EInventoryIconVisibility
+{
+	ALWAYS = 0,
+	HIDE_VICINITY = 1,
+	//further values yet unused, but nice to have anyway
+	HIDE_PLAYER_CONTAINER = 2,
+	HIDE_HANDS_SLOT = 4
+}
+
+//!EXCLUSIVITY values, restrict attachment combinations
+enum EAttExclusions
+{
+	OCCUPANCY_INVALID = -1,
+	//Legacy relations
+	LEGACY_EYEWEAR_HEADGEAR,
+	LEGACY_EYEWEAR_MASK,
+	LEGACY_HEADSTRAP_HEADGEAR,
+	LEGACY_HEADSTRAP_MASK,
+	LEGACY_HEADGEAR_MASK,
+	LEGACY_HEADGEAR_EYEWEWEAR,
+	LEGACY_HEADGEAR_HEADSTRAP,
+	LEGACY_MASK_HEADGEAR,
+	LEGACY_MASK_EYEWEWEAR,
+	LEGACY_MASK_HEADSTRAP,
+	//
+	EXCLUSION_HEADGEAR_HELMET_0, //full helmet
+	//EXCLUSION_HEADGEAR_HELMET_0_A, //example of another 'vector' of potential conflict, like between helmet and eyewear..otherwise the other non-helmet entities would collide through the 'EXCLUSION_HEADSTRAP_0' value.
+	EXCLUSION_HEADSTRAP_0,
+	EXCLUSION_MASK_0,
+	EXCLUSION_MASK_1,
+	EXCLUSION_MASK_2, //Mostly Gasmasks
+	EXCLUSION_MASK_3, //bandana mask special behavior
+	EXCLUSION_GLASSES_REGULAR_0,
+	EXCLUSION_GLASSES_TIGHT_0,
+	//values to solve the edge-cases with shaving action
+	SHAVING_MASK_ATT_0,
+	SHAVING_HEADGEAR_ATT_0,
+	SHAVING_EYEWEAR_ATT_0,
+}
+
+class DebugSpawnParams
+{
+	Man m_Player;
+
+	static DebugSpawnParams WithPlayer(Man player)
+	{
+		DebugSpawnParams params = new DebugSpawnParams();
+		params.m_Player = player;
+		return params;
+	}
+};
+
+class TSelectableActionInfoArrayEx extends array<ref Param> {}
+typedef Param3<int, int, string> TSelectableActionInfo;
+typedef Param4<int, int, string, int> TSelectableActionInfoWithColor;
+
+class EntityAI extends Entity
+{
+	bool 								m_DeathSyncSent;
+	bool 								m_KilledByHeadshot;
+	bool 								m_PreparedToDelete = false;
+	bool 								m_RefresherViable = false;
+	bool								m_WeightDirty = 1;
+	private ref map<int,ref set<int>>	m_AttachmentExclusionSlotMap; //own masks for different slots <slot,mask>. Kept on instance to better respond to various state changes
+	private ref set<int>				m_AttachmentExclusionMaskGlobal; //additional mask values and simple item values. Independent of slot-specific behavior!
+	private ref set<int> 				m_AttachmentExclusionMaskChildren; //additional mask values and simple item values
+	
+	ref DestructionEffectBase			m_DestructionBehaviourObj;
+	
+	ref KillerData 						m_KillerData;
+	private ref HiddenSelectionsData	m_HiddenSelectionsData;
+	
+	const int DEAD_REPLACE_DELAY		= 2000;
+	const int DELETE_CHECK_DELAY		= 100;
+	
+	ref array<EntityAI> 			m_AttachmentsWithCargo;
+	ref array<EntityAI> 			m_AttachmentsWithAttachments;
+	ref InventoryLocation 			m_OldLocation;
+	
+	protected ref DamageZoneMap 	m_DamageZoneMap;
+	private ref map<int, string> 	m_DamageDisplayNameMap = new map<int, string>; //values are localization keys as strings, use 'Widget.TranslateString' method to get the localized one
+	
+	float							m_Weight;
+	float							m_WeightEx;
+	float 							m_ConfigWeight = ConfigGetInt("weight");
+	protected bool 					m_CanDisplayWeight;
+	private float 					m_LastUpdatedTime;
+	protected float					m_ElapsedSinceLastUpdate;
+	
+	protected UTemperatureSource m_UniversalTemperatureSource;
+	
+	bool m_PendingDelete = false;
+	bool m_Initialized = false;
+	bool m_TransportHitRegistered = false;
+	vector m_TransportHitVelocity;
+	
+	//Called on item attached to this item (EntityAI item, string slot, EntityAI parent)
+	protected ref ScriptInvoker		m_OnItemAttached;
+	//Called on item detached from this item (EntityAI item, string slot, EntityAI parent)
+	protected ref ScriptInvoker		m_OnItemDetached;
+	//Called when an item is added to the cargo of this item (EntityAI item, EntityAI parent)
+	protected ref ScriptInvoker		m_OnItemAddedIntoCargo;
+	//Called when an item is removed from the cargo of this item (EntityAI item, EntityAI parent)
+	protected ref ScriptInvoker		m_OnItemRemovedFromCargo;
+	//Called when an item is moved around in the cargo of this item (EntityAI item, EntityAI parent)
+	protected ref ScriptInvoker		m_OnItemMovedInCargo;
+	//Called when an item is flipped around in cargo (bool flip)
+	protected ref ScriptInvoker		m_OnItemFlipped;
+	//Called when an items view index is changed 
+	protected ref ScriptInvoker		m_OnViewIndexChanged;
+	//Called when an location in this item is reserved (EntityAI item) - cargo
+	protected ref ScriptInvoker		m_OnSetLock;
+	//Called when this item is unreserved (EntityAI item) - cargo
+	protected ref ScriptInvoker		m_OnReleaseLock;
+	//Called when an location in this item is reserved (EntityAI item) - attachment
+	protected ref ScriptInvoker		m_OnAttachmentSetLock;
+	//Called when this item is unreserved (EntityAI item) - attachment
+	protected ref ScriptInvoker		m_OnAttachmentReleaseLock;	
+	//Called when this entity is hit
+	protected ref ScriptInvoker		m_OnHitByInvoker;	
+	//Called when this entity is killed
+	protected ref ScriptInvoker		m_OnKilledInvoker;
+	
+	void EntityAI()
+	{
+		// Set up the Energy Manager
+		string type = GetType();
+		string param_access_energy_sys = "CfgVehicles " + type + " EnergyManager ";
+		bool is_electic_device = GetGame().ConfigIsExisting(param_access_energy_sys);
+
+		if (is_electic_device) // TO DO: Check if this instance is a hologram (advanced placement). If Yes, then do not create Energy Manager component.
+		{
+			CreateComponent(COMP_TYPE_ENERGY_MANAGER);
+			RegisterNetSyncVariableBool("m_EM.m_IsSwichedOn");
+			RegisterNetSyncVariableBool("m_EM.m_CanWork");
+			RegisterNetSyncVariableBool("m_EM.m_IsPlugged");
+			RegisterNetSyncVariableInt("m_EM.m_EnergySourceNetworkIDLow");
+			RegisterNetSyncVariableInt("m_EM.m_EnergySourceNetworkIDHigh");
+			RegisterNetSyncVariableFloat("m_EM.m_Energy");
+		}
+		
+		// Item preview index
+		RegisterNetSyncVariableInt( "m_ViewIndex", 0, 99 );
+		// Refresher signalization
+		RegisterNetSyncVariableBool("m_RefresherViable");
+		
+		m_AttachmentsWithCargo			= new array<EntityAI>();
+		m_AttachmentsWithAttachments	= new array<EntityAI>();
+		m_LastUpdatedTime = 0.0;
+		m_ElapsedSinceLastUpdate = 0.0;
+		
+		m_CanDisplayWeight = ConfigGetBool("displayWeight");
+		
+		InitDamageZoneMapping();
+		InitDamageZoneDisplayNameMapping();
+		
+		m_HiddenSelectionsData = new HiddenSelectionsData( GetType() );
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(DeferredInit,34);
+	}
+	
+	void ~EntityAI()
+	{
+		
+	}
+	
+	void DeferredInit()
+	{
+		m_Initialized = true;
+	}
+	
+	bool IsInitialized()
+	{
+		return m_Initialized;
+	}
+	
+	//! should the item's icon be hidden in any part of the inventory?
+	int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.ALWAYS;
+	}
+
+	private ref ComponentsBank m_ComponentsBank;
+	ComponentEnergyManager m_EM; // This reference is necesarry due to synchronization, since it's impossible to synchronize values from a component :(
+
+	//! CreateComponent
+	Component CreateComponent(int comp_type, string extended_class_name="")
+	{
+		return GetComponent(comp_type, extended_class_name);
+	}
+
+	//! GetComponent
+	Component GetComponent(int comp_type, string extended_class_name="")
+	{
+		if ( m_ComponentsBank == NULL )
+			m_ComponentsBank = new ComponentsBank(this);
+		
+		return m_ComponentsBank.GetComponent(comp_type, extended_class_name);
+	}
+
+	//! DeleteComponent
+	bool DeleteComponent(int comp_type)
+	{
+		return m_ComponentsBank.DeleteComponent(comp_type);
+	}
+	
+	string GetDestructionBehaviour()
+	{
+		return "";
+	}
+	
+	bool IsDestructionBehaviour()
+	{
+		return false;
+	}
+	
+	//! IsComponentExist
+	bool HasComponent(int comp_type)
+	{
+		if ( m_ComponentsBank )
+			return m_ComponentsBank.IsComponentAlreadyExist(comp_type);
+		
+		return false;
+	}
+	
+	//! Calculates if the max lifetime is higher than refresher frequency (i.e. gets kept alive by refresher) 
+	void MaxLifetimeRefreshCalc()
+	{
+		if ( (!GetGame().IsMultiplayer() || GetGame().IsServer()) && GetEconomyProfile() )
+		{
+			float lifetime = GetEconomyProfile().GetLifetime();
+			int frequency = GetCEApi().GetCEGlobalInt("FlagRefreshFrequency");
+			if ( frequency <= 0 )
+			{
+				frequency = GameConstants.REFRESHER_FREQUENCY_DEFAULT;
+			}
+			
+			if ( frequency <= lifetime )
+			{
+				m_RefresherViable = true;
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	bool IsRefresherSignalingViable()
+	{
+		if (IsRuined())
+		{
+			return false;
+		}
+		return m_RefresherViable;
+	}
+	
+	#ifdef DEVELOPER
+	override void SetDebugItem()
+	{
+		super.SetDebugItem();
+		_item = this;
+	}
+	#endif
+	
+	
+	//! Initializes script-side map of damage zones and their components (named selections in models)
+	void InitDamageZoneMapping()
+	{
+		m_DamageZoneMap = new DamageZoneMap;
+		DamageSystem.GetDamageZoneMap(this,m_DamageZoneMap);
+	}
+	
+	//! Initialize map of damage zone display names for more optimized retrieval
+	void InitDamageZoneDisplayNameMapping()
+	{	
+		string path_base;
+		string path;
+		string component_name;
+		
+		if ( IsWeapon() )
+		{
+			path_base = CFG_WEAPONSPATH;
+		}
+		else if ( IsMagazine() )
+		{
+			path_base = CFG_MAGAZINESPATH;
+		}
+		else
+		{
+			path_base = CFG_VEHICLESPATH;
+		}
+		
+		path_base = string.Format( "%1 %2 DamageSystem DamageZones", path_base, GetType() );
+		
+		if ( !GetGame().ConfigIsExisting(path_base) )
+		{
+			component_name = GetDisplayName();
+			GetGame().FormatRawConfigStringKeys(component_name);
+			m_DamageDisplayNameMap.Insert( "".Hash(), component_name );
+		}
+		else
+		{
+			TStringArray zone_names = new TStringArray;
+			GetDamageZones( zone_names );
+			
+			for ( int i = 0; i < zone_names.Count(); i++ )
+			{
+				path = string.Format( "%1 %2 displayName", path_base, zone_names[i] );
+				
+				if (GetGame().ConfigIsExisting(path) && GetGame().ConfigGetTextRaw(path,component_name))
+				{
+					GetGame().FormatRawConfigStringKeys(component_name);
+					m_DamageDisplayNameMap.Insert( zone_names[i].Hash(), component_name );
+				}
+			}
+		}
+	}
+	
+	protected float ConvertNonlethalDamage(float damage, DamageType damageType)
+	{
+		return 0.0;
+	}
+	
+	//! DEPRECATED - for legacy purposes
+	float ConvertNonlethalDamage(float damage)
+	{
+		return 0.0;
+	}
+	
+	DamageZoneMap GetEntityDamageZoneMap()
+	{
+		return m_DamageZoneMap;
+	}
+	
+	map<int, string> GetEntityDamageDisplayNameMap()
+	{
+		return m_DamageDisplayNameMap;
+	}
+	
+	//! 'displayWeight' in item config
+	bool CanDisplayWeight()
+	{
+		return m_CanDisplayWeight;
+	}
+
+	//! Log
+	void Log(string msg, string fnc_name = "n/a")
+	{
+		Debug.Log(msg, "Object", "n/a", fnc_name, this.GetType());
+	}
+
+	//! LogWarning
+	void LogWarning(string msg, string fnc_name = "n/a")
+	{
+		Debug.LogWarning(msg, "Object", "n/a", fnc_name, this.GetType());
+	}
+
+	//! LogError
+	void LogError(string msg, string fnc_name = "n/a")
+	{
+		Debug.LogError(msg, "Object", "n/a", fnc_name, this.GetType());
+	}
+
+	///@{ Skinning
+	bool IsSkinned()
+	{
+		return GetCompBS() && GetCompBS().IsSkinned();
+	}
+
+	void SetAsSkinned()
+	{
+		if (GetCompBS())
+			GetCompBS().SetAsSkinned();
+	}
+
+	bool CanBeSkinnedWith(EntityAI tool)
+	{
+		if ( !IsSkinned()  &&  tool )
+			if ( !IsAlive() )
+				return true;
+		return false;
+	}
+	///@} Skinning
+
+	// ITEM TO ITEM FIRE DISTRIBUTION
+	//! Override this method to return TRUE when this item has or can provide fire. Evaluated on server and client.
+	bool HasFlammableMaterial()
+	{
+		return false;
+	}
+	
+	//! Override this method so it checks whenever this item can be ignited right now or not. Evaluated on Server and Client.
+	bool CanBeIgnitedBy(EntityAI igniter = NULL)
+	{
+		return false;
+	}
+	
+	//! Override this method and check if the given item can be ignited right now by this one. Evaluated on Server and Client.
+	bool CanIgniteItem(EntityAI ignite_target = NULL)
+	{
+		return false;
+	}
+	
+	//! Override this method and make it so it returns whenever this item is on fire right now or not. Evaluated on Server and Client.
+	bool IsIgnited()
+	{
+		if (m_EM)
+			return m_EM.IsWorking();
+		return false;
+	}
+	
+	// Change return value to true if last detached item cause disassemble of item - different handlig some inventory operations
+	bool DisassembleOnLastDetach()
+	{
+		return false;
+	}
+	
+	bool IsBasebuildingKit()
+	{
+		return false;
+	}
+	
+	//! Should return false if you want to disable hologram rotation
+	bool PlacementCanBeRotated()
+	{
+		return true;
+	}
+	
+	//! Executed on Server when this item ignites some target item
+	void OnIgnitedTarget( EntityAI target_item)
+	{
+		
+	}
+	
+	//! Executed on Server when some item ignited this one
+	void OnIgnitedThis( EntityAI fire_source)
+	{
+		
+	}
+	
+	//! Executed on Server when this item failed to ignite target item
+	void OnIgnitedTargetFailed( EntityAI target_item)
+	{
+		
+	}
+	
+	//! Executed on Server when some item failed to ignite this one
+	void OnIgnitedThisFailed( EntityAI fire_source)
+	{
+		
+	}
+	
+	//! Final evaluation just before the target item is actually ignited. Evaluated on Server.
+	bool IsTargetIgnitionSuccessful(EntityAI item_target)
+	{
+		return true;
+	}
+	
+	//! Final evaluation just before this item is actually ignited from fire source. Evaluated on Server.
+	bool IsThisIgnitionSuccessful(EntityAI item_source = NULL)
+	{
+		return true;
+	}
+	// End of fire distribution ^
+	
+	// ADVANCED PLACEMENT EVENTS
+	void OnPlacementStarted(Man player);		
+	void OnHologramBeingPlaced(Man player);
+	void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0");
+	void OnPlacementCancelled(Man player);
+	
+	bool CanBePlaced(Man player, vector position)
+	{
+		return true;
+	}
+
+	//! Method which returns message why object can't be placed at given position
+	string CanBePlacedFailMessage( Man player, vector position )
+	{
+		return "";
+	}
+	
+	//! Do the roof check when placing this?
+	bool DoPlacingHeightCheck()
+	{
+		return false;
+	}
+	
+	//! used as script-side override of distance for specific height checks
+	float HeightCheckOverride()
+	{
+		return 0.0;
+	}
+	
+	//! used as script-side override of start pos for specific height checks
+	float HeightStartCheckOverride()
+	{
+		return 0.0;
+	}
+	
+	//! is this container empty or not, checks both cargo and attachments
+	bool IsEmpty()
+	{
+		return (!HasAnyCargo() && GetInventory().AttachmentCount() == 0);
+	}
+	
+	bool CanBeSplit()
+	{
+		return false;
+	}
+
+	//! is this container empty or not, checks only cargo
+	bool HasAnyCargo()
+	{
+		CargoBase cargo = GetInventory().GetCargo();
+		
+		if(!cargo) return false;//this is not a cargo container
+		
+		if( cargo.GetItemCount() > 0 )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	array<EntityAI> GetAttachmentsWithCargo()
+	{
+		return m_AttachmentsWithCargo;
+	}
+	
+	array<EntityAI> GetAttachmentsWithAttachments()
+	{
+		return m_AttachmentsWithAttachments;
+	}
+
+	int GetAgents() { return 0; }
+	void RemoveAgent(int agent_id);
+	void RemoveAllAgents();
+	void RemoveAllAgentsExcept(int agent_to_keep);
+	void InsertAgent(int agent, float count = 1);
+
+	override bool IsEntityAI() { return true; }
+	
+	bool IsInventoryVisible()
+	{
+		return !( GetParent() || GetHierarchyParent() );
+	}
+	
+	bool IsPlayer()
+	{
+		return false;
+	}
+	
+	bool IsAnimal()
+	{
+		return false;
+	}
+	
+	bool IsZombie()
+	{
+		return false;
+	}
+	
+	bool IsZombieMilitary()
+	{
+		return false;
+	}
+	
+	bool IsIgnoredByConstruction()
+	{
+		return IsDamageDestroyed();
+	}
+	
+	bool CanBeTargetedByAI(EntityAI ai)
+	{
+		if (ai && ai.IsBeingBackstabbed())
+		{
+			return false;
+		}
+		
+		if ( !dBodyIsActive( this ) && !IsMan() )
+			return false;
+		return !IsDamageDestroyed();
+	}
+	
+	bool CanBeBackstabbed()
+	{
+		return false;
+	}
+	
+	/**@brief Delete this object in next frame
+	 * @return \p void
+	 *
+	 * @code
+	 *			ItemBase item = GetGame().GetPlayer().CreateInInventory("GrenadeRGD5");
+	 *			item.Delete();
+	 * @endcode
+	**/
+	override void Delete()
+	{
+		m_PendingDelete = true;
+		super.Delete();
+	}
+	
+	void DeleteOnClient()
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(GetGame().ObjectDeleteOnClient, this);
+	}
+	
+	// delete synchronized between server and client
+	void DeleteSafe()
+	{
+		if (GetHierarchyRootPlayer() == null)
+		{
+			Delete();
+		}
+		else
+		{
+			if (GetGame().IsServer() && GetGame().IsMultiplayer())
+				GetHierarchyRootPlayer().JunctureDeleteItem(this);
+			else
+				GetHierarchyRootPlayer().AddItemToDelete(this);
+		}
+	}
+	
+	//legacy, wrong name, use 'DeleteSafe()' instead
+	void DeleteSave()
+	{		
+		DeleteSafe();
+	}
+	
+	bool IsSetForDeletion()
+	{
+		return IsPreparedToDelete() || m_PendingDelete || ToDelete() || IsPendingDeletion();
+	}
+	
+	override bool CanBeActionTarget()
+	{
+		if (super.CanBeActionTarget())
+		{
+			return !IsSetForDeletion();
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	void SetPrepareToDelete()
+	{
+		m_PreparedToDelete = true;
+	}
+	
+	bool IsPreparedToDelete()
+	{
+		return m_PreparedToDelete;
+	}
+	
+	
+	void CheckForDestroy()
+	{
+		if (IsPrepareToDelete())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(TryDelete, DELETE_CHECK_DELAY, false);
+		}
+	}
+	
+	bool IsPrepareToDelete()
+	{
+		return false;
+	}
+	
+	bool TryDelete()
+	{
+		if (!IsPrepareToDelete())
+		{
+			Debug.Log("TryDelete - not ready for deletion");
+			return false;
+		}
+
+		if (GetGame().HasInventoryJunctureItem(this))
+		{
+			Debug.Log("TryDelete - deferred call");
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(TryDelete, DELETE_CHECK_DELAY, false);
+			return false;
+		}
+
+		OnBeforeTryDelete();
+		Debug.Log("TryDelete - OnBeforeTryDelete end");
+		DeleteSafe();
+		Debug.Log("TryDelete - DeleteSafe end");
+
+		return true;
+	}
+	
+	void OnBeforeTryDelete();
+	
+	//! Returns root of current hierarchy (for example: if this entity is in Backpack on gnd, returns Backpack)
+	proto native EntityAI GetHierarchyRoot();
+
+	//! Returns root of current hierarchy cast to Man
+	proto native Man GetHierarchyRootPlayer();
+	
+	//! Returns direct parent of current entity
+	proto native EntityAI GetHierarchyParent();
+
+	//! Get economy item profile (if assigned, otherwise null)
+	proto native CEItemProfile GetEconomyProfile();
+
+	// !returns the number of levels bellow the hierarchy root this entity is at
+	int GetHierarchyLevel(int lvl = 0)
+	{
+		if (!GetHierarchyParent())
+			return lvl;
+
+		return GetHierarchyParent().GetHierarchyLevel(lvl+1);
+	}
+	
+	void OnInventoryInit()
+	{
+		InitAttachmentExclusionValues();
+	}
+	
+	//! Called upon object creation
+	void EEInit()
+	{
+		if (GetInventory())
+		{
+			GetInventory().EEInit();
+			m_AttachmentsWithCargo.Clear();
+			m_AttachmentsWithAttachments.Clear();
+			for ( int i = 0; i < GetInventory().AttachmentCount(); i++ )
+			{
+				EntityAI attachment = GetInventory().GetAttachmentFromIndex( i );
+				if ( attachment )
+				{
+					if ( attachment.GetInventory().GetCargo() )
+					{
+						m_AttachmentsWithCargo.Insert( attachment );
+					}
+					
+					if ( attachment.GetInventory().GetAttachmentSlotsCount() > 0 )
+					{
+						m_AttachmentsWithAttachments.Insert( attachment );
+					}
+				}
+			}
+		}
+		
+		MaxLifetimeRefreshCalc();
+	}
+	
+	//! Called right before object deleting
+	void EEDelete(EntityAI parent)
+	{
+		m_PendingDelete = true;
+		GetInventory().EEDelete(parent);
+		
+		if (m_EM)
+			m_EM.OnDeviceDestroyed();
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType) 
+	{
+		super.OnExplosionEffects(source, directHit, componentIndex, surface, pos, surfNormal, energyFactor, explosionFactor, isWater, ammoType);
+		#ifndef SERVER
+		g_Game.GetWorld().AddEnvShootingSource(pos, 1.0);
+		#endif
+		if (m_DestructionBehaviourObj && m_DestructionBehaviourObj.HasExplosionDamage())
+		{
+			m_DestructionBehaviourObj.OnExplosionEffects(source, directHit, componentIndex, surface, pos, surfNormal, energyFactor, explosionFactor, isWater, ammoType);
+		}
+	}
+	
+	
+	void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner) { }
+	
+	void OnItemAttachmentSlotChanged (notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc) {}
+	
+	void EEItemLocationChanged (notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		EntityAI old_owner = oldLoc.GetParent();
+		EntityAI new_owner = newLoc.GetParent();
+		OnItemLocationChanged(old_owner, new_owner);
+		
+		if (oldLoc.GetType() == InventoryLocationType.ATTACHMENT && newLoc.GetType() == InventoryLocationType.ATTACHMENT)
+		{
+			OnItemAttachmentSlotChanged(oldLoc,newLoc);
+		}
+		
+		if (oldLoc.GetType() == InventoryLocationType.ATTACHMENT)
+		{
+			if (old_owner)
+				OnWasDetached(old_owner, oldLoc.GetSlot());
+			else
+				Error("EntityAI::EEItemLocationChanged - detached, but old_owner is null");
+		}
+		
+		if (newLoc.GetType() == InventoryLocationType.ATTACHMENT)
+		{
+			if (new_owner)
+				OnWasAttached(newLoc.GetParent(), newLoc.GetSlot());
+			else
+				Error("EntityAI::EEItemLocationChanged - attached, but new_owner is null");
+		}
+	}
+
+	//! Called from 'IEntity.AddChild'
+	void EEParentedTo(EntityAI parent)
+	{
+	}
+
+	//! Called from 'IEntity.RemoveChild' or 'IEntity.AddChild' when hierarchy changes
+	void EEParentedFrom(EntityAI parent)
+	{
+	}
+	
+	void EEInventoryIn (Man newParentMan, EntityAI diz, EntityAI newParent)
+	{
+	}
+	void EEInventoryOut (Man oldParentMan, EntityAI diz, EntityAI newParent)
+	{
+		m_LastUpdatedTime = 0.0;
+		
+		if (GetInventory() && newParent == null)
+		{
+			GetInventory().ResetFlipCargo();
+		}
+	}
+
+	void EEAmmoChanged()
+	{
+		SetWeightDirty();
+	}
+
+	void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		// Notify potential parent that this item was ruined
+		EntityAI parent = GetHierarchyParent();
+		
+		if (newLevel == GameConstants.STATE_RUINED)
+		{
+			if (parent)
+			{
+				parent.OnAttachmentRuined(this);
+			}
+			if (!zone)
+			{
+				OnDamageDestroyed(oldLevel);
+			}
+			AttemptDestructionBehaviour(oldLevel,newLevel, zone);
+		}
+	}
+	
+	//! Called when the health gets to the min value, 'oldLevel' is previous health level, 'oldLevel' -1 means this entity was just spawned
+	void OnDamageDestroyed(int oldLevel);
+	
+	void AttemptDestructionBehaviour(int oldLevel, int newLevel, string zone) 
+	{
+		if (IsDestructionBehaviour() && GetDestructionBehaviour())
+		{
+			typename destType = GetDestructionBehaviour().ToType();
+			
+			if (destType)
+			{
+				if (!m_DestructionBehaviourObj)
+				{
+					m_DestructionBehaviourObj = DestructionEffectBase.Cast(destType.Spawn());
+				}
+				
+				if (m_DestructionBehaviourObj)
+				{
+					m_DestructionBehaviourObj.OnHealthLevelChanged(this, oldLevel, newLevel, zone);
+				}
+			}
+			else
+			{
+				ErrorEx("Incorrect destruction behaviour type, make sure the class returned in 'GetDestructionBehaviour()' is a valid type inheriting from 'DestructionEffectBase'");
+			}
+		}
+	}
+	
+	
+	void SetTakeable(bool pState);
+	
+	//! called on server when the entity is killed
+	void EEKilled(Object killer)
+	{
+		if (m_OnKilledInvoker)
+			m_OnKilledInvoker.Invoke(this, killer);
+		//analytics
+		GetGame().GetAnalyticsServer().OnEntityKilled( killer, this );
+		
+		if( ReplaceOnDeath() )
+			GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( DeathUpdate, DEAD_REPLACE_DELAY, false);
+	}
+	
+	bool ReplaceOnDeath()
+	{
+		return false;
+	}
+	
+	string GetDeadItemName()
+	{
+		return "";
+	}
+	
+	bool KeepHealthOnReplace()
+	{
+		return false;
+	}
+	
+	void DeathUpdate()
+	{
+		EntityAI dead_entity = EntityAI.Cast( GetGame().CreateObjectEx( GetDeadItemName(), GetPosition(), ECE_OBJECT_SWAP, RF_ORIGINAL ) );
+		dead_entity.SetOrientation(GetOrientation());
+		if ( KeepHealthOnReplace() )
+			dead_entity.SetHealth(GetHealth());
+		this.Delete();
+	}
+	
+	//! Called when some attachment of this parent is ruined. Called on server and client side.
+	void OnAttachmentRuined(EntityAI attachment)
+	{
+		// ...
+	}
+	
+	void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		if (m_OnHitByInvoker)
+			m_OnHitByInvoker.Invoke(this, damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		#ifdef DEVELOPER
+		//Print("EEHitBy: " + this + "; damageResult:"+ damageResult.GetDamage("","") +"; damageType: "+ damageType +"; source: "+ source +"; component: "+ component +"; dmgZone: "+ dmgZone +"; ammo: "+ ammo +"; modelPos: "+ modelPos);
+		#endif
+	}
+	
+	// called only on the client who caused the hit
+	void EEHitByRemote(int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos)
+	{
+		
+	}
+	
+	// !Called on PARENT when a child is attached to it.
+	void EEItemAttached(EntityAI item, string slot_name)
+	{
+		int slotId = InventorySlots.GetSlotIdFromString(slot_name);
+		PropagateExclusionValueRecursive(item.GetAttachmentExclusionMaskAll(slotId),slotId); //Performed from parent to avoid event order issues on swap
+		SetWeightDirty();
+
+		if ( m_ComponentsBank != NULL )
+		{
+			for ( int comp_key = 0; comp_key < COMP_TYPE_COUNT; ++comp_key )
+			{
+				if ( m_ComponentsBank.IsComponentAlreadyExist(comp_key) )
+				{
+					m_ComponentsBank.GetComponent(comp_key).Event_OnItemAttached(item, slot_name);
+				}
+			}
+		}		
+		
+		// Energy Manager
+		if ( m_EM && item.GetCompEM())
+			m_EM.OnAttachmentAdded(item);
+		
+		if ( item.GetInventory().GetCargo() )
+			m_AttachmentsWithCargo.Insert( item );
+		
+		if ( item.GetInventory().GetAttachmentSlotsCount() > 0 )
+			m_AttachmentsWithAttachments.Insert( item );
+		
+		if ( m_OnItemAttached )
+			m_OnItemAttached.Invoke( item, slot_name, this );
+	}
+	
+	void SwitchItemSelectionTexture(EntityAI item, string slot_name);
+	void SwitchItemSelectionTextureEx(EItemManipulationContext context, Param par = null);
+	
+	// !Called on PARENT when a child is detached from it.
+	void EEItemDetached(EntityAI item, string slot_name)
+	{
+		int slotId = InventorySlots.GetSlotIdFromString(slot_name);
+		ClearExclusionValueRecursive(item.GetAttachmentExclusionMaskAll(slotId),slotId); //Performed from parent to avoid event order issues on swap
+		SetWeightDirty();
+		
+		if ( m_ComponentsBank != NULL )
+		{
+			for ( int comp_key = 0; comp_key < COMP_TYPE_COUNT; ++comp_key )
+			{
+				if ( m_ComponentsBank.IsComponentAlreadyExist(comp_key) )
+				{
+					m_ComponentsBank.GetComponent(comp_key).Event_OnItemDetached(item, slot_name);
+				}
+			}
+		}
+		
+		// Energy Manager
+		if (m_EM && item.GetCompEM())
+			m_EM.OnAttachmentRemoved(item);
+		
+		if ( m_AttachmentsWithCargo.Find( item ) > -1 )
+			m_AttachmentsWithCargo.RemoveItem( item );
+		
+		if ( m_AttachmentsWithAttachments.Find( item ) > -1 )
+			m_AttachmentsWithAttachments.RemoveItem( item );
+		
+				
+		if ( m_OnItemDetached )
+			m_OnItemDetached.Invoke( item, slot_name, this );
+	}
+
+	void EECargoIn(EntityAI item)
+	{
+		SetWeightDirty();
+		
+		if( m_OnItemAddedIntoCargo )
+			m_OnItemAddedIntoCargo.Invoke( item, this );
+			
+		item.OnMovedInsideCargo(this);
+	}
+
+	void EECargoOut(EntityAI item)
+	{
+		SetWeightDirty();
+		
+		if( m_OnItemRemovedFromCargo )
+			m_OnItemRemovedFromCargo.Invoke( item, this );
+			
+		item.OnRemovedFromCargo(this);
+	}
+
+	void EECargoMove(EntityAI item)
+	{
+		if( m_OnItemMovedInCargo )
+			m_OnItemMovedInCargo.Invoke( item, this );
+		item.OnMovedWithinCargo(this);
+	}
+	
+	ScriptInvoker GetOnItemAttached()
+	{
+		if( !m_OnItemAttached )
+			m_OnItemAttached = new ScriptInvoker;
+		return m_OnItemAttached;
+	}
+	
+	ScriptInvoker GetOnItemDetached()
+	{
+		if( !m_OnItemDetached )
+			m_OnItemDetached = new ScriptInvoker;
+		return m_OnItemDetached;
+	}
+	
+	ScriptInvoker GetOnItemAddedIntoCargo()
+	{
+		if( !m_OnItemAddedIntoCargo )
+			m_OnItemAddedIntoCargo = new ScriptInvoker;
+		return m_OnItemAddedIntoCargo;
+	}
+	
+	ScriptInvoker GetOnItemRemovedFromCargo()
+	{
+		if( !m_OnItemRemovedFromCargo )
+			m_OnItemRemovedFromCargo = new ScriptInvoker;
+		return m_OnItemRemovedFromCargo;
+	}
+	
+	ScriptInvoker GetOnItemMovedInCargo()
+	{
+		if( !m_OnItemMovedInCargo )
+			m_OnItemMovedInCargo = new ScriptInvoker;
+		return m_OnItemMovedInCargo;
+	}
+	
+	ScriptInvoker GetOnItemFlipped()
+	{
+		if( !m_OnItemFlipped )
+			m_OnItemFlipped = new ScriptInvoker;
+		return m_OnItemFlipped;
+	}
+	
+	ScriptInvoker GetOnViewIndexChanged()
+	{
+		if( !m_OnViewIndexChanged )
+			m_OnViewIndexChanged = new ScriptInvoker;
+		return m_OnViewIndexChanged;
+	}
+	
+	ScriptInvoker GetOnSetLock()
+	{
+		if( !m_OnSetLock )
+			m_OnSetLock = new ScriptInvoker;
+		return m_OnSetLock;
+	}
+	
+	ScriptInvoker GetOnReleaseLock()
+	{
+		if( !m_OnReleaseLock )
+			m_OnReleaseLock = new ScriptInvoker;
+		return m_OnReleaseLock;
+	}
+	
+	ScriptInvoker GetOnAttachmentSetLock()
+	{
+		if( !m_OnAttachmentSetLock )
+			m_OnAttachmentSetLock = new ScriptInvoker;
+		return m_OnAttachmentSetLock;
+	}
+	
+	ScriptInvoker GetOnAttachmentReleaseLock()
+	{
+		if( !m_OnAttachmentReleaseLock )
+			m_OnAttachmentReleaseLock = new ScriptInvoker;
+		return m_OnAttachmentReleaseLock;
+	}
+	
+	ScriptInvoker GetOnHitByInvoker()
+	{
+		if ( !m_OnHitByInvoker )
+			m_OnHitByInvoker = new ScriptInvoker;
+		return m_OnHitByInvoker;
+	}
+	
+	ScriptInvoker GetOnKilledInvoker()
+	{
+		if ( !m_OnKilledInvoker )
+			m_OnKilledInvoker = new ScriptInvoker;
+		return m_OnKilledInvoker;
+	}
+	
+	
+	//! Called when this item enters cargo of some container
+	void OnMovedInsideCargo(EntityAI container)
+	{
+		if (m_EM)
+			m_EM.HandleMoveInsideCargo(container);
+	}
+	
+	//! Called when this item exits cargo of some container
+	void OnRemovedFromCargo(EntityAI container)
+	{
+		
+	}
+	
+	//! Called when this item moves within cargo of some container
+	void OnMovedWithinCargo(EntityAI container)
+	{
+	
+	}
+	
+	//! Called when entity is part of "connected system" and being restored after load
+	void EEOnAfterLoad()
+	{
+		// ENERGY MANAGER
+		// Restore connections between devices which were connected before server restart
+		if ( m_EM && m_EM.GetRestorePlugState() )
+		{
+			int b1 = m_EM.GetEnergySourceStorageIDb1();
+			int b2 = m_EM.GetEnergySourceStorageIDb2();
+			int b3 = m_EM.GetEnergySourceStorageIDb3();
+			int b4 = m_EM.GetEnergySourceStorageIDb4();
+
+			// get pointer to EntityAI based on this ID
+			EntityAI potential_energy_source = GetGame().GetEntityByPersitentID(b1, b2, b3, b4); // This function is available only in this event!
+			
+			// IMPORTANT!
+			// Object IDs acquired here become INVALID when electric devices are transfered to another server while in plugged state (like Flashlight plugged into its attachment 9V battery)
+			// To avoid issues, these items must be excluded from this system of restoring plug state so they don't unintentionally plug to incorrect devices through these invalid IDs.
+			// Therefore their plug state is being restored withing the EEItemAttached() event while being excluded by the following 'if' conditions...
+			
+			bool is_attachment = false;
+			
+			if (potential_energy_source)
+				is_attachment = GetInventory().HasAttachment(potential_energy_source);
+			
+			if ( !is_attachment	&&	potential_energy_source )
+				is_attachment = potential_energy_source.GetInventory().HasAttachment(this);
+			
+			if ( potential_energy_source && potential_energy_source.GetCompEM() /*&& potential_energy_source.HasEnergyManager()*/ && !is_attachment )
+				m_EM.PlugThisInto(potential_energy_source); // restore connection
+		}
+	}
+	
+	//! Called when entity is being created as new by CE/ Debug
+	void EEOnCECreate()
+	{
+	}
+
+	//! Called when entity is being loaded from DB or Storage (after all children loaded)
+	void AfterStoreLoad()
+	{
+	}
+	
+	//! Called when an item fails to get loaded into the inventory of an entity and gets dropped
+	void OnBinLoadItemsDropped()
+	{
+		if (GetHierarchyRootPlayer())
+			GetHierarchyRootPlayer().SetProcessUIWarning(true);
+	}
+	
+	//! Sets all animation values to 1, making them INVISIBLE if they are configured in models.cfg in such way. These selections must also be defined in the entity's config class in 'AnimationSources'. 
+	void HideAllSelections()
+	{
+		string cfg_path = "cfgVehicles " + GetType() + " AnimationSources";
+		
+		if ( GetGame().ConfigIsExisting(cfg_path) )
+		{
+			int	selections = GetGame().ConfigGetChildrenCount(cfg_path);
+			
+			for (int i = 0; i < selections; i++)
+			{
+				string selection_name;
+				GetGame().ConfigGetChildName(cfg_path, i, selection_name);
+				HideSelection(selection_name);
+			}
+		}
+	}
+	
+	//! Sets all animation values to 0, making them VISIBLE if they are configured in models.cfg in such way. These selections must also be defined in the entity's config class in 'AnimationSources'. 
+	void ShowAllSelections()
+	{
+		string cfg_path = "cfgVehicles " + GetType() + " AnimationSources";
+		
+		if ( GetGame().ConfigIsExisting(cfg_path) )
+		{
+			int	selections = GetGame().ConfigGetChildrenCount(cfg_path);
+			
+			for (int i = 0; i < selections; i++)
+			{
+				string selection_name;
+				GetGame().ConfigGetChildName(cfg_path, i, selection_name);
+				ShowSelection(selection_name);
+			}
+		}
+	}
+	
+	/**@fn		CanReceiveAttachment
+	 * @brief calls this->CanReceiveAttachment(attachment)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, attachment, "CanReceiveAttachment");
+	 **/
+	bool CanReceiveAttachment (EntityAI attachment, int slotId)
+	{
+		//generic occupancy check
+		EntityAI currentAtt = GetInventory().FindAttachment(slotId);
+		bool hasInternalConflict = attachment.HasInternalExclusionConflicts(slotId);
+		if (currentAtt) //probably a swap or same-type swap
+		{
+			set<int> diff = attachment.GetAttachmentExclusionMaskAll(slotId);
+			diff.RemoveItems(currentAtt.GetAttachmentExclusionMaskAll(slotId));
+			if (diff.Count() == 0)
+			{
+				return !hasInternalConflict;
+			}
+			else
+			{
+				return !hasInternalConflict && !IsExclusionFlagPresentRecursive(diff,slotId);
+			}
+		}
+		return !hasInternalConflict && !IsExclusionFlagPresentRecursive(attachment.GetAttachmentExclusionMaskAll(slotId),slotId);
+	}
+	
+	/**@fn		CanLoadAsAttachment
+	 * @brief	calls this->CanLoadAsAttachment(attachment), is called on server start when loading in the storage
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, attachment, "CanLoadAsAttachment");
+	 **/
+	bool CanLoadAttachment(EntityAI attachment)
+	{
+		return true;
+	}
+
+	/**@fn		CanPutAsAttachment
+	 * @brief	calls this->CanPutAsAttachment(parent)
+	 * @param[in] parent	\p	target entity this is trying to attach to
+	 * @return	true if action allowed
+	 *
+	 * @note: engine code is scriptConditionExecute(this, parent, "CanPutAsAttachment")
+	 **/
+	bool CanPutAsAttachment (EntityAI parent)
+	{
+		return !IsHologram();
+	}
+
+	//If return true, item can be attached even from parent to this. Item will be switched during proccess. (only hands)
+	bool CanSwitchDuringAttach(EntityAI parent)
+	{
+		return false;
+	}
+	/**@fn		CanReleaseAttachment
+	 * @brief calls this->CanReleaseAttachment(attachment)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, attachment, "CanReleaseAttachment");
+	 **/
+	bool CanReleaseAttachment (EntityAI attachment)
+	{
+		if( attachment && attachment.GetInventory() && GetInventory() )
+		{
+			InventoryLocation il = new InventoryLocation();
+			attachment.GetInventory().GetCurrentInventoryLocation( il );
+			if( il.IsValid() )
+			{
+				int slot = il.GetSlot();
+				return !GetInventory().GetSlotLock( slot );
+			}
+		}
+		return true;
+	}
+	/**@fn		CanDetachAttachment
+	 * @brief	calls this->CanDetachAttachment(parent)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, parent, "CanDetachAttachment");
+	 **/
+	bool CanDetachAttachment (EntityAI parent)
+	{
+		return true;
+	}
+	
+	bool CanBeFSwaped()
+	{
+		return true;
+	}
+	
+	bool CanCombineAttachment(notnull EntityAI e, int slot, bool stack_max_limit = false)
+	{
+		EntityAI att = GetInventory().FindAttachment(slot);
+		if(att)
+			return att.CanBeCombined(e, true, stack_max_limit);
+		return false;
+	}	
+	
+	bool CanBeCombined(EntityAI other_item, bool reservation_check = true, bool stack_max_limit = false )
+	{
+		return false;
+	}
+	
+	void CombineItemsClient(EntityAI entity2, bool use_stack_max = false )
+	{}
+	
+	/**@fn		CanReceiveItemIntoCargo
+	 * @brief	calls this->CanReceiveItemIntoCargo(item)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, item, "CanReceiveItemIntoCargo");
+	 **/
+	bool CanReceiveItemIntoCargo(EntityAI item)
+	{
+		if (GetInventory() && GetInventory().GetCargo())
+			return GetInventory().GetCargo().CanReceiveItemIntoCargo(item));
+		
+		return true;
+	}
+	
+	/**@fn		CanLoadItemIntoCargo
+	 * @brief	calls this->CanLoadItemIntoCargo(item), is called on server start when loading in the storage
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, item, "CanLoadItemIntoCargo");
+	 **/
+	bool CanLoadItemIntoCargo(EntityAI item)
+	{
+		return true;
+	}
+	
+	/**@fn		CanPutInCargo
+	 * @brief	calls this->CanPutInCargo(parent)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, parent, "CanPutInCargo");
+	 **/
+	bool CanPutInCargo (EntityAI parent)
+	{
+		return !IsHologram();
+	}
+
+	/**@fn		CanSwapItemInCargo
+	 * @brief	calls this->CanSwapItemInCargo(child_entity, new_entity)
+	 * @return	true if action allowed
+	 *
+	 * @note: return ScriptConditionExecute(GetOwner(), child_entity, "CanSwapItemInCargo", new_entity);
+	 **/
+	bool CanSwapItemInCargo (EntityAI child_entity, EntityAI new_entity)
+	{
+		if (GetInventory() && GetInventory().GetCargo())
+			return GetInventory().GetCargo().CanSwapItemInCargo(child_entity, new_entity));
+		
+		return true;
+	}
+
+	/**@fn		CanReleaseCargo
+	 * @brief	calls this->CanReleaseCargo(cargo)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, cargo, "CanReleaseCargo");
+	 **/
+	bool CanReleaseCargo (EntityAI cargo)
+	{
+		return true;
+	}
+
+	/**@fn		CanRemoveFromCargo
+	 * @brief	calls this->CanRemoveFromCargo(parent)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, parent, "CanRemoveFromCargo");
+	 **/
+	bool CanRemoveFromCargo (EntityAI parent)
+	{
+		return true;
+	}
+	
+	/**@fn		CanReceiveItemIntoInventory
+	 * @brief calls this->CanReceiveItemIntoInventory(item)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, , "CanReceiveItemIntoInventory");
+	 **/
+	/*bool CanReceiveItemIntoInventory (EntityAI entity_ai)
+	{
+		return true;
+	}*/
+
+	/**@fn		CanPutInInventory
+	 * @brief calls this->CanPutInInventory(parent)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, parent, "ConditionIntoInventory");
+	 **/
+	/*bool CanPutInInventory (EntityAI parent)
+	{
+		return true;
+	}*/
+
+	/**@fn		CanReceiveItemIntoHands
+	 * @brief	calls this->CanReceiveItemIntoHands(item_to_hands)
+	 * @return	true if action allowed
+	 *
+	 * @note: scriptConditionExecute(this, item_to_hands, "CanReceiveItemIntoHands");
+	 **/
+	bool CanReceiveItemIntoHands (EntityAI item_to_hands)
+	{
+		return true;
+	}
+	
+	bool IsBeingPlaced()
+	{
+		return false;
+	}
+	
+	override bool IsHologram()
+	{
+		return false;
+	}
+	
+	bool CanSaveItemInHands (EntityAI item_in_hands)
+	{
+		return true;
+	}
+
+	/**@fn		CanPutIntoHands
+	 * @brief calls this->CanPutIntoHands(parent)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, parent, "CanPutIntoHands");
+	 **/
+	bool CanPutIntoHands (EntityAI parent)
+	{
+		return !IsHologram();
+	}
+
+	/**@fn		CanReleaseFromHands
+	 * @brief calls this->CanReleaseFromHands(handheld)
+	 * @return	true if action allowed
+	 *
+	 * @note: scriptConditionExecute(this, handheld, "CanReleaseFromHands");
+	 **/
+	bool CanReleaseFromHands (EntityAI handheld)
+	{
+		return true;
+	}
+
+	/**@fn		CanRemoveFromHands
+	 * @brief	calls this->CanRemoveFromHands(parent)
+	 * @return	true if action allowed
+	 *
+	 * @note: return scriptConditionExecute(this, parent, "CanRemoveFromHands");
+	 **/
+	bool CanRemoveFromHands (EntityAI parent)
+	{
+		return true;
+	}
+
+	/**@fn		CanDisplayAttachmentSlot
+	 * @param	slot_name->name of the attachment slot that will or won't be displayed
+	 * @return	true if attachment icon can be displayed in UI (inventory)
+	 **/	
+	bool CanDisplayAttachmentSlot( string slot_name )
+	{
+		Debug.LogWarning("Obsolete function - use CanDisplayAttachmentSlot with slot id parameter");
+		return InventorySlots.GetShowForSlotId(InventorySlots.GetSlotIdFromString(slot_name));
+	}
+	
+	/**@fn		CanDisplayAttachmentSlot
+	 * @param	slot_id->id of the attachment slot that will or won't be displayed
+	 * @return	true if attachment icon can be displayed in UI (inventory)
+	 **/	
+	bool CanDisplayAttachmentSlot( int slot_id )
+	{
+		return InventorySlots.GetShowForSlotId(slot_id);
+	}
+	
+	/**@fn		CanDisplayAnyAttachmentSlot
+	 * @return	true if any attachment slot can be shown
+	 **/	
+	bool CanDisplayAnyAttachmentSlot()
+	{
+		int count = GetInventory().GetAttachmentSlotsCount();
+		int slotID;
+		for (int i = 0; i < count; i++)
+		{
+			slotID = GetInventory().GetAttachmentSlotId(i);
+			if (CanDisplayAttachmentSlot(slotID))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	/**@fn		CanDisplayAttachmentCategory
+	 * @param	category_name->name of the attachment category that will or won't be displayed
+	 * @return	true if attachment icon can be displayed in UI (inventory)
+	 **/		
+	bool CanDisplayAttachmentCategory( string category_name )
+	{
+		return true;
+	}
+	
+	/**@fn		CanDisplayCargo
+	 * @return	true if cargo can be displayed in UI (inventory)
+	 **/		
+	bool CanDisplayCargo()
+	{
+		return GetInventory().GetCargo() != null;
+	}
+	
+	/**@fn		CanAssignToQuickbar
+	 * @return	true if item can be assigned to quickbar safely
+	 **/		
+	bool CanAssignToQuickbar()
+	{
+		return true;
+	}
+	
+	/**@fn		CanAssignAttachmentsToQuickbar
+	 * @return	true if attached item can be assigned to quickbar safely
+	 **/
+	bool CanAssignAttachmentsToQuickbar()
+	{
+		return true;
+	}
+	
+	/**@fn		IgnoreOutOfReachCondition
+	 * @return	if true, attachment condition for out of reach (inventory) will be ignored
+	 **/		
+	bool IgnoreOutOfReachCondition()
+	{
+		return GetHierarchyRootPlayer() == GetGame().GetPlayer();
+	}	
+
+	// !Called on CHILD when it's attached to parent.
+	void OnWasAttached( EntityAI parent, int slot_id );
+	
+	// !Called on CHILD when it's detached from parent.
+	void OnWasDetached( EntityAI parent, int slot_id )
+	{
+		if (!IsFlagSet(EntityFlags.VISIBLE))
+		{
+			SetInvisible(false);
+			OnInvisibleSet(false);
+			SetInvisibleRecursive(false,parent);
+		}
+	}
+	
+	void OnCargoChanged() { }
+	
+	bool IsTakeable()
+	{
+		return false;
+	}
+	
+	proto native GameInventory GetInventory();
+	proto native void CreateAndInitInventory();
+	proto native void DestroyInventory();
+		
+	int GetSlotsCountCorrect()
+	{
+		if (GetInventory())
+			return GetInventory().GetAttachmentSlotsCount();
+		else
+			return -1;
+	}
+
+	EntityAI FindAttachmentBySlotName(string slot_name)
+	{
+		if ( GetGame() )
+		{
+			int slot_id = InventorySlots.GetSlotIdFromString(slot_name);
+			if (slot_id != InventorySlots.INVALID)
+				return GetInventory().FindAttachment(slot_id); 
+		}
+		return null;
+	}
+
+	/**@fn		IsLockedInSlot
+	 * @return	true if entity is locked in attachment slot
+	 **/	
+	bool IsLockedInSlot()
+	{
+		EntityAI parent = GetHierarchyParent();
+		if ( parent )
+		{
+			InventoryLocation inventory_location = new InventoryLocation();
+			GetInventory().GetCurrentInventoryLocation( inventory_location );
+			
+			return parent.GetInventory().GetSlotLock( inventory_location.GetSlot() );
+		}
+		
+		return false;
+	}
+	
+	/**
+	\brief Put item anywhere into this entity (as attachment or into cargo, recursively)
+	*/
+	bool PredictiveTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityToInventory(InventoryMode.JUNCTURE, flags, item);
+		else
+			return GetInventory().TakeEntityToInventory(InventoryMode.PREDICTIVE, flags, item);
+	}
+	bool LocalTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToInventory(InventoryMode.LOCAL, flags, item);
+	}
+	bool ServerTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToInventory(InventoryMode.SERVER, flags, item);
+	}
+	bool PredictiveTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityToTargetInventory(InventoryMode.JUNCTURE, target, flags, item);
+		else
+			return GetInventory().TakeEntityToTargetInventory(InventoryMode.PREDICTIVE, target, flags, item);
+	}
+	bool LocalTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToTargetInventory(InventoryMode.LOCAL, target, flags, item);
+	}
+	bool ServerTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToTargetInventory(InventoryMode.SERVER, target, flags, item);
+	}
+	/**
+	\brief Put item into into cargo
+	*/
+	bool PredictiveTakeEntityToCargo (notnull EntityAI item)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityToCargo(InventoryMode.JUNCTURE, item);
+		else
+			return GetInventory().TakeEntityToCargo(InventoryMode.PREDICTIVE, item);
+	}
+	bool LocalTakeEntityToCargo (notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToCargo(InventoryMode.LOCAL, item);
+	}
+	bool ServerTakeEntityToCargo (notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToCargo(InventoryMode.SERVER, item);
+	}
+
+	bool PredictiveTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityToTargetCargo(InventoryMode.JUNCTURE, target, item);
+		else
+			return GetInventory().TakeEntityToTargetCargo(InventoryMode.PREDICTIVE, target, item);
+	}
+	bool LocalTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToTargetCargo(InventoryMode.LOCAL, target, item);
+	}
+	bool ServerTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityToTargetCargo(InventoryMode.SERVER, target, item);
+	}
+	/**
+	\brief Put item into into cargo on specific cargo location
+	*/
+	bool PredictiveTakeEntityToCargoEx (notnull EntityAI item, int idx, int row, int col)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityToCargoEx(InventoryMode.JUNCTURE, item, idx, row, col);
+		else
+			return GetInventory().TakeEntityToCargoEx(InventoryMode.PREDICTIVE, item, idx, row, col);
+	}
+	bool LocalTakeEntityToCargoEx (notnull EntityAI item, int idx, int row, int col)
+	{
+		return GetInventory().TakeEntityToCargoEx(InventoryMode.LOCAL, item, idx, row, col);
+	}
+
+	bool PredictiveTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityToTargetCargoEx(InventoryMode.JUNCTURE, cargo, item, row, col);
+		else
+			return GetInventory().TakeEntityToTargetCargoEx(InventoryMode.PREDICTIVE, cargo, item, row, col);
+	}
+	bool LocalTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		return GetInventory().TakeEntityToTargetCargoEx(InventoryMode.LOCAL, cargo, item, row, col);
+	}
+	bool ServerTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		return GetInventory().TakeEntityToTargetCargoEx(InventoryMode.SERVER, cargo, item, row, col);
+	}
+	/**
+	\brief Returns if item can be added as attachment on specific slot. Note that slot index IS NOT slot ID! Slot ID is defined in DZ/data/config.cpp
+	*/
+	bool PredictiveTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityAsAttachmentEx(InventoryMode.JUNCTURE, item, slot);
+		else
+			return GetInventory().TakeEntityAsAttachmentEx(InventoryMode.PREDICTIVE, item, slot);
+	}
+	bool LocalTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		return GetInventory().TakeEntityAsAttachmentEx(InventoryMode.LOCAL, item, slot);
+	}
+	bool ServerTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		return GetInventory().TakeEntityAsAttachmentEx(InventoryMode.SERVER, item, slot);
+	}
+
+	bool PredictiveTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityAsTargetAttachmentEx(InventoryMode.JUNCTURE, target, item, slot);
+		else
+			return GetInventory().TakeEntityAsTargetAttachmentEx(InventoryMode.PREDICTIVE, target, item, slot);
+	}
+	bool LocalTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		return GetInventory().TakeEntityAsTargetAttachmentEx(InventoryMode.LOCAL, target, item, slot);
+	}
+	bool ServerTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		return GetInventory().TakeEntityAsTargetAttachmentEx(InventoryMode.SERVER, target, item, slot);
+	}
+
+	bool PredictiveTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeEntityAsTargetAttachment(InventoryMode.JUNCTURE, target, item);
+		else
+			return GetInventory().TakeEntityAsTargetAttachment(InventoryMode.PREDICTIVE, target, item);
+	}
+	bool LocalTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityAsTargetAttachment(InventoryMode.LOCAL, target, item);
+	}
+	bool ServerTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityAsTargetAttachment(InventoryMode.SERVER, target, item);
+	}
+
+	bool PredictiveTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if ( GetGame().IsMultiplayer() )
+			return GetInventory().TakeToDst(InventoryMode.JUNCTURE, src, dst);
+		else
+			return GetInventory().TakeToDst(InventoryMode.PREDICTIVE, src, dst);
+	}
+	bool LocalTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		return GetInventory().TakeToDst(InventoryMode.LOCAL, src, dst);
+	}
+	bool ServerTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		return GetInventory().TakeToDst(InventoryMode.SERVER, src, dst);
+	}
+
+	/**
+	\brief Put item into as attachment
+	*/
+	bool PredictiveTakeEntityAsAttachment(notnull EntityAI item)
+	{
+		if (GetGame().IsMultiplayer())
+			return GetInventory().TakeEntityAsAttachment(InventoryMode.JUNCTURE, item);
+		else
+			return GetInventory().TakeEntityAsAttachment(InventoryMode.PREDICTIVE, item);
+	}
+	bool LocalTakeEntityAsAttachment (notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityAsAttachment(InventoryMode.LOCAL, item);
+	}
+	bool ServerTakeEntityAsAttachment (notnull EntityAI item)
+	{
+		return GetInventory().TakeEntityAsAttachment(InventoryMode.SERVER, item);
+	}
+
+	bool PredictiveDropEntity(notnull EntityAI item)
+	{
+		return false;
+	}
+	
+	bool LocalDropEntity(notnull EntityAI item)
+	{
+		return false;
+	}
+	
+	bool ServerDropEntity(notnull EntityAI item)
+	{
+		return false;
+	}
+
+	/**
+	\brief Get attached entity by type
+	*/
+	EntityAI GetAttachmentByType(typename type)
+	{
+		for ( int i = 0; i < GetInventory().AttachmentCount(); i++ )
+		{
+			EntityAI attachment = GetInventory().GetAttachmentFromIndex( i );
+			if ( attachment && attachment.IsInherited( type ) )
+				return attachment;
+		}
+		return NULL;
+	}
+
+	/**
+	\brief Get attached entity by config type name
+	*/
+	EntityAI GetAttachmentByConfigTypeName(string type)
+	{
+		for ( int i = 0; i < GetInventory().AttachmentCount(); i++ )
+		{
+			EntityAI attachment = GetInventory().GetAttachmentFromIndex ( i );
+			if ( attachment.IsKindOf ( type ) )
+				return attachment;
+			}
+		return NULL;
+	}
+	/**
+	\brief Returns if item can be dropped out from this entity
+	*/
+	bool CanDropEntity(notnull EntityAI item)
+	{
+		return true;
+	}
+
+	EntityAI SpawnInInventoryOrGroundPos(string object_name, GameInventory inv, vector pos)
+	{
+		if (inv)
+		{
+			EntityAI res = inv.CreateInInventory(object_name);
+			if (res)
+			{
+				return res;
+			}
+		}
+
+		return SpawnEntityOnGroundPos(object_name, pos);
+	}
+
+	/**
+	 **/
+	EntityAI SpawnEntityOnGroundPos(string object_name, vector pos)
+	{
+		InventoryLocation il = new InventoryLocation();
+		vector mat[4];
+		Math3D.MatrixIdentity4(mat);
+		mat[3] = pos;
+		il.SetGround(NULL, mat);
+		return SpawnEntity(object_name, il,ECE_PLACE_ON_SURFACE,RF_DEFAULT);
+	}
+	/**
+	 **/
+	EntityAI SpawnEntityOnGround(string object_name, vector mat[4])
+	{
+		InventoryLocation il = new InventoryLocation();
+		il.SetGround(NULL, mat);
+		return SpawnEntity(object_name, il,ECE_PLACE_ON_SURFACE,RF_DEFAULT);
+	}
+	
+	//----------------------------------------------------------------
+
+	bool CanSwapEntities(EntityAI otherItem, InventoryLocation otherDestination, InventoryLocation destination)
+	{
+		return true;
+	}
+	
+	// Forward declarations to allow lower modules to access properties that are modified from higher modules
+	// These are mainly used within the ItemBase
+	void SetWet(float value, bool allow_client = false);
+	void AddWet(float value);
+	void SetWetMax();
+
+	float GetWet()
+	{
+		return 0;
+	}
+	
+	float GetWetMax()
+	{
+		return 0;
+	}
+
+	float GetWetMin()
+	{
+		return 0;
+	}
+	
+	float GetWetInit()
+	{
+		return 0;
+	}
+	
+	bool HasWetness()
+	{
+		return GetWetMax() - GetWetMin() != 0;
+	}
+	
+	void OnWetChanged(float newVal, float oldVal);
+
+	void OnWetLevelChanged(EWetnessLevel newLevel, EWetnessLevel oldLevel);
+	// ! Returns current wet level of the entity
+	EWetnessLevel GetWetLevel();
+	
+	// ! Calculates wet level from a given wetness, to get level of an entity, use 'GetWetLevel()' instead
+	static EWetnessLevel GetWetLevelInternal(float wetness)
+	{
+		if (wetness < GameConstants.STATE_DAMP)
+		{
+			return EWetnessLevel.DRY;
+		}
+		else if (wetness < GameConstants.STATE_WET)
+		{
+			return EWetnessLevel.DAMP;
+		}
+		else if (wetness < GameConstants.STATE_SOAKING_WET)
+		{
+			return EWetnessLevel.WET;
+		}
+		else if (wetness < GameConstants.STATE_DRENCHED)
+		{
+			return EWetnessLevel.SOAKING;
+		}
+		return EWetnessLevel.DRENCHED;
+	}
+	//----------------------------------------------------------------
+	
+	float GetQuantity()
+	{
+		return 0;
+	}
+	
+	int GetQuantityMax()
+	{
+		return 0;
+	}
+	
+	void SetQuantityToMinimum();
+	
+	int GetTargetQuantityMax(int attSlotID = -1)
+	{
+		return 0;
+	}
+	
+	int GetQuickBarBonus()
+	{
+		return 0;
+	}
+
+	//----------------------------------------------------------------
+
+	void SetTemperature(float value, bool allow_client = false) {};
+	void AddTemperature(float value) {};
+	void SetTemperatureMax() {};
+
+	float GetTemperature()
+	{
+		return 0;
+	}
+	
+	float GetTemperatureInit()
+	{
+		return 0;
+	}
+	
+	float GetTemperatureMin()
+	{
+		return 0;
+	}
+
+	float GetTemperatureMax()
+	{
+		return 0;
+	}
+	
+	//----------------------------------------------------------------
+		
+	HiddenSelectionsData GetHiddenSelectionsData()
+	{
+		return m_HiddenSelectionsData;
+	}
+	
+	//! Returns index of the string found in cfg array 'hiddenSelections'. If it's not found then it returns -1.
+	int GetHiddenSelectionIndex( string selection )
+	{
+		if (m_HiddenSelectionsData)
+			return m_HiddenSelectionsData.GetHiddenSelectionIndex( selection );
+
+		return -1;
+	}
+	
+	//! Returns the hiddenSelectionsTextures array from the object's config
+	override TStringArray GetHiddenSelections()
+	{
+		if (m_HiddenSelectionsData)
+			return m_HiddenSelectionsData.m_HiddenSelections;
+		else
+			return super.GetHiddenSelections();
+	}
+	
+	//! Returns the hiddenSelectionsTextures array from the object's config
+	override TStringArray GetHiddenSelectionsTextures()
+	{
+		if (m_HiddenSelectionsData)
+			return m_HiddenSelectionsData.m_HiddenSelectionsTextures;
+		else
+			return super.GetHiddenSelectionsTextures();
+	}
+	
+	//! Returns the hiddenSelectionsMaterials array from the object's config
+	override TStringArray GetHiddenSelectionsMaterials()
+	{
+		if (m_HiddenSelectionsData)
+			return m_HiddenSelectionsData.m_HiddenSelectionsMaterials;
+		else
+			return super.GetHiddenSelectionsMaterials();
+	}
+	
+	/**
+	 * @fn		EntityPlaceOnSurfacePointWithRotation
+	 * @brief	applies correct rotation according to WRUtils::EntityPlacementRotation(type->GetRotationFlags())
+	 *
+	 * @param[out]	trans	\p		the transform to apply the correct rotation on
+	 * @param[in]	pos		\p		position to check
+	 * @param[in]	dx		\p		up vector x to align to
+	 * @param[in]	dz		\p		up vector z to align to
+	 * @param[in]	fAngle	\p		angle to position
+	 * @param[in]	align	\p		align to surface
+	 **/	
+	proto native void PlaceOnSurfaceRotated(out vector trans[4], vector pos, float dx = 0, float dz = 0, float fAngle = 0, bool align = false);
+
+	/**
+	 * @fn		RegisterNetSyncVariableBool
+	 * @brief	registers bool variable synchronized over network
+	 *
+	 * @param[in]	variableName	\p		which variable should be synchronized
+	 **/	
+	proto native void RegisterNetSyncVariableBool(string variableName);
+	
+	/**
+	 * @fn		RegisterNetSyncVariableBoolSignal
+	 * @brief	when bool variable is true, it's sent to clients and become false again
+	 *
+	 * @param[in]	variableName	\p		which variable should be synchronized
+	 **/	
+	proto native void RegisterNetSyncVariableBoolSignal(string variableName);
+
+	/**
+	 * @fn		RegisterNetSyncVariableInt
+	 * @brief	registers int variable synchronized over network
+	 *
+	 * @param[in]	variableName	\p		which variable should be synchronized
+	 * @param[in]	minValue		\p		minimal value used for quantization (when minValue == maxValue, no quatization is done)
+	 * @param[in]	maxValue		\p		maximal value used for quantization (when minValue == maxValue, no quatization is done)
+	 **/	
+	proto native void RegisterNetSyncVariableInt(string variableName, int minValue = 0, int maxValue = 0);
+	
+	/**
+	 * @fn		RegisterNetSyncVariableFloat
+	 * @brief	registers float variable synchronized over network
+	 *
+	 * @param[in]	variableName	\p		which variable should be synchronized
+	 * @param[in]	minValue		\p		minimal value used for quantization (when minValue == maxValue, no quatization is done)
+	 * @param[in]	maxValue		\p		maximal value used for quantization (when minValue == maxValue, no quatization is done)
+	 * @param[in]	precision		\p		precision in number of digits after decimal point
+	 **/	
+	proto native void RegisterNetSyncVariableFloat(string variableName, float minValue = 0, float maxValue = 0, int precision = 1);
+	
+	/**
+	 * @fn		RegisterNetSyncVariableObject
+	 * @brief	registers object variable synchronized over network, only synchronizes if network id is assigned. Doesn't handle object despawn on client
+	 *
+	 * @param[in]	variableName	\p		which variable should be synchronized
+	 **/	
+	proto native void RegisterNetSyncVariableObject(string variableName);
+	
+	proto native void UpdateNetSyncVariableInt(string variableName, float minValue = 0, float maxValue = 0);
+	proto native void UpdateNetSyncVariableFloat(string variableName, float minValue = 0, float maxValue = 0, int precision = 1);
+
+	proto native void SwitchLight(bool isOn);
+
+	//! Simple hidden selection state; 0 == hidden
+	proto native void SetSimpleHiddenSelectionState(int index, bool state);
+	proto native bool IsSimpleHiddenSelectionVisible(int index);
+	
+	//! Change texture in hiddenSelections
+	proto native void SetObjectTexture(int index, string texture_name);
+	proto native owned string GetObjectTexture(int index);
+	//! Change material in hiddenSelections
+	proto native void SetObjectMaterial(int index, string mat_name);
+	proto native owned string GetObjectMaterial(int index);
+		
+	proto native bool	IsPilotLight();
+	proto native void SetPilotLight(bool isOn);
+
+	/**
+	\brief Engine calls this function to collect data from entity to store for persistence (on server side).
+	@code
+	void OnStoreSave(ParamsWriteContext ctx)
+	{
+		// dont forget to propagate this call trough class hierarchy!
+		super.OnStoreSave(ctx);
+
+		// write any data (using params) you want to store
+		int   a = 5;
+		float b = 6.0;
+
+		ctx.Write(a);
+		ctx.Write(b);
+	}
+	@endcode
+	*/
+	void OnStoreSave(ParamsWriteContext ctx)
+	{
+		// Saving of energy related states
+		if ( m_EM )
+		{		
+			// Save energy amount
+			ctx.Write( m_EM.GetEnergy() );
+			
+			// Save passive/active state
+			ctx.Write( m_EM.IsPassive() );
+			
+			// Save ON/OFF state
+			ctx.Write( m_EM.IsSwitchedOn() );
+			
+			// Save plugged/unplugged state
+			ctx.Write( m_EM.IsPlugged() );
+			
+			// ENERGY SOURCE
+			// Save energy source IDs
+			EntityAI energy_source = m_EM.GetEnergySource();
+			int b1 = 0;
+			int b2 = 0;
+			int b3 = 0;
+			int b4 = 0;
+
+			if (energy_source)
+			{
+				energy_source.GetPersistentID(b1, b2, b3, b4);
+			}
+
+			ctx.Write( b1 ); // Save energy source block 1
+			ctx.Write( b2 ); // Save energy source block 2
+			ctx.Write( b3 ); // Save energy source block 3
+			ctx.Write( b4 ); // Save energy source block 4
+		}
+	}
+	
+	/**
+	\brief Called when data is loaded from persistence (on server side).
+	@code
+
+	void OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		// dont forget to propagate this call trough class hierarchy!
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+
+		// read data loaded from game database (format and order of reading must be the same as writing!)
+		int a;
+		if ( !ctx.Read(a) )
+			return false;
+
+		float b;
+		if ( !ctx.Read(b) )
+			return false;
+
+		return true;
+	}
+	@endcode
+	*/
+	
+	bool OnStoreLoad (ParamsReadContext ctx, int version)
+	{
+		// Restoring of energy related states
+		
+		if ( m_EM )
+		{
+			// Load energy amount
+			float f_energy = 0;
+			if ( !ctx.Read( f_energy ) )
+				f_energy = 0;
+			m_EM.SetEnergy(f_energy);
+			
+			// Load passive/active state
+			bool b_is_passive = false;
+			if ( !ctx.Read( b_is_passive ) )
+				return false;
+			m_EM.SetPassiveState(b_is_passive);
+			
+			// Load ON/OFF state
+			bool b_is_on = false;
+			if ( !ctx.Read( b_is_on ) )
+			{
+				m_EM.SwitchOn();
+				return false;
+			}
+			
+			// Load plugged/unplugged state
+			bool b_is_plugged = false;
+			if ( !ctx.Read( b_is_plugged ) )
+				return false;
+			
+			// ENERGY SOURCE
+			if ( version <= 103 )
+			{
+				// Load energy source ID low
+				int i_energy_source_ID_low = 0; // Even 0 can be valid ID!
+				if ( !ctx.Read( i_energy_source_ID_low ) )
+					return false;
+				
+				// Load energy source ID high
+				int i_energy_source_ID_high = 0; // Even 0 can be valid ID!
+				if ( !ctx.Read( i_energy_source_ID_high ) )
+					return false;
+			}
+			else
+			{
+				int b1 = 0;
+				int b2 = 0;
+				int b3 = 0;
+				int b4 = 0;
+
+				if ( !ctx.Read(b1) ) return false;
+				if ( !ctx.Read(b2) ) return false;
+				if ( !ctx.Read(b3) ) return false;
+				if ( !ctx.Read(b4) ) return false;
+
+				if ( b_is_plugged )
+				{
+					// Because function GetEntityByPersitentID() cannot be called here, ID values must be stored and used later.
+					m_EM.StoreEnergySourceIDs( b1, b2, b3, b4 );
+					m_EM.RestorePlugState(true);
+				}
+			}
+
+			if (b_is_on)
+			{
+				m_EM.SwitchOn();
+			}
+		}
+		return true;
+	}
+
+	//! Sets object synchronization dirty flag, which signalize that object wants to be synchronized (take effect only in MP on server side)
+	proto native void SetSynchDirty();
+
+	/**
+	\brief Called on clients after receiving synchronization data from server.
+	*/
+	void OnVariablesSynchronized()
+	{
+		if ( m_EM )
+		{
+			if ( GetGame().IsMultiplayer() )
+			{
+				bool is_on = m_EM.IsSwitchedOn();
+				
+				if (is_on != m_EM.GetPreviousSwitchState())
+				{
+					if (is_on)
+						m_EM.SwitchOn();
+					else
+						m_EM.SwitchOff();
+				}
+				
+				int id_low = m_EM.GetEnergySourceNetworkIDLow();
+				int id_High = m_EM.GetEnergySourceNetworkIDHigh();
+				
+				EntityAI energy_source = EntityAI.Cast( GetGame().GetObjectByNetworkId(id_low, id_High) );
+				
+				if (energy_source)
+				{
+					ComponentEnergyManager esem = energy_source.GetCompEM();
+					
+					if ( !esem )
+					{
+						string object = energy_source.GetType();
+						Error("Synchronization error! Object " + object + " has no instance of the Energy Manager component!");
+					}
+					
+					m_EM.PlugThisInto(energy_source);
+					
+				}
+				else
+				{
+					m_EM.UnplugThis();
+				}
+				
+				m_EM.DeviceUpdate();
+				m_EM.StartUpdates();
+			}
+		}
+	}
+
+	proto native void SetAITargetCallbacks(AbstractAITargetCallbacks callbacks);
+
+	override void EOnFrame(IEntity other, float timeSlice)
+	{
+		if ( m_ComponentsBank != NULL )
+		{
+			for ( int comp_key = 0; comp_key < COMP_TYPE_COUNT; ++comp_key )
+			{
+				if ( m_ComponentsBank.IsComponentAlreadyExist(comp_key) )
+				{
+					m_ComponentsBank.GetComponent(comp_key).Event_OnFrame(other, timeSlice);
+				}
+			}
+		}
+	}
+	
+	string GetDebugText()
+	{
+		string text = string.Empty;
+
+		text += "Weight: " + GetWeightEx() + "\n";
+		text += "Disabled: " + GetIsSimulationDisabled() + "\n";
+		#ifdef SERVER
+		if (GetEconomyProfile())
+			text += "CE Lifetime default: " + (int)GetEconomyProfile().GetLifetime() + "\n";
+		text += "CE Lifetime remaining: " + (int)GetLifetime() + "\n";
+		#endif
+		
+		ComponentEnergyManager compEM = GetCompEM();
+		if (compEM)
+		{
+			text += "Energy Source: " + Object.GetDebugName(compEM.GetEnergySource()) + "\n";
+			text += "Switched On: " + compEM.IsSwitchedOn() + "\n";
+			text += "Is Working: " + compEM.IsWorking() + "\n";
+		}
+
+		return text;
+	}
+	
+	
+	void GetDebugButtonNames(out string button1, out string button2, out string button3, out string button4){}//DEPRICATED, USE GetDebugActions / OnAction
+	void OnDebugButtonPressClient(int button_index){}//DEPRICATED, USE GetDebugActions / OnAction
+	void OnDebugButtonPressServer(int button_index){}//DEPRICATED, USE GetDebugActions / OnAction
+	
+	
+	Shape DebugBBoxDraw()
+	{
+		return GetComponent(COMP_TYPE_ETITY_DEBUG).DebugBBoxDraw();
+	}
+
+	void DebugBBoxSetColor(int color)
+	{
+		GetComponent(COMP_TYPE_ETITY_DEBUG).DebugBBoxSetColor(color);
+	}
+
+	void DebugBBoxDelete()
+	{
+		GetComponent(COMP_TYPE_ETITY_DEBUG).DebugBBoxDelete();
+	}
+
+	Shape DebugDirectionDraw(float distance = 1)
+	{
+		return GetComponent(COMP_TYPE_ETITY_DEBUG).DebugDirectionDraw(distance);
+	}
+
+	void DebugDirectionSetColor(int color)
+	{
+		GetComponent(COMP_TYPE_ETITY_DEBUG).DebugDirectionSetColor(color);
+	}
+
+	void DebugDirectionDelete()
+	{
+		GetComponent(COMP_TYPE_ETITY_DEBUG).DebugDirectionDelete();
+	}
+
+	//! Hides selection of the given name. Must be configed in config.cpp and models.cfg
+	void HideSelection( string selection_name )
+	{
+		if ( !ToDelete() )
+		{
+			SetAnimationPhase ( selection_name, 1 ); // 1 = hide, 0 = unhide!
+		}
+	}
+
+	//! Shows selection of the given name. Must be configed in config.hpp and models.cfg
+	void ShowSelection( string selection_name )
+	{
+		if ( !ToDelete() )
+		{
+			SetAnimationPhase ( selection_name, 0 ); // 1 = hide, 0 = unhide!
+		}
+	}
+
+	//! Returns blocks of bits of persistence id of this entity.
+	//! This id stays the same even after server restart.
+	proto void GetPersistentID( out int b1, out int b2, out int b3, out int b4 );
+
+	//! Set (override) remaining economy lifetime (seconds)
+	proto native void SetLifetime( float fLifeTime );
+	//! Get remaining economy lifetime (seconds)
+	proto native float GetLifetime();
+	//! Reset economy lifetime to default (seconds)
+	proto native void IncreaseLifetime();
+
+	//! Set (override) max economy lifetime per entity instance (seconds)
+	proto native void SetLifetimeMax( float fLifeTime );
+	//! Get max economy lifetime per instance - default is from DB (seconds)
+	proto native float GetLifetimeMax();
+
+	//! Reset economy lifetime to default across entity hierarchy all the way to the topmost entity
+	void IncreaseLifetimeUp()
+	{
+		IncreaseLifetime();
+		if (GetHierarchyParent())
+			GetHierarchyParent().IncreaseLifetimeUp();
+	}	
+
+
+	// BODY STAGING
+	//! Use this to access Body Staging component on dead character. Returns NULL if the given object lacks such component.
+	ComponentBodyStaging GetCompBS()
+	{
+		if ( HasComponent(COMP_TYPE_BODY_STAGING) )
+			return ComponentBodyStaging.Cast( GetComponent(COMP_TYPE_BODY_STAGING) );
+		return NULL;
+	}
+
+	///@{ energy manager
+	//! ENERGY MANAGER:Documentation: Confluence >> Camping & Squatting >> Electricity >> Energy Manager functionalities
+	//! Use this to access Energy Manager component on your device. Returns NULL if the given object lacks such component.
+	ComponentEnergyManager GetCompEM()
+	{
+		if (m_EM)
+			return m_EM;
+		
+		if ( HasComponent(COMP_TYPE_ENERGY_MANAGER) )
+			return ComponentEnergyManager.Cast( GetComponent(COMP_TYPE_ENERGY_MANAGER) );
+		return NULL;
+	}
+
+	//! If this item has class EnergyManager in its config then it returns true. Otherwise returns false.
+	bool HasEnergyManager()
+	{
+		return HasComponent(COMP_TYPE_ENERGY_MANAGER);
+	}
+
+	// ------ Public Events for Energy manager component. Overwrite these and put your own functionality into them. ------
+
+	//! Energy manager event: Called only once when this device starts doing its work
+	void OnWorkStart() {}
+
+	//! Energy manager event: Called every device update if its supposed to do some work. The update can be every second or at random, depending on its manipulation.
+	void OnWork( float consumed_energy ) {}
+
+	//! Energy manager event: Called when the device stops working (was switched OFF or ran out of energy)
+	void OnWorkStop() {}
+
+	//! Energy manager event: Called when the device is switched on
+	void OnSwitchOn() {}
+
+	//! Energy manager event: Called when the device is switched OFF
+	void OnSwitchOff() {}
+
+	//! Energy manager event: Called when this device is plugged into some energy source
+	void OnIsPlugged(EntityAI source_device) {}
+
+	//! Energy manager event: Called when this device is UNPLUGGED from the energy source
+	void OnIsUnplugged( EntityAI last_energy_source ) {}
+
+	//! Energy manager event: When something is plugged into this device
+	void OnOwnSocketTaken( EntityAI device ) {}
+
+	//! Energy manager event: When something is UNPLUGGED from this device
+	void OnOwnSocketReleased( EntityAI device ) {}
+
+	//! Energy manager event: Object's initialization. Energy Manager is fully initialized by this point.
+	void OnInitEnergy() {}
+
+	//! Energy manager event: Called when energy was consumed on this device. ALWAYS CALL super.OnEnergyConsumed() !!!
+	void OnEnergyConsumed() {}
+
+	//! Energy manager event: Called when energy was added on this device. ALWAYS CALL super.OnEnergyAdded() !!!
+	void OnEnergyAdded() {}
+	///@} energy manager
+	
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(sender, rpc_type, ctx);
+
+		if ( GetGame().IsClient() )
+		{
+			switch (rpc_type)
+			{
+				// BODY STAGING - server => client synchronization of skinned state.
+				case ERPCs.RPC_BS_SKINNED_STATE:
+				{
+					Param1<bool> p_skinned_state= new Param1<bool>(false);
+					if (ctx.Read(p_skinned_state))
+					{
+						float state = p_skinned_state.param1;
+						if (state && GetCompBS())
+							GetCompBS().SetAsSkinnedClient();
+					}
+					break;
+				}
+				
+				case ERPCs.RPC_EXPLODE_EVENT:
+				{
+					OnExplodeClient();					
+					break;
+				}
+			}
+		}
+	}
+
+	#ifdef DIAG_DEVELOPER
+	void FixEntity()
+	{
+		if (!(GetGame().IsServer()))
+			return;
+		SetFullHealth();
+		
+		if (GetInventory())
+		{
+			int i = 0;
+			int AttachmentsCount = GetInventory().AttachmentCount();
+			if (AttachmentsCount > 0)
+			{
+				for (i = 0; i < AttachmentsCount; i++)
+				{
+					GetInventory().GetAttachmentFromIndex(i).FixEntity();
+				}
+			}
+		
+			CargoBase cargo = GetInventory().GetCargo();
+			if (cargo)
+			{
+				int cargoCount = cargo.GetItemCount();
+				for (i = 0; i < cargoCount; i++)
+				{
+					cargo.GetItem(i).FixEntity();
+				}
+			}
+		}
+	}
+	#endif
+
+	float GetWetWeightModifier()
+	{
+		return CfgGameplayHandler.GetWetnessWeightModifiers()[GetWetLevel()];
+	}
+
+	float GetConfigWeightModified()
+	{
+		return m_ConfigWeight * GetWetWeightModifier();	
+	}
+
+	#ifdef DEVELOPER
+	string GetConfigWeightModifiedDebugText()
+	{
+		if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+		{
+			return "(" + m_ConfigWeight + "(config weight) * " + GetWetWeightModifier() + "(Wetness Modifier))";
+		}
+		return string.Empty;
+	}
+	#endif
+	
+
+	//Obsolete, use GetWeightEx()
+	int GetWeight()
+	{
+		return GetWeightEx();
+	}
+
+	void ClearWeightDirty()
+	{
+		//Print("ent:" + this + " - ClearWeightDirty");
+		m_WeightDirty = 0;
+	}
+
+	void SetWeightDirty()
+	{
+		#ifdef DEVELOPER
+		if (WeightDebug.m_VerbosityFlags & WeightDebugType.SET_DIRTY_FLAG)
+		{
+			Print("---------------------------------------");
+			Print("ent:" + this + " - SetWeightDirty");
+			if (WeightDebug.m_VerbosityFlags & WeightDebugType.DUMP_STACK)
+			{
+				DumpStack();
+			}
+			Print("---------------------------------------");
+		}
+		#endif
+		m_WeightDirty = 1;
+		if (GetHierarchyParent())
+		{
+			GetHierarchyParent().SetWeightDirty();
+		}
+	}
+	// returns weight of all cargo and attachments
+	float GetInventoryAndCargoWeight(bool forceRecalc = false)
+	{
+		float totalWeight;
+		if (GetInventory())
+		{
+			int i = 0;
+			int AttachmentsCount = GetInventory().AttachmentCount();
+			if (AttachmentsCount > 0)
+			{
+				for (i = 0; i < AttachmentsCount; i++)
+				{
+					totalWeight += GetInventory().GetAttachmentFromIndex(i).GetWeightEx(forceRecalc);
+				}
+			}
+		
+			CargoBase cargo = GetInventory().GetCargo();
+			if (cargo)
+			{
+				int cargoCount = cargo.GetItemCount();
+				for (i = 0; i < cargoCount; i++)
+				{
+					totalWeight += cargo.GetItem(i).GetWeightEx(forceRecalc);
+				}
+			}
+		}
+		return totalWeight;	
+	}
+	//! returns weight of the entity in a way that's specific to the entity type and is internal to the weight system calculation, to obtain entity's weight, use the 'GetWeightEx' method instead
+	protected float GetWeightSpecialized(bool forceRecalc = false)
+	{
+		return GetInventoryAndCargoWeight(forceRecalc);
+	}
+
+	//! returns overall weight of the entity, 'forceRecalc = true' is meant to be used only when debugging, using it in gameplay code is higly inadvisable as it bypasses the weight caching and has adverse effect on performance
+	//this method is not meant to be overriden, to adjust weight calculation for specific item type, override 'GetWeightSpecialized(bool forceRecalc = false)' instead
+	float GetWeightEx(bool forceRecalc = false)
+	{
+		if (m_WeightDirty || forceRecalc)//recalculate
+		{
+			m_WeightEx = GetWeightSpecialized(forceRecalc);
+			ClearWeightDirty();
+		
+			#ifdef DEVELOPER
+			if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+			{
+				WeightDebug.GetWeightDebug(this).SetWeight(m_WeightEx);
+			}
+			if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_DIRTY)
+			{
+				Print("ent:" + this + " - Dirty Recalc");
+				if (WeightDebug.m_VerbosityFlags & WeightDebugType.DUMP_STACK)
+				{
+					DumpStack();
+				}
+			}
+			#endif
+		}
+
+		return m_WeightEx;
+	}
+	
+	void UpdateWeight(WeightUpdateType updateType = WeightUpdateType.FULL, float weightAdjustment = 0);
+	
+	float GetSingleInventoryItemWeightEx(){}
+
+	void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		//fix entity
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.FIX_ENTITY, "Fix Entity", FadeColors.LIGHT_GREY));
+	
+		//weight
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.GET_TOTAL_WEIGHT, "Print Weight", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.GET_TOTAL_WEIGHT_RECALC, "Print Weight Verbose", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.GET_PLAYER_WEIGHT, "Print Player Weight", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.GET_PLAYER_WEIGHT_RECALC, "Print Player Weight Verbose", FadeColors.LIGHT_GREY));
+	}
+	bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (action_id == EActions.FIX_ENTITY)
+		{
+			#ifdef DIAG_DEVELOPER
+			FixEntity();
+			#endif
+		}
+		else if (action_id == EActions.GET_TOTAL_WEIGHT) //Prints total weight of item + its contents
+		{
+			WeightDebug.ClearWeightDebug();
+			#ifndef SERVER
+			Debug.Log("======================== "+  GetType() +" =================================");
+			#endif
+			Debug.Log("Weight:" + GetWeightEx().ToString());
+			Debug.Log("Weight excluding cargo and attachments:" + GetSingleInventoryItemWeightEx());
+			Debug.Log("----------------------------------------------------------------------------------------------");
+		}
+		else if (action_id == EActions.GET_TOTAL_WEIGHT_RECALC) //Prints total weight of item + its contents
+		{
+			WeightDebug.ClearWeightDebug();
+			WeightDebug.SetVerbosityFlags(WeightDebugType.RECALC_FORCED);
+			#ifndef SERVER
+			Debug.Log("======================== "+  GetType() +" RECALC ===========================");
+			#endif
+			Debug.Log("Weight:" + GetWeightEx(true).ToString());
+			Debug.Log("Weight excluding cargo and attachments:" + GetSingleInventoryItemWeightEx());
+			WeightDebug.PrintAll(this);
+			Debug.Log("----------------------------------------------------------------------------------------------");
+			WeightDebug.SetVerbosityFlags(0);
+		}
+		else if (action_id == EActions.GET_PLAYER_WEIGHT) //Prints total weight of item + its contents
+		{
+			WeightDebug.ClearWeightDebug();
+			#ifndef SERVER
+			Debug.Log("======================== PLAYER: "+player+" ===========================");
+			#endif
+			Debug.Log("New overall weight Player:"+player.GetWeightEx().ToString());
+
+			Debug.Log("----------------------------------------------------------------------------------------------");
+		}
+		else if (action_id == EActions.GET_PLAYER_WEIGHT_RECALC) //Prints total weight of item + its contents
+		{
+			WeightDebug.ClearWeightDebug();
+			WeightDebug.SetVerbosityFlags(WeightDebugType.RECALC_FORCED);
+			#ifndef SERVER
+			Debug.Log("======================== PLAYER RECALC: "+player+" ===========================");
+			#endif
+			Debug.Log("New overall weight Player:"+player.GetWeightEx(true).ToString());
+			WeightDebug.PrintAll(player);
+			Debug.Log("----------------------------------------------------------------------------------------------");
+			WeightDebug.SetVerbosityFlags(0);
+		}
+		return false;
+	}
+
+	///@{ view index
+	//! Item view index is used to setup which camera will be used in item view widget in inventory.
+	//! With this index you can setup various camera angles for different item states (e.g. fireplace, weapons).
+	int m_ViewIndex = 0;
+	
+	//! Sets item preview index
+	void SetViewIndex( int index )
+	{
+		m_ViewIndex = index;
+		
+		if( GetGame().IsServer() ) 
+		{
+			SetSynchDirty();
+		}
+	}
+	
+	//! Returns item preview index !!!! IF OVERRIDING with more dynamic events call GetOnViewIndexChanged() in constructor on client !!!!
+	int GetViewIndex()
+	{
+		if ( MemoryPointExists( "invView2" ) )
+		{
+			#ifdef PLATFORM_WINDOWS
+			InventoryLocation il = new InventoryLocation();
+			GetInventory().GetCurrentInventoryLocation( il );
+			InventoryLocationType type = il.GetType();
+			switch ( type )
+			{
+				case InventoryLocationType.CARGO:
+				{
+					return 0;
+				}
+				case InventoryLocationType.ATTACHMENT:
+				{
+					return 1;
+				}
+				case InventoryLocationType.HANDS:
+				{
+					return 0;
+				}
+				case InventoryLocationType.GROUND:
+				{
+					return 1;
+				}
+				case InventoryLocationType.PROXYCARGO:
+				{
+					return 0;
+				}
+				default:
+				{
+					return 0;
+				}
+			}			
+			#endif
+			
+			#ifdef PLATFORM_CONSOLE
+			return 1;
+			#endif
+		}
+		return 0;
+	}
+	///@} view index
+	
+	//! Returns hit component for the Entity (overriden for each Type - PlayerBase, DayZInfected, DayZAnimal, etc.)
+	string GetHitComponentForAI()
+	{
+		Debug.LogError("EntityAI: HitComponentForAI not set properly for that entity (" + GetType() + ")");
+		//! returns Global so it is obvious you need to configure that properly on entity
+		return "";
+	}
+
+	//! returns default hit component for the Entity (overriden for each Type - PlayerBase, DayZInfected, DayZAnimal, etc.)
+	string GetDefaultHitComponent()
+	{
+		Debug.LogError("EntityAI: DefaultHitComponent not set properly for that entity (" + GetType() + ")");
+		//! returns Global so it is obvious you need to configure that properly on entity
+		return "";
+	}
+	
+	//! returns default hit position component name for the Entity (overriden by type if needed - used mainly as support for impact particles)
+	string GetDefaultHitPositionComponent()
+	{
+		Debug.LogError("EntityAI: DefaultHitPositionComponent not set for that entity (" + GetType() + ")");
+		return "";
+	}
+	
+	array<string> GetSuitableFinisherHitComponents()
+	{
+		Debug.LogError("EntityAI: SuitableFinisherHitComponents not set for that entity (" + GetType() + ")");
+		return null;
+	}
+	
+	vector GetDefaultHitPosition()
+	{
+		Debug.LogError("EntityAI: DefaultHitPosition not set for that entity (" + GetType() + ")");
+		return vector.Zero;
+	}
+	
+	//! value is related to EMeleeTargetType
+	int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.ALIGNABLE;
+	}
+	
+	//! returns sound type of attachment (used for clothing and weapons on DayZPlayerImplement, paired with Anim*Type enum from DayZAnimEvents)
+	string GetAttachmentSoundType()
+	{
+		return "None";
+	}
+	
+	//! returns item behaviour of item (more in ItemBase)
+	bool IsHeavyBehaviour()
+	{
+		return false;
+	}
+	
+	//! returns item behaviour of item (more in ItemBase)
+	bool IsOneHandedBehaviour()
+	{
+		return false;
+	}
+	
+	//! returns item behaviour of item (more in ItemBase)
+	bool IsTwoHandedBehaviour()
+	{
+		return false;
+	}
+	
+	string ChangeIntoOnAttach(string slot) {}
+	string ChangeIntoOnDetach() {}
+	
+	/**
+	\brief Central economy calls this function whenever going over all the entities 
+	@code
+	void OnCEUpdate()
+	{
+		// dont forget to propagate this call trough class hierarchy! - always at the start of the function
+		super.OnCEUpdate();
+	
+		// use m_ElapsedSinceLastUpdate for time-related purposes
+	}
+	@endcode
+	*/
+	void OnCEUpdate()
+	{
+		float currentTime = GetGame().GetTickTime();
+		if (m_LastUpdatedTime == 0)
+			m_LastUpdatedTime = currentTime;
+		
+		m_ElapsedSinceLastUpdate = currentTime - m_LastUpdatedTime; 
+		m_LastUpdatedTime = currentTime;
+	}
+
+	void OnDebugSpawnEx(DebugSpawnParams params)
+	{
+		OnDebugSpawn();
+	}
+	
+	void OnDebugSpawn() 
+	{
+		array<string> slots = new array<string>;
+		ConfigGetTextArray("Attachments", slots);
+		
+		array<string> mags = new array<string>;
+		ConfigGetTextArray("magazines", mags);
+		
+		//-------
+		
+		TStringArray all_paths = new TStringArray;
+		
+		all_paths.Insert(CFG_VEHICLESPATH);
+		all_paths.Insert(CFG_MAGAZINESPATH);
+		all_paths.Insert(CFG_WEAPONSPATH);
+		
+		string config_path;
+		string child_name;
+		int scope;
+		string path;
+		int consumable_count;
+		
+		for (int i = 0; i < all_paths.Count(); i++)
+		{
+			config_path = all_paths.Get(i);
+			int children_count = GetGame().ConfigGetChildrenCount(config_path);
+			
+			for (int x = 0; x < children_count; x++)
+			{
+				GetGame().ConfigGetChildName(config_path, x, child_name);
+				path = config_path + " " + child_name;
+				scope = GetGame().ConfigGetInt( config_path + " " + child_name + " scope" );
+				bool should_check = 1;
+				if ( config_path == "CfgVehicles" && scope == 0)
+				{
+					should_check = 0;
+				}
+				
+				if ( should_check )
+				{
+					string inv_slot;
+					GetGame().ConfigGetText( config_path + " " + child_name + " inventorySlot",inv_slot );
+					for (int z = 0; z < slots.Count(); z++)
+					{
+						if (slots.Get(z) == inv_slot)
+						{
+							this.GetInventory().CreateInInventory( child_name );
+							continue;
+							//Print("matching attachment: " + child_name + " for inv. slot name:" +inv_slot);
+						}
+					}
+				}
+			}
+		}
+	};
+	
+	override EntityAI ProcessMeleeItemDamage(int mode = 0)
+	{
+		if (GetGame().IsServer())
+			AddHealth("","Health",-MELEE_ITEM_DAMAGE);
+		return this;
+	}
+
+	//! Returns liquid throughput coeficient
+	float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_DEFAULT;
+	}
+	
+	string GetInvulnerabilityTypeString()
+	{
+		return "";
+	}
+	
+	void ProcessInvulnerabilityCheck(string servercfg_param)
+	{
+		if ( GetGame() && GetGame().IsMultiplayer() && GetGame().IsServer() )
+		{
+			int invulnerability;
+			switch (servercfg_param)
+			{
+				case "disableContainerDamage":
+					invulnerability = CfgGameplayHandler.GetDisableContainerDamage();
+				break;
+				
+				case "disableBaseDamage":
+					invulnerability = CfgGameplayHandler.GetDisableBaseDamage();
+				break;
+			}
+				
+			if (invulnerability > 0)
+			{
+				SetAllowDamage(false);
+			}
+		}
+	}
+
+	void SetBayonetAttached(bool pState, int slot_idx = -1) {};
+	bool HasBayonetAttached() {};
+	int GetBayonetAttachmentIdx() {};
+	
+	void SetButtstockAttached(bool pState, int slot_idx = -1) {};
+	bool HasButtstockAttached() {};
+	int GetButtstockAttachmentIdx() {};
+	
+	void SetInvisibleRecursive(bool invisible, EntityAI parent = null, array<int> attachments = null)
+	{
+		array<int> childrenAtt = new array<int>;
+		array<int> attachmentsArray = new array<int>;
+		if (attachments)
+			attachmentsArray.Copy(attachments);
+		else
+		{
+			for (int i = 0; i < GetInventory().GetAttachmentSlotsCount(); i++)
+			{
+				attachmentsArray.Insert(GetInventory().GetAttachmentSlotId(i));
+			}
+		}
+		
+		EntityAI item;
+		
+		foreach( int slot : attachmentsArray )
+		{
+			if( parent )
+				item = parent.GetInventory().FindAttachment(slot);
+			else
+				item = this;//GetInventory().FindAttachment(slot);
+			
+			if( item )
+			{
+				if( item.GetInventory().AttachmentCount() > 0 )
+				{
+					for(i = 0; i < item.GetInventory().GetAttachmentSlotsCount(); i++)
+					{
+						childrenAtt.Insert(item.GetInventory().GetAttachmentSlotId(i));
+					}
+					
+					SetInvisibleRecursive(invisible,item,childrenAtt);
+				}
+				
+				item.SetInvisible(invisible);
+				item.OnInvisibleSet(invisible);
+			}
+		}
+	}
+	
+	void SoundHardTreeFallingPlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "hardTreeFall_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+		
+	void SoundSoftTreeFallingPlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "softTreeFall_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+		
+	void SoundHardBushFallingPlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "hardBushFall_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+		
+	void SoundSoftBushFallingPlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "softBushFall_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+	
+	void RegisterTransportHit(Transport transport)
+	{
+		if (!m_TransportHitRegistered)
+		{	
+			m_TransportHitRegistered = true; 
+			m_TransportHitVelocity = GetVelocity(transport);
+			Car car;
+			float damage;
+			vector impulse;
+			
+			// a different attempt to solve hits from "standing" car to the players
+			if (Car.CastTo(car, transport))
+			{
+				if (car.GetSpeedometerAbsolute() > 2 )
+				{
+					damage = m_TransportHitVelocity.Length();
+					ProcessDirectDamage(DT_CUSTOM, transport, "", "TransportHit", "0 0 0", damage);
+				}
+				else
+				{
+					m_TransportHitRegistered = false;
+				}
+
+				// compute impulse and apply only if the body dies
+				if (IsDamageDestroyed() && car.GetSpeedometerAbsolute() > 3)
+				{
+					impulse = 40 * m_TransportHitVelocity;
+					impulse[1] = 40 * 1.5;
+					dBodyApplyImpulse(this, impulse);
+				}
+			}			
+			else //old solution just in case if somebody use it
+			{
+				// avoid damage because of small movements
+				if (m_TransportHitVelocity.Length() > 0.1)
+				{
+					damage = m_TransportHitVelocity.Length();
+					ProcessDirectDamage(DT_CUSTOM, transport, "", "TransportHit", "0 0 0", damage);
+				}
+				else
+				{
+					m_TransportHitRegistered = false;
+				}
+				
+				// compute impulse and apply only if the body dies
+				if (IsDamageDestroyed() && m_TransportHitVelocity.Length() > 0.3)
+				{
+					impulse = 40 * m_TransportHitVelocity;
+					impulse[1] = 40 * 1.5;
+					dBodyApplyImpulse(this, impulse);
+				}
+			}
+		}
+	}
+	
+	bool GetInventoryHandAnimation(notnull InventoryLocation loc, out int value)
+	{
+		value = -1;
+		return false;
+	}
+	
+	bool TranslateSlotFromSelection(string selection_name, out int slot_id)
+	{
+		return false;
+	}
+	
+	//! Universal Temperature Sources Helpers
+	bool IsUniversalTemperatureSource()
+	{
+		return GetUniversalTemperatureSource() != null && GetUniversalTemperatureSource().IsActive();
+	}
+	
+	UTemperatureSource GetUniversalTemperatureSource()
+	{
+		return m_UniversalTemperatureSource;
+	}
+	
+	void SetUniversalTemperatureSource(UTemperatureSource uts)
+	{
+		m_UniversalTemperatureSource = uts;
+	}
+	
+	vector GetUniversalTemperatureSourcePosition()
+	{
+		return GetPosition();
+	}
+
+	//! Remotely controlled devices helpers
+	RemotelyActivatedItemBehaviour GetRemotelyActivatedItemBehaviour();
+
+	void PairRemote(notnull EntityAI trigger);
+
+	void UnpairRemote();
+
+	EntityAI GetPairDevice();
+
+	void SetPersistentPairID(int id)
+	{
+		RemotelyActivatedItemBehaviour raib = GetRemotelyActivatedItemBehaviour();
+		if (raib)
+		{
+			raib.SetPersistentPairID(id);
+		}
+	}
+
+	//! Turnable Valve behaviour
+	bool HasTurnableValveBehavior();
+	bool IsValveTurnable(int pValveIndex);
+	int GetTurnableValveIndex(int pComponentIndex);
+	void ExecuteActionsConnectedToValve(int pValveIndex);
+
+//////////////////////////////////
+// attachment exclusion section //
+//////////////////////////////////
+	private void InitAttachmentExclusionValues()
+	{
+		m_AttachmentExclusionSlotMap = new map<int,ref set<int>>();
+		m_AttachmentExclusionMaskGlobal = new set<int>;
+		m_AttachmentExclusionMaskChildren = new set<int>();
+	
+		int count = GetInventory().GetSlotIdCount();
+		//no sense in performing inits for something that cannot be attached anywhere (hand/lefthand and some other 'special' slots are the reason for creating 'new' sets above)
+		if (count == 0)
+			return;
+		
+		InitInherentSlotExclusionMap();
+		InitGlobalExclusionValues();
+		InitLegacyConfigExclusionValues();
+	}
+	
+	//! map stored on instance to better respond to various state changes
+	private void InitInherentSlotExclusionMap()
+	{
+		int count = GetInventory().GetSlotIdCount();
+		//starting with the INVALID slot, so it is always in the map of attachable items
+		SetAttachmentExclusionMaskSlot(InventorySlots.INVALID,GetAttachmentExclusionInitSlotValue(InventorySlots.INVALID));
+		
+		int slotId;
+		for (int i = 0; i < count; i++) 
+		{
+			slotId = GetInventory().GetSlotId(i);
+			SetAttachmentExclusionMaskSlot(slotId,GetAttachmentExclusionInitSlotValue(slotId));
+		}
+	}
+	
+	//! override this to modify slot behavior for specific items, or just set 'm_AttachmentExclusionMaskGlobal' value for simple items
+	protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> dflt = new set<int>;
+		return dflt;
+	}
+	
+	//Initiated last, and only for items that do not have others defined already
+	protected void InitLegacyConfigExclusionValues()
+	{
+		bool performLegacyInit = InitLegacyExclusionCheck();
+		
+		//adding implicit slot info AFTER the check is performed
+		InitLegacySlotExclusionValuesImplicit();
+		
+		if (performLegacyInit)
+			InitLegacySlotExclusionValuesDerived();
+	}
+
+	//returns 'false' if the script initialization 
+	protected bool InitLegacyExclusionCheck()
+	{
+		//first check the globals
+		if (m_AttachmentExclusionMaskGlobal.Count() > 0)
+			return false;
+		
+		//now the map
+		int count = m_AttachmentExclusionSlotMap.Count();
+		if (count > 1) //more than InventorySlots.INVALID
+		{
+			for (int i = 0; i < count; i++)
+			{
+				int countSet = m_AttachmentExclusionSlotMap.GetElement(i).Count();
+				if (countSet > 0) //SOMETHING is defined
+				{
+					return false;
+				}
+			}
+		}
+		
+		return true;
+	}
+
+	/**@fn		InitLegacySlotExclusionValuesImplicit
+	 * @brief	adding base one-directional relations between headgear, masks, eyewear, and headstraps (exception)
+	 *
+	 * @note: 'InitLegacyConfigExclusionValues' adds them the other way if the item does not have any script-side exclusions AND has some legacy config parameter.
+	**/
+	protected void InitLegacySlotExclusionValuesImplicit()
+	{
+		int slotId;
+		int slotCount = GetInventory().GetSlotIdCount();
+		for (int i = 0; i < slotCount; i++) 
+		{
+			slotId = GetInventory().GetSlotId(i);
+			set<int> tmp;
+			switch (slotId)
+			{
+				case InventorySlots.HEADGEAR:
+				{
+					tmp = new set<int>;
+					tmp.Copy(GetAttachmentExclusionInitSlotValue(slotId));
+					tmp.Insert(EAttExclusions.LEGACY_HEADGEAR_MASK);
+					tmp.Insert(EAttExclusions.LEGACY_HEADGEAR_HEADSTRAP);
+					tmp.Insert(EAttExclusions.LEGACY_HEADGEAR_EYEWEWEAR);
+					SetAttachmentExclusionMaskSlot(slotId,tmp);
+					break;
+				}
+				
+				case InventorySlots.MASK:
+				{
+					tmp = new set<int>;
+					tmp.Copy(GetAttachmentExclusionInitSlotValue(slotId));
+					tmp.Insert(EAttExclusions.LEGACY_MASK_HEADGEAR);
+					tmp.Insert(EAttExclusions.LEGACY_MASK_HEADSTRAP);
+					tmp.Insert(EAttExclusions.LEGACY_MASK_EYEWEWEAR);
+					SetAttachmentExclusionMaskSlot(slotId,tmp);
+					break;
+				}
+				
+				case InventorySlots.EYEWEAR:
+				{
+					tmp = new set<int>;
+					tmp.Copy(GetAttachmentExclusionInitSlotValue(slotId));
+					if (ConfigGetBool("isStrap"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_HEADSTRAP_HEADGEAR);
+						tmp.Insert(EAttExclusions.LEGACY_HEADSTRAP_MASK);
+					}
+					else
+					{
+						tmp.Insert(EAttExclusions.LEGACY_EYEWEAR_HEADGEAR);
+						tmp.Insert(EAttExclusions.LEGACY_EYEWEAR_MASK);
+					}
+					SetAttachmentExclusionMaskSlot(slotId,tmp);
+					break;
+				}
+			}
+		}
+	}
+	
+	protected void InitLegacySlotExclusionValuesDerived()
+	{
+		int slotId;
+		int slotCount = GetInventory().GetSlotIdCount();
+		for (int i = 0; i < slotCount; i++) 
+		{
+			slotId = GetInventory().GetSlotId(i);
+			set<int> tmp;
+			switch (slotId)
+			{
+				case InventorySlots.HEADGEAR:
+				{
+					tmp = new set<int>;
+					tmp.Copy(GetAttachmentExclusionMaskSlot(slotId));
+					if (ConfigGetBool("noNVStrap"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_HEADSTRAP_HEADGEAR);
+					}
+					if (ConfigGetBool("noMask"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_MASK_HEADGEAR);
+					}
+					if (ConfigGetBool("noEyewear"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_EYEWEAR_HEADGEAR);
+					}
+					SetAttachmentExclusionMaskSlot(slotId,tmp);
+					break;
+				}
+				
+				case InventorySlots.MASK:
+				{
+					tmp = new set<int>;
+					tmp.Copy(GetAttachmentExclusionMaskSlot(slotId));
+					if (ConfigGetBool("noNVStrap"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_HEADSTRAP_MASK);
+					}
+					if (ConfigGetBool("noHelmet"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_HEADGEAR_MASK);
+					}
+					if (ConfigGetBool("noEyewear"))
+					{
+						tmp.Insert(EAttExclusions.LEGACY_EYEWEAR_MASK);
+					}
+					SetAttachmentExclusionMaskSlot(slotId,tmp);
+					break;
+				}
+				
+				case InventorySlots.EYEWEAR:
+				{
+					tmp = new set<int>;
+					tmp.Copy(GetAttachmentExclusionMaskSlot(slotId));
+					if (ConfigGetBool("isStrap"))
+					{
+						if (ConfigGetBool("noHelmet"))
+						{
+							tmp.Insert(EAttExclusions.LEGACY_HEADGEAR_HEADSTRAP);
+						}
+						if (ConfigGetBool("noMask"))
+						{
+							tmp.Insert(EAttExclusions.LEGACY_MASK_HEADSTRAP);
+						}
+					}
+					else
+					{
+						if (ConfigGetBool("noHelmet"))
+						{
+							tmp.Insert(EAttExclusions.LEGACY_HEADGEAR_EYEWEWEAR);
+						}
+						if (ConfigGetBool("noMask"))
+						{
+							tmp.Insert(EAttExclusions.LEGACY_MASK_EYEWEWEAR);
+						}
+					}
+					SetAttachmentExclusionMaskSlot(slotId,tmp);
+					break;
+				}
+			}
+		}
+	}
+
+	//! override to init part of the mask, independent of slot-specific behavior
+	protected void InitGlobalExclusionValues();
+	
+	//! to help with item staging exclusions
+	protected void AddSingleExclusionValueGlobal(EAttExclusions value)
+	{
+		if (m_AttachmentExclusionMaskGlobal.Find(value) == -1)
+			m_AttachmentExclusionMaskGlobal.Insert(value);
+	}
+	
+	//! to help with item staging exclusions
+	protected void ClearSingleExclusionValueGlobal(EAttExclusions value)
+	{
+		int idx = m_AttachmentExclusionMaskGlobal.Find(value);
+		if (idx != -1)
+			m_AttachmentExclusionMaskGlobal.Remove(idx);
+	}
+	
+	protected void SetAttachmentExclusionMaskGlobal(set<int> values)
+	{
+		m_AttachmentExclusionMaskGlobal.Clear();
+		m_AttachmentExclusionMaskGlobal.Copy(values);
+	}
+	
+	//! sets values for specific slot
+	protected void SetAttachmentExclusionMaskSlot(int slotId, set<int> values)
+	{
+		if (m_AttachmentExclusionSlotMap)
+		{
+			m_AttachmentExclusionSlotMap.Set(slotId,values);
+		}
+		else
+			ErrorEx("m_AttachmentExclusionSlotMap not available! Fill the 'inventorySlot[]' in the " + this + " config file.");
+	}
+	
+	private void PropagateExclusionValueRecursive(set<int> values, int slotId)
+	{
+		if (values && values.Count() != 0)
+		{
+			set<int> passThis;
+			InventoryLocation lcn = new InventoryLocation();
+			GetInventory().GetCurrentInventoryLocation(lcn);
+			if (CheckExclusionAccessPropagation(lcn.GetSlot(), slotId, values, passThis))
+			{
+				m_AttachmentExclusionMaskChildren.InsertSet(passThis);
+				EntityAI parent = GetHierarchyParent();
+				if (parent)
+					parent.PropagateExclusionValueRecursive(passThis,lcn.GetSlot());
+			}
+		}
+	}
+	
+	private void ClearExclusionValueRecursive(set<int> values, int slotId)
+	{
+		if (values && values.Count() != 0)
+		{
+			set<int> passThis;
+			InventoryLocation lcn = new InventoryLocation();
+			GetInventory().GetCurrentInventoryLocation(lcn);
+			if (CheckExclusionAccessPropagation(lcn.GetSlot(), slotId, values, passThis))
+			{
+				int count = passThis.Count();
+				for (int i = 0; i < count; i++)
+				{
+					m_AttachmentExclusionMaskChildren.RemoveItem(passThis[i]);
+				}
+				EntityAI parent = GetHierarchyParent();
+				if (parent)
+					parent.ClearExclusionValueRecursive(passThis,lcn.GetSlot());
+			}
+		}
+	}
+	
+	//! Slot-specific, children (attachments), and additional (state etc.) masks combined
+	set<int> GetAttachmentExclusionMaskAll(int slotId)
+	{
+		set<int> values = new set<int>();
+		set<int> slotValues = GetAttachmentExclusionMaskSlot(slotId);
+		if (slotValues)
+			values.InsertSet(slotValues);
+		values.InsertSet(m_AttachmentExclusionMaskGlobal);
+		values.InsertSet(m_AttachmentExclusionMaskChildren);
+		
+		return values;
+	}
+	
+	//! Specific slot behavior
+	set<int> GetAttachmentExclusionMaskSlot(int slotId)
+	{
+		return m_AttachmentExclusionSlotMap.Get(slotId);
+	}
+	
+	//! Global mask value, independent of slot-specific behavior!
+	set<int> GetAttachmentExclusionMaskGlobal()
+	{
+		return m_AttachmentExclusionMaskGlobal;
+	}
+	
+	//! Mask value coming from the item's attachments
+	set<int> GetAttachmentExclusionMaskChildren()
+	{
+		return m_AttachmentExclusionMaskChildren;
+	}
+	
+	//! checks if any attachment or item state would interfere with this being attached into a different slot (Headgear -> Mask)
+	private bool HasInternalExclusionConflicts(int targetSlot)
+	{
+		set<int> targetSlotValues = GetAttachmentExclusionMaskSlot(targetSlot);
+		if (targetSlotValues) //can be null, if so, no conflict
+		{
+			set<int> additionalValues = new set<int>(); //NOT slot values
+			additionalValues.InsertSet(GetAttachmentExclusionMaskGlobal());
+			additionalValues.InsertSet(GetAttachmentExclusionMaskChildren());
+			
+			int countTarget = targetSlotValues.Count();
+			for (int i = 0; i < countTarget; i++)
+			{
+				if (additionalValues.Find(targetSlotValues[i]) != -1)
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	//! checks 'this' if the incoming flag is present for the current state (slot behavior and others)
+	protected bool IsExclusionFlagPresent(set<int> values)
+	{
+		int slotId;
+		string slotName;
+		GetInventory().GetCurrentAttachmentSlotInfo(slotId,slotName); //if currently attached, treat it accordingly
+		
+		set<int> currentSlotValuesAll = GetAttachmentExclusionMaskAll(slotId);
+		int count = values.Count();
+		for (int i = 0; i < count; i++)
+		{
+			if (currentSlotValuesAll.Find(values[i]) != -1)
+				return true;
+		}
+		return false;
+	}
+	
+	//! Gets flag from what is effectively an owner
+	protected bool IsExclusionFlagPresentRecursive(set<int> values, int targetSlot)
+	{
+		if (values && values.Count() != 0)
+		{
+			InventoryLocation lcn = new InventoryLocation();
+			GetInventory().GetCurrentInventoryLocation(lcn);
+			EntityAI parent = GetHierarchyParent();
+			set<int> passThis;
+			if (CheckExclusionAccessCondition(lcn.GetSlot(),targetSlot, values, passThis))
+			{
+				if (parent && parent != this) //we reached root if false
+				{
+					return parent.IsExclusionFlagPresentRecursive(passThis,lcn.GetSlot());
+				}
+			}
+			return IsExclusionFlagPresent(passThis);
+		}
+		
+		return false;
+	}
+	
+	//!
+	protected bool CheckExclusionAccessCondition(int occupiedSlot, int targetSlot, set<int> value, inout set<int> adjustedValue)
+	{
+		bool occupiedException = occupiedSlot == InventorySlots.HANDS || occupiedSlot == InventorySlots.SHOULDER || occupiedSlot == InventorySlots.MELEE || occupiedSlot == InventorySlots.LEFTHAND;
+		bool targetException = targetSlot == InventorySlots.HANDS || targetSlot == InventorySlots.SHOULDER || targetSlot == InventorySlots.MELEE || targetSlot == InventorySlots.LEFTHAND;
+		
+		if (occupiedException)
+		{
+			adjustedValue = value;
+			return false;
+		}
+		
+		if (targetException)
+		{
+			adjustedValue = null;
+			return false;
+		}
+		
+		AdjustExclusionAccessCondition(occupiedSlot,targetSlot,value,adjustedValue);
+		return adjustedValue.Count() != 0;
+	}
+	
+	//!if we want to filter 
+	protected void AdjustExclusionAccessCondition(int occupiedSlot, int testedSlot, set<int> value, inout set<int> adjustedValue)
+	{
+		adjustedValue = value;
+	}
+
+	//! special propagation contition
+	protected bool CheckExclusionAccessPropagation(int occupiedSlot, int targetSlot, set<int> value, inout set<int> adjustedValue)
+	{
+		bool occupiedException = occupiedSlot == InventorySlots.HANDS || occupiedSlot == InventorySlots.SHOULDER || occupiedSlot == InventorySlots.MELEE || occupiedSlot == InventorySlots.LEFTHAND;
+		bool targetException = targetSlot == InventorySlots.HANDS || targetSlot == InventorySlots.SHOULDER || targetSlot == InventorySlots.MELEE || targetSlot == InventorySlots.LEFTHAND || targetSlot == InventorySlots.INVALID;
+		
+		if (targetException)
+		{
+			adjustedValue = null;
+			return false;
+		}
+		
+		AdjustExclusionAccessPropagation(occupiedSlot,targetSlot,value,adjustedValue);
+		return adjustedValue.Count() != 0;
+	}
+	
+	//!if we want to filter propagation specifically; DO NOT override unless you know what you are doing.
+	protected void AdjustExclusionAccessPropagation(int occupiedSlot, int testedSlot, set<int> value, inout set<int> adjustedValue)
+	{
+		AdjustExclusionAccessCondition(occupiedSlot,testedSlot,value,adjustedValue);
+	}
+
+	bool IsManagingArrows()
+	{
+		return false;
+	}
+
+	ArrowManagerBase GetArrowManager()
+	{
+		return null;
+	}
+
+	void SetFromProjectile(ProjectileStoppedInfo info)
+	{
+	}
+
+	void ClearInventory();
+};
+
+#ifdef DEVELOPER
+void SetDebugDeveloper_item(Object entity)//without a setter,the place where the setting happens is near impossible to find as way too many hits for "_item" exist
+{
+	if (entity)
+		entity.SetDebugItem();
+
+}
+Object _item;//watched item goes here(LCTRL+RMB->Watch)
+#endif
diff --git a/scripts/3_Game/DayZ/Entities/EntityLightSource.c b/scripts/3_Game/DayZ/Entities/EntityLightSource.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e2d65013f1570f621fb9226bf034bf59d963739
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/EntityLightSource.c
@@ -0,0 +1,75 @@
+enum LightSourceType
+{
+	NotDef,
+	PointLight,
+	SpotLight
+};
+
+class EntityLightSource extends Entity
+{
+	//---------------------------------------------------------------------------
+	// Generic interface
+	//---------------------------------------------------------------------------
+	proto native void 			SetLightType(int pType); // This works only if it's caled in the light's constructor!
+	proto native int  			GetLightType();
+
+	proto native void 			SetEnabled(bool pState);
+	proto native bool 			IsEnabled();
+
+	proto native void 			SetCastShadow(bool pState);
+	proto native bool 			GetCastShadow();
+
+	proto native bool 			EnableSpecular(bool pState);
+	proto native bool 			EnableLinear(bool pState);
+
+	proto native void 			SetPulseCoef(float pState);
+
+	proto native void 			SetVisibleDuringDaylight(bool pState);
+	proto native bool 			IsVisibleDuringDaylight();
+
+	proto native void 			SetRadius(float pValue);
+	proto native float 			GetRadius();
+	
+	//---------------------------------------------------------------------------
+	// heat haze
+	//---------------------------------------------------------------------------
+	proto native void 			EnableHeatHaze(bool pState);
+	
+	proto native void 			SetHeatHazeRadius(float pValue);
+	proto native float 			GetHeatHazeRadius();
+
+	proto native void 			SetHeatHazePower(float pValue);
+	proto native float 			GetHeatHazePower();
+	
+	//---------------------------------------------------------------------------
+	// colors & brightness
+	//---------------------------------------------------------------------------
+	proto native void   		SetDiffuseColor(float pRed, float pGreen, float pBlue);
+	proto native void   		SetDiffuseColorV(vector pColorVector);
+	proto native void   		SetDiffuseAlpha(float pAlpha);
+	proto native vector 		GetDiffuseColorV();
+	proto native float  		GetDiffuseAlpha();
+	
+	proto native void   		SetAmbientColor(float pRed, float pGreen, float pBlue);
+	proto native void   		SetAmbientColorV(vector pColorVector);
+	proto native void   		SetAmbientAlpha(float pAlpha);
+	proto native vector 		GetAmbientColorV();
+	proto native float  		GetAmbientAlpha();
+
+	proto native void   		SetBrightness(float pValue);
+	proto native float  		GetBrightness();
+	
+	//---------------------------------------------------------------------------
+	// flares
+	//---------------------------------------------------------------------------
+	proto native void 			SetFlareVisible(bool pState);
+	proto native bool			IsFlareVisible();
+	proto native void			SetFlareRelPosition(vector pPosition);
+	proto native vector			GetFlareRelPosition();
+
+	//---------------------------------------------------------------------------
+	// spot light specifics
+	//---------------------------------------------------------------------------
+	proto native void  			SetSpotLightAngle(float pValue);
+	proto native float 			GetSpotLightAngle();
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/InventoryItem.c b/scripts/3_Game/DayZ/Entities/InventoryItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..c49778847670afd6fff1e923d321976ecae88876
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/InventoryItem.c
@@ -0,0 +1,241 @@
+class InventoryItem extends EntityAI
+{	
+	static private const float SOUND_CONTACT_SKIP = 0.33;//second
+	
+#ifdef DIAG_DEVELOPER
+	static private ref array<ref string> s_ImpactSoundsInfo = new array<ref string>();
+#endif
+
+	private SoundLookupTable m_SoundImpactTable;
+	private float m_SoundContactTickTime;
+	private bool m_IsMeleeWeapon = false;
+	
+	proto native InventoryItemType GetInventoryItemType();
+
+	//! Some inventoryItem devices can be switched on/off (radios, transmitters)
+	proto native void SwitchOn(bool onOff);
+	//! Some inventoryItem devices can be switched on/off (radios, transmitters)
+	proto native bool IsOn();
+	
+	//! collisions with character
+	proto native void EnableCollisionsWithCharacter(bool state);
+	proto native bool HasCollisionsWithCharacter();
+
+	proto native MeleeCombatData GetMeleeCombatData();	
+	
+	proto native void ThrowPhysically(DayZPlayer player, vector force, bool collideWithCharacters = true);
+
+	//! Sets the item to use the server configured 'networkRangeFar' instead of 'networkRangeNear'
+	//  This method performs an OR operation with the config 'forceFarBubble'. If set in the config 
+	//  this method has no effect. 
+	proto native void ForceFarBubble(bool state);
+	
+	void InventoryItem()
+	{
+		InitImpactSoundData();
+		
+		if (ConfigIsExisting("isMeleeWeapon"))
+			m_IsMeleeWeapon = ConfigGetBool("isMeleeWeapon");
+	}
+	
+	
+	void OnRightClick()
+	{
+	
+	}
+
+	event bool OnUseFromInventory(Man owner)
+	{
+		return false;
+	}
+
+	//! Get tooltip text
+	string GetTooltip()
+	{
+		string temp;
+		if (!DescriptionOverride(temp))
+			temp = ConfigGetString("descriptionShort");
+		return temp;
+	}
+
+	override bool IsInventoryItem()
+	{
+		return true;
+	}
+	
+	int GetMeleeMode()
+	{
+		return 0;
+	}
+
+	int GetMeleeHeavyMode()
+	{
+		return 1;
+	}	
+	
+	int GetMeleeSprintMode()
+	{
+		return 2;
+	}
+	
+	override bool IsMeleeWeapon()
+	{
+		return m_IsMeleeWeapon;
+	}
+	
+	bool IsMeleeFinisher()
+	{
+		return false;
+	}
+	
+	// -------------------------------------------------------------------------------
+	void PlayImpactSound(float weight, float velocity, int surfaceHash)
+	{
+		if (!m_SoundImpactTable)
+			return;
+
+		SoundObjectBuilder soundBuilder = m_SoundImpactTable.GetSoundBuilder(surfaceHash);
+		if (soundBuilder != null)
+		{
+			soundBuilder.AddVariable("weight", weight);
+			soundBuilder.AddVariable("speed", velocity);
+			soundBuilder.AddEnvSoundVariables(GetPosition());
+				
+			SoundObject soundObject = soundBuilder.BuildSoundObject();
+			if (soundObject != null)
+			{
+				soundObject.SetKind(WaveKind.WAVEEFFECTEX);
+				PlaySound(soundObject, soundBuilder);
+			}
+		}
+	}
+	
+	// -------------------------------------------------------------------------------
+	protected void InitImpactSoundData()
+	{
+		#ifndef SERVER
+		string soundImpactType = "default";
+		if ( ConfigIsExisting("soundImpactType") )
+			soundImpactType = ConfigGetString("soundImpactType");
+		
+		m_SoundImpactTable = AnimSoundLookupTableBank.GetInstance().GetImpactTable(soundImpactType + "_Impact_LookupTable");
+		#endif
+	}
+	
+	// -------------------------------------------------------------------------------
+	AbstractWave PlaySound(SoundObject so, SoundObjectBuilder sob)
+	{
+		if (so == null)
+			return null;
+
+		so.SetPosition(GetPosition());
+		AbstractWave wave = GetGame().GetSoundScene().Play3D(so, sob);
+
+		return wave;
+	}
+	
+	// -------------------------------------------------------------------------------
+	void PlaySoundByAnimEvent(EAnimSoundEventID id)
+	{
+		AnimSoundEvent soundEvent = GetInventoryItemType().GetSoundEvent(id);
+		if (soundEvent)
+		{
+			SoundObjectBuilder builder = soundEvent.GetSoundBuilder();
+			SoundObject soundObject = builder.BuildSoundObject();
+			if (soundObject)
+				PlaySound(soundObject, builder);
+		}
+	}
+	
+	
+	// -------------------------------------------------------------------------------
+	string GetImpactSurfaceType(IEntity other, Contact impact)
+	{
+		string surface;
+		int liquid = -1;
+		return GetImpactSurfaceTypeEx(other, impact, liquid);
+	}
+	
+	// -------------------------------------------------------------------------------
+	string GetImpactSurfaceTypeEx(IEntity other, Contact impact, out int liquid)
+	{		
+		vector mins, maxs;
+		GetWorldBounds(mins, maxs);
+		vector size = maxs - mins;		
+
+		vector add = impact.RelativeVelocityBefore.Normalized() * size.Length();
+		string surfaceImpact;
+		if (DayZPhysics.GetHitSurfaceAndLiquid(
+			Object.Cast(other),
+			impact.Position + add,
+			impact.Position - add,
+			surfaceImpact,
+			liquid))
+		{
+			return surfaceImpact;
+		}
+		string surface;
+		GetGame().SurfaceUnderObjectEx(this, surface, surfaceImpact, liquid);
+
+		return surfaceImpact;
+	}
+	
+	//! returns ammo (projectile) used in melee if the item is destroyed. Override higher for specific use
+	string GetRuinedMeleeAmmoType()
+	{
+		return "MeleeSoft";
+	}
+
+	// -------------------------------------------------------------------------------
+	float ProcessImpactSound(IEntity other, Contact extra, float weight, out int surfaceHash)
+	{
+		int liquidType = -1;
+		return ProcessImpactSoundEx(other, extra, weight, surfaceHash,liquidType);
+	}
+	
+	
+	// -------------------------------------------------------------------------------
+	float ProcessImpactSoundEx(IEntity other, Contact extra, float weight, out int surfaceHash, out int liquidType)
+	{
+		float impactVelocity = extra.RelativeVelocityBefore.Length();
+		if ( impactVelocity < 0.3 )
+			return 0.0;
+		
+		float tickTime = GetGame().GetTickTime();
+		if ( m_SoundContactTickTime + SOUND_CONTACT_SKIP > tickTime )
+			return 0.0;
+		
+		string surfaceName = GetImpactSurfaceTypeEx(other, extra, liquidType);
+		if ( surfaceName == "" )
+			return 0.0;
+
+#ifdef DIAG_DEVELOPER
+		string infoText = "Surface: " + surfaceName + ", Weight: " + weight + ", Speed: " + impactVelocity;
+		
+		if ( s_ImpactSoundsInfo.Count() == 10 )
+			s_ImpactSoundsInfo.Remove(9);
+		
+		s_ImpactSoundsInfo.InsertAt(infoText, 0);
+#endif
+
+		m_SoundContactTickTime = tickTime;
+
+		surfaceHash = surfaceName.Hash();
+		return impactVelocity;		
+	}
+	
+#ifdef DIAG_DEVELOPER
+	static void DrawImpacts()
+	{
+		DbgUI.Begin("Item impact sounds", 10, 200);
+		
+		for ( int i = 0; i < s_ImpactSoundsInfo.Count(); ++i )
+		{
+			string line = (i + 1).ToString() + ". " + s_ImpactSoundsInfo.Get(i);
+			DbgUI.Text(line);
+		}
+		
+		DbgUI.End();
+	}
+#endif
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/Man.c b/scripts/3_Game/DayZ/Entities/Man.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc174b049c4987fe96a193ae0e578f2839635a6f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/Man.c
@@ -0,0 +1,923 @@
+class Man extends EntityAI
+{
+	//! Returns player's input interface
+	proto native UAInterface GetInputInterface();
+	//! Returns player's identity
+	proto native PlayerIdentity GetIdentity();
+	//! Returns vehicle which this Man object is driving. If this Man object isn't as driver of any vehicle it will return NULL.
+	proto native EntityAI GetDrivingVehicle();
+
+	proto native owned string GetCurrentWeaponMode();
+
+	//! Set speech restriction
+	proto native void SetSpeechRestricted(bool state);
+	//! Check if player has resctricted speech
+	proto native bool IsSpeechRestricted();
+
+	//! Texture that is used on the Man's face and hands
+	proto native void SetFaceTexture(string texture_name);
+	//! Material that is used on the Man's face and hands
+	proto native void SetFaceMaterial(string material_name);
+
+	proto native bool IsSoundInsideBuilding();
+	proto native bool IsCameraInsideVehicle();
+
+	proto native owned string GetMasterAttenuation();
+	proto native void SetMasterAttenuation(string masterAttenuation);
+
+	void Man()
+	{
+		SetFlags(EntityFlags.TOUCHTRIGGERS, false);
+	}
+
+	override bool IsMan()
+	{
+		return true;
+	}
+
+	override bool IsHealthVisible()
+	{
+		return false;
+	}
+
+	override bool HasFixedActionTargetCursorPosition()
+	{
+		return true;
+	}
+
+	bool IsUnconscious();
+
+	int GetPlayerState()
+	{
+		if (IsAlive())
+			return EPlayerStates.ALIVE;
+		
+		return EPlayerStates.DEAD;
+	}
+	
+	void AddItemToDelete(EntityAI item);
+
+	///@{ inventory
+	HumanInventory GetHumanInventory()
+	{
+		HumanInventory i = HumanInventory.Cast(GetInventory());
+		return i;
+	}
+
+	//Called when an item is removed from the cargo of this item
+	protected ref ScriptInvoker		m_OnItemAddedToHands;
+	//Called when an item is moved around in the cargo of this item
+	protected ref ScriptInvoker		m_OnItemRemovedFromHands;
+	
+	ScriptInvoker GetOnItemAddedToHands()
+	{
+		if (!m_OnItemAddedToHands)
+			m_OnItemAddedToHands = new ScriptInvoker();
+		
+		return m_OnItemAddedToHands;
+	}
+	
+	
+	ScriptInvoker GetOnItemRemovedFromHands()
+	{
+		if( !m_OnItemRemovedFromHands )
+			m_OnItemRemovedFromHands = new ScriptInvoker;
+		
+		return m_OnItemRemovedFromHands;
+	}
+	
+	void EEItemIntoHands(EntityAI item)
+	{
+		SetWeightDirty();
+		if( m_OnItemAddedToHands )
+			m_OnItemAddedToHands.Invoke( item, this );
+	}
+	
+	void EEItemOutOfHands(EntityAI item)
+	{
+		SetWeightDirty();
+		if( m_OnItemRemovedFromHands )
+			m_OnItemRemovedFromHands.Invoke( item, this );
+	}
+
+	///@{ drop juncture
+	bool JunctureDropEntity (notnull EntityAI item)
+	{
+		return DropEntityImpl(InventoryMode.JUNCTURE, this, item);
+	}
+
+	override bool PredictiveDropEntity (notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveDropEntity input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), this))
+			return JunctureDropEntity(item);
+		else
+			return DropEntityImpl(InventoryMode.PREDICTIVE, this, item);
+	}
+
+	override bool LocalDropEntity (notnull EntityAI item)
+	{
+		return DropEntityImpl(InventoryMode.LOCAL, this, item);
+	}
+
+	override bool ServerDropEntity (notnull EntityAI item)
+	{
+		return DropEntityImpl(InventoryMode.SERVER, this, item);
+	}
+
+	protected bool DropEntityImpl (InventoryMode mode, notnull EntityAI owner, notnull EntityAI item)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::DropEntity(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetHumanInventory().DropEntity(mode, owner, item);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} drop juncture
+
+	override bool CanDropEntity (notnull EntityAI item) { return true; }
+
+	void OnItemInHandsChanged () { }
+
+	bool NeedInventoryJunctureFromServer (notnull EntityAI item, EntityAI currParent, EntityAI newParent) { return false; }
+
+	///@{ hand juncture
+	void JunctureTakeEntityToHands (notnull EntityAI item)
+	{
+		TakeEntityToHandsImpl(InventoryMode.JUNCTURE, item);
+	}
+
+	void PredictiveTakeEntityToHands (EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeEntityToHands input data not sent yet, cannot allow another input action");
+			return;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), this))
+			JunctureTakeEntityToHands(item);
+		else
+			TakeEntityToHandsImpl(InventoryMode.PREDICTIVE, item);
+	}
+
+	void LocalTakeEntityToHands (EntityAI item)
+	{
+		TakeEntityToHandsImpl(InventoryMode.LOCAL, item);
+	}
+	
+	void ServerTakeEntityToHands (EntityAI item)
+	{
+		TakeEntityToHandsImpl(InventoryMode.SERVER, item);
+	}
+
+	void TakeEntityToHandsImpl (InventoryMode mode, EntityAI item)
+	{
+		if (!GetGame().IsDedicatedServer() )
+		{
+			InventoryLocation il = new InventoryLocation;
+			il.SetHands(this, item);
+			//GetInventory().AddInventoryReservationEx(item, il ,GameInventory.c_InventoryReservationTimeoutShortMS);
+		}
+			
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2Hands(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		EntityAI itemInHands = GetHumanInventory().GetEntityInHands();
+		
+		InventoryLocation src_item = new InventoryLocation;
+		if (item.GetInventory().GetCurrentInventoryLocation(src_item))
+		{
+			if (itemInHands == null)
+			{	
+				InventoryLocation hand_dst = new InventoryLocation;
+				hand_dst.SetHands(this, item);
+				GetHumanInventory().TakeToDst(mode, src_item, hand_dst);
+			}
+			else if (GetHumanInventory().CanSwapEntitiesEx(itemInHands, item))
+				GetInventory().SwapEntities(mode, itemInHands, item);
+			UpdateInventoryMenu();
+		}
+	}
+	///@} hand juncture
+
+	void LocalDestroyEntityInHands ()
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Destroy IH=" + GetHumanInventory().GetEntityInHands());
+		GetHumanInventory().LocalDestroyEntity(GetHumanInventory().GetEntityInHands());
+		UpdateInventoryMenu();
+	}
+
+	void PredictiveMoveItemFromHandsToInventory ()
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Stash IH=" + GetHumanInventory().GetEntityInHands());
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] PredictiveMoveItemFromHandsToInventory input data not sent yet, cannot allow another input action");
+			return;
+		}
+		
+		InventoryMode invMode = InventoryMode.PREDICTIVE;
+		
+		if (NeedInventoryJunctureFromServer( GetHumanInventory().GetEntityInHands(), this, this))
+			invMode = InventoryMode.JUNCTURE;
+
+		//! returns item to previous location, if available
+		if (GetHumanInventory().GetEntityInHands().m_OldLocation && GetHumanInventory().GetEntityInHands().m_OldLocation.IsValid())
+		{
+			InventoryLocation invLoc = new InventoryLocation;
+			GetHumanInventory().GetEntityInHands().GetInventory().GetCurrentInventoryLocation(invLoc);
+			//old location is somewhere on player
+			if (GetHumanInventory().GetEntityInHands().m_OldLocation.GetParent() && GetHumanInventory().GetEntityInHands().m_OldLocation.GetParent().GetHierarchyRootPlayer())
+			{
+				if (GetHumanInventory().LocationCanMoveEntity(invLoc, GetHumanInventory().GetEntityInHands().m_OldLocation))
+				{
+					if (GetHumanInventory().TakeToDst(invMode, invLoc,GetHumanInventory().GetEntityInHands().m_OldLocation))
+					{
+						UpdateInventoryMenu();
+						return;
+					}
+				}
+			}
+		}
+
+		GetHumanInventory().TakeEntityToInventory(invMode, FindInventoryLocationType.ATTACHMENT | FindInventoryLocationType.CARGO, GetHumanInventory().GetEntityInHands());		
+		UpdateInventoryMenu();
+	}
+
+	///@{ !hand -> !hand replace
+	protected bool ReplaceItemWithNewImpl(InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Replace !HND lambda=" + lambda.DumpToString());
+		bool code = GetHumanInventory().ReplaceItemWithNew(mode, lambda);
+		UpdateInventoryMenu();
+		return code;
+	}
+
+	bool LocalReplaceItemWithNew(ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemWithNewImpl(InventoryMode.LOCAL, lambda);
+	}
+
+	bool ServerReplaceItemWithNew(ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemWithNewImpl(InventoryMode.SERVER, lambda);
+	}
+	///@} !hand -> !hand replace
+	
+	///@{ !hand replace -> hand
+	protected bool ReplaceItemElsewhereWithNewInHandsImpl (InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Replace !HND->HND lambda=" + lambda.DumpToString());
+		bool code = GetHumanInventory().ReplaceItemElsewhereWithNewInHands(mode, lambda);
+		UpdateInventoryMenu();
+		return code;
+	}
+
+	bool LocalReplaceItemElsewhereWithNewInHands (ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemElsewhereWithNewInHandsImpl(InventoryMode.LOCAL, lambda);
+	}
+
+	bool ServerReplaceItemElsewhereWithNewInHands (ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemElsewhereWithNewInHandsImpl(InventoryMode.SERVER, lambda);
+	}
+	///@} !hand replace -> hand
+
+	///@{ hand replace
+	protected bool ReplaceItemInHandsWithNewImpl (InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Replace HND->HND lambda=" + lambda.DumpToString());
+		bool code = GetHumanInventory().ReplaceItemInHandsWithNew(mode, lambda);
+		UpdateInventoryMenu();
+		return code;
+	}
+
+	bool LocalReplaceItemInHandsWithNew (ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInHandsWithNewImpl(InventoryMode.LOCAL, lambda);
+	}
+
+	bool ServerReplaceItemInHandsWithNew (ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInHandsWithNewImpl(InventoryMode.SERVER, lambda);
+	}
+	///@} hand replace
+	
+	///@{ hand replace2
+	protected bool ReplaceItemInHandsWithNewElsewhereImpl (InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Replace HND->elsewhere lambda=" + lambda.DumpToString());
+		bool code = GetHumanInventory().ReplaceItemInHandsWithNewElsewhere(mode, lambda);
+		UpdateInventoryMenu();
+		return code;
+	}
+	
+	bool LocalReplaceItemInHandsWithNewElsewhere (ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInHandsWithNewElsewhereImpl(InventoryMode.LOCAL, lambda);
+	}
+	
+	bool ServerReplaceItemInHandsWithNewElsewhere (ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInHandsWithNewElsewhereImpl(InventoryMode.SERVER, lambda);
+	}
+	///@} hand replace2
+
+	///@{ to inv juncture
+	bool JunctureTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return TakeEntityToInventoryImpl(InventoryMode.JUNCTURE, flags, item);
+	}
+
+	override bool PredictiveTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeEntityToInventory input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), this))
+			return JunctureTakeEntityToInventory(flags, item);
+		else
+			return TakeEntityToInventoryImpl(InventoryMode.PREDICTIVE, flags, item);
+	}
+
+	override bool LocalTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return TakeEntityToInventoryImpl(InventoryMode.LOCAL, flags, item);
+	}
+
+	override bool ServerTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return TakeEntityToInventoryImpl(InventoryMode.SERVER, flags, item);
+	}
+
+	protected bool TakeEntityToInventoryImpl (InventoryMode mode, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2Inv(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetHumanInventory().TakeEntityToInventory(mode, flags, item);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to inv juncture
+
+	///@{ to cgo juncture
+	bool JunctureTakeEntityToCargo (notnull EntityAI item)
+	{
+		return TakeEntityToCargoImpl(InventoryMode.JUNCTURE, item);
+	}
+
+	override bool PredictiveTakeEntityToCargo (notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeEntityToCargo input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), this))
+			return JunctureTakeEntityToCargo(item);
+		else
+			return TakeEntityToCargoImpl(InventoryMode.PREDICTIVE, item);
+	}
+
+	override bool LocalTakeEntityToCargo (notnull EntityAI item)
+	{
+		return TakeEntityToCargoImpl(InventoryMode.LOCAL, item);
+	}
+
+	override bool ServerTakeEntityToCargo (notnull EntityAI item)
+	{
+		return TakeEntityToCargoImpl(InventoryMode.SERVER, item);
+	}
+
+	protected bool TakeEntityToCargoImpl (InventoryMode mode, notnull EntityAI item)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2Cgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetHumanInventory().TakeEntityToCargo(mode, item);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to cgo juncture
+
+	///@{ as att juncture
+	bool JunctureTakeEntityAsAttachment (notnull EntityAI item)
+	{
+		return TakeEntityAsAttachmentImpl(InventoryMode.JUNCTURE, item);
+	}
+
+	override bool PredictiveTakeEntityAsAttachment (notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeEntityAsAttachment input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), this))
+			return JunctureTakeEntityAsAttachment(item);
+		else
+			return TakeEntityAsAttachmentImpl(InventoryMode.PREDICTIVE, item);
+	}
+
+	override bool LocalTakeEntityAsAttachment (notnull EntityAI item)
+	{
+		return TakeEntityAsAttachmentImpl(InventoryMode.LOCAL, item);
+	}
+
+	override bool ServerTakeEntityAsAttachment (notnull EntityAI item)
+	{
+		return TakeEntityAsAttachmentImpl(InventoryMode.SERVER, item);
+	}
+
+	protected bool TakeEntityAsAttachmentImpl (InventoryMode mode, notnull EntityAI item)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2Att(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetHumanInventory().TakeEntityAsAttachment(mode, item);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} as att juncture
+
+	///@{ as att ex juncture
+	bool JunctureTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		return TakeEntityAsAttachmentExImpl(InventoryMode.JUNCTURE, item, slot);
+	}
+
+	override bool PredictiveTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeEntityAsAttachmentEx input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), this))
+			return JunctureTakeEntityAsAttachmentEx(item, slot);
+		else
+			return TakeEntityAsAttachmentExImpl(InventoryMode.PREDICTIVE, item, slot);
+	}
+
+	override bool LocalTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		return TakeEntityAsAttachmentExImpl(InventoryMode.LOCAL, item, slot);
+	}
+
+	override bool ServerTakeEntityAsAttachmentEx (notnull EntityAI item, int slot)
+	{
+		return TakeEntityAsAttachmentExImpl(InventoryMode.SERVER, item, slot);
+	}
+
+	protected bool TakeEntityAsAttachmentExImpl (InventoryMode mode, notnull EntityAI item, int slot)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2AttEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetHumanInventory().TakeEntityAsAttachmentEx(mode, item, slot);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} as att ex juncture
+
+	///@{ swap juncture
+	bool JunctureSwapEntities (notnull EntityAI item1, notnull EntityAI item2)
+	{
+		return SwapEntitiesImpl(InventoryMode.JUNCTURE, item1, item2);
+	}
+
+	bool PredictiveSwapEntities (notnull EntityAI item1, notnull EntityAI item2)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveSwapEntities input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		bool need_j1 = NeedInventoryJunctureFromServer(item1, item1.GetHierarchyParent(), item2.GetHierarchyParent());
+		bool need_j2 = NeedInventoryJunctureFromServer(item2, item2.GetHierarchyParent(), item1.GetHierarchyParent());
+		if (need_j1 || need_j2)
+			return SwapEntitiesImpl(InventoryMode.JUNCTURE, item1, item2);
+		else
+			return SwapEntitiesImpl(InventoryMode.PREDICTIVE, item1, item2);
+	}
+
+	bool LocalSwapEntities (notnull EntityAI item1, notnull EntityAI item2)
+	{
+		return SwapEntitiesImpl(InventoryMode.LOCAL, item1, item2);
+	}
+
+	bool ServerSwapEntities (notnull EntityAI item1, notnull EntityAI item2)
+	{
+		return SwapEntitiesImpl(InventoryMode.SERVER, item1, item2);
+	}
+
+	protected bool SwapEntitiesImpl (InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2)
+	{
+		bool code;
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::SwapImpl(" + typename.EnumToString(InventoryMode, mode) + ") item1=" + Object.GetDebugName(item1) + " item2=" + item2.GetDebugName(this));
+		if (!GameInventory.CanSwapEntitiesEx(item1, item2))
+			Error("[inv] (Man@" + this + ") SwapEntitiesImpl - cannot swap items!");
+
+		code = GetHumanInventory().SwapEntities(mode, item1, item2);
+
+		UpdateInventoryMenu();
+		if (!code)
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + "  SwapEntitiesImpl - cannot swap or forceswap");
+		return code;
+	}
+	///@} swap juncture
+
+	///@{ ForceSwap juncture
+	bool JunctureForceSwapEntities (notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		return ForceSwapEntitiesImpl(InventoryMode.JUNCTURE, item1, item2, item2_dst);
+	}
+
+	bool PredictiveForceSwapEntities (notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveForceSwapEntities input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		bool need_j1 = NeedInventoryJunctureFromServer(item1, item1.GetHierarchyParent(), item2.GetHierarchyParent());
+		bool need_j2 = NeedInventoryJunctureFromServer(item2, item2.GetHierarchyParent(), item1.GetHierarchyParent());
+		if (need_j1 || need_j2)
+			return ForceSwapEntitiesImpl(InventoryMode.JUNCTURE, item1, item2, item2_dst);
+		else
+			return ForceSwapEntitiesImpl(InventoryMode.PREDICTIVE, item1, item2, item2_dst);
+	}
+
+	bool LocalForceSwapEntities (notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		return ForceSwapEntitiesImpl(InventoryMode.LOCAL, item1, item2, item2_dst);
+	}
+
+	bool ServerForceSwapEntities (notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		return ForceSwapEntitiesImpl(InventoryMode.SERVER, item1, item2, item2_dst);
+	}
+
+	protected bool ForceSwapEntitiesImpl (InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		bool code = false;
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + "  ForceSwapImpl(" + typename.EnumToString(InventoryMode, mode) + ") item1=" + Object.GetDebugName(item1) + " item2=" + item2.GetDebugName(this));
+    	code = GetHumanInventory().ForceSwapEntities(mode, item1, item2, item2_dst);
+
+		UpdateInventoryMenu();
+		if (!code)
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + "  ForceSwapEntitiesImpl - cannot Forceswap");
+		return code;
+	}
+	///@} ForceSwap juncture
+
+	///@{ to target inv juncture
+	bool JunctureTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return TakeEntityToTargetInventoryImpl(InventoryMode.JUNCTURE, target, flags, item);
+	}
+
+	override bool PredictiveTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " ::PredictiveTakeEntityToTargetInventory input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), target))
+			return JunctureTakeEntityToTargetInventory(target, flags, item);
+		else
+			return TakeEntityToTargetInventoryImpl(InventoryMode.PREDICTIVE, target, flags, item);
+	}
+	
+	bool PredictiveTakeOrSwapAttachment( notnull EntityAI item )
+	{
+		if( GetInventory().CanAddAttachment( item ) )
+		{
+			return PredictiveTakeEntityAsAttachment( item );
+		}
+		else
+		{
+			for( int i = 0; i < item.GetInventory().GetSlotIdCount(); i++ )
+			{
+				int slot_id = item.GetInventory().GetSlotId(i);
+				EntityAI slot_item = GetInventory().FindAttachment( slot_id );
+				if( slot_item && GetInventory().CanSwapEntitiesEx( item, slot_item ) )
+				{
+					return PredictiveSwapEntities(item, slot_item);
+				}
+			}
+		}
+		return false;
+	}
+
+	override bool LocalTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		return TakeEntityToTargetInventoryImpl(InventoryMode.LOCAL, target, flags, item);
+	}
+
+	protected bool TakeEntityToTargetInventoryImpl (InventoryMode mode, notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2TargetInv(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetInventory().TakeEntityToTargetInventory(mode, target, flags, item);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to target inv juncture
+
+	///@{ to target cgo ex juncture
+	bool JunctureTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		return TakeEntityToTargetCargoExImpl(InventoryMode.JUNCTURE, cargo, item, row, col);
+	}
+
+	override bool PredictiveTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::PredictiveTakeEntityToTargetCargoEx input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), cargo.GetCargoOwner()))
+			return JunctureTakeEntityToTargetCargoEx(cargo, item, row, col);
+		else
+			return TakeEntityToTargetCargoExImpl(InventoryMode.PREDICTIVE, cargo, item, row, col);
+	}
+
+	override bool LocalTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		return TakeEntityToTargetCargoExImpl(InventoryMode.LOCAL, cargo, item, row, col);
+	}
+	
+	override bool ServerTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		return TakeEntityToTargetCargoExImpl(InventoryMode.SERVER, cargo, item, row, col);
+	}
+
+	protected bool TakeEntityToTargetCargoExImpl (InventoryMode mode, notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2TargetCgoEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetInventory().TakeEntityToTargetCargoEx(mode, cargo, item, row, col);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to target cgo ex juncture
+
+	///@{ to target cgo juncture
+	bool JunctureTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		return TakeEntityToTargetCargoImpl(InventoryMode.JUNCTURE, target, item);
+	}
+
+	override bool PredictiveTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::PredictiveTakeEntityToTargetCargo input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), target))
+			return JunctureTakeEntityToTargetCargo(target, item);
+		else
+			return TakeEntityToTargetCargoImpl(InventoryMode.PREDICTIVE, target, item);
+	}
+
+	override bool LocalTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		return TakeEntityToTargetCargoImpl(InventoryMode.LOCAL, target, item);
+	}
+	
+	override bool ServerTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		if (IsAlive())
+			return TakeEntityToTargetCargoImpl(InventoryMode.SERVER, target, item);
+		else
+			return TakeEntityToTargetCargoImpl(InventoryMode.SERVER, target, item);
+	}
+
+	protected bool TakeEntityToTargetCargoImpl (InventoryMode mode, notnull EntityAI target, notnull EntityAI item)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " Take2TargetCgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+
+		bool code = GetInventory().TakeEntityToTargetInventory(mode, target, FindInventoryLocationType.CARGO, item);
+  		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to target cgo juncture
+
+	///@{ to target att ex juncture
+	bool JunctureTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		return TakeEntityToTargetAttachmentExImpl(InventoryMode.JUNCTURE, target, item, slot);
+	}
+
+	override bool PredictiveTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::PredictiveTakeEntityToTargetAttachmentEx input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), target))
+			return JunctureTakeEntityToTargetAttachmentEx(target, item, slot);
+		else
+			return TakeEntityToTargetAttachmentExImpl(InventoryMode.PREDICTIVE, target, item, slot);
+	}
+
+	override bool LocalTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		return TakeEntityToTargetAttachmentExImpl(InventoryMode.LOCAL, target, item, slot);
+	}
+
+	override bool ServerTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		return TakeEntityToTargetAttachmentExImpl(InventoryMode.SERVER, target, item, slot);
+	}
+
+	protected bool TakeEntityToTargetAttachmentExImpl (InventoryMode mode, notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2TargetAtt(" + typename.EnumToString(InventoryMode, mode) + ") item=" + Object.GetDebugName(item));
+		bool code = GetInventory().TakeEntityAsTargetAttachmentEx(mode, target, item, slot);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to target att ex juncture
+
+	///@{ to target att juncture
+	bool JunctureTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		return TakeEntityToTargetAttachmentImpl(InventoryMode.JUNCTURE, target, item);
+	}
+
+	override bool PredictiveTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeEntityToTargetAttachment input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), target))
+			return JunctureTakeEntityToTargetAttachment(target, item);
+		else
+			return TakeEntityToTargetAttachmentImpl(InventoryMode.PREDICTIVE, target, item);
+	}
+
+	override bool LocalTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		return TakeEntityToTargetAttachmentImpl(InventoryMode.LOCAL, target, item);
+	}
+
+	override bool ServerTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		return TakeEntityToTargetAttachmentImpl(InventoryMode.SERVER, target, item);
+	}
+
+	protected bool TakeEntityToTargetAttachmentImpl (InventoryMode mode, notnull EntityAI target, notnull EntityAI item)
+	{
+		InventoryLocation il = new InventoryLocation;
+		if( target.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.ATTACHMENT, il) )
+		{
+			return TakeEntityToTargetAttachmentExImpl(mode, target, item, il.GetSlot());
+		}
+		return false;
+	}
+	///@} to target att juncture
+
+	///@{ to dst juncture
+	bool JunctureTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		return TakeToDstImpl(InventoryMode.JUNCTURE, src, dst);
+	}
+
+	override bool PredictiveTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			Print("[inv] " + GetSimulationTimeStamp() + " Man@" + this + " ::PredictiveTakeToDst input data not sent yet, cannot allow another input action");
+			return false;
+		}
+
+		if (NeedInventoryJunctureFromServer(src.GetItem(), src.GetParent(), dst.GetParent()))
+			return JunctureTakeToDst(src, dst);
+		else
+			return TakeToDstImpl(InventoryMode.PREDICTIVE, src, dst);
+	}
+
+	override bool LocalTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		return TakeToDstImpl(InventoryMode.LOCAL, src, dst);
+	}
+
+	override bool ServerTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		return TakeToDstImpl(InventoryMode.SERVER, src, dst);
+	}
+
+	protected bool TakeToDstImpl (InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS = " + GetSimulationTimeStamp() + " ::Take2Dst(" + typename.EnumToString(InventoryMode, mode) + ") src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+		bool code = GetHumanInventory().TakeToDst(mode, src, dst);
+		UpdateInventoryMenu();
+		return code;
+	}
+	///@} to dst juncture
+	///@} inventory
+	
+	void JunctureDeleteItem(EntityAI item)
+	{
+		
+	} 
+
+	override bool CanBeSkinned()
+	{
+		return true;
+	}
+	
+	void UpdateInventoryMenu();
+	
+	///@{ Stats
+	//! Registers new stat type for this player.
+	/*!
+		\param[in] name The name of the stat type.
+	*/
+	proto native bool StatRegister( string name );
+	//! Gets counter value of the specified stat type.
+	/*!
+		\param[in] name The name of the stat type.
+	*/
+	proto native float StatGet( string name );
+	//! Gets counter value as string of the specified stat type.
+	/*!
+		\param[in]	name  The name of the stat type.
+		\param[out] value A formatted string containing stat value.
+	*/
+	proto void StatGetCounter( string name, out string value );
+	//! Gets counter value as formatted time string of the specified stat type.
+	/*!
+		\param[in]	name  The name of the stat type.
+		\param[out] value A formatted string containing stat value.
+	*/
+	proto void StatGetAsTime( string name, out string value );
+	//! Updates stat counter with given value.
+	/*!
+		\param[in] name  The name of the stat type.
+		\param[in] value The specified value.
+	*/
+	proto native void StatUpdate( string name, float value );
+	//! Updates stat counter by time.
+	/*!
+		Use this to measure play time.
+		\param[in] name The name of the stat type.
+	*/
+	proto native void StatUpdateByTime( string name );
+	//! Updates stat counter by player's actual position.
+	/*!
+		Use this to measure player's travelling distance.
+		\param[in] name The name of the stat type.
+	*/
+	proto native void StatUpdateByPosition( string name );
+	//! Updates stat counter by given position.
+	/*!
+		\param[in] name The name of the stat type.
+		\param[in] pos	The specified position.
+	*/
+	proto native void StatUpdateByGivenPos( string name, vector pos );
+	/*! Invokes read stats from server to client.
+		\note Call this on client when you need update stats.
+	*/
+	proto native void StatInvokeUpdate();
+	/*! Invokes save stats from server to client.
+		\note Call this on server when you need update stats.
+	*/
+	proto native void StatSyncToClient();
+	///@} Stats
+	
+	bool IsInventorySoftLocked()
+	{
+		return false;
+	}
+
+	void SetInventorySoftLock(bool status);
+	
+	/// returns true if man is in transport, false otherwise
+	bool IsInTransport()
+	{
+		return Transport.Cast(GetParent()) != null;
+	}
+	
+	void StopDeathDarkeningEffect();
+	bool PhysicalPredictiveDropItem(EntityAI entity, bool heavy_item_only = true);
+	void SetProcessUIWarning(bool state);
+	void OnGameplayDataHandlerSync(); //depricated, sync now happens before the player is created, calling of this event still happens for legacy reasons
+	bool CanPlaceItem(EntityAI item);
+};
diff --git a/scripts/3_Game/DayZ/Entities/Object.c b/scripts/3_Game/DayZ/Entities/Object.c
new file mode 100644
index 0000000000000000000000000000000000000000..333cf15510f92ef60292713d4ed2728106b9d903
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/Object.c
@@ -0,0 +1,1423 @@
+enum ProcessDirectDamageFlags
+{
+	ALL_TRANSFER,
+	NO_ATTACHMENT_TRANSFER, //!< Do not transfer damage to attachments
+	NO_GLOBAL_TRANSFER, 	//!< Do not transfer damage to global
+	NO_TRANSFER, 			//!< NO_ATTACHMENT_TRANSFER | NO_GLOBAL_TRANSFER
+}
+
+class ObjectSnapCallback
+{
+	Object m_Owner;				//! The owner performing the snap callback
+	vector m_OwnerPosition;		//! The position of the owner in world space
+	vector m_OwnerDirection;	//! The direction of the owner in world space
+
+	vector m_Offset;			//! The true center of the bounding box of the object to be dropped in model space
+	vector m_Extents;			//! The size of the boundig box, centered
+
+	vector m_DirectionFunc;		//! How much should the direction be favoured. 
+
+	bool m_DebugEnabled;		//! If 'OnDebug' is to be called
+	vector m_Transform[4];		//! The transformation currently being debugged
+
+	/**@brief Initialization of script variables
+	 * 
+	**/
+	void OnSetup()
+	{
+	}
+
+	/**@brief Debug callback for rendering on the screen
+	**/
+	void OnDebug(vector p0, vector p1, bool hasHit, bool found)
+	{
+	}
+
+	/**@brief Called for first layer contacts to determine if this object should be snapped around or default rv raycast placement is fine
+	 * @return True if bounding snap is to be used
+	 * 
+	**/
+	bool OnFirstContact(Object other)
+	{
+		return false;
+	}
+
+	/**@brief Initial query around the owner position to see if an object should be processed in contact testing
+	 * @return True if the object should be counted
+	 * 
+	**/
+	bool OnQuery(Object other)
+	{
+		return true;
+	}
+
+	/**@brief Ray cast line test from owner to a tested position
+	 * @return True if the line test should be broken and make the transformation invalid
+	 * 
+	**/
+	bool OnCollide(Object other)
+	{
+		return true;
+	}
+};
+
+class Object extends IEntity
+{
+	private void ~Object();
+	private void Object();
+	
+	bool CanBeSkinned()
+	{
+		return false;
+	}
+	
+	/**@brief Delete this object in next frame
+	 * @return \p void
+	 *
+	 * @code
+	 *			ItemBase item = GetGame().GetPlayer().CreateInInventory("GrenadeRGD5");
+	 *			item.Delete();
+	 * @endcode
+	**/
+	void Delete()
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(GetGame().ObjectDelete, this);
+	}
+	
+	proto native void AddProxyPhysics(string proxySelectionName);	
+	
+	proto native void RemoveProxyPhysics(string proxySelectionName);	
+	
+	//! Object entered trigger
+	void OnEnterTrigger(ScriptedEntity trigger) {}
+	
+	//! Object left trigger
+	void OnLeaveTrigger(ScriptedEntity trigger) {}
+
+	//! Retrieve all LODS	
+	proto native bool GetLODS(notnull out array<LOD> lods);
+	
+	//! Retrieve LOD name
+	proto native owned string GetLODName(LOD lod);
+
+	proto native vector GetBoundingCenter();
+	
+	//! Retrieve LOD by given name
+	LOD GetLODByName( string name )
+	{
+		array<LOD> lods = new array<LOD>;
+		GetLODS( lods );
+		
+		for ( int i = 0; i < lods.Count(); ++i )
+		{
+			string lod_name = GetLODName( lods.Get( i ) );
+			lod_name.ToLower();
+			name.ToLower();
+			if ( lod_name == name ) 
+			{
+				return lods.Get( i );
+			}
+		}
+		
+		return NULL;
+	}
+	
+	//! Returns the hiddenSelections array from the object's config
+	TStringArray GetHiddenSelections()
+	{
+		return HiddenSelectionsData.GetHiddenSelectionsConfig(GetType());
+	}
+	
+	//! Returns the hiddenSelectionsTextures array from the object's config
+	TStringArray GetHiddenSelectionsTextures()
+	{
+		return HiddenSelectionsData.GetHiddenSelectionsTexturesConfig(GetType());
+	}
+	
+	//! Returns the hiddenSelectionsMaterials array from the object's config
+	TStringArray GetHiddenSelectionsMaterials()
+	{
+		return HiddenSelectionsData.GetHiddenSelectionsMaterialsConfig(GetType());
+	}
+	
+	//! Creates an explosion on this object by its ammoType in config.
+	void Explode(int damageType, string ammoType = "")
+	{
+		if (ammoType == "")
+			ammoType = ConfigGetString("ammoType");
+		
+		if (ammoType == "")
+			ammoType = "Dummy_Heavy";
+		
+		if ( GetGame().IsServer() )
+		{
+			SynchExplosion();
+			DamageSystem.ExplosionDamage(EntityAI.Cast(this), null, ammoType, GetPosition(), damageType);
+		}
+	}
+	
+	void SynchExplosion()
+	{
+		if ( GetGame().IsDedicatedServer() ) // Multiplayer server
+		{
+			Param1<EntityAI> p = new Param1<EntityAI>(null);			
+			GetGame().RPCSingleParam( this, ERPCs.RPC_EXPLODE_EVENT, p, true);
+		}
+		else if ( !GetGame().IsMultiplayer() ) // Singleplayer
+		{
+			OnExplodeClient();
+		}
+	}
+	
+	//! Called on clients when this object explodes
+	void OnExplodeClient()
+	{
+		string ammoType = ConfigGetString("ammoType");
+		
+		if (ammoType == "")
+			ammoType = "Dummy_Heavy";
+		
+		vector pos = GetPosition();
+		
+		// Handle spawn of particle if one is configured in config
+		AmmoEffects.PlayAmmoParticle(ammoType, pos);			
+		
+		// Handle spawn of Effect if one is configured in config
+		AmmoEffects.PlayAmmoEffect(ammoType, pos);
+	}
+	
+	void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType) { }
+	
+	//! returns action component name by given component index, 'geometry' can be "fire" or "view" (default "" for mixed/legacy mode)
+	proto native owned string GetActionComponentName(int componentIndex, string geometry = "");
+	
+	//! returns action component position by given component index, 'geometry' can be "fire" or "view" (default "" for mixed/legacy mode)
+	proto native owned vector GetActionComponentPosition(int componentIndex, string geometry = "");
+
+	//! outputs action component name list by given component index, 'geometry' can be "fire" or "view" (default "" for mixed/legacy mode). Returns -1 (not found), 0 (found default component only), or 1 (found named component)
+	proto native owned int GetActionComponentNameList(int componentIndex, TStringArray nameList, string geometry = "");
+	
+	//! return true if selection containts action component, 'geometry' can be "fire" or "view" (default "" for mixed/legacy mode)
+	proto native bool IsActionComponentPartOfSelection(int componentIndex, string selectionName, string geometry = "");
+	
+	//! outputs action component index list by given selection, 'geometry' can be "fire" or "view" (default "" for mixed/legacy mode)
+	proto void GetActionComponentsForSelectionName(int level, string selectionName, TIntArray componentIndices);
+	
+	//! The center of the component, in model space
+	proto vector GetActionComponentCenter(int level, int componentIndex);
+	
+	//! The center of the component, in model space
+	proto vector GetActionComponentCenterOOB(int level, int componentIndex);
+	
+	//! The AABB of the component
+	proto void GetActionComponentMinMax(int level, int componentIndex, out vector min, out vector max);
+	
+	//! Flag to determine this object is marked to be deleted soon
+	proto native bool ToDelete();
+	
+	//! Determine whether this object is in the deletion ProcessDirectDamage
+	//! Is useful in the case where a parent is being deleted, since the children will be deleted first
+	//! So to know if something was removed or detached from it's parent, use this check to see if it is because the parent is being deleted
+	proto native bool IsPendingDeletion();
+
+	//! Native functions for getting the level used for calculating the pivot
+	proto native	int			GetGeometryLevel();
+	proto native	int			GetFireGeometryLevel();
+	proto native	int			GetViewGeometryLevel();
+	proto native	int			GetMemoryLevel();
+
+#ifdef DEVELOPER
+	//! Conversion between enfusion and RV bone formats for hierarchy
+	proto 			bool		ToBonePivot(out int pivot, int level, int bone);
+	proto 			bool		FromBonePivot(int pivot, out int level, out int bone);
+#endif
+
+	//! Get the pivot point of the bone from the component index in the LOD, level can be geometry, fire, view or memory
+	proto 			int			GetBonePivot(int level, int component);
+
+	//! Get the pivots assigned to the animation source at the specified LOD
+	proto native	void		GetBonePivotsForAnimationSource(int level, string animationSource, out TIntArray pivots);
+
+	//! returns local space, model space, world space position of the bone 
+	proto native	vector		GetBonePositionLS(int pivot);
+	proto native 	vector		GetBonePositionMS(int pivot);
+	proto native 	vector		GetBonePositionWS(int pivot);
+
+	//! returns local space, model space, world space orientation (quaternion) of a bone 
+	proto native	void 		GetBoneRotationLS(int pivot, out float quaternion[4]);
+	proto native 	void 		GetBoneRotationMS(int pivot, out float quaternion[4]);
+	proto native 	void 		GetBoneRotationWS(int pivot, out float quaternion[4]);
+
+	//! returns local space, model space, world space transformations of a bone 
+	proto native	void 		GetBoneTransformLS(int pivot, out vector transform[4]);
+	proto native 	void 		GetBoneTransformMS(int pivot, out vector transform[4]);
+	proto native 	void 		GetBoneTransformWS(int pivot, out vector transform[4]);
+	
+	/**
+	\brief Get corner positions in worldspace aligned to the orientation of the object (currently only TOP/BOTTOM supported)
+	@param axis The axis the object is aligned to
+	@param corners array[4] of vector, each a corner aligned to the axis ({0,0}, {0,1}, {1,0}, {1,1})
+	\return true if collision box exists, false otherwise
+	*/
+	proto native	void 		GetTightlyPackedCorners(ETransformationAxis axis, out vector corners[4]);
+
+#ifdef DIAG_DEVELOPER
+	void DebugDrawTightlyPackedCorners(ETransformationAxis axis, int color)
+	{
+#ifndef SERVER
+		vector points[2];
+		vector corners[4];
+		
+		GetTightlyPackedCorners(axis, corners);
+
+		points[0] = corners[0];
+		points[1] = corners[1];
+		Shape.CreateLines(color, ShapeFlags.TRANSP | ShapeFlags.ONCE | ShapeFlags.NOOUTLINE | ShapeFlags.NOZBUFFER, points, 2);
+
+		points[0] = corners[1];
+		points[1] = corners[3];
+		Shape.CreateLines(color, ShapeFlags.TRANSP | ShapeFlags.ONCE | ShapeFlags.NOOUTLINE | ShapeFlags.NOZBUFFER, points, 2);
+
+		points[0] = corners[3];
+		points[1] = corners[2];
+		Shape.CreateLines(color, ShapeFlags.TRANSP | ShapeFlags.ONCE | ShapeFlags.NOOUTLINE | ShapeFlags.NOZBUFFER, points, 2);
+
+		points[0] = corners[2];
+		points[1] = corners[0];
+		Shape.CreateLines(color, ShapeFlags.TRANSP | ShapeFlags.ONCE | ShapeFlags.NOOUTLINE | ShapeFlags.NOZBUFFER, points, 2);
+#endif
+	}
+#endif
+	
+	//! Retrieve position
+	proto native vector GetPosition();
+
+	//! Returns world position.
+	//! This function takes proxy transformation into account.
+	proto native vector GetWorldPosition();
+	
+	//! Set position
+	proto native void SetPosition(vector vPos);
+	
+	/**
+	\brief Place object on surface
+	*/
+	proto native void PlaceOnSurface();
+
+	/**
+	\brief Retrieve orientation (yaw, pitch, roll) in <b>degrees</b>
+	\return vector of yaw, pitch and roll angles (x = yaw, y = pitch, z = roll)
+	*/
+	proto native vector GetOrientation();
+
+	/**
+	\brief Set orientation (yaw, pitch, roll) in <b>degrees</b>
+	@param vOrientation, vector of yaw, pitch and roll angles (x = yaw, y = pitch, z = roll)
+	*/
+	proto native void SetOrientation(vector vOrientation);
+	
+	//! Retrieve direction vector
+	proto native vector GetDirection();
+	
+	/**
+	\brief Set direction of object
+	@param vDirection, direction vector
+	\note object up vector is always y-axis
+	*/
+	proto native void SetDirection(vector vPos);
+	
+	//! Retrieve direction up vector
+	proto native vector GetDirectionUp();
+	
+	//! Retrieve direction aside vector
+	proto native vector GetDirectionAside();
+	
+	//! Calculate local position of other entity to this entity
+	proto native vector GetLocalPos(vector vPos);
+	//! Calculate global position to this entity from local position
+	proto native vector GetGlobalPos(vector vPos);
+	
+	//! Retrieve object's speed in global space
+	proto native vector GetSpeed();
+	
+	//! Retrieve object's speed in local space
+	proto native vector GetModelSpeed();
+	
+	//! Returns true if object's geometry can affect pathgraph generation
+	proto native bool CanAffectPathgraph();
+	
+	//! Sets if object's geometry affects pathgraph generation. If first parameter is true, it ignores second parameter and sets affecting pathgraph by parameter set in object's config
+	proto native void SetAffectPathgraph(bool fromConfig, bool affect);
+	
+
+	/**
+	\brief Get Clipping info
+	@param minMax array[2] of vectors, into minMax[0] is returned min, into minMax[1] is returned max
+	\return radius of bounding box
+	@code
+	vector minMax[2];
+	float radius = GetGame().GetPlayer().ClippingInfo(minMax);
+	Print(minMax);
+	Print(radius);
+	@endcode
+	*/
+	proto float ClippingInfo(out vector minMax[2]);
+	
+	/** 
+	\brief Gets collision bounding box
+	@param minMax array[2] of vectors, into minMax[0] is returned min, into minMax[1] is returned max
+	\return true if collision box exists, false otherwise
+	@code
+	vector minMax[2];
+	if(GetGame().GetPlayer().GetCollisionBox(minMax))
+		Print("has box");
+	@endcode
+	*/
+	proto native bool GetCollisionBox(out vector minMax[2]);
+	
+	/** 
+	\brief Gets collision radius (bounding sphere)
+	\return bounding sphere radius
+	*/
+	proto native float GetCollisionRadius();
+	
+	//! Get total damage (clipped to range 0..1)
+	proto native float GetDamage();
+
+	
+	proto native void GetSelectionList(out TStringArray selectionList);
+	
+	//! Returns noise multiplier of surface under object
+	float GetSurfaceNoise()
+	{
+		vector position = GetPosition();
+		return GetGame().SurfaceGetNoiseMultiplier(NULL, position, -1);
+	}
+	
+	//! Returns type of surface under object
+	string GetSurfaceType()
+	{
+		string surface_type;
+		int liquid_type;
+		
+		GetGame().SurfaceUnderObject(this, surface_type,liquid_type);
+//		Print(surface_type);
+//		Print(liquid_type);
+		
+		return surface_type;
+	}
+
+	//! Returns true if the given selection was found in the p3d file. False if otherwise.
+	bool HasSelection( string selection )
+	{
+		TStringArray selections = new TStringArray;
+		GetSelectionList( selections );
+		
+		for ( int i = 0; i < selections.Count(); ++i )
+		{
+			if ( selections.Get( i ) == selection )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	//! Searches object's config for the given animation name. Returns true if it was found, or false if not.
+	bool HasAnimation( string anim_name )
+	{
+		string cfg_path_vehicles = "CfgVehicles " + GetType() + " ";
+		if ( GetGame().ConfigIsExisting (cfg_path_vehicles)  &&  GetGame().ConfigIsExisting (cfg_path_vehicles + "AnimationSources " + anim_name) )
+		{
+			return true;
+		}
+		
+		string cfg_path_weapons = "CfgWeapons " + GetType() + " ";
+		if ( GetGame().ConfigIsExisting (cfg_path_weapons)  &&  GetGame().ConfigIsExisting (cfg_path_weapons + "AnimationSources " + anim_name) )
+		{
+			return true;
+		}
+		
+		string cfg_path_magazines = "CfgMagazines " + GetType() + " ";
+		if ( GetGame().ConfigIsExisting (cfg_path_magazines)  &&  GetGame().ConfigIsExisting (cfg_path_magazines + "AnimationSources " + anim_name) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//! If Returns true if this item has EnergyManager in its config. Otherwise returns false.
+	/*bool HasEnergyManager()
+	{
+		return false;
+	}*/
+	
+	proto native int GetMemoryPointIndex(string memoryPointName);
+	proto native vector GetMemoryPointPos(string memoryPointName);
+	proto native vector GetMemoryPointPosByIndex(int pointIndex);
+	proto native bool MemoryPointExists(string memoryPoint);
+	
+	proto native void CreateDynamicPhysics(int interactionLayers);
+	proto native void EnableDynamicCCD(bool state);
+	proto native void SetDynamicPhysicsLifeTime(float lifeTime);
+
+	//! Called when tree is chopped down. 'cutting_entity' can be tool, or player, if cutting bush with bare hands
+	void OnTreeCutDown(EntityAI cutting_entity);
+	
+	//! Get config class of object
+	string GetType()
+	{
+		string ret;
+		GetGame().ObjectGetType(this, ret);
+	
+		return ret;
+	}
+	
+	//! Get display name of entity
+	string GetDisplayName()
+	{
+		string tmp;
+		if (NameOverride(tmp))
+		{
+			tmp = Widget.TranslateString(tmp);
+		}
+		else
+		{
+			GetGame().ObjectGetDisplayName(this, tmp);
+		}
+		return tmp;
+	}
+	
+	//Used to specify this object will always display it's own name when attached to another object
+	bool DisplayNameRuinAttach()
+	{
+		return false;
+	}
+	
+	//! Returns name of the model of this object without the '.p3d' suffix
+	string GetModelName()
+	{
+		return GetGame().GetModelName(GetType());
+	}
+
+	//! Return path and name of the model
+	proto native owned string GetShapeName();
+
+	int Release()
+	{
+		return GetGame().ObjectRelease(this);
+	}
+	
+	//! Check config class name of the object
+	bool IsKindOf(string type)
+	{
+		return GetGame().ObjectIsKindOf(this, type);
+	}
+		
+	// Check alive state
+	bool IsAlive()
+	{
+		return !IsDamageDestroyed();
+	}
+
+	//! Returns if this entity is Man
+	bool IsMan()
+	{
+		return false;
+	}
+
+	//! Checks if this instance is of type DayZCreature
+	bool IsDayZCreature()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is EntityAI
+	bool IsEntityAI()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is Static Transmitter
+	bool IsStaticTransmitter()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is a non-static Transmitter
+	bool IsTransmitter()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is ItemBase
+	bool IsItemBase()
+	{
+		return false;
+	}
+	
+	//Returns true for protector cases and similar items. Usually can be nested in other cargo while full, unlike clothing..
+	bool IsContainer()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is Magazine
+	bool IsMagazine()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is Ammo Pile
+	bool IsAmmoPile()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is InventoryItem
+	bool IsInventoryItem()
+	{
+		return false;
+	}
+
+	//! Returns if this entity is Clothing
+	bool IsClothing()
+	{
+		return false;
+	}
+
+	//! Returns if this entity is fireplacebase
+	bool IsFireplace()
+	{	
+		return false;
+	}
+	
+	//! Returns if this entity is tree
+	bool IsTree()
+	{	
+		return false;
+	}
+	
+	//! Returns if this entity is rock
+	bool IsRock()
+	{	
+		return false;
+	}
+	
+	//! Returns whether object is PlanBase
+	bool IsWoodBase()
+	{
+		return false;
+	}
+
+	//! Returns if this entity is bush
+	bool IsBush()
+	{
+		return false;
+	}
+	
+	bool IsCuttable()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is Pelt_Base
+	bool IsPeltBase()
+	{
+		return false;
+	}
+
+	//! Returns if this entity is Weapon
+	bool IsWeapon()
+	{
+		return false;
+	}
+	
+	//! returns if this entity is Melee Weapon
+	bool IsMeleeWeapon()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is Building
+	bool IsBuilding()
+	{
+		return false;
+	}
+	
+	EWaterSourceObjectType GetWaterSourceObjectType()
+	{
+		return EWaterSourceObjectType.NONE;
+	}
+	
+	//! Returns if this entity is Well (extends Building)
+	//! DEPRECATED by GetWaterSourceObjectType
+	bool IsWell()
+	{
+		return false;
+	}
+	//! Returns if this entity is a weapon which can shoot explosive ammo
+	bool ShootsExplosiveAmmo()//placed on Object so that we can optimize early checks in DayZGame without casting
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is Fuel Station (extends Building)
+	bool IsFuelStation()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity is transport
+	bool IsTransport()
+	{
+		return false;
+	}
+	
+	//! Returns if this is an appliance, that can be plugged into electric circuit (== not energy source)
+	bool IsElectricAppliance()
+	{
+		return false;
+	}
+
+	//! Returns if this entity can be constucted,deconstructed (e.g. fence,watchtower)
+	bool CanUseConstruction()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity can be built, specifically.
+	bool CanUseConstructionBuild()
+	{
+		return false;
+	}
+	
+	//! Returns if this entity can be constructed without tools
+	bool CanUseHandConstruction()
+	{
+		return false;
+	}
+	
+	bool IsBeingBackstabbed()
+	{
+		return false;
+	}
+	
+	void SetBeingBackstabbed(int backstabType){}
+	
+	//! Returns if this entity if a food item
+	bool IsFood()
+	{
+		return ( IsFruit() || IsMeat() || IsCorpse() || IsMushroom() );
+	}
+	
+	bool IsFruit()
+	{
+		return false;
+	}
+	
+	bool IsMeat()
+	{
+		return false;
+	}
+	
+	bool IsCorpse()
+	{
+		return false;
+	}
+	
+	bool IsMushroom()
+	{
+		return false;
+	}	
+
+	//! Returns if the health of this entity should be displayed (widgets, inventory)
+	bool IsHealthVisible()
+	{
+		return true;
+	}
+	
+	//! Returns true if the health of damage zones should be displayed (instead of global HP of the entity) ( action widgets)
+	bool ShowZonesHealth()
+	{
+		return false;
+	}
+
+	bool IsParticle()
+	{
+		return false;
+	}
+	
+	bool IsItemTent()
+	{
+		return false;
+	}
+	
+	bool IsScriptedLight()
+	{
+		return false;
+	}
+	
+	bool IsHologram()
+	{
+		return false;
+	}
+		
+	bool HasProxyParts()
+	{
+		return false;
+	}
+	
+	bool CanObstruct()
+	{
+		return IsPlainObject() && !IsScenery();
+	}
+	
+	bool CanProxyObstruct()
+	{
+		return HasProxyParts() || CanUseConstruction();
+	}
+	
+	//! can the object's own proxy geometry obstruct it? Currently checking 'ObjIntersectView'
+	bool CanProxyObstructSelf()
+	{
+		return false;
+	}
+	
+	bool CanBeIgnoredByDroppedItem()
+	{
+		return IsBush() || IsTree() || IsMan() || IsDayZCreature() || IsItemBase();
+	}
+	
+	bool CanBeAutoDeleted()
+	{
+		return true;
+	}
+	
+	//! Disables icon in the vicinity, useful for large, immovable items, that are not buildings
+	bool DisableVicinityIcon()
+	{
+		return false;
+	}
+
+	//! Returns low and high bits of networkID.
+	//! This id is shared between client and server for whole server-client session.
+	proto void GetNetworkID( out int lowBits, out int highBits );
+	
+	string GetNetworkIDString()
+	{
+		int low, high;
+		GetNetworkID( low, high );
+		return high.ToString() + low.ToString();
+	}
+
+	override string GetDebugName()
+	{
+		return GetDebugNameNative();
+	}
+	
+	static string GetDebugName(Object o)
+	{
+		if (o)
+			return o.GetDebugName();
+		return "null";
+	}
+	
+	//! native GetDebugName which is internally overloaded where needed
+	proto string GetDebugNameNative();
+	
+	//! Remote procedure call shortcut, see CGame.RPC / CGame.RPCSingleParam
+	void RPC(int rpc_type, array<ref Param> params, bool guaranteed, PlayerIdentity recipient = NULL)
+	{
+		GetGame().RPC(this, rpc_type, params, guaranteed, recipient);
+	}
+	
+	//! Remote procedure call shortcut, see CGame.RPCSingleParam / CGame.RPC
+	void RPCSingleParam(int rpc_type, Param param, bool guaranteed, PlayerIdentity recipient = NULL)
+	{
+		GetGame().RPCSingleParam(this, rpc_type, param, guaranteed, recipient);
+	}
+	
+	/**
+  \brief Called after remote procedure call is recieved for this object
+		@param rpc_type user defined identification of RPC
+		@param ctx read context for params
+	*/
+	void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx);
+
+	vector GetSelectionPositionOld(string name)
+	{
+		return GetGame().ObjectGetSelectionPosition(this, name);
+	}
+	
+	vector GetSelectionPositionLS(string name)
+	{
+		return GetGame().ObjectGetSelectionPositionLS(this, name);
+	}
+	
+	vector GetSelectionPositionMS(string name)
+	{
+		return GetGame().ObjectGetSelectionPositionMS(this, name);
+	}
+	
+	vector GetSelectionPositionWS(string name)
+	{
+		return GetGame().ObjectGetSelectionPositionWS(this, name);
+	}
+
+	
+	vector ModelToWorld(vector modelPos)
+	{
+		return GetGame().ObjectModelToWorld(this, modelPos);
+	}
+	
+	vector WorldToModel(vector worldPos)
+	{
+		return GetGame().ObjectWorldToModel(this, worldPos);
+	}
+
+	// config class API	
+	
+	proto string ConfigGetString(string entryName);
+	/**
+  \brief Get a raw strings from config entry.
+	@param entryName 
+	\return value output string
+	\note use 'FormatRawConfigStringKeys' method to change localization keys to script-friendly
+	*/
+	proto string ConfigGetStringRaw(string entryName);
+	proto int ConfigGetInt(string entryName);
+	bool ConfigGetBool(string entryName)
+	{
+		return (ConfigGetInt(entryName) == 1);
+	}
+
+	proto float ConfigGetFloat(string entryName);
+	proto vector ConfigGetVector(string entryName);
+	//proto ParamEntry ConfigGetEntry(string entryName);
+
+	/**
+  \brief Get array of strings from config entry.
+	@param entryName 
+	@param value output
+	*/
+	proto native void		ConfigGetTextArray(string entryName, out TStringArray values);
+
+	/**
+  \brief Get array of raw strings from config entry.
+	@param entryName 
+	@param value output in raw format (localization keys '$STR_' are not translated).
+	\note use 'FormatRawConfigStringKeys' method to change localization keys to script-friendly
+	*/
+	proto native void		ConfigGetTextArrayRaw(string entryName, out TStringArray values);
+	
+	/**
+  \brief Get array of floats from config entry.
+	@param entryName 
+	@param value output
+	*/
+	proto native void		ConfigGetFloatArray(string entryName, out TFloatArray values);
+	
+	/**
+  \brief Get array of integers from config entry.
+	@param entryName 
+	@param value output
+	*/
+	proto native void		ConfigGetIntArray(string entryName, out TIntArray values);
+
+	/**
+  \brief Checks if given entry exists.
+	@param entryName 
+	*/
+	proto native bool		ConfigIsExisting(string entryName);
+	
+	//! Compares config class name to given string
+	bool KindOf( string tag )
+	{
+		bool found = false;
+		string item_name = this.GetType();	
+		TStringArray item_tag_array = new TStringArray;
+		ConfigGetTextArray("cfgVehicles " + item_name + " itemInfo", item_tag_array);	
+		
+		int array_size = item_tag_array.Count();
+		for (int i = 0; i < array_size; i++)
+		{
+			if ( item_tag_array.Get(i) == tag )
+			{
+				found = true;
+				break;
+			}
+		}
+		return found;
+	}
+	
+	bool IsAnyInherited( array<typename> typenames )
+	{
+		bool ret;
+		for( int i = 0; i < typenames.Count(); i++ )
+		{
+			ret = ret || this.IsInherited( typenames.Get(i) );
+		}
+		return ret;
+	}
+		
+	/**
+  \brief Is this just static object without config? So we can avoid calling unnecessary methods
+	*/
+	proto native bool IsPlainObject();
+		
+	/**
+  \brief Is this Scenery? (handy for excluding terain when it is not needed)
+	*/
+	proto native bool IsScenery();
+	
+	// Damage system
+	/**
+  	\brief Checks if object's DamageSystem has been initialized(despite the name, does not really reliably answer the question whether the object is configured to have damage system or not)
+	*/
+	proto native bool   HasDamageSystem();
+	
+	/**
+  	\brief Checks if object is destroyed.
+	*/
+	proto native bool   IsDamageDestroyed();
+	
+	/**
+	\brief Sets the time over which to perform DestructTent/DestructTree
+	@param time time over which to perform DestructTent/DestructTree
+	*/
+	proto native void  SetDestructTime(float time);
+	
+	/**
+	\brief Returns current state of health.
+	@param zoneName if empty string, returns state of global health
+	@param healthType if empty string, returns state of main health
+	*/
+	proto native float  GetHealth(string zoneName, string healthType);
+	
+	/**
+	\brief Returns current state of health in range <0, 1>.
+	@param zoneName if empty string, returns state of global health
+	@param healthType if empty string, returns state of main health
+	*/
+	proto native float  GetHealth01(string zoneName, string healthType);
+	
+	/**
+  \brief Returns maximum value of health.
+	@param zoneName if empty string, returns state of global health
+	@param healthType if empty string, returns state of main health
+	*/
+	proto native float  GetMaxHealth(string zoneName, string healthType);
+	
+	/**
+  \brief Sets current state of health.
+	@param zoneName if empty string, sets state of global health
+	@param healthType if empty string, sets state of main health
+	*/
+	proto native void   SetHealth(string zoneName, string healthType, float value);
+	
+	/**
+  \brief Sets full health to all zones and removes fatal damage when applicable
+	*/
+	proto native void   SetFullHealth();
+	
+	/**
+  \brief Adds health.
+	@param zoneName if empty string, sets state of global health
+	@param healthType if empty string, sets state of main health
+	*/
+	proto native void   AddHealth(string zoneName, string healthType, float value);
+
+	/**
+  \brief Decreases health.
+	@param zoneName if empty string, sets state of global health
+	@param healthType if empty string, sets state of main health
+	*/
+	proto native void   DecreaseHealth(string zoneName, string healthType, float value);
+	
+	/**
+  \brief Decreases health with the option of auto-deleting the object if its ruined.
+	@param zoneName if empty string, sets state of global health
+	@param healthType if empty string, sets state of main health
+	*/
+	void   DecreaseHealth(string zoneName, string healthType, float value, bool auto_delete)
+	{
+		DecreaseHealth( zoneName, healthType, value);
+		
+		float result_health = GetHealth(zoneName, healthType);
+		
+		if ( auto_delete  &&  result_health <= 0 )
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(GetGame().ObjectDelete, this); 
+		}
+	}
+	
+	//! Equivalent of GetHealth("", "");
+	float GetHealth()
+	{
+		return GetHealth("", "");
+	}
+	//! Equivalent of GetHealth01("", "");
+	float GetHealth01()
+	{
+		return GetHealth01("", "");
+	}
+	//! Equivalent of GetMaxHealth("", "");
+	float GetMaxHealth()
+	{
+		return GetMaxHealth("", "");
+	}
+	//! Equivalent of SetHealth("", "", float value);
+	void SetHealth(float health)
+	{
+		SetHealth("", "", health);
+	}
+	//! Equivalent of SetHealth("", "", float value);
+	void SetGlobalHealth(float health)
+	{
+		SetHealth("", "", health);
+	}
+	//! Sets specific health level. It will use the cutoff value as returned by 'GetHealthLevelValue' as the health value for the given health level, which means it will always be set to the max health as allowed by the given health level.
+	void SetHealthLevel(int healthLevel, string zone = "")
+	{
+		SetHealth01(zone,"", GetHealthLevelValue(healthLevel, zone));
+	}
+	//! Similar to 'SetHealthLevel', but allows to jump up/down 'healthLevelDelta' amount of health levels from the current one. Positive values cause health level increase, therefore damage the item, and vice-versa.
+	void AddHealthLevel(int healthLevelDelta, string zone = "")
+	{
+		int maxHealthLevel = GetNumberOfHealthLevels(zone) - 1;
+		int newHealthLevel = Math.Clamp(GetHealthLevel(zone) + healthLevelDelta,0,maxHealthLevel);
+		SetHealthLevel(newHealthLevel,zone);
+	}
+	
+	//! Sets health relative to its maximum
+	void SetHealth01(string zoneName, string healthType, float coef)
+	{
+		SetHealth(zoneName,healthType,(GetMaxHealth(zoneName,healthType)*coef));
+	}
+	//! Sets health to its maximum (zone or global)
+	void SetHealthMax(string zoneName = "", string healthType = "")
+	{
+		SetHealth(zoneName,healthType,GetMaxHealth(zoneName,healthType));
+	}
+	//! Equivalent of AddHealth("", "", float value);
+	void AddHealth( float add_health)
+	{
+		AddHealth("", "", add_health);
+	}
+	//! Equivalent of DecreaseHealth("", "", float value, bool auto_delete);
+	void DecreaseHealth(float dec_health, bool auto_delete = true)
+	{
+		DecreaseHealth("", "", dec_health, auto_delete);
+	}
+	//! Decreases health by the given coeficient.
+	void DecreaseHealthCoef(float dec_health_coef, bool auto_delete = true)
+	{
+		float current_health = GetHealth();
+		float final_health_coef = GetHealth01() - dec_health_coef;
+		float final_health = GetMaxHealth() * final_health_coef;		
+		DecreaseHealth("", "", current_health - final_health);
+	}
+
+	/**
+  \brief Applies damage on object.
+	@param damageType DT_CLOSE_COMBAT/DT_FIRE_ARM/DT_EXPLOSION/DT_CUSTOM
+	@param source source of damage
+	@param componentName which 'DamageZone' was hit (NOT a component name, actually!)
+	@param ammoName ammoType, which defines how much damage should be applied
+	@param directHitModelPos local position of hit
+	@param damageCoef multiplier of applied damage
+	@param flags enables/disables special behaviour depending on the flags used (ProcessDirectDamageFlags type)
+	*/
+	proto native void ProcessDirectDamage(int damageType, EntityAI source, string componentName, string ammoName, vector modelPos, float damageCoef = 1.0, int flags = 0);
+	
+	/**
+  	\brief Event called from C++ right before damage is applied
+		@return whether to apply the damage or not
+	*/
+	bool EEOnDamageCalculated(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		return true;
+	}
+	
+	/**
+  \brief Obtains a list of nammes of all object's damage zones
+	@param list of names
+	*/
+	proto native void GetDamageZones(out TStringArray dmgZones);
+	
+	/**
+  \brief Obtains middle position of damage zone based on it's name
+	@param name of the damage zone
+	*/
+	proto native vector GetDamageZonePos(string zoneName);
+	/**
+  \brief Obtains name of damage zone based on index of specific component
+	@param index of the component
+	*/
+	proto native owned string GetDamageZoneNameByComponentIndex(int componentIndex);
+	
+	/**
+  	\brief Returns global health level specified in object's config class parameter healthLevels
+	     (range is usually 0..4, 0 = pristine, 1 = worn, 2 = damaged, 3 = badly damaged, 4 = ruined but can be changed).
+	@param zoneName if empty string, returns state of global health level
+	*/
+	proto native int GetHealthLevel(string zone = "");
+	
+	/**
+  	\brief Returns global number of health levels specified in object's config class parameter healthLevels
+	     (range is usually 0..4, 0 = pristine, 1 = worn, 2 = damaged, 3 = badly damaged, 4 = ruined but can be changed).
+	@param zoneName if empty string, returns number of global health levels
+	*/
+	proto native int GetNumberOfHealthLevels(string zone = "");
+	
+	/**
+  	\brief Returns cutoff value for health level specified in object's config class parameter healthLevels
+	@param zoneName if empty string, returns number of global health levels
+	@param healthLevel the health level to get the value from
+	*/
+	proto native float GetHealthLevelValue(int healthLevel, string zone = "");
+	
+
+	/**
+  	\brief Returns if object can receive damage
+	*/
+	proto native bool GetAllowDamage();
+	/**
+  	\brief Enable or disable object to receive damage
+	@param enable or disable
+	*/
+	proto native void SetAllowDamage(bool val);
+	
+	/**
+	\brief Returns if object is destroyable
+	*/
+	proto native bool GetCanBeDestroyed();
+	
+	/**
+	\brief Enable or disable destruction of object (after health is depleated)
+	@param enable or disable
+	*/
+	proto native void SetCanBeDestroyed(bool val);
+	
+	/**
+	\brief Returns whether the object is ruined (0 Health).
+	\return \p bool true = item has 0 Health or less
+	@code
+		if ( item.IsRuined() )
+		{
+			Print("Object is ruined!");
+		}
+	@endcode
+	*/
+	bool IsRuined()
+	{
+		return IsDamageDestroyed();
+	}
+	
+	//! Event called from C++ when simulation is enabled
+	void OnSimulationEnabled() {}
+	
+	//! Event called from C++ when simulation is disabled
+	void OnSimulationDisabled() {}
+
+	void GetActions(typename action_input_type, out array<ActionBase_Basic> actions)
+	{
+	}
+
+	//! Plays the given sound once on this object's instance. Range is in meters. Created sound is only local, unless create_local is set to false. Returns the sound itself.
+	SoundOnVehicle PlaySound(string sound_name, float range, bool create_local = true)
+	{
+		return GetGame().CreateSoundOnObject(this, sound_name, range, false, create_local);
+	}
+	
+	//! Plays the given sound in loop on this object's instance. Range is in meters. Created sound is only local, unless create_local is set to false. Returns the sound itself.
+	SoundOnVehicle PlaySoundLoop(string sound_name, float range, bool create_local = true)
+	{
+		return GetGame().CreateSoundOnObject(this, sound_name, range, true, create_local);
+	}
+	
+	//! EffectSound - plays soundset on this object and returns state of the sound (true - played, false - not played)
+	bool PlaySoundSet( out EffectSound sound, string sound_set, float fade_in, float fade_out, bool loop = false )
+	{
+		if ( GetGame() && !GetGame().IsDedicatedServer() )
+		{
+			if ( sound )
+			{
+				if ( loop )
+				{
+					return true;
+				}
+				else
+				{
+					StopSoundSet( sound );		//auto stop for non-looped sounds
+				}
+			}
+			
+			sound = SEffectManager.PlaySoundOnObject( sound_set, this, fade_in, fade_out, loop );
+			sound.SetAutodestroy( true );
+			
+			return true;
+		}
+		
+		return false;
+	}	
+
+	//! EffectSound - plays soundset on this object in loop and returns state of the sound (true - played, false - not played)
+	bool PlaySoundSetLoop( out EffectSound sound, string sound_set, float fade_in, float fade_out )
+	{
+		return PlaySoundSet( sound, sound_set, fade_in, fade_out, true );
+	}
+	
+	//! Same as PlaySoundSetAtMemoryPointLooped, only requests stoppage of the currently playing EffectSound if it already exists and playing, before playing the new sound
+	bool PlaySoundSetAtMemoryPointLoopedSafe(out EffectSound sound, string soundSet, string memoryPoint,float play_fade_in = 0, float stop_fade_out = 0)
+	{
+		if (sound && sound.IsPlaying())
+		{
+			sound.SoundStop();
+		}
+		return PlaySoundSetAtMemoryPointLooped(sound, soundSet, memoryPoint, play_fade_in, stop_fade_out);
+	}
+	
+	bool PlaySoundSetAtMemoryPointLooped(out EffectSound sound, string soundSet, string memoryPoint, float play_fade_in = 0, float stop_fade_out = 0)
+	{
+		return PlaySoundSetAtMemoryPoint(sound, soundSet, memoryPoint, true, play_fade_in, stop_fade_out);
+	}
+
+	
+	bool PlaySoundSetAtMemoryPoint(out EffectSound sound, string soundSet, string memoryPoint, bool looped = false, float play_fade_in = 0, float stop_fade_out = 0)
+	{
+		vector pos;
+		
+		if (MemoryPointExists(memoryPoint))
+		{
+			pos = GetMemoryPointPos(memoryPoint);
+			pos = ModelToWorld(pos);
+		}
+		else
+		{
+			ErrorEx(string.Format("Memory point %1 not found when playing soundset %2 at memory point location", memoryPoint, soundSet));
+			return false;
+		}
+		
+		sound = SEffectManager.PlaySoundEnviroment(soundSet, pos, play_fade_in, stop_fade_out, looped);
+		return true;
+	}
+	
+	//! EffectSound - stops soundset and returns state of the sound (true - stopped, false - not playing)
+	bool StopSoundSet( out EffectSound sound )
+	{
+		if ( sound && GetGame() && ( !GetGame().IsDedicatedServer() ) )
+		{
+			sound.SoundStop();
+			sound = null;
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void PostAreaDamageActions();
+	void PreAreaDamageActions();
+	
+	void SpawnDamageDealtEffect();
+	void OnReceivedHit(ImpactEffectsData hitData);
+
+	//! DEPRECATED
+	void OnPlayerRecievedHit();
+	
+	bool HasNetworkID()
+	{
+		int lo = 0;
+		int hi = 0;
+		GetNetworkID(lo, hi);
+		return lo | hi;
+	}
+	
+	bool NameOverride(out string output)
+	{
+		return false;
+	}
+	
+	bool DescriptionOverride(out string output)
+	{
+		return false;
+	}
+	
+	EntityAI ProcessMeleeItemDamage(int mode = 0) {}
+	
+	bool CanBeRepairedToPristine()
+	{
+		return false;
+	}
+	
+	vector GetCenter()
+	{
+		if ( MemoryPointExists("ce_center") )
+		{
+			//Print("CE_CENTER found");
+			return ModelToWorld( GetMemoryPointPos("ce_center") );
+		}
+		else
+		{
+			//Print("CE_CENTER DOING A BAMBOOZLE => not found");
+			return GetPosition() + Vector(0, 0.2, 0);
+		}
+	}
+	
+	#ifdef DEVELOPER
+	void SetDebugItem();
+	#endif
+	
+	void AddArrow(Object arrow, int componentIndex, vector closeBonePosWS, vector closeBoneRotWS)
+	{
+		int pivot = GetBonePivot(GetFireGeometryLevel(), componentIndex);
+		vector parentTransMat[4];
+		vector arrowTransMat[4];
+		
+		if (pivot == -1)
+		{
+			GetTransform(parentTransMat);
+		}
+		else
+		{
+			GetBoneTransformWS(pivot, parentTransMat);
+		}
+		
+		float scale = GetScale();
+		scale = 1 / (scale * scale);
+		
+		arrow.GetTransform(arrowTransMat);
+		Math3D.MatrixInvMultiply4(parentTransMat, arrowTransMat, arrowTransMat);
+		
+		// orthogonalize matrix - parent might be skewed
+		Math3D.MatrixOrthogonalize4(arrowTransMat);
+				
+		arrowTransMat[3] = arrowTransMat[3] * scale;
+		
+		arrow.SetTransform(arrowTransMat);
+		
+		AddChild(arrow, pivot);
+	}
+	
+	bool CanBeActionTarget()
+	{
+		return !IsHologram();
+	}
+	
+	bool HasFixedActionTargetCursorPosition()
+	{
+		return false;
+	}
+
+	//Debug
+	//----------------------------------------------
+	/*void DbgAddPxyPhy(string slot)
+	{
+		Print("AddProxyPhysics slot: " + slot);
+		AddProxyPhysics(slot);
+	}*/
+};
diff --git a/scripts/3_Game/DayZ/Entities/ObjectTyped.c b/scripts/3_Game/DayZ/Entities/ObjectTyped.c
new file mode 100644
index 0000000000000000000000000000000000000000..9df98310b1f06965c3b9e46b8cbc4256bc448234
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/ObjectTyped.c
@@ -0,0 +1,4 @@
+class ObjectTyped extends Object
+{
+	
+};
diff --git a/scripts/3_Game/DayZ/Entities/ScriptedEntity.c b/scripts/3_Game/DayZ/Entities/ScriptedEntity.c
new file mode 100644
index 0000000000000000000000000000000000000000..01290fb8b331c6951f5fad362a5302c6144ebe39
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/ScriptedEntity.c
@@ -0,0 +1,66 @@
+enum TriggerShape
+{
+	BOX,
+	SPHERE,
+	CYLINDER,
+}
+
+class ScriptedEntity extends EntityAI
+{
+	/**
+	\brief Sets collision properties for object
+		\param mins \p vector Min values of box
+		\param maxs \p vector Max values of box
+		\param radius \p float Radius of bounding sphere
+		\note This function is obsolete, use rather SetCollisionBox()
+	*/
+	proto native void SetClippingInfo(vector mins, vector maxs, float radius);
+	
+	/**
+	\brief Sets collision box for object
+		\param mins \p vector Min values of box
+		\param maxs \p vector Max values of box
+		\note Automatically sets TriggerShape.BOX
+		\n usage :
+		@code
+			vector mins = "-1 -1 -1";
+			vector maxs = "1 1 1";
+			SetCollisionBox(mins, maxs);
+		@endcode
+	*/
+	proto native void SetCollisionBox(vector mins, vector maxs);
+		
+	/**
+	\brief Sets collision sphere for object
+		\param radius \p float Radius of cylinder
+		\note Automatically sets TriggerShape.SPHERE
+		\n usage :
+		@code
+			SetCollisionSphere(3);
+		@endcode
+	*/
+	proto native void SetCollisionSphere(float radius);
+	
+	/**
+	\brief Sets collision cylinder for object
+		\param radius \p float Radius of cylinder
+		\param height \p float Height of cylinder
+		\note Automatically sets TriggerShape.CYLINDER
+		\n usage :
+		@code
+			SetCollisionCylinder(3, 6);
+		@endcode
+	*/
+	proto native void SetCollisionCylinder(float radius, float height);	
+		
+	//! Set the TriggerShape to be used, default is TriggerShape.BOX
+	proto native void SetTriggerShape(TriggerShape shape);
+	
+	//! Get the current TriggerShape
+	proto native TriggerShape GetTriggerShape();
+	
+	override bool IsInventoryVisible()
+	{
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Entities/SoundOnVehicle.c b/scripts/3_Game/DayZ/Entities/SoundOnVehicle.c
new file mode 100644
index 0000000000000000000000000000000000000000..91dc35cd879ddbb11cc74996fdd31a5f2fd5cd0d
--- /dev/null
+++ b/scripts/3_Game/DayZ/Entities/SoundOnVehicle.c
@@ -0,0 +1,8 @@
+class SoundOnVehicle extends Entity
+{
+	proto native float GetSoundLength();
+};
+
+class SoundWaveOnVehicle extends Entity
+{
+};
diff --git a/scripts/3_Game/DayZ/Enums/EActions.c b/scripts/3_Game/DayZ/Enums/EActions.c
new file mode 100644
index 0000000000000000000000000000000000000000..50105ae1beff774a129fc82da6d6af4dab3281b2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EActions.c
@@ -0,0 +1,79 @@
+enum EActions
+{
+	GET_TOTAL_WEIGHT,
+	GET_TOTAL_WEIGHT_RECALC,
+	GET_PLAYER_WEIGHT,
+	GET_PLAYER_WEIGHT_RECALC,
+	SET_MAX_QUANTITY,
+	ADD_QUANTITY,
+	REMOVE_QUANTITY,
+	SET_QUANTITY_0,
+	INJECT_STRING_RABBIT,
+	INJECT_STRING_TIGER,
+	ADD_HEALTH,
+	REMOVE_HEALTH,
+	DESTROY_HEALTH,
+	WATCH_ITEM,
+	WATCH_PLAYER,
+	USER_ACTION,
+	ADD_TEMPERATURE,
+	REMOVE_TEMPERATURE,
+	ADD_WETNESS,
+	REMOVE_WETNESS,
+	LIQUIDTYPE_UP,
+	LIQUIDTYPE_DOWN,
+	PRINT_BULLETS,
+	SPIN,
+	FOOD_STAGE_PREV,
+	FOOD_STAGE_NEXT,
+	MAKE_SPECIAL,
+	DELETE,
+	SEPARATOR,
+	ACTIVATE_ENTITY,
+	DEACTIVATE_ENTITY,
+	FIX_ENTITY,
+	BROOM_BURN_VERY_SHORT,
+	BROOM_BURN_SHORT,
+	BROOM_BURN_MEDIUM,
+	BROOM_BURN_LONG,
+	ALARM_SET_AHEAD,
+	CAR_HORN_START_LONG,
+	CAR_HORN_START_SHORT,
+	CAR_HORN_STOP,
+	CAR_FUEL_FULL,
+	CAR_FUEL_EMPTY,
+	CAR_FUEL_INCREASE,
+	CAR_FUEL_DECREASE,
+	CAR_COOLANT_FULL,
+	CAR_COOLANT_EMPTY,
+	CAR_COOLANT_INCREASE,
+	CAR_COOLANT_DECREASE,
+	BUILDING_OUTPUT_LOG,
+	BUILDING_PLAY_DOOR_SOUND,
+	BUILDING_OPEN_DOOR,
+	BUILDING_CLOSE_DOOR,
+	BUILDING_LOCK_DOOR,
+	BUILDING_UNLOCK_DOOR,
+	SPECIALIZED_ACTION1,
+	SPECIALIZED_ACTION2,
+	SPECIALIZED_ACTION3,
+	SPECIALIZED_ACTION4,
+	SPECIALIZED_ACTION5,
+	SPECIALIZED_ACTION6,
+	
+	
+	//<----add new individual types above this line
+	
+	
+	DEBUG_AGENTS_RANGE_INJECT_START = 100,
+	DEBUG_AGENTS_RANGE_INJECT_END = 199,
+	
+	DEBUG_AGENTS_RANGE_REMOVE_START = 200,
+	DEBUG_AGENTS_RANGE_REMOVE_END = 299,
+	
+	DEBUG_ITEM_WATCH_BUTTON_RANGE_START = 300,
+	DEBUG_ITEM_WATCH_BUTTON_RANGE_END = 309,
+	
+	RECIPES_RANGE_START = 1000,
+	RECIPES_RANGE_END = 3000,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EAgents.c b/scripts/3_Game/DayZ/Enums/EAgents.c
new file mode 100644
index 0000000000000000000000000000000000000000..862289f176f09cd735ecd4c5ca65bf419110b792
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EAgents.c
@@ -0,0 +1,13 @@
+// BEWARE, ALL NUMBERS 2 RAISED TO THE POWER OF 0 - 32, MAX 32 INDIVIDUAL AGENTS, MUST MATCH CONFIG-SIDE AGENT CONFIGURATION
+enum eAgents
+{
+	//agent list
+	CHOLERA 		= 1;
+	INFLUENZA 		= 2;
+	SALMONELLA		= 4;
+	BRAIN 			= 8;
+	FOOD_POISON		= 16;
+	CHEMICAL_POISON	= 32;
+	WOUND_AGENT		= 64;
+	NERVE_AGENT		= 128;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EAnimSoundEventID.c b/scripts/3_Game/DayZ/Enums/EAnimSoundEventID.c
new file mode 100644
index 0000000000000000000000000000000000000000..e3a8975b4ecc7e53a23432154803fa8631ca26a6
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EAnimSoundEventID.c
@@ -0,0 +1,4 @@
+enum EAnimSoundEventID
+{
+	DROP = 898
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EBrokenLegs.c b/scripts/3_Game/DayZ/Enums/EBrokenLegs.c
new file mode 100644
index 0000000000000000000000000000000000000000..9616e9f7f4d0301c98807ad83ee66cd4de41d045
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EBrokenLegs.c
@@ -0,0 +1,6 @@
+enum eBrokenLegs
+{
+	NO_BROKEN_LEGS = 0,
+	BROKEN_LEGS = 1,
+	BROKEN_LEGS_SPLINT = 2,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ECameraZoomType.c b/scripts/3_Game/DayZ/Enums/ECameraZoomType.c
new file mode 100644
index 0000000000000000000000000000000000000000..6e0660ae9b736cf0da9ac4d47b7cfbe268713b15
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ECameraZoomType.c
@@ -0,0 +1,6 @@
+enum ECameraZoomType
+{
+	NONE 	= 0,
+	NORMAL 	= 1,
+	SHALLOW	= 2,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ECharGender.c b/scripts/3_Game/DayZ/Enums/ECharGender.c
new file mode 100644
index 0000000000000000000000000000000000000000..478e6bc8c0e8778dafda8860ca820e377b689186
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ECharGender.c
@@ -0,0 +1,5 @@
+enum ECharGender
+{
+	Male	= 0,
+	Female	= 1
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EConsumeType.c b/scripts/3_Game/DayZ/Enums/EConsumeType.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a4843cdd078850d7f8717292371a78a83368d7c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EConsumeType.c
@@ -0,0 +1,7 @@
+enum EConsumeType
+{
+	ITEM_SINGLE_TIME,
+	ITEM_CONTINUOUS,
+	ENVIRO_POND,
+	ENVIRO_WELL,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EContaminationTypes.c b/scripts/3_Game/DayZ/Enums/EContaminationTypes.c
new file mode 100644
index 0000000000000000000000000000000000000000..61e6e8d0281ffa21c7699b5b55b62003a6845be8
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EContaminationTypes.c
@@ -0,0 +1,7 @@
+enum EContaminationTypes
+{
+	ITEM_BADGE_CONTAMINATED = 1;
+	ITEM_BADGE_POISONED 	= 2;
+	ITEM_BADGE_NERVE_GAS	= 4;
+	ITEM_BADGE_DIRTY 		= 8;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ECrewMemberState.c b/scripts/3_Game/DayZ/Enums/ECrewMemberState.c
new file mode 100644
index 0000000000000000000000000000000000000000..c4e225ef2cbe9f75a92bc8182893d7dd4e0ea631
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ECrewMemberState.c
@@ -0,0 +1,6 @@
+enum ECrewMemberState
+{
+	DEFAULT			= 0,
+	UNCONSCIOUS		= 1,
+	DEAD
+}
diff --git a/scripts/3_Game/DayZ/Enums/EDayZProfilesOptions.c b/scripts/3_Game/DayZ/Enums/EDayZProfilesOptions.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f655e1f1a01e1fa864f9c5534b9c7bc667bae01
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EDayZProfilesOptions.c
@@ -0,0 +1,17 @@
+enum EDayZProfilesOptions
+{
+	HUD,
+	CROSSHAIR,
+	QUICKBAR,
+	SERVER_MESSAGES, //SYSTEM_CHAT_MSG ??
+	USERS_CHAT, //DIRECT_CHAT_MSG
+	RADIO_CHAT, //RADIO_CHAT_MSG	
+	GAME_MESSAGES,
+	ADMIN_MESSAGES,
+	PLAYER_MESSAGES,
+	SERVERINFO_DISPLAY,
+	BLEEDINGINDICATION,
+	CONNECTIVITY_INFO,
+	HUD_BRIGHTNESS,
+	MAX
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EDiagMenuIDs.c b/scripts/3_Game/DayZ/Enums/EDiagMenuIDs.c
new file mode 100644
index 0000000000000000000000000000000000000000..8435e7cb05a2cb732f4d4be3219b35cc6393292e
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EDiagMenuIDs.c
@@ -0,0 +1,205 @@
+enum DiagMenuIDs
+{
+	SCRIPTS_MENU,
+	
+	VEHICLES,
+		VEHICLE_DEBUG_OUTPUT,
+		VEHICLE_DUMP_CRASH_DATA,
+
+	INVENTORY_MENU,
+		INVENTORY_ENTITY_PLACEMENT_CALLBACK_DEBUG,
+	
+	TRANSFER_VALUES_MENU,
+		TRANSFER_VALUES_SHOW,
+	
+	CRAFTING_MENU,
+		CRAFTING_GENERATE,
+		CRAFTING_INSTANT,
+		CRAFTING_DUMP,
+	
+	CHEATS_MENU,
+		CHEATS_MODIFIERS,
+		CHEATS_KILL_PLAYER,
+		CHEATS_INVINCIBILITY,
+		CHEATS_DISABLE_STAMINA,
+		CHEATS_RESET_PLAYER,
+		CHEATS_RESET_PLAYER_MAX,
+		CHEATS_INVENTORY_ACCESS,
+		CHEATS_FIX_ITEMS,
+		CHEATS_CREATE_HIT,
+		CHEATS_CREATE_HIT_LIGHT,
+	
+	PLAYER_AGENTS_MENU,
+		PLAYER_AGENTS_INJECTS_SHOW,
+	
+	SOFT_SKILLS_MENU,	
+		SOFT_SKILLS_SHOW_DEBUG,
+		SOFT_SKILLS_TOGGLE_STATE,
+		SOFT_SKILLS_TOGGLE_MODEL,
+		SOFT_SKILLS_SPECIALTY_VALUE,
+	
+	LIFESPAN_MENU,
+		LIFESPAN_BLOODY_HANDS,
+		LIFESPAN_PLAYTIME_UPDATE,
+	
+	MISC_MENU,
+		MISC_ACTION_ON_CURSOR,
+		MISC_DISABLE_PERSONAL_LIGHT,
+		MISC_ITEM_DEBUG_ACTIONS,
+		MISC_LOG_PLAYER_STATS,
+		MISC_ACTION_TARGETS_MENU,
+			MISC_ACTION_TARGETS_NEW,
+			MISC_ACTION_TARGETS_DEBUG,
+			MISC_ACTION_TARGETS_SELPOS_DEBUG,
+		MISC_PERMANENT_CROSSHAIR,
+		MISC_TELEPORT_BREAKS_SYNC,
+		MISC_VEHICLE_GETOUT_BOX,
+		MISC_VEHICLE_GETOUT_RAYCAST,
+		MISC_TOGGLE_HUD,
+		MISC_ENVIRONMENT_MENU,
+			MISC_ENVIRONMENT_DEBUG,
+			MISC_ENVIRONMENT_LOGGING_DRYWET,
+		MISC_FALLDAMAGE_DEBUG,
+		MISC_DISPLAY_PLAYER_INFO,
+		MISC_UNIVERSAL_TEMPERATURE_SOURCES,
+		MISC_DRAW_CHECKERBOARD,
+		MISC_BULLET_IMPACT,
+		MISC_PRESENCE_NOTIFIER_DBG,
+		MISC_GO_UNCONSCIOUS,
+		MISC_GO_UNCONSCIOUS_DELAYED,
+		MISC_QUICK_RESTRAIN,	
+		MISC_HAIR_MENU,
+			MISC_HAIR_DISPLAY_DEBUG,
+			MISC_HAIR_LEVEL,
+			MISC_HAIR_LEVEL_HIDE,
+			MISC_HAIR_HIDE_ALL,
+		MISC_CAM_SHAKE,
+		MISC_QUICK_FISHING,
+		MISC_HOLOGRAM,
+		MISC_SHOCK_IMPACT,
+		MISC_SHOW_PLUG_ARROWS,
+		MISC_BREATH_VAPOR_LVL,
+		MISC_TARGETABLE_BY_AI,
+		MISC_HIT_INDICATION_MENU,
+			MISC_HIT_INDICATION_DEBUG,
+			MISC_HIT_INDICATION_SPAWN_HIT,
+			MISC_HIT_INDICATION_SPAWN_HIT_DIRECTION,
+			MISC_HIT_INDICATION_MODE,
+			MISC_HIT_INDICATION_TYPE,
+			MISC_HIT_INDICATION_DURATION,
+			MISC_HIT_INDICATION_BREAKPOINT,
+			MISC_HIT_INDICATION_DISTANCE,
+			MISC_HIT_INDICATION_ROTATION,
+			MISC_HIT_INDICATION_SCATTER,
+			MISC_HIT_INDICATION_DISABLE_PPE,
+		MISC_FREEZE_ENTITY,
+		MISC_CONNECTION_STATS,
+		MISC_PLAYER_SYMPTOMS_SHOW,
+		MISC_INPUT_DEVICE_DISCONNECT_DBG,
+		MISC_DEBUG_MONITOR,
+		MISC_FORCE_HINT_INDEX,
+	SIMULATE_MENU,
+		SIMULATE_MODE,
+		SIMULATE_INFINITE_LOOP,
+		SIMULATE_NULL_POINTER,
+		SIMULATE_DIVISION_BY_ZERO,
+		SIMULATE_ERROR_FUNCTION,
+		
+	MELEE_MENU,
+		MELEE_DEBUG,
+		MELEE_CONTINUOUS,
+		MELEE_SHOW_TARGETS,
+		MELEE_DRAW_TARGETS,
+		MELEE_DRAW_RANGE,
+		MELEE_DRAW_BLOCK_RANGE_AI,
+		MELEE_DRAW_BLOCK_RANGE_PVP,
+	
+	WEAPON_MENU,
+		WEAPON_PARTICLES,
+		WEAPON_DEBUG,
+		WEAPON_AIM_NOISE,
+		WEAPON_RECOIL,
+		WEAPON_UNLIMITED_AMMO,
+		WEAPON_BURST_VERSION,
+		WEAPON_CLAYMORE_DEBUG,
+		WEAPON_LIFT_DEBUG,
+	
+	BLEEDING_MENU,
+		BLEEDING_SOURCES,
+		BLEEDING_DISABLE_BLOOD_LOSS,
+		BLEEDING_ACTIVATE_SOURCE,
+		BLEEDING_ACTIVATE_ALL_SOURCES,
+		BLEEDING_ACTIVATE_SOURCE_LEVEL,
+		BLEEDING_RELOAD,
+		BLEEDINGINDICATORS_MENU,
+			BLEEDINGINDICATORS,
+			BLEEDINGINDICATORS_USEVALUEOVERRIDES,
+			BLEEDINGINDICATORS_SEQUENCE_DURATION,
+			BLEEDINGINDICATORS_DROP_RANDOMROTATION,
+			BLEEDINGINDICATORS_DROP_BASEDURATION,
+			BLEEDINGINDICATORS_DROP_MINDELAY,
+			BLEEDINGINDICATORS_DROP_MAXDELAY,
+			BLEEDINGINDICATORS_DROP_PROGRESSTHRESHOLD,
+			BLEEDINGINDICATORS_DROP_STARTSIZE,
+			BLEEDINGINDICATORS_DROP_ENDSIZE,
+			BLEEDINGINDICATORS_DROP_RNDSCALEMIN,
+			BLEEDINGINDICATORS_DROP_RNDSCALEMAX,
+			BLEEDINGINDICATORS_DROP_SCATTER,
+			BLEEDINGINDICATORS_DROP_SLIDEDISTANCE,
+			BLEEDINGINDICATORS_DROP_COLOR_MENU,
+				BLEEDINGINDICATORS_DROP_COLOR_ENABLEDESATURATION,
+				BLEEDINGINDICATORS_DROP_COLOR_DESATURATIONEND,
+				BLEEDINGINDICATORS_DROP_COLOR_R,
+				BLEEDINGINDICATORS_DROP_COLOR_G,
+				BLEEDINGINDICATORS_DROP_COLOR_B,
+				BLEEDINGINDICATORS_DROP_COLOR_A_START,
+				BLEEDINGINDICATORS_DROP_COLOR_A_END,	
+	
+	LOGS_MENU,
+		LOGS_ACTIONS,
+		LOGS_WEAPONS,
+		LOGS_SYNC,
+		LOGS_BASEBUILDING,
+		LOGS_SYMPTOMS,
+		LOGS_QUICKBAR,
+		LOGS_INVENTORY_MENU,	
+			LOGS_INVENTORY_MOVE,
+			LOGS_INVENTORY_RESERVATION,
+			LOGS_INVENTORY_HFSM,
+		LOGS_BLEEDING_CHANCES,
+	
+	TRIGGER_MENU,
+		TRIGGER_DEBUG,
+		TRIGGER_PLAYER_DEBUG,	
+	
+	BASEBUILDING_MENU,
+		BASEBUILDING_WOOD,
+		BASEBUILDING_GATE,	
+	
+	UNDERGROUND_MENU,
+		UNDERGROUND_SHOW_BREADCRUMB,
+		UNDERGROUND_DISABLE_DARKENING,	
+	
+	FINISHERS_MENU,
+		FINISHERS_FINISHER_FORCED,	
+	
+	SOUNDS_MENU,
+		SOUNDS_ITEM_IMPACT_SOUNDS,
+	
+	CAMERATOOLS_MENU,
+		CAMERATOOLS_ENABLE_REMOTE_CAMERA,
+		CAMERATOOLS_ENABLE_REMOTE_CAMERA_BROADCAST,	
+	
+	FEATURE_TIME_ACCEL_MENU,
+		FEATURE_TIME_ACCEL,
+		FEATURE_TIME_ACCEL_VALUE1,
+		FEATURE_TIME_ACCEL_VALUE2,
+		FEATURE_TIME_ACCEL_UG_ENTRANCES,
+		FEATURE_TIME_ACCEL_UG_RESERVOIR,
+		FEATURE_TIME_ACCEL_ENERGY_CONSUME,
+		FEATURE_TIME_ACCEL_ENERGY_RECHARGE,
+		FEATURE_TIME_ACCEL_FOOD_DECAY,
+	
+	// This stays last!
+	MODDED_MENU,
+};
diff --git a/scripts/3_Game/DayZ/Enums/EGameStateIcons.c b/scripts/3_Game/DayZ/Enums/EGameStateIcons.c
new file mode 100644
index 0000000000000000000000000000000000000000..7abba42487b83ef33af01eafdb34006c82d45089
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EGameStateIcons.c
@@ -0,0 +1,15 @@
+enum EConnectivityStatType
+{
+	PING,
+	SERVER_PERF,
+	CONN_LOST,
+	//------------------
+	COUNT
+}
+
+enum EConnectivityStatLevel
+{
+	OFF,
+	LEVEL1,
+	LEVEL2
+}
diff --git a/scripts/3_Game/DayZ/Enums/EMeleeTargetType.c b/scripts/3_Game/DayZ/Enums/EMeleeTargetType.c
new file mode 100644
index 0000000000000000000000000000000000000000..e9d2e098cc6393c61bbd41ee7c106eff865c37cc
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EMeleeTargetType.c
@@ -0,0 +1,5 @@
+enum EMeleeTargetType
+{
+	ALIGNABLE = 0,
+	NONALIGNABLE,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EMixedSoundStates.c b/scripts/3_Game/DayZ/Enums/EMixedSoundStates.c
new file mode 100644
index 0000000000000000000000000000000000000000..2dfd767aeea5feaa3e4d00b4c94918879af24290
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EMixedSoundStates.c
@@ -0,0 +1,8 @@
+//! bits
+enum eMixedSoundStates
+{
+	HUNGRY = 1,
+	THIRSTY = 2,
+	//---------
+	COUNT = 4//! bits, must be 2x the size of previous element !
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EPlayerStates.c b/scripts/3_Game/DayZ/Enums/EPlayerStates.c
new file mode 100644
index 0000000000000000000000000000000000000000..f2ae40590a547399d8338c163fa47e4e1fc3d306
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EPlayerStates.c
@@ -0,0 +1,5 @@
+enum EPlayerStates
+{
+	ALIVE,
+	DEAD,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EPulseType.c b/scripts/3_Game/DayZ/Enums/EPulseType.c
new file mode 100644
index 0000000000000000000000000000000000000000..902d744708a45af9a36df59adabf10c4a651224d
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EPulseType.c
@@ -0,0 +1,5 @@
+enum EPulseType
+{
+	REGULAR,
+	IRREGULAR,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ERPCs.c b/scripts/3_Game/DayZ/Enums/ERPCs.c
new file mode 100644
index 0000000000000000000000000000000000000000..363dfd6a452198d5db78d3d7ef3c29abdd9ef391
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ERPCs.c
@@ -0,0 +1,196 @@
+enum ERPCs
+{
+	PB_START = -1,
+	PB_END = -2,
+	PB_SINGLEUSE_START = -3,
+	PB_SINGLEUSE_END = -4,
+	RPC_SYNC_ITEM_VAR = 0,
+	RPC_SYNC_STAT,
+	RPC_WRITE_NOTE,
+	RPC_WRITE_NOTE_CLIENT,
+	RPC_SYNC_DISPLAY_STATUS,
+	RPC_ON_SET_CAPTIVE,
+	RPC_SYNC_SCENE_OBJECT,
+	RPC_USER_ACTION_PROMPT_SYNCH,
+	RPC_USER_ACTION_MESSAGE,
+	RPC_ITEM_DIAG,
+	RPC_ITEM_DIAG_CLOSE,
+	RPC_SET_OBJECT_POSITION,
+//	RPC_USER_ACTION_MESSAGES,
+	RPC_PLAYER_SYMPTOM_ON,
+	RPC_PLAYER_SYMPTOM_OFF,
+	RPC_STAMINA,
+	RPC_DAMAGE_VALUE_SYNC,
+	RPC_DEBUG_MONITOR_FLT,
+	RPC_DEBUG_MONITOR_STR,
+	RPC_USER_ACTION_PROMPT_PROGRESS,
+	RPC_USER_ACTION_PROMPT_CLEAN,
+	RPC_BS_SKINNED_STATE,
+	RPC_TRAP_VICTIM,
+	RPC_TRAP_DISARM,
+	RPC_EXPLODE_EVENT,
+	RPC_TOGGLE_PERSONAL_LIGHT,
+	RPC_CHECK_PULSE,
+	DEV_RPC_SPAWN_ITEM_ON_GROUND,
+	DEV_RPC_SPAWN_ITEM_ON_GROUND_PATTERN_GRID,
+	DEV_RPC_SPAWN_ITEM_ON_CURSOR,
+	DEV_RPC_SPAWN_ITEM_IN_INVENTORY,
+	DEV_RPC_SPAWN_ITEM_AS_ATTACHMENT,
+	DEV_RPC_CLEAR_INV,
+	DEV_RPC_TELEPORT,
+	DEV_RPC_SET_PLAYER_DIRECTION,
+	DEV_RPC_SEND_SERVER_LOG,
+	DEV_RPC_STATS_DATA,
+	DEV_RPC_LEVELS_DATA,
+	DEV_RPC_MODS_DATA,
+	DEV_RPC_MODS_DATA_DETAILED,
+	DEV_RPC_MODS_ACTIVATE,
+	DEV_RPC_MODS_DETAILED,
+	DEV_RPC_MODS_DEACTIVATE,
+	DEV_RPC_MODS_LOCK,
+	DEV_RPC_AGENTS_DATA,
+	DEV_RPC_STOMACH_DATA,
+	DEV_RPC_CREATE_SCENE_OBJECT,
+	DEV_RPC_SCENE_LOAD,
+	DEV_STATS_UPDATE,
+	DEV_LEVELS_UPDATE,
+	DEV_STOMACH_UPDATE,
+	DEV_MODS_UPDATE,
+	DEV_AGENTS_UPDATE,
+	DEV_RPC_PLUGIN_DZCREATURE_DEBUG,
+	RPC_SOFT_SKILLS_SPECIALTY_SYNC,
+	RPC_SOFT_SKILLS_STATS_SYNC,
+	RPC_SOFT_SKILLS_PRINT_DEBUG,
+	RPC_CRAFTING_INVENTORY_INSTANT,
+	RPC_INIT_SET_QUICKBAR,
+	RPC_READ_NOTE,
+	RPC_SYNC_EVENT,
+	DEV_AGENT_GROW,
+	RPC_SYNC_THERMOMETER,
+	RPC_SEND_NOTIFICATION,
+	RPC_SEND_NOTIFICATION_EXTENDED,
+	RPC_SEND_MAP_MARKERS,
+	RPC_SEND_LIGHTING_SETUP,
+	RPC_USER_SYNC_PERMISSIONS,
+	RPC_WARNING_ITEMDROP,
+	RPC_WARNING_TELEPORT,
+	RPC_DEBUG_INSTABUILD,
+	RPC_SHOCK,
+	RPC_SERVER_RESPAWN_MODE,
+	RPC_SOUND_LOCK_ATTACH,
+	RPC_SOUND_HELICRASH,
+	RPC_SOUND_ARTILLERY,
+	DEV_RPC_MODS_RESET,
+	DEV_RPC_STATS_RESET,
+	DEV_RPC_AGENT_RESET,
+	DEV_RPC_STAT_SET,
+	DEV_RPC_SERVER_SCRIPT,
+	DEV_RPC_SERVER_SCRIPT_RESULT,
+	RPC_SOUND_CONTAMINATION,
+	RPC_SOUND_ARTILLERY_SINGLE,
+	RPC_CFG_GAMEPLAY_SYNC,
+	RPC_UNDERGROUND_SYNC,
+	DEV_RPC_SPAWN_PRESET,
+	DEV_RPC_SET_TIME,
+	DEV_TEMP_UPDATE,
+	DEV_SET_DEV_ITEM,
+	DEV_REQUEST_UTS_DEBUG,
+	DEV_UTS_DEBUG_DATA,
+	DEV_SET_WEATHER,
+	RPC_SET_BILLBOARDS,
+	
+#ifdef DIAG_DEVELOPER	
+	DIAG_VEHICLE_DEBUG_OUTPUT,
+	
+	DIAG_PLAYER_SYMPTOMS_DEBUG_ON, // Client -> Server
+	DIAG_PLAYER_SYMPTOMS_DEBUG_OFF, // Client -> Server
+	DIAG_PLAYER_SYMPTOMS_DEBUG, // Server -> Client
+	
+	DIAG_CRAFTING_INSTANT,
+	
+	DIAG_CHEATS_MODIFIERS,
+	DIAG_CHEATS_KILL_PLAYER,
+	DIAG_CHEATS_INVINCIBILITY,
+	DIAG_CHEATS_DISABLE_STAMINA,
+	DIAG_CHEATS_RESET_PLAYER,
+	DIAG_CHEATS_RESET_PLAYER_MAX,
+	DIAG_CHEATS_INVENTORY_ACCESS,
+	DIAG_CHEATS_ITEMS_FIX,
+	DIAG_CHEATS_CREATE_HIT,
+	DIAG_CHEATS_CREATE_HIT_LIGHT,
+		
+	DIAG_SOFT_SKILLS_SHOW_DEBUG,
+	DIAG_SOFT_SKILLS_TOGGLE_STATE,
+	DIAG_SOFT_SKILLS_TOGGLE_MODEL,
+	DIAG_SOFT_SKILLS_SPECIALTY_VALUE,
+	
+	DIAG_LIFESPAN_BLOODY_HANDS,
+	DIAG_LIFESPAN_PLAYTIME_UPDATE,
+	
+	DIAG_MISC_LOG_PLAYER_STATS,
+	DIAG_MISC_ENVIRONMENT_DEBUG, // Client -> Server
+	DIAG_MISC_ENVIRONMENT_DEBUG_DATA, // Server -> Client
+	DIAG_MISC_ENVIRONMENT_LOGGING_DRYWET,
+	DIAG_MISC_FALLDAMAGE_DEBUG, // Client -> Server
+	DIAG_MISC_FALLDAMAGE_DEBUG_DATA, // Server -> Client
+	DIAG_MISC_GO_UNCONSCIOUS,
+	DIAG_MISC_GO_UNCONSCIOUS_DELAYED,
+	DIAG_MISC_QUICK_RESTRAIN,
+	DIAG_MISC_HAIR_LEVEL_HIDE,
+	DIAG_MISC_QUICK_FISHING,
+	DIAG_MISC_TARGETABLE_BY_AI,
+	DIAG_MISC_DEBUG_MONITOR,
+
+	
+	
+	DIAG_SIMULATE_INFINITE_LOOP,
+	DIAG_SIMULATE_NULL_POINTER,
+	DIAG_SIMULATE_DIVISION_BY_ZERO,
+	DIAG_SIMULATE_ERROR_FUNCTION,
+	
+	DIAG_WEAPON_PARTICLES,
+	DIAG_WEAPON_RECOIL,
+	DIAG_WEAPON_BURST_VERSION,
+	
+	DIAG_BLEEDING_DISABLE_BLOOD_LOSS,
+	DIAG_BLEEDING_ACTIVATE_SOURCE,
+	DIAG_BLEEDING_ACTIVATE_ALL_SOURCES,
+	
+	DIAG_LOGS_ACTIONS,
+	DIAG_LOGS_WEAPONS,
+	DIAG_LOGS_SYNC,
+	DIAG_LOGS_BASEBUILDING,
+	DIAG_LOGS_SYMPTOMS,
+	DIAG_LOGS_INVENTORY_MOVE,
+	DIAG_LOGS_INVENTORY_RESERVATION,
+	DIAG_LOGS_INVENTORY_HFSM,
+	DIAG_LOGS_QUICKBAR,
+	DIAG_LOGS_BLEEDING_CHANCES,
+	
+	DIAG_TRIGGER_DEBUG,
+	
+	DIAG_BASEBUILDING_WOOD,
+	DIAG_BASEBUILDING_GATE,
+	
+	DIAG_FINISHERS_FORCE_FINISHER,
+	
+	DIAG_CAMERATOOLS_CAM_SUBSCRIBE,
+	DIAG_CAMERATOOLS_CAM_DATA,
+	
+	DIAG_TIMEACCEL,
+	DIAG_TIMEACCEL_CLIENT_SYNC,
+	
+	DIAG_ITEM_DEBUG_ACTIONS,
+	
+	DEV_DIAGMENU_SUBSCRIBE,
+	
+	DEV_PLAYER_DEBUG_REQUEST,
+	DEV_PLAYER_DEBUG_DATA,
+	
+	RPC_DAYZPLAYER_DEBUGSERVERWALK,
+	DIAG_VEHICLES_DUMP_CRASH_DATA_REQUEST,
+	DIAG_VEHICLES_DUMP_CRASH_DATA_CONTENTS,
+#endif
+	
+	RPC_END, // DO NOT USE OR APPEND AFTER, purely here to indicate the end
+}
diff --git a/scripts/3_Game/DayZ/Enums/EStaminaConsumers.c b/scripts/3_Game/DayZ/Enums/EStaminaConsumers.c
new file mode 100644
index 0000000000000000000000000000000000000000..4351c50bc6d2d28247b43d7224158461c23e6864
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EStaminaConsumers.c
@@ -0,0 +1,13 @@
+enum EStaminaConsumers
+{
+	HOLD_BREATH,
+	MELEE_HEAVY,
+	MELEE_EVADE,
+	SPRINT,
+	JUMP,
+	VAULT,
+	CLIMB,
+	ROLL,
+	DROWN,
+	PUSH,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EStaminaModifiers.c b/scripts/3_Game/DayZ/Enums/EStaminaModifiers.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1268cbdd0c040c644e5d2eee2723f700158561f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EStaminaModifiers.c
@@ -0,0 +1,14 @@
+enum EStaminaModifiers
+{
+	HOLD_BREATH,
+	JUMP,
+	MELEE_LIGHT,
+	MELEE_HEAVY,
+	MELEE_EVADE,
+	OVERALL_DRAIN,
+	VAULT,
+	CLIMB,
+	ROLL,
+	DROWN,
+	PUSH_CAR,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EStatLevels.c b/scripts/3_Game/DayZ/Enums/EStatLevels.c
new file mode 100644
index 0000000000000000000000000000000000000000..7eaf4a0c36f57b7840f20c564644c7f566d2b7d9
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EStatLevels.c
@@ -0,0 +1,8 @@
+enum EStatLevels
+{
+	GREAT,
+	HIGH,
+	MEDIUM,
+	LOW,
+	CRITICAL,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ESyncEvent.c b/scripts/3_Game/DayZ/Enums/ESyncEvent.c
new file mode 100644
index 0000000000000000000000000000000000000000..cfe79387f00f7d4fd2139a6d2950836dce8d80b2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ESyncEvent.c
@@ -0,0 +1,6 @@
+enum ESyncEvent
+{
+	PlayerList,
+	EntityKill,
+	PlayerIgnateFireplayce
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ETimeOfDay.c b/scripts/3_Game/DayZ/Enums/ETimeOfDay.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b7c766867887d412137723b34023de2cfb14ba6
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ETimeOfDay.c
@@ -0,0 +1,5 @@
+enum ETimeOfDay
+{
+	Day,
+	Night,
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/ETransformationAxis.c b/scripts/3_Game/DayZ/Enums/ETransformationAxis.c
new file mode 100644
index 0000000000000000000000000000000000000000..2930a5f57af4b6bbca475872e9095b82306817be
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/ETransformationAxis.c
@@ -0,0 +1,9 @@
+enum ETransformationAxis
+{
+	BOTTOM	= 0,
+	LEFT	= 1,
+	BACK	= 2,
+	TOP		= 3,
+	RIGHT	= 4,
+	FRONT	= 5
+};
diff --git a/scripts/3_Game/DayZ/Enums/EWaterLevels.c b/scripts/3_Game/DayZ/Enums/EWaterLevels.c
new file mode 100644
index 0000000000000000000000000000000000000000..75d5f6c5bbf8abacf6eb59b3d0db66bf33b811ac
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EWaterLevels.c
@@ -0,0 +1,7 @@
+enum EWaterLevels
+{
+	LEVEL_LOW,
+	LEVEL_CROUCH, //high enough to disallow prone
+	LEVEL_ERECT, //high enough to disallow prone and crouch
+	LEVEL_SWIM_START //high enough
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Enums/EWaterSourceObjectType.c b/scripts/3_Game/DayZ/Enums/EWaterSourceObjectType.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7d982fd36441f8712fb4f8ec1dbc3445133453f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Enums/EWaterSourceObjectType.c
@@ -0,0 +1,6 @@
+enum EWaterSourceObjectType
+{
+	NONE 	= -1,
+	WELL 	= 0,
+	THROUGH = 1
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Containers/ScrollBarContainer.c b/scripts/3_Game/DayZ/GUI/Containers/ScrollBarContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f52ba455e437cc3d3e8775afa873e879a17d6d2
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Containers/ScrollBarContainer.c
@@ -0,0 +1,240 @@
+// -----------------------------------------------------------
+class ScrollBarContainer : ScriptedWidgetEventHandler
+{
+	reference bool Invert;
+	protected Widget Content;
+	protected Widget ScrollBar;
+	protected Widget Scroller;
+	protected Widget m_root;
+	
+	const int WHEEL_STEP = 20;
+	protected float		m_root_height;
+	protected float		m_content_height;
+	protected float		m_position;
+	protected bool		m_scrolling;
+	protected float		m_scrolling_start_pos;
+	protected int		m_scrolling_mouse_pos;
+		
+	void ~ScrollBarContainer()
+	{
+		//if(GetGame() != NULL)
+		//GetGame().GetDragQueue().RemoveCalls(this);
+	}
+	
+	void ScrollFixedAmount( bool down, float amount )
+	{
+		m_root.Update();
+		Content.Update();
+		float width;
+	
+		m_root.GetScreenSize(width, m_root_height);
+		Content.GetScreenSize(width, m_content_height);
+		
+		float diff = m_root_height / m_content_height;
+		float one_percent = diff / 100;
+		float percents = amount / m_content_height;
+		//float step = (1.0 / (m_content_height - m_root_height)) * WHEEL_STEP;
+		float step = (percents/100);
+		if(down)
+		m_position += 1 * ( percents + 0.05 );
+		else
+		m_position -= 1 * ( percents + 0.05 );
+		
+		if (m_position < 0) m_position = 0;
+		if (m_position > 1 - diff) m_position = 1 - diff;
+		UpdateScroller();
+	}
+	
+	void ScrollToPos( float pos )
+	{
+		m_root.Update();
+		Content.Update();
+		float width;
+	
+		m_root.GetScreenSize(width, m_root_height);
+		Content.GetScreenSize(width, m_content_height);
+		
+		float diff = m_root_height / m_content_height;
+		float percents = pos / m_content_height;
+
+		m_position = percents;
+		
+		if (m_position < 0)
+			m_position = 0;
+		if (m_position > 1 - diff)
+			m_position = 1 - diff;
+		UpdateScroller();
+	}
+	
+	void ScrollToBottom()
+	{
+		m_root.Update();
+		Content.Update();
+		float width;
+	
+		m_root.GetScreenSize(width, m_root_height);
+		Content.GetScreenSize(width, m_content_height);
+		
+		float diff = m_root_height / m_content_height;
+		m_position = 1 - diff;
+		UpdateScroller();
+	}
+	
+	void ScrollToTop()
+	{
+		if( m_position != 0 )
+		{
+			m_position = 0;
+			UpdateScroller();
+		}
+	}
+	
+	float GetContentYPos()
+	{
+		float x, y;
+		Content.GetPos(x, y);
+		return y;
+	}
+	
+	float GetRootHeight()
+	{
+		return m_root_height;
+	}
+	
+	void UpdateScroller()
+	{
+		m_root.Update();
+		Content.Update();
+		float width;
+		float height;
+		float diff;
+		float scroller_height;
+	
+		m_root.GetScreenSize(width, m_root_height);
+		Content.GetScreenSize(width, m_content_height);
+	
+		diff = m_content_height - m_root_height;
+		if (diff <= 0)
+		{
+			Content.SetPos(0,0);
+			Scroller.Show(false);
+			ScrollBar.Show(false);
+			m_position = 0;
+			return;
+		}
+		
+		scroller_height = (m_root_height / m_content_height) * m_root_height;
+
+		ScrollBar.Show(true);
+		Scroller.Show(true);
+		Scroller.GetSize(width, height);
+		Scroller.SetSize(width, scroller_height);
+
+		float pos = ( -m_content_height * m_position );
+		
+		if( pos <= -diff )
+			pos = -diff;
+		
+		Scroller.SetPos(0, -pos);
+		
+		if(Invert)
+			Content.SetPos(0, -(diff + (-diff * m_position)));
+		else
+			Content.SetPos(0, pos);
+	}
+
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_root.SetHandler(this);
+		m_root.SetFlags(WidgetFlags.VEXACTPOS);
+		m_scrolling = false;
+		UpdateScroller();
+	}
+	
+	protected void StopScrolling()
+	{
+		if (m_scrolling)
+		{
+			GetGame().GetDragQueue().RemoveCalls(this);
+			m_scrolling = false;
+		}
+	}
+	
+	protected void UpdateScroll(int mouse_x, int mouse_y, bool is_dragging)
+	{
+		m_root.Update();
+		Content.Update();
+		float width;
+	
+		m_root.GetScreenSize(width, m_root_height);
+		Content.GetScreenSize(width, m_content_height);
+		
+		if (m_scrolling)
+		{
+			if (is_dragging)
+			{
+				float diff = (mouse_y - m_scrolling_mouse_pos);
+				float scroller_height = (m_root_height / m_content_height) * m_root_height; 
+				m_position = m_scrolling_start_pos + (diff / (m_root_height - scroller_height));
+				if (m_position < 0) m_position = 0;
+				if (m_position > 1) m_position = 1;
+			}
+			else
+			{
+				m_scrolling = false;
+				StopScrolling();
+			}
+		}
+		
+		UpdateScroller();
+	}
+
+	
+	
+	// ScriptedWidgetEventHandler override
+	//--------------------------------------------------------------------------
+	override bool OnMouseButtonDown(Widget  w, int  x, int  y, int  button)
+	{
+		if (button == MouseState.LEFT && w == Scroller && !m_scrolling)
+		{
+			m_scrolling = true;
+			m_scrolling_start_pos = m_position;
+			int mouse_x;
+			GetMousePos(mouse_x, m_scrolling_mouse_pos);
+			GetGame().GetDragQueue().Call(this, "UpdateScroll");
+			return true;
+		}
+	
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnMouseButtonUp(Widget  w, int  x, int  y, int  button)
+	{
+		StopScrolling();
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnMouseWheel(Widget  w, int  x, int  y, int  wheel)
+	{
+		if (m_scrolling || m_content_height <= m_root_height) return false;
+	
+		float step = (1.0 / (m_content_height - m_root_height)) * WHEEL_STEP;
+		m_position -= wheel * step;
+	
+		if (m_position < 0) m_position = 0;
+		if (m_position > 1) m_position = 1;
+		UpdateScroller();
+		return true;
+	}
+	
+	override bool OnResize( Widget  w, int x, int y) {
+		if (w == m_root || w == Content) 
+		{
+			UpdateScroller();
+		}
+		return false;
+	}
+};
diff --git a/scripts/3_Game/DayZ/GUI/Containers/SizeToChild.c b/scripts/3_Game/DayZ/GUI/Containers/SizeToChild.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc61f75f5a32c35dd4f9242ad74ffd3b1d38d75d
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Containers/SizeToChild.c
@@ -0,0 +1,137 @@
+class SizeToChild extends ScriptedWidgetEventHandler
+{
+	reference string		m_ChildName;
+	reference float			m_HorizontalOffset;
+	reference float			m_VerticalOffset;
+	reference bool			m_ResizeHorizontal;
+	reference bool			m_ResizeVertical;
+	
+	protected Widget		m_Root;
+	protected Widget		m_Child;
+	
+	protected static bool	m_IgnoredBool;
+	
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_Root	= w;
+		
+		m_Child	= m_Root.FindAnyWidget( m_ChildName );
+		if ( m_Child )
+		{
+			ResizeParentToChild();
+		}
+	}
+	
+	bool ResizeParentToChild()
+	{
+		return ResizeParentToChild( m_IgnoredBool, -1, true );
+	}
+	
+	bool ResizeParentToChild( out bool changed_size, int limit = -1, bool immedUpdate = true )
+	{
+		float x, y, o_x, o_y, new_x, new_y;
+		if ( m_Child )
+		{
+			m_Child.Update();
+			m_Child.GetScreenSize( x, y );
+			m_Root.GetScreenSize( new_x, new_y );
+			m_Root.GetSize( o_x, o_y );
+			
+			bool changed	= false;
+			bool hit_limit	= false;
+			
+			if ( m_ResizeHorizontal && ( x > new_x + 0.01 || x < new_x - 0.01 ) )
+			{
+				new_x = x + m_HorizontalOffset;
+				changed = true;
+			}
+			else
+				new_x = o_x;
+			
+			if ( m_ResizeVertical && ( y > new_y + 0.01 || y < new_y - 0.01 ) )
+			{
+				new_y = y + m_VerticalOffset;
+				changed = true;
+			}
+			else
+				new_y = o_y;
+			
+			if ( limit > 0 && new_y > limit )
+			{
+				new_y = limit;
+				hit_limit = true;
+			}
+			
+			if ( changed )
+			{
+				m_Root.SetSize( new_x, new_y, immedUpdate );
+			}
+			
+			changed_size = changed;
+			return hit_limit;
+		}
+		else
+		{
+			m_Child	= m_Root.FindAnyWidget( m_ChildName );
+			if ( !m_Child )
+			{
+				Print( "Error in size to child, " + m_Root.GetName() + " has no child named " + m_ChildName );
+			}
+		}
+		
+		return false;
+	}
+}
+
+class SizeToParent extends ScriptedWidgetEventHandler
+{
+	reference bool		m_ResizeHorizontal;
+	reference bool		m_ResizeVertical;
+	
+	protected Widget	m_Root;
+	protected Widget	m_Parent;
+	
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_Root	= w;
+		
+		if ( m_ResizeHorizontal )
+			m_Root.ClearFlags( WidgetFlags.HEXACTSIZE );
+		if ( m_ResizeVertical )
+			m_Root.ClearFlags( WidgetFlags.VEXACTSIZE );
+		
+		m_Parent	= m_Root.GetParent();
+		
+		Refresh();
+	}
+	
+	void Refresh()
+	{
+		float x, y, o_x, o_y, new_x, new_y;
+		m_Parent.Update();
+		m_Parent.GetScreenSize( x, y );
+		m_Root.GetScreenSize( new_x, new_y );
+		m_Root.GetSize( o_x, o_y );
+		
+		bool changed = false;
+		
+		if ( m_ResizeHorizontal && x != new_x )
+		{
+			new_x = x;
+			changed = true;
+		}
+		else
+			new_x = o_x;
+		
+		if ( m_ResizeVertical && y != new_y )
+		{
+			new_y = y;
+			changed = true;
+		}
+		else
+			new_y = o_y;
+		
+		if ( changed )
+			m_Root.SetSize( new_x, new_y );
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Credits/CreditsLoader.c b/scripts/3_Game/DayZ/GUI/Credits/CreditsLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..2e0d0813f0068d0ab0ab891791a4ce5135f50a45
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Credits/CreditsLoader.c
@@ -0,0 +1,53 @@
+class CreditsLoader
+{
+	protected static const string JSON_FILE_PATH = "scripts/data/credits.json";
+	
+	static void CreateTestJson()
+	{
+		string nameDepartment	= "Department";
+		string nameSection		= "Section";
+		string nameLine			= "Line";
+		
+		JsonDataCredits data = new JsonDataCredits();
+		data.Departments = new array<ref JsonDataCreditsDepartment>;
+		
+		for (int index_dep = 0; index_dep < 3; ++index_dep)
+		{
+			JsonDataCreditsDepartment department = new JsonDataCreditsDepartment();
+			department.Sections = new array<ref JsonDataCreditsSection>();
+			department.DepartmentName = (nameDepartment +" "+ index_dep);
+			
+			for (int index_sec = 0; index_sec < 4; ++index_sec)
+			{
+				JsonDataCreditsSection section = new JsonDataCreditsSection();
+				section.SectionLines = new array<string>;
+				section.SectionName = (nameSection +" "+ index_sec);
+				
+				int linesCount = Math.RandomInt(3, 10);
+				for (int i = 0; i < linesCount; ++i)
+				{
+					section.SectionLines.Insert(nameLine +" "+ i);
+				}	
+				
+				department.Sections.Insert(section);
+			}
+			
+			data.Departments.Insert(department);
+		}
+
+		string errorMessage;
+		if (!JsonFileLoader<ref JsonDataCredits>.SaveFile(JSON_FILE_PATH, data, errorMessage))
+			ErrorEx(errorMessage);
+	}
+	
+	static JsonDataCredits GetData()
+	{
+		string errorMessage;
+		JsonDataCredits data;
+		
+		if (!JsonFileLoader<ref JsonDataCredits>.LoadFile(JSON_FILE_PATH, data, errorMessage))
+			ErrorEx(errorMessage);
+		
+		return data;
+	}
+}
diff --git a/scripts/3_Game/DayZ/GUI/Credits/JsonDataCredits.c b/scripts/3_Game/DayZ/GUI/Credits/JsonDataCredits.c
new file mode 100644
index 0000000000000000000000000000000000000000..8361ddb2be692f1722228f9b55632cb1890cf8e9
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Credits/JsonDataCredits.c
@@ -0,0 +1,5 @@
+class JsonDataCredits : Managed
+{
+	ref array<ref JsonDataCreditsDepartment> Departments;
+};
+
diff --git a/scripts/3_Game/DayZ/GUI/Credits/JsonDataCreditsDepartment.c b/scripts/3_Game/DayZ/GUI/Credits/JsonDataCreditsDepartment.c
new file mode 100644
index 0000000000000000000000000000000000000000..94528a8a56dc2bfdce5d6be7b2462926ca411a9f
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Credits/JsonDataCreditsDepartment.c
@@ -0,0 +1,6 @@
+class JsonDataCreditsDepartment : Managed
+{
+	string DepartmentName;
+	ref array<ref JsonDataCreditsSection> Sections;
+};
+
diff --git a/scripts/3_Game/DayZ/GUI/Credits/JsonDataCreditsSection.c b/scripts/3_Game/DayZ/GUI/Credits/JsonDataCreditsSection.c
new file mode 100644
index 0000000000000000000000000000000000000000..50dbc83f37d591e2730d37f26c4cf8d3c8a2689f
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Credits/JsonDataCreditsSection.c
@@ -0,0 +1,6 @@
+class JsonDataCreditsSection : Managed
+{
+	string SectionName;
+	ref array<string> SectionLines;
+};
+
diff --git a/scripts/3_Game/DayZ/GUI/DLCs/DLCDataLoader.c b/scripts/3_Game/DayZ/GUI/DLCs/DLCDataLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..90a163325706768f63ba6a8a07de5c55b3bf1aff
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/DLCs/DLCDataLoader.c
@@ -0,0 +1,15 @@
+class DlcDataLoader
+{
+	protected static const string JSON_FILE_PATH = "scripts/data/dlcinfo.json";
+	
+	static JsonDataDLCList GetData()
+	{
+		JsonDataDLCList data;
+		
+		string errorMessage;
+		if (!JsonFileLoader<JsonDataDLCList>.LoadFile(JSON_FILE_PATH, data, errorMessage))
+			ErrorEx(errorMessage);
+		
+		return data;
+	}
+}
diff --git a/scripts/3_Game/DayZ/GUI/DLCs/JsonDataDLCInfo.c b/scripts/3_Game/DayZ/GUI/DLCs/JsonDataDLCInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..3766576a917fc4b4da2c6eaf83b33439cc7e6c56
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/DLCs/JsonDataDLCInfo.c
@@ -0,0 +1,12 @@
+class JsonDataDLCList : Managed
+{
+	ref array<ref JsonDataDLCInfo> DLCs;
+};
+
+class JsonDataDLCInfo : Managed
+{
+	string Name;
+	string HeaderText;
+	string DescriptionText;
+	string VideoFileName;
+};
diff --git a/scripts/3_Game/DayZ/GUI/Effects/Bouncer.c b/scripts/3_Game/DayZ/GUI/Effects/Bouncer.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f5c741921e1049c632aa0a0d10588b765ce474b
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Effects/Bouncer.c
@@ -0,0 +1,37 @@
+// -----------------------------------------------------------
+class Bouncer
+{
+	reference float amount;
+	reference float speed;
+
+	protected float m_orginal_width;
+	protected float m_orginal_height;
+	protected Widget m_root;
+	protected ref AnimatorTimer m_anim;
+
+	// -----------------------------------------------------------
+	void Bouncer()
+	{
+		m_anim = new AnimatorTimer();
+	}
+	
+	// -----------------------------------------------------------
+	protected void Update()
+	{
+Print("Update");
+		
+		if (m_root)
+		{
+			float p = amount * m_anim.GetValue();
+			m_root.SetSize(m_orginal_width + (m_orginal_width * p), m_orginal_height - (m_orginal_height * p));
+		}
+	}
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_root.GetSize(m_orginal_width, m_orginal_height);
+		m_anim.AnimateLoop(speed);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Effects/HoverEffect.c b/scripts/3_Game/DayZ/GUI/Effects/HoverEffect.c
new file mode 100644
index 0000000000000000000000000000000000000000..5cd6fe8f46dd5ad430f92b7935e4fd60440fb7db
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Effects/HoverEffect.c
@@ -0,0 +1,49 @@
+// -----------------------------------------------------------
+class HoverEffect : ScriptedWidgetEventHandler
+{
+	reference float speed;
+	reference float amount;
+	protected float m_orginal_width;
+	protected float m_orginal_height;
+	protected Widget m_root;
+	protected ref AnimatorTimer m_anim;
+	
+	void HoverEffect()
+	{
+		m_anim = new AnimatorTimer();
+	}
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_root.SetHandler(this);
+	}
+	
+	// -----------------------------------------------------------
+	protected void Update()
+	{
+		float p = amount * m_anim.GetValue();
+		m_root.SetSize(m_orginal_width + (m_orginal_width * p), m_orginal_height + (m_orginal_height * p));
+	
+		float c = 1.0 - (0.5 * m_anim.GetValue());
+		m_root.SetColor(ARGBF(1, 1, c, c));
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if ( !m_anim.IsRunning() ) m_root.GetSize(m_orginal_width, m_orginal_height);
+		m_anim.Animate(1.0, speed);
+		
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		m_anim.Animate(0.0, speed);
+		return false;
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Effects/MainMenuButtonEffect.c b/scripts/3_Game/DayZ/GUI/Effects/MainMenuButtonEffect.c
new file mode 100644
index 0000000000000000000000000000000000000000..00d32829f49414cbeeafed9a6b7a8f93119a4c39
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Effects/MainMenuButtonEffect.c
@@ -0,0 +1,67 @@
+class MainMenuButtonEffect : ScriptedWidgetEventHandler
+{
+	reference float speed;
+	reference float amount;
+	protected float m_textProportion;
+	protected float m_textProportion2;
+	protected ButtonWidget m_root;
+	protected ref AnimatorTimer m_anim;
+	
+	// -----------------------------------------------------------
+	void MainMenuButtonEffect()
+	{
+		if ( GetGame() )
+		{
+			GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(this.Update);
+		}
+		m_anim = new AnimatorTimer();
+	}
+	
+	// -----------------------------------------------------------
+	void ~MainMenuButtonEffect()
+	{
+		if ( GetGame() && GetGame().GetUpdateQueue(CALL_CATEGORY_GUI) )
+		{
+			GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Remove(this.Update);
+		}
+	}
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(ButtonWidget w)
+	{
+		m_root = w;
+		m_root.SetHandler(this);
+	}
+	
+	// -----------------------------------------------------------
+	protected void Update(float tDelta)
+	{
+		m_anim.Tick(tDelta);
+		float p = amount * m_anim.GetValue();
+		//m_root.SetTextProportion( m_textProportion + (p * 0.5) );
+		m_root.SetTextOffset( p * 4, 0 );
+	
+		float c = 1.0 - m_anim.GetValue();
+		m_root.SetTextColor(ARGBF(1, 1, c, c));
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		//if ( !m_anim.IsRunning() ) m_textProportion = m_root.GetTextProportion();
+		if ( !m_anim.IsRunning() )
+		{
+			m_root.GetPos( m_textProportion, m_textProportion2 );
+		}
+		m_anim.Animate(1.0, speed);
+
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		m_anim.Animate(0.0, speed);
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Effects/RadialMenu.c b/scripts/3_Game/DayZ/GUI/Effects/RadialMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..39f72d7461e2d71ba387d82844054e53e5bacb69
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Effects/RadialMenu.c
@@ -0,0 +1,688 @@
+enum RadialMenuControlType
+{
+	MOUSE,
+	CONTROLLER	
+}
+
+class RadialMenu : ScriptedWidgetEventHandler
+{
+	protected Widget					m_Parent;
+	protected Widget 					m_ItemCardsContainer;
+	protected Widget					m_RadialSelector;
+	protected ImageWidget				m_RadialSelectorImage;
+	protected ImageWidget 				m_RadialSelectorPointerImage;
+	protected int 						m_RadialSelectorOriginalColor;
+	protected int 						m_RadialSelectorDisabledColor;
+	protected Widget 					m_SelectedObject;
+	protected ref map<Widget, float> 	m_RadialItemCards;
+	
+	protected float 					m_AngleRadOffset;
+	protected ref Timer 				m_UpdateTimer;
+	
+	//widget
+	static const string 				RADIAL_SELECTOR	 			= "RadialSelector";
+	static const string 				RADIAL_SELECTOR_IMAGE		= "SelectorImage";
+	static const string 				RADIAL_SELECTOR_POINTER		= "SelectorPointer";
+	static const string 				RADIAL_DELIMITER_CONTAINER 	= "RadialDelimiterContainer";
+	static const string 				RADIAL_ITEM_CARD_CONTAINER 	= "RadialItemCardContainer";
+
+	//controls
+	protected RadialMenuControlType 	m_ControlType;
+	private UAIDWrapper 				m_SelectInputWrapper;
+	private UAIDWrapper 				m_BackInputWrapper;
+	protected float 					m_ControllerAngle;
+	protected float 					m_ControllerTilt;
+
+	//controller
+	protected int 						m_ControllerTimout;
+	protected bool						m_IsControllerTimoutEnabled 		= true;			//enables/disables controller deselect timeout reset
+	protected const float				CONTROLLER_DESELECT_TIMEOUT 		= 1000;			//timeout [ms] after which selection is automatically deselect when controller is not active
+	protected const float 				CONTROLLER_TILT_TRESHOLD_SELECT		= 0.8;			//tilt value (0.0-1.0) for controller sticks after which the selection will be selected
+	protected const float 				CONTROLLER_TILT_TRESHOLD_EXECUTE	= 1.0;			//tilt value (0.0-1.0) for controller sticks after which the selection will be executed 
+	
+	//mouse
+	protected bool 						m_WidgetInitialized;
+	protected const float 				MOUSE_SAFE_ZONE_RADIUS = 120;		//Radius [px] of safe zone where every previous selection is deselected
+	
+	//References
+	protected float 					m_RadiusOffset;					//Radius [% of the main container size]
+	protected float 					m_ExecuteDistanceOffset;		//Distance offset [% of the main container size] after which the selection will be automatically executed
+	protected float						m_OffsetFromTop;				//first item in the menu won't be directly on top but offset by a rad angle value (clock-wise)
+	protected float						m_ItemCardRadiusOffset;			//Radius [% of the main container size] for item cards
+	protected string					m_DelimiterLayout;				//layout file name with path
+	
+	ref UIScriptedMenu					m_RegisteredClass;	
+	ref static RadialMenu				m_Instance;
+	
+	/*
+	
+			RADIAL MENU EVENTS
+	
+	Mouse:
+		OnMouseSelect
+		OnMouseDeselect
+		OnMouseExecute - unused, press events used instead
+		OnMousePressLeft
+		OnMousePressRight
+	
+	Controller:
+		OnControllerSelect
+		OnControllerDeselect
+		OnControllerExecute - unused, press events used instead
+		OnControllerPressSelect
+		OnControllerPressBack
+	
+	Common:
+		OnControlsChanged		- controls has been changed (mouse<->controller)
+	
+	*/
+	
+	
+	//============================================
+	// RadialMenu
+	//============================================
+	void RadialMenu()
+	{
+		m_Instance = this;
+		
+		//set default control type
+#ifdef PLATFORM_CONSOLE
+		Input inp = GetGame().GetInput();
+		if (inp && inp.IsEnabledMouseAndKeyboardEvenOnServer())
+		{
+			m_ControlType = RadialMenuControlType.MOUSE;
+		}
+		else
+		{
+			m_ControlType = RadialMenuControlType.CONTROLLER;
+		}
+#endif
+#ifdef PLATFORM_WINDOWS
+		m_ControlType = RadialMenuControlType.MOUSE;
+#endif
+		
+		m_SelectInputWrapper = GetUApi().GetInputByID(UAUISelect).GetPersistentWrapper();
+		m_BackInputWrapper= GetUApi().GetInputByID(UAUIBack).GetPersistentWrapper();
+		
+		//radial cards
+		m_RadialItemCards = new map<Widget, float>;
+		m_UpdateTimer = new Timer();
+		m_UpdateTimer.Run(0.01, this, "Update", NULL, true);
+	}
+
+	void ~RadialMenu()
+	{
+	}
+	
+	static RadialMenu GetInstance()
+	{
+		return m_Instance;
+	}
+	
+	//Set handler
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_ItemCardsContainer = w.FindAnyWidget(RADIAL_ITEM_CARD_CONTAINER);
+		m_RadialSelector = w.FindAnyWidget(RADIAL_SELECTOR);
+		m_RadialSelectorImage = ImageWidget.Cast(m_RadialSelector.FindAnyWidget(RADIAL_SELECTOR_IMAGE));
+		m_RadialSelectorPointerImage = ImageWidget.Cast(m_RadialSelector.FindAnyWidget(RADIAL_SELECTOR_POINTER));
+		
+		m_RadialSelectorOriginalColor = m_RadialSelectorImage.GetColor();
+		m_RadialSelectorDisabledColor = ARGB(255,150,150,150);
+		
+		//parent
+		m_Parent = w;
+		m_Parent.SetHandler(this);
+	}
+
+	//controls
+	void SetControlType(RadialMenuControlType type)
+	{
+		if (m_ControlType != type)
+		{
+			m_ControlType = type;
+			GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControlsChanged", NULL, type);
+		}
+	}
+	
+	bool IsUsingMouse()
+	{
+		if (m_ControlType == RadialMenuControlType.MOUSE)
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	bool IsUsingController()
+	{
+		if (m_ControlType == RadialMenuControlType.CONTROLLER)
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void SetWidgetInitialized(bool state)
+	{
+		m_WidgetInitialized = state;
+	}
+	
+	bool IsWidgetInitialized()
+	{
+		return m_WidgetInitialized;
+	}
+			
+	//============================================
+	// Setup
+	//============================================	
+	void RegisterClass(UIScriptedMenu class_name)
+	{
+		m_RegisteredClass = class_name;
+		if (m_UpdateTimer && !m_UpdateTimer.IsRunning())
+			m_UpdateTimer.Run(0.01, this, "Update", NULL, true);
+	}	
+
+	//Set radial menu parameters
+	//Radius offset [% of the main container size]
+	void SetRadiusOffset(float radius_offset)
+	{
+		m_RadiusOffset = radius_offset;
+	}
+	
+	//Distance offset [% of the main container size] after which the selection will be automatically executed
+	void SetExecuteDistOffset(float execute_dist_offset)
+	{
+		m_ExecuteDistanceOffset	= execute_dist_offset;
+	}
+	
+	//First item in the menu won't be directly on top but offset by a rad angle value (clock-wise)
+	void SetOffsetFromTop(float offset_from_top)
+	{
+		m_OffsetFromTop	= offset_from_top;
+	}
+	
+	//Radius [% of the main container size] for item cards	
+	void SetItemCardRadiusOffset(float item_card_radius_offset)
+	{
+		m_ItemCardRadiusOffset = item_card_radius_offset;
+	}
+	
+	//Enable/Disable controller timeout
+	void ActivateControllerTimeout(bool state)
+	{
+		m_IsControllerTimoutEnabled = state;
+	}
+	
+	void SetWidgetProperties(string delimiter_layout)
+	{
+		m_DelimiterLayout = delimiter_layout;
+	}
+	
+	//============================================
+	// Visual
+	//============================================	
+	//hide_selector => shows/hides radial selector when refreshing radial menu
+	void Refresh(bool hide_selector = true)
+	{
+		int item_cards_count = GetItemCardsCount();
+		if (item_cards_count > 0)
+			m_AngleRadOffset = 2 * Math.PI / item_cards_count;		
+		float angle_rad = -Math.PI / 2;
+		
+		//--PARAM top offset--
+		if (m_OffsetFromTop != 0)
+		{
+			angle_rad = angle_rad + m_OffsetFromTop;
+		}
+		//--------------------
+		
+		//delete all delimiters
+		Widget delimiters_panel = m_Parent.FindAnyWidget(RADIAL_DELIMITER_CONTAINER);
+		if (delimiters_panel)
+		{
+			Widget del_child = delimiters_panel.GetChildren();
+			while (del_child)
+			{
+				Widget child_to_destroy1 = del_child;
+				del_child = del_child.GetSibling();
+				
+				delete child_to_destroy1;
+			}
+		}
+		
+		//Position item cards, crate radial delimiters
+		Widget item_cards_panel = m_Parent.FindAnyWidget(RADIAL_ITEM_CARD_CONTAINER);
+		Widget item_card = item_cards_panel.GetChildren();
+		
+		//get radius
+		float original_r = GetRadius();
+		float item_cards_r = original_r;
+		
+		//--PARAM top offset--....
+		if (m_ItemCardRadiusOffset != 0)
+		{
+			item_cards_r = item_cards_r * m_ItemCardRadiusOffset;
+			if (item_cards_r < 0) item_cards_r = 0;				//min radius is 0
+		}
+		
+		m_RadialItemCards.Clear();
+		for (int i = 0; i < item_cards_count; ++i)
+		{
+			//position item cards
+			if (item_card)
+			{
+				//creates circle from simple widget items
+				float pos_x = item_cards_r * Math.Cos(angle_rad);
+				float pos_y = item_cards_r * Math.Sin(angle_rad);
+				
+				pos_x = pos_x / original_r;
+				pos_y =	pos_y / original_r;
+				
+				item_card.SetPos(pos_x, pos_y);
+				
+				//store item card
+				m_RadialItemCards.Insert(item_card, angle_rad);
+				
+				//get next child
+				item_card = item_card.GetSibling();
+			}
+			//-------------------------
+			
+			//create delimiter
+			if (item_cards_count > 1 && delimiters_panel && m_DelimiterLayout)
+			{
+				Widget delimiter_widget = GetGame().GetWorkspace().CreateWidgets(m_DelimiterLayout, delimiters_panel);
+				float delim_angle_rad = angle_rad + (m_AngleRadOffset / 2);
+				delimiter_widget.SetPos(0, 0);
+				delimiter_widget.SetRotation(0, 0, GetAngleInDegrees(delim_angle_rad) + 90);
+			}
+						
+			//calculate next angle
+			angle_rad += m_AngleRadOffset;
+		}
+		
+		//hide selector on refresh
+		if (hide_selector)
+		{
+			HideRadialSelector();
+		}
+	}
+
+	//Radial selector
+	protected void ShowRadialSelector(Widget selected_item)
+	{
+		if (m_RadialSelector && selected_item)
+		{
+			int item_count = m_RadialItemCards.Count();
+			if (item_count > 1)
+			{
+				int angle_deg = GetAngleInDegrees(m_RadialItemCards.Get(selected_item));
+				m_RadialSelector.SetRotation(0, 0, angle_deg + 90);			//rotate widget according to its desired rotation
+				
+				//set radial selector size
+				float progress = (1 / item_count) * 2;
+				m_RadialSelectorImage.SetMaskProgress(progress);
+				
+				m_RadialSelector.Show(true);
+				
+				bool grey_selector = selected_item.GetFlags() & WidgetFlags.DISABLED;
+				if (!grey_selector)
+				{
+					m_RadialSelectorImage.SetColor(m_RadialSelectorDisabledColor);
+					m_RadialSelectorPointerImage.SetColor(m_RadialSelectorDisabledColor);
+				}
+				else
+				{
+					m_RadialSelectorImage.SetColor(m_RadialSelectorOriginalColor);
+					m_RadialSelectorPointerImage.SetColor(m_RadialSelectorOriginalColor);
+				}
+			}
+		}
+	}
+	
+	protected void HideRadialSelector()
+	{
+		if (m_RadialSelector)
+		{
+			m_RadialSelector.Show(false);
+		}
+	}
+	
+	//============================================
+	// Widget size calculations
+	//============================================	
+	protected int GetItemCardsCount()
+	{
+		Widget child = m_ItemCardsContainer.GetChildren();
+		int count = 0;
+		
+		while (child)
+		{
+			++count;
+			
+			child = child.GetSibling();
+		}
+		
+		return count;
+	}
+	
+	protected float GetRadius()
+	{
+		float radius = Math.AbsFloat(GetParentMinSize() * 0.5);
+		
+		//PARAM --radius--
+		if (m_RadiusOffset > 0)
+		{
+			return radius * m_RadiusOffset;
+		}
+		//----------------
+		
+		return radius;
+	}
+	
+	protected void GetParentCenter(out float center_x, out float center_y)
+	{
+		if (m_Parent)
+		{
+			float wx;
+			float wy;
+			m_Parent.GetScreenPos(wx, wy);
+			
+			float ww;
+			float wh;
+			m_Parent.GetScreenSize(ww, wh);
+			
+			center_x = wx + ww / 2;	//center
+			center_y = wy + wh / 2;
+		}
+	}
+	
+	protected float GetParentMinSize()
+	{
+		if (m_Parent)
+		{
+			float size_x;
+			float size_y;
+			m_Parent.GetScreenSize(size_x, size_y);
+			
+			return Math.Min(size_x, size_y);
+		}
+		
+		return 0;
+	}
+
+	//============================================
+	// Angle calculations
+	//============================================	
+	//get object by angle (degrees)
+	protected Widget GetObjectByDegAngle(float deg_angle)
+	{
+		for (int i = 0; i < m_RadialItemCards.Count(); ++i)
+		{
+			Widget w = m_RadialItemCards.GetKey(i);
+			float w_angle = GetAngleInDegrees(m_RadialItemCards.Get(w));
+			float offset = GetAngleInDegrees(m_AngleRadOffset) / 2;
+			float min_angle = w_angle - offset;
+			float max_angle = w_angle + offset;
+			
+			if (min_angle < 0) min_angle += 360;	//clamp 0-360
+			if (max_angle > 360) max_angle -= 360;
+			
+			if (min_angle > max_angle)		//angle radius is in the cycling point 360->
+			{
+				if (min_angle <= deg_angle)	//is cursor position also before this point
+				{
+					if (deg_angle > max_angle)
+					{
+						return w;
+					}
+				}
+				else							//is cursor position after this point
+				{
+					if (deg_angle < max_angle)
+					{
+						return w;
+					}
+				}
+			}
+			else
+			{
+				if (deg_angle >= min_angle && deg_angle < max_angle)	//min, max angles are within 0-360 radius
+				{
+					return w;
+				}				
+			}
+		}
+		
+		return NULL;
+	}
+	
+	//returns GUI compatible mouse-to-parent angle
+	protected float GetMousePointerAngle()
+	{
+		int mouse_x;
+		int mouse_y;
+		GetMousePos(mouse_x, mouse_y);
+		
+		float center_x;
+		float center_y;
+		GetParentCenter(center_x, center_y);
+
+		float tan_x = mouse_x - center_x;
+		float tan_y = mouse_y - center_y;
+		float angle = Math.Atan2(tan_y, tan_x);
+		
+		return angle;
+	}
+	
+	//returns distance from parent center
+	protected float GetMouseDistance()
+	{
+		int mouse_x;
+		int mouse_y;
+		GetMousePos(mouse_x, mouse_y);
+		
+		float center_x;
+		float center_y;
+		GetParentCenter(center_x, center_y);
+
+		float distance = vector.Distance(Vector(mouse_x, mouse_y, 0), Vector(center_x, center_y, 0));
+		
+		return distance;
+	}
+	
+	//return angle 0-360 deg
+	protected float GetAngleInDegrees(float rad_angle)
+	{
+		float rad_deg = rad_angle * Math.RAD2DEG;
+		
+		int angle_mp = rad_deg / 360;
+		
+		if (rad_deg < 0)
+		{
+			rad_deg = rad_deg - (360 * angle_mp);
+			rad_deg += 360;
+		}
+		
+		return rad_deg;
+	}
+
+	//============================================
+	// Update
+	//============================================
+	//mouse
+	int last_time = -1;
+	protected void Update()
+	{
+		if (this && !m_RegisteredClass)
+		{
+			m_UpdateTimer.Stop();
+			return;
+		}
+		
+		//get delta time
+		if (last_time < 0)
+		{
+			last_time = GetGame().GetTime();
+		}
+		int delta_time = GetGame().GetTime() - last_time;
+		last_time = GetGame().GetTime();
+		
+		//controls
+		if (this && m_RegisteredClass && m_RegisteredClass.IsVisible())
+		{
+			//mouse controls
+			if (IsUsingMouse() && m_WidgetInitialized)
+			{
+				float mouse_angle = GetMousePointerAngle();
+				float mouse_distance = GetMouseDistance();
+				
+				//--PARAM --safe zone radius--
+				if (mouse_distance <= MOUSE_SAFE_ZONE_RADIUS)
+				{
+					//Deselect
+					GetGame().GameScript.CallFunction(m_RegisteredClass, "OnMouseDeselect", NULL, m_SelectedObject);
+					m_SelectedObject = NULL;
+					//hide selector
+					HideRadialSelector();
+				}
+				else
+				{
+					//Deselect
+					GetGame().GameScript.CallFunction(m_RegisteredClass, "OnMouseDeselect", NULL, m_SelectedObject);
+					
+					//Select
+					m_SelectedObject = GetObjectByDegAngle(GetAngleInDegrees(mouse_angle));
+					GetGame().GameScript.CallFunction(m_RegisteredClass, "OnMouseSelect", NULL, m_SelectedObject);				
+					//show selector
+					ShowRadialSelector(m_SelectedObject);
+				}
+			}
+			//controller controls
+			else if (IsUsingController())
+			{
+				UpdataControllerInput();
+				
+				//Controller tilt
+				if (m_ControllerAngle > -1 && m_ControllerTilt > -1)
+				{
+					//Right analogue stick
+					Widget w_selected = GetObjectByDegAngle(m_ControllerAngle);
+					//Select
+					if (w_selected)
+					{
+						if (w_selected != m_SelectedObject)
+						{
+							if (m_ControllerTilt >= CONTROLLER_TILT_TRESHOLD_SELECT)
+							{
+								//Deselect
+								GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControllerDeselect", NULL, m_SelectedObject);
+							
+								//Select new object
+								m_SelectedObject = w_selected;
+								GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControllerSelect", NULL, m_SelectedObject);
+								//show selector
+								ShowRadialSelector(m_SelectedObject);
+							}
+						}
+					}
+					else
+					{
+						GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControllerDeselect", NULL, m_SelectedObject);
+						m_SelectedObject = NULL;
+						//hide selector
+						HideRadialSelector();						
+					}		
+				}
+				//if controller is giving no feedback
+				else
+				{
+					if (m_IsControllerTimoutEnabled)
+					{
+						m_ControllerTimout += delta_time;
+						
+						if (m_ControllerTimout >= CONTROLLER_DESELECT_TIMEOUT)
+						{
+							GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControllerDeselect", NULL, m_SelectedObject);
+							m_SelectedObject = NULL;
+							//hide selector
+							HideRadialSelector();						
+							
+							m_ControllerTimout = 0;		//reset controller timeout
+						}
+					}
+				}
+				
+				m_ControllerAngle = -1;				//reset angle and tilt
+				m_ControllerTilt = -1;
+			}
+			
+			m_WidgetInitialized = true;
+		}
+	}
+	
+	float NormalizeInvertAngle(float angle)
+	{
+		float new_angle = 360 - angle;
+		int angle_mp = new_angle / 360;
+			
+		new_angle = new_angle - (360 * angle_mp);
+			
+		return new_angle;
+	}
+	
+	//============================================
+	// Controls
+	//============================================
+	void UpdataControllerInput()
+	{
+		Input input = GetGame().GetInput();
+		
+		//Controller radial
+		float angle;
+		float tilt;
+		input.GetGamepadThumbDirection(GamepadButton.THUMB_RIGHT, angle, tilt);
+		angle = NormalizeInvertAngle(angle * Math.RAD2DEG);
+			
+		m_ControllerAngle = angle;
+		m_ControllerTilt = tilt;
+		m_ControllerTimout	= 0;			//reset controller timeout
+		
+		//Controller buttons
+		//Select (A,cross)
+		if (m_SelectInputWrapper.InputP().LocalPress())
+		{
+			GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControllerPressSelect", NULL, m_SelectedObject);
+		}
+		
+		//Back (B,circle)
+		if (m_BackInputWrapper.InputP().LocalPress())
+		{
+			GetGame().GameScript.CallFunction(m_RegisteredClass, "OnControllerPressBack", NULL, m_SelectedObject);
+		}
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT && m_SelectedObject/* && w == m_SelectedObject*/)
+		{
+			//Execute
+			GetGame().GameScript.CallFunction(m_RegisteredClass, "OnMousePressLeft", NULL, m_SelectedObject);
+			
+			return true;
+		}
+		
+		if (button == MouseState.RIGHT)
+		{
+			//Back one level
+			GetGame().GameScript.CallFunction(m_RegisteredClass, "OnMousePressRight", NULL, NULL);
+			
+			return true;
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Effects/RadialProgressBar.c b/scripts/3_Game/DayZ/GUI/Effects/RadialProgressBar.c
new file mode 100644
index 0000000000000000000000000000000000000000..c71159861806d9027eb9bdf2a52cec30034f0038
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Effects/RadialProgressBar.c
@@ -0,0 +1,105 @@
+// -----------------------------------------------------------
+class RadialProgressBar
+{
+	reference float speed;
+	reference float start_rotation;
+
+	protected string m_BarHider;
+	protected string m_BarPart;
+	protected Widget m_Root;	
+	protected ref AnimatorTimer m_Anim;
+	protected float x, y, z;
+	protected float rotation = 0;
+	protected int stage = 0;
+
+	// -----------------------------------------------------------
+	void RadialProgressBar()
+	{
+		m_Anim = new AnimatorTimer();
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(this.Update);
+	}
+	
+	// -----------------------------------------------------------
+	void ~RadialProgressBar()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Remove(this.Update);
+	}
+	
+	void SetProgress( float progress )
+	{
+		if( progress < 50 )
+		{
+			stage = 0;
+		}
+		rotation = 360 * ( progress / 100 );
+	}
+	
+	// -----------------------------------------------------------
+	protected void Update(float tDelta)
+	{
+		m_Anim.Tick(tDelta);
+		
+		Widget child = m_Root.GetChildren();
+		
+		int index = 0;
+		while ( child )
+		{
+			UpdateChild( child, index );
+			index++;
+			child = child.GetSibling();
+		}
+	}
+	
+	protected void UpdateChild( Widget child, int index )
+	{
+		float rotation_value = ( m_Anim.GetTargetValue() * Math.RAD2DEG );
+		if( child.GetName() == m_BarHider )
+		{
+			if( stage == 0 )
+			{
+				if( rotation > 0 )
+				{
+						child.GetChildren().Show(true);
+				}
+				else
+				{
+						child.GetChildren().Show(false);	
+				}
+				
+				child.GetChildren().SetRotation( 0, 0, start_rotation + rotation);
+				
+				if(  rotation > 180 )
+				{
+					stage = 1;
+					child.GetChildren().SetRotation(0, 0, 360);
+				}
+				
+			}	
+		}
+		else if( child.GetName() == m_BarPart )
+		{
+			if( stage == 0 )
+			child.Show( false );
+			if( stage == 1 )
+			{
+				child.Show( true );
+				child.SetRotation( 0, 0, start_rotation + rotation );
+				
+				if( rotation > 360 )
+				{
+					stage = 2;
+					child.SetRotation( 0, 0, 180 );
+				}
+			}
+		}
+	}
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit( Widget w )
+	{
+		m_Root = w;
+		m_BarHider = "BarHider_" + m_Root.GetName();
+		m_BarPart = "BarPart2_" + m_Root.GetName();
+		m_Anim.AnimateLoop( speed );
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Effects/Rotator.c b/scripts/3_Game/DayZ/GUI/Effects/Rotator.c
new file mode 100644
index 0000000000000000000000000000000000000000..4b9eef98322a42d03910f3da2edfc23122d83094
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Effects/Rotator.c
@@ -0,0 +1,30 @@
+// -----------------------------------------------------------
+class Rotator
+{
+	reference float speed;
+
+	protected Widget m_root;	
+	protected ref AnimatorTimer m_anim;
+
+	// -----------------------------------------------------------
+	void Rotator()
+	{
+		m_anim = new AnimatorTimer();
+	}
+	
+	// -----------------------------------------------------------
+	protected void Update()
+	{
+		if (m_root)
+		{
+			m_root.SetRotation(0, 0, m_anim.GetTargetValue() * Math.RAD2DEG);
+		}
+	}
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_anim.AnimateLoop(speed);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Embeded.c b/scripts/3_Game/DayZ/GUI/Embeded.c
new file mode 100644
index 0000000000000000000000000000000000000000..118dbd161129b3f3f0f685bff69222bf9f556eec
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Embeded.c
@@ -0,0 +1,11 @@
+
+class EmbededButtonScript
+{
+	reference string Caption;
+	void OnWidgetScriptInit(Widget w)
+	{
+		ButtonWidget button = ButtonWidget.Cast(w.GetChildren());
+		button.SetText(Caption);
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/GUI/Hints/HintPage.c b/scripts/3_Game/DayZ/GUI/Hints/HintPage.c
new file mode 100644
index 0000000000000000000000000000000000000000..52e84fed9359a052f9115d3de0cd8afb355296e1
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Hints/HintPage.c
@@ -0,0 +1,23 @@
+/*
+	Data model class for Hint json
+	Location: 
+*/
+class HintPage 
+{
+	private string 	m_Headline;			// Headline hint text	
+	private string 	m_Description;		// Hint description text
+	private string 	m_ImagePath;		// Hint image, can be null  
+
+	string GetHeadlineText()
+	{
+		return m_Headline;
+	}
+	string GetDescriptionText()
+	{
+		return m_Description;
+	}
+	string GetImagePath()
+	{
+		return m_ImagePath;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Hints/UiHintPanel.c b/scripts/3_Game/DayZ/GUI/Hints/UiHintPanel.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ace894fd86701be31af6ec4a592eae560c01d8e
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Hints/UiHintPanel.c
@@ -0,0 +1,300 @@
+/*
+	Ui class for hints in in-game-menu
+*/
+
+class UiHintPanel extends ScriptedWidgetEventHandler
+{	
+	#ifdef DIAG_DEVELOPER
+	static int				m_ForcedIndex = -1;//only for debug purposes
+	#endif
+	
+	// Const
+	protected int 			m_SlideShowDelay			= 25000;											// The speed of the slideshow 
+	protected string 				m_RootPath			= "Gui/layouts/new_ui/hints/in_game_hints.layout";	// Layout path 
+	protected const string 			m_DataPath			= "scripts/data/hints.json";						// Json path
+	// Widgets
+	protected Widget 				m_RootFrame;
+	protected Widget 				m_SpacerFrame;
+	protected ButtonWidget 			m_UiLeftButton;
+	protected ButtonWidget 			m_UiRightButton;
+	protected RichTextWidget		m_UiDescLabel;
+	protected TextWidget			m_UiHeadlineLabel;
+	protected ImageWidget 			m_UiHintImage;
+	protected TextWidget 			m_UiPageingLabel;
+	// Data		
+	protected ref array<ref HintPage>	m_ContentList;
+	protected int 					m_PageIndex = int.MIN;
+	protected DayZGame				m_Game;
+	protected bool					m_Initialized;
+	protected Widget 				m_ParentWidget;
+	protected int					m_PreviousRandomIndex = int.MIN;
+	
+	// ---------------------------------------------------------
+	
+	// Constructor
+	void UiHintPanel(Widget parent_widget)
+	{		
+		DayZGame game = DayZGame.Cast(GetGame());
+		m_ParentWidget = parent_widget;
+		Init(game);
+	}
+	// Destructor
+	void ~UiHintPanel()
+	{
+		StopSlideShow();
+	
+		if(m_RootFrame)
+			m_RootFrame.Unlink();
+	}
+
+	
+	void Init(DayZGame game)
+	{
+		//as this class is now also being instantiated from within the DayZGame CTOR, where GetGame() does not work yet, we need a way to pass the game instance from DayZGame CTOR
+		//however for modding legacy support purposes, this was done without modifying the CTOR signature with the addition of the Init method, 
+		//in order to keep compatibility with existing MODs, there is still a way to instantiate this class properly even without calling Init from the outside
+		
+		if (m_Initialized)
+			return;
+		if (!game)//is null when instantiated from DayZGame during loading before calling Init explicitly
+			return;
+		m_Initialized = true;
+
+		m_Game = game;
+		// Load Json File 
+		LoadContentList();
+		// If load successful 
+		if (m_ContentList)	
+		{
+			// Build the layout
+			BuildLayout(m_ParentWidget);
+			// Get random page index 
+			RandomizePageIndex();
+			// Populate the layout with data
+			PopulateLayout();
+			// Start the slideshow
+			StartSlideshow();			
+		}
+		else 
+			ErrorEx("Could not create the hint panel. The data are missing!");
+	}
+	
+	// ------------------------------------------------------
+	
+	// Load content data from json file 
+	protected void LoadContentList()
+	{
+		string errorMessage;
+		if (!JsonFileLoader<array<ref HintPage>>.LoadFile(m_DataPath, m_ContentList, errorMessage))
+			ErrorEx(errorMessage);
+	}	
+	
+	// Create and Build the layout 
+	protected void BuildLayout(Widget parent_widget)
+	{
+		// Create the layout
+		m_RootFrame = m_Game.GetWorkspace().CreateWidgets(m_RootPath, parent_widget);
+		
+		if (m_RootFrame)
+		{
+			// Find Widgets
+			m_SpacerFrame		= m_RootFrame.FindAnyWidget("GridSpacerWidget1");		
+			m_UiLeftButton		= ButtonWidget.Cast(m_RootFrame.FindAnyWidget("LeftButton"));		
+			m_UiRightButton		= ButtonWidget.Cast(m_RootFrame.FindAnyWidget("RightButton"));
+			m_UiHeadlineLabel	= TextWidget.Cast(m_RootFrame.FindAnyWidget("HeadlineLabel"));	
+			m_UiDescLabel		= RichTextWidget.Cast(m_RootFrame.FindAnyWidget("HintDescLabel"));
+			m_UiHintImage		= ImageWidget.Cast(m_RootFrame.FindAnyWidget("HintImage"));
+			m_UiPageingLabel	= TextWidget.Cast(m_RootFrame.FindAnyWidget("PageInfoLabel"));
+			// Set handler
+			m_RootFrame.SetHandler(this);
+		}
+	}
+	
+	// Populate the hint with content
+	protected void PopulateLayout()
+	{
+		if (m_RootFrame)
+		{
+			SetHintHeadline();
+			SetHintDescription();
+			SetHintImage();
+			SetHintPaging();
+		}
+	}	
+	
+	// -------------------------------------------
+	// Setters
+	protected void SetHintHeadline()
+	{
+		m_UiHeadlineLabel.SetText(m_ContentList.Get(m_PageIndex).GetHeadlineText());
+	}
+	protected void SetHintDescription()
+	{
+		#ifdef DEVELOPER
+		//Print("showing contents for page "+m_PageIndex);
+		#endif
+		m_UiDescLabel.SetText(m_ContentList.Get(m_PageIndex).GetDescriptionText());
+		m_UiDescLabel.Update();
+		m_SpacerFrame.Update();
+	}
+	protected void SetHintImage()
+	{
+		string image_path = m_ContentList.Get(m_PageIndex).GetImagePath();
+		
+		// If there is an image 
+		if (image_path)
+		{	
+			// Show the widget
+			m_UiHintImage.Show(true);
+			// Set the image path
+			m_UiHintImage.LoadImageFile(0, image_path);
+		}
+		else 
+		{
+			// Hide the widget
+			m_UiHintImage.Show(false);
+		}
+	}
+	protected void SetHintPaging()
+	{
+		if (m_UiPageingLabel)
+			m_UiPageingLabel.SetText(string.Format("%1 / %2", m_PageIndex + 1, m_ContentList.Count()));	
+	}
+	
+	void ShowRandomPage()
+	{
+		RandomizePageIndex();
+		PopulateLayout();
+	}
+	
+	// Set a random page index 
+	protected void RandomizePageIndex()
+	{
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.IsInitialized())
+		{
+			if (m_ForcedIndex != -1)
+			{
+				m_PageIndex = Math.Clamp(m_ForcedIndex,0,m_ContentList.Count() - 1);
+				return;	
+			}
+		}	
+		#endif
+		
+		Math.Randomize(m_Game.GetTime());
+		Math.RandomFloat01();//throw-away value, without calling this, the next random number is always the same, calling Math.Randomize(-1) makes no difference
+		while (m_PageIndex == m_PreviousRandomIndex)
+			m_PageIndex = Math.RandomIntInclusive(0, m_ContentList.Count() - 1);
+		m_PreviousRandomIndex = m_PageIndex;
+		
+	}
+	// Show next hint page by incrementing the page index. 
+	protected void ShowNextPage()
+	{
+		// Update the page index
+		if ( m_PageIndex < m_ContentList.Count() - 1 )
+		{
+			m_PageIndex++;
+		}
+		else 											
+		{
+			m_PageIndex = 0;
+		}
+		
+		//Update the hint page
+		PopulateLayout();
+	}	
+	// Show previous hint page by decreasing the page index. 
+	protected void ShowPreviousPage()
+	{
+		// Update the page index
+		if ( m_PageIndex == 0 )
+		{
+			m_PageIndex = m_ContentList.Count() - 1;
+		}
+		else 
+		{
+			m_PageIndex--;
+		
+		}
+		//Update the hint page
+		PopulateLayout();
+	}
+
+	// -------------------------------------------
+	// Slideshow
+	
+	// Creates new slidshow thread
+	protected void StartSlideshow()
+	{
+		m_Game.GetCallQueue(CALL_CATEGORY_GUI).CallLater(SlideshowThread, m_SlideShowDelay);
+	}
+	// Slidshow thread - run code
+	protected void SlideshowThread()
+	{
+		ShowNextPage();
+	}
+	// Stop the slide show
+	protected void StopSlideShow()
+	{
+		m_Game.GetCallQueue(CALL_CATEGORY_GUI).Remove(SlideshowThread);
+	}
+	// Restart the slide show 
+	protected void RestartSlideShow()
+	{
+		StopSlideShow();
+		StartSlideshow();
+	}
+	
+	// ----------------------------------------
+	// Layout manipulation
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			switch (w)
+			{
+				case m_UiLeftButton:
+				{
+					ShowPreviousPage();
+					return true;
+				}
+				case m_UiRightButton:
+				{	
+					ShowNextPage();
+					return true;
+				}	
+			}
+		}
+		return false;
+	}
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (w == m_RootPath || w == m_UiLeftButton || w == m_UiRightButton)
+		{
+			StopSlideShow();
+			return true;
+		}
+		return false;
+	}
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (w == m_RootPath || w == m_UiLeftButton || w == m_UiRightButton)
+		{
+			RestartSlideShow();
+			return true;
+		}
+		return false;
+	}
+}
+
+// ---------------------------------------------------------------------------------------------------------
+class UiHintPanelLoading extends UiHintPanel
+{
+	override void Init(DayZGame game)
+	{
+		m_RootPath = "Gui/layouts/new_ui/hints/in_game_hints_load.layout";
+		super.Init(game);
+	}
+}
diff --git a/scripts/3_Game/DayZ/GUI/InventoryGrid.c b/scripts/3_Game/DayZ/GUI/InventoryGrid.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec021cea7a954be7b282bf2f022a7b88617dccc8
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/InventoryGrid.c
@@ -0,0 +1,774 @@
+// -----------------------------------------------------------
+class InventoryGridController extends ScriptedWidgetEventHandler
+{
+	void OnItemEnter(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemLeave(InventoryGrid grid, Widget w) {}
+	void OnItemDrag(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemDraggingOver(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemDrop(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemDropReceived(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemClick(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemLeftClick(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemRightClick(InventoryGrid grid, Widget w, int row, int col) {}
+	void OnItemDoubleClick(InventoryGrid grid, Widget w, int row, int col) {}
+	// float GetItemQuantity(InventoryGrid grid, InventoryItem item) {}
+	int GetItemColor(ScriptedWidgetEventHandler grid, InventoryItem item)
+	{ 
+		return 0;
+	}
+	int GetQuickbarItemColor(InventoryGrid grid, InventoryItem item) {}
+	vector GetItemSize(InventoryGrid grid, InventoryItem item)
+	{
+		return Vector(0, 1, 1);
+	}
+	string GetItemQuantityText( InventoryItem item ) {}
+	int HasItemQuantity( InventoryItem item ) {}
+	float GetItemQuantity( InventoryItem item ) {}
+	int GetItemQuantityMax( InventoryItem item ) {}
+	int GetItemCount( InventoryItem item ) {}
+	bool CanAddItemInHandToInventory() {}
+};
+
+// -----------------------------------------------------------
+//! map: item x vector(index, width, height)
+typedef map<InventoryItem, vector> TItemsMap
+
+class InventoryGrid extends ScriptedWidgetEventHandler
+{
+	// AARRGGBB
+	static int ITEM_COLOR_QUICKBAR_NORMAL	= 0x0AFFFFFF;
+	static int ITEM_COLOR_QUICKBAR_H_GOOD	= 0x2A6e980d;
+	static int ITEM_COLOR_QUICKBAR_H_BAD	= 0x2A980d0d;
+	static int ITEM_COLOR_QUICKBAR_I_BAD	= 0x2A986e0d;
+	static int ITEM_COLOR_NORMAL			= 0x0AFFFFFF;
+	static int ITEM_COLOR_DRAG				= 0x0AFFFFFF;
+	
+	reference bool						m_IsDebugOutput;
+
+	protected ref map<int, Widget>		m_BackgroundWidgets;
+	protected ref map<int, Widget>		m_ItemWidgets;
+	protected ref TItemsMap				m_Items;
+	protected InventoryGridController	m_Controller;
+
+	
+	protected Widget					m_Root;
+	protected int						m_GridSize;
+	protected bool						m_IsMouseLeftDown;
+	protected bool						m_CanAddItemInHandToInventory;
+
+	void InventoryGrid()
+	{
+		m_Items				= new TItemsMap;	
+		m_BackgroundWidgets	= new map<int, Widget>;
+		m_ItemWidgets		= new map<int, Widget>;
+	}
+
+	protected void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+	}
+	
+	// NOTE: This is a cached value, depending on when it is called it might not be 100% accurate
+	bool CanAddItemInHandToInventory()
+	{
+		return m_CanAddItemInHandToInventory;
+	}
+	
+	// ScriptedWidgetEventHandler override
+	override bool OnUpdate(Widget w)
+	{
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		int col = GetCol( w );
+		
+		if ( !IsValidPos( col ) )
+			return false;	
+		
+		if (m_IsDebugOutput)
+		{
+			PrintString (m_Root.GetName() + "::OnMouseEnter(" + col.ToString() + ")");
+		}
+		
+		if (m_Controller) m_Controller.OnItemEnter(this, w, 0, col);
+	
+		return true;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (m_Controller) m_Controller.OnItemLeave(this, w);
+	
+		return true;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.RIGHT || button == MouseState.LEFT)
+		{
+			int col = GetCol( w );
+		
+			if ( !IsValidPos( col ) )
+				return false;
+			
+			if (m_IsDebugOutput)
+			{
+				PrintString (m_Root.GetName() + "::OnMouseButtonDown(" + col.ToString() + ")");
+			}
+		
+			if (m_Controller) 
+			{
+				if (button == MouseState.RIGHT )
+				{
+					m_Controller.OnItemRightClick(this, w, 0, col);
+				}
+
+				if (button == MouseState.LEFT )
+				{
+					m_IsMouseLeftDown = true;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	// -----------------------------------------------------------
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if ( button == MouseState.LEFT )
+		{
+			if( m_IsMouseLeftDown )
+			{
+				m_Controller.OnItemLeftClick(this, w, 0, m_col);
+				m_IsMouseLeftDown = false;
+			}
+		}
+
+		if (button == MouseState.RIGHT || button == MouseState.LEFT)
+		{
+			int col = GetCol( w );
+		
+			if ( !IsValidPos( col ) )
+				return false;
+			
+			if (m_IsDebugOutput)
+			{
+				PrintString (m_Root.GetName() + "::OnMouseButtonUp(" + col.ToString() + ")");
+			}
+		
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		if (button != MouseState.LEFT) return false;
+		
+		int col = GetCol( w );
+	
+		if ( !IsValidPos( col ) )
+				return false;
+		
+		if (m_IsDebugOutput)
+		{
+			PrintString (m_Root.GetName() + "::OnDoubleClick(" + col.ToString() + ")");
+		}
+	
+		if (m_Controller) m_Controller.OnItemDoubleClick(this, w, 0, col);
+	
+		return true;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnDrop(Widget w, int x, int y, Widget reciever)
+	{
+		if (m_IsDebugOutput)
+		{
+			PrintString (m_Root.GetName() + "::OnDrop()");
+		}
+	
+		if (m_Controller) 
+		{
+			m_Controller.OnItemDrop(this, w, 0, m_col);
+		}
+		
+		if (w)
+		{
+			ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( w.FindAnyWidget("Preview") );
+			if (item_preview)
+			{
+				item_preview.SetView( item_preview.GetItem().GetViewIndex() );
+			}
+		}
+		
+		return true;
+	}
+	
+	int GetCol( Widget w )
+	{
+		int index;
+		
+		if( m_ItemWidgets.GetKeyByValueChecked( w, index ) )
+			return index;
+		else if( m_BackgroundWidgets.GetKeyByValueChecked( w, index ) )
+			return index;
+		else
+			return -1;
+	}
+	
+	int GetColFromBg( Widget w )
+	{
+		return m_BackgroundWidgets.GetKeyByValue( w );
+	}
+	
+	int GetGridSize()
+	{
+		return m_GridSize;
+	}
+	
+	void SetGridSize( int size )
+	{
+		m_GridSize = size;
+		for( int i = 0; i < m_BackgroundWidgets.Count(); i++ )
+		{
+			if( i < size )
+			{
+				m_BackgroundWidgets.Get( i ).Show( true );
+			}
+			else
+			{
+				m_BackgroundWidgets.Get( i ).Show( false );
+			}
+		}
+	}
+	
+	bool IsValidPos( int index )
+	{
+		return ( m_GridSize > index && index > -1 );
+	}
+	
+	private Widget m_on_drag_item;
+	private int m_col;
+	
+	//--------------------------------------------------------------------------
+	override bool OnDrag(Widget w, int x, int y)
+	{
+		w.SetPos(x, y);
+
+		m_col = GetCol( w );
+		
+		if ( !IsValidPos( m_col ) )
+			return false;
+		
+		if (m_IsDebugOutput)
+		{
+			PrintString (m_Root.GetName() + "::OnDrag(" + m_col.ToString() + ")");
+		}
+	
+		if (m_Controller) m_Controller.OnItemDrag(this, w, 0, m_col);
+	
+		ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( w.FindAnyWidget("Preview") );
+		if (item_preview)
+		{
+			item_preview.SetView( item_preview.GetItem().GetViewIndex() );
+		}
+		return true;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnDraggingOver(Widget w, int x, int y, Widget reciever)
+	{
+		int col = GetCol( reciever );
+		
+		if ( !IsValidPos( col ) )
+		{
+			return false;
+		}
+		
+		if (m_IsDebugOutput)
+		{
+			PrintString (m_Root.GetName() + "::OnDraggingOver(" + col.ToString() + ")");
+		}
+	
+		if (m_Controller) m_Controller.OnItemDraggingOver(this, w, 0, col);
+	
+		
+		return true;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnDropReceived(Widget w, int x, int y, Widget reciever)
+	{
+		int col = GetCol( reciever );
+	
+		if ( !IsValidPos( col ) )
+			return false;
+		
+		if (m_IsDebugOutput)
+		{
+			PrintString (m_Root.GetName() + "::OnDropReceived(" + col.ToString() + ")");
+		}
+	
+		if (m_Controller) m_Controller.OnItemDropReceived(this, w, 0, col);
+	
+		
+		return true;
+	}
+	
+	TItemsMap GetItems() {
+		return m_Items;	
+	}
+	
+	//--------------------------------------------------------------------------
+	Widget GetItem(int index)
+	{
+		if( m_ItemWidgets.Contains( index ) )
+			return m_ItemWidgets.Get( index );
+		else
+			return null;
+	}
+	
+	//--------------------------------------------------------------------------
+	Widget GetItemBackground(int index)
+	{
+		if( m_BackgroundWidgets.Contains( index ) )
+			return m_BackgroundWidgets.Get( index );
+		else
+			return null;
+	}
+
+	Widget GetRoot()
+	{
+		return m_Root;
+	}
+	
+	void SetItemColor(InventoryItem item, int color)
+	{
+		if (m_Items.Contains(item))
+		{
+			vector data = m_Items.Get(item);
+			int index = Math.Round(data[0]);
+			
+			Widget w = GetItem(index);
+			if (w)
+				w.SetColor(color);
+		}
+	}
+	
+	void SetController(InventoryGridController controller) { 
+		m_Controller = controller; 
+	}
+
+	InventoryGridController GetController() { 
+		return m_Controller; 
+	}
+	
+	//--------------------------------------------------------------------------
+	void GenerateQuickBarBackgroundTiles(int count)
+	{
+		for (int i = 0; i < count; i++)
+		{
+			Widget root_widget = GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory/inventoryGridBackground.layout", m_Root);
+			TextWidget label_widget = TextWidget.Cast( root_widget.FindAnyWidget( "Label1" ) );
+			TextWidget label_widget2 = TextWidget.Cast( root_widget.FindAnyWidget( "Label2" ) );
+			label_widget.SetText( (i+1).ToString() );
+			label_widget2.SetText( (i+1).ToString() );
+			m_BackgroundWidgets.Insert( i, root_widget );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void UpdateQuickbarItems( TItemsMap items )
+	{
+		int i;
+		int c;
+		int index;
+		int width;
+		int height;
+		int row;
+		int col;
+		InventoryItem item;
+		vector data;
+		Widget bck;
+		Widget item_w;
+		
+		// remove not actual items
+		c = m_Items.Count();
+		for (i = 0; i < c; i++)
+		{
+			item = m_Items.GetKey(i);
+			if( item != NULL )
+			{
+				bool remove_item = false;
+				
+				if (items.Contains(item) == false)
+				{
+					remove_item = true;
+				}
+				else
+				{
+					// check items position actual
+					if ((m_Items.Get(item) - items.Get(item)).LengthSq() > 0.01)
+					{
+						// item has different position or size
+						remove_item = true;
+					}
+				}
+				
+				if (remove_item)
+				{
+					RemoveItem(item);
+					c--;
+					i--;			
+				}
+			}
+		}
+		
+		// add new items
+		for (i = 0; i < items.Count(); i++)
+		{
+			item = items.GetKey(i);
+			data = items.Get(item);
+					
+			if (m_Items.Contains(item) == false)
+			{
+				AddItem(item, data, Vector(0,0,0) );
+			}
+		}
+		
+		// cache if entity in hands can be added to inventory
+		m_CanAddItemInHandToInventory = m_Controller.CanAddItemInHandToInventory();
+	
+		// refresh quickbar
+		for (i = 0; i < items.Count(); i++)
+		{
+			item = items.GetKey(i);
+			data = items.Get(item);
+			RefreshQuickbarItemVariables( item, data );
+		}
+	}
+	
+	
+	//--------------------------------------------------------------------------
+	void UpdateItems(TItemsMap items, bool show_quantity, bool show_temperature )
+	{
+		int i;
+		int c;
+		int index;
+		int width;
+		int height;
+		int row;
+		int col;
+		InventoryItem item;
+		vector data;
+		Widget bck;
+		Widget item_w;
+		
+		// remove not actual items
+		c = m_Items.Count();
+		for (i = 0; i < c; i++)
+		{
+			item = m_Items.GetKey(i);
+			
+			bool remove_item = false;
+			
+			if (items.Contains(item) == false)
+			{
+				remove_item = true;
+			}
+			else
+			{
+				// check items position actual
+				if ((m_Items.Get(item) - items.Get(item)).LengthSq() > 0.01)
+				{
+					// item has different position or size
+					remove_item = true;
+				}
+			}
+			
+			if (remove_item)
+			{
+				RemoveItem(item);
+				c--;
+				i--;			
+			}
+		}
+		
+		// add new items
+		for (i = 0; i < items.Count(); i++)
+		{
+			item = items.GetKey(i);
+			data = items.Get(item);
+					
+			if (m_Items.Contains(item) == false)
+			{
+				AddItem(item, data, Vector(0,0,0) );
+			}
+		}
+	
+		// add new items
+		for (i = 0; i < items.Count(); i++)
+		{
+			item = items.GetKey(i);
+			data = items.Get(item);
+			// refresh quantity
+			RefreshItemVariables( item, data, show_quantity, show_temperature );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void UpdateQuantityItems()
+	{
+		int i;
+		int index;
+		InventoryItem item;
+		vector data;
+		for (i = 0; i < m_Items.Count(); i++)
+		{
+			item = m_Items.GetKey(i);
+			data = m_Items.Get(item); 
+			index = Math.Round(data[0]);
+			RefreshItemVariables( item, data, true, false );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void UpdateTemperatureItems()
+	{
+		int i;
+		int index;
+		InventoryItem item;
+		vector data;
+		for (i = 0; i < m_Items.Count(); i++)
+		{
+			item = m_Items.GetKey(i);
+			data = m_Items.Get(item); 
+			index = Math.Round(data[0]);
+			RefreshItemVariables( item, data, false, true );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void RefreshQuickbarItemVariables(InventoryItem item, vector data)
+	{
+		int	index = Math.Round(data[0]);
+		Widget bck = GetItemBackground(index);
+		if ( bck )
+		{
+			Widget item_w = bck.FindAnyWidget("GridItem");
+			if ( item_w )
+			{
+				int color = m_Controller.GetQuickbarItemColor( this, item ); // !!!!!
+				item_w.SetColor( color );
+			}
+		}
+		RefreshItemVariables( item, data, true, false );
+	}
+	
+	//--------------------------------------------------------------------------
+	void RefreshItemVariables(InventoryItem item, vector data, bool show_quantity, bool show_temperature )
+	{
+		int	index = Math.Round(data[0]);
+		Widget bck = GetItemBackground(index);
+		Widget item_w;
+	
+		if ( bck )
+		{
+			item_w = bck.FindAnyWidget("GridItem");
+			if ( item_w )
+			{
+				int has_quantity = m_Controller.HasItemQuantity( item );
+				Widget quantity_panel = bck.FindAnyWidget("QuantityPanel");
+				TextWidget item_quantity = TextWidget.Cast( bck.FindAnyWidget("Quantity") );
+				ProgressBarWidget quantity_progress = ProgressBarWidget.Cast( bck.FindAnyWidget("QuantityBar") );
+				Widget quantity_stack = bck.FindAnyWidget("QuantityStackPanel");
+				if ( has_quantity == QUANTITY_HIDDEN )
+				{
+					quantity_panel.Show( false );
+				}
+				else
+				{
+					quantity_panel.Show( true );
+					if ( has_quantity == QUANTITY_COUNT )
+					{
+						item_quantity.SetText( m_Controller.GetItemQuantityText( item ) );
+						quantity_stack.Show( true );
+						quantity_progress.Show( false );
+					}
+					else if ( has_quantity == QUANTITY_PROGRESS )
+					{
+						float progress_max = quantity_progress.GetMax();
+						int max = m_Controller.GetItemQuantityMax( item );
+						int count = m_Controller.GetItemCount( item );
+						float quantity = m_Controller.GetItemQuantity( item );
+						if ( count > 0 )
+						{
+							max = count;
+						}
+						if ( max > 0 )
+						{
+	
+							float value = Math.Round( ( quantity / max ) * 100 );
+							quantity_progress.SetCurrent( value );
+						}
+						quantity_stack.Show( false );
+						quantity_progress.Show( true );
+					}
+				}
+				
+				if ( show_temperature )
+				{
+					if ( item && item.IsInherited( InventoryItem ) )
+					{
+						int color = m_Controller.GetItemColor( this, item); // !!!!!
+						if ( color )
+						{
+							item_w.SetColor( color );
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void AddItem(InventoryItem item, vector data, vector rotation)
+	{
+		m_Items.Set(item, data);			
+				
+		int index = Math.Round(data[0]);
+		int width = Math.Round(data[1]);
+		int height = Math.Round(data[2]);
+				
+		Widget bck = GetItemBackground(index);
+		Widget item_w_bck = GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory/inventoryGridItem.layout", bck);
+		Widget item_w = item_w_bck.FindAnyWidget("GridItem");
+		
+		bck.FindAnyWidget("LabelTR").Show( true );
+		bck.FindAnyWidget("LabelCC").Show( false );
+		
+		m_ItemWidgets.Insert( index, item_w );
+		
+		ResetItemWidget(item_w, width, height);
+		
+		if ( item )
+		{
+			ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( item_w.FindAnyWidget("Preview") );
+			item_preview.SetItem(item);
+			item_preview.SetModelOrientation( rotation );
+			item_preview.SetView( item_preview.GetItem().GetViewIndex() );
+			
+			RefreshItemVariables( item, data, true, true );
+		}
+	}
+
+	//--------------------------------------------------------------------------
+	void SetItem(InventoryItem item, vector data, vector rotation)
+	{
+		m_Items.Set(item, data);
+				
+		int index = Math.Round(data[0]);
+		int width = Math.Round(data[1]);
+		int height = Math.Round(data[2]);
+				
+		Widget bck = GetItemBackground(index);
+		Widget item_w_bck = bck.FindAnyWidget("GridItemBck");
+		
+		if(item_w_bck)
+		{
+			bck.FindAnyWidget("LabelTR").Show( true );
+			bck.FindAnyWidget("LabelCC").Show( false );
+			
+			Widget item_w = item_w_bck.FindAnyWidget("GridItem");
+			ResetItemWidget(item_w, width, height);
+			
+			if ( item )
+			{
+				ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( item_w.FindAnyWidget("Preview") );
+				item_preview.SetItem(item);
+				item_preview.Show( true );
+				item_preview.SetModelOrientation( rotation );
+				item_preview.SetView( item_preview.GetItem().GetViewIndex() );
+				
+				RefreshItemVariables( item, data, true, true );
+			}
+			else
+			{
+				item_preview = ItemPreviewWidget.Cast( item_w.FindAnyWidget("Preview") );
+				item_preview.Show( false );
+			}
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	protected void ResetItemWidget(Widget item_w, int width, int height)
+	{
+		if( item_w )
+		{
+			item_w.SetColor(ITEM_COLOR_NORMAL);
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void ResetItem(InventoryItem item)
+	{
+		if (m_Items.Contains(item))
+		{
+			vector data = m_Items.Get(item);
+			int index = Math.Round(data[0]);
+			int width = Math.Round(data[1]);
+			int height = Math.Round(data[2]);
+			Widget bck = GetItemBackground(index);
+			Widget item_w = bck.FindAnyWidget("GridItem");
+			ResetItemWidget(item_w, width, height);
+			RefreshItemVariables( item, data, true, true );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	bool HasItem(InventoryItem item)
+	{
+		return m_Items.Contains(item);
+	}
+	
+	//--------------------------------------------------------------------------
+	void RemoveItem(InventoryItem item)
+	{
+		Widget bck;
+		Widget itemW;
+		if ( item && m_Items.Contains( item ) )
+		{
+			vector data = m_Items.Get(item);
+			int index = Math.Round(data[0]);
+			int width = Math.Round(data[1]);
+			int height = Math.Round(data[2]);
+			bck = GetItemBackground(index);
+			if( bck )
+			{
+				itemW = bck.FindAnyWidget("GridCell");
+				if( itemW )
+					delete itemW;
+				bck.FindAnyWidget("LabelTR").Show( false );
+				bck.FindAnyWidget("LabelCC").Show( true );
+			}
+		
+			m_Items.Remove( item );
+			m_ItemWidgets.Remove( index );
+		}
+	}
+};
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/AutoHeightSpacer.c b/scripts/3_Game/DayZ/GUI/Spacers/AutoHeightSpacer.c
new file mode 100644
index 0000000000000000000000000000000000000000..382ab38e918fb19c1746dbb9a08a170f848572cb
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/AutoHeightSpacer.c
@@ -0,0 +1,129 @@
+// -----------------------------------------------------------
+class AutoHeightSpacer : ScriptedWidgetEventHandler
+{
+	reference bool AlignChilds;
+	reference int MinHeight;
+	reference int MaxHeight;
+	reference int Gap;
+	reference float Top;
+	protected Widget m_root;
+
+	void Update()
+	{
+		float x = 0;
+		float y = 0;
+		float width = 0;
+		float height = 0;
+		float heightOld = 0;
+		float top = Top;
+		float rowRight;
+		float rowHeight;
+		float rowWidth;
+		Widget child = m_root.GetChildren();
+
+		//PrintString(m_root.GetName() + ": AutoHeightSpacer::Update()");
+
+		if ( !AlignChilds )	top = -100000;
+
+		if (child != NULL)
+		{
+		// first row init
+		m_root.GetScreenSize(rowWidth, height);
+		rowHeight = 0;
+		rowRight = rowWidth;
+
+		while (child)
+		{
+			if (child.IsVisible() == false || child.GetName() == "SelectedContainer" || child.GetName() == "Icon")
+			{
+				// skip invisible widgets
+				child = child.GetSibling();
+				continue;
+			}
+
+			child.GetScreenSize(width, height);
+
+			if (AlignChilds)
+			{
+				child.SetFlags(WidgetFlags.EXACTPOS, false);
+
+				// no space left in this row, move to next one
+				if (rowRight < width)
+				{
+					top += rowHeight;
+					if ( rowHeight > 0 ) top += Gap;
+					rowRight = rowWidth;
+					rowHeight = 0;
+				}
+
+				// increase row height if necessary
+				if (height > rowHeight) rowHeight = height;
+
+				child.SetPos(rowWidth - rowRight, top, false);
+				rowRight -= width + Gap;
+			}
+			else
+			{
+				child.GetScreenPos(x, y);
+				y += height;
+				if (top < y) top = y;
+			}
+
+			child = child.GetSibling();
+		}
+
+		// add last row height;
+		top += rowHeight;
+
+		if (AlignChilds)
+		{
+			height = top;
+		}
+		else
+		{
+			m_root.GetScreenPos(x, y);
+			height = top - y;
+		}
+		}
+
+		m_root.GetSize(width, heightOld);
+
+		if (MaxHeight > 0 && height > MaxHeight)
+		{
+			height = MaxHeight;
+		}
+
+		if (MinHeight > height)
+		{
+			height = MinHeight;
+		}
+
+		if (Math.AbsInt(heightOld - height) > 1)
+		{
+			m_root.SetSize(width, height);
+		}
+		else if (AlignChilds)
+		{
+			m_root.Update();
+		}
+
+		return;
+	}
+
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_root.SetHandler(this);
+		m_root.SetFlags(WidgetFlags.VEXACTPOS);
+		Update();
+	}
+
+	override bool OnChildRemove( Widget  w, Widget  child) {
+		if (w == m_root)
+		{
+			Update();
+		}
+
+		return false;
+	}
+};
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/HorizontalSpacer.c b/scripts/3_Game/DayZ/GUI/Spacers/HorizontalSpacer.c
new file mode 100644
index 0000000000000000000000000000000000000000..893c270346c88a38ea2f6e789d4c16a73540fdaa
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/HorizontalSpacer.c
@@ -0,0 +1,27 @@
+// -----------------------------------------------------------
+class HorizontalSpacer : SpacerBase
+{
+	reference int Border;
+	reference int Gap;
+	
+	override protected void UpdateChild(Widget child, float w, float h, int index)
+	{
+		float itemWidth = (w - (Border * 2) - ((m_count - 1) * Gap)) / m_count;
+		float itemHeight = h - (2 * Border);
+	
+		child.SetPos(Border + ((itemWidth + Gap) * index), Border);
+		child.SetSize(itemWidth, itemHeight);
+		
+		if(child.GetChildren())
+		{
+			Widget c = child.GetChildren();
+			RightGap gap;
+			c.GetScript(gap);
+			if(gap)
+			gap.OnUpdate(c);
+
+			//gap.Update();
+			
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/HorizontalSpacerWithFixedAspect.c b/scripts/3_Game/DayZ/GUI/Spacers/HorizontalSpacerWithFixedAspect.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a99434ab069cb9ff43d44474d4955f02c6b95ef
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/HorizontalSpacerWithFixedAspect.c
@@ -0,0 +1,46 @@
+// -----------------------------------------------------------
+class HorizontalSpacerWithFixedAspect: ScriptedWidgetEventHandler
+{
+	protected Widget m_root;
+	reference int border;
+	reference int gap;
+	reference float coef;
+	float itemWidth;
+	float itemHeight;
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_root.SetHandler(this);
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnUpdate(Widget w)
+	{
+		if (w == m_root) UpdateLayout();
+		return false;
+	}
+	
+	protected void UpdateLayout()
+	{
+		Widget child = m_root.GetChildren();
+		
+			int index = 0;
+			while (child)
+			{
+				if( index == 0 )
+				{
+					child.GetScreenSize(itemWidth, itemHeight);
+				}
+				else
+				{
+					child.SetFlags( WidgetFlags.EXACTPOS, false);
+					child.SetPos(itemWidth+(itemWidth*coef), 0);
+				}
+				
+				index++;
+				child = child.GetSibling();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/ItemsCounter.c b/scripts/3_Game/DayZ/GUI/Spacers/ItemsCounter.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f62d926a13850ff3870d71559f3b4ec2a3f4e95
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/ItemsCounter.c
@@ -0,0 +1,16 @@
+// -----------------------------------------------------------
+class ItemsCounter : ScriptedWidgetEventHandler
+{
+	bool NumberOfItems;
+	
+	void OnWidgetScriptInit(Widget w)
+	{
+    Widget child = w.GetChildren();
+  
+    while (child)
+    {
+        child = child.GetSibling();
+        NumberOfItems++;
+    }
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/NoticeSpacer.c b/scripts/3_Game/DayZ/GUI/Spacers/NoticeSpacer.c
new file mode 100644
index 0000000000000000000000000000000000000000..d38e0eee56395d91eb37ae9e0fc748b55d9a17f7
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/NoticeSpacer.c
@@ -0,0 +1,10 @@
+// -----------------------------------------------------------
+class NoticeSpacer : AutoHeightSpacer
+{
+	override bool OnEvent(EventType eventType, Widget target, int parameter0, int parameter1)
+	{
+		Update();
+		
+		return super.OnEvent(eventType, target, parameter0, parameter1);
+	}
+};
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/RightGap.c b/scripts/3_Game/DayZ/GUI/Spacers/RightGap.c
new file mode 100644
index 0000000000000000000000000000000000000000..aa4734ddf8e60a0a1d3af793876096696b46cd5c
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/RightGap.c
@@ -0,0 +1,27 @@
+// -----------------------------------------------------------
+class RightGap : ScriptedWidgetEventHandler
+{
+	reference int gap;
+	bool kola;
+	/*void OnWidgetScriptInit(Widget w)
+	{
+		float width;
+		float height;
+		w.SetFlags( WidgetFlags.EXACTSIZE, false );
+		w.GetScreenSize( width, height );
+		Print(w.GetName());
+		Print(width);
+		Print(height);
+		w.SetSize( width-gap, height );
+		w.Update();
+	}*/
+	override bool OnUpdate( Widget  w)
+	{
+		float width;
+		float height;
+		w.SetFlags( WidgetFlags.EXACTSIZE, false );
+		w.GetParent().GetScreenSize( width, height );
+		w.SetSize( width-gap, height );
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/SpacerBase.c b/scripts/3_Game/DayZ/GUI/Spacers/SpacerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..398d69e3edcda0edd787e0b6bfc85ec121a1d467
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/SpacerBase.c
@@ -0,0 +1,83 @@
+// -----------------------------------------------------------
+class SpacerBase : ScriptedWidgetEventHandler
+{
+	protected Widget m_root;
+	protected int m_count;
+
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_root = w;
+		m_count = 0;
+	
+		Widget child = m_root.GetChildren();
+		while (child)
+		{
+			m_count++;
+			child.SetFlags(WidgetFlags.EXACTPOS | WidgetFlags.EXACTSIZE, false);
+			child = child.GetSibling();
+		}
+	
+		m_root.SetHandler(this);
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnUpdate(Widget w)
+	{
+		if (w == m_root) UpdateLayout();
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnChildAdd( Widget  w, Widget  child)
+	{
+		m_count++;
+		child.SetFlags(WidgetFlags.EXACTPOS | WidgetFlags.EXACTSIZE, false);
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnChildRemove( Widget  w, Widget  child)
+	{
+		m_count--;
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	protected int GetChildIndex(Widget w)
+	{
+		Widget child = m_root.GetChildren();
+	
+		int index = 0;
+		while (child)
+		{
+			if (child == w) return index;
+	
+			index++;
+			child = child.GetSibling();
+		}
+	
+		return INDEX_NOT_FOUND;
+	}
+	
+	// -----------------------------------------------------------
+	void UpdateLayout()
+	{
+		if (m_count == 0) return;
+	
+		float width;
+		float height;
+		m_root.GetScreenSize(width, height);
+	
+		Widget child = m_root.GetChildren();
+		
+		int index = 0;
+		while (child)
+		{
+			UpdateChild(child, width, height, index);
+			index++;
+			child = child.GetSibling();
+		}
+	}
+	protected void UpdateChild(Widget child, float w, float h, int index) {}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Spacers/VerticalSpacer.c b/scripts/3_Game/DayZ/GUI/Spacers/VerticalSpacer.c
new file mode 100644
index 0000000000000000000000000000000000000000..17837a697f24f8063119661c31761073aed75a0e
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Spacers/VerticalSpacer.c
@@ -0,0 +1,15 @@
+// -----------------------------------------------------------
+class VerticalSpacer : SpacerBase
+{
+	reference int border;
+	reference int gap;
+
+	override protected void UpdateChild(Widget child, float w, float h, int index)
+	{
+		float itemWidth = w - (2 * border);
+		float itemHeight = (h - (border * 2) - ((m_count - 1) * gap)) / m_count;
+	
+		child.SetPos(border, border + ((itemHeight + gap) * index));
+		child.SetSize(itemWidth, itemHeight);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/Tabber.c b/scripts/3_Game/DayZ/GUI/Tabber.c
new file mode 100644
index 0000000000000000000000000000000000000000..6fe7a1bc25cb4b5c8135bd04c86cd5ad587e2758
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/Tabber.c
@@ -0,0 +1,55 @@
+// -----------------------------------------------------------
+class Tabber : ScriptedWidgetEventHandler
+{
+	Widget ButtonsPanel;
+	Widget ContentPanel;
+	reference int SelectedTab;
+	
+	// -----------------------------------------------------------
+	void OnWidgetScriptInit(Widget w)
+	{
+		w.SetHandler(this);
+		SelectTab(SelectedTab);
+	}
+	
+	// -----------------------------------------------------------
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w && w.GetParent() == ButtonsPanel)
+		{
+			SelectedTab = 0;
+			Widget iw = ButtonsPanel.GetChildren();
+			while(iw)
+			{
+				if (iw == w) break;
+				SelectedTab++;
+				iw = iw.GetSibling();
+			}
+	
+			SelectTab(SelectedTab);
+		}
+		
+		return false;
+	}
+	
+	// -----------------------------------------------------------
+	protected void SelectTab(int index)
+	{
+		Print(index);
+		int n = 0;
+		Widget w = ContentPanel.GetChildren();
+		while(w)
+		{
+			if (n == index)
+			{
+				w.Show(true);
+			}
+			else
+			{
+				w.Show(false);
+			}
+			n++;
+			w = w.GetSibling();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/GUI/WidgetLayoutName.c b/scripts/3_Game/DayZ/GUI/WidgetLayoutName.c
new file mode 100644
index 0000000000000000000000000000000000000000..2da8777ae72a77660fd30004dec791c6e9c4c544
--- /dev/null
+++ b/scripts/3_Game/DayZ/GUI/WidgetLayoutName.c
@@ -0,0 +1,51 @@
+class WidgetLayoutName
+{
+	#ifdef PLATFORM_CONSOLE
+	const string InventoryXbox					= "gui/layouts/inventory_new/xbox/day_z_inventory_new.layout";
+	#else
+	const string InventoryNarrow				= "gui/layouts/inventory_new/narrow/day_z_inventory_new.layout";
+	const string InventoryMedium				= "gui/layouts/inventory_new/medium/day_z_inventory_new.layout";
+	const string InventoryWide					= "gui/layouts/inventory_new/wide/day_z_inventory_new.layout";
+	#endif
+	
+	const string HandsPreview					= "gui/layouts/inventory_new/hands_preview.layout";
+	
+	const string InventorySlotsContainerNarrow	= "gui/layouts/inventory_new/narrow/inventory_slots_container.layout";
+	const string InventorySlotsContainerMedium	= "gui/layouts/inventory_new/medium/inventory_slots_container.layout";
+	const string InventorySlotsContainerWide	= "gui/layouts/inventory_new/wide/inventory_slots_container.layout";
+	const string InventorySlotsContainerXbox	= "gui/layouts/inventory_new/xbox/inventory_slots_container.layout";
+	
+	const string CargoContainerNarrow			= "gui/layouts/inventory_new/narrow/cargo_container.layout";
+	const string CargoContainerMedium			= "gui/layouts/inventory_new/medium/cargo_container.layout";
+	const string CargoContainerWide				= "gui/layouts/inventory_new/wide/cargo_container.layout";
+	const string CargoContainerXbox				= "gui/layouts/inventory_new/xbox/cargo_container.layout";
+	
+	const string CargoContainerRowNarrow		= "gui/layouts/inventory_new/narrow/cargo_container_row.layout";
+	const string CargoContainerRowMedium		= "gui/layouts/inventory_new/medium/cargo_container_row.layout";
+	const string CargoContainerRowWide			= "gui/layouts/inventory_new/wide/cargo_container_row.layout";
+	const string CargoContainerRowXbox			= "gui/layouts/inventory_new/xbox/cargo_container_row.layout";
+	
+	const string IconNarrow						= "gui/layouts/inventory_new/narrow/icon.layout";
+	const string IconMedium						= "gui/layouts/inventory_new/medium/icon.layout";
+	const string IconWide						= "gui/layouts/inventory_new/wide/icon.layout";
+	const string IconXbox						= "gui/layouts/inventory_new/xbox/icon.layout";
+	
+	const string LeftAreaNarrow					= "gui/layouts/inventory_new/narrow/left_area.layout";
+	const string LeftAreaMedium					= "gui/layouts/inventory_new/medium/left_area.layout";
+	const string LeftAreaWide					= "gui/layouts/inventory_new/wide/left_area.layout";
+	const string LeftAreaXbox					= "gui/layouts/inventory_new/xbox/left_area.layout";
+	
+	const string RightAreaNarrow				= "gui/layouts/inventory_new/narrow/right_area.layout";
+	const string RightAreaMedium				= "gui/layouts/inventory_new/medium/right_area.layout";
+	const string RightAreaWide					= "gui/layouts/inventory_new/wide/right_area.layout";
+	const string RightAreaXbox					= "gui/layouts/inventory_new/xbox/right_area.layout";
+	
+	const string CollapsibleHeader				= "gui/layouts/inventory_new/collapsible_header.layout";
+	const string ClosableHeader					= "gui/layouts/inventory_new/closable_header.layout";
+	const string HandsHeader					= "gui/layouts/inventory_new/hands_header.layout";
+	const string HandsArea						= "gui/layouts/inventory_new/hands_area.layout";
+	const string Container						= "gui/layouts/inventory_new/container.layout";
+	const string CollapsibleContainer			= "gui/layouts/inventory_new/collapsible_container.layout";
+	const string ClosableContainer				= "gui/layouts/inventory_new/closable_container.layout";
+	const string AttachmentsGroupContainer		= "gui/layouts/inventory_new/attachments_group_container.layout";
+};
diff --git a/scripts/3_Game/DayZ/GameplayEffectWidgets_base.c b/scripts/3_Game/DayZ/GameplayEffectWidgets_base.c
new file mode 100644
index 0000000000000000000000000000000000000000..22b8df80122c3240c4a084dd73f3f9c404027c99
--- /dev/null
+++ b/scripts/3_Game/DayZ/GameplayEffectWidgets_base.c
@@ -0,0 +1,23 @@
+class GameplayEffectWidgets_base extends Managed
+{
+	int m_MaskWidgetUpdateCount;//number of times the widget was updated through a single voice event
+
+	void IncreaseMaskUpdateCount(){m_MaskWidgetUpdateCount++};
+	void ResetMaskUpdateCount(){m_MaskWidgetUpdateCount = 0};
+	
+	bool IsAnyEffectRunning(){}
+	bool AreEffectsSuspended(){}
+	void AddActiveEffects(array<int> effects){}
+	void RemoveActiveEffects(array<int> effects){}
+	void StopAllEffects(){}
+	void AddSuspendRequest(int request_id){}
+	void RemoveSuspendRequest(int request_id){}
+	void ClearSuspendRequests(){}
+	int GetSuspendRequestCount(){}
+	void UpdateWidgets(int type = -1, float timeSlice = 0, Param p = null, int handle = -1){}
+	void Update(float timeSlice){}
+	void OnVoiceEvent(float breathing_resistance01){}
+	void SetBreathIntensityStamina(float stamina_cap, float stamina_current){}
+	
+	void RegisterGameplayEffectData(int id, Param p){}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/AmmoTypes.c b/scripts/3_Game/DayZ/Global/AmmoTypes.c
new file mode 100644
index 0000000000000000000000000000000000000000..dadf5f50e50b038243c76e79f268e0686be1695c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/AmmoTypes.c
@@ -0,0 +1,30 @@
+class AmmoTypesAPI
+{
+	private void AmmoTypesAPI() {}
+	private void ~AmmoTypesAPI() {}
+	
+	//! Check if ammoType exists (registered in cfgAmmoTypes)
+	static proto bool Exists(string ammoType);
+	//! Get the default ammoType of a magazine
+	static proto bool GetAmmoType(string magazineType, out string ammoType);
+	
+	//! Helper method
+	static bool MagazineTypeToAmmoType(string magazineType, out string ammoType)
+	{
+		if ( !AmmoTypesAPI.Exists(magazineType) )
+		{
+			if ( !AmmoTypesAPI.GetAmmoType(magazineType, ammoType) )
+			{
+				ErrorEx(string.Format("%1 is not a magazineType or ammoType or has no default 'ammo' set up in config.", magazineType));
+				return false;
+			}
+			return true;
+		}
+		else
+		{
+			// This is already an ammoType
+			ammoType = magazineType;
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/DayZPhysics.c b/scripts/3_Game/DayZ/Global/DayZPhysics.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8333ada1ef57bf94d382e2f89ac4023ae88898f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/DayZPhysics.c
@@ -0,0 +1,230 @@
+enum PhxInteractionLayers
+{
+	NOCOLLISION,
+
+	DEFAULT,
+	BUILDING,
+	CHARACTER,
+	VEHICLE,
+	DYNAMICITEM,
+	DYNAMICITEM_NOCHAR,
+	ROADWAY,
+	VEHICLE_NOTERRAIN,
+	CHARACTER_NO_GRAVITY,
+	RAGDOLL_NO_CHARACTER,
+
+	//! Redefinition of 'RAGDOLL_NO_CHARACTER'
+	FIREGEOM,
+
+	DOOR,
+	RAGDOLL,
+
+	WATERLAYER,
+	TERRAIN,
+
+	GHOST,
+	WORLDBOUNDS,
+	FENCE,
+
+	AI,
+	AI_NO_COLLISION,
+	AI_COMPLEX,
+
+	TINYCAPSULE,
+	TRIGGER,
+	TRIGGER_NOTERRAIN,
+
+	ITEM_SMALL,
+	ITEM_LARGE,
+
+	CAMERA,
+	
+	TEMP
+};
+
+
+/*!
+	Input parameters for RaycastRVProxy function.
+*/
+class RaycastRVParams
+{
+	vector begPos; //!< begin position of raycast (e.g. player position)
+	vector endPos; //!< end position of raycast (e.g. player direction)
+
+	Object ignore; //!< ignore this object in collision, used only if groundOnly is false
+	Object with;   //!< ignore object with this object, otherwise collision hits, used only if groundOnly is false
+
+	float radius; //!< radius along the ray tested
+
+	/*!
+		Sets the raycast behaviour in terms of result.
+		\see CollisionFlags
+	*/
+	CollisionFlags flags;
+
+	/*!
+		type of intersection, possible values
+		ObjIntersectFire(0),
+		ObjIntersectView(1),
+		ObjIntersectGeom(2),
+		ObjIntersectIFire(3), 
+		ObjIntersectNone(4)
+	*/
+	int type;
+
+	bool sorted;     //!< used only if groundOnly = false
+	bool groundOnly; //!< raycasts only ground (ignores all objects). Default value is false if not needed.
+
+	void RaycastRVParams( vector vBeg, vector vEnd, Object pIgnore = null, float fRadius = 0.0 )
+	{
+		begPos = vBeg;
+		endPos = vEnd;
+		ignore = pIgnore;
+		radius = fRadius;
+
+		// default values
+		with       = null;
+		flags      = CollisionFlags.NEARESTCONTACT;
+		type       = ObjIntersectView;
+		sorted     = false;
+		groundOnly = false;
+	}
+};
+
+
+/*!
+	Contains result data of RaycastRVProxy function.
+*/
+class RaycastRVResult
+{
+	Object obj;    //!< object,that we collide with (NULL if none), If hierLevel > 0 object is the proxy object
+	Object parent; //!< if hierLevel > 0 most parent of the proxy object
+
+	vector pos; //!< position of collision (in world coord)
+	vector dir; //!< direction outside (in world coord) or (in case of line-object collision) direction and size of the intersection
+
+	int hierLevel; //!< which hierarchy level is the collision detected at, == 0 = objects in landscape, > 0 = proxy
+	int component; //!< index of component in corresponding geometry level
+	
+	SurfaceInfo surface; //!< surface material info handle
+
+	bool entry; //!< is false if begining point was TriggerInsider
+	bool exit;  //!< is false if end point was inside
+};
+
+class CollisionOverlapCallback : Managed
+{
+	bool OnContact(IEntity other, Contact contact)
+	{
+		return true;
+	}
+};
+
+class DayZPhysics
+{
+	private void DayZPhysics() {}
+	private void ~DayZPhysics() {}
+	
+	/**
+	\brief Raycasts world by given parameters
+	\param begPos \p vector 	Begin position of raycast (e.g. player position)
+	\param endPos \p vector 	End position of raycast (e.g. player direction)
+	\param contactPos \p vector out, 	world position of first contact
+	\param contactDir \p vector out, 	direction of first contact (available only when object is hitted)
+	\param contactComponent \p int out, object 	component index (available only when object is hitted)
+	\param results \p set<Object> out, 	set of objects hitted by raycast. Can be NULL if not needed
+	\param with \p Object 	Ignores the object from collision. Used only when \p ground_only is false. Can be NULL if not needed
+	\param ignore \p Object Ignores the object from collision. Used only when \p ground_only is false. Can be NULL if not needed 
+	\param sorted \p bool 	Default value is false, used only if \p ground_only = false
+	\param ground_only \bool 	raycasts only ground (ignores all objects). Default value is false if not needed.
+	\param iType \p int, 	type of intersection, possible values ObjIntersectFire(0), ObjIntersectView(1), ObjIntersectGeom(2), ObjIntersectIFire(3), 
+	ObjIntersectNone(4) 
+	\param radius \p float 	Radius of the ray, default value set to 0 
+
+	\returns \p bool return true if raycast hits ground or object
+	@code
+	// raycast test
+	PlayerBase player = g_Game.GetPlayer();
+	
+	if (player)
+	{	
+		vector begPos = player.GetPosition();
+		vector endPos = begPos + (player.GetDirection() * 100);
+		vector contactPos;
+		vector contactDir;
+		int contactComponent; 
+		set<Object> results = new set<Object>;
+		Object with; 
+		Object ignore;  
+		bool sorted; 
+		bool ground_only;  
+		int iType;
+		float radius;
+
+		if ( GetGame().Raycast(begPos, endPos, contactPos, contactDir, contactComponent, results, with, ignore, sorted, ground_only, iType, radius) )
+		{	
+			Print(begPos);
+			Print(endPos);
+			Print(contactPos);
+			Print(contactDir);
+			Print(contactComponent);	
+			Print(results);
+			Print(with);
+			Print(ignore);
+			Print(sorted);
+			Print(ground_only);
+			Print(iType);
+			Print(radius);
+
+			Print( GetGame().Raycast(begPos, endPos, contactPos, contactDir, contactComponent, results, with, ignore, sorted, ground_only, iType, radius) );
+		}
+	}
+
+		>> vector begPos = 0x00000000dd62df30 {<750.573,49.8043,2167.25>}
+		>> vector endPos = 0x00000000dd62df3c {<849.589,49.8043,2181.25>}
+		>> vector contactPos = 0x00000000dd62df48 {<751.068,49.8043,2167.32>}
+		>> vector contactDir = 0x00000000dd62df54 {<0.987203,2.04891e-08,0.139505>}
+		>> int contactComponent = 8
+		>> set<Object> results = set<Object><a022d840>
+		>> Object with = NULL
+		>> Object ignore = NULL
+		>> bool sorted = 0
+		>> bool ground_only = 0
+		>> int iType =   0
+		>> float radius = 0
+	
+		>> 1
+	@endcode
+	*/
+	proto static bool	RaycastRV(vector begPos, vector endPos, out vector contactPos, out vector contactDir, out int contactComponent, /*out*/ set<Object> results = NULL, Object with = NULL, Object ignore = NULL,  bool sorted = false,  bool ground_only = false,  int iType = ObjIntersectView, float radius = 0.0, CollisionFlags flags = CollisionFlags.NEARESTCONTACT);
+	
+	//I am so sorry about this, I am unable to change RaycastRV above without breaking rest of DZ
+	//proto static bool	RaycastRVExt(vector begPos, vector endPos, out vector contactPos, out vector contactDir, out int contactComponent, /*out*/ array<string> resultSurfaces = NULL, /*out*/ array<Object> resultObjects = NULL, Object with = NULL, Object ignore = NULL,  bool sorted = false,  bool ground_only = false,  int iType = ObjIntersectView, float radius = 0.0, CollisionFlags flags = CollisionFlags.NEARESTCONTACT);
+	
+	proto static bool	GetHitSurface(Object other, vector begPos, vector endPos, string surface);
+
+	proto static bool	GetHitSurfaceAndLiquid(Object other, vector begPos, vector endPos, string surface, out int liquidType);
+
+	proto static bool	RaycastRVProxy( notnull RaycastRVParams in, out notnull array< ref RaycastRVResult> results, array< Object > excluded = null );
+
+
+	proto static bool	RayCastBullet(vector begPos, vector endPos, PhxInteractionLayers layerMask, Object ignoreObj, out Object hitObject, out vector hitPosition, out vector hitNormal, out float hitFraction);
+
+	proto static bool	SphereCastBullet(vector begPos, vector endPos, float radius, PhxInteractionLayers layerMask, Object ignoreObj, out Object hitObject, out vector hitPosition, out vector hitNormal, out float hitFraction);
+
+
+	proto static bool	GeometryOverlapBullet(vector transform[4], dGeom geometry, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+
+	proto static bool	EntityOverlapBullet(vector transform[4], IEntity entity, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+
+	proto static bool	EntityOverlapSingleBullet(vector transform[4], IEntity entity, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+	
+	proto static bool	SphereOverlapBullet(vector position, float radius, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+	
+	proto static bool	CylinderOverlapBullet(vector transform[4], vector extents, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+
+	proto static bool	CapsuleOverlapBullet(vector transform[4], float radius, float height, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+
+	proto static bool	BoxOverlapBullet(vector transform[4], vector extents, PhxInteractionLayers layerMask, notnull CollisionOverlapCallback callback);
+
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/BIOSErrorModule.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/BIOSErrorModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..3068fa6934be981d74bbaa86bfdae69d36013c99
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/BIOSErrorModule.c
@@ -0,0 +1,118 @@
+/**
+  \brief Possible Error codes for bios API.
+	* This is the list of errors that can be returned from bios API.
+	* Errors after UNKNOWN are extended errors that are not present in the native API.	
+*/
+enum EBiosError
+{
+	//! 0 - No error. Can be returned from any call.
+	OK,
+	//! 1 - The operation was cancelled. See individual calls for details.
+	CANCEL
+	//! 2 - Atleast one of the input parameters is incorrect
+	BAD_PARAMETER,
+	//! 3 - The call could not find some data. See individual calls for details.
+	NOT_FOUND,
+	//! 4 - The call is not supported for the current platform. Can be returned from any call.
+	NOT_IMPLEMENTED,
+	//! 5 - [XB] The action cannot be performed because the user does not own the content.
+	PURCHASE_REQUIRED,
+	//! 6 - The action is not allowed. (restricted, not enough permission)
+	NOT_ALLOWED,
+	//! 7 - [XB] The user is banned from some action.
+	BANNED,
+	//! 8 - API usage error. For example, usage of objects whos native lifetime ended. Can be returned from any call.
+	LOGICAL,
+	
+	//! 9 - Response was of unexpected format
+	WRONG_RESPONSE_DATA,		
+	
+	//! 10 - Server is no longer registered
+	SERVER_HEARTBEAT_SERVER_NOT_FOUND,
+	//! 11 - Server was already registered
+	SERVER_REGISTER_ALREADY_EXISTS,		
+	
+	//! 12 - Failed to open the request
+	REQUEST_CREATE_FAIL_XHR,
+	//! 13 - Failed to send the data
+	REQUEST_SEND_FAIL,
+	//! 14 - Failed to wait for the operation to end - only in a synchronous call
+	REQUEST_WAIT_FAIL,
+	
+	//! 15 - Response was expected to be in JSON format, but it was not
+	NON_JSON_RESPONSE,
+	
+	// RESERVED SPACE OF REDUNDANT ERRORS
+
+	//! 21 - [PS] Mandatory update exist and is required.	
+	UPDATE_REQUIRED,
+	//! 22 - [PS] Mandatory update exist and is ready to install.
+	UPDATE_REQUIRED_AND_DOWNLOADED,
+	
+	//! 23 - Resource is unreachable or unavailable, can be 404 or no internet connection (etc.)
+	COMUNICATION_ERROR,
+
+	//! 24 - Any other error. Can be returned from any call.
+	UNKNOWN,
+	
+	//! 25 - Extended error. Script not properly linked with engine. May be removed in future.
+	BAD_SCRIPT,
+};
+
+class BIOSErrorModule : ErrorHandlerModuleScript
+{
+	void BIOSErrorModule()
+	{
+		SetCategory(ErrorCategory.BIOSError);
+	}
+	
+	override void InitOptionalVariables()
+	{
+		super.InitOptionalVariables();
+		
+		m_Header = "#STR_BIOS_BIOSError";
+	}
+	
+	override void FillErrorDataMap()
+	{
+		super.FillErrorDataMap();
+		
+		InsertErrorProperties(EBiosError.OK); // Not an error, so no message
+		InsertBIOSError(EBiosError.CANCEL								, "#STR_BIOS_OperationCancelled");
+		InsertBIOSError(EBiosError.BAD_PARAMETER						, "#STR_BIOS_BadParameter");
+		InsertBIOSError(EBiosError.NOT_FOUND							, "#STR_BIOS_NotFound");
+		InsertBIOSError(EBiosError.NOT_IMPLEMENTED						, "#STR_BIOS_NotImplemented");
+		InsertBIOSError(EBiosError.PURCHASE_REQUIRED					, "#STR_BIOS_PurchaseRequired");
+		InsertBIOSError(EBiosError.NOT_ALLOWED							, "#STR_BIOS_ActionRestricted");
+		InsertBIOSError(EBiosError.BANNED								, "#STR_auth_publisher_ban");
+		InsertBIOSError(EBiosError.LOGICAL								, "#STR_BIOS_APILogicError");
+		
+		InsertBIOSError(EBiosError.WRONG_RESPONSE_DATA					, "#STR_BIOS_UnexpectedFormat");
+
+		InsertBIOSError(EBiosError.SERVER_HEARTBEAT_SERVER_NOT_FOUND	, "#STR_BIOS_ServerNotRegistered");
+		InsertBIOSError(EBiosError.SERVER_REGISTER_ALREADY_EXISTS		, "#STR_BIOS_ServerAlreadyRegistered");
+
+		InsertBIOSError(EBiosError.REQUEST_CREATE_FAIL_XHR				, "#STR_BIOS_FailedToOpenRequest");
+		InsertBIOSError(EBiosError.REQUEST_SEND_FAIL					, "#STR_BIOS_FailedToSendData");
+		InsertBIOSError(EBiosError.REQUEST_WAIT_FAIL					, "#STR_BIOS_FailedToWaitOperationEnd");
+
+		InsertBIOSError(EBiosError.NON_JSON_RESPONSE					, "#STR_BIOS_UnexpectedFormat");
+
+		InsertBIOSError(EBiosError.UPDATE_REQUIRED						, "#STR_BIOS_UpdateRequired");
+		InsertBIOSError(EBiosError.UPDATE_REQUIRED_AND_DOWNLOADED		, "#STR_BIOS_UpdateRequiredAndDownloaded");
+
+		InsertBIOSError(EBiosError.COMUNICATION_ERROR					, "#STR_BIOS_CommunicationError");
+
+		InsertBIOSError(EBiosError.UNKNOWN								, "#server_browser_error_unknown");
+		InsertBIOSError(EBiosError.BAD_SCRIPT							, "#STR_BIOS_LinkageError");
+	}
+	
+	void InsertBIOSError(int code, string message)
+	{
+		#ifdef PLATFORM_CONSOLE
+		InsertDialogueErrorProperties(code, message);
+		#else
+		InsertErrorProperties(code, message);
+		#endif
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ClientKickedModule.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ClientKickedModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a183ecdb6d4dcfae64280ac0b8b93336487ec3a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ClientKickedModule.c
@@ -0,0 +1,351 @@
+enum EClientKicked
+{
+	UNKNOWN = -1,		// -1 must always be UNKNOWN
+	OK = 0,				// 0 must always be OK
+	
+	SERVER_EXIT,		// Server last ditch effort to try and disconnect players
+	KICK_ALL_ADMIN,		// Admin kicked all (RCON)
+	KICK_ALL_SERVER,	// Server kicked all
+	
+	TIMEOUT,			// Players network timed out
+	LOGOUT,				// Player logged out (does not need a message as it is not an "error")
+	KICK,				// Generic kick	
+	BAN,				// Player was banned
+	PING,				// Player went over ping limit
+	MODIFIED_DATA,		// Player has modified data or has a corrupted install
+	UNSTABLE_NETWORK,	// Player internet is too unstable
+	SERVER_SHUTDOWN,	// Server is shutting down and therefore kicks all players	
+	
+	NOT_WHITELISTED,	// Player is not whitelisted
+	NO_IDENTITY,		// No identity received while creating identity
+	INVALID_UID,		// UID was incorrect while creating identity
+	BANK_COUNT,			// Amount of banks was changed
+	ADMIN_KICK,			// Kicked by admin
+	INVALID_ID,			// Player has an invalid ID
+	
+	INPUT_HACK,			// Player is sending more Inputs than possible
+	
+	QUIT,				// Player closed the game
+	LEAVE,				// Player pressed the Leave button
+	
+	// LoginMachine kicks (0x0030)
+	LOGIN_MACHINE_ERROR = 48,	// Generic LoginMachine error (fallback)
+	PLAYER_STATE_TIMEOUT,		// Player spent too much time in one state of the LoginMachine
+	IDENTITY_NOT_CREATED,		// Player was assigned but identity was not yet created
+	DUPLICATE_UID,				// Player tried to log in while not being logged out yet
+	DB_PING_RESPONSE,			// Unknown/unexpected database response
+	DB_IDENTITY,				// Identity not found
+	DB_TIMEOUT,					// Database connection timed out
+	DB_BAD_VERSION,				// Unsupported version of character data
+	DB_ERROR,					// Database error
+	DB_APP_ERROR,				// Something went wrong on server
+	DB_APP_EXIT,				// Application is exiting
+	DB_BAD_DATA,				// Character data check failed
+	DB_GET_RESPONSE,			// Unknown/unexpected database response
+	NO_PLAYER,					// Player was not created on server
+	CREATE_NEW_CLIENT,			// Creating of the client with a new character failed
+	CREATE_LOADED_CHAR,			// Creating the existing character failed
+	LOAD_LOADED_CHAR,			// Loading the existing character failed
+	NO_NETWORK_INFO,			// Network info for player not found
+	CREATE_READY_CLIENT,		// Creating of the client with loaded character failed
+	RECONNECT_INFO,				// No info for reconnecting character
+	RECONNECT_IDENTITY,			// No identity for reconnecting character
+	RECONNECT_CHAR,				// No character for reconnecting character
+	
+	// RespawnMachine Kicks (0x0050)
+	INIT_RESPAWN_IDENTITY = 80,	// No identity when initializing respawn
+	RESPAWN_IDENTITY,			// No identity when respawning
+	NEW_RESPAWN_NETWORK,		// No network info when respawning
+	NEW_RESPAWN_IDENTITY,		// No identity when respawning
+	NEW_RESPAWN_INFO,			// No info when respawning
+	RESPAWN_NEW_CLIENT,			// Creating of client with new respawned character failed
+	
+	// PlayerVerification Kicks (0x0060)
+	PLAYER_VERIFICATION = 96,	// Generic PlayerVerification error (fallback)
+	NO_INFO,					// No player info
+	BROKEN_DATA,				// Data could not be verified because it is corrupt
+
+	// VerificationError (0x0070)
+	VERIFICATION_ERROR = 112,	// Generic Verification error (fallback)
+	VE_UNKNOWN,					// Unknown/unexpected error
+	VE_DECOMPRESS,				// Data received by Server is corrupted
+	VE_MISSING_MOD,				// Client is missing a mod which is on Server
+	VE_EXTRA_MOD,				// Client has a mod which is not on Server
+	VE_CLIENT_CORRUPT,			// Client installation is corrupt
+	VE_SERVER_CORRUPT,			// Server installation is corrupt
+	VE_UNEXPECTED_MOD_PBO,		// Client has a PBO which is not part of Server
+	VE_UM_ROGUE_PBO,			// Client has a PBO which is not part of Server
+	VE_UM_CLIENT_UPDATED,		// Extra PBO most likely because Client has a newer version of mod
+	VE_UM_SERVER_UPDATED,		// Extra PBO most likely because Server has a newer version of mod
+	VE_UNEXPECTED_SOURCE,		// The source of the Extra PBO could not be determined
+	VE_PATCHED_PBO,				// Client has a patched PBO
+	VE_INTEGRITY,				// Client has a corrupted file
+	VE_MISSING_BISIGN,			// Client has a PBO which is missing a .bisign
+	VE_MISSING_PBO,				// Missing PBO
+	VE_M_ROGUE_PBO,				// Missing PBO from unknown origins
+	VE_M_CLIENT_UPDATED,		// Missing PBO most likely because Client has a newer version of mod
+	VE_M_SERVER_UPDATED,		// Missing PBO most likely because Server has a newer version of mod
+	VE_M_SERVER_CORRUPT,		// Server installation is corrupt
+	VE_M_CLIENT_CORRUPT,		// Client installation is corrupt
+	VE_M_UNEXPECTED_SOURCE,		// The source of the Missing PBO could not be determined
+	VE_GPROJ,					// The Client and Server .gproj are not equal
+	
+	// PBO Mismatch (0x0090)
+	PBO_MISMATCH = 144,			// Server and Client are using different PBO
+	PBO_VERSION_MISMATCH,		// Server and Client are using different PBO versions
+	PBO_CLIENT_UPDATED,			// Client has a more recent version
+	PBO_SERVER_UPDATED,			// Server has a more recent version
+	
+	// AuthError Kicks (0x00A0)
+	AUTH_ERROR = 160,						// Generic Auth error (fallback)
+	AUTH_NO_USER,							// The user was not found
+	
+	// Steam Validate (0x00B0)
+	AUTH_INVALID_STEAM_VALIDATE = 176,		// Unknown error (API update needed?)
+	AUTH_NO_SERVER,							// Server not initialized properly
+	AUTH_INVALID_TICKET,					// Ticket is not valid.
+	AUTH_DUPLICATE_REQUEST,					// A ticket has already been submitted for this steamID
+	AUTH_INVALID_VERSION,					// Ticket is from an incompatible interface version
+	AUTH_GAME_MISMATCH,						// Ticket is not for this game
+	AUTH_EXPIRED_TICKET,					// Ticket has expired
+	
+	// Steam OnValidate (0x00C0)
+	AUTH_INVALID_STEAM_ONVALIDATE = 192,	// Unknown error (API update needed?)
+	AUTH_USER_NOT_CONNECTED,				// The user in question is not connected to steam
+	AUTH_LICENCE,							// The license has expired.
+	AUTH_SERVICE_BAN,						// The user is VAC banned for this game.
+	AUTH_LOGGED_IN_ELSEWHERE,				// The user account has logged in elsewhere.
+	AUTH_TIMEOUT,							// VAC has been unable to perform anti-cheat checks on this user
+	AUTH_CANCELED,							// The ticket has been canceled by the issuer
+	AUTH_ALREADY_USED,						// This ticket has already been used, it is not valid.
+	AUTH_TICKET_INVALID,					// This ticket is not from a user instance currently connected to steam.
+	AUTH_PUBLISHER_BAN,						// The user is banned for this game.
+	
+	// Bios Validate (0x00D0)
+	AUTH_INVALID_BIOS_VALIDATE = 208,		// Unknown error (API update needed?)
+	AUTH_BIOS_REQUEST_CREATE,				// Failed to create the request to identify user.
+	AUTH_BIOS_REQUEST_SEND,					// Failed to send request
+	AUTH_BIOS_REQUEST_WAIT,					// Failed to receive response
+	AUTH_UNKNOWN_BIOS_VALIDATE,				// Unknown error
+	
+	// Bios OnValidate (0x00E0)
+	AUTH_INVALID_BIOS_ONVALIDATE = 224,		// Unknown error (API update needed?)
+	AUTH_BIOS_WRONG_RESPONSE,				// Response has unexpected format
+	AUTH_UNKNOWN_BIOS_ONVALIDATE,			// Unknown error
+
+	// BattlEye Kicks (0x00F0)
+	BATTLEYE = 240,				// Kick administred by BattlEye (Can also be Admin Kick)
+	
+	// Unauthorized Network Message (0x0100)
+	UNM1 = 256,
+	UNM2,
+	UNM3,
+	UNM4,
+	UNM5,
+	UNM6,
+};
+
+#ifdef PLATFORM_WINDOWS
+const string AUTH_PREFIX = "#STR_MP_STEAM_AUTH_FAILED\n";
+#else
+#ifdef PLATFORM_XBOX
+const string AUTH_PREFIX = "#STR_xbox_authentification_fail\n";
+#else
+#ifdef PLATFORM_PS4
+const string AUTH_PREFIX = "#STR_ps4_authentification_fail\n";
+#else
+const string AUTH_PREFIX = "#STR_authentification_fail\n";
+#endif
+#endif
+#endif
+
+const string LOGIN_PREFIX = "#STR_LOGIN_PREFIX"+"\n";
+const string RESPAWN_PREFIX = "#STR_RESPAWN_PREFIX"+"\n";
+const string VE_PREFIX = "#STR_VE_PREFIX"+"\n";
+
+const string VERIFY = "\n"+"#STR_VERIFY";
+const string MODS = "\n"+"#STR_MODS0"+"\n"+"#STR_MODS1"+"\n";
+
+const string SERVER_MUST_UPDATE = "\n"+"#STR_S_UPDATE";
+const string CLIENT_MUST_UPDATE = "\n"+"#STR_C_UPDATE" + VERIFY;
+
+const string UNM_MESSAGE = "#STR_UNM_MESSAGE";
+
+class ClientKickedModule : ErrorHandlerModuleScript
+{
+	void ClientKickedModule()
+	{
+		SetCategory(ErrorCategory.ClientKicked);
+	}
+	
+	override void InitOptionalVariables()
+	{
+		super.InitOptionalVariables();
+		
+		m_Header = "#menu_warning";
+		m_Prefix = "#STR_MP_KICKED_CLIENT\n";
+	}
+	
+	override void FillErrorDataMap()
+	{
+		super.FillErrorDataMap();
+		
+		InsertDialogueErrorProperties(EClientKicked.SERVER_EXIT,						"#STR_server_shutdown");
+		InsertDialogueErrorProperties(EClientKicked.KICK_ALL_ADMIN,						"#STR_kickAll_admin");
+		InsertDialogueErrorProperties(EClientKicked.KICK_ALL_SERVER,					"#STR_kickAll_server");
+		
+		InsertDialogueErrorProperties(EClientKicked.TIMEOUT,							"#STR_MP_TIMEOUT_CLIENT");
+		InsertErrorProperties(EClientKicked.LOGOUT); // No handling, just register it exists
+		InsertDialogueErrorProperties(EClientKicked.KICK,								"");
+		InsertDialogueErrorProperties(EClientKicked.BAN,								"#STR_MP_BANNED_CLIENT");
+		InsertDialogueErrorProperties(EClientKicked.PING,								"#STR_MP_MAX_PING");
+		InsertSplitDialogueErrorProperties(EClientKicked.MODIFIED_DATA,					"#STR_modified_data" + VERIFY, "#STR_modified_data");
+		InsertSplitDialogueErrorProperties(EClientKicked.UNSTABLE_NETWORK,				"#STR_unstable_network_client", "#STR_unstable_network_server");
+		InsertDialogueErrorProperties(EClientKicked.SERVER_SHUTDOWN,					"#STR_server_shutdown");
+
+		InsertDialogueErrorProperties(EClientKicked.NOT_WHITELISTED,					"#multi_server_not_whitelisted_message");
+		InsertDialogueErrorProperties(EClientKicked.NO_IDENTITY,						"#STR_no_identity");
+		InsertDialogueErrorProperties(EClientKicked.INVALID_UID,						"#STR_invalid_UID");
+		InsertSplitDialogueErrorProperties(EClientKicked.BANK_COUNT,					"#STR_bank_count" + VERIFY, "#STR_bank_count");
+		InsertDialogueErrorProperties(EClientKicked.ADMIN_KICK,							"#STR_admin_kick");
+		InsertDialogueErrorProperties(EClientKicked.INVALID_ID,							"#STR_invalid_ID");
+		
+		InsertDialogueErrorProperties(EClientKicked.INPUT_HACK,							"#STR_INPUT_HACK");
+		
+		InsertErrorProperties(EClientKicked.QUIT); // No handling, just register it exists
+		InsertErrorProperties(EClientKicked.LEAVE); // No handling, just register it exists
+
+		// LoginMachine kicks			
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.LOGIN_MACHINE_ERROR,				"#server_browser_error_unknown", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.PLAYER_STATE_TIMEOUT,				"#STR_player_state_timeout", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.IDENTITY_NOT_CREATED,				"#STR_identity_not_created", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DUPLICATE_UID,					"#STR_duplicate_UID", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_PING_RESPONSE,					"#STR_db_ping_response", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_IDENTITY,						"#STR_db_identity", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_TIMEOUT,						"#STR_db_timeout", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_BAD_VERSION,					"#STR_db_bad_version", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_ERROR,							"#STR_db_error", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_APP_ERROR,						"#STR_app_error", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_APP_EXIT,						"#STR_app_exit", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_BAD_DATA,						"#menu_character_check_fail", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.DB_GET_RESPONSE,					"#STR_db_get_response", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.NO_PLAYER,						"#STR_no_player", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.CREATE_NEW_CLIENT,				"#STR_create_new_client", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.CREATE_LOADED_CHAR,				"#STR_create_loaded_char", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.LOAD_LOADED_CHAR,					"#STR_load_loaded_char", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.NO_NETWORK_INFO,					"#STR_no_network_info", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.CREATE_READY_CLIENT,				"#STR_create_ready_client", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.RECONNECT_INFO,					"#STR_reconnect_info", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.RECONNECT_IDENTITY,				"#STR_reconnect_identity", LOGIN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.RECONNECT_CHAR,					"#STR_reconnect_char", LOGIN_PREFIX);
+
+		// RespawnMachine Kicks			
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.INIT_RESPAWN_IDENTITY,			"#STR_init_respawn_identity", RESPAWN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.RESPAWN_IDENTITY,					"#STR_respawn_identity", RESPAWN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.NEW_RESPAWN_NETWORK,				"#STR_new_respawn_network", RESPAWN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.NEW_RESPAWN_IDENTITY,				"#STR_new_respawn_identity", RESPAWN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.NEW_RESPAWN_INFO,					"#STR_new_respawn_info", RESPAWN_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.RESPAWN_NEW_CLIENT,				"#STR_respawn_new_client", RESPAWN_PREFIX);
+
+		// PlayerVerification Kicks
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.PLAYER_VERIFICATION,			"#server_browser_error_unknown", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.NO_INFO,						"#STR_no_info", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.BROKEN_DATA,					"#STR_broken_data", VE_PREFIX);
+
+		// VerificationError
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VERIFICATION_ERROR,			"#server_browser_error_unknown", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_UNKNOWN,					"#server_browser_error_unknown", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_DECOMPRESS,				"#STR_ve_decompress", VE_PREFIX);
+		InsertExtendedPrefixSplitDialogueErrorProperties(EClientKicked.VE_MISSING_MOD,			"#STR_ve_missing_mod" + MODS, VE_PREFIX, "#STR_ve_missing_mod");
+		InsertExtendedPrefixSplitDialogueErrorProperties(EClientKicked.VE_EXTRA_MOD,			"#STR_ve_extra_mod" + MODS, VE_PREFIX, "#STR_ve_extra_mod");
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_CLIENT_CORRUPT,			"#STR_ve_client_corrupt" + VERIFY, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_SERVER_CORRUPT,			"#STR_ve_server_corrupt", VE_PREFIX);
+		InsertExtendedPrefixSplitDialogueErrorProperties(EClientKicked.VE_UNEXPECTED_MOD_PBO,	"#STR_ve_unexpected_mod_pbo0"+"\n"+"#STR_ve_unexpected_mod_pbo1"+"\n"+"#STR_ve_unexpected_mod_pbo2"+"\n"+"#STR_ve_unexpected_mod_pbo3"+"\n", VE_PREFIX, "#STR_ve_unexpected_mod_pbo0");
+		InsertExtendedPrefixSplitDialogueErrorProperties(EClientKicked.VE_UM_ROGUE_PBO,			"#STR_ve_unexpected_mod_pbo0"+"\n"+"#STR_ve_unexpected_mod_pbo1"+"\n"+"#STR_ve_unexpected_mod_pbo2"+"\n"+"#STR_ve_unexpected_mod_pbo3"+"\n", VE_PREFIX, "#STR_ve_unexpected_mod_pbo0");
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_UM_CLIENT_UPDATED,			"#STR_ve_um_client_updated" + SERVER_MUST_UPDATE, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_UM_SERVER_UPDATED,			"#STR_ve_um_server_updated" + CLIENT_MUST_UPDATE, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_UNEXPECTED_SOURCE,			"#STR_ve_unexpected_source", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_PATCHED_PBO,				"#STR_ve_patched_pbo" + VERIFY, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_INTEGRITY,					"#STR_ve_integrity" + VERIFY, VE_PREFIX);
+		InsertExtendedPrefixSplitDialogueErrorProperties(EClientKicked.VE_MISSING_BISIGN,		"#STR_ve_missing_bising" + VERIFY, VE_PREFIX, "#STR_ve_missing_bising");
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_MISSING_PBO,				"#STR_ve_missing_pbo", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_M_ROGUE_PBO,				"#STR_ve_m_rogue_pbo0"+"\n"+"#STR_ve_m_rogue_pbo1", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_M_CLIENT_UPDATED,			"#STR_ve_m_client_updated" + SERVER_MUST_UPDATE, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_M_SERVER_UPDATED,			"#STR_ve_m_server_updated0"+"\n"+"#STR_ve_m_server_updated1" + CLIENT_MUST_UPDATE, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_M_SERVER_CORRUPT,			"#STR_ve_m_server_corrupt0"+"\n"+"#STR_ve_m_server_corrupt1"+"\n", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_M_CLIENT_CORRUPT,			"#STR_ve_m_client_corrupt0"+"\n"+"#STR_ve_m_client_corrupt1" + VERIFY, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_M_UNEXPECTED_SOURCE,		"#STR_ve_m_unexpected_source", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.VE_GPROJ,						VERIFY + " (.gproj)", VE_PREFIX);
+		
+		// PBO Mismatch
+		InsertExtendedPrefixSplitDialogueErrorProperties(EClientKicked.PBO_MISMATCH,			"#STR_pbo_mismatch" + VERIFY, VE_PREFIX, "#STR_pbo_mismatch");
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.PBO_VERSION_MISMATCH,			"#STR_pbo_version_mismatch", VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.PBO_CLIENT_UPDATED,			"#STR_pbo_client_updated" + SERVER_MUST_UPDATE, VE_PREFIX);
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.PBO_SERVER_UPDATED,			"#STR_pbo_server_updated" + CLIENT_MUST_UPDATE, VE_PREFIX);
+		
+		// AuthError Kicks
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_ERROR,					"#server_browser_error_unknown", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_NO_USER,					"#STR_auth_no_user", AUTH_PREFIX);
+
+		// Steam Validate
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_INVALID_STEAM_VALIDATE,	"#server_browser_error_unknown", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_NO_SERVER,				"#STR_auth_no_server", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_INVALID_TICKET,			"#STR_auth_invalid_ticket", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_DUPLICATE_REQUEST,		"#STR_auth_duplicate_request", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_INVALID_VERSION,			"#STR_auth_invalid_version", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_GAME_MISMATCH,			"#STR_auth_game_mismatch", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_EXPIRED_TICKET,			"#STR_auth_expired_ticket", AUTH_PREFIX);
+
+		// Steam OnValidate
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_INVALID_STEAM_ONVALIDATE,"#server_browser_error_unknown", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_USER_NOT_CONNECTED,		"#STR_auth_user_not_connected", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_LICENCE,					"#STR_auth_licence", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_SERVICE_BAN,				"#STR_auth_service_ban", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_LOGGED_IN_ELSEWHERE,		"#STR_auth_logged_in_elsewhere", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_TIMEOUT,					"#STR_auth_timeout", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_CANCELED,				"#STR_auth_cancelled", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_ALREADY_USED,			"#STR_auth_already_used", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_TICKET_INVALID,			"#STR_auth_ticket_invalid", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_PUBLISHER_BAN,			"#STR_auth_publisher_ban", AUTH_PREFIX);
+
+		// Bios Validate
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_INVALID_BIOS_VALIDATE,	"#server_browser_error_unknown", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_BIOS_REQUEST_CREATE,		"#STR_auth_bios_request_create", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_BIOS_REQUEST_SEND,		"#STR_auth_bios_request_send", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_BIOS_REQUEST_WAIT,		"#STR_auth_bios_request_wait", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_UNKNOWN_BIOS_VALIDATE,	"#server_browser_error_unknown", AUTH_PREFIX);
+
+		// Bios OnValidate
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_INVALID_BIOS_ONVALIDATE,	"#server_browser_error_unknown", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_BIOS_WRONG_RESPONSE,		"#STR_auth_bios_wrong_response", AUTH_PREFIX);
+		InsertPrefixDialogueErrorProperties(EClientKicked.AUTH_UNKNOWN_BIOS_ONVALIDATE,	"#server_browser_error_unknown", AUTH_PREFIX);
+
+		// BattlEye Kicks
+		InsertExtendedPrefixDialogueErrorProperties(EClientKicked.BATTLEYE,	"", "BattlEye\n");
+		
+		// Unauthorized Network Message
+		InsertDialogueErrorProperties(EClientKicked.UNM1, UNM_MESSAGE);
+		InsertDialogueErrorProperties(EClientKicked.UNM2, UNM_MESSAGE);
+		InsertDialogueErrorProperties(EClientKicked.UNM3, UNM_MESSAGE);
+		InsertDialogueErrorProperties(EClientKicked.UNM4, UNM_MESSAGE);
+		InsertDialogueErrorProperties(EClientKicked.UNM5, UNM_MESSAGE);
+		InsertDialogueErrorProperties(EClientKicked.UNM6, UNM_MESSAGE);
+	}
+}
+
+/*class ClientKickedModuleUI : UIScriptedMenu
+{
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		super.OnModalResult(w, x, y, code, result);
+		
+		int error = ErrorModuleHandler.GetCodeFromError(code);		
+		switch ( error )
+		{
+			default:
+				break;
+		}
+		
+		return true;
+	}
+}*/
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorClientModule.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorClientModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..33f00fce549272009f0c907477ec77dd22d21981
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorClientModule.c
@@ -0,0 +1,89 @@
+enum EConnectErrorClient
+{
+	UNKNOWN = -1,				// -1 must always be UNKNOWN
+	OK = 0,						// 0 must always be OK
+
+	SERVER_UNREACHABLE,			// Could not connect to server because it is not reachable (offline, restarting, ..)
+	ALREADY_CONNECTING,			// Client is already attempting to join a server
+	ERROR_MSG_SHOWED,			// Indicates there is an error on screen that has yet to be confirmed
+	INCORRECT_CLIENT_STATE,		// The client is already connected or is connecting to a server
+	INVALID_SESSION,			// The guid of the session is empty
+
+	VERSION_MISMATCH,			// Mismatch between server and client version
+	VERSION_MISMATCH_RB,		// Client build is lower than "requiredBuild" (server config)
+	VERSION_MISMATCH_AB,		// Client build is higher than "allowedBuild" (server config)
+
+	DLC_CHECK_FAILED,			// Client does not have required DLC
+	EMPTY_PASSWORD,				// Player input an empty password
+	
+	PASSWORD,					// Server is password protected
+	BE_LICENCE,					// Server is using BE and it has not yet been agreed to
+};
+
+class ConnectErrorClientModule : ErrorHandlerModuleScript
+{
+	void ConnectErrorClientModule()
+	{
+		SetCategory(ErrorCategory.ConnectErrorClient);
+	}
+	
+	override void InitOptionalVariables()
+	{
+		super.InitOptionalVariables();
+		
+		m_Header = "#server_browser_connecting_failed";
+	}
+	
+	override void FillErrorDataMap()
+	{
+		super.FillErrorDataMap();
+		
+		InsertDialogueErrorProperties(EConnectErrorClient.SERVER_UNREACHABLE,		"#STR_server_unreachable");
+		InsertDialogueErrorProperties(EConnectErrorClient.ALREADY_CONNECTING,		"#STR_already_connecting");
+		InsertDialogueErrorProperties(EConnectErrorClient.ERROR_MSG_SHOWED,			"#STR_error_msg_showed");
+		InsertDialogueErrorProperties(EConnectErrorClient.INCORRECT_CLIENT_STATE, 	"#STR_incorrect_client_state");
+		InsertDialogueErrorProperties(EConnectErrorClient.INVALID_SESSION,			"#STR_invalid_session");
+		
+		InsertDialogueErrorProperties(EConnectErrorClient.VERSION_MISMATCH,			"#multi_server_not_compatible_message");
+		InsertDialogueErrorProperties(EConnectErrorClient.VERSION_MISMATCH_RB,		"#multi_server_not_compatible_message");
+		InsertDialogueErrorProperties(EConnectErrorClient.VERSION_MISMATCH_AB,		"#multi_server_not_compatible_message");
+		
+		InsertDialogueErrorProperties(EConnectErrorClient.DLC_CHECK_FAILED,			"#mod_detail_info_warning");
+		InsertDialogueErrorProperties(EConnectErrorClient.EMPTY_PASSWORD,			"#STR_empty_password");
+		
+		InsertErrorProperties(EConnectErrorClient.PASSWORD);
+		InsertErrorProperties(EConnectErrorClient.BE_LICENCE);
+	}
+
+#ifndef NO_GUI	
+	override void OnEvent(EventType eventTypeId, Param params)
+	{
+		switch (eventTypeId)
+		{
+			case MPSessionPlayerReadyEventTypeID:
+				g_Game.GetUIManager().CloseSpecificDialog(m_LastErrorThrown);
+				break;
+			
+			default:
+				break;
+		}
+	}
+#endif
+}
+
+/*class ConnectErrorClientModuleUI : UIScriptedMenu
+{	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		super.OnModalResult(w, x, y, code, result);
+		
+		int error = ErrorModuleHandler.GetCodeFromError(code);		
+		switch ( error )
+		{
+			default:
+				break;
+		}
+		
+		return true;
+	}
+}*/
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorScriptModule.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorScriptModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7a366dba424dea45f3c62a3f57d9eddd877c1e4
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorScriptModule.c
@@ -0,0 +1,94 @@
+enum EConnectErrorScript
+{
+	UNKNOWN = -1,				// -1 must always be UNKNOWN
+	OK = 0,						// 0 must always be OK
+	
+	ALREADY_CONNECTING,			// Already joining a server
+	ALREADY_CONNECTING_THIS, 	// Already joining this exact server
+}
+
+class ConnectErrorScriptModule : ErrorHandlerModuleScript
+{
+	void ConnectErrorScriptModule()
+	{
+		SetCategory(ErrorCategory.ConnectErrorScript);		
+	}
+	
+	override void InitOptionalVariables()
+	{
+		super.InitOptionalVariables();
+		
+		m_Header = "#server_browser_connecting_failed";
+#ifndef NO_GUI
+		m_UIHandler = new ConnectErrorScriptModuleUI();
+#endif
+	}
+	
+	override void FillErrorDataMap()
+	{
+		super.FillErrorDataMap();
+		
+		InsertDialogueErrorProperties(EConnectErrorScript.ALREADY_CONNECTING, 		"#STR_script_already_connecting", DBT_YESNOCANCEL, DBB_NO);
+		InsertDialogueErrorProperties(EConnectErrorScript.ALREADY_CONNECTING_THIS, 	"#STR_script_already_connecting_this");
+	}
+	
+	override void OnEvent(EventType eventTypeId, Param params)
+	{
+		switch (eventTypeId)
+		{
+			case MPSessionPlayerReadyEventTypeID:
+#ifndef NO_GUI
+				g_Game.GetUIManager().CloseSpecificDialog(m_LastErrorThrown);
+#endif
+				break;
+			
+			default:
+				break;
+		}
+	}
+}
+
+class ConnectErrorScriptModuleUI : UIScriptedMenu
+{
+	protected static void DisconnectSession(bool loadMpPrivilege)
+	{
+		g_Game.DisconnectSessionForce();
+		g_Game.DisconnectSessionScript();
+		
+		if (loadMpPrivilege)
+		{
+			OnlineServices.LoadMPPrivilege();
+		}
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		super.OnModalResult(w, x, y, code, result);
+		
+		int error = ErrorModuleHandler.GetCodeFromError(code);		
+		switch ( error )
+		{
+			case EConnectErrorScript.ALREADY_CONNECTING:
+			{
+					switch ( result )
+					{
+						case DBB_YES:
+							g_Game.GetCallQueue(CALL_CATEGORY_SYSTEM).Call(DisconnectSession, true);
+							break;
+						case DBB_CANCEL:
+							g_Game.GetCallQueue(CALL_CATEGORY_SYSTEM).Call(DisconnectSession, false);
+							break;
+					
+						default:
+							break;
+					}
+				break;
+			}				
+			
+			default:
+				break;
+		}
+		
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorServerModule.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorServerModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..63fe9552926433adcb75d8e61a5667dda46c262d
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ConnectErrorServerModule.c
@@ -0,0 +1,111 @@
+enum EConnectErrorServer
+{
+	UNKNOWN = -1,			// -1 must always be UNKNOWN
+	OK = 0,					// 0 must always be OK
+
+	WRONG_PASSWORD,			// User entered wrong password
+	WRONG_VERSION,			// Server and client do not have the same build while "forceSameBuild" is true
+	CONNECT_ERROR,			// Unknown error
+	SESSION_FULL,			// Server is full
+	FILE_PATCHING,			// Bad file patching
+
+	ALREADY_CONNECTED,		// Client is already connected
+	HOST_ADDRESS,			// Was unable to resolve host address
+	NET_CHANNEL,			// Client failed to create NetChannel
+	CONNECT,				// Connecting itself has failed
+	REQUEST_PLAYER,			// Failed to request player
+	CREATE_PLAYER,			// Failed to create player
+	TIMEOUT,				// Packages timed out
+	UID,					// Failed to find uid	
+	NET_CHANNEL_SERVER,		// Server failed to create NetChannel	
+	ACTIVATE,				// Failed to activate session
+	SERVER_LOCKED,			// Server is locked by admin
+	SERVER_SHUTDOWN,		// Server is shutting down soon
+	BUILD_SMALLER,			// Client has a build smaller than the Server
+	BUILD_GREATER,			// Client has a build greater than the Server
+	VERSION_SMALLER,		// Client has a version smaller than the Server
+	VERSION_GREATER,		// Client has a version greater than the Server
+	EQUAL_MOD,				// Server and Client do not have equal mods while "equalModRequired" is true
+	CLIENT_DIAG,			// Client is using Diag exe while Server is not
+	SERVER_DIAG,			// Server is using Diag exe while Client is not
+	NO_DEVICE_ID,			// Client has not acquired device id
+};
+
+class ConnectErrorServerModule : ErrorHandlerModuleScript
+{
+	void ConnectErrorServerModule()
+	{
+		SetCategory(ErrorCategory.ConnectErrorServer);
+	}
+	
+	override void InitOptionalVariables()
+	{
+		super.InitOptionalVariables();
+		
+		m_Header = "#server_browser_connecting_failed";
+	}
+	
+	override void FillErrorDataMap()
+	{
+		super.FillErrorDataMap();
+			
+		InsertDialogueErrorProperties(EConnectErrorServer.WRONG_PASSWORD, 		"#server_browser_wrong_password");
+		InsertDialogueErrorProperties(EConnectErrorServer.WRONG_VERSION, 		"#server_browser_wrong_version");
+		InsertDialogueErrorProperties(EConnectErrorServer.CONNECT_ERROR,		"#server_browser_wrong_connect_error");
+		InsertDialogueErrorProperties(EConnectErrorServer.SESSION_FULL,			"#server_browser_session_full");
+		InsertDialogueErrorProperties(EConnectErrorServer.FILE_PATCHING,		"#server_browser_bad_file_patching");
+
+		InsertDialogueErrorProperties(EConnectErrorServer.ALREADY_CONNECTED, 	"#STR_already_connected");
+		InsertDialogueErrorProperties(EConnectErrorServer.HOST_ADDRESS,			"#STR_host_address");
+		InsertDialogueErrorProperties(EConnectErrorServer.NET_CHANNEL,			"#STR_net_channel");
+		InsertDialogueErrorProperties(EConnectErrorServer.CONNECT,				"#STR_connect");
+		InsertDialogueErrorProperties(EConnectErrorServer.REQUEST_PLAYER,		"#STR_request_player");
+		InsertDialogueErrorProperties(EConnectErrorServer.CREATE_PLAYER,		"#STR_create_player");
+		InsertDialogueErrorProperties(EConnectErrorServer.TIMEOUT,				"#STR_timeout");
+		InsertDialogueErrorProperties(EConnectErrorServer.UID,					"#STR_UID");
+		InsertDialogueErrorProperties(EConnectErrorServer.NET_CHANNEL_SERVER, 	"#STR_net_channel_server");
+		InsertDialogueErrorProperties(EConnectErrorServer.ACTIVATE,				"#STR_activate");
+		InsertDialogueErrorProperties(EConnectErrorServer.SERVER_LOCKED,		"#STR_MP_SESSION_LOCKED");
+		InsertDialogueErrorProperties(EConnectErrorServer.SERVER_SHUTDOWN,		"#STR_shutdown_server");
+		InsertDialogueErrorProperties(EConnectErrorServer.BUILD_SMALLER,		"#STR_build_smaller"+"\n"+"#STR_PLEASE_UPDATE");
+		InsertDialogueErrorProperties(EConnectErrorServer.BUILD_GREATER,		"#STR_build_greater"+"\n"+"#STR_PLEASE_WAIT");
+		InsertDialogueErrorProperties(EConnectErrorServer.VERSION_SMALLER,		"#STR_version_smaller"+"\n"+"#STR_PLEASE_UPDATE");
+		InsertDialogueErrorProperties(EConnectErrorServer.VERSION_GREATER,		"#STR_version_greater"+"\n"+"#STR_PLEASE_WAIT");
+		InsertDialogueErrorProperties(EConnectErrorServer.EQUAL_MOD,			"#STR_equal_mod");
+		InsertDialogueErrorProperties(EConnectErrorServer.CLIENT_DIAG,			"#STR_client_diag");
+		InsertDialogueErrorProperties(EConnectErrorServer.SERVER_DIAG,			"#STR_server_diag");
+		InsertDialogueErrorProperties(EConnectErrorServer.NO_DEVICE_ID,			"#STR_no_device_id");
+	}
+	
+	override void OnEvent(EventType eventTypeId, Param params)
+	{
+		switch (eventTypeId)
+		{
+			case MPSessionPlayerReadyEventTypeID:
+#ifndef NO_GUI
+				g_Game.GetUIManager().CloseSpecificDialog(m_LastErrorThrown);
+#endif
+				break;
+			
+			default:
+				break;
+		}
+	}
+}
+
+/*class ConnectErrorServerModuleUI : UIScriptedMenu
+{
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		super.OnModalResult(w, x, y, code, result);
+		
+		int error = ErrorModuleHandler.GetCodeFromError(code);		
+		switch ( error )
+		{
+			default:
+				break;
+		}
+		
+		return true;
+	}
+}*/
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorHandlerModule.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorHandlerModule.c
new file mode 100644
index 0000000000000000000000000000000000000000..65fb78cc89ad43532af725e938a9345acc64b9eb
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorHandlerModule.c
@@ -0,0 +1,273 @@
+//-----------------------------------------------------------------------------
+// Definition
+//-----------------------------------------------------------------------------
+//! Definition and API of an ErrorHandlerModule - Do not insert any logic here! (as this class is not moddable)
+class ErrorHandlerModule
+{
+	//! Returns the category the module handles.
+	proto native ErrorCategory GetCategory();
+	
+	//! Set the category the module handles.
+	proto native void SetCategory(ErrorCategory category);
+	
+	//! Event that gets triggered when an error of the owned category is thrown.
+	protected void OnErrorThrown(int errorCode, owned string additionalInfo = "")
+	{
+		#ifdef DEVELOPER
+		Print(ErrorModuleHandler.GetErrorHex(errorCode));
+		#endif
+	}
+	
+	//! Retrieve the message shown on Client
+	string GetClientMessage(int errorCode, string additionalInfo = "")
+	{
+		return GetSimpleMessage(errorCode, additionalInfo);
+	}
+	
+	//! Retrieve the message shown on Client
+	string GetLastClientMessage(int errorCode)
+	{
+		return GetSimpleMessage(errorCode);
+	}
+	
+	//! Retrieve the message shown on Server
+	string GetServerMessage(int errorCode, string additionalInfo = "")
+	{
+		return GetSimpleMessage(errorCode, additionalInfo);
+	}
+	
+	//! Retrieve the message shown on Server
+	string GetLastServerMessage(int errorCode)
+	{
+		return GetSimpleMessage(errorCode);
+	}
+	
+	//! Simple message of just code and info
+	string GetSimpleMessage(int errorCode, string additionalInfo = "")
+	{
+		return string.Format("[%1]: %2", ErrorModuleHandler.GetErrorHex(errorCode), additionalInfo);
+	}
+	
+	//! Event called by ErrorModuleHandler
+	void OnEvent(EventType eventTypeId, Param params)
+	{
+	}
+}
+
+//-----------------------------------------------------------------------------
+// Script override
+//-----------------------------------------------------------------------------
+/**
+  \brief This is where to input logic and extend functionality of ErrorHandlerModule
+*/
+class ErrorHandlerModuleScript : ErrorHandlerModule
+{
+	protected string m_Header = ""; //!< \p Optional: Header (e.g. The header of a Dialogue box)
+	protected string m_Prefix = ""; //!< \p Optional: Prefix (e.g. Fixed text at the start of the messages in the module)
+	protected ref UIScriptedMenu m_UIHandler = null; //!< \p Optional: The UI the handler might generally use	
+	
+	protected int m_LastErrorThrown = 0; //!< Holds the last thrown error in this module, defaults to 0
+	protected string m_LastAdditionalInfo = ""; //!< Holds the last additional info passed in
+	
+	/**
+		\brief \p Map containing the codes that exist for the ErrorHandlerModule
+		* The code links to ErrorProperties
+		* This contains at the very least the Message for the error
+		* Additionally, it can contain the way to handle the error (e.g. Throw a Dialogue with the message)
+	*/
+	protected ref map<int, ref ErrorProperties> m_ErrorDataMap = new map<int, ref ErrorProperties>();
+	
+	//! Constructor, by default calls the function that will fill the ErrorDataMap
+	void ErrorHandlerModuleScript()
+	{
+		InitOptionalVariables();
+		FillErrorDataMap();
+	}
+	
+	void ~ErrorHandlerModuleScript()
+	{
+		if (m_UIHandler)
+		{
+			delete m_UIHandler;
+		}
+	}
+	
+	//! Function which gets called before FillErrorDataMap, designed to set Optional Variales before ErrorProperties are created
+	void InitOptionalVariables()
+	{
+	}
+	
+	//! Function to fill up m_ErrorDataMap, gets called in the Constructor
+	void FillErrorDataMap()
+	{
+		//! Already insert the default "UNKNOWN ERROR" message for code "-1"
+		InsertDialogueErrorProperties(-1, "#server_browser_error_unknown");
+	}
+	
+	/**
+	\brief Fetches the ErrorProperties for the error code.
+		\param errorCode \p int The full error code
+		\return \p ErrorProperties The data and handling for the error
+	*/
+	ErrorProperties GetProperties(int errorCode)
+	{
+		int error = ErrorModuleHandler.GetCodeFromError(errorCode);
+		ErrorProperties properties = null;
+			
+		if (!m_ErrorDataMap.Find(error, properties))
+		{
+			Error(string.Format("[EHM] Could not find any properties for error %1(%2) in %3", errorCode, ErrorModuleHandler.GetErrorHex(errorCode), this));
+		}
+		
+		return properties;
+	}
+	
+	/**
+	\brief Fetches the Client message for the error code.
+		\param errorCode \p int The full error code
+		\return \p string The Client message for the error
+	*/
+	override string GetClientMessage(int errorCode, string additionalInfo = "")
+	{
+		ErrorProperties properties = GetProperties(errorCode);
+			
+		if ( properties )
+		{
+			return properties.GetClientMessage(additionalInfo);
+		}
+		else
+		{
+			return additionalInfo;
+		}
+	}
+	
+	/**
+	\brief Fetches the Client message for the error code, attempting to retrieve the data from the latest.
+		\param errorCode \p int The full error code to check against
+		\return \p string The Client message for the error
+	*/
+	override string GetLastClientMessage(int errorCode)
+	{
+		if (errorCode == m_LastErrorThrown)
+		{
+			return GetClientMessage(errorCode, m_LastAdditionalInfo);
+		}
+		else
+		{
+			ErrorEx(string.Format("Was unable to get the information on the last error as another has already occurred. (%1 != %2)", ErrorModuleHandler.GetErrorHex(errorCode), ErrorModuleHandler.GetErrorHex(m_LastErrorThrown)));
+			return GetClientMessage(errorCode);
+		}
+	}
+	
+	/**
+	\brief Fetches the Server message for the error code.
+		\param errorCode \p int The full error code
+		\return \p string The Server message for the error
+	*/	
+	override string GetServerMessage(int errorCode, string additionalInfo = "")
+	{
+		ErrorProperties properties = GetProperties(errorCode);
+			
+		if ( properties )
+		{
+			return properties.GetServerMessage(additionalInfo);
+		}
+		else
+		{
+			return additionalInfo;
+		}
+	}
+	
+	/**
+	\brief Fetches the Server message for the error code, attempting to retrieve the data from the latest.
+		\param errorCode \p int The full error code to check against
+		\return \p string The Server message for the error
+	*/
+	override string GetLastServerMessage(int errorCode)
+	{
+		if (errorCode == m_LastErrorThrown)
+		{
+			return GetServerMessage(errorCode, m_LastAdditionalInfo);
+		}
+		else
+		{
+			ErrorEx(string.Format("Was unable to get the information on the last error as another has already occurred. (%1 != %2)", ErrorModuleHandler.GetErrorHex(errorCode), ErrorModuleHandler.GetErrorHex(m_LastErrorThrown)), ErrorExSeverity.WARNING);
+			return GetServerMessage(errorCode);
+		}
+	}
+	
+	/**
+	\brief Event that gets triggered when an error of the owned category is thrown.
+	  * Do not call directly!
+	  * Call ErrorModuleHandler.ThrowError instead
+		\param errorCode \p int The full error code
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+	*/
+	protected override void OnErrorThrown(int errorCode, owned string additionalInfo = "")
+	{
+		super.OnErrorThrown(errorCode, additionalInfo);
+		
+		m_LastErrorThrown = errorCode;
+		m_LastAdditionalInfo = additionalInfo;
+		
+		ErrorProperties properties = GetProperties(errorCode);
+			
+		if ( properties )
+		{
+			properties.HandleError(errorCode, additionalInfo);
+		}
+		else
+		{
+			ErrorEx(string.Format("Error code %1(%2) was thrown but no ErrorProperties was found for it in category %3.", errorCode, ErrorModuleHandler.GetErrorHex(errorCode), GetCategory().ToString()));
+			if (m_ErrorDataMap.Find(-1, properties))
+			{
+				properties.HandleError(errorCode, additionalInfo);
+			}
+		}
+	}
+	
+	//-----------------------------------------------------------------------------
+	// Insert helpers
+	//-----------------------------------------------------------------------------
+	//! Insert an error with Dialogue as handling, using the Optional Variables
+	void InsertDialogueErrorProperties(int code, string message, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_ErrorDataMap.Insert(code, DialogueErrorProperties(string.Format("%1%2", m_Prefix, message), message, m_Header, m_UIHandler, dialogButtonType, defaultButton, dialogMeaningType, displayAdditionalInfo));
+	}
+	
+	//! Insert an error with Dialogue as handling with custom header
+	void InsertHeaderDialogueErrorProperties(int code, string message, string header, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_ErrorDataMap.Insert(code, DialogueErrorProperties(string.Format("%1%2", m_Prefix, message), message, header, m_UIHandler, dialogButtonType, defaultButton, dialogMeaningType, displayAdditionalInfo));
+	}
+	
+	//! Insert an error with Dialogue as handling with custom prefix
+	void InsertPrefixDialogueErrorProperties(int code, string message, string prefix, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_ErrorDataMap.Insert(code, DialogueErrorProperties(string.Format("%1%2", prefix, message), message, m_Header, m_UIHandler, dialogButtonType, defaultButton, dialogMeaningType, displayAdditionalInfo));
+	}
+	
+	//! Insert an error with Dialogue as handling with extended prefix
+	void InsertExtendedPrefixDialogueErrorProperties(int code, string message, string prefix, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_ErrorDataMap.Insert(code, DialogueErrorProperties(string.Format("%1%2%3", m_Prefix, prefix, message), message, m_Header, m_UIHandler, dialogButtonType, defaultButton, dialogMeaningType, displayAdditionalInfo));
+	}
+	
+	//! Insert an error with Dialogue as handling with extended prefix and separate server message
+	void InsertExtendedPrefixSplitDialogueErrorProperties(int code, string message, string prefix, string serverMessage, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_ErrorDataMap.Insert(code, DialogueErrorProperties(string.Format("%1%2%3", m_Prefix, prefix, message), serverMessage, m_Header, m_UIHandler, dialogButtonType, defaultButton, dialogMeaningType, displayAdditionalInfo));
+	}
+	
+	//! Insert an error with Dialogue as handling with separate server message
+	void InsertSplitDialogueErrorProperties(int code, string message, string serverMessage, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_ErrorDataMap.Insert(code, DialogueErrorProperties(string.Format("%1%2", m_Prefix, message), serverMessage, m_Header, m_UIHandler, dialogButtonType, defaultButton, dialogMeaningType, displayAdditionalInfo));
+	}
+
+	//! Insert an error with no handling
+	void InsertErrorProperties(int code, string message = "")
+	{
+		m_ErrorDataMap.Insert(code, ErrorProperties(message, message));
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorModuleHandler.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorModuleHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..02b3ac08ea4b456f8f9bd577abc7b2b667a5a508
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorModuleHandler.c
@@ -0,0 +1,265 @@
+/**
+  \brief ErrorCategory - To decide what ErrorHandlerModule needs to be called and easily identify where it came from
+*/
+enum ErrorCategory
+{
+	Unknown/* = -1*/,
+	//! Generic error group
+	Generic,
+	//! Error group for when something went wrong while trying to connect to the server
+	ConnectErrorClient,
+	//! Error group for when the Client did connect to the Server, but the server rejected the connection
+	ConnectErrorServer,
+	//! Error group for connect errors thrown from Script
+	ConnectErrorScript,
+	//! Error group for when Client is kicked from server
+	ClientKicked,
+	//! Error group for BIOS errors
+	BIOSError,
+};
+
+/**
+  \brief The error handler itself, for managing and distributing errors to modules
+	* Manages the ErrorHandlerModule instances inserted in Init.
+	* API comes with several functions to Create, Throw and extract data from error codes.
+	* The format used is an int which is made up of two shorts, one that holds the category and one that holds the code.
+	* Therefore when looking at an error code, it is much easier to identify when looking at the hex value.
+*/
+class ErrorModuleHandler
+{
+	/**
+	\brief Creates and throws the error code, sending it to the handler of the category.
+		\param category \p ErrorCategory Category the error is thrown from
+		\param code \p int The code that the error belongs to inside the category between [-32768, 32767]
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+		\return \p int The full error code
+		@code
+			int errorCode = ErrorModuleHandler.ThrowError( ErrorCategory.ConnectErrorClient, -1 );
+			Print( errorCode );
+
+			>> errorCode = 196607
+		@endcode
+	*/	
+	static proto int 						ThrowError(ErrorCategory category, int code, string additionalInfo = "");
+	
+	/**
+	\brief Throws the error code and sends it to the handler of the category.
+		\param errorCode \p int The full error code
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+		\return \p int The full error code
+		@code
+			int errorCode = ErrorModuleHandler.ThrowErrorCode( 0x0002FFFF );
+			Print( errorCode );
+
+			>> errorCode = 196607
+		@endcode
+	*/
+	static proto int						ThrowErrorCode(int errorCode, string additionalInfo = "");
+	
+	/**
+	\brief Creates full error code.
+		\param category \p ErrorCategory Category the error is thrown from
+		\param code \p int The code that the error belongs to inside the category between [-32768, 32767]
+		\return \p int The full error code
+		@code
+			int errorCode = ErrorModuleHandler.CreateError( ErrorCategory.ConnectErrorClient, -1 );
+			Print( errorCode );
+
+			>> errorCode = 196607
+		@endcode
+	*/
+	static proto int 						CreateError(ErrorCategory category, int code);
+	
+	/**
+	\brief Returns the category the error was thrown from.
+		\param errorCode \p int The full error code
+		\return \p ErrorCategory The ErrorCategory the error was thrown from
+		@code
+			ErrorCategory category = ErrorModuleHandler.GetCategoryFromError( 0x0002FFFF );
+			Print( category );
+
+			>> category = 2
+		@endcode
+	*/
+	static proto ErrorCategory 				GetCategoryFromError(int errorCode);
+	
+	/**
+	\brief Returns the code of the error.
+		\param errorCode \p int The full error code
+		\return \p int The code of the error
+		@code
+			int code = ErrorModuleHandler.GetCodeFromError( 0x0002FFFF );
+			Print( code );
+
+			>> code = -1
+		@endcode
+	*/
+	static proto int 						GetCodeFromError(int errorCode);
+	
+	/**
+	\brief Returns a formatted string of the error code.
+		\param errorCode \p int The full error code
+		\return \p string A formatted string of the error code
+		@code
+			string formattedCode = ErrorModuleHandler.GetErrorHex( 196607 );
+			Print( formattedCode );
+
+			>> formattedCode = '0x0002FFFF'
+		@endcode
+	*/
+	static proto owned string				GetErrorHex(int errorCode);
+	
+	
+	
+	/**
+	\brief Adds a module handler to the ErrorModuleHandler.
+		\param category \p ErrorCategory Category the module is for
+		\param errorModule \p ErrorHandlerModule The class containing the information and codes for the category.
+		\return \p bool Whether the adding of the module was successful or not
+	*/
+	static proto bool						AddModule(ErrorCategory category, notnull ErrorHandlerModule errorModule);
+	
+	/**
+	\brief Removes a module handler from the ErrorModuleHandler.
+		\param category \p ErrorCategory Category the module is for
+		\return \p bool Whether the removing of the module was successful or not
+	*/
+	static proto bool						RemoveModule(ErrorCategory category);
+	
+	
+	
+	/**
+	\brief Gets the Client Message for specified error
+		\param category \p ErrorCategory Category the error is thrown from
+		\param code \p int The code that the error belongs to inside the category between [-32768, 32767]
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+		\return \p string The message which would appear on Client
+	*/	
+	static proto string						GetClientMessage(ErrorCategory category, int code, string additionalInfo = "");
+	
+	/**
+	\brief Gets the Client Message for specified error
+		\param errorCode \p int The full error code
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+		\return \p string The message which would appear on Client
+	*/
+	static proto string						GetClientMessageByCode(int errorCode, string additionalInfo = "");
+	
+	/**
+	\brief Gets the Client Message for specified error, while attempting to restore information on the most recent error
+		\param category \p ErrorCategory Category the error is thrown from
+		\param code \p int The code that the error belongs to inside the category between [-32768, 32767]
+		\return \p string The message which would appear on Client
+	*/	
+	static proto string						GetLastClientMessage(ErrorCategory category, int code);
+	
+	/**
+	\brief Gets the Client Message for specified error, while attempting to restore information on the most recent error
+		\param errorCode \p int The full error code
+		\return \p string The message which would appear on Client
+	*/
+	static proto string						GetLastClientMessageByCode(int errorCode);
+	
+	/**
+	\brief Gets the Server Message for specified error
+		\param category \p ErrorCategory Category the error is thrown from
+		\param code \p int The code that the error belongs to inside the category between [-32768, 32767]
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+		\return \p string The message which would appear on Server
+	*/	
+	static proto string						GetServerMessage(ErrorCategory category, int code, string additionalInfo = "");
+	
+	/**
+	\brief Gets the Server Message for specified error
+		\param errorCode \p int The full error code
+		\param additionalInfo \p string Any additional info regarding the error, usually data
+		\return \p string The message which would appear on Server
+	*/
+	static proto string						GetServerMessageByCode(int errorCode, string additionalInfo = "");
+	
+	/**
+	\brief Gets the Server Message for specified error, while attempting to restore information on the most recent error
+		\param category \p ErrorCategory Category the error is thrown from
+		\param code \p int The code that the error belongs to inside the category between [-32768, 32767]
+		\return \p string The message which would appear on Server
+	*/	
+	static proto string						GetLastServerMessage(ErrorCategory category, int code);
+	
+	/**
+	\brief Gets the Server Message for specified error, while attempting to restore information on the most recent error
+		\param errorCode \p int The full error code
+		\return \p string The message which would appear on Server
+	*/
+	static proto string						GetLastServerMessageByCode(int errorCode);
+	
+	
+	
+	/**
+	\brief Gets the EMH Instance
+		\return \p ErrorModuleHandler The ErrorModuleHandler Instance
+	*/
+	static proto native ErrorModuleHandler	GetInstance();
+	
+	static proto void						GetErrorModules(notnull out array<ErrorHandlerModule> errorModules);
+	
+	
+	
+	/**
+	\brief Wrapper for AddModule to give feedback whether it succeeded or not.
+		\param errorModule \p ErrorHandlerModule The ErrorHandlerModule to add
+	*/
+	void SafeAddModule(notnull ErrorHandlerModule errorModule)
+	{
+		if ( !AddModule(errorModule.GetCategory(), errorModule) )
+			Error(string.Format("[EMH] Adding %1 failed. (Category: %2)", errorModule, errorModule.GetCategory()));
+	}
+	
+	/**
+	\brief Wrapper for RemoveModule to give feedback whether it succeeded or not.
+		\param errorModule \p ErrorHandlerModule The ErrorHandlerModule to add
+	*/
+	void SafeRemoveModule(notnull ErrorHandlerModule errorModule)
+	{
+		if ( !RemoveModule(errorModule.GetCategory()) )
+			Error(string.Format("[EMH] Removing %1 failed. (Category: %2)", errorModule, errorModule.GetCategory()));
+	}
+	
+	/**
+	\brief Wrapper for RemoveModule to give feedback whether it succeeded or not.
+		\param category \p ErrorCategory Category to remove
+	*/
+	void SafeRemoveModule(ErrorCategory category)
+	{
+		if ( !RemoveModule(category) )
+			Error(string.Format("[EMH] Removing %1 failed.", category));
+	}
+	
+	/**
+	\brief Gets called shortly after creation of ErrorModuleHandler.
+	*/
+	private void Init()
+	{
+		if (!g_Game.IsDedicatedServer())
+		{
+			SafeAddModule(new ConnectErrorClientModule);
+			SafeAddModule(new ConnectErrorServerModule);		
+			SafeAddModule(new ConnectErrorScriptModule);
+		}
+		SafeAddModule(new ClientKickedModule);
+		SafeAddModule(new BIOSErrorModule);
+	}
+	
+	/**
+	\brief is called by DayZGame to pass Events.
+	*/
+	void OnEvent(EventType eventTypeId, Param params)
+	{
+		array<ErrorHandlerModule> errorModules = new array<ErrorHandlerModule>;
+		GetErrorModules(errorModules);
+		
+		foreach (ErrorHandlerModule module : errorModules)
+		{
+			module.OnEvent(eventTypeId, params);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorProperties.c b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorProperties.c
new file mode 100644
index 0000000000000000000000000000000000000000..016fdc4d51e3e51b664d48d2147100a7ad47c8f8
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/ErrorModuleHandler/ErrorProperties.c
@@ -0,0 +1,81 @@
+//! Class which holds the properties and handling of an error
+class ErrorProperties
+{
+	const string EP_HEADER_FORMAT_STRING = "%1 (%2)"; //!< Formating for header (%1 = Header; %2 = ErrorCode)
+	const string EP_MESSAGE_FORMAT_STRING = "%1\n(%2)"; //!< Formating for message (%1 = Message; %2 = AdditionalInfo)
+	
+	protected string m_Message; //!< Message which will appear on Client
+	protected string m_ServerMessage; //!< Message which will appear on Server
+	
+	void ErrorProperties(string message, string serverMessage)
+	{
+		m_Message = message;
+		m_ServerMessage = serverMessage;
+	}
+		
+	void HandleError(int errorCode, string additionalInfo = "") {}
+	
+	string GetClientMessage(string additionalInfo = "")
+	{
+		if ( additionalInfo != "" )
+			return string.Format(EP_MESSAGE_FORMAT_STRING, m_Message, additionalInfo);
+		else
+			return m_Message;
+	}
+	
+	string GetServerMessage(string additionalInfo = "")
+	{
+		if ( additionalInfo != "" )
+			return string.Format(EP_MESSAGE_FORMAT_STRING, m_ServerMessage, additionalInfo);
+		else
+			return m_ServerMessage;
+	}
+}
+
+//! Error which shows a generic Dialogue UI
+class DialogueErrorProperties : ErrorProperties
+{
+	protected string m_Header;
+	protected int m_DialogButtonType;
+	protected int m_DefaultButton;
+	protected int m_DialogMeaningType;
+	protected UIScriptedMenu m_Handler;
+	protected bool m_DisplayAdditionalInfo;
+	
+	void DialogueErrorProperties(string message, string serverMessage, string header, UIScriptedMenu handler = null, int dialogButtonType = DBT_OK, int defaultButton = DBB_OK, int dialogMeaningType = DMT_EXCLAMATION, bool displayAdditionalInfo = true)
+	{
+		m_Header = header;
+		m_DialogButtonType = dialogButtonType;
+		m_DefaultButton = defaultButton;
+		m_DialogMeaningType = dialogMeaningType;
+		m_Handler = handler;
+		m_DisplayAdditionalInfo = displayAdditionalInfo;
+	}
+	
+	override void HandleError(int errorCode, string additionalInfo = "")
+	{
+#ifdef NO_GUI
+		return; //do not display error if GUI is disabled
+#endif 
+		
+#ifdef SERVER
+		return;
+#else
+		string message;
+		if (m_DisplayAdditionalInfo && additionalInfo != "")
+			message = string.Format(EP_MESSAGE_FORMAT_STRING, m_Message, additionalInfo);
+		else
+			message = m_Message;
+		
+		GetGame().GetUIManager().ShowDialog(
+			string.Format(EP_HEADER_FORMAT_STRING, m_Header, ErrorModuleHandler.GetErrorHex(errorCode)),
+			message, errorCode, m_DialogButtonType, m_DefaultButton, m_DialogMeaningType, m_Handler);
+#endif
+	}
+	
+	string GetHeader() { return m_Message; }
+	int GetDialogButtonType() { return m_DialogButtonType; }
+	int GetDefaultButton() { return m_DefaultButton; }
+	int GetDialogMeaningType() { return m_DialogMeaningType; }
+	UIScriptedMenu GetHandler() { return m_Handler; }
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/Game.c b/scripts/3_Game/DayZ/Global/Game.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ced867fa23ed81c6b7b406542a21de771ebb7fe
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/Game.c
@@ -0,0 +1,1423 @@
+/**
+ *  Game Class provide most "world" or global engine API functions.
+ */
+
+static int GAME_STORAGE_VERSION = 135;
+
+class CGame
+{
+	// enableDebugMonitor in server config
+	int m_DebugMonitorEnabled;
+
+	ScriptModule GameScript;
+
+	private ref array<ref Param> m_ParamCache;
+	
+	//analytics	
+	ref AnalyticsManagerServer 	m_AnalyticsManagerServer;
+	ref AnalyticsManagerClient 	m_AnalyticsManagerClient;	
+	ref MenuDefaultCharacterData 		m_CharacterData;
+	
+	#ifdef DIAG_DEVELOPER
+	ref array<ComponentEnergyManager> m_EnergyManagerArray;
+	void EnableEMPlugs(bool enable)
+	{
+		for (int i = 0; i < GetGame().m_EnergyManagerArray.Count(); ++i)
+		{
+			if (GetGame().m_EnergyManagerArray[i])
+				GetGame().m_EnergyManagerArray[i].SetDebugPlugs(enable);
+		}
+	}
+	#endif
+	
+	void CGame()
+	{
+		Math.Randomize(-1);
+		
+		LogManager.Init();
+		m_ParamCache = new array<ref Param>;
+		m_ParamCache.Insert(null);
+		
+		//analytics
+		m_AnalyticsManagerServer = new AnalyticsManagerServer;
+		m_AnalyticsManagerClient = new AnalyticsManagerClient;
+		
+		//m_CharacterData = new MenuCharacrerData;
+		
+		// actual script version - increase by one when you make changes
+		StorageVersion(GAME_STORAGE_VERSION);
+		
+		#ifdef DIAG_DEVELOPER
+		m_EnergyManagerArray = new array<ComponentEnergyManager>;
+		#endif
+		
+		if (!IsDedicatedServer())
+		{
+			SEffectManager.Init();
+			AmmoEffects.Init();
+			VONManager.Init();
+		}
+	}
+	
+	private void ~CGame()
+	{
+		// Clean these up even if it is dedicated server, just to be safe
+		SEffectManager.Cleanup();	
+		AmmoEffects.Cleanup();
+		VONManager.CleanupInstance();
+		
+		// Is initialized in StartupEvent
+		ParticleManager.CleanupInstance();
+	}
+	
+	proto native WorkspaceWidget GetWorkspace();
+	proto native WorkspaceWidget GetLoadingWorkspace();
+	
+	//! 
+	/**
+  \brief Called when some system event occur.
+  @param eventTypeId event type.
+	@param params Param object, cast to specific param class to get parameters for particular event.
+	*/
+	void OnEvent(EventType eventTypeId, Param params)
+	{
+	}
+
+	//PLM Type: 0 == RESUMED, 1 == SUSPENDED
+	void OnProcessLifetimeChanged(int plmtype)
+	{
+
+	}
+
+	void OnLicenseChanged()
+	{
+
+	}
+	
+	/**
+	\brief Called after creating of CGame instance
+	*/
+	void OnAfterCreate()
+	{
+	}
+
+	/**
+	\brief Called when recieving focus (windows)
+	*/
+	void OnActivateMessage()
+	{
+	}
+
+	/**
+	\brief Called when loosing focus (windows)
+	*/
+	void OnDeactivateMessage()
+	{
+	}
+
+	/**
+	\brief Called once before game update loop starts, ret value indicates if init was done in scripts, otherwise it is done in the engine
+	*/
+	bool OnInitialize()
+	{
+		return false;
+	}
+	
+	/**
+	\brief Called when inputs is not possible (Steam overlay active or something), all internal script variables should be reset here!
+	*/
+	void OnDeviceReset()
+	{
+	}
+	
+	/**
+  \brief Called on World update
+  @param doSim False when simulation is paused, True otherwise
+	@param timeslice time elapsed from last call
+	*/
+	void OnUpdate(bool doSim, float timeslice) 
+	{
+	}
+	
+	/**
+  \brief Called on World update after simulation of entities
+  @param doSim False when simulation is paused, True otherwise
+	@param timeslice time elapsed from last call
+	*/
+	void OnPostUpdate(bool doSim, float timeslice) 
+	{
+	}
+
+	/**
+  \brief Called when key is pressed
+  @param key direct input key code (DIK)
+	*/
+	void OnKeyPress(int key)
+	{
+	}
+
+	/**
+  \brief Called when key is released
+  @param key direct input key code (DIK)
+	*/
+	void OnKeyRelease(int key)
+	{
+	}
+
+	/**
+  \brief Called when mouse button is pressed
+  @param button - number of button \ref Mouse
+	*/
+	void OnMouseButtonPress(int button)
+	{
+	}
+	
+	/**
+  \brief Called when mouse button is released
+  @param button - number of button \ref Mouse
+	*/
+	void OnMouseButtonRelease(int button)
+	{
+	}
+	
+	/**
+  \brief create custom main menu part (submenu)
+	*/
+	UIScriptedMenu			CreateScriptedMenu( int id ) { }
+
+	/**
+  \brief create custom window part
+	*/
+	UIScriptedWindow			CreateScriptedWindow( int id ) { }	
+	
+	/**
+  \brief Called after remote procedure call is recieved for this object
+		@param target object on which remote procedure is called, when NULL, RPC is evaluated by CGame as global
+		@param rpc_type user defined identification of RPC
+		@param ctx read context for params
+	*/
+	void	OnRPC(PlayerIdentity sender, Object target, int rpc_type, ParamsReadContext ctx)
+	{
+	}
+
+	/**
+  \brief Sets exit code and quits in the right moment
+	*/
+	proto native void		RequestExit( int code );
+
+	/**
+  \brief Sets exit code and restart in the right moment
+	*/
+	proto native void		RequestRestart(int code);
+
+	/**
+  \brief Returns if the application is focused on PC, returns true always on console
+	*/
+	proto native bool		IsAppActive();
+
+	/**
+  \brief Gets the server address. (from client)
+	*/
+	proto bool				GetHostAddress( out string address, out int port );
+	
+	/**
+  \brief Gets the server name. (from client)
+	*/
+	proto owned string		GetHostName();
+	
+	/**
+  \brief Gets the server data. (from client)
+	*/
+	proto GetServersResultRow GetHostData();
+	
+	/**
+  \brief Connects to IsServer
+	@param IpAddress of the server
+	@param port of the server set to 0 for default port
+	@param password of the server
+	\return 0 on success, error code from ErrorModuleHandler on not success
+	*/
+	proto native int				Connect( UIScriptedMenu parent , string IpAddress, int port, string password );	
+	/**
+  \brief Connects to last success network session
+	\return 0 on success, error code from ErrorModuleHandler on not success
+	*/
+	proto native int				ConnectLastSession( UIScriptedMenu parent , int selectedCharacter = -1 );
+	/**
+  \brief Disconnects from current multiplayer session
+	*/
+	proto native void				DisconnectSession();
+	
+	/**
+  \brief Forces disconnect from current multiplayer session even if not yet in the game
+	*/
+	proto native void 				DisconnectSessionForce();
+
+	// profile functions
+	/**
+  \brief Gets array of strings from profile variable
+	@param name of the variable
+	@param values output values
+	\n usage:
+	@code
+	TStringArray lastInventoryArray = new TStringArray;
+	GetGame().GetProfileStringList("lastInventory", lastInventoryArray);
+	@endcode
+	*/
+	proto native void		GetProfileStringList(string name, out TStringArray values);
+
+	/**
+  \brief Gets string from profile variable
+	@param name of the variable
+	@param value output value
+	\return true when successful
+	*/
+	proto bool					GetProfileString(string name, out string value);
+
+	/**
+  \brief Sets array of strings to profile variable
+	@param name of the variable
+	@param values to set
+	*/
+	proto native void		SetProfileStringList(string name, TStringArray values);
+
+	/**
+  \brief Sets string to profile variable
+	@param name of the variable
+	@param value to set
+	*/
+	proto native void		SetProfileString(string name, string value);
+
+	/**
+  \brief Saves profile on disk.
+	*/
+	proto native void		SaveProfile();
+
+	/**
+  \brief Gets current player name
+	@param name output value
+	*/
+	proto void					GetPlayerName(out string name);
+	
+	/**
+   \brief Gets current player name. If length of player name is grater than maxLength, then it is omitted and append ellipsis
+	@param maxLength - max chars in name
+	@param name - output value of player name with 'maxLength' characters and then ellipsis "..."
+	*/
+	proto void					GetPlayerNameShort(int maxLength, out string name);
+	
+	/**
+  \brief Sets current player name
+	@param name
+	*/
+	proto native void		SetPlayerName(string name);
+	
+	/**
+  	\brief Assign player entity to client (in multiplayer)
+	\note Works only on server
+	@param name
+	*/	
+	proto native Entity	CreatePlayer(PlayerIdentity identity, string name, vector pos, float radius, string spec);
+	
+	/**
+  	\brief Selects player's controlled object
+		@param identity identity used in MP (use NULL in singleplayer)
+		@param player object which should be controlled by player
+		\note We can use only instances of DayZPlayer now
+	*/	
+	proto native void		SelectPlayer(PlayerIdentity identity, Object player);
+	
+	/**
+  	\brief returns player's network id from identity id in out parameters
+		@param identity PlayerIdentity.id used in MP (use NULL in singleplayer)
+		@param networkIdLowBits lower bits of 64bit network id
+		@param networkIdHighBits higher bits of 64bit network id
+		\note Usable only on server
+	*/	
+	proto void 				GetPlayerNetworkIDByIdentityID( int playerIdentityID, out int networkIdLowBits, out int networkIdHightBits );
+
+	/**
+  	\brief Returns entity identified by network id
+		@param networkIdLowBits identity used in MP (use NULL in singleplayer)
+		@param networkIdHighBits object which should be controlled by player
+	*/	
+	proto native Object 	GetObjectByNetworkId( int networkIdLowBits, int networkIdHighBits );
+
+	/**
+	\brief Static objects cannot be replicated by default (there are too many objects on the map). Use this method when you want to replicate some scripted variables. Cannot be called in object's constructor, because networking is not initialized yet
+		@param object static object to replicate
+		@return false, if registration wasn't successful or when object is already registered
+	*/
+	proto native bool		RegisterNetworkStaticObject(Object object);
+	
+	/**
+  	\brief Creates spectator object (mostly cameras)
+		@param identity identity used in MP (use NULL in singleplayer)
+		@param spectatorObjType classname for spectator object (like cameras)
+		@param position where to create spectator instance
+	*/	
+	proto native void		SelectSpectator(PlayerIdentity identity, string spectatorObjType, vector position);
+
+	/**
+  	\brief Updates spectator position on server = position of network bubble
+		@param position 
+	*/	
+	proto native void		UpdateSpectatorPosition(vector position);
+	
+	/**
+  	\brief Inform client about logout time (creates logout screen on specified client)
+	\note Works only on server
+	@param player object which is logging out
+	@param time length of logout
+	*/
+	proto native void		SendLogoutTime(Object player, int time);
+	
+	/**
+  	\brief Destroy player info and disconnect 
+	\note Works only on server
+	*/
+	proto native void		DisconnectPlayer(PlayerIdentity identity, string uid = "");
+	
+	/**
+  	\brief Add player to reconnect cache to be able to rejoin character still existing in the world
+	\note Works only on server and no database requests are sent
+	@param identity of player
+	*/
+	proto native void		AddToReconnectCache(PlayerIdentity identity);
+	
+	/**
+  	\brief Remove player from reconnect cache
+	\note Works only on server
+	@param uid of the player
+	*/
+	proto native void		RemoveFromReconnectCache(string uid);
+	
+	/**
+  	\brief Remove all player from reconnect cache
+	\note Works only on server
+	*/
+	proto native void		ClearReconnectCache();
+
+
+	/**
+  	\brief Set actual storage version - for next save
+	*/
+	proto native void StorageVersion( int iVersion );
+
+	/**
+  	\brief Returns actual storage version - loading
+	*/
+	proto native int		LoadVersion();
+
+	/**
+  	\brief Returns actual storage version - saving
+	*/
+	proto native int		SaveVersion();
+
+	/**
+  	\brief Returns current daytime on server
+	*/
+	proto native float		GetDayTime();
+	
+	// config functions
+	/**
+	\brief Get string value from config on path.
+		@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+		@param value output
+		\return true on success
+	*/
+	proto bool					ConfigGetText(string path, out string value);
+	
+	/**
+	\brief Get raw string value from config on path.
+		@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+		@param value output in raw format (localization keys '$STR_' are not translated)
+		\return true on success
+		\note use 'FormatRawConfigStringKeys' method to change localization keys to script-friendly
+	*/
+	proto bool					ConfigGetTextRaw(string path, out string value);
+	
+	/**
+	\brief Get string value from config on path.
+		@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+		\return value output string
+	*/
+	string ConfigGetTextOut(string path)
+	{
+		string ret_s;
+		ConfigGetText(path, ret_s);
+		return ret_s;
+	}
+	
+	/**
+	\brief Changes localization key format to script-friendly format.
+		@param original config string.
+		\return value output string with '$' substituted to script-friendly '#'. If not found, does nothing.
+	*/
+	bool FormatRawConfigStringKeys(inout string value)
+	{
+		int ret;
+		ret = value.Replace("$STR_","#STR_");
+		return ret > 0;
+	}
+	
+	/**
+	\brief Get name of the p3d file of the given class name.
+		@param class name of the desired object
+		\return Name of the object's p3d file (without the '.p3d' suffix)
+	*/
+	string GetModelName(string class_name)
+	{
+		if ( class_name != "" )
+		{
+			string cfg = "CfgVehicles " + class_name + " model";
+			string model_path;
+			if ( GetGame().ConfigGetText(cfg, model_path) )
+			{
+				int to_substring_end = model_path.Length() - 4; // -4 to leave out the '.p3d' suffix
+				int to_substring_start = 0;
+				
+				// Currently we have model path. To get the name out of it we need to parse this string from the end and stop at the first found '\' sign
+				for (int i = to_substring_end; i > 0; i--)
+				{
+					string sign = model_path.Get(i);
+					if ( sign == "\\" )
+					{
+						to_substring_start = i + 1;
+						break
+					}
+				}
+				
+				string model_name = model_path.Substring(to_substring_start, to_substring_end - to_substring_start);
+				return model_name;
+			}
+		}
+		
+		return "UNKNOWN_P3D_FILE";
+	}
+	
+	/**
+  \brief Get float value from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	\return value
+	*/
+	proto native float	ConfigGetFloat(string path);
+	
+
+	/**
+  \brief Get vector value from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	\return value
+	*/
+	proto native vector ConfigGetVector(string path);
+
+	/**
+  \brief Get int value from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	\return value
+	*/
+	proto native int		ConfigGetInt(string path);
+
+	/**
+  \brief Returns type of config value
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	\return one of constants CT_INT, CT_FLOAT, CT_STRING, CT_ARRAY, CT_CLASS, CT_OTHER
+	*/
+	proto native int		ConfigGetType(string path);
+
+	/**
+  \brief Get array of strings from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param value output
+	\n usage :
+	@code
+	TStringArray characterAnimations = new TStringArray;
+	GetGame().ConfigGetTextArray("CfgMovesMaleSdr2 States menu_idleUnarmed0 variantsPlayer", characterAnimations);
+	@endcode
+	*/
+	proto native void		ConfigGetTextArray(string path, out TStringArray values);
+
+	/**
+  \brief Get array of raw strings from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param value output in raw format (localization keys '$STR_' are not translated)
+	\n usage :
+	@code
+	TStringArray characterAnimations = new TStringArray;
+	GetGame().ConfigGetTextArrayRaw("CfgMovesMaleSdr2 States menu_idleUnarmed0 variantsPlayer", characterAnimations);
+	@endcode
+	\note use 'FormatRawConfigStringKeys' method to change localization keys to script-friendly
+	*/
+	proto native void		ConfigGetTextArrayRaw(string path, out TStringArray values);
+	
+	/**
+  \brief Get array of floats from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param value output
+	*/
+	proto native void		ConfigGetFloatArray(string path, out TFloatArray values);
+	
+	/**
+  \brief Get array of integers from config on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param value output
+	*/
+	proto native void		ConfigGetIntArray(string path, out TIntArray values);
+
+	/**
+  \brief Get name of subclass in config class on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param index of subclass in class
+	@param name output
+	\return true on success, false if path or child is not found
+	*/
+	proto bool					ConfigGetChildName(string path, int index, out string name);
+
+	/**
+  \brief Get name of base class of config class on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param name output
+	\return true on success, false if path or base is not exists
+	*/
+	proto bool					ConfigGetBaseName(string path, out string base_name);
+
+	/**
+  \brief Get count of subclasses in config class on path.
+	@param path of value, classes are delimited by empty space. You can specify config file by using "configFile" or "missionConfigFile" as a first class name.
+	@param index of parameter in class
+	@param name output
+	\return true on success, false if path or child is not found
+	*/
+	proto native int		ConfigGetChildrenCount(string path);
+	proto native bool		ConfigIsExisting(string path);
+
+	proto native void		ConfigGetFullPath(string path, out TStringArray full_path);
+	proto native void		ConfigGetObjectFullPath(Object obj, out TStringArray full_path);
+	
+	proto native void		GetModInfos(notnull out array<ref ModInfo> modArray);
+	proto native bool		GetModToBeReported();
+
+/**
+\brief Converts array of strings into single string.
+	\param Array of strings like {"All", "AllVehicles", "Land"}
+	\return Converts given array into something lile "All AllVehicles Land".
+	@code
+		???
+	@endcode
+*/
+	string					ConfigPathToString(TStringArray array_path)
+	{
+		string return_path = "";
+		int count = array_path.Count();
+		
+		for (int i = 0; i < count; i++)
+		{
+			return_path += array_path.Get(i);
+			
+			if ( i < count - 1 )
+			{
+				return_path += " ";
+			}
+		}
+		
+		return return_path;
+	}
+
+	/**
+  \brief Get command line parameter value.
+	@param name of parameter
+	@param value output
+	\return true when parameter exists, false otherwise
+	\n usage :
+	@code
+	// you run e.g.: DayZInt.exe -scriptDebug=true
+	string value;
+	if (GetGame().CommandlineGetParam("scriptDebug", value) && value == "true")
+	{
+		Print("Script debugging on!");
+	}
+	@endcode
+	*/
+	proto bool					CommandlineGetParam(string name, out string value);
+	
+	proto native void CopyToClipboard(string text);
+	proto void				CopyFromClipboard(out string text);
+
+	proto native void 	BeginOptionsVideo();
+	proto native void 	EndOptionsVideo();
+	
+	proto native void	AdminLog(string text);
+	
+	// entity functions
+	/**
+	\brief Preload objects with certain type in certain distance from camera.
+	@param type of objects which should be preloaded
+	@param distance from camera in which objects should be preloaded
+	\return true on success
+	*/
+	proto native bool		PreloadObject( string type, float distance );
+
+	proto native Object		CreateStaticObjectUsingP3D(string p3dFilename, vector position, vector orientation, float scale = 1.0, bool createLocal = false);
+	
+	/**
+	\brief Creates object of certain type
+	@param type of objects to create
+	@param pos position where to create object
+	@param create_local if True, object is not spawned on clients only on server
+
+	@param init_ai if creating object is LightAI class, by this param is initialised AI or not
+	\return new Object
+	*/
+	proto native Object CreateObject( string type, vector pos, bool create_local = false, bool init_ai = false, bool create_physics = true );
+	proto native SoundOnVehicle CreateSoundOnObject(Object source, string sound_name, float distance, bool looped, bool create_local = false);
+	proto native SoundWaveOnVehicle CreateSoundWaveOnObject(Object source, SoundObject soundObject, AbstractWave soundWave);
+
+	/**
+	\brief Creates object of certain type
+	@param type of objects to create
+	@param pos position where to create object
+	@param iFlags are used to setup object and/ or spawn behavior
+	@param iRotation are used to setup object rotation on spawn (or default if not specified)
+	\return new Object
+	*/
+	proto native Object CreateObjectEx( string type, vector pos, int iFlags, int iRotation = RF_DEFAULT );
+	
+	proto native void   ObjectDelete( Object obj );
+	proto native void   ObjectDeleteOnClient( Object obj );
+    proto native void   RemoteObjectDelete( Object obj ); /// RemoteObjectDelete - deletes only remote object (unregisters from network). do not use if not sure what you do
+	proto native void   RemoteObjectTreeDelete( Object obj ); /// RemoteObjectDelete - deletes only remote object tree (unregisters from network). do not use if not sure what you do
+    proto native void   RemoteObjectCreate( Object obj ); /// RemoteObjectCreate - postponed registration of network object (and creation of remote object). do not use if not sure what you do
+	proto native void   RemoteObjectTreeCreate( Object obj ); /// RemoteObjectTreeCreate - postponed registration of network object tree (and creation of remote objects). do not use if not sure what you do
+	proto native int    ObjectRelease( Object obj );
+	proto void          ObjectGetType( Object obj, out string type );
+	proto void          ObjectGetDisplayName( Object obj, out string name );
+	proto native vector ObjectGetSelectionPosition(Object obj, string name);
+	proto native vector ObjectGetSelectionPositionLS(Object obj, string name);
+	proto native vector ObjectGetSelectionPositionMS(Object obj, string name);
+	proto native vector ObjectGetSelectionPositionWS(Object obj, string name);
+	proto native vector ObjectModelToWorld(Object obj, vector modelPos);
+	proto native vector ObjectWorldToModel(Object obj, vector worldPos);
+	//! returns true if player can access item's cargo/attachments (check only distance)
+	proto native bool		IsObjectAccesible(EntityAI item, Man player);
+
+	// input
+	proto native Input	GetInput();
+
+	// camera	
+	proto native vector	GetCurrentCameraPosition();	
+	proto native vector	GetCurrentCameraDirection();
+
+	// sound
+	proto native AbstractSoundScene GetSoundScene();
+	
+	// noise
+	proto native NoiseSystem GetNoiseSystem();
+	
+	// inventory
+	proto native bool	AddInventoryJuncture(Man player, notnull EntityAI item, InventoryLocation dst, bool test_dst_occupancy, int timeout_ms);
+	
+	bool	AddInventoryJunctureEx(Man player, notnull EntityAI item, InventoryLocation dst, bool test_dst_occupancy, int timeout_ms)
+	{
+		bool result = AddInventoryJuncture(player, item, dst, test_dst_occupancy, timeout_ms/*10000000*/);
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryReservationLogEnable() )
+		{
+			Debug.InventoryReservationLog("STS = " + player.GetSimulationTimeStamp() + " result: " + result + " item:" + item + " dst: " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "AddInventoryJuncture",player.ToString() );	
+		}
+		#endif
+		//Print("Juncture - STS = " + player.GetSimulationTimeStamp() + " item:" + item + " dst: " + InventoryLocation.DumpToStringNullSafe(dst));
+		return result;
+	}
+	
+	//Has inventory juncture for any player
+	proto native bool 	HasInventoryJunctureItem(notnull EntityAI item);
+	
+	proto native bool 	HasInventoryJunctureDestination(Man player, notnull InventoryLocation dst);
+	proto native bool	AddActionJuncture(Man player, notnull EntityAI item, int timeout_ms);
+	proto native bool	ExtendActionJuncture(Man player, notnull EntityAI item, int timeout_ms);
+	proto native bool	ClearJuncture(Man player, notnull EntityAI item);
+	
+	bool	ClearJunctureEx(Man player, notnull EntityAI item)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryReservationLogEnable() )
+		{
+			Debug.InventoryReservationLog("STS = " + player.GetSimulationTimeStamp()+ " item:" + item, "n/a" , "n/a", "ClearJuncture",player.ToString() );	
+		}
+		#endif
+		return ClearJuncture( player, item);
+	}
+
+	// support
+	//! Delevoper only: Executes Enforce Script expression, if there is an error, is printed into the script console
+	proto native bool 	ExecuteEnforceScript(string expression, string mainFnName);
+	//! Delevoper only: Dump all script allocations
+	proto native void	DumpInstances(bool csvFormatting);
+	
+	proto native bool 	ScriptTest();
+	//! Get list of all debug modes
+	proto native void		GetDiagModeNames(out TStringArray diag_names);
+	//! Set specific debug mode
+	proto native void		SetDiagModeEnable(int diag_mode, bool enabled);
+	//! Gets state of specific debug mode
+	proto native bool		GetDiagModeEnable(int diag_mode);
+
+	//! Get list of all debug draw modes
+	proto native void		GetDiagDrawModeNames(out TStringArray diag_names);
+	//! Set debug draw mode
+	proto native void		SetDiagDrawMode(int diag_draw_mode);
+	//! Gets current debug draw mode
+	proto native int		GetDiagDrawMode();
+
+	//! If physics extrapolation is enabled, always true on retail release builds
+	proto native bool		IsPhysicsExtrapolationEnabled();
+	
+	/**
+	\brief Returns average FPS of last 16 frames
+	@return fps in milliseconds
+	*/
+	proto native float		GetFps();
+	
+	/**
+	\brief Returns current time from start of the game
+	@return time in seconds
+	*/
+	proto native float		GetTickTime();
+
+	proto void					GetInventoryItemSize(InventoryItem item, out int width, out int height);
+	/**
+  \brief Returns list of all objects in circle "radius" around position "pos"
+	@param pos
+	@param radius
+	@param objects output array
+	*/
+	proto native void		GetObjectsAtPosition(vector pos, float radius, out array<Object> objects, out array<CargoBase> proxyCargos);
+	/**
+  \brief Returns list of all objects in sphere "radius" around position "pos"
+	@param pos
+	@param radius
+	@param objects output array
+	*/
+	proto native void		GetObjectsAtPosition3D(vector pos, float radius, out array<Object> objects, out array<CargoBase> proxyCargos);
+	proto native World	GetWorld();
+	proto void					GetWorldName( out string world_name );
+	
+	string GetWorldName()
+	{
+		string world_name;
+		g_Game.GetWorldName(world_name);
+		return world_name;
+	}
+
+	proto native bool VerifyWorldOwnership( string sWorldName );
+	proto native bool GoBuyWorldDLC( string sWorldName );
+
+	proto void					FormatString( string format, string params[], out string output);
+	proto void					GetVersion( out string version );
+	proto native UIManager	GetUIManager();
+	proto native DayZPlayer		GetPlayer();
+	proto native void		GetPlayers( out array<Man> players );
+	DayZPlayer GetPlayerByIndex(int index = 0)
+	{
+		array<Man> players();
+		GetPlayers(players);
+		if (index >= players.Count())
+			return null;
+		return DayZPlayer.Cast(players[index]);
+	}
+	
+	//! Stores login userdata as parameters which are sent to server	
+	proto native void		StoreLoginData(ParamsWriteContext ctx);
+	
+	//! Returns the direction where the mouse points, from the camera view
+	proto native vector		GetPointerDirection();
+	//! Transforms position in world to position in screen in pixels as x, y component of vector, z parameter represents distance between camera and world_pos
+	proto native vector		GetWorldDirectionFromScreen(vector world_pos);
+	//! Transforms position in world to position in screen in pixels as x, y component of vector, z parameter represents distance between camera and world_pos
+	proto native vector		GetScreenPos(vector world_pos);
+	//! Transforms position in world to position in screen in percentage (0.0 - 1.0) as x, y component of vector, z parameter represents distance between camera and world_pos
+	proto native vector		GetScreenPosRelative(vector world_pos);
+	
+	//! Return singleton of MenuData class - at main menu contains characters played with current profile.
+	proto native MenuData	GetMenuData();
+	/**
+  \brief Initiate remote procedure call. When called on client, RPC is evaluated on server; When called on server, RPC is executed on all clients
+	@param target object on which remote procedure is called, when NULL, RPC is evaluated by CGame as global
+	@param rpc_type user defined identification of RPC
+	@param params custom params array
+	@param recipient specified client to send RPC to. If NULL, RPC will be send to all clients (specifying recipient increase security and decrease network traffic)
+	@code
+	const int RPC_LOW_BLOOD_PRESSURE_EFFECT = 0;
+	...
+	// on server side, after blood pressure of player is low...
+	Param1<float> p = new Param1<float>(m_blood_pressure);
+	array<param> params = new array<param>;
+	params.Insert(p);
+	GetGame().RPC(player, RPC_LOW_BLOOD_PRESSURE_EFFECT, params);
+	// or shortcut
+	GetGame().RPCSingleParam(player, RPC_LOW_BLOOD_PRESSURE_EFFECT, p);
+	...
+	// on client
+	class PlayerBase
+	{
+		// override OnRPC function
+		void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+		{
+			// dont forget to propagate this call trough class hierarchy!
+			super.OnRPC(rpc_type, ctx);
+
+			switch(rpc_type)
+			{
+				case RPC_LOW_BLOOD_PRESSURE_EFFECT:
+					Param1<float> p = Param1<float>(0);
+					if (ctx.Read(p))
+					{
+						float blood_pressure = p.param1;
+						float effect_intensity = 1.0 - blood_pressure;
+						ShowFancyScreenEffect(effect_intensity);
+					}
+				break;
+			}
+		}
+	}
+	@endcode
+	*/
+	proto native void		RPC(Object target, int rpcType, notnull array<ref Param> params, bool guaranteed,PlayerIdentity recipient = null);
+	//! see CGame.RPC
+	void					RPCSingleParam(Object target, int rpc_type, Param param, bool guaranteed, PlayerIdentity recipient = null)
+	{
+		m_ParamCache.Set(0, param);
+		RPC(target, rpc_type, m_ParamCache, guaranteed, recipient);
+	}
+	//! Not actually an RPC, as it will send it only to yourself
+	proto native void		RPCSelf(Object target, int rpcType, notnull array<ref Param> params);
+	void					RPCSelfSingleParam(Object target, int rpcType, Param param)
+	{
+		m_ParamCache.Set(0, param);
+		RPCSelf(target, rpcType, m_ParamCache);
+	}
+
+	//! Use for profiling code from start to stop, they must match have same name, look wiki pages for more info: https://confluence.bistudio.com/display/EN/Profiler
+	proto native void		ProfilerStart(string name);
+	//! Use for profiling code from start to stop, they must match have same name, look wiki pages for more info: https://confluence.bistudio.com/display/EN/Profiler
+	proto native void		ProfilerStop(string name); 
+
+	
+/**
+ \brief Prints text into game chat.
+	\param text to print
+	\param colorClass ??
+	\n usage :
+	@code
+		GetGame().Chat("Item splitted", "colorAction");
+	@endcode
+*/
+	proto native void		Chat(string text, string colorClass);
+	proto native void		ChatMP(Man recipient, string text, string colorClass);
+	proto native void		ChatPlayer(string text);
+	/**
+	 \brief Mutes voice of source player to target player
+	@param muteUID 		uid of player you want to mute
+	@param playerUID 	uid of player that (doesnt't) want to hear muteUID
+	*/
+	proto native void		MutePlayer(string muteUID, string playerUID, bool mute);
+	
+	/**
+	 \brief Mute all players for listenerId
+	@param listenerId uid of player
+	@param mute true, if player can not listen anybody. Otherwise false.
+	*/
+	proto native void		MuteAllPlayers(string listenerId, bool mute);
+	
+	/**
+	 \brief Enable/disable VoN for target player
+	@param player in question
+	@param enable sets if player can use VoN
+	*/
+	proto native void		EnableVoN(Object player, bool enable);
+	
+	/**
+	 \brief Enable/disable VoN effect (only on server)
+	@param player in question
+	@param voice effect (VoiceEffectMumbling = 1, VoiceEffectExtortion = 2, VoiceEffectObstruction = 4)
+	@param enable or disable effect
+	*/
+	proto native void		SetVoiceEffect(Object player, int effect, bool enable);
+	
+	/**
+	 \brief Set voice level of VoN (only on client) (VoiceLevelWhisper = 0, VoiceLevelNormal = 1, VoiceLevelShout = 2)
+	@param level of voice
+	*/
+	proto native void		SetVoiceLevel(int level);
+	
+	/**
+	 \brief Get voice level of VoN (on both client and server) (VoiceLevelWhisper = 0, VoiceLevelNormal = 1, VoiceLevelShout = 2)
+	*/
+	proto native int		GetVoiceLevel(Object player = null);
+
+	/**
+	 \brief Enable microphone to locally capture audio from user. Audio heard does NOT automatically get transmitted over network
+	@param enable enables or disabled listening
+	*/
+	proto native void 		EnableMicCapture(bool enable);
+	
+	/**
+	 \brief Returns whether mic is currently capturing audio from user
+	*/
+	proto native bool		IsMicCapturing();
+	
+	/**
+	 \brief Returns whether user is currently in a voice party (currently only supported on xbox)
+	*/
+	proto native bool 		IsInPartyChat();
+	
+	// mission
+	proto native Mission 	GetMission();
+	proto native void		SetMission(Mission mission);
+	
+	
+	//! Starts intro
+	proto native void		StartRandomCutscene(string world);
+	//! Starts mission (equivalent for SQF playMission). You MUST use double slash \\ 
+	proto native void		PlayMission(string path);
+	
+	//! Create only enforce script mission, used for mission script reloading 
+	proto protected native void		CreateMission(string path);
+	proto native void		RestartMission();
+	//! Returns to main menu, leave world empty for using last mission world
+	proto native void		AbortMission();
+	proto native void		RespawnPlayer();
+	proto native bool		CanRespawnPlayer();
+	proto native void		SetLoginTimerFinished();
+
+	proto native void		SetMainMenuWorld(string world);
+	proto native owned string GetMainMenuWorld();	
+	
+	//! Logout methods
+	proto native void		LogoutRequestTime();
+	proto native void		LogoutRequestCancel();
+
+	proto native bool		IsMultiplayer();
+	proto native bool		IsClient();
+	proto native bool		IsServer();
+	/**
+	 \brief Robust check which is preferred than the above, as it is valid much sooner
+	 	\note You may want to use #ifdef SERVER instead for slight performance gain...
+	*/
+	proto native bool		IsDedicatedServer();
+
+	//! Server config parsing. Returns 0 if not found.
+	proto native int		ServerConfigGetInt(string name);
+	
+	// Internal build
+	proto native bool		IsDebug();
+	
+//#ifdef PLATFORM_XBOX
+	static bool 			IsDigitalCopy() 
+	{
+		return OnlineServices.IsGameActive(false);
+	}
+//#endif
+	
+	/*bool IsNewMenu()
+	{
+		return m_ParamNewMenu;
+	}*/
+
+	void SetDebugMonitorEnabled(int value)
+	{
+		m_DebugMonitorEnabled = value;
+	}
+	
+	bool IsDebugMonitor()
+	{
+		return IsServer() && m_DebugMonitorEnabled;
+	}
+	
+	proto native void		GetPlayerIndentities( out array<PlayerIdentity> identities );
+	
+	proto native float		SurfaceY(float x, float z);
+	proto native float		SurfaceRoadY(float x, float z, RoadSurfaceDetection rsd = RoadSurfaceDetection.LEGACY);
+	proto native float		SurfaceRoadY3D(float x, float y, float z, RoadSurfaceDetection rsd);
+	proto void				SurfaceGetType(float x, float z, out string type);
+	proto void				SurfaceGetType3D(float x, float y, float z, out string type);
+	proto void				SurfaceUnderObject(notnull Object object, out string type, out int liquidType);
+	proto void				SurfaceUnderObjectEx(notnull Object object, out string type, out string impact, out int liquidType);
+	proto void				SurfaceUnderObjectByBone(notnull Object object, int boneType, out string type, out int liquidType);
+	proto native float		SurfaceGetNoiseMultiplier(Object directHit, vector pos, int componentIndex);
+	proto native vector		SurfaceGetNormal(float x, float z);
+	proto native float		SurfaceGetSeaLevel();
+	proto native bool		SurfaceIsSea(float x, float z);
+	proto native bool		SurfaceIsPond(float x, float z);
+	proto native float      GetWaterDepth(vector posWS);
+	
+	proto native void 		UpdatePathgraphRegion(vector regionMin, vector regionMax);
+	
+	//! Returns the largest height difference between the given positions
+	float GetHighestSurfaceYDifference( array<vector> positions)
+	{
+		float high 			= -9999999;
+		float low 			= 99999999;
+		
+		for (int i = 0; i < positions.Count(); i++)
+		{
+			vector pos = positions.Get(i);
+			pos[1] = SurfaceRoadY( pos[0], pos[2]);
+			float y = pos[1];
+			
+			if ( y > high )
+				high = y;
+			
+			if ( y < low )
+				low = y;
+			
+			;
+		}
+		
+		return high - low;
+	}
+	
+	//! Returns tilt of the ground on the given position in degrees, so you can use this value to rotate any item according to terrain.
+	vector GetSurfaceOrientation(float x, float z)
+	{
+		vector normal = GetGame().SurfaceGetNormal(x, z);
+		vector angles = normal.VectorToAngles();
+		angles[1] = angles[1]+270; // This fixes rotation of item so it stands vertically. Feel free to change, but fix existing use cases.
+		
+		//Hack because setorientation and similar functions break and flip stuff upside down when using exactly this vector ¯\_(ツ)_/¯ (note: happens when surface is flat)
+		if (angles == "0 540 0")
+			angles = "0 0 0";
+		return angles;
+	}
+	
+	//! Checks if the surface is digable
+	bool IsSurfaceDigable(string surface)
+	{
+		return ConfigGetInt("CfgSurfaces " + surface + " isDigable");
+	}
+	
+	//! Checks if the surface is fertile
+	bool IsSurfaceFertile(string surface)
+	{
+		return ConfigGetInt("CfgSurfaces " + surface + " isFertile");
+	}
+	
+	void UpdatePathgraphRegionByObject(Object object)
+	{
+		if ( object )
+		{
+			vector pos = object.GetPosition();
+			vector min_max[2];
+			float radius = object.ClippingInfo ( min_max );
+			vector min = Vector ( pos[0] - radius, pos[1], pos[2] - radius );
+			vector max = Vector ( pos[0] + radius, pos[1], pos[2] + radius );
+			UpdatePathgraphRegion( min, max );
+		}
+	}
+	
+	/**
+	\brief Finds all objects that are in choosen oriented bounding box (OBB)
+		\param center \p vector, center of OBB
+		\param orientation \p vector, direction (front vector), used for calculation of OBB rotation
+		\param edgeLength \p vector, sizes of whole box
+		\param excludeObjects \p array<Object>, objects that should be excluded from collision check
+		\param collidedObjects \p array<Object>, out parameter, objects that collided with OBB
+		\returns \p bool, \p true if at least one object collided with OBB, \p false otherwise
+		\note Object that doesn't have collision geometry will be ignored, as this only uses geometry
+		
+		@code
+			vector pos = GetPosition();
+			vector orientation = GetOrientation();
+			vector size = "10 4 8";
+			array<Object> excluded_objects = new array<Object>;
+			excluded_objects.Insert(this);
+			array<Object> nearby_objects = new array<Object>;
+			
+			if(GetGame().IsBoxColliding( pos, orientation, size, excluded_objects, nearby_objects))
+			{
+				for (int i = 0, c = nearby_objects.Count(); i < c; ++i)
+				{
+					PrintString("object " + i.ToString());
+				}
+			}
+		@endcode
+	*/
+	proto native bool		IsBoxColliding(vector center, vector orientation, vector edgeLength, array<Object> excludeObjects, array<Object> collidedObjects = NULL); 
+	
+	/**
+	\brief Finds all objects with geometry iType that are in choosen oriented bounding box (OBB)
+		\param center \p vector, center of OBB
+		\param orientation \p vector, direction (front vector), used for calculation of OBB rotation
+		\param edgeLength \p vector, sizes of whole box
+		\param iPrimaryType \p int, 	type of intersection, possible values ObjIntersectFire(0), ObjIntersectView(1), ObjIntersectGeom(2), ObjIntersectIFire(3), 
+	ObjIntersectNone(4) 
+		\param iSecondaryType \p int, 	type of intersection, possible values ObjIntersectFire(0), ObjIntersectView(1), ObjIntersectGeom(2), ObjIntersectIFire(3), 
+	ObjIntersectNone(4) 
+		\param excludeObjects \p array<Object>, objects that should be excluded from collision check
+		\param collidedObjects \p array<Object>, out parameter, objects that collided with OBB
+		\returns \p bool, \p true if at least one object collided with OBB, \p false otherwise
+		
+		@code
+			vector pos = GetPosition();
+			vector orientation = GetOrientation();
+			vector size = "10 4 8";
+			array<Object> excluded_objects = new array<Object>;
+			excluded_objects.Insert(this);
+			array<Object> nearby_objects = new array<Object>;
+			
+			if(GetGame().IsBoxCollidingGeometry( pos, orientation, size, ObjIntersectView, ObjIntersectGeom, excluded_objects, nearby_objects))
+			{
+				for (int i = 0, c = nearby_objects.Count(); i < c; ++i)
+				{
+					PrintString("object " + i.ToString());
+				}
+			}
+		@endcode
+	*/
+	proto native bool		IsBoxCollidingGeometry(vector center, vector orientation, vector edgeLength, int iPrimaryType, int iSecondaryType, array<Object> excludeObjects, array<Object> collidedObjects = NULL); 
+
+	proto native bool		IsBoxCollidingGeometryProxy(notnull BoxCollidingParams params, array<Object> excludeObjects, array<ref BoxCollidingResult> collidedObjects = NULL); 
+		
+	//! Returns weather controller object.
+	proto native Weather GetWeather();
+
+	//! Sets custom camera camera EV. range: -50.0..50.0? //TODO
+	proto native void	SetEVUser(float value);
+
+	proto native void 	OverrideDOF(bool enable, float focusDistance, float focusLength, float focusLengthNear, float blur, float focusDepthOffset);
+	
+	proto native void	AddPPMask(float ndcX, float ndcY, float ndcRadius, float ndcBlur);
+
+	proto native void 	ResetPPMask();
+
+	/*!
+	override inventory light
+	\param diffuse		directional light
+	\param ambient 		ambient light
+	\param ground		ground light
+	\param dir		direction of light, Vector(0,0,1) is from camera
+	*/
+	proto native void 	OverrideInventoryLights(vector diffuse, vector ambient, vector ground, vector dir);
+
+	/*!
+	set night vission parameters (set to zero when to disable it) 
+	\param lightIntensityMul	multiplicator of lights intensity
+	\param noiseIntensity		intensity of noise PP
+	*/
+	proto native void 	NightVissionLightParams(float lightIntensityMul, float noiseIntensity);
+
+
+	proto native void OpenURL(string url);
+	
+	//! Initialization of damage effects
+	proto native void		InitDamageEffects(Object effect);
+
+//-----------------------------------------------------------------------------
+// persitence
+//-----------------------------------------------------------------------------
+
+	//! Returns EntityAI by its persistent ID parts
+	//! or null if entity with given persistent ID does not exists.
+	/*!
+		This function returns valid data only inside AfterLoad event.
+		Do not use this in anywhere else.
+
+		Its main purpose is only for keep track on object connections
+		after server restarts, all data related to this function are deleted
+		when server initialization is done.
+	*/
+	proto native EntityAI GetEntityByPersitentID( int b1, int b2, int b3, int b4 );
+
+//-----------------------------------------------------------------------------
+
+/**
+\brief Returns is class name inherited from parent class name
+	\param cfg_class_name \p Config Class name ("Animal_CervusElaphus")
+	\param cfg_parent_name \p Parent Config Class name ("DZ_LightAI")
+	\returns \p bool is class name inherited from parent class name
+	@code
+		bool is_kind = GetGame().IsKindOf( "Animal_CervusElaphus", "DZ_LightAI");
+		PrintString(ToString(is_kind));
+		
+		>> 1
+	@endcode
+*/
+	bool IsKindOf(string cfg_class_name, string cfg_parent_name)
+	{
+		TStringArray full_path = new TStringArray;
+		
+		ConfigGetFullPath("CfgVehicles " + cfg_class_name, full_path);
+	
+		if (full_path.Count() == 0)
+		{
+			ConfigGetFullPath("CfgAmmo " + cfg_class_name, full_path);
+		}
+		
+		if (full_path.Count() == 0)
+		{
+			ConfigGetFullPath("CfgMagazines " + cfg_class_name, full_path);
+		}
+		
+		if (full_path.Count() == 0)
+		{
+			ConfigGetFullPath("cfgWeapons " + cfg_class_name, full_path);
+		}
+	
+		if (full_path.Count() == 0)
+		{
+			ConfigGetFullPath("CfgNonAIVehicles " + cfg_class_name, full_path);
+		}
+		
+		cfg_parent_name.ToLower();
+		for (int i = 0; i < full_path.Count(); i++)
+		{
+			string tmp = full_path.Get(i);
+			tmp.ToLower();
+			if (tmp == cfg_parent_name)
+			{
+				return true;
+			}
+		}
+	
+		return false;
+	}
+
+/**
+\brief Returns is object inherited from parent class name
+	\param object \p Object
+	\param cfg_parent_name \p Parent Config Class name ("DZ_LightAI")
+	\returns \p bool is object inherited from parent class name
+	@code
+		bool is_kind = GetGame().IsKindOf( my_animal, "DZ_LightAI");
+		PrintString(ToString(is_kind));
+		
+		>> 1
+	@endcode
+*/
+	bool ObjectIsKindOf(Object object, string cfg_parent_name)
+	{
+		TStringArray full_path = new TStringArray;
+		ConfigGetObjectFullPath(object, full_path);
+	
+		cfg_parent_name.ToLower();
+	
+		for (int i = 0; i < full_path.Count(); i++)
+		{
+			string tmp = full_path.Get(i);
+			tmp.ToLower();
+			if (tmp == cfg_parent_name)
+			{
+				return true;
+			}
+		}
+	
+		return false;
+	}
+	
+	/**
+	Searches given config path (config_path) for the given member (searched_member) and returns its index.
+	\nReturns -1 if not found.
+	\n usage:
+	* @code
+	* int skinning_class_index = g_Game.ConfigFindClassIndex(cfgPath_animal, "Skinning");
+	* @endcode
+	*/
+	int ConfigFindClassIndex(string config_path, string searched_member)
+	{
+		int class_count = ConfigGetChildrenCount(config_path);
+		for (int index = 0; index < class_count; index++)
+		{
+			string found_class = "";
+			ConfigGetChildName(config_path, index, found_class);
+			if (found_class == searched_member)
+			{
+				return index;
+			}
+		}
+		return -1;
+	}
+
+	//!returns mission time in milliseconds	
+	proto int GetTime();
+
+	/**
+  Returns CallQueue for certain category
+  @param call_category call category, valid values are:
+	\n CALL_CATEGORY_SYSTEM - calls & timers in this queue are processed every time without any restrictions
+	\n CALL_CATEGORY_GUI - calls & timers in this queue are processed when GUI is enabled (even during pase game)
+	\n CALL_CATEGORY_GAMEPLAY - calls & timers in this queue are processed only during mission, when game is not paused
+	\n usage:
+	* @code
+	* GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(this, "Refresh"); // calls "Refresh" function on "this" with no arguments
+	* GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(this, "Show", new Param1<bool>(true)); // calls "Show" function on "this" with one bool argument
+	* GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(this, "SetPos", new Param2<float, float>(0.2, 0.5)); // calls "SetPos" function on "this" with two float arguments
+	* @endcode
+	*/
+	ScriptCallQueue GetCallQueue(int call_category) {}
+
+	ScriptInvoker GetUpdateQueue(int call_category) {}
+
+	ScriptInvoker GetPostUpdateQueue(int call_category) {}
+	/**
+  Returns TimerQueue for certain category
+  @param call_category call category, valid values are:
+	\n CALL_CATEGORY_SYSTEM - calls & timers in this queue are processed every time without any restrictions
+	\n CALL_CATEGORY_GUI - calls & timers in this queue are processed when GUI is enabled (even during pase game)
+	\n CALL_CATEGORY_GAMEPLAY - calls & timers in this queue are processed only during mission, when game is not paused
+	*/
+	TimerQueue GetTimerQueue(int call_category) {}
+
+	/**
+  Returns DragQueue. Callbacks are called on mouse move until mouse button is released, then the queue is cleaned.
+	*/
+	DragQueue GetDragQueue() {}
+
+	//!returns class name of first valid survivor (TODO address confusing naming?)
+	string CreateDefaultPlayer() {}
+	
+	//!returns class name of random survivor (TODO address confusing naming?)
+	string CreateRandomPlayer() {}
+	
+	//!outputs array of all valid survivor class names
+	TStringArray ListAvailableCharacters() {}
+
+	bool IsInventoryOpen()
+	{
+	}
+
+	proto native BiosUserManager GetUserManager();
+	
+	//! Return DLC service (service for entitlement keys for unlock content)
+	proto native ContentDLC GetContentDLCService();
+	
+	//! Returns true when current mission is Main Menu
+	bool IsMissionMainMenu()
+	{
+		return (g_Game.GetMissionState() == DayZGame.MISSION_STATE_MAINMENU);
+	}
+	
+	MenuDefaultCharacterData GetMenuDefaultCharacterData(bool fill_data = true)
+	{
+		//Print("GetMenuDefaultCharacterData");
+		//DumpStack();
+		//if used on server, creates an empty container to be filled by received data
+		if (!m_CharacterData)
+		{
+			m_CharacterData = new MenuDefaultCharacterData;
+			if (fill_data)
+				GetGame().GetMenuData().RequestGetDefaultCharacterData(); //fills the structure
+		}
+		return m_CharacterData;
+	}
+	
+	//Analytics Manager
+	AnalyticsManagerServer GetAnalyticsServer()
+	{
+		return m_AnalyticsManagerServer;
+	}
+	
+	AnalyticsManagerClient GetAnalyticsClient()
+	{
+		return m_AnalyticsManagerClient;
+	}
+};
diff --git a/scripts/3_Game/DayZ/Global/PBOAPI.c b/scripts/3_Game/DayZ/Global/PBOAPI.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb4c1435854e41925bdc85a02e595f0cd9c7aefa
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/PBOAPI.c
@@ -0,0 +1,6 @@
+class PBOAPI
+{
+	proto native owned string GetPBOVersion(string openName);
+}
+
+static proto native PBOAPI GetPBOAPI();
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Global/UUID.c b/scripts/3_Game/DayZ/Global/UUID.c
new file mode 100644
index 0000000000000000000000000000000000000000..f877b4fc320d02549008fe8adcaaea8f016fcf64
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/UUID.c
@@ -0,0 +1,23 @@
+class UUIDApi
+{
+	/**
+	\brief Creates a 128bit UUID using system APIs
+	@code
+		int uuid[4];
+		UUIDApi.Generate(uuid);
+	@endcode
+	 */
+	static proto void Generate(inout int id[4]);
+
+	/**
+	\brief Output the UUID as standard format string (eg. 123e4567-e89b-12d3-a456-426655440000)
+	@code
+		int uuid[4];
+		Print(UUIDApi.FormatString(uuid));
+	
+		>> "123e4567-e89b-12d3-a456-426655440000"
+	@endcode
+	 */
+	static proto string FormatString(int id[4]);
+
+};
diff --git a/scripts/3_Game/DayZ/Global/World.c b/scripts/3_Game/DayZ/Global/World.c
new file mode 100644
index 0000000000000000000000000000000000000000..b50b3a134fe3f60de2f3525c94e04f2fa3739be6
--- /dev/null
+++ b/scripts/3_Game/DayZ/Global/World.c
@@ -0,0 +1,277 @@
+class World: Managed
+{
+	//proto private void ~World();
+	//proto private void World();
+
+	proto void CheckSoundObstruction(EntityAI source,  bool inSource, out float obstruction, out float occlusion);
+
+	proto native void	GetPlayerList(out array<Man> players);
+
+	/**
+	\brief Sets the world time acceleration, overriding config. Mostly used for debug purposes.
+		\param timeMultiplier 0-64 acceleration value, -1 to reset back
+	*/
+	proto native void SetTimeMultiplier(float timeMultiplier);
+	
+	/**
+	\brief Get actual ingame world time
+		\param year
+		\param month in range <1, 12>
+		\param day in range <1, 31>
+		\param hour in range <0, 23>
+		\param minute in range <0, 59>
+		@code
+			int year, month, day, hour, minute;
+			GetGame().GetWorld().GetDate(year, month, day, hour, minute);
+		@endcode
+	*/
+	proto void			GetDate(out int year, out int month, out int day, out int hour, out int minute);
+	
+	/**
+	\brief Sets actual ingame world time
+		\param year
+		\param month in range <1, 12>
+		\param day in range <1, 31>
+		\param hour in range <0, 23>
+		\param minute in range <0, 59>
+		@code
+			int year = 2016;
+			int month = 5;
+			int day = 4;
+			int hour = 14;
+			int minute = 57;
+			GetGame().GetWorld().SetDate(year, month, day, hour, minute);
+		@endcode
+	*/
+	proto native void	SetDate(int year, int month, int day, int hour, int minute);
+	proto native float	GetLatitude();
+	proto native float	GetLongitude();
+	proto native float	GetMoonIntensity();
+	proto native float	GetSunOrMoon();
+	proto native bool	IsNight();
+		
+	proto native float	GetEyeAccom();
+	proto native void	SetEyeAccom(float eyeAccom);
+
+	proto native void	StartFpsBenchmark(int sectorsCount, float preloadDistance, float fpsLimitRed, float fpsLimitGreen, float fpsLimitBlue, float minX, float minY, float maxX, float maxY);
+	proto native void	StartFpsBenchmarkWithMask(float preloadDistance, float fpsLimitRed, float fpsLimitGreen, float fpsLimitBlue);
+	proto native void	StartFpsBenchmarkViews(string xmlFileName, float preloadDistance);
+	proto native void	SetBuldozerWaterEnabled(bool enable);
+	/**
+	\brief Sets preferred view distance, which persists between game sessions
+		\param distance
+	*/
+	proto native void SetPreferredViewDistance(float distance);
+
+	proto native void SetViewDistance(float distance);
+
+	proto native void SetObjectViewDistance(float distance);
+	
+	proto native void SetExplicitVolumeFactor_EnvSounds2D(float factor, float fadeTime);
+	
+	
+	/**
+	\brief Affects env sound controller value 'Shooting' 
+		\param sound position
+		\param relative value (0..1) - how much should be value decreased
+	*/		
+	proto native void AddEnvShootingSource(vector position, float shootingValDecrease);
+	
+	proto int GetWorldSize();
+
+	/**
+	\brief Translates world coordinates to a grid coordinates(map grid)
+		\param pos
+		\param size of grid in meters
+		\param x grid position result [out]
+		\param z grid position result [out]
+		@code
+			int x,z;
+			GetGame().GetWorld().GetGridCoords(GetGame().GetPlayer().GetPosition(), 100, x, z);
+		@endcode
+	*/	
+	proto void GetGridCoords(vector pos, float gridSize, out int gridX, out int gridZ);
+
+	/**
+	load light config 
+	*/
+	proto native void LoadNewLightingCfg(string path);
+
+	/**
+	load user light config (just first item is used) 
+	*/
+	proto native void LoadUserLightingCfg(string path, string name);
+
+	/**
+	set lerp to user lighting cfg
+	*/
+	proto native void SetUserLightingLerp(float val);
+
+	
+	/**
+	returns reference to AIWorld
+	*/	
+	proto native AIWorld GetAIWorld();
+	
+	/**
+	For entities that aren't a house, any animation source that contains "door" is treated as a door by the pathgraph.
+	Using the phase value where 0=CLOSED, 1=OPENED, we can update the state of the door without regenerating the tile
+	*/	
+	proto native void UpdatePathgraphDoorByAnimationSourceName(notnull Object object, string animSourceName);
+	
+	proto native void MarkObjectForPathgraphUpdate(Object object);
+	proto native void ProcessMarkedObjectsForPathgraphUpdate();
+
+	
+	/*!
+	@code
+	Material matColors = GetGame().GetWorld().GetMaterial("postprocess/glow");
+	SetMaterialParam(matColors, "Saturation", 0.8);
+	float color[4];
+	color[0] = 0.5;
+	color[1] = 0.8;
+	color[2] = 0.7;
+	color[3] = 0.6;
+	SetMaterialParam(matColors, "OverlayColor", color);
+	@endcode
+	*/
+	proto native Material GetMaterial(string materialName);
+
+	/*!
+	set new PP effect and its material
+	\param camera					number of camera
+	\param effectIndex		index of effect
+	\param effectName			name of effect
+	\param matName				name of material
+	*/
+	proto native void		SetCameraPostProcessEffect(int cam, int ppEffect, string effectName, string materialName);
+	
+	void SetAperture(float invDiameter)
+	{
+		if (invDiameter <= 0)
+		{
+			SetEyeAccom(-1);
+		}
+		else
+		{
+			float apertureArea = 1.0 / invDiameter;
+			SetEyeAccom(apertureArea * apertureArea);
+		}
+	}
+	
+	/*!
+	checks if 3rd person camera is disabled from server
+	*/
+	proto native bool Is3rdPersonDisabled();
+	
+	/*!
+	checks if crosshair is disabled from server
+	*/
+	proto native bool IsCrosshairDisabled();
+	
+	/*!
+	checks if mouse and keyboard is enabled from server (only on console)
+	*/
+	proto native bool IsMouseAndKeyboardEnabledOnServer();
+	
+	/*!
+	Returns the value set in server config for notifying high ping
+	*/
+	proto native int GetPingWarningThreshold();
+
+	/*!
+	Returns the value set in server config for notifying high ping
+	*/
+	proto native int GetPingCriticalThreshold();
+
+		/*!
+	Returns the value set in server config for notifying low server fps
+	*/
+	proto native float GetServerFpsWarningThreshold();
+
+	/*!
+	Returns the value set in server config for notifying low server fps
+	*/
+	proto native float GetServerFpsCriticalThreshold();
+
+	/*!
+	enable/disable transmiting voice over network globally
+	\param disable	if true, then VoN is no more usable for transmiting voice
+	*/
+	proto native void DisableTransmitVoN(bool disable);
+	
+	/*!
+	enable/disable receiving all voice over network globally
+	\param disable	if true, then player is not able listen any voice from VoN
+	\return true if mute request was sent successfully to server. If false, then was problem with sent request or missing player idendity.
+	*/
+	proto native bool DisableReceiveVoN(bool disable);
+	
+	/*!
+	\return true if transmiting voice over network is disabled, so player can not talking
+	*/
+	proto native bool IsDisabledTransmitingVoN();
+	
+	/*!
+	\return true, if receiving voice over network is disabled, so player can not listen anybody
+	*/
+	proto native bool IsDisabledReceivingVoN();
+	
+	/*!
+	enables/disables player's voice communication
+	\param listening			enable or disable microphone
+	\param toggled				enable or disable PTT/Voice activation
+	*/
+	proto void SetVoiceOn(bool listening, bool toggled = false);
+
+	/*!
+	create sphere
+	\param worldX		world X of touch with ground
+	\param worldZ		world X of touch with ground
+	\param radius		radius
+	\param centerLerp01	lerp of values inside rasterization
+	\param timeDown01	relative speed of going down, 1 is usually 0.5secs
+	\param maxHeight01	maximum relative height of flattening, 0 = no flatten
+	*/
+	proto native void FlattenGrassSphere(float x, float z, float radius, float centerLerp01, float timeDown01, float maxHeight01);
+
+	/*!
+	create ellipse
+	\param worldX		world X of touch with ground
+	\param worldZ		world X of touch with ground
+	\param radiusX		radius in X coord before rotate
+	\param radiusZ		radius in Z coord before rotate
+	\param offset		offset, 0 = default center, <-1, 1>
+	\param angleRAD		rotation
+	\param centerLerp01	lerp of values inside rasterization
+	\param timeDown01	relative speed of going down, 1 is usually 0.5secs
+	\param maxHeight01	maximum relative height of flattening, 0 = no flatten
+	*/
+	proto native void FlattenGrassEllipse(float x, float z, float sideX, float sideZ, float offset, float angleRAD, float centerLerp01, float timeDown01, float maxHeight01);
+
+	/*!
+	create box
+	\param worldX		world X of touch with ground
+	\param worldZ		world X of touch with ground
+	\param sideSize		size of side
+	\param angleRAD		rotation
+	\param centerLerp01	lerp of values inside rasterization
+	\param timeDown01	relative speed of going down, 1 is usually 0.5secs
+	\param maxHeight01	maximum relative height of flattening, 0 = no flatten
+	*/
+	proto native void FlattenGrassBox(float x, float z, float side, float angleRAD, float centerLerp01, float timeDown01, float maxHeight01);
+
+	/*!
+	create rectangle
+	\param worldX		world X of touch with ground
+	\param worldZ		world X of touch with ground
+	\param sideXSize	size of side in X
+	\param sideZSize	size of side in Z
+	\param offset		offset, 0 = default center, <-1, 1>
+	\param angleRAD		rotation
+	\param centerLerp01	lerp of values inside rasterization
+	\param timeDown01	relative speed of going down, 1 is usually 0.5secs
+	\param maxHeight01	maximum relative height of flattening, 0 = no flatten
+	*/
+	proto native void FlattenGrassRect(float x, float z, float sideX, float sideZ, float offset, float angleRAD, float centerLerp01, float timeDown01, float maxHeight01);
+};
diff --git a/scripts/3_Game/DayZ/HiddenSelectionsData.c b/scripts/3_Game/DayZ/HiddenSelectionsData.c
new file mode 100644
index 0000000000000000000000000000000000000000..062fd7c0a6029fa8692095f15350baf20ff22214
--- /dev/null
+++ b/scripts/3_Game/DayZ/HiddenSelectionsData.c
@@ -0,0 +1,58 @@
+class HiddenSelectionsData
+{
+	ref array<string> m_HiddenSelections = new array<string>;
+	ref array<string> m_HiddenSelectionsTextures = new array<string>;
+	ref array<string> m_HiddenSelectionsMaterials = new array<string>;
+	
+	ref map<string, int> m_HiddenSelectionNameToIndex = new map<string, int>;
+	
+	void HiddenSelectionsData(string type)
+	{
+		GetGame().ConfigGetTextArray( string.Format("CfgVehicles %1 hiddenSelections", 			type), m_HiddenSelections );
+		GetGame().ConfigGetTextArray( string.Format("CfgVehicles %1 hiddenSelectionsTextures", 	type), m_HiddenSelectionsTextures );
+		GetGame().ConfigGetTextArray( string.Format("CfgVehicles %1 hiddenSelectionsMaterials", type), m_HiddenSelectionsMaterials );
+		
+		for (int i = 0; i < m_HiddenSelections.Count(); ++i)
+			m_HiddenSelectionNameToIndex.Insert(m_HiddenSelections[i], i);
+	}
+	
+	int GetHiddenSelectionIndex(string selection)
+	{
+		int index;
+		if (m_HiddenSelectionNameToIndex.Find(selection, index))
+			return index;
+		
+		return -1;
+	}
+	
+	TStringArray GetHiddenSelectionsTextures()
+	{
+		return m_HiddenSelectionsTextures;
+	}
+	
+	TStringArray GetHiddenSelectionsMaterials()
+	{
+		return m_HiddenSelectionsMaterials;
+	}
+	
+	static array<string> GetHiddenSelectionsConfig(string type)
+	{
+		array<string> hiddenSelections = new array<string>;
+		GetGame().ConfigGetTextArray( string.Format("CfgVehicles %1 hiddenSelections", type), hiddenSelections );
+		return hiddenSelections;
+	}
+	
+	static array<string> GetHiddenSelectionsTexturesConfig(string type)
+	{
+		array<string> hiddenSelectionsTextures = new array<string>;
+		GetGame().ConfigGetTextArray( string.Format("CfgVehicles %1 hiddenSelectionsTextures", type), hiddenSelectionsTextures );
+		return hiddenSelectionsTextures;
+	}
+	
+	static array<string> GetHiddenSelectionsMaterialsConfig(string type)
+	{
+		array<string> hiddenSelectionsMaterials = new array<string>;
+		GetGame().ConfigGetTextArray( string.Format("CfgVehicles %1 hiddenSelectionsMaterials", type), hiddenSelectionsMaterials );
+		return hiddenSelectionsMaterials;
+	}
+}
diff --git a/scripts/3_Game/DayZ/HitInfo.c b/scripts/3_Game/DayZ/HitInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..842b18ff15e7e68b5fd681b25651142002c4ab05
--- /dev/null
+++ b/scripts/3_Game/DayZ/HitInfo.c
@@ -0,0 +1,9 @@
+class HitInfo
+{
+	proto native float GetSurfaceNoiseMultiplier();
+	proto native string GetAmmoType();
+	proto native vector GetPosition();
+	proto native vector GetSurfaceNormal();
+	proto native string GetSurface();
+	proto native bool IsWater();
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Hive/Hive.c b/scripts/3_Game/DayZ/Hive/Hive.c
new file mode 100644
index 0000000000000000000000000000000000000000..acf8423da647c830666915d8a81b7ddc26546f25
--- /dev/null
+++ b/scripts/3_Game/DayZ/Hive/Hive.c
@@ -0,0 +1,31 @@
+
+/** @file */
+
+// -------------------------------------------------------------------------
+class Hive
+{
+	private void Hive() {}
+	private void ~Hive() {}
+	
+	proto native void InitOnline( string ceSetup, string host = "" );
+	proto native void InitOffline();
+	proto native void InitSandbox();
+
+	proto native bool IsIdleMode();
+
+	proto native void SetShardID( string shard );
+	proto native void SetEnviroment( string env );
+
+	proto native void CharacterSave( Man player );
+	proto native void CharacterKill( Man player );
+	proto native void CharacterExit( Man player );
+
+	proto native void CallUpdater( string content );
+
+	//! Only valid during login
+	proto native bool CharacterIsLoginPositionChanged( Man player );
+};
+
+proto native Hive CreateHive();
+proto native void DestroyHive();
+proto native Hive GetHive();
diff --git a/scripts/3_Game/DayZ/Http/BackendApi.c b/scripts/3_Game/DayZ/Http/BackendApi.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e5a812b9bcaa30916674a9007ef2dbbe043b4ff
--- /dev/null
+++ b/scripts/3_Game/DayZ/Http/BackendApi.c
@@ -0,0 +1,267 @@
+
+/** @file */
+
+
+	//! Backend error
+	enum EBackendError
+	{
+		EBERR_OK,					// all OK
+		EBERR_UNKNOWN,				// unknown error
+		EBERR_DISABLED,				// backend is disabled
+		EBERR_INVALID_STATE,		// called request from state where it is not possible (ie. reading data before logon and such)
+		EBERR_BUSY,					// no request can be called - login/ auth in process
+		EBERR_ALREADY_OFFLINE,		// state is already active
+		EBERR_ALREADY_ONLINE,		// state is already active
+		EBERR_ALREADY_REQUESTED,	// state already requested once!
+		EBERR_LOGIN_FAILED,			// failed to logon
+		EBERR_AUTH_FAILED,			// failed to authenticate
+		EBERR_LOGIN_SUCCESS,		// logon successfull
+		EBERR_AUTH_SUCCESS,			// authenticate successfull
+		EBERR_CONFIGURATION_GET,	// configuration received
+		EBERR_CEPROFILE_GET,		// CE profile configuration received
+		EBERR_CHARACTER_GET,		// character data receieved
+		EBERR_CHARACTER_UPDATE,		// character update done
+	};
+	
+	//! Backend request
+	enum EBackendRequest
+	{
+/*		// game api
+		EBREQ_GAME_Test,					// environment test - dummy data read
+		EBREQ_GAME_World,					// static world configuration read
+		EBREQ_GAME_CEProfile,
+		EBREQ_GAME_CharacterGet,			// character data read
+		EBREQ_GAME_CharacterUpdate,			// character data update
+//		#if BACKENDAPI_DEV_CHARACTER
+		EBREQ_GAME_DevCharacterGet,			// dev character data read
+		EBREQ_GAME_DevCharacterUpdate,		// dev character data update
+//		#endif
+		EBREQ_GAME_Heartbeat,*/
+		// user api request <> response
+		EBREQ_USER_Login,
+		EBREQ_USER_Auth,
+/*		// lobby api request <> response
+		EBREQ_LOBBY_RoomsRegister,
+		EBREQ_LOBBY_RoomsJoin,
+		EBREQ_LOBBY_RoomsAcceptPlayer,
+		EBREQ_LOBBY_RoomsHeartBeat,
+		EBREQ_LOBBY_RoomsUpdate,
+		EBREQ_LOBBY_RoomsRemovePlayer,
+		EBREQ_LOBBY_RoomsSearch,
+		EBREQ_LOBBY_RoomsGetByIds,
+		EBREQ_LOBBY_RoomsGetByHostIds,
+		EBREQ_LOBBY_GetActiveScenarios,
+		// storage api request <> response
+		EBREQ_STORAGE_GetFileTempURL,
+		EBREQ_STORAGE_GetFileTempURLS2S,
+		EBREQ_STORAGE_GetFile,
+		EBREQ_STORAGE_DeleteFile,
+		EBREQ_STORAGE_GetFileS2S,
+		EBREQ_STORAGE_DeleteFileS2S,
+		EBREQ_STORAGE_PatchFileS2S,
+		EBREQ_STORAGE_Upload,
+		EBREQ_STORAGE_UploadS2S,
+		EBREQ_STORAGE_UploadZip,
+		EBREQ_STORAGE_UploadZipS2S,
+		EBREQ_STORAGE_Limits,
+		EBREQ_STORAGE_LimitsS2S,
+		// feedback request <> response
+//		#if ONLINE_SLACKAPI
+		EBREQ_SLACKAPI_PostMessage,
+//		#endif*/
+	};	
+	
+	//! Credential parameters
+	enum EBackendCredentials
+	{
+		EBCRED_NAME,
+		EBCRED_PWD,
+		EBCRED_BASEURI,
+	};
+
+
+// -------------------------------------------------------------------------
+// Callback interface for backend - must exist for the duration of request!
+class BackendCallback : Managed
+{
+	/**
+	\brief Called when data were recieved, you can ignore it when using callback to JsonStruct object with expand feature
+	\param data Contain received data, may be JSON, plain text, XML or image
+	\param size 
+	*/
+	void OnDataReceive( string data, int size )
+	{
+		Print("[BackendCallback] Data received, size=" + size);
+		Print(data);
+	}
+
+	/**
+	\brief Request finished with error result
+	\param code Error code is type of EBackendError
+	*/
+	void OnError( int code )
+	{
+		Print("[BackendCallback] OnError: " + GetBackendApi().GetErrorCode(code));
+	}
+
+	/**
+	\brief Request finished with success result
+	\param code Code is type of EBackendRequest
+	*/
+	void OnSuccess( int code )
+	{
+		Print("[BackendCallback] OnSuccess()");
+	}
+
+	/**
+	\brief Request not finished due to timeout
+	*/
+	void OnTimeout()
+	{
+		Print("[BackendCallback] OnTimeout");
+	}
+
+};
+
+
+// -------------------------------------------------------------------------
+// Backend API access
+class BackendApi
+{
+	private void BackendApi() {}
+	private void ~BackendApi() {}
+	
+	/**
+	\brief Initiate backend - request processing
+	*/
+	proto native bool Initiate();
+	/**
+	\brief Shutdown backend - request processing
+	*/
+	proto native bool Shutdown();
+
+
+	/**
+	\brief Backend offline - authentication may be initiated
+	*/
+	proto native bool IsDisconnected();
+	/**
+	\brief Backend fully working and initialized
+	*/
+	proto native bool IsRuntime();
+	/**
+	\brief Backend is busy - authentication in process
+	*/
+	proto native bool IsBusy();
+	
+	
+	//! Error code to string
+	string GetErrorCode( int code )
+	{
+		string result;
+	
+		if ( code == EBackendError.EBERR_OK )
+			result = "OK";
+		else if ( code == EBackendError.EBERR_UNKNOWN )
+			result = "Offline";
+		else if ( code == EBackendError.EBERR_DISABLED )
+			result = "Communication Disabled";
+		else if ( code == EBackendError.EBERR_INVALID_STATE )
+			result = "Cannot be called from current state";
+		else if ( code == EBackendError.EBERR_BUSY )
+			result = "Busy processing requests";
+		else if ( code == EBackendError.EBERR_ALREADY_OFFLINE )
+			result = "Already disconnected";
+		else if ( code == EBackendError.EBERR_ALREADY_ONLINE )
+			result = "Already connected";
+		else if ( code == EBackendError.EBERR_LOGIN_FAILED )
+			result = "Failed to logon";
+		else if ( code == EBackendError.EBERR_AUTH_FAILED )
+			result = "Failed to Authenticate";
+		else
+			result = "*";
+			
+		return result;
+	}
+	
+	/**
+	\brief Called when initiate cannot be called
+	*/
+	void OnCannotInitiate( int code )
+	{
+		Print("!!! [Backend] Cannot Initiate: "+ GetErrorCode(code));
+	}
+	
+	/**
+	\brief Called when shutdown cannot be proceeded
+	*/
+	void OnCannotShutdown( int code )
+	{
+		Print("!!! [Backend] Cannot Shutdown: "+ GetErrorCode(code));
+	}
+
+	/**
+	\brief Called when step was successfully proceeded
+	*/
+	void OnSuccess( string step )
+	{
+		Print( "[Backend] Successfully Solicited: " + step );
+	}
+	
+	/**
+	\brief Called when step failed
+	*/
+	void OnFail( string step )
+	{
+		Print( "[Backend] Failed to Proceed: " + step );
+	}
+
+	/**
+	\brief Ask specific request with callback result
+	\param request Is type of request, which is EBackendRequest
+	\param cb Is script callback where you will recieve result/ error or even data when request finsihes
+	\param data Is optional callback when request uses or response return Json data and you want to work with object
+	*/
+	proto native void Request( int request, BackendCallback cb, JsonApiStruct dataObject );
+
+	/**
+	\brief Ask player request with callback result from controller (Lobby)
+	\param request Is type of request, which is EBackendRequest
+	\param cb Is script callback where you will recieve result/ error or even data when request finsihes
+	\param data Is optional callback when request uses or response return Json data and you want to work with object
+	\param iPlayerId Is Player Id used on player identity
+	*/
+	proto native void PlayerRequest( int request, BackendCallback cb, JsonApiStruct dataObject, int iPlayerId );
+
+	/**
+	\brief Send feedback message and/ or script object with whatever data on it (additionally it is possible to handle callback as well)
+	\param cb Is script callback where you will recieve result/ error or even data when request finsihes
+	\param data Is optional callback when request uses or response return Json data and you want to work with object
+	\param message Is custom
+	*/
+	proto native void FeedbackMessage( BackendCallback cb, JsonApiStruct dataObject, string message );
+
+	/**
+	\brief Set credentials value per item
+	\param item Is type of EBackendCredentials parameter you want to set
+	\param str Is value itself
+	*/
+	proto native void SetCredentialsItem( EBackendCredentials item, string str );
+
+	/**
+	\brief Get credentials value per item
+	\param item Is type of EBackendCredentials parameter you want to read
+	*/
+	proto native string GetCredentialsItem( EBackendCredentials item );
+
+	/**
+	\brief Invoke credentials update (authenticate with new name+password)
+	*/
+	proto native void VerifyCredentials();
+
+};
+
+
+proto native BackendApi GetBackendApi();
+
+// -------------------------------------------------------------------------
diff --git a/scripts/3_Game/DayZ/Http/JsonApi.c b/scripts/3_Game/DayZ/Http/JsonApi.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8675e9a17b2ff1d242670e39947b92e05709b79
--- /dev/null
+++ b/scripts/3_Game/DayZ/Http/JsonApi.c
@@ -0,0 +1,86 @@
+
+/** @file */
+
+// -------------------------------------------------------------------------
+// error codes for handle processing
+// defined in C++
+enum EJsonApiError
+{
+	ETJSON_UNKNOWN,			// invalid code
+
+	ETJSON_OK,				// all fine
+	ETJSON_COMMSEND,		// error during send
+	ETJSON_COMMRECV,		// error during receive
+	ETJSON_PARSERERROR,		// error during parsing
+	ETJSON_PACKNOSTART,		// error - cannot start packing (invalid state)
+	ETJSON_TIMEOUT,			// failed to send/ store handle due to timeout
+	ETJSON_NOBUFFERS,		// not enough buffers available
+	ETJSON_FAILFILELOAD,	// failed to load file
+	ETJSON_FAILFILESAVE,	// failed to save file
+	ETJSON_NOTARRAY,		// object is not array (ie. attempt to provide different or none object as array)
+};
+
+
+// -------------------------------------------------------------------------
+// JsonApi Handle is container encapsulating real JSON data being sent or recieved via. RESTful/ other service
+class JsonApiHandle
+{
+	private void JsonApiHandle() {}
+	private void ~JsonApiHandle() {}
+	
+	/**
+	\brief Length of JSON
+	*/
+	proto native int Size();
+
+	/**
+	\brief Return as string
+	*/
+	proto native owned string AsString();
+
+	/**
+	\brief Invalidate handle and schedule removal
+	*/
+	proto native void Invalidate();
+
+};
+
+
+// -------------------------------------------------------------------------
+// parent class for handling JsonApi Struct objects
+//
+//
+class JsonApi
+{
+	private void JsonApi() {}
+	private void ~JsonApi() {}
+
+	/**
+	\brief Override number of concurrent buffers used (depending project requirements, DEFAULT = 16, MIN = 4)
+	*/
+	proto native void SetBuffers( int iBufferCount );
+
+	/**
+	\brief Actual number of total buffers active + free
+	*/
+	proto native int BufferCount();
+
+	/**
+	\brief Maximum number of buffers used at once!
+	*/
+	proto native int BufferMax();
+
+	/**
+	\brief List of all currently active handles
+	*/
+	proto native void DebugList();
+
+};
+
+
+// -------------------------------------------------------------------------
+// JsonApi access methods
+proto native JsonApi CreateJsonApi();
+proto native void DestroyJsonApi();
+proto native JsonApi GetJsonApi();
+
diff --git a/scripts/3_Game/DayZ/Http/JsonApiStruct.c b/scripts/3_Game/DayZ/Http/JsonApiStruct.c
new file mode 100644
index 0000000000000000000000000000000000000000..fa73dd23fdc67a3e3824dad374c0356ba6ffc37f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Http/JsonApiStruct.c
@@ -0,0 +1,303 @@
+
+/** @file */
+
+// -------------------------------------------------------------------------
+// object which allow to parse upon generic JSON structure and format it back
+//
+//
+class JsonApiStruct : Managed
+{
+
+	void JsonApiStruct()
+	{
+	}
+
+	void ~JsonApiStruct()
+	{
+	}
+
+	/**
+	\brief Event when expand (unpack) process starts
+	*/
+	void OnExpand()
+	{
+	}
+
+	/**
+	\brief Event when pack starts - you will pack your stuff here
+	*/
+	void OnPack()
+	{
+		Print( "OnPack() ");
+	}
+
+	/**
+	\brief Verification event after successfull JSON packing
+	*/
+	void OnBufferReady()
+	{
+	}
+
+	/**
+	\brief Event called when pending store operation is finished - callback from JsonApiHandle before handle release
+	*/
+	void OnSuccess( int errorCode )
+	{
+		// errorCode is EJsonApiError
+	}
+
+	/**
+	\brief Event called when pending store operation is finished - callback from JsonApiHandle before handle release
+	*/
+	void OnError( int errorCode )
+	{
+		// errorCode is EJsonApiError
+	}
+	
+	/**
+	\brief Called when parsing object
+	*/
+	void OnObject( string name )
+	{
+		Print( "OnObject: " + name );
+	}
+
+	/**
+	\brief Called when parsing integer value
+	*/
+	void OnInteger( string name, int value )
+	{
+		Print( "OnInteger: " + value );
+	}
+
+	/**
+	\brief Called when parsing float value
+	*/
+	void OnFloat( string name, float value )
+	{
+		Print( "OnFloat: " + value );
+	}
+
+	/**
+	\brief Called when parsing boolean value
+	*/
+	void OnBoolean( string name, bool value )
+	{
+		Print( "OnBoolean: " + value );
+	}
+
+	/**
+	\brief Called when parsing string value
+	*/
+	void OnString( string name, string value )
+	{
+		Print( "OnString: " + value );
+	}
+	
+	/**
+	\brief Called when parsing vector value
+	*/
+	void OnVector( string name, vector value )
+	{
+		Print( "OnVector: " + value );
+	}
+	
+	/**
+	\brief Called when parsing array
+	*/
+	void OnStartArray( string name )
+	{
+		Print( "OnStartArray: " + name );
+	}
+
+	/**
+	\brief Called when array end, returns count of items
+	*/
+	void OnEndArray( int itemCount )
+	{
+		Print( "OnEndArray: " + itemCount );
+	}
+
+	/**
+	\brief Called when parsing object
+	*/
+	void OnItemObject( int index, string name )
+	{
+		Print( "OnItemObject: " + name );
+	}
+
+	/**
+	\brief Called when parsing integer value
+	*/
+	void OnItemInteger( int index, int value )
+	{
+		Print( "OnItemInteger: " + value );
+	}
+
+	/**
+	\brief Called when parsing float value
+	*/
+	void OnItemFloat( int index, float value )
+	{
+		Print( "OnItemFloat: " + value );
+	}
+
+	/**
+	\brief Called when parsing boolean value
+	*/
+	void OnItemBoolean( int index, bool value )
+	{
+		Print( "OnItemBoolean: " + value );
+	}
+
+	/**
+	\brief Called when parsing string value from array
+	*/
+	void OnItemString( int index, string value )
+	{
+		Print( "OnItemString: " + value );
+	}
+	
+	/**
+	\brief Called when parsing vector value from array
+	*/
+	void OnItemVector( int index, vector value )
+	{
+		Print( "OnItemVector: " + value );
+	}
+	
+	/**
+	\brief Register script variable for auto-feature
+	*/
+	proto native void RegV( string name );
+
+	/**
+	\brief Push object to parse (only during parse operation)
+	*/
+	proto native void Push( JsonApiStruct obj );	
+	
+	/**
+	\brief Start object at hierarchy - !!! Be cautious and doublecheck results when using this !!!
+	*/
+	proto native void StartObject( string name );
+
+	/**
+	\brief End object at hierarchy - !!! Be cautious and doublecheck results when using this !!!
+	*/
+	proto native void EndObject();
+
+	/**
+	\brief Add scripted object to hierarchy (calls through hierarchy)
+	*/
+	proto native void StoreObject( string name, JsonApiStruct obj );
+	
+	/**
+	\brief Add float value to hierarchy
+	*/
+	proto native void StoreFloat( string name, float value );
+	
+	/**
+	\brief Add integer value to hierarchy
+	*/
+	proto native void StoreInteger( string name, int value );
+	
+	/**
+	\brief Add boolean value to hierarchy
+	*/
+	proto native void StoreBoolean( string name, bool value );
+
+	/**
+	\brief Add string value to hierarchy
+	*/
+	proto native void StoreString( string name, string value );
+	
+	/**
+	\brief Add vector value to hierarchy
+	*/
+	proto native void StoreVector( string name, vector value );
+	
+	/**
+	\brief Start array at hierarchy - !!! Be cautious and doublecheck results when using this !!!
+	*/
+	proto native void StartArray( string name );
+
+	/**
+	\brief End array at hierarchy - !!! Be cautious and doublecheck results when using this !!!
+	*/
+	proto native void EndArray();
+	
+	/**
+	\brief Add scripted unnamed/ array object
+	*/
+	proto native void ItemObject( JsonApiStruct obj );
+	
+	/**
+	\brief Add unnamed/ array float value
+	*/
+	proto native void ItemFloat( float value );
+	
+	/**
+	\brief Add unnamed/ array integer value
+	*/
+	proto native void ItemInteger( int value );
+	
+	/**
+	\brief Add unnamed/ array boolean value
+	*/
+	proto native void ItemBoolean( bool value );
+
+	/**
+	\brief Add unnamed/ array string value
+	*/
+	proto native void ItemString( string value );
+
+	/**
+	\brief Add unnamed/ array vector value
+	*/
+	proto native void ItemVector( vector value );
+
+	/**
+	\brief Call this when you've done packing or unpacking (interrupt operation)
+	*/
+	proto native void SetDone();
+
+	/**
+	\brief Call this when you've done packing or unpacking + want to generate error - prevent to send invalid data etc.
+	*/
+	proto native void SetFail();
+	
+	/**
+	\brief Start object packing - when it can be done (when sending remote etc.)
+	*/
+	proto native void Pack();
+
+	/**
+	\brief Start object packing now - for use at main thread only!
+	*/
+	proto native void InstantPack();
+
+	/**
+	\brief Start object unpacking from RAW string data
+	*/
+	proto native void ExpandFromRAW( string data );
+
+	/**
+	\brief Get packed JSON as string (!only if you called Pack() first, it may return null)
+	*/
+	proto native string AsString();
+
+	/**
+	\brief Pack() and save JSON to file
+	*/
+	proto native bool PackToFile( string FileName );
+	/**
+	\brief Save JSON to file (only If something was loaded or recieved previously!)
+	*/
+	proto native bool SaveToFile( string FileName );
+	/**
+	\brief Load JSON from file and Expand
+	*/
+	proto native bool LoadFromFile( string FileName );
+
+};
+
diff --git a/scripts/3_Game/DayZ/Http/RestApi.c b/scripts/3_Game/DayZ/Http/RestApi.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c991e9be3ffc4d3a133e2e67df8df519e63b5a2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Http/RestApi.c
@@ -0,0 +1,184 @@
+
+/** @file */
+
+
+// -------------------------------------------------------------------------
+// states, (result + error) codes
+// defined in C++
+enum ERestResultState
+{
+	EREST_EMPTY,				// not initialized
+	EREST_PENDING,				// awaiting processing
+	EREST_FEEDING,				// awaiting incoming data
+	EREST_SUCCESS,				// result and/ or data are ready (success), awaiting data processing to be finished (no longer blocking queue processing)
+	EREST_PROCESSED,			// finished (either successfully or with failure) and eill be removed ASAP
+
+	EREST_ERROR,				// (state >= EREST_ERROR) == error happened
+	EREST_ERROR_CLIENTERROR,	//  (EREST_ERROR == EREST_ERROR_CLIENTERROR)
+	EREST_ERROR_SERVERERROR,
+	EREST_ERROR_APPERROR,
+	EREST_ERROR_TIMEOUT,
+	EREST_ERROR_NOTIMPLEMENTED,
+	EREST_ERROR_UNKNOWN,
+};
+
+// -------------------------------------------------------------------------
+// options
+// defined in C++
+enum ERestOption
+{
+	ERESTOPTION_UNKNOWN,					// invalid option
+
+	ERESTOPTION_READOPERATION,		// read operation timeout (default 10sec)
+	ERESTOPTION_CONNECTION,			// connection timeout (default 10sec)
+	// note: limit for timeout is between <3 .. 120> seconds, you cannot exceed this value
+};
+
+
+
+// -------------------------------------------------------------------------
+// object to be used from script for result binding
+//
+//	[Example:]
+//
+//		RestCallback cbx1 = new RestCallback;
+//		RestContext ctx = GetRestApi().GetRestContext("http://somethingsomewhere.com/path/");
+//		ctx.GET(cbx1,"RequestPath?Argument=Something");
+//
+//		Event are then called upon RestCallback()
+//
+class RestCallback : Managed
+{
+	/**
+	\brief Called in case request failed (ERestResultState) - Note! May be called multiple times in case of (RetryCount > 1)
+	*/
+	void OnError( int errorCode )
+	{
+		// override this with your implementation
+		Print(" !!! OnError() ");
+	};
+
+	/**
+	\brief Called in case request timed out or handled improperly (no error, no success, no data)
+	*/
+	void OnTimeout()
+	{
+		// override this with your implementation
+		Print(" !!! OnTimeout() ");
+	};
+
+	/**
+	\brief Called when data arrived and/ or response processed successfully
+	*/
+	void OnSuccess( string data, int dataSize )
+	{
+		// override this with your implementation
+		Print(" !!! OnSuccess() size=" + dataSize );
+		if( dataSize > 0 )
+			Print(data); // !!! NOTE: Print() will not output string longer than 1024b, check your dataSize !!!
+	};
+
+	/**
+	\brief Called when data arrived and/ or file created successfully
+	*/
+	void OnFileCreated( string fileName, int dataSize )
+	{
+		// override this with your implementation
+		Print(" !!! OnFileCreated() file=" + fileName + " size=" + dataSize );
+	};
+
+};
+
+
+// -------------------------------------------------------------------------
+// context API and request API
+class RestContext
+{
+	private void RestContext() {}
+	private void ~RestContext() {}
+	
+	/**
+	\brief Processes GET request and returns result (ERestResultState) and/ or data (timeout, error) when finished
+	*/
+	proto native int GET( RestCallback cb, string request );
+
+	/**
+	\brief Processes GET request and returns data immediately (thread blocking operation!)
+	*/
+	proto native string GET_now( string request );
+
+	/**
+	\brief Processes GET request and returns result (ERestResultState) and/ or stores data int specified file (timeout, error) when finished
+	*/
+	proto native int FILE( RestCallback cb, string request, string filename );
+
+	/**
+	\brief Processes GET request and returns result (ERestResultState) and/ stores data int specified file immediately (thread blocking operation!)
+	*/
+	proto native int FILE_now( string request, string filename );
+
+	/**
+	\brief Pushes POST request and returns result (ERestResultState) and/ or data (timeout, error) when finished
+	*/
+	proto native int POST( RestCallback cb, string request, string data );
+
+	/**
+	\brief Processes POST request and returns data immediately (thread blocking operation!)
+	*/
+	proto native string POST_now( string request, string data );
+
+	/**
+	\brief Clear all pending requests and buffers
+	*/
+	proto native void reset();
+
+	/**
+	\brief Set Content-Type header (string)
+	
+	default content type is "application/octet-stream"
+	but you can specify whatever you like, for example "application/json" "application/sql" "text/plain"
+	*/
+	proto native void SetHeader( string value );
+};
+
+
+// -------------------------------------------------------------------------
+// RestApi core for context create/ access + debug features
+class RestApi
+{
+	private void RestApi() {}
+	private void ~RestApi() {}
+
+	/**
+	\brief Get new or existing context for http comm GetRestContext("www.server915.com/interface/")
+	*/
+	proto native RestContext GetRestContext( string serverURL );
+	
+	/**
+	\brief Get count of registered contexes
+	*/
+	proto native int GetContextCount();
+
+	/**
+	\brief Enable debug output to console (disabled by default)
+	*/
+	proto native void EnableDebug( bool bEnable );
+
+	/**
+	\brief List of all currently active contexes and processed (pending) requests
+	*/
+	proto native void DebugList();
+
+	/**
+	\brief Set specific option (integer)
+	*/
+	proto native void SetOption( int option, int value );
+
+};
+
+// -------------------------------------------------------------------------
+// RestApi create/ access methods out of Hive initialization
+proto native RestApi CreateRestApi();
+proto native void DestroyRestApi();
+proto native RestApi GetRestApi();
+
diff --git a/scripts/3_Game/DayZ/ImpactEffects.c b/scripts/3_Game/DayZ/ImpactEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..badd6394b76217adda4b506e5bc4bf889a72d231
--- /dev/null
+++ b/scripts/3_Game/DayZ/ImpactEffects.c
@@ -0,0 +1,196 @@
+enum ImpactTypes
+{
+	UNKNOWN;
+	STOP;
+	PENETRATE;
+	RICOCHET;
+	MELEE;
+}
+
+class ImpactEffectsData
+{
+	Object 		m_DirectHit;
+	int			m_ImpactType;
+	int 		m_ComponentIndex;
+	bool		m_IsDeflected;
+	bool		m_IsWater;
+	string		m_Surface;
+	string		m_AmmoType;
+	vector 		m_InSpeed;
+	vector		m_OutSpeed;
+	vector 		m_Position;
+	vector		m_SurfaceNormal;
+	vector		m_ExitPosition;
+
+
+}
+
+class ImpactMaterials
+{
+	ref static map<string, typename> 	m_ImpactEffect;
+	static int 							m_LastRegisteredMaterial = 0;
+	
+	//! Map of ammo which will not spawn any impact effect
+	ref static map<string, int>			m_IgnoredAmmo;
+	static int 							m_LastRegisteredIgnoredAmmo = 0;
+	
+	/** \name  Surface effects
+	*	Register all hit materials here!
+	*	When modding, these can be unregistered with 'UnregisterSurface' if so desired
+	*/
+	//@{
+	static int PLASTIC	 					= RegisterSurface("Hit_Plastic");
+	static int SAND 						= RegisterSurface("Hit_Sand");
+	static int TEXTILE 						= RegisterSurface("Hit_Textile");
+	static int CONCRETE 					= RegisterSurface("Hit_Concrete");
+	static int GRAVEL 						= RegisterSurface("Hit_Gravel");
+	static int DIRT 						= RegisterSurface("Hit_Dirt");
+	static int FOLIAGE 						= RegisterSurface("Hit_Foliage");
+	static int GRASS 						= RegisterSurface("Hit_Grass");
+	static int WOOD 						= RegisterSurface("Hit_Wood");
+	static int METAL 						= RegisterSurface("Hit_Metal");
+	static int GLASS 						= RegisterSurface("Hit_Glass");
+	static int GLASS_THIN 					= RegisterSurface("Hit_Glass_Thin");
+	static int WATER 						= RegisterSurface("Hit_Water");
+	static int RUBBER 						= RegisterSurface("Hit_Rubber");
+	static int PLASTER 						= RegisterSurface("Hit_Plaster");
+	static int MEATBONES					= RegisterSurface("Hit_MeatBones");
+	static int MEATBONES_SHOVEL				= RegisterSurface("Hit_MeatBones_MeleeShovel");
+	static int MEATBONES_PIPEWRENCH			= RegisterSurface("Hit_MeatBones_MeleePipeWrench");
+	static int MEATBONES_WRENCH				= RegisterSurface("Hit_MeatBones_MeleeWrench");
+	static int MEATBONES_FIST				= RegisterSurface("Hit_MeatBones_MeleeFist");
+	static int UNDEFINED 					= RegisterSurface("Hit_Undefined");
+	static int ERROR_NO_MATERIAL			= RegisterSurface("Hit_ErrorNoMaterial");
+	//@}
+	
+	/** \name  Ignored ammo
+	*	Register ammo which will not spawn impact effects here
+	*	When modding, these can be unregistered with 'UnregisterIgnoredAmmo' if so desired
+	*/
+	//@{
+	static int FIST							= RegisterIgnoredAmmo("MeleeFist");
+	static int FIST_HEAVY					= RegisterIgnoredAmmo("MeleeFist_Heavy");
+	static int SOFT							= RegisterIgnoredAmmo("MeleeSoft");
+	static int SOFT_HEAVY					= RegisterIgnoredAmmo("MeleeSoft_Heavy");
+	static int DUMMY						= RegisterIgnoredAmmo("Dummy_Light");
+	static int DUMMY_HEAVY					= RegisterIgnoredAmmo("Dummy_Heavy");
+	//@}
+	
+	static int RegisterSurface(string surface)
+	{
+		if (!m_ImpactEffect)
+			m_ImpactEffect = new map<string, typename>;
+		
+		m_ImpactEffect.Insert(surface, surface.ToType());
+		 
+		return ++m_LastRegisteredMaterial;
+	}
+	
+	static bool UnregisterSurface(string surface)
+	{
+		if (m_ImpactEffect)
+		{
+			m_ImpactEffect.Remove(surface);
+			return !m_ImpactEffect.Contains(surface);
+		}
+		
+		return false;
+	}
+	
+	static int RegisterIgnoredAmmo(string ammo)
+	{
+		if (!m_IgnoredAmmo)
+			m_IgnoredAmmo = new map<string, int>;
+		
+		++m_LastRegisteredIgnoredAmmo;
+		
+		m_IgnoredAmmo.Insert(ammo, m_LastRegisteredIgnoredAmmo);
+		 
+		return m_LastRegisteredIgnoredAmmo;
+	}
+	
+	static bool UnregisterIgnoredAmmo(string ammo)
+	{
+		if (m_IgnoredAmmo)
+		{
+			m_IgnoredAmmo.Remove(ammo);
+			return !m_IgnoredAmmo.Contains(ammo);
+		}
+		
+		return false;
+	}
+	
+	static typename GetImpactEffect(string surface, string ammoType)
+	{
+		string key = string.Format("%1_%2", surface, ammoType);
+		
+		typename eff_type = m_ImpactEffect[key];
+		
+		if (eff_type)
+			return eff_type;
+		else
+			return m_ImpactEffect[surface];
+	}
+	
+	static void EvaluateImpactEffectEx(ImpactEffectsData pData)
+	{
+		EvaluateImpactEffect(pData.m_DirectHit, pData.m_ComponentIndex, pData.m_Surface, pData.m_Position, pData.m_ImpactType, pData.m_SurfaceNormal, pData.m_ExitPosition, pData.m_InSpeed, pData.m_OutSpeed, pData.m_IsDeflected, pData.m_AmmoType, pData.m_IsWater);
+	}
+	
+	static void EvaluateImpactEffect(Object directHit, int componentIndex, string surface, vector pos, int impact_type, vector surfNormal, vector exitPos, vector inSpeed, vector outSpeed, bool deflected, string ammoType, bool isWater)
+	{
+		// No impact effects wanted for this ammo
+		if (m_IgnoredAmmo.Contains(ammoType))
+			return;
+		
+		if (impact_type == ImpactTypes.UNKNOWN)
+			impact_type = ImpactTypes.STOP;
+		
+		if (deflected)
+			impact_type = ImpactTypes.RICOCHET;
+		else if (outSpeed)
+			impact_type = ImpactTypes.PENETRATE;
+		
+		if (isWater)
+			surface = "Hit_Water";
+		
+		EffBulletImpactBase eff = EffBulletImpactBase.Cast(GetImpactEffect(surface, ammoType).Spawn());
+		
+		if ( !eff && surface == "" ) // handle undefined surface
+		{
+			eff = EffBulletImpactBase.Cast( surface.ToType().Spawn() );
+			
+			if (eff)
+			{
+				RegisterSurface(surface);
+				ErrorEx(string.Format("Unregistered surface for bullet impact effect (%1). Register this surface in ImpactMaterials (Script) for better performance.", surface), ErrorExSeverity.WARNING);
+			}
+			else
+			{
+				if (directHit)
+				{
+					string object_type = directHit.GetType();
+					
+					if ( object_type == "" )
+						object_type = "OBJECT_WITHOUT_CONFIG_CLASS";
+
+					ErrorEx(string.Format("Object '%1' with model file: %2 has undefined 'Hit_...' material! Cannot play impact effect.", object_type, directHit.GetShapeName()));
+					eff = EffBulletImpactBase.Cast(GetImpactEffect("Hit_ErrorNoMaterial", ammoType).Spawn());
+				}
+			}
+		}
+		
+		if ( !eff && surface != "" )
+		{
+			ErrorEx(string.Format("Unregistered surface impact material <%1>! Register this surface in ImpactMaterials (Script).", surface));
+			eff = EffBulletImpactBase.Cast(GetImpactEffect("Hit_Undefined", ammoType).Spawn());
+		}
+		
+		if (eff)
+		{
+			eff.EvaluateEffect(directHit, componentIndex, pos, impact_type, surfNormal, exitPos, inSpeed, outSpeed, ammoType);
+			eff.SetAutodestroy(true);
+			SEffectManager.PlayInWorld(eff, pos);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/InputAPI/UAInput.c b/scripts/3_Game/DayZ/InputAPI/UAInput.c
new file mode 100644
index 0000000000000000000000000000000000000000..71d358fd86c64fdaefb4132efe87ab73fd2106c2
--- /dev/null
+++ b/scripts/3_Game/DayZ/InputAPI/UAInput.c
@@ -0,0 +1,238 @@
+
+/** @file */
+
+
+// constants for device (binding device) type determine:
+//
+//	EUAINPUT_DEVICE_KEYBOARD
+//	EUAINPUT_DEVICE_MOUSE
+//	EUAINPUT_DEVICE_KEYBOARDMOUSE
+//	EUAINPUT_DEVICE_CONTROLLER
+//	EUAINPUT_DEVICE_IR
+
+// -------------------------------------------------------------------------
+class UAIDWrapper
+{
+	private void UAIDWrapper() {}
+	private void ~UAIDWrapper() {}
+	
+	proto native UAInput InputP();			// get input pointer
+};
+
+// -------------------------------------------------------------------------
+class UAInput
+{
+	proto native int ID();			// return input index
+	proto native int NameHash();	// return input hash
+
+	proto native int BindingCount();	// return binding count
+	proto native int Binding( int iIndex );	// return binding at index
+
+	proto native void ClearBinding();	// remove all bindings
+
+	proto native void BindCombo( string sButtonName );		// bind combo to this input by name (single/ or append to existing button)
+	proto native void BindComboByHash( int iHash );			// bind combo to this input by hash (single/ or append to existing button)
+
+	proto native void AddAlternative();						// add new alternative keybind
+	proto native void ClearAlternative( int iIndex );		// clear binding alternative by index
+	proto native void SelectAlternative( int iIndex );		// select binding alternative by index
+	proto native int AlternativeCount();					// get currently assigned alternative count
+	proto native int AlternativeIndex();					// get currently selected alternative index
+	proto native void ClearDeviceBind( int iDeviceFlags );	// clear binding for specific device(s)
+
+	proto native int BindKeyCount(); // binded key count (for selected alternative)
+	proto native int GetBindKey( int iIndex ); // binded "control" at index (for selected alternative)
+	proto native int GetBindDevice( int iIndex ); // binded "control" device type at index (for selected alternative)
+	proto native bool CheckBindDevice( int iIndex, int iDeviceFlags ); // compare binded device "control" type :: EUAINPUT_DEVICE_KEYBOARD for example
+
+	proto native float LocalValue();
+
+	proto native bool LocalPress();
+	proto native bool LocalRelease();
+	proto native bool LocalHold();
+	proto native bool LocalHoldBegin();
+	proto native bool LocalDoubleClick();
+	proto native bool LocalClick();
+
+	proto native bool IsCombo();	// return true if there is currently combo bind - use Binding() result !!!
+
+	// normal state is there are no limits, input generates all the events
+	// but if there is an limiter, 
+	proto native bool IsLimited();	// return true if there is an event limit
+
+	proto native bool IsLimitConditionActive();	// return true if event limits matches current control item activity
+
+	proto native bool IsPressLimit();		// if limited to PRESS
+	proto native bool IsReleaseLimit();		// if limited to RELEASE
+	proto native bool IsHoldLimit();		// if limited to HOLD
+	proto native bool IsHoldBeginLimit();	// if limited to HOLDBEGIN
+	proto native bool IsClickLimit();		// if limited to SINGLE CLICK
+	proto native bool IsDoubleClickLimit();	// if limited to DOUBLE CLICK
+
+	proto native bool HasSorting( int iIndex );		// has sorting group index?
+
+	proto native void Supress();			// supress press event for next frame (while not pressed ATM - otherwise until release)
+
+	proto native bool IsLocked();			// determine if locked (not active ATM)
+	proto native void Lock();				// lock (until unlock called or exclusion is selected)
+	proto native void Unlock();				// unlock exclusively
+
+	proto native int ConflictCount();		// get number of conflicts with other inputs
+
+	proto native void ForceEnable( bool bEnable );	// force enable on/ off
+	proto native void ForceDisable( bool bEnable );	// force disable on/ off
+
+	proto native void Backlit_Override( int eType, int iColor ); // enable/ disable backlit of associated controls (EUABACKLIT_*)
+	proto native bool Backlit_Enabled(); // check whether associated controls are backlit
+
+	proto native UAIDWrapper GetPersistentWrapper(); // create persistent object for input access
+
+	private void UAInput();
+	private void ~UAInput();
+};
+
+// -------------------------------------------------------------------------
+class UAInterface
+{
+	private void UAInterface() {}
+	private void ~UAInterface() {}
+	
+	// getting action state
+	/**
+	\brief Get action state
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return actual action state as float, for regular two state buttons returns 0 or 1, for analog buttons/axes returns value in interval <0, 1> with consideration of defined deadzones
+	@see SyncedValue()
+	*/
+	proto native float	SyncedValue_ID(int action, bool check_focus = true);
+	proto native float	SyncedValue(string action, bool check_focus = true);
+		
+	/**  
+	\brief Returns true just in frame, when action was invoked (button was pressed)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was invoked in that frame, false otherwise
+	@see SyncedPress()
+	*/
+	proto native bool	SyncedPress_ID(int action, bool check_focus = true);
+	proto native bool	SyncedPress(string action, bool check_focus = true);
+	
+	/**  
+	\brief Returns true just in frame, when release action happened (button was released)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see SyncedRelease()
+	*/
+	proto native bool	SyncedRelease_ID(int action, bool check_focus = true);
+	proto native bool	SyncedRelease(string action, bool check_focus = true);
+
+	/**  
+	\brief Returns true just in frame, when hold action invoked (button is hold)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see SyncedHold()
+	*/
+	proto native bool	SyncedHold_ID(int action, bool check_focus = true);
+	proto native bool	SyncedHold(string action, bool check_focus = true);
+
+	/**  
+	\brief Returns true just in frame, when double click action invoked (button double clicked)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see SyncedDbl()
+	*/
+	proto native bool	SyncedDbl_ID(int action, bool check_focus = true);
+	proto native bool	SyncedDbl(string action, bool check_focus = true);
+	
+	/**  
+	\brief Returns true just in frame, when single click action invoked (button pressed and released before hold timer)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see SyncedClick()
+	*/
+	proto native bool	SyncedClick_ID(int action, bool check_focus = true);
+	proto native bool	SyncedClick(string action, bool check_focus = true);
+	
+};
+
+// -------------------------------------------------------------------------
+class UAInputAPI
+{
+	private void UAInputAPI() {}
+	private void ~UAInputAPI() {}
+	
+	proto native void ListCurrentProfile();
+	proto native void ListCurrentPreset();
+	proto native void ListAvailableButtons();
+	proto native void ListActiveGroup();
+
+	proto native void GetActiveInputs( out TIntArray items ); //! returns list of all bindable (i.e. visible) inputs from the active group ('core' by default)
+
+	proto native UAInput GetInputByID( int iID );
+	proto native UAInput GetInputByName( string sInputName );
+
+	proto native owned string GetButtonName( int iHash );	// get localized name for any button hash
+	proto native owned string GetButtonIcon( int iHash );	// get associated icon path for any button hash
+
+	proto native int ModificatorCount();	// modificator count
+	proto native owned string GetModificatorName( int index );	// modificator name
+	
+	// for options only mapping, do not call normally as it is not performance wise!
+	proto native int DeterminePressedButton();	// recently pressed key, mouse button or pad button (returns zero if nothing pressed)
+	proto native int DeterminedCount(); // all buttons (keys, etc.) pressed during determination test (call only when DeterminePressedButton() returned something !)
+	proto native int GetDetermined( int iIndex ); // total count of pressed buttons (call only when DeterminePressedButton() returned something !)
+
+	proto native UAInput RegisterInput( string sInputName, string sLoc, string sGroupName );
+	proto native void DeRegisterInput( string sInputName );
+
+	proto native void RegisterGroup( string sGroupName, string sLoc );
+	proto native void DeRegisterGroup( string sGroupName );
+
+	proto native void UpdateControls(); // call this on each change of exclusion
+	proto native void ActivateGroup( string sGroupName );
+	proto native void ActivateExclude( string sExcludeName );
+	proto native void ActivateContext( string sContextName );
+	proto native void ActivateModificator( string sModName );
+	proto native void DeactivateModificator( string sModName );
+
+	proto native void DeactivateContext();
+
+	proto native bool PresetCreateNew(); // create new dynamic preset from the selected one. False == cannot create new == too many presets (current max == 6)
+	proto native bool PresetDelete( int index ); // delete specific preset - (false == not deletable!)
+	proto native int PresetCurrent(); // determine index of current preset - (-1 == not selected)
+	proto native void PresetSelect( int index ); // select specific preset
+	/**  
+	\brief Resets current 'main' preset without reverting anything else ('softer' Revert)
+	\note Does not reset dynamic presets, since they don't have any real defaults in the core PBOs.
+	*/
+	proto native void PresetReset();
+	proto native int PresetCount(); // count of presets
+	proto native owned string PresetName( int index ); // name of selected preset
+
+	proto native int SortingCount(); // sorting group count
+	proto native owned string SortingName( int index );	// sorting group name (different from localization!)
+	proto native owned string SortingLocalization( int index );	// sorting group localized name
+
+	proto native void Export(); // export XML (user) configuration
+	proto native void Revert(); // revert XML (user) configuration - all of it and use default PBO content! Auto-exports afterward.
+	proto native void SaveInputPresetMiscData(); // saves preset index on consoles, where the regular XMLs are unavailable
+	proto native void SupressNextFrame( bool bForce); // supress inputs for nextframe (until key release - call this when leaving main menu and alike - to avoid button collision after character control returned)
+	
+	proto native void Backlit_None(); // turn off backlit
+	proto native void Backlit_Background( int eType, int iColor1, int iColor2 ); // start backlit
+	proto native void Backlit_Animation( string strName, float fLifeTime, int iColor1, int iColor2 ); // start backlit animation and after time limit -> continue with another one
+	proto native bool Backlit_Enabled(); // check whether backlit active
+	proto native void Backlit_KeyByHash( int uHash, int eLayer, int eType, int iColor ); // key directly (during keybinding process) (EUABACKLIT_*)
+	proto native void Backlit_KeyByName( string strName, int eLayer, int eType, int iColor ); // key directly (by name) (EUABACKLIT_*)
+	proto native void Backlit_Remove( int eLayer ); // turn off layer of backlit
+	proto native void Backlit_ForceUpdate(); // this forces update immediately - USE ONLY IN LOADING SEQUENCE !!!
+	proto native void Backlit_EmptyQueue(); // empty queue of animations - use if you want to play something immediately
+
+};
+
+proto native UAInputAPI GetUApi();
diff --git a/scripts/3_Game/DayZ/InventoryItemType.c b/scripts/3_Game/DayZ/InventoryItemType.c
new file mode 100644
index 0000000000000000000000000000000000000000..33623fbcc8dba13f7de707fba2d817b1556abf3b
--- /dev/null
+++ b/scripts/3_Game/DayZ/InventoryItemType.c
@@ -0,0 +1,63 @@
+class InventoryItemType
+{
+	ref array<ref AnimSoundEvent> m_animSoundEvents;
+
+	private void InventoryItemType()
+	{
+		LoadSoundEvents();
+	}
+	
+	private void ~InventoryItemType();
+	
+	void LoadSoundEvents()
+	{
+		string cfgPath = "CfgVehicles " + GetName() + " AnimEvents SoundWeapon";
+		
+		m_animSoundEvents = new array<ref AnimSoundEvent>;
+
+		int soundCount = GetGame().ConfigGetChildrenCount(cfgPath);
+		
+		if (soundCount <= 0)//try other path
+		{
+			cfgPath = "CfgWeapons " + GetName() + " AnimEvents SoundWeapon";
+			soundCount = GetGame().ConfigGetChildrenCount(cfgPath);
+		}
+		
+		if (soundCount <= 0)//try other path
+		{
+			cfgPath = "CfgMagazines " + GetName() + " AnimEvents SoundWeapon";
+			soundCount = GetGame().ConfigGetChildrenCount(cfgPath);
+		}
+		
+		if (soundCount <= 0)//try other path
+		{
+			cfgPath = "CfgAmmo " + GetName() + " AnimEvents SoundWeapon";
+			soundCount = GetGame().ConfigGetChildrenCount(cfgPath);
+		}
+		
+		for (int i = 0; i < soundCount; i++)
+		{
+			string soundName;
+			GetGame().ConfigGetChildName(cfgPath, i, soundName);			
+			string soundPath = cfgPath + " " + soundName + " ";
+			AnimSoundEvent soundEvent = new AnimSoundEvent(soundPath);
+			if (soundEvent.IsValid())
+				m_animSoundEvents.Insert(soundEvent);
+		}
+	}
+
+
+	AnimSoundEvent GetSoundEvent(int event_id)
+	{
+		foreach (AnimSoundEvent soundEvent : m_animSoundEvents)
+		{
+			if (soundEvent.m_iID == event_id)
+				return soundEvent;
+		}
+
+		return null;
+	}
+
+
+	proto native owned string GetName();
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/IsBoxCollidingGeometryProxyClasses.c b/scripts/3_Game/DayZ/IsBoxCollidingGeometryProxyClasses.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e9a938c7d0b5f9a6a15d5eeaa0bfd2aafd2e6f4
--- /dev/null
+++ b/scripts/3_Game/DayZ/IsBoxCollidingGeometryProxyClasses.c
@@ -0,0 +1,40 @@
+//! Class that holds parameters to feed into CGame.IsBoxCollidingGeometryProxy
+class BoxCollidingParams
+{
+	/**
+	\brief Set the parameters
+	    \param center \p vector Center of box
+		\param orientation \p vector Orientation of box
+		\param edgeLength \p vector EdgeLength of box
+		\param primaryType \p vector Primary geometry to check
+		\param secondaryType \p vector Secondary geometry to check (if no backup is needed, fill in the same as for primaryType)
+		\param fullComponentInfo \p vector When true gives information about every component and proxy in box, when false just the first component found
+	*/
+	proto native void SetParams(vector center, vector orientation, vector edgeLength, ObjIntersect primaryType, ObjIntersect secondaryType, bool fullComponentInfo);
+}
+
+//! ComponentInfo for BoxCollidingResult
+class ComponentInfo
+{
+	int component;			//!< Component index
+	vector componentMin; 	//!< Component min in world space
+	vector componentMax; 	//!< Component max in world space
+	vector componentCenter; //!< Component center in world space
+	float componentRadius; 	//!< Radius of bounding box
+}
+
+//! Result for an object found in CGame.IsBoxCollidingGeometryProxy
+class BoxCollidingResult
+{
+	Object obj;		//!< Object inside of box
+	Object parent; 	//!< Parent of proxy object
+	
+	int hierLevel; 	//!< How deep in the proxy hierarchy are we
+	int geomLevel; 	//!< What geometry was the object found in (will either be primaryType or secondaryType)
+	
+	ref ComponentInfoArray componentInfo; 	//!< Either the first component found or all of them depending on "fullComponentInfo"
+	ref ProxyInfoArray proxyInfo; 			//!< Either the first proxy found or all of them depending on "fullComponentInfo"
+}
+
+typedef array<ref ComponentInfo> ComponentInfoArray;
+typedef array<ref BoxCollidingResult> ProxyInfoArray;
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/KillerData.c b/scripts/3_Game/DayZ/KillerData.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce08e892f093a01c52ab28f343bed2cf29b12a9a
--- /dev/null
+++ b/scripts/3_Game/DayZ/KillerData.c
@@ -0,0 +1,6 @@
+class KillerData
+{
+	EntityAI 	m_Killer;
+	EntityAI 	m_MurderWeapon; //can be fists, so no ItemBase possible
+	bool 		m_KillerHiTheBrain;
+}
diff --git a/scripts/3_Game/DayZ/ModInfo.c b/scripts/3_Game/DayZ/ModInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..600fb5af7dae0dc9c217354076560a89c54de51b
--- /dev/null
+++ b/scripts/3_Game/DayZ/ModInfo.c
@@ -0,0 +1,23 @@
+class ModInfo
+{
+	proto owned string GetName();
+	proto owned string GetPicture();
+	proto owned string GetLogo();
+	proto owned string GetLogoSmall();
+	proto owned string GetLogoOver(); //hover-over logo variant
+	proto owned string GetTooltip();
+	proto owned string GetOverview(); //description
+	proto owned string GetAction();
+	proto owned string GetAuthor();
+	proto owned string GetVersion();
+	proto bool GetDefault();
+	proto bool GetIsDLC();
+	proto bool GetIsOwned();
+	proto void GoToStore();
+	
+	static const string DEFAULT_PICTURE = "Gui/textures/modlogo_default_co.edds";
+	static const string DEFAULT_LOGO = "Gui/textures/modlogo_default_co.edds";
+	static const string DEFAULT_LOGO_SMALL = "Gui/textures/modlogo_default_co.edds";
+	static const string DEFAULT_LOGO_OVER = "Gui/textures/modlogo_default_hover_co.edds";
+	static const string DEFAULT_OVERVIEW = "";
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Noise.c b/scripts/3_Game/DayZ/Noise.c
new file mode 100644
index 0000000000000000000000000000000000000000..964c3aff277f7a2df3e2bfb54738762b2643a0b0
--- /dev/null
+++ b/scripts/3_Game/DayZ/Noise.c
@@ -0,0 +1,23 @@
+class NoiseSystem
+{
+	private void NoiseSystem() {}
+	private void ~NoiseSystem() {}
+	
+	proto void AddNoise(EntityAI source_entity, NoiseParams noise_params, float external_strenght_multiplier = 1.0);
+	proto void AddNoisePos(EntityAI source_entity, vector pos, NoiseParams noise_params, float external_strenght_multiplier = 1.0);
+	
+	//! Will make a noise at that position which the AI will "see" for the duration of 'lifetime'
+	proto void AddNoiseTarget(vector pos, float lifetime, NoiseParams noise_params, float external_strength_multiplier = 1.0);
+}
+	
+class NoiseParams
+{	
+	void NoiseParams()
+	{
+		
+	}
+	
+	proto native void Load(string noise_name);
+	
+	proto native void LoadFromPath(string noise_path);
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/ObjectSpawner.c b/scripts/3_Game/DayZ/ObjectSpawner.c
new file mode 100644
index 0000000000000000000000000000000000000000..e5aaab21adbb93849e6a7496e22e3dab3d36d073
--- /dev/null
+++ b/scripts/3_Game/DayZ/ObjectSpawner.c
@@ -0,0 +1,137 @@
+class ObjectSpawnerHandler
+{
+	protected static const ref TStringArray VALID_PATHS = {"DZ\\plants","DZ\\plants_bliss","DZ\\rocks","DZ\\rocks_bliss","DZ/plants","DZ/plants_bliss","DZ/rocks","DZ/rocks_bliss"};
+	//---------------------------------------------------------------------------------------
+	static void SpawnObjects()
+	{
+		if (CfgGameplayHandler.GetObjectSpawnersArr() && CfgGameplayHandler.GetObjectSpawnersArr().Count() > 0)
+		{
+			TStringArray arr = CfgGameplayHandler.GetObjectSpawnersArr();
+			foreach (string spawnerFilePath: arr)
+			{
+				string path = "$mission:" + spawnerFilePath;
+
+				string errorMessage;
+				ObjectSpawnerJson spawner;
+				if (JsonFileLoader<ObjectSpawnerJson>.LoadFile(path, spawner, errorMessage))
+				{
+					foreach (ITEM_SpawnerObject o : spawner.Objects)
+						SpawnObject(o);
+				}
+				else
+					ErrorEx(errorMessage);
+			}
+		}
+	}
+	//---------------------------------------------------------------------------------------
+	static void SpawnObject(ITEM_SpawnerObject item)
+	{
+		Object object;
+		
+		float scale = item.scale;
+		if (scale == 0)
+			scale = 1;
+		
+		if (item.name.Contains("\\") || item.name.Contains("/"))
+		{
+			if (ValidatePath(item.name))
+				object = GetGame().CreateStaticObjectUsingP3D(item.name, vector.ArrayToVec(item.pos), vector.ArrayToVec(item.ypr),scale);
+		}
+		else
+		{
+			int flags = ECE_SETUP | ECE_UPDATEPATHGRAPH | ECE_CREATEPHYSICS | ECE_NOLIFETIME | ECE_DYNAMIC_PERSISTENCY;
+			
+			if (item.enableCEPersistency)
+			{
+				flags &= ~ECE_DYNAMIC_PERSISTENCY;
+				flags &= ~ECE_NOLIFETIME;
+			}
+			
+			object = GetGame().CreateObjectEx(item.name, vector.ArrayToVec(item.pos), flags, RF_IGNORE);
+			if (object)
+			{
+				object.SetOrientation( vector.ArrayToVec(item.ypr));
+				if (item.scale != 1)
+					object.SetScale(scale);
+			}
+		}
+		
+		if (!object)
+			PrintToRPT("Object spawner failed to spawn "+item.name);
+	}
+	//---------------------------------------------------------------------------------------
+	static void OnGameplayDataHandlerLoad()
+	{
+		SpawnObjects();
+		GetGame().GetWorld().ProcessMarkedObjectsForPathgraphUpdate();
+	}
+	
+	//---------------------------------------------------------------------------------------
+	static bool ValidatePath(string path)
+	{
+		foreach (string p: VALID_PATHS)
+		{
+			if (path.Contains(p))
+				return true;
+		}
+		return false;
+	}
+	//---------------------------------------------------------------------------------------
+};
+
+class ObjectSpawnerJson
+{
+	ref array<ref ITEM_SpawnerObject> Objects;
+};
+
+class ITEM_SpawnerObject
+{
+	string name;
+	float pos[3];
+	float ypr[3];
+	float scale;
+	bool enableCEPersistency;
+};
+
+
+//! Utility class that converts init.c format type of spawn commands to a json file, fill in the SpawnInit() with your data and call SpawnDataConverter.SpawnObjects() through script editor console, result is a json file
+class SpawnDataConverter
+{
+	static ref array<ref ITEM_SpawnerObject> Objects = new array<ref ITEM_SpawnerObject>;
+	static string m_Path = "$mission:myspawndata.json";
+	
+	static void SpawnObjects()
+	{
+		Objects.Clear();
+		SpawnInit();
+		ObjectSpawnerJson j = new ObjectSpawnerJson();
+		j.Objects = Objects;
+		
+		string errorMessage;
+		if (!JsonFileLoader<ObjectSpawnerJson>.SaveFile(m_Path, j, errorMessage))
+			ErrorEx(errorMessage);
+	}
+	
+	static void SpawnInit()
+	{
+		AddSpawnData("Land_Wall_Gate_FenR", "8406.501953 107.736824 12782.338867", "0.000000 0.000000 0.000000");
+		AddSpawnData("Land_Wall_Gate_FenR", "8410.501953 107.736824 12782.338867", "0.000000 0.000000 0.000000");
+		AddSpawnData("Land_Wall_Gate_FenR", "8416.501953 107.736824 12782.338867", "0.000000 0.000000 0.000000");
+		AddSpawnData("Land_Wall_Gate_FenR", "8422.501953 107.736824 12782.338867", "0.000000 0.000000 0.000000");
+	}
+	
+	static void AddSpawnData(string objectName, vector position, vector orientation)
+	{
+		ITEM_SpawnerObject obj = new ITEM_SpawnerObject();
+		obj.name = objectName;
+		obj.pos[0] = position[0];
+		obj.pos[1] = position[1];
+		obj.pos[2] = position[2];
+		
+		obj.ypr[0] = orientation[0];
+		obj.ypr[1] = orientation[1];
+		obj.ypr[2] = orientation[2];
+		
+		Objects.Insert(obj);		
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEDOF.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEDOF.c
new file mode 100644
index 0000000000000000000000000000000000000000..17ab98690e35edefaafe6491616060da6cde7a55
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEDOF.c
@@ -0,0 +1,73 @@
+//---------------------------------------------------------
+//Native exceptions - legacy methods for direct access to specific postprocesses. Each one is evaluated and handled separately, this just connects them to the system.
+
+//!DOF postprocess, does not directly use materials
+class PPEDOF: PPEClassBase
+{
+	//g_Game.OverrideDOF(bool enable, float focusDistance, float focusLength, float focusLengthNear, float blur, float focusDepthOffset);
+	static const int PARAM_ENABLE = 0;
+	static const int PARAM_FOCUS_DIST = 1;
+	static const int PARAM_FOCUS_LEN = 2;
+	static const int PARAM_FOCUS_LEN_NEAR = 3;
+	static const int PARAM_BLUR = 4;
+	static const int PARAM_FOCUS_DEPTH_OFFSET = 5;
+	
+	static const int L_0_ADS = 100;
+	static const int L_1_ADS = 100;
+	static const int L_2_ADS = 100;
+	static const int L_3_ADS = 100;
+	static const int L_4_ADS = 100;
+	static const int L_5_ADS = 100;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PPEExceptions.DOF;
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		 //no known max. 1000 used as max
+		RegisterParameterScalarBool(PARAM_ENABLE,"Enable",false);
+		
+		RegisterParameterScalarFloat(PARAM_FOCUS_DIST,"FocusDistance",2.0,0.0,1000.0); //2.0f used in code with null camera interpolation 
+		RegisterParameterScalarFloat(PARAM_FOCUS_LEN,"FocusLength",-1.0,-1.0,1000.0); //-1.0f used as code default
+		RegisterParameterScalarFloat(PARAM_FOCUS_LEN_NEAR,"FocusLengthNear",-1.0,-1.0,1000.0); //-1.0f used as code default
+		RegisterParameterScalarFloat(PARAM_BLUR,"Blur",1.0,0.0,1000.0); //1.0f used in code with null camera interpolation 
+		RegisterParameterScalarFloat(PARAM_FOCUS_DEPTH_OFFSET,"FocusDepthOffset",0.0,0.0,1000.0); //0.0f used as code default
+	}
+	
+	override void ApplyValueChanges()
+	{
+		if (m_UpdatedParameters.Count() > 0)
+		{
+			SetFinalParameterValue(-1); //unique handling
+		}
+		
+		m_UpdatedParameters.Clear();
+	}
+	
+	//! Overriden to handle the specific exception
+	override void SetFinalParameterValue(int parameter_idx)
+	{
+		Param enabled_par = GetParameterCommandData(PARAM_ENABLE).GetCurrentValues();
+		bool is_enabled = Param1<bool>.Cast(enabled_par).param1;
+		
+		if (is_enabled)
+		{
+			array<float> array_values = {-1.0};
+			
+			for (int i = 1; i < PARAM_FOCUS_DEPTH_OFFSET + 1; i++)
+			{
+				Param values = GetParameterCommandData(i).GetCurrentValues();
+				float value_var_float = Param1<float>.Cast(values).param1;
+				array_values.Insert(value_var_float);
+			}
+			
+			g_Game.OverrideDOF(true, array_values.Get(PARAM_FOCUS_DIST), array_values.Get(PARAM_FOCUS_LEN), array_values.Get(PARAM_FOCUS_LEN_NEAR), array_values.Get(PARAM_BLUR), array_values.Get(PARAM_FOCUS_DEPTH_OFFSET));
+		}
+		else
+		{
+			g_Game.OverrideDOF(false,0.0,0.0,0.0,0.0,1.0);
+		}
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEExposureNative.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEExposureNative.c
new file mode 100644
index 0000000000000000000000000000000000000000..a8480f3c39c4ba0b43995a99434c5319387c456b
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEExposureNative.c
@@ -0,0 +1,36 @@
+//---------------------------------------------------------
+//Native exceptions - legacy methods for direct access to specific postprocesses. Each one is evaluated and handled separately, this just connects them to the system.
+
+//!EV postprocess, does not directly use materials
+class PPEExposureNative: PPEClassBase
+{
+	//g_Game.SetEVValue
+	static const int PARAM_INTENSITY = 0;
+	
+	static const int L_0_NVG_OPTIC = 100;
+	static const int L_0_NVG_GOGGLES = 200;
+	static const int L_0_NVG_OFF = 300;
+	static const int L_0_FLASHBANG = 400;
+	static const int L_0_BURLAP = 500;
+	static const int L_0_DEATH = 1000;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PPEExceptions.EXPOSURE;
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",0.0,-100.0,100.0); //no real range, it seems. -100..100 used
+	}
+	
+	//! Overriden to handle the specific exception
+	override void SetFinalParameterValue(int parameter_idx)
+	{
+		Param values = GetParameterCommandData(parameter_idx).GetCurrentValues();
+		float value_var_float = Param1<float>.Cast(values).param1;
+		
+		g_Game.SetEVValue(value_var_float);
+		//DbgPrnt("PPEDebug | SetFinalParameterValue | PPEExposureNative | float val: " + value_var_float);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEEyeAccomodationNative.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEEyeAccomodationNative.c
new file mode 100644
index 0000000000000000000000000000000000000000..a235f232087c03e771becc3c91ebba5c0f13e070
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPEEyeAccomodationNative.c
@@ -0,0 +1,36 @@
+//---------------------------------------------------------
+//Native exceptions - legacy methods for direct access to specific postprocesses. Each one is evaluated and handled separately, this just connects them to the system.
+
+//!Eye Accomodation postprocess, does not directly use materials
+class PPEEyeAccomodationNative: PPEClassBase
+{
+	//g_Game.GetWorld().SetEyeAccom
+	static const int PARAM_INTENSITY = 0;
+	
+	static const int L_0_UNDERGROUND = 100;
+	static const int L_0_NVG_GENERIC = 300;
+	/*static const int L_0_NVG_OPTIC = 400;
+	static const int L_0_NVG_GOGGLES = 401;
+	static const int L_0_NVG_OFF = 402;*/
+	static const int L_0_BURLAP = 500;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PPEExceptions.EYEACCOM;
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",1.0,0.0,1000.0); //no known max. 1000 used as max
+	}
+	
+	//! Overriden to handle the specific exception
+	override void SetFinalParameterValue(int parameter_idx)
+	{
+		Param values = GetParameterCommandData(parameter_idx).GetCurrentValues();
+		float value_var_float = Param1<float>.Cast(values).param1;
+		
+		g_Game.GetWorld().SetEyeAccom(value_var_float);
+		//DbgPrnt("PPEDebug | SetFinalParameterValue | PPEEyeAccomodationNative | float val: " + value_var_float);
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPELightIntensityParamsNative.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPELightIntensityParamsNative.c
new file mode 100644
index 0000000000000000000000000000000000000000..212eb29f5398d89d6fad29a14e1718f5e54e2966
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/Exceptions/PPELightIntensityParamsNative.c
@@ -0,0 +1,53 @@
+//---------------------------------------------------------
+//Native exceptions - legacy methods for direct access to specific postprocesses. Each one is evaluated and handled separately, this just connects them to the system.
+
+//!g_Game.NightVissionLightParams, does not directly use materials. Controls light multiplication and filmgrain noise intensity (multiplier)
+class PPELightIntensityParamsNative: PPEClassBase
+{
+	//g_Game.SetEVValue
+	static const int PARAM_LIGHT_MULT = 0;
+	static const int PARAM_NOISE_MULT = 1;
+	
+	static const int L_0_NVG = 100;
+	static const int L_0_TOXIC_TINT = 200;
+	static const int L_1_NVG = 100;
+	static const int L_1_TOXIC_TINT = 200;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PPEExceptions.NVLIGHTPARAMS;
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_LIGHT_MULT,"lightIntensityMul",1.0,0.0,50.0); //some reasonable values
+		RegisterParameterScalarFloat(PARAM_NOISE_MULT,"noiseIntensity",0.0,0.0,50.0); //some reasonable values
+	}
+	
+	override void ApplyValueChanges()
+	{
+		if (m_UpdatedParameters.Count() > 0)
+		{
+			SetFinalParameterValue(-1); //unique handling
+		}
+		
+		m_UpdatedParameters.Clear();
+	}
+	
+	//! Overriden to handle the specific exception
+	override void SetFinalParameterValue(int parameter_idx)
+	{
+		array<float> array_values = new array<float>;
+		
+		for (int i = 0; i < PARAM_NOISE_MULT + 1; i++)
+		{
+			Param values = GetParameterCommandData(i).GetCurrentValues();
+			float value_var_float = Param1<float>.Cast(values).param1;
+			array_values.Insert(value_var_float);
+		}
+		
+		g_Game.NightVissionLightParams(array_values.Get(PARAM_LIGHT_MULT),array_values.Get(PARAM_NOISE_MULT));
+		
+		//DbgPrnt("PPEDebug | SetFinalParameterValue | PPELightIntensityParamsNative | float val: " + value_var_float);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEChromAber.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEChromAber.c
new file mode 100644
index 0000000000000000000000000000000000000000..b9ed90fa988a3c3390491295b57ec7265491a01b
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEChromAber.c
@@ -0,0 +1,25 @@
+//!ChromAber - PostProcessEffectType.ChromAber
+class PPEChromAber: PPEClassBase
+{
+	static const int PARAM_POWERX = 0;
+	static const int PARAM_POWERY = 1;
+	
+	static const int L_0_INTRO = 100;
+	static const int L_1_INTRO = 100;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.ChromAber;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/chromaber";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_POWERX,"PowerX",0.0,0.0,0.05);
+		RegisterParameterScalarFloat(PARAM_POWERY,"PowerY",0.0,0.0,0.05);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEColorGrading.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEColorGrading.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cfbf296a1e720bf17f105f2d9532101548f08ec
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEColorGrading.c
@@ -0,0 +1,21 @@
+//!ColorGrading - PostProcessEffectType.ColorGrading
+//TODO
+class PPEColorGrading: PPEClassBase
+{
+	//static const int PARAM_COLORTABLE = 0;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.ColorGrading;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/colorgrading";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		//RegisterParameterTexture(PARAM_COLORTABLE,"ColorTable","Graphics/Textures/postprocess/color_test.edds");
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEColors.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEColors.c
new file mode 100644
index 0000000000000000000000000000000000000000..09ea31cd34d44f1804af10744becddd0eff9d77e
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEColors.c
@@ -0,0 +1,35 @@
+//!Colors - PostProcessEffectType.Colors
+//TODO - 'ColorsEffect' type may be used differently in c++, no emat linked to it? Investigate.
+class PPEColors: PPEClassBase
+{
+	static const int PARAM_BRIGHTNESS = 0;
+	static const int PARAM_CONTRAST = 1;
+	static const int PARAM_OFFSET = 2;
+	static const int PARAM_OVERLAYFACTOR = 3;
+	static const int PARAM_OVERLAYCOLOR = 4;
+	static const int PARAM_SATURATION = 5;
+	static const int PARAM_COLORIZATIONCOLOR = 6;
+	static const int PARAM_DESATURATIONWEIGHTS = 7;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.Colors;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/colors";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_BRIGHTNESS,"Brightness",1,0,2);
+		RegisterParameterScalarFloat(PARAM_CONTRAST,"Contrast",1,0,2);
+		RegisterParameterScalarFloat(PARAM_OFFSET,"Offset",0,-1,1);
+		RegisterParameterScalarFloat(PARAM_OVERLAYFACTOR,"OverlayFactor",0,0,1);
+		RegisterParameterColor(PARAM_OVERLAYCOLOR,"OverlayColor",1,1,1,0);
+		RegisterParameterScalarFloatEx(PARAM_SATURATION,"Saturation",1,0,1,PPEMatClassParameterFloatSaturation);
+		RegisterParameterColorEx(PARAM_COLORIZATIONCOLOR,"ColorizationColor",1.0,1.0,1.0,0.0,PPEMatClassParameterColorColorization);
+		RegisterParameterVector(PARAM_DESATURATIONWEIGHTS,"DesaturationWeights",{0.299,0.587,0.114,0});
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEDepthOfField.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEDepthOfField.c
new file mode 100644
index 0000000000000000000000000000000000000000..9f9a1746d6039a62f7d6e185ee9095ca1f59cb1c
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEDepthOfField.c
@@ -0,0 +1,61 @@
+//!DepthOfField - PostProcessEffectType.DepthOfField
+//TODO - may be just a dummy, since CGame.OverrideDOF function handles script overrides?
+class PPEDepthOfField: PPEClassBase
+{
+	static const int PARAM_DOFLQ = 0;
+	static const int PARAM_FOCALDISTANCE = 1;
+	static const int PARAM_HYPERFOCAL = 2;
+	static const int PARAM_FOCALOFFSET = 3;
+	static const int PARAM_BLURFACTOR = 4;
+	static const int PARAM_SIMPLEDOF = 5;
+	static const int PARAM_SIMPLEHFNEAR = 6;
+	static const int PARAM_SIMPLEDOFSIZE = 7;
+	static const int PARAM_SIMPLEDOFGAUSS = 8;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.DepthOfField;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		string ret = "Graphics/Materials/postprocess/depthoffieldTest2";
+		/*
+		GameOptions m_Options = new GameOptions();
+		ListOptionsAccess loa = ListOptionsAccess.Cast( m_Options.GetOptionByType( AT_POSTPROCESS_EFFECTS ) );
+		
+		switch (loa.GetIndex())
+		{
+			case POSTPROCESS_OPTION_VALUE_LOW:
+				ret = "Graphics/Materials/postprocess/hbao_low";
+			break;
+			
+			case POSTPROCESS_OPTION_VALUE_MEDIUM:
+				ret = "Graphics/Materials/postprocess/hbao_medium";
+			break;
+			
+			case POSTPROCESS_OPTION_VALUE_HIGH:
+				ret = "Graphics/Materials/postprocess/hbao_high";
+			break;
+			
+			case POSTPROCESS_OPTION_VALUE_HIGHEST:
+				ret = "Graphics/Materials/postprocess/hbao_highest";
+			break;
+		}
+		*/
+		return ret;
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarBool(PARAM_DOFLQ,"DOFLowQuality",false);
+		RegisterParameterScalarFloat(PARAM_FOCALDISTANCE,"FocalDistance",0.1,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_HYPERFOCAL,"HyperFocal",0.85,0.1,100.0);
+		RegisterParameterScalarFloat(PARAM_FOCALOFFSET,"FocalOffset",0.0,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_BLURFACTOR,"BlurFactor",4.0,0.0,10.0);
+		RegisterParameterScalarBool(PARAM_SIMPLEDOF,"SimpleDOF",false);
+		RegisterParameterScalarFloat(PARAM_SIMPLEHFNEAR,"SimpleHyperFocalNear",0.7,0.1,100.0);
+		RegisterParameterScalarInt(PARAM_SIMPLEDOFSIZE,"SimpleDOFSize",2.0,1.0,4.0);
+		RegisterParameterScalarInt(PARAM_SIMPLEDOFGAUSS,"SimpleDOFGauss",1.0,0.0,4.0);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEDynamicBlur.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEDynamicBlur.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc075688ff0667cd9e756d617572efb353293f1d
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEDynamicBlur.c
@@ -0,0 +1,20 @@
+//!DynamicBlur - PostProcessEffectType.DynamicBlur
+class PPEDynamicBlur: PPEClassBase
+{
+	static const int PARAM_BLURRINESS = 0;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.DynamicBlur;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/dynamicblur";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_BLURRINESS,"Blurriness",20,0,30);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEFXAA.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEFXAA.c
new file mode 100644
index 0000000000000000000000000000000000000000..8e6ac815d9b0259502de273f377fb9cc2824e56c
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEFXAA.c
@@ -0,0 +1,20 @@
+//!FXAA - PostProcessEffectType.FXAA
+class PPEFXAA: PPEClassBase
+{
+	static const int PARAM_PRESET = 0;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.FXAA;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/fxaa";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarInt(PARAM_PRESET,"Preset",0,0,5);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEFilmGrain.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEFilmGrain.c
new file mode 100644
index 0000000000000000000000000000000000000000..2749fb02ff310b495aeb088a2949041850ed20c6
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEFilmGrain.c
@@ -0,0 +1,47 @@
+//!FilmGrain - PostProcessEffectType.FilmGrain
+/*!
+	Be advised, for this to take any effect, 'g_Game.NightVissionLightParams' needs to have non-zero 'noiseIntensity' parameter.
+	/note set by 'PPELightIntensityParamsNative.PARAM_NOISE_MULT' currently
+*/
+class PPEFilmGrain: PPEClassBase
+{
+	static const int PARAM_INTENSITY = 0;
+	static const int PARAM_SHARPNESS = 1;
+	static const int PARAM_GRAINSIZE = 2;
+	static const int PARAM_INTENSITYX0 = 3;
+	static const int PARAM_INTENSITYX1 = 4;
+	static const int PARAM_MONOCHROMATIC = 5;
+	static const int PARAM_SIMPLE = 6;
+	static const int PARAM_DISTORT = 7;
+	static const int PARAM_FREQUENCY = 8;
+	//static const int PARAM_NOISEMAP = 9;
+	
+	static const int L_1_NVG = 100;
+	static const int L_1_TOXIC_TINT = 200;
+	static const int L_2_NVG = 100;
+	static const int L_2_TOXIC_TINT = 200;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.FilmGrain;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/filmgrainNV"; //TODO - differentiate between filmgrainNV?
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",0.0,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_SHARPNESS,"Sharpness",2.35,0.0,20.0);
+		RegisterParameterScalarFloat(PARAM_GRAINSIZE,"GrainSize",2.75,1.0,9.0);
+		RegisterParameterScalarFloat(PARAM_INTENSITYX0,"IntensityX0",0.0,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_INTENSITYX1,"IntensityX1",0.0,0.0,1.0);
+		RegisterParameterScalarBool(PARAM_MONOCHROMATIC,"Monochromatic",true);
+		RegisterParameterScalarBool(PARAM_SIMPLE,"Simple",false);
+		RegisterParameterScalarBool(PARAM_DISTORT,"Distort",true);
+		RegisterParameterScalarFloat(PARAM_FREQUENCY,"Frequency",20.0,1.0,1000.0);
+		//RegisterParameterTexture(PARAM_NOISEMAP,"NoiseMap","{0B1C7AEDC4645C8A}System/textures/noise.edds");
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGaussFilter.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGaussFilter.c
new file mode 100644
index 0000000000000000000000000000000000000000..abb72874930879563cd9cab1d297c6de846d1767
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGaussFilter.c
@@ -0,0 +1,31 @@
+//!GaussFilter - PostProcessEffectType.GaussFilter
+class PPEGaussFilter: PPEClassBase
+{
+	static const int PARAM_INTENSITY = 0;
+	
+	static const int L_0_ADS = 100;
+	static const int L_0_SHOCK = 200;
+	static const int L_0_FEVER = 300;
+	static const int L_0_FLASHBANG = 400;
+	static const int L_0_INV = 500;
+	static const int L_0_MENU = 600;
+	static const int L_0_CONTROLS = 700;
+	static const int L_0_TUTORIALS = 800;
+	static const int L_0_SERVER_BROWSER = 900;
+	static const int L_0_DISCONNECT = 1000;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.GaussFilter;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/gauss";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",0.0,0.0,1.0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGlow.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGlow.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a6f9dafa1d5a9960b8b14c5a1e2dd69674d4b00
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGlow.c
@@ -0,0 +1,126 @@
+/*enum PPEGlow
+{
+	PARAM_VISIBLEPERCENT = 0,
+}*/
+
+//!Glow - PostProcessEffectType.Glow
+class PPEGlow: PPEClassBase
+{
+	static const int PARAM_VISIBLEPERCENT = 0;
+	static const int PARAM_TARGETBRIGHTNESS = 1;
+	static const int PARAM_SPEEDDARKTOBRIGHT = 2;
+	static const int PARAM_SPEEDBRIGHTTODARK = 3;
+	static const int PARAM_TONEMAPPING = 4;
+	static const int PARAM_HDR = 5;
+	static const int PARAM_FILMICSHOULDERSTRENGTH = 6;
+	static const int PARAM_FILMICLINEARSTRENGTH = 7;
+	static const int PARAM_FILMICLINEARANGLE = 8;
+	static const int PARAM_FILMICTOESTRENGTH = 9;
+	static const int PARAM_FILMICTOENUMERATOR = 10;
+	static const int PARAM_FILMICTOEDENUMERATOR = 11;
+	static const int PARAM_FILMICEXPOSUREBIAS = 12;
+	static const int PARAM_FILMICWHITEPOINT = 13;
+	static const int PARAM_BLOOMTHRESHOLD = 14;
+	static const int PARAM_BLOOMSTEEPNESS = 15;
+	static const int PARAM_BLOOMINTENSITY = 16;
+	static const int PARAM_BRIGHTNESS = 17;
+	static const int PARAM_CONTRAST = 18;
+	static const int PARAM_OFFSET = 19;
+	static const int PARAM_OVERLAYFACTOR = 20;
+	static const int PARAM_OVERLAYCOLOR = 21;
+	static const int PARAM_SATURATION = 22;
+	static const int PARAM_COLORIZATIONCOLOR = 23;
+	static const int PARAM_DESATURATIONWEIGHTS = 24;
+	static const int PARAM_VIGNETTE = 25;
+	static const int PARAM_VIGNETTECOLOR = 26;
+	static const int PARAM_LENSDISTORT = 27;
+	static const int PARAM_MAXCHROMABBERATION = 28;
+	static const int PARAM_LENSCENTERX = 29;
+	static const int PARAM_LENSCENTERY = 30;
+	
+	//layer info
+	static const int L_20_HIT = 100;
+	static const int L_20_FLASHBANG = 300;
+	static const int L_20_SHOCK = 500;
+	
+	static const int L_21_SHOCK = 100;
+	static const int L_21_HIT = 300;
+	static const int L_21_FLASHBANG = 500;
+	
+	static const int L_22_BLOODLOSS = 100;
+	
+	static const int L_23_GLASSES = 100;
+	static const int L_23_TOXIC_TINT = 200;
+	static const int L_23_NVG = 600;
+	
+	static const int L_25_MENU = 100;
+	static const int L_25_TUNNEL = 300;
+	static const int L_25_SHOCK = 500;
+	static const int L_25_UNCON = 700;
+	static const int L_25_BURLAP = 800;
+	
+	static const int L_26_MENU = 100;
+	static const int L_26_TUNNEL = 300;
+	static const int L_26_SHOCK = 500;
+	static const int L_26_UNCON = 700;
+	static const int L_26_BURLAP = 800;
+	
+	static const int L_27_ADS = 100;
+	
+	static const int L_28_ADS = 100;
+	
+	static const int L_29_ADS = 100;
+	
+	static const int L_30_ADS = 100;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.Glow;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/glow";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		//HDR
+		RegisterParameterScalarFloat(PARAM_VISIBLEPERCENT,"VisiblePercent",95,1,100);
+		RegisterParameterScalarFloat(PARAM_TARGETBRIGHTNESS,"TargetBrightness",0.3,0.01,1);
+		RegisterParameterScalarFloat(PARAM_SPEEDDARKTOBRIGHT,"SpeedDarkToBright",0.3,0.01,1);
+		RegisterParameterScalarFloat(PARAM_SPEEDBRIGHTTODARK,"SpeedBrightToDark",0.3,0.01,1);
+		RegisterParameterScalarInt(PARAM_TONEMAPPING,"ToneMapping",2,0,2);
+		RegisterParameterScalarBool(PARAM_HDR,"HDR",1);
+		//Filmic tonemapping
+		RegisterParameterScalarFloat(PARAM_FILMICSHOULDERSTRENGTH,"FilmicShoulderStrength",0.153,0,1);
+		RegisterParameterScalarFloat(PARAM_FILMICLINEARSTRENGTH,"FilmicLinearStrength",0.357,-1,1);
+		RegisterParameterScalarFloat(PARAM_FILMICLINEARANGLE,"FilmicLinearAngle",0.231,-1,1);
+		RegisterParameterScalarFloat(PARAM_FILMICTOESTRENGTH,"FilmicToeStrength",0.1573,0.001,3);
+		RegisterParameterScalarFloat(PARAM_FILMICTOENUMERATOR,"FilmicToeNumerator",0.011,-1,1);
+		RegisterParameterScalarFloat(PARAM_FILMICTOEDENUMERATOR,"FilmicToeDenumerator",3.75,0.1,20);
+		RegisterParameterScalarFloat(PARAM_FILMICEXPOSUREBIAS,"FilmicExposureBias",4.0,0.1,20);
+		RegisterParameterScalarFloat(PARAM_FILMICWHITEPOINT,"FilmicWhitePoint",1.5,0.1,20);
+		//Bloom
+		RegisterParameterScalarFloat(PARAM_BLOOMTHRESHOLD,"BloomThreshold",0.5,0,1);
+		RegisterParameterScalarFloat(PARAM_BLOOMSTEEPNESS,"BloomSteepness",1,0,10);
+		RegisterParameterScalarFloat(PARAM_BLOOMINTENSITY,"BloomIntensity",1,0,4);
+		//Color modificators
+			//color defines
+			RegisterParameterScalarFloat(PARAM_BRIGHTNESS,"Brightness",1,0,2);
+			RegisterParameterScalarFloat(PARAM_CONTRAST,"Contrast",1,0,2);
+			RegisterParameterScalarFloat(PARAM_OFFSET,"Offset",0,-1,1);
+			RegisterParameterScalarFloat(PARAM_OVERLAYFACTOR,"OverlayFactor",0,0,1);
+			RegisterParameterColor(PARAM_OVERLAYCOLOR,"OverlayColor",1,1,1,0);
+			RegisterParameterScalarFloatEx(PARAM_SATURATION,"Saturation",1,0,1,PPEMatClassParameterFloatSaturation);
+			RegisterParameterColorEx(PARAM_COLORIZATIONCOLOR,"ColorizationColor",1.0,1.0,1.0,0.0,PPEMatClassParameterColorColorization);
+			RegisterParameterVector(PARAM_DESATURATIONWEIGHTS,"DesaturationWeights",{0.299,0.587,0.114,0});
+		RegisterParameterScalarFloat(PARAM_VIGNETTE,"Vignette",0,0,2); //C++ maximum is set to 1.0 (Workbench), but the parameter can accept more. 2.0 is a reasonable value
+		RegisterParameterColor(PARAM_VIGNETTECOLOR,"VignetteColor",0,0,0,0);
+		//Distort
+		RegisterParameterScalarFloat(PARAM_LENSDISTORT,"LensDistort",0,-5,5);
+		RegisterParameterScalarFloat(PARAM_MAXCHROMABBERATION,"MaxChromAbberation",0,0,1);
+		RegisterParameterScalarFloat(PARAM_LENSCENTERX,"LensCenterX",0,-1,1);
+		RegisterParameterScalarFloat(PARAM_LENSCENTERY,"LensCenterY",0,-1,1);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGodRays.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGodRays.c
new file mode 100644
index 0000000000000000000000000000000000000000..9d39ded88d227c113a7a9163bc6bbe22769e4561
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEGodRays.c
@@ -0,0 +1,34 @@
+//!GodRays - PostProcessEffectType.GodRays
+class PPEGodRays: PPEClassBase
+{
+	static const int PARAM_INTENSITY = 0;
+	static const int PARAM_SUNVISIBLE = 1;
+	static const int PARAM_OVERBURNINTENSITY = 2;
+	static const int PARAM_OVERBURNSTART = 3;
+	static const int PARAM_OVERBURNEND = 4;
+	//static const int PARAM_SUNMASKMAT = 5; //Warning, not to be used until DECLARE_RESOURCE_NAME solution is implemented!
+	
+	static const int L_0_GLASSES = 100;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.GodRays;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/godrayssun";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",0.8,0,1);
+		RegisterParameterScalarFloat(PARAM_SUNVISIBLE,"SunVisible",1.0,0,1);
+		RegisterParameterScalarFloat(PARAM_OVERBURNINTENSITY,"OverBurnIntensity",0.25,0,1);
+		RegisterParameterScalarFloat(PARAM_OVERBURNSTART,"OverBurnStart",0.025,0,1);
+		RegisterParameterScalarFloat(PARAM_OVERBURNEND,"OverBurnEnd",0.175,0,1);
+		
+		//TODO
+		//SunMaskMat - DECLARE_RESOURCE_NAME
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEHBAO.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEHBAO.c
new file mode 100644
index 0000000000000000000000000000000000000000..162b988158e91e6e63c915baef0ec8d6bbde5029
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEHBAO.c
@@ -0,0 +1,37 @@
+//!HBAO - PostProcessEffectType.HBAO
+//TODO - may be just a dummy, since SSAO already uses the HBAO materials?
+class PPEHBAO: PPEClassBase
+{
+	static const int PARAM_RADIUSMETERS = 0;
+	static const int PARAM_INTENSITY = 1;
+	static const int PARAM_BLURSHARPNESS = 2;
+	static const int PARAM_NDOTVBIAS = 3;
+	static const int PARAM_SMALLSCALEAO = 4;
+	static const int PARAM_LARGESCALEAO = 5;
+	static const int PARAM_NUMDIRECTIONS = 6;
+	static const int PARAM_NUMSAMPLES = 7;
+	static const int PARAM_DEINTERLEAVE = 8;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.HBAO;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/hbao";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_RADIUSMETERS,"RadiusMeters",2.0,0.1,10.0);
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",1.0,0.1,100.0);
+		RegisterParameterScalarFloat(PARAM_BLURSHARPNESS,"BlurSharpness",32.0,1.0,300.0);
+		RegisterParameterScalarFloat(PARAM_NDOTVBIAS,"NdotVBias",0.2,0.0,0.5);
+		RegisterParameterScalarFloat(PARAM_SMALLSCALEAO,"SmallScaleAO",1.0,0.1,2.0);
+		RegisterParameterScalarFloat(PARAM_LARGESCALEAO,"LargeScaleAO",1.0,0.1,2.0);
+		RegisterParameterScalarInt(PARAM_NUMDIRECTIONS,"NumDirections",8,1,8);
+		RegisterParameterScalarInt(PARAM_NUMSAMPLES,"NumSamples",4,1,8);
+		RegisterParameterScalarBool(PARAM_DEINTERLEAVE,"Deinterleave",true);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEMedian.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEMedian.c
new file mode 100644
index 0000000000000000000000000000000000000000..128824cea8b58597f55a48ca19ab3a0886dd99d4
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEMedian.c
@@ -0,0 +1,23 @@
+//!Median - PostProcessEffectType.Median
+//unused/not modifiable from script?
+class PPEMedian: PPEClassBase
+{
+	static const int PARAM_KERNEL = 0;
+	static const int PARAM_METHOD = 1;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.Median;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/median";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarInt(PARAM_KERNEL,"Kernel",3,3,5);
+		RegisterParameterScalarInt(PARAM_METHOD,"Method",2,0,2);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPENone.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPENone.c
new file mode 100644
index 0000000000000000000000000000000000000000..3a163602a57e9da6b69bc5c542bc0db8a2a9605f
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPENone.c
@@ -0,0 +1,13 @@
+//!Dummy class - PostProcessEffectType.None
+class PPENone: PPEClassBase
+{
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.None;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "";
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERadialBlur.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERadialBlur.c
new file mode 100644
index 0000000000000000000000000000000000000000..835113d1a1abe8c0db85e0160cc4f4d05b2fa30c
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERadialBlur.c
@@ -0,0 +1,32 @@
+//!RadialBlur - PostProcessEffectType.RadialBlur
+class PPERadialBlur: PPEClassBase
+{
+	static const int PARAM_POWERX = 0;
+	static const int PARAM_POWERY = 1;
+	static const int PARAM_OFFSETX = 2;
+	static const int PARAM_OFFSETY = 3;
+	static const int PARAM_PIXELSCALE = 4;
+	
+	
+	static const int L_0_PAIN_BLUR = 100;
+	
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.RadialBlur;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/radialblur";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_POWERX,"PowerX",0.0,0.0,0.1);
+		RegisterParameterScalarFloat(PARAM_POWERY,"PowerY",0.0,0.0,0.1);
+		RegisterParameterScalarFloat(PARAM_OFFSETX,"OffsetX",0.05,0.0,0.5);
+		RegisterParameterScalarFloat(PARAM_OFFSETY,"OffsetY",0.05,0.0,0.5);
+		RegisterParameterScalarFloat(PARAM_PIXELSCALE,"PixelScale",0.5,0.125,1.0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERain.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERain.c
new file mode 100644
index 0000000000000000000000000000000000000000..59c9fac2bed538509cdab9f5237b208fc9f1fe17
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERain.c
@@ -0,0 +1,74 @@
+//!Rain - PostProcessEffectType.Rain
+class PPERain: PPEClassBase
+{
+	static const int PARAM_DROPDISTANCE = 0;
+	static const int PARAM_DROPSIZEX = 1;
+	static const int PARAM_DROPSIZEY = 2;
+	static const int PARAM_RAINFOGGINESS = 3;
+	static const int PARAM_RAINDENSITY = 4;
+	static const int PARAM_FOGCOLORMULT = 5;
+	static const int PARAM_BCKGRNDCOLORMULT = 6;
+	static const int PARAM_REFRACTIONSCALE = 7;
+	static const int PARAM_SUNVISIBLE = 8;
+	static const int PARAM_GODRAYINTNEAR = 9;
+	static const int PARAM_GODRAYINTFAR = 10;
+	static const int PARAM_RIPPLESBLEND = 11;
+	static const int PARAM_RIPPLESDIST = 12;
+	static const int PARAM_SPEED = 13;
+	static const int PARAM_DISTANTSPEED = 14;
+	static const int PARAM_WINDAFFECTSPEED = 15;
+	static const int PARAM_MINDIVERGENCE = 16;
+	static const int PARAM_MAXDIVERGENCE = 17;
+	static const int PARAM_WINDSPEEDFORMAXDIV = 18;
+	/*
+	static const int PARAM_DROPREFRACTIONTEX = 19;
+	static const int PARAM_DISTANTTEX = 20;
+	static const int PARAM_ROTNOISEMAP = 21;
+	static const int PARAM_RIPPLEMAP = 22;
+	static const int PARAM_MOVMAP = 23;
+	static const int PARAM_MOVNOISEMAP = 24;
+	static const int PARAM_SUNMASKMAT = 25;
+	*/
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.Rain;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/rain";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_DROPDISTANCE,"DropDistance",1.45,0.0,100.0);
+		RegisterParameterScalarFloat(PARAM_DROPSIZEX,"DropSizeX",0.003,0.0,100.0);
+		RegisterParameterScalarFloat(PARAM_DROPSIZEY,"DropSizeY",0.075,0.0,100.0);
+		RegisterParameterScalarFloat(PARAM_RAINFOGGINESS,"RainFogginess",0.5,0.0,5.0);
+		RegisterParameterScalarFloat(PARAM_RAINDENSITY,"RainDensity",1.0,0.0,5.0);
+		RegisterParameterScalarFloat(PARAM_FOGCOLORMULT,"FogColorMultiplier",0.5,0.0,5.0);
+		RegisterParameterScalarFloat(PARAM_BCKGRNDCOLORMULT,"BackgroundColorMultiplier",1.1,0.0,5.0);
+		RegisterParameterScalarFloat(PARAM_REFRACTIONSCALE,"RefractionScale",0.01,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_SUNVISIBLE,"SunVisible",1.0,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_GODRAYINTNEAR,"GodRayIntensityNear",1.5,0.0,50.0);
+		RegisterParameterScalarFloat(PARAM_GODRAYINTFAR,"GodRayIntensityFar",1.2,0.0,50.0);
+		RegisterParameterScalarFloat(PARAM_RIPPLESBLEND,"RipplesBlend",50.0,0.0,250.0);
+		RegisterParameterScalarFloat(PARAM_RIPPLESDIST,"RipplesDist",100.0,0.0,250.0);
+		RegisterParameterScalarFloat(PARAM_SPEED,"Speed",10.0,0.0,50.0);
+		RegisterParameterScalarFloat(PARAM_DISTANTSPEED,"DistantSpeed",16.0,0.0,100.0);
+		RegisterParameterScalarFloat(PARAM_WINDAFFECTSPEED,"WindAffectsSpeed",0.02,0.0,10.0);
+		RegisterParameterScalarFloat(PARAM_MINDIVERGENCE,"MinDivergence",0.005,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_MAXDIVERGENCE,"MaxDivergence",0.03,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_WINDSPEEDFORMAXDIV,"WindSpeedForMaxDivergence",10.0,0.0,100.0);
+		
+		/*RegisterParameterTexture(PARAM_DROPREFRACTIONTEX,"DropRefractionTex","{3D95A4E49ACDDE5}graphics/textures/postprocess/drop_refraction.edds");
+		RegisterParameterTexture(PARAM_DISTANTTEX,"DistantTex","{3435F57626D5A6DB}graphics/textures/postprocess/raindistantmask.edds");
+		RegisterParameterTexture(PARAM_ROTNOISEMAP,"RotationNoiseMap","{7B4F4B4EE2566E84}graphics/textures/postprocess/noise.edds");
+		RegisterParameterTexture(PARAM_RIPPLEMAP,"RipplesMap","{59E25B3D2EB94B}graphics/textures/postprocess/ripple.edds");
+		RegisterParameterTexture(PARAM_MOVMAP,"MovableMap","{EBF63DBBED7D8}graphics/textures/postprocess/rainripplesmovable.edds");
+		RegisterParameterTexture(PARAM_MOVNOISEMAP,"MovableNoiseMap","{2E275BD75961FA54}graphics/textures/postprocess/rainripplesmovablenoise.edds");*/
+		
+		//RegisterParameterResource(PARAM_SUNMASKMAT,"SunMaskMat","{FAF56DD689E895BE}Graphics/Materials/postprocess/godrayssunmask.emat");
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERotBlur.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERotBlur.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4b779f03a037a379d93e6210302c16faae3afbf
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPERotBlur.c
@@ -0,0 +1,28 @@
+//!Rotation Blur
+class PPERotBlur: PPEClassBase
+{
+	static const int PARAM_POWER = 0;
+	static const int PARAM_MINANGLEPERSEC = 1;
+	static const int PARAM_MAXANGLEPERSEC = 2;
+	static const int PARAM_MINDEPTH = 3;
+	static const int PARAM_MAXDEPTH = 4;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.RotBlur;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/rotblur";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_POWER,"Power",0.0,0.0,0.09);
+		RegisterParameterScalarFloat(PARAM_MINANGLEPERSEC,"MinAnglePerSec",10.0,0.0,180.0);
+		RegisterParameterScalarFloat(PARAM_MAXANGLEPERSEC,"MaxAnglePerSec",100.0,0.0,180.0);
+		RegisterParameterScalarFloat(PARAM_MINDEPTH,"MinDepth",2.5,0.0,5.0);
+		RegisterParameterScalarFloat(PARAM_MAXDEPTH,"MaxDepth",4.5,0.0,50.0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESMAA.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESMAA.c
new file mode 100644
index 0000000000000000000000000000000000000000..17480fe664b9db935688912daabe5eef8e0c694a
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESMAA.c
@@ -0,0 +1,20 @@
+//!SMAA - PostProcessEffectType.SMAA
+class PPESMAA: PPEClassBase
+{
+	static const int PARAM_PRESET = 0;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.SMAA;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/smaa";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarInt(PARAM_PRESET,"Preset",0,0,3);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESSAO.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESSAO.c
new file mode 100644
index 0000000000000000000000000000000000000000..512d1bfa96ae65c404f068a9612b805a8f3a2441
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESSAO.c
@@ -0,0 +1,77 @@
+//!SSAO - PostProcessEffectType.SSAO
+class PPESSAO: PPEClassBase
+{
+	static const int POSTPROCESS_OPTION_VALUE_LOW = 0;
+	static const int POSTPROCESS_OPTION_VALUE_MEDIUM = 1;
+	static const int POSTPROCESS_OPTION_VALUE_HIGH = 2;
+	static const int POSTPROCESS_OPTION_VALUE_HIGHEST = 3;
+	
+	static const int PARAM_NUMPASSES = 0;
+	static const int PARAM_INTENSITY = 1;
+	static const int PARAM_RADIUSNEAR = 2;
+	static const int PARAM_RADIUSFAR = 3;
+	static const int PARAM_COSANGLE0 = 4;
+	static const int PARAM_COSANGLE1 = 5;
+	static const int PARAM_MAXDISTANCE = 6;
+	static const int PARAM_MAXBLURDISTANCE = 7;
+	static const int PARAM_NEARINTENSITY = 8;
+	static const int PARAM_FARINTENSITY = 9;
+	static const int PARAM_FARINTENSITYDIST = 10;
+	static const int PARAM_NUMBLURPASSES = 11;
+	static const int PARAM_BLURSIZE = 12;
+	static const int PARAM_COLORAMOUNT = 13;
+	static const int PARAM_COLORSSAOAMOUNT = 14;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.SSAO;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		//return "Graphics/Materials/postprocess/hbao"; //"default-default", with no option taken into account (c++)
+		GameOptions options = new GameOptions;
+		
+		ListOptionsAccess loa = ListOptionsAccess.Cast( options.GetOptionByType( OptionAccessType.AT_POSTPROCESS_EFFECTS ) );
+		string ret = "";
+		switch (loa.GetIndex())
+		{
+			case POSTPROCESS_OPTION_VALUE_LOW:
+				ret = "Graphics/Materials/postprocess/hbao_low";
+			break;
+			
+			case POSTPROCESS_OPTION_VALUE_MEDIUM:
+				ret = "Graphics/Materials/postprocess/hbao_medium";
+			break;
+			
+			case POSTPROCESS_OPTION_VALUE_HIGH:
+				ret = "Graphics/Materials/postprocess/hbao_high";
+			break;
+			
+			case POSTPROCESS_OPTION_VALUE_HIGHEST:
+				ret = "Graphics/Materials/postprocess/hbao_highest";
+			break;
+		}
+		return ret;
+	}
+	
+	//TODO - defaults are taken from c++ directly, instead of material files! Add support for options switching
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarInt(PARAM_NUMPASSES,"NumPasses",2,2,8);
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",15.0,0.0,1000.0);
+		RegisterParameterScalarFloat(PARAM_RADIUSNEAR,"RadiusNear",60.0,0.0,200.0);
+		RegisterParameterScalarFloat(PARAM_RADIUSFAR,"RadiusFar",5.0,0.0,200.0);
+		RegisterParameterScalarFloat(PARAM_COSANGLE0,"CosAngle0",0.1,0.0,2.0);
+		RegisterParameterScalarFloat(PARAM_COSANGLE1,"CosAngle1",1.0,0.0,2.0);
+		RegisterParameterScalarFloat(PARAM_MAXDISTANCE,"MaxDistance",1.5,0.0,10000.0);
+		RegisterParameterScalarFloat(PARAM_MAXBLURDISTANCE,"MaxBlurDistance",0.2,0.0,10.0);
+		RegisterParameterScalarFloat(PARAM_NEARINTENSITY,"NearIntensity",0.2,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_FARINTENSITY,"FarIntensity",5.0,0.0,20.0);
+		RegisterParameterScalarFloat(PARAM_FARINTENSITYDIST,"FarIntensityDistance",20.0,0.0,1000.0);
+		RegisterParameterScalarInt(PARAM_NUMBLURPASSES,"NumBlurPasses",1,0,8);
+		RegisterParameterScalarInt(PARAM_BLURSIZE,"BlurSize",1.0,1.0,4.0);
+		RegisterParameterScalarFloat(PARAM_COLORAMOUNT,"ColorAmount",0.5,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_COLORSSAOAMOUNT,"ColorSsaoAmount",0.25,0.0,1.0);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESunMask.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESunMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef44b84b109aa5e153834938630741b1550645c8
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPESunMask.c
@@ -0,0 +1,30 @@
+//!SunMask - PostProcessEffectType.SunMask
+//A dummy class in script; 'SunMaskEffect' is used as a part of Rain and GodRays
+class PPESunMask: PPEClassBase
+{
+	/*
+	static const int PARAM_INTENSITY = 0;
+	static const int PARAM_SUNSIZE = 1;
+	static const int PARAM_VSTREAKINT = 2;
+	static const int PARAM_DSTREAKINT = 3;
+	static const int PARAM_SUNMASK = 4;
+	*/
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.SunMask;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "";
+	}
+	
+	/*override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_INTENSITY,"Intensity",0.8,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_SUNSIZE,"SunSize",0.2,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_VSTREAKINT,"VerticalStreakIntensity",0.75,0.0,5.0);
+		RegisterParameterScalarFloat(PARAM_DSTREAKINT,"DiagonalStreakIntensity",0.6,0.0,5.0);
+		//RegisterParameterResource(PARAM_SUNMASK,"SunMask","");
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEUnderWater.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEUnderWater.c
new file mode 100644
index 0000000000000000000000000000000000000000..9cb1eab1571636cd55272cf42e1dadf557bb0838
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEUnderWater.c
@@ -0,0 +1,28 @@
+//!UnderWater - PostProcessEffectType.UnderWater
+class PPEUnderWater: PPEClassBase
+{
+	static const int PARAM_RSINTENSITY = 0;
+	static const int PARAM_RSPLANEDIST = 1;
+	static const int PARAM_RSDEPTHDECREASE = 2;
+	static const int PARAM_RSUVSCALE = 3;
+	static const int PARAM_WATERPLANELUM = 4;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.UnderWater;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/uw";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_RSINTENSITY,"RayShaftsIntensity",0.0,-0.2,0.2);
+		RegisterParameterScalarFloat(PARAM_RSPLANEDIST,"RayShaftsPlaneDistance",1.0,0.1,4.0);
+		RegisterParameterScalarFloat(PARAM_RSDEPTHDECREASE,"RayShaftsDepthDecrease",2.5,1.0,100.0);
+		RegisterParameterScalarFloat(PARAM_RSUVSCALE,"RayShaftsUVScale",2.0,0.1,10.0);
+		RegisterParameterScalarFloat(PARAM_WATERPLANELUM,"WaterPlaneLuminance",0.05,0.001,0.5);
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEWetDistort.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEWetDistort.c
new file mode 100644
index 0000000000000000000000000000000000000000..47d1c40bf6ba5a7299b1f8eccc030621f830118e
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatClasses/PPEWetDistort.c
@@ -0,0 +1,54 @@
+//!WetDistort - PostProcessEffectType.WetDistort
+class PPEWetDistort: PPEClassBase
+{
+	static const int PARAM_BLURPOWER = 0;
+	static const int PARAM_LOCALBLURPOWER = 1;
+	static const int PARAM_EFFPOWERTOP = 2;
+	static const int PARAM_EFFPOWERBOTTOM = 3;
+	static const int PARAM_BLURDOWNSIZE = 4;
+	static const int PARAM_BLURGAUSS = 5;
+	static const int PARAM_WAVSPDX1 = 6;
+	static const int PARAM_WAVSPDX2 = 7;
+	static const int PARAM_WAVSPDY1 = 8;
+	static const int PARAM_WAVSPDY2 = 9;
+	static const int PARAM_WAVEAMPX1 = 10;
+	static const int PARAM_WAVEAMPX2 = 11;
+	static const int PARAM_WAVEAMPY1 = 12;
+	static const int PARAM_WAVEAMPY2 = 13;
+	static const int PARAM_PHASERANDX = 14;
+	static const int PARAM_PHASERANDY = 15;
+	static const int PARAM_PHASEPOSX = 16;
+	static const int PARAM_PHASEPOSY = 17;
+	
+	override int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.WetDistort;
+	}
+	
+	override string GetDefaultMaterialPath()
+	{
+		return "Graphics/Materials/postprocess/wetdistort";
+	}
+	
+	override void RegisterMaterialParameters()
+	{
+		RegisterParameterScalarFloat(PARAM_BLURPOWER,"BlurPower",0.5,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_LOCALBLURPOWER,"LocalBlurPower",0.4,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_EFFPOWERTOP,"EffectPowerTop",0.0,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_EFFPOWERBOTTOM,"EffectPowerBottom",0.0,0.0,1.0);
+		RegisterParameterScalarInt(PARAM_BLURDOWNSIZE,"BlurDownSize",2,0,3);
+		RegisterParameterScalarInt(PARAM_BLURGAUSS,"BlurGauss",1,1,4);
+		RegisterParameterScalarFloat(PARAM_WAVSPDX1,"WaveSpeedX1",4.1,0.5,10.0);
+		RegisterParameterScalarFloat(PARAM_WAVSPDX2,"WaveSpeedX2",3.7,0.5,10.0);
+		RegisterParameterScalarFloat(PARAM_WAVSPDY1,"WaveSpeedY1",2.5,0.5,10.0);
+		RegisterParameterScalarFloat(PARAM_WAVSPDY2,"WaveSpeedY2",1.85,0.5,10.0);
+		RegisterParameterScalarFloat(PARAM_WAVEAMPX1,"WaveAmpX1",0.005,0.001,0.02);
+		RegisterParameterScalarFloat(PARAM_WAVEAMPX2,"WaveAmpX2",0.004,0.001,0.02);
+		RegisterParameterScalarFloat(PARAM_WAVEAMPY1,"WaveAmpY1",0.009,0.001,0.02);
+		RegisterParameterScalarFloat(PARAM_WAVEAMPY2,"WaveAmpY2",0.007,0.001,0.02);
+		RegisterParameterScalarFloat(PARAM_PHASERANDX,"PhaseRandX",0.5,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_PHASERANDY,"PhaseRandY",0.3,0.0,1.0);
+		RegisterParameterScalarFloat(PARAM_PHASEPOSX,"PhasePosX",10.0,0.0,20.0);
+		RegisterParameterScalarFloat(PARAM_PHASEPOSY,"PhasePosY",6.0,0.0,20.0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterBool.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterBool.c
new file mode 100644
index 0000000000000000000000000000000000000000..20047312af5aa52c1d66f17e80771d25fc2ff9df
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterBool.c
@@ -0,0 +1,191 @@
+class PPEMatClassParameterBool extends PPEMatClassParameterCommandData
+{
+	protected ref map<int,ref array<bool,int>> m_LayerInfo; //<priority,<value,operator>>
+	
+	protected PPETemplateDefBool m_Bool;
+	protected bool m_ValueDefault;
+	
+	void PPEMatClassParameterBool(int mat_idx, int parameter_idx, PPEClassBase parent)
+	{
+		m_LayerInfo = new map<int,ref array<bool,int>>;
+	}
+	
+	override void InitDefaults()
+	{
+		Class.CastTo(m_Bool,m_Defaults);
+		m_ValueDefault = m_Bool.param2;
+	}
+	
+	override void InitCuttent()
+	{
+		m_CurrentValues = new Param1<bool>(m_ValueDefault);
+	}
+	
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_BOOL;
+	}
+	
+	override void Update(float timeslice, out Param p_total, out bool setting_defaults, int order)
+	{
+		super.Update(timeslice,p_total,setting_defaults,order);
+		
+		int active_request_count = 0;
+		
+		PPERequestParamDataBool req_data;
+		
+		bool setting_value_zero = false;
+		
+		bool bool_value_temp = false;
+		bool bool_value_total = m_ValueDefault;
+		
+		if (p_total == null)
+		{
+			p_total = new Param1<bool>(false);
+		}
+		
+		if (m_RequestMap.Count() > 0)
+		{
+			m_LayerInfo.Clear();
+		}
+		else
+		{
+			//DbgPrnt("m_RequestMap.Count() is zero! Using default values. | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+			SetParameterValueDefault(p_total);
+			m_Parent.ParamUpdateRemove(m_ParameterIndex);
+			return;
+		}
+		
+		for ( int i = 0; i < m_RequestMap.Count(); i++ )
+		{
+			req_data = PPERequestParamDataBool.Cast(m_RequestMap.GetElement(i));
+			
+			if (req_data == null)
+			{
+				Error("PPEMatClassParameterBool | req_data not found! | " + this + " | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+				continue;
+			}
+			
+			setting_value_zero = req_data.IsSettingDefaultValues();
+			
+			if (setting_value_zero && !req_data.GetUpdatingDataValues() && !req_data.IsDataActive())
+			{
+				//DbgPrnt("Is Default, not updating | idx: " + i + " | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+				continue;
+			}
+			
+			if (setting_value_zero)
+			{
+				req_data.m_BoolTarget = false;
+				//DbgPrnt("PPEDebug | PPEMatClassParameterBool - UpdateParameterValues | !data.m_DefaultTargetSet | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | req_data.m_BoolTarget: " + req_data.m_BoolTarget);
+			}
+			else 
+			{
+				active_request_count++;
+			}
+			
+			//evaluation
+			//--------------------------------
+			req_data.m_BoolLast = req_data.m_BoolCurrent;
+			
+			if (!req_data.GetUpdatingDataValues() && req_data.IsDataActive()) //set to exact value, not updating anymore
+			{
+				bool_value_temp = req_data.m_BoolCurrent;
+				PrepareLayerInfo(req_data.GetPriorityLayer(),bool_value_temp,req_data.GetInteractionMask());
+				//DbgPrnt("PPEDebug | PPEMatClassParameterBool - UpdateParameterValues | !req_data.m_UpdatingData | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | not updating, addaing current value into mix: " + bool_value_temp);
+				continue;
+			}
+			
+			bool_value_temp = req_data.m_BoolTarget;
+			
+			//DbgPrnt("PPEDebug | PPEMatClassParameterBool - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+			req_data.SetUpdatingDataValues(false);
+			if (setting_value_zero)
+			{
+				req_data.SetDataActive(false);
+				//RemovePriorityInfo(req_data.GetPriorityLayer()); //redundant?
+			}
+			else
+			{
+				bool_value_temp = req_data.m_BoolTarget;
+				PrepareLayerInfo(req_data.GetPriorityLayer(),bool_value_temp,req_data.GetInteractionMask());
+			}
+			
+			req_data.m_BoolCurrent = bool_value_temp;
+		}
+		
+		if (active_request_count == 0)
+		{
+			SetParameterValueDefault(p_total);
+		}
+		else
+		{
+			//---------------------------
+			//MASK handling and calculation
+			bool value;
+			int operator;
+			bool override_active = false;
+			
+			for ( i = 0; i < m_LayerInfo.Count(); i++ )
+			{
+				if ( override_active )
+					break;
+				
+				value = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).Get(LAYER_INFO_VALUE);
+				operator = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).Get(LAYER_INFO_OPERATOR);
+				
+				switch (operator)
+				{
+					case PPOperators.LOWEST:
+						bool_value_total = Math.Min(bool_value_total,value);
+					break;
+					
+					case PPOperators.HIGHEST:
+						bool_value_total = Math.Max(bool_value_total,value);
+					break;
+					
+					case PPOperators.OVERRIDE:
+						bool_value_total = value;
+					break;
+					
+					case PPOperators.SET:
+						bool_value_total = value;
+					break;
+					
+					default:
+						Error("PPEMatClassParameterBool | Invalid operator " + operator + " in mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+					break;
+				}
+				
+				if ( operator == PPOperators.OVERRIDE )
+				{
+					//DbgPrnt("m_LayerInfo | PPOperators.OVERRIDE at: " + i);
+					override_active = true;
+				}
+			}
+			
+			m_CommandLayersArray.Clear();
+			
+			Param1<bool>.Cast(p_total).param1 = bool_value_total;
+		}
+		
+		//DbgPrnt("PPEDebug | PPEMatClassParameterBool - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | parameter update end, removing from queue");
+		m_Parent.ParamUpdateRemove(m_ParameterIndex);
+		
+		m_CurrentValues = p_total;
+	}
+	
+	void PrepareLayerInfo(int layer, bool value, int operator)
+	{
+		m_LayerInfo.Set(layer,{value,operator});
+		AddPriorityInfo(layer);
+	}
+	
+	//! No active requests for the mat. parameter value change, sets the value to DEFAULT
+	override void SetParameterValueDefault(inout Param p_total)
+	{
+		p_total = new Param1<bool>(PPETemplateDefBool.Cast(m_Defaults).param2);
+		m_CurrentValues = p_total;
+		//DbgPrnt("PPEDebug | PPEMatClassParameterBool - UpdateParameterValues | exit 3 - zero value");
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterColor.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterColor.c
new file mode 100644
index 0000000000000000000000000000000000000000..163e5dc4fd02ff00af7ba88bbdd4306a6b3273c5
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterColor.c
@@ -0,0 +1,346 @@
+
+class ColorValuesData : Managed
+{
+	protected ref array<float> m_Values;
+	protected int m_Operator;
+	
+	void ColorValuesData(ref array<float> values, int operator)
+	{
+		m_Values = new array<float>;
+		m_Values.Copy(values);
+		m_Operator = operator;
+	}
+	
+	void SetValues(ref array<float> values)
+	{
+		m_Values.Copy(values);
+	}
+	
+	array<float> GetValues()
+	{
+		return m_Values;
+	}
+	
+	void SetOperator(int operator)
+	{
+		m_Operator = operator;
+	}
+	
+	int GetOperator()
+	{
+		return m_Operator;
+	}
+}
+
+class PPEMatClassParameterColor extends PPEMatClassParameterCommandData
+{
+	const int VALUE_RED = 0;
+	const int VALUE_GREEN = 1;
+	const int VALUE_BLUE = 2;
+	const int VALUE_ALPHA = 3;
+	const int VALUES_COUNT = 4; //rgba
+	
+	protected PPETemplateDefColor m_Color;
+	protected ref map<int,ref ColorValuesData> m_LayerInfo; //<priority,<<values>,operator>>
+	
+	float m_ColorDefaults[4];
+	
+	void PPEMatClassParameterColor(int mat_idx, int parameter_idx, PPEClassBase parent)
+	{
+		m_LayerInfo = new map<int,ref ColorValuesData>;
+	}
+	
+	override void InitDefaults()
+	{
+		m_Color = PPETemplateDefColor.Cast(m_Defaults);
+		m_ColorDefaults = {m_Color.param2,m_Color.param3,m_Color.param4,m_Color.param5};
+	}
+	
+	override void InitCuttent()
+	{
+		m_CurrentValues = new Param4<float,float,float,float>(m_ColorDefaults[0],m_ColorDefaults[1],m_ColorDefaults[2],m_ColorDefaults[3]);
+	}
+	
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_COLOR;
+	}
+	
+	override void Update(float timeslice, out Param p_total, out bool setting_defaults, int order)
+	{
+		super.Update(timeslice,p_total,setting_defaults,order);
+		 
+		int active_request_count = 0;
+		
+		PPERequestParamDataColor req_data;
+		
+		bool setting_value_zero = false;
+		
+		array<float> color_values_total = {0.0,0.0,0.0,0.0};
+		array<float> color_values_temp = {0.0,0.0,0.0,0.0};
+		bool color_total_override_set = false;
+		
+		// param creation
+		if (p_total == null)
+		{
+			p_total = new Param4<float,float,float,float>(0.0,0.0,0.0,0.0);
+		}
+		
+		if (m_RequestMap.Count() > 0)
+		{
+			m_LayerInfo.Clear();
+		}
+		else
+		{
+			//DbgPrnt("m_RequestMap.Count() is zero! Using default values. | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+			SetParameterValueDefault(p_total); //TODO - redundant?
+			m_Parent.ParamUpdateRemove(m_ParameterIndex);
+			return;
+		}
+		
+		//get target values, evaluate active and priority conditions, and insert into arrays to later process
+		for ( int i = 0; i < m_RequestMap.Count(); i++ )
+		{
+			req_data = PPERequestParamDataColor.Cast(m_RequestMap.GetElement(i));
+			
+			if (req_data == null)
+			{
+				Error("PPEMatClassParameterColor | req_data not found! | " + this + " | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+				continue;
+			}
+			
+			setting_value_zero = req_data.IsSettingDefaultValues();
+			
+			//skips "zero value" defaults
+			if (setting_value_zero && !req_data.GetUpdatingDataValues() && !req_data.IsDataActive()) 
+			{
+				//DbgPrnt("Is Default, not updating | idx: " + i + " | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+				continue;
+			}
+			
+			active_request_count++; //something is active, though not necessarily setting new values
+			
+			//evaluation
+			//--------------------------------
+			req_data.m_ColorLast = req_data.m_ColorCurrent;
+			
+			if (!req_data.GetUpdatingDataValues() && req_data.IsDataActive()) //set to exact value, not updating anymore
+			{
+				color_values_temp.Copy(req_data.m_ColorCurrent); //already converted from before?
+				PrepareLayerInfo(req_data.GetPriorityLayer(),{color_values_temp[0],color_values_temp[1],color_values_temp[2],color_values_temp[3]},req_data.GetInteractionMask());
+				//DbgPrnt("PPEDebug | PPEMatClassParameterColor - UpdateParameterValues | !req_data.m_UpdatingData | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | not updating, addaing current values into mix: " + req_data.m_ColorCurrent[0] + "," + req_data.m_ColorCurrent[1] + "," + req_data.m_ColorCurrent[2] + "," + req_data.m_ColorCurrent[3]);
+				continue;
+			}
+			
+			if (setting_value_zero)
+			{
+				req_data.m_ColorTarget = {0.0,0.0,0.0,0.0}; //color_defaults;
+				//DbgPrnt("PPEDebug | PPEMatClassParameterColor - UpdateParameterValues | !data.m_DefaultTargetSet | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | req_data.m_FloatTarget: " + req_data.m_FloatTarget);
+			}
+			
+			//DbgPrnt("PPEDebug | PPEMatClassParameterColor - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+			req_data.SetUpdatingDataValues(false);
+			if (setting_value_zero)
+			{
+				req_data.SetDataActive(false);
+				//RemovePriorityInfo(req_data.GetPriorityLayer()); //redundant?
+			}
+			else
+			{
+				color_values_temp.Copy(req_data.m_ColorTarget);
+				PrepareLayerInfo(req_data.GetPriorityLayer(),{color_values_temp[0],color_values_temp[1],color_values_temp[2],color_values_temp[3]},req_data.GetInteractionMask());
+			}
+			
+			req_data.m_ColorCurrent.Copy(color_values_temp);
+			//DbgPrnt("PPEDebug | PPEMatClassParameterColor - UpdateParameterValues | current: " + req_data.m_ColorCurrent);
+		}
+		
+		//---------------------------
+		//MASK handling and calculation
+		array<float> values;
+		int operator = -1;
+		bool override_active = false;
+		
+		color_values_total = {m_ColorDefaults[0],m_ColorDefaults[1],m_ColorDefaults[2],m_ColorDefaults[3]};
+		
+		for ( i = 0; i < m_LayerInfo.Count(); i++ )
+		{
+			if ( override_active )
+				break;
+			
+			values = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).GetValues();
+			operator = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).GetOperator();
+			
+			switch (operator)
+			{
+				case PPOperators.LOWEST:
+					color_values_total[VALUE_RED] = Math.Min(color_values_total[VALUE_RED], values[VALUE_RED]);
+					color_values_total[VALUE_GREEN] = Math.Min(color_values_total[VALUE_GREEN], values[VALUE_GREEN]);
+					color_values_total[VALUE_BLUE] = Math.Min(color_values_total[VALUE_BLUE], values[VALUE_BLUE]);
+					color_values_total[VALUE_ALPHA] = Math.Min(color_values_total[VALUE_ALPHA], values[VALUE_ALPHA]);
+				break;
+				
+				case PPOperators.HIGHEST:
+					color_values_total[VALUE_RED] = Math.Max(color_values_total[VALUE_RED], values[VALUE_RED]);
+					color_values_total[VALUE_GREEN] = Math.Max(color_values_total[VALUE_GREEN], values[VALUE_GREEN]);
+					color_values_total[VALUE_BLUE] = Math.Max(color_values_total[VALUE_BLUE], values[VALUE_BLUE]);
+					color_values_total[VALUE_ALPHA] = Math.Max(color_values_total[VALUE_ALPHA], values[VALUE_ALPHA]);
+				break;
+				
+				case PPOperators.ADD_RELATIVE:
+				case PPOperators.ADD:
+					color_values_total[VALUE_RED] = color_values_total[VALUE_RED] + values[VALUE_RED];
+					color_values_total[VALUE_GREEN] = color_values_total[VALUE_GREEN] + values[VALUE_GREEN];
+					color_values_total[VALUE_BLUE] = color_values_total[VALUE_BLUE] + values[VALUE_BLUE];
+					color_values_total[VALUE_ALPHA] = color_values_total[VALUE_ALPHA] + values[VALUE_ALPHA];
+				break;
+				
+				/*case PPOperators.ADD_RELATIVE: //no known max values, unusable!
+					float_value_total = (1 - float_value_total) * value + float_value_total;
+				break;*/
+				
+				case PPOperators.SUBSTRACT_RELATIVE:
+				case PPOperators.SUBSTRACT:
+					color_values_total[VALUE_RED] = color_values_total[VALUE_RED] - values[VALUE_RED];
+					color_values_total[VALUE_GREEN] = color_values_total[VALUE_GREEN] - values[VALUE_GREEN];
+					color_values_total[VALUE_BLUE] = color_values_total[VALUE_BLUE] - values[VALUE_BLUE];
+					color_values_total[VALUE_ALPHA] = color_values_total[VALUE_ALPHA] - values[VALUE_ALPHA];
+				break;
+				
+				/*case PPOperators.SUBSTRACT_RELATIVE: //no known max values, unusable!
+					float_value_total = float_value_total - value * float_value_total;
+				break;*/
+				
+				case PPOperators.SUBSTRACT_REVERSE_RELATIVE:
+				case PPOperators.SUBSTRACT_REVERSE:
+					color_values_total[VALUE_RED] = values[VALUE_RED] - color_values_total[VALUE_RED];
+					color_values_total[VALUE_GREEN] = values[VALUE_GREEN] - color_values_total[VALUE_GREEN];
+					color_values_total[VALUE_BLUE] = values[VALUE_BLUE] - color_values_total[VALUE_BLUE];
+					color_values_total[VALUE_ALPHA] = values[VALUE_ALPHA] - color_values_total[VALUE_ALPHA];
+				break;
+				
+				/*case PPOperators.SUBSTRACT_REVERSE_RELATIVE: //no known max values, unusable!
+					float_value_total = value * float_value_total - float_value_total;
+				break;*/
+				
+				case PPOperators.MULTIPLICATIVE:
+					color_values_total[VALUE_RED] = color_values_total[VALUE_RED] * values[VALUE_RED];
+					color_values_total[VALUE_GREEN] = color_values_total[VALUE_GREEN] * values[VALUE_GREEN];
+					color_values_total[VALUE_BLUE] = color_values_total[VALUE_BLUE] * values[VALUE_BLUE];
+					color_values_total[VALUE_ALPHA] = color_values_total[VALUE_ALPHA] * values[VALUE_ALPHA];
+				break;
+				
+				case PPOperators.OVERRIDE:
+					color_values_total.Copy(values);
+				break;
+				
+				case PPOperators.SET:
+					color_values_total.Copy(values);
+				break;
+			}
+			
+			//DbgPrnt("m_LayerInfo | color_values_total pre-clamp: " + color_values_total[VALUE_RED] + "/" + color_values_total[VALUE_GREEN] + "/" + color_values_total[VALUE_BLUE] + "/" + color_values_total[VALUE_ALPHA] + " | i: " + i);
+			if ( operator == PPOperators.OVERRIDE )
+			{
+				//DbgPrnt("m_LayerInfo | PPOperators.OVERRIDE at: " + i);
+				override_active = true;
+			}
+			
+			//RemovePriorityInfo(m_CommandLayersArray.Get(i));
+		}
+		
+		m_CommandLayersArray.Clear();
+		
+		if ( m_MaterialIndex == 15 && m_ParameterIndex == 21 )
+		{
+			//Print("m_MaterialIndex: " + m_MaterialIndex + "|m_ParameterIndex: " + m_ParameterIndex);
+			//Print("PPEMatClassParameterColor values: " + color_values_total[0] + " " + color_values_total[1] + " " + color_values_total[2] + " " + color_values_total[3]);
+		}
+		
+		//TODO - consider moving this up, if possible
+		if ( active_request_count <= 0 )
+		{
+			SetParameterValueDefault(p_total);
+		}
+		else
+		{
+			Param4<float,float,float,float>.Cast(p_total).param1 = color_values_total[0];
+			Param4<float,float,float,float>.Cast(p_total).param2 = color_values_total[1];
+			Param4<float,float,float,float>.Cast(p_total).param3 = color_values_total[2];
+			Param4<float,float,float,float>.Cast(p_total).param4 = color_values_total[3];
+		}
+		
+		//DbgPrnt("PPEDebug | PPEMatClassParameterColor - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | parameter update end, removing from queue");
+		m_Parent.ParamUpdateRemove(m_ParameterIndex);
+		
+		ModifyResultValues(p_total);
+		
+		m_CurrentValues = p_total;
+	}
+	
+	//! Fills relative values into arrays/member variables
+	void PrepareLayerInfo(int layer, ref array<float> values, int operator)
+	{
+		ColorValuesData tmp;
+		if (m_LayerInfo.Contains(layer))
+		{
+			tmp = m_LayerInfo.Get(layer);
+			tmp.SetValues(values);
+			tmp.SetOperator(operator);
+		}
+		else
+		{
+			tmp = new ColorValuesData(values,operator);
+		}
+		
+		m_LayerInfo.Set(layer,tmp);
+		AddPriorityInfo(layer);
+	}
+	
+	override void SetParameterValueDefault(inout Param p_total)
+	{
+		if (!p_total)
+		{
+			p_total = new Param4<float,float,float,float>(m_ColorDefaults[0],m_ColorDefaults[1],m_ColorDefaults[2],m_ColorDefaults[3]);
+		}
+		else
+		{
+			Param4<float,float,float,float>.Cast(p_total).param1 = m_ColorDefaults[0];
+			Param4<float,float,float,float>.Cast(p_total).param2 = m_ColorDefaults[1];
+			Param4<float,float,float,float>.Cast(p_total).param3 = m_ColorDefaults[2];
+			Param4<float,float,float,float>.Cast(p_total).param4 = m_ColorDefaults[3];
+		}
+		m_CurrentValues = p_total;
+	}
+}
+
+class PPEMatClassParameterColorColorization extends PPEMatClassParameterColor
+{
+	override void ModifyResultValues(inout Param result_values)
+	{
+		super.ModifyResultValues(result_values);
+		
+		//saturation-dependency handling
+		Param par = PPEManagerStatic.GetPPEManager().GetPostProcessCurrentValues(PostProcessEffectType.Glow,PPEGlow.PARAM_SATURATION);
+		float saturation_coef = Param1<float>.Cast(par).param1;
+		
+		float r = Param4<float,float,float,float>.Cast(result_values).param1;
+		float g = Param4<float,float,float,float>.Cast(result_values).param2;
+		float b = Param4<float,float,float,float>.Cast(result_values).param3;
+		float a = Param4<float,float,float,float>.Cast(result_values).param4;
+		
+		float highest_channel = Math.Max(Math.Max(r,g),b);
+		saturation_coef = Easing.EaseOutSine(saturation_coef);
+		
+		r = Math.Lerp(highest_channel,r,saturation_coef); 
+		g = Math.Lerp(highest_channel,g,saturation_coef);
+		b = Math.Lerp(highest_channel,b,saturation_coef);
+		a = Math.Lerp(m_ColorDefaults[3],a,saturation_coef);
+		//
+		
+		Param4<float,float,float,float>.Cast(result_values).param1 = r;
+		Param4<float,float,float,float>.Cast(result_values).param2 = g;
+		Param4<float,float,float,float>.Cast(result_values).param3 = b;
+		Param4<float,float,float,float>.Cast(result_values).param4 = a;
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterCommandData.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterCommandData.c
new file mode 100644
index 0000000000000000000000000000000000000000..7bd89af82347ba434ae0e0c43ee12fcf267f820d
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterCommandData.c
@@ -0,0 +1,131 @@
+typedef map<int,ref PPERequestParamDataBase> ActiveParameterRequestsMap; //<request_ID, data>
+
+class PPEMatClassParameterCommandData
+{
+	//default layer constants, complex data like colors PPEMatClassParameterColor are handled separately
+	const int LAYER_INFO_VALUE = 0;
+	const int LAYER_INFO_OPERATOR = 1;
+	
+	ref array<int> 									m_CommandLayersArray; //for tracking active priorities and sorting them //TODO - could have been 'set'..
+	protected int 									m_UpdatedCount;
+	protected int 									m_MaterialIndex; //just a helper
+	protected int 									m_ParameterIndex;
+	protected ref ActiveParameterRequestsMap 		m_RequestMap;//<request_ID, parameter data>
+	protected PPEClassBase 							m_Parent;
+	protected ref Param 							m_Defaults; // Careful, formating is such, that param1 is ALWAYS string, containing parameter name. Actual values follow.
+	protected ref Param 							m_CurrentValues; // Careful, only actual values, WITHOUT string
+	
+	protected ref map<int,ref array<int>> 			m_Dependencies;
+	
+	void PPEMatClassParameterCommandData(int mat_idx, int parameter_idx, PPEClassBase parent)
+	{
+		m_MaterialIndex = mat_idx;
+		m_ParameterIndex = parameter_idx;
+		m_Parent = parent;
+		
+		m_CommandLayersArray = new array<int>;
+		m_UpdatedCount = 0;
+		m_RequestMap = new ActiveParameterRequestsMap;
+	}
+	
+	int GetParameterVarType()
+	{
+		return -1;
+	}
+	
+	void SetMaterialIndex(int value)
+	{
+		m_MaterialIndex = value;
+	}
+	
+	void SetParameterIndex(int value)
+	{
+		m_ParameterIndex = value;
+	}
+	
+	void SetParent(PPEClassBase parent)
+	{
+		m_Parent = parent;
+	}
+	
+	void InsertRequestData(PPERequestParamDataBase request_data)
+	{
+		m_RequestMap.Set(request_data.GetRequesterIDX(),request_data);//<request_ID, data>
+	}
+	
+	void Update(float timeslice, out Param p_total, out bool setting_defaults, int order)
+	{
+		//insert dependencies to another update round
+		if ( m_Dependencies && m_Dependencies.Count() > 0 && order < PPEConstants.DEPENDENCY_ORDER_HIGHEST )
+		{
+			int key_mat = -1;
+			int element_par = -1;
+			for (int i = 0; i < m_Dependencies.Count(); i++)
+			{
+				key_mat = m_Dependencies.GetKey(i);
+				for (int j = 0; j < m_Dependencies.GetElement(i).Count(); j++)
+				{
+					element_par = m_Dependencies.GetElement(i).Get(j);
+					PPEManagerStatic.GetPPEManager().SetMaterialParamUpdating(key_mat,element_par,order + 1); // TODO - revise, currently only does one more update
+				}
+			}
+		}
+	}
+	
+	//! Modifies values to be used for setter methods later in the manager update. Currently used only on PPEMatClassParameterColor, TODO!!
+	void ModifyResultValues(inout Param result_values)
+	{
+	}
+	
+	//! Adds 'layers' to be iterated throug
+	void AddPriorityInfo(int priority)
+	{
+		if ( m_CommandLayersArray.Find(priority) == -1 )
+		{
+			m_CommandLayersArray.Insert(priority);
+			m_CommandLayersArray.Sort();
+		}
+		else
+		{
+			//DbgPrnt("PPEDebug | PPEMatClassParameterCommandData - AddPriorityInfo | Already exists, values have been overwritten!");
+		}
+	}
+	
+	//! Currently unused; layer info gets cleared every update
+	void RemovePriorityInfo(int priority)
+	{
+	}
+	
+	//! Adds name and default values from material registration, override on children to properly add for each type
+	void RegisterDefaults(Param p)
+	{
+		m_Defaults = p;
+		InitDefaults();
+		InitCuttent();
+	}
+	
+	protected void InitDefaults() {};
+	
+	protected void InitCuttent() {};
+	
+	protected void SetParameterValueDefault(inout Param p_total)
+	{
+	}
+	
+	//! Careful, formating is such, that param1 is ALWAYS string, containing parameter name, should it be needed. Actual values follow.
+	Param GetDefaultValues()
+	{
+		return m_Defaults;
+	}
+	
+	//! Careful, only actual values, WITHOUT string
+	Param GetCurrentValues()
+	{
+		return m_CurrentValues;
+	}
+	
+	void DbgPrnt(string text)
+	{
+		//Debug.Log(""+text);
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterFloat.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterFloat.c
new file mode 100644
index 0000000000000000000000000000000000000000..29a6949ed5e16205fe9821749ddca108daf0c6da
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterFloat.c
@@ -0,0 +1,249 @@
+class PPEMatClassParameterFloat extends PPEMatClassParameterCommandData
+{
+	protected ref map<int,ref array<float,int>> m_LayerInfo; //<priority,<value,operator>>
+	
+	protected PPETemplateDefFloat m_Float;
+	protected float m_ValueDefault;
+	protected float m_ValueMin;
+	protected float m_ValueMax;
+	
+	void PPEMatClassParameterFloat(int mat_idx, int parameter_idx, PPEClassBase parent)
+	{
+		m_LayerInfo = new map<int,ref array<float,int>>;
+	}
+	
+	override void InitDefaults()
+	{
+		Class.CastTo(m_Float,m_Defaults);
+		//m_Float = PPETemplateDefFloat.Cast(m_Defaults);
+		m_ValueDefault = m_Float.param2;
+		m_ValueMin = m_Float.param3;
+		m_ValueMax = m_Float.param4;
+	}
+	
+	override void InitCuttent()
+	{
+		m_CurrentValues = new Param1<float>(m_ValueDefault);
+	}
+	
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_FLOAT;
+	}
+	
+	override void Update(float timeslice, out Param p_total, out bool setting_defaults, int order)
+	{
+		super.Update(timeslice,p_total,setting_defaults,order);
+		
+		int active_request_count = 0;
+		
+		PPERequestParamDataFloat req_data;
+		
+		bool setting_value_zero = false;
+		
+		float float_value_temp = 0.0;
+		float float_value_default = 0.0;
+		float float_value_total = 0.0;
+		
+		if (p_total == null)
+		{
+			p_total = new Param1<float>(0.0);
+		}
+		
+		if (m_RequestMap.Count() > 0)
+		{
+			m_LayerInfo.Clear();
+		}
+		else
+		{
+			//DbgPrnt("m_RequestMap.Count() is zero! Using default values. | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+			SetParameterValueDefault(p_total);
+			m_Parent.ParamUpdateRemove(m_ParameterIndex);
+			return;
+		}
+		
+		for ( int i = 0; i < m_RequestMap.Count(); i++ )
+		{
+			req_data = PPERequestParamDataFloat.Cast(m_RequestMap.GetElement(i));
+			
+			if (req_data == null)
+			{
+				Error("Debug | PPEMatClassParameterFloat | req_data not found! | " + this + " | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+				continue;
+			}
+			
+			setting_value_zero = req_data.IsSettingDefaultValues();
+			
+			if (setting_value_zero && !req_data.GetUpdatingDataValues() && !req_data.IsDataActive())
+			{
+				//DbgPrnt("Is Default, not updating | idx: " + i + " | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+				continue;
+			}
+			
+			if (setting_value_zero)
+			{
+				req_data.m_FloatTarget = 0;//min;
+				//DbgPrnt("PPEDebug | PPEMatClassParameterFloat - UpdateParameterValues | !data.m_DefaultTargetSet | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | req_data.m_FloatTarget: " + req_data.m_FloatTarget);
+			}
+			else 
+			{
+				active_request_count++;
+			}
+			
+			//evaluation
+			//--------------------------------
+			req_data.m_FloatLast = req_data.m_FloatCurrent;
+			
+			if (!req_data.GetUpdatingDataValues() && req_data.IsDataActive()) //set to exact value, not updating anymore
+			{
+				float_value_temp = req_data.m_FloatCurrent;
+				PrepareLayerInfo(req_data.GetPriorityLayer(),float_value_temp,req_data.GetInteractionMask());
+				//DbgPrnt("PPEDebug | PPEMatClassParameterFloat - UpdateParameterValues | !req_data.m_UpdatingData | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | not updating, addaing current value into mix: " + float_value_temp);
+				continue;
+			}
+			
+			float_value_temp = req_data.m_FloatTarget;
+			
+			//DbgPrnt("PPEDebug | PPEMatClassParameterFloat - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+			req_data.SetUpdatingDataValues(false);
+			if (setting_value_zero)
+			{
+				req_data.SetDataActive(false);
+				//RemovePriorityInfo(req_data.GetPriorityLayer()); //redundant?
+			}
+			else
+			{
+				float_value_temp = req_data.m_FloatTarget;
+				PrepareLayerInfo(req_data.GetPriorityLayer(),float_value_temp,req_data.GetInteractionMask());
+			}
+			
+			req_data.m_FloatCurrent = float_value_temp;
+		}
+		
+		//---------------------------
+		//MASK handling and calculation
+		float value;
+		int operator;
+		bool override_active = false;
+		
+		if ( m_ValueMax == 0.0 )
+			float_value_total = m_ValueDefault; //?
+		else
+			float_value_total = m_ValueDefault / m_ValueMax;
+		
+		//float_value_total = Math.InverseLerp(m_ValueMin,m_ValueMax,m_ValueDefault);
+		float_value_default = float_value_total;
+		
+		for ( i = 0; i < m_LayerInfo.Count(); i++ )
+		{
+			if ( override_active )
+				break;
+			
+			value = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).Get(LAYER_INFO_VALUE);
+			operator = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).Get(LAYER_INFO_OPERATOR);
+			
+			switch (operator)
+			{
+				case PPOperators.LOWEST:
+					float_value_total = Math.Min(float_value_total,value);
+				break;
+				
+				case PPOperators.HIGHEST:
+					float_value_total = Math.Max(float_value_total,value);
+				break;
+				
+				case PPOperators.ADD:
+					//float_value_total = float_value_total + value - float_value_default;
+					float_value_total = float_value_total + value;
+				break;
+				
+				case PPOperators.ADD_RELATIVE:
+					float_value_total = (1 - float_value_total) * value + float_value_total;
+				break;
+				
+				case PPOperators.SUBSTRACT:
+					//float_value_total = float_value_total - value + float_value_default;
+					float_value_total = float_value_total - value;
+				break;
+				
+				case PPOperators.SUBSTRACT_RELATIVE:
+					float_value_total = float_value_total - value * float_value_total;
+				break;
+				
+				case PPOperators.SUBSTRACT_REVERSE:
+					//float_value_total = value - float_value_default - float_value_total;
+					float_value_total = value - float_value_total;
+				break;
+				
+				case PPOperators.SUBSTRACT_REVERSE_RELATIVE:
+					float_value_total = value * float_value_total - float_value_total;
+				break;
+				
+				case PPOperators.MULTIPLICATIVE:
+					//float_value_total = Math.Lerp(float_value_default, float_value_total, value);
+					float_value_total = float_value_total * value;
+				break;
+				
+				case PPOperators.OVERRIDE:
+					float_value_total = value;
+				break;
+				
+				case PPOperators.SET:
+					float_value_total = value;
+				break;
+			}
+			
+			//DbgPrnt("m_LayerInfo | float_value_total pre-clamp: " + float_value_total + " | i: " + i);
+			float_value_total = Math.Clamp(float_value_total,0,1);
+			
+			if ( operator == PPOperators.OVERRIDE )
+			{
+				//DbgPrnt("m_LayerInfo | PPOperators.OVERRIDE at: " + i);
+				override_active = true;
+			}
+			
+			//RemovePriorityInfo(m_CommandLayersArray.Get(i));
+		}
+		
+		m_CommandLayersArray.Clear();
+		
+		//TODO - consider moving this up, if possible
+		if (active_request_count == 0)
+		{
+			SetParameterValueDefault(p_total);
+		}
+		else
+		{
+			float res = Math.Lerp(m_ValueMin,m_ValueMax,float_value_total);
+			Param1<float>.Cast(p_total).param1 = res; //converts back to absolute values
+		}
+		
+		//DbgPrnt("PPEDebug | PPEMatClassParameterFloat - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | parameter update end, removing from queue");
+		m_Parent.ParamUpdateRemove(m_ParameterIndex);
+		
+		m_CurrentValues = p_total;
+	}
+	
+	void PrepareLayerInfo(int layer, float value, int operator)
+	{
+		m_LayerInfo.Set(layer,{value,operator});
+		AddPriorityInfo(layer);
+	}
+	
+	//! No active requests for the mat. parameter value change, sets the value to DEFAULT (zero?)
+	override void SetParameterValueDefault(inout Param p_total)
+	{
+		p_total = new Param1<float>(PPETemplateDefFloat.Cast(m_Defaults).param2);
+		m_CurrentValues = p_total;
+		//DbgPrnt("PPEDebug | PPEMatClassParameterFloat - UpdateParameterValues | exit 3 - zero value");
+	}
+}
+
+class PPEMatClassParameterFloatSaturation extends PPEMatClassParameterFloat
+{
+	void PPEMatClassParameterFloatSaturation(int mat_idx, int parameter_idx, PPEClassBase parent)
+	{
+		m_Dependencies = new map<int,ref array<int>>;
+		m_Dependencies.Set(PostProcessEffectType.Glow,{PPEGlow.PARAM_COLORIZATIONCOLOR, PPEGlow.PARAM_OVERLAYCOLOR});
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterInt.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterInt.c
new file mode 100644
index 0000000000000000000000000000000000000000..ead750295e74fa503a13ff8be032f5bb790c6505
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterInt.c
@@ -0,0 +1,191 @@
+class PPEMatClassParameterInt extends PPEMatClassParameterCommandData
+{
+	protected ref map<int,ref array<int,int>> m_LayerInfo; //<priority,<value,operator>>
+	
+	protected PPETemplateDefInt m_Int;
+	protected int m_ValueDefault;
+	
+	void PPEMatClassParameterInt(int mat_idx, int parameter_idx, PPEClassBase parent)
+	{
+		m_LayerInfo = new map<int,ref array<int,int>>;
+	}
+	
+	override void InitDefaults()
+	{
+		Class.CastTo(m_Int,m_Defaults);
+		m_ValueDefault = m_Int.param2;
+	}
+	
+	override void InitCuttent()
+	{
+		m_CurrentValues = new Param1<int>(m_ValueDefault);
+	}
+	
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_INT;
+	}
+	
+	override void Update(float timeslice, out Param p_total, out bool setting_defaults, int order)
+	{
+		super.Update(timeslice,p_total,setting_defaults,order);
+		
+		int active_request_count = 0;
+		
+		PPERequestParamDataInt req_data;
+		
+		bool setting_value_zero = false;
+		
+		bool int_value_temp = false;
+		bool int_value_total = m_ValueDefault;
+		
+		if (p_total == null)
+		{
+			p_total = new Param1<int>(0);
+		}
+		
+		if (m_RequestMap.Count() > 0)
+		{
+			m_LayerInfo.Clear();
+		}
+		else
+		{
+			//DbgPrnt("m_RequestMap.Count() is zero! Using default values. | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+			SetParameterValueDefault(p_total);
+			m_Parent.ParamUpdateRemove(m_ParameterIndex);
+			return;
+		}
+		
+		for ( int i = 0; i < m_RequestMap.Count(); i++ )
+		{
+			req_data = PPERequestParamDataInt.Cast(m_RequestMap.GetElement(i));
+			
+			if (req_data == null)
+			{
+				Error("Debug | PPEMatClassParameterInt | req_data not found! | " + this + " | mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+				continue;
+			}
+			
+			setting_value_zero = req_data.IsSettingDefaultValues();
+			
+			if (setting_value_zero && !req_data.GetUpdatingDataValues() && !req_data.IsDataActive())
+			{
+				//DbgPrnt("Is Default, not updating | idx: " + i + " | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+				continue;
+			}
+			
+			if (setting_value_zero)
+			{
+				req_data.m_IntTarget = false;
+				//DbgPrnt("PPEDebug | PPEMatClassParameterInt - UpdateParameterValues | !data.m_DefaultTargetSet | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | req_data.m_IntTarget: " + req_data.m_IntTarget);
+			}
+			else 
+			{
+				active_request_count++;
+			}
+			
+			//evaluation
+			//--------------------------------
+			req_data.m_IntLast = req_data.m_IntCurrent;
+			
+			if (!req_data.GetUpdatingDataValues() && req_data.IsDataActive()) //set to exact value, not updating anymore
+			{
+				int_value_temp = req_data.m_IntCurrent;
+				PrepareLayerInfo(req_data.GetPriorityLayer(),int_value_temp,req_data.GetInteractionMask());
+				//DbgPrnt("PPEDebug | PPEMatClassParameterInt - UpdateParameterValues | !req_data.m_UpdatingData | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | not updating, addaing current value into mix: " + int_value_temp);
+				continue;
+			}
+			
+			int_value_temp = req_data.m_IntTarget;
+			
+			//DbgPrnt("PPEDebug | PPEMatClassParameterInt - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX());
+			req_data.SetUpdatingDataValues(false);
+			if (setting_value_zero)
+			{
+				req_data.SetDataActive(false);
+				//RemovePriorityInfo(req_data.GetPriorityLayer()); //redundant?
+			}
+			else
+			{
+				int_value_temp = req_data.m_IntTarget;
+				PrepareLayerInfo(req_data.GetPriorityLayer(),int_value_temp,req_data.GetInteractionMask());
+			}
+			
+			req_data.m_IntCurrent = int_value_temp;
+		}
+		
+		if (active_request_count == 0)
+		{
+			SetParameterValueDefault(p_total);
+		}
+		else
+		{
+			//---------------------------
+			//MASK handling and calculation
+			int value;
+			int operator;
+			bool override_active = false;
+			
+			for ( i = 0; i < m_LayerInfo.Count(); i++ )
+			{
+				if ( override_active )
+					break;
+				
+				value = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).Get(LAYER_INFO_VALUE);
+				operator = m_LayerInfo.Get(m_CommandLayersArray.Get(i)).Get(LAYER_INFO_OPERATOR);
+				
+				switch (operator)
+				{
+					case PPOperators.LOWEST:
+						int_value_total = Math.Min(int_value_total,value);
+					break;
+					
+					case PPOperators.HIGHEST:
+						int_value_total = Math.Max(int_value_total,value);
+					break;
+					
+					case PPOperators.OVERRIDE:
+						int_value_total = value;
+					break;
+					
+					case PPOperators.SET:
+						int_value_total = value;
+					break;
+					
+					default:
+						Error("PPEMatClassParameterInt | Invalid operator " + operator + " in mat/par: " + m_MaterialIndex + "/" + m_ParameterIndex);
+					break;
+				}
+				
+				if ( operator == PPOperators.OVERRIDE )
+				{
+					//DbgPrnt("m_LayerInfo | PPOperators.OVERRIDE at: " + i);
+					override_active = true;
+				}
+			}
+			
+			m_CommandLayersArray.Clear();
+			
+			Param1<int>.Cast(p_total).param1 = int_value_total;
+		}
+		
+		//DbgPrnt("PPEDebug | PPEMatClassParameterInt - UpdateParameterValues | mat/par/req: " + m_MaterialIndex + "/" + m_ParameterIndex + "/" + req_data.GetRequesterIDX() + " | parameter update end, removing from queue");
+		m_Parent.ParamUpdateRemove(m_ParameterIndex);
+		
+		m_CurrentValues = p_total;
+	}
+	
+	void PrepareLayerInfo(int layer, int value, int operator)
+	{
+		m_LayerInfo.Set(layer,{value,operator});
+		AddPriorityInfo(layer);
+	}
+	
+	//! No active requests for the mat. parameter value change, sets the value to DEFAULT
+	override void SetParameterValueDefault(inout Param p_total)
+	{
+		p_total = new Param1<int>(PPETemplateDefInt.Cast(m_Defaults).param2);
+		m_CurrentValues = p_total;
+		//DbgPrnt("PPEDebug | PPEMatClassParameterInt - UpdateParameterValues | exit 3 - zero value");
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterResource.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterResource.c
new file mode 100644
index 0000000000000000000000000000000000000000..278a64bbfe60c2c75bd41c34063e697528a3fb49
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterResource.c
@@ -0,0 +1,7 @@
+class PPEMatClassParameterResource extends PPEMatClassParameterCommandData
+{
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_RESOURCE;
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterTexture.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterTexture.c
new file mode 100644
index 0000000000000000000000000000000000000000..8a07b9d1663d6152683c52c1d1e3001bce796bbf
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterTexture.c
@@ -0,0 +1,7 @@
+class PPEMatClassParameterTexture extends PPEMatClassParameterCommandData
+{
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_TEXTURE;
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterVector.c b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterVector.c
new file mode 100644
index 0000000000000000000000000000000000000000..3caefe08afa508a80220e17b57b29ba95bdf7ecf
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/MatParameters/PPEMatClassParameterVector.c
@@ -0,0 +1,7 @@
+class PPEMatClassParameterVector extends PPEMatClassParameterCommandData
+{
+	override int GetParameterVarType()
+	{
+		return PPEConstants.VAR_TYPE_VECTOR;
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Materials/PPEMatClassesBase.c b/scripts/3_Game/DayZ/PPEManager/Materials/PPEMatClassesBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba3622d70f7c5df0920f2c0aa54abbcf59cb68aa
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Materials/PPEMatClassesBase.c
@@ -0,0 +1,384 @@
+//! Created once, on manager init. Script-side representation of C++ material class, separate handling.
+class PPEClassBase
+{
+	protected PPEManager 											m_Manager;
+	protected string 												m_MaterialPath = "";
+	protected Material 												m_Material;
+	
+	protected ref map<int, ref array<int>>							m_ParameterUpdateQueueMap;
+	protected ref array<int> 										m_ParameterRemovalQueue;
+	protected ref array<int> 										m_UpdatedParameters;
+	
+	protected ref map<int,ref PPEMatClassParameterCommandData> 		m_MaterialParamMapStructure; //<param_idx, <ParamData>>
+	
+	void PPEClassBase(string mat_path_override = "")
+	{
+		Init(mat_path_override);
+		CreateMaterial();
+		CreateDataStructure();
+		RegisterMaterialParameters();
+	}
+	
+	protected void Init(string mat_path_override = "")
+	{
+		if (mat_path_override != "")
+		{
+			m_MaterialPath = mat_path_override;
+		}
+		else
+		{
+			m_MaterialPath = GetDefaultMaterialPath();
+		}
+		m_Manager = PPEManagerStatic.GetPPEManager();
+	}
+	
+	protected void CreateMaterial()
+	{
+		if (m_MaterialPath != "")
+			m_Material = GetGame().GetWorld().GetMaterial(m_MaterialPath);
+	}
+	
+	Material GetMaterial()
+	{
+		return m_Material;
+	}
+	
+	//do not override!
+	protected void CreateDataStructure()
+	{
+		m_MaterialParamMapStructure = new map<int,ref PPEMatClassParameterCommandData>;
+		//m_ParameterUpdateQueue = new array<int>;
+		m_ParameterUpdateQueueMap = new map<int, ref array<int>>;
+		m_ParameterRemovalQueue = new array<int>;
+		m_UpdatedParameters = new array<int>;
+	}
+	
+	//! inserted into associative array by parameter int value, parameter registration order does not matter (still ordered, though)
+	protected void RegisterMaterialParameters();
+	
+	protected void RegisterParameterScalarBool(int idx, string parameter_name, bool default_value)
+	{
+		PPETemplateDefBool p = new PPETemplateDefBool(parameter_name,default_value);
+		PPEMatClassParameterBool parameter_data = new PPEMatClassParameterBool(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	protected void RegisterParameterScalarInt(int idx, string parameter_name, int default_value, int min, int max)
+	{
+		PPETemplateDefInt p = new PPETemplateDefInt(parameter_name,default_value,min,max);
+		
+		PPEMatClassParameterInt parameter_data = new PPEMatClassParameterInt(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	//!WARNING - min/max values are usually taken from Workbench defaults, may not be actual min/max values the renderer can handle! When in doubt, try some higher/lower values...
+	protected void RegisterParameterScalarFloat(int idx, string parameter_name, float default_value, float min, float max)
+	{
+		PPETemplateDefFloat p = new PPETemplateDefFloat(parameter_name,default_value,min,max);
+		
+		PPEMatClassParameterFloat parameter_data = new PPEMatClassParameterFloat(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	//!WARNING - min/max values are usually taken from Workbench defaults, may not be actual min/max values the renderer can handle! When in doubt, try some higher/lower values...
+	protected void RegisterParameterScalarFloatEx(int idx, string parameter_name, float default_value, float min, float max, typename type)
+	{
+		PPETemplateDefFloat p = new PPETemplateDefFloat(parameter_name,default_value,min,max);
+		
+		PPEMatClassParameterFloat parameter_data;
+		bool boo = Class.CastTo(parameter_data,type.Spawn());
+		//Print("RegisterParameterColorEx: " + boo );
+		parameter_data.RegisterDefaults(p);
+		parameter_data.SetMaterialIndex(GetPostProcessEffectID());
+		parameter_data.SetParameterIndex(idx);
+		parameter_data.SetParent(this);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	//!WARNING - min/max values are usually taken from Workbench defaults, may not be actual min/max values the renderer can handle! When in doubt, try some higher/lower values...
+	protected void RegisterParameterColor(int idx, string parameter_name, float r, float g, float b, float a)
+	{
+		PPETemplateDefColor p = new PPETemplateDefColor(parameter_name,r,g,b,a);
+		PPEMatClassParameterColor parameter_data = new PPEMatClassParameterColor(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	//!WARNING - min/max values are usually taken from Workbench defaults, may not be actual min/max values the renderer can handle! When in doubt, try some higher/lower values...
+	protected void RegisterParameterColorEx(int idx, string parameter_name, float r, float g, float b, float a, typename type)
+	{
+		PPETemplateDefColor p = new PPETemplateDefColor(parameter_name,r,g,b,a);
+		PPEMatClassParameterColor parameter_data;
+		bool boo = Class.CastTo(parameter_data,type.Spawn());
+		//Print("RegisterParameterColorEx: " + boo );
+		parameter_data.RegisterDefaults(p);
+		parameter_data.SetMaterialIndex(GetPostProcessEffectID());
+		parameter_data.SetParameterIndex(idx);
+		parameter_data.SetParent(this);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	protected void RegisterParameterVector(int idx, string parameter_name, array<float> default_values) //needs to be compatible with every type of vector (vector2 to vector4), hence array<float>...
+	{
+		PPETemplateDefVector p = new PPETemplateDefVector(parameter_name,default_values);
+		PPEMatClassParameterVector parameter_data = new PPEMatClassParameterVector(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	//TEXTURE and RESOURCE types are not overridable during runtime..currently unused and unhandled
+	protected void RegisterParameterTexture(int idx, string parameter_name, string default_path)
+	{
+		PPETemplateDefTexture p = new PPETemplateDefTexture(parameter_name,default_path);
+		PPEMatClassParameterTexture parameter_data = new PPEMatClassParameterTexture(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	protected void RegisterParameterResource(int idx, string parameter_name, string default_path)
+	{
+		PPETemplateDefResource p = new PPETemplateDefResource(parameter_name,default_path);
+		PPEMatClassParameterResource parameter_data = new PPEMatClassParameterResource(GetPostProcessEffectID(),idx,this);
+		parameter_data.RegisterDefaults(p);
+		m_MaterialParamMapStructure.Set(idx, parameter_data);
+	}
+	
+	//------------------------------------------------------------------------------------
+	//! Distributes requester data to the material class structure and links them to appropriate parameter
+	void InsertParamValueData(PPERequestParamDataBase request_data)
+	{
+		PPEMatClassParameterCommandData param_data;
+		bool exists = m_MaterialParamMapStructure.Find(request_data.GetParameterID(),param_data);
+		if ( !exists )
+		{
+			Error("PPEClassBase | InsertParamValueData | mat/par/req: " + GetPostProcessEffectID() + "/" + request_data.GetParameterID() + "/" + request_data.GetRequesterIDX() + " not registered in m_MaterialParamMapStructure!");
+			return;
+		}
+		
+		request_data.SetDataActive(true);
+		request_data.SetUpdatingDataValues(true); //marks request data as updating
+		param_data.InsertRequestData(request_data);//<request_ID, data>
+		
+		//DbgPrnt("PPEDebug | InsertParamValueData | mat/par/req: " + GetPostProcessEffectID() + "/" + request_data.GetParameterID() + "/" + request_data.GetRequesterIDX() + " | requester: " + request_data.m_Requester);
+	}
+	
+	//TODO - rework
+	//!unused, see 'RemoveActiveRequestFromMaterials' for more info
+	void RemoveRequest(int req_idx)
+	{
+		/*for (int i = 0; i < m_ActiveMaterialRequestMap.Count(); i++)
+		{
+			ActiveParameterRequestsMap dbg = m_ActiveMaterialRequestMap.Get(i);
+			//DbgPrnt("PPEDebug | dbg size: " + dbg.Count());
+			
+			if ( m_ActiveMaterialRequestMap.Get(i).Contains(req_idx) )
+			{
+				m_ActiveMaterialRequestMap.Get(i).Remove(req_idx);
+				
+				dbg = m_ActiveMaterialRequestMap.Get(i);
+				
+				if ( !m_ActiveMaterialRequestMap.Get(i) || m_ActiveMaterialRequestMap.Get(i).Count() < 1 )
+				{
+					if (m_ParameterUpdateQueue.IsValidIndex(i))
+					{
+						DbgPrnt("PPEDebug | PPEClassBase - RemoveRequest | Removing: " + i);
+						DbgPrnt("PPEDebug | PPEClassBase - RemoveRequest | exit 4 - last request removal");
+						m_ParameterRemovalQueue.Insert(m_ParameterUpdateQueue.Get(i));
+					}
+					else
+						DbgPrnt("PPEDebug | PPEClassBase - RemoveRequest | Update queue no. " + i + " already removed!");
+				}
+			}
+			//Adds to update one more time
+			m_Manager.SetMaterialParamUpdating(GetPostProcessEffectID(),i);
+		}*/
+	}
+	
+	//! generic update method, take care when overriding!
+	void OnUpdate(float timeslice, int order)
+	{
+		int parameter_idx = -1;
+		//DbgPrnt("PPEDebug | PPEClassBase - OnUpdate | mat_id: " + GetPostProcessEffectID());
+		
+		if ( m_ParameterUpdateQueueMap.Contains(order) )
+		{
+			//Print(m_ParameterUpdateQueueMap.Get(order));
+			for ( int i = 0; i < m_ParameterUpdateQueueMap.Get(order).Count(); i++ )
+			{
+				//DbgPrnt("PPEDebug | PPEClassBase - OnUpdate | parameter_idx: " + m_ParameterUpdateQueue.Get(i));
+				Param p_values; //TODO - move to material classes?
+				bool setting_defaults = false;
+				parameter_idx = m_ParameterUpdateQueueMap.Get(order).Get(i);
+				m_MaterialParamMapStructure.Get(parameter_idx).Update(timeslice,p_values,setting_defaults,order);
+				
+				InsertUpdatedParameter(parameter_idx);
+			}
+			m_Manager.InsertUpdatedMaterial(GetPostProcessEffectID());
+			
+			ParamUpdateQueueCleanup(order);
+		}
+		/*if ( !m_ParameterUpdateQueueMap.Contains(order) || m_ParameterUpdateQueueMap.Get(order).Count() < 1 )
+			m_Manager.RemoveMaterialUpdating(GetPostProcessEffectID(),order); //stops material from updating when no parameters are.*/
+	}
+	
+	//! Clamps the values being set to defaults, if there is no request setting non-zero values on the parameter
+	void SetFinalParameterValue(int parameter_idx)
+	{
+		int var_type = GetParameterCommandData(parameter_idx).GetParameterVarType();
+		Param values = GetParameterCommandData(parameter_idx).GetCurrentValues();
+		
+		switch (var_type)
+		{
+			case PPEConstants.VAR_TYPE_BOOL:
+				bool value_var_bool = Param1<bool>.Cast(values).param1;
+				
+				m_Material.SetParamByIndex(parameter_idx,value_var_bool);
+				//Print("DebugValues | PPEConstants.VAR_TYPE_BOOL | bool val: " + value_var_bool);
+			break;
+			
+			case PPEConstants.VAR_TYPE_INT:
+				int value_var_int = Param1<int>.Cast(values).param1;
+				
+				m_Material.SetParamByIndex(parameter_idx,value_var_int);
+				//Print("DebugValues | PPEConstants.VAR_TYPE_BOOL | bool val: " + value_var_bool);
+			break;
+			
+			case PPEConstants.VAR_TYPE_FLOAT:
+				float value_var_float = Param1<float>.Cast(values).param1;
+				
+				m_Material.SetParamByIndex(parameter_idx,value_var_float);
+				//Print("DebugValues | PPEConstants.VAR_TYPE_FLOAT | float val: " + value_var_float);
+			break;
+			
+			case PPEConstants.VAR_TYPE_COLOR:
+				float color[4] = {0,0,0,0};
+				color[0] = Param4<float,float,float,float>.Cast(values).param1;
+				color[1] = Param4<float,float,float,float>.Cast(values).param2;
+				color[2] = Param4<float,float,float,float>.Cast(values).param3;
+				color[3] = Param4<float,float,float,float>.Cast(values).param4;
+				
+				m_Material.SetParamByIndex(parameter_idx,color);
+				//Print("DebugValues | PPEConstants.VAR_TYPE_COLOR | color val:: " + color[0] + " " + color[1] + " " + color[2] + " " + color[3]);
+			break;
+		}
+	}
+	
+	void ApplyValueChanges()
+	{
+		int parameter_id;
+		for (int i = 0; i < m_UpdatedParameters.Count(); i++)
+		{
+			parameter_id = m_UpdatedParameters.Get(i);
+			SetFinalParameterValue(parameter_id);
+		}
+		
+		m_UpdatedParameters.Clear();
+	}
+	
+	protected void InsertUpdatedParameter(int mat_id)
+	{
+		if ( m_UpdatedParameters.Find(mat_id) == -1 )
+			m_UpdatedParameters.Insert(mat_id);
+	}
+	
+	//! Queue selected parameter for removal from the update queue
+	void ParamUpdateRemove(int parameter_idx)
+	{
+		if ( m_ParameterRemovalQueue.Find(parameter_idx) == -1 )
+			m_ParameterRemovalQueue.Insert(parameter_idx);
+	}
+	
+	//! Queue specific parameter of this material to update
+	void SetParameterUpdating(int order, int parameter_id)
+	{
+		if ( !m_ParameterUpdateQueueMap.Contains(order) )
+		{
+			m_ParameterUpdateQueueMap.Set(order,new array<int>);
+		}
+		
+		if ( m_ParameterUpdateQueueMap.Get(order).Find(parameter_id) == -1 )
+		{
+			m_ParameterUpdateQueueMap.Get(order).Insert(parameter_id);
+		}
+	}
+	
+	protected void ParamUpdateQueueCleanup(int order)
+	{
+		//DbgPrnt("PPEDebug | PPEClassBase - ParamUpdateQueueCleanup | mat_id: " + GetPostProcessEffectID() + " | UpdateQueue count: " + m_ParameterUpdateQueue.Count());
+		//DbgPrnt("PPEDebug | PPEClassBase - ParamUpdateQueueCleanup | mat_id: " + GetPostProcessEffectID() + " | RemovalQueue count: " + m_ParameterRemovalQueue.Count());
+		for ( int i = 0; i < m_ParameterUpdateQueueMap.Get(order).Count(); i++ )
+		{
+			if ( m_ParameterRemovalQueue.Find(m_ParameterUpdateQueueMap.Get(order).Get(i)) != -1 )
+			{
+				//DbgPrnt("PPEDebug | PPEClassBase - ParamUpdateQueueCleanup | removing update of: " + m_ParameterUpdateQueue.Get(i));
+				//m_ParameterUpdateQueue.RemoveItem(m_ParameterUpdateQueue.Get(i));
+			}
+		}
+		m_ParameterUpdateQueueMap.Get(order).Clear();
+	}
+	
+	//! override this if you want to use different path by default; '.emat' is appended automatically
+	string GetDefaultMaterialPath();
+	
+	void ChangeMaterialPathUsed(string path)
+	{
+		m_MaterialPath = path;
+		m_Material = null;
+		CreateMaterial();
+	}
+	
+	string GetCurrentMaterialPath()
+	{
+		return m_MaterialPath;
+	}
+	
+	//! Overriden in all material classes!
+	int GetPostProcessEffectID()
+	{
+		return PostProcessEffectType.None;
+	}
+	
+	//! Some PP effects are handled as hard-coded exceptions, outside of material system. Default == PPEExceptions.NONE (systemic behaviour)
+	/*int GetExceptionID()
+	{
+		return PPEExceptions.NONE;
+	}*/
+	
+	PPEMatClassParameterCommandData GetParameterCommandData(int parameter_idx)
+	{
+		return m_MaterialParamMapStructure.Get(parameter_idx);
+	}
+	
+#ifdef DEVELOPER
+	//Debug//
+	//-----//
+	/*void DumpMap()
+	{
+		DbgPrnt("PPEClassDebug | m_ActiveMaterialRequestMap COUNT: " + m_ActiveMaterialRequestMap.Count());
+		for (int i = 0; i < m_ActiveMaterialRequestMap.Count(); i++)
+		{
+			DbgPrnt("PPEClassDebug | m_ActiveRequest#: " + i);
+			//ActiveMaterialRequests request = m_ActiveMaterialRequestMap.Get(i);
+			DbgPrnt("PPEClassDebug | request: " + request);
+			for (int j = 0; j < request.Count(); j++)
+			{
+				DbgPrnt("PPEClassDebug | request#: " + j);
+				array<bool,float,int,int> values = request.Get(j);
+				foreach (auto val : values)
+				{
+					DbgPrnt("PPEClassDebug | relative: " + val);
+				}
+			}
+		}
+		DbgPrnt("------------");
+	}*/
+#endif
+	
+	void DbgPrnt(string text)
+	{
+		//Debug.Log(""+text);
+	}
+};
diff --git a/scripts/3_Game/DayZ/PPEManager/PPEConstants.c b/scripts/3_Game/DayZ/PPEManager/PPEConstants.c
new file mode 100644
index 0000000000000000000000000000000000000000..326f34c3ba29ed63243e74a4f559287e7c18217d
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/PPEConstants.c
@@ -0,0 +1,91 @@
+//! PPE type priorities, C++ based. DO NOT CHANGE ORDER! Used only when calling 'SetCameraPostProcessEffect'
+enum PostProcessPrioritiesCamera
+{
+	PPP_SSAO,
+	PPP_CLOUDS,
+	PPP_DOF,
+	PPP_ROTBLUR,
+	PPP_GODRAYS,
+	PPP_RAIN,
+	PPP_RADIALBLUR,
+	PPP_CHROMABER,
+	PPP_WETDISTORT,
+	PPP_DYNBLUR,
+	PPP_UNDERWATER,
+	PPP_DOF_BOKEH,
+	PPP_COLORGRADE,
+	PPP_GLOW,
+	PPP_FILMGRAIN,
+	PPP_FILMGRAIN_NV,
+	PPP_FXAA,
+	PPP_SMAA,
+	PPP_GAUSS_FILTER,
+	PPP_MEDIAN, //unused?
+	//PPP_SSR
+};
+
+enum PPERequesterCategory
+{
+	NONE = 0;
+	GAMEPLAY_EFFECTS = 2;
+	MENU_EFFECTS = 4;
+	MISC_EFFECTS = 8;
+	ALL = 14; //GAMEPLAY_EFFECTS|MENU_EFFECTS|MISC_EFFECTS
+};
+
+/** 
+/brief IDs of custom PPE classes 
+/note Currently used for various native exceptions that used to be handled outside of script-side postprocess system.
+/note Can be used for custom functionality as well, C++ permitting.
+*/
+enum PPEExceptions
+{
+	NONE = -1,
+	EXPOSURE = 50,
+	DOF,
+	EYEACCOM,
+	NVLIGHTPARAMS,
+};
+
+//! PP operators, specify operation between subsequent layers
+enum PPOperators
+{
+	LOWEST, //only lowest value gets used. Note - if first request, it is compared against default values!
+	HIGHEST, //only highest value gets used. Note - if first request, it is compared against default values!
+	ADD, //LINEAR addition
+	ADD_RELATIVE, //LINEAR relative addition (relative to diff between current and max, where applicable. Otherwise used as absolute addition)
+	SUBSTRACT, //LINEAR substraction
+	SUBSTRACT_RELATIVE, //LINEAR relative substraction
+	SUBSTRACT_REVERSE, //LINEAR sub. target from dst
+	SUBSTRACT_REVERSE_RELATIVE, //LINEAR relative sub. target from dst
+	MULTIPLICATIVE, //LINEAR multiplication
+	SET, //sets the value, does not terminate possible further calculations
+	OVERRIDE //does not interact; sets the value, and terminates possible further calculations. Use with care, preferred use is SET with higher priority command
+};
+
+class PPEConstants
+{
+	static const int VAR_TYPE_BOOL = 1;
+	static const int VAR_TYPE_INT = 2;
+	static const int VAR_TYPE_FLOAT = 4;
+	static const int VAR_TYPE_COLOR = 8;
+	static const int VAR_TYPE_VECTOR = 16;
+	
+	static const int VAR_TYPE_BLENDABLE = VAR_TYPE_INT|VAR_TYPE_FLOAT|VAR_TYPE_COLOR;
+	static const int VAR_TYPE_TEXTURE = 32;
+	static const int VAR_TYPE_RESOURCE = 64;
+	
+	//static const int VALUE_MAX_COLOR = 255; //if only...
+	
+	static const int DEPENDENCY_ORDER_BASE = 0;
+	static const int DEPENDENCY_ORDER_HIGHEST = 1; //!< number of potential recursive update cycles in case of parameter dependency
+}
+
+typedef Param2<string,bool> PPETemplateDefBool;
+typedef Param4<string,int,int,int> PPETemplateDefInt;
+typedef Param4<string,float,float,float> PPETemplateDefFloat; //name, default, min, max
+typedef Param5<string,float,float,float,float> PPETemplateDefColor; //name, defaults - floats. Min/Max is always the same, no need to define it here.
+//typedef Param4<string,vector,vector,vector> PPETemplateDefVector;
+typedef Param2<string,ref array<float>> PPETemplateDefVector; //needs to be compatible with every type of vector (vector2 to vector4), hence array<float>...
+typedef Param2<string,string> PPETemplateDefTexture; //Currently unused, setting these parameters during runtime can prove problematic
+typedef Param2<string,string> PPETemplateDefResource; //Currently unused, setting these parameters during runtime can prove problematic
diff --git a/scripts/3_Game/DayZ/PPEManager/PPEManager.c b/scripts/3_Game/DayZ/PPEManager/PPEManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd97d7107f72d1bf82c2c2dfff2d5366c3f43e94
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/PPEManager.c
@@ -0,0 +1,397 @@
+//! Static component of PPE manager, used to hold the instance.
+class PPEManagerStatic
+{
+	static ref PPEManager m_Manager;
+	
+	static void CreateManagerStatic()
+	{
+		if (m_Manager)
+		{
+			Debug.Log("PPEManagerStatic | CreateManagerStatic - PPEManager already exists");
+			return;
+		}
+		
+		m_Manager = new PPEManager;
+	}
+	
+	static void DestroyManagerStatic()
+	{
+		if (m_Manager)
+		{
+			m_Manager.Cleanup();
+			delete m_Manager;
+		}
+	}
+	
+	//! Returns the manager instance singleton
+	static PPEManager GetPPEManager()
+	{
+		return m_Manager;
+	}
+}
+
+/**
+/brief Postprocess manager, responsible for updates, receiving, and re-distributing requester data to their respective destinations.
+	/par Basic post process flow outline:
+	Getting a registered 'PPERequester' instance from the 'PPERequesterBank'
+	
+	/par
+	Launching the requester, either through an overriden 'Start' method, or custom method with some setters (both flag it as active and to be processed)
+	
+	/par On render update, PPEManager:
+	Handles queued requester changes, re-distributes individual commands to material structure
+		
+		/par
+		Updates the material/parameter structure and calculates the blend values
+		
+		/par
+		Sets the final values via native functions (only called once per changed parameter - optimization stonks)
+	
+	/note Requester serves as a centralized platform for specific effec/group of effects. Although technically the direct commands to mat/param would be feasible, this allows for easier control of effect groups,
+	/note and clearer command hierarchy (no value setters without clear parentage).
+*/
+class PPEManager extends Managed
+{
+	const int CAMERA_ID = 0;
+	
+	protected bool 									m_ManagerInitialized;
+	protected ref map<int, ref PPEClassBase> 		m_PPEClassMap; //contains sorted postprocess classes, IDs in 'PostProcessEffectType' // <MaterialID,<material_class>>
+	protected ref map<int, ref array<int>> 			m_PPEMaterialUpdateQueueMap; //multiple levels of update queues, to allow for multiple dependent updates during same frame (greedy?)
+	protected ref array<int> 						m_UpdatedMaterials;
+	protected ref array<ref PPERequesterBase> 		m_ExistingPostprocessRequests; //which requests are active overall. Does not have to be updating ATM!
+	protected ref array<ref PPERequesterBase> 		m_UpdatingRequests; //which requests are currently updating and processing
+	
+	void PPEManager()
+	{
+		m_ManagerInitialized = false;
+		PPERequesterBank.Init();
+	}
+	
+	void Cleanup()
+	{
+		PPERequesterBank.Cleanup();
+		
+		if (m_ManagerInitialized)
+		{
+			m_PPEMaterialUpdateQueueMap.Clear();
+			m_ExistingPostprocessRequests.Clear();
+			m_UpdatingRequests.Clear();
+			m_PPEClassMap.Clear();
+		}
+	}
+	
+	//! Launched from 'DayZGame.DeferredInit' to make earlier access, use, and updates impossible (downside of a non-static system)
+	void Init()
+	{
+		//DbgPrnt("PPEDebug | PPEManager | m_ManagerInitialized: " + m_ManagerInitialized);
+		if (!m_ManagerInitialized)
+		{
+			m_PPEMaterialUpdateQueueMap = new map<int, ref array<int>>;
+			m_UpdatedMaterials = new array<int>;
+			m_ExistingPostprocessRequests = new array<ref PPERequesterBase>;
+			m_UpdatingRequests = new array<ref PPERequesterBase>;
+			InitPPEManagerClassMap();
+			
+			GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(this.Update); //can be safely and easily 'disabled' here
+			m_ManagerInitialized = true;
+		}
+	}
+	
+	//! Ordered by 'PostProcessEffectType' for easy access through the same enum; ID saved all the same
+	protected void InitPPEManagerClassMap()
+	{
+		if (m_PPEClassMap)
+		{
+			delete m_PPEClassMap;
+		}
+		m_PPEClassMap = new map<int, ref PPEClassBase>;
+		
+		RegisterPPEClass(new PPENone()); //dummy
+		RegisterPPEClass(new PPEUnderWater());
+		RegisterPPEClass(new PPESSAO());
+		RegisterPPEClass(new PPEDepthOfField());
+		RegisterPPEClass(new PPEHBAO());
+		RegisterPPEClass(new PPERotBlur());
+		RegisterPPEClass(new PPEGodRays());
+		RegisterPPEClass(new PPERain());
+		RegisterPPEClass(new PPEFilmGrain());
+		RegisterPPEClass(new PPERadialBlur());
+		RegisterPPEClass(new PPEChromAber());
+		RegisterPPEClass(new PPEWetDistort());
+		RegisterPPEClass(new PPEDynamicBlur());
+		RegisterPPEClass(new PPEColorGrading());
+		RegisterPPEClass(new PPEColors());
+		RegisterPPEClass(new PPEGlow());
+		RegisterPPEClass(new PPESMAA());
+		RegisterPPEClass(new PPEFXAA());
+		RegisterPPEClass(new PPEMedian());
+		RegisterPPEClass(new PPESunMask());
+		RegisterPPEClass(new PPEGaussFilter());
+		RegisterPPEClass(new PPEExposureNative());
+		RegisterPPEClass(new PPEEyeAccomodationNative());
+		RegisterPPEClass(new PPEDOF());
+		RegisterPPEClass(new PPELightIntensityParamsNative());
+	}
+	
+	//! Registeres material class and creates data structure within
+	protected void RegisterPPEClass(PPEClassBase material_class)
+	{
+		m_PPEClassMap.Set(material_class.GetPostProcessEffectID(), material_class);
+	}
+	
+	void SendMaterialValueData(PPERequestParamDataBase data)
+	{
+		//DbgPrnt("DataVerification | m_ColorTarget | SendMaterialValueData: " + PPERequestParamDataColor.Cast(data).m_ColorTarget[0] + "/" + PPERequestParamDataColor.Cast(data).m_ColorTarget[1] + "/" + PPERequestParamDataColor.Cast(data).m_ColorTarget[2] + "/" + PPERequestParamDataColor.Cast(data).m_ColorTarget[3]);
+		PPEClassBase mat_class = m_PPEClassMap.Get(data.GetMaterialID());
+		mat_class.InsertParamValueData(data);
+		SetMaterialParamUpdating(data.GetMaterialID(),data.GetParameterID(),PPEConstants.DEPENDENCY_ORDER_BASE);
+	}
+	
+	//! Queues material/parameter to update (once)
+	void SetMaterialParamUpdating(int material_id, int parameter_id, int order)
+	{
+		if ( order > PPEConstants.DEPENDENCY_ORDER_HIGHEST )
+		{
+			//DbgPrnt("PPEDebug | PPEManager - SetMaterialParamUpdating | Order higher than max, ignoring! | mat/par/ord: " + material_id + "/" + parameter_id + "/" + order);
+			return;
+		}
+		
+		PPEClassBase mat_class = m_PPEClassMap.Get(material_id);
+		
+		//DbgPrnt("PPEDebug | PPEManager - SetMaterialParamUpdating | mat/par: " + material_id + "/" + parameter_id);
+		//insert material into queue
+		if ( !m_PPEMaterialUpdateQueueMap.Contains(order) )
+			m_PPEMaterialUpdateQueueMap.Set(order,new array<int>);
+		
+		int found = m_PPEMaterialUpdateQueueMap.Get(order).Find(material_id);
+		if ( found == -1 )
+		{
+			m_PPEMaterialUpdateQueueMap.Get(order).Insert(material_id);
+		}
+		
+		mat_class.SetParameterUpdating(order,parameter_id);
+	}
+	
+	//! Currently unused, requests remain in the hierarchy and are used when needed (slightly faster than constantly re-shuffilng the arrays)
+	void RemoveMaterialUpdating(int material_id, int order = 0)
+	{
+		if ( m_PPEMaterialUpdateQueueMap.Contains(order) )
+		{
+			m_PPEMaterialUpdateQueueMap.Get(order).RemoveItem(material_id);
+			
+			if ( m_PPEMaterialUpdateQueueMap.Get(order).Count() == 0)
+				m_PPEMaterialUpdateQueueMap.Remove(order);
+		}
+	}
+	
+	protected void ClearMaterialUpdating()
+	{
+		m_PPEMaterialUpdateQueueMap.Clear();
+	}
+	
+	//! Marks requester as 'active'. Currently indistinguiishable from 'updating' requester, can potentially be used for intermittently updated requesters
+	void SetRequestActive(PPERequesterBase request, bool active)
+	{
+		int found = m_ExistingPostprocessRequests.Find(request);
+		if ( active && found == -1 )
+		{
+			m_ExistingPostprocessRequests.Insert(request);
+		}
+		else if ( !active && found > -1 ) //should always be found in this case, redundant?
+		{
+			//RemoveActiveRequestFromMaterials(request);
+			
+			m_ExistingPostprocessRequests.Remove(found);
+		}
+	}
+	
+	//! Marks requester as 'updating' and to be processed on manager update
+	void SetRequestUpdating(PPERequesterBase request, bool active)
+	{
+		if (!m_UpdatingRequests)
+		{
+			Debug.Log("PPEManager | SetRequestUpdating | !m_UpdatingRequests");
+			return;
+		}
+		
+		int idx = m_UpdatingRequests.Find(request);
+		
+		if ( active && idx == -1 )
+		{
+			m_UpdatingRequests.Insert(request);
+		}
+		else if ( !active && idx > -1 )
+		{
+			m_UpdatingRequests.Remove(idx);
+		}
+	}
+	
+	// Just a getter
+	bool GetExistingRequester(typename req, out PPERequesterBase ret)
+	{
+		int idx = m_ExistingPostprocessRequests.Find(PPERequesterBank.GetRequester(req));
+		if (idx > -1)
+		{
+			ret = m_ExistingPostprocessRequests.Get(idx);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsAnyRequesterRunning(array<typename> requesters)
+	{
+		foreach (typename requesterType : requesters)
+		{
+			PPERequesterBase ppeRequester;
+			GetExistingRequester(requesterType, ppeRequester);
+			if (ppeRequester && ppeRequester.IsRequesterRunning())
+				return true;
+		}
+		
+		return false;
+	}
+	
+	/**
+	/brief Originally designed to rip the requester data from all relevant mat/params, but that proved too costly and volatile.
+	/note Still, it is here, use at your own peril.
+	*/
+	protected void RemoveActiveRequestFromMaterials(PPERequesterBase req)
+	{
+		int count = req.GetActiveRequestStructure().Count();
+		int mat_id;
+		for (int i = 0; i < count; i++)
+		{
+			mat_id = req.GetActiveRequestStructure().GetKey(i);
+			PPEClassBase mat_class = m_PPEClassMap.Get(mat_id);
+			mat_class.RemoveRequest(req.GetRequesterIDX());
+		}
+	}
+	
+	//! Unused cleanup method, should it be ever needed
+	protected void RequestsCleanup()
+	{
+	}
+	
+	//! Marks material class as updated and values to be set in the course of update - 'ProcessApplyValueChanges'
+	void InsertUpdatedMaterial(int mat_id)
+	{
+		if ( m_UpdatedMaterials.Find(mat_id) == -1 )
+			m_UpdatedMaterials.Insert(mat_id);
+	}
+	
+	//---------//
+	//PROCESSING
+	//---------//
+	protected void ProcessRequesterUpdates(float timeslice)
+	{
+		PPERequesterBase req;
+		for (int i = 0; i < m_UpdatingRequests.Count(); i++)
+		{
+			//DbgPrnt("PPEDebug | ProcessRequesterUpdates | m_UpdatingRequests[i]: " + m_UpdatingRequests[i]);
+			req = m_UpdatingRequests.Get(i);
+			if (req)
+				req.OnUpdate(timeslice);
+		}
+	}
+	
+	protected void ProcessMaterialUpdates(float timeslice)
+	{
+		for (int i = 0; i < m_PPEMaterialUpdateQueueMap.Count(); i++) //orders (levels?)
+		{
+			//DbgPrnt("PPEDebug | ProcessMaterialUpdates | GetKey " + i + ": " + m_PPEMaterialUpdateQueueMap.GetKey(i));
+			//DbgPrnt("PPEDebug | ProcessMaterialUpdates | GetElement - count " + i + ": " + m_PPEMaterialUpdateQueueMap.GetElement(i).Count());
+			
+			for (int j = 0; j < m_PPEMaterialUpdateQueueMap.GetElement(i).Count(); j++)
+			{
+				PPEClassBase mat_class = m_PPEClassMap.Get(m_PPEMaterialUpdateQueueMap.GetElement(i).Get(j));
+				mat_class.OnUpdate(timeslice,i);
+			}
+		}
+	}
+	
+	protected void ProcessApplyValueChanges()
+	{
+		int material_id;
+		for (int i = 0; i < m_UpdatedMaterials.Count(); i++)
+		{
+			material_id = m_UpdatedMaterials.Get(i);
+			PPEClassBase mat_class = m_PPEClassMap.Get(material_id);
+			mat_class.ApplyValueChanges();
+		}
+		
+		m_UpdatedMaterials.Clear();
+		ClearMaterialUpdating();
+	}
+	
+	void Update(float timeslice)
+	{
+		if (!m_ManagerInitialized)
+			return;
+		
+		ProcessRequesterUpdates(timeslice);
+		ProcessMaterialUpdates(timeslice);
+		ProcessApplyValueChanges();
+		RequestsCleanup(); //unused
+	}
+	
+	//! Returns default values as Param. See 'PPEConstants' file for various typedefs used
+	Param GetPostProcessDefaultValues(int material, int parameter)
+	{
+		PPEClassBase mat_class = m_PPEClassMap.Get(material);
+		return mat_class.GetParameterCommandData(parameter).GetDefaultValues();
+	}
+	
+	//! Returns current values as Param. See 'PPEConstants' file for various typedefs used
+	Param GetPostProcessCurrentValues(int material, int parameter)
+	{
+		PPEClassBase mat_class = m_PPEClassMap.Get(material);
+		return mat_class.GetParameterCommandData(parameter).GetCurrentValues();
+	}
+	
+	//TODO - certain C++ events may change the actual material path with a graphics option changes. Reflect this on script-side!
+	//Currently only SSAY/HBAO affected...welp.
+	//! Changes material file associated with the script material class. Will be used very rarely, mostly set in C++ anyway.
+	void ChangePPEMaterial(PostProcessPrioritiesCamera priority, PostProcessEffectType type, string path, bool scriptside_only)
+	{
+		if (m_PPEClassMap.Contains(type))
+		{
+			PPEClassBase mat_class = m_PPEClassMap.Get(type);
+			typename name = mat_class.Type();
+			PPEClassBase postprocess_capsule = PPEClassBase.Cast(name.Spawn());
+			postprocess_capsule.ChangeMaterialPathUsed(path);
+			
+			if (postprocess_capsule.GetMaterial() == 0x0)
+			{
+				Debug.Log("PPEManager | Invalid material path " + path + " used for " + name );
+				return;
+			}
+			
+			//m_PPEClassMap.Remove(type);
+			m_PPEClassMap.Set(type,postprocess_capsule);
+		}
+		
+		//can be sent script-side only to adapt to c++ options changes
+		if (!scriptside_only)
+			SetCameraPostProcessEffect(CAMERA_ID,priority,type,path);
+	}
+	
+	//! stops all effects of a certain kind
+	void StopAllEffects(int mask = 0)
+	{
+		if (m_ExistingPostprocessRequests)
+		{		
+			foreach (PPERequesterBase requester : m_ExistingPostprocessRequests)
+			{
+				if (requester.GetCategoryMask() & mask)
+				{
+					requester.Stop();
+				}
+			}
+		}
+	}
+	
+	void DbgPrnt(string text)
+	{
+		//Debug.Log(""+text);
+	}
+};
diff --git a/scripts/3_Game/DayZ/PPEManager/PPERequestData.c b/scripts/3_Game/DayZ/PPEManager/PPERequestData.c
new file mode 100644
index 0000000000000000000000000000000000000000..337103af5567b5abbb115f114dbde5496d9e1dd4
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/PPERequestData.c
@@ -0,0 +1,187 @@
+//! Data for one material parameter, requester side
+class PPERequestParamDataBase
+{
+	PPERequesterBase m_Requester;
+	protected bool m_UpdatingDataValues; //new values are being sent periodically
+	protected bool m_IsActive; //hasn't been stopped yet (does not have to update values)
+	protected bool m_SettingDefaultValues;
+	
+	protected int m_MaterialID;
+	protected int m_ParameterID;
+	protected int m_VariableType; //PPEConstants.VAR_TYPE_INT etc.
+	protected int m_RequesterIDX;
+	protected int m_InteractionMask;
+	protected int m_Priority; //de-facto blending layer
+	
+	void PPERequestParamDataBase(int requester_idx, int mat_id, int param_id, int data_type = 0, int priority = 0, int mask = PPOperators.SET)
+	{
+		m_RequesterIDX = requester_idx;
+		m_MaterialID = mat_id;
+		m_ParameterID = param_id;
+		m_VariableType = data_type;
+		m_Priority = priority;
+		m_InteractionMask = mask;
+		m_UpdatingDataValues = false;
+		m_SettingDefaultValues = false;
+		m_IsActive = false;
+		InitValues();
+	}
+	
+	void InitValues()
+	{
+	}
+	
+	void SetUpdatingDataValues(bool state)
+	{
+		m_UpdatingDataValues = state;
+	}
+	
+	bool GetUpdatingDataValues()
+	{
+		return m_UpdatingDataValues;
+	}
+	
+	void SetDataActive(bool state)
+	{
+		m_IsActive = state;
+	}
+	
+	bool IsDataActive()
+	{
+		return m_IsActive;
+	}
+	
+	void SetSettingDefaultValues(bool state)
+	{
+		m_SettingDefaultValues = state;
+	}
+	
+	bool IsSettingDefaultValues()
+	{
+		return m_SettingDefaultValues;
+	}
+	
+	int GetRequesterIDX()
+	{
+		return m_RequesterIDX;
+	}
+	
+	int GetMaterialID()
+	{
+		return m_MaterialID;
+	}
+	
+	int GetParameterID()
+	{
+		return m_ParameterID;
+	}
+	
+	int GetVarType()
+	{
+		return m_VariableType;
+	}
+	
+	void SetInteractionMask(int mask)
+	{
+		m_InteractionMask = mask;
+	}
+	
+	int GetInteractionMask()
+	{
+		return m_InteractionMask;
+	}
+	
+	void SetPriorityLayer(int priority)
+	{
+		m_Priority = priority;
+	}
+	
+	int GetPriorityLayer()
+	{
+		return m_Priority;
+	}
+}
+
+class PPERequestParamDataBool extends PPERequestParamDataBase
+{
+	bool m_BoolTarget;
+	bool m_BoolCurrent;
+	bool m_BoolLast;
+	
+	void PPERequestParamDataBool(int requester_idx, int mat_id, int param_id, int data_type = 0, int priority = 0, int mask = PPOperators.SET, bool relative = false )
+	{
+		m_BoolCurrent = 0;
+		m_BoolLast = 0;
+		m_VariableType = PPEConstants.VAR_TYPE_BOOL;
+	}
+}
+
+class PPERequestParamDataInt extends PPERequestParamDataBase
+{
+	int m_IntTarget;
+	int m_IntCurrent;
+	int m_IntLast;
+	
+	void PPERequestParamDataInt(int requester_idx, int mat_id, int param_id, int data_type = 0, int priority = 0, int mask = PPOperators.SET, bool relative = false )
+	{
+		m_IntCurrent = -1;
+		m_IntLast = -1;
+		m_VariableType = PPEConstants.VAR_TYPE_INT;
+	}
+}
+
+class PPERequestParamDataFloat extends PPERequestParamDataBase
+{
+	float m_FloatTarget;
+	float m_FloatCurrent;
+	float m_FloatLast;
+	
+	float m_FloatFormerTarget;//former target; remnants of a fading mechanic...revise and re-connect?
+	float m_FloatStart;//actual start value; remnants of a fading mechanic...revise and re-connect?
+	
+	void PPERequestParamDataFloat(int requester_idx, int mat_id, int param_id, int data_type = 0, int priority = 0, int mask = PPOperators.SET, bool relative = false )
+	{
+		m_VariableType = PPEConstants.VAR_TYPE_FLOAT;
+	}
+	
+	override void InitValues()
+	{
+		m_FloatTarget = float.LOWEST;
+		m_FloatCurrent = float.LOWEST;
+		m_FloatLast = float.LOWEST;
+		m_FloatFormerTarget = float.LOWEST;
+		m_FloatStart = float.LOWEST;
+	}
+}
+
+class PPERequestParamDataColor extends PPERequestParamDataBase
+{
+	ref array<float>  m_ColorTarget;
+	ref array<float>  m_ColorCurrent;
+	ref array<float>  m_ColorLast;
+	
+	ref array<float>  m_ColorFormerTarget;//former target; remnants of a fading mechanic...revise and re-connect?
+	ref array<float>  m_ColorStart;//actual start values; remnants of a fading mechanic...revise and re-connect?
+	
+	void PPERequestParamDataColor(int requester_idx, int mat_id, int param_id, int data_type = 0, int priority = 0, int mask = PPOperators.SET, bool relative = false )
+	{
+		m_VariableType = PPEConstants.VAR_TYPE_COLOR;
+	}
+	
+	override void InitValues()
+	{
+		m_ColorTarget = {0.0,0.0,0.0,0.0};
+		m_ColorCurrent = {0,0.0,0.0,0.0};
+		m_ColorLast = {0.0,0.0,0.0,0.0};
+		m_ColorFormerTarget = {0.0,0.0,0.0,0.0};
+		m_ColorStart = {0.0,0.0,0.0,0.0};
+	}
+}
+
+//TODO
+class PPERequestParamDataVector extends PPERequestParamDataBase
+{
+	vector m_VectorTarget;
+	vector m_VectorCurrent;
+	vector m_VectorLast;
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/PPERequesterBank.c b/scripts/3_Game/DayZ/PPEManager/PPERequesterBank.c
new file mode 100644
index 0000000000000000000000000000000000000000..f1bb95895afc2b84d8676299d11c869a5f6bc565
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/PPERequesterBank.c
@@ -0,0 +1,239 @@
+/**
+	\brief Requester bank contains all registered type instances as singletons. Creating new instances outside of bank might be a bad idea (and a way to memory leakage)
+*/
+class PPERequesterBank extends Managed
+{
+	private static ref map<int,ref PPERequesterBase> m_Instances;
+	private static bool m_Initialized = false;
+	
+	static int m_lastID = -1;
+	
+	static const int INVALID					= -1;
+	static const int REQ_INVENTORYBLUR			= RegisterRequester(PPERequester_InventoryBlur);
+	static const int REQ_CONTROLLERDISCONNECT	= RegisterRequester(PPERequester_ControllerDisconnectBlur);
+	static const int REQ_GLASSESSPORTBLACK		= RegisterRequester(PPERequester_GlassesSportBlack);
+	static const int REQ_GLASSESSPORTBLUE		= RegisterRequester(PPERequester_GlassesSportBlue);
+	static const int REQ_GLASSESSPORTGREEN		= RegisterRequester(PPERequester_GlassesSportGreen);
+	static const int REQ_GLASSESSPORTORANGE		= RegisterRequester(PPERequester_GlassesSportOrange);
+	static const int REQ_GLASSESAVIATOR			= RegisterRequester(PPERequester_GlassesAviator);
+	static const int REQ_GLASSESDESIGNER		= RegisterRequester(PPERequester_GlassesDesignerBlack);
+	static const int REQ_GLASSESTACTICAL		= RegisterRequester(PPERequester_TacticalGoggles);
+	static const int REQ_MOTOHELMETBLACK		= RegisterRequester(PPERequester_MotoHelmetBlack);
+	static const int REQ_GLASSESWELDING			= RegisterRequester(PPERequester_WeldingMask);
+	static const int REQ_CAMERANV				= RegisterRequester(PPERequester_CameraNV);
+	static const int REQ_CAMERAADS				= RegisterRequester(PPERequester_CameraADS);
+	static const int REQ_BLOODLOSS				= RegisterRequester(PPERequester_BloodLoss);
+	static const int REQ_DEATHEFFECTS			= RegisterRequester(PPERequester_DeathDarkening);
+	static const int REQ_UNCONEFFECTS			= RegisterRequester(PPERequester_UnconEffects);
+	static const int REQ_TUNELVISSION			= RegisterRequester(PPERequester_TunnelVisionEffects);
+	static const int REQ_BURLAPSACK				= RegisterRequester(PPERequester_BurlapSackEffects);
+	static const int REQ_INTROCHROMABB			= RegisterRequester(PPERequester_IntroChromAbb);
+	static const int REQ_FEVEREFFECTS			= RegisterRequester(PPERequester_FeverEffects);
+	static const int REQ_FLASHBANGEFFECTS		= RegisterRequester(PPERequester_FlashbangEffects);
+	static const int REQ_SHOCKHITEFFECTS		= RegisterRequester(PPERequester_ShockHitReaction);
+	static const int REQ_HEALTHHITEFFECTS		= RegisterRequester(PPERequester_HealthHitReaction);
+	static const int REQ_MENUEFFECTS			= RegisterRequester(PPERequester_MenuEffects);
+	static const int REQ_CONTROLLERBLUR			= RegisterRequester(PPERequester_ControlsBlur);
+	static const int REQ_SERVERBROWSEREFFECTS	= RegisterRequester(PPERequester_ServerBrowserBlur);
+	static const int REQ_TUTORIALEFFECTS		= RegisterRequester(PPERequester_TutorialMenu);
+	static const int REQ_CONTAMINATEDAREA		= RegisterRequester(PPERequester_ContaminatedAreaTint);
+	static const int REQ_SPOOKYAREA				= RegisterRequester(PPERequester_SpookyAreaTint);
+	static const int REQ_PAINBLUR				= RegisterRequester(PPERequester_PainBlur);
+	static const int REQ_UNDERGROUND			= RegisterRequester(PPERUndergroundAcco);
+	static const int REQ_DROWNING				= RegisterRequester(PPERequester_Drowning);
+	
+	private static ref PPERequesterRegistrations 	m_Registrations; //more registrations to be placed here
+	
+	static void Init()
+	{
+		m_Registrations = new PPERequesterRegistrations;
+		
+		if (!m_Instances)
+			m_Instances = new map<int,ref PPERequesterBase>;
+		
+		m_Initialized = true;
+	}
+	
+	static void Cleanup()
+	{
+		if (m_Initialized)
+		{
+			delete m_Registrations;
+			m_Instances.Clear();
+		}
+	}
+	
+	/**
+	\brief Returns an instance (singleton) of a requester based on typename.
+	\param type \p typename Typename of the requester.
+	\return \p PPERequesterBase Requester singleton.
+	\note Returns only already registered instances, does not register anything.
+	*/
+	static PPERequesterBase GetRequester(typename type)
+	{
+		if (!type)
+		{
+			Error("Requested type is NULL!");
+			return null;
+		}
+		
+		PPERequesterBase temp;
+		PPERequesterBase ret;
+		for (int i = 0; i < m_Instances.Count(); i++)
+		{
+			temp = m_Instances.GetElement(i);
+			if (temp.Type() == type)
+			{
+				Class.CastTo(ret,temp);
+				break;
+			}
+		}
+		
+		if (!ret)
+		{
+			Debug.Log("'" + type.ToString() + "' not found in bank! Register first in 'RegisterRequester' method.");
+		}
+		return ret;
+	}
+	
+	/**
+	\brief Returns an instance (singleton) of a requester based on index.
+	\param index \p int Index of the registered requester.
+	\return \p PPERequesterBase Requester singleton.
+	\note Returns only already registered instances, does not register anything.
+	*/
+	static PPERequesterBase GetRequester(int index)
+	{
+		PPERequesterBase ret = m_Instances.Get(index);
+		
+		if (!ret)
+		{
+			Debug.Log("Requester idx '" + index + "' not found in bank! Register first in 'RegisterRequester' method.");
+		}
+		return ret;
+	}
+	
+	/**
+	\brief Returns an ID of a requester type.
+	\param type \p typename Typename of the requester.
+	\return \p int Requester ID.
+	\note Returns '-1' if not found.
+	*/
+	static int GetRequesterID(typename type)
+	{
+		int ret = -1;
+		PPERequesterBase temp;
+		
+		for (int i = 0; i < m_Instances.Count(); i++)
+		{
+			temp = m_Instances.GetElement(i);
+			if (temp.Type() == type)
+			{
+				ret = m_Instances.GetKey(i);
+			}
+		}
+		
+		if ( ret == -1 )
+		{
+			Debug.Log("Requester instance of the '" + type.ToString() + "' type not found in bank! Register first in 'RegisterRequester' method.");
+		}
+		return ret;
+	}
+	
+	/**
+	\brief Returns a typename from a requester ID.
+	\param index \p int ID of the requester.
+	\return \p typename Requester typename.
+	*/
+	static typename GetRequesterTypename(int index)
+	{
+		typename ret;
+		PPERequesterBase temp = m_Instances.Get(index);
+		if ( !temp )
+		{
+			Debug.Log("No requester exists under idx '" + index + "' in bank! Register first in 'RegisterRequester' method.");
+		}
+		else
+		{
+			ret = temp.Type();
+		}
+		
+		return ret;
+	}
+	
+	/**
+	\brief Registers new requester type.
+	\note Performed only on game start. New requesters can be registered in 'PPERequesterRegistrations'
+	*/
+	static int RegisterRequester(typename type)
+	{
+		if (!m_Instances)
+			m_Instances = new map<int,ref PPERequesterBase>;
+		
+		if ( GetRequester(type) != null )
+		{
+			//Error("Trying to register an already existing requester type: " + type);
+			Debug.Log("Trying to register an already existing requester type: " + type);
+			return -1;
+		}
+		
+		m_lastID++;
+		
+		PPERequesterBase req;
+		req = PPERequesterBase.Cast(type.Spawn());
+		req.SetRequesterIDX(m_lastID);
+		m_Instances.Set(m_lastID,req);
+		
+		return m_lastID;
+	}
+	
+	//! Verifies the instance
+	static bool VerifyRequester(PPERequesterBase req)
+	{
+		if (!m_Initialized) //initial registrations are fair game
+		{
+			return true;
+		}
+		
+		PPERequesterBase temp;
+		for (int i = 0; i < m_Instances.Count(); i++)
+		{
+			temp = m_Instances.GetElement(i);
+			if (temp == req)
+			{
+				return true;
+			}
+		}
+		
+		//Error("Requester instance " + req + " not valid! Please use registered instances from PPERequesterBank.");
+		Debug.Log("Requester instance '" + req + "' not valid! Please use registered instances from PPERequesterBank.");
+		return false;
+	}
+	
+	/*static void DumpInstances()
+	{
+		Print("DumpInstances");
+		for (int i = 0; i < m_Instances.Count(); i++)
+		{
+			Print(m_Instances.GetKey(i));
+			Print(m_Instances.GetElement(i));
+		}
+	}*/
+}
+
+//! Mod this, if you wish to register custom requesters
+class PPERequesterRegistrations extends Managed
+{
+	void PPERequesterRegistrations()
+	{
+		//PPERequesterBank.RegisterRequester(TestReq);
+	}
+}
+
+/*modded class PPERequesterRegistrations extends Managed
+{
+	void PPERequesterRegistrations()
+	{
+		PPERequesterBank.RegisterRequester(TestReq2);
+	}
+}*/
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERBloodLoss.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERBloodLoss.c
new file mode 100644
index 0000000000000000000000000000000000000000..cbd3541d73381326aed3764d7128e545d25aa12b
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERBloodLoss.c
@@ -0,0 +1,7 @@
+class PPERequester_BloodLoss extends PPERequester_GameplayBase
+{
+	void SetBloodLossLevel(float level)
+	{
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_SATURATION,true,level,PPEGlow.L_22_BLOODLOSS,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERBurlapSack.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERBurlapSack.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7d12160fa0a36a881e91311079f37fbf9f407c2
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERBurlapSack.c
@@ -0,0 +1,27 @@
+class PPERequester_BurlapSackEffects extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,-100.0,PPEExposureNative.L_0_BURLAP,PPOperators.SET);
+		SetTargetValueFloat(PPEExceptions.EYEACCOM,PPEEyeAccomodationNative.PARAM_INTENSITY,false,0.0,PPEEyeAccomodationNative.L_0_BURLAP,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTE,false,2.0,PPEGlow.L_25_BURLAP,PPOperators.SET);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTECOLOR,{0.0,0.0,0.0,0.0},PPEGlow.L_26_BURLAP,PPOperators.LOWEST);
+		
+		if (GetGame() && GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+		{
+			GetGame().GetMission().GetEffectWidgets().AddSuspendRequest(EffectWidgetSuspends.BURLAPSACK);//these should probably be elsewhere, PPEs are mission independent
+		}
+	}
+	
+	override protected void OnStop(Param par = null)
+	{
+		super.OnStop();
+		
+		if (GetGame() && GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+		{
+			GetGame().GetMission().GetEffectWidgets().RemoveSuspendRequest(EffectWidgetSuspends.BURLAPSACK);//these should probably be elsewhere, PPEs are mission independent
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERCameraADS_Opt.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERCameraADS_Opt.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba555afe3ed7ef67a3861576734ef1c5582fca88
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERCameraADS_Opt.c
@@ -0,0 +1,63 @@
+class PPERequester_CameraADS extends PPERequester_GameplayBase
+{
+	void SetValuesOptics(out array<float> mask_array, out array<float> lens_array, float gauss = 0.0)
+	{
+		//mask
+		GetGame().ResetPPMask();
+		if (mask_array.Count() != 4)
+		{
+			mask_array = {0.0,0.0,0.0,0.0};
+		}
+		GetGame().AddPPMask(mask_array[0], mask_array[1], mask_array[2], mask_array[3]);
+		
+		//lens
+		if (lens_array.Count() != 4)
+		{
+			lens_array = {0.0,0.0,0.0,0.0};
+		}
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_LENSDISTORT,false,lens_array[0],PPEGlow.L_27_ADS,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_MAXCHROMABBERATION,false,lens_array[1],PPEGlow.L_28_ADS,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_LENSCENTERX,false,lens_array[2],PPEGlow.L_29_ADS,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_LENSCENTERY,false,lens_array[3],PPEGlow.L_30_ADS,PPOperators.SET);
+		
+		//DOF - no DOF in optics
+		SetTargetValueBoolDefault(PPEExceptions.DOF,PPEDOF.PARAM_ENABLE);
+		
+		//blur
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,false,gauss,PPEGaussFilter.L_0_ADS,PPOperators.ADD_RELATIVE);
+	}
+	
+	void SetValuesIronsights(out array<float> DOF_array)
+	{
+		//mask - no mask
+		GetGame().ResetPPMask();
+		
+		//lens - no lens
+		SetTargetValueFloatDefault(PostProcessEffectType.Glow,PPEGlow.PARAM_LENSDISTORT);
+		SetTargetValueFloatDefault(PostProcessEffectType.Glow,PPEGlow.PARAM_MAXCHROMABBERATION);
+		SetTargetValueFloatDefault(PostProcessEffectType.Glow,PPEGlow.PARAM_LENSCENTERX);
+		SetTargetValueFloatDefault(PostProcessEffectType.Glow,PPEGlow.PARAM_LENSCENTERY);
+		
+		//DOF
+		SetTargetValueBool(PPEExceptions.DOF,PPEDOF.PARAM_ENABLE,DOF_array[0],PPEDOF.L_0_ADS,PPOperators.SET);
+		SetTargetValueFloat(PPEExceptions.DOF,PPEDOF.PARAM_FOCUS_DIST,false,DOF_array[1],PPEDOF.L_1_ADS,PPOperators.SET);
+		SetTargetValueFloat(PPEExceptions.DOF,PPEDOF.PARAM_FOCUS_LEN,false,DOF_array[2],PPEDOF.L_2_ADS,PPOperators.SET);
+		SetTargetValueFloat(PPEExceptions.DOF,PPEDOF.PARAM_FOCUS_LEN_NEAR,false,DOF_array[3],PPEDOF.L_3_ADS,PPOperators.SET);
+		SetTargetValueFloat(PPEExceptions.DOF,PPEDOF.PARAM_BLUR,false,DOF_array[4],PPEDOF.L_4_ADS,PPOperators.SET);
+		SetTargetValueFloat(PPEExceptions.DOF,PPEDOF.PARAM_FOCUS_DEPTH_OFFSET,false,DOF_array[5],PPEDOF.L_5_ADS,PPOperators.SET);
+		
+		//blur - no gauss blur (DOF bokeh only)
+		SetTargetValueFloatDefault(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY);
+	}
+	
+	override protected void OnStop(Param par = null)
+	{
+		super.OnStop(par);
+		
+		if ( !GetGame() )
+			return;
+		
+		GetGame().ResetPPMask();
+		//material parameter values reset by default on stop
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERCameraNV.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERCameraNV.c
new file mode 100644
index 0000000000000000000000000000000000000000..2fa99934cc632e7565e1d64afe5c4c993cc02dca
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERCameraNV.c
@@ -0,0 +1,93 @@
+class PPERequester_CameraNV extends PPERequester_GameplayBase
+{
+	static const int NV_NO_BATTERY= 0; //darkness
+	static const int NV_DEFAULT_OPTICS = 1;
+	static const int NV_DEFAULT_GLASSES = 2;
+	static const int NV_PUMPKIN = 3;
+	static const int NV_TRANSITIVE = 4; //resets EV during camera transitions
+	static const int NV_DAYTIME_OPTICS = 5;
+	
+	protected int m_CurrentMode;
+	protected float m_UGExposureCoef = 1.0;
+	
+	protected void SetNVMode(int mode)
+	{
+		SetTargetValueFloat(PPEExceptions.EYEACCOM,PPEEyeAccomodationNative.PARAM_INTENSITY,false,1.0,PPEEyeAccomodationNative.L_0_NVG_GENERIC,PPOperators.SET);
+		
+		switch (mode)
+		{
+			case NV_NO_BATTERY: //battery off
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.0,0.0,0.0,0.0},PPEGlow.L_23_NVG,PPOperators.MULTIPLICATIVE);
+				SetTargetValueFloatDefault(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY);
+				SetTargetValueFloatDefault(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS);
+				SetTargetValueFloatDefault(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_LIGHT_MULT,false,1.0,PPELightIntensityParamsNative.L_0_NVG,PPOperators.HIGHEST);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_NOISE_MULT,false,0.0,PPELightIntensityParamsNative.L_1_NVG,PPOperators.HIGHEST);
+			break;
+			
+			case NV_DEFAULT_OPTICS: //NV optic on
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.0,1.0,0.0,0.0},PPEGlow.L_23_NVG,PPOperators.MULTIPLICATIVE);
+				SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,7.0 * m_UGExposureCoef,PPEExposureNative.L_0_NVG_OPTIC,PPOperators.ADD);
+				SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS,false,9.0,PPEFilmGrain.L_1_NVG,PPOperators.SET);
+				SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE,false,1.0,PPEFilmGrain.L_2_NVG,PPOperators.SET);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_LIGHT_MULT,false,3.0,PPELightIntensityParamsNative.L_0_NVG,PPOperators.HIGHEST);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_NOISE_MULT,false,2.0,PPELightIntensityParamsNative.L_1_NVG,PPOperators.HIGHEST);
+			break;
+			
+			case NV_DAYTIME_OPTICS: //NV optic in daytime mode
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.0,1.0,0.0,0.0},PPEGlow.L_23_NVG,PPOperators.MULTIPLICATIVE);
+				SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,2.0 * m_UGExposureCoef,PPEExposureNative.L_0_NVG_OPTIC,PPOperators.ADD);
+				SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS,false,9.0,PPEFilmGrain.L_1_NVG,PPOperators.SET);
+				SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE,false,1.0,PPEFilmGrain.L_2_NVG,PPOperators.SET);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_LIGHT_MULT,false,3.0,PPELightIntensityParamsNative.L_0_NVG,PPOperators.HIGHEST);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_NOISE_MULT,false,1.0,PPELightIntensityParamsNative.L_1_NVG,PPOperators.HIGHEST);
+			break;
+			
+			case NV_DEFAULT_GLASSES: //goggles on
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.0,1.0,0.0,0.0},PPEGlow.L_23_NVG,PPOperators.MULTIPLICATIVE);
+				SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,7.0 * m_UGExposureCoef,PPEExposureNative.L_0_NVG_GOGGLES,PPOperators.ADD);
+				SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS,false,10.0,PPEFilmGrain.L_1_NVG,PPOperators.SET);
+				SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE,false,1.0,PPEFilmGrain.L_2_NVG,PPOperators.SET);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_LIGHT_MULT,false,2.0,PPELightIntensityParamsNative.L_0_NVG,PPOperators.HIGHEST);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_NOISE_MULT,false,1.0,PPELightIntensityParamsNative.L_1_NVG,PPOperators.HIGHEST);
+			break;
+			
+			case NV_PUMPKIN: //pumpkin-o-vision
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{1.0,0.2,0.0,0.0},PPEGlow.L_23_NVG,PPOperators.MULTIPLICATIVE);
+				SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,5.5 * m_UGExposureCoef,PPEExposureNative.L_0_NVG_GOGGLES,PPOperators.ADD);
+				SetTargetValueFloatDefault(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS);
+				SetTargetValueFloatDefault(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_LIGHT_MULT,false,1.0,PPELightIntensityParamsNative.L_0_NVG,PPOperators.HIGHEST);
+				SetTargetValueFloat(PPEExceptions.NVLIGHTPARAMS,PPELightIntensityParamsNative.PARAM_NOISE_MULT,false,0.0,PPELightIntensityParamsNative.L_1_NVG,PPOperators.HIGHEST);
+			break;
+			
+			case NV_TRANSITIVE: //camera transition
+				//SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,0,PPEExposureNative.L_0_NVG_OFF,PPOperators.SET);
+				SetTargetValueFloatDefault(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY);
+			break;
+		}
+		
+		m_CurrentMode = mode;
+	}
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetNVMode(Param1<int>.Cast(par).param1);
+	}
+	
+	//other values reset automatically on stop
+	override protected void OnStop(Param par = null)
+	{
+		super.OnStop(par);
+	}
+	
+	void SetUndergroundExposureCoef(float coef)
+	{
+		m_UGExposureCoef = coef;
+		
+		if (m_IsRunning)
+			SetNVMode(m_CurrentMode); //TODO: improve (oof...)
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERContaminated.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERContaminated.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4366bb3b580f23a5447e767b2e4bd6a1482583c
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERContaminated.c
@@ -0,0 +1,84 @@
+// PPE when player is in contaminated area trigger
+class PPERequester_ContaminatedAreaTint extends PPERequester_GameplayBase
+{
+	protected vector m_StartRGB = vector.Zero;
+	protected float m_AccumulatedTime = 0;
+	protected bool m_FadeIn = false;
+	protected bool m_FadeOut = false;
+	
+	const float FADE_TIME = 3;
+	// the end result is 1 - the value set here
+	const float R_TARGET = 0.142; // end value 0.858
+	const float G_TARGET = 0.15; // end value 0.850
+	const float B_TARGET = 0.44; // end value 0.560
+	
+	override protected void OnStart( Param par = null )
+	{
+		super.OnStart( par );
+		
+		m_AccumulatedTime = 0;
+		
+		m_FadeIn = true;
+		m_FadeOut = false;
+		
+		SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS,false,10.0,PPEFilmGrain.L_1_TOXIC_TINT,PPOperators.HIGHEST);
+		SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE,false,1.0,PPEFilmGrain.L_2_TOXIC_TINT,PPOperators.LOWEST);
+	}
+	
+	override protected void OnUpdate( float delta )
+	{
+		super.OnUpdate( delta );
+		
+		if ( m_FadeIn && m_AccumulatedTime <= FADE_TIME )
+		{
+			m_AccumulatedTime += delta;
+		
+			m_StartRGB[0] = 1 - FadeColourMult( 0, 1, m_AccumulatedTime / FADE_TIME ) * R_TARGET;
+			m_StartRGB[1] = 1 - FadeColourMult( 0, 1, m_AccumulatedTime / FADE_TIME ) * G_TARGET;
+			m_StartRGB[2] = 1 - FadeColourMult( 0, 1, m_AccumulatedTime / FADE_TIME ) * B_TARGET;
+			
+			SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{m_StartRGB[0], m_StartRGB[1], m_StartRGB[2], 0.0},PPEGlow.L_23_TOXIC_TINT,PPOperators.MULTIPLICATIVE);
+		}
+		
+		if ( m_FadeOut )
+		{
+			if (m_AccumulatedTime <= FADE_TIME)
+			{
+				m_AccumulatedTime += delta;
+			
+				m_StartRGB[0] = ( 1 - R_TARGET ) + FadeColourMult( 0, R_TARGET, m_AccumulatedTime / FADE_TIME );
+				m_StartRGB[1] = ( 1 - G_TARGET ) + FadeColourMult( 0, G_TARGET, m_AccumulatedTime / FADE_TIME );
+				m_StartRGB[2] = ( 1 - B_TARGET ) + FadeColourMult( 0, B_TARGET, m_AccumulatedTime / FADE_TIME );
+				
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{m_StartRGB[0], m_StartRGB[1], m_StartRGB[2], 0.0},PPEGlow.L_23_TOXIC_TINT,PPOperators.MULTIPLICATIVE);
+			}
+			else
+			{
+				Stop(); //proper termination after a fadeout
+			}
+		}
+	}
+	
+	override void OnStop(Param par = null)
+	{
+		m_FadeIn = false;
+		m_FadeOut = false;
+		Param1<bool> p;
+		
+		if (par && Class.CastTo(p,par))
+			m_FadeOut = p.param1;
+		
+		m_AccumulatedTime = 0;
+		
+		super.OnStop(par);
+	}
+	
+	// Lerped multiplier for RGBA values
+	protected float FadeColourMult( float x, float y, float deltaT )
+	{
+		float output;
+		output = Math.Lerp( x, y, deltaT );
+		Easing.EaseInOutSine( output );
+		return output;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERControllerDisconnectBlur.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERControllerDisconnectBlur.c
new file mode 100644
index 0000000000000000000000000000000000000000..289c1ba3f9d53eec946732713dda7bba35e56f66
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERControllerDisconnectBlur.c
@@ -0,0 +1,9 @@
+class PPERequester_ControllerDisconnectBlur extends PPERequester_MenuBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,false,1.0,PPEGaussFilter.L_0_DISCONNECT,PPOperators.SET); //PPOperators.OVERRIDE?
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERControlsBlur.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERControlsBlur.c
new file mode 100644
index 0000000000000000000000000000000000000000..c79167006798d2d490f6914c17ba1a9c039a8aa3
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERControlsBlur.c
@@ -0,0 +1,12 @@
+class PPERequester_ControlsBlur extends PPERequester_MenuBase
+{
+	protected float m_Gauss;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Gauss = Param1<float>.Cast(par).param1;
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,m_Gauss,PPEGaussFilter.L_0_CONTROLS,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERDeathDarkening.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERDeathDarkening.c
new file mode 100644
index 0000000000000000000000000000000000000000..b8a7d0db889937ce3727ce8986ee297f72733bbe
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERDeathDarkening.c
@@ -0,0 +1,17 @@
+class PPERequester_DeathDarkening extends PPERequester_GameplayBase
+{
+	protected float m_Value;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Value = Param1<float>.Cast(par).param1;
+		//Print("PPERequester_DeathDarkening | level: " + m_Value);
+		m_Value = Easing.EaseInCubic(m_Value);
+		m_Value = Math.Lerp(0,-10,m_Value);
+		//Print("PPERequester_DeathDarkening | value: " + value);
+		
+		SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,m_Value,PPEExposureNative.L_0_DEATH,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERDrowningEffect.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERDrowningEffect.c
new file mode 100644
index 0000000000000000000000000000000000000000..12c7c35b4b57fe49083bf7cd141adb26aab95a24
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERDrowningEffect.c
@@ -0,0 +1,41 @@
+class PPERequester_Drowning extends PPERequester_GameplayBase
+{
+	private float m_EffectPhase = 0;
+	private float m_Magnitude = 0;
+	private float m_MinMagnitude = 0.3;
+	private float m_MaxMagnitude = 0.3;												// Actual Maximum is Min+Max
+	private float m_Frequency = 5;
+	private float m_Stamina01;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart(par);
+		
+		m_EffectPhase = 0;
+		m_Magnitude = 0;
+	}
+	
+	override protected void OnUpdate(float delta)
+	{			
+		super.OnUpdate(delta);
+		
+		if (!m_IsRunning)
+			return;
+		
+		m_EffectPhase += delta * m_Frequency / (m_Stamina01 + 1);	// Start with lower frequency and increase it as it gets closer to danger
+		
+		float currentVal = (Math.Sin(m_EffectPhase) +1)/2; 							// Makes current val oscillate between 0 and 1 (normlization)
+		currentVal = Easing.EaseInExpo(currentVal);									// Ease it to tweak the effect
+		currentVal *= currentVal * m_MaxMagnitude;									// Scale the normalized value to make it proportional to the Max Magnitude
+		currentVal += m_MinMagnitude;
+		m_Magnitude = Math.Lerp(m_Magnitude, currentVal, delta * m_Frequency);		// Learp to smooth the changes
+		
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTE,true, m_Magnitude,PPEGodRays.L_0_GLASSES,PPOperators.ADD);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTECOLOR,{0.0,0.025,0.04, 0.0},PPEGlow.L_23_GLASSES,PPOperators.ADD);
+	}
+	
+	void SetStamina01(float stamina01)
+	{
+		m_Stamina01 = stamina01;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERFever.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERFever.c
new file mode 100644
index 0000000000000000000000000000000000000000..7041ee8ca87722daa3cbf31c4d911cc581e7ec12
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERFever.c
@@ -0,0 +1,7 @@
+class PPERequester_FeverEffects extends PPERequester_GameplayBase
+{
+	void SetFeverIntensity(float intensity)
+	{
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,intensity,PPEGaussFilter.L_0_FEVER,PPOperators.ADD_RELATIVE);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERFlashbangEffects.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERFlashbangEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..64be65cb0cb823b7ffb7208470841932fe126b50
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERFlashbangEffects.c
@@ -0,0 +1,64 @@
+class PPERequester_FlashbangEffects extends PPERequester_GameplayBase
+{
+	const float VAL_FACTOR = 0.85;
+	const float EXPOSURE_MAX = 50;
+	protected float m_Exposure;
+	protected float m_Intensity;
+	
+	override protected void OnStart(Param par = null)
+	{
+		if (!m_IsRunning)
+		{
+			if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				GetGame().GetMission().GetEffectWidgets().AddActiveEffects({EffectWidgetsTypes.COVER_FLASHBANG});
+		}
+		
+		super.OnStart();
+	}
+	
+	override protected void OnStop(Param par = null)
+	{
+		super.OnStop();
+		
+		m_Intensity = 0.0;
+		m_Exposure = 0.0;
+		
+		if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+			GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.COVER_FLASHBANG});
+	}
+	
+	override protected void OnUpdate(float delta)
+	{
+		super.OnUpdate(delta);
+		
+		if (GetGame() && GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+		{
+			Param1<float> par = new Param1<float>(1 - m_Intensity);
+			GetGame().GetMission().GetEffectWidgets().UpdateWidgets(EffectWidgetsTypes.COVER_FLASHBANG,0,par,EffectWidgetHandles.FLASHBANG);
+		}
+	}
+	
+	void SetFlashbangIntensity(float intensity, float daytime_toggle)
+	{
+		m_Intensity = intensity;
+		array<float> overlay_color = {1.0, 1.0, 1.0, intensity};
+		if (daytime_toggle <= 5.0)
+		{
+			m_Exposure = Math.Clamp(intensity * daytime_toggle,0.0,EXPOSURE_MAX);
+		}
+		else
+		{
+			m_Exposure = Easing.EaseInQuart(intensity);
+			m_Exposure = Math.Clamp(EXPOSURE_MAX * m_Exposure,0.0,EXPOSURE_MAX);
+		}
+		overlay_color[3] = intensity;
+		
+		//blur
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,intensity,PPEGaussFilter.L_0_FLASHBANG,PPOperators.ADD_RELATIVE);
+		//overlay
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_OVERLAYFACTOR,true,intensity,PPEGlow.L_20_FLASHBANG,PPOperators.HIGHEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_OVERLAYCOLOR,overlay_color,PPEGlow.L_21_FLASHBANG,PPOperators.SET);
+		//exposure
+		SetTargetValueFloat(PPEExceptions.EXPOSURE,PPEExposureNative.PARAM_INTENSITY,false,m_Exposure,PPEExposureNative.L_0_FLASHBANG,PPOperators.ADD);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERGlasses.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERGlasses.c
new file mode 100644
index 0000000000000000000000000000000000000000..9a488633a9c067e4021ba706e6515e4c4276a6c4
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERGlasses.c
@@ -0,0 +1,81 @@
+//glasses and helmets
+//! base, not to be used directly, would lead to layering collisions!
+class PPERequester_GenericBlackGlassesBase extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.4,0.4,0.4,0.0},PPEGlow.L_23_GLASSES,PPOperators.SUBSTRACT);
+	}
+}
+
+class PPERequester_GlassesSportBlack extends PPERequester_GenericBlackGlassesBase{}
+class PPERequester_GlassesDesignerBlack extends PPERequester_GenericBlackGlassesBase{}
+class PPERequester_MotoHelmetBlack extends PPERequester_GenericBlackGlassesBase{}
+
+class PPERequester_GlassesSportBlue extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.3,0.3,0.0,0.0},PPEGlow.L_23_GLASSES,PPOperators.SUBSTRACT);
+	}
+}
+
+class PPERequester_GlassesSportGreen extends PPERequester_GameplayBase	
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.2,0.0,0.2,0.0},PPEGlow.L_23_GLASSES,PPOperators.SUBSTRACT);
+	}
+}
+
+class PPERequester_GlassesSportOrange extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.0,0.3,0.5,0.0},PPEGlow.L_23_GLASSES,PPOperators.SUBSTRACT);
+	}
+}
+
+class PPERequester_GlassesAviator extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.3,0.3,0.1,0.0},PPEGlow.L_23_GLASSES,PPOperators.SUBSTRACT);
+	}
+}
+
+class PPERequester_TacticalGoggles extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+	}
+}
+
+class PPERequester_WeldingMask extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.GodRays,PPEGodRays.PARAM_INTENSITY,true,0,PPEGodRays.L_0_GLASSES,PPOperators.LOWEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{0.7,0.7,0.7,0.0},PPEGlow.L_23_GLASSES,PPOperators.SUBSTRACT);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERHealthHit.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERHealthHit.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1c70837524801163ebbe0616b147fa76b44050d
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERHealthHit.c
@@ -0,0 +1,11 @@
+class PPERequester_HealthHitReaction extends PPERequester_GameplayBase
+{
+	const float INTENSITY_MULT = 6.0;
+	
+	void SetHitIntensity(float intensity)
+	{
+		//color overlay
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_OVERLAYFACTOR,true,0.05,PPEGlow.L_20_HIT,PPOperators.HIGHEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_OVERLAYCOLOR,{intensity * INTENSITY_MULT, 0.0, 0.0, 1.0},PPEGlow.L_21_HIT,PPOperators.HIGHEST);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERIntroChromAbb.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERIntroChromAbb.c
new file mode 100644
index 0000000000000000000000000000000000000000..42d7718e8911e84166f535cc61023366543ba6ae
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERIntroChromAbb.c
@@ -0,0 +1,10 @@
+class PPERequester_IntroChromAbb extends PPERequester_MenuBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		SetTargetValueFloat(PostProcessEffectType.ChromAber,PPEChromAber.PARAM_POWERX,false,0.002,PPEChromAber.L_0_INTRO,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.ChromAber,PPEChromAber.PARAM_POWERY,false,0.002,PPEChromAber.L_1_INTRO,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERInventoryBlur.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERInventoryBlur.c
new file mode 100644
index 0000000000000000000000000000000000000000..a121ae129d361406cbd984af9208f6e71a0094dd
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERInventoryBlur.c
@@ -0,0 +1,8 @@
+class PPERequester_InventoryBlur extends PPERequester_GameplayBase
+{
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,false,0.5,PPEGaussFilter.L_0_INV,PPOperators.SET); //PPOperators.OVERRIDE?
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERMenuEffects.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERMenuEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1ab5062ca2e82a6fb7653b8f27408e5e1652fe3
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERMenuEffects.c
@@ -0,0 +1,13 @@
+class PPERequester_MenuEffects extends PPERequester_MenuBase
+{
+	void SetBlurIntensity(float gauss)
+	{
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,gauss,PPEGaussFilter.L_0_MENU,PPOperators.SET);
+	}
+	
+	void SetVignetteIntensity(float vignette)
+	{
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTE,false,vignette,PPEGlow.L_25_MENU,PPOperators.SET);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTECOLOR,{0.0,0.0,0.0,0.0},PPEGlow.L_26_MENU,PPOperators.OVERRIDE);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERPain.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERPain.c
new file mode 100644
index 0000000000000000000000000000000000000000..15e87f2552086023720eacd20596a34237ba1bd2
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERPain.c
@@ -0,0 +1,11 @@
+class PPERequester_PainBlur extends PPERequester_GameplayBase
+{
+	void SetRadialBlur(float power_x, float power_y, float offset_x, float offset_y, float pixel_scale = 0.5 )
+	{
+		SetTargetValueFloat(PostProcessEffectType.RadialBlur,PPERadialBlur.PARAM_POWERX,false,power_x, PPERadialBlur.L_0_PAIN_BLUR ,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.RadialBlur,PPERadialBlur.PARAM_POWERY,false,power_y, PPERadialBlur.L_0_PAIN_BLUR,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.RadialBlur,PPERadialBlur.PARAM_OFFSETX,false,offset_x, PPERadialBlur.L_0_PAIN_BLUR,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.RadialBlur,PPERadialBlur.PARAM_OFFSETY,false,offset_y, PPERadialBlur.L_0_PAIN_BLUR,PPOperators.SET);
+		SetTargetValueFloat(PostProcessEffectType.RadialBlur,PPERadialBlur.PARAM_PIXELSCALE,false,pixel_scale,PPERadialBlur.L_0_PAIN_BLUR ,PPOperators.SET);
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERServerBrowser.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERServerBrowser.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2479c41dd5bed1afaf6629eee54b07d927d8073
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERServerBrowser.c
@@ -0,0 +1,13 @@
+class PPERequester_ServerBrowserBlur extends PPERequester_MenuBase
+{
+	protected float m_Gauss;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Gauss = Param1<float>.Cast(par).param1;
+		
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,m_Gauss,PPEGaussFilter.L_0_SERVER_BROWSER,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERShockHit.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERShockHit.c
new file mode 100644
index 0000000000000000000000000000000000000000..3c1a54592845140e61da7cc7f7d408952e74abf3
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERShockHit.c
@@ -0,0 +1,29 @@
+class PPERequester_ShockHitReaction extends PPERequester_GameplayBase
+{
+	protected float m_Gauss;
+	protected float m_VignetteIntensity;
+	protected float m_OverlayFactor;
+	protected ref array<float> m_OverlayColor;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Gauss = Param3<float,float,float>.Cast(par).param1;
+		m_VignetteIntensity = Param3<float,float,float>.Cast(par).param2;
+		m_OverlayFactor = Param3<float,float,float>.Cast(par).param3;
+		
+		m_OverlayColor = {0.0, 0.0, 0.0, 1.0};
+		if (m_OverlayFactor > 0.0)
+			m_OverlayColor = {0.1, 0.1, 0.1, 1.0};
+		
+		//blur
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,m_Gauss,PPEGaussFilter.L_0_SHOCK,PPOperators.ADD_RELATIVE);
+		//vignette
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTE,false,m_VignetteIntensity,PPEGlow.L_25_SHOCK,PPOperators.ADD);
+		//SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTECOLOR,{0.25,0.25,0.25,0.0},PPEGlow.L_26_SHOCK,PPOperators.ADD_RELATIVE);
+		//color overlay
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_OVERLAYFACTOR,true,m_OverlayFactor,PPEGlow.L_20_SHOCK,PPOperators.HIGHEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_OVERLAYCOLOR,m_OverlayColor,PPEGlow.L_21_SHOCK,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERSpooky.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERSpooky.c
new file mode 100644
index 0000000000000000000000000000000000000000..89f6bcbbf52eb022abf81627a46b0c24aa2b25d8
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERSpooky.c
@@ -0,0 +1,84 @@
+// PPE when player is in spooky area trigger
+class PPERequester_SpookyAreaTint extends PPERequester_GameplayBase
+{
+	protected vector m_StartRGB = vector.Zero;
+	protected float m_AccumulatedTime = 0;
+	protected bool m_FadeIn = false;
+	protected bool m_FadeOut = false;
+	
+	const float FADE_TIME = 3;
+	// the end result is 1 - the value set here
+	const float R_TARGET = 0.60; // 0.31  79   129 0.50
+	const float G_TARGET = 0.28; // 0.80 204   184 0.72
+	const float B_TARGET = 0.07; // 0.95 242   239 0.93
+	
+	override protected void OnStart( Param par = null )
+	{
+		super.OnStart( par );
+		
+		m_AccumulatedTime = 0;
+		
+		m_FadeIn = true;
+		m_FadeOut = false;
+		
+		SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_SHARPNESS,false,10.0,PPEFilmGrain.L_1_TOXIC_TINT,PPOperators.HIGHEST);
+		SetTargetValueFloat(PostProcessEffectType.FilmGrain,PPEFilmGrain.PARAM_GRAINSIZE,false,1.0,PPEFilmGrain.L_2_TOXIC_TINT,PPOperators.LOWEST);
+	}
+	
+	override protected void OnUpdate( float delta )
+	{
+		super.OnUpdate( delta );
+		
+		if ( m_FadeIn && m_AccumulatedTime <= FADE_TIME )
+		{
+			m_AccumulatedTime += delta;
+		
+			m_StartRGB[0] = 1 - FadeColourMult( 0, 1, m_AccumulatedTime / FADE_TIME ) * R_TARGET;
+			m_StartRGB[1] = 1 - FadeColourMult( 0, 1, m_AccumulatedTime / FADE_TIME ) * G_TARGET;
+			m_StartRGB[2] = 1 - FadeColourMult( 0, 1, m_AccumulatedTime / FADE_TIME ) * B_TARGET;
+			
+			SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{m_StartRGB[0], m_StartRGB[1], m_StartRGB[2], 0.0},PPEGlow.L_23_TOXIC_TINT,PPOperators.MULTIPLICATIVE);
+		}
+		
+		if ( m_FadeOut )
+		{
+			if (m_AccumulatedTime <= FADE_TIME)
+			{
+				m_AccumulatedTime += delta;
+			
+				m_StartRGB[0] = ( 1 - R_TARGET ) + FadeColourMult( 0, R_TARGET, m_AccumulatedTime / FADE_TIME );
+				m_StartRGB[1] = ( 1 - G_TARGET ) + FadeColourMult( 0, G_TARGET, m_AccumulatedTime / FADE_TIME );
+				m_StartRGB[2] = ( 1 - B_TARGET ) + FadeColourMult( 0, B_TARGET, m_AccumulatedTime / FADE_TIME );
+				
+				SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_COLORIZATIONCOLOR,{m_StartRGB[0], m_StartRGB[1], m_StartRGB[2], 0.0},PPEGlow.L_23_TOXIC_TINT,PPOperators.MULTIPLICATIVE);
+			}
+			else
+			{
+				Stop(); //proper termination after a fadeout
+			}
+		}
+	}
+	
+	override void OnStop(Param par = null)
+	{
+		m_FadeIn = false;
+		m_FadeOut = false;
+		Param1<bool> p;
+		
+		if (par && Class.CastTo(p,par))
+			m_FadeOut = p.param1;
+		
+		m_AccumulatedTime = 0;
+		
+		super.OnStop(par);
+	}
+	
+	// Lerped multiplier for RGBA values
+	protected float FadeColourMult( float x, float y, float deltaT )
+	{
+		float output;
+		output = Math.Lerp( x, y, deltaT );
+		Easing.EaseInOutSine( output );
+		return output;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERTunnel.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERTunnel.c
new file mode 100644
index 0000000000000000000000000000000000000000..feaacab1c3499d5a65607f9ea9827808c71cd0eb
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERTunnel.c
@@ -0,0 +1,14 @@
+class PPERequester_TunnelVisionEffects extends PPERequester_GameplayBase
+{
+	protected float m_Intensity;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Intensity = Param1<float>.Cast(par).param1;
+		
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTE,false,m_Intensity,PPEGlow.L_25_TUNNEL,PPOperators.HIGHEST);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTECOLOR,{0.0,0.0,0.0,0.0},PPEGlow.L_26_TUNNEL,PPOperators.LOWEST);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERTutorial.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERTutorial.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d0f176fe62f2d8506aae9e51c41d908272484cd
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERTutorial.c
@@ -0,0 +1,13 @@
+class PPERequester_TutorialMenu extends PPERequester_MenuBase
+{
+	protected float m_Gauss;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Gauss = Param1<float>.Cast(par).param1;
+		
+		SetTargetValueFloat(PostProcessEffectType.GaussFilter,PPEGaussFilter.PARAM_INTENSITY,true,m_Gauss,PPEGaussFilter.L_0_TUTORIALS,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERUnconEffects.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERUnconEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a710e534b8e8b0d5a7754a2f98d0237ac6f3196
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERUnconEffects.c
@@ -0,0 +1,14 @@
+class PPERequester_UnconEffects extends PPERequester_GameplayBase
+{
+	protected float m_Intensity;
+	
+	override protected void OnStart(Param par = null)
+	{
+		super.OnStart();
+		
+		m_Intensity = Param1<float>.Cast(par).param1;
+		
+		SetTargetValueFloat(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTE,false,m_Intensity,PPEGlow.L_25_UNCON,PPOperators.ADD);
+		SetTargetValueColor(PostProcessEffectType.Glow,PPEGlow.PARAM_VIGNETTECOLOR,{0.0,0.0,0.0,0.0},PPEGlow.L_26_UNCON,PPOperators.LOWEST);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERUndergroundAcco.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERUndergroundAcco.c
new file mode 100644
index 0000000000000000000000000000000000000000..d6fe8d9a9a2f6565966dec3aba5c133262d3f1c5
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERUndergroundAcco.c
@@ -0,0 +1,7 @@
+class PPERUndergroundAcco extends PPERequester_GameplayBase
+{
+	void SetEyeAccommodation(float value)
+	{
+		SetTargetValueFloat(PPEExceptions.EYEACCOM,PPEEyeAccomodationNative.PARAM_INTENSITY,false,value,PPEEyeAccomodationNative.L_0_UNDERGROUND,PPOperators.SET);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PPEManager/Requesters/PPERequestPlatformsBase.c b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERequestPlatformsBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f2d07a34cef88f617b5da3919a2641aafcc79855
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEManager/Requesters/PPERequestPlatformsBase.c
@@ -0,0 +1,448 @@
+
+class PPERequesterBase
+{
+	protected bool m_IsRunning; //helps determine if the requester has been stopped or not
+	protected bool m_ValuesSent;
+	protected int m_IDX;
+	
+	protected bool m_Valid = false;
+	
+	protected ref map<int,ref map<int,ref PPERequestParamDataBase>> m_RequestDataStructure; // <material<param_id,data>> // parameter data objects are singletons
+	
+	void PPERequesterBase(int requester_IDX)
+	{
+		m_Valid = PPERequesterBank.VerifyRequester(this);
+		
+		m_IDX = requester_IDX;
+		m_ValuesSent = true;
+		m_IsRunning = false;
+		m_RequestDataStructure = new map<int,ref map<int,ref PPERequestParamDataBase>>;
+	}
+	
+	//! Has to be set for the requester to be handled
+	void SetRequesterUpdating(bool state)
+	{
+		if (!m_Valid)
+		{
+			Debug.Log("" + this + " not valid!");
+			return;
+		}
+		
+		PPEManagerStatic.GetPPEManager().SetRequestUpdating(this,state);
+		
+		//TODO - separate into its own function?
+		if (state)
+			PPEManagerStatic.GetPPEManager().SetRequestActive(this,true);
+	}
+	
+	void Start(Param par = null)
+	{
+		OnStart(par);
+		m_IsRunning = true;
+	}
+	
+	void Stop(Param par = null)
+	{
+		if (!m_RequestDataStructure || m_RequestDataStructure.Count() <= 0)
+			return;
+		
+		OnStop(par);
+		m_IsRunning = false;
+	}
+	
+	bool IsRequesterRunning()
+	{
+		return m_IsRunning;
+	}
+	
+	//! automatically assigned by PPERequesterBank
+	void SetRequesterIDX(int idx)
+	{
+		m_IDX = idx;
+	}
+	
+	//! Returns requester index
+	int GetRequesterIDX()
+	{
+		return m_IDX;
+	}
+	
+	//!mask for mass-handling methods like 'StopAllEffects'
+	int GetCategoryMask()
+	{
+		return PPERequesterCategory.NONE;
+	}
+	
+	//SETTERS//
+	//vvvvvvv//
+	protected void SetTargetValueBool(int mat_id, int param_idx, bool val, int priority_layer, int operator = PPOperators.SET)
+	{
+		if ( !m_RequestDataStructure )
+			return;
+		
+		PPERequestParamDataBool data = PPERequestParamDataBool.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_BOOL));
+		data.SetPriorityLayer(priority_layer);
+		data.SetInteractionMask(operator);
+		
+		data.m_BoolTarget = val;
+		data.m_BoolLast = data.m_BoolCurrent;
+		
+		if (data.m_BoolTarget != data.m_BoolCurrent || data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(false);
+			data.SetDataActive(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueBool | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueBoolDefault(int mat_id, int param_idx)
+	{
+		//TODO - running check and cleanup rework (elsewhere!)
+		if ( !m_RequestDataStructure || !m_RequestDataStructure.Get(mat_id) || !m_RequestDataStructure.Get(mat_id).Get(param_idx))
+			return;
+		
+		PPERequestParamDataBool data = PPERequestParamDataBool.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_BOOL));
+		data.m_BoolLast = data.m_BoolCurrent;
+		if (!data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueBoolDefault | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueInt(int mat_id, int param_idx, bool relative, int val, int priority_layer, int operator = PPOperators.SET)
+	{
+		if ( !m_RequestDataStructure )
+			return;
+		
+		PPERequestParamDataInt data = PPERequestParamDataInt.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_INT));
+		data.SetPriorityLayer(priority_layer);
+		data.SetInteractionMask(operator);
+		
+		data.m_IntTarget = val;
+		data.m_IntLast = data.m_IntCurrent;
+		if (data.m_IntTarget != data.m_IntCurrent || data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(false);
+			data.SetDataActive(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueInt | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueIntDefault(int mat_id, int param_idx)
+	{
+		//TODO - running check and cleanup rework (elsewhere!)
+		if ( !m_RequestDataStructure || !m_RequestDataStructure.Get(mat_id) || !m_RequestDataStructure.Get(mat_id).Get(param_idx))
+			return;
+		
+		PPERequestParamDataInt data = PPERequestParamDataInt.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_INT));
+		data.m_IntLast = data.m_IntCurrent;
+		if (!data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueIntDefault | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueFloat(int mat_id, int param_idx, bool relative, float val, int priority_layer, int operator = PPOperators.ADD_RELATIVE)
+	{
+		if ( !m_RequestDataStructure )
+			return;
+		
+		PPERequestParamDataFloat data = PPERequestParamDataFloat.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_FLOAT));
+		data.SetPriorityLayer(priority_layer);
+		data.SetInteractionMask(operator);
+		
+		data.m_FloatFormerTarget = data.m_FloatTarget;
+		data.m_FloatTarget = RelativizeValue(val,PPEConstants.VAR_TYPE_FLOAT,mat_id,param_idx,relative);
+		data.m_FloatLast = data.m_FloatCurrent;
+		data.m_FloatStart = data.m_FloatCurrent;
+		if (data.m_FloatTarget != data.m_FloatCurrent || data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(false);
+			data.SetDataActive(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueFloat | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueFloatDefault(int mat_id, int param_idx)
+	{
+		//TODO - running check and cleanup rework (elsewhere!)
+		if ( !m_RequestDataStructure || !m_RequestDataStructure.Get(mat_id) || !m_RequestDataStructure.Get(mat_id).Get(param_idx))
+			return;
+		
+		PPERequestParamDataFloat data = PPERequestParamDataFloat.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_FLOAT));
+		data.m_FloatFormerTarget = data.m_FloatTarget;
+		data.m_FloatLast = data.m_FloatCurrent;
+		data.m_FloatStart = data.m_FloatCurrent;
+		if (!data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueFloatDefault | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueColor(int mat_id, int param_idx, ref array<float> val, int priority_layer, int operator = PPOperators.ADD_RELATIVE)
+	{
+		if ( !m_RequestDataStructure )
+			return;
+		
+		PPERequestParamDataColor data = PPERequestParamDataColor.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_COLOR));
+		data.SetPriorityLayer(priority_layer);
+		data.SetInteractionMask(operator);
+		data.m_ColorFormerTarget = data.m_ColorTarget;
+		
+		data.m_ColorTarget.Copy(val);
+		
+		data.m_ColorLast = data.m_ColorCurrent;
+		data.m_ColorStart = data.m_ColorCurrent;
+		//if (data.m_ColorTarget != data.m_ColorCurrent)
+		{
+			data.SetSettingDefaultValues(false);
+			data.SetDataActive(true);
+					
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueColor | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	protected void SetTargetValueColorDefault(int mat_id, int param_idx)
+	{
+		//TODO - running check and cleanup rework (elsewhere!)
+		if ( !m_RequestDataStructure || !m_RequestDataStructure.Get(mat_id) || !m_RequestDataStructure.Get(mat_id).Get(param_idx))
+			return;
+		
+		PPERequestParamDataColor data = PPERequestParamDataColor.Cast(GetRequestData(mat_id,param_idx,PPEConstants.VAR_TYPE_COLOR));
+		data.m_ColorFormerTarget = data.m_ColorTarget;
+		data.m_ColorLast = data.m_ColorCurrent;
+		data.m_ColorStart = data.m_ColorCurrent;
+		if (!data.IsSettingDefaultValues())
+		{
+			data.SetSettingDefaultValues(true);
+			
+			QueueValuesSend();
+		}
+		//DbgPrnt("PPEDebug | PPERequesterBase - SetTargetValueColorDefault | mat/par/req: " + mat_id + "/" + param_idx + "/" + m_IDX + " | data: " + data);
+	}
+	
+	/*protected void SetTargetValueVector(int mat_id, int param_idx, bool relative, vector val, int priority_layer, int operator = PPOperators.ADD_RELATIVE)
+	{
+	}
+	
+	void SetTargetValueTexture(int mat_id, int param_idx, string val, int priority_layer, int mask, bool override_priority = false)
+	{
+	}*/
+	
+	/*void SetTargetValueResource(int mat_id, int param_idx, string val, int priority_layer, int mask, bool override_priority = false)
+	{
+	}*/
+	
+	//! Sets this requester to update in the manager
+	protected void QueueValuesSend()
+	{
+		m_ValuesSent = false;
+		//m_IsRunning = true;
+		SetRequesterUpdating(true);
+	}
+	
+	//! returns request data for specific parameter, or creates one if one does not exist in this request yet (singletons)
+	PPERequestParamDataBase GetRequestData(int mat_id, int param_idx, int type)
+	{
+		PPERequestParamDataBase data;
+		if ( m_RequestDataStructure.Get(mat_id) )
+		{
+			if (m_RequestDataStructure.Get(mat_id).Get(param_idx))
+			{
+				data = m_RequestDataStructure.Get(mat_id).Get(param_idx);
+			}
+			else
+			{
+				data = PrepareData(mat_id,param_idx,type);
+				m_RequestDataStructure.Get(mat_id).Set(param_idx,data);
+			}
+		}
+		else
+		{
+			data = PrepareData(mat_id,param_idx,type);
+			map<int,ref PPERequestParamDataBase> temp_map = new map<int,ref PPERequestParamDataBase>;
+			temp_map.Set(param_idx,data);
+			m_RequestDataStructure.Set(mat_id, temp_map);
+		}
+		
+		if (!data)
+		{
+			Error("GetRequestData | no data found in the structure");
+		}
+		
+		data.m_Requester = this;
+		
+		return data;
+	}
+	
+	protected PPERequestParamDataBase PrepareData(int mat_id, int param_idx, int type)
+	{
+		PPERequestParamDataBase data;
+		switch (type)
+		{
+			case PPEConstants.VAR_TYPE_BOOL:
+				data = new PPERequestParamDataBool(m_IDX, mat_id, param_idx);
+			break;
+			
+			case PPEConstants.VAR_TYPE_INT:
+				data = new PPERequestParamDataInt(m_IDX, mat_id, param_idx);
+			break;
+			
+			case PPEConstants.VAR_TYPE_FLOAT:
+				data = new PPERequestParamDataFloat(m_IDX, mat_id, param_idx);
+			break;
+			
+			case PPEConstants.VAR_TYPE_COLOR:
+				data = new PPERequestParamDataColor(m_IDX, mat_id, param_idx);
+			break;
+		}
+		return data;
+	}
+	
+	// unused?
+	map<int,ref map<int,ref PPERequestParamDataBase>> GetActiveRequestStructure()
+	{
+		return m_RequestDataStructure;
+	}
+	
+	protected void ClearRequesterData()
+	{
+		m_RequestDataStructure.Clear();
+	}
+	
+	protected void SendCurrentValueData(PPERequestParamDataBase data)
+	{
+		PPEManagerStatic.GetPPEManager().SendMaterialValueData(data);
+	}
+	
+	//EVENTS//
+	//vvvvvv//
+	void OnUpdate(float delta)
+	{
+		//DbgPrnt("PPEDebug | PPERequesterBase | OnUpdate");
+		
+		if ( !m_ValuesSent )
+		{
+			for (int i = 0; i < m_RequestDataStructure.Count(); i++)
+			{
+				for (int j = 0; j < m_RequestDataStructure.GetElement(i).Count(); j++)
+				{
+					SendCurrentValueData(m_RequestDataStructure.GetElement(i).GetElement(j)); //map<int,ref map<int,PPERequestParamDataBase>> //<material<param,data>>
+				}
+			}
+			m_ValuesSent = true;
+		}
+		SetRequesterUpdating(false);
+	}
+	
+	protected void OnStart(Param par = null)
+	{
+		SetRequesterUpdating(true);
+	}
+	
+	//! automatically resets all material parameters of this requester to defaults
+	protected void OnStop(Param par = null)
+	{
+		//DbgPrnt("PPEDebug | " + this + " | OnStop");
+		SetRequesterUpdating(true);
+		SetDefaultValuesAll();
+	}
+	
+	//! converts all values used to relative values (if not relative already)
+	protected float RelativizeValue(float value, int var_type, int mat_id, int param_id, bool relative)
+	{
+		float ret = value;
+		if (!relative) //if not already relative...
+		{
+			switch (var_type)
+			{
+				case PPEConstants.VAR_TYPE_FLOAT:
+					PPETemplateDefFloat p_float = PPETemplateDefFloat.Cast(PPEManagerStatic.GetPPEManager().GetPostProcessDefaultValues(mat_id,param_id));
+					ret = Math.InverseLerp(p_float.param3, p_float.param4, ret);
+					ret = Math.Clamp(ret,0.0,1.0);
+				break;
+			}
+		}
+		//Print("RelativizeValue: " + ret);
+		
+		return ret;
+	}
+	
+	//! Sets all requested values to default, ignoring them in further calculations.
+	protected void SetDefaultValuesAll()
+	{
+		//<material<param_id,data>>
+		PPERequestParamDataBase req_data;
+		
+		for (int i = 0; i < m_RequestDataStructure.Count(); i++)
+		{
+			for (int j = 0; j < m_RequestDataStructure.GetElement(i).Count(); j++)
+			{
+				req_data = m_RequestDataStructure.GetElement(i).GetElement(j);
+				
+				if (!req_data.IsDataActive())
+					continue;
+				
+				switch (req_data.GetVarType())
+				{
+					case PPEConstants.VAR_TYPE_BOOL:
+						SetTargetValueBoolDefault(req_data.GetMaterialID(),req_data.GetParameterID());
+					break;
+					
+					case PPEConstants.VAR_TYPE_INT:
+						SetTargetValueIntDefault(req_data.GetMaterialID(),req_data.GetParameterID());
+					break;
+					
+					case PPEConstants.VAR_TYPE_FLOAT:
+						SetTargetValueFloatDefault(req_data.GetMaterialID(),req_data.GetParameterID());
+					break;
+					
+					case PPEConstants.VAR_TYPE_COLOR:
+						SetTargetValueColorDefault(req_data.GetMaterialID(),req_data.GetParameterID());
+					break;
+				}
+			}
+		}
+	}
+	
+	void DbgPrnt(string text)
+	{
+		//Debug.Log(""+text);
+	}
+}
+
+//////////////////////////////////////////////////////////////////////////////////////
+//							Base requester platforms								//
+//////////////////////////////////////////////////////////////////////////////////////
+
+class PPERequester_GameplayBase extends PPERequesterBase
+{
+	override int GetCategoryMask()
+	{
+		return PPERequesterCategory.GAMEPLAY_EFFECTS;
+	}
+}
+
+class PPERequester_MenuBase extends PPERequesterBase
+{
+	override int GetCategoryMask()
+	{
+		return PPERequesterCategory.MENU_EFFECTS;
+	}
+}
diff --git a/scripts/3_Game/DayZ/PPEffects.c b/scripts/3_Game/DayZ/PPEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..e33adcec20ffbb8aab1d4d1eabc2dea10cd084d9
--- /dev/null
+++ b/scripts/3_Game/DayZ/PPEffects.c
@@ -0,0 +1,756 @@
+//! Deprecated; 'PPEManager' used instead
+class PPEffects
+{
+	// COLORIZE IDs
+	static const int COLORIZE_NV = 100;
+	
+	//CONSTANTS
+	static const float COLOR_SHOCK = 0.1;//shock color value (relative) //todo
+	
+	//-------------------------------------------------------
+	// BLUR START
+	//-------------------------------------------------------
+	static int 		m_BlurInventory;
+	static int 		m_BlurDrunk;
+	static int		m_BlurFever;
+	static int 		m_BlurMenu;
+	static int 		m_BlurOptics;
+	static int 		m_BlurFlashbang;
+	static int 		m_BlurShock;
+	
+	static int	 	m_BurlapBlindness;
+	static int 		m_DyingEffect;
+	static int 		m_ShockEffect;
+	
+	static int 		m_ChromAbbOptic;
+	//static int 		m_ChromAbbShock;
+	
+	static int 		m_VignetteUnconscious;
+	static int 		m_VignetteShock;
+	static int 		m_VignetteTunnel;
+	static int 		m_VignetteMenu;
+	
+	static float	m_BloodSaturation;
+	
+	static ref array<float> m_BlurValues;
+	static ref array<float> m_ChromAbbValues;
+	static ref array<int> m_VignetteEffects;
+	static ref map<int, ref array<float>> m_VignetteValues;
+	static ref map<int, ref array<float>> m_ColorValues;
+	static ref array<float> m_ColorEffect;
+	static ref map<int, ref array<float>> m_ColorizeEffects;
+	
+	//static float m_UnconsciousVignetteColor[4];
+	//static float m_UnconsciousVignetteIntesity;
+	
+	static float m_ColorValueTotal[4] = {0,0,0,0};
+	static float m_ColorOverlayTotal;
+
+	static Material m_MatColors;
+	static Material m_RadialBlur;
+	
+	static void Init()
+	{
+		//Print("---Init PPEffects---");
+		if ( m_BlurValues )
+		{
+			delete m_BlurValues;
+		}
+		if ( m_ChromAbbValues )
+		{
+			delete m_ChromAbbValues;
+		}
+		if ( m_VignetteEffects )
+		{
+			delete m_VignetteEffects;
+		}
+		if ( m_VignetteValues )
+		{
+			delete m_VignetteValues;
+		}
+		if ( m_ColorEffect )
+		{
+			delete m_ColorEffect;
+		}
+		
+		m_MatColors = GetGame().GetWorld().GetMaterial("graphics/materials/postprocess/glow");
+		m_RadialBlur = GetGame().GetWorld().GetMaterial("graphics/materials/postprocess/radialblur");
+		m_BlurValues = new array<float>;
+		m_ChromAbbValues = new array<float>;
+		m_VignetteEffects = new array<int>;
+		m_VignetteValues = new map<int, ref array<float>>;
+		
+		// add new blur effects here
+		m_BlurInventory		= RegisterBlurEffect();
+		m_BlurDrunk			= RegisterBlurEffect();
+		m_BlurFever			= RegisterBlurEffect();
+		m_BlurMenu			= RegisterBlurEffect();
+		m_BlurOptics 		= RegisterBlurEffect();
+		m_BlurFlashbang		= RegisterBlurEffect();
+		
+		// add chromatic abberation effects here
+		m_ChromAbbOptic 	= RegisterChromAbbEffect();
+		//m_ChromAbbShock 	= RegisterChromAbbEffect();
+		
+		// add vignette effects here
+		m_VignetteUnconscious 	= RegisterVignetteEffect();
+		m_VignetteShock 		= RegisterVignetteEffect();
+		m_VignetteTunnel 		= RegisterVignetteEffect();
+		m_VignetteMenu 			= RegisterVignetteEffect();
+		
+		m_ColorEffect = new array<float>;
+		m_ColorValues = new map<int, ref array<float>>;
+		
+		// add new color effects here
+		m_BurlapBlindness 	= RegisterColorEffect();
+		m_DyingEffect 		= RegisterColorEffect();
+		m_ShockEffect 		= RegisterColorEffect();
+		
+		// ------------------------NV-related stuff below------------------------
+		array<float> colorizeDefault = {0.0, 0.0, 0.0};
+		m_ColorizeEffects = new map<int, ref array<float>>;
+		
+		// colorize: r, g, b
+		// colorize effects registration
+		m_ColorizeEffects.Set(PPEffects.COLORIZE_NV, colorizeDefault);
+		//SetNVParams(1.0, 0.0, 2.35, 2.75); //default values
+		// ------------------------End of NV-related stuff------------------------
+	}
+	
+	static void ResetBlurEffects()
+	{	
+		if( m_BlurValues )
+		{
+			for ( int i = 0; i < m_BlurValues.Count(); ++i )
+			{
+				m_BlurValues[i] = 0;
+			}
+			UpdateBlur();
+		}
+	}
+	
+	static void ResetRadialBlur()
+	{	
+		SetRadialBlur(0,0,0,0);
+	}
+	
+	static void SetBlurValue(int index, float value)
+	{
+		if ( m_BlurValues && index < m_BlurValues.Count() )
+		{
+			m_BlurValues[index] = value;
+		}
+		else
+		{
+			Print("Error: PPEffects: m_BlurValues with index: "+ index +" is not registered.");
+		}
+	}
+	
+	static int RegisterBlurEffect()
+	{
+		return m_BlurValues.Insert(0);
+	}
+	
+	//-------------------------------------------------------
+	//! sets blur effect to an absolute value between 0..1
+	static void SetRadialBlur(float powerX, float powerY, float offsetX, float offsetY )
+	{
+		if (GetGame())
+		{
+			m_RadialBlur.SetParam("PowerX", powerX);
+			m_RadialBlur.SetParam("PowerY", powerY);
+			m_RadialBlur.SetParam("OffsetX", offsetX);
+			m_RadialBlur.SetParam("OffsetY", offsetY);
+		}
+	}
+	//-------------------------------------------------------
+	//! sets blur effect to an absolute value between 0..1
+	static void SetBlur(float value)
+	{
+		if (GetGame())
+		{
+			Material mat_blur = GetGame().GetWorld().GetMaterial("graphics/materials/postprocess/gauss");
+		
+			if (mat_blur)
+			{
+				mat_blur.SetParam("Intensity", value);
+			}
+		}
+	}
+	//-------------------------------------------------------
+	//! updates the blur post process effect where the resulting blur is an aggregate of all individual blur effect values
+	static void UpdateBlur()
+	{		
+		float blur_value_total = 0;
+		if( m_BlurValues )
+		{
+			for ( int i = 0; i < m_BlurValues.Count(); ++i )
+			{
+				blur_value_total += m_BlurValues[i];
+			}
+		}
+		
+		SetBlur( blur_value_total );
+	}
+	//-------------------------------------------------------
+	//! Set blur inventory effect to a specified 'value' between 0..1
+	static void SetBlurInventory(float value)
+	{
+		SetBlurValue(m_BlurInventory, value);
+		UpdateBlur();
+	}
+	//-------------------------------------------------------
+	//! Set blur drunk effect to a specified 'value' between 0..1
+	static void SetBlurDrunk(float value)
+	{
+		SetBlurValue(m_BlurDrunk, value);
+		UpdateBlur();
+	}
+
+	//-------------------------------------------------------
+	//! Set blur drunk effect to a specified 'value' between 0..1
+	static void SetBlurFever(float value)
+	{
+		SetBlurValue(m_BlurFever, value);
+		UpdateBlur();
+	}
+	
+	//-------------------------------------------------------
+	//! Set menu blur to a specified 'value' between 0..1
+	static void SetBlurMenu(float value)
+	{
+		SetBlurValue(m_BlurMenu, value);
+		UpdateBlur();
+	}
+	
+	//-------------------------------------------------------
+	//! Set optics and ironsights blur to a specified 'value' between 0..1
+	static void SetBlurOptics(float value)
+	{
+		SetBlurValue(m_BlurOptics, value);
+		UpdateBlur();
+	}
+	
+	//-------------------------------------------------------
+	//! Set blur flashbang hit effect to a specified 'value' between 0..1
+	static void SetBlurFlashbang(float value)
+	{
+		SetBlurValue(m_BlurFlashbang, value);
+		UpdateBlur();
+	}
+	
+	static void SetBlurShock(float value)
+	{
+		SetBlurValue(m_BlurShock, value);
+		UpdateBlur();
+	}
+	
+	//-------------------------------------------------------
+	// BLUR END
+	//-------------------------------------------------------
+	
+	//-------------------------------------------------------
+	// CHROMATIC ABBERATION
+	//-------------------------------------------------------
+	static int RegisterChromAbbEffect()
+	{
+		return m_ChromAbbValues.Insert(0);
+	}
+	
+	static void ResetChromAbbEffects()
+	{	
+		if( m_ChromAbbValues )
+		{
+			for ( int i = 0; i < m_ChromAbbValues.Count(); ++i )
+			{
+				m_ChromAbbValues[i] = 0;
+			}
+			UpdateChromAbb();
+		}	
+	}
+	
+	static void SetChromAbbValue(int index, float value)
+	{
+		if ( m_ChromAbbValues && index < m_ChromAbbValues.Count() )
+		{
+			m_ChromAbbValues[index] = value;
+		}
+		else
+		{
+			Print("Error: PPEffects: m_ChromAbbValues with index: "+ index +" is not registered.");
+		}
+	}
+	
+	static void SetChromAbb(float value)
+	{
+		if (GetGame())
+		{
+			if (m_MatColors)
+			{
+				//Print("SetChromAbb: " + value);
+				m_MatColors.SetParam("MaxChromAbberation", value);
+				//SetVignette(value,0,255,0);
+			}
+		}
+	}
+	//-------------------------------------------------------
+	//! updates the chromatic abberation post process effect where the resulting chromabb is an aggregate of all individual chromabb effect values
+	static void UpdateChromAbb()
+	{		
+		float chromabb_value_total = 0;
+		if( m_ChromAbbValues )
+		{
+			for ( int i = 0; i < m_ChromAbbValues.Count(); ++i )
+			{
+				chromabb_value_total += m_ChromAbbValues[i]; //currently additive!
+			}
+		}
+		
+		SetChromAbb( chromabb_value_total );
+	}
+	
+	static void SetChromAbbOptic(float value)
+	{
+		SetChromAbbValue(m_ChromAbbOptic, value);
+		UpdateChromAbb();
+	}
+	
+	/*static void SetChromAbbShock(float value)
+	{
+		SetChromAbbValue(m_ChromAbbShock, value);
+		UpdateChromAbb();
+	}*/
+	
+	//-------------------------------------------------------
+	// CHROMATIC ABBERATION END
+	//-------------------------------------------------------
+	
+	/*
+	static void SetOverlayColor(float r, float g, float b, float a)
+	{
+		Material matColors = GetGame().GetWorld().GetMaterial("graphics/materials/postprocess/glow");
+		
+		m_Color[0] = r;
+		m_Color[1] = g;
+		m_Color[2] = b;
+		m_Color[3] = a;
+		
+		matColors.SetParam("OverlayColor", m_Color);
+		matColors.SetParam("OverlayFactor", a);
+
+	}*/
+	
+	static void ResetColorEffects()
+	{
+		if( m_ColorEffect )
+		{
+			for ( int i = 0; i < m_ColorEffect.Count(); ++i )
+			{
+				//m_ColorEffect[i] = 0;
+				m_ColorValues.Set(i,{0,0,0,0,0});
+			}
+			UpdateColor();
+		}
+	}
+	
+	static void SetColorValue(int index, float r, float g, float b, float a, float overlay)
+	{
+		if ( index < m_ColorEffect.Count() )
+		{
+			array<float> values = {r,g,b,a,overlay};
+			
+			m_ColorValues.Set(index, values);
+		}
+		else
+		{
+			Print("Error: PPEffects: m_ColorValues with index: "+ index +" is not registered.");
+		}
+	}
+	
+	static int RegisterColorEffect()
+	{
+		return m_ColorEffect.Insert(0);
+	}	
+	
+	static void UpdateColor()
+	{
+		float color_value_total[4] = {0,0,0,0};
+		float color_overlay;
+		/*
+		m_MatColors.ResetParam("OverlayColor");
+		m_MatColors.ResetParam("OverlayFactor");
+		*/
+		if( !GetGame() || !GetGame().GetWorld() )
+		{
+			return;
+		}
+
+		for ( int i = 0; i < m_ColorValues.Count(); ++i )
+		{
+			int key = m_ColorValues.GetKey(i);
+			array<float> value = m_ColorValues.Get(key);
+			
+			color_value_total[0] 	= color_value_total[0] + value[0];
+			color_value_total[1] 	= color_value_total[1] + value[1];
+			color_value_total[2] 	= color_value_total[2] + value[2];
+			color_value_total[3] 	= color_value_total[3] + value[3];
+			color_overlay  			+= value[4];
+		}
+		
+		m_ColorValueTotal = color_value_total;
+		m_ColorOverlayTotal = color_overlay;
+		m_MatColors.SetParam("OverlayColor", color_value_total);
+		m_MatColors.SetParam("OverlayFactor", color_overlay);	
+	}
+
+	/*!
+	set lens effect 
+	\param lens	<-5, 5>, 0 = disable (performance plus), > 0 = outside effect, < 0 inside effect
+	\param chromAbb	<0, 1>, chromaticity, 1 = max, 0 disable (performance plus)
+	\param centerX	<-1, 1>, center of effect, 0 = screen center in X
+	\param centerY	<-1, 1>, center of effect, 0 = screen center in Y
+	*/
+	static void SetLensEffect(float lens, float chromAbb, float centerX, float centerY)
+	{
+		PerformSetLensEffect(lens, chromAbb, centerX, centerY);
+	}
+
+	//!added for convenience
+	static void PerformSetLensEffect(float lens, float chromAbb, float centerX, float centerY)
+	{
+		m_MatColors.SetParam("LensDistort", lens);
+		SetChromAbbOptic(chromAbb);
+		m_MatColors.SetParam("LensCenterX", centerX);
+		m_MatColors.SetParam("LensCenterY", centerY);
+	}
+	
+	/*!
+	set vignette
+	\param intensity <0, 1>, intensity of effect, 0 = disable
+	\param R
+	\param G
+	\param B
+	*/
+	static void SetVignette(float intensity, float R, float G, float B, float A)
+	{
+		float color[4];
+		color[0] = R;
+		color[1] = G;
+		color[2] = B;
+		color[3] = A;
+
+		m_MatColors.SetParam("Vignette", intensity);
+		m_MatColors.SetParam("VignetteColor", color);
+	}
+	
+	static void SetVignetteEffectValue(int index, float intensity, float r, float g, float b, float a)
+	{
+		if ( index < m_VignetteEffects.Count() )
+		{
+			array<float> values = {intensity,r,g,b,a};
+			
+			m_VignetteValues.Set(index, values);
+		}
+		else
+		{
+			Print("Error: PPEffects: m_ColorValues with index: "+ index +" is not registered.");
+		}
+	}
+	
+	static int RegisterVignetteEffect()
+	{
+		return m_VignetteEffects.Insert(0);
+	}
+	
+	static void SetUnconsciousnessVignette(float value)
+	{
+		SetVignetteEffectValue(m_VignetteUnconscious, value, 0,0,0,0); //todo
+		UpdateVignette();
+	}
+	
+	static void SetShockVignette(float value)
+	{
+		SetVignetteEffectValue(m_VignetteShock, value, 0,0,0,0); //todo
+		UpdateVignette();
+	}
+	
+	static void SetTunnelVignette(float value)
+	{
+		SetVignetteEffectValue(m_VignetteTunnel, value, 0,0,0,0); //todo
+		UpdateVignette();
+	}
+	
+	static void SetMenuVignette(float value)
+	{
+		SetVignetteEffectValue(m_VignetteMenu, value, 0,0,0,0); //todo
+		UpdateVignette();
+	}
+
+	static void ResetVignettes()
+	{
+		if( m_VignetteValues )
+		{
+			for ( int i = 0; i < m_VignetteValues.Count(); ++i )
+			{
+				array<float> values = {0,0,0,0,0};
+			
+				m_VignetteValues.Set(i, values);
+			}
+			UpdateVignette();
+		}
+	}
+
+	static void OverrideDOF(bool enable, float focusDistance, float focusLength, float focusLengthNear, float blur, float focusDepthOffset)
+	{
+		GetGame().OverrideDOF(enable, focusDistance, focusLength, focusLengthNear, blur, focusDepthOffset);
+	}
+
+	static void AddPPMask(float ndcX, float ndcY, float ndcRadius, float ndcBlur)
+	{
+		GetGame().AddPPMask(ndcX, ndcY, ndcRadius, ndcBlur);
+	}
+	
+	static void ResetPPMask()
+	{
+		if( GetGame() ) GetGame().ResetPPMask();
+	}
+	
+	static void ResetDOFOverride()
+	{
+		OverrideDOF(false,0,0,0,0,1);
+	}
+	
+	static void ResetLensEffect()
+	{
+		SetLensEffect(0,0,0,0);
+	}
+	
+	static void HitEffect(float value)
+	{
+		float m_HitEffectColor[4];
+		m_HitEffectColor[0] = Math.Lerp(Math.Clamp(m_ColorValueTotal[0],0,1), 1, value);
+		m_HitEffectColor[1] = 0;
+		m_HitEffectColor[2] = 0;
+		m_HitEffectColor[3] = Math.Lerp(Math.Clamp(m_ColorValueTotal[0],0,1), 1, value);
+		/*
+		Print("---------------------------");
+		Print("m_ColorValueTotal[0]: " + m_ColorValueTotal[0]);
+		Print("value: " + value);
+		Print("---------------------------");
+		Print("r: " + m_HitEffectColor[0]);
+		Print("g: " + m_HitEffectColor[1]);
+		Print("b: " + m_HitEffectColor[2]);
+		Print("a: " + m_HitEffectColor[3]);
+		*/
+		m_MatColors.SetParam("OverlayColor", m_HitEffectColor);
+		m_MatColors.SetParam("OverlayFactor", 0.05);
+	}
+	
+	static void SetShockEffectColor(float value)
+	{
+		if (value > 0)
+			SetColorValue(m_ShockEffect, COLOR_SHOCK, COLOR_SHOCK, COLOR_SHOCK, 1, value);
+		else
+			SetColorValue(m_ShockEffect, 0, 0, 0, 1, value);
+		UpdateColor();
+	}
+	
+	static void FlashbangEffect(float value)
+	{
+		float hitEffectColor[4];
+		hitEffectColor[0] = 1;
+		hitEffectColor[1] = 1;
+		hitEffectColor[2] = 1;
+		hitEffectColor[3] = Math.Lerp(Math.Clamp(m_ColorValueTotal[0],0,1), 1, value);
+		
+		m_MatColors.SetParam("OverlayColor", hitEffectColor);
+		m_MatColors.SetParam("OverlayFactor", 0.75);
+	}
+	
+	static void EnableBurlapSackBlindness()
+	{
+		SetColorValue(m_BurlapBlindness, 0, 0, 0, 1, 1.0);
+		UpdateColor();
+		g_Game.SetEVValue(-5);
+	}
+
+	static void DisableBurlapSackBlindness()
+	{		
+		SetColorValue(m_BurlapBlindness, 0, 0, 0, 0, 0.0);
+		UpdateColor();
+		g_Game.SetEVValue(0);
+	}
+	
+	static void SetDeathDarkening(float value) 
+	{
+		value = Math.Clamp(value,0,1);
+		SetColorValue(m_DyingEffect, 0, 0, 0, 1, value);
+		UpdateColor();
+		if (value > 0.99)
+			SetEVValuePP(-5); //additional "darkness" to avoid lens flare
+		else
+			SetEVValuePP(0);
+	}
+
+	static void UpdateSaturation()
+	{
+		m_MatColors.SetParam("Saturation", m_BloodSaturation/*+add_additional_modifiers_here*/);
+	}
+	
+	static void UpdateVignette()
+	{
+		float color[4];
+		float intesity;
+		
+		float intensity_value_total = 0; //use just the highest?
+		if( m_VignetteEffects )
+		{
+			for ( int i = 0; i < m_VignetteEffects.Count(); ++i )
+			{
+				if (m_VignetteValues.Get(i))
+				{
+					/*color[0] = m_VignetteValues.Get(i)[1]; //red
+					color[1] = m_VignetteValues.Get(i)[2]; //green
+					color[2] = m_VignetteValues.Get(i)[3]; //blue
+					color[3] = m_VignetteValues.Get(i)[4]; //alpha*/
+					color[0] = m_VignetteValues.Get(i).Get(1); //red
+					color[1] = m_VignetteValues.Get(i).Get(2); //green
+					color[2] = m_VignetteValues.Get(i).Get(3); //blue
+					color[3] = m_VignetteValues.Get(i).Get(4); //alpha
+					
+					intesity = m_VignetteValues.Get(i).Get(0);
+					intensity_value_total += intesity;
+				}
+				else
+				{
+					//Print("no m_VignetteValues");
+				}
+			}
+		}
+		
+		/*color[0] = m_UnconsciousVignetteColor[0];
+		color[1] = m_UnconsciousVignetteColor[1];
+		color[2] = m_UnconsciousVignetteColor[2];
+		
+		intesity = m_UnconsciousVignetteIntesity;*/
+		
+		SetVignette( intensity_value_total, color[0], color[1], color[2], color[3] );
+	}
+
+	static void SetBloodSaturation(float value)
+	{
+		m_BloodSaturation = value;
+		UpdateSaturation();
+	}
+	
+	/*static void SetUnconsciousnessVignette(float value)
+	{
+		m_UnconsciousVignetteIntesity = value;
+		UpdateVignette();
+	}
+	
+	static void RemoveUnconsciousnessVignette()
+	{
+		m_UnconsciousVignetteIntesity = 0;
+		UpdateVignette();
+	}*/
+	
+	// appropriate parts of the code will call these functions
+	static void SetColorizationNV(float r, float g, float b)
+	{
+		array<float> colorizeArray = {r, g, b};
+		m_ColorizeEffects.Set(PPEffects.COLORIZE_NV, colorizeArray);
+		UpdateColorize();
+	}
+	
+	static void UpdateColorize()
+	{
+		bool foundActiveEffect = false;
+		int lowestKey = 1000000;
+		array<float> chosenArray;
+		// search for active effect with highest priority (lower value of key better)
+		for (int i = 0; i < m_ColorizeEffects.Count(); i++)
+		{
+			int currentKey = m_ColorizeEffects.GetKey(i);
+			array<float> colorizeValues = m_ColorizeEffects.Get(currentKey);
+			// check for non-zero active effect
+			for (int j = 0; j < colorizeValues.Count(); j++)
+			{
+				if (colorizeValues[j] != 0.0)
+				{
+					if (currentKey < lowestKey)
+					{
+						chosenArray = colorizeValues;
+						lowestKey = currentKey;
+						foundActiveEffect = true;
+						break;
+					}
+				}
+			}
+		}
+		if (foundActiveEffect)
+		{
+			float color[4];
+			color[0] = chosenArray[0];
+			color[1] = chosenArray[1];
+			color[2] = chosenArray[2];
+			color[3] = 0;
+	        m_MatColors.SetParam("ColorizationColor", color);
+		}
+		else
+		{
+			// no active event found, reset colorize effect
+			ResetColorize();
+		}
+	}
+	static void ResetColorize()
+	{
+		float color[4];
+		color[0] = 1.0;
+		color[1] = 1.0;
+		color[2] = 1.0;
+		color[3] = 0;
+        m_MatColors.SetParam("ColorizationColor", color);
+	}
+
+	// EV check for NV optics
+	static void SetEVValuePP(float value)
+	{
+		g_Game.SetEVValue(value);
+	}
+	
+	// light multiplier and noise intensity (using filmgrainNV.emat!) for nvg
+	// added other parameters for filmgrainNV.emat, sharpness and grain size
+	static void SetNVParams(float light_mult, float noise_intensity, float sharpness, float grain_size)
+	{
+		Material matHDR = GetGame().GetWorld().GetMaterial("Graphics/Materials/postprocess/filmgrainNV");
+/*#ifdef PLATFORM_CONSOLE
+//worst-case scenario console fix!
+		noise_intensity = 0.0;
+#endif*/
+		g_Game.NightVissionLightParams(light_mult, noise_intensity);
+		matHDR.SetParam("Sharpness", sharpness);
+		matHDR.SetParam("GrainSize", grain_size);
+	}
+	
+	// bloom PP, experimental stuff
+	static void SetBloom(float thres, float steep, float inten)
+    {
+		m_MatColors.SetParam("BloomThreshold", thres);
+		m_MatColors.SetParam("BloomSteepness", steep);
+		m_MatColors.SetParam("BloomIntensity", inten);
+    }
+
+	static void ResetAll()
+	{
+		ResetBlurEffects();
+		ResetColorEffects();
+		ResetVignettes();
+		ResetPPMask();
+		ResetDOFOverride();
+		ResetLensEffect();
+		SetBloodSaturation(1);
+		//RemoveUnconsciousnessVignette();
+		ResetColorize();
+	}	
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/Particle.c b/scripts/3_Game/DayZ/Particles/Particle.c
new file mode 100644
index 0000000000000000000000000000000000000000..e80430bfa5949eea77e6be470a3d8a4febb9d6bd
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/Particle.c
@@ -0,0 +1,837 @@
+/**
+\brief Legacy way of using particles in the game
+*	\note They work okay when just needing to play a particle once every once in a while
+*		  But are extremely wasteful when it comes to playing multiple Particles at the same time
+*/
+class Particle : ParticleBase
+{
+	/** \name Generic data
+		Generic data for the Particle
+	*/
+	//@{
+	//! ID from ParticleList if assigned
+	protected 	int		m_ParticleID;
+	//! Approx. remaining lifetime of particle
+	protected 	float	m_Lifetime;
+	//! Whether this particle repeats
+	protected 	bool 	m_IsRepeat;
+	//! Whether this particle is queued for deletion
+	private 	bool 	m_MarkedForDeletion;
+	//@}
+	
+	/** \name Wiggle API
+		Data for the wiggle API
+	*/
+	//@{
+	//! Used for Wiggle API, to signal that wiggle API is currently doing work
+	bool 				m_WiggleProcessing;
+	//! Used for Wiggle API, to restore after unparenting
+	bool 				m_ForceOrientationRelativeToWorld;
+	//! Used for Wiggle API, to restore after unparenting
+	vector 				m_DefaultOri;
+	//! Used for Wiggle API, to restore after unparenting
+	vector 				m_DefaultPos;
+	//! Used for Wiggle API, to restore after unparenting
+	vector 				m_DefaultWorldOri;
+	//! Used for Wiggle API, to restore after unparenting
+	vector 				m_DefaultWorldPos;
+	
+	//! Used for Wiggle API, Wiggle room [-m_MaxOriWiggle, m_MaxOriWiggle]
+	float 				m_MaxOriWiggle;
+	//! Used for Wiggle API, Interval for wiggling [0, m_MaxOriInterval[
+	float 				m_MaxOriInterval;
+	//! Used for Wiggle API, calls the Wiggle functionality
+	ref Timer 			m_RandomizeOri;
+	//@}
+	
+	//! Parent Object the Particle is child of
+	protected Object 	m_ParentObject;
+	//! The child object which contains the actual particle
+	protected Object 	m_ParticleEffect;
+	
+	//! DEPRECATED
+	protected int		m_PreviousFrame;
+	//! DEPRECATED
+	private vector 		m_GlobalPosPreviousFrame;
+	//! DEPRECATED	
+	static private const int MAX_EMITORS = 30;
+	
+	
+	//! ctor
+	void Particle()
+	{
+		ParticleInit();
+	}
+	
+	//! Purely here so that it can be emptied in ParticleSource
+	protected void ParticleInit()
+	{
+		SetFlags(EntityFlags.VISIBLE, true);
+		SetEventMask(EntityEvent.INIT);
+		SetEventMask(EntityEvent.FRAME);
+	}	
+	
+	/** \name Create a particle (static)
+		You can create a particle either at some position, or create it as a child on some object.
+	*/
+	//@{
+	
+	/**
+	\brief Creates a particle emitter and attaches it on the given object
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param parent_obj \p Object Instance on which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (Optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yawn, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p Particle Created particle instance
+	*/
+	static Particle CreateOnObject( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		if (!parent_obj)
+			Error("ERROR when creating a particle! Parameter parent_obj is NULL!");
+		
+		vector global_pos = parent_obj.GetPosition();
+		Particle p = CreateInWorld(particle_id, global_pos, Vector(0,0,0), force_world_rotation);
+		p.AddAsChild(parent_obj, local_pos, local_ori, force_world_rotation);
+		p.m_DefaultOri = local_ori;
+		
+		return p;
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility
+	*/
+	static Particle Create( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0" )
+	{
+		return CreateOnObject( particle_id, parent_obj, local_pos, local_ori);
+	}
+	
+	/**
+	\brief Creates a particle emitter on the given position
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param global_pos \p Vector Position where the particel will be created
+		\param global_ori \p vector Orientation (Pitch, Yawn, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p Particle Created particle instance
+	*/
+	static Particle CreateInWorld( int particle_id, vector global_pos, vector global_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		Particle p = Particle.Cast( GetGame().CreateObjectEx("Particle", global_pos, ECE_LOCAL) );
+		p.SetSource(particle_id);
+		p.SetOrientation(global_ori);
+		p.m_ForceOrientationRelativeToWorld = force_world_rotation;
+		return p;
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	static Particle Create( int particle_id, vector global_pos, vector global_ori = "0 0 0" )
+	{
+		return CreateInWorld( particle_id, global_pos, global_ori );
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Static play on creation
+		You can use the following Play(...) functions to create and activate a particle in 1 line of your script.
+	*/
+	//@{
+	
+	/**
+	\brief Creates a particle emitter, attaches it on the given object and activates it
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param parent_obj \p Object Instance on which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (Optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yaw, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p Particle Created particle instance
+	*/
+	static Particle PlayOnObject( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		Particle p = CreateOnObject(particle_id, parent_obj, local_pos, local_ori, force_world_rotation);
+		p.PlayParticle();
+		
+		return p;
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	static Particle Play( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0" )
+	{
+		return PlayOnObject( particle_id, parent_obj, local_pos, local_ori);
+	}
+	
+	/**
+	\brief Creates a particle emitter on the given position and activates it
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param global_pos \p Vector Position where the particel will be created
+		\return \p Particle Created particle instance
+	*/
+	static Particle PlayInWorld( int particle_id, vector global_pos)
+	{
+		Particle p = CreateInWorld(particle_id, global_pos);
+		p.PlayParticle();
+		
+		return p;
+	}
+
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	static Particle Play( int particle_id, vector global_pos)
+	{
+		return PlayInWorld( particle_id, global_pos);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Playback
+ 		Methods regarding playing/stopping of particle
+	*/
+	//@{
+	
+	/**
+	\brief Method to tell the particle to start playing
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+	*/
+	override void PlayParticle(int particle_id = -1)
+	{
+		PlayParticleEx(particle_id, 0);
+	}
+	
+	/**
+	\brief Method to tell the particle to start playing
+		\note The parameter to set the ID will only work when the particle is not already playing
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+		\param flags \p int Flags to pass to the playing (None on this level)
+		\return \p bool Whether the particle successfully started
+	*/
+	override bool PlayParticleEx(int particle_id = -1, int flags = 0)
+	{
+		if ( particle_id > -1 )
+		{
+			SetSource(particle_id);
+		}
+		
+		OnParticleStart();
+
+		UpdateState();
+		
+		return true;
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+	*/
+	void Play(int particle_id = -1)
+	{
+		PlayParticle(particle_id);
+	}
+	
+	/**
+	\brief Method to tell the particle to stop playing
+		\note No flags available for Particle
+		\note Emitors are automatically removed later when its particle count is 0
+		\param flags \p int Flags to pass to the stopping (None on this level)
+		\return \p bool Whether the particle successfully stopped
+	*/
+	override bool StopParticle(int flags = 0)
+	{
+		OnParticleStop();		
+		
+		// Without the following we might get an error when a particle parent is despawned client-side.
+		Object parent = Object.Cast( GetParent() );
+		if ( parent && !ToDelete())
+		{
+			vector world_pos = GetPosition();
+			parent.RemoveChild(this);
+			SetPosition(world_pos);
+		}
+		
+		UpdateState();
+		
+		return true;
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.14 and below
+	*/
+	void Stop()
+	{
+		StopParticle();
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Properties and state
+		Obtain information or set properties regarding the state of the Particle
+	*/
+	//@{
+	
+	/**
+	\brief Sets particle id
+		\note Does not work at runtime, particle object needs to be destroyed and then Particle needs to play again
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+	*/
+	void SetSource(int particle_id)
+	{
+		m_ParticleID = particle_id;
+	}
+	
+	/**
+	\brief Gets particle id
+		\note This is not necessarily the CURRENT particle
+			* As one can use SetSource while the Particle is still playing
+			* But that will not change the particle before Particle is played again
+		\return \p int The last set Particle ID registered in ParticleList
+	*/
+	int GetParticleID()
+	{
+		return m_ParticleID;
+	}
+	
+	/**
+	\brief Returns direct particle effect entity which is usually handled by this class 'Particle' if there is one
+		\note Is a child of this Particle
+		\return \p Object The Object with the particle component or null
+	*/
+	Object GetDirectParticleEffect()
+	{
+		return m_ParticleEffect;
+	}
+	
+	/**
+	\brief Returns the parent of this Particle if there is one
+		\return \p Object The registered parent or null
+	*/
+	Object GetParticleParent()
+	{
+		return m_ParentObject;
+	}
+	
+	/**
+	\brief Returns if there is any particle active
+		\return \p bool Whether there is any particle active
+	*/
+	bool HasActiveParticle()
+	{
+		if (m_ParticleEffect)
+		{
+			return ParticleHasActive(m_ParticleEffect);
+		}
+		
+		return false;
+	}
+	
+	/**
+	\brief Returns the total count of active particles in all emitors
+		\note Internally does a sum, HasActiveParticle is better for a quick check
+		\return \p int Total count of active particles
+	*/
+	int GetParticleCount()
+	{
+		if (m_ParticleEffect)
+		{
+			return ParticleGetCount(m_ParticleEffect);
+		}
+		
+		return 0;
+	}
+	
+	/**
+	\brief Returns whether there is a repeating particle
+		\return \p bool whether there is a repeating particle
+	*/
+	bool IsRepeat()
+	{
+		if (m_ParticleEffect)
+		{
+			bool repeat = false;
+			
+			int emitors = GetParticleEmitorCount(m_ParticleEffect);
+			
+			for (int i = 0; i < emitors; ++i)
+			{
+				GetParticleParm(m_ParticleEffect, i, EmitorParam.REPEAT, repeat);
+				
+				if (repeat)
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	/**
+	\brief Returns the approx. max lifetime
+		\return \p float The largest lifetime sum among the emitors
+	*/
+	float GetMaxLifetime()
+	{
+		float lifetime_return = 0;
+		
+		if (m_ParticleEffect)
+		{
+			float lifetime_min = 0;
+			float lifetime_random = 0;			
+			float effect_time = 0;
+			
+			float lifetime_sum = 0;
+			
+			int emitors = GetParticleEmitorCount(m_ParticleEffect);
+			
+			for (int i = 0; i < emitors; ++i)
+			{
+				GetParticleParm(m_ParticleEffect, i, EmitorParam.LIFETIME, lifetime_min);
+				GetParticleParm(m_ParticleEffect, i, EmitorParam.LIFETIME_RND, lifetime_random);
+				GetParticleParm(m_ParticleEffect, i, EmitorParam.EFFECT_TIME, effect_time);
+				
+				lifetime_sum = lifetime_min + lifetime_random + effect_time;
+				
+				if ( lifetime_sum > lifetime_return )
+				{
+					lifetime_return = lifetime_sum;
+				}
+			}
+		}
+		
+		return lifetime_return;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Misc Particle specific helpers
+		Functionality specific for Particle
+	*/
+	//@{
+	
+	/**
+	\brief Creates/Destroys ParticleEffect child according to current state
+		\note Is called from Play/Stop methods
+	*/
+	protected void UpdateState()
+	{
+		if ( m_IsPlaying == false && m_ParticleEffect)
+		{
+			DestroyParticleEffect();
+		}
+		else if ( m_IsPlaying == true && m_ParticleEffect == null )
+		{
+			CreateParticleEffect();
+		}
+	}
+	
+	/**
+	\brief Creates ParticleEffect child, called from UpdateState
+	*/
+	private void CreateParticleEffect()
+	{
+		if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() )
+		{
+			string fullPath = ParticleList.GetParticleFullPath(m_ParticleID);
+			if (fullPath == "")
+			{
+				ErrorEx("Could not play Particle as there is no valid particle id assigned.");
+				m_IsPlaying = false;
+				return;
+			}
+			
+			if ( m_ParticleEffect == null )
+			{
+				m_ParticleEffect = GetGame().CreateObjectEx("#particlesourceenf", vector.Zero, ECE_LOCAL); // particle source must be lowercase!
+			}
+			
+			AddChild(m_ParticleEffect, -1, m_ForceOrientationRelativeToWorld);
+			
+			vobject vobj = GetObject( fullPath );			
+			m_ParticleEffect.SetObject(vobj, "");
+			ReleaseObject(vobj);
+			
+			m_IsRepeat = IsRepeat();
+			m_Lifetime = GetMaxLifetime();
+		}
+	}
+	
+	/**
+	\brief Destroys ParticleEffect child, called from UpdateState
+		\note Does not destroy it immediately
+			* As it simply nulls the lifetime
+			* Then it will be cleaned up by EOnFrame eventually
+	*/
+	private void DestroyParticleEffect()
+	{
+		if ( m_ParticleEffect && GetGame() )
+		{
+			SetParameter(-1, EmitorParam.LIFETIME, 0);
+			SetParameter(-1, EmitorParam.LIFETIME_RND, 0);
+			SetParameter(-1, EmitorParam.REPEAT, 0);
+			
+			m_IsRepeat = false;
+		}
+	}
+	
+	/**
+	\brief OnFrame update event decrementing the stored approx. lifetime and checking for deletion
+	*/
+	override void EOnFrame(IEntity other, float timeSlice)
+	{		
+		m_Lifetime -= timeSlice;
+		OnCheckAutoDelete();
+	}
+	
+	/**
+	\brief Creates ParticleEffect child, called from UpdateState
+	*/
+	void OnCheckAutoDelete()
+	{
+		if (m_Lifetime <= 0)
+		{
+			if (!m_MarkedForDeletion)
+			{
+				m_IsRepeat = IsRepeat(); // It is possible that the REPEAT flag was changed during lifetime, so it needs to be checked again.
+				
+				if ( m_IsRepeat )
+				{
+					m_Lifetime = GetMaxLifetime();
+				}
+				else
+				{
+					OnParticleStop();
+					
+					if ( GetParticleCount() == 0 )
+					{
+						m_MarkedForDeletion = true;
+						OnToDelete();
+						OnParticleEnd();
+					}
+				}
+			}
+			else
+			{
+				if ( m_MarkedForDeletion )
+				{
+					if (m_ParticleEffect)
+					{
+						m_ParticleEffect.Delete();
+						m_ParticleEffect = null;
+					}
+					
+					Delete();
+				}
+			}
+		}
+	}
+	
+	/**
+	\brief Called before deletion from OnCheckAutoDelete
+	*/
+	private void OnToDelete()
+	{
+
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Misc
+ 		Various helpers
+	*/
+	//@{
+	
+	/**
+	\brief Attaches this particle onto some object. If null value is provided then the particle will be detached from the current parent.
+		\note Due to the members being filled in, AddChild/RemoveChild cannot be used with Particle when using Wiggle
+		\param parent \p Object Parent onto which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yawn, Roll in degrees) (Optional)
+		\param force_rotation_to_world \p bool Force rotation to be in WS (Optional)
+	*/
+	void AddAsChild(Object parent, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_rotation_to_world = false)
+	{
+		if (ToDelete())
+			return;
+		
+		if (parent)
+		{
+			// AddAsChild method is sometimes called from a timer.
+			// Due to that it is necesarry to use ToDelete() here to check if the parent object is flagged for deletion or not on client,
+			// because sometimes this code is executed before the parent's destructor from where this would normally be handled.
+			if (!parent.ToDelete())
+			{
+				SetPosition(local_pos);
+				SetOrientation(local_ori);
+				m_ParentObject = parent;
+				m_DefaultPos = local_pos;
+				m_ForceOrientationRelativeToWorld = force_rotation_to_world;
+				
+				if (m_ParticleEffect)
+					AddChild(m_ParticleEffect, -1, m_ForceOrientationRelativeToWorld);
+				
+				parent.AddChild(this, -1, false);
+			}
+		}
+		else
+		{
+			if (m_ParentObject && !m_ParentObject.ToDelete())
+			{
+				m_ParentObject.RemoveChild(this, true);
+				m_ParentObject = null;
+			}
+		}
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Parameter API
+ 		Helpful methods for getting or setting parameters
+	*/
+	//@{
+	
+	/**
+	\brief Set the value of a parameter of all emitors in the particle
+		\param parameter \p int The parameter to apply the new value to (enum EmitorParam)
+		\param value \p float The value to apply
+	*/
+	void SetParticleParam(int parameter_id, float value )
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		SetParticleParm(m_ParticleEffect, -1, parameter_id, value);
+	}
+	
+	/**
+	\brief Set the value of a parameter of an emitor in the particle
+		\param emitter \p int The emitter to apply the new value to, -1 for all emitter
+		\param parameter \p int The parameter to apply the new value to (enum EmitorParam)
+		\param value \p float The value to apply
+	*/
+	void SetParameter(int emitter, int parameter, float value)
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		SetParticleParm(m_ParticleEffect, emitter, parameter, value);
+	}
+	
+	/**
+	\brief Get the value of a parameter of an emitor in the particle
+		\param emitter \p int The emitor to get the value from
+		\param parameter \p int The parameter to get the value from (enum EmitorParam)
+		\param value \p float The value
+	*/
+	void GetParameter(int emitter, int parameter, out float value)
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		GetParticleParm(m_ParticleEffect, emitter, parameter, value);
+	}
+	
+	/**
+	\brief Get the value of a parameter of an emitor in the particle
+		\param emitter \p int The emitor to get the value from
+		\param parameter \p int The parameter to get the value from (enum EmitorParam)
+		\return \p float The value
+	*/
+	float GetParameterEx(int emitter, int parameter)
+	{
+		if (!m_ParticleEffect)
+			return 0;
+		
+		float value;
+		GetParticleParm(m_ParticleEffect, emitter, parameter, value);
+		return value;
+	}
+	
+	/**
+	\brief Scales the given parameter on all emitors relatively to their ORIGINAL value.
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param coef \p float The multiplier to apply
+	*/
+	void ScaleParticleParamFromOriginal(int parameter_id, float coef )
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		int emitors = GetParticleEmitorCount(m_ParticleEffect);			
+		for (int i = 0; i < emitors; ++i)
+		{
+			float value;
+			GetParticleParmOriginal(m_ParticleEffect, i, parameter_id, value);
+			SetParticleParm(m_ParticleEffect, i, parameter_id, value * coef);
+		}
+	}
+	
+	/**
+	\brief Scales the given parameter on all emitors relatively to their CURRENT value.
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param coef \p float The multiplier to apply
+	*/
+	void ScaleParticleParam(int parameter_id, float coef )
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		int emitors = GetParticleEmitorCount(m_ParticleEffect);	
+		for (int i = 0; i < emitors; ++i)
+		{
+			float value;
+			GetParticleParm(m_ParticleEffect, i, parameter_id, value);
+			SetParticleParm(m_ParticleEffect, i, parameter_id, value * coef);
+		}
+	}
+	
+	/**
+	\brief Increments the value of the given parameter relatively from the ORIGINAL value.
+		\note It's a simple sum, so negative value decrements
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param value \p float The value to sum
+	*/
+	void IncrementParticleParamFromOriginal(int parameter_id, float value )
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		int emitors = GetParticleEmitorCount(m_ParticleEffect);	
+		for (int i = 0; i < emitors; ++i)
+		{
+			float param;
+			GetParticleParmOriginal(m_ParticleEffect, i, parameter_id, param);
+			SetParticleParm(m_ParticleEffect, i, parameter_id, param + value);
+		}
+	}
+	
+	/**
+	\brief Increments the value of the given parameter relatively from the CURRENT value.
+		\note It's a simple sum, so negative value decrements
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param value \p float The value to sum
+	*/
+	void IncrementParticleParam(int parameter_id, float value )
+	{
+		if (!m_ParticleEffect)
+			return;
+		
+		int emitors = GetParticleEmitorCount(m_ParticleEffect);	
+		for (int i = 0; i < emitors; ++i)
+		{
+			float param;
+			GetParticleParm(m_ParticleEffect, i, parameter_id, param);
+			SetParticleParm(m_ParticleEffect, i, parameter_id, param + value);
+		}
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Wiggle API
+ 		Settings to make the Particle wiggle
+	*/
+	//@{
+	
+	/**
+	\brief Checks if particle is currently wiggling
+	*/
+	bool IsWiggling()
+	{
+		return m_RandomizeOri && m_RandomizeOri.IsRunning();
+	}
+	
+	/**
+	\brief Makes the particle change direction by random_angle every random_interval seconds.
+		\note This does not actually work on Particle with no parent, it should on ParticleSource
+		\note Calling SetWiggle(0,0) will effectively stop all wiggle functionality
+		\param random_angle \p float Will be the range [-random_angle, random_angle[ to wiggle between
+		\param random_interval \p float Will be the time range [0, random_interval] to wiggle next time
+	*/
+	void SetWiggle(float random_angle, float random_interval)
+	{	
+		if ( random_angle != 0 || random_interval != 0 )
+		{	
+			m_MaxOriWiggle = random_angle;
+			m_MaxOriInterval = random_interval;
+			
+			if ( !m_RandomizeOri )
+				m_RandomizeOri = new Timer( CALL_CATEGORY_GAMEPLAY );
+			
+			if ( !m_RandomizeOri.IsRunning() ) // Makes sure the timer is NOT running already
+				m_RandomizeOri.Run( Math.RandomFloat(0, m_MaxOriInterval) , this, "RandomizeOrientation", null, false);
+		}
+		else
+		{
+			StopWiggle();
+		}
+	}
+	
+	/**
+	\brief Stops randomized wiggle
+	*/
+	void StopWiggle()
+	{			
+		if ( m_RandomizeOri )
+		{
+			m_RandomizeOri.Stop();
+		}
+		
+		m_MaxOriWiggle = 0;
+		m_MaxOriInterval = 0;
+	}
+	
+	/**
+	\brief Randomizes a new orientation and applies it
+	*/
+	void RandomizeOrientation()
+	{
+		m_WiggleProcessing = true;
+		
+		if (m_ParentObject)
+		{
+			if ( !m_RandomizeOri.IsRunning() )
+			{
+				m_RandomizeOri.Run( Math.RandomFloat(0, m_MaxOriInterval) , this, "RandomizeOrientation", NULL, false);
+			}
+			
+			Object old_parent = m_ParentObject;
+			AddAsChild( null );
+			AddAsChild( old_parent, m_DefaultPos, m_DefaultOri + RandWiggleVector() );
+		}
+		
+		m_WiggleProcessing = false;
+	}
+	
+	/**
+	\brief Helper to get a randomized wiggle vector
+	*/
+	protected vector RandWiggleVector()
+	{
+		return Vector( RandWiggleFloat(), RandWiggleFloat(), RandWiggleFloat() );
+	}
+	
+	/**
+	\brief Helper to get a randomized wiggle float value
+	*/
+	protected float RandWiggleFloat()
+	{
+		return Math.RandomFloatInclusive(-m_MaxOriWiggle, m_MaxOriWiggle);
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/ParticleBase.c b/scripts/3_Game/DayZ/Particles/ParticleBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..7766c5fab12bffda63ee5d91b4583ecaf75113e6
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/ParticleBase.c
@@ -0,0 +1,228 @@
+/**
+\brief Invokers for ParticleBase events, called from events
+	@code
+	void EnableOnEndPrint(ParticleBase psrc)
+	{
+		psrc.GetEvents().Event_OnParticleEnd.Insert(PrintParticleEnded);
+	}
+	
+	void PrintParticleEnded(ParticleBase psrc)
+	{
+		Print(string.Format("%1 ended.", psrc.GetDebugNameNative());
+	}
+	@endcode
+*/
+class ParticleEvents
+{
+	/**
+	\brief Called when particle starts playing
+		\note Particle: Called when any Play method has been called
+		\note ParticleSource: Called when PlayParticleNative is successful
+	*/
+	ref ScriptInvoker Event_OnParticleStart = new ScriptInvoker();
+	/**
+	\brief Called when particle stops playing
+		\note Particle: Called when any Stop method has been called or when lifetime is over
+		\note ParticleSource: Called when StopParticleNative is successful, when the particle ends and when the particle is destroyed while it is playing
+	*/
+	ref ScriptInvoker Event_OnParticleStop = new ScriptInvoker();
+	/**
+	\brief Called when particle is reset
+		\note Particle: Not present, there is no reset functionality
+		\note ParticleSource: Called when ResetParticleNative is successful
+	*/
+	ref ScriptInvoker Event_OnParticleReset = new ScriptInvoker();
+	/**
+	\brief Called when particle ends
+		\note Particle: Called when lifetime is over and there are no emitors active anymore
+		\note ParticleSource: Called when particle ends naturally or after the particle is stopped and there are no emitors active anymore
+		\warning Looped never ends naturally and need to be stopped
+	*/
+	ref ScriptInvoker Event_OnParticleEnd = new ScriptInvoker();
+	/**
+	\brief Called when particle receives a parent
+		\note Particle: Not present
+	*/
+	ref ScriptInvoker Event_OnParticleParented = new ScriptInvoker();
+	/**
+	\brief Called when particle is orphaned
+		\note Particle: Not present
+	*/
+	ref ScriptInvoker Event_OnParticleUnParented = new ScriptInvoker();
+}
+
+/**
+\brief Engine base class with internal functionality 
+	\note Is NOT intended for direct creation
+		* As this does not have an actual particle
+		* Use either Particle or ParticleSource
+*/
+class ParticleBase : Entity
+{
+	//! Whether the particle is currently playing
+	protected 	bool 	m_IsPlaying;
+	
+	//! Event invokers
+	protected ref ParticleEvents m_EventInvokers;
+	
+	
+	
+	//! ctor
+	void ParticleBase()
+	{
+		m_EventInvokers = new ParticleEvents();
+	}
+	
+	
+	
+	//! Have script recognize this as a Particle without casting
+	override bool IsParticle()
+	{
+		return true;
+	}
+	
+	
+	
+	/** \name Playback
+ 		Methods regarding playing/stopping of particle
+	*/
+	//@{
+
+	/**
+	\brief Method to tell the particle to start playing
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+		\return \p bool Whether the particle successfully started
+	*/
+	void PlayParticle(int particle_id = -1)
+	{
+		ErrorEx("Not implemented.", ErrorExSeverity.WARNING);
+	}
+	
+	/**
+	\brief Method to tell the particle to start playing
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+		\param flags \p int Flags to pass to the playing
+		\return \p bool Whether the particle successfully started
+	*/
+	bool PlayParticleEx(int particle_id = -1, int flags = 0)
+	{
+		ErrorEx("Not implemented.", ErrorExSeverity.WARNING);
+		return false;
+	}
+
+	/**
+	\brief Method to tell the particle to stop playing
+		\param flags \p int Flags to pass to the stopping
+		\return \p bool Whether the particle successfully stopped
+	*/
+	bool StopParticle(int flags = 0)
+	{
+		ErrorEx("Not implemented.", ErrorExSeverity.WARNING);
+		return false;
+	}
+	
+	/**
+	\brief Method to tell the particle to reset
+		\return \p bool Whether the particle successfully reset
+	*/
+	bool ResetParticle()
+	{
+		ErrorEx("Not implemented.", ErrorExSeverity.WARNING);
+		return false;
+	}
+
+	/**
+	\brief Method to tell the particle to restart (reset + play)
+		\return \p bool Whether the particle successfully restarted
+	*/
+	bool RestartParticle()
+	{
+		ErrorEx("Not implemented.", ErrorExSeverity.WARNING);
+		return false;
+	}
+
+	/**
+	\brief Ask if the particle is still playing
+		\return \p bool Whether the particle is playing
+	*/
+	bool IsParticlePlaying()
+	{
+		ErrorEx("Not implemented.", ErrorExSeverity.WARNING);
+		return false;
+	}
+	
+	//@}
+	
+	
+	
+	/**
+	\brief Get the events
+		\return \p ParticleEvents If there is any events set, this will return them so that additional functionality can be bound to them
+	*/
+	ParticleEvents GetEvents()
+	{
+		return m_EventInvokers;
+	}
+	
+	
+	
+	/** \name Events
+	*	ParticleBase events
+	*	For ParticleSource, these are handed on C++ side
+	*	For more information, read ParticleEvents
+	*/
+	//@{ 
+	
+	/**
+	\brief Event when the particle starts
+	*/
+	protected void OnParticleStart()
+	{
+		m_IsPlaying = true;
+		GetEvents().Event_OnParticleStart.Invoke(this);
+	}
+	
+	/**
+	\brief Event when the particle stops
+	*/
+	protected void OnParticleStop()
+	{
+		m_IsPlaying = false;
+		GetEvents().Event_OnParticleStop.Invoke(this);
+	}
+	
+	/**
+	\brief Event when the particle is restarted
+	*/
+	protected void OnParticleReset()
+	{
+		GetEvents().Event_OnParticleReset.Invoke(this);
+	}
+	
+	/**
+	\brief Event when the particle ends
+		\note Looping particles will never end
+	*/
+	protected void OnParticleEnd()
+	{
+		GetEvents().Event_OnParticleEnd.Invoke(this);
+	}
+	
+	/**
+	\brief Event when the particle receives a parent
+	*/
+	protected void OnParticleParented(IEntity parent)
+	{
+		GetEvents().Event_OnParticleParented.Invoke(this);
+	}
+	
+	/**
+	\brief Event when the particle is orphaned
+	*/
+	protected void OnParticleUnParented(IEntity parent)
+	{
+		GetEvents().Event_OnParticleUnParented.Invoke(this);
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/ParticleList.c b/scripts/3_Game/DayZ/Particles/ParticleList.c
new file mode 100644
index 0000000000000000000000000000000000000000..2e3d57e06857b5a95d8bd85b538c07b1083446d8
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/ParticleList.c
@@ -0,0 +1,443 @@
+// Register all particles below!
+
+// Example how to register particles from a mod
+/*
+modded class ParticleList
+{
+	static const int MODDED_PARTICLE = RegisterParticle( "mod_folder/" , "my_modded_particle");
+}
+*/
+
+class ParticleList
+{
+	ref static map<int, string> m_ParticlePaths; // Contains full paths to all particles. WARNING: Paths are without the '.ptc' suffix!
+	ref static map<string, int> m_ParticleNames; // Contains file NAME (without suffix) to id. 
+	
+	static int m_lastID = 0;
+	
+	// REGISTER ALL PARTICLES BELOW:
+	
+	static const int INVALID						= -1;
+	static const int NONE							= 0; // 0 does not exist either, valid particle starts from 1
+	static const int PARTICLE_TEST					= RegisterParticle("_test_orientation");
+	static const int DEBUG_DOT						= RegisterParticle("debug_dot");
+	
+	// FIREPLACE	
+	// Normal fireplace
+	static const int CAMP_FIRE_START				= RegisterParticle("fire_small_camp_01_start");
+	static const int CAMP_SMALL_FIRE 				= RegisterParticle("fire_small_camp_01");
+	static const int CAMP_NORMAL_FIRE				= RegisterParticle("fire_medium_camp_01");
+	static const int CAMP_SMALL_SMOKE 				= RegisterParticle("smoke_small_camp_01");
+	static const int CAMP_NORMAL_SMOKE				= RegisterParticle("smoke_medium_camp_01");
+	static const int CAMP_FIRE_END					= RegisterParticle("fire_small_camp_01_end");
+	static const int CAMP_STEAM_2END				= RegisterParticle("steam_medium_camp_2end");
+	static const int CAMP_STEAM_EXTINGUISH_START	= RegisterParticle("default_01");
+	static const int CAMP_STOVE_FIRE				= RegisterParticle("fire_small_stove_01");
+	static const int CAMP_STOVE_FIRE_START			= RegisterParticle("fire_small_stove_01_start");
+	static const int CAMP_STOVE_FIRE_END			= RegisterParticle("fire_small_stove_01_end");
+	static const int CAMP_NO_IGNITE_WIND			= RegisterParticle("fire_extinguish_wind");
+	// Fireplace indoor
+	static const int HOUSE_FIRE_START				= RegisterParticle("fire_small_house_01_start");
+	static const int HOUSE_SMALL_FIRE 				= RegisterParticle("fire_small_house_01");
+	static const int HOUSE_SMALL_SMOKE 				= RegisterParticle("smoke_small_house_01");
+	static const int HOUSE_NORMAL_FIRE				= RegisterParticle("fire_medium_house_01");
+	static const int HOUSE_NORMAL_SMOKE				= RegisterParticle("smoke_medium_house_01");
+	static const int HOUSE_FIRE_END					= RegisterParticle("fire_small_house_01_end");
+	static const int HOUSE_FIRE_STEAM_2END			= RegisterParticle("steam_medium_house_2end");
+	// Fireplace in barrel with holes
+	static const int BARREL_FIRE_START				= RegisterParticle("fire_small_barrel_01_start");
+	static const int BARREL_SMALL_FIRE 				= RegisterParticle("fire_small_barrel_01");
+	static const int BARREL_SMALL_SMOKE 			= RegisterParticle("smoke_small_barrel_01");
+	static const int BARREL_NORMAL_FIRE				= RegisterParticle("fire_medium_barrel_01");
+	static const int BARREL_NORMAL_SMOKE			= RegisterParticle("smoke_medium_barrel_01");
+	static const int BARREL_FIRE_END				= RegisterParticle("fire_small_barrel_01_end");
+	static const int BARREL_FIRE_STEAM_2END			= RegisterParticle("steam_medium_camp_2end");
+	// Fireplace in indoor oven
+	static const int OVEN_FIRE_START				= RegisterParticle("fire_small_oven_01_start");
+	static const int OVEN_SMALL_FIRE 				= RegisterParticle("fire_small_oven_01");
+	static const int OVEN_NORMAL_FIRE				= RegisterParticle("fire_medium_oven_01");
+	static const int OVEN_FIRE_END					= RegisterParticle("fire_small_ovenl_01_end");
+	
+	// COOKING
+	static const int COOKING_BOILING_EMPTY			= RegisterParticle("cooking_boiling_empty");
+	static const int COOKING_BOILING_START			= RegisterParticle("cooking_boiling_start");
+	static const int COOKING_BOILING_DONE			= RegisterParticle("cooking_boiling_done");
+	static const int COOKING_BAKING_START			= RegisterParticle("cooking_baking_start");
+	static const int COOKING_BAKING_DONE			= RegisterParticle("cooking_baking_done");	
+	static const int COOKING_DRYING_START			= RegisterParticle("cooking_drying_start");
+	static const int COOKING_DRYING_DONE			= RegisterParticle("cooking_drying_done");
+	static const int COOKING_BURNING_DONE			= RegisterParticle("cooking_burning_done");
+	
+	// TORCH
+	static const int TORCH_T3						= RegisterParticle("fire_small_torch_01");
+	static const int TORCH_T1						= RegisterParticle("fire_small_torch_02");
+	static const int TORCH_T2						= RegisterParticle("fire_small_torch_03");
+	
+	//BROOM TORCH
+	static const int BROOM_TORCH_T1					= RegisterParticle("fire_small_broom_torch_01");
+	static const int BROOM_TORCH_T2					= RegisterParticle("fire_small_broom_torch_02");
+	static const int BROOM_TORCH_T3					= RegisterParticle("fire_small_broom_torch_03");
+	
+	// ROADFLARE
+	static const int ROADFLARE_BURNING_INIT			= RegisterParticle("fire_small_roadflare_red_04");
+	static const int ROADFLARE_BURNING_MAIN			= RegisterParticle("fire_small_roadflare_red_01");
+	static const int ROADFLARE_BURNING_ENDING		= RegisterParticle("fire_small_roadflare_red_02");
+	static const int ROADFLARE_BURNING_SMOKE		= RegisterParticle("fire_small_roadflare_red_03");
+	
+	// FLARE PROJECTILE
+	static const int FLAREPROJ_FIRE					= RegisterParticle("fire_small_roadflare_red_04");
+	static const int FLAREPROJ_ACTIVATE				= RegisterParticle("fire_small_flare_yellow_01");
+	static const int FLAREPROJ_ACTIVATE_RED			= RegisterParticle("fire_small_flare_red_01");
+	static const int FLAREPROJ_ACTIVATE_GREEN		= RegisterParticle("fire_small_flare_green_01");
+	static const int FLAREPROJ_ACTIVATE_BLUE		= RegisterParticle("fire_small_flare_blue_01");
+	
+	// DIGGING
+	static const int DIGGING_STASH					= RegisterParticle("digging_ground");
+	
+	// SMOKE GRENADES
+	//! RDG2
+	static const int GRENADE_RDG2_BLACK_START		= RegisterParticle("smoke_RDG2_black_01");
+	static const int GRENADE_RDG2_BLACK_LOOP		= RegisterParticle("smoke_RDG2_black_02");
+	static const int GRENADE_RDG2_BLACK_END			= RegisterParticle("smoke_RDG2_black_03");
+	static const int GRENADE_RDG2_WHITE_START		= RegisterParticle("smoke_RDG2_white_01");
+	static const int GRENADE_RDG2_WHITE_LOOP		= RegisterParticle("smoke_RDG2_white_02");
+	static const int GRENADE_RDG2_WHITE_END			= RegisterParticle("smoke_RDG2_white_03");
+	//! M18
+	static const int GRENADE_M18_GREEN_START		= RegisterParticle("smoke_M18_green_01");
+	static const int GRENADE_M18_GREEN_LOOP			= RegisterParticle("smoke_M18_green_02");
+	static const int GRENADE_M18_GREEN_END			= RegisterParticle("smoke_M18_green_03");
+	static const int GRENADE_M18_PURPLE_START		= RegisterParticle("smoke_M18_purple_01");
+	static const int GRENADE_M18_PURPLE_LOOP		= RegisterParticle("smoke_M18_purple_02");
+	static const int GRENADE_M18_PURPLE_END			= RegisterParticle("smoke_M18_purple_03");
+	static const int GRENADE_M18_RED_START			= RegisterParticle("smoke_M18_red_01");
+	static const int GRENADE_M18_RED_LOOP			= RegisterParticle("smoke_M18_red_02");
+	static const int GRENADE_M18_RED_END			= RegisterParticle("smoke_M18_red_03");
+	static const int GRENADE_M18_WHITE_START		= RegisterParticle("smoke_M18_white_01");
+	static const int GRENADE_M18_WHITE_LOOP			= RegisterParticle("smoke_M18_white_02");
+	static const int GRENADE_M18_WHITE_END			= RegisterParticle("smoke_M18_white_03");
+	static const int GRENADE_M18_YELLOW_START		= RegisterParticle("smoke_M18_yellow_01");
+	static const int GRENADE_M18_YELLOW_LOOP		= RegisterParticle("smoke_M18_yellow_02");
+	static const int GRENADE_M18_YELLOW_END			= RegisterParticle("smoke_M18_yellow_03");
+	static const int GRENADE_M18_BLACK_START		= RegisterParticle("smoke_M18_black_01");
+	static const int GRENADE_M18_BLACK_LOOP			= RegisterParticle("smoke_M18_black_02");
+	static const int GRENADE_M18_BLACK_END			= RegisterParticle("smoke_M18_black_03");
+
+	//! FLASH GRENADE
+	//! M84
+	static const int GRENADE_M84					= RegisterParticle("explosion_M84_01");
+	
+	// FRAGMENTATION GRENADES
+	static const int RGD5							= RegisterParticle("explosion_RGD5_01");
+	static const int M67							= RegisterParticle("explosion_M67_01");
+	
+	// ELECTRICITY	        
+	static const int POWER_GENERATOR_SMOKE			= RegisterParticle("smoke_small_generator_01");
+	static const int BARBED_WIRE_SPARKS				= RegisterParticle("electro_shortc2");
+	static const int EASTER_EGG_ACTIVATE			= RegisterParticle("easter_egg_activate");
+
+	// PLAYER
+	static const int BLEEDING_SOURCE				= RegisterParticle("blood_bleeding_01");
+	static const int BLEEDING_SOURCE_LIGHT			= RegisterParticle("blood_bleeding_02");
+	static const int BLOOD_SURFACE_DROPS			= RegisterParticle("blood_surface_drops");
+	static const int BLOOD_SURFACE_CHUNKS			= RegisterParticle("blood_surface_chunks");
+	static const int VOMIT							= RegisterParticle("character_vomit_01");
+	static const int BREATH_VAPOUR_LIGHT			= RegisterParticle("breath_vapour_light");
+	static const int BREATH_VAPOUR_MEDIUM			= RegisterParticle("breath_vapour_medium");
+	static const int BREATH_VAPOUR_HEAVY			= RegisterParticle("breath_vapour_heavy");
+	static const int VOMIT_CHUNKS					= RegisterParticle("character_vomit_puddle");
+	
+	// GUNS
+	static const int GUN_MUZZLE_FLASH_SVD_STAR		= RegisterParticle("weapon_shot_Flame_3D_4star");
+	static const int GUN_SOLO_MUZZLE_FLASH			= RegisterParticle("weapon_shot_Flame_3D");
+	static const int GUN_FNX						= RegisterParticle("weapon_shot_fnx_01");
+	static const int GUN_FNX_SUPPRESSED				= RegisterParticle("weapon_shot_fnx_02");
+	static const int GUN_PARTICLE_TEST				= RegisterParticle("weapon_shot_fnx_01");
+	static const int GUN_PARTICLE_CASING			= RegisterParticle("weapon_shot_chamber_smoke");
+	static const int GUN_PARTICLE_CASING_RAISE		= RegisterParticle("weapon_shot_chamber_smoke_raise");
+	static const int GUN_CZ75						= RegisterParticle("weapon_shot_cz75_01");
+	static const int GUN_AKM						= RegisterParticle("weapon_shot_akm_01");
+	static const int GUN_AKM_SUPPRESSED				= RegisterParticle("weapon_shot_akm_02");
+	static const int GUN_IZH18						= RegisterParticle("weapon_shot_izh18_01");
+	static const int GUN_IZH18_SUPPRESSED			= RegisterParticle("weapon_shot_izh18_02");
+	static const int GUN_MP5K						= RegisterParticle("weapon_shot_mp5k_01");
+	static const int GUN_MP5K_2						= RegisterParticle("weapon_shot_mp5k_02_boris");
+	static const int GUN_MP5K_SUPPRESSED			= RegisterParticle("weapon_shot_mp5k_02");
+	static const int GUN_MP5K_COMPENSATOR			= RegisterParticle("weapon_shot_mp5k_02");
+	static const int GUN_UMP45						= RegisterParticle("weapon_shot_ump45_01");
+	static const int GUN_M4A1						= RegisterParticle("weapon_shot_m4a1_01");
+	static const int GUN_MP133						= RegisterParticle("weapon_shot_mp133_01");
+	static const int GUN_PELLETS					= RegisterParticle("weapon_shot_pellets");
+	static const int GUN_MOSIN9130					= RegisterParticle("weapon_shot_mosin9130_01");
+	static const int GUN_MOSIN_COMPENSATOR			= RegisterParticle("weapon_shot_mosin_compensator_01");
+	static const int GUN_CZ527						= RegisterParticle("weapon_shot_cz527_01");
+	static const int GUN_SKS						= RegisterParticle("weapon_shot_sks_01");
+	static const int GUN_WINCHESTER70				= RegisterParticle("weapon_shot_winch70_01");
+	static const int GUN_VSS						= RegisterParticle("weapon_shot_vss_01");
+	static const int GUN_AK74						= RegisterParticle("weapon_shot_ak74_01");
+	static const int GUN_AK101						= RegisterParticle("weapon_shot_ak101_01");
+	
+	static const int GUN_MAGNUM						= RegisterParticle("weapon_shot_magnum_01");
+	
+	static const int GUN_CZ61						= RegisterParticle("weapon_shot_cz61_01");
+	static const int GUN_LONG_WINDED_SMOKE			= RegisterParticle("weapon_shot_winded_smoke");
+	static const int GUN_LONG_WINDED_SMOKE_SMALL	= RegisterParticle("weapon_shot_winded_smoke_small");
+	static const int SMOKING_BARREL					= RegisterParticle("smoking_barrel");
+	static const int SMOKING_BARREL_SMALL			= RegisterParticle("smoking_barrel_small");
+	static const int SMOKING_BARREL_HEAVY			= RegisterParticle("smoking_barrel_heavy");
+	static const int SMOKING_BARREL_STEAM			= RegisterParticle("smoking_barrel_steam");
+	static const int SMOKING_BARREL_STEAM_SMALL		= RegisterParticle("smoking_barrel_steam_small");
+	static const int SMARKS_CHAMBER					= RegisterParticle("weapon_shot_chamber_spark");
+	
+	// BULLET & MELEE IMPACTS
+	static const int IMPACT_TEST					= RegisterParticle("impacts/bullet_impact_placeholder");
+	static const int IMPACT_DISTANT_DUST			= RegisterParticle("impacts/distant_dust");
+	static const int IMPACT_TEST_RICOCHET			= RegisterParticle("impacts/bullet_riochet_placeholder");
+	static const int IMPACT_TEST2					= RegisterParticle("_test_orientation_02");
+	static const int IMPACT_TEST_ENTER_DEBUG		= RegisterParticle("impacts/_test_impact_enter_debug");
+	static const int IMPACT_TEST_RICOCHET_DEBUG		= RegisterParticle("impacts/_test_impact_ricochet_debug");
+	static const int IMPACT_TEST_EXIT_DEBUG			= RegisterParticle("impacts/_test_impact_exit_debug");
+	static const int IMPACT_TEST_NO_MATERIAL_ERROR	= RegisterParticle("_test_no_material");
+	static const int IMPACT_WOOD_ENTER				= RegisterParticle("impacts/hit_wood_ent_01");
+	static const int IMPACT_WOOD_RICOCHET			= RegisterParticle("impacts/hit_wood_ric_01");
+	static const int IMPACT_WOOD_EXIT				= RegisterParticle("impacts/hit_wood_ext_01");
+	static const int IMPACT_CONCRETE_ENTER			= RegisterParticle("impacts/hit_concrete_ent_01");
+	static const int IMPACT_CONCRETE_RICOCHET		= RegisterParticle("impacts/hit_concrete_ric_01");
+	static const int IMPACT_CONCRETE_EXIT			= RegisterParticle("impacts/hit_concrete_ext_01");
+	static const int IMPACT_FOLIAGE_ENTER			= RegisterParticle("impacts/hit_foliage_ent_01");
+	static const int IMPACT_FOLIAGE_RICOCHET		= RegisterParticle("impacts/hit_foliage_ric_01");
+	static const int IMPACT_FOLIAGE_EXIT			= RegisterParticle("impacts/hit_foliage_ext_01");
+	static const int IMPACT_GRASS_ENTER				= RegisterParticle("impacts/hit_grass_ent_01");
+	static const int IMPACT_GRASS_RICOCHET			= RegisterParticle("impacts/hit_grass_ric_01");
+	static const int IMPACT_DIRT_ENTER				= RegisterParticle("impacts/hit_dirt_ent_01");
+	static const int IMPACT_DIRT_RICOCHET			= RegisterParticle("impacts/hit_dirt_ric_01");
+	static const int IMPACT_DIRT_EXIT				= RegisterParticle("impacts/hit_dirt_ext_01");
+	static const int IMPACT_RUBBER_ENTER			= RegisterParticle("impacts/hit_rubber_ent_01");
+	static const int IMPACT_RUBBER_RICOCHET			= RegisterParticle("impacts/hit_rubber_ric_01");
+	static const int IMPACT_RUBBER_EXIT				= RegisterParticle("impacts/hit_rubber_ext_01");
+	static const int IMPACT_GRAVEL_ENTER			= RegisterParticle("impacts/hit_gravel_ent_01");
+	static const int IMPACT_GRAVEL_RICOCHET			= RegisterParticle("impacts/hit_gravel_ric_01");
+	static const int IMPACT_GRAVEL_EXIT				= RegisterParticle("impacts/hit_gravel_ext_01");
+	static const int IMPACT_PLASTER_ENTER			= RegisterParticle("impacts/hit_plaster_ent_01");
+	static const int IMPACT_PLASTER_RICOCHET		= RegisterParticle("impacts/hit_plaster_ric_01");
+	static const int IMPACT_PLASTER_EXIT			= RegisterParticle("impacts/hit_plaster_ext_01");
+	static const int IMPACT_METAL_ENTER				= RegisterParticle("impacts/hit_metal_ent_01");
+	static const int IMPACT_METAL_RICOCHET			= RegisterParticle("impacts/hit_metal_ric_01");
+	static const int IMPACT_METAL_EXIT				= RegisterParticle("impacts/hit_metal_ext_01");
+	static const int IMPACT_MEAT_ENTER				= RegisterParticle("impacts/hit_meat_ent_01");
+	static const int IMPACT_MEAT_RICOCHET			= RegisterParticle("impacts/hit_meat_ric_01");
+	static const int IMPACT_MEAT_EXIT				= RegisterParticle("impacts/hit_meat_ext_01");
+	static const int IMPACT_MEATBONES_ENTER			= RegisterParticle("impacts/hit_meatbones_ent_01");
+	static const int IMPACT_MEATBONES_RICOCHET		= RegisterParticle("impacts/hit_meatbones_ent_01");
+	static const int IMPACT_MEATBONES_EXIT			= RegisterParticle("impacts/hit_meatbones_ext_01");
+	static const int IMPACT_GLASS_ENTER				= RegisterParticle("impacts/hit_glass_ent_01");
+	static const int IMPACT_GLASS_RICOCHET			= RegisterParticle("impacts/hit_glass_ric_01");
+	static const int IMPACT_GLASS_EXIT				= RegisterParticle("impacts/hit_glass_ext_01");
+	static const int IMPACT_WATER_SMALL_ENTER		= RegisterParticle("impacts/hit_water_ent_01");
+	static const int IMPACT_WATER_MEDIUM_ENTER		= RegisterParticle("impacts/hit_water_ent_02");
+	static const int IMPACT_WATER_LARGE_ENTER		= RegisterParticle("impacts/hit_water_ent_03");
+	static const int IMPACT_TEXTILE_ENTER			= RegisterParticle("impacts/hit_textile_ent_01");
+	static const int IMPACT_TEXTILE_RICOCHET		= RegisterParticle("impacts/hit_textile_ric_01");
+	static const int IMPACT_TEXTILE_EXIT			= RegisterParticle("impacts/hit_textile_ext_01");
+	static const int IMPACT_SAND_ENTER				= RegisterParticle("impacts/hit_sand_ent_01");
+	static const int IMPACT_SAND_RICOCHET			= RegisterParticle("impacts/hit_sand_ric_01");
+	static const int IMPACT_SAND_EXIT				= RegisterParticle("impacts/hit_sand_ext_01");
+	static const int IMPACT_PLASTIC_ENTER			= RegisterParticle("impacts/hit_plastic_ent_01");
+	static const int IMPACT_PLASTIC_RICOCHET		= RegisterParticle("impacts/hit_plastic_ric_01");
+	static const int IMPACT_PLASTIC_EXIT			= RegisterParticle("impacts/hit_plastic_ext_01");
+	
+	// EXPLOSIONS
+	static const int EXPLOSION_LANDMINE				= RegisterParticle("explosion_landmine_01");
+	static const int EXPLOSION_TEST					= RegisterParticle("explosion_placeholder");
+	static const int EXPLOSION_GOAT					= RegisterParticle("explosion_goat");
+	
+	// ENVIRO EFX
+	static const int SMOKING_HELI_WRECK				= RegisterParticle("smoke_heli_wreck_01");
+	static const int AURORA_SANTA_WRECK				= RegisterParticle("smoke_santa_wreck");
+	static const int SMOKE_GENERIC_WRECK			= RegisterParticle("smoke_generic_wreck");
+	static const int SMOKING_CAR_ENGINE				= RegisterParticle("menu_engine_fire");
+	static const int EVAPORATION					= RegisterParticle("menu_evaporation");
+	
+	// VEHICLES
+	static const int HATCHBACK_COOLANT_OVERHEATING	= RegisterParticle("Hatchback_coolant_overheating");
+	static const int HATCHBACK_COOLANT_OVERHEATED	= RegisterParticle("Hatchback_coolant_overheated");
+	static const int HATCHBACK_ENGINE_OVERHEATING	= RegisterParticle("Hatchback_engine_failing");
+	static const int HATCHBACK_ENGINE_OVERHEATED	= RegisterParticle("Hatchback_engine_failure");
+	static const int HATCHBACK_EXHAUST_SMOKE		= RegisterParticle("Hatchback_exhaust");
+	
+	// CORPSE DECAY
+	static const int ENV_SWARMING_FLIES 			= RegisterParticle("env_fly_swarm_01");
+	
+	// BONFIRE 
+	static const int BONFIRE_FIRE 					= RegisterParticle("fire_bonfire");
+	static const int BONFIRE_SMOKE		 			= RegisterParticle("smoke_bonfire");
+	static const int SPOOKY_MIST		 			= RegisterParticle("spooky_mist");
+	
+	static const int VOMIT_BLOOD					= RegisterParticle("character_vomitBlood_01");
+
+	// CONTAMINATED AREAS
+	static const int CONTAMINATED_AREA_GAS_TINY		= RegisterParticle("contaminated_area_gas_around_tiny");
+	static const int CONTAMINATED_AREA_GAS_AROUND	= RegisterParticle("contaminated_area_gas_around");
+	static const int CONTAMINATED_AREA_GAS_BIGASS	= RegisterParticle("contaminated_area_gas_bigass");
+	static const int CONTAMINATED_AREA_GAS_GROUND	= RegisterParticle("contaminated_area_gas_ground");
+	static const int CONTAMINATED_AREA_GAS_SHELL	= RegisterParticle("contaminated_area_gas_shell");
+	
+	//Fireworks
+	static const int FIREWORKS_SHOT					= RegisterParticle("fireworks_small_01");
+	static const int FIREWORKS_EXPLOSION_RED		= RegisterParticle("fireworks_large_01_Red");
+	static const int FIREWORKS_EXPLOSION_GREEN		= RegisterParticle("fireworks_large_01_Green");
+	static const int FIREWORKS_EXPLOSION_BLUE 		= RegisterParticle("fireworks_large_01_Blue");
+	static const int FIREWORKS_EXPLOSION_YELLOW		= RegisterParticle("fireworks_large_01_Yellow");
+	static const int FIREWORKS_EXPLOSION_PINK		= RegisterParticle("fireworks_large_01_Pink");
+	
+	static const int FIREWORKS_FUSE					= RegisterParticle("fireworks_small_04");
+	static const int FIREWORKS_AFTERBURN_START		= RegisterParticle("fireworks_small_02");
+	static const int FIREWORKS_AFTERBURN_END		= RegisterParticle("fireworks_small_03");
+	
+	//Fireworks anniversary
+	static const int FIREWORKS_EXPLOSION_THANKS1	= RegisterParticle("fireworks_ThankYou_anim");
+	static const int FIREWORKS_EXPLOSION_THANKS2	= RegisterParticle("fireworks_For10_anim");
+	static const int FIREWORKS_EXPLOSION_THANKS3	= RegisterParticle("fireworks_Amazing_anim");
+	static const int FIREWORKS_EXPLOSION_THANKS4	= RegisterParticle("fireworks_Years_anim");
+	static const int FIREWORKS_EXPLOSION_THANKS5	= RegisterParticle("fireworks_Dayz_anim");
+	
+	
+	//pox grenade
+	static const int GRENADE_CHEM_BREAK				= RegisterParticle("contaminated_area_gas_grenade");
+	//Claymore
+	static const int CLAYMORE_EXPLOSION				= RegisterParticle("explosion_claymore_01");
+	static const int PLASTIC_EXPLOSION				= RegisterParticle("explosion_plastic_01");
+	
+	// Water jet/spilling
+	static const int WATER_JET						= RegisterParticle("water_jet");
+	static const int WATER_JET_WEAK					= RegisterParticle("water_jet_weak");
+	static const int WATER_SPILLING					= RegisterParticle("water_spilling");
+	
+	// Drowning bubbles
+	static const int DROWNING_BUBBLES				= RegisterParticle("breath_bubbles");
+	
+	//! Cupid's bolt
+	static const int BOLT_CUPID_TAIL				= RegisterParticle("cupid_bolt");
+	static const int BOLT_CUPID_HIT					= RegisterParticle("cupid_hit");
+	
+	static int RegisterParticle(string file_name)
+	{
+		return RegisterParticle(GetPathToParticles(), file_name);
+	}
+	
+	//! Registers a particle and returns its ID
+	static int RegisterParticle(string root_path, string file_name)
+	{
+		if (!m_ParticlePaths)
+			m_ParticlePaths = new map<int, string>;
+		
+		if (!m_ParticleNames)
+			m_ParticleNames = new map<string, int>;
+	
+		string path = string.Format("%1%2", root_path, file_name);
+		string fullPath = string.Format("%1.ptc", path);
+		
+		if ( !FileExist(fullPath) )
+		{
+			string devMsgSuffix;
+			#ifdef DEVELOPER
+			devMsgSuffix = " Then rebuild 'scripts' and 'graphics' PBOs.";
+			#endif
+			ErrorEx(string.Format("Particle file not found! <%1> Correct path to this particle in script file ParticleList.c!%2",
+				fullPath, devMsgSuffix), ErrorExSeverity.WARNING);
+		}
+
+		int existingNameId;
+		if (m_ParticleNames.Find(file_name, existingNameId))
+		{
+			int existingPathId;
+			if (m_ParticlePaths.GetKeyByValueChecked(path, existingPathId))
+			{
+				if (existingNameId == existingPathId)
+				{				
+					return existingNameId; // We have already registered this exact file
+				}
+				else
+				{
+					ErrorEx(string.Format("ParticleNames and ParticlePaths array are containing conflicting data. ID %1 vs ID %2", existingNameId, existingPathId));
+				}
+			}
+			else
+			{
+				ErrorEx(string.Format("Duplicate particle filename: %1; GetParticleIDByName will only work with the first path if there are two different paths.", file_name), ErrorExSeverity.WARNING);
+			}
+		}
+		else
+		{
+			m_ParticleNames.Insert(file_name, m_lastID + 1);
+		}
+		
+		++m_lastID;
+		m_ParticlePaths.Insert(m_lastID, path);
+		return m_lastID;
+	}
+	
+	static int GetRegisteredParticlesCount()
+	{
+		return m_lastID;
+	}
+	
+	//! Purely checks for an invalid number, does NOT mean it is actually registered
+	static bool IsValidId(int id)
+	{
+		return id != NONE && id != INVALID;
+	}
+	
+	//! Returns particle's full path (without .ptc suffix) based on its ID
+	static string GetParticlePath(int particle_id)
+	{
+		string path;		
+		if (!m_ParticlePaths.Find(particle_id, path))	
+			ErrorEx(string.Format("No particle registered with id: %1", particle_id), ErrorExSeverity.WARNING);
+		return path;
+	}
+	
+	//! Returns particle's full path (with .ptc suffix) based on its ID
+	static string GetParticleFullPath(int particle_id)
+	{
+		return string.Format("%1.ptc", GetParticlePath(particle_id));
+	}
+	
+	//! Returns particle's ID based on the path (without .ptc suffix)
+	static int GetParticleID(string particle_file)
+	{
+		int id = m_ParticlePaths.GetKeyByValue(particle_file);
+		if (!IsValidId(id)) // valid id starts from 1, 0 is invalid
+			ErrorEx(string.Format("No particle registered with path: %1", particle_file), ErrorExSeverity.WARNING);		
+		return id;
+	}
+	
+	//! Returns particle's ID based on the filename (without .ptc suffix)
+	static int GetParticleIDByName(string name)
+	{
+		int id = 0;
+		if (!m_ParticleNames.Find(name, id))
+			ErrorEx(string.Format("No particle registered with name: %1", name), ErrorExSeverity.WARNING);		
+		return id;
+	}
+	
+	//! Returns base path to all particles
+	static string GetPathToParticles()
+	{
+		return "graphics/particles/";
+	}
+	
+	//! Preloads all particles
+	static void PreloadParticles()
+	{
+		if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() ) // client side
+		{
+			int count = m_ParticlePaths.Count();
+			
+			for (int i = 0; i < count; ++i)
+			{
+				vobject vobj = GetObject( string.Format("%1.ptc", m_ParticlePaths[i]) );
+				ReleaseObject(vobj);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/ParticleManager/ParticleManager.c b/scripts/3_Game/DayZ/Particles/ParticleManager/ParticleManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..baf08dcf47f225ec7be6b4b34bce1f0c45b2ad22
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/ParticleManager/ParticleManager.c
@@ -0,0 +1,548 @@
+//! Flags for ParticleManagerSettings
+enum ParticleManagerSettingsFlags
+{
+	NONE,
+	//! Particles will be locked to the index and not reused
+	FIXED_INDEX,
+	//! Allocation blocks the game until it is done
+	BLOCKING,
+	//! Disable the creation of virtual particles when the pool is still allocating
+	DISABLE_VIRTUAL,
+	//! Reuse stopped particles even if they are owned by something
+	REUSE_OWNED,
+};
+
+//! Class simply to have easily modded constants
+class ParticleManagerConstants
+{
+	/** \name Global ParticleManager settings
+ 		Settings applied to the global ParticleManager
+	*/
+	//@{
+	static const int POOL_SIZE = 10000;
+	static const int FLAGS = ParticleManagerSettingsFlags.NONE;
+	//@}
+}
+
+//! Settings given to ParticleManager on creation (in ctor)
+class ParticleManagerSettings
+{
+	/**
+	\brief Constructor (ctor)
+		\param poolSize \p int Size of pool (amount of created and reserved particles)
+		\param flags \p int ParticleManagerSettingsFlags
+	*/
+	void ParticleManagerSettings(int poolSize, int flags = ParticleManagerSettingsFlags.NONE)
+	{
+	}
+	
+	//! dtor
+	void ~ParticleManagerSettings()
+	{
+	}
+}
+
+//! Invokers for ParticleManager events
+class ParticleManagerEvents
+{
+	ref ScriptInvoker Event_OnAllocation = new ScriptInvoker();
+	ref ScriptInvoker Event_OnAllocationEnd = new ScriptInvoker();
+}
+
+//! Has a fixed pool of precreated and reserved particles
+class ParticleManager : Managed
+{
+	//! Static ParticleManager
+	private static ref ParticleManager g_ParticleManager;
+
+	//! Access to the static ParticleManager
+	static ParticleManager GetInstance()
+	{
+		if (!g_ParticleManager && !GetGame().IsDedicatedServer())
+		{
+			g_ParticleManager = new ParticleManager(
+				new ParticleManagerSettings(
+					ParticleManagerConstants.POOL_SIZE,
+					ParticleManagerConstants.FLAGS));
+			g_ParticleManager.SetName("GlobalParticleManager");
+		}
+		
+		return g_ParticleManager;
+	}
+	
+	//! To clean it up properly before game closes
+	static void CleanupInstance()
+	{
+		if (g_ParticleManager)
+			delete g_ParticleManager;
+	}
+	
+	/**
+	\brief Constructor (ctor)
+		\param settings \p ParticleManagerSettings Settings for the ParticleManager
+	*/
+	void ParticleManager(ParticleManagerSettings settings)
+	{		
+	}
+	
+	//! dtor
+	void ~ParticleManager()
+	{
+	}
+	
+	
+	
+	/** \name API for compatibility with Particle/ParticleSource create/play
+		Mimics the static Create and Play methods from Particle/ParticleSource
+	*/
+	//@{
+	
+	/**
+	\brief Create function
+		\param id \p int Particle ID registered in ParticleList
+		\param pos \p vector Position of ParticleSource in LS (WS when no parent)
+		\param playOnCreation \p bool Whether to play immediately after creation (Optional)
+		\param parent \p Object Parent Object which will child the ParticleSource (Optional)		
+		\param ori \p vector Orientation of ParticleSource in LS (WS when no parent) (Pitch, Yaw, Roll in degrees) (Optional)
+		\param forceWorldRotation \p bool Forces orientation to rotate relative to the world and not with the parent (Optional)
+		\param owner \p Class The owning instance for this particle (Optional)
+		\return \p ParticleSource Created particle instance when successful
+	*/
+	ParticleSource CreateParticle( int id, vector pos, bool playOnCreation = false, Object parent = null, vector ori = vector.Zero, bool forceWorldRotation = false, Class owner = null )
+	{
+		int flags = ParticlePropertiesFlags.NONE;
+		
+		if (playOnCreation)
+		{
+			flags = flags | ParticlePropertiesFlags.PLAY_ON_CREATION;
+		}
+		
+		if (forceWorldRotation)
+		{
+			flags = flags | ParticlePropertiesFlags.FORCE_WORLD_ROT;
+		}
+
+		return CreateParticleEx(id, pos, flags, parent, ori, owner);
+	}
+	
+	/**
+	\brief Master create function
+		\param id \p int Particle ID registered in ParticleList
+		\param pos \p vector Position of ParticleSource in LS (WS when no parent)
+		\param flags \p int See ParticlePropertiesFlags (Optional)
+		\param parent \p Object Parent Object which will child the ParticleSource (Optional)		
+		\param ori \p vector Orientation of ParticleSource in LS (WS when no parent) (Pitch, Yaw, Roll in degrees) (Optional)
+		\param owner \p Class The owning instance for this particle (Optional)
+		\return \p ParticleSource Created particle instance when successful
+	*/
+	ParticleSource CreateParticleEx( int id, vector pos, int flags = ParticlePropertiesFlags.NONE, Object parent = null, vector ori = vector.Zero, Class owner = null )
+	{
+		string particlePath = ParticleList.GetParticleFullPath(id);
+		if (particlePath == "") // There is already an error inside of ParticleList signaling this
+		{
+			ErrorEx(string.Format("Could not create ParticleSource as particle id %1 is invalid.", id));
+			return null;
+		}
+
+		ParticleProperties props = new ParticleProperties(pos, flags, parent, ori, owner);
+		ParticleSource p = CreateParticleByPath(particlePath, props);
+		return p;
+	}
+	
+	/**
+	\brief Creates a particle emitter and attaches it on the given object
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param parent_obj \p Object Instance on which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (Optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yaw, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p ParticleSource Created particle instance
+	*/
+	ParticleSource CreateOnObject(
+		int particle_id,
+		Object parent_obj,
+		vector local_pos = "0 0 0",
+		vector local_ori = "0 0 0",
+		bool force_world_rotation = false )
+	{
+		return CreateParticle(particle_id, local_pos, false, parent_obj, local_ori, force_world_rotation);
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility
+	*/
+	ParticleSource Create( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0" )
+	{
+		return CreateOnObject( particle_id, parent_obj, local_pos, local_ori);
+	}
+	
+	/**
+	\brief Creates a particle emitter on the given position
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param global_pos \p Vector Position where the particel will be created
+		\param global_ori \p vector Orientation (Pitch, Yawn, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Has absolutely no effect here as there is no parent
+		\return \p ParticleSource Created particle instance
+	*/
+	ParticleSource CreateInWorld( int particle_id, vector global_pos, vector global_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		return CreateParticle(particle_id, global_pos, false, null, global_ori, force_world_rotation);
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	ParticleSource Create( int particle_id, vector global_pos, vector global_ori = "0 0 0" )
+	{
+		return CreateInWorld( particle_id, global_pos, global_ori );
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Static play on creation
+		You can use the following Play(...) functions to create and activate a particle in 1 line of your script.
+	*/
+	//@{
+	
+	/**
+	\brief Creates a particle emitter, attaches it on the given object and activates it
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param parent_obj \p Object Instance on which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (Optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yaw, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p ParticleSource Created particle instance
+	*/
+	ParticleSource PlayOnObject(int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		return CreateParticle(particle_id, local_pos, true, parent_obj, local_ori, force_world_rotation);
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	ParticleSource Play( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0" )
+	{
+		return PlayOnObject( particle_id, parent_obj, local_pos, local_ori);
+	}
+	
+	/**
+	\brief Creates a particle emitter on the given position and activates it
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param global_pos \p Vector Position where the particel will be created
+		\return \p ParticleSource Created particle instance
+	*/
+	ParticleSource PlayInWorld(int particle_id, vector global_pos)
+	{
+		return PlayInWorldEx(particle_id, null, global_pos);
+	}
+	
+	ParticleSource PlayInWorldEx(int particle_id, Object parent_obj, vector global_pos, vector global_ori = "0 0 0", bool force_world_rotation = false)
+	{
+		return CreateParticle(particle_id, global_pos, true, parent_obj, global_ori, force_world_rotation);
+		
+	}
+
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	ParticleSource Play( int particle_id, vector global_pos)
+	{
+		return PlayInWorld( particle_id, global_pos);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Get Particles
+ 		API for creating, playing or obtaining particles from the pool
+	*/
+	//@{
+	
+	/**
+	\brief Creates an amount of particles with the properties given
+		\param particles \p array<ParticleSource> The resulting particles if an array is given
+		\param path \p string Path of particle effect
+		\param properties \p ParticleProperties Properties of the particles created
+		\param count \p int Amount of particles to create with these properties
+		\return \p int Amount of particles created in this frame, if the ParticleManager is still allocating while this is called and virtual particles are enabled, the overflow particles will be virtual instead and not given in the out array
+	*/
+	proto native int CreateParticles(array<ParticleSource> particles, string path, notnull ParticlePropertiesArray properties, int count = 1);
+	
+	/**
+	\brief Create a particle
+		\param path \p string Path of particle effect
+		\param properties \p ParticleProperties Properties of the particles created
+		\return \p ParticleSource The resulting particle
+	*/
+	ParticleSource CreateParticleByPath(string path, notnull ParticleProperties properties)
+	{
+		array<ParticleSource> tempArr = new array<ParticleSource>;
+		CreateParticles(tempArr, path, {properties}, 1);
+		
+		if (tempArr.Count() > 0)
+			return tempArr[0];
+		else
+			return null;
+	}
+	
+	/**
+	\brief QoL function using script ParticleList, strongly recommend to read comments for CreateParticles as well
+		\param id \p int ID of particle registered in ParticleList
+		\param properties \p ParticleProperties Properties of the particles created
+		\param count \p int Amount of particles to create with these properties
+		\return \p int Amount of particles created in this frame, if the ParticleManager is still allocating while this is called and virtual particles are enabled, the overflow particles will be virtual instead
+	*/
+	int CreateParticlesById(int id, notnull ParticlePropertiesArray properties, int count)
+	{
+		return CreateParticles(null, ParticleList.GetParticleFullPath(id), properties, count);
+	}
+	
+	/**
+	\brief QoL function using script ParticleList, strongly recommend to read comments for CreateParticles as well
+		\param id \p int ID of particle registered in ParticleList
+		\param properties \p ParticleProperties Properties of the particles created
+		\param count \p int Amount of particles to create with these properties
+		\return \p array<ParticleSource> The resulting particles - Read particles param of CreateParticles
+	*/
+	array<ParticleSource> CreateParticlesByIdArr(int id, notnull ParticlePropertiesArray properties, int count)
+	{
+		array<ParticleSource> outArr = new array<ParticleSource>;
+		CreateParticles(outArr, ParticleList.GetParticleFullPath(id), properties, count);
+		return outArr;
+	}
+	
+	/**
+	\brief QoL function for when only one particle is needed using script ParticleList, strongly recommend to read comments for CreateParticles as well
+		\param id \p int ID of particle registered in ParticleList
+		\param properties \p ParticleProperties Properties of the particles created
+		\return \p ParticleSource The resulting particle
+	*/
+	ParticleSource CreateParticleById(int id, ParticleProperties properties)
+	{
+		array<ParticleSource> tempArr = new array<ParticleSource>;
+		CreateParticles(tempArr, ParticleList.GetParticleFullPath(id), {properties}, 1);
+		
+		if (tempArr.Count() > 0)
+			return tempArr[0];
+		else
+			return null;
+	}
+	
+	/**
+	\brief QoL function for when wanting to play a particle at a position right away
+		\param particles \p array<ParticleSource> The resulting particles if an array is given
+		\param path \p string Path of particle effect
+		\param positions \p array<vector> Positions of particles
+		\param count \p int Amount of particles to create at this position
+		\return \p int Amount of particles created in this frame, if the ParticleManager is still allocating while this is called and virtual particles are enabled, the overflow particles will be virtual instead and not given in the out array
+	*/
+	proto native int PlayParticles(out array<ParticleSource> particles, string path, notnull array<vector> positions, int count = 1);
+	
+	/**
+	\brief QoL function using script ParticleList, strongly recommend to read comments for PlayParticles as well
+		\param id \p int ID of particle registered in ParticleList
+		\param positions \p array<vector> Positions of particles
+		\param count \p int Amount of particles to create at this position
+		\return \p array<ParticleSource> The resulting particles - Read particles param of PlayParticles
+	*/
+	array<ParticleSource> PlayParticlesById(int id, array<vector> positions, int count)
+	{
+		array<ParticleSource> outArr = new array<ParticleSource>;
+		PlayParticles(outArr, ParticleList.GetParticleFullPath(id), positions, count);
+		return outArr;
+	}
+	
+	/**
+	\brief QoL function for when only one particle is needed using script ParticleList, strongly recommend to read comments for PlayParticles as well
+		\param id \p int ID of particle registered in ParticleList
+		\param positions \p array<vector> Positions of particles
+		\return \p ParticleSource The resulting particle
+	*/
+	ParticleSource PlayParticleById(int id, array<vector> position)
+	{
+		array<ParticleSource> tempArr = new array<ParticleSource>;
+		PlayParticles(tempArr, ParticleList.GetParticleFullPath(id), position, 1);
+		
+		if (tempArr.Count() > 0)
+			return tempArr[0];
+		else
+			return null;
+	}
+	
+	/**
+	\brief Manually get the particle at index
+		\param index \p int Index of particle
+		\return \p ParticleSource ParticleSource at given index
+	*/
+	proto native ParticleSource GetParticle(int index);
+	
+	/**
+	\brief Manually get a portion of the particles in the pool
+		\param particles \p array<ParticleSource> The resulting particles
+		\param startIndex \p int Starting index
+		\param count \p int Amount of particles to get
+		\return \p int Amount of particles in outArray
+	*/
+	proto native int GetParticles(out array<ParticleSource> outArray, int startIndex, int count);
+	
+	/**
+	\brief Manually get a portion of the particles in the pool
+		\param startIndex \p int Starting index
+		\param count \p int Amount of particles to get
+		\return \p array<ParticleSource> The resulting particles
+	*/
+	array<ParticleSource> GetParticlesEx(int startIndex, int count)
+	{
+		array<ParticleSource> outArr = new array<ParticleSource>;
+		GetParticles(outArr, startIndex, count);
+		return outArr;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Identification
+ 		Identification functionality
+	*/
+	//@{
+	
+	/**
+	\brief Set a name for the ParticleManager to identify it more easily
+		\param name \p string Name for ParticleManager
+	*/
+	proto native void SetName(string name);
+	
+	/**
+	\brief Gets the name which is set for the ParticleManager, default is "ParticleSourceManager"
+		\param name \p string Name of ParticleManager
+	*/
+	proto string GetName();
+	
+	/**
+	\brief Gets the debug name for the ParticleManager
+		\param dbgName \p string "name:id"
+	*/
+	proto string GetDebugNameNative();
+	
+	/**
+	\brief Gets the debug name for the ParticleManager
+		\return \p string "name:id"
+	*/
+	override string GetDebugName()
+	{
+		return GetDebugNameNative();
+	}
+	
+	/**
+	\brief Gets the ID for the ParticleManager
+		\return \p int ID for the ParticleManager (different every restart, as it is the nth instance created since the start of the program)
+	*/
+	proto int GetCountID();
+	
+	/**
+	\brief Gets the amount of ParticleManager that have been created since the start of the program
+		\return \p int Amount of ParticleManager that have been created since the start of the program
+	*/
+	proto native static int GetStaticCount();
+	
+	/**
+	\brief Gets the amount of ParticleManager that are currently existing
+		\return \p int Amount of ParticleManager that are currently existing
+	*/
+	proto native static int GetStaticActiveCount();
+	
+	//@}
+	
+	
+	
+	/** \name Properties and state
+		Obtain information about the state of the ParticleManager
+	*/
+	//@{
+	
+	/**
+	\brief Gets the fixed maximum size of the pool
+		\return \p int The fixed maximum size of the pool
+	*/
+	proto native int GetPoolSize();
+	
+	/**
+	\brief Gets the amount of particles currently allocated
+		\return \p int Amount of particles currently allocated
+	*/
+	proto native int GetAllocatedCount();
+	
+	/**
+	\brief Gets the amount of virtual particles
+		\return \p int Amount of virtual particles currently waiting to be turned into real particles
+	*/
+	proto native int GetVirtualCount();
+	
+	/**
+	\brief Gets the amount of playing particles
+		\return \p int Amount of currently playing particles
+	*/
+	proto native int GetPlayingCount();
+	
+	/**
+	\brief Checks if the ParticleManager has allocated all slots in the pool
+		\return \p bool True when the number of allocated particles is the same as the pool size
+	*/
+	proto native bool IsFinishedAllocating();
+	
+	//@}
+	
+	
+	
+	/** \name Script Events API
+		Setting and getting of ScriptEvents
+	*/
+	//@{
+	
+	/**
+	\brief Set the events
+		\param events \p Managed The events to set
+	*/
+	private proto void SetScriptEvents(Managed events);
+	
+	/**
+	\brief Get the events
+		\return \p Managed If there is any events set, this will return them
+	*/
+	private proto Managed GetScriptEvents();
+	
+	/**
+	\brief Get the events
+		\return \p ParticleManagerEvents If there is any events set, this will return them so that additional functionality can be bound to them
+	*/
+	ParticleManagerEvents GetEvents()
+	{
+		return ParticleManagerEvents.Cast(GetScriptEvents());
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Events
+		Events called from C++
+	*/
+	//@{
+	
+	void OnAllocation(array<ParticleSource> allocatedParticles)
+	{
+		GetEvents().Event_OnAllocation.Invoke(this, allocatedParticles);
+	}
+	
+	void OnAllocationEnd()
+	{
+		GetEvents().Event_OnAllocationEnd.Invoke(this);
+	}
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/ParticleManager/ParticleSource.c b/scripts/3_Game/DayZ/Particles/ParticleManager/ParticleSource.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c55ec004da86d19977822f8132cb698ff70ce6a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/ParticleManager/ParticleSource.c
@@ -0,0 +1,1031 @@
+//! Flags to pass to ParticleSource.SetParticleAutoDestroyFlags
+enum ParticleAutoDestroyFlags
+{
+	//! No automatic destroying
+	NONE,
+	//! Destroy when the Particle ends (looping particle never ends)
+	ON_END,
+	//! Destroy when particle stops
+	ON_STOP,
+	//! ON_END | ON_STOP
+	ALL,
+}
+
+//! Flags to pass to ParticleSource.PlayParticleEx
+enum PlayParticleFlags
+{
+	//! No flags
+	NONE,		
+	// Is just a placeholder for now
+}
+
+//! Flags to pass to ParticleSource.StopParticle
+enum StopParticleFlags
+{
+	//! No flags
+	NONE,
+	//! Reset state after stopping
+	RESET,
+	/**
+	\brief Flag will make the particle stop immediately, taking it out of simulation and clearing VISIBLE flag
+	*	\note By default the particle will gradually fade
+	*	\note Note that when using IMMEDIATE, it is possible to call PlayParticle and it will resume from the moment it stopped
+	*		  Which is not possible by default, as the gradual fade is accomplished by nulling the lifetime
+	*/
+	IMMEDIATE,
+	//! Is default behaviour, but can be used in conjuction with IMMEDIATE which hides it when this flag is not present
+	VISIBLE,
+	//! (SPF_IMMEDIATE | SPF_VISIBLE) "Freezes" the particle while keeping it visible
+	PAUSE,
+}
+
+//! Mode for GetParticle
+enum EGetParticleMode
+{
+	//! Full path with ext 		("graphics/particles/smoking_barrel_small.ptc")
+	FULL,
+	//! Full path without ext 	("graphics/particles/smoking_barrel_small")
+	NO_EXT,
+	//! Filename only 			("smoking_barrel_small")
+	FILE,
+}
+
+enum ParticlePropertiesFlags
+{
+	NONE,
+	//! Makes the particle start playing immediately after being created
+	PLAY_ON_CREATION,
+	//! Only applicable when there is a parent, this will force the localOri to be in world space instead of local
+	FORCE_WORLD_ROT,
+	//! By default, a particle unparents when it ends, this disables this behaviour
+	KEEP_PARENT_ON_END,
+};
+
+//! Properties while creating a ParticleSource
+class ParticleProperties
+{
+	/**
+	*\brief Constructor (ctor)
+	*	\param localPos \p vector Local position of particle, if no parent this is world position
+	*	\param flags \p int See ParticlePropertiesFlags
+	*	\param parent \p Object The parent that the ParticleSource will be added to as a child
+	*	\param localOri \p vector Local orientation of particle, if no parent this is world orientation
+	*	\param owner \p Class The owning instance for this particle, as long as it exists, this particle will not be reused (unless flagged)
+	*					Important when for example virtual is enabled
+	*					since if the particle owner has been deleted, the virtual should not be converted
+	*					Only fill in owner if necessary, for example when the owner is reusing the same particle after storing it
+	*/
+	void ParticleProperties(vector localPos, int flags, Object parent = null, vector localOri = vector.Zero, Class owner = null)
+	{
+	}
+	
+	//! dtor
+	void ~ParticleProperties()
+	{
+	}
+	
+	/** \name Data access
+ 		Methods to retrieve the data in script
+	*/
+	//@{
+	proto Object GetParent();
+	proto Class GetOwner();
+	proto vector GetLocalPos();
+	proto vector GetLocalOri();
+	proto int GetPPFlags();
+	proto bool IsPlayOnCreation();
+	proto bool IsForceWorldRotation();	
+	proto bool IsKeepParentOnEnd();
+	//@}
+}
+
+typedef array<ref ParticleProperties> ParticlePropertiesArray;
+typedef array<ParticleSource> ParticleSourceArray;
+
+/**
+*\brief Entity which has the particle instance as an ObjectComponent
+*	\note Unfortunately the native methods are private and have a script wrapper
+*		  This is because of backwards compatibility with the old Particle and to avoid confusion
+*		  As we should continue to use Particle for consistency, as it is too deeply rooted in script
+*		  Which means switching is no longer possible due to it being harmful for already existing mods
+*		  Even though using the ParticleSource directly would be preferred
+*
+*	\note Some variables from Particle are invalid on this level, those marked DEPRECATED by Particle are still DEPRECATED here
+*		  m_ParticleID; 			//!< INVALID - Use GetParticleID() instead
+*		  m_Lifetime;				//!< INVALID - No EOnFrame, so no use for it
+*		  m_IsPlaying;				//!< VALID - Set through events - IsParticlePlaying() is still better
+*		  m_IsRepeat;				//!< INVALID - Use IsRepeat() instead
+*		  m_MarkedForDeletion;		//!< INVALID - No EOnFrame, so no use for it
+*		  Wiggle API variables are still used for Wiggle API
+*		  m_ParentObject; 			//!< VALID - Set through events - Or use GetParticleParent() or GetParent()
+*		  m_ParticleEffect;			//!< VALID - Not in the same usage as Particle, as it will always be 'this', never null
+*/
+class ParticleSource : Particle
+{
+	//! ctor
+	void ParticleSource()
+	{
+		m_ParticleEffect = this;
+	}
+	
+	//! dtor
+	void ~ParticleSource()
+	{
+	}
+	
+	//! Empty - Only needed for Particle
+	override protected void ParticleInit() {}
+	
+	/**
+	\brief Enables the particle to automatically clean up itself when ending or stopping
+		\note Is enabled by default (ALL)
+		\note Looping particles never end
+		\note ParticleSource belonging to a ParticleManager will ignore these
+		\param flags \p ParticleAutoDestroyFlags Flags enabling when the particle should be auto destroyed
+	*/
+	proto native void SetParticleAutoDestroyFlags(ParticleAutoDestroyFlags flags);
+	
+	/**
+	\brief Disables the particle automatically cleaning up itself when ending or stopping
+	*/
+	void DisableAutoDestroy()
+	{
+		SetParticleAutoDestroyFlags(ParticleAutoDestroyFlags.NONE);
+	}
+	
+	/**
+	\brief Gets the currently set ParticleAutoDestroyFlags flags set on this ParticleSource
+		\return \p int Currently set ParticleAutoDestroyFlags flags set on this ParticleSource
+	*/
+	proto native int GetParticleAutoDestroyFlags();
+	
+	/** \name Create a particle (static)
+		Helper static methods to create/attach/play a ParticleSource on one line
+	*/
+	//@{
+	
+	/**
+	\brief Create function
+		\param id \p int Particle ID registered in ParticleList
+		\param pos \p vector Position of ParticleSource in LS (WS when no parent)
+		\param playOnCreation \p bool Whether to play immediately after creation (Optional)
+		\param parent \p Object Parent Object which will child the ParticleSource (Optional)		
+		\param ori \p vector Orientation of ParticleSource in LS (WS when no parent) (Pitch, Yaw, Roll in degrees) (Optional)
+		\param forceWorldRotation \p bool Forces orientation to rotate relative to the world and not with the parent (Optional)
+		\param owner \p Class The owning instance for this particle (Optional)
+		\return \p ParticleSource Created particle instance when successful
+	*/
+	static ParticleSource CreateParticle( int id, vector pos, bool playOnCreation = false, Object parent = null, vector ori = vector.Zero, bool forceWorldRotation = false, Class owner = null )
+	{
+		int flags = ParticlePropertiesFlags.NONE;
+		
+		if (playOnCreation)
+		{
+			flags = flags | ParticlePropertiesFlags.PLAY_ON_CREATION;
+		}
+		
+		if (forceWorldRotation)
+		{
+			flags = flags | ParticlePropertiesFlags.FORCE_WORLD_ROT;
+		}
+
+		return CreateParticleEx(id, pos, flags, parent, ori, owner);
+	}
+	
+	/**
+	\brief Master create function
+		\param id \p int Particle ID registered in ParticleList
+		\param pos \p vector Position of ParticleSource in LS (WS when no parent)
+		\param flags \p int See ParticlePropertiesFlags (Optional)
+		\param parent \p Object Parent Object which will child the ParticleSource (Optional)		
+		\param ori \p vector Orientation of ParticleSource in LS (WS when no parent) (Pitch, Yaw, Roll in degrees) (Optional)
+		\param owner \p Class The owning instance for this particle (Optional)
+		\return \p ParticleSource Created particle instance when successful
+	*/
+	static ParticleSource CreateParticleEx( int id, vector pos, int flags = ParticlePropertiesFlags.NONE, Object parent = null, vector ori = vector.Zero, Class owner = null )
+	{
+		string particlePath = ParticleList.GetParticleFullPath(id);
+		if (particlePath == "") // There is already an error inside of ParticleList signaling this
+		{
+			ErrorEx(string.Format("Could not create ParticleSource as particle id %1 is invalid.", id));
+			return null;
+		}
+
+		vector localPos = pos;
+		
+		if (parent)
+			pos = parent.GetPosition();
+		
+		ParticleSource p = ParticleSource.Cast( GetGame().CreateObjectEx("ParticleSource", pos, ECE_LOCAL) );
+		p.SetParticle(particlePath);
+		ParticleProperties props = new ParticleProperties(localPos, flags, parent, ori, owner);
+		p.ApplyProperties(props);
+		
+		return p;
+	}
+	
+	/**
+	\brief Creates a particle emitter and attaches it on the given object
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param parent_obj \p Object Instance on which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (Optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yaw, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p Particle Created particle instance
+	*/
+	override static Particle CreateOnObject(
+		int particle_id,
+		Object parent_obj,
+		vector local_pos = "0 0 0",
+		vector local_ori = "0 0 0",
+		bool force_world_rotation = false )
+	{
+		return CreateParticle(particle_id, local_pos, false, parent_obj, local_ori, force_world_rotation);
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility
+	*/
+	override static Particle Create( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0" )
+	{
+		return CreateOnObject( particle_id, parent_obj, local_pos, local_ori);
+	}
+	
+	/**
+	\brief Creates a particle emitter on the given position
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param global_pos \p Vector Position where the particel will be created
+		\param global_ori \p vector Orientation (Pitch, Yawn, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Has absolutely no effect here as there is no parent
+		\return \p Particle Created particle instance
+	*/
+	override static Particle CreateInWorld( int particle_id, vector global_pos, vector global_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		return CreateParticle(particle_id, global_pos, false, null, global_ori, force_world_rotation);
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	override static ParticleSource Create( int particle_id, vector global_pos, vector global_ori = "0 0 0" )
+	{
+		return CreateInWorld( particle_id, global_pos, global_ori );
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Static play on creation
+		You can use the following Play(...) functions to create and activate a particle in 1 line of your script.
+	*/
+	//@{
+	
+	/**
+	\brief Creates a particle emitter, attaches it on the given object and activates it
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param parent_obj \p Object Instance on which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (Optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yaw, Roll in degrees) (Optional)
+		\param force_world_rotation \p bool Forces particle's orientation to rotate relative to the world and not with the object (Optional)
+		\return \p Particle Created particle instance
+	*/
+	override static Particle PlayOnObject(int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_world_rotation = false )
+	{
+		return CreateParticle(particle_id, local_pos, true, parent_obj, local_ori, force_world_rotation);
+	}
+	
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	override static Particle Play( int particle_id, Object parent_obj, vector local_pos = "0 0 0", vector local_ori = "0 0 0" )
+	{
+		return PlayOnObject( particle_id, parent_obj, local_pos, local_ori);
+	}
+	
+	/**
+	\brief Creates a particle emitter on the given position and activates it
+		\param particle_id \p int Particle ID registered in ParticleList
+		\param global_pos \p Vector Position where the particel will be created
+		\return \p Particle Created particle instance
+	*/
+	override static Particle PlayInWorld( int particle_id, vector global_pos)
+	{
+		return CreateParticle(particle_id, global_pos, true);
+	}
+
+	/**
+	\brief Legacy function for backwards compatibility with 1.01 and below
+	*/
+	override static Particle Play( int particle_id, vector global_pos)
+	{
+		return PlayInWorld( particle_id, global_pos);
+	}
+	
+	//@}
+	
+
+	
+	/** \name Playback
+ 		Methods regarding playing/stopping of particle
+	*/
+	//@{
+	
+	/**
+	\brief Method to tell the particle to start playing
+		\note Will call OnParticleStart when successful
+		\return \p bool Whether the particle successfully started
+	*/
+	private proto bool PlayParticleNative(int flags);
+	
+	/**
+	\brief Method to tell the particle to start playing
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+		\return \p bool Whether the particle successfully started
+	*/
+	override bool PlayParticleEx(int particle_id = -1, int flags = 0)
+	{
+		if ( particle_id > -1 )
+		{
+			// Here we can just do it directly
+			// While with the old system it will not work when the particle is already created
+			SetParticleByID(particle_id);
+		}
+		
+		return PlayParticleNative(flags);
+	}
+	
+	/**
+	\brief Method to tell the particle to stop playing
+		\note The particle is not immediately stopped by default, instead it will gradually fade
+			* If this is however desired, then pass in StopParticleFlags.IMMEDIATE
+		\param flags \p int Flags to pass to the stopping (StopParticleFlags)
+		\return \p bool Whether the particle successfully stopped
+	*/
+	private proto bool StopParticleNative(int flags);
+	
+	/**
+	\brief Method to tell the particle to stop playing
+		\param flags \p int Flags to pass to the stopping (StopParticleFlags)
+		\return \p bool Whether the particle successfully stopped
+	*/
+	override bool StopParticle(int flags = 0)
+	{
+		return StopParticleNative(flags);
+	}
+	
+	/**
+	\brief Method to tell the particle to reset
+		\return \p bool Whether the particle successfully reset
+	*/
+	private proto native bool ResetParticleNative();
+	
+	/**
+	\brief Method to tell the particle to reset
+		\return \p bool Whether the particle successfully reset
+	*/
+	override bool ResetParticle()
+	{
+		return ResetParticleNative();
+	}
+	
+	/**
+	\brief Method to tell the particle to restart (reset + play)
+		\return \p bool Whether the particle successfully restarted
+	*/
+	private proto native bool RestartParticleNative();
+	
+	/**
+	\brief Method to tell the particle to restart (reset + play)
+		\return \p bool Whether the particle successfully restarted
+	*/
+	override bool RestartParticle()
+	{
+		return RestartParticleNative();
+	}
+	
+	/**
+	\brief Ask if the particle is still playing
+		\return \p bool Whether the particle is playing
+	*/
+	private proto bool IsParticlePlayingNative();
+	
+	/**
+	\brief Ask if the particle is still playing
+		\return \p bool Whether the particle is playing
+	*/
+	override bool IsParticlePlaying()
+	{
+		return IsParticlePlayingNative();
+	}
+	
+	//@}
+	
+	
+	
+	/** \name SetParticle
+ 		Methods that set the particle to be used
+	*/
+	//@{
+	
+	/**
+	\brief Assigns a particle to the ParticleSource
+		\param path \p string Path of particle effect
+		\return \p bool Whether the creating and assigning of particle was successful
+	*/
+	private proto native bool SetParticleNative(string path);
+	
+	/**
+	\brief Assigns a particle to the ParticleSource
+		\note Intentionally private, as it is best to use 'SetParticleByID' instead from script, because ParticleList
+		\param path \p string Path of particle effect
+		\return \p bool Whether the creating and assigning of particle was successful
+	*/
+	private bool SetParticle(string path)
+	{
+		return SetParticleNative(path);
+	}
+	
+	/**
+	\brief Assigns a particle to the ParticleSource
+		\param id \p int ID of particle registered in ParticleList
+		\return \p bool Whether the creating and assigning of particle was successful
+	*/
+	bool SetParticleByID(int id)
+	{
+		return SetParticle(ParticleList.GetParticleFullPath(id));
+	}
+	
+	/**
+	\brief Sets particle id
+		\note Purely here for backwards compatibility with Particle
+		\param particle_id \p int Particle ID registered in ParticleList to start playing
+	*/
+	override void SetSource(int particle_id)
+	{
+		SetParticleByID(particle_id);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name GetParticle
+ 		Methods that get the particle assigned
+	*/
+	//@{
+	
+	/**
+	\brief Gets the path to the currently assigned particle
+		\param path \p string Path of particle effect
+		\param mode \p EGetParticleMode What path to return
+		\return \p bool Whether the path is filled in or not
+	*/
+	private proto bool GetParticleNative(out string path, EGetParticleMode mode);
+	
+	/**
+	\brief Gets the path to the currently assigned particle
+		\param path \p string Path of particle effect
+		\param mode \p EGetParticleMode What path to return
+		\return \p bool Whether the path is filled in or not
+	*/
+	bool GetParticle(out string path, EGetParticleMode mode)
+	{
+		return GetParticleNative(path, mode);
+	}
+	
+	/**
+	\brief Gets the ParticleList ID of the currently assigned particle
+		\return \p int ID of particle registered in ParticleList
+	*/
+	override int GetParticleID()
+	{
+		string path;
+		if (GetParticle(path, EGetParticleMode.FILE))
+			return ParticleList.GetParticleIDByName(path);
+		else
+			return -1;			
+	}
+	
+	/**
+	\brief Gets the ParticleList ID of the currently assigned particle
+		\note This is because the new GetParticleID will only work when every particle file name has a unique name
+			* In case this is not the case, then this method is what one will want to use
+		\return \p int ID of particle registered in ParticleList
+	*/
+	int GetParticleIDLegacy()
+	{
+		string path;
+		if (GetParticle(path, EGetParticleMode.NO_EXT))
+			return ParticleList.GetParticleID(path);
+		else
+			return -1;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Apply properties
+ 		Methods to apply properties to the particle
+	*/
+	//@{
+	
+	/**
+	\brief Applies the properties given to the ParticleSource
+		\note Already handles proper reparenting
+		\param properties \p ParticleProperties The properties to apply
+		\return \p bool Whether the properties were successfully applied
+	*/
+	private proto native bool ApplyPropertiesNative(ParticleProperties properties);
+	
+	/**
+	\brief Applies the properties given to the ParticleSource		
+		\param properties \p ParticleProperties The properties to apply
+		\return \p bool Whether the properties were successfully applied
+	*/
+	bool ApplyProperties(ParticleProperties properties)
+	{
+		return ApplyPropertiesNative(properties);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Properties and state
+		Obtain information or set properties regarding the state of the Particle
+	*/
+	//@{
+	
+	/**
+	\brief Returns direct particle effect entity
+		\note Backwards compatibility with Particle, here it is the Object itself
+		\return \p Object The Object with the particle component (this)
+	*/
+	override Object GetDirectParticleEffect()
+	{
+		return this;
+	}
+	
+	/**
+	\brief Returns the parent of this Particle if there is one
+		\return \p Object The parent or null if there is none
+	*/
+	override Object GetParticleParent()
+	{
+		return Object.Cast(GetParent());
+	}
+	
+	/**
+	\brief Returns if there is any particle active
+		\return \p bool Whether there is any particle active
+	*/
+	private proto bool HasActiveParticleNative();
+	
+	/**
+	\brief Returns if there is any particle active
+		\return \p bool Whether there is any particle active
+	*/
+	override bool HasActiveParticle()
+	{
+		return HasActiveParticleNative();
+	}
+	
+	/**
+	\brief Returns the total count of active particles in all emitors
+		\note Internally does a sum, HasActiveParticle is better for a quick check
+		\return \p int Total count of active particles
+	*/
+	private proto int GetParticleCountNative();
+	
+	/**
+	\brief Returns the total count of active particles in all emitors
+		\note Internally does a sum, HasActiveParticle is better for a quick check
+		\return \p int Total count of active particles
+	*/
+	override int GetParticleCount()
+	{
+		return GetParticleCountNative();
+	}
+	
+	/**
+	\brief Returns whether there is a repeating particle
+		\return \p bool whether there is a repeating particle
+	*/
+	private proto bool IsRepeatNative();
+	
+	/**
+	\brief Returns whether there is a repeating particle
+		\return \p bool whether there is a repeating particle
+	*/
+	override bool IsRepeat()
+	{
+		return IsRepeatNative();
+	}
+	
+	/**
+	\brief Returns the approx. max lifetime
+		\return \p float The largest lifetime sum among the emitors
+	*/
+	private proto float GetMaxLifetimeNative();
+	
+	/**
+	\brief Returns the approx. max lifetime
+		\return \p float The largest lifetime sum among the emitors
+	*/
+	override float GetMaxLifetime()
+	{
+		return GetMaxLifetimeNative();
+	}
+	
+	/**
+	\brief Get the owner of this ParticleSource
+		\return \p Class The owner or null
+	*/
+	proto native Class GetOwner();
+	
+	/**
+	\brief Set the owner of this ParticleSource
+		\param \p Class The owner or null
+	*/
+	proto native void SetOwner(Class owner);
+	
+	/**
+	\brief null the owner of this ParticleSource
+	*/
+	proto native void Orphan();
+		
+	//@}
+	
+	
+	
+	/** \name Owning ParticleManager
+ 		Methods regarding the owner
+	*/
+	//@{
+	
+	/**
+	\brief Get the ParticleManager the ParticleSource belongs to if any
+		\return \p ParticleManager The ParticleManager which created the ParticleSource or null
+	*/
+	proto native ParticleManager GetParticleManager();
+	
+	/**
+	\brief Get the index of this ParticleSource in the owning ParticleManager
+		\return \p int The index in the pool in the owning ParticleManager, -1 if no owner
+	*/
+	proto native int GetIndex();
+	
+	//@}
+	
+	
+	
+	/** \name Static counter API
+		Gives counter information for the class
+	*/
+	//@{
+	
+	/**
+	\brief Gets the ID for the ParticleSource
+		\note Different every restart, as it is the nth instance created since the start of the program
+		\return \p int ID for the ParticleSource
+	*/
+	proto int GetCountID();
+	
+	/**
+	\brief Gets the amount of ParticleSource that have been created since the start of the program
+		\return \p int Amount of ParticleSource that have been created since the start of the program
+	*/
+	proto native static int GetStaticCount();
+	
+	/**
+	\brief Gets the amount of ParticleSource that are currently existing
+		\return \p int Amount of ParticleSource that are currently existing
+	*/
+	proto native static int GetStaticActiveCount();
+	
+	//@}
+	
+	
+	
+	/** \name Events
+	*	ParticleBase events
+	*	For ParticleSource, these are handed on C++ side
+	*	For more information, read ParticleEvents
+	*/
+	//@{
+	
+	/**
+	\brief Event when the particle receives a parent
+	*/
+	override protected void OnParticleParented(IEntity parent)
+	{
+		m_ParentObject = Object.Cast(parent);
+		
+		super.OnParticleParented(parent);
+	}
+	
+	/**
+	\brief Event when the particle is orphaned
+	*/
+	override protected void OnParticleUnParented(IEntity parent)
+	{
+		m_ParentObject = null;
+		
+		// Since we have lost the parent, we will need to refresh the wiggle
+		// As it uses a cached local position, which is now no longer correct
+		if (!m_WiggleProcessing && IsWiggling())
+		{
+			float randomAngle = m_MaxOriWiggle;
+			float randomInterval = m_MaxOriInterval;
+			m_DefaultPos = m_DefaultWorldPos;
+			m_DefaultOri = m_DefaultWorldOri;
+			
+			StopWiggle();
+			SetWiggle(randomAngle, randomInterval);
+		}
+		
+		super.OnParticleUnParented(parent);
+	}
+	
+	/**
+	\brief Event when the particle stops
+	*/
+	override protected void OnParticleStop()
+	{
+		if (IsWiggling())
+		{
+			StopWiggle();
+			delete m_RandomizeOri;
+		}
+		
+		super.OnParticleStop();
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Misc backwards compatibility helpers
+		Helpers for misc backwards compatibility functionality
+	*/
+	//@{
+	
+	/**
+	\brief Attaches this particle onto some object. If null value is provided then the particle will be detached from the current parent.
+		\note Unlike Particle, you are free to use AddChild/RemoveChild instead of this one if you know what you are doing
+		\param parent \p Object Parent onto which this particle will be attached
+		\param local_pos \p vector Attachment position local to the parent (optional)
+		\param local_ori \p vector Orientation local to the parent (Pitch, Yawn, Roll in degrees) (Optional)
+		\param force_rotation_to_world \p bool Force rotation to be in WS (Optional)
+	*/
+	override void AddAsChild(Object parent, vector local_pos = "0 0 0", vector local_ori = "0 0 0", bool force_rotation_to_world = false)
+	{
+		int flags = ParticlePropertiesFlags.NONE;
+		
+		if (force_rotation_to_world)
+			flags = ParticlePropertiesFlags.FORCE_WORLD_ROT;
+		
+		ParticleProperties props = new ParticleProperties(local_pos, flags, parent, local_ori);
+		ApplyProperties(props);
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Parameter API
+ 		Helpful methods for getting or setting parameters
+	*/
+	//@{
+	
+	/**
+	\brief Set the value of a parameter of all emitors in the particle
+		\param parameter \p int The parameter to apply the new value to (enum EmitorParam)
+		\param value \p float The value to apply
+	*/
+	override void SetParticleParam(int parameter_id, float value )
+	{
+		SetParticleParm(this, -1, parameter_id, value);
+	}
+	
+	/**
+	\brief Set the value of a parameter of an emitor in the particle
+		\param emitter \p int The emitter to apply the new value to, -1 for all emitter
+		\param parameter \p int The parameter to apply the new value to (enum EmitorParam)
+		\param value \p float The value to apply
+	*/
+	override void SetParameter(int emitter, int parameter, float value)
+	{
+		SetParticleParm(this, emitter, parameter, value);
+	}
+	
+	/**
+	\brief Get the value of a parameter of an emitor in the particle
+		\param emitter \p int The emitor to get the value from
+		\param parameter \p int The parameter to get the value from (enum EmitorParam)
+		\param value \p float The value
+	*/
+	override void GetParameter(int emitter, int parameter, out float value)
+	{
+		GetParticleParm(this, emitter, parameter, value);
+	}
+	
+	/**
+	\brief Get the value of a parameter of an emitor in the particle
+		\param emitter \p int The emitor to get the value from
+		\param parameter \p int The parameter to get the value from (enum EmitorParam)
+		\return \p float The value
+	*/
+	override float GetParameterEx(int emitter, int parameter)
+	{
+		float value;
+		GetParticleParm(this, emitter, parameter, value);
+		return value;
+	}
+	
+	/**
+	\brief Scales the given parameter on all emitors relatively to their ORIGINAL value.
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param coef \p float The multiplier to apply
+	*/
+	override void ScaleParticleParamFromOriginal(int parameter_id, float coef )
+	{	
+		int emitors = GetParticleEmitorCount(this);			
+		for (int i = 0; i < emitors; ++i)
+		{
+			float value;
+			GetParticleParmOriginal(this, i, parameter_id, value);
+			SetParticleParm(this, i, parameter_id, value * coef);
+		}
+	}
+	
+	/**
+	\brief Scales the given parameter on all emitors relatively to their CURRENT value.
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param coef \p float The multiplier to apply
+	*/
+	override void ScaleParticleParam(int parameter_id, float coef )
+	{
+		int emitors = GetParticleEmitorCount(this);	
+		for (int i = 0; i < emitors; ++i)
+		{
+			float value;
+			GetParticleParm(this, i, parameter_id, value);
+			SetParticleParm(this, i, parameter_id, value * coef);
+		}
+	}
+	
+	/**
+	\brief Increments the value of the given parameter relatively from the ORIGINAL value.
+		\note It's a simple sum, so negative value decrements
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param value \p float The value to sum
+	*/
+	override void IncrementParticleParamFromOriginal(int parameter_id, float value )
+	{
+		int emitors = GetParticleEmitorCount(this);	
+		for (int i = 0; i < emitors; ++i)
+		{
+			float param;
+			GetParticleParmOriginal(this, i, parameter_id, param);
+			SetParticleParm(this, i, parameter_id, param + value);
+		}
+	}
+	
+	/**
+	\brief Increments the value of the given parameter relatively from the CURRENT value.
+		\note It's a simple sum, so negative value decrements
+		\param parameter_id \p int The parameter to adjust (enum EmitorParam)
+		\param value \p float The value to sum
+	*/
+	override void IncrementParticleParam(int parameter_id, float value )
+	{
+		int emitors = GetParticleEmitorCount(this);	
+		for (int i = 0; i < emitors; ++i)
+		{
+			float param;
+			GetParticleParm(this, i, parameter_id, param);
+			SetParticleParm(this, i, parameter_id, param + value);
+		}
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Wiggle API
+ 		Settings to make the Particle wiggle
+	*/
+	//@{
+	
+	/**
+	\brief Makes the particle change direction by random_angle every random_interval seconds.
+		\note This does not actually work on Particle with no parent, it should on ParticleSource
+		\param random_angle \p float Will be the range [-random_angle, random_angle[ to wiggle between
+		\param random_interval \p float Will be the time range [0, random_interval] to wiggle next time
+	*/
+	override void SetWiggle(float random_angle, float random_interval)
+	{
+		if (random_angle != 0 || random_interval != 0)
+		{
+			if (IsWiggling())
+			{
+				m_MaxOriWiggle = random_angle;
+				m_MaxOriInterval = random_interval;
+				return;
+			}
+			
+			// We need the position to be accurate before storing it
+			Update();
+
+			// These are only ever used within the Wiggle API
+			// To restore the properties after wiggling
+			// So let's only set them within the Wiggle API c:
+			
+			m_DefaultPos = GetLocalPosition();
+			m_DefaultOri = GetLocalYawPitchRoll();
+			m_DefaultWorldPos = GetWorldPosition();
+			m_DefaultWorldOri = GetYawPitchRoll();	
+			m_ForceOrientationRelativeToWorld = IsHierarchyPositionOnly();
+		}
+		
+		super.SetWiggle(random_angle, random_interval);
+	}
+	
+	/**
+	\brief Stops randomized wiggle
+	*/
+	override void StopWiggle()
+	{
+		bool wiggling = IsWiggling();
+		
+		super.StopWiggle();
+		
+		if (wiggling)
+		{
+			// Restore pre-wiggle orientation
+			int flags = ParticlePropertiesFlags.NONE;
+			
+			if (m_ForceOrientationRelativeToWorld)
+				flags = ParticlePropertiesFlags.FORCE_WORLD_ROT;
+			
+			ParticleProperties prop = new ParticleProperties(m_DefaultPos, flags, GetParticleParent(), m_DefaultOri, GetOwner());
+			ApplyProperties(prop);
+		}
+	}
+	
+	/**
+	\brief Randomizes a new orientation and applies it
+	*/
+	override private void RandomizeOrientation()
+	{
+		if (ToDelete())
+			return;
+		
+		m_WiggleProcessing = true;
+		
+		if ( !m_RandomizeOri.IsRunning() )
+			m_RandomizeOri.Run( Math.RandomFloat(0, m_MaxOriInterval) , this, "RandomizeOrientation", null, false);
+		
+		int flags = ParticlePropertiesFlags.NONE;
+		
+		if (m_ForceOrientationRelativeToWorld)
+			flags = ParticlePropertiesFlags.FORCE_WORLD_ROT;
+
+		ParticleProperties prop = new ParticleProperties(m_DefaultPos, flags, GetParticleParent(), m_DefaultOri + RandWiggleVector(), GetOwner());
+		ApplyProperties(prop);
+		
+		m_WiggleProcessing = false;
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Misc Particle specific helpers
+		Functionality specific for Particle, so we empty them here
+	*/
+	//@{
+	
+	//! Empty
+	override private void UpdateState() { ErrorEx("Should not be in use on ParticleSource."); }
+	
+	//! Empty
+	override private void DestroyParticleEffect() { ErrorEx("Should not be in use on ParticleSource."); }
+
+	//! Empty
+	override private void CreateParticleEffect() { ErrorEx("Should not be in use on ParticleSource."); }
+	
+	//! Empty
+	override protected void EOnFrame(IEntity other, float timeSlice) { ErrorEx("Should not be in use on ParticleSource."); }	
+	
+	//! Empty
+	override private void OnCheckAutoDelete() { ErrorEx("Should not be in use on ParticleSource."); }	
+	
+	//! Empty
+	override private void OnToDelete() { ErrorEx("Should not be in use on ParticleSource."); }
+	
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/Tests/PMTCreationAndCleanup.c b/scripts/3_Game/DayZ/Particles/Tests/PMTCreationAndCleanup.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d54e118f4806fa9b0c70eee6069a74a3ff56638
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/Tests/PMTCreationAndCleanup.c
@@ -0,0 +1,180 @@
+class OwnershipTestDummyClass
+{
+	// Simply exists
+}
+
+class PMTCreationAndCleanup : PMTF
+{
+	int m_EventTestManagerID;
+	bool m_bTestEventsPassed = false;
+	
+	int m_OwnershipTestManagerID;
+	
+	//---------------------------------------------------------------------------
+	// Ctor - Decides the tests to run
+	//---------------------------------------------------------------------------
+	void PMTCreationAndCleanup()
+	{
+		//AddInitTest("TestInvalidSize");
+		AddInitTest("TestCCSB");
+		AddInitTest("TestEvents");
+		AddInitTest("TestOwnership");
+	}
+	
+	//---------------------------------------------------------------------------
+	// Tests
+	//---------------------------------------------------------------------------
+	// Test invalid size VMEs
+	TFResult TestInvalidSize()
+	{
+		Debug.ParticleLog("Expecting VME: Invalid size. (0)", this, "TestInvalidSize");
+		TestCreationSmallBlocking(0, false);
+		
+		Debug.ParticleLog("Expecting VME: Invalid size. (-3)", this, "TestInvalidSize");
+		TestCreationSmallBlocking(-3, false);
+		
+		return NTFR(TFR.SUCCESS); // No way to check if a VME popped or not...
+	}
+	
+	//---------------------------------------------------------------------------
+	// TestCreationCleanupSmallBlocking
+	TFResult TestCCSB()
+	{
+		return TestCleanup("TestMultiCreation", 3000);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test if events are called properly
+	TFResult TestEvents()
+	{
+		ParticleManager pm = new ParticleManager(new ParticleManagerSettings(3000));
+		bool success = !pm.IsFinishedAllocating(); // We need it to not be done in the same frame
+		if (Assert(success))
+		{
+			pm.GetEvents().Event_OnAllocationEnd.Insert(PassCheckEvents);
+		
+			m_EventTestManagerID = InsertManager(pm);
+			AddFrameTest("CheckTestEvents");
+			
+			return NTFR(TFR.SUCCESS);
+		}
+		
+		return NTFR(TFR.FAIL);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test ownership
+	TFResult TestOwnership()
+	{
+		ParticleManager pm = CreatePMFixedBlocking(1);
+		bool success = pm.IsFinishedAllocating(); // We need it to be done in the same frame
+		if (Assert(success))
+		{		
+			m_OwnershipTestManagerID = InsertManager(pm);
+			OwnershipTestDummyClass dummy = new OwnershipTestDummyClass();
+			
+			ParticleProperties pp = new ParticleProperties(GetGame().GetPlayer().GetPosition(), ParticlePropertiesFlags.NONE, null, vector.Zero, dummy);
+			string particlePath = ParticleList.GetParticleFullPath(ParticleList.EXPLOSION_LANDMINE);
+			
+			bool result = Assert(pm.CreateParticleByPath(particlePath, pp) != null);
+			Debug.ParticleLog("Expecting VME: All particles in pool are already used.", this, "TestOwnership");
+			result &= Assert(pm.CreateParticleByPath(particlePath, pp) == null);
+			delete dummy;
+			result &= Assert(pm.CreateParticleByPath(particlePath, pp) != null);		
+			
+			return BTFR(result);
+		}
+		
+		return NTFR(TFR.FAIL);
+	}
+	
+	//---------------------------------------------------------------------------
+	// OnFrame Checks
+	//---------------------------------------------------------------------------
+	TFResult CheckTestEvents()
+	{
+		ParticleManager pm;
+		if (GetManager(m_EventTestManagerID, pm))
+		{
+			if (pm)
+			{
+				if (pm.IsFinishedAllocating())
+				{
+					return BTFR(Assert(m_bTestEventsPassed));
+				}
+			}
+			else
+			{
+				return BTFR(Assert(false));
+			}
+		}
+		else
+		{
+			return BTFR(Assert(false));
+		}
+		
+		return NTFR(TFR.PENDING);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Passes
+	//---------------------------------------------------------------------------
+	void PassCheckEvents(ParticleManager pm)
+	{
+		Assert(pm.IsFinishedAllocating());
+		m_bTestEventsPassed = true;
+	}
+	
+	//---------------------------------------------------------------------------
+	// Helpers
+	//---------------------------------------------------------------------------
+	TFResult TestCreationSmallBlocking(int size, bool enableAsserts = true)
+	{
+		// Blocking, so that we can test AllocatedCount
+		ParticleManager pm = CreatePMFixedBlocking(size);
+		PrintPMStats(pm);
+		
+		bool success = true;
+		
+		if (enableAsserts)
+		{
+			success &= Assert(pm.GetPoolSize() == size);
+			success &= Assert(pm.GetAllocatedCount() == size);
+			success &= Assert(pm.GetEvents() != null);
+		}
+		
+		return BTFR(success);
+	}
+	
+	TFResult TestCleanup(string f, int p1 = 0)
+	{	
+		int pmTotal = ParticleManager.GetStaticActiveCount();
+		int psTotal = ParticleSource.GetStaticActiveCount();
+		
+		PrintActiveStats();
+		
+		TFResult res = CTFR();
+		
+		GetGame().GameScript.CallFunction(this, f, res, p1);
+
+		int pmTotalPost = ParticleManager.GetStaticActiveCount();
+		int psTotalPost = ParticleSource.GetStaticActiveCount();
+		
+		PrintActiveStats();
+		
+		bool success = Assert(pmTotal == pmTotalPost);
+		success &= Assert(psTotal == psTotalPost);
+		
+		return res.And(BTFR(success));
+	}
+	
+	TFResult TestMultiCreation(int instances)
+	{
+		TFResult res = CTFR();
+		for (int i = 0; i < instances; ++i)
+		{
+			res.And(TestCreationSmallBlocking(1));
+		}
+		return res;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/Tests/PMTF.c b/scripts/3_Game/DayZ/Particles/Tests/PMTF.c
new file mode 100644
index 0000000000000000000000000000000000000000..1ef3f684166086e2fb29162c850cbe5f5f383f24
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/Tests/PMTF.c
@@ -0,0 +1,46 @@
+class PMTF : TestFramework
+{
+	private static int PM_CREATED = 0;
+	private ref map<int, ref ParticleManager> m_Managers = new map<int, ref ParticleManager>();
+	
+	//---------------------------------------------------------------------------
+	// Manager management
+	//---------------------------------------------------------------------------
+	int InsertManager(ParticleManager pm)
+	{
+		Assert(m_Managers.Insert(PM_CREATED, pm));
+		++PM_CREATED;
+		
+		return PM_CREATED - 1;
+	}
+	
+	bool GetManager(int id, out ParticleManager pm)
+	{
+		return m_Managers.Find(id, pm);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Prints
+	//---------------------------------------------------------------------------
+	protected void PrintPMStats(notnull ParticleManager pm)
+	{
+		Debug.ParticleLog(string.Format(
+			"Poolsize: %1 | Allocated: %2 | Virtual: %3 | Playing: %4", pm.GetPoolSize(), pm.GetAllocatedCount(), pm.GetVirtualCount(), pm.GetPlayingCount()),
+		this, "PrintPMStats", pm);
+	}
+	
+	protected void PrintActiveStats()
+	{
+		Debug.ParticleLog(string.Format(
+			"Active ParticleManagers: %1 | Active ParticleSources: %2", ParticleManager.GetStaticActiveCount(), ParticleSource.GetStaticActiveCount()),
+		this, "PrintActiveStats");
+	}
+	
+	//---------------------------------------------------------------------------
+	// Helpers
+	//---------------------------------------------------------------------------
+	protected ParticleManager CreatePMFixedBlocking(int size)
+	{
+		return new ParticleManager(new ParticleManagerSettings(size, ParticleManagerSettingsFlags.BLOCKING));
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Particles/Tests/PMTPlayback.c b/scripts/3_Game/DayZ/Particles/Tests/PMTPlayback.c
new file mode 100644
index 0000000000000000000000000000000000000000..a7e8f60db90a2fab8b7ea88f9527c1c7b810811c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Particles/Tests/PMTPlayback.c
@@ -0,0 +1,304 @@
+class PMTPlayback : PMTF
+{
+	ref array<ParticleSource> m_ParticleSources = new array<ParticleSource>();
+	
+	// TestOnePlaying
+	int m_OnePlayingManagerID;
+	bool m_bOnePlayingTestSuccess = false;
+	
+	// TestOnePlayingStandAloneAutoDestroy
+	int m_OnePlayingSAADPSID;
+	bool m_bOnePlayingSAADEnded = false;
+	
+	// TestOnePlayingStandAlone
+	int m_OnePlayingSAPSID;
+	bool m_bOnePlayingSAEnded = false;
+	
+	// TestStop
+	int m_StopPSID;
+	float m_StopAccumulatedTime;
+	static const float STOP_ACCUMULATED_TIME_STOP_CUTOFF = 2;
+	static const float STOP_ACCUMULATED_TIME_PLAY_CUTOFF = 3;
+	bool m_bStopWasStopped = false;
+	bool m_bStopWasResumed = false;
+	bool m_bStopEnded = false;
+	
+	//---------------------------------------------------------------------------
+	// Ctor - Decides the tests to run
+	//---------------------------------------------------------------------------
+	void PMTPlayback()
+	{
+		//AddInitTest("TestOnePlaying");
+		//AddInitTest("TestOnePlayingStandAloneAutoDestroy");
+		//AddInitTest("TestOnePlayingStandAlone");
+		//AddInitTest("TestWiggleStress");
+		AddInitTest("TestStopping");
+	}
+	
+	//---------------------------------------------------------------------------
+	// Tests
+	//---------------------------------------------------------------------------
+	// Test one particle playing
+	TFResult TestOnePlaying()
+	{
+		ParticleManager pm = CreatePMFixedBlocking(1);
+		m_OnePlayingManagerID = InsertManager(pm);
+
+		DayZPlayer player = GetGame().GetPlayer();
+		
+		ParticleSource p = pm.CreateParticleById(ParticleList.EXPLOSION_LANDMINE, new ParticleProperties(player.GetPosition() + player.GetDirection() * 3, true));
+		p.GetEvents().Event_OnParticleEnd.Insert(PassOnePlaying);
+		
+		AddFrameTest("CheckOnePlaying");
+
+		return BTFR(p.IsParticlePlaying());
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test one standalone particle playing which will auto destroy
+	TFResult TestOnePlayingStandAloneAutoDestroy()
+	{
+		DayZPlayer player = GetGame().GetPlayer();
+		
+		ParticleSource p = ParticleSource.CreateParticle(ParticleList.EXPLOSION_LANDMINE, player.GetPosition() + player.GetDirection() * 3 + player.GetDirectionAside() * 3, true);
+		p.GetEvents().Event_OnParticleEnd.Insert(OnePlayingSAADEnded);
+		
+		m_OnePlayingSAADPSID = m_ParticleSources.Insert(p);
+		
+		AddFrameTest("CheckOnePlayingSAAD");
+
+		return BTFR(p.IsParticlePlaying());
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test one standalone particle playing which will not auto destroy
+	TFResult TestOnePlayingStandAlone()
+	{
+		DayZPlayer player = GetGame().GetPlayer();
+		
+		ParticleSource p = ParticleSource.CreateParticle(ParticleList.EXPLOSION_LANDMINE, player.GetPosition() + player.GetDirection() * 3 - player.GetDirectionAside() * 3, true);
+		p.GetEvents().Event_OnParticleEnd.Insert(OnePlayingSAEnded);
+		p.DisableAutoDestroy();
+		
+		m_OnePlayingSAPSID = m_ParticleSources.Insert(p);
+		
+		AddFrameTest("CheckOnePlayingSA");
+
+		return BTFR(p.IsParticlePlaying());
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test wiggling
+	TFResult TestWiggleStress()
+	{
+		DayZPlayer player = GetGame().GetPlayer();
+		
+		ParticleSource p = ParticleSource.CreateParticle(ParticleList.ROADFLARE_BURNING_MAIN, player.GetPosition() + player.GetDirection() * 4, true);
+		p.SetWiggle(90, 0.1);
+
+		return BTFR(p.IsParticlePlaying());
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test stop
+	TFResult TestStopping()
+	{
+		DayZPlayer player = GetGame().GetPlayer();
+		
+		//ParticleSource p = ParticleSource.CreateParticle(ParticleList.EXPLOSION_LANDMINE, player.GetPosition() + player.GetDirection() * 4, true);
+		ParticleSource p = ParticleSource.CreateParticle(ParticleList.EXPLOSION_LANDMINE, vector.Zero, true, player);
+		p.GetEvents().Event_OnParticleEnd.Insert(StopEnded);
+		p.DisableAutoDestroy();
+		
+		m_StopPSID = m_ParticleSources.Insert(p);
+		
+		AddFrameTest("CheckStop");
+
+		return BTFR(p.IsParticlePlaying());
+	}
+	
+	//---------------------------------------------------------------------------
+	// OnFrame Checks
+	//---------------------------------------------------------------------------
+	TFResult CheckOnePlaying()
+	{
+		ParticleManager pm;
+		if (GetManager(m_OnePlayingManagerID, pm))
+		{
+			if (pm)
+			{
+				ParticleSource p = pm.GetParticle(0);
+				if (p.IsParticlePlaying())
+				{
+					return NTFR(TFR.PENDING);
+				}
+				else
+				{
+					return BTFR(m_bOnePlayingTestSuccess);
+				}
+			}
+			else
+			{
+				return BTFR(Assert(false));
+			}
+		}
+		else
+		{
+			return BTFR(Assert(false));
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	TFResult CheckOnePlayingSAAD()
+	{
+		if (m_ParticleSources.IsValidIndex(m_OnePlayingSAADPSID))
+		{
+			ParticleSource p = m_ParticleSources[m_OnePlayingSAADPSID];
+			if (p)
+			{
+				if (p.IsParticlePlaying())
+				{
+					return NTFR(TFR.PENDING);
+				}
+				else
+				{
+					if (m_bOnePlayingSAADEnded)
+					{
+						// There might be one frame where it is still alive before getting cleaned up
+						return NTFR(TFR.PENDING);
+					}
+					else
+					{
+						// Should be gone when no longer playing
+						return BTFR(Assert(false));
+					}
+				}
+			}
+			else
+			{
+				// Make sure the particle ended, if it did, then success!
+				return BTFR(m_bOnePlayingSAADEnded);
+			}
+		}
+		else
+		{
+			return BTFR(Assert(false));
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	TFResult CheckOnePlayingSA()
+	{
+		if (m_ParticleSources.IsValidIndex(m_OnePlayingSAPSID))
+		{
+			ParticleSource p = m_ParticleSources[m_OnePlayingSAPSID];
+			if (p)
+			{
+				if (p.IsParticlePlaying())
+				{
+					return NTFR(TFR.PENDING);
+				}
+				else
+				{
+					// Clean up the Particle, no leaking from tests!
+					GetGame().ObjectDelete(p);
+					// Make sure the particle ended, if it did, then success!
+					return BTFR(m_bOnePlayingSAEnded);
+				}
+			}
+			else
+			{
+				// It should not be gone, no autodestroy
+				return BTFR(Assert(false));
+			}
+		}
+		else
+		{
+			return BTFR(Assert(false));
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	TFResult CheckStop(float dt)
+	{
+		m_StopAccumulatedTime += dt;
+		
+		if (m_ParticleSources.IsValidIndex(m_StopPSID))
+		{
+			ParticleSource p = m_ParticleSources[m_StopPSID];
+			if (p)
+			{
+				if (p.IsParticlePlaying())
+				{
+					if (!m_bStopWasStopped && m_StopAccumulatedTime > STOP_ACCUMULATED_TIME_STOP_CUTOFF)
+					{
+						p.StopParticle();
+						m_StopAccumulatedTime = 0;
+						m_bStopWasStopped = true;
+					}
+					
+					return NTFR(TFR.PENDING);
+				}
+				else
+				{
+					// Means it was stopped before it was supposed to
+					// Possibly because particle length is shorter than STOP_ACCUMULATED_TIME_CUTOFF
+					if (!Assert(m_bStopWasStopped))
+					{
+						return BTFR(false);
+					}
+					else if (!m_bStopWasResumed && m_StopAccumulatedTime > STOP_ACCUMULATED_TIME_PLAY_CUTOFF)
+					{
+						p.PlayParticle();
+						m_bStopWasResumed = true;						
+					}
+					else if (m_bStopEnded)
+					{
+						// Clean up the Particle, no leaking from tests!
+						GetGame().ObjectDelete(p);
+						return BTFR(true);
+					}	
+					
+					return NTFR(TFR.PENDING);						
+				}
+			}
+			else
+			{
+				// It should not be gone, no autodestroy
+				return BTFR(Assert(false));
+			}
+		}
+		else
+		{
+			return BTFR(Assert(false));
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	// Passes
+	//---------------------------------------------------------------------------
+	void PassOnePlaying(ParticleSource p)
+	{
+		m_bOnePlayingTestSuccess = true;
+	}
+	
+	//---------------------------------------------------------------------------
+	// Helpers
+	//---------------------------------------------------------------------------
+	void OnePlayingSAADEnded(ParticleSource p)
+	{
+		m_bOnePlayingSAADEnded = true;
+	}
+
+	//---------------------------------------------------------------------------
+	void OnePlayingSAEnded(ParticleSource p)
+	{
+		m_bOnePlayingSAEnded = true;
+	}
+
+	//---------------------------------------------------------------------------
+	void StopEnded(ParticleSource p)
+	{
+		m_bStopEnded = true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PersistentFlag.c b/scripts/3_Game/DayZ/PersistentFlag.c
new file mode 100644
index 0000000000000000000000000000000000000000..153529e69642657be2c485f60dec2dd019cacc7b
--- /dev/null
+++ b/scripts/3_Game/DayZ/PersistentFlag.c
@@ -0,0 +1,12 @@
+// These are flags which are persistent for the player entity, ie. are saved when the player is disconnected and loaded after connection.
+// Normal persistence events OnStoreSave/OnStoreLoad are used to save/load these flags within a single int, the purpose is to unify the getter/setter interface so that every system that needs a bool does not need to create its own handling methods/logic.
+// !!! Every value needs to be a power of 2 !!!
+
+enum PersistentFlag
+{
+	AREA_PRESENCE = 1;
+	//ADDITIONAL_FLAG_1 = 2
+	//ADDITIONAL_FLAG_2 = 4
+	//ADDITIONAL_FLAG_3 = 8
+	//ADDITIONAL_FLAG_4 = 16
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/PlayerConstants.c b/scripts/3_Game/DayZ/PlayerConstants.c
new file mode 100644
index 0000000000000000000000000000000000000000..589843ee70ebf5f6f9b19bebadc3049df70aaa64
--- /dev/null
+++ b/scripts/3_Game/DayZ/PlayerConstants.c
@@ -0,0 +1,250 @@
+class PlayerConstants 
+{
+	static const float WEAPON_RAISE_BLEND_DELAY = 0.2;
+	static const float MELEE2_MOVEMENT_BLEND_DELAY = 0.35;
+	static const float HEAVY_HIT_THRESHOLD = 0.5; //defines what is considered a 'heavy hit' from the indicator's standpoint
+
+	static const float FULL_SPRINT_DELAY_DEFAULT 		= 0.5;	//! [seconds]
+	static const float FULL_SPRINT_DELAY_FROM_CROUCH 	= 1.0;	//! [seconds]
+	static const float FULL_SPRINT_DELAY_FROM_PRONE 	= 2.0;	//! [seconds]
+	
+	//----------------------------------------------------------
+	//				SHOES DAMAGE/FEET BLEEDING
+	//----------------------------------------------------------
+	static const float BAREFOOT_MOVEMENT_BLEED_MODIFIER = 0.1;
+	static const float SHOES_MOVEMENT_DAMAGE_PER_STEP = 0.035;
+	static const int CHECK_EVERY_N_STEP = 10;//will process every n-th step(for performance reasons)
+	//----------------------------------------------------------
+	//					STAT LEVELS START
+	//----------------------------------------------------------
+	static const float SL_HEALTH_CRITICAL = 15;
+	static const float SL_HEALTH_LOW = 30;
+	static const float SL_HEALTH_NORMAL = 50;
+	static const float SL_HEALTH_HIGH = 80;	
+	
+	static const float SL_TOXICITY_CRITICAL = 20;
+	static const float SL_TOXICITY_LOW = 40;
+	static const float SL_TOXICITY_NORMAL = 60;
+	static const float SL_TOXICITY_HIGH = 80;
+
+	static const float SL_BLOOD_CRITICAL = 3000;
+	static const float SL_BLOOD_LOW = 3500;
+	static const float SL_BLOOD_NORMAL = 4000;
+	static const float SL_BLOOD_HIGH = 4500;
+	
+	static const float SL_ENERGY_CRITICAL = 0;
+	static const float SL_ENERGY_LOW = 300;
+	static const float SL_ENERGY_NORMAL = 800;
+	static const float SL_ENERGY_HIGH = 3500;
+	static const float SL_ENERGY_MAX = 5000;
+	
+	static const float SL_WATER_CRITICAL = 0;
+	static const float SL_WATER_LOW = 300;
+	static const float SL_WATER_NORMAL = 800;
+	static const float SL_WATER_HIGH = 3500;
+	static const float SL_WATER_MAX = 5000;
+	//----------------------------------------------------------
+	//						STAT LEVELS END
+	//----------------------------------------------------------
+
+	//-------------------------------------------------------
+	static const float NORMAL_TEMPERATURE_L = 36.0;
+	static const float NORMAL_TEMPERATURE_H = 36.5;
+	static const float HIGH_TEMPERATURE_L 	= 38.5;
+	static const float HIGH_TEMPERATURE_H	= 39.0;
+	//-------------------------------------------------------
+	static const float DIGESTION_SPEED							= 1.7;	//quantity processed in the stomach per second
+	static const float CONSUMPTION_MULTIPLIER_BASE				= 1;	//must not be 0 or less
+	static const float STOMACH_ENERGY_TRANSFERED_PER_SEC 		= 3;	//amount of kcal transfered to energy per second(this should ideally be higher than what player burns under high metabolic load[sprint])
+	static const float STOMACH_WATER_TRANSFERED_PER_SEC 		= 6;	//amount of ml transfered to water per second(this should ideally be higher than what player burns under high metabolic load[sprint])
+	static const float STOMACH_SOLID_EMPTIED_PER_SEC 			= 7;	//amount of g/ml emptied from stomach per second
+
+	static const float LOW_WATER_THRESHOLD 						= SL_WATER_LOW;		//threshold from which water affects health
+
+	static const float LOW_ENERGY_THRESHOLD 					= SL_ENERGY_LOW;	//threshold from which energy affects health
+
+	//--------------------------------------------------------
+	static const float METABOLIC_SPEED_ENERGY_BASAL		= 0.01;		//energy loss per second while idle
+	
+	static const float METABOLIC_SPEED_ENERGY_WALK		= 0.1;		//energy loss per second
+	static const float METABOLIC_SPEED_ENERGY_JOG		= 0.3;		//energy loss per second
+	static const float METABOLIC_SPEED_ENERGY_SPRINT	= 0.6;		//energy loss per second
+	
+	static const float METABOLIC_SPEED_WATER_BASAL		= 0.01;		//water loss per second while idle
+	
+	static const float METABOLIC_SPEED_WATER_WALK		= 0.1;		//water loss per second
+	static const float METABOLIC_SPEED_WATER_JOG		= 0.3;		//water loss per second
+	static const float METABOLIC_SPEED_WATER_SPRINT		= 0.6;		//water loss per second
+	//--------------------------------------------------------
+	
+	static const float	THRESHOLD_HEAT_COMFORT_PLUS_WARNING		= 0.2;	//missing comment
+	static const float	THRESHOLD_HEAT_COMFORT_PLUS_CRITICAL 	= 0.5;	//missing comment
+	static const float	THRESHOLD_HEAT_COMFORT_PLUS_EMPTY		= 0.9;	//missing comment
+
+	static const float	THRESHOLD_HEAT_COMFORT_MINUS_WARNING	= -0.3;	//missing comment
+	static const float	THRESHOLD_HEAT_COMFORT_MINUS_CRITICAL	= -0.5;	//missing comment
+	static const float	THRESHOLD_HEAT_COMFORT_MINUS_EMPTY		= -0.9;	//missing comment
+
+	//--------------------------------------------------------
+	static const int BLOOD_THRESHOLD_FATAL 					= 2500;	//fatal blood level
+	
+	static const float BLOOD_REGEN_RATE_PER_SEC				= 0.3; 	//base amount of blood regenerated per second
+	static const float DAMAGE_ZONE_BLOOD_REGEN_MODIFIER 	= 0.7;
+	
+	static const float BLOOD_REGEN_MODIFIER_ENERGY_LOW		= 0; 	//multiplier for blood regen rate 
+	static const float BLOOD_REGEN_MODIFIER_ENERGY_MID		= 0.5;
+	static const float BLOOD_REGEN_MODIFIER_ENERGY_HIGH		= 1;
+	
+	static const float BLOOD_REGEN_MODIFIER_WATER_LOW		= 0; 	//multiplier for blood regen rate (BLOOD_REGEN_MULTIPLIER_WATER_LOW ?)
+	static const float BLOOD_REGEN_MODIFIER_WATER_MID		= 0.5;
+	static const float BLOOD_REGEN_MODIFIER_WATER_HIGH		= 1;
+	
+	static const float SALINE_BLOOD_REGEN_PER_SEC			= 3;	//boost for blood regen per second, independent on BLOOD_REGEN_SPEED
+	static const float SALINE_LIQUID_AMOUNT					= 500;
+	static const float SALINE_WATER_REGEN_PER_SEC 			= 2.1;
+	
+	static const float HEMOLYTIC_BLOOD_DRAIN_PER_SEC		= 7;	//hemolytic reaction blood drain per second
+	static const float HEMOLYTIC_BLOODLOSS_AMOUNT			= 500;
+	static const float HEMOLYTIC_RISK_SHOCK_THRESHOLD		= 75;	// amount of blood from transfusion causing player character going into shock
+	static const float HEMOLYTIC_REACTION_THRESHOLD			= 175;	// amount of blood from transfusion triggering hemolytic reaction
+	
+	static const float WATER_LOSS_THRESHOLD_HC_PLUS_LOW		= THRESHOLD_HEAT_COMFORT_PLUS_WARNING;
+	static const float WATER_LOSS_THRESHOLD_HC_PLUS_HIGH	= THRESHOLD_HEAT_COMFORT_PLUS_CRITICAL;
+	
+	static const float ENERGY_LOSS_THRESHOLD_HC_MINUS_LOW	= THRESHOLD_HEAT_COMFORT_MINUS_WARNING;
+	static const float ENERGY_LOSS_THRESHOLD_HC_MINUS_HIGH	= THRESHOLD_HEAT_COMFORT_MINUS_CRITICAL;
+	
+	static const float WATER_LOSS_HC_PLUS_LOW				= 0;
+	static const float WATER_LOSS_HC_PLUS_HIGH				= 0.4;
+
+	static const float ENERGY_LOSS_HC_MINUS_LOW				= 0.2;
+	static const float ENERGY_LOSS_HC_MINUS_HIGH			= 0.45;
+	
+	static const float HEALTH_LOSS_HC_PLUS_LOW				= 0.05;
+	static const float HEALTH_LOSS_HC_PLUS_HIGH				= 0.15;		
+	
+	static const float HEALTH_LOSS_HC_MINUS_LOW				= 0.05;
+	static const float HEALTH_LOSS_HC_MINUS_HIGH 			= 0.15;	
+	
+	static const float WATER_LOSS_FEVER						= 0.2;
+	
+	//--------------------------------------------------------
+	static const float LOW_ENERGY_DAMAGE_PER_SEC			= 0.05;	//health loss per second while low on energy
+	static const float LOW_WATER_DAMAGE_PER_SEC				= 0.05;	//health loss per second while low on water
+	
+	static const float HEALTH_REGEN_MIN						= 0.005;	//health regen rate at BLOOD_THRESHOLD_FATAL blood level
+	static const float HEALTH_REGEN_MAX						= 0.03;		//health regen rate at MAXIMUM blood level
+	
+	static const float LEG_HEALTH_REGEN						= 1;		//Leg health regen when leg is NOT BROKEN
+	static const float LEG_HEALTH_REGEN_BROKEN				= 0.18;		//Leg health regen when BROKEN OR SPLINTED
+	
+	static const float UNCONSCIOUS_THRESHOLD				= 25.0;		//player goes unconscious when we get under this threshold
+	static const float CONSCIOUS_THRESHOLD					= 50.0;		//player regains consciousness when he gets above this threshold
+	
+	static const float SHOCK_REFILL_CONSCIOUS_SPEED			= 5;		//shock refill speed when the player is conscious
+	static const float SHOCK_REFILl_UNCONSCIOUS_SPEED		= 1;		//shock refill speed when the player is unconscious
+	
+	static const float SHOCK_DAMAGE_BLOOD_THRESHOLD_HIGH	= 3000;		// we start dealing shock damage over time when we get at this value or lower
+	static const float SHOCK_DAMAGE_BLOOD_THRESHOLD_LOW		= 2500; 	// the closer we get to this value, the higher the over time shock damage we deal
+	
+	static const float SHOCK_DAMAGE_HIGH					= 5.5; 		// shock damage per second when the blood is near the upper blood threshold
+	static const float SHOCK_DAMAGE_LOW						= 6.25; 	// shock damage per second when the blood is near the lower blood threshold
+	
+	static const float SHOCK_REFILL_COOLDOWN_AFTER_HIT 		= 1000; 	// duration of cooldown (ms) during which shock regeneration is paused
+	
+	static const float UNCONSCIOUS_IN_WATER_TIME_LIMIT_TO_DEATH	= 20;	// how long can player survive while unconscious when in water in secs 
+	//----------------------------------------------------------
+	static const float BLEEDING_SOURCE_BLOODLOSS_PER_SEC 	= -20; 		// amount of blood loss per second from one bleeding source 
+	static const float BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM = 0.6; 		// modifier of the bloodloss given by BLEEDING_SOURCE_BLOODLOSS_PER_SEC, multiplying these two will give the resulting bloodloss
+	static const float BLEEDING_SOURCE_FLOW_MODIFIER_LOW	= 0.1; 		// modifier of the bloodloss given by BLEEDING_SOURCE_BLOODLOSS_PER_SEC, multiplying these two will give the resulting bloodloss
+	static const float BLEEDING_SOURCE_FLOW_MODIFIER_HIGH	= 1; 		// modifier of the bloodloss given by BLEEDING_SOURCE_BLOODLOSS_PER_SEC, multiplying these two will give the resulting bloodloss
+	static const int BLEEDING_SOURCE_DURATION_NORMAL = 300; 			// in seconds, how long will bleeding source exist until disapearing
+	static const float BLEEDING_LOW_PRESSURE_BLOOD = 4000.0;			// from which blood level we start lowering BLEEDING_SOURCE_BLOODLOSS_PER_SEC
+	static const float BLEEDING_LOW_PRESSURE_MIN_MOD = 0.3;				// minimal value for low pressure bleeding (lowest possible multiplier of BLEEDING_SOURCE_BLOODLOSS_PER_SEC)
+	
+	static const float BLEEDING_SOURCE_CLOSE_INFECTION_CHANCE = 0.40;	// a chance for wound infection when the wound is self-closing
+	static const float BLEEDING_SOURCE_BURN_MODIFIER = 0.65;			// modifies a bloodflow for any bleeding source obtained through skin burn from contaminated area
+
+	 
+	//----------------------------------------------------------
+	static const float BREATH_VAPOUR_THRESHOLD_HIGH 		= -5.0; 	//missing comment
+	static const float BREATH_VAPOUR_THRESHOLD_LOW 			= 7.0; 		//missing comment
+	//----------------------------------------------------------
+	static const float IMMUNITY_THRESHOLD_LEVEL_HIGH = 0.95;
+	static const float IMMUNITY_THRESHOLD_LEVEL_NORMAL = 0.65;
+	static const float IMMUNITY_THRESHOLD_LEVEL_LOW = 0.35;
+	static const float IMMUNITY_THRESHOLD_LEVEL_CRITICAL = 0.15;
+	//----------------------------------------------------------
+	static const float VITAMINS_LIFETIME_SECS				= 300;
+
+	static const float CHANCE_TO_BLEED_SLIDING_LADDER_PER_SEC = 0.3; // probability of bleeding source occuring while sliding down ladder without gloves given as percentage per second(0.5 means 50% chance bleeding source will happen every second while sliding down) 
+	static const float GLOVES_DAMAGE_SLIDING_LADDER_PER_SEC = -3;// how much damage the gloves receive while sliding down the ladder (per sec)
+	
+	//----------------------------------------------------------
+	//						BADGE THRESHOLDS
+	//----------------------------------------------------------
+	static const int BT_STOMACH_VOLUME_LVL3 = 1000;
+	static const int BT_STOMACH_VOLUME_LVL2 = 750;
+	static const int BT_STOMACH_VOLUME_LVL1 = 1;
+
+	//!
+	static const int LAST_UA_MSG_LIFETIME = 30;						//! last User Action message lifetime [s] (default: 30s)
+	
+	//!
+	const int	 	VOMIT_THRESHOLD 			= 2000;
+	
+	static const float 	CORPSE_THRESHOLD_MEDIUM = 0.7; //0.7
+	static const float 	CORPSE_THRESHOLD_DECAYED = 0.3; //0.3
+	
+	static const int 	CORPSE_STATE_FRESH = 0;
+	static const int 	CORPSE_STATE_MEDIUM = 1;
+	static const int 	CORPSE_STATE_DECAYED = 2;
+	//----------------------------------------------------------
+	static const float 	CAMERA_THRESHOLD_PITCH = -70.0;
+	
+	//----------------------------------------------------------
+	//						BROKEN LEGS SHOCK
+	//----------------------------------------------------------
+	static const float 	BROKEN_LEGS_INITIAL_SHOCK = 20;				//Inflicted shock on modifier start
+	static const float 	BROKEN_LEGS_LOW_SHOCK_WALK = 4;				//Inflicted shock on modifier update with almost healthy legs 
+	static const float 	BROKEN_LEGS_MID_SHOCK_WALK = 6;				//Inflicted shock on modifier update with mid health legs
+	static const float 	BROKEN_LEGS_HIGH_SHOCK_WALK = 8;			//Inflicted shock on modifier update with low health legs
+	static const float 	BROKEN_LEGS_SHOCK_SWIM = 2;					//Inflicted shock on modifier update when swimming
+	static const float 	BROKEN_LEGS_LIGHT_MELEE_SHOCK = 10; 		//Inflicted shock per light weapon swing
+	static const float 	BROKEN_LEGS_HEAVY_MELEE_SHOCK = 25; 		//Inflicted shock per heavy weapon swing
+	static const float	BROKEN_LEGS_LOW_HEALTH_THRESHOLD = 25;		//Amount of health BELOW which legs have "low health"
+	static const float	BROKEN_LEGS_HIGH_HEALTH_THRESHOLD = 75;		//Amount of health OVER which legs have "low health"
+	//static const int	BROKEN_LEGS_FALL_STEP_COUNT = 10;			//Number of steps before falling over
+	static const float	BROKEN_LEGS_STAND_SHOCK = 0;				//Shock dealt when standing with broken legs
+	static const float	BROKEN_LEGS_ROLL_SHOCK = 10;				//Shock dealt when rolling with broken legs
+	static const float	BROKEN_CROUCH_MODIFIER = 0.5;				//Inflicted shock modifier for crouched stance
+	
+	//----------------------------------------------------------
+	//						AI SENSOR MULTIPLIER
+	//----------------------------------------------------------
+	static const float AI_NOISE_ROLL 			= 2;				//Multiplier for the noise generated while prone rolling
+	static const float AI_NOISE_SPRINT 			= 1;				//Multiplier for the noise generated while sprinting
+	static const float AI_NOISE_RUN 			= 0.8;				//Multiplier for the noise generated while jogging
+	static const float AI_NOISE_CROUCH_RUN 		= 0.6;				//Multiplier for the noise generated while Sprint crouch
+	static const float AI_NOISE_WALK 			= 0.4;				//Multiplier for the noise generated while walking
+	static const float AI_NOISE_IDLE 			= 0;				//Multiplier for the noise generated while staying still
+	static const float AI_NOISE_SHOES_BOOTS 	= 0.85;				//Multiplier for the noise generated while wearing boots
+	static const float AI_NOISE_SHOES_SNEAKERS	= 0.6;				//Multiplier for the noise generated while wearing sneakers
+	static const float AI_NOISE_SHOES_NONE 		= 0.45;				//Multiplier for the noise generated while not wearing shoes
+	static const float AI_VISIBILITY_RUN 		= 1;				//Multiplier for the visibility of the player while jogging or sprinting
+	static const float AI_VISIBILITY_WALK 		= 0.66;				//Multiplier for the visibility of the player while walking
+	static const float AI_VISIBILITY_IDLE 		= 0.3;				//Multiplier for the visibility of the player while staying still
+	static const float AI_VISIBILITY_STANDING	= 1.5;				//Multiplier for the visibility of the player while standing
+	static const float AI_VISIBILITY_CROUCH		= 0.6;				//Multiplier for the visibility of the player while crouched
+	static const float AI_VISIBILITY_PRONE 		= 0.15;				//Multiplier for the visibility of the player while prone
+	//----------------------------------------------------------
+	//						DROWNING
+	//----------------------------------------------------------
+	
+																	//(positive values mean the distance under water surface, ie 0.1 --> 10cm under water, -0.1 --> 10cm above water)
+	static const float 	DROWNING_DEFAULT_THRESHOLD 			= 0.25;	//what water level value does it take for the player to be considered drowning while swimming - values <0.35 observed as the highest during swimming
+	static const float 	DROWNING_SWIMMING_THRESHOLD 		= 0.4;	//what water level value does it take for the player to be considered drowning while swimming - values <0.35 observed as the highest during swimming
+	static const float	DROWNING_UNCONSCIOUS_THRESHOLD 		= 0.1;	//what water level value does it take for the player to be considered drowning while unconscious -  0.10 seemed a reasonable value based on visual observation and matching it to water depth values(can be adjust more precisely though)
+	static const int	DROWNING_BUBBLE_FREQUENCY_MAX		= 4000; //how often should bubbles appear when the stamina is at its highest,(in ms)
+	static const int	DROWNING_BUBBLE_FREQUENCY_MIN		= 1000; //how often should bubbles appear when the stamina is at its lowest,(in ms)
+}
diff --git a/scripts/3_Game/DayZ/ProgressAsync.c b/scripts/3_Game/DayZ/ProgressAsync.c
new file mode 100644
index 0000000000000000000000000000000000000000..172771388de7b56b15a392f381d74b52cc5255ed
--- /dev/null
+++ b/scripts/3_Game/DayZ/ProgressAsync.c
@@ -0,0 +1,8 @@
+class ProgressAsync
+{
+	//proto native void SetUserData(Widget inst);
+	proto static native void SetUserData(Widget inst);
+	proto static native void SetProgressData(Widget inst);
+	proto static native void DestroyAllPendingProgresses();
+	proto static native void StartProgress();
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/RemotelyActivatedItemBehaviour.c b/scripts/3_Game/DayZ/RemotelyActivatedItemBehaviour.c
new file mode 100644
index 0000000000000000000000000000000000000000..c97e10803151dda23eca6fcc42d50f91b2c656c9
--- /dev/null
+++ b/scripts/3_Game/DayZ/RemotelyActivatedItemBehaviour.c
@@ -0,0 +1,167 @@
+class RemotelyActivatedItemBehaviour
+{
+	protected EntityAI		m_Parent;
+	protected bool			m_IsTrigger;
+	protected EntityAI		m_PairDevice;
+	protected int			m_PairDeviceNetIdLow;
+	protected int			m_PairDeviceNetIdHigh;
+	protected int			m_PersistentPairID = int.MIN;
+	
+	protected static ref map<int,EntityAI> m_RemoteReceivers = new map<int,EntityAI>();
+
+	void RemotelyActivatedItemBehaviour(notnull EntityAI pParent)
+	{
+		m_Parent = pParent;
+
+		m_PairDeviceNetIdLow 	= -1;
+		m_PairDeviceNetIdHigh 	= -1;
+	}
+	
+	void ~RemotelyActivatedItemBehaviour()
+	{
+		if (m_Parent)
+			Unpair();
+	}
+	
+	void SetTrigger()
+	{
+		m_IsTrigger = true;
+	}
+	
+	void OnVariableSynchronized()
+	{
+		Pair();
+	}
+	
+	void OnStoreSave(ParamsWriteContext ctx)
+	{
+		ctx.Write(m_PersistentPairID);
+	}	
+	
+	bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!ctx.Read(m_PersistentPairID))
+			return false;
+
+		if (m_PersistentPairID == int.MIN)//default value, no point in going further
+			return true;
+
+		if (m_IsTrigger)//trigger
+		{
+			EntityAI receiver = m_RemoteReceivers.Get(m_PersistentPairID);
+			if (receiver)
+				Pair(receiver);
+		}
+		else // remotely controlled device
+		{
+			m_RemoteReceivers.Insert(m_PersistentPairID, m_Parent);//receivers will register themselves upon being loaded from the storage
+		}
+
+		return true;
+	}
+	
+	void OnAfterLoad()
+	{
+		if (m_IsTrigger && m_PersistentPairID != int.MIN && !m_PairDevice)
+		{
+			EntityAI receiver = m_RemoteReceivers.Get(m_PersistentPairID);
+			if (receiver)
+			{
+				//if both the receiver and trigger are somewhere in the world outside of the player inventory, there is no guarantee 
+				//that the pairing is going to be succesful during the 'OnStoreLoad' event as that requires the receiver to already be loaded when the trigger is being loaded
+				//therefore, it's necessary to also perform pairing in this event, which happens at the end of the storage loading process
+				//do note that this event is not called when the entity is being loaded as part of the player inventory, therefore, we need to pair both in 'OnStoreLoad' and here to handle both situations
+				//(when the trigger is in the player's inventory, it always loads correctly after the receiver, which is always in the world)
+				Pair(receiver);
+			}
+		}
+	}
+	
+	
+	static int GeneratePersistentID()
+	{
+		int randomID = Math.RandomInt(0, int.MAX);
+		if (m_RemoteReceivers.Contains(randomID))
+		{
+			//it's very unlikely to have a collision here, but lets handle it anyway
+			return GeneratePersistentID();
+		}
+		else
+			return randomID;
+	}
+	
+	void SetPersistentPairID(int id)
+	{
+		m_PersistentPairID = id;
+		
+		if (!m_IsTrigger)
+			m_RemoteReceivers.Insert(id,m_Parent);
+	}
+	
+	void Pair()
+	{
+		EntityAI device = EntityAI.Cast(GetGame().GetObjectByNetworkId(GetPairDeviceNetIdLow(), GetPairDeviceNetIdHigh()));
+		if (device)
+		{
+			Pair(device);
+		}
+	}
+
+	void Pair(notnull EntityAI device)
+	{
+		m_PairDevice = device;
+		SetPairDeviceNetIds(device);
+		
+		if (device != m_Parent && (!m_Parent.GetPairDevice() || m_Parent.GetPairDevice() != m_PairDevice))
+			m_PairDevice.PairRemote(m_Parent);
+
+		m_PairDevice.SetSynchDirty();
+		m_Parent.SetSynchDirty();
+	}
+	
+	void Unpair()
+	{
+		m_PairDeviceNetIdLow 	= -1;
+		m_PairDeviceNetIdHigh 	= -1;
+
+		if (m_PairDevice)
+		{
+			m_PairDevice.SetSynchDirty();
+			m_PairDevice = null;
+		}
+		
+		if (m_PersistentPairID != int.MIN)
+		{
+			if (m_RemoteReceivers.Contains(m_PersistentPairID))
+				m_RemoteReceivers.Remove(m_PersistentPairID);
+		}
+
+		m_PersistentPairID = int.MIN;
+		m_Parent.SetSynchDirty();
+	}
+	
+	EntityAI GetPairDevice()
+	{
+		return m_PairDevice;
+	}
+	
+	bool IsPaired()
+	{
+		return m_PairDevice != null;
+	}
+	
+	void SetPairDeviceNetIds(notnull EntityAI device)
+	{
+		device.GetNetworkID(m_PairDeviceNetIdLow, m_PairDeviceNetIdHigh);
+	}
+	
+	int GetPairDeviceNetIdLow()
+	{
+		return m_PairDeviceNetIdLow;
+	}
+
+	int GetPairDeviceNetIdHigh()
+	{
+		return m_PairDeviceNetIdHigh;
+	}
+}
diff --git a/scripts/3_Game/DayZ/Services/AchievementsXbox.c b/scripts/3_Game/DayZ/Services/AchievementsXbox.c
new file mode 100644
index 0000000000000000000000000000000000000000..deec2f952e4ca0a06a495b8b84c79a659e3fcd07
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/AchievementsXbox.c
@@ -0,0 +1,202 @@
+enum EAchievementError
+{
+	ERR_OK,
+	ERR_NOT_FOUND, 
+	ERR_BAD_DATA,
+	ERR_NOT_IMPLEMENTED,
+	ERR_UNKNOWN,
+};
+
+enum EAchievementTargetId
+{
+	TARGET_SURVIVOR,
+	TARGET_INFECTED,
+};
+
+enum EAchievementRankId
+{
+	RANK_SURVIVOR,				//!< must be TARGET_SURVIVOR
+	RANK_INFECTED,				//!< must be TARGET_INFECTED
+	RANK_INFECTED_SOLDIER,		//!< must be TARGET_INFECTED
+};
+
+enum EAchievementRangeId
+{
+	RANGE_OTHER,
+	RANGE_MELEE,
+	RANGE_RANGED,
+};
+
+enum EAchievementHitId
+{
+	HIT_OTHER,
+	HIT_HEADSHOT,
+};
+
+enum EAchievementActionId
+{
+	ACTION_EAT,
+	ACTION_DRINK,
+	ACTION_EQUIP_GEAR,
+	ACTION_COOK_STEAK,
+	ACTION_IGNITE_FIRE_MATCHBOX,
+	ACTION_IGNITE_FIRE_ROAD_FLARE,
+	ACTION_IGNITE_FIRE_HAND_DRILL,
+	ACTION_SHAVE,
+	ACTION_GUT_DEER,
+	ACTION_APPLY_MEDS_ON_SURVIVOR,
+	ACTION_HANDCUFF_SURVIVOR,
+};
+
+class Achievements
+{
+	private void Achievements();
+	private void ~Achievements();
+	
+	static proto EAchievementError SendEventAction(EAchievementActionId action_id);
+	static proto EAchievementError SendEventKill(EAchievementTargetId target_id, EAchievementRankId rank_id, EAchievementRangeId range_id, EAchievementHitId hit_id, float distance);
+	
+	//===================================
+	// OnActionEat
+	//===================================
+	static void OnActionEat()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_EAT ) );
+	}
+	
+	//===================================
+	// OnActionDrink
+	//===================================
+	static void OnActionDrink()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_DRINK ) );
+	}
+	
+	//===================================
+	// OnEquipdFullGear
+	//===================================
+	static void OnEquippedFullGear()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_EQUIP_GEAR ) );
+	}
+	
+	//===================================
+	// OnCookedSteak
+	//===================================
+	static void OnCookedSteak()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_COOK_STEAK ) );
+	}
+	
+	//===================================
+	// OnActionIgniteMatchbox
+	//===================================
+	static void OnActionIgniteMatchbox()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_IGNITE_FIRE_MATCHBOX ) );
+	}
+	
+	//===================================
+	// OnActionIgniteRoadflare
+	//===================================
+	static void OnActionIgniteRoadflare()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_IGNITE_FIRE_ROAD_FLARE ) );
+	}
+	
+	//===================================
+	// OnActionIgniteDrill
+	//===================================
+	static void OnActionIgniteDrill()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_IGNITE_FIRE_HAND_DRILL ) );
+	}
+	
+	//===================================
+	// OnActionShave
+	//===================================
+	static void OnActionShave()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_SHAVE ) );
+	}
+	
+	//===================================
+	// OnActionGutDeer
+	//===================================
+	static void OnActionGutDeer()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_GUT_DEER ) );
+	}
+	
+	//===================================
+	// OnActionMedsSurvivor
+	//===================================
+	static void OnActionMedsSurvivor()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_APPLY_MEDS_ON_SURVIVOR ) );
+	}
+	
+	//===================================
+	// OnActionHandcuff
+	//===================================
+	static void OnActionHandcuff()
+	{
+		CheckError( SendEventAction( EAchievementActionId.ACTION_HANDCUFF_SURVIVOR ) );
+	}	
+	
+	//===================================
+	// OnPlayerKilled
+	//===================================
+	static void OnPlayerKilled(EntityAI victim, EntityAI killer, EntityAI source, bool is_headshot)
+	{		
+		EAchievementTargetId	target_id		= EAchievementTargetId.TARGET_SURVIVOR;
+		EAchievementRankId		target_rank_id	= EAchievementRankId.RANK_SURVIVOR;
+		EAchievementRangeId		range_id		= EAchievementRangeId.RANGE_OTHER;
+		EAchievementHitId		hit_id			= EAchievementHitId.HIT_OTHER;
+		float 					distance		= 0;
+		
+		if ( victim.IsZombie() )
+		{
+			target_id = EAchievementTargetId.TARGET_INFECTED;
+			target_rank_id = EAchievementRankId.RANK_INFECTED;
+			
+			if ( victim.IsZombieMilitary() )
+			{
+				target_rank_id = EAchievementRankId.RANK_INFECTED_SOLDIER;
+			}
+		}		
+		
+		if ( source )
+		{
+			if ( source.IsMeleeWeapon() )
+			{
+				range_id = EAchievementRangeId.RANGE_MELEE;
+			}
+			else if ( source.IsWeapon() && killer )
+			{
+				range_id = EAchievementRangeId.RANGE_RANGED;
+				distance = vector.Distance( killer.GetPosition(), victim.GetPosition() );
+				
+				if ( is_headshot )
+				{
+					hit_id = EAchievementHitId.HIT_HEADSHOT;
+				}
+			}
+		}
+		
+		CheckError( SendEventKill(target_id, target_rank_id, range_id, hit_id, distance) );
+	}
+	
+	//-----------------------------------
+	// CheckError
+	//-----------------------------------
+	private static void CheckError(EAchievementError error)
+	{
+		if ( error != EAchievementError.ERR_OK )
+		{
+			Print("Achievements: Cannot send achievement event. Error ID: " + error);
+		}
+	}
+};
+
+typedef Achievements AchievementsXbox;
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Services/BiosClientServices.c b/scripts/3_Game/DayZ/Services/BiosClientServices.c
new file mode 100644
index 0000000000000000000000000000000000000000..a46cc8b7f98ba641b2a1336c0f57cc7242f3032b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosClientServices.c
@@ -0,0 +1,21 @@
+//!	BiosClientServices class provides individual online services.
+/*!
+	Bohemia interactive online services (Bios), Client services API.
+ 	Use the individual Get methods to access individual service providers.
+	Do not store references to individual service providers, use the Get methods instead.
+	Temporary storage in a function body is fine as long as the owning BiosClientServices object is referenced.
+	Do not attempt to construct this object. It is currently provided by the engine.
+ */
+class BiosClientServices
+{
+	private void BiosClientServices() {}
+	void ~BiosClientServices()
+	{
+	}
+	
+	proto native BiosPrivacyService GetPrivacyService();
+	proto native BiosSocialService GetSocialService();
+	proto native BiosLobbyService GetLobbyService();
+	proto native BiosSessionService GetSessionService();
+	proto native BiosPackageService GetPackageService();
+};
diff --git a/scripts/3_Game/DayZ/Services/BiosLobbyService.c b/scripts/3_Game/DayZ/Services/BiosLobbyService.c
new file mode 100644
index 0000000000000000000000000000000000000000..8a1bcf29a0771676d5f3fbfed35b5456871a1f39
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosLobbyService.c
@@ -0,0 +1,572 @@
+// ip, name, connection port, queryPort
+typedef Param4<string, string, int, int> CachedServerInfo;
+
+// Script File
+
+enum ESortType
+{
+	HOST,		
+	TIME,
+	POPULATION,
+	SLOTS,
+	PING
+	FAVORITE,
+	PASSWORDED,
+	QUEUE
+};
+
+enum ESortOrder
+{
+	ASCENDING,		
+	DESCENDING,
+};
+
+class GetServerModListResult
+{
+	string m_Id;	// server id (IP:Port)
+	array<string> m_Mods;
+}
+
+//! GetServersResultRow the output structure of the GetServers operation that represents one game server
+class GetServersResultRow
+{
+	string	m_Id;					// PC is IP:Port
+	int		m_Priority;				// PC something is working -> 667223046
+	string	m_Name;					// PC is name of server
+	string	m_Description; 			// PC not work
+	string	m_HostIp; 				// PC not work
+	int		m_HostPort; 			// PC is works
+	bool	m_Invisible;
+	bool	m_Official;
+	string	m_MapNameToRun; 		// PC not work always 0
+	bool	m_Modded; 				// PC not work always 0
+	int		m_ModeId; 				// identifies if third person is allowed on a CONSOLE server. On PC always 0
+	bool	m_AntiCheat;
+	int		m_RegionId; 			// PC not work always 0
+	int		m_MinPlayers;
+	int		m_MaxPlayers; 			// PC - max players
+	int		m_FreeSlots; 			// PC - max players
+	int		m_CurrentNumberPlayers;
+	int		m_PlayersInQueue;
+	string	m_GameVersion; 			// PC not work alway ""
+	bool	m_IsPasswordProtected;	// PC work
+	string	m_CreatedAt;
+	string	m_UpdatedAt;
+	bool	m_MouseAndKeyboardEnabled;
+	bool	m_WhitelistEnabled;
+	bool	m_IsDLC;
+	
+	//Scripted
+	bool		m_IsExpanded;
+	int 		m_SortName;	
+	int			m_SortTime;
+	bool		m_IsSelected;
+
+	//characters alive
+	string m_CharactersAlive;
+	//steam friends - list of names separated by comma
+	string m_SteamFriends;
+	
+	int m_Ping;	
+  	string m_TimeOfDay;
+  	//! disable3rdPerson servers for mode regular/hardcore
+  	int m_Disable3rdPerson;  //1 for disabled, ie. hardcore
+	//! time multiplier of environment
+	float m_EnvironmentTimeMul;
+	float m_EnvironmentNightTimeMul;
+	bool		m_AllowedFilePatching;
+	string m_ShardId;
+	int m_SteamQueryPort;
+	
+	bool m_Favorite;
+
+	string GetIpPort()
+	{
+#ifdef PLATFORM_WINDOWS
+		return m_Id;
+#else
+		return GetIP() + ":" + m_HostPort;
+#endif
+	}
+	
+	string GetIP()
+	{
+#ifdef PLATFORM_WINDOWS
+		// Hack - In new Serverborwser on PC has bad m_HostIp but ID contains correct IP
+		array<string> parts = new array<string>;
+		m_Id.Split(":", parts);
+		return parts[0];
+#else
+		return m_HostIp;
+#endif
+	}
+	
+	bool IsSelected()
+	{
+		return m_IsSelected;
+	}
+	
+	string GetValueStr(ESortType sort_type)
+	{
+		switch( sort_type )
+		{
+			case ESortType.HOST:
+			{
+				return m_Name;
+			}
+		}
+		
+		return "";
+	}	
+	
+	int GetValueInt(ESortType sort_type)
+	{
+		switch( sort_type )
+		{
+			case ESortType.TIME:
+			{
+				return m_SortTime;
+			}
+			case ESortType.POPULATION:
+			{
+				return m_CurrentNumberPlayers;
+			}
+			case ESortType.SLOTS:
+			{
+				return m_MaxPlayers;
+			}
+			case ESortType.PING:
+			{
+				return m_Ping;
+			}
+			case ESortType.QUEUE:
+			{
+				return m_PlayersInQueue;
+			}
+		}		
+		return 0;
+	}
+	
+	// Returns 0 if values are equal, 
+	// a positive number if this entry is "greater than" other,
+	// and a negative number if this entry is "less than" other 
+	int CompareTo(GetServersResultRow other, ESortType sortType)
+	{	
+		// string comparison
+		if (sortType == ESortType.HOST)
+		{
+			string val1 = this.GetValueStr(ESortType.HOST);
+			string val2 = other.GetValueStr(ESortType.HOST);
+			
+			if (val1 == val2)
+				return 0;
+			
+			if (val1 < val2)
+				return 1;
+			
+			return -1;
+		}
+
+		// int comparison
+		int comparisonResult = other.GetValueInt(sortType) - this.GetValueInt(sortType);
+		if (comparisonResult == 0)
+		{
+			// if sorting by POPULATION, break ties using QUEUE size
+			if (sortType == ESortType.POPULATION)
+			{
+				comparisonResult = this.CompareTo(other, ESortType.QUEUE);	
+			}
+		}
+		
+		return comparisonResult;
+	}
+};
+
+
+typedef array<ref GetServersResultRow> GetServersResultRowArray;
+
+class GetFirstServerWithEmptySlotResult
+{
+	GetServersResult m_Result;
+};
+
+//! GetServersInput the input structure of the GetServers operation
+class GetFirstServerWithEmptySlotInput
+{
+	bool		m_Official;
+	string		m_GameVersion;
+	int			m_RegionId;
+
+	bool		m_UseOfficial;
+	bool		m_UseGameVersion;
+	bool		m_UseRegionId;
+		
+	void SetOfficial( bool Official )
+	{
+		m_Official					= Official;
+		m_UseOfficial				= true;
+	}
+	
+	void SetGameVersion( string GameVersion )
+	{
+		m_GameVersion				= GameVersion;
+		m_UseGameVersion			= true;
+	}
+	
+	void SetRegionId( int RegionId )
+	{
+		m_RegionId					= RegionId;
+		m_UseRegionId				= true;
+	}
+};
+
+//! GetServersResult the output structure of the GetServers operation
+class GetServersResult
+{
+	int								m_Page;
+	int								m_Pages;
+	ref GetServersResultRowArray	m_Results;
+
+	int m_NumServers;
+};
+
+//! GetServersInput the input structure of the GetServers operation
+class GetServersInput
+{
+	bool		m_AntiCheat;
+	int			m_RowsPerPage;
+	string		m_SortBy; //na of property
+	ESortOrder	m_SortOrder;
+	string		m_Name;
+	string		m_GameType;
+	int			m_Platform; // 1 - PC, 2 - xbox, 3 - PSN
+	int			m_ModeId; // identifies if third person is allowed on a CONSOLE server. On PC always 0
+	int			m_Page;
+	string		m_GameVersion;
+	bool		m_Official;
+	bool		m_Joinable;
+	string		m_MapNameToRun;
+	bool		m_IsModded;
+	int			m_MinPlayers; // minimum 1
+	int			m_MaxPlayers; // maximum 99
+	bool		m_IsPasswordProtected;
+	int			m_RegionId; // 1 - Americas, 2 - Europe, 3 - Asia
+	int			m_Priority;
+	int 		m_FreeSlotsMin;
+	int 		m_FreeSlotsMax;
+	string		m_HostIp;
+	int			m_HostPort;
+	string		m_FavoriteServers;
+	bool		m_MouseAndKeyboardEnabled;
+	bool		m_WhitelistEnabled;
+	bool		m_IsDLC;
+
+	bool m_UseAntiCheat;
+	bool m_UseName;
+	bool m_UseGameType;
+	bool m_UseModeId;
+	bool m_UseGameVersion;
+	bool m_UseOfficial;
+	bool m_UseJoinable;
+	bool m_UseMapNameToRun;
+	bool m_UseIsModded;
+	bool m_UseMinPlayers; 
+	bool m_UseMaxPlayers; 
+	bool m_UseIsPasswordProtected;
+	bool m_UseRegionId; 
+	bool m_UsePriority;
+	bool m_UseFreeSlotsMin;
+	bool m_UseFreeSlotsMax;
+	bool m_UseHostIp;
+	bool m_UseHostPort;
+	bool m_UseHostIps;
+	bool m_UseMouseAndKeyboardEnabled;
+	bool m_UseWhitelistEnabled;
+	bool m_UseIsDLC;
+	
+	void SetAntiCheatFilter( bool anti_cheat )
+	{
+		m_AntiCheat					= anti_cheat;
+		m_UseAntiCheat				= true;
+	}
+	
+	void SetNameFilter( string name )
+	{
+		m_Name						= name;
+		m_UseName					= true;
+	}
+	
+	void SetGameTypeFilter( string game_type )
+	{
+		m_GameType					= game_type;
+		m_UseGameType				= true;
+	}
+	
+	void SetModeIdFilter( int mode_id )
+	{
+		m_ModeId					= mode_id;
+		m_UseModeId					= true;
+	}
+	
+	void SetGameVersionFilter( string game_version )
+	{
+		m_GameVersion				= game_version;
+		m_UseGameVersion			= true;
+	}
+	
+	void SetOfficialFilter( bool official )
+	{
+		m_Official					= official;
+		m_UseOfficial				= true;
+	}
+	
+	void SetJoinableFilter( bool joinable )
+	{
+		m_Joinable					= joinable;
+		m_UseJoinable				= true;
+	}
+	
+	void SetMapNameToRun( string mapNameToRun )
+	{
+		m_MapNameToRun = mapNameToRun;
+		m_UseMapNameToRun = true;
+	}
+	
+	void SetIsModdedFilter( bool is_modded )
+	{
+		m_IsModded					= is_modded;
+		m_UseIsModded				= true;
+	}
+	
+	void SetMinPlayersFilter( int min_players )
+	{
+		m_MinPlayers				= min_players;
+		m_UseMinPlayers				= true;
+	}
+	
+	void SetMaxPlayersFilter( int max_players )
+	{
+		m_MaxPlayers				= max_players;
+		m_UseMaxPlayers				= true;
+	}
+	
+	void SetIsPasswordProtectedFilter( bool password_protected )
+	{
+		m_IsPasswordProtected		= password_protected;
+		m_UseIsPasswordProtected	= true;
+	}
+	
+	void SetRegionIdFilter( int region )
+	{
+		m_RegionId					= region;
+		m_UseRegionId				= true;
+	}
+	
+	void SetPriorityFilter( int priority )
+	{
+		m_Priority					= priority;
+		m_UsePriority				= true;
+	}
+	
+	void SetFreeSlotsMin( int freeSlotsMin )
+	{
+		m_FreeSlotsMin = freeSlotsMin;
+		m_UseFreeSlotsMin = true;
+	}
+	
+	void SetFreeSlotsMax( int freeSlotsMax )
+	{
+		m_FreeSlotsMax = freeSlotsMax;
+		m_UseFreeSlotsMax = true;
+	}
+	
+	void SetHostIp( string hostIp )
+	{
+		m_HostIp = hostIp;
+		m_UseHostIp = true;
+	}
+	
+	void SetHostPort( int hostPort )
+	{
+		m_HostPort = hostPort;
+		m_UseHostPort = true;
+	}
+	
+	void SetMouseAndKeyboardEnabled(bool enabledMouseAndKeyboard)
+	{
+		m_MouseAndKeyboardEnabled = enabledMouseAndKeyboard;
+		m_UseMouseAndKeyboardEnabled = true;
+	}
+	
+	void SetFavorited( bool show )
+	{
+		m_SortBy += "F";
+		AddShow( show );
+		
+	}
+	
+	void SetFriendsPlaying( bool show )
+	{
+		m_SortBy += "P";
+		AddShow( show );
+	}
+	
+	void SetPreviouslyPlayed( bool show )
+	{
+		m_SortBy += "R";
+		AddShow( show );
+	}
+	
+	void SetProperVersionMatch( bool show )
+	{
+		m_SortBy += "V";
+		AddShow( show );
+	}
+	
+	void SetFullServer( bool show )
+	{
+		m_SortBy += "S";
+		AddShow( show );
+	}
+	
+	void SetThirdPerson( bool show )
+	{
+		m_SortBy += "3";
+		AddShow( show );
+	}
+	
+	void SetPublic( bool show )
+	{
+		m_SortBy += "L";
+		AddShow( show );
+	}
+	
+	void SetAcceleratedTime( bool show )
+	{
+		m_SortBy += "A";
+		AddShow( show );
+	}
+
+	void SetAllowedFilePatching( bool show )
+	{
+		m_SortBy += "7";
+		AddShow( show );
+	}
+	
+	void SetLAN()
+	{
+		m_SortBy += "N";
+	}
+	
+	void SetPingFilter( int pingMaxValue )
+	{
+		m_SortBy += "M" + pingMaxValue + ";";
+	}
+	
+	void SetBattleyeProtection(bool show)
+	{
+		m_SortBy += "B";
+		AddShow(show);
+	}
+		
+	void SetPassworded(bool show)
+	{
+		m_SortBy += "C";
+		AddShow(show);
+	}
+
+	void AddShow( bool show )
+	{
+		if( show )
+			m_SortBy += "+";
+		else
+			m_SortBy += "-";
+	}
+	
+	void AddFavourite(string ip, int port)
+	{
+		m_FavoriteServers += ip + ";" + port + ";";
+	}
+	
+	void SetWhitelistEnabled(bool whitelistEnabled)
+	{
+		m_WhitelistEnabled = whitelistEnabled;
+		m_UseWhitelistEnabled = true;
+		
+		m_SortBy += "W";
+		AddShow(whitelistEnabled);
+	}
+	
+	void SetIsDLC(bool isDLC)
+	{
+		m_IsDLC = isDLC;
+		m_UseIsDLC = true;
+		
+		m_SortBy += "D";
+		AddShow(isDLC);
+	}
+};
+
+class BiosLobbyService
+{
+	//! Query game servers
+	/*!
+		The async result is returned in the OnDoneAsync callback.
+		Expected errors:
+			BAD_PARAMETER -	if atleast one of the permissions is not supported on the current platform, 
+							or atleast one of the input arrays is NULL.
+			
+		@param inputValues input structure
+		
+	*/
+	proto native EBiosError GetServers(GetServersInput inputValues);
+
+	//! First 1st free server
+	/*!
+		The async result is returned in the OnGetFirstServerWithEmptySlot callback.
+				
+	*/
+	proto native EBiosError GetFirstServerWithEmptySlot(GetFirstServerWithEmptySlotInput inputValues);
+	
+	proto native void AddServerFavorite(string ipAddress, int port, int steamQueryPort);
+	proto native void RemoveServerFavorite(string ipAddress, int port, int steamQueryPort);
+	proto native void GetFavoriteServers(TStringArray favServers);
+	
+	//! Get cached info about favorited servers (ONLY ON WINDOWS)
+	/*!
+		@param favServersInfoCache gets populated with data with format: key = Query End Point, value.param1 = Server Name, value.param2 = Connection Port
+	*/
+	proto native void GetCachedFavoriteServerInfo(array<ref CachedServerInfo> favServersInfoCache);
+	
+	//! Async function to retrieve info about mods for specific server (only for PC)
+	//! @param serverId have to be an id returned by callbacks issued by last call to GetServers
+	//! if GetServers is used another time the id's must be upated
+	proto native EBiosError GetServerModList(string serverId);
+	
+	//! Async callback for GetServers
+	/*!
+		@param result_list result object
+		@param error error indicating success or fail of the async operation.
+		@param response for debugging - this is the data returned by the server; or an empty string ;)
+	*/
+	
+	void OnDoneAsync(GetServersResult result_list, EBiosError error, string response)
+	{
+		/*
+		if (result_list.m_Results != null && result_list.m_Results.Count() > 0)
+			Print(result_list.m_Results[0].m_TimeOfDay);
+		*/
+		OnlineServices.OnLoadServersAsync( result_list, error, response );
+	}
+	
+	void OnGetFirstServerWithEmptySlot(GetFirstServerWithEmptySlotResult result_list, EBiosError error)
+	{
+		OnlineServices.OnAutoConnectToEmptyServer( result_list, error );
+	}
+	
+	//! Async callback for GetServerModList
+	void OnServerModList(GetServerModListResult result_list, EBiosError error)
+	{
+		OnlineServices.OnGetServerModList( result_list, error );
+	}
+};
diff --git a/scripts/3_Game/DayZ/Services/BiosPackageService.c b/scripts/3_Game/DayZ/Services/BiosPackageService.c
new file mode 100644
index 0000000000000000000000000000000000000000..a04c036a0afede563db04f611c92fd4569593954
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosPackageService.c
@@ -0,0 +1,70 @@
+
+//! BiosCheckUpdateResult represent result of the PromptUpdateAsync request.
+class BiosCheckUpdateResult
+{
+	//! Is new update available?
+	bool	m_IsUpdate;
+	
+	//! Is update mandatory?
+	bool	m_IsMandatory;
+};
+
+class BiosPackageService
+{
+	//! Async check if exist new update
+	/*!
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError CheckUpdateAsync();
+	
+	
+	//! Prompt user to accept update with system GUI
+	/*!
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError PromptUpdateAsync();
+	
+	
+	//! Show store for current title (system GUI). Only on Xbox.
+	/*!
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError ShowStoreAsync();
+	
+	//! Callback function for CheckUpdateAsync()
+	/*!
+		@param checkUpdateResult contain information about availability of new update and if it is mandatory.
+		@param error indicating success or fail of the async operation.
+	*/
+	void OnCheckUpdate(BiosCheckUpdateResult checkUpdateResult, EBiosError error)
+	{
+		if ( !error && ( checkUpdateResult.m_IsUpdate || checkUpdateResult.m_IsMandatory ) )
+		{
+			OnlineServices.PromptUpdate();
+		}
+	}
+	
+	
+	//! Callback function for PromptUpdateAsync()
+	/*!
+		Show system UI with update.
+		On Xbox, game suspend after accept update.
+
+		@param error indicating success or fail of the async operation.
+	*/
+	void OnPromptUpdate(EBiosError error)
+	{
+		OnlineServices.ErrorCaught( error );
+	}
+	
+	
+	//! Callback function for ShowStoreAsync()
+	/*!
+		@param error indicating success or fail of the async operation.
+	*/
+	void OnShowStore(EBiosError error)
+	{
+		OnlineServices.ErrorCaught( error );
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Services/BiosPrivacyService.c b/scripts/3_Game/DayZ/Services/BiosPrivacyService.c
new file mode 100644
index 0000000000000000000000000000000000000000..edeb1ce3ad15d13e09caedde505cd36b94ec9a6a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosPrivacyService.c
@@ -0,0 +1,123 @@
+//!	EBiosPrivacyPermission represents possible privacy permissions
+/*!
+	See individual values for platform support and meaning.
+*/
+enum EBiosPrivacyPermission
+{
+	COMMUNICATE_VOICE,		//!< Xbox: represents CommunicateUsingVoice permissions, see Xbox Docs.
+	COMMUNICATE_TEXT,		//!< Xbox: represents CommunicateUsingText permissions, see Xbox Docs.
+	VIEW_PROFILE,			//!< Xbox: represents ViewTargetProfile permissions, see Xbox Docs.
+	VIEW_PRESENCE,			//!< Xbox: represents ViewTargetPresence permissions, see Xbox Docs.
+};
+
+//!	EBiosPrivacyPrivilege represents possible privacy privileges
+/*!
+	See individual values for platform support and meaning.
+*/
+enum EBiosPrivacyPrivilege
+{
+	COMMUNICATE_VOICE,		//!< Xbox: represents XPRIVILEGE_COMMUNICATION_VOICE_INGAME privilege, see Xbox Docs.
+	COMMUNICATE_TEXT,		//!< Xbox: represents XPRIVILEGE_COMMUNICATIONS privilege, see Xbox Docs.
+	MULTIPLAYER_GAMEPLAY,	//!< Xbox: represents XPRIVILEGE_MULTIPLAYER_SESSIONS privilege, see Xbox Docs.
+	MULTIPLAYER_LOBBY,		//!< Xbox: represents XPRIVILEGE_MULTIPLAYER_PARTIES privilege, see Xbox Docs.
+};
+
+//! BiosPrivacyPermissionResult represents the per permission result of the GetPermissionsAsync reqeust.
+
+class BiosPrivacyPermissionResult
+{
+	EBiosPrivacyPermission	m_Permission;	//!< The reqeusted permission.
+	bool					m_IsAllowed;	//!< Result.
+	
+	static bool Compare( BiosPrivacyPermissionResult a, BiosPrivacyPermissionResult b )
+	{
+		return ( a.m_Permission == b.m_Permission && a.m_IsAllowed == b.m_IsAllowed );
+	}
+};
+
+
+typedef array<ref BiosPrivacyPermissionResult> BiosPrivacyPermissionResultArray;
+
+//! BiosPrivacyUidResult represents the per user result of the GetPermissionsAsync request.
+
+class BiosPrivacyUidResult
+{
+	string									m_Uid;			//!< Uid of the target user.
+	ref BiosPrivacyPermissionResultArray	m_Results;		//!< Array of permission results for this target user.
+};
+
+typedef array<ref BiosPrivacyUidResult> BiosPrivacyUidResultArray;
+
+//! BiosPrivacyService is used to query privacy permissions for a target user/s.
+
+class BiosPrivacyService
+{
+	//! Query for privacy permissions
+	/*!
+		The async result is returned in the OnPermissions callback.
+		Expected errors:
+			BAD_PARAMETER -	if atleast one of the permissions is not supported on the current platform, 
+							or atleast one of the input arrays is NULL.
+			
+		@param uid_list list of target user Uid's for which to query privacy permissions.
+		@param permission_list list of requested permissions for each target user.
+		@return EBiosError indicating if the async operation is pending.
+		
+	*/
+	proto native EBiosError GetPermissionsAsync(array<string> uid_list, array<EBiosPrivacyPermission> permission_list);
+
+	//! Query for privileges
+	/*!
+		The async result is returned in the OnPrivilege callback.
+		Expected errors:
+			BAD_PARAMETER -	if atleast one of the privileges is not supported on the current platform, 
+			PURCHASE_REQUIRED,
+			BANNED,
+			NOT_ALLOWED - the privilege is granted,
+			
+		@param privilege the requested privilege.
+		@param tryResolution Xbox: show system GUI with error msg and attempts to resolve it if possible.
+		@return EBiosError indicating if the async operation is pending.
+		
+	*/
+	proto native EBiosError GetPrivilegeAsync(EBiosPrivacyPrivilege privilege, bool try_resolution);
+	
+	//! Async callback for GetPermissionsAsync
+	/*!
+		@param result_list list of results for each requested user. NULL if failed.
+		@param error error indicating success or fail of the async operation.
+	
+	*/
+	void OnPermissions(BiosPrivacyUidResultArray result_list, EBiosError error)
+	{
+		if (result_list == null)
+		{
+			Print("biapi privacy error: " + error);
+			return;
+		}
+				
+		OnlineServices.OnPermissionsAsync( result_list, error );
+	}
+	
+	//! Async callback for GetPrivilegeAsync
+	/*!
+		@param privilege the requested privilege.
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnPrivilege(EBiosPrivacyPrivilege privilege, EBiosError error)
+	{
+		switch ( privilege )
+		{
+			case EBiosPrivacyPrivilege.MULTIPLAYER_GAMEPLAY:
+			{
+				OnlineServices.OnLoadMPPrivilege( error );
+				break;
+			}
+			case EBiosPrivacyPrivilege.COMMUNICATE_VOICE:
+			{
+				OnlineServices.OnLoadVoicePrivilege( error );
+				break;
+			}
+		}
+	}
+};
diff --git a/scripts/3_Game/DayZ/Services/BiosSessionService.c b/scripts/3_Game/DayZ/Services/BiosSessionService.c
new file mode 100644
index 0000000000000000000000000000000000000000..c24854a8a46f3d5a87d62ad6445421bd504f6a2b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosSessionService.c
@@ -0,0 +1,263 @@
+class BiosSessionService
+{
+	protected int				m_GetSessionAttempts;
+	string						m_CurrentHandle;
+	
+	//! Enter a gameplay session
+	/*!
+		The async result is returned in the OnEnterGameplaySession callback.
+		Expected errors:
+			LOGICAL - if the user is currently in an active gameplay session.
+			
+		@param session_address server IP address.
+		@param session_port server port.	
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError	EnterGameplaySessionAsync(string session_address, int session_port);
+	
+	//! Leave a gameplay session
+	/*!
+		The async result is returned in the OnLeaveGameplaySession callback.
+		If there is an unexpected error the state is cleared.
+		Expected errors:
+			ERR_NOT_FOUND - when attempting to leave a gameplay session the user is not part of.
+			ERR_LOGICAL - when the user is not in a gameplay session.
+			
+		@param session_address server IP address.
+		@param session_port server port.	
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError	LeaveGameplaySessionAsync(string session_address, int session_port);
+	
+	//! Alerts engine that players in current session have changed
+	/*!
+		@param newPlayers players that have just joined the server. When player joins a server, ALL players already on server count as new players.
+	*/
+	proto native void OnSessionPlayerListUpdate(array<string> newPlayers);
+	
+	//! Gets a session from a join handle
+	/*!
+		The async result is returned in the OnGetGameplaySession, OnGetLobbySession or OnGetSessionError callback,
+		dependinng on the type of session, or error.
+		Expected errors:
+
+		@param join_handle the parsed join handle.
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	void TryGetSession( string join_handle = "" )
+	{
+		if ( join_handle != "" )
+		{
+			m_GetSessionAttempts	= 0;
+			m_CurrentHandle			= join_handle;
+		}
+		
+		if ( m_GetSessionAttempts < 10 )
+			GetSessionAsync( m_CurrentHandle );
+		else
+			g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_JOIN);
+	}
+	
+	//! Gets a session from a join handle
+	/*!
+		The async result is returned in the OnGetGameplaySession, OnGetLobbySession or OnGetSessionError callback,
+		dependinng on the type of session, or error.
+		Expected errors:
+
+		@param join_handle the parsed join handle.
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError	GetSessionAsync(string join_handle);
+	
+	//! Sets the activity to a gameplay session
+	/*!
+		The async result is returned in the OnSetActivity callback.
+		Expected errors:
+			ERR_NOT_FOUND - when attempting to set a gameplay session activity the user is not part of.
+			
+		@param session_address server IP address.
+		@param session_port server port.		
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError	SetGameplayActivityAsync(string session_address, int session_port);
+	
+	//! not implemented
+	//proto native EBiosError	SetLobbyActivityAsync(...);
+	
+	//! Clears the current activity
+	/*!
+		The async result is returned in the OnClearActivity callback.
+		Expected errors:
+					
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError	ClearActivityAsync();
+	
+	//! Show system UI to invite friends to current gameplay session
+	/*! 
+		The async result is returned in the OnShowInviteToGameplaySession callback. 
+		On Xbox, if session with session_address and session_port does not exist, then xbox show 
+		message "We could not send the invite".
+		
+		@param session_address server IP address.
+		@param session_port server port.
+		
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError ShowInviteToGameplaySessionAsync(string session_address, int session_port);
+
+	//! Send invite to list of users
+	/*! 
+		The async result is returned in the OnInviteToGameplaySession callback. 
+		The user must be inside the session. That means, OnEnterGameplaySession must be called with no errors.
+		
+		@param session_address server IP address.
+		@param session_port server port.
+		@param invitee_list list of users to invite
+
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError InviteToGameplaySessionAsync(string session_address, int session_port, array<string> invitee_list);
+
+	//! Notifiy about interactive multiplayer state
+	proto native void SetMultiplayState(bool is_active);
+	
+	//! Callback function
+	/*!
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnSetActivity(EBiosError error)
+	{
+		OnlineServices.ErrorCaught( error );
+	}
+	
+	//! Callback function
+	/*!
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnClearActivity(EBiosError error)
+	{
+	}
+	
+	//! Callback function
+	/*!
+		@param session_address server IP address.
+		@param session_port server port.
+	*/
+	void OnGetGameplaySession(string session_address, int session_port)
+	{	
+		m_GetSessionAttempts = 0;
+		switch (g_Game.GetGameState())
+		{
+			case DayZGameState.IN_GAME:
+			{
+				string addr;
+				int port;
+				bool found = GetGame().GetHostAddress( addr, port );
+				if (addr != session_address || port != session_port )
+				{
+					if (found)
+					{
+						OnlineServices.SetInviteServerInfo( session_address, session_port );
+						g_Game.GetUIManager().CloseAll();
+						if (!g_Game.GetUIManager().EnterScriptedMenu( MENU_INVITE_TIMER, null ))
+						{
+							NotificationSystem.AddNotification( NotificationType.CONNECT_FAIL_GENERIC, NotificationSystem.DEFAULT_TIME_DISPLAYED );
+						}
+					}
+					else
+					{
+						NotificationSystem.AddNotification( NotificationType.JOIN_FAIL_GET_SESSION, NotificationSystem.DEFAULT_TIME_DISPLAYED );
+					}
+				}
+				else
+				{
+					NotificationSystem.AddNotification( NotificationType.INVITE_FAIL_SAME_SERVER, NotificationSystem.DEFAULT_TIME_DISPLAYED, "#ps4_already_in_session" );
+				}
+				break;
+			}
+			case DayZGameState.CONNECTING:
+			{
+				g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_FORCE);
+				// Intentionally no break, fall through to connecting
+			}
+			default:
+			{
+				g_Game.ConnectFromJoin( session_address, session_port );
+				break;
+			}
+		}
+	}
+	
+	//! //! Callback function, not implemented
+	/*void OnGetLobbySession(...)
+	{
+	}*/
+	
+	//! Callback function
+	/*!
+		@param error error indicating fail of the async operation. Cannot be OK.
+	*/
+	void OnGetSessionError(EBiosError error)
+	{
+		OnlineServices.ErrorCaught( error );
+		m_GetSessionAttempts++;
+		
+		#ifdef PLATFORM_XBOX
+			GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( TryGetSession, 100, false, "" );
+		#endif
+		#ifdef PLATFORM_PS4
+			g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_JOIN);
+		#endif		
+	}
+	
+	//! Callback function
+	/*!
+		@param session_address server IP address. Empty if failed.
+		@param session_port server port. 0 if failed.
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnEnterGameplaySession(string session_address, int session_port, EBiosError error)
+	{
+		if ( !OnlineServices.ErrorCaught( error ) )
+		{
+			SetGameplayActivityAsync( session_address, session_port );
+			if ( OnlineServices.GetPendingInviteList() )
+				InviteToGameplaySessionAsync( session_address, session_port, OnlineServices.GetPendingInviteList() );
+			
+			//OnlineServices.GetCurrentServerInfo(session_address, session_port);
+		}
+	}
+	
+	//! Callback function
+	/*!
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnLeaveGameplaySession(EBiosError error)
+	{
+	}
+	
+	//! Callback function
+	/*!
+		@param error indicating success or fail of the async operation.
+	*/
+	void OnShowInviteToGameplaySession(EBiosError error)
+	{
+		OnlineServices.ErrorCaught( error );
+	}
+
+	//! Callback function
+	/*!
+		@param error indicating success or fail of the async operation.
+	*/
+	void OnInviteToGameplaySession(EBiosError error)
+	{
+
+	}
+	
+	array<string> GetSessionPlayerList()
+	{
+		return ClientData.GetSimplePlayerList();
+	}
+	
+};
diff --git a/scripts/3_Game/DayZ/Services/BiosSocialService.c b/scripts/3_Game/DayZ/Services/BiosSocialService.c
new file mode 100644
index 0000000000000000000000000000000000000000..f449c6fa75edf6ae0f8eb8c3ed6fcb6e436fdcf3
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosSocialService.c
@@ -0,0 +1,62 @@
+
+//! BiosFriendInfo represents friend information
+
+class BiosFriendInfo
+{
+	string	m_Uid;			//!< The Uid of the friend.
+	string	m_DisplayName;	//!< The Displayable nick name of the friend.
+	bool	m_IsFavorite;	//!< Xbox: Is a favorite friend?
+	bool	m_IsFollowed;	//!< Xbox: Is this a two-way friendship?
+	
+	static bool Compare( BiosFriendInfo a, BiosFriendInfo b )
+	{
+		return ( a.m_Uid == b.m_Uid && a.m_DisplayName == b.m_DisplayName && a.m_IsFavorite == b.m_IsFavorite && a.m_IsFollowed == b.m_IsFollowed );
+	}
+};
+
+typedef array<ref BiosFriendInfo> BiosFriendInfoArray;
+
+//! BiosSocialService is used to query friend list and other social features for the current user.
+/*!
+	Todo: report friend changes
+*/
+class BiosSocialService
+{
+	//! Display small system UI profile for the target.
+	/*!
+		Xbox: The async result is returned in the OnPermissionsAsync callback.
+			
+		@param uid_target target user Uid's for which to display profile.
+		@return EBiosError indicating if the async operation is pending.		
+	*/
+	proto native EBiosError ShowUserProfileAsync(string uid_target);
+	
+	//! Query for friends list
+	/*!
+		The async result is returned in the OnFriendsAsync callback.
+		
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError GetFriendsAsync();
+
+	//! Async callback for ShowUserProfileAsync
+	/*!
+		@param error error indicating success or fail of the async operation.
+			Xbox: OK - the user displayed the fullscreen profile
+			Xbox: CANCEL - the user closed the small profile.
+	*/
+	void OnUserProfileAsync(EBiosError error)
+	{
+		OnlineServices.OnUserProfileAsync( error );
+	}
+	
+	//! Async callback for GetFriendsAsync
+	/*!
+		@param friend_list list of BiosFriendInfo for each friend. NULL if failed.
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnFriendsAsync(BiosFriendInfoArray friend_list, EBiosError error)
+	{
+		OnlineServices.OnFriendsAsync( friend_list, error );
+	}
+};
diff --git a/scripts/3_Game/DayZ/Services/BiosUserManager.c b/scripts/3_Game/DayZ/Services/BiosUserManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b5c4de8177b9800dac7dfa33cc7671c60e72a9c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/BiosUserManager.c
@@ -0,0 +1,319 @@
+
+enum EBiosJoinType
+{
+	INVITE,
+	ACTIVITY,
+};
+
+class BiosUser
+{
+	proto native owned string GetName();
+	proto native owned string GetUid();
+	proto native BiosClientServices GetClientServices();
+	proto native bool IsOnline();
+};
+
+class BiosUserManager
+{
+	//! Gets the initiatior of the title
+	/*!
+		@return BiosUser the initiator. May be NULL.
+	*/
+	proto native BiosUser GetTitleInitiator();
+	
+	//! Gets the currently present list of users
+	/*!
+		Fills in the array.
+		Expected errors:
+			BAD_PARAMETER -	user_list is NULL, 
+	
+		@return EBiosError indicating if the operation is done.
+	*/
+	proto native EBiosError GetUserList(array<ref BiosUser> user_list);
+	
+	//! Display a system dependant ui for log-on
+	proto native EBiosError LogOnUserAsync(BiosUser user);
+
+	//! Display a system dependant account picket
+	/*!
+		Xbox: The async result is returned in the OnUserPicked callback.
+	
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError PickUserAsync();
+	
+	
+	//! Parse the join data from from command line parameters.
+	/*!
+		The async result is returned in the OnJoin callback.
+		The OnJoin callback is called also during runtime when a join is accepted.
+		Expected errors:
+			BAD_PARAMETER -	join_data could not be parsed, 
+	
+		@param join_data the startup join data from command line parameters.
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError ParseJoinAsync(string join_data);
+
+	//! Parse the party data from from command line parameters.
+	/*!
+		The async result is returned in the OnPartyHost callback.
+		The OnPartyHost callback is called also during runtime when a player hosts a game for the party.
+		Expected errors:
+			BAD_PARAMETER -	join_data could not be parsed, 
+	
+		@param party_data the startup party data from command line parameters.
+		@return EBiosError indicating if the async operation is pending.
+	*/
+	proto native EBiosError ParsePartyAsync(string party_data);
+	
+	//! Informs the engine about the current selected user.
+	/*!
+		Must be called to ensure proper authentication etc.
+	
+		@param user the user to select.
+	*/
+	proto native bool SelectUser(BiosUser user);
+	
+	//! Returns the currently selected user.
+	/*!
+		@return BiosUser the selected user. May be NULL.
+	*/
+	proto native BiosUser GetSelectedUser();
+	
+	//! Call async function to get database ID
+	/*!
+		@return EBiosError indicating if the async operation is pending. If active user is not set, then return NOT_FOUND
+	*/
+	proto native EBiosError GetUserDatabaseIdAsync();
+	
+	bool SelectUserEx(BiosUser user)
+	{
+		bool success = false;
+		
+		BiosUser selectedUser = GetSelectedUser();
+		if (selectedUser && selectedUser != user && g_Game.GetGameState() != DayZGameState.MAIN_MENU)
+		{
+			success = SelectUser(user);
+			g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_FORCE & ~DisconnectSessionFlags.SELECT_USER);
+		}
+		else
+			success = SelectUser(user);
+		
+		if (!success)
+		{
+			NotificationSystem.AddNotification(NotificationType.GENERIC_ERROR, NotificationSystem.DEFAULT_TIME_DISPLAYED);
+		}
+		
+		return success;
+	}
+	
+	//! Callback function.
+	/*!
+		@param dbID user database ID. If something went wrong, then it is empty string.
+		@param error indicating correct state.
+	*/
+	void OnUserDatabaseId(string dbID, EBiosError error)
+	{
+		if ( !OnlineServices.ErrorCaught( error ) )
+		{
+			g_Game.SetDatabaseID( dbID );
+		}
+	}
+
+	//! Callback function.
+	/*!
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnUserLoggedOn(EBiosError error)
+	{
+		if ( OnlineServices.ErrorCaught( error ) )
+		{
+			GetGame().GetInput().ResetActiveGamepad();
+			g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_FORCE);
+		}
+	}
+	
+	//! Callback function.
+	/*!
+		@param user picked user. NULL on fail.
+		@param error error indicating success or fail of the async operation.
+	*/
+	void OnUserPicked(BiosUser user, EBiosError error)
+	{
+		if ( !user )
+		{
+			GetGame().GetInput().ResetActiveGamepad();
+			g_Game.GamepadCheck();
+		}
+		else if ( !OnlineServices.ErrorCaught( error ) )
+		{
+			if (SelectUserEx( user ))
+			{
+				if ( GetGame().GetMission() )
+					GetGame().GetMission().Reset();
+				OnGameNameChanged( user );
+				g_Game.SelectUser(GetGame().GetInput().GetUserGamepad(user));
+			}
+		}
+	}
+
+	//! Callback function.
+	void OnLoggedOn(BiosUser user)
+	{
+		if ( user && GetSelectedUser() == user )
+			g_Game.SelectUser(GetGame().GetInput().GetUserGamepad(user));
+	}
+
+	//! Callback function.
+	void OnLoggedOff(BiosUser user)
+	{
+		OnSignedOut( user );
+	}
+	
+	//! Callback function.
+	/*!
+		Called when a new user signed in
+	
+		@param user the user that signed in. Cannot be NULL.
+	*/
+	void OnSignedIn(BiosUser user)
+	{
+		
+	}
+	
+	//! Callback function.
+	/*!
+		Called when a new user signed out
+	
+		@param user the user that signed out. Cannot be NULL.
+	*/
+	void OnSignedOut(BiosUser user)
+	{
+		if ( user == GetSelectedUser() )
+		{
+			SelectUserEx( null );
+			GetGame().GetInput().ResetActiveGamepad();
+			g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_FORCE & ~DisconnectSessionFlags.SELECT_USER);
+		}
+	}
+	
+	//! Callback function.
+	/*!
+		Called when a join is parsed or when a runtime join is accepted from the system UI.
+	
+		@param type the type of join. Undefined on error.
+		@param joiner the user that is joining. NULL on error.
+		@param handle join handle for a session. Empty on error.
+		@param joinee uid of the user that is being joined. Empty on error.
+		@param error indicating if parsing failed. OK if not a result of ParseJoinAsync.
+	*/
+	void OnJoin(EBiosJoinType type, BiosUser joiner, string handle, string joinee, EBiosError error) 
+	{
+		if ( !OnlineServices.ErrorCaught( error ) )
+		{
+			OnlineServices.SetBiosUser( joiner );
+			
+			SelectUserEx( joiner );
+			OnlineServices.SetSessionHandle( handle );
+			
+			if ( g_Game.GetGameState() == DayZGameState.IN_GAME )
+			{
+				g_Game.SetLoadState( DayZLoadState.JOIN_START );
+				OnlineServices.GetSession();
+			}
+			else
+			{
+				if ( GetGame().GetUIManager() && GetGame().GetInput().IsActiveGamepadSelected() )
+				{
+					GetGame().GetUIManager().CloseMenu( MENU_TITLE_SCREEN );
+					GetGame().GetInput().IdentifyGamepad( GamepadButton.BUTTON_NONE );
+				}
+				g_Game.SetLoadState( DayZLoadState.JOIN_START );
+				g_Game.GamepadCheck();
+			}
+		}
+		else
+		{
+			g_Game.DisconnectSessionEx(DISCONNECT_SESSION_FLAGS_JOIN);
+		}
+	}
+	
+	//! Callback function.
+	/*!
+		Called when a party is parsed or when a party is hosted from the system UI.
+	
+		@param host the user that is hosting the party. NULL on error.
+		@param invitee_list list of party members.
+		@param error indicating if parsing failed. OK if not a result of ParsePartyAsync.
+	*/
+	void OnPartyHost(BiosUser host, array<string> invitee_list, EBiosError error)
+	{
+		#ifdef PLATFORM_PS4
+		if (host)
+		#endif
+		{
+			SelectUserEx(host);
+			
+		#ifdef PLATFORM_PS4
+			if (!host.IsOnline())
+		{
+			LogOnUserAsync( host );
+		}
+		#endif
+		}
+
+
+		if (GetGame().GetUIManager())
+		{
+			GetGame().GetUIManager().CloseMenu(MENU_TITLE_SCREEN);
+		}
+		
+		OnlineServices.SetPendingInviteList( invitee_list );
+		if (g_Game.GetGameState() != DayZGameState.IN_GAME && g_Game.GetGameState() != DayZGameState.CONNECTING)
+		{
+			if (!GetGame().GetUIManager().GetMenu() || GetGame().GetUIManager().GetMenu().GetID() != MENU_MAIN)
+			{
+				GetGame().GetUIManager().EnterScriptedMenu(MENU_MAIN, GetGame().GetUIManager().GetMenu());
+			}
+			g_Game.SetGameState( DayZGameState.PARTY );
+			g_Game.SetLoadState( DayZLoadState.PARTY_START );
+			g_Game.GamepadCheck();
+		}
+	}
+
+	//! Callback function.
+	/*!
+		Called when display info of a signed in user changed.
+	
+		@param user the user affected by the change.
+	*/
+	void OnGameNameChanged(BiosUser user)
+	{
+		if ( user == GetSelectedUser() )
+		{
+			g_Game.SetPlayerName( user.GetName() );
+			#ifdef PLATFORM_CONSOLE
+				g_Game.SetPlayerGameName( user.GetName() );
+			#endif
+			if ( GetGame().GetUIManager().GetMenu() )
+			{
+				GetGame().GetUIManager().GetMenu().Refresh();
+			}
+		}
+	}
+	
+	BiosUser GetUser( string user_id )
+	{
+		array<ref BiosUser> user_list = new array<ref BiosUser>;
+		GetUserList( user_list );
+		foreach ( BiosUser user : user_list )
+		{
+			if ( user.GetUid() == user_id )
+			{
+				return user;
+			}
+		}
+		return null;
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Services/ContentDLC.c b/scripts/3_Game/DayZ/Services/ContentDLC.c
new file mode 100644
index 0000000000000000000000000000000000000000..ad996063df906ec6941985e6619cc5a2f619c650
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/ContentDLC.c
@@ -0,0 +1,53 @@
+
+// Binded values from engine
+enum EDLCId
+{
+	DLC_UNKNOWN,
+	DLC_BLISS,
+};
+
+//! ContentDLC is for query installed DLC (only as entitlement keys, not content)
+class ContentDLC
+{
+	//! void(EDLCId dlcId)
+	ref ScriptInvoker m_OnChange = new ScriptInvoker();
+	
+	/*!
+		For getting current entitlements on device (console). Could be called 
+		after any entitlement change or before accessing locked content.
+		\param dlcIdList through this list is returned all installed DLC with valid license for current user
+		\return count of installed and valid DLCs.
+	*/
+	proto native int GetEntitlements(out TIntArray dlcIdList);
+	
+	/*!
+		\param dlcId ID of DLC
+		\return current state of availability of unlocking' dlc. Only DLC with valid license return true.
+	*/
+	proto native bool IsDLCInstalled(EDLCId dlcId);
+	
+	bool OwnsAllDLC()
+	{
+		const int length = EnumTools.GetEnumSize(EDLCId);
+		
+		// Start at 1, because 0 is DLC_UNKNOWN
+		for (int i = 1; i < length; ++i)
+		{
+			if (!IsDLCInstalled(EnumTools.GetEnumValue(EDLCId, i)))
+				return false;
+		}
+		
+		return true;
+	}
+	
+	/*!
+		Called from engine for notifing script after any change in additional 
+		content (installed, lost license). There should be check for current state of entitlements.
+		On Xbox should be problem with event lost license! (system bug)
+		\param dlcId ID of DLC that was changed. Could be empty string if console does not report concrete DLC ID.
+	*/
+	void OnChange(EDLCId dlcId)
+	{
+		m_OnChange.Invoke(dlcId);
+	}
+};
diff --git a/scripts/3_Game/DayZ/Services/TrialService.c b/scripts/3_Game/DayZ/Services/TrialService.c
new file mode 100644
index 0000000000000000000000000000000000000000..be1f6d18cea1a622902aaa7c7fa88441977691fd
--- /dev/null
+++ b/scripts/3_Game/DayZ/Services/TrialService.c
@@ -0,0 +1,24 @@
+
+//! TrialService is used to query if the game is trial version or not
+class TrialService
+{
+	/*!
+		Xbox: Retrieves if the game license is trial
+			
+		@param bIsSimulator switch in between the testing simulator for trial and the retail version.
+							If the game is in retail mode it automatically ignores this switch and 
+							uses the correct app runtime version.
+		@return boolean if the game is in trial mode.		
+	*/
+	proto native bool IsGameTrial(bool bIsSimulator);
+	
+	/*!
+		Xbox: Retrieves if the game license is active
+			
+		@param bIsSimulator switch in between the testing simulator for trial and the retail version.
+							If the game is in retail mode it automatically ignores this switch and 
+							uses the correct app runtime version.
+		@return boolean if the game is in trial mode.		
+	*/
+	proto native bool IsGameActive(bool bIsSimulator);
+};
diff --git a/scripts/3_Game/DayZ/Sound.c b/scripts/3_Game/DayZ/Sound.c
new file mode 100644
index 0000000000000000000000000000000000000000..dfed8e60e2c5fdd5cd4d0514a576899790a22b45
--- /dev/null
+++ b/scripts/3_Game/DayZ/Sound.c
@@ -0,0 +1,193 @@
+enum WaveKind 
+{
+	WAVEEFFECT,
+	WAVEEFFECTEX,
+	WAVESPEECH,
+	WAVEMUSIC,
+	WAVESPEECHEX,
+	WAVEENVIRONMENT,
+	WAVEENVIRONMENTEX,
+	WAVEWEAPONS,
+	WAVEWEAPONSEX,
+	WAVEATTALWAYS,
+	WAVEUI
+}
+
+class AbstractSoundScene
+{
+	private void AbstractSoundScene() {}
+	private void ~AbstractSoundScene() {}
+	
+	proto native AbstractWave Play2D(SoundObject soundObject, SoundObjectBuilder soundBuilder);
+	proto native AbstractWave Play3D(SoundObject soundObject, SoundObjectBuilder soundBuilder);
+	proto native SoundObject BuildSoundObject(SoundObjectBuilder soundObjectbuilder);
+
+	proto native float GetRadioVolume();
+	proto native void SetRadioVolume(float vol, float time);
+
+	proto native float GetSpeechExVolume();
+	proto native void SetSpeechExVolume(float vol, float time);
+
+	proto native float GetMusicVolume();
+	proto native void SetMusicVolume(float vol, float time);
+
+	proto native float GetSoundVolume();
+	proto native void SetSoundVolume(float vol, float time);
+
+	proto native float GetVOIPVolume();
+	proto native void SetVOIPVolume(float vol, float time);
+	
+	proto native float GetSilenceThreshold();
+	proto native float GetAudioLevel();
+}
+
+
+class SoundObjectBuilder
+{
+	void SoundObjectBuilder(SoundParams soundParams);	
+	
+	SoundObject BuildSoundObject()
+	{
+		return GetGame().GetSoundScene().BuildSoundObject(this);
+	}
+
+	proto native void Initialize(SoundParams soundParams);
+
+	proto native void AddEnvSoundVariables(vector position);
+	proto native void AddVariable(string name, float value);
+	proto void AddVariables(notnull array<string> names, array<float> values = null);
+	
+	//! Deprecated - same functionality, just poor naming
+	void UpdateEnvSoundControllers(vector position)
+	{
+		AddEnvSoundVariables(position);
+	}
+
+	//! Deprecated - same functionality, just poor naming
+	void SetVariable(string name, float value)
+	{
+		AddVariable(name, value);
+	}
+}
+
+
+class SoundObject
+{
+	void SoundObject(SoundParams soundParams);
+	
+	proto void UpdateVariables(notnull array<float> values);
+
+	//! Note:	'SoundObject' is not an Entity, and therefore can not be accessed by using 'IEntity.GetChildren', 
+	//! 		though internally 'SoundObject.SetParent' is similiar to 'IEntity.AddChild' by creating an 'EntityHierarchyComponent'
+	proto native void SetParent(IEntity parent, int pivot = -1);
+	proto native IEntity GetParent();
+	proto native int GetHierarchyPivot();
+	
+	//! Note:	Sets the position locally if parented, retrieves globally with the sound offset
+	proto native void SetPosition(vector position);
+	proto native vector GetPosition();
+	
+	//! Note:	Sets the speed locally if parented, retrieves globally with the parent speed
+	proto native void SetSpeed(vector speed);
+	proto native vector GetSpeed();
+
+	proto native void SetOcclusionObstruction(float occlusion, float obstruction);
+	proto native void SetKind(WaveKind kind);
+	proto native void Initialize(SoundParams soundParams);
+}
+
+//soundsys.hpp
+class SoundParams
+{
+	void SoundParams(string name);
+		
+	proto native bool Load(string name);	
+	proto native bool IsValid();
+	proto string GetName();
+}
+
+class AbstractWaveEvents
+{
+	ref ScriptInvoker Event_OnSoundWaveStarted = new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundWaveStopped = new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundWaveLoaded = new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundWaveHeaderLoaded = new ScriptInvoker();
+	ref ScriptInvoker Event_OnSoundWaveEnded = new ScriptInvoker();
+}
+
+class AbstractWave
+{
+	private void InitEvents()
+	{
+		AbstractWaveEvents events = new AbstractWaveEvents();
+		SetUserData(events);
+	}
+
+	#ifdef DIAG_DEVELOPER
+	private void AbstractWave() { InitEvents(); }
+	private void ~AbstractWave() {}
+	#else
+	void AbstractWave() { InitEvents(); }
+	#endif
+	
+	proto void SetUserData(Managed inst);
+	proto Managed GetUserData();
+	
+	proto void Play();
+	
+	void PlayWithOffset(float offset)
+	{
+		Play();
+		SetStartOffset(offset);
+	}
+	//proto native void Mute();
+	proto void Stop();
+	proto void Restart();
+	proto void SetStartOffset(float offset);
+	//! WARNING: Blocking! Waits for header to load
+	proto float GetLength();
+	//! Current position in percentage of total length
+	proto float GetCurrPosition();
+	proto void Loop(bool setLoop);
+	proto float GetVolume();
+	proto void SetVolume(float value);
+	proto void SetVolumeRelative(float value);
+	proto void SetFrequency(float value);
+	proto float GetFrequency();
+	proto void SetPosition(vector position, vector velocity = "0 0 0");
+	proto void SetFadeInFactor(float volume);
+	proto void SetFadeOutFactor(float volume);
+	proto void SetDoppler(bool setDoppler);
+	proto void Skip(float timeSec);
+	proto bool IsHeaderLoaded();
+	
+	AbstractWaveEvents GetEvents()
+	{
+		return AbstractWaveEvents.Cast(GetUserData());
+	}
+	
+	void OnPlay()
+	{
+		GetEvents().Event_OnSoundWaveStarted.Invoke(this);
+	}
+	
+	void OnStop()
+	{
+		GetEvents().Event_OnSoundWaveStopped.Invoke(this);
+	}
+		
+	void OnLoad()
+	{
+		GetEvents().Event_OnSoundWaveLoaded.Invoke(this);
+	}
+	
+	void OnHeaderLoad()
+	{
+		GetEvents().Event_OnSoundWaveHeaderLoaded.Invoke(this);
+	}
+	
+	void OnEnd()
+	{
+		GetEvents().Event_OnSoundWaveEnded.Invoke(this);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Static/Easing.c b/scripts/3_Game/DayZ/Static/Easing.c
new file mode 100644
index 0000000000000000000000000000000000000000..388bd21450331b511c5017685abf9b1e79f74d55
--- /dev/null
+++ b/scripts/3_Game/DayZ/Static/Easing.c
@@ -0,0 +1,284 @@
+//! Input value between 0 and 1, returns value adjusted by easing, no automatic clamping of input(do your own !!)
+class Easing
+{
+	static float EaseInSine( float t ) 
+	{
+		return -1 * Math.Cos( t * ( Math.PI / 2 ) ) + 1;
+	}
+
+	static float EaseOutSine( float t ) 
+	{
+		return Math.Sin( t * ( Math.PI / 2 ) );
+	}
+
+	static float EaseInOutSine( float t ) 
+	{
+		return -0.5 * ( Math.Cos( Math.PI * t ) - 1 );
+	}
+
+	static float EaseInQuad( float t ) 
+	{
+		return t * t;
+	}
+
+	static float EaseOutQuad( float t ) 
+	{
+		return t * ( 2 - t );
+	}
+
+	static float EaseInOutQuad( float t ) 
+	{
+		if(t < 0.5)
+			return 2 * t * t;
+		else 
+			return -1 + ( 4 - 2 * t ) * t;
+	}
+
+	static float EaseInCubic( float t ) 
+	{
+		return t * t * t;
+	}
+
+	static float EaseOutCubic( float t ) 
+	{
+		float t1 = t - 1;
+		return t1 * t1 * t1 + 1;
+	}
+
+	static float EaseInOutCubic( float t ) 
+	{
+		if( t < 0.5 ) 
+			return 4 * t * t * t;
+		else 
+			return ( t - 1 ) * ( 2 * t - 2 ) * ( 2 * t - 2 ) + 1;
+	}
+
+	static float EaseInQuart( float t ) 
+	{
+		return t * t * t * t;
+	}
+
+	static float EaseOutQuart( float t ) 
+	{
+		float t1 = t - 1;
+		return 1 - t1 * t1 * t1 * t1;
+	}
+
+
+	static float EaseInOutQuart( float t ) 
+	{
+		float t1 = t - 1;
+		
+		if(t < 0.5)
+			return 8 * t * t * t * t;
+		else
+			return 1 - 8 * t1 * t1 * t1 * t1;
+	}
+
+	static float EaseInQuint( float t ) 
+	{
+		return t * t * t * t * t;
+	}
+
+	static float EaseOutQuint( float t ) 
+	{
+		float t1 = t - 1;
+		return 1 + t1 * t1 * t1 * t1 * t1;
+	}
+
+	static float EaseInOutQuint( float t ) 
+	{
+		float t1 = t - 1;
+		
+		if( t < 0.5 )
+		{
+			return 16 * t * t * t * t * t;
+		}
+		else
+		{
+			return  1 + 16 * t1 * t1 * t1 * t1 * t1;
+		}
+	}
+
+	static float EaseInExpo( float t ) 
+	{
+		if( t == 0 ) 
+		{
+			return 0;
+		}
+		
+		return 	Math.Pow( 2, 10 * ( t - 1 ) );
+	}
+
+	static float EaseOutExpo( float t ) 
+	{
+		if( t == 1 ) {
+			return 1;
+		}
+
+		return ( -Math.Pow( 2, -10 * t ) + 1 );
+	}
+
+	static float EaseInOutExpo( float t ) 
+	{
+    
+		if( t == 0 || t == 1 ) 
+		{
+			return t;
+    	}
+
+	    float scaledTime = t * 2;
+	    float scaledTime1 = scaledTime - 1;
+			
+	    if( scaledTime < 1 ) 
+		{
+	       return 0.5 * Math.Pow( 2, 10 *  scaledTime1 );
+	   	}
+	
+		return 0.5 * ( -Math.Pow( 2, -10 * scaledTime1 ) + 2 );
+
+	}
+
+	static float EaseInCirc( float t ) 
+	{
+		float scaledTime = t / 1;
+		return -1 * ( Math.Sqrt( 1 - scaledTime * t ) - 1 );
+	}
+
+	static float EaseOutCirc( float t ) 
+	{
+		float t1 = t - 1;
+		return Math.Sqrt( 1 - t1 * t1 );
+	}
+	
+	static float EaseInOutCirc( float t ) 
+	{
+
+		float scaledTime = t * 2;
+		float scaledTime1 = scaledTime - 2;
+
+		if( scaledTime < 1 ) 
+		{
+			return -0.5 * ( Math.Sqrt( 1 - scaledTime * scaledTime ) - 1 );
+		}
+
+		return 0.5 * ( Math.Sqrt( 1 - scaledTime1 * scaledTime1 ) + 1 );
+	}
+
+	static float EaseInBack( float t, float magnitude = 1.70158 ) 
+	{
+		return t * t * ( ( magnitude + 1 ) * t - magnitude );
+	}
+
+	static float EaseOutBack( float t, float magnitude = 1.70158 ) 
+	{
+		float scaledTime = ( t / 1 ) - 1;
+		return (scaledTime * scaledTime * ( ( magnitude + 1 ) * scaledTime + magnitude )) + 1;
+	}
+
+	static float EaseInOutBack( float t, float magnitude = 1.70158 ) 
+	{
+
+		float scaledTime = t * 2;
+		float scaledTime2 = scaledTime - 2;
+
+		float s = magnitude * 1.525;
+
+		if( scaledTime < 1) 
+		{
+			return 0.5 * scaledTime * scaledTime * (( ( s + 1 ) * scaledTime ) - s);
+		}
+
+		return 0.5 * (scaledTime2 * scaledTime2 * ( ( s + 1 ) * scaledTime2 + s ) + 2);
+	}
+
+	static float EaseInElastic( float t, float magnitude = 0.7 ) 
+	{
+		if( t == 0 || t == 1 ) 
+			return t;
+
+		float scaledTime = t / 1;
+		float scaledTime1 = scaledTime - 1;
+
+		float p = 1 - magnitude;
+		float s = p / ( 2 * Math.PI ) * Math.Asin( 1 );
+
+		return -(Math.Pow( 2, 10 * scaledTime1 ) * Math.Sin( ( scaledTime1 - s ) * ( 2 * Math.PI ) / p ));
+	}
+
+	static float EaseOutElastic( float t, float magnitude = 0.7 ) 
+	{
+		float p = 1 - magnitude;
+		float scaledTime = t * 2;
+
+		if( t == 0 || t == 1 ) {
+			return t;
+		}
+
+		float s = p / ( 2 * Math.PI ) * Math.Asin( 1 );
+		return (Math.Pow( 2, -10 * scaledTime ) * Math.Sin( ( scaledTime - s ) * ( 2 * Math.PI ) / p )) + 1;
+	}
+
+	static float EaseInOutElastic( float t, float magnitude = 0.65 ) 
+	{
+		float p = 1 - magnitude;
+
+		if( t == 0 || t == 1 ) 
+		{
+			return t;
+		}
+
+		float scaledTime = t * 2;
+		float scaledTime1 = scaledTime - 1;
+		
+		float s = p / ( 2 * Math.PI ) * Math.Asin( 1 );
+
+		if( scaledTime < 1 ) 
+		{
+			return -0.5 * (Math.Pow( 2, 10 * scaledTime1 ) * Math.Sin( ( scaledTime1 - s ) * ( 2 * Math.PI ) / p ));
+		}
+
+		return (Math.Pow( 2, -10 * scaledTime1 ) *        Math.Sin( ( scaledTime1 - s ) * ( 2 * Math.PI ) / p ) * 0.5) + 1;
+	}
+
+	static float EaseOutBounce( float t ) 
+	{
+
+		float scaledTime = t / 1;
+
+		if( scaledTime < ( 1 / 2.75 ) ) {
+
+			return 7.5625 * scaledTime * scaledTime;
+
+		} else if( scaledTime < ( 2 / 2.75 ) ) {
+
+			float scaledTime2 = scaledTime - ( 1.5 / 2.75 );
+			return ( 7.5625 * scaledTime2 * scaledTime2 ) + 0.75;
+
+		} else if( scaledTime < ( 2.5 / 2.75 ) ) {
+
+			scaledTime2 = scaledTime - ( 2.25 / 2.75 );
+			return ( 7.5625 * scaledTime2 * scaledTime2 ) + 0.9375;
+
+		} else {
+
+			scaledTime2 = scaledTime - ( 2.625 / 2.75 );
+			return ( 7.5625 * scaledTime2 * scaledTime2 ) + 0.984375;
+
+		}
+	}
+
+	static float EaseInBounce( float t ) 
+	{
+		return 1 - EaseOutBounce( 1 - t );
+	}
+
+	static float EaseInOutBounce( float t ) 
+	{
+		if( t < 0.5 ) 
+		{
+			return EaseInBounce( t * 2 ) * 0.5;
+		}
+		return ( EaseOutBounce( ( t * 2 ) - 1 ) * 0.5 ) + 0.5;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Static/TimeAccel.c b/scripts/3_Game/DayZ/Static/TimeAccel.c
new file mode 100644
index 0000000000000000000000000000000000000000..04bb4c606b04b1d7fab7ecde05b5f09e52e6bbaf
--- /dev/null
+++ b/scripts/3_Game/DayZ/Static/TimeAccel.c
@@ -0,0 +1,136 @@
+#ifdef DIAG_DEVELOPER
+typedef Param3<bool, float, int> TimeAccelParam;//enabled, timeAccel,category mask
+
+enum ETimeAccelCategories
+{
+	//DO NOT FORGET TO INCLUDE IN THE MAPPING 'Init()' FUNCTION
+	UNDERGROUND_ENTRANCE 	= 0x00000001,
+	UNDERGROUND_RESERVOIR 	= 0x00000002,
+	ENERGY_CONSUMPTION 		= 0x00000004,
+	ENERGY_RECHARGE 		= 0x00000008,
+	FOOD_DECAY 				= 0x00000010,
+	//SYSTEM5 = 0x00000020,
+	//SYSTEM6 = 0x00000040,
+	//SYSTEM6 = 0x00000080,
+}
+
+class FeatureTimeAccel
+{
+	static ref TimeAccelParam 		m_CurrentTimeAccel;// 	= new TimeAccelParam(false, 0, 0);
+	static ref map<int,int> 		m_Mapping 			= new map<int,int>();
+	static ref array<int> 			m_IDs				= new array<int>();
+	static bool 					m_Initializeded 	= Init();
+	
+	static bool Init()
+	{
+		Bind(DiagMenuIDs.FEATURE_TIME_ACCEL_UG_ENTRANCES, 		ETimeAccelCategories.UNDERGROUND_ENTRANCE);
+		Bind(DiagMenuIDs.FEATURE_TIME_ACCEL_UG_RESERVOIR, 		ETimeAccelCategories.UNDERGROUND_RESERVOIR);
+		Bind(DiagMenuIDs.FEATURE_TIME_ACCEL_ENERGY_CONSUME, 	ETimeAccelCategories.ENERGY_CONSUMPTION);
+		Bind(DiagMenuIDs.FEATURE_TIME_ACCEL_ENERGY_RECHARGE, 	ETimeAccelCategories.ENERGY_RECHARGE);
+		Bind(DiagMenuIDs.FEATURE_TIME_ACCEL_FOOD_DECAY, 		ETimeAccelCategories.FOOD_DECAY);
+		return true;
+	}
+	
+	//-------------------------------
+	
+	static void Bind(DiagMenuIDs id, ETimeAccelCategories catBit)
+	{
+		m_Mapping.Insert(id, catBit);
+		m_IDs.Insert(id);
+	}
+	
+	//-------------------------------
+	
+	static int GetCategoryByDiagID(DiagMenuIDs id)
+	{
+		return m_Mapping.Get(id);
+	}
+	
+	//-------------------------------
+	
+	static int GetDiagIDByCategory(ETimeAccelCategories category)
+	{
+		for (int i = 0; i < m_Mapping.Count();i++)
+		{
+			if (m_Mapping.GetElement(i) == category)
+			{
+				return m_Mapping.GetKey(i);
+			}
+		}
+		return -1;
+	}
+	
+	//-------------------------------
+	
+	static bool GetFeatureTimeAccelEnabled(ETimeAccelCategories categoryBit)
+	{
+		return (m_CurrentTimeAccel && m_CurrentTimeAccel.param1 && (categoryBit & m_CurrentTimeAccel.param3) != 0);
+	}
+	
+	//-------------------------------
+	
+	static float GetFeatureTimeAccelValue()
+	{
+		if (m_CurrentTimeAccel)
+			return m_CurrentTimeAccel.param2;
+		else return 1;
+	}
+	
+	//-------------------------------
+	
+	static void CopyTimeAccelClipboard(bool enable, int timeAccelBig, float timeAccelSmall, int bitMask)
+	{
+		string output = "-timeAccel=";
+		int val = enable;
+		output += val.ToString()+","+timeAccelBig.ToString()+","+timeAccelSmall.ToString()+","+bitMask.ToString();
+		GetGame().CopyToClipboard(output);
+	}
+	
+	//-------------------------------
+	
+	static int GetTimeAccelBitmask()
+	{
+		int bitmask = 0;
+		
+		foreach (int id : m_IDs)
+		{
+			WriteCategoryBit(bitmask, id);	
+		}
+
+		return bitmask;
+	}
+	
+	//-------------------------------
+	
+	static void WriteCategoryBit(out int bitmask, int diagMenuID)
+	{
+		int bit = GetCategoryByDiagID(diagMenuID);
+		if (DiagMenu.GetValue(diagMenuID))
+		{
+			bitmask = bitmask | bit;
+		}
+	}
+	
+	//-------------------------------
+	
+	static bool AreTimeAccelParamsSame(TimeAccelParam p1, TimeAccelParam p2)
+	{
+		if (!p1 || !p2)
+			return false;
+		if (p1.param1 != p2.param1)
+			return false;
+		if (p1.param2 != p2.param2)
+			return false;
+		if (p1.param3 != p2.param3)
+			return false;
+		return true;
+	}
+	
+	//-------------------------------
+	
+	static void SendTimeAccel(Man player, TimeAccelParam param)
+	{
+		GetGame().RPCSingleParam(player, ERPCs.DIAG_TIMEACCEL, param, true, player.GetIdentity());
+	}
+}
+#endif
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/SurfaceInfo.c b/scripts/3_Game/DayZ/SurfaceInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..97a31b74d36aadedd948c9c74b17b9f40fb0833a
--- /dev/null
+++ b/scripts/3_Game/DayZ/SurfaceInfo.c
@@ -0,0 +1,31 @@
+typedef int[] SurfaceInfo;
+
+/*!
+	Unmanaged surface info handle. Provides API to surfaces that are defined as part of 'CfgSurfaces' or exist in an objects .bisurf file.
+	Lifetime is managed in code so don't store handles of this type yourself.
+*/
+class SurfaceInfo
+{
+	private void SurfaceInfo() {};
+	private void ~SurfaceInfo() {};
+	
+	proto string GetName();
+	proto string GetEntryName();
+	proto string GetSurfaceType();
+	
+	proto float GetRoughness();
+	proto float GetDustness();
+	proto float GetBulletPenetrability();
+	proto float GetThickness();
+	proto float GetDeflection();
+	proto float GetTransparency();
+	proto float GetAudability();
+	
+	proto bool IsLiquid();
+	proto bool IsStairs();
+	proto bool IsPassthrough();
+	proto bool IsSolid();
+	
+	proto string GetSoundEnv();
+	proto string GetImpact();
+};
diff --git a/scripts/3_Game/DayZ/SyncEvents.c b/scripts/3_Game/DayZ/SyncEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd2030a8bdf0ee525605bde200fe5d1ad6f889ca
--- /dev/null
+++ b/scripts/3_Game/DayZ/SyncEvents.c
@@ -0,0 +1,108 @@
+class SyncEvents
+{
+	static void RegisterEvents()
+	{
+		DayZGame dz_game = DayZGame.Cast( GetGame() );
+		
+		dz_game.Event_OnRPC.Insert( Event_OnRPC );
+		Print("SyncEvents -> RegisterEvents");
+	}
+	
+	static void Event_OnRPC(PlayerIdentity sender, Object target, int rpc_type, ParamsReadContext ctx)
+	{		
+		if ( rpc_type == ERPCs.RPC_SYNC_EVENT && GetGame() && GetGame().IsMultiplayer() && GetGame().IsClient() )
+		{			
+			Param2<ESyncEvent, ref SyncData> event_data = new Param2<ESyncEvent, ref SyncData>( -1, null );
+			
+			if ( ctx.Read( event_data ) )
+			{
+				OnSyncEvent( event_data.param1, event_data.param2, target );
+			}
+		}
+	}
+	
+	static void OnSyncEvent( ESyncEvent event_type, SyncData data, Object target )
+	{
+		switch ( event_type )
+		{
+			case ESyncEvent.PlayerList:
+			{
+				ClientData.SyncEvent_PreprocessPlayerList(data.m_ServerPlayerList);
+				ClientData.SyncEvent_OnRecievedPlayerList(data.m_ServerPlayerList);
+				break;
+			}
+			case ESyncEvent.EntityKill:
+			{
+				ClientData.SyncEvent_OnEntityKilled( data.m_EntityKill );
+				break;
+			}
+			case ESyncEvent.PlayerIgnateFireplayce:
+			{
+				ClientData.SyncEvent_OnPlayerIgnitedFireplace( data.m_SyncInt );
+				break;
+			}
+		}
+	}
+	
+	static void SendPlayerList()
+	{
+		SyncData data = new SyncData;
+		data.m_ServerPlayerList = new SyncPlayerList;
+		data.m_ServerPlayerList.CreatePlayerList();
+		
+		SendSyncEvent( ERPCs.RPC_SYNC_EVENT, ESyncEvent.PlayerList, data, true );
+	}
+	
+	static void SendEntityKilled( EntityAI victim, EntityAI killer, EntityAI source, bool is_headshot )
+	{
+		if ( (victim && victim.IsPlayer()) || (killer && killer.IsPlayer()) )
+		{
+			SyncData data = new SyncData;
+			data.m_EntityKill = new SyncEntityKillInfo;
+			
+			data.m_EntityKill.m_EntityVictim	= victim;
+			data.m_EntityKill.m_EntityKiller	= killer;
+			data.m_EntityKill.m_EntitySource	= source;
+			data.m_EntityKill.m_IsHeadShot		= is_headshot;
+			
+			Man recipient;
+			
+			if ( killer && killer.IsPlayer() && victim.GetID() != killer.GetID() )
+			{
+				recipient = Man.Cast(killer);
+			}
+			else if ( victim && victim.IsPlayer() )
+			{
+				recipient = Man.Cast(victim);
+			}	
+			
+			SendSyncEventEx( ERPCs.RPC_SYNC_EVENT, ESyncEvent.EntityKill, data, true, recipient );
+		}
+	}
+	
+	static void SendPlayerIgnatedFireplace( Man player, EFireIgniteType ignite_type )
+	{
+		SyncData data = new SyncData;
+		data.m_SyncInt = ignite_type;
+		
+		SendSyncEvent( ERPCs.RPC_SYNC_EVENT, ESyncEvent.PlayerIgnateFireplayce, data, true, player.GetIdentity() );
+	}
+	
+	private static void SendSyncEvent( ERPCs rpc_event_id, ESyncEvent sync_event_type, SyncData data = null, bool guaranteed = true, PlayerIdentity player_target = null )
+	{
+		Param2<ESyncEvent, ref SyncData> event_data = new Param2<ESyncEvent, ref SyncData>( sync_event_type, data );
+		if ( !player_target )
+		{
+ 			GetGame().RPCSingleParam( null, rpc_event_id, event_data, guaranteed );
+		}
+		else
+		{
+			GetGame().RPCSingleParam( null, rpc_event_id, event_data, guaranteed, player_target );
+		}
+	}
+	
+	private static void SendSyncEventEx( ERPCs rpc_event_id, ESyncEvent sync_event_type, SyncData data = null, bool guaranteed = true, Man recipient = null )
+	{
+		SendSyncEvent(rpc_event_id, sync_event_type, data, guaranteed, recipient.GetIdentity());
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/AI/AITarget_callbacks.c b/scripts/3_Game/DayZ/Systems/AI/AITarget_callbacks.c
new file mode 100644
index 0000000000000000000000000000000000000000..126c4a6e8578cc8e19db7627a30d1a3429fef822
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/AI/AITarget_callbacks.c
@@ -0,0 +1,14 @@
+//TODO: info + some doc
+
+// abstract base class - cannot be created
+class AbstractAITargetCallbacks
+{
+};
+
+class AITargetCallbacks : AbstractAITargetCallbacks
+{
+	vector GetHeadPositionWS() { return vector.Zero; }
+	vector GetVisionPointPositionWS(EntityAI pApplicant) { return vector.Zero; }
+	
+	float GetMaxVisionRangeModifier(EntityAI pApplicant) { return 1.0; }
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/Actions/ActionBase_Basic.c b/scripts/3_Game/DayZ/Systems/Actions/ActionBase_Basic.c
new file mode 100644
index 0000000000000000000000000000000000000000..6dfdb9832bff9513330d45183066005413a3390c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Actions/ActionBase_Basic.c
@@ -0,0 +1,4 @@
+class ActionBase_Basic
+{
+} 
+
diff --git a/scripts/3_Game/DayZ/Systems/Actions/ActionInput_Basic.c b/scripts/3_Game/DayZ/Systems/Actions/ActionInput_Basic.c
new file mode 100644
index 0000000000000000000000000000000000000000..476d756b18e7acda299614e967625c93c4d1b84a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Actions/ActionInput_Basic.c
@@ -0,0 +1,4 @@
+class ActionInput_Basic
+{
+} 
+
diff --git a/scripts/3_Game/DayZ/Systems/ArrowManager/ArrowManagerBase.c b/scripts/3_Game/DayZ/Systems/ArrowManager/ArrowManagerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e242fa48dc7d0fc8933aece46d0b4ee8076ee12a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/ArrowManager/ArrowManagerBase.c
@@ -0,0 +1,99 @@
+class ArrowManagerBase
+{
+	protected const int VERSION = 2;
+	protected ref array<EntityAI> m_Arrows;
+	protected EntityAI m_Owner;
+	
+	void ArrowManagerBase(EntityAI owner)
+	{
+		m_Owner = owner;
+		m_Arrows = new array<EntityAI>();
+	}
+
+	void AddArrow(EntityAI arrow)
+	{
+		m_Arrows.Insert(arrow);
+	}
+	
+	void RemoveArrow(EntityAI arrow)
+	{
+		m_Arrows.RemoveItem(arrow);
+	}
+		
+	void ClearArrows()
+	{
+		foreach (EntityAI arrow : m_Arrows)
+		{
+			if (arrow)
+				arrow.DeleteSafe();
+		}
+
+		m_Arrows.Clear();
+	}
+	
+	int GetArrowsCount()
+	{
+		return m_Arrows.Count();
+	}
+	
+	void DropArrow(int index)
+	{
+		if (m_Arrows.Count() > index)
+		{
+			EntityAI arrow = m_Arrows.Get(index);
+			vector pos = arrow.GetPosition();
+			
+			m_Owner.RemoveChild(arrow);
+			
+			vector m4[4];
+			Math3D.MatrixIdentity4(m4);
+			m4[3] = pos;
+	
+			arrow.PlaceOnSurfaceRotated(m4, pos);
+			
+			arrow.SetTransform(m4);
+			arrow.PlaceOnSurface();
+		}
+	}
+	
+	void DropFirstArrow()
+	{
+		DropArrow(0);
+	}
+	
+	void DropAllArrows()
+	{
+		for (int i = m_Arrows.Count() - 1; i >= 0 ; i--)
+		{
+			DropArrow(i);
+		}
+	}
+	
+	EntityAI GetArrow(int index)
+	{
+		if (m_Arrows.Count() > index)
+		{
+			return m_Arrows.Get(index);
+		}
+
+		return null;
+	}
+	
+	EntityAI GetFirstArrow()
+	{
+		if (m_Arrows.Count())
+		{
+			return m_Arrows.Get(0);
+		}
+
+		return null;
+	}
+
+	EntityAI AcquireFirstArrow(bool keepTransform = false)
+	{
+		EntityAI entity = GetFirstArrow();
+		m_Owner.RemoveChild(entity, keepTransform);
+		return entity;
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/FSMBase.c b/scripts/3_Game/DayZ/Systems/FSMBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c850257004eb97498d0e87c3e98776c8194e1ad8
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/FSMBase.c
@@ -0,0 +1,184 @@
+void fsmbDebugPrint (string s)
+{
+#ifdef FSM_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void fsmbDebugSpam (string s)
+{
+#ifdef FSM_DEBUG_SPAM
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+
+/**@class	FSMTransition
+ * @brief	represents transition src ---- event[guard]/action ----|> dst
+ **/
+class FSMTransition<Class FSMStateBase, Class FSMEventBase, Class FSMActionBase, Class FSMGuardBase>
+{
+	ref FSMStateBase m_srcState;
+	ref FSMEventBase m_event; // @NOTE: NULL event means "completion transition" in UML speak
+	ref FSMStateBase m_dstState; // @NOTE: NULL dst state == UML terminate pseudonode
+	ref FSMActionBase m_action;
+	ref FSMGuardBase m_guard;
+
+	void FSMTransition (FSMStateBase src, FSMEventBase e, FSMStateBase dst, FSMActionBase a = NULL, FSMGuardBase g = NULL)
+	{
+		m_srcState = src;
+		m_event = e;
+		m_dstState = dst;
+		m_action = a;
+		m_guard = g;
+	}
+};
+
+enum ProcessEventResult
+{
+	FSM_OK,
+	FSM_TERMINATED,
+	FSM_ABORTED,
+	FSM_NO_TRANSITION,
+};
+
+/**@class		FSMBase
+ * @brief		base class for finite state machine
+ *
+ * stores current state (m_state) and transition table with possible transitions from each state
+ * to another state via event
+ **/
+class FSMBase<Class FSMStateBase, Class FSMEventBase, Class FSMActionBase, Class FSMGuardBase>
+{
+	protected ref FSMStateBase m_state; /// current fsm state
+	protected ref FSMStateBase m_initialState; /// configurable initial state of the machine
+	protected ref FSMEventBase m_initialEvent; /// configurable initial event to start the machine (null by default)
+	protected ref array<ref FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase>> m_transitions; /// fsm transition table
+
+	void FSMBase ()
+	{
+		m_transitions = new array<ref FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase>>;
+	}
+
+	/**@fn			GetCurrentState
+	 * @brief		returns currently active state
+	 * @return		current state the FSM is in (or NULL)
+	 **/
+	FSMStateBase GetCurrentState ()
+	{
+		return m_state;
+	}
+
+	/**@fn			SetInitialState
+	 * @brief		sets the initial_state for starting the machine
+	 **/
+	void SetInitialState (FSMStateBase initial_state)
+	{
+		m_initialState = initial_state;
+	}
+
+	/**@fn			Start
+	 * @brief		starts the state machine by entering the initial_state (using intial_event as argument to initial state's onEntry)
+	 * @param[in]	e \p	optional event for starting the machind
+	 **/
+	void Start (FSMEventBase initial_event = NULL)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) fsmbDebugPrint("[fsm] " + this.ToString() + "::Start(" + initial_event.ToString() + "), init_state=" + m_initialState.ToString());
+
+		m_state = m_initialState;
+		m_state.OnEntry(initial_event);
+	}
+
+	/**@fn			IsRunning
+	 * @brief		returns true if machine is in running state
+	 **/
+	bool IsRunning () { return m_state != NULL; }
+
+	/**@fn			Terminate
+	 * @brief		terminates the state machine
+	 **/
+	void Terminate (FSMEventBase terminal_event = NULL)
+	{
+		if (IsRunning())
+		{
+			m_state.OnExit(terminal_event);
+			m_state = NULL;
+		}
+	}
+
+	/**@fn			Update
+	 * @brief		if machine running, call OnUpdate() on current state
+	 **/
+	void Update (float dt)
+	{
+		if (IsRunning())
+			m_state.OnUpdate(dt);
+	}
+	
+	/**@fn			AddTransition
+	 * @brief		adds transition into transition table
+	 **/
+	void AddTransition (FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t)
+	{
+		m_transitions.Insert(t);
+	}
+
+	/**@fn			ProcessEvent
+	 * @brief		instructs the state machine to process the event e
+	 * @param[in]	e	\p	event that will be used to find suitable transition from current state
+	 * @return		FSM_OK if transition found and allowed by guard (if any)
+	 **/
+	ProcessEventResult ProcessEvent (FSMEventBase e)
+	{
+		FSMStateBase curr_state = m_state;
+
+		int count = m_transitions.Count();
+		for (int i = 0; i < count; ++i)
+		{
+			FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> row = m_transitions.Get(i);
+			if (row.m_srcState.Type() == curr_state.Type() && row.m_event.Type() == e.Type())
+			{
+				FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_transitions.Get(i);
+				bool hasGuard = t.m_guard != NULL;
+				if (!hasGuard || (hasGuard && t.m_guard.GuardCondition(e)))		// 1) exec guard (if any)
+				{
+					ProcessLocalTransition(t, e); // 2) process transition allowed by guard
+				}
+			}
+		}
+		return ProcessEventResult.FSM_NO_TRANSITION;
+	}
+
+	/**@fn			ProcessLocalTransition
+	 * @brief		instructs the state machine to process the event locally - no hierarchy is crossed
+	 * @param[in]	t	\p	the transition in m_transitions
+	 * @param[in]	e	\p	event that will be used to process transition from current state
+	 * @return		FSM_OK or FSM_TERMINATED
+	 **/
+	protected ProcessEventResult ProcessLocalTransition (FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t, FSMEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) fsmbDebugPrint("[fsm] (local) state=" + t.m_srcState.ToString() + "-------- event=" + e.ToString() + "[G=" + t.m_guard.ToString() +"]/A=" + t.m_action.ToString() + " --------|> dst=" + t.m_dstState.ToString());
+
+		m_state.OnExit(e);			// 1) call onExit on old state
+
+		if (t.m_action)
+			t.m_action.Action(e);	// 2) execute transition action (if any)
+
+		m_state = t.m_dstState;		// 3) change state to new
+
+		if (t.m_dstState != NULL)
+		{
+			m_state.OnEntry(e);		// 4a) call onEntry on new state
+			return ProcessEventResult.FSM_OK;
+		}
+		else
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmbDebugPrint("[fsm] terminating fsm: state=" + t.m_srcState.ToString() + " event=" + e.ToString());
+			return ProcessEventResult.FSM_TERMINATED; // 4b) or terminate
+		}
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/HFSMBase.c b/scripts/3_Game/DayZ/Systems/HFSMBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..72b1564ca7c43a8a7a8849dacaacc24d0228a910
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/HFSMBase.c
@@ -0,0 +1,686 @@
+void fsmDebugPrint (string s)
+{
+#ifdef FSM_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void fsmDebugSpam (string s)
+{
+#ifdef FSM_DEBUG_SPAM
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+
+/**@class		HFSMBase
+ * @brief		base class for hierarchic finite state machine
+ *
+ * stores current state (m_State) and transition table with possible transitions from each state
+ * to another state via event
+ *
+ * each state can have nested state machine, thus creating hierarchy
+ **/
+class HFSMBase<Class FSMStateBase, Class FSMEventBase, Class FSMActionBase, Class FSMGuardBase>
+{
+	protected ref FSMStateBase m_State; /// current fsm state
+	protected FSMStateBase m_OwnerState; /// state that owns this fsm (or null if root)
+	protected ref FSMStateBase m_InitialState; /// configurable initial state of the machine
+	protected ref array<ref FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase>> m_Transitions = new array<ref FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase>>; /// fsm transition table
+	protected bool m_HasCompletions = false;
+
+	void HFSMBase (FSMStateBase ownerState = NULL)
+	{
+		m_OwnerState = ownerState;
+	}
+
+	/**@fn		GetCurrentState
+	 * @return	returns currently active state within this machine (i.e. not hierarchic state)
+	 **/
+	FSMStateBase GetCurrentState ()
+	{
+		return m_State;
+	}
+	/**@fn		GetOwnerState
+	 * @return	returns state that is owner of this fsm submachine. returns null if this is a root machine.
+	 **/
+	FSMStateBase GetOwnerState ()
+	{
+		return m_OwnerState;
+	}
+	/**@fn		GetHierarchyPath
+	 * @brief		returns hierarchic state (path to root) of a state
+	 * @param[in] state \p state the path is starting
+	 * @param[out] path  \p  current hierarchic state
+	 * @return	true if current state returned in path argument, false otherwise
+	 **/
+	bool GetHierarchyPath (FSMStateBase state, out array<FSMStateBase> path)
+	{
+		FSMStateBase curr = state;
+		while (curr)
+		{
+		  path.Insert(curr);
+		  curr = curr.GetParentState();
+		}
+		return path.Count() > 0;
+	}
+
+	/**@fn		SetInitialState
+	 * @param[in] initial_state \p state the machine will be entered to after ::Start()
+	 * @param[in] initial_event \p event that will be used to start the machine
+	 **/
+	void SetInitialState (FSMStateBase initial_state)
+	{
+		m_InitialState = initial_state;
+	}
+	/**@fn		AddTransition
+	 * @brief	adds transition into transition table
+	 **/
+	void AddTransition (FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t)
+	{
+		m_Transitions.Insert(t);
+		//if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm] +++ ow=" + this.GetOwnerState() + " this=" + this + " t=" + t + " state=" + t.m_srcState + "-------- event=" + t.m_event + "[G=" + t.m_guard +"]/A=" + t.m_action + " --------|> dst=" + t.m_dstState);
+		if (t.m_event == NULL)
+		{
+			Print("Warning (performance): FSM " + this + " has completion transition for src=" + t.m_srcState + " ---NULL----|> dst=" + t.m_dstState);
+			m_HasCompletions = true;
+		}
+	}
+
+	/**@fn		Start
+	 * @brief	starts the state machine by entering the initial_state (using intial_event as argument to initial state's onEntry)
+	 * @param[in] e \p optional event for starting the machind
+	 **/
+	void Start (FSMEventBase initial_event = NULL, bool useExistingState = false)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			fsmDebugPrint("[hfsm] " + this.ToString() + "::Start(" + initial_event.ToString() + "), init_state=" + m_InitialState.ToString());
+		}
+			
+		if (!useExistingState)
+			m_State = m_InitialState;
+		
+		m_State.OnEntry(initial_event);
+		
+		if (m_HasCompletions)
+			ProcessCompletionTransitions();
+	}
+	/**@fn		IsRunning
+	 * @brief	returns true if machine is in running state
+	 **/
+	bool IsRunning () { return m_State != NULL; }
+	/**@fn		Terminate
+	 * @brief	terminates the state machine
+	 **/
+	void Terminate (FSMEventBase terminal_event = NULL)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			fsmDebugPrint("[hfsm] " + this.ToString() + "::Terminate(" + terminal_event.ToString() + ")");
+		}
+		
+		if (IsRunning())
+		{
+			m_State.OnExit(terminal_event);
+			m_State = NULL;
+		}
+	}
+	void Abort (FSMEventBase abort_event = NULL)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			fsmDebugPrint("[hfsm] " + this.ToString() + "::Abort(" + abort_event.ToString() + ")");
+		}
+			
+		if (IsRunning())
+		{
+			m_State.OnAbort(abort_event);
+			m_State = NULL;
+		}
+	}
+	/**@fn		Update
+	 * @brief	if machine running, call OnUpdate() on current state
+	 **/
+	void Update (float dt)
+	{
+		if (IsRunning())
+			m_State.OnUpdate(dt);
+	}
+
+	protected ProcessEventResult ProcessAbortTransition (FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t, FSMEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			fsmDebugPrint("[hfsm] (local abort) state=" + t.m_srcState.ToString() + "-------- ABORT event=" + e.ToString() + "[G=" + t.m_guard.ToString() +"]/A=" + t.m_action.ToString() + " --------|> dst=" + t.m_dstState.ToString());
+		}
+		
+		m_State.OnAbort(e);			// 1) call onAbort on old state
+
+		if (t.m_action)
+			t.m_action.Action(e);	// 2) execute transition action (if any)
+
+		auto tmp = t.m_srcState.GetParentState();
+		if (tmp == t.m_dstState.GetParentState())
+		{
+			m_State = t.m_dstState;		// 3) change state to new (or NULL)
+
+			if (t.m_dstState != NULL)
+			{
+				m_State.OnEntry(e);		// 4a1) call onEntry on new state (see 4a2) )
+				return ProcessEventResult.FSM_OK;
+			}
+			else
+			{
+				if (LogManager.IsInventoryHFSMLogEnable())
+				{
+					fsmDebugPrint("[hfsm] abort & terminating fsm: state=" + t.m_srcState.ToString() + " event=" + e.ToString());
+				}
+					
+				return ProcessEventResult.FSM_TERMINATED; // 4b) or terminate
+			}
+		}
+		else
+		{
+			m_State = NULL;
+			return ProcessEventResult.FSM_ABORTED; // 4c) or signal abort to parent (with appropriate transition)
+		}
+	}
+
+	/**@fn		FindAbortDestinationState
+	 * @brief	i
+	 * @param[in]	e	\p	event that will be used to find suitable transition from current state
+	 * @return	FSM_OK if transition found and allowed by guard (if any)
+	 * @return	FSM_NO_TRANSITION if no unguarded transition found in submachine or local machine
+	 * @return	FSM_TERMINATED state machine has terminated
+	 * @return	FSM_ABORTED state machine has aborted
+	 **/
+	FSMStateBase FindAbortDestinationState (FSMEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			if (GetOwnerState())
+				fsmDebugPrint("[hfsm] SUB! " + GetOwnerState().Type().ToString() + "::FindAbortDestinationState(" + e.Type().ToString() + ")");
+			else
+				fsmDebugPrint("[hfsm] root::FindAbortDestinationState(" + e.Type().ToString() + ")");
+		}
+		
+		// 1) look in submachine first (if any)
+		if (m_State && m_State.HasFSM())
+		{
+			HFSMBase<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> a = m_State.GetFSM();
+			FSMStateBase abort_dst = a.FindAbortDestinationState(e);
+
+			if (abort_dst)
+			{
+				return abort_dst;
+			}
+		}
+
+		// 2) local transitions
+		int i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				fsmDebugPrint("[hfsm] abort event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+			}
+			
+			return NULL;
+		}
+
+		FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+		return t.m_dstState;
+	}
+	
+	/**@fn		ProcessAbortEvent
+	 * @brief	instructs the hierarchical state machine to process the event e
+	 * @param[in]	e	\p	event that will be used to find suitable transition from current state
+	 * @return	FSM_OK if transition found and allowed by guard (if any)
+	 * @return	FSM_NO_TRANSITION if no unguarded transition found in submachine or local machine
+	 * @return	FSM_TERMINATED state machine has terminated
+	 * @return	FSM_ABORTED state machine has aborted
+	 **/
+	FSMStateBase ProcessAbortEvent(FSMEventBase e, out ProcessEventResult result)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			if (GetOwnerState())
+				fsmDebugPrint("[hfsm] SUB! " + GetOwnerState().Type().ToString() + "::ProcessAbortEvent(" + e.Type().ToString() + ")");
+			else
+				fsmDebugPrint("[hfsm] root::ProcessAbortEvent(" + e.Type().ToString() + ")");
+		}
+		
+		// 1) look in submachine first (if any)
+		if (m_State && m_State.HasFSM())
+		{
+			HFSMBase<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> a = m_State.GetFSM();
+			ProcessEventResult subfsm_res;
+			FSMStateBase abort_dst = a.ProcessAbortEvent(e, subfsm_res);
+
+			switch (subfsm_res)
+			{
+				case ProcessEventResult.FSM_OK:
+				{
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{
+						fsmDebugPrint("[hfsm] event processed by sub machine=" + m_State.ToString());
+					}
+					result = subfsm_res;		// 1.1) submachine accepted event
+					return NULL;
+				}
+				case ProcessEventResult.FSM_ABORTED:
+				{
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{
+						fsmDebugPrint("[hfsm] aborted sub machine=" + m_State.ToString());
+					}
+					m_State.OnAbort(e); // 1.2) submachine aborted, abort submachine owner (i.e. this)
+
+					if (GetOwnerState() == abort_dst.GetParentState())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable())
+						{
+							fsmDebugPrint("[hfsm] aborted sub machine=" + m_State.ToString() + " & abort destination reached.");
+						}
+						m_State = abort_dst;
+						m_State.OnEntry(e);		// 1.3) submachine aborted, call onEntry on new state (cross-hierarchy transition)
+						result = ProcessEventResult.FSM_OK;
+						return NULL;
+					}
+					else
+					{
+						result = ProcessEventResult.FSM_ABORTED; // 1.4) submachine has aborted, look for destination state in parent
+						return NULL;
+					}
+
+					break;
+				}
+				case ProcessEventResult.FSM_TERMINATED:
+				{
+					break; // submachine has finished, look for local transitions from exited submachine
+				}
+				case ProcessEventResult.FSM_NO_TRANSITION:
+				{
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{
+						fsmDebugPrint("[hfsm] aborted (but no transition) sub machine=" + m_State.ToString());
+					}
+					break; // submachine has no transition, look for transitions in local machine
+				}
+			}
+		}
+
+		// 2) local transitions
+		int i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				fsmDebugPrint("[hfsm] abort event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+			}
+			result = ProcessEventResult.FSM_NO_TRANSITION;
+			return NULL;
+		}
+
+		FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+		ProcessEventResult res = ProcessAbortTransition(t, e);
+		result = res;
+		switch (res)
+		{
+			case ProcessEventResult.FSM_OK:
+			{
+				//if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm] abort event processed by machine=" + m_State.ToString());
+				return NULL; // machine accepted event
+			}
+			case ProcessEventResult.FSM_ABORTED:
+			{
+				if (LogManager.IsInventoryHFSMLogEnable())
+				{
+					fsmDebugPrint("[hfsm] aborted sub machine=" + m_State.ToString() + " will fall-through to dst=" + t.m_dstState);
+				}
+				return t.m_dstState; // store destination state for parent(s)
+			}
+
+			case ProcessEventResult.FSM_TERMINATED:
+			{
+				if (LogManager.IsInventoryHFSMLogEnable())
+				{
+					fsmDebugPrint("[hfsm] aborted & terminated sub machine=" + m_State.ToString());
+				}
+				break; // submachine has finished, look for local transitions from exited submachine
+			}
+			case ProcessEventResult.FSM_NO_TRANSITION:
+			{	
+				break; // submachine has no transition, look for transitions in local machine
+			}
+		}
+		return NULL;
+	}
+
+
+	/**@fn		ProcessEvent
+	 * @brief	instructs the hierarchical state machine to process the event e
+	 * @param[in]	e	\p	event that will be used to find suitable transition from current state
+	 * @return	FSM_OK if transition found and allowed by guard (if any)
+	 * @return	FSM_NO_TRANSITION if no unguarded transition found in submachine or local machine
+	 * @return	FSM_TERMINATED state machine has terminated
+	 **/
+	ProcessEventResult ProcessEvent(FSMEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			if (GetOwnerState())
+				fsmDebugPrint("[hfsm] SUB!::" + GetOwnerState().Type().ToString() + "::ProcessEvent(" + e.Type().ToString() + ")");
+			else
+				fsmDebugPrint("[hfsm] root::ProcessEvent(" + e.Type().ToString() + " =" + e.DumpToString());
+		}
+		
+		// 1) completion transitions have priority (if any)
+		if (m_HasCompletions)
+			ProcessCompletionTransitions();
+
+		// 2) submachine then (if any)
+		if (m_State && m_State.HasFSM())
+		{
+			ProcessEventResult subfsm_res = m_State.ProcessEvent(e);
+
+			switch (subfsm_res)
+			{
+				case ProcessEventResult.FSM_OK:
+				{
+					if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm] event processed by sub machine=" + m_State.ToString());
+					return subfsm_res; // submachine accepted event
+				}
+				case ProcessEventResult.FSM_TERMINATED:
+				{
+					break; // submachine has finished, look for local transitions from exited submachine
+				}
+				case ProcessEventResult.FSM_NO_TRANSITION:
+				{	
+					break; // submachine has no transition, look for transitions in local machine
+				}
+			}
+		}
+
+		// 3) local transitions
+		int i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				fsmDebugPrint("[hfsm] event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+			}
+			return ProcessEventResult.FSM_NO_TRANSITION;
+		}
+
+		FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> row = m_Transitions.Get(i);
+		ProcessEventResult res;
+		if (row.m_dstState != NULL)
+		{
+			// this is regular transition
+			if (row.m_srcState.GetParentState() == row.m_dstState.GetParentState())
+				res = LocalTransition(i, e); // transition is within this state machine
+			else
+				Error("cross-hierarchy transition or misconfigured transition detected!");
+				//res = HierarchicTransition(i, e); // transition has to cross hierarchy
+		}
+		else
+		{
+			// this is terminating transition
+			if (row.m_srcState.GetParentState() == GetOwnerState())
+				res = LocalTransition(i, e); // terminating transition is within this state machine
+			else
+				Error("cross-hierarchy transition or misconfigured transition detected!");
+				//res = HierarchicTransition(i, e); // source node crosses hierarchy (terminate lies always within this machine)
+		}
+		return res;
+	}
+
+	protected int FindFirstUnguardedTransition (FSMEventBase e)
+	{
+		FSMStateBase curr_state = m_State;
+
+		int count = m_Transitions.Count();
+		for (int i = 0; i < count; ++i)
+		{
+			FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+			if ((t.m_srcState == curr_state) && (t.m_event != NULL) && (t.m_event.Type() == e.Type()))
+			{
+				//if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm] [" + i + "/" + count + "] *** matched! t=" + t + " state=" + t.m_srcState + "-------- event=" + t.m_event + "[G=" + t.m_guard +"]/A=" + t.m_action + " --------|> dst=" + t.m_dstState);
+				bool hasGuard = t.m_guard != NULL;
+				if (!hasGuard || (hasGuard && t.m_guard.GuardCondition(e)))		// 1) exec guard (if any)
+				{
+					return i;
+				}
+			}
+			//else if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm][" + i + "/" + count + "] ... matching  t=" + t + " state=" + t.m_srcState + "-------- event=" + t.m_event + "[G=" + t.m_guard +"]/A=" + t.m_action + " --------|> dst=" + t.m_dstState);
+		}
+		return -1;
+	}
+	
+	FSMStateBase FindTransitionState(FSMStateBase s, FSMEventBase e)
+	{
+		FSMStateBase curr_state = s;
+
+		int count = m_Transitions.Count();
+		for (int i = 0; i < count; ++i)
+		{
+			FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+			if ((t.m_srcState == curr_state) && (t.m_event != NULL) && (t.m_event.Type() == e.Type()))
+			{
+				return t.m_dstState;
+			}
+		}
+		return null;
+	}
+	
+	FSMStateBase FindGuardedTransitionState(FSMStateBase s, FSMEventBase e)
+	{
+		FSMStateBase curr_state = s;
+
+		int count = m_Transitions.Count();
+		for (int i = 0; i < count; ++i)
+		{
+			FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+			if ((t.m_srcState == curr_state) && (t.m_event != NULL) && (t.m_event.Type() == e.Type()))
+			{
+				bool hasGuard = t.m_guard != NULL;
+				if (!hasGuard || (hasGuard && t.m_guard.GuardCondition(e)))		// 1) exec guard (if any)
+				{
+					return t.m_dstState;
+				}
+			}
+		}
+		return null;
+	}
+
+	protected int FindFirstCompletionTransition ()
+	{
+		if (IsRunning())
+		{
+			FSMStateBase curr_state = m_State;
+
+			int count = m_Transitions.Count();
+			for (int i = 0; i < count; ++i)
+			{
+				FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+
+				//if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] (local) matching state=" + t.m_srcState + "-------- event=" + t.m_event + "[G=" + t.m_guard +"]/A=" + t.m_action + " --------|> dst=" + t.m_dstState);
+				if ((t.m_srcState.Type() == curr_state.Type()) && (t.m_event == NULL))
+				{
+					bool hasGuard = t.m_guard != NULL;
+					if (!hasGuard || (hasGuard && t.m_guard.GuardCondition(NULL)))		// 1) exec guard (if any)
+					{
+						return i;
+					}
+				}
+			}
+		}
+		return -1;
+	}
+
+
+	/**@fn		ProcessLocalTransition
+	 * @brief	instructs the state machine to process the event locally - no hierarchy is crossed
+	 * @param[in]	t	\p	the transition in m_Transitions
+	 * @param[in]	e	\p	event that will be used to process transition from current state
+	 * @return	FSM_OK or FSM_TERMINATED
+	 **/
+	protected ProcessEventResult ProcessLocalTransition (FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t, FSMEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			fsmDebugPrint("[hfsm] (local) state=" + t.m_srcState.ToString() + "-------- event=" + e.ToString() + "[G=" + t.m_guard.ToString() +"]/A=" + t.m_action.ToString() + " --------|> dst=" + t.m_dstState.ToString());
+		}
+		
+		m_State.OnExit(e);			// 1) call onExit on old state
+
+		if (t.m_action)
+			t.m_action.Action(e);	// 2) execute transition action (if any)
+
+		m_State = t.m_dstState;		// 3) change state to new
+
+		if (t.m_dstState != NULL)
+		{
+			m_State.OnEntry(e);		// 4a) call onEntry on new state
+
+			if (GetOwnerState())
+				GetOwnerState().OnSubMachineChanged(t.m_srcState, t.m_dstState);	// 5a) notify owner state about change in submachine
+			
+			if (m_State)
+				m_State.OnStateChanged(t.m_srcState, t.m_dstState); // 5b) notify current state about change in machine
+
+			return ProcessEventResult.FSM_OK;
+		}
+		else
+		{
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				fsmDebugPrint("[hfsm] terminating fsm: state=" + t.m_srcState.ToString() + " event=" + e.ToString());
+			}
+				
+			if (GetOwnerState())
+				GetOwnerState().OnSubMachineChanged(t.m_srcState, NULL);	// 5) notify owner state about change in submachine
+			return ProcessEventResult.FSM_TERMINATED; // 4b) or terminate
+		}
+	}
+	/**@fn		LocalProcessEvent
+	 * @brief	instructs the state machine to process the event e
+	 * @param[in]	i	\p	index of the transition in m_Transitions
+	 * @param[in]	e	\p	event that will be used to process transition from current state
+	 * @return	FSM_OK or FSM_TERMINATED
+	 **/
+	protected ProcessEventResult LocalTransition (int i, FSMEventBase e)
+	{
+		FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+		ProcessEventResult ret = ProcessLocalTransition(t, e);
+		return ret;
+	}
+
+	protected ProcessEventResult ProcessCompletionTransitions ()
+	{
+		int completionIdx = FindFirstCompletionTransition();
+		while (completionIdx != -1)
+		{
+			FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> row = m_Transitions.Get(completionIdx);
+			ProcessEventResult res;
+			if (row.m_dstState != NULL)
+			{
+				// this is regular completion transition
+				if (row.m_srcState.GetParentState() == row.m_dstState.GetParentState())
+					res = LocalTransition(completionIdx, NULL); // transition is within this state machine
+				else
+					Error("cross-hierarchy transition or misconfigured transition detected!");
+					//res = HierarchicTransition(completionIdx, NULL); // transition has to cross hierarchy
+			}
+			else
+			{
+				// this is terminating completion transition
+				if (row.m_srcState.GetParentState() == GetOwnerState())
+					res = LocalTransition(completionIdx, NULL); // terminating transition is within this state machine
+				else
+					Error("cross-hierarchy transition or misconfigured transition detected!");
+					//res = HierarchicTransition(completionIdx, NULL); // source node crosses hierarchy (terminate lies always within this machine)
+			}
+
+			completionIdx = FindFirstCompletionTransition();
+		}
+		return ProcessEventResult.FSM_NO_TRANSITION;
+	}
+};
+
+/** cross-hierarchy transitions (for future use):
+
+	protected bool RemoveCommonParents (out array<WeaponStateBase> src_path, out array<WeaponStateBase> dst_path)
+	{
+		//for (int j = 0; j < src_path.Count(); ++j) fsmDebugPrint("[hfsm] curr state src_path[" + j + "] = " + src_path[j].ToString());
+		//for (int k = 0; k < dst_path.Count(); ++k) fsmDebugPrint("[hfsm] next state dst_path[" + k + "] = " + dst_path[k].ToString());
+		while ((src_path.Count() > 0) && (dst_path.Count() > 0) && (src_path.Get(src_path.Count() - 1) == dst_path.Get(dst_path.Count() - 1)))
+		{
+			src_path.Remove(src_path.Count() - 1);
+			dst_path.Remove(dst_path.Count() - 1);
+		}
+		//for (int je = 0; je < src_path.Count(); ++je) fsmDebugPrint("[hfsm] curr state src_path[" + je + "] = " + src_path[je].ToString());
+		//for (int ke = 0; ke < dst_path.Count(); ++ke) fsmDebugPrint("[hfsm] next state dst_path[" + ke + "] = " + dst_path[ke].ToString());
+	}
+	protected ProcessEventResult HierarchicTransition (int i, FSMEventBase e)
+	{
+		fsmDebugPrint("[hfsm] { " + this.ToString() + "::HierarchicTransition(" + e.Type().ToString() + ")");
+
+		FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+
+		array<WeaponStateBase> src_path = new array<WeaponStateBase>;
+		array<WeaponStateBase> dst_path = new array<WeaponStateBase>;
+		if (GetHierarchyPath(t.m_srcState, src_path))
+		{
+			if (t.m_dstState == NULL)
+			{
+				Error("cross hierarchy terminate not yet implemented");
+				WeaponStateBase curr_state = GetCurrentState();
+
+				//for (int ex = 0; ex < src_path.Count(); ++ex) { fsmDebugPrint("[hfsm] exiting level=" + ex); src_path[ex].OnExit(e); }
+				//for (int en = dst_path.Count(); en --> 0;)
+				//for (int en = 0; en < dst_path.Count(); ++en) { fsmDebugPrint("[hfsm] entering level=" + en); int ii = dst_path.Count() - 1 - en; dst_path[ii].OnEntry(e); }
+				fsmDebugPrint("[hfsm] } " + this.ToString() + "::HierarchicTransition(" + e.Type().ToString() + ") --> terminated");
+				return ProcessEventResult.FSM_TERMINATED;
+			}
+			else if (GetHierarchyPath(t.m_dstState, dst_path))
+			{
+				Error("cross hierarchy event implemented, not fully debugged");
+				RemoveCommonParents(src_path, dst_path);
+
+				for (int ex = 0; ex < src_path.Count(); ++ex)
+				{
+					src_path[ex].OnExit(e); // 1) call OnExit on all nodes on src_path ()
+				}
+
+				//if (t.m_action)
+				//	t.m_action.Action(e);	// 2) execute transition action (if any)
+
+				//m_State = t.m_dstState; // 4) change state to new
+				
+				//for (int en = dst_path.Count(); en --> 0;)
+				for (int en = 0; en < dst_path.Count(); ++en)
+				{
+					int ii = dst_path.Count() - 1 - en;
+					dst_path[ii].OnEntry(e);	// 5) call OnEntry on all nodes on dst_path (@NOTE: reverse order)
+				}
+
+				fsmDebugPrint("[hfsm] } " + this.ToString() + "::HierarchicTransition(" + e.Type().ToString() + ") --> OK");
+				return ProcessEventResult.FSM_OK;
+			}
+			else
+			{
+				Error("unhandled case, what did you do?");
+			}
+		}
+
+		fsmDebugPrint("[hfsm] } " + this.ToString() + "::HierarchicTransition(" + e.Type().ToString() + ") --> no transition");
+		return ProcessEventResult.FSM_NO_TRANSITION;
+	}
+*/
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/BuildingInventory.c b/scripts/3_Game/DayZ/Systems/Inventory/BuildingInventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..90ab5572b2ffe16805a583314767f196f5df0e37
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/BuildingInventory.c
@@ -0,0 +1,10 @@
+/**@class		BuildingInventory
+ * @brief		inventory for buildings (also called "proxy cargo")
+ **/
+class BuildingInventory : GameInventory
+{
+	//proto native bool HasProxyCargo();
+	//proto native int GetProxyCargoCount();
+	//proto native Cargo GetProxyCargo(int cargoIndex);
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Cargo.c b/scripts/3_Game/DayZ/Systems/Inventory/Cargo.c
new file mode 100644
index 0000000000000000000000000000000000000000..e91565426742d139cc84dd6076cc79812961c038
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Cargo.c
@@ -0,0 +1,176 @@
+/**@class	CargoBase
+ * @brief	represents base for cargo storage for entities
+ *
+ * @NOTE: rows == y axis
+ **/
+class CargoBase : Managed
+{
+	/**@fn			GetCargoOwner
+	 * @brief		get the entity that owns the cargo
+	 * @return		cargo owner
+	 **/
+	proto native EntityAI GetCargoOwner ();
+
+	/**@fn			GetCargoOwnerIndex
+	 * @brief		get index of this cargo in the entity that owns the cargo
+	 * @return		owner's index of this cargo
+	 **/
+	proto native int GetOwnerCargoIndex ();
+
+	/**@fn			IsProxyCargo
+	 * @return		true if cargo is in proxy object
+	 **/	
+	proto native bool IsProxyCargo ();
+	
+	/**@fn			GetItemCount
+	 * @return		number of items in cargo
+	 **/
+	proto native int GetItemCount ();
+	/**@fn			GetItem
+	 * @return		get item at specific index
+	 **/
+	proto native EntityAI GetItem (int index);
+
+	/**@fn			GetWidth
+	 * @return		width of the cargo
+	 **/
+	proto native int GetWidth ();
+	/**@fn			GetHeight
+	 * @return		height of the cargo
+	 **/
+	proto native int GetHeight ();
+	/**@fn			GetItemRowCol
+	 * @param[out]	row			returned row of the item at internal index
+	 * @param[out]	col			returned col. 0 on xbox
+	 **/
+	proto bool GetItemRowCol (int index, out int row, out int col);
+	/**@fn			GetItemSize
+	 * @param[out]	w			returned width of the item at internal index
+	 * @param[out]	h			returned height of the item at internal index
+	 **/
+	proto bool GetItemSize (int index, out int w, out int h);
+
+	/**@fn			FindEntityInCargo
+	 * @return		find internal index of the entity in cargo or -1 if not found
+	 **/
+	proto native int FindEntityInCargo (notnull EntityAI e);
+
+	private void CargoBase ();
+	private void ~CargoBase ();
+	
+	/**@fn			CanReceiveItemIntoCargo
+	 * @brief		condition EntityAI::CanReceiveItemIntoCargo for Cargo.
+	 * @return		true if cargo can be added, false otherwise
+	 **/
+	bool CanReceiveItemIntoCargo (EntityAI item) { return true; }
+
+	/**@fn			CanSwapItemInCargo
+	 * @brief		condition EntityAI::CanSwapItemInCargo for Cargo.
+	 * @return		true if cargo can be added, false otherwise
+	 **/
+	bool CanSwapItemInCargo (EntityAI child_entity, EntityAI new_entity) { return true; }
+	
+	proto native int GetUserReservedLocationCount ();
+	/**@fn			GetUserReservedLocation
+	 * @param[in]	idx			index of the user reserved location
+	 * @param[out]	eai			returned entity of the user reservation at internal index
+	 * @param[out]	row			returned row of the user reservation at internal index
+	 * @param[out]	col			returned col
+	 * @param[out]	w			returned width of the user reservation at internal index
+	 * @param[out]	h			returned height of the user reservation at internal index
+	 * @param[out]	flp			returned flip
+	 * @return		true if record found, false otherwise
+	 **/
+	proto bool GetUserReservedLocation (int index, out EntityAI eai, out int row, out int col, out int w, out int h, out int flp);
+	proto native void SetUserReservedLocation (notnull EntityAI eai);
+	proto native void ClearUserReservedLocation (notnull EntityAI eai);
+};
+
+
+#ifdef PLATFORM_CONSOLE
+	class CargoList : CargoBase
+	{
+		/**@fn			GetMaxWeight
+		 * @return		maximum weight that the cargo can hold
+		 **/
+		proto native int GetMaxWeight ();
+	
+		/**@fn			GetTotalWeight
+		 * @brief		sums weight of all items in cargo and adds weight of item if item != null
+		 * @return		sum of weights plus weight of item (if !null)
+		 **/
+		proto native int GetTotalWeight (EntityAI item);
+
+		/**@fn			CanFitItemIntoCargo
+		 * @return		true if adding item does not exceed GetMaxWeight, false otherwise
+		 **/		
+		proto native bool CanFitItemIntoCargo (EntityAI cargo);
+	
+		/**@fn			CanReceiveItemIntoCargo
+		 * @return		true if adding item does not exceed GetMaxWeight, false otherwise
+		 **/
+		override bool CanReceiveItemIntoCargo (EntityAI item)
+		{
+			return true;
+			//return CanFitItemIntoCargo(item);
+		}
+	
+		/**@fn			CanFitSwappedItemInCargo
+		 * @return		true if swapping item does not exceed GetMaxWeight, false otherwise
+		 **/		
+		proto native bool CanFitSwappedItemInCargo (EntityAI child_entity, EntityAI new_entity);
+	
+		override bool CanSwapItemInCargo (EntityAI child_entity, EntityAI new_entity)
+		{
+			return CanFitSwappedItemInCargo(child_entity, new_entity);
+		}
+	};
+#else
+#ifdef SERVER_FOR_CONSOLE
+	class CargoList : CargoBase
+	{
+		/**@fn			GetMaxWeight
+		 * @return		maximum weight that the cargo can hold
+		 **/
+		proto native int GetMaxWeight ();
+	
+		/**@fn			GetTotalWeight
+		 * @brief		sums weight of all items in cargo and adds weight of item if item != null
+		 * @return		sum of weights plus weight of item (if !null)
+		 **/
+		proto native int GetTotalWeight (EntityAI item);
+
+		/**@fn			CanFitItemIntoCargo
+		 * @return		true if adding item does not exceed GetMaxWeight, false otherwise
+		 **/		
+		proto native bool CanFitItemIntoCargo (EntityAI cargo);
+	
+		/**@fn			CanReceiveItemIntoCargo
+		 * @return		true if adding item does not exceed GetMaxWeight, false otherwise
+		 **/
+		override bool CanReceiveItemIntoCargo (EntityAI item)
+		{
+			return true; 
+			//return CanFitItemIntoCargo(item);
+		}
+	
+		/**@fn			CanFitSwappedItemInCargo
+		 * @return		true if swapping item does not exceed GetMaxWeight, false otherwise
+		 **/		
+		proto native bool CanFitSwappedItemInCargo (EntityAI child_entity, EntityAI new_entity);
+	
+		override bool CanSwapItemInCargo (EntityAI child_entity, EntityAI new_entity)
+		{
+			return CanFitSwappedItemInCargo(child_entity, new_entity);
+		}
+	};
+#else
+	class CargoGrid : CargoBase
+	{
+		/**@fn			FindEntityInCargoOn
+		 * @return		get item at coordinates (row, col). col is 0 on xbox.
+		 **/
+		proto native EntityAI FindEntityInCargoOn (int row, int col);
+	};
+#endif
+#endif
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Debug.c b/scripts/3_Game/DayZ/Systems/Inventory/Debug.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c3132ba8ed6aedc537b6b885082cd78a6bb98f1
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Debug.c
@@ -0,0 +1,26 @@
+void syncDebugPrint (string s)
+{
+#ifdef INV_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+void actionDebugPrint (string s)
+{
+#ifdef INV_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+void inventoryDebugPrint (string s)
+{
+#ifdef INV_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedForceSwapping.c b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedForceSwapping.c
new file mode 100644
index 0000000000000000000000000000000000000000..a6ec451224ee151dee34465fb02f1955a3868474
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedForceSwapping.c
@@ -0,0 +1,363 @@
+// When editing this, take a look at HandAnimatedMoveToDst_W4T_Basic as well
+// They can not be inherited from each other because of different inheritance
+class HandAnimatedMoveToDst_W4T_Basic extends HandStateBase
+{
+	ref InventoryLocation m_Dst;
+
+	override void OnEntry(HandEventBase e)
+	{
+		Man player = e.m_Player;
+		if (m_Dst && m_Dst.IsValid())
+		{
+			EntityAI item = m_Dst.GetItem();
+			InventoryLocation src = new InventoryLocation;
+			if (item.GetInventory().GetCurrentInventoryLocation(src))
+			{
+				if (GameInventory.LocationCanMoveEntity(src, m_Dst))
+				{
+					GameInventory.LocationSyncMoveEntity(src, m_Dst);
+					player.OnItemInHandsChanged();
+				}
+				else
+				{
+					#ifdef DEVELOPER
+					if ( LogManager.IsInventoryHFSMLogEnable() )
+					{	
+						Debug.InventoryHFSMLog("[hndfsm] HandAnimatedMoveToDst_W4T_Basic - not allowed");
+					}
+					#endif
+				}
+			}
+			else
+				Error("[hndfsm] " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " HandAnimatedMoveToDst_W4T_Basic - item " + item + " has no Inventory or Location, inv=" + item.GetInventory());
+		}
+		else
+			Error("[hndfsm] HandAnimatedMoveToDst_W4T_Basic - event has no valid m_Dst");
+
+		super.OnEntry(e);
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		m_Dst = null;
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		m_Dst = null;
+		super.OnExit(e);
+	}
+
+	override bool IsWaitingForActionFinish() { return true; }
+};
+
+class HandForceSwappingAnimated_Show extends HandStartAction
+{
+	ref InventoryLocation m_Src1 = null;
+	ref InventoryLocation m_Src2 = null;
+	ref InventoryLocation m_Dst1 = null;
+	ref InventoryLocation m_Dst2 = null;
+
+	void HandForceSwapingAnimated_Show(Man player = null, HandStateBase parent = null, WeaponActions action = WeaponActions.NONE, int actionType = -1) { }
+
+	override void OnEntry(HandEventBase e)
+	{
+		if (m_Src1 && m_Src2 && m_Dst1 && m_Dst2)
+		{
+			//InventoryLocation dummy;
+			//dummy.Copy(m_Dst2);			
+			//if (GameInventory.CanForceSwapEntitiesEx(m_Src1.GetItem(), m_Dst1, m_Src2.GetItem(), dummy) && dummy == m_Dst2)
+			//{
+
+				//! TODO(kumarjac): THIS IS WHAT IS BEING CALLED FOR SOME REASON!!!!!
+
+				GameInventory.LocationSwap(m_Src1, m_Src2, m_Dst1, m_Dst2);
+				e.m_Player.OnItemInHandsChanged();
+			//}
+			//else
+			//{
+			//	if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] HandForceSwapingAnimated_Show - not allowed");
+			//}
+		}
+		else
+			Error("[hndfsm] HandForceSwappingAnimated_Show is not properly configured!");
+
+		super.OnEntry(e);
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+		super.OnExit(e);
+	}
+
+	override bool IsWaitingForActionFinish() { return true; }
+};
+
+
+class HandAnimatedForceSwapping extends HandStateBase
+{
+	ref InventoryLocation m_Src1 = null;
+	ref InventoryLocation m_Src2 = null;
+	ref InventoryLocation m_Dst1 = null;
+	ref InventoryLocation m_Dst2 = null;
+
+	ref HandStartHidingAnimated m_Start;
+	ref HandAnimatedMoveToDst_W4T m_Show;
+	ref HandAnimatedMoveToDst_W4T_Basic m_Hide;
+
+	void HandAnimatedForceSwapping(Man player = null, HandStateBase parent = null)
+	{
+		// setup nested state machine
+		m_Start = new HandStartHidingAnimated(player, this, WeaponActions.HIDE, -1);
+		m_Show = new HandAnimatedMoveToDst_W4T(player, this, WeaponActions.SHOW, -1);
+		m_Hide = new HandAnimatedMoveToDst_W4T_Basic(player, this);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _AEh_ = new HandAnimEventChanged;
+		HandEventBase __Xd_ = new HandEventDestroyed;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Start,		_AEh_,	m_Hide ));
+		m_FSM.AddTransition(new HandTransition(   m_Hide,		_AEh_,	m_Show )); // no animation in Hide step
+		m_FSM.AddTransition(new HandTransition(   m_Show,		_fin_,	null ));
+		m_FSM.AddTransition(new HandTransition(   m_Hide,		_fin_,	null ));
+		m_FSM.AddTransition(new HandTransition(   m_Show,		__Xd_,	null ));
+		m_FSM.AddTransition(new HandTransition(   m_Hide,		__Xd_,	null ));
+
+		m_FSM.SetInitialState(m_Start);
+	}
+
+	override void OnEntry(HandEventBase e)
+	{		
+		HandEventForceSwap efs = HandEventForceSwap.Cast(e);
+		if (efs)
+		{
+			if ( efs.GetSrc().GetType() == InventoryLocationType.HANDS )
+			{
+				m_Start.m_ActionType = efs.m_AnimationID;
+			
+				m_Src1 = efs.GetSrc();
+				m_Src2 = efs.m_Src2;
+				m_Dst1 = efs.GetDst();
+				m_Dst2 = efs.m_Dst2;
+			
+				m_Show.m_ActionType = efs.m_Animation2ID;
+			}
+			else
+			{
+				m_Start.m_ActionType = efs.m_Animation2ID;
+			
+				m_Src1 = efs.m_Src2;
+				m_Src2 = efs.GetSrc();
+				m_Dst1 = efs.m_Dst2;
+				m_Dst2 = efs.GetDst();
+			
+				m_Show.m_ActionType = efs.m_AnimationID;
+			}
+			
+			m_Hide.m_Dst = m_Dst1;
+			m_Show.m_Dst = m_Dst2;
+
+			if (!GetGame().IsDedicatedServer())
+			{
+				e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst1.GetItem(), m_Dst1, GameInventory.c_InventoryReservationTimeoutShortMS);
+				e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst2.GetItem(), m_Dst2, GameInventory.c_InventoryReservationTimeoutShortMS);
+			}
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			if (m_Dst1)
+			{
+				e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst1.GetItem(), m_Dst1);
+				e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+			}
+		}
+		else
+		{
+			if (m_Dst1)
+			{
+				GetGame().ClearJuncture(e.m_Player, m_Dst1.GetItem());
+				GetGame().ClearJuncture(e.m_Player, m_Dst2.GetItem());
+			}
+		}
+		
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+		
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst1.GetItem(), m_Dst1);
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+		}
+		else
+		{
+			GetGame().ClearJuncture(e.m_Player, m_Dst1.GetItem());
+			GetGame().ClearJuncture(e.m_Player, m_Dst2.GetItem());
+		}
+		
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+
+		super.OnExit(e);
+	}
+};
+
+class HandAnimatedForceSwapping_Inst extends HandStateBase
+{
+	ref InventoryLocation m_Src1 = null;
+	ref InventoryLocation m_Src2 = null;
+	ref InventoryLocation m_Dst1 = null;
+	ref InventoryLocation m_Dst2 = null;
+
+	ref HandStartHidingAnimated m_Start;
+	ref HandForceSwappingAnimated_Show m_Swap;
+
+	void HandAnimatedForceSwapping_Inst(Man player = null, HandStateBase parent = null)
+	{
+		// setup nested state machine
+		m_Start = new HandStartHidingAnimated(player, this, WeaponActions.HIDE, -1);
+		m_Swap = new HandForceSwappingAnimated_Show(player, this, WeaponActions.SHOW, -1);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _AEh_ = new HandAnimEventChanged;
+		HandEventBase __Xd_ = new HandEventDestroyed;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Start,	_AEh_,	m_Swap ));
+		m_FSM.AddTransition(new HandTransition(   m_Swap,	_fin_,	null ));
+		m_FSM.AddTransition(new HandTransition(   m_Swap,	__Xd_,	null ));
+
+		m_FSM.SetInitialState(m_Start);
+	}
+
+	override void OnEntry(HandEventBase e)
+	{		
+		HandEventForceSwap efs = HandEventForceSwap.Cast(e);
+		if (efs)
+		{
+			if ( efs.GetSrc().GetType() == InventoryLocationType.HANDS )
+			{
+				m_Start.m_ActionType = efs.m_AnimationID;
+			
+				m_Src1 = efs.GetSrc();
+				m_Src2 = efs.m_Src2;
+				m_Dst1 = efs.GetDst();
+				m_Dst2 = efs.m_Dst2;
+
+				m_Swap.m_ActionType = efs.m_Animation2ID;
+			}
+			else
+			{
+				m_Start.m_ActionType = efs.m_Animation2ID;
+			
+				m_Src1 = efs.m_Src2;
+				m_Src2 = efs.GetSrc();
+				m_Dst1 = efs.m_Dst2;
+				m_Dst2 = efs.GetDst();
+
+				m_Swap.m_ActionType = efs.m_AnimationID;				
+			}
+			
+			m_Swap.m_Src1 = m_Src1;
+			m_Swap.m_Dst1 = m_Dst1;
+			m_Swap.m_Src2 = m_Src2;
+			m_Swap.m_Dst2 = m_Dst2;
+			
+			if (!GetGame().IsDedicatedServer())
+			{
+				e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst1.GetItem(), m_Dst1, GameInventory.c_InventoryReservationTimeoutShortMS);
+				e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst2.GetItem(), m_Dst2, GameInventory.c_InventoryReservationTimeoutShortMS);
+			}
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+			if ( !GetGame().IsDedicatedServer())
+			{
+				if (m_Dst1)
+				{
+					e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst1.GetItem(), m_Dst1);
+				}
+				if (m_Dst2)
+				{
+					e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+				}
+			}
+			else
+			{
+				if (m_Dst1)
+				{
+					GetGame().ClearJuncture(e.m_Player, m_Dst1.GetItem());
+				}
+				if (m_Dst2)
+				{
+					GetGame().ClearJuncture(e.m_Player, m_Dst2.GetItem());
+				}			
+			}
+		
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+		
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst1.GetItem(), m_Dst1);
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+		}
+		else
+		{
+			GetGame().ClearJuncture(e.m_Player, m_Dst1.GetItem());
+			GetGame().ClearJuncture(e.m_Player, m_Dst2.GetItem());
+		}
+		
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+
+		super.OnExit(e);
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedMovingToAtt.c b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedMovingToAtt.c
new file mode 100644
index 0000000000000000000000000000000000000000..10011e7ba543856e44a7b67372678a6c88d321bc
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedMovingToAtt.c
@@ -0,0 +1,154 @@
+class HandStartHidingAnimated extends HandStartAction
+{
+	void HandStartHidingAnimated(Man player = null, HandStateBase parent = null, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{ }
+
+	override void OnEntry(HandEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		super.OnExit(e);
+	}
+	
+	override bool IsWaitingForActionFinish() { return m_ActionType == -1; }
+};
+
+// When editing this, take a look at HandAnimatedMoveToDst_W4T_Basic as well
+// They can not be inherited from each other because of different inheritance
+class HandAnimatedMoveToDst_W4T extends HandStartAction
+{
+	ref InventoryLocation m_Dst;
+
+	override void OnEntry(HandEventBase e)
+	{
+		Man player = e.m_Player;
+		if (m_Dst && m_Dst.IsValid())
+		{
+			EntityAI item = m_Dst.GetItem();
+			InventoryLocation src = new InventoryLocation;
+			if (item.GetInventory().GetCurrentInventoryLocation(src))
+			{
+				if (GameInventory.LocationCanMoveEntity(src, m_Dst))
+				{
+					GameInventory.LocationSyncMoveEntity(src, m_Dst);
+					player.OnItemInHandsChanged();
+				}
+				else
+				{
+					#ifdef DEVELOPER
+					if ( LogManager.IsInventoryHFSMLogEnable() )
+					{	
+						Debug.InventoryHFSMLog("[hndfsm] HandAnimatedMoveToDst_W4T - not allowed");
+					}
+					#endif
+				}
+			}
+			else
+				Error("[hndfsm] " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " HandAnimatedMoveToDst_W4T - item " + item + " has no Inventory or Location, inv=" + item.GetInventory());
+		}
+		else
+			Error("[hndfsm] HandAnimatedMoveToDst_W4T - event has no valid m_Dst");
+
+		super.OnEntry(e);
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		m_Dst = null;
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		m_Dst = null;
+		super.OnExit(e);
+	}
+
+	override bool IsWaitingForActionFinish() { return true; }
+};
+
+class HandAnimatedMovingToAtt extends HandStateBase
+{
+	EntityAI m_Entity; /// weapon to be taken
+
+	ref HandStartHidingAnimated m_Hide;
+	ref HandAnimatedMoveToDst_W4T m_Show;
+	
+	ref InventoryLocation m_ilEntity;
+
+	void HandAnimatedMovingToAtt(Man player = null, HandStateBase parent = null)
+	{
+		// setup nested state machine
+		m_Hide = new HandStartHidingAnimated(player, this, WeaponActions.HIDE, -1);
+		m_Show = new HandAnimatedMoveToDst_W4T(player, this, WeaponActions.SHOW, -1);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _AEh_ = new HandAnimEventChanged;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Hide, _AEh_,   m_Show ));
+		m_FSM.AddTransition(new HandTransition(   m_Show, _fin_,     null ));
+		
+		m_FSM.SetInitialState(m_Hide);
+	}
+
+	override void OnEntry(HandEventBase e)
+	{
+		m_Entity = e.GetSrcEntity();
+		HandEventMoveTo ev_move = HandEventMoveTo.Cast(e);
+		if (ev_move)
+		{
+			m_Show.m_Dst = ev_move.GetDst();
+			m_Hide.m_ActionType = ev_move.GetAnimationID();
+			m_Show.m_ActionType = ev_move.GetAnimationID();
+			
+			m_ilEntity = m_Show.m_Dst;
+			
+			e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Entity, m_ilEntity, GameInventory.c_InventoryReservationTimeoutShortMS);
+		}
+		
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Entity, m_ilEntity);
+		}
+		else
+		{
+			GetGame().ClearJunctureEx(e.m_Player, m_Entity);
+		}
+		
+		m_Entity = null;
+		m_ilEntity = null;
+		
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Entity, m_ilEntity);
+		}
+		
+		m_Entity = null;
+		m_ilEntity = null;
+		
+		super.OnExit(e);
+	}
+};
+
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedSwapping.c b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedSwapping.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c08c99b6dc62e53ffb7ef5c6bc372f2f7f0b8e5
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedSwapping.c
@@ -0,0 +1,111 @@
+class HandSwappingAnimated_Show extends HandForceSwappingAnimated_Show
+{
+};
+
+
+class HandAnimatedSwapping extends HandStateBase
+{
+	ref InventoryLocation m_Src1 = null;
+	ref InventoryLocation m_Src2 = null;
+	ref InventoryLocation m_Dst1 = null;
+	ref InventoryLocation m_Dst2 = null;
+
+	ref HandStartHidingAnimated m_Hide;
+	ref HandSwappingAnimated_Show m_Show;
+
+	void HandAnimatedSwapping(Man player = null, HandStateBase parent = null)
+	{
+		// setup nested state machine
+		m_Hide = new HandStartHidingAnimated(player, this, WeaponActions.HIDE, -1);
+		m_Show = new HandSwappingAnimated_Show(player, this, WeaponActions.SHOW, -1);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _AEh_ = new HandAnimEventChanged;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Hide, _AEh_,   m_Show ));
+		m_FSM.AddTransition(new HandTransition(   m_Show, _fin_,     null ));
+
+		m_FSM.SetInitialState(m_Hide);
+	}
+
+	override void OnEntry(HandEventBase e)
+	{
+		HandEventSwap es = HandEventSwap.Cast(e);
+		if (es)
+		{
+			m_Src1 = es.GetSrc();
+			m_Src2 = es.m_Src2;
+			m_Dst1 = es.GetDst();
+			m_Dst2 = es.m_Dst2;
+
+			m_Show.m_Src1 = m_Src1;
+			m_Show.m_Src2 = m_Src2;
+			m_Show.m_Dst1 = m_Dst1;
+			m_Show.m_Dst2 = m_Dst2;
+
+			m_Hide.m_ActionType = es.m_AnimationID;
+			m_Show.m_ActionType = es.m_Animation2ID;
+			
+			if (!GetGame().IsDedicatedServer())
+			{
+				e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst2.GetItem(), m_Dst2, GameInventory.c_InventoryReservationTimeoutShortMS);
+				e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst1.GetItem(), m_Dst1, GameInventory.c_InventoryReservationTimeoutShortMS);
+			}
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			if (m_Dst2)
+			{
+				e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+			}
+			if (m_Dst1)
+			{
+				e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst1.GetItem(), m_Dst1);
+			}
+		}
+		else
+		{
+			if (m_Dst2)
+			{
+				GetGame().ClearJuncture(e.m_Player, m_Dst2.GetItem());
+			}
+			if (m_Dst1)
+			{
+				GetGame().ClearJuncture(e.m_Player, m_Dst1.GetItem());
+			}
+		}
+		
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		if ( !GetGame().IsDedicatedServer())
+		{
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst1.GetItem(), m_Dst1);		
+		}
+		
+		m_Src1 = null;
+		m_Src2 = null;
+		m_Dst1 = null;
+		m_Dst2 = null;
+
+		super.OnExit(e);
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedTakingFromAtt.c b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedTakingFromAtt.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4a8d79fd9ad05899efb1af1ab3aa140f0e28832
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimatedTakingFromAtt.c
@@ -0,0 +1,136 @@
+class HandTakingAnimated_Hide extends HandStartAction
+{ };
+
+class HandTakingAnimated_Show extends HandStartAction
+{
+	ref InventoryLocation m_Src;
+	ref InventoryLocation m_Dst;
+
+	void HandTakingAnimated_Show(Man player = null, HandStateBase parent = null, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_Src = null;
+		m_Dst = null;
+	}
+
+	override void OnEntry(HandEventBase e)
+	{
+		super.OnEntry(e);
+
+		if (m_Src)
+		{
+			if (m_Src.IsValid())
+			{
+				#ifdef DEVELOPER
+				if ( LogManager.IsInventoryHFSMLogEnable() )
+				{	
+					Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "OnEntry", e.m_Player.ToString() );
+				}
+				#endif
+				
+				//if (GameInventory.LocationCanMoveEntity(m_Src, m_Dst))
+				//{
+					GameInventory.LocationSyncMoveEntity(m_Src, m_Dst);
+					e.m_Player.OnItemInHandsChanged();
+				//}
+				//else
+				//{
+				//	if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] HandTakingAnimated_Show - not allowed");
+				//}
+			}
+			else
+			{
+				Error("[hndfsm] " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " HandTakingAnimated_Show m_Src=invalid, item not in bubble?");
+			}
+		}
+		else
+			Error("[hndfsm] HandTakingAnimated_Show, error - m_Src not configured");
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		m_Src = null;
+		m_Dst = null;
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		m_Src = null;
+		m_Dst = null;
+		super.OnExit(e);
+	}
+
+	override bool IsWaitingForActionFinish() { return true; }
+};
+
+
+class HandAnimatedTakingFromAtt extends HandStateBase
+{
+	ref HandTakingAnimated_Hide m_Hide;
+	ref HandTakingAnimated_Show m_Show;
+	
+	ref InventoryLocation m_Dst;
+
+	void HandAnimatedTakingFromAtt(Man player = null, HandStateBase parent = null)
+	{
+		// setup nested state machine
+		m_Hide = new HandTakingAnimated_Hide(player, this, WeaponActions.HIDE, -1);
+		m_Show = new HandTakingAnimated_Show(player, this, WeaponActions.SHOW, -1);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _AEh_ = new HandAnimEventChanged;
+		HandEventBase __Xd_ = new HandEventDestroyed;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Hide, _AEh_,   m_Show ));
+		m_FSM.AddTransition(new HandTransition(   m_Hide, __Xd_,     null ));
+		m_FSM.AddTransition(new HandTransition(   m_Show, _fin_,     null ));
+		m_FSM.AddTransition(new HandTransition(   m_Show, __Xd_,     null ));
+		
+		m_FSM.SetInitialState(m_Hide);
+	}
+
+	override void OnEntry(HandEventBase e)
+	{
+		m_Dst = e.GetDst();
+		m_Show.m_Src = e.GetSrc();
+		m_Show.m_Dst = e.GetDst();
+
+		m_Hide.m_ActionType = e.GetAnimationID();
+		m_Show.m_ActionType = e.GetAnimationID();
+			
+		e.m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst.GetItem(), m_Dst, GameInventory.c_InventoryReservationTimeoutShortMS);
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort(HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "OnAbort", e.m_Player.ToString() );
+		}
+		#endif
+		if (m_Dst)
+		{
+			e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst.GetItem(), m_Dst);
+			if ( GetGame().IsServer() )
+				GetGame().ClearJuncture(e.m_Player, m_Dst.GetItem());
+		}
+		m_Dst = null;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit(HandEventBase e)
+	{
+		e.m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst.GetItem(), m_Dst);
+		m_Dst = null;
+
+		super.OnExit(e);
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandAnimated_Guards.c b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimated_Guards.c
new file mode 100644
index 0000000000000000000000000000000000000000..a960aa5de4b5794ffeb54518737d66ea664a9e80
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandAnimated_Guards.c
@@ -0,0 +1,340 @@
+int SlotToAnimType(notnull Man player, notnull InventoryLocation src, InventoryLocation dst = null)
+{
+	//Print("src.GetType() " + src.GetType());
+	InventoryLocation invloc1 = new InventoryLocation;
+	//InventoryLocation invloc2 = new InventoryLocation;
+	
+	if ( (dst && dst.GetParent() && !dst.GetParent().GetHierarchyRootPlayer()) || (src && src.GetParent() && !src.GetParent().GetHierarchyRootPlayer()) )
+		return -1;
+	
+	if (dst && (dst.GetType() == InventoryLocationType.ATTACHMENT || dst.GetType() == InventoryLocationType.CARGO))
+	{
+		invloc1.Copy(dst);
+		//invloc2.Copy(src);
+	}
+	else if (src.GetType() == InventoryLocationType.ATTACHMENT || src.GetType() == InventoryLocationType.CARGO)
+	{
+		invloc1.Copy(src);
+		//invloc2.Copy(dst);
+	}
+	else
+	{
+		return -1;
+	}
+	
+	int val = -1;
+	if ( invloc1.GetItem() && invloc1.GetItem().GetInventoryHandAnimation(invloc1,val) )
+	{
+		return val;
+	}
+	
+	if (invloc1.GetType() == InventoryLocationType.ATTACHMENT /*|| src.GetType() == InventoryLocationType.HANDS*/)
+	{
+		//return WeaponHideShowTypes.HIDESHOW_SLOT_KNIFEBACK;
+		switch (invloc1.GetSlot())
+		{
+			case InventorySlots.SHOULDER:
+			{
+				if (invloc1.GetItem() && invloc1.GetItem().IsWeapon())
+				{
+					return WeaponHideShowTypes.HIDESHOW_SLOT_RFLLEFTBACK;
+				}
+				else if (invloc1.GetItem() && invloc1.GetItem().IsOneHandedBehaviour())
+				{
+					return WeaponHideShowTypes.HIDESHOW_SLOT_1HDLEFTBACK;
+				}
+				return WeaponHideShowTypes.HIDESHOW_SLOT_2HDLEFTBACK;
+			}
+			case InventorySlots.MELEE:
+			{
+				if (invloc1.GetItem() && invloc1.GetItem().IsWeapon())
+				{
+					return WeaponHideShowTypes.HIDESHOW_SLOT_RFLRIGHTBACK;
+				}
+				else if (invloc1.GetItem() && invloc1.GetItem().IsOneHandedBehaviour())
+				{
+					return WeaponHideShowTypes.HIDESHOW_SLOT_1HDRIGHTBACK;
+				}
+				return WeaponHideShowTypes.HIDESHOW_SLOT_2HDRIGHTBACK;
+			}
+			case InventorySlots.PISTOL:
+			{
+				EntityAI parent_item = invloc1.GetParent(); 		// belt
+				Man owner;
+				if (parent_item)
+					owner = parent_item.GetHierarchyRootPlayer(); 		// player
+				if (!owner)
+					return -1;
+				
+				EntityAI item1 = owner.GetInventory().FindAttachment(InventorySlots.HIPS);
+				EntityAI item2 = parent_item.GetHierarchyParent();
+				if (owner && item1 == item2) // is the pistol in a belt holster?
+				{
+					return WeaponHideShowTypes.HIDESHOW_SLOT_PISTOLBELT;
+				}
+				return WeaponHideShowTypes.HIDESHOW_SLOT_PISTOLCHEST;
+			}
+			case InventorySlots.KNIFE:
+				return WeaponHideShowTypes.HIDESHOW_SLOT_KNIFEBACK;
+			
+			/*case InventorySlots.VEST:
+			case InventorySlots.FEET:
+			case InventorySlots.BODY:
+			case InventorySlots.LEGS:
+			case InventorySlots.BACK:
+			case InventorySlots.HIPS:
+			case InventorySlots.HEADGEAR:
+				return WeaponHideShowTypes.HIDESHOW_SLOT_INVENTORY;*/
+			
+			default:
+				return WeaponHideShowTypes.HIDESHOW_SLOT_INVENTORY;
+				//Print("[hndfsm] SlotToAnimType -  not animated slot in src_loc=" + InventoryLocation.DumpToStringNullSafe(invloc1));
+		};
+		//
+		//if (InventorySlots.GetSlotIdFromString("Pistol"))
+	}
+	else if (invloc1.GetType() == InventoryLocationType.CARGO)
+	{
+		if ( invloc1.GetItem() && (invloc1.GetItem().GetInventory().HasInventorySlot(InventorySlots.SHOULDER) || invloc1.GetItem().GetInventory().HasInventorySlot(InventorySlots.MELEE)) )
+		{
+			//Print("Special inventory anim");
+			if (invloc1.GetItem() && invloc1.GetItem().IsWeapon())
+			{
+				return WeaponHideShowTypes.HIDESHOW_SLOT_RFLRIGHTBACK;
+			}
+			else if (invloc1.GetItem() && invloc1.GetItem().IsOneHandedBehaviour())
+			{
+				return WeaponHideShowTypes.HIDESHOW_SLOT_1HDRIGHTBACK;
+			}
+			return WeaponHideShowTypes.HIDESHOW_SLOT_2HDRIGHTBACK;
+		}
+		//Print("Default inventory anim");
+		return WeaponHideShowTypes.HIDESHOW_SLOT_INVENTORY; //default item animation
+	}
+	return -1;
+}
+
+bool SelectAnimationOfTakeToHands(notnull Man player, notnull InventoryLocation src, notnull InventoryLocation dst, out int animType)
+{
+	if (player.IsInTransport())
+		return false;
+	if (src.GetType() == InventoryLocationType.GROUND)
+		return false;
+
+	if (src.GetItem().GetHierarchyRootPlayer() == player)
+	{	
+		animType = SlotToAnimType(player, src);
+		if (animType != -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SelectAnimationOfTakeToHands - selected animType=" + animType + " for item=" + src.GetItem());
+			return true;
+		}
+	}
+	if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SelectAnimationOfTakeToHands - no animation");
+	return false;
+}
+
+bool SelectAnimationOfMoveFromHands(notnull Man player, notnull InventoryLocation src, notnull InventoryLocation dst, out int animType)
+{
+	if (player.IsInTransport())
+		return false;
+
+	if (src.GetItem().GetHierarchyRootPlayer() == player)
+	{	
+		animType = SlotToAnimType(player, dst);
+		if (animType != -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SelectAnimationOfMoveFromHands guard - selected animType=" + animType + " for item=" + src.GetItem());
+			return true;
+		}
+	}
+	if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SelectAnimationOfMoveFromHands - no animation");
+	return false;
+}
+
+bool SelectAnimationOfForceSwapInHands(notnull Man player, notnull InventoryLocation old_src, notnull InventoryLocation new_src, notnull InventoryLocation old_dst, notnull InventoryLocation new_dst, out int animType1, out int animType2)
+{
+	if (player.IsInTransport())
+		return false;
+	
+	if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SlotToAnimType - old_src=" + InventoryLocation.DumpToStringNullSafe(old_src) + " new_src=" + InventoryLocation.DumpToStringNullSafe(new_src) + " old_dst=" + InventoryLocation.DumpToStringNullSafe(old_dst) + " new_dst=" + InventoryLocation.DumpToStringNullSafe(new_dst));
+
+	if (old_src.GetItem().GetHierarchyRootPlayer() == player || new_src.GetItem().GetHierarchyRootPlayer() == player)
+	{
+		animType1 = SlotToAnimType(player, old_src, old_dst);
+		animType2 = SlotToAnimType(player, new_src, new_dst);
+		//Print("animType1 = " + animType1);
+		//Print("animType2 = " + animType2);
+		if (animType1 != -1 && animType2 != -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SelectAnimationOfForceSwapInHands guard - selected animType1=" + animType1 + " animType2=" + animType2 + " for old_item=" + old_src.GetItem() + " for new_item=" + new_src.GetItem());
+			return true;
+		}
+		/*else if (animType1 != -1 || animType2 != -1) //HACK
+		{
+			animType1 = -1;
+			animType2 = -1;
+			return false;
+		}*/
+	}
+	if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] SelectAnimationOfForceSwapInHands - no animation");
+	return false;
+}
+
+
+class HandSelectAnimationOfTakeToHandsEvent extends HandGuardBase
+{
+	void HandSelectAnimationOfTakeToHandsEvent(Man p = null) { }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		int animType = -1;
+		if (SelectAnimationOfTakeToHands(e.m_Player, e.GetSrc(), e.GetDst(), animType))
+		{
+			e.m_AnimationID = animType;
+			return true;
+		}
+		return false;
+	}
+};
+
+class HandSelectAnimationOfMoveFromHandsEvent extends HandGuardBase
+{
+	protected Man m_Player;
+
+	void HandSelectAnimationOfMoveFromHandsEvent(Man p = null)
+	{
+		m_Player = p; 
+	}
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		EntityAI eai = m_Player.GetHumanInventory().GetEntityInHands();
+		if (eai)
+		{
+			InventoryLocation src = new InventoryLocation;
+			if (eai.GetInventory().GetCurrentInventoryLocation(src))
+			{
+				if (e.m_IsJuncture == false && e.m_IsRemote == false)
+				{
+					if (!GameInventory.LocationCanMoveEntity(src, e.GetDst()))
+					{
+						if (LogManager.IsInventoryHFSMLogEnable())
+						{
+							hndDebugPrint("[hndfsm] HandSelectAnimationOfMoveFromHandsEvent - rejected");
+						}
+						
+						return false;
+					}
+				}
+				
+				int animType = -1;
+				if (SelectAnimationOfMoveFromHands(e.m_Player, src, e.GetDst(), animType))
+				{
+					e.m_AnimationID = animType;
+					return true;
+				}
+				return false;
+			}
+		}
+		return false;
+	}
+};
+
+class HandSelectAnimationOfForceSwapInHandsEvent extends HandGuardBase
+{
+	protected Man m_Player;
+
+	void HandSelectAnimationOfForceSwapInHandsEvent(Man p = NULL) { m_Player = p; }
+
+	bool ProcessSwapEvent(notnull HandEventBase e, out int animType1, out int animType2)
+	{
+		HandEventSwap es = HandEventSwap.Cast(e);
+		if (es)
+			return SelectAnimationOfForceSwapInHands(e.m_Player, es.m_Src, es.m_Src2, es.m_Dst, es.m_Dst2, animType1, animType2);
+		Error("HandSelectAnimationOfForceSwapInHandsEvent - not an swap event");
+		return false;
+	}
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		HandEventForceSwap es = HandEventForceSwap.Cast(e);
+		if (es)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				hndDebugPrint("[hndfsm] HandSelectAnimationOfForceSwapInHandsEvent FSwap e=" + e.DumpToString());
+			}
+			
+			if (!es.m_Src2.IsValid() || !es.m_Src.IsValid())
+			{
+				Error("[hndfsm] HandSelectAnimationOfForceSwapInHandsEvent - invalid item source");
+				return false;
+			}
+			
+			bool allow = e.m_IsJuncture || e.m_IsRemote;
+			if (allow == false)
+			{
+				if (GameInventory.CanSwapEntitiesEx(es.GetSrc().GetItem(), es.m_Src2.GetItem()))
+				{
+					allow = true; // allow if ordinary swap
+				}
+				else if (es.m_Dst2)
+				{
+					if (GameInventory.CanForceSwapEntitiesEx(es.GetSrc().GetItem(), es.m_Dst, es.m_Src2.GetItem(), es.m_Dst2) == false)
+					{
+						Error("[hndfsm] HandSelectAnimationOfForceSwapInHandsEvent - no room at dst=" + InventoryLocation.DumpToStringNullSafe(es.m_Dst2));
+					}
+					else
+					{
+						allow = true;
+					}
+				}
+			}
+			
+			if (allow)
+			{
+				int animType1 = -1;
+				int animType2 = -1;
+				if (ProcessSwapEvent(e, animType1, animType2))
+				{
+					e.m_AnimationID = animType1;
+					es.m_Animation2ID = animType2;
+					return true;
+				}
+			}
+			else
+			{
+				Error("[hndfsm] HandSelectAnimationOfForceSwapInHandsEvent - m_HasRoomGuard.GuardCondition failed");
+			}
+		}
+		else
+		{
+			Error("[hndfsm] HandSelectAnimationOfForceSwapInHandsEvent - not a swap event");
+		}
+		return false;
+	}
+};
+
+class HandSelectAnimationOfSwapInHandsEvent extends HandSelectAnimationOfForceSwapInHandsEvent
+{
+	override bool GuardCondition(HandEventBase e)
+	{
+		HandEventSwap es = HandEventSwap.Cast(e);
+		if (es)
+		{
+			int animType1 = -1;
+			int animType2 = -1;
+			if (ProcessSwapEvent(e, animType1, animType2))
+			{
+				e.m_AnimationID = animType1;
+				es.m_Animation2ID = animType2;
+				return true;
+			}
+		}
+		else
+			Error("[hndfsm] HandSelectAnimationOfSwapInHandsEvent - not a swap event");
+		return false;
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandFSM.c b/scripts/3_Game/DayZ/Systems/Inventory/HandFSM.c
new file mode 100644
index 0000000000000000000000000000000000000000..c300ccc5c01d045b3d94512bfbbf0d450ac6e053
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandFSM.c
@@ -0,0 +1,116 @@
+void hndDebugPrint (string s)
+{
+#ifdef INV_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void hndDebugSpam (string s)
+{
+#ifdef INV_DEBUG_SPAM
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void hndDebugSpamALot (string s)
+{
+#ifdef INV_DEBUG_SPAM_FREQ
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+
+
+typedef FSMTransition<HandStateBase, HandEventBase, HandActionBase, HandGuardBase> HandTransition;
+
+
+/**@class		HandFSM
+ * @brief		Hand finite state machine
+ **/
+class HandFSM extends HFSMBase<HandStateBase, HandEventBase, HandActionBase, HandGuardBase>
+{
+	int GetCurrentStateID ()
+	{
+		/*if (m_States.Count() == 2)
+		{
+			int s0 = m_States[0].GetCurrentStateID();
+			int s1 = m_States[1].GetCurrentStateID() << 8;
+			return s1 | s0;
+		}*/
+		return 0;
+	}
+
+	/**@fn			SyncStateFromID
+	 * @brief		load from database - reverse lookup for state from saved id
+	 * @param[in]	id			the id stored in database during save
+	 **/
+	protected bool SyncStateFromID (int id)
+	{
+		/*if (id == 0)
+			return false;
+
+		int s0 = id & 0x000000ff;
+		int s1 = id & 0x0000ff00;
+
+		int count = m_Transitions.Count();
+		bool set0 = false;
+		bool set1 = false;
+		for (int i = 0; i < count; ++i)
+		{
+			HandTransition t = m_Transitions.Get(i);
+			if (!set0 && t.m_srcState && s0 == t.m_srcState.GetCurrentStateID())
+			{
+				m_States[0] = t.m_srcState;
+				set0 = true;
+			}
+			if (!set1 && t.m_srcState && s1 == t.m_srcState.GetCurrentStateID())
+			{
+				m_States[1] = t.m_srcState;
+				set1 = true;
+			}
+			if (set0 && set1)
+				return true;
+		}*/
+		return false;
+	}
+
+	/**@fn			OnStoreLoad
+	 * @brief		load state of fsm
+	 **/
+	bool OnStoreLoad (ParamsReadContext ctx, int version)
+	{
+		/*int id = 0;
+		ctx.Read(id);
+		if (SyncStateFromID(id))
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] OnStoreLoad - loaded current state from id=" + id);
+		else
+			Print("[hndfsm] Warning! OnStoreLoad - cannot load curent hand state, id=" + id);*/
+		return true;
+	}
+
+	/**@fn			OnStoreSave
+	 * @brief		save state of fsm
+	 **/
+	void OnStoreSave (ParamsWriteContext ctx)
+	{
+		/*int id = GetCurrentStateID();
+		ctx.Write(id);
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] OnStoreSave - saving current state=" + GetCurrentState() + " id=" + id);*/
+	}
+
+	/**@fn			NetSyncCurrentStateID
+	 * @brief		Engine callback - network synchronization of FSM's state. not intended to direct use.
+	 **/
+	void NetSyncCurrentStateID (int id)
+	{
+		/*if (SyncStateFromID(id))
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] NetSyncCurrentStateID - loaded current state from id=" + id);
+		else
+			Print("[hndfsm] NetSyncCurrentStateID called with null, ignoring request to set current fsm state.");*/
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandReplacingItemElsewhereWithNewInHands.c b/scripts/3_Game/DayZ/Systems/Inventory/HandReplacingItemElsewhereWithNewInHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..128d4fc736fb97799c7859d3cc157d878ccacf1f
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandReplacingItemElsewhereWithNewInHands.c
@@ -0,0 +1,58 @@
+class HandStartReplacingItemElsewhereWithNewInHands extends HandStateBase
+{
+	void HandStartReplacingItemElsewhereWithNewInHands (Man player = NULL, HandStateBase parent = NULL)
+	{ }
+
+	override void OnEntry (HandEventBase e)
+	{
+		super.OnEntry(e);
+		
+		Man player = e.m_Player;
+		HandEventReplaceWithNewBase edr = HandEventReplaceWithNewBase.Cast(e);
+		if (edr)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] HandStartReplacingItemElsewhereWithNewInHands about to execute lambda");
+
+			HumanInventoryWithFSM inv = HumanInventoryWithFSM.Cast(player.GetInventory());
+			edr.m_Lambda.Execute(inv);
+			return;
+		}
+		else
+			Error("[hndfsm] HandStartReplacingItemElsewhereWithNewInHands - not a HandEvenReplaceWithNewBase event");
+	}
+
+	override void OnAbort (HandEventBase e)
+	{
+		super.OnAbort(e);
+	}
+
+	override void OnExit (HandEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+
+class HandReplacingItemElsewhereWithNewInHands extends HandStateBase
+{
+	ref HandStartReplacingItemElsewhereWithNewInHands m_Replacing;
+
+	void HandReplacingItemElsewhereWithNewInHands (Man player = NULL, HandStateBase parent = NULL)
+	{
+		// setup nested state machine
+		m_Replacing = new HandStartReplacingItemElsewhereWithNewInHands(player, this);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Replacing, _fin_,     NULL ));
+
+		m_FSM.SetInitialState(m_Replacing);
+	}
+};
+
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandReplacingItemInHands.c b/scripts/3_Game/DayZ/Systems/Inventory/HandReplacingItemInHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..ed19d82c64598847d76ac0e705d138f95b7a2318
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandReplacingItemInHands.c
@@ -0,0 +1,82 @@
+class HandStartReplacingItemInHands extends HandStateBase
+{
+	void HandStartReplacingItemInHands (Man player = NULL, HandStateBase parent = NULL)
+	{ }
+
+	override void OnEntry (HandEventBase e)
+	{
+		super.OnEntry(e);
+		
+		Man player = e.m_Player;
+		EntityAI itemInHands = player.GetHumanInventory().GetEntityInHands();
+
+		InventoryLocation src = new InventoryLocation;
+		if (itemInHands.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			HandEventDestroyAndReplaceWithNew edr = HandEventDestroyAndReplaceWithNew.Cast(e);
+			if (edr)
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] HandStartReplacingItemInHands about to execute lambda");
+
+				HumanInventoryWithFSM inv = HumanInventoryWithFSM.Cast(player.GetInventory());
+				edr.m_Lambda.Execute(inv);
+				//player.GetItemAccessor().OnItemInHandsChanged();
+				return;
+			}
+			else
+				Error("[hndfsm] HandStartReplacingItemInHands - not a HandEventDestroyAndReplaceWithNew event");
+		}
+		else
+			Error("[hndfsm] HandStartReplacingItemInHands - itemInHands has no InventoryLocation");
+	}
+
+	override void OnAbort (HandEventBase e)
+	{
+		super.OnAbort(e);
+	}
+
+	override void OnExit (HandEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+
+class HandReplacingItemInHands extends HandStateBase
+{
+	ref HandStartReplacingItemInHands m_Replacing;
+
+	void HandReplacingItemInHands (Man player = NULL, HandStateBase parent = NULL)
+	{
+		// setup nested state machine
+		m_Replacing = new HandStartReplacingItemInHands(player, this);
+
+		// events:
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+
+		m_FSM = new HandFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_FSM.AddTransition(new HandTransition(   m_Replacing, _fin_,     NULL ));
+
+		m_FSM.SetInitialState(m_Replacing);
+	}
+
+	override void OnEntry (HandEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (HandEventBase e)
+	{
+		super.OnAbort(e);
+	}
+
+	override void OnExit (HandEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandStableState.c b/scripts/3_Game/DayZ/Systems/Inventory/HandStableState.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0a48b796d16e722274b063098546e358d65bdfa
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandStableState.c
@@ -0,0 +1,41 @@
+/**@class		HandStableState
+ * @brief	  represents stable state (i.e. the basic states that the fsm will spend the most time in)
+ **/
+class HandStableState extends HandStateBase
+{
+	int m_AnimState;
+
+	void HandStableState (Man player = NULL, HandStateBase parent = NULL, int anim_state = -1) { m_AnimState = anim_state; }
+
+	void SyncAnimState () { }
+
+	override void OnEntry (HandEventBase e)
+	{
+		super.OnEntry(e);
+		SyncAnimState();
+
+		//m_weapon.OnStableStateEntry();
+	}
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+		SyncAnimState();
+	}
+	override void OnAbort (HandEventBase e)
+	{
+		super.OnAbort(e);
+	}
+	override void OnExit (HandEventBase e)
+	{
+		//m_weapon.ResetWeaponAnimState();
+		super.OnExit(e);
+	}
+
+	override bool IsIdle () { return true; }
+
+	int GetCurrentStateID () { return 0; }
+
+	/// query for entity in hands
+	bool HasEntityInHands () { return false; }
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandStartAction.c b/scripts/3_Game/DayZ/Systems/Inventory/HandStartAction.c
new file mode 100644
index 0000000000000000000000000000000000000000..f9abd4d046708724a15fbadea1c3fe1cd898ce8a
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandStartAction.c
@@ -0,0 +1,58 @@
+/**@class 	HandStartAction
+ * @brief	simple class starting animation action specified by m_action and m_actionType
+ */
+class HandStartAction extends HandStateBase
+{
+	WeaponActions m_Action; /// action to be played
+	int m_ActionType; /// specific action sub-type
+
+	void HandStartAction (Man player = NULL, HandStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_Action = action;
+		m_ActionType = actionType;
+	}
+
+	override void OnEntry (HandEventBase e)
+	{
+		super.OnEntry(e);
+
+		if (e.m_Player)
+		{
+			HumanCommandWeapons hcw = e.m_Player.GetCommandModifier_Weapons();
+			if (hcw)
+			{
+				if (m_ActionType == -1)
+				{
+					hcw.StartAction(-1, -1);
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("HCW: " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " playing A=-1 AT=-1 fini=" + hcw.IsActionFinished());
+				}
+				else
+				{
+					hcw.StartAction(m_Action, m_ActionType);
+		
+					if (hcw.GetRunningAction() == m_Action && hcw.GetRunningActionType() == m_ActionType)
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("HCW: " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " playing A=" + typename.EnumToString(WeaponActions, m_Action) + " AT=" + WeaponActionTypeToString(m_Action, m_ActionType) + " fini=" + hcw.IsActionFinished());
+					}
+					else
+						Error("HCW: NOT playing A=" + typename.EnumToString(WeaponActions, m_Action) + " AT=" + WeaponActionTypeToString(m_Action, m_ActionType) + " fini=" + hcw.IsActionFinished());
+				}
+			}
+			else
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("---: remote playing A=" + typename.EnumToString(WeaponActions, m_Action) + " AT=" + WeaponActionTypeToString(m_Action, m_ActionType));
+		}
+		else
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("---: warning, no player wants to play A=" + typename.EnumToString(WeaponActions, m_Action) + " AT=" + WeaponActionTypeToString(m_Action, m_ActionType));
+		}
+	}
+	override void OnExit (HandEventBase e)
+	{
+		super.OnExit(e);
+	}
+	
+	override bool IsIdle () { return false; }
+};
+
+
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HandStateBase.c b/scripts/3_Game/DayZ/Systems/Inventory/HandStateBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..ffebc4ca0fd04e36b6eae4c363228d757b56b1b3
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HandStateBase.c
@@ -0,0 +1,142 @@
+/**@class	HandStateBase
+ * @brief	represent hand state base
+ *
+ * Class comes with entry/update/exit hooks that can be overriden in custom states
+ **/
+class HandStateBase
+{
+	Man m_Player; /// entity that this state relates to
+	HandStateBase m_parentState; /// hierarchical parent state of this state (or null)
+	ref HandFSM m_FSM; /// nested state machine (or null)
+	void HandStateBase (Man player = NULL, HandStateBase parent = NULL) { m_Player = player; m_parentState = parent; }
+
+	/**@fn		SetParentState
+	 * @brief	allows construction of hierarchical state machine
+	 **/
+	void SetParentState (HandStateBase parent) { m_parentState = parent; }
+	/**@fn		GetParentState
+	 * @return	state that owns this sub-state (or null if plain state)
+	 **/
+	HandStateBase GetParentState () { return m_parentState; }
+
+	bool HasFSM () { return m_FSM != NULL; }
+	HandFSM GetFSM () { return m_FSM; }
+
+	bool ProcessEvent (HandEventBase e)
+	{
+		if (HasFSM())
+			return m_FSM.ProcessEvent(e);
+		return false;
+	}
+
+	/**@fn		AddTransition
+	 * @brief	adds transition into m_FSM transition table
+	 **/
+	void AddTransition (HandTransition t)
+	{
+		if (HasFSM())
+			m_FSM.AddTransition(t);
+		else
+			Error("[hndfsm] adding transition to state without FSM. Configure FSM first.");
+	}
+
+
+	/**@fn		OnEntry
+	 * @brief	called upon entry to state
+	 * @NOTE	if state has (non-running) sub-machine, it's started on entry
+	 * @param[in] e	the event that triggered transition to this state
+	 **/
+	void OnEntry (HandEventBase e)
+	{
+		if (HasFSM() && !m_FSM.IsRunning())
+		{
+			if (e)
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] { " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " " + this.Type().ToString() + "  Has Sub-FSM! Starting submachine...");
+			}
+			else
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] { " + this.Type().ToString() + "  Has Sub-FSM! Starting submachine...");
+			}
+			m_FSM.Start(e);
+		}
+		else
+		{
+			if (e)
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] { " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " " + this.Type().ToString());
+			}
+			else
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] { " + this.Type().ToString());
+			}
+		}
+	}
+
+	/**@fn		OnUpdate
+	 * @brief ongoing behavior, performed while being in the state
+	 *
+	 * @NOTE: this is supposed to be the Do() operation in UML speak
+	 **/
+	void OnUpdate (float dt)
+	{
+		if (HasFSM() && m_FSM.IsRunning())
+			m_FSM.GetCurrentState().OnUpdate(dt);
+	}
+
+	/**@fn		OnAbort
+	 * @brief called when abort signal arrives
+	 * @param[in] e	the event that triggered abort from this state
+	 **/
+	void OnAbort (HandEventBase e)
+	{
+		if (HasFSM() && m_FSM.IsRunning())
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] OnAbort " + this.Type().ToString() + "  Has Sub-FSM! Aborting submachine...");
+			m_FSM.Abort(e);
+		}
+		//Debug.InventoryHFSMLog("ABORTED " + e.m_Player.GetSimulationTimeStamp(), ""/*typename.EnumToString(HandEventID, GetEventID()) */, "n/a", "OnAbort", m_Player.ToString() );
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] } " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " ABORTED " + this.Type().ToString());
+	}
+
+	/**@fn		OnExit
+	 * @brief called on exit from state
+	 * @param[in] e	the event that triggered transition from this state
+	 **/
+	void OnExit (HandEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] } " + Object.GetDebugName(e.m_Player) + " STS = " + e.m_Player.GetSimulationTimeStamp() + " " + this.Type().ToString());
+	}
+
+	/**@fn			IsWaitingForActionFinish
+	 * @brief		waiting for active animation action/actionType finish
+	 * @return		true if this state is waiting for finish signal
+	 **/
+	bool IsWaitingForActionFinish () { return HasFSM() && m_FSM.IsRunning() && m_FSM.GetCurrentState().IsWaitingForActionFinish(); }
+
+	/**@fn			IsIdle
+	 * @brief		idle state does not expect any animation events
+	 * @return		true if this state is idle
+	 **/
+	bool IsIdle () { return false; }
+
+	/**@fn		OnSubMachineChanged
+	 * @brief	called when sub-machine has changed its state
+	 * @param[in]	src		from state (previous)
+	 * @param[in]	dst		to state (current)
+	 **/
+	void OnSubMachineChanged (HandStateBase src, HandStateBase dst) { }
+
+	/**@fn		OnStateChanged
+	 * @brief	called on current state when state machine has changed its state
+	 * @param[in]	src		from state (previous)
+	 * @param[in]	dst		to state (current)
+	 **/
+	void OnStateChanged (HandStateBase src, HandStateBase dst)
+	{
+		m_Player.GetHumanInventory().OnHandsStateChanged(src, dst);
+	}
+};
+
+
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Hand_Actions.c b/scripts/3_Game/DayZ/Systems/Inventory/Hand_Actions.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0a86903c52c1d890c07e3e97b2779ac83c526c3
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Hand_Actions.c
@@ -0,0 +1,239 @@
+///@{ actions
+
+/**@class	HandActionBase
+ * @brief	represents action executed on transition just between OnExit from old state and OnEntry to new state
+ **/
+class HandActionBase
+{
+	/**@fn			Action
+	 * @brief		executed when transition occurs
+	 **/
+	void Action (HandEventBase e) { }
+};
+
+
+class HandActionCreated extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionCreated", e.m_Player.ToString() );
+		}
+		#endif
+
+		e.m_Player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionTake extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionTake", e.m_Player.ToString() );
+		}
+		#endif
+
+		GameInventory.LocationSyncMoveEntity(e.GetSrc(), e.GetDst());
+		e.m_Player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionDrop extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionDrop", e.m_Player.ToString() );
+		}
+		#endif
+
+		GameInventory.LocationSyncMoveEntity(e.GetSrc(), e.GetDst());
+ 		e.m_Player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionThrow extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionThrow", e.m_Player.ToString() );
+		}
+		#endif
+		HandEventThrow throwEvent = HandEventThrow.Cast(e);
+
+		GameInventory.LocationSyncMoveEntity(e.GetSrc(), e.GetDst());
+
+		DayZPlayer player = DayZPlayer.Cast(e.m_Player);
+		if ( player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_REMOTE )
+		{
+			InventoryItem item = InventoryItem.Cast(e.GetSrcEntity());
+			if( item )
+				item.ThrowPhysically(player, throwEvent.GetForce());
+			else
+				Error("[hndfsm] HandActionThrow - src entity null!");
+		}
+
+		player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionMoveTo extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionMoveTo", e.m_Player.ToString() );
+		}
+		#endif
+
+		HandEventMoveTo es = HandEventMoveTo.Cast(e);
+		if (es)
+		{
+			GameInventory.LocationSyncMoveEntity(e.GetSrc(), es.m_Dst);
+			e.m_Player.OnItemInHandsChanged();
+		}
+		else
+			Error("[hndfsm] HandActionMoveTo - this is no HandEventMoveTo");
+	}
+};
+
+class HandActionDestroy extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionDestroy", e.m_Player.ToString() );
+		}
+		#endif
+
+		GetGame().ObjectDelete(e.GetSrcEntity());
+		e.m_Player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionDestroyed extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionDestroyed", e.m_Player.ToString() );
+		}
+		#endif
+		e.m_Player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionDestroyAndReplaceWithNew extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionDestroyAndReplaceWithNew", e.m_Player.ToString() );
+		}
+		#endif
+		Man player = e.m_Player;
+		EntityAI itemInHands = player.GetHumanInventory().GetEntityInHands();
+
+		InventoryLocation src = new InventoryLocation;
+		if (itemInHands.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			HandEventDestroyAndReplaceWithNew edr = HandEventDestroyAndReplaceWithNew.Cast(e);
+			if (edr)
+			{
+				edr.m_Lambda.Execute();
+				return;
+			}
+			else
+				Error("[hndfsm] HandActionDestroyAndReplaceWithNew - not a HandEventDestroyAndReplaceWithNew event");
+		}
+		else
+			Error("[hndfsm] HandActionDestroyAndReplaceWithNew - itemInHands has no InventoryLocation");
+	}
+};
+
+class HandActionDestroyAndReplaceWithNewElsewhere extends HandActionDestroyAndReplaceWithNew
+{
+	override void Action (HandEventBase e)
+	{
+		super.Action(e);
+	}
+};
+
+class HandActionReplaced extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionReplaced", e.m_Player.ToString() );
+		}
+		#endif
+		Man player = e.m_Player;
+
+		player.OnItemInHandsChanged();
+	}
+};
+
+class HandActionSwap extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionSwap", e.m_Player.ToString() );
+		}
+		#endif
+		HandEventSwap es = HandEventSwap.Cast(e);
+		if (es)
+		{
+			GameInventory.LocationSwap(es.GetSrc(), es.m_Src2, es.GetDst(), es.m_Dst2);
+			e.m_Player.OnItemInHandsChanged();
+		}
+		else
+			Error("[hndfsm] HandActionSwap - this is no HandEventSwap");
+	}
+};
+
+class HandActionForceSwap extends HandActionBase
+{
+	override void Action (HandEventBase e)
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("Action - STS = " + e.m_Player.GetSimulationTimeStamp(), e.ToString() , "n/a", "HandActionForceSwap", e.m_Player.ToString() );
+		}
+		#endif
+		HandEventForceSwap es = HandEventForceSwap.Cast(e);
+		if (es)
+		{
+			GameInventory.LocationSwap(es.GetSrc(), es.m_Src2, es.GetDst(), es.m_Dst2);
+			e.m_Player.OnItemInHandsChanged();
+		}
+		else
+			Error("[hndfsm] HandActionForceSwap - this is no HandEventForceSwap");
+	}
+};
+
+///@} actions
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Hand_Events.c b/scripts/3_Game/DayZ/Systems/Inventory/Hand_Events.c
new file mode 100644
index 0000000000000000000000000000000000000000..029db0eadd384ecbfa2312713aa44517581275ce
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Hand_Events.c
@@ -0,0 +1,799 @@
+///@{ events
+
+/**@enum	HandEventID
+ * @brief	identifier for events mainly for rpc purposes
+ **/
+enum HandEventID
+{
+	UNKNOWN,
+	TAKE,
+	MOVETO,
+	DROP,
+	THROW,
+	SWAP,
+	FORCESWAP,
+	DESTROY,
+	CREATED,
+	DESTROYED,
+	REPLACE,
+	REPLACE2,
+	REPLACE3,
+	REPLACED,
+	HUMANCOMMAND_ACTION_FINISHED,
+	HUMANCOMMAND_ACTION_ABORTED,
+	ANIMEVENT_CHANGE_HIDE
+};
+
+enum JunctureRequestResult
+{
+	JUNCTURE_NOT_REQUIRED,
+	JUNCTURE_ACQUIRED,
+	JUNCTURE_DENIED,
+	ERROR,
+}
+
+/**@class	HandEventBase
+ * @brief	represents event that triggers transition from state to state
+ **/
+class HandEventBase
+{
+	int m_EventID = 0;
+	int m_AnimationID = -1;
+	DayZPlayer m_Player;
+	ref InventoryLocation m_Src;
+
+	//! For action guards. Although we can guarantee the item will exist for remotes and juncture, 
+	//! we can't guarantee the conditions will be the same as when the action was first performed.
+	//! So therefore we only perform maximal checks on the Client and then Server but then do minimal 
+	//! checks on Juncture-Client and Juncture-Server and no checks on Remote-Client.
+	bool m_IsJuncture;
+	bool m_IsRemote;
+
+	void HandEventBase (Man p = null, InventoryLocation src = null) { Class.CastTo(m_Player, p); m_Src = src; }
+	HandEventID GetEventID () { return m_EventID; }
+
+	bool IsAuthoritative()
+	{
+		return m_Player && (m_Player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_CLIENT && m_Player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_REMOTE);
+	}
+
+	bool IsOwner()
+	{
+		return m_Player && (m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT || m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_SERVER || m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_SINGLEPLAYER);
+	}
+
+	bool IsProxy()
+	{
+		return m_Player && (m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_REMOTE || m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_REMOTE);
+	}
+
+	void ReadFromContext (ParamsReadContext ctx) { } // actual read is in CreateHandEventFromContext
+
+	void WriteToContext (ParamsWriteContext ctx)
+	{
+		ctx.Write(m_EventID);
+		ctx.Write(m_Player);
+		OptionalLocationWriteToContext(m_Src, ctx);
+		ctx.Write(m_AnimationID);
+	}
+
+	InventoryLocation GetSrc () { return m_Src; }
+	EntityAI GetSrcEntity ()
+	{
+		if (m_Src)
+			return m_Src.GetItem();
+		return null;
+	}
+	EntityAI GetSecondSrcEntity () { return null; }
+	InventoryLocation GetDst () { return null; }
+	int GetAnimationID () { return m_AnimationID; }
+	bool AcquireInventoryJunctureFromServer (notnull Man player) { return false; }
+	bool CheckRequest () { return true; }
+	bool CheckRequestEx (InventoryValidation validation)
+	{
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (validation.m_IsRemote || validation.m_IsJuncture)
+			return true;
+		
+		return CheckRequest();
+	}
+	bool CanPerformEvent () { return true; }
+	bool CanPerformEventEx (InventoryValidation validation) { return CanPerformEvent(); }
+	bool CheckRequestSrc () { return true; }
+	bool IsServerSideOnly () { return false; }
+
+	static HandEventBase HandEventFactory (HandEventID id, Man p = null, InventoryLocation src = null)
+	{
+		switch (id)
+		{
+			case HandEventID.UNKNOWN: return null;
+			case HandEventID.TAKE: return new HandEventTake(p, src);
+			case HandEventID.MOVETO: return new HandEventMoveTo(p, src);
+			case HandEventID.DROP: return new HandEventDrop(p, src);
+			case HandEventID.THROW: return new HandEventThrow(p, src);
+			case HandEventID.SWAP: return new HandEventSwap(p, src);
+			case HandEventID.FORCESWAP: return new HandEventForceSwap(p, src);
+			case HandEventID.DESTROY: return new HandEventDestroy(p, src);
+			case HandEventID.CREATED: return new HandEventCreated(p, src);
+			case HandEventID.DESTROYED: return new HandEventDestroyed(p, src);
+			case HandEventID.REPLACE: return new HandEventDestroyAndReplaceWithNew(p, src);
+			case HandEventID.REPLACE2: return new HandEventDestroyAndReplaceWithNewElsewhere(p, src);
+			case HandEventID.REPLACE3: return new HandEventDestroyElsewhereAndReplaceWithNewInHands(p, src);
+			case HandEventID.REPLACED: return new HandEventReplaced(p, src);
+			case HandEventID.ANIMEVENT_CHANGE_HIDE: return HandAnimEventChanged(p, src);
+			case HandEventID.HUMANCOMMAND_ACTION_FINISHED : return HandEventHumanCommandActionFinished(p, src);
+			case HandEventID.HUMANCOMMAND_ACTION_ABORTED : return HandEventHumanCommandActionAborted(p, src);
+		}
+		Error("[hndfsm] HandEventFactory - unregistered hand event with id=" + id);
+		return null;
+	}
+	
+	static HandEventBase CreateHandEventFromContext (ParamsReadContext ctx)
+	{
+		int eventID = -1;
+		if (!ctx.Read(eventID))
+		{
+			Error("[hndfsm] CreateHandEventFromContext - cannot read eventID");
+			return null;
+		}
+		Man player;
+		if (!ctx.Read(player))
+		{
+			Error("[hndfsm] CreateHandEventFromContext - cannot read player");
+			return null;
+		}		
+		InventoryLocation src;
+		OptionalLocationReadFromContext(src, ctx);
+
+		int animID = -1;
+		if (!ctx.Read(animID))
+		{
+			Error("[hndfsm] CreateHandEventFromContext - cannot read animID");
+			return null;
+		}
+		HandEventBase b = HandEventFactory(eventID, player, src);
+		if (b)
+		{
+			b.m_AnimationID = animID;
+			b.ReadFromContext(ctx);
+		}
+		return b;
+	}
+	
+	string DumpToString ()
+	{
+		string res = "{ HandEv id=" + typename.EnumToString(HandEventID, GetEventID());
+		res = res + " pl=" + Object.GetDebugName(m_Player);
+		res = res + " src=" + InventoryLocation.DumpToStringNullSafe(m_Src);
+		res = res + " }";
+		return res;
+	}
+	
+	bool ReserveInventory()
+	{
+		InventoryLocation dst = GetDst();
+		if( dst && !m_Player.GetHumanInventory().AddInventoryReservationEx(dst.GetItem(), dst, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	void ClearInventoryReservation()
+	{
+		InventoryLocation dst = GetDst();
+		if(dst)
+		{
+			m_Player.GetHumanInventory().ClearInventoryReservationEx(dst.GetItem(), dst);
+		}
+	}
+};
+
+class HandEventTake extends HandEventBase
+{
+	void HandEventTake (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.TAKE; }
+
+	override InventoryLocation GetDst ()
+	{
+		InventoryLocation dst = new InventoryLocation;
+		dst.SetHands(m_Player, GetSrcEntity());
+		return dst;
+	}
+
+	override bool CheckRequestSrc ()
+	{
+		if (false == GameInventory.CheckRequestSrc(m_Player, GetSrc(), GameInventory.c_MaxItemDistanceRadius))
+		{
+			Debug.InventoryHFSMLog("CANNOT perform", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CheckRequestSrc", m_Player.ToString() );
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(m_Player) + " failed src1 check with cmd=" + typename.EnumToString(HandEventID, GetEventID()) + " src1=" + InventoryLocation.DumpToStringNullSafe(GetSrc()));
+			return false; // stale packet
+		}
+		return true;
+	}
+	
+	override bool CheckRequest ()
+	{
+		return GameInventory.CheckMoveToDstRequest(m_Player, GetSrc(), GetDst(), GameInventory.c_MaxItemDistanceRadius);
+	}
+	
+	override bool CanPerformEventEx(InventoryValidation validation)
+	{
+		if (validation.m_IsJuncture)
+		{
+			return true;
+		}
+		
+		if (!GameInventory.LocationCanMoveEntity(GetSrc(), GetDst()))
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("CANNOT perform", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CanPerformEvent", m_Player.ToString() );
+			}
+			#endif
+			//if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[desync] HandleInputData man=" + Object.GetDebugName(m_Player) + " CANNOT perform ev=" + DumpToString());
+			return false;
+		}
+		
+		return super.CanPerformEventEx(validation);
+	}
+	
+	override bool AcquireInventoryJunctureFromServer (notnull Man player)
+	{
+		InventoryLocation src = GetSrc();
+		InventoryLocation dst = GetDst();
+		if (src && dst)
+		{
+			return TryAcquireInventoryJunctureFromServer(player, src, dst);
+		}
+		Error("[hndfsm] HandEventTake. AcquireInventoryJunctureFromServer: no src or dst for ev=" + DumpToString());
+		return JunctureRequestResult.ERROR;
+	}
+};
+
+class HandEventMoveTo extends HandEventBase
+{
+	ref InventoryLocation m_Dst; /// destination for item in hands
+
+	void HandEventMoveTo (Man p = null, InventoryLocation src = null, InventoryLocation dst = null) { m_EventID = HandEventID.MOVETO; m_Dst = dst; }
+
+	override void ReadFromContext (ParamsReadContext ctx)
+	{
+		m_Dst = new InventoryLocation;
+		super.ReadFromContext(ctx);
+		m_Dst.ReadFromContext(ctx);
+	}
+	override void WriteToContext (ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+		m_Dst.WriteToContext(ctx);
+	}
+
+	override InventoryLocation GetDst () { return m_Dst; }
+	
+	override bool CheckRequestSrc ()
+	{
+		if (false == GameInventory.CheckRequestSrc(m_Player, GetSrc(), GameInventory.c_MaxItemDistanceRadius))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(m_Player) + " failed src1 check with cmd=" + typename.EnumToString(HandEventID, GetEventID()) + " src1=" + InventoryLocation.DumpToStringNullSafe(GetSrc()));
+			return false; // stale packet
+		}
+		return true;
+	}
+	
+	override bool CheckRequest ()
+	{
+		return GameInventory.CheckMoveToDstRequest(m_Player, GetSrc(), GetDst(), GameInventory.c_MaxItemDistanceRadius);
+	}
+	
+	override bool CanPerformEvent ()
+	{
+		if (false == GameInventory.LocationCanMoveEntity(GetSrc(), GetDst()))
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("CANNOT perform", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CanPerformEvent", m_Player.ToString() );
+			}
+			#endif
+			return false;
+		}
+		return true;
+	}
+
+	override bool AcquireInventoryJunctureFromServer (notnull Man player)
+	{
+		InventoryLocation src = GetSrc();
+		InventoryLocation dst = GetDst();
+		if (src && dst)
+		{
+			return TryAcquireInventoryJunctureFromServer(player, src, dst);
+		}
+		Error("[hndfsm] HandEventMoveTo. AcquireInventoryJunctureFromServer: no src or dst for ev=" + DumpToString());
+		return JunctureRequestResult.ERROR;
+	}
+
+	override string DumpToString ()
+	{
+		string res = "{ HandEventMoveTo id=" + typename.EnumToString(HandEventID, GetEventID()) + " pl=" + Object.GetDebugName(m_Player) + " src=" + InventoryLocation.DumpToStringNullSafe(m_Src)  + " dst=" + InventoryLocation.DumpToStringNullSafe(m_Dst) + " }";
+		return res;
+	}
+};
+
+//! Abstracted event, not to be used, only inherited
+class HandEventRemove extends HandEventBase
+{
+	override InventoryLocation GetDst ()
+	{
+		return m_Dst;
+	}
+
+	override bool CheckRequestSrc ()
+	{
+		if (false == GameInventory.CheckRequestSrc(m_Player, GetSrc(), GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("Check src - failed, src = " + InventoryLocation.DumpToStringNullSafe(GetSrc()), typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CheckRequestSrc", m_Player.ToString() );
+			}
+			#endif
+			return false; // stale packet
+		}
+		return true;
+	}
+	
+	override bool CheckRequest ()
+	{
+		return GameInventory.CheckMoveToDstRequest(m_Player, GetSrc(), GetDst(), GameInventory.c_MaxItemDistanceRadius);
+	}
+	
+	override bool CanPerformEvent ()
+	{
+		if (false == GameInventory.LocationCanMoveEntity(GetSrc(), GetDst()))
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("CANNOT perform", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CanPerformEvent", m_Player.ToString() );
+			}
+			#endif
+			return false;
+		}
+		return true;
+	}
+
+	override bool AcquireInventoryJunctureFromServer (notnull Man player)
+	{
+		InventoryLocation src = GetSrc();
+		InventoryLocation dst = GetDst();
+		if (src && dst)
+		{
+			return TryAcquireInventoryJunctureFromServer(player, src, dst);
+		}
+		Error("[hndfsm] HandEventThrow. AcquireInventoryJunctureFromServer: no src or dst for ev=" + DumpToString());
+		return JunctureRequestResult.ERROR;
+	}
+	
+	ref InventoryLocation m_Dst;
+};
+
+class HandEventDrop extends HandEventRemove
+{
+	void HandEventDrop (Man p = null, InventoryLocation src = null)
+	{
+		m_EventID = HandEventID.DROP;
+		m_CanPerformDrop = true;
+	}
+
+	override void ReadFromContext(ParamsReadContext ctx)
+	{
+		super.ReadFromContext(ctx);
+
+		ctx.Read(m_CanPerformDrop);
+		OptionalLocationReadFromContext(m_Dst, ctx);
+		if (!m_Dst)
+		{
+			m_Dst = new InventoryLocation();
+		}
+	}
+
+	override void WriteToContext(ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+
+		ctx.Write(m_CanPerformDrop);
+		OptionalLocationWriteToContext(m_Dst, ctx);
+	}
+
+	override bool CheckRequestEx(InventoryValidation validation)
+	{
+		//! Check to see if this is the initial call from the server (but the event originated from a client)
+		if (!validation.m_IsJuncture && IsAuthoritative())
+		{
+			m_CanPerformDrop = GameInventory.SetGroundPosByOwner(m_Player, GetSrcEntity(), m_Dst);
+		}
+
+		if (!m_CanPerformDrop)
+		{
+			validation.m_Reason = InventoryValidationReason.DROP_PREVENTED;
+			return false;
+		}
+
+		return super.CheckRequestEx(validation);
+	}
+	
+	override bool CanPerformEventEx(InventoryValidation validation)
+	{
+		if (!m_CanPerformDrop)
+		{
+			return false;
+		}
+
+		//! On multiplayer client, if this is the initial call then we are waiting for the server to setup this event still
+		if (!validation.m_IsJuncture && !validation.m_IsRemote && !GetDst() && (GetGame().IsMultiplayer() && GetGame().IsClient()))
+		{
+			return true;
+		}
+		
+		//! Singleplayer or server was initial caller
+		if (!validation.m_IsRemote && !GetDst())
+		{
+			m_Dst = new InventoryLocation();
+			m_CanPerformDrop = GameInventory.SetGroundPosByOwner(m_Player, GetSrcEntity(), m_Dst);
+			
+			if (!m_CanPerformDrop)
+			{
+				validation.m_Reason = InventoryValidationReason.DROP_PREVENTED;
+				return false;
+			}
+		}
+
+		return super.CanPerformEventEx(validation);
+	}
+	
+	bool m_CanPerformDrop;
+};
+
+class HandEventThrow extends HandEventRemove
+{
+	void HandEventThrow (Man p = null, InventoryLocation src = null) 
+	{
+		m_EventID = HandEventID.THROW; 
+		if( src )
+		{
+			vector mat[4];
+			EntityAI entity = GetSrcEntity();
+			if (entity)
+			{
+				m_Dst = new InventoryLocation;
+				entity.GetTransform(mat);
+				m_Dst.SetGround(entity, mat);
+			}
+			else
+			{
+				Error("[hndfsm] HandEventThrow src entity null!");
+			}
+		}
+	}
+	
+	override void ReadFromContext (ParamsReadContext ctx)
+	{
+		super.ReadFromContext(ctx);
+		
+		m_Dst = new InventoryLocation;
+		m_Dst.ReadFromContext(ctx);
+
+		float x, y, z;
+		ctx.Read(x);
+		ctx.Read(y);
+		ctx.Read(z);
+		m_Force[0] = x;
+		m_Force[1] = y;
+		m_Force[2] = z;
+	}
+	
+	override void WriteToContext (ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+		
+		m_Dst.WriteToContext(ctx);
+
+		ctx.Write(m_Force[0]);
+		ctx.Write(m_Force[1]);
+		ctx.Write(m_Force[2]);
+	}
+
+	void SetForce(vector force)	{ m_Force = force; }
+	vector GetForce() { return m_Force; }
+	
+	vector m_Force;	
+};
+
+class HandEventSwap extends HandEventBase
+{
+	// super.m_Src == src location of new item (that will be taken)
+	ref InventoryLocation m_Dst; /// destination for new item (i.e. hands)
+	ref InventoryLocation m_Src2; /// src of old item in hands
+	ref InventoryLocation m_Dst2; /// destination for old item that was in hands
+	int m_Animation2ID = -1;
+
+	void HandEventSwap (Man p = null, InventoryLocation src = null, InventoryLocation src2 = null, InventoryLocation dst = null, InventoryLocation dst2 = null)
+	{
+		m_EventID = HandEventID.SWAP; 
+		m_Dst = dst;
+		m_Src2 = src2;
+		m_Dst2 = dst2;
+	}
+	
+	override void ReadFromContext (ParamsReadContext ctx)
+	{
+		super.ReadFromContext(ctx);
+
+		m_Src2 = new InventoryLocation;
+		m_Dst = new InventoryLocation;
+		m_Dst2 = new InventoryLocation;
+
+		m_Src2.ReadFromContext(ctx);
+		m_Dst.ReadFromContext(ctx);
+		m_Dst2.ReadFromContext(ctx);
+		ctx.Read(m_Animation2ID);
+	}
+
+	override void WriteToContext (ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+
+		m_Src2.WriteToContext(ctx);
+		m_Dst.WriteToContext(ctx);
+		m_Dst2.WriteToContext(ctx);
+		ctx.Write(m_Animation2ID);
+	}
+
+	override InventoryLocation GetDst ()
+	{
+		return m_Dst;
+	}
+	
+	override EntityAI GetSecondSrcEntity()
+	{
+		return m_Src2.GetItem();
+	}
+	
+	override bool CheckRequestSrc ()
+	{
+		//return false;
+
+		if (false == GameInventory.CheckRequestSrc(m_Player, GetSrc(), GameInventory.c_MaxItemDistanceRadius))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(m_Player) + " failed src1 check with cmd=" + typename.EnumToString(HandEventID, GetEventID()) + " src1=" + InventoryLocation.DumpToStringNullSafe(GetSrc()));
+			return false; // stale packet
+		}
+		if (false == GameInventory.CheckRequestSrc(m_Player, m_Src2, GameInventory.c_MaxItemDistanceRadius))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(m_Player) + " failed src2 check with cmd=" + typename.EnumToString(HandEventID, GetEventID()) + " src2=" + InventoryLocation.DumpToStringNullSafe(m_Src2));
+			return false; // stale packet
+		}
+		return true;
+	}
+				
+	override bool CheckRequest ()
+	{
+		if (!GameInventory.CheckSwapItemsRequest(m_Player, m_Src, m_Src2, m_Dst, m_Dst2, GameInventory.c_MaxItemDistanceRadius))
+		{	
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("CheckSwapItemsRequest - failed", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CheckRequest", m_Player.ToString() );
+			}
+			#endif
+		}
+  		else if (!m_Player.GetHumanInventory().CanAddSwappedEntity(m_Src, m_Src2, m_Dst, m_Dst2))
+		{	
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("CanAddSwappedEntity - failed", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CheckRequest", m_Player.ToString() );
+			}
+			#endif
+		}
+		else
+			return true;
+
+		return false;
+	}
+	
+	override bool CanPerformEvent ()
+	{
+		if (GameInventory.CanForceSwapEntitiesEx(GetSrc().GetItem(), m_Dst, m_Src2.GetItem(), m_Dst2))
+			return true;
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("CANNOT perform", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CanPerformEvent", m_Player.ToString() );
+		}
+		#endif
+		return false;
+	}
+
+	override bool AcquireInventoryJunctureFromServer (notnull Man player)
+	{
+		return TryAcquireTwoInventoryJuncturesFromServer(player, m_Src, m_Src2, m_Dst, m_Dst2);
+	}
+
+	override string DumpToString ()
+	{
+		return "{ HandEventSwap id=" + typename.EnumToString(HandEventID, GetEventID()) + " pl=" + Object.GetDebugName(m_Player) + " src1=" + InventoryLocation.DumpToStringNullSafe(m_Src) + " src2=" + InventoryLocation.DumpToStringNullSafe(m_Src2) + " dst1=" + InventoryLocation.DumpToStringNullSafe(m_Dst) + " dst2=" + InventoryLocation.DumpToStringNullSafe(m_Dst2) + " }";
+	}
+	
+	void CheckAndExecuteForceStandUp()
+	{
+		DayZPlayer player = DayZPlayer.Cast(m_Player);
+		player.ForceStandUpForHeavyItemsSwap( m_Src.GetItem(), m_Src2.GetItem() );
+	}
+	
+	override bool ReserveInventory()
+	{
+		if( !m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst.GetItem(), m_Dst, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			return false;
+		}
+		if( !m_Player.GetHumanInventory().AddInventoryReservationEx(m_Dst2.GetItem(), m_Dst2, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst.GetItem(), m_Dst);
+			return false;
+		}
+		return true;
+	}
+	
+	override void ClearInventoryReservation()
+	{
+		m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst.GetItem(), m_Dst);
+		m_Player.GetHumanInventory().ClearInventoryReservationEx(m_Dst2.GetItem(), m_Dst2);
+	}
+};
+
+class HandEventForceSwap extends HandEventSwap
+{	
+	void HandEventForceSwap (Man p = null, InventoryLocation src = null, InventoryLocation src2 = null, InventoryLocation dst = null, InventoryLocation dst2 = null) { m_EventID = HandEventID.FORCESWAP; }
+	
+	override bool CheckRequest ()
+	{
+		bool test1 = false;
+		EntityAI inHands = m_Player.GetHumanInventory().GetEntityInHands();
+		if (GetSrcEntity() && inHands && m_Dst && m_Dst.IsValid())
+		{
+			test1 = GameInventory.CheckSwapItemsRequest(m_Player, m_Src, m_Src2, m_Dst, m_Dst2, GameInventory.c_MaxItemDistanceRadius);
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{
+				if (!test1)	
+					Debug.InventoryHFSMLog("CheckSwapItemsRequest failed", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CheckRequest", m_Player.ToString() );
+	 		}
+			#endif
+		}
+		return test1;
+	}
+	
+	override bool CanPerformEvent ()
+	{
+		bool test2 = GameInventory.CanForceSwapEntitiesEx(m_Src.GetItem(), m_Dst, m_Src2.GetItem(), m_Dst2); // null here means 'do not search for dst2' (already have valid one from constructor)
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{
+			if (!test2)	
+				Debug.InventoryHFSMLog("CanForceSwapEntitiesEx failed", typename.EnumToString(HandEventID, GetEventID()) , "n/a", "CanPerformEvent", m_Player.ToString() );
+		}
+		#endif
+		return test2;
+	}
+};
+
+class HandEventDestroy extends HandEventBase
+{
+	void HandEventDestroy (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.DESTROY; }
+	
+	override bool IsServerSideOnly () { return true; }
+};
+
+class HandEventCreated extends HandEventBase
+{
+	void HandEventCreated (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.CREATED; }
+};
+
+class HandEventDestroyed extends HandEventBase
+{
+	void HandEventDestroyed (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.DESTROYED; }
+};
+
+class HandEventReplaceWithNewBase extends HandEventBase
+{
+	string m_Type;
+	ref ReplaceItemWithNewLambdaBase m_Lambda;
+
+	void HandEvengReplaceWithNewBase (Man p = null, InventoryLocation src = null, ReplaceItemWithNewLambdaBase lambda = NULL) { m_EventID = HandEventID.REPLACE; m_Lambda = lambda; }
+
+	override void ReadFromContext (ParamsReadContext ctx)
+	{
+		super.ReadFromContext(ctx);
+		ctx.Read(m_Type);
+		Error("[hndfsm] HandEventDestroyAndReplaceWithNew - Cannot serialize lambda (read)");
+	}
+	override void WriteToContext (ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+		ctx.Write(m_Type);
+		Error("[hndfsm] HandEventDestroyAndReplaceWithNew - Cannot serialize lambda (write)");
+	}
+
+	override bool IsServerSideOnly () { return true; }
+	
+	override InventoryLocation GetDst ()
+	{
+		InventoryLocation dst = new InventoryLocation;
+		dst.SetHands(m_Player, GetSrcEntity());
+		return dst;
+	}
+	
+	override string DumpToString ()
+	{
+		string res = "{ HandEvenReplaceWithNewBase id=" + typename.EnumToString(HandEventID, GetEventID()) + " pl=" + Object.GetDebugName(m_Player) + " src=" + InventoryLocation.DumpToStringNullSafe(GetSrc()) + " lambda=" + m_Lambda + " dst=" + InventoryLocation.DumpToStringNullSafe(GetDst()) + " }";
+		return res;
+	}
+};
+
+class HandEventDestroyAndReplaceWithNew extends HandEventReplaceWithNewBase
+{
+	void HandEventDestroyAndReplaceWithNew (Man p = null, InventoryLocation src = null, ReplaceItemWithNewLambdaBase lambda = NULL) { m_EventID = HandEventID.REPLACE; m_Lambda = lambda; }
+};
+
+class HandEventDestroyAndReplaceWithNewElsewhere extends HandEventDestroyAndReplaceWithNew
+{
+	void HandEventDestroyAndReplaceWithNewElsewhere (Man p = null, InventoryLocation src = null, ReplaceItemWithNewLambdaBase lambda = NULL) { m_EventID = HandEventID.REPLACE3; m_Lambda = lambda; }
+};
+
+class HandEventDestroyElsewhereAndReplaceWithNewInHands extends HandEventReplaceWithNewBase
+{
+	void HandEventDestroyElsewhereAndReplaceWithNewInHands (Man p = null, InventoryLocation src = null, ReplaceItemWithNewLambdaBase lambda = NULL) { m_EventID = HandEventID.REPLACE3; m_Lambda = lambda; }
+};
+
+class HandEventReplaced extends HandEventBase
+{
+	void HandEventReplaced (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.REPLACED; }
+};
+
+// anim events
+
+class HandAnimEventChanged extends HandEventBase
+{
+	void HandAnimEventChanged (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.ANIMEVENT_CHANGE_HIDE; }
+};
+
+HandEventBase HandAnimEventFactory (WeaponEvents type, Man p = null, InventoryLocation src = null)
+{
+	switch (type)
+	{
+		case WeaponEvents.CHANGE_HIDE: return new HandAnimEventChanged(p, src);
+		case WeaponEvents.CHANGE_SHOW: return new HandAnimEventChanged(p, src);
+	}
+	return null;
+}
+
+/**@brief		triggered when animation action finishes
+ **/
+class HandEventHumanCommandActionFinished extends HandEventBase
+{
+	void HandEventHumanCommandActionFinished (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.HUMANCOMMAND_ACTION_FINISHED; }
+};
+/**@brief		triggered when animation action aborts
+ **/
+class HandEventHumanCommandActionAborted extends HandEventBase
+{
+	void HandEventHumanCommandActionAborted (Man p = null, InventoryLocation src = null) { m_EventID = HandEventID.HUMANCOMMAND_ACTION_ABORTED; }
+};
+
+///@} events
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Hand_Guards.c b/scripts/3_Game/DayZ/Systems/Inventory/Hand_Guards.c
new file mode 100644
index 0000000000000000000000000000000000000000..5bdd79f63d98afbd5acd319d5900707161369648
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Hand_Guards.c
@@ -0,0 +1,406 @@
+///@{ guards
+
+/**@class	HandGuardBase
+ * @brief	represents guard on a transition from state to state
+ **/
+class HandGuardBase
+{
+	/**@fn			GuardCondition
+	 * @brief		enable or disable transition based on condition
+	 * @note		Item is guaranteed to exist on remote client due to replication relationships
+	 * @note		The guard is a boolean operation executed first and which can prevent the transition from firing by returning false
+	 * @return		true if transition is allowed
+	 **/
+	bool GuardCondition(HandEventBase e) { return true; }
+};
+
+
+class HandGuardAnd extends HandGuardBase
+{
+	ref HandGuardBase m_arg0;
+	ref HandGuardBase m_arg1;
+
+	void HandGuardAnd(HandGuardBase arg0 = null, HandGuardBase arg1 = null) { m_arg0 = arg0; m_arg1 = arg1; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		bool result = m_arg0.GuardCondition(e) && m_arg1.GuardCondition(e);
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result + " - " + m_arg0.Type() + " && " + m_arg1.Type(), "HandGuardAnd" , "n/a", "GuardCondition", e.m_Player.ToString() );
+		}
+		#endif
+		
+		return result;
+	}
+};
+
+class HandGuardNot extends HandGuardBase
+{
+	ref HandGuardBase m_arg0;
+
+	void HandGuardNot(HandGuardBase arg0 = null) { m_arg0 = arg0; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		bool result = !m_arg0.GuardCondition(e);
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result + " - " + m_arg0.Type(), "HandGuardNot" , "n/a", "GuardCondition", e.m_Player.ToString() );
+		}
+		#endif
+		return result;
+	}
+};
+
+class HandGuardOr extends HandGuardBase
+{
+	ref HandGuardBase m_arg0;
+	ref HandGuardBase m_arg1;
+
+	void HandGuardOr(HandGuardBase arg0 = null, HandGuardBase arg1 = null) { m_arg0 = arg0; m_arg1 = arg1; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		bool result = m_arg0.GuardCondition(e) || m_arg1.GuardCondition(e);
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result + " - " + m_arg0.Type() + " || " + m_arg1.Type(), "HandGuardOr" , "n/a", "GuardCondition", e.m_Player.ToString() );
+		}
+		#endif
+		return result;
+	}
+};
+
+class HandGuardHasItemInEvent extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardHasItemInEvent(Man p = null) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		EntityAI eai = e.GetSrcEntity();
+		if (eai != NULL /* && CanTakeInHands*/)
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("GuardCondition result: true - " + eai, "HandGuardHasItemInEvent" , "n/a", "GuardCondition", m_Player.ToString() );
+			}
+			#endif
+			return true;
+		}
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: false - " + eai, "HandGuardHasItemInEvent" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+		
+		return false;
+	}
+};
+
+class HandGuardHasWeaponInEvent extends HandGuardHasItemInEvent
+{
+	void HandGuardHasWeapoonInEvent (Man p = null) { }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		EntityAI eai = e.GetSrcEntity();
+		bool result = false;
+		if (eai)
+		{
+			if (eai.IsWeapon())
+			{
+				result = true;
+			}
+		}
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result,"HandGuardHasWeaponInEvent", "n/a", "GuardCondition", e.m_Player.ToString() );
+		}
+		#endif
+		return result;
+	}
+};
+
+class HandGuardIsSameItemInHands extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardIsSameItemInHands(Man p = null) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		bool result = false;
+		if (e.GetSrcEntity() == m_Player.GetHumanInventory().GetEntityInHands())
+		{
+			result = true;
+		}
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result + " - srcItem = " + e.GetSrcEntity() + " hnd= " + m_Player.GetHumanInventory().GetEntityInHands(), "HandGuardIsSameItemInHands" , "n/a", "GuardCondition", e.m_Player.ToString() );
+		}
+		#endif
+		return result;
+	}
+};
+
+class HandGuardHasDestroyedItemInHands extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardHasDestroyedItemInHands(Man p = null) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		EntityAI hnd = m_Player.GetHumanInventory().GetEntityInHands();
+		if (e.GetSrcEntity())
+		{
+			if (e.GetSrcEntity() == hnd)
+			{
+				#ifdef DEVELOPER
+				if ( LogManager.IsInventoryHFSMLogEnable() )
+				{	
+					Debug.InventoryHFSMLog("GuardCondition result: true - has same entity in hands " + hnd, "HandGuardHasDestroyedItemInHands" , "n/a", "GuardCondition", m_Player.ToString() );
+				}
+				#endif
+				return true;
+			}
+
+			if (hnd == null)
+			{
+				#ifdef DEVELOPER
+				if ( LogManager.IsInventoryHFSMLogEnable() )
+				{	
+					Debug.InventoryHFSMLog("GuardCondition result: true - hands already empty", "HandGuardHasDestroyedItemInHands" , "n/a", "GuardCondition", m_Player.ToString() );
+				}
+				#endif
+				return true;
+			}
+		}
+		else
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("GuardCondition result: true - hands already empty and item destroyed", "HandGuardHasDestroyedItemInHands" , "n/a", "GuardCondition", m_Player.ToString() );
+			}
+			#endif
+			return true;
+		}
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: false -  destroyed entity not in hands", "HandGuardHasDestroyedItemInHands" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+		return false;
+	}
+};
+
+class HandGuardHasItemInHands extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardHasItemInHands(Man p = null) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		bool result = false;
+		if (m_Player.GetHumanInventory().GetEntityInHands())
+		{
+			result = true;
+		}
+
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result + " - " + m_Player.GetHumanInventory().GetEntityInHands(), "HandGuardHasItemInHands" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+		return result;
+	}
+};
+
+//! TODO(kumarjac): This guard is unused but it has a fault and doesn't conform with maximimal/minimal checks on "Juncture"/"Remote"
+class HandGuardHasRoomForItem extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardHasRoomForItem(Man p = null) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		if (e.GetDst() && e.GetDst().IsValid())
+		{
+			if ( !GetGame().IsDedicatedServer())
+			{
+				if (m_Player)
+					m_Player.GetHumanInventory().ClearInventoryReservationEx(e.GetDst().GetItem(),e.GetDst());
+			}
+
+			if (!GameInventory.LocationTestAddEntity(e.GetDst(), false, true, true, true, true, false))
+			{
+				#ifdef DEVELOPER
+				if ( LogManager.IsInventoryHFSMLogEnable() )
+				{	
+					Debug.InventoryHFSMLog("GuardCondition result: false - no room at dst=" + InventoryLocation.DumpToStringNullSafe(e.GetDst()), "HandGuardHasRoomForItem" , "n/a", "GuardCondition", m_Player.ToString() );
+				}
+				#endif
+				//if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] HandGuardHasRoomForItem - no room at dst=" + InventoryLocation.DumpToStringNullSafe(e.GetDst()));
+				//Error("[hndfsm] HandGuardHasRoomForItem - no room at dst=" + InventoryLocation.DumpToStringNullSafe(e.GetDst()));
+				return false;
+			}
+				
+			
+			if ( !GetGame().IsDedicatedServer())
+			{
+				if (m_Player)
+					m_Player.GetHumanInventory().AddInventoryReservationEx(e.GetDst().GetItem(), e.GetDst(), GameInventory.c_InventoryReservationTimeoutShortMS);
+			}
+			
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("GuardCondition result: true", "HandGuardHasRoomForItem" , "n/a", "GuardCondition", m_Player.ToString() );
+			}
+			#endif
+			return true;
+		}
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: false - e.m_Dst is null", "HandGuardHasRoomForItem" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+
+		return false;
+	}
+};
+
+class HandGuardCanMove extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardCanMove(Man p = null) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		HandEventMoveTo es = HandEventMoveTo.Cast(e);
+		
+		bool result = e.m_IsJuncture || e.m_IsRemote;
+		if (result == false)
+		{
+			result = GameInventory.LocationCanMoveEntity(es.GetSrc(), es.GetDst());
+		}
+
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result, "HandGuardCanMove" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+		
+		return result;
+	}
+};
+
+class HandGuardCanSwap extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardCanSwap(Man p = NULL) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		HandEventSwap es = HandEventSwap.Cast(e);
+
+		bool result = e.m_IsJuncture || e.m_IsRemote;
+		if (result == false)
+		{
+			result = GameInventory.CanSwapEntitiesEx(es.GetSrc().GetItem(), es.m_Src2.GetItem());
+		}
+
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result, "HandGuardCanSwap" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+		//if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] HandGuardCanSwap guard - cannot swap");
+		return result;
+	}
+};
+
+class HandGuardCanForceSwap extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardCanForceSwap(Man p = NULL) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		HandEventForceSwap es = HandEventForceSwap.Cast(e);
+
+		bool result = e.m_IsJuncture || e.m_IsRemote;
+		if (result == false)
+		{
+			result = GameInventory.CanSwapEntitiesEx(es.GetSrc().GetItem(), es.m_Src2.GetItem());
+
+			if (result == false && es.m_Dst2)
+			{
+				result = GameInventory.CanForceSwapEntitiesEx(es.GetSrc().GetItem(), es.m_Dst, es.m_Src2.GetItem(), es.m_Dst2);
+			}
+		}
+		
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryHFSMLogEnable() )
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result, "HandGuardCanForceSwap" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+
+		return result;
+	}
+};
+
+class HandGuardInstantForceSwap extends HandGuardBase
+{
+	protected Man m_Player;
+	void HandGuardInstantForceSwap(Man p = NULL) { m_Player = p; }
+
+	override bool GuardCondition(HandEventBase e)
+	{
+		HandEventForceSwap es = HandEventForceSwap.Cast(e);
+		
+		InventoryLocation src1 = es.m_Src;
+		InventoryLocation dst2 = es.m_Dst2;
+		
+		bool result = false;
+		if (src1.GetType() == InventoryLocationType.CARGO && dst2.GetType() == InventoryLocationType.CARGO)
+		{
+			if (src1.GetParent() == dst2.GetParent())
+			{
+				result = true;
+			}
+		}
+
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{	
+			Debug.InventoryHFSMLog("GuardCondition result: " + result, "HandGuardInstantForceSwap" , "n/a", "GuardCondition", m_Player.ToString() );
+		}
+		#endif
+
+		return result;
+	}
+};
+
+///@} guards
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Hand_States.c b/scripts/3_Game/DayZ/Systems/Inventory/Hand_States.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d0b82ef4f349099e6145f813af015e384f9e1a9
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Hand_States.c
@@ -0,0 +1,67 @@
+///@{ states
+
+enum HandStateID
+{
+	UNKNOWN				=  0,
+	Empty				=  1,
+	Equipped			=  2,
+}
+
+class HandStateEmpty : HandStableState
+{
+	override void OnEntry(HandEventBase e)
+	 { 
+		if(e)
+		{
+			switch (e.m_EventID)
+			{
+				case HandEventID.MOVETO: 
+					if (HumanInventory.HasInventoryReservation(e.GetSrcEntity(), e.GetDst()))
+						HumanInventory.ClearInventoryReservation(e.GetSrcEntity(), e.GetDst());
+					break;
+				
+				default: {};
+			}
+		}
+		super.OnEntry(e); 
+	}
+	override void OnExit(HandEventBase e) { super.OnExit(e); }
+	override int GetCurrentStateID() { return HandStateID.Empty; }
+};
+
+class HandStateEquipped : HandStableState
+{
+	override void OnEntry(HandEventBase e)
+	{
+		if(e)
+		{
+			switch (e.m_EventID)
+			{
+				case HandEventID.MOVETO: 
+					if (HumanInventory.HasInventoryReservation(e.GetSrcEntity(), e.GetDst()))
+						HumanInventory.ClearInventoryReservation(e.GetSrcEntity(), e.GetDst());
+					break;
+				
+				default: {};
+			} 
+		}
+		super.OnEntry(e); 
+	}
+	override void OnExit(HandEventBase e)
+	{
+		/*switch (e.m_EventID)
+		{
+			case HandEventID.MOVETO: 
+				if (HumanInventory.HasInventoryReservation(e.GetSrcEntity(), e.GetDst()))
+					HumanInventory.ClearInventoryReservation(e.GetSrcEntity(), e.GetDst());
+				break;
+				
+			default: {};
+		}*/
+		super.OnExit(e);
+	}
+	override int GetCurrentStateID() { return HandStateID.Equipped; }
+};
+
+///@} states
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HumanInventory.c b/scripts/3_Game/DayZ/Systems/Inventory/HumanInventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..27c71421b3c80d9ef737718b3c6d20e5cc928af4
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HumanInventory.c
@@ -0,0 +1,616 @@
+/**@class		HumanInventory
+ * @brief		inventory for plain man/human
+ *
+ * HumanInventory has simple synchronous operations only, i.e.
+ * no animations are involved while adding/removing/swapping to/from hands.
+ *
+ * Animations are added on higher level of hierarchy (DayZPlayerInventory for example)
+ **/
+class HumanInventory : GameInventory
+{	
+	int m_syncClearUserReservationindex = -1;
+	//int m_UserReservationToClear = -1;
+	/**@fn			GetEntityInHands
+	 * @return		entity in hands
+	 **/
+	proto native EntityAI GetEntityInHands();
+
+	/**@fn			CanAddEntityInHands
+	 * @brief		alternative for TestAddEntityInHands(e, true, true, true);
+	 **/
+	proto native bool CanAddEntityInHands(EntityAI e);
+
+	/**@fn			TestAddEntityInHands
+	 * @param[in]	e	entity to test for taking in hands
+	 * @param[in]	do_item_check		deny if entity is not InventoryItem
+	 * @param[in]	do_occupancy_test		deny if there is item in hands already
+	 * @param[in]	do_script_check		deny if script conditions fail
+	 * @return		true if item passed all tests
+	 **/
+	proto native bool TestAddEntityInHands(EntityAI e, bool do_resevation_check, bool do_item_check, bool do_lock_check, bool do_occupancy_test, bool do_script_check);
+
+	/**@fn			CanRemoveEntityInHands
+	 * @return		true if entity can be removed from hands
+	 **/
+	proto native bool CanRemoveEntityInHands();
+
+	proto native bool CanOpenInventory();
+
+	/**@fn			CreateInHands
+	 * @brief		creates new entity in hands
+	 * @param[in]	typeName type name of the entity to be created
+	 * @return		new entity or null otherwise
+	 **/
+	proto native EntityAI CreateInHands(string typeName);
+
+	proto native int GetUserReservedLocationCount();
+	proto native int FindUserReservedLocationIndex(notnull EntityAI e);
+	proto native int FindCollidingUserReservedLocationIndex(notnull EntityAI e, notnull InventoryLocation dst);
+	proto native void GetUserReservedLocation(int index, out notnull InventoryLocation dst);
+	proto native int FindFirstUserReservedLocationIndexForContainer(notnull EntityAI e);
+	
+	proto native void SetUserReservedLocation(notnull EntityAI eai, notnull InventoryLocation dst);
+	proto native void ClearUserReservedLocation(notnull EntityAI eai);
+	proto native bool ClearUserReservedLocationAtIndex(int index);
+	proto native void ClearUserReservedLocationForContainer(notnull EntityAI eai);
+	proto native bool GetDebugFlag();
+
+	/**
+	 * @fn		CreateInInventory
+	 * @brief	creates entity somewhere in inventory
+	 *
+	 * @param[in]	type	\p		item type to be placed in inventory
+	 * @return	created entity
+	 **/
+	override EntityAI CreateInInventory(string type)
+	{
+		EntityAI newEntity = super.CreateInInventory(type);
+		if (newEntity == null)
+			newEntity = CreateInHands(type);
+		return newEntity;
+	}
+	
+	void ClearUserReservedLocationSynced(notnull EntityAI eai)
+	{
+		if (GetGame().IsClient())
+			m_syncClearUserReservationindex = FindUserReservedLocationIndex(eai);
+		else if (!GetGame().IsMultiplayer())
+		{
+			ClearUserReservedLocation(eai);
+			eai.GetOnReleaseLock().Invoke(eai);
+		}
+			
+	}
+	
+	void ClearUserReservedLocationAtIndexSynced(int index)
+	{
+		if (GetGame().IsClient())
+			m_syncClearUserReservationindex = index;
+		else if (!GetGame().IsMultiplayer())
+		{
+			ClearUserReservedLocationAtIndex(index);
+			
+			InventoryLocation il = new InventoryLocation();
+			
+			GetUserReservedLocation(index,il);
+			EntityAI item = il.GetItem();
+			item.GetOnReleaseLock().Invoke(item);
+		}
+			
+	}
+
+	Man GetManOwner()
+	{
+		return Man.Cast(GetInventoryOwner());
+	}
+
+	bool HasEntityInHands(EntityAI e)
+	{
+		return e == GetEntityInHands();
+	}
+	
+	bool ProcessHandEvent(HandEventBase e);
+
+	void OnHandsStateChanged(HandStateBase src, HandStateBase dst);
+	void OnHandsExitedStableState(HandStateBase src, HandStateBase dst);
+	void OnHandsEnteredStableState(HandStateBase src, HandStateBase dst);
+	
+	void OnEntityInHandsCreated(InventoryLocation src)
+	{
+		InventoryLocation cpy = new InventoryLocation();
+		cpy.Copy(src);
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] OnEntityInHandsCreated src=" + InventoryLocation.DumpToStringNullSafe(cpy));
+		ProcessHandEvent(new HandEventCreated(GetManOwner(), src));
+	}
+
+	void OnEntityInHandsDestroyed(InventoryLocation src)
+	{
+		InventoryLocation cpy = new InventoryLocation();
+		cpy.Copy(src);
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] OnEntityInHandsDestroyed src=" + InventoryLocation.DumpToStringNullSafe(cpy));
+		ProcessHandEvent(new HandEventDestroyed(GetManOwner(), cpy));
+	}
+
+	bool HandEvent(InventoryMode mode, HandEventBase e)
+	{
+		return true;
+	}
+	
+	override bool DropEntity(InventoryMode mode, EntityAI owner, notnull EntityAI item)
+	{
+		InventoryLocation src = new InventoryLocation();
+		if (item && item.GetInventory() && item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			switch (src.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::DropEntity(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+					HandEvent(mode, new HandEventDrop(GetManOwner(), src));
+					return true;
+
+				default:
+					return super.DropEntity(mode, owner, item);
+			}
+		}
+
+		Error("No inventory location");
+		return false;
+	}
+	
+	bool ThrowEntity(EntityAI item, vector dir, float force)
+	{
+		if (GetGame().IsServer() && GetGame().IsMultiplayer())
+			return false;
+		
+		DayZPlayer player = DayZPlayer.Cast(item.GetHierarchyRootPlayer());
+		InventoryMode invMode = InventoryMode.PREDICTIVE;
+				
+		if (player.NeedInventoryJunctureFromServer(item, item.GetHierarchyParent(), null))
+			invMode = InventoryMode.JUNCTURE;
+		
+		InventoryLocation src = new InventoryLocation();
+		if (item && item.GetInventory() && item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			switch (src.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::ThrowEntity item=" + item);
+					HandEventThrow throwEvent = new HandEventThrow(GetManOwner(), src);
+					throwEvent.SetForce(dir * force);
+					HandEvent(invMode, throwEvent);
+					return true;
+
+				default:
+					DropEntity(invMode, player, item);
+					return true;
+			}
+		}
+		Error("No inventory location");
+		return false;
+	}
+		
+	bool RedirectToHandEvent(InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (src.GetType() == InventoryLocationType.HANDS)
+		{
+			Man man_src = Man.Cast(src.GetParent());
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HI::RedirectToHandEvent - source location == HANDS, player has to handle this");
+			
+			EntityAI item = src.GetItem();
+			
+			int r_index = FindUserReservedLocationIndex(item);
+
+			if (r_index >= 0)
+			{
+				InventoryLocation r_il = new InventoryLocation();
+				GetUserReservedLocation(r_index,r_il);
+
+				ClearUserReservedLocationAtIndex(r_index);
+				int r_type = r_il.GetType();
+				if (r_type == InventoryLocationType.CARGO || r_type == InventoryLocationType.PROXYCARGO)
+				{
+					r_il.GetParent().GetOnReleaseLock().Invoke(item);
+				}
+				else if (r_type == InventoryLocationType.ATTACHMENT)
+				{
+					r_il.GetParent().GetOnAttachmentReleaseLock().Invoke(item, r_il.GetSlot());
+				}
+			}
+	
+			man_src.GetHumanInventory().HandEvent(mode, new HandEventMoveTo(man_src, src, dst));
+			return true;
+		}
+		
+		if (dst.GetType() == InventoryLocationType.HANDS)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HI::RedirectToHandEvent - dst location == HANDS, player has to handle this");
+						
+			Man man_dst = Man.Cast(dst.GetParent());
+			man_dst.GetHumanInventory().HandEvent(mode, new HandEventTake(man_dst, src));
+			return true;
+		}
+		return false;
+	}
+
+	override bool TakeToDst(InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] Take2Dst(" + typename.EnumToString(InventoryMode, mode) + ") src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+
+		if (GetManOwner().IsAlive() && RedirectToHandEvent(mode, src, dst))
+			return true;
+
+		return super.TakeToDst(mode, src, dst);
+	}
+
+	override bool TakeEntityToInventory(InventoryMode mode, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			if (FindFreeLocationFor(item, flags, dst))
+			{
+				if (RedirectToHandEvent(mode, src, dst))
+					return true;
+
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::Take2Inv(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+				return super.TakeEntityToInventory(mode, flags, item);
+			}
+			else
+				return false; // no room
+		}
+		Error("HumanInventory::TakeEntityToInventory: No inventory location");
+		return false;
+	}
+
+	/**
+	\brief Put item into into cargo on specific cargo location
+	*/
+	override bool TakeEntityToCargoEx(InventoryMode mode, notnull EntityAI item, int idx, int row, int col)
+	{
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			switch (src.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (GetInventoryOwner().IsAlive())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::Take2Cgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " row=" + row + " col=" + col);
+						InventoryLocation dst = new InventoryLocation();
+						dst.SetCargo(GetInventoryOwner(), item, idx, row, col, item.GetInventory().GetFlipCargo());
+
+						HandEvent(mode, new HandEventMoveTo(GetManOwner(), src, dst));
+						return true;
+					}
+
+					return super.TakeEntityToCargoEx(mode, item, idx, row, col);
+
+				default:
+					return super.TakeEntityToCargoEx(mode, item, idx, row, col);
+			}
+		}
+
+		Error("HumanInventory::TakeEntityToCargoEx: No inventory location");
+		return false;
+	}
+
+	override bool TakeEntityAsAttachmentEx(InventoryMode mode, notnull EntityAI item, int slot)
+	{
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			switch (src.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (GetInventoryOwner().IsAlive())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::Take2Att(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " slot=" + slot);
+						InventoryLocation dst = new InventoryLocation();
+						EntityAI src_entity = GetInventoryOwner();
+						dst.SetAttachment(src_entity, item, slot);
+
+						HandEvent(mode, new HandEventMoveTo(GetManOwner(), src, dst));
+						return true;
+					}
+
+					return super.TakeEntityAsAttachmentEx(mode, item, slot);
+
+				default:
+					return super.TakeEntityAsAttachmentEx(mode, item, slot);
+			}
+		}
+
+		Error("HumanInventory::TakeEntityAsAttachmentEx: No inventory location");
+		return false;
+	}
+
+	override bool SwapEntities(InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2)
+	{
+		InventoryLocation src1, src2, dst1, dst2;
+		if (GameInventory.MakeSrcAndDstForSwap(item1, item2, src1, src2, dst1, dst2))
+		{
+			bool handled = false;
+			switch (src1.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					//! returns item to previous location, if available
+					InventoryLocation fswap_dst2 = new InventoryLocation;
+					if ( SwappingToPreviousLocation(item1, item2, fswap_dst2) )
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::Swap HandEventForceSwap(" + typename.EnumToString(InventoryMode, mode) + ") IH=src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2));
+						HandEvent(mode, new HandEventForceSwap(GetManOwner(), src1, src2, dst1, fswap_dst2));
+					}
+					else
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::Swap HandEventSwap(" + typename.EnumToString(InventoryMode, mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + "src2=" + InventoryLocation.DumpToStringNullSafe(src2));
+						HandEvent(mode, new HandEventSwap(GetManOwner(), src1, src2, dst1, dst2));
+					}
+					handled = true;
+					break;
+			}
+
+			switch (src2.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::Swap HandEventSwap2(" + typename.EnumToString(InventoryMode, mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " IH=src2=" + InventoryLocation.DumpToStringNullSafe(src2));
+					HandEvent(mode, new HandEventSwap(GetManOwner(), src2, src1, dst2, dst1));
+					handled = true;
+					break;
+			}
+
+			if (!handled)
+				return super.SwapEntities(mode, item1, item2);
+
+			return true;
+		}
+
+		Error("HumanInventory::SwapEntities: cannot create src1, src2, dst1, dst2");
+		return false;
+	}
+
+	override bool ForceSwapEntities(InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		InventoryLocation src1, src2, dst1;
+		if (GameInventory.MakeSrcAndDstForForceSwap(item1, item2, src1, src2, dst1, item2_dst))
+		{
+			GameInventory manOwnerInventory = GetManOwner().GetInventory();
+			
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::FSwap(" + typename.EnumToString(InventoryMode, mode) + ") dst1=" + InventoryLocation.DumpToStringNullSafe(dst1)+ " dst2=" + InventoryLocation.DumpToStringNullSafe(item2_dst));
+			bool handled = false;
+			switch (src1.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::FSwap-HND@1(" + typename.EnumToString(InventoryMode, mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " item2_dst=" + InventoryLocation.DumpToStringNullSafe(item2_dst));
+					HandEventBase e = new HandEventForceSwap(GetManOwner(), src1, src2, dst1, item2_dst);
+					e.ReserveInventory();
+					HandEvent(mode, e);
+					handled = true;
+					break;
+
+			}
+
+			switch (src2.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					//! returns item to previous location, if available
+					InventoryLocation fswap_dst2 = new InventoryLocation;
+					if ( SwappingToPreviousLocation(item2, item1, fswap_dst2))
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::FSwap-PREV(" + typename.EnumToString(InventoryMode, mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " fswap_dst2=" + InventoryLocation.DumpToStringNullSafe(fswap_dst2));
+						HandEvent(mode, new HandEventForceSwap(GetManOwner(), src1, src2, dst1, fswap_dst2));
+					}
+					else
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::FSwap-HND@2(" + typename.EnumToString(InventoryMode, mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " item2_dst=" + InventoryLocation.DumpToStringNullSafe(item2_dst));
+						HandEvent(mode, new HandEventForceSwap(GetManOwner(), src1, src2, dst1, item2_dst));
+					}
+				
+					handled = true;	
+					break;
+			}
+			
+			bool returnValue = true;
+
+			if (!handled)
+				returnValue = super.ForceSwapEntities(mode, item1, item2, item2_dst);
+			
+			return returnValue;
+		}
+
+		Error("HumanInventory::ForceSwapEntities: No inventory location");
+		return false;
+	}
+
+	override bool LocalDestroyEntity(notnull EntityAI item)
+	{
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			switch (src.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (GetInventoryOwner().IsAlive())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::LocalDestroy inv item=" + item);
+						HandEvent(InventoryMode.LOCAL, new HandEventDestroy(GetManOwner(), src));
+						return true;
+					}
+
+					return super.LocalDestroyEntity(item);
+
+				default:
+					return super.LocalDestroyEntity(item);
+			}
+		}
+
+		Error("LocalDestroyEntity: No inventory location");
+		return false;
+	}
+
+	override bool ReplaceItemWithNew(InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		EntityAI itemInHands = GetEntityInHands();
+		if (itemInHands == lambda.m_OldItem)
+			return ReplaceItemInHandsWithNew(mode, lambda);
+
+		return super.ReplaceItemWithNew(mode, lambda);
+	}
+	
+	bool ReplaceItemElsewhereWithNewInHands(InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInElsewhereWithNewinHandsImpl(mode, new HandEventDestroyElsewhereAndReplaceWithNewInHands(GetManOwner(), null, lambda));
+	}
+	
+	protected bool ReplaceItemInElsewhereWithNewinHandsImpl(InventoryMode mode, HandEventBase e)
+	{
+		if (GetEntityInHands())
+		{
+			Error("[inv] HumanInventory::ReplaceItemInElsewhereWithNewinHandsImpl Item in hands, event=" + e.DumpToString());
+			return false;
+		}
+
+		InventoryLocation dst = e.GetDst();
+		if (dst)
+		{
+			switch (dst.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if (GetInventoryOwner().IsAlive())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::ReplaceItemInElsewhereWithNewinHandsImpl event=" + e);
+						HandEvent(mode, e);
+						return true;
+					}
+
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::ReplaceItemInElsewhereWithNewinHandsImpl DEAD_owner=" + GetInventoryOwner().GetName() +"="+ GetInventoryOwner());
+					Error("HumanInventory::ReplaceItemInElsewhereWithNewinHandsImpl TODO"); // replace-with-new in corpse's hands, not implemented
+					return false;
+
+				default:
+					Error("[inv] HumanInventory::ReplaceItemInElsewhereWithNewinHandsImpl src has to be hands");
+					return false;
+			}
+		}
+
+		Error("[inv] HumanInventory::ReplaceItemInElsewhereWithNewinHandsImpl no dst in event, event=" + e.DumpToString());
+		return false;
+	}
+
+	protected bool ReplaceItemInHandsWithNewImpl(InventoryMode mode, HandEventBase e)
+	{
+		EntityAI itemInHands = GetEntityInHands();
+		InventoryLocation src = new InventoryLocation();
+		if (itemInHands && itemInHands.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			switch (src.GetType())
+			{
+				case InventoryLocationType.HANDS:
+					if ((mode != InventoryMode.SERVER) && GetInventoryOwner().IsAlive())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::ReplaceItemInHandsWithNewImpl event=" + e);
+						HandEvent(mode, e);
+						return true;
+					}
+
+					if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] HumanInventory::ReplaceItemInHandsWithNewImpl DEAD_owner=" + GetInventoryOwner().GetName() +"="+ GetInventoryOwner());
+					HandEvent(mode, e);
+					return true;
+
+				default:
+					Error("[inv] HumanInventory::ReplaceItemInHandsWithNewImpl src has to be hands");
+					return false;
+			}
+		}
+
+		Error("[inv] HumanInventory::ReplaceItemInHandsWithNewImpl No item in hands, event=" + e.DumpToString());
+		return false;
+	}
+
+	bool ReplaceItemInHandsWithNew(InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInHandsWithNewImpl(mode, new HandEventDestroyAndReplaceWithNew(GetManOwner(), null, lambda));
+	}
+
+	bool ReplaceItemInHandsWithNewElsewhere(InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		return ReplaceItemInHandsWithNewImpl(mode, new HandEventDestroyAndReplaceWithNewElsewhere(GetManOwner(), null, lambda));
+	}
+	
+	bool SwappingToPreviousLocation(EntityAI item1, EntityAI item2, out InventoryLocation dst)
+	{
+		bool SwapToPrevious = true;
+		InventoryLocation src1 = new InventoryLocation();
+		InventoryLocation src2 = new InventoryLocation();
+		dst = new InventoryLocation();
+		if (item1.GetInventory().GetCurrentInventoryLocation(src1) && item2.GetInventory().GetCurrentInventoryLocation(src2))
+		{
+			if (item1.m_OldLocation && item1.m_OldLocation.IsValid() && !item1.m_OldLocation.CollidesWith(src2) && item1.m_OldLocation.GetParent() && item1.m_OldLocation.GetParent().GetHierarchyRootPlayer())	
+			{
+				dst.Copy(item1.m_OldLocation);
+				
+				int count = item1.GetInventory().GetSlotIdCount();
+				if (count > 0 && src2.GetType() == InventoryLocationType.ATTACHMENT) //item2 is currently attached somewhere
+				{
+					for (int i = 0; i < count; i++)
+					{
+						int slotID = item1.GetInventory().GetSlotId(i);
+						if (src2.GetSlot() == slotID) //can be attached into the same slot. And will be.
+							return false;
+					}
+				}
+				
+				if (!item1.m_OldLocation.GetParent().GetInventory().LocationCanAddEntity(item1.m_OldLocation))
+					SwapToPrevious = false;
+
+				if (CanSwapEntitiesEx(item1,item2))
+					SwapToPrevious = false;
+				
+				if (SwapToPrevious)
+					return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	void HandleInventoryManipulation();
+	
+	void Update(float delta_time)
+	{
+		HandleInventoryManipulation();
+		if ( m_syncClearUserReservationindex != -1 && ScriptInputUserData.CanStoreInputUserData())
+		{
+			ScriptInputUserData ctx = new ScriptInputUserData();
+			ctx.Write(INPUT_UDT_INVENTORY);
+			ctx.Write(InventoryCommandType.USER_RESERVATION_CANCEL);
+			ctx.Write(m_syncClearUserReservationindex);
+			ctx.Send();
+			
+			InventoryLocation il = new InventoryLocation();
+			
+			GetUserReservedLocation(m_syncClearUserReservationindex,il);
+			ClearUserReservedLocationAtIndex(m_syncClearUserReservationindex);
+			EntityAI item = il.GetItem();
+			item.GetOnReleaseLock().Invoke(item);
+			m_syncClearUserReservationindex = -1;
+		}
+	}
+
+	bool ValidateUserReservationCancel(inout Serializer ctx, InventoryValidation validation)
+	{
+		validation.m_Result = InventoryValidationResult.SUCCESS;
+
+		int index = -1;
+		if (!ctx.Read(index))
+		{
+			//! TODO(kumarjac): It returned true and claimed success before, is this correct?
+			return true; 
+		}
+		
+		ClearUserReservedLocationAtIndex(index);
+		//m_UserReservationToClear = index;
+		
+		return true; 
+	}
+}
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/HumanInventoryWithFSM.c b/scripts/3_Game/DayZ/Systems/Inventory/HumanInventoryWithFSM.c
new file mode 100644
index 0000000000000000000000000000000000000000..36ef06ea9a4d5a0e372d5a0be92c4643cc4725be
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/HumanInventoryWithFSM.c
@@ -0,0 +1,166 @@
+/**
+ * @class	HumanInventoryWithFSM
+ * @brief	HumanInventory... with FSM (synchronous, no anims)
+ **/
+class HumanInventoryWithFSM : HumanInventory
+{
+	protected ref HandFSM m_FSM;  /// hand slot state machine
+	protected ref HandStateBase m_Empty;
+	protected ref HandStateBase m_Equipped;
+
+	void HumanInventoryWithFSM ()
+	{
+		m_FSM = new HandFSM();
+	}
+	
+	void CreateStableStates ()
+	{
+		// stable states are created only if they do not exist already (for example created by derived class like DayZPlayerInventory)
+		// @NOTE: this cannot be done in constructor, as there is NO owner set yet. GetManOwner() will therefore return NULL.
+		if (!m_Empty)
+			m_Empty = new HandStateEmpty(GetManOwner());
+		if (!m_Equipped)
+			m_Equipped = new HandStateEquipped(GetManOwner());
+	}
+
+	override void Init ()
+	{
+		// setup state machine
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[hndfsm] Initializing Human Inventory FSM");
+		
+		// basic states
+		CreateStableStates();
+		
+		// events
+		HandEventBase __T__ = new HandEventTake;
+		HandEventBase __D__ = new HandEventDrop;
+		HandEventBase __Tw_ = new HandEventThrow;
+		HandEventBase __M__ = new HandEventMoveTo;
+		HandEventBase __W__ = new HandEventSwap;
+		HandEventBase __F__ = new HandEventForceSwap;
+		HandEventBase __X__ = new HandEventDestroy;
+		HandEventBase __Xd_ = new HandEventDestroyed;
+		HandEventBase __R__ = new HandEventDestroyAndReplaceWithNew;
+		HandEventBase __Re_ = new HandEventDestroyAndReplaceWithNewElsewhere;
+		HandEventBase __Rh_ = new HandEventDestroyElsewhereAndReplaceWithNewInHands;
+		HandEventBase __Rd_ = new HandEventReplaced;
+		HandEventBase __Cd_ = new HandEventCreated;
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _abt_ = new HandEventHumanCommandActionAborted;
+
+
+		HandReplacingItemInHands replacing = new HandReplacingItemInHands(GetManOwner());
+		HandReplacingItemInHands replacingElsewhere = new HandReplacingItemInHands(GetManOwner());
+		HandReplacingItemElsewhereWithNewInHands replacingElsewhere3 = new HandReplacingItemElsewhereWithNewInHands(GetManOwner());
+
+		// setup transitions
+		m_FSM.AddTransition(new HandTransition( m_Empty   , __T__,  m_Equipped, new HandActionTake, new HandGuardHasItemInEvent(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_Empty   , __Cd_,  m_Equipped, new HandActionCreated, new HandGuardHasItemInEvent(GetManOwner())));
+
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __D__,    m_Empty, new HandActionDrop, null));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __Tw_,    m_Empty, new HandActionThrow, null));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __M__,    m_Empty, new HandActionMoveTo, new HandGuardAnd(new HandGuardHasItemInHands(GetManOwner()), new HandGuardCanMove(GetManOwner()))));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __X__,    m_Empty, new HandActionDestroy, new HandGuardHasItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __Xd_,    m_Empty, new HandActionDestroyed, new HandGuardHasDestroyedItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __Xd_, m_Equipped, new HandActionDestroyed, new HandGuardNot(new HandGuardHasDestroyedItemInHands(GetManOwner()))));
+
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __R__, replacing));
+		m_FSM.AddTransition(new HandTransition(replacing, _fin_, m_Equipped));
+			replacing.AddTransition(new HandTransition(replacing.m_Replacing, _abt_, m_Equipped));
+
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __Re_, replacingElsewhere));
+		m_FSM.AddTransition(new HandTransition(replacingElsewhere, _fin_, m_Empty));
+			replacingElsewhere.AddTransition(new HandTransition(replacingElsewhere.m_Replacing, _abt_, m_Equipped));
+		
+		m_FSM.AddTransition(new HandTransition(m_Empty, __Rh_, replacingElsewhere3));
+		m_FSM.AddTransition(new HandTransition(replacingElsewhere3, _fin_, m_Equipped));
+			replacingElsewhere3.AddTransition(new HandTransition(replacingElsewhere3.m_Replacing, _abt_, m_Empty));
+		
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __Rd_, m_Equipped, new HandActionReplaced, null));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __W__, m_Equipped, new HandActionSwap, new HandGuardAnd(new HandGuardHasItemInHands(GetManOwner()), new HandGuardCanSwap(GetManOwner()))));
+		m_FSM.AddTransition(new HandTransition(m_Equipped, __F__, m_Equipped, new HandActionForceSwap, new HandGuardAnd(new HandGuardHasItemInHands(GetManOwner()), new HandGuardCanForceSwap(GetManOwner()))));
+
+		// start FSM
+		m_FSM.SetInitialState(m_Empty);
+		m_FSM.Start();
+		
+		super.Init();
+	}
+
+	bool CanProcessHandEvents () { return m_FSM && m_FSM.IsRunning(); }
+
+	/**@fn			ProcessHandEvent
+	 * @brief		hand's fsm handling of events
+	 * @NOTE:		warning: ProcessHandEvent can be called only within DayZPlayer::HandleInventory (or ::CommandHandler)
+	 **/
+	override bool ProcessHandEvent (HandEventBase e)
+	{
+		//SyncRemote(e);
+		if (m_FSM.ProcessEvent(e) == ProcessEventResult.FSM_OK)
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{
+				Debug.InventoryHFSMLog("STS = " + GetManOwner().GetSimulationTimeStamp() , e.ToString(), "ProcessHandEvent", e.m_Player.ToString() );
+			}
+			#endif
+			return true;
+		}
+		else
+		{
+			//if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("FSM refused to process event (no transition): src=" + GetCurrentState().ToString() + " event=" + e.ToString());
+			return false;
+		}
+	}
+	
+	bool ProcessHandAbortEvent (HandEventBase e)
+	{
+		//SyncRemote(e);
+		ProcessEventResult aa;
+		m_FSM.ProcessAbortEvent(e, aa);
+		if (aa == ProcessEventResult.FSM_OK)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugSpam("[hndfsm]  STS = " + GetManOwner().GetSimulationTimeStamp() + " Processed event e=" + e.ToString());
+			return true;
+		}
+		else
+		{
+			//if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("FSM refused to process event (no transition): src=" + GetCurrentState().ToString() + " event=" + e.ToString());
+			return false;
+		}
+	}
+
+	override bool OnStoreLoad (ParamsReadContext ctx, int version)
+	{
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+		
+		//@TODO
+		//m_FSM.OnStoreLoad(ctx, version);
+
+		return true;
+	}
+
+	override void OnStoreSave (ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+    //@TODO
+		//m_FSM.OnStoreSave(ctx, version);
+	}
+
+	/**@fn			GetCurrentStateID
+	 * @return		identifier of current stable state
+	 **/
+	int GetCurrentStateID () { return m_FSM.GetCurrentStateID(); }
+	
+	bool IsIdle () { return m_FSM.GetCurrentState().IsIdle(); }
+
+	/**@fn			NetSyncCurrentStateID
+	 * @brief		Engine callback - network synchronization of FSM's state. not intended to direct use.
+	 **/
+	void NetSyncCurrentStateID (int id)
+	{
+		m_FSM.NetSyncCurrentStateID(id);
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Inventory.c b/scripts/3_Game/DayZ/Systems/Inventory/Inventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..93b02058880b2bbbb25cd2abd8d78a27a6c98155
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Inventory.c
@@ -0,0 +1,1349 @@
+//-------------------------------------------------------
+enum InventoryCommandType
+{
+	MOVE,					///< generic move, may involve animations
+	SYNC_MOVE,				///< synchronous move. action is finished immeadiately, no animations involved
+	HAND_EVENT,				///< event for hands
+	SWAP,					///< swap two entities (simple swap of compatible objects)
+	FORCESWAP,				///< Forced swap two entities. First goes to second's place, second goes "somewhere else"
+	DESTROY,				///< destroy of entity right in inventory
+	REPLACE,				///< replace of entity in inventory (@NOTE: hands goes through HAND_EVENT)
+	USER_RESERVATION_CANCEL	///< Clear user reserved inventory space
+};
+enum InventoryJunctureType
+{
+	TAKE,			///< taking from ground
+	SWAP,			///< swapping from ground
+	//LOAD,			///< load mag from ground
+};
+
+//! NOTE: PREDICTIVE is not to be used at all in multiplayer
+enum InventoryMode
+{
+	PREDICTIVE,		///< 'Predictive' means that the operation uses Client-Side Prediction, i.e. the action runs the same code on both, client AND server
+	LOCAL,			///< 'Local' operation executes from where it is run
+	JUNCTURE,		///< 'Juncture' operation is used whenever there is possibility of race condition, i.e. two players picking same item from ground
+	SERVER,			///< 'Server' mode operation is required if and only if the operation runs only on server (creates and/or destroys objects)
+};
+
+enum InventoryValidationResult
+{
+	FAILED,
+	JUNCTURE,
+	SUCCESS
+};
+
+enum InventoryValidationReason
+{
+	UNKNOWN,
+	JUNCTURE_DENIED,
+	DROP_PREVENTED
+};
+
+class InventoryValidation
+{
+	bool m_IsJuncture = false;
+	bool m_IsRemote = false;
+
+	InventoryValidationResult m_Result = InventoryValidationResult.FAILED;
+	InventoryValidationReason m_Reason = InventoryValidationReason.UNKNOWN;
+
+	bool IsAuthoritative()
+	{
+		return !m_IsJuncture && !m_IsRemote;
+	}
+};
+
+enum InventoryCheckContext
+{
+	DEFAULT,
+	SYNC_CHECK,
+}
+
+enum FindInventoryReservationMode
+{
+	//! The original logic, finds anything depending on the parameters, item or dst required
+	LEGACY,
+	//! Find a reservation for the item EXCLUDING the dst, item and dst required
+	ITEM,
+	//! Find a reservation for the dst EXCLUDING the item, item and dst required
+	DST,
+	//! Find an exact reservation for item and dst, item and dst required
+	EQUAL,
+};
+
+/**@class		GameInventory
+ * @brief		script counterpart to engine's class Inventory
+ **/
+class GameInventory
+{
+	protected static int m_inventory_check_context = InventoryCheckContext.DEFAULT;
+
+//-------------------------------------------------------
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///@{ Engine native functions
+
+	/**
+	 * @fn		GetInventoryOwner
+	 * @return	entity associated with this inventory
+	 **/
+	proto native EntityAI GetInventoryOwner();
+	
+#ifdef DEVELOPER
+	/**
+	 * @fn		DumpInventoryDebug
+	 * @brief	dump out failed inventory operations of the current inventory
+	 **/
+	proto native void DumpInventoryDebug();
+	
+	/**
+	 * @fn		DumpStaticInventoryDebug
+	 * @brief	dump out a more global list of failed inventory operations
+	 **/
+	static proto native void DumpStaticInventoryDebug();
+#endif
+	
+	/**
+	 * @fn		HasEntityInInventory
+	 * @brief	query inventory if item is somewhere
+	 *
+	 * All available inventory locations (hands, cargo, attachments, proxycargo, ...) are
+	 * traversed recursively from root to leafs.
+	 *
+	 * @param[in]	item	\p		item to be found in inventory
+	 * @return		true if found, false otherwise
+	 **/
+	proto native bool HasEntityInInventory(notnull EntityAI item);
+
+	/**
+	 * @fn		EnumerateInventory
+	 * @brief		enumerate inventory using traversal type and filling items array
+	 * @param[in]	tt		used traversal type
+	 * @param[out]	items		items in inventory (in order determined by traversal)
+	 * @return	true if found any, false otherwise
+	 **/	
+	proto native bool EnumerateInventory(InventoryTraversalType tt, out array<EntityAI> items);
+
+	/**
+	 * @fn		CountInventory
+	 * @brief	almost identical to EnumerateInventory except it does not return items
+	 * @return	number of items
+	 **/		
+	proto native int CountInventory();
+
+
+	///@{ cargo
+	proto native CargoBase GetCargo();
+	proto native CargoBase GetCargoFromIndex(int index);
+	/**
+	 * @brief Create Entity of specified type in cargo of entity
+	 **/
+	proto native EntityAI CreateEntityInCargo(string typeName);
+	/**
+	 * @brief	Create Entity of specified type in cargo of entity at coordinates (row, col)
+	 * @param	typeName		type to create
+	 * @param	row		the row of cargo to be created at
+	 * @param	col		the column of cargo to be created at
+	 **/
+	proto native EntityAI CreateEntityInCargoEx(string typeName, int idx, int row, int col, bool flip);
+
+	proto native bool HasEntityInCargo(notnull EntityAI e);
+	proto native bool HasEntityInCargoEx(notnull EntityAI e, int idx, int row, int col);
+	proto native bool CanAddEntityInCargo(notnull EntityAI e, bool flip);
+	proto native bool CanAddEntityInCargoEx(notnull EntityAI e, int idx, int row, int col, bool flip);
+	proto native bool CanAddEntityInCargoExLoc(InventoryLocation loc);
+	proto native bool TestAddEntityInCargoEx(notnull EntityAI e, int idx, int row, int col, bool flip, bool do_resevation_check, bool do_item_check, bool do_lock_check, bool do_occupancy_test, bool do_script_check, bool do_script_load_check);
+	proto native bool TestAddEntityInCargoExLoc(notnull InventoryLocation loc, bool do_resevation_check, bool do_item_check, bool do_lock_check, bool do_occupancy_test, bool do_script_check, bool do_script_load_check);
+	//proto native bool AddEntityInCargo (notnull EntityAI owner, EntityAI cargo);
+	//proto native bool AddEntityInCargoEx (notnull EntityAI owner, notnull EntityAI e, int idx, int row, int col);
+	proto native bool CanRemoveEntityInCargo(notnull EntityAI e);
+	proto native bool CanRemoveEntityInCargoEx(notnull EntityAI e, int idx, int row, int col);
+	///@} cargo
+
+
+	///@{ attachments
+	/**@fn		GetSlotId
+	 * @param	index		index into array of configured slots (@see GetSlotIdCount)
+	 * @return	slot where this item belongs
+	 **/
+	proto native int GetSlotId(int index);
+	/**@fn		GetSlotIdCount
+	 * @return	number of slots this item can belong to
+	 **/
+	proto native int GetSlotIdCount();
+	/**@fn		GetAttachmentSlotId
+	 * @param	index		index of the slot for attachment (@see GetAttachmentSlotsCount)
+	 * @return	slot for attachment
+	 **/
+	proto native int GetAttachmentSlotId(int index);
+	/**@fn		GetAttachmentSlotsCount
+	 * @return	number of slots for attachments
+	 **/
+	proto native int GetAttachmentSlotsCount();
+	/**@fn		HasAttachmentSlot
+	 * @return	true if this entity has attachments slot with id=slotId
+	 **/
+	/*proto native*/bool HasAttachmentSlot(int slotId) //TODO - flip to code
+	{
+		int count = GetAttachmentSlotsCount();
+		for (int i = 0; i < count; i++)
+		{
+			if (GetAttachmentSlotId(i) == slotId)
+				return true;
+		}
+		return false;
+	}
+	/**@fn		HasInventorySlot
+	 * @return	true if this entity has inventory slot with id=slotId
+	 **/
+	proto native bool HasInventorySlot(int slotId);
+	/**@fn		AttachmentCount
+	 * @brief	Returns count of attachments attached to this item
+	 **/
+	proto native int AttachmentCount();
+	/**@fn		CreateAttachment
+	 * @brief	Create Entity of specified type as attachment of entity
+	 **/
+	proto native EntityAI CreateAttachment(string typeName);
+	/**@fn		CreateAttachmentEx
+	 * @brief	Create Entity of specified type as attachment of entity
+	 * @param	typeName		type to create
+	 * @param	slotId		the slot to be created in
+	 **/
+	proto native EntityAI CreateAttachmentEx(string typeName, int slotId);
+	/**@fn		GetAttachmentFromIndex
+	 * @return	attached entity by attachment index
+	 * @NOTE:	index is not slot! for getting attachment by slot use FindAttachment
+	 **/
+	proto native EntityAI GetAttachmentFromIndex(int index);
+	/**
+	 * @brief	Returns attached entity in slot (you can use InventorySlots.GetSlotIdFromString(name) to get slot id)
+	 **/
+	proto native EntityAI FindAttachment(int slot);
+	/**
+	 * @brief	Returns attached entity in slot (you can use EntityAI.GetActionComponentName to get slot id)
+	 **/
+	proto native EntityAI FindAttachmentByName(string slotName);
+	/**@fn		HasAttachment
+	 * @brief	brief Returns True if entity is attached to this
+	 **/
+	proto native bool HasAttachment(notnull EntityAI e);
+	/**@fn		HasAttachmentEx
+	 * @brief	brief Returns True if entity is attached to this in slot
+	 **/
+	proto native bool HasAttachmentEx(notnull EntityAI e, int slot);
+	/**@fn		CanAddAttachment
+	 * @brief	Check if attachment can be added to any slot
+	 * @return	true if entity can be added as attachment
+	 **/
+	proto native bool CanAddAttachment(notnull EntityAI e);
+	/**@fn		CanAddAttachmentEx
+	 * @brief	Check if attachment can be added to slot
+	 * @NOTE:	Note that slot index IS NOT slot ID! Slot ID is defined in DZ/data/config.cpp
+	 **/
+	proto native bool CanAddAttachmentEx(notnull EntityAI e, int slot);
+
+	proto native bool CanRemoveAttachment(EntityAI attachment);
+	proto native bool CanRemoveAttachmentEx(EntityAI attachment, int slot);
+
+	//proto native bool RemoveAttachment(EntityAI attachment);
+	//proto native bool RemoveAttachmentEx(EntityAI attachment, int slot);
+
+	/**
+	 * @brief	Returns placeholder entity for slot (naked arms, legs etc)
+	 **/
+	proto native EntityAI FindPlaceholderForSlot(int slot);
+	proto native bool IsPlaceholderEntity(notnull Object e);
+	///@} attachments
+
+
+	/**
+	 * @fn		GetCurrentInventoryLocation
+	 * @brief	returns information about current item location
+	 * @param[out]	loc	\p		current InventoryLocation
+	 * @return	true if current location retrieved (and is valid)
+	 **/
+	proto native bool GetCurrentInventoryLocation(out notnull InventoryLocation loc);
+
+	/**
+	 * @brief		FindFreeLocationFor
+	 * @param[in]	item		item that would be placed in inventory
+	 * @param[out]	loc			the InventoryLocation the item can be placed to
+	 * @return	true if found any, false otherwise
+	 **/
+	proto native bool FindFreeLocationFor(notnull EntityAI item, FindInventoryLocationType flags, out notnull InventoryLocation loc);
+		/**
+	 * @brief		FindFreeLocationForEx
+	 * @param[in]	item		item that would be placed in inventory
+	 * @param[out]	loc			the InventoryLocation the item can be placed to
+	 * @return	true if found any, false otherwise
+	 **/
+	proto native bool FindFreeLocationForEx(notnull EntityAI item, FindInventoryLocationType flags, notnull InventoryLocation exclude, out notnull InventoryLocation loc);
+
+	/**
+	 * @brief		FindFirstFreeLocationForNewEntity
+	 * @param[in]	item_type		item type that would be placed in inventory
+	 * @param[out]	loc			the InventoryLocation the item can be placed to
+	 * @return	true if found any, false otherwise
+	 **/
+	proto native bool FindFirstFreeLocationForNewEntity(string item_type, FindInventoryLocationType flags, out notnull InventoryLocation loc);
+
+	/**@fn			FindFreeLocationsFor
+	 * @brief		searches inventory for suitable location for @item
+	 * @param[in]	item		item that would be placed in inventory
+	 * @param[in]	flags		flags affecting selection ( @see FindInventoryLocation )
+	 * @param[out]	locs		array of InventoryLocations the item can be placed to
+	 * @return		number of suitable inventory locations
+	 *
+	 * Example:
+	 * @code
+	 *   Entity bino = GetGame().CreateObject("Binoculars", "3312 0 854");
+	 *   EntityAI bino2;
+	 *   if (Class.CastTo(bino2, bino))
+	 *   {
+	 *     array<ref InventoryLocation> a = new array<ref InventoryLocation>; // 1) allocate memory for array
+	 *     for (int i = 0; i < 10; ++i)
+	 *     {
+	 *       a.Insert(new InventoryLocation); // 2) pre-allocate inventorylocations from script. engine only fills them in, engine does not allocate memory to avoid mixing.
+	 *     }
+	 *
+	 *     int sz = player.FindFreeLocationsFor(bino, FindInventoryLocationType.ANY_CARGO | FindInventoryLocationType.ATTACHMENT, a); // 3) ask engine to fill the locations
+	 *     if (sz > 0)
+	 *     {
+	 *       InventoryLocation src = new InventoryLocation;
+	 *       bino2.GetCurrentInventoryLocation(src); // 5) get current location
+	 *
+	 *       InventoryLocation dst = a[0]; // 6) get first (this is only example)
+	 *
+	 *       ... use src and dst
+	 *     }
+	 *   }
+	 * @endcode
+	 **/
+	proto native int FindFreeLocationsFor(notnull EntityAI item, FindInventoryLocationType flags, out notnull array<ref InventoryLocation> locs);
+
+	/**
+	 * @fn		LocationCreateEntity
+	 * @brief	creates new item directly at location
+	 * @param[in]	type	\p		item type to be placed in inventory
+	 * @return	created entity, null otherwise
+	 **/
+	static proto native EntityAI LocationCreateEntity(notnull InventoryLocation inv_loc, string type, int iSetupFlags, int iRotation);
+	/**
+	 * @fn		LocationCreateLocalEntity
+	 * @brief	creates new <b>local</b> item directly at location
+	 * 			@NOTE: the item is created localy, i.e. it's not registered to network
+	 * @param[in]	type	\p		item type to be placed in inventory
+	 * @return	created entity, null otherwise
+	 **/	
+	static proto native EntityAI LocationCreateLocalEntity(notnull InventoryLocation inv_loc, string type, int iSetupFlags, int iRotation);
+	/**
+	 * @fn		LocationCanAddEntity
+	 * @brief	queries if the entity contained in inv_loc.m_item can be added to ground/attachment/cargo/hands/...
+	 * @return true if can be added, false otherwise
+	 **/
+	static proto native bool LocationCanAddEntity(notnull InventoryLocation inv_loc);
+	
+	//Added script check to  LocationCanAddEntity
+	static bool LocationCanAddEntityEx(notnull InventoryLocation inv_loc)
+	{
+		return LocationCanAddEntity(inv_loc);
+	}
+	
+	/**
+	 * @fn		LocationTestAddEntity
+	 * @brief	test if the entity contained in inv_loc.m_item can be added to ground/attachment/cargo/hands/...
+	 * @return true if can be added, false otherwise
+	 **/
+	static proto native bool LocationTestAddEntity(notnull InventoryLocation inv_loc, bool do_resevation_check, bool do_item_check, bool do_lock_check, bool do_occupancy_test, bool do_script_check, bool do_script_load_check);
+	/**
+	 * @fn		LocationCanRemoveEntity
+	 * @brief	queries if the entity contained in inv_loc.m_item can be removed from ground/attachment/cargo/hands/...
+	 * @return true if can be added, false otherwise
+	 **/
+	static proto native bool LocationCanRemoveEntity(notnull InventoryLocation inv_loc);
+	/**
+	 * @fn		LocationCanMoveEntity
+	 * @brief	queries if the entity contained in inv_loc.m_item can be moved to another location
+	 * This is a shorthand for CanRemove + CanAdd query
+	 * @return true if can be moved, false otherwise
+	 **/
+	static proto native bool LocationCanMoveEntity(notnull InventoryLocation src, notnull InventoryLocation dst);
+	
+	static int GetInventoryCheckContext()
+	{
+		return m_inventory_check_context;
+	}
+	
+	static bool LocationCanMoveEntitySyncCheck(notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		m_inventory_check_context = InventoryCheckContext.SYNC_CHECK;
+		bool result = LocationCanMoveEntity(src, dst);
+		m_inventory_check_context = InventoryCheckContext.DEFAULT;
+		return result;
+		
+	}
+	/**
+	 * @fn		LocationCanAddEntity
+	 * @brief	query the entity at the specific inventory location
+	 * @return entity at the location, null otherwise
+	 **/
+	static proto native EntityAI LocationGetEntity(notnull InventoryLocation inv_loc);
+
+	
+	//! Returns true if this Inventory owner is in cargo of something
+	bool IsInCargo()
+	{
+		InventoryLocation lcn = new InventoryLocation();
+		GetCurrentInventoryLocation(lcn);
+		if (lcn.GetType() == InventoryLocationType.CARGO)
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//! Returns true if this Inventory owner is an attachment of something
+	bool IsAttachment()
+	{
+		InventoryLocation lcn = new InventoryLocation();
+		GetCurrentInventoryLocation(lcn);
+		if (lcn.GetType() == InventoryLocationType.ATTACHMENT)
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//! Returns true if inventory owner or his hiearchy parents are in cargo
+	bool IsCargoInHiearchy()
+	{
+		InventoryLocation lcn = new InventoryLocation();
+		EntityAI ent = GetInventoryOwner();
+		while (ent)
+		{
+			if (ent.GetInventory().GetCurrentInventoryLocation(lcn) && lcn.IsValid())
+			{
+				if (lcn.GetType() == InventoryLocationType.CARGO || lcn.GetType() == InventoryLocationType.PROXYCARGO)
+					return true;
+			}
+			
+			ent = ent.GetHierarchyParent();
+		}
+		
+		return false;
+	}
+	
+	//! Returns true if the item is currently attached and outputs attachment slot id and name
+	bool GetCurrentAttachmentSlotInfo(out int slot_id, out string slot_name)
+	{
+		slot_id = InventorySlots.INVALID;
+		slot_name = "";
+		InventoryLocation lcn = new InventoryLocation();
+		GetCurrentInventoryLocation(lcn);
+		if (lcn.GetType() == InventoryLocationType.ATTACHMENT)
+		{
+			slot_id = lcn.GetSlot();
+			slot_name = InventorySlots.GetSlotName(slot_id);
+			return true;
+		}
+		return false;
+	}
+	
+	static void OnServerInventoryCommandStatic(ParamsReadContext ctx)
+	{
+		int tmp = -1;
+		ctx.Read(tmp);
+
+		int type = -1;
+		if (!ctx.Read(type))
+			return;
+
+		switch (type)
+		{
+			case InventoryCommandType.SYNC_MOVE:
+			{
+				InventoryLocation src = new InventoryLocation();
+				InventoryLocation dst = new InventoryLocation();
+
+				src.ReadFromContext(ctx);
+				dst.ReadFromContext(ctx);
+				if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms ServerInventoryCommand cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+
+				if (!src.GetItem() || !dst.GetItem())
+				{
+					LogError("[syncinv] ServerInventoryCommand (cmd=SYNC_MOVE) dropped, item not in bubble");
+					break; // not in bubble
+				}
+
+				LocationSyncMoveEntity(src, dst);
+				break;
+			}
+
+			case InventoryCommandType.HAND_EVENT:
+			{
+				HandEventBase e = HandEventBase.CreateHandEventFromContext(ctx);
+				if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms ServerInventoryCommand cmd=" + typename.EnumToString(InventoryCommandType, type) + " event=" + e.DumpToString());
+				
+				if (!e.GetSrcEntity())
+				{
+					Error("[syncinv] ServerInventoryCommand (cmd=HAND_EVENT) dropped, item not in bubble");
+					break; // not in bubble
+				}
+				e.m_Player.GetHumanInventory().ProcessHandEvent(e);
+				break;
+			}
+
+			case InventoryCommandType.FORCESWAP:
+			case InventoryCommandType.SWAP:
+			{
+				InventoryLocation src1 = new InventoryLocation();
+				InventoryLocation src2 = new InventoryLocation();
+				InventoryLocation dst1 = new InventoryLocation();
+				InventoryLocation dst2 = new InventoryLocation();
+				src1.ReadFromContext(ctx);
+				src2.ReadFromContext(ctx);
+				dst1.ReadFromContext(ctx);
+				dst2.ReadFromContext(ctx);
+		
+				if (src1.IsValid() && src2.IsValid() && dst1.IsValid() && dst2.IsValid())
+				{
+					if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms ServerInventoryCommand Swap src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+
+					LocationSwap(src1, src2, dst1, dst2);
+				}
+				else
+					Error("ServerInventoryCommand - cannot swap, invalid location input: src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+
+				break;
+			}
+		}
+	}
+
+	/**
+	 * @fn		LocationAddEntity
+	 * @brief	adds item to inventory location
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool LocationAddEntity(notnull InventoryLocation inv_loc);
+	/**
+	 * @fn		LocationRemoveEntity
+	 * @brief	removes item from inventory location
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool LocationRemoveEntity(notnull InventoryLocation inv_loc);
+
+	/**
+	 * @fn		LocationMoveEntity
+	 * @brief	removes item from current inventory location and adds it to destination
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool LocationMoveEntity(notnull InventoryLocation src_loc, notnull InventoryLocation dst_loc);
+
+	/**
+	 * @fn		LocationSyncMoveEntity
+	 * @brief	synchronously removes item from current inventory location and adds it to destination
+	 *			no anims involved
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool LocationSyncMoveEntity(notnull InventoryLocation src_loc, notnull InventoryLocation dst_loc);
+
+	/**
+	 * @fn		LocationSwap
+	 * @brief	swaps two entities
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool LocationSwap(notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2);
+
+	/**
+	 * @fn		ServerLocationMoveEntity
+	 * @brief	removes item from current inventory location and adds it to destination + sync via inventory command
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool ServerLocationMoveEntity(notnull EntityAI item, ParamsWriteContext ctx);
+
+	/**
+	 * @fn		ServerLocationSyncMoveEntity
+	 * @brief	synchronously removes item from current inventory location and adds it to destination + sync via
+	 * inventory command
+	 *			no anims involved
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool ServerLocationSyncMoveEntity(Man player, notnull EntityAI item, ParamsWriteContext ctx);
+
+	/**
+	 * @fn		ServerLocationSwap
+	 * @brief	swaps two entities
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool ServerLocationSwap(notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2, ParamsWriteContext ctx);
+
+	/**
+	 * @fn		ServerHandEvent
+	 * @brief	hand event to clients
+	 * @return true if success, false otherwise
+	 **/
+	static proto native bool ServerHandEvent(notnull Man player, notnull EntityAI item, ParamsWriteContext ctx);
+
+	/**
+	 * @fn		PrepareDropEntityPos
+	 * @brief	Finds a transformation for the item to be dropped to
+	 * 				If the initial transforation overlaps with another conflicting entity (i.e. car) then the transform will be snapped to the nearest outer edge.
+	 * 				If no valid snapping transformation could be found, then the output from 'PlaceOnSurface' is used
+	 * @param	useValuesInMatrix Is ignored if transformation overlaps with possible conflicting entity. If no valid transform is found and this is false then the transform at the owner is used for 'PlaceOnSurface'
+	 * @param	conflictCheckDepth If -1 then no conflict depth check is performed, if 0 then it only checks to see if it conflicts but doesn't perform snapping
+	 * @return	true if valid transformation found near owner
+	 **/
+	static proto native bool PrepareDropEntityPos(EntityAI owner, notnull EntityAI item, out vector mat[4], bool useValuesInMatrix = false, int conflictCheckDepth = -1);
+	static proto native bool TestDropEntityPos(EntityAI owner, notnull EntityAI item, out vector mat[4], bool useValuesInMatrix = false, int conflictCheckDepth = -1);
+
+	/**@fn      CanSwapEntities
+	 * @brief   test if ordinary swap can be performed.
+	 *
+	 * Ordinary in the sense that the two items has equal sizes and can be swapped without
+	 * additional space.
+	 *
+	 * @param [in]  item1     first item
+	 * @param [in]  item2     second item
+	 * @return    true if can be swapped
+	 */
+	static proto native bool CanSwapEntities(notnull EntityAI item1, notnull EntityAI item2);
+	
+	static bool CanSwapEntitiesEx(notnull EntityAI item1, notnull EntityAI item2)
+	{
+		int slot;
+		InventoryLocation il1 = new InventoryLocation();
+		InventoryLocation il2 = new InventoryLocation();
+		
+		item2.GetInventory().GetCurrentInventoryLocation(il2);
+		slot = il2.GetSlot();
+
+		if (item1.GetQuantity() > item1.GetTargetQuantityMax(slot))
+			return false;
+		
+		
+		item1.GetInventory().GetCurrentInventoryLocation(il1);
+		slot = il1.GetSlot();
+		
+		if (item2.GetQuantity() > item2.GetTargetQuantityMax(slot))
+			return false;
+		
+		if (!item1.CanSwapEntities(item2, il2, il1) || !item2.CanSwapEntities(item1, il1, il2))
+		{
+			return false;
+		}
+		
+		return CanSwapEntities(item1,item2);
+	}
+
+	/**@fn      CanForceSwapEntities
+	 * @brief   test if forced swap can be performed.
+	 *
+	 * @param [in]  item1     is the forced item (primary)
+	 * @param [in]  item1_dst     optional destination for item1 (null if item1 goes to place of item2)
+	 * @param [in]  item2     second item that will be replaced by the item1. (secondary)
+	 * @param [out]  item2_dst     second item's potential destination (if null, search for item_dst2 is ommited). if (NOT null AND IsValid()), then it is tried first, without search to inventory
+	 * @return    true if can be force swapped
+	 */
+	static proto native bool CanForceSwapEntities(notnull EntityAI item1, InventoryLocation item1_dst, notnull EntityAI item2, out InventoryLocation item2_dst);
+	static bool CanForceSwapEntitiesEx(notnull EntityAI item1, InventoryLocation item1_dst, notnull EntityAI item2, out InventoryLocation item2_dst)
+	{
+		if (!CanForceSwapEntities(item1, item1_dst, item2, item2_dst) )
+			return false;
+		
+		int slot;
+		InventoryLocation il = new InventoryLocation;
+		
+		if (!item1.CanBeFSwaped())
+			return false;
+
+		if ( item1_dst == null)
+		{
+			item2.GetInventory().GetCurrentInventoryLocation(il);
+			slot = il.GetSlot();
+		}
+		else
+		{
+			slot = item1_dst.GetSlot();
+		}
+		
+		if ( item1.GetQuantity() > item1.GetTargetQuantityMax(slot) )
+			return false;
+		
+		if ( item2_dst == null)
+		{
+			item1.GetInventory().GetCurrentInventoryLocation(il);
+			slot = il.GetSlot();
+		}
+		else
+		{
+			slot = item2_dst.GetSlot();
+		}
+		
+		if (!item1.CanSwapEntities(item2, item2_dst, item1_dst) || !item2.CanSwapEntities(item1, item1_dst, item2_dst))
+		{
+			return false;
+		}
+		
+		if ( item2.GetQuantity() > item2.GetTargetQuantityMax(slot) )
+			return false;
+		
+		return true;
+	}
+	
+	proto native bool CanAddSwappedEntity(notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2);
+
+	///@{ reservations
+	const int c_InventoryReservationTimeoutMS = 5000;
+	const int c_InventoryReservationTimeoutShortMS = 3000;
+	
+	static proto native bool AddInventoryReservation(EntityAI item, InventoryLocation dst, int timeout_ms);
+	bool AddInventoryReservationEx(EntityAI item, InventoryLocation dst, int timeout_ms)
+	{
+		if (GetGame().IsMultiplayer() && GetGame().IsServer() )
+			return true;
+		
+		bool ret_val = AddInventoryReservation(item, dst, timeout_ms);
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryReservationLogEnable() )
+		{
+			DayZPlayer player = GetGame().GetPlayer();
+			if ( player )
+			{
+				if (item)
+					Debug.InventoryMoveLog("Reservation result: " + ret_val + " - STS = " + player.GetSimulationTimeStamp() + " / " + item.ToString() + " / " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "AddInventoryReservation", player.ToString() );
+				else
+					Debug.InventoryMoveLog("Reservation result: " + ret_val + " - STS = " + player.GetSimulationTimeStamp() + " / null / " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "AddInventoryReservation", player.ToString() );
+			}
+		}
+		#endif
+		return ret_val;
+	}
+	
+	static proto native bool ExtendInventoryReservation(EntityAI item, InventoryLocation dst, int timeout_ms);
+	bool ExtendInventoryReservationEx(EntityAI item, InventoryLocation dst, int timeout_ms)
+	{ 
+		if (GetGame().IsMultiplayer() && GetGame().IsServer() )
+			return true;
+		
+		bool ret_val = ExtendInventoryReservation(item,dst,timeout_ms);
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryReservationLogEnable() )
+		{
+			DayZPlayer player = GetGame().GetPlayer();
+			if ( player )
+			{
+				if (item)
+					Debug.InventoryMoveLog("Reservation result: " + ret_val + " - STS = " + player.GetSimulationTimeStamp() + " / " + item.ToString() + " / " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "ExtendInventoryReservation", player.ToString() );
+				else
+					Debug.InventoryMoveLog("Reservation result: " + ret_val + " - STS = " + player.GetSimulationTimeStamp() + " / null / " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "ExtendInventoryReservation", player.ToString() );
+			}
+		}
+		#endif
+		return ret_val;
+	}
+	
+	static proto native bool ClearInventoryReservation(EntityAI item, InventoryLocation dst);
+	bool ClearInventoryReservationEx(EntityAI item, InventoryLocation dst)
+	{
+		if (GetGame().IsMultiplayer() && GetGame().IsServer() )
+			return true;
+		
+		bool ret_val = ClearInventoryReservation(item,dst);
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryReservationLogEnable() )
+		{
+			DayZPlayer player = GetGame().GetPlayer();
+			if ( player )
+			{
+				if (item)
+					Debug.InventoryMoveLog("Reservation cleared result: " + ret_val + " - STS = " + player.GetSimulationTimeStamp() + " / " + item.ToString() + " / " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "ClearInventoryReservation", player.ToString() );
+				else
+					Debug.InventoryMoveLog("Reservation cleared result: " + ret_val + " - STS = " + player.GetSimulationTimeStamp() + " / null / " + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "ClearInventoryReservation", player.ToString() );
+			}
+		}
+		#endif
+		return ret_val;
+	}
+	
+	//! Internally: HasInventoryReservationEx(item, dst, FindInventoryReservationMode.LEGACY, FindInventoryReservationMode.LEGACY)
+	static proto native bool HasInventoryReservation(EntityAI item, InventoryLocation dst);
+	//! Internally: !HasInventoryReservationEx(item, dst, FindInventoryReservationMode.ITEM, FindInventoryReservationMode.DST)
+	static proto native bool HasInventoryReservationCanAdd(EntityAI item, InventoryLocation dst);
+	
+	//! itemMode will iterate over item reservations, parentMode will iterate over parent reservations
+	static proto native bool HasInventoryReservationEx(EntityAI item, InventoryLocation dst, FindInventoryReservationMode itemMode, FindInventoryReservationMode parentMode);
+	static proto native bool GetInventoryReservationCount(EntityAI item, InventoryLocation dst);
+	proto native int GetAnyInventoryReservationCount();
+	///@} reservations
+
+	///@{ locks
+	proto native bool CanLockInventoryWithKey(notnull EntityAI key);
+	proto native bool CanUnlockInventoryWithKey(notnull EntityAI key);
+	proto native void LockInventoryWithKey(notnull EntityAI key);
+	proto native void UnlockInventoryWithKey(notnull EntityAI key);
+	proto native bool HasKeys();
+
+	proto native void LockInventory(int lockType);
+	proto native void UnlockInventory(int lockType);
+	proto native int GetScriptLockCount();
+	proto native bool IsInventoryUnlocked();
+	proto native bool IsInventoryLocked();
+	proto native bool IsInventoryLockedForLockType(int lockType);
+	proto native bool SetSlotLock(int slot, bool locked);
+	proto native bool GetSlotLock(int slot);
+	///@} locks
+
+	///@{ anti-cheats
+	const float c_MaxItemDistanceRadius = 2.5;
+	static proto native bool CheckRequestSrc(notnull Man requestingPlayer, notnull InventoryLocation src, float radius);
+	static proto native bool CheckDropRequest(notnull Man requestingPlayer, notnull InventoryLocation src, float radius);
+	static proto native bool CheckTakeItemRequest(notnull Man requestingPlayer, notnull InventoryLocation src, notnull InventoryLocation dst, float radius);
+	static proto native bool CheckMoveToDstRequest(notnull Man requestingPlayer, notnull InventoryLocation src, notnull InventoryLocation dst, float radius);
+	static proto native bool CheckSwapItemsRequest(notnull Man requestingPlayer, notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2, float radius);
+	static proto native bool CheckManipulatedObjectsDistances(notnull EntityAI e0, notnull EntityAI e1, float radius);
+	///@} anti-cheats
+
+///@} Engine native functions
+///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+///@{ script functions
+
+	/**@fn		Init
+	 * @brief	called by engine right after creation of entity
+	 **/
+	void Init()
+	{
+		GetInventoryOwner().OnInventoryInit();
+	}
+
+	/// db load hooks
+	bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		return true;
+	}
+	void OnAfterStoreLoad();
+	/// db store hook
+	void OnStoreSave(ParamsWriteContext ctx);
+
+	void EEInit()
+	{
+		InventoryLocation src = new InventoryLocation;
+		if (GetCurrentInventoryLocation(src))
+		{
+			if (src.GetType() == InventoryLocationType.HANDS)
+			{
+				Man man = Man.Cast(src.GetParent());
+				if (man)
+				{
+					if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("Inventory::EEInit - Man=" + man + " item=" + this);
+					man.GetHumanInventory().OnEntityInHandsCreated(src);
+				}
+			}
+		}
+	}
+	
+	void EEDelete(EntityAI parent)
+	{
+		EntityAI item = GetInventoryOwner();
+		Man player = item.GetHierarchyRootPlayer();
+		if (player)
+			player.GetInventory().ClearInventoryReservationEx(item, null);
+	}
+
+	/**@fn		CreateInInventory
+	 * @brief	creates entity somewhere in inventory
+	 *
+	 * @param[in]	type	\p		item type to be placed in inventory
+	 * @return	created entity or null
+	 **/
+	EntityAI CreateInInventory(string type)
+	{
+		InventoryLocation loc = new InventoryLocation();
+		if (FindFirstFreeLocationForNewEntity(type, FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT, loc))
+		{
+			switch (loc.GetType())
+			{
+				case InventoryLocationType.ATTACHMENT:
+					return loc.GetParent().GetInventory().CreateAttachmentEx(type, loc.GetSlot());
+				case InventoryLocationType.CARGO:
+					return loc.GetParent().GetInventory().CreateEntityInCargoEx(type, loc.GetIdx(), loc.GetRow(), loc.GetCol(), loc.GetFlip());
+				default:
+					Error("CreateInInventory: unknown location for item");
+					break;
+			}
+		}
+
+		return null;
+	}
+
+	/**
+	 * @fn		CanAddEntityToInventory
+	 * @brief	ask inventory if item could be placed somewhere in inventory
+	 *
+	 * All available inventory locations (hands, cargo, attachments, proxycargo, ...) are
+	 * traversed recursively from root to leafs.
+	 *
+	 * @param[in]	item	\p		item to be placed in inventory
+	 * @return	true if item can be added, false otherwise
+	 **/
+	bool CanAddEntityToInventory(notnull EntityAI item, int flag = FindInventoryLocationType.ANY)
+	{
+		InventoryLocation il = new InventoryLocation();
+		bool result = FindFreeLocationFor(item, flag, il);
+		return result;
+	}
+	/**
+	 * @fn		AddEntityToInventory
+	 * @brief	add entity somewhere in inventory
+	 *
+	 * All available inventory locations (hands, cargo, attachments, proxycargo, ...) are
+	 * traversed recursively from root to leafs.
+	 *
+	 * @NOTE: AddEntityToInventory does not perform the checks the CanAddEntityToInventory does
+	 * (script conditions for example).
+	 * if not sure, always call CanAddEntityToInventory before AddEntityToInventory.
+	 *
+	 * @param[in]	item	\p		item to be placed in inventory
+	 * @return	true if item can be added, false otherwise
+	 **/
+	bool AddEntityToInventory(notnull EntityAI item)
+	{
+		InventoryLocation il = new InventoryLocation();
+		bool result = FindFreeLocationFor(item, FindInventoryLocationType.ANY, il);
+		if (result)
+			return LocationAddEntity(il);
+
+		return result;
+	}
+
+	/**
+	 * @brief Returns if entity can be removed from its current location
+	 **/
+	bool CanRemoveEntity()
+	{
+		InventoryLocation il = new InventoryLocation;
+		if (GetCurrentInventoryLocation(il))
+			return LocationCanRemoveEntity(il);
+
+		return false;
+	}
+
+	// Script version of CanAddEntity* methods based on InventoryLocation
+	/**
+	 * @fn		CanAddEntityInto
+	 * @brief	Asks inventory if item could be placed in inventory, hands, etc.
+	 *
+	 * Location is based on the flags parameter. This method is used in methods that are 
+	 * asking for if item can be placed in specific location, like CanAddEntityToInventory,
+	 * CanAddEntityInHands, etc.
+	 *
+	 * @param[in]	item	\p		item to be placed in inventory
+	 * @param[in]	flags	\p		FindInventoryLocationType
+	 * @return	true if item can be added, false otherwise
+	*/	
+	bool CanAddEntityInto(notnull EntityAI item, FindInventoryLocationType flags = FindInventoryLocationType.ANY)
+	{
+		InventoryLocation loc = new InventoryLocation();
+		return FindFreeLocationFor(item, flags, loc)  &&  !item.IsHologram();
+	}
+	
+	/**
+	\brief Test if entity can be put to the inventory (Cargo, ProxyCargo, Attachment)
+	*/
+	bool CanAddEntityIntoInventory(notnull EntityAI item)
+	{
+		return CanAddEntityInto(item, FindInventoryLocationType.ANY_CARGO | FindInventoryLocationType.ATTACHMENT);
+	}
+
+	/**
+	\brief Test if entity can be put into hands
+	*/
+	bool CanAddEntityIntoHands(notnull EntityAI item)
+	{
+		return CanAddEntityInto(item, FindInventoryLocationType.HANDS);
+	}
+
+	///@{ synchronization
+	bool OnInputUserDataProcess(ParamsReadContext ctx);
+	bool OnInventoryJunctureFromServer(ParamsReadContext ctx);
+	bool OnInventoryJunctureRepairFromServer(ParamsReadContext ctx);
+	void OnInventoryJunctureFailureFromServer(ParamsReadContext ctx);
+	void OnServerInventoryCommand(ParamsReadContext ctx);
+	///@} synchronization
+
+	void OnInventoryFailure(InventoryCommandType type, InventoryValidationReason reason, InventoryLocation src, InventoryLocation dst);
+
+	/**
+	 * @fn			TakeEntityToInventory
+	 * @brief		Put item anywhere into this entity (as attachment or into cargo, recursively)
+	 * @param[in]	mode				inventory mode
+	 * @param[in]	flags				preferred location, @see FindInventoryLocationType
+	 * @param[in]	item				item to be taken in inventory
+	 * @return		true on success
+	 *
+	 * @NOTE: Predictive.* / Local.* functions:
+	 * a) 'Predictive' means that the operation uses Client-Side Prediction, i.e. the
+	 * action runs the same code on both, client AND server.
+	 *
+	 * b) 'Local' operation executes from where it is run, i.e. the operation from client
+	 *		is NOT sent to server, and only client performs the inventory operation (TakeEntityTo.*)
+	 *		this behaviour is necessary when inventory operations are ALREADY synchronized by another
+	 *		means, like Actions.
+	 *		For example @see ActionTakeItemToHands that performs OnCompleteServer
+	 *		and OnCompleteClient with synchronization set to false in order to avoid duplicate
+	 *		synchronization.
+	**/
+	bool TakeEntityToInventory(InventoryMode mode, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Inv(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			if (FindFreeLocationFor(item, flags, dst))
+				return TakeToDst(mode, src, dst);
+
+			if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Inv(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " Warning - no room for item");
+			return false;
+		}
+		Error("[inv] I::Take2Inv(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " Error - src has no inventory location");
+		return false;
+	}
+
+	/// helper that finds location first, then moves the entity into it
+	bool TakeEntityToTargetInventory(InventoryMode mode, notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Target(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+				
+			if (target.GetInventory().FindFreeLocationFor(item, flags, dst))
+				return TakeToDst(mode, src, dst);
+
+			if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Target(" + typename.EnumToString(InventoryMode, mode) + ") target=" + target + " item=" + item + " Warning - no room for item in target");
+			return false;
+		}
+		Error("[inv] I::Take2Target(" + typename.EnumToString(InventoryMode, mode) + ") target=" + target + " item=" + item + " Error - src has no inventory location");
+		return false;
+	}
+
+	/**@fn			TakeToDst
+	 * @brief		move src to dst
+	 * @param[in]	mode				inventory mode
+	 * @param[in]	src					source location of the item
+	 * @param[in]	dst					destination location of the item
+	 **/
+	bool TakeToDst (InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		bool ret;
+		switch (mode)
+		{
+			case InventoryMode.SERVER:
+				ret = LocationSyncMoveEntity(src, dst);
+				if (ret && dst.IsValid())
+					InventoryInputUserData.SendServerMove(null, InventoryCommandType.SYNC_MOVE, src, dst);
+				return ret;
+			case InventoryMode.LOCAL:
+				ret = LocationSyncMoveEntity(src, dst);
+				return ret;
+			default:
+				return false;
+		}
+		return false;
+	}
+
+	/**@fn			TakeEntityToCargo
+	 * @brief		moves item to cargo of this intentory
+	 * @param[in]	mode				inventory mode
+	 * @param[in]	item				item to be put in this inventory as cargo
+	 **/
+	bool TakeEntityToCargo(InventoryMode mode, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Cgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+		return TakeEntityToInventory(mode, FindInventoryLocationType.CARGO, item);
+	}
+
+	/// Put item into into cargo of another entity
+	bool TakeEntityToTargetCargo(InventoryMode mode, notnull EntityAI target, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2TargetCgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + "to cargo of target=" + target);
+		return TakeEntityToTargetInventory(mode, target, FindInventoryLocationType.CARGO, item);
+	}
+
+	/**@fn			TakeEntityToCargoEx
+	 * @brief		moves item on specific cargo location
+	 * @param[in]	mode				inventory mode
+	 * @param[in]	item				item to be put in this inventory as cargo
+	 **/
+	bool TakeEntityToCargoEx(InventoryMode mode, notnull EntityAI item, int idx, int row, int col)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Cgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " row=" + row + " col=" + col);
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			dst.SetCargo(GetInventoryOwner(), item, idx, row, col, item.GetInventory().GetFlipCargo());
+
+			return TakeToDst(mode, src, dst);
+		}
+		Error("[inv] I::Take2Cgo(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " row=" + row + " col=" + col + " Error - src has no inventory location");
+		return false;
+	}
+
+	/// Put item into into cargo on specific cargo location of another entity
+	bool TakeEntityToTargetCargoEx(InventoryMode mode, notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2TargetCgoEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + "to cargo of target=" + cargo.GetCargoOwner() + " row=" + row + " col=" + col);
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			dst.SetCargoAuto(cargo, item, row, col, item.GetInventory().GetFlipCargo());
+
+			return TakeToDst(mode, src, dst);
+		}
+		Error("[inv] I::Take2TargetCgoEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + "to cargo of target=" + cargo.GetCargoOwner() + " row=" + row + " col=" + col);
+		return false;
+	}
+
+	bool TakeEntityAsAttachmentEx(InventoryMode mode, notnull EntityAI item, int slot)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2AttEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " slot=" + slot);
+		return TakeEntityAsTargetAttachmentEx(mode, GetInventoryOwner(), item, slot);
+	}
+
+	/// put item as attachment of target
+	bool TakeEntityAsTargetAttachmentEx(InventoryMode mode, notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2TargetAttEx(" + typename.EnumToString(InventoryMode, mode) + ") as ATT of target=" + target + " item=" + item + " slot=" + slot);
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			
+			EntityAI att = target.GetInventory().FindAttachment(slot);
+			if (att)
+			{
+				att.CombineItemsClient(item, true);
+				return true;
+			}
+			else
+			{
+				InventoryLocation dst = new InventoryLocation();
+				dst.SetAttachment(target, item, slot);
+				return TakeToDst(mode, src, dst);
+			}
+		}
+		Error("[inv] I::Take2AttEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item + " Error - src has no inventory location");
+		return false;
+	}
+
+	bool TakeEntityAsAttachment(InventoryMode mode, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2Att(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+		return TakeEntityToInventory(mode, FindInventoryLocationType.ATTACHMENT, item);
+	}
+
+	bool TakeEntityAsTargetAttachment(InventoryMode mode, notnull EntityAI target, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Take2AttEx(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+		return TakeEntityToTargetInventory(mode, target, FindInventoryLocationType.ATTACHMENT, item);
+	}
+
+	/// helper function for swap
+	static bool MakeDstForSwap(notnull InventoryLocation src1, notnull InventoryLocation src2, out InventoryLocation dst1, out InventoryLocation dst2)
+	{
+		if (dst1 == null)
+			dst1 = new InventoryLocation();
+
+		dst1.Copy(src1);
+		dst1.CopyLocationFrom(src2, false);
+		dst1.SetFlip(src1.GetItem().GetInventory().GetFlipCargo()); // update flip flag from inventory item
+		
+		if (dst2 == null)
+			dst2 = new InventoryLocation();
+
+		dst2.Copy(src2);
+		dst2.CopyLocationFrom(src1, false);
+		dst2.SetFlip(src2.GetItem().GetInventory().GetFlipCargo()); // update flip flag from inventory item
+		return true;
+	}
+
+	/// helper function for swap
+	static bool MakeSrcAndDstForSwap(notnull EntityAI item1, notnull EntityAI item2, out InventoryLocation src1, out InventoryLocation src2, out InventoryLocation dst1, out InventoryLocation dst2)
+	{
+		if (src1 == null)
+			src1 = new InventoryLocation();
+		if (src2 == null)
+			src2 = new InventoryLocation();
+		if (item1.GetInventory().GetCurrentInventoryLocation(src1) && item2.GetInventory().GetCurrentInventoryLocation(src2))
+			return MakeDstForSwap(src1, src2, dst1, dst2);
+		return false;
+	}
+
+	/// helper function for ForceSwap
+	static bool MakeSrcAndDstForForceSwap(notnull EntityAI item1, notnull EntityAI item2, out InventoryLocation src1, out InventoryLocation src2, out InventoryLocation dst1, notnull InventoryLocation dst2)
+	{
+		if (src1 == null)
+			src1 = new InventoryLocation();
+		if (src2 == null)
+			src2 = new InventoryLocation();
+
+		if (item1.GetInventory().GetCurrentInventoryLocation(src1) && item2.GetInventory().GetCurrentInventoryLocation(src2))
+		{
+			// src1 -> dst_of(src2)
+			if (dst1 == null)
+				dst1 = new InventoryLocation();
+
+			dst1.Copy(src1);
+			dst1.CopyLocationFrom(src2, false);
+			dst1.SetFlip(dst1.GetItem().GetInventory().GetFlipCargo());
+
+			// src2 -> dst2 from user
+			return true;
+		}
+
+		return false;
+	}
+
+	bool SwapEntities(InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2)
+	{
+		return false;
+	}
+
+	bool ForceSwapEntities(InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		return false;
+	}
+
+	static bool SetGroundPosByOwner(EntityAI owner, notnull EntityAI item, out InventoryLocation ground)
+	{
+		vector m4[4];
+		Math3D.MatrixIdentity4(m4);
+		bool success = GameInventory.PrepareDropEntityPos(owner, item, m4, false, GameConstants.INVENTORY_ENTITY_DROP_OVERLAP_DEPTH);
+		ground.SetGround(item, m4);
+		return success;
+	}
+
+	bool DropEntity(InventoryMode mode, EntityAI owner, notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Drop(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			if (!SetGroundPosByOwner(owner, item, dst))
+			{
+				OnInventoryFailure(InventoryCommandType.SYNC_MOVE, InventoryValidationReason.DROP_PREVENTED, src, dst);
+				return false;
+			}
+
+			return TakeToDst(mode, src, dst);
+		}
+
+		Error("DropEntity - No inventory location");
+		return false;
+	}
+	
+	static bool SetGroundPosByTransform(EntityAI owner, notnull EntityAI item, out InventoryLocation ground, vector transform[4])
+	{
+		bool success = GameInventory.PrepareDropEntityPos(owner, item, transform, true, GameConstants.INVENTORY_ENTITY_DROP_OVERLAP_DEPTH);
+		ground.SetGround(item, transform);
+		return success;
+	}
+	
+	bool DropEntityWithTransform(InventoryMode mode, EntityAI owner, notnull EntityAI item, vector transform[4])
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Drop(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			SetGroundPosByTransform(owner, item, dst, transform);
+
+			return TakeToDst(mode, src, dst);
+		}
+
+		Error("DropEntityWithTransform - No inventory location");
+		return false;
+	}
+	
+	static void SetGroundPosByOwnerBounds(EntityAI owner, notnull EntityAI item, out InventoryLocation ground, vector halfExtents, float angle, float cosAngle, float sinAngle)
+	{
+		vector m4[4];
+		owner.GetTransform(m4);
+			
+		vector randomPos = Vector(Math.RandomFloat(-halfExtents[0], halfExtents[0]), 0, Math.RandomFloat(-halfExtents[2], halfExtents[2]));
+		randomPos = vector.RotateAroundZero(randomPos, vector.Up, cosAngle, sinAngle);
+		
+		float dist = randomPos[0] * m4[1][0] + randomPos[1] * m4[1][1] + randomPos[2] * m4[1][2];
+
+		m4[3][0] = m4[3][0] + randomPos[0];
+		m4[3][1] = m4[3][1] - dist + halfExtents[1];
+		m4[3][2] = m4[3][2] + randomPos[2];
+		
+		item.PlaceOnSurfaceRotated(m4, Vector(m4[3][0], m4[3][1], m4[3][2]));
+		
+		ground.SetGround(item, m4);
+	}
+	
+	bool DropEntityInBounds(InventoryMode mode, EntityAI owner, notnull EntityAI item, vector halfExtents, float angle, float cosAngle, float sinAngle)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::Drop(" + typename.EnumToString(InventoryMode, mode) + ") item=" + item);
+		
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();	
+
+			SetGroundPosByOwnerBounds(owner, item, dst, halfExtents, angle, cosAngle, sinAngle);
+
+			return TakeToDst(mode, src, dst);
+		}
+
+		Error("DropEntityInBounds - No inventory location");
+		return false;
+	}
+
+	bool LocalDestroyEntity(notnull EntityAI item)
+	{
+		if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::LocalDestroyEntity inv item=" + item);
+		InventoryLocation src = new InventoryLocation();
+		if (item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			if (src.GetType() == InventoryLocationType.HANDS)
+				Error("[inv] Source location == HANDS, player has to handle this");
+
+			GetGame().ObjectDelete(src.GetItem());
+			return true;
+		}
+
+		Error("LocalDestroyEntity: No inventory location");
+		return false;
+	}
+
+	bool ReplaceItemWithNew(InventoryMode mode, ReplaceItemWithNewLambdaBase lambda)
+	{
+		InventoryLocation src = new InventoryLocation();
+		if (lambda.m_OldItem.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			if (LogManager.IsInventoryMoveLogEnable()) inventoryDebugPrint("[inv] I::ReplaceItemWithNew executing lambda=" + lambda + "on old_item=" + lambda.m_OldItem);
+			lambda.Execute();
+			return true;
+		}
+
+		Error("[inv] I::ReplaceItemWithNew - no inventory location");
+		return false;
+	}
+	
+	proto native bool GetFlipCargo();
+	proto native void SetFlipCargo(bool flip);
+	proto native void FlipCargo();
+	proto native void ResetFlipCargo();
+///@} script functions
+}
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/InventoryInputUserData.c b/scripts/3_Game/DayZ/Systems/Inventory/InventoryInputUserData.c
new file mode 100644
index 0000000000000000000000000000000000000000..363df92c77388e387fb606dfbcf53414379c335c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/InventoryInputUserData.c
@@ -0,0 +1,125 @@
+
+class InventoryInputUserData
+{
+	///@{ move
+	static void SerializeMove(ParamsWriteContext ctx, int type, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		ctx.Write(INPUT_UDT_INVENTORY);
+		ctx.Write(type);
+		src.WriteToContext(ctx);
+		dst.WriteToContext(ctx);
+	}
+
+	static void SendInputUserDataMove(int type, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (GetGame().IsClient())
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms sending cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeMove(ctx, type, src, dst);
+			ctx.Send();
+		}
+	}
+
+	static void SendServerMove(Man player, int type, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (GetGame().IsServer())
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] server sending cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeMove(ctx, type, src, dst);
+			GameInventory.ServerLocationSyncMoveEntity(player, src.GetItem(), ctx);
+		}
+	}
+	///@} move
+
+	///@{ swap
+	static void SerializeSwap(ParamsWriteContext ctx, notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2, bool skippedSwap)
+	{
+		ctx.Write(INPUT_UDT_INVENTORY);
+		ctx.Write(InventoryCommandType.SWAP);
+		src1.WriteToContext(ctx);
+		src2.WriteToContext(ctx);
+		dst1.WriteToContext(ctx);
+		dst2.WriteToContext(ctx);
+		ctx.Write(skippedSwap);
+	}
+
+	static void SendInputUserDataSwap(notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2, bool skippedSwap = false)
+	{
+		if (GetGame().IsClient())
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms sending cmd=SWAP src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeSwap(ctx, src1, src2, dst1, dst2, skippedSwap);
+			ctx.Send();
+		}
+	}
+
+	static void SendServerSwap(notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2, bool skippedSwap = false)
+	{
+		if (GetGame().IsServer())
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] server sending cmd=SWAP src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeSwap(ctx, src1, src2, dst1, dst2, skippedSwap);
+			GameInventory.ServerLocationSwap(src1, src2, dst1, dst2, ctx);
+		}
+	}
+	///@} swap
+
+	///@{ hand
+	static void SerializeHandEvent(ParamsWriteContext ctx, HandEventBase e)
+	{
+		ctx.Write(INPUT_UDT_INVENTORY);
+		ctx.Write(InventoryCommandType.HAND_EVENT);
+		e.WriteToContext(ctx);
+	}
+
+	static void SendInputUserDataHandEvent(HandEventBase e)
+	{
+		if (GetGame().IsClient())
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms SendInputUserDataHandEvent e=" + e.DumpToString());
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeHandEvent(ctx, e);
+			ctx.Send();
+		}
+	}
+
+	static void SendServerHandEventViaInventoryCommand(notnull Man player, HandEventBase e)
+	{
+		// Warning: this uses NetworkMessageInventoryCommand
+		if (GetGame().IsServer())
+		{
+			if (e.IsServerSideOnly())
+				Error("[syncinv] SendServerHandEvent - called on server side event only, e=" + e.DumpToString());
+			if (player.IsAlive())
+				Error("[syncinv] SendServerHandEvent - called on living thing.. server hand command is only for dead people, e=" + e.DumpToString());
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] SendServerHandEventViaInventoryCommand SendInputUserDataHandEvent e=" + e.DumpToString());
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeHandEvent(ctx, e);
+			GameInventory.ServerHandEvent(player, e.GetSrcEntity(), ctx);
+		}
+	}
+	///@} hand
+
+	static void SerializeDestroy(ParamsWriteContext ctx, notnull InventoryLocation src)
+	{
+		ctx.Write(INPUT_UDT_INVENTORY);
+		ctx.Write(InventoryCommandType.DESTROY);
+		src.WriteToContext(ctx);
+	}
+
+	static void SendInputUserDataDestroy(notnull InventoryLocation src)
+	{
+		if (GetGame().IsClient())
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] SendInputUserDataDestroy src=" + InventoryLocation.DumpToStringNullSafe(src));
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			SerializeDestroy(ctx, src);
+			ctx.Send();
+		}
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/InventoryLocation.c b/scripts/3_Game/DayZ/Systems/Inventory/InventoryLocation.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb553357767492b5ab91ef123f296f6831ebad63
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/InventoryLocation.c
@@ -0,0 +1,624 @@
+//@NOTE: DO NOT EDIT! enum values are overwritten from c++
+/// types of Inventory Location
+enum InventoryLocationType
+{
+	UNKNOWN, ///< unknown, usually freshly created object
+	GROUND, /// < ground
+	ATTACHMENT, ///< attachment of another entity
+	CARGO, ///< cargo of another entity
+	HANDS, ///< hands of another entity
+	PROXYCARGO, ///< cargo of a large object (building,...)
+};
+
+//@NOTE: DO NOT EDIT! enum values are overwritten from c++
+/// flags for searching locations in inventory
+enum FindInventoryLocationType
+{
+	ATTACHMENT, 	///< 	ATT
+	CARGO,			///< 	CGO
+	HANDS, 			///< 	HND
+	PROXYCARGO, 	///< 	PXY
+	ANY_CARGO, 		///< 	CGO | PXY
+	ANY, 			///< 	ATT | CGO | PXY | HND
+	NO_SLOT_AUTO_ASSIGN ///<	skips auto-assign test
+};
+
+//! InventoryLocation
+class InventoryLocation
+{
+	/**
+	 * @fn			IsValid
+	 * @brief		verify current set inventory location
+	 * @return	true if valid, false otherwise
+	 **/
+	proto native bool IsValid();
+	/**
+	 * @fn		GetType
+	 * @brief	returns type of InventoryLocation
+	 *
+	 * @see	InventoryLocationType for known types of inventory locations
+	 **/
+	proto native int GetType();
+	/**
+	 * @fn		GetParent
+	 * @brief	returns parent of current inventory location
+	 *
+	 * Parent entity can be null if item is on ground.
+	 *
+	 * @return parent entity, null otherwise
+	 **/
+	proto native EntityAI GetParent();
+	/**
+	 * @fn		GetItem
+	 * @brief	returns item of current inventory location
+	 *
+	 * Item can be null if and only if this is a query for location
+	 * of item that is about to be created (new spawn).
+	 *
+	 * @return	item
+	 **/
+	proto native EntityAI GetItem();
+	/**
+	 * @fn		GetSlot
+	 * @brief	returns slot id if current type is Attachment
+	 *
+	 * @NOTE: slot id is related to order of entries in DZ/data/config.cpp secton CfgSlots
+	 *
+	 * @return	slot id if attachment, -1 otherwise
+	 **/
+	proto native int GetSlot();
+	/**
+	 * @fn		GetIdx
+	 * @brief	returns index of cargo if current type is Cargo / ProxyCargo
+	 * @return	index or -1
+	 **/
+	proto native int GetIdx();
+	/**
+	 * @fn		GetRow
+	 * @brief	returns row of cargo if current type is Cargo / ProxyCargo
+	 * @return	row or -1
+	 **/
+	proto native int GetRow();
+	/**
+	 * @fn		GetCol
+	 * @brief	returns column of cargo if current type is Cargo / ProxyCargo
+	 * @return	index or -1
+	 **/
+	proto native int GetCol();
+	/**
+	 * @fn		GetFlip
+	 * @brief	returns flip status of cargo
+	 * @return	true/false
+	 **/
+	proto native bool GetFlip();
+	/**
+	 * @fn		GetPos
+	 * @brief	returns position of item in world if type is Ground
+	 * @return	position
+	 **/
+	proto native vector GetPos();
+	/**
+	 * @fn		GetDir
+	 * @brief	returns direction of item in world if type is Ground
+	 * @return	position
+	 **/	
+	proto native void GetDir(out float dir[4]);
+
+	/**
+	 * @fn		SetGround
+	 * @brief	sets current inventory location type to Ground with transformation mat
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 * @param[in]	mat	transformation matrix
+	 **/
+	proto native void SetGround(EntityAI e, vector mat[4]);
+	/**
+	 * @fn		SetGroundEx
+	 * @brief	sets current inventory location type to Ground with transformation mat
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 * @param[in]	pos		position vector
+	 * @param[in]	dir		direction quat
+	 **/
+	proto native void SetGroundEx(EntityAI e, vector pos, float dir[4]);
+	/**
+	 * @fn		SetAttachment
+	 * @brief	sets current inventory location type to Attachment with slot id set to <slotId>
+	 * @param[in]	parent		parent entity the item <e> will be attached to
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 * @param[in]	slotId		slot id where the item will be attached
+	 **/
+	proto native void SetAttachment(notnull EntityAI parent, EntityAI e, int slotId);
+	
+	/**
+	 * @fn		SetCargoAuto
+	 * @brief	based on Cargo.IsProxyCargo uses SetProxyCargo or SetCargo respectively
+	 * @param[in]	cargo		cargo that will receive item <e> into cargo
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 * @param[in]	row		row of the cargo
+	 * @param[in]	col		column of the cargo
+	 **/
+	proto native void SetCargoAuto(notnull CargoBase cargo, EntityAI e, int row, int col, bool flip);
+
+	/**
+	 * @fn		SetCargo
+	 * @brief	sets current inventory location type to Cargo with coordinates (idx, row, col)
+	 * @param[in]	parent		parent entity that will receive item <e> into cargo
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 * @param[in]	idx		index of cargo
+	 * @param[in]	row		row of the cargo
+	 * @param[in]	col		column of the cargo
+	 **/
+	proto native void SetCargo(notnull EntityAI parent, EntityAI e, int idx, int row, int col, bool flip);
+	/**
+	 * @fn		SetProxyCargo
+	 * @brief	sets current inventory location type to ProxyCargo with coordinates (idx, row, col)
+	 * @NOTE: typical usage is in building-like dummy structures, where furniture with cargo is part
+	 * 		of the model, and is not a physical entity (like person or bag).
+	 * @param[in]	parent		parent entity that will receive item <e> into proxy cargo
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 * @param[in]	idx		index of cargo
+	 * @param[in]	row		row of the cargo
+	 * @param[in]	col		column of the cargo
+	 *
+	 **/
+	proto native void SetProxyCargo(notnull EntityAI parent, EntityAI e, int idx, int row, int col, bool flip);
+	/**
+	 * @fn		SetHands
+	 * @brief	sets current inventory location type to Hands
+	 * @param[in]	parent		parent entity the item <e> will be attached to. this'd better be inherited from Person
+	 * @param[in]	e		entity with this inventory location (null for new spawns)
+	 **/
+	proto native void SetHands(notnull EntityAI parent, EntityAI e);
+	
+	/**
+	 * @fn		SetParent
+	 * brief	sets current inventory location's GetParent
+	 **/
+	proto native void SetParent(notnull EntityAI parent);
+	/**
+	 * @fn		SetItem
+	 * brief	sets current inventory location's item
+	 **/
+	proto native void SetItem(notnull EntityAI item);
+
+	// direct set methods
+	proto native void SetSlot(int slotId);
+	proto native void SetIndex(int idx);
+	proto native void SetRow(int row);
+	proto native void SetCol(int col);
+	proto native void SetFlip(bool flip);
+
+	/**
+	 * @fn		Reset
+	 **/
+	proto native void Reset();
+	
+	proto native bool CompareLocationOnly(notnull InventoryLocation other);
+
+	/**
+	 * @fn		CollidesWith
+	 * @brief	checks if inventory locations collides each with other
+	 **/
+	proto native bool CollidesWith(notnull InventoryLocation rhs);
+
+	/**
+	 * @fn		Copy
+	 * @brief	copies location data to another location
+	 *
+	 * @NOTE	it copies all data (except enforce internal data)
+	 **/
+	proto native InventoryLocation Copy(notnull InventoryLocation rhs);
+	/**
+	 * @fn		CopyLocationFrom
+	 * @brief	copies location to another location without m_item member
+	 *
+	 * @NOTE	it does NOT do a copy of m_item member!
+	 **/
+	proto native InventoryLocation CopyLocationFrom(notnull InventoryLocation rhs, bool copyFlip);
+	
+	static string DumpToStringNullSafe(InventoryLocation loc)
+	{
+		if (loc)
+			return loc.DumpToString();
+		return "{ null }";
+	}
+	
+	string DumpToString()
+	{
+		string res = "{ type=" + typename.EnumToString(InventoryLocationType, GetType());
+		switch (GetType())
+		{
+			case InventoryLocationType.UNKNOWN:
+			{
+				break;
+			}
+			case InventoryLocationType.GROUND:
+			{
+				res = res + " item=" + Object.GetDebugName(GetItem());
+				vector pos = GetPos();
+				float dir[4];
+				GetDir(dir);
+				res = res + " pos=(" + pos[0] + ", " + pos[1] + ", " + pos[2] + ")";
+				res = res + " dir=(" + dir[0] + ", " + dir[1] + ", " + dir[2] + ", " + dir[3] + ")";
+				break;
+			}
+			case InventoryLocationType.ATTACHMENT:
+			{
+				res = res + " item=" + Object.GetDebugName(GetItem());
+				res = res + " parent=" + Object.GetDebugName(GetParent());
+				res = res + " slot=" + GetSlot();
+				break;
+			}
+			case InventoryLocationType.CARGO:
+			{
+				res = res + " item=" + Object.GetDebugName(GetItem());
+				res = res + " parent=" + Object.GetDebugName(GetParent());
+				res = res + " idx=" + GetIdx() + " row=" + GetRow() + " col=" + GetCol() + " f=" + GetFlip();
+				break;
+			}
+			case InventoryLocationType.HANDS:
+			{
+				res = res + " item=" + Object.GetDebugName(GetItem());
+				res = res + " parent=" + Object.GetDebugName(GetParent());
+				break;
+			}
+			case InventoryLocationType.PROXYCARGO:
+			{
+				res = res + " item=" + Object.GetDebugName(GetItem());
+				res = res + " parent=" + Object.GetDebugName(GetParent());
+				res = res + " idx=" + GetIdx() + " row=" + GetRow() + " col=" + GetCol() + " f=" + GetFlip();
+				break;
+			}
+			default:
+			{
+				res = res + "??";
+				break;
+			}
+		}
+		res = res + " }";
+		return res;
+	}
+
+	bool ReadFromContext(ParamsReadContext ctx)
+	{
+		EntityAI parent;
+		EntityAI item;
+		int type = 0;
+		int idx = -1;
+		int row = -1;
+		int col = -1;
+		bool flp = false;
+		if (!ctx.Read(type))
+			return false;
+
+		switch (type)
+		{
+			case InventoryLocationType.UNKNOWN:
+			{
+				break;
+			}
+			case InventoryLocationType.GROUND:
+			{
+				if (!ctx.Read(item))
+					return false;
+				vector pos;
+				if (!ctx.Read(pos))
+					return false;
+
+				float dir[4];
+				if (!ctx.Read(dir))
+					return false;
+				
+				if (!item)
+				{
+#ifdef DIAG_DEVELOPER
+#ifdef SERVER
+					Debug.Log(string.Format("Item=%1 does not exist on server!", Object.GetDebugName(item)), "GROUND" , "n/a", "ReadFromContext", this.ToString() );
+#endif
+#endif
+					break; // parent or item is not in bubble
+				}
+
+				SetGroundEx(item, pos, dir);
+				break;
+			}
+			case InventoryLocationType.ATTACHMENT:
+			{
+				if (!ctx.Read(parent))
+					return false;
+				if (!ctx.Read(item))
+					return false;
+				int slot;
+				if (!ctx.Read(slot))
+					return false;
+				
+				if (!parent || !item)
+				{
+#ifdef DIAG_DEVELOPER
+#ifdef SERVER
+					Debug.Log(string.Format("Parent=%1 or Item=%2 does not exist on server!", Object.GetDebugName(parent), Object.GetDebugName(item)), "ATTACHMENT" , "n/a", "ReadFromContext", this.ToString() );
+#endif
+#endif
+					break; // parent or item is not in bubble
+				}
+
+				SetAttachment(parent, item, slot);
+				break;
+			}
+			case InventoryLocationType.CARGO:
+			{
+				if (!ctx.Read(parent))
+					return false;
+				if (!ctx.Read(item))
+					return false;
+				if (!ctx.Read(idx))
+					return false;
+				if (!ctx.Read(row))
+					return false;
+				if (!ctx.Read(col))
+					return false;
+				if (!ctx.Read(flp))
+					return false;
+				
+				if (!parent || !item)
+				{
+#ifdef DIAG_DEVELOPER
+#ifdef SERVER
+					Debug.Log(string.Format("Parent=%1 or Item=%2 does not exist on server!", Object.GetDebugName(parent), Object.GetDebugName(item)), "CARGO" , "n/a", "ReadFromContext", this.ToString() );
+#endif
+#endif
+					break; // parent or item is not in bubble
+				}
+
+				SetCargo(parent, item, idx, row, col, flp);
+				break;
+			}
+			case InventoryLocationType.HANDS:
+			{
+				if (!ctx.Read(parent))
+					return false;
+				if (!ctx.Read(item))
+					return false;
+				
+				if (!parent || !item)
+				{
+#ifdef DIAG_DEVELOPER
+#ifdef SERVER
+					Debug.Log(string.Format("Parent=%1 or Item=%2 does not exist on server!", Object.GetDebugName(parent), Object.GetDebugName(item)), "HANDS" , "n/a", "ReadFromContext", this.ToString() );
+#endif
+#endif
+					break; // parent or item is not in bubble
+				}
+
+				SetHands(parent, item);
+				break;
+			}
+			case InventoryLocationType.PROXYCARGO:
+			{
+				if (!ctx.Read(parent))
+					return false;
+				if (!ctx.Read(item))
+					return false;
+				if (!ctx.Read(idx))
+					return false;
+				if (!ctx.Read(row))
+					return false;
+				if (!ctx.Read(col))
+					return false;
+				if (!ctx.Read(flp))
+					return false;
+				
+				if (!parent || !item)
+				{
+#ifdef DIAG_DEVELOPER
+#ifdef SERVER
+					Debug.Log(string.Format("Parent=%1 or Item=%2 does not exist on server!", Object.GetDebugName(parent), Object.GetDebugName(item)), "PROXYCARGO" , "n/a", "ReadFromContext", this.ToString() );
+#endif
+#endif
+					break; // parent or item is not in bubble
+				}
+
+				SetProxyCargo(parent, item, idx, row, col, flp);
+				break;
+			}
+			default:
+			{
+				ErrorEx("ReadFromContext - really unknown location type, this should not happen, type=" + type);
+				return false;
+			}
+		}
+		return true;
+	}
+
+	bool WriteToContext(ParamsWriteContext ctx)
+	{
+		if (!ctx.Write(GetType()))
+		{
+			Error("InventoryLocation::WriteToContext - cannot write to context! failed to write type");
+			return false;
+		}
+
+		switch (GetType())
+		{
+			case InventoryLocationType.UNKNOWN:
+			{
+				break;
+			}
+			case InventoryLocationType.GROUND:
+			{
+				if (!ctx.Write(GetItem()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed GND, arg=item");
+					return false;
+				}
+
+				vector pos = GetPos();
+				if (!ctx.Write(pos))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed GND, arg=pos");
+					return false;
+				}
+
+				float dir[4];
+				GetDir(dir);
+				if (!ctx.Write(dir))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed GND, arg=dir");
+					return false;
+				}
+
+				break;
+			}
+			case InventoryLocationType.ATTACHMENT:
+			{
+				if (!ctx.Write(GetParent()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed ATT, arg=parent");
+					return false;
+				}
+				if (!ctx.Write(GetItem()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed ATT, arg=item");
+					return false;
+				}
+				if (!ctx.Write(GetSlot()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed ATT, arg=slot");
+					return false;
+				}
+				break;
+			}
+			case InventoryLocationType.CARGO:
+			{
+				if (!ctx.Write(GetParent()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed CGO, arg=parent");
+					return false;
+				}
+				if (!ctx.Write(GetItem()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed CGO, arg=item");
+					return false;
+				}
+				if (!ctx.Write(GetIdx()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed CGO, arg=idx");
+					return false;
+				}
+				if (!ctx.Write(GetRow()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed CGO, arg=row");
+					return false;
+				}
+				if (!ctx.Write(GetCol()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed CGO, arg=col");
+					return false;
+				}
+				if (!ctx.Write(GetFlip()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed CGO, arg=flp");
+					return false;
+				}
+				break;
+			}
+			case InventoryLocationType.HANDS:
+			{
+				if (!ctx.Write(GetParent()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed HND, arg=parent");
+					return false;
+				}
+				if (!ctx.Write(GetItem()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed HND, arg=item");
+					return false;
+				}
+				break;
+			}
+			case InventoryLocationType.PROXYCARGO:
+			{
+				if (!ctx.Write(GetParent()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed PXY, arg=parent");
+					return false;
+				}
+				if (!ctx.Write(GetItem()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed PXY, arg=item");
+					return false;
+				}
+				if (!ctx.Write(GetIdx()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed PXY, arg=idx");
+					return false;
+				}
+				if (!ctx.Write(GetRow()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed PXY, arg=row");
+					return false;
+				}
+				if (!ctx.Write(GetCol()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed PXY, arg=col");
+					return false;
+				}
+				if (!ctx.Write(GetFlip()))
+				{
+					Error("InventoryLocation::WriteToContext - cannot write to context! failed PXY, arg=flp");
+					return false;
+				}
+
+				break;
+			}
+			default:
+			{
+				Error("WriteToContext - really unknown location type, this should not happen, type=" + GetType());
+				return false;
+			}
+		}
+		return true;
+	}
+};
+
+bool OptionalLocationWriteToContext(InventoryLocation loc, notnull ParamsWriteContext ctx)
+{
+	if (loc)
+	{
+		if (!ctx.Write(true))
+		{
+			Error("OptionalLocationWriteToContext - cannot write 1 to context!");
+			return false;
+		}
+		return loc.WriteToContext(ctx);
+	}
+	else
+	{
+		if (!ctx.Write(false))
+		{
+			Error("OptionalLocationWriteToContext - cannot write 0 to context!");
+			return false;
+		}
+	}
+	return true;
+}
+
+bool OptionalLocationReadFromContext(out InventoryLocation loc, notnull ParamsReadContext ctx)
+{
+	bool present = false;
+	if (!ctx.Read(present))
+	{
+		Error("OptionalLocationReadFromContext - cannot read bool from context!");
+		return false;
+	}
+	
+	if (!present)
+		return true;
+
+	loc = new InventoryLocation();
+	if (!loc.ReadFromContext(ctx))
+	{
+		Error("OptionalLocationReadFromContext - cannot read (present) inventorylocation from context!");
+		return false;
+	}
+	return true;
+}
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/InventorySlots.c b/scripts/3_Game/DayZ/Systems/Inventory/InventorySlots.c
new file mode 100644
index 0000000000000000000000000000000000000000..7facbc7b1d0abbffdc5a109ecfcbc980bec61c85
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/InventorySlots.c
@@ -0,0 +1,95 @@
+
+/**@class		InventorySlots
+ * @brief		provides access to slot configuration
+ **/
+class InventorySlots
+{	
+	/**@NOTE: engine pre-populates this class with first 32 slots from CfgSlots (uppercased)
+	 **/
+	
+	/** \name C++ constants
+		Constants filled in from C++
+	*/
+	//@{
+	//! Amount of pre-populated slots (32)
+	const int COUNT;
+	//! Invalid slot (-1)
+	const int INVALID;
+	//@}
+	
+	#ifdef DIAG_DEVELOPER
+	private void InventorySlots() {}
+	private void ~InventorySlots() {}
+	#else
+	void InventorySlots() {}
+	void ~InventorySlots() {}
+	#endif
+
+	/**@fn		GetSlotIdFromString
+	 * @brief	converts string to slot_id
+	 * @param[in]	slot_name	\p	slot name to be find.
+	 * @return		slot id or InventorySlots.INVALID
+	 *
+	 * @example 
+	 *		int slot = InventorySlots.GetSlotIdFromString("FireWood");
+	 *		if (slot != InventorySlots.INVALID)
+	 *
+	 * @NOTE the example looks in the DZ/data/config.cpp and searches for class entry Slot_##slot_name
+	 *		class Slot_Firewood { whatever };
+	 *
+	 * i.e. it does NOT look at name= or displayName= attributes of the entry!
+	 **/
+	static proto native int GetSlotIdFromString(string slot_name);
+	/**@fn		GetSlotName
+	 * @brief	converts slot_id to string
+	 * @param[in]	slot_id	\p	slot id to be find.
+	 * @return		string or null string
+	 **/
+	static proto native owned string GetSlotName(int id);
+	/**@fn		GetSlotDisplayName
+	 * @brief	converts slot_id to string
+	 * @param[in]	slot_id	\p	slot id to be find.
+	 * @return		string or null string
+	 **/
+	static proto native owned string GetSlotDisplayName(int id);
+	/**@fn		IsSlotIdValid
+	 * @brief	verifies existence of the slot id
+	 * @return	true if slot valid
+	 **/
+	static proto native bool IsSlotIdValid(int slotId);
+	/**@fn		GetStackMaxForSlotId
+	 * @param[in]	slot_id	\p	queried slot
+	 * @return	stackMax attribute from corresponding entry (or default value == 1)
+	 **/
+	static proto native int GetStackMaxForSlotId(int slot_Id);
+	/**@fn		GetShowForSlotId
+	 * @param[in]	slot_id	\p	queried slot
+	 * @return	show attribute from corresponding entry (or default value == true)
+	 **/
+	static proto native bool GetShowForSlotId(int slot_Id);
+	/**@fn		GetAutoAttachForSlotId
+	 * @param[in]	slot_id	\p	queried slot
+	 * @return	auto attach attribute from corresponding entry (or default value == 1)
+	 **/
+	static proto native bool GetAutoAttachForSlotId(int slot_Id);
+	/**@fn		GetBoneNameForSlotId
+	 * @param[in]	slot_id	\p	queried slot
+	 * @param[out]	bone_name	\p	selection filled with attribute from corresponding entry
+	 * @return	true if slot valid
+	 **/	
+	static proto bool GetBoneNameForSlotId(int slot_Id, out string bone_name);
+	/**@fn		GetSelectionForSlotId
+	 * @param[in]	slot_id	\p	queried slot
+	 * @param[out]	selection	\p	selection filled with attribute from corresponding entry
+	 * @return	true if slot valid
+	 **/
+	static proto bool GetSelectionForSlotId(int slot_Id, out string selection);
+
+	/**@fn		GetBoneIndexForSlotId
+	 * @param[in]	slot_id	\p	queried slot
+	 * @return	stackMax attribute from corresponding entry (or default value == 1)
+	 **/
+	//static proto native int GetBoneIndexForSlotId (int slot_Id);
+};
+
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/Junctures.c b/scripts/3_Game/DayZ/Systems/Inventory/Junctures.c
new file mode 100644
index 0000000000000000000000000000000000000000..26792b9798893ffc265ca8c7fed2afd02d94dd7c
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/Junctures.c
@@ -0,0 +1,98 @@
+
+bool TryAcquireInventoryJunctureFromServer (notnull Man player, notnull InventoryLocation src, notnull InventoryLocation dst)
+{
+	if (player.NeedInventoryJunctureFromServer(src.GetItem(), src.GetParent(), dst.GetParent()))
+	{
+		if ( ( src.GetItem() && src.GetItem().IsSetForDeletion() ) || ( src.GetParent() && src.GetParent().IsSetForDeletion() ) || ( dst.GetParent() && dst.GetParent().IsSetForDeletion() ) )
+		{
+			return JunctureRequestResult.JUNCTURE_DENIED;
+		}
+		bool test_dst_occupancy = true;
+		if (GetGame().AddInventoryJunctureEx(player, src.GetItem(), dst, test_dst_occupancy, GameInventory.c_InventoryReservationTimeoutMS))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] juncture needed and acquired, player=" + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			return JunctureRequestResult.JUNCTURE_ACQUIRED; // ok
+		}
+		else
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] juncture request DENIED, player=" + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			return JunctureRequestResult.JUNCTURE_DENIED; // permission to perform juncture denied
+		}
+	}
+	else
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] juncture not required, player=" + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+		return JunctureRequestResult.JUNCTURE_NOT_REQUIRED; // juncture not necessary
+	}
+}
+
+bool TryAcquireTwoInventoryJuncturesFromServer (notnull Man player, notnull InventoryLocation src1, notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2)
+{
+	#ifdef DEVELOPER
+	if ( LogManager.IsInventoryReservationLogEnable() )
+	{
+		Debug.InventoryReservationLog("STS = " + player.GetSimulationTimeStamp() + " src1:" + src1.DumpToString() + " dst1: " + dst1.DumpToString()+ " src2:" + src2.DumpToString() + " dst2: " + dst2.DumpToString(), "InventoryJuncture" , "n/a", "TryAcquireTwoInventoryJuncturesFromServer",player.ToString() );	
+	}
+	#endif
+	
+	//if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] t=" + GetGame().GetTime() + "ms TryAcquireTwoInventoryJuncturesFromServer src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+
+	bool need_j1 = player.NeedInventoryJunctureFromServer(src1.GetItem(), src1.GetParent(), dst1.GetParent());
+	bool need_j2 = player.NeedInventoryJunctureFromServer(src2.GetItem(), src2.GetParent(), dst2.GetParent());
+	if (need_j1 || need_j2)
+	{
+		if (need_j1)
+		{
+			if ( ( src1.GetItem() && src1.GetItem().IsSetForDeletion() ) || ( src1.GetParent() && src1.GetParent().IsSetForDeletion() ) || ( dst1.GetParent() && dst1.GetParent().IsSetForDeletion() ) )
+			{
+				return JunctureRequestResult.JUNCTURE_DENIED;
+			}
+			if (!GetGame().AddInventoryJunctureEx(player, src1.GetItem(), dst1, false, GameInventory.c_InventoryReservationTimeoutMS))
+			{
+				/*#ifdef DEVELOPER
+				if ( LogManager.IsInventoryReservationLogEnable() )
+				{
+					Debug.InventoryMoveLog("", "SWAP" , "n/a", "TryAcquireTwoInventoryJuncturesFromServer", player.ToString() );
+				}
+				#endif*/
+				return JunctureRequestResult.JUNCTURE_DENIED; // permission to perform juncture denied
+			}
+		}
+//Need add log and change chanel to print
+		if (need_j2)
+		{
+			if ( ( src2.GetItem() && src2.GetItem().IsSetForDeletion() ) || ( src2.GetParent() && src2.GetParent().IsSetForDeletion() ) || ( dst2.GetParent() && dst2.GetParent().IsSetForDeletion() ) )
+			{
+				if (need_j1)
+				{
+					GetGame().ClearJunctureEx(player, src1.GetItem()); // release already acquired juncture for item1
+				}
+				return JunctureRequestResult.JUNCTURE_DENIED;
+			}
+			if (!GetGame().AddInventoryJunctureEx(player, src2.GetItem(), dst2, false, GameInventory.c_InventoryReservationTimeoutMS))
+			{
+				//if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] item2 juncture request DENIED, player=" + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+				if (need_j1)
+				{
+					GetGame().ClearJunctureEx(player, src1.GetItem()); // release already acquired juncture for item1
+					//if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] item2 juncture request DENIED, cleaning acquired juncture for item1, , player=" + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+				}
+				return JunctureRequestResult.JUNCTURE_DENIED; // permission to perform juncture denied
+			}
+		}
+
+		return JunctureRequestResult.JUNCTURE_ACQUIRED; // ok, both junctures acquired
+	}
+	else
+	{
+		#ifdef DEVELOPER
+		if ( LogManager.IsInventoryReservationLogEnable() )
+		{
+			Debug.InventoryMoveLog("Remote - skipped", "SWAP" , "n/a", "ProcessInputData", player.ToString() );
+		}
+		#endif
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] junctures not required, player=" + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+		return JunctureRequestResult.JUNCTURE_NOT_REQUIRED; // juncture not necessary
+	}
+}
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/ReplaceItemWithNewLambdaBase.c b/scripts/3_Game/DayZ/Systems/Inventory/ReplaceItemWithNewLambdaBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b71044bbc7ac25318e424429953d3a811fcadd01
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/ReplaceItemWithNewLambdaBase.c
@@ -0,0 +1,308 @@
+/**@class		ReplaceItemWithNewLambdaBase
+ * @brief		base class for transformation operations (creating one item from another)
+ **/
+class ReplaceItemWithNewLambdaBase
+{
+	EntityAI m_OldItem;
+	string m_NewItemType;
+	protected ref InventoryLocation m_OldLocation;
+	protected ref InventoryLocation m_NewLocation;
+	protected bool m_RemoveFromLocationPassed = false;
+	private bool m_RemoveNetworkObjectInfoPassed = false;
+
+	void ReplaceItemWithNewLambdaBase(EntityAI old_item, string new_item_type)
+	{
+		m_OldItem = old_item;
+		m_NewItemType = new_item_type;
+	}
+
+	void OverrideNewLocation(InventoryLocation newLocation)
+	{
+		m_NewLocation = newLocation;
+	}
+	
+	void VerifyItemTypeBySlotType() {}
+
+	protected bool WantCreateNewEntity()
+	{
+		return m_NewLocation && m_NewItemType != string.Empty;
+	}
+
+	protected bool CanExecuteLambda()
+	{
+		if (m_OldItem)
+			if (GameInventory.LocationCanRemoveEntity(m_OldLocation))
+				//if (WantCreateNewEntity() GameInventory.LocationTestAddEntityType(m_NewItemType, true, true, false, true))
+					return true;
+		return false;
+	}
+
+	/**@fn		PrepareLocations
+	 * @brief	Step A. - prepare inventory locations
+	 **/
+	protected bool PrepareLocations()
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step A) Prepare inventory locations, old_item=" + m_OldItem);
+		m_OldLocation = new InventoryLocation;
+		if (m_OldItem.GetInventory().GetCurrentInventoryLocation(m_OldLocation)) // A.1) store old location
+		{
+			if (m_NewLocation == null)
+			{
+				m_NewLocation = new InventoryLocation;
+				m_NewLocation.CopyLocationFrom(m_OldLocation, true);	// A.2) prepare new location from old
+				
+				//setting proper location type for ground pos
+				if (!m_NewLocation.GetParent())
+				{
+					vector m4[4];
+					Math3D.MatrixIdentity4(m4);
+					m4[3] = m_NewLocation.GetPos();
+					string path = "" + CFG_VEHICLESPATH + " " + m_NewItemType + " inherit_rotation";
+					bool keep_rotation = GetGame().ConfigIsExisting(path) && GetGame().ConfigGetInt(path) > 0;
+					
+					if (m_OldLocation.GetType() == InventoryLocationType.GROUND && keep_rotation)
+					{
+						float dir[4];
+						m_OldLocation.GetDir(dir);
+						m_NewLocation.SetGroundEx(null,m_NewLocation.GetPos(),dir);
+					}
+					else
+					{
+						m_NewLocation.SetGround(null,m4);
+					}
+				}
+			}
+			return true;
+		}
+		else
+			Error("[inv] ReplaceItemWithNewLambdaBase Step A.1) failed to get old_item inventory location");
+		return false;
+	}
+
+	/**@fn		RemoveOldItemFromLocation
+	 * @brief	Step B. - free location for new item
+	 * @NOTE	this operation does not delete the object, only removes it from inventory location
+	 **/
+	protected void RemoveOldItemFromLocation()
+	{
+		if (!GameInventory.LocationRemoveEntity(m_OldLocation)) // B) remove entity from old inventory location (making it free for new item)
+		{
+			Error("[inv] ReplaceItemWithNewLambdaBase Step B) failed to remove old_item rom current inventory location");
+			m_RemoveFromLocationPassed = false;
+		}
+		Print("[inv] ReplaceItemWithNewLambdaBase Step B) remove OK, loc=" + InventoryLocation.DumpToStringNullSafe(m_OldLocation));
+		m_RemoveFromLocationPassed = true;
+	}
+	protected void UndoRemoveOldItemFromLocation()
+	{
+		if (!GameInventory.LocationAddEntity(m_OldLocation)) // B) undo
+			Error("[inv] ReplaceItemWithNewLambdaBase Step B) failed to undo remove");
+		Print("[inv] ReplaceItemWithNewLambdaBase Step B) undo remove OK, loc=" + InventoryLocation.DumpToStringNullSafe(m_OldLocation));
+	}
+
+	/**@fn		RemoveNetworkObjectInfo
+	 * @brief	Step C. - remove network part of the object
+	 * @NOTE	this operation does not delete the object, only removes its network part (and deletes it on client)
+	 **/
+	protected void RemoveNetworkObjectInfo()
+	{
+		GetGame().RemoteObjectTreeDelete(m_OldItem); // C) this forces server to send DeleteObject Message to client. This is needed for preserving the appearance of network operations on client (so that DeleteObject(old) arrives before CreateVehicle(new)). @NOTE: this does not delete the object on server, only it's network representation.
+		// @NOTE: the item is not deleted right now on server, but rather after copying the properties in Step E)
+		m_RemoveNetworkObjectInfoPassed = true;
+	}
+	protected void UndoRemoveNetworkObjectInfo()
+	{
+		GetGame().RemoteObjectTreeCreate(m_OldItem);
+	}
+
+	/**@fn		CreateNewEntity
+	 * @brief	Step D. - create new entity (LOCAL) with specified type
+	 *
+	 * @NOTE: if (!m_NewLocation || m_NewItemType.Empty) ==> this function does not create a new entity
+	 **/
+	protected EntityAI CreateNewEntity()
+	{
+		if (WantCreateNewEntity())
+		{
+			VerifyItemTypeBySlotType();
+			EntityAI new_item;
+			
+			switch (m_NewLocation.GetType())
+			{
+				case InventoryLocationType.GROUND:
+					new_item = EntityAI.Cast(GetGame().CreateObjectEx(m_NewItemType,m_NewLocation.GetPos(),ECE_PLACE_ON_SURFACE|ECE_LOCAL));
+					string path = "" + CFG_VEHICLESPATH + " " + m_NewItemType + " inherit_rotation";
+					bool keep_rotation = GetGame().ConfigIsExisting(path) && GetGame().ConfigGetInt(path) > 0;
+					if (keep_rotation)
+					{
+						new_item.SetOrientation(m_OldItem.GetOrientation()); //this one actually works...debug InventoryLocation
+					}
+				break;
+				case InventoryLocationType.ATTACHMENT:
+					// forces rawlocation in C++ to make location Valid
+					m_NewLocation.SetAttachment(m_NewLocation.GetParent(), null, m_NewLocation.GetSlot());
+					new_item = GameInventory.LocationCreateEntity(m_NewLocation, m_NewItemType, ECE_OBJECT_SWAP, RF_NONE);
+				break;
+				default:
+					new_item = GameInventory.LocationCreateLocalEntity(m_NewLocation, m_NewItemType, ECE_OBJECT_SWAP, RF_NONE);
+				break;
+			}
+			
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step D) Created new new_item=" + new_item);
+			if (new_item)
+			{
+				return new_item;
+			}
+			else
+			{							
+				return null;
+
+				/*InventoryLocation backupLocation = new InventoryLocation;
+				vector mtx[4];
+				Math3D.MatrixIdentity4(mtx);
+				mtx[3] = m_OldItem.GetPosition();
+				backupLocation.SetGround(null, mtx);
+				if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step D) plan B - creating=" + m_NewItemType + " at bkp loc=" + backupLocation.DumpToString() + ", but failed");
+				new_item = GameInventory.LocationCreateLocalEntity(backupLocation, m_NewItemType,ECE_OBJECT_SWAP,RF_NONE); // create LOCAL new one on ground
+				if (!new_item)
+				{
+					Error("[inv] ReplaceItemWithNewLambdaBase Step D) plan B - wanted to create=" + m_NewItemType + " at bkp loc=" + backupLocation.DumpToString() + ", but failed");
+					return null;
+				}
+				return new_item;*/
+			}
+		}
+
+		// user did not asked for new entity
+		return null;
+	}
+
+	/**@fn		CopyOldPropertiesToNew
+	 * @brief	Step E. copy properties from old object to the created one
+	 *
+	 * @NOTE: This is supposed to be overriden in derived classes
+	 **/
+	void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step E) Copying props " + old_item + " --> " + new_item);
+	}
+
+	/**@fn		DeleteOldEntity
+	 * @brief	Step F. - deletes physically old item
+	 **/
+	protected void DeleteOldEntity()
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step F) delete old item=" + m_OldItem);
+		m_OldItem.DeleteSafe();
+	}
+	
+	/**@fn		CreateNetworkObjectInfo
+	 * @brief	Step G. - create NetworkObjectInfo for new item
+	 *
+	 * @NOTE: new_item can be null if the lambda did not create any item (intentionaly)
+	 **/
+	protected void CreateNetworkObjectInfo(EntityAI new_item)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step G) CreateNetworkObjectInfo =" + new_item);
+		if (new_item)
+			GetGame().RemoteObjectTreeCreate(new_item); // G) this forces server to send CreateVehicle Message to client. This is needed for preserving the appearance of network operations on client (so that DeleteObject(old) arrives before CreateVehicle(new)). @NOTE: this does not delete the object on server, only it's network representation.
+	}
+
+	/**@fn		OnSuccess
+	 * @brief	Step H. - notification on finish
+	 *
+	 * @NOTE: new_item can be null if the lambda did not create any item (intentionaly)
+	 **/
+	protected void OnSuccess(EntityAI new_item)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[inv] ReplaceItemWithNewLambdaBase Step H) OnSuccess=" + new_item);
+	}
+
+	/**@fn		OnAbort
+	 * @brief	Step Out - notification on abort
+	 *
+	 * @NOTE: new_item can be null if the lambda did not create any item (intentionaly)
+	 **/
+	protected void OnAbort()
+	{
+		Print("Error [inv] ReplaceItemWithNewLambdaBase OnAbort");
+	}
+
+	void Execute(HumanInventoryWithFSM fsm_to_notify = null)
+	{
+		int t = GetGame().GetTime();
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[syncinv] t=" + t + " lambda.Execute start ");
+
+		// A) init
+		bool prepared = PrepareLocations();
+
+		if (prepared && CanExecuteLambda())
+		{
+			// B) rm old (and delete on client)
+			RemoveOldItemFromLocation();
+			if (!m_RemoveFromLocationPassed)
+			{
+				Error("[inv] ReplaceItemWithNewLambdaBase Step B) ABORT - failed while rm old item from loc=" + InventoryLocation.DumpToStringNullSafe(m_OldLocation));
+
+				if (fsm_to_notify)
+					fsm_to_notify.ProcessHandAbortEvent(new HandEventHumanCommandActionAborted(fsm_to_notify.GetManOwner()));
+				OnAbort();
+				return;
+			}
+
+			// C) rm NetworkObjectInfo from old item (+ send delete object tree to clients)
+			RemoveNetworkObjectInfo();
+
+			// D) mk new in place of old
+			EntityAI new_item = CreateNewEntity();
+			if (WantCreateNewEntity() && new_item == null)
+			{
+				//Error("[inv] ReplaceItemWithNewLambdaBase Step D) ABORT - wanted to create=" + m_NewItemType + " at loc=" + m_NewLocation.DumpToString() + ", but failed");
+				Print("Error [inv] ReplaceItemWithNewLambdaBase Step D) ABORT - wanted to create=" + m_NewItemType + " at loc=" + InventoryLocation.DumpToStringNullSafe(m_NewLocation) + ", but failed");
+				if (m_RemoveFromLocationPassed)
+					UndoRemoveOldItemFromLocation();
+				if (m_RemoveNetworkObjectInfoPassed)
+					UndoRemoveNetworkObjectInfo();
+
+				OnAbort();
+				if (fsm_to_notify)
+					fsm_to_notify.ProcessHandAbortEvent(new HandEventHumanCommandActionAborted(fsm_to_notify.GetManOwner()));
+				return;
+			}
+
+			// E) cpy props
+			CopyOldPropertiesToNew(m_OldItem, new_item);
+
+			// F) del old
+			DeleteOldEntity();
+
+			// G) mk new NetworkObjectInfo
+			CreateNetworkObjectInfo(new_item);
+
+			// H) notification
+			OnSuccess(new_item);
+		}
+		else
+		{
+			Print("[syncinv] warning, lambda cannot be executed, skipping!");
+			if (fsm_to_notify)
+				fsm_to_notify.ProcessHandAbortEvent(new HandEventHumanCommandActionAborted(fsm_to_notify.GetManOwner()));
+			OnAbort();
+			return;
+		}
+		int te = GetGame().GetTime();
+		int dt = te - t;
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[syncinv] te=" + te + " lambda.Execute end, exec time=" + dt);
+	}
+
+	string DumpToString()
+	{
+		string s = "{ old=" + m_OldItem + " newType=" + m_NewItemType + "}";
+		return s;
+	}
+};
+
+
+class ItemInventory : GameInventory
+{
+};
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/TransportInventory.c b/scripts/3_Game/DayZ/Systems/Inventory/TransportInventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..63fda40dbcfd8c2d1fafac8087c1394cae49e3fc
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/TransportInventory.c
@@ -0,0 +1,7 @@
+/**@class		TransportInventory
+ * @brief		inventory for transport ("man cargo")
+ **/
+class TransportInventory : GameInventory
+{
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/Inventory/WeaponInventory.c b/scripts/3_Game/DayZ/Systems/Inventory/WeaponInventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..5609dca0f6001b9b0b52f28b7c595d6b66663b9b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/Inventory/WeaponInventory.c
@@ -0,0 +1,8 @@
+/**@class		WeaponInventory
+ * @brief		inventory for weapons
+ **/
+class WeaponInventory : ItemInventory
+{
+};
+
+proto native bool TryFireWeapon(EntityAI weapon, int muzzleIndex);
diff --git a/scripts/3_Game/DayZ/Systems/OFSMBase.c b/scripts/3_Game/DayZ/Systems/OFSMBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..789f0d5b0b12b9c1186330850a5fe2f4fab76f72
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/OFSMBase.c
@@ -0,0 +1,174 @@
+/**@class		OFSMBase
+ * @brief		base class for Orthogonal Finite State Machine
+ *
+ * stores current states (m_states) and transition table with possible transitions from each state
+ * to another state via event
+ **/
+class OFSMBase<Class FSMStateBase, Class FSMEventBase, Class FSMActionBase, Class FSMGuardBase>
+{
+	protected ref array<ref FSMStateBase> m_States; /// current fsm state
+	protected ref array<ref FSMStateBase> m_InitialStates; /// configurable initial state of the machine
+	protected ref array<ref FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase>> m_Transitions; /// fsm transition table
+
+	void OFSMBase ()
+	{
+		m_States = new array<ref FSMStateBase>;
+		m_InitialStates = new array<ref FSMStateBase>;
+		m_Transitions = new array<ref FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase>>;
+	}
+
+	/**@fn			GetCurrentStates
+	 * @brief		returns currently active state
+	 * @return		current state the FSM is in (or NULL)
+	 **/
+	array<ref FSMStateBase> GetCurrentState ()
+	{
+		return m_States;
+	}
+
+	/**@fn			SetInitialState
+	 * @brief		sets the initial_state for starting the machine
+	 **/
+	void SetInitialStates (array<ref FSMStateBase> initial_states)
+	{
+		m_InitialStates = initial_states;
+
+		for (int s = 0; s < initial_states.Count(); ++s)
+			m_States.Insert(initial_states[s]);
+	}
+
+	/**@fn			Start
+	 * @brief		starts the state machine by entering the initial_state (using intial_event as argument to initial state's onEntry)
+	 * @param[in]	e \p	optional event for starting the machind
+	 **/
+	void Start (array<ref FSMEventBase> initial_events = null)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) fsmbDebugPrint("[ofsm] " + this.ToString() + "::Start(" + initial_events.ToString() + "), init_state=" + m_InitialStates.ToString());
+
+		for (int s = 0; s < m_States.Count(); ++s)
+		{
+			m_States[s] = m_InitialStates[s];
+
+			if (initial_events)
+				m_States[s].OnEntry(initial_events[s]);
+			else
+				m_States[s].OnEntry(null);
+		}
+	}
+
+	/**@fn			IsRunning
+	 * @brief		returns true if machine is in running state
+	 **/
+	bool IsRunning ()
+	{
+		int sc = m_States.Count();
+		if (sc)
+		{
+			for (int s = 0; s < sc; ++s)
+				if (m_States[s] != null)
+					return true;
+		}
+		return false;
+	}
+
+	/**@fn			Terminate
+	 * @brief		terminates the state machine
+	 **/
+	void Terminate (array<ref FSMEventBase> terminal_events = null)
+	{
+		if (IsRunning())
+		{
+			for (int s = 0; s < m_States.Count(); ++s)
+			{
+				if (terminal_events)
+					m_States[s].OnExit(terminal_events[s]);
+				else
+					m_States[s].OnExit(null);
+
+				m_States[s] = null;
+			}
+		}
+	}
+
+	/**@fn			Update
+	 * @brief		if machine running, call OnUpdate() on current state
+	 **/
+	void Update (float dt)
+	{
+		if (IsRunning())
+		{
+			for (int s = 0; s < m_States.Count(); ++s)
+			{
+				m_States[s].OnUpdate(dt);
+			}
+		}
+	}
+	
+	/**@fn			AddTransition
+	 * @brief		adds transition into transition table
+	 **/
+	void AddTransition (FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t)
+	{
+		m_Transitions.Insert(t);
+	}
+
+	/**@fn			ProcessEvent
+	 * @brief		instructs the state machine to process the event e
+	 * @param[in]	e	\p	event that will be used to find suitable transition from current state
+	 * @return		FSM_OK if transition found and allowed by guard (if any)
+	 **/
+	ProcessEventResult ProcessEvent (FSMEventBase e)
+	{
+		int count = m_Transitions.Count();
+		for (int i = 0; i < count; ++i)
+		{
+			FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> row = m_Transitions.Get(i);
+			if (row.m_event.Type() == e.Type())
+			{
+				for (int s = 0; s < m_States.Count(); ++s)
+				{
+					if (row.m_srcState.Type() == m_States[s].Type() && row.m_event.Type() == e.Type())
+					{
+						FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t = m_Transitions.Get(i);
+						bool hasGuard = t.m_guard != NULL;
+						if (!hasGuard || (hasGuard && t.m_guard.GuardCondition(e)))		// 1) exec guard (if any)
+						{
+							ProcessLocalTransition(s, t, e); // 2) process transition allowed by guard
+						}
+					}
+				}
+			}
+		}
+		return ProcessEventResult.FSM_NO_TRANSITION;
+	}
+
+	/**@fn			ProcessLocalTransition
+	 * @brief		instructs the state machine to process the event locally - no hierarchy is crossed
+	 * @param[in]	t	\p	the transition in m_transitions
+	 * @param[in]	e	\p	event that will be used to process transition from current state
+	 * @return		FSM_OK or FSM_TERMINATED
+	 **/
+	protected ProcessEventResult ProcessLocalTransition (int s, FSMTransition<FSMStateBase, FSMEventBase, FSMActionBase, FSMGuardBase> t, FSMEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) fsmbDebugPrint("[ofsm] (local) state=" + t.m_srcState.ToString() + "-------- event=" + e.ToString() + "[G=" + t.m_guard.ToString() +"]/A=" + t.m_action.ToString() + " --------|> dst=" + t.m_dstState.ToString());
+
+		m_States[s].OnExit(e);			// 1) call onExit on old state
+
+		if (t.m_action)
+			t.m_action.Action(e);	// 2) execute transition action (if any)
+
+		m_States[s] = t.m_dstState;		// 3) change state to new
+
+		if (t.m_dstState != NULL)
+		{
+			m_States[s].OnEntry(e);		// 4a) call onEntry on new state
+			return ProcessEventResult.FSM_OK;
+		}
+		else
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmbDebugPrint("[ofsm] terminating fsm: state=" + t.m_srcState.ToString() + " event=" + e.ToString());
+			return ProcessEventResult.FSM_TERMINATED; // 4b) or terminate
+		}
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/Systems/TFTests/EnProfilerTests.c b/scripts/3_Game/DayZ/Systems/TFTests/EnProfilerTests.c
new file mode 100644
index 0000000000000000000000000000000000000000..2f20e14e58cb7ebade137224b637a3cefe7a9b59
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/TFTests/EnProfilerTests.c
@@ -0,0 +1,793 @@
+class EnProfilerTests : TestFramework
+{
+	//! Remember this, so we can restore the previous state before the test!
+	bool m_bWasProfilerEnabled;
+	
+	//---------------------------------------------------------------------------
+	// Ctor - Decides the tests to run
+	//---------------------------------------------------------------------------
+	void EnProfilerTests()
+	{
+		m_bWasProfilerEnabled = EnProfiler.IsEnabledC();
+		
+		AddInitTest("TestToggling");
+		AddInitTest("TestTogglingImmediate");
+		AddInitTest("TestSetFlags");
+		AddInitTest("TestClearFlags");
+		AddInitTest("TestAddFlags");
+		AddInitTest("TestModule");
+		AddInitTest("TestClassTimeData");
+		AddInitTest("TestClassCountData");
+		AddInitTest("TestFuncTimeData");
+		AddInitTest("TestFuncCountData");		
+	}
+	
+	//---------------------------------------------------------------------------
+	// Dtor
+	//---------------------------------------------------------------------------
+	void ~EnProfilerTests()
+	{
+		EnProfiler.Enable(m_bWasProfilerEnabled, true);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Tests
+	//---------------------------------------------------------------------------
+	// Test toggling state
+	TFResult TestToggling()
+	{
+		bool currentlyEnabled = EnProfiler.IsEnabledP();
+		EnProfiler.Enable(!currentlyEnabled);
+		if (Assert(currentlyEnabled != EnProfiler.IsEnabledP()))
+		{
+			EnProfiler.Enable(currentlyEnabled);				
+			return BTFR(Assert(currentlyEnabled == EnProfiler.IsEnabledP()));
+		}
+		
+		return NTFR(TFR.FAIL);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test toggling immediate state
+	TFResult TestTogglingImmediate()
+	{
+		bool currentlyEnabled = EnProfiler.IsEnabledC();
+		EnProfiler.Enable(!currentlyEnabled, true);
+		if (Assert(currentlyEnabled != EnProfiler.IsEnabledC()))
+		{
+			EnProfiler.Enable(currentlyEnabled, true);				
+			return BTFR(Assert(currentlyEnabled == EnProfiler.IsEnabledC()));
+		}
+		
+		return NTFR(TFR.FAIL);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test SetFlags/GetFlags
+	TFResult TestSetFlags()
+	{
+		int currentFlags = EnProfiler.GetFlags();
+		
+		for (int i = 0; i < EnumTools.GetEnumSize(EnProfilerFlags); ++i)
+		{
+			int flags = EnumTools.GetEnumValue(EnProfilerFlags, i);
+			EnProfiler.SetFlags(flags);
+			
+			if (!Assert(EnProfiler.GetFlags() == flags))
+			{
+				EnProfiler.SetFlags(currentFlags);
+				return NTFR(TFR.FAIL);
+			}
+			
+			for (int j = 0; j < EnumTools.GetEnumSize(EnProfilerFlags); ++j)
+			{
+				flags |= EnumTools.GetEnumValue(EnProfilerFlags, j);
+				EnProfiler.SetFlags(flags);
+				
+				if (!Assert(EnProfiler.GetFlags() == flags))
+				{
+					EnProfiler.SetFlags(currentFlags);
+					return NTFR(TFR.FAIL);
+				}
+			}
+		}
+		
+		// Let's test some bogus
+		EnProfiler.SetFlags(-333);
+		int bogusFlags = EnProfiler.GetFlags();
+		bogusFlags &= ~EnProfilerFlags.ALL;
+		if (!Assert(bogusFlags == 0))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		bogusFlags = EnProfiler.SetFlags(6003);
+		bogusFlags &= ~EnProfilerFlags.ALL;
+		if (!Assert(bogusFlags == 0))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		// Reset
+		EnProfiler.SetFlags(currentFlags);		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test removing of flags
+	TFResult TestClearFlags()
+	{
+		int currentFlags = EnProfiler.GetFlags();
+						
+		EnProfiler.SetFlags(EnProfilerFlags.RECURSIVE);
+		
+		if (!Assert(EnProfiler.RemoveFlags(EnProfilerFlags.RECURSIVE) == EnProfilerFlags.NONE))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		EnProfiler.SetFlags(EnProfilerFlags.RECURSIVE | EnProfilerFlags.RESET);
+		EnProfiler.RemoveFlags(EnProfilerFlags.RECURSIVE | EnProfilerFlags.RESET);
+		
+		if (!Assert(EnProfiler.GetFlags() == EnProfilerFlags.NONE))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		EnProfiler.SetFlags(EnProfilerFlags.RECURSIVE | EnProfilerFlags.RESET);
+		EnProfiler.ClearFlags();
+		
+		if (!Assert(EnProfiler.GetFlags() == EnProfilerFlags.NONE))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		// Reset
+		EnProfiler.SetFlags(currentFlags);		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test adding of flags
+	TFResult TestAddFlags()
+	{
+		int currentFlags = EnProfiler.GetFlags();
+						
+		EnProfiler.ClearFlags();
+		
+		// Return should match resulting flags
+		if (!Assert(EnProfiler.AddFlags(EnProfilerFlags.RESET) == EnProfiler.GetFlags()))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(EnProfiler.GetFlags() == EnProfilerFlags.RESET))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(EnProfiler.AddFlags(EnProfilerFlags.RECURSIVE) == (EnProfilerFlags.RESET | EnProfilerFlags.RECURSIVE)))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			return NTFR(TFR.FAIL);
+		}
+		
+		// Reset
+		EnProfiler.SetFlags(currentFlags);		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test module
+	TFResult TestModule()
+	{
+		// File lives in Game, use it while testing
+		const EnProfilerModule eptModule = EnProfilerModule.GAME;
+		
+		// This was added at the same time as this API, so check if it works as well
+		string nameOfCurrentModule = Type().GetModule();
+		if (!Assert(nameOfCurrentModule != ""))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// We know we are in Game, so use it as a test
+		EnProfilerModule currentModule;
+		if (!Assert(EnProfiler.NameToModule(nameOfCurrentModule, currentModule)))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(currentModule == eptModule))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// Test if setting and getting works
+		EnProfilerModule currentlyProfiledModule = EnProfiler.GetModule();		
+		EnProfiler.SetModule(eptModule);		
+		
+		if (!Assert(EnProfiler.GetModule() == eptModule))
+		{
+			EnProfiler.SetModule(currentlyProfiledModule);
+			return NTFR(TFR.FAIL);
+		}
+		
+		// Data to restore
+		int currentFlags = EnProfiler.GetFlags();
+		bool wasEnabled = EnProfiler.RequestImmediateData();
+		
+		// Make sure we are only profiling Game and that the data is clean
+		// Only valid for the Get...Per... methods, as they need to be sorted
+		EnProfiler.RemoveFlags(EnProfilerFlags.RECURSIVE);
+		
+		// GetTickTime() returns in seconds, so gather the results in seconds too
+		int resolution = EnProfiler.GetTimeResolution();
+		EnProfiler.SetTimeResolution(1);
+		
+		// Time to sleeb
+		float previousTime = EnProfiler.GetTimeOfFunc("Sleep", Type(), true);
+		float timeSlept = Sleep(0.3);
+		float postTime = EnProfiler.GetTimeOfFunc("Sleep", Type(), true);
+		float diff = postTime - previousTime - timeSlept;
+		
+		// Restore
+		EnProfiler.SetTimeResolution(resolution);		
+		
+		// We called the function, so it must have some time
+		if (!Assert(postTime > 0))
+		{
+			EnProfiler.SetFlags(currentFlags);
+			
+			if (!wasEnabled)
+				EnProfiler.Enable(false, true);
+			
+			EnProfiler.SetModule(currentlyProfiledModule);
+			
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(diff < 0.00001))
+		{
+			EnProfiler.SetFlags(currentFlags);			
+			
+			if (!wasEnabled)
+				EnProfiler.Enable(false, true);
+			
+			EnProfiler.SetModule(currentlyProfiledModule);
+			
+			return NTFR(TFR.FAIL);
+		}
+		
+		// Clean the session
+		EnProfiler.ResetSession(true);
+		
+		// Something from a different module should not get sorted, so just fire something from a different module
+		for (int i = 0; i < 1000; ++i)
+		{
+			EnumTools.StringToEnum(EnProfilerModule, "MISSION_CUSTOM");
+		}
+		
+		// Sort and gather the data and validate if it is correct
+		EnProfiler.SortData();	
+		array<ref EnProfilerTimeFuncPair> timePerFunc = {};
+		EnProfiler.GetTimePerFunc(timePerFunc);
+		
+		Debug.TFLog("Game fncs:", this, "TestModule");
+		
+		int funcCount = timePerFunc.Count();
+		for (int j = 0; j < funcCount; ++j)
+		{
+			EnProfilerTimeFuncPair tfp = timePerFunc[j];
+			Debug.TFLog(string.Format("	time: %1 | fnc: %2", tfp.param1, tfp.param2), this, "TestModule");
+			// We are currently profiling Game, so this Core function shouldn't be present
+			if (!Assert(tfp.param2 != "EnumTools::StringToEnum"))
+			{
+				EnProfiler.SetFlags(currentFlags);
+				
+				if (!wasEnabled)
+					EnProfiler.Enable(false, true);
+				
+				EnProfiler.SetModule(currentlyProfiledModule);
+				
+				return NTFR(TFR.FAIL);
+			}
+		}
+		
+		array<ref EnProfilerTimeClassPair> timePerClass = {};
+		EnProfiler.GetTimePerClass(timePerClass);
+		
+		int classCount = timePerClass.Count();
+		for (int k = 0; k < classCount; ++k)
+		{
+			typename type = timePerClass[k].param2;
+			EnProfilerModule classModule;
+			if (!Assert(EnProfiler.NameToModule(type.GetModule(), classModule)))
+			{
+				EnProfiler.SetFlags(currentFlags);
+				
+				if (!wasEnabled)
+					EnProfiler.Enable(false, true);
+				
+				EnProfiler.SetModule(currentlyProfiledModule);
+				
+				return NTFR(TFR.FAIL);
+			}
+			
+			// Only classes from Game should be present
+			if (!Assert(classModule == eptModule))
+			{
+				EnProfiler.SetFlags(currentFlags);
+				
+				if (!wasEnabled)
+					EnProfiler.Enable(false, true);
+				
+				EnProfiler.SetModule(currentlyProfiledModule);
+				
+				return NTFR(TFR.FAIL);
+			}
+		}
+		
+		// Now let's check if we can gather the data of what we called earlier by switching the profiled module without resetting the session
+		EnProfiler.SetModule(EnProfilerModule.CORE, false);
+		EnProfiler.SortData();
+		timePerFunc.Clear(); // Let's reuse the array, but the Get...Per... methods only appends to the array, clearing is our responsibility
+		EnProfiler.GetTimePerFunc(timePerFunc);
+		
+		bool found = false;
+		
+		Debug.TFLog("Core fncs:", this, "TestModule");
+		
+		funcCount = timePerFunc.Count();
+		for (int l = 0; l < funcCount; ++l)
+		{
+			EnProfilerTimeFuncPair tfpc = timePerFunc[l];
+			Debug.TFLog(string.Format("	time: %1 | fnc: %2", tfpc.param1, tfpc.param2), this, "TestModule");
+			// We are currently profiling Core, so this Core function should be present
+			if (tfpc.param2 == "EnumTools::StringToEnum")
+			{
+				found = true;
+				break;
+			}
+		}
+		
+		Assert(found);
+		
+		// Test some bogus
+		EnProfilerModule mod = EnProfiler.GetModule();
+		EnProfiler.SetModule(-333);
+		bool success = Assert(EnProfiler.GetModule() == mod);
+		EnProfiler.SetModule(6003);
+		success &= Assert(EnProfiler.GetModule() == mod);
+		
+		EnProfiler.SetFlags(currentFlags);
+		EnProfiler.SetModule(currentlyProfiledModule);
+		
+		if (!wasEnabled)
+			EnProfiler.Enable(false, true);
+		
+		return BTFR(success && found);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test to see if class time data is correct
+	TFResult TestClassTimeData()
+	{
+		// We should restore this when done
+		int resolution = EnProfiler.GetTimeResolution();
+		bool wasEnabled = EnProfiler.RequestImmediateData();
+		
+		// GetTickTime() returns in seconds, so gather the results in seconds too
+		EnProfiler.SetTimeResolution(1);
+		
+		// Create the classes
+		EPTHelperClass clss = new EPTHelperClass();
+		
+		// Time to stress
+		float previousTime = EnProfiler.GetTimeOfClass(clss.Type(), true);
+		float timeStressed = clss.DoEverything();
+		float postTime =  EnProfiler.GetTimeOfClass(clss.Type(), true);
+		float postTimeStatic = EnProfiler.GetTimeOfClass(StaticGetType(EPTHelperClass), true);
+		float timeProfiled = postTime - previousTime;
+		float diff = Math.AbsFloat(timeProfiled - timeStressed);
+		
+		Debug.TFLog(string.Format("Profiling result: stressed: %1 | profiled: %2 | diff: %3", timeStressed, timeProfiled, diff), this, "TestClassTimeData");
+		
+		// Restore
+		EnProfiler.SetTimeResolution(resolution);
+		if (!wasEnabled)
+			EnProfiler.Enable(false, true);
+		
+		// We called the function, so it must have some time
+		if (!Assert(postTime > 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(postTime == postTimeStatic))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(diff < 0.001))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test to see if class count data is correct
+	TFResult TestClassCountData()
+	{
+		const int allocAmount = 9;
+		const int releaseAmount = 6;
+		int remainingAmount = allocAmount - releaseAmount;
+		
+		// We should restore this when done
+		bool wasEnabled = EnProfiler.RequestImmediateData();
+		
+		// Time to test
+		int previousAlloc = EnProfiler.GetAllocationsOfClass(StaticGetType(EPTHelperClass), true);
+		int previousInstances = EnProfiler.GetInstancesOfClass(StaticGetType(EPTHelperClass), true);
+
+		array<ref EPTHelperClass> instanceArr = {};
+		for (int i = 0; i < allocAmount; ++i)
+		{
+			instanceArr.Insert(new EPTHelperClass());
+		}
+		
+		for (int j = 0; j < releaseAmount; ++j)
+		{
+			delete instanceArr[j];
+		}
+		
+		int postAlloc = EnProfiler.GetAllocationsOfClass(StaticGetType(EPTHelperClass), true);
+		int postInstances = EnProfiler.GetInstancesOfClass(StaticGetType(EPTHelperClass), true);
+		
+		int alloced = postAlloc - previousAlloc;
+		int instances = postInstances - previousInstances;
+		
+		Debug.TFLog(string.Format("Profiling result: alloc: %1 | instances: %2", alloced, instances), this, "TestClassCountData");
+		
+		// Restore
+		if (!wasEnabled)
+			EnProfiler.Enable(false, true);
+		
+		// Time to check
+		if (!Assert(alloced == allocAmount))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(instances == remainingAmount))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test to see if func time data is correct
+	TFResult TestFuncTimeData()
+	{
+		// We should restore this when done
+		int resolution = EnProfiler.GetTimeResolution();
+		bool wasEnabled = EnProfiler.RequestImmediateData();
+		
+		// GetTickTime() returns in seconds, so gather the results in seconds too
+		EnProfiler.SetTimeResolution(1);
+		
+		// Time to stress
+		float previousTime = EnProfiler.GetTimeOfFunc("StringFormat", Type(), true);
+		float timeStressed = StringFormat();
+		float postTime = EnProfiler.GetTimeOfFunc("StringFormat", Type(), true);
+		float timeProfiled = postTime - previousTime;
+		float diff = Math.AbsFloat(timeProfiled - timeStressed);
+		
+		float previousTime2 = EnProfiler.GetTimeOfFunc("StringConcat", Type(), true);
+		float timeStressed2 = StringConcat();
+		float postTime2 = EnProfiler.GetTimeOfFunc("StringConcat", Type(), true);
+		float timeProfiled2 = postTime2 - previousTime2;
+		float diff2 = Math.AbsFloat(timeProfiled2 - timeStressed2);
+		
+		Debug.TFLog(string.Format("Profiling result: StringFormat: %1 | StringConcat: %2", timeProfiled, timeProfiled2), this, "TestFuncTimeData");
+		
+		// Restore
+		EnProfiler.SetTimeResolution(resolution);
+		if (!wasEnabled)
+		{
+			EnProfiler.Enable(false, true);
+		}
+		
+		// We called the function, so it must have some time
+		if (!Assert(postTime > 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(diff < 0.001))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(postTime2 > 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		if (!Assert(diff2 < 0.001))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// I know that string.Format is faster than additive concatenation
+		if (!Assert(timeProfiled < timeProfiled2))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test to see if func count data is correct
+	TFResult TestFuncCountData()
+	{
+		// We should restore this when done
+		bool wasEnabled = EnProfiler.RequestImmediateData();
+		
+		// Time to count		
+		
+		// - CallFunction
+		int previousCountCF = EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		GetGame().GameScript.CallFunction(this, "TestFuncCountDataHelper", null, 0);
+		int postCountCF = EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		
+		int callCountCF = postCountCF - previousCountCF;
+		
+		// - CallFunctionParams
+		int previousCountCFP = EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		GetGame().GameScript.CallFunctionParams(this, "TestFuncCountDataHelper", null, null);
+		int postCountCFP =  EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		
+		int callCountCFP = postCountCFP - previousCountCFP;
+		
+		// - Regular call
+		int previousCountRG = EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		TestFuncCountDataHelper();
+		int postCountRG =  EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		
+		int callCountRG = postCountRG - previousCountRG;
+		
+		// - Call
+		int previousCountC = EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		GetGame().GameScript.Call(this, "TestFuncCountDataHelper", 0);
+		int postCountC =  EnProfiler.GetCountOfFunc("TestFuncCountDataHelper", Type(), true);
+		
+		int callCountC = postCountC - previousCountC;
+		
+		// - Garbage		
+		int callCountNon = EnProfiler.GetCountOfFunc("Non Existing Method", Type(), true);
+		
+		// - Static
+		int previousCountS = EnProfiler.GetCountOfFunc("TestFuncCountDataHelperStatic", Type(), true);
+		TestFuncCountDataHelperStatic();
+		int postCountS = EnProfiler.GetCountOfFunc("TestFuncCountDataHelperStatic", Type(), true);
+		
+		int callCountS = postCountS - previousCountS;
+		
+		// - Global
+		int previousCountG = EnProfiler.GetCountOfFuncG("GetDayZGame", true);
+		GetDayZGame();
+		int postCountG = EnProfiler.GetCountOfFuncG("GetDayZGame", true);
+	
+		int callCountG = postCountG - previousCountG;
+		
+		// - Global proto
+		// Not tracked, so don't need to compare before and after, should always be 0
+		ErrorEx("Testing global proto call", ErrorExSeverity.INFO);
+		int callCountGP = EnProfiler.GetCountOfFuncG("ErrorEx", true);
+		
+		// - Static proto
+		// Not tracked, so don't need to compare before and after, should always be 0
+		int callCountSP = EnProfiler.GetCountOfFunc("GetCountOfFunc", StaticGetType(EnProfiler), true);
+		
+		// - proto
+		// Not tracked, so don't need to compare before and after, should always be 0
+		GetGame().GetHostName();
+		int callCountP = EnProfiler.GetCountOfFunc("GetHostName", GetGame().Type(), true);
+		
+		// - proto native
+		// Not tracked, so don't need to compare before and after, should always be 0
+		GetGame().IsServer();
+		int callCountPN = EnProfiler.GetCountOfFunc("IsServer", GetGame().Type(), true);
+		
+		// - static proto native
+		// Not tracked, so don't need to compare before and after, should always be 0
+		ErrorModuleHandler.GetInstance();
+		int callCountSPN = EnProfiler.GetCountOfFunc("GetInstance", StaticGetType(ErrorModuleHandler), true);
+		
+		// Restore
+		if (!wasEnabled)
+		{
+			EnProfiler.Enable(false, true);
+		}
+		
+		// Do the checks
+		
+		// - CallFunction
+		if (!Assert(callCountCF == 1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - CallFunctionParams
+		if (!Assert(callCountCFP == 1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Regular call
+		if (!Assert(callCountRG == 1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Call
+		if (!Assert(callCountC == 1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Garbage
+		if (!Assert(callCountNon == -1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Static
+		if (!Assert(callCountS == 1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Global
+		if (!Assert(callCountG == 1))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Global proto
+		if (!Assert(callCountGP == 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - Static proto
+		if (!Assert(callCountSP == 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - proto
+		if (!Assert(callCountP == 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - proto native
+		if (!Assert(callCountPN == 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		// - static proto native
+		if (!Assert(callCountSPN == 0))
+		{
+			return NTFR(TFR.FAIL);
+		}
+		
+		return NTFR(TFR.SUCCESS);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Helpers
+	//---------------------------------------------------------------------------
+	// Snore
+	float Sleep(float timeS)
+	{		
+		float startTime = GetGame().GetTickTime();
+		while (GetGame().GetTickTime() - startTime < timeS)
+		{
+			// Zzz
+		}		
+		
+		return GetGame().GetTickTime() - startTime;
+	}
+	
+	//---------------------------------------------------------------------------
+	// Example stress method
+	float StringFormat()
+	{		
+		float startTime = GetGame().GetTickTime();
+		
+		for (int i = 0; i < 1000; ++i)
+		{
+			string example = string.Format("This %1 is %2 just %3 an %4 example %5", i, Type(), this, startTime, "lorem ipsum 1 2 3");
+		}	
+		
+		return GetGame().GetTickTime() - startTime;
+	}
+	
+	//---------------------------------------------------------------------------
+	// Example stress method 2
+	float StringConcat()
+	{		
+		float startTime = GetGame().GetTickTime();
+		
+		for (int i = 0; i < 1000; ++i)
+		{
+			string example = "This " + i + " is " + Type() + " just " + this + " an " + startTime + " example " + "lorem ipsum 1 2 3";
+		}
+		
+		return GetGame().GetTickTime() - startTime;
+	}
+	
+	//---------------------------------------------------------------------------
+	// To make sure it is only ever called in that test
+	void TestFuncCountDataHelper()
+	{
+		int dummy = 3;
+	}
+	
+	//---------------------------------------------------------------------------
+	// To make sure it is only ever called in that test
+	static void TestFuncCountDataHelperStatic()
+	{
+		int dummy = 3;
+	}
+}
+
+class EPTHelperClass
+{
+	float Sleep2(float timeS)
+	{		
+		float startTime = GetGame().GetTickTime();
+		while (GetGame().GetTickTime() - startTime < timeS)
+		{
+			// Zzz
+		}		
+		
+		return GetGame().GetTickTime() - startTime;
+	}
+	float SleepAgain(float timeS)
+	{		
+		float startTime = GetGame().GetTickTime();
+		while (GetGame().GetTickTime() - startTime < timeS)
+		{
+			// Zzz
+		}		
+		
+		return GetGame().GetTickTime() - startTime;
+	}
+	
+	float DoEverything()
+	{
+		float startTime = GetGame().GetTickTime();
+		
+		Sleep2(3);
+		SleepAgain(3);
+		
+		return GetGame().GetTickTime() - startTime;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/TFTests/ScriptInvokerTests.c b/scripts/3_Game/DayZ/Systems/TFTests/ScriptInvokerTests.c
new file mode 100644
index 0000000000000000000000000000000000000000..212a434fe0c4acf7275043e6bf20b1a253f5211b
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/TFTests/ScriptInvokerTests.c
@@ -0,0 +1,192 @@
+class ScriptInvokerTests : TestFramework
+{
+	ref ScriptInvoker m_Invoker;
+	int m_InvokeCount;
+	
+	//---------------------------------------------------------------------------
+	// Ctor - Decides the tests to run
+	//---------------------------------------------------------------------------
+	void ScriptInvokerTests()
+	{
+		m_Invoker = new ScriptInvoker();
+		
+		//AddInitTest("TestFirstUnique");
+		//AddInitTest("TestSecondUnique");
+		//AddInitTest("TestInsertRemoveUnique");
+		//AddInitTest("TestInsertUniqueImmediate");
+		//AddInitTest("TestClearRunning");
+		//AddInitTest("TestInvokeRunning");
+		AddInitTest("TestInsertRunning");
+	}
+	
+	//---------------------------------------------------------------------------
+	// Dtor
+	//---------------------------------------------------------------------------
+	void ~ScriptInvokerTests()
+	{
+		
+	}
+	
+	//---------------------------------------------------------------------------
+	// Tests
+	//---------------------------------------------------------------------------
+	// Test first insert flagged as unique
+	TFResult TestFirstUnique()
+	{
+		InvokeReset();
+		
+		bool insert1 = m_Invoker.Insert(InvokeLog, EScriptInvokerInsertFlags.UNIQUE);
+		Assert(insert1);
+		bool insert2 = m_Invoker.Insert(InvokeLog);
+		Assert(!insert2);
+		
+		m_Invoker.Invoke("TestFirstUnique");
+		bool count = Assert(m_InvokeCount == 1);
+		
+		InvokeReset();
+		
+		return BTFR(insert1 && !insert2 && count);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test second insert flagged as unique
+	TFResult TestSecondUnique()
+	{
+		InvokeReset();
+		
+		bool insert1 = m_Invoker.Insert(InvokeLog);
+		Assert(insert1);
+		bool insert2 = m_Invoker.Insert(InvokeLog, EScriptInvokerInsertFlags.UNIQUE);
+		Assert(!insert2);
+		
+		m_Invoker.Invoke("TestSecondUnique");
+		bool count = Assert(m_InvokeCount == 1);
+		
+		InvokeReset();
+		
+		return BTFR(insert1 && !insert2 && count);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test inserting and removing of unique
+	TFResult TestInsertRemoveUnique()
+	{
+		InvokeReset();
+		
+		bool insert1 = m_Invoker.Insert(InvokeLog, EScriptInvokerInsertFlags.UNIQUE);
+		Assert(insert1);
+		bool remove1 = m_Invoker.Remove(InvokeLog);
+		Assert(remove1);
+		bool insert2 = m_Invoker.Insert(InvokeLog);
+		Assert(insert2);
+		
+		m_Invoker.Invoke("TestInsertRemoveUnique");
+		bool count = Assert(m_InvokeCount == 1);
+		
+		InvokeReset();
+		
+		return BTFR(insert1 && remove1 && insert2 && count);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test inserting and of unique and immediate
+	TFResult TestInsertUniqueImmediate()
+	{
+		InvokeReset();
+		
+		bool insert1 = m_Invoker.Insert(InvokeLog, EScriptInvokerInsertFlags.UNIQUE);
+		Assert(insert1);
+		bool insert2 = m_Invoker.Insert(InvokeLog, EScriptInvokerInsertFlags.IMMEDIATE);
+		Assert(insert2);
+		
+		m_Invoker.Invoke("TestInsertUniqueImmediate");
+		bool count = Assert(m_InvokeCount == 1);
+		
+		InvokeReset();
+		
+		return BTFR(insert1 && !insert2 && count);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test clearing while invoking
+	TFResult TestClearRunning()
+	{
+		InvokeReset();
+		
+		m_Invoker.Insert(InvokeClear);
+		m_Invoker.Insert(InvokeLog);
+		
+		m_Invoker.Invoke("TestClearRunning");
+		bool count = Assert(m_InvokeCount == 1);
+		
+		InvokeReset();
+		
+		return BTFR(count);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test invoke while invoking (will result in overflow)
+	TFResult TestInvokeRunning()
+	{
+		InvokeReset();
+		
+		m_Invoker.Insert(InvokeInvoke);
+		
+		m_Invoker.Invoke("TestInvokeRunning");
+		
+		InvokeReset();
+		
+		return BTFR(false); // This can never succeed, it will never even reach this point
+	}
+	
+	//---------------------------------------------------------------------------
+	// Test insert while invoking
+	TFResult TestInsertRunning()
+	{
+		InvokeReset();
+		
+		m_Invoker.Insert(InvokeInsert);
+		
+		m_Invoker.Invoke("TestInvokeRunning");
+		Print(m_InvokeCount);
+		bool count = Assert(m_InvokeCount == 129);
+		
+		InvokeReset();
+		
+		return BTFR(count);
+	}
+
+	
+	//---------------------------------------------------------------------------
+	// Helpers
+	//---------------------------------------------------------------------------
+	void InvokeLog(string s)
+	{
+		//Debug.TFLog(s, this, "InvokeLog");
+		++m_InvokeCount;
+	}
+	
+	void InvokeReset()
+	{
+		m_Invoker.Clear();
+		m_InvokeCount = 0;
+	}
+	
+	void InvokeClear(string s)
+	{
+		InvokeLog(s);
+		m_Invoker.Clear();
+	}
+	
+	void InvokeInvoke(string s)
+	{
+		InvokeLog(s);
+		m_Invoker.Invoke(s);
+	}
+	
+	void InvokeInsert(string s)
+	{
+		InvokeLog(s);
+		m_Invoker.Insert(InvokeInsert, EScriptInvokerInsertFlags.IMMEDIATE);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/TestFramework.c b/scripts/3_Game/DayZ/Systems/TestFramework.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a55d6fcce820429a3e463cae04f81db445060b5
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/TestFramework.c
@@ -0,0 +1,290 @@
+enum TFR
+{
+	FAIL = -1,
+	SUCCESS,
+	PENDING,
+}
+
+class TFResult // Pretty much just to be able to keep a reference...
+{
+	TFR Result;
+	
+	void TFResult(TFR result)
+	{
+		Result = result;
+	}
+	
+	TFResult And(TFResult other)
+	{
+		if (Result == TFR.PENDING || other.Result == TFR.PENDING)
+			ErrorEx("Trying to And while one of the results are PENDING.");
+		
+		if (Result == TFR.SUCCESS && other.Result == TFR.SUCCESS)
+			Result = TFR.SUCCESS;
+		else
+			Result = TFR.FAIL;
+		
+		return this;
+	}
+	
+	TFResult Or(TFResult other)
+	{
+		if (Result == TFR.PENDING || other.Result == TFR.PENDING)
+			ErrorEx("Trying to Or while one of the results are PENDING.");
+		
+		if (Result == TFR.SUCCESS || other.Result == TFR.SUCCESS)
+			Result = TFR.SUCCESS;
+		else
+			Result = TFR.FAIL;
+		
+		return this;
+	}
+}
+typedef array<ref TFResult> TFResultArr;
+
+class TFCaller
+{
+	private Class 			m_Instance;
+	private string 			m_Test;
+	private ref TFResult 	m_Result;
+	
+	void TFCaller(Class instance, string test, TFResult result)
+	{
+		m_Instance 	= instance;
+		m_Test 		= test;
+		m_Result 	= result;
+	}
+	
+	TFResult Run(float dt)
+	{
+		bool callResult = GetGame().GameScript.CallFunction(m_Instance, m_Test, m_Result, dt);
+		if (!callResult)
+		{
+			ErrorEx(string.Format("Failed to call function \'%1\' on \'%2\'", m_Test, m_Instance.GetDebugName()));
+			m_Result.Result = TFR.FAIL;
+		}
+		
+		return m_Result;
+	}
+	
+	string GetTest()
+	{
+		return m_Test;
+	}
+	
+	string GetTestEx()
+	{
+		return string.Format("%1::%2", m_Instance.ClassName(), m_Test);
+	}
+}
+typedef array<ref TFCaller> TFCallerArr;
+
+class TFModule
+{
+	private int 				m_Count;
+	private int 				m_Failed;
+	private int 				m_Success;
+	
+	private ref TFCallerArr 	m_Tests;
+	private ref TFResultArr 	m_Results;
+	
+	private ref array<string>	m_SucceededTests;
+	private ref array<string>	m_FailedTests;
+	
+	void TFModule()
+	{
+		m_Tests = {};
+		m_Results = {};
+		
+		m_SucceededTests = {};
+		m_FailedTests = {};
+	}
+	
+	int Count()
+	{
+		return m_Count;
+	}
+	
+	int Failed()
+	{
+		return m_Failed;
+	}
+	
+	int Success()
+	{
+		return m_Success;
+	}
+	
+	int Pending()
+	{
+		return m_Count - (m_Failed + m_Success);
+	}
+	
+	void AddTest(Class instance, string test, bool repeat)
+	{
+		++m_Count;
+		
+		TFResult result = new TFResult(TFR.PENDING);
+		m_Results.Insert(result);
+		
+		m_Tests.Insert(new TFCaller(instance, test, result));
+	}
+	
+	bool Run(bool fatal, float dt)
+	{
+		array<TFCaller> done = new array<TFCaller>();
+		
+		// Run the tests
+		int runningTests = m_Tests.Count();
+		for (int i = 0; i < runningTests; ++i)
+		{
+			TFCaller t = m_Tests[i];
+			if (RunTest(t, dt))
+				done.Insert(t);
+		}
+		
+		// Remove finished tests
+		foreach (TFCaller doneT : done)
+			m_Tests.RemoveItem(doneT);
+		
+		// Validate fatal
+		if (fatal && m_Tests.Count() > 0)
+		{
+			Print("- Active tests -------------------------");
+			foreach (TFCaller rTest : m_Tests)
+				Print(rTest.GetTest());
+			Print("----------------------------------------");
+			
+			ErrorEx("Not all tests are done while run was fatal.");
+			m_Tests.Clear();
+		}
+		
+		return m_Tests.Count() == 0;
+	}
+	
+	private bool RunTest(TFCaller caller, float dt)
+	{
+		TFR res = caller.Run(dt).Result;
+		
+		switch (res)
+		{
+			case TFR.FAIL:
+				++m_Failed;
+				m_FailedTests.Insert(caller.GetTestEx());
+				break;
+			case TFR.SUCCESS:
+				++m_Success;
+				m_SucceededTests.Insert(caller.GetTestEx());
+				break;
+		}
+		
+		return res != TFR.PENDING;
+	}
+	
+	string Result()
+	{
+		return string.Format("{ [TFModule] :: Tests: %1 | Success: %2 | Failed: %3 | Pending: %4 }", Count(), Success(), Failed(), Pending());
+	}
+	
+	void PrintResult(string prefix = "", TestFramework caller = null, string function = "")
+	{
+		Debug.TFLog(string.Format("%1%2", prefix, Result()), caller, function);
+		if (m_SucceededTests.Count())
+		{
+			Debug.TFLog("   |-[SUCCESS]", caller, function);
+			foreach (string success : m_SucceededTests)
+			{
+				Debug.TFLog(string.Format("        |- %1", success), caller, function);
+			}
+		}
+		if (m_FailedTests.Count())
+		{
+			Debug.TFLog("   |-[FAILED]", caller, function);
+			foreach (string fail : m_FailedTests)
+			{
+				Debug.TFLog(string.Format("        |- %1", fail), caller, function);
+			}
+		}
+	}
+}
+
+//! Test Framework
+class TestFramework : ScriptedEntity
+{
+	private ref TFModule m_OnInitModule;
+	private ref TFModule m_OnFrameModule;
+	
+	void TestFramework()
+	{
+		SetEventMask(EntityEvent.INIT);
+		SetEventMask(EntityEvent.FRAME);
+		
+		m_OnInitModule = new TFModule();
+		m_OnFrameModule = new TFModule();
+	}
+	
+	void ~TestFramework()
+	{
+		m_OnInitModule.PrintResult("IM: ", this, "~TestFrameWork");
+		m_OnFrameModule.PrintResult("FM: ", this, "~TestFrameWork");
+	}
+	
+	//---------------------------------------------------------------------------
+	// Perform tests
+	//---------------------------------------------------------------------------
+	protected override void EOnInit(IEntity other, int extra)
+	{
+		m_OnInitModule.Run(true, 0);
+	}
+	
+	protected override void EOnFrame(IEntity other, float timeSlice)
+	{
+		if (m_OnFrameModule.Run(false, timeSlice))
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(Delete);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Add a test
+	//---------------------------------------------------------------------------
+	protected void AddInitTest(string test)
+	{
+		m_OnInitModule.AddTest(this, test, false);
+	}
+	
+	protected void AddFrameTest(string test)
+	{
+		m_OnFrameModule.AddTest(this, test, true);
+	}
+	
+	//---------------------------------------------------------------------------
+	// Asserts
+	//---------------------------------------------------------------------------
+	protected bool Assert(bool condition)
+	{
+		if (!condition)
+			ErrorEx("ASSERTION FAILED.");
+		
+		return condition;
+	}
+	
+	//---------------------------------------------------------------------------
+	// Helpers
+	//---------------------------------------------------------------------------
+	TFResult NTFR(TFR result)
+	{
+		return new TFResult(result);
+	}
+	
+	TFResult BTFR(bool result)
+	{
+		if (result)
+			return new TFResult(TFR.SUCCESS);
+		else
+			return new TFResult(TFR.FAIL);
+	}
+	
+	TFResult CTFR()
+	{
+		return new TFResult(TFR.SUCCESS);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSource.c b/scripts/3_Game/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSource.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a4cdd129df450a406cf2e5cbe3f94f92951eaa2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSource.c
@@ -0,0 +1,304 @@
+class UniversalTemperatureSourceSettings
+{
+	float m_UpdateInterval		= 1.0;			//! how often the Update is ticking
+	float m_TemperatureMin		= 0;			//! min temperature you can get from the TemperatureSource
+	float m_TemperatureMax		= 100;			//! max temperature you can get from the TemperatureSource
+	float m_TemperatureCap		= float.MAX;	//! temperature cap that will limit the return value from GetTemperature method
+	float m_RangeFull			= 1;			//! range where the full temperature is given to receiver
+	float m_RangeMax			= 2;			//! maximum range where the receiver can get some temperature
+	
+	bool m_Updateable 			= false;		//! if the Update is running periodically
+	bool m_ManualUpdate  		= false;		//! update is called manually (ex. own tick of parent entity)
+	bool m_AffectStat			= false;		//! if the temperature generated is also set as Temperature Stat on Item itself
+
+	vector m_Position			= vector.Zero;
+	EntityAI m_Parent			= null;			//! parent Entity of the UTS
+}
+
+class UniversalTemperatureSourceResult
+{
+	float m_Temperature = 0;
+	// ?? what else
+}
+
+//! original Timer deletes m_params which is unwanted
+class UniversalTemperatureSourceTimer : Timer
+{
+	override void OnTimer()
+	{
+		if (m_params)
+		{
+			GetGame().GameScript.CallFunctionParams(m_target, m_function, null, m_params);
+		}
+		else
+		{
+			GetGame().GameScript.CallFunction(m_target, m_function, null, 0);
+		}
+	}
+	
+	override void Stop()
+	{
+		SetRunning(false);
+		m_time = 0;
+	}
+	
+	void SetParams(Param params)
+	{
+		m_params = params;
+	}
+}
+
+typedef UniversalTemperatureSource UTemperatureSource;
+
+class UniversalTemperatureSource
+{
+	protected bool 										m_Active
+	protected ref UniversalTemperatureSourceTimer 		m_Timer;
+	protected UniversalTemperatureSourceSettings 		m_Settings;
+	protected ref UniversalTemperatureSourceResult 		m_ResultValues;
+	protected ref UniversalTemperatureSourceLambdaBase 	m_Lambda;
+
+	void UniversalTemperatureSource(EntityAI pParent, UniversalTemperatureSourceSettings pSettings, UniversalTemperatureSourceLambdaBase pLambda)
+	{
+		m_Active			= false;
+		m_Settings			= pSettings;
+		m_Lambda			= pLambda;
+		m_ResultValues 		= new UniversalTemperatureSourceResult();
+		m_Timer				= new UniversalTemperatureSourceTimer();
+		
+		Init(pParent);
+	}
+	
+	void ~UniversalTemperatureSource() {};
+	
+	void Init(EntityAI pParent)
+	{
+		if (pParent)
+		{
+			pParent.SetUniversalTemperatureSource(this);
+	
+			m_Settings.m_Parent 	= pParent;
+			m_Settings.m_Position	= pParent.GetPosition();
+		}
+		
+		if (!m_Settings.m_ManualUpdate)
+		{
+			auto params = new Param2<UniversalTemperatureSourceSettings, UniversalTemperatureSourceLambdaBase>(m_Settings, m_Lambda);
+	
+			m_Timer.Run(m_Settings.m_UpdateInterval, this, "Update", params, m_Settings.m_Updateable);
+			SetActive(false);
+		}
+	}
+	
+	vector GetPosition()
+	{
+		return m_Settings.m_Position;
+	}
+	
+	float GetFullRange()
+	{
+		return m_Settings.m_RangeFull;
+	}
+
+	float GetMaxRange()
+	{
+		return m_Settings.m_RangeMax;
+	}
+	
+	float GetTemperature()
+	{
+		if (m_Settings.m_TemperatureCap != float.MAX)
+		{
+			return Math.Min(m_Settings.m_TemperatureCap, GetTemperatureRaw());
+		}
+		
+		return GetTemperatureRaw();
+	}
+	
+	float GetTemperatureRaw()
+	{
+		if (m_ResultValues)
+		{
+			return m_ResultValues.m_Temperature;
+		}
+		
+		return 0;
+	}
+	
+	float GetTemperatureMin()
+	{
+		return m_Settings.m_TemperatureMin;
+	}
+	
+	float GetTemperatureMax()
+	{
+		return m_Settings.m_TemperatureMax;
+	}
+	
+	EntityAI GetParent()
+	{
+		return m_Settings.m_Parent;
+	}
+	
+	bool IsActive()
+	{
+		if (m_Settings.m_ManualUpdate)
+		{
+			return m_Active;
+		}
+
+		return m_Timer && m_Timer.IsRunning();
+	}
+	
+	void SetActive(bool pActive)
+	{
+		if (m_Settings.m_ManualUpdate)
+		{
+			m_Active = pActive;
+			return;
+		}
+
+		if (pActive && !m_Timer.IsRunning())
+		{
+			m_Timer.Continue();
+		}
+		else
+		{
+			m_Timer.Stop();
+		}
+	}
+	
+	void SetDefferedActive(bool pActive, float pSeconds)
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLaterByName(this, "SetActive", pSeconds * 1000, false, new Param1<bool>(pActive));
+	}
+	
+	void ChangeSettings(UniversalTemperatureSourceSettings pSettings)
+	{
+		m_Timer.SetParams(new Param2<UniversalTemperatureSourceSettings, UniversalTemperatureSourceLambdaBase>(m_Settings, m_Lambda));
+	}
+
+	void Update(UniversalTemperatureSourceSettings settings, UniversalTemperatureSourceLambdaBase lambda)
+	{
+		if (!IsActive())
+		{
+			return;
+		}
+
+		if (lambda)
+		{
+			settings.m_Position = settings.m_Parent.GetUniversalTemperatureSourcePosition();
+			lambda.Execute(settings, m_ResultValues);
+		}
+
+	}
+}
+
+typedef UniversalTemperatureSourceDebug UTemperatureSourceDebug
+
+class UniversalTemperatureSourceDebug
+{
+	const string DELIMITER_DATA		= "|";
+	const string DELIMITER_KEYPAIR	= ":";
+
+	string m_Header;
+	string m_Data;
+	ref array<string> m_Names;		//! names parsed from m_Pairs
+	ref array<string> m_Values;		//! values parsed from m_Pairs
+	ref array<string> m_Pairs;		//! keeps first iteration of parsed data from the m_Data
+	
+	void UniversalTemperatureSourceDebug()
+	{
+		m_Header 		= "";
+		m_Data 			= "";
+		m_Pairs			= new array<string>();
+		m_Names			= new array<string>();
+		m_Values		= new array<string>();
+	}
+	
+	void AddHeader(string header)
+	{
+		m_Header = header;
+	}
+	
+	void Add(string name, string value)
+	{
+		m_Data = string.Format("%1%2:%3%4", m_Data, name, value, DELIMITER_DATA);	
+	}
+	
+	void Commit()
+	{
+		m_Pairs = ParseData();
+		ParseKeyPairs();
+	}
+
+	int PairsCount()
+	{
+		return m_Pairs.Count();
+	}
+	
+	string GetHeader()
+	{
+		return m_Header;
+	}
+	
+	string GetName(int pIndex)
+	{
+		if (m_Names.Count() - 1 < pIndex)
+		{
+			Debug.Log(string.Format("GetName index: %1 from data of length: %2", pIndex, m_Names.Count()), "UniversalTemperatureSourceDebug");
+			return "";
+		}
+		
+		return m_Names.Get(pIndex);
+	}
+	
+	string GetValue(int pIndex)
+	{
+		if (m_Values.Count() - 1 < pIndex)
+		{
+			Debug.Log(string.Format("GetValue index: %1 from data of length: %2", pIndex, m_Values.Count()), "UniversalTemperatureSourceDebug");
+			return "";
+		}
+		
+		return m_Values.Get(pIndex);
+	}
+	
+	protected array<string> ParseData()
+	{
+		
+		array<string> parsed = new array<string>();
+		if (m_Data)
+		{
+			m_Data.Split(DELIMITER_DATA, parsed);
+		}
+		
+		return parsed;
+	}
+	
+	protected void ParseKeyPairs()
+	{
+		m_Names.Clear();
+		m_Values.Clear();
+
+		if (m_Pairs)
+		{
+			for (int i = 0; i < m_Pairs.Count(); i++)
+			{
+				array<string> keypair = new array<string>();
+
+				m_Pairs.Get(i).Split(DELIMITER_KEYPAIR, keypair);
+				m_Names.Insert(keypair[0]);
+				m_Values.Insert(keypair[1]);
+			}
+		}
+	}
+	
+	void Debug()
+	{
+		for (int i = 0; i < m_Names.Count(); i++)
+		{
+			Debug.Log(string.Format("%1: %2", m_Names.Get(i), m_Values.Get(i)), "UniversalTemperatureSourceDebug");
+		}
+	}
+}
diff --git a/scripts/3_Game/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaBase.c b/scripts/3_Game/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c40f08a24f2bf2b95b696bf4500b15f84bf863a1
--- /dev/null
+++ b/scripts/3_Game/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaBase.c
@@ -0,0 +1,11 @@
+class UniversalTemperatureSourceLambdaBase
+{
+	void UniversalTemperatureSourceLambdaBase();
+	void ~UniversalTemperatureSourceLambdaBase();
+	void Execute(UniversalTemperatureSourceSettings pSettings, UniversalTemperatureSourceResult resultValues);
+	void DryItemsInVicinity(UniversalTemperatureSourceSettings pSettings);
+	
+	//! --------------------------------------
+	//! DEPRECATED
+	const float HEAT_THROUGH_AIR_COEF = 0.003;
+}
diff --git a/scripts/3_Game/DayZ/TriggerCarrierBase.c b/scripts/3_Game/DayZ/TriggerCarrierBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb4732afe20dd1d663c45cc61ad11f471cd93af9
--- /dev/null
+++ b/scripts/3_Game/DayZ/TriggerCarrierBase.c
@@ -0,0 +1,10 @@
+class UndergroundTriggerCarrierBase extends ScriptedEntity
+{
+	int m_TriggerIndex = -1;
+	
+	void SetIndex(int index)
+	{
+		m_TriggerIndex = index;
+		SetSynchDirty();
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/UndergroundAreaLoader.c b/scripts/3_Game/DayZ/UndergroundAreaLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc253933c4f4457e902cc8820374a2d22f3702bd
--- /dev/null
+++ b/scripts/3_Game/DayZ/UndergroundAreaLoader.c
@@ -0,0 +1,133 @@
+class JsonUndergroundTriggers
+{
+	ref array<ref JsonUndergroundAreaTriggerData> Triggers;
+}
+
+
+class JsonUndergroundAreaBreadcrumb
+{
+	vector GetPosition()
+	{
+		return Vector(Position[0],Position[1],Position[2]);
+	}
+	
+	ref array<float> 	Position;
+	float 				EyeAccommodation;
+	bool 				UseRaycast;
+	float 				Radius;
+}
+
+class JsonUndergroundAreaTriggerData
+{
+	vector GetPosition()
+	{
+		return Vector(Position[0],Position[1],Position[2]);
+	}
+	
+	vector GetOrientation()
+	{
+		return Vector(Orientation[0],Orientation[1],Orientation[2]);
+	}
+	vector GetSize()
+	{
+		return Vector(Size[0],Size[1],Size[2]);
+	}
+	
+	ref array<float> Position;
+	ref array<float> Orientation;
+	ref array<float> Size;
+	float  EyeAccommodation;
+	float  InterpolationSpeed;
+	
+	ref array<ref JsonUndergroundAreaBreadcrumb> Breadcrumbs;
+	
+};
+
+
+class UndergroundAreaLoader
+{
+	private static string m_Path = "$mission:cfgundergroundtriggers.json";
+	
+	static ref JsonUndergroundTriggers m_JsonData;
+	
+	
+	static JsonUndergroundTriggers GetData()
+	{
+		if (!FileExist(m_Path))
+		{
+			// We fallback to check in data and notify user file was not found in mission
+			PrintToRPT("[WARNING] :: [UndergroundAreaLoader GetData()] :: file not found in MISSION folder, your path is " + m_Path + " Attempting DATA folder");
+			
+			string worldName;
+			GetGame().GetWorldName(worldName);
+			m_Path = string.Format("dz/worlds/%1/ce/cfgundergroundtriggers.json", worldName);
+			
+			if (!FileExist(m_Path))
+			{
+				PrintToRPT("[WARNING] :: [UndergroundAreaLoader GetData()] ::file not found in DATA folder, your path is " + m_Path);
+				return null; // Nothing could be read, just end here
+			}
+		}
+
+		string errorMessage;
+		JsonUndergroundTriggers data;
+		if (!JsonFileLoader<JsonUndergroundTriggers>.LoadFile(m_Path, data, errorMessage))
+			ErrorEx(errorMessage);
+		
+		return data;
+	}
+	
+	
+	static void SpawnAllTriggerCarriers()
+	{
+		if (!m_JsonData)
+		{
+			m_JsonData = GetData();
+		}
+		
+		if (!m_JsonData || !m_JsonData.Triggers)
+		{
+			return;
+		}
+		
+		foreach (int i, auto data:m_JsonData.Triggers)
+		{
+			SpawnTriggerCarrier(i, data);
+		}
+	}
+	
+	static void SpawnTriggerCarrier(int index, JsonUndergroundAreaTriggerData data)
+	{
+		
+		UndergroundTriggerCarrierBase carrier = UndergroundTriggerCarrierBase.Cast(GetGame().CreateObjectEx( "UndergroundTriggerCarrier", data.GetPosition(), ECE_NONE ));
+		//Print("spawning trigger carrier at pos :" +data.GetPosition());
+		if (carrier)
+		{
+			carrier.SetIndex(index);
+			carrier.SetOrientation(data.GetOrientation());
+		}
+	}
+	
+	//---------------------------------------------------------------------------------------
+	static void SyncDataSend(PlayerIdentity identity)
+	{
+		GetGame().RPCSingleParam(null, ERPCs.RPC_UNDERGROUND_SYNC, new Param1<JsonUndergroundTriggers>(m_JsonData), true, identity);
+	}
+	
+	//---------------------------------------------------------------------------------------
+	
+	static void OnRPC(ParamsReadContext ctx)
+	{
+		Param1<JsonUndergroundTriggers> data = new Param1< JsonUndergroundTriggers>(null);
+		
+		if ( ctx.Read(data) )
+		{
+			m_JsonData = data.param1;
+		}
+		else
+		{
+			ErrorEx("UndergroundAreaLoader datasynced - failed to read");
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/VONManager.c b/scripts/3_Game/DayZ/VONManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4e9176baf8c0fcc2ca7640eae631d7a0dbbd505
--- /dev/null
+++ b/scripts/3_Game/DayZ/VONManager.c
@@ -0,0 +1,327 @@
+class VONManagerBase : Managed
+{
+	protected bool					m_VoNToggled;
+	ref 	  ScriptInvoker			m_OnVonStateEvent;
+	ref 	  ScriptInvoker			m_OnPartyChatChangedEvent;
+	
+	void VONManagerBase()
+	{
+		m_VoNToggled = false;
+	}
+	
+	void HideVoiceNotification();
+	void ShowVoiceNotification(int level, bool fading);
+	void HandleInput(Input inp);
+	void OnVOIPThresholdChanged();
+	void OnEvent(EventType eventTypeId, Param params);
+	
+	bool IsVonToggled()
+	{
+		return m_VoNToggled;
+	}
+}
+
+class VONManagerImplementation : VONManagerBase
+{
+	void VONManagerImplementation()
+	{
+		m_OnVonStateEvent = new ScriptInvoker();
+		m_OnPartyChatChangedEvent = new ScriptInvoker();
+	}
+	
+	void ~VONManagerImplementation()
+	{
+		m_OnVonStateEvent.Clear();
+		m_OnPartyChatChangedEvent.Clear();
+	}
+	
+	/**
+	\brief Hides the VON notification completely and immediately
+	*/
+	override void HideVoiceNotification()
+	{
+		if (GetGame().IsMissionMainMenu())
+		{
+			return;
+		}
+		
+		Mission mission = GetGame().GetMission();
+		mission.GetMicrophoneIcon().Show(false);
+		mission.HideVoiceLevelWidgets();
+	}
+	
+	/**
+	\brief Shows the voice notification
+		\param level the loudness of the player voice. 0 = whisper, 1 = normal, 2 = shout
+		\param fading specifies whether icon should slowly fade to invisibility after being displayed
+	*/
+	override void ShowVoiceNotification(int level, bool fading)
+	{
+		if (GetGame().IsMissionMainMenu())
+		{
+			return;
+		}
+		
+		Mission mission = GetGame().GetMission();
+		ImageWidget micIcon = mission.GetMicrophoneIcon();
+		WidgetFadeTimer micTimer = mission.GetMicWidgetFadeTimer();
+		map<int,ImageWidget> voiceLeveWidgets = mission.GetVoiceLevelWidgets();
+		map<int,ref WidgetFadeTimer> voiceLevelTimers = mission.GetVoiceLevelTimers();
+		
+		// microphone icon
+		micTimer.Stop();
+		micIcon.SetAlpha(1.0); 
+		micIcon.Show(true);
+		
+		if (fading)
+		{
+			micTimer.FadeOut(micIcon, 3.0);
+		}
+		
+		// range icons
+		for( int n = 0; n < voiceLeveWidgets.Count(); n++ )
+		{
+			int voiceKey = voiceLeveWidgets.GetKey(n);
+			ImageWidget voiceWidget = voiceLeveWidgets.Get(n);
+			
+			// stop fade timer since it will be refreshed
+			WidgetFadeTimer timer = voiceLevelTimers.Get(n);		
+			timer.Stop();
+		
+			// show widgets according to the level
+			if ( voiceKey <= level )
+			{
+				voiceWidget.SetAlpha(1.0); // reset from possible previous fade out 
+				voiceWidget.Show(true);
+				
+				if (fading)
+				{
+					timer.FadeOut(voiceWidget, 3.0);
+				}
+			}
+			else
+			{
+				voiceWidget.Show(false);
+			}
+		}
+	}
+	
+	/**
+	\brief Handles some VON related input
+		\param inp input to handle
+	*/
+	override void HandleInput(Input inp)
+	{
+#ifdef PLATFORM_XBOX
+		// ignore VON-related input if user is in an xbox party
+		if (GetGame().IsInPartyChat())
+		{
+			return;
+		}
+#endif
+		int oldLevel = GetGame().GetVoiceLevel();
+		if (oldLevel == -1) //VoN system not initialized!
+			return;
+				
+		int newLevel = -1;
+		
+		if (inp.LocalPress_ID(UAVoiceDistanceUp,false))
+		{
+			newLevel = ( oldLevel + 1 ) % ( VoiceLevelShout + 1 );
+		}
+		
+		if (inp.LocalPress_ID(UAVoiceDistanceDown,false))
+		{
+			newLevel = oldLevel - 1;
+			if (newLevel < VoiceLevelWhisper) //nah...
+			{
+				newLevel = VoiceLevelShout;
+			}
+		}
+		
+		if (newLevel > -1)
+		{
+			GetGame().SetVoiceLevel(newLevel);
+			UpdateVoiceIcon();
+		}
+	}
+	
+	private void UpdateVoiceIcon()
+	{
+		Mission mission = GetGame().GetMission();
+		int rangeLevel = GetGame().GetVoiceLevel();
+			
+		if (mission.IsVoNActive())
+		{
+			if (m_VoNToggled)
+			{
+				if (VONManager.IsVoiceThresholdMinimum())
+				{
+					ShowVoiceNotification(rangeLevel, false);
+				}
+				else
+				{
+					ShowVoiceNotification(rangeLevel, true);
+				}
+			}
+			else
+			{
+				ShowVoiceNotification(rangeLevel, false);
+			}
+		}
+		else
+		{
+			HideVoiceNotification();
+		}
+	}
+	
+	/**
+	\brief Fires every time VOIP threshold value changes
+	*/
+	override void OnVOIPThresholdChanged()
+	{		
+		UpdateVoiceIcon();
+	}
+	
+	/**
+	\brief Handles VON-related events
+		\param eventTypeId event that fired
+		\param params event-specific parameters
+	*/
+	override void OnEvent(EventType eventTypeId, Param params)
+	{
+		Mission mission = GetGame().GetMission();
+		switch (eventTypeId)
+		{
+			case VONUserStartedTransmittingAudioEventTypeID:
+			{
+				// only handle this if we are in Voice Activation mode, so ignore if in PTT mode
+				if (m_VoNToggled)
+				{
+					if (!VONManager.IsVoiceThresholdMinimum())
+					{
+						ShowVoiceNotification(GetGame().GetVoiceLevel(), false);
+					}
+				}
+				break;
+			}
+			
+			case VONUserStoppedTransmittingAudioEventTypeID:
+			{
+				// only handle this if we are in Voice Activation mode, so ignore if in PTT mode
+				if (m_VoNToggled)
+				{
+					if (!VONManager.IsVoiceThresholdMinimum())
+					{
+						HideVoiceNotification();
+					}
+				}
+				break;
+			}
+			
+			case VONStateEventTypeID:
+			{
+				if (!mission)
+				{
+					break;
+				}
+				
+				VONStateEventParams vonStateParams = VONStateEventParams.Cast( params );
+				mission.SetVoNActive(vonStateParams.param1);
+				m_VoNToggled = vonStateParams.param2;
+				
+				UpdateVoiceIcon();
+				
+				m_OnVonStateEvent.Invoke();
+				break;
+			}
+			
+			case PartyChatStatusChangedEventTypeID:
+			{
+				m_OnPartyChatChangedEvent.Invoke();
+				break;
+			}
+			
+			case VONStartSpeakingEventTypeID:
+			{
+				VONStartSpeakingEventParams vonStartParams;
+				if (Class.CastTo(vonStartParams, params))
+				{
+					GetDayZGame().AddVoiceNotification(vonStartParams);
+				}
+				break;
+			}
+			
+			case VONStopSpeakingEventTypeID:
+			{
+				VONStopSpeakingEventParams vonStopParams;
+				if (Class.CastTo(vonStopParams, params))
+				{
+					GetDayZGame().RemoveVoiceNotification(vonStopParams);
+				}
+				break;
+			}
+			
+			case MPSessionPlayerReadyEventTypeID:
+			{
+				UpdateVoiceIcon();
+				break;
+			}	
+		}
+	}
+}
+
+//! Manager class which handles Voice-over-network functionality while player is connected to a server
+class VONManager
+{	
+	private static ref VONManagerBase m_VONManager = new VONManagerBase();
+
+	/**
+	\brief Main way to access VONManager functionality from script
+		\return \p Instance of VONManagerImplementation if logged on to server, or VONManagerBase otherwise
+	*/
+	static VONManagerBase GetInstance()
+	{
+		return m_VONManager;
+	}
+	
+	/**
+	\brief Initializes VONManager, runs when user first connects to a server
+	*/
+	static void Init()
+	{
+		delete m_VONManager;
+		m_VONManager = new VONManagerImplementation();
+	}
+	
+	/**
+	\brief Uninitializes VONManager, runs when user disconnects from server
+	*/
+	static void CleanupInstance()
+	{
+		delete m_VONManager;
+		m_VONManager = new VONManagerBase();
+	}
+	
+	/**
+	\brief Specifies whether VON mode is toggled or not
+		\return \p True if in Voice Activation mode, False if in Push-to-Talk mode
+	*/
+	static bool IsVONToggled()
+	{
+		return m_VONManager.IsVonToggled();
+	}
+	
+	/**
+	\brief Specifies whether user's voice activation threshold value is equal to the minimum voice activation threshold value
+		\return \p True if threshold minimum, false otherwise
+	*/
+	static bool IsVoiceThresholdMinimum()
+	{
+		GameOptions gameOptions = new GameOptions();
+		NumericOptionsAccess noa;
+		Class.CastTo(noa, gameOptions.GetOptionByType( OptionAccessType.AT_OPTIONS_VON_THRESHOLD_SLIDER ));
+
+		return noa.ReadValue() <= GetGame().GetSoundScene().GetSilenceThreshold();
+	}
+}
diff --git a/scripts/3_Game/DayZ/Vehicles/Car.c b/scripts/3_Game/DayZ/Vehicles/Car.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a3a05ef050c3672b9482752b1e45278fc163015
--- /dev/null
+++ b/scripts/3_Game/DayZ/Vehicles/Car.c
@@ -0,0 +1,449 @@
+
+//!	Car's sound controller list. (native, do not change or extend)
+enum CarSoundCtrl
+{
+	// simulation
+	ENGINE, //!< indicates if engine is ON
+	RPM,    //!< engine's RPM
+	SPEED,  //!< speed of the car in km/h
+
+	// miscellaneous
+	DOORS, //!< indicates if doors are open
+	PLAYER //!< indicates if driver is controlled by player
+};
+
+
+
+//!	Type of vehicle's fluid. (native, do not change or extend)
+enum CarFluid
+{
+	FUEL,
+	OIL,
+	BRAKE,
+	COOLANT,
+
+	USER1, //!< reserved for user / modding support
+	USER2, //!< reserved for user / modding support
+	USER3, //!< reserved for user / modding support
+	USER4  //!< reserved for user / modding support
+};
+
+
+
+//!	Enumerated gearbox types. (native, do not change or extend)
+enum CarGearboxType
+{
+	MANUAL,   //!< classic manual transmission with friction plates between engine and gearbox
+	AUTOMATIC //!< automatic transmission with torque converter between engine and gearbox
+}
+
+
+
+//!	Enumerated vehicle's gears. (native, do not change or extend)
+enum CarGear
+{
+	REVERSE,
+	NEUTRAL,
+	FIRST,
+	SECOND,
+	THIRD,
+	FOURTH,
+	FIFTH,
+	SIXTH,
+	SEVENTH,
+	EIGTH,
+	NINTH,
+	TENTH,
+	ELEVENTH,
+	TWELFTH,
+	THIRTEENTH,
+	FOURTEENTH,
+	FIFTEENTH,
+	SIXTEENTH
+};
+
+
+
+//!	Enumerated automatic gearbox modes. (native, do not change or extend)
+enum CarAutomaticGearboxMode
+{
+	P, //!< park
+	R, //!< reverse
+	N, //!< neutral
+	D  //!< drive
+};
+
+
+
+//!	Base native class for all motorized wheeled vehicles.
+class Car extends Transport
+{
+	//!	DEPRECATED, left for backwards compatibility, the methods of this class are now directly accessible on Car itself
+	proto native CarController GetController();
+	
+	//!	Returns the current speed of the vehicle in km/h.
+	proto native float GetSpeedometer();
+	
+	//! Returns the current speed of the vehicle in km/h. Value is absolute
+	float GetSpeedometerAbsolute()
+	{
+		return Math.AbsFloat(GetSpeedometer());
+	}
+
+	override bool IsAreaAtDoorFree( int currentSeat, float maxAllowedObjHeight = 0.5, float horizontalExtents = 0.5, float playerHeight = 1.7 )
+	{
+		vector transform[4];
+		
+		vector extents;
+		
+		extents[0] = horizontalExtents;
+		extents[1] = playerHeight;
+		extents[2] = horizontalExtents;
+
+		float speed = GetSpeedometerAbsolute();
+		if (speed > 8)
+			extents[2] = extents[2] * 6;
+		if (speed > 8)
+			extents[0] = 2;
+		
+		return IsAreaAtDoorFree( currentSeat, maxAllowedObjHeight, extents, transform );
+	}
+	
+	override Shape DebugFreeAreaAtDoor( int currentSeat, float maxAllowedObjHeight = 0.5, float horizontalExtents = 0.5, float playerHeight = 1.7 )
+	{
+		int color = ARGB(20, 0, 255, 0);
+		
+		vector transform[4];
+		
+		vector extents;
+		
+		extents[0] = horizontalExtents;
+		extents[1] = playerHeight;
+		extents[2] = horizontalExtents;
+
+		float speed = GetSpeedometerAbsolute();
+		if (speed > 8)
+			extents[2] = extents[2] * 6;
+		if (speed > 8)
+			extents[0] = 2;
+		
+		if (!IsAreaAtDoorFree( currentSeat, maxAllowedObjHeight, extents, transform ))
+		{
+			color = ARGB(20, 255, 0, 0);
+		}
+		
+		Shape shape = Debug.DrawBox(-extents * 0.5, extents * 0.5, color);
+		shape.SetMatrix(transform);
+		return shape;
+	}
+	
+	override int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.HIDE_VICINITY;
+	}
+
+//-----------------------------------------------------------------------------
+// controls
+
+	//!	Returns the current steering value in range <-1, 1>.
+	proto native float GetSteering();
+	/*!
+		Sets the steering value.
+
+		\param in     should be in range <-1, 1>
+		\param analog indicates if the input value was taken from analog controller
+	*/
+	proto native void SetSteering( float in, bool analog = false );
+
+	//!	Returns the current thrust turbo modifier value in range <0, 1>.
+	proto native float GetThrustTurbo();
+	//!	Returns the current thrust gentle modifier value in range <0, 1>.
+	proto native float GetThrustGentle();
+	//!	Returns the current thrust value in range <0, 1>.
+	proto native float GetThrust();
+	/*!
+		Sets the thrust value.
+
+		\param in     should be in range <0, 1>
+		\param gentle should be in range <0, 1>, thrust modifier
+		\param turbo  should be in range <0, 1>, thrust modifier
+	*/
+	proto native void SetThrust( float in, float gentle = 0, float turbo = 0 );
+
+	//! Returns the current brake value in range <0, 1>.
+	proto native float GetBrake();
+	/*!
+		Sets the brake value.
+
+		\param in should be in range <0, 1>
+		\param panic should be in range <0, 1>
+	*/
+	proto native void SetBrake( float in, float panic = 0, bool gentle = false );
+	
+	//! Returns the current handbrake value in range <0, 1>.
+	proto native float GetHandbrake();
+	/*!
+		Sets the handbrake value.
+
+		\param in should be in range <0, 1>
+	*/
+	proto native void SetHandbrake( float in );
+	
+	/*!
+		Sets if brakes should activate without a driver present
+	*/
+	proto native void SetBrakesActivateWithoutDriver( bool activate = true );
+	
+	//! Returns the current clutch value in range <0, 1>.
+	proto native float GetClutch();
+	/*!
+		Sets the clutch state.
+	*/
+	proto native void SetClutchState( bool in );
+
+	//!	Returns index of the current gear.
+	proto native int GetGear();
+
+	proto native void ShiftUp();
+	proto native void ShiftTo( CarGear gear );
+	proto native void ShiftDown();
+
+//-----------------------------------------------------------------------------
+
+//-----------------------------------------------------------------------------
+// fluids
+
+	/*!
+		Returns tank capacity for the specified vehicle's fluid.
+
+		\param fluid the specified fluid type
+	*/
+	proto native float GetFluidCapacity( CarFluid fluid );
+
+	/*!
+		Returns fraction value (in range <0, 1>)
+		of the current state of the specified vehicle's fluid.
+
+		\param[in] fluid the specified fluid type
+	*/
+	proto native float GetFluidFraction( CarFluid fluid );
+
+	//! Removes from the specified fluid the specified amount.
+	proto native void Leak( CarFluid fluid, float amount );
+
+	//! Removes all the specified fluid from vehicle.
+	proto native void LeakAll( CarFluid fluid );
+
+	//! Adds to the specified fluid the specified amount.
+	proto native void Fill( CarFluid fluid, float amount );
+
+	/*!
+		Is called every time when the specified vehicle's fluid level
+		changes eg. when car is consuming fuel.
+
+		\param[in] fluid fluid identifier, \see CarFluid
+		\param[in] newValue new fluid level
+		\param[in] oldValue previous fluid level before change
+	*/
+	void OnFluidChanged( CarFluid fluid, float newValue, float oldValue ) {}
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// engine
+
+	//! Returns engine's min operating rpm
+	proto native float EngineGetRPMMin();
+	
+	//! Returns engine's idle rpm before engine stalls.
+	proto native float EngineGetRPMIdle();
+	
+	//! Returns engine's max rpm before engine blows up.
+	proto native float EngineGetRPMMax();
+
+	//! Returns engine's maximal working rpm without damaging the engine.
+	proto native float EngineGetRPMRedline();
+
+	//! Returns engine's rpm value.
+	proto native float EngineGetRPM();
+
+	//! Returns true when engine is running, false otherwise.
+	proto native bool EngineIsOn();
+
+	//! Starts the engine.
+	proto native void EngineStart();
+
+	/*!
+		Is called every time the game wants to start the engine.
+
+		\return true if the engine can start, false otherwise.
+	*/
+	bool OnBeforeEngineStart()
+	{
+		// engine can start by default
+		return true;
+	}
+
+	//! Is called every time the engine starts.
+	void OnEngineStart() {}
+
+	//! Stops the engine.
+	proto native void EngineStop();
+
+	//! Is called every time the engine stops.
+	void OnEngineStop() {}
+
+	//! Get actual position of engine (model space)
+	proto native vector GetEnginePos();
+	//! Override the position of engine (model space)
+	proto native void SetEnginePos(vector pos);
+
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// gearbox
+
+	//! Returns total number of gears.
+	proto native int GetGearsCount();
+
+	//! Returns gearbox type. See CarGearboxType enum for more info.
+	proto native CarGearboxType GearboxGetType();
+
+	//! Returns gearbox mode. This is useful when car has automatic gearbox.
+	proto native CarAutomaticGearboxMode GearboxGetMode();
+
+	/*!
+		Is called every time when the simulation changed gear.
+
+		\param[in] newGear new gear level
+		\param[in] oldGear previous gear level before gear shift
+	*/
+	void OnGearChanged( int newGear, int oldGear )
+	{
+	}
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// wheels
+
+	//! Returns true if any of the wheels are locked in terms of its movement.
+	proto native bool WheelIsAnyLocked();
+	/*!
+		Returns true if given wheel is locked in terms of its movement.
+
+		\param[in] wheelIdx index of the wheel, they are counted from left-front to rear-right
+	*/
+	proto native bool WheelIsLocked( int wheelIdx );
+	
+	//! How many wheel can be attached to a car (hubs only)
+	proto native int WheelCount();
+	
+	//! Number of actually attached wheels (hubs only)
+	proto native int WheelCountPresent();
+
+//-----------------------------------------------------------------------------
+
+
+//-----------------------------------------------------------------------------
+// events
+
+	/*!
+		Is called every time when vehicle collides with other object.
+
+		\param[in] zoneName configured vehicle's zone that was hit
+		\param[in] localPos position where the vehicle was hit in vehicle's space
+		\param[in] other object with which the vehicle is colliding
+		\param[in] data contact properties
+	*/
+	void OnContact( string zoneName, vector localPos, IEntity other, Contact data ) {}
+
+	/*!
+		Is called every sound simulation step.
+		In this callback, user can modify behaviour of sound controllers.
+
+		\param[in] ctrl sound controller identifier, \see CarSoundCtrl
+		\param[in] oldValue already computed value by the game code
+		\return new value of the specified sound controller.
+	*/
+	float OnSound( CarSoundCtrl ctrl, float oldValue )
+	{
+		// just use the computed value by the game code
+		return oldValue;
+	}
+
+	/*!
+		Is called after every input simulation step.
+
+		Note that the player character and other systems can always change the internal state.
+		It is highly recommended to store state of custom inputs elsewhere and call Setters here.
+
+		\param[in] dt frame time in seconds
+	*/
+	void OnInput( float dt ) {}
+
+	/*!
+		Is called every game frame.
+		\param[in] dt frame time in seconds
+	*/
+	void OnUpdate( float dt ) {}
+//-----------------------------------------------------------------------------
+
+
+	// implemented only in internal configuration
+	proto native void ForcePosition( vector pos );
+	// implemented only in internal configuration
+	proto native void ForceDirection( vector dir );
+};
+
+
+
+//! DEPRECATED class left for backwards compatibility, methods are available on car itself now
+class CarController
+{
+	private void CarController() {}
+	private void ~CarController() {}
+	
+	//!	Returns the current steering value in range <-1, 1>.
+	proto float GetSteering();
+	/*!
+		Sets the steering value.
+
+		\param in     should be in range <-1, 1>
+		\param analog indicates if the input value was taken from analog controller
+	*/
+	proto void SetSteering( float in, bool analog = false );
+
+	//!	Returns the current thrust turbo modifier value in range <0, 1>.
+	proto float GetThrustTurbo();
+	//!	Returns the current thrust gentle modifier value in range <0, 1>.
+	proto float GetThrustGentle();
+	//!	Returns the current thrust value in range <0, 1>.
+	proto float GetThrust();
+	/*!
+		Sets the thrust value.
+
+		\param in     should be in range <0, 1>
+		\param gentle should be in range <0, 1>, thrust modifier
+		\param turbo  should be in range <0, 1>, thrust modifier
+	*/
+	proto void SetThrust( float in, float gentle = 0, float turbo = 0 );
+
+	//! Returns the current brake value in range <0, 1>.
+	proto float GetBrake();
+	/*!
+		Sets the brake value.
+
+		\param in should be in range <0, 1>
+		\param panic should be in range <0, 1>
+	*/
+	proto void SetBrake( float in, float panic = 0 );
+
+	//!	Returns index of the current gear.
+	proto int GetGear();
+
+	proto void ShiftUp();
+	proto void ShiftTo( CarGear gear );
+	proto void ShiftDown();
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/Vehicles/Helicopter.c b/scripts/3_Game/DayZ/Vehicles/Helicopter.c
new file mode 100644
index 0000000000000000000000000000000000000000..671a9f1547371a2fdedb5c5828dc5052025068d4
--- /dev/null
+++ b/scripts/3_Game/DayZ/Vehicles/Helicopter.c
@@ -0,0 +1,28 @@
+/*!
+	Base native class for helicopter.
+*/
+class Helicopter extends Transport
+{
+};
+
+//! Native implementatin with auto hover funcionality
+class HelicopterAuto extends Helicopter
+{
+	//! Returns true when engine is running, false otherwise.
+	proto native bool IsEngineOn();
+
+	//! Starts the engine.
+	proto native void EngineStart();
+
+	//! Stops the engine.
+	proto native void EngineStop();
+
+	//! Returns true when auto-hover system is turned on, false otherwise.
+	proto native bool IsAutohoverOn();
+
+	//! Enables auto-hover system.
+	proto native void AutohoverOn();
+
+	//! Disables auto-hover system.
+	proto native void AutohoverOff();
+};
diff --git a/scripts/3_Game/DayZ/Vehicles/Transport.c b/scripts/3_Game/DayZ/Vehicles/Transport.c
new file mode 100644
index 0000000000000000000000000000000000000000..65e1a6291cd96ac6c82c01b9e70d7c93062377a2
--- /dev/null
+++ b/scripts/3_Game/DayZ/Vehicles/Transport.c
@@ -0,0 +1,296 @@
+/*!
+	Base native class of all vehicles in game.
+*/
+class Transport extends EntityAI
+{
+	ref TIntArray m_SingleUseActions;
+	ref TIntArray m_ContinuousActions;
+	ref TIntArray m_InteractActions;
+
+	void Transport()
+	{
+	}
+
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+
+
+	//! Synchronizes car's state in case the simulation is not running.
+	proto native void Synchronize();
+
+
+	//! Returns crew capacity of this vehicle.
+	proto native int CrewSize();
+
+	//! Returns crew member index based on action component index.
+	//! -1 is returned when no crew position corresponds to given component index.
+	proto native int CrewPositionIndex( int componentIdx );
+
+	//! Returns crew member index based on player's instance.
+	//! -1 is returned when the player is not isnide.
+	proto native int CrewMemberIndex( Human player );
+
+	//! Returns crew member based on position index.
+	//! Null can be returned if no Human is present on the given position.
+	proto native Human CrewMember( int posIdx );
+
+	//! Reads entry point and direction into vehicle on given position in model space.
+	proto void CrewEntry( int posIdx, out vector pos, out vector dir );
+
+	//! Reads entry point and direction into vehicle on given position in world space.
+	proto void CrewEntryWS( int posIdx, out vector pos, out vector dir );
+
+	//! Returns crew transformation indside vehicle in model space
+	proto void CrewTransform( int posIdx, out vector mat[4] );
+
+	//! Returns crew transformation indside vehicle in world space
+	proto void CrewTransformWS( int posIdx, out vector mat[4] );
+
+	//! Performs transfer of player from world into vehicle on given position.
+	proto native void CrewGetIn( Human player, int posIdx );
+
+	//! Performs transfer of player from vehicle into world from given position.
+	proto native Human CrewGetOut( int posIdx );
+	
+	//! Handles death of player in vehicle and awakes its physics if needed
+	proto native void CrewDeath( int posIdx );
+	
+	override bool IsTransport()
+	{
+		return true;
+	}
+	
+	override bool IsIgnoredByConstruction()
+	{
+		return false;
+	}
+	
+	override bool IsHealthVisible()
+	{
+		return true;
+	}
+
+	override bool ShowZonesHealth()
+	{
+		return true;
+	}
+	
+	bool IsAnyCrewPresent()
+	{
+		for (int index = 0; index < CrewSize(); ++index)
+		{
+			if (CrewMember(index) != null)
+				return true;
+		}
+		
+		return false;
+	}
+	
+	float GetTransportCameraDistance()
+	{
+		return 4.0;
+	}
+	
+	void MarkCrewMemberUnconscious(int crewMemberIndex);
+	void MarkCrewMemberDead(int crewMemberIndex);
+	protected void HandleByCrewMemberState(ECrewMemberState state);
+
+	vector GetTransportCameraOffset()
+	{
+		return "0 1.3 0";
+	}
+	
+	int GetAnimInstance()
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		Error("GetAnimInstance() not implemented");
+		return 0;
+#else
+		return 2;
+#endif
+	}
+
+	int GetSeatAnimationType( int posIdx )
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		Error("GetSeatAnimationType() not implemented");
+#endif
+		return 0;
+	}
+
+	int Get3rdPersonCameraType()
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		Error("Get3rdPersonCameraType() not implemented");
+		return 0;
+#else
+		return 31;
+#endif
+	}
+	
+	bool CrewCanGetThrough( int posIdx )
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		return false;
+#else
+		return true;
+#endif
+	}
+	
+	bool CanReachSeatFromSeat( int currentSeat, int nextSeat )
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		return false;
+#else
+		return true;
+#endif
+	}
+	
+	bool CanReachSeatFromDoors( string pSeatSelection, vector pFromPos, float pDistance = 1.0 )
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		return false;
+#else
+		return true;
+#endif	
+	}
+
+	bool CanReachDoorsFromSeat( string pDoorsSelection, int pCurrentSeat )
+	{
+#ifndef CFGMODS_DEFINE_TEST
+		return false;
+#else
+		return true;
+#endif
+	}
+	
+	int GetSeatIndexFromDoor( string pDoorSelection )
+	{
+		//Potientially could be fixed some other way, currently follows the unfortunate pattern that CanReachDoorsFromSeat has created
+		switch (pDoorSelection)
+		{
+			case "DoorsDriver":
+				return 0;
+				break;
+			case "DoorsCoDriver":
+				return 1;
+				break;
+			case "DoorsCargo1":
+				return 2;
+				break;
+			case "DoorsCargo2":
+				return 3;
+				break;
+		}
+		return -1;
+	}
+	
+	bool IsIgnoredObject( Object o )
+	{
+		if (!o)
+			return false;
+
+		//! If the player can't interact (hint: collide) with the object, then it is ignored
+		int layer = dBodyGetInteractionLayer(o);
+		bool interacts = dGetInteractionLayer(this, PhxInteractionLayers.CHARACTER, layer);
+		if (!interacts)
+		{
+			return true;
+		}
+
+		DayZPlayer player;
+		if (Class.CastTo(player, o))
+		{
+			//! Ignore any player that is currently in this vehicle
+			HumanCommandVehicle hcv = player.GetCommand_Vehicle();
+			if (hcv && hcv.GetTransport() == this)
+			{
+				return true;
+			}
+		}
+
+		EntityAI e = EntityAI.Cast(o);			
+		// CanBeSkinned means it is a dead entity which should not block the door
+		return ( ( e && (e.IsZombie() || e.IsHologram()) ) || o.CanBeSkinned() || o.IsBush() || o.IsTree() );
+	}
+
+	bool IsAreaAtDoorFree( int currentSeat, float maxAllowedObjHeight, inout vector extents, out vector transform[4] )
+	{
+		GetTransform(transform);
+		
+		vector crewPos;
+		vector crewDir;
+		CrewEntry( currentSeat, crewPos, crewDir );
+		
+		vector entry[4];
+		entry[2] = crewDir;
+		entry[0] = vector.Up * crewDir;
+		entry[1] = entry[2] * entry[0];
+		entry[3] = crewPos;
+		
+		Math3D.MatrixMultiply4( transform, entry, transform );
+		
+		vector position = transform[3];
+		vector orientation = Math3D.MatrixToAngles(transform);
+		
+		position[1] = position[1] + maxAllowedObjHeight + (extents[1] * 0.5);
+		
+		array<Object> excluded = new array<Object>;
+		array<Object> collided = new array<Object>;
+		
+		excluded.Insert(this);
+		
+		GetGame().IsBoxColliding(position, orientation, extents, excluded, collided);
+		
+		orientation.RotationMatrixFromAngles(transform);
+		transform[3] = position;
+		
+		foreach (Object o : collided)
+		{
+			EntityAI e = EntityAI.Cast(o);			
+			if (IsIgnoredObject(o))
+				continue;
+			
+			vector minmax[2];
+			if (o.GetCollisionBox(minmax))
+				return false;
+		}
+
+		return true;
+	}
+
+	bool IsAreaAtDoorFree( int currentSeat, float maxAllowedObjHeight = 0.5, float horizontalExtents = 0.5, float playerHeight = 1.7 )
+	{
+		vector transform[4];
+		vector extents;
+		
+		extents[0] = horizontalExtents;
+		extents[1] = playerHeight;
+		extents[2] = horizontalExtents;
+		
+		return IsAreaAtDoorFree( currentSeat, maxAllowedObjHeight, extents, transform );
+	}
+	
+	Shape DebugFreeAreaAtDoor( int currentSeat, float maxAllowedObjHeight = 0.5, float horizontalExtents = 0.5, float playerHeight = 1.7 )
+	{
+		int color = ARGB(20, 0, 255, 0);
+		
+		vector transform[4];
+		vector extents;
+		
+		extents[0] = horizontalExtents;
+		extents[1] = playerHeight;
+		extents[2] = horizontalExtents;
+		
+		if (!IsAreaAtDoorFree( currentSeat, maxAllowedObjHeight, extents, transform ))
+		{
+			color = ARGB(20, 255, 0, 0);
+		}
+		
+		Shape shape = Debug.DrawBox(-extents * 0.5, extents * 0.5, color);
+		shape.SetMatrix(transform);
+		return shape;
+	}
+};
diff --git a/scripts/3_Game/DayZ/Weather.c b/scripts/3_Game/DayZ/Weather.c
new file mode 100644
index 0000000000000000000000000000000000000000..53b25187d84c8ba05596716c13efe840b5c919ff
--- /dev/null
+++ b/scripts/3_Game/DayZ/Weather.c
@@ -0,0 +1,254 @@
+/*!
+	All classes related to game weather
+*/
+
+
+//-----------------------------------------------------------------------------
+/*!
+	Weather phenomenon type
+*/
+enum EWeatherPhenomenon
+{
+	OVERCAST,
+	FOG,
+	RAIN
+};
+
+
+//-----------------------------------------------------------------------------
+/*!
+	Weather phenomenon
+*/
+class WeatherPhenomenon
+{
+	private void WeatherPhenomenon() {}
+	private void ~WeatherPhenomenon() {}
+	
+	//! Returns type of this phenomenon.
+	proto native EWeatherPhenomenon GetType();
+
+	//! Returns actual value of phenomenon in range <0, 1>.
+	proto native float GetActual();
+
+	//! Returns a forecast value the phenomenon is heading towards.
+	proto native float GetForecast();
+
+	/*!
+		\brief Sets the forecast.
+		\param forecast     Desired forecast value that should be met in given time.
+		\param time         A time of the next change (how long it takes in seconds to interpolate to given value).
+		\param minDuration  A minimal time in seconds the change will last.
+	*/
+	proto native void Set( float forecast, float time = 0, float minDuration = 0 );
+
+	//! Reads the time in seconds when the next forecast will be computed.
+	proto native float GetNextChange();
+	//! Sets the time in seconds when the next forecast will be computed.
+	proto native void SetNextChange( float time );
+
+	/*!
+		\brief Reads limits of this phenomenon.
+		\param fnMin Function minimum (in range <0, 1>).
+		\param fnMax Function maximum (in range <0, 1>).
+	*/
+	proto void GetLimits( out float fnMin, out float fnMax );
+	/*!
+		\brief Sets limits of this phenomenon.
+
+		Actual value of this phenomenon will be always held in range <fnMin, fnMax>.
+
+		Default values are:
+			fnMin  = 0
+			fnMax  = 1
+
+		\param fnMin Function minimum (in range <0, 1>).
+		\param fnMax Function maximum (in range <0, 1>).
+	*/
+	proto native void SetLimits( float fnMin, float fnMax );
+
+	/*!
+		\brief Reads limits of change when forecast is computed.
+		\param fcMin Forecast change minimum (in range <0, 1>).
+		\param fcMax Forecast change maximum (in range <0, 1>).
+	*/
+	proto void GetForecastChangeLimits( out float fcMin, out float fcMax );
+	/*!
+		\brief Sets limits of change when forecast is computed.
+
+		These limits govern how much the forecast value can change
+		when it is computed by weather controller.
+
+		Default values are:
+			fcMin  = 0
+			fcMax  = 1
+
+		\param fcMin Forecast change minimum (in range <0, 1>).
+		\param fcMax Forecast change maximum (in range <0, 1>).
+	*/
+	proto native void SetForecastChangeLimits( float fcMin, float fcMax );
+
+	/*!
+		\brief Reads time range in which next forecast can be computed.
+		\param ftMin Minimal number of seconds.
+		\param ftMax Maximal number of seconds.
+	*/
+	proto void GetForecastTimeLimits( out float ftMin, out float ftMax );
+	/*!
+		\brief Sets time range in which next forecast can be computed.
+
+		Default values are:
+			ftMin  = 300  (5 minutes)
+			ftMax  = 3600 (1 hour)
+
+		\param ftMin Minimal number of seconds.
+		\param ftMax Maximal number of seconds.
+	*/
+	proto native void SetForecastTimeLimits( float ftMin, float ftMax );
+
+	/*!
+		\brief Is called every time the Phenomenon computes new forecast.
+
+		\note Called on server only.
+
+		\param change Computed change of forecast value.
+		\param time   Seconds when the next forecast will be computed.
+		\return True when script modifies state of this phenomenon false otherwise.
+	*/
+
+	bool OnBeforeChange( float change, float time )
+	{
+		// check if mission forces use of custom weather
+		Weather weather = g_Game.GetWeather();
+		
+		if ( weather.GetMissionWeather() )
+			return false;
+		
+		// check for active worlddata with custom onbeforechange behaviour
+		Mission currentMission = g_Game.GetMission();
+
+		if ( currentMission )
+		{
+			WorldData worldData = currentMission.GetWorldData();
+			if ( worldData )
+			{
+				return worldData.WeatherOnBeforeChange( GetType(), GetActual(), change, time );
+			}
+		}
+
+		return false;
+	}
+};
+
+
+typedef WeatherPhenomenon Overcast;
+typedef WeatherPhenomenon Fog;
+typedef WeatherPhenomenon Rain;
+
+
+
+
+//-----------------------------------------------------------------------------
+/*!
+	Weather controller
+*/
+class Weather
+{
+	protected bool m_missionWeather;
+	
+	private void Weather()
+	{
+		m_missionWeather = false;
+	}
+	
+	private void ~Weather() {}
+	
+	//! Returns actual time from start of a server (how many seconds elapsed from server start).
+	proto native float GetTime();
+
+	//! Returns an overcast phenomenon object.
+	proto native Overcast GetOvercast();
+
+	//! Returns a fog phenomenon object.
+	proto native Fog GetFog();
+
+	//! Returns a rain phenomenon object.
+	proto native Rain GetRain();
+
+	/*!
+		\brief Sets the thunderstorm properties.
+		\param  density   A value in <0, 1> range where 0 means no thunderstorms at all
+		                  and 1 means thunderstorm every time it gets cloudy.
+		\param  threshold The overcast value that must be exceeded so that lightning can appear.
+		\param  timeOut   A minimal time in seconds between lightning during thunderstorm.
+	*/
+	proto native void SetStorm( float density, float threshold, float timeOut );
+	
+	//! enables/disables thunderbolt simulation on client (together with sounds)
+	proto native void SuppressLightningSimulation(bool state);
+
+	//! Returns wind vector (direction and speed as length of the vector).
+	proto native vector GetWind();
+	//! Sets the wind vector (direction and speed as length of the vector).
+	proto native void SetWind( vector wind );
+	/*!
+		\brief Returns actual wind speed in metre per second.
+		\note Wind is changing continuously in time, so the returned value may not stand for too long.
+	*/
+	proto native float GetWindSpeed();
+	/*!
+		\brief Sets the actual wind speed in metre per second.
+		\note Wind is changing continuously in time, so the returned value may not stand for too long.
+		      Minimum speed for wind is 0.1 m/s.
+	*/
+	proto native void SetWindSpeed( float speed );
+	/*!
+		\brief Returns maximal wind speed in metre per second.
+		\note By default this value is 10 m/s but it can be overridden in script on mission initialization.
+	*/
+	proto native float GetWindMaximumSpeed();
+	//! Sets the maximal wind speed in metre per second.
+	proto native void SetWindMaximumSpeed( float maxSpeed );
+	/*!
+		\brief Reads function parameters that controls the wind behaviour (change in time).
+		\param fnMin   Function relative minimum (in range <0, 1>).
+		\param fnMax   Function relative maximum (in range <0, 1>).
+		\param fnSpeed Controls speed of change of function value.
+	*/
+	proto void GetWindFunctionParams( out float fnMin, out float fnMax, out float fnSpeed );
+	/*!
+		\brief Sets function parameters that controls the wind behaviour (change in time).
+		\param fnMin   Function relative minimum (in range <0, 1>).
+		\param fnMax   Function relative maximum (in range <0, 1>).
+		\param fnSpeed Controls speed of change of function value.
+	*/
+	proto native void SetWindFunctionParams( float fnMin, float fnMax, float fnSpeed );
+
+	/*!
+		\brief Sets overcast threshold values for rain phenomena.
+
+		Rain can start only if actual overcast value is in given range of <tMin, tMax>.
+		If it's already raining and actual overcast value gets out of given range
+		then rain will stop in given tTime seconds.
+
+		Default values are:
+			tMin  = 0.6
+			tMax  = 1
+			tTime = 30
+
+		\param tMin  Minimal overcast value (in range <0, 1>).
+		\param tMax  Maximal overcast value (in range <0, 1>).
+		\param tTime Time in seconds when it stops raining.
+	*/
+	proto native void SetRainThresholds( float tMin, float tMax, float tTime );
+
+	void MissionWeather( bool use )
+	{
+		m_missionWeather = use;
+	}
+	
+	bool GetMissionWeather()
+	{
+		return m_missionWeather;
+	}
+
+};
diff --git a/scripts/3_Game/DayZ/WorldData.c b/scripts/3_Game/DayZ/WorldData.c
new file mode 100644
index 0000000000000000000000000000000000000000..e5232022a3167866c526ce4eb68fec4881f75cca
--- /dev/null
+++ b/scripts/3_Game/DayZ/WorldData.c
@@ -0,0 +1,151 @@
+//! Keeps information about currently loaded world, like temperature
+class WorldData
+{
+	protected float m_DayTemperature;	// legacy, no longer used
+	protected float m_NightTemperature;	// legacy, no longer used
+	protected Weather m_Weather;
+	protected float m_EnvironmentTemperature;
+	protected float m_Timer;
+	protected float	m_MaxTemps[12];
+	protected float m_MinTemps[12];
+	protected float m_Sunrise_Jan;
+	protected float m_Sunset_Jan;
+	protected float m_Sunrise_Jul;
+	protected float m_Sunset_Jul;
+	protected ref array<vector> m_FiringPos; // Where we should fire from. On Init set the relevant data
+
+	void WorldData()
+	{
+		Init();
+	}
+	
+	void Init()
+	{
+		m_DayTemperature = 10; 	// legacy, no longer used
+		m_NightTemperature = 6;	// legacy, no longer used
+		m_Weather = g_Game.GetWeather();
+		m_EnvironmentTemperature = 12.0;
+		m_Timer = 0.0;
+		m_Sunrise_Jan = 8.54;
+		m_Sunset_Jan = 15.52;
+		m_Sunrise_Jul = 3.26;
+		m_Sunset_Jul = 20.73;
+		m_MaxTemps = {3,5,7,14,19,24,26,25,21,16,10,5};
+		m_MinTemps = {-3,-2,0,4,9,14,18,17,12,7,4,0};
+	}
+
+	float GetApproxSunriseTime( float monthday )
+	{
+		if ( monthday <= 8.0 )
+			return ( ( m_Sunrise_Jan - m_Sunrise_Jul ) / ( 8 - 1 ) ) * ( 1 - monthday ) + m_Sunrise_Jan;
+		else
+			return ( ( ( monthday - 8 ) * ( m_Sunrise_Jan - m_Sunrise_Jul ) ) / ( 13 - 8 ) ) + m_Sunrise_Jul;
+	}
+	float GetApproxSunsetTime( float monthday )
+	{
+		if ( monthday <= 8.0 )
+			return ( ( m_Sunset_Jan - m_Sunset_Jul ) / (8 - 1) ) * ( 1 - monthday ) + m_Sunset_Jan;
+		else
+			return ( ( ( monthday - 8 ) * ( m_Sunset_Jan - m_Sunset_Jul ) ) / ( 13 - 8 ) ) + m_Sunset_Jul;
+	}
+	protected float CalcBaseEnvironmentTemperature( float monthday, float daytime )
+	{
+		float approxSunrise = GetApproxSunriseTime( monthday );
+		float approxSunset = GetApproxSunsetTime( monthday );
+		float dayLight = approxSunset - approxSunrise;
+		float nightTime = 24.0 - dayLight;
+		int tempArrayIndex = Math.Floor(monthday) - 1;
+		int tempArrayIndexToLerp = tempArrayIndex + 1;
+		if ( tempArrayIndexToLerp >= 12 )
+			tempArrayIndexToLerp = 0;
+		float tempArrayLerp = monthday - Math.Floor(monthday);
+		float minTempA = m_MinTemps[tempArrayIndex];
+		float minTempB = m_MinTemps[tempArrayIndexToLerp];
+		float maxTempA = m_MaxTemps[tempArrayIndex];
+		float maxTempB = m_MaxTemps[tempArrayIndexToLerp];
+		float eveningMinA = minTempA + ( 0.5 * Math.AbsFloat( minTempA - maxTempA ) );
+		float eveningMinB = minTempB + ( 0.5 * Math.AbsFloat( minTempB - maxTempB ) );
+
+		if ( ( daytime >= approxSunrise ) && ( daytime <= approxSunset ) ) {
+			if ( daytime <= ( approxSunrise + ( dayLight * 0.75 ) ) )
+				return Math.Lerp(
+					Math.Lerp( minTempA, minTempB, tempArrayLerp ),
+					Math.Lerp( maxTempA, maxTempB, tempArrayLerp ),
+					( ( daytime - approxSunrise ) / ( dayLight * 0.75 ) ) );
+			else
+				return Math.Lerp(
+					Math.Lerp( maxTempA, maxTempB, tempArrayLerp ),
+					Math.Lerp( eveningMinA, eveningMinB, tempArrayLerp ),
+					( ( ( daytime - approxSunrise ) - ( dayLight * 0.75 ) ) / ( dayLight - ( dayLight * 0.75 ) ) ) );
+		} else {
+			if ( ( daytime > approxSunset ) && ( daytime < 24 ) )
+				return Math.Lerp(
+					Math.Lerp( eveningMinA, eveningMinB, tempArrayLerp ),
+					Math.Lerp( minTempA, minTempB, tempArrayLerp ),
+					( ( daytime - approxSunset ) / ( 24 - approxSunset ) ) / 2.0 );
+			else
+				return Math.Lerp(
+					Math.Lerp( eveningMinA, eveningMinB, tempArrayLerp ),
+					Math.Lerp( minTempA, minTempB, tempArrayLerp ),
+					( ( ( daytime + ( 24 - approxSunset ) ) / nightTime ) / 2.0 ) + 0.5 );
+		}
+	}
+	void UpdateBaseEnvTemperature(float timeslice)
+	{
+		m_Timer += timeslice;
+		if ( m_Timer > 30 )
+		{
+			int year, month, day, hour, minute;
+			GetGame().GetWorld().GetDate( year, month, day, hour, minute );
+			m_EnvironmentTemperature = CalcBaseEnvironmentTemperature( month + ( day / 32.0 ), hour + ( minute / 60.0 ) );
+			m_Timer = 0;
+		}
+	}
+
+	// getter for the new base enviro temperature
+	float GetBaseEnvTemperature()
+	{
+		return m_EnvironmentTemperature;
+	}
+	float GetBaseEnvTemperatureExact(int month, int day, int hour, int minute)
+	{
+		return CalcBaseEnvironmentTemperature( month + ( day / 32.0 ), hour + ( minute / 60.0 ) );
+	}
+
+	// legacy, no longer used
+	float GetDayTemperature()
+	{
+		return m_DayTemperature;
+	}
+	// legacy, no longer used
+	float GetNightTemperature()
+	{
+		return m_NightTemperature;
+	}
+
+	bool WeatherOnBeforeChange( EWeatherPhenomenon type, float actual, float change, float time )
+	{
+		// default behaviour is same like setting MissionWeather (in Weather) to true
+		return false;
+	}
+	
+	// Used to return the artillery firing positions
+	array<vector> GetArtyFiringPos()
+	{
+		return m_FiringPos;
+	}
+
+	// debug
+	void BaseTempDebug(int month, int day)
+	{
+		Print("--------------------");
+		for ( int i = 0; i < 24; i++ )
+		{
+			for ( int j = 0; j < 6; j++ )
+			{
+				int minute = ( j * 10 );
+				Print(string.Format( "%1:%2      %3", i, minute, GetBaseEnvTemperatureExact( month, day, i, minute ) ) );
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/WorldLighting.c b/scripts/3_Game/DayZ/WorldLighting.c
new file mode 100644
index 0000000000000000000000000000000000000000..71873224fb25e494d848b7ab0ea361f7dfe4876e
--- /dev/null
+++ b/scripts/3_Game/DayZ/WorldLighting.c
@@ -0,0 +1,38 @@
+class WorldLighting
+{
+	string lighting_default = "dz\\data\\lighting\\lighting_default.txt";
+	string lighting_darknight = "dz\\data\\lighting\\lighting_darknight.txt";
+	
+	void WorldLighting() {}
+	void ~WorldLighting() {}
+		
+	// sets global lighting config by given value (sent from server, defined in server config)
+	void SetGlobalLighting( int lightingID )
+	{
+		switch ( lightingID )
+		{
+			case 0:
+				GetGame().GetWorld().LoadNewLightingCfg( lighting_default );
+				break;
+				
+			case 1:
+				GetGame().GetWorld().LoadNewLightingCfg( lighting_darknight );
+				break;
+		}
+	}
+}
+
+/*modded class WorldLighting
+{
+	protected string lighting_modded = "your\\path\\to\\lighting\\cfg.txt";
+	
+	override void SetGlobalLighting( int lightingID )
+	{
+		switch ( lightingID )
+		{
+			case 3:
+				GetGame().GetWorld().LoadNewLightingCfg( lighting_modded );
+				break;
+		}
+	}
+}*/
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/XboxDemoGame.c b/scripts/3_Game/DayZ/XboxDemoGame.c
new file mode 100644
index 0000000000000000000000000000000000000000..14a3a09a39ab57d67f62a53a49a3d6e4ceafa1e4
--- /dev/null
+++ b/scripts/3_Game/DayZ/XboxDemoGame.c
@@ -0,0 +1,5 @@
+//global variables for xbox demo purposes
+int g_DemoPlayerClass 	= 0;
+int g_DemoWeather 		= 0;
+int g_DemoTimeOfDay 	= 0;
+//
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/constants.c b/scripts/3_Game/DayZ/constants.c
new file mode 100644
index 0000000000000000000000000000000000000000..4abfe4e88d1ed9a8bd8960a0284782ee07ddbc17
--- /dev/null
+++ b/scripts/3_Game/DayZ/constants.c
@@ -0,0 +1,924 @@
+/**
+ * \defgroup CppEnums Internally defined enums
+ * \desc Various enums defined in C++
+ * @{
+ */
+enum ChatChannelType
+{
+	System, 				//!< CCSystem
+	Admin, 					//!< CCAdmin
+	Direct, 				//!< CCDirect
+	Megaphone, 				//!< CCMegaphone
+	Transmitter, 			//!< CCTransmitter
+	PublicAddressSystem, 	//!< CCPublicAddressSystem
+	BattlEye, 				//!< CCBattlEye
+}
+
+enum VoiceLevel
+{
+	Whisper, 	//!< VoiceLevelWhisper
+	Talk, 		//!< VoiceLevelTalk
+	Shout 		//!< VoiceLevelShout
+}
+
+enum VoiceEffectType
+{
+	Mumbling, 		//!< VoiceEffectMumbling
+	Extortion, 		//!< VoiceEffectExtortion
+	Obstruction 	//!< VoiceEffectObstruction
+}
+
+enum ObjIntersect
+{
+	Fire, 	//!< ObjIntersectFire: Fire Geometry
+	View, 	//!< ObjIntersectView: View Geometry
+	Geom,	//!< ObjIntersectGeom: Geometry
+	IFire, 	//!< ObjIntersectIFire: (Indirect) Fire Geometry
+	None 	//!< ObjIntersectNone: No Geometry
+}
+
+enum RoadSurfaceDetection
+{
+	//! Find nearest surface under given point
+	UNDER,
+	//! Find nearest surface above given point
+	ABOVE,
+	//! Find nearest surface to given point
+	CLOSEST,
+	//! Legacy version, UNDER but without proxy support
+	LEGACY,
+}
+
+//! UserID of a parent widget usually matches this value, unless overriden in the 'InitWidgetSet' method
+enum EffectWidgetsTypes
+{
+	ROOT = -2, //used when handling the m_Root widget directly
+	NONE = 0,
+	
+	MASK_OCCLUDER = 1,
+	MASK_BREATH = 2,
+	
+	HELMET_OCCLUDER = 10,
+	HELMET_BREATH = 11,
+	
+	MOTO_OCCLUDER = 20,
+	MOTO_BREATH = 21,
+	
+	COVER_FLASHBANG = 50,
+	NVG_OCCLUDER = 51,
+	PUMPKIN_OCCLUDER = 52,
+	EYEPATCH_OCCLUDER = 53,
+	HELMET2_OCCLUDER = 54,
+	
+	BLEEDING_LAYER = 60,
+}
+
+enum EffectWidgetHandles
+{
+	FLASHBANG,
+}
+
+enum EffectWidgetSuspends
+{
+	BURLAPSACK,
+	UNCON,
+}
+
+class HitDirectionConstants
+{
+	const int ROTATION_DEFAULT = 0; //0 == random
+	const float DURATION_BASE = 2.0;
+	const float BREAKPOINT_BASE = 0.2;
+	const float DISTANCE_ADJUST = 0.0;
+	const float SCATTER = 10.0;
+	const int COLOR_DEFAULT = 0xffbb0a1e;
+}
+
+enum HitDirectionModes
+{
+	DISABLED,
+	STATIC,
+	DYNAMIC
+}
+
+enum HitIndicatorType
+{
+	SPLASH,
+	SPIKE,
+	ARROW
+}
+
+enum EInputRestrictors
+{
+	INVENTORY,
+	MAP
+}
+
+/** @}*/
+
+//! how often virtual hud checks if there is a difference since last sync
+const int VIRTUAL_HUD_UPDATE_INTERVAL = 1000;
+
+/**
+ * \defgroup UI UI
+ * \desc constants User Interface
+ * @{
+ */
+const int IDC_OK					= 1;
+const int IDC_CANCEL				= 2;
+const int IDC_RESTART				= 5;
+
+const int IDC_MAIN_NEXT_CHARACTER	= 50;
+const int IDC_MAIN_PREV_CHARACTER	= 51;
+
+const int IDC_MAIN_OPTIONS      	= 102;
+const int IDC_MAIN_MULTIPLAYER  	= 105;
+const int IDC_MAIN_QUIT         	= 106;
+const int IDC_MAIN_CONTINUE			= 114;
+const int IDC_MAIN_PLAY         	= 142;
+const int IDC_MAIN_CHARACTER		= 143;
+const int IDC_MAIN_ONLINE			= 124;
+const int IDC_MULTI_REFRESH			= 123;
+const int IDC_MULTI_INVITE			= 126;
+
+const int IDC_BOOK_VIEWER_PREV  	= 102;
+const int IDC_BOOK_VIEWER_NEXT  	= 103;
+
+//! ingame menu
+const int IDC_INT_RETRY				= 105; //default respawn
+const int IDC_INT_RETRY_CUSTOM		= 106; //custom respawn
+const int IDC_INT_EXIT				= 107;
+//const int IDC_INT_RESPAWN			= 108; //respawn dialogue
+/** @}*/
+
+/**
+ * \defgroup MenuID MenuID
+ * \desc constants for menu pages
+ * @{
+ */
+
+const int MENU_ANY									= 1;
+const int MENU_NONE									= 2;
+const int MENU_LOC_ADD								= 3;
+const int MENU_UNKNOWN								= 4;
+const int MENU_CHARACTER							= 5;
+const int MENU_CHAT									= 6;
+const int MENU_EARLYACCESS							= 7;
+const int MENU_SCENE_EDITOR							= 8;
+const int MENU_INGAME								= 9;
+const int MENU_INSPECT								= 10;
+const int MENU_INVENTORY							= 11;
+const int MENU_LOADING								= 12;
+const int MENU_MAIN									= 13;
+const int MENU_OPTIONS								= 14;
+const int MENU_STARTUP								= 15;
+const int MENU_SCRIPTCONSOLE						= 16;
+const int MENU_CHAT_INPUT							= 17;
+const int MENU_SCRIPTCONSOLE_DIALOG_PRESET_NAME		= 18;
+const int MENU_SCRIPTCONSOLE_DIALOG_PRESET_RENAME 	= 19;
+const int MENU_CONTROLS_PRESET						= 20;
+const int MENU_NOTE									= 21;
+const int MENU_MAP									= 22;
+const int MENU_BOOK									= 23;
+const int MENU_HELP_SCREEN      					= 24;
+const int MENU_GESTURES		      					= 25;
+const int MENU_LOGOUT 								= 26;
+const int MENU_TITLE_SCREEN							= 27;
+const int MENU_XBOX_CONTROLS						= 28;
+const int MENU_RADIAL_QUICKBAR						= 29;
+const int MENU_LOGIN_QUEUE							= 30;
+const int MENU_SERVER_BROWSER						= 31;
+const int MENU_CAMERA_TOOLS							= 32;
+const int MENU_VIDEO								= 33;
+const int MENU_KEYBINDINGS							= 34;
+const int MENU_TUTORIAL								= 35;
+const int MENU_CREDITS								= 36;
+const int MENU_INVITE_TIMER							= 37;
+const int MENU_LOGIN_TIME							= 38;
+const int MENU_WARNING_ITEMDROP						= 39;
+const int MENU_RESPAWN_DIALOGUE						= 40;
+const int MENU_WARNING_TELEPORT						= 41;
+const int MENU_CONNECT_ERROR						= 42;
+const int MENU_WARNING_INPUTDEVICE_DISCONNECT		= 43;
+const int MENU_SCRIPTCONSOLE_UNIVERSAL_INFO_DIALOG	= 44;
+const int MENU_MISSION_LOADER						= 45;
+
+
+const int GUI_WINDOW_MISSION_LOADER = 1;
+
+const string CFG_VEHICLESPATH = "CfgVehicles";
+const string CFG_WEAPONSPATH = "CfgWeapons";
+const string CFG_MAGAZINESPATH = "CfgMagazines";
+const string CFG_AMMO = "CfgAmmo";
+const string CFG_WORLDS = "CfgWorlds";
+const string CFG_SURFACES = "CfgSurfaces";
+const string CFG_RECIPESPATH = "CfgRecipes";
+const string CFG_SOUND_SHADERS = "CfgSoundShaders";
+const string CFG_SOUND_SETS = "CfgSoundSets";
+const string CFG_NONAI_VEHICLES = "CfgNonAIVehicles";
+const string CFG_SOUND_TABLES = "CfgSoundTables";
+
+/** @}*/
+
+/**
+ * \defgroup CFGConstants Local data saving to files
+ * \desc constants for saving local datas
+ * @{
+ */
+const int		CFG_ARRAY_ITEMS_MAX		= 64;
+const string	CFG_FILE_FIXED_PROFILE	= "Scripts/profile_fixed.cfg";
+const string	CFG_FILE_USER_PROFILE	= "$profile:profile.cfg";
+const string	CFG_FILE_DEBUG_PROFILE	= "debugProfile.cfg";
+const string	CFG_FILE_EMOTES_PROFILE	= "$profile:emotesProfile.cfg";
+const string	CFG_FILE_SEARCH_HISTORY	= "$profile:search_history.history";
+const string	CFG_FILE_ENS_HISTORY	= "script_enscript.history";
+const string	CFG_FILE_ENS_HISTORY_SERVER	= "script_enscriptServer.history";
+const string	CFG_FILE_SCRIPT_LOG		= "$profile:script.log";
+const string	CFG_FILE_SCRIPT_LOG_EXT	= "$profile:scriptExt.log";
+const string	CFG_FILE_ADDITIONAL_INFO= "$profile:serverInfo.cfg";
+const string 	CFG_FILE_DEBUG_DIR =	"$profile:ScriptConsole/";
+const string 	CFG_FILE_MISSION_LIST =	"$profile:missionlist.json";
+/** @}*/
+
+/**
+ * \defgroup RPC RPC commands
+ * \desc Constants for sending RPC commands on server
+ * @{
+ */
+/*
+const int RPC_SYNC_ITEM_VAR                     = 1;
+const int RPC_SYNC_STAT                         = 2;
+const int RPC_WRITE_NOTE                        = 3;
+const int RPC_SYNC_DISPLAY_STATUS               = 4;
+const int RPC_RECIPE_SEND    					= 7;
+const int RPC_ON_SET_CAPTIVE					= 8;
+const int RPC_SYNC_SCENE_OBJECT					= 9;
+const int RPC_READ_A_BOOK               		= 10;	
+const int RPC_USER_ACTION_PROMPT_SYNCH			= 11;
+const int RPC_USER_ACTION_MESSAGE 				= 12;
+const int RPC_ITEM_DIAG							= 13;
+const int RPC_ITEM_DIAG_CLOSE					= 14;
+const int RPC_SET_OBJECT_POSITION 				= 15;
+const int RPC_USER_ACTION_MESSAGES 				= 16;
+const int RPC_ITEM_SPLIT						= 17;
+const int RPC_ITEM_COMBINE						= 18;
+const int RPC_PLAYER_STATES_ON					= 19;
+const int RPC_PLAYER_STATES_OFF					= 20;
+const int RPC_PLACING_DEBUG						= 21;
+const int RPC_PLACING_START						= 22;
+const int RPC_PLACING_STOP						= 23;
+const int RPC_STAMINA							= 25;
+const int RPC_DAMAGE_VALUE_SYNC					= 26;
+const int RPC_USER_ACTION_PROMPT_PROGRESS		= 27;
+const int RPC_PLACING_UPDATE					= 28;
+const int RPC_USER_ACTION_PROMPT_CLEAN			= 29;
+const int RPC_DISABLE_MODIFIERS					= 30;
+const int RPC_KILL_PLAYER						= 31;
+const int RPC_ENABLE_INVINCIBILITY				= 32;
+const int RPC_ITEM_DEBUG_ACTIONS				= 33;
+const int RPC_LOG_PLAYER_STATS					= 34;
+const int RPC_EM_IS_PLUGGED						= 35;
+const int RPC_EM_IS_UNPLUGGED					= 36;
+*/
+/** @}*/
+
+
+/**
+ * \defgroup DeveloperRPC Developer RPC commands
+ * \desc Constants for sending developer RPC commands on server
+ * @{
+ */
+/*
+const int DEV_RPC_SPAWN_GROUND_ITEM             = 101;
+const int DEV_RPC_CLEAR_INV                     = 102;
+const int DEV_RPC_TELEPORT                      = 103;
+const int DEV_RPC_SET_PLAYER_DIRECTION          = 104;
+const int DEV_RPC_SEND_SERVER_LOG               = 105;
+const int DEV_RPC_STATS_DATA					= 107;
+const int DEV_RPC_MODS_DATA						= 108;
+const int DEV_RPC_AGENTS_DATA					= 109;
+const int DEV_RPC_CREATE_SCENE_OBJECT 			= 110;
+const int DEV_RPC_SCENE_LOAD 					= 111;
+const int DEV_RPC_SPAWN_INV_ITEM                = 112;
+const int DEV_RPC_SPAWN_ATTACHMENT_ITEM         = 113;
+const int DEV_RPC_SPAWN_ITEM_ON_CURSOR          = 114;
+*/
+/** @}*/
+
+/**
+ * \defgroup SyncCMD Sync update commands
+ * \desc Constants for synchronization update commands
+ * @{
+ */
+	/*
+const int DEV_STATS_UPDATE						= 1;
+const int DEV_MODS_UPDATE						= 2;
+const int DEV_AGENTS_UPDATE						= 3;
+	*/
+/** @}*/
+
+/**
+ * \defgroup MessageCMD Message commands
+ * \desc Messaging System - the numbers must be 0 or higher, and the highest number should not be bigger than NUM_OF_CHANNELS-1
+ * @{
+ */
+const int NUM_OF_CHANNELS 		= 100;
+const int MSG_TEST_CHANNEL		= 0;
+const int MSG_IMMUNE_REACTION	= 1;
+const int MSG_STATS_SYNCED		= 2;
+const int MSG_NOTIFIERS_TICK	= 3;
+/** @}*/
+	
+/**
+ * \defgroup Modifier pools minimum tick times in ms
+ * \desc Modifier pools minimum tick times
+ * @{
+ */
+const int MIN_TICK_MDFR_POOL_MAIN = 10000;//in ms
+const int MIN_TICK_MDFR_POOL_PLAYER = 3000;
+const int MIN_TICK_MDFR_POOL_ENVIRONMENT = 3000;
+const int MIN_TICK_MDFR_POOL_DISEASE = 30000;
+const int MIN_TICK_NOTIFIERS = 1000;
+/** @}*/
+
+/**
+ * \defgroup EmoteIDs Emote ids
+ * @{
+ */
+class EmoteConstants
+{
+	const int ID_EMOTE_GREETING			= 1;
+	const int ID_EMOTE_SOS				= 2; //FB
+	const int ID_EMOTE_HEART 			= 3;
+	const int ID_EMOTE_TAUNT	 		= 4;
+	const int ID_EMOTE_LYINGDOWN		= 5;
+	const int ID_EMOTE_TAUNTKISS		= 6;
+	const int ID_EMOTE_FACEPALM			= 7;
+	const int ID_EMOTE_TAUNTELBOW		= 8;
+	const int ID_EMOTE_THUMB			= 9;
+	const int ID_EMOTE_THROAT		 	= 10;
+	const int ID_EMOTE_SUICIDE			= 11; //FB
+	const int ID_EMOTE_DANCE 			= 12;
+	const int ID_EMOTE_CAMPFIRE 		= 13;
+	const int ID_EMOTE_SITA 			= 14;
+	const int ID_EMOTE_SITB 			= 15;
+	const int ID_EMOTE_THUMBDOWN 		= 16;
+	
+	const int ID_EMOTE_DABBING 		= 32;
+	const int ID_EMOTE_TIMEOUT 		= 35;
+	const int ID_EMOTE_CLAP 		= 39;
+	const int ID_EMOTE_POINT 		= 40;
+	const int ID_EMOTE_SILENT 		= 43;
+	const int ID_EMOTE_SALUTE 		= 44;
+	const int ID_EMOTE_RPS 			= 45;
+	const int ID_EMOTE_WATCHING 	= 46;
+	const int ID_EMOTE_HOLD 		= 47;
+	const int ID_EMOTE_LISTENING 	= 48;
+	const int ID_EMOTE_POINTSELF 	= 49;
+	const int ID_EMOTE_LOOKATME 	= 50;
+	const int ID_EMOTE_TAUNTTHINK 	= 51;
+	const int ID_EMOTE_MOVE 		= 52;
+	const int ID_EMOTE_DOWN 		= 53;
+	const int ID_EMOTE_COME 		= 54;
+	const int ID_EMOTE_RPS_R 		= 55;
+	const int ID_EMOTE_RPS_P 		= 56;
+	const int ID_EMOTE_RPS_S 		= 57;
+	const int ID_EMOTE_NOD 			= 58;
+	const int ID_EMOTE_SHAKE 		= 59;
+	const int ID_EMOTE_SHRUG 		= 60;
+	const int ID_EMOTE_SURRENDER 	= 61;
+	const int ID_EMOTE_VOMIT 		= 62;
+	const int ID_EMOTE_DEBUG 		= 1000;
+	
+	/**
+	 * \defgroup CustomEmoteIDs Custom animation events ID for emotes
+	 * \desc used mainly in suicide emotes
+	 * @{
+	 */
+	const int EMOTE_SUICIDE_DEATH 	= 1;
+	const int EMOTE_SUICIDE_BLEED 	= 2;
+	const int EMOTE_SUICIDE_SIMULATION_END = 3;
+	/** @}*/
+}
+
+/**
+ * \defgroup ItemGeneratorCfg Configurations for ItemsGenerator class
+ * \desc Configurations for ItemsGenerator class
+ * @{
+ */
+const float		ITEMSGEN_TICK = 10; //in seconds
+const float		ITEMSGEN_MIN_DISTANCE_TO_REPOSITION = 80; //in meters
+const float		ITEMSGEN_SPAWN_DISTANCE = 60; //in meters
+const float		ITEMSGEN_MAX_SPREAD = 15; //in meters
+const int		ITEMSGEN_ITEMS_AMOUNT = 5;
+/** @}*/
+
+
+/**
+ * \defgroup SATIDs Selectable action types ids
+ * \desc These ids helsp diferentiate types of selectable actions 
+ * @{
+ */
+const int SAT_INTERACT_ACTION	= 1;
+const int SAT_CRAFTING	 		= 2;
+const int SAT_DEBUG_ACTION		= 3;
+/** @}*/
+
+/**
+ * \defgroup UAIDs User action internal state machine states
+ * \desc User action internal state machine states
+ * @{
+ */
+const int 		UA_NONE = 0;
+const int 		UA_FAILED = 1;
+const int 		UA_PROCESSING = 2;
+const int 		UA_REPEAT = 3;
+const int 		UA_FINISHED = 4;
+const int		UA_CANCEL = 5;
+const int		UA_INTERRUPT = 6;
+const int       UA_START = 7;
+const int       UA_STARTT = 8;
+const int       UA_CANCELT = 9;
+const int       UA_FINISHEDT = 10;
+const int    	UA_ANIM_EVENT = 11;
+const int 		UA_INITIALIZE = 12;
+const int		UA_CHECK_CON = 13;
+const int		UA_AM_PENDING = 14;
+const int		UA_AM_ACCEPTED = 15;
+const int		UA_AM_REJECTED = 16;
+const int		UA_IN_START = 17;
+const int		UA_IN_END = 18;
+const int		UA_SPAWN_DUST_A = 19;
+const int		UA_SPAWN_DUST_B = 20;
+const int		UA_IN_CRAFTING = 21;
+	
+const int		UA_ERROR = 24;
+	
+const int		UA_SETEND_2 = 32;
+/** @}*/
+
+/**
+
+ * \defgroup AGTIDs Agent transmission system
+ * \desc Agent transmission system
+ * @{
+ */
+const int AGT_INV_IN	 		= 1;
+const int AGT_INV_OUT	 		= 2;
+const int AGT_UACTION_CONSUME	= 3;
+const int AGT_TRANSFER_COPY	= 4;
+const int AGT_UACTION_TOUCH		= 5;
+const int AGT_WATER_POND		= 6;
+const int AGT_AIRBOURNE_BIOLOGICAL	= 7;
+const int AGT_UACTION_TO_PLAYER	= 8;
+const int AGT_UACTION_TO_ITEM	= 9;
+const int AGT_ITEM_TO_FLESH		= 10;
+const int AGT_AIRBOURNE_CHEMICAL = 11;
+
+const int DEF_BIOLOGICAL		= 1;
+const int DEF_CHEMICAL			= 2;
+/** @}*/
+			
+const int QUANTITY_HIDDEN = 0;
+const int QUANTITY_COUNT = 1;
+const int QUANTITY_PROGRESS = 2;
+
+
+			
+/**
+ * \defgroup LiquidTypes LiquidTypes
+ * \desc Constants for liquid types
+ * @{
+ */
+// BEWARE ALL INDIVIDUAL LIQUID TYPES ARE ALSO REPRESENTED CONFIG-SIDE AND MUST MATCH(all changes must be made on both sides)
+// NOTE ANY NUMBER HERE MUST BE A 0 OR ANY POWER OF TWO, THERE IS A MAXIMUM OF 32 INDIVIDUAL LIQUID TYPES POSSIBLE
+const int LIQUID_BLOOD_0_P	= 1;
+const int LIQUID_BLOOD_0_N	= 2;
+const int LIQUID_BLOOD_A_P	= 4;
+const int LIQUID_BLOOD_A_N	= 8;
+const int LIQUID_BLOOD_B_P	= 16;
+const int LIQUID_BLOOD_B_N	= 32;
+const int LIQUID_BLOOD_AB_P	= 64;
+const int LIQUID_BLOOD_AB_N = 128;
+const int LIQUID_SALINE 	= 256;
+
+const int LIQUID_WATER = 512;
+const int LIQUID_RIVERWATER = 1024;
+const int LIQUID_VODKA = 2048;
+const int LIQUID_BEER = 4096;
+const int LIQUID_GASOLINE = 8192;
+const int LIQUID_DIESEL = 16384;
+const int LIQUID_DISINFECTANT = 32768;
+const int LIQUID_SOLUTION = 65536;
+
+// these are groups which do not have to correspond with configs
+const int GROUP_LIQUID_BLOOD = 255;
+const int GROUP_LIQUID_ALL = -1;//-1 = all bits to 1
+/** @}*/
+
+/**
+ * \defgroup LiquidThroughputs LiquidThroughputs
+ * \desc Constants for liquid transfer speeds
+ * @{
+ */
+const float LIQUID_THROUGHPUT_TINY = 0.1;
+const float LIQUID_THROUGHPUT_DEFAULT = 1.0;
+const float LIQUID_THROUGHPUT_GASOLINECANISTER = 10.0;
+const float LIQUID_THROUGHPUT_CAR_DEFAULT = 1.0;
+const float LIQUID_THROUGHPUT_GENERATOR = 10.0;
+const float LIQUID_THROUGHPUT_FUELSTATION = 20.0;
+const float LIQUID_THROUGHPUT_WELL = 15.0;
+const float LIQUID_THROUGHPUT_BARREL = 100.0;
+
+/** @}*/
+	
+/**
+ * \defgroup ChatMessagesVisibility ChatMessagesVisibility
+ * \desc Constants for toggle chat messages type visibility
+ * @{
+ */
+const string SYSTEM_CHAT_MSG 	= "system_chat_msg";
+const string GLOBAL_CHAT_MSG 	= "global_chat_msg";
+const string DIRECT_CHAT_MSG	= "direct_chat_msg";
+const string VEHICLE_CHAT_MSG 	= "vehicle_chat_msg";
+const string RADIO_CHAT_MSG 	= "radio_chat_msg";	
+const string GAME_CHAT_MSG 		= "game_chat_msg";	
+const string ADMIN_CHAT_MSG 	= "admin_chat_msg";	
+const string PLAYER_CHAT_MSG 	= "player_chat_msg";	
+/** @}*/
+
+/**
+ * \defgroup HUDVisibility HUDVisibility
+ * \desc Constants for toggling of HUD visibility
+ * @{
+ */
+const string SHOW_QUICKBAR 		= "show_quickbar";
+const string SHOW_HUD 			= "show_hud";
+const string HUD_BRIGHTNESS		= "hud_brightness";
+const string ENABLE_BLEEDINGINDICATION	= "enable_bleedingindication";
+const string SHOW_CONNECTIVITYINFO	= "show_connectivityinfo";
+//const string SHOW_HUD_AUTOHIDE 	= "hud_autohide";
+const string SHOW_CROSSHAIR 	= "show_crosshair";
+const string SHOW_SERVERINFO 	= "show_serverinfo";
+/** @}*/
+
+/**
+ * \defgroup LockConstants Controls locks
+ * \desc Constants for toggling of alternate 
+ * @{
+ */
+const string LOCK_SPRINT 	= "lock_sprint";
+const string LOCK_FREELOOK 	= "lock_freelook";
+const string LOCK_ZOOM 		= "lock_zoom";
+/** @}*/
+
+/**
+ * \defgroup ItemVariables Item Variables
+ * \desc Constants for Item Variables
+ * @{
+ */
+const int VARIABLE_QUANTITY 	= 1;
+const int VARIABLE_ENERGY 		= 2;
+const int VARIABLE_TEMPERATURE 	= 4;
+const int VARIABLE_WET 			= 8;
+const int VARIABLE_LIQUIDTYPE	= 16;
+const int VARIABLE_ISLIT		= 32;
+const int VARIABLE_COLOR		= 64;
+const int VARIABLE_CLEANNESS	= 128;
+/** @}*/
+
+const float CRAFTING_TIME_UNIT_SIZE = 4.0;// time unit size for crafting, this value is multiplied by the length given by a recipe
+
+const float PROJECTED_CURSOR_DISTANCE = 5;//how long is the raycast from the weapon for projected cursor
+
+
+/**
+  * \ misc
+ */
+
+const float DEBUG_QUICK_UNRESTRAIN_TIME = 1.0;
+const float MELEE_ITEM_DAMAGE = 1.0;
+
+const int HAIR_SELECTION_COUNT = 45;
+/**
+* \ input exclude types; DEPRECATED (confusing)
+*/
+const int INPUT_EXCLUDE_ALL = 0;
+const int INPUT_EXCLUDE_INVENTORY = 1;
+const int INPUT_EXCLUDE_MOUSE_ALL = 2;
+const int INPUT_EXCLUDE_MOUSE_RADIAL = 3;
+const int INPUT_EXCLUDE_MAP = 4;
+
+class GameConstants
+{
+	/**
+	 * \defgroup StaminaHandlerCfg Configurations for StaminaHandler class
+	 * \desc Configurations for StaminaHandler class
+	 * @{
+	 */
+		// unit = currently percent (stamina max is 100)
+	const int 	STAMINA_DRAIN_STANDING_SPRINT_PER_SEC = 4; //in units (how much sprint depletes stamina)
+	const int 	STAMINA_DRAIN_CROUCHED_SPRINT_PER_SEC = 1; //in units (how much sprint in crouch depletes stamina)
+	const int 	STAMINA_DRAIN_PRONE_SPRINT_PER_SEC = 3; //in units (how much sprint in prone depletes stamina)
+	const int	STAMINA_DRAIN_SWIM_FAST_PER_SEC = 5; //in units (how much fast swimming depletes stamina)
+	const int	STAMINA_DRAIN_LADDER_FAST_PER_SEC = 8; //in units (how much fast ladder climb depletes stamina)
+	
+	const float	STAMINA_DRAIN_HOLD_BREATH_START = 0.2; //in units (how much holding breath depletes stamina at the start)
+	const float	STAMINA_DRAIN_HOLD_BREATH_END = 1.0; //in units (how much holding breath depletes stamina at the end)
+	const float	STAMINA_DRAIN_JUMP = 25;		// in units (how much jumping depletes stamina)
+	const float	STAMINA_DRAIN_VAULT = 20;		// in units (how much jumping depletes stamina)
+	const float	STAMINA_DRAIN_CLIMB = 42;		// in units (how much jumping depletes stamina)
+	const float	STAMINA_DRAIN_MELEE_LIGHT = 5; //in units (how much light melee punch depletes stamina)
+	const float	STAMINA_DRAIN_MELEE_HEAVY = 25; //in units (how much heavy melee punch depletes stamina)
+	const float	STAMINA_DRAIN_MELEE_EVADE = 8; // in units (how much evade depletes stamina)
+	const float	STAMINA_DRAIN_ROLL = 5; // in units (how much roll depletes stamina)
+	
+	const float STAMINA_DRAIN_HOLD_BREATH_DURATION = 5.0; //in seconds, time it takes to increase stamina drain from STAMINA_DRAIN_HOLD_BREATH_START to STAMINA_DRAIN_HOLD_BREATH_END
+	const float	STAMINA_DRAIN_HOLD_BREATH_EXPONENT = 3; //holding breath exponent
+	
+	const int 	STAMINA_GAIN_JOG_PER_SEC = 2; //in units (how much of stamina units is gained while jogging)
+	const int 	STAMINA_GAIN_WALK_PER_SEC = 4; //in units (how much of stamina units is gained while walking)
+	const int 	STAMINA_GAIN_IDLE_PER_SEC = 5; //in units (how much of stamina units is gained while iddling)
+	const int	STAMINA_GAIN_SWIM_PER_SEC = 1; //in units (how much of stamina units is gained while slowly swim)
+	const int	STAMINA_GAIN_LADDER_PER_SEC = 1; //in units (how much of stamina units is gained while slowly swim)
+	const int	STAMINA_GAIN_ROLL_PER_SEC = 0; //in units (how much of stamina units is gained while rolling)
+	const float STAMINA_GAIN_BONUS_CAP = 3.0; //in units (tells how much extra units can be added at best to stamina regain)
+	
+	const float STAMINA_KG_TO_STAMINAPERCENT_PENALTY = 1.75; //in units (by how many  units is max stamina bar reduced for each 1 kg of load weight)
+	const float STAMINA_MIN_CAP = 5; //in units (overload won't reduce max stamina bar under this value)
+	const float STAMINA_HOLD_BREATH_THRESHOLD_ACTIVATE = 10; // in units
+	const float STAMINA_HOLD_BREATH_THRESHOLD_DRAIN = 0; // in units
+	const float STAMINA_JUMP_THRESHOLD = 25; // in units
+	const float STAMINA_VAULT_THRESHOLD = 20; // in units
+	const float STAMINA_CLIMB_THRESHOLD = 42; // in units
+	const float STAMINA_ROLL_THRESHOLD = 5; // in units
+	
+	
+	const float STAMINA_MELEE_HEAVY_THRESHOLD = STAMINA_DRAIN_MELEE_HEAVY; // in units (how many units we need to make a heavy hit in melee)
+	const float STAMINA_MELEE_EVADE_THRESHOLD = 8; // in units
+	const float STAMINA_REGEN_COOLDOWN_DEPLETION = 0.45; // in secs (how much time we will spend in cooldown before the stamina will starts with regeneration)
+	const float STAMINA_REGEN_COOLDOWN_EXHAUSTION = 0.5;
+	const float STAMINA_WEIGHT_LIMIT_THRESHOLD = 6000; //! in grams (weight where the player is not penalized by stamina)
+	const float STAMINA_KG_TO_GRAMS = 1000; //for kg to g conversion
+	const float STAMINA_SYNC_RATE = 0.5; //in secs
+	const float STAMINA_MAX = 100;
+	/** @}*/
+	
+	/**
+	 * \defgroup EnvironmentCfg Configurations for Environment class
+	 * \desc Configurations for Environment class
+	 * @{
+	 */
+	const float ENVIRO_TICK_RATE 						= 3;		//! in secs. how often should enviro effet process
+	const float	ENVIRO_TICKS_TO_WETNESS_CALCULATION 	= 2;	  	//! each X (ticks) is processed wetness on items on player
+	const float ENVIRO_TICK_ROOF_RC_CHECK 				= 10;	  	//! in secs. how often we should check if player is under the roof (raycast)
+	const float ENVIRO_WET_INCREMENT 					= 0.01;	  	//! amount of wetness added to items wet value each tick if is raining
+	const float ENVIRO_DRY_INCREMENT 					= 0.00005; 	//! amount of wetness subtracted from items wet value each tick if is not raining due to player heat
+	const float ENVIRO_SUN_INCREMENT 					= 0.002;	//! (not used) amount of wetness subtracted from items wet value each tick if is not raining due to sun
+	const float ENVIRO_FIRE_INCREMENT					= 23.5;		//! how much is the generic temp effect increased when player is next to a fireplace
+	const float ENVIRO_CLOUD_DRY_EFFECT 				= 0.7;		//! how many % of ENVIRO_SUN_INCREMENT is reduced by cloudy sky
+	const float ENVIRO_FOG_DRY_EFFECT 					= 0.9;		//! how many % of ENVIRO_SUN_INCREMENT is reduced by fog
+	const float ENVIRO_CLOUDS_TEMP_EFFECT 				= 0.35;		//! how many % of environment temperature can be lowered by clouds
+	const float ENVIRO_FOG_TEMP_EFFECT 					= 0.24;		//! how many % of environment temperature can be lowered by fog
+	const float ENVIRO_WET_PENALTY 						= 0.5;		//! at which state of item wetness (0-1) will heat isolation start having negative effect on heat comfort of item
+	const float ENVIRO_WET_PASSTHROUGH_COEF 			= 0.1;		//! how many times slower is wetting/drying items in backpacks
+	const float ENVIRO_ITEM_HEAT_TRANSFER_COEF 			= 0.01;		//! converts temperature of items to entities heatcomfort gain
+	const float ENVIRO_WATER_TEMPERATURE_COEF 			= 1.5;		//! how many time is water colder than air
+	const float ENVIRO_DEFAULT_ENTITY_HEAT 				= 2.5;		//! heat entity generates if not moving
+	const float ENVIRO_TEMPERATURE_HEIGHT_REDUCTION 	= 0.02;		//! amount of ?C reduced for each 100 meteres of height above water level
+	const float ENVIRO_TEMPERATURE_INSIDE_COEF 			= 0.085;	//! increases temp in interiors
+	const float ENVIRO_TEMPERATURE_INSIDE_VEHICLE_COEF	= 0.051;	//! increases temp inside vehicles
+	const float ENVIRO_TEMPERATURE_UNDERROOF_COEF		= 0.072;
+	const float ENVIRO_TEMPERATURE_WIND_COEF			= 2.5;		//! windchill effect on base temperature
+	const float ENVIRO_WIND_EFFECT 						= 0.25;		//! amount of % wind affect drying/wetting
+	const float ENVIRO_HIGH_NOON 						= 12;		//! when is sun highest on sky
+	
+	const float ENVIRO_HEATCOMFORT_HEADPARTS_WEIGHT		= 0.3;		//! how much this head parts (clothing) affects final heatcomfort
+	const float ENVIRO_HEATCOMFORT_BODYPARTS_WEIGHT		= 1.0;		//! how much this body parts (clothing) affects final heatcomfort
+	const float ENVIRO_HEATCOMFORT_FEETPARTS_WEIGHT		= 0.5;		//! how much this feet parts (clothing) affects final heatcomfort
+	const float ENVIRO_HEATISOLATION_BACK_WEIGHT		= 0.45;		//! weight of back for the sum of heat isolation
+	const float ENVIRO_HEATISOLATION_VEST_WEIGHT		= 0.64;		//! weight of vest for the sum of heat isolation
+	const float ENVIRO_LOW_TEMP_LIMIT					= -40;		//! lowest temperature(deg Celsius) where the player gets lowest possible heat comfort (-1)
+	const float ENVIRO_HIGH_TEMP_LIMIT					= 50;		//! highest temperature(deg Celsius) where the player gets highest possible heat comfort (1)
+	const float ENVIRO_PLAYER_COMFORT_TEMP				= 26;		//! comfort temperature of environment for the player
+	const float ENVIRO_TEMP_EFFECT_ON_PLAYER			= 60;		//! impact of enviro temperature on player (lower value = higher, cannot be zero or below!)
+	const float ENVIRO_PLAYER_HEATBUFFER_DECREASE		= 0.34;		//! Multiplier of enviro temperature for heat buffer decrease (after its static timer runs out)
+	const float ENVIRO_PLAYER_HEATBUFFER_INCREASE		= 0.51;		//! How much heat buffer increases per one enviro tick
+	const float ENVIRO_PLAYER_HEATBUFFER_TICK			= 0.011;	//! Heat buffer static timer tick (set for 2s enviro tick, 180s to 1.0)
+	
+	//! impact of item wetness to the heat isolation
+	const float ENVIRO_ISOLATION_WETFACTOR_DRY			= 1.0;
+	const float ENVIRO_ISOLATION_WETFACTOR_DAMP			= 0.9;
+	const float ENVIRO_ISOLATION_WETFACTOR_WET			= 0.75;
+	const float ENVIRO_ISOLATION_WETFACTOR_SOAKED		= 0.5;
+	const float ENVIRO_ISOLATION_WETFACTOR_DRENCHED 	= 0.0;
+	//! impact of item health (state) to the heat isolation
+	const float ENVIRO_ISOLATION_HEALTHFACTOR_PRISTINE  = 1.0;
+	const float ENVIRO_ISOLATION_HEALTHFACTOR_WORN		= 0.9;
+	const float ENVIRO_ISOLATION_HEALTHFACTOR_DAMAGED	= 0.8;
+	const float ENVIRO_ISOLATION_HEALTHFACTOR_B_DAMAGED = 0.5;
+	const float ENVIRO_ISOLATION_HEALTHFACTOR_RUINED  	= 0.0;
+	
+	const float ENVIRO_TEMP_SOURCES_LOOKUP_RADIUS		= 20.0;
+	
+	const float LIQUID_RAIN_AMOUNT_COEF_BASE = 10.0;
+	
+	// --
+	//! various damage per second constants
+	const float FIRE_ATTACHMENT_DAMAGE_PER_SECOND 		= 0.07;		//! damage per second dealt to attachment by fire
+	
+	/** @}*/
+	
+	/**
+	 * \defgroup CarFluidsConstants Cars Fluids 
+	 * \desc Constants for car fluids
+	 * @{
+	 */
+	const int CARS_FLUIDS_TICK 		= 1;
+	const int CARS_LEAK_TICK_MIN 	= 0.02;
+	const int CARS_LEAK_TICK_MAX 	= 0.05;
+	const int CARS_LEAK_THRESHOLD	= 0.5;
+	/** @}*/
+	
+	/**
+	 * \defgroup CarContactConstants Cars Contact 
+	 * \desc Constants for car contact event
+	 * @{
+	 */
+	const float CARS_CONTACT_DMG_THRESHOLD = 750.0;
+	const float CARS_CONTACT_DMG_MIN = 150.0;
+	const float CARS_CONTACT_DMG_KILLCREW = 1200.0;
+	/** @}*/
+	
+	/**
+	 * \defgroup ItemHealth Item Health States (ItemBase.GetHealthLevel)
+	 * \desc Constants for Item Health States
+	 * @{
+	 */
+	const int STATE_RUINED 		 	= 4;
+	const int STATE_BADLY_DAMAGED 	= 3;
+	const int STATE_DAMAGED 	  	= 2;
+	const int STATE_WORN 		  	= 1;
+	const int STATE_PRISTINE 	  	= 0;
+	/** @}*/
+	
+	/**
+	 * \defgroup ItemDamage Item Damage Relative Values (ItemBase.GetHealth01)
+	 * \desc Constants for relative Item Health handling
+	 * @{
+	 */
+	const float DAMAGE_PRISTINE_VALUE 		= 1.0;
+	const float DAMAGE_WORN_VALUE 			= 0.7;
+	const float DAMAGE_DAMAGED_VALUE 		= 0.5;
+	const float DAMAGE_BADLY_DAMAGED_VALUE 	= 0.3;
+	const float DAMAGE_RUINED_VALUE 		= 0.0;
+	/** @}*/
+	
+	/**
+	 * \defgroup ItemWetness Item Wetness States (ItemBase.GetWet)
+	 * \desc Constants for Item Wetness States
+	 * @{
+	 */
+	const float STATE_DRENCHED		= 0.8;
+	const float STATE_SOAKING_WET	= 0.5;
+	const float STATE_WET			= 0.25;
+	const float STATE_DAMP			= 0.05;
+	const float STATE_DRY			= 0;
+	/** @}*/
+	
+	/**
+	 * \defgroup ItemWetness Item Wetness Weight Modifiers
+	 * \desc Constants for Item Wetness States
+	 * @{
+	 */
+	const float WEIGHT_DRENCHED		= 2.0;
+	const float WEIGHT_SOAKING_WET	= 1.66;
+	const float WEIGHT_WET			= 1.33;
+	const float WEIGHT_DAMP			= 1.0;
+	const float WEIGHT_DRY			= 1.0;
+	/** @}*/
+	
+	const int OPTICS_STATE_DAY	 		= 0; //default state for most optics
+	const int OPTICS_STATE_NIGHTVISION 	= 1;
+	//const int OPTICS_STATE_OTHER	 	= 2;
+	
+	const float WETNESS_RATE_WETTING_INSIDE = 0.0020;
+	const float WETNESS_RATE_WETTING_LIQUID = 0.015;
+	const float WETNESS_RATE_DRYING_INSIDE  = -0.0016;
+	const float WETNESS_RATE_DRYING_GROUND  = -0.0008;
+	
+	const float TEMPERATURE_RATE_COOLING_INSIDE = -0.17;
+	const float TEMPERATURE_RATE_COOLING_GROUND = -0.34;
+	const float TEMPERATURE_RATE_COOLING_PLAYER = -0.35; // celsius per second
+	
+	const float HEATISO_THRESHOLD_BAD = 0.2;
+	const float HEATISO_THRESHOLD_LOW = 0.4;
+	const float HEATISO_THRESHOLD_MEDIUM = 0.6;
+	const float HEATISO_THRESHOLD_HIGH = 0.8;
+	
+	/**
+	 * \defgroup Barrel Barrel related functions constants
+	 * \desc Barrel related functions constants
+	 * @{
+	 */
+	const int BAREL_LIME_PER_PELT = 100; //grams per pelt 
+	const int BAREL_BLEACH_PER_CLOTH = 50; //ml per item
+	const float BAREL_LIME_PER_PLANT = 50; //grams per gram
+	/** @}*/
+	
+	/**
+	 * \defgroup FOVSettings FOV settings
+	 * \desc Constats for setting of DayZPlayerCamera FOV
+	 */
+	
+	//! FOV (vertical angle/2) in radians. Take care to modify also in "basicDefines.hpp"
+	const float DZPLAYER_CAMERA_FOV_EYEZOOM			= 0.3926;	// 45deg
+	const float DZPLAYER_CAMERA_FOV_EYEZOOM_SHALLOW	= 0.610865;	// 70deg
+	const float DZPLAYER_CAMERA_FOV_IRONSIGHTS		= 0.5236;	// 60deg
+	
+	const string DEFAULT_CHARACTER_NAME = "#str_cfgvehicles_survivor0"; //experiment, used to be "Survivor"
+	
+	const int DEFAULT_CHARACTER_MENU_ID = -1;
+	
+	const float CLEAN_UNRESTRAIN_DAMAGE = 10;
+	
+	//! Camera shake
+	const int CAMERA_SHAKE_GRENADE_DISTANCE = 40;
+	const int CAMERA_SHAKE_ARTILLERY_DISTANCE = 200;
+	const int CAMERA_SHAKE_ARTILLERY_DISTANCE2 = 40000; // Square distance used for distance check
+	
+	//! Wood mining GameConstants, scaled by output. Should not be lower than ~1.5s!
+	const float MINING_WOOD_FAST = 2.0;
+	const float MINING_WOOD_MEDIUM = 2.0;
+	const float MINING_WOOD_SLOW = 3.0;
+	
+	//! Non-lethal projectile damage QuantityConversions
+	const float PROJECTILE_CONVERSION_ANIMALS 	= 0.1;
+	const float PROJECTILE_CONVERSION_INFECTED 	= 0.44;
+	const float PROJECTILE_CONVERSION_PLAYERS 	= 0.1;
+	
+	const float NL_DAMAGE_FIREARM_CONVERSION_ANIMALS 	= PROJECTILE_CONVERSION_ANIMALS;
+	const float NL_DAMAGE_FIREARM_CONVERSION_INFECTED 	= PROJECTILE_CONVERSION_INFECTED;
+	const float NL_DAMAGE_FIREARM_CONVERSION_PLAYERS  	= PROJECTILE_CONVERSION_PLAYERS;
+	
+	const float NL_DAMAGE_CLOSECOMBAT_CONVERSION_ANIMALS 	= 0.16;
+	const float NL_DAMAGE_CLOSECOMBAT_CONVERSION_INFECTED 	= 0.16;
+	const float NL_DAMAGE_CLOSECOMBAT_CONVERSION_PLAYERS  	= 0;
+	
+	const float ROOF_CHECK_RAYCAST_DIST = 20.0;
+	
+	//! misc
+	const float ITEM_TEMPERATURE_TO_EXPLODE_MIN = 100;
+	const float LOADING_SCREEN_HINT_INTERVAL = 14;//the time that elapses before a hint is switched during loading in screens that support hint switching
+	const float LOADING_SCREEN_HINT_INTERVAL_MIN = 8;//the minimum time that needs to remain on the count-down counter for a hint to still be changed based on the 'LOADING_SCREEN_HINT_INTERVAL'(prevents last moment hint update where the player has no time to read it)
+	
+	
+	/**
+	 * \defgroup LifetimeRefresherConstants Lifetime Refresher functionality constants
+	 * \desc Constats for lifetime refresher (radius, default lifetime, frequency...)
+	 */
+	const int REFRESHER_MAX_DURATION_DEFAULT		= 3600 * 24 * 40; 	//max duration of refresher in seconds - 40 days (+ 5 days final refresh )
+	const int REFRESHER_FREQUENCY_DEFAULT 			= 3600 * 24 * 5;	//frequency of lifetime refreshes/refresher time decreases - 5 days 
+	const float REFRESHER_RADIUS 					= 60; 				//meters
+	// lifetime of refresher itself is in db (3600 * 24 * 7 = 604800 )
+	
+	/**
+	 * \defgroup FoodDecayConstants Food decay constants
+	 * \desc Constants for decay of various types of food.
+	 */
+	const float DECAY_FOOD_RAW_MEAT = 21600;
+	const float DECAY_FOOD_RAW_CORPSE = 32400;
+	const float DECAY_FOOD_RAW_FRVG = 43200;
+	const float DECAY_FOOD_BOILED_MEAT = 259200;
+	const float DECAY_FOOD_BOILED_FRVG = 172800;
+	const float DECAY_FOOD_BAKED_MEAT = 345600;
+	const float DECAY_FOOD_BAKED_FRVG = 259200;
+	const float DECAY_FOOD_DRIED_MEAT = 691200;
+	const float DECAY_FOOD_CAN_OPEN = 172800;
+	const int DECAY_FOOD_FRVG_DRIED_CHANCE = 43;
+	const int DECAY_TIMER_RANDOM_PERCENTAGE = 25;
+	const float DECAY_RATE_ON_PLAYER = 2.5;
+	
+	const int RESPAWN_MODE_CUSTOM = 0;
+	const int RESPAWN_MODE_RANDOM = 1;
+
+	/**
+	 * \defgroup InventoryConstants Inventory constants
+	 * \desc Constants for inventory
+	 */
+	const int INVENTORY_ENTITY_DROP_OVERLAP_DEPTH = 2; // How deep should it go looking for a free spot to drop an entity
+	
+	//----------------------------------------------------------
+	//							AI
+	//----------------------------------------------------------
+	
+	const float AI_ATTACKSPEED = 1.5;
+	const float AI_MAX_BLOCKABLE_ANGLE = 60; // The angle under which an infected must be relative to player to be blockable
+	const float AI_CONTAMINATION_DMG_PER_SEC = 3; // The amount of damage AI agents take per contaminated area damage event
+	
+	//----------------------------------------------------------
+	//						   MELEE
+	//----------------------------------------------------------
+	
+	const float PVP_MAX_BLOCKABLE_ANGLE = 60; // The angle under which a Player must be relative to player to be blockable
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/dayzplayer.c b/scripts/3_Game/DayZ/dayzplayer.c
new file mode 100644
index 0000000000000000000000000000000000000000..74b49ac089587d4f401e1968b2b78cf258d4406e
--- /dev/null
+++ b/scripts/3_Game/DayZ/dayzplayer.c
@@ -0,0 +1,1323 @@
+/** @file 
+
+  this file is interface DayZPlayer classes 
+
+*/
+
+
+// *************************************************************************************
+// ! DayZPlayerCameraResult - camera result -
+// *************************************************************************************
+class DayZPlayerCameraResult
+{
+
+	vector		m_CameraTM[4];				//!< transformation matrix - pos + orient of the camera
+	float 		m_fFovMultiplier;			//!< fov multiplier - 1.0 default - used for modifying fov - 
+	float 		m_fFovAbsolute;				//!< fov absolute value override - -1.0 default, if set - overrides absolute fov setting
+	float		m_fNearPlane;				//!< nearplane distance
+	float 		m_fPositionModelSpace;  	//!< 0.0 position is in heading space, 1.0 position is in model space
+	float 		m_fDistance;				//!< camera distance (external cameras only)
+	float 		m_fUseHeading;				//!< 0..1 (0 uses direct dir returned, 1 uses heading from player)
+	float		m_fPredictCollisionRadius;	//!< sphere radius used for collision prediction
+
+	int 		m_iDirectBone;				//!< -1 no bone, >= 0 - bone index camera is bound to, m_CameraTM is offset to the bone 
+	int 		m_iDirectBoneMode;			//! 0 not used, 1 - pos, 2 - rot, 3 - pos+rot applied as a parent to m_CameraTM, 4 as 3 but cam aligned with Y
+	float 		m_fInsideCamera;			//!< 0..1 (0 normal lod, 1 inside lod), >0.7 -> inside
+	bool		m_bUpdateWhenBlendOut;		//!< true - camera is updated when blending to new camera (Ironsights == false)
+	float 		m_fShootFromCamera;			//!< 1(default) - uses shoot from camera (+aiming sway), 0 pure weapon shoot (ironsights == 0)
+	float		m_fIgnoreParentRoll;		//!< 1 - resets base transforms roll
+	float		m_fIgnoreParentPitch;		//!< 1 - resets base transforms pitch
+	float		m_fIgnoreParentYaw;			//!< 1 - resets base transforms yaw
+	bool		m_bUpdateEveryFrame;		//!< Whether the camera updates the next frame or blends with next character update
+	
+	vector		m_OwnerTM[4];				//!< override automatically calculated owner transform during rendering (default - false)
+	bool		m_bOwnerTMOverride;			//!< The world space transform of the owner to the camera
+
+	IEntity		m_CollisionIgnoreEntity;	//!< ignore entity in 3rd person camera collision solver
+
+	//! cannot be instanced from script (always created from C++)
+	private void DayZPlayerCameraResult()
+	{
+	}
+
+	//! cannot be instanced from script (always created from C++)
+	private void ~DayZPlayerCameraResult()
+	{
+	}
+
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera - main dayz player camera implement 
+// *************************************************************************************
+class DayZPlayerCamera 
+{
+
+	void DayZPlayerCamera(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		m_pPlayer		= pPlayer;
+		m_pInput 		= pInput;
+	}
+
+	//! this overrides freelook for cameras
+	bool CanFreeLook()
+	{
+		return true;
+	}
+
+	//! virtual callback - called when camera is created
+	void OnActivate(DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+	}
+
+	//!	virtual callback - called each frame
+	void OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+	}
+
+	//!	helper to blend between cameras 
+	//! ret[0] - up down angle
+	//! ret[1] - left right angle
+	//! ret[2] - roll angle
+	vector GetBaseAngles()
+	{
+		return "0 0 0";
+	}
+
+	vector GetAdditiveAngles()
+	{
+		return "0 0 0";
+	}
+	
+	string GetCameraName()
+	{
+		return "DayZPlayerCamera";
+	}
+	
+	float GetCurrentYaw()
+	{
+		return -1;
+	}
+	
+	float GetCurrentPitch()
+	{
+		return -1;
+	}
+	
+	float GetCurrentRoll()
+	{
+		return -1;
+	}
+
+	vector GetCurrentOrientation()
+	{
+		return Vector(GetCurrentYaw(), GetCurrentPitch(), GetCurrentRoll());
+	}
+	
+	bool IsCamera3rdRaised()
+	{
+		return false;
+	}
+
+	void SpawnDiagCameraShake()
+	{
+		SpawnCameraShakeProper(1, 1, 15, 4);
+	}
+
+	void SpawnCameraShake(float strength = 1, float radius = 2, float smoothness = 5, float radius_decay_speed = 6)
+	{
+		SpawnCameraShakeProper(strength, radius, smoothness, radius_decay_speed);//done this way in order to avoid duplicating default params which could cause issues under certain circumstances
+	}
+	
+	void SpawnCameraShakeProper(float strength, float radius, float smoothness, float radius_decay_speed);
+	
+	//! data 
+	protected 	DayZPlayer 				m_pPlayer;		//!< player camera is attached to
+	protected 	HumanInputController	m_pInput;		//!< human input 
+	
+	//! m_fCamPosOffsetZ info, used to adjust near plane in DayZPlayerCameraIronsights now
+	void SendRecoilOffsetZ(float offset) {};
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerTypeStepSoundLookupTable - virtual 
+// *************************************************************************************
+class DayZPlayerTypeStepSoundLookupTable
+{
+	SoundObjectBuilder GetSoundBuilder(int eventId, int pMovement, int pSurfaceHash, AnimBootsType pBoots)
+	{
+		return null;
+	}
+}
+
+// *************************************************************************************
+// ! DayZPlayerTypeVoiceSoundLookupTable - virtual 
+// *************************************************************************************
+class DayZPlayerTypeVoiceSoundLookupTable
+{
+	SoundObjectBuilder GetSoundBuilder(int eventId, int parameterHash)
+	{
+		return null;
+	}
+	
+	NoiseParams GetNoiseParams(int eventId);
+}
+
+// *************************************************************************************
+// ! DayZPlayerTypeAttachmentSoundLookupTable - virtual 
+// *************************************************************************************
+class DayZPlayerTypeAttachmentSoundLookupTable
+{
+	SoundObjectBuilder GetSoundBuilder(int eventId, string slotName, int attachmentHash)
+	{
+		return null;
+	}
+}
+
+class DayZPlayerTypeAnimTable
+{
+	AnimSoundEvent GetSoundEvent(int event_id)
+	{
+		return null;
+	}
+}
+
+// *************************************************************************************
+// ! VegetationSound
+// *************************************************************************************
+
+class VegetationSound
+{
+	private ref SoundObjectBuilder m_SoundObjectBuilder;
+	private ref TIntArray m_AnimEventIds;
+	
+	void VegetationSound(SoundObjectBuilder soundObjectBuilder, TIntArray animEventIds)
+	{
+		m_SoundObjectBuilder = soundObjectBuilder;
+		m_AnimEventIds = animEventIds;
+	}
+	
+	SoundObjectBuilder GetSoundObjectBuilder()
+	{
+		return m_SoundObjectBuilder;
+	}
+	
+	TIntArray GetAnimEventIds()
+	{
+		return m_AnimEventIds;
+	}
+}
+
+// *************************************************************************************
+// ! DayZPlayerType - DayZPlayer configuration 
+// *************************************************************************************
+
+//! class that configures static data for DayZPlayer
+//! on each mission start DayZPlayerTypeCreate(DayZPlayerType pType) is called - can call methods
+
+class DayZPlayerType
+{
+	//!----------------------------------------------------
+	// item in hands config
+
+	//! 
+	proto native 	void SetDefaultItemInHandsProfile(string pAnimInstanceName, HumanItemBehaviorCfg pBehaviorCfg);
+
+
+	//! reset profiles 
+	proto native 	void ResetItemInHandsProfiles();
+
+	//! adds setup profile for items of class pItemClass
+	//! when item is in hands - pAnimInstanceName is used for animation sourcing 
+	//! pCanRaise is whether weapon / item can be raised
+	//! pRHandIK == false -> rhand ik is always turned off
+	//! pLHandIK == false -> lhand ik is always turned off
+
+	//! VKOSTIK: DO NOT FORGET !!! HumanItemBehaviorCfg.m_iPerItemCameraUD - per item camera user data - enables you setup different cameras for different items in hands
+
+	//!
+	proto native 	int AddItemInHandsProfile(string pItemClass, string pAnimInstanceName, HumanItemBehaviorCfg pBehaviorCfg);
+
+	//!
+	proto native 	int AddItemInHandsProfileIK(string pItemClass, string pAnimInstanceName, HumanItemBehaviorCfg pBehaviorCfg, string pIkPoseAnim, string pWeaponStates = "");
+
+	//! add bone remap for item class
+	//! pBoneRemap has always 2x N members
+	//! bone in item's P3D first, bone in Character skeleton second
+
+	//! array<string> remap = { "bolt", "Weapon_Bolt", "magazine", "Weapon_Magazine", "trigger", "Weapon_Trigger" };
+	//! AddItemBoneRemap("class", remap);
+
+	proto native 	int AddItemBoneRemap(string pItemClass, array<string> pBoneRemap);
+
+
+	//! debug / hack - loads all animation instances
+	proto native 	void DebugPreloadAnimationInstances();
+
+
+
+	//!----------------------------------------------------
+	// camera creators
+
+	//! resets camera creators
+	proto native 	void ResetCameraCreators();
+
+	//! registers camera creator - camera type => camera type (must be descendant of DayZPlayerCamera)
+	proto native 	void RegisterCameraCreator(int pCameraID, typename pCameraType);
+
+	//! registers camera on change function - static function 
+	proto native 	void RegisterCameraOnChangeFnStatic(typename pClass, string pFnName);
+
+	//! registers camera on change function - 
+	proto native 	void RegisterCameraOnChangeFn(Class pInstance, string pFnName);
+
+
+	//!----------------------------------------------------
+	// global options
+
+	//! sets look limits for a player
+	proto native 	void SetLookLimits(float pDown, float pUp, float pLeft, float pRight);
+
+	//! sets aim limits for a player
+	proto native 	void SetAimLimits(float pDown, float pUp, float pLeft, float pRight);
+	
+	//! sets vertical minimum aim limit for a player
+	proto native 	void SetVerticalMinimumAimLimit(float value);
+
+	//! sets aim limits for a player
+	proto native 	void SetCameraShootParams(float pRayDistance, float pRayRadius, float pMaxAngleCos);
+
+	//!----------------------------------------------------
+	// bone indices
+
+	proto native	int  GetHeadBoneIdx();
+
+	//!----------------------------------------------------
+	// event handling
+
+	//! calls DayZPlayer.OnStepEvent();
+	proto native	void RegisterStepEvent(string pEventType, float pFilterTimeout);
+
+	//! calls DayZPlayer.OnSoundEvent();
+	proto native	void RegisterSoundEvent(string pEventType, float pFilterTimeout);
+
+	//! calls DayZPlayer.OnParticleEvent();
+	proto native	void RegisterParticleEvent(string pEventType, float pFilterTimeout);
+
+
+	void 				 RegisterStepSoundLookupTable(DayZPlayerTypeStepSoundLookupTable pSSLUT)
+	{
+		m_pStepSoundLookupTable = pSSLUT;
+	}
+	
+	DayZPlayerTypeStepSoundLookupTable	GetStepSoundLookupTable()
+	{
+		return m_pStepSoundLookupTable;
+	}
+	
+	void RegisterAttachmentSoundLookupTable(DayZPlayerTypeAttachmentSoundLookupTable pASLUT)
+	{
+		m_pAttachmentSoundLookupTable = pASLUT;
+	}
+	
+	DayZPlayerTypeAttachmentSoundLookupTable	GetAttachmentSoundLookupTable()
+	{
+		return m_pAttachmentSoundLookupTable;
+	}
+	
+	void RegisterVoiceSoundLookupTable(DayZPlayerTypeVoiceSoundLookupTable pASLUT)
+	{
+		m_pVoiceSoundLookupTable = pASLUT;
+	}
+	
+	DayZPlayerTypeVoiceSoundLookupTable	GetVoiceSoundLookupTable()
+	{
+		return m_pVoiceSoundLookupTable;
+	}
+	
+	void RegisterSoundTable(DayZPlayerTypeAnimTable pST)
+	{
+		m_pSoundTable = pST;
+	}
+	
+	DayZPlayerTypeAnimTable GetSoundTable()
+	{
+		return m_pSoundTable;
+	}
+	
+	/*
+	void RegisterSoundVoiceTable(DayZPlayerTypeAnimTable pVST)
+	{
+		m_pSoundVoiceTable = pVST;
+	}
+	
+	DayZPlayerTypeAnimTable GetSoundVoiceTable()
+	{
+		return m_pSoundVoiceTable;
+	}
+	*/
+	
+	array<ref VegetationSound> GetVegetationSounds()
+	{
+		return m_pVegetationSounds;
+	}
+	
+	NoiseParams GetNoiseParamsStand()
+	{
+		return m_pNoiseStepStand;
+	}
+	
+	NoiseParams GetNoiseParamsCrouch()
+	{
+		return m_pNoiseStepCrouch;
+	}
+	
+	NoiseParams GetNoiseParamsProne()
+	{
+		return m_pNoiseStepProne;
+	}
+	
+	NoiseParams GetNoiseParamsLandLight()
+	{
+		return m_pNoiseLandLight;	
+	}
+	
+	NoiseParams GetNoiseParamsLandHeavy()
+	{
+		return m_pNoiseLandHeavy;
+	}
+	
+	NoiseParams GetNoiseParamsWhisper()
+	{
+		return m_pNoiseWhisper;	
+	}
+	
+	NoiseParams GetNoiseParamsTalk()
+	{
+		return m_pNoiseTalk;	
+	}
+	
+	NoiseParams GetNoiseParamsShout()
+	{
+		return m_pNoiseShout;	
+	}
+	
+	void LoadSoundWeaponEvent()
+	{
+		string cfgPath = "CfgVehicles SurvivorBase AnimEvents SoundWeapon ";
+		
+		m_animSoundEventsAttack = new array<ref AnimSoundEvent>;
+
+		int soundCount = GetGame().ConfigGetChildrenCount(cfgPath);
+		for(int i = 0; i < soundCount; i++)
+		{
+			string soundName;
+			GetGame().ConfigGetChildName(cfgPath, i, soundName);
+			string soundPath = cfgPath + soundName + " ";
+			AnimSoundEvent soundEvent = new AnimSoundEvent(soundPath);
+			if(soundEvent.IsValid())
+				m_animSoundEventsAttack.Insert(soundEvent);
+		}
+	}
+	
+	void LoadVegetationSounds()
+	{
+		m_pVegetationSounds = new array<ref VegetationSound>;
+
+		string vegSoundsCfgPath = "CfgVehicles SurvivorBase VegetationSounds ";
+		int vegSoundsCount = GetGame().ConfigGetChildrenCount(vegSoundsCfgPath);
+
+		for (int v = 0; v < vegSoundsCount; ++v)
+		{
+			string vegSoundParamName;
+			GetGame().ConfigGetChildName(vegSoundsCfgPath, v, vegSoundParamName);
+			
+			string soundSet = "";
+			GetGame().ConfigGetText(vegSoundsCfgPath + vegSoundParamName + " soundSet", soundSet);
+
+			TIntArray animEventIds = new TIntArray;
+			GetGame().ConfigGetIntArray(vegSoundsCfgPath + vegSoundParamName + " animEventIds", animEventIds);
+
+			SoundParams soundParams = new SoundParams(soundSet);
+
+			if (soundParams.IsValid() && animEventIds.Count() > 0)
+			{
+				m_pVegetationSounds.Insert(new VegetationSound(new SoundObjectBuilder(soundParams), animEventIds));
+			}
+		}
+	}
+	
+	AnimSoundEvent GetSoundWeaponEvent(int event_id)
+	{
+		foreach (AnimSoundEvent soundEvent : m_animSoundEventsAttack)
+		{
+			if (soundEvent.m_iID == event_id)
+				return soundEvent;
+		}
+
+		return null;
+	}
+	
+	//! register hit components for AI melee (used by attacking AI)
+	void RegisterHitComponentsForAI()
+	{
+		m_HitComponentsForAI = new array<ref DayZAIHitComponent>;
+
+		//! registers default hit compoent for entity
+		m_DefaultHitComponent = "dmgZone_torso";
+		//! registers default hit position for entity
+		m_DefaultHitPositionComponent = "Pelvis";
+
+		//! list of components suitable for melee finisher attacks (used in fight logic)
+		m_SuitableFinisherHitComponents = new array<string>;
+		m_SuitableFinisherHitComponents.Insert("Head");
+
+		//! register hit components that are selected by probability
+		//DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "dmgZone_head", 5); // TMP comment out
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "dmgZone_leftArm", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "dmgZone_torso", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "dmgZone_rightArm", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "dmgZone_leftLeg", 40);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "dmgZone_rightLeg", 40);
+	}
+	
+	string GetHitComponentForAI()
+	{
+		string hitComp;
+		
+		if (DayZAIHitComponentHelpers.SelectMostProbableHitComponent(m_HitComponentsForAI, hitComp))
+		{
+			return hitComp;
+		}
+		
+		return GetDefaultHitComponent();
+	}
+	
+	string GetDefaultHitComponent()
+	{
+		return m_DefaultHitComponent;
+	}
+	
+	string GetDefaultHitPositionComponent()
+	{
+		return m_DefaultHitPositionComponent;
+	}
+	
+	array<string> GetSuitableFinisherHitComponents()
+	{
+		return m_SuitableFinisherHitComponents;
+	}
+	
+	private void DayZPlayerType()
+	{
+		string cfgPath = "CfgVehicles SurvivorBase ";
+	
+		m_pNoiseStepStand = new NoiseParams();
+		m_pNoiseStepStand.LoadFromPath(cfgPath + "NoiseStepStand");
+		
+		m_pNoiseStepCrouch = new NoiseParams();
+		m_pNoiseStepCrouch.LoadFromPath(cfgPath + "NoiseStepCrouch");
+		
+		m_pNoiseStepProne = new NoiseParams();
+		m_pNoiseStepProne.LoadFromPath(cfgPath + "NoiseStepProne");
+		
+		m_pNoiseLandLight = new NoiseParams();
+		m_pNoiseLandLight.LoadFromPath(cfgPath + "NoiseLandLight");
+		
+		m_pNoiseLandHeavy = new NoiseParams();
+		m_pNoiseLandHeavy.LoadFromPath(cfgPath + "NoiseLandHeavy");
+		
+		m_pNoiseWhisper = new NoiseParams();
+		m_pNoiseWhisper.LoadFromPath(cfgPath + "NoiseWhisper");
+		
+		m_pNoiseTalk = new NoiseParams();
+		m_pNoiseTalk.LoadFromPath(cfgPath + "NoiseTalk");
+		
+		m_pNoiseShout = new NoiseParams();
+		m_pNoiseShout.LoadFromPath(cfgPath + "NoiseShout");
+		
+		LoadSoundWeaponEvent();
+		LoadVegetationSounds();
+	}
+	
+	private void ~DayZPlayerType();
+
+	//!----------------------------------------------------
+	// global settings
+
+	//! returns Human global settings for DayZPlayer
+	proto native 	SHumanGlobalSettings 		GetGlobalSettingsW();
+
+
+	//!----------------------------------------------------
+	// command configs
+
+	// returns command move setting for write - in init phase
+	proto native 	SHumanCommandMoveSettings	CommandMoveSettingsW();
+
+	// returns command swim setting for write - in init phase
+	proto native 	SHumanCommandSwimSettings	CommandSwimSettingsW();
+
+	// returns command swim setting for write - in init phase
+	proto native 	SHumanCommandClimbSettings	CommandClimbSettingsW();
+
+
+	//!< this is used for getting appropriate sound effect to play step event on various surfaces && boots
+	//!< it's downcasted to StepSoundLookupTable
+	ref DayZPlayerTypeStepSoundLookupTable m_pStepSoundLookupTable;
+	ref DayZPlayerTypeAttachmentSoundLookupTable m_pAttachmentSoundLookupTable;
+	ref DayZPlayerTypeVoiceSoundLookupTable m_pVoiceSoundLookupTable;
+	ref DayZPlayerTypeAnimTable m_pSoundTable;
+	//ref DayZPlayerTypeAnimTable m_pSoundVoiceTable;
+	ref NoiseParams m_pNoiseStepStand;
+	ref NoiseParams m_pNoiseStepCrouch;
+	ref NoiseParams m_pNoiseStepProne;
+	ref NoiseParams m_pNoiseLandLight;
+	ref NoiseParams m_pNoiseLandHeavy;
+	
+	// von noises
+	ref NoiseParams m_pNoiseWhisper;
+	ref NoiseParams m_pNoiseTalk;
+	ref NoiseParams m_pNoiseShout;
+
+	ref array<ref VegetationSound> m_pVegetationSounds;
+
+	//! Melee hit components (AI targeting)	
+	protected ref array<ref DayZAIHitComponent> m_HitComponentsForAI;
+	protected string m_DefaultHitComponent;
+	protected string m_DefaultHitPositionComponent;
+
+	protected ref array<string> m_SuitableFinisherHitComponents;
+	
+	ref array<ref AnimSoundEvent> m_animSoundEventsAttack;
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerConstants - dayz player constants 
+// *************************************************************************************
+//! defined in C++
+enum DayZPlayerConstants
+{
+    //! ---------------------------------------------------------
+    //! ---------------------- movement stances -----------------
+    //! ---------------------------------------------------------
+	DEBUG_MENU,				//!< dayz player debug menu in enfusion 
+	DEBUG_TURNSLIDE,		//!< over turn slides / clamps
+	DEBUG_SHOWDEBUGPLUGIN,  //!< menu for showing debug plugin
+	DEBUG_SHOWINJURY,		//!< menu for showing injuries
+	DEBUG_SHOWEXHAUSTION,	//!< menu for showing exhaustion
+	DEBUG_ENABLEJUMP,		//!< menu for showing exhaustion
+	DEBUG_ENABLETALKING,	//!< option for showing talk command
+	
+
+    //! ---------------------------------------------------------
+    //! ---------------------- movement stances -----------------
+    //! ---------------------------------------------------------
+
+	STANCEIDX_ERECT,
+	STANCEIDX_CROUCH,
+	STANCEIDX_PRONE,
+	STANCEIDX_RAISEDERECT,
+	STANCEIDX_RAISEDCROUCH,
+	STANCEIDX_RAISEDPRONE,
+	/*
+	 STANCEIDX_ERECT + STANCEIDX_RAISED = STANCEIDX_RAISEDERECT
+	 STANCEIDX_RAISEDCROUCH - STANCEIDX_RAISED = STANCEIDX_CROUCH...
+	*/
+	STANCEIDX_RAISED,
+
+
+	//! stance masks 
+	STANCEMASK_ERECT,
+	STANCEMASK_CROUCH,
+	STANCEMASK_PRONE,
+	STANCEMASK_RAISEDERECT,
+	STANCEMASK_RAISEDCROUCH,
+	STANCEMASK_RAISEDPRONE,
+	STANCEMASK_ALL,		// STANCEMASK_ERECT | STANCEMASK_CROUCH | STANCEMASK_PRONE | STANCEMASK_RAISEDERECT | STANCEMASK_RAISEDCROUCH | STANCEMASK_RAISEDPRONE
+	STANCEMASK_NOTRAISED 	= STANCEMASK_ERECT | STANCEMASK_CROUCH | STANCEMASK_PRONE,
+	STANCEMASK_RAISED 		= STANCEMASK_RAISEDERECT | STANCEMASK_RAISEDCROUCH | STANCEMASK_RAISEDPRONE,
+
+
+	//! movements - masks 
+	MOVEMENT_IDLE,  			//! 0x1
+	MOVEMENT_WALK,				//! 0x2
+	MOVEMENT_RUN,				//! 0x4
+	MOVEMENT_SPRINT,			//! 0x8 
+
+	//! rotation modes
+	
+	ROTATION_DISABLE,			//!
+	ROTATION_ENABLE,			//!
+	
+	//! movement idx
+	MOVEMENTIDX_SLIDE	= -2,
+	MOVEMENTIDX_IDLE	= 0,
+	MOVEMENTIDX_WALK	= 1,
+	MOVEMENTIDX_RUN		= 2,
+	MOVEMENTIDX_SPRINT  = 3,
+	MOVEMENTIDX_CROUCH_RUN = 4,
+	
+	//! melee hit type
+	MELEE_LIGHT = 0,
+	MELEE_HEAVY = 1,
+	
+
+	//! vehicle classes
+	VEHICLECLASS_CAR,
+	VEHICLECLASS_HELI,
+
+	//! vehicle seats
+	VEHICLESEAT_DRIVER,
+	VEHICLESEAT_CODRIVER,
+	VEHICLESEAT_PASSENGER_L,
+	VEHICLESEAT_PASSENGER_R,
+
+	//! death types
+	DEATH_DEFAULT = -1,			//! not defining in C++ as it is only used in script for undefined type
+	DEATH_PULL_OUT_TRANSPORT,	//! transport death -> death - special handling for pulling a dead player out of a vehicle
+	DEATH_BODY,					//! locomotion -> death - normal death animation while a player is conciscious 
+	DEATH_FAST,					//! locomotion -> death - faster animation, for impulse driven deaths, i.e. hit by vehicle
+	DEATH_WATER,				//! swimming -> death 
+	DEATH_FALL,					//! falling -> death 
+	DEATH_UNCON_ON_LAND,		//! unconscious -> death - while not in water
+	DEATH_UNCON_IN_WATER,		//! unconscious -> death - while in water
+	// - Type not used for "swimming to death" or "transport to death"
+
+    //! ---------------------------------------------------------
+    //! ---------------------- COMMAND IDs ----------------------
+    //! ---------------------------------------------------------
+	
+	//! command ids - main movement commands 
+	COMMANDID_NONE,    		// type is int - no command - invalid state 
+	COMMANDID_MOVE,			// type is int (overridden from C++) - normal movement (idle, walk, run, sprint, ... )
+	COMMANDID_ACTION,		// type is int (overridden from C++) - full body action
+	COMMANDID_MELEE,		// type is int (overridden from C++) - melee attacks
+	COMMANDID_MELEE2,		// type is int (overridden from C++) - melee attacks
+	COMMANDID_FALL,			// type is int (overridden from C++) - falling
+	COMMANDID_DEATH,		// type is int (overridden from C++) - dead 
+	COMMANDID_DAMAGE,		// type is int (overridden from C++) - fullbody damage
+	COMMANDID_LADDER,		// type is int (overridden from C++) - ladder
+	COMMANDID_UNCONSCIOUS,	// type is int (overridden from C++) - unconscious
+	COMMANDID_SWIM,			// type is int (overridden from C++) - swimming
+	COMMANDID_VEHICLE,		// type is int (overridden from C++) - vehicle
+	COMMANDID_CLIMB,		// type is int (overridden from C++) - climb
+	COMMANDID_SCRIPT,		// type is int (overridden from C++) - all scripted commands
+
+
+	//! modifier commands - additive behaviour 
+	COMMANDID_MOD_LOOKAT,    	// look at - always on 
+	COMMANDID_MOD_WEAPONS,   	// weapons - always on 
+    COMMANDID_MOD_ACTION,		// action - additive action 
+	COMMANDID_MOD_DAMAGE,		// damage - additive damage 
+
+
+
+
+    //! ---------------------------------------------------------
+    //! ---------------------- ACTIONS --------------------------
+    //! ---------------------------------------------------------
+
+	//! internal action commands used in HumanCommandActionCallback.InternalCommand()
+	CMD_ACTIONINT_INTERRUPT				= -2,		//!< totally interrupt action (no animation, just blend)
+	CMD_ACTIONINT_FINISH				= -1,		//!< secondary ending (finishing action, eg running out of water while drinking, not all actions have this)
+	CMD_ACTIONINT_END					= 0,		//!< end action (stopping action, without finish, all actions have this)
+	CMD_ACTIONINT_ACTION				= 1,		//!< one time secondary action within an action
+	CMD_ACTIONINT_ACTIONLOOP			= 2,		//!< loop secondary action within an action
+
+
+	//! animations constants 
+
+	//! note: (erc - standing, cro - crouching, pne - prone)    	anim pose it can start from
+	//! note: (end, end2, action, loop2)							internal command which can be send in loop state 
+
+	//! looping 	
+		
+    //! --------------------------
+    //! modifier (differential animation)
+    CMD_ACTIONMOD_DRINK					= 0,		// erc,cro    		[end, end2]
+	CMD_ACTIONMOD_EAT					= 1,		// erc,cro    		[end, end2]
+	CMD_ACTIONMOD_EMPTY_VESSEL			= 2,		// erc,cro          [end]
+	CMD_ACTIONMOD_CATCHRAIN				= 3,		// erc,cro			[end]
+	CMD_ACTIONMOD_VIEWCOMPASS			= 7,		// erc,cro          [end]
+	CMD_ACTIONMOD_ITEM_TUNE				= 9,		// erc,cro			[end]
+	CMD_ACTIONMOD_GIVEL					= 10,		// erc,cro			[end]
+	CMD_ACTIONMOD_GIVER					= 11,		// erc,cro			[end]
+	CMD_ACTIONMOD_SHAVE					= 12,		// erc,cro			[end]
+	CMD_ACTIONMOD_FILLMAG				= 13,		// erc,cro			[end]
+	CMD_ACTIONMOD_EMPTYMAG				= 14,		// erc,cro			[end]
+	CMD_ACTIONMOD_OPENITEM				= 15,		// erc,cro			[end]
+	CMD_ACTIONMOD_TAKETEMPSELF			= 18,		// erc,cro			[end]
+	CMD_ACTIONMOD_VIEWMAP				= 19,		// erc,cro			[end]
+	CMD_ACTIONMOD_RAISEITEM				= 20,		// erc,cro			[end]
+	CMD_ACTIONMOD_SEARCHINVENTORY		= 21,		// erc,cro			[end]
+	CMD_ACTIONMOD_CRAFTING				= 22,		// erc,cro			[end]
+	CMD_ACTIONMOD_RESTRAINEDSTRUGGLE	= 23,		// erc,cro 			[end, end2]
+	CMD_ACTIONMOD_COVERHEAD_SELF		= 24,		// erc,cro 			[end, end2]
+	CMD_ACTIONMOD_COVERHEAD_TARGET		= 25,		// erc,cro 			[end, end2]
+	CMD_ACTIONMOD_SET_ALARM				= 250,
+	CMD_ACTIONMOD_SET_KITCHENTIMER		= 252,
+	CMD_ACTIONMOD_RESET_KITCHENTIMER	= 253,
+	
+	// onetime 
+	CMD_ACTIONMOD_PICKUP_HANDS			= 500,		// erc,cro
+	CMD_ACTIONMOD_PICKUP_INVENTORY		= 501,		// erc,cro
+	CMD_ACTIONMOD_LICKBATTERY			= 502,		// erc,cro
+	CMD_ACTIONMOD_LIGHTFLARE			= 503,		// erc,cro
+	CMD_ACTIONMOD_LITCHEMLIGHT			= 504,		// erc,cro
+	CMD_ACTIONMOD_UNPINGRENAGE			= 505,		// erc,cro
+	CMD_ACTIONMOD_OPENDOORFW			= 506,		// erc,cro
+	CMD_ACTIONMOD_OPENLID				= 507,		// erc,cro 
+	CMD_ACTIONMOD_CLOSELID				= 508,		// erc,cro 	
+	CMD_ACTIONMOD_ITEM_ON				= 509,		// erc,cro
+	CMD_ACTIONMOD_ITEM_OFF				= 510,		// erc,cro
+	CMD_ACTIONMOD_BATONEXTEND			= 511,		// erc,cro
+	CMD_ACTIONMOD_BATONRETRACT			= 512,		// erc,cro
+	CMD_ACTIONMOD_UNLOCKHANDCUFFTARGET	= 513,		// erc,cro
+	CMD_ACTIONMOD_FISHINGRODEXTEND		= 514,		// erc,cro
+	CMD_ACTIONMOD_FISHINGRODRETRACT		= 515,		// erc,cro
+	CMD_ACTIONMOD_CLEANHANDSBOTTLE		= 516,		// erc,cro
+	CMD_ACTIONMOD_OPENITEM_ONCE			= 517,		// erc,cro
+	CMD_ACTIONMOD_ATTACHSCOPE			= 518,		// erc,cro
+	CMD_ACTIONMOD_ATTACHBARREL			= 519,		// erc,cro
+	CMD_ACTIONMOD_EMPTYSEEDSPACK		= 520,		// erc,cro
+	CMD_ACTIONMOD_INTERACTONCE			= 521,		// erc,cro
+	CMD_ACTIONMOD_ATTACHITEM			= 522,		// erc,cro
+	CMD_ACTIONMOD_CLOSEITEM_ONCE		= 523,		// erc,cro,pne
+	CMD_ACTIONMOD_FOLDITEM_ONCE			= 524,		// erc,cro
+	CMD_ACTIONMOD_UNFOLDITEM_ONCE		= 525,		// erc,cro
+	CMD_ACTIONMOD_PRESS_TRIGGER			= 526,		// erc,cro
+	CMD_ACTIONMOD_STOP_ALARM			= 251,
+	CMD_ACTIONMOD_EAT_PILL			    = 527,      // erc,cro
+	CMD_ACTIONMOD_EAT_TABLET			= 528,      // erc,cro
+	CMD_ACTIONMOD_HEATPACK			    = 529,      // erc,cro
+	CMD_ACTIONMOD_BLOODTEST 		    = 530,      // erc,cro
+	CMD_ACTIONMOD_BLOODTESTOTHER 		= 531,      // erc,cro
+	
+	
+	CMD_ACTIONMOD_DROPITEM_HANDS		= 900,		// erc, cro
+	CMD_ACTIONMOD_DROPITEM_INVENTORY	= 901,		// erc, cro
+	
+	
+
+    //! --------------------------
+    //! fb (full body)
+    CMD_ACTIONFB_DRINK					= 0,		// pne				[end, end2]
+	CMD_ACTIONFB_EAT					= 1,		// pne				[end, end2]
+	CMD_ACTIONFB_CATCHRAIN				= 3,		// pne				[end]
+	CMD_ACTIONFB_ITEM_TUNE				= 9,		// pne				[end]
+	CMD_ACTIONFB_GIVEL					= 10,		// pne				[end]
+	CMD_ACTIONFB_GIVER					= 11,		// pne				[end]
+	CMD_ACTIONFB_FILLMAG				= 13,		// pne				[end]
+	CMD_ACTIONFB_EMPTYMAG				= 14,		// pne				[end]
+	CMD_ACTIONFB_DRINKPOND				= 50,		// cro 	      	    [end]
+	CMD_ACTIONFB_DRINKWELL				= 51,		// cro 	            [end]
+	CMD_ACTIONFB_FILLBOTTLEWELL			= 52,		// cro	            [end]
+	CMD_ACTIONFB_FIREESTINGUISHER		= 53,		// erc              [end]
+	CMD_ACTIONFB_WRING					= 54,		// cro 		        [end]
+	CMD_ACTIONFB_FISHING				= 56,		// cro			    [action (check fish), end(catch fish), end2(not catching anything ]
+	CMD_ACTIONFB_CPR					= 57,		// cro     		    [end]
+	CMD_ACTIONFB_BANDAGE				= 58,		// cro		        [end]
+	CMD_ACTIONFB_CRAFTING				= 59,		// cro		        [end]
+	CMD_ACTIONFB_INTERACT				= 60,		// erc,cro			[end]
+	CMD_ACTIONFB_FORCEFEED				= 62,		// erc,cro          [end]
+	CMD_ACTIONFB_BANDAGETARGET			= 63,		// erc,cro          [end]
+	CMD_ACTIONFB_SPRAYPLANT				= 64,		// cro     		    [end]
+	CMD_ACTIONFB_STARTFIRE				= 65,		// cro			    [end]
+	CMD_ACTIONFB_ANIMALSKINNING			= 66,		// cro				[end]
+	CMD_ACTIONFB_WASHHANDSWELL			= 67,		// cro				[end]
+	CMD_ACTIONFB_WASHHANDSPOND			= 68,		// cro				[end]
+	CMD_ACTIONFB_SALINEBLOODBAGTARGET	= 69,		// erc,cro			[end]
+	CMD_ACTIONFB_SALINEBLOODBAG			= 70,		// erc,cro			[end]
+	CMD_ACTIONFB_STITCHUPSELF			= 71,		// erc,cro			[end]
+	CMD_ACTIONFB_VOMIT					= 72,		// cro				[end]
+	CMD_ACTIONFB_UNRESTRAINTARGET		= 73,		// erc,cro			[end (finish cutting), end2 (cancel cutting)]
+	CMD_ACTIONFB_RESTRAINTARGET			= 74,		// erc,cro			[end (finish tying up), end2 (cancel tying up)]
+	CMD_ACTIONFB_CHECKPULSE				= 76,		// cro				[end]
+	CMD_ACTIONFB_CLEANWOUNDSTARGET		= 78,		// erc, cro			[end]
+	CMD_ACTIONFB_COLLECTBLOODSELF		= 81,		// erc, cro			[end]
+	CMD_ACTIONFB_EMPTY_VESSEL			= 82,		// erc, cro			[end]
+	CMD_ACTIONFB_OPENITEM				= 83,		// pne				[end]
+	CMD_ACTIONFB_HACKBUSH				= 85,		// erc				[end, end2]
+	CMD_ACTIONFB_HACKTREE				= 86,		// erc				[end, end2]
+	CMD_ACTIONFB_TAKETEMPSELF			= 87,		// pne				[end]
+	CMD_ACTIONFB_DIG					= 88,		// erc				[end, end2]
+	CMD_ACTIONFB_DIGUPCACHE				= 89,		// erc				[end, end2]
+	CMD_ACTIONFB_DIGMANIPULATE			= 90,		// erc				[end, end2]
+	CMD_ACTIONFB_DEPLOY_HEAVY			= 95,		// erc				[end, end2]
+	CMD_ACTIONFB_DEPLOY_2HD				= 96,		// cro				[end, end2]
+	CMD_ACTIONFB_DEPLOY_1HD				= 97,		// cro				[end, end2]
+	CMD_ACTIONFB_BLOWFIREPLACE			= 98,		// cro				[end]
+	CMD_ACTIONFB_VIEWMAP				= 99,		// pne				[end]
+	CMD_ACTIONFB_VIEWCOMPASS			= 100,		// pne				[end]
+	CMD_ACTIONFB_FILLBOTTLEPOND			= 101,		// erc, cro			[end]
+	CMD_ACTIONFB_PLACING_HEAVY			= 102,		// erc				[end, end2]
+	CMD_ACTIONFB_PLACING_2HD			= 103,		// cro				[end, end2]
+	CMD_ACTIONFB_PLACING_1HD			= 104,		// cro				[end, end2]
+	CMD_ACTIONFB_CUTBARK				= 105,		// erc,cro			[end, end2]
+	CMD_ACTIONFB_VIEWNOTE				= 106,		// erc,cro,pne		[end]
+	CMD_ACTIONFB_SEARCHINVENTORY		= 107,		// pne				[end]
+	CMD_GESTUREFB_LOOKOPTICS			= 108,		// erc,cro,pne		[end]
+	CMD_ACTIONFB_MINEROCK				= 109,		// erc				[end, end2]
+	CMD_ACTIONFB_RAISEITEM				= 110,		// pne 				[end]
+	CMD_ACTIONFB_RESTRAINEDSTRUGGLE		= 111,		// ,pne 			[end, end2]
+	CMD_ACTIONFB_RESTRAINSELF			= 112,		// erc,cro 			[end]
+	CMD_ACTIONFB_ASSEMBLE				= 113,		// erc,cro			[end, end2]
+	CMD_ACTIONFB_DISASSEMBLE			= 114,		// erc,cro			[end, end2]
+	CMD_ACTIONFB_FLAME_REPAIR			= 115,		// erc, cro	
+	CMD_ACTIONFB_TURN_VALVE				= 116,		// erc
+	CMD_ACTIONFB_SET_ALARM				= 250,		// erc,cro			??not sure
+	CMD_ACTIONFB_SHOVEL_DIG		     	= 117,		// cro			    [end, end2]
+	CMD_ACTIONFB_VEHICLE_PUSH			= 118,		// erc
+	CMD_ACTIONFB_PATCHING_TIRE			= 119,		// cro              [end]
+	CMD_ACTIONFB_PATCHING_DUCTTAPE		= 120,		// cro              [end]
+	CMD_ACTIONFB_PATCHING_SEWING		= 121,		// cro              [end]
+	CMD_ACTIONFB_PATCHING_LEATHER_SEWING_KIT		= 122,		// cro              [end]
+	CMD_ACTIONFB_SPLITTING_FIREWOOD		= 123,		// cro              [end]
+	CMD_ACTIONFB_BREAKING_STICK		    = 124,		// cro              [end]
+	CMD_ACTIONFB_CLEANING_WEAPON	    = 125,		// cro              [end]
+	
+	// onetime 
+	CMD_ACTIONFB_PICKUP_HANDS			= 500,		// pne
+	CMD_ACTIONFB_PICKUP_INVENTORY		= 501,		// pne
+	CMD_ACTIONFB_LICKBATTERY			= 502,		// pne
+	CMD_ACTIONFB_LIGHTFLARE				= 503,		// pne
+	CMD_ACTIONFB_LITCHEMLIGHT			= 504,		// pne
+	CMD_ACTIONFB_UNPINGRENAGE			= 505,		// pne
+	CMD_ACTIONFB_ITEM_ON				= 506,		// pne
+	CMD_ACTIONFB_ITEM_OFF				= 507,		// pne
+	CMD_ACTIONFB_HANDCUFFTARGET			= 508,		// erc,cro
+	CMD_ACTIONFB_MORPHINE				= 509,		// cro
+	CMD_ACTIONFB_INJECTION				= 510,		// cro
+	CMD_ACTIONFB_INJECTIONTARGET		= 511,		// erc,cro
+	CMD_ACTIONFB_DRINKSIP				= 512,		// cro
+	CMD_ACTIONFB_CLEANHANDSBOTTLE		= 513,		// pne
+	CMD_ACTIONFB_OPENITEM_ONCE			= 514,		// pne
+	CMD_ACTIONFB_POKE					= 515,		// cro
+	CMD_ACTIONFB_ATTACHSCOPE			= 516,		// pne
+	CMD_ACTIONFB_ATTACHBARREL			= 517,		// pne
+	CMD_ACTIONFB_RESTRAIN				= 518,		// erc,cro,pne
+	CMD_ACTIONFB_PICKUP_HEAVY			= 519,		// erc
+	CMD_ACTIONFB_PRESS_TRIGGER			= 526,		// pne
+	CMD_ACTIONFB_RAISE_FLAG				= 600,		// erc?
+	CMD_ACTIONFB_LOWER_FLAG				= 601,		// erc?
+	CMD_ACTIONFB_STOP_ALARM				= 251,
+	CMD_ACTIONFB_EAT_PILL				= 527,      // pne
+	CMD_ACTIONFB_EAT_TABLET				= 528,      // pne
+	CMD_ACTIONFB_HEATPACK			    = 529,      // pne
+
+	CMD_ACTIONFB_DROPITEM_HANDS		= 900,			// pne, pne back
+	
+	    //! ---------------------------------------------------------
+    //! ---------------------- TRAILER --------------------------
+    //! ---------------------------------------------------------
+    CMD_TRAILER_MASK 	 				= 3006,
+	CMD_TRAILER_MASK_02 	 			= 3007,
+	
+    
+    //! ---------------------------------------------------------
+    //! ---------------------- VEHICLES -------------------------
+    //! ---------------------------------------------------------
+	
+	// looping actions
+	CMD_ACTIONMOD_STARTENGINE			= 300,    		// [end]
+	CMD_ACTIONMOD_TOOTHORN				= 301,    		// [end]
+	
+	// onetime actions
+	CMD_ACTIONMOD_DRIVER_DOOR_OPEN		= 400,
+	CMD_ACTIONMOD_DRIVER_DOOR_CLOSE		= 401,
+	CMD_ACTIONMOD_CODRIVER_DOOROPEN		= 402,
+	CMD_ACTIONMOD_CODRIVER_DOORCLOSE	= 403,
+	CMD_ACTIONMOD_STOPENGINE			= 404,
+	CMD_ACTIONMOD_SHIFTGEAR				= 405,
+	CMD_ACTIONMOD_HEADLIGHT				= 406,
+	
+	
+	
+    
+    //! ---------------------------------------------------------
+    //! ---------------------- GESTURES -------------------------
+    //! ---------------------------------------------------------
+    //! modifier (differential animation)
+    CMD_GESTUREMOD_GREETING				= 1000,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_POINT				= 1001,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_THUMB				= 1002,			// erc,cro	 	    [end, CMD_ACTIONINT_ACTION to switch to THUMB DOWN]
+    CMD_GESTUREMOD_THUMBDOWN			= 1003,			// erc,cro	 	    [end, CMD_ACTIONINT_ACTION to switch to THUMB UP]
+    CMD_GESTUREMOD_SILENCE				= 1004,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_TAUNT				= 1005,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_TIMEOUT				= 1006,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_HEART				= 1007,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_FACEPALM				= 1008,			// erc,cro   	    [end]
+    CMD_GESTUREMOD_WATCHING				= 1009,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_HOLD					= 1010,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_LISTENING			= 1011,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_POINTSELF			= 1012,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_LOOKATME				= 1013,			// erc,cro	 	    [end]
+    CMD_GESTUREMOD_OKAY					= 1014,			// erc,cro	 	    [end]
+
+    CMD_GESTUREMOD_RPS					= 10000,		// erc 	            [SPECIAL, SEE BELOW]
+
+    CMD_ACTIONINT_RPS_ROCK				= 10,	    	// RPS Internal Gesture
+    CMD_ACTIONINT_RPS_PAPER				= 11,			// RPS Internal Gesture
+    CMD_ACTIONINT_RPS_SCISSORS			= 12,			// RPS Internal Gesture
+	
+	
+    // onetime 		
+    CMD_GESTUREMOD_THROAT				= 1100,			// erc,cro
+    CMD_GESTUREMOD_CLAP					= 1101,			// erc,cro
+    CMD_GESTUREMOD_DABBING				= 1102,			// erc,cro
+    CMD_GESTUREMOD_MOVE					= 1103,			// erc,cro
+    CMD_GESTUREMOD_DOWN					= 1104,			// erc,cro
+    CMD_GESTUREMOD_COME					= 1105,			// erc,cro
+    CMD_GESTUREMOD_TAUNTKISS			= 1106,			// erc,cro
+    CMD_GESTUREMOD_TAUNTELBOW			= 1107,			// erc,cro
+    CMD_GESTUREMOD_TAUNTTHINK			= 1108,			// erc,cro
+    CMD_GESTUREMOD_NODHEAD				= 1109,			// erc,cro
+    CMD_GESTUREMOD_SHAKEHEAD			= 1110,			// erc,cro
+    CMD_GESTUREMOD_SHRUG				= 1111,			// erc,cro
+    CMD_GESTUREMOD_SURRENDER			= 1112,			// erc
+    CMD_GESTUREMOD_SURRENDERIN			= 1112,			// erc
+    CMD_GESTUREMOD_SURRENDEROUT			= 1113,			// erc
+	
+    //! --------------------------
+    //! fb (full body)
+    CMD_GESTUREFB_GREETING				= 1000,			// pne 	    [end]
+    CMD_GESTUREFB_POINT					= 1001,			// pne 	    [end]
+    CMD_GESTUREFB_THUMB					= 1002,			// pne 	    [end, CMD_ACTIONINT_ACTION to switch to THUMB DOWN]
+    CMD_GESTUREFB_THUMBDOWN				= 1003,			// pne 	    [end, CMD_ACTIONINT_ACTION to switch to THUMB UP]
+    CMD_GESTUREFB_SILENCE				= 1004,			// pne 	    [end]
+    CMD_GESTUREFB_TAUNT					= 1005,			// pne 	    [end]
+    CMD_GESTUREFB_TIMEOUT				= 1006,			// pne 	    [end]
+    CMD_GESTUREFB_HEART					= 1007,			// pne 	    [end]
+    CMD_GESTUREFB_WATCHING				= 1009,			// pne 	    [end]
+    CMD_GESTUREFB_HOLD					= 1010,			// pne 	    [end]
+    CMD_GESTUREFB_LISTENING				= 1011,			// pne 	    [end]
+    CMD_GESTUREFB_POINTSELF				= 1012,			// pne 	    [end]
+    CMD_GESTUREFB_LOOKATME				= 1013,			// pne 	    [end]
+    CMD_GESTUREFB_OKAY					= 1014,			// pne 	    [end]
+	
+    CMD_GESTUREFB_SALUTE				= 1050,			// erc              [end]
+    CMD_GESTUREFB_CAMPFIRE				= 1051,			// cro              [end]
+    CMD_GESTUREFB_LYINGDOWN				= 1052,			// cro              [end]
+    CMD_GESTUREFB_SOS					= 1053,			// erc              [end]
+    CMD_GESTUREFB_SITA					= 1054,			// cro              [end]
+    CMD_GESTUREFB_SITB					= 1055,			// cro              [end]
+    CMD_GESTUREFB_DABBING				= 1056,			// erc, cro         [end]
+    CMD_GESTUREFB_KNEEL					= 1057,			// cro   			[end]
+
+    // onetime 
+    CMD_GESTUREFB_THROAT				= 1100,			// pne
+    CMD_GESTUREFB_MOVE					= 1103,			// pne
+    CMD_GESTUREFB_DOWN					= 1104,			// pne
+    CMD_GESTUREFB_COME					= 1105,			// pne
+    CMD_GESTUREFB_TAUNTKISS				= 1106,			// pne
+    CMD_GESTUREFB_TAUNTTHINK			= 1108,			// pne
+    CMD_GESTUREFB_DANCE					= 1109,			// erc
+	CMD_GESTUREFB_NODHEAD				= 1110,			// pne
+	CMD_GESTUREFB_SHAKEHEAD				= 1111,			// pne
+    CMD_GESTUREFB_SHRUG					= 1112,			// pne
+    CMD_GESTUREFB_SURRENDER				= 1113,			// cro,pne
+    CMD_GESTUREFB_SURRENDERIN			= 1113,			// cro,pne
+    CMD_GESTUREFB_SURRENDEROUT			= 1114,			// cro,pne
+	
+
+    //! ---------------------------------------------------------
+    //! ---------------------- TRAILER --------------------------
+    //! ---------------------------------------------------------
+	CMD_TRAILER_WAKE_UP 				= 3000,
+	CMD_TRAILER_DEAD_BODY 				= 3001,
+	CMD_TRAILER_WALKIE_TALKIE 			= 3002,
+	CMD_TRAILER_WOUNDED 				= 3003,
+	CMD_TRAILER_WALK_AWAY 				= 3004,
+	CMD_TRAILER_DEAD 	 				= 3005,
+	
+    
+    //! ---------------------------------------------------------
+    //! ---------------------- SUICIDE --------------------------
+    //! ---------------------------------------------------------
+    //! fb (full body)
+    CMD_SUICIDEFB_1HD					= 2000,			// cro              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_FIREAXE				= 2001,			// erc              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_PITCHFORK				= 2002,			// erc              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_PISTOL				= 2003,			// cro              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_RIFLE					= 2004,			// cro              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_SWORD					= 2005,			// erc              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_UNARMED				= 2006,			// cro              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_WOODAXE				= 2007,			// erc              [end (cancel), end2 (commit)]
+    CMD_SUICIDEFB_SPEAR					= 2008,			// erc              [end (cancel), end2 (commit)]
+	CMD_SUICIDEFB_SICKLE				= 2009,			// cro              [end (cancel), end2 (commit)]
+	CMD_SUICIDEFB_HOE					= 2010,			// erc              [end (cancel), end2 (commit)]
+
+	// 32767 is totaly MAXIMAL index !!!!!
+
+};
+
+//! defined in C++
+enum DayZPlayerInstanceType
+{
+	INSTANCETYPE_SERVER,		//! server instance 
+	INSTANCETYPE_CLIENT,		//! client instance && controlled
+	INSTANCETYPE_REMOTE,		//! client instance && other player 
+	
+	INSTANCETYPE_AI_SERVER,				//! temporary!
+	INSTANCETYPE_AI_REMOTE,				//! temporary!
+	INSTANCETYPE_AI_SINGLEPLAYER,	//! temporary!
+}
+
+// *************************************************************************************
+// ! DayZPlayer - mainly for logic and camera 
+// *************************************************************************************
+class SDayZPlayerHeadingModel
+{
+	int 	m_iCamMode;				//[in]		- DayZPlayerConstants.CAMERAMODE_...
+	int 	m_iCurrentCommandID;    //[in]		- Current Main Command ID 
+	float 	m_fOrientationAngle;	//[in/out] 	- horizontal model orientation (where you face) - in rad
+	float 	m_fHeadingAngle;		//[in/out] 	- horizontal aim angle (where you aim) - in rad
+
+	//! cannot be created from script	
+	private void SDayZPlayerHeadingModel() {}
+	private void ~SDayZPlayerHeadingModel() {}
+}
+
+
+// *************************************************************************************
+// ! DayZPlayer - mainly for logic and camera 
+// *************************************************************************************
+class SDayZPlayerAimingModel
+{
+	int 	m_iCamMode;				//[in]		- DayZPlayerConstants.CAMERAMODE_... HEAD,EXTERNAL,WEAPON...
+	int 	m_iCurrentCommandID;    //[in]		- Current Main Command ID 
+	float	m_fCurrentAimX;			//[in]		- horizontal aim angle - in degrees
+	float	m_fCurrentAimY;			//[in]		- vertical aim angle - in degrees
+
+	float	m_fAimXCamOffset;		//[out] 	- camera (angle) offset modifier
+	float	m_fAimYCamOffset;		//[out] 	- camera (angle) offset modifier
+	float	m_fAimXHandsOffset;		//[out] 	- hands offset modifier
+	float	m_fAimYHandsOffset;		//[out] 	- hands offset modifier
+	float	m_fAimXMouseShift;		//[out]		- shift like mouse does
+	float	m_fAimYMouseShift;		//[out]		- shift like mouse does
+	float 	m_fCamPosOffsetX;		//[out]		- camera (position) offset modifier
+	float 	m_fCamPosOffsetY;		//[out]		- camera (position) offset modifier
+	float 	m_fCamPosOffsetZ;		//[out]		- camera (position) offset modifier
+
+	//! cannot be created from script
+	private void SDayZPlayerAimingModel() {}
+	private void ~SDayZPlayerAimingModel() {}
+}
+
+
+// *************************************************************************************
+// ! DayZPlayer - mainly for logic and camera 
+// *************************************************************************************
+class DayZPlayer extends Human
+{
+	const int 						SIMPLE_SELECTION_MELEE_RIFLE = 0;
+	const int 						SIMPLE_SELECTION_MELEE_MELEE = 1;
+	const int 						SIMPLE_SELECTION_SHOULDER_RIFLE = 2;
+	const int 						SIMPLE_SELECTION_SHOULDER_MELEE = 3;
+	
+	//! returns appropriate DayZPlayerType
+	proto native DayZPlayerType		GetDayZPlayerType();
+	
+	proto native DayZPlayerInstanceType 	GetInstanceType();
+
+	override string GetDebugName()
+	{
+		string res = super.GetDebugName();
+		res += ":" + typename.EnumToString(DayZPlayerInstanceType, GetInstanceType());
+		return res;
+	}
+
+	//! ---------------- heading model -------------------------
+	//! updated each tick
+	//! this can limit / extend player's heading (orientation) behaviour in game 
+	
+	bool			HeadingModel(float pDt, SDayZPlayerHeadingModel pModel);	
+
+
+	//! ---------------- aiming model -------------------------
+
+	//! updated each tick - this takes care about aiming 
+	
+	bool			AimingModel(float pDt, SDayZPlayerAimingModel pModel);
+
+	
+	
+	//! ---------------- command handling -------------------------
+
+	//! updated each tick 
+	//! handles: starting new commands, canceling, interruption 
+	//! pDt 						- delta time 
+	//! pCurrentCommandID 			- actually running command's ID 
+	//! pCurrentCommandFinished		- is current command finished 
+	
+	void 			CommandHandler(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished);	
+
+	//! ---------------- camera handling -------------------------
+
+	//! virtual 
+	//! returns registered camera type
+	//! pCameraMode - DayZPlayerConstants.CAMERAMODE_ ... 
+	int 			CameraHandler(int pCameraMode);
+
+
+	//! ---------------- camera additional functions -------------------------
+
+	//! gets current camera 
+	proto native 	DayZPlayerCamera		GetCurrentCamera();
+	
+	//! gets transform of current player camera
+	proto native 	void 					GetCurrentCameraTransform(out vector position, out vector direction, out vector rotation);
+
+	//! gets current camera 
+	proto native 	int 					GetCurrentPerItemCameraUD();
+	
+	proto native	bool					IsCameraBlending();
+
+
+	//! ---------------- animation graph functions -------------------------
+
+	//! functions usable only from CommandHandler
+	proto native void AnimCallCommand(int pCommand, int pParamInt, float pParamFloat);
+	proto native void AnimSetFloat(int pVar, float pFlt);
+	proto native void AnimSetInt(int pVar, int pInt);
+	proto native void AnimSetBool(int pVar, bool pBool);
+
+	//! ---------------- deterministic random numbers ------------------------
+
+	/**
+	\brief Random number in range of <0,0xffffffff> - !!! use this only during deterministic simulation (CommandHandler)
+	\return int value in range of <0,0xffffffff>
+	*/
+	proto native	int						Random();
+	
+	/**
+	\brief Random number in range of <0,pRange-1> - !!! use this only during deterministic simulation (CommandHandler)
+	@param pRange upper bounds of random number
+	\return int value in range of <0,pRange-1>
+	*/
+	proto native	float					RandomRange(int pRange);
+
+	/**
+	\brief Random number in range of <0,1> - !!! use this only during deterministic simulation (CommandHandler)
+	\return float value in range of <0,1>
+	*/
+	proto native	float					Random01();
+	
+	//! DEPRICATED(use GetEyeZoomLevel())  returns true if player is using EyeZoom, otherwise false
+	bool									IsEyeZoom();
+	//! returns eye zoom level, uses ECameraZoomType values
+	int 									GetEyeZoomLevel();
+	//! return true if shots are fired from camere, otherwise false
+	bool									IsShootingFromCamera();
+	//! return true if player is trying to hold breah, otherwise false
+	bool									IsHoldingBreath();
+	//! return true if player is currently performing FB gesture, otherwise false
+	bool									IsPerformingFBGesture();
+	//! return true if player is currently in 3pp, otherwise false
+	bool									IsInThirdPerson();
+
+	//! processes melee hit
+	proto native	MeleeCombatData			GetMeleeCombatData();
+
+	//! processes melee hit (uses component index)
+	proto native	void					ProcessMeleeHit(InventoryItem pMeleeWeapon, int pMeleeModeIndex, Object pTarget, int pComponentIndex, vector pHitWorldPos);
+	//! processes melee hit (uses component name)
+	proto native	void					ProcessMeleeHitName(InventoryItem pMeleeWeapon, int pMeleeModeIndex, Object pTarget, string pComponentName, vector pHitWorldPos);
+	
+	//! get reason for kickoff if available (server only)
+	proto native	EClientKicked			GetKickOffReason();
+	
+	//! ---------------- release controls -------------------------
+	proto native	void					ReleaseNetworkControls();
+	
+	//! ---------------- sync stuff -------------------------
+	
+	proto native	void					SendSyncJuncture(int pJunctureID, ParamsWriteContext ctx);
+	proto native	void					StoreInputForRemotes(ParamsWriteContext ctx);
+	
+	//! ---------------- sync shadow -------------------------
+
+
+	//! test if entity is DayZPlayer 
+	//static proto native bool				IsEntityDayZPlayer(IEntity pEntity);
+
+	//! 
+	proto native 	bool					DebugSyncShadowSetup(DayZPlayer pPlayer);
+	
+	void SetCurrentWaterLevel(float pWaterLevel);
+	float GetCurrentWaterLevel();
+
+
+	//! ---------------- camera additiona functions -------------------------
+	
+	
+	//! returns true if player is currently in one of the stances specified by stance mask 
+	//! IsPlayerInStance(STANCEMASK_ERECT | STANCEMASK_CROUCH) returns true if player is standing or crouching and not raised (aimed)
+	//! IsPlayerInStance(STANCEMASK_PRONE | STANCEIDX_RAISEDPRONE) returns true if player is in or in prone (both raised or nonraised)
+	//! IsPlayerInStance(STANCEMASK_ALL) returns true always 
+	//! IsPlayerInStance(STANCEMASK_RAISEDERECT | STANCEMASK_RAISEDCROUCH | STANCEMASK_RAISEDPRONE) returns true if player has raised hands
+	
+	// PSOVIS - move to native
+	bool		IsPlayerInStance(int pStanceMask)		// STANCEMASK_ERECT | STANCEMASK_CROUCH 
+	{
+		HumanMovementState		state = new HumanMovementState;
+		GetMovementState(state);
+		
+		bool ret = ((1 << state.m_iStanceIdx) & pStanceMask) != 0;
+		return ret;
+	}
+	
+	void OnInputForRemote (ParamsReadContext ctx) { }
+	void OnInputFromServer (ParamsReadContext ctx) { }
+	
+	//! ---------------- speaking anim -------------------------
+	
+	//! Check if player is using VoN to speak and return max amplitude from current samples
+	proto native	float	IsPlayerSpeaking();
+	
+	void UpdateDummyPlayerProxyVisibility(EntityAI shoulder, EntityAI melee)
+	{
+		/*EntityAI shoulder_item = FindAttachmentBySlotName("Shoulder");
+		EntityAI melee_item = FindAttachmentBySlotName("Melee");*/
+		bool boo;
+		
+		if ( melee )
+		{
+			boo = melee.IsWeapon();
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_MELEE_RIFLE,boo);
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_MELEE_MELEE,!boo);
+		}
+		if ( shoulder )
+		{
+			boo = shoulder.IsWeapon();
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_SHOULDER_RIFLE,boo);
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_SHOULDER_MELEE,!boo);
+		}
+	}
+	
+	//! ---------------- Forces player to stand up when swapping to heavy item -------------------------
+	void ForceStandUpForHeavyItems(notnull EntityAI item)
+	{
+		InventoryLocation il = new InventoryLocation;
+		if ( item.IsHeavyBehaviour() && IsPlayerInStance(DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_CROUCH))
+		{
+			HumanCommandMove cm = GetCommand_Move();
+			if (cm)
+			{
+				cm.ForceStance(DayZPlayerConstants.STANCEIDX_ERECT);
+			}
+		}
+	}
+	
+	void ForceStandUpForHeavyItemsSwap(notnull EntityAI item1, notnull EntityAI item2)
+	{
+		ForceStandUpForHeavyItems(item1);
+		ForceStandUpForHeavyItems(item2);
+	}
+	
+	void OnThrowingModeChange(bool change_to_enabled){}
+}
+
diff --git a/scripts/3_Game/DayZ/game.c b/scripts/3_Game/DayZ/game.c
new file mode 100644
index 0000000000000000000000000000000000000000..27a86688bd536b9768041aed468d460cdc6df0e7
--- /dev/null
+++ b/scripts/3_Game/DayZ/game.c
@@ -0,0 +1,9 @@
+// #include "Scripts/DayZGame.c"
+
+// ---------------------
+CGame CreateGame()
+{
+	//Print("CreateGame()");
+	g_Game = new DayZGame;
+	return g_Game;
+}
diff --git a/scripts/3_Game/DayZ/gameplay.c b/scripts/3_Game/DayZ/gameplay.c
new file mode 100644
index 0000000000000000000000000000000000000000..d03bb8a24c221c4580550e4f5d5b4978c5c30607
--- /dev/null
+++ b/scripts/3_Game/DayZ/gameplay.c
@@ -0,0 +1,1501 @@
+
+/** @file */
+
+/// tree traversal type, for more see http://en.wikipedia.org/wiki/Tree_traversal
+enum InventoryTraversalType
+{
+	PREORDER,
+	INORDER,
+	POSTORDER,
+	LEVELORDER
+};
+
+const int INDEX_NOT_FOUND = -1;
+//-----------------------------------------------------------------------------
+typedef Serializer ParamsReadContext;
+typedef Serializer ParamsWriteContext;
+
+/**
+\brief Class for sending RPC over network
+	@code
+		// example sending
+		void Send()
+		{
+			ScriptRPC rpc = new ScriptRPC();
+	
+			rpc.Write(645);
+			rpc.Write("hello");
+			
+			array<float> farray = {1.2, 5.6, 8.1};
+			rpc.Write(farray);
+	
+			rpc.Send(m_Player, ERPCs.RPC_TEST, true, m_Player.GetIdentity());
+		}
+
+		// example receive
+		void OnRPC(ParamsReadContext ctx)
+		{
+			int num;
+			string text;
+			array<float> farray;
+
+			ctx.Read(num);
+			ctx.Read(text);
+			ctx.Read(farray);
+		}
+	@endcode
+*/
+
+class JsonSerializer: Serializer
+{
+	void JsonSerializer() {}
+	void ~JsonSerializer() {}
+	
+	/**
+	\brief Script variable serialization to json string
+	@param variable_out script variable to be serialized to string
+	@param nice if the string should be formated for human readability
+	@param result from the serialization, output or error depending on the return value 
+	\return if the serialization was successful
+	@code
+		Data data;
+		string textOut; 
+		bool nice = false;
+		JsonSerializer js = new JsonSerializer();
+		bool ok = js.WriteToString(data, false, textOut);	
+	@endcode	
+	*/
+	proto bool WriteToString(void variable_out, bool nice, out string result);
+	
+	/**
+	\brief Json string deserialization to script variable
+	@param variable_in script variable to be deserialized from string
+	@param jsonString the input string
+	@param error from the deserialization. Is used only if the return value of the function is false
+	\return if the deserialization was successful
+	@code
+		// Example json
+		//  {
+		//    "i": 6,                                 // Int
+		//    "f": 3.5,                               // Float
+		//    "v": [1.1,2.2,3.3]                      // Vector3 is static array of size 3
+		//    "s": "string",                          // String
+		//    "subData": {                            // Object
+		//      "staticIArr": [9,8],                  // Static array (of ints)
+		//      "dynamicSArr": ["string1","string2"]  // Dynamic array (of strings)
+		//    },                                      //
+		//    "fSet": [12.3,14.7],                    // Set (of floats)
+		//    "ifMap": {                              // Map (of int, float), only valid key type is int, enum, string
+		//      "3": 4.5,							  // Map key has to be as string
+		//      "4": 5.5
+		//    }
+		//  }
+	
+		Data data = new Data;
+		string input = // valid json string;
+		string error;
+	    bool ok = js.ReadFromString(data, input, error);
+	@endcode	
+	*/
+	proto bool ReadFromString(void variable_in, string jsonString, out string error);
+};
+
+
+class ScriptRPC: ParamsWriteContext
+{
+	void ScriptRPC();
+	void ~ScriptRPC();
+	//! Reset internal buffer which stores written data. After Reset is callded, ScriptRPC can be used again as "new" ScriptRPC
+	proto native void Reset();
+	/**
+  \brief Initiate remote procedure call. When called on client, RPC is evaluated on server; When called on server, RPC is executed on all clients. 
+	Do not reset ScriptRPC internal state, so if is Send called multiple times in a row, it sends same (previously written) data again and again, until is Reset() called.
+	@param target object on which remote procedure is called, when NULL, RPC is evaluated by CGame as global
+	@param rpc_type user defined identification of RPC
+	@param recipient specified client to send RPC to. If NULL, RPC will be send to all clients (specifying recipient increase security and decrease network traffic)
+	*/
+	proto native void Send(Object target, int rpc_type, bool guaranteed,PlayerIdentity recipient = NULL);
+};
+
+class ScriptInputUserData : ParamsWriteContext
+{
+	void ScriptInputUserData ();
+	void ~ScriptInputUserData ();
+
+	proto native void Reset ();
+	proto native void Send ();
+
+	proto native bool CopyFrom(ParamsReadContext other);
+
+	proto native static bool CanStoreInputUserData ();
+};
+
+class ScriptReadWriteContext
+{
+	void ScriptReadWriteContext ();
+	void ~ScriptReadWriteContext ();
+
+	proto native ParamsWriteContext GetWriteContext ();
+	proto native ParamsReadContext GetReadContext ();
+};
+
+class ScriptRemoteInputUserData : ParamsWriteContext
+{
+	void ScriptRemoteInputUserData ();
+	void ~ScriptRemoteInputUserData ();
+
+	proto native void Reset ();
+};
+
+class ScriptJunctureData : ParamsWriteContext
+{
+	void ScriptJunctureData ();
+	void ~ScriptJunctureData ();
+
+	proto native void Reset ();
+};
+
+//-----------------------------------------------------------------------------
+class MeleeCombatData
+{
+	proto native int GetModesCount();
+
+	proto native owned string GetModeName(int index);
+
+	proto native owned string GetAmmoTypeName(int index);
+
+	proto native float GetModeRange(int index);
+	
+	private void MeleeCombatData();
+	private void ~MeleeCombatData();
+}
+
+//-----------------------------------------------------------------------------
+const string NullStringArray[1] = { "" };
+
+//-----------------------------------------------------------------------------
+//! Selection class
+class Selection
+{
+	private void Selection() {}
+	private void ~Selection() {}
+	
+	proto native owned string GetName();
+	proto native int GetVertexCount();
+	proto native int GetLODVertexIndex(int sel_vertex_index);
+
+	vector GetVertexPosition(LOD lod, int index)
+	{
+		int lodIndex = GetLODVertexIndex(index);
+		if (lodIndex == -1)
+		{
+			Error("Vertex doesn't exist");
+			return vector.Zero;
+		}
+		
+		return lod.GetVertexPosition(lodIndex);
+	}
+};
+
+//-----------------------------------------------------------------------------
+//! LOD class
+class LOD
+{
+	// standard(BI) LOD names in p3d
+	static const string NAME_GEOMETRY 		= "geometry";
+	static const string NAME_VIEW		 	= "view";
+	static const string NAME_FIRE	 		= "fire";
+	static const string NAME_MEMORY 		= "memory";
+	static const string NAME_ROADWAY 		= "roadway";
+
+	private void LOD() {}
+	private void ~LOD() {}
+	
+	proto native int GetSelectionCount();
+	proto native bool GetSelections(notnull out array<Selection> selections);
+
+	proto native vector GetVertexPosition(int vertex_index);
+	
+	proto native owned string GetName(Object myObject);
+	
+	Selection GetSelectionByName(string name)
+	{
+		array<Selection> selections = new array<Selection>;
+		GetSelections(selections);
+		
+		for (int i = 0; i < selections.Count(); ++i)
+		{
+			string selection_name = selections.Get(i).GetName();
+			selection_name.ToLower();
+			name.ToLower();
+			if (selection_name == name)
+			{
+				return selections.Get(i);
+			}
+		}
+		
+		return null;
+	}
+	
+	proto native int GetPropertyCount();
+	proto native owned string GetPropertyName(int index);
+	proto native owned string GetPropertyValue(int index);
+}
+
+class Plant extends Object
+{
+};
+
+/*
+class ParamEntry
+{
+	proto string GetString(string entryName);
+	proto int GetInt(string entryName);
+	proto float GetFloat(string entryName);
+	proto ref ParamEntry GetEntry(string entryName); 
+	proto int GetNumChildren();
+	proto ref ParamEntry GetNumChildren(int n);	
+};
+*/
+//-----------------------------------------------------------------------------
+	
+//-----------------------------------------------------------------------------
+class ProxyInventory extends ObjectTyped
+{
+};
+
+//-----------------------------------------------------------------------------
+class ProxySubpart extends Entity
+{
+};
+
+//-----------------------------------------------------------------------------
+// custom widgets
+//-----------------------------------------------------------------------------
+class ItemPreviewWidget: Widget
+{
+	proto native void SetItem(EntityAI object);
+	proto native EntityAI GetItem();
+	
+	proto native int GetView();
+	/**
+	* 0 - default boundingbox_min + boundingbox_max + invView
+	* 1 - boundingbox_min2 + boundingbox_max2 + invView2
+	* 2 - boundingbox_min3 + boundingbox_max3 + invView3
+	* ...	
+	*/
+	proto native void SetView(int viewIndex);
+
+	proto native void		SetModelOrientation(vector vOrientation);
+	proto native vector GetModelOrientation();
+	proto native void		SetModelPosition(vector vPos);
+	proto native vector GetModelPosition();
+	
+	proto native void SetForceFlipEnable(bool enable);
+	proto native void SetForceFlip(bool value);
+};
+
+//-----------------------------------------------------------------------------
+class PlayerPreviewWidget: Widget
+{
+	proto native void		UpdateItemInHands(EntityAI object);
+	proto native void		SetPlayer(DayZPlayer player);
+	//proto native void		SetPlayerType(string type);
+	proto native DayZPlayer	GetDummyPlayer();
+	
+	proto native void		Refresh();
+
+	proto native void		SetModelOrientation(vector vOrientation);
+	proto native vector		GetModelOrientation();
+	proto native void		SetModelPosition(vector vPos);
+	proto native vector		GetModelPosition();
+};
+
+//-----------------------------------------------------------------------------
+class HtmlWidget extends RichTextWidget
+{
+	proto native void LoadFile(string path);
+};
+
+//-----------------------------------------------------------------------------
+class MapWidget: Widget
+{
+	proto native void ClearUserMarks();
+	proto native void AddUserMark(vector pos, string text, int color /*ARGB*/, string texturePath);
+	proto native vector GetMapPos();
+	proto native void SetMapPos(vector worldPos);
+	proto native float GetScale();
+	proto native void SetScale(float scale);
+	proto native float GetContourInterval();
+	proto native float GetCellSize(float pLegendWidth);
+	proto native vector MapToScreen(vector worldPos);
+	proto native vector ScreenToMap(vector screenPos);
+};
+
+//-----------------------------------------------------------------------------
+//! Player description (base engine class)
+class PlayerIdentityBase : Managed
+{
+	//! ping range estimation
+	proto int GetPingAct();
+	//! ping range estimation
+	proto int GetPingMin();
+	//! ping range estimation
+	proto int GetPingMax();
+	//! ping range estimation
+	proto int GetPingAvg();
+
+	//! bandwidth estimation (in kbps)
+	proto int GetBandwidthMin();
+	//! bandwidth estimation (in kbps)
+	proto int GetBandwidthMax();
+	//! bandwidth estimation (in kbps)
+	proto int GetBandwidthAvg();
+	
+	//! nick (short) name of player
+	proto string GetName();
+	//! nick without any processing
+	proto string GetPlainName();
+	//! full name of player
+	proto string GetFullName();
+	//! unique id of player (hashed steamID, database Xbox id...) can be used in database or logs
+	proto string GetId();
+	//! plaintext unique id of player (cannot be used in database or logs)
+	proto string GetPlainId();
+	//! id of player in one session (is reused after player disconnects)
+	proto int GetPlayerId();
+	
+	//! get player
+	proto Man GetPlayer();
+
+	//! This is a C++ managed class, so script has no business managing the lifetime
+	private void PlayerIdentityBase();
+	private void ~PlayerIdentityBase();
+};
+
+//! The class that will be instanced (moddable)
+class PlayerIdentity : PlayerIdentityBase
+{
+
+}
+
+//-----------------------------------------------------------------------------
+const int PROGRESS_START = 0;
+const int PROGRESS_FINISH = 1;
+const int PROGRESS_PROGRESS = 2;
+const int PROGRESS_UPDATE = 3;
+
+//-----------------------------------------------------------------------------
+typedef int ChatChannel;
+
+//-----------------------------------------------------------------------------
+//! state, progress, title
+typedef Param3<int, float, string> ProgressEventParams;
+typedef Param1<string> ScriptLogEventParams;
+//! channel, from, text, color config class
+typedef Param4<int, string, string, string> ChatMessageEventParams;
+typedef Param1<int> ChatChannelEventParams;
+typedef Param1<int> SQFConsoleEventParams;
+
+//! Name, uid
+typedef Param2<string, string> ClientConnectedEventParams;
+//! PlayerIdentity, useDB, pos, yaw, preloadTimeout (= additional time in seconds to how long server waits for loginData)
+typedef Param5<PlayerIdentity, bool, vector, float, int> ClientPrepareEventParams;
+//! PlayerIdentity, PlayerPos, Top, Bottom, Shoe, Skin
+typedef Param3<PlayerIdentity, vector, Serializer> ClientNewEventParams; 
+//! PlayerIdentity, Man
+typedef Param2<PlayerIdentity, Man> ClientNewReadyEventParams; 
+//! PlayerIdentity, Man
+typedef Param2<PlayerIdentity, Man> ClientRespawnEventParams; 
+//! PlayerIdentity, Man
+typedef Param2<PlayerIdentity, Man> ClientReadyEventParams;
+//! PlayerIdentity, Man
+typedef Param2<PlayerIdentity, Man> ClientReconnectEventParams; 
+//! PlayerIdentity, Man, LogoutTime, AuthFailed
+typedef Param4<PlayerIdentity, Man, int, bool> ClientDisconnectedEventParams; 
+
+//! LoginTime
+typedef Param1<int> LoginTimeEventParams; 
+//! RespawnTime
+typedef Param1<int> RespawnEventParams; 
+//! Position
+typedef Param1<vector> PreloadEventParams; 
+//! Player
+typedef Param1<Man> LogoutCancelEventParams; 
+//! PlayerIdentity
+typedef Param1<PlayerIdentity> ConnectivityStatsUpdatedEventParams; 
+//! float
+typedef Param1<float> ServerFpsStatsUpdatedEventParams; 
+//! text message for line 1, text message for line 2 
+typedef Param2<string, string> LoginStatusEventParams; 
+//! logoutTime
+typedef Param1<int> LogoutEventParams; 
+//! Width, Height, Windowed
+typedef Param3<int, int, bool> WindowsResizeEventParams;
+//! listening, toggled
+typedef Param2<bool, bool> VONStateEventParams;
+//! player name, player id
+typedef Param2<string, string> VONStartSpeakingEventParams;
+//! player name, player id
+typedef Param2<string, string> VONStopSpeakingEventParams;
+//! world name
+typedef Param1<string> DLCOwnerShipFailedParams;
+//! Camera
+typedef Param1<FreeDebugCamera> SetFreeCameraEventParams;
+//! Duration
+typedef Param1<int> MPConnectionLostEventParams;
+//! EClientKicked, AdditionalInfo
+typedef Param2<int, string> MPConnectionCloseEventParams;
+//! Player, "Killer" (Beware: Not necessarily actually the killer, Client doesn't have this info)
+typedef Param2<DayZPlayer, Object> PlayerDeathEventParams;
+
+
+//-----------------------------------------------------------------------------
+
+//! no params
+const EventType	StartupEventTypeID;
+//! no params
+const EventType	WorldCleaupEventTypeID;
+
+//-----------------------------------------------------------------------------
+//! no params
+const EventType	MPSessionStartEventTypeID;
+	//! no params
+const EventType	MPSessionEndEventTypeID;
+	//! no params
+const EventType	MPSessionFailEventTypeID;
+	//! no params
+const EventType	MPSessionPlayerReadyEventTypeID;
+	//! params: \ref MPConnectionLostEventParams
+const EventType	MPConnectionLostEventTypeID;
+	//! params: \ref MPConnectionCloseEventParams
+const EventType	MPConnectionCloseEventTypeID;
+
+//-----------------------------------------------------------------------------
+//! params: \ref ProgressEventParams
+const EventType	ProgressEventTypeID;
+//! no params
+const EventType	NetworkManagerClientEventTypeID;
+//! no params
+const EventType	NetworkManagerServerEventTypeID;
+//! no params
+const EventType	DialogQueuedEventTypeID;
+	
+//-----------------------------------------------------------------------------
+//! params: \ref ChatMessageEventParams
+const EventType	ChatMessageEventTypeID;
+//! params: \ref ChatChannelEventParams
+const EventType	ChatChannelEventTypeID;
+	
+//-----------------------------------------------------------------------------	
+//! params: \ref ClientConnectedEventParams
+const EventType	ClientConnectedEventTypeID;
+//! params: \ref ClientPrepareEventParams
+const EventType	ClientPrepareEventTypeID;
+//! params: \ref ClientNewEventParams
+const EventType	ClientNewEventTypeID;
+//! params: \ref ClientNewReadyEventParams
+const EventType	ClientNewReadyEventTypeID;
+//! params: \ref ClientRespawnEventParams
+const EventType	ClientRespawnEventTypeID;
+//! params: \ref ClientReconnectEventParams
+const EventType	ClientReconnectEventTypeID;
+//! params: \ref ClientReadyEventParams
+const EventType	ClientReadyEventTypeID;
+//! params: \ref ClientDisconnectedEventParams
+const EventType	ClientDisconnectedEventTypeID;
+//! no params
+const EventType	ClientRemovedEventTypeID;
+	
+//-----------------------------------------------------------------------------
+//! params: \ref ConnectivityStatsUpdatedEventParams
+const EventType	ConnectivityStatsUpdatedEventTypeID;
+//! params: \ref ServerFpsStatsUpdatedEventParams
+const EventType	ServerFpsStatsUpdatedEventTypeID;
+//! params: \ref LogoutCancelEventParams
+const EventType	LogoutCancelEventTypeID;
+//! params: \ref LoginTimeEventParams
+const EventType	LoginTimeEventTypeID;
+//! params: \ref RespawnEventParams
+const EventType	RespawnEventTypeID;
+//! params: \ref PreloadEventParams
+const EventType	PreloadEventTypeID;
+//! params: \ref LogoutEventParams
+const EventType	LogoutEventTypeID;
+//! params: \ref LoginStatusEventParams
+const EventType	LoginStatusEventTypeID;
+	
+//-----------------------------------------------------------------------------
+//! no params
+const EventType	SelectedUserChangedEventTypeID;
+//! params: \ref ScriptLogEventParams
+const EventType	ScriptLogEventTypeID;
+	
+//-----------------------------------------------------------------------------
+//! params: \ref VONStateEventParams
+const EventType	VONStateEventTypeID;
+//! params: \ref VONStartSpeakingEventParams
+const EventType	VONStartSpeakingEventTypeID;
+//! params: \ref VONStopSpeakingEventParams
+const EventType	VONStopSpeakingEventTypeID;
+//! no params
+const EventType	VONUserStartedTransmittingAudioEventTypeID;
+//! no params
+const EventType	VONUserStoppedTransmittingAudioEventTypeID;
+//! no params
+	
+//-----------------------------------------------------------------------------
+const EventType	PartyChatStatusChangedEventTypeID;
+//! params: \ref DLCOwnerShipFailedParams
+const EventType	DLCOwnerShipFailedEventTypeID;
+//! params: \ref SetFreeCameraEventParams
+const EventType	SetFreeCameraEventTypeID;
+//! no params
+const EventType	ConnectingStartEventTypeID;
+//! no params
+const EventType	ConnectingAbortEventTypeID;
+//! params: \ref PlayerDeathEventParams
+const EventType	PlayerDeathEventTypeID;
+	
+//possible in engine events not accessable from script
+//ReloadShadersEvent
+//LoadWorldProgressEvent
+	
+//SignStatusEvent
+//SetPausedEvent
+//TerminationEvent
+//UserSettingsChangedEvent
+//StorageChangedEvent
+//BeforeResetEvent
+//AfterRenderEvent
+//AfterResetEvent
+//CrashLogEvent
+//ConsoleEvent
+
+class CursorIcons
+{
+	const string None 			= "";
+	const string Cursor			= "set:dayz_gui image:cursor";
+	const string CloseDoors 	= "set:dayz_gui image:close";
+	const string OpenDoors 		= "set:dayz_gui image:open";
+	const string OpenCarDoors 	= "set:dayz_gui image:open_car";
+	const string CloseCarDoors 	= "set:dayz_gui image:close_car";
+	const string EngineOff 		= "set:dayz_gui image:engine_off";
+	const string EngineOn 		= "set:dayz_gui image:engine_on";
+	const string LadderDown 	= "set:dayz_gui image:ladderdown";
+	const string LadderOff 		= "set:dayz_gui image:ladderoff";
+	const string LadderUp 		= "set:dayz_gui image:ladderup";
+	const string LootCorpse 	= "set:dayz_gui image:gear";
+	const string CloseHood 		= "set:dayz_gui image:close_hood";
+	const string OpenHood 		= "set:dayz_gui image:open_hood";
+	const string GetOut 		= "set:dayz_gui image:getout";
+	const string GetInCargo 	= "set:dayz_gui image:get_in_cargo";
+	const string Reload 		= "set:dayz_gui image:reload";
+	const string GetInDriver 	= "set:dayz_gui image:get_in_driver";
+	const string GetInCommander = "set:dayz_gui image:get_in_commander";
+	const string GetInPilot 	= "set:dayz_gui image:get_in_pilot";
+	const string GetInGunner 	= "set:dayz_gui image:get_in_gunner";
+};
+
+	
+
+// some defs for CGame::ShowDialog()
+/*
+const int DBB_NONE = 0;
+const int DBB_OK = 1;
+const int DBB_YES = 2;
+const int DBB_NO = 3;
+const int DBB_CANCEL = 4;
+
+const int DBT_OK = 0;		//just OK button
+const int DBT_YESNO = 1;	//Yes and No buttons
+const int DBT_YESNOCANCEL = 2; //Yes, No, Cancel buttons
+
+const int DMT_NONE = 0;
+const int DMT_INFO = 1;
+const int DMT_WARNING = 2;
+const int DMT_QUESTION = 3;
+const int DMT_EXCLAMATION = 4;
+*/
+
+proto native CGame GetGame();
+
+class Hud : Managed
+{
+	ref Timer m_Timer;
+	void Init(Widget hud_panel_widget) {}
+	void DisplayNotifier(int key, int tendency, int status) {}
+	void DisplayBadge(int key, int value) {}
+	void SetStamina(int value, int range) {}
+	void DisplayStance(int stance) {}
+	void DisplayPresence() {}
+	void ShowCursor() { }
+	void HideCursor() { }
+	void SetCursorIcon(string icon) { }
+	void SetCursorIconScale(string type, float percentage) { }
+	void SetCursorIconOffset(string type, float x, float y) { }
+	void SetCursorIconSize(string type, float x, float y) {	}
+	void ShowWalkieTalkie(bool show) { }
+	void ShowWalkieTalkie(int fadeOutSeconds) { }
+	void SetWalkieTalkieText(string text) { }
+	void RefreshQuickbar(bool itemChanged = false) {}
+	void Show(bool show) {}
+	void UpdateBloodName() {}
+	void SetTemperature(string temp);
+	void SetStaminaBarVisibility(bool show);
+	void Update(float timeslice){}
+	void ShowVehicleInfo();
+	void HideVehicleInfo();
+	void ToggleHeatBufferPlusSign(bool show);
+	
+	void ShowQuickbarUI(bool show);
+	void ShowQuickbarPlayer(bool show);
+	void ShowHudPlayer(bool show);
+	void ShowHudUI(bool show);
+	void ShowHudInventory(bool show);
+	void ShowQuickBar(bool show);
+	void UpdateQuickbarGlobalVisibility();
+	void ShowHud(bool show);
+	
+	void OnResizeScreen();
+
+	void SetPermanentCrossHair(bool show) {}
+	
+	void SpawnHitDirEffect(DayZPlayer player, float hit_direction,float intensity_max);
+	void SetConnectivityStatIcon(EConnectivityStatType type, EConnectivityStatLevel level);
+};
+
+//-----------------------------------------------------------------------------
+//! Mission class
+class Mission
+{
+	ScriptModule MissionScript;
+
+	ref array<vector> m_ActiveRefresherLocations;
+	
+	protected ref ScriptInvoker m_OnInputDeviceChanged = new ScriptInvoker();
+	protected ref ScriptInvoker m_OnInputPresetChanged = new ScriptInvoker();
+	protected ref ScriptInvoker m_OnInputDeviceConnected = new ScriptInvoker();
+	protected ref ScriptInvoker m_OnInputDeviceDisconnected = new ScriptInvoker();
+	protected ref ScriptInvoker m_OnModMenuVisibilityChanged = new ScriptInvoker();
+
+	private void ~Mission();
+	
+	void OnInit()	{}
+	void OnMissionStart() {}
+	void OnMissionFinish()	{}
+	void OnUpdate(float timeslice)
+	{
+#ifdef FEATURE_CURSOR
+		m_TimeStamp++;
+#endif
+	}
+	void OnKeyPress(int key) {}
+	void OnKeyRelease(int key) {}
+	void OnMouseButtonPress(int button){}
+	void OnMouseButtonRelease(int button){}
+	void OnEvent(EventType eventTypeId, Param params) {}
+	void OnItemUsed(InventoryItem item, Man owner) {}	
+	void AddDummyPlayerToScheduler(Man player){}
+	void Reset(){}
+	void ResetGUI(){}
+	void OnGameplayDataHandlerLoad(){}
+	
+	Hud GetHud()
+	{ 
+		return NULL;
+	}
+
+	ObjectSnapCallback GetInventoryDropCallback()
+	{
+		return NULL;
+	}
+	
+	bool IsPlayerDisconnecting(Man player);
+	
+	UIScriptedMenu	CreateScriptedMenu(int id) 
+	{ 
+		return NULL;
+	}
+	
+	UIScriptedWindow	CreateScriptedWindow(int id) 
+	{ 
+		return NULL;
+	}
+	
+	WorldData GetWorldData()
+	{
+		return NULL;
+	}
+	
+	WorldLighting GetWorldLighting()
+	{
+		return NULL;
+	}
+	
+	bool IsPaused() 
+	{ 
+		return false; 
+	}
+	
+	bool IsGame()
+	{
+		return false;
+	}
+	
+	bool IsServer()
+	{
+		return false;
+	}
+
+	void Pause() {}
+	void Continue() {}
+	
+	void AbortMission() {}
+
+	void CreateLogoutMenu(UIMenuPanel parent) {}
+	void StartLogoutMenu(int time) {}
+
+	void CreateDebugMonitor() {}
+	void HideDebugMonitor() {}
+	
+	void RefreshCrosshairVisibility() {}
+
+	void HideCrosshairVisibility() {}
+	
+	bool IsMissionGameplay()
+	{
+		return false;
+	}
+	
+	bool IsControlDisabled() {}
+	int GetControlDisabledMode() {}
+	
+	void PlayerControlEnable(bool bForceSupress); //!deprecated
+	void PlayerControlDisable(int mode); //!deprecated
+	
+	void RemoveActiveInputExcludes(array<string> excludes, bool bForceSupress = false);
+	void RemoveActiveInputRestriction(int restrictor);
+	void AddActiveInputExcludes(array<string> excludes);
+	void AddActiveInputRestriction(int restrictor);
+	void RefreshExcludes();
+	bool IsInputExcludeActive(string exclude);
+	bool IsInputRestrictionActive(int restriction);
+	void EnableAllInputs(bool bForceSupress = false);
+
+	void ShowInventory() {}
+	void HideInventory() {}
+	
+	void ShowChat() {}
+	void HideChat() {}
+	void UpdateVoiceLevelWidgets(int level) {}
+	
+	void HideVoiceLevelWidgets() {}
+	bool IsVoNActive() {}
+	void SetVoNActive(bool active) {}
+	
+	bool InsertCorpse(Man player)
+	{
+		return false;
+	}
+	
+	UIScriptedMenu GetNoteMenu() {};
+	void SetNoteMenu(UIScriptedMenu menu) {};
+	void SetPlayerRespawning(bool state);
+	void OnPlayerRespawned(Man player);
+	bool IsPlayerRespawning();
+	array<vector> GetActiveRefresherLocations();
+	
+	//! for client-side usage
+	void SetRespawnModeClient(int mode);
+	int GetRespawnModeClient()
+	{
+		return -1;
+	}
+	//! server-side
+	void SyncRespawnModeInfo(PlayerIdentity identity) {};
+	
+	ImageWidget GetMicrophoneIcon()
+	{
+		return null;
+	}
+	
+	WidgetFadeTimer GetMicWidgetFadeTimer() {}				
+	
+	GameplayEffectWidgets_base GetEffectWidgets() {}
+	
+	map<int,ImageWidget> GetVoiceLevelWidgets() {}
+	
+	map<int,ref WidgetFadeTimer> GetVoiceLevelTimers() {}
+	
+	ScriptInvoker GetOnInputDeviceChanged()
+	{
+		if (!m_OnInputDeviceChanged)
+		{
+			m_OnInputDeviceChanged = new ScriptInvoker;
+		}
+
+		return m_OnInputDeviceChanged;
+	}
+	
+	ScriptInvoker GetOnInputPresetChanged()
+	{
+		if (!m_OnInputPresetChanged)
+		{
+			m_OnInputPresetChanged = new ScriptInvoker;
+		}
+
+		return m_OnInputPresetChanged;
+	}
+	
+	ScriptInvoker GetOnInputDeviceConnected()
+	{
+		if (!m_OnInputDeviceConnected)
+		{
+			m_OnInputDeviceConnected = new ScriptInvoker;
+		}
+
+		return m_OnInputDeviceConnected;
+	}
+	
+	ScriptInvoker GetOnInputDeviceDisconnected()
+	{
+		if (!m_OnInputDeviceDisconnected)
+		{
+			m_OnInputDeviceDisconnected = new ScriptInvoker;
+		}
+
+		return m_OnInputDeviceDisconnected;
+	}
+	
+	ScriptInvoker GetOnModMenuVisibilityChanged()
+	{
+		if (!m_OnModMenuVisibilityChanged)
+		{
+			m_OnModMenuVisibilityChanged = new ScriptInvoker;
+		}
+
+		return m_OnModMenuVisibilityChanged;
+	}
+
+#ifdef FEATURE_CURSOR
+	int m_TimeStamp = 0;
+	int GetTimeStamp() { return m_TimeStamp; }
+#endif
+	
+#ifdef DEVELOPER
+	bool m_SuppressNextFrame = true;
+	void SetInputSuppression(bool state) {}
+	bool GetInputSuppression() {}
+#endif
+};
+
+// -------------------------------------------------------------------------
+
+class MenuData: Managed
+{
+	proto native int	GetCharactersCount();
+	proto native int 	GetLastPlayedCharacter();
+	//! Return Character person or null if character initialization failed (inventory load, or corrupted data)
+	proto native Man 	CreateCharacterPerson(int index);
+	
+	proto void 			GetLastServerAddress(int index, out string address);
+	proto native int 	GetLastServerPort(int index);
+	proto void 			GetLastServerName(int index, out string address);
+	
+	proto void 			RequestSetDefaultCharacterData();
+	proto bool			RequestGetDefaultCharacterData();
+	
+	//! Actual DefaultCharacter saving
+	void OnSetDefaultCharacter(ParamsWriteContext ctx)
+	{
+		if (!GetMenuDefaultCharacterDataInstance()/* || GetGame().IsServer()*/)
+		{
+			Error("MenuData | OnSetDefaultCharacter - failed to get data class!");
+			return;
+		}
+		
+		GetMenuDefaultCharacterDataInstance().SerializeCharacterData(ctx);
+		SaveCharactersLocal();
+	}
+	
+	//! Actual DefaultCharacter loading
+	bool OnGetDefaultCharacter(ParamsReadContext ctx)
+	{
+		if (!GetMenuDefaultCharacterDataInstance())
+		{
+			Error("MenuData | OnGetDefaultCharacter - failed to get data class!");
+			return false;
+		}
+		
+		if (GetMenuDefaultCharacterDataInstance().DeserializeCharacterData(ctx))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	proto void 			GetCharacterName(int index, out string name);
+	proto native void 	SetCharacterName(int index, string newName);
+	// save character is set as last played character 
+	proto native void 	SaveCharacter(bool localPlayer, bool verified);
+	proto native void 	SaveDefaultCharacter(Man character);
+	
+	//! Saves characters menu data to file
+	proto native void 	SaveCharactersLocal();
+	//! Loads characters menu data from file
+	proto native void 	LoadCharactersLocal();
+	proto native void 	ClearCharacters();
+	
+	MenuDefaultCharacterData GetMenuDefaultCharacterDataInstance()
+	{
+		return GetGame().GetMenuDefaultCharacterData();
+	}
+	
+	//proto native void	GetCharacterStringList(int characterID, string name, out TStringArray values);
+	//proto bool			GetCharacterString(int characterID,string name, out string value);
+};
+
+//holds 'default character' data
+class MenuDefaultCharacterData
+{
+	//const int MODE_SERVER = 0;
+	//const int MODE_CLIENT = 1;
+	
+	string 					m_CharacterName;
+	string 					m_CharacterType;
+	ref map<int,string> 	m_AttachmentsMap;
+	bool 					m_ForceRandomCharacter;
+	
+	void MenuDefaultCharacterData()
+	{
+		Init();
+	}
+	
+	void Init()
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			GetGame().GetMenuData().LoadCharactersLocal();
+		}
+		m_AttachmentsMap = new map<int,string>;
+	}
+	
+	void ClearAttachmentsMap()
+	{
+		m_AttachmentsMap.Clear();
+	}
+	
+	void SetDefaultAttachment(int slotID, string type)
+	{
+		m_AttachmentsMap.Set(slotID,type); //using 'Set' instead of 'Insert' for convenience
+	}
+	
+	void GenerateRandomEquip()
+	{
+		ClearAttachmentsMap();
+		
+		int slot_ID;
+		string attachment_type;
+		for (int i = 0; i < DefaultCharacterCreationMethods.GetAttachmentSlotsArray().Count(); i++)
+		{
+			slot_ID = DefaultCharacterCreationMethods.GetAttachmentSlotsArray().Get(i);
+			if (DefaultCharacterCreationMethods.GetConfigArrayCountFromSlotID(slot_ID) > 0)
+			{
+				attachment_type = DefaultCharacterCreationMethods.GetConfigAttachmentTypes(slot_ID).GetRandomElement();
+				//if (attachment_type != "")
+					SetDefaultAttachment(slot_ID,attachment_type);
+			}
+		}
+	}
+	
+	void EquipDefaultCharacter(Man player)
+	{
+		if (!player)
+		{
+			ErrorEx("WARNING - trying to equip non-existent object! | MenuDefaultCharacterData::EquipDefaultCharacter");
+			return;
+		}
+		
+		int slot_ID;
+		string attachment_type;
+		string current_attachment_type;
+		EntityAI current_attachment_object;
+		
+		for (int i = 0; i < m_AttachmentsMap.Count(); i++)
+		{
+			attachment_type = "";
+			current_attachment_type = "";
+			slot_ID = m_AttachmentsMap.GetKey(i);
+			attachment_type = m_AttachmentsMap.GetElement(i); //Get(i)
+			current_attachment_object = player.GetInventory().FindAttachment(slot_ID);
+			
+			if (current_attachment_object)
+			{
+				current_attachment_type = current_attachment_object.GetType();
+			}
+			if (current_attachment_type != attachment_type)
+			{
+				if (current_attachment_object)
+					g_Game.ObjectDelete(current_attachment_object);
+				if (attachment_type != "")
+					player.GetInventory().CreateAttachmentEx(attachment_type,slot_ID);
+			}
+		}
+	}
+	
+	//!serializes data into a param array to be used by "StoreLoginData(notnull array<ref Param> params);" 
+	void SerializeCharacterData(ParamsWriteContext ctx)
+	{
+		ctx.Write(m_CharacterType);
+		ctx.Write(m_AttachmentsMap);
+		ctx.Write(m_ForceRandomCharacter);
+		ctx.Write(m_CharacterName);
+		//DumpAttMapContents();
+	}
+	
+	bool DeserializeCharacterData(ParamsReadContext ctx)
+	{
+		if (!ctx.Read(m_CharacterType))
+			return false;
+		if (!ctx.Read(m_AttachmentsMap))
+			return false;
+		if (!ctx.Read(m_ForceRandomCharacter))
+			return false;
+		if (!ctx.Read(m_CharacterName))
+			return false;
+		
+		//DumpAttMapContents();
+		return true;
+	}
+	
+	void SetCharacterName(string name)
+	{
+		m_CharacterName = name;
+	}
+	
+	string GetCharacterName()
+	{
+		return m_CharacterName;
+	}
+	
+	void SetCharacterType(string character_type)
+	{
+		m_CharacterType = character_type;
+	}
+	
+	string GetCharacterType()
+	{
+		return m_CharacterType;
+	}
+	
+	void SetRandomCharacterForced(bool state)
+	{
+		m_ForceRandomCharacter = state;
+	}
+	
+	bool IsRandomCharacterForced()
+	{
+		return m_ForceRandomCharacter;
+	}
+	
+	map<int,string> GetAttachmentMap()
+	{
+		return m_AttachmentsMap;
+	}
+	
+	//DEBUG
+	void DumpAttMapContents()
+	{
+		int debugID;
+		string debugType;
+		Print("-----------");
+		Print("m_AttachmentsMap contents:");
+		for (int j = 0; j < m_AttachmentsMap.Count(); j++)
+		{
+			debugID = m_AttachmentsMap.GetKey(j);
+			debugType = m_AttachmentsMap.GetElement(j);
+			Print("index " + j);
+			Print("debugID: " + debugID);
+			Print("debugType: " + debugType);
+		}
+		Print("-----------");
+	}
+}
+
+class DefaultCharacterCreationMethods
+{
+	static ref array<int> m_AttachmentSlots = {
+		InventorySlots.SHOULDER,
+		InventorySlots.MELEE,
+		InventorySlots.HEADGEAR,
+		InventorySlots.MASK,
+		InventorySlots.EYEWEAR,
+		InventorySlots.GLOVES,
+		InventorySlots.ARMBAND,
+		InventorySlots.BODY,
+		InventorySlots.VEST,
+		InventorySlots.BACK,
+		InventorySlots.HIPS,
+		InventorySlots.LEGS,
+		InventorySlots.FEET
+	};
+	//conversion nescesssary for legacy reasons...
+	static ref array<string> m_ConfigArrayNames = {
+		"shoulder",
+		"melee",
+		"headgear",
+		"mask",
+		"eyewear",
+		"gloves",
+		"armband",
+		"top",
+		"vests",
+		"backpacks",
+		"hips",
+		"bottom",
+		"shoe"
+	};
+	
+	const static string m_Path = "cfgCharacterCreation";
+	
+	//! Returns config path of att. slot category, empty if undefined
+	static string GetPathFromSlotID(int slot_ID)
+	{
+		int idx = m_AttachmentSlots.Find(slot_ID);
+		string path = "" + m_Path + " " + m_ConfigArrayNames.Get(idx);
+		return path;
+	}
+	
+	//! How many 'default equip' types are listed in the corresponding array
+	static int GetConfigArrayCountFromSlotID(int slot_ID)
+	{
+		TStringArray types = new TStringArray;
+		GetGame().ConfigGetTextArray(GetPathFromSlotID(slot_ID),types);
+		return types.Count();
+	}
+	
+	//! Lists all configured types (if any) for the appropriate attachment
+	static array<string> GetConfigAttachmentTypes(int slot_ID)
+	{
+		TStringArray types = new TStringArray;
+		GetGame().ConfigGetTextArray(GetPathFromSlotID(slot_ID),types);
+		return types;
+	}
+	
+	//! Lists all customizable InventorySlots
+	static array<int> GetAttachmentSlotsArray()
+	{
+		return m_AttachmentSlots;
+	}
+	
+	//! for conversion of slot ID to config array's string
+	static array<string> GetConfigArrayNames()
+	{
+		return m_ConfigArrayNames;
+	}
+}
+
+//! C++ OptionAccessType
+enum OptionAccessType
+{
+	AT_UNKNOWN,
+	AT_OBJECTS_DETAIL,
+	AT_TEXTURE_DETAIL,
+	AT_HDR_DETAIL,
+	AT_FSAA_DETAIL,
+	AT_VSYNC_VALUE,
+	AT_ANISO_DETAIL,
+	AT_OPTIONS_FXAA_VALUE,
+	AT_OPTIONS_SW_VALUE,
+	AT_POSTPROCESS_EFFECTS,
+	AT_QUALITY_PREFERENCE,
+	AT_ATOC_DETAIL,
+	AT_AMBIENT_OCCLUSION,
+	AT_BLOOM,
+	AT_ROTATION_BLUR,
+	AT_SHADOW_DETAIL,
+	AT_OPTIONS_TERRAIN,
+	AT_OPTIONS_RESOLUTION,
+	AT_OPTIONS_GAMMA_SLIDER,
+	AT_OPTIONS_BRIGHT_SLIDER,
+	AT_OPTIONS_VISIBILITY_SLIDER,
+	AT_OPTIONS_OBJECT_VISIBILITY_SLIDER,
+	AT_OPTIONS_SHADOW_VISIBILITY_SLIDER,
+	AT_OPTIONS_DRAWDISTANCE_SLIDER,
+	AT_ASPECT_RATIO,
+	AT_OPTIONS_FIELD_OF_VIEW,
+	AT_OPTIONS_MUSIC_SLIDER,
+	AT_OPTIONS_EFFECTS_SLIDER,
+	AT_OPTIONS_VON_SLIDER,
+	AT_OPTIONS_MASTER_VOLUME,
+	AT_OPTIONS_HWACC,
+	AT_OPTIONS_EAX,
+	AT_OPTIONS_LANGUAGE,
+	AT_OPTIONS_RADIO,
+	AT_CONFIG_MOUSE_FILTERING,
+	AT_CONFIG_HEAD_BOB,
+	AT_OPTIONS_DISPLAY_MODE,
+	AT_OPTIONS_TERRAIN_SHADER,
+	AT_OPTIONS_AIM_HELPER,
+	AT_OPTIONS_MOUSE_AND_KEYBOARD,
+	AT_OPTIONS_PAUSE,
+	AT_OPTIONS_FLIPMODE,
+	AT_OPTIONS_VON_THRESHOLD_SLIDER,
+
+	AT_OPTIONS_MOUSE_YAXIS_INVERTED,
+	AT_OPTIONS_MOUSE_XAXIS,
+	AT_OPTIONS_MOUSE_YAXIS,
+	AT_OPTIONS_MOUSE_XAXIS_AIM_MOD,
+	AT_OPTIONS_MOUSE_YAXIS_AIM_MOD,
+
+	AT_OPTIONS_CONTROLLER_LS_XAXIS,
+	AT_OPTIONS_CONTROLLER_LS_YAXIS,
+	AT_OPTIONS_CONTROLLER_LS_XAXIS_VEHICLE_MOD,
+	AT_OPTIONS_CONTROLLER_RS_YAXIS_INVERTED,
+	AT_OPTIONS_CONTROLLER_RS_XAXIS,
+	AT_OPTIONS_CONTROLLER_RS_YAXIS,
+	AT_OPTIONS_CONTROLLER_RS_XAXIS_AIM_MOD,
+	AT_OPTIONS_CONTROLLER_RS_YAXIS_AIM_MOD,
+	AT_OPTIONS_VON_INPUT_MODE
+};
+
+//! Used for script-based game options. For anything C++ based, you would most likely use "Option Access Type" above
+enum OptionIDsScript
+{
+	OPTION_HUD = 100, //starts at 100 to avoid ID conflict with AT_
+	OPTION_CROSSHAIR,
+	OPTION_GAME_MESSAGES,
+	OPTION_ADMIN_MESSAGES,
+	OPTION_PLAYER_MESSAGES,
+	OPTION_QUICKBAR,
+	OPTION_SERVER_INFO,
+	OPTION_BLEEDINGINDICATION,
+	OPTION_CONNECTIVITY_INFO,
+	OPTION_HUD_BRIGHTNESS
+};
+
+// -------------------------------------------------------------------------
+/*
+// Option Access Control Type
+const int OA_CT_NUMERIC = 0;
+const int OA_CT_SWITCH = 1;
+const int OA_CT_LIST = 2;
+
+// Option Field of view constants
+const float OPTIONS_FIELD_OF_VIEW_MIN = 0.75242724772f;
+const float OPTIONS_FIELD_OF_VIEW_MAX = 1.30322025726f;
+*/
+
+class OptionsAccess: Managed
+{
+	//proto private void ~OptionsAccess();
+	//proto private void OptionsAccess();
+
+	/**
+	\brief AccessType of current option
+ 	\return AccessType
+	*/
+	proto native  int	GetAccessType();
+	
+	/**
+	\brief Current option controller type. OA_CT_NUMERIC = 0, OA_CT_SWITCH = 1, OA_CT_LIST = 2
+	\return ControlType
+	*/
+	proto native  int	GetControlType();
+	
+	/**
+	\brief Applies the option value if the value has changed and forgets the old value. This function has no effect on internal options, see OptionsAccess::Test
+	*/
+	proto native  void	Apply();
+	
+	/**
+	\brief Sets the option value internaly if the value has changed and wasnt set immediately upon change
+	*/
+	proto native  void	Test();
+	
+	/**
+	\brief Reverts the option value to old value if the value has changed and wasnt applied. This function has effect on internal options
+	*/	
+	proto native  void	Revert();
+	
+	/**
+	\brief If the option value is changed and not applied or reverted. Value can already be set internally if the value was changed immediately
+	\return 1 if the value is changed, 0 othewise
+	*/
+	proto native  int	IsChanged();
+	
+	/**
+	\brief If the option value will take effect only after the game is restarted
+	\return 1 if the value is changed, 0 othewise
+	*/
+	proto native  int	NeedRestart();
+	
+	/**
+	\brief If the value is changed internally immediately upon change.
+	\return 1 if the value is changed immediately, 0 othewise
+	*/
+	proto native  int	SetChangeImmediately();
+	//proto native  void	Initialize();
+	
+		/** \name Script Events API
+		Setting and getting of ScriptEvents
+	*/
+	//@{
+	
+	/**
+	\brief Set the events
+		\param events \p Managed The events to set
+	*/
+	private proto void SetScriptEvents(Managed events);
+	
+	/**
+	\brief Get the events
+		\return \p Managed If there is any events set, this will return them
+	*/
+	private proto Managed GetScriptEvents();
+	
+	/**
+	\brief Get the events
+		\return \p ParticleManagerEvents If there is any events set, this will return them so that additional functionality can be bound to them
+	*/
+	OptionsAccessEvents GetEvents()
+	{
+		return OptionsAccessEvents.Cast(GetScriptEvents());
+	}
+	
+	//@}
+	
+	
+	
+	/** \name Events
+		Events called from C++
+	*/
+	//@{
+	
+	void OnRevert()
+	{
+		GetEvents().Event_OnRevert.Invoke(this);
+	}
+	
+	//@}
+};
+
+//! Invokers for ParticleManager events
+class OptionsAccessEvents
+{
+	ref ScriptInvoker Event_OnRevert = new ScriptInvoker();
+}
+
+// -------------------------------------------------------------------------
+class NumericOptionsAccess extends OptionsAccess
+{
+	proto native  float	ReadValue();
+	proto native  void	WriteValue(float value);
+	proto native	float	GetMin();
+	proto native	float	GetMax();
+	proto native	float	GetDefault();
+};
+
+// -------------------------------------------------------------------------
+class ListOptionsAccess extends OptionsAccess
+{
+	proto native int	GetIndex();
+	proto native int	GetDefaultIndex();
+	proto native void	SetIndex(int index);
+	proto native int	GetItemsCount();
+	proto	void		GetItemText(int index, out string value);
+};
+
+// -------------------------------------------------------------------------
+class SwitchOptionsAccess extends OptionsAccess
+{
+	proto native void	Switch();
+	proto	void		GetItemText(out string value);
+	proto native int	GetIndex();
+	proto native int	GetDefaultIndex();
+};
+
+// -------------------------------------------------------------------------
+class GameOptions: Managed
+{	
+	/**
+	\brief Tests, Applies every option and save config with options to file, see OptionsAccess::Test, OptionsAccess::Apply
+	*/
+	proto native void	Apply();
+
+	/**
+	\brief Load config with options and Revert every option, see OptionsAccess::Revert
+	*/
+	proto native void	Revert();
+
+	/**
+	\brief Tests every option, see OptionsAccess::Test
+	*/
+	proto native void	Test();
+
+	/**
+ 	\brief Get option by index
+	@param index	
+ 	\return OptionsAccess
+ 	*/
+	proto native OptionsAccess GetOption(int index);
+	
+	/**
+ 	\brief Get option by AccessType
+	@param AccessType	
+ 	\return OptionsAccess
+ 	*/
+	proto native OptionsAccess GetOptionByType(int accessType);
+	
+	/**
+ 	\brief Registered options count
+ 	\return number of options
+ 	*/
+	proto native int GetOptionsCount();
+
+	/**
+	\brief Checks if any option is changed and needs restart, see OptionsAccess::IsChanged, OptionsAccess::NeedRestart
+	\return 1 if such option was found, 0 othewise
+	*/
+	proto native int NeedRestart();
+	
+	/**
+	\brief Checks if any option is changed, see OptionsAccess::IsChanged
+	\return 1 if such option was found, 0 othewise
+	*/
+	proto native int IsChanged();
+	
+	/**
+	\brief Initializes option values with the current users settings
+	*/
+	proto native void Initialize();
+};
+
+
+typedef Link<Object> OLinkT;
+
+/**
+ * @fn	SpawnEntity
+ * @brief	Spawns entity in known inventory location
+ *
+ * @param[in]	object_name \p string Name of item class
+ * @param[in] inv_loc \p Inventory Location of the spawned item
+ * @return		created entity in case of success, null otherwise
+ **/
+EntityAI SpawnEntity (string object_name, notnull InventoryLocation inv_loc, int iSetupFlags, int iRotation)
+{
+	return GameInventory.LocationCreateEntity(inv_loc, object_name,iSetupFlags,iRotation);
+}
+
+class Static : Object
+{
+};
+
+
+class PrtTest // Temporal class for toggling particles on guns
+{
+	static bool m_GunParticlesState = true;
+}
+
+// #include "Scripts/Classes/Component/_include.c"
diff --git a/scripts/3_Game/DayZ/human.c b/scripts/3_Game/DayZ/human.c
new file mode 100644
index 0000000000000000000000000000000000000000..a84081cb00b6265c79d29194ed5b1e3db9f6c797
--- /dev/null
+++ b/scripts/3_Game/DayZ/human.c
@@ -0,0 +1,1566 @@
+/** @file 
+
+  this file is interface to Human 
+
+*/
+
+enum HumanInputControllerOverrideType
+{
+	DISABLED,
+	ENABLED,		//! Permenantly active until DISABLED is passed
+	ONE_FRAME,		//! Will apply value and then DISABLED on subsequent CommandHandler call
+};
+
+// *************************************************************************************
+// ! HumanInputController - what we know about the input - human.GetInputController()
+// *************************************************************************************
+class HumanInputController
+{
+	//--------------------------------------------------------------
+
+	//! disables input controller
+	proto native void			SetDisabled(bool pState);
+	
+	//!	returns pSpeed 0,1..2..3 (idle, walk, run, sprint), local normalized direction vector 
+	proto void 					GetMovement(out float pSpeed, out vector pLocalDirection);
+
+	//! returns main heading angle (in radians)  -PI .. PI (this is world Y angle player is actualy pointing the camera)
+	proto native float 			GetHeadingAngle();
+
+	//! returns per tick aim change (in radians) 
+	proto native vector 		GetAimChange();
+
+	//! returns aim change (in radians) 
+	proto native vector 		GetAimDelta(float dt);
+
+	//! returns absolute tracking change (in radians) 
+	proto native vector 		GetTracking();
+
+	//! 1st/3rd person camera view
+	proto native bool			CameraViewChanged();
+
+	//! returns true if freelook is active
+	proto native bool			CameraIsFreeLook();
+	
+	//! reset freelook toggle
+	proto native void			ResetFreeLookToggle();
+
+	//! returns if camera is tracking (using IR device)
+	proto native bool			CameraIsTracking();
+
+	//! returns true if camera is on right/ false-left shoulder
+	proto native bool			Camera3rdIsRightShoulder();
+
+	//--------------------------------------------------------------
+
+	//! stance change button was pressed
+	proto native bool			IsStanceChange();
+
+	//! jump/climb action was pressed
+	proto native bool			IsJumpClimb();
+
+
+	//--------------------------------------------------------------
+
+	//! returns pressed SHIFT (melee evade)
+	proto native bool			IsMeleeEvade();
+
+	//! returns SHIFT down (melee fast/heavy) attack modifier
+	proto native bool			IsMeleeFastAttackModifier();
+
+	//! returns 0,1,2 = none,left,right
+	proto native int 			IsMeleeLREvade();
+
+	//! return weapon melee attack modifier
+	proto native bool			IsMeleeWeaponAttack();
+
+	//--------------------------------------------------------------
+
+	//! returns true if weapon click perfomed recently (before raise specifically)
+	proto native bool			WeaponWasRaiseClick();
+
+	//! returns true if weapon is raised
+	proto native bool			IsWeaponRaised();
+
+	//! returns true if weapon ADS mode
+	proto native bool			WeaponADS();
+
+	//! resets ADS mode to default
+	proto native void			ResetADS();
+	
+	//! returns true if change of throwing mode has been requested
+	proto native bool			IsThrowingModeChange();
+
+	//! resets Throwing mode
+	proto native void			ResetThrowingMode();
+	
+	//! returns true if Walk set to toggle
+	proto native bool			IsWalkToggled();
+
+	//--------------------------------------------------------------
+	
+	/**
+	*	\brief Deprecated; returns true if Use/Attack button is pressed (== true for multiple ticks). Synced.
+	*	\note Returns state of both 'UADefaultAction' and 'UAFire' input actions. Those are now separated in the methods below.
+	*/
+	proto native bool			IsUseButton();
+
+	/**
+	*	\brief Deprecated; returns true if Use/Attack button has just been pressed (== true for 1 tick only). Synced.
+	*	\note Returns state of both 'UADefaultAction' and 'UAFire' input actions. Those are now separated in the methods below.
+	*/
+	proto native bool			IsUseButtonDown();
+	
+		//! returns true if 'UADefaultAction' button is pressed (== true for multiple ticks). Synced.
+		proto native bool			IsUseItemButton();
+		//! returns true if 'UADefaultAction' button has just been pressed (== true for 1 tick only). Synced.
+		proto native bool			IsUseItemButtonDown();
+		
+		//! returns true if 'UAFire' button is pressed (== true for multiple ticks). Synced.
+		proto native bool			IsAttackButton();
+		//! returns true if 'UAFire' button has just been pressed (== true for 1 tick only). Synced.
+		proto native bool			IsAttackButtonDown();
+
+	//! single 'UADefaultAction' (== true for 1 tick only) + not raised
+	proto native bool			IsSingleUse();
+
+	//! Long click 'UADefaultAction' (== true for multiple ticks) + not raised
+	proto native bool			IsContinuousUse();
+
+	//! is start of cont. 'UADefaultAction' (== true for 1 tick only) + not raised
+	proto native bool			IsContinuousUseStart();
+
+	//! is end of cont. 'UADefaultAction' (== true for 1 tick only) + not raised
+	proto native bool			IsContinuousUseEnd();
+
+	//! is immediate action triggered - 1 tick only
+	//! Middle Button + not raised !
+	proto native bool			IsImmediateAction(); //TODO: revise, may be obsolete
+
+	//--------------------------------------------------------------
+	//! weapon handling 
+	
+	//! R - reloading / bolting  (== true for 1 tick only)
+	proto native bool			IsReloadOrMechanismSingleUse();
+
+	//! R - reloading / bolting - long press (== true for multiple ticks)
+	proto native bool			IsReloadOrMechanismContinuousUse();
+
+	//! R - reloading / bolting  (== true for 1 tick only)
+	proto native bool			IsReloadOrMechanismContinuousUseStart();
+
+	//! R - reloading / bolting - long press (== true for multiple ticks)
+	proto native bool			IsReloadOrMechanismContinuousUseEnd();
+
+	//! zooming 
+	proto native bool			IsZoom();
+
+	//! zooming toggle
+	proto native bool			IsZoomToggle();
+
+	//! reset zoom toggle
+	proto native void			ResetZoomToggle();
+
+	//! sight has been changed (in/out ironsights)
+	proto native bool			IsSightChange();
+
+	//!
+	proto native bool			IsZoomIn();
+
+	//!
+	proto native bool			IsZoomOut();
+
+  	//! fire mode has changed
+	proto native bool			IsFireModeChange();
+
+  	//! zeroing up
+	proto native bool			IsZeroingUp();
+
+  	//! zeroing down
+	proto native bool			IsZeroingDown();
+
+  	//! holding breath
+	proto native bool			IsHoldBreath();
+
+  	//! reset hold breath toggle
+	proto native void			ResetHoldBreath();
+
+	//--------------------------------------------------------------
+
+	//! returns 1..12 if F1 - F12 us pressed, 0 otherwise
+	//! Deprecated; slots no longer used, bindable input actions instead
+	proto native int 			IsGestureSlot();
+
+	//! returns true, if player controls other entity (vehicle for example)
+	proto native bool 			IsOtherController();
+
+	//--------------------------------------------------------------
+
+	//! returns 1..10 if some quickbar slot is used, 0 otherwise
+	proto native int 			IsQuickBarSlot();
+
+	//! single use (== true for 1 tick only)
+	//! quickbar + not raised !
+	proto native bool			IsQuickBarSingleUse();
+
+	//! Long click use (== true for multiple ticks)
+	//! long quickbar + not raised !
+	proto native bool			IsQuickBarContinuousUse();
+
+	//! is start of cont use (== true for 1 tick only)
+	//! long quickbar + not raised !
+	proto native bool			IsQuickBarContinuousUseStart();
+
+	//! is end of cont use (== true for 1 tick only)
+	//! long quickbar + not raised !	
+	proto native bool			IsQuickBarContinuousUseEnd();
+
+
+
+	//--------------------------------------------------------------
+	// LIMITS 
+
+	//! this disables sprint
+	proto native void 			LimitsDisableSprint(bool pDisable);
+
+	//! is sprint disabled
+	proto native bool			LimitsIsSprintDisabled();
+	
+
+	//--------------------------------------------------------------
+	// overrides
+
+	//!
+	proto native void 			OverrideMovementSpeed(HumanInputControllerOverrideType overrideType, float value);
+
+	//!
+	proto native void 			OverrideMovementAngle(HumanInputControllerOverrideType overrideType, float value);
+	
+	//!
+	proto native void 			OverrideAimChangeX(HumanInputControllerOverrideType overrideType, float value);
+
+	//!
+	proto native void 			OverrideAimChangeY(HumanInputControllerOverrideType overrideType, float value);
+
+	//!
+	proto native void 			OverrideMeleeEvade(HumanInputControllerOverrideType overrideType, bool value);
+
+	//!
+	proto native void 			OverrideRaise(HumanInputControllerOverrideType overrideType, bool value);
+
+	//! 
+	proto native void 			Override3rdIsRightShoulder(HumanInputControllerOverrideType overrideType, bool value);
+
+	//!
+	proto native void 			OverrideFreeLook(HumanInputControllerOverrideType overrideType, bool value);
+
+
+	//--------------------------------------------------------------
+
+	//! never created by script
+	private void HumanInputController()
+	{
+	}
+
+	//! never created by script
+	private void ~HumanInputController()
+	{
+	}	
+}
+
+
+// *************************************************************************************
+// ! HumanInputController - what we know about the input - human.GetInputController()
+// *************************************************************************************
+
+typedef 	int 	TAnimGraphCommand;
+typedef 	int 	TAnimGraphVariable;
+typedef 	int 	TAnimGraphTag;
+typedef 	int 	TAnimGraphEvent;
+
+//!
+class HumanAnimInterface
+{
+	private void HumanAnimInterface();
+	private void ~HumanAnimInterface();
+	
+	//-----------------------------------------------------
+	// Binds, returns -1 when error, otherwise if ok
+
+	//! returns command index - 	
+	proto native TAnimGraphCommand		BindCommand(string pCommandName);
+
+	//!
+	proto native TAnimGraphVariable 	BindVariableFloat(string pVariable);
+	proto native TAnimGraphVariable 	BindVariableInt(string pVariable);
+	proto native TAnimGraphVariable 	BindVariableBool(string pVariable);
+
+	//!
+	proto native TAnimGraphTag 			BindTag(string pTagName);
+
+	//!
+	proto native TAnimGraphEvent		BindEvent(string pEventName);
+}
+
+
+// *************************************************************************************
+// ! HumanCommandActionCallback - called as action callback 
+// *************************************************************************************
+class HumanCommandActionCallback
+{
+	private void HumanCommandActionCallback();
+	private void ~HumanCommandActionCallback();
+	
+	//! get the human this cb belongs to
+	proto native Human 		GetHuman();
+	
+	//! cancels action 
+	proto native 	void 	Cancel();
+
+	//! calls internal command 
+	//! pInternalCommandId is one of CMD_ACTIONINT_ ... 
+	proto native 	void 	InternalCommand(int pInternalCommandId);	
+	
+	//! enables character aligning to desired position and direction in world space
+	proto native	void	SetAligning(vector pPositionWS, vector pDirectionWS);
+
+	//! disables character aligning
+	proto native	void	ResetAligning();
+
+	//! enables calling cancel condition
+	//! default is disabled
+	//! when enabled - there must be a function "bool CancelCondition()" implemented
+	proto native 	void 	EnableCancelCondition(bool pEnable);
+
+	//! system implemented cancel condition (now raise or sprint cancels action)
+	proto native 	bool	DefaultCancelCondition();
+
+	//! registers animation event, when event registered and received - it sends OnAnimationEvent with registered id 
+	proto native void 		RegisterAnimationEvent(string pAnimationEventStr, int pId);
+
+	//! enables state change callback OnStateChange 
+	proto native void 		EnableStateChangeCallback();
+
+	//! example of implement of CancelCondition
+	//! returns true it it should CANCEL the action
+	//	bool				CancelCondition()	{ return false; }
+
+	//! undef state - not running anymore
+	static const int 	STATE_NONE 			= 0;
+
+	//! looped state 
+	static const int 	STATE_LOOP_IN 		= 1;
+	static const int 	STATE_LOOP_LOOP 	= 2;
+	static const int 	STATE_LOOP_END 		= 3;
+	static const int 	STATE_LOOP_END2		= 4;
+	static const int 	STATE_LOOP_LOOP2	= 5;
+	static const int 	STATE_LOOP_ACTION	= 6;
+
+	//! one time state 
+	static const int 	STATE_NORMAL 		= 7;
+
+	//! returns one of STATE_...
+	proto native int 	GetState();
+
+
+	//----------------------------------
+	// debug helper
+
+	//! returns debug string of current state 
+	static string	GetStateString(int pState)
+	{
+		switch (pState)
+		{
+		case STATE_NONE:			return "NONE";
+
+		case STATE_LOOP_IN:			return "LOOP_IN";
+		case STATE_LOOP_LOOP: 		return "LOOP_LOOP";
+		case STATE_LOOP_END:		return "LOOP_END";
+		case STATE_LOOP_END2:		return "LOOP_END2";
+		case STATE_LOOP_LOOP2:		return "LOOP_LOOP2";
+		case STATE_LOOP_ACTION:		return "LOOP_ACTION";
+
+			//! one time state 
+		case STATE_NORMAL:			return "ONE TIME";
+		}
+
+		return "Undef";
+	}
+
+
+	//! returns debug string of current state 
+	string	GetStateString()
+	{
+		return GetStateString(GetState());
+	}
+
+
+
+	//----------------------------------
+	// callbacks
+
+	//! calls animation event -> must be registered with RegisterAnimationEvent
+	void 	OnAnimationEvent(int pEventID)	{};
+
+	//! called ALWAYS! when action is finished (normal finish or cancel -> pCanceled)
+	void 	OnFinish(bool pCanceled)	{};		
+
+	//! called when enabled by EnableStateChangeCallback and state changes, call GetState() to get actual state 
+	void 	OnStateChange(int pOldState, int pCurrentState)			{};
+	
+	
+	// helps identify type of callback
+	bool IsUserActionCallback()
+	{
+		return false;
+	}
+	
+	bool IsGestureCallback()
+	{
+		return false;
+	}
+	
+	bool IsSymptomCallback()
+	{
+		return false;
+	}
+}
+
+
+// *************************************************************************************
+// ! HumanCommandMove
+// *************************************************************************************
+class HumanCommandMove
+{
+	private void HumanCommandMove() {}
+	private void ~HumanCommandMove() {}
+	
+	//! marks command to continue to combo 
+	//! -180 -90 0 90 180 angles of current movement 
+	proto native float 		GetCurrentMovementAngle();
+		
+	//! direction held on keyboard/controller
+	//! -180 -90 0 90 180 angles of input movement (no filtering, no postprocesses)
+	//! return false in idle states
+	proto bool				GetCurrentInputAngle(out float pAngle);
+
+	//! 0,1,2..3 idle, walk, run, sprint 
+	proto native float 		GetCurrentMovementSpeed();
+	
+	//! returns true if character is changing stance
+	proto native bool		IsChangingStance();
+	
+	//! return true if prone is on back
+	proto native bool		IsOnBack();
+	
+	//! return true if character barrel rolling
+	proto native bool		IsInRoll();
+	
+	//! return true if character transitions out of uncon
+	proto native bool		IsLeavingUncon();
+
+	//! return true if prone on back is chaning to crounch/stand
+	proto native bool		IsStandingFromBack();
+
+	//! marks command to continue to combo 
+	proto native void 		StartMeleeEvade();
+
+	//! marks command to continue to combo, pDirAngle specifies angle
+	proto native void 		StartMeleeEvadeA(float pDirAngle);
+
+	//! this is true when in melee evade
+	proto native bool		IsMeleeEvade();
+
+	//! this enables/disables block 
+	proto native void 		SetMeleeBlock(bool pBlock);
+
+	//!	pStanceIds is one of STANCEIDX_ERECT,STANCEIDX_CROUCH,STANCEIDX_PRONE,STANCEIDX_RAISEDERECT,STANCEIDX_RAISEDCROUCH,STANCEIDX_RAISEDPRONE,
+	//! or -1 when release the stance lock 
+	proto native void 		ForceStance(int pStanceIdx);
+
+
+	//!	pStanceIds is one of STANCEIDX_ERECT,STANCEIDX_CROUCH
+	//! this forces to stand up to required stance
+	proto native void 		ForceStanceUp(int pStanceIdx);
+
+
+	//! sets the multiplier for SHumanCommandMoveSettings::m_fRunSpringTimeout
+	proto native void		SetRunSprintFilterModifier(float value);
+
+	//! sets the multiplier for SHumanCommandMoveSettings::m_fDirFilterTimeout
+	proto native void		SetDirectionFilterModifier(float value);
+
+	//! sets the multiplier for SHumanCommandMoveSettings::m_fDirFilterSprintTimeout
+	proto native void		SetDirectionSprintFilterModifier(float value);
+
+	//! sets the multiplier for HumanItemBehaviorCfg::m_fMoveHeadingFilterSpan
+	proto native void		SetTurnSpanModifier(float value);
+
+	//! sets the multiplier for HumanItemBehaviorCfg::m_fMoveHeadingSprintFilterSpan
+	proto native void		SetTurnSpanSprintModifier(float value);
+	
+	//! sets water level (depth)
+	proto native void		SetCurrentWaterLevel(float value);
+}
+
+
+
+// *************************************************************************************
+// ! HumanCommandMelee - actual command melee running on 
+// *************************************************************************************
+class HumanCommandMelee
+{
+	private void HumanCommandMelee() {}
+	private void ~HumanCommandMelee() {}
+	
+	//! marks command to continue to combo 
+	proto native void 		ContinueCombo();
+
+	//! returns true if hit is in range, where person can continue to combo
+	proto native bool		IsInComboRange();
+
+	//! is true only once after hit event 
+	proto native bool		WasHit();
+
+	//! cancels command melee and goes to HumanCommandMove
+	proto native void		Cancel();
+	
+	//! is on back in prone stance?
+	proto native bool		IsOnBack();
+}
+
+
+// *************************************************************************************
+// ! HumanCommandMelee2 - actual command melee running on - Heavy/Light version
+// *************************************************************************************
+class HumanCommandMelee2
+{
+	private void HumanCommandMelee2() {}
+	private void ~HumanCommandMelee2() {}
+	
+	static const int HIT_TYPE_LIGHT = 0;
+	static const int HIT_TYPE_HEAVY	= 1;
+	static const int HIT_TYPE_FINISHER = 2; //liver stab
+	static const int HIT_TYPE_FINISHER_NECK = 3;
+	
+	//! marks command to continue to combo 
+	proto native void 		ContinueCombo(bool pHeavyHit, float pComboValue, EntityAI target = null, vector hitPos = vector.Zero);
+
+	//! returns true if hit is in range, where person can continue to combo
+	proto native bool		IsInComboRange();
+
+	//! is true only once after hit event 
+	proto native bool		WasHit();
+
+	//! cancels command melee and goes to HumanCommandMove
+	proto native void		Cancel();
+
+	//! is on back in prone stance?
+	proto native bool		IsOnBack();
+	
+	proto native int		GetComboCount();
+	
+	proto native int		GetCurrentHitType();
+	
+	proto native bool		IsFinisher();
+}
+
+
+// *************************************************************************************
+// ! HumanCommandFall - actually falling 
+// *************************************************************************************
+class HumanCommandFall
+{
+	private void HumanCommandFall() {}
+	private void ~HumanCommandFall() {}
+	
+	static const int LANDTYPE_NONE = 0;
+	static const int LANDTYPE_LIGHT	= 1;
+	static const int LANDTYPE_MEDIUM = 2;
+	static const int LANDTYPE_HEAVY = 3;
+
+	//! this is true when fall has physically landed - need to call Land after this is true
+	proto native bool	PhysicsLanded();
+	
+	//! end fall with land
+	proto native void 	Land(int pLandType);
+	
+	//! returns true if fall is in landing state 
+	proto native bool	IsLanding();
+}
+
+// *************************************************************************************
+// ! HumanCommandDeathCallback - called as action callback 
+// *************************************************************************************
+class HumanCommandDeathCallback
+{
+	//----------------------------------
+	// callbacks
+
+	void 	OnSimulationEnd()	{};		
+
+	//! 'OnSimulationEnd' is called before this
+	bool	ShouldSimulationBeDisabled() { return true; };
+}
+
+// *************************************************************************************
+// ! HumanCommandDeath - actually dying
+// *************************************************************************************
+class HumanCommandDeath
+{	
+	private void HumanCommandDeath() {}
+	private void ~HumanCommandDeath() {}
+}
+
+
+// *************************************************************************************
+// ! HumanCommandUnconscious - actually not dying
+// *************************************************************************************
+class HumanCommandUnconscious
+{	
+	private void HumanCommandUnconscious() {}
+	private void ~HumanCommandUnconscious() {}
+	
+	proto native void 	WakeUp(int targetStance = -1);
+	proto native bool	IsWakingUp();
+	
+	proto native bool	IsOnLand();
+	proto native bool	IsInWater();
+}
+
+
+// *************************************************************************************
+// ! HumanCommandDamage - additional damage 
+// *************************************************************************************
+class HumanCommandDamage
+{	
+	private void HumanCommandDamage() {}
+	private void ~HumanCommandDamage() {}
+}
+
+// *************************************************************************************
+// ! HumanCommandLadder ladder
+// *************************************************************************************
+class HumanCommandLadder
+{	
+	private void HumanCommandLadder() {}
+	private void ~HumanCommandLadder() {}
+	
+	//! returns true if on exiting point
+	proto native bool				CanExit();
+
+	//!
+	proto native void 				Exit();
+
+	//! debug draws any ladder 
+	proto native static bool		DebugDrawLadder(Building pBuilding, int pLadderIndex);
+	
+	//!
+	proto native static int 		DebugGetLadderIndex(string pComponentName); 
+
+	//! returns the safe logout position in worldspace 
+	//! the position is closest to the last possible exit point the player passed
+	proto native vector				GetLogoutPosition();
+}
+
+
+
+// *************************************************************************************
+// ! HumanCommandLadder ladder
+// *************************************************************************************
+class HumanCommandSwim
+{
+	private void HumanCommandSwim() {}
+	private void ~HumanCommandSwim() {}
+	
+	//!
+	proto native void 				StopSwimming();
+
+	//! returns water level from entity position 
+	//! returns in format (totalWaterDepth, characterDepht, 0)
+	proto native static vector 		WaterLevelCheck(Human pHuman, vector pPosition);
+}
+
+
+
+// *************************************************************************************
+// ! HumanCommandVehicle vehicle
+// *************************************************************************************
+class HumanCommandVehicle
+{
+	private void HumanCommandVehicle() {}
+	private void ~HumanCommandVehicle() {}
+	
+	proto native Transport			GetTransport();
+	proto native int				GetVehicleClass();
+	proto native int				GetVehicleSeat();
+	proto native void				SetVehicleType(int pVehicleType);
+	proto native int				GetVehicleType();
+	
+	proto native void				GetOutVehicle();
+	proto native void				KnockedOutVehicle();
+	proto native bool				ShouldBeKnockedOut();
+	proto native void				JumpOutVehicle();
+	proto native void				SwitchSeat(int pTransportPositionIndex, int pVehicleSeat);
+	proto native bool				IsGettingIn();
+	proto native bool				IsGettingOut();
+	proto native bool				IsSwitchSeat();
+	proto native bool				WasGearChange();
+	proto native void				SetClutchState(bool pState);
+	proto native void				KeepInVehicleSpaceAfterLeave(bool pState);
+
+	bool IsObjectIgnoredOnGettingOut(IEntity entity)
+	{
+		Object object;
+		if (!Class.CastTo(object, entity))
+		{
+			return true;
+		}
+
+		Transport transport = GetTransport();
+		if (!transport)
+		{
+			return true;
+		}
+
+		if (object == transport || object.GetParent() == transport)
+		{
+			return true;
+		}
+
+		return transport.IsIgnoredObject(object);
+	}
+}
+
+// *************************************************************************************
+// ! HumanCommandClimb
+// *************************************************************************************
+
+//! result from static test
+class SHumanCommandClimbResult
+{
+	bool		m_bIsClimb;	
+	bool		m_bIsClimbOver;
+	bool		m_bFinishWithFall;
+	bool		m_bHasParent;
+
+	float		m_fClimbHeight;
+	
+	vector 		m_ClimbGrabPoint;		//! grab point for climb && climb over (in local space of it's parent)
+	vector 		m_ClimbGrabPointNormal;	//! normal to grabpoint position (used for character orientation)
+	vector 		m_ClimbStandPoint;		//! where climb ends (in local space of it's parent)
+	vector 		m_ClimbOverStandPoint;	//! where climb over ends (in local space of it's parent)
+	
+	IEntity		m_GrabPointParent;		//! parent of grabpoint
+	IEntity		m_ClimbStandPointParent;
+	IEntity		m_ClimbOverStandPointParent;
+};
+
+
+//! state of climb command
+enum ClimbStates
+{
+	STATE_MOVE,
+	STATE_TAKEOFF,
+	STATE_ONTOP,
+	STATE_FALLING,
+	STATE_FINISH
+};
+
+//! command itself
+class HumanCommandClimb
+{
+	private void HumanCommandClimb() {}
+	private void ~HumanCommandClimb() {}
+	
+	//! returns the state of climb (enum value of ClimbStates);
+	proto native int				GetState();
+	
+	//! returns world space position of climbing grab point
+	proto native vector				GetGrabPointWS();
+	
+	//! returns world space position of landspot after climbing over
+	proto native vector				GetClimbOverStandPointWS();
+	
+	//! debug draws climb heauristics
+	//! pDebugDrawLevel viz DebugDrawClimb
+	proto native static bool		DoClimbTest(Human pHuman, SHumanCommandClimbResult pResult, int pDebugDrawLevel);
+
+	//! debug draws climb heauristics
+	//! int pLevel = 1 result, 2 - capsules (3 - all)
+	proto native static bool		DebugDrawClimb(Human pHuman, int pLevel);
+}
+
+
+
+
+// *************************************************************************************
+// ! HumanCommandFullBodyDamage - full body damages
+// *************************************************************************************
+class HumanCommandFullBodyDamage
+{	
+	private void HumanCommandFullBodyDamage() {}
+	private void ~HumanCommandFullBodyDamage() {}
+}
+
+
+//! actions
+enum WeaponActions
+{
+	INTERRUPT			= 15,
+	NONE                = -1,
+	RELOAD 				= 0,
+	MECHANISM			= 1,
+	CHAMBERING 			= 2,
+	CHAMBERING_LOADER 	= 3,
+	UNJAMMING			= 4,
+	FIRE 				= 5,
+	HIDE 				= 6,
+	SHOW 				= 7,
+	RELOAD_CLIP			= 8,
+};
+//! action types
+/// reload action types
+enum WeaponActionReloadTypes
+{
+	//! reload action types - rifles
+	RELOADRIFLE_MAGAZINE_BULLET 			= 0,   		// CMD_Reload_Magazine
+	RELOADRIFLE_NOMAGAZINE_BULLET 			= 1,
+	RELOADRIFLE_MAGAZINE_NOBULLET 			= 2,
+	RELOADRIFLE_NOMAGAZINE_NOBULLET 		= 3,
+	RELOADRIFLE_MAGAZINE_NOBULLET_OPEN		= 4,
+	RELOADRIFLE_NOMAGAZINE_NOBULLET_OPEN	= 5,
+
+	// reload action types - pistols
+	RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_UNCOCKED	= 8, // CMD_Reload_Magazine	
+	RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_UNCOCKED		= 9,
+	RELOADPISTOL_MAGAZINE_BULLET_CLOSED					= 10,   		
+	RELOADPISTOL_NOMAGAZINE_BULLET_CLOSED 				= 11,
+	RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_COCKED 		= 12,
+	RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_COCKED 		= 13,
+	RELOADPISTOL_NOMAGAZINE_NOBULLET_OPENED 			= 14,
+	RELOADPISTOL_MAGAZINE_NOBULLET_OPENED 				= 15,
+
+	RELOAD_MAGAZINE_DETACH 	= 16,
+	RELOADRIFLE_MAGAZINE_DETACH = 17,                    // CMD_Reload_Magazine
+
+	RELOADSRIFLE_MAGAZINE_BULLET 		= 20,   		// CMD_Reload_Magazine
+	RELOADSRIFLE_NOMAGAZINE_BULLET 		= 21,
+	RELOADSRIFLE_MAGAZINE_NOBULLET 		= 22,
+	RELOADSRIFLE_NOMAGAZINE_NOBULLET 	= 23,
+};
+
+enum WeaponActionReloadClipTypes
+{
+	RELOADRIFLE_CLIP_NOBULLET			= 0,
+	RELOADRIFLE_CLIP_BULLET				= 1,
+}
+
+enum WeaponActionMechanismTypes
+{
+	//! mechanism action types
+	MECHANISM_OPENED 	= 0,		// CMD_Reload_BoltAction
+	MECHANISM_CLOSED 	= 1,		
+	MECHANISM_SPECIAL 	= 2,	    // crossbow, magnum ... special mechanism action apropriate for custom weapons
+    MECHANISM_CLOSED_UNCOCKED 	= 3,	
+};
+
+enum WeaponActionChamberingTypes
+{
+	CHAMBERING_END = -1,
+	//! chambering action types
+	CHAMBERING_ONEBULLET_OPENED 				= 0,		// CMD_Reload_Chambering
+	CHAMBERING_ONEBULLET_CLOSED  				= 1,		//
+	CHAMBERING_ONEBULLET_CLOSED_UNCOCKED 		= 2,
+	CHAMBERING_ONEBULLET_UNIQUE_OPENED 			= 3,		//
+	CHAMBERING_ONEBULLET_UNIQUE_CLOSED			= 4,		//
+	CHAMBERING_TWOBULLETS_START					= 6,		//  plays one bullet, then second, then ends, when CHAMBERING_TWOBULLETS_END arise, it's canceled
+	CHAMBERING_TWOBULLETS_END					= 7,		//  - one bullet reload with closed mechanism		
+	CHAMBERING_STARTLOOPABLE_CLOSED				= 10,		// start loop chambering
+	CHAMBERING_ENDLOOPABLE						= 11,		// end loop chambering
+	CHAMBERING_STARTLOOPABLE_CLOSED_KEEP		= 12,		// start loop chambering and keep last bullet
+	CHAMBERING_STARTLOOPABLE_OPENED				= 13,		// 
+	
+	CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED	= 15,
+	CHAMBERING_STARTLOOPABLE_SHOTGUN_COCKED		= 16, 
+	
+	CHAMBERING_DOUBLE_1				= 17,
+	CHAMBERING_DOUBLE_2				= 18,
+	CHAMBERING_DOUBLE_3				= 19,
+	CHAMBERING_DOUBLE_4				= 20,
+	
+
+	CHAMBERING_CROSSBOW_OPENED			= 21,		// chambering crossbow
+	CHAMBERING_CROSSBOW_CLOSED			= 22,		// chambering crossbow
+	CHAMBERING_CROSSBOW_FULL			= 23,		// chambering crossbow
+};
+
+enum WeaponActionChamberingLoaderTypes
+{
+	CHAMBERINGLOADER_OPENED		= 0,		// CMD_Reload_ChamberingFast - one bullet reload with open mechanism
+	CHAMBERINGLOADER_CLOSED 	= 1,		//  - one bullet reload with closed mechanism
+};
+
+enum WeaponActionUnjammingTypes
+{
+	//! unjam action types
+	UNJAMMING_START 					= 1,		// CMD_Weapon_Jam - 0
+	UNJAMMING_END 						= 0,		// 1
+	UNJAMMING_INTERRUPT					= -1,
+};
+
+enum WeaponActionFireTypes
+{
+	FIRE_NORMAL 						= 0,
+	FIRE_LAST 							= 1,
+	FIRE_COCKED 						= 2,
+	FIRE_UNCOCKED 						= 3,
+	FIRE_DRY							= 4,
+	FIRE_JAM							= 5
+};
+
+enum WeaponHideShowTypes
+{ 
+	HIDESHOW_SLOT_2HDLEFTBACK = 0,
+	HIDESHOW_SLOT_RFLLEFTBACK = 1,
+	HIDESHOW_SLOT_1HDLEFTBACK = 2,
+	HIDESHOW_SLOT_2HDRIGHTBACK = 3,
+	HIDESHOW_SLOT_RFLRIGHTBACK = 4,
+	HIDESHOW_SLOT_1HDRIGHTBACK = 5,
+	HIDESHOW_SLOT_PISTOLBELT = 6,
+	HIDESHOW_SLOT_PISTOLCHEST = 7,
+	HIDESHOW_SLOT_KNIFEBACK = 8,
+	HIDESHOW_SLOT_INVENTORY = 9,
+};
+
+string WeaponActionTypeToString (int A, int AT)
+{
+	switch (A)
+	{
+		case WeaponActions.INTERRUPT: return "Weapon interrupt";
+		case WeaponActions.NONE: return "---";
+		case WeaponActions.RELOAD: return typename.EnumToString(WeaponActionReloadTypes, AT);
+		case WeaponActions.MECHANISM: return typename.EnumToString(WeaponActionMechanismTypes, AT);
+		case WeaponActions.CHAMBERING: return typename.EnumToString(WeaponActionChamberingTypes, AT);
+		case WeaponActions.CHAMBERING_LOADER: return typename.EnumToString(WeaponActionChamberingLoaderTypes, AT);
+		case WeaponActions.UNJAMMING: return typename.EnumToString(WeaponActionUnjammingTypes, AT);
+		case WeaponActions.FIRE: return typename.EnumToString(WeaponActionFireTypes, AT);
+		case WeaponActions.HIDE: return typename.EnumToString(WeaponHideShowTypes, AT);
+		case WeaponActions.SHOW: return typename.EnumToString(WeaponHideShowTypes, AT);
+	}
+	return "---";
+}
+
+//! events
+enum WeaponEvents
+{
+	ATTACHMENT_HIDE,
+	ATTACHMENT_SHOW,
+	BULLET_EJECT,
+	BULLET_HIDE,
+	BULLET_HIDE2,
+	BULLET_IN_CHAMBER,
+	BULLET_IN_MAGAZINE,
+	BULLET_SHOW,
+	BULLET_SHOW2,
+	CANUNJAM_END,
+	CANUNJAM_START,
+	COCKED,
+	MAGAZINE_ATTACHED,
+	MAGAZINE_DETACHED,
+	MAGAZINE_HIDE,
+	MAGAZINE_SHOW,
+	SLIDER_OPEN,
+	UNJAMMED,
+	HAMMER_UNCOCKED,
+	HAMMER_COCKED
+	CHANGE_HIDE,
+	CHANGE_SHOW,
+	CYLINDER_ROTATE,
+};
+
+
+// *************************************************************************************
+// ! HumanCommandWeapons - weapon handling
+// *************************************************************************************
+class HumanCommandWeapons
+{
+	private void HumanCommandWeapons() {}
+	private void ~HumanCommandWeapons() {}
+	
+	//!
+    proto native 	bool		IsActionFinished();
+	
+	//! returns -1 when no action is running or RELOAD,MECHANISM, .... 
+    proto native 	int 		GetRunningAction();
+
+	//! returns -1 when no action is running or appropriate action type
+    proto native 	int 		GetRunningActionType();
+
+	//! sets start and end animation position - f.e. for reload clip action
+	proto native 	void		SetActionProgressParams(float pStart, float pEnd);
+
+	//! start reload,mechanism,chambering,unjam ... 
+	proto native 	bool		StartAction(WeaponActions pAction, int pActionType);
+
+	//! register events 
+	proto native    void    	RegisterEvent(string pName, int pId);
+
+	//! return -1 when there is no event, otherwise it returns pId of event from animation 
+	proto native 	int 		IsEvent();
+	
+	//! returns true when clip visual change is needed for reload clip action
+	proto native 	bool 		IsInWeaponReloadBulletSwitchState();
+
+	//! sets head tilt to optics
+	proto native	void		SetADS(bool pState);
+
+	//! command for lifting weapon near obstacled (works only when weapon is raised)
+	proto native	void		LiftWeapon(bool pState);
+
+	//!
+	void 	RegisterDefaultEvents()
+	{
+		RegisterEvent("Weapon_AttachmentHide", WeaponEvents.ATTACHMENT_HIDE);
+		RegisterEvent("Weapon_AttachmentShow", WeaponEvents.ATTACHMENT_SHOW);
+		RegisterEvent("Weapon_BulletEject", WeaponEvents.BULLET_EJECT);
+		RegisterEvent("Weapon_BulletHide", WeaponEvents.BULLET_HIDE);
+		RegisterEvent("Weapon_BulletHide2", WeaponEvents.BULLET_HIDE2);
+		RegisterEvent("Weapon_BulletInChamber", WeaponEvents.BULLET_IN_CHAMBER);
+		RegisterEvent("Weapon_BulletInMagazine", WeaponEvents.BULLET_IN_MAGAZINE);
+		RegisterEvent("Weapon_BulletShow", WeaponEvents.BULLET_SHOW);
+		RegisterEvent("Weapon_BulletShow2", WeaponEvents.BULLET_SHOW2);
+		RegisterEvent("Weapon_CanUnjam_End", WeaponEvents.CANUNJAM_END);
+		RegisterEvent("Weapon_CanUnjam_Start", WeaponEvents.CANUNJAM_START);
+		RegisterEvent("Weapon_Cocked", WeaponEvents.COCKED);
+		RegisterEvent("Weapon_MagazineAttached", WeaponEvents.MAGAZINE_ATTACHED);
+		RegisterEvent("Weapon_MagazineDetached", WeaponEvents.MAGAZINE_DETACHED);
+		RegisterEvent("Weapon_MagazineHide", WeaponEvents.MAGAZINE_HIDE);
+		RegisterEvent("Weapon_MagazineShow", WeaponEvents.MAGAZINE_SHOW);
+		RegisterEvent("Weapon_SliderOpen", WeaponEvents.SLIDER_OPEN);
+		RegisterEvent("Weapon_Unjammed", WeaponEvents.UNJAMMED);
+		RegisterEvent("Weapon_Hammer_Uncocked", WeaponEvents.HAMMER_UNCOCKED);
+		RegisterEvent("Weapon_Hammer_Cocked", WeaponEvents.HAMMER_COCKED);
+		RegisterEvent("Weapon_Change_Hide", WeaponEvents.CHANGE_HIDE);
+		RegisterEvent("Weapon_Change_Show", WeaponEvents.CHANGE_SHOW);
+		RegisterEvent("Weapon_CylinderRotate", WeaponEvents.CYLINDER_ROTATE);
+	}
+
+	//----------------------------------------------------
+	// weapon init states
+
+
+	//! this sets to a weapon init state 
+	//! each weapon has a different weapon state 
+	//! those states are defined by animation set by AddItemInHandsProfileIK - in DayZPlayerCfgBase.c
+	//! each frame of animation is one init state 
+	proto native 	void 		SetInitState(int pFrameIndex);
+
+	//! just static version of SetInitState
+	proto native static void 	StaticSetInitState(Human pHuman, int pFrameIdx);
+
+
+	//----------------------------------------------------
+	// 
+
+	//! returns base aiming angle UD - without sway/offsets/...
+	proto native float 			GetBaseAimingAngleUD();
+
+	//! returns base aiming angle LR - without sway/offsets/...
+	proto native float 			GetBaseAimingAngleLR();
+
+
+	//----------------------------------------------------
+	// throwing
+	proto native void			SetThrowingMode(bool pState);
+	
+	proto native bool			IsThrowingMode();
+	
+	proto native void			ThrowItem(int throwType);
+	
+	proto native bool			WasItemLeaveHandsEvent();
+	
+	//----------------------------------------------------
+	// debug copy 
+
+	//! return -1 when there is no event, otherwise it returns pId of event from animation 
+	proto native 	int 		DebugIsEvent();
+
+	//! 
+	proto native 	void 		DebugResetEvents();
+}
+
+
+// *************************************************************************************
+// ! HumanCommandAdditives - additional damage 
+// *************************************************************************************
+class HumanCommandAdditives
+{
+	private void HumanCommandAdditives() {}
+	private void ~HumanCommandAdditives() {}
+
+	//! sets injury level 0..1, interpolate == false -> resets the value, otherwise it's interpolating towards the new value
+	proto native void 	SetInjured(float pValue, bool pInterpolate);
+
+	//! sets exhaustion level 0..1, interpolate == false -> resets the value, otherwise it's interpolating towards the new value
+	proto native void 	SetExhaustion(float pValue, bool pInterpolate);
+
+	//! sets talking
+	proto native void 	SetTalking(bool pValue);
+
+	//! starts modifier
+	proto native void	StartModifier(int pType);
+
+	//! cancels modifier
+	proto native void	CancelModifier();
+
+	//! is modifier active
+	proto native bool	IsModifierActive();
+}
+
+
+// *************************************************************************************
+// ! HumanMovementState - movement state, command, stance, movement, human.GetMovementState(movementState)
+// *************************************************************************************
+class HumanMovementState
+{
+	int 		m_CommandTypeId;	//! current command's id 
+	int 		m_iStanceIdx;		//! current stance (DayZPlayerConstants.STANCEIDX_ERECT, ...), only if the command has a stance
+	int 		m_iMovement;		//! current movement (0 idle, 1 walk, 2-run, 3-sprint), only if the command has a movement 
+	float		m_fLeaning;			//! leaning state (not all commands need to have all movements)
+	
+	int			m_LocalMovement = -1;
+	
+	//! 
+	bool		IsRaised()
+	{
+		return m_iStanceIdx >= DayZPlayerConstants.STANCEIDX_RAISEDERECT;
+	}
+	
+	//! 
+	bool		IsRaisedInProne()
+	{
+		return m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE;
+	}
+	
+	//! 
+	bool		IsInProne()
+	{
+		return m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE;
+	}
+
+	//! 
+	bool		IsInRaisedProne()
+	{
+		return m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE;
+	}	
+		
+	//! 
+	bool		IsLeaning()
+	{
+		return m_fLeaning != 0;
+	}
+}
+
+
+/**
+*\brief HumanCommandScript fully scriptable command
+*	\warning NON-MANAGED, will be managed by C++ once it is sent to the CommandHandler through Human.StartCommand_Script
+*	\note So ideally, it is best to set up the HumanCommandScript, not create any instances and start it through Human.StartCommand_ScriptInst
+*			In case an instance needs to be created, it needs manual deletion if not sent to the CommandHandler
+*			But deleting it while it is in the CommandHandler will cause crashes
+*/
+class HumanCommandScript
+{
+	//! constructor must have 1st parameter to be Human
+	// HumanCommandScript(Human pHuman);
+
+	//! virtual to be overridden
+	//! called when command starts
+	void 	OnActivate()	{ };
+
+	//! called when command ends
+	void 	OnDeactivate()	{ };
+
+
+	//---------------------------------------------------------------
+	// usable everywhere
+
+	//! this terminates human command script and shows CommandHandler(  ... pCurrentCommandFinished == true );
+	proto native void 	SetFlagFinished(bool pFinished);
+
+
+	//---------------------------------------------------------------
+	// PreAnim Update 
+
+	//! override this !
+	//! called before any animation is processed
+	//! here change animation values, add animation commands	
+	void 	PreAnimUpdate(float pDt);
+
+	//! function usable in PreAnimUpdate or in !!! OnActivate !!!
+	proto native 	void	PreAnim_CallCommand(int pCommand, int pParamInt, float pParamFloat);
+	proto native 	void	PreAnim_SetFloat(int pVar, float pFlt);
+	proto native 	void	PreAnim_SetInt(int pVar, int pInt);
+	proto native 	void	PreAnim_SetBool(int pVar, bool pBool);
+
+	//! sets character rotation (heading)
+	proto native 	void 	PreAnim_SetFilteredHeading(float pYawAngle, float pFilterDt, float pMaxYawSpeed);
+
+	//---------------------------------------------------------------
+	// PrePhys Update 
+
+	//! override this !
+	//! after animation is processed, before physics is processed
+	void 	PrePhysUpdate(float pDt);
+
+	//! script function usable in PrePhysUpdate
+	proto native 	bool	PrePhys_IsEvent(int pEvent);
+	proto native 	bool	PrePhys_IsTag(int pTag);
+	proto native 	bool	PrePhys_GetTranslation(out vector pOutTransl);		// vec3 in local space !
+	proto native 	bool	PrePhys_GetRotation(out float pOutRot[4]);         	// quaternion in local space !
+	proto native 	void	PrePhys_SetTranslation(vector pInTransl); 			// vec3 in local space !
+	proto native 	void	PrePhys_SetRotation(float pInRot[4]);				// quaternion in local space !
+
+	//---------------------------------------------------------------
+	// PostPhys Update 
+
+	//! override this !
+	//! final adjustment of physics state (after physics was applied)
+	//! returns true if command continues running / false if command should end (or you can use SetFlagFinished(true))
+	bool	PostPhysUpdate(float pDt);
+
+	//! script function usable in PostPhysUpdate
+	proto native 	void	PostPhys_GetPosition(out vector pOutTransl);		//! vec3 in world space
+	proto native 	void	PostPhys_GetRotation(out float pOutRot[4]);        	//! quaternion in world space
+	proto native 	void	PostPhys_SetPosition(vector pInTransl);				//! vec3 in world space
+	proto native 	void	PostPhys_SetRotation(float pInRot[4]);				//! quaternion in world space
+	proto native 	void	PostPhys_LockRotation();							//! do not process rotations !
+}
+
+//! used in script-side identification of animation commands on human (swim, fall, move...)
+enum HumanMoveCommandID
+{
+	None = 0,
+	CommandMove = 1,
+	CommandMelee = 2,
+	CommandMelee2 = 4,
+	CommandFall = 8,
+	CommandClimb = 16,
+	CommandDeath = 32,
+	CommandUnconscious = 64,
+	CommandDamageFullbody = 128,
+	CommandDamageAdditive = 256,
+	CommandLadder = 512,
+	CommandSwim = 1024,
+	CommandVehicle = 2048,
+	CommandActionFullbody = 4096,
+	CommandActionAdditive = 8192
+}
+
+// *************************************************************************************
+// ! Human - human script interface 
+// *************************************************************************************
+class Human extends Man
+{
+
+	//! gets human transform in World Space
+	proto native	void 		GetTransformWS(out vector pTm[4]);
+	
+	//! makes test if there's enough space for character's collider assuming that character can be pushed away from obstacle - usable for checking if character is in some tight space
+	proto native	bool		CheckFreeSpace(vector localDir, float distance, bool useHeading, vector posOffset = vector.Zero, float xzScale = 1.0);
+
+	//! makes test if character can physically move in given direction - length of dir means distance, returns distance fraction
+	proto			float		CollisionMoveTest(vector dir, vector offset, float xzScale, IEntity ignoreEntity, out IEntity hitEntity, out vector hitPosition, out vector hitNormal);
+
+	//---------------------------------------------------------
+	// link/unlink to/from local space
+	proto native	void		LinkToLocalSpaceOf(notnull IEntity child, vector pLocalSpaceMatrix[4]);
+	proto native	void		UnlinkFromLocalSpace();
+
+	//---------------------------------------------------------
+	// bone transforms 
+
+	//! returns bone index for a name (-1 if pBoneName doesn't exist)
+	proto native 	int 		GetBoneIndexByName(string pBoneName);
+
+	
+	//! returns animation interface - usable in HumanCommandScript implementations 
+	proto native 	HumanAnimInterface 	GetAnimInterface();
+
+	//---------------------------------------------------------
+	// physic props
+		
+	//! returns true if physics controller is falling 
+	proto native 	bool		PhysicsIsFalling(bool pValidate);
+
+	//! outs pVelocity - linear velocity of PHYSICS CONTROLLER 
+	proto native 	void 		PhysicsGetVelocity(out vector pVelocity);
+
+	proto native	void		PhysicsEnableGravity(bool pEnable);
+
+	proto native	bool		PhysicsIsSolid();
+	proto native	void		PhysicsSetSolid(bool pSolid);
+
+	//! Sets and synchronize interaction layers 'RAGDOLL' and 'RAGDOLL_NO_CHARACTER' to prevent body stacking and players going through dead creatures
+	proto native	void		PhysicsSetRagdoll(bool pEnable);
+
+	//---------------------------------------------------------
+	// controller 
+			
+	//! returns human input controller
+	proto native 	HumanInputController	GetInputController();
+
+	//---------------------------------------------------------
+	// item accessor
+
+	proto native 	HumanItemAccessor		GetItemAccessor();
+
+
+	//---------------------------------------------------------
+	// commands 
+
+	//! returns movement state (current command id, )
+	proto native 	void 	GetMovementState(HumanMovementState pState);
+
+	//! returns current command ID (see DayZPlayerConstants.COMMANDID_...)
+	proto native 	int 	GetCurrentCommandID();
+
+
+	//!----- MOVE -----
+
+	//! starts command - Move
+	proto native 	HumanCommandMove			StartCommand_Move();
+
+	proto native 	HumanCommandMove			GetCommand_Move();
+
+	//!----- MELEE -----
+
+	//! starts command - melee
+	proto native 	HumanCommandMelee			StartCommand_Melee(EntityAI pTarget);
+
+	proto native 	HumanCommandMelee			GetCommand_Melee();
+
+	//! starts command - melee2
+	proto native 	HumanCommandMelee2			StartCommand_Melee2(EntityAI pTarget, int pHitType, float pComboValue, vector hitPos = vector.Zero);
+	
+	proto native 	HumanCommandMelee2			GetCommand_Melee2();
+
+
+	//!----- FALL -----
+
+	//! starts command - fall
+	//! pYVelocity <= 0 -> fall
+	//! pYVelocity > 0 -> jump
+	proto native 	HumanCommandFall			StartCommand_Fall(float pYVelocity);
+
+	//! 
+	proto native 	HumanCommandFall			GetCommand_Fall();
+
+
+	//!----- LADDER -----
+
+	//! starts command - fall
+	proto native 	HumanCommandLadder 			StartCommand_Ladder(Building pBuilding, int pLadderIndex);
+
+	proto native 	HumanCommandLadder 			GetCommand_Ladder();
+
+
+	//!----- LADDER -----
+
+	//! starts command - Swim
+	proto native 	HumanCommandSwim			StartCommand_Swim();
+
+	proto native 	HumanCommandSwim 			GetCommand_Swim();
+
+
+	//!----- VEHICLE -----
+
+	//! starts command - vehicle
+	proto native 	HumanCommandVehicle			StartCommand_Vehicle(Transport pTransport, int pTransportPositionIndex, int pVehicleSeat, bool fromUnconscious = false);
+
+	proto native 	HumanCommandVehicle			GetCommand_Vehicle();
+
+
+	//!----- CLIMB -----
+
+	//! starts command - climb
+	proto native 	HumanCommandClimb			StartCommand_Climb(SHumanCommandClimbResult pClimbResult, int pType);
+
+	proto native 	HumanCommandClimb			GetCommand_Climb();
+
+	//!----- Death -----
+
+	//! starts command - death
+	proto native 	HumanCommandDeathCallback	StartCommand_Death(int pType, float pDirection, typename pCallbackClass, bool pKeepInLocalSpaceAfterLeave = false);
+
+	proto native 	HumanCommandDeathCallback	GetCommand_Death();
+
+
+	//! starts command - unconscious
+	proto native 	HumanCommandUnconscious 	StartCommand_Unconscious(float pType);
+
+	proto native 	HumanCommandUnconscious		GetCommand_Unconscious();
+
+
+	//!----- FullBody Damages -----
+
+	//! starts fullbody damage 
+	// -> of type 0,...
+	// -> from direction (lback -180,left -90,0,righ 90,rightback 180)
+	proto native 	HumanCommandFullBodyDamage	StartCommand_Damage(int pType, float pDirection);
+
+	proto native 	HumanCommandFullBodyDamage	GetCommand_Damage();
+
+
+
+	//!----- ACTIONS ----- 
+
+	//! starts command - Action 
+	//! pStanceMask is mix of flags STANCEMASK_ERECT, ... 
+	proto native 	HumanCommandActionCallback 	StartCommand_Action(int pActionID, typename pCallbackClass, int pStanceMask);
+
+	//! is human is in command action - returns its callback, if current command is action 
+	proto native	HumanCommandActionCallback 	GetCommand_Action();
+
+	
+	//---------------------------------------------------------
+	// command modifiers
+
+	//!
+	proto native 	int 		GetCommandModifierCount();
+
+	//! returns COMMANDID_ .. type id of command modifier on index pIndex
+	proto native 	int 		GetCommandModifierID(int pIndex);	
+
+
+	//! default (always-on modifiers)
+
+	//! returns modifier for additives / small behaviours on human 
+	proto native 	HumanCommandAdditives		GetCommandModifier_Additives();
+
+	//! returns interface for handling weapons 
+	proto native 	HumanCommandWeapons			GetCommandModifier_Weapons();
+
+
+
+
+	// --- modifier/additive actions - played on COMMANDID_MOVE command
+
+	//! adds action command modifier, creates callback instance for you 
+	proto native 	HumanCommandActionCallback	AddCommandModifier_Action(int pActionID, typename pCallbackClass);
+
+	//! force remove - normally if action is ended or interrupted - this is not needed to call 
+	proto native 	void 						DeleteCommandModifier_Action(HumanCommandActionCallback pCallback);
+
+	//! returns callback for action if any is active, null if nothing runs 
+	proto native 	HumanCommandActionCallback	GetCommandModifier_Action();
+
+
+
+	//!--- modifier for light Damages 
+
+	//! starts additive damage 
+	// -> of type 0,...
+	// -> from direction (lback -180,left -90,0,righ 90,rightback 180)
+	proto native 	HumanCommandDamage			AddCommandModifier_Damage(int pType, float pDirection);
+
+	proto native 	void 						DeleteCommandModifier_Damage(HumanCommandDamage pDamage);
+
+	proto native 	HumanCommandDamage			GetCommandModifier_Damage();
+
+
+	//!--- SCRIPTED COMMANDS 
+
+	//! starts command - Action 
+	//! pStanceMask is mix of flags STANCEMASK_ERECT, ... 
+	proto native 	HumanCommandScript			StartCommand_Script(HumanCommandScript pHumanCommand);
+	proto native 	HumanCommandScript			StartCommand_ScriptInst(typename pCallbackClass);
+
+	//! is human is in command action - returns its callback, if current command is action 
+	proto native	HumanCommandScript			GetCommand_Script();
+
+
+
+	//---------------------------------------------------------
+	// debug info for Item Accessor
+
+
+	//! returns current item's class name
+	proto native   owned string  						DebugGetItemClass();
+
+	//! returns current item's class that is found in config
+	proto native   owned string  						DebugGetItemSuperClass();
+
+	//! returns current item's animation instance 
+	proto native   owned string  						DebugGetItemAnimInstance();
+	
+	
+	//---------------------------------------------------------
+	// helper functions for disabling simulation upon death
+	proto native	void StartDeath();
+	proto native	void ResetDeath();
+
+	proto native	void ResetDeathCooldown();
+	proto native	bool IsDeathProcessed();
+	proto native	bool IsDeathConditionMet();
+
+
+	//--------------------------------------------------------
+	// commands start/finish events
+	
+	void	OnCommandMoveStart();
+	void	OnCommandMoveFinish();
+
+	void	OnCommandMeleeStart();
+	void	OnCommandMeleeFinish();
+
+	void	OnCommandMelee2Start();
+	void	OnCommandMelee2Finish();
+
+	void	OnCommandFallStart();
+	void	OnCommandFallFinish();
+
+	void	OnCommandClimbStart();
+	void	OnCommandClimbFinish();
+
+	void	OnCommandDeathStart();
+	void	OnCommandDeathFinish();
+
+	void	OnCommandUnconsciousStart();
+	void	OnCommandUnconsciousFinish();
+
+	void	OnCommandDamageFullbodyStart();
+	void	OnCommandDamageFullbodyFinish();
+
+	void	OnCommandDamageAdditiveStart();
+	void	OnCommandDamageAdditiveFinish();
+
+	void	OnCommandLadderStart();
+	void	OnCommandLadderFinish();
+
+	void	OnCommandSwimStart();
+	void	OnCommandSwimFinish();
+
+	void	OnCommandVehicleStart();
+	void	OnCommandVehicleFinish();
+
+	void	OnCommandActionFullbodyStart();
+	void	OnCommandActionFullbodyFinish();
+
+	void	OnCommandActionAdditiveStart();
+	void	OnCommandActionAdditiveFinish();
+	
+	//! gets called on stance change
+	void	OnStanceChange(int previousStance, int newStance);
+	
+	//! Called by code to see if it can
+	bool	CanChangeStance(int previousStance, int newStance);
+	
+	//--------------------------------------------------------
+	// rolling API
+	
+	bool	CanRoll();
+	void	OnRollStart(bool isToTheRight);
+	void	OnRollFinish();
+}
diff --git a/scripts/3_Game/DayZ/humanitems.c b/scripts/3_Game/DayZ/humanitems.c
new file mode 100644
index 0000000000000000000000000000000000000000..cf57cd7e57279db7000adc8ab85838ca5a6468ea
--- /dev/null
+++ b/scripts/3_Game/DayZ/humanitems.c
@@ -0,0 +1,148 @@
+
+// *************************************************************************************
+// ! HumanItemBehaviorCfg - per item config of stances / movements   
+// *************************************************************************************
+class HumanItemBehaviorCfg
+{
+
+	// static int	DEFMOVEMENT				= MOVEMENT_IDLE | MOVEMENT_WALK | MOVEMENT_RUN | SPRINT;
+
+	//! bit mask of ik settings 
+	static int IKSETTING_AIMING = 0x1;
+	static int IKSETTING_RHAND 	= 0x2;
+	static int IKSETTING_LHAND  = 0x4;	
+	
+	int		m_iType;
+
+	int		m_iStanceMask;					//!< combinations of STANCEMASK_
+	int		m_StanceMovements[6];			//! 6 stances -> all has movement mask, STANCEIDX_ ... is index
+	int		m_StanceRotation[6];			//! 
+	int 	m_IKSettings[24];				//! [stance][movement] mask for ik 
+	int 	m_IKSettingsMelee[2];				//! [inpact type] mask for ik (0 - light/1 - heavy)
+	int 	m_iPerItemCameraUserData;		//! per item camera user data - can be obtained in runtime by DayZPlayer.GetPerItemCameraUD()
+
+	//! movement caps
+	float 	m_fMoveHeadingFilterSpan;		//! default delay of alignment when moving
+	float 	m_fMoveHeadingSprintFilterSpan;	//! delay of alignment when sprintinh
+	float	m_fMoveHeadingProneFilterSpan;	//! delay of alignment when moving in prone stance
+	float 	m_fMoveHeadingFilterSpeed;		//! max speed of alignment when moving
+
+	//! evade caps
+	float 	m_fMeleeEvadeHeadingFilterSpan;		//! delay of alignment when evading
+	float 	m_fMeleeEvadeHeadingFilterSpeed;	//! max speed of alignment when evading
+
+
+	//! per weapon lean forward 
+	bool	m_bAttackLean;					//! default false
+
+	//! per weapon lean forward 
+	bool	m_bJumpAllowed;					//! default true
+	
+	private bool m_bPlaceholder;
+	
+
+	void 	SetIK(int pStance, int pMovement, bool pAim, bool pRArm, bool pLArm)
+	{
+		int val = 0;
+		if (pAim)	val |=  IKSETTING_AIMING;
+		if (pRArm)	val |=  IKSETTING_RHAND;
+		if (pLArm)	val |=  IKSETTING_LHAND;
+
+		// Print("Setting ik " + pStance.ToString() + "," +   pMovement.ToString() );
+		pStance = pStance * 4;
+		pStance = pStance + pMovement;
+
+		// Print("Setting ik " + pStance.ToString() + " to value " +   val.ToString() );
+		m_IKSettings[pStance] = val;
+	}
+
+	void 	SetIKStance(int pStance, bool pAim, bool pRArm, bool pLArm)
+	{
+		int val = 0;
+		if (pAim)	val |=  IKSETTING_AIMING;
+		if (pRArm)	val |=  IKSETTING_RHAND;
+		if (pLArm)	val |=  IKSETTING_LHAND;
+
+		int bo = pStance * 4;
+
+		for (int i = 0; i < 4; i++)
+		{
+			m_IKSettings[bo+i] = val;
+		}
+	}
+
+	void 	SetIKMelee(int pHitType, bool pAim, bool pRArm, bool pLArm)
+	{
+		int val = 0;
+		if (pAim)	val |=  IKSETTING_AIMING;
+		if (pRArm)	val |=  IKSETTING_RHAND;
+		if (pLArm)	val |=  IKSETTING_LHAND;
+
+		m_IKSettingsMelee[pHitType] = val;
+	}
+
+	void 	SetIKAll(bool pAim, bool pRArm, bool pLArm)
+	{
+		int val = 0;
+		if (pAim)	val |=  IKSETTING_AIMING;
+		if (pRArm)	val |=  IKSETTING_RHAND;
+		if (pLArm)	val |=  IKSETTING_LHAND;
+
+		int i;
+		for (i = 0; i < 24; i++)
+		{
+			m_IKSettings[i] = val;
+		}
+
+		for (i = 0; i < 2; i++)
+		{
+			m_IKSettingsMelee[i] = val;
+		}
+	}
+
+	
+}
+
+// *************************************************************************************
+// ! HumanItemAccessor - item helpers
+// *************************************************************************************
+class HumanItemAccessor
+{
+	//! signalization from script to engine that item in hands changed
+	proto native void 	OnItemInHandsChanged(bool pInstant = false);
+	
+	//! reset weapon anim override in case of premature death
+	proto native void 	ResetWeaponInHands();
+
+	//! hides item in hands visually
+	proto native void	HideItemInHands(bool pState);
+
+	//! returns if item in hands is hidden visually
+	proto native bool	IsItemInHandsHidden();
+
+	//! returns true if item in hands is a weapon
+	proto native bool	IsItemInHandsWeapon();
+
+	//! returns true if weapon is item and it has camera point - local pos, dir in weapon space
+	proto native bool 	WeaponGetCameraPoint(out vector pPos, out vector pRot);
+
+	//! returns true if weapon is item and it has camera point - model space matrix - 
+	proto native bool 	WeaponGetCameraPointMSTransform (notnull EntityAI pCamEntity, vector pCamPoint, vector pCamDir, out vector pTm[4]);
+
+	//! returns true if weapon is item and it has camera point - model space matrix - 
+	proto native bool 	WeaponGetCameraPointBoneRelative(notnull EntityAI pCamEntity, vector pCamPoint, vector pCamDir, int pBoneIndex, out vector pTm[4]);
+
+	//! return current aiming point from aiming model (additive swaying applied - no recoil points)
+	proto native bool 	WeaponGetAimingModelDirTm(out vector pTm[4]);
+
+	//! 
+	proto native HumanItemBehaviorCfg GetItemInHandsBehaviourCfg();
+
+	private void HumanItemAccessor() 
+	{
+	}
+
+	private void ~HumanItemAccessor() 
+	{
+	}
+}
diff --git a/scripts/3_Game/DayZ/humansettings.c b/scripts/3_Game/DayZ/humansettings.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe7b5bb06f066908ac40f7347ae3010a7eae43e6
--- /dev/null
+++ b/scripts/3_Game/DayZ/humansettings.c
@@ -0,0 +1,97 @@
+class SHumanGlobalSettings
+{
+	private void SHumanGlobalSettings() {}
+	private void ~SHumanGlobalSettings() {}
+	
+	float		m_fPhysMoveMaxTracedDistance;		//!<	when actual phys step is lower than this -> distance is traced, otherwise it's just set 	
+}
+
+
+class SHumanCommandMoveSettings 
+{
+	private void SHumanCommandMoveSettings() {}
+	private void ~SHumanCommandMoveSettings() {}
+	
+	float 		m_fRunSpringTimeout;				//!< filter span value		[s]
+	float		m_fRunSpringMaxChange;				//!< filter speed value		[val/s]
+	float		m_fDirFilterTimeout;				//!< direction filter timeout [s]
+	float		m_fDirFilterSprintTimeout;			//!< sprint direction filter timeout [s]
+	float		m_fDirFilterSpeed;					//!< direction filter max rot speed [rad/s]
+	float		m_fMaxSprintAngle;					//!< max sprint angle [rad]
+
+	float 		m_fTurnAngle;						//!< when character starts to turn (45 deg default)
+	float 		m_fTurnEndUpdateNTime;				//!< when turn values are not updated anymore (normalized time)
+	float 		m_fTurnNextNTime;					//!< when next turn is started from previous turn
+
+	float		m_fSlidingPoseAngle;				//!< angle (0.707 * PI)	- when angle is bigger - sliding pose is done (rad)
+	float		m_fSlidingPoseTrackTime;			//!< time change of angle is tracked in the past (sec)
+	float		m_fSlidingPoseRepTime;				//!< not to do sliding pose after another sliding pose (sec)
+
+	float		m_fHeadingChangeLimiterIdle;
+	float		m_fHeadingChangeLimiterWalk;
+	float		m_fHeadingChangeLimiterRun;
+	
+	float		m_fLeaningSpeed;
+
+	float		m_fWaterLevelSpeedRectrictionLow;	//!< Water level (in meters) - m_iMaxSpeedNormal_WaterLevelLow and m_iMaxSpeedFast_WaterLevelLow are applied when character is deeper
+	float		m_fWaterLevelSpeedRectrictionHigh;	//!< Water level (in meters) - m_iMaxSpeedNormal_WaterLevelHigh and m_iMaxSpeedFast_WaterLevelHigh are applied when character is deeper
+	
+	int			m_iMaxSpeedNormal_WaterLevelLow;	//!< Max movement speed for m_fWaterLevelSpeedRectrictionLow when character doesn't want to sprint (-1 means no change)
+	int			m_iMaxSpeedFast_WaterLevelLow;		//!< Max movement speed for m_fWaterLevelSpeedRectrictionLow when character wants to sprint (-1 means no change)
+	int			m_iMaxSpeedNormal_WaterLevelHigh;	//!< Max movement speed for m_fWaterLevelSpeedRectrictionHigh when character doesn't want to sprint (-1 means no change)
+	int			m_iMaxSpeedFast_WaterLevelHigh;		//!< Max movement speed for m_fWaterLevelSpeedRectrictionHigh when character wants to sprint (-1 means no change)
+}
+
+class SHumanCommandSwimSettings 
+{
+	private void SHumanCommandSwimSettings() {}
+	private void ~SHumanCommandSwimSettings() {}	
+	
+	float 		m_fAlignIdleTimeout;				//! align filters in idle, slow, fast
+	float 		m_fAlignIdleMaxChanged;	
+	float 		m_fAlignSlowTimeout;		
+	float 		m_fAlignSlowMaxChanged;	
+	float 		m_fAlignFastTimeout;		
+	float 		m_fAlignFastMaxChanged;	
+
+	float		m_fMovementSpeed;			
+	float		m_fMovementSpeedFltTime;
+	float		m_fMovementSpeedFltMaxChange;
+
+	float		m_fWaterLevelSwim;					//!< when swimming - entity position depth (1.4 m)
+	float		m_fWaterLevelIn;					//!< when entering water - what level cases swimming (1.5m)
+	float		m_fWaterLevelOut;					//!< what water level causes to stop swimming (1.2m)
+
+
+	float 		m_fToCrouchLevel;					//!< when to crouch
+	float 		m_fToErectLevel;					//!< when to stand
+}
+
+
+
+class SHumanCommandClimbSettings 
+{
+	private void SHumanCommandClimbSettings() {}
+	private void ~SHumanCommandClimbSettings() {}	
+	
+	//! generic settings
+	float		m_fCharHeight;
+
+	//! forward pass
+	float 		m_fCharWidth;
+
+	float		m_fFwMinHeight;
+	float		m_fFwMaxHeight;
+	float		m_fFwMaxDistance;
+
+	//! forward step
+	float		m_fStepFreeSpace;		//! must be a space to step there 
+	float		m_fStepPositionAfterEdge;
+	float		m_fStepDownRadius;
+	float		m_fStepMinNormal;
+	float		m_fStepVariation;
+	float		m_fStepMinWidth;
+
+	float		m_fClimbOverMaxWidth;
+	float		m_fClimbOverMinHeight;
+};
diff --git a/scripts/3_Game/DayZ/tools/BitArray.c b/scripts/3_Game/DayZ/tools/BitArray.c
new file mode 100644
index 0000000000000000000000000000000000000000..79cf563c93698384e46248114813b816e4886786
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/BitArray.c
@@ -0,0 +1,100 @@
+//this class allows for creation and manipulation of arrays which hold unique IDs, and allow for bitwise-like operation over these IDs
+//essentially, this extends single INT to any legth when it comes to holding and manipulating individual bits
+
+const int BIT_INT_SIZE = 32;
+class BitArray
+{	
+	static int IDToIndex(int id)
+	{
+		int m_NumOfItems = BitArray.IDToNumOfItems(id);
+		int index 	= (id - (m_NumOfItems * BIT_INT_SIZE)) - 1;
+		return index;
+	}
+
+	static int IDToMask(int id)
+	{
+		int index 			= BitArray.IDToIndex(id);
+		int bit 			= 1 << index;
+		return bit;
+	}
+	//! Creates an array which will be able to accomodate 'size' number of unique IDs
+	static array<int> CreateMaskArray(int size)
+	{
+		int m_NumOfItems 		= BitArray.IDToNumOfItems(size);
+		array<int> bit_array 	= new array<int>;
+
+		for(int i = 0;i <= m_NumOfItems;i++)
+		{
+			bit_array.Insert(0);
+		}
+		
+		return bit_array;
+	}
+	//! Returns number of bits this array can hold
+	static int GetBitCount( array<int> bit_array )
+	{
+		return ( (bit_array.Count() ) * BIT_INT_SIZE );
+	}
+
+	//! Returns number of INTs required to hold this ID minus 1(ie for 32, the result is 0, for 33, the result is 1)
+	static int IDToNumOfItems(int id)
+	{
+		int m_NumOfItems = id / BIT_INT_SIZE;
+		if( id % BIT_INT_SIZE == 0 ) m_NumOfItems--;
+		return m_NumOfItems;
+	}
+	
+	static array<int> CreateArrayWithID(int id)
+	{
+		int m_NumOfItems 	= BitArray.IDToNumOfItems(id);//TODO: check for too big id
+		int bit 			= BitArray.IDToMask(id);
+		
+		array<int> bit_array = new array<int>;
+		
+		for(int i = 0;i <= m_NumOfItems;i++)
+		{
+			bit_array.Insert(0);
+		}
+		bit_array.Set(m_NumOfItems, bit);
+		return bit_array;
+	}
+	
+	static bool IsMaskContainID(array<int> bit_array, int id)
+	{
+		if( BitArray.IDToNumOfItems( id ) > bit_array.Count() )
+		{
+			return false;
+		}
+		else
+		{
+			int index_mask 		=  BitArray.IDToMask(id);
+			int num_of_items 	= BitArray.IDToNumOfItems(id);
+			int array_mask 		= bit_array.Get( num_of_items );
+			
+			if ( index_mask & array_mask )
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}
+	}
+	
+	static bool AddIDToMask(array<int> bit_array, int id)
+	{
+		if( BitArray.IDToNumOfItems(id) > bit_array.Count() )
+		{
+			return false;
+		}
+		else
+		{
+			int num_of_items 	= BitArray.IDToNumOfItems(id);
+			int bit 			= BitArray.IDToMask(id);
+			int new_mask 		= bit_array.Get(num_of_items) | bit;
+			bit_array.Set(num_of_items, new_mask);
+			return true;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/CameraTools.c b/scripts/3_Game/DayZ/tools/CameraTools.c
new file mode 100644
index 0000000000000000000000000000000000000000..7bf1de8dce569e39ae2850c280ee5c496b061351
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/CameraTools.c
@@ -0,0 +1,110 @@
+#ifdef DIAG_DEVELOPER
+class CameraToolsMenuServer
+{
+	ref array<Man> m_Subscribers = new array<Man>;
+	void OnRPC(int rpc_type, ParamsReadContext ctx)
+	{
+		switch (rpc_type)
+		{
+			case ERPCs.DIAG_CAMERATOOLS_CAM_DATA:
+			{
+				Param4<vector, vector,float,float> p4 = new Param4<vector, vector,float,float>(vector.Zero, vector.Zero,0,0);
+				if (ctx.Read(p4))
+				{
+					foreach (int index, Man p : m_Subscribers)
+					{
+						if (p)
+						{
+							GetGame().RPCSingleParam(p, ERPCs.DIAG_CAMERATOOLS_CAM_DATA, p4, true, p.GetIdentity());
+						}
+						else
+						{
+							m_Subscribers.Remove(index);
+						}
+					}
+				}
+				break;
+			}
+			case ERPCs.DIAG_CAMERATOOLS_CAM_SUBSCRIBE:
+			{
+				Param2<bool, Man> par2 = new Param2<bool, Man>(false,null);
+	
+				if (ctx.Read(par2))
+				{
+					bool enable = par2.param1;
+					Man player = par2.param2;
+					
+					bool found = false;
+					foreach (int i, Man m : m_Subscribers)
+					{
+						if (m == player)
+						{
+							if (!enable)
+							{
+								m_Subscribers.Remove(i);
+								return;
+							}
+							found = true;
+							m_Subscribers[i] = player;
+						}
+					}
+					if (!found && enable)//not found in the array, insert it
+					{
+						m_Subscribers.Insert(player);
+					}
+				}
+				break;
+			}
+		}
+	}
+};
+
+class CameraToolsMenuClient
+{
+	Shape m_DebugShape = null;
+	
+	void ~CameraToolsMenuClient()
+	{
+		if (m_DebugShape)
+		{
+			m_DebugShape.Destroy();
+		}
+	}
+	
+	void DelayedDestroy()
+	{
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( DestroyNow, 2000);
+	}
+	
+	void DestroyNow()
+	{
+		delete this;
+	}
+	
+	void OnRPC(ParamsReadContext ctx)
+	{
+		if (m_DebugShape)
+		{
+			m_DebugShape.Destroy();
+			m_DebugShape = null;
+		}
+		
+		Param4<vector, vector,float,float> p4 = new Param4<vector, vector,float,float>(vector.Zero, vector.Zero,0,0);
+		if ( ctx.Read( p4 ) )
+		{
+			vector pos = p4.param1;
+			vector dir = p4.param2;
+			float plane = p4.param3;
+			float fov = p4.param4 * Math.RAD2DEG;
+			
+			
+			m_DebugShape = Debug.DrawFrustum(fov, 30, 0.5);
+			vector mat[4];
+			Math3D.DirectionAndUpMatrix(dir,vector.Up,mat);
+			mat[3] = pos;
+			m_DebugShape.SetMatrix(mat);
+
+		}
+	}
+};
+#endif
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Component.c b/scripts/3_Game/DayZ/tools/Component.c
new file mode 100644
index 0000000000000000000000000000000000000000..a20f07353a22b8e7a52237adb124ba7e7d63c663
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Component.c
@@ -0,0 +1,172 @@
+/**
+ * \defgroup Components
+ * \desc Constants for Components
+ * @{
+ */
+const string	COMP_NAME_NONE				= "None";
+const int		COMP_TYPE_UNDEFINED			= -1;
+const int		COMP_TYPE_ETITY_DEBUG		= 0;
+const int		COMP_TYPE_ENERGY_MANAGER	= 1;
+const int		COMP_TYPE_BODY_STAGING		= 2;
+const int		COMP_TYPE_ANIMAL_BLEEDING	= 3;
+const int		COMP_TYPE_COUNT				= 4;
+/** @}*/
+
+class Component
+{
+
+	//==========================================
+	// Variables Private Static
+	private static string m_CompNames[COMP_TYPE_COUNT];	
+	
+	//==========================================
+	// Variables Private
+	protected EntityAI		m_ThisEntityAI;
+	
+	//==========================================
+	
+	void 	Event_OnFrame(IEntity other, float timeSlice);
+	Shape 	DebugBBoxDraw();
+	void	DebugBBoxSetColor(int color);
+	void	DebugBBoxDelete();
+	Shape	DebugDirectionDraw(float distance = 1);
+	void	DebugDirectionSetColor(int color);
+	void	DebugDirectionDelete();
+	
+	// Methods Public Static
+	static void	Init()
+	{
+		m_CompNames[COMP_TYPE_ETITY_DEBUG]			= "ComponentEntityDebug";
+		m_CompNames[COMP_TYPE_ENERGY_MANAGER]		= "ComponentEnergyManager";
+		m_CompNames[COMP_TYPE_BODY_STAGING]			= "ComponentBodyStaging";
+		m_CompNames[COMP_TYPE_ANIMAL_BLEEDING]		= "ComponentAnimalBleeding";
+	}
+
+	///////////////////////////////////public/static
+	// GetNameByType
+	////////////////////////////////////////////////
+	static string GetNameByType(int comp_type)
+	{
+		if ( IsTypeExist(comp_type) == false )
+		{
+			LogErrorBadCompType(comp_type, "Component->GetNameByType()");
+			return "None";
+		}
+		
+		return m_CompNames[comp_type];
+	}
+
+	///////////////////////////////////public/static
+	// IsTypeExist
+	////////////////////////////////////////////////
+	static bool IsTypeExist(int comp_type)
+	{
+		if ( comp_type < 0 || comp_type >= COMP_TYPE_COUNT )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+
+	///////////////////////////////////public/static
+	// LogErrorBadCompType
+	////////////////////////////////////////////////
+	static void	LogErrorBadCompType(int comp_type, string fnc_name)
+	{
+		string msg = "Bad parameter comp_type='"+comp_type.ToString()+"'. Parameter must be 0-"+(COMP_TYPE_COUNT - 1).ToString()+". Returning component name 'None'.";
+		Debug.LogError(msg, "Component", "n/a", fnc_name);
+	}
+
+	///////////////////////////////////public/static
+	// LogWarningAlredyExist
+	////////////////////////////////////////////////
+	static void	LogWarningAlredyExist(int comp_type, string fnc_name)
+	{
+		string msg = "Component '"+Component.GetNameByType(comp_type)+"' already exists!";
+		Debug.LogError(msg, "Component", "n/a", fnc_name);
+	}
+
+	//=======================================public
+	// SetParentEntityAI
+	//=============================================
+	void SetParentEntityAI(EntityAI e)
+	{
+		m_ThisEntityAI = e;
+	}
+
+	//====================================protected
+	// Awake
+	//=============================================
+	void Event_OnAwake()
+	{
+		
+	}
+
+	//====================================protected
+	// Init
+	//=============================================
+	void Event_OnInit()
+	{
+		
+	}
+
+	//=======================================public
+	// Log
+	//=============================================
+	void LogThis(string msg, string fnc_name = "n/a")
+	{
+		//Debug.Log(msg, GetCompName(), "n/a", fnc_name, m_ThisEntityAI.ToString());
+	}
+
+	//=======================================public
+	// LogWarning
+	//=============================================
+	void LogThisWarning(string msg, string fnc_name = "n/a")
+	{
+		Debug.LogWarning(msg, GetCompName(), "n/a", fnc_name, m_ThisEntityAI.ToString());
+	}
+
+	//=======================================public
+	// LogError
+	//=============================================
+	void LogThisError(string msg, string fnc_name = "n/a")
+	{
+		Debug.LogError(msg, GetCompName(), "n/a", fnc_name, m_ThisEntityAI.ToString());
+	}
+
+	//=======================================public
+	// GetType
+	//=============================================
+	string GetCompName()
+	{
+		return Component.GetNameByType(this.GetCompType());
+	}
+
+	//=======================================public
+	// GetType
+	//=============================================
+	int GetCompType()
+	{
+		return COMP_TYPE_UNDEFINED;
+	}
+
+	//=======================================public
+	// Event_OnItemAttached
+	//=============================================
+	void Event_OnItemAttached(EntityAI item, string slot_name)
+	{
+		LogThis("" + item + " -> " + slot_name,"Event_OnItemAttached");
+		//Debug.Log("Component=>Event_OnItemAttached: " + item + " -> " + slot_name, );
+	}
+
+	//=======================================public
+	// Event_OnItemDetached
+	//=============================================
+	void Event_OnItemDetached(EntityAI item, string slot_name)
+	{
+		LogThis("" + item + " <- " + slot_name,"Event_OnItemDetached");
+		//Log("Component=>Event_OnItemDetached: " + item + " <- " + slot_name );
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Component/BodyStaging.c b/scripts/3_Game/DayZ/tools/Component/BodyStaging.c
new file mode 100644
index 0000000000000000000000000000000000000000..b37e8a19665f839b3dcc464af4984f528bd5cafb
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Component/BodyStaging.c
@@ -0,0 +1,67 @@
+//-----------------------------
+// BODY STAGING
+//-----------------------------
+/*
+Every dead body will have this component which will control its various states.
+Read "Dead bodies staging" design on Confluence.
+*/
+
+class ComponentBodyStaging : Component
+{
+	bool m_IsSkinned;
+	
+	void ComponentBodyStaging()
+	{
+		m_IsSkinned = false;
+	}
+	
+	void ~ComponentBodyStaging()
+	{
+		
+	}
+	
+	void SetAsSkinned()
+	{
+		m_IsSkinned = true;
+		
+		// Temporal! Body is moved into ground so we can see if it was already skinned or not until necesarry assets are developed.
+		/*
+		if ( !m_ThisEntityAI.IsKindOf("Animal_GallusGallusDomesticus")  &&  !m_ThisEntityAI.IsKindOf("Animal_GallusGallusDomesticusF") )
+		{
+			vector body_new_pos = m_ThisEntityAI.GetPosition() - "0 0.2 0";
+			m_ThisEntityAI.SetPosition(body_new_pos);
+		}
+		else
+		{
+			vector body_new_pos2 = m_ThisEntityAI.GetPosition() - "0 0.08 0";
+			m_ThisEntityAI.SetPosition(body_new_pos2);
+		}
+		*/
+		
+		SynchSkinnedState();
+	}
+	
+	bool IsSkinned()
+	{
+		return m_IsSkinned;
+	}
+	
+	void SetAsSkinnedClient()
+	{
+		m_IsSkinned = true;
+	}
+	
+	/*====================================
+	  SERVER --> CLIENT  SYNCHRONIZATION
+	====================================*/
+	
+	// Synchronizes properties
+	protected void SynchSkinnedState()
+	{
+		if ( GetGame().IsServer() )
+		{
+			Param1<bool> p = new Param1<bool>( IsSkinned() );
+			GetGame().RPCSingleParam( m_ThisEntityAI, ERPCs.RPC_BS_SKINNED_STATE, p, true );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Component/ComponentAnimalBleeding.c b/scripts/3_Game/DayZ/tools/Component/ComponentAnimalBleeding.c
new file mode 100644
index 0000000000000000000000000000000000000000..3beacb44728041434f878a94555746cdded22d04
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Component/ComponentAnimalBleeding.c
@@ -0,0 +1,116 @@
+//-----------------------------
+// ANIMAL BLEEDING
+//-----------------------------
+/*
+Animal bleeding is handled by this component.
+*/
+
+class ComponentAnimalBleeding : Component
+{
+	// Member variables
+	protected ref Timer m_BleedTimer;
+	protected const float BASE_BLEED_RATE = 250;
+	protected const float PASS_OUT_AMOUT = 500;
+
+	// Constructor
+	void ComponentAnimalBleeding()
+	{
+		
+	}
+	
+	void InflictWoundDamage( TotalDamageResult damage_result, string zone_name, string ammo )
+	{
+		if ( ammo == "MeleeWolf")
+		{
+			m_ThisEntityAI.SetHealth( "", "", 0 );
+		}	
+		
+		if ( !zone_name )
+			return;
+		
+		float health_damage_inflicted = damage_result.GetDamage( zone_name, "Health");
+		//float blood_damage_inflicted = damage_result.GetDamage( zone_name, "Blood");	
+		float wound_healt_damage = health_damage_inflicted;
+		//float wound_blood_damage = health_damage_inflicted;
+		
+		m_ThisEntityAI.DecreaseHealth( "", "Health", wound_healt_damage );
+		//m_ThisEntityAI.DecreaseHealth( "", "Blood", wound_blood_damage );
+		
+		if ( zone_name != "" )
+		{
+			m_ThisEntityAI.DecreaseHealth( zone_name, "Health", wound_healt_damage );
+			//m_ThisEntityAI.DecreaseHealth( zone_name, "Blood", wound_blood_damage );
+		}	
+		
+		//Print("Zone hit: " + zone_name );
+		
+		//Print("damage_result Health: " + damage_result.GetDamage( zone_name, "Health" ) );
+		//Print("damage_result Blood: " + damage_result.GetDamage( zone_name, "Blood" ) );
+	}
+	
+	void CreateWound( TotalDamageResult damage_result, string zone_name, string ammo )
+	{
+		//Print( "GetHealth Health before creating wound@: " + zone_name + " " + m_ThisEntityAI.GetHealth( zone_name, "Health" ));
+		InflictWoundDamage( damage_result, zone_name, ammo );
+		//Print( "GetHealth Health after creating wood@: " + zone_name + " " + m_ThisEntityAI.GetHealth( zone_name, "Health" ));
+		
+		float can_bleed = false; //= GetGame().ConfigGetFloat( "CfgVehicles " + m_ThisEntityAI.GetType() + " DamageSystem " + "DamageZones " + zone_name + " canBleed" );
+		//Print("can_bleed: " + can_bleed );
+		float bleed_treshold = 0; //= GetGame().ConfigGetFloat( "CfgAmmo " + ammo + " DamageApplied " + "bleedThreshold" );
+		//Print("bleed_treshold: " + bleed_treshold );
+		float chance = -1; //Math.RandomFloat01();
+		//Print("chance: " + chance );
+		
+		//Print( "GetHealth Health @: " + m_ThisEntityAI.GetHealth( zone_name, "Health" ));
+		//Print( "GetHealth Blood @: " + m_ThisEntityAI.GetHealth( zone_name, "Blood" ));
+		//Print( "GetHealth Shock @: " + m_ThisEntityAI.GetHealth( zone_name, "Shock" ));
+		
+		if ( can_bleed && chance <= bleed_treshold )
+		{
+			m_BleedTimer = new Timer();
+			float wound_intensity = GetWoundIntensity( bleed_treshold );
+			//Print("wound_intensity: " + wound_intensity);
+			m_BleedTimer.Run( 1, this, "Bleed", new Param1<float>( wound_intensity ), true ); 
+		}
+		/*
+		else
+		{
+			Print("Not bleeding");
+		}
+		*/
+	}
+
+	void Bleed( float wound_intensity )
+	{
+		if ( m_ThisEntityAI.IsAlive() )
+		{
+			float bleeding_intensity = BASE_BLEED_RATE * wound_intensity;
+			//Print("bleeding_intensity: " + bleeding_intensity);
+			float global_blood_lvl = m_ThisEntityAI.GetHealth( "", "Blood" );
+
+			m_ThisEntityAI.DecreaseHealth( "", "Blood", bleeding_intensity );
+
+			if ( global_blood_lvl < PASS_OUT_AMOUT )
+			{
+				m_ThisEntityAI.SetHealth( "", "", 0 );
+				//Print("global_blood_lvl < PASS_OUT_AMOUT => Zabijam zviera.");	
+			}
+			
+			//Print( "GetHealth Global Health: " + m_ThisEntityAI.GetHealth( "", "Health" ));
+			//Print( "GetHealth Global Blood: " + m_ThisEntityAI.GetHealth( "", "Blood" ));
+			//Print( "GetHealth Global Shock: " + m_ThisEntityAI.GetHealth( "", "Shock" ));
+			
+		}
+		else
+		{
+			m_BleedTimer.Stop();	
+			//Print("Vypinam timer.");		
+		}
+	}
+
+	float GetWoundIntensity( float bleed_treshold )
+	{
+		//higher the bleeding treshold => more intense bleeding
+		return bleed_treshold * 2;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Component/ComponentEnergyManager.c b/scripts/3_Game/DayZ/tools/Component/ComponentEnergyManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..2282c4f3f535c2f6cf462c7bd45b835203e0353f
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Component/ComponentEnergyManager.c
@@ -0,0 +1,1845 @@
+//-----------------------------
+// ENERGY MANAGER
+//-----------------------------
+/*
+Author: Boris Vacula
+
+Documentation can be found at DayZ Confluence >> Camping & Squatting >> Electricity >> Energy Manager functionalities
+
+This system controls storage, spending and sharing of energy between instances.
+
+Every EntityAI object which uses this API gains these functions:
+	-It can store some amout of energy
+	-It can use this amount of energy for any kind of functionality
+	-It can share this energy with other devices plugged into it
+	-It will have an ON/OFF switch
+*/
+
+class ComponentEnergyManager : Component
+{
+	protected const  float DEFAULT_UPDATE_INTERVAL = 15;
+	protected static bool 			m_DebugPlugs = false; //true; // Use this to toggle visualisation of plug connections
+	protected 		Shape			m_DebugPlugArrow;
+	
+	protected 		bool			m_IsSwichedOn;
+	protected 		bool			m_IsSwichedOnPreviousState; // Necesarry due to synchronization of m_IsSwichedOn
+	protected 		bool			m_IsPassiveDevice;
+	protected 		bool			m_IsWorking;
+	protected 		bool			m_CanWork;
+	protected 		bool			m_CanStopWork;
+	protected 		bool			m_RestorePlugState; // After server restart, this value reports if this device was plugged into something or not at the end of last session.
+	protected 		bool			m_AutoSwitchOff;
+	protected 		bool			m_ShowSocketsInInventory;
+	protected 		bool			m_HasElectricityIcon; // Electricity icon over the item in inventory
+	protected 		bool			m_AutoSwitchOffWhenInCargo;
+	protected 		bool			m_IsPlugged; // Synchronized variable
+	protected 		bool			m_ConvertEnergyToQuantity;
+	
+	protected 		int				m_MySocketID = -1;
+	protected 		int				m_PlugType;
+	protected 		int				m_EnergySourceStorageIDb1; // Storage persistence ID
+	protected 		int				m_EnergySourceStorageIDb2; // Storage persistence ID
+	protected 		int				m_EnergySourceStorageIDb3; // Storage persistence ID
+	protected 		int				m_EnergySourceStorageIDb4; // Storage persistence ID
+	protected 		int				m_AttachmentActionType;
+	protected 		int				m_EnergySourceNetworkIDLow = -1;  // Network ID
+	protected 		int				m_EnergySourceNetworkIDHigh = -1; // Network ID
+	
+	protected 		float			m_EnergyUsage;
+	protected 		float			m_Energy;
+	protected 		float			m_EnergyAtSpawn;
+	protected 		float			m_EnergyStorageMax;
+	protected 		float			m_ReduceMaxEnergyByDamageCoef;
+	protected 		float			m_SocketsCount;
+	protected 		float			m_CordLength;
+	protected 		float			m_LastUpdateTime;
+	protected 		float			m_WetnessExposure;
+	protected 		float			m_UpdateInterval; // Interval of OnWork(...) calls and device updates.
+	
+	protected 		string			m_CordTextureFile;
+	
+	// Concatenated strings for p3d selections
+	protected static const string	SOCKET_ 			= "socket_";
+	protected static const string	_PLUGGED 			= "_plugged";
+	protected static const string	_AVAILABLE 			= "_available";
+	static const string				SEL_CORD_PLUGGED 	= "cord_plugged";
+	static const string				SEL_CORD_FOLDED		= "cord_folded";
+	
+	protected ref TIntArray			m_CompatiblePlugTypes;
+	EntityAI						m_EnergySource; // Energy source can be any EntityAI object
+	ref array<EntityAI> 			m_PluggedDevices;
+	ref map<string,EntityAI>		m_DeviceByPlugSelection;
+	
+	ref Timer 						m_UpdateTimer;
+	ref Timer 						m_UpdateQuantityTimer;
+	ref Timer 						m_DebugUpdate;
+	
+	const int MAX_SOCKETS_COUNT 	= 4;
+	EntityAI m_Sockets[MAX_SOCKETS_COUNT];
+	
+	
+
+	// Constructor
+	void ComponentEnergyManager()
+	{
+		// Disable debug arrows on public release, so that they don't use their timers.
+		#ifndef DEVELOPER
+		m_DebugPlugs = false;
+		#endif
+	}
+	
+	void ~ComponentEnergyManager()
+	{
+		if (m_DebugPlugArrow)
+		{
+			m_DebugPlugArrow.Destroy();
+			m_DebugPlugArrow = NULL; 
+		}
+	}
+
+	// Initialization. Energy Manager is ready.
+	override void Event_OnInit()
+	{
+		m_ThisEntityAI.m_EM = this;
+		GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnInitEnergy", NULL, 0);
+	}
+	
+	// Update debug arrows
+	void DebugUpdate()
+	{
+		if ( GetDebugPlugs() )
+		{
+			if ( GetGame().IsMultiplayer()  &&  GetGame().IsServer() )
+			{
+				if (m_DebugUpdate)
+					m_DebugUpdate.Stop();
+				
+				return;
+			}
+		
+			if (m_DebugPlugArrow)
+			{
+				m_DebugPlugArrow.Destroy();
+				m_DebugPlugArrow = NULL; 
+			}
+			
+			if ( GetEnergySource() )
+			{
+				vector from = GetEnergySource().GetPosition() + "0 0.1 0";
+				vector to = m_ThisEntityAI.GetPosition() + "0 0.1 0";
+				
+				//No need to draw an arrow in this situation as it would not be visible
+				if ( vector.DistanceSq(from, to) == 0 )
+					return;
+				
+				if ( m_ThisEntityAI.GetType() == "BarbedWire" ) // Special case for debugging of electric fences. Temporal code until offsets in fences are fixed.
+				{
+					EntityAI BBB = m_ThisEntityAI.GetHierarchyParent();
+					
+					if ( BBB  &&  BBB.GetType() == "Fence" )
+					{
+						to = to + "0 -1.3 0";
+					}
+				}
+				
+				m_DebugPlugArrow = DrawArrow( from, to );
+			}
+		}
+	}
+	
+	Shape DrawArrow(vector from, vector to, float size = 0.5, int color = 0xFFFFFFFF, float flags = 0)
+	{
+		vector dir = to - from;
+		dir.Normalize();
+		vector dir1 = dir * size;
+		size = size * 0.5;
+	
+		vector dir2 = dir.Perpend() * size;
+	
+		vector pts[5];
+		pts[0] = from;
+		pts[1] = to;
+		pts[2] = to - dir1 - dir2;
+		pts[3] = to - dir1 + dir2;
+		pts[4] = to;
+		
+		return Shape.CreateLines(color, flags, pts, 5);
+	}
+
+	EntityAI GetThisEntityAI()
+	{
+		return m_ThisEntityAI;
+	}
+	
+	// Prepare everything
+	override void Event_OnAwake()
+	{
+		string cfg_item = "CfgVehicles " + m_ThisEntityAI.GetType();
+		string cfg_energy_manager = cfg_item + " EnergyManager ";
+		
+		// Read all config parameters
+		m_EnergyUsage					= GetGame().ConfigGetFloat(cfg_energy_manager + "energyUsagePerSecond");
+		bool switch_on					= GetGame().ConfigGetFloat(cfg_energy_manager + "switchOnAtSpawn");
+		m_AutoSwitchOff					= GetGame().ConfigGetFloat(cfg_energy_manager + "autoSwitchOff");
+		m_HasElectricityIcon			= GetGame().ConfigGetFloat(cfg_energy_manager + "hasIcon");
+		m_AutoSwitchOffWhenInCargo 		= GetGame().ConfigGetFloat(cfg_energy_manager + "autoSwitchOffWhenInCargo");
+		
+		m_EnergyAtSpawn					= GetGame().ConfigGetFloat(cfg_energy_manager + "energyAtSpawn");
+		m_Energy = m_EnergyAtSpawn;
+		m_EnergyStorageMax				= GetGame().ConfigGetFloat(cfg_energy_manager + "energyStorageMax");
+		m_ReduceMaxEnergyByDamageCoef	= GetGame().ConfigGetFloat(cfg_energy_manager + "reduceMaxEnergyByDamageCoef");
+		m_SocketsCount					= GetGame().ConfigGetFloat(cfg_energy_manager + "powerSocketsCount");
+		
+		m_IsPassiveDevice				= GetGame().ConfigGetFloat(cfg_energy_manager + "isPassiveDevice");
+		m_CordLength 					= GetGame().ConfigGetFloat(cfg_energy_manager + "cordLength");
+		m_PlugType 						= GetGame().ConfigGetFloat(cfg_energy_manager + "plugType");
+		
+		m_AttachmentActionType			= GetGame().ConfigGetFloat(cfg_energy_manager + "attachmentAction");
+		m_WetnessExposure				= GetGame().ConfigGetFloat(cfg_energy_manager + "wetnessExposure");
+		
+		float update_interval			= GetGame().ConfigGetFloat(cfg_energy_manager + "updateInterval");
+		
+		m_ConvertEnergyToQuantity		= GetGame().ConfigGetFloat(cfg_energy_manager + "convertEnergyToQuantity");
+		
+		
+		// Check if energy->quantity converion is configured properly
+		float cfg_max_quantity = GetGame().ConfigGetFloat (cfg_item + " varQuantityMax");
+		
+		if (m_ConvertEnergyToQuantity  &&  cfg_max_quantity <= 0)
+		{
+			string error = "Error! Item " + m_ThisEntityAI.GetType() + " has invalid configuration of the energy->quantity conversion feature. To fix this, add 'varQuantityMax' parameter with value higher than 0 to the item's config. Then make sure to re-build the PBO containing this item!";
+			Error(error);
+			m_ConvertEnergyToQuantity = false;
+		}
+		else
+		{
+			if (m_ConvertEnergyToQuantity)
+			{
+				if (!m_UpdateQuantityTimer)
+					m_UpdateQuantityTimer = new Timer( CALL_CATEGORY_SYSTEM );
+				
+				m_UpdateQuantityTimer.Run( 0.3 , this, "OnEnergyAdded", NULL, false);
+			}
+		}
+		
+		// Set update interval
+		if ( update_interval <= 0 )
+			update_interval = DEFAULT_UPDATE_INTERVAL;
+		
+		SetUpdateInterval( update_interval );
+		
+		// If energyAtSpawn is present, then use its value for energyStorageMax if that cfg param is not present (for convenience's sake)
+		string cfg_check_energy_limit = cfg_energy_manager + "energyStorageMax";
+		
+		if ( !GetGame().ConfigIsExisting (cfg_check_energy_limit)  &&  m_Energy > 0 )
+		{
+			m_EnergyStorageMax = m_Energy;
+		}
+		
+		// Fill m_CompatiblePlugTypes
+		string cfg_check_plug_types = cfg_energy_manager + "compatiblePlugTypes";
+		
+		if ( GetGame().ConfigIsExisting (cfg_check_plug_types) )
+		{
+			m_CompatiblePlugTypes = new TIntArray;
+			GetGame().ConfigGetIntArray(cfg_check_plug_types, m_CompatiblePlugTypes);	
+		}
+		
+		if (GetSocketsCount() > 0)
+			m_PluggedDevices = new array<EntityAI>;
+		
+		if ( m_CordLength < 0 )
+		{
+			m_CordLength = 0;
+			string error_message_cord = "Warning! " + m_ThisEntityAI.GetType() + ": config parameter 'cordLength' is less than 0! Cord length should not be negative!";
+			DPrint(error_message_cord);
+		}
+		
+		if (GetSocketsCount() > 0)
+		{
+			m_DeviceByPlugSelection = new map<string,EntityAI>;
+			// Prepare the m_DeviceByPlugSelection
+			string cfg_animation_sources = "cfgVehicles " + m_ThisEntityAI.GetType() + " " + "AnimationSources ";
+			int animation_sources_count = GetGame().ConfigGetChildrenCount(cfg_animation_sources);
+			
+			for (int i_selection = 0; i_selection < animation_sources_count; i_selection++)
+			{
+				// TO DO: This could be optimized so not all selections on item are considered as plug/socket selections.
+				string selection;
+				GetGame().ConfigGetChildName(cfg_animation_sources, i_selection, selection);
+				m_DeviceByPlugSelection.Set(selection, NULL);
+			}
+		}
+		
+		
+		
+		// Prepare sockets
+		if ( m_SocketsCount > MAX_SOCKETS_COUNT )
+		{
+			m_SocketsCount = MAX_SOCKETS_COUNT;
+			string error_message_sockets = "Error! " + m_ThisEntityAI.GetType() + ": config parameter 'powerSocketsCount' is higher than the current limit (" + MAX_SOCKETS_COUNT.ToString() + ")! Raise the limit (constant MAX_SOCKETS_COUNT) or decrease the powerSocketsCount parameter for this device!";
+			DPrint(error_message_sockets);
+		}
+		
+		m_Sockets[MAX_SOCKETS_COUNT]; // Handles selections for plugs in the sockets. Feel free to change the limit if needed.
+		
+		GetGame().ConfigGetText(cfg_energy_manager + "cordTextureFile", m_CordTextureFile); 
+		
+		if ( switch_on )
+		{
+			SwitchOn();
+		}
+		
+		for ( int i = 0; i <= GetSocketsCount(); ++i )
+		{
+			m_ThisEntityAI.HideSelection ( SOCKET_ + i.ToString() + _PLUGGED );
+		}
+		
+		// Show/hide inventory sockets
+		m_ShowSocketsInInventory = false;
+		if ( GetSocketsCount() > 0  &&  IsPlugCompatible(PLUG_COMMON_APPLIANCE)  &&  m_ThisEntityAI.GetType() != "MetalWire" ) // metal wire filter is hopefully temporal.
+		{
+			m_ShowSocketsInInventory = true;
+		}
+		
+		m_CanWork = HasEnoughStoredEnergy();
+		
+		m_ThisEntityAI.HideSelection( SEL_CORD_PLUGGED );
+		
+		
+		#ifdef DIAG_DEVELOPER
+		GetGame().m_EnergyManagerArray.Insert( this );
+		#endif
+	}
+
+	// Returns the type of this component
+	override int GetCompType()
+	{
+		return COMP_TYPE_ENERGY_MANAGER;
+	}
+	
+	// When the object is deleted
+	void OnDeviceDestroyed()
+	{
+		bool was_working = m_ThisEntityAI.GetCompEM().IsWorking();
+		
+		SwitchOff();
+		UnplugAllDevices();
+		UnplugThis();
+		SetPowered( false );
+		
+		if ( was_working )
+			m_ThisEntityAI.OnWorkStop();
+		;
+	}
+	
+	//Restart the debug timer when relogging
+	void RefreshDebug()
+	{
+		if ( m_DebugPlugs )
+		{
+			if ( !m_DebugUpdate )
+				m_DebugUpdate = new Timer( CALL_CATEGORY_SYSTEM );
+			
+			if ( !m_DebugUpdate.IsRunning() )
+				m_DebugUpdate.Run(0.01, this, "DebugUpdate", NULL, true);
+		}
+		else
+		{
+			if ( m_DebugPlugArrow )
+			{
+				m_DebugPlugArrow.Destroy();
+				m_DebugPlugArrow = NULL; 
+			}
+		}
+	}
+	
+	bool GetDebugPlugs()
+	{
+		return m_DebugPlugs;
+	}
+	
+	void SetDebugPlugs( bool newVal )
+	{
+		m_DebugPlugs = newVal;
+		RefreshDebug();
+	}
+
+	//======================================================================================
+	// 									 PUBLIC FUNCTIONS
+	// 						Use these to control the Energy Manager
+	// Functions are in order of their return value: void, bool, int, float, string, array.
+	//======================================================================================
+
+	//! Energy manager: Switches ON the device so it starts doing its work if it has enough energy.
+	void SwitchOn()
+	{
+		m_IsSwichedOnPreviousState = m_IsSwichedOn;
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if ( CanSwitchOn() )
+			{
+				m_IsSwichedOn = true;
+				Synch();
+				
+				DeviceUpdate(); // 'Wake up' this device now
+				StartUpdates();
+				
+				// 'Wakes up' all connected devices
+				WakeUpWholeBranch( m_ThisEntityAI );
+				
+				UpdateCanWork();
+				
+				// Call event
+				GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnSwitchOn", NULL, 0);
+			}
+		}
+		
+		if ( !GetGame().IsServer()  &&  GetGame().IsMultiplayer()/*  &&  CanSwitchOn() */) // I want the CanSwitchOn() check, but when it's here, the OnSwitchOn() event is never called on client-side due to engine's synchronization system changing the m_IsSwichedOn to true without any specific event beign called. (Yes there is OnVariablesSynchronized() but that is called also when m_CanWork is synchronized, so I need to write a method of knowing when was this specific value changed.)
+		{
+			GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnSwitchOn", NULL, 0);
+		}
+	}
+
+	//! Energy manager: Switches OFF the device.
+	void SwitchOff()
+	{
+		m_IsSwichedOnPreviousState = m_IsSwichedOn;
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if ( CanSwitchOff() )
+			{
+				m_IsSwichedOn = false;
+				Synch();
+				
+				if ( IsWorking() )
+				{
+					StopUpdates();
+					DeviceUpdate();
+				}
+				
+				// 'Wakes up' all connected devices
+				WakeUpWholeBranch( m_ThisEntityAI );
+
+				UpdateCanWork();
+								
+				// Call event
+				GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnSwitchOff", NULL, 0);
+			}
+		}
+		
+		if ( !GetGame().IsServer()  &&  GetGame().IsMultiplayer() )
+		{
+			m_IsSwichedOn = false;
+			GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnSwitchOff", NULL, 0);
+		}
+	}
+
+	//! Energy manager: Changes the status of this device. When it's passive (true), the main timer and OnWork events are not used.
+	void SetPassiveState(bool state = true)
+	{
+		m_IsPassiveDevice = state;
+		if ( !m_IsPassiveDevice )
+		{
+			DeviceUpdate();
+		}
+	}
+
+	//! Energy manager: Unplugs the given device from this one.
+	void UnplugDevice(EntityAI device_to_unplug)
+	{
+		if ( GetGame() )
+		{
+			int indexStart	= GetPluggedDevicesCount() - 1;
+			bool deviceFound = false;
+			
+			for (int i = indexStart; i >= 0; --i)
+			{
+				EntityAI plugged_device = GetPluggedDevices().Get(i);
+				
+				if (plugged_device == device_to_unplug)
+				{
+					GetPluggedDevices().Remove(i);
+					deviceFound = true;
+					break;
+				}
+			}
+			
+			if (deviceFound)
+			{
+				int socket_ID = device_to_unplug.GetCompEM().GetMySocketID();
+				UnplugCordFromSocket(socket_ID);
+				device_to_unplug.GetCompEM().SetEnergySource(null);
+				device_to_unplug.GetCompEM().DeviceUpdate();
+				device_to_unplug.GetCompEM().StartUpdates();
+				device_to_unplug.GetCompEM().WakeUpWholeBranch(m_ThisEntityAI);
+				
+				if (m_DebugPlugs && m_DebugPlugArrow)
+				{
+					m_DebugPlugArrow.Destroy();
+					m_DebugPlugArrow = null;
+				}
+				
+				OnOwnSocketReleased(device_to_unplug);
+				device_to_unplug.GetCompEM().OnIsUnplugged(m_ThisEntityAI);
+				device_to_unplug.ShowSelection(SEL_CORD_FOLDED);
+				device_to_unplug.HideSelection(SEL_CORD_PLUGGED);
+			}
+		}
+	}
+
+	//! Energy manager: Unplugs this device from its power source
+	void UnplugThis()
+	{
+		if (GetGame())
+		{
+			if (GetEnergySource())
+			{
+				GetEnergySource().GetCompEM().UnplugDevice(m_ThisEntityAI);
+			}
+		}
+	}
+	
+	//! Energy manager: Unplugs everything directly connected to this device
+	void UnplugAllDevices()
+	{
+		if ( GetPluggedDevices() ) // This check is necesarry in case this function is called before initialization
+		{
+			int indexStart	= GetPluggedDevicesCount() - 1;
+			for (int i = indexStart; i >= 0; --i)
+			{
+				UnplugDevice(GetPluggedDevices().Get(i));
+			}
+		}
+	}
+	
+	// Used only for storing of the plug's state through server restart
+	void RestorePlugState(bool state)
+	{
+		m_RestorePlugState = state;
+	}
+
+	//! Energy manager: Sets stored energy for this device. It ignores the min/max limit!
+	void SetEnergy(float new_energy)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer()) // Client can't change energy value.
+		{
+			m_ThisEntityAI.SetWeightDirty();
+			float old_energy = m_Energy;
+			m_Energy = new_energy;
+			
+			if ( old_energy - GetEnergyUsage() <= 0 || (old_energy != new_energy && Math.Min(old_energy,new_energy) <= 0) )
+			{
+				UpdateCanWork();
+			}
+		}
+	}
+	
+	//! Energy manager: Sets stored energy for this device between 0 and MAX based on relative input value between 0 and 1
+	void SetEnergy0To1(float energy01)
+	{
+		SetEnergy( Math.Lerp(0, GetEnergyMax(),energy01));
+	}
+
+	//! Energy manager: Shows/Hides all selections this system works with. Call this if something is wrong with selections (like during Init and Restore event in config)
+	void UpdateSelections()
+	{
+		// Lets update sockets, if there are any
+		int slots_c = GetSocketsCount();
+		
+		for ( int i = 0; i < slots_c; ++i )
+		{
+			EntityAI plug_owner = GetDeviceBySocketID(i);
+			
+			if ( plug_owner )
+			{
+				string plugged_selection = SOCKET_ + (i+1).ToString() + _PLUGGED;
+				string available_selection = SOCKET_ + (i+1).ToString() + _AVAILABLE;
+				m_ThisEntityAI.ShowSelection ( plugged_selection );
+				m_ThisEntityAI.HideSelection ( available_selection );
+				string texture_path = plug_owner.GetCompEM().GetCordTextureFile();
+				int selection_index = m_ThisEntityAI.GetHiddenSelectionIndex( plugged_selection );
+				m_ThisEntityAI.SetObjectTexture(selection_index, texture_path );
+			}
+			else
+			{
+				m_ThisEntityAI.ShowSelection ( SOCKET_ + (i+1).ToString() + _AVAILABLE );
+				m_ThisEntityAI.HideSelection ( SOCKET_ + (i+1).ToString() + _PLUGGED );
+			}
+		}
+		
+		// Now lets update the cord/plug state
+		if ( GetEnergySource() )
+		{
+			m_ThisEntityAI.ShowSelection ( SEL_CORD_PLUGGED );
+			m_ThisEntityAI.HideSelection ( SEL_CORD_FOLDED );
+		}
+		else
+		{
+			m_ThisEntityAI.ShowSelection ( SEL_CORD_FOLDED );
+			m_ThisEntityAI.HideSelection ( SEL_CORD_PLUGGED );
+		}
+	}
+
+	//! Energy manager: Unplugs this device when it's necesarry
+	void UpdatePlugState()
+	{
+		if (m_ThisEntityAI.GetCompEM().GetEnergySource())
+		{
+			EntityAI player = m_ThisEntityAI.GetHierarchyRootPlayer();
+			// Check if the item is held in hands during advanced placement
+			if (player)
+			{
+				// Measure distance from the player
+				vector playerPosition = player.GetPosition();
+				if (!IsEnergySourceAtReach(playerPosition, 5))
+					UnplugThis();
+			}
+			else
+			{
+				// Measure distance from the device
+				vector itemPosition = m_ThisEntityAI.GetPosition();
+				
+				if (m_ThisEntityAI.GetHierarchyParent())
+					itemPosition = m_ThisEntityAI.GetHierarchyParent().GetPosition();
+				
+				if (!IsEnergySourceAtReach(itemPosition))
+					UnplugThis();
+			}
+		}
+	}
+
+	// Returns an array of plug types this device can accept
+	void GetCompatiblePlugTypes(out TIntArray IDs)
+	{
+		IDs = m_CompatiblePlugTypes;
+	}
+
+	// Stores IDs of the energy source.
+	void StoreEnergySourceIDs(int b1, int b2, int b3, int b4)
+	{
+		m_EnergySourceStorageIDb1 = b1;
+		m_EnergySourceStorageIDb2 = b2;
+		m_EnergySourceStorageIDb3 = b3;
+		m_EnergySourceStorageIDb4 = b4;
+	}
+	
+	//! Energy manager: Changes the maximum amount of energy this device can store (when pristine).
+	void SetEnergyMaxPristine(float new_limit)
+	{
+		m_EnergyStorageMax = new_limit;
+	}
+	
+	//! Energy manager: Changes the length of the virtual power cord.
+	void SetCordLength( float new_length )
+	{
+		m_CordLength = new_length;
+	}
+	
+	// Sets the plug type (for plug -> socket compatibility checks).
+	void SetPlugType( int new_type )
+	{
+		m_PlugType = new_type;
+	}
+	
+	// Sets the new attachment action type.
+	void SetAttachmentAction( int new_action_type )
+	{
+		m_AttachmentActionType = new_action_type;
+	}
+	
+	//! Energy manager: Changes the energy usage per second.
+	void SetEnergyUsage( float new_usage )
+	{
+		m_EnergyUsage = new_usage;
+	}
+	
+	//! Energy manager: Resets energy usage to default (config) value.
+	void ResetEnergyUsage()
+	{
+		string cfg_energy_usage = "CfgVehicles " + m_ThisEntityAI.GetType() + " EnergyManager ";
+		m_EnergyUsage = GetGame().ConfigGetFloat (cfg_energy_usage + "energyUsagePerSecond");
+	}
+	
+	// Sets path to the cord texture file.
+	void SetCordTextureFile( string new_path )
+	{
+		m_CordTextureFile = new_path;
+	}
+	
+	// Sets energy source. Intended to be called only on client through RPC.
+	void SetEnergySourceClient( EntityAI source )
+	{	
+		SetEnergySource(source);
+	}
+	
+	//! Energy manager: Stores the device which is plugged into the given socket ID.
+	void SetDeviceBySocketID(int id, EntityAI plugged_device)
+	{
+		m_Sockets[id] = plugged_device;
+	}
+	
+		
+	//! Energy manager: Sets visibility of the electricity icon (bolt).
+	void SetElectricityIconVisibility( bool make_visible )
+	{
+		m_HasElectricityIcon = make_visible;
+	}
+	
+	// Checks whenever this device can work or not and updates this information on all clients. Can be called many times per frame because synchronization happens only once if a change has occured.
+	void UpdateCanWork()
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			bool current_state = CanWork();
+			
+			if (current_state != m_CanWork)
+			{
+				m_CanWork = current_state;
+				Synch();
+				
+				if ( m_ThisEntityAI && m_ThisEntityAI.GetHierarchyParent() && m_ThisEntityAI.GetHierarchyParent().GetCompEM() )
+				{
+					m_ThisEntityAI.GetHierarchyParent().GetCompEM().UpdateCanWork();
+				}
+			}
+		}
+	}
+	
+	void HandleMoveInsideCargo(EntityAI container)
+	{
+		if ( m_AutoSwitchOffWhenInCargo )
+		{
+			if (IsSwitchedOn())
+			{
+				SwitchOff();
+			}
+		}
+	}
+	
+	//! Energy manager: Sets the interval of the OnWork(...) calls. Changing this value does not change the rate of energy consumption.
+	void SetUpdateInterval( float value )
+	{
+		m_UpdateInterval = value;
+	}
+	
+	// Returns true if this device was plugged into something at the end of previous session
+	bool GetRestorePlugState()
+	{
+		return m_RestorePlugState;
+	}
+	
+	//! Energy manager: Attempts to plug this device into the energy_source. Returns true if the action was successfull, or false if not (due to plug incompatibility or no free socket on the receiver). The ID of the power socket is chosen automatically unless optional parameter socket_id is used (starting from 0). If the given ID is not free then a free socket is found.
+	bool PlugThisInto(EntityAI energy_source, int socket_id = -1)
+	{
+		return energy_source.GetCompEM().PlugInDevice(m_ThisEntityAI, socket_id);
+	}
+	
+	//! Energy manager: Checks if the device can be switched ON
+	bool CanSwitchOn()
+	{
+		if ( !IsSwitchedOn() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	
+	/**
+	\brief Energy manager: Checks whenever this device can do work or not.
+		\param test_energy \p float optional parameter will overwite the default energy consumption value of this device.
+		\return \p bool Returns true if this device will work when it's switched on. Otherwise it returns false.
+	*/
+	bool CanWork( float test_energy = -1)
+	{
+		if ( GetGame().IsMultiplayer()  &&  GetGame().IsClient() )
+		{
+			return m_CanWork;
+		}
+		
+		if (m_ThisEntityAI && m_ThisEntityAI.IsRuined())
+		{
+			return false;
+		}
+		
+		// Check if the power source(s) (which can be serially connected) can provide needed energy.
+		float 		energy_usage 	= test_energy;
+		float 		gathered_energy = GetEnergy();
+		EntityAI	energy_source 	= GetEnergySource();
+		
+		if (energy_usage == -1)
+		{
+			energy_usage = GetEnergyUsage();
+		}
+		
+		if ( !CheckWetness() )
+		{
+			return false;
+		}
+		
+		if (gathered_energy <= 0 && energy_usage <= 0) //empty power source
+		{
+			return false;
+		}
+		
+		int cycle_limit = 500; // Sanity check to definitely avoid infinite cycles
+		
+		while ( gathered_energy < energy_usage ) // Look for energy source if we don't have enough stored energy
+		{
+			// Safetycheck!
+			if (cycle_limit > 0)
+			{
+				cycle_limit--;
+			}
+			else
+			{
+				DPrint("Energy Manager ERROR: The 'cycle_limit' safety break had to be activated to prevent possible game freeze. Dumping debug information...");
+				//Print(m_ThisEntityAI);
+				//Print(this);
+				//Print(energy_source);
+				
+				if (energy_source.GetCompEM())
+				{
+					//Print(energy_source.GetCompEM());
+				}
+				
+				//Print(gathered_energy);
+				//Print(energy_usage);
+				
+				//Print(m_ThisEntityAI.GetPosition());
+				
+				if (energy_source)
+				{
+					//Print(energy_source.GetPosition());
+				}
+				
+				//Print("End of the 'cycle_limit' safety break ^ ");
+				
+				return false;
+			}
+			// ^ Safetycheck!
+			
+			if ( energy_source  &&  energy_source != m_ThisEntityAI  &&  !energy_source.IsRuined()  &&  energy_source.GetCompEM()  &&  energy_source.GetCompEM().IsSwitchedOn()  &&  energy_source.GetCompEM().CheckWetness() )
+			{
+				gathered_energy = gathered_energy + energy_source.GetCompEM().GetEnergy();
+				energy_source = energy_source.GetCompEM().GetEnergySource();
+			}
+			else
+			{
+				// No power source, no energy.
+				return false;
+			}
+		}
+		
+		// Enough energy was found
+		return true;
+	}
+
+	//! Energy manager: Checks if this device is being stopped from working by its wetness level. Returns true when its wetness is not blocking it, false when its to owet to work.
+	bool CheckWetness()
+	{
+		return (m_ThisEntityAI.GetWet() <= 1-m_WetnessExposure);
+	}
+	
+	//! Energy manager: Checks if the device can be switched OFF
+	bool CanSwitchOff()
+	{
+		if ( IsPassive() )
+		{
+			return false;
+		}
+		
+		return IsSwitchedOn();
+	}
+
+	// Returns previous state of the switch.
+	bool GetPreviousSwitchState()
+	{
+		return m_IsSwichedOnPreviousState;
+	}
+	
+	//! Energy manager: Returns state of the switch. Whenever the device is working or not does not matter. Use IsWorking() to account for that as well.
+	bool IsSwitchedOn()
+	{
+		return m_IsSwichedOn;
+	}
+
+	//! Energy manager: Returns true if the cord of this device is folded. Returns false if it's plugged.
+	bool IsCordFolded()
+	{
+		if ( IsPlugged() )
+			return false;
+		
+		return true;
+	}
+	
+	//! Energy manager: Returns true if this device is set to be passive. False if otherwise.
+	bool IsPassive()
+	{
+		return m_IsPassiveDevice;
+	}
+
+	//! Energy manager: Returns true if this device is plugged into some other device (even if they are OFF or ruined). Otherwise it returns false.
+	bool IsPlugged()
+	{
+		return m_IsPlugged;
+	}
+	
+	
+	//! Energy manager: Consumes the given amount of energy. If there is not enough of stored energy in this device, then it tries to take it from its power source, if any exists. Returns true if the requested amount of energy was consumed. Otherwise it returns false.
+	bool ConsumeEnergy(float amount)
+	{
+		return FindAndConsumeEnergy(m_ThisEntityAI, amount, true);
+	}
+
+	//! Energy manager: Returns true if this device is working right now.
+	bool IsWorking()
+	{
+		return m_IsWorking;
+	}
+
+	//! Energy manager: Returns true if this device has enough of stored energy for its own use.
+	bool HasEnoughStoredEnergy()
+	{
+		if ( GetEnergy() > GetEnergyUsage() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	//! Energy manager: Returns true if this device has any free socket to receive a plug. If optional parameter socket_id is provided then only that socket ID is checked.
+	bool HasFreeSocket( int socket_id = -1 )
+	{
+		if (socket_id == -1)
+		{
+			int plugged_devices = GetPluggedDevicesCount();
+			int plugged_devices_limit = GetSocketsCount();
+			
+			if ( plugged_devices < plugged_devices_limit )
+			{
+				return true;
+			}
+			
+			return false;
+		}
+		else
+		{
+			EntityAI device = GetDeviceBySocketID(socket_id);
+			
+			if (device)
+			{
+				return false;
+			}
+			else
+			{
+				return true;
+			}
+		}
+	}
+
+	//! Energy manager: Checks if the given plug is compatible with this device's socket. Used by CanReceivePlugFrom() method.
+	bool IsPlugCompatible(int plug_ID)
+	{
+		if ( plug_ID == PLUG_UNDEFINED )
+		{
+			return true; // When plugType is undefined in config then make it compatible.
+		}
+		
+		if ( m_CompatiblePlugTypes )
+		{
+			for ( int i = 0; i < m_CompatiblePlugTypes.Count(); i++ )
+			{
+				int plug_ID_to_Check = m_CompatiblePlugTypes.Get(i);
+				
+				if ( plug_ID_to_Check == plug_ID )
+				{
+					return true;
+				}
+			}
+		}
+		else
+		{
+			// Since the config parameter compatiblePlugTypes is not present, then accept all plugs for simplicity's sake
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//! Energy manager: Returns true if this device can receive power plug of the other device.
+	bool CanReceivePlugFrom( EntityAI device_to_plug )
+	{
+		// The following conditions are broken down for the sake of easier reading/debugging.
+		
+		if ( HasFreeSocket()  &&  device_to_plug != m_ThisEntityAI)
+		{
+			if ( device_to_plug.GetCompEM().GetEnergySource() != m_ThisEntityAI)
+			{	
+				if ( IsPlugCompatible(device_to_plug.GetCompEM().GetPlugType()) )
+				{
+					if ( device_to_plug.GetCompEM().IsEnergySourceAtReach( device_to_plug.GetPosition(), 0, m_ThisEntityAI.GetPosition() ) )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	//! Energy manager: Returns true if this device can be plugged into the given energy source. Otherwise returns false.
+	bool CanBePluggedInto( EntityAI potential_energy_provider )
+	{
+		return potential_energy_provider.GetCompEM().CanReceivePlugFrom( m_ThisEntityAI );
+	}
+	
+	//! Energy manager: Returns true if the electricity icon (bolt) is supposed to be visible for this device. False if not.
+	bool HasElectricityIcon()
+	{
+		return m_HasElectricityIcon;
+	}
+	
+	//! Energy manager: Returns true if this item automatically converts its energy to quantity
+	bool HasConversionOfEnergyToQuantity()
+	{
+		return m_ConvertEnergyToQuantity;
+	}
+
+	/**
+	\brief Energy manager: Returns true if this device's virtual power cord can reach its energy source at the given position, depending on its cordLength config parameter. Otherwise returns false.
+		\param from_position \p vector position from where the measurement will be taken
+		\param add_tolerance \p float parameter will add to the cord's length in meters (optional)
+		\return \p bool True if the power source will be at reach for the plug, or if config param cordLength is absent or 0. False if not, or is not plugged, or this device lacks Energy Manager component.
+		@code
+			vector position_player = GetGame().GetPlayer().GetPosition();
+			
+			if ( my_device.GetCompEM().IsEnergySourceAtReach( position_player )  )
+			{
+				Print("Power source is at reach!");
+			}else{
+				Print("Power source is NOT at reach!");
+			}
+		@endcode
+	*/
+	bool IsEnergySourceAtReach( vector from_position, float add_tolerance = 0, vector override_source_position = "-1 -1 -1" )
+	{
+		if ( !IsPlugged()  &&  override_source_position == "-1 -1 -1" )
+		{
+			return false;
+		}
+		
+		if ( GetCordLength() == 0 ) // 0 is an exception, which means infinitely long cable.
+		{
+			return true;
+		}
+		
+		vector source_pos;
+		float distance;
+		
+		if ( override_source_position == "-1 -1 -1" )
+		{
+			EntityAI energy_source = GetEnergySource();
+			
+			if (!energy_source)
+				return false;
+			
+			source_pos = energy_source.GetPosition();
+			distance = vector.Distance( from_position, source_pos );
+		}
+		else
+		{
+			source_pos = override_source_position;
+			distance = vector.Distance( from_position, source_pos );
+		}
+		
+		if (distance > GetCordLength() + add_tolerance)
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	bool HasVisibleSocketsInInventory()
+	{
+		return m_ShowSocketsInInventory;
+	}
+	
+	//! Energy manager: Returns true if this selection is a plug that's plugged into this device. Otherwise returns false.
+	bool IsSelectionAPlug(string selection_to_test )
+	{
+		if ( GetPluggedDevices() )
+		{
+			int socket_count = GetSocketsCount();
+			
+			for ( int i = socket_count; i >= 0; --i )
+			{
+				string real_selection = SOCKET_ + i.ToString() +_PLUGGED;
+				
+				if ( selection_to_test == real_selection)
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	
+	
+	
+	//! Energy manager: Returns the count of power sockets (whenever used or not)
+	int GetSocketsCount()
+	{
+		return m_SocketsCount;
+	}
+
+	//! Energy manager: Returns plug type. Check \DZ\data\basicDefines.hpp  OR  \Scripts\Classes\Component\_constants.h files for types of plugs
+	int GetPlugType()
+	{
+		return m_PlugType;
+	}
+
+	// Returns the action ID which is supposed to be done upon receiving an attachment
+	int GetAttachmentAction()
+	{
+		return m_AttachmentActionType;
+	}
+
+	// Returns persistent ID (block 1) of the energy source
+	int GetEnergySourceStorageIDb1()
+	{
+		return m_EnergySourceStorageIDb1;
+	}
+
+	// Returns persistent ID (block 2) of the energy source
+	int GetEnergySourceStorageIDb2()
+	{
+		return m_EnergySourceStorageIDb2;
+	}
+	
+	// Returns persistent ID (block 3) of the energy source
+	int GetEnergySourceStorageIDb3()
+	{
+		return m_EnergySourceStorageIDb3;
+	}
+	
+	// Returns persistent ID (block 4) of the energy source
+	int GetEnergySourceStorageIDb4()
+	{
+		return m_EnergySourceStorageIDb4;
+	}
+	
+	// Returns network ID (low) of the energy source
+	int GetEnergySourceNetworkIDLow()
+	{
+		return m_EnergySourceNetworkIDLow;
+	}
+
+	// Returns network ID (high) of the energy source
+	int GetEnergySourceNetworkIDHigh()
+	{
+		return m_EnergySourceNetworkIDHigh;
+	}
+	
+	//! Energy manager: Returns the number of devices plugged into this one.
+	int GetPluggedDevicesCount()
+	{
+		if ( GetPluggedDevices() )
+		{
+			return GetPluggedDevices().Count();
+		}
+		
+		return 0;
+	}
+	
+	//! Energy manager: Returns % of stored energy this device has as integer (from 0 to 100)
+	int GetEnergy0To100()
+	{
+		if ( m_EnergyStorageMax > 0 )
+		{
+			int coef = Math.Round( m_Energy / m_EnergyStorageMax * 100 );
+			return coef;
+		}
+		
+		return 0;
+	}
+	
+	//! Energy manager: Returns % of stored energy this device has as float (from 0.0 to 1.0)
+	float GetEnergy0To1()
+	{
+		if ( m_EnergyStorageMax > 0 )
+		{
+			return m_Energy / m_EnergyStorageMax;
+		}
+		
+		return 0;
+	}
+	
+	//! Energy manager: Returns the update interval of this device.
+	float GetUpdateInterval()
+	{
+		#ifdef DIAG_DEVELOPER
+		if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.ENERGY_CONSUMPTION) || (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.ENERGY_RECHARGE)))
+		{
+			return 1;//when modifying time accel, we might want to see things happen when they should, instead of waiting for the next tick
+		}
+		#endif
+		return m_UpdateInterval;
+	}
+	
+	//! Returns wetness exposure value defined in config
+	float GetWetnessExposure()
+	{
+		return m_WetnessExposure;
+	}
+	
+	//! Energy manager: Returns the number of energy this device needs to run itself (See its config >> energyUsagePerSecond)
+	float GetEnergyUsage()
+	{
+		return m_EnergyUsage;
+	}
+
+	//! Energy manager: Returns the amount of stored energy this device has
+	float GetEnergy()
+	{
+		return m_Energy;
+	}
+
+	//! Energy manager: Adds energy to this device and clamps it within its min/max storage limits. Returns the amount of energy that was clamped. Negative value is supported, but you should still use ConsumeEnergy(...) for propper substraction of energy.
+	float AddEnergy(float added_energy)
+	{
+		if (added_energy != 0)
+		{
+			//Print("AddEnergy ---------> " + added_energy + " " + this + " " +m_ThisEntityAI.ClassName());
+			#ifdef DIAG_DEVELOPER
+			if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.ENERGY_CONSUMPTION) && added_energy < 0)
+			{
+				float timeAccel = FeatureTimeAccel.GetFeatureTimeAccelValue();
+				added_energy *= timeAccel;
+			}
+			#endif
+			
+			bool energy_was_added = (added_energy > 0);
+			
+			float energy_to_clamp = GetEnergy() + added_energy;
+			float clamped_energy = Math.Clamp( energy_to_clamp, 0, GetEnergyMax() );
+			SetEnergy(clamped_energy);
+			StartUpdates();
+			
+			if (energy_was_added)
+				OnEnergyAdded();
+			else
+				OnEnergyConsumed();
+			
+			return energy_to_clamp - clamped_energy;
+		}
+		
+		return 0;
+	}
+	
+	//! Energy manager: Returns the maximum amount of energy this device can curently store. If parameter 'reduceMaxEnergyByDamageCoef' is used in the config of this device then the returned value will be reduced by damage.
+	float GetEnergyMax()
+	{
+		float max_health = 0;
+		
+		if ( m_ThisEntityAI.HasDamageSystem() )
+			max_health = m_ThisEntityAI.GetMaxHealth("","");
+		//else if ( m_ReduceMaxEnergyByDamageCoef != 0 )
+		//	Error("[ERROR] ReduceMaxEnergyByDamageCoef is setup but " + m_ThisEntityAI.GetType() + " does not have a Damage System");
+		
+		if ( max_health == 0 || m_ReduceMaxEnergyByDamageCoef == 0 )
+			return GetEnergyMaxPristine();
+		
+		float health = 100;
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer()) // TO DO: Remove this IF when method GetHealth can be called on client!
+			health = m_ThisEntityAI.GetHealth("","");
+		
+		float damage_coef = 1 - (health / max_health);
+		
+		return GetEnergyMaxPristine() * (1 - ( damage_coef * m_ReduceMaxEnergyByDamageCoef ) );
+	}
+	
+	//! Energy manager: Returns the maximum amount of energy this device can store. It's damage is NOT taken into account.
+	float GetEnergyMaxPristine()
+	{
+		return m_EnergyStorageMax;
+	}
+	
+	float GetEnergyAtSpawn()
+	{
+		return m_EnergyAtSpawn;
+	}
+	
+	//! Energy manager: Returns the length of the virtual power cord.
+	float GetCordLength()
+	{
+		return m_CordLength;
+	}
+
+	//! Energy manager: Returns the energy source this device is plugged into
+	EntityAI GetEnergySource()
+	{
+		return m_EnergySource;
+	}
+	
+	//! Energy manager: Returns the device which is plugged into the given socket ID.
+	EntityAI GetDeviceBySocketID(int id)
+	{
+		return m_Sockets[id];
+	}
+
+	//! Energy manager: Returns the device to which the given plug selection belongs to
+	EntityAI GetPlugOwner(string plug_selection_name)
+	{
+		if ( m_DeviceByPlugSelection.Contains(plug_selection_name) )
+		{
+			return m_DeviceByPlugSelection.Get(plug_selection_name);
+		}
+		
+		return NULL;
+	}
+	
+	//! Energy manager: Returns a device which is plugged into this one. If there are more devices to choose from then it returns the first one that is found.
+	EntityAI GetPluggedDevice()
+	{
+		if ( GetPluggedDevicesCount() > 0 )
+		{
+			return GetPluggedDevices().Get(0);
+		}
+		
+		return NULL;
+	}
+	
+	//! Energy manager: Returns path to the cord texture file.
+	string GetCordTextureFile()
+	{
+		return m_CordTextureFile;
+	}
+
+	//! Energy manager: Returns an array of devices which are plugged into this one
+	array<EntityAI> GetPluggedDevices()
+	{
+		return m_PluggedDevices;
+	}
+
+	//! Energy manager: Returns an array of devices which are plugged into this one and are turned on
+	array<EntityAI> GetPoweredDevices()
+	{
+		array<EntityAI> return_array = new array<EntityAI>;
+		int plugged_devices_c = GetPluggedDevicesCount();
+		for ( int i = 0; i < plugged_devices_c; ++i )
+		{
+			EntityAI device = GetPluggedDevices().Get(i);
+			if ( IsSwitchedOn() )
+			{
+				return_array.Insert(device);
+			}
+		}
+		
+		return return_array;
+	}
+	
+	
+	/*===================================
+				PUBLIC EVENTS
+	===================================*/
+
+	// Called every device update if its supposed to do some work. The update can be every second or at random, depending on its manipulation.
+	void OnWork( float consumed_energy ) 
+	{
+		m_ThisEntityAI.OnWork(consumed_energy);
+	}
+
+	// Called when this device is plugged into some energy source
+	void OnIsPlugged(EntityAI source_device) 
+	{
+		if (m_DebugPlugs)
+		{
+			if (!m_DebugUpdate)
+				m_DebugUpdate = new Timer( CALL_CATEGORY_SYSTEM );
+			
+			if (!m_DebugUpdate.IsRunning())
+				m_DebugUpdate.Run(0.01, this, "DebugUpdate", NULL, true);
+		}
+		
+		UpdateCanWork();
+		m_ThisEntityAI.OnIsPlugged(source_device);
+	}
+
+	// Called when this device is UNPLUGGED from the energy source
+	void OnIsUnplugged( EntityAI last_energy_source ) 
+	{
+		UpdateCanWork();
+		m_ThisEntityAI.OnIsUnplugged( last_energy_source );
+	}
+
+	// When something is plugged into this device
+	void OnOwnSocketTaken( EntityAI device ) 
+	{
+		//play sound
+		if ( device.GetCompEM().GetPlugType() == PLUG_COMMON_APPLIANCE && m_ThisEntityAI.IsInitialized() )
+		{
+			EffectSound sound_plug;
+			m_ThisEntityAI.PlaySoundSet( sound_plug, "cablereel_plugin_SoundSet", 0, 0 );
+		}
+		
+		m_ThisEntityAI.OnOwnSocketTaken(device);
+	}
+
+	// When something is UNPLUGGED from this device
+	void OnOwnSocketReleased( EntityAI device ) 
+	{
+		//play sound
+		if ( device.GetCompEM().GetPlugType() == PLUG_COMMON_APPLIANCE && m_ThisEntityAI.IsInitialized() )
+		{
+			EffectSound sound_unplug;
+			m_ThisEntityAI.PlaySoundSet( sound_unplug, "cablereel_unplug_SoundSet", 0, 0 );
+		}
+				
+		m_ThisEntityAI.OnOwnSocketReleased( device );
+	}
+	
+	
+	// Handles automatic attachment action
+	void OnAttachmentAdded(EntityAI elec_device)
+	{
+		int attachment_action_type = GetAttachmentAction();
+		
+		if ( attachment_action_type == PLUG_THIS_INTO_ATTACHMENT )
+		{
+			if ( elec_device.GetCompEM().CanReceivePlugFrom( m_ThisEntityAI ) )
+			{
+				PlugThisInto(elec_device);
+			}
+		}
+		else if ( attachment_action_type == PLUG_ATTACHMENTS_INTO_THIS )
+		{
+			elec_device.GetCompEM().PlugThisInto(m_ThisEntityAI);
+		}
+	}
+
+	// Handles automatic detachment action
+	void OnAttachmentRemoved(EntityAI elec_device)
+	{
+		int attachment_action_type = GetAttachmentAction();
+		
+		if ( attachment_action_type == PLUG_THIS_INTO_ATTACHMENT )
+		{
+			if ( elec_device == GetEnergySource() )
+			{
+				UnplugThis();
+			}
+		}
+		else if ( attachment_action_type == PLUG_ATTACHMENTS_INTO_THIS )
+		{
+			elec_device.GetCompEM().UnplugThis();
+		}
+	}
+
+	// Starts the device's main cycle
+	void StartUpdates()
+	{
+		if (!m_IsPassiveDevice)
+		{
+			if (!m_UpdateTimer)
+				m_UpdateTimer = new Timer(CALL_CATEGORY_SYSTEM);
+			
+			if (!m_UpdateTimer.IsRunning()) // Makes sure the timer is NOT running already
+			{
+				m_UpdateTimer.Run(GetUpdateInterval(), this, "DeviceUpdate", null, true);
+			}
+		}
+	}
+	
+	//! Energy manager: Called when energy was consumed on this device
+	void OnEnergyConsumed()
+	{
+		m_ThisEntityAI.OnEnergyConsumed();
+	}
+	
+	//! Energy manager: Called when energy was added on this device
+	void OnEnergyAdded()
+	{
+		if (m_UpdateQuantityTimer)
+		{
+			m_UpdateQuantityTimer.Stop();
+			m_UpdateQuantityTimer = NULL;
+		}
+		
+		m_ThisEntityAI.OnEnergyAdded();
+	}
+
+
+	/*===================================
+			 PROTECTED FUNCTIONS
+	===================================*/
+
+	// Stops the device's main cycle
+	protected void StopUpdates()
+	{
+		if (m_UpdateTimer)
+		{
+			m_UpdateTimer.Stop();
+			m_UpdateTimer = NULL; // Delete timer from memory
+		}
+	}
+
+	//! Gets called originally when the player is interacting with an item containing this energy component, then recursively following the branches of connection from the original item to the peripheries
+	//! External calling of this function is not automatic for all item interactions and may need to be implemented on case by case bases
+	//! Avoid using for gameplay logic, use 'OnInteractBranch' instead
+	void InteractBranch(EntityAI originalCaller, Man player = null, int system = 0)
+	{
+		OnInteractBranch(originalCaller, player, system);
+		if ( GetSocketsCount() > 0 )
+		{
+			array<EntityAI> devices = GetPluggedDevices();
+			
+			foreach ( EntityAI device : devices)
+			{
+				if ( device != originalCaller ) // originalCaller check here prevents infinite loops
+				{
+					device.GetCompEM().InteractBranch( originalCaller, player, system );
+				}
+			}
+		}
+	}
+	
+	//! Called when the player is interacting with an item containing this energy component, or when interacting with an item this device is connected to
+	protected void OnInteractBranch(EntityAI originalCaller, Man player, int system)
+	{
+		m_ThisEntityAI.IncreaseLifetime();
+	
+	}
+		
+	// 'Wakes up' all devices down the network so they start working, if they have enough power, and are switched ON
+	protected void WakeUpWholeBranch( EntityAI original_caller )
+	{
+		if ( GetSocketsCount() > 0 )
+		{
+			array<EntityAI> plugged_devices = GetPluggedDevices();
+			int plugged_devices_c = plugged_devices.Count();
+			
+			for ( int i = 0; i < plugged_devices_c; ++i )
+			{
+				EntityAI device = plugged_devices.Get(i);
+				if ( device != original_caller ) // original_caller check here prevents infinite loops
+				{
+					device.GetCompEM().UpdateCanWork();
+					device.GetCompEM().DeviceUpdate();
+					device.GetCompEM().StartUpdates();
+					device.GetCompEM().WakeUpWholeBranch( original_caller );
+				}
+			}
+		}
+	}
+
+	// Finds an available socket and plugs the given device into it.
+	// This is mainly about visualisation.
+	protected void PlugCordIntoSocket( EntityAI device_to_plug, int socket_id = -1 )
+	{
+		if (socket_id >= 0)
+		{
+			EntityAI plug_owner_by_socket = GetDeviceBySocketID(socket_id);
+			
+			if (!plug_owner_by_socket)
+			{
+				UpdateSocketSelections(socket_id, device_to_plug);
+				return;
+			}
+		}
+
+		int slots_c = GetSocketsCount();
+		
+		for ( int i = 0; i < slots_c; ++i )
+		{
+			EntityAI plug_owner = GetDeviceBySocketID(i);
+			
+			if ( !plug_owner ) // Check if this socket is available
+			{
+				UpdateSocketSelections(i, device_to_plug);
+				break;
+			}
+		}
+	}
+	
+	// Updates socket selections (plugged/unplugged) of the given ID and sets color texture of the plug.
+	protected void UpdateSocketSelections(int socket_id, EntityAI device_to_plug)
+	{
+		SetDeviceBySocketID(socket_id, device_to_plug);
+		
+		string plugged_selection = SOCKET_ + (socket_id+1).ToString() + _PLUGGED;
+		SetPlugOwner( plugged_selection, device_to_plug );
+		m_ThisEntityAI.ShowSelection ( plugged_selection );
+		
+		string unplugged_selection = SOCKET_ + (socket_id+1).ToString() + _AVAILABLE;
+		m_ThisEntityAI.HideSelection ( unplugged_selection );
+		string texture_path = device_to_plug.GetCompEM().GetCordTextureFile();
+		int selection_index = m_ThisEntityAI.GetHiddenSelectionIndex( plugged_selection );
+		m_ThisEntityAI.SetObjectTexture( selection_index, texture_path );
+		device_to_plug.GetCompEM().SetMySocketID(socket_id);
+	}
+	
+	
+	// Sets energy source for this device
+	protected void SetEnergySource( EntityAI source )
+	{	
+		m_EnergySource = source;
+		
+		if (source)
+		{
+			m_IsPlugged = true;
+			StartUpdates();
+		}
+		else
+		{
+			m_IsPlugged = false;
+			m_EnergySourceNetworkIDLow = -1;
+			m_EnergySourceNetworkIDHigh = -1;
+		}
+		
+		if (m_EnergySource)
+			m_EnergySource.GetNetworkID(m_EnergySourceNetworkIDLow, m_EnergySourceNetworkIDHigh);
+		
+		Synch();
+	}
+
+	// Plugs the given device into this one
+	protected bool PlugInDevice(EntityAI device_to_plug, int socket_id = -1)
+	{
+		if (CanReceivePlugFrom(device_to_plug))
+		{
+			device_to_plug.IncreaseLifetime();
+			InteractBranch(m_ThisEntityAI);
+			if (device_to_plug.GetCompEM().IsPlugged())
+				device_to_plug.GetCompEM().UnplugThis();
+			
+			GetPluggedDevices().Insert(device_to_plug);
+			device_to_plug.GetCompEM().SetEnergySource(m_ThisEntityAI);
+			
+			PlugCordIntoSocket(device_to_plug, socket_id); // Visualisation
+			OnOwnSocketTaken(device_to_plug);
+			
+			device_to_plug.GetCompEM().OnIsPlugged(m_ThisEntityAI);
+			WakeUpWholeBranch( m_ThisEntityAI );
+			
+			if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+			{
+				device_to_plug.HideSelection(SEL_CORD_FOLDED);
+				device_to_plug.ShowSelection(SEL_CORD_PLUGGED);
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	// Sets the device to which the given plug selection belongs to
+	protected void SetPlugOwner(string selection_name, EntityAI device)
+	{
+		if ( m_DeviceByPlugSelection.Contains(selection_name) )
+		{
+			m_DeviceByPlugSelection.Set(selection_name, device);
+		}
+	}
+	
+	// Frees the given socket.
+	// This is only about visualisation.
+	protected void UnplugCordFromSocket( int socket_to_unplug_ID )
+	{
+		EntityAI plug_owner = GetDeviceBySocketID(socket_to_unplug_ID);
+		
+		if ( plug_owner )
+		{
+			SetDeviceBySocketID(socket_to_unplug_ID, NULL);
+			string unplugged_selection = SOCKET_ + (socket_to_unplug_ID+1).ToString() + _AVAILABLE;
+			m_ThisEntityAI.ShowSelection ( unplugged_selection );
+			
+			string plugged_selection = SOCKET_ + (socket_to_unplug_ID+1).ToString() + _PLUGGED;
+			m_ThisEntityAI.HideSelection ( plugged_selection );
+			SetPlugOwner( plugged_selection, NULL );
+			plug_owner.GetCompEM().SetMySocketID(-1);
+		}
+	}
+
+	// Sets the state of the device
+	protected void SetPowered( bool state )
+	{
+		m_IsWorking = state;
+	}
+	
+	// Tries to consume the given amount of energy. If there is none in this device, then it tries to take it from some power source.
+	protected bool FindAndConsumeEnergy(EntityAI original_caller, float amount, bool ignore_switch_state = false)
+	{
+		if ( (ignore_switch_state  ||  IsSwitchedOn())  &&  !m_ThisEntityAI.IsRuined() )
+		{
+			float available_energy = AddEnergy(-amount);
+			
+			if ( available_energy < 0  &&  IsPlugged() )
+			{
+				// This devices does not has enough of stored energy, therefore it will take it from its power source (which can be a chain of cable reels)
+				EntityAI next_power_source = GetEnergySource();
+				
+				if (next_power_source  &&  next_power_source != original_caller) // Prevents infinite loop if the power source is the original caller itself
+				{
+					return next_power_source.GetCompEM().FindAndConsumeEnergy( original_caller, -available_energy );
+				}
+			}
+			
+			if ( available_energy >= 0)
+			{
+				return true;
+			}
+			
+			return false;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	// Gets the socket ID this device is powered from.
+	protected int GetMySocketID()
+	{
+		return m_MySocketID;
+	}
+	
+	// Sets the socket ID this device is plugged into.
+	protected void SetMySocketID( int slot_ID )
+	{
+		m_MySocketID = slot_ID;
+	}
+
+	void Synch()
+	{
+		m_ThisEntityAI.SetSynchDirty();
+	}
+	
+	void ClearLastUpdateTime()
+	{
+		m_LastUpdateTime = 0;
+	}
+	
+	void RememberLastUpdateTime()
+	{
+		m_LastUpdateTime = GetCurrentUpdateTime();
+	}
+	
+	float GetCurrentUpdateTime()
+	{
+		return GetGame().GetTime();
+	}
+	
+	// Updates the device's state of power. This function is visualized in the diagram at DayZ Confluence >> Camping & Squatting >> Electricity >> Energy Manager functionalities
+	void DeviceUpdate()
+	{
+		/*
+		vector pos = m_ThisEntityAI.GetPosition();
+		string debug_message = "Object " + m_ThisEntityAI.GetType() + "  |  Energy: " + GetEnergy() + "  |  IsAtReach: " + (IsEnergySourceAtReach(pos)).ToString();
+		Print(debug_message);
+		*/
+		
+		if ( !m_IsPassiveDevice )
+		{
+			// 'm_ThisEntityAI' and 'this' must be checked because this method is caled from a timer
+			if ( m_ThisEntityAI  &&  this  &&  IsSwitchedOn()  &&  !m_ThisEntityAI.IsRuined()  &&  CheckWetness()  &&  m_CanWork  &&  !GetGame().IsMissionMainMenu() )
+			{
+				bool was_powered = IsWorking();
+				float consumed_energy_coef;
+				// Make sure to use only as much % of energy as needed since this function can be called at random.
+				
+				if ( m_LastUpdateTime == 0 )
+				{
+					RememberLastUpdateTime();
+					consumed_energy_coef = 1.0;
+				}
+				else
+				{
+					float updatetime = GetCurrentUpdateTime();
+					float time = updatetime - m_LastUpdateTime;
+					consumed_energy_coef = time / 1000;
+				}
+				
+				if (consumed_energy_coef > 0) // Prevents calling of OnWork events when no energy is consumed
+				{
+					m_LastUpdateTime = GetCurrentUpdateTime();
+					float consume_energy = GetEnergyUsage() * consumed_energy_coef;
+					bool has_consumed_enough = true;
+					
+					if (GetGame().IsServer() || !GetGame().IsMultiplayer()) // single player or server side multiplayer
+						has_consumed_enough = ConsumeEnergy( consume_energy );
+					
+					SetPowered( has_consumed_enough );
+					
+					if ( has_consumed_enough )
+					{
+						if ( !was_powered )
+						{
+							m_CanStopWork = true;
+							WakeUpWholeBranch(m_ThisEntityAI);
+							GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnWorkStart", NULL, 0);
+							UpdateCanWork();
+						}
+						
+						OnWork( consume_energy );
+					}
+					else
+					{
+						if ( was_powered )
+						{
+							if (m_CanStopWork)
+							{
+								m_CanStopWork = false;
+								ClearLastUpdateTime();
+								GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnWorkStop", NULL, 0); // This event is called only once when the device STOPS being powered
+								UpdateCanWork();
+								
+								if (m_AutoSwitchOff)
+								{
+									SwitchOff(); 
+								}
+							}
+						}
+						
+						StopUpdates();
+					}
+				}
+				else
+				{
+					ClearLastUpdateTime();
+				}
+			}
+			else if (this && m_ThisEntityAI)
+			{
+				SetPowered( false );
+				StopUpdates();
+				
+				if (m_CanStopWork)
+				{
+					m_CanStopWork = false;
+					ClearLastUpdateTime();
+					GetGame().GameScript.CallFunction(m_ThisEntityAI, "OnWorkStop", NULL, 0); // This event is called only once when the device STOPS being powered
+					UpdateCanWork();
+					
+					if (m_AutoSwitchOff)
+					{
+						SwitchOff(); 
+					}
+				}
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Component/ComponentEntityDebug.c b/scripts/3_Game/DayZ/tools/Component/ComponentEntityDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..bb1a32d9750dca87ba15709176cd4ac28be00c13
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Component/ComponentEntityDebug.c
@@ -0,0 +1,124 @@
+class ComponentEntityDebug extends Component
+{
+	
+	protected Shape				m_DebugShapeBBox;
+	protected Shape				m_DebugShapeDirection;
+	protected float				m_DebugShapeDirectionDist;
+
+	// -------------------------------------------------------------------------
+	override Shape DebugBBoxDraw()
+	{
+		#ifndef DEVELOPER
+		return null;
+		#endif
+		
+		if ( m_DebugShapeBBox )
+			m_DebugShapeBBox.Destroy();
+				
+		vector min_max[2];
+		
+		if (!m_ThisEntityAI.GetCollisionBox(min_max))
+			return null;
+		
+		m_DebugShapeBBox = Debug.DrawBox(min_max[0], min_max[1]);
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(OnDrawing, 0, true);
+		
+		m_ThisEntityAI.SetEventMask(EntityEvent.FRAME);
+
+		return null;
+	}
+
+	// -------------------------------------------------------------------------
+	override void DebugBBoxSetColor(int color)
+	{
+		if ( m_DebugShapeBBox )
+		{
+			m_DebugShapeBBox.SetColor(color);
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	override void DebugBBoxDelete()
+	{
+		#ifndef DEVELOPER
+		return;
+		#endif
+		
+		if ( m_DebugShapeBBox )
+		{
+			m_DebugShapeBBox.Destroy();
+			m_DebugShapeBBox = null;
+		}
+		
+		if ( !m_DebugShapeDirection && !m_DebugShapeBBox )
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Remove(OnDrawing);
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	override Shape DebugDirectionDraw(float distance = 1)
+	{	
+		#ifndef DEVELOPER
+		return null;
+		#endif
+		
+		if ( m_DebugShapeDirection )
+		{
+			m_DebugShapeDirection.Destroy();
+		}
+		
+		vector p1 = "0 0 0";
+		vector p2 = m_ThisEntityAI.GetDirection() * m_DebugShapeDirectionDist;
+		m_DebugShapeDirectionDist = distance;
+		m_DebugShapeDirection = Debug.DrawArrow(p1, p2);
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(OnDrawing, 0, true);
+		
+		m_ThisEntityAI.SetEventMask(EntityEvent.FRAME);
+		return null;
+	}
+
+	// -------------------------------------------------------------------------
+	override void DebugDirectionDelete()
+	{
+		#ifndef DEVELOPER
+		return;
+		#endif
+		
+		if ( m_DebugShapeDirection )
+		{
+			m_DebugShapeDirection.Destroy();
+			m_DebugShapeDirection = null;
+		}
+		
+		if ( !m_DebugShapeDirection && !m_DebugShapeBBox )
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Remove(OnDrawing);
+		}
+	}
+
+	void OnDrawing()
+	{
+		#ifndef DEVELOPER
+		return;
+		#endif
+		
+		if ( m_DebugShapeBBox || m_DebugShapeDirection )
+		{		
+			vector mat[4];
+			m_ThisEntityAI.GetTransform(mat);
+		
+			if ( m_DebugShapeBBox )
+			{
+				m_DebugShapeBBox.SetMatrix(mat);
+			}
+			
+			if ( m_DebugShapeDirection )
+			{
+				m_DebugShapeDirection.SetMatrix(mat);			
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Component/_constants.c b/scripts/3_Game/DayZ/tools/Component/_constants.c
new file mode 100644
index 0000000000000000000000000000000000000000..acd9a8099e8a63156a1974f0468cf77b9c17f42d
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Component/_constants.c
@@ -0,0 +1,36 @@
+// Commands using action data chanel sync
+const int INPUT_UDT_STANDARD_ACTION_START			= 1;
+const int INPUT_UDT_STANDARD_ACTION_END_REQUEST		= 2;
+const int INPUT_UDT_STANDARD_ACTION_INPUT_END		= 3;
+const int INPUT_UDT_QUICKABARSHORTCUT				= 4;
+const int INPUT_UDT_MELEE_TARGET					= 5;
+const int INPUT_UDT_WEAPON_ACTION					= 6;
+const int INPUT_UDT_ITEM_MANIPULATION				= 7;
+const int INPUT_UDT_INVENTORY						= 8;
+const int INPUT_UDT_ADVANCED_PLACEMENT				= 9;
+//const int INPUT_UDT_WEAPON_REMOTE_SYNC			= 9; // obsolette
+const int INPUT_UDT_WEAPON_REMOTE_EVENT				= 10;
+const int INPUT_UDT_USER_MUTE_XBOX					= 11;
+const int INPUT_UDT_HAND_REMOTE_EVENT				= 12;
+//const int INPUT_UDT_USER_SYNC_PERMISSIONS			= 12;// obsolete
+const int INPUT_UDT_WEAPON_LIFT_EVENT 				= 13;
+const int INPUT_UDT_RESET_ADS						= 14;
+const int INPUT_UDT_GESTURE							= 15;
+
+// ELECTRICITY SYSTEM CONSTANTS
+
+// Plug types
+const int PLUG_UNDEFINED 				= 0;
+const int PLUG_BATTERY_SLOT 			= 1;
+const int PLUG_COMMON_APPLIANCE 		= 2;
+const int PLUG_CROCODILE_PINS 			= 3;
+const int PLUG_CROCODILE_PINS_CHARGER 	= 4;
+const int PLUG_PAS_DEVICE	 			= 5;
+const int PLUG_BARBED_WIRE				= 6;
+const int PLUG_GAS_CAN_SLOT				= 7;
+const int PLUG_VEHICLE_BATTERY_PINS		= 8;
+
+// Automatic attachment actions
+const int NO_ATTACHMENT_ACTION 			= 0;
+const int PLUG_THIS_INTO_ATTACHMENT 	= 1;
+const int PLUG_ATTACHMENTS_INTO_THIS 	= 2;
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/ComponentsBank.c b/scripts/3_Game/DayZ/tools/ComponentsBank.c
new file mode 100644
index 0000000000000000000000000000000000000000..ea18e3392d1753752450816661d5391a65bded7d
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/ComponentsBank.c
@@ -0,0 +1,81 @@
+class ComponentsBank
+{
+	private EntityAI	m_EntityParent;
+	private ref Component	m_Components[COMP_TYPE_COUNT];
+		
+	void ComponentsBank(EntityAI entity_parent)
+	{
+		m_EntityParent = entity_parent;
+	}
+
+	Component GetComponent(int comp_type, string extended_class_name="")
+	{
+		if ( !Component.IsTypeExist(comp_type) )
+		{
+			Component.LogErrorBadCompType(comp_type, "EntityAI.GetComponent(int comp_type)");
+			return NULL;
+		}
+		
+		if ( !IsComponentAlreadyExist(comp_type) )
+		{
+			CreateComponent(comp_type, extended_class_name);
+		}
+		
+		return m_Components[comp_type];		
+	}
+	
+	bool DeleteComponent(int comp_type)
+	{
+		if ( IsComponentAlreadyExist(comp_type) )
+		{
+			m_Components[comp_type] = NULL;
+			return true;
+		}
+		
+		return false;
+	}
+
+	private Component CreateComponent(int comp_type, string extended_class_name="")
+	{
+		if ( !Component.IsTypeExist(comp_type) )
+		{
+			Component.LogErrorBadCompType(comp_type, "EntityAI->CreateComponent(int comp_type)");
+			return NULL;
+		}
+		
+		if ( IsComponentAlreadyExist(comp_type) )
+		{
+			Component.LogWarningAlredyExist(comp_type, "EntityAI->CreateComponent(int comp_type)");
+			return m_Components[comp_type];
+		}
+		
+		
+		string clas_name = extended_class_name;
+		
+		if ( clas_name == string.Empty )
+		{
+			clas_name = Component.GetNameByType(comp_type);
+		}
+		
+		Component comp = Component.Cast(clas_name.ToType().Spawn());
+		
+		comp.SetParentEntityAI(m_EntityParent);
+		comp.Event_OnAwake();
+		
+		m_Components[comp_type] = comp;
+		
+		comp.Event_OnInit();
+		
+		return comp;
+	}
+
+	bool IsComponentAlreadyExist(int comp_type)
+	{
+		if ( m_Components[comp_type] != NULL )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Debug.c b/scripts/3_Game/DayZ/tools/Debug.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f89fb9ecfce7aa86fbc8b620b5507607140f13b
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Debug.c
@@ -0,0 +1,978 @@
+// TODO:
+// 1. Alredy exist some key in array / map
+// 2. Object is null (check object & log error)
+// 3. Debug version only
+// 4. Destructor of static classes
+// 5. Debug Console Interface:
+//		- Clear Log
+//		- Filter
+//		- Log per frame
+// 6. Per frame log ?
+// 7. Zapis do fajlu
+
+class Debug
+{	
+	static private const string	LOG_DEBUG					= "Debug";
+	static private const string	LOG_DEBUG_ACTION			= "Action";
+	static private const string	LOG_DEBUG_SYMPTOM			= "Symptom";
+	static private const string	LOG_DEBUG_INV_MOVE			= "Inv Move";
+	static private const string	LOG_DEBUG_INV_RESERVATION	= "Inv Rrsv";
+	static private const string	LOG_DEBUG_INV_HFSM			= "HFSM";
+	static private const string	LOG_DEBUG_QUICKBAR			= "Quickbar";
+	static private const string	LOG_DEBUG_BASEBUILDING		= "Base Building";
+	static private const string	LOG_DEBUG_BLEEDING_CHANCES	= "Bleeding";
+	static private const string LOG_DEBUG_TRIGGER			= "Trigger";
+	static private const string LOG_DEBUG_PARTICLE			= "Particle";
+	static private const string LOG_DEBUG_TF				= "TestFramework";
+	static private const string LOG_DEBUG_WEIGHT			= "Weight";
+	static private const string LOG_DEBUG_MELEE				= "Melee";
+	static private const string LOG_DEBUG_WEATHER			= "Weather";
+
+	static private const string	LOG_INFO					= "Info";
+	static private const string	LOG_WARNING					= "Warning";
+	static private const string	LOG_ERROR					= "Error";
+	static private const string	LOG_DEFAULT					= "n/a";
+	
+	static private ref array<Shape>	m_DebugShapes;
+	
+	static Widget m_DebugLayoutCanvas;
+	static CanvasWidget m_CanvasDebug;
+	
+	
+	
+	static string GetDebugName(Managed entity)
+	{
+		if (!entity)
+			return "";
+		
+		Object obj;
+		if (CastTo(obj, entity))
+			return obj.GetDebugNameNative();
+		
+		return entity.GetDebugName();
+	}
+	
+	static void InitCanvas()
+	{
+		if (!m_DebugLayoutCanvas)
+		{
+			m_DebugLayoutCanvas = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_debugcanvas.layout");
+			m_CanvasDebug = CanvasWidget.Cast( m_DebugLayoutCanvas.FindAnyWidget( "CanvasWidget" ) );
+		}
+	}
+
+	static void ClearCanvas()
+	{
+		if (m_CanvasDebug)
+			m_CanvasDebug.Clear();
+	}
+	
+	static void CanvasDrawLine(float x1, float y1, float x2, float y2, float width, int color)
+	{
+		InitCanvas();
+		m_CanvasDebug.DrawLine(x1, y1, x2, y2, width, color);
+	}
+	
+	/**
+	\brief Draws a "point" on the screen at x,y coordinates
+	Debug.ClearCanvas();
+	for(int i = 0; i < 700;i++)
+	{
+		float val = i/700;
+		float y = Easing.EaseInOutExpo(val);
+		Debug.CanvasDrawPoint(i,y*700,ARGBF( 0.6, 1, 1, 1 ));
+	}
+	*/
+	
+	static void CanvasDrawPoint(float x1, float y1, int color)
+	{
+		CanvasDrawLine(x1, y1, x1+1, y1, 1, color);
+	}
+	
+	static void	Init()
+	{
+		m_DebugShapes	= new array<Shape>;
+	}
+	
+	static void DestroyAllShapes()
+	{
+		for ( int i = 0; i < m_DebugShapes.Count(); ++i )
+		{
+			if ( m_DebugShapes.Get(i) )
+			{
+				m_DebugShapes.Get(i).Destroy();
+			}
+		}
+		
+		m_DebugShapes.Clear();
+	}
+	
+	static void RemoveShape(out Shape shape)
+	{
+		if (!shape) return;
+		for ( int i = 0; i < m_DebugShapes.Count(); i++ )
+		{
+			Shape found_shape = m_DebugShapes.Get(i);
+			
+			if ( found_shape  &&  found_shape == shape )
+			{
+				found_shape.Destroy();
+				m_DebugShapes.Remove(i); // Mandatory! Otherwise the Destroy() function causes crash!
+				shape = null;
+				return;
+			}
+		}
+	}
+	/**
+	\brief Prints debug message with normal prio
+		\param msg \p string Debug message for print
+		\return \p void None
+		@code
+			Debug.Log("Hello World");
+			
+			>> [Log]: Hello World;
+		@endcode
+	*/
+	static void	Log(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	ActionLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_ACTION, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	SymptomLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_SYMPTOM, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	InventoryMoveLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_INV_MOVE, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	InventoryReservationLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_INV_RESERVATION, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	InventoryHFSMLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_INV_HFSM, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	QuickbarLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_QUICKBAR, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}	
+	
+	static void	BaseBuildingLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_BASEBUILDING, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	BleedingChancesLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_BLEEDING_CHANCES, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	TriggerLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_DEBUG_TRIGGER, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	ParticleLog(string message = LOG_DEFAULT, Managed caller = null, string function = "", Managed entity = null)
+	{
+		string res = LogMessage(LOG_DEBUG_PARTICLE, GetDebugName(caller), GetDebugName(entity), "", function, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	TFLog(string message = LOG_DEFAULT, TestFramework caller = null, string function = "")
+	{
+		string res = LogMessage(LOG_DEBUG_TF, GetDebugName(caller), "", "", function, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	WeightLog(string message = LOG_DEFAULT, Managed caller = null, string function = "", Managed entity = null)
+	{
+		/*
+		string res = LogMessage(LOG_DEBUG_WEIGHT, GetDebugName(caller), GetDebugName(entity), "", function, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+		*/
+	}
+	
+	static void	MeleeLog(Entity entity, string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT)
+	{
+		string logMessage = string.Format("%1: %2", entity.GetSimulationTimeStamp(), message);
+		string res = LogMessage(LOG_DEBUG_MELEE, plugin, GetDebugName(entity), author, label, logMessage);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	WeatherLog(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		if (!LogManager.IsWeatherLogEnabled())
+		{
+			return;
+		}
+
+		string res = LogMessage(LOG_DEBUG_WEATHER, plugin, entity, author, label, message);
+
+		#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+		#endif
+	}
+	
+	/**
+	\brief Prints debug message with normal prio
+		\param msg \p string Debug message for print
+		\return \p void None
+		@code
+			Debug.Log("Hello World");
+			
+			>> [Log]: Hello World;
+		@endcode
+	*/
+	static void	LogInfo(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_INFO, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	/**
+	\brief Prints debug message as warning message
+		\param msg \p string Debug message for warning print
+		\return \p void None
+		@code
+			Debug.LogWarning("Hello World, this is warning log");
+			
+			>> [Warning]: Hello World, this is warning log
+		@endcode
+	*/
+	static void	LogWarning(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_WARNING, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	/**
+	\brief Prints debug message as error message
+		\param msg \p string Debug message for error print
+		\return \p void None
+		@code
+			Debug.LogError("Hello World, this is error log");
+			
+			>> [Error]: Hello World, this is error log
+		@endcode
+	*/
+	static void	LogError(string message = LOG_DEFAULT, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		string res = LogMessage(LOG_ERROR, plugin, entity, author, label, message);
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	LogArrayInt(array<int> arr = NULL, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		if (arr == null)
+			return;
+
+		string res;
+
+		for (int i = 0; i < arr.Count(); i++)
+		{
+			res += LogMessage(LOG_DEBUG, plugin, entity, author, label, arr.Get(i).ToString());
+		}
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	LogArrayString(array<string> arr = NULL, string plugin = LOG_DEFAULT, string author = LOG_DEFAULT, string label = LOG_DEFAULT, string entity = LOG_DEFAULT)
+	{
+		if (arr == null)
+			return;
+
+		string res;
+			
+		for (int i = 0; i < arr.Count(); i++)
+		{
+			res += LogMessage(LOG_DEBUG, plugin, entity, author, label, arr.Get(i));
+		}
+
+#ifdef LOG_TO_RPT
+		if (res.Length() > 0)
+		{
+			PrintToRPT("" + res);
+		}
+#endif
+	}
+	
+	static void	ReceivedLogMessageFromServer(string message)
+	{
+		if (!LogManager.IsLogsEnable())
+		{
+			return;
+		}
+
+		SaveLog(message);
+
+#ifdef LOG_TO_RPT
+		if (message.Length() > 0)
+		{
+			PrintToRPT("" + message);
+		}
+#endif
+	}
+	
+	static void ClearScriptLogs()
+	{
+		ClearLogs();
+	}
+
+	static Shape DrawBox(vector pos1, vector pos2, int color = 0x1fff7f7f)
+	{
+		return DrawBoxEx(pos1, pos2, color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE);
+	}
+	
+	static Shape DrawBoxEx(vector pos1, vector pos2, int color = 0x1fff7f7f, ShapeFlags flags = ShapeFlags.TRANSP|ShapeFlags.NOZWRITE)
+	{
+		Shape shape = Shape.Create(ShapeType.BBOX, color, flags, pos1, pos2);
+		if (( flags & ShapeFlags.ONCE ) == 0)
+			m_DebugShapes.Insert(shape);
+		return shape;
+	}
+	
+	static Shape DrawCube(vector pos, float size = 1, int color = 0x1fff7f7f)
+	{
+		vector min = pos;
+		vector max = pos;
+		
+		float size_h = size * 0.5;
+	
+		min[0] = min[0] - size_h;
+		min[1] = min[1] - size_h;
+		min[2] = min[2] - size_h;
+		
+		max[0] = max[0] + size_h;
+		max[1] = max[1] + size_h;
+		max[2] = max[2] + size_h;
+		
+		Shape shape = Shape.Create(ShapeType.DIAMOND, color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE, min, max);
+		m_DebugShapes.Insert(shape);
+		return shape;
+	}
+	
+	static Shape DrawSphere(vector pos, float size = 1, int color = 0x1fff7f7f, ShapeFlags flags = ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE)
+	{
+		Shape shape = Shape.CreateSphere(color, flags, pos, size);
+		if (( flags & ShapeFlags.ONCE ) == 0)
+			m_DebugShapes.Insert(shape);
+		return shape;
+	}
+	
+	static Shape DrawFrustum(float horizontalAngle, float verticalAngle, float length, int color = 0x1fff7f7f, ShapeFlags flags = ShapeFlags.TRANSP|ShapeFlags.WIREFRAME)
+	{
+		Shape shape = Shape.CreateFrustum(horizontalAngle, verticalAngle, length, color, flags);
+		if (( flags & ShapeFlags.ONCE ) == 0)
+			m_DebugShapes.Insert(shape);
+		return shape;
+	}
+	
+	static Shape DrawCylinder(vector pos, float radius, float height = 1, int color = 0x1fff7f7f, ShapeFlags flags = ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE )
+	{
+		Shape shape = Shape.CreateCylinder(color, flags, pos, radius, height);
+		if (( flags & ShapeFlags.ONCE ) == 0)
+			m_DebugShapes.Insert(shape);
+		return shape;
+	}
+	
+	static array<Shape> DrawCone(vector pos, float lenght, float halfAngle, float offsetAngle, int color = 0xFFFFFFFF, int flags = 0)
+	{
+		array<Shape> shapes = new array<Shape>;
+		
+		vector endL, endR;
+		Math3D.ConePoints(pos, lenght, halfAngle, offsetAngle, endL, endR);
+
+		// Left side
+		shapes.Insert( Debug.DrawLine(pos, endL, color, flags) );
+		// Rigth side
+		shapes.Insert( Debug.DrawLine(pos, endR, color, flags) );
+		// Top side
+		shapes.Insert( Debug.DrawLine(endL, endR, color, flags) );
+		// Middle (height) line		
+		shapes.Insert( Debug.DrawLine(pos, pos + Vector(Math.Cos(offsetAngle), 0, Math.Sin(offsetAngle)).Normalized() * lenght, color, flags) );
+		
+		return shapes;
+	}
+	
+	/**
+	DrawLine
+	\nFlags:
+	\n ShapeFlags.NOZBUFFER
+	\n ShapeFlags.NOZUPDATE
+	\n ShapeFlags.DOUBLESIDE
+	\n ShapeFlags.WIREFRAME
+	\n ShapeFlags.TRANSP
+	\n ShapeFlags.ONCE
+	\n ShapeFlags.NOOUTLINE
+	\n ShapeFlags.NOCULL
+	*/
+	static Shape DrawLine(vector from, vector to, int color = 0xFFFFFFFF, int flags = 0)
+	{
+		vector pts[2]
+		pts[0] = from;
+		pts[1] = to;
+		
+		Shape shape = Shape.CreateLines(color, flags, pts, 2);
+		if (( flags & ShapeFlags.ONCE ) == 0)
+			m_DebugShapes.Insert(shape);
+		//m_DebugShapes.Debug();
+		return shape;
+	}
+
+	static Shape DrawLines(vector[] positions, int count, int color = 0xFFFFFFFF, int flags = 0)
+	{
+		
+		Shape shape = Shape.CreateLines(color, flags, positions, count);
+		if (( flags & ShapeFlags.ONCE ) == 0)
+			m_DebugShapes.Insert(shape);
+		return shape;
+	}
+	
+	static Shape DrawArrow(vector from, vector to, float size = 0.5, int color = 0xFFFFFFFF, int flags = 0)
+	{
+		Shape shape = Shape.CreateArrow(from, to, size, color, flags);
+		m_DebugShapes.Insert(shape);
+		return shape;
+	}
+
+	
+	
+	/**
+	\brief Returns some of base config classes strings like CfgVehicles, CfgWeapons, etc. for searching purposes
+		\param base_classes \p out TStringArray Array containing some of base config classes
+	*/
+	static void GetBaseConfigClasses( out TStringArray base_classes )
+	{
+		base_classes.Clear();
+		base_classes.Insert(CFG_VEHICLESPATH);
+		base_classes.Insert(CFG_WEAPONSPATH);
+		base_classes.Insert(CFG_MAGAZINESPATH);
+		base_classes.Insert(CFG_AMMO);
+		base_classes.Insert(CFG_WORLDS);
+		base_classes.Insert(CFG_SURFACES);
+		base_classes.Insert(CFG_SOUND_SETS);
+		base_classes.Insert(CFG_SOUND_SHADERS);
+		base_classes.Insert(CFG_NONAI_VEHICLES);
+		base_classes.Insert(CFG_SOUND_TABLES);
+	}
+	
+	/**
+	\brief Returns config classes containing search_string in name
+		\param search_string \p string String to search in class names
+		\param filtered_classes \p out TStringArray Array containing filtered classes based on search_string
+		\param only_public \p bool Set to true to return only public classes, set to false to return all filtered classes
+	*/
+	static void GetFiltredConfigClasses( string search_string, out TStringArray filtered_classes, bool only_public = true )
+	{	
+		TStringArray searching_in = new TStringArray;
+		GetBaseConfigClasses( searching_in );
+		
+		filtered_classes.Clear();
+		
+		search_string.ToLower();
+		
+		for ( int s = 0; s < searching_in.Count(); ++s )
+		{
+			string config_path = searching_in.Get(s);
+			
+			int objects_count = GetGame().ConfigGetChildrenCount(config_path);
+			for (int i = 0; i < objects_count; i++)
+			{
+				string childName;
+				GetGame().ConfigGetChildName(config_path, i, childName);
+	
+				if ( only_public )
+				{
+					int scope = GetGame().ConfigGetInt( config_path + " " + childName + " scope" );
+					if ( scope == 0 )
+					{
+						continue;
+					}
+				}
+				
+				string nchName = childName;
+				nchName.ToLower();
+	
+				if ( nchName.Contains(search_string) != -1)
+				{
+					filtered_classes.Insert(childName);
+				}
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------
+	//-------private
+	
+	static private bool				m_EnabledLogs; //! DEPRECATED
+		
+	static private string LogMessage(string level, string plugin, string entity, string author, string label, string message)
+	{
+		if (GetGame() == null || !LogManager.IsLogsEnable())
+			return string.Empty;
+		
+		bool is_server_log = ( GetGame().IsServer() && GetGame().IsMultiplayer() );
+		
+		
+		// Formation output to external file
+		// %date{MM-dd HH:mm:ss} | %Enviroment | %Level | %Module | %Entity | %Author | %Label | %Message	
+		string date			= GetDate();
+		string env			= "Client";
+		string msg			= string.Empty;
+		
+		if ( is_server_log )
+		{
+			env = "Server";
+		}
+		
+		msg = string.Format("%1 | %2 | %3 | %4 | %5 | %6 | %7", date, env, level, plugin, entity, label, message);
+	
+		if ( is_server_log )
+		{
+			SaveLog(msg);
+			#ifdef DEVELOPER //not sendig log to clients on stable
+			Param1<string> msg_p = new Param1<string>(msg);
+			CallMethod(CALL_ID_SEND_LOG, msg_p);
+			#endif
+		}
+		else
+		{
+			SaveLog(msg);
+		}
+
+		return msg;
+	}
+	
+	static private void	SaveLog(string log_message)
+	{
+		#ifndef SERVER
+		CachedObjectsParams.PARAM1_STRING.param1 = log_message;
+		GetDispatcher().CallMethod(CALL_ID_SCR_CNSL_ADD_PRINT, CachedObjectsParams.PARAM1_STRING);
+		#endif		
+		
+		FileHandle fileHandle = OpenFile(GetFileName(), FileMode.APPEND);		
+		if (fileHandle == 0)
+			return;
+
+		FPrintln(fileHandle, log_message);
+		CloseFile(fileHandle);
+
+		#ifndef LOG_TO_RPT
+		#ifdef DIAG_DEVELOPER
+		Print(string.Format("%1", log_message));
+		#endif
+		#endif
+	}
+	
+	static void	ClearLogs()
+	{
+		if (FileExist(GetFileName()))
+		{
+			FileHandle fileHandle = OpenFile(GetFileName(), FileMode.WRITE);
+			if (fileHandle == 0)
+				return;
+				
+			FPrintln(fileHandle, "");
+			CloseFile(fileHandle);	
+		}
+	}
+	
+	static string GetFileName()
+	{
+		return CFG_FILE_SCRIPT_LOG_EXT;
+	}
+	
+	static private string GetDate()
+	{
+		int year;
+		int month;
+		int day;
+		int hour;
+		int minute;
+		int second;
+		
+		GetYearMonthDay(year, month, day);
+		GetHourMinuteSecond(hour, minute, second);
+		
+		string date = month.ToStringLen(2) + "-" + day.ToStringLen(2) + " " + hour.ToStringLen(2) + ":" + minute.ToStringLen(2) + ":" + second.ToStringLen(2);
+		
+		return date;
+	}
+};
+
+class LogManager
+{
+	static bool m_DoLogs;
+	static bool m_DoActionDebugLog;
+	static bool m_DoSymptomDebugLog;
+	static bool m_DoInventoryMoveLog;
+	static bool m_DoInventoryReservationLog;
+	static bool m_DoInventoryHFSMLog;
+	static bool m_DoSyncLog;
+	static bool m_DoQuickbarLog;
+	static bool m_DoBaseBuildingLog;
+	static bool m_DoWeaponLog;
+	static bool m_DoWeatherLog;
+	static bool m_DoBleedingChanceLog;
+	
+	static void Init()
+	{
+		#ifdef DIAG_DEVELOPER
+		m_DoLogs 					= true;
+		#else
+		m_DoLogs					= IsCLIParam("doLogs");
+		#endif
+
+		m_DoActionDebugLog 			= IsCLIParam("doActionLog");
+		m_DoSymptomDebugLog 		= IsCLIParam("doSymptomLog");
+		m_DoInventoryMoveLog 		= IsCLIParam("doInvMoveLog");
+		m_DoInventoryReservationLog = IsCLIParam("doInvReservLog");
+		m_DoInventoryHFSMLog 		= IsCLIParam("doInvHFSMLog");
+		m_DoSyncLog					= IsCLIParam("doSyncLog");
+		m_DoQuickbarLog 			= IsCLIParam("doQuickbarLog");
+		m_DoBaseBuildingLog			= IsCLIParam("doBaseBuildingLog");
+		m_DoWeaponLog 				= IsCLIParam("doWeaponLog");
+		m_DoWeatherLog 				= IsCLIParam("doWeatherLog");
+	}
+	
+	static bool IsLogsEnable()
+	{
+		return m_DoLogs;
+	}
+	
+	static void SetLogsEnabled(bool enable)
+	{
+		m_DoLogs = enable;
+	}
+	
+	static bool IsActionLogEnable()
+	{
+		return m_DoActionDebugLog;
+	}
+	
+	static void ActionLogEnable(bool enable)
+	{
+		m_DoActionDebugLog = enable;
+	}
+	
+	static bool IsInventoryMoveLogEnable()
+	{
+		return m_DoInventoryMoveLog;
+	}
+	
+	static void InventoryMoveLogEnable(bool enable)
+	{
+		m_DoInventoryMoveLog = enable;
+	}
+	
+	static bool IsInventoryReservationLogEnable()
+	{
+		return m_DoInventoryReservationLog;
+	}
+	
+	static void InventoryReservationLogEnable(bool enable)
+	{
+		m_DoInventoryReservationLog = enable;
+	}
+	
+	static bool IsInventoryHFSMLogEnable()
+	{
+		return m_DoInventoryHFSMLog;
+	}
+	
+	static void InventoryHFSMLogEnable(bool enable)
+	{
+		m_DoInventoryHFSMLog = enable;
+	}
+	
+	static bool IsSyncLogEnable()
+	{
+		return m_DoSyncLog;
+	}
+	
+	static void SyncLogEnable(bool enable)
+	{
+		m_DoSyncLog = enable;
+	}
+	
+	static bool IsQuickbarLogEnable()
+	{
+		return m_DoQuickbarLog;
+	}
+	
+	static void QuickbarLogEnable(bool enable)
+	{
+		m_DoQuickbarLog = enable;
+	}
+	
+	static bool IsBaseBuildingLogEnable()
+	{
+		return m_DoBaseBuildingLog;
+	}
+	
+	static void BaseBuildingLogEnable(bool enable)
+	{
+		m_DoBaseBuildingLog = enable;
+	}
+	
+	static bool IsSymptomLogEnable()
+	{
+		return m_DoSymptomDebugLog;
+	}
+	
+	static void SymptomLogEnable(bool enable)
+	{
+		m_DoSymptomDebugLog = enable;
+	}
+	
+	static bool IsWeaponLogEnable()
+	{
+		return m_DoWeaponLog;
+	}
+	
+	static void WeaponLogEnable(bool enable)
+	{
+		m_DoWeaponLog = enable;
+	}
+	
+	static bool IsWeatherLogEnabled()
+	{
+		return m_DoWeatherLog;
+	}
+	
+	static bool IsBleedingChancesLogEnable()
+	{
+		return m_DoBleedingChanceLog;
+	}
+	
+	static void BleedingChancesLogEnable(bool enable)
+	{
+		m_DoBleedingChanceLog = enable;
+	} 
+}
+
+enum WeightDebugType
+{
+	NONE 			= 0,
+	RECALC_FORCED 	= 1,
+	RECALC_DIRTY 	= 2,
+	DUMP_STACK		= 4,
+	SET_DIRTY_FLAG  = 8,
+}
+
+class WeightDebug
+{
+	static private ref map<EntityAI, ref WeightDebugData> m_WeightDebugData 	= new map<EntityAI, ref WeightDebugData>();
+	static WeightDebugType m_VerbosityFlags;
+	
+	//-------------------------------------------------------------
+	static WeightDebugData GetWeightDebug(EntityAI entity)
+	{
+		if (!m_WeightDebugData.Get(entity))
+		{
+			WeightDebugData data = new WeightDebugData(entity);
+			m_WeightDebugData.Insert(entity,data);
+			return data;
+		}
+		return m_WeightDebugData.Get(entity);
+	}
+	//-------------------------------------------------------------
+	static void ClearWeightDebug()
+	{
+		m_WeightDebugData.Clear();
+	}
+	//-------------------------------------------------------------
+	static void PrintAll(EntityAI entity)
+	{
+		GameInventory inv = entity.GetInventory();
+		if (!inv)
+			return;
+		array<EntityAI> items = new array<EntityAI>;
+		inv.EnumerateInventory(InventoryTraversalType.PREORDER, items);
+		for(int i = 0; i < items.Count(); i++)
+		{
+			EntityAI item = items.Get(i);
+			if (m_WeightDebugData.Get(item))
+			{
+				m_WeightDebugData.Get(item).Output();
+			}
+		}
+	}
+	//-------------------------------------------------------------
+	static void SetVerbosityFlags(WeightDebugType type)
+	{
+		m_VerbosityFlags = type;
+	}
+}
+
+class WeightDebugData
+{
+	string 	m_Classname;
+	string 	m_Weight;
+	int 	m_InventoryDepth;
+	string 	m_CalcDetails;
+	//-------------------------------------------------------------
+	void WeightDebugData(EntityAI entity)
+	{
+		m_Classname = entity.GetType();
+		m_InventoryDepth = entity.GetHierarchyLevel();
+	}
+	//-------------------------------------------------------------
+	void SetWeight(float weight)
+	{
+		m_Weight = weight.ToString();
+	}
+	//-------------------------------------------------------------
+	void SetCalcDetails(string details)
+	{
+		m_CalcDetails = details;
+	}
+	
+	//-------------------------------------------------------------
+	void AddCalcDetails(string details)
+	{
+		m_CalcDetails += "+ "+details;
+	}
+	//-------------------------------------------------------------
+	void Output()
+	{
+		string spaces;
+		for(int i = 0; i < m_InventoryDepth;i++)
+			spaces+="--------";
+
+		Print(spaces+">" + m_Classname + " Overall entity weight: "+ m_Weight + " Calculation details:" + m_CalcDetails);
+	}
+	//-------------------------------------------------------------
+
+}
diff --git a/scripts/3_Game/DayZ/tools/DebugPrint.c b/scripts/3_Game/DayZ/tools/DebugPrint.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f014281244b33507ee77ef8ec8fe8ce7040810d
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/DebugPrint.c
@@ -0,0 +1,229 @@
+class DebugPrint
+{	
+	static private const int 	MSG_LOG		= 0;
+	static private const int 	MSG_WARNING	= 1;
+	static private const int 	MSG_ERROR	= 2;
+	static private const int 	MSG_COUNT	= 3;
+	
+	static private string		s_MsgPrefix[MSG_COUNT];
+	static private string		s_MsgStackMarkStart;
+	static private string		s_MsgStackMarkEnd;
+	static private bool			s_MsgStackMarked;
+	static private bool			s_TraceAllLogs;
+	
+	static void OnInit()
+	{
+		s_MsgPrefix[MSG_LOG]		= "Log";
+		s_MsgPrefix[MSG_WARNING]	= "Warning";
+		s_MsgPrefix[MSG_ERROR]		= "Error";
+		
+		s_MsgStackMarkStart			= "-- Stack trace --";
+		s_MsgStackMarked			= false;
+		s_MsgStackMarkEnd			= "-----------------";
+		
+		s_TraceAllLogs				= false;
+	}
+	
+	/**
+	\brief Prints debug message with normal prio
+		\param msg \p string Debug message for print
+		\return \p void None
+		@code
+			DebugPrint.Log("Hello World");
+			
+			>> [Log]: Hello World;
+		@endcode
+	*/
+	static void	Log(string msg)
+	{
+		LogMessage(msg, MSG_LOG, s_TraceAllLogs);
+	}
+	
+	/**
+	\brief Prints debug message as normal message and prints stack trace of calls
+		\param msg \p string Debug message for print
+		\return \p void None
+		@code
+			DebugPrint.LogAndTrace("Hello World, this is normal log");
+			
+			>> [Log]: Hello World, this is normal log
+			>>		-- Stack trace --
+			>>   	OnKeyPress() Scripts/mission/missionGameplay.c : 230
+			>>   	OnKeyPress() Scripts/DayZGame.c : 346
+			>>   	-----------------
+		@endcode
+	*/
+	static void	LogAndTrace(string msg)
+	{
+		LogMessage(msg, MSG_LOG, true);
+	}
+	
+	/**
+	\brief Prints debug message as warning message
+		\param msg \p string Debug message for warning print
+		\return \p void None
+		@code
+			DebugPrint.LogWarning("Hello World, this is warning log");
+			
+			>> [Warning]: Hello World, this is warning log
+		@endcode
+	*/
+	static void	LogWarning(string msg)
+	{
+		LogMessage(msg, MSG_WARNING, s_TraceAllLogs);
+	}
+	
+	/**
+	\brief Prints debug message as warning message and prints stack trace of calls
+		\param msg \p string Debug message for warning print
+		\return \p void None
+		@code
+			DebugPrint.LogWarningAndTrace("Hello World, this is warning log");
+			
+			>> [Warning]: Hello World, this is warning log
+			>>		-- Stack trace --
+			>>   	OnKeyPress() Scripts/mission/missionGameplay.c : 230
+			>>   	OnKeyPress() Scripts/DayZGame.c : 346
+			>>   	-----------------
+		@endcode
+	*/
+	static void	LogWarningAndTrace(string msg)
+	{
+		LogMessage(msg, MSG_WARNING, true);
+	}
+	
+	/**
+	\brief Prints debug message as error message
+		\param msg \p string Debug message for error print
+		\return \p void None
+		@code
+			DebugPrint.LogError("Hello World, this is error log");
+			
+			>> [Error]: Hello World, this is error log
+		@endcode
+	*/
+	static void	LogError(string msg)
+	{
+		LogMessage(msg, MSG_ERROR, s_TraceAllLogs);
+	}
+	
+	/**
+	\brief Prints debug message as error message and prints stack trace of calls
+		\param msg \p string Debug message for error print
+		\return \p void None
+		@code
+			DebugPrint.LogErrorAndTrace("Hello World, this is error log");
+			
+			>> [Error]: Hello World, this is error log
+			>>		-- Stack trace --
+			>>   	OnKeyPress() Scripts/mission/missionGameplay.c : 230
+			>>   	OnKeyPress() Scripts/DayZGame.c : 346
+			>>   	-----------------
+		@endcode
+	*/
+	static void LogErrorAndTrace(string msg)
+	{
+		LogMessage(msg, MSG_ERROR, true);
+	}
+	
+	/**
+	\brief Function adjust received message for debug console (Do not use)
+		\param msg \p string Message for adjust
+		\return \p string Adjusted Message
+		@code
+		
+			string msg = DebugPrint.AdjustDebugLog("s = 'Hello World, this is error log'");
+			DebugPrint.Log(msg);
+			
+			>> Hello World, this is error log
+		@endcode
+	*/
+	static string AdjustDebugLog(string msg)
+	{
+		if ( IsStackTrace(msg) )
+		{
+			return TrimStackTrace(msg);
+		}
+		
+		if ( IsDebugLog(msg) ) 
+		{
+			return TrimDebugLog(msg);
+		}
+		
+		return msg;
+	}
+	
+	static void EnableTracingLogs(bool enable)
+	{
+		s_TraceAllLogs = enable;
+	}
+	
+	static private bool		IsDebugLog(string msg)
+	{
+		for ( int i = 0; i < MSG_COUNT; ++i )
+		{
+			if ( msg.IndexOf(s_MsgPrefix[i]) != -1 )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	static private string	TrimDebugLog(string msg)
+	{
+		int msg_lenght = msg.Length();
+		int log_start = msg.IndexOf("'") + 1;
+		
+		if ( log_start == -1 )
+		{
+			return msg;
+		}
+		
+		int log_lenght = msg_lenght - log_start - 2;
+		
+		return msg.Substring(log_start, log_lenght);
+	}
+	static private bool		IsStackTrace(string msg)
+	{
+		if ( s_MsgStackMarked && msg.IndexOf(s_MsgStackMarkEnd) != -1 )
+		{
+			s_MsgStackMarked = false;
+			return false;
+		}
+		
+		if ( s_MsgStackMarked )
+		{
+			return true;
+		}
+		
+		if ( msg.IndexOf(s_MsgStackMarkStart) != -1 )
+		{
+			s_MsgStackMarked = true;
+			return true;
+		}
+		
+		return false;
+	}
+	static private string	TrimStackTrace(string msg)
+	{
+		if ( msg.IndexOf("DebugPrint.c") != -1 )
+		{
+			return string.Empty;
+		}
+		
+		return msg;
+	}
+
+	static private void		LogMessage(string msg, int msg_type, bool trace=false)
+	{	
+		string mesg = "["+s_MsgPrefix[msg_type]+"]: "+msg;
+		
+		Print(mesg);
+		
+		if ( trace )
+		{
+			DumpStack();
+		}
+	}
+};
diff --git a/scripts/3_Game/DayZ/tools/Dispatcher.c b/scripts/3_Game/DayZ/tools/Dispatcher.c
new file mode 100644
index 0000000000000000000000000000000000000000..49d8a7a21f1ecb5f976680f883d11b26bfb4d42f
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Dispatcher.c
@@ -0,0 +1,45 @@
+typedef int CallID;
+
+const CallID CALL_ID_SEND_LOG							= 0;
+const CallID CALL_ID_SCR_CNSL_HISTORY_BACK				= 1;
+const CallID CALL_ID_SCR_CNSL_HISTORY_NEXT				= 2;
+const CallID CALL_ID_SCR_CNSL_ADD_PRINT					= 3;
+const CallID CALL_ID_SCR_CNSL_GET_SQF_WATCHER			= 4;
+const CallID CALL_ID_SCR_CNSL_SET_SQF_WATCHER_RESULT	= 5;
+const CallID CALL_ID_SCENE_EDITOR_COMMAND				= 6;
+const CallID CALL_ID_HIDE_INVENTORY						= 7;
+const CallID CALL_ID_SCR_CNSL_GETSELECTEDITEM			= 8;
+
+class Dispatcher
+{	
+	Param CallMethod(CallID call_id, Param params){}
+}
+
+ref Dispatcher g_Dispatcher;
+
+Dispatcher GetDispatcher()
+{
+	if ( g_Dispatcher == NULL )
+	{
+		//Print("[Dispatcher.h]=>GetDispatcher(): g_Dispatcher is NULL!!");
+		return NULL;
+	}
+	
+	return g_Dispatcher;
+}
+
+void SetDispatcher(Dispatcher dispatcher)
+{
+	g_Dispatcher = dispatcher;
+}
+
+Param CallMethod( CallID call_id, Param params )
+{
+	Dispatcher dis = GetDispatcher();
+	if ( dis )
+	{
+		return dis.CallMethod(call_id, params);
+	}
+	
+	return NULL;
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/InputUtils.c b/scripts/3_Game/DayZ/tools/InputUtils.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5e2c1e118486042488a2f281e4b85268121a1b2
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/InputUtils.c
@@ -0,0 +1,286 @@
+class InputUtils
+{
+	//useful for console preset differentiation
+	static const string PRESET_OLD 			= "#STR_UAPRESET_0";
+	static const string PRESET_NEW 			= "#STR_UAPRESET_1";
+	static const int VARIANT_OLD 			= 0;
+	static const int VARIANT_NEW 			= 1;
+	static int m_CurrentPresetIDConsole 	= -1;
+	//
+	
+	static protected ref map<int, ref array<int>> m_InputActionSortingMap; //<sorting_idx,<input_ID>>
+	static protected ref array<int> m_UnsortedInputActions;
+	
+	static const float ICON_SCALE_NORMAL	= 1.21;
+	static const float ICON_SCALE_TOOLBAR	= 1.81;
+	
+	static string GetButtonNameFromInput(string pInputName, int pInputDeviceType)
+	{
+		UAInput inp = GetUApi().GetInputByName(pInputName);
+		for (int i = 0; i < inp.AlternativeCount(); i++)
+		{
+			inp.SelectAlternative(i);
+			if (inp.CheckBindDevice(0, pInputDeviceType))
+			{
+				return GetUApi().GetButtonName(inp.GetBindKey(0));
+			}
+		}
+		
+		return "";
+	}
+	
+	//! returns a map of button names, combo or not
+	static map<int,ref TStringArray> GetComboButtonNamesFromInput(string pInputName, int pInputDeviceType) //TODO: revisit to include same input device alternatives too?
+	{
+		UAInput inp = GetUApi().GetInputByName(pInputName);
+		TStringArray buttons;
+		map<int,ref TStringArray> output;//<alternativeIDX<button_array>>
+		for (int i = 0; i < inp.AlternativeCount(); i++)
+		{
+			inp.SelectAlternative(i);
+			if (inp.BindingCount() > 0 && inp.Binding(0) != 0 && inp.CheckBindDevice(0,pInputDeviceType))
+			{
+				buttons = new TStringArray;
+				if (inp.IsCombo())
+				{
+					buttons.Insert(GetUApi().GetButtonName( inp.Binding(0) ));
+					
+					for (int j = 1; j < inp.BindingCount(); j++)
+					{
+						if (inp.Binding(j) != 0 && inp.CheckBindDevice(j,pInputDeviceType))
+						{
+							buttons.Insert(GetUApi().GetButtonName( inp.Binding(j) ));
+						}
+					}
+					//return buttons;
+				}
+				else
+				{
+					buttons.Insert(GetUApi().GetButtonName(inp.GetBindKey(0)));
+					//return buttons;
+				}
+				
+				if (buttons.Count() > 0)
+				{
+					if (!output)
+					{
+						output = new map<int,ref TStringArray>;
+					}
+					output.Insert(i,buttons);
+				}
+			}
+		}
+		
+		return output;
+	}
+
+	static array<string> GetButtonIconPathFromInput(notnull UAInput pInput, int pInputDeviceType = EUAINPUT_DEVICE_CONTROLLER)
+	{
+		array<string> buttonIcons = new array<string>();
+		
+		for (int i = 0; i < pInput.AlternativeCount(); i++)
+		{
+			pInput.SelectAlternative(i);
+			bool done = false;
+			for (int bk = 0; bk < pInput.BindKeyCount(); bk++)
+			{
+				if (pInput.CheckBindDevice(0, pInputDeviceType))
+				{
+					buttonIcons.Insert(GetUApi().GetButtonIcon(pInput.Binding(bk)));
+				
+					if (bk == pInput.BindKeyCount() - 1)
+					{
+						done = true;
+					}
+				}
+			}
+				
+			if (done)
+			{
+				buttonIcons.Invert();
+				return buttonIcons;
+			}
+		}
+		
+		return buttonIcons;
+	}
+	
+	static array<string> GetButtonIconPathFromInput(string pInputName, int pInputDeviceType)
+	{
+		UAInput inp = GetUApi().GetInputByName(pInputName);
+
+		array<string> buttonIcons = new array<string>();
+		buttonIcons = InputUtils.GetButtonIconPathFromInput(inp, pInputDeviceType);
+		
+		return buttonIcons;
+	}
+	
+	static void GetImagesetAndIconFromInputAction(notnull UAInput pInput, int pInputDeviceType, out array<string> pImageSet, out array<string> pIconName)
+	{
+		array<string> buttons = InputUtils.GetButtonIconPathFromInput(pInput, pInputDeviceType);
+		if (buttons.Count() == 0 )
+		{
+			return;
+		}
+		
+		for (int i = 0; i < buttons.Count(); i++)
+		{
+			array<string> parts = new array<string>;
+			buttons.Get(i).Split(":", parts);
+			
+			if (parts.Count() < 2)
+			{
+				return;
+			}
+			
+			pImageSet.Insert(parts[1].SubstringInverted(parts[1], parts[1].Length() - 6, parts[1].Length()));
+	
+			//! Asia vs Europe/N.America controller layout
+			#ifdef PLATFORM_PS4		
+			if (GetGame().GetInput().GetEnterButton() == GamepadButton.B)
+			{
+				//! switch confirm button
+				if (parts[2] == "cross")
+				{
+					parts[2] = "circle";
+				}
+				
+				//! switch back button
+				if (parts[2] == "circle")
+				{
+					parts[2] = "cross";
+				}
+			}
+			#endif
+		
+			pIconName.Insert(parts[2]);
+		}
+	}
+	
+	static void GetImagesetAndIconFromInputAction(string pInputAction, int pInputDeviceType, out array<string> pImageSet, out array<string> pIconName)
+	{
+		UAInput inp = GetUApi().GetInputByName(pInputAction);
+		
+		InputUtils.GetImagesetAndIconFromInputAction(inp, pInputDeviceType, pImageSet, pIconName);
+	}
+	
+	static string GetRichtextButtonIconFromInputAction(notnull UAInput pInput, string pLocalizedDescription, int pInputDeviceType = EUAINPUT_DEVICE_CONTROLLER, float pScale = ICON_SCALE_NORMAL, bool pVertical = false)
+	{
+		array<string> imageSets = new array<string>();
+		array<string> iconNames = new array<string>();
+		InputUtils.GetImagesetAndIconFromInputAction(pInput, pInputDeviceType, imageSets, iconNames);
+		
+		if (imageSets.Count() == 0)
+		{
+			return "";
+		}
+		
+		string result = string.Format("<image set=\"%1\" name=\"%2\" scale=\"%3\" />", imageSets.Get(0), iconNames.Get(0), pScale);
+		
+		string divider = " ";
+		if (pVertical)
+		{
+			divider = string.Format("\n%1\n", divider);
+		}
+		
+		if (imageSets.Count() > 1)
+		{
+			//! first element is already taken
+			for (int i = 1; i < imageSets.Count(); i++)
+			{
+				result = string.Format("%1%2<image set=\"%3\" name=\"%4\" scale=\"%5\" />", result, divider, imageSets.Get(i), iconNames.Get(i), pScale);
+			}
+		}
+		
+		return string.Format("%1 %2", result, pLocalizedDescription);
+	}
+	
+	static string GetRichtextButtonIconFromInputAction(string pInputAction, string pLocalizedDescription, int pInputDeviceType = EUAINPUT_DEVICE_CONTROLLER, float pScale = ICON_SCALE_NORMAL, bool pVertical = false)
+	{
+		UAInput inp = GetUApi().GetInputByName(pInputAction);
+
+		array<string> imageSets = new array<string>();
+		array<string> iconNames = new array<string>();
+		InputUtils.GetImagesetAndIconFromInputAction(inp, pInputDeviceType, imageSets, iconNames);
+		
+		return InputUtils.GetRichtextButtonIconFromInputAction(inp, pLocalizedDescription, pInputDeviceType, pScale, pVertical);
+	}
+	
+	static void UpdateConsolePresetID()
+	{
+		string profile_name;
+		GetGame().GetInput().GetProfileName(GetUApi().PresetCurrent(), profile_name);
+
+		if (profile_name == PRESET_OLD)
+		{
+			m_CurrentPresetIDConsole = VARIANT_OLD;
+		}
+		else
+		{
+			m_CurrentPresetIDConsole = VARIANT_NEW;
+		}
+	}
+	
+	static int GetConsolePresetID()
+	{
+		return m_CurrentPresetIDConsole;
+	}
+	
+	static map<int, ref array<int>> GetInputActionSortingMap()
+	{
+		return m_InputActionSortingMap;
+	}
+	
+	static array<int> GetUnsortedInputActions()
+	{
+		return m_UnsortedInputActions;
+	}
+	
+	static bool InitInputMetadata()
+	{
+		if (!m_InputActionSortingMap)
+		{
+			m_InputActionSortingMap = new map<int, ref array<int>>;
+			
+			TIntArray sorted_actions = new TIntArray;
+			if (!m_UnsortedInputActions)
+			{
+				m_UnsortedInputActions = new array<int>;
+			}
+			GetUApi().GetActiveInputs(m_UnsortedInputActions);
+			
+			UAInput inp;
+			
+			for (int i = 0; i < GetUApi().SortingCount(); i++)
+			{
+				int input_id;
+				array<int> sorting_content = new array<int>;
+				for (int j = 0; j < m_UnsortedInputActions.Count(); j++)
+				{
+					input_id = m_UnsortedInputActions[j];
+					inp = GetUApi().GetInputByID(input_id);
+					if (inp.HasSorting(i))
+					{
+						sorting_content.Insert(input_id);
+						sorted_actions.Insert(input_id);
+					}
+				}
+				
+				if (sorting_content.Count() > 0)
+				{
+					sorting_content.Sort();
+					m_InputActionSortingMap.Insert(i,sorting_content);
+				}
+			}
+			
+			//remove sorted used inputs
+			int count = sorted_actions.Count();
+			for (i = 0; i < count; i++)
+			{
+				m_UnsortedInputActions.RemoveItem(sorted_actions[i]);
+			}
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/JsonFileLoader.c b/scripts/3_Game/DayZ/tools/JsonFileLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..42d40467a4f9916171c994df07c98e1ca1e1f794
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/JsonFileLoader.c
@@ -0,0 +1,175 @@
+class JsonFileLoader<Class T>
+{
+	protected static ref JsonSerializer m_Serializer = new JsonSerializer();
+	
+	static bool LoadFile(string filename, out T data, out string errorMessage)
+	{
+		if (FileExist(filename))
+		{
+			FileHandle handle = OpenFile(filename, FileMode.READ);
+			if (handle == 0)
+			{
+				errorMessage = string.Format("Cannot open file \"%1\" for reading", filename);
+				return false;
+			}
+			
+			string fileContent;
+			string lineContent;
+			while (FGets(handle, lineContent) >= 0)
+			{
+				fileContent += lineContent;
+			}
+			
+			CloseFile(handle);
+			
+			if (!m_Serializer)
+				m_Serializer = new JsonSerializer();
+
+			string error;
+			if (!m_Serializer.ReadFromString(data, fileContent, error))
+			{
+				errorMessage = string.Format("Cannot load data from \"%1\":\n%2", filename, error);
+				return false;
+			}
+			
+			return true;
+		}
+		else
+		{
+			errorMessage = string.Format("File \"%1\" does not exist, check the provided path", filename, error);
+			return false;
+		}
+	}
+	
+	static bool SaveFile(string filename, T data, out string errorMessage)
+	{
+		string fileContent;
+
+		if (!m_Serializer)
+			m_Serializer = new JsonSerializer();
+
+		string makeDataError;
+		if (!MakeData(data, fileContent, makeDataError, true))
+		{
+			errorMessage = string.Format("Cannot save data to file \"%1\", %2", filename, makeDataError);
+			return false;
+		}	
+
+		FileHandle handle = OpenFile(filename, FileMode.WRITE);
+		if (handle == 0)
+		{
+			errorMessage = string.Format("Cannot open file \"%1\" for writing", filename);
+			return false;
+		}
+
+		FPrint(handle, fileContent);
+		CloseFile(handle);
+
+		return true;
+	}
+	
+	static bool LoadData(string string_data, out T data, out string errorMessage)
+	{
+		string error;
+
+		if (!m_Serializer)
+			m_Serializer = new JsonSerializer();
+		
+		if (!m_Serializer.ReadFromString(data, string_data, error))
+		{
+			errorMessage = string.Format("Cannot load provided JSON data (deserialization error) - check syntax: %1", error);
+			return false;
+		}
+		
+		return true;
+	}
+	
+	static bool MakeData(T inputData, out string outputData, out string errorMessage, bool prettyPrint = true)
+	{
+		if (!m_Serializer)
+			m_Serializer = new JsonSerializer();
+		
+		if (!m_Serializer.WriteToString(inputData, prettyPrint, outputData))
+		{
+			errorMessage = "Cannot create JSON from provided data (serialization error)";
+			return false;
+		}
+		
+		return true;
+	}
+	
+	//! DEPRECATED
+	//! ----------
+
+	//! #ifndef DIAG_DEVELOPER
+	
+	//! use JsonFileLoader::LoadFile instead
+	static void JsonLoadFile(string filename, out T data)
+	{
+		
+		if (FileExist(filename))
+		{
+			string file_content;
+			string line_content;
+			string error;
+			
+			FileHandle handle = OpenFile(filename, FileMode.READ);
+			if (handle == 0)
+				return;
+
+			while (FGets(handle,  line_content) >= 0)
+			{
+				file_content += line_content;
+			}
+			
+			CloseFile(handle);
+			
+			if (!m_Serializer)
+				m_Serializer = new JsonSerializer();
+			
+			if (!m_Serializer.ReadFromString(data, file_content, error))
+				ErrorEx(string.Format("Cannot load data from \"%1\":\n%2", filename, error));
+		}
+	}
+
+	//! use JsonFileLoader::SaveFile instead
+	static void JsonSaveFile(string filename, T data)
+	{
+		string file_content;
+		if (!m_Serializer)
+			m_Serializer = new JsonSerializer();
+		
+		m_Serializer.WriteToString(data, true, file_content);
+		
+		FileHandle handle = OpenFile(filename, FileMode.WRITE);
+		if (handle == 0)
+			return;
+		
+		FPrint(handle, file_content);
+		CloseFile(handle);
+	}
+
+	//!use JsonFileLoader::LoadData instead
+	static void JsonLoadData(string string_data, out T data)
+	{
+		string error;
+		if (!m_Serializer)
+			m_Serializer = new JsonSerializer();
+		
+		if (!m_Serializer.ReadFromString(data, string_data, error))
+			ErrorEx(string.Format("Cannot load data %1", error));
+	}
+
+	//!use JsonFileLoader::MakeData instead
+	static string JsonMakeData(T data)
+	{
+		string string_data;
+		if (!m_Serializer)
+			m_Serializer = new JsonSerializer();
+		
+		m_Serializer.WriteToString(data, true, string_data);
+		return string_data;
+	}
+
+	//#endif
+}
diff --git a/scripts/3_Game/DayZ/tools/JsonObject.c b/scripts/3_Game/DayZ/tools/JsonObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..ecc493f29461eac7b45dbac24bb18284c53b4f5d
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/JsonObject.c
@@ -0,0 +1,173 @@
+class JsonObject
+{	
+	ref map<string, string> 		m_Strings;
+	ref map<string, int>			m_Ints;
+	ref map<string, float>			m_Floats;
+	ref map<string, bool>			m_Bools;
+	ref map<string, ref Vector2>	m_Vectors2;
+		
+	void JsonObject()
+	{
+		m_Strings	= new map<string, string>;
+		m_Ints		= new map<string, int>;
+		m_Floats	= new map<string, float>;
+		m_Bools		= new map<string, bool>;
+		m_Vectors2	= new map<string, ref Vector2>;
+	}
+	
+	void ~JsonObject()
+	{
+		Clear();
+	}
+		
+	void Clear()
+	{
+		m_Strings.Clear();
+		m_Ints.Clear();
+		m_Floats.Clear();
+		m_Bools.Clear();
+		m_Vectors2.Clear();
+	}
+	
+	void AddString(string name, string value)
+	{
+		array<string> strgs = new array<string>;
+		value.Split("\"", strgs);
+		
+		if ( strgs.Count() > 1 )
+		{
+			value = "";
+			int str_count = strgs.Count();
+			
+			for ( int i = 0; i < str_count; ++i )
+			{
+				string s = strgs[i];
+				
+				int length = s.Length();
+	
+				if ( s[length - 1] != "\\" )
+				{
+					value += s;
+					
+					if (i < str_count - 1 )
+					{
+						value += "\\";
+						value += "\"";
+					}
+				}
+			}
+		}
+				
+		m_Strings.Insert(name, value);
+	}
+	
+	void AddInt(string name, int value)
+	{
+		m_Ints.Insert(name, value);
+	}
+	
+	void AddFloat(string name, float value)
+	{
+		m_Floats.Insert(name, value);
+	}
+	
+	void AddBool(string name, bool value)
+	{
+		m_Bools.Insert(name, value);
+	}
+	
+	void AddVector2(string name, float x, float y)
+	{
+		Vector2 v = new Vector2(x, y);
+		m_Vectors2.Insert(name, v);
+	}
+	
+	string GetJson()
+	{
+		string name;
+		int i;
+		
+		string jsn = "";
+		jsn += "{";
+		
+		// Parse Strings
+		for ( i = 0; i < m_Strings.Count(); ++i )
+		{
+			if ( jsn.Length() > 1 )
+			{
+				jsn += ",";
+			}
+				
+			name = m_Strings.GetKey(i);
+			string value_str = m_Strings.GetElement(i);
+			
+			jsn += "\""+name+"\":\""+value_str+"\"";
+		}
+			
+		// Parse Ints
+		for ( i = 0; i < m_Ints.Count(); ++i )
+		{
+			if ( jsn.Length() > 1 )
+			{
+				jsn += ",";
+			}
+				
+			name = m_Ints.GetKey(i);
+			int value_int = m_Ints.GetElement(i);
+			
+			jsn += "\""+name+"\":"+value_int;
+		}
+				
+		// Parse Floats
+		for ( i = 0; i < m_Floats.Count(); ++i )
+		{
+			if ( jsn.Length() > 1 )
+			{
+				jsn += ",";
+			}
+				
+			name = m_Floats.GetKey(i);
+			float value_flt = m_Floats.GetElement(i);
+			
+			jsn += "\""+name+"\":"+value_flt;
+		}
+			
+		// Parse Bools
+		for ( i = 0; i < m_Bools.Count(); ++i )
+		{
+			if ( jsn.Length() > 1 )
+			{
+				jsn += ",";
+			}
+				
+			name = m_Bools.GetKey(i);
+							
+			if ( m_Bools.GetElement(i) )
+			{
+				jsn += "\""+name+"\":true";
+			}
+			else
+			{
+				jsn += "\""+name+"\":false";
+			}
+		}
+		
+		// Parse Vectors2
+		for ( i = 0; i < m_Vectors2.Count(); ++i )
+		{
+			if ( jsn.Length() > 1 )
+			{
+				jsn += ",";
+			}
+				
+			name = m_Vectors2.GetKey(i);
+			Vector2 value_vct = m_Vectors2.GetElement(i);
+			
+			jsn += "\""+name+"\":{\"x\":"+value_vct.x+",\"y\":"+value_vct.y+"}";
+		}
+				
+		jsn += "}";
+		
+		return jsn;
+	}
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/KeysToUIElements.c b/scripts/3_Game/DayZ/tools/KeysToUIElements.c
new file mode 100644
index 0000000000000000000000000000000000000000..c878f61e02e47075d64dc60c3ce875b5a41c450e
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/KeysToUIElements.c
@@ -0,0 +1,178 @@
+//
+// Keep this Object up-to-date with KeyCodes Enum in EnSystem.c
+//
+// KeysToUIElements is mapping of KeyCodes to its literal name or icon from ImageSet
+// that will be displayed in floating widget for Default Actions - aka Action Target Selection
+
+typedef Param2<string, bool> KeyToUIElement;
+
+class KeysToUIElements
+{
+	static private ref map<int, ref KeyToUIElement> m_KeysToUIElements;
+	
+	static private void	RegisterKeyToUIElement(int key_code, string name, bool is_image_set )
+	{
+		if ( m_KeysToUIElements == NULL )
+		{
+			m_KeysToUIElements = new map<int, ref KeyToUIElement>;
+		}
+		
+		if ( m_KeysToUIElements.Contains(key_code) )
+		{
+			Debug.Log("Template ID: "+string.ToString(key_code)+" is alredy exist!", "KeysToUIElements -> OnInit()", "System", "KeysToUIElements Registration", "None");
+		}
+		else
+		{
+			KeyToUIElement params = new KeyToUIElement(name, is_image_set);
+			m_KeysToUIElements.Set(key_code, params);
+		}
+	}
+
+	static KeyToUIElement GetKeyToUIElement(int key_code)
+	{
+		if ( m_KeysToUIElements && m_KeysToUIElements.Contains(key_code) )
+		{
+			return m_KeysToUIElements.Get(key_code);
+		}
+		
+		Debug.Log("Template ID: "+string.ToString(key_code)+" does not exist!", "KeysToUIElements -> GetKeysToUIElement()", "System", "Get KeysToUIElements", "None");
+		return NULL;
+	}
+
+	static void Init()
+	{
+		//////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//////// Register KeysToUIElements ///////////////////////////////////////////////////////////////////////
+		//					  | KeyCode					| Name									| is_image_set  //
+		RegisterKeyToUIElement( KeyCode.KC_ESCAPE		, "ESC"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_1			, "1"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_2			, "2"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_3			, "3"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_4			, "4"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_5			, "5"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_6			, "6"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_7			, "7"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_8			, "8"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_9			, "9"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_0			, "0"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_MINUS		, "-"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_EQUALS		, "="									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_BACK			, "BKSPC"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_TAB			, "TAB"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_Q			, "Q"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_W			, "W"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_E			, "E"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_R			, "R"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_T			, "T"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_Y			, "Y"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_U			, "U"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_I			, "I"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_O			, "O"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_P			, "P"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_LBRACKET		, "("									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_RBRACKET		, ")"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_RETURN		, "ENTER"								, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_LCONTROL		, "LCTRL"								, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_A			, "A"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_S			, "S"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_D			, "D"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_F			, "F"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_G			, "G"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_H			, "H"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_J			, "J"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_K			, "K"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_L			, "L"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_SEMICOLON	, ";"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_APOSTROPHE	, "'"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_GRAVE		, "`"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_LSHIFT		, "LSHIFT"								, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_BACKSLASH	, "\\"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_Z			, "Z"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_X			, "X"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_C			, "C"									, false			);
+		RegisterKeyToUIElement(	KeyCode.KC_V			, "V"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_B			, "B"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_N			, "N"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_M			, "M"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_COMMA		, ","									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_PERIOD		, "."									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_SLASH		, "/"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_RSHIFT		, "RSHIFT"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_MULTIPLY		, "*"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_LMENU		, "LALT"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_SPACE		, "SPACE"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_CAPITAL		, "CPSLOCK"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F1			, "F1"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F2			, "F2"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F3			, "F3"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F4			, "F4"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F5			, "F5"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F6			, "F6"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F7			, "F7"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F8			, "F8"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F9			, "F9"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F10			, "F10"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMLOCK		, "NMLOCK"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_SCROLL		, "SCRLOCK"								, false			); 
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD7		, "Num7"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD8		, "Num8"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD9		, "Num9"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_SUBTRACT		, "Num-"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD4		, "Num4"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD5		, "Num5"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD6		, "Num6"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_ADD			, "Num+"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD1		, "Num1"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD2		, "Num2"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD3		, "Num3"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPAD0		, "Num0"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_DECIMAL		, "Num."								, false			);
+		//RegisterKeyToUIElement( KeyCode.KC_OEM_102,    ///< < > | on UK/Germany keyboards 
+		RegisterKeyToUIElement( KeyCode.KC_F11			, "F11"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_F12			, "F12"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPADEQUALS	, "Num="								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_PREVTRACK	, "PrevTrack"							, false			);
+		//RegisterKeyToUIElement( KeyCode.KC_AT,    ///<                     (NEC PC98) 
+		RegisterKeyToUIElement( KeyCode.KC_COLON		, ":"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_UNDERLINE	, "_"									, false			);
+		//RegisterKeyToUIElement( KeyCode.KC_STOP,    ///<                     (NEC PC98) 
+		//RegisterKeyToUIElement( KeyCode.KC_AX,    ///<                     (Japan AX) 
+		//RegisterKeyToUIElement( KeyCode.KC_UNLABELED,    ///<                        (J3100) 
+		RegisterKeyToUIElement( KeyCode.KC_NEXTTRACK	, "NextTrack"							, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPADENTER	, "NumEnter"							, false			);
+		RegisterKeyToUIElement( KeyCode.KC_RCONTROL		, "RCTRL"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_MUTE			, "Mute"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_CALCULATOR	, "Calc"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_PLAYPAUSE	, "Play"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_MEDIASTOP	, "Stop"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_VOLUMEDOWN	, "Vol-"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_VOLUMEUP		, "Vol+"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_WEBHOME		, "Web Home"							, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NUMPADCOMMA	, "Num,"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_DIVIDE		, "Num/"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_SYSRQ		, "SysRq"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_RMENU		, "RALT"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_PAUSE		, "Pause"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_HOME			, "Home"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_UP			, "ArrowUp"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_PRIOR		, "PageUp"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_LEFT			, "ArrowLeft"							, false			);
+		RegisterKeyToUIElement( KeyCode.KC_RIGHT		, "ArrowRight"							, false			);
+		RegisterKeyToUIElement( KeyCode.KC_END			, "End"									, false			);
+		RegisterKeyToUIElement( KeyCode.KC_DOWN			, "ArrowDown"							, false			);
+		RegisterKeyToUIElement( KeyCode.KC_NEXT			, "PgDn"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_INSERT		, "Insert"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_DELETE		, "Delete"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_LWIN			, "LWIN"								, false			);
+		RegisterKeyToUIElement( KeyCode.KC_RWIN			, "RWIN"							    , false			);
+		//RegisterKeyToUIElement( KeyCode.KC_APPS,    ///< AppMenu key 
+		//RegisterKeyToUIElement( KeyCode.KC_POWER,    ///< System Power 
+		//RegisterKeyToUIElement( KeyCode.KC_SLEEP,    ///< System Sleep 
+		//RegisterKeyToUIElement( KeyCode.KC_WAKE,    ///< System Wake 
+		//RegisterKeyToUIElement( KeyCode.KC_MEDIASELECT   ///< Media Selection
+		// Mouse buttons
+		RegisterKeyToUIElement( 1048576					, "set:dayz_gui image:left_mouse"		, true			);
+		RegisterKeyToUIElement( 1048577					, "set:dayz_gui image:right_mouse"		, true			);
+		RegisterKeyToUIElement( 1048578			 		, "set:dayz_gui image:middle_mouse"		, true			);
+	}
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/LogTemplates.c b/scripts/3_Game/DayZ/tools/LogTemplates.c
new file mode 100644
index 0000000000000000000000000000000000000000..8175b1550f367734aa1ad87df16c9e4b3f103a68
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/LogTemplates.c
@@ -0,0 +1,144 @@
+typedef Param3<string, string, string> LogTemplate;
+typedef int LogTemplateID;
+
+/*
+ * OBSOLETE: kept for possible backward compatibility only
+ */
+class LogTemplates
+{
+	static private ref map<LogTemplateID, ref LogTemplate> m_LogTemplates;
+	
+	static private void	RegisterLogTamplate(LogTemplateID template_id, string author, string plugin, string label)
+	{
+		if ( m_LogTemplates == NULL )
+		{
+			m_LogTemplates	= new map<LogTemplateID, ref LogTemplate>;
+		}
+		
+		if ( m_LogTemplates.Contains(template_id) )
+		{
+			Debug.Log("Template ID: "+string.ToString(template_id)+" is alredy exist!", "LogTemplate.h -> OnInit()", "System", "Template Registration", "None");
+		}
+		else
+		{
+			LogTemplate params = new LogTemplate(author, plugin, label);
+			m_LogTemplates.Set(template_id, params);
+		}
+	}
+	
+	// Steps to register of new log template:
+	// 1.) Crete new LogTemplateID in below of this comment.
+	// 2.) Set Template Name in format TEMPLATE_[CUSTOM NAME] => TEMPLATE_MY_LOG
+	// 3.) Set Template ID which is your id + your custom id =>  + CustomID(0) = 50190
+	//////////////////////////////////////////////////////////////
+	//			 			Template Name				Template ID
+	static LogTemplateID	TEMPLATE_UNKNOWN			= 0;
+	static LogTemplateID	TEMPLATE_JANOSIK			= 1;
+	static LogTemplateID	TEMPLATE_PLAYER_WEIGHT		= 2;
+	static LogTemplateID	TEMPLATE_BROADCAST			= 3;
+	
+	static void Init()
+	{
+		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		////////Register Log templates//////////////////////////////////////////////////////////////////////////////////////
+		//						| Template Name			| author			| plugin				| label					////
+		RegisterLogTamplate(	TEMPLATE_UNKNOWN		,"Unknown"			,"Unknown"				,"Unknown"				);//
+		RegisterLogTamplate(	TEMPLATE_JANOSIK		,"Janosik"			,"GUI"					,"None"					);//
+		RegisterLogTamplate(	TEMPLATE_PLAYER_WEIGHT	,"Unknown"			,"PlayerBase"			,"Weight"				);//
+		RegisterLogTamplate(	TEMPLATE_BROADCAST		,"Unknown"			,"PluginMessageManager"	,"Broadcast"			);//
+		
+	}
+	
+	static LogTemplate GetTemplate(LogTemplateID template_id)
+	{
+		if ( m_LogTemplates && m_LogTemplates.Contains(template_id) )
+		{
+			return m_LogTemplates.Get(template_id);
+		}
+		
+		Debug.Log("Template ID: "+string.ToString(template_id)+" does not exist!", "LogTemplate.h -> GetTemplate()", "System", "Get Log Template", "None");
+		return NULL;
+	}
+}
+
+/**
+\brief Creates debug log (optional) from LogTemplate which are registred
+	\param template_id \p LogTemplateID ID of LogTemplate which was registred in proto/Logtemplate.h -> "class LogTemplates"
+	\param message \p string Debug message for log
+	\return \p void
+	@code
+		Log("This is some debug log message", TEMPLATE_JINDRICH);
+		
+		>> output to scriptExt.log (for GamutLogViewer)
+	@endcode
+*/
+void Log(string message, LogTemplateID template_id = 0)
+{
+	LogTemplate log_template = LogTemplates.GetTemplate(template_id);
+	
+	Debug.Log(message, log_template.param2, log_template.param1, log_template.param3);
+}
+
+/**
+\brief Creates info log (optional) from LogTemplate which are registred
+	\param template_id \p LogTemplateID ID of LogTemplate which was registred in proto/Logtemplate.h -> "class LogTemplates"
+	\param message \p string Info message for log
+	\return \p void
+	@code
+		LogInfo("This is some info log message", TEMPLATE_JINDRICH);
+		
+		>> output to scriptExt.log (for GamutLogViewer)
+	@endcode
+*/
+void LogInfo(string message, LogTemplateID template_id = 0)
+{
+	LogTemplate log_template = LogTemplates.GetTemplate(template_id);
+	
+	Debug.LogInfo(message, log_template.param2, log_template.param1, log_template.param3);
+}
+
+/**
+\brief Creates warning log  (optional) from LogTemplate which are registred
+	\param template_id \p LogTemplateID ID of LogTemplate which was registred in proto/Logtemplate.h -> "class LogTemplates"
+	\param message \p string Warning message for log
+	\return \p void
+	@code
+		LogT(TEMPLATE_JINDRICH, "This is some warning log message");
+		
+		>> output to scriptExt.log (for GamutLogViewer)
+	@endcode
+*/
+void LogWarning(string message, LogTemplateID template_id = 0)
+{
+	LogTemplate log_template = LogTemplates.GetTemplate(template_id);
+	
+	Debug.LogWarning(message, log_template.param2, log_template.param1, log_template.param3);
+}
+
+/**
+\brief Creates error log (optional) from LogTemplate which are registred
+	\param template_id \p LogTemplateID ID of LogTemplate which was registred in proto/Logtemplate.h -> "class LogTemplates"
+	\param message \p string Error message for log
+	\return \p void
+	@code
+		LogT(TEMPLATE_JINDRICH, "This is some error log message");
+		
+		>> output to scriptExt.log (for GamutLogViewer)
+	@endcode
+*/
+void LogError(string message, LogTemplateID template_id = 0)
+{
+	LogTemplate log_template = LogTemplates.GetTemplate(template_id);
+	
+	Debug.LogError(message, log_template.param2, log_template.param1, log_template.param3);
+}
+
+void SQFPrint(string sqf_msg)
+{
+	Print(sqf_msg);
+}
+
+void SQFLog(string sqf_msg)
+{
+	Log(sqf_msg);
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/SimpleMovingAverage.c b/scripts/3_Game/DayZ/tools/SimpleMovingAverage.c
new file mode 100644
index 0000000000000000000000000000000000000000..89fc78a3db3311a8710af8caa0ecf1987a5c9a40
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/SimpleMovingAverage.c
@@ -0,0 +1,44 @@
+class SimpleMovingAverage<Class T>
+{
+	private T m_Sum 				= 0;
+	private int m_Pointer 			= 0;
+	private int m_Size 				= 0;
+	private ref array<T> m_Samples 	= new array<T>();
+
+	/**
+	\brief Initialize Simple Moving Average Cyclic Buffer
+		\param pSize \p size of the buffer
+		\param pDefaultValue \p initial value stored in buffer
+	*/
+	void SimpleMovingAverage(int pSize, T pDefaultValue = 0)
+	{
+		m_Size = pSize;
+
+		for (int i = 0; i < m_Size; i++)
+		{
+			m_Samples.Insert(pDefaultValue);
+        	m_Sum += m_Samples[i];
+		}
+	}
+
+	/**
+	\brief Add new value and return average value from buffer
+		\param newSample \p value that will be added to buffer
+		\return average value from the buffer
+	@code
+		ref SimpleMovingAverage<float> m_Buffer = SimpleMovingAverage<float>(10, 0.5);
+		float sma = m_Buffer.Add(0.2);
+	@endcode
+	*/
+	T Add(T newSample)
+    {
+        m_Sum = m_Sum - m_Samples[m_Pointer] + newSample;
+        m_Samples[m_Pointer++] = newSample;
+        if (m_Pointer == m_Size)
+		{
+            m_Pointer = 0;
+		}
+
+        return m_Sum / m_Size;
+    }
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/TimeConversions.c b/scripts/3_Game/DayZ/tools/TimeConversions.c
new file mode 100644
index 0000000000000000000000000000000000000000..28ae9b12abe8c7c037197f016a33b793c0bd0c9c
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/TimeConversions.c
@@ -0,0 +1,73 @@
+/**@class		FullTimeData
+ * @brief		struct that keeps Time relevant information for future formatting
+ **/
+class FullTimeData
+{
+	int m_Days
+	int m_Hours
+	int m_Minutes
+	int m_Seconds
+	
+	string FormatedAsTimestamp()
+	{
+		m_Hours += m_Days * 24;
+		
+		string h;
+		string m;
+		string s;
+		
+		if (m_Hours < 10)
+			h = "0";
+		
+		if (m_Minutes < 10)
+			m = "0";
+		
+		if (m_Seconds < 10)
+			s = "0";
+		
+		return string.Format("%1%2:%3%4:%5%6", h, m_Hours, m, m_Minutes, s, m_Seconds);
+	}
+	
+	string FormatedWithZero()
+	{
+		return string.Format("%1#STR_time_unit_abbrev_day_0 %2#STR_time_unit_abbrev_hour_0 %3#STR_time_unit_abbrev_minute_0 %4#STR_time_unit_abbrev_second_0", m_Days, m_Hours, m_Minutes, m_Seconds);
+	}
+	
+	string FormatedNonZero()
+	{
+		string message;
+		
+		if (m_Days > 0)
+			message += string.Format("%1#STR_time_unit_abbrev_day_0 ", m_Days);
+		if (m_Hours > 0)
+			message += string.Format("%1#STR_time_unit_abbrev_hour_0 ", m_Hours);
+		if (m_Minutes > 0)
+			message += string.Format("%1#STR_time_unit_abbrev_minute_0 ", m_Minutes);
+
+		message += string.Format("%1#STR_time_unit_abbrev_second_0", m_Seconds);
+		
+		return message;
+	}
+}
+
+class TimeConversions
+{
+	/**
+	  	\brief transform time in seconds into FullTimeData struct
+		@param timeInSeconds time in seconds
+		@param fullTime time output as FullTimeData struct
+	*/
+	static void ConvertSecondsToFullTime(int timeInSeconds, out FullTimeData fullTime)
+	{
+	    fullTime.m_Days = timeInSeconds / (24 * 3600);
+	 
+	    timeInSeconds = timeInSeconds % (24 * 3600);
+	    fullTime.m_Hours = timeInSeconds / 3600;
+	 
+	    timeInSeconds = timeInSeconds % 3600;
+	    fullTime.m_Minutes = timeInSeconds / 60;
+	 
+	    timeInSeconds = timeInSeconds % 60;
+	    fullTime.m_Seconds = timeInSeconds;
+	}
+}
diff --git a/scripts/3_Game/DayZ/tools/UIManager.c b/scripts/3_Game/DayZ/tools/UIManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..e4088906c2e9a6512d8f1cc7fb820de73567c7de
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/UIManager.c
@@ -0,0 +1,255 @@
+class UIManager
+{
+	//! Create & open menu with specific id (see \ref MenuID) and set its parent
+	proto native UIScriptedMenu EnterScriptedMenu(int id, UIMenuPanel parent);
+	proto native UIScriptedMenu CreateScriptedMenu(int id, UIMenuPanel parent);
+
+	proto native void EnterServerBrowser(UIMenuPanel parentMenu);
+
+	proto native UIScriptedMenu ShowScriptedMenu(UIScriptedMenu menu, UIMenuPanel parent);
+	proto native void HideScriptedMenu(UIScriptedMenu menu);
+
+	proto native Widget GetWidgetUnderCursor();
+	proto native bool IsDialogVisible();
+	proto native bool IsModalVisible();
+	proto native void CloseSpecificDialog(int id);
+	proto native void CloseDialog();
+	proto native void HideDialog();
+	
+	/**
+  \brief Shows message dialog
+	@param caption 
+	@param text
+	@param id custom user id
+	@param butts \ref DialogBoxType
+	@param def \ref DialogBoxButton
+	@param type \ref DialogMessageType
+	@param handler
+	\n usage :
+	@code
+	const int QUIT_DIALOG_ID = 76;
+	GetGame().GetUIManager().ShowDialog("Quit", "Do You really want to quit?", QUIT_DIALOG_ID, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+	...
+	// after user pass dialog, callback on menu/event handler is called
+	ScriptedWidgetEventHandler::OnModalResult( Widget  w,	int  x,	int  y,	int  code,	int  result	)
+	{
+		if (code == QUIT_DIALOG_ID && result == DBB_YES) // yes this is callback for dialog we show earlier and user press YES button
+		{
+			Quit();
+		}
+	}
+	@endcode
+	*/
+	proto native void ShowDialog(string caption, string text, int id, int butts /*DBT_*/, int def/*DBB_*/, int type /*DMT_*/, UIScriptedMenu handler);
+	//! natively checks game focus on cursor hiding
+	proto native bool ShowCursor(bool visible);
+	proto native bool IsCursorVisible();
+	proto native bool IsDialogQueued();
+	proto native bool ShowQueuedDialog();
+	proto native int  GetLoginQueuePosition();
+	proto native bool ScreenFadeVisible();
+	proto native void ScreenFadeIn(float duration, string text, int backgroundColor, int textColor);
+	proto native void ScreenFadeOut(float duration);
+	proto native bool IsScaledMode();
+	proto native void SetScaledMode(bool enabled);
+	
+	//! Returns most-top open menu
+	proto native UIScriptedMenu GetMenu();
+	
+	//! Close top window on windows stack, returns true when any window is closed
+	bool Back()
+	{
+		if (IsDialogVisible() == false)
+		{
+			UIMenuPanel menu = GetMenu();
+			if (menu)
+			{
+				menu.Close();
+				return true;
+			}		
+		}
+
+		return false;
+	}
+	
+	//! Close all opened menus
+	bool CloseAll()
+	{
+		UIMenuPanel menu = GetMenu();
+		while (menu)
+		{
+			if (menu.GetParentMenu())
+			{
+				menu = menu.GetParentMenu();
+			}
+			else
+			{
+				menu.Close();
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	//! Close all opened menus except first menu
+	bool CloseAllSubmenus()
+	{
+		UIMenuPanel menu = GetMenu();
+		
+		while (menu && menu.GetParentMenu() && menu.GetParentMenu().GetParentMenu())
+		{
+			menu = menu.GetParentMenu();
+		}
+		
+		if (menu && menu.GetParentMenu())
+		{
+			menu.Close();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//! Close menu with specific ID (see \ref MenuID)
+	bool CloseMenu(int id)
+	{
+		UIMenuPanel menu = GetMenu();
+		
+		while (menu)
+		{
+			if (menu.GetID() == id)
+			{
+				menu.Close();
+				return true;
+			}
+
+			menu = menu.GetParentMenu();
+		}
+
+		return false;
+	}
+
+	bool HideMenu(int id)
+	{
+		UIScriptedMenu menu = GetMenu();
+
+		while (menu)
+		{
+			if (menu.GetID() == id)
+			{
+				HideScriptedMenu( menu );
+				return true;
+			}
+
+			menu = UIScriptedMenu.Cast( menu.GetParentMenu() );
+		}
+
+		return false;
+	}
+
+	//! Returns true if menu with specific ID is opened (see \ref MenuID)
+	bool IsMenuOpen(int id)
+	{
+		return FindMenu(id) != null;
+	}
+
+	//! Returns menu with specific ID if it is open (see \ref MenuID)
+	UIScriptedMenu FindMenu(int id)
+	{
+		UIScriptedMenu menu = GetMenu();
+
+		while (menu)
+		{
+			if (menu.GetID() == id)
+			{
+				return menu;
+			}
+
+			menu = UIScriptedMenu.Cast( menu.GetParentMenu() );
+		}
+
+		return NULL;
+	}
+	
+	//Window management
+	void OpenWindow( int id )
+	{
+		UIScriptedWindow window = UIScriptedWindow.GetWindow( id );
+		
+		//if window is already opened, close it
+		if ( window )
+		{
+			CloseWindow( id );
+			
+			return;
+		}
+		
+		//create new window
+		switch( id )
+		{
+			case GUI_WINDOW_MISSION_LOADER: 
+				window = GetGame().GetMission().CreateScriptedWindow( id );
+				break;
+				
+			default: {};
+		}
+		
+		if ( window )
+		{
+			window.Init();
+			
+			//add to active windows
+			UIScriptedWindow.AddToActiveWindows( id, window );
+		}
+	}
+
+	void CloseWindow( int id )
+	{
+		UIScriptedWindow window = UIScriptedWindow.GetWindow( id );
+		
+		if ( window )
+		{
+			UIScriptedWindow.RemoveFromActiveWindows( id );
+			window.HideWindow();
+			
+			//delete window;
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(this.DeleteWindow, window );
+			/*
+			wtf? leak			
+			Timer delete_timer = new Timer ( CALL_CATEGORY_SYSTEM );
+			Param1<UIScriptedWindow> params = new Param1<UIScriptedWindow>( window );
+			delete_timer.Run( 0.5, this, "DeleteWindow", params, false );*/
+			
+		}
+	}
+
+	void DeleteWindow( UIScriptedWindow window )
+	{
+		delete window;
+	}
+	
+	bool IsWindowOpened( int id )
+	{
+		if ( UIScriptedWindow.GetWindow( id ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void ShowUICursor( bool visible )
+	{
+		g_Game.SetMouseCursorDesiredVisibility(visible);
+	}
+};
+
+//! Returns random loading background texture path
+string GetRandomLoadingBackground()
+{
+	const string images[] = {"{655A1BF79F5B291}Gui/textures/loading_screens/loading_screen_1_co.edds", "{84BE5F7442BD4B}Gui/textures/loading_screens/loading_screen_2_co.edds"};
+	Math.Randomize(-1);
+	int index = Math.RandomInt(0, 100) % 2;
+	return images[index];
+}
diff --git a/scripts/3_Game/DayZ/tools/UIScriptedMenu.c b/scripts/3_Game/DayZ/tools/UIScriptedMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..b7c7811f25def2c4de43bbd84d0a3bb0767b3e7b
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/UIScriptedMenu.c
@@ -0,0 +1,590 @@
+//-----------------------------------------------------------------------------
+class UIMenuPanel: Managed
+{
+	proto native UIMenuPanel GetSubMenu();
+	proto native UIMenuPanel GetParentMenu();
+	proto native UIMenuPanel GetVisibleMenu();
+	proto native void SetSubMenu(UIMenuPanel submenu);
+	proto native void SetParentMenu(UIMenuPanel parent);
+	proto native bool CanClose();
+	proto native bool CanCloseOnEscape();
+	//! Create & open menu with specific id (see \ref MenuID) and set this menu as its parent
+	proto native UIScriptedMenu EnterScriptedMenu(int id);
+	
+	proto native void DestroySubmenu();
+	proto native bool IsAnyMenuVisible();
+	proto native bool IsVisible();
+
+#ifdef FEATURE_CURSOR
+	//! Signal when the menu is created through 'UIManager.CreateScriptedMenu'
+	proto native bool IsCreatedHidden();
+#endif
+	
+	//! If visibility of application is changed. On console it is called when application is suspended or constrained.
+	//! @param isVisible indicate if application is visible in foreground
+	void OnVisibilityChanged(bool isVisible)
+	{
+	}
+	
+	//! Safe way to close window, using this function can even window safely close itself
+	proto native void Close();
+
+	bool UseMouse()	{
+		#ifdef PLATFORM_CONSOLE
+		return GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer();
+		#else
+		return true;
+		#endif
+	}
+
+	bool UseKeyboard()	{
+		#ifdef PLATFORM_CONSOLE
+		return GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer();
+		#else
+		return true;
+		#endif
+	}
+	
+	bool UseGamepad()	{
+		return true;
+	}
+
+	//! Returns \ref MenuID
+	int GetID()	{
+		return MENU_UNKNOWN;
+	}
+	
+	//! Refresh request, called from anywhere
+	void Refresh()
+	{
+	}
+};
+
+//-----------------------------------------------------------------------------
+//! Part of main menu hierarchy to create custom menus from script
+class UIScriptedMenu extends UIMenuPanel
+{
+	int m_id;
+	Widget layoutRoot;
+	private Widget	m_AnimAlphaWidget;
+	private bool	m_AnimAlphaIsIncreasing;
+	private float	m_AnimAlphaValue;
+
+	Widget GetLayoutRoot()
+	{
+		return layoutRoot;
+	}
+	
+	void LockControls()
+	{
+#ifdef FEATURE_CURSOR
+		if (IsCreatedHidden())
+			return;
+#endif
+
+		if (UseMouse())
+		{
+			GetGame().GetInput().ChangeGameFocus(1, INPUT_DEVICE_MOUSE);
+			GetGame().GetUIManager().ShowUICursor(true);
+		}
+
+		if (UseKeyboard())
+		{
+			GetGame().GetInput().ChangeGameFocus(1, INPUT_DEVICE_KEYBOARD);
+		}
+		
+		if (UseGamepad())
+		{
+			GetGame().GetInput().ChangeGameFocus(1, INPUT_DEVICE_GAMEPAD);
+		}
+	}
+	
+	void UnlockControls()
+	{
+#ifdef FEATURE_CURSOR
+		if (IsCreatedHidden())
+			return;
+#endif
+
+		if (UseMouse())
+		{
+			GetGame().GetInput().ChangeGameFocus(-1, INPUT_DEVICE_MOUSE);
+		}
+
+		if (GetParentMenu() && GetParentMenu().UseMouse())
+		{
+			GetGame().GetUIManager().ShowUICursor(true);
+		}
+		else
+		{
+			GetGame().GetUIManager().ShowUICursor(false);
+		}
+
+		if(UseKeyboard())
+		{
+			GetGame().GetInput().ChangeGameFocus(-1, INPUT_DEVICE_KEYBOARD);
+		}
+		
+		if(UseGamepad())
+		{
+			GetGame().GetInput().ChangeGameFocus(-1, INPUT_DEVICE_GAMEPAD);
+		}
+	}
+	
+	void UIScriptedMenu() 
+	{
+		m_id = MENU_UNKNOWN;
+	}
+	
+	void ~UIScriptedMenu()
+	{
+	}
+
+	//! Sets \ref MenuID
+	void SetID(int id) {
+		m_id = id;
+	}
+
+	//! Returns \ref MenuID
+	override int GetID()	{
+		return m_id;
+	}
+
+	void SetWidgetAnimAlpha( Widget widget )
+	{
+		m_AnimAlphaValue = 0.3;
+		m_AnimAlphaWidget = widget;
+	}
+	
+	//create widgets here and return layout root Widget
+	//widgets will be destroyed automatically by c++ side
+	Widget Init()
+	{
+		return NULL;
+	}
+
+	void Cleanup()
+	{
+	}
+
+	//after show
+	void OnShow()
+	{
+		LockControls();	
+	}
+
+	//after hide
+	void OnHide()
+	{
+		UnlockControls();
+	}
+
+	//! Per frame update, called from engine
+	void Update(float timeslice)
+	{
+		#ifdef PLATFORM_CONSOLE
+		if ( m_AnimAlphaWidget )
+		{
+			float anim_speed = 1.2;
+			float anim_value_max = 1.0;
+			float anim_value_min = 0.3;
+			if ( m_AnimAlphaIsIncreasing )
+			{
+				m_AnimAlphaValue += anim_speed * timeslice;
+				
+				if ( m_AnimAlphaValue >= anim_value_max )
+				{
+					m_AnimAlphaValue = anim_value_max;
+					m_AnimAlphaIsIncreasing = false;
+				}
+			}
+			else
+			{
+				m_AnimAlphaValue -= anim_speed * timeslice;
+				
+				if ( m_AnimAlphaValue <= anim_value_min )
+				{
+					m_AnimAlphaValue = anim_value_min;
+					m_AnimAlphaIsIncreasing = true;
+				}
+			}
+			
+			
+			m_AnimAlphaWidget.SetAlpha( m_AnimAlphaValue );
+		}
+		#endif
+	}
+
+	// Moved to parent
+	//! Refresh request, called from anywhere
+	//void Refresh()
+	//{
+	//}
+
+	proto native void SetFadingPanels(Widget panel0, Widget panel1, Widget panel2, Widget panel3, Widget panel4);
+	
+	bool OnClick(Widget w, int x, int y, int button)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnClick( w, x, y, button ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnModalResult( w, x, y, code, result ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnDoubleClick( w, x, y, button ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnSelect(Widget w, int x, int y)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnSelect( w, x, y ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnItemSelected( w, x, y, row, column, oldRow, oldColumn ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnFocus(Widget w, int x, int y)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnFocus( w, x, y ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnFocusLost(Widget w, int x, int y)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnFocusLost( w, x, y ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnMouseEnter( w, x, y ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnMouseLeave( w, enterW, x, y ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnMouseButtonDown( w, x, y, button ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnMouseButtonUp( w, x, y, button ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnMouseWheel(Widget w, int x, int y, int wheel)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnMouseWheel( w, x, y, wheel ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnController(Widget w, int control, int value)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnController( w, control, value ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnKeyDown( w, x, y, key ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnKeyUp(Widget w, int x, int y, int key)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnKeyUp( w, x, y, key ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnKeyPress(Widget w, int x, int y, int key)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnKeyPress( w, x, y, key ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnChange( w, x, y, finished ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnDrag(Widget w, int x, int y)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnDrag( w, x, y ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnDragging(Widget w, int x, int y, Widget reciever)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnDragging( w, x, y, reciever ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnDraggingOver(Widget w, int x, int y, Widget reciever)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnDraggingOver( w, x, y, reciever ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnDrop(Widget w, int x, int y, Widget reciever)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnDrop( w, x, y, reciever ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	bool OnDropReceived(Widget w, int x, int y, Widget reciever)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnDropReceived( w, x, y, reciever ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	bool OnEvent(EventType eventType, Widget target, int parameter0, int parameter1)
+	{
+		if ( UIScriptedWindow.GetActiveWindows() )
+		{
+			for ( int i = 0; i < UIScriptedWindow.GetActiveWindows().Count(); i++ )
+			{
+				if ( UIScriptedWindow.GetActiveWindows().GetElement( i ).OnEvent( eventType, target, parameter0, parameter1 ) )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	ScriptedWidgetEventHandler GetContextMenu()
+	{
+		return null;
+	}
+	
+	bool OnXboxEvent(int xboxEvent)
+	{
+		return true;
+	}
+	
+	void OnRPC(ParamsReadContext ctx){}
+	void OnRPCEx(int rpc_type, ParamsReadContext ctx){}
+	
+	void InitNoteWrite(EntityAI paper, EntityAI pen, string text = "") {}
+	void InitNoteRead(string text = "") {}
+	void InitMapItem(EntityAI item) {}
+	void LoadMapMarkers() {}
+};
diff --git a/scripts/3_Game/DayZ/tools/UIScriptedWindow.c b/scripts/3_Game/DayZ/tools/UIScriptedWindow.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ebb5376d8ae15b14a410ff78915bf79bb35f32d
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/UIScriptedWindow.c
@@ -0,0 +1,227 @@
+class UIScriptedWindow
+{
+	Widget	m_WgtRoot;
+	int m_Id;
+
+	//---MOVE TO UIMANAGER WHEN FIXED
+	static ref map<int, UIScriptedWindow> m_ActiveWindows;
+	
+	static void AddToActiveWindows( int id, UIScriptedWindow window )
+	{
+		if ( m_ActiveWindows == NULL )
+		{
+			m_ActiveWindows = new map<int, UIScriptedWindow>;
+		}
+			
+		m_ActiveWindows.Insert( id, window );
+	}
+	
+	static void RemoveFromActiveWindows( int id )
+	{
+		if ( m_ActiveWindows )
+		{
+			m_ActiveWindows.Remove( id );	
+		}
+	}
+	
+	static UIScriptedWindow GetWindow( int id )
+	{
+		if ( m_ActiveWindows )
+		{
+			return m_ActiveWindows.Get( id );
+		}
+		
+		return NULL;
+	}
+	
+	static map<int, UIScriptedWindow> GetActiveWindows()
+	{
+		return m_ActiveWindows;
+	}
+	//---
+
+	
+	void UIScriptedWindow(int id)
+	{
+		m_Id = id;
+	}
+		
+	void ~UIScriptedWindow()
+	{
+		GetWidgetRoot().Show(false);
+		delete GetWidgetRoot();
+	}
+	
+	Widget GetWidgetRoot()
+	{
+		return m_WgtRoot;
+	}
+	
+	Widget Init()
+	{
+	}
+	
+	void ShowWindow()
+	{
+		GetWidgetRoot().Show( true );
+	}
+	
+	void HideWindow()
+	{
+		GetWidgetRoot().Show( false );
+	}
+	
+	void CloseWindow()
+	{
+		GetGame().GetUIManager().CloseWindow( m_Id );
+	}
+	
+	//--- EVENTS
+	bool OnClick(Widget w, int x, int y, int button)
+	{
+		return false;
+	}
+	
+	bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		return false;
+	}
+	
+	bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		return false;
+	}
+	
+	bool OnSelect(Widget w, int x, int y)
+	{
+		return false;
+	}
+	
+	bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn)
+	{
+		return false;
+	}
+	
+	bool OnFocus(Widget w, int x, int y)
+	{
+		return false;
+	}
+	
+	bool OnFocusLost(Widget w, int x, int y)
+	{
+		return false;
+	}
+	
+	bool OnMouseEnter(Widget w, int x, int y)
+	{
+		return false;
+	}
+	
+	bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		return false;
+	}
+	
+	bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		return false;
+	}
+	
+	bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		return false;
+	}
+	
+	bool OnMouseWheel(Widget w, int x, int y, int wheel)
+	{
+		return false;
+	}
+	
+	bool OnController(Widget w, int control, int value)
+	{
+		return false;
+	}
+	
+	bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		return false;
+	}
+	
+	bool OnKeyUp(Widget w, int x, int y, int key)
+	{
+		return false;
+	}
+	
+	bool OnKeyPress(Widget w, int x, int y, int key)
+	{
+		return false;
+	}
+	
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		return false;
+	}
+	
+	bool OnDrag(Widget w, int x, int y)
+	{
+		return false;
+	}
+	
+	bool OnDragging(Widget w, int x, int y, Widget reciever)
+	{
+		return false;
+	}
+	
+	bool OnDraggingOver(Widget w, int x, int y, Widget reciever)
+	{
+		return false;
+	}
+	
+	bool OnDrop(Widget w, int x, int y, Widget reciever)
+	{
+		return false;
+	}
+	
+	bool OnDropReceived(Widget w, int x, int y, Widget reciever)
+	{
+		return false;
+	}
+	
+	bool OnEvent(EventType eventType, Widget target, int parameter0, int parameter1)
+	{
+		return false;
+	}
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+	
+}
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/UtilityClasses.c b/scripts/3_Game/DayZ/tools/UtilityClasses.c
new file mode 100644
index 0000000000000000000000000000000000000000..056bcfcf38825eac86a244985ce06beb63ac7f20
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/UtilityClasses.c
@@ -0,0 +1,52 @@
+class ItemVariableFlags
+{
+	static const int NONE 					= 0;
+	static const int FLOAT			 		= 0x0001;
+	static const int STRING		 			= 0x0002;
+	static const int BOOL 					= 0x0004;
+};
+
+class CachedObjectsParams
+{	
+	static ref Param1<int> 		PARAM1_INT;//CachedObjectsParams.PARAM1_INT
+	static ref Param1<bool> 	PARAM1_BOOL;//CachedObjectsParams.PARAM1_BOOL
+	static ref Param1<float> 	PARAM1_FLOAT;//CachedObjectsParams.PARAM1_FLOAT
+	static ref Param1<string> 	PARAM1_STRING;//CachedObjectsParams.PARAM1_STRING
+	
+	static ref Param2<int,int> 		PARAM2_INT_INT;//CachedObjectsParams.PARAM2_INT_INT
+	static ref Param2<int,float> 	PARAM2_INT_FLOAT;//CachedObjectsParams.PARAM2_INT_FLOAT
+	static ref Param2<int,string> 	PARAM2_INT_STRING;//CachedObjectsParams.PARAM2_INT_STRING
+	static ref Param2<string,float> PARAM2_STRING_FLOAT;//CachedObjectsParams.PARAM2_STRING_FLOAT
+	static ref Param2<string,string> PARAM2_STRING_STRING;//CachedObjectsParams.PARAM2_STRING_STRING
+	static ref Param2<float,float> 	PARAM2_FLOAT_FLOAT;//CachedObjectsParams.PARAM2_STRING_STRING
+	
+	static void Init()
+	{
+		PARAM1_INT = new Param1<int>(0);
+		PARAM1_BOOL = new Param1<bool>(false);
+		PARAM1_FLOAT = new Param1<float>(0);
+		PARAM1_STRING = new Param1<string>("");
+		
+		PARAM2_INT_INT = new Param2<int,int>(0,0);
+		PARAM2_INT_FLOAT = new Param2<int,float>(0,0);
+		PARAM2_INT_STRING = new Param2<int,string>(0,"");
+		PARAM2_STRING_FLOAT = new Param2<string,float>("",0);
+		PARAM2_STRING_STRING = new Param2<string,string>("","");
+		PARAM2_FLOAT_FLOAT = new Param2<float,float>(0,0);
+	}
+};
+
+
+class CachedObjectsArrays//don't forget to .Clear() your cache object before using it
+{	
+	static void Init()
+	{
+		ARRAY_STRING 	= new TStringArray;
+		ARRAY_FLOAT 	= new TFloatArray;
+		ARRAY_INT 		= new TIntArray;
+	}
+	
+	static ref TStringArray ARRAY_STRING;//CachedObjectsArrays.ARRAY_STRING
+	static ref TFloatArray ARRAY_FLOAT;//CachedObjectsArrays.ARRAY_FLOAT
+	static ref TIntArray ARRAY_INT;//CachedObjectsArrays.ARRAY_INT
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/Vector2.c b/scripts/3_Game/DayZ/tools/Vector2.c
new file mode 100644
index 0000000000000000000000000000000000000000..b063100d0064bdfb3ebee71ff39b43c1928df0eb
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/Vector2.c
@@ -0,0 +1,11 @@
+class Vector2
+{	
+	void Vector2(float value_x, float value_y)
+	{
+		x = value_x;
+		y = value_y;
+	}
+	
+	float x;
+	float y;
+};
\ No newline at end of file
diff --git a/scripts/3_Game/DayZ/tools/input.c b/scripts/3_Game/DayZ/tools/input.c
new file mode 100644
index 0000000000000000000000000000000000000000..afffd718e5251b9b67feb1edacf1e74a195a57d0
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/input.c
@@ -0,0 +1,413 @@
+
+enum EInputDeviceType
+{
+	UNKNOWN,
+	MOUSE_AND_KEYBOARD,
+	CONTROLLER
+};
+
+//-----------------------------------------------------------------------------
+class Input
+{
+	// input locking 
+	
+	/**
+	\brief Change game focus number
+	@param add number to add to focus number
+	@param input_device if equals -1, works globally on all devices, see INPUT_DEVICE_* values in constants.h 
+	@see HasGameFocus()
+	*/
+	proto native void		ChangeGameFocus(int add, int input_device = -1);
+	
+	/**
+	\brief Reset game focus number (set to 0)
+	@param input_device if equals -1, works globally on all devices, see INPUT_DEVICE_* values in constants.h 
+	@see HasGameFocus()
+	*/
+	proto native void		ResetGameFocus(int input_device = -1);
+	
+	/**
+	\brief Check if game should have focus
+	@param input_device if equals -1, checks all devices, see INPUT_DEVICE_* values in constants.h 
+	@return true if focus number == 0, false otherwise
+	*/
+	proto native bool		HasGameFocus(int input_device = -1);
+
+	// actions
+	proto native int		GetActionGroupsCount();
+	proto native int		GetActionGroupSize(int group_index);
+	proto int				GetActionGroupName(int group_index, out string name);
+	proto int				GetActionDesc(int action_index, out string desc);
+
+	// getting action state
+	/**
+	\brief Get action state
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return actual action state as float, for regular two state buttons returns 0 or 1, for analog buttons/axes returns value in interval <0, 1> with consideration of defined deadzones
+	@see LocalValue()
+	*/
+	proto native float	LocalValue_ID(int action, bool check_focus = true);
+	proto native float	LocalValue(string action, bool check_focus = true);
+		
+	/**  
+	\brief Returns true just in frame, when action was invoked (button was pressed)
+	\note if the input is limited (click, hold, doubleclick), 'Press' event is limited as well, and reacts to the limiter only! Otherwise it registeres the first event, usually 'press' (change of value from 0)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was invoked in that frame, false otherwise
+	@see LocalPress()
+	*/
+	proto native bool	LocalPress_ID(int action, bool check_focus = true);
+	proto native bool	LocalPress(string action, bool check_focus = true);
+	
+	/**  
+	\brief Returns true just in frame, when release action happened (button was released)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see LocalRelease()
+	*/
+	proto native bool	LocalRelease_ID(int action, bool check_focus = true);
+	proto native bool	LocalRelease(string action, bool check_focus = true);
+
+	/**  
+	\brief Returns true just in frame, when hold action invoked (button is hold)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see LocalHold()
+	*/
+	proto native bool	LocalHold_ID(int action, bool check_focus = true);
+	proto native bool	LocalHold(string action, bool check_focus = true);
+
+	/**  
+	\brief Returns true just in frame, when double click action invoked (button double clicked)
+	@param action id of action, defined in \ref 4_World/Classes/UserActionsComponent/_constants.c
+	@param check_focus if true and game is unfocused, returns 0; otherwise returns actual value
+	@return true if action was released in that frame, false otherwise
+	@see LocalDbl()
+	*/
+	proto native bool	LocalDbl_ID(int action, bool check_focus = true);
+	proto native bool	LocalDbl(string action, bool check_focus = true);
+
+	/**  
+	\brief Disable key until end of frame
+	@param key id of key, defined in \ref KeyCode
+	\code
+	GetGame().GetInput().DisableKey(KeyCode.KC_RETURN);
+	\endcode
+	*/
+	proto native void	DisableKey(int key);
+	
+	//! Enable mouse and keyboard (on consoles)
+	proto native void	EnableMouseAndKeyboard(bool enable);
+	//! @return state of support mouse and keyboard (on consoles)
+	proto native bool	IsEnabledMouseAndKeyboard();
+	/*!
+	@return state of support mouse and keyboard. If client playing on server 
+	where mouse and keyboard is disabled, then return false. (on consoles)
+	*/
+	proto native bool	IsEnabledMouseAndKeyboardEvenOnServer();
+	
+	/*!
+	@return Console: Last state queried from the platform operating system for the active gamepad. 
+			PC: Always true.
+	*/
+	proto native bool	IsMouseConnected();
+	proto native bool	IsKeyboardConnected();
+
+	//! gets currently selected profile
+	proto native int	GetCurrentProfile();
+	// gets currently selected profile keys for action
+	proto native void	GetCurrentProfileActionKeys(int action_index, out TIntArray keys);
+	//! gets profile by index
+	proto int			GetProfileName(int profile_index, out string name);
+	//! gets profile by name
+	proto native int	GetProfilesCount();
+	//! setting active profile
+	proto native int	SetProfile(int index);
+
+
+	// devices - joystick only!
+	proto native int		GetDevicesCount();
+	proto int				GetDeviceName(int device_index, out string name);
+	proto native int		IsDeviceXInput(int device_index);
+	proto native int		IsDeviceEnabled(int device_index);
+	proto native void		SetDeviceEnabled(int device_index, bool enabled);
+	
+	//! return true if was deflected button.
+	proto bool				GetGamepadThumbDirection(GamepadButton thumbButton, out float angle, out float value);
+	
+	//! clears active gamepad
+	proto native void		ResetActiveGamepad();
+	proto native void		SelectActiveGamepad(int gamepad);
+	proto native void		GetGamepadList(out array<int> gamepads);
+	proto void				GetGamepadUser(int gamepad, out BiosUser user);
+	/**  
+	\brief the on OnGamepadIdentification callback will return the first gamepad where the button was pressed
+	@param button the button that needs to be pressed for the identification
+	*/
+	proto native void		IdentifyGamepad(GamepadButton button);
+	//! returns true if there is an active gamepad selected.
+	proto native bool		IsActiveGamepadSelected();
+
+	//! returns true if 'Gamepad' or 'Mouse and Keyboard' is connected
+	bool IsAnyInputDeviceActive()
+	{
+		return IsActiveGamepadSelected() || IsMouseConnected() || IsKeyboardConnected();
+	}
+	
+	/**  
+	\brief returns true if 'Gamepad' or if 'Mouse/Keyboard' control is allowed locally and on server, and the respective input devicse are connected. Gamepad takes priority.
+	@param unavailableDeviceList lists all devices that SHOULD be available, but aren't. Optional.
+	*/
+	bool AreAllAllowedInputDevicesActive(out array<int> unavailableDeviceList = null)
+	{
+		bool passed = true;
+		bool gamepad = IsActiveGamepadSelected();
+		bool mouse = IsMouseConnected();
+		bool keyboard = IsKeyboardConnected();
+		bool MnKEnabled;
+		
+		if (g_Game.GetGameState() != DayZGameState.IN_GAME)
+		{
+			MnKEnabled = IsEnabledMouseAndKeyboard();
+		}
+		else if (g_Game.GetGameState() != DayZGameState.MAIN_MENU)
+		{
+			MnKEnabled = IsEnabledMouseAndKeyboardEvenOnServer();
+		}
+		else
+		{
+			return true;
+		}
+		
+		if (!MnKEnabled)
+		{
+			if (!gamepad)
+			{
+				passed = false;
+				FillUnavailableDeviceArray(EUAINPUT_DEVICE_CONTROLLER,unavailableDeviceList);
+			}
+		}
+		else
+		{
+			if (!gamepad)
+			{
+				if (!mouse)
+				{
+					passed = false;
+					FillUnavailableDeviceArray(EUAINPUT_DEVICE_MOUSE,unavailableDeviceList);
+				}
+				if (!keyboard)
+				{
+					passed = false;
+					FillUnavailableDeviceArray(EUAINPUT_DEVICE_KEYBOARD,unavailableDeviceList);
+				}
+				
+				if (!passed)
+				{
+					FillUnavailableDeviceArray(EUAINPUT_DEVICE_CONTROLLER,unavailableDeviceList);
+				}
+			}
+		}
+		return passed;
+	}
+	
+	void FillUnavailableDeviceArray(int device, inout array<int> filler)
+	{
+		if (filler)
+		{
+			filler.Insert(device);
+		}
+	}
+	
+	//! currently lists only available Gamepad, Mouse, and Keyboard. Extendable as needed.
+	void UpdateConnectedInputDeviceList()
+	{
+		g_Game.GetConnectedInputDeviceList().Clear();
+		
+		if (IsActiveGamepadSelected())
+			g_Game.GetConnectedInputDeviceList().Insert(EUAINPUT_DEVICE_CONTROLLER);
+		if (IsMouseConnected())
+			g_Game.GetConnectedInputDeviceList().Insert(EUAINPUT_DEVICE_MOUSE);
+		if (IsKeyboardConnected())
+			g_Game.GetConnectedInputDeviceList().Insert(EUAINPUT_DEVICE_KEYBOARD);
+	}
+	
+	/**
+	@return Input device, with the last input event ('mouse and keyboard', 'controller' or
+	'unknown' if none input event was fired from the beginning).
+	*/
+	proto native EInputDeviceType	GetCurrentInputDevice();
+	
+	/**
+	\note For PlayStation, Enter button in Asia territory is typically Circle button (B button),
+	but in Europe and America it is Cross button (A button).
+	\return Button, which represent Enter/Accept button.
+	*/
+	proto native GamepadButton		GetEnterButton();
+	
+	//! callback that is fired when a new gamepad is connected
+	void OnGamepadConnected(int gamepad)
+	{
+		#ifdef PLATFORM_PS4
+		BiosUser user;
+		GetGamepadUser( gamepad, user );
+		if (user && user == GetGame().GetUserManager().GetSelectedUser())
+		{
+			SelectActiveGamepad(gamepad);
+			if (GetGame().GetMission())
+				GetGame().GetMission().GetOnInputDeviceConnected().Invoke(EUAINPUT_DEVICE_CONTROLLER); //only for PS, xbox handles it on identification
+		}
+		#endif
+		
+		#ifdef PLATFORM_XBOX
+		if (gamepad == g_Game.GetPreviousGamepad())
+		{
+			SelectActiveGamepad(g_Game.GetPreviousGamepad());
+			if (GetGame().GetMission())
+				GetGame().GetMission().GetOnInputDeviceConnected().Invoke(EUAINPUT_DEVICE_CONTROLLER); //only for PS, xbox handles it on identification
+		}
+		#endif
+	}
+	
+	//! callback that is fired when gamepad is disconnected
+	void OnGamepadDisconnected(int gamepad)
+	{
+		if (IsInactiveGamepadOrUserSelected(gamepad))
+		{
+			UpdateConnectedInputDeviceList();
+			
+			if (!g_Game.IsLoading())
+			{
+				DayZLoadState state = g_Game.GetLoadState();
+				if (state != DayZLoadState.MAIN_MENU_START && state != DayZLoadState.MAIN_MENU_USER_SELECT)
+				{
+					if (GetGame().GetMission())
+						GetGame().GetMission().GetOnInputDeviceDisconnected().Invoke(EUAINPUT_DEVICE_CONTROLLER);
+				}
+			}
+		}
+	}
+
+	//! callback that is fired when identification was requested
+	void OnGamepadIdentification(int gamepad)
+	{
+		if (gamepad > -1)
+		{
+			DayZLoadState state = g_Game.GetLoadState();
+			
+			UpdateConnectedInputDeviceList();
+			SelectActiveGamepad(gamepad);
+			g_Game.SelectUser(gamepad);
+			g_Game.SetPreviousGamepad(gamepad);
+			if (state == DayZLoadState.MAIN_MENU_START || state == DayZLoadState.MAIN_MENU_USER_SELECT)
+			{
+				if (GetGame().GetMission())
+					GetGame().GetMission().Reset();
+			}
+			
+			if (GetGame() && GetGame().GetMission() && GetGame().GetMission().GetOnInputDeviceConnected())
+				GetGame().GetMission().GetOnInputDeviceConnected().Invoke(EUAINPUT_DEVICE_CONTROLLER);
+		}
+	}
+	
+	int GetUserGamepad( BiosUser user )
+	{
+		array<int> gamepads = new array<int>;
+		GetGamepadList( gamepads );
+		for( int i = 0; i < gamepads.Count(); i++ )
+		{
+			BiosUser user2;
+			GetGamepadUser( gamepads[i], user2 );
+			if( user == user2 )
+				return gamepads[i];
+		}
+		return -1;
+	}
+	
+	bool IsInactiveGamepadOrUserSelected( int gamepad = -1 )
+	{
+		#ifdef PLATFORM_XBOX
+		return !IsActiveGamepadSelected();
+		#endif
+		#ifdef PLATFORM_PS4
+		BiosUser user;
+		GetGamepadUser( gamepad, user );
+		return (user == GetGame().GetUserManager().GetSelectedUser());
+		#endif
+		return false;
+	}
+	
+	//! callback that is fired when mouse is connected (PS: and assigned to the user)
+	//! does not fire on PC - mouse/keyboard assumed to always be connected
+	void OnMouseConnected()
+	{
+		UpdateConnectedInputDeviceList();
+		if (!g_Game.IsLoading() && GetGame().GetMission())
+		{
+			DayZLoadState state = g_Game.GetLoadState();
+			if (state != DayZLoadState.MAIN_MENU_START && state != DayZLoadState.MAIN_MENU_USER_SELECT)
+			{
+				GetGame().GetMission().GetOnInputDeviceConnected().Invoke(EUAINPUT_DEVICE_MOUSE);
+			}
+		}
+	}
+
+	//! callback that is fired when mouse is disconnected
+	//! does not fire on PC - mouse/keyboard assumed to always be connected
+	void OnMouseDisconnected()
+	{
+		UpdateConnectedInputDeviceList();
+		if (!g_Game.IsLoading() && GetGame().GetMission())
+		{
+			DayZLoadState state = g_Game.GetLoadState();
+			if (state != DayZLoadState.MAIN_MENU_START && state != DayZLoadState.MAIN_MENU_USER_SELECT)
+			{
+				GetGame().GetMission().GetOnInputDeviceDisconnected().Invoke(EUAINPUT_DEVICE_MOUSE);
+			}
+		}
+	}
+
+	//! callback that is fired when keyboard is connected (PS: and assigned to the user)
+	//! does not fire on PC - mouse/keyboard assumed to always be connected
+	void OnKeyboardConnected()
+	{
+		UpdateConnectedInputDeviceList();
+		if (!g_Game.IsLoading() && GetGame().GetMission())
+		{
+			DayZLoadState state = g_Game.GetLoadState();
+			if (state != DayZLoadState.MAIN_MENU_START && state != DayZLoadState.MAIN_MENU_USER_SELECT)
+			{
+				GetGame().GetMission().GetOnInputDeviceConnected().Invoke(EUAINPUT_DEVICE_KEYBOARD);
+			}
+		}
+	}
+
+	//! callback that is fired when keyboard is disconnected
+	//! does not fire on PC - mouse/keyboard assumed to always be connected
+	void OnKeyboardDisconnected()
+	{
+		UpdateConnectedInputDeviceList();
+		if (!g_Game.IsLoading() && GetGame().GetMission())
+		{
+			DayZLoadState state = g_Game.GetLoadState();
+			if (state != DayZLoadState.MAIN_MENU_START && state != DayZLoadState.MAIN_MENU_USER_SELECT)
+			{
+				GetGame().GetMission().GetOnInputDeviceDisconnected().Invoke(EUAINPUT_DEVICE_KEYBOARD);
+			}
+		}
+	}
+	
+	//! called from code on different input device use
+	void OnLastInputDeviceChanged(EInputDeviceType inputDevice)
+	{
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnInputDeviceChanged().Invoke(inputDevice);
+		}
+	}
+};
+
diff --git a/scripts/3_Game/DayZ/tools/tools.c b/scripts/3_Game/DayZ/tools/tools.c
new file mode 100644
index 0000000000000000000000000000000000000000..188044632264a352287843853397736759d72bd0
--- /dev/null
+++ b/scripts/3_Game/DayZ/tools/tools.c
@@ -0,0 +1,1060 @@
+/**
+ * \defgroup Tools
+ * \desc Helpful functions & classes
+ * @{
+ */
+
+//--------------------------------------------------------------------------
+const int CALL_CATEGORY_SYSTEM = 0; // Runs always
+const int CALL_CATEGORY_GUI = 1; // Runs always (on client)
+const int CALL_CATEGORY_GAMEPLAY = 2; // Runs unless ingame menu is opened
+
+const int CALL_CATEGORY_COUNT = 3;
+
+// -------------------------------------------------------------------------
+class CallQueueContext
+{
+	Class m_target;
+	string m_function;
+	ref Param m_params;
+	bool m_valid;
+
+	void CallQueueContext(Class target, string fn, Param params)
+	{
+		m_target = target;
+		m_function = fn;
+		m_params = params;
+		m_valid = true;
+	}
+		
+	void Call()
+	{
+		CallParams(m_params);
+	}
+		
+	void CallParams(Param params)
+	{
+		if (params)
+		{
+			GetGame().GameScript.CallFunctionParams(m_target, m_function, NULL, params);
+		}
+		else
+		{
+			GetGame().GameScript.CallFunction(m_target, m_function, NULL, 0);
+		}
+	}
+	
+	void Invalidate() {
+		m_valid = false;
+	}
+
+	bool IsValid(){
+		return m_valid;
+	}
+};
+
+//--------------------------------------------------------------------------
+/**
+ \brief CallQueue Class provide "lazy" calls - when we don't want to execute function immediately but later during frame update (used mainly in UI)
+ \n usage:
+ @code
+ GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(this, "Refresh"); // calls "Refresh" function on "this" with no arguments
+ GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(this, "Show", new Param1<bool>(true)); // calls "Show" function on "this" with one bool argument
+ GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(this, "SetPos", new Param2<float, float>(0.2, 0.5)); // calls "SetPos" function on "this" with two float arguments
+ @endcode
+ */
+class CallQueue extends array<ref CallQueueContext>
+{
+	private bool m_processing;
+
+	void CallQueue()
+	{
+		m_processing = false;
+	}
+		
+	/**
+	\brief System function, don't call it
+	*/
+	void Tick()
+	{
+		if (m_processing) return;
+	
+		m_processing = true;
+	
+		while(Count() > 0)
+		{
+			CallQueueContext ctx = Get(0);
+			if (!ctx.IsValid())
+			{
+				Remove(0);
+			}
+			else
+			{
+				Remove(0);
+				ctx.Call();
+			}
+		}
+	
+		m_processing = false;
+	}
+
+	/**
+  \brief Creates new call request, add it on queue and execute during frame update (depends on call category)
+  @param obj target object on which function will be executed
+	@param fn_name name of function (on object "obj") which will be executed
+	@param params function arguments see Param for usage, default NULL (no arguments)
+	\warning When object "obj" is deleted prior call execution, don't forget to remove calls for this object with RemoveCalls
+	*/
+	void Call(Class obj, string fn_name, Param params = NULL)
+	{
+		Insert(new CallQueueContext(obj, fn_name, params));
+	}
+
+
+	/**
+  \brief Removes all queued calls for object (call this function when object is going to be deleted)
+  @param obj object for which you want remove all "lazy" calls
+	*/
+	void RemoveCalls(Class obj)
+	{
+		if (Count())
+		{
+			for (int i = Count() - 1; i >= 0; i--)
+			{
+				CallQueueContext ctx = Get(i);
+				if (ctx.m_target == obj)
+				{
+					ctx.Invalidate();
+				}
+			}
+		}
+	}
+};
+
+//--------------------------------------------------------------------------
+/**
+ \brief DragQueue Class provide callbacks while mouse is dragging. Callback function must have exact arguments: 
+ @code
+ void AnyFunctionName(int mouse_x, int mouse_y, bool is_dragging);
+ @endcode
+ When mouse button is released, callback function is called one more time with is_dragging = false. Then all callbacks are automatically removed from queue.
+
+ \n usage:
+ @code
+ class XYZ
+ {
+	void UpdateDrag(int mouse_x, int mouse_y, bool is_dragging);
+ }
+...
+ GetGame().GetDragQueue().Call(this, "UpdateDrag"); // calls "UpdateDrag" function on "this" 
+
+ @endcode
+ */
+class DragQueue extends CallQueue
+{
+	private ref Param3<int, int, bool> m_mouse_params; // x,y, is_holding_mb
+	
+	void DragQueue()
+	{
+		m_mouse_params = new Param3<int, int, bool>(0,0,true);
+	}
+
+	/**
+	\brief System function, don't call it
+	*/
+	override void Tick()
+	{
+		if (m_processing) return;
+	
+		m_processing = true;
+	
+		int last_index = 0;
+		int mouse_x;
+		int mouse_y;
+		bool is_holding = false;
+		CallQueueContext ctx;
+	
+		if (GetMouseState(MouseState.LEFT) & 0x80000000)
+		{
+			is_holding = true;
+		}
+	
+		GetMousePos(mouse_x, mouse_y);
+	
+		if (!is_holding || mouse_x != m_mouse_params.param1 || mouse_y != m_mouse_params.param2)
+		{
+			m_mouse_params.param1 = mouse_x;
+			m_mouse_params.param2 = mouse_y;
+			m_mouse_params.param3 = is_holding;
+	
+			while (Count() > last_index)
+			{
+				ctx = Get(last_index);
+				if (!ctx.IsValid())
+				{
+					Remove(last_index);
+				}
+				else
+				{
+					ctx.CallParams(m_mouse_params);
+					last_index++;
+				}
+			}
+		}
+	
+		// clear queue when mouse button is released
+		if (!is_holding)
+		{
+			Clear();
+		}
+	
+		m_processing = false;
+	}
+}
+
+//--------------------------------------------------------------------------
+/**
+ \brief TimerBase Class provide just interface for all Timer classes. Don't instance this class, use Timer class instead.
+ */
+class TimerBase: Managed
+{
+	protected bool m_running;
+	protected bool m_loop;
+	protected float m_duration;
+	protected float m_time;
+	protected array<TimerBase> m_timerQueue;
+	protected float m_RunTime;
+
+	void ~TimerBase()
+	{
+		if (!m_timerQueue) return;
+	
+		SetRunning(false);
+	}
+
+
+	/**
+  \brief Pause Timer, internal counter is not restarted, so timer can continue later. Can be unpaused via Continue.
+	*/
+	void Pause()
+	{
+		SetRunning(false);
+	}
+
+	/**
+  \brief Timer continue when it was paused.
+	*/
+	void Continue()
+	{
+		SetRunning(true);
+	}
+
+	/**
+  \brief Stop Timer and restart internal counter. Cannot be unpaused, must be started again.
+	*/
+	void Stop()
+	{
+		SetRunning(false);
+		m_time = 0;
+	}
+		
+	/**
+  \return True when Timer is running (not stopped, not paused)
+	*/
+	bool IsRunning()
+	{
+		return m_running;
+	}
+		
+	/**
+  \brief System function, don't call.
+	*/
+	void Tick(float timeslice)
+	{
+		if (IsRunning())
+		{
+			m_RunTime += timeslice;
+			m_time = m_time + timeslice;
+	
+			if (m_time >= m_duration)
+			{
+				if (m_loop)
+				{
+					m_time = m_time - m_duration;
+				}
+				else
+				{
+					SetRunning(false);
+					m_time = 0;
+				}
+	
+				OnTimer();			
+			}
+			else
+			{
+				OnUpdate();
+			}
+		}
+	}
+
+	/**
+  \brief System function, don't call.
+	*/
+	void OnTimerQueueDestoryed()
+	{
+		m_timerQueue = NULL;
+	}
+
+	float GetTime()
+	{
+		return m_time;
+	}
+		
+	float GetDuration()
+	{
+		return m_duration;
+	}
+		
+	float GetRemaining()
+	{
+		return m_duration - m_time;
+	}
+	
+	float GetRunTime()
+	{
+		return m_RunTime;
+	}
+		
+	protected void OnInit(int category)
+	{
+		m_duration = 1;
+		m_loop = false;
+		m_time = 0;
+		m_running = false;
+		if (GetGame())
+			m_timerQueue = GetGame().GetTimerQueue(category);
+		else
+			ErrorEx("Attempting to Init a timer when the game does not exist (GetGame() == null)");
+	}
+		
+	protected void OnStart(float duration, bool loop)
+	{
+		m_RunTime = 0;
+		m_duration = duration;
+		m_loop = loop;
+		m_time = 0;
+		SetRunning(true);
+	}
+		
+	protected void OnUpdate()	{}
+	protected void OnTimer() {}
+	protected void SetRunning(bool running)
+	{
+		int index = -1;
+	
+		if (m_running == running) return;
+	
+			m_running = running;
+		if (m_timerQueue == NULL) return;
+		
+		if (running)
+		{
+			if (m_timerQueue.Find(this) == -1)
+			{
+				m_timerQueue.Insert(this);
+			}
+		}
+		else
+		{
+			index = m_timerQueue.Find(this);
+			if (index != -1)
+			{
+				m_timerQueue.Remove(index);
+			}
+		}
+	}
+};
+
+//--------------------------------------------------------------------------
+/**
+ \brief TimerQueue Class using for system purpose only
+ */
+class TimerQueue extends array<TimerBase>
+{
+	private bool m_processing;
+
+	// -------------------------------------------------------------------------
+	void TimerQueue()
+	{
+		m_processing = false;
+	}
+	
+	// -------------------------------------------------------------------------
+	void ~TimerQueue()
+	{
+		if (Count())
+		{
+			for (int i = Count() - 1; i >= 0; i--)
+			{
+				Get(i).OnTimerQueueDestoryed();
+			}
+	
+			Clear();
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	void Tick(float timeslice)
+	{
+		if (m_processing) return;
+	
+		m_processing = true;
+	
+		if (Count())
+		{
+			for (int i = Count() - 1; i >= 0; i--)
+			{
+				Get(i).Tick(timeslice);
+			}
+		}
+	
+		m_processing = false;
+	}
+};
+
+//--------------------------------------------------------------------------
+/**
+ \brief Simple class for fading Widgets
+ */
+class WidgetFadeTimer extends TimerBase
+{
+	private Widget m_widget;
+	bool m_fadeIn;
+	float m_alpha;
+
+	void WidgetFadeTimer()
+	{
+		OnInit(CALL_CATEGORY_GUI);
+		m_fadeIn = true;
+	}
+
+	/**
+  \brief Make "fade in" effect on Widget (transparency goes from 0.0 to 1.0)
+  @param w widget which will be faded
+	@param time duration of effect
+	@param continue - if True continue from current alpha value, otherwise always begin from 0.0 alpha
+	*/
+	void FadeIn(Widget w, float time, bool continue_ = false)
+	{
+		m_alpha = w.GetAlpha();
+		
+		if (continue_ && m_alpha > 0.95)
+		{
+			w.SetAlpha(1.0);
+			w.Show(true);
+			return;
+		}	
+		
+		m_widget = w;
+		m_fadeIn = true;
+	
+		OnStart(time, false);
+	
+		if (m_widget)
+		{
+			m_alpha = m_widget.GetAlpha();
+			m_widget.SetAlpha(0);
+			m_widget.Show(true);
+		}
+	
+		if (continue_)
+		{
+			m_time = m_alpha * time;
+		}
+	}
+
+	/**
+  \brief Make "fade out" effect on Widget (transparency goes from 1.0 to 0.0)
+  @param w widget which will be faded
+	@param time duration of effect
+	@param continue - if True continue from current alpha value, otherwise always begin from 1.0 alpha
+	*/
+	void FadeOut(Widget w, float time, bool continue_ = false)
+	{
+		m_alpha = w.GetAlpha();
+		
+		if (continue_ && m_alpha < 0.05)
+		{
+			w.SetAlpha(0);
+			w.Show(false);
+			return;
+		}	
+		
+		m_widget = w;
+		m_fadeIn = false;
+	
+		OnStart(time, false);
+		
+		if (m_widget && !continue_)
+		{
+			m_alpha = 1.0;
+			m_widget.SetAlpha(m_alpha);
+			m_widget.Show(true);
+		}	
+	
+		if (continue_)
+		{
+			m_time = (1.0 - m_alpha) * time;
+		}
+	}
+	
+	override private void OnTimer()
+	{
+		if (m_widget)
+		{
+			if (m_fadeIn)
+			{
+				m_widget.SetAlpha(1);
+			}
+			else
+			{
+				m_widget.SetAlpha(0);
+				m_widget.Show(false);
+			}
+		}
+	}
+	
+	override private void OnUpdate()
+	{
+		float timeDiff = m_time / m_duration;
+		float progress;
+		if (m_widget)
+		{
+			if (m_fadeIn)
+			{
+				progress = timeDiff;
+			}
+			else
+			{
+				progress = Math.Lerp(m_alpha,0,timeDiff);
+				progress = Math.Clamp(progress,0,1);
+			}
+			
+			m_widget.SetAlpha(progress);
+		}
+	}
+};
+
+//--------------------------------------------------------------------------
+/**
+ \brief Timer class. Use when you want call function after some time, or repeatedly in time intervals. Call is not executed after the Timer object is deleted.
+ \n usage:
+ @code
+ class MyObject
+ {
+	ref Timer myTimer1;
+	ref Timer myTimer2;
+	ref Timer myTimer3;
+
+	void MyObject()
+	{
+		myTimer1 = new Timer();
+		myTimer1.Run(10, this, "Refresh"); // calls "Refresh" on "this" after 10 seconds
+
+		myTimer2 = new Timer();
+		myTimer2.Run(10, this, "Refresh", NULL, true); // calls "Refresh" on "this" every 10 seconds, until Pause or Stop is called
+
+		myTimer3 = new Timer();
+		myTimer3.Run(15, this, "Show", new Param1<bool>(false)); // calls "Show" on "this" with one bool argument after 15 seconds
+	}
+
+	void Refresh();
+	void Show(bool visible);
+ }
+ 
+ @endcode
+
+ */
+class Timer extends TimerBase
+{
+	protected Managed m_target;
+	protected string m_function;
+	protected ref Param m_params;
+
+	void Timer(int category = CALL_CATEGORY_SYSTEM)
+	{
+		OnInit(category);
+	}
+
+	/**
+  \brief Starts timer.
+	@param duration function is executed after this time (in seconds).
+	@param obj target object on which function will be executed
+	@param fn_name name of function (on object "obj") which will be executed
+	@param params function arguments see Param for usage, default NULL (no arguments)
+	@param loop when true, timer is looped endlessly and function is executed after every loop.
+	*/
+	void Run(float duration, Managed obj, string fn_name, Param params = NULL, bool loop = false)
+	{
+		m_target = obj;
+		m_function = fn_name;
+			
+		m_params = params;
+		OnStart(duration, loop);
+	}
+	
+	override protected void OnTimer()
+	{
+		if (m_params)
+		{
+			GetGame().GameScript.CallFunctionParams(m_target, m_function, NULL, m_params);
+			m_params = NULL;
+		}
+		else
+		{
+			GetGame().GameScript.CallFunction(m_target, m_function, NULL, 0);
+		}
+	}
+		
+	override void Stop()
+	{
+		super.Stop();
+		m_params = NULL;
+	}
+};
+
+
+
+//--------------------------------------------------------------------------
+/**
+ \brief AnimationTimer class. This timer is for animating float value.
+ \n usage:
+ @code
+ class MyObject
+ {
+	ref AnimationTimer myAnim;
+	
+	void MyObject()
+	{
+		myAnim = new AnimationTimer();
+		myAnim.Run(60, this, "Refresh");
+	}
+
+	void Refresh()
+	{
+		Print(myAnim.GetValue());
+	}
+ }; 
+ @endcode
+
+ */
+
+class AnimationTimer : TimerBase
+{
+	private bool m_Active;
+	private float m_TargetValue;
+	private float m_TargetValueOriginal;
+	private float m_Value;
+	protected Managed m_TargetObject;
+	protected string m_UpdateFunction;
+	protected string m_FinishedFunction;
+	protected ref Param m_Params;
+	
+	void AnimationTimer(int category = CALL_CATEGORY_SYSTEM)
+	{
+		OnInit(category);
+	}
+	
+	void ~AnimationTimer()
+	{
+		SetRunning(false);
+	}
+	
+	void Run(float targetVal, Managed obj, string updateFunc, string finishedFunc, float startingVal = 0, bool loop = false, float speed = 1.0, Param params = null, int category = CALL_CATEGORY_SYSTEM)
+	{
+		SetRunning(true);
+		m_TargetObject = obj;
+		m_UpdateFunction = updateFunc;
+		m_FinishedFunction = finishedFunc;
+		m_TargetValueOriginal = targetVal;
+		m_TargetValue = targetVal;
+		m_time = speed;
+		m_loop = loop;
+		m_Active = true;
+		m_Params = params;
+		m_Value = startingVal;
+	}
+
+	/**
+  \brief Returns actual animated value.
+	*/
+	float GetValue() {
+		return m_Value;
+	}	
+
+	override bool IsRunning()
+	{
+		return m_Active;
+	}
+	/**
+  \brief Ticks the timer, is called by timer subsystem.
+	*/
+	override void Tick(float timeslice)
+	{
+		if ( !m_Active ) 
+			return;
+		
+
+		float diff = Math.AbsFloat(m_TargetValue - m_Value);
+		float step = m_time * timeslice;
+
+		if (diff < step)
+		{
+			m_Value = m_TargetValue;
+			if (!m_loop)
+			{
+				m_Active = false;
+			}
+			else
+			{
+				if (m_TargetValue == m_TargetValueOriginal)
+				{
+					m_TargetValue = 0;
+				}
+				else
+				{
+					m_TargetValue = m_TargetValueOriginal;
+				}
+				
+			}
+			GetGame().GameScript.CallFunction(m_TargetObject, m_FinishedFunction, NULL, m_Params);
+		}
+		else
+		{
+			if (m_TargetValue > m_Value) 
+			{
+				m_Value += step;
+			}
+			else
+			{
+				m_Value -= step;
+			}
+		}
+		
+		GetGame().GameScript.CallFunction(m_TargetObject, m_UpdateFunction, NULL, m_Params);
+	}
+};
+
+class AnimatorTimer
+{
+	private bool m_active = false;
+	private bool m_loop = false;
+	private float m_target_value = 0;
+	private float m_value = 0;
+	private float m_time = 0;
+
+	/**
+  \brief Starts animate value until value reaches target value.
+	@param val \p float target value
+	@param speed \p float speed of animating, units per second
+	*/
+	void Animate(float val, float speed = 1.0)
+	{
+		m_target_value = val;
+		m_loop = false;
+		m_time = speed;
+		m_active = true;
+	}
+
+	/**
+  \brief Starts infinite animation loop <-1,1>. Based on sinus transition.
+	@param speed \p float speed of animating , cycles per second (1.0 means one 360 degree sinus cycle per second: 0..1..0..-1..0)
+	*/
+	void AnimateLoop(float speed = 1.0)
+	{
+		m_value = 0;
+		m_target_value = 0;
+		m_loop = true;
+		m_time = speed;
+		m_active = true;
+	}
+
+	/**
+  \brief Returns actual animated value.
+	*/
+	float GetValue() {
+		return m_value;
+	}	
+
+	/**
+  \brief Returns target value. While AnimateLoop returns angle of cycle in radians.
+	*/
+	float GetTargetValue() {
+		return m_target_value;
+	}
+
+	/**
+  \brief Sets both value and target value.
+	*/
+	void SetValue(float val) {
+		m_value = val;
+		m_target_value = val;
+	}	
+
+	bool IsRunning()
+	{
+		return m_active;
+	}
+	/**
+  \brief Ticks the timer, is called by timer subsystem.
+	*/
+	void Tick(float timeslice)
+	{
+		if ( !m_active ) return;
+		
+		if (m_loop)
+		{
+			m_target_value += m_time * Math.PI2 * timeslice;
+			while (m_target_value > Math.PI2) m_target_value -= Math.PI2;
+			
+			m_value = Math.Sin(m_target_value);
+		}
+		else
+		{
+			float diff = Math.AbsFloat(m_target_value - m_value);
+			float step = m_time * timeslice;
+	
+			if (diff < step)
+			{
+				m_value = m_target_value;
+				m_active = false;
+			}
+			else
+			{
+				if (m_target_value > m_value) 
+				{
+					m_value += step;
+				}
+				else
+				{
+					m_value -= step;
+				}
+			}
+		}
+	}
+};
+
+/**
+ \brief Associative array template, with multiple values per key
+ \n usage:
+ @code
+ ref multiMap<string, int>	myMap = new multiMap<string, int>;
+ myMap.Insert("jozo", 7);
+ myMap.Insert("jozo", 3);
+ myMap.Insert("jozo", 5);
+ myMap.Insert("fero", 98);
+ myMap.Insert("fero", 35);
+ myMap.Insert("fero", 17);
+
+ Print("Jozo:");
+ myMap.Get("jozo").Debug();
+ Print("Fero:");
+ myMap.Get("fero").Debug();
+
+ @endcode
+
+ */
+class multiMap<Class K, Class V>
+{
+	private ref array<ref array<V> > m_values;
+	private ref array<K> m_keys;
+
+	bool HasKey(K key)
+	{
+		int index = -1;
+		if (m_keys)
+		{
+			index = m_keys.Find(key);
+		}
+
+		if (index != -1)
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	array<V> Get(K key)
+	{
+		int index = -1;
+		if (m_keys)
+		{
+			index = m_keys.Find(key);
+		}
+
+		if (index != -1)
+		{
+			return m_values.Get(index);
+		}
+
+		return NULL;
+	}
+
+	array<V> GetByIndex(int index)
+	{
+		return m_values.Get(index);
+	}
+
+	K GetKeyByIndex(int index)
+	{
+		return m_keys.Get(index);
+	}
+
+	void Insert(K key, V value)
+	{
+		int index = -1;
+		
+		if (!m_keys)
+		{
+			m_keys = new array<K>;
+			m_values = new array<ref array<V> >;
+		}
+		else
+		{
+			index = m_keys.Find(key);
+		}
+
+		if (index == -1)
+		{
+			array<V> value_array = new array<V>;
+			value_array.Insert(value);
+
+			m_keys.Insert(key);
+			m_values.Insert(value_array);
+
+		}
+		else
+		{
+			m_values.Get(index).Insert(value);
+		}
+	}
+
+	void RemoveByIndex(int index)
+	{
+		m_keys.Remove(index);
+		m_values.Remove(index);
+	}
+
+	void Remove(K key)
+	{
+		int index = -1;
+		if (m_keys)
+		{
+			index = m_keys.Find(key);
+		}
+
+		if (index != -1)
+		{
+			RemoveByIndex(index);
+		}
+	}
+
+	int Count()
+	{
+		if (m_keys)
+		{
+			return m_keys.Count();
+		}
+
+		return 0;
+	}
+
+	void Clear()
+	{
+		if ( m_keys && m_values)
+		{
+			m_keys.Clear();
+			m_values.Clear();
+		}
+		
+	}
+
+	void ~multiMap()
+	{
+		Clear();
+	}
+};
+
+// at last one template definition should be here, for template initialization in this script module
+typedef map<string, string> TStringMap;
+
+int GetTemperatureColor( int temperature )
+{
+	int alpha = 255;
+	int red = 153;
+	int green = 153;
+	int blue = 153;
+	if ( temperature < 20 )
+	{
+		temperature = temperature - 20;
+		temperature = Math.Clamp( temperature, -50, 50);
+		temperature = Math.AbsInt(temperature);
+
+		red = Math.Clamp ( red - ((red/50 )*temperature), 0, 255 );
+		green = Math.Clamp ( green - ((green/50 )*temperature), 0, 255 );
+		blue = Math.Clamp ( blue+((blue/50)*temperature), 0, 255 );
+	}
+	else if ( temperature > 20 )
+	{
+		temperature = Math.Clamp( temperature, -100, 100);
+		blue = Math.Clamp ( blue - ((blue/100 )*temperature), 0, 255 );
+		green = Math.Clamp ( green - ((green/100 )*temperature), 0, 255 );
+		red = Math.Clamp ( red+((red/100)*temperature), 0, 255 );
+	}
+
+	int color = ARGB( alpha, red, green, blue );
+	return color;
+}
+
+//! Return value from profile variable, if variable with given name is not present, default value is returned
+bool GetProfileValueBool(string name, bool def = false)
+{
+	string value;
+	if (GetGame().GetProfileString(name, value))
+	{
+		if (value == "true" || value == "1")
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	else
+	{
+		return def;
+	}
+}
+	
+//! Writes bool variable to profile, after write don't forget to call CGame::SaveProfile() to save profile to storage!
+void SetProfileValueBool(string name, bool value)
+{
+	if (value)
+	{
+		GetGame().SetProfileString(name, "1");
+	}
+	else
+	{
+		GetGame().SetProfileString(name, "0");
+	}
+}
+
+
+int GetNumberOfSetBits(int i)//leaving here for legacy/modding reasons
+{
+	return Math.GetNumberOfSetBits(i);
+}
+
+/** @}*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamage.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamage.c
new file mode 100644
index 0000000000000000000000000000000000000000..9219dcfbfebb7cd2f29329f682a0dd27b9165716
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamage.c
@@ -0,0 +1,269 @@
+// DEPRECATED: Backwards compatibility class to prevent existing mods breaking
+// I wish I could rename this to AreaDamageTimer, but can't, because of backwards compatibility with mods
+class AreaDamageBase : AreaDamageManager
+{
+	protected AreaDamageBase			m_AreaDamage;
+	
+	protected float						m_PlayerDamage;
+	protected float						m_OthersDamage;
+	
+	protected string					m_AmmoName;
+	protected int 						m_DamageType;
+	
+	protected float						m_LoopInterval;
+	protected float						m_DeferDuration;
+	
+	protected ref array<string>			m_HitZones;
+	protected ref array<string> 		m_RaycastSources;
+	protected ref array<typename>		m_DamageableTypes
+	
+	protected ref Timer					m_LoopTimer;
+	protected ref Timer					m_DeferTimer;
+	
+	void AreaDamageBase(EntityAI parent)
+	{
+		m_AreaDamage		= this;
+		
+		m_PlayerDamage		= 0.0;
+		m_OthersDamage		= 0.0;
+		
+		m_AmmoName			= "MeleeDamage";
+		m_DamageType 		= DT_CUSTOM;
+		
+		m_LoopInterval 		= 1.0;
+		m_DeferDuration		= 1.0;
+		
+		m_HitZones			= new array<string>;
+		m_RaycastSources	= new array<string>;
+		m_DamageableTypes	= new array<typename>;
+		m_DamageableTypes.Insert(DayZPlayer);
+		
+		m_LoopTimer 		= new Timer(CALL_CATEGORY_SYSTEM);
+		m_DeferTimer 		= new Timer(CALL_CATEGORY_SYSTEM);
+		
+		m_TriggerBaseClass = "AreaDamageTrigger";
+	}
+	
+	//! events
+	void OnEnter(Object object)
+	{
+		if ( GetGame().IsServer() )
+		{
+			OnEnterServer(object);
+		}
+		else
+		{
+			OnEnterClient(object);
+		}
+	}
+	void OnEnterClient(Object object) {}
+	void OnEnterServer(Object object) {}
+	
+	void OnLeave(Object object)
+	{
+		if ( GetGame().IsServer() )
+		{
+			OnLeaveServer(object);
+		}
+		else
+		{
+			OnLeaveClient(object);
+		}
+	}
+
+	void OnLeaveClient(Object object) {}
+	void OnLeaveServer(Object object)
+	{
+		//! stop all running timers
+		if ( m_DeferTimer && m_DeferTimer.IsRunning() )
+		{
+			m_DeferTimer.Stop();
+		}
+		if ( m_LoopTimer && m_LoopTimer.IsRunning() )
+		{
+			m_LoopTimer.Stop();
+		}
+	}
+	
+	protected void EvaluateDamage_Loop(Object object)
+	{
+		m_LoopTimer.Run(m_LoopInterval, this, "EvaluateDamage", new Param1<Object>(object), true);
+	}
+
+	protected void EvaluateDamage_Defer(Object object)
+	{
+		m_DeferTimer.Run(m_DeferDuration, this, "EvaluateDamage", new Param1<Object>(object), false);
+	}
+	
+	protected void EvaluateDamage_DeferLoop(Object object)
+	{
+		m_DeferTimer.Run(m_DeferDuration, this, "EvaluateDamage_Loop", new Param1<Object>(object), false);
+	}
+	
+	protected void EvaluateDamage(Object object)
+	{
+		string hitzone;
+
+		if ( m_RaycastSources.Count() )
+		{
+			hitzone = GetRaycastedHitZone(object, m_RaycastSources);
+			EvaluateDamage_Common(object, hitzone);
+		}
+		else
+		{
+			hitzone = GetRandomHitZone(m_HitZones);
+			EvaluateDamage_Common(object, hitzone);
+		}
+	}
+	
+	protected void EvaluateDamage_Common(Object object, string hitzone)
+	{
+		if ( object && object.IsAlive() )
+		{
+			if ( object.IsAnyInherited( m_DamageableTypes ) )
+			{
+				//If we are hitting an infected or animal, we increase the damage dealt as they do not bleed
+				//Change is multiplier
+				/*DayZInfected dayzInfected = DayZInfected.Cast(object);
+				DayZAnimal dayzAnimal = DayZAnimal.Cast(object);
+				EntityAI eai = EntityAI.Cast(object);
+				if ( dayzInfected || dayzAnimal )
+				{
+					//Agents should not take damage from fireplace, but just in case, keep multiplier relatively low
+					if ( hitzone )
+					{
+						eai.ProcessDirectDamage(m_DamageType, EntityAI.Cast(m_ParentObject), hitzone, m_AmmoName, "0.5 0.5 0.5", 8);
+					}
+					else
+						eai.ProcessDirectDamage(m_DamageType, EntityAI.Cast(m_ParentObject), "", m_AmmoName, "0.5 0.5 0.5", 8);
+	}
+				else*/
+				{
+					object.ProcessDirectDamage(m_DamageType, m_ParentObject, hitzone, m_AmmoName, "0.5 0.5 0.5", 1);
+				}
+				PostDamageActions();
+			}
+		}
+	}
+	
+	
+	//! ------------------------------------------------------
+	//! common
+	//!
+	
+	protected string GetRandomHitZone(array<string> hitzones)
+	{
+		Math.Randomize(-1);
+		int idx = Math.RandomInt( 0, 100 ) % hitzones.Count();
+
+		return hitzones[idx];
+	}
+	
+	protected string GetRaycastedHitZone(Object victim, array<string> raycast_sources_str)
+	{
+		
+		// Vertical raycast start positions:    Center,      North East,    North West,    South East,  South West
+		//vector raycast_sources[5] = {"0.0 0.1 0.0", "0.2 0.1 0.2", "-.2 0.1 0.2", "0.2 0.1 -.2", "-.2 0.1 -.2"};
+		
+		string hitzone;
+		vector contact_pos;
+		vector contact_dir;
+		int contactComponent;
+		bool isSteppedOn = false;
+		
+		array<vector> raycast_sources = new array<vector>;
+		ref set<Object> victims = new set<Object>;
+
+		// convert Array of string to array of Vectors
+		for ( int v = 0; v < raycast_sources_str.Count(); ++v)
+		{
+			raycast_sources.Insert(raycast_sources_str[v].ToVector());
+		}
+		
+		for ( int i = 0; i < raycast_sources.Count(); ++i )
+		{
+			vector raycast_start_pos = m_AreaDamageTrigger.ModelToWorld( raycast_sources.Get(i) );
+			vector raycast_end_pos = "0 0.5 0" + raycast_start_pos;
+			
+			//#ifdef DEVELOPER
+			//Debug.DrawArrow( raycast_start_pos, raycast_end_pos );
+			//#endif
+			DayZPhysics.RaycastRV( raycast_start_pos, raycast_end_pos, contact_pos, contact_dir, contactComponent, victims , null, m_AreaDamageTrigger, true, false, ObjIntersectIFire);
+			
+			for ( int j = 0; j < victims.Count(); ++j )
+			{
+				Object contact_obj = victims.Get(j);
+				
+				if ( contact_obj.IsAnyInherited(m_DamageableTypes) )
+				{
+					isSteppedOn = true;
+					break;
+				}
+			}
+			
+			if ( isSteppedOn )
+			{
+				EntityAI eai = EntityAI.Cast(victim);
+				if ( eai )
+				{
+					hitzone = eai.GetDamageZoneNameByComponentIndex(contactComponent);
+					break;
+				}
+			}
+		}
+		
+		if ( isSteppedOn )
+		{
+			return hitzone;
+		}
+		else
+		{
+			// Damage random leg since we don't know what part of player's body was caught in the trap.
+			string dmg_zone_rnd = "LeftFoot";
+			if ( Math.RandomIntInclusive(0, 1) == 1 )
+				dmg_zone_rnd = "RightFoot";
+			return dmg_zone_rnd;
+		}
+	}
+	
+	//! -----------------------------------------------------
+	//! DEBUG
+	//!
+
+#ifdef DEVELOPER
+	ref array<Shape> triggerAreaShapes = new array<Shape>();
+	
+	void EnableDebug(bool pState = false)
+	{
+		//if (GetGame() && (!GetGame().IsClient() || GetGame().IsMultiplayer()))
+			//return;
+
+		if ( pState )
+		{
+			Debug_DrawArea();
+		}
+		else
+		{
+			Debug_CleanupShapes(triggerAreaShapes);
+		}
+	}
+
+	protected void Debug_DrawArea()
+	{
+		vector min = m_AreaPosition + m_ExtentMin;
+		vector max = m_AreaPosition + m_ExtentMax;
+
+		triggerAreaShapes.Insert(Debug.DrawBox(min, max));
+	}
+
+	private void Debug_CleanupShapes(array<Shape> shapesArr)
+	{
+		for ( int it = 0; it < shapesArr.Count(); ++it )
+		{
+			Debug.RemoveShape( shapesArr[it] );
+		}
+		
+		shapesArr.Clear();
+	}
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageEvents.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..e26234b3c41c5070915e1d0f1fa803fbf0046a1a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageEvents.c
@@ -0,0 +1,62 @@
+//! Events used across AreaDamage API, calling of these needs to be handled by parent
+class AreaDamageEvents
+{
+	///@{
+	//! Called when a trigger is created
+	void OnTriggerCreated() {}
+	//! Called when a trigger is destroyed
+	void OnTriggerDestroyed() {}	
+	///@}
+	
+	///@{
+	//! Called when an object enters the trigger
+	void OnEnterBeginEvent(TriggerInsider insider) {}
+	void OnEnterServerEvent(TriggerInsider insider) {}
+	void OnEnterClientEvent(TriggerInsider insider) {}
+	void OnEnterEndEvent(TriggerInsider insider) {}
+	///@}
+	
+	///@{
+	//! Called at the beginning of an update loop
+	void OnStayStartBeginEvent(int nrOfInsiders) {}
+	void OnStayStartServerEvent(int nrOfInsiders) {}
+	void OnStayStartClientEvent(int nrOfInsiders) {}
+	void OnStayStartEndEvent(int nrOfInsiders) {}
+	///@}
+	
+	///@{
+	//! Called in the update loop
+	void OnStayBeginEvent(TriggerInsider insider, float deltaTime) {}
+	void OnStayServerEvent(TriggerInsider insider, float deltaTime) {}
+	void OnStayClientEvent(TriggerInsider insider, float deltaTime) {}
+	void OnStayEndEvent(TriggerInsider insider, float deltaTime) {}
+	///@}
+	
+	///@{
+	//! Called at the end of an update loop
+	void OnStayFinishBeginEvent() {}
+	void OnStayFinishServerEvent() {}
+	void OnStayFinishClientEvent() {}
+	void OnStayFinishEndEvent() {}
+	///@}
+	
+	///@{
+	//! Called when an object leaves the trigger
+	void OnLeaveBeginEvent(TriggerInsider insider) {}
+	void OnLeaveServerEvent(TriggerInsider insider) {}
+	void OnLeaveClientEvent(TriggerInsider insider) {}
+	void OnLeaveEndEvent(TriggerInsider insider) {}
+	///@}
+	
+	///@{
+	//! Called when an object gets evaluated for taking damage
+	protected bool OnEvaluateDamage(TriggerInsider insider, float damageCoef) { return false; }
+	///@}
+	
+	///@{
+	//! Called before an object is damaged (only when it actually damaged an object)
+	protected void PreDamageActions() {}
+	//! Called after an object was damaged (only when it actually damaged an object)
+	protected void PostDamageActions() {}
+	///@}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLooped.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLooped.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f1cc8179c6f2b977c0bac888756c7eff05ebaed
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLooped.c
@@ -0,0 +1,102 @@
+class AreaDamageLooped : AreaDamageManager
+{
+	//! Current start time in seconds
+	protected float				m_CurrentTime = 0.0;
+	//! Previous start time in seconds
+	protected float				m_PreviousTime = 0.0;	
+	//! How much time has accumulated
+	protected float 			m_AccumulatedTime = 0.0;	
+	//! Loop interval in seconds
+	protected float				m_LoopInterval = 1.0;
+	
+	//! Caching of the amount of loops that will be performed in this frame
+	protected int 				m_AmountOfLoops = 0;
+	
+	//! Decides if the looping will be using the Object as reference or the time since last update loop
+	protected bool				m_LoopByObject = true;
+	
+	void AreaDamageLooped(EntityAI parent, bool loopByObject = true)
+	{
+		m_LoopByObject = loopByObject;
+	}
+	
+	//! Gets called when the trigger is spawned, so is the start and also a reset
+	override void OnTriggerCreated()
+	{
+		super.OnTriggerCreated();
+		
+		m_PreviousTime = g_Game.GetTickTime();
+		m_AccumulatedTime = 0.0;
+	}
+	
+	override void SetLoopInterval( float time )
+	{
+		m_LoopInterval = time;
+	}
+	
+	override void OnEnterServerEvent(TriggerInsider insider)
+	{
+		super.OnEnterServerEvent(insider);
+		
+		// Do direct damaging first time on entering
+		if (m_LoopByObject)
+			OnEvaluateDamageEx(insider, 1);
+	}
+	
+	override void OnStayStartServerEvent(int nrOfInsiders)
+	{
+		super.OnStayStartServerEvent(nrOfInsiders);
+		
+		m_CurrentTime = g_Game.GetTickTime();		
+		m_AccumulatedTime += m_CurrentTime - m_PreviousTime;		
+		m_PreviousTime = m_CurrentTime;
+		
+		m_AmountOfLoops = m_AccumulatedTime / m_LoopInterval;
+	}
+	
+	override void OnStayServerEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayServerEvent(insider, deltaTime);
+		
+		// As we are using the Ex variant, we can put the logic in CalculateDamageScale
+		OnEvaluateDamageEx(insider, deltaTime);
+	}
+	
+	override void OnStayFinishServerEvent()
+	{
+		super.OnStayFinishServerEvent();
+		
+		m_AccumulatedTime -= m_AmountOfLoops * m_LoopInterval;
+	}
+	
+	// TODO: EMH: OnLeaveServerEvent -> perform the remaining buffered damage to be done?
+	
+	override protected float CalculateDamageScale(TriggerInsider insider, float deltaTime)
+	{	
+		// If we want the LoopInterval to be dependant on the Object, we will need their lastDamaged time
+		if (m_LoopByObject)
+		{
+			float lastDamaged = 0;
+			
+			AreaDamageTriggerInsider dInsider;
+			if ( CastTo( dInsider, insider ) )
+				lastDamaged = dInsider.lastDamaged;
+			
+			// First time it is damaged, do full damage
+			if (lastDamaged == 0)
+				return 1;
+			
+			// This way, in case the server lags, it will scale the damage to catch up if necessary
+			// We want to wait until it is at least above 1, to not spam the network with hit messages
+			float damageCoeff = (m_CurrentTime - lastDamaged) / m_LoopInterval;
+			if ( damageCoeff >= 1 )
+				return damageCoeff;
+			
+			return 0;
+		}
+		else
+		{
+			return m_AmountOfLoops;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLoopedDeferred.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLoopedDeferred.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1db76de530b54bd3922c27c997d344a3920f5bf
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLoopedDeferred.c
@@ -0,0 +1,19 @@
+//! Deferred version of AreaDamageLooped
+class AreaDamageLoopedDeferred : AreaDamageLooped
+{
+	//! Time the damage should be deferred in seconds
+	protected float m_DeferDuration = 1.0;
+
+	override void SetDeferDuration(float time)
+	{
+		m_DeferDuration = time;
+	}
+	
+	override protected float CalculateDamageScale(TriggerInsider insider, float deltaTime)
+	{
+		if ( m_DeferDuration > 0 && (insider.lastUpdated - insider.timeEntered) >= m_DeferDuration )
+			return super.CalculateDamageScale(insider, deltaTime);
+		
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLoopedDeferred_NoVehicle.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLoopedDeferred_NoVehicle.c
new file mode 100644
index 0000000000000000000000000000000000000000..0fd28ea02e50dcbb863d0b7e3d04ce108dc5c384
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageLoopedDeferred_NoVehicle.c
@@ -0,0 +1,16 @@
+//! A particular version of the deferred loop used to not damage players inside vehicles 
+class AreaDamageLoopedDeferred_NoVehicle: AreaDamageLoopedDeferred
+{
+	override bool OnEvaluateDamageEx( TriggerInsider insider, float deltaTime )
+	{
+		// For case where player is inside vehicle 
+		if ( insider.GetObject().IsMan() )
+		{
+			PlayerBase playerInsider = PlayerBase.Cast( insider.GetObject() );
+			if ( playerInsider.GetCommand_Vehicle() )
+				return false;
+		}
+		
+		return super.OnEvaluateDamageEx( insider, deltaTime );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageManager.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..3eafa71c838c6131dc5f9762856fe6efc350c76b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageManager.c
@@ -0,0 +1,423 @@
+class AreaDamageComponentTypes
+{
+	const int BASE = 0;
+	const int HITZONE = 1;
+	const int RAYCASTED = 2;
+}
+
+class AreaDamageManager : AreaDamageEvents
+{
+	protected EntityAI						m_ParentObject;
+	protected AreaDamageTriggerBase			m_AreaDamageTrigger;	
+	
+	protected ref AreaDamageComponent		m_DamageComponent;
+	
+	protected vector						m_ExtentMin;
+	protected vector 						m_ExtentMax;
+	protected vector 						m_AreaPosition;
+	protected vector 						m_AreaOrientation;
+	
+	protected string						m_TriggerBaseClass;
+	
+	void AreaDamageManager(EntityAI parent)
+	{
+		m_ParentObject		= parent;
+		
+		m_DamageComponent	= new AreaDamageComponent(this);
+		
+		m_ExtentMin 		= vector.Zero;
+		m_ExtentMax 		= vector.Zero;
+		m_AreaPosition		= parent.GetPosition();
+		m_AreaOrientation	= parent.GetOrientation();
+		
+		m_TriggerBaseClass 	= "AreaDamageTriggerBase";
+	}
+	
+	void ~AreaDamageManager()
+	{
+		Destroy();
+	}
+	
+	void SetDamageComponentType(int type)
+	{
+		switch (type)
+		{
+			case AreaDamageComponentTypes.BASE:
+			{
+				m_DamageComponent = new AreaDamageComponent(this);
+				break;
+			}
+			case AreaDamageComponentTypes.HITZONE:
+			{
+				m_DamageComponent = new AreaDamageComponentRandomHitzone(this);
+				break;
+			}
+			case AreaDamageComponentTypes.RAYCASTED:
+			{
+				m_DamageComponent = new AreaDamageComponentRaycasted(this);
+				break;
+			}
+			
+			default:
+			{
+				Error(string.Format("[ERROR] :: [AreaDamageManager] :: Unknown DamageComponentType: %1", type));
+				break;
+			}
+		}
+	}
+
+	//! spawn damage trigger
+	void Spawn()
+	{
+		if ( CreateDamageTriggerEx() )
+			OnTriggerCreated();
+	}
+	
+	//! destroy damage trigger
+	void Destroy()
+	{
+		if ( DestroyDamageTriggerEx() )
+			OnTriggerDestroyed();
+	}
+
+	/////////////////////////////////////////////////////////////
+	/** @name AreaDamageEvents Implementation
+ 	*  Implementation for handling \ref AreaDamageEvents
+	*  Pass them on to the AreaDamageComponent
+	*  Calling of the events that are the same in TriggerEvents will come from AreaDamageTriggerBase
+	*/
+	///@{
+	//! Called when a trigger is created
+	override void OnTriggerCreated()
+	{
+		m_DamageComponent.OnTriggerCreated();
+	}
+	
+	//! Called when a trigger is destroyed
+	override void OnTriggerDestroyed()
+	{
+		m_DamageComponent.OnTriggerDestroyed();
+	}
+	
+	//! Called when an object enters the trigger
+	override void OnEnterBeginEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnEnterBeginEvent(insider);
+	}
+	override void OnEnterServerEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnEnterServerEvent(insider);
+	}
+	override void OnEnterClientEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnEnterClientEvent(insider);
+	}
+	override void OnEnterEndEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnEnterEndEvent(insider);
+	}
+	
+	//! Called at the beginning of an update loop
+	override void OnStayStartBeginEvent(int nrOfInsiders)
+	{
+		m_DamageComponent.OnStayStartBeginEvent(nrOfInsiders);
+	}
+	override void OnStayStartServerEvent(int nrOfInsiders)
+	{
+		m_DamageComponent.OnStayStartServerEvent(nrOfInsiders);
+	}
+	override void OnStayStartClientEvent(int nrOfInsiders)
+	{
+		m_DamageComponent.OnStayStartClientEvent(nrOfInsiders);
+	}
+	override void OnStayStartEndEvent(int nrOfInsiders)
+	{
+		m_DamageComponent.OnStayStartEndEvent(nrOfInsiders);
+	}
+	
+	//! Called in the update loop
+	override void OnStayBeginEvent(TriggerInsider insider, float deltaTime)
+	{
+		m_DamageComponent.OnStayBeginEvent(insider, deltaTime);
+	}
+	override void OnStayServerEvent(TriggerInsider insider, float deltaTime)
+	{
+		m_DamageComponent.OnStayServerEvent(insider, deltaTime);
+	}
+	override void OnStayClientEvent(TriggerInsider insider, float deltaTime)
+	{
+		m_DamageComponent.OnStayClientEvent(insider, deltaTime);
+	}
+	override void OnStayEndEvent(TriggerInsider insider, float deltaTime)
+	{
+		m_DamageComponent.OnStayEndEvent(insider, deltaTime);
+	}
+	
+	//! Called at the end of an update loop
+	override void OnStayFinishBeginEvent()
+	{
+		m_DamageComponent.OnStayFinishBeginEvent();
+	}
+	override void OnStayFinishServerEvent()
+	{
+		m_DamageComponent.OnStayFinishServerEvent();
+	}
+	override void OnStayFinishClientEvent()
+	{
+		m_DamageComponent.OnStayFinishClientEvent();
+	}
+	override void OnStayFinishEndEvent()
+	{
+		m_DamageComponent.OnStayFinishEndEvent();
+	}
+	
+	//! Called when an object leaves the trigger
+	override void OnLeaveBeginEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnLeaveBeginEvent(insider);
+	}
+	override void OnLeaveServerEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnLeaveServerEvent(insider);
+	}
+	override void OnLeaveClientEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnLeaveClientEvent(insider);
+	}
+	override void OnLeaveEndEvent(TriggerInsider insider)
+	{
+		m_DamageComponent.OnLeaveEndEvent(insider);
+	}
+	
+	//! Tell the AreaDamageComponent to calculate and apply the damage to the Object
+	override bool OnEvaluateDamage(TriggerInsider insider, float damageCoef)
+	{
+		return m_DamageComponent.OnEvaluateDamage(insider, damageCoef);
+	}
+
+	//! Usually called from AreaDamageComponent
+	override void PreDamageActions()
+	{
+		if ( m_ParentObject )
+			m_ParentObject.PreAreaDamageActions();
+	}
+
+	//! Usually called from AreaDamageComponent
+	override void PostDamageActions()
+	{
+		if ( m_ParentObject )
+			m_ParentObject.PostAreaDamageActions();
+	}
+	///@}
+	/////////////////////////////////////////////////////////////
+
+	
+	//! Some event extensions
+	///@{
+	//! Alternative OnEvaluateDamage, using CalculateDamageScale
+	bool OnEvaluateDamageEx(TriggerInsider insider, float deltaTime)
+	{
+		return OnEvaluateDamage( insider, CalculateDamageScale( insider, deltaTime ) );
+	}
+	
+	//! Helper for calculating damageCoeff when using OnEvaluateDamageEx
+	protected float CalculateDamageScale(TriggerInsider insider, float deltaTime)
+	{
+		return deltaTime;
+	}
+	///@}
+	
+	
+	//! script configuration
+	///@{
+	void SetExtents( vector mins, vector maxs )
+	{
+		m_ExtentMin = mins;
+		m_ExtentMax = maxs;
+		
+		if ( m_AreaDamageTrigger )
+		{
+			m_AreaDamageTrigger.SetExtents(m_ExtentMin, m_ExtentMax);
+		}
+	}	
+	void GetExtents( out vector mins, out vector maxs )
+	{
+		mins = m_ExtentMin;
+		maxs = m_ExtentMax;
+	}	
+	void GetWorldExtents( out vector mins, out vector maxs )
+	{
+		GetExtents(mins, maxs);
+		
+		mins + m_AreaPosition;
+		maxs + m_AreaPosition;
+	}
+
+	void SetAmmoName( string ammo_name )
+	{
+		m_DamageComponent.m_AmmoName = ammo_name;
+	}
+	string GetAmmoName()
+	{
+		return m_DamageComponent.m_AmmoName;
+	}
+	
+	void SetDamageType( int pDamageType )
+	{
+		m_DamageComponent.m_DamageType = pDamageType;
+	}
+	int GetDamageType()
+	{
+		return m_DamageComponent.m_DamageType;
+	}
+	
+    void SetParentObject( EntityAI obj )
+	{
+		m_ParentObject = obj;
+	}
+	EntityAI GetParentObject()
+	{
+		return m_ParentObject;
+	}
+	
+    void SetAreaPosition( vector position )
+	{
+		m_AreaPosition = position;
+		
+		if ( m_AreaDamageTrigger )
+		{
+			m_AreaDamageTrigger.SetPosition(m_AreaPosition);
+		}
+	}
+	vector GetPosition()
+	{
+		return m_AreaPosition;
+	}
+	
+    void SetAreaOrientation( vector orientation )
+	{
+		m_AreaOrientation = orientation;
+		
+		if ( m_AreaDamageTrigger )
+		{
+			m_AreaDamageTrigger.SetOrientation(m_AreaOrientation);
+		}
+	}	
+	vector GetOrientation()
+	{
+		return m_AreaOrientation;
+	}
+	
+	void SetDamageableTypes(array<typename> damageableTypes)
+	{
+		m_DamageComponent.m_DamageableTypes = damageableTypes;
+	}
+	array<typename> GetDamageableTypes()
+	{
+		return m_DamageComponent.m_DamageableTypes;
+	}
+	
+	void AddDamageableType(typename damageableType)
+	{
+		if (m_DamageComponent.m_DamageableTypes.Find(damageableType) != -1)
+			m_DamageComponent.m_DamageableTypes.Insert(damageableType);
+	}
+	
+	void RemoveAddDamageableType(typename damageableType)
+	{
+		m_DamageComponent.m_DamageableTypes.RemoveItem(damageableType);
+	}
+	
+	void SetLoopInterval( float time )
+	{
+		Error("SetLoopInterval not implemented - usable in Regular(looped) area damage objects only");
+	}
+	
+	void SetDeferDuration( float time )
+	{
+		Error("SetDeferDuration not implemented - usable in Deferred area damage objects only");
+	}
+
+	void SetHitZones( array<string> hitzones )
+	{
+		AreaDamageComponentRandomHitzone adc;
+		if ( CastTo( adc, m_DamageComponent ) )
+			adc.SetHitZones( hitzones );
+		else
+			Error("SetHitZones not implemented - override for non raycasted versions of area damage objects only");
+	}
+
+	void SetRaycastSources( array<string> raycast_sources )
+	{
+		AreaDamageComponentRaycasted adc;
+		if ( CastTo( adc, m_DamageComponent ) )
+			adc.SetRaycastSources( raycast_sources );
+		else
+			Error("SetRaycastSources not implemented - override for raycasted versions of area damage objects only");
+	}
+	
+	void SetRaycastSourcesVector( array<vector> raycast_sources )
+	{
+		AreaDamageComponentRaycasted adc;
+		if ( CastTo( adc, m_DamageComponent ) )
+			adc.SetRaycastSourcesVector( raycast_sources );
+		else
+			Error("SetRaycastSources not implemented - override for raycasted versions of area damage objects only");
+	}
+	
+	AreaDamageTriggerBase GetTrigger()
+	{
+		return m_AreaDamageTrigger;
+	}
+	///@}
+	
+
+	//! create damage trigger with basic set of params
+	///@{
+	protected bool CreateDamageTriggerEx()
+	{
+		int flags;
+
+		if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+			flags = ECE_CREATEPHYSICS;
+		else
+			flags = ECE_LOCAL;
+
+		if (Class.CastTo(m_AreaDamageTrigger, GetGame().CreateObjectEx( m_TriggerBaseClass, m_AreaPosition, flags )))
+		{
+			m_AreaDamageTrigger.SetOrientation( m_AreaOrientation );
+			m_AreaDamageTrigger.SetExtents( m_ExtentMin, m_ExtentMax );
+			m_AreaDamageTrigger.SetAreaDamageManager(this);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	protected void CreateDamageTrigger()
+	{
+		CreateDamageTriggerEx();
+	}
+	///@}
+	
+	
+	//! destroys damage trigger
+	///@{
+	protected bool DestroyDamageTriggerEx()
+	{
+		if ( GetGame() && m_AreaDamageTrigger ) // It's necesarry to check if the game exists. Otherwise a crash occurs while quitting.
+		{
+			GetGame().ObjectDelete( m_AreaDamageTrigger );
+			m_AreaDamageTrigger = null;
+			return true;
+		}
+		
+		return false;
+	}
+	
+	protected void DestroyDamageTrigger()
+	{
+		DestroyDamageTriggerEx();
+	}
+	///@}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageOnce.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageOnce.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf3b7c6e13c2def67c9839f89d730f5168d53384
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageOnce.c
@@ -0,0 +1,37 @@
+class AreaDamageOnce : AreaDamageManager
+{	
+	override void OnEnterServerEvent(TriggerInsider insider)
+	{
+		super.OnEnterServerEvent(insider);
+		
+		OnEvaluateDamageEx(insider, 1);
+	}
+}
+
+class AreaDamageOnceDeferred : AreaDamageOnce
+{
+	//! Time the damage should be deferred in seconds
+	protected float m_DeferDuration = 1.0;
+
+	override void SetDeferDuration(float time)
+	{
+		m_DeferDuration = time;
+	}
+	
+	override void OnStayServerEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayServerEvent(insider, deltaTime);
+		
+		AreaDamageTriggerInsider dInsider;
+		if ( CastTo( dInsider, insider ) && dInsider.lastDamaged == 0 )
+			OnEvaluateDamageEx(insider, 1);
+	}
+	
+	override protected float CalculateDamageScale(TriggerInsider insider, float deltaTime)
+	{
+		if ( m_DeferDuration > 0 && (insider.lastUpdated - insider.timeEntered) >= m_DeferDuration )
+			return super.CalculateDamageScale(insider, deltaTime);
+		
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageTriggerBase.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageTriggerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..9522a6f87d741401d27cf02fe0639c413941fa1c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageTriggerBase.c
@@ -0,0 +1,250 @@
+//! Extended TriggerInsider for AreaDamageTriggerBase
+class AreaDamageTriggerInsider : TriggerInsider
+{
+	//! Last time the object was damaged in seconds
+	float lastDamaged;
+	
+	void AreaDamageTriggerInsider(Object obj)
+	{
+	}
+}
+
+//! Managed by AreaDamageManager and its derivatives
+class AreaDamageTriggerBase : Trigger
+{
+	//! AreaDamageManager managing this instance
+	protected ref AreaDamageManager		m_AreaDamageManager;
+	
+	//! ctor
+	void AreaDamageTriggerBase()
+	{
+		m_AreaDamageManager = null;
+	}
+
+	//! dtor
+	void ~AreaDamageTriggerBase()
+	{
+		//! call Leave for all insiders when removing trigger
+		int nr = m_insiders.Count();
+		for (int n = 0; n < nr; ++n)
+		{
+			Object insObj = m_insiders[n].GetObject();
+			if ( insObj )
+				Leave(m_insiders[n]);
+		}
+	}
+	
+	//! AreaDamageTriggerBase configuration
+	//@{
+	//! Set the manager instance
+	void SetAreaDamageManager( AreaDamageManager adType )
+	{
+		m_AreaDamageManager = adType;
+		
+		#ifdef DEVELOPER
+		m_DebugAreaType = m_AreaDamageManager.GetAmmoName();
+		#endif
+	}
+	//@}
+	
+	
+	//! TriggerEvents, pass them on to manager
+	//@{
+	//! OnEnter
+	override protected void OnEnterBeginEvent(TriggerInsider insider)
+	{
+		super.OnEnterBeginEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnEnterBeginEvent(insider);
+	}
+	override protected void OnEnterServerEvent(TriggerInsider insider)
+	{
+		super.OnEnterServerEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnEnterServerEvent(insider);
+	}
+	override protected void OnEnterClientEvent(TriggerInsider insider)
+	{
+		super.OnEnterClientEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnEnterClientEvent(insider);
+	}
+	override protected void OnEnterEndEvent(TriggerInsider insider)
+	{
+		super.OnEnterEndEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnEnterEndEvent(insider);
+	}
+
+	//! OnStayStart
+	override protected void OnStayStartBeginEvent(int nrOfInsiders)
+	{
+		super.OnStayStartBeginEvent(nrOfInsiders);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayStartBeginEvent(nrOfInsiders);
+	}
+	override protected void OnStayStartServerEvent(int nrOfInsiders)
+	{
+		super.OnStayStartServerEvent(nrOfInsiders);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayStartServerEvent(nrOfInsiders);
+	}
+	override protected void OnStayStartClientEvent(int nrOfInsiders)
+	{
+		super.OnStayStartClientEvent(nrOfInsiders);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayStartClientEvent(nrOfInsiders);
+	}
+	override protected void OnStayStartEndEvent(int nrOfInsiders)
+	{
+		super.OnStayStartEndEvent(nrOfInsiders);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayStartEndEvent(nrOfInsiders);
+	}
+
+	//!OnStay
+	override protected void OnStayBeginEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayBeginEvent(insider, deltaTime);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayBeginEvent(insider, deltaTime);
+	}
+	override protected void OnStayServerEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayServerEvent(insider, deltaTime);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayServerEvent(insider, deltaTime);
+	}
+	override protected void OnStayClientEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayClientEvent(insider, deltaTime);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayClientEvent(insider, deltaTime);
+	}
+	override protected void OnStayEndEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayEndEvent(insider, deltaTime);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayEndEvent(insider, deltaTime);
+	}
+
+	//! OnStayFinish
+	override protected void OnStayFinishBeginEvent()
+	{
+		super.OnStayFinishBeginEvent();
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayFinishBeginEvent();
+	}
+	override protected void OnStayFinishServerEvent()
+	{
+		super.OnStayFinishServerEvent();
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayFinishServerEvent();
+	}
+	override protected void OnStayFinishClientEvent()
+	{
+		super.OnStayFinishClientEvent();
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayFinishClientEvent();
+	}
+	override protected void OnStayFinishEndEvent()
+	{
+		super.OnStayFinishEndEvent();
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnStayFinishEndEvent();
+	}
+	
+	//! OnLeave
+	override protected void OnLeaveBeginEvent(TriggerInsider insider)
+	{
+		super.OnLeaveBeginEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnLeaveBeginEvent(insider);
+	}
+	override protected void OnLeaveServerEvent(TriggerInsider insider)
+	{
+		super.OnLeaveServerEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnLeaveServerEvent(insider);
+	}
+	override protected void OnLeaveClientEvent(TriggerInsider insider)
+	{
+		super.OnLeaveClientEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnLeaveClientEvent(insider);
+	}
+	override protected void OnLeaveEndEvent(TriggerInsider insider)
+	{
+		super.OnLeaveEndEvent(insider);
+		
+		if ( m_AreaDamageManager )
+			m_AreaDamageManager.OnLeaveEndEvent(insider);
+	}
+	//@}
+	
+	
+	//! TriggerInsider conditions
+	//@{
+	//! Condition whether a TriggerInsider should still be updated or not (checked in update loop and before adding)
+	override protected bool ShouldRemoveInsider(TriggerInsider insider)
+	{
+		return !insider.GetObject().IsAlive();
+	}
+	//@}
+	
+	
+	//! TriggerInsider processing
+	//@{
+	//! Override the TriggerInsider type to be AreaDamageTriggerInsider
+	override protected TriggerInsider CreateInsider(Object obj)
+	{
+		return new AreaDamageTriggerInsider(obj);		
+	}
+	
+	//! Adding of new TriggerInsider
+	override protected void AddInsider(Object obj)
+	{
+		if ( !GetGame().IsServer() )
+			return;
+		
+		super.AddInsider(obj);
+	}
+	
+	//! Removing of TriggerInsider
+	override protected void RemoveInsider(TriggerInsider insider, int index = -1)
+	{
+		if ( !GetGame().IsServer() )
+			return;
+		
+		super.RemoveInsider(insider, index);
+	}
+	
+	//! Update the current TriggerInsider inside the Trigger
+	override protected void UpdateInsiders(int timeout)
+	{
+		if ( !GetGame().IsServer() )
+			return;
+	
+		super.UpdateInsiders(timeout);
+	}
+	//@}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageTriggerDirect.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageTriggerDirect.c
new file mode 100644
index 0000000000000000000000000000000000000000..806f82bfa222a6d0c55eed44e95eaba55d47d4d5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/AreaDamageTriggerDirect.c
@@ -0,0 +1,10 @@
+class AreaDamageTriggerDirect extends AreaDamageTriggerBase
+{
+	override void OnStayServerEvent(TriggerInsider insider, float deltaTime)
+	{
+		super.OnStayServerEvent(insider, deltaTime);
+		
+		if (m_AreaDamageManager)
+			m_AreaDamageManager.OnEvaluateDamage(insider, deltaTime);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponent.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponent.c
new file mode 100644
index 0000000000000000000000000000000000000000..f4e573df8448b556abb0cf29ecf316208e3a0874
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponent.c
@@ -0,0 +1,73 @@
+class AreaDamageComponentData
+{
+	string Hitzone = "";
+	vector Modelpos = "0.5 0.5 0.5";
+}
+
+class AreaDamageComponent : AreaDamageEvents
+{
+	AreaDamageManager 		m_Parent;
+	
+	int 					m_DamageType;
+	string					m_AmmoName;
+
+	ref array<typename>		m_DamageableTypes
+	
+	void AreaDamageComponent(AreaDamageManager parent)
+	{
+		m_Parent = parent;
+		
+		m_DamageType 		= DT_CUSTOM;
+		m_AmmoName			= "MeleeDamage";
+
+		m_DamageableTypes	= new array<typename>;
+		m_DamageableTypes.Insert(DayZPlayer);
+	}
+	
+	override bool OnEvaluateDamage(TriggerInsider insider, float damageCoef)
+	{
+		// No need to damage if the coef is 0!
+		if ( ShouldDamage(insider.GetObject()) && damageCoef > 0 )
+			return EvaluateDamageInternal(insider, damageCoef);
+		
+		return false;
+	}
+	
+	override void PreDamageActions()
+	{
+		m_Parent.PreDamageActions();
+	}
+
+	override void PostDamageActions()
+	{
+		m_Parent.PostDamageActions();
+	}
+	
+	protected bool ShouldDamage(Object object)
+	{
+		return object && object.IsAlive() && object.IsAnyInherited( m_DamageableTypes );
+	}
+	
+	protected AreaDamageComponentData GetAreaDamageComponentData(Object object)
+	{
+		return new AreaDamageComponentData;
+	}
+	
+	private bool EvaluateDamageInternal(TriggerInsider insider, float damageCoef)
+	{
+		PreDamageActions();
+		
+		AreaDamageTriggerInsider dInsider;
+		if ( CastTo( dInsider, insider ) )
+			dInsider.lastDamaged = g_Game.GetTickTime();
+		
+		Object object = insider.GetObject();
+		
+		AreaDamageComponentData data = GetAreaDamageComponentData(object);
+		object.ProcessDirectDamage(m_DamageType, m_Parent.GetParentObject(), data.Hitzone, m_AmmoName, data.Modelpos, damageCoef);
+				
+		PostDamageActions();
+		
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponentRandomHitzone.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponentRandomHitzone.c
new file mode 100644
index 0000000000000000000000000000000000000000..23c6a1ee06ec90f02684715e82dbe3fe53309151
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponentRandomHitzone.c
@@ -0,0 +1,23 @@
+//! Newer implementation equivalent of "AreaDamageRegular", hitzone selection only
+class AreaDamageComponentRandomHitzone : AreaDamageComponent
+{
+	ref array<string>	m_HitZones;
+	
+	void AreaDamageComponentRandomHitzone(AreaDamageManager parent)
+	{
+		m_HitZones = new array<string>;
+	}
+	
+	void SetHitZones( array<string> hitzones )
+	{
+		m_HitZones = hitzones;
+	}
+	
+	override protected AreaDamageComponentData GetAreaDamageComponentData(Object object)
+	{
+		AreaDamageComponentData data = new AreaDamageComponentData;
+		data.Hitzone = m_HitZones.GetRandomElement();
+		
+		return data;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponentRaycasted.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponentRaycasted.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7a88dd5398e4659a63439226e276bba78068060
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageNew/DamageComponents/AreaDamageComponentRaycasted.c
@@ -0,0 +1,155 @@
+//! Newer implementation equivalent of "AreaDamageRegularRaycasted", hitzone selection only
+class AreaDamageComponentRaycasted : AreaDamageComponent
+{
+	// Defined in local space of the trigger
+	ref array<vector> 				m_RaycastSources;
+	vector 							m_RaycastEndOffset;
+	
+	ref array<ref RaycastRVResult> 	m_RaycastCache;
+	int								m_RaycastCachedIndex;
+	
+	void AreaDamageComponentRaycasted(AreaDamageManager parent)
+	{
+		m_RaycastSources = new array<vector>;
+		m_RaycastEndOffset = "0 0.5 0";
+		
+		m_RaycastCache = new array<ref RaycastRVResult>;
+		m_RaycastCachedIndex = -1;
+	}
+	
+	override void OnTriggerCreated()
+	{
+		super.OnTriggerCreated();
+		
+		ClearCache();
+	}
+
+	void SetRaycastSources( array<string> raycast_sources )
+	{
+		m_RaycastSources.Clear();
+		
+		// convert Array of string to array of Vectors
+		int nrOfSources = raycast_sources.Count();
+		for ( int v = 0; v < nrOfSources; ++v)
+		{
+			m_RaycastSources.Insert(raycast_sources[v].ToVector());
+		}
+	}
+	
+	void SetRaycastSourcesVector( array<vector> raycast_sources )
+	{
+		m_RaycastSources = raycast_sources;
+	}
+	
+	void SetRaycastLength(float length)
+	{
+		m_RaycastEndOffset = Vector(0, length, 0);
+	}
+	
+	override void OnStayFinishServerEvent()
+	{
+		super.OnStayFinishServerEvent();
+		
+		ClearCache();
+	}
+	
+	override protected AreaDamageComponentData GetAreaDamageComponentData(Object object)
+	{
+		AreaDamageComponentData data = new AreaDamageComponentData;
+		data.Hitzone = GetRaycastedHitZone(object);
+		
+		return data;
+	}
+	
+	protected void ClearCache()
+	{
+		m_RaycastCache.Clear();
+		m_RaycastCachedIndex = -1;
+	}
+	
+	protected string GetRaycastedHitZone(Object victim)
+	{
+		int nrOfCachedResults = m_RaycastSources.Count();
+		for ( int c = 0; c < nrOfCachedResults; ++c )
+		{
+			RaycastRVResult cachedRes = m_RaycastCache[c];
+			if ( cachedRes.obj == victim )
+				return victim.GetDamageZoneNameByComponentIndex(cachedRes.component);
+		}
+		
+		int nrOfSources = m_RaycastSources.Count();
+		array<ref RaycastRVResult> victims = new array<ref RaycastRVResult>;
+		
+		string hitzone = "";
+		
+		AreaDamageTriggerBase trigger = m_Parent.GetTrigger();
+		
+		RaycastRVParams params = new RaycastRVParams( vector.Zero, vector.Zero, trigger, 0.0 );
+		params.type = ObjIntersectIFire;
+		params.flags = CollisionFlags.ONLYDYNAMIC;
+		
+		for ( int i = m_RaycastCachedIndex + 1; i < nrOfSources; ++i )
+		{
+			m_RaycastCachedIndex = i;
+			
+			params.begPos = trigger.ModelToWorld( m_RaycastSources[i] );
+			params.endPos = params.begPos + m_RaycastEndOffset;
+			
+			if ( DayZPhysics.RaycastRVProxy(params, victims) )
+			{			
+				for ( int j = 0; j < victims.Count(); ++j )
+				{
+					RaycastRVResult res = victims[j];
+					
+					if (res.obj == victim)
+						hitzone = victim.GetDamageZoneNameByComponentIndex(res.component);
+					
+					if (res.obj.IsAnyInherited(m_DamageableTypes))
+						m_RaycastCache.Insert(res);
+				}
+				
+				if ( !( hitzone == "") )
+					return hitzone;
+				
+				victims.Clear();
+			}
+		}
+		
+		return GetFallbackHitZone(victim);
+	}
+	
+	protected string GetFallbackHitZone(Object victim)
+	{
+		Error(string.Format("[WARNING] :: [%1] :: [AreaDamageComponentRaycasted] :: No proper HitZone found for damaging %2, using fallback.",
+			m_Parent, Object.GetDebugName(victim)));
+		
+		// Fallbacks, currently are implemented assuming that foot/leg damagezones would be desired to damage
+		if ( victim.IsInherited(DayZPlayer) || victim.IsInherited(DayZInfected) )
+		{
+			// Damage random leg since we don't know what part of player's body was caught in the trap.
+			if ( Math.RandomIntInclusive(0, 1) == 1 )
+				return "RightFoot";
+			return "LeftFoot";
+		}
+		else
+		{					
+			array<string> damageZones = new array<string>;		
+			victim.GetDamageZones(damageZones);
+			
+			int nrOfDmgZones = damageZones.Count();
+			
+			if (nrOfDmgZones > 0)
+			{
+				for (int z = 0; z < nrOfDmgZones; ++z)
+				{
+					if ( damageZones[z].Contains("Foot") || damageZones[z].Contains("Leg") )
+						return damageZones[z];
+				}
+				
+				return damageZones.GetRandomElement();
+			}
+			else
+				return "";
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTime.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTime.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef5543120d21646b7170aa75de91c5b712446b3d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTime.c
@@ -0,0 +1,22 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageOneTime extends AreaDamageBase
+{	
+	void AreaDamageOneTime(EntityAI parent)
+	{
+
+	}
+	
+	void ~AreaDamageOneTime() {}
+
+	override void SetHitZones( array<string> hitzones )
+	{
+		m_HitZones = hitzones;
+	}
+	
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+
+		EvaluateDamage(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeDeferred.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeDeferred.c
new file mode 100644
index 0000000000000000000000000000000000000000..187ded6ceaa5cc4c625d4e61eeed20a89ac8329a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeDeferred.c
@@ -0,0 +1,27 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageOneTimeDeferred extends AreaDamageBase
+{	
+	void AreaDamageOneTimeDeferred(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageOneTimeDeferred() {}
+	
+	override void SetDeferDuration(float time)
+	{
+		m_DeferDuration = time;
+	}
+
+	override void SetHitZones( array<string> hitzones )
+	{
+		m_HitZones = hitzones;
+	}
+
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);;
+
+		EvaluateDamage_Defer(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeRaycasted.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeRaycasted.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd2170b8e61e1636015cbf8e115874ad1b60396d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeRaycasted.c
@@ -0,0 +1,22 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageOneTimeRaycasted extends AreaDamageBase
+{	
+	void AreaDamageOneTimeRaycasted(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageOneTimeRaycasted() {}
+
+	override void SetRaycastSources( array<string> raycast_sources )
+	{
+		m_RaycastSources = raycast_sources;
+	}
+	
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+
+		EvaluateDamage(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeRaycastedDeferred.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeRaycastedDeferred.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ed62eea2d89a666118e50fad0a9773944883b4f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageOneTimeRaycastedDeferred.c
@@ -0,0 +1,27 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageOneTimeRaycastedDeferred extends AreaDamageBase
+{	
+	void AreaDamageOneTimeRaycastedDeferred(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageOneTimeRaycastedDeferred() {}
+	
+	override void SetDeferDuration(float time)
+	{
+		m_DeferDuration = time;
+	}
+	
+	override void SetRaycastSources( array<string> raycast_sources )
+	{
+		m_RaycastSources = raycast_sources;
+	}
+
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+
+		EvaluateDamage_Defer(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegular.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegular.c
new file mode 100644
index 0000000000000000000000000000000000000000..1bce483d61a394c085142458e122ec9e0ac4fc7c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegular.c
@@ -0,0 +1,27 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageRegular extends AreaDamageBase
+{	
+	void AreaDamageRegular(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageRegular() {}
+
+	override void SetLoopInterval( float time )
+	{
+		m_LoopInterval = time;
+	}
+
+	override void SetHitZones( array<string> hitzones )
+	{
+		m_HitZones = hitzones;
+	}
+	
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+
+		EvaluateDamage_Loop(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularDeferred.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularDeferred.c
new file mode 100644
index 0000000000000000000000000000000000000000..a5b829567a140e31e2535291b57568672853b574
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularDeferred.c
@@ -0,0 +1,32 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageRegularDeferred extends AreaDamageRegular
+{	
+	void AreaDamageRegularDeferred(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageRegularDeferred() {}
+
+	override void SetLoopInterval(float time)
+	{
+		m_LoopInterval = time;
+	}
+
+	override void SetDeferDuration(float time)
+	{
+		m_DeferDuration = time;
+	}
+
+	override void SetHitZones( array<string> hitzones )
+	{
+		m_HitZones = hitzones;
+	}
+	
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+		
+		EvaluateDamage_DeferLoop(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularRaycasted.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularRaycasted.c
new file mode 100644
index 0000000000000000000000000000000000000000..ecf8d1541af9587e36b4d66ca330219569f012a7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularRaycasted.c
@@ -0,0 +1,27 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageRegularRaycasted extends AreaDamageBase
+{	
+	void AreaDamageRegularRaycasted(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageRegularRaycasted() {}
+
+	override void SetLoopInterval(float time)
+	{
+		m_LoopInterval = time;
+	}
+
+	override void SetRaycastSources( array<string> raycast_sources )
+	{
+		m_RaycastSources = raycast_sources;
+	}
+	
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+		
+		EvaluateDamage_Loop(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularRaycastedDeferred.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularRaycastedDeferred.c
new file mode 100644
index 0000000000000000000000000000000000000000..64c54d087a28a89618d2aed5fb3fcc5745f69d5f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageRegularRaycastedDeferred.c
@@ -0,0 +1,32 @@
+// DEPRECATED: Left for backwards compatibility with mods
+class AreaDamageRegularRaycastedDeferred extends AreaDamageBase
+{	
+	void AreaDamageRegularRaycastedDeferred(EntityAI parent)
+	{
+
+	}
+
+	void ~AreaDamageRegularRaycastedDeferred() {}
+
+	override void SetLoopInterval(float time)
+	{
+		m_LoopInterval = time;
+	}
+
+	override void SetDeferDuration(float time)
+	{
+		m_DeferDuration = time;
+	}
+	
+	override void SetRaycastSources( array<string> raycast_sources )
+	{
+		m_RaycastSources = raycast_sources;
+	}
+	
+	override void OnEnterServer(Object object)
+	{
+		super.OnEnterServer(object);
+		
+		EvaluateDamage_DeferLoop(object);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageTrigger.c b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..8eaf45a44d42e7e9d903473067c49870d152a7f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/AreaDamage/AreaDamageTrigger.c
@@ -0,0 +1,119 @@
+// DEPRECATED: Left for backwards compatibility with mods
+// This file is NOT AN EXAMPLE of how to use triggers
+// As overriding UpdateInsiders should ideally no longer be done
+// Look at "AreaDamageTriggerBase.c" instead and use that as base
+class AreaDamageTrigger extends AreaDamageTriggerBase
+{
+	protected ref AreaDamageBase	m_AreaDamageType;
+	
+	protected vector				m_ExtentMin;
+	protected vector				m_ExtentMax;	
+	protected float					m_InnerDistance;
+	
+	protected int					m_TriggerUpdateMs;
+	
+	void AreaDamageTrigger()
+	{
+		// Backwards compat, revert the flags back to what they used to be
+		ClearEventMask(EntityEvent.ENTER | EntityEvent.LEAVE);
+		SetEventMask(EntityEvent.TOUCH);
+		
+		m_AreaDamageType = null;
+		
+		m_ExtentMin = vector.Zero;
+		m_ExtentMax = vector.Zero;	
+		m_InnerDistance = 0;
+		
+		m_TriggerUpdateMs = 100;
+	}
+	
+	// Backwards compat
+	override void EOnTouch(IEntity other, int extra)
+	{
+		Object obj;
+		if (Class.CastTo(obj, other))
+			AddInsider(obj);
+	}
+	
+	override void SetExtents( vector mins, vector maxs )
+	{
+		m_ExtentMax = maxs;
+		m_ExtentMin = mins;
+		
+		m_InnerDistance = (GetRadius(m_ExtentMin, m_ExtentMax) * 0.5) + 0.2;
+
+		super.SetExtents(mins, maxs);
+	}
+	
+	override void SetAreaDamageManager( AreaDamageManager adType )
+	{
+		super.SetAreaDamageManager( adType );
+		
+		m_AreaDamageType = AreaDamageBase.Cast(adType);
+	}
+		
+	void SetAreaDamageType( AreaDamageBase adType )
+	{
+		super.SetAreaDamageManager( adType );
+		
+		m_AreaDamageType = adType;
+	}
+	
+	override void OnEnter( Object obj )
+	{
+		super.OnEnter( obj );
+		
+		if ( GetGame().IsServer() && m_AreaDamageType )
+			 m_AreaDamageType.OnEnter( obj );
+	}
+	
+	override void OnLeave( Object obj )
+	{
+		super.OnLeave( obj );
+		
+		if ( GetGame().IsServer() && m_AreaDamageType )
+			 m_AreaDamageType.OnLeave( obj );
+	}
+	
+	override protected void UpdateInsiders(int timeout)
+	{
+		if ( GetGame().IsServer() )
+		{
+			for (int n = 0; n < m_insiders.Count(); )
+			{
+				TriggerInsider ins = m_insiders.Get(n);
+				if ( ins.GetObject() == null )
+				{
+					//object has been deleted. Remove it
+					m_insiders.Remove(n);
+					continue;
+				}
+	
+				Object insObj = ins.GetObject();
+				if ( insObj && ( !insObj.IsAlive() || vector.DistanceSq(insObj.GetPosition(), GetPosition()) > (m_InnerDistance * m_InnerDistance) ) )
+				{
+					int timeDiff = g_Game.GetTime() - ins.timeStamp;
+					if (timeDiff > 500)
+					{
+						//object left. Remove it
+						OnLeave(ins.GetObject());
+						m_insiders.Remove(n);
+						
+						continue;
+					}
+					else
+					{
+						//Print("" + this + " :: " + insObj + " :: " + timeDiff);
+					}
+				}
+				
+				++n;
+			}
+			
+			//!DEBUG
+			#ifdef DEVELOPER
+			DebugSendDmgTrigger();
+			#endif
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ArrowManager/ArrowManagerPlayer.c b/scripts/4_World/DayZ/Classes/ArrowManager/ArrowManagerPlayer.c
new file mode 100644
index 0000000000000000000000000000000000000000..4b149a64d9af15d29a584d8ff3d2eee712289321
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ArrowManager/ArrowManagerPlayer.c
@@ -0,0 +1,175 @@
+class ArrowManagerPlayer : ArrowManagerBase
+{	
+	private static ref map<int,typename> m_TypeHashTable;
+	
+	void ArrowManagerPlayer(PlayerBase player)
+	{
+		if (!m_TypeHashTable)
+		{
+			InitializeHash();
+		}
+	}
+	
+	private static void InitializeHash()
+	{
+		m_TypeHashTable = new map<int,typename>();
+		
+		AddArrowTypeToHash("Ammo_HuntingBolt");
+		AddArrowTypeToHash("Ammo_ImprovisedBolt_1");
+		AddArrowTypeToHash("Ammo_ImprovisedBolt_2");
+		AddArrowTypeToHash("Ammo_ImprovisedBolt_3");
+	}
+	
+	private static void AddArrowTypeToHash(string ArrowType)
+	{
+		m_TypeHashTable.Insert(ArrowType.Hash(), ArrowType.ToType());
+	}
+	
+	private static typename GetArrowTypeFromHash(int hash)
+	{
+		return m_TypeHashTable.Get(hash);
+	}
+	
+	bool Save(ParamsWriteContext ctx)
+	{
+		ctx.Write(VERSION);
+		int count = m_Arrows.Count();
+		int i;
+		//TODO MW Delete after find why sometimes arrow missing - most likely Life span
+		for (i = count - 1; i >= 0; i--)
+		{
+			if (!m_Arrows.Get(i))
+			{
+				m_Arrows.Remove(i);
+			}
+		}
+		count = m_Arrows.Count();
+		
+		ctx.Write(count);
+		
+		for (i = 0; i < count; i++)
+		{
+			EntityAI arrow = m_Arrows.Get(i);
+			
+			string type = arrow.GetType();
+			ctx.Write(type.Hash());
+			
+			vector angle = arrow.GetLocalYawPitchRoll();
+			vector pos = arrow.GetLocalPosition();
+			
+			ctx.Write(angle[0]);
+			ctx.Write(angle[1]);
+			ctx.Write(angle[2]);
+			ctx.Write(pos[0]);
+			ctx.Write(pos[1]);
+			ctx.Write(pos[2]);
+			
+			int pivot = arrow.GetHierarchyPivot();
+			ctx.Write(pivot);
+		}
+
+		return true;
+	}
+
+	
+	bool Load(ParamsReadContext ctx)
+	{
+		int version;
+		if (!ctx.Read(version))
+		{
+			return false;
+		}
+		
+		int count;
+		if (!ctx.Read(count))
+		{
+			return false;
+		}
+		
+		for (int i = 0; i < count; i++)
+		{
+		
+			if (version >= 1)
+			{
+				int hash;
+				if (!ctx.Read(hash))
+				{
+					return false;
+				}
+
+				float angleF[3];
+				float posF[3];
+				float value;
+				
+				if (!ctx.Read(value))
+				{
+					return false;
+				}
+				angleF[0] = value;
+				
+				if (!ctx.Read(value))
+				{
+					return false;
+				}
+				angleF[1] = value;
+				
+				if (!ctx.Read(value))
+				{
+					return false;
+				}
+				angleF[2] = value;
+				
+				if (!ctx.Read(value))
+				{
+					return false;
+				}
+				posF[0] = value;
+				
+				if (!ctx.Read(value))
+				{
+					return false;
+				}
+				posF[1] = value;
+				
+				if (!ctx.Read(value))
+				{
+					return false;
+				}
+				posF[2] = value;
+				
+				vector angle = "0 0 0";
+				vector pos = "0 0 0";
+
+				angle = vector.ArrayToVec(angleF);
+				pos = vector.ArrayToVec(posF);
+				
+				int pivot;
+				if (!ctx.Read(pivot))
+				{
+					return false;
+				}
+				
+				if (version >= 2)
+				{
+					#ifdef SERVER
+					int spawnFlags = ECE_KEEPHEIGHT|ECE_DYNAMIC_PERSISTENCY;
+					#else
+					int spawnFlags = ECE_LOCAL|ECE_KEEPHEIGHT|ECE_DYNAMIC_PERSISTENCY;
+					#endif
+					
+					typename arrowType = GetArrowTypeFromHash(hash);
+					EntityAI arrow = EntityAI.Cast(GetGame().CreateObjectEx(arrowType.ToString(), pos, spawnFlags));
+					if (arrow)
+					{
+						arrow.SetQuantityToMinimum();
+						arrow.SetYawPitchRoll(angle);
+						m_Owner.AddChild(arrow, pivot);
+					}
+				}
+			}
+		
+		}
+
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/BaseBuilding/Construction.c b/scripts/4_World/DayZ/Classes/BaseBuilding/Construction.c
new file mode 100644
index 0000000000000000000000000000000000000000..a60b392e58f6438dc4e920475433b145441726fc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BaseBuilding/Construction.c
@@ -0,0 +1,1347 @@
+enum ConstructionMaterialType
+{
+	MATERIAL_NONE	= 0,
+	MATERIAL_LOG	= 1,
+	MATERIAL_WOOD	= 2,
+	MATERIAL_STAIRS	= 3,
+	MATERIAL_METAL	= 4,
+	MATERIAL_WIRE	= 5
+}
+
+class Construction
+{
+	static const float REPAIR_MATERIAL_PERCENTAGE = 0.15;
+	static const float DECONSTURCT_MATERIAL_LOSS = 0.2;
+	protected ref map<string, ref ConstructionPart> m_ConstructionParts;	//string - part name; int - 0-not constructed, 1-constructed
+	protected BaseBuildingBase 	m_Parent;
+	
+	//Debug
+	protected Shape m_CollisionBox;
+	//Collision detectection
+	protected ConstructionBoxTrigger m_ConstructionBoxTrigger;
+	
+	//============================================
+	// Construction
+	//============================================	
+	void Construction( BaseBuildingBase parent )
+	{
+		m_ConstructionParts = new ref map<string, ref ConstructionPart>;
+		
+		//set parent object
+		SetParent( parent );
+	}
+	
+	void Init()
+	{
+		UpdateConstructionParts();
+	}
+		
+	//parent
+	protected BaseBuildingBase GetParent()
+	{
+		return m_Parent;
+	}
+	protected void SetParent( BaseBuildingBase parent )
+	{
+		m_Parent = parent;
+	}
+	//============================================
+	// Construction process
+	//============================================
+	//constructed parts
+	void AddToConstructedParts( string part_name )
+	{
+		ConstructionPart constrution_part = GetConstructionPart( part_name );
+		
+		if ( constrution_part )
+		{
+			if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction " + Object.GetDebugName(m_Parent) + " AddToConstructedParts part=" + constrution_part.GetPartName());
+			constrution_part.SetBuiltState( true );
+		}
+	}
+	
+	void RemoveFromConstructedParts( string part_name )
+	{
+		ConstructionPart constrution_part = GetConstructionPart( part_name );
+		
+		if ( constrution_part ) 
+		{
+			if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction " + Object.GetDebugName(m_Parent) + " RemoveFromConstructedParts part=" + constrution_part.GetPartName());
+			constrution_part.SetBuiltState( false );
+		}
+	}
+	
+	//BuildPart
+	void BuildPartServer( notnull Man player, string part_name, int action_id )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction BuildPartServer | " + part_name);
+		//reset DamageZone health
+		string damage_zone;
+		if (DamageSystem.GetDamageZoneFromComponentName(GetParent(),part_name,damage_zone))
+		{
+			GetParent().SetAllowDamage(true);
+			GetParent().SetHealthMax(damage_zone);
+			GetParent().ProcessInvulnerabilityCheck(GetParent().GetInvulnerabilityTypeString());
+		}
+		
+		//on action
+		TakeMaterialsServer( part_name );
+
+		//destroy build collision check trigger
+		DestroyCollisionTrigger();
+
+		//call event
+		GetParent().OnPartBuiltServer( player, part_name, action_id );
+	}
+	
+	//DismantlePart
+	void DismantlePartServer( notnull Man player, string part_name, int action_id )
+	{
+		string damage_zone;
+		DamageSystem.GetDamageZoneFromComponentName( GetParent(),part_name,damage_zone );
+		
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction DismantlePartServer | " + part_name);
+		//receive materials
+		ReceiveMaterialsServer( player, part_name, damage_zone );
+			
+		//drop non-usable materials
+		DropNonUsableMaterialsServer( player, part_name );
+		
+		//call event
+		GetParent().OnPartDismantledServer( player, part_name, action_id );
+		
+		//set DamageZone health to zero (redundant?)
+		/*if ( GetParent().GetHealth(damage_zone,"Health") > 0 )
+		{
+			GetParent().SetHealth(damage_zone,"Health",0);
+		}*/
+	}
+	
+	//DestroyPart
+	void DestroyPartServer( Man player, string part_name, int action_id, bool destroyed_by_connected_part = false )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction DestroyPartServer | " + part_name);
+		//destroy attached materials (if locked)
+		DestroyMaterialsServer( player, part_name );
+		
+		//drop non-usable materials
+		DropNonUsableMaterialsServer( player, part_name );			
+		
+		//call event
+		GetParent().OnPartDestroyedServer( player, part_name, action_id, destroyed_by_connected_part );
+		
+		//set DamageZone health to zero (redundant?)
+		string damage_zone;
+		if ( DamageSystem.GetDamageZoneFromComponentName(GetParent(),part_name,damage_zone) && GetParent().GetHealth(damage_zone,"Health") > 0 )
+		{
+			GetParent().SetHealth(damage_zone,"Health",0);
+		}
+	}
+	
+	void DestroyConnectedParts(string part_name)
+	{
+		array<string> parts;// = new array<string>;
+		parts = GetValidDepenentPartsArray(part_name);
+		if (parts)
+		{
+			for (int i = 0; i < parts.Count(); i++)
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction DestroyConnectedParts | " + parts.Get(i));
+				if (!ExceptionCheck(parts.Get(i)))
+					DestroyPartServer(null,parts.Get(i),AT_DESTROY_PART,true);
+			}
+		}
+	}
+	
+	//!Exceptions from 'dependent parts' hierarchy are handled here
+	bool ExceptionCheck(string part_name)
+	{
+		//gate hack
+		ConstructionPart part = GetConstructionPart(part_name);
+		if( /*Fence.Cast(m_Parent) && */part.IsGate() )
+		{
+			if( GetConstructionPart("wall_base_down").IsBuilt() || GetConstructionPart("wall_base_up").IsBuilt() )
+				return true;
+		}
+		return false;
+	}
+	
+	//============================================
+	// Update construction
+	//============================================
+	//update visual
+	void InitVisuals()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction " + Object.GetDebugName(m_Parent) + " InitVisuals");
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			string key = m_ConstructionParts.GetKey( i );
+			ConstructionPart value = m_ConstructionParts.Get( key );
+		
+			if ( value.IsBuilt() )
+			{
+				ShowConstructionPart( value.GetPartName() );		
+			}
+		}
+	}
+
+	void UpdateVisuals()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction " + Object.GetDebugName(m_Parent) + " UpdateVisuals");
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			string key = m_ConstructionParts.GetKey( i );
+			ConstructionPart value = m_ConstructionParts.Get( key );
+			if ( value.IsBuilt() )
+			{
+				ShowConstructionPart( value.GetPartName() );
+			}
+			else
+			{
+				HideConstructionPart( value.GetPartName() );
+			}
+		}
+	}
+	
+	//update physics (only)
+	void UpdatePhysics()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction " + Object.GetDebugName(m_Parent) + " UpdatePhysics m_ConstructionParts=" + m_ConstructionParts.Count());
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			string key = m_ConstructionParts.GetKey( i );
+			ConstructionPart value = m_ConstructionParts.Get( key );
+		
+			if ( value.IsBuilt() )
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] GetType=" + m_Parent.GetType() + " i=" + i + " ADD");
+				ShowConstructionPartPhysics( value.GetPartName() );
+			}
+			else
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] GetType=" + m_Parent.GetType() + " i=" + i + " RM");
+				HideConstructionPartPhysics( value.GetPartName() );
+			}
+		}
+	}
+	
+	void InitBaseState ()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction " + Object.GetDebugName(m_Parent) + " InitBaseState");
+		InitVisuals();
+	}
+	
+	//update construction parts
+	protected void UpdateConstructionParts()
+	{
+		string construction_path = "cfgVehicles" + " " + GetParent().GetType() + " " + "Construction";
+		
+		if ( GetGame().ConfigIsExisting( construction_path ) )
+		{
+			//main parts
+			for ( int i = 0; i < GetGame().ConfigGetChildrenCount( construction_path ); ++i )
+			{
+				string main_part_name;
+				GetGame().ConfigGetChildName( construction_path, i, main_part_name );
+				string part_path = construction_path + " " + main_part_name;
+				
+				//parts
+				for ( int j = 0; j < GetGame().ConfigGetChildrenCount( part_path ); ++j )
+				{
+					string part_name;
+					GetGame().ConfigGetChildName( part_path, j, part_name );
+					
+					string name;
+					GetGame().ConfigGetTextRaw( part_path + " " + part_name + " " + "name", name );							//name
+					GetGame().FormatRawConfigStringKeys(name);
+					bool show_on_init = GetGame().ConfigGetInt( part_path + " " + part_name + " " + "show_on_init" );		//show on init
+					int id = GetGame().ConfigGetInt( part_path + " " + part_name + " " + "id" );							//part id
+					bool is_base = GetGame().ConfigGetInt( part_path + " " + part_name + " " + "is_base" );					//is base (part)
+					bool is_gate = GetGame().ConfigGetInt( part_path + " " + part_name + " " + "is_gate" );					//is gate (part)
+					
+					m_ConstructionParts.Insert( part_name, new ConstructionPart( name, part_name, main_part_name, id, show_on_init, is_base, is_gate, GetRequiredParts(part_name,main_part_name) ) );
+					
+					if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction name=" + name + " part_name=" + part_name + " show=" + show_on_init + " base=" + is_base + " gate=" + is_gate);
+				}
+			}
+		}
+	}
+	
+	//============================================
+	// Parts
+	//============================================	
+	map<string, ref ConstructionPart> GetConstructionParts()
+	{
+		return m_ConstructionParts;
+	}
+	
+	ConstructionPart GetConstructionPart( string part_name )
+	{
+		return m_ConstructionParts.Get( part_name );
+	}
+
+	//CONSTRUCTION
+	/*ConstructionPart GetConstructionPartToBuild( string part_name, ItemBase tool )
+	{
+		if ( CanBuildPart( part_name, tool ) )
+		{
+			return GetConstructionPart( part_name );
+		}
+		
+		return NULL;
+	}*/
+	
+	bool CanBuildPart( string part_name, ItemBase tool, bool use_tool )
+	{
+		if ( !IsPartConstructed( part_name ) && HasRequiredPart( part_name ) && !HasConflictPart( part_name ) && HasMaterials( part_name ) && (!use_tool || CanUseToolToBuildPart( part_name, tool )) && !MaterialIsRuined(part_name) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool MaterialIsRuined(string part_name)
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "Materials";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				//get type, quantity from material
+				string config_path;
+				string slot_name;
+				config_path = cfg_path + " " + child_name + " " + "slot_name";
+				GetGame().ConfigGetText( config_path, slot_name );
+				config_path = cfg_path + " " + child_name + " " + "quantity";
+				float quantity = GetGame().ConfigGetFloat( config_path );
+				config_path = cfg_path + " " + child_name + " " + "lockable";
+				bool lockable = GetGame().ConfigGetInt( config_path );
+				
+				ItemBase attachment = ItemBase.Cast( GetParent().FindAttachmentBySlotName( slot_name ) );
+				if (attachment.IsRuined())
+					return true;
+			}
+		}
+		return false;
+	}
+	
+	//Get all construction parts that can be build (at that current time)
+	void GetConstructionPartsToBuild( string main_part_name, out array<ConstructionPart> construction_parts, ItemBase tool, out string real_constructionTarget, bool use_tool )
+	{
+		construction_parts.Clear();
+		string part_name;
+		ConstructionPart value;
+		string key;
+		
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			key = m_ConstructionParts.GetKey( i );
+			value = m_ConstructionParts.Get( key );
+		
+			if ( main_part_name == value.GetMainPartName() && CanBuildPart( value.GetPartName(), tool, use_tool ) )
+			{
+				construction_parts.Insert( value );
+			}
+			
+			if ( main_part_name == value.GetPartName() )
+			{
+				part_name = value.GetMainPartName();
+			}
+		}
+		
+		if( construction_parts.Count() == 0 && part_name )
+		{
+			for ( i = 0; i < m_ConstructionParts.Count(); ++i )
+			{
+				key = m_ConstructionParts.GetKey( i );
+				value = m_ConstructionParts.Get( key );
+		
+				if ( part_name == value.GetMainPartName() && CanBuildPart( value.GetPartName(), tool, use_tool ) )
+				{
+					construction_parts.Insert( value );
+				}
+			}
+		}
+	}
+	
+	//Returns (first found) base construction part
+	ConstructionPart GetBaseConstructionPart()
+	{
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			string key = m_ConstructionParts.GetKey( i );
+			ConstructionPart value = m_ConstructionParts.Get( key );
+		
+			if ( value.IsBase() )
+			{
+				return value;
+			}
+		}
+		
+		return NULL;
+	}
+	
+	//Returns (first found) gate construction part
+	ConstructionPart GetGateConstructionPart()
+	{
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			string key = m_ConstructionParts.GetKey( i );
+			ConstructionPart value = m_ConstructionParts.Get( key );
+		
+			if ( value.IsGate() )
+			{
+				return value;
+			}
+		}
+		
+		return NULL;
+	}
+	
+	//checks if construction part has required part already built
+	protected bool HasRequiredPart( string part_name )
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "required_parts";
+		
+		ref array<string> required_parts = new array<string>;
+		GetGame().ConfigGetTextArray( cfg_path, required_parts );
+		
+		//check if parts are already built
+		for ( int i = 0; i < required_parts.Count(); ++i )
+		{
+			if ( !IsPartConstructed( required_parts.Get( i ) ) )
+			{
+				return false;
+			}
+			//hack - gate
+			/*else if (part_name == "wall_gate" && (IsPartConstructed("wall_base_down") || IsPartConstructed("wall_base_up")))
+			{
+				return true;
+			}*/
+		}
+		
+		return true;
+	}
+	
+	//checks if there are conflict parts already built
+	protected bool HasConflictPart( string part_name )
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "conflicted_parts";
+		ref array<string> conflict_parts = new array<string>;
+		GetGame().ConfigGetTextArray( cfg_path, conflict_parts );
+
+		//check if parts are already built
+		for ( int i = 0; i < conflict_parts.Count(); i++ )
+		{
+			if ( IsPartConstructed( conflict_parts.Get( i ) ) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	//DECONSTRUCTION
+	ConstructionPart GetConstructionPartToDismantle( string part_name, ItemBase tool )
+	{
+		if ( CanDismantlePart( part_name, tool ) )
+		{
+			return GetConstructionPart( part_name );
+		}
+		
+		return NULL;
+	}
+
+	bool CanDismantlePart( string part_name, ItemBase tool )
+	{
+		if ( IsPartConstructed( part_name ) && !HasDependentPart( part_name ) && CanUseToolToDismantlePart( part_name, tool ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//checks if construction part has dependent part (that is already built) because of which it cannot be deconstruct
+	//TODO return whole array of dependent parts/dependencies (one or the other), should be used to eventually destroy all dependent parts instead
+	bool HasDependentPart( string part_name )
+	{
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			string key = m_ConstructionParts.GetKey( i );
+			ConstructionPart construction_part = m_ConstructionParts.Get( key );
+			
+			if ( construction_part.IsBuilt() )
+			{
+				if ( construction_part.GetRequiredParts().Find( part_name ) > -1 )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	//returns array of BUILT parts that directly depend on 'part_name'
+	protected array<string> GetValidDepenentPartsArray( string part_name, array<string> recurs = null )
+	{
+		string name;
+		string cfg_path;
+		ref array<string> dependent_parts;
+		
+		for ( int i = 0; i < m_ConstructionParts.Count(); ++i )
+		{
+			name = m_ConstructionParts.GetKey( i );
+			ConstructionPart construction_part = m_ConstructionParts.Get( name );
+			
+			if ( construction_part.IsBuilt() && construction_part.GetRequiredParts() && construction_part.GetRequiredParts().Find( part_name ) > -1 ) //does the construction part need 'part_name' to exist?
+			{
+				if ( !dependent_parts )
+				{
+					dependent_parts = new array<string>;
+				}
+				
+				if ( !recurs || (recurs.Find(name) == -1 ) )
+				{
+					dependent_parts.Insert(name);
+				}
+//				Print("part #" + i + ": " + name);
+			}
+		}
+		
+		//fully recursive search, disconnected (unnescessary)
+		/*if (dependent_parts)
+		{
+			if ( dependent_parts.Count() > 0 )
+			{
+				ref array<string> temp = new array<string>;
+				for ( i = 0; i < dependent_parts.Count(); i++ )
+				{
+					temp = GetValidDepenentPartsArray(dependent_parts.Get(i),dependent_parts);
+					if (temp.Count() > 0)
+					{
+						dependent_parts.InsertAll(temp);
+					}
+				}
+			}
+			Print("dependent_parts.Count(): " + dependent_parts.Count());
+		}*/
+		return dependent_parts;
+	}
+	
+	//gets all required parts of a construction part; fills into ConstructionPart on init
+	array<string> GetRequiredParts( string part_name, string main_part_name )
+	{
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " " + "Construction" + " " + main_part_name + " " + part_name + " " + "required_parts";
+		ref array<string> required_parts = new array<string>;
+		GetGame().ConfigGetTextArray( cfg_path, required_parts );
+		
+		return required_parts;
+	}
+	
+	//DESTROY
+	ConstructionPart GetConstructionPartToDestroy( string part_name )
+	{
+		if ( CanDestroyPart( part_name ) )
+		{
+			return GetConstructionPart( part_name );
+		}
+		
+		return NULL;
+	}	
+
+	bool CanDestroyPart( string part_name )
+	{
+		if ( IsPartConstructed( part_name ) && !HasDependentPart( part_name ) )
+		{
+			return true;
+		}
+		
+		return false;
+	}	
+	
+	//CONSTRUCTION PART STATE
+	//show/hide construction part
+	protected void ShowConstructionPart( string part_name )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction ShowConstructionPart - " + part_name);
+		GetParent().SetAnimationPhase( part_name, 0 );
+	}
+	
+	protected void HideConstructionPart( string part_name )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] Construction HideConstructionPart - " + part_name);
+		GetParent().SetAnimationPhase( part_name, 1 );
+	}
+	
+	//show/hide physics
+	void ShowConstructionPartPhysics( string part_name )
+	{
+		GetParent().AddProxyPhysics( part_name );
+	}
+	
+	void HideConstructionPartPhysics( string part_name )
+	{
+		GetParent().RemoveProxyPhysics( part_name );
+	}	
+	
+	//is part constructed
+	bool IsPartConstructed( string part_name )
+	{
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		if ( construction_part && construction_part.IsBuilt() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//============================================
+	// Materials for construction
+	//============================================
+	//has materials
+	bool HasMaterials( string part_name, bool repairing = false )
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "Materials";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				//get type, quantity from material
+				string material_path;
+				string slot_name;
+				float quantity;
+				material_path = cfg_path + " " + child_name + " " + "slot_name";
+				GetGame().ConfigGetText( material_path, slot_name );
+				material_path = cfg_path + " " + child_name + " " + "quantity";
+				quantity = GetGame().ConfigGetFloat( material_path );
+				
+				if (repairing)
+				{
+					quantity *= REPAIR_MATERIAL_PERCENTAGE;
+					quantity = Math.Max(Math.Floor(quantity),1);
+				}
+				
+				//if the selected material (or its quantity) is not available
+				if ( !HasMaterialWithQuantityAttached( slot_name, quantity ) )
+				{
+					return false;
+				}
+			}
+		}
+		
+		return true;	//return true even if no material required
+	}
+	
+	//check if parent object has attachment of required quantity attached to it
+	protected bool HasMaterialWithQuantityAttached( string slot_name, float quantity )
+	{
+		ItemBase attachment = ItemBase.Cast( GetParent().FindAttachmentBySlotName( slot_name ) );
+		
+		if ( attachment && attachment.GetQuantity() >= quantity )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//take materials when building
+	void TakeMaterialsServer( string part_name, bool repairing = false )
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "Materials";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				//get type, quantity from material
+				string config_path;
+				string slot_name;
+				config_path = cfg_path + " " + child_name + " " + "slot_name";
+				GetGame().ConfigGetText( config_path, slot_name );
+				config_path = cfg_path + " " + child_name + " " + "quantity";
+				float quantity = GetGame().ConfigGetFloat( config_path );
+				config_path = cfg_path + " " + child_name + " " + "lockable";
+				bool lockable = GetGame().ConfigGetInt( config_path );
+				
+				ItemBase attachment = ItemBase.Cast( GetParent().FindAttachmentBySlotName( slot_name ) );
+				if ( lockable )
+				{
+					//lock attachment
+					InventoryLocation inventory_location = new InventoryLocation;
+					attachment.GetInventory().GetCurrentInventoryLocation( inventory_location );
+			
+					GetParent().GetInventory().SetSlotLock( inventory_location.GetSlot(), true );
+				}
+				else
+				{
+					if ( quantity > -1 )						//0 - ignores quantity
+					{
+						if (repairing)
+						{
+							quantity *= REPAIR_MATERIAL_PERCENTAGE;
+							quantity = Math.Max(Math.Floor(quantity),1);
+						}
+						//subtract quantity
+						attachment.AddQuantity( -quantity );
+					}
+					else										//-1 - deletes the object
+					{
+						GetGame().ObjectDelete( attachment );
+					}
+				}
+			}
+		}
+	}
+	
+	//receive materials when dismantling
+	protected void ReceiveMaterialsServer( notnull Man player, string part_name, string damagezone_name )
+	{
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		bool is_base = construction_part.IsBase();
+		string main_part_name = construction_part.GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "Materials";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			StaticConstructionMethods.SpawnConstructionMaterialPiles(GetParent(),player,cfg_path,part_name,damagezone_name,is_base);
+		}
+	}
+	
+	//destroy lockable materials when destroying
+	protected void DestroyMaterialsServer( Man player, string part_name )
+	{
+		ConstructionPart cPart = GetConstructionPart( part_name );
+		string main_part_name = cPart.GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "Materials";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				//get type, quantity from material
+				string config_path;
+				string type;
+				string slot_name;
+				config_path = cfg_path + " " + child_name + " " + "type";
+				GetGame().ConfigGetText( config_path, type );
+				config_path = cfg_path + " " + child_name + " " + "slot_name";
+				GetGame().ConfigGetText( config_path, slot_name );
+				config_path = cfg_path + " " + child_name + " " + "quantity";
+				float quantity = GetGame().ConfigGetFloat( config_path );
+				config_path = cfg_path + " " + child_name + " " + "lockable";
+				bool lockable = GetGame().ConfigGetInt( config_path );
+				
+				//get material
+				ItemBase attachment = ItemBase.Cast( GetParent().FindAttachmentBySlotName( slot_name ) );
+				
+				//material still attached
+				if ( lockable )			//if lockable 
+				{
+					if ( attachment )
+					{
+						InventoryLocation inventory_location = new InventoryLocation;
+						attachment.GetInventory().GetCurrentInventoryLocation( inventory_location );
+						if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + Object.GetDebugName(GetParent()) + " DestroyMaterialsServer unlock slot=" + inventory_location.GetSlot());
+						
+						GetParent().GetInventory().SetSlotLock( inventory_location.GetSlot() , false );
+						GetGame().ObjectDelete( attachment );		//delete object
+					}
+				}
+			}
+		}
+	}
+		
+	void DropNonUsableMaterialsServer( Man player, string part_name )
+	{
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " " + "Construction" + " " + construction_part.GetMainPartName() + " " + construction_part.GetPartName() + " " + "platform_support";
+		string platform_support;
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{		
+			GetGame().ConfigGetText( cfg_path, platform_support );
+		}
+		
+		if ( platform_support.Length() > 0 || construction_part.IsBase() )
+		{
+			string at_cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "GUIInventoryAttachmentsProps";
+			
+			if ( GetGame().ConfigIsExisting( at_cfg_path ) )
+			{
+				int	child_count = GetGame().ConfigGetChildrenCount( at_cfg_path );
+				
+				for ( int i = 0; i < child_count; i++ )
+				{
+					string child_name;
+					GetGame().ConfigGetChildName( at_cfg_path, i, child_name );
+					child_name.ToLower();
+					
+					if ( child_name.Contains( platform_support ) )
+					{
+						ref array<string> attachment_slots = new array<string>;
+						GetGame().ConfigGetTextArray( at_cfg_path + " " + child_name + " " + "attachmentSlots", attachment_slots );
+						
+						for ( int j = 0; j < attachment_slots.Count(); ++j )
+						{
+							//get material
+							ItemBase attachment = ItemBase.Cast( GetParent().FindAttachmentBySlotName( attachment_slots.Get( j ) ) );
+							
+							//material still attached
+							if ( attachment )
+							{
+								InventoryLocation inventory_location = new InventoryLocation;
+								attachment.GetInventory().GetCurrentInventoryLocation( inventory_location );
+								if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + Object.GetDebugName(GetParent()) + " DropNonUsableMaterials UNlocking slot=" + inventory_location.GetSlot());
+								
+								//unlock slot
+								GetParent().GetInventory().SetSlotLock( inventory_location.GetSlot() , false );
+								
+								EntityAI parent = GetParent();
+								if (!parent)
+									parent = player;
+								
+								int quantity_max = attachment.GetTargetQuantityMax(-1);
+								InventoryLocation dst = new InventoryLocation;
+								vector mat[4];
+								attachment.GetTransform(mat);
+								
+								if ( parent.MemoryPointExists("" + part_name + "_materials") )
+								{
+									vector destination = parent.GetMemoryPointPos("" + part_name + "_materials");
+									destination = GetGame().ObjectModelToWorld(parent,destination);
+									float health = attachment.GetHealth("","Health");
+									float quantity = attachment.GetQuantity() - 1;
+									if (quantity < 1.0)
+										quantity = 1.0;
+									float dir[4];
+									inventory_location.GetDir(dir);
+									dst.SetGroundEx(attachment,destination,dir);
+									//Print(dst.DumpToString());
+									MiscGameplayFunctions.CreateItemBasePiles(attachment.GetType(),destination,quantity,health,true);
+									attachment.AddQuantity( -quantity );
+								}
+								else
+								{
+									dst.SetGround(attachment,mat);
+									
+									for ( int k = attachment.GetQuantity(); k > quantity_max;  )
+									{
+										Object o = parent.GetInventory().LocationCreateEntity( dst, attachment.GetType(), ECE_PLACE_ON_SURFACE, RF_DEFAULT );
+										ItemBase new_item = ItemBase.Cast( o );
+										
+										if( new_item )
+										{
+											MiscGameplayFunctions.TransferItemProperties( attachment, new_item );
+											attachment.AddQuantity( -quantity_max );
+											new_item.SetQuantity( quantity_max );
+										}
+										k -= quantity_max;
+									}
+								}
+								
+								//drop
+								if (attachment.GetQuantity() > 0)
+								{
+									if ( GetGame().IsMultiplayer() )
+									{
+										parent.ServerTakeToDst( inventory_location, dst );
+									}
+									else
+									{
+										parent.LocalTakeToDst( inventory_location, dst );
+									}
+								}
+								else
+								{
+									attachment.Delete();
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	//set lock on materials that are attached and cannot be locked/unlocked
+	void SetLockOnAttachedMaterials( string part_name, bool lock_slot )
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "Materials";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				//get type, quantity from material
+				string config_path;
+				string type;
+				string slot_name;
+				config_path = cfg_path + " " + child_name + " " + "type";
+				GetGame().ConfigGetText( config_path, type );
+				config_path = cfg_path + " " + child_name + " " + "slot_name";
+				GetGame().ConfigGetText( config_path, slot_name );
+				config_path = cfg_path + " " + child_name + " " + "quantity";
+				float quantity = GetGame().ConfigGetFloat( config_path );
+				config_path = cfg_path + " " + child_name + " " + "lockable";
+				bool lockable = GetGame().ConfigGetInt( config_path );
+				
+				//get material
+				ItemBase attachment = ItemBase.Cast( GetParent().FindAttachmentBySlotName( slot_name ) );
+				
+				//material still attached
+				if ( lockable )			//if lockable 
+				{
+					if ( attachment )
+					{
+						InventoryLocation inventory_location = new InventoryLocation;
+						attachment.GetInventory().GetCurrentInventoryLocation( inventory_location );
+						if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + Object.GetDebugName(GetParent()) + " SetLockOnAttachedMaterials lock=" + lock_slot +" slot=" + inventory_location.GetSlot());
+						GetParent().GetInventory().SetSlotLock( inventory_location.GetSlot(), lock_slot );
+					}
+				}
+			}
+		}
+	}
+	
+	//============================================
+	// Construction tools
+	//============================================	
+	bool CanUseToolToBuildPart( string part_name, ItemBase tool )
+	{
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		string part_cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + construction_part.GetMainPartName() + " " + construction_part.GetPartName() + " " + "build_action_type";
+		if ( GetGame().ConfigIsExisting( part_cfg_path ) )
+		{
+			int part_build_action_type = GetGame().ConfigGetInt( part_cfg_path );
+			string tool_cfg_path = "cfgVehicles" + " " + tool.GetType() + " " + "build_action_type";
+			
+			if ( GetGame().ConfigIsExisting( tool_cfg_path ) )
+			{
+				int tool_build_action_type = GetGame().ConfigGetInt( tool_cfg_path );
+  
+				if ( ( part_build_action_type & tool_build_action_type ) > 0 )
+				{
+					return true;
+				}				
+			}
+		}
+		
+		return false;
+	}
+	
+	bool CanUseToolToDismantlePart( string part_name, ItemBase tool )
+	{
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		string part_cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + construction_part.GetMainPartName() + " " + construction_part.GetPartName() + " " + "dismantle_action_type";
+		if ( GetGame().ConfigIsExisting( part_cfg_path ) )
+		{
+			int part_dismantle_action_type = GetGame().ConfigGetInt( part_cfg_path );
+			string tool_cfg_path = "cfgVehicles" + " " + tool.GetType() + " " + "dismantle_action_type";
+			
+			if ( GetGame().ConfigIsExisting( tool_cfg_path ) )
+			{
+				int tool_dismantle_action_type = GetGame().ConfigGetInt( tool_cfg_path );
+  
+				if ( ( part_dismantle_action_type & tool_dismantle_action_type ) > 0 )
+				{
+					return true;
+				}				
+			}
+		}
+		
+		return false;
+	}
+	
+	ConstructionMaterialType GetMaterialType( string part_name )
+	{
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		string part_cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + construction_part.GetMainPartName() + " " + construction_part.GetPartName() + " " + "material_type";
+		if ( GetGame().ConfigIsExisting( part_cfg_path ) )
+		{
+			return GetGame().ConfigGetInt( part_cfg_path );
+		}
+		
+		return ConstructionMaterialType.MATERIAL_NONE;
+	}
+	
+	//============================================
+	// Collision check
+	//============================================
+	//Collisions (BBox and Trigger); deprecated
+	bool IsColliding( string part_name )
+	{
+		if (CfgGameplayHandler.GetDisableIsCollidingCheck())
+			return false;
+		ConstructionPart construction_part = GetConstructionPart( part_name );
+		
+		if ( construction_part )
+		{
+			vector center;
+			float absolute_ofset = 0.05; 	//we need to lift BBox even more, because it colliddes with house floors due to various reasons (probably geometry or float imperfections)
+			vector edge_length;
+			vector min_max[2];				//data used for creating trigger
+			ref array<Object> excluded_objects = new array<Object>;
+			ref array<Object> collided_objects = new array<Object>;
+			
+			excluded_objects.Insert( GetParent() );
+			
+			//get min_max and center from config and memory points
+			GetCollisionBoxData( part_name, min_max );
+			
+			center = GetBoxCenter( min_max );
+			center = GetParent().ModelToWorld( center );		//convert to world coordinates
+			edge_length = GetCollisionBoxSize( min_max );
+			
+			//Create trigger
+			//CreateCollisionTrigger( part_name, min_max, center );
+			
+			//check collision on box trigger and collision box
+			//IsTrigger colliding was turned off (for now) for easier way to build something with other players around
+			if ( /* IsTriggerColliding() || */ GetGame().IsBoxCollidingGeometry( Vector( center[0], center[1] + absolute_ofset, center[2] ), GetParent().GetOrientation(), edge_length, ObjIntersectView, ObjIntersectGeom, excluded_objects, collided_objects ) )
+			{
+				//Debug
+//				DrawDebugCollisionBox( min_max, ARGB( 150, 255, 0, 0 ) );
+				//
+				for (int i = 0; i < collided_objects.Count(); i++)
+				{
+					//Print(collided_objects.Get(i).GetType());
+					EntityAI entity = EntityAI.Cast(collided_objects.Get(i));
+					if ( entity && !entity.IsIgnoredByConstruction() )
+						return true;
+				}
+			}
+			//Debug
+//			DrawDebugCollisionBox( min_max, ARGB( 150, 255, 255, 255 ) );
+		}
+		return false;
+	}
+	
+	//! Collision check for building part
+	bool IsCollidingEx( CollisionCheckData check_data )
+	{
+		if (CfgGameplayHandler.GetDisableIsCollidingCheck())
+			return false;
+		ConstructionPart construction_part = GetConstructionPart( check_data.m_PartName );
+		
+		if ( construction_part )
+		{
+			vector center;
+			float absolute_ofset = 0.05; 	//we need to lift BBox even more, because it colliddes with house floors due to various reasons (probably geometry or float imperfections)
+			vector edge_length;
+			vector min_max[2];				//data used for creating trigger
+			ref array<Object> excluded_objects = new array<Object>;
+			ref array<Object> collided_objects = new array<Object>;
+			
+			excluded_objects.Insert( GetParent() );
+			if (check_data.m_AdditionalExcludes.Count() > 0)
+			{
+				excluded_objects.InsertAll(check_data.m_AdditionalExcludes);
+			}
+			
+			GetCollisionBoxData( check_data.m_PartName, min_max );
+			center = GetBoxCenter( min_max );
+			center = GetParent().ModelToWorld( center );		//convert to world coordinates
+			edge_length = GetCollisionBoxSize( min_max );
+			
+			if ( GetGame().IsBoxCollidingGeometry( Vector( center[0], center[1] + absolute_ofset, center[2] ), GetParent().GetOrientation(), edge_length, check_data.m_PrimaryGeometry, check_data.m_SecondaryGeometry, excluded_objects, collided_objects ) )
+			{
+				//Debug
+				//DrawDebugCollisionBox( min_max, ARGB( 150, 255, 0, 0 ) );
+				for (int i = 0; i < collided_objects.Count(); i++)
+				{
+					EntityAI entity = EntityAI.Cast(collided_objects.Get(i));
+					if ( entity && !entity.IsIgnoredByConstruction() )
+						return true;
+				}
+			}
+			//Debug
+			//DrawDebugCollisionBox( min_max, ARGB( 150, 255, 255, 255 ) );
+		}
+		return false;
+	}
+
+	vector GetCollisionBoxSize( vector min_max[2] )
+	{
+		vector box_size = Vector( 0, 0, 0 );
+		
+		box_size[0] = Math.AbsFloat( min_max[1][0] - min_max[0][0] );
+		box_size[1] = Math.AbsFloat( min_max[1][1] - min_max[0][1] );
+		box_size[2] = Math.AbsFloat( min_max[1][2] - min_max[0][2] );
+		
+		return box_size;
+	}
+	
+	//returns collision box data from construction config and model p3d
+	protected void GetCollisionBoxData( string part_name, out vector min_max[2] )
+	{
+		string main_part_name = GetConstructionPart( part_name ).GetMainPartName();
+		string cfg_path = "cfgVehicles" + " " + GetParent().GetType() + " "+ "Construction" + " " + main_part_name + " " + part_name + " " + "collision_data";
+		ref array<string> collision_data = new array<string>;
+		GetGame().ConfigGetTextArray( cfg_path, collision_data );
+		
+		if ( collision_data.Count() > 0 )
+		{
+			if ( GetParent().MemoryPointExists( collision_data[0] ) )
+			{
+				min_max[0] = GetParent().GetMemoryPointPos( collision_data[0] );
+			}
+			if ( GetParent().MemoryPointExists( collision_data[1] ) )
+			{
+				min_max[1] = GetParent().GetMemoryPointPos( collision_data[1] );
+			}
+		}
+	}
+	
+	//returns center point of box defined by min/max values
+	vector GetBoxCenter( vector min_max[2] )
+	{
+		vector center;
+		
+		center[0] = ( min_max[1][0] - min_max[0][0] ) / 2;
+		center[1] = ( min_max[1][1] - min_max[0][1] ) / 2;
+		center[2] = ( min_max[1][2] - min_max[0][2] ) / 2;
+		center = Vector( min_max[1][0] - center[0], min_max[1][1] - center[1], min_max[1][2] - center[2] ); //offset to box center
+		
+		return center;
+	}
+	
+	void GetTriggerExtents( vector min_max[2], out vector extents[2] )
+	{
+		vector egde_length = GetCollisionBoxSize( min_max );
+		extents[0][0] = -egde_length[0] / 2;		//min
+		extents[0][1] = -egde_length[1] / 2;
+		extents[0][2] = -egde_length[2] / 2;
+		extents[1][0] = egde_length[0] / 2;			//max
+		extents[1][1] = egde_length[1] / 2;
+		extents[1][2] = egde_length[2] / 2;
+	}
+	
+	//Debug
+	protected void DrawDebugCollisionBox( vector min_max[2], int color )
+	{
+		DestroyDebugCollisionBox();
+		
+		vector mat[4];
+		GetParent().GetTransform( mat );
+		
+		m_CollisionBox = Debug.DrawBox( min_max[0], min_max[1], color );
+		m_CollisionBox.SetMatrix( mat );
+	}
+	
+	protected void DestroyDebugCollisionBox()
+	{
+		if ( m_CollisionBox )
+		{
+			m_CollisionBox.Destroy();
+			m_CollisionBox = NULL;
+		}		
+	}
+	
+	void CreateCollisionTrigger( string part_name, vector min_max[2], vector center )
+	{
+		if ( m_ConstructionBoxTrigger )
+		{
+			if ( m_ConstructionBoxTrigger.GetPartName() == part_name )		//already created
+			{
+				return;
+			}
+			else
+			{
+				DestroyCollisionTrigger();
+			}
+		}	
+		
+		//get proper trigger extents (min<max)
+		vector extents[2];
+		GetTriggerExtents( min_max, extents );
+		
+		//create trigger
+		m_ConstructionBoxTrigger = ConstructionBoxTrigger.Cast( GetGame().CreateObject( "ConstructionBoxTrigger", center, false, false, false ) );
+		m_ConstructionBoxTrigger.SetPosition( center );
+		m_ConstructionBoxTrigger.SetOrientation( GetParent().GetOrientation() );	
+		m_ConstructionBoxTrigger.SetExtents( extents[0], extents[1] );
+		
+		m_ConstructionBoxTrigger.SetPartName( part_name );
+	}
+	//
+	
+	void DestroyCollisionTrigger()
+	{
+		GetGame().ObjectDelete( m_ConstructionBoxTrigger );
+		m_ConstructionBoxTrigger = NULL;
+	}
+	
+	bool IsTriggerColliding()
+	{
+		return m_ConstructionBoxTrigger.IsColliding();
+	}
+}
+
+class StaticConstructionMethods
+{
+	//! spawns material from any construction; 'player' parameter optional
+	static void SpawnConstructionMaterialPiles(notnull EntityAI entity, Man player, string cfg_path, string main_part_name, string damagezone_name = "", bool is_base = false )
+	{
+		int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+		
+		for ( int i = 0; i < child_count; i++ )
+		{
+			string child_name;
+			GetGame().ConfigGetChildName( cfg_path, i, child_name );
+			
+			//get type, quantity from material
+			string config_path;
+			string type;
+			string slot_name;
+			config_path = cfg_path + " " + child_name + " " + "type";
+			GetGame().ConfigGetText( config_path, type );
+			config_path = cfg_path + " " + child_name + " " + "slot_name";
+			GetGame().ConfigGetText( config_path, slot_name );
+			config_path = cfg_path + " " + child_name + " " + "quantity";
+			float quantity = GetGame().ConfigGetFloat( config_path );
+			config_path = cfg_path + " " + child_name + " " + "lockable";
+			bool lockable = GetGame().ConfigGetInt( config_path );
+			
+			//receive material quantity
+			ItemBase attachment = ItemBase.Cast( entity.FindAttachmentBySlotName( slot_name ) );
+			int slot_id;
+			
+			//material still attached
+			if ( lockable )			//if lockable 
+			{
+				if ( attachment )
+				{
+					InventoryLocation src = new InventoryLocation;
+					attachment.GetInventory().GetCurrentInventoryLocation( src );
+					if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + Object.GetDebugName( entity) + " DropNonUsableMaterials UNlocking slot=" + src.GetSlot() );
+					entity.GetInventory().SetSlotLock( src.GetSlot() , false );
+					
+					//detach if base
+					if ( is_base )
+					{
+						if ( GetGame().IsMultiplayer() && player )
+						{
+							InventoryLocation dst = new InventoryLocation;
+							GameInventory.SetGroundPosByOwner( player, src.GetItem(), dst );
+							player.ServerTakeToDst( src, dst );
+						}
+						else
+						{
+							entity.GetInventory().DropEntity( InventoryMode.PREDICTIVE, entity, attachment );
+						}
+					}
+				}
+			}
+			else
+			{
+				float pile_health;
+				float qty_coef;
+				vector destination = entity.GetPosition();
+				//placed on helper memory point, if available
+				if ( entity.MemoryPointExists("" + main_part_name + "_materials") )
+				{
+					destination = entity.GetMemoryPointPos("" + main_part_name + "_materials");
+					destination = GetGame().ObjectModelToWorld(entity,destination);
+				}
+				else if ( entity.MemoryPointExists(main_part_name) )
+				{
+					destination = entity.GetMemoryPointPos(main_part_name);
+					destination = GetGame().ObjectModelToWorld(entity,destination);
+				}
+				//pile_health = GameConstants.DAMAGE_WORN_VALUE * MiscGameplayFunctions.GetTypeMaxGlobalHealth(type);
+				pile_health = entity.GetHealth01(damagezone_name,"Health") * MiscGameplayFunctions.GetTypeMaxGlobalHealth(type);
+				qty_coef =  1 - (entity.GetHealthLevel(damagezone_name) * Construction.DECONSTURCT_MATERIAL_LOSS) - Construction.DECONSTURCT_MATERIAL_LOSS;
+				quantity *= qty_coef;
+				quantity = Math.Max(Math.Floor(quantity),1);
+				MiscGameplayFunctions.CreateItemBasePiles(type,destination,quantity,pile_health,true);
+			}
+		}
+	}
+}
+
+//! Data structure for passing parameters (extendable, modable)
+class CollisionCheckData
+{
+	ref array<Object> m_AdditionalExcludes;
+	string m_PartName;
+	int m_PrimaryGeometry;
+	int m_SecondaryGeometry;
+	
+	void CollisionCheckData()
+	{
+		m_AdditionalExcludes = new array<Object>;
+		m_PartName = "";
+		m_PrimaryGeometry = ObjIntersectGeom;
+		m_SecondaryGeometry = ObjIntersectView;
+	}
+}
+
+class ConstructionBoxTrigger : ManTrigger
+{
+	string m_PartName;
+	
+	void SetPartName( string part_name )
+	{
+		m_PartName = part_name;
+	}
+	
+	string GetPartName()
+	{
+		return m_PartName;
+	}
+	
+	override protected void UpdateInsiders( int timeout )
+	{
+		super.UpdateInsiders( 20 );
+	}
+	
+	bool IsColliding()
+	{
+		if ( GetInsiders().Count() > 0 )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/BaseBuilding/ConstructionActionData.c b/scripts/4_World/DayZ/Classes/BaseBuilding/ConstructionActionData.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba8e338a3c9ca62a95465cf4a88642ac2207213b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BaseBuilding/ConstructionActionData.c
@@ -0,0 +1,387 @@
+class ConstructionActionData
+{
+	Object m_Target;
+	
+	//base building
+	ref array<ConstructionPart> 	m_BuildParts;
+	ref array<ConstructionPart>	 	m_BuildPartsNoTool;
+	
+	int 							m_PartIndex; //used on client only, action synchronizes it to server to avoid mismatch
+	string 							m_MainPartName;
+	string 							m_MainPartNameNoTool;
+	ref ConstructionPart 			m_TargetPart;
+	
+	//combination lock
+	CombinationLock 				m_CombinationLock;
+	
+	//attaching
+	int 							m_SlotId;
+	PlayerBase 						m_ActionInitiator;
+	//detaching
+	ref array<EntityAI> 			m_Attachments;
+	
+	protected ActionVariantManager	m_ActionVariantManager;
+	protected ActionVariantManager	m_ActionNoToolVariantManager;
+
+	int 							m_AttachmentsIndex;
+
+	void ConstructionActionData()
+	{
+		m_BuildParts = new ref array<ConstructionPart>;
+		m_BuildPartsNoTool = new ref array<ConstructionPart>;
+		m_PartIndex = 0;
+		
+		m_Attachments = new ref array<EntityAI>;
+		m_AttachmentsIndex = 0;
+
+		if ( GetGame().IsClient() || !GetGame().IsMultiplayer() )
+		{
+			m_ActionVariantManager = ActionManagerClient.GetVariantManager( ActionBuildPart );
+			m_ActionVariantManager.GetOnUpdateInvoker().Clear();
+			m_ActionVariantManager.GetOnUpdateInvoker().Insert(OnUpdateActions);
+				
+			m_ActionNoToolVariantManager = ActionManagerClient.GetVariantManager( ActionBuildShelter );
+			m_ActionNoToolVariantManager.GetOnUpdateInvoker().Clear();
+			m_ActionNoToolVariantManager.GetOnUpdateInvoker().Insert(OnUpdateActionsNoTool);
+		}
+	}
+	
+	//************************************************/
+	//  Base building
+	//************************************************/
+	string GetMainPartName()
+	{
+		return m_MainPartName;
+	}
+	
+	string GetMainPartNameNoTool()
+	{
+		return m_MainPartNameNoTool;
+	}
+	
+	void SetTarget( Object target )
+	{
+		m_Target = target;
+	}
+	
+	Object GetTarget()
+	{
+		return m_Target;
+	}
+	
+	void SetTargetPart( ConstructionPart target_part )
+	{
+		m_TargetPart = target_part;
+	}
+
+	ConstructionPart GetTargetPart()
+	{
+		return m_TargetPart;
+	}
+	
+	void SetSlotId( int slot_id )
+	{
+		m_SlotId = slot_id;
+	}
+	
+	int GetSlotId()
+	{
+		return m_SlotId;
+	}
+	
+	void SetActionInitiator( PlayerBase action_initiator )
+	{
+		m_ActionInitiator = action_initiator;
+	}
+	
+	PlayerBase GetActionInitiator()
+	{
+		return m_ActionInitiator;
+	}
+	
+	// deprecated
+	void SetNextIndex()
+	{
+	}
+	
+	// deprecated
+	void RefreshPartsToBuild( string main_part_name, ItemBase tool, bool use_tool = true )
+	{
+
+	}
+	
+	void OnUpdateActions( Object item, Object target, int component_index )
+	{
+		ItemBase tool = ItemBase.Cast( item );
+		if ( tool )
+		{
+			BaseBuildingBase base_building_object = BaseBuildingBase.Cast( target );
+			if ( base_building_object )
+			{
+				string main_part_name = target.GetActionComponentName( component_index );
+				base_building_object.GetConstruction().GetConstructionPartsToBuild( main_part_name, m_BuildParts, tool, m_MainPartName, true );
+				m_ActionVariantManager.SetActionVariantCount(m_BuildParts.Count());
+			}
+			else
+			{
+				m_BuildParts.Clear();
+				m_ActionVariantManager.Clear();
+			}
+
+		}
+		else
+		{
+			m_BuildParts.Clear();
+			m_ActionVariantManager.Clear();
+		}		
+		//not needed
+		//m_Target = target;
+	}
+	
+	void OnUpdateActionsNoTool( Object item, Object target, int component_index )
+	{
+		BaseBuildingBase base_building_object = BaseBuildingBase.Cast( target );
+		if ( base_building_object )
+		{
+			string main_part_name = target.GetActionComponentName( component_index );
+			base_building_object.GetConstruction().GetConstructionPartsToBuild( main_part_name, m_BuildPartsNoTool, null, m_MainPartNameNoTool, false );
+			m_ActionNoToolVariantManager.SetActionVariantCount(m_BuildPartsNoTool.Count());
+		}
+		else
+		{
+			m_BuildPartsNoTool.Clear();
+			m_ActionNoToolVariantManager.Clear();
+		}	
+	}
+	
+	int GetConstructionPartsCount()
+	{
+		return m_BuildParts.Count();
+	}
+	
+	// deprecated
+	ConstructionPart GetCurrentBuildPart()
+	{
+		return null;
+	}
+	
+	ConstructionPart GetBuildPartAtIndex(int idx)
+	{
+		if( m_BuildParts.Count() > idx )
+		{
+			return m_BuildParts.Get( idx );
+		}
+		return null;
+	}
+	
+	ConstructionPart GetBuildPartNoToolAtIndex(int idx)
+	{
+		if( m_BuildPartsNoTool.Count() > idx )
+		{
+			return m_BuildPartsNoTool.Get( idx );
+		}
+		return null;
+	}
+
+	//************************************************/
+	//  Combination lock
+	//************************************************/	
+	CombinationLock GetCombinationLock()
+	{
+		return m_CombinationLock;
+	}
+	
+	void SetCombinationLock( CombinationLock combination_lock )
+	{
+		m_CombinationLock = CombinationLock.Cast( combination_lock );
+	}
+
+	string GetDialNumberText()
+	{
+		string dial_text;
+		
+		if ( m_CombinationLock )
+		{
+			string combination_text = m_CombinationLock.GetCombination().ToString();
+			
+			//insert zeros to dials with 0 value
+			int length_diff = m_CombinationLock.GetLockDigits() - combination_text.Length();
+			for ( int i = 0; i < length_diff; ++i )
+			{
+				combination_text = "0" + combination_text;
+			}
+			
+			//assemble the whole combination with selected part
+			for ( int j = 0; j < m_CombinationLock.GetLockDigits(); ++j )
+			{
+				if ( j == m_CombinationLock.GetDialIndex() )
+				{
+					dial_text += string.Format( "[%1]", combination_text.Get( j ) );
+				}
+				else
+				{
+					dial_text += string.Format( " %1 ", combination_text.Get( j ) );
+				}
+			}
+		}
+
+		return dial_text;
+	}
+	
+	//************************************************/
+	//  Attach/Detach actions
+	//************************************************/	
+	int GetAttachmentSlotFromSelection( PlayerBase player, EntityAI target, ItemBase item_to_attach, string selection )
+	{
+		string cfg_path = "cfgVehicles" + " " + target.GetType() + " "+ "GUIInventoryAttachmentsProps";
+		
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				string child_selection;
+				GetGame().ConfigGetText( cfg_path + " " + child_name + " " + "selection", child_selection );
+				
+				if ( selection == child_selection )
+				{
+					ref array<string> attachment_slots = new array<string>;
+					GetGame().ConfigGetTextArray( cfg_path + " " + child_name + " " + "attachmentSlots", attachment_slots );
+					
+					for ( int j = 0; j < attachment_slots.Count(); ++j )
+					{
+						int target_slot_id = InventorySlots.GetSlotIdFromString( attachment_slots.Get( j ) );
+						int item_slot_count = item_to_attach.GetInventory().GetSlotIdCount();
+						
+						for ( int k = 0; k < item_slot_count; ++k )
+						{
+							int item_slot_id = item_to_attach.GetInventory().GetSlotId( k );
+							ItemBase attachment_item = ItemBase.Cast( target.GetInventory().FindAttachment( item_slot_id ) );
+							
+							if ( target_slot_id == item_slot_id )
+							{
+								if (  target.GetInventory().CanAddAttachmentEx( item_to_attach, item_slot_id ) && target.CanReceiveAttachment( item_to_attach, item_slot_id ) || attachment_item && attachment_item.CanBeCombined( item_to_attach ) )
+								{
+									if(target.CanDisplayAttachmentSlot(target_slot_id))
+										return item_slot_id;
+									else
+										return -1;
+								}								
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		return -1;
+	}
+	
+	void GetAttachmentsFromSelection( EntityAI target, string selection, out array<EntityAI> attachments )
+	{
+		attachments.Clear();		//clear output
+		
+		string cfg_path = "cfgVehicles" + " " + target.GetType() + " "+ "GUIInventoryAttachmentsProps";
+		if ( GetGame().ConfigIsExisting( cfg_path ) )
+		{
+			int	child_count = GetGame().ConfigGetChildrenCount( cfg_path );
+			
+			for ( int i = 0; i < child_count; i++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( cfg_path, i, child_name );
+				
+				string child_selection;
+				GetGame().ConfigGetText( cfg_path + " " + child_name + " " + "selection", child_selection );
+				
+				if ( selection == child_selection )
+				{
+					ref array<string> attachment_slots = new array<string>;
+					GetGame().ConfigGetTextArray( cfg_path + " " + child_name + " " + "attachmentSlots", attachment_slots );
+					
+					for ( int j = 0; j < attachment_slots.Count(); ++j )
+					{
+						int target_slot_id = InventorySlots.GetSlotIdFromString( attachment_slots.Get( j ) );
+						
+						//is attached and can be detached
+						EntityAI attachment = target.GetInventory().FindAttachment( target_slot_id );
+						if ( attachment && target.GetInventory().CanRemoveAttachmentEx( attachment, target_slot_id ) && !target.GetInventory().GetSlotLock( target_slot_id ) )
+						{
+							attachments.Insert( attachment );
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	void CombineItems( ItemBase target, ItemBase item )
+	{
+		if ( target.ConfigGetBool( "canBeSplit" ) && item && !target.IsFullQuantity() )
+		{
+			int quantity_used = target.ComputeQuantityUsed( item, true );
+			if( quantity_used != 0 )
+			{
+				target.AddQuantity( quantity_used );
+				item.AddQuantity( -quantity_used );
+			}
+		}
+	}
+	
+	void RefreshAttachmentsToDetach( EntityAI target, string main_part_name )
+	{
+		GetAttachmentsFromSelection( target, main_part_name, m_Attachments );
+	}
+	
+	void SetNextAttachmentIndex()
+	{
+		if ( GetAttachmentsToDetachCount() > 1 )
+		{
+			if ( m_AttachmentsIndex <= GetAttachmentsToDetachCount() - 2 )
+			{
+				m_AttachmentsIndex++;
+			}
+			else if ( m_AttachmentsIndex >= GetAttachmentsToDetachCount() >  - 1 )
+			{
+				m_AttachmentsIndex = 0;
+			}
+		}
+		else
+		{
+			m_AttachmentsIndex = 0;
+		}
+	}
+		
+	int GetAttachmentsToDetachCount()
+	{
+		return m_Attachments.Count();
+	}	
+		
+	EntityAI GetActualAttachmentToDetach()
+	{
+		if ( GetAttachmentsToDetachCount() > 0 )
+		{
+			m_AttachmentsIndex = Math.Clamp( m_AttachmentsIndex, 0, GetAttachmentsToDetachCount() - 1 );
+			
+			if ( m_Attachments && GetAttachmentsToDetachCount() > ( m_AttachmentsIndex ) )
+			{
+				return m_Attachments.Get( m_AttachmentsIndex );
+			}		
+		}
+
+		return NULL;
+	}
+	
+	//************************************************/
+	//  Common
+	//************************************************/
+	void ResetActionIndexes()
+	{
+		m_PartIndex = 0;
+		m_AttachmentsIndex = 0;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/BaseBuilding/ConstructionPart.c b/scripts/4_World/DayZ/Classes/BaseBuilding/ConstructionPart.c
new file mode 100644
index 0000000000000000000000000000000000000000..06e49b7e7e6a3b0126de9485cefe55e9cc0e411f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BaseBuilding/ConstructionPart.c
@@ -0,0 +1,79 @@
+class ConstructionPart
+{
+	string 	m_Name;				//localized text name that is displayed ingame
+	int		m_Id;				//a number used for synchronization and persistence purposes, must be unique and withing sync limit (total number of bits in all sync/persistence variables)
+	string 	m_PartName;			//config class name
+	string 	m_MainPartName;		//main (parent) config class name
+	bool 	m_IsBuilt;			//defines part build state
+	bool 	m_IsBase;			//defines if this part is the foundation of the whole construction
+	bool 	m_IsGate;			//defines part gate state
+	ref array<string> m_RequiredParts; //list of parts required by this part
+	
+	void ConstructionPart( string name, string part_name, string main_part_name, int id, bool is_built, bool is_base, bool is_gate, array<string> required_parts )
+	{
+		m_Name = name;
+		m_PartName = part_name;
+		m_MainPartName = main_part_name;
+		m_Id = id;
+		m_IsBuilt = is_built;
+		m_IsBase = is_base;
+		m_IsGate = is_gate;
+		m_RequiredParts = required_parts;
+	}
+	
+	string GetName()
+	{
+		string ret = Widget.TranslateString(m_Name);
+		return ret;
+	}
+	
+	string GetPartName()
+	{
+		return m_PartName;
+	}
+
+	string GetMainPartName()
+	{
+		return m_MainPartName;
+	}
+	
+	int GetId()
+	{
+		return m_Id;
+	}
+	
+	bool IsBuilt()
+	{
+		return m_IsBuilt;
+	}
+	
+	void SetBuiltState( bool is_built )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] SetBuildState=" + is_built + " part=" + m_PartName);
+		m_IsBuilt = is_built;
+	}
+	
+	void SetRequestBuiltState( bool req_built )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] SetRequestBuiltState=" + req_built + " part=" + m_PartName);
+		if (GetGame().IsMultiplayer())
+			SetBuiltState(req_built);
+		else
+			; // skip set to true in single player - will be synced later
+	}
+	
+	bool IsBase()
+	{
+		return m_IsBase;
+	}
+	
+	bool IsGate()
+	{
+		return m_IsGate;
+	}
+	
+	array<string> GetRequiredParts()
+	{
+		return m_RequiredParts;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/BleedingIndication/BleedingIndicationConstants.c b/scripts/4_World/DayZ/Classes/BleedingIndication/BleedingIndicationConstants.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab2ce4e53ff07fb705fef92fb5f38ca47ef1cd5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingIndication/BleedingIndicationConstants.c
@@ -0,0 +1,61 @@
+class BleedingIndicationConstants
+{
+//--------------------------------------------------------------
+//indicator-level constants
+	static const int 	INDICATOR_SEVERITY_LOW = 0;
+	static const int 	INDICATOR_SEVERITY_MEDIUM = 1;
+	static const int 	INDICATOR_SEVERITY_HIGH = 2;
+	static const int 	SEQUENCE_STEPS = 10; //! Used to pre-gen poisson probabilities, I REALLY wouldn't go over 10 here. Values above 12 cause overflow!
+	static const float 	SEQUENCE_DURATION_DEFAULT = 1.0;
+	
+//--------------------------------------------------------------
+//shared drop-level constants
+	static const float 	DROP_PROGRESS_THRESHOLD = 0.2; //[0..1]
+	static const float 	DROP_COLOR_DESATURATIONEND = 0.75; //[0..1]
+	static const int 	DROP_COLOR_RED = 0x9f;
+	static const int 	DROP_COLOR_GREEN = 0x3f;
+	static const int 	DROP_COLOR_BLUE = 0x3f;
+	static const int 	DROP_COLOR_ALPHA_START = 0xff;
+	static const int 	DROP_COLOR_ALPHA_END = 0x00;
+	
+//--------------------------------------------------------------
+//sorted severity constants
+	//Low
+	static const float 	SEQUENCE_DURATION_LOW = 1.0; //seconds
+	static const float 	SEQUENCE_DROP_AVERAGE_LOW = 1.5; //used to pre-gen probabilities on game start. Values above 5 can break the poisson! DO NOT touch unless you know what you're doing.
+	static const float 	DROP_DURATION_LOW = 1.5; //seconds
+	static const float 	SEQUENCE_DROP_DELAY_MIN_LOW = DROP_DURATION_LOW / 5; //min delay to spawn a drop
+	static const float 	SEQUENCE_DROP_DELAY_MAX_LOW = 2.5 * DROP_DURATION_LOW; //max delay between drops
+	static const float 	DROP_SIZE_START_LOW = 0.62;
+	static const float 	DROP_SIZE_END_LOW = 0.70;
+	static const float 	DROP_SIZE_VARIATION_MIN_LOW = 1.0; //randomizes every drop's coef min
+	static const float 	DROP_SIZE_VARIATION_MAX_LOW = 1.0; //randomizes every drop's coef max
+	static const int 	DROP_SCATTER_LOW = 25; //pixels
+	static const float 	DROP_SLIDE_DISTANCE_LOW = 4;
+	
+	//Medium
+	static const float 	SEQUENCE_DURATION_MEDIUM = 0.6; //seconds
+	static const float 	SEQUENCE_DROP_AVERAGE_MEDIUM = 2.0; //used to pre-gen probabilities on game start. Values above 5 can break the poisson! DO NOT touch unless you know what you're doing.
+	static const float 	DROP_DURATION_MEDIUM = 1.5; //seconds
+	static const float 	SEQUENCE_DROP_DELAY_MIN_MEDIUM = DROP_DURATION_MEDIUM / 5; //min delay to spawn a drop
+	static const float 	SEQUENCE_DROP_DELAY_MAX_MEDIUM = 2 * DROP_DURATION_MEDIUM; //max delay between drops
+	static const float 	DROP_SIZE_START_MEDIUM = 0.76;
+	static const float 	DROP_SIZE_END_MEDIUM = 0.83;
+	static const float 	DROP_SIZE_VARIATION_MIN_MEDIUM = 1.0; //randomizes every drop's coef min
+	static const float 	DROP_SIZE_VARIATION_MAX_MEDIUM = 1.0; //randomizes every drop's coef max
+	static const int 	DROP_SCATTER_MEDIUM = 30; //pixels
+	static const float 	DROP_SLIDE_DISTANCE_MEDIUM = 6;
+	
+	//High
+	static const float 	SEQUENCE_DURATION_HIGH = 0.4; //seconds
+	static const float 	SEQUENCE_DROP_AVERAGE_HIGH = 2.5; //used to pre-gen probabilities on game start. Values above 5 can break the poisson! DO NOT touch unless you know what you're doing.
+	static const float 	DROP_DURATION_HIGH = 1.5; //seconds
+	static const float 	SEQUENCE_DROP_DELAY_MIN_HIGH = DROP_DURATION_HIGH / 5; //min delay to spawn a drop
+	static const float 	SEQUENCE_DROP_DELAY_MAX_HIGH = 1.5 * DROP_DURATION_HIGH; //max delay between drops
+	static const float 	DROP_SIZE_START_HIGH = 0.92;
+	static const float 	DROP_SIZE_END_HIGH = 1.00;
+	static const float 	DROP_SIZE_VARIATION_MIN_HIGH = 1.0; //randomizes every drop's coef min
+	static const float 	DROP_SIZE_VARIATION_MAX_HIGH = 1.2; //randomizes every drop's coef max
+	static const int 	DROP_SCATTER_HIGH = 35; //pixels
+	static const float 	DROP_SLIDE_DISTANCE_HIGH = 8;
+}
diff --git a/scripts/4_World/DayZ/Classes/BleedingIndication/BleedingIndicationStaticInfo.c b/scripts/4_World/DayZ/Classes/BleedingIndication/BleedingIndicationStaticInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..9beff59909702d109df2bd4e1ca3dad1eae69704
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingIndication/BleedingIndicationStaticInfo.c
@@ -0,0 +1,26 @@
+//!static info (non-constants)
+class DbgBleedingIndicationStaticInfo
+{
+	static bool m_DbgEnableBleedingIndication = true;
+	static bool m_DbgUseOverrideValues = true;
+	static bool m_DbgDropRotationRandom = true;
+	static float m_DbgSequenceDuration = BleedingIndicationConstants.SEQUENCE_DURATION_DEFAULT;
+	static float m_DbgDropDurationBase = BleedingIndicationConstants.DROP_DURATION_MEDIUM;
+	static float m_DbgDropMinDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MIN_MEDIUM;
+	static float m_DbgDropMaxDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MAX_MEDIUM;
+	static float m_DbgDropProgressTreshold = BleedingIndicationConstants.DROP_PROGRESS_THRESHOLD;
+	static float m_DbgDropStartSize = BleedingIndicationConstants.DROP_SIZE_START_LOW;
+	static float m_DbgDropEndSize = BleedingIndicationConstants.DROP_SIZE_END_LOW;
+	static float m_DbgDropSizeVariationMin = BleedingIndicationConstants.DROP_SIZE_VARIATION_MIN_LOW;
+	static float m_DbgDropSizeVariationMax = BleedingIndicationConstants.DROP_SIZE_VARIATION_MAX_LOW;
+	static int m_DbgDropScatter = BleedingIndicationConstants.DROP_SCATTER_LOW;
+	static float m_DbgDropSlideDistance = BleedingIndicationConstants.DROP_SLIDE_DISTANCE_LOW;
+	//colors
+	static bool m_DbgDropDesaturate = true;
+	static float m_DbgDesaturationEnd = BleedingIndicationConstants.DROP_COLOR_DESATURATIONEND;
+	static int m_DbgDropColorRed = BleedingIndicationConstants.DROP_COLOR_RED;
+	static int m_DbgDropColorGreen = BleedingIndicationConstants.DROP_COLOR_GREEN;
+	static int m_DbgDropColorBlue = BleedingIndicationConstants.DROP_COLOR_BLUE;
+	static int m_DbgDropColorAlphaStart = BleedingIndicationConstants.DROP_COLOR_ALPHA_START;
+	static int m_DbgDropColorAlphaEnd = BleedingIndicationConstants.DROP_COLOR_ALPHA_END;
+}
diff --git a/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSource.c b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSource.c
new file mode 100644
index 0000000000000000000000000000000000000000..753697cacbcd2e454d9927d8f6ef319fb3855b5e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSource.c
@@ -0,0 +1,198 @@
+enum eBleedingSourceType
+{
+	NORMAL,
+	CONTAMINATED,
+}
+
+class BleedingSource
+{
+	vector m_Position;
+	Particle m_BloodParticle;
+	PlayerBase m_Player;
+	int m_Bit;
+	string m_Bone;
+	ref EffectParticle m_BleedingEffect;
+	vector m_Orientation;
+	Shape m_DebugShape;
+	Shape m_DebugShape1;
+	ref Timer m_DebugTick;
+	vector m_Offset;
+	float m_FlowModifier;
+	float m_ActiveTime;
+	float m_MaxTime;
+	string m_ParticleName;
+	bool m_DeleteRequested;
+	eBleedingSourceType m_Type = eBleedingSourceType.NORMAL;
+	
+	void BleedingSource(PlayerBase player, int bit, string bone, vector orientation, vector offset,int max_time, float flow_modifier, string particle_name)
+	{
+		//m_Position = position;
+		m_Player = player;
+		m_Bit = bit;
+		m_Bone = bone;
+		m_Orientation = orientation;
+		m_Offset = offset;
+		m_FlowModifier = flow_modifier;
+		m_MaxTime = max_time;
+		m_ParticleName = particle_name;
+		
+		//CreateBleedSymptom();
+		if (!GetGame().IsDedicatedServer())
+		{	
+			CreateParticle();
+			StartSourceBleedingIndication();
+
+		}
+	}
+
+	void ~BleedingSource()
+	{
+		if (m_BloodParticle)
+			RemoveParticle();
+		
+		RemoveDebugShape();
+		
+		StopSourceBleedingIndication(!m_Player || !m_Player.IsAlive());
+	}
+	
+	void SetType(eBleedingSourceType type)
+	{
+		m_Type = type;
+	}
+	
+	eBleedingSourceType GetType()
+	{
+		return m_Type;
+	}
+	
+	int GetActiveTime()
+	{
+		return m_ActiveTime;
+	}
+	
+	void SetActiveTime(int time)
+	{
+		m_ActiveTime = time;
+	}
+	
+	int GetBit()
+	{
+		return m_Bit;
+	}
+	
+	void CreateParticle()
+	{
+		int boneIdx = m_Player.GetBoneIndexByName(m_Bone);
+		m_BleedingEffect = EffectParticle.Cast(m_ParticleName.ToType().Spawn());
+		if (m_BleedingEffect)
+		{
+			SEffectManager.PlayInWorld( m_BleedingEffect, "0 0 0" );
+			m_BloodParticle = m_BleedingEffect.GetParticle();
+			m_BloodParticle.SetOrientation(m_Orientation);
+			vector pos;
+			pos += m_Offset;
+			m_BloodParticle.SetPosition(pos);
+			float time = Math.RandomFloat01() * 2;
+			//time = time;
+			m_BloodParticle.SetParameter(-1, EmitorParam.CURRENT_TIME, time);
+			//m_BloodParticle.SetParameter(1, EmitorParam.CURRENT_TIME, time);
+			
+			m_Player.AddChild(m_BloodParticle, boneIdx);
+			return;
+		}
+		else
+		{
+			Error("bleeding source: failed to spawn the particle: "+m_ParticleName);
+		}
+	}
+	
+	void RemoveParticle()
+	{
+		SEffectManager.DestroyEffect(m_BleedingEffect);
+	}
+
+	void OnUpdateServer(float deltatime, float blood_scale, bool no_blood_loss )
+	{
+		m_ActiveTime += deltatime;
+		
+		if (m_ActiveTime >= m_MaxTime)
+		{
+			if (m_Player.GetBleedingManagerServer() && !m_DeleteRequested)
+			{
+				m_Player.GetBleedingManagerServer().RequestDeletion(GetBit());//add yourself to a list of sources to be deleted
+				m_DeleteRequested = true;
+			}
+		}
+		if ( !no_blood_loss )
+		{
+			float flow = m_FlowModifier;
+			switch ( m_Type )
+			{
+				case eBleedingSourceType.NORMAL:
+				{
+					//do nothing
+					break;
+				}
+				case eBleedingSourceType.CONTAMINATED:
+				{
+					flow *= PlayerConstants.BLEEDING_SOURCE_BURN_MODIFIER;
+				}
+			}
+			m_Player.AddHealth("GlobalHealth","Blood", (PlayerConstants.BLEEDING_SOURCE_BLOODLOSS_PER_SEC * blood_scale * deltatime * flow) );
+		}
+	}
+	
+	void StartSourceBleedingIndication()
+	{
+		if (m_Player.IsControlledPlayer())
+		{
+			#ifdef DIAG_DEVELOPER
+			if (DbgBleedingIndicationStaticInfo.m_DbgEnableBleedingIndication)
+			{
+			#endif
+				Param4<bool,int,vector,bool> par = new Param4<bool,int,vector,bool>(true,m_Bit,"0 0 0",false);
+				GetGame().GetMission().GetEffectWidgets().AddActiveEffects({EffectWidgetsTypes.BLEEDING_LAYER});
+				GetGame().GetMission().GetEffectWidgets().UpdateWidgets(EffectWidgetsTypes.BLEEDING_LAYER,0,par);
+			#ifdef DIAG_DEVELOPER
+			}
+			#endif
+		}
+	}
+	
+	void StopSourceBleedingIndication(bool instant = false)
+	{
+		if ( m_Player && m_Player.IsControlledPlayer() && GetGame() && (!GetGame().IsDedicatedServer()) )
+		{
+			Param4<bool,int,vector,bool> par = new Param4<bool,int,vector,bool>(false,m_Bit,"0 0 0",instant);
+			GetGame().GetMission().GetEffectWidgets().UpdateWidgets(EffectWidgetsTypes.BLEEDING_LAYER,0,par);
+		}
+	}
+	
+	void DrawDebugShape()
+	{
+		RemoveDebugShape();
+		
+		Particle p = m_BleedingEffect.GetParticle();
+		vector pos = p.GetPosition();
+		m_DebugShape = Debug.DrawSphere(pos, 0.009, COLOR_BLUE, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER);
+		vector arrow_to = m_BloodParticle.GetOrientation();
+		arrow_to = arrow_to.AnglesToVector();
+		arrow_to = -arrow_to * 0.3;
+		arrow_to = pos + arrow_to;
+		
+		m_DebugShape1 = Debug.DrawArrow(pos, arrow_to, 0.1, COLOR_GREEN);
+	}
+	
+	void RemoveDebugShape()
+	{
+		if (m_DebugShape)
+		{
+			Debug.RemoveShape(m_DebugShape);
+		}
+		
+		if (m_DebugShape1) 
+		{
+			Debug.RemoveShape(m_DebugShape1);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourceLocation.c b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourceLocation.c
new file mode 100644
index 0000000000000000000000000000000000000000..6209d4db3ab600e09d652fcf64042337f7120a00
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourceLocation.c
@@ -0,0 +1,12 @@
+class BleedingSourceLocation
+{
+	void BleedingSourceLocation()
+	{
+
+	}
+
+	void ~BleedingSourceLocation()
+	{
+	
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourceZone.c b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourceZone.c
new file mode 100644
index 0000000000000000000000000000000000000000..695aa909c454a1835314b5b35f53a85050372e2b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourceZone.c
@@ -0,0 +1,82 @@
+class BleedingSourceZone
+{
+	string 		m_FireSelectionName;
+	int			m_Bit;
+	vector		m_EmitterOffset;
+	vector		m_EmitterOrientation;
+	string		m_Bone;
+	float		m_FlowModifier;
+	int 		m_MaxTime;
+	string		m_ParticleName;
+	int			m_InventorySlotLocation;
+	
+	void BleedingSourceZone(string selection_name, int bit, vector offset, vector orientation, string bone, int max_time, float flow_modifier, string particle_name)
+	{
+		m_FireSelectionName = selection_name;
+		m_Bit = bit;
+		m_EmitterOffset = offset;
+		m_EmitterOrientation = orientation;
+		m_Bone = bone;
+		m_FlowModifier = flow_modifier;
+		m_MaxTime = max_time;
+		m_ParticleName = particle_name;
+	}
+
+	//which inv location is associated(is covering) with this bleeding source ?
+	void SetInvLocation(int inv_slot)
+	{
+		m_InventorySlotLocation = inv_slot;
+	} 
+	
+	int GetInvLocation()
+	{
+		return m_InventorySlotLocation;
+	}
+
+	void ~BleedingSourceZone()
+	{
+	
+	}
+	
+	string GetSelectionName()
+	{
+		return m_FireSelectionName;
+	}
+	
+	int GetMaxTime()
+	{
+		return m_MaxTime;
+	}
+	
+	string GetParticleName()
+	{
+		return m_ParticleName;
+	}
+	
+	int GetBit()
+	{
+		return m_Bit;
+	}
+	
+	float GetFlowModifier()
+	{
+		return m_FlowModifier;
+	}
+	
+	vector GetOrientation()
+	{
+		return m_EmitterOrientation;
+	}
+		
+	vector GetOffset()
+	{
+		return m_EmitterOffset;
+	}
+	
+	string GetBoneName()
+	{
+		return m_Bone;
+	}
+	
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerBase.c b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f9a82cfcd30b17ecad0d92d446a713c0d03b3489
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerBase.c
@@ -0,0 +1,334 @@
+class BleedingSourcesManagerBase
+{
+	ref map<int, ref BleedingSource> m_BleedingSources = new map<int, ref BleedingSource>;
+	ref map<string, ref BleedingSourceZone> m_BleedingSourceZone = new map<string, ref BleedingSourceZone>;
+	ref map<int, int> m_BleedingSourcesByLocation = new map<int, int>;
+	static ref map<int, int> m_BleedingSourcesZonesMaskByLocation = new map<int, int>;//for each inventory location, keep a bitmask where a bit is set to 1 for each bleeding source zone that belongs to that location
+	static ref set<int> m_BleedingSourcesLocationsList = new set<int>;
+	ItemBase m_Item;//item used to remove the bleeding source
+	PlayerBase m_Player;
+	//ref map<string, int> m_FireGeomToBit = new map<string, int>;
+	ref map<int, string> m_BitToFireGeom = new map<int, string>;
+	protected int m_Bit;
+	int m_BitOffset = 0;
+	
+	void BleedingSourcesManagerBase( PlayerBase player )
+	{
+		m_Player = player;
+		Init();
+	}
+	
+	protected void Init()
+	{
+		//dmgZone_head
+		RegisterBleedingZoneEx("Head",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 0 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.MASK);
+		//dmgZone_torso
+		RegisterBleedingZoneEx("Neck", PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL,"", "-180 0 0" , "0.02 -0.05 0.05", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.HEADGEAR);
+		RegisterBleedingZoneEx("Pelvis",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -135 0" , "0 0.12 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("Spine",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 55 0" , "0 -0.1 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("Spine1",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 155 0" , "0 -0.1 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("Spine2",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 55 0" , "0 -0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("Spine3",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 155 0" , "0 -0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH, "BleedingSourceEffect",InventorySlots.BODY);
+		//dmgZone_leftArm
+		RegisterBleedingZoneEx("LeftShoulder",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect", InventorySlots.BODY);
+		RegisterBleedingZoneEx("LeftArm", PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "","0 90 90" , "0 -0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("LeftArmRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("LeftForeArm",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		//dmgZone_rightArm
+		RegisterBleedingZoneEx("RightShoulder",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("RightArm", PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL,"", "0 -90 0" , "0 0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("RightArmRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		RegisterBleedingZoneEx("RightForeArm",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.05 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.BODY);
+		//dmgZone_leftHand
+		RegisterBleedingZoneEx("LeftForeArmRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0.1 0 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW, "BleedingSourceEffectLight", InventorySlots.GLOVES);
+		//dmgZone_rightHand
+		RegisterBleedingZoneEx("RightForeArmRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "-0.1 0 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW, "BleedingSourceEffectLight", InventorySlots.GLOVES);
+		//dmgZone_leftLeg
+		RegisterBleedingZoneEx("LeftLeg",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		RegisterBleedingZoneEx("LeftLegRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		RegisterBleedingZoneEx("LeftUpLeg",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.12 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		RegisterBleedingZoneEx("LeftUpLegRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM , "BleedingSourceEffect",InventorySlots.LEGS);
+		//dmgZone_rightLeg
+		RegisterBleedingZoneEx("RightLeg",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.06 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		RegisterBleedingZoneEx("RightLegRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		RegisterBleedingZoneEx("RightUpLeg",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.12 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		RegisterBleedingZoneEx("RightUpLegRoll",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.06 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM, "BleedingSourceEffect",InventorySlots.LEGS);
+		//dmgZone_leftFoot
+		RegisterBleedingZoneEx("LeftFoot",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 180 0" , "0 0 0.035", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW, "BleedingSourceEffectLight", InventorySlots.LEGS);
+		RegisterBleedingZoneEx("LeftToeBase",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 -90 0" , "0 0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW, "BleedingSourceEffect",InventorySlots.FEET);
+		//dmgZone_rightFoot
+		RegisterBleedingZoneEx("RightFoot",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 0 0" , "0 0 -0.035", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW, "BleedingSourceEffectLight", InventorySlots.LEGS);
+		RegisterBleedingZoneEx("RightToeBase",PlayerConstants.BLEEDING_SOURCE_DURATION_NORMAL, "", "0 90 0" , "0 -0.07 0", PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW, "BleedingSourceEffect", InventorySlots.FEET);
+	}
+	
+	protected void SetItem(ItemBase item)
+	{
+		m_Item = item;
+	}
+	
+	
+	set<int> GetBleedingSourcesLocations()
+	{
+		return m_BleedingSourcesLocationsList;
+	}
+	
+	
+	//for inventory location, get the active bits
+	int GetBleedingSourceBitsByInvLocation(int inv_location)
+	{
+		if (m_BleedingSourcesByLocation.Contains(inv_location))
+		{
+			return m_BleedingSourcesByLocation.Get(inv_location);
+		}
+
+		return 0;
+	}
+
+	//for inventory location, get the active bits
+	int GetFreeBleedingSourceBitsByInvLocation(int inv_location)
+	{
+		if (m_BleedingSourcesZonesMaskByLocation.Contains(inv_location))
+		{
+			return (~m_BleedingSourcesZonesMaskByLocation.Get(inv_location) & GetBleedingSourceBitsByInvLocation(inv_location)) | (m_BleedingSourcesZonesMaskByLocation.Get(inv_location) & ~GetBleedingSourceBitsByInvLocation(inv_location));//xor
+		}
+
+		return 0;
+	}
+	
+	bool IsBleedingSourceActive(string name)
+	{
+		name.ToLower();
+		int bit = GetBitFromSelectionName(name);
+
+		return m_Player.GetBleedingBits() & bit;
+	}
+	
+	
+	protected int GetBitFromSelectionID(int id)
+	{
+		CachedObjectsArrays.ARRAY_STRING.Clear();
+		m_Player.GetActionComponentNameList(id, CachedObjectsArrays.ARRAY_STRING, "fire");
+		
+		for (int i = 0; i < CachedObjectsArrays.ARRAY_STRING.Count(); i++)
+		{
+			/*
+			string name = CachedObjectsArrays.ARRAY_STRING.Get(i);
+			PrintString(name);
+			*/
+			int bit = GetBitFromSelectionName(CachedObjectsArrays.ARRAY_STRING.Get(i));
+			if (  bit !=0 )
+			{
+				return bit;
+			}
+		}
+		return 0;
+	}
+	
+	protected BleedingSourceZone GetBleedingSourceMeta(int bit)
+	{
+		return m_BleedingSourceZone.Get(GetSelectionNameFromBit(bit));
+	}
+	
+	int GetRegisteredSourcesCount()
+	{
+		return m_BitOffset;
+	}
+	
+	protected void RegisterBleedingZoneEx(string name, int max_time, string bone = "", vector orientation = "0 0 0", vector offset = "0 0 0", float flow_modifier = 1, string particle_name = "BleedingSourceEffect", int inv_location = 0)
+	{
+		if ( m_BitOffset == BIT_INT_SIZE)
+		{
+			Error("Too many bleeding sources, max is "+BIT_INT_SIZE.ToString());
+		}
+		else
+		{
+			name.ToLower();
+			//PrintString(name);
+			//int bit = Math.Pow(2, m_BitOffset);
+			m_Bit = 1 << m_BitOffset;
+			//PrintString(bit.ToString());
+			string bone_name = bone;
+			
+			if (bone_name == "")
+			{
+				bone_name = name;
+			}
+			
+			m_BleedingSourceZone.Insert(name, new BleedingSourceZone(name, m_Bit, offset, orientation, bone_name, max_time, flow_modifier, particle_name));
+			m_BleedingSourceZone.Get(name).SetInvLocation(inv_location);
+			m_BitToFireGeom.Insert(m_Bit, name);
+			m_BleedingSourcesZonesMaskByLocation.Set( inv_location, m_BleedingSourcesZonesMaskByLocation.Get(inv_location) | m_Bit);//set a bit to 1 to already existing bitmask for that location
+			m_BleedingSourcesLocationsList.Insert(inv_location);
+			m_BitOffset++;
+		}
+	}
+	protected void RegisterBleedingZone(string name, int max_time, string bone = "", vector orientation = "0 0 0", vector offset = "0 0 0", float flow_modifier = 1, string particle_name = "BleedingSourceEffect")
+	{
+		RegisterBleedingZoneEx(name, max_time, bone, orientation, offset, flow_modifier, particle_name);
+	}
+	
+	void RemoveAllSources()
+	{
+		//int count = m_BleedingSources.Count();
+		while (m_BleedingSources.Count() > 0 )
+		{
+			int bit = m_BleedingSources.GetKey(0);
+			RemoveBleedingSource(bit);
+		}
+	}
+	
+	protected int GetBitFromSelectionName(string name)
+	{
+		if (!m_BleedingSourceZone.Get(name))
+		{
+			return 0;
+		}
+		return m_BleedingSourceZone.Get(name).GetBit();
+	}	
+	
+	protected string GetSelectionNameFromBit(int bit)
+	{
+		return m_BitToFireGeom.Get(bit);
+	}
+	
+	bool AttemptAddBleedingSource(int component)
+	{
+		int bit = GetBitFromSelectionID(component);
+		
+		if ( bit == 0 )
+		{
+			return false;
+		}
+		
+		if ( CanAddBleedingSource(bit) )
+		{
+			AddBleedingSource(bit);
+			return true;
+		}
+		return false;
+	}
+	
+	bool AttemptAddBleedingSourceBySelection(string selection_name)
+	{
+		selection_name.ToLower();
+		int bit = GetBitFromSelectionName(selection_name);
+		
+		if ( bit == 0 )
+		{
+			return false;
+		}
+		
+		if ( CanAddBleedingSource(bit) )
+		{
+			AddBleedingSource(bit);
+			return true;
+		}
+		return false;
+	}
+	
+	
+	bool AttemptAddBleedingSourceDirectly(int bit, eBleedingSourceType type = eBleedingSourceType.NORMAL, int context = 0)
+	{
+		if(CanAddBleedingSource(bit))
+		{
+			AddBleedingSourceEx(bit, type, context);
+			return true;
+		}  
+		return false;
+	}
+	
+	
+	protected bool CanAddBleedingSource(int bit)
+	{
+		if (!GetBleedingSourceMeta(bit)) 
+		{
+			return false;
+		}
+		if ((m_Player.GetBleedingBits() & bit) == 0)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	protected void AddBleedingSourceEx(int bit, eBleedingSourceType type = eBleedingSourceType.NORMAL, int context = 0)
+	{
+		AddBleedingSource(bit);
+		m_BleedingSources.Get(bit).SetType(type);
+	}
+	
+	protected void AddBleedingSource(int bit)
+	{
+		BleedingSourceZone bsz = GetBleedingSourceMeta(bit);
+		vector orientation = bsz.GetOrientation();
+		vector offset = bsz.GetOffset();
+		string bone_name =  bsz.GetBoneName();
+		float flow_modifier = bsz.GetFlowModifier();
+		int max_time = bsz.GetMaxTime();
+		string particle_name = bsz.GetParticleName();
+		int inventory_loc = bsz.GetInvLocation();
+		m_BleedingSourcesByLocation.Set(inventory_loc, (m_BleedingSourcesByLocation.Get(inventory_loc) | bit));
+		m_BleedingSources.Insert(bit, new BleedingSource(m_Player, bit,bone_name, orientation, offset, max_time, flow_modifier, particle_name) );
+	}
+	
+	int GetBleedingSourceActiveTime(int bit)
+	{
+		int time = -1;
+		if (m_BleedingSources.Contains(bit))
+		{
+			time = m_BleedingSources.Get(bit).GetActiveTime();
+		}
+		return time;
+	}
+	
+	void SetBleedingSourceActiveTime(int bit, int time)
+	{
+		if (m_BleedingSources.Contains(bit))
+		{
+			m_BleedingSources.Get(bit).SetActiveTime(time);
+		}
+	}
+	
+	void SetBleedingSourceType(int bit, eBleedingSourceType type)
+	{
+		if (m_BleedingSources.Contains(bit))
+		{
+			m_BleedingSources.Get(bit).SetType(type);
+		}
+	}	
+	eBleedingSourceType GetBleedingSourceType(int bit)
+	{
+		if (m_BleedingSources.Contains(bit))
+		{
+			return m_BleedingSources.Get(bit).GetType();
+		}
+		return -1;
+	}
+	
+	protected bool RemoveBleedingSource(int bit)
+	{
+		if (m_BleedingSources.Contains(bit))
+		{
+			BleedingSourceZone bsz = GetBleedingSourceMeta(bit);
+			int inventory_loc = bsz.GetInvLocation();
+			m_BleedingSourcesByLocation.Set(inventory_loc, (m_BleedingSourcesByLocation.Get(inventory_loc) & ~bit));//deactivate the bit
+			m_BleedingSources.Remove(bit);
+			return true;
+		}
+		return false;
+	}
+
+	int GetBleedingSourcesCount()
+	{
+		return m_BleedingSources.Count();
+	}
+	
+	/*void ChangeBleedingIndicatorVisibility(bool visible)
+	{
+		int count = m_BleedingSources.Count();
+		for (int i = 0; i < count; i++)
+		{
+			m_BleedingSources.GetElement(i).ToggleSourceBleedingIndication(visible);
+		}
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerRemote.c b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerRemote.c
new file mode 100644
index 0000000000000000000000000000000000000000..dc695b45bfbdd83525213e44d0a589a25b1047f2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerRemote.c
@@ -0,0 +1,266 @@
+//this is instantiated on the client for both the controlled character, as well as the remote characters
+class BleedingSourcesManagerRemote extends BleedingSourcesManagerBase
+{
+	int m_BleedingBits;
+	bool m_ShowDiag;
+	bool m_ShowingDiag;
+	bool m_ShowingDiagDraw;
+	Shape m_Point;
+	bool m_EnableHitIndication = false;
+	
+	override protected void Init()
+	{
+		super.Init();
+		
+		if (GetGame().GetMission().GetEffectWidgets()/* && m_Player.IsControlledPlayer()*/)
+		{
+			Param3<bool,int,float> par = new Param3<bool,int,float>(true,0,0);
+			GetGame().GetMission().GetEffectWidgets().RegisterGameplayEffectData(EffectWidgetsTypes.BLEEDING_LAYER,par);
+		}
+	}
+	
+	override protected void RegisterBleedingZoneEx(string name, int max_time, string bone = "", vector orientation = "0 0 0", vector offset = "0 0 0", float flow_modifier = 1, string particle_name = "BleedingSourceEffect", int inv_location = 0)
+	{
+		super.RegisterBleedingZoneEx(name,max_time,bone,orientation,offset,flow_modifier,particle_name,inv_location);
+		
+		if (GetGame().GetMission().GetEffectWidgets()/* && m_Player.IsControlledPlayer()*/)
+		{
+			Param3<bool,int,float> par = new Param3<bool,int,float>(false,m_Bit,flow_modifier);
+			GetGame().GetMission().GetEffectWidgets().RegisterGameplayEffectData(EffectWidgetsTypes.BLEEDING_LAYER,par);
+		}
+	}
+	
+	void OnVariablesSynchronized(int current_bits)
+	{
+		if (current_bits != m_BleedingBits)
+		{
+			if (m_BleedingBits == 0)
+			{
+				m_Player.OnBleedingBegin();
+			}
+			OnBleedingBitsUpdate(m_BleedingBits, current_bits);
+			m_BleedingBits = current_bits;
+			if (m_BleedingBits == 0)
+			{
+				m_Player.OnBleedingEnd();
+			}
+		}
+	}
+	
+	void Reload()
+	{
+		m_BleedingSourceZone.Clear();
+		m_BitOffset = 0;
+		Init();
+		int bit_offset = 0;
+		
+		for (int i = 0; i < BIT_INT_SIZE; i++)
+		{
+			int bit = 1 << bit_offset;
+			bit_offset++;
+			if ( (bit & m_BleedingBits) != 0 )
+			{
+				RemoveBleedingSource(bit);
+				AddBleedingSource(bit);
+			}
+		}
+	}
+	
+	
+	override protected void AddBleedingSource(int bit)
+	{
+		super.AddBleedingSource(bit);
+		if (GetGame().IsMultiplayer())
+			m_Player.OnBleedingSourceAdded();
+	}
+	
+	override protected bool RemoveBleedingSource(int bit)
+	{
+		if (super.RemoveBleedingSource(bit))
+		{
+			if (GetGame().IsMultiplayer())
+				m_Player.OnBleedingSourceRemovedEx(m_Item);
+			return true;
+		}
+		return false;
+	}
+
+	void OnBleedingBitsUpdate(int old_mask, int new_mask)
+	{
+		for (int i = 0; i < 32; i++)
+		{
+			int compare_bit = 1 << i;
+			int new_compare_result_bit = compare_bit & new_mask;
+			int old_compare_result_bit = compare_bit & old_mask;
+			
+			if ( new_compare_result_bit )
+			{
+				if ( !(new_compare_result_bit & old_mask))
+				{
+					//a different active bit in the new mask
+					AddBleedingSource(new_compare_result_bit);
+				}
+			}
+			else
+			{
+				if ( new_compare_result_bit != old_compare_result_bit )
+				{
+					RemoveBleedingSource(old_compare_result_bit);
+				}
+			}
+		}
+	}
+	
+	int GetBleedingSourceCountRemote()
+	{
+		int bleeding_source_count = 0;
+		int pow = 0;
+		
+		for (int i = 0; i < BIT_INT_SIZE ; i++)
+		{
+			int bit = Math.Pow(2, pow);
+			pow++;
+			if ( (m_BleedingBits & bit) != 0)
+			{
+				bleeding_source_count++;
+			}
+		}
+		
+		return bleeding_source_count;
+	}
+	
+	void SetDiag(bool value)
+	{
+		m_ShowDiag = value;
+		return;
+		
+		int boneIdx = m_Player.GetBoneIndexByName("RightArmExtra");
+
+		if ( boneIdx != -1 )
+		{
+		  Object linkedObject = GetGame().CreateObject("Ammo_ArrowBolt", "0 0 0");
+		
+		//linkedObject.SetPosition("0 1 0");
+		//linkedObject.SetOrientation("0 90 0");
+		  /*
+		
+		  Set local space transform for linked object
+		
+		  */
+			
+			BleedingSourceEffect eff = new BleedingSourceEffect();
+			eff.SetAutodestroy(true);
+			SEffectManager.PlayInWorld( eff, "0 0 0" );
+			Particle p = eff.GetParticle();
+			//p.SetOrientation("0 90 0");
+			m_Player.AddChild(p, boneIdx);
+		
+		 	 m_Player.AddChild(linkedObject, boneIdx);
+		}
+	
+	}
+	
+	void OnUpdate()
+	{
+		#ifndef NO_GUI
+		if (m_ShowDiag)
+		{
+			DisplayDebug();
+			DisplayVisualDebug();
+		}
+		else if ( m_ShowingDiag || m_ShowingDiagDraw )
+		{
+			if (m_ShowingDiag)
+				CleanDebug();
+			if (m_ShowingDiagDraw)
+				CleanVisualDebug();
+		}
+		#endif
+	}
+	
+	void DisplayDebug()
+	{	
+		m_ShowingDiag = true;
+		
+		DbgUI.BeginCleanupScope();
+        DbgUI.Begin("Bleeding Sources", 50, 50);
+		
+		int pow = 0;
+		
+		bool anyBleedingSourceActive = false;
+		
+		for (int i = 0; i < BIT_INT_SIZE ; i++)
+		{
+			int bit = Math.Pow(2, pow);
+			pow++;
+			if ( (m_BleedingBits & bit) != 0)
+			{
+				BleedingSourceZone bsz = GetBleedingSourceMeta(bit);
+				
+				string name = GetSelectionNameFromBit(bit);
+				string slot_name =  InventorySlots.GetSlotName(bsz.GetInvLocation());
+				DbgUI.Text(name + "| slot name: "+ slot_name);
+				anyBleedingSourceActive = true;
+			}
+		}
+		
+		if (!anyBleedingSourceActive)
+		{
+			DbgUI.Text("Currently no bleeding sources are active.");
+		}
+		
+        DbgUI.End();
+        DbgUI.EndCleanupScope();
+	}
+	
+	void CleanDebug()
+	{
+		m_ShowingDiag = false;
+		
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin("Bleeding Sources", 50, 50);
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+	
+	void DisplayVisualDebug()
+	{
+		/*
+		if(m_Point) 
+		{
+			Debug.RemoveShape(m_Point);
+		}
+		
+		int boneIdx = m_Player.GetBoneIndexByName("LeftKneeExtra");
+		int pointIdx = m_Player.GetMemoryPointIndex("lknee");
+		
+		vector posLS = DayZPlayerUtils.GetMemoryPointPositionBoneRelative(m_Player, boneIdx, pointIdx);
+		
+		vector pTm[4];
+		m_Player.GetBoneTransformMS(boneIdx, pTm);
+		vector posMS = posLS.Multiply4(pTm);
+		
+		vector pos = m_Player.ModelToWorld(posMS);
+		m_Point = Debug.DrawSphere(pos, 0.1, COLOR_RED);
+		*/
+		
+		m_ShowingDiagDraw = true;
+		
+		int bsCount = m_BleedingSources.Count();
+		for (int i = 0; i < bsCount; ++i)
+		{
+			m_BleedingSources.GetElement(i).DrawDebugShape();
+		}
+	}
+	
+	void CleanVisualDebug()
+	{
+		m_ShowingDiagDraw = false;
+		
+		int bsCount = m_BleedingSources.Count();
+		for (int i = 0; i < bsCount; ++i)
+		{
+			m_BleedingSources.GetElement(i).RemoveDebugShape();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerServer.c b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..6871017a120a35db0cec241d1a02a1dfa88ac713
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BleedingSources/BleedingSourcesManagerServer.c
@@ -0,0 +1,296 @@
+class BleedingSourcesManagerServer extends BleedingSourcesManagerBase
+{
+	const float TICK_INTERVAL_SEC = 3;
+	float 	m_Tick;
+	bool	m_DisableBloodLoss = false;
+	ref array<int> m_DeleteList = new array<int>;
+	
+	const int STORAGE_VERSION = 103;
+	
+	protected BleedingSourceZone GetBleedingSourceZone(int bit)
+	{
+		return m_BleedingSourceZone.Get(GetSelectionNameFromBit(bit));
+	}
+	
+	int GetStorageVersion()
+	{
+		return STORAGE_VERSION;
+	}
+	
+	void RequestDeletion(int bit)
+	{
+		m_DeleteList.Insert(bit);
+	}
+	
+	override protected void AddBleedingSource(int bit)
+	{
+		#ifdef DEVELOPER
+		if (m_Player && !m_Player.GetAllowDamage())//full invincibility prevents bleeding source creation
+			return;
+		#endif
+		
+		m_Player.SetBleedingBits(m_Player.GetBleedingBits() | bit );
+		super.AddBleedingSource(bit);
+		m_Player.OnBleedingSourceAdded();
+	}
+	
+	override protected bool RemoveBleedingSource(int bit)
+	{
+		if(!super.RemoveBleedingSource(bit))
+		{
+			Error("Failed to remove bleeding source:" + bit);
+		}
+		else
+		{
+			m_Player.OnBleedingSourceRemovedEx(m_Item);
+		}
+		
+		int inverse_bit_mask = ~bit;
+		m_Player.SetBleedingBits(m_Player.GetBleedingBits() & inverse_bit_mask );
+		
+		
+		//infection moved here to allow proper working in singleplayer
+		float chanceToInfect;
+		
+		if (m_Item)
+		{
+			chanceToInfect = m_Item.GetInfectionChance(0, CachedObjectsParams.PARAM1_BOOL);
+		}
+		else
+		{
+			chanceToInfect = PlayerConstants.BLEEDING_SOURCE_CLOSE_INFECTION_CHANCE;
+		}
+		float diceRoll = Math.RandomFloat01();
+		if (diceRoll < chanceToInfect)
+		{
+			m_Player.InsertAgent(eAgents.WOUND_AGENT);
+		}
+		
+		m_Item = null;//reset, so that next call, if induced by self-healing, will have no item
+		
+		return true;
+	}
+	
+	void RemoveAnyBleedingSource()
+	{
+		int bleeding_sources_bits = m_Player.GetBleedingBits();
+		int rightmost_bit = bleeding_sources_bits & (-bleeding_sources_bits);
+		
+		RemoveBleedingSource(rightmost_bit);
+	}
+	
+	void RemoveMostSignificantBleedingSource()
+	{
+		int bit = GetMostSignificantBleedingSource();
+		if( bit != 0)
+			RemoveBleedingSource(bit);
+	}
+	
+	void RemoveMostSignificantBleedingSourceEx(ItemBase item)
+	{
+		SetItem(item);
+		RemoveMostSignificantBleedingSource();
+	}
+	
+	int GetMostSignificantBleedingSource()
+	{
+		int bleeding_sources_bits = m_Player.GetBleedingBits();
+		
+		float highest_flow;
+		int highest_flow_bit;
+		int bit_offset;
+		
+		for(int i = 0; i < BIT_INT_SIZE; i++)
+		{
+			int bit = 1 << bit_offset;
+			
+			if( (bit & bleeding_sources_bits) != 0 )
+			{
+				BleedingSourceZone meta = GetBleedingSourceMeta(bit);
+				if(meta)
+				{
+					if( meta.GetFlowModifier() > highest_flow )
+					{
+						highest_flow = meta.GetFlowModifier();
+						highest_flow_bit = bit;
+						//Print(meta.GetSelectionName());
+					}
+				}
+			}
+			bit_offset++;
+		}
+		return highest_flow_bit;
+	}
+	
+	void OnTick(float delta_time)
+	{
+		m_Tick += delta_time;
+		if( m_Tick > TICK_INTERVAL_SEC )
+		{
+			while( m_DeleteList.Count() > 0 )
+			{
+				RemoveBleedingSource(m_DeleteList.Get(0));
+				m_DeleteList.Remove(0);
+			} 
+			
+			float blood_scale = Math.InverseLerp(PlayerConstants.BLOOD_THRESHOLD_FATAL, PlayerConstants.BLEEDING_LOW_PRESSURE_BLOOD, m_Player.GetHealth( "GlobalHealth", "Blood" ));
+			blood_scale = Math.Clamp( blood_scale, PlayerConstants.BLEEDING_LOW_PRESSURE_MIN_MOD, 1 );
+
+			for(int i = 0; i < m_BleedingSources.Count(); i++)
+			{
+				m_BleedingSources.GetElement(i).OnUpdateServer( m_Tick, blood_scale, m_DisableBloodLoss );
+			}
+			m_Tick = 0;
+		}
+	}
+	
+	void ActivateAllBS()
+	{
+		for(int i = 0; i < m_BleedingSourceZone.Count(); i++)
+		{
+			int bit = m_BleedingSourceZone.GetElement(i).GetBit();
+			if( CanAddBleedingSource(bit) )
+			{
+				AddBleedingSource(bit);
+			}
+		}
+	}
+	
+	//damage must be to "Blood" healthType
+	void ProcessHit(float damage, EntityAI source, int component, string zone, string ammo, vector modelPos)
+	{
+		float dmg_max = m_Player.GetMaxHealth(zone, "Blood");
+		float bleed_threshold = GetGame().ConfigGetFloat("CfgAmmo " + ammo + " DamageApplied bleedThreshold");
+		string damageTypeString = GetGame().ConfigGetTextOut("CfgAmmo " + ammo + " DamageApplied type");
+		bleed_threshold = Math.Clamp(bleed_threshold,0,1);
+		float bleedingChance;
+		bool createBleedingSource = false;
+		
+		// 'true' only when the damageTypeString is handled there
+		if (BleedChanceData.CalculateBleedChance(damageTypeString, damage, bleed_threshold,bleedingChance))
+		{
+			float roll = Math.RandomFloat01();
+			createBleedingSource = bleedingChance != 0 && bleedingChance >= roll;
+			
+			#ifdef DEVELOPER
+			if (LogManager.IsBleedingChancesLogEnable())
+			{	
+				Debug.BleedingChancesLog(roll.ToString(), "BleedingSourcesManagerServer" , "n/a", "bleeding random roll:");
+			}
+			#endif
+		}
+		else if (source && source.IsZombie())
+		{
+			int chance = Math.RandomInt(0,100);
+			if (chance <= damage)
+			{
+				createBleedingSource = true;
+			}
+		}
+		else if (damage > (dmg_max * (1 - bleed_threshold)) )
+		{
+			createBleedingSource = true;
+		}
+		
+		if (createBleedingSource)
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsBleedingChancesLogEnable())
+			{	
+				Debug.BleedingChancesLog("true", "BleedingSourcesManagerServer" , "n/a", "Attempting to create bleeding source");
+			}
+			#endif
+			AttemptAddBleedingSource(component);
+		}
+	}
+	
+	void DebugActivateBleedingSource(int source)
+	{
+		RemoveAllSources();
+		
+		if(source >= m_BleedingSourceZone.Count() || !m_BleedingSourceZone.GetElement(source)) return;
+		
+		int bit = m_BleedingSourceZone.GetElement(source).GetBit();
+		
+		if( bit && CanAddBleedingSource(bit) )
+		{
+			AddBleedingSource(bit);
+		}
+	}
+	
+	void SetBloodLoss(bool status)
+	{
+		m_DisableBloodLoss = status;
+	}
+	
+	void OnStoreSave( ParamsWriteContext ctx )
+	{
+		//int count = m_BleedingSources.Count();
+		int active_bits = m_Player.GetBleedingBits();
+		ctx.Write(active_bits);
+		
+		int bit_offset = 0;
+		for(int i = 0; i < BIT_INT_SIZE; i++)
+		{
+			int bit = 1 << bit_offset;
+			if( (bit & active_bits) != 0 )
+			{
+				int active_time = GetBleedingSourceActiveTime(bit);
+				eBleedingSourceType type = GetBleedingSourceType(bit);
+				
+				ctx.Write(active_time);
+				ctx.Write(type);
+			}
+			bit_offset++;
+		}
+	}
+
+	bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		int active_bits;
+		if(!ctx.Read(active_bits))
+		{
+			return false;
+		}
+	
+		int bit_offset = 0;
+		for(int i = 0; i < BIT_INT_SIZE; i++)
+		{
+			int bit = 1 << bit_offset;
+			if( (bit & active_bits) != 0 && CanAddBleedingSource(bit))
+			{
+				AddBleedingSource(bit);
+				int active_time = 0;
+				if(!ctx.Read(active_time))
+				{
+					return false;
+				}
+				else
+				{
+					SetBleedingSourceActiveTime(bit,active_time);
+				}
+				if( version >= 121 )//type was added in this version
+				{
+					eBleedingSourceType type = eBleedingSourceType.NORMAL;
+					if (!ctx.Read(type))
+					{
+						return false;
+					}
+					else
+					{
+						SetBleedingSourceType(bit,type);
+					}
+				}
+			}
+			bit_offset++;
+		}
+		return true;
+	}
+	
+	
+	void ~BleedingSourcesManagerServer()
+	{
+		if (m_Player && !m_Player.IsAlive())
+			RemoveAllSources();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/BloodyHands.c b/scripts/4_World/DayZ/Classes/BloodyHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..23e763f2794db755a07731b4fa9443a6e0ebe8c0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BloodyHands.c
@@ -0,0 +1,24 @@
+class BloodyHands
+{
+	string m_Materials[2];
+	
+	const int MATERIAL_TYPE_NORMAL = 0;
+	const int MATERIAL_TYPE_BLOODY = 1;
+
+	void BloodyHands( string normal_material, string bloody_material )
+	{
+		m_Materials[MATERIAL_TYPE_NORMAL] = normal_material;
+		m_Materials[MATERIAL_TYPE_BLOODY] = bloody_material;
+	}
+
+	string GetMaterial( int material_type )
+	{
+		return m_Materials[material_type];
+	}
+
+	void SetMaterial( int material_type, string material )
+	{
+		m_Materials[material_type] = material;
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/BulletHitReaction/BulletHitReaction.c b/scripts/4_World/DayZ/Classes/BulletHitReaction/BulletHitReaction.c
new file mode 100644
index 0000000000000000000000000000000000000000..644bed5302223306ec60b0044d38f4eda389aa97
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/BulletHitReaction/BulletHitReaction.c
@@ -0,0 +1,99 @@
+class DamageDealtEffect
+{
+	const float ALPHA_MIN = 0;
+	const float ALPHA_MAX = 1;
+	float m_HitDuration;
+	float m_BreakPoint;
+	float m_TimeActive;
+	PPERequester_HealthHitReaction m_Requester;
+	
+	void DamageDealtEffect()
+	{
+		m_HitDuration = 0.10;
+		m_BreakPoint = 0.05;
+		Class.CastTo(m_Requester, PPERequesterBank.GetRequester(PPERequester_HealthHitReaction));
+		//Print("=====================================================");
+		//Print("=====================================================");
+	}
+	
+	void ~DamageDealtEffect()
+	{
+		PPERequesterBank.GetRequester(PPERequester_HealthHitReaction).Stop();
+	}
+	
+	void Update(float deltatime)
+	{
+		float value;
+		
+		if( m_TimeActive <= m_BreakPoint )
+		{
+			value = Math.InverseLerp(0, m_BreakPoint, m_TimeActive);
+		}
+		else
+		{
+			float tmp_value = Math.InverseLerp(m_BreakPoint, m_HitDuration, m_TimeActive);
+			value = 1 - tmp_value;
+		}
+		m_TimeActive += deltatime;
+		value = Math.Clamp(value,0,1);
+		float val = Math.Lerp(ALPHA_MIN, ALPHA_MAX, value);
+		//Print(val);
+		m_Requester.SetHitIntensity(val);
+		
+		if(m_TimeActive >= m_HitDuration)
+		{
+			delete this;
+		}
+	}
+	
+}
+
+class EffectRadial
+{
+	
+	float m_TimeActive;
+	float m_Divisor = 16;
+	float m_Duration = 0.6;
+	PPERequester_PainBlur m_PPERequester;
+	
+	void EffectRadial(Param param1, Param param2)
+	{
+		if (param1)
+		{
+			Param2<float, float> p1 = Param2<float, float>.Cast(param1);
+			if (p1)
+			{
+				m_Divisor = p1.param1;
+				m_Duration = p1.param2;
+			}
+		}
+
+		if ( Class.CastTo( m_PPERequester, PPERequesterBank.GetRequester( PPERequesterBank.REQ_PAINBLUR ) ) )
+			m_PPERequester.Start();
+	}
+	
+	void ~EffectRadial()
+	{
+		if(m_PPERequester)
+			m_PPERequester.SetRadialBlur(0,0,0,0);
+	}
+
+	void Update(float deltatime)
+	{
+		
+		float time = Math.InverseLerp(0, m_Duration, m_TimeActive);	
+		float value = 1 - Easing.EaseInQuart(time);
+		float strenght = value / m_Divisor; //The divisor matches the ease curve used
+		
+		if(m_PPERequester)
+			m_PPERequester.SetRadialBlur(strenght, strenght, 1 - value, 1 - value);
+		
+		
+		
+		m_TimeActive += deltatime;
+		if(m_TimeActive >= m_Duration)
+		{
+			delete this;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/CameraShake.c b/scripts/4_World/DayZ/Classes/CameraShake.c
new file mode 100644
index 0000000000000000000000000000000000000000..fa79caf558e265f5e1a27051e2e6175916dd8113
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/CameraShake.c
@@ -0,0 +1,69 @@
+class CameraShake
+{
+	const float MIN_PLAYER_DISTANCE = 40;
+	
+	float m_Radius;
+	float m_RadiusDecaySpeed;
+	float m_RandomAngle;
+	float m_Time;
+	float m_InitLR;
+	float m_InitUD;
+	bool m_ToDelete;
+	float m_Smoothness;
+	float m_StregthFactor;
+	DayZPlayerImplement m_Player;
+	
+	void ~CameraShake()
+	{
+		if(m_Player)
+			m_Player.GetAimingModel().SetCamShakeValues(0, 0);
+
+	}
+	
+	void CameraShake( float strength_factor, float radius, float smoothness, float radius_decay_speed )
+	{
+		/*
+		
+		Print("-----------ON CREATE------------");
+		Print(camera_offset);
+		Print("-----------ON CREATE END------------");
+		*/
+		//m_Player = DayZPlayerImplement.Cast(player);
+		m_Player = DayZPlayerImplement.Cast(GetGame().GetPlayer());
+		m_StregthFactor = strength_factor;
+		//m_InitLR = lr_angle;
+		//m_InitUD = ud_angle;
+		m_Radius = radius;
+		m_RadiusDecaySpeed = radius_decay_speed;
+		m_Smoothness = smoothness;
+	}
+	
+	void Update(float delta_time, out float x_axis, out float y_axis)
+	{
+		if(m_ToDelete)
+			delete this;
+		
+		m_Radius -= delta_time * m_RadiusDecaySpeed; //diminish radius each frame
+		
+		if( m_RandomAngle >= 0 )
+		{
+			m_RandomAngle = -m_Radius + (Math.RandomFloat( -m_Radius / m_Smoothness, m_Radius / m_Smoothness));
+		}
+		else
+		{
+			m_RandomAngle = m_Radius + (Math.RandomFloat( -m_Radius / m_Smoothness, m_Radius / m_Smoothness));
+		}
+		
+		x_axis = m_RandomAngle * m_StregthFactor;
+		y_axis = m_RandomAngle * m_StregthFactor;
+
+		//Print(x_axis);
+		//Print(y_axis);
+		
+		if( m_Radius < 0.01 )
+		{
+			m_ToDelete = true;
+		}
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParam.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParam.c
new file mode 100644
index 0000000000000000000000000000000000000000..8d9f95ecda29ed11ec6fc2abda8ababd9144a508
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParam.c
@@ -0,0 +1,73 @@
+const int CFG_TYPE_STRING	= 0;
+const int CFG_TYPE_INT		= 1;
+const int CFG_TYPE_FLOAT	= 2;
+const int CFG_TYPE_BOOL		= 3;
+const int CFG_TYPE_ARRAY	= 4;
+const int CFG_TYPE_PARAM	= 5;
+
+class CfgParam: Managed
+{
+	protected string	m_ParamName;
+	protected string	m_ParamValueString;
+	
+	void CfgParam(string param_name)
+	{
+		m_ParamName	= param_name;
+	}
+	
+	void SetName(string param_name)
+	{
+		m_ParamName	= param_name;
+	}
+	
+	string GetName()
+	{
+		return m_ParamName;
+	}
+	
+	int GetType()
+	{
+		return -1;
+	}
+
+	bool IsArray()
+	{
+		return false;
+	}
+	
+	static CfgParam CreateParam(string name, int cfg_type)
+	{
+		CfgParam param;
+
+		switch (cfg_type)
+		{
+			case CFG_TYPE_STRING:
+			{
+				param = new CfgParamString(name);
+				break;
+			}
+			case CFG_TYPE_INT:
+			{
+				param = new CfgParamInt(name);
+				break;
+			}
+			case CFG_TYPE_FLOAT:
+			{
+				param = new CfgParamFloat(name);
+				break;
+			}
+			case CFG_TYPE_BOOL:
+			{
+				param = new CfgParamBool(name);
+				break;
+			}
+			case CFG_TYPE_ARRAY:
+			{
+				param = new CfgParamArray(name);
+				break;
+			}
+		}
+		
+		return param;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamArray.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamArray.c
new file mode 100644
index 0000000000000000000000000000000000000000..ad752df13e01c480e7003ccae501bdcc3169bc23
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamArray.c
@@ -0,0 +1,121 @@
+class CfgParamArray extends CfgParam
+{
+	private ref array<ref CfgParam> m_Values;
+	
+	void CfgParamArray(string param_name)
+	{
+		m_Values = new array<ref CfgParam>;
+	}
+	
+	void ~CfgParamArray()
+	{
+		if ( m_Values != NULL )
+		{
+			Clear();
+		}
+	}
+	
+	void Clear()
+	{
+		m_Values.Clear();
+	}
+	
+	array<ref CfgParam> GetValues()
+	{
+		return m_Values;
+	}
+	
+	CfgParam GetValue(int i)
+	{
+		return m_Values.Get(i);
+	}
+	
+	void InsertValue(CfgParam value)
+	{
+		if ( m_Values == NULL )
+		{
+			m_Values = new array<ref CfgParam>;
+		}
+		
+		m_Values.Insert(value);
+	}
+	
+	bool IsParamExist(string name, int cfg_type)
+	{
+		if ( m_Values == NULL )
+		{
+			m_Values = new array<ref CfgParam>;
+		}
+		
+		for ( int i = 0; i < m_Values.Count(); ++i )
+		{
+			CfgParam p = m_Values.Get(i);
+			
+			if ( name == p.GetName() )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool RenameParam(string name, int cfg_type, string new_name)
+	{
+		if ( m_Values == NULL )
+		{
+			m_Values = new array<ref CfgParam>;
+		}
+		
+		for ( int i = 0; i < m_Values.Count(); ++i )
+		{
+			CfgParam p = m_Values.Get(i);
+			
+			if ( name == p.GetName() )
+			{
+				p.SetName(new_name);
+				return true;
+			}
+		}
+		
+		return false;		
+	}
+	
+	CfgParam GetValueByName(string name, int cfg_type)
+	{
+		if ( m_Values == NULL )
+		{
+			m_Values = new array<ref CfgParam>;
+		}
+		
+		for ( int i = 0; i < m_Values.Count(); ++i )
+		{
+			CfgParam p = m_Values.Get(i);
+			
+			if ( name == p.GetName() )
+			{
+				return p;
+			}
+		}
+		
+		CfgParam param = CreateParam(name, cfg_type);
+		m_Values.Insert(param);
+		
+		return param;
+	}
+	
+	void SetParams(array<ref CfgParam> value_array)
+	{
+		m_Values = value_array;
+	}	
+	
+	bool IsValueArray()
+	{
+		return true;
+	}
+	
+	override int GetType()
+	{
+		return CFG_TYPE_ARRAY;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamBool.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamBool.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8f8283c1e8c579eaa5749d9091a271737642bfe
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamBool.c
@@ -0,0 +1,24 @@
+class CfgParamBool extends CfgParamType
+{	
+	private bool m_Value;
+	
+	void CfgParamBool(string param_name)
+	{
+		m_Value = false;
+	}
+	
+	void SetValue(bool value)
+	{
+		m_Value = value;
+	}
+	
+	bool GetValue()
+	{
+		return m_Value;
+	}
+	
+	override int GetType()
+	{
+		return CFG_TYPE_BOOL;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamFloat.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamFloat.c
new file mode 100644
index 0000000000000000000000000000000000000000..6aeaa0ab0062d98d657a511abdd940e04103b785
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamFloat.c
@@ -0,0 +1,24 @@
+class CfgParamFloat extends CfgParamType
+{	
+	private float m_Value;
+	
+	void CfgParamFloat(string param_name)
+	{
+		m_Value = 0;
+	}
+	
+	void SetValue(float value)
+	{
+		m_Value = value;
+	}
+	
+	float GetValue()
+	{
+		return m_Value;
+	}
+	
+	override int GetType()
+	{
+		return CFG_TYPE_FLOAT;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamInt.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamInt.c
new file mode 100644
index 0000000000000000000000000000000000000000..7c70d7e4fd72faacbfae4081899e84b4c8aadd12
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamInt.c
@@ -0,0 +1,24 @@
+class CfgParamInt extends CfgParamType
+{	
+	private int m_Value;
+	
+	void CfgParamInt(string param_name)
+	{
+		m_Value = 0;
+	}
+	
+	void SetValue(int value)
+	{
+		m_Value = value;
+	}
+	
+	int GetValue()
+	{
+		return m_Value;
+	}
+	
+	override int GetType()
+	{
+		return CFG_TYPE_INT;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamString.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamString.c
new file mode 100644
index 0000000000000000000000000000000000000000..3929178e4d27f8366da1b20ed74482dc3600afea
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamString.c
@@ -0,0 +1,24 @@
+class CfgParamString extends CfgParamType
+{	
+	private string m_Value;
+	
+	void CfgParamString(string param_name)
+	{
+		m_Value = STRING_EMPTY;
+	}
+	
+	void SetValue(string value)
+	{
+		m_Value = value;
+	}
+	
+	string GetValue()
+	{
+		return m_Value;
+	}
+	
+	override int GetType()
+	{
+		return CFG_TYPE_STRING;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamType.c b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamType.c
new file mode 100644
index 0000000000000000000000000000000000000000..46fea8e5c80cdfc1e4659e6a0c1ff09c6f9ecbb9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ConfigHandler/CfgParamType.c
@@ -0,0 +1,7 @@
+class CfgParamType extends CfgParam
+{	
+	void CfgParamType(string param_name)
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..b5a7e475f4788de8f2eaf417bb906145386d37bc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea.c
@@ -0,0 +1,73 @@
+class ContaminatedArea_Base : EffectArea
+{
+	override void OnPlayerEnterServer(PlayerBase player, EffectTrigger trigger)
+	{
+		super.OnPlayerEnterServer(player, trigger);
+		player.IncreaseContaminatedAreaCount();
+	}
+	
+	override void OnPlayerExitServer(PlayerBase player, EffectTrigger trigger)
+	{
+		super.OnPlayerExitServer(player, trigger);
+		player.DecreaseContaminatedAreaCount();
+	}
+}
+
+class ContaminatedArea_Static : ContaminatedArea_Base
+{
+	// ----------------------------------------------
+	// 				INITIAL SETUP
+	// ----------------------------------------------
+	
+	override void SetupZoneData(  EffectAreaParams params )
+	{
+		super.SetupZoneData( params );
+	}
+	
+	override void EEInit()
+	{
+		// We make sure we have the particle array
+		if ( !m_ToxicClouds )
+			m_ToxicClouds = new array<Particle>;
+		
+		SetSynchDirty();
+		
+		#ifdef DEVELOPER
+		// Debugs when placing entity by hand using internal tools
+		if ( GetGame().IsServer() && !GetGame().IsMultiplayer() )
+		{
+			Debug.Log("YOU CAN IGNORE THE FOLLOWING DUMP");
+			InitZone();
+			Debug.Log("YOU CAN USE FOLLOWING DATA PROPERLY");
+		}
+		#endif
+		
+		if ( GetGame().IsClient() && GetGame().IsMultiplayer() )
+			InitZone();
+		
+		super.EEInit();
+	}
+	
+	
+	override void InitZoneServer()
+	{
+		super.InitZoneServer();
+		
+		// We create the trigger on server
+		if ( m_TriggerType != "" )
+			CreateTrigger( m_Position, m_Radius );
+	}
+	
+	override void InitZoneClient()
+	{
+		super.InitZoneClient();
+		
+		// We spawn VFX on client
+		PlaceParticles( GetWorldPosition(), m_Radius, m_InnerRings, m_InnerSpacing, m_OuterRingToggle, m_OuterSpacing, m_OuterRingOffset, m_ParticleID );
+	}
+	
+	override void EEDelete( EntityAI parent )
+	{
+		super.EEDelete( parent );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedAreaLoader.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedAreaLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..ebe21b66e296ac4ecd68d48ec7fe4ff833ca6823
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedAreaLoader.c
@@ -0,0 +1,107 @@
+// This will be used to parse and load contaminated area related data
+class EffectAreaLoader
+{
+	private static string m_Path = "$mission:cfgeffectarea.json";
+	
+	static void CreateZones()
+	{
+		JsonDataContaminatedAreas effectAreaData;
+		
+		// We confirm the contaminated area configuration file exists in mission folder
+		if ( !FileExist( m_Path ) )
+		{
+			// We fallback to check in data and notify user file was not found in mission
+			PrintToRPT("[WARNING] :: [EffectAreaLoader CreateZones] :: No contaminated area file found in MISSION folder, your path is " + m_Path + " Attempting DATA folder"); // If the path is invalid, we warn the user
+			
+			m_Path = "";
+			GetGame().GetWorldName( m_Path );
+			m_Path = string.Format("dz/worlds/%1/ce/cfgeffectarea.json", m_Path );
+			
+			if ( !FileExist( m_Path ) )
+			{
+				PrintToRPT("[WARNING] :: [EffectAreaLoader CreateZones] :: No contaminated area file found in DATA folder, your path is " + m_Path); // If the path is invalid, we warn the user
+				return; // Nothing could be read, just end here
+			}
+		}
+		
+		// We load the data from file, in case of failure we notify user
+		effectAreaData = EffectAreaLoader.GetData();
+		if ( effectAreaData )
+		{
+			// Now that we have extracted the data we go through every declared area
+			//Debug.Log("Contaminated area JSON contains : " + effectAreaData.Areas.Count());
+			
+			for ( int i = 0; i < effectAreaData.Areas.Count(); i++ )
+			{
+				EffectAreaParams params = new EffectAreaParams();
+				
+				// We feed in all relevant data
+				params.m_ParamName = effectAreaData.Areas.Get( i ).AreaName;
+				string areaType = effectAreaData.Areas.Get( i ).Type;
+				params.m_ParamTriggerType = effectAreaData.Areas.Get( i ).TriggerType;
+				JsonDataAreaData data = effectAreaData.Areas.Get( i ).Data;
+				
+				// World level area data ( Trigger info, world particles, etc... )
+				vector pos = Vector( data.Pos[0], data.Pos[1], data.Pos[2] );
+				params.m_ParamRadius = data.Radius;
+				params.m_ParamPosHeight = data.PosHeight;
+				params.m_ParamNegHeight = data.NegHeight;
+				params.m_ParamInnerRings = data.InnerRingCount;
+				params.m_ParamInnerSpace = data.InnerPartDist;
+				params.m_ParamOuterToggle = data.OuterRingToggle;
+				params.m_ParamOuterSpace = data.OuterPartDist;
+				params.m_ParamOuterOffset = data.OuterOffset;
+				params.m_ParamVertLayers = data.VerticalLayers;
+				params.m_ParamVerticalOffset = data.VerticalOffset;
+				string particleName = data.ParticleName;
+				
+				// Local level area data ( Player particles and PPE )
+				JsonDataPlayerData playerData = effectAreaData.Areas.Get( i ).PlayerData;
+				string aroundPartName = playerData.AroundPartName;
+				string tinyPartName = playerData.TinyPartName;
+				string ppeRequesterType = playerData.PPERequesterType;
+				
+				// Conversion of particle name to ID for synchronization and loading
+				if (particleName != "")
+					params.m_ParamPartId = ParticleList.GetParticleID( particleName );
+				
+				if (aroundPartName != "")
+					params.m_ParamAroundPartId = ParticleList.GetParticleID( aroundPartName );
+				
+				if (tinyPartName != "")
+					params.m_ParamTinyPartId = ParticleList.GetParticleID( tinyPartName );
+				
+				params.m_ParamPpeRequesterType = ppeRequesterType;
+
+				EffectArea newZone; // Zones MUST inherit from EffectArea
+				
+				// We snap item position to ground before creating if specified Y is 0
+				if ( pos[1] == 0 )
+				{
+					pos[1] = GetGame().SurfaceRoadY( pos[0], pos[2] );
+					Class.CastTo( newZone, GetGame().CreateObjectEx( areaType, pos, ECE_PLACE_ON_SURFACE ) );
+				}
+				else
+					Class.CastTo( newZone, GetGame().CreateObjectEx( areaType, pos, ECE_NONE ) );
+				
+				// We created a new zone, we feed in the data to finalize setup
+				if ( newZone )
+					newZone.SetupZoneData( params );
+				else
+					Error("[WARNING] :: [EffectAreaLoader CreateZones] :: Cast failed, are you sure your class ( 'Type:' ) inherits from EffectArea and that there are no Typos?");
+			}
+		}
+		else
+			Error("[WARNING] :: [EffectAreaLoader CreateZones] :: Data could not be read, please check data and syntax"); // Most JSON related errors should be handled, but we have an extra check in case data could not be read
+	}
+	
+	static JsonDataContaminatedAreas GetData()
+	{
+		string errorMessage;
+		JsonDataContaminatedAreas data;
+		if (!JsonFileLoader<JsonDataContaminatedAreas>.LoadFile(m_Path, data, errorMessage))
+			ErrorEx(errorMessage);
+		
+		return data;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea_Dynamic.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea_Dynamic.c
new file mode 100644
index 0000000000000000000000000000000000000000..59aaf2ad4105bb7bb4312a376eb5a8d4da50f6cf
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea_Dynamic.c
@@ -0,0 +1,390 @@
+enum eAreaDecayStage
+{
+	INIT 			= 1, // The dynamic area is initializing
+	START 			= 2, // The dynamic area is starting
+	LIVE 			= 3, // The dynamic area is live
+	DECAY_START 	= 4, // The dynamic area decay has started
+	DECAY_END 		= 5, // The dynamic area will soon be deleted
+}
+
+// The parameters for the explosion light when creating dynamic area
+class ShellLight extends PointLightBase
+{
+	protected float m_DefaultBrightness = 10;
+	protected float m_DefaultRadius = 100;
+	
+	void ShellLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo(m_DefaultRadius);
+		SetBrightnessTo(m_DefaultBrightness);
+		SetFlareVisible(false);
+		SetAmbientColor(1.0, 1.0, 0.3);
+		SetDiffuseColor(1.0, 1.0, 0.3);
+		SetLifetime(0.15);
+		SetDisableShadowsWithinRadius(-1);
+		SetCastShadow( false );
+	}
+}
+
+// The dynamic Contaminated area, using it's own default settings
+class ContaminatedArea_Dynamic : ContaminatedArea_Base
+{
+	protected ref Timer 	m_StartupTimer;
+	protected ref Timer 	m_FXTimer;
+	protected FlareLight 	m_FlareLight;
+	protected ShellLight	m_ShellLight; 				// Light used upon ariborne shell detonation
+	protected vector 		m_OffsetPos; 				// This will be the position at which we spawn all future airborne FX
+	protected int 			m_DecayState 				= eAreaDecayStage.INIT; // The current state in which the area is
+	
+	// Constants used for startup events
+	const int 				AIRBORNE_EXPLOSION_DELAY 	= 20;
+	const int 				AREA_SETUP_DELAY 			= 10;
+	const float 			AIRBORNE_FX_OFFSET 			= 50;
+	const float 			ARTILLERY_SHELL_SPEED		= 100; // Units per second
+	
+	// Constants used for dissapearing events
+	const float				DECAY_START_PART_SIZE 		= 32;
+	const int				DECAY_START_PART_BIRTH_RATE = 1;
+	const float				DECAY_END_PART_SIZE 		= 17;
+	const int				DECAY_END_PART_BIRTH_RATE 	= 1;
+	const float 			START_DECAY_LIFETIME		= 900;
+	const float 			FINISH_DECAY_LIFETIME		= 300;
+	
+	// Item Spawning upon area creation, the 4 arrays bellow have to have the same amount of elements
+	const ref array<string> 	SPAWN_ITEM_TYPE 		= {"Grenade_ChemGas"};//item classnames
+	const ref array<int>		SPAWN_ITEM_COUNT 		= {Math.RandomIntInclusive(2,5)};//how many of each type
+	const ref array<float> 		SPAWN_ITEM_RAD_MIN 		= {5};//min distance the item will be spawned from the area position(epicenter)
+	const ref array<float> 		SPAWN_ITEM_RAD_MAX 		= {15};//max distance the item will be spawned from the area position(epicenter)
+	
+	
+	void ContaminatedArea_Dynamic()
+	{
+		RegisterNetSyncVariableInt("m_DecayState");
+	}
+	
+	override void EEOnCECreate()
+	{
+		// We get the PPE index for future usage and synchronization ( we must do it here for dynamic as it is not read through file )
+		if ( GetGame().IsServer() )
+			m_PPERequesterIdx = GetRequesterIndex(m_PPERequesterType);
+		
+		SetSynchDirty();
+		
+		// If this is the first initialization, we delay it in order to play cool effects
+		if ( m_DecayState == eAreaDecayStage.INIT )
+		{
+			vector areaPos = GetPosition();
+			m_OffsetPos = areaPos;
+			m_OffsetPos[1] = m_OffsetPos[1] + AIRBORNE_FX_OFFSET;
+			
+			// play artillery sound, sent to be played for everyone on server
+			array<vector> artilleryPoints = GetGame().GetMission().GetWorldData().GetArtyFiringPos();
+			vector closestPoint = areaPos;
+			int dist = 0;
+			int temp;
+			int index = 0;
+			for ( int i = 0; i < artilleryPoints.Count(); i++ )
+			{
+				temp = vector.DistanceSq( artilleryPoints.Get( i ), areaPos );
+				if ( temp < dist || dist == 0 )
+				{
+					dist = temp;
+					index = i;
+				}
+			}
+			
+			closestPoint = artilleryPoints.Get( index );
+			
+			// We calculate the delay depending on distance from firing position to simulate shell travel time
+			float delay = vector.Distance( closestPoint, areaPos );
+			delay = delay / ARTILLERY_SHELL_SPEED;
+			delay += AIRBORNE_EXPLOSION_DELAY; // We add the base, minimum time ( no area can start before this delay )
+			
+			Param3<vector, vector, float> pos; // The value to be sent through RPC
+			array<ref Param> params; // The RPC params
+			
+			// We prepare to send the message
+			pos = new Param3<vector, vector, float>( closestPoint, areaPos, delay );
+			params = new array<ref Param>;
+			
+			// We send the message with this set of coords
+			params.Insert( pos );
+			GetGame().RPC( null, ERPCs.RPC_SOUND_ARTILLERY_SINGLE, params, true );
+			
+			m_FXTimer = new Timer( CALL_CATEGORY_GAMEPLAY );
+			m_FXTimer.Run( delay, this, "PlayFX" );	
+			
+			delay += AREA_SETUP_DELAY; // We have an additional delay between shell detonation and finalization of area creation
+			// setup zone
+			m_StartupTimer = new Timer( CALL_CATEGORY_GAMEPLAY );
+			m_StartupTimer.Run( delay, this, "InitZone" );
+		}
+	}
+	
+	float GetRemainingTime()
+	{
+		return GetLifetime();
+	}
+	
+	float GetStartDecayLifetime()
+	{
+		return START_DECAY_LIFETIME;
+	}
+	
+	float GetFinishDecayLifetime()
+	{
+		return FINISH_DECAY_LIFETIME;
+	}
+	
+	override void Tick()
+	{
+		if ( GetRemainingTime() < GetFinishDecayLifetime() )
+		{
+			// The second state of decay, further reduction of particle density and size
+			SetDecayState( eAreaDecayStage.DECAY_END );
+		}
+		else if ( GetRemainingTime() < GetStartDecayLifetime() )
+		{
+			// The first state of decay, slight reduction in particle density and size
+			SetDecayState( eAreaDecayStage.DECAY_START );
+		}
+		
+	}
+	
+	// Set the new state of the Area
+	void SetDecayState( int newState )
+	{
+		if (m_DecayState != newState)
+		{
+			m_DecayState = newState;
+		
+			// We update the trigger state values as we also want to update player bound effects
+			if ( m_Trigger )
+				ContaminatedTrigger_Dynamic.Cast( m_Trigger ).SetAreaState( m_DecayState );
+			
+			SetSynchDirty();
+		}
+	}
+	
+	override void EEInit()
+	{
+		// We make sure we have the particle array
+		if ( !m_ToxicClouds )
+			m_ToxicClouds = new array<Particle>;
+		
+		// We set the values for dynamic area as these are not set through JSON and are standardized
+		m_Name = "Default Dynamic";
+		m_Radius = 120;
+		m_PositiveHeight = 7;
+		m_NegativeHeight = 10;
+		m_InnerRings = 1;
+		m_InnerSpacing = 40;
+		m_OuterSpacing = 30;
+		m_OuterRingOffset = 0;
+		m_Type = eZoneType.DYNAMIC;
+		m_TriggerType = "ContaminatedTrigger_Dynamic";
+		
+		SetSynchDirty();
+		
+		#ifdef DEVELOPER
+		// Debugs when placing entity by hand using internal tools
+		/*if ( GetGame().IsServer() && !GetGame().IsMultiplayer() )
+		{
+			Debug.Log("YOU CAN IGNORE THE FOLLOWING DUMP");
+			InitZone();
+			Debug.Log("YOU CAN USE FOLLOWING DATA PROPERLY");
+		}*/
+		#endif
+		
+		m_OffsetPos = GetPosition();
+		m_OffsetPos[1] = m_OffsetPos[1] + AIRBORNE_FX_OFFSET;
+		
+		// If a player arrives slightly later during the creation process we check if playing the flare FX is relevant
+		if ( m_DecayState == eAreaDecayStage.INIT )
+			PlayFlareVFX();
+		
+		if ( m_DecayState == eAreaDecayStage.LIVE )
+			InitZone(); // If it has already been created, we simply do the normal setup, no cool effects, force the LIVE state
+		else if ( GetGame().IsClient() && m_DecayState > eAreaDecayStage.LIVE )
+			InitZoneClient(); // Same as before but without state forcing
+		
+		super.EEInit();
+	}
+	
+	// We spawn particles and setup trigger
+	override void InitZone()
+	{
+		m_DecayState = eAreaDecayStage.LIVE;
+		SetSynchDirty();
+		
+		super.InitZone();
+	}
+	
+	override void InitZoneServer()
+	{
+		super.InitZoneServer();
+		
+		SpawnItems();
+		// We create the trigger on server
+		if ( m_TriggerType != "" )
+			CreateTrigger( m_Position, m_Radius );
+	}
+	
+	void SpawnItems()
+	{
+		//Print("---------============ Spawning items at pos:"+m_Position);
+		foreach (int j, string type:SPAWN_ITEM_TYPE)
+		{
+			//Print("----------------------------------");
+			for (int i = 0; i < SPAWN_ITEM_COUNT[j]; i++)
+			{
+				vector randomDir2d = vector.RandomDir2D();
+				float randomDist = Math.RandomFloatInclusive(SPAWN_ITEM_RAD_MIN[j],SPAWN_ITEM_RAD_MAX[j]);
+				vector spawnPos = m_Position + (randomDir2d * randomDist);
+				InventoryLocation il = new InventoryLocation;
+				vector mat[4];
+				Math3D.MatrixIdentity4(mat);
+				mat[3] = spawnPos;
+				il.SetGround(NULL, mat);
+				//Print("Spawning item:"+ type + " at position:" + il.GetPos());
+				GetGame().CreateObjectEx(type, il.GetPos(), ECE_PLACE_ON_SURFACE);
+			}
+		}
+	}
+	
+	override void InitZoneClient()
+	{
+		super.InitZoneClient();
+		
+		if ( !m_ToxicClouds )
+			m_ToxicClouds = new array<Particle>;
+		
+		// We spawn VFX on client
+		PlaceParticles( GetWorldPosition(), m_Radius, m_InnerRings, m_InnerSpacing, m_OuterRingToggle, m_OuterSpacing, m_OuterRingOffset, m_ParticleID );		
+	}
+	
+	override void OnParticleAllocation(ParticleManager pm, array<ParticleSource> particles)
+	{
+		super.OnParticleAllocation(pm, particles);
+		
+		if ( m_DecayState > eAreaDecayStage.LIVE )
+		{
+			foreach ( ParticleSource p : particles )
+			{
+				if ( m_DecayState == eAreaDecayStage.DECAY_END )
+				{
+					p.SetParameter( 0, EmitorParam.BIRTH_RATE, DECAY_END_PART_BIRTH_RATE );
+					p.SetParameter( 0, EmitorParam.SIZE, DECAY_END_PART_SIZE );
+				}
+				else
+				{
+					p.SetParameter( 0, EmitorParam.BIRTH_RATE, DECAY_START_PART_BIRTH_RATE );
+					p.SetParameter( 0, EmitorParam.SIZE, DECAY_START_PART_SIZE );
+				}
+			}
+		}
+	}
+	
+	override void CreateTrigger( vector pos, int radius )
+	{
+		super.CreateTrigger( pos, radius );
+		
+		// This handles the specific case of dynamic triggers as some additionnal parameters are present
+		ContaminatedTrigger_Dynamic dynaTrigger = ContaminatedTrigger_Dynamic.Cast( m_Trigger );
+		if ( dynaTrigger )
+		{
+			dynaTrigger.SetLocalEffects( m_AroundParticleID, m_TinyParticleID, m_PPERequesterIdx );
+			dynaTrigger.SetAreaState( m_DecayState );
+		}
+	}
+	
+	void PlayFX()
+	{
+		if ( GetGame().IsServer() )
+		{
+			Param1<vector> pos; // The value to be sent through RPC
+			array<ref Param> params; // The RPC params
+			
+			// We prepare to send the message
+			pos = new Param1<vector>( vector.Zero );
+			params = new array<ref Param>;
+			
+			// We send the message with this set of coords
+			pos.param1 = m_OffsetPos;
+			params.Insert( pos );
+			GetGame().RPC( null, ERPCs.RPC_SOUND_CONTAMINATION, params, true );
+			
+			// We go to the next stage
+			m_DecayState = eAreaDecayStage.START;
+			SetSynchDirty();
+		}
+	}
+	
+	void PlayExplosionLight()
+	{
+		m_ShellLight = ShellLight.Cast( ScriptedLightBase.CreateLight( ShellLight, m_OffsetPos ) );
+	}
+	
+	void PlayFlareVFX()
+	{
+		if ( GetGame().IsClient() || ( GetGame().IsServer() && !GetGame().IsMultiplayer() ) )
+		{
+			// We spawn locally the dummy object which will be used to move and manage the particle
+			DynamicArea_Flare dummy = DynamicArea_Flare.Cast( GetGame().CreateObjectEx( "DynamicArea_Flare", m_OffsetPos, ECE_SETUP | ECE_LOCAL ) );
+			
+			// We add some light to reinforce the effect
+			m_FlareLight = FlareLightContamination.Cast(ScriptedLightBase.CreateLight( FlareLightContamination, m_OffsetPos ));
+		}
+	}
+	
+	override void EEDelete( EntityAI parent )
+	{
+		super.EEDelete( parent );
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if ( !m_ToxicClouds )
+			m_ToxicClouds = new array<Particle>;
+		
+		switch ( m_DecayState )
+		{
+			case eAreaDecayStage.START:
+				PlayExplosionLight();
+			break;
+			case eAreaDecayStage.LIVE:
+				InitZoneClient();
+			
+			break;
+			case eAreaDecayStage.DECAY_START:
+			{
+				// We go through all the particles bound to this area and update relevant parameters
+				//Debug.Log("We start decay");
+				foreach ( Particle p : m_ToxicClouds )
+				{
+					p.SetParameter( 0, EmitorParam.BIRTH_RATE, DECAY_START_PART_BIRTH_RATE );
+					p.SetParameter( 0, EmitorParam.SIZE, DECAY_START_PART_SIZE );
+				}
+				
+				break;
+			}
+			case eAreaDecayStage.DECAY_END:
+			{
+				// We go through all the particles bound to this area and update relevant parameters
+				//Debug.Log("We finish decay");
+				foreach ( Particle prt : m_ToxicClouds )
+				{
+					prt.SetParameter( 0, EmitorParam.BIRTH_RATE, DECAY_END_PART_BIRTH_RATE );
+					prt.SetParameter( 0, EmitorParam.SIZE, DECAY_END_PART_SIZE );
+				}
+				
+				break;
+			}
+			default:
+			break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea_Local.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea_Local.c
new file mode 100644
index 0000000000000000000000000000000000000000..9f0bcecff59855b9bdcdb0c5db77ba91cb22ad27
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/ContaminatedArea_Local.c
@@ -0,0 +1,70 @@
+class ContaminatedArea_Local : ContaminatedArea_Dynamic
+{
+	const float TICK_RATE 	= 1;
+	ref Timer 	m_Timer1 	= new Timer;
+	float 		m_Lifetime 	= 360;
+	// ----------------------------------------------
+	// 				INITIAL SETUP
+	// ----------------------------------------------
+	
+	void ContaminatedArea_Local()
+	{
+		m_EffectsPriority = -10;
+	}
+	
+	override void SetupZoneData(  EffectAreaParams params )
+	{
+		params.m_ParamPartId 		= ParticleList.CONTAMINATED_AREA_GAS_AROUND;
+		params.m_ParamInnerRings 	= 0;
+		params.m_ParamPosHeight 	= 3;
+		params.m_ParamNegHeight 	= 5;
+		params.m_ParamRadius 		= 10;
+		params.m_ParamOuterToggle 	= false;
+		params.m_ParamTriggerType 	= "ContaminatedTrigger_Local";
+		
+		params.m_ParamAroundPartId 	= 0;
+		params.m_ParamTinyPartId 	= 0;
+		
+		super.SetupZoneData( params );
+	}
+	
+	override void EEInit()
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			SetupZoneData(new EffectAreaParams);
+			m_Timer1.Run(TICK_RATE, this, "Tick", NULL, true);
+		}
+	}
+	
+	override void SpawnItems()
+	{
+		// override base funcionality as we don't want any items spawned here
+	}
+	
+	override float GetStartDecayLifetime()
+	{
+		return 20;
+	}
+	
+	override float GetFinishDecayLifetime()
+	{
+		return 10;
+	}
+	
+	override float GetRemainingTime()
+	{
+		return m_Lifetime;
+	}
+
+	override void Tick()
+	{
+		m_Lifetime -= TICK_RATE;
+		if (m_Lifetime <= 0)
+		{
+			Delete();
+		}
+	}
+
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/DynamicArea_Flare.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/DynamicArea_Flare.c
new file mode 100644
index 0000000000000000000000000000000000000000..9d835c841c2f059e743c74c24031d7c8f88fc194
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/DynamicArea_Flare.c
@@ -0,0 +1,33 @@
+// The dummy entity which is spawned in the announcement process of Dynamic Contaminated Areas
+class DynamicArea_Flare : ScriptedEntity
+{
+	const float FALL_SPEED = 0.5; // The speed at which this object falls ( units per second )
+	const float LIFETIME = 40000; // How long this entity will stay in world
+	private Particle m_Particle;
+	void DynamicArea_Flare()
+	{
+		SetEventMask( EntityEvent.FRAME );
+		SetFlags( EntityFlags.ACTIVE, false );
+		
+		// We create the particle effect
+		m_Particle = ParticleManager.GetInstance().PlayOnObject( ParticleList.FLAREPROJ_ACTIVATE_RED, this );
+		
+		// We specify we will delete this object after set time
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater( GetGame().ObjectDeleteOnClient, LIFETIME, false, this );
+	}
+	
+	// We slowly fall
+	override void EOnFrame( IEntity other, float timeSlice )
+	{
+		vector newPos = GetPosition();
+		newPos[1] = newPos[1] - ( FALL_SPEED * timeSlice );
+		SetPosition( newPos );
+	}
+	
+	// We delete the entity and stop the particles
+	override void EEDelete( EntityAI parent )
+	{
+		if ( m_Particle )
+			m_Particle.Stop();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/EffectArea.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/EffectArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..99905f40b522756df1092b615929a2999912f830
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/EffectArea.c
@@ -0,0 +1,455 @@
+// Mostly used for better readability
+enum eZoneType
+{
+	STATIC = 1,
+	DYNAMIC = 2
+}
+
+// Class used for parameter transfer, all of the params are shadows of EffectArea member variables
+class EffectAreaParams
+{
+	string 	m_ParamName 				= "Default setup";
+	string 	m_ParamTriggerType 			= "ContaminatedTrigger";
+	float 	m_ParamRadius 				= 100;
+	float 	m_ParamPosHeight 			= 25;
+	float 	m_ParamNegHeight 			= 10;
+	int 	m_ParamInnerRings 			= 1;
+	int 	m_ParamInnerSpace 			= 35;
+	bool 	m_ParamOuterToggle 			= true;
+	int 	m_ParamOuterSpace 			= 20;
+	int 	m_ParamOuterOffset 			= -5;
+	int 	m_ParamVertLayers 			= 0;
+	int 	m_ParamVerticalOffset 		= 10;
+	/*
+	int 	m_ParamPartId 				= ParticleList.CONTAMINATED_AREA_GAS_BIGASS;
+	int 	m_ParamAroundPartId 		= ParticleList.CONTAMINATED_AREA_GAS_AROUND;
+	int 	m_ParamTinyPartId 			= ParticleList.CONTAMINATED_AREA_GAS_TINY;
+	*/
+	int 	m_ParamPartId 				= 0;
+	int 	m_ParamAroundPartId 		= 0;
+	int 	m_ParamTinyPartId 			= 0;
+	
+	string 	m_ParamPpeRequesterType 	= "PPERequester_ContaminatedAreaTint";
+}
+
+// Base class for contaminated and other "Effect" areas
+class EffectArea : House
+{
+	// Area Data
+	string					m_Name = "Default setup"; 				// The user defined name of the area
+	int						m_Type = eZoneType.STATIC; 				// If the zone is static or dynamic
+	vector 					m_Position; 							// World position of Area
+	
+	// Trigger Data
+	float					m_Radius = 100; 						// Radius of the Contaminated Area
+	float					m_PositiveHeight = 25; 					// Distance between center and maximum height
+	float					m_NegativeHeight = 10; 					// Distance between center and minimum height
+	
+	// PCG parameters
+	// Inner Particle data
+	int						m_InnerRings = 1; 						// The amount of inner rings one wants
+	int						m_InnerSpacing = 35; 					// Distance between two particles placed on inner rings of the area
+	// Outer particle data
+	bool					m_OuterRingToggle = true; 				// Allow disabling outer ring if undesired
+	int						m_OuterRingOffset = -5; 				// Distance between the outermost ring of particles and area radius
+	int						m_OuterSpacing = 20; 					// Distance between two particles placed on the outer most ring of the area
+	// Verticality handling
+	int						m_VerticalLayers = 0; 					// Used to add multiple layers vertically and set vertical spacing ( 0 don't do anything )
+	int						m_VerticalOffset = 10; 					// Used to determine vertical offset between two vertical layers
+	
+	// Particles and visual effects
+	int						m_ParticleID = ParticleList.CONTAMINATED_AREA_GAS_BIGASS;
+	int						m_AroundParticleID = ParticleList.CONTAMINATED_AREA_GAS_AROUND;
+	int						m_TinyParticleID = ParticleList.CONTAMINATED_AREA_GAS_TINY;
+	string 					m_PPERequesterType;
+	int 					m_PPERequesterIdx = -1;
+	int						m_EffectsPriority;						// When multiple areas overlap, only the area with the highest priority will play its effects
+	
+	// Other values and storage
+	string 					m_TriggerType = "ContaminatedTrigger"; 	// The trigger class used by this zone
+	EffectTrigger			m_Trigger; 								// The trigger used to determine if player is inside toxic area
+
+	ref array<Particle> 	m_ToxicClouds; 							// All static toxic clouds in ContaminatedArea
+	
+
+	// ----------------------------------------------
+	// 				INITIAL SETUP
+	// ----------------------------------------------
+	
+	void EffectArea()
+	{
+		RegisterNetSyncVariableFloat("m_Radius", 0, 0, 2);
+		RegisterNetSyncVariableFloat("m_PositiveHeight", 0, 0, 2);
+		RegisterNetSyncVariableFloat("m_NegativeHeight", 0, 0, 2);
+		
+		RegisterNetSyncVariableInt("m_InnerRings");
+		RegisterNetSyncVariableInt("m_InnerSpacing");
+		RegisterNetSyncVariableInt("m_OuterRingOffset");
+		RegisterNetSyncVariableInt("m_OuterSpacing");
+		RegisterNetSyncVariableInt("m_VerticalLayers");
+		RegisterNetSyncVariableInt("m_VerticalOffset");
+		
+		RegisterNetSyncVariableInt("m_ParticleID");
+		/*
+		RegisterNetSyncVariableInt("m_AroundParticleID");
+		RegisterNetSyncVariableInt("m_TinyParticleID");
+		RegisterNetSyncVariableInt("m_PPERequesterIdx");
+		*/
+		RegisterNetSyncVariableBool("m_OuterRingToggle");
+	}
+	
+	void ~EffectArea()
+	{
+		
+	}
+
+	void SetupZoneData( EffectAreaParams params ) 
+	{
+		// A lot of branching, allowing to use default values on specified params
+		if ( params.m_ParamName != "" )
+			m_Name = params.m_ParamName;
+		if ( params.m_ParamTriggerType != "" )
+			m_TriggerType = params.m_ParamTriggerType;
+		
+		if ( params.m_ParamRadius > 0 )
+			m_Radius = params.m_ParamRadius;
+		if ( params.m_ParamPosHeight > -1 )
+			m_PositiveHeight = params.m_ParamPosHeight;
+		if ( params.m_ParamNegHeight > -1 )
+			m_NegativeHeight = params.m_ParamNegHeight;
+		
+		m_InnerRings = params.m_ParamInnerRings;
+		if ( params.m_ParamInnerSpace > -1 )
+			m_InnerSpacing = params.m_ParamInnerSpace;
+		
+		m_OuterRingToggle = params.m_ParamOuterToggle;
+		if ( params.m_ParamOuterSpace > -1 )
+			m_OuterSpacing = params.m_ParamOuterSpace;
+		m_OuterRingOffset = params.m_ParamOuterOffset;
+		
+		if ( params.m_ParamVertLayers > 0 )
+			m_VerticalLayers = params.m_ParamVertLayers;
+		if ( params.m_ParamVerticalOffset > 0 )
+			m_VerticalOffset = params.m_ParamVerticalOffset;
+		
+		m_ParticleID = params.m_ParamPartId;
+		m_AroundParticleID = params.m_ParamAroundPartId;
+		m_TinyParticleID = params.m_ParamTinyPartId;
+		
+		if ( params.m_ParamPpeRequesterType != "" )
+		{
+			m_PPERequesterType = params.m_ParamPpeRequesterType;
+			m_PPERequesterIdx = GetRequesterIndex(m_PPERequesterType);			
+		}
+		// We get the PPE index for future usage and synchronization
+		
+		
+		// DEVELOPER NOTE :
+		// If you cannot register a new requester, add your own indexation and lookup methods to get an index and synchronize it
+		// EXAMPLE : m_PPERequesterIdx = MyLookupMethod()
+		
+		// We sync our data
+		SetSynchDirty();
+		
+		// Now that everything is ready, we finalize setup
+		InitZone();
+	}
+
+	void Tick() {};
+	
+		
+	// Through this we will evaluate the resize of particles
+	override void OnCEUpdate()
+	{
+		super.OnCEUpdate();
+		Tick();
+	}
+	
+	void InitZone()
+	{
+		//Debug.Log("------------------------------------------");
+		//Debug.Log( "We have created the zone : " + m_Name );
+		
+		m_Position = GetWorldPosition();
+		
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			InitZoneClient();
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			InitZoneServer();
+		}
+		
+		//Debug.Log("------------------------------------------");
+	}
+	
+	// The following methods are to be overriden to execute specifc logic
+	// Each method is executed where it says it will so no need to check for server or client ;) 
+	void InitZoneServer() {};
+	
+	void InitZoneClient() {};
+	
+	// ----------------------------------------------
+	// 				INTERACTION SETUP
+	// ----------------------------------------------
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool DisableVicinityIcon()
+    {
+        return true;
+    }
+	
+	override bool CanBeTargetedByAI( EntityAI ai )
+	{
+		return false;
+	}
+	
+	// ----------------------------------------------
+	// 				PARTICLE GENERATION
+	// ----------------------------------------------
+	// Used to position all particles procedurally
+	void PlaceParticles( vector pos, float radius, int nbRings, int innerSpacing, bool outerToggle, int outerSpacing, int outerOffset, int partId )
+	{
+#ifdef NO_GUI
+		return; // do not place any particles if there is no GUI
+#endif
+		if (partId == 0)
+		{
+			Error("[WARNING] :: [EffectArea PlaceParticles] :: no particle defined, skipping area particle generation" );
+			return;
+		}
+		// Determine if we snap first layer to ground
+		bool snapFirstLayer = true; 
+		if ( m_Type == eZoneType.STATIC && pos[1] != GetGame().SurfaceRoadY( pos[0], pos[2] ) )
+			snapFirstLayer = false;
+		
+		// BEGINNING OF SAFETY NET
+		// We want to prevent divisions by 0
+		if ( radius == 0 )
+		{
+			// In specific case of radius, we log an error and return as it makes no sense
+			Error("[WARNING] :: [EffectArea PlaceParticles] :: Radius of contaminated zone is set to 0, this should not happen");
+			return;
+		}
+		
+		if ( outerToggle && radius == outerOffset )
+		{
+			Error("[WARNING] :: [EffectArea PlaceParticles] :: Your outerOffset is EQUAL to your Radius, this will result in division by 0");
+			return;
+		}
+		
+		// Inner spacing of 0 would cause infinite loops as no increment would happen
+		if ( innerSpacing == 0 )
+			innerSpacing = 1;
+		
+		// END OF SAFETY NET
+		
+		int partCounter = 0; // Used for debugging, allows one to know how many emitters are spawned in zone
+		int numberOfEmitters = 1; // We always have the central emitter
+		
+		//Debug.Log("We have : " + nbRings + " rings");
+		//Debug.Log("We have : " + m_VerticalLayers + " layers");
+		
+		float angle = 0; // Used in for loop to know where we are in terms of angle spacing ( RADIANS )
+		
+		ParticlePropertiesArray props = new ParticlePropertiesArray();
+		
+		// We also populate vertically, layer 0 will be snapped to ground, subsequent layers will see particles floating and relevant m_VerticalOffset
+		for ( int k = 0; k <= m_VerticalLayers; k++ )
+		{
+			vector partPos = pos;
+			// We prevent division by 0
+			// We don't want to tamper with ground layer vertical positioning
+			if ( k != 0 )
+			{
+				partPos[1] = partPos[1] + ( m_VerticalOffset * k );
+			}
+			
+			// We will want to start by placing a particle at center of area
+			props.Insert(ParticleProperties(partPos, ParticlePropertiesFlags.PLAY_ON_CREATION, null, vector.Zero, this));
+			partCounter++;
+			
+			// For each concentric ring, we place a particle emitter at a set offset
+			for ( int i = 1; i <= nbRings + outerToggle; i++ )
+			{
+				//Debug.Log("We are on iteration I : " + i );
+				
+				// We prepare the variables to use later in calculation
+				float angleIncrement; 		// The value added to the offset angle to place following particle
+				float ab; 					// Length of a side of triangle used to calculate particle positionning
+				vector temp = vector.Zero; 	// Vector we rotate to position next spawn point
+				
+				// The particle density is not the same on the final ring which will only happen if toggled
+				// Toggle uses bool parameter treated as int, thus i > nbRings test ( allows to limit branching )
+				if ( i > nbRings )
+				{
+					ab = radius - outerOffset; // We want to leave some space to better see area demarcation
+					
+					// We calculate the rotation angle depending on particle spacing and distance from center
+					angleIncrement = Math.Acos( 1 - ( ( outerSpacing * outerSpacing ) / ( 2 * Math.SqrInt(ab) ) ) );
+					temp[2] = temp[2] + ab;
+					
+					//Debug.Log("Radius of last circle " + i + " is : " + ab);
+				}
+				else
+				{
+					ab = ( radius / ( nbRings + 1 ) ) * i; // We add the offset from one ring to another
+					
+					// We calculate the rotation angle depending on particle spacing and distance from center
+					angleIncrement = Math.Acos( 1 - ( ( innerSpacing * innerSpacing ) / ( 2 * Math.SqrInt(ab) ) ) );
+					temp[2] = temp[2] + ab;
+					
+					//Debug.Log("Radius of inner circle " + i + " is : " + ab);
+				}
+				
+				for ( int j = 0; j <= ( Math.PI2 / angleIncrement ); j++ )
+				{
+					// Determine position of particle emitter
+					// Use offset of current ring for vector length
+					// Use accumulated angle for vector direction
+					
+					float sinAngle = Math.Sin( angle );
+					float cosAngle = Math.Cos( angle );
+				
+					partPos = vector.RotateAroundZero( temp, vector.Up, cosAngle, sinAngle );
+					partPos += pos;
+					
+					// We snap first layer to ground if specified
+					if ( k == 0 && snapFirstLayer == true )
+						partPos[1] = GetGame().SurfaceY( partPos[0], partPos[2] );
+					else if ( k == 0 && snapFirstLayer == false )
+						partPos[1] = partPos[1] - m_NegativeHeight;
+					
+					// We check the particle is indeed in the trigger to make it consistent
+					if ( partPos[1] <= pos[1] + m_PositiveHeight && partPos[1] >= pos[1] - m_NegativeHeight )
+					{
+						// Place emitter at vector end ( coord )
+						props.Insert(ParticleProperties(partPos, ParticlePropertiesFlags.PLAY_ON_CREATION, null, GetGame().GetSurfaceOrientation( partPos[0], partPos[2] ), this));
+						
+						++partCounter;
+					}
+
+					// Increase accumulated angle
+					angle += angleIncrement;
+				}
+				
+				angle = 0; // We reset our accumulated angle for the next ring
+			}
+		}
+		
+		m_ToxicClouds.Reserve(partCounter);
+		
+		ParticleManager gPM = ParticleManager.GetInstance();
+		
+		array<ParticleSource> createdParticles = gPM.CreateParticlesByIdArr(partId, props, partCounter);
+		if (createdParticles.Count() != partCounter)
+		{
+			if (gPM.IsFinishedAllocating())
+			{
+				ErrorEx(string.Format("Not enough particles in pool for EffectArea: %1", m_Name));
+				OnParticleAllocation(gPM, createdParticles);
+			}
+			else
+			{
+				gPM.GetEvents().Event_OnAllocation.Insert(OnParticleAllocation);
+			}
+		}
+		else
+		{
+			OnParticleAllocation(gPM, createdParticles);
+		}
+		
+		//Debug.Log("Emitter count : " + partCounter );
+	}
+	
+	void OnParticleAllocation(ParticleManager pm, array<ParticleSource> particles)
+	{
+		foreach (ParticleSource p : particles)
+		{
+			if (p.GetOwner() == this) // Safety, since it can be unrelated particles when done through event
+				m_ToxicClouds.Insert(p);
+		}
+	}
+	
+	int GetRequesterIndex(string type)
+	{
+		typename t = type.ToType();
+		if (!t)
+			return - 1;
+		PPERequesterBase req = PPERequesterBank.GetRequester(t);
+		if (req)
+			return req.GetRequesterIDX();
+		return -1;
+	}
+	
+	
+	// ----------------------------------------------
+	// 				TRIGGER SETUP
+	// ----------------------------------------------
+	
+	void CreateTrigger( vector pos, int radius )
+	{
+		// The trigger pos is based on lwer end, but we want to stretch downwards
+		pos[1] = pos[1] - m_NegativeHeight;
+		
+		// Create new trigger of specified type
+		if ( Class.CastTo( m_Trigger, GetGame().CreateObjectEx( m_TriggerType, pos, ECE_NONE ) ) )
+		{
+			// We finalize trigger dimension setup
+			m_Trigger.SetCollisionCylinder( radius, ( m_NegativeHeight + m_PositiveHeight ) );
+			
+			// If the trigger is lower in hierarchy and can see it's local effects customized, we pass the new parameters
+			if ( m_Trigger.IsInherited( EffectTrigger ) )
+			{
+				//Debug.Log("We override area local effects");
+				EffectTrigger.Cast( m_Trigger ).SetLocalEffects( m_AroundParticleID, m_TinyParticleID, m_PPERequesterIdx );
+			}
+			m_Trigger.Init(this, m_EffectsPriority);
+			//Debug.Log("We created the trigger at : " + m_Trigger.GetWorldPosition() );
+		}
+	}
+	
+	// ----------------------------------------------
+	// 				AREA DELETION
+	// ----------------------------------------------
+	
+	override void EEDelete( EntityAI parent )
+	{
+		if ( m_Trigger )
+		{
+			GetGame().ObjectDelete( m_Trigger );
+		}
+		
+		// We stop playing particles on this client when the base object is deleted ( out of range for example )
+		if ( (GetGame().IsClient() || !GetGame().IsMultiplayer())  && m_ToxicClouds )
+		{
+			foreach ( Particle p : m_ToxicClouds )
+			{
+				p.Stop();
+			}
+		}
+		
+		super.EEDelete( parent );
+	}
+	
+	void OnPlayerEnterServer(PlayerBase player, EffectTrigger trigger)
+	{
+		player.IncreaseEffectAreaCount();
+	}
+	void OnPlayerExitServer(PlayerBase player, EffectTrigger trigger)
+	{
+		player.DecreaseEffectAreaCount();
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/JsonDataContaminatedArea.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/JsonDataContaminatedArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..ccb22ab6239443739da1f0b687b6844d6f4a9cf1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/JsonDataContaminatedArea.c
@@ -0,0 +1,38 @@
+// JSON data structure
+class JsonDataContaminatedAreas : Managed
+{
+	ref array<ref JsonDataContaminatedArea> Areas;
+	ref array<ref array<float>> SafePositions;
+}
+
+class JsonDataContaminatedArea : Managed
+{
+	string AreaName;
+	string Type;
+	string TriggerType;
+	JsonDataAreaData Data;
+	JsonDataPlayerData PlayerData;
+};
+
+class JsonDataAreaData : Managed
+{
+	ref array<float> Pos;
+	float Radius;
+	float PosHeight;
+	float NegHeight;
+	int InnerRingCount;
+	int InnerPartDist;
+	bool OuterRingToggle;
+	int OuterPartDist;
+	int OuterOffset;
+	int VerticalLayers;
+	int VerticalOffset;
+	string ParticleName; 
+};
+
+class JsonDataPlayerData : Managed
+{
+	string AroundPartName;
+	string TinyPartName;
+	string PPERequesterType;
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/SpookyArea.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/SpookyArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..e8893d5d73258c01467a58b1621271953169d633
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/SpookyArea.c
@@ -0,0 +1,67 @@
+// The base area for Spooky land, spooky particles and spooky triggers for a spooky halloween
+class SpookyArea : EffectArea
+{
+	// ----------------------------------------------
+	// 				INITIAL SETUP
+	// ----------------------------------------------
+	override void EEInit()
+	{
+		// We make sure we have the particle array
+		if ( !m_ToxicClouds )
+			m_ToxicClouds = new array<Particle>;
+		
+		SetSynchDirty();
+		
+		#ifdef DEVELOPER
+		// Debugs when placing entity by hand using internal tools
+		if ( GetGame().IsServer() && !GetGame().IsMultiplayer() )
+		{
+			Debug.Log("YOU CAN IGNORE THE FOLLOWING DUMP");
+			InitZone();
+			Debug.Log("YOU CAN USE FOLLOWING DATA PROPERLY");
+		}
+		#endif
+		
+		if ( GetGame().IsClient() && GetGame().IsMultiplayer() )
+			InitZone();
+		
+		super.EEInit();
+	}
+	
+	override void InitZoneServer()
+	{
+		super.InitZoneServer();
+		
+		// We create the trigger on server
+		if ( m_TriggerType != "" )
+			CreateTrigger( m_Position, m_Radius );
+	}
+	
+	override void InitZoneClient()
+	{
+		super.InitZoneClient();
+		
+		// We spawn VFX on client
+		PlaceParticles( GetWorldPosition(), m_Radius, m_InnerRings, m_InnerSpacing, m_OuterRingToggle, m_OuterSpacing, m_OuterRingOffset, m_ParticleID );
+	}
+}
+
+class SpookyArea23 : SpookyArea
+{
+	override void OnPlayerEnterServer(PlayerBase player, EffectTrigger trigger)
+	{
+		super.OnPlayerEnterServer(player, trigger);
+		
+		EntityAI spookyEntity = EntityAI.Cast(GetGame().CreateObjectEx("SpookyPlayerStalker","0 0 0",ECE_SETUP));
+		int boneIdx = player.GetBoneIndexByName("Head");
+		player.AddChild(spookyEntity,boneIdx,true);
+	}
+	
+	override void OnPlayerExitServer(PlayerBase player, EffectTrigger trigger)
+	{
+		super.OnPlayerExitServer(player, trigger);
+		
+		array<typename> types = {SpookyPlayerStalker};
+		MiscGameplayFunctions.RemoveAllAttachedChildrenByTypename(player,types);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ContaminatedArea/SpookyAreaMisc.c b/scripts/4_World/DayZ/Classes/ContaminatedArea/SpookyAreaMisc.c
new file mode 100644
index 0000000000000000000000000000000000000000..b23da302b81ae9d30f377f742c2bb9ad6e90e80c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContaminatedArea/SpookyAreaMisc.c
@@ -0,0 +1,355 @@
+//-------------------------------------------------------------
+class SpookyEventWind : SpookyEventBase
+{
+	override protected void Init()
+	{
+		SetCoolDown(65);
+		m_SoundSet = "SpookyArea_WhistlingWind_SoundSet";
+	}
+	
+	override protected bool CanDo(PlayerBase player, TStringVectorMap surfaceTypes)
+	{
+		return player.IsSoundInsideBuilding();
+	}
+	
+	override protected void Do(PlayerBase player)
+	{
+		//put additional code here
+	}
+}
+//-------------------------------------------------------------
+class SpookyEventWhisper : SpookyEventBase
+{
+	override protected void Init()
+	{
+		SetCoolDown(80);
+		m_SoundSet = "SpookyArea_Whispering_SoundSet";
+	}
+	
+	override protected void Do(PlayerBase player)
+	{
+		//put additional code here
+	}
+
+}
+//-------------------------------------------------------------
+class SpookyEventSteps : SpookyEventBase
+{
+	override protected void Init()
+	{
+		SetCoolDown(40);
+		m_SoundSet = "SpookyArea_RunOnConcrete_SoundSet";
+		m_Surfaces = {"stone", "gravel", "concrete", "wood", "asphalt", "tiles", "textile"};
+	}
+	
+	override protected void Do(PlayerBase player)
+	{
+		//put additional code here
+	}
+}
+//-------------------------------------------------------------
+class SpookyEventRustle : SpookyEventBase
+{
+	override protected void Init()
+	{
+		SetCoolDown(60);
+		m_SoundSet = "SpookyArea_IntenseFoliageRustle_SoundSet";
+		m_Surfaces = {"grass", "dirt", "forest", "soil"};
+	}
+	
+	override protected bool CanDo(PlayerBase player, TStringVectorMap surfaceTypes)
+	{
+		return !player.IsSoundInsideBuilding();
+	}
+	
+	override protected void Do(PlayerBase player)
+	{
+		vector soundPos = GetSoundPos(player);
+		
+		string secondarySoundSet = "SpookyArea_Hedgehog_SoundSet";
+		
+		if (Math.RandomBool())
+		{
+			secondarySoundSet = "SpookyArea_Badger_Voice_SoundSet";
+		}
+
+		EffectSound sound =	SEffectManager.PlaySound(secondarySoundSet, soundPos);
+		sound.SetAutodestroy( true );
+	}
+}
+
+
+//-------------------------------------------------------------
+//-------------------------------------------------------------
+//-------------------------------------------------------------
+
+class SpookyEventBase
+{
+	//internal params, do not set manually
+	protected float 			m_PerformedTimestamp;//internal, marks the time this event was last performed so that it can guruantee the cooldown period before playing it again
+	protected int 				m_Cooldown;//how much time needs to elapse between this event can be performed again in seconds
+	//the params bellow can be set in the 'Init' method
+	protected string 			m_SoundSet;//if set, will play this soundset when performing the event
+	protected ref TStringArray 	m_Surfaces;//if set, the player needs to detect this surface for the event to be considered valid
+	protected vector			m_MatchingSurfacePos;//position of the first matching surface
+	
+	void SpookyEventBase()
+	{
+		Init();
+	}
+
+	protected void Init();
+	
+	
+	protected vector GetMatchingSurfacePos(TStringArray surfaces, TStringVectorMap gatheredSurfaces)
+	{
+		for (int i = 0; i < gatheredSurfaces.Count(); i++)
+		{
+			string currSurface = gatheredSurfaces.GetKey(i);
+			foreach (string s:surfaces)
+			{
+				if (currSurface.Contains(s))
+					return gatheredSurfaces.Get(currSurface);
+			}
+		}
+		
+		return vector.Zero;
+	}
+	
+	protected void SetCoolDown(float secs)
+	{
+		m_Cooldown = secs * 1000;
+	}
+	
+	protected bool HasSurfaces()
+	{
+		return (m_Surfaces && m_Surfaces.Count() > 0);
+	}
+	
+	protected bool CanDo(PlayerBase player, TStringVectorMap surfaceTypes)
+	{
+		return true;
+	}
+	
+	protected void Do(PlayerBase player);
+	
+	//internal, do not override, use 'CanDo' instead
+	bool CanPerform(PlayerBase player, float currentTime, TStringVectorMap surfaceTypes)
+	{
+		bool surfaceCheckResult = 1;
+		
+		if (HasSurfaces())
+		{
+			m_MatchingSurfacePos = GetMatchingSurfacePos(m_Surfaces, surfaceTypes);
+			surfaceCheckResult =  m_MatchingSurfacePos != vector.Zero;
+		}
+		
+			
+		return ( currentTime > (m_PerformedTimestamp + m_Cooldown) && surfaceCheckResult && CanDo(player, surfaceTypes) );
+	}
+	
+	//internal, do not override, use 'Do' instead
+	void Perform(PlayerBase player, float currentTime, TStringVectorMap gatheredSurfaces)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.TRIGGER_DEBUG))
+			Print("Performing " + this);
+		#endif
+		m_PerformedTimestamp = currentTime;
+		
+		if (m_SoundSet)
+		{
+			vector soundPos = GetSoundPos(player);
+			EffectSound sound =	SEffectManager.PlaySound(m_SoundSet, soundPos);
+			sound.SetAutodestroy( true );
+			
+			#ifdef DIAG_DEVELOPER
+			if (DiagMenu.GetBool(DiagMenuIDs.TRIGGER_DEBUG))
+				Debug.DrawSphere(soundPos , 0.15,Colors.YELLOW, ShapeFlags.NOZBUFFER);
+			#endif
+		}
+			
+		Do(player);
+	}
+
+	protected vector GetSoundPos(PlayerBase player)
+	{
+		vector soundPos;
+		
+		if (HasSurfaces())
+		{
+			soundPos = m_MatchingSurfacePos;
+		}
+		else
+		{
+			float distance 		= Math.RandomFloatInclusive(5,15);
+			vector randomDir 	= vector.RandomDir2D() * distance;
+			vector playerPos 	= player.GetPosition();
+			soundPos 			= playerPos + randomDir;
+		}
+		
+		return soundPos;
+	}
+}
+
+//----------------------------------------------------------------------------------------------------------
+
+class SpookyTriggerEventsHandler
+{
+	protected ref array<ref SpookyEventBase> 	m_SoundEvents;
+	protected PlayerBase						m_Player;
+	protected float 							m_TimeAccu;
+	protected const float 						CONSECUTIVE_EVENTS_COOLDOWN = 20;//min delay in seconds before two events
+	protected const float 						EVENT_CHECK_FREQUENCY = 2;//when not in cooldown, the rate at which we query the events
+	protected const float						FIRST_EVENT_CHECK_DELAY = 15;//the delay between the first event check when we first enter the contaminated area
+	protected const float 						SURFACE_CHECK_POINT_DISTANCE = 2;//additional checks for surface are performed at this distance from the player
+	protected float 							m_NextEventCheck = FIRST_EVENT_CHECK_DELAY;
+	
+	void SpookyTriggerEventsHandler(notnull PlayerBase player)
+	{
+		if (!m_SoundEvents)
+		{
+			m_SoundEvents = new array<ref SpookyEventBase>();
+			RegisterEvents();
+		}
+		
+		m_Player = player;
+	}
+	
+	void ~SpookyTriggerEventsHandler()
+	{
+		m_SoundEvents = null;
+	}
+	
+	protected void RegisterEvents()
+	{
+		m_SoundEvents.Insert(new SpookyEventWind());
+		m_SoundEvents.Insert(new SpookyEventWhisper());
+		m_SoundEvents.Insert(new SpookyEventSteps());
+		m_SoundEvents.Insert(new SpookyEventRustle());
+
+	}
+	
+	void Update(float deltaTime)
+	{
+		m_TimeAccu += deltaTime;
+		if (m_TimeAccu > m_NextEventCheck)
+		{
+			if (SelectEvent())
+				m_NextEventCheck = CONSECUTIVE_EVENTS_COOLDOWN;
+			else
+				m_NextEventCheck = EVENT_CHECK_FREQUENCY;
+			m_TimeAccu = 0;
+		}
+	}
+	
+	protected void GatherSurfaces(notnull TStringVectorMap gatheredGurfaces)
+	{
+		gatheredGurfaces.Clear();
+		
+		vector playerPos = m_Player.GetPosition();
+		TVectorArray positions = new TVectorArray();
+		
+		positions.Insert(playerPos);
+		positions.Insert(playerPos + ("0 0 1" * SURFACE_CHECK_POINT_DISTANCE));
+		positions.Insert(playerPos + ("0 0 -1" * SURFACE_CHECK_POINT_DISTANCE));
+		positions.Insert(playerPos + ("1 0 0" * SURFACE_CHECK_POINT_DISTANCE));
+		positions.Insert(playerPos + ("-1 0 0" * SURFACE_CHECK_POINT_DISTANCE));
+		
+		foreach (vector pos : positions)
+		{
+			string surfaceType;
+			GetGame().SurfaceGetType3D(pos[0],pos[1], pos[2], surfaceType);
+			
+			if (!gatheredGurfaces.Contains(surfaceType))
+				gatheredGurfaces.Insert(surfaceType, pos);
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.TRIGGER_DEBUG))
+		{
+			foreach (vector p:positions)
+				Debug.DrawLine(p, p + "0 10 0", COLOR_BLUE,ShapeFlags.NOZBUFFER);
+		}
+		#endif
+		
+	}
+	
+	protected bool SelectEvent()
+	{
+		TStringVectorMap gatheredSurfaces = new TStringVectorMap();
+		GatherSurfaces(gatheredSurfaces);//this can be optimized by calling this on demand from an event, as none events might be eligible at this point, so we might be doing this in vain
+		
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.TRIGGER_DEBUG))
+		{
+			for(int i = 0; i < gatheredSurfaces.Count(); i++)
+			{
+				Print(gatheredSurfaces.GetKey(i));
+				Print(gatheredSurfaces.Get(gatheredSurfaces.GetKey(i)));
+				
+			}
+			Print("--------------------------------------------------------------------");
+		}
+		#endif
+		
+		array<ref SpookyEventBase> validEvents = new array<ref SpookyEventBase>();
+		float currentTime = GetGame().GetTime();
+		foreach (SpookyEventBase spookyEvent:m_SoundEvents)
+		{
+			if (spookyEvent.CanPerform(m_Player, currentTime, gatheredSurfaces))
+				validEvents.Insert(spookyEvent);
+		}
+
+		//validEvents.Debug();
+		SpookyEventBase selectedEvent;
+		
+		if (validEvents.Count() > 0)
+		{
+			int randIndex = Math.RandomIntInclusive(0, validEvents.Count() - 1);
+			selectedEvent = validEvents[randIndex];
+		}
+		if (selectedEvent)
+		{
+			selectedEvent.Perform(m_Player, currentTime, gatheredSurfaces);
+			return true;
+		}
+		return false;
+		
+	}
+
+}
+
+//!this entity gets attached to each player while present in the spooky area
+class SpookyPlayerStalker : ScriptedEntity
+{
+	
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaConstant m_UTSLConstant;
+	
+
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_Updateable		= true;
+			m_UTSSettings.m_UpdateInterval	= 3;
+			m_UTSSettings.m_TemperatureMin	= -20;
+			m_UTSSettings.m_TemperatureMax	= -20;
+			m_UTSSettings.m_RangeFull		= 2;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= -20;
+			m_UTSSettings.m_ManualUpdate	= false;
+			
+			m_UTSLConstant					= new UniversalTemperatureSourceLambdaConstant();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLConstant);
+			m_UTSource.SetActive(true);
+		}
+
+	}
+	
+}
diff --git a/scripts/4_World/DayZ/Classes/ContextMenu.c b/scripts/4_World/DayZ/Classes/ContextMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..143a6fc4bb9e29ac4f801ea3548d34a9806ca121
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ContextMenu.c
@@ -0,0 +1,288 @@
+//--------------------------------------------------------------------------
+class ContextMenu extends ScriptedWidgetEventHandler
+{
+	protected static ref ContextMenu m_ContextMenuInstance;
+	
+	Widget m_context_menu_root_widget;
+	private Widget m_context_menu_panel_widget;
+	private ref array<ref CallQueueContext> m_commands;
+	private int m_max_item_width;
+	private int m_count;
+	private bool m_builtIn = false;
+	const int ITEMS_COUNT = 27;
+	
+	//--------------------------------------------------------------------------
+	void ContextMenu()
+	{
+		m_commands = new array<ref CallQueueContext>;
+		m_count = 0;
+	}
+	//--------------------------------------------------------------------------
+	void ~ContextMenu()
+	{
+		Clear();
+	
+		delete m_context_menu_root_widget;
+	}
+	//--------------------------------------------------------------------------
+	void Init(Widget layoutRoot, bool builtIn = false)
+	{
+		m_builtIn = builtIn;
+		if (!m_context_menu_root_widget)
+		{
+			m_context_menu_root_widget = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_inventory_context_menu.layout", layoutRoot);
+			m_context_menu_panel_widget = m_context_menu_root_widget.FindAnyWidget("PanelWidget");
+			m_context_menu_root_widget.Show(false);
+			m_context_menu_root_widget.SetHandler(this);
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void Show(int x, int y)
+	{
+		if ( m_count == 0) return;
+		int screen_w, screen_h;
+		float w, h;
+		float sx, sy;
+		int offset_x;// = -20;
+		int offset_y;// = -10;
+	
+		GetScreenSize(screen_w, screen_h);
+	
+		// align buttons
+		float button_height_percent = 0.02;  // button height is 4% of screen height
+		float button_height = screen_h * button_height_percent;
+		
+		for ( int i = 0; i < m_count; i++)
+		{
+			ButtonWidget menu_button = ButtonWidget.Cast( m_context_menu_root_widget.FindAnyWidget( String( "Button" + (i+1).ToString() ) ) );
+			if(menu_button)
+			{
+					menu_button.SetSize(0.90, button_height);
+					menu_button.Show(true);
+			}
+		}
+	
+	
+		AutoHeightSpacer spacer;
+		m_context_menu_panel_widget.GetScript(spacer);
+		if ( spacer )
+		{
+			spacer.Update();	
+		}
+	
+		m_context_menu_root_widget.GetSize(w, h);
+		m_context_menu_panel_widget.GetSize(sx, sy);
+		m_context_menu_root_widget.SetSize(w, sy);
+	
+		// set position
+		m_context_menu_root_widget.GetScreenSize(w,h);
+		screen_w -= 10;
+		screen_h -= 10;
+	
+		int right_edge = x + w - offset_x;
+		if (right_edge > screen_w) 
+		{
+			x = screen_w - w - offset_x;
+		}
+		else
+		{
+			x = x + offset_x;
+		}
+	
+		int bottom_edge = y + h - offset_y;
+		if (bottom_edge > screen_h)
+		{
+			y = y - h - offset_y;
+		}
+		else
+		{
+			y = y + offset_y;
+		}
+	
+		m_context_menu_root_widget.SetPos(x, y);
+		m_context_menu_root_widget.Show(true);
+	}	
+	//--------------------------------------------------------------------------
+	void SetSize(float x, float y)
+	{
+		m_context_menu_root_widget.SetSize(x, y);
+	}
+
+	//--------------------------------------------------------------------------
+	void ShowBackdrop(bool show)
+	{
+		if (show == true)
+		{
+			m_context_menu_root_widget.FindAnyWidget("BackdropImageWidget").Show(true);
+		}
+		else
+		{
+			m_context_menu_root_widget.FindAnyWidget("BackdropImageWidget").Show(false);
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	void Hide()
+	{
+		m_context_menu_root_widget.Show(false);
+	
+		Clear();
+	}
+	
+	//--------------------------------------------------------------------------
+	bool IsVisible()
+	{
+		return m_context_menu_root_widget.IsVisible();
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		super.OnMouseLeave(w, enterW, x, y);
+		
+		if ( !m_builtIn && enterW && m_context_menu_panel_widget && enterW != m_context_menu_panel_widget && enterW.GetParent() != m_context_menu_panel_widget )
+		{
+			Hide();
+			return true;
+		}
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		super.OnMouseButtonDown(w, x, y, button);
+		
+		if (button == MouseState.LEFT && w.GetUserID() > -1 && w.GetUserID() < m_commands.Count())
+		{
+			CallQueueContext ctx = m_commands.Get(w.GetUserID());
+
+			int actionId = Param3<EntityAI, int, int>.Cast(ctx.m_params).param2;
+			if (actionId == EActions.DELETE)
+				Hide();
+			
+			UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+			if (menu)
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(menu.Refresh);
+			
+			ctx.Call();
+
+			return true;
+		}
+
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	void Add(string label, Class obj, string fn_name, Param params)
+	{
+		 AddEx(label, FadeColors.LIGHT_GREY, obj, fn_name, params);
+	}
+	
+	void AddEx(string label, int labelColor, Class obj, string funcName, Param params)
+	{
+		int count = Count();
+		ButtonWidget menuButton = ButtonWidget.Cast(m_context_menu_root_widget.FindAnyWidget(string.Format("Button%1", count + 1)));
+		if (menuButton)
+		{
+			label.ToUpper();
+			menuButton.SetText(label);
+			menuButton.SetTextColor(labelColor);
+			menuButton.Show(true);
+			if (!funcName)
+				menuButton.SetFlags(menuButton.GetFlags() | WidgetFlags.IGNOREPOINTER);	
+
+			int itemWidth = label.Length();
+			if (m_max_item_width < itemWidth)
+				m_max_item_width = itemWidth;
+		}
+		
+		m_count++;
+		m_commands.Insert(new CallQueueContext(obj, funcName, params));
+	}
+	
+	//--------------------------------------------------------------------------
+	void Remove(int index)
+	{
+		if (index < m_commands.Count())
+		{
+			m_commands.RemoveOrdered(index);
+			ButtonWidget menu_button = ButtonWidget.Cast( m_context_menu_root_widget.FindAnyWidget( String( "Button" + ( index + 1 ).ToString() ) ) );
+			menu_button.Show( false );
+			menu_button.SetText( "" );
+			m_count--;
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	int Count()
+	{
+		return m_commands.Count();
+	}
+	
+	//--------------------------------------------------------------------------
+	void Clear()
+	{	
+		int i;
+		
+		m_commands.Clear();
+		
+		if (!m_context_menu_panel_widget)
+			return;
+		Widget child = m_context_menu_panel_widget.GetChildren();
+		while(child)
+		{
+			ButtonWidget button = ButtonWidget.Cast(child);
+			if(button)
+			{
+				button.Show(false);
+			}
+			child = child.GetSibling();
+			
+			
+		}
+		m_count = 0;
+		m_max_item_width = 0;
+	}
+
+	void BuildContextMenu(notnull EntityAI entity, notnull Widget rootWidget, Class target)
+	{
+		Clear();
+
+		TSelectableActionInfoArrayEx customActions = new TSelectableActionInfoArrayEx();
+		entity.GetDebugActions(customActions);
+	
+		int actionsCount = customActions.Count();
+		for (int i = 0; i < customActions.Count(); i++)
+		{
+			TSelectableActionInfoWithColor actionInfo = TSelectableActionInfoWithColor.Cast(customActions.Get(i));
+			if (actionInfo)
+			{
+				int actionId 		= actionInfo.param2;
+				int textColor		= actionInfo.param4;
+				string actionText 	= actionInfo.param3;
+	
+				if (actionId == EActions.SEPARATOR)
+					AddEx(actionText, textColor, null, "", null);
+				else
+					AddEx(actionText, textColor, target, "OnSelectAction", new Param3<EntityAI, int, int>(entity, actionId, textColor));
+			}
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	static void DisplayContextMenu(int x, int y, notnull EntityAI entity, notnull Widget rootWidget, Class target)
+	{
+		m_ContextMenuInstance = new ContextMenu();
+		if (m_ContextMenuInstance)
+		{
+			m_ContextMenuInstance.Init(rootWidget);
+			m_ContextMenuInstance.BuildContextMenu(entity, rootWidget, target);
+
+			m_ContextMenuInstance.SetSize(1,1);
+			m_ContextMenuInstance.Show(x, y);
+		}
+	}
+	
+};
diff --git a/scripts/4_World/DayZ/Classes/Cooking/Cooking.c b/scripts/4_World/DayZ/Classes/Cooking/Cooking.c
new file mode 100644
index 0000000000000000000000000000000000000000..b9ddf7be381f191c6bf69ea5cd889f8297481918
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Cooking/Cooking.c
@@ -0,0 +1,543 @@
+enum CookingMethodType
+{
+	NONE		= 0,		//no cooking method available
+	BAKING		= 1,
+	BOILING		= 2,
+	DRYING		= 3,
+	TIME		= 4,
+	
+	COUNT
+}
+
+class Cooking
+{
+	static const float TIME_WITH_SUPPORT_MATERIAL_COEF 				= 1.0;	//! time modifier used when not using support material
+	static const float TIME_WITHOUT_SUPPORT_MATERIAL_COEF			= 2.0;  //! time modifier used when using support material
+
+	static const float COOKING_FOOD_TIME_INC_VALUE 					= 2;	//! time increase when cooking a food
+	static const float COOKING_LARD_DECREASE_COEF 					= 25;	//! how many units from quantity of lard are remove at each stage
+	static const float COOKING_FOOD_QUANTITY_DECREASE_AMOUNT_NONE 	= 25;	//! how many units from quantity of item are removed at each stage when support material is NOT used
+	static const float COOKING_FOOD_QUANTITY_DECREASE_AMOUNT_LARD 	= 0;	//! NOT USED.
+
+	static const float DEFAULT_COOKING_TEMPERATURE 					= 150;	//default temperature for cooking (e.g. cooking on stick)
+	static const float FOOD_MAX_COOKING_TEMPERATURE					= 150;	//
+	static const float PARAM_BURN_DAMAGE_COEF						= 0.05;	//value for calculating damage on items located in fireplace CargoGrid
+
+	static const float LIQUID_BOILING_POINT 						= 150;	//boiling point for liquids
+	static const float LIQUID_VAPOR_QUANTITY 						= 2;	//vapor quantity
+
+	typename COOKING_EQUIPMENT_POT	 					= Pot;
+	typename COOKING_EQUIPMENT_FRYINGPAN				= FryingPan;
+	typename COOKING_EQUIPMENT_CAULDRON					= Cauldron;
+	typename COOKING_INGREDIENT_LARD 					= Lard;
+	
+	void ProcessItemToCook(notnull ItemBase pItem, ItemBase cookingEquip, Param2<CookingMethodType, float> pCookingMethod, out Param2<bool, bool> pStateFlags)
+	{
+		Edible_Base item_to_cook = Edible_Base.Cast(pItem);
+		
+		//! state flags are in order: is_done, is_burned
+		pStateFlags = new Param2<bool, bool>(false, false);
+				
+		if (item_to_cook && item_to_cook.CanBeCooked())
+		{
+			//! enable cooking SoundEvent
+			item_to_cook.MakeSoundsOnClient(true, pCookingMethod.param1);
+
+			//! update food
+			UpdateCookingState(item_to_cook, pCookingMethod.param1, cookingEquip, pCookingMethod.param2);
+			
+			//check for done state for boiling and drying
+			if (item_to_cook.IsFoodBoiled() || item_to_cook.IsFoodDried())
+			{
+				pStateFlags.param1 = true;
+			}
+			//! check for done state from baking (exclude Lard from baked items)
+			else if (item_to_cook.IsFoodBaked() && item_to_cook.Type() != Lard)
+			{
+				pStateFlags.param1 = true;
+			}
+			//! check for burned state
+			else if (item_to_cook.IsFoodBurned())
+			{
+				pStateFlags.param2 = true;
+			}
+		}
+		else   
+		{
+			//damage item
+			pItem.DecreaseHealth("", "", PARAM_BURN_DAMAGE_COEF * 100);
+			
+			//add temperature to item
+			AddTemperatureToItem(pItem, null, 0);
+		}
+	}
+
+	//COOKING PROCESS
+	//--- Cooking with equipment (pot)
+	//Returns 1 if the item changed its cooking stage, 0 if not
+	int CookWithEquipment(ItemBase cooking_equipment, float cooking_time_coef = 1)
+	{
+		bool is_empty;
+		
+		//check cooking conditions
+		if (cooking_equipment == null)
+		{
+			return 0;
+		}
+		
+		if (cooking_equipment.IsRuined())
+		{
+			return 0;
+		}
+		
+		//manage items in cooking equipment
+		Param2<bool, bool> stateFlags = new Param2<bool, bool>(false, false); // 1st - done; 2nd - burned
+		Param2<CookingMethodType, float> cookingMethodWithTime = GetCookingMethodWithTimeOverride(cooking_equipment);
+		
+		//! cooking time coef override
+		if (cooking_time_coef != 1)
+		{
+			cookingMethodWithTime.param2 = cooking_time_coef;
+		}
+		
+		CargoBase cargo = cooking_equipment.GetInventory().GetCargo();
+		if (cargo)
+		{
+			is_empty = cargo.GetItemCount() == 0;
+			
+			//process items
+			for (int i = 0; i < cargo.GetItemCount(); i++)
+			{
+				ProcessItemToCook(ItemBase.Cast(cargo.GetItem(i)), cooking_equipment, cookingMethodWithTime, stateFlags);
+			}
+		}
+		else
+		{
+			ProcessItemToCook(cooking_equipment, cooking_equipment, cookingMethodWithTime, stateFlags);
+		}
+		
+		//manage cooking equipment
+		Bottle_Base bottle_base = Bottle_Base.Cast(cooking_equipment);
+		if (bottle_base)
+		{
+			float cookingEquipmentTemp = cooking_equipment.GetTemperature();
+			
+			//handle water boiling
+			if (cookingEquipmentTemp >= LIQUID_BOILING_POINT)
+			{
+				//remove agents
+				cooking_equipment.RemoveAllAgents();
+				
+				if (cooking_equipment.GetQuantity() > 0)
+				{
+					//vaporize liquid
+					cooking_equipment.AddQuantity(-LIQUID_VAPOR_QUANTITY);
+				}
+			}
+			
+			//handle audio visuals
+			bottle_base.RefreshAudioVisualsOnClient(cookingMethodWithTime.param1, stateFlags.param1, is_empty, stateFlags.param2);
+		}
+
+		FryingPan frying_pan = FryingPan.Cast(cooking_equipment);
+		if (frying_pan && !bottle_base)
+		{
+			//handle audio visuals
+			frying_pan.RefreshAudioVisualsOnClient(cookingMethodWithTime.param1, stateFlags.param1, is_empty, stateFlags.param2);
+		}
+		
+		return 1;
+	}
+	
+	//Returns 1 if the item changed its cooking stage, 0 if not
+	int CookOnStick( Edible_Base item_to_cook, float cook_time_inc )
+	{
+		if ( item_to_cook && item_to_cook.CanBeCookedOnStick() )
+		{
+			//update food
+			return UpdateCookingStateOnStick( item_to_cook, cook_time_inc );
+		}
+		
+		return 0;
+	}
+	
+	//Returns 1 if the item changed its cooking stage, 0 if not
+	protected int UpdateCookingState(Edible_Base item_to_cook, CookingMethodType cooking_method, ItemBase cooking_equipment, float cooking_time_coef)
+	{
+		//food properties
+		float food_temperature = item_to_cook.GetTemperature();
+		
+		//{min_temperature, time_to_cook, max_temperature (optional)}
+		//get next stage name - if next stage is not defined, next stage name will be empty "" and no cooking properties (food_min_temp, food_time_to_cook, food_max_temp) will be set
+		FoodStageType new_stage_type = item_to_cook.GetNextFoodStageType(cooking_method);
+
+		float food_min_temp 	= 0;
+		float food_time_to_cook = 0;
+		float food_max_temp		= -1;
+		
+		//Set next stage cooking properties if next stage possible
+		if (item_to_cook.CanChangeToNewStage(cooking_method)) // new_stage_type != NONE
+		{
+			array<float> next_stage_cooking_properties = new array<float>();
+			next_stage_cooking_properties = FoodStage.GetAllCookingPropertiesForStage(new_stage_type, null, item_to_cook.GetType());
+			
+			food_min_temp = next_stage_cooking_properties.Get(eCookingPropertyIndices.MIN_TEMP);
+			food_time_to_cook = next_stage_cooking_properties.Get(eCookingPropertyIndices.COOK_TIME);
+			// The last element is optional and might not exist
+			if (next_stage_cooking_properties.Count() > 2)
+			{
+				food_max_temp = next_stage_cooking_properties.Get(eCookingPropertyIndices.MAX_TEMP);
+			}
+		}
+		
+		//add temperature
+		AddTemperatureToItem(item_to_cook, cooking_equipment, food_min_temp);
+		
+		//add cooking time if the food can be cooked by this method
+		if (food_min_temp > 0 && food_temperature >= food_min_temp)
+		{
+			float new_cooking_time = item_to_cook.GetCookingTime() + COOKING_FOOD_TIME_INC_VALUE * cooking_time_coef;
+			item_to_cook.SetCookingTime(new_cooking_time);
+			
+			//progress to next stage
+			if (item_to_cook.GetCookingTime() >= food_time_to_cook)
+			{
+				//if max temp is defined check next food stage
+				if (food_max_temp >= 0)
+				{
+					if (food_temperature > food_max_temp && item_to_cook.GetFoodStageType() != FoodStageType.BURNED)
+					{
+						new_stage_type = FoodStageType.BURNED;
+					}
+				}
+				
+				//! Change food stage
+				item_to_cook.ChangeFoodStage(new_stage_type);
+				//! Remove all modifiers
+				item_to_cook.RemoveAllAgentsExcept(eAgents.BRAIN);
+				
+				if (cooking_equipment)
+				{
+					if (cooking_method == CookingMethodType.BAKING)
+					{
+						ItemBase lard = GetItemTypeFromCargo(COOKING_INGREDIENT_LARD, cooking_equipment);
+						if (lard)
+						{
+							//decrease lard quantity
+							float lardQuantity = lard.GetQuantity() - COOKING_LARD_DECREASE_COEF;
+							lardQuantity = Math.Clamp(lardQuantity, 0, lard.GetQuantityMax());
+							lard.SetQuantity(lardQuantity);
+						}
+						else
+						{
+							//! any foodstage without lard
+							DecreaseCookedItemQuantity(item_to_cook, COOKING_FOOD_QUANTITY_DECREASE_AMOUNT_NONE);
+						}
+					}
+				}
+				else
+				{
+					//! any foodstage without lard 
+					DecreaseCookedItemQuantity(item_to_cook, COOKING_FOOD_QUANTITY_DECREASE_AMOUNT_NONE);
+				}
+				
+				//reset cooking time
+				item_to_cook.SetCookingTime(0);
+
+				return 1;
+			}
+		}
+		
+		return 0;
+	}
+	
+	//Returns 1 if the item changed its cooking stage, 0 if not
+	protected int UpdateCookingStateOnStick( Edible_Base item_to_cook, float cook_time_inc )
+	{
+		//food properties
+		float food_temperature = item_to_cook.GetTemperature();
+		
+		//{min_temperature, time_to_cook, max_temperature (optional)}
+		//get next stage name - if next stage is not defined, next stage name will be empty "" and no cooking properties (food_min_temp, food_time_to_cook, food_max_temp) will be set
+		FoodStageType new_stage_type = item_to_cook.GetNextFoodStageType( CookingMethodType.BAKING );
+		float food_min_temp = 0;
+		float food_time_to_cook = 0;
+		float food_max_temp = -1;
+		bool is_done = false;	// baked
+		bool is_burned = false;	// burned
+
+		//Set next stage cooking properties if next stage possible
+		if ( item_to_cook.CanChangeToNewStage( CookingMethodType.BAKING ) )
+		{
+			array<float> next_stage_cooking_properties = new array<float>;
+			next_stage_cooking_properties = FoodStage.GetAllCookingPropertiesForStage( new_stage_type, null, item_to_cook.GetType() );
+			
+			food_min_temp = next_stage_cooking_properties.Get( eCookingPropertyIndices.MIN_TEMP );
+			food_time_to_cook = next_stage_cooking_properties.Get( eCookingPropertyIndices.COOK_TIME );
+			// The last element is optional and might not exist
+			if ( next_stage_cooking_properties.Count() > 2 )
+				food_max_temp = next_stage_cooking_properties.Get( eCookingPropertyIndices.MAX_TEMP );
+		}
+		
+		
+		// refresh audio
+		if (item_to_cook.GetInventory().IsAttachment())
+		{
+			item_to_cook.MakeSoundsOnClient(true, CookingMethodType.BAKING);
+			//add temperature
+			AddTemperatureToItem(item_to_cook, null, food_min_temp);
+		}
+		
+		//add cooking time if the food can be cooked by this method
+		if ( food_min_temp > 0 && food_temperature >= food_min_temp )
+		{
+			float new_cooking_time = item_to_cook.GetCookingTime() + cook_time_inc;
+			item_to_cook.SetCookingTime( new_cooking_time );
+			
+			//progress to next stage
+			if ( item_to_cook.GetCookingTime() >= food_time_to_cook )
+			{
+				//if max temp is defined check next food stage
+				if ( food_max_temp >= 0 )
+				{
+					if ( food_temperature > food_max_temp && item_to_cook.GetFoodStageType() != FoodStageType.BURNED )
+					{
+						new_stage_type = FoodStageType.BURNED;
+					}
+				}
+				
+				//change food stage
+				item_to_cook.ChangeFoodStage( new_stage_type );
+				item_to_cook.RemoveAllAgentsExcept(eAgents.BRAIN);
+				
+				DecreaseCookedItemQuantity(item_to_cook, COOKING_FOOD_QUANTITY_DECREASE_AMOUNT_NONE);
+
+				//reset cooking time
+				item_to_cook.SetCookingTime( 0 );
+				return 1;
+			}
+		}
+		
+		return 0;
+	}
+	
+	void SmokeItem(Edible_Base item_to_cook, float cook_time_inc)
+	{
+		if (item_to_cook)
+		{
+			float new_cook_time = item_to_cook.GetCookingTime() + cook_time_inc;
+			float drying_cook_time = FoodStage.GetCookingPropertyFromIndex(eCookingPropertyIndices.COOK_TIME, FoodStageType.DRIED, null, item_to_cook.GetType());
+
+			switch (item_to_cook.GetFoodStageType())
+			{
+			case FoodStageType.RAW:
+				item_to_cook.SetCookingTime(new_cook_time);
+
+				if (item_to_cook.GetCookingTime() >= drying_cook_time)
+				{
+					item_to_cook.ChangeFoodStage(FoodStageType.DRIED);
+					item_to_cook.RemoveAllAgentsExcept(eAgents.BRAIN);
+					item_to_cook.SetCookingTime(0);
+				}
+			break;
+			default:
+				item_to_cook.SetCookingTime(new_cook_time);
+
+				if (item_to_cook.GetCookingTime() >= drying_cook_time)
+				{
+					item_to_cook.ChangeFoodStage(FoodStageType.BURNED);
+					item_to_cook.RemoveAllAgents();
+					item_to_cook.SetCookingTime(0);
+				}
+			break;
+			}
+		}
+	}
+	
+	void TerminateCookingSounds(ItemBase pItem)
+	{
+		Edible_Base edible;
+		if (pItem)
+		{
+			if (pItem.GetInventory()) // cookware
+			{
+				CargoBase cargo = pItem.GetInventory().GetCargo();
+				if (cargo)
+				{
+					for (int i = 0; i < cargo.GetItemCount(); i++)
+					{
+						edible = Edible_Base.Cast(cargo.GetItem(i));
+						if (edible)
+						{
+							edible.MakeSoundsOnClient(false);
+						}
+					}
+				}
+			}
+			else
+			{
+				edible = Edible_Base.Cast(pItem);
+				if (edible)
+				{
+					edible.MakeSoundsOnClient(false);
+				}
+			}
+		}
+	}
+	
+	//! Cooking data
+	protected ItemBase GetItemTypeFromCargo( typename item_type, ItemBase cooking_equipment )
+	{
+		CargoBase cargo = cooking_equipment.GetInventory().GetCargo();
+		if (cargo)
+		{
+			for (int i = 0; i < cargo.GetItemCount(); i++)
+			{
+				EntityAI entity = cargo.GetItem(i);
+				if (entity.Type() == item_type)
+				{
+					ItemBase item = ItemBase.Cast(entity);
+		
+					return item;
+				}
+			}
+		}
+		
+		return null;
+	}
+
+	//! DEPREACTED
+	protected CookingMethodType GetCookingMethod(ItemBase cooking_equipment)
+	{
+		if (cooking_equipment.Type() == COOKING_EQUIPMENT_POT || cooking_equipment.Type() == COOKING_EQUIPMENT_CAULDRON)
+		{
+			//has water, but not petrol dammit X)
+			if (cooking_equipment.GetQuantity() > 0 && cooking_equipment.GetLiquidType() != LIQUID_GASOLINE)
+			{
+				return CookingMethodType.BOILING;
+			}
+			
+			//has lard in cargo
+			if (GetItemTypeFromCargo(COOKING_INGREDIENT_LARD, cooking_equipment))
+			{
+				return CookingMethodType.BAKING;
+			}
+			return CookingMethodType.DRYING;
+		}
+		
+		if (cooking_equipment.Type() == COOKING_EQUIPMENT_FRYINGPAN)
+		{
+			if (GetItemTypeFromCargo(COOKING_INGREDIENT_LARD, cooking_equipment))
+			{
+				return CookingMethodType.BAKING;
+			}
+			return CookingMethodType.DRYING;
+		}
+
+		return CookingMethodType.NONE;
+	}
+	
+	protected Param2<CookingMethodType, float> GetCookingMethodWithTimeOverride(ItemBase cooking_equipment)
+	{
+		Param2<CookingMethodType, float> val = new Param2<CookingMethodType, float>(CookingMethodType.NONE, TIME_WITH_SUPPORT_MATERIAL_COEF);
+
+		switch (cooking_equipment.Type())
+		{
+			case COOKING_EQUIPMENT_POT:
+			case COOKING_EQUIPMENT_CAULDRON:
+			case COOKING_EQUIPMENT_FRYINGPAN:
+				if (cooking_equipment.GetQuantity() > 0)
+				{
+					if (cooking_equipment.GetLiquidType() == LIQUID_GASOLINE)
+					{
+						//! when cooking in gasoline, jump to drying state(will be burnt then)
+						val = new Param2<CookingMethodType, float>(CookingMethodType.DRYING, TIME_WITHOUT_SUPPORT_MATERIAL_COEF);
+						break;
+					}
+	
+					val = new Param2<CookingMethodType, float>(CookingMethodType.BOILING, TIME_WITH_SUPPORT_MATERIAL_COEF);
+					break;
+				}
+				
+				if (GetItemTypeFromCargo(COOKING_INGREDIENT_LARD, cooking_equipment))
+				{
+					//has lard in cargo, slower process
+					val = new Param2<CookingMethodType, float>(CookingMethodType.BAKING, TIME_WITH_SUPPORT_MATERIAL_COEF);
+					break;
+				}
+
+				if (cooking_equipment.GetInventory().GetCargo().GetItemCount() > 0)
+				{
+					val = new Param2<CookingMethodType, float>(CookingMethodType.BAKING, TIME_WITHOUT_SUPPORT_MATERIAL_COEF);
+					break;
+				}
+				
+				val = new Param2<CookingMethodType, float>(CookingMethodType.NONE, TIME_WITHOUT_SUPPORT_MATERIAL_COEF);
+				break;
+			
+			default:
+				val = new Param2<CookingMethodType, float>(CookingMethodType.BAKING, TIME_WITHOUT_SUPPORT_MATERIAL_COEF);
+				break;
+		}
+
+		return val;
+	}
+	
+	Edible_Base GetFoodOnStick( ItemBase stick_item )
+	{
+		Edible_Base food_on_stick = Edible_Base.Cast( stick_item.GetAttachmentByType( Edible_Base ) );
+
+		return food_on_stick;
+	}
+	
+	float GetTimeToCook( Edible_Base item_to_cook, CookingMethodType cooking_method )
+	{
+		FoodStageType food_stage_type = item_to_cook.GetNextFoodStageType( cooking_method );
+		return FoodStage.GetCookingPropertyFromIndex( eCookingPropertyIndices.COOK_TIME, food_stage_type, null, item_to_cook.GetType());
+	}
+
+	float GetMinTempToCook( Edible_Base item_to_cook, CookingMethodType cooking_method )
+	{
+		FoodStageType food_stage_type = item_to_cook.GetNextFoodStageType( cooking_method );
+		return FoodStage.GetCookingPropertyFromIndex( eCookingPropertyIndices.MIN_TEMP, food_stage_type, null, item_to_cook.GetType());
+	}
+	
+	//add temperature to item
+	protected void AddTemperatureToItem( ItemBase cooked_item, ItemBase cooking_equipment, float min_temperature )
+	{
+		if ( cooked_item.GetTemperatureMax() >= FireplaceBase.PARAM_ITEM_HEAT_MIN_TEMP )
+		{
+			float item_temperature = cooked_item.GetTemperature();
+			
+			//set actual cooking temperature
+			float actual_cooking_temp = DEFAULT_COOKING_TEMPERATURE;	//default
+			if ( cooking_equipment )
+			{
+				actual_cooking_temp = cooking_equipment.GetTemperature();
+			}
+			
+			//add temperature
+			if ( actual_cooking_temp > item_temperature )
+			{
+				item_temperature = actual_cooking_temp * 0.5;
+				item_temperature = Math.Clamp( item_temperature, min_temperature, FOOD_MAX_COOKING_TEMPERATURE );
+				
+				//set new temperature
+				if ( GetGame() && GetGame().IsServer() )
+				{
+					cooked_item.SetTemperature( item_temperature );
+				}
+			}
+		}
+	}
+	
+	protected void DecreaseCookedItemQuantity(notnull Edible_Base pItem, float pAmount = 0.0)
+	{
+		if (GetGame().IsServer())
+		{
+			float quantity = pItem.GetQuantity() - pAmount;
+			quantity = Math.Clamp(quantity, 0, pItem.GetQuantityMax());
+			pItem.SetQuantity(quantity);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Cooking/FireConsumable.c b/scripts/4_World/DayZ/Classes/Cooking/FireConsumable.c
new file mode 100644
index 0000000000000000000000000000000000000000..2eec44aa174f65c97d155ecef8594b6aaf5222c9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Cooking/FireConsumable.c
@@ -0,0 +1,36 @@
+class FireConsumable
+{
+	ItemBase m_Item;
+	float m_Energy;
+	float m_RemainingEnergy;
+	
+	void FireConsumable ( ItemBase item, float energy )
+	{
+		m_Item = item;
+		m_Energy = energy;
+		m_RemainingEnergy = energy;
+	}
+	
+	//Item
+	ItemBase GetItem()
+	{
+		return m_Item;
+	}
+	
+	//Energy
+	float GetEnergy()
+	{
+		return m_Energy;
+	}
+	
+	//Remaining energy
+	float GetRemainingEnergy()
+	{
+		return m_RemainingEnergy;
+	}
+	
+	void SetRemainingEnergy( float energy )
+	{
+		m_RemainingEnergy = energy;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Cooking/FireConsumableType.c b/scripts/4_World/DayZ/Classes/Cooking/FireConsumableType.c
new file mode 100644
index 0000000000000000000000000000000000000000..66ab4d32bb95e0398c597a335be56b537219dd9c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Cooking/FireConsumableType.c
@@ -0,0 +1,39 @@
+class FireConsumableType
+{
+	typename 	m_ItemType;
+	float 		m_Energy;
+	bool 		m_IsKindling;
+	string 		m_AttSlot;
+	
+	void FireConsumableType ( typename item_type, float energy, bool is_kindling, string att_slot )
+	{
+		m_ItemType = item_type;
+		m_Energy = energy;
+		m_IsKindling = is_kindling;
+		m_AttSlot = att_slot;
+	}
+	
+	//Item typename
+	typename GetItemType()
+	{
+		return m_ItemType;
+	}
+	
+	//Energy
+	float GetEnergy()
+	{
+		return m_Energy;
+	}
+	
+	//Is Kindling
+	bool IsKindling()
+	{
+		return m_IsKindling;
+	}
+	
+	//Attachment slot
+	string GetAttSlot()
+	{
+		return m_AttSlot;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/CorpseData.c b/scripts/4_World/DayZ/Classes/CorpseData.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e1c7cecffaebef99f0b52dc84e3fe202d6edbe2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/CorpseData.c
@@ -0,0 +1,103 @@
+class CorpseData
+{
+	const int 	GET_LIFETIME_TRIES_MAX = 3;
+	
+	bool 		m_bUpdate;
+	int 		m_iLastUpdateTime;
+	int 		m_iTimeOfDeath;
+	int 		m_iMaxLifetime;
+	int 		m_iCorpseState;
+	int 		m_iTriesToGetLifetime;
+	PlayerBase 	m_Player;
+	
+	void CorpseData(notnull PlayerBase player,int time_of_death)
+	{
+		m_bUpdate = true;
+		m_iLastUpdateTime = time_of_death;
+		m_iTimeOfDeath = time_of_death;
+		m_iMaxLifetime = -1;
+		//m_iMaxLifetime = player.GetLifetime(); //player.GetEconomyProfile().GetLifetime();
+		m_iCorpseState = PlayerConstants.CORPSE_STATE_FRESH;
+		m_Player = player;
+		m_iTriesToGetLifetime = 0;
+		
+		/*Print("CorpseData init value | player.GetLifetime(): " + player.GetLifetime() );
+		Print("CorpseData init value | player.GetEconomyProfile().GetLifetime(): " + player.GetEconomyProfile().GetLifetime() );
+		Print("---------------------");*/
+	}
+	
+	void UpdateCorpseState(bool force_check = false)
+	{
+		/*Print("CorpseData update value | player.GetLifetime(): " + m_Player.GetLifetime() );
+		Print("CorpseData update value | player.GetEconomyProfile().GetLifetime(): " + m_Player.GetEconomyProfile().GetLifetime() );
+		Print("---------------------");*/
+		
+		if (m_iMaxLifetime <= 0 )
+		{
+			if ( m_iCorpseState == PlayerConstants.CORPSE_STATE_DECAYED && !force_check )
+			{
+				m_bUpdate = false;
+				return;
+			}
+			else
+			{
+				m_iMaxLifetime = m_Player.GetLifetime();
+				if (m_iMaxLifetime <= 0) //cleanup time not initialized yet!
+				{
+					m_iTriesToGetLifetime++;
+					m_iMaxLifetime = -1;
+					if (m_iTriesToGetLifetime >= GET_LIFETIME_TRIES_MAX)
+					{
+						m_bUpdate = false;
+					}
+					
+					return;
+				}
+				m_iMaxLifetime -= 30 * m_iTriesToGetLifetime; //adjusts for failed init attempts
+				m_Player.SetLifetime(m_iMaxLifetime);
+			}
+		}
+		
+		int ioriginal_state = m_iCorpseState;
+		float fremaining_lifetime = m_Player.GetLifetime();
+		float fdecay_percentage = fremaining_lifetime/m_iMaxLifetime;
+		
+		#ifdef DIAG_DEVELOPER
+		float timeAccel = 1;
+		if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.FOOD_DECAY))
+		{
+			timeAccel = FeatureTimeAccel.GetFeatureTimeAccelValue();
+			float percetElapsed = 1-fdecay_percentage;
+			fdecay_percentage = Math.Clamp(1 - percetElapsed * timeAccel,0,1);
+		}
+		#endif
+		
+		//int current_time = GetGame().GetTime();
+		//float fdecay_percentage_by_game_time = 1 - ((current_time - m_iTimeOfDeath) / 1000 )/m_iMaxLifetime;
+		//Print("fdecay_percentage_by_game_time - " + fdecay_percentage_by_game_time);
+		
+		if (fdecay_percentage > PlayerConstants.CORPSE_THRESHOLD_MEDIUM)
+		{
+			m_iCorpseState = PlayerConstants.CORPSE_STATE_FRESH;
+		}
+		else if (fdecay_percentage <= PlayerConstants.CORPSE_THRESHOLD_MEDIUM && fdecay_percentage > PlayerConstants.CORPSE_THRESHOLD_DECAYED)
+		{
+			m_iCorpseState = PlayerConstants.CORPSE_STATE_MEDIUM;
+		}
+		else
+		{
+			m_iCorpseState = PlayerConstants.CORPSE_STATE_DECAYED;
+			m_bUpdate = false;
+		}
+		
+		if (ioriginal_state != m_iCorpseState)
+		{
+			m_Player.m_CorpseState = m_iCorpseState;
+			m_Player.SetSynchDirty();
+/*
+			Print("Corpse Syncing | player - " + m_Player);
+			Print("Corpse Syncing | state - " + m_iCorpseState);
+*/
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/CraftingManager.c b/scripts/4_World/DayZ/Classes/CraftingManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7cd8b20676e87b35b58fde7e4e52da74819f78c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/CraftingManager.c
@@ -0,0 +1,179 @@
+//! Client only - manage set up crafting on client 
+class CraftingManager
+{
+	const int CM_MODE_NONE = 0;
+	const int CM_MODE_WORLD = 1;
+	const int CM_MODE_INVENTORY = 2;
+
+	PlayerBase m_player;
+	PluginRecipesManager m_recipesManager; 
+	ActionVariantManager m_actionVariantManager;
+	int m_recipeID;
+	int m_contextualRecipeID;
+	int m_recipeCount;
+	int m_craftingMode;
+	ItemBase m_item1;
+	ItemBase m_item2;
+	
+	ref array<int> m_recipes;
+
+	void CraftingManager(PlayerBase player, PluginRecipesManager recipesManager)
+	{
+		m_recipesManager = recipesManager;
+		m_player = player;
+		m_craftingMode = CM_MODE_NONE;
+		m_actionVariantManager = ActionManagerClient.GetVariantManager( ActionWorldCraft );
+		m_actionVariantManager.GetOnUpdateInvoker().Clear();
+		m_actionVariantManager.GetOnUpdateInvoker().Insert(OnUpdate);
+		m_recipes = new array<int>;
+	}
+
+	void SetRecipeID(int recipeID)
+	{
+		m_recipeID = recipeID;
+	}
+	
+	int GetRecipeID()
+	{
+		return m_recipeID;
+	}
+	
+	bool IsInventoryCraft()
+	{
+		return m_craftingMode == CM_MODE_INVENTORY;
+	}
+	
+	bool IsWorldCraft()
+	{
+		return m_craftingMode == CM_MODE_WORLD;
+	}
+	
+	int GetRecipesCount()
+	{
+		return 	m_recipeCount;
+	}
+	 // deprecated
+	void SetNextRecipe()
+	{
+
+	}
+	
+	void OnUpdate( Object item, Object target, int component_index )
+	{
+		ItemBase item1 = ItemBase.Cast( item );
+		ItemBase item2 = ItemBase.Cast( target );
+		
+		if ( m_player.GetActionManager().GetRunningAction() )
+			return;
+		
+		ItemBase item_in_hands = m_player.GetItemInHands();
+		
+		if (!item1 || !item2)
+		{
+			m_recipeCount = 0;
+			m_craftingMode = CM_MODE_NONE;
+			m_actionVariantManager.Clear();
+			return;
+		}
+		else
+		{
+			
+			if ( item1 != item_in_hands && item2 != item_in_hands )
+			{
+				InventoryLocation il1 = new InventoryLocation;
+				InventoryLocation il2 = new InventoryLocation;
+				
+				item1.GetInventory().GetCurrentInventoryLocation(il1);
+				item2.GetInventory().GetCurrentInventoryLocation(il2);
+				
+				Error("Crafting manager - both of items are out of hands - item1: " + il1.DumpToString() + " item2: " + il2.DumpToString() + " / item in hands: - " + item_in_hands);
+			}
+		}
+		
+		int recipeCount = 0;
+		
+		if (m_craftingMode == CM_MODE_INVENTORY)
+		{
+			recipeCount = m_recipesManager.GetValidRecipes(m_item1, m_item2, m_recipes, m_player);
+			m_recipeCount = recipeCount;
+			m_recipeID = m_recipes.Get(m_contextualRecipeID);
+			return;
+		}
+		
+		recipeCount = m_recipesManager.GetValidRecipes(item1, item2, m_recipes, m_player);
+
+		if (recipeCount == 0)
+		{
+			m_recipeCount = 0;
+			m_craftingMode = CM_MODE_NONE;
+			m_actionVariantManager.Clear();
+		}
+		else
+		{
+			if ( m_craftingMode == CM_MODE_NONE || m_recipeCount != recipeCount  || m_item1 != item1  || m_item2 != item2 )
+			{
+				m_craftingMode = CM_MODE_WORLD;
+				m_recipeCount = recipeCount;
+				m_contextualRecipeID = 0;
+				m_item1 = item1;
+				m_item2 = item2;
+				
+				m_actionVariantManager.SetActionVariantCount(m_recipeCount);
+			}
+			m_recipeID = m_recipes.Get(m_contextualRecipeID);
+		}
+		
+	}
+	
+	bool SetInventoryCraft(int recipeID, ItemBase item1, ItemBase item2)
+	{
+		int recipeCount = m_recipesManager.GetValidRecipes(item1,item2,m_recipes, m_player);
+		
+		for ( int i = 0; i < recipeCount; i++ )
+		{
+			if (recipeID == -1 || m_recipes.Get(i) == recipeID)
+			{
+				if ( m_recipesManager.GetIsInstaRecipe(m_recipes.Get(i)) || m_recipesManager.IsEnableDebugCrafting() )
+				{
+					Param craftParam = new Param3<int, ItemBase, ItemBase>(m_recipes.Get(i), item1, item2);
+					m_player.RPCSingleParam(ERPCs.RPC_CRAFTING_INVENTORY_INSTANT, craftParam, true, m_player.GetIdentity());
+					return true;
+				}
+				else
+				{
+					m_craftingMode = CM_MODE_INVENTORY;
+					m_recipeCount = recipeCount;
+					m_contextualRecipeID = i;
+					m_item1 = item1;
+					m_item2 = item2;
+					m_recipeID = m_recipes.Get(i);
+
+					ActionManagerClient am = ActionManagerClient.Cast(m_player.GetActionManager());
+					
+					if ( m_player.GetItemInHands() == item1) am.SetInventoryAction( am.GetAction(ActionWorldCraft), item2, item1);
+					else am.SetInventoryAction( am.GetAction(ActionWorldCraft), item1, item2);					
+
+					return true;
+				}		
+			}			
+			
+		}	
+		return false;
+	}
+	
+	void ResetInventoryCraft()
+	{
+		m_recipeCount = 0;
+		m_craftingMode = CM_MODE_NONE;
+	}
+	
+	bool IsEnableDebugCrafting()
+	{
+		return true;
+	}
+	
+	int GetRecipeID( int action_index )
+	{
+		return m_recipes[action_index];
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Debug/PresetHandlers.c b/scripts/4_World/DayZ/Classes/Debug/PresetHandlers.c
new file mode 100644
index 0000000000000000000000000000000000000000..1e20cd0c4cdfa79e5a0a8617835fb641770b5bfd
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Debug/PresetHandlers.c
@@ -0,0 +1,218 @@
+#ifdef DEVELOPER
+//----------------------------------------------------------
+//Class names need to match the preset name + _Preset suffix
+//----------------------------------------------------------
+
+
+//TEMPLATE:
+/*
+
+class Farmer_Preset extends PresetSpawnBase
+{
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		//m_ItemsInventory -> contains all items in player inventory
+	}
+}
+
+*/
+
+//---------------------------------------------
+
+class FreshSpawn_Preset extends PresetSpawnBase
+{
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		FindAndTakeToHandsFromInventory("Plum");
+	}
+}
+//---------------------------------------------
+
+class Farmer_Preset extends PresetSpawnBase
+{
+	override void OnPresetSpawn(PlayerBase player)
+	{
+
+	}
+}
+//---------------------------------------------
+class AntiHazard_Preset extends PresetSpawnBase
+{
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		EntityAI mask = FindItem("AirborneMask");
+		
+		if (mask)
+		{
+			auto debugParams = DebugSpawnParams.WithPlayer(player);
+			mask.OnDebugSpawnEx(debugParams);
+		}
+		
+	}
+}
+//---------------------------------------------
+
+class Update117_Preset extends PresetSpawnBase
+{	
+	vector randompos;
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		randompos = player.GetPosition();
+		foreach (EntityAI itm : m_ItemsPreset)
+		{
+			if (itm)
+			{
+				vector itempos;
+				itempos[0] = Math.RandomFloat(-1,1);
+				itempos[2] = Math.RandomFloat(-1,1);
+				
+				ItemBase itmBase = ItemBase.Cast(itm);
+				
+				itmBase.SetPosition(randompos + itempos);
+				itmBase.SetQuantity(100);
+			}
+		}
+	}
+}
+
+//---------------------------------------------
+
+class Update118_Preset extends PresetSpawnBase
+{	
+	vector randompos;
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		randompos = player.GetPosition();
+		foreach (EntityAI itm : m_ItemsPreset)
+		{
+			if (itm)
+			{
+				vector itempos;
+				itempos[0] = Math.RandomFloat(-1,1);
+				itempos[2] = Math.RandomFloat(-1,1);
+				
+				ItemBase itmBase = ItemBase.Cast(itm);
+				
+				itmBase.SetPosition(randompos + itempos);
+				itmBase.SetQuantity(100);
+			}
+		}
+	}
+}
+//---------------------------------------------
+
+class BBMaterials_Preset extends PresetSpawnBase
+{	
+	vector randompos;
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		randompos = player.GetPosition();
+		foreach (EntityAI itm : m_ItemsPreset)
+		{
+			if (itm)
+			{
+				vector itempos;
+				itempos[0] = Math.RandomFloat(-1,1);
+				itempos[2] = Math.RandomFloat(-1,1);
+				itm.SetPosition(randompos + itempos);
+			}
+		}
+	}
+}
+//---------------------------------------------
+
+
+class Military_Light_Preset extends PresetSpawnBase
+{
+	override void OnPresetSpawn(PlayerBase player)
+	{
+		EntityAI weapon = FindItem("AK101");
+
+		auto debugParams = DebugSpawnParams.WithPlayer(player);
+		weapon.OnDebugSpawnEx(debugParams);
+
+		FindAndTakeToHandsFromInventory("AK101");
+	}
+}
+
+
+
+
+//---------------------------------------------
+//------------------ BASE ---------------------
+//---------------------------------------------
+
+class PresetSpawnBase
+{
+	ref array<EntityAI> m_ItemsInventory = new array<EntityAI>;//inventory items
+	HumanInventory m_Inventory;
+	PlayerBase m_Player;
+	array<EntityAI> m_ItemsPreset;//all items spawned from this preset
+	//---------------------------------------------
+	
+	void Init(PlayerBase player)
+	{
+		m_Player = player;
+		m_Inventory = player.GetHumanInventory();
+		m_ItemsPreset = player.m_PresetItems;
+		m_Inventory.EnumerateInventory(InventoryTraversalType.INORDER, m_ItemsInventory);
+		OnPresetSpawn(player);
+
+		foreach (auto item:m_ItemsPreset)
+		{
+			Print(item);
+		}
+	}
+	
+	//---------------------------------------------
+	
+	void OnPresetSpawn(PlayerBase player)
+	{
+
+	}
+	//---------------------------------------------
+	
+	void TakeToHands(EntityAI item)
+	{
+		if (GetGame().IsMultiplayer() && m_Player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_SERVER)//throws assert otherwise
+			return;
+		if (GetGame().IsDedicatedServer())
+		{
+			m_Player.TakeEntityToHandsImpl(InventoryMode.SERVER, item);
+		}
+		else
+		{
+			m_Player.TakeEntityToHandsImpl(InventoryMode.PREDICTIVE, item);
+		}
+		
+	}
+	
+	void FindAndTakeToHandsFromInventory(string classname)
+	{
+		m_Inventory.EnumerateInventory(InventoryTraversalType.INORDER, m_ItemsInventory);
+		foreach(EntityAI item:m_ItemsInventory)
+		{
+			if (item.ClassName() == classname)
+			{
+				TakeToHands(item);
+				return;
+			}
+		}
+	}
+	
+	EntityAI FindItem(string classname)
+	{
+		m_Inventory.EnumerateInventory(InventoryTraversalType.INORDER, m_ItemsInventory);
+		foreach(EntityAI item:m_ItemsInventory)
+		{
+			if (item.ClassName() == classname)
+			{
+				return item;
+			}
+		}
+		return null;
+	}
+	
+}
+
+#endif
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/DebugMonitorValues.c b/scripts/4_World/DayZ/Classes/DebugMonitorValues.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7cd33beeb14cffdcf9d8ef714b393422ebfaa23
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/DebugMonitorValues.c
@@ -0,0 +1,205 @@
+class DebugMonitorValues
+{
+	const int TYPE_HEALTH 		= 1;
+	const int TYPE_BLOOD 		= 2;
+	const int TYPE_BODY_TEMP 	= 3;
+	const int TYPE_POSITION 	= 4;
+	const int TYPE_LAST_DAMAGE 	= 5;
+	
+	const int LAST_DAMAGE_FALL	= 1;
+	const int LAST_DAMAGE_HIT	= 2;
+
+	const float VALUE_CHECK_INTERVAL	 	= 1;
+	const float SENSITIVTY_PERCENTAGE 		= 1;//how much the value needs to change up/down from previous update to trigger a new update(in percent)
+
+	PlayerBase m_Player;
+	float m_TimeSinceLastTick = VALUE_CHECK_INTERVAL + 1;
+	
+	string m_CurrentLastDamage;
+	
+	float m_LastHealthUpdate;
+	float m_LastBloodUpdate;
+	string m_lastDamageUpdate;
+	
+	float m_HealthMaxValue;
+	float m_BloodMaxValue;
+
+	float m_BloodClient;
+	float m_HealthClient;
+	string m_LastDamageClient;
+	
+	void DebugMonitorValues(PlayerBase player)
+	{
+		m_Player = player;
+		Init();
+	}
+
+	void Init()
+	{
+		m_HealthMaxValue 	= m_Player.GetMaxHealth("", "Health");
+		m_BloodMaxValue 	= m_Player.GetMaxHealth("", "Blood");
+	}
+	
+	void OnScheduledTick(float deltatime)
+	{
+		if ( GetGame().IsClient() ) return;
+		if ( !GetGame().IsDebugMonitor() ) return; // turned off in server config
+		
+		m_TimeSinceLastTick += deltatime;
+		
+		if ( m_TimeSinceLastTick > VALUE_CHECK_INTERVAL )
+		{
+			m_TimeSinceLastTick = 0;
+			CheckValues();
+		}
+	}
+	
+	void CheckValues()
+	{
+		CheckHealth();
+		CheckBlood();
+		CheckLastDamage();
+	}
+	
+	float GetBlood()
+	{
+		return m_BloodClient;
+	}
+	
+	float GetHealth()
+	{
+		return m_HealthClient;
+	}
+	
+	string GetLastDamage()
+	{
+		return m_LastDamageClient;
+	}
+	
+	void SetLastDamage(string value)
+	{
+		m_CurrentLastDamage = value;
+	}
+	
+	void CheckHealth()
+	{
+		float health_current = m_Player.GetHealth("","Health");
+		float health_normalized = health_current / m_HealthMaxValue;
+		float difference_normalized = health_normalized - m_LastHealthUpdate;
+		float diff_abs = Math.AbsFloat(difference_normalized);
+		
+		if ( diff_abs > ( SENSITIVTY_PERCENTAGE /100 ) )
+		{
+			Param1<float> param = new Param1<float>( health_current );
+
+			SendValue(TYPE_HEALTH, param);
+			m_LastHealthUpdate = health_normalized;
+		}
+	}
+	
+	void CheckBlood()
+	{
+		float blood_current = m_Player.GetHealth("","Blood");
+		float blood_normalized = blood_current / m_BloodMaxValue;
+		float difference_normalized = blood_normalized - m_LastBloodUpdate;
+		float diff_abs = Math.AbsFloat(difference_normalized);
+		
+		if ( diff_abs > ( SENSITIVTY_PERCENTAGE /100 ) )
+		{
+			Param1<float> param = new Param1<float>( blood_current );
+			
+			SendValue(TYPE_BLOOD, param);
+			m_LastBloodUpdate = blood_normalized;
+		}
+	}
+	
+	void CheckLastDamage()
+	{
+		if (m_CurrentLastDamage != m_lastDamageUpdate)
+		{
+			Param1<string> param = new Param1<string>(m_CurrentLastDamage);
+			SendValue(TYPE_LAST_DAMAGE, param);
+			m_lastDamageUpdate = m_CurrentLastDamage;
+		}
+	}
+	
+	void SendValue(int value_type, Param param)
+	{
+		switch(value_type)
+		{
+		case DebugMonitorValues.TYPE_HEALTH:
+		case DebugMonitorValues.TYPE_BLOOD:
+			{	
+				Param1<float> value_float = Param1<float>.Cast( param );
+
+				CachedObjectsParams.PARAM2_INT_FLOAT.param1 = value_type;
+				CachedObjectsParams.PARAM2_INT_FLOAT.param2 = value_float.param1;
+				//Print("SendingValue type " + value_type.ToString() + " value "  + value_float.ToString());
+				GetGame().RPCSingleParam(m_Player, ERPCs.RPC_DEBUG_MONITOR_FLT, CachedObjectsParams.PARAM2_INT_FLOAT, true, m_Player.GetIdentity());
+			}
+			break;
+		case DebugMonitorValues.TYPE_LAST_DAMAGE:
+			{
+				Param1<string> value_string = Param1<string>.Cast( param );
+
+				CachedObjectsParams.PARAM2_INT_STRING.param1 = value_type;
+				CachedObjectsParams.PARAM2_INT_STRING.param2 = value_string.param1;
+				//Print("SendingValue type " + value_type.ToString() + " value "  + value_string);
+				GetGame().RPCSingleParam(m_Player, ERPCs.RPC_DEBUG_MONITOR_STR, CachedObjectsParams.PARAM2_INT_STRING, true, m_Player.GetIdentity());
+			}
+			break;
+		}
+	}
+
+	void ReceiveValue(int value_type, Param param)
+	{	
+		GetGame().GetMission().CreateDebugMonitor();
+		
+		switch (value_type)
+		{
+		case DebugMonitorValues.TYPE_HEALTH:
+			{
+				Param1<float> valueHealth = Param1<float>.Cast( param );
+				//Print("ReceivedValue health " + valueHealth.param1.ToString());
+				m_HealthClient = valueHealth.param1;
+			}
+			break;
+		case DebugMonitorValues.TYPE_BLOOD:
+			{
+				Param1<float> valueBlood = Param1<float>.Cast( param );
+				//Print("ReceivedValue blood " + valueBlood.param1.ToString());
+				m_BloodClient = valueBlood.param1;
+			}
+			break;
+		case DebugMonitorValues.TYPE_LAST_DAMAGE:
+			{
+				Param1<string> valueLastDamage = Param1<string>.Cast( param );
+				//Print("ReceivedValue lastdamage " + valueLastDamage.param1);
+				m_LastDamageClient = valueLastDamage.param1;
+			}
+			break; 		
+		}
+	}
+
+	void OnRPCFloat(ParamsReadContext ctx)
+	{
+		Param1<float> value = new Param1<float>(0);
+		
+		ctx.Read(CachedObjectsParams.PARAM2_INT_FLOAT);
+		int value_type 	= CachedObjectsParams.PARAM2_INT_FLOAT.param1;
+		value.param1 	= CachedObjectsParams.PARAM2_INT_FLOAT.param2;
+		
+		ReceiveValue(value_type, value);
+	}
+	
+	void OnRPCString(ParamsReadContext ctx)
+	{
+		Param1<string> value = new Param1<string>("");
+
+		ctx.Read(CachedObjectsParams.PARAM2_INT_STRING);
+		int value_type 	= CachedObjectsParams.PARAM2_INT_STRING.param1;
+		value.param1 	= CachedObjectsParams.PARAM2_INT_STRING.param2;
+		
+		ReceiveValue(value_type, value);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/DestructionEffects/DestructionEffects.c b/scripts/4_World/DayZ/Classes/DestructionEffects/DestructionEffects.c
new file mode 100644
index 0000000000000000000000000000000000000000..d655103692ecc40cfb3a669c2826ad13938daaf3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/DestructionEffects/DestructionEffects.c
@@ -0,0 +1,253 @@
+/*
+class TestDestructionEffect : DestructionEffectBase
+{
+	ref AreaDamageManager m_AreaManager;
+	override void Init()
+	{
+		m_EntityIsTakeable = true;
+		
+		m_ParticlePersistent = ParticleList.GRENADE_M18_GREEN_LOOP;
+		m_ParticleOneTime = ParticleList.GRENADE_M84;
+		
+		m_SoundSetOneTime = "AlarmClock_Destroyed_SoundSet";
+		m_SoundSetPersistent= "KitchenTimer_Ticking_Loop_SoundSet";
+		
+		m_ReplaceWithEntity = "";
+		m_KeepHealthOnReplace = true;
+		m_ReplaceDelay = 1000;
+		
+		m_HasExplosionDamage = true;
+		m_AmmoType = "";
+		m_DamageType = 0;
+	}
+	
+	override void OnEntityDestroyedOneTimeClient(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedOneTimeServer(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentClient(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentServer(EntityAI entity, string zone)
+	{
+		AreaDamageLoopedDeferred_NoVehicle area_damage = new AreaDamageLoopedDeferred_NoVehicle( m_Entity );
+		area_damage.SetDamageComponentType(AreaDamageComponentTypes.HITZONE);
+		
+		vector min, max;
+		m_Entity.GetBounds(min, max);
+		vector center = m_Entity.GetPosition();
+
+		vector orientation = m_Entity.GetOrientation();
+		
+		area_damage.SetExtents( "-1 -1 -1", "1 1 1" );
+		area_damage.SetAreaPosition( center );
+		area_damage.SetAreaOrientation( orientation );
+		area_damage.SetLoopInterval( 1.0 );
+		area_damage.SetDeferDuration( 0.2 );
+		area_damage.SetHitZones( { "Torso","LeftHand","LeftLeg","LeftFoot","RightHand","RightLeg","RightFoot" } );
+		area_damage.SetAmmoName( "BarbedWireHit" );
+		area_damage.Spawn();
+		
+		m_AreaManager = area_damage;
+		
+	}
+}
+
+//--------------------------------------------------------------------
+
+
+
+class TestDestructionEffect2 : DestructionEffectBase
+{
+	override void Init()
+	{
+		m_EntityIsTakeable = false;
+		
+		
+		m_ParticlePersistent = ParticleList.GRENADE_M18_GREEN_LOOP;
+		m_ParticleOneTime = ParticleList.GRENADE_M84;
+		
+		m_SoundSetOneTime = "AlarmClock_Destroyed_SoundSet";
+		m_SoundSetPersistent= "KitchenTimer_Ticking_Loop_SoundSet";
+		
+		m_ReplaceWithEntity = "";
+		m_KeepHealthOnReplace = true;
+		m_ReplaceDelay = 1000;
+		
+		m_HasExplosionDamage = true;
+		m_AmmoType = "LandFuelFeed_Ammo";
+		m_DamageType = DamageType.EXPLOSION;
+	}
+	
+	
+	override void OnEntityDestroyedOneTimeClient(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedOneTimeServer(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentClient(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentServer(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{	
+			vector n = surfNormal.VectorToAngles() + "0 90 0";
+			Particle p1 = ParticleManager.GetInstance().PlayInWorld(ParticleList.SMOKE_GENERIC_WRECK, pos);
+			p1.SetOrientation(n);
+		
+			Particle p2 = ParticleManager.GetInstance().PlayInWorld(ParticleList.EXPLOSION_LANDMINE, pos);
+			p2.SetOrientation(n);
+
+			Particle p3 = ParticleManager.GetInstance().PlayInWorld(ParticleList.IMPACT_METAL_RICOCHET, pos);
+			p3.SetOrientation(n);
+		
+			Particle p4 = ParticleManager.GetInstance().PlayInWorld(ParticleList.IMPACT_GRAVEL_RICOCHET, pos);
+			p4.SetOrientation(n);
+		}
+	}
+}
+*/
+class DestructionEffectGasCanister : DestructionEffectBase
+{
+	override void Init()
+	{
+		m_EntityIsTakeable = true;
+		
+		
+		m_ParticlePersistent = ParticleList.NONE;
+		m_ParticleOneTime = ParticleList.RGD5;
+		
+		m_SoundSetOneTime = "";
+		m_SoundSetPersistent= "";
+		
+		m_ReplaceWithEntity = "";
+		m_KeepHealthOnReplace = true;
+		m_ReplaceDelay = 1000;
+		
+		m_HasExplosionDamage = true;
+		m_AmmoType = "GasCanister_Ammo";
+		m_DamageType = DamageType.EXPLOSION;
+	}
+	
+	
+	override void OnEntityDestroyedOneTimeClient(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedOneTimeServer(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentClient(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentServer(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+	}
+}
+
+class DestructionEffectMetalicMechanism : DestructionEffectBase
+{
+	override void Init()
+	{
+		m_EntityIsTakeable = true;
+		
+		
+		m_ParticlePersistent = ParticleList.NONE;
+		m_ParticleOneTime = ParticleList.NONE;
+		
+		m_SoundSetOneTime = "AlarmClock_Destroyed_SoundSet";
+		m_SoundSetPersistent= "";
+		
+		m_ReplaceWithEntity = "";
+		m_KeepHealthOnReplace = true;
+		m_ReplaceDelay = 1000;
+		
+		m_HasExplosionDamage = false;
+		m_AmmoType = "";
+		m_DamageType = DamageType.EXPLOSION;
+	}
+	
+	
+	override void OnEntityDestroyedOneTimeClient(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedOneTimeServer(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentClient(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentServer(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+	}
+}
+
+class DestructionEffectSpookyGoat : DestructionEffectBase
+{
+	override void Init()
+	{
+		m_EntityIsTakeable = false;
+		
+		m_ParticlePersistent = ParticleList.NONE;
+		m_ParticleOneTime = ParticleList.EXPLOSION_GOAT;
+		
+		m_SoundSetOneTime = "";
+		m_SoundSetPersistent= "";
+		
+		m_ReplaceWithEntity = "";
+		m_KeepHealthOnReplace = false;
+		m_ReplaceDelay = 0;
+		
+		m_HasExplosionDamage = false;
+		m_AmmoType = "";
+		m_DamageType = DamageType.EXPLOSION;
+	}
+	
+	
+	override void OnEntityDestroyedOneTimeClient(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedOneTimeServer(EntityAI entity, int oldLevel, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentClient(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnEntityDestroyedPersistentServer(EntityAI entity, string zone)
+	{
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/EmoteClasses/EmoteBase.c b/scripts/4_World/DayZ/Classes/EmoteClasses/EmoteBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc593bca22668c126d6af3d25b47d0755db2157c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/EmoteClasses/EmoteBase.c
@@ -0,0 +1,103 @@
+class EmoteBase
+{
+	protected PlayerBase m_Player; //useful for various conditions in child classes
+	protected int m_ID = -1;
+	protected string m_InputActionName = "";
+	protected int m_StanceMaskAdditive = 0;
+	protected int m_StanceMaskFullbody = 0;
+	protected int m_AdditiveCallbackUID = 0;
+	protected int m_FullbodyCallbackUID = 0;
+	protected bool m_HideItemInHands = false;
+	
+	bool EmoteCondition(int stancemask)
+	{
+		return true;
+	}
+	
+	bool CanBeCanceledNormally(notnull EmoteCB callback)
+	{
+		return true;
+	}
+	
+	//! Checks for valid stance mask
+	bool EmoteFBStanceCheck(int stancemask)
+	{
+		int stanceIdx = DayZPlayerUtils.ConvertStanceMaskToStanceIdx(stancemask);
+		
+		if (!m_Player)
+		{
+			ErrorEx("No player for 'PlayerCanChangeStance'");
+			return false;
+		}
+		
+		if (stanceIdx != -1 && !DayZPlayerUtils.PlayerCanChangeStance(m_Player, stanceIdx))
+			return false;
+		
+		return true;
+	}
+	
+	bool DetermineOverride(out int callback_ID, out int stancemask, out bool is_fullbody)
+	{
+		return false;
+	}
+	
+	void OnBeforeStandardCallbackCreated(int callback_ID, int stancemask, bool is_fullbody);
+	void OnCallbackEnd();
+	
+	bool EmoteStartOverride(typename callbacktype, int id, int mask, bool fullbody)
+	{
+		return false;
+	}
+	
+	void SetOwnerPlayer(PlayerBase player)
+	{
+		m_Player = player;
+	}
+	
+///////////
+//Getters//
+///////////
+	PlayerBase GetOwnerPlayer()
+	{
+		return m_Player;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+	
+	string GetInputActionName()
+	{
+		return m_InputActionName;
+	}
+	
+	int GetStanceMaskAdditive()
+	{
+		return m_StanceMaskAdditive;
+	}
+	
+	int GetStanceMaskFullbody()
+	{
+		return m_StanceMaskFullbody;
+	}
+	
+	int GetAdditiveCallbackUID()
+	{
+		return m_AdditiveCallbackUID;
+	}
+	
+	int GetFullbodyCallbackUID()
+	{
+		return m_FullbodyCallbackUID;
+	}
+	
+	bool GetHideItemInHands()
+	{
+		return m_HideItemInHands;
+	}
+	/*
+	protected int m_StanceMaskAdditive = 0;
+	protected int m_StanceMaskFullbody = 0;
+	*/
+}
diff --git a/scripts/4_World/DayZ/Classes/EmoteClasses/EmoteClasses.c b/scripts/4_World/DayZ/Classes/EmoteClasses/EmoteClasses.c
new file mode 100644
index 0000000000000000000000000000000000000000..49693bac00ee1af18701ad250c173f02d8bbfa70
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/EmoteClasses/EmoteClasses.c
@@ -0,0 +1,733 @@
+
+class EmoteGreeting extends EmoteBase
+{
+	void EmoteGreeting()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_GREETING;
+		m_InputActionName = "EmoteGreeting";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_GREETING;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_GREETING;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteSOS extends EmoteBase
+{
+	void EmoteSOS()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SOS;
+		m_InputActionName = "EmoteSOS";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SOS;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteHeart extends EmoteBase
+{
+	void EmoteHeart()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_HEART;
+		m_InputActionName = "EmoteHeart";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_HEART;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_HEART;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteTaunt extends EmoteBase
+{
+	void EmoteTaunt()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_TAUNT;
+		m_InputActionName = "EmoteTaunt";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_TAUNT;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_TAUNT;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteLyingDown extends EmoteBase
+{
+	protected const float 	WATER_DEPTH = 0.15;
+	void EmoteLyingDown()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_LYINGDOWN;
+		m_InputActionName = "EmoteLyingDown";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_LYINGDOWN;
+		m_HideItemInHands = true;
+	}
+	
+	override bool EmoteCondition(int stancemask)
+	{
+		vector water_info = HumanCommandSwim.WaterLevelCheck( m_Player, m_Player.GetPosition() - (m_Player.GetDirection() * 0.9) );
+		if ( water_info[0] < WATER_DEPTH ) //is player able to lay down without "drowning"?
+			return true;
+		return false;
+	}
+}
+
+class EmoteTauntKiss extends EmoteBase
+{
+	void EmoteTauntKiss()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_TAUNTKISS;
+		m_InputActionName = "EmoteTauntKiss";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_TAUNTKISS;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_TAUNTKISS;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmotePoint extends EmoteBase
+{
+	void EmotePoint()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_POINT;
+		m_InputActionName = "EmotePoint";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_POINT;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_POINT;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteTauntElbow extends EmoteBase
+{
+	void EmoteTauntElbow()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_TAUNTELBOW;
+		m_InputActionName = "EmoteTauntElbow";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_TAUNTELBOW;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteThumb extends EmoteBase
+{
+	void EmoteThumb()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_THUMB;
+		m_InputActionName = "EmoteThumb";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_THUMB;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_THUMB;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteThumbDown extends EmoteBase
+{
+	void EmoteThumbDown()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_THUMBDOWN;
+		m_InputActionName = "EmoteThumbDown";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_THUMBDOWN;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_THUMBDOWN;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteThroat extends EmoteBase
+{
+	void EmoteThroat()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_THROAT;
+		m_InputActionName = "EmoteThroat";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_THROAT;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_THROAT;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteDance extends EmoteBase
+{
+	void EmoteDance()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_DANCE;
+		m_InputActionName = "EmoteDance";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_DANCE;
+		m_HideItemInHands = true;
+	}
+	
+	override bool EmoteCondition(int stancemask)
+	{
+		if (m_Player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		return true;
+	}
+}
+
+class EmoteSalute extends EmoteBase
+{
+	void EmoteSalute()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SALUTE;
+		m_InputActionName = "EmoteSalute";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SALUTE;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteTimeout extends EmoteBase
+{
+	void EmoteTimeout()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_TIMEOUT;
+		m_InputActionName = "EmoteTimeout";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_TIMEOUT;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_TIMEOUT;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteDabbing extends EmoteBase
+{
+	void EmoteDabbing()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_DABBING;
+		//m_InputActionName = "EmoteDabbing";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_DABBING;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteFacepalm extends EmoteBase
+{
+	void EmoteFacepalm()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_FACEPALM;
+		m_InputActionName = "EmoteFacepalm";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_FACEPALM;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteClap extends EmoteBase
+{
+	void EmoteClap()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_CLAP;
+		m_InputActionName = "EmoteClap";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_CLAP;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteSilent extends EmoteBase
+{
+	void EmoteSilent()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SILENT;
+		m_InputActionName = "EmoteSilent";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_SILENCE;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SILENCE;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteWatching extends EmoteBase
+{
+	void EmoteWatching()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_WATCHING;
+		m_InputActionName = "EmoteWatching";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_WATCHING;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_WATCHING;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteHold extends EmoteBase
+{
+	void EmoteHold()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_HOLD;
+		m_InputActionName = "EmoteHold";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_HOLD;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_HOLD;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteListening extends EmoteBase
+{
+	void EmoteListening()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_LISTENING;
+		m_InputActionName = "EmoteListening";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_LISTENING;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_LISTENING;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmotePointSelf extends EmoteBase
+{
+	void EmotePointSelf()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_POINTSELF;
+		m_InputActionName = "EmotePointSelf";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_POINTSELF;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_POINTSELF;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteLookAtMe extends EmoteBase
+{
+	void EmoteLookAtMe()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_LOOKATME;
+		m_InputActionName = "EmoteLookAtMe";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_LOOKATME;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_LOOKATME;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteTauntThink extends EmoteBase
+{
+	void EmoteTauntThink()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_TAUNTTHINK;
+		m_InputActionName = "EmoteTauntThink";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_TAUNTTHINK;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_TAUNTTHINK;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteMove extends EmoteBase
+{
+	void EmoteMove()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_MOVE;
+		m_InputActionName = "EmoteMove";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_MOVE;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_MOVE;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteGetDown extends EmoteBase
+{
+	void EmoteGetDown()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_DOWN;
+		m_InputActionName = "EmoteGetDown";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_DOWN;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_DOWN;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteCome extends EmoteBase
+{
+	void EmoteCome()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_COME;
+		m_InputActionName = "EmoteCome";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_COME;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_COME;
+		m_HideItemInHands = false;
+	}
+}
+
+//Handled directly via EmoteManager!
+class EmoteSurrender extends EmoteBase
+{
+	void EmoteSurrender()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SURRENDER;
+		m_InputActionName = "EmoteSurrender";
+		m_HideItemInHands = false;
+	}
+	
+	override bool DetermineOverride(out int callback_ID, out int stancemask, out bool is_fullbody)
+	{
+		stancemask = DayZPlayerConstants.STANCEMASK_ALL;
+		return true;
+	}
+	
+	override bool EmoteStartOverride(typename callbacktype, int id, int mask, bool fullbody)
+	{
+		bool surrendered = m_Player.GetEmoteManager().m_IsSurrendered;
+		if (!surrendered)
+		{
+			m_Player.GetEmoteManager().PlaySurrenderInOut(true);
+		}
+		else
+		{
+			if (m_Player.GetItemInHands())
+				m_Player.GetItemInHands().Delete();
+		}
+		
+		return true;
+	}
+}
+
+class EmoteCampfireSit extends EmoteBase
+{
+	void EmoteCampfireSit()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_CAMPFIRE;
+		m_InputActionName = "EmoteCampfireSit";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_CAMPFIRE;
+		m_HideItemInHands = true;
+	}
+}
+
+class EmoteSitA extends EmoteBase
+{
+	void EmoteSitA()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SITA;
+		m_InputActionName = "EmoteSitA";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SITA;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteSitB extends EmoteBase
+{
+	void EmoteSitB()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SITB;
+		m_InputActionName = "EmoteSitB";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SITB;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteRPSRandom extends EmoteBase
+{
+	void EmoteRPSRandom()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_RPS;
+		m_InputActionName = "EmoteRPSRandom";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_RPS;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteRPSRock extends EmoteBase
+{
+	void EmoteRPSRock()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_RPS_R;
+		m_InputActionName = "EmoteRPSRock";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_RPS;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteRPSPaper extends EmoteBase
+{
+	void EmoteRPSPaper()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_RPS_P;
+		m_InputActionName = "EmoteRPSPaper";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_RPS;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteRPSScisors extends EmoteBase
+{
+	void EmoteRPSScisors()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_RPS_S;
+		m_InputActionName = "EmoteRPSScisors";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_RPS;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteNod extends EmoteBase
+{
+	void EmoteNod()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_NOD;
+		m_InputActionName = "EmoteNod";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_NODHEAD;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_NODHEAD;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteShake extends EmoteBase
+{
+	void EmoteShake()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SHAKE;
+		m_InputActionName = "EmoteShake";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_SHAKEHEAD;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SHAKEHEAD;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteShrug extends EmoteBase
+{
+	void EmoteShrug()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SHRUG;
+		m_InputActionName = "EmoteShrug";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_SHRUG;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_SHRUG;
+		m_HideItemInHands = false;
+	}
+}
+
+class EmoteSuicide extends EmoteBase
+{
+	void EmoteSuicide()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_SUICIDE;
+		m_InputActionName = "EmoteSuicide";
+		m_StanceMaskAdditive = 0;
+		m_StanceMaskFullbody = 0;
+		m_AdditiveCallbackUID = 0;
+		m_FullbodyCallbackUID = 0;
+		m_HideItemInHands = false;
+	}
+	
+	override bool DetermineOverride(out int callback_ID, out int stancemask, out bool is_fullbody)
+	{
+		is_fullbody = true;
+		callback_ID = -1;
+		stancemask = 0;
+		string suicideStr;
+		ItemBase weapon;
+		weapon = m_Player.GetItemInHands();
+		if (weapon)
+		{
+			if (weapon.ConfigIsExisting("suicideAnim"))
+			{
+				suicideStr = weapon.ConfigGetString("suicideAnim");
+			}
+			
+			if (weapon.IsKindOf("Pistol_Base"))
+			{
+				callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_PISTOL;
+				stancemask = DayZPlayerConstants.STANCEMASK_CROUCH;
+				//m_Player.OverrideShootFromCamera(false);
+			}
+			else if (Weapon_Base.Cast(weapon)) //long firearms
+			{
+				callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_RIFLE;
+				stancemask = DayZPlayerConstants.STANCEMASK_CROUCH;
+				//m_Player.OverrideShootFromCamera(false);
+			}
+			else
+			{
+				switch (suicideStr)
+				{
+					case "onehanded":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_1HD;
+						stancemask = DayZPlayerConstants.STANCEMASK_CROUCH;
+					break;
+					
+					case "fireaxe":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_FIREAXE;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+					
+					case "pitchfork":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_PITCHFORK;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+					
+					case "sword":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_SWORD;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+					
+					case "spear":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_SPEAR;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+					
+					case "woodaxe":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_WOODAXE;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+					
+					case "sickle":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_SICKLE;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+					
+					case "hoe":
+						callback_ID = DayZPlayerConstants.CMD_SUICIDEFB_HOE;
+						stancemask = DayZPlayerConstants.STANCEMASK_ERECT;
+					break;
+				}
+			}
+		}
+		if (callback_ID > -1)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool EmoteCondition(int stancemask)
+	{
+		ItemBase itemInHands = m_Player.GetItemInHands();
+		
+		if (!itemInHands.CanBeUsedForSuicide())
+		{
+			return false;
+		}
+		
+		return super.EmoteCondition(stancemask);
+	}
+	
+	override bool CanBeCanceledNormally(notnull EmoteCB callback)
+	{
+		int state = callback.GetState();
+		if (state > HumanCommandActionCallback.STATE_LOOP_LOOP) //Cannot be canceled once started
+			return false;
+		
+		return super.CanBeCanceledNormally(callback);;
+	}
+	
+	override void OnBeforeStandardCallbackCreated(int callback_ID, int stancemask, bool is_fullbody)
+	{
+		if (callback_ID > -1)
+		{
+			if (callback_ID == DayZPlayerConstants.CMD_SUICIDEFB_PISTOL || callback_ID == DayZPlayerConstants.CMD_SUICIDEFB_RIFLE)
+				m_Player.OverrideShootFromCamera(false);
+		}
+	}
+	
+	override void OnCallbackEnd()
+	{
+		m_Player.SetSuicide(false);
+	}
+}
+
+class EmoteVomit extends EmoteBase
+{
+	void EmoteVomit()
+	{
+		m_ID = EmoteConstants.ID_EMOTE_VOMIT;
+		m_InputActionName = "EmoteVomit";
+		m_StanceMaskAdditive = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMaskFullbody = DayZPlayerConstants.STANCEMASK_PRONE;
+		m_AdditiveCallbackUID = DayZPlayerConstants.CMD_GESTUREMOD_NODHEAD;
+		m_FullbodyCallbackUID = DayZPlayerConstants.CMD_GESTUREFB_NODHEAD;
+		m_HideItemInHands = false;
+	}
+	
+	override bool EmoteCondition(int stancemask)
+	{
+		return DayZPlayerUtils.PlayerCanChangeStance(m_Player,DayZPlayerConstants.STANCEIDX_CROUCH);
+	}
+	
+	override bool EmoteStartOverride(typename callbacktype, int id, int mask, bool fullbody)
+	{
+		if ( m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer() )
+		{
+			SymptomBase symptom = m_Player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_VOMIT);
+			
+			if ( symptom )
+			{
+			    symptom.SetDuration(Math.RandomIntInclusive(4,8));
+			}
+		}
+		
+		m_Player.GetEmoteManager().SetEmoteLockState(false);
+		
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/EmoteConstructor.c b/scripts/4_World/DayZ/Classes/EmoteConstructor.c
new file mode 100644
index 0000000000000000000000000000000000000000..9b663c0f0ded612d1a0c3ec26d8759eb45890637
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/EmoteConstructor.c
@@ -0,0 +1,80 @@
+class EmoteConstructor
+{
+	bool ConstructEmotes(PlayerBase player, out map<int, ref EmoteBase> emoteMap)
+	{
+		TTypenameArray emote_array_names = new TTypenameArray;
+		RegisterEmotes(emote_array_names);
+		Sort(emote_array_names,emote_array_names.Count());
+		
+		emoteMap = new map<int, ref EmoteBase>;
+		ref EmoteBase new_emote;
+		
+		for (int i = 0; i < emote_array_names.Count(); i++)
+		{
+			new_emote = EmoteBase.Cast(emote_array_names[i].Spawn());
+			if (new_emote)
+			{
+				if (new_emote.GetID() < 0)
+				{
+					ErrorEx("Emote " + emote_array_names[i].ToString() + " has an invalid ID, registation failed!");
+					return false;
+				}
+				else if (emoteMap.Contains(new_emote.GetID()))
+				{
+					ErrorEx("Emote " + emote_array_names[i].ToString() + " has a duplicate ID, registation failed!");
+					return false;
+				}
+				else
+				{
+					new_emote.SetOwnerPlayer(player); 
+					emoteMap.Insert(new_emote.GetID(), new_emote);
+				}
+			}
+		}
+		return true;
+	}
+	
+	void RegisterEmotes(TTypenameArray emotes)
+	{
+		emotes.Insert(EmoteGreeting);
+		emotes.Insert(EmoteSOS);
+		emotes.Insert(EmoteHeart);
+		emotes.Insert(EmoteTaunt);
+		emotes.Insert(EmoteLyingDown);
+		emotes.Insert(EmoteTauntKiss);
+		emotes.Insert(EmotePoint);
+		emotes.Insert(EmoteTauntElbow);
+		emotes.Insert(EmoteThumb);
+		emotes.Insert(EmoteThumbDown);
+		emotes.Insert(EmoteThroat);
+		emotes.Insert(EmoteDance);
+		emotes.Insert(EmoteSalute);
+		emotes.Insert(EmoteTimeout);
+		//emotes.Insert(EmoteDabbing);
+		emotes.Insert(EmoteFacepalm);
+		emotes.Insert(EmoteClap);
+		emotes.Insert(EmoteSilent);
+		emotes.Insert(EmoteWatching);
+		emotes.Insert(EmoteHold);
+		emotes.Insert(EmoteListening);
+		emotes.Insert(EmotePointSelf);
+		emotes.Insert(EmoteLookAtMe);
+		emotes.Insert(EmoteTauntThink);
+		emotes.Insert(EmoteMove);
+		emotes.Insert(EmoteGetDown);
+		emotes.Insert(EmoteCome);
+		emotes.Insert(EmoteSurrender); //exception, partially handled in EmoteManager directly (..)
+		emotes.Insert(EmoteCampfireSit);
+		emotes.Insert(EmoteSitA);
+		emotes.Insert(EmoteSitB);
+		emotes.Insert(EmoteRPSRandom);
+		emotes.Insert(EmoteRPSRock);
+		emotes.Insert(EmoteRPSPaper);
+		emotes.Insert(EmoteRPSScisors);
+		emotes.Insert(EmoteNod);
+		emotes.Insert(EmoteShake);
+		emotes.Insert(EmoteShrug);
+		emotes.Insert(EmoteSuicide);
+		emotes.Insert(EmoteVomit);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/EmoteManager.c b/scripts/4_World/DayZ/Classes/EmoteManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..b04a1cba99e315ad05781f694f571668942d5741
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/EmoteManager.c
@@ -0,0 +1,1184 @@
+class EmoteCB : HumanCommandActionCallback
+{
+	bool 			m_IsFullbody;
+	int 			m_callbackID;
+	PlayerBase 		m_player;
+	EmoteManager 	m_Manager;
+	
+	void ~EmoteCB()
+	{
+		if (m_Manager)
+		{
+			m_Manager.OnCallbackEnd();
+		}
+		
+		if (GetGame() && m_player)
+			m_player.RequestHandAnimationStateRefresh();
+	}
+	
+	bool CancelCondition()
+	{
+		return false;
+	}
+	
+	bool IsEmoteCallback()
+	{
+		return IsGestureCallback();
+	}
+	
+	override void OnAnimationEvent(int pEventID)
+	{
+		switch (pEventID)
+		{
+			case EmoteConstants.EMOTE_SUICIDE_DEATH :
+				
+				if (GetGame().IsServer())
+					m_Manager.KillPlayer();
+				
+				m_Manager.LogSuicide();
+			break;
+			
+			case UA_ANIM_EVENT :
+				if (GetGame().IsServer())
+				{
+					if (m_player.GetItemInHands() && SurrenderDummyItem.Cast(m_player.GetItemInHands()))
+						m_player.GetItemInHands().Delete();
+					
+					if (m_player.GetItemInHands())
+					{
+						m_player.PhysicalPredictiveDropItem(m_player.GetItemInHands());
+					}
+				}
+				m_Manager.m_ItemToBeCreated = true;
+			break;
+			
+			case EmoteConstants.EMOTE_SUICIDE_BLEED :
+				if (GetGame().IsServer())
+					m_Manager.CreateBleedingEffect(m_callbackID);
+			break;
+			
+			case EmoteConstants.EMOTE_SUICIDE_SIMULATION_END :
+				if (GetGame().IsServer())
+				{
+					EntityAI itemInHands = m_player.GetHumanInventory().GetEntityInHands();
+					if (itemInHands)
+					{
+						vector m4[4];
+						itemInHands.GetTransform(m4);
+						m_player.GetInventory().DropEntityWithTransform(InventoryMode.SERVER, m_player, itemInHands, m4);
+					}
+				}
+				
+				m_player.StartDeath();
+			break;
+		}
+	}
+	
+	override bool IsGestureCallback()
+	{
+		return true;
+	}
+};
+
+class EmoteLauncher
+{
+	static const int FORCE_NONE = 0;
+	static const int FORCE_DIFFERENT = 1;
+	static const int FORCE_ALL = 2;
+	
+	protected bool m_InterruptsSameIDEmote;
+	protected int m_ForcePlayEmote;
+	protected int m_ID;
+	
+	void EmoteLauncher(int emoteID, bool interrupts_same)
+	{
+		m_ID = emoteID;
+		m_InterruptsSameIDEmote = interrupts_same;
+		m_ForcePlayEmote = FORCE_NONE;
+	}
+	
+	void SetForced(int mode)
+	{
+		m_ForcePlayEmote = mode;
+	}
+	
+	int GetForced()
+	{
+		return m_ForcePlayEmote;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+}
+
+class EmoteManager
+{
+	PlayerBase 				m_Player;
+	ItemBase				m_item;
+	EmoteCB					m_Callback;
+	HumanInputController 	m_HIC;
+	ref array<string> 		m_InterruptInputs;
+	ref array<UAInput> 		m_InterruptInputDirect;
+	ref InventoryLocation 	m_HandInventoryLocation;
+	ref EmoteLauncher 		m_MenuEmote;
+	bool					m_bEmoteIsPlaying;
+	bool 					m_IsSurrendered;
+	bool 					m_ItemToBeCreated;
+	bool 					m_CancelEmote;
+	bool 					m_InstantCancelEmote;
+	bool 					m_GestureInterruptInput;
+	protected bool			m_ItemToHands; //deprecated
+	protected bool			m_ItemIsOn;
+	protected bool			m_MouseButtonPressed;
+	protected bool 			m_PlayerDies;
+	protected bool 			m_controllsLocked;
+	protected bool 			m_InventoryAccessLocked;
+	protected bool 			m_EmoteLockState;
+	protected int 			m_DeferredEmoteExecution;
+	protected int  			m_GestureID;
+	protected int			m_PreviousGestureID;
+	protected int			m_CurrentGestureID;
+	protected int 			m_LastMask;
+	protected int 			m_RPSOutcome;
+	protected int 			m_InterruptInputsCount;
+	protected const int 	CALLBACK_CMD_INVALID = -1;
+	protected const int 	CALLBACK_CMD_END = -2;
+	protected const int 	CALLBACK_CMD_GESTURE_INTERRUPT = -3;
+	protected const int 	CALLBACK_CMD_INSTACANCEL = -4;
+	PluginAdminLog 			m_AdminLog;
+	protected ref Timer 	m_ReservationTimer;
+
+	protected ref map<int, ref EmoteBase>		m_NameEmoteMap; //<emote_ID,EmoteBase>
+	protected ref array<ref EmoteBase>			m_EmoteClassArray; //registered 'EmoteBase' object refs
+	protected ref array<int>					m_EmoteIDs; //IDs of registered emotes (found in 'EmoteConstants'). For quick access.
+	protected ref array<int>					m_EmoteInputIDs; //input IDs for the registered 'EmoteBase' objects
+	protected SHumanCommandSwimSettings 		m_HumanSwimSettings;
+	
+	void EmoteManager(PlayerBase player) 
+	{
+		m_Player = player;
+		m_HIC = m_Player.GetInputController();
+		m_ItemIsOn = false;
+		m_controllsLocked = false;
+		m_InventoryAccessLocked = false;
+		m_RPSOutcome = -1;
+		m_DeferredEmoteExecution = CALLBACK_CMD_INVALID;
+		
+		m_InterruptInputs = new array<string>;
+		m_InterruptInputs.Insert("UAMoveForward");
+		m_InterruptInputs.Insert("UAMoveBack");
+		m_InterruptInputs.Insert("UATurnLeft");
+		m_InterruptInputs.Insert("UATurnRight");
+		m_InterruptInputs.Insert("UAMoveLeft");
+		m_InterruptInputs.Insert("UAMoveRight");
+		m_InterruptInputs.Insert("UAStand");
+		m_InterruptInputs.Insert("UACrouch");
+		m_InterruptInputs.Insert("UAProne");
+		m_InterruptInputs.Insert("UAGetOver");
+		
+		m_HandInventoryLocation = new InventoryLocation();
+		m_HandInventoryLocation.SetHands(m_Player, null);
+		
+		if (GetGame().IsServer())
+		{
+			m_AdminLog = PluginAdminLog.Cast(GetPlugin(PluginAdminLog));
+		}
+		
+		m_ReservationTimer = new Timer();
+		m_ReservationTimer.Run(8, this, "CheckEmoteLockedState", null, true);
+		
+		m_HumanSwimSettings = m_Player.GetDayZPlayerType().CommandSwimSettingsW();
+		
+		ConstructData();
+	}
+	
+	void ~EmoteManager()
+	{
+		if (m_ReservationTimer && m_ReservationTimer.IsRunning())
+			m_ReservationTimer.Stop();
+	}
+	
+	void ConstructData()
+	{
+		EmoteConstructor ec = new EmoteConstructor;
+		if (!m_NameEmoteMap)
+		{
+			ec.ConstructEmotes(m_Player,m_NameEmoteMap);
+			m_EmoteClassArray = new array<ref EmoteBase>;
+			m_EmoteIDs = new array<int>;
+			m_EmoteInputIDs = new array<int>;
+			int inputID;
+			int count = m_NameEmoteMap.Count();
+			UAInput inp;
+			
+			for (int i = 0; i < count; i++)
+			{
+				m_EmoteClassArray.Insert(m_NameEmoteMap.GetElement(i));
+				m_EmoteIDs.Insert(m_NameEmoteMap.GetElement(i).GetID());
+				inp = GetUApi().GetInputByName(m_NameEmoteMap.GetElement(i).GetInputActionName());
+				inputID = inp.ID();
+				m_EmoteInputIDs.Insert(inputID);
+			}
+			
+			if (m_EmoteInputIDs.Count() != m_EmoteClassArray.Count())
+			{
+				ErrorEx("Faulty emote data detected in 'ConstructData' method!",ErrorExSeverity.WARNING);
+			}
+		}
+	}
+	
+	void SetGesture(int id)
+	{
+		m_GestureID = id;
+	}
+	
+	int GetGesture()
+	{
+		return m_GestureID;
+	}
+	
+	int DetermineGestureIndex()
+	{
+		int count = m_EmoteInputIDs.Count();
+		for (int i = 0; i < count; ++i)
+ 		{
+			if (GetUApi().GetInputByID(m_EmoteInputIDs[i]).LocalPress())
+ 			{
+ 				return m_EmoteIDs[i];
+ 			}
+ 		}
+		
+		return 0;
+	}
+	
+	//! Also includes a stance check for FB callbacks
+	bool DetermineEmoteData(EmoteBase emote, out int callback_ID, out int stancemask, out bool is_fullbody)
+	{
+		if (emote.DetermineOverride(callback_ID, stancemask, is_fullbody))
+		{
+			return emote.EmoteFBStanceCheck(stancemask);
+		}
+		else if (emote.GetAdditiveCallbackUID() != 0 && m_Player.IsPlayerInStance(emote.GetStanceMaskAdditive()))
+		{
+			callback_ID = emote.GetAdditiveCallbackUID();
+			stancemask = emote.GetStanceMaskAdditive();
+			is_fullbody = false;
+			return true;
+		}
+		else if (emote.GetFullbodyCallbackUID() != 0 && emote.EmoteFBStanceCheck(emote.GetStanceMaskFullbody()))
+		{
+			callback_ID = emote.GetFullbodyCallbackUID();
+			stancemask = emote.GetStanceMaskFullbody();
+			is_fullbody = true;
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//Called from players commandhandler each frame, checks input
+	void Update(float deltaT)
+	{
+		// no updates on restrained characters
+		if (m_Player.IsRestrained())
+			return;
+		
+		if (m_ItemToBeCreated)
+		{
+			if (!m_Player.GetItemInHands() && GetGame().IsServer())
+			{
+				m_Player.GetHumanInventory().CreateInHands("SurrenderDummyItem");
+			}
+			m_ItemToBeCreated = false;
+		}
+		
+		int gestureSlot = DetermineGestureIndex();
+		
+		//deferred emote cancel
+		if (m_InstantCancelEmote) //'hard' cancel
+		{
+			if (m_Callback)
+			{
+				m_Callback.Cancel();
+			}
+			
+			if (m_MenuEmote)
+			{
+				m_MenuEmote = null;
+			}
+			m_DeferredEmoteExecution = CALLBACK_CMD_INVALID;
+			m_InstantCancelEmote = false;
+		}
+		else if (m_CancelEmote) //'soft' cancel
+		{
+			if (m_IsSurrendered)
+			{
+				EndSurrenderRequest(new SurrenderData);
+			}
+			else if (m_Callback)
+			{
+				m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+			}
+			
+			m_CancelEmote = false;
+		}
+		
+		if (m_MenuEmote && m_MenuEmote.GetForced() > EmoteLauncher.FORCE_NONE && !GetGame().IsDedicatedServer()) //forced emote playing
+		{
+			SendEmoteRequestSync(m_MenuEmote.GetID());
+		}
+		else if (m_Callback)
+		{
+			bool uiGesture = false;
+			if (!GetGame().IsDedicatedServer())
+			{
+				uiGesture = GetGame().GetUIManager().IsMenuOpen(MENU_GESTURES);
+				
+				if (InterruptGestureCheck())
+				{
+					SendEmoteRequestSync(CALLBACK_CMD_END);
+				}
+				
+				if (InterruptWaterCheck())
+				{
+					SendEmoteRequestSync(CALLBACK_CMD_INSTACANCEL);
+				}
+			}
+			
+			if (gestureSlot > 0 || m_GestureInterruptInput || (m_HIC.IsSingleUse() && !uiGesture) || (m_HIC.IsContinuousUseStart() && !uiGesture) || (m_Callback.m_IsFullbody && !uiGesture && m_HIC.IsWeaponRaised())) 
+			{
+				if (m_CurrentGestureID == EmoteConstants.ID_EMOTE_SUICIDE && m_HIC.IsSingleUse())
+				{
+					if (m_Callback.GetState() == m_Callback.STATE_LOOP_LOOP)
+					{
+						CommitSuicide();
+					}
+					else
+					{
+						return;
+					}
+				}
+				else if ((m_CurrentGestureID == EmoteConstants.ID_EMOTE_THUMB || m_CurrentGestureID == EmoteConstants.ID_EMOTE_THUMBDOWN) && m_HIC.IsSingleUse())
+				{
+					m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_ACTION);
+				}
+				else if (m_HIC.IsSingleUse() && (m_CurrentGestureID == EmoteConstants.ID_EMOTE_RPS || m_CurrentGestureID == EmoteConstants.ID_EMOTE_RPS_R || m_CurrentGestureID == EmoteConstants.ID_EMOTE_RPS_P || m_CurrentGestureID == EmoteConstants.ID_EMOTE_RPS_S))
+				{
+					if (m_RPSOutcome != -1)
+					{
+						if (m_RPSOutcome == 0)
+						{
+							m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_RPS_ROCK);
+						}
+						else if (m_RPSOutcome == 1)
+						{
+							m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_RPS_PAPER);
+						}
+						else if (m_RPSOutcome == 2)
+						{
+							m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_RPS_SCISSORS);
+						}
+						m_RPSOutcome = -1;
+					}
+					else
+					{
+						m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+					}
+				}
+				else if (m_CurrentGestureID != EmoteConstants.ID_EMOTE_SUICIDE || (m_CurrentGestureID == EmoteConstants.ID_EMOTE_SUICIDE && m_Callback.GetState() < 3))
+				{
+					SendEmoteRequestSync(CALLBACK_CMD_END);
+				}
+				else if (m_CurrentGestureID == EmoteConstants.ID_EMOTE_SUICIDE)
+				{
+					SendEmoteRequestSync(CALLBACK_CMD_END);
+				}
+			}
+			
+			if (m_LastMask != -1 && m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_PRONE))
+			{
+				m_Callback.Cancel();
+			}
+			
+			if (m_MenuEmote && m_bEmoteIsPlaying)
+			{
+				SendEmoteRequestSync(CALLBACK_CMD_END);
+			}
+			
+			if (m_DeferredEmoteExecution == CALLBACK_CMD_END)
+			{
+				EndCallbackCommand();
+			}
+			
+			if (m_DeferredEmoteExecution == CALLBACK_CMD_GESTURE_INTERRUPT)
+			{
+				InterruptCallbackCommand();
+			}
+		}
+		//no m_Callback exists
+		else
+		{
+			if (m_bEmoteIsPlaying)
+			{
+				m_bEmoteIsPlaying = false;
+				OnEmoteEnd();
+			}
+			else if (!m_Player.GetItemInHands() && m_IsSurrendered && !m_ItemToBeCreated)
+			{
+				PlaySurrenderInOut(false);
+				return;
+			}
+			// getting out of surrender state - hard cancel
+			else if (m_IsSurrendered && (m_HIC.IsSingleUse() || m_HIC.IsContinuousUseStart() || m_HIC.IsWeaponRaised()))
+			{
+				if (m_Player.GetItemInHands())
+					m_Player.GetItemInHands().Delete();
+				return;
+			}
+			
+			// fallback in case lock does not end properly
+			else if (m_IsSurrendered && !m_Player.GetItemInHands() || (m_Player.GetItemInHands() && m_Player.GetItemInHands().GetType() != "SurrenderDummyItem" && m_EmoteLockState))
+			{
+				m_IsSurrendered = false;
+				SetEmoteLockState(false);
+				return;
+			}
+			//actual emote launch
+			else if (m_DeferredEmoteExecution > CALLBACK_CMD_INVALID)
+			{
+				PlayEmote(m_DeferredEmoteExecution);
+			}
+			//client-side emote launcher
+			else if (!m_bEmoteIsPlaying && m_MenuEmote && !GetGame().IsDedicatedServer())
+			{
+				SendEmoteRequestSync(m_MenuEmote.GetID());
+			}
+			else if (!m_MenuEmote && gestureSlot > 0)
+			{
+				CreateEmoteCBFromMenu(gestureSlot,true); //translation no longer needed
+			}
+		}
+	}
+	
+	void OnEmoteEnd()
+	{
+		ShowItemInHands();
+		
+		if (m_PlayerDies)
+		{
+			m_Player.SetHealth(0.0);
+			return;
+		}
+		
+		//surrender "state" switch
+		if (m_CurrentGestureID == EmoteConstants.ID_EMOTE_SURRENDER)
+		{
+			m_IsSurrendered = !m_IsSurrendered;
+			SetEmoteLockState(m_IsSurrendered);
+		}
+		
+		m_CurrentGestureID = 0;
+		
+		if (m_IsSurrendered)
+		{
+			return;
+		}
+		m_GestureInterruptInput = false;
+		SetEmoteLockState(false);
+
+		// back to the default - shoot from camera - if not set already
+		if (!m_Player.IsShootingFromCamera())
+			m_Player.OverrideShootFromCamera(true);
+	}
+	
+	//server-side
+	bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{
+		if (userDataType == INPUT_UDT_GESTURE)
+		{
+			int forced = EmoteLauncher.FORCE_NONE;
+			int gestureID = -1;
+			int random = -1;
+			
+			if (ctx.Read(gestureID))
+			{
+				ctx.Read(forced);
+				if (ctx.Read(random))
+				{
+					m_RPSOutcome = random;
+				}
+				
+				//server-side check
+				if (forced > EmoteLauncher.FORCE_NONE || CanPlayEmote(gestureID))
+				{
+					ScriptJunctureData pCtx = new ScriptJunctureData;
+					pCtx.Write(gestureID);
+					pCtx.Write(forced);
+					
+					m_Player.SendSyncJuncture(DayZPlayerSyncJunctures.SJ_GESTURE_REQUEST, pCtx);
+				}
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	//server and client
+	void OnSyncJuncture(int pJunctureID, ParamsReadContext pCtx)
+	{
+		int forced;
+		int gesture_id;
+		if (!m_CancelEmote)
+		{
+			pCtx.Read(gesture_id);
+			pCtx.Read(forced);
+			
+			EmoteBase emoteData;
+			if ((m_Callback || m_IsSurrendered) && (forced == EmoteLauncher.FORCE_ALL || (forced == EmoteLauncher.FORCE_DIFFERENT && m_CurrentGestureID != gesture_id)))
+			{	
+				if (m_Callback)
+				{
+					if (m_NameEmoteMap.Find(m_CurrentGestureID,emoteData) && emoteData.CanBeCanceledNormally(m_Callback))
+						m_CancelEmote = true;
+					else
+						return;
+				}
+				m_CancelEmote = true;
+			}
+			
+			if (gesture_id == CALLBACK_CMD_INSTACANCEL)
+			{
+				if (m_Callback)
+				{
+					if (m_NameEmoteMap.Find(m_CurrentGestureID,emoteData) && !emoteData.CanBeCanceledNormally(m_Callback))
+					{
+						m_InstantCancelEmote = false;
+						return;
+					}
+				}
+				m_InstantCancelEmote = true;
+			}
+			
+			m_DeferredEmoteExecution = gesture_id;
+		}
+		else
+			m_CancelEmote = false;
+	}
+	
+	void OnCallbackEnd()
+	{
+		EmoteBase emoteData;
+		if (m_NameEmoteMap.Find(m_CurrentGestureID,emoteData))
+			emoteData.OnCallbackEnd();
+	}
+	
+	void AfterStoreLoad()
+	{
+		//failsafe, deletes helper item after fully loading character
+		if (m_Player.GetItemInHands() && SurrenderDummyItem.Cast(m_Player.GetItemInHands()))
+			m_Player.GetItemInHands().Delete();
+	}
+	
+	bool PlayEmote(int id)
+	{
+		m_DeferredEmoteExecution = CALLBACK_CMD_INVALID;
+		
+		if (!CanPlayEmote(id))
+			return false;
+		
+		if (m_AdminLog)
+			m_AdminLog.LogPrint("[emote] " + Object.GetDebugName(m_Player) + " play emote id=" + id + " IH=" + Object.GetDebugName(m_Player.GetItemInHands()));
+		
+		m_PreviousGestureID = m_CurrentGestureID;
+		m_CurrentGestureID = id;
+		if (id > 0)
+		{
+			//-----------------------------------------------
+			EmoteBase emote;
+			if (m_NameEmoteMap.Find(id,emote))
+			{
+				int callback_ID;
+				int stancemask;
+				bool is_fullbody;
+				if (DetermineEmoteData(emote,callback_ID,stancemask,is_fullbody))
+				{
+					if (!emote.EmoteStartOverride(EmoteCB,callback_ID,stancemask,is_fullbody))
+					{
+						emote.OnBeforeStandardCallbackCreated(callback_ID,stancemask,is_fullbody);
+						CreateEmoteCallback(EmoteCB,callback_ID,stancemask,is_fullbody);
+					}
+					
+					if (emote.GetHideItemInHands())
+					{
+						HideItemInHands();
+					}
+				}
+				else
+				{
+					ErrorEx("EmoteManager | DetermineEmoteData failed!");
+				}
+			}
+		}
+		
+		SetEmoteLockState(m_bEmoteIsPlaying);
+		return m_bEmoteIsPlaying;
+	}
+	
+	//creates Emote callback
+	protected void CreateEmoteCallback(typename callbacktype, int id, int mask, bool fullbody)
+	{
+		if (m_Player)
+		{
+			m_LastMask = -1;
+
+			if (fullbody)
+			{
+				Class.CastTo(m_Callback, m_Player.StartCommand_Action(id,callbacktype,mask));
+				m_Callback.m_IsFullbody = true;
+				m_Callback.EnableCancelCondition(true);
+			}
+			else if (m_Player.IsPlayerInStance(mask))
+			{
+				m_LastMask = mask;  //character is probably not prone now
+				Class.CastTo(m_Callback, m_Player.AddCommandModifier_Action(id,callbacktype));
+			}
+			
+			if (m_Callback)
+			{
+				m_bEmoteIsPlaying = true;
+				m_Callback.m_callbackID = id;
+				m_Callback.m_player = m_Player;
+				m_Callback.m_Manager = this;
+			}
+		}
+	}
+	
+	protected void HideItemInHands()
+	{
+		m_item = m_Player.GetItemInHands();
+		if (m_Callback && m_item)
+		{
+			m_Player.TryHideItemInHands(true);
+		}
+	}
+	
+	protected void ShowItemInHands()
+	{
+		if (m_item)
+		{
+			m_Player.TryHideItemInHands(false);
+		}
+	}
+	
+	protected void CommitSuicide()
+	{
+		Weapon_Base weapon;
+		WeaponEventBase weapon_event = new WeaponEventTrigger;
+		
+		if (Weapon_Base.CastTo(weapon,m_Player.GetItemInHands()))
+		{
+			if (weapon.CanFire())
+			{
+				m_Callback.RegisterAnimationEvent("Simulation_End",EmoteConstants.EMOTE_SUICIDE_SIMULATION_END);
+				m_Player.SetSuicide(true);
+				weapon.ProcessWeaponEvent(weapon_event);
+				m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+				if (m_Player.IsAlive()) 
+				{
+					EntityAI helm = m_Player.FindAttachmentBySlotName("Headgear");
+					if (helm && GetGame().IsServer())
+					{
+						float damage = helm.GetMaxHealth("","");
+						helm.AddHealth("","", -damage/2);
+					}
+					GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(this.KillPlayer);
+					if (m_AdminLog)
+					{
+						m_AdminLog.Suicide(m_Player);
+					}
+				}
+			}
+			else
+			{
+				if (!weapon.IsDamageDestroyed())
+				{
+					weapon.ProcessWeaponEvent(weapon_event);
+				}
+				m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			}
+		}
+		else if (m_Player.GetItemInHands() && m_Player.GetItemInHands().ConfigIsExisting("suicideAnim"))
+		{
+			m_Callback.RegisterAnimationEvent("Death",EmoteConstants.EMOTE_SUICIDE_DEATH);
+			m_Callback.RegisterAnimationEvent("Bleed",EmoteConstants.EMOTE_SUICIDE_BLEED);
+			m_Callback.RegisterAnimationEvent("Simulation_End",EmoteConstants.EMOTE_SUICIDE_SIMULATION_END);
+			m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+			m_Player.SetSuicide(true);
+		}
+		else
+		{
+			m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+		}
+	}
+
+	void KillPlayer()
+	{
+		if (GetGame().IsServer())
+		{
+			m_Player.SetHealth(0);
+		}
+	}
+	
+	void LogSuicide()
+	{
+		if (GetGame().IsServer())
+		{
+			PlayerIdentity identity = m_Player.GetIdentity();
+			if (identity)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(GetGame().AdminLog, "Player '" + identity.GetName() + "' (id=" + identity.GetId() + ") committed suicide.");
+			}
+		}
+	}
+	
+	void CreateEmoteCBFromMenu(int id, bool interrupts_same = false)
+	{
+		m_MenuEmote = new EmoteLauncher(id,interrupts_same);
+	}
+	
+	EmoteLauncher GetEmoteLauncher()
+	{
+		return m_MenuEmote;
+	}
+	
+	void InterruptCallbackCommand()
+	{
+		m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+		
+		if (m_MenuEmote)
+			m_MenuEmote = null;
+		
+		m_DeferredEmoteExecution = CALLBACK_CMD_INVALID;
+	}
+	
+	void EndCallbackCommand()
+	{
+		if (m_CurrentGestureID == EmoteConstants.ID_EMOTE_DANCE)
+		{
+			m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+		}
+		else
+		{
+			m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+		}
+		
+		if (m_MenuEmote)
+			m_MenuEmote = null;
+		m_DeferredEmoteExecution = CALLBACK_CMD_INVALID;
+	}
+	
+	//sends request
+	void SendEmoteRequestSync(int id)
+	{
+		int forced = EmoteLauncher.FORCE_NONE;
+		if (m_MenuEmote)
+		{
+			forced = m_MenuEmote.GetForced();
+		}
+		
+		m_RPSOutcome = -1;
+		switch (id)
+		{
+			case EmoteConstants.ID_EMOTE_RPS :
+				m_RPSOutcome = Math.RandomInt(0,3);
+			break;
+			
+			case EmoteConstants.ID_EMOTE_RPS_R :
+				m_RPSOutcome = 0;
+			break;
+			
+			case EmoteConstants.ID_EMOTE_RPS_P :
+				m_RPSOutcome = 1;
+			break;
+			
+			case EmoteConstants.ID_EMOTE_RPS_S :
+				m_RPSOutcome = 2;
+			break;
+		}
+		
+		ScriptInputUserData ctx = new ScriptInputUserData;
+		if (GetGame().IsMultiplayer() && GetGame().IsClient())
+		{
+			bool canProceed = true; //running callbacks in certain state can block additional actions
+			EmoteBase emoteData;
+			if (m_Callback && m_NameEmoteMap.Find(m_CurrentGestureID,emoteData))
+			{
+				canProceed = emoteData.CanBeCanceledNormally(m_Callback);
+			}
+			
+			if (ctx.CanStoreInputUserData() && (CanPlayEmote(id) || forced) && canProceed)
+			{
+				ctx.Write(INPUT_UDT_GESTURE);
+				ctx.Write(id);
+				ctx.Write(forced);
+				if (m_RPSOutcome != -1)
+				{
+					ctx.Write(m_RPSOutcome);
+				}
+				ctx.Send();
+			}
+			m_MenuEmote = NULL;
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			if (id == CALLBACK_CMD_END)
+			{
+				EndCallbackCommand();
+			}
+			else if (id == CALLBACK_CMD_GESTURE_INTERRUPT)
+			{
+				m_DeferredEmoteExecution = CALLBACK_CMD_GESTURE_INTERRUPT;
+			}
+			else
+			{
+				PlayEmote(id);
+			}
+			m_MenuEmote = NULL;
+		}
+	}
+	
+	bool IsControllsLocked()
+	{
+		return m_controllsLocked;
+	}
+	
+	bool CanPlayEmote(int id)
+	{
+		//special cases
+		if (id == CALLBACK_CMD_END || id == CALLBACK_CMD_GESTURE_INTERRUPT || id == CALLBACK_CMD_INSTACANCEL)
+		{
+			return true;
+		}
+		
+		if (GetGame().IsClient() && GetGame().GetUIManager().FindMenu(MENU_INVENTORY))
+		{
+			return false;
+		}
+		
+		if (!m_Player || !m_Player.IsAlive() || (!IsEmotePlaying() && m_Player.GetCommand_Action() || m_Player.GetCommandModifier_Action()) || m_Player.GetThrowing().IsThrowingModeEnabled() || m_Player.IsItemsToDelete())
+		{	
+			return false;
+		}
+		
+		ItemBase item = m_Player.GetItemInHands();
+		if (item && item.IsHeavyBehaviour() && (id != EmoteConstants.ID_EMOTE_SURRENDER))
+		{
+			return false;
+		}
+		
+		if ((m_Player.GetWeaponManager() && m_Player.GetWeaponManager().IsRunning()) || (m_Player.GetActionManager() && m_Player.GetActionManager().GetRunningAction()))
+		{
+			return false;
+		}
+		
+		if (m_HIC.IsWeaponRaised() || m_Player.IsRolling() || m_Player.IsClimbing() || m_Player.IsRestrainStarted() || m_Player.IsFighting() || m_Player.IsSwimming() || m_Player.IsClimbingLadder() || m_Player.IsFalling() || m_Player.IsUnconscious() || m_Player.IsJumpInProgress() || m_Player.IsRestrained()) 	// rework conditions into something better?
+		{
+			return false;
+		}
+		if (m_Player.GetCommand_Vehicle())
+		{
+			if (m_Player.GetCommand_Vehicle().GetTransport())
+			{
+				return false;
+			}
+		}
+		
+		if (m_Player.GetCommand_Move() && m_Player.GetCommand_Move().IsOnBack() && id != EmoteConstants.ID_EMOTE_SURRENDER)
+		{
+			return false;
+		}
+		
+		//"locks" player in surrender state
+		if (m_IsSurrendered && (id != EmoteConstants.ID_EMOTE_SURRENDER))
+		{
+			return false;
+		}
+		
+		if (m_Player.GetDayZPlayerInventory().IsProcessing())
+		{
+			return false;
+		}
+		
+		EmoteBase emote;
+		if (m_NameEmoteMap.Find(id,emote))
+		{
+			int callback_ID;
+			int stancemask;
+			bool is_fullbody;
+			if (DetermineEmoteData(emote,callback_ID,stancemask,is_fullbody) && emote.EmoteCondition(stancemask))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	void PlaySurrenderInOut(bool state)
+	{
+		m_PreviousGestureID = m_CurrentGestureID;
+		m_CurrentGestureID = EmoteConstants.ID_EMOTE_SURRENDER;
+		if (state)
+		{
+			if (m_Player.GetItemInHands() && !m_Player.CanDropEntity(m_Player.GetItemInHands()))
+				return;
+			
+			if (m_Player.GetItemInHands() && GetGame().IsClient())
+			{
+				m_Player.PhysicalPredictiveDropItem(m_Player.GetItemInHands());
+			}
+			
+			CreateEmoteCallback(EmoteCB,DayZPlayerConstants.CMD_GESTUREFB_SURRENDERIN,DayZPlayerConstants.STANCEMASK_ALL,true);
+			
+			if (m_Callback)
+				m_Callback.RegisterAnimationEvent("ActionExec", UA_ANIM_EVENT);
+		}
+		else
+		{
+			if (m_Player.IsAlive() && !m_Player.IsUnconscious())
+			{
+				CreateEmoteCallback(EmoteCB,DayZPlayerConstants.CMD_GESTUREFB_SURRENDEROUT,DayZPlayerConstants.STANCEMASK_ALL,true);
+			}
+			else
+			{
+				m_bEmoteIsPlaying = false;
+				OnEmoteEnd();
+			}
+		}
+	}
+	
+	//!
+	void SetEmoteLockState(bool state)
+	{
+		//separate inventory access locking
+		if (state != m_InventoryAccessLocked)
+		{
+			m_Player.SetInventorySoftLock(state);
+			m_InventoryAccessLocked = state;
+		}
+		
+		//full emote locking (
+		if (state == m_EmoteLockState)
+		{
+			ErrorEx("emote lock state already set",ErrorExSeverity.INFO);
+			return;
+		}
+		
+		if (!m_HandInventoryLocation)
+		{
+			m_HandInventoryLocation = new InventoryLocation;
+			m_HandInventoryLocation.SetHands(m_Player,null);
+		}
+		
+		if (!state)
+		{
+			if (m_Player.GetInventory().HasInventoryReservation(null, m_HandInventoryLocation))
+				m_Player.GetInventory().ClearInventoryReservationEx(null, m_HandInventoryLocation);
+			
+			if (m_Player.GetActionManager())
+				m_Player.GetActionManager().EnableActions(true);
+				
+			if (m_controllsLocked)
+				m_controllsLocked = false;
+		}
+		else
+		{
+			if (!m_Player.GetInventory().HasInventoryReservation(null, m_HandInventoryLocation))
+				m_Player.GetInventory().AddInventoryReservationEx(null, m_HandInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+				
+			if (m_Player.GetActionManager())
+				m_Player.GetActionManager().EnableActions(false);
+			
+			//Movement lock in fullbody anims
+			if (m_Callback && m_Callback.m_IsFullbody && !m_controllsLocked)
+				m_controllsLocked = true;
+		}
+		m_EmoteLockState = state;
+	}
+	
+	void CheckEmoteLockedState()
+	{
+		if (!m_Player.GetItemInHands() || (m_Player.GetItemInHands() && !SurrenderDummyItem.Cast(m_Player.GetItemInHands())))
+			return;
+		
+		//refreshes reservation in case of unwanted timeout
+		if (m_EmoteLockState && m_HandInventoryLocation)
+		{
+			m_Player.GetInventory().ExtendInventoryReservationEx(null, m_HandInventoryLocation, 10000);
+		}
+	}
+	
+	//! directly force-ends surrender state from outside of normal flow
+	void EndSurrenderRequest(SurrenderData data = null)
+	{
+		if (m_IsSurrendered && data)
+		{
+			SetEmoteLockState(false);
+			if (m_Player.GetItemInHands())
+				m_Player.GetItemInHands().Delete();
+			
+			m_IsSurrendered = false;
+			
+			data.End();
+		}
+	}
+	
+	//sent from server to cancel general emote callback
+	void ServerRequestEmoteCancel()
+	{
+		ScriptJunctureData pCtx = new ScriptJunctureData;
+		pCtx.Write(CALLBACK_CMD_GESTURE_INTERRUPT);
+		
+		m_Player.SendSyncJuncture(DayZPlayerSyncJunctures.SJ_GESTURE_REQUEST, pCtx);
+	}
+	
+	bool InterruptGestureCheck()
+	{
+		//init pass
+		if (!m_InterruptInputDirect)
+		{
+			m_InterruptInputDirect = new array<UAInput>;
+			m_InterruptInputsCount = m_InterruptInputs.Count();
+			
+			for (int i = 0; i < m_InterruptInputsCount; i++)
+			{
+				m_InterruptInputDirect.Insert(GetUApi().GetInputByName(m_InterruptInputs[i]));
+			}
+		}
+		
+		//interrupts any callback if restrain action is in progress, takes priority
+		if (!m_Callback.m_IsFullbody)
+			return false;
+		
+		for (int idx = 0; idx < m_InterruptInputsCount; idx++)
+		{
+			if (m_InterruptInputDirect[idx].LocalPress())
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool InterruptWaterCheck()
+	{
+		float waterLevel = m_Player.GetCurrentWaterLevel();
+		
+		if (m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_PRONE) && waterLevel >= m_HumanSwimSettings.m_fToCrouchLevel)
+		{
+			return true;
+		}
+		else if (m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEIDX_RAISEDCROUCH) && waterLevel >= m_HumanSwimSettings.m_fToErectLevel)
+		{
+			return true;
+		}
+		
+		return m_Player.GetModifiersManager() && m_Player.GetModifiersManager().IsModifierActive(eModifiers.MDF_DROWNING);
+	}
+	
+	bool IsEmotePlaying()
+	{
+		return m_bEmoteIsPlaying || m_IsSurrendered;
+	}
+	
+	map<int,ref EmoteBase> GetNameEmoteMap()
+	{
+		return m_NameEmoteMap;
+	}
+	
+	void CreateBleedingEffect(int Callback_ID)
+	{
+		if (GetGame().IsServer() && m_Player.IsAlive())
+		{
+			switch (Callback_ID)
+			{
+				case DayZPlayerConstants.CMD_SUICIDEFB_1HD :
+					m_Player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("Neck");
+				break;
+				
+				case DayZPlayerConstants.CMD_SUICIDEFB_FIREAXE :
+					m_Player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll");
+				break;
+				
+				case DayZPlayerConstants.CMD_SUICIDEFB_PITCHFORK :
+					m_Player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("Spine2");
+				break;
+				
+				case DayZPlayerConstants.CMD_SUICIDEFB_SWORD :
+					m_Player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("Spine2");
+				break;
+				
+				case DayZPlayerConstants.CMD_SUICIDEFB_SPEAR :
+					m_Player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("Head");
+				break;
+				
+				case DayZPlayerConstants.CMD_SUICIDEFB_WOODAXE :
+					m_Player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll");
+				break;
+				
+				default :
+					ErrorEx("EmoteManager.c | CreateBleedingEffect | WRONG ID",ErrorExSeverity.INFO);
+				break;
+			}
+		}
+	}
+	
+/////////////////////////////////////////////////////////
+	//! Deprecated
+	protected void PickEmote(int gestureslot)
+	{
+	}
+};
+
+class SurrenderData
+{
+	//!called on surrender end request end
+	void End();
+}
+
+/**@class		ChainedDropAndKillPlayerLambda
+ * @brief		drops weapon in hands to ground and then calls kill
+ **/
+class ChainedDropAndKillPlayerLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+
+	void ChainedDropAndKillPlayerLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+		m_Player = player;
+		InventoryLocation gnd = new InventoryLocation;
+		vector mtx[4];
+		old_item.GetTransform(mtx);
+		gnd.SetGround(old_item, mtx);
+		
+		OverrideNewLocation(gnd);
+	}
+		
+	override void Execute (HumanInventoryWithFSM fsm_to_notify = null)
+	{
+		if (PrepareLocations())
+		{
+			vector transform[4];
+		
+			m_Player.GetInventory().TakeToDst(InventoryMode.SERVER, m_OldLocation, m_NewLocation);
+			m_Player.OnItemInHandsChanged();			
+		}
+		
+		m_Player.SetHealth(0);
+		
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[syncinv] player=" + Object.GetDebugName(m_Player) + " STS = " + m_Player.GetSimulationTimeStamp() + " ChainedDropAndKillPlayerLambda");
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Environment/Environment.c b/scripts/4_World/DayZ/Classes/Environment/Environment.c
new file mode 100644
index 0000000000000000000000000000000000000000..3eeb0608432b3019307cad5c8799779fbc653c51
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Environment/Environment.c
@@ -0,0 +1,1256 @@
+class Environment
+{
+	const float RAIN_LIMIT_LOW		= 0.05;
+
+	const float WATER_LEVEL_HIGH	= 1.5;
+	const float WATER_LEVEL_MID 	= 1.2;
+	const float WATER_LEVEL_LOW 	= 0.5;
+	const float WATER_LEVEL_NONE	= 0.15;
+	
+	protected float					m_WetDryTick; //ticks passed since last clothing wetting or drying
+	protected float					m_ItemsWetnessMax; //! keeps wetness of most wet item in player's possesion
+	protected float					m_RoofCheckTimer; // keeps info about tick time
+
+	//player
+	protected PlayerBase 			m_Player;
+	protected float					m_PlayerHeightPos; // y position of player above water level (meters)
+	protected float 				m_PlayerSpeed; // 1-3 speed of player movement
+	protected float 				m_PlayerTemperature; //34-44
+	protected float 				m_PlayerHeat; //3-9 heatcomfort generated by entites movement
+	protected float					m_HeatComfort;  //delta that changes entitys temperature				
+
+	//environment
+	protected float 				m_Rain = 0; // 0-1 amount of rain 
+	protected float 				m_Wind = 0; // strength of wind
+	protected float 				m_Fog = 0; // 0-1 how foggy it is
+	protected float 				m_DayOrNight = 0; // 0-1 day(1) or night(0)
+	protected float 				m_Clouds = 0; // 0-1 how cloudy it is
+	protected float 				m_EnvironmentTemperature = 0; //temperature of environment player is in
+	protected float					m_Time = 0;
+	protected string 				m_SurfaceType;
+	
+	//
+	protected float					m_WaterLevel;
+	protected bool 					m_IsUnderRoof;
+	private bool					m_IsUnderRoofBuilding;
+	protected bool 					m_IsInWater;
+	protected bool					m_IsTempSet;
+	//
+	protected float 				m_HeatSourceTemp;	//! DEPRECATED
+	protected float 				m_HeatBufferTimer;
+	
+	protected ref array<int> 		m_SlotIdsComplete;
+	protected ref array<int> 		m_SlotIdsUpper;
+	protected ref array<int> 		m_SlotIdsBottom;
+	protected ref array<int> 		m_SlotIdsLower;
+	
+	protected ref array<int>		m_HeadParts;
+	protected ref array<int>		m_BodyParts;
+	protected ref array<int>		m_FeetParts;
+	
+	protected ref SimpleMovingAverage<float> m_WindAverageBuffer;
+
+	protected bool m_HasTemperatureSources;
+	protected float m_UTSAverageTemperature;
+	protected ref array<UTemperatureSource> m_UTemperatureSources;
+	protected ref SimpleMovingAverage<float> m_UTSAverageTemperatureBuffer;
+	
+	#ifdef DIAG_DEVELOPER
+	bool m_Debug = false;
+
+	bool m_DebugLogDryWet = false;
+	#endif
+		
+	void Environment(PlayerBase pPlayer)
+	{
+		Init(pPlayer);
+	}
+	
+	void Init(PlayerBase pPlayer)
+	{
+		m_Player 						= pPlayer;
+		m_PlayerSpeed					= 0.0;
+		m_WetDryTick					= 0.0;
+		m_RoofCheckTimer				= 0.0;
+		m_WaterLevel					= 0.0;
+		m_HeatComfort					= 0.0;
+		
+		m_IsUnderRoof					= false;
+		m_IsInWater						= false;
+		m_SurfaceType					= "cp_dirt";
+
+		m_HeatBufferTimer 				= 0.0;
+		
+		m_WindAverageBuffer 			= new SimpleMovingAverage<float>(30, 0.5);
+		
+		m_UTSAverageTemperature			= 0.0;
+		m_UTemperatureSources 			= new array<UTemperatureSource>();
+		m_UTSAverageTemperatureBuffer	= new SimpleMovingAverage<float>(10, 0);
+
+		//! whole body slots		
+		m_SlotIdsComplete 		= new array<int>;		
+		m_SlotIdsComplete 		= {
+			InventorySlots.HEADGEAR,
+			InventorySlots.MASK,
+			InventorySlots.EYEWEAR,
+			InventorySlots.GLOVES,
+			InventorySlots.ARMBAND,
+			InventorySlots.BODY,
+			InventorySlots.HIPS,
+			InventorySlots.VEST,
+			InventorySlots.BACK,
+			InventorySlots.LEGS,
+			InventorySlots.FEET
+		};
+		//! upper body part slots
+		m_SlotIdsUpper 			= new array<int>;
+		m_SlotIdsUpper 			= {
+			InventorySlots.GLOVES,
+			InventorySlots.ARMBAND,
+			InventorySlots.BODY,
+			InventorySlots.HIPS,
+			InventorySlots.VEST,
+			InventorySlots.BACK,
+			InventorySlots.LEGS,
+			InventorySlots.FEET
+		};
+		//! bottom body part slots
+		m_SlotIdsBottom 		= new array<int>;
+		m_SlotIdsBottom			= {
+			InventorySlots.HIPS,
+			InventorySlots.LEGS,
+			InventorySlots.FEET
+		};
+		//! lower body part slots
+		m_SlotIdsLower 			= new array<int>;
+		m_SlotIdsLower			= {
+			InventorySlots.FEET,
+		};
+
+		//! --------------------------
+		//! heat comfort related slots
+		m_HeadParts				= new array<int>;
+		m_HeadParts				= {
+			InventorySlots.HEADGEAR,
+			InventorySlots.MASK,
+		};
+		
+		m_BodyParts				= new array<int>;
+		m_BodyParts				= {
+			InventorySlots.GLOVES,
+
+			InventorySlots.BODY,
+			InventorySlots.BACK,
+			InventorySlots.VEST,
+		};
+		
+		m_FeetParts				= new array<int>;
+		m_FeetParts				= {
+			InventorySlots.LEGS,
+			InventorySlots.FEET,
+		};
+	}
+
+	
+	// Calculates heatisolation of clothing, process its wetness, collects heat from heated items and calculates player's heat comfort
+	void Update(float pDelta)
+	{
+		if (m_Player)
+		{
+			m_RoofCheckTimer += pDelta;
+			//! check if player is under roof (only if the Building check is false)
+			if ( m_RoofCheckTimer >= GameConstants.ENVIRO_TICK_ROOF_RC_CHECK )
+			{
+				if ( !IsInsideBuilding() )
+					CheckUnderRoof();
+				
+				m_RoofCheckTimer = 0;
+			}
+
+			m_Time += pDelta;
+			if ( m_Time >= GameConstants.ENVIRO_TICK_RATE )
+			{
+				m_Time = 0;
+				m_WetDryTick++; // Sets whether it is time to add wetness to items and clothing
+
+				//! Updates data
+				CheckWaterContact(m_WaterLevel);
+				CollectAndSetPlayerData();
+				CollectAndSetEnvironmentData();
+				GatherTemperatureSources();
+
+				ProcessTemperatureSources();
+				
+				//! Process temperature
+				ProcessItemsHeat();
+
+				//! Process item wetness/dryness
+				if ( m_WetDryTick >= GameConstants.ENVIRO_TICKS_TO_WETNESS_CALCULATION )
+				{
+					if ( IsWaterContact() )
+					{
+						ProcessWetnessByWaterLevel(m_WaterLevel);
+					}
+					else if ( IsRaining() && !IsInsideBuilding() && !IsUnderRoof() && !IsInsideVehicle() )
+					{
+						ProcessWetnessByRain();
+					}
+					else
+					{
+						ProcessItemsDryness();
+					}
+
+					//! setting of wetness/dryiness of player
+					if ( ( m_ItemsWetnessMax < GameConstants.STATE_WET ) && ( m_Player.GetStatWet().Get() == 1 ) )
+					{
+						m_Player.GetStatWet().Set( 0 );
+					}
+					else if ( ( m_ItemsWetnessMax >= GameConstants.STATE_WET ) && ( m_Player.GetStatWet().Get() == 0 ) )
+					{
+						m_Player.GetStatWet().Set( 1 );
+					}
+
+					m_WetDryTick = 0;
+					m_ItemsWetnessMax = 0; //! reset item wetness counter;
+				}
+			}
+		}
+	}
+	
+	bool IsTemperatureSet()
+	{
+		return m_IsTempSet;
+	}
+
+	// DEPRECATED
+	void AddToEnvironmentTemperature(float pTemperature);
+	
+	//! Returns heat player generated based on player's movement speed (for now)
+	protected float GetPlayerHeat()
+	{
+		float heat = Math.Max(m_PlayerSpeed * GameConstants.ENVIRO_DEFAULT_ENTITY_HEAT, GameConstants.ENVIRO_DEFAULT_ENTITY_HEAT);
+		return heat;
+	}
+	
+	bool IsUnderRoof()
+	{
+		return m_IsUnderRoof;
+	}
+	
+	protected bool IsWaterContact()
+	{
+		return m_IsInWater;
+	}
+	
+	bool IsInsideBuilding()
+	{
+		return m_Player && m_Player.IsSoundInsideBuilding();
+	}
+
+	protected bool IsInsideVehicle()
+	{
+		return m_Player && m_Player.IsInVehicle();
+	}
+	
+	private bool IsUnderRoofBuilding()
+	{
+		return m_IsUnderRoofBuilding;
+	}
+	
+	protected bool IsRaining()
+	{
+		return m_Rain > RAIN_LIMIT_LOW;
+	}
+	
+	//! Checks whether Player is sheltered
+	protected void CheckUnderRoof()
+	{
+		// if inside vehicle return immediatelly
+		if (IsInsideVehicle())
+		{
+			m_IsUnderRoof = false;
+			m_IsUnderRoofBuilding = false;
+			return;
+		}
+		
+		float hitFraction;
+		vector hitPosition, hitNormal;
+		vector from = m_Player.GetPosition();
+		vector to = from + "0 25 0";
+		Object hitObject;
+		PhxInteractionLayers collisionLayerMask = PhxInteractionLayers.ITEM_LARGE|PhxInteractionLayers.BUILDING|PhxInteractionLayers.VEHICLE;
+		
+		m_IsUnderRoof = DayZPhysics.RayCastBullet(from, to, collisionLayerMask, null, hitObject, hitPosition, hitNormal, hitFraction);
+
+		m_IsUnderRoofBuilding = hitObject && hitObject.IsInherited(House);
+	}
+	
+	protected void CheckWaterContact(out float pWaterLevel)
+	{
+		m_IsInWater = false;
+		if (m_Player.IsSwimming())
+		{
+			m_IsInWater = true;
+			HumanMovementState hms = new HumanMovementState();
+			m_Player.GetMovementState(hms);
+			pWaterLevel = WATER_LEVEL_MID;
+			if (hms.m_iMovement >= DayZPlayerConstants.MOVEMENTIDX_WALK)
+				pWaterLevel = WATER_LEVEL_HIGH;
+
+			return;
+		}
+		
+		//! no valid surface under character
+		if (IsUnderRoofBuilding())
+		{
+			m_IsInWater = false;
+			return;
+		}
+
+		string surfType;
+		int liquidType;
+
+		g_Game.SurfaceUnderObject(m_Player, surfType, liquidType);
+		
+		switch ( liquidType )
+		{
+			case 0: // sea
+			case LIQUID_WATER:
+			case LIQUID_RIVERWATER:
+				pWaterLevel = m_Player.GetCurrentWaterLevel();
+				m_IsInWater = true;
+			break;
+		}
+
+		//! sync info about water contact to player
+		m_Player.SetInWater(m_IsInWater);
+
+		//! update active surface
+		m_SurfaceType = surfType;
+	}
+	
+	// ENVIRONMENT
+	// Returns amount of deg C air temperature should be lowered by, based on player's height above water level
+	float GetTemperatureHeightCorrection()
+	{
+		float temperature_reduction = Math.Max(0, (m_PlayerHeightPos * GameConstants.ENVIRO_TEMPERATURE_HEIGHT_REDUCTION));
+		return temperature_reduction;
+	}
+	
+	float GetWindModifierPerSurface()
+	{
+		if (IsUnderRoofBuilding())
+			return 0.0;
+
+		return g_Game.ConfigGetFloat("CfgSurfaces " + m_SurfaceType + " windModifier");
+	}
+	
+	float GetTemperature()
+	{
+		return m_EnvironmentTemperature;
+	}
+	
+	// Calculates and return temperature of environment
+	protected float GetEnvironmentTemperature()
+	{
+		float temperature;
+		temperature = g_Game.GetMission().GetWorldData().GetBaseEnvTemperature();
+		temperature += Math.AbsFloat(temperature * m_Clouds * GameConstants.ENVIRO_CLOUDS_TEMP_EFFECT);
+		
+		if (IsWaterContact())
+		{
+			temperature -= Math.AbsFloat(temperature * GameConstants.ENVIRO_WATER_TEMPERATURE_COEF);
+		}
+		
+		if (IsInsideBuilding() || m_IsUnderRoofBuilding)
+		{
+			temperature += Math.AbsFloat(temperature * GameConstants.ENVIRO_TEMPERATURE_INSIDE_COEF);
+		}
+		else if (IsInsideVehicle())
+		{
+			temperature += Math.AbsFloat(temperature * GameConstants.ENVIRO_TEMPERATURE_INSIDE_VEHICLE_COEF);
+		}
+		else if (IsUnderRoof() && !m_IsUnderRoofBuilding)
+		{
+			temperature += Math.AbsFloat(temperature * GameConstants.ENVIRO_TEMPERATURE_UNDERROOF_COEF);
+			temperature -= GameConstants.ENVIRO_TEMPERATURE_WIND_COEF * GetWindModifierPerSurface() * m_Wind;
+		}
+		else
+		{
+			temperature -= GameConstants.ENVIRO_TEMPERATURE_WIND_COEF * GetWindModifierPerSurface() * m_Wind;
+			temperature -= Math.AbsFloat(temperature * m_Fog * GameConstants.ENVIRO_FOG_TEMP_EFFECT);
+			temperature -= GetTemperatureHeightCorrection();
+		}
+		
+		// incorporate temperature from temperature sources (buffer)
+		if (Math.AbsFloat(m_UTSAverageTemperature) > 0.001)
+		{
+			temperature += m_UTSAverageTemperature;
+		}
+		
+		return temperature;
+	}	
+		
+	// Calculats wet/drying delta based on player's location and weather
+	float GetWetDelta()
+	{
+		float wetDelta = 0;
+		if ( IsWaterContact() )
+		{
+			//! player is getting wet by movement/swimming in water (+differentiate wetDelta by water level)
+			if (m_WaterLevel >= WATER_LEVEL_HIGH)
+			{
+				wetDelta = 1;
+			}
+			else if (m_WaterLevel >= WATER_LEVEL_MID && m_WaterLevel < WATER_LEVEL_HIGH)
+			{
+				wetDelta = 0.66;
+			}
+			else if (m_WaterLevel >= WATER_LEVEL_LOW && m_WaterLevel < WATER_LEVEL_MID)
+			{
+				wetDelta = 0.66;
+			}
+			else if (m_WaterLevel >= WATER_LEVEL_NONE && m_WaterLevel < WATER_LEVEL_LOW)
+			{
+				wetDelta = 0.33;
+			}
+		}
+		else if (IsRaining() && !IsInsideBuilding() && !IsUnderRoof() && !IsInsideVehicle())
+		{
+			//! player is getting wet from rain
+			wetDelta = GameConstants.ENVIRO_WET_INCREMENT * GameConstants.ENVIRO_TICKS_TO_WETNESS_CALCULATION * (m_Rain) * (1 + (GameConstants.ENVIRO_WIND_EFFECT * m_Wind));
+		}
+		else
+		{
+			//! player is drying
+			float tempEffect = Math.Max(m_PlayerHeat + GetEnvironmentTemperature(), 1.0);
+
+			float weatherEffect = ((1 - (m_Fog * GameConstants.ENVIRO_FOG_DRY_EFFECT))) * (1 - (m_Clouds * GameConstants.ENVIRO_CLOUD_DRY_EFFECT));
+			if (weatherEffect <= 0)
+			{
+				weatherEffect = 1.0;
+			}
+			
+			wetDelta = -(GameConstants.ENVIRO_DRY_INCREMENT * weatherEffect * tempEffect);
+			if (!IsInsideBuilding())
+			{
+				wetDelta *= 1 + (GameConstants.ENVIRO_WIND_EFFECT * m_Wind);
+			}
+		}
+
+		return wetDelta;
+	}
+
+	// EXPOSURE
+	// Each tick updates current entity member variables
+	protected void CollectAndSetPlayerData()
+	{
+		vector playerPos = m_Player.GetPosition();
+		m_PlayerHeightPos = playerPos[1];
+
+		HumanCommandMove hcm = m_Player.GetCommand_Move();
+		if (hcm)
+		{
+			m_PlayerSpeed = hcm.GetCurrentMovementSpeed();
+		}
+
+		m_PlayerHeat = GetPlayerHeat();
+	}
+	
+	// Each tick updates current environment member variables
+	protected void CollectAndSetEnvironmentData()
+	{
+		Weather weather	= g_Game.GetWeather();
+		m_Rain			= weather.GetRain().GetActual();
+		m_DayOrNight 	= g_Game.GetWorld().GetSunOrMoon();
+		m_Fog 			= weather.GetFog().GetActual();
+		m_Clouds 		= weather.GetOvercast().GetActual();
+		m_Wind 			= m_WindAverageBuffer.Add(weather.GetWindSpeed() / weather.GetWindMaximumSpeed());
+
+		SetEnvironmentTemperature();
+	}
+	
+	void SetEnvironmentTemperature()
+	{
+		m_IsTempSet = true;
+		m_EnvironmentTemperature = GetEnvironmentTemperature();
+	}
+
+	protected void ProcessWetnessByRain()
+	{
+		ProcessItemsWetness(m_SlotIdsComplete);
+	}
+
+	protected void ProcessWetnessByWaterLevel(float pWaterLevel)
+	{
+		// process attachments by water depth
+		if (pWaterLevel >= WATER_LEVEL_HIGH)
+		{
+			//! complete
+			ProcessItemsWetness(m_SlotIdsComplete);
+		}
+		else if (pWaterLevel >= WATER_LEVEL_MID && pWaterLevel < WATER_LEVEL_HIGH)
+		{
+			//! upper part
+			ProcessItemsWetness(m_SlotIdsUpper);
+		}
+		else if (pWaterLevel >= WATER_LEVEL_LOW && pWaterLevel < WATER_LEVEL_MID)
+		{
+			//! bottom part
+			ProcessItemsWetness(m_SlotIdsBottom);
+		}
+		else if (pWaterLevel >= WATER_LEVEL_NONE && pWaterLevel < WATER_LEVEL_LOW)
+		{
+			//! feet
+			ProcessItemsWetness(m_SlotIdsLower);
+		}
+	}
+
+	// Wets or dry items once in given time
+	protected void ProcessItemsWetness(array<int> pSlotIds)
+	{
+		EntityAI attachment;
+		
+		int playerAttachmentCount = m_Player.GetInventory().AttachmentCount();
+		
+		LogDryWetProcess(string.Format("Environment :: ProcessItemsWetness (update interval=%1s)", GameConstants.ENVIRO_TICK_RATE));
+		for (int attIdx = 0; attIdx < playerAttachmentCount; ++attIdx)
+		{
+			attachment = m_Player.GetInventory().GetAttachmentFromIndex(attIdx);
+			if (attachment.IsItemBase())
+			{
+				int attachmentSlotsCount = attachment.GetInventory().GetSlotIdCount();
+				for (int attachmentSlotId = 0; attachmentSlotId < attachmentSlotsCount; ++attachmentSlotId)
+				{
+					int attachmentSlot = attachment.GetInventory().GetSlotId(attachmentSlotId);
+					for (int i = 0; i < pSlotIds.Count(); ++i)
+					{
+						if (attachmentSlot == pSlotIds.Get(i))
+						{
+							ApplyWetnessToItem(ItemBase.Cast(attachment));
+							break;
+						}
+					}
+				}
+			}
+		}
+		
+		if (m_Player.GetItemInHands())
+			ApplyWetnessToItem(m_Player.GetItemInHands());
+
+		LogDryWetProcess("==========");
+
+	}
+
+	protected void ProcessItemsDryness()
+	{
+		EntityAI attachment;
+		ItemBase item;
+		
+		int attCount = m_Player.GetInventory().AttachmentCount();
+		
+		LogDryWetProcess(string.Format("Environment :: ProcessItemsDryness (update interval=%1s)", GameConstants.ENVIRO_TICK_RATE));
+		EnvironmentDrynessData drynessData = new EnvironmentDrynessData();
+		drynessData.m_UseTemperatureSources = m_HasTemperatureSources;
+
+		if (m_HasTemperatureSources)
+		{
+			float distance = vector.Distance(m_UTemperatureSources[0].GetPosition(), m_Player.GetPosition());
+			distance = Math.Max(distance, 0.1);
+			drynessData.m_TemperatureSourceDistance = distance;
+			LogDryWetProcess(string.Format("distance to heatsource: %1 m", distance));
+		}
+		
+		for (int attIdx = 0; attIdx < attCount; attIdx++)
+		{
+			attachment = m_Player.GetInventory().GetAttachmentFromIndex(attIdx);
+			if (attachment && attachment.IsItemBase())
+			{
+				item = ItemBase.Cast(attachment);
+				if (item)
+					ApplyDrynessToItemEx(item, drynessData);
+			}
+		}
+
+		if (m_Player.GetItemInHands())
+		{
+			ApplyDrynessToItemEx(m_Player.GetItemInHands(), drynessData);
+		}
+		
+		LogDryWetProcess("==========");
+	}
+
+	protected void ApplyWetnessToItem(ItemBase pItem)
+	{
+		if (pItem)
+		{
+			ItemBase parentItem;
+			bool isParentWet 			= false;
+			bool parentContainsLiquid 	= false;
+			InventoryLocation iLoc 		= new InventoryLocation();
+
+			if (pItem.GetInventory().GetCurrentInventoryLocation(iLoc))
+			{
+				EntityAI parent = iLoc.GetParent();
+				if (parent)
+				{
+					parentItem = ItemBase.Cast(parent);
+					if (parentItem)
+					{
+						if (parentItem.GetWet() >= GameConstants.STATE_SOAKING_WET)
+							isParentWet = true;
+
+						if ((parentItem.GetLiquidType() != 0) && (parentItem.GetQuantity() > 0))
+							parentContainsLiquid = true;
+					}
+					else
+						isParentWet = true;
+					
+					if ((pItem.GetWet() > m_ItemsWetnessMax) && (parent == m_Player))
+						m_ItemsWetnessMax = pItem.GetWet();
+				}
+			}
+
+			if (isParentWet || parentContainsLiquid)
+			{
+				float soakingCoef = 0;
+				if (parentContainsLiquid)
+				{
+					soakingCoef = pItem.GetSoakingIncrement("parentWithLiquid");
+					LogDryWetProcess(string.Format("%1 (soak coef=%2/s, current wetness=%3) [parent contains liquid]", pItem.GetDisplayName(), soakingCoef / GameConstants.ENVIRO_TICK_RATE, pItem.GetWet()), parentItem != null);
+				}
+				else if (isParentWet && parentItem)
+				{
+					if (pItem.GetWet() < parentItem.GetWet())
+					{
+						soakingCoef = pItem.GetSoakingIncrement("wetParent");
+						LogDryWetProcess(string.Format("%1 (soak coef=%2/s, current wetness=%3) [parent wet]", pItem.GetDisplayName(), soakingCoef / GameConstants.ENVIRO_TICK_RATE, pItem.GetWet()), parentItem != null);
+					}
+				}
+				else
+				{
+					soakingCoef = GetWetDelta();
+					LogDryWetProcess(string.Format("%1 (soak coef=%2/s, current wetness=%3) [normal]", pItem.GetDisplayName(), soakingCoef / GameConstants.ENVIRO_TICK_RATE, pItem.GetWet()), parentItem != null);
+				}
+
+				pItem.AddWet(soakingCoef);
+				pItem.AddTemperature(GameConstants.ENVIRO_TICK_RATE * GameConstants.TEMPERATURE_RATE_COOLING_PLAYER * pItem.GetSoakingIncrement("wetParent"));
+				
+				if (pItem.GetInventory().GetCargo())
+				{
+					int inItemCount = pItem.GetInventory().GetCargo().GetItemCount();
+					for (int i = 0; i < inItemCount; i++)
+					{
+						ItemBase inItem;
+						if (Class.CastTo(inItem, pItem.GetInventory().GetCargo().GetItem(i)))
+							ApplyWetnessToItem(inItem);
+					}
+				}
+				
+				int attCount = pItem.GetInventory().AttachmentCount();
+				if (attCount > 0)
+				{
+					for (int attIdx = 0; attIdx < attCount; attIdx++)
+					{
+						EntityAI attachment = pItem.GetInventory().GetAttachmentFromIndex(attIdx);
+						ItemBase itemAtt = ItemBase.Cast(attachment);
+						if (itemAtt)
+							ApplyWetnessToItem(itemAtt);
+					}
+				}
+			}
+		}
+	}
+	
+	protected void ApplyDrynessToItem(ItemBase pItem)
+	{
+		EnvironmentDrynessData drynessData = new EnvironmentDrynessData();
+		ApplyDrynessToItemEx(pItem, drynessData);
+	}
+	
+	protected void ApplyDrynessToItemEx(ItemBase pItem, EnvironmentDrynessData pDrynessData)
+	{
+		if (pItem)
+		{
+			float dryingIncrement = pItem.GetDryingIncrement("player");
+			if (pDrynessData.m_UseTemperatureSources)
+				dryingIncrement = pItem.GetDryingIncrement("playerHeatSource");
+			
+			ItemBase parentItem;
+			bool isParentWet 			= false;
+			bool parentContainsLiquid 	= false;
+	
+			InventoryLocation iLoc = new InventoryLocation();
+			if (pItem.GetInventory().GetCurrentInventoryLocation(iLoc))
+			{
+				EntityAI parent = iLoc.GetParent();
+				if (parent)
+				{
+					parentItem = ItemBase.Cast(parent);
+					if (parentItem)
+					{
+						if (parentItem.GetWet() >= GameConstants.STATE_SOAKING_WET)
+							isParentWet = true;
+	
+						if ((parentItem.GetLiquidType() != 0) && (parentItem.GetQuantity() > 0))
+							parentContainsLiquid = true;
+					}
+					
+					if ((pItem.GetWet() > m_ItemsWetnessMax) && (parent == m_Player))
+					{
+						m_ItemsWetnessMax = pItem.GetWet();
+					}
+				}
+			}
+	
+			float dryingCoef = 0;
+			
+			if (!isParentWet && !parentContainsLiquid)
+			{
+				
+				dryingCoef = (-1 * GameConstants.ENVIRO_TICK_RATE * dryingIncrement) / pDrynessData.m_TemperatureSourceDistance;
+				if (pItem.GetWet() >= GameConstants.STATE_DAMP)
+				{
+					LogDryWetProcess(string.Format("%1 (dry coef=%2/s, current wetness=%3) [normal]", pItem.GetDisplayName(), dryingCoef / GameConstants.ENVIRO_TICK_RATE, pItem.GetWet()), parentItem != null);
+					pItem.AddWet(dryingCoef);			
+				}
+				
+				if (pItem.GetInventory().GetCargo())
+				{
+					int inItemCount = pItem.GetInventory().GetCargo().GetItemCount();
+					for (int i = 0; i < inItemCount; i++)
+					{
+						ItemBase inItem;
+						if (Class.CastTo(inItem, pItem.GetInventory().GetCargo().GetItem(i)))
+							ApplyDrynessToItemEx(inItem, pDrynessData);
+					}
+				}
+				
+				int attCount = pItem.GetInventory().AttachmentCount();
+				if (attCount > 0)
+				{
+					for (int attIdx = 0; attIdx < attCount; attIdx++)
+					{
+						EntityAI attachment = pItem.GetInventory().GetAttachmentFromIndex(attIdx);
+						ItemBase itemAtt;
+						if (ItemBase.CastTo(itemAtt, attachment))
+							ApplyDrynessToItemEx(itemAtt, pDrynessData);
+					}
+				}
+				
+				pItem.AddTemperature(GameConstants.ENVIRO_TICK_RATE * GameConstants.TEMPERATURE_RATE_COOLING_PLAYER);
+			}
+			
+			if (parentContainsLiquid)
+			{
+				//! adds wetness to item inside parent item containing liquid
+				dryingCoef = (GameConstants.ENVIRO_TICK_RATE * pItem.GetSoakingIncrement("parentWithLiquid")) / pDrynessData.m_TemperatureSourceDistance;
+				LogDryWetProcess(string.Format("%1 (dry coef=%2/s, current wetness=%3) [parent contains liquid]", pItem.GetDisplayName(), dryingCoef / GameConstants.ENVIRO_TICK_RATE, pItem.GetWet()), parentItem != null);
+				pItem.AddWet(dryingCoef);
+				pItem.AddTemperature(GameConstants.ENVIRO_TICK_RATE * GameConstants.TEMPERATURE_RATE_COOLING_PLAYER);
+			}
+	
+			if (isParentWet)
+			{
+				if (pItem.GetWet() < parentItem.GetWet())
+				{
+					//! adds wetness to item inside wet parent item
+					dryingCoef = (GameConstants.ENVIRO_TICK_RATE * pItem.GetSoakingIncrement("wetParent")) / pDrynessData.m_TemperatureSourceDistance;
+					LogDryWetProcess(string.Format("%1 (dry coef=%2/s, current wetness=%3) [parent wet]", pItem.GetDisplayName(), dryingCoef / GameConstants.ENVIRO_TICK_RATE, pItem.GetWet()), parentItem != null);
+					pItem.AddWet(dryingCoef);
+				}
+	
+				pItem.AddTemperature(GameConstants.ENVIRO_TICK_RATE * GameConstants.TEMPERATURE_RATE_COOLING_PLAYER * 3.5);
+			}
+		}
+	}
+
+	// HEAT COMFORT
+	//! Calculates and process temperature of items
+	protected void ProcessItemsHeat()
+	{
+		float hcHead, hcBody, hcFeet;	//! Heat Comfort
+		float hHead, hBody, hFeet;		//! Heat (from items);
+		
+		float heatComfortAvg;
+		float heatAvg;
+
+		BodyPartHeatProperties(m_HeadParts, GameConstants.ENVIRO_HEATCOMFORT_HEADPARTS_WEIGHT, hcHead, hHead);
+		BodyPartHeatProperties(m_BodyParts, GameConstants.ENVIRO_HEATCOMFORT_BODYPARTS_WEIGHT, hcBody, hBody);
+		BodyPartHeatProperties(m_FeetParts, GameConstants.ENVIRO_HEATCOMFORT_FEETPARTS_WEIGHT, hcFeet, hFeet);
+
+		heatComfortAvg = (hcHead + hcBody + hcFeet) / 3;
+		heatAvg = (hHead + hBody + hFeet) / 3;
+		heatAvg = heatAvg * GameConstants.ENVIRO_ITEM_HEAT_TRANSFER_COEF;
+		
+		// heat buffer
+		float applicableHB = 0.0;
+		if (m_UTSAverageTemperature < 0.001)
+		{
+			applicableHB = m_Player.GetStatHeatBuffer().Get() / 30.0;
+			if (applicableHB > 0.0)
+			{
+				if (m_HeatBufferTimer > 1.0)
+				{
+					m_Player.GetStatHeatBuffer().Add(Math.Min(EnvTempToCoef(m_EnvironmentTemperature), -0.1) * GameConstants.ENVIRO_PLAYER_HEATBUFFER_DECREASE);
+				}
+				else
+				{
+					m_HeatBufferTimer += GameConstants.ENVIRO_PLAYER_HEATBUFFER_TICK;
+				}
+			}
+			else
+			{
+				m_HeatBufferTimer = 0.0;
+			}			
+		}
+		else
+		{
+			applicableHB = m_Player.GetStatHeatBuffer().Get() / 30.0;
+			if (m_HeatComfort > PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING)
+			{
+				m_Player.GetStatHeatBuffer().Add(GameConstants.ENVIRO_PLAYER_HEATBUFFER_INCREASE);
+				m_HeatBufferTimer = 0.0;
+			}
+			else
+			{
+				m_HeatBufferTimer = 0.0;
+			}
+		}
+		
+		m_HeatComfort = (heatComfortAvg + heatAvg + (GetPlayerHeat() / 100)) + EnvTempToCoef(m_EnvironmentTemperature);
+		if ((m_HeatComfort + applicableHB) < (PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_WARNING - 0.01))
+		{
+			m_HeatComfort += applicableHB;
+		}
+		else
+		{
+			if (m_HeatComfort <= (PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_WARNING - 0.01))
+			{
+				m_HeatComfort = PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_WARNING - 0.01;
+			}
+		}
+
+		m_HeatComfort = Math.Clamp(m_HeatComfort, m_Player.GetStatHeatComfort().GetMin(), m_Player.GetStatHeatComfort().GetMax());
+		
+		m_Player.GetStatHeatComfort().Set(m_HeatComfort);
+	}
+	
+	//! DEPRECATED
+	protected bool OverridenHeatComfort(out float value);
+	
+	protected float EnvTempToCoef(float pTemp)
+	{
+		if (pTemp >= GameConstants.ENVIRO_HIGH_TEMP_LIMIT)
+		{
+			return 1;
+		}
+		
+		if (pTemp <= GameConstants.ENVIRO_LOW_TEMP_LIMIT)
+		{
+			return -1;
+		}
+
+		return (pTemp - GameConstants.ENVIRO_PLAYER_COMFORT_TEMP) / GameConstants.ENVIRO_TEMP_EFFECT_ON_PLAYER;
+	}
+	
+	//! returns weighted avg heat comfort for bodypart
+	protected void BodyPartHeatProperties(array<int> pBodyPartIds, float pCoef, out float pHeatComfort, out float pHeat)
+	{
+		int attCount;
+		
+		EntityAI attachment;
+		ItemBase item;
+		
+		pHeatComfort = -1;
+		attCount = m_Player.GetInventory().AttachmentCount();
+		
+		for (int attIdx = 0; attIdx < attCount; attIdx++)
+		{
+			attachment = m_Player.GetInventory().GetAttachmentFromIndex(attIdx);
+			if (attachment.IsClothing())
+			{
+				item = ItemBase.Cast(attachment);
+				int attachmentSlot = attachment.GetInventory().GetSlotId(0);
+
+				//! go through all body parts we've defined for that zone (ex.: head, body, feet)
+				for (int i = 0; i < pBodyPartIds.Count(); i++)
+				{
+					if (attachmentSlot == pBodyPartIds.Get(i))
+					{
+						float heatIsoMult = 1.0;
+						if (attachmentSlot == InventorySlots.VEST)
+						{
+							heatIsoMult = GameConstants.ENVIRO_HEATISOLATION_VEST_WEIGHT;
+						}
+
+						if (attachmentSlot == InventorySlots.BACK)
+						{
+							heatIsoMult = GameConstants.ENVIRO_HEATISOLATION_BACK_WEIGHT;
+						}
+
+						pHeatComfort += heatIsoMult * MiscGameplayFunctions.GetCurrentItemHeatIsolation(item);
+						
+						// go through any attachments and cargo (only current level, ignore nested containers - they isolate)
+						int inAttCount = item.GetInventory().AttachmentCount();
+						if (inAttCount > 0)
+						{
+							for (int inAttIdx = 0; inAttIdx < inAttCount; inAttIdx++)
+							{
+								EntityAI inAttachment = item.GetInventory().GetAttachmentFromIndex(inAttIdx);
+								ItemBase itemAtt = ItemBase.Cast(inAttachment);
+								if (itemAtt)
+								{
+									pHeat += itemAtt.GetTemperature();
+								}
+							}
+						}
+						if (item.GetInventory().GetCargo())
+						{
+							int inItemCount = item.GetInventory().GetCargo().GetItemCount();
+							
+							for (int j = 0; j < inItemCount; j++)
+							{
+								ItemBase inItem;
+								if (Class.CastTo(inItem, item.GetInventory().GetCargo().GetItem(j)))
+								{
+									pHeat += inItem.GetTemperature();
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+
+		pHeatComfort = (pHeatComfort / pBodyPartIds.Count()) * pCoef;
+		pHeat = (pHeat / pBodyPartIds.Count()) * pCoef;
+	}
+	
+	protected void GatherTemperatureSources()
+	{
+		m_UTemperatureSources.Clear();
+
+		array<Object> nearestObjects = new array<Object>;
+		GetGame().GetObjectsAtPosition(m_Player.GetPosition(), GameConstants.ENVIRO_TEMP_SOURCES_LOOKUP_RADIUS, nearestObjects, null);
+
+		foreach (Object nearestObject : nearestObjects)
+		{
+			EntityAI ent = EntityAI.Cast(nearestObject);
+			if (ent && ent.IsUniversalTemperatureSource() && ent != m_Player)
+			{
+				//! next temp source is too far
+				if (vector.DistanceSq(m_Player.GetPosition(), ent.GetPosition()) > Math.SqrFloat(ent.GetUniversalTemperatureSource().GetMaxRange()))
+					continue;
+
+				m_UTemperatureSources.Insert(ent.GetUniversalTemperatureSource());
+			}
+		}
+
+		if (m_Player.GetItemInHands() && m_Player.GetItemInHands().IsUniversalTemperatureSource())
+			m_UTemperatureSources.Insert(m_Player.GetItemInHands().GetUniversalTemperatureSource());
+	}
+	
+	protected void ProcessTemperatureSources()
+	{
+		if (m_UTemperatureSources.Count() == 0)
+		{
+			m_HasTemperatureSources = false;
+			m_UTSAverageTemperature = m_UTSAverageTemperatureBuffer.Add(0);
+			return;
+		}
+
+		array<float> utsTemperatures = new array<float>();
+		
+		// get temperature from the source (based on distance), save it for min/max filtering
+		foreach (UTemperatureSource tempSource : m_UTemperatureSources)
+			utsTemperatures.Insert(CalcTemperatureFromTemperatureSource(tempSource));
+
+		float min = MiscGameplayFunctions.GetMinValue(utsTemperatures);
+		float max = MiscGameplayFunctions.GetMaxValue(utsTemperatures);
+		
+		if (max > 0 && min < 0)
+		{
+			//! adds average of 2 most significat sources to buffer
+			m_UTSAverageTemperature = m_UTSAverageTemperatureBuffer.Add((max + min) * 0.5);
+		}
+		else
+		{
+			m_UTSAverageTemperature = m_UTSAverageTemperatureBuffer.Add(max);
+		}
+		
+		m_HasTemperatureSources = true;
+	}
+	
+	float GetUniversalSourcesTemperageAverage()
+	{
+		return m_UTSAverageTemperature;
+	}
+	
+	float CalcTemperatureFromTemperatureSource(notnull UTemperatureSource uts)
+	{
+		float distance 		= vector.Distance(m_Player.GetPosition(), uts.GetPosition());
+		distance 			= Math.Max(distance, 0.1);	//min distance cannot be 0 (division by zero)
+		float temperature	= 0;
+
+		//Debug.Log(string.Format("CalcTemperatureFromTemperatureSource::distance: %1", distance), "Environment");
+		
+		//! heat transfer through air to player (env temperature)
+		if (distance > uts.GetFullRange())
+		{
+			float distFactor = 1 - (distance / uts.GetMaxRange());
+			distFactor = Math.Max(distFactor, 0.0); //! dist factor minimum should be at 0
+			temperature = uts.GetTemperature() * distFactor;
+			//temperature = Math.Clamp(temperature, uts.GetTemperatureMin(), uts.GetTemperatureMax());
+			//Debug.Log(string.Format("CalcTemperatureFromTemperatureSource::distFactor: %1", distFactor), "Environment");
+			//Debug.Log(string.Format("CalcTemperatureFromTemperatureSource::temperatureXX: %1", temperature), "Environment");
+		}
+		else
+		{
+			temperature = uts.GetTemperature();
+		}
+
+		//Debug.Log(string.Format("CalcTemperatureFromTemperatureSource::temperature: %1", temperature), "Environment");
+
+		return temperature;
+	}
+
+	//! debug
+#ifdef DIAG_DEVELOPER
+	EnvDebugData GetEnvDebugData()
+	{
+		EnvDebugData data = new EnvDebugData();
+		data.Synch(this, m_Player);
+		return data;
+	}
+	
+	void ShowEnvDebugPlayerInfo(bool enabled)
+	{
+		EnvDebugData data = GetEnvDebugData();
+		DisplayEnvDebugPlayerInfo(enabled, data);
+	}
+	
+	static void DisplayEnvDebugPlayerInfo(bool enabled, EnvDebugData data)
+	{
+		int windowPosX = 10;
+		int windowPosY = 200;
+
+		Object obj;
+
+		DbgUI.Begin("Player stats", windowPosX, windowPosY);
+		if ( enabled )
+		{
+			DbgUI.Text(string.Format("Heat comfort: %1", data.m_PlayerData.m_HeatComfort));
+			DbgUI.Text(string.Format("Inside: %1 (%2)", data.m_PlayerData.m_Inside, data.m_PlayerData.m_Surface));
+			DbgUI.Text(string.Format("Under roof: %1 (%2)", data.m_PlayerData.m_UnderRoof, data.m_PlayerData.m_UnderRoofTimer));
+			if ( data.m_PlayerData.m_WaterLevel > 0 )
+			{
+				DbgUI.Text(string.Format("Water Level: %1", data.m_PlayerData.m_WaterLevel));
+			}
+			
+		}
+		DbgUI.End();
+		
+		DbgUI.Begin("Weather stats:", windowPosX, windowPosY + 200);
+		if ( enabled )
+		{
+			DbgUI.Text(string.Format("Env temperature (base): %1", data.m_MiscData.m_TemperatureBase));
+			DbgUI.Text(string.Format("Env temperature (modfied): %1", data.m_MiscData.m_TemperatureModified));
+			DbgUI.Text(string.Format("Wind: %1 (x%2)", data.m_WeatherData.m_Wind, data.m_WeatherData.m_WindModifier));
+			DbgUI.Text(string.Format("Rain: %1", data.m_WeatherData.m_Rain));
+			DbgUI.Text(string.Format("Day/Night (1/0): %1", data.m_MiscData.m_DayOrNight));
+			DbgUI.Text(string.Format("Fog: %1", data.m_WeatherData.m_Fog));
+			DbgUI.Text(string.Format("Clouds: %1", data.m_WeatherData.m_Clouds));
+			DbgUI.Text(string.Format("Height: %1", data.m_MiscData.m_Height));
+			DbgUI.Text(string.Format("Wet delta: %1", data.m_MiscData.m_WetDelta));
+		}
+		DbgUI.End();
+	}
+	
+	void FillDebugWeatherData(EnvDebugWeatherData data)
+	{
+		data.m_Wind = m_Wind;
+		data.m_WindModifier = GetWindModifierPerSurface();
+		data.m_Rain = m_Rain;
+		data.m_Fog = m_Fog;
+		data.m_Clouds = m_Clouds;
+	}
+#endif
+
+	string GetDebugMessage()
+	{
+		string message;		
+		message += "Player stats";
+		message += "\nHeat comfort: " + m_HeatComfort.ToString();
+		message += "\nInside: " + IsInsideBuilding().ToString() + " (" + m_Player.GetSurfaceType() + ")";
+		message += "\nUnder roof: " + m_IsUnderRoof.ToString() + " (" + GetNextRoofCheck() + ")";
+		if (IsWaterContact() && m_WaterLevel > WATER_LEVEL_NONE)
+		{
+			message += "\nWater Level: " + m_WaterLevel;
+		}
+
+		message += "\n\nWeather stats";
+		message += "\nEnv temperature (base): " + g_Game.GetMission().GetWorldData().GetBaseEnvTemperature().ToString();
+		message += "\nEnv temperature (modified): " + m_EnvironmentTemperature.ToString();
+		message += "\nWind: " + m_Wind.ToString() + " (x" + GetWindModifierPerSurface() + ")";
+		message += "\nRain: " + m_Rain.ToString();
+		message += "\nDay/Night (1/0): " + m_DayOrNight.ToString();
+		message += "\nFog: " + m_Fog.ToString();
+		message += "\nClouds: " + m_Clouds.ToString();
+		message += "\nHeight: " + GetTemperatureHeightCorrection().ToString();
+		message += "\nWet delta: " + GetWetDelta().ToString();
+		
+		return message;
+	}
+	
+	int GetNextRoofCheck()
+	{
+		return (GameConstants.ENVIRO_TICK_ROOF_RC_CHECK - m_RoofCheckTimer) + 1;
+	}
+	
+	float GetWaterLevel()
+	{
+		if (IsWaterContact() && m_WaterLevel > WATER_LEVEL_NONE)
+		{
+			return m_WaterLevel;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	
+	float GetDayOrNight()
+	{
+		return m_DayOrNight;
+	}
+	
+	private void LogDryWetProcess(string message, bool indented = false)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (m_DebugLogDryWet)
+		{
+			string indentation = "";
+			if (indented)
+				indentation = "|--";
+
+			Debug.Log(string.Format("%1 %2", indentation, message));
+		}
+		#endif
+	}
+}
+
+class EnvironmentDrynessData
+{
+	bool m_UseTemperatureSources 		= false;
+	float m_TemperatureSourceDistance	= 1.0;
+}
+
+#ifdef DIAG_DEVELOPER
+class EnvDebugPlayerData : Param
+{
+	float 	m_HeatComfort;
+	bool 	m_Inside;
+	string 	m_Surface;
+	bool 	m_UnderRoof;
+	int 	m_UnderRoofTimer;
+	float 	m_WaterLevel;
+	
+	void Synch(Environment env, PlayerBase player)
+	{
+		m_HeatComfort = player.GetStatHeatComfort().Get();
+		m_Inside = env.IsInsideBuilding();
+		m_Surface = player.GetSurfaceType();
+		m_UnderRoof = env.IsUnderRoof();
+		m_UnderRoofTimer = env.GetNextRoofCheck();
+		m_WaterLevel = env.GetWaterLevel();
+	}
+	
+	override bool Serialize(Serializer ctx)
+	{
+		return (
+		ctx.Write(m_HeatComfort) && ctx.Write(m_Inside) && ctx.Write(m_Surface) && ctx.Write(m_UnderRoof) && ctx.Write(m_UnderRoofTimer) && ctx.Write(m_WaterLevel));
+	}
+	
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(m_HeatComfort) && ctx.Read(m_Inside) && ctx.Read(m_Surface) && ctx.Read(m_UnderRoof) && ctx.Read(m_UnderRoofTimer) && ctx.Read(m_WaterLevel);
+	}
+}
+
+class EnvDebugMiscData : Param
+{
+	float 	m_TemperatureBase;
+	float 	m_TemperatureModified;
+	float 	m_DayOrNight;
+	float 	m_Height;
+	float 	m_WetDelta;
+	
+	void Synch(Environment env)
+	{
+		m_TemperatureBase = g_Game.GetMission().GetWorldData().GetBaseEnvTemperature();
+		m_TemperatureModified = env.GetTemperature();
+		m_DayOrNight = env.GetDayOrNight();
+		m_Height = env.GetTemperatureHeightCorrection();
+		m_WetDelta = env.GetWetDelta();
+	}
+	
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(m_TemperatureBase) && ctx.Write(m_TemperatureModified) && ctx.Write(m_DayOrNight) && ctx.Write(m_Height) && ctx.Write(m_WetDelta);
+	}
+	
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(m_TemperatureBase) && ctx.Read(m_TemperatureModified) && ctx.Read(m_DayOrNight) && ctx.Read(m_Height) && ctx.Read(m_WetDelta);
+	}
+}
+
+class EnvDebugWeatherData : Param
+{
+	float 	m_Wind;
+	float 	m_WindModifier;
+	float 	m_Rain;
+	float 	m_Fog;
+	float 	m_Clouds;
+	
+	void Synch(Environment env)
+	{
+		env.FillDebugWeatherData(this);
+	}
+	
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(m_Wind) && ctx.Write(m_WindModifier) && ctx.Write(m_Rain) && ctx.Write(m_Fog) && ctx.Write(m_Clouds);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(m_Wind) && ctx.Read(m_WindModifier) && ctx.Read(m_Rain) && ctx.Read(m_Fog) && ctx.Read(m_Clouds);
+	}
+}
+
+class EnvDebugData : Param
+{
+	ref EnvDebugPlayerData 		m_PlayerData = new EnvDebugPlayerData();
+	ref EnvDebugMiscData 		m_MiscData = new EnvDebugMiscData();
+	ref EnvDebugWeatherData 	m_WeatherData = new EnvDebugWeatherData();
+	
+	void Synch(Environment env, PlayerBase player)
+	{
+		m_PlayerData.Synch(env, player);
+		m_MiscData.Synch(env);
+		m_WeatherData.Synch(env);
+	}
+	
+	override bool Serialize(Serializer ctx)
+	{
+		return m_PlayerData.Serialize(ctx) && m_MiscData.Serialize(ctx) && m_WeatherData.Serialize(ctx);
+	}
+		
+	override bool Deserializer(Serializer ctx)
+	{
+		return m_PlayerData.Deserializer(ctx) && m_MiscData.Deserializer(ctx) && m_WeatherData.Deserializer(ctx);
+	}
+}
+#endif
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Explosion.c b/scripts/4_World/DayZ/Classes/Explosion.c
new file mode 100644
index 0000000000000000000000000000000000000000..edeb493b7f49cb0255cbe76985101c1549923fa8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Explosion.c
@@ -0,0 +1,25 @@
+// WIP
+
+class Explosion
+{
+	void SpawnEffect( vector position, Effect eff, vector pos, vector ori)
+	{
+		SEffectManager.PlayInWorld(eff, pos);
+	}
+}
+
+class ExplosionTest : House
+{
+	ref Timer m_Delay;
+	
+	void ExplosionTest()
+	{
+		m_Delay = new Timer;
+		m_Delay.Run(1, this, "ExplodeNow", null, false);
+	}
+	
+	void ExplodeNow()
+	{
+		Explode(DT_EXPLOSION, "Explosion_NonLethal");
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Explosions/FlashbangEffect.c b/scripts/4_World/DayZ/Classes/Explosions/FlashbangEffect.c
new file mode 100644
index 0000000000000000000000000000000000000000..aca165119bd600a618c0e18fceed939797472b09
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Explosions/FlashbangEffect.c
@@ -0,0 +1,208 @@
+class FlashbangEffect
+{
+	protected const float 						ALPHA_MIN = 0.0;
+	protected const float 						ALPHA_MAX = 1.0;
+	
+	protected const float 						SOUND_DEFER_TIME = 0.4;			//! SFX will be played ~0.5s AFTER VFX 
+
+	protected float 							m_HitDuration;
+	protected float 							m_BreakPoint;
+	protected float 							m_TimeActive;
+	protected float								m_DayTimeToggle;
+	
+	protected float								m_AlphaMaxActual; //actual max alpha of the effect
+	protected float								m_SoundMaxActual; //actual max volume of the sound
+	protected float								m_ProgressMultiplier; 
+	
+	protected bool								m_Visual;
+	protected bool 								m_Initialized;
+	
+	protected PlayerBase 						m_Player;
+	protected EffectSound 						m_FlashbangEffectSound;
+	protected float 							m_SoundStopTime;
+	
+	protected ref Timer							m_DeferAttenuation;
+	
+	protected PPERequester_FlashbangEffects 	m_Requester;
+	
+	void FlashbangEffect(PlayerBase player, bool visual = true)
+	{
+		m_Player = player;
+		m_Visual = visual;
+		m_Initialized = false;
+
+		m_HitDuration = 8.0;
+		m_BreakPoint = 2.5;
+		m_AlphaMaxActual = ALPHA_MAX;
+		m_SoundMaxActual = 1.0;
+		m_ProgressMultiplier = 1.0;
+		
+		m_FlashbangEffectSound = null;
+		
+		if (m_Visual)
+		{
+			Class.CastTo(m_Requester,PPERequesterBank.GetRequester(PPERequester_FlashbangEffects));
+			m_Requester.Start();
+		}
+		
+		m_DeferAttenuation = new ref Timer();
+		m_DeferAttenuation.Run(SOUND_DEFER_TIME, this, "PlaySound", null, false);
+		
+		//! naive time of the day selector
+		m_DayTimeToggle = 5; //! -1: night; 1: day
+		if ( g_Game.GetDayTime() >= 22.0 || g_Game.GetDayTime() < 7.0 )
+		{
+			m_DayTimeToggle = 10;
+		}
+	}
+	
+	void ~FlashbangEffect()
+	{
+		if ( m_Visual )
+		{
+			ClearVisual();
+		}
+		
+		if ( m_Player )
+		{
+			m_Player.OnPlayerReceiveFlashbangHitEnd();
+		}
+
+		if ( m_DeferAttenuation.IsRunning() )
+		{
+			m_DeferAttenuation.Stop();
+		}
+		
+		m_DeferAttenuation = null;
+		SEffectManager.DestroyEffect(m_FlashbangEffectSound);
+	}
+	
+	void SetupFlashbangValues(float progress_mult = 1.0, float visual_value_max = 1.0, float sound_value_max = 1.0)
+	{
+		if ( !m_Initialized )
+		{
+			m_Initialized = true;
+			m_ProgressMultiplier = progress_mult;
+			m_AlphaMaxActual = visual_value_max;
+			m_SoundMaxActual = sound_value_max;
+			
+			m_HitDuration *= m_ProgressMultiplier;
+			m_BreakPoint *= m_ProgressMultiplier;
+		}
+	}
+	
+	protected void PlaySound()
+	{
+		if ( !m_Initialized )
+		{
+			Error("" + this + " not initialized");
+			return;
+		}
+		
+		vector pos;
+		MiscGameplayFunctions.GetHeadBonePos(m_Player, pos);
+		
+		if (!m_FlashbangEffectSound)
+		{
+			m_FlashbangEffectSound = SEffectManager.CreateSound("Tinnitus_SoundSet", pos);
+		}
+		
+		if (!m_FlashbangEffectSound.IsPlaying())
+		{
+			m_FlashbangEffectSound.SetParent(m_Player);
+			m_FlashbangEffectSound.SetAttachedLocalPos(m_Player.WorldToModel(pos));
+			m_FlashbangEffectSound.SetSoundWaveKind(WaveKind.WAVEEFFECTEX);
+			m_FlashbangEffectSound.SetSoundFadeIn(4 * Math.Clamp(m_ProgressMultiplier,0.5,1.0)); //TODO
+			m_SoundStopTime = 2 * Math.Clamp(m_ProgressMultiplier,0.5,1.0);
+			m_FlashbangEffectSound.SetSoundFadeOut(m_SoundStopTime); //TODO
+			m_FlashbangEffectSound.SetSoundMaxVolume(Math.Clamp(m_SoundMaxActual,0.1,1.0)); //TODO
+			m_FlashbangEffectSound.SetSoundLoop(true);
+			m_FlashbangEffectSound.SoundPlay();
+			m_FlashbangEffectSound.SetAutodestroy(true);
+			
+			SetAttenuationFilter();
+		}
+	}
+
+	protected void SetAttenuationFilter()
+	{
+		if ( !m_DeferAttenuation.IsRunning() || m_Player.GetMasterAttenuation() != "FlashbangAttenuation" )
+		{
+			m_Player.SetMasterAttenuation("FlashbangAttenuation");
+		}
+	}
+	
+	protected void ResetAttenuationFilter()
+	{
+		m_Player.SetMasterAttenuation("");
+	}
+	
+	protected void StopSound()
+	{
+		if (m_FlashbangEffectSound)
+		{
+			m_FlashbangEffectSound.SoundStop();
+			SEffectManager.DestroyEffect(m_FlashbangEffectSound);
+		}
+	}
+	
+	protected void ClearVisual()
+	{
+		if (m_Requester)
+		{
+			m_Requester.Stop();
+		}
+	}
+	
+	protected void SetVisual(float val)
+	{
+		if (m_Requester && m_Requester.IsRequesterRunning())
+		{
+			m_Requester.SetFlashbangIntensity(val, m_DayTimeToggle);
+		}
+	}
+	
+	void Stop()
+	{
+		StopSound();
+	}
+	
+	void Update(float deltatime)
+	{
+		if ( !m_Initialized )
+		{
+			Error("" + this + " not initialized");
+		}
+		else if ( m_Visual )
+		{
+			float value;
+
+			if ( m_TimeActive <= m_BreakPoint )
+			{
+				value = m_AlphaMaxActual;
+				//Print("Flashbango | m_AlphaMaxActual: " + value);
+			}
+			else
+			{
+				value = Math.InverseLerp(m_HitDuration - m_BreakPoint, m_HitDuration, m_TimeActive);
+				value = Math.Clamp(value,0.0,1.0);
+				value = m_AlphaMaxActual - value * m_AlphaMaxActual;
+				//Print("Flashbango | tmp_value: " + value);
+			}
+			SetVisual(value);
+		}
+
+		m_TimeActive += deltatime;
+
+		if (m_TimeActive >= m_HitDuration - m_SoundStopTime)
+		{
+			StopSound();
+		}
+		
+		if (m_TimeActive >= m_HitDuration)
+		{
+			ResetAttenuationFilter();
+			delete this;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/FoodStage/FoodStage.c b/scripts/4_World/DayZ/Classes/FoodStage/FoodStage.c
new file mode 100644
index 0000000000000000000000000000000000000000..91b2ea790650458c8a67b10fdd4bf5667c784fdb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/FoodStage/FoodStage.c
@@ -0,0 +1,683 @@
+enum FoodStageType
+{
+	NONE		= 0,			//food stage not define
+	RAW			= 1,			//default
+	BAKED		= 2,
+	BOILED		= 3,
+	DRIED		= 4,
+	BURNED		= 5,
+	ROTTEN		= 6,
+	
+	COUNT						//for net sync purposes
+}
+
+// Used to make getting data more readable
+enum eCookingPropertyIndices
+{
+	MIN_TEMP 	= 0,
+	COOK_TIME 	= 1,
+	MAX_TEMP 	= 2
+}
+
+class FoodStage
+{
+	protected FoodStageType m_FoodStageTypeClientLast;
+	protected FoodStageType m_FoodStageType;
+	protected Edible_Base m_FoodItem;
+	
+	protected int m_SelectionIndex;				//visual properties
+	protected int m_TextureIndex;
+	protected int m_MaterialIndex;
+	
+	protected float m_CookingTime;
+	
+	// Lookup and search values
+	// STRINGs are mostly used for CONFIG searches
+	// INTs are mostly used for MAP searches
+	static const string VISUAL_PROPERTIES 			= 	"visual_properties";
+	static const string NUTRITION_PROPERTIES 		= 	"nutrition_properties";
+	static const string COOKING_PROPERTIES 			= 	"cooking_properties";
+	static const int 	VISUAL_PROPERTIES_HASH 		= 	VISUAL_PROPERTIES.Hash();
+	static const int 	NUTRITION_PROPERTIES_HASH 	= 	NUTRITION_PROPERTIES.Hash();
+	static const int 	COOKING_PROPERTIES_HASH 	= 	COOKING_PROPERTIES.Hash();
+	
+	// The following will be filled in constructor
+	private static int 	m_StageRawHash 		= 0;
+	private static int 	m_StageBakedHash 	= 0;
+	private static int 	m_StageBoiledHash 	= 0;
+	private static int 	m_StageDriedHash 	= 0;
+	private static int 	m_StageBurnedHash 	= 0;
+	private static int 	m_StageRottenHash 	= 0;
+	
+	// Cache food stage data for each Edible_Base
+	// Used to get information for specific Edible_Base
+	static ref map<int, ref map<int, ref map<int, ref array<float>>>> m_EdibleBasePropertiesMap;
+	// Used to store food stage transitions for every Edible_Base
+	static ref map<int, ref map<int, ref map<int, ref array<int>>>> m_EdibleBaseTransitionsMap;
+	// Used to store the Hashed key of all possible food transitions ( including modded ones )
+	static ref array<int> m_FoodStageTransitionKeys;
+	
+	//constructor
+	void FoodStage( Edible_Base food_item )
+	{
+		//default
+		m_FoodStageType = FoodStageType.RAW;
+		m_FoodItem = food_item;
+		
+		//reset cooking time
+		m_CookingTime = 0;
+		
+		m_FoodStageTypeClientLast = m_FoodStageType;
+		
+		// We fill all FoodStageHash values
+		if ( m_StageRawHash == 0 )
+			m_StageRawHash		= "Raw".Hash();
+		if ( m_StageBakedHash == 0 )
+			m_StageBakedHash	= "Baked".Hash();
+		if ( m_StageBoiledHash == 0 )
+			m_StageBoiledHash	= "Boiled".Hash();
+		if ( m_StageDriedHash == 0 )
+			m_StageDriedHash	= "Dried".Hash();
+		if ( m_StageBurnedHash == 0 )
+			m_StageBurnedHash	= "Burned".Hash();
+		if ( m_StageRottenHash == 0 )
+			m_StageRottenHash	= "Rotten".Hash();
+		
+		//get config data for all food stages
+		SetupFoodStageMapping();
+		
+		// Get all config data relative to food stage transitions
+		SetupFoodStageTransitionMapping();
+		
+		ChangeFoodStage( m_FoodStageType );
+	}
+	
+	void SetupFoodStageMapping()
+	{
+		// We ensure we have the map is setup before trying to fill it
+		if ( !m_EdibleBasePropertiesMap )
+			m_EdibleBasePropertiesMap = new map<int, ref map<int, ref map< int, ref array<float>>>>;
+		
+		string foodType = m_FoodItem.GetType();
+		int hashedFood = foodType.Hash();
+		
+		// We start to fill the map, we don't want duplicates of the same food type
+		if ( !m_EdibleBasePropertiesMap.Contains( hashedFood ) )
+		{
+			map<int, ref map<int, ref array<float>>>foodStagesMap = new map<int, ref map<int, ref array<float>>>;
+			
+			for ( int i = 1; i < FoodStageType.COUNT; ++i )
+			{
+				map<int, ref array<float>> stagePropertiesMap = new map<int, ref array<float>>;
+				
+				// Insert visual properties
+				array<float> visual_properties = new array<float>;
+				string path = string.Format("CfgVehicles %1 Food FoodStages %2 visual_properties", foodType, GetFoodStageName(i));
+				GetGame().ConfigGetFloatArray( path, visual_properties);
+				
+				stagePropertiesMap.Insert( VISUAL_PROPERTIES_HASH , visual_properties );
+				
+				// Insert nutrition properties
+				array<float> nutrition_properties = new array<float>;
+				path = string.Format("CfgVehicles %1 Food FoodStages %2 nutrition_properties", foodType, GetFoodStageName(i));
+				GetGame().ConfigGetFloatArray( path, nutrition_properties);
+				
+				stagePropertiesMap.Insert( NUTRITION_PROPERTIES_HASH, nutrition_properties );
+				
+				// Insert cooking properties
+				array<float> cooking_properties = new array<float>;
+				path = string.Format("CfgVehicles %1 Food FoodStages %2 cooking_properties", foodType, GetFoodStageName(i));
+				GetGame().ConfigGetFloatArray( path, cooking_properties);
+				
+				stagePropertiesMap.Insert( COOKING_PROPERTIES_HASH , cooking_properties );
+				
+				// Insert all properties for relevant food stage
+				foodStagesMap.Insert( GetFoodStageNameHash( i ), stagePropertiesMap );
+			}
+			
+			m_EdibleBasePropertiesMap.Insert( hashedFood, foodStagesMap );
+		}
+	}
+	
+	void SetupFoodStageTransitionMapping()
+	{
+		// We ensure we have only one map and that it does exist
+		if ( !m_EdibleBaseTransitionsMap )
+			m_EdibleBaseTransitionsMap = new map<int, ref map<int, ref map< int, ref array<int>>>>;
+		
+		// We ensure we have our key array setup
+		if ( !m_FoodStageTransitionKeys )
+			m_FoodStageTransitionKeys = new array<int>;
+		
+		string foodType = m_FoodItem.GetType();
+		int hashedFood = foodType.Hash();
+		
+		// We start to fill the map, we don't want duplicates of the same food type
+		if ( !m_EdibleBaseTransitionsMap.Contains( hashedFood ) )
+		{
+			map<int, ref map<int, ref array<int>>> foodStagesMap = new map<int, ref map<int, ref array<int>>>;
+			
+			for ( int i = 1; i < FoodStageType.COUNT; ++i )
+			{
+				map<int, ref array<int>> stageTransitionsMap = new map<int, ref array<int>>;
+				string config_path = string.Format("CfgVehicles %1 Food FoodStageTransitions %2", foodType, GetFoodStageName( i ) );
+				
+				for ( int j = 0; j < GetGame().ConfigGetChildrenCount( config_path ); ++j )
+				{
+					array<int> stageTransition = new array<int>;
+					string classCheck; // Used to get any existing transition class
+					GetGame().ConfigGetChildName( config_path, j, classCheck );
+					
+					string transition_path = string.Format("%1 %2", config_path, classCheck );
+					if ( GetGame().ConfigIsExisting( transition_path ) )
+					{
+						int transitionClassHash = classCheck.Hash();
+						stageTransition.Insert( GetGame().ConfigGetInt( string.Format("%1 transition_to", transition_path) ) );
+						stageTransition.Insert( GetGame().ConfigGetInt( string.Format("%1 cooking_method", transition_path) ) );
+						stageTransitionsMap.Insert( transitionClassHash, stageTransition);
+						
+						// We only want one entry per key
+						if ( m_FoodStageTransitionKeys.Find( transitionClassHash ) == -1 )
+						{
+							m_FoodStageTransitionKeys.Insert( transitionClassHash );
+						}
+					}
+				}
+				
+				foodStagesMap.Insert( GetFoodStageNameHash(i), stageTransitionsMap );
+			}
+			
+			m_EdibleBaseTransitionsMap.Insert( hashedFood, foodStagesMap );
+		}
+	}
+	
+	//Food Stage Type
+	FoodStageType GetFoodStageType()
+	{
+		return m_FoodStageType;
+	}
+	
+	void SetFoodStageType( FoodStageType food_stage_type )
+	{
+		m_FoodStageType = food_stage_type;
+	}
+	
+	//Selection index
+	int GetSelectionIndex()
+	{
+		return m_SelectionIndex;
+	}
+	void SetSelectionIndex( int index )
+	{
+		m_SelectionIndex = index;
+	}
+	
+	//Texture index
+	int GetTextureIndex()
+	{
+		return m_TextureIndex;
+	}
+	void SetTextureIndex( int index )
+	{
+		m_TextureIndex = index;
+	}
+	
+	//Material index
+	int GetMaterialIndex()
+	{
+		return m_MaterialIndex;
+	}
+	void SetMaterialIndex( int index )
+	{
+		m_MaterialIndex = index;
+	}
+		
+	//Food properties
+	protected static float GetNutritionPropertyFromIndex( int index, FoodStageType stage_type, FoodStage stage, string classname )
+	{
+		if ( stage )
+		{
+			stage_type = stage.m_FoodStageType;
+			classname = stage.GetFoodItem().GetType();
+		}
+		
+		string food_stage_name = GetFoodStageName( stage_type );
+		int hashedStageName = GetFoodStageNameHash( stage_type );
+
+		array<float> nutrition_properties;
+		
+		map<int, ref map<int, ref array<float>>>foodStagesMap;
+		map<int, ref array<float>> stagePropertiesMap;
+		
+		if( !m_EdibleBasePropertiesMap.Find(classname.Hash(), foodStagesMap))
+			return 0;
+		if( !foodStagesMap.Find(hashedStageName, stagePropertiesMap))
+			return 0;
+		if( !stagePropertiesMap.Find(NUTRITION_PROPERTIES_HASH, nutrition_properties))
+			return 0;
+
+		if ( nutrition_properties.Count() > 0 )
+		{
+			if ( index > (nutrition_properties.Count() - 1) )
+			{
+				return 0;
+			}
+			else
+			{
+				return nutrition_properties.Get( index );
+			}
+		}
+		//calculate nutrition properties from base stage and nutrition modifiers
+		else
+		{
+			// Will not attempt to optimize this as it is for a setup we do not support internally
+			//get modifiers class for nutrition values
+			string config_path = string.Format("CfgVehicles %1 Food nutrition_modifiers_class", classname);
+			
+			if ( GetGame().ConfigIsExisting( config_path ) )
+			{
+				string nutr_mod_class;
+				GetGame().ConfigGetText( config_path, nutr_mod_class );
+				
+				config_path = string.Format("CfgVehicles NutritionModifiers %1 base_stage", nutr_mod_class);
+				string nutr_base_stage;
+				GetGame().ConfigGetText( config_path, nutr_base_stage );
+				
+				//get nutrition values for food stage and modifiers 
+				config_path = string.Format("CfgVehicles %1 Food FoodStages %2 nutrition_properties", classname, nutr_base_stage);
+				array<float> base_nutr_properties = new array<float>;
+				GetGame().ConfigGetFloatArray( config_path, base_nutr_properties );
+				
+				config_path = string.Format("CfgVehicles NutritionModifiers %1 %2 nutrition_properties", nutr_mod_class, food_stage_name);
+				array<float> nutr_mod_properties = new array<float>;
+				GetGame().ConfigGetFloatArray( config_path, nutr_mod_properties );
+				
+				//base nutrition * food stage nutrition modifier
+				if ( base_nutr_properties.Count() > 0 && nutr_mod_properties.Count() > 0 )
+				{
+					return ( base_nutr_properties.Get( index ) * nutr_mod_properties.Get( index ) );
+				}
+			}
+		}
+		
+		return 0;
+	}
+	
+	static float GetFullnessIndex(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 0 , stage_type, stage, classname );
+	}
+	
+	static float GetEnergy(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 1 , stage_type, stage, classname );
+	}
+	
+	static float GetWater(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 2 , stage_type, stage, classname );
+	}
+	
+	static float GetNutritionalIndex(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 3 , stage_type , stage, classname);
+	}
+	
+	static float GetToxicity(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 4 , stage_type, stage, classname );
+	}
+	
+	static int GetAgents(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 5 , stage_type, stage, classname );
+	}
+	
+	static float GetDigestibility(FoodStage stage, int stage_type = -1, string classname = "")
+	{
+		return GetNutritionPropertyFromIndex( 6 , stage_type, stage, classname );
+	}
+	
+	//Food item
+	protected Edible_Base GetFoodItem()
+	{
+		return m_FoodItem;
+	}
+	
+	//Cooking time
+	float GetCookingTime()
+	{
+		return m_CookingTime;
+	}
+	void SetCookingTime( float time )
+	{
+		m_CookingTime = time;
+	}
+	
+	static float GetCookingPropertyFromIndex( int index, FoodStageType stage_type, FoodStage stage, string classname )
+	{ 
+		if ( stage )
+		{
+			stage_type = stage.m_FoodStageType;
+			classname = stage.GetFoodItem().GetType();
+		}
+		
+		string food_stage_name = GetFoodStageName( stage_type );
+		int hashedStageName = GetFoodStageNameHash( stage_type );
+
+		array<float> cooking_properties = new array<float>;
+		
+		map<int, ref map<int, ref array<float>>>foodStagesMap = new map<int, ref map<int, ref array<float>>>;
+		map<int, ref array<float>> stagePropertiesMap = new map<int, ref array<float>>;
+		
+		m_EdibleBasePropertiesMap.Find(classname.Hash(), foodStagesMap);
+		foodStagesMap.Find(hashedStageName, stagePropertiesMap);
+		
+		stagePropertiesMap.Find(COOKING_PROPERTIES_HASH, cooking_properties);
+		
+		if ( cooking_properties.Count() > 0 )
+		{
+			if ( index > (cooking_properties.Count() - 1) )
+			{
+				return -1;
+			}
+			else
+			{
+				return cooking_properties.Get( index );
+			}
+		}
+		return 0;
+	}
+	
+	static array<float> GetAllCookingPropertiesForStage( FoodStageType stage_type, FoodStage stage, string classname )
+	{
+		if ( stage )
+		{
+			stage_type = stage.m_FoodStageType;
+			classname = stage.GetFoodItem().GetType();
+		}
+		
+		string food_stage_name = GetFoodStageName( stage_type );
+		int hashedStageName = GetFoodStageNameHash( stage_type );
+
+		array<float> cooking_properties = new array<float>;
+		
+		map<int, ref map<int, ref array<float>>>foodStagesMap = new map<int, ref map<int, ref array<float>>>;
+		map<int, ref array<float>> stagePropertiesMap = new map<int, ref array<float>>;
+		
+		m_EdibleBasePropertiesMap.Find(classname.Hash(), foodStagesMap);
+		foodStagesMap.Find(hashedStageName, stagePropertiesMap);
+		
+		stagePropertiesMap.Find(COOKING_PROPERTIES_HASH, cooking_properties);
+		
+		if ( cooking_properties.Count() > 0 )
+		{
+			return cooking_properties;
+		}
+		return null;
+	}
+	
+	//********************************************/
+	//	FOOD STAGE CHANGE
+	//********************************************/
+	//Checks if food stage can be changed to another stage
+	bool CanChangeToNewStage( CookingMethodType cooking_method )
+	{
+		if ( GetNextFoodStageType( cooking_method ) == FoodStageType.NONE )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	//returns possible food stage type according to given cooking method
+	FoodStageType GetNextFoodStageType( CookingMethodType cooking_method )
+	{
+		array<int> food_transition = new array<int>;
+		
+		map<int, ref map<int, ref array<int>>> foodStagesMap = new map<int, ref map<int, ref array<int>>>;
+		map<int, ref array<int>> foodTransitionsMap = new map<int, ref array<int>>;
+		
+		m_EdibleBaseTransitionsMap.Find(GetFoodItem().GetType().Hash(), foodStagesMap);
+		foodStagesMap.Find( GetFoodStageNameHash( GetFoodStageType() ), foodTransitionsMap );
+		
+		// We go through the key array, checking every possible transition
+		for ( int i = 0; i < m_FoodStageTransitionKeys.Count(); ++i )
+		{
+			// We test if a given transition is setup on this item
+			foodTransitionsMap.Find(m_FoodStageTransitionKeys.Get( i ), food_transition);
+			if ( food_transition )
+			{
+				// We now check if the given transition class is relevant
+				if ( food_transition.Get( 1 ) == cooking_method )
+				{
+					return food_transition.Get( 0 );
+				}
+			}
+		}
+		
+		return FoodStageType.BURNED; //If the item cannot transition out of current state, burn it
+	}
+	
+	void ChangeFoodStage( FoodStageType new_stage_type )
+	{
+		map<int, ref map<int, ref array<float>>>foodStagesMap = new map<int, ref map<int, ref array<float>>>;
+		map<int, ref array<float>> stagePropertiesMap = new map<int, ref array<float>>;
+		
+		//merge stages
+		//food stage type
+		SetFoodStageType( new_stage_type );
+		
+		array<float> visual_properties = new array<float>;
+		
+		m_EdibleBasePropertiesMap.Find( GetFoodItem().GetType().Hash(), foodStagesMap );
+		foodStagesMap.Find( GetFoodStageNameHash( GetFoodStageType() ), stagePropertiesMap );
+		stagePropertiesMap.Find( VISUAL_PROPERTIES_HASH, visual_properties );
+		
+		if ( visual_properties.Count() > 0 )
+		{
+			//selection index
+			int index = visual_properties.Get( 0 );
+			if ( index >= 0 )
+			{
+				SetSelectionIndex( index );
+			}
+			//texture index
+			index = visual_properties.Get( 1 );
+			if ( index >= 0 )
+			{
+				SetTextureIndex( index );
+			}
+			//material index
+			index = visual_properties.Get( 2 );
+			if ( index >= 0 )
+			{
+				SetMaterialIndex( index );
+			}	
+		}
+		
+		//refresh visual
+		GetFoodItem().Synchronize();
+	}	
+
+	void UpdateVisuals()
+	{
+		//if item has food stages
+		if ( GetFoodItem().HasFoodStage() ) 
+		{
+			Edible_Base food_item = GetFoodItem();
+			
+			array<string> config_selections	= food_item.GetHiddenSelections();
+			array<string> config_textures	= food_item.GetHiddenSelectionsTextures();
+			array<string> config_materials	= food_item.GetHiddenSelectionsMaterials();
+			
+			//selection index
+			int selection_index;
+			if ( GetSelectionIndex() >= 0 && config_selections.Count() > GetSelectionIndex() )
+			{
+				selection_index = GetSelectionIndex();
+			}
+			
+			//texture index
+			int texture_index;
+			if ( GetTextureIndex() >= 0 && config_textures.Count() > GetTextureIndex() )
+			{
+				texture_index = GetTextureIndex();
+			}
+	
+			//material index
+			int material_index;
+			if ( GetMaterialIndex() >= 0 && config_materials.Count() > GetMaterialIndex() )
+			{
+				material_index = GetMaterialIndex();
+			}
+				
+			//hide all selection except the configured one
+			for ( int i = 0; i < config_selections.Count(); i++ )
+			{
+				if ( config_selections.Get( i ) != config_selections.Get( selection_index ) )
+				{
+					food_item.SetAnimationPhase( config_selections.Get( i ), 1 );
+				}
+			}
+	
+			//Debug	
+			//Print( "item = " + food_item.GetType() + " selection index = " + GetSelectionIndex().ToString() + " texture index = " + GetTextureIndex().ToString() );
+		
+			//show selection
+			food_item.SetAnimationPhase( config_selections.Get( selection_index ), 0 );
+			//set texture
+			food_item.SetObjectTexture( selection_index, config_textures.Get( texture_index ) );
+			//set materials
+			food_item.SetObjectMaterial( selection_index, config_materials.Get( material_index ) );
+		}
+				
+		m_FoodStageTypeClientLast = m_FoodStageType;
+	}
+
+	//Food States
+	//check food stages
+	bool IsFoodInStage( FoodStageType food_stage_type )
+	{
+		if ( GetFoodStageType() == food_stage_type )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool IsFoodRaw()
+	{
+		return IsFoodInStage( FoodStageType.RAW );
+	}
+	
+	bool IsFoodBaked()
+	{
+		return IsFoodInStage( FoodStageType.BAKED );
+	}
+	
+	bool IsFoodBoiled()
+	{
+		return IsFoodInStage( FoodStageType.BOILED );
+	}
+	
+	bool IsFoodDried()
+	{
+		return IsFoodInStage( FoodStageType.DRIED );
+	}
+	
+	bool IsFoodBurned()
+	{
+		return IsFoodInStage( FoodStageType.BURNED );
+	}
+
+	bool IsFoodRotten()
+	{
+		return IsFoodInStage( FoodStageType.ROTTEN );
+	}
+			
+	//get name of food stage type
+	static string GetFoodStageName( FoodStageType food_stage_type )
+	{
+		switch ( food_stage_type )
+		{
+			case FoodStageType.RAW: 	return "Raw";
+			case FoodStageType.BAKED: 	return "Baked";
+			case FoodStageType.BOILED: 	return "Boiled";
+			case FoodStageType.DRIED: 	return "Dried";
+			case FoodStageType.BURNED: 	return "Burned";
+			case FoodStageType.ROTTEN: 	return "Rotten";
+		}
+		
+		return "Raw";
+	}
+	
+	// Get hashed name of food stage type for quicker access
+	static int GetFoodStageNameHash( FoodStageType food_stage_type )
+	{
+		switch ( food_stage_type )
+		{
+			case FoodStageType.RAW:		return m_StageRawHash;
+			case FoodStageType.BAKED:	return m_StageBakedHash;
+			case FoodStageType.BOILED:	return m_StageBoiledHash;
+			case FoodStageType.DRIED:	return m_StageDriedHash;
+			case FoodStageType.BURNED:	return m_StageBurnedHash;
+			case FoodStageType.ROTTEN:	return m_StageRottenHash;
+		}
+		
+		return m_StageRawHash;
+	}
+	
+	//================================================================
+	// SERIALIZATION
+	//================================================================	
+	void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		//Food stage type 
+		ctx.Write( m_FoodStageType );
+		
+		//Selection index
+		ctx.Write( m_SelectionIndex );
+
+		//Texture index
+		ctx.Write( m_TextureIndex );
+
+		//Material index
+		ctx.Write( m_MaterialIndex );
+	}
+	
+	bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		//Food stage type 
+		if ( !ctx.Read( m_FoodStageType ) )
+		{
+			m_FoodStageType = FoodStageType.RAW;	//set default
+			return false;
+		}
+		
+		//Selection index
+		if ( !ctx.Read( m_SelectionIndex ) )
+		{
+			m_SelectionIndex = 0;			//set default
+			return false;
+		}
+		
+		//Texture index
+		if ( !ctx.Read( m_TextureIndex ) )
+		{
+			m_TextureIndex = 0;				//set default
+			return false;
+		}
+		
+		//Material index
+		if ( !ctx.Read( m_MaterialIndex ) )
+		{
+			m_MaterialIndex = 0;			//set default			
+			return false;
+		}
+		
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/HeatComfortAnimHandler.c b/scripts/4_World/DayZ/Classes/HeatComfortAnimHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..f65c58f262009881dbf982ef185538e6e0e98aed
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HeatComfortAnimHandler.c
@@ -0,0 +1,106 @@
+class HeatComfortAnimHandler
+{
+	const float TICK_INTERVAL  = 2;
+	float m_TimeSinceLastTick;
+	float m_ProcessTimeAccuFreeze;
+	float m_ProcessTimeAccuHot;
+	
+	PlayerBase m_Player;
+	float m_EventTimeFreeze = -1;
+	float m_EventTimeHot = -1;
+	protected ref HumanMovementState m_MovementState = new HumanMovementState();
+	
+	const float TIME_INTERVAL_HC_MINUS_LOW_MIN = 5; const float TIME_INTERVAL_HC_MINUS_LOW_MAX = 12;
+	const float TIME_INTERVAL_HC_MINUS_HIGH_MIN = 15; const float TIME_INTERVAL_HC_MINUS_HIGH_MAX = 25;
+	
+	const float TIME_INTERVAL_HC_PLUS_LOW_MIN = 5; const float TIME_INTERVAL_HC_PLUS_LOW_MAX = 12;
+	const float TIME_INTERVAL_HC_PLUS_HIGH_MIN = 15; const float TIME_INTERVAL_HC_PLUS_HIGH_MAX = 25;
+	
+	void HeatComfortAnimHandler(PlayerBase player)
+	{
+		m_Player = player;
+	}
+
+	void Update(float delta_time, HumanMovementState hms)
+	{
+		m_TimeSinceLastTick += delta_time;
+
+		if( m_TimeSinceLastTick > TICK_INTERVAL )
+		{
+			Process(m_TimeSinceLastTick);
+			m_TimeSinceLastTick = 0;
+		}
+	}
+	
+	float GetEventTime(float hc_value ,float threshold_low, float threshold_high, float low_min, float high_min, float low_max, float high_max)
+	{
+		float inv_value = Math.InverseLerp(threshold_low, threshold_high, hc_value);
+		float value_min = Math.Lerp(low_min, high_min,inv_value);
+		float value_max = Math.Lerp(low_max,high_max,inv_value);
+
+		return Math.RandomFloatInclusive(value_min,value_max);
+	}
+	
+	
+	void Process(float delta_time)
+	{
+		if( GetGame().IsServer() )
+		{
+			
+			float hc = m_Player.GetStatHeatComfort().Get();
+			float inv_value;
+			float value_min;
+			float value_max;
+			float offset_time;
+			
+			if ( hc <= PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING )
+			{
+				m_ProcessTimeAccuFreeze++;
+				
+				if(m_EventTimeFreeze < 0)//if not set
+				{
+					m_EventTimeFreeze = GetEventTime(hc, PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_EMPTY,PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING, TIME_INTERVAL_HC_MINUS_LOW_MIN, TIME_INTERVAL_HC_MINUS_HIGH_MIN, TIME_INTERVAL_HC_MINUS_LOW_MAX, TIME_INTERVAL_HC_MINUS_HIGH_MAX);
+				}
+				
+				if( m_ProcessTimeAccuFreeze > m_EventTimeFreeze )
+				{
+					m_ProcessTimeAccuFreeze = 0;
+					m_EventTimeFreeze = -1;
+					m_Player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_FREEZE);
+					/*
+					Print("-----======== freezing ========-------");
+					Print(inv_value);
+					Print(value_min);
+					Print(value_max);
+					Print(offset_time);
+					Print("-----======== freezing ========-------");
+					*/
+				}	
+			}
+			else if ( hc >= PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_WARNING )
+			{
+				m_ProcessTimeAccuHot++;
+				
+				if(m_EventTimeHot < 0)//if not set
+				{
+					m_EventTimeHot = GetEventTime(hc, PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_EMPTY,PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_WARNING, TIME_INTERVAL_HC_PLUS_LOW_MIN, TIME_INTERVAL_HC_PLUS_LOW_MIN, TIME_INTERVAL_HC_PLUS_LOW_MAX, TIME_INTERVAL_HC_PLUS_HIGH_MAX);
+				}
+				
+				if( m_ProcessTimeAccuHot > m_EventTimeHot )
+				{
+					m_ProcessTimeAccuHot = 0;
+					m_EventTimeHot = -1;
+					m_Player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_HOT);
+					
+					//Print("-----======== freezing ========-------");
+					//Print(inv_value);
+					//Print(value_min);
+					//Print(value_max);
+					//Print(offset_time);
+					//Print("-----======== freezing ========-------");
+					
+				}	
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionArrow.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionArrow.c
new file mode 100644
index 0000000000000000000000000000000000000000..57046c795573e79c7cc3fe9e02dd34a2bb27c859
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionArrow.c
@@ -0,0 +1,31 @@
+
+class HitDirectionEffectArrow extends HitDirectionEffectBase
+{
+	override HitDirectionImagesBase GetImageData()
+	{
+		typename type = HitDirectionImagesArrow;
+		HitDirectionImagesArrow data = HitDirectionImagesArrow.Cast(type.Spawn());
+		return data;
+	}
+	
+	override void FinalizePositionCalculation()
+	{
+		//blobs move around the edges, the rest on elypsis
+		float distance_x = (m_DistanceAdjust * m_SizeXEnf) + (m_SizeXEnf / 2.5);
+		float distance_y = (m_DistanceAdjust * m_SizeYEnf) + (m_SizeYEnf / 2.5);
+		m_PosX = Math.Sin(m_AngleRad) * distance_x;
+		m_PosY = -Math.Cos(m_AngleRad) * distance_y;
+	}
+	
+	override void SetIndicatorRotation(float timeslice = -1.0)
+	{
+		if (m_RotationOverride == HitDirectionConstants.ROTATION_DEFAULT)
+		{
+			m_LayoutRoot.SetRotation(0,0,Math.RAD2DEG * m_AngleRad,true);
+		}
+		else
+		{
+			m_LayoutRoot.SetRotation(0,0,m_RotationOverride,true);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionBase.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..37761e3c8c4d25cbed5e2fcdf874f965176312d0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionBase.c
@@ -0,0 +1,230 @@
+
+
+class HitDirectionEffectBase
+{
+	const float DURATION_COEF_MIN = 0.6;
+	const float INTENSITY_MIN = 0.6;
+	
+	float m_HitDirection;
+	float m_Duration;
+	float m_BreakPoint;
+	float m_TimeActive;
+	float m_IntensityMax;
+	
+	Widget m_LayoutRoot;
+	Widget m_Image;
+	
+	DayZPlayer m_Player;
+	
+	bool m_Initialized;
+	int m_SizeXEnf;
+	int m_SizeYEnf;
+	float m_PosX;
+	float m_PosY;
+	float m_PosXScreenEdge;
+	float m_PosYScreenEdge;
+	float m_AngleRad;
+	float m_AngleRadPrev;
+	float m_SmoothVel[1];
+	
+	ref HitDirectionImagesBase m_ImageData;
+	
+	void HitDirectionEffectBase()
+	{
+		m_Initialized = false;
+		m_PosX = 0.0;
+		m_PosY = 0.0;
+		m_AngleRad = 0.0;
+		m_SmoothVel[0] = 0.0;
+		
+		m_ImageData = GetImageData();
+		m_ImageData.GetCurrentImageData(m_LayoutRoot,m_Image);
+	}
+	
+	//! Called manually after object spawn
+	void Init(DayZPlayer player, float hit_direction, float intensity_max)
+	{
+		m_Player = player;
+		float duration_coef = Math.Clamp(intensity_max,DURATION_COEF_MIN,1);
+		m_IntensityMax = Math.Clamp(intensity_max,INTENSITY_MIN,1);
+		m_Duration = m_DurationMax * duration_coef;
+		m_BreakPoint = Math.Clamp(m_BreakPointBase * m_Duration,0,m_Duration);
+		m_Scatter = Math.Clamp(m_Scatter,0.0,180.0);
+		m_HitDirection = hit_direction + (Math.RandomFloatInclusive(0,m_Scatter) * Math.Pow(-1.0,Math.RandomIntInclusive(0,1)));
+		
+		Widget w = m_LayoutRoot;
+		w = w.GetChildren();
+		while (w)
+		{
+			w.Show(m_Image == w);
+			w = w.GetSibling();
+		}
+		
+		m_Image.SetColor(m_Color);
+		
+		m_LayoutRoot.Show(true);
+		
+		CalculateArrowPosition();
+		SetIndicatorRotation();
+		SetIndicatorPositon();
+		m_Initialized = true;
+	}
+	
+	HitDirectionImagesBase GetImageData(){}
+	
+	void ~HitDirectionEffectBase()
+	{
+		m_LayoutRoot.Show(false);
+		delete m_LayoutRoot;
+	}
+	
+	bool DurationCheck()
+	{
+		if ( m_TimeActive >= m_Duration )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	void Update( float timeslice )
+	{
+		float intensity;
+		
+		if ( m_TimeActive <= m_BreakPoint )
+		{
+			intensity = m_IntensityMax;
+		}
+		else
+		{
+			float tmp_value = Math.InverseLerp(m_BreakPoint, m_Duration, m_TimeActive);
+			intensity = Math.Lerp(m_IntensityMax,0.0,tmp_value);
+		}
+		
+		m_TimeActive += timeslice;
+		intensity = Math.Clamp(intensity,0,1);
+		
+		if ( m_TimeActive >= m_Duration )
+		{
+			m_LayoutRoot.Show(false);
+		}
+		else
+		{
+			m_LayoutRoot.SetAlpha(intensity);
+			if ( m_Mode == HitDirectionModes.DYNAMIC )
+			{
+				CalculateArrowPosition(timeslice);
+				SetIndicatorPositon(timeslice);
+				SetIndicatorRotation(timeslice);
+			}
+		}
+	}
+	
+	void CalculateArrowPosition(float timeslice = -1.0)
+	{
+		m_HitDirection = Math.NormalizeAngle(m_HitDirection);
+		
+		float angle_direction = m_Player.GetOrientation()[0];
+		angle_direction = Math.NormalizeAngle(angle_direction);
+		float camera_angle = GetGame().GetCurrentCameraDirection().VectorToAngles()[0];
+		camera_angle = Math.NormalizeAngle(camera_angle);
+		
+		float angle_camera_diff = angle_direction - camera_angle;
+		m_AngleRad = m_HitDirection + angle_camera_diff;
+		m_AngleRad = Math.NormalizeAngle(m_AngleRad);
+		m_AngleRad = m_AngleRad * Math.DEG2RAD;
+		
+		m_PosX = 0.0;
+		m_PosY = 0.0;
+		
+		GetScreenSize(m_SizeXEnf,m_SizeYEnf);
+		
+		if ( m_Initialized && timeslice != -1.0 )
+		{
+			float val = m_AngleRadPrev - m_AngleRad + Math.PI;
+			val = Math.ModFloat(val, Math.PI2);
+			val -= Math.PI;
+			m_AngleRad = m_AngleRadPrev - Math.SmoothCD(0, val, m_SmoothVel, 0.1, 1000, timeslice);
+		}
+		m_AngleRadPrev = m_AngleRad;
+		
+		m_PosXScreenEdge = Math.Clamp(Math.Sin(m_AngleRad)/Math.Sin(Math.PI/4),-1,1) * ( m_SizeXEnf/2 + m_DistanceAdjust * m_SizeXEnf);
+		m_PosYScreenEdge = Math.Clamp(-1 * Math.Cos(m_AngleRad)/Math.Cos(Math.PI/4),-1,1) * ( m_SizeYEnf/2 + m_DistanceAdjust * m_SizeYEnf);
+		
+		FinalizePositionCalculation();
+	}
+	
+	//! specific handling on individual indicator type
+	void FinalizePositionCalculation(){}
+	void SetIndicatorRotation(float timeslice = -1.0){}
+	
+	void SetIndicatorPositon(float timeslice = -1.0)
+	{
+		m_LayoutRoot.SetPos(m_PosX,m_PosY,true);
+	}
+	
+	//-----------------------------------------------------------------------
+	//Static stuff below
+	//-----------------------------------------------------------------------
+	static bool m_ServerOverrideEnabled;
+	static int m_Mode;
+	static int m_ID;
+	static int m_Color;
+	static protected typename m_Type;
+	static float m_DurationMax;
+	static float m_BreakPointBase; //! range 0..1, a point where the fading starts
+	static float m_DistanceAdjust;
+	static int m_RotationOverride;
+	static float m_Scatter; //! range 0..180, randomized offset of direction to make it less acurate
+	
+	//!sets override values, or defaults
+	static void CheckValues()
+	{
+		m_ServerOverrideEnabled = CfgGameplayHandler.GetHitIndicationOverrideEnabled();
+		if (m_ServerOverrideEnabled)
+		{
+			m_Mode = CfgGameplayHandler.GetHitIndicationMode();
+			m_ID = CfgGameplayHandler.GetHitIndicationTypeID();
+			m_Color = CfgGameplayHandler.GetHitIndicationIndicatorColor();
+			m_DurationMax = CfgGameplayHandler.GetHitIndicationMaxDuration();
+			m_BreakPointBase = CfgGameplayHandler.GetHitIndicationBreakPoint();
+			m_Scatter = CfgGameplayHandler.GetHitIndicationScatter();
+		}
+		else
+		{
+			m_Mode = HitDirectionModes.STATIC;
+			m_ID = HitIndicatorType.SPLASH;
+			m_Color = HitDirectionConstants.COLOR_DEFAULT;
+			m_DurationMax = HitDirectionConstants.DURATION_BASE;
+			m_BreakPointBase = HitDirectionConstants.BREAKPOINT_BASE;
+			m_Scatter = HitDirectionConstants.SCATTER;
+		}
+		m_DistanceAdjust = HitDirectionConstants.DISTANCE_ADJUST;
+		m_RotationOverride = HitDirectionConstants.ROTATION_DEFAULT;
+	}
+	
+	static typename GetCurrentType()
+	{
+		switch (m_ID)
+		{
+			case HitIndicatorType.SPLASH:
+				m_Type = HitDirectionEffectSplash;
+			break;
+			
+			case HitIndicatorType.SPIKE:
+				m_Type = HitDirectionEffectSpike;
+			break;
+			
+			case HitIndicatorType.ARROW:
+				m_Type = HitDirectionEffectArrow;
+			break;
+			
+			default:
+				ErrorEx("Unknown HitDirection mode, using HitIndicatorType.SPLASH",ErrorExSeverity.INFO);
+				m_Type = HitDirectionEffectSplash;
+			break;
+		}
+		
+		return m_Type;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesArrow.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesArrow.c
new file mode 100644
index 0000000000000000000000000000000000000000..d96dbd071e92d6c27b53e68bcb4c2752617f4dc7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesArrow.c
@@ -0,0 +1,35 @@
+
+class HitDirectionImagesArrow_Static
+{
+	static ref array<string> 	m_ImagePathsLayouts;
+	static ref array<string> 	m_ImagePathsImages;
+	
+	static void InitArrays()
+	{
+		if ( !m_ImagePathsLayouts && !m_ImagePathsImages )
+		{
+			m_ImagePathsLayouts = new array<string>;
+			m_ImagePathsImages = new array<string>;
+		}
+	}
+}
+
+class HitDirectionImagesArrow extends HitDirectionImagesBase
+{
+	override protected void PerformRegisterImages()
+	{
+		HitDirectionImagesArrow_Static.InitArrays();
+		
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Arrow_0");
+	}
+	
+	override protected ref array<string> GetTypeLayoutPathArray()
+	{
+		return HitDirectionImagesArrow_Static.m_ImagePathsLayouts;
+	}
+	
+	override protected ref array<string> GetTypeImagePathArray()
+	{
+		return HitDirectionImagesArrow_Static.m_ImagePathsImages;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesBase.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..13a5a6ab5e5f822424f48e01e5a23e6df8394e2a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesBase.c
@@ -0,0 +1,45 @@
+
+class HitDirectionImagesBase
+{
+	int 						m_ImageIndex;
+	
+	void HitDirectionImagesBase()
+	{
+		if ( (!GetTypeLayoutPathArray() && !GetTypeImagePathArray()) )
+		{
+			PerformRegisterImages();
+		}
+		
+		RandomizeImageIdx();
+	}
+	
+	protected void PerformRegisterImages()
+	{
+		/*
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Splash_1");
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Splash_2");
+		...
+		*/
+	}
+	
+	protected void RegisterImage(string layout_path, string image_name)
+	{
+		GetTypeLayoutPathArray().Insert(layout_path);
+		GetTypeImagePathArray().Insert(image_name);
+	}
+	
+	protected void RandomizeImageIdx()
+	{
+		m_ImageIndex = Math.RandomIntInclusive(0,GetTypeImagePathArray().Count() - 1);
+	}
+	
+	protected array<string> GetTypeLayoutPathArray(){}
+	protected array<string> GetTypeImagePathArray(){}
+	
+	//! Layout should be sufficient for generic manipulation of the hit image
+	void GetCurrentImageData(out Widget layout, out Widget image)
+	{
+		layout = GetGame().GetWorkspace().CreateWidgets(GetTypeLayoutPathArray()[m_ImageIndex]);
+		image = layout.FindAnyWidget(GetTypeImagePathArray()[m_ImageIndex]);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesSpike.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesSpike.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2606f66d902623d6787767913a24907ae62de61
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesSpike.c
@@ -0,0 +1,35 @@
+
+class HitDirectionImagesSpike_Static
+{
+	static ref array<string> 	m_ImagePathsLayouts;
+	static ref array<string> 	m_ImagePathsImages;
+	
+	static void InitArrays()
+	{
+		if ( !m_ImagePathsLayouts && !m_ImagePathsImages )
+		{
+			m_ImagePathsLayouts = new array<string>;
+			m_ImagePathsImages = new array<string>;
+		}
+	}
+}
+
+class HitDirectionImagesSpike extends HitDirectionImagesBase
+{
+	override protected void PerformRegisterImages()
+	{
+		HitDirectionImagesSpike_Static.InitArrays();
+		
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Spike_0");
+	}
+	
+	override protected ref array<string> GetTypeLayoutPathArray()
+	{
+		return HitDirectionImagesSpike_Static.m_ImagePathsLayouts;
+	}
+	
+	override protected ref array<string> GetTypeImagePathArray()
+	{
+		return HitDirectionImagesSpike_Static.m_ImagePathsImages;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesSplash.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesSplash.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c5508dfc14ac187a5b5a50d3682e6a810baaf74
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionImages/HitDirectionImagesSplash.c
@@ -0,0 +1,37 @@
+
+class HitDirectionImagesSplash_Static
+{
+	static ref array<string> 	m_ImagePathsLayouts;
+	static ref array<string> 	m_ImagePathsImages;
+	
+	static void InitArrays()
+	{
+		if ( !m_ImagePathsLayouts && !m_ImagePathsImages )
+		{
+			m_ImagePathsLayouts = new array<string>;
+			m_ImagePathsImages = new array<string>;
+		}
+	}
+}
+
+class HitDirectionImagesSplash extends HitDirectionImagesBase
+{
+	override protected void PerformRegisterImages()
+	{
+		HitDirectionImagesSplash_Static.InitArrays();
+		
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Splash_0");
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Splash_1");
+		RegisterImage("gui/layouts/gameplay/HitDirectionIndication.layout","Single_indicator_Splash_2");
+	}
+	
+	override protected ref array<string> GetTypeLayoutPathArray()
+	{
+		return HitDirectionImagesSplash_Static.m_ImagePathsLayouts;
+	}
+	
+	override protected ref array<string> GetTypeImagePathArray()
+	{
+		return HitDirectionImagesSplash_Static.m_ImagePathsImages;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionSpike.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionSpike.c
new file mode 100644
index 0000000000000000000000000000000000000000..df35ee4a5cdef5f3f1629ba1313e3410a80e13c4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionSpike.c
@@ -0,0 +1,31 @@
+
+class HitDirectionEffectSpike extends HitDirectionEffectBase
+{
+	override HitDirectionImagesBase GetImageData()
+	{
+		typename type = HitDirectionImagesSpike;
+		HitDirectionImagesSpike data = HitDirectionImagesSpike.Cast(type.Spawn());
+		return data;
+	}
+	
+	override void FinalizePositionCalculation()
+	{
+		//blobs move around the edges, the rest on elypsis
+		float distance_x = (m_DistanceAdjust * m_SizeXEnf) + (m_SizeXEnf / 2.5);
+		float distance_y = (m_DistanceAdjust * m_SizeYEnf) + (m_SizeYEnf / 2.5);
+		m_PosX = Math.Sin(m_AngleRad) * distance_x;
+		m_PosY = -Math.Cos(m_AngleRad) * distance_y;
+	}
+	
+	override void SetIndicatorRotation(float timeslice = -1.0)
+	{
+		if (m_RotationOverride == HitDirectionConstants.ROTATION_DEFAULT)
+		{
+			m_LayoutRoot.SetRotation(0,0,Math.RAD2DEG * m_AngleRad,true);
+		}
+		else
+		{
+			m_LayoutRoot.SetRotation(0,0,m_RotationOverride,true);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionSplash.c b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionSplash.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ef3b51f18fe442f60b2a9822831c6e3c38a84b4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/HitIndication/HitDirectionSplash.c
@@ -0,0 +1,32 @@
+
+class HitDirectionEffectSplash extends HitDirectionEffectBase
+{
+	override HitDirectionImagesBase GetImageData()
+	{
+		typename type = HitDirectionImagesSplash;
+		HitDirectionImagesSplash data = HitDirectionImagesSplash.Cast(type.Spawn());
+		return data;
+	}
+	
+	override void FinalizePositionCalculation()
+	{
+		//blobs move around the edges, the rest on elypsis
+		m_PosX = m_PosXScreenEdge;
+		m_PosY = m_PosYScreenEdge;
+	}
+	
+	override void SetIndicatorRotation(float timeslice = -1.0)
+	{
+		if ( timeslice == -1.0) //does not rotate on dynamic mode update
+		{
+			if (m_RotationOverride == HitDirectionConstants.ROTATION_DEFAULT)
+			{
+				m_LayoutRoot.SetRotation(0,0,Math.RandomIntInclusive(0,359),true);
+			}
+			else
+			{
+				m_LayoutRoot.SetRotation(0,0,m_RotationOverride,true);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Hologram.c b/scripts/4_World/DayZ/Classes/Hologram.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb905ab271fa407c54e67e1e2a7c216634e7a80f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Hologram.c
@@ -0,0 +1,1612 @@
+class Hologram
+{
+	#ifdef SERVER
+	protected const int SPAWN_FLAGS 	= ECE_CREATEPHYSICS;
+	#else
+	protected const int SPAWN_FLAGS 	= ECE_LOCAL;
+	#endif
+	
+	
+	#ifdef DIAG_DEVELOPER
+	string m_CollisionDetails;
+	#endif
+	
+	protected const string SUFFIX_MATERIAL_DEPLOYABLE 	= "_deployable.rvmat";
+	protected const string SUFFIX_MATERIAL_UNDEPLOYABLE = "_undeployable.rvmat";
+	protected const string SUFFIX_MATERIAL_POWERED 		= "_powered.rvmat";
+
+	protected ItemBase 			m_Parent;
+	protected EntityAI 			m_Projection;
+	protected PlayerBase 		m_Player;
+	protected ProjectionTrigger m_ProjectionTrigger;
+	protected string			m_ProjectionTypename;
+
+	protected bool 				m_IsColliding;
+	protected bool 				m_IsCollidingGPlot;
+	protected bool 				m_IsSlope;
+	protected bool 				m_IsCollidingPlayer;
+	protected bool 				m_IsFloating;
+	protected bool 				m_UpdatePosition;
+	protected bool 				m_IsHidden;
+
+	protected vector 			m_DefaultOrientation;
+	protected vector			m_Rotation;
+	protected vector			m_y_p_r_previous;
+	protected vector 			m_ContactDir;
+	protected vector 			m_FromAdjusted;
+	protected const string 		ANIMATION_PLACING 				= "Placing";
+	protected const string 		ANIMATION_INVENTORY 			= "Inventory";
+	protected const string 		SELECTION_PLACING 				= "placing";
+	protected const string 		SELECTION_INVENTORY 			= "inventory";
+
+	protected const float 		SMALL_PROJECTION_RADIUS 		= 1;
+	protected const float 		SMALL_PROJECTION_GROUND 		= 2;
+	protected const float		DISTANCE_SMALL_PROJECTION		= 1; //! Deprecated
+	protected const float		LARGE_PROJECTION_DISTANCE_LIMIT	= 6;
+	protected const float 		PROJECTION_TRANSITION_MIN		= 1;
+	protected const float 		PROJECTION_TRANSITION_MAX		= 0.25;
+	protected const float 		LOOKING_TO_SKY					= 0.75;
+	static const float 			DEFAULT_MAX_PLACEMENT_HEIGHT_DIFF = 1.5;
+	
+	protected float 			m_SlopeTolerance;
+	protected bool				m_AlignToTerrain;
+	protected vector 			m_YawPitchRollLimit;
+	protected int				m_ContactComponent;
+	
+	protected ref set<string> 	m_SelectionsToRefresh 			= new set<string>;
+	
+	// Watchtower correction variables	
+	// These watchtower component names should be corrected when colliding with them as they are supposed to be "trigger boxes", not colliders
+	static const protected ref array<string>	m_WatchtowerIgnoreComponentNames	= new array<string>;
+	
+	// These watchtower components are supposed to be trigger boxes, but should block placement on them (currently only the boxes above the stairs)
+	static const protected ref array<string>	m_WatchtowerBlockedComponentNames	= new array<string>;
+
+	void Hologram(PlayerBase player, vector pos, ItemBase item)
+	{	
+		m_Player 		= player;
+		m_Parent 		= item;
+		m_Projection 	= null;
+
+		m_ProjectionTrigger = null;
+		m_UpdatePosition 	= true;
+		m_ContactComponent 	= -1;
+
+		m_Rotation 		= "0 0 0";
+		m_FromAdjusted 	= "0 0 0";
+		
+		// If the static names are empty, generate the needed names
+		// Refer to their definitions to see why these are required
+		if (m_WatchtowerIgnoreComponentNames.Count() == 0)
+		{
+			string baseStringBegin 		= Watchtower.BASE_VIEW_NAME;
+			string baseIgnoreStringEnd 	= Watchtower.BASE_WALL_NAME;
+
+			int floors 	= Watchtower.MAX_WATCHTOWER_FLOORS;
+			int walls 	= Watchtower.MAX_WATCHTOWER_WALLS;
+
+			string compName;
+			for (int i = 1; i < floors + 1; ++i)
+			{
+				compName = baseStringBegin + i.ToString();
+				for (int j = 1; j < walls + 1; ++j)
+					m_WatchtowerIgnoreComponentNames.Insert(compName + baseIgnoreStringEnd + j.ToString());
+				
+				if (i != 1)
+					m_WatchtowerBlockedComponentNames.Insert(compName);
+				else
+					m_WatchtowerIgnoreComponentNames.Insert(compName);
+			}
+		}
+
+		string configPathProjectionTypename = string.Format("CfgVehicles %1 projectionTypename", m_Parent.GetType());
+		if (GetGame().ConfigIsExisting(configPathProjectionTypename))
+		{
+			m_ProjectionTypename = GetGame().ConfigGetTextOut(configPathProjectionTypename);
+		}
+
+		EntityAI projectionEntity;
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+		{	
+			projectionEntity = EntityAI.Cast(GetGame().CreateObjectEx(ProjectionBasedOnParent(), pos, ECE_PLACE_ON_SURFACE));
+			projectionEntity.SetAllowDamage(false);
+			SetProjectionEntity(projectionEntity);
+			SetAnimations();
+		}
+		else
+		{
+			projectionEntity = EntityAI.Cast(GetGame().CreateObjectEx(ProjectionBasedOnParent(), pos, ECE_TRACE|ECE_LOCAL));
+			if (projectionEntity == null)
+			{
+				ErrorEx(string.Format("Cannot create hologram entity from config class %1", ProjectionBasedOnParent()), ErrorExSeverity.WARNING);
+				return;
+			}
+
+			SetProjectionEntity(projectionEntity);
+			SetAnimations();
+			CreateTrigger();
+			RefreshTrigger();
+		}
+		
+		if (ItemBase.Cast(projectionEntity))
+		{
+			ItemBase.Cast(GetProjectionEntity()).SetIsHologram(true);
+		}
+		
+		string configPathSlope = string.Format("CfgVehicles %1 slopeTolerance", GetProjectionEntity().GetType());
+		if (GetGame().ConfigIsExisting(configPathSlope))
+		{
+			m_SlopeTolerance = GetGame().ConfigGetFloat(configPathSlope);
+		}
+		
+		string configPathAlign = string.Format("CfgVehicles %1 alignHologramToTerain", GetProjectionEntity().GetType());
+		if (GetGame().ConfigIsExisting(configPathAlign))
+		{
+			m_AlignToTerrain = GetGame().ConfigGetInt(configPathAlign);
+		}
+		
+		string configPathOrientationLimit = string.Format("CfgVehicles %1 yawPitchRollLimit", GetProjectionEntity().GetType());
+		if (GetGame().ConfigIsExisting(configPathOrientationLimit))
+		{
+			m_YawPitchRollLimit = GetGame().ConfigGetVector(configPathOrientationLimit);
+		}
+	}
+	
+	void ~Hologram()
+	{
+		if (GetGame())
+		{
+			if (m_Projection)
+			{
+				GetGame().ObjectDelete(m_Projection);
+			}
+	
+			if (m_ProjectionTrigger)
+			{
+				GetGame().ObjectDelete(m_ProjectionTrigger);
+			}
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		DestroyDebugCollisionBox();
+		#endif
+	}
+	
+	void SetAnimations()
+	{
+		if ( m_Projection.HasAnimation( ANIMATION_PLACING ) )
+		{
+			m_Projection.SetAnimationPhase( ANIMATION_PLACING, 0 );
+			SetSelectionToRefresh( SELECTION_PLACING );
+
+			if ( m_Projection.HasAnimation( ANIMATION_INVENTORY ) )
+			{
+				m_Projection.SetAnimationPhase( ANIMATION_INVENTORY, 1 );
+			}
+		}
+		else
+		{
+			UpdateSelections();
+			SetSelectionToRefresh( SELECTION_INVENTORY );
+		}
+	}
+	
+	// Updates selections on hologram object so they reflect the state of the parent object's selections.
+	void UpdateSelections()
+	{
+		string cfg_access = "CfgVehicles " + m_Projection.GetType() + " AnimationSources ";
+		
+		if ( GetGame().ConfigIsExisting(cfg_access) )
+		{
+			int cfg_access_count = g_Game.ConfigGetChildrenCount(cfg_access);
+
+			for ( int i = 0; i < cfg_access_count; ++i )
+			{
+				string found_anim;
+				GetGame().ConfigGetChildName(cfg_access, i, found_anim);
+				
+				float anim_phase = m_Parent.GetAnimationPhase(found_anim);
+				m_Projection.SetAnimationPhase(found_anim, anim_phase);
+			}
+		}
+	}
+
+	string ProjectionBasedOnParent()
+	{
+		return GetProjectionName(m_Parent);
+	}
+	
+	string GetProjectionName(ItemBase item)
+	{
+		//! configuration override
+		if (m_ProjectionTypename != "")
+		{
+			return m_ProjectionTypename;
+		}
+
+		if (!item)
+		{
+			return "";
+		}
+		
+		if (item.CanMakeGardenplot())
+		{
+			return "GardenPlotPlacing";
+		}
+		
+		//Camping & Base building
+		if (item.IsInherited( TentBase ) || item.IsBasebuildingKit())
+		{
+			return item.GetType() + "Placing";
+		}
+		
+		return item.GetType();
+	}
+	
+	//! DEPRECATED
+	static bool DoesHaveProjection(ItemBase item)
+	{
+		return item && (item.IsDeployable() || item.CanMakeGardenplot() || item.IsInherited(DeployableContainer_Base));
+	}
+	
+	// update loop for visuals and collisions of the hologram
+	void UpdateHologram(float timeslice)
+	{
+		if (!m_Parent)
+		{
+			m_Player.TogglePlacingLocal();
+			
+			return;
+		}
+		
+		if (IsRestrictedFromAdvancedPlacing())
+		{
+			m_Player.TogglePlacingLocal();
+			
+			return;
+		}
+
+		if (!GetUpdatePosition())
+			return;
+		
+		
+		#ifdef DIAG_DEVELOPER
+		DebugConfigValues();
+		DestroyDebugCollisionBox();
+		#endif
+
+		// update hologram position	
+		SetProjectionPosition(GetProjectionEntityPosition(m_Player));
+		SetProjectionOrientation(AlignProjectionOnTerrain(timeslice));
+
+		EvaluateCollision();
+		RefreshTrigger();
+		CheckPowerSource();
+		RefreshVisual();
+
+		m_Projection.OnHologramBeingPlaced(m_Player);
+	}
+	
+	vector AlignProjectionOnTerrain( float timeslice )
+	{
+		vector y_p_r;
+		
+		if ( m_AlignToTerrain )
+		{
+			vector projection_orientation_angles = GetDefaultOrientation() + GetProjectionRotation();	
+			vector mat0[3];
+			vector mat1[3];
+			vector mat2[3];
+			vector projection_position = m_Projection.GetPosition();
+			vector normal;
+			
+			if ( m_ContactDir.Length() > 0 )
+			{
+				normal = m_ContactDir;
+			} 
+			else
+			{
+				normal = GetGame().SurfaceGetNormal( projection_position[0], projection_position[2] );
+			}
+			
+			vector angles = normal.VectorToAngles();
+			angles[1] = angles[1] + 270;
+					
+			angles[0] = Math.Clamp( angles[0], 0, 360 ); 
+			angles[1] = Math.Clamp( angles[1], 0, 360 );
+			angles[2] = Math.Clamp( angles[2], 0, 360 );
+				
+			projection_orientation_angles[0] = projection_orientation_angles[0] + ( 360 - angles[0] );
+			
+			Math3D.YawPitchRollMatrix( projection_orientation_angles, mat0 );
+			Math3D.YawPitchRollMatrix( angles, mat1 );
+			Math3D.MatrixMultiply3( mat1, mat0, mat2 );	
+			
+			y_p_r = Math3D.MatrixToAngles( mat2 );
+		}
+		else
+		{
+			y_p_r = GetDefaultOrientation() + GetProjectionRotation();
+			
+			if ( y_p_r[0] > 180 )
+			{
+				y_p_r[0] = y_p_r[0] - 360;
+			}
+			
+			if ( y_p_r[0] < -180 )
+			{
+				y_p_r[0] = y_p_r[0] + 360;
+			}
+		}	
+		
+		return SmoothProjectionMovement( y_p_r, timeslice );
+	}
+	
+	vector SmoothProjectionMovement( vector y_p_r, float timeslice )
+	{	
+		if ( m_y_p_r_previous )
+		{					
+			if ( Math.AbsFloat( y_p_r[0] - m_y_p_r_previous[0] ) > 100 )
+			{												
+				if ( y_p_r[0] > 0 )
+				{		
+					m_y_p_r_previous[0] = m_y_p_r_previous[0] + 360; 
+				}
+				
+				if ( y_p_r[0] < 0 )
+				{		
+					m_y_p_r_previous[0] = m_y_p_r_previous[0] - 360;
+				}
+			}
+			
+			y_p_r[0] = Math.Lerp( m_y_p_r_previous[0], y_p_r[0], 15 * timeslice );
+			y_p_r[1] = Math.Lerp( m_y_p_r_previous[1], y_p_r[1], 15 * timeslice );
+			y_p_r[2] = Math.Lerp( m_y_p_r_previous[2], y_p_r[2], 15 * timeslice );
+		}
+		
+		m_y_p_r_previous = y_p_r;
+		
+		return y_p_r;
+	}
+	
+	void CreateTrigger()
+	{
+		Class.CastTo(m_ProjectionTrigger, g_Game.CreateObjectEx("ProjectionTrigger", GetProjectionPosition(), SPAWN_FLAGS));
+
+		m_ProjectionTrigger.SetOrientation(GetProjectionOrientation());
+		m_ProjectionTrigger.SetParentObject(this);
+		m_ProjectionTrigger.SetParentOwner(m_Player);
+		
+		RefreshVisual();
+	}
+
+	void RefreshTrigger()
+	{
+		vector min_max[2];
+		GetProjectionCollisionBox( min_max );
+
+		m_ProjectionTrigger.SetPosition(GetProjectionPosition());
+		m_ProjectionTrigger.SetOrientation(GetProjectionOrientation());
+		m_ProjectionTrigger.SetExtents(min_max[0], min_max[1]);
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	void DebugText(string header, bool mustBeTrue = false, bool condition = true, string info = "")
+	{		
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			int color = 0xFFFFFFFF;
+			
+			if (mustBeTrue && !condition || !mustBeTrue && condition)
+				color = COLOR_RED;
+			
+			string text = header + condition + info;	
+			DbgUI.ColoredText(color, text);
+		}		
+	}
+	
+	protected float m_PitchOverride;
+	protected float m_RollOverride;
+	void DebugConfigValues()
+	{
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			m_PitchOverride = m_YawPitchRollLimit[1];
+			m_RollOverride = m_YawPitchRollLimit[2];
+			
+			DbgUI.InputFloat("slopeTolerance override", m_SlopeTolerance);
+			DbgUI.SameLine();
+			DbgUI.InputFloat("pitch limit override", m_PitchOverride);
+			DbgUI.SameLine();
+			DbgUI.InputFloat("roll limit override", m_RollOverride);
+			
+			m_YawPitchRollLimit[1] = m_PitchOverride;
+			m_YawPitchRollLimit[2] = m_RollOverride;
+		}
+	}
+	#endif
+
+	void EvaluateCollision(ItemBase action_item = null)
+	{
+		#ifdef DIAG_DEVELOPER
+		m_CollisionDetails = "";
+		#endif
+
+		if (!m_Player.CanPlaceItem(m_Projection))
+		{
+			#ifdef DIAG_DEVELOPER
+			m_CollisionDetails += "[Player]";
+			#endif
+			SetIsColliding(true);
+			
+		}
+		else if (IsFloating() || IsHidden() || IsCollidingBBox(action_item) || IsCollidingPlayer() || IsClippingRoof() || !IsBaseViable() || IsCollidingGPlot() || IsCollidingZeroPos() || IsCollidingAngle() || !IsPlacementPermitted() || !HeightPlacementCheck() || IsUnderwater() || IsInTerrain())
+		{
+			SetIsColliding(true);
+		}
+		else if ( m_Projection.IsInherited( TrapSpawnBase ))
+		{
+			#ifdef DIAG_DEVELOPER
+			DebugText("Inherits from TrapSpawnBase, checking IsPlaceableAtposition", true);
+			#endif
+
+			TrapSpawnBase trapSpawnBase;
+			Class.CastTo(trapSpawnBase, m_Projection);
+			SetIsColliding(!trapSpawnBase.IsPlaceableAtPosition(m_Projection.GetPosition()));
+		}
+		else if (m_Projection.IsInherited(TrapBase))
+		{
+			#ifdef DIAG_DEVELOPER
+			DebugText("Inherits from TrapBase, checking IsPlaceableAtposition", true);
+			#endif
+			TrapBase trapBase;
+			Class.CastTo(trapBase, m_Projection);
+			SetIsColliding(!trapBase.IsPlaceableAtPosition(m_Projection.GetPosition()));
+		}
+		else
+		{
+			SetIsColliding(false);
+		}
+	}
+	
+	bool IsClippingRoof()
+	{
+		if (CfgGameplayHandler.GetDisableIsClippingRoofCheck())
+			return false;
+		if (GetGame().IsServer() && GetGame().IsMultiplayer())
+			return false;
+		
+		//Some locations allow you to look up and attempt placing the hologram on the bottom side of a floor - most notably the floors of a watchtower
+		//This check also prevents some very unnatural placements
+
+		bool b1 = m_Projection.GetPosition()[1] > GetGame().GetCurrentCameraPosition()[1];
+		bool b2 = false;
+		#ifdef DIAG_DEVELOPER
+		vector from, to;
+		#endif
+		if (m_Projection.DoPlacingHeightCheck())
+		{
+			b2 = MiscGameplayFunctions.IsUnderRoofEx(m_Projection, GameConstants.ROOF_CHECK_RAYCAST_DIST, ObjIntersectFire);
+			#ifdef DIAG_DEVELOPER			
+			MiscGameplayFunctions.IsUnderRoofFromToCalculation(m_Projection, from, to);
+			DrawArrow(from, to, !b2);
+			#endif
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsClippingRoof: ", false, b1, " | (projection height) " + m_Projection.GetPosition()[1] + " > (camera height) " + GetGame().GetCurrentCameraPosition()[1]);
+		DebugText("IsClippingRoof: ", false, b2, " | (DoPlacingHeightCheck) " + m_Projection.DoPlacingHeightCheck() + " && (IsUnderRoof) " + MiscGameplayFunctions.IsUnderRoof(m_Projection) + " | from: " + from[1] + " | to: " + to[1]);
+		#endif
+		
+		return b1 || b2;
+	}
+	
+	bool IsCollidingAngle()
+	{
+		if (CfgGameplayHandler.GetDisableIsCollidingAngleCheck())
+			return false;
+		vector projection_orientation = m_Projection.GetOrientation();		
+		bool isTrue = Math.AbsFloat( projection_orientation[1] ) > m_YawPitchRollLimit[1] || Math.AbsFloat( projection_orientation[2] ) > m_YawPitchRollLimit[2];
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsCollidingAngle: ", false, isTrue, " | (proj pitch) " + Math.AbsFloat( projection_orientation[1] ) + " > (pitch limit) " + m_YawPitchRollLimit[1] + " | (proj roll) " + Math.AbsFloat( projection_orientation[2] ) + " > (roll limit) " + m_YawPitchRollLimit[2]);
+		#endif
+
+		return isTrue;
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	protected Shape m_CollisionBox;
+	protected void DrawDebugCollisionBox( vector min_max[2], int color )
+	{
+		vector mat[4];
+		m_Projection.GetTransform( mat );
+		m_CollisionBox = Debug.DrawBox( min_max[0], min_max[1], color );
+		m_CollisionBox.SetMatrix( mat );
+	}
+	
+	protected void DestroyDebugCollisionBox()
+	{
+		if ( m_CollisionBox )
+		{
+			m_CollisionBox.Destroy();
+			m_CollisionBox = NULL;
+		}		
+	}
+	#endif
+
+	bool IsCollidingBBox(ItemBase action_item = null)
+	{
+		if (CfgGameplayHandler.GetDisableIsCollidingBBoxCheck())
+			return false;
+
+		vector center;
+		vector relativeOffset; //we need to lift BBox, because it is calculated from the bottom of projection, and not from the middle
+		vector absoluteOffset = "0 0.05 0"; //we need to lift BBox even more, because it colliddes with house floors due to various reasons (probably geometry or float imperfections)
+		vector orientation = GetProjectionOrientation();
+		vector edgeLength;
+		vector minMax[2];
+		array<Object> excludedObjects = new array<Object>();
+		array<Object> collidedObjects = new array<Object>();
+		
+		GetProjectionCollisionBox(minMax);
+		relativeOffset[1] = (minMax[1][1] - minMax[0][1]) * 0.5;
+		center = m_Projection.GetPosition() + relativeOffset + absoluteOffset;
+		edgeLength = GetCollisionBoxSize(minMax);
+		excludedObjects.Insert(m_Projection);
+		excludedObjects.Insert(m_Player);
+
+		if (action_item)
+			excludedObjects.Insert(action_item);
+
+		//add is construction check
+		// Base building objects behave in a way that causes this test to generate false positives
+		bool isTrue = GetGame().IsBoxCollidingGeometry(center, orientation, edgeLength, ObjIntersectFire, ObjIntersectGeom, excludedObjects, collidedObjects);		
+		#ifdef DIAG_DEVELOPER	
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			string text = "";
+			foreach (Object object: collidedObjects)
+				text += " | " + Object.GetDebugName(object);
+
+			DebugText("IsCollidingBBox: ", false, isTrue, text);
+		
+			int color = 0x01FFFFFF;
+			if (isTrue)
+				color = 0x33F22613;
+			
+			DrawDebugCollisionBox(minMax, color);
+		}
+		#endif
+
+		return isTrue;
+	}
+
+	bool IsBaseViable()
+	{	
+		//This function is not required to solve server-side fixes for clipping, saves calculations and potential false negatives
+		if (GetGame().IsServer() && GetGame().IsMultiplayer())
+			return true;
+
+		if (CfgGameplayHandler.GetDisableIsBaseViableCheck())
+			return true;
+		
+		vector from_left_close = m_Projection.CoordToParent(GetLeftCloseProjectionVector());
+		vector to_left_close_down = from_left_close + "0 -1 0";
+
+		vector from_right_close = m_Projection.CoordToParent(GetRightCloseProjectionVector());
+		vector to_right_close_down = from_right_close + "0 -1 0";
+
+		vector from_left_far = m_Projection.CoordToParent(GetLeftFarProjectionVector());
+		vector to_left_far_down = from_left_far + "0 -1 0";
+
+		vector from_right_far = m_Projection.CoordToParent(GetRightFarProjectionVector());
+		vector to_right_far_down = from_right_far + "0 -1 0";
+		
+		vector contact_pos_left_close;
+		vector contact_pos_right_close;
+		vector contact_pos_left_far;
+		vector contact_pos_right_far;
+		vector contact_dir_left_close;
+		vector contact_dir_right_close;
+		vector contact_dir_left_far;
+		vector contact_dir_right_far;
+		int contact_component_left_close;
+		int contact_component_right_close;
+		int contact_component_left_far;
+		int contact_component_right_far;
+		set<Object> results_left_close = new set<Object>;
+		set<Object> results_right_close = new set<Object>;
+		set<Object> results_left_far = new set<Object>;
+		set<Object> results_right_far = new set<Object>;
+		Object obj_left_close;
+		Object obj_right_close;
+		Object obj_left_far;
+		Object obj_right_far;
+
+		//Not sure what the intention here was before, but it boiled down to a very bloated version of what you see here right now
+		DayZPhysics.RaycastRV(from_left_close, to_left_close_down, contact_pos_left_close, contact_dir_left_close, contact_component_left_close, results_left_close, null, m_Projection, false, false, ObjIntersectFire);
+		if (results_left_close.Count() > 0)
+			obj_left_close = results_left_close[results_left_close.Count() - 1];
+
+		DayZPhysics.RaycastRV(from_right_close, to_right_close_down, contact_pos_right_close, contact_dir_right_close, contact_component_right_close, results_right_close, null, m_Projection, false, false, ObjIntersectFire);
+		if (results_right_close.Count() > 0)	
+			obj_right_close = results_right_close[results_right_close.Count() - 1];
+
+		DayZPhysics.RaycastRV(from_left_far, to_left_far_down, contact_pos_left_far, contact_dir_left_far, contact_component_left_far, results_left_far, null, m_Projection, false, false, ObjIntersectFire);
+		if (results_left_far.Count() > 0) 
+			obj_left_far = results_left_far[results_left_far.Count() - 1];
+
+		DayZPhysics.RaycastRV(from_right_far, to_right_far_down, contact_pos_right_far, contact_dir_right_far, contact_component_right_far, results_right_far, null, m_Projection, false, false, ObjIntersectFire);
+		if (results_right_far.Count() > 0)
+			obj_right_far = results_right_far[results_right_far.Count() - 1];
+		
+		return IsBaseIntact(obj_left_close, obj_right_close, obj_left_far, obj_right_far ) && IsBaseStatic( obj_left_close ) && IsBaseFlat( contact_pos_left_close, contact_pos_right_close, contact_pos_left_far, contact_pos_right_far);
+	}
+
+	bool IsCollidingGPlot()
+	{
+		if (CfgGameplayHandler.GetDisableIsCollidingGPlotCheck())
+			return false;
+
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsCollidingGPlot: ", false, m_IsCollidingGPlot);
+		#endif
+
+		return m_IsCollidingGPlot;
+	}
+
+	bool IsCollidingZeroPos()
+	{
+		vector origin = Vector(0, 0, 0);
+		bool isTrue = GetProjectionPosition() == origin;
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsCollidingZeroPos: ", false, isTrue);
+		#endif
+
+		return isTrue;
+	}
+	
+	//! DEPRECATED
+	bool IsBehindObstacle()
+	{			
+		ErrorEx("Deprecated check - do not use", ErrorExSeverity.WARNING);
+		return false;
+	}
+	
+	//This function only takes one of the found objects since IsBaseIntact already verifies that all of them are either null or the same object
+	bool IsBaseStatic( Object objectToCheck )
+	{	
+		//check if the object below hologram is dynamic object. Dynamic objects like barrels can be taken to hands 
+		//and item which had been placed on top of them, would stay floating in the air			
+		#ifdef DIAG_DEVELOPER
+		if (objectToCheck == null)
+			DebugText("IsBaseStatic(must be true): ", true, true, " | objectToCheck is null (this is good)");
+		else
+			DebugText("IsBaseStatic(must be true): ", true, IsObjectStatic(objectToCheck));
+		#endif
+		return objectToCheck == null || IsObjectStatic(objectToCheck);
+	}
+	
+	bool IsObjectStatic( Object obj )
+	{
+		return obj.IsBuilding() || obj.IsPlainObject() || (!m_Parent.IsInherited(KitBase) && obj.IsInherited(BaseBuildingBase) && (m_WatchtowerBlockedComponentNames.Find(obj.GetActionComponentName(m_ContactComponent, LOD.NAME_VIEW)) == -1));
+	}
+
+	bool IsBaseIntact( Object under_left_close, Object under_right_close, Object under_left_far, Object under_right_far )
+	{
+		bool isTrue = (under_left_close == under_right_close && under_right_close == under_left_far && under_left_far == under_right_far);
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsBaseIntact(must be true and all equal): ", true, isTrue, " | ulc: " + Object.GetDebugName(under_left_close) + " | urc: " + Object.GetDebugName(under_right_close) + " | ulf: " + Object.GetDebugName(under_left_far) + " | urf: " + Object.GetDebugName(under_right_far));
+		if (!isTrue)
+		{
+			array<bool> conditions = new array<bool>();
+			conditions.Insert(under_left_close == null);
+			conditions.Insert(under_right_close == null);
+			conditions.Insert(under_left_far == null);
+			conditions.Insert(under_right_far == null);
+			
+			int amountOfNull = 0;
+			if (!under_left_close)
+				++amountOfNull;
+			if (!under_right_close)
+				++amountOfNull;
+			if (!under_left_far)
+				++amountOfNull;
+			if (!under_right_far)
+				++amountOfNull;
+			
+			if ( amountOfNull < 3 )
+				for ( int i = 0; i < conditions.Count(); ++i)
+					conditions[i] = !conditions[i];
+			
+			DrawBaseSpheres(conditions);
+		}
+		#endif
+
+		return isTrue;
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	void DrawArrow(vector from, vector to, bool condition)
+	{
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			int color = 0xFFFFFFFF;
+			if (!condition)
+				color = COLOR_RED;
+			
+			Debug.DrawArrow(from, to, 1, color, ShapeFlags.ONCE);
+		}
+	}
+	
+	void DrawSphere(vector pos, bool condition)
+	{
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			int color = 0x01FFFFFF;
+			if (!condition)
+				color = 0x99F22613;
+			
+			Debug.DrawSphere(pos, 1, color, ShapeFlags.ONCE|ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE);
+		}
+	}
+	
+	void DrawBaseSpheres(array<bool> conditions)
+	{
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			array<vector> positions = new array<vector>();
+			positions.Insert(m_Projection.CoordToParent( GetLeftCloseProjectionVector() ));
+			positions.Insert(m_Projection.CoordToParent( GetRightCloseProjectionVector() ));
+			positions.Insert(m_Projection.CoordToParent( GetLeftFarProjectionVector() ));
+			positions.Insert(m_Projection.CoordToParent( GetRightFarProjectionVector() ));
+			
+			for (int i = 0; i < positions.Count(); ++i)
+				DrawSphere(positions[i], conditions[i]);
+		}
+	}
+	
+	void DrawDebugArrow(float start, float dist, int color = 0xFF1FFFFF)
+	{
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+		{
+			vector from = m_Player.GetPosition() + start * MiscGameplayFunctions.GetHeadingVector(m_Player);
+			vector to = m_Player.GetPosition() + dist * MiscGameplayFunctions.GetHeadingVector(m_Player);
+
+			Debug.DrawArrow(from, to, 0.5, 0xFF1FFFFF, ShapeFlags.ONCE|ShapeFlags.TRANSP);
+		}
+	}
+	#endif
+
+	bool IsBaseFlat( vector contact_pos_left_close, vector contact_pos_right_close, vector contact_pos_left_far, vector contact_pos_right_far )
+	{		
+		vector projection_pos = GetProjectionPosition();
+		float slope_pos_left_close = Math.AbsFloat(projection_pos[1] - contact_pos_left_close[1]);
+		float slope_pos_right_close = Math.AbsFloat(projection_pos[1] - contact_pos_right_close[1]);
+		float slope_pos_left_far = Math.AbsFloat(projection_pos[1] - contact_pos_left_far[1]);
+		float slope_pos_right_far = Math.AbsFloat(projection_pos[1] - contact_pos_right_far[1]);
+		
+		bool isTrue = slope_pos_left_close < m_SlopeTolerance && slope_pos_right_close < m_SlopeTolerance && slope_pos_left_far < m_SlopeTolerance && slope_pos_right_far < m_SlopeTolerance;
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsBaseFlat(must be true): ", true, isTrue, " (slope < slopeTolerance) | slopeTolerance:  " + m_SlopeTolerance + " | lc: " + slope_pos_left_close + " | rc: " + slope_pos_right_close + " | lf: " + slope_pos_left_far + " | rf: " + slope_pos_right_far);
+		DrawArrow(projection_pos, contact_pos_left_close, slope_pos_left_close < m_SlopeTolerance);
+		DrawArrow(projection_pos, contact_pos_right_close, slope_pos_right_close < m_SlopeTolerance);		
+		DrawArrow(projection_pos, contact_pos_left_far, slope_pos_left_far < m_SlopeTolerance);
+		DrawArrow(projection_pos, contact_pos_right_far, slope_pos_right_far < m_SlopeTolerance);
+		#endif
+
+		return isTrue;
+		}
+		
+	//! Checks if the item can be legally placed (usually checked by action as well)
+	bool IsPlacementPermitted()
+	{
+		if (CfgGameplayHandler.GetDisableIsPlacementPermittedCheck())
+			return true;
+
+		bool isTrue = m_Parent && m_Parent.CanBePlaced(m_Player, GetProjectionPosition());
+
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsPlacementPermitted(must be true): ", true, isTrue, " (Note: ItemBase::CanBePlaced() return value)");
+		#endif
+		return isTrue;
+	}
+	
+	//! Checks height relative to player's position
+	bool HeightPlacementCheck()
+	{
+		if (CfgGameplayHandler.GetDisableHeightPlacementCheck())
+			return true;
+		if ( GetProjectionEntity() ) //simple height check
+		{
+			vector playerpos = m_Player.GetPosition();
+			vector projectionpos = GetProjectionPosition();
+			float delta1 = playerpos[1] - projectionpos[1];
+			
+			if ( delta1 > DEFAULT_MAX_PLACEMENT_HEIGHT_DIFF || delta1 < -DEFAULT_MAX_PLACEMENT_HEIGHT_DIFF )
+			{
+				#ifdef DIAG_DEVELOPER
+				DebugText("HeightPlacementCheck(must be true): ", true, false, " | Height difference between item and player is larger than " + DEFAULT_MAX_PLACEMENT_HEIGHT_DIFF);
+				#endif
+				return false;
+			}
+		}
+		#ifdef DIAG_DEVELOPER
+		DebugText("HeightPlacementCheck(must be true): ", true, true);
+		#endif
+		return true;
+	}
+	
+	bool IsUnderwater()
+	{
+		if (CfgGameplayHandler.GetDisableIsUnderwaterCheck())
+			return false;
+		// Fast check middle of object
+		string type;
+		int liquid;
+		g_Game.SurfaceUnderObject(m_Projection, type, liquid);
+		
+		if (liquid == LIQUID_WATER)
+		{
+			#ifdef DIAG_DEVELOPER
+			DebugText("IsUnderwater: ", false, true, " | Surface under object is water");
+			#endif
+			return true;
+		}
+		
+		// Check every corner of the object
+		vector left_close = m_Projection.CoordToParent( GetLeftCloseProjectionVector() );
+		vector right_close = m_Projection.CoordToParent( GetRightCloseProjectionVector() );
+		vector left_far = m_Projection.CoordToParent( GetLeftFarProjectionVector() );
+		vector right_far = m_Projection.CoordToParent( GetRightFarProjectionVector() );
+		bool surface_sea_water = IsSurfaceSea(left_close) || IsSurfaceSea(right_close) || IsSurfaceSea(left_far) || IsSurfaceSea(right_far);
+		
+		#ifdef DIAG_DEVELOPER
+		// I'd rather duplicate this on internal than introduce (even) more raycasts than needed on retail..
+		float lc = g_Game.GetWaterDepth(left_close);
+		float rc = g_Game.GetWaterDepth(right_close);
+		float lf = g_Game.GetWaterDepth(left_far);
+		float rf = g_Game.GetWaterDepth(right_far);
+		bool isTrue = (lc > 0 || rc > 0 || lf > 0 || rf > 0 || surface_sea_water);
+		DebugText("IsUnderwater: ", false, isTrue, " surface_sea_water: " + surface_sea_water + " | (all must be less than zero) | lc: " + lc + " | rc: " + rc + " | lf: " + lf + " | rf: " + rf);
+		//DebugText("Corner Height: ", false, true, " lc: " + left_close[1] + " | rc: " + right_close[1] + " | lf: " + left_far[1] + " | rf: " + right_far[1]);
+		if (isTrue)
+		{
+			array<bool> conditions = {lc <= 0, rc <= 0, lf <= 0, rf <= 0};
+			DrawBaseSpheres(conditions);
+		}
+		#endif
+		
+		return (surface_sea_water || g_Game.GetWaterDepth(left_close) > 0 || g_Game.GetWaterDepth(right_close) > 0 || g_Game.GetWaterDepth(left_far) > 0 || g_Game.GetWaterDepth(right_far) > 0);	
+	}
+	
+	bool IsInTerrain()
+	{
+		if (CfgGameplayHandler.GetDisableIsInTerrainCheck())
+			return false;
+		vector fromHeightOffset = "0 0.3 0";
+		vector toHeightOffset = "0 1 0";
+		
+		vector from_left_close = m_Projection.CoordToParent( GetLeftCloseProjectionVector() ) + fromHeightOffset;
+		vector to_left_close_down = from_left_close + toHeightOffset;
+
+		vector from_right_close = m_Projection.CoordToParent( GetRightCloseProjectionVector() ) + fromHeightOffset;
+		vector to_right_close_down = from_right_close + toHeightOffset;
+
+		vector from_left_far = m_Projection.CoordToParent( GetLeftFarProjectionVector() ) + fromHeightOffset;
+		vector to_left_far_down = from_left_far + toHeightOffset;
+
+		vector from_right_far = m_Projection.CoordToParent( GetRightFarProjectionVector() ) + fromHeightOffset;
+		vector to_right_far_down = from_right_far + toHeightOffset;
+
+		vector contact_pos_left_close;
+		vector contact_pos_right_close;
+		vector contact_pos_left_far;
+		vector contact_pos_right_far;
+		
+		vector contact_dir_left_close;
+		vector contact_dir_right_close;
+		vector contact_dir_left_far;
+		vector contact_dir_right_far;
+		
+		int contact_component_left_close;
+		int contact_component_right_close;
+		int contact_component_left_far;
+		int contact_component_right_far;
+		
+		#ifdef DIAG_DEVELOPER
+		// I'd rather duplicate this on internal than introduce (even) more raycasts than needed on retail..
+		set<Object> lcO = new set<Object>();
+		set<Object> rcO = new set<Object>();
+		set<Object> lfO = new set<Object>();
+		set<Object> rfO = new set<Object>();
+		bool lc = DayZPhysics.RaycastRV( from_left_close, to_left_close_down, contact_pos_left_close, contact_dir_left_close, contact_component_left_close, lcO, m_Projection, m_Projection, false, true, ObjIntersectFire );
+		bool rc = DayZPhysics.RaycastRV( from_right_close, to_right_close_down, contact_pos_right_close, contact_dir_right_close, contact_component_right_close, rcO, m_Projection, m_Projection, false, true, ObjIntersectFire );
+		bool lf = DayZPhysics.RaycastRV( from_left_far, to_left_far_down, contact_pos_left_far, contact_dir_left_far, contact_component_left_far, lfO, m_Projection, m_Projection, false, true, ObjIntersectFire );
+		bool rf = DayZPhysics.RaycastRV( from_right_far, to_right_far_down, contact_pos_right_far, contact_dir_right_far, contact_component_right_far, rfO, m_Projection, m_Projection, false, true, ObjIntersectFire );
+		bool isTrue = ( lc || rc || lf || rf );
+		string text = "";		
+		if (isTrue)
+		{
+			if (lc)
+				text += " | lc";
+			if (rc)
+				text += " | rc";
+			if (lf)
+				text += " | lf";
+			if (rf)
+				text += " | rf";
+			
+			if (lcO.Count() > 0)
+				text += " | lcO: " + lcO[0];
+			if (rcO.Count() > 0)
+				text += " | rcO: " + rcO[0];
+			if (lfO.Count() > 0)
+				text += " | lfO: " + lfO[0];
+			if (rfO.Count() > 0)
+				text += " | rfO: " + rfO[0];
+			
+			array<bool> conditions = {!lc, !rc, !lf, !rf};
+			DrawBaseSpheres(conditions);
+		}
+		DebugText("IsInTerrain: ", false, isTrue, text);
+		#endif
+
+		if (DayZPhysics.RaycastRV( from_left_close, to_left_close_down, contact_pos_left_close, contact_dir_left_close, contact_component_left_close, NULL, m_Projection, m_Projection, false, true, ObjIntersectFire ))
+			return true;
+
+		if (DayZPhysics.RaycastRV( from_right_close, to_right_close_down, contact_pos_right_close, contact_dir_right_close, contact_component_right_close, NULL,m_Projection, m_Projection, false, true, ObjIntersectFire ))
+			return true;
+
+		if (DayZPhysics.RaycastRV( from_left_far, to_left_far_down, contact_pos_left_far, contact_dir_left_far, contact_component_left_far, NULL, m_Projection, m_Projection, false, true, ObjIntersectFire ))
+			return true;
+
+		if (DayZPhysics.RaycastRV( from_right_far, to_right_far_down, contact_pos_right_far, contact_dir_right_far, contact_component_right_far, NULL, m_Projection, m_Projection, false, true, ObjIntersectFire ))
+			return true;
+		
+		return false;
+	}
+	
+	void CheckPowerSource()
+	{
+		//in range of its power source.
+		if (m_Player && m_Parent && m_Parent.HasEnergyManager() && m_Parent.GetCompEM().IsPlugged())
+		{
+			// Unplug the device when the player is too far from the power source.
+			m_Parent.GetCompEM().UpdatePlugState();
+			
+			// Delete local hologram when plug is rippled out and advanced placement is active
+			if (GetGame().IsMultiplayer() && GetGame().IsClient())
+			{
+				if (!m_Parent.GetCompEM().IsPlugged())
+					m_Player.TogglePlacingLocal();
+			}
+		}				
+	}
+	
+	EntityAI PlaceEntity( EntityAI entity_for_placing )
+	{
+		//string-based comparison
+		if (entity_for_placing.IsInherited(TentBase) || entity_for_placing.IsBasebuildingKit() )
+		{
+			return entity_for_placing;
+		}
+		
+		if (m_Projection.IsInherited(GardenPlotPlacing))
+		{
+			Class.CastTo(entity_for_placing, GetGame().CreateObjectEx( "GardenPlot", m_Projection.GetPosition(), ECE_OBJECT_SWAP ));
+			return entity_for_placing;
+		}
+		
+		//inheritance comparison
+		if( !GetProjectionEntity().IsKindOf( m_Parent.GetType() ))
+		{
+			Class.CastTo(entity_for_placing, GetGame().CreateObjectEx( m_Projection.GetType(), m_Projection.GetPosition(), ECE_OBJECT_SWAP ));
+		}
+		
+		return entity_for_placing;
+	}
+	
+	protected void GetProjectionCollisionBox( out vector min_max[2] )
+	{
+		if (!m_Projection.GetCollisionBox( min_max ) && m_Projection.MemoryPointExists("box_placing_min"))
+		{
+			min_max[0] = m_Projection.GetMemoryPointPos( "box_placing_min" );
+			min_max[1] = m_Projection.GetMemoryPointPos( "box_placing_max" );
+			//Debug.DrawSphere(m_Projection.ModelToWorld(min_max[0]) , 0.8,Colors.RED, ShapeFlags.ONCE);
+			//Debug.DrawSphere(m_Projection.ModelToWorld(min_max[1]), 0.8,Colors.RED, ShapeFlags.ONCE);
+		}
+	}
+	
+	protected vector GetCollisionBoxSize( vector min_max[2] )
+	{
+		vector box_size = Vector(1,1,1);
+		
+		box_size[0] = min_max[1][0] - min_max[0][0];
+		box_size[2] = min_max[1][2] - min_max[0][2];
+		box_size[1] = min_max[1][1] - min_max[0][1];
+		
+		return box_size;
+	}
+
+	vector GetLeftCloseProjectionVector()
+	{
+		vector min_max[2];
+		GetProjectionCollisionBox( min_max );
+
+		return min_max[0];
+	}
+
+	vector GetRightCloseProjectionVector()
+	{
+		vector min_max[2];
+		GetProjectionCollisionBox( min_max );
+		min_max[1][1] = min_max[0][1];
+		min_max[1][2] = min_max[0][2];
+
+		return min_max[1];
+	}
+
+	vector GetLeftFarProjectionVector()
+	{
+		vector min_max[2];
+		GetProjectionCollisionBox( min_max );
+		min_max[0][2] = min_max[1][2];
+
+		return min_max[0];
+	}
+
+	vector GetRightFarProjectionVector()
+	{
+		vector min_max[2];
+		GetProjectionCollisionBox( min_max );
+		min_max[1][1] = min_max[0][1]; 
+
+		return min_max[1];
+	}
+
+	// Replaced by IsUnderwater, currently unused
+	bool IsSurfaceWater( vector position )
+	{
+		CGame game = GetGame();
+		return game.SurfaceIsSea( position[0], position[2] ) || game.SurfaceIsPond( position[0], position[2] );
+	}
+	
+	bool IsSurfaceSea( vector position )
+	{
+		CGame game = GetGame();
+		return game.SurfaceIsSea( position[0], position[2] );
+	}
+
+	protected vector GetProjectionEntityPosition(PlayerBase player)
+	{
+		float minProjectionDistance;
+		float maxProjectionDistance; 
+		m_ContactDir = vector.Zero;
+		vector minMax[2];
+		float projectionRadius = GetProjectionRadius();
+		float cameraToPlayerDistance = vector.Distance(GetGame().GetCurrentCameraPosition(), player.GetPosition());
+
+		if (projectionRadius < SMALL_PROJECTION_RADIUS) // objects with radius smaller than 1m
+		{
+			minProjectionDistance = SMALL_PROJECTION_RADIUS;
+			maxProjectionDistance = SMALL_PROJECTION_RADIUS * 2;
+		}
+		else
+		{
+			minProjectionDistance = projectionRadius;
+			maxProjectionDistance = projectionRadius * 2;
+			maxProjectionDistance = Math.Clamp(maxProjectionDistance, SMALL_PROJECTION_RADIUS, LARGE_PROJECTION_DISTANCE_LIMIT);
+		}
+		
+		vector from = GetGame().GetCurrentCameraPosition();
+		//adjusts raycast origin to player head approx. level (limits results behind the character)
+		if ( DayZPlayerCamera3rdPerson.Cast(player.GetCurrentCamera()) )
+		{
+			vector head_pos;
+			MiscGameplayFunctions.GetHeadBonePos(player,head_pos);
+			float dist = vector.Distance(head_pos,from);
+			from = from + GetGame().GetCurrentCameraDirection() * dist;
+		}
+		
+		vector to = from + (GetGame().GetCurrentCameraDirection() * (maxProjectionDistance + cameraToPlayerDistance));
+		vector contactPosition;
+		set<Object> hitObjects = new set<Object>();
+
+		DayZPhysics.RaycastRV(from, to, contactPosition, m_ContactDir, m_ContactComponent, hitObjects, player, m_Projection, false, false, ObjIntersectFire);
+		
+		bool contactHitProcessed = false;
+		//! will not push hologram up when there is direct hit of an item
+		if (!CfgGameplayHandler.GetDisableIsCollidingBBoxCheck())
+		{
+			if (hitObjects.Count() > 0)
+			{
+				if (hitObjects[0].IsInherited(Watchtower))
+				{
+					contactHitProcessed = true;
+					contactPosition = CorrectForWatchtower(m_ContactComponent, contactPosition, player, hitObjects[0]);
+				}
+				
+				if (!contactHitProcessed && hitObjects[0].IsInherited(InventoryItem))
+					contactPosition = hitObjects[0].GetPosition();
+			}
+		}
+
+		static const float raycastOriginOffsetOnFail = 0.25;
+		static const float minDistFromStart = 0.01;
+		// Camera isn't correctly positioned in some cases, leading to raycasts hitting the object directly behind the camera
+		if ((hitObjects.Count() > 0) && (vector.DistanceSq(from, contactPosition) < minDistFromStart))
+		{
+			from = contactPosition + GetGame().GetCurrentCameraDirection() * raycastOriginOffsetOnFail;
+			DayZPhysics.RaycastRV(from, to, contactPosition, m_ContactDir, m_ContactComponent, hitObjects, player, m_Projection, false, false, ObjIntersectFire);
+		}
+
+		bool isFloating = SetHologramPosition(player.GetPosition(), minProjectionDistance, maxProjectionDistance, contactPosition);
+		SetIsFloating(isFloating);
+
+		#ifdef DIAG_DEVELOPER
+		DrawDebugArrow(minProjectionDistance, maxProjectionDistance);
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM))
+		{
+			Debug.DrawSphere(GetProjectionPosition(), 0.1, 0x99FF0000, ShapeFlags.ONCE|ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE);
+		}
+		#endif
+		
+		m_FromAdjusted = from;
+
+		return contactPosition;
+	}
+	
+	/**  
+	\brief Sets hologram position based on player and projection distance
+	@param startPosition start position
+	@param minProjectionDistance lower distance limit
+	@param maxProjectionDistance higher distance limit
+	@param inout contactPosition is position of the hologram contact with ground/object 	
+	@return true if hologram is floating (is on the near or far edge)
+	*/
+	protected bool SetHologramPosition(vector startPosition, float minProjectionDistance, float maxProjectionDistance, inout vector contactPosition)
+	{
+		float playerToProjectionDistance = vector.Distance(startPosition, contactPosition);
+		vector playerToProjection;
+		
+		#ifdef DIAG_DEVELOPER
+		DebugText("SetHologramPosition::startPosition: ", false, m_IsHidden, string.Format(" | %1", startPosition));
+		DebugText("SetHologramPosition::contactPosition [in]: ", false, m_IsHidden, string.Format(" | %1", contactPosition));
+		DebugText("SetHologramPosition::minProjectionDistance: ", false, m_IsHidden, string.Format(" | %1", minProjectionDistance));
+		DebugText("SetHologramPosition::maxProjectionDistance: ", false, m_IsHidden, string.Format(" | %1", maxProjectionDistance));
+		DebugText("SetHologramPosition::playerToProjectionDistance: ", false, m_IsHidden, string.Format(" | %1", playerToProjectionDistance));
+		#endif
+
+		//hologram is at min distance from player
+		if (playerToProjectionDistance <= minProjectionDistance)
+		{
+			playerToProjection = contactPosition - startPosition;
+			playerToProjection.Normalize();
+			//prevents the hologram to go underground/floor while hologram exceeds minProjectionDistance
+			playerToProjection[1] = playerToProjection[1] + PROJECTION_TRANSITION_MIN;
+			
+			contactPosition = startPosition + (playerToProjection * minProjectionDistance);
+			
+			#ifdef DIAG_DEVELOPER
+			DebugText("SetHologramPosition::contactPosition[out] (< minProjectDistance): ", false, m_IsHidden, string.Format(" | %1", contactPosition));
+			#endif
+
+			return true;
+		}
+		//hologram is at max distance from player
+		else if (playerToProjectionDistance >= maxProjectionDistance)
+		{
+			playerToProjection = contactPosition - startPosition;
+			playerToProjection.Normalize();
+			//prevents the hologram to go underground/floor while hologram exceeds maxProjectionDistance
+			playerToProjection[1] = playerToProjection[1] + PROJECTION_TRANSITION_MAX;
+			
+			contactPosition = startPosition + (playerToProjection * maxProjectionDistance);
+			
+			#ifdef DIAG_DEVELOPER
+			DebugText("SetHologramPosition::contactPosition[out] (< maxProjectionDistance): ", false, m_IsHidden, string.Format(" | %1", contactPosition));
+			#endif
+		
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool IsFenceOrWatchtowerKit()
+	{
+		return m_Parent.IsBasebuildingKit() || m_Parent.IsInherited(TentBase);
+	}
+	
+	vector CorrectForWatchtower(int contactComponent, vector contactPos, PlayerBase player, Object hitObject)
+	{
+		// Raycast has hit one of the trigger boxes that show construction prompts, so projection would be floating in the air without this correction
+		if (m_WatchtowerIgnoreComponentNames.Find(hitObject.GetActionComponentName(contactComponent, LOD.NAME_VIEW)) != -1 )
+			contactPos[1] = hitObject.GetActionComponentPosition(contactComponent, LOD.NAME_VIEW)[1];
+		
+		return contactPos;
+	}
+	
+	//This function is currently unused
+	bool IsProjectionTrap()
+	{
+		return m_Projection.IsInherited( TrapBase ) || m_Projection.IsInherited( TrapSpawnBase );
+	}
+
+	float GetProjectionDiameter()
+	{		
+		float diameter;
+		float radius;
+		vector diagonal;
+		vector min_max[2];
+
+		GetProjectionCollisionBox( min_max );
+		diagonal = GetCollisionBoxSize( min_max );
+		diameter = diagonal.Length();
+
+		return diameter;	
+	}
+
+	float GetProjectionRadius()
+	{		
+		float diameter;
+		float radius;
+		vector diagonal;
+		vector min_max[2];
+
+		GetProjectionCollisionBox( min_max );
+		diagonal = GetCollisionBoxSize( min_max );
+		diameter = diagonal.Length();
+		radius = diameter / 2;
+
+		return radius;	
+	}
+		
+	void SetUpdatePosition( bool state )
+	{
+		m_UpdatePosition = state;
+	}
+
+	bool GetUpdatePosition()
+	{
+		return m_UpdatePosition;
+	}
+
+	EntityAI GetParentEntity()
+	{
+		return m_Parent;
+	}
+	
+	void SetProjectionEntity( EntityAI projection )
+	{
+		m_Projection = projection;
+	}
+
+	EntityAI GetProjectionEntity()
+	{
+		return m_Projection;
+	}
+	
+	void SetIsFloating( bool is_floating )
+	{
+		m_IsFloating = is_floating;
+	}
+		
+	void SetIsColliding( bool is_colliding )
+	{
+		#ifdef DIAG_DEVELOPER
+		DebugText("Is colliding: ", false, is_colliding, m_CollisionDetails);
+		#endif
+		m_IsColliding = is_colliding;
+	}
+
+	void SetIsHidden( bool is_hidden )
+	{
+		m_IsHidden = is_hidden;
+	}
+	
+	void SetIsCollidingPlayer( bool is_colliding )
+	{
+		m_IsCollidingPlayer = is_colliding;
+	}
+
+	void SetIsCollidingGPlot( bool is_colliding_gplot )
+	{
+		m_IsCollidingGPlot = is_colliding_gplot;
+	}
+
+	bool IsFloating()
+	{
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsFloating: ", false, m_IsFloating);
+		#endif
+		return m_IsFloating;
+	}
+
+	bool IsColliding()
+	{
+		return m_IsColliding;
+	}
+	
+	bool IsHidden()
+	{
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsHidden: ", false, m_IsHidden);
+		#endif
+		return m_IsHidden;
+	}
+
+	bool IsCollidingPlayer()
+	{
+		if (CfgGameplayHandler.GetDisableIsCollidingPlayerCheck())
+			return false;
+		#ifdef DIAG_DEVELOPER
+		DebugText("IsCollidingPlayer: ", false, m_IsCollidingPlayer);
+		#endif
+		return m_IsCollidingPlayer;
+	}
+
+	void SetProjectionPosition(vector position)
+	{
+		m_Projection.SetPosition( position );
+		
+		if (IsFloating())
+		{
+			m_Projection.SetPosition(SetOnGround(position));
+		}
+	}
+
+	void SetProjectionOrientation(vector orientation)
+	{	
+		m_Projection.SetOrientation(orientation);
+	}
+	
+	vector GetProjectionRotation()
+	{
+		return m_Rotation;
+	}
+	
+	void AddProjectionRotation( float addition )
+	{	
+		m_Rotation[0] = m_Rotation[0] + addition;
+	}
+	
+	void SubtractProjectionRotation( float subtraction )
+	{	
+		m_Rotation[0] = m_Rotation[0] - subtraction;
+	}
+	
+	vector SetOnGround( vector position )
+	{
+		vector from = position;
+		vector ground;
+		vector player_to_projection_vector;
+		float projection_diameter = GetProjectionDiameter();
+			
+		ground = Vector(0, -Math.Max(projection_diameter, SMALL_PROJECTION_GROUND), 0);
+		
+		vector to = from + ground;
+		vector contact_pos = to;
+		
+		RaycastRVParams rayInput = new RaycastRVParams(from, to, m_Projection);
+		rayInput.flags = CollisionFlags.ALLOBJECTS;
+		array<ref RaycastRVResult> results = new array<ref RaycastRVResult>;
+		
+		if (DayZPhysics.RaycastRVProxy(rayInput, results))
+		{
+			RaycastRVResult res;
+			for (int i = 0; i < results.Count(); i++)
+			{
+				res = results.Get(i);
+				if (res.entry || (!res.obj && !res.parent))
+				{
+					contact_pos = res.pos;
+					break;
+				}
+			}
+		}
+		
+		//LOS check
+		if (contact_pos != "0 0 0")
+		{
+			vector check_pos;
+			vector check_dir;
+			int check_component = -1;
+			set<Object> hit_object = new set<Object>;
+			to = contact_pos;
+			to[1] = to[1] + 0.1;
+			from = m_FromAdjusted;
+			
+			if (DayZPhysics.RaycastRV(from, to, check_pos, check_dir, check_component, hit_object, null, m_Player, false, false, ObjIntersectFire))
+			{
+				if ((hit_object.Count() > 0)&& (!hit_object[0].IsInherited(Watchtower) || (hit_object[0].IsInherited(Watchtower) && (m_WatchtowerIgnoreComponentNames.Find(hit_object[0].GetActionComponentName(check_component, LOD.NAME_VIEW)) == -1))))
+				{
+					contact_pos = "0 0 0";
+				}
+			}
+		}
+		
+		HideWhenClose(contact_pos);
+
+		return contact_pos;
+	}
+
+	vector HideWhenClose( vector pos )
+	{
+		//if the hologram is too close to player when he looks to the sky, send the projection to away
+		vector cam_dir = GetGame().GetCurrentCameraDirection();
+
+		if( cam_dir[1] > LOOKING_TO_SKY )
+		{
+			pos = "0 0 0";
+		}
+
+		return pos;
+	}
+
+	vector GetProjectionPosition()
+	{
+		if (m_Projection)
+			return m_Projection.GetPosition();
+		
+		return vector.Zero;
+	}
+	
+	vector GetProjectionOrientation()
+	{
+		if (m_Projection)
+			return m_Projection.GetOrientation();
+		
+		return vector.Zero;
+	}
+	
+	vector GetDefaultOrientation()
+	{
+		m_DefaultOrientation = GetGame().GetCurrentCameraDirection().VectorToAngles();
+		m_DefaultOrientation[1] = 0;
+		
+		if (!GetParentEntity().PlacementCanBeRotated())
+		{
+			m_DefaultOrientation = vector.Zero;
+		}
+		
+		return m_DefaultOrientation;
+	}
+
+	int GetHiddenSelection( string selection )
+	{	
+		int idx = m_Projection.GetHiddenSelectionIndex(selection);
+
+		if ( idx != -1 )
+			return idx;
+		else
+			return 0;
+	}
+
+	// the function accepts string
+	void SetSelectionToRefresh( string selection )
+	{
+		m_SelectionsToRefresh.Insert( selection );
+	}
+
+	//overloaded function to accept array of strings
+	void SetSelectionToRefresh(array<string> selection)
+	{
+		foreach (string s : selection)
+			m_SelectionsToRefresh.Insert(s);
+	}
+	
+	void RefreshVisual()
+	{
+		if (m_Projection)
+		{
+			static const string textureName = "#(argb,8,8,3)color(0.5,0.5,0.5,0.75,ca)";
+
+			int hidden_selection 			= 0;
+			string selection_to_refresh;
+			string config_material 			= string.Format("CfgVehicles %1 hologramMaterial", m_Projection.GetType());
+			string hologram_material 		= GetGame().ConfigGetTextOut(config_material);
+			string config_model 			= string.Format("CfgVehicles %1 hologramMaterialPath", m_Projection.GetType());
+			string hologram_material_path 	= string.Format("%1\\%2%3", GetGame().ConfigGetTextOut(config_model), hologram_material, CorrectMaterialPathName());
+			
+			for (int i = 0; i < m_SelectionsToRefresh.Count(); ++i)
+			{
+				selection_to_refresh = m_SelectionsToRefresh.Get(i);
+				hidden_selection = GetHiddenSelection(selection_to_refresh);
+				m_Projection.SetObjectTexture(hidden_selection, textureName);
+				m_Projection.SetObjectMaterial(hidden_selection, hologram_material_path);
+			}
+		}
+	}
+	
+	// Returns correct string to append to material path name
+	string CorrectMaterialPathName()
+	{
+		if (IsColliding() || IsFloating())
+		{
+			return SUFFIX_MATERIAL_UNDEPLOYABLE;
+		}
+		else if (m_Parent.HasEnergyManager())
+		{
+			ComponentEnergyManager comp_em = m_Parent.GetCompEM();
+			string SEL_CORD_PLUGGED = m_Parent.GetCompEM().SEL_CORD_PLUGGED;
+			string SEL_CORD_FOLDED = m_Parent.GetCompEM().SEL_CORD_FOLDED;
+			
+			if (comp_em.IsPlugged() && comp_em.IsEnergySourceAtReach(GetProjectionPosition()))
+			{
+				m_Projection.SetAnimationPhase(SEL_CORD_PLUGGED, 0);
+				m_Projection.SetAnimationPhase(SEL_CORD_FOLDED, 1);	
+				return SUFFIX_MATERIAL_POWERED;
+			}
+			else
+			{
+				m_Projection.SetAnimationPhase(SEL_CORD_PLUGGED, 1);
+				m_Projection.SetAnimationPhase(SEL_CORD_FOLDED, 0);
+			}
+		}
+
+		return SUFFIX_MATERIAL_DEPLOYABLE;
+	}
+	
+	private bool IsRestrictedFromAdvancedPlacing()
+	{
+		if (m_Player.IsJumpInProgress())
+			return true;
+		if (m_Player.IsSwimming())
+			return true;
+		if (m_Player.IsClimbingLadder())
+			return true;
+		if (m_Player.IsRaised())
+			return true;
+		if (m_Player.IsClimbing())
+			return true;
+		if (m_Player.IsRestrained())
+			return true;
+		if (m_Player.IsUnconscious())
+			return true;
+		
+		return false;
+	}
+};
+
+class ProjectionTrigger extends Trigger
+{
+	protected int m_TriggerUpdateMs;
+	protected Hologram m_ParentObj;
+	protected PlayerBase m_Player;
+
+	override void OnEnter( Object obj )
+	{
+		//Print("OnEnter");
+		if ( m_ParentObj )
+		{
+			m_ParentObj.SetIsCollidingPlayer( true );
+			m_TriggerUpdateMs = 50;
+		}
+	}
+
+	override void OnLeave( Object obj )
+	{
+		//Print("OnLeave");
+		if ( m_ParentObj )
+		{
+			m_ParentObj.SetIsCollidingPlayer( false );
+		}
+	}
+
+	override protected void UpdateInsiders(int timeout)
+	{
+		super.UpdateInsiders(m_TriggerUpdateMs);
+	}
+	
+	void SetParentObject( Hologram projection )
+	{
+		m_ParentObj = projection;
+	}
+
+	void SetParentOwner( PlayerBase player )
+	{
+		m_Player = player;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/InjuryHandler.c b/scripts/4_World/DayZ/Classes/InjuryHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..503a4caf2af0cb079d0175c65901714fe6c28ae8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/InjuryHandler.c
@@ -0,0 +1,247 @@
+class InjuryHandlerThresholds
+{
+	const float WORN = 0.5;
+	const float DAMAGED = 0.3;
+	const float BADLY_DAMAGED = 0.2;
+	const float RUINED = 0.1;
+};
+
+class InjuryAnimValues
+{
+	const float LVL0 = 0;
+	const float LVL1 = 0.3;
+	const float LVL2 = 0.6;
+	const float LVL3 = 0.8;
+	const float LVL4 = 1;
+};
+
+enum eInjuryHandlerLevels
+{
+	PRISTINE,
+	WORN,
+	DAMAGED,
+	BADLY_DAMAGED,
+	RUINED,
+}
+
+enum eInjuryOverrides
+{
+	//! MUST BE POW2
+	NONE = 0,
+	MORPHINE = 1,
+	PAIN_KILLERS_LVL0 = 2,
+	PAIN_KILLERS_LVL1 = 4,
+	BROKEN_LEGS = 8, //New
+	BROKEN_LEGS_SPLINT = 16, //New
+	PRONE_ANIM_OVERRIDE = 32, //Prevent non pristine animation when prone
+}
+
+class InjuryAnimationHandler
+{
+
+	const float VALUE_CHECK_INTERVAL	 	= 5;
+	const float SENSITIVTY_PERCENTAGE 		= 1; //how much the value needs to change up/down from previous update to trigger a new update(in percent)
+
+	ref ScriptInvoker m_ChangedStateInvoker	= new ScriptInvoker();
+	
+	float m_TimeSinceLastTick = VALUE_CHECK_INTERVAL + 1;
+	float m_LastUpdate;
+	eInjuryHandlerLevels m_LastHealthUpdate;
+	float m_HealthMaxValue;
+	
+	
+	private PlayerBase m_Player; //! owner
+	private bool m_AnimationChange = false;
+	private bool m_InjuryAnimEnabled = false;
+	private float m_InjuryAnimDamageValue = 0;
+	int m_ForceInjuryAnimMask;
+	
+	void InjuryAnimationHandler(PlayerBase player)
+	{
+		m_Player = player;
+		m_HealthMaxValue = m_Player.GetMaxHealth("", "Health");
+	}
+	
+	bool IsInjuryAnimEnabled()
+	{
+		return m_InjuryAnimEnabled;
+	}
+	
+	float GetInjuryAnimValue()
+	{
+		return m_InjuryAnimDamageValue;
+	}
+	
+	ScriptInvoker GetInvoker()
+	{
+		return m_ChangedStateInvoker;
+	}
+	
+	void Update(float deltaT)
+	{
+		if ( m_AnimationChange )
+		{
+			m_Player.GetCommandModifier_Additives().SetInjured(m_InjuryAnimDamageValue, m_InjuryAnimEnabled);
+			m_AnimationChange = false;
+		}
+
+		if ( GetGame().IsClient() ) 
+			return;
+		
+		m_TimeSinceLastTick += deltaT;
+
+		if ( m_TimeSinceLastTick > VALUE_CHECK_INTERVAL )
+		{
+			CheckValue();
+			m_TimeSinceLastTick = 0;
+		}
+	}
+
+	eInjuryHandlerLevels GetOverrideLevel(eInjuryHandlerLevels unchanged_level)
+	{
+		eInjuryHandlerLevels override_level = unchanged_level;
+		
+		//Whatever the case, prone will always use PRISTINE anim level as alternative anim level(s) are not interesting gameplaywise
+		if ( m_ForceInjuryAnimMask & eInjuryOverrides.PRONE_ANIM_OVERRIDE && override_level > eInjuryHandlerLevels.PRISTINE )
+		{
+			override_level = eInjuryHandlerLevels.PRISTINE;
+			return override_level;
+		}
+		
+		if ( m_ForceInjuryAnimMask & eInjuryOverrides.MORPHINE && override_level > eInjuryHandlerLevels.PRISTINE )
+		{
+			override_level = eInjuryHandlerLevels.PRISTINE;
+		}
+		
+		if ( m_ForceInjuryAnimMask & eInjuryOverrides.PAIN_KILLERS_LVL1 && override_level > eInjuryHandlerLevels.WORN )
+		{
+			override_level = eInjuryHandlerLevels.WORN;
+		}
+		
+		if ( m_ForceInjuryAnimMask & eInjuryOverrides.PAIN_KILLERS_LVL0 && override_level > eInjuryHandlerLevels.DAMAGED )
+		{
+			override_level = eInjuryHandlerLevels.DAMAGED;
+		}
+		
+		if ( m_ForceInjuryAnimMask && override_level > eInjuryHandlerLevels.DAMAGED )
+		{
+			override_level = eInjuryHandlerLevels.RUINED;
+		}
+		
+		//Broken leg overrides
+		if ( m_ForceInjuryAnimMask & eInjuryOverrides.BROKEN_LEGS_SPLINT && override_level < eInjuryHandlerLevels.DAMAGED )
+		{
+			override_level = eInjuryHandlerLevels.DAMAGED;
+		}
+		
+		if ( m_ForceInjuryAnimMask & eInjuryOverrides.BROKEN_LEGS && override_level < eInjuryHandlerLevels.RUINED )
+		{
+			//Average leg health used to determine which animation to use
+			float avgLegHealth = m_Player.GetHealth("RightLeg","") + m_Player.GetHealth("LeftLeg","") + m_Player.GetHealth("RightFoot","") + m_Player.GetHealth("LeftFoot","");
+			avgLegHealth *= 0.25; //divide by 4 to make the average leg health;
+			if (avgLegHealth <= PlayerConstants.BROKEN_LEGS_LOW_HEALTH_THRESHOLD)
+				override_level = eInjuryHandlerLevels.RUINED;
+			else if (avgLegHealth >= PlayerConstants.BROKEN_LEGS_HIGH_HEALTH_THRESHOLD)
+				override_level = eInjuryHandlerLevels.WORN;
+			else
+				override_level = eInjuryHandlerLevels.DAMAGED;
+		}
+		
+		return override_level;
+	
+	}
+	
+	void CheckValue(bool forceUpdate = false)
+	{
+		float health_current_normalized = m_Player.GetHealth("","Health") / m_HealthMaxValue;
+		eInjuryHandlerLevels injury_level = GetInjuryLevel(health_current_normalized);
+		
+		if ( m_ForceInjuryAnimMask )
+		{
+			injury_level = GetOverrideLevel(injury_level);
+		}
+		
+		if ( m_LastHealthUpdate != injury_level || forceUpdate )
+		{
+			SendValue(injury_level);
+			m_ChangedStateInvoker.Invoke(injury_level);
+			m_LastHealthUpdate = injury_level;
+			Synchronize(injury_level);
+		}
+	}
+	
+	void Synchronize(eInjuryHandlerLevels level)
+	{
+		m_Player.m_HealthLevel = level;
+		//Print("m_Player.m_HealthLevel:" + m_Player.m_HealthLevel);
+		m_Player.SetSynchDirty();
+	}
+
+	void SendValue(eInjuryHandlerLevels level)
+	{
+		DayZPlayerSyncJunctures.SendInjury(m_Player, true, level);
+	}
+	
+	void SetInjuryCommandParams(bool enable, eInjuryHandlerLevels level)
+	{
+		m_AnimationChange = true;
+		m_InjuryAnimEnabled = enable;
+		m_InjuryAnimDamageValue = GetInjuryValue(level);
+	}
+	
+	eInjuryHandlerLevels GetInjuryLevel(float health)
+	{
+		if ( health  < InjuryHandlerThresholds.RUINED ) 
+		{
+			return eInjuryHandlerLevels.RUINED;
+		}
+		
+		if ( health  < InjuryHandlerThresholds.BADLY_DAMAGED ) 
+		{
+			return eInjuryHandlerLevels.BADLY_DAMAGED;
+		}
+		
+		if ( health  < InjuryHandlerThresholds.DAMAGED ) 			
+		{
+			return eInjuryHandlerLevels.DAMAGED;
+		}
+		
+		if ( health  < InjuryHandlerThresholds.WORN ) 		
+		{
+			return eInjuryHandlerLevels.WORN;
+		}
+		
+		return eInjuryHandlerLevels.PRISTINE;
+	}
+	
+	
+	float GetInjuryValue(eInjuryHandlerLevels level)
+	{
+		switch ( level )
+		{
+			case eInjuryHandlerLevels.RUINED:
+			{
+				return InjuryAnimValues.LVL4;
+			}
+			case eInjuryHandlerLevels.BADLY_DAMAGED:
+			{
+				return InjuryAnimValues.LVL3;
+			}
+			case eInjuryHandlerLevels.DAMAGED:
+			{
+				return InjuryAnimValues.LVL2;
+			}
+			case eInjuryHandlerLevels.WORN:
+			{
+				return InjuryAnimValues.LVL1;
+			}
+			case eInjuryHandlerLevels.PRISTINE:
+			{
+				return InjuryAnimValues.LVL0;
+			}
+			default:
+				Error("Undefined Injury level");
+		}
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/IntroSceneCharacter.c b/scripts/4_World/DayZ/Classes/IntroSceneCharacter.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff346099ca6b235f8f20f59f496ba99565bc832d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/IntroSceneCharacter.c
@@ -0,0 +1,480 @@
+class IntroSceneCharacter extends Managed
+{
+	protected int			m_CharacterId;
+	protected string		m_CharacterType;
+	protected MenuData		m_CharacterDta;
+	protected PlayerBase	m_CharacterObj;
+	protected vector		m_CharacterPos;
+	protected vector		m_CharacterRot;
+		
+	protected ref TStringArray 	m_CharGenderList				= new TStringArray;
+	protected ref TStringArray	m_CharShirtList					= new TStringArray; //legacy
+	protected ref TStringArray 	m_CharPantsList					= new TStringArray; //legacy
+	protected ref TStringArray	m_CharShoesList					= new TStringArray; //legacy
+	
+	protected ref map<ECharGender, ref array<string>> m_Characters = new map<ECharGender, ref array<string>>;
+	
+	protected ECharGender		m_CharGender;
+	
+	void IntroSceneCharacter()
+	{
+		m_CharacterId = GameConstants.DEFAULT_CHARACTER_MENU_ID;
+	}
+	
+	void ~IntroSceneCharacter()
+	{
+		CharacterUnload();
+	}
+	
+	bool IsDefaultCharacter()
+	{
+		return m_CharacterId == GameConstants.DEFAULT_CHARACTER_MENU_ID;
+	}
+	
+	void SetToDefaultCharacter()
+	{
+		m_CharacterId = GameConstants.DEFAULT_CHARACTER_MENU_ID;
+	}
+	//==============================================
+	// SetcharacterID
+	//==============================================
+	void SetCharacterID(int char_id)
+	{
+		m_CharacterId = char_id;
+	}
+	
+	//==============================================
+	// GetCharacterID
+	//==============================================
+	int GetCharacterID()
+	{
+		return m_CharacterId;
+	}
+	
+	//==============================================
+	// GetCharacterObj
+	//==============================================
+	PlayerBase GetCharacterObj()
+	{
+		return m_CharacterObj;
+	}
+	
+	//==============================================
+	// GetCharGenderList	
+	//==============================================
+	TStringArray GetCharGenderList()
+	{
+		return m_CharGenderList;
+	}
+	
+	//==============================================
+	// GetCharGenderList	
+	//==============================================
+	TStringArray GetCharList(ECharGender gender)
+	{
+		return m_Characters[gender];
+	}
+	
+	//==============================================
+	// GetCharShirtsList
+	//==============================================
+	TStringArray GetCharShirtsList()
+	{
+		return m_CharShirtList;
+	}
+	
+	//==============================================
+	// GetCharPantsList
+	//==============================================
+	TStringArray GetCharPantsList()
+	{
+		return m_CharPantsList;
+	}
+	
+	//==============================================
+	// GetCharShoesList
+	//==============================================
+	TStringArray GetCharShoesList()
+	{
+		return m_CharShoesList;
+	}
+	
+	//==============================================
+	// SetCharacterGender
+	//==============================================
+	void SetCharacterGender(ECharGender gender)
+	{
+		m_CharGender = gender;
+	}
+	
+	//==============================================
+	// IsCharacterFemale
+	//==============================================
+	bool IsCharacterFemale()
+	{
+		return ( m_CharGender == ECharGender.Female );
+	}
+	
+	//==============================================
+	// SetCharacterGender
+	//==============================================
+	ECharGender GetCharacterGender()
+	{
+		return m_CharGender;
+	}
+	
+	//==============================================
+	// GetPosition
+	//==============================================
+	vector GetPosition()
+	{
+		return m_CharacterObj.GetPosition();
+	}
+	
+	//==============================================
+	// GetNextCharacterID
+	//==============================================
+	int GetNextCharacterID()
+	{
+		int count = m_CharacterDta.GetCharactersCount();
+		
+		if ( count == 0 )
+		{	
+			return -1;
+		}
+		
+		if ( m_CharacterId + 1 < count )
+		{
+			return m_CharacterId + 1;
+		}
+		else
+		{
+			return -1;
+		}
+	}
+	
+	//==============================================
+	// GetPrevCharacterID
+	//==============================================
+	int GetPrevCharacterID()
+	{
+		int count = m_CharacterDta.GetCharactersCount();
+		
+		if ( count == 0 )
+		{
+			return -1;
+		}
+		
+		if ( m_CharacterId > -1 )
+		{
+			return m_CharacterId - 1;
+		}
+		
+		return count - 1;
+	}
+	
+	//==============================================
+	// CreateNewCharacterRandom
+	//==============================================
+	void CreateNewCharacterRandom()
+	{
+		// Select random gender
+		SetCharacterGender( Math.RandomInt(0, 2) );
+		
+		// Select random character skin (class name)
+		string char_name_random = m_Characters[GetCharacterGender()].GetRandomElement();
+		
+		// Create new character
+		CreateNewCharacterByName( char_name_random );
+	}
+	
+	//==============================================
+	// CreateNewCharacterById
+	//==============================================
+	void CreateNewCharacterById( int character_id )
+	{
+		if ( character_id == GameConstants.DEFAULT_CHARACTER_MENU_ID )
+		{
+			CreateDefaultCharacter();
+		}
+		else
+		{
+			CharacterLoad( character_id, m_CharacterPos, m_CharacterRot );
+		}
+	}
+	
+	//==============================================
+	// CreateNewCharacterByName
+	//==============================================
+	void CreateNewCharacterByName( string character_name, bool randomize_equip = true )
+	{
+		m_CharacterType = character_name;
+		GetGame().GetMenuDefaultCharacterData().SetCharacterType(m_CharacterType);
+		if (randomize_equip)
+			GetGame().GetMenuDefaultCharacterData().GenerateRandomEquip();
+		
+		CreateNewCharacter();
+	}
+	
+	void CreateDefaultCharacter()
+	{
+		CharacterUnload();
+		//m_CharacterDta.RequestGetDefaultCharacterData();
+		m_CharacterType = GetGame().GetMenuDefaultCharacterData().GetCharacterType();
+		if (m_CharacterType != "")
+		{
+			CreateNewCharacter();
+		}
+		
+		if(m_CharacterObj)
+		{
+			m_CharacterObj.PlaceOnSurface();
+			m_CharacterObj.SetPosition(m_CharacterPos);
+			m_CharacterObj.SetOrientation(m_CharacterRot);
+		}
+		else
+		{
+			string default_name = Widget.TranslateString( GameConstants.DEFAULT_CHARACTER_NAME );
+			CreateNewCharacterRandom();
+			//m_CharacterDta.SetCharacterName(GameConstants.DEFAULT_CHARACTER_MENU_ID, default_name);
+			GetGame().GetMenuDefaultCharacterData().SetCharacterName(GameConstants.DEFAULT_CHARACTER_NAME);
+		}
+	}
+	
+	void GetLastPlayedServer(int characterID, out string address, out string name, out int port)
+	{
+		m_CharacterDta.GetLastServerAddress(characterID,address);
+		port = m_CharacterDta.GetLastServerPort(characterID);
+		m_CharacterDta.GetLastServerName(characterID,name);
+	}
+	//==============================================
+	// CreateNewCharacter
+	//==============================================
+	void CreateNewCharacter()
+	{
+		// Unload old character (if exist)
+		CharacterUnload();
+		
+		// Create Character
+		m_CharacterObj = PlayerBase.Cast(g_Game.CreateObjectEx(m_CharacterType, m_CharacterPos, ECE_PLACE_ON_SURFACE));
+		
+		if (m_CharacterObj)
+		{
+			m_CharacterObj.PlaceOnSurface();
+			m_CharacterObj.SetOrientation(m_CharacterRot);
+			GetGame().GetMenuDefaultCharacterData().EquipDefaultCharacter(m_CharacterObj);
+		}
+		
+		//Create New Random Character
+		SetupPlayerName( true );
+	}
+	
+	//! Generates random equip for the new IntroSceneCharacter, whatever is defined in 'cfgCharacterCreation'
+	/*void EquipNewCharacter()
+	{
+		int slot_ID;
+		string attachment_type;
+		for (int i = 0; i < DefaultCharacterCreationMethods.GetAttachmentSlotsArray().Count(); i++)
+		{
+			slot_ID = DefaultCharacterCreationMethods.GetAttachmentSlotsArray().Get(i);
+			if (DefaultCharacterCreationMethods.GetConfigArrayCountFromSlotID(slot_ID) > 0)
+			{
+				attachment_type = DefaultCharacterCreationMethods.GetConfigAttachmentTypes(slot_ID).GetRandomElement();
+				if (attachment_type != "")
+					SetAttachment(attachment_type,slot_ID);
+			}
+		}
+	}*/
+	
+	//==============================================
+	// LoadCharacterData
+	//==============================================
+	void LoadCharacterData(vector char_pos, vector char_rot, bool default_char = false)
+	{
+		m_CharacterDta = g_Game.GetMenuData();
+		m_CharacterPos = char_pos;
+		m_CharacterRot = char_rot;
+		
+		if (!default_char && m_CharacterDta.GetLastPlayedCharacter() > -1 )
+		{
+			m_CharacterId = m_CharacterDta.GetLastPlayedCharacter();
+			m_CharacterDta.GetCharacterName(m_CharacterId, g_Game.GetPlayerGameName());
+		}
+		
+		// Load all avalible options for character creation; mostly legacy stuff
+		g_Game.ConfigGetTextArray("cfgCharacterCreation" + " gender",	m_CharGenderList);
+		g_Game.ConfigGetTextArray("cfgCharacterCreation" + " top",		m_CharShirtList);
+		g_Game.ConfigGetTextArray("cfgCharacterCreation" + " bottom",	m_CharPantsList);
+		g_Game.ConfigGetTextArray("cfgCharacterCreation" + " shoe",		m_CharShoesList);
+
+		// Init character table
+		m_Characters.Clear();
+		m_Characters.Insert( ECharGender.Male,		new array<string> );
+		m_Characters.Insert( ECharGender.Female,	new array<string> );
+		
+		// Sort character by Gender
+		TStringArray characters = GetGame().ListAvailableCharacters();
+		for (int i = 0; i < characters.Count(); i++)
+		{
+			string char_cfg_name = characters.Get(i);
+			if ( GetGame().IsKindOf(char_cfg_name, "SurvivorMale_Base") )
+			{
+				m_Characters[ECharGender.Male].Insert( char_cfg_name );
+			}
+			else
+			{
+				m_Characters[ECharGender.Female].Insert( char_cfg_name );
+			}
+		}
+		
+		CreateNewCharacterById(m_CharacterId/*, m_CharacterPos, m_CharacterRot*/);
+		
+		if (GetCharacterObj() )
+		{
+			if ( GetCharacterObj().IsMale() )
+				SetCharacterGender(ECharGender.Male);
+			else
+				SetCharacterGender(ECharGender.Female);
+		}
+	}
+	
+	//-------------------------
+	// CharacterUnload
+	//-------------------------
+	protected void CharacterUnload()
+	{
+		if ( m_CharacterObj )
+		{
+			g_Game.ObjectDelete(m_CharacterObj);
+			m_CharacterObj = NULL;
+		}
+	}
+
+	//-------------------------
+	// CharacterLoad
+	//-------------------------
+	protected void CharacterLoad( int character_id, vector char_pos, vector char_rot )
+	{
+		if ( character_id == -1 )
+		{
+			Error("IntroSceneCharacter->CharacterLoad: character_id = "+ character_id +" Cant Load Character!!!");
+			return;
+		}
+		
+		CharacterUnload();
+		
+		SetCharacterID( character_id );
+				
+		m_CharacterObj = PlayerBase.Cast( m_CharacterDta.CreateCharacterPerson( character_id ) );
+		
+		if ( m_CharacterObj )
+		{
+			
+			m_CharacterObj.PlaceOnSurface();
+			m_CharacterObj.SetPosition(char_pos);
+			m_CharacterObj.SetOrientation(char_rot);	
+		}	
+	}
+	
+	//-------------------------
+	// SetupPlayerName
+	//-------------------------
+	protected void SetupPlayerName( bool new_name )
+	{
+		string name = GameConstants.DEFAULT_CHARACTER_NAME;		
+		
+#ifdef PLATFORM_CONSOLE
+		BiosUserManager user_manager = GetGame().GetUserManager();
+		if( user_manager )
+		{
+			BiosUser user = user_manager.GetSelectedUser();
+			if( user )
+			{
+				name = user.GetName();
+			}
+		}
+#else
+		if ( !new_name )
+		{
+			m_CharacterDta.GetCharacterName(m_CharacterId, name);
+		}
+#endif
+		
+		g_Game.SetPlayerGameName(name);
+	}
+	
+	//==============================================
+	// SetAttachment
+	//==============================================
+	void SetAttachment(string type, int slot)
+	{
+		if ( !m_CharacterObj )
+		{
+			return;
+		}
+		
+		g_Game.ObjectDelete(m_CharacterObj.GetInventory().FindAttachment(slot));
+		
+		EntityAI entity = EntityAI.Cast( g_Game.CreateObjectEx(type, m_CharacterObj.GetPosition(), ECE_PLACE_ON_SURFACE) );
+		
+		if (entity)
+		{
+			m_CharacterObj.LocalTakeEntityAsAttachmentEx(entity, slot);
+		}
+	}
+	
+	string GetCharacterNameById(int char_id )
+	{
+		string character_name;
+		if (char_id == GameConstants.DEFAULT_CHARACTER_MENU_ID)
+		{
+			character_name = GetGame().GetMenuDefaultCharacterData().GetCharacterName();
+		}
+		else
+		{
+			m_CharacterDta.GetCharacterName(char_id, character_name);
+		}
+		return character_name;
+	}
+	
+	string GetCharacterName()
+	{
+		string character_name;
+		if (IsDefaultCharacter())
+		{
+			character_name = GetGame().GetMenuDefaultCharacterData().GetCharacterName();
+		}
+		else
+		{
+			m_CharacterDta.GetCharacterName(m_CharacterId, character_name);
+		}
+		return character_name;
+	}
+	
+	//==============================================
+	// SaveCharName
+	//==============================================
+	void SaveCharName( string name )
+	{
+		if (IsDefaultCharacter())
+		{
+			GetGame().GetMenuDefaultCharacterData().SetCharacterName(name);
+		}
+		else
+		{
+			m_CharacterDta.SetCharacterName(m_CharacterId, name);
+		}
+		m_CharacterDta.SaveCharactersLocal();
+	}
+	
+	//==============================================
+	// SaveDefaultCharacter
+	//==============================================
+	void SaveDefaultCharacter()
+	{
+		//if (m_CharacterObj)
+		{
+			m_CharacterDta.RequestSetDefaultCharacterData();
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/InventoryActionHandler.c b/scripts/4_World/DayZ/Classes/InventoryActionHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..68f596676c8fdaff91ea9fda8bef3398b490d101
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/InventoryActionHandler.c
@@ -0,0 +1,124 @@
+//! Client only - manage set up crafting on client 
+class InventoryActionHandler
+{
+	ActionBase m_action;
+	ActionTarget m_target;
+	ItemBase m_mainItem;
+	bool 	m_useItemInHands;
+
+	PlayerBase m_player;
+	
+	bool m_isActive;
+	vector m_actionStartPos;
+	
+	const float MIN_DISTANCE_TO_INTERRUPT = 1.0;	
+	const int IAH_SINGLE_USE = 1;
+	const int IAH_CONTINUOUS = 2;
+
+
+	void InventoryActionHandler(PlayerBase player)
+	{
+		m_player = player;
+		m_isActive = false;
+		m_action = null;
+		m_target = null;
+		m_mainItem = null;
+		m_useItemInHands = false;
+
+	}
+	
+	void SetAction(ActionBase action, ItemBase target_item, ItemBase main_item )
+	{
+		Object target_parent = null;
+		if(target_item)
+		{
+			target_parent = target_item.GetHierarchyParent();
+		}
+		ActionTarget at = new ActionTarget(target_item, target_parent, -1, vector.Zero, -1);
+		
+		SetAction(action, at, main_item );
+	}
+	
+	void SetAction(ActionBase action, ActionTarget target, ItemBase main_item )
+	{
+		ActionManagerClient mngr;
+		Class.CastTo(mngr, m_player.GetActionManager());
+		
+		m_action = action;
+		m_target = target;
+		m_mainItem = main_item;
+		
+		ItemBase itemInHand = m_player.GetItemInHands();
+		m_useItemInHands = main_item == itemInHand;
+		
+		m_actionStartPos = m_player.GetPosition();
+		m_isActive = true;
+		
+		//mngr.InjectAction( action, target, main_item );
+		mngr.ForceTarget(m_target.GetObject());
+		
+		GetGame().GetMission().HideInventory();
+	}	
+	
+	bool IsActiveAction()
+	{
+		return m_isActive;
+	}
+	
+	void OnUpdate()
+	{
+		
+		if( !m_isActive ) return;
+		
+		if( m_player.IsRaised() || m_player.GetCommand_Melee() )
+		{
+			DeactiveAction();
+			return;			
+		}
+		
+		if( GetGame().IsInventoryOpen() )
+		{
+			DeactiveAction();
+			return;				
+		}
+
+		if (m_useItemInHands)
+		{
+			ItemBase handItem = m_player.GetItemInHands();
+		
+			if( handItem != m_mainItem )
+			{
+				DeactiveAction();
+				return;
+			}
+		}
+			
+		if( Math.AbsFloat( vector.Distance(m_actionStartPos, m_player.GetPosition())) > MIN_DISTANCE_TO_INTERRUPT )
+		{
+			DeactiveAction();
+			return;
+		}
+		
+		
+	}
+
+	void DeactiveAction()
+	{
+		if( !m_isActive ) return;
+		
+		m_isActive = false;
+		
+		ActionManagerClient mngr;
+		Class.CastTo(mngr, m_player.GetActionManager());
+	
+		mngr.EjectAction(m_action);
+		mngr.ClearForceTarget();
+		
+		m_player.GetCraftingManager().ResetInventoryCraft();
+		
+		m_action = null;
+		m_target = null;
+		m_mainItem = null;
+		m_useItemInHands = false;	
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/KeyBinding.c b/scripts/4_World/DayZ/Classes/KeyBinding.c
new file mode 100644
index 0000000000000000000000000000000000000000..64af91d14a9fdf80052d4259b905e7a95de7a7b4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/KeyBinding.c
@@ -0,0 +1,56 @@
+class KeyBinding
+{
+	private int		m_ActiveUIMenuID;
+	private int		m_Key1;
+	private int		m_Key2;	
+	private string	m_CallbackTarget;
+	private string	m_CallbackFunction;
+	private string	m_InfoKeys;
+	private string	m_InfoDescription
+	
+	void KeyBinding( int ui_id, int key1, int key2, string call_target, string call_function, string info_bind, string info_description )
+	{
+		m_ActiveUIMenuID	= ui_id;
+		m_Key1				= key1;
+		m_Key2				= key2;
+		m_CallbackTarget	= call_target;
+		m_CallbackFunction	= call_function;
+		m_InfoKeys			= info_bind;
+		m_InfoDescription	= info_description;
+	}
+	
+	int GetUIMenuID()
+	{
+		return m_ActiveUIMenuID;
+	}
+	
+	int GetKey1()
+	{
+		return m_Key1;
+	}
+	
+	int GetKey2()
+	{
+		return m_Key2;
+	}
+	
+	string GetCallbackTarget()
+	{
+		return m_CallbackTarget;
+	}
+	
+	string GetCallbackFunction()
+	{
+		return m_CallbackFunction;
+	}
+	
+	string GetInfoBind()
+	{
+		return m_InfoKeys;
+	}
+	
+	string GetInfoDescription()
+	{
+		return m_InfoDescription;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/KuruShake.c b/scripts/4_World/DayZ/Classes/KuruShake.c
new file mode 100644
index 0000000000000000000000000000000000000000..c0f2d8d80f8859279a0cc936f7273026102f37e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/KuruShake.c
@@ -0,0 +1,78 @@
+class KuruShake
+{
+	const float RANDOM_RANGE_POINT = 1;
+	const float RANDOM_RANGE_DEVIATION = 0.50;
+	const float SHAKE_DURATION_PHASE1 = 0.01;
+	const float SHAKE_STRENGTH_MIN = 1;
+	const float SHAKE_STRENGTH_MAX = 5;
+	
+	PlayerBase m_Player;
+	float m_Time;
+	float m_Time2;
+	float m_RelativeTime;
+	float m_RelativeTime2;
+	float m_ShakeStrength;
+	
+	
+	ref array<vector> m_Curve = new array<vector>;
+	
+	void KuruShake(PlayerBase player, float amount)
+	{
+		
+		vector pos1;
+		int seed = Math.Randomize(player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSGeneric,0,10000));
+		Math.RandomFloat(-RANDOM_RANGE_POINT,RANDOM_RANGE_POINT);//throw away
+		m_ShakeStrength = Math.Lerp(SHAKE_STRENGTH_MIN, SHAKE_STRENGTH_MAX, amount);
+		pos1[0] = Math.RandomFloat(-RANDOM_RANGE_POINT,RANDOM_RANGE_POINT);
+		pos1[1] = Math.RandomFloat(-RANDOM_RANGE_POINT,RANDOM_RANGE_POINT);
+		pos1.Normalize();
+		pos1 = pos1 * m_ShakeStrength;
+		
+		vector pos2;
+		pos2[0] = pos1[0] + Math.RandomFloat(-RANDOM_RANGE_DEVIATION,RANDOM_RANGE_DEVIATION) + pos1[0];
+		pos2[1] = pos1[1] + Math.RandomFloat(-RANDOM_RANGE_DEVIATION,RANDOM_RANGE_DEVIATION) + pos1[1];
+		m_Curve.Insert("0 0 0");
+		m_Curve.Insert(pos1);
+		m_Curve.Insert(pos2);
+		
+		/*
+		Print("==========================");
+		for(int i = 0; i < m_Curve.Count(); i++)
+		{
+			Print(m_Curve[i]);
+		}
+		Print("==========================");
+		*/
+	}
+	
+	void Update(float delta_time, out float pos_x, out float pos_y )
+	{
+		if(m_RelativeTime < 0.99)
+		{
+			m_Time += delta_time;
+			m_RelativeTime = Math.InverseLerp(0, SHAKE_DURATION_PHASE1, m_Time);
+			//m_RelativeTime = m_RelativeTime - 0.01;
+			m_RelativeTime = Easing.EaseInQuint(m_RelativeTime);
+			vector pos = Math3D.Curve(ECurveType.CatmullRom, m_RelativeTime, m_Curve);
+			pos_x = pos[0];
+			pos_y = pos[1];
+		}
+		else
+		{
+			m_Time2 += delta_time * 1;
+			m_RelativeTime2 = 1 -  m_Time2;
+			m_RelativeTime2 = Easing.EaseInQuint(m_RelativeTime2);
+			vector pos2 = Math3D.Curve(ECurveType.CatmullRom, m_RelativeTime2, m_Curve);
+			pos_x = pos2[0];
+			pos_y = pos2[1];
+		}
+		
+		if(m_Time2 >= 0.99)
+		{
+			delete this;
+		}
+	}
+
+	
+			
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/LifespanLevel.c b/scripts/4_World/DayZ/Classes/LifespanLevel.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3ea2a47fed64f7c17c8ab3b57f53c7dd0923d92
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/LifespanLevel.c
@@ -0,0 +1,36 @@
+class LifespanLevel
+{
+	protected int m_Level;
+	protected float m_Threshold;
+	protected string m_TextureName;
+	protected string m_MaterialName;
+
+
+	void LifespanLevel( int level, float threshold, string texture_name, string material_name )
+	{
+		m_Level = level;
+		m_Threshold = threshold;
+		m_TextureName = texture_name;
+		m_MaterialName = material_name;
+	}
+
+	int GetLevel()
+	{
+		return m_Level;
+	}
+
+	float GetThreshold()
+	{
+		return m_Threshold;
+	}
+
+	string GetTextureName()
+	{
+		return m_TextureName;
+	}
+
+	string GetMaterialName()
+	{
+		return m_MaterialName;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/MeleeTargeting.c b/scripts/4_World/DayZ/Classes/MeleeTargeting.c
new file mode 100644
index 0000000000000000000000000000000000000000..dfcc18ad8207ba1a3c00e98640044b463175b468
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/MeleeTargeting.c
@@ -0,0 +1,290 @@
+class MeleeTargetData
+{	
+	Object Obj;
+	vector HitPos;
+	int HitComponent;
+	
+	void MeleeTargetData(Object o, vector p, int c)
+	{
+		Obj = o;
+		HitPos = p;
+		HitComponent = c;
+	}
+}
+
+class MeleeTargetSettings
+{
+	vector ConeOrigin;
+	float ConeLength;
+	float ConeHalfAngle;
+	float ConeHalfAngleRad;
+	float ConeMinHeight;
+	float ConeMaxHeight;
+	
+	vector ConeLeftPoint;
+	vector ConeRightPoint;
+	
+	vector RayStart;
+	vector RayEnd;
+	vector Dir;
+	vector XZDir;
+	float MaxDist;
+	
+	EntityAI Attacker;
+	ref array<typename> TargetableObjects
+	
+	void MeleeTargetSettings(vector coneOrigin, float coneLength, float coneHalfAngle, float coneMinHeight, float coneMaxHeight, vector rayStart, vector dir, float maxDist, EntityAI pToIgnore, array<typename> targetableObjects)
+	{
+		ConeOrigin 			= coneOrigin;
+		ConeLength 			= coneLength;
+		ConeHalfAngle 		= coneHalfAngle;
+		ConeHalfAngleRad 	= Math.DEG2RAD * coneHalfAngle;
+		ConeMinHeight 		= coneMinHeight;
+		ConeMaxHeight 		= coneMaxHeight;
+		
+		RayStart 			= rayStart;
+		RayEnd 				= rayStart + Math.SqrFloat(coneLength) * dir;
+		
+		Dir 				= dir; 
+		
+		XZDir 				= dir;
+		XZDir[1] 			= 0;
+		XZDir.Normalize();
+		
+		MaxDist 			= maxDist;
+		
+		Attacker 			= pToIgnore;
+		TargetableObjects 	= targetableObjects;
+		
+		// Calculate cone points
+		Math3D.ConePoints(ConeOrigin, ConeLength, ConeHalfAngleRad, -Math.Atan2(XZDir[0], XZDir[2]), ConeLeftPoint, ConeRightPoint);
+	}
+}
+
+class ComponentResult
+{
+	vector ComponentPos;
+	float ComponentAngle;
+	float ComponentDistance2;
+	int ComponentIdx;
+}
+
+class MeleeTargeting
+{
+	const static PhxInteractionLayers MELEE_TARGET_OBSTRUCTION_LAYERS = PhxInteractionLayers.BUILDING|PhxInteractionLayers.DOOR|PhxInteractionLayers.VEHICLE|PhxInteractionLayers.ROADWAY|PhxInteractionLayers.TERRAIN|PhxInteractionLayers.ITEM_SMALL|PhxInteractionLayers.ITEM_LARGE|PhxInteractionLayers.FENCE;
+	
+	MeleeTargetData GetMeleeTargetEx(MeleeTargetSettings settings, out array<Object> allTargets = null, array<string> blacklistedDamageZones = null)
+	{
+		MeleeTargetData ret;
+		
+		// Easier access to MeleeTargetSettings variables
+		vector 	coneOrigin 					= settings.ConeOrigin;
+		float 	coneLength 					= settings.ConeLength;
+		float 	coneHalfAngle 				= settings.ConeHalfAngle;
+		float	radAngle 					= settings.ConeHalfAngleRad;
+		float 	coneMinHeight 				= settings.ConeMinHeight;
+		float 	coneMaxHeight 				= settings.ConeMaxHeight;
+		
+		vector coneLeft 					= settings.ConeLeftPoint;
+		vector coneRight 					= settings.ConeRightPoint;
+		
+		vector rayStart 					= settings.RayStart;
+		vector rayEnd 						= settings.RayEnd;
+		vector dir 							= settings.Dir;
+		vector xzDir 						= settings.XZDir;
+		float maxDist 						= settings.MaxDist;
+		
+		EntityAI pToIgnore 					= settings.Attacker;
+		array<typename> targetableObjects 	= settings.TargetableObjects;
+		
+		// Calculate box size
+		float boxWidth = vector.Distance(coneLeft, coneRight);		
+		float boxHeight = coneMaxHeight - coneMinHeight;
+		
+		vector boxSize = Vector(boxWidth, boxHeight, coneLength);
+		
+		// Calculate box center
+		vector centerHeight = Vector(0, Math.Lerp(coneMinHeight, coneMaxHeight, 0.5), 0);
+		vector offset = xzDir * coneLength * 0.5;
+		vector boxCenter = coneOrigin + offset + centerHeight;
+		
+		// Gather all targets
+		BoxCollidingParams params = new BoxCollidingParams();
+		params.SetParams(boxCenter, xzDir.VectorToAngles(), boxSize, ObjIntersect.Fire, ObjIntersect.Fire, true);
+		array<ref BoxCollidingResult> results = new array<ref BoxCollidingResult>;
+		array<Object> toIgnore = { pToIgnore };
+		if (GetGame().IsBoxCollidingGeometryProxy(params, toIgnore, results))
+		{
+			//
+			float 	retVal 	= float.MAX;
+			float 	tgAngle = Math.Tan(radAngle);	
+		
+			#ifdef DIAG_DEVELOPER
+			if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DRAW_RANGE) && DiagMenu.GetBool(DiagMenuIDs.MELEE_DEBUG))
+				Debug.DrawLine(rayStart, rayEnd, COLOR_GREEN, ShapeFlags.ONCE);
+			#endif
+			
+			// Find the most suitable target
+			foreach (BoxCollidingResult bResult : results)
+			{
+				Object obj = bResult.obj;
+				
+				// Check for targetable objects
+				if (!obj.IsAnyInherited(targetableObjects) || !obj.IsAlive())
+				{
+					continue;
+				}
+				
+				// Ready the defaults for the object
+				vector targetPos = obj.GetPosition();							
+				float targetAngle = Math.RAD2DEG * Math.AbsFloat(Math3D.AngleFromPosition(coneOrigin, dir, targetPos));	
+				float targetDistance2 = vector.DistanceSq(targetPos, Math3D.NearestPoint(rayStart, rayEnd, targetPos));	
+				int hitComponent = -1;
+
+				float csSum = float.MAX;
+				
+				// Find the most suitable component
+				ComponentResult result;
+				if (FindMostSuitableComponentEx(obj, bResult, settings, csSum, result, blacklistedDamageZones))
+				{
+					targetPos 		= result.ComponentPos;
+					targetAngle 	= result.ComponentAngle;
+					targetDistance2 = result.ComponentDistance2;
+					hitComponent 	= result.ComponentIdx;
+				}
+
+				// ProxyInfo
+				if (bResult.proxyInfo)
+				{
+					foreach (BoxCollidingResult pInfo : bResult.proxyInfo)
+					{
+						if (FindMostSuitableComponentEx(obj, pInfo, settings, csSum, result, blacklistedDamageZones))
+						{
+							targetPos 		= result.ComponentPos;							
+							targetAngle 	= result.ComponentAngle;	
+							targetDistance2 = result.ComponentDistance2;	
+							hitComponent 	= result.ComponentIdx;
+						}
+					}
+				}
+				
+				// No suitable component found
+				if (hitComponent == -1 || csSum == float.MAX)
+				{
+					continue;
+				}
+
+				// Check if it is a better fit than what has been found previously
+				float sum  = targetDistance2;
+				if (sum < retVal)
+				{
+					ret 	= new MeleeTargetData(obj, targetPos, hitComponent);
+					retVal 	= sum;
+				}
+	
+				allTargets.Insert(obj);
+			}
+		}
+		
+		return ret;
+	}
+	
+	MeleeTargetData GetMeleeTarget(MeleeTargetSettings settings, out array<Object> allTargets = null)
+	{
+		return GetMeleeTargetEx(settings, allTargets);
+	}
+	
+
+	bool FindMostSuitableComponentEx(Object obj, BoxCollidingResult bResult, MeleeTargetSettings settings, out float sum, out ref ComponentResult result, array<string> blacklistedDamageZones)
+	{
+		foreach (ComponentInfo cInfo : bResult.componentInfo)
+		{
+			ComponentResult cResult = new ComponentResult;
+			
+			if (!EvaluateComponentEx(obj, cInfo, settings, cResult, blacklistedDamageZones))
+			{
+				continue;
+			}
+			
+			// Smallest number is a winner
+			float cSum = cResult.ComponentDistance2;
+			if (cSum < sum)
+			{
+				sum = cSum;				
+				result = cResult;				
+			}
+		}
+		
+		return result != null;
+	}
+
+	bool FindMostSuitableComponent(Object obj, BoxCollidingResult bResult, MeleeTargetSettings settings, out float sum, out ref ComponentResult result)
+	{
+		return FindMostSuitableComponentEx(obj, bResult, settings, sum, result, null);
+	}
+	
+	bool EvaluateComponentEx(Object obj, ComponentInfo cInfo, MeleeTargetSettings settings, out ref ComponentResult result, array<string> blacklistedDamageZones)
+	{
+		//! check if the component is on blacklist, if so, continue in lookup
+		foreach (string zoneName: blacklistedDamageZones)
+		{
+			if (obj.GetDamageZoneNameByComponentIndex(cInfo.component) == zoneName)
+			{
+				return false;
+			}
+		}
+
+		vector componentPos = cInfo.componentCenter;
+		
+		// Too far away! (fast reject)
+		float componentMaxDist2 = Math.SqrFloat(settings.MaxDist + cInfo.componentRadius * obj.GetScale());
+		vector nearestPoint = Math3D.NearestPoint(settings.RayStart, settings.RayEnd, componentPos);
+		float componentDistance2 = vector.DistanceSq(componentPos, nearestPoint);
+		if (componentDistance2 > componentMaxDist2)
+		{
+			return false;
+		}
+		
+		// Here some more accurate check could be placed that would adjust the componentPos
+		
+		// Outside of the cone angle!
+		float componentAngle = Math.RAD2DEG * Math.AbsFloat(Math3D.AngleFromPosition(settings.ConeOrigin, settings.XZDir, componentPos));	
+		if (componentAngle > settings.ConeHalfAngle)
+		{
+			return false;
+		}
+			
+		// Obstructed!
+		if (IsMeleeTargetObstructed(settings.RayStart, componentPos))
+		{
+			return false;
+		}
+
+		// We found something, fill it in!
+		result.ComponentPos = componentPos;
+		result.ComponentAngle = componentAngle;
+		result.ComponentDistance2 = componentDistance2;
+		result.ComponentIdx = cInfo.component;
+		
+		return true;
+	}
+	
+	bool EvaluateComponent(Object obj, ComponentInfo cInfo, MeleeTargetSettings settings, out ref ComponentResult result)
+	{
+		return EvaluateComponentEx(obj, cInfo, settings, result, {});
+	}
+	
+	bool IsMeleeTargetObstructed(vector rayStart, vector rayEnd)
+	{
+		if (rayStart == rayEnd)
+		{
+			return true; // Not possible to trace when this happens (zero length raycast)
+		}
+		
+		Object hitObject;
+		vector hitPos, hitNormal;
+		float hitFraction;
+
+		return DayZPhysics.RayCastBullet( rayStart, rayEnd, MELEE_TARGET_OBSTRUCTION_LAYERS, null, hitObject, hitPos, hitNormal, hitFraction);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/MessageReceiverBase.c b/scripts/4_World/DayZ/Classes/MessageReceiverBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..613b94737ed70da253616289a6179225e4e51f22
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/MessageReceiverBase.c
@@ -0,0 +1,65 @@
+class MessageReceiverBase
+{
+	// message system
+	PluginMessageManager m_ModuleMessageManager;
+	string m_System;
+
+	void OnReceive(int channel) {}
+	void OnReceiveInt(int channel, int value) {}
+	void OnReceiveFloat(int channel, float value) {}
+	void OnReceiveString(int channel, string value) {}
+	//! This method is called when an object inheriting from this class subscribes to a channel, and a message along with an object reference is broadcast on that channel, if the object was created just for the purpose of relaying information and is not referenced anywhere else, it should be deleted after processing inside this method
+	void OnReceiveParam(int channel, Param params) {}
+	
+	void MessageReceiverBase()
+	{
+		m_ModuleMessageManager = PluginMessageManager.Cast(GetPlugin(PluginMessageManager));
+	}
+
+	void Subscribe(int channel)
+	{
+		m_ModuleMessageManager.Subscribe(this,channel);
+	}
+
+	void Unsubscribe(int channel)
+	{
+		if( IsPluginManagerExists() ) m_ModuleMessageManager.Unsubscribe(this,channel);
+	}
+
+	void UnsubscribeAll()
+	{
+		if( IsPluginManagerExists() ) m_ModuleMessageManager.UnsubscribeAll(this);
+	}
+
+	void Broadcast(int channel)
+	{
+		m_ModuleMessageManager.Broadcast(channel);
+	}
+
+	void BroadcastInt(int channel, int value)
+	{
+		m_ModuleMessageManager.BroadcastInt(channel, value);
+	}
+
+	void BroadcastFloat(int channel, float value)
+	{
+		m_ModuleMessageManager.BroadcastFloat(channel, value);
+	}
+
+	void BroadcastString(int channel, string value)
+	{
+		m_ModuleMessageManager.BroadcastString(channel, value);
+	}
+
+	void BroadcastParam(int channel,Param params)
+	{
+		m_ModuleMessageManager.BroadcastParam(channel, params);
+	}
+
+	//Messaging system
+	void Log(string message)
+	{
+		Debug.Log(message,m_System);
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/MissionBaseWorld.c b/scripts/4_World/DayZ/Classes/MissionBaseWorld.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3c3579ec7587822afdcc00ac3b4590edac83452
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/MissionBaseWorld.c
@@ -0,0 +1,7 @@
+class MissionBaseWorld extends Mission
+{
+	RainProcurementHandler GetRainProcurementHandler()
+	{
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Modules/PlantMaterial.c b/scripts/4_World/DayZ/Classes/Modules/PlantMaterial.c
new file mode 100644
index 0000000000000000000000000000000000000000..130597df9090740aebfbe0e55ac132b3a4a1833e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Modules/PlantMaterial.c
@@ -0,0 +1,15 @@
+class PlantMaterialHealth
+{
+	string m_InfestedTex;
+	string m_InfestedMat;
+	string m_HealthyTex;
+	string m_HealthyMat;
+	
+	void PlantMaterialHealth()
+	{
+		m_InfestedTex = "";
+		m_InfestedMat = "";
+		m_HealthyTex = "";
+		m_HealthyMat = "";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Modules/SyncedValue.c b/scripts/4_World/DayZ/Classes/Modules/SyncedValue.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f58fc2590ce928029f8a1f90e3a25b4ca4aed40
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Modules/SyncedValue.c
@@ -0,0 +1,131 @@
+class SyncedValue
+{
+	string m_Name;
+	float m_Value;
+	float m_ValueNorm;
+	bool m_State;
+	
+	void SyncedValue( string name, float value, bool state, float val_norm )
+	{
+		m_Name = name;
+		m_Value = value;
+		m_State = state;
+		m_ValueNorm = val_norm;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	float GetValue()
+	{
+		return m_Value;
+	}	
+	
+	float GetValueNorm()
+	{
+		return m_ValueNorm;
+	}
+	
+	bool GetState()
+	{
+		return m_State;
+	}
+}
+
+class SyncedValueLevel
+{
+	string m_Name;
+	float m_Value;
+	float m_Value2;
+	
+	void SyncedValueLevel( string name, float value, float value2 )
+	{
+		m_Name = name;
+		m_Value = value;
+		m_Value2 = value2;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	float GetValue()
+	{
+		return m_Value;
+	}
+	
+	float GetValue2()
+	{
+		return m_Value2;
+	}
+}
+
+
+class SyncedValueModifier
+{
+	string m_Name;
+	int m_ID;
+	bool m_Locked;
+	bool m_Active;
+	
+	void SyncedValueModifier( int id, string name, bool active, bool locked )
+	{
+		m_Name = name;
+		m_ID = id;
+		m_Locked = locked;
+		m_Active = active;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+	
+	bool GetLocked()
+	{
+		return m_Locked;
+	}
+	
+	bool GetActive()
+	{
+		return m_Active;
+	}
+}
+
+
+class SyncedValueAgent
+{
+	string m_Name;
+	string m_Value;
+	int m_ID;
+	
+	void SyncedValueAgent( string name, string value, int id )
+	{
+		m_Name = name;
+		m_Value = value;
+		m_ID = id;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	string GetValue()
+	{
+		return m_Value;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/MouseBinding.c b/scripts/4_World/DayZ/Classes/MouseBinding.c
new file mode 100644
index 0000000000000000000000000000000000000000..f4893303f2062ef51a8c73ddb289734ef76daf78
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/MouseBinding.c
@@ -0,0 +1,56 @@
+class MouseBinding
+{
+	private int		m_ActiveUIMenuID;
+	private int		m_MouseButton;
+	private int		m_MouseEvent;
+	private string	m_CallbackTarget;
+	private string	m_CallbackFunction;
+	private string	m_InfoKeys;
+	private string	m_InfoDescription
+	
+	void MouseBinding( int ui_id, int mouse_button, int mouse_event, string call_target, string call_function, string info_bind, string info_description )
+	{
+		m_ActiveUIMenuID	= ui_id;
+		m_MouseButton		= mouse_button;
+		m_MouseEvent		= mouse_event;
+		m_CallbackTarget	= call_target;
+		m_CallbackFunction	= call_function;
+		m_InfoKeys			= info_bind;
+		m_InfoDescription	= info_description;
+	}
+	
+	int GetUIMenuID()
+	{
+		return m_ActiveUIMenuID;
+	}
+	
+	int GetButtonID()
+	{
+		return m_MouseButton;
+	}
+	
+	int GetMouseEvent()
+	{
+		return m_MouseEvent;
+	}
+	
+	string GetCallbackTarget()
+	{
+		return m_CallbackTarget;
+	}
+	
+	string GetCallbackFunction()
+	{
+		return m_CallbackFunction;
+	}
+	
+	string GetInfoBind()
+	{
+		return m_InfoKeys;
+	}
+	
+	string GetInfoDescription()
+	{
+		return m_InfoDescription;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/MouseButtonInfo.c b/scripts/4_World/DayZ/Classes/MouseButtonInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..c615a1643b50b6d37d393125760e6f2d30bdc4ea
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/MouseButtonInfo.c
@@ -0,0 +1,48 @@
+class MouseButtonInfo
+{
+	private int		m_ButtonID;
+	private int		m_TimeLastPress;
+	private int		m_TimeLastRelease;
+	
+	void MouseButtonInfo(int button)
+	{
+		m_ButtonID			= button;
+		m_TimeLastPress		= -1;
+		m_TimeLastRelease	= -1;
+	}
+	
+	int GetButtonID()
+	{
+		return m_ButtonID;
+	}
+	
+	int GetTimeLastPress()
+	{
+		return m_TimeLastPress;
+	}
+	
+	int GetTimeLastRelease()
+	{
+		return m_TimeLastRelease;
+	}
+	
+	void Press()
+	{
+		m_TimeLastPress = GetGame().GetTime();
+	}
+	
+	void Release()
+	{
+		m_TimeLastRelease = GetGame().GetTime();
+	}
+	
+	bool IsButtonDown()
+	{
+		if ( m_TimeLastRelease < m_TimeLastPress )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/NutritionalProfile.c b/scripts/4_World/DayZ/Classes/NutritionalProfile.c
new file mode 100644
index 0000000000000000000000000000000000000000..806733977149a6ccf2d4069b8bf538e4e11f0786
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/NutritionalProfile.c
@@ -0,0 +1,79 @@
+class NutritionalProfile
+{
+	float m_Energy;
+	float m_WaterContent;
+	float m_NutritionalIndex;
+	float m_FullnessIndex;
+	float m_Toxicity;
+	int m_LiquidType;
+	int m_Agents;
+	string m_LiquidClassname;
+	float m_Digestibility;
+	
+	void NutritionalProfile(float energy, float water_content, float nutritional_index, float fullness_index, float toxicity, int agents, float digestibility)
+	{
+		m_Energy = energy;
+		m_WaterContent = water_content;
+		m_NutritionalIndex = nutritional_index;
+		m_FullnessIndex = fullness_index;
+		m_Toxicity = toxicity;
+		m_Agents = agents;
+		m_Digestibility = digestibility;
+	}
+	
+	void MarkAsLiquid(int liquid_type, string classname)
+	{
+		m_LiquidType = liquid_type;
+		m_LiquidClassname = classname;
+	}
+	
+	int GetAgents()
+	{
+		return m_Agents;
+	}
+	
+	int GetLiquidType()
+	{
+		return m_LiquidType;
+	}
+	
+	string GetLiquidClassname()
+	{
+		return m_LiquidClassname;
+	}
+	
+	bool IsLiquid()
+	{
+		return (m_LiquidType > 0);
+	}
+	
+	float GetEnergy()
+	{
+		return m_Energy;
+	}
+	
+	float GetWaterContent()
+	{
+		return m_WaterContent;
+	}
+	
+	float GetNutritionalIndex()
+	{
+		return m_NutritionalIndex;
+	}
+	
+	float GetFullnessIndex()
+	{
+		return m_FullnessIndex;
+	}
+	
+	float GetToxicity()
+	{
+		return m_Toxicity;
+	}	
+	
+	float GetDigestibility()
+	{
+		return m_Digestibility;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnDataInterpreted.c b/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnDataInterpreted.c
new file mode 100644
index 0000000000000000000000000000000000000000..3ff62634bbad2c1f750a140d586ce43bbedc7b8b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnDataInterpreted.c
@@ -0,0 +1,4 @@
+class PlayerSpawnDataInterpreted
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnDataJson.c b/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnDataJson.c
new file mode 100644
index 0000000000000000000000000000000000000000..7f281d93b1b079255f8d2523dd34ea55a6a9314a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnDataJson.c
@@ -0,0 +1,211 @@
+class PlayerSpawnJsonDataBase : Managed
+{
+	//! sets default values throughout the freshly created structure as required
+	
+	bool IsValid()
+	{
+		return true;
+	}
+}
+
+class PlayerSpawnJsonData : PlayerSpawnJsonDataBase
+{
+	ref array<ref PlayerSpawnPreset> presets;
+}
+
+class PlayerSpawnPreset : PlayerSpawnJsonDataBase
+{
+	int spawnWeight; //spawn probability weight
+	string name; //optional
+	ref array<string> characterTypes;
+	ref array<ref PlayerSpawnPresetSlotData> attachmentSlotItemSets;
+	ref array<ref PlayerSpawnPresetDiscreteCargoSetData> discreteUnsortedItemSets;
+	
+	string GetRandomCharacterType()
+	{
+		if (characterTypes && characterTypes.Count() > 0)
+			return characterTypes.GetRandomElement();
+		
+		Debug.Log("No characterTypes defined. Falling back to 'default' character type, or random, if undefined","n/a","n/a","PlayerSpawnPreset");
+		return string.Empty;
+	}
+	
+	override bool IsValid()
+	{
+		if (!super.IsValid())
+			return false;
+		
+		if (spawnWeight < 1)
+		{
+			Debug.Log("Invalid spawn weight, skipping preset: " + name,"n/a","Validation","PlayerSpawnPreset");
+			return false;
+		}
+		
+		return true;
+	}
+	
+	//! preset might be valid even with no attachmentSlotItemSets configured, checked separately
+	bool HasAttachmentSlotSetsDefined()
+	{
+		return attachmentSlotItemSets && attachmentSlotItemSets.Count() > 0;
+	}
+	
+	//! preset might be valid even with no unsorted item sets configured, checked separately
+	bool HasDiscreteUnsortedItemSetsDefined()
+	{
+		return discreteUnsortedItemSets && discreteUnsortedItemSets.Count() > 0;
+	}
+}
+
+class PlayerSpawnPresetSlotData : PlayerSpawnJsonDataBase
+{
+	string slotName;
+	ref array<ref PlayerSpawnPresetDiscreteItemSetSlotData> discreteItemSets;
+	
+	//! Translates slot name to match something from both 'CfgSlots' and 'attachments[]' in entity's config
+	bool TranslateAndValidateSlot(EntityAI parent, inout int slotID)
+	{
+		string tmp = slotName;
+		if (slotName == "shoulderL")
+		{
+			tmp = "Shoulder";
+		}
+		else if (slotName == "shoulderR")
+		{
+			tmp = "Melee";
+		}
+		
+		slotID = InventorySlots.GetSlotIdFromString(tmp);
+		if (!InventorySlots.IsSlotIdValid(slotID))
+		{
+			Debug.Log("Wrong slot name used: " + slotName,"n/a","Validation","PlayerSpawnPresetSlotData");
+			return false;
+		}
+		if (!parent)
+		{
+			Debug.Log("No parent entity found when trying to populate slot: " + slotName,"n/a","Validation","PlayerSpawnPresetSlotData");
+			return false;
+		}
+		if (!parent.GetInventory().HasAttachmentSlot(slotID))
+		{
+			Debug.Log("Slot: " + slotName + " undefined on entity: " + parent.GetType(),"n/a","Validation","PlayerSpawnPresetSlotData");
+			return false;
+		}
+		
+		return true;
+	}
+	
+	//! slot name validity checked separately
+	override bool IsValid()
+	{
+		if (!super.IsValid())
+			return false;
+		
+		if (discreteItemSets == null || discreteItemSets.Count() < 1)
+		{
+			Debug.Log("discreteItemSets for slot: " + slotName + " undefined","n/a","Validation","PlayerSpawnPresetSlotData");
+			return false;
+		}
+		
+		return true;
+	}
+}
+
+//! base for any item set
+class PlayerSpawnPresetItemSetBase : PlayerSpawnJsonDataBase
+{
+	bool simpleChildrenUseDefaultAttributes;
+	ref PlayerSpawnAttributesData attributes;
+	ref array<ref PlayerSpawnPresetComplexChildrenType> complexChildrenTypes;
+	ref array<string> simpleChildrenTypes;
+	
+	//! overriden later
+	int GetQuickbarIdx()
+	{
+		return -1;
+	}
+}
+
+//base for DISCRETE item sets
+class PlayerSpawnPresetDiscreteItemSetBase : PlayerSpawnPresetItemSetBase
+{
+	int spawnWeight;
+	
+	override bool IsValid()
+	{
+		if (!super.IsValid())
+			return false;
+		
+		if (spawnWeight < 1)
+		{
+			Debug.Log("Invalid spawnWeight set for a discrete item set!","n/a","Validation","PlayerSpawnPresetDiscreteItemSetBase");
+			return false;
+		}
+		return true;
+	}
+}
+
+//! one item set for slot
+class PlayerSpawnPresetDiscreteItemSetSlotData : PlayerSpawnPresetDiscreteItemSetBase
+{
+	string itemType;
+	int quickBarSlot;
+	
+	override bool IsValid()
+	{
+		if (!super.IsValid())
+			return false;
+		
+		//empty 'itemType' is valid alternative here
+		
+		if (!attributes)
+		{
+			Debug.Log("No attributes defined for a discrete item set!","n/a","Validation","PlayerSpawnPresetDiscreteItemSetSlotData");
+			return false;
+		}
+		
+		//unable to verify any of the other integers, since they always default to '0'. Needs to be configured carefully!
+		
+		return true;
+	}
+	
+	override int GetQuickbarIdx()
+	{
+		return quickBarSlot;
+	}
+}
+
+//! one set for cargo
+class PlayerSpawnPresetDiscreteCargoSetData : PlayerSpawnPresetDiscreteItemSetBase
+{
+	string name;
+}
+
+//! used for specific hierarchical child spawning
+class PlayerSpawnPresetComplexChildrenType : PlayerSpawnPresetItemSetBase
+{
+	string itemType;
+	int quickBarSlot;
+	
+	override bool IsValid()
+	{
+		if (!super.IsValid())
+			return false;
+		
+		return itemType != string.Empty; //needs item type to function
+	}
+	
+	override int GetQuickbarIdx()
+	{
+		return quickBarSlot;
+	}
+}
+
+class PlayerSpawnAttributesData : PlayerSpawnJsonDataBase
+{
+	float healthMin;
+	float healthMax;
+	float quantityMin;
+	float quantityMax;
+	//ref array<string> magazineAmmoOrdered;
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnHandler.c b/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..79efd4249f3d1486e233c95274e6c6b012ec44a3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerGearSpawn/CfgPlayerSpawnHandler.c
@@ -0,0 +1,330 @@
+class PlayerSpawnHandler
+{
+	private static bool m_Initialized;
+	static ref PlayerSpawnJsonData m_Data = new PlayerSpawnJsonData();
+	
+	static bool LoadData()
+	{
+		array<string> spawnGearPresetFiles = CfgGameplayHandler.GetPlayerSpawnGearPresetFiles();
+		if (!spawnGearPresetFiles || (spawnGearPresetFiles && spawnGearPresetFiles.Count() == 0))
+			return false;
+
+		m_Data.presets = {};
+
+		foreach (string spawnPresetFile : spawnGearPresetFiles)
+		{
+			PlayerSpawnPreset preset;
+			string path = "$mission:" + spawnPresetFile;
+
+			string errorMessage;
+			if (!JsonFileLoader<PlayerSpawnPreset>.LoadFile(path, preset, errorMessage))
+			{
+				ErrorEx(errorMessage);
+				return false;
+			}
+			
+			if (preset != null)
+				m_Data.presets.Insert(preset);
+		}
+
+		m_Initialized = m_Data.presets.Count() > 0;
+		
+		return true;
+	}
+	
+	static bool IsInitialized()
+	{
+		return m_Initialized;
+	}
+	
+	static PlayerSpawnPreset GetRandomCharacterPreset()
+	{
+		array<int> weightedPresetIndexes = new array<int>();
+		int count = m_Data.presets.Count();
+		PlayerSpawnPreset p;
+		for (int i = 0; i < count; i++)
+		{
+			p = m_Data.presets[i];
+			if (p.IsValid())
+			{
+				for (int j = 0; j < p.spawnWeight; j++)
+				{
+					weightedPresetIndexes.Insert(i);
+				}
+			}
+		}
+		
+		return m_Data.presets.Get(weightedPresetIndexes.GetRandomElement());
+	} 
+	
+	//! equips character with the chosen preset
+	static bool ProcessEquipmentData(PlayerBase player, PlayerSpawnPreset data)
+	{
+		if (data.IsValid())
+		{
+			ProcessSlotsEquipment(player, data);
+			ProcessCargoEquipment(player, data);
+		}
+		
+		return true;
+	}
+	
+	//! iterates over each object and spawns alternatives
+	private static void ProcessSlotsEquipment(PlayerBase player, PlayerSpawnPreset data)
+	{
+		if (!data.HasAttachmentSlotSetsDefined())
+		{
+			Debug.Log("No non-empty 'attachmentSlotItemSets' array found. Skipping slot spawns","n/a","n/a","ProcessSlotsEquipment");
+			return;
+		}
+		
+		foreach (PlayerSpawnPresetSlotData slotData : data.attachmentSlotItemSets)
+		{
+			SelectAndSpawnSlotEquipment(player,slotData);
+		}
+	}
+	
+	//! selects weighted slot equipment variant
+	private static bool SelectAndSpawnSlotEquipment(PlayerBase player, PlayerSpawnPresetSlotData slotData)
+	{
+		int slotID;
+		if (!slotData.TranslateAndValidateSlot(player,slotID))
+			return false;
+		
+		if (!slotData.IsValid())
+			return false;
+		
+		array<int> weightedDiscreteSetIndexes = new array<int>();
+		int count = slotData.discreteItemSets.Count();
+		PlayerSpawnPresetDiscreteItemSetSlotData dis;
+		for (int i = 0; i < count; i++)
+		{
+			dis = slotData.discreteItemSets[i];
+			
+			if (dis.IsValid()) //only when the type exists and spawnWeight is set
+			{
+				for (int j = 0; j < dis.spawnWeight; j++)
+				{
+					weightedDiscreteSetIndexes.Insert(i);
+				}
+			}
+		}
+		
+		dis = null;
+		if (weightedDiscreteSetIndexes.Count() > 0)
+			dis = slotData.discreteItemSets.Get(weightedDiscreteSetIndexes.GetRandomElement());
+		return SpawnDiscreteSlotItemSet(player,dis,slotID);
+	}
+	
+	//! chooses one object from the array
+	private static void ProcessCargoEquipment(PlayerBase player, PlayerSpawnPreset data)
+	{
+		if (!data.HasDiscreteUnsortedItemSetsDefined())
+		{
+			Debug.Log("No non-empty 'discreteUnsortedItemSets' array found. Skipping cargo spawns","n/a","n/a","ProcessCargoEquipment");
+			return;
+		}
+		
+		SelectAndSpawnCargoSet(player,data);
+	}
+	
+	private static bool SelectAndSpawnCargoSet(PlayerBase player, PlayerSpawnPreset data)
+	{
+		array<int> weightedDiscreteSetIndexes = new array<int>();
+		int count = data.discreteUnsortedItemSets.Count();
+		PlayerSpawnPresetDiscreteCargoSetData csd;
+		for (int i = 0; i < count; i++)
+		{
+			csd = data.discreteUnsortedItemSets[i];
+			
+			if (csd.IsValid()) //only when the spawnWeight is set
+			{
+				for (int j = 0; j < csd.spawnWeight; j++)
+				{
+					weightedDiscreteSetIndexes.Insert(i);
+				}
+			}
+		}
+		
+		csd = null;
+		if (weightedDiscreteSetIndexes.Count() > 0)
+			csd = data.discreteUnsortedItemSets.Get(weightedDiscreteSetIndexes.GetRandomElement());
+		return SpawnDiscreteCargoItemSet(player,csd);
+	}
+	
+	private static bool SpawnDiscreteCargoItemSet(PlayerBase player, PlayerSpawnPresetDiscreteCargoSetData csd)
+	{
+		SpawnComplexChildrenItems(player,csd);
+		SpawnSimpleChildrenItems(player,csd);
+		return true;
+	}
+	
+	private static bool SpawnDiscreteSlotItemSet(PlayerBase player, PlayerSpawnPresetDiscreteItemSetSlotData dis, int slotID)
+	{
+		if (!dis)
+		{
+			Debug.Log("No PlayerSpawnPresetDiscreteItemSet found. Skipping spawn for slot: " + InventorySlots.GetSlotName(slotID),"n/a","n/a","SpawnDiscreteSlotItemSet");
+			return false;
+		}
+		
+		ItemBase item;
+		if (slotID == InventorySlots.HANDS) //hands exception
+			item = ItemBase.Cast(player.GetHumanInventory().CreateInHands(dis.itemType));
+		else
+			item = ItemBase.Cast(player.GetInventory().CreateAttachmentEx(dis.itemType,slotID));
+		
+		if (item)
+		{
+			HandleNewItem(item,dis);
+		}
+		else if (dis.itemType != string.Empty)
+		{
+			Debug.Log("FAILED spawning item type: " + dis.itemType + " into slot: " + InventorySlots.GetSlotName(slotID) + " of parent: " + player,"n/a","n/a","SpawnDiscreteSlotItemSet");
+			return false;
+		}
+		
+		return item != null;
+	}
+	
+	//! could spawn other items recursively. Parent item is guaranteed here.
+	private static bool SpawnComplexChildrenItems(EntityAI parent, notnull PlayerSpawnPresetItemSetBase data)
+	{
+		if (!data.complexChildrenTypes || data.complexChildrenTypes.Count() < 1) //no children defined, still valid!
+		{
+			return false;
+		}
+		
+		foreach (PlayerSpawnPresetComplexChildrenType cct : data.complexChildrenTypes)
+		{
+			//todo: slotID option over nyah?
+			if (cct.itemType == string.Empty)
+			{
+				Debug.Log("Empty item type found in 'complexChildrenTypes' of parent : " + parent,"n/a","n/a","SpawnSimpleChildrenItems");
+				continue;
+			}
+			
+			ItemBase item;
+			Class.CastTo(item,CreateChildItem(parent,cct.itemType));
+			
+			if (item)
+			{
+				HandleNewItem(item,cct);
+			}
+			else
+			{
+				Debug.Log("FAILED spawning item: " + cct.itemType + " of parent: " + parent,"n/a","n/a","SpawnComplexChildrenItems");
+			}
+		}
+		
+		return true;
+	}
+	
+	private static bool SpawnSimpleChildrenItems(EntityAI parent, PlayerSpawnPresetItemSetBase data)
+	{
+		if (!data || !data.simpleChildrenTypes || data.simpleChildrenTypes.Count() < 1) //no children defined, still valid!
+		{
+			return false;
+		}
+		
+		int count = data.simpleChildrenTypes.Count();
+		string itemType;
+		for (int i = 0; i < count; i++)
+		{
+			itemType = data.simpleChildrenTypes[i];
+			if (itemType == string.Empty)
+			{
+				Debug.Log("Empty item type found at idx: " + i.ToString() + " of 'simpleChildrenTypes' array. Skipping","n/a","n/a","SpawnSimpleChildrenItems");
+				continue;
+			}
+			
+			ItemBase item;
+			Class.CastTo(item,CreateChildItem(parent,itemType));
+			
+			if (item)
+			{
+				if (!data.simpleChildrenUseDefaultAttributes)
+					ApplyAttributes(item,data.attributes);
+			}
+			else
+			{
+				Debug.Log("FAILED spawning item type: " + itemType + " to parent: " + parent,"n/a","n/a","SpawnSimpleChildrenItems");
+			}
+		}
+		return true;
+	}
+	
+	private static void HandleNewItem(notnull ItemBase item, PlayerSpawnPresetItemSetBase data)
+	{
+		ApplyAttributes(item,data.attributes);
+		
+		PlayerBase player;
+		if (Class.CastTo(player,item.GetHierarchyRootPlayer()) && data.GetQuickbarIdx() > -1)
+			player.SetQuickBarEntityShortcut(item,data.GetQuickbarIdx());
+		
+		SpawnComplexChildrenItems(item,data);
+		SpawnSimpleChildrenItems(item,data);
+	}
+	
+	private static EntityAI CreateChildItem(EntityAI parent, string type)
+	{
+		PlayerBase player;
+		ItemBase newItem;
+		if (Class.CastTo(player,parent)) //special behavior
+		{
+			int count = player.GetInventory().AttachmentCount();
+			if (Class.CastTo(newItem,player.GetInventory().CreateInInventory(type)))
+				return newItem;
+			
+			Debug.Log("FAILED spawning item: " + type + ", it fits in no cargo or attachment on any worn item","n/a","n/a","CreateChildItem");
+			return null;
+		}
+		
+		//weapon magazine exception
+		if (GetGame().ConfigIsExisting(CFG_MAGAZINESPATH + " " + type) && parent.IsWeapon())
+		{
+			Weapon_Base wep
+			if (Class.CastTo(wep,parent))
+				return wep.SpawnAttachedMagazine(type);
+		}
+		
+		return parent.GetInventory().CreateInInventory(type);
+	}
+	
+	private static void ApplyAttributes(ItemBase item, PlayerSpawnAttributesData attributes)
+	{
+		if (!attributes)
+			return;
+		
+		float health01 = Math.RandomFloatInclusive(attributes.healthMin,attributes.healthMax);
+		item.SetHealth01("","Health",health01);
+		
+		float quantity01 = Math.RandomFloatInclusive(attributes.quantityMin,attributes.quantityMax);
+		if (item.IsMagazine())
+		{
+			Magazine mag = Magazine.Cast(item);
+			//todo: magazine bullet customization?
+			/*if (attributes.magazineAmmoOrdered && attributes.magazineAmmoOrdered.Count() > 0)
+			{
+				mag.ServerSetAmmoCount(0);
+				foreach (string bulletType : attributes.magazineAmmoOrdered)
+				{
+					mag.ServerStoreCartridge(health01,bulletType);
+				}
+				mag.SetSynchDirty();
+			}
+			else*/
+			{
+				int ammoQuantity = (int)Math.Lerp(0,mag.GetAmmoMax(),quantity01);
+				mag.ServerSetAmmoCount(ammoQuantity);
+			}
+		}
+		else //'varQuantityDestroyOnMin' quantity safeguard
+		{
+			float quantityAbsolute = Math.Lerp(item.GetQuantityMin(),item.GetQuantityMax(),quantity01);
+			quantityAbsolute = Math.Round(quantityAbsolute); //avoids weird floats
+			if (quantityAbsolute <= item.GetQuantityMin() && item.ConfigGetBool("varQuantityDestroyOnMin"))
+				quantityAbsolute++;
+			item.SetQuantity(quantityAbsolute);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerLightManager.c b/scripts/4_World/DayZ/Classes/PlayerLightManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..1df9f75c301bbc275afc5324f1913130a771f416
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerLightManager.c
@@ -0,0 +1,75 @@
+class ActionTargetLighSource : ActionTarget
+{
+	bool 	m_Remove;
+}
+
+//WIP
+class PlayerLightManager
+{
+	int 									m_SelectedLightSource;
+	ref ActionTargetLighSource 				m_LightItemTarget;
+	ref array<ref ActionTarget> 			m_ValidLightItems;
+	PlayerBase 								m_Player;
+	
+	void PlayerLightManager(PlayerBase player)
+	{
+		m_LightItemTarget = null;
+		m_ValidLightItems = new array<ref ActionTarget>;
+		m_Player = player;
+	}
+	
+	// can be anything, as long as it has appropriate actions for handling lights, see Mich2001Helmet
+	void AddLightSource(Object object)
+	{
+		m_LightItemTarget = new ActionTargetLighSource(object, null, -1, vector.Zero, -1);
+		UpdateLightSourceList();
+	}
+	
+	void RemoveLightSource(Object object)
+	{
+		m_LightItemTarget = new ActionTargetLighSource(object, null, -1, vector.Zero, -1);
+		m_LightItemTarget.m_Remove = true;
+		UpdateLightSourceList();
+	}
+	
+	void UpdateLightSourceList()
+	{
+		if ( m_LightItemTarget )
+		{
+			if ( !m_LightItemTarget.m_Remove )
+			{
+				m_ValidLightItems.Insert(m_LightItemTarget);
+			}
+			else
+			{
+				m_ValidLightItems.RemoveItem(m_LightItemTarget);
+			}
+		}
+	}
+	
+	ref array<ref ActionTarget> GetLightSourceList()
+	{
+		return m_ValidLightItems;
+	}
+	
+	void SetSelectedLightSourceIdx(int value)
+	{
+		m_SelectedLightSource = value;
+	}
+	
+	int GetSelectedLightSourceIdx()
+	{
+		return m_SelectedLightSource;
+	}
+	
+	void SelectLightSourceTarget(ActionTarget target) //should be ActionTarget?
+	{
+		int idx = m_ValidLightItems.Find(target);
+		SetSelectedLightSourceIdx(idx);
+	}
+	
+	ref ActionTarget GetSelectedLightSourceTarget()
+	{
+		return m_ValidLightItems.Get(m_SelectedLightSource);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/ModifierBase.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/ModifierBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..066259eacb9405bfdadd143bf58bacd425286bb2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/ModifierBase.c
@@ -0,0 +1,238 @@
+enum eModifiersTickType//bitmask
+{
+	TICK 					= 1,
+	ACTIVATE_CHECK 			= 2,
+	DEACTIVATE_CHECK 		= 4,
+}
+
+
+class ModifierBase
+{
+	int					m_ID = 0;
+	ModifiersManager 	m_Manager;//the manager instance
+	string 				m_System = "Modifiers";
+	float 				m_ActivatedTime;//overall time this modifier was active
+	bool				m_TrackActivatedTime;//should this modifier track overall time it was active ?
+	bool				m_IsPersistent;//is this modifier saved to the DB ?
+	PlayerBase			m_Player;
+	float				m_TickIntervalInactive = 5;
+	float				m_TickIntervalActive = 3;
+	bool				m_IsActive;
+	bool				m_ShouldBeActive;
+	float				m_AccumulatedTimeActive;
+	float				m_AccumulatedTimeInactive;
+	float				m_LastTickedActive;
+	int 				m_TickType = (eModifiersTickType.TICK | eModifiersTickType.ACTIVATE_CHECK | eModifiersTickType.DEACTIVATE_CHECK);//some modifiers do not need to check activate condition, as they get activated by request 
+	float				m_LastTickedInactive;
+	bool				m_IsLocked = false;
+	EActivationType		m_ActivationType;
+	eModifierSyncIDs	m_SyncID;//max 32 synced modifiers supported, 0 == no sync
+	PluginPlayerStatus 		m_ModulePlayerStatus;
+
+	void ModifierBase()
+	{
+		Class.CastTo(m_ModulePlayerStatus, GetPlugin(PluginPlayerStatus));
+	}
+	
+	void InitBase(PlayerBase player, ModifiersManager manager)
+	{
+		m_Manager 				= manager;
+		m_Player 				= player;
+		Init();
+	}
+	
+	void Init(){}
+
+
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+	
+	bool IsPersistent()
+	{
+		return m_IsPersistent;
+	}
+
+	void MakeParamObjectPersistent(Param object)
+	{
+		m_Manager.m_ParamList.Insert(object);
+	}
+
+
+	void ResetLastTickTime()
+	{
+		m_LastTickedActive = 0;
+	}
+
+	string GetDebugText()
+	{
+		return "";
+	}
+	
+	string GetDebugTextSimple()
+	{
+		return "";
+	}
+	
+	void DisableActivateCheck()
+	{
+		m_TickType = (m_TickType & ~eModifiersTickType.ACTIVATE_CHECK);
+	}	
+	
+	void DisableDeactivateCheck()
+	{
+		m_TickType = (m_TickType & ~eModifiersTickType.DEACTIVATE_CHECK);
+	}
+
+	void Tick(float delta_time)
+	{
+
+		if( !m_IsActive && m_ShouldBeActive )
+		{
+			Activate();
+		}
+
+		if( m_IsActive )
+		{
+			m_AccumulatedTimeActive += delta_time;
+			if( m_AccumulatedTimeActive > m_TickIntervalActive )
+			{
+				if( m_TickType & eModifiersTickType.DEACTIVATE_CHECK && DeactivateCondition(m_Player) && !IsLocked() )
+				{
+					Deactivate();
+				}
+				else//if(m_TickType & eModifiersTickType.TICK)
+				{
+					m_ActivatedTime += m_AccumulatedTimeActive;
+					OnTick(m_Player, m_AccumulatedTimeActive);
+				}
+				m_AccumulatedTimeActive = 0;
+			}
+		}
+		else if(m_TickType & eModifiersTickType.ACTIVATE_CHECK)
+		{
+			m_AccumulatedTimeInactive += delta_time;
+			if( m_AccumulatedTimeInactive > m_TickIntervalInactive )
+			{
+				if( ActivateCondition(m_Player) )
+				{
+					if( !IsLocked() ) 
+					{
+						ActivateRequest(EActivationType.TRIGGER_EVENT_ON_ACTIVATION);
+					}
+				}
+				m_AccumulatedTimeInactive = 0;
+			}
+		}
+	}
+	
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+	
+	void SetLock(bool state)
+	{
+		m_IsLocked = state;
+	}
+
+	bool IsLocked()
+	{
+		return m_IsLocked;		
+	}
+	
+	bool IsTrackAttachedTime()
+	{
+		return m_TrackActivatedTime;
+	}
+	
+	float GetAttachedTime()
+	{
+		return m_ActivatedTime;
+	}
+	
+	void SetAttachedTime(float time)
+	{
+		m_ActivatedTime = time;
+	}
+	
+	int GetModifierID()
+	{
+		return m_ID;
+	}
+	
+	string GetName()
+	{
+		string name = ClassName();
+		int index_start = name.Length() - 4;
+		int index_end = name.Length();
+		name = name.SubstringInverted(name, index_start, index_end);
+		return name;
+	}
+
+	bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	//! is called when an inactive modifier gets activated during gameplay, is NOT called on activation upon player server connection(see OnReconnect)
+	void OnActivate(PlayerBase player)
+	{
+
+	}
+	
+	//! is called when a modifier is being re-activated upon player server connection, use to activate systems which are not persistent and need to run alongside active modifiers
+	void OnReconnect(PlayerBase player)
+	{
+
+	}
+
+	void OnDeactivate(PlayerBase player)
+	{
+
+	}
+	
+	void Activate()
+	{
+		m_IsActive = true;
+		m_Player.m_SyncedModifiers = (m_Player.m_SyncedModifiers | m_SyncID);
+		if( m_ActivationType == EActivationType.TRIGGER_EVENT_ON_ACTIVATION ) OnActivate(m_Player);
+		else if(m_ActivationType == EActivationType.TRIGGER_EVENT_ON_CONNECT ) OnReconnect(m_Player);
+		m_Player.SetSynchDirty();
+	}
+	
+	void ActivateRequest(EActivationType trigger)
+	{
+		m_ShouldBeActive = true;
+		m_ActivationType = trigger;
+	}
+
+	void Deactivate(bool trigger = true)
+	{
+		if(!m_IsActive)
+			return;
+		m_Player.m_SyncedModifiers = (m_Player.m_SyncedModifiers & ~m_SyncID);
+		m_ShouldBeActive = false;
+		m_IsActive = false;
+		m_ActivatedTime = 0;
+		if(trigger) 
+			OnDeactivate(m_Player);
+	}
+
+
+	void OnStoreSave( ParamsWriteContext ctx )
+	{
+	}
+
+
+	private void OnTick(PlayerBase player, float deltaT)
+	{
+		
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Antibiotics.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Antibiotics.c
new file mode 100644
index 0000000000000000000000000000000000000000..39f21ba4e59432902d76ad7a2629827402a15893
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Antibiotics.c
@@ -0,0 +1,78 @@
+class AntibioticsMdfr: ModifierBase
+{
+	float m_RegenTime;
+	const int ANTIBIOTICS_LIFETIME = 300;
+	const float ANTIBIOTICS_STRENGTH = 1;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_ANTIBIOTICS;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 3;
+		m_RegenTime = ANTIBIOTICS_LIFETIME;
+		
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override string GetDebugText()
+	{
+		return (ANTIBIOTICS_LIFETIME - GetAttachedTime()).ToString();
+	}
+
+	
+	override string GetDebugTextSimple()
+	{
+	return (ANTIBIOTICS_LIFETIME - GetAttachedTime()).ToString();
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseHealingsCount();
+		player.IncreaseAntibioticsCount();
+		/*
+		if ( player.GetNotifiersManager() )
+			player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+		*/
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseHealingsCount();
+		player.DecreaseAntibioticsCount();
+		/*
+		if ( player.GetNotifiersManager() )
+			player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+		*/
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if ( attached_time >= m_RegenTime )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.AntibioticsAttack( ANTIBIOTICS_STRENGTH * deltaT );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BloodRegen.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BloodRegen.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc7769e603e9629cf95caedb93b2423f4c177288
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BloodRegen.c
@@ -0,0 +1,86 @@
+class BloodRegenMdfr: ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BLOOD_REGEN;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		float m_MaxBlood = player.GetMaxHealth("GlobalHealth", "Blood");
+		if ( player.GetHealth("GlobalHealth", "Blood") <= m_MaxBlood )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float m_MaxBlood = player.GetMaxHealth("GlobalHealth", "Blood");
+		if ( player.GetHealth("GlobalHealth", "Blood") >= m_MaxBlood )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		float regen_modifier_water = GetRegenModifierWater( player.GetStatWater().Get() );
+		float regen_modifier_energy = GetRegenModifierEnergy( player.GetStatEnergy().Get() );
+		float blood_regen_speed = PlayerConstants.BLOOD_REGEN_RATE_PER_SEC * regen_modifier_water * regen_modifier_energy;
+		/*
+		PrintString("regen_modifier_water" + regen_modifier_water);
+		PrintString("regen_modifier_energy" + regen_modifier_energy);
+		PrintString("blood_regen_speed" + blood_regen_speed);
+		*/
+		player.AddHealth("","Blood", blood_regen_speed * deltaT );
+	}
+	
+	float GetRegenModifierWater(float water)
+	{
+		float modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_WATER_HIGH;
+		int water_level = m_Player.GetStatLevelWater();
+		
+		/*
+		if( water < PlayerConstants.BLOOD_REGEN_THRESHOLD_WATER_MID ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_WATER_MID}
+		if( water < PlayerConstants.BLOOD_REGEN_THRESHOLD_WATER_LOW ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_WATER_LOW}
+		*/
+		
+		if( water_level == EStatLevels.MEDIUM ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_WATER_MID}
+		if( water_level >= EStatLevels.LOW ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_WATER_LOW}
+		
+		return modifier;
+	}
+	
+	float GetRegenModifierEnergy(float energy)
+	{
+		float modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_ENERGY_HIGH;
+		int energy_level = m_Player.GetStatLevelEnergy();
+				
+		//if( energy < PlayerConstants.BLOOD_REGEN_THRESHOLD_ENERGY_MID ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_ENERGY_MID}
+		//if( energy < PlayerConstants.BLOOD_REGEN_THRESHOLD_ENERGY_LOW ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_ENERGY_LOW}
+		
+		if( energy_level == EStatLevels.MEDIUM ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_ENERGY_MID}
+		if( energy_level >= EStatLevels.LOW ) {modifier = PlayerConstants.BLOOD_REGEN_MODIFIER_ENERGY_LOW}
+		
+		return modifier;
+	}
+	
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BoneRegen.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BoneRegen.c
new file mode 100644
index 0000000000000000000000000000000000000000..7418053afa5395066161ccbb48bc6a29f895fae2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BoneRegen.c
@@ -0,0 +1,61 @@
+class BoneRegenMdfr: ModifierBase
+{
+	private const 	float	MINIMAL_WATER_TO_REGENRATE = 2500;
+	private const 	float	MINIMAL_ENERGY_TO_REGENRATE = 4000;
+	private const 	float	MINIMAL_BLOOD_TO_REGENRATE = 5000;
+	private const 	float	MINIMAL_BLOOD_REQUIRED_TO_REGENERATE_HEALTH = 5000;
+	private const	float 	BONE_HEALTH_INCREMENT_PER_SEC = 0.25;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BONE_REGEN;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if (  player.GetHealth("GlobalHealth", "Blood") >= MINIMAL_BLOOD_TO_REGENRATE && player.GetStatWater().Get() >= MINIMAL_WATER_TO_REGENRATE && player.GetStatEnergy().Get() >= MINIMAL_ENERGY_TO_REGENRATE )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if (  player.GetHealth("GlobalHealth", "Blood") < MINIMAL_BLOOD_TO_REGENRATE && player.GetStatWater().Get() < MINIMAL_WATER_TO_REGENRATE && player.GetStatEnergy().Get() < MINIMAL_ENERGY_TO_REGENRATE )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		/*
+		player.AddHealth("RightArm","Health",BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		player.AddHealth("RightHand","Health",BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		player.AddHealth("LeftArm","Health",BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		player.AddHealth("LeftHand","Health",+BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		
+		player.AddHealth("RightLeg","Health",+BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		player.AddHealth("RightFoot","Health",+BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		player.AddHealth("LeftLeg","Health",+BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		player.AddHealth("LeftFoot","Health",+BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		
+		player.AddHealth("Torso","Health",+BONE_HEALTH_INCREMENT_PER_SEC * deltaT);
+		*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BreathVapourMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BreathVapourMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..9a7aca7b7da46d03f73cdaf926c77f5ab8c7047e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/BreathVapourMdfr.c
@@ -0,0 +1,63 @@
+const int BREATH_VAPOUR_LEVEL_MAX = 3;
+
+class BreathVapourMdfr extends ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime 	= false;
+		m_ID 					= eModifiers.MDF_BREATH_VAPOUR;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 6;
+		DisableDeactivateCheck();
+
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+	
+	override string GetDebugText()
+	{
+		//return m_Player.GetStatHeatComfort().Get().ToString();
+	}
+	
+	override string GetDebugTextSimple()
+	{
+		//return m_Player.GetStatHeatComfort().Get().ToString();
+	}
+
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		if( !player.m_Environment.IsTemperatureSet() )
+			return;
+		float air_temperature = player.m_Environment.GetTemperature();
+		int level = 0;//default
+		if( MiscGameplayFunctions.IsValueInRange( air_temperature, PlayerConstants.BREATH_VAPOUR_THRESHOLD_HIGH, PlayerConstants.BREATH_VAPOUR_THRESHOLD_LOW) )
+		{
+			float value = Math.InverseLerp( PlayerConstants.BREATH_VAPOUR_THRESHOLD_LOW, PlayerConstants.BREATH_VAPOUR_THRESHOLD_HIGH,air_temperature);
+			value = Math.Clamp(value,0,1);
+			level = Math.Round(Math.Lerp(1,BREATH_VAPOUR_LEVEL_MAX,value));
+		}
+		else if(air_temperature < PlayerConstants.BREATH_VAPOUR_THRESHOLD_HIGH)
+		{
+			level = BREATH_VAPOUR_LEVEL_MAX;
+		}
+		if( level != player.m_BreathVapour )
+		{
+			player.m_BreathVapour = level;
+			player.SetSynchDirty();
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/CharcoalMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/CharcoalMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..b014f774ce3e6abfb71023adf002401e244b08c5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/CharcoalMdfr.c
@@ -0,0 +1,87 @@
+class CharcoalMdfr: ModifierBase
+{
+	float m_Killrate;
+	const int CHARCOAL_LIFETIME = 300;
+	const int CHARCOAL_EFFECT_TIME = 100;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_CHARCOAL;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 3;
+		m_Killrate = 2.85;	// # of killed agents per sec
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate( player );
+	}
+	
+	/*
+	override string GetDebugText()
+	{
+		
+		string text;
+		float time_till_effective = CHARCOAL_LIFETIME - CHARCOAL_EFFECT_TIME  - GetAttachedTime();
+		
+		text = "time till effective: " + time_till_effective.ToString() + "\n";
+		
+		if(time_till_effective > 0)
+			text += "killing agents:" + "NO";
+		else
+			text += "killing agents:" + "YES";
+		
+		
+		return text;
+		
+	}
+		*/
+
+	
+	override string GetDebugTextSimple()
+	{
+		return ( (int)(CHARCOAL_LIFETIME - GetAttachedTime()) ).ToString() + " | " + (((int)(CHARCOAL_LIFETIME - CHARCOAL_EFFECT_TIME  - GetAttachedTime())) * -1).ToString();
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseHealingsCount();
+
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseHealingsCount();
+
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if ( attached_time >= CHARCOAL_LIFETIME )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		if ( GetAttachedTime() > ( CHARCOAL_LIFETIME - CHARCOAL_EFFECT_TIME ) )
+		{		
+			player.m_AgentPool.AddAgent(eAgents.SALMONELLA, -m_Killrate * deltaT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/DisinfectMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/DisinfectMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..9a6f771f4fd9376b8b1bdfeea2261c322d33afde
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/DisinfectMdfr.c
@@ -0,0 +1,81 @@
+class DisinfectionMdfr: ModifierBase
+{
+	const int LIFETIME = 100;
+	//const int EFFECT_TIME = 100;
+	PluginTransmissionAgents m_PluginTransmissionAgents = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+	float m_WoundAgentInvasibility;
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_DISINFECTION;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		//m_WoundAgentInvasibility = m_PluginTransmissionAgents.GetAgentInvasibility(eAgents.WOUND_AGENT);
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate( player );
+	}
+	
+	override string GetDebugText()
+	{
+		return ( LIFETIME - GetAttachedTime() ).ToString();
+	}
+	
+	override string GetDebugTextSimple()
+	{
+		return ( LIFETIME - GetAttachedTime() ).ToString();
+	}
+
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseHealingsCount();
+
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseHealingsCount();
+		
+		if(player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION1))
+		{
+			player.m_AgentPool.AddAgent(eAgents.WOUND_AGENT, -10000);
+		}
+
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if ( attached_time >= LIFETIME )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		if(player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION2))
+		{
+			player.m_AgentPool.AddAgent(eAgents.WOUND_AGENT, -m_PluginTransmissionAgents.GetAgentInvasibility(eAgents.WOUND_AGENT) * deltaT);
+		}
+		else
+		{
+			player.m_AgentPool.AddAgent(eAgents.WOUND_AGENT, -m_PluginTransmissionAgents.GetAgentInvasibility(eAgents.WOUND_AGENT) * 2 * deltaT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Drowning.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Drowning.c
new file mode 100644
index 0000000000000000000000000000000000000000..71ec3eba8186b317990f8482606b49d83e82b9d1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Drowning.c
@@ -0,0 +1,74 @@
+class DrowningMdfr: ModifierBase
+{
+	const int 	TICK_FREQUENCY = 1;
+	static const float STAMINA_RECOVERY_MULTIPLIER = 0;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_DROWNING;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= TICK_FREQUENCY;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_DROWNING;
+	}	
+
+	bool CheckIsDrowning(PlayerBase player)
+	{
+		return player.GetDrowningWaterLevelCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return CheckIsDrowning(player);
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return !CheckIsDrowning(player);
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		if (player.GetStaminaHandler().GetStamina() <= 0)
+		{
+			player.AddHealth("","",deltaT * -CfgGameplayHandler.GetHealthDepletionSpeed());
+			player.AddHealth("","Shock",deltaT * -CfgGameplayHandler.GetShockDepletionSpeed());
+			player.RequestSoundEventEx(EPlayerSoundEventID.DROWNING_PAIN, false, EPlayerSoundEventParam.HIGHEST_PRIORITY);
+		}
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.SetDrowning(true);
+		player.GetStaminaHandler().ActivateRecoveryModifier(EStaminaMultiplierTypes.DROWNING);
+		player.RequestSoundEventEx(EPlayerSoundEventID.DROWNING_BREATH, false, EPlayerSoundEventParam.HIGHEST_PRIORITY);
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( PlayDrowningSound, 3000 ,false, 1);
+	}
+	
+	
+	void PlayDrowningSound(int index)
+	{
+		if (m_Player.m_IsDrowning)//check if we are still drowning after the delay
+		{
+			if (index == 0)
+			{
+				m_Player.RequestSoundEventEx(EPlayerSoundEventID.EXHAUSTED_BREATH, false, EPlayerSoundEventParam.HIGHEST_PRIORITY);
+			}
+			else if (index == 1)
+			{
+				m_Player.RequestSoundEventEx(EPlayerSoundEventID.DROWNING_BREATH, false, EPlayerSoundEventParam.HIGHEST_PRIORITY);
+			}
+		}
+	}
+		
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.SetDrowning(false);
+		player.GetStaminaHandler().DeactivateRecoveryModifier(EStaminaMultiplierTypes.DROWNING);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/EpinephrineMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/EpinephrineMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..a532c9cbd8cb435866ab907ecb1f57456aca7f94
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/EpinephrineMdfr.c
@@ -0,0 +1,67 @@
+class EpinephrineMdfr: ModifierBase
+{
+	const int LIFETIME = 60;
+	const float STAMINA_DEPLETION_MULTIPLIER = 0;
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_EPINEPHRINE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 1;
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override string GetDebugText()
+	{
+		return (LIFETIME - GetAttachedTime()).ToString();
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseHealingsCount();
+		//if( player.GetNotifiersManager() ) player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+		player.GiveShock(100);
+		player.GetStaminaHandler().SetStamina(100);
+		player.GetStaminaHandler().ActivateDepletionModifier(EStaminaMultiplierTypes.EPINEPHRINE);
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		//if( player.GetNotifiersManager() ) player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+		player.DecreaseHealingsCount();
+		//player.GetStaminaHandler().SetDepletionMultiplier(1);
+		player.GetStaminaHandler().DeactivateDepletionModifier(EStaminaMultiplierTypes.EPINEPHRINE);
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if( attached_time >= LIFETIME )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		//player.GetStaminaHandler().SetStamina(100);
+	}
+
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Flies.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Flies.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd6db9873acbedfafd7ffb94c8a35a879a46f0a6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Flies.c
@@ -0,0 +1,77 @@
+class FliesMdfr: ModifierBase
+{
+	const float DISTANCE_SENSITIVITY_SQR = Math.SqrFloat(0.05/*actual distance in meters*/);
+	const int TICK_FREQUENCY = 15;
+	const int IDLE_COUNT_THRESHOLD = 40;
+	vector m_PrevPosition;
+	int m_IdleCount;
+	
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_FLIES;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= TICK_FREQUENCY;
+		DisableActivateCheck();
+		DisableDeactivateCheck();
+	}	
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		float dist_sqr = vector.DistanceSq(player.GetPosition(), m_PrevPosition);
+		if( dist_sqr < DISTANCE_SENSITIVITY_SQR)//has the player stayed still since last check
+		{
+			m_IdleCount++;
+		}
+		else
+		{
+			if(m_IdleCount >= IDLE_COUNT_THRESHOLD)//disable the effect
+			{
+				player.m_CorpseState = -PlayerConstants.CORPSE_STATE_DECAYED;
+				player.SetSynchDirty();
+			}
+			
+			m_IdleCount = 0;//player moved, reset the count
+		}
+		m_PrevPosition = player.GetPosition();
+		
+		if( m_IdleCount == IDLE_COUNT_THRESHOLD)//should we play the effect ?
+		{
+			player.m_CorpseState = PlayerConstants.CORPSE_STATE_DECAYED;
+			player.SetSynchDirty();
+		}
+		
+		
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		m_IdleCount = 0;
+		player.m_CorpseState = -PlayerConstants.CORPSE_STATE_DECAYED;
+		player.SetSynchDirty();
+	}	
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+
+	}
+	
+	
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Health.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Health.c
new file mode 100644
index 0000000000000000000000000000000000000000..6cd3035bcfdf1b491cf5ad92fac0d96d7e15a7fb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Health.c
@@ -0,0 +1,44 @@
+class HealthMdfr: ModifierBase
+{
+	private float	m_LastHealthLevel;
+	private float	m_LastBloodLevel;
+	
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_HEALTH;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		DisableDeactivateCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		
+		float blood =  player.GetHealth("GlobalHealth", "Blood");
+		float health = player.GetHealth("GlobalHealth", "Health");	
+
+		float healthdelta  = Math.AbsInt(health - m_LastHealthLevel);
+		if (health <  m_LastHealthLevel) healthdelta = -healthdelta;
+		//if( player.m_NotifiersManager ) player.m_NotifiersManager.FindNotifier(eNotifiers.NTF_LIVES).DisplayTendency(healthdelta);
+		m_LastHealthLevel = health;
+		
+		float blooddelta  = Math.AbsInt(blood - m_LastBloodLevel);
+		if (blood <  m_LastBloodLevel) blooddelta = -blooddelta;
+		//if( player.m_NotifiersManager ) player.m_NotifiersManager.FindNotifier(eNotifiers.NTF_BLOOD).DisplayTendency(blooddelta);
+		m_LastBloodLevel = blood;
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/HealthRegen.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/HealthRegen.c
new file mode 100644
index 0000000000000000000000000000000000000000..894d13c50cafe7df1d1873b2097b3e01bab8ee6c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/HealthRegen.c
@@ -0,0 +1,67 @@
+class HealthRegenMdfr: ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_HEALTH_REGEN;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		DisableDeactivateCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		if (player.IsAlive())//this needs to be here, some of the other modifiers can kill the character during the same modifier tick, and not checking here can partially revive him(resulting in a broken char)
+		{
+
+			float regen_speed = player.GetHealthRegenSpeed() * deltaT;;
+			player.AddHealth("GlobalHealth", "Health" ,  regen_speed );
+			
+			player.AddHealth("RightArm","Health",regen_speed * PlayerConstants.DAMAGE_ZONE_BLOOD_REGEN_MODIFIER );
+			player.AddHealth("RightHand","Health",regen_speed * PlayerConstants.DAMAGE_ZONE_BLOOD_REGEN_MODIFIER);
+			player.AddHealth("LeftArm","Health",regen_speed * PlayerConstants.DAMAGE_ZONE_BLOOD_REGEN_MODIFIER);
+			player.AddHealth("LeftHand","Health",regen_speed * PlayerConstants.DAMAGE_ZONE_BLOOD_REGEN_MODIFIER);
+			
+			//Leg regen when legs are NOT BROKEN
+			if ( player.GetBrokenLegs() == eBrokenLegs.NO_BROKEN_LEGS )
+			{
+				player.AddHealth("RightLeg","Health", PlayerConstants.LEG_HEALTH_REGEN);
+				player.AddHealth("RightFoot","Health", PlayerConstants.LEG_HEALTH_REGEN);
+				player.AddHealth("LeftLeg","Health", PlayerConstants.LEG_HEALTH_REGEN);
+				player.AddHealth("LeftFoot","Health", PlayerConstants.LEG_HEALTH_REGEN);
+			}
+			else
+			{
+				//Leg regen when legs are BROKEN or SPLINTED
+				player.AddHealth("RightLeg","Health", PlayerConstants.LEG_HEALTH_REGEN_BROKEN);
+				player.AddHealth("RightFoot","Health",PlayerConstants.LEG_HEALTH_REGEN_BROKEN);
+				player.AddHealth("LeftLeg","Health", PlayerConstants.LEG_HEALTH_REGEN_BROKEN);
+				player.AddHealth("LeftFoot","Health", PlayerConstants.LEG_HEALTH_REGEN_BROKEN);
+			}
+			
+			player.AddHealth("Torso","Health",regen_speed * PlayerConstants.DAMAGE_ZONE_BLOOD_REGEN_MODIFIER);
+			
+			// We increase head health regeneration as it is unclear to players what health level individual zones have
+			player.AddHealth("Head","Health",( regen_speed * PlayerConstants.DAMAGE_ZONE_BLOOD_REGEN_MODIFIER ) * 2 );
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/HeatComfortMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/HeatComfortMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..7bd94d46c816e9b814663b610875418cdb5796e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/HeatComfortMdfr.c
@@ -0,0 +1,79 @@
+class HeatComfortMdfr: ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime 	= false;
+		m_ID 					= eModifiers.MDF_TEMPERATURE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		DisableDeactivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+	
+	override string GetDebugText()
+	{
+		return m_Player.GetStatHeatComfort().Get().ToString();
+	}
+	
+	override string GetDebugTextSimple()
+	{
+		return m_Player.GetStatHeatComfort().Get().ToString();
+	}
+
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		float heat_comfort = player.GetStatHeatComfort().Get();
+		float health_loss;
+		float value_normalized;
+		
+		if( heat_comfort > PlayerConstants.WATER_LOSS_THRESHOLD_HC_PLUS_LOW )
+		{
+			value_normalized = Math.Lerp(PlayerConstants.WATER_LOSS_THRESHOLD_HC_PLUS_LOW, PlayerConstants.WATER_LOSS_THRESHOLD_HC_PLUS_HIGH, heat_comfort);
+			value_normalized = Math.Clamp(value_normalized, 0, 1);
+			float water_loss = deltaT * Math.Lerp(PlayerConstants.WATER_LOSS_HC_PLUS_LOW, PlayerConstants.WATER_LOSS_HC_PLUS_HIGH, value_normalized);
+			player.GetStatWater().Add(-water_loss);
+
+			if( heat_comfort > PlayerConstants.WATER_LOSS_THRESHOLD_HC_PLUS_HIGH )
+			{
+				value_normalized = Math.Lerp(PlayerConstants.WATER_LOSS_THRESHOLD_HC_PLUS_HIGH, 1.0, heat_comfort);
+				value_normalized = Math.Clamp(value_normalized, 0, 1);
+				health_loss = deltaT * Math.Lerp(PlayerConstants.HEALTH_LOSS_HC_PLUS_LOW, PlayerConstants.HEALTH_LOSS_HC_PLUS_HIGH, value_normalized);
+			}
+		}
+		if( heat_comfort < PlayerConstants.ENERGY_LOSS_THRESHOLD_HC_MINUS_LOW )
+		{
+			value_normalized = Math.InverseLerp(PlayerConstants.ENERGY_LOSS_THRESHOLD_HC_MINUS_LOW, PlayerConstants.ENERGY_LOSS_THRESHOLD_HC_MINUS_HIGH, heat_comfort);
+			value_normalized = Math.Clamp(value_normalized, 0, 1);
+			float energy_loss = deltaT * Math.Lerp(PlayerConstants.ENERGY_LOSS_HC_MINUS_LOW, PlayerConstants.ENERGY_LOSS_HC_MINUS_HIGH, value_normalized);
+			player.GetStatEnergy().Add(-energy_loss);
+
+			if( heat_comfort < PlayerConstants.ENERGY_LOSS_THRESHOLD_HC_MINUS_HIGH )
+			{
+				value_normalized = Math.InverseLerp(PlayerConstants.ENERGY_LOSS_THRESHOLD_HC_MINUS_HIGH, -1.0, heat_comfort);
+				value_normalized = Math.Clamp(value_normalized, 0, 1);
+				health_loss = deltaT * Math.Lerp(PlayerConstants.HEALTH_LOSS_HC_MINUS_LOW, PlayerConstants.HEALTH_LOSS_HC_MINUS_HIGH, value_normalized);
+			}
+		}
+
+		if( health_loss != 0 )
+		{
+			player.AddHealth("","",-health_loss);
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Hunger.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Hunger.c
new file mode 100644
index 0000000000000000000000000000000000000000..70af91e517d2f3893f4b86ab912da532181de99c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Hunger.c
@@ -0,0 +1,52 @@
+class HungerMdfr: ModifierBase
+{
+	protected float	m_EnergyDelta;
+	protected float	m_LastEnergyLevel;
+	ref HumanMovementState		m_MovementState	= new HumanMovementState();
+		
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_HUNGER;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 1;
+		DisableDeactivateCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.GetMovementState(m_MovementState);
+		float energy = player.GetStatEnergy().Get();
+		float metabolic_speed = MiscGameplayFunctions.GetEnergyMetabolicSpeed(m_MovementState.m_iMovement);
+		
+		float modifier = energy/PlayerConstants.SL_ENERGY_MAX + PlayerConstants.CONSUMPTION_MULTIPLIER_BASE; 
+		metabolic_speed *= modifier; //non linear shaping for consumption curve (comment out to have it linear)
+		
+		player.GetStatEnergy().Add( -metabolic_speed * deltaT );
+		if ( energy <= PlayerConstants.LOW_ENERGY_THRESHOLD )
+		{
+			player.SetMixedSoundState( eMixedSoundStates.HUNGRY );
+			if ((player.GetStomach().GetDigestingType() & PlayerStomach.DIGESTING_ENERGY) == 0)
+				player.AddHealth("GlobalHealth", "Health", -PlayerConstants.LOW_ENERGY_DAMAGE_PER_SEC * deltaT );
+		}
+		else
+		{
+			player.UnsetMixedSoundState( eMixedSoundStates.HUNGRY );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ImmuneSystem.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ImmuneSystem.c
new file mode 100644
index 0000000000000000000000000000000000000000..1bda2eb0329f8b28295cc5dfdd6412f3fc0b7f8d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ImmuneSystem.c
@@ -0,0 +1,73 @@
+class ImmuneSystemMdfr: ModifierBase
+{
+	bool m_HasDisease;
+	bool m_HasHealings;
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_IMMUNE_SYSTEM;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		
+		DisableDeactivateCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+//		Debug.Log("ticking immune system", "agent");
+		float result 	= player.GetImmunity() * deltaT;
+		player.ImmuneSystemTick(result, deltaT);
+//		Debug.Log("result: "+result.ToString(), "agent");
+		
+		if( m_HasDisease != player.HasDisease() )
+		{
+			if(player.HasDisease())
+			{
+				if( player.GetNotifiersManager() ) player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_SICK);
+			}
+			else
+			{
+				if( player.GetNotifiersManager() ) player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_SICK);
+			}
+			m_HasDisease = player.HasDisease();
+		}	
+
+			
+		if( m_HasHealings != player.HasHealings() )
+		{
+		
+			if( player.HasHealings() )
+			{
+				if( player.GetNotifiersManager() )
+					player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+			}
+			else
+			{
+				if( player.GetNotifiersManager() )
+					player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+			}
+			m_HasHealings = player.HasHealings();
+		}
+		
+	}
+	
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ImmunityBoost.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ImmunityBoost.c
new file mode 100644
index 0000000000000000000000000000000000000000..d376226fa2bd684bdaa47a21bc37725b128fc051
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ImmunityBoost.c
@@ -0,0 +1,70 @@
+class ImmunityBoost: ModifierBase
+{
+	float 			m_LastWaterLevel;
+	ref HumanMovementState		m_MovementState	= new HumanMovementState();
+	float m_RegenTime;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_IMMUNITYBOOST;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 1;
+		m_RegenTime = PlayerConstants.VITAMINS_LIFETIME_SECS;
+	}		
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override string GetDebugText()
+	{
+		return (m_RegenTime - GetAttachedTime()).ToString();
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.SetImmunityBoosted(true);
+		player.IncreaseHealingsCount();
+		/*
+		if( player.GetNotifiersManager() )
+			player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+		*/
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.SetImmunityBoosted(false);
+		player.DecreaseHealingsCount();
+		/*
+		if( player.GetNotifiersManager() )
+			player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+		*/
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if( attached_time >= m_RegenTime )
+		{
+			return true;	
+		}
+		else
+		{
+			return false;	
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Mask.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Mask.c
new file mode 100644
index 0000000000000000000000000000000000000000..444f03852a74ce0de65330d8ca281886e22c9655
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Mask.c
@@ -0,0 +1,119 @@
+class MaskMdfr: ModifierBase
+{
+	const float IN_AREA_CONSUME_FILTER_QUANTITY_PER_SEC = 0.3;
+	const float OUT_AREA_CONSUME_FILTER_QUANTITY_PER_SEC = 0.03;
+	
+	const float STAMINA_RECOVERY_MODIFIER = 0.5;
+	const float STAMINA_DEPLETION_MODIFIER = 1.25;
+	
+	const float LOW_FILTER_SOUND_EVENT_MIN = 3;
+	const float LOW_FILTER_SOUND_EVENT_MAX = 9;
+	
+	const float LOW_FILTER_SOUND_THRESHOLD = 0.2;//[0..1] , what's the filter quantity between 0 and 1 at which low filter sounds begin playing ?
+	
+	float m_SoundTimeAccu1;
+	float m_NextSoundEventTime;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_MASK;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE_SHORT;
+	}	
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return MaskBase.Cast(player.GetInventory().FindAttachment(InventorySlots.MASK)) != null;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition( player);
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		MaskBase mask = MaskBase.Cast(player.GetInventory().FindAttachment(InventorySlots.MASK));
+		
+		float consume_quantity = OUT_AREA_CONSUME_FILTER_QUANTITY_PER_SEC;
+		
+		bool inside_area = m_Manager.IsModifierActive(eModifiers.MDF_AREAEXPOSURE);
+		
+		if(inside_area)
+		{
+			consume_quantity = IN_AREA_CONSUME_FILTER_QUANTITY_PER_SEC;
+		}
+
+		if ( mask && !mask.IsDamageDestroyed())
+		{
+			bool consuming_filter = mask.ConsumeQuantity(consume_quantity * deltaT, player);
+			StaminaSoundHandlerServer.Cast(player.GetPlayerSoundManagerServer().GetHandler(eSoundHandlers.STAMINA)).SetStaminaZoneOffset(1);
+
+			if (mask.HasValidFilter())
+			{
+				player.GetStaminaHandler().ActivateRecoveryModifier(EStaminaMultiplierTypes.MASK);
+				player.GetStaminaHandler().ActivateDepletionModifier(EStaminaMultiplierTypes.MASK);
+				
+			}
+			else
+			{
+				player.GetStaminaHandler().DeactivateRecoveryModifier(EStaminaMultiplierTypes.MASK);
+				player.GetStaminaHandler().DeactivateDepletionModifier(EStaminaMultiplierTypes.MASK);
+			}
+			HandleSounds(player, deltaT, mask);
+		}
+	}
+	
+	void HandleSounds(PlayerBase player, float deltaT, MaskBase mask)
+	{
+		float filter_quantity_01 = mask.GetFilterQuantity01();
+		
+		if(mask.CanHaveExternalFilter() && !mask.IsExternalFilterAttached())
+			return;
+		
+		if(filter_quantity_01 > LOW_FILTER_SOUND_THRESHOLD)
+			return;
+		
+		float low_quantity_norm = Math.InverseLerp(0, LOW_FILTER_SOUND_THRESHOLD, filter_quantity_01);//should give us 0..1 based on normalized quantity between 0 and LOW_FILTER_SOUND_THRESHOLD
+		
+		m_SoundTimeAccu1 += deltaT;
+		if( m_SoundTimeAccu1 >= m_NextSoundEventTime)
+		{
+			m_NextSoundEventTime = Math.Lerp(LOW_FILTER_SOUND_EVENT_MIN, LOW_FILTER_SOUND_EVENT_MAX,low_quantity_norm);
+			
+			EPlayerSoundEventID event_type = EPlayerSoundEventID.STAMINA_LOW_FILTER_UPPER;
+			//under 50% of low filter quantity (not overall filter quantity!!)
+			if (low_quantity_norm < 0.5)
+			{
+				event_type = EPlayerSoundEventID.STAMINA_LOW_FILTER_MID;
+			}
+			if (low_quantity_norm < 0.25)
+			{
+				event_type = EPlayerSoundEventID.STAMINA_LOW_FILTER_LOWER;
+			}
+			player.RequestSoundEventEx(event_type, false, EPlayerSoundEventParam.HIGHEST_PRIORITY);
+			m_SoundTimeAccu1 = 0;
+		} 
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		//m_NextSoundEventTime = Math.RandomFloat(LOW_FILTER_SOUND_EVENT_MIN, LOW_FILTER_SOUND_EVENT_MAX);
+	}	
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		StaminaSoundHandlerServer.Cast(player.GetPlayerSoundManagerServer().GetHandler(eSoundHandlers.STAMINA)).SetStaminaZoneOffset(0);
+		player.GetStaminaHandler().DeactivateRecoveryModifier(EStaminaMultiplierTypes.MASK);
+		player.GetStaminaHandler().DeactivateDepletionModifier(EStaminaMultiplierTypes.MASK);
+	}
+	
+	
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/MorphineMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/MorphineMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..86f33395984edc81cc98b60e980e51a5dcf98045
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/MorphineMdfr.c
@@ -0,0 +1,69 @@
+class MorphineMdfr: ModifierBase
+{
+	const int LIFETIME = 60;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_MORPHINE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 1;
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override string GetDebugText()
+	{
+		return (LIFETIME - GetAttachedTime()).ToString();
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		if (player.GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS)
+		{
+			player.m_ShockHandler.SetMultiplier(0.1); //was 0.5 //Switch the shock multiplier NEED A CONST
+		}
+		//if( player.GetNotifiersManager() ) player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+		player.IncreaseHealingsCount();
+		m_Player.m_InjuryHandler.m_ForceInjuryAnimMask = m_Player.m_InjuryHandler.m_ForceInjuryAnimMask | eInjuryOverrides.MORPHINE;
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		
+		if (player.GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS)
+			player.m_ShockHandler.SetMultiplier(1); //Reset the shock multiplier when modifier stops
+		//if( player.GetNotifiersManager() ) player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+		player.DecreaseHealingsCount();
+		m_Player.m_InjuryHandler.m_ForceInjuryAnimMask = m_Player.m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.MORPHINE;
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if( attached_time >= LIFETIME )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/PainKillersMdfr.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/PainKillersMdfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..caa8441107eaa40adf8c0fdfa92defc6edbcf56c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/PainKillersMdfr.c
@@ -0,0 +1,77 @@
+class PainKillersMdfr: ModifierBase
+{
+	const int LIFETIME = 240;
+	const int ACTIVATION_DELAY = 15;
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_PAINKILLERS;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 1;
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override string GetDebugText()
+	{
+		return (LIFETIME - GetAttachedTime()).ToString();
+	}
+
+	
+	override void OnActivate(PlayerBase player)
+	{
+		if (player.GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS)
+			player.m_ShockHandler.SetMultiplier(0.5);//was 0.75 //Switch the shock multiplier NEED A CONST
+		player.IncreaseHealingsCount();
+		/*
+		if( player.GetNotifiersManager() ) 
+			player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+		*/
+		m_Player.m_InjuryHandler.m_ForceInjuryAnimMask = m_Player.m_InjuryHandler.m_ForceInjuryAnimMask | eInjuryOverrides.PAIN_KILLERS_LVL0;
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		if (player.GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS)
+			player.m_ShockHandler.SetMultiplier(1); //Reset the shock multiplier when modifier stops
+		player.DecreaseHealingsCount();
+		/*
+		if( player.GetNotifiersManager() ) 
+			player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+		*/
+		m_Player.m_InjuryHandler.m_ForceInjuryAnimMask = m_Player.m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.PAIN_KILLERS_LVL0;
+		m_Player.m_InjuryHandler.m_ForceInjuryAnimMask = m_Player.m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.PAIN_KILLERS_LVL1;
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if( attached_time >= LIFETIME )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		if(GetAttachedTime() > ACTIVATION_DELAY)
+		{
+			m_Player.m_InjuryHandler.m_ForceInjuryAnimMask = m_Player.m_InjuryHandler.m_ForceInjuryAnimMask | eInjuryOverrides.PAIN_KILLERS_LVL1;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Saline.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Saline.c
new file mode 100644
index 0000000000000000000000000000000000000000..17d24f2cbfbb6dfa5351bc1ae65eee97efbc341c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Saline.c
@@ -0,0 +1,68 @@
+class SalineMdfr: ModifierBase
+{
+	float m_RegenTime;
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_IsPersistent = true;
+		m_ID 					= eModifiers.MDF_SALINE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_RegenTime = CalculateRegenTime();
+		DisableActivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+
+		if ( attached_time > m_RegenTime )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseHealingsCount();
+		/*
+		if( player.GetNotifiersManager() )
+			player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_PILLS);
+		*/
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseHealingsCount();
+		/*
+		if( player.GetNotifiersManager() )
+			player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_PILLS);
+		*/
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.AddHealth("", "Blood", PlayerConstants.SALINE_BLOOD_REGEN_PER_SEC * deltaT);
+		player.GetStatWater().Add( PlayerConstants.SALINE_WATER_REGEN_PER_SEC * deltaT );
+	}
+	
+	float CalculateRegenTime()
+	{
+		float regen_time = PlayerConstants.SALINE_LIQUID_AMOUNT / PlayerConstants.SALINE_BLOOD_REGEN_PER_SEC;
+		return regen_time;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Shock.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Shock.c
new file mode 100644
index 0000000000000000000000000000000000000000..f40b232c3b47f6b691cb9774b627bde7ebea245f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Shock.c
@@ -0,0 +1,76 @@
+class ShockMdfr: ModifierBase
+{
+	private const float	 	UNCONSCIOUS_LIMIT = 50;
+	private const float 	SHOCK_INCREMENT_PER_SEC = 1;
+	
+	override void Init()
+	{
+		m_ID 					= eModifiers.MDF_SHOCK;
+		m_TickIntervalInactive 	= 1;
+		m_TickIntervalActive 	= 0.35;
+		//DisableActivateCheck();
+		DisableDeactivateCheck();
+	}	
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+	}
+	
+	float GetRefillSpeed(PlayerBase player)
+	{
+		if ( player.m_IsDrowning )
+		{
+			return 0;
+		}
+		if ( player.IsUnconscious() )
+		{
+			return CfgGameplayHandler.GetShockRefillSpeedUnconscious() * player.m_UnconRefillModifier;
+		}
+		if (player.GetBrokenLegs() != eBrokenLegs.BROKEN_LEGS || (player.m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE || player.m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE))
+		{
+			return CfgGameplayHandler.GetShockRefillSpeedConscious();
+		}
+		if ( player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS && (player.IsSwimming() || player.IsClimbingLadder()) )
+		{
+			return CfgGameplayHandler.GetShockRefillSpeedUnconscious();
+		}
+		return 0; //Block shock regen when standing with broken legs
+	}
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		//Print("m_UnconRefillModifier" + player.m_UnconRefillModifier);
+		if ( GetGame().GetTime() > player.m_LastShockHitTime + PlayerConstants.SHOCK_REFILL_COOLDOWN_AFTER_HIT && player.GetPulseType() == EPulseType.REGULAR)
+		{
+			if (!player.IsUnconscious())
+				player.m_UnconRefillModifier = 1;//reset this UnconRefillModifier some time after the player has been hit(we want the UnconRefillModifier to only apply to uncon induced by a projectile)
+			
+			if (player.GetHealth01("","Shock") == 1)//no need to continue if the shock is full
+				return;
+			
+			if ( !CfgGameplayHandler.GetAllowRefillSpeedModifier() )
+				player.m_UnconRefillModifier = 1;
+			
+			player.AddHealth("","Shock", deltaT * GetRefillSpeed(player) );
+		}
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ShockDamage.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ShockDamage.c
new file mode 100644
index 0000000000000000000000000000000000000000..90797635a2e93698018bcf6498320dfd43e219b9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/ShockDamage.c
@@ -0,0 +1,50 @@
+class ShockDamageMdfr: ModifierBase
+{
+	const int UNCONSIOUSS_COOLDOWN_TIME = 60;//in s
+	override void Init()
+	{
+		m_TrackActivatedTime	= false;
+		m_ID 					= eModifiers.MDF_SHOCK_DAMAGE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 0.5;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if( !player.IsUnconscious() && player.GetHealth("","Blood") <= PlayerConstants.SHOCK_DAMAGE_BLOOD_THRESHOLD_HIGH && GetGame().GetTime() > (player.m_UnconsciousEndTime + UNCONSIOUSS_COOLDOWN_TIME) )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+	// ------------------------------------------------------------------------------
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		float blood =  player.GetHealth("","Blood");
+		float value = Math.InverseLerp( PlayerConstants.SHOCK_DAMAGE_BLOOD_THRESHOLD_HIGH, PlayerConstants.SHOCK_DAMAGE_BLOOD_THRESHOLD_LOW, blood );
+		value = Math.Clamp(value,0,1);
+		float dmg = Math.Lerp( PlayerConstants.SHOCK_DAMAGE_HIGH, PlayerConstants.SHOCK_DAMAGE_LOW, value);
+		float damage =  -dmg * deltaT;
+		player.AddHealth("","Shock", damage);
+		//PrintString(damage.ToString());
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Stomach.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Stomach.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb775ee10ac3901103579d456f4112d6cf7d8875
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Stomach.c
@@ -0,0 +1,70 @@
+class StomachMdfr: ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_STOMACH;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		
+		DisableDeactivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.m_PlayerStomach.Update(deltaT);
+		/*
+		float stomachs_combined_before = player.GetStatStomachWater().Get() + player.GetStatStomachEnergy().Get();
+		if(stomachs_combined_before <=0) // takes care of division by 0 also there is no point in doing anything if there is nothing to transfer
+		{
+			player.GetStatStomachVolume().Set(0);
+			return;
+		}
+		
+		// Energy
+		if ( player.GetStatStomachEnergy().Get() >= PlayerConstants.STOMACH_ENERGY_TRANSFERED_PER_SEC*deltaT )
+		{
+			player.GetStatEnergy().Add(PlayerConstants.STOMACH_ENERGY_TRANSFERED_PER_SEC*deltaT);
+			player.GetStatStomachEnergy().Add(-PlayerConstants.STOMACH_ENERGY_TRANSFERED_PER_SEC*deltaT);
+		}
+		else
+		{
+			player.GetStatEnergy().Add(player.GetStatStomachEnergy().Get());
+			player.GetStatStomachEnergy().Set(0);
+		}
+		//Water
+		if (  player.GetStatStomachWater().Get() >= PlayerConstants.STOMACH_WATER_TRANSFERED_PER_SEC*deltaT )
+		{
+			player.GetStatWater().Add(PlayerConstants.STOMACH_WATER_TRANSFERED_PER_SEC*deltaT);
+			player.GetStatStomachWater().Add(-PlayerConstants.STOMACH_WATER_TRANSFERED_PER_SEC*deltaT);
+			
+		}
+		else
+		{
+			player.GetStatWater().Add(player.GetStatStomachWater().Get());
+			player.GetStatStomachWater().Set(0);
+			
+		}
+		
+		float stomachs_combined_after = player.GetStatStomachWater().Get() + player.GetStatStomachEnergy().Get();
+		float percentage = stomachs_combined_after / stomachs_combined_before;
+		
+		player.GetStatStomachVolume().Set( player.GetStatStomachVolume().Get() * percentage );
+		*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Testing.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Testing.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d87d4beeb91348d86f0a6105cf590138877272c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Testing.c
@@ -0,0 +1,55 @@
+class TestingMdfr: ModifierBase
+{
+	float stuff;
+	bool swch;
+	override void Init()
+	{
+		m_TrackActivatedTime			= true;
+		m_ID 					= eModifiers.MDF_TESTING;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		//m_Timer1.Run(1, this, "BadaBang");
+		player.GetSymptomManager().QueueUpPrimarySymptom( SymptomIDs.SYMPTOM_COUGH );
+		
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+
+	// ------------------------------------------------------------------------------
+
+	// ------------------------------------------------------------------------------
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return swch;
+		if(stuff < 40)
+		{
+			return true;
+		}
+		else return false;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if (GetAttachedTime() > 100) {swch = true; return true;}
+		else return false;
+		if(stuff > 40)
+		{
+			return true;
+		}
+		else return false;
+	}
+	// ------------------------------------------------------------------------------
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		stuff += deltaT;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Thirst.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Thirst.c
new file mode 100644
index 0000000000000000000000000000000000000000..3716f67946f91056fd7704ecc33c1d0eb54b365b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Thirst.c
@@ -0,0 +1,52 @@
+class ThirstMdfr: ModifierBase
+{
+	float 			m_LastWaterLevel;
+	ref HumanMovementState		m_MovementState	= new HumanMovementState();
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_THIRST;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 1;
+		DisableDeactivateCheck();
+	}		
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.GetMovementState(m_MovementState);
+		float water = player.GetStatWater().Get();
+		float metabolic_speed = MiscGameplayFunctions.GetWaterMetabolicSpeed(m_MovementState.m_iMovement);
+		
+		float modifier = water/PlayerConstants.SL_WATER_MAX + PlayerConstants.CONSUMPTION_MULTIPLIER_BASE;
+		metabolic_speed *= modifier; //non linear shaping for consumption curve (comment out to have it linear)
+		
+		player.GetStatWater().Add( (-metabolic_speed * deltaT) );
+		
+		if ( water <= PlayerConstants.LOW_WATER_THRESHOLD )
+		{
+			player.SetMixedSoundState( eMixedSoundStates.THIRSTY );
+			if ((player.GetStomach().GetDigestingType() & PlayerStomach.DIGESTING_WATER) == 0)
+				player.AddHealth("GlobalHealth", "Health", -PlayerConstants.LOW_WATER_DAMAGE_PER_SEC * deltaT );
+		}
+		else
+		{
+			player.UnsetMixedSoundState( eMixedSoundStates.THIRSTY );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Toxicity.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Toxicity.c
new file mode 100644
index 0000000000000000000000000000000000000000..47f51c96999c90ab5b7d396e1dffc8f229e102b0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Toxicity.c
@@ -0,0 +1,48 @@
+class ToxicityMdfr: ModifierBase
+{
+	private const float	 	TOXICITY_CLEANUP_PER_SEC = 1;
+	private const float 	VOMIT_THRESHOLD = 70;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_TOXICITY;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		DisableDeactivateCheck();
+	}	
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return true;
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		player.GetStatToxicity().Add( -TOXICITY_CLEANUP_PER_SEC * deltaT );
+		if( player.GetStatToxicity().Get() > VOMIT_THRESHOLD )
+		{
+			SymptomBase symptom = player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_VOMIT);
+		
+			if( symptom )
+			{ 
+				symptom.SetDuration(Math.RandomIntInclusive(4,8));
+			}
+		}
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Unconsciousness.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Unconsciousness.c
new file mode 100644
index 0000000000000000000000000000000000000000..29806864f0c162b0f276c438a9ff610903979e0b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/Unconsciousness.c
@@ -0,0 +1,58 @@
+class UnconsciousnessMdfr: ModifierBase
+{
+	const int UNCONSIOUSS_COOLDOWN_TIME = 60;//in s
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_UNCONSCIOUSNESS;
+		m_TickIntervalInactive 	= 0.5;
+		m_TickIntervalActive 	= 0.5;
+	}		
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if( player.GetHealth("","Shock") <=  PlayerConstants.UNCONSCIOUS_THRESHOLD )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		DayZPlayerSyncJunctures.SendPlayerUnconsciousness(player, true);
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.m_UnconsciousEndTime = GetGame().GetTime();
+		DayZPlayerSyncJunctures.SendPlayerUnconsciousness(player, false);
+	}
+	
+	override string GetDebugText()
+	{
+		string text_pulse = "pulse type:"+m_Player.GetPulseType()+"|";
+		string text_shock = (PlayerConstants.CONSCIOUS_THRESHOLD - m_Player.GetHealth("","Shock")).ToString();
+		string debug_text = text_pulse + text_shock;
+		return debug_text;
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if( player.GetHealth("","Shock") >= PlayerConstants.CONSCIOUS_THRESHOLD && player.GetPulseType() == EPulseType.REGULAR )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/AreaExposure.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/AreaExposure.c
new file mode 100644
index 0000000000000000000000000000000000000000..b9f6e2339bf84a41ff4994df24ab202c2a147b2f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/AreaExposure.c
@@ -0,0 +1,147 @@
+class AreaExposureMdfr: ModifierBase
+{
+	const int EVENT_1_INTERVAL_MIN = 3;
+	const int EVENT_1_INTERVAL_MAX = 5;
+	
+	const float AGENTS_PER_SEC = 5;
+	protected float m_NextEvent1;
+	protected float m_Time1;
+	
+	const int EVENT_2_INTERVAL_MIN = 13;
+	const int EVENT_2_INTERVAL_MAX = 18;
+	
+	
+	const float AGENT_DOSE_PER_BS_SEC = 0.33;//how many agents will be injected in one sec per a single bleeding source
+	
+	protected float m_NextEvent2;
+	protected float m_Time2;
+	
+	
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_AREAEXPOSURE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE_LONG;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE_SHORT;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_ZONE_EXPOSURE;
+		DisableActivateCheck();
+		DisableDeactivateCheck();
+		
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+	
+		JsonDataContaminatedAreas data = EffectAreaLoader.GetData();
+		if (data)
+		{
+			MiscGameplayFunctions.TeleportCheck(player, data.SafePositions);
+		}
+		
+		//make the player cough immediately
+		float transmitted = TransmitAgents(player, 1);
+		if(transmitted) 
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_COUGH);
+		
+		m_NextEvent1 = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN, EVENT_1_INTERVAL_MAX );
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		#ifdef DEVELOPER
+		if(!player.GetCanBeDestroyed())
+			return;
+		#endif
+		
+		float transmitted = TransmitAgents(player, AGENTS_PER_SEC * deltaT);
+		
+		m_Time2 += deltaT;
+		
+		if (transmitted)
+		{
+			m_Time1 += deltaT;
+			if (m_Time1 >= m_NextEvent1 )
+			{
+				player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_COUGH);
+				
+				if(Math.RandomFloat01() < 0.25)//creates a cough cooldown once in a while
+				{
+					m_NextEvent1 = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN * 2, EVENT_1_INTERVAL_MAX * 2 );
+				}
+				else
+				{
+					m_NextEvent1 = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN, EVENT_1_INTERVAL_MAX );
+				}
+			
+				m_Time1 = 0;
+			}
+		}
+		
+		if ( m_Time2 >= m_NextEvent2 )
+		{
+			BleedingSourceCreateCheck(player);
+			m_Time2 = 0;
+			m_NextEvent2 = Math.RandomFloatInclusive( EVENT_2_INTERVAL_MIN, EVENT_2_INTERVAL_MAX );
+		}
+		
+		ApplyAgentsToBleedingSources(player, deltaT);
+		
+	}
+
+	void ApplyAgentsToBleedingSources(PlayerBase player, float deltaT)
+	{
+		
+		int count = player.GetBleedingSourceCount();
+		float agent_dose = count * AGENT_DOSE_PER_BS_SEC * deltaT;
+		player.InsertAgent(eAgents.CHEMICAL_POISON, agent_dose);
+		
+	}
+	
+	void BleedingSourceCreateCheck(PlayerBase player)
+	{
+		int free_bs_locations = 0;//bitmask where each bit set to 1 represents available bleeding source location
+		set<int> list = player.GetBleedingManagerServer().GetBleedingSourcesLocations();
+		
+		foreach(int location: list)
+		{
+			float prot_level = PluginTransmissionAgents.GetProtectionLevelEx(DEF_CHEMICAL, location, player, true);
+			float dice_throw = Math.RandomFloat01();
+			if(dice_throw > prot_level)
+			{
+				free_bs_locations = player.GetBleedingManagerServer().GetFreeBleedingSourceBitsByInvLocation(location) | free_bs_locations;
+			}
+		}
+		
+		int num_of_free_bs = Math.GetNumberOfSetBits(free_bs_locations);//gets us the number of bits set to 1, where each represents a free bleeding source location
+		
+		if ( num_of_free_bs > 0 )
+		{
+			int random_bs_index = Math.RandomIntInclusive(0, num_of_free_bs - 1 );// - 1 on the max to convert count to index
+			int random_bs_bit = Math.Pow(2, Math.GetNthBitSet(free_bs_locations,random_bs_index));
+			player.GetBleedingManagerServer().AttemptAddBleedingSourceDirectly(random_bs_bit, eBleedingSourceType.CONTAMINATED);
+		}
+	}
+
+	float TransmitAgents(PlayerBase player, float count)
+	{
+		PluginTransmissionAgents plugin = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+		return plugin.TransmitAgentsEx(null, player, AGT_AIRBOURNE_CHEMICAL, count, eAgents.CHEMICAL_POISON);
+	}
+	
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Bleeding.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Bleeding.c
new file mode 100644
index 0000000000000000000000000000000000000000..3813d5cc936c9a4929ba537c0f3fbde145e88181
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Bleeding.c
@@ -0,0 +1,58 @@
+//checks for critical blood level and kills the character if bellow
+class BleedingCheckMdfr: ModifierBase
+{
+	protected const float		BLOOD_DECREMENT_PER_SEC = -10;
+	PluginAdminLog 				m_AdminLog;
+		
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BLEEDING;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		
+		if( GetGame().IsServer() )
+		{
+			m_AdminLog 				= PluginAdminLog.Cast( GetPlugin(PluginAdminLog) );
+		}
+		
+		DisableDeactivateCheck();
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		float blood = player.GetHealth("","Blood");
+		
+		if( blood < PlayerConstants.BLOOD_THRESHOLD_FATAL )
+		{
+			return true;
+		}
+		return false;
+		
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		player.SetHealth("","",-1000);
+		
+		if ( m_AdminLog )
+		{
+			m_AdminLog.BleedingOut( player );
+		}
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Blinded.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Blinded.c
new file mode 100644
index 0000000000000000000000000000000000000000..69e18c7342d701bd9e9e340fc1da062d02abb3e9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Blinded.c
@@ -0,0 +1,49 @@
+class BlindedMdfr: ModifierBase
+{
+	private const float		BLIND_TIME = 7;
+	private float	 		m_Timer;
+
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BLINDED;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		DisableActivateCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{	
+		m_Timer = 0;
+		
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{	
+		g_Game.GetWorld().SetAperture(0);
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if ( m_Timer > BLIND_TIME )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		m_Timer++;
+		g_Game.GetWorld().SetAperture(m_Timer);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/BrokenArms.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/BrokenArms.c
new file mode 100644
index 0000000000000000000000000000000000000000..8cc75df7bd96b3d652d13c1cee64bebea702d7e7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/BrokenArms.c
@@ -0,0 +1,43 @@
+class BrokenArmsMdfr: ModifierBase
+{
+	private const 	float	HEALTHY_ARM = 80;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BROKEN_ARMS;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if ( player.GetHealth("RightArm", "Health") <= 0 || player.GetHealth("LeftArm", "Health") <= 0 )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		// player.setBrokenLimbs("Arms",true);
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		// player.setBrokenLimbs("Arms",false);
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if ( player.GetHealth("RightArm", "Health") >= HEALTHY_ARM && player.GetHealth("LeftArm", "Health") >= HEALTHY_ARM )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/BrokenLegs.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/BrokenLegs.c
new file mode 100644
index 0000000000000000000000000000000000000000..b127cde34d6777db4738dffa5c6b97143056a6b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/BrokenLegs.c
@@ -0,0 +1,83 @@
+class BrokenLegsMdfr: ModifierBase
+{
+	private const 	float	HEALTHY_LEG = 100; //Health at which legs are no longer considered broken
+	private 		int 	currentState = -1; //Current broken leg state used upon reconnect
+	private const 	float	TIME_TO_UPDATE = 0.5;
+	private			float	elapsedTime = TIME_TO_UPDATE + 1;
+	
+	#ifdef DEVELOPER
+	ref static Timer timer;
+	#endif
+
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BROKEN_LEGS;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 0.5;
+		m_ActivationType 		= EActivationType.TRIGGER_EVENT_ON_ACTIVATION;
+		m_IsPersistent			= true;
+	}
+	
+	override void OnActivate(PlayerBase player)
+	{
+		//Print("------------> OnActivate - BrokenLegsMdfr");
+		player.SetBrokenLegs(-eBrokenLegs.BROKEN_LEGS);//note the negative sign
+		player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_FRACTURE);
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		//Print("------------> OnReconnect - BrokenLegsMdfr");
+		player.SetBrokenLegs(player.GetBrokenLegs());
+		player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_FRACTURE);
+	}
+	
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.UpdateBrokenLegs(eBrokenLegs.NO_BROKEN_LEGS);
+		if ( player.IsWearingSplint() )
+		{
+			MiscGameplayFunctions.RemoveSplint(player); //Remove splint when leg is healed
+		}
+		
+		player.SetBrokenLegs(eBrokenLegs.NO_BROKEN_LEGS);
+		player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_FRACTURE);
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if ( player.GetHealth("RightLeg", "Health") >= HEALTHY_LEG && player.GetHealth("LeftLeg", "Health") >= HEALTHY_LEG )
+		{
+			
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.UpdateBrokenLegs(/*legacy param - value not used*/0);
+	}
+	
+
+	#ifdef DEVELOPER
+	static void DelayedRequest(PlayerBase player, bool state)
+	{
+		timer = new Timer( CALL_CATEGORY_SYSTEM );
+		if(state)
+			timer.Run( 10 , player.GetModifiersManager().GetModifier(eModifiers.MDF_BROKEN_LEGS), "Delayed", new Param1<bool>(state));
+		else
+			BrokenLegsMdfr.Cast(player.GetModifiersManager().GetModifier(eModifiers.MDF_BROKEN_LEGS)).Delayed(false);
+	}
+	
+	void Delayed(bool state)
+	{
+		m_Player.GetModifiersManager().ActivateModifier(eModifiers.MDF_BROKEN_LEGS);
+	}
+	#endif
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Burning.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Burning.c
new file mode 100644
index 0000000000000000000000000000000000000000..760c0f9b8d417957fa0bdbe740fc65f495b7053a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Burning.c
@@ -0,0 +1,50 @@
+class BurningMdfr: ModifierBase
+{
+	private const float	 	BURNING_TRESHOLD = 199;
+	private const float	 	HEALTH_DECREMENT_PER_SEC = -5;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_BURNING;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	override bool ActivateCondition(PlayerBase player)
+	{
+		float hc = player.GetStatHeatComfort().Get();
+		if ( hc > BURNING_TRESHOLD )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		//Print("My face is melting!");
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if ( player.GetStatHeatComfort().Get() <= BURNING_TRESHOLD )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		float currenthealth = player.GetHealth("GlobalHealth", "Health");
+		player.SetHealth("GlobalHealth", "Health" , ( currenthealth + (HEALTH_DECREMENT_PER_SEC*deltaT) ) );	
+		//player.GetStatTemperature().Set( player.GetStatTemperature().GetMax() );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Fatigue.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Fatigue.c
new file mode 100644
index 0000000000000000000000000000000000000000..cab787b49854b89f97ec8de62392fd12eb359785
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Fatigue.c
@@ -0,0 +1,59 @@
+class FatigueMdfr: ModifierBase
+{	
+	private float m_Time;
+	private float m_NextEvent;
+	
+	static const float FATIGUE_EVENT_INTERVAL_MIN = 5;
+	static const float FATIGUE_EVENT_INTERVAL_MAX = 12;
+	static const float STAMINA_RECOVERY_MULTIPLIER = 0.33;
+	static const float STAMINA_DEPLETION_MULTIPLIER = 1.33;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_FATIGUE;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE_LONG;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return (player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION1) || player.GetModifiersManager().IsModifierActive(eModifiers.MDF_POISONING) || player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION2));
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		if( player.m_NotifiersManager ) 
+			player.m_NotifiersManager.ActivateByType(eNotifiers.NTF_FEVERISH);
+		
+
+		
+		player.GetStaminaHandler().ActivateRecoveryModifier(EStaminaMultiplierTypes.FATIGUE);
+		player.GetStaminaHandler().ActivateDepletionModifier(EStaminaMultiplierTypes.FATIGUE);
+
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+		this.OnActivate(player);
+	}
+
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		//player.GetStaminaHandler().SetDepletionMultiplier(1);
+		player.GetStaminaHandler().DeactivateRecoveryModifier(EStaminaMultiplierTypes.FATIGUE);
+		player.GetStaminaHandler().DeactivateDepletionModifier(EStaminaMultiplierTypes.FATIGUE);
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return  !ActivateCondition(player);
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Fever.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Fever.c
new file mode 100644
index 0000000000000000000000000000000000000000..a913b37562dcabf6534afca43af84b4ad3ccf637
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Fever.c
@@ -0,0 +1,65 @@
+class FeverMdfr: ModifierBase
+{
+	private float m_Time;
+	private float m_NextEvent;
+	
+	static const float EVENT_INTERVAL_MIN = 12;
+	static const float EVENT_INTERVAL_MAX = 18;
+	
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_FEVER;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE_SHORT;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_FEVER;
+	}
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return (player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CHOLERA) || player.GetModifiersManager().IsModifierActive(eModifiers.MDF_INFLUENZA) || player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION2));
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		if( player.m_NotifiersManager ) 
+			player.m_NotifiersManager.ActivateByType(eNotifiers.NTF_FEVERISH);
+		
+		player.GetSymptomManager().QueueUpSecondarySymptom(SymptomIDs.SYMPTOM_FEVERBLUR);
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+		this.OnActivate(player);
+	}
+
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		if( player.m_NotifiersManager ) 
+			player.m_NotifiersManager.DeactivateByType(eNotifiers.NTF_FEVERISH);
+		player.GetSymptomManager().RemoveSecondarySymptom(SymptomIDs.SYMPTOM_FEVERBLUR);
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		float water_loss = deltaT * PlayerConstants.WATER_LOSS_FEVER;
+		player.GetStatWater().Add(-water_loss);
+		
+		m_Time += deltaT;
+	
+		if ( m_Time >= m_NextEvent )
+		{
+			m_Time = 0;
+			m_NextEvent = Math.RandomFloatInclusive( EVENT_INTERVAL_MIN, EVENT_INTERVAL_MAX );
+			
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_HOT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HeartAttack.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HeartAttack.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2f8c1ab63ea456e2d7189a3cac6360c997896b4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HeartAttack.c
@@ -0,0 +1,44 @@
+class HeartAttackMdfr: ModifierBase
+{
+	private const float 	HEALTH_DECREMENT_PER_SEC = -0.2;
+	private const float 	SHOCK_DECREMENT_PER_SEC = -2;
+	private const float 	SHOCK_LIMIT = 0;
+		
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_HEART_ATTACK;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_IsPersistent = true;
+		DisableDeactivateCheck();
+		DisableActivateCheck();
+	}
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		if ( player.GetHealth("GlobalHealth","Shock") <= SHOCK_LIMIT )
+		{
+			float currenthealth = player.GetHealth("GlobalHealth", "Health");
+			player.AddHealth("GlobalHealth", "Health" , HEALTH_DECREMENT_PER_SEC * deltaT );
+		}
+		else
+		{
+			float currentshock =  player.GetHealth("GlobalHealth", "Shock");
+			player.AddHealth("GlobalHealth", "Shock", SHOCK_DECREMENT_PER_SEC * deltaT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HeatBuffer.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HeatBuffer.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e676c95aa045cdaf06fe4b65a14daa804b9d99a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HeatBuffer.c
@@ -0,0 +1,62 @@
+class HeatBufferMdfr: ModifierBase
+{
+	protected const float HEATBUFFER_SHOW = 25.0;
+	protected const float HEATBUFFER_HIDE = 20.0;
+
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_HEATBUFFER;
+		m_TickIntervalInactive 	= 1;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		float heatbuffer = player.GetStatHeatBuffer().Get();
+		if ( heatbuffer >= HEATBUFFER_SHOW )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		if( player.GetNotifiersManager() )
+		{
+			//player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_HEATBUFFER);
+			player.ToggleHeatBufferVisibility( true );
+		}
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		if( player.GetNotifiersManager() )
+		{
+			//player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_HEATBUFFER);
+			player.ToggleHeatBufferVisibility( false );
+		}
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float heatbuffer = player.GetStatHeatBuffer().Get();
+		if ( heatbuffer < HEATBUFFER_HIDE )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HemolyticReaction.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HemolyticReaction.c
new file mode 100644
index 0000000000000000000000000000000000000000..ca444ddcba96bdb0cd14d7b126f45d472ae1937b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/HemolyticReaction.c
@@ -0,0 +1,60 @@
+class HemolyticReactionMdfr: ModifierBase
+{
+	private float		m_RunningTime;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = true;
+		m_ID 					= eModifiers.MDF_HEMOLYTIC_REACTION;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_IsPersistent = true;
+		m_RunningTime = CalculateRunTime();
+		
+		DisableActivateCheck();
+	}
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+		OnActivate(player);
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		float attached_time = GetAttachedTime();
+		
+		if(attached_time > m_RunningTime )
+		{
+			return true;	
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.AddHealth("","Blood",-PlayerConstants.HEMOLYTIC_BLOOD_DRAIN_PER_SEC * deltaT);
+	}
+	
+	float CalculateRunTime()
+	{
+		float time = PlayerConstants.HEMOLYTIC_BLOODLOSS_AMOUNT / PlayerConstants.SALINE_BLOOD_REGEN_PER_SEC;
+		return time;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Poisoning.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Poisoning.c
new file mode 100644
index 0000000000000000000000000000000000000000..871d9e5c424529a0fc875862af4bb5d59eced3c4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Poisoning.c
@@ -0,0 +1,91 @@
+class PoisoningMdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 150;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 0;
+	
+	static const int VOMIT_OCCURRENCES_PER_HOUR_MIN = 60;
+	static const int VOMIT_OCCURRENCES_PER_HOUR_MAX = 120;
+
+	static const int WATER_DRAIN_FROM_VOMIT = 70;
+	static const int ENERGY_DRAIN_FROM_VOMIT = 55;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime	= true;
+		m_IsPersistent			= true;
+		m_ID 					= eModifiers.MDF_POISONING;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.FOOD_POISON) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.FOOD_POISON) <= AGENT_THRESHOLD_DEACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		this.OnActivate(player);
+	}
+	
+	override void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{	
+		int agent_max = PluginTransmissionAgents.GetAgentMaxCount(eAgents.FOOD_POISON);
+		int agent_count = player.m_AgentPool.GetSingleAgentCount(eAgents.FOOD_POISON);
+		float stomach_volume = player.m_PlayerStomach.GetStomachVolume();
+		
+		float norm_value = Math.InverseLerp(0, agent_max, agent_count );
+		float eased_value = Easing.EaseInCirc(norm_value);
+		float chance = Math.Lerp(VOMIT_OCCURRENCES_PER_HOUR_MIN, VOMIT_OCCURRENCES_PER_HOUR_MAX, eased_value );
+		chance = (chance / 3600) * deltaT;
+		
+		if( Math.RandomFloat01() < chance )
+		{
+			SymptomBase symptom = player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_VOMIT);
+			
+			if( symptom )
+			{
+				symptom.SetDuration(5);
+
+				if (m_Player.GetStatWater().Get() > (WATER_DRAIN_FROM_VOMIT))
+					m_Player.GetStatWater().Add(-1 * WATER_DRAIN_FROM_VOMIT);
+				if (m_Player.GetStatEnergy().Get() > (ENERGY_DRAIN_FROM_VOMIT))
+					m_Player.GetStatEnergy().Add(-1 * ENERGY_DRAIN_FROM_VOMIT);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/StuffedStomach.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/StuffedStomach.c
new file mode 100644
index 0000000000000000000000000000000000000000..9beb94ea57164cff2180424b72bbbd3304510bb1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/StuffedStomach.c
@@ -0,0 +1,51 @@
+class StuffedStomachMdfr: ModifierBase
+{
+	protected const int	 	STUFFED_TRESHOLD = PlayerConstants.BT_STOMACH_VOLUME_LVL3;
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_STUFFED;
+		m_TickIntervalInactive 	= 1;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		float stomach = player.m_PlayerStomach.GetStomachVolume();
+		if ( stomach >= STUFFED_TRESHOLD )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		if( player.GetNotifiersManager() )
+		{
+			player.GetNotifiersManager().ActivateByType(eNotifiers.NTF_STUFFED);
+		}
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		if( player.GetNotifiersManager() )
+		{
+			player.GetNotifiersManager().DeactivateByType(eNotifiers.NTF_STUFFED);
+		}
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Tremor.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Tremor.c
new file mode 100644
index 0000000000000000000000000000000000000000..a25103389dc3c6cb58af23cb95cf4b555730422a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Tremor.c
@@ -0,0 +1,46 @@
+class TremorMdfr: ModifierBase
+{
+	private const float	 	TREMOR_DECREMENT_PER_SEC = 0.008;
+
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_TREMOR;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if ( player.GetStatTremor().Get() > player.GetStatTremor().GetMin() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if ( player.GetStatTremor().Get() == player.GetStatTremor().GetMin() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.GetStatTremor().Add( (TREMOR_DECREMENT_PER_SEC*deltaT) );
+		
+		//Mirek: SetShakeBodyFactor is removed now, because it worked only on legacy animation system
+		//player.SetShakeBodyFactor(player.GetStatTremor().Get());
+		//_person SetBodyShaking tremor; ASK GAMEPLAY PROGRAMMERS TO EXPOSE THIS ENGINE FUNCTION IN ENSCRIPT
+		//PrintString( "Tremor:" + ToString(tremor) );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/VomitStuffed.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/VomitStuffed.c
new file mode 100644
index 0000000000000000000000000000000000000000..3310c8a940bf2c9c682db8410f006f0c9b85f2d4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/VomitStuffed.c
@@ -0,0 +1,39 @@
+class VomitStuffedMdfr: ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_VOMITSTUFFED;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		float stomach = m_Player.m_PlayerStomach.GetStomachVolume();
+		if ( stomach >= PlayerConstants.VOMIT_THRESHOLD )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		player.GetSymptomManager().QueueUpPrimarySymptom( SymptomIDs.SYMPTOM_VOMIT );
+	}
+
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Wet.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Wet.c
new file mode 100644
index 0000000000000000000000000000000000000000..91903801090ef0273880dc6ef1417ca0e9fc3a6c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/conditions/Wet.c
@@ -0,0 +1,54 @@
+class WetMdfr: ModifierBase
+{
+	override void Init()
+	{
+		m_TrackActivatedTime 	= false;
+		m_ID 					= eModifiers.MDF_WETNESS;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if (player.GetStatWet().Get() == player.GetStatWet().GetMax())
+			return true;
+		
+		return false;
+	}
+	
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		if (player.GetStatWet().Get() == player.GetStatWet().GetMin())
+			return true;
+		
+		return false;
+	}
+
+
+	override void OnActivate(PlayerBase player)
+	{
+		if( player.m_NotifiersManager ) player.m_NotifiersManager.ActivateByType(eNotifiers.NTF_WETNESS);
+	}
+
+	override void OnReconnect(PlayerBase player)
+	{
+		this.OnActivate(player);
+	}
+
+
+	override void OnDeactivate(PlayerBase player)
+	{
+		if( player.m_NotifiersManager ) player.m_NotifiersManager.DeactivateByType(eNotifiers.NTF_WETNESS);
+	}
+	
+	override string GetDebugText()
+	{
+		string wetness = m_Player.GetStatWet().Get().ToString();
+		string wetness_min = m_Player.GetStatWet().GetMin().ToString();
+		return "wetness:"+wetness+" | " +"wetness min:"+wetness_min;
+	}
+	
+	override string GetDebugTextSimple()
+	{
+		return "";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/BrainDisease.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/BrainDisease.c
new file mode 100644
index 0000000000000000000000000000000000000000..277937e5756418f5d58770ee919150fd184da718
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/BrainDisease.c
@@ -0,0 +1,77 @@
+class BrainDiseaseMdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 2000;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 0;
+	const int SHAKE_INTERVAL_MIN = 1;
+	const int SHAKE_INTERVAL_MAX = 4;
+	//const float SHAKE_INTERVAL_DEVIATION = 1;
+	
+	float m_Time;
+	float m_ShakeTime;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime	= false;
+		m_ID 					= eModifiers.MDF_BRAIN;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.BRAIN) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.BRAIN) <= AGENT_THRESHOLD_DEACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		m_Time += deltaT;
+		float brain_agents = player.GetSingleAgentCountNormalized(eAgents.BRAIN) / 8.0;
+		float chance_of_laughter = Math.RandomFloat01();
+
+		if( chance_of_laughter < brain_agents )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_LAUGHTER);
+		}
+		
+		if( m_Time >= m_ShakeTime )
+		{
+			DayZPlayerSyncJunctures.SendKuruRequest(player, brain_agents);
+			m_ShakeTime = m_Time + Math.RandomFloat(SHAKE_INTERVAL_MIN, SHAKE_INTERVAL_MAX);
+		}
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Cholera.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Cholera.c
new file mode 100644
index 0000000000000000000000000000000000000000..08c29d0084e7280e29b1375610c07210bc11a7f4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Cholera.c
@@ -0,0 +1,86 @@
+class CholeraMdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 250;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 50;
+	
+	static const int CHANCE_OF_VOMIT = 10;
+	static const int CHANCE_OF_VOMIT_AGENT = 30;
+	static const int WATER_DRAIN_FROM_VOMIT = 450;
+	static const int ENERGY_DRAIN_FROM_VOMIT = 310;
+	static const float WATER_LOSS_CHOLERA = 0.5;
+	static const float WATER_LOSS_CHOLERA_MIN = 0.1; 	// min multiplier of WATER_LOSS_CHOLERA
+	static const float STOMACH_MIN_VOLUME = 200;		// for vomit symptom
+
+	override void Init()
+	{
+		m_TrackActivatedTime 	= false;
+		m_ID 					= eModifiers.MDF_CHOLERA;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.CHOLERA) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.CHOLERA) <= AGENT_THRESHOLD_DEACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		float water_loss = ( deltaT * ( WATER_LOSS_CHOLERA * Math.Max( WATER_LOSS_CHOLERA_MIN, player.GetSingleAgentCountNormalized( eAgents.CHOLERA ) ) ) );
+		//Print( ( WATER_LOSS_CHOLERA * Math.Max( WATER_LOSS_CHOLERA_MIN, player.GetSingleAgentCountNormalized( eAgents.CHOLERA ) ) ) );
+		player.GetStatWater().Add( -water_loss );
+
+		float stomach_volume = player.m_PlayerStomach.GetStomachVolume();
+		if( stomach_volume >= STOMACH_MIN_VOLUME )
+		{
+			int roll = Math.RandomInt( 0, 100 );
+			if( roll < ( CHANCE_OF_VOMIT + ( CHANCE_OF_VOMIT_AGENT * player.GetSingleAgentCountNormalized( eAgents.CHOLERA ) ) ) )
+			{
+				SymptomBase symptom = player.GetSymptomManager().QueueUpPrimarySymptom( SymptomIDs.SYMPTOM_VOMIT );
+				if( symptom )
+				{ 
+					symptom.SetDuration( Math.RandomIntInclusive( 4,8 ) );
+
+					if (m_Player.GetStatWater().Get() > (WATER_DRAIN_FROM_VOMIT))
+						m_Player.GetStatWater().Add(-1 * WATER_DRAIN_FROM_VOMIT);
+					if (m_Player.GetStatEnergy().Get() > (ENERGY_DRAIN_FROM_VOMIT))
+						m_Player.GetStatEnergy().Add(-1 * ENERGY_DRAIN_FROM_VOMIT);
+				}
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/CommonCold.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/CommonCold.c
new file mode 100644
index 0000000000000000000000000000000000000000..b11db12be7ead78f58d8090a9315b05c1ea9ed3f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/CommonCold.c
@@ -0,0 +1,57 @@
+class CommonColdMdfr: ModifierBase
+{
+	const int AGENT_THRESHOLD_ACTIVATE = 200;
+	const int AGENT_THRESHOLD_DEACTIVATE = 100;
+	override void Init()
+	{
+		m_TrackActivatedTime	= false;
+		m_ID 					= eModifiers.MDF_COMMON_COLD;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.INFLUENZA) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		//if( player.m_NotifiersManager ) player.m_NotifiersManager.ActivateByType(eNotifiers.NTF_SICK);
+		player.IncreaseDiseaseCount();
+	}
+	
+	override protected void OnDeactivate(PlayerBase player)
+	{
+
+		player.DecreaseDiseaseCount();
+	}
+
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		return (player.GetSingleAgentCount(eAgents.INFLUENZA) <= AGENT_THRESHOLD_DEACTIVATE);
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		float chance_of_sneeze = player.GetSingleAgentCountNormalized(eAgents.INFLUENZA);
+		
+		if( Math.RandomFloat01() < chance_of_sneeze / Math.RandomInt(15,20) )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_SNEEZE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination.c
new file mode 100644
index 0000000000000000000000000000000000000000..27929f796a1d4f3d0053c758fa1b110d40a69f1e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination.c
@@ -0,0 +1,59 @@
+class ContaminationStage1Mdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 1;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 100;
+	
+	static const int EVENT_1_INTERVAL_MIN = 20;
+	static const int EVENT_1_INTERVAL_MAX = 40;
+	
+	protected float m_NextEvent;
+	protected float m_Time;
+	
+	override void Init()
+	{
+		m_ID 					= eModifiers.MDF_CONTAMINATION1;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_CONTAMINATION;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		return ( player.GetSingleAgentCount(eAgents.CHEMICAL_POISON) >= AGENT_THRESHOLD_ACTIVATE && player.GetSingleAgentCount(eAgents.CHEMICAL_POISON) < AGENT_THRESHOLD_DEACTIVATE );
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		//player.IncreaseDiseaseCount();
+		m_NextEvent = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN, EVENT_1_INTERVAL_MAX );
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		//player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		/*
+		m_Time += deltaT;
+		
+		if ( m_Time >= m_NextEvent )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_COUGH);
+			m_Time = 0;
+			m_NextEvent = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN, EVENT_1_INTERVAL_MAX );
+		}
+		*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination2.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination2.c
new file mode 100644
index 0000000000000000000000000000000000000000..a0a460b25b318c5931837c7e2481bfd239a1301a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination2.c
@@ -0,0 +1,75 @@
+class ContaminationStage2Mdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 100;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 400;
+	
+	static const int EVENT_1_INTERVAL_MIN = 20;
+	static const int EVENT_1_INTERVAL_MAX = 40;
+	
+	protected float m_NextEvent1;
+	protected float m_Time1;
+	
+	
+	static const int EVENT_2_INTERVAL_MIN = 200;
+	static const int EVENT_2_INTERVAL_MAX = 400;
+	
+	protected float m_NextEvent2;
+	protected float m_Time2;
+	
+	override void Init()
+	{
+		m_ID 					= eModifiers.MDF_CONTAMINATION2;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_CONTAMINATION2;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		return ( player.GetSingleAgentCount(eAgents.CHEMICAL_POISON) >= AGENT_THRESHOLD_ACTIVATE && player.GetSingleAgentCount(eAgents.CHEMICAL_POISON) < AGENT_THRESHOLD_DEACTIVATE);
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+		m_NextEvent1 = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN, EVENT_1_INTERVAL_MAX );
+		m_NextEvent2 = Math.RandomFloatInclusive( EVENT_2_INTERVAL_MIN, EVENT_2_INTERVAL_MAX );
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		
+		m_Time1 += deltaT;
+		m_Time2 += deltaT;
+		
+	
+		if ( m_Time1 >= m_NextEvent1 )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_COUGH);
+			m_Time1 = 0;
+			m_NextEvent1 = Math.RandomFloatInclusive( EVENT_1_INTERVAL_MIN, EVENT_1_INTERVAL_MAX );
+		}
+		if ( m_Time2 >= m_NextEvent2 )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_VOMIT);
+			m_Time2 = 0;
+			m_NextEvent2 = Math.RandomFloatInclusive( EVENT_2_INTERVAL_MIN, EVENT_2_INTERVAL_MAX );
+		}
+
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination3.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination3.c
new file mode 100644
index 0000000000000000000000000000000000000000..27a77b5c0629930abfd51f2d7e46dfc8959e679c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Contamination3.c
@@ -0,0 +1,57 @@
+class ContaminationStage3Mdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 400;
+	static const int AGENT_THRESHOLD_DEACTIVATE = AGENT_THRESHOLD_ACTIVATE - 1;
+	static const int AGENT_THRESHOLD_FEVER = 250;
+	static const float DAMAGE_PER_SEC = -3;
+
+	override void Init()
+	{
+		m_ID 					= eModifiers.MDF_CONTAMINATION3;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE_SHORT;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_CONTAMINATION2;//using the same sync as stage 2 for now
+		m_TrackActivatedTime	= true;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		return ( player.GetSingleAgentCount(eAgents.CHEMICAL_POISON) >= AGENT_THRESHOLD_ACTIVATE );
+
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+		player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_VOMIT);
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		if(GetAttachedTime() > 4 && (!player.GetSymptomManager().GetCurrentPrimaryActiveSymptom() || (player.GetSymptomManager().GetCurrentPrimaryActiveSymptom() &&  player.GetSymptomManager().GetCurrentPrimaryActiveSymptom().GetType() != SymptomIDs.SYMPTOM_VOMIT)) )
+		{
+			player.AddHealth("","Shock", -100);
+		}
+		
+		if (player.IsUnconscious())
+		{
+			player.AddHealth("","",DAMAGE_PER_SEC * deltaT);
+		}
+
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Influenza.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Influenza.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a321f6a23679940476bee35ea3d819d99676742
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Influenza.c
@@ -0,0 +1,52 @@
+class InfluenzaMdfr: ModifierBase
+{
+	const int AGENT_THRESHOLD_ACTIVATE = 300;
+	const int AGENT_THRESHOLD_DEACTIVATE = 200;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime = false;
+		m_ID 					= eModifiers.MDF_INFLUENZA;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.INFLUENZA) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		return (player.GetSingleAgentCount(eAgents.INFLUENZA) <= AGENT_THRESHOLD_DEACTIVATE);
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		float chance_of_cough = player.GetSingleAgentCountNormalized(eAgents.INFLUENZA);
+		
+		if( Math.RandomFloat01() < chance_of_cough / Math.RandomInt(5,20) )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_COUGH);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Salmonella.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Salmonella.c
new file mode 100644
index 0000000000000000000000000000000000000000..addc62ca9bc9d51791ff8af20a6170d2e1ee20bc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/Salmonella.c
@@ -0,0 +1,103 @@
+class SalmonellaMdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 60;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 20;
+
+	static const int CHANCE_OF_VOMIT = 10;			// base vomit chance
+	static const int CHANCE_OF_VOMIT_AGENT = 20;	// adjusted by the agent count
+	static const int WATER_DRAIN_FROM_VOMIT = 450;
+	static const int ENERGY_DRAIN_FROM_VOMIT = 310;
+	static const float STOMACH_MIN_VOLUME = 200;	// min volume of stomach for vomit symptom
+	
+	static const float EVENT_INTERVAL_MIN = 12;
+	static const float EVENT_INTERVAL_MAX = 18;
+	
+	
+	
+	float m_Time;
+	float m_NextEvent;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime	= false;
+		m_ID 					= eModifiers.MDF_SALMONELLA;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.SALMONELLA) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		//if( player.m_NotifiersManager ) player.m_NotifiersManager.ActivateByType(eNotifiers.NTF_SICK);
+		player.IncreaseDiseaseCount();
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		if( player.GetSingleAgentCount( eAgents.SALMONELLA ) <= AGENT_THRESHOLD_DEACTIVATE ) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		float stomach_volume = player.m_PlayerStomach.GetStomachVolume();
+		if( stomach_volume >= STOMACH_MIN_VOLUME )
+		{
+			int roll = Math.RandomInt( 0, 100 );
+			int chance_of_vomit = CHANCE_OF_VOMIT + ( CHANCE_OF_VOMIT_AGENT * player.GetSingleAgentCountNormalized( eAgents.SALMONELLA ) );
+			if( roll < chance_of_vomit )
+			{
+				SymptomBase symptom = player.GetSymptomManager().QueueUpPrimarySymptom( SymptomIDs.SYMPTOM_VOMIT );
+				
+				if( symptom )
+				{
+					symptom.SetDuration( 5 );
+
+					// figure something more clever
+					if ( m_Player.GetStatWater().Get() > WATER_DRAIN_FROM_VOMIT )
+						m_Player.GetStatWater().Add( -1 * WATER_DRAIN_FROM_VOMIT );
+					if ( m_Player.GetStatEnergy().Get() > ENERGY_DRAIN_FROM_VOMIT )
+						m_Player.GetStatEnergy().Add( -1 * ENERGY_DRAIN_FROM_VOMIT );
+				}
+			}
+		}
+		
+		m_Time += deltaT;
+	
+		if ( m_Time >= m_NextEvent )
+		{
+			m_Time = 0;
+			m_NextEvent = Math.RandomFloatInclusive( EVENT_INTERVAL_MIN, EVENT_INTERVAL_MAX );
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_PAIN_LIGHT);
+		}
+		
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/TestDisease.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/TestDisease.c
new file mode 100644
index 0000000000000000000000000000000000000000..4dd27b4cafad5a84a28e00d2355e16dbe7e380b2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/TestDisease.c
@@ -0,0 +1,48 @@
+class TestDiseaseMdfr: ModifierBase
+{
+	float m_Interval;
+	ref Param1<float> m_SomeValue;
+
+	override void Init()
+	{
+		m_TrackActivatedTime			= false;
+		m_ID 							= 9999;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= 5;
+		m_SomeValue		= new Param1<float>(0);
+		MakeParamObjectPersistent(m_SomeValue);
+		
+		DisableDeactivateCheck();
+		DisableActivateCheck();
+	}
+	
+	override bool ActivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnActivate(PlayerBase player)
+	{
+		//player.GetBleedingManagerServer().AttemptAddBleedingSource(Math.RandomInt(0, 100));
+	}
+	
+	override void OnReconnect(PlayerBase player)
+	{
+		//OnActivate(player);
+		//player.GetSymptomManager().QueueUpSecondaryState( SymptomIDs.SYMPTOM_BLINDNESS );
+	}
+
+	override void OnDeactivate(PlayerBase player)
+	{
+	}
+
+	override bool DeactivateCondition(PlayerBase player)
+	{
+		return false;
+	}
+
+	override void OnTick(PlayerBase player, float deltaT)
+	{
+		player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_LAUGHTER);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/WoundInfection.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/WoundInfection.c
new file mode 100644
index 0000000000000000000000000000000000000000..031c60a4f7265025274a88a19103e82c233509e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/WoundInfection.c
@@ -0,0 +1,82 @@
+class WoundInfectionMdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 100;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 20;
+	 
+	void WoundInfectionMdfr()
+	{
+		Error("[ERROR] :: WoundInfectionMdfr is deprecated.");
+	}
+};
+
+
+
+class WoundInfectStage1Mdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 1;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 250;
+	static const int AGENT_THRESHOLD_FEVER = 250;
+	
+	static const int PAIN_EVENT_INTERVAL_MIN = 18;
+	static const int PAIN_EVENT_INTERVAL_MAX = 26;
+	
+	protected float m_NextEvent;
+	protected float m_Time;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime	= false;
+		m_ID 					= eModifiers.MDF_WOUND_INFECTION1;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_WOUND_INFECT_1;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		if( player.GetSingleAgentCount(eAgents.WOUND_AGENT) >= AGENT_THRESHOLD_ACTIVATE && !player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION2)) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+		m_NextEvent = Math.RandomFloatInclusive( PAIN_EVENT_INTERVAL_MIN, PAIN_EVENT_INTERVAL_MAX );
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		return !ActivateCondition(player);
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		
+		m_Time += deltaT;
+		
+		if ( m_Time >= m_NextEvent )
+		{
+			player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_PAIN_LIGHT);
+			m_Time = 0;
+			m_NextEvent = Math.RandomFloatInclusive( PAIN_EVENT_INTERVAL_MIN, PAIN_EVENT_INTERVAL_MAX );
+		}
+		
+
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/WoundInfection2.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/WoundInfection2.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e9286e1a95692e6dbbd4bb3725e9ac95730fc46
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/Modifiers/diseases/WoundInfection2.c
@@ -0,0 +1,96 @@
+class WoundInfectStage2Mdfr: ModifierBase
+{
+	static const int AGENT_THRESHOLD_ACTIVATE = 250;
+	static const int AGENT_THRESHOLD_DEACTIVATE = 0;
+
+	static const int PAIN_EVENT_INTERVAL_MIN = 6;
+	static const int PAIN_EVENT_INTERVAL_MAX = 12;
+	
+	
+	static const float DAMAGE_PER_SEC = 0.04;
+	
+	protected float m_NextEvent;
+	protected float m_Time;
+	
+	override void Init()
+	{
+		m_TrackActivatedTime	= false;
+		m_ID 					= eModifiers.MDF_WOUND_INFECTION2;
+		m_TickIntervalInactive 	= DEFAULT_TICK_TIME_INACTIVE;
+		m_TickIntervalActive 	= DEFAULT_TICK_TIME_ACTIVE;
+		m_SyncID				= eModifierSyncIDs.MODIFIER_SYNC_WOUND_INFECT_2;
+	}
+	
+	override string GetDebugText()
+	{
+		return ("Activate threshold: "+AGENT_THRESHOLD_ACTIVATE + "| " +"Deativate threshold: "+AGENT_THRESHOLD_DEACTIVATE);
+	}
+	
+	override protected bool ActivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.WOUND_AGENT) >= AGENT_THRESHOLD_ACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnActivate(PlayerBase player)
+	{
+		player.IncreaseDiseaseCount();
+		m_NextEvent = Math.RandomFloatInclusive( PAIN_EVENT_INTERVAL_MIN, PAIN_EVENT_INTERVAL_MAX );
+		
+		SymptomBase shivers = player.GetSymptomManager().QueueUpSecondarySymptomEx(SymptomIDs.SYMPTOM_HAND_SHIVER);
+			if ( shivers )
+			{
+				CachedObjectsParams.PARAM1_INT.param1 = 3;
+				shivers.SetParam(CachedObjectsParams.PARAM1_INT);
+			}
+		
+	}
+
+	override protected void OnDeactivate(PlayerBase player)
+	{
+		player.DecreaseDiseaseCount();
+		player.GetSymptomManager().RemoveSecondarySymptom(SymptomIDs.SYMPTOM_HAND_SHIVER);
+	}
+
+	override protected bool DeactivateCondition(PlayerBase player)
+	{
+		if(player.GetSingleAgentCount(eAgents.WOUND_AGENT) <= AGENT_THRESHOLD_DEACTIVATE) 
+		{
+			return true;
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	override protected void OnTick(PlayerBase player, float deltaT)
+	{
+		m_Time += deltaT;
+	
+		if ( m_Time >= m_NextEvent )
+		{
+			if( player.IsAntibioticsActive() )
+			{
+				player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_PAIN_LIGHT);
+			}
+			else
+			{
+				player.GetSymptomManager().QueueUpPrimarySymptom(SymptomIDs.SYMPTOM_PAIN_HEAVY);
+				float damage = m_Time * (DAMAGE_PER_SEC + player.GetHealthRegenSpeed());
+				player.AddHealth("","", -damage);
+			}
+			
+			m_Time = 0;
+			m_NextEvent = Math.RandomFloatInclusive( PAIN_EVENT_INTERVAL_MIN, PAIN_EVENT_INTERVAL_MAX );
+		}
+
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/ModifiersManager.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/ModifiersManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..408c865c7682aa35adfaf61ae8953da0f22ca845
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/ModifiersManager.c
@@ -0,0 +1,371 @@
+//max 32 synced modifiers supported
+enum eModifierSyncIDs 
+{
+
+	MODIFIER_SYNC_WOUND_INFECT_1 	= 0x00000001,
+	MODIFIER_SYNC_WOUND_INFECT_2 	= 0x00000002,
+	MODIFIER_SYNC_CONTAMINATION 	= 0x00000004,//stage1 
+	MODIFIER_SYNC_CONTAMINATION2 	= 0x00000008,//stage2 and stage3 share the same sync id
+	MODIFIER_SYNC_ZONE_EXPOSURE 	= 0x00000010,
+	MODIFIER_SYNC_DROWNING 			= 0x00000020,
+	MODIFIER_SYNC_FEVER				= 0x00000040,
+	//0x00000080,
+	//0x00000100,
+	//0x00000200,
+	//0x00000400,
+	//0x00000800,
+	//0x00001000,
+	LAST_INDEX,
+};
+
+
+
+
+enum EActivationType {
+
+	TRIGGER_EVENT_OFF,
+	TRIGGER_EVENT_ON_ACTIVATION,
+	TRIGGER_EVENT_ON_CONNECT
+};
+
+const int DEFAULT_TICK_TIME_ACTIVE = 3;
+const int DEFAULT_TICK_TIME_ACTIVE_SHORT = 1;
+const int DEFAULT_TICK_TIME_INACTIVE = 3;
+const int DEFAULT_TICK_TIME_INACTIVE_LONG = 10;
+
+class ModifierDebugObj
+{
+	string 	m_Name;
+	int 	m_ID;
+	bool 	m_IsActive;
+	bool	m_IsLocked;
+	
+	void ModifierDebugObj(int id, string name, bool active, bool locked)
+	{
+		m_Name = name;
+		m_ID = id;
+		m_IsActive = active;
+		m_IsLocked = locked;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+	
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+	
+	bool IsLocked()
+	{
+		return m_IsLocked;
+	}
+}
+
+class ModifiersManager
+{
+	PlayerBase m_Player;
+	ref map<int, ref ModifierBase> m_ModifierList;
+	ref array< ref ModifierBase> m_ModifierListArray = new array< ref ModifierBase>;
+	ref array<ref Param> m_ParamList;
+	bool m_AllowModifierTick = false;
+	const int STORAGE_VERSION = 121;
+	void ModifiersManager(PlayerBase player)
+	{
+		m_ModifierList 	= new map<int, ref ModifierBase>;
+		m_ParamList 	= new array<ref Param>;
+		m_Player 		= player;
+		
+		Init();
+	}
+
+	void Init()
+	{
+		#ifdef DEVELOPER
+		AddModifier(new TestDiseaseMdfr);
+		#endif
+		AddModifier(new BloodRegenMdfr);
+		//AddModifier(new BoneRegen);
+		//AddModifier(new Health);
+		AddModifier(new SalineMdfr);
+		AddModifier(new HealthRegenMdfr);
+		AddModifier(new HungerMdfr);
+		//AddModifier(new Shock);
+		AddModifier(new ImmuneSystemMdfr);
+		AddModifier(new StomachMdfr);
+		AddModifier(new HeatComfortMdfr);
+		AddModifier(new ThirstMdfr);
+		AddModifier(new BleedingCheckMdfr);
+		//AddModifier(new Blinded);
+		//AddModifier(new BrokenArms);
+		AddModifier(new BrokenLegsMdfr); // <-- Broken legs are here
+		AddModifier(new VomitStuffedMdfr);
+		AddModifier(new BurningMdfr);
+		AddModifier(new FeverMdfr);
+		AddModifier(new HeartAttackMdfr);
+		AddModifier(new HemolyticReactionMdfr);
+		AddModifier(new PoisoningMdfr);
+		AddModifier(new StuffedStomachMdfr);
+		//AddModifier(new Tremor);
+		AddModifier(new UnconsciousnessMdfr);
+		AddModifier(new ShockDamageMdfr);
+		AddModifier(new CommonColdMdfr);
+		AddModifier(new CholeraMdfr);
+		AddModifier(new InfluenzaMdfr);
+		AddModifier(new SalmonellaMdfr);
+		AddModifier(new BrainDiseaseMdfr);
+		AddModifier(new WetMdfr);
+		AddModifier(new ImmunityBoost);
+		AddModifier(new AntibioticsMdfr);
+		AddModifier(new ToxicityMdfr);
+		AddModifier(new BreathVapourMdfr);
+		AddModifier(new ShockMdfr);
+		AddModifier(new WoundInfectStage1Mdfr);
+		AddModifier(new WoundInfectStage2Mdfr);
+		AddModifier(new CharcoalMdfr);
+		AddModifier(new MorphineMdfr);
+		AddModifier(new PainKillersMdfr);
+		AddModifier(new EpinephrineMdfr);
+		AddModifier(new HeatBufferMdfr);
+		AddModifier(new DisinfectionMdfr);
+		AddModifier(new FatigueMdfr);
+		AddModifier(new ContaminationStage1Mdfr);
+		AddModifier(new ContaminationStage2Mdfr);
+		AddModifier(new ContaminationStage3Mdfr);
+		AddModifier(new AreaExposureMdfr);
+		AddModifier(new MaskMdfr);
+		AddModifier(new FliesMdfr);
+		AddModifier(new DrowningMdfr);
+	}
+
+	void SetModifiers(bool enable)
+	{
+		if (m_AllowModifierTick == enable)
+			return;
+		
+		m_AllowModifierTick = enable;
+		
+		#ifdef DIAG_DEVELOPER
+		#ifndef SERVER
+		DiagMenu.SetValue(DiagMenuIDs.CHEATS_MODIFIERS, enable);
+		#endif
+		#endif
+		
+		if ( !enable )
+		{
+			for (int i = 0; i < m_ModifierList.Count(); i++)
+			{
+				m_ModifierList.GetElement(i).ResetLastTickTime();
+			}
+		}
+	}
+
+	int GetStorageVersion()
+	{
+		return STORAGE_VERSION;
+	}
+	
+	bool IsModifiersEnable()
+	{
+		return m_AllowModifierTick;
+	}
+	
+	void AddModifier(ModifierBase modifier)
+	{
+		modifier.InitBase(m_Player,this);
+		int id = modifier.GetModifierID();
+		
+		if (id < 1)
+		{
+			Error("modifiers ID must be 1 or higher(for debugging reasons)");			
+		}
+		
+		//TODO: add a check for duplicity
+		m_ModifierList.Insert(id, modifier);
+		m_ModifierListArray.Insert(modifier);
+	}
+	
+	bool IsModifierActive(eModifiers modifier_id)
+	{
+		return m_ModifierList.Get(modifier_id).IsActive();
+	}
+
+	void OnScheduledTick(float delta_time)
+	{
+		if(!m_AllowModifierTick) return;
+
+		foreach(ModifierBase m: m_ModifierListArray)
+		{
+			m.Tick(delta_time);
+		}
+
+	}
+	
+	void DeactivateAllModifiers()
+	{
+		for(int i = 0; i < m_ModifierList.Count(); i++)
+		{
+			m_ModifierList.GetElement(i).Deactivate();
+		}
+	}
+	
+	void ActivateModifier(int modifier_id, bool triggerEvent = EActivationType.TRIGGER_EVENT_ON_ACTIVATION)
+	{
+		m_ModifierList.Get(modifier_id).ActivateRequest(triggerEvent);
+	}
+
+	void DeactivateModifier(int modifier_id, bool triggerEvent = true)
+	{
+		m_ModifierList.Get(modifier_id).Deactivate(triggerEvent);
+	}
+	
+	void OnStoreSave( ParamsWriteContext ctx )
+	{
+		CachedObjectsArrays.ARRAY_INT.Clear();
+		
+		int modifier_count;
+		for(int x = 0; x < m_ModifierList.Count(); x++)
+		{
+			ModifierBase mdfr = m_ModifierList.GetElement(x);
+			if( mdfr.IsActive() && mdfr.IsPersistent() ) 
+			{
+				modifier_count++;
+				//save the modifier id
+				CachedObjectsArrays.ARRAY_INT.Insert( mdfr.GetModifierID() );
+				if( mdfr.IsTrackAttachedTime() )
+				{
+					//save the overall attached time
+					CachedObjectsArrays.ARRAY_INT.Insert( mdfr.GetAttachedTime() );
+				}
+			}
+		}
+
+		//write the count
+		//CachedObjectsParams.PARAM1_INT.param1 = modifier_count;
+		//PrintString("Saving modifiers count: "+ modifier_count);
+		ctx.Write(modifier_count);
+
+		//write the individual modifiers and respective attached times
+		for(int i = 0; i < CachedObjectsArrays.ARRAY_INT.Count(); i++)
+		{
+			int item = CachedObjectsArrays.ARRAY_INT.Get(i);
+			//PrintString( "saving item: "+item );
+			ctx.Write(item);
+		}
+
+		for (int z = 0; z < m_ParamList.Count(); z++)
+		{
+			m_ParamList.Get(z).Serialize(ctx);
+		}
+
+	}
+
+	bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		int modifier_count;
+		if(!ctx.Read(modifier_count))
+			return false;
+		//PrintString("Loading modifiers count: "+ modifier_count);
+		for(int i = 0; i < modifier_count; i++)
+		{
+			int modifier_id;
+			if(!ctx.Read(modifier_id))
+				return false;
+			//PrintString( "loading item: "+modifier_id );
+			//int modifier_id = CachedObjectsParams.PARAM1_INT.param1;
+			ModifierBase modifier = GetModifier(modifier_id);
+			if( modifier )
+			{
+				if( modifier.IsTrackAttachedTime() )
+				{
+					int time;
+					if(!ctx.Read(time))//get the attached time
+						return false;
+					modifier.SetAttachedTime( time );
+				}
+				
+				ActivateModifier(modifier_id, EActivationType.TRIGGER_EVENT_ON_CONNECT);
+			}
+			else
+			{
+				Debug.LogError("DB loading: non-existent modifier with id:"+modifier_id.ToString());
+			}
+		}
+		
+		for (int x = 0; x < m_ParamList.Count(); x++)
+		{
+			if(!m_ParamList.Get(x).Deserializer(ctx))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	ModifierBase GetModifier(int modifier_id)
+	{
+		return m_ModifierList.Get(modifier_id);
+	}
+		
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+
+	void SetModifierLock(int modifier_id, bool state)
+	{
+		m_ModifierList.Get(modifier_id).SetLock(state);
+	}
+
+
+	bool GetModifierLock(int modifier_id)
+	{
+		return m_ModifierList.Get(modifier_id).IsLocked();
+	}
+
+	void DbgGetModifiers(array<ref ModifierDebugObj> modifiers)
+	{
+		modifiers.Clear();
+		for(int i = 1;i < eModifiers.COUNT; i++)
+		{
+			if(m_ModifierList.Contains(i))
+			{
+				ModifierBase modifier = m_ModifierList.Get(i);
+				int modifier_id = modifier.GetModifierID();
+				string modifier_name = modifier.GetName();
+				bool active = modifier.IsActive();
+				string debug_text = modifier.GetDebugTextSimple();
+				bool is_locked = modifier.IsLocked();
+
+				if(active && debug_text != "")
+				{
+					modifier_name +=" | "+debug_text; 
+				}
+				ModifierDebugObj obj = new ModifierDebugObj(modifier_id, modifier_name, active, is_locked);
+	
+				modifiers.Insert( obj );
+			}
+		}
+	}
+	
+	void ResetAll()
+	{
+		bool hasAreaExposureModifier 	= IsModifierActive(eModifiers.MDF_AREAEXPOSURE);
+		bool hasMaksModifier 			= IsModifierActive(eModifiers.MDF_MASK);
+
+		DeactivateAllModifiers();
+		
+		if (hasAreaExposureModifier)
+			ActivateModifier(eModifiers.MDF_AREAEXPOSURE);
+		
+		if (hasMaksModifier)
+			ActivateModifier(eModifiers.MDF_MASK);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerModifiers/eModifiers.c b/scripts/4_World/DayZ/Classes/PlayerModifiers/eModifiers.c
new file mode 100644
index 0000000000000000000000000000000000000000..c66b54517a58fab9972c84144614978e62540b78
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerModifiers/eModifiers.c
@@ -0,0 +1,59 @@
+enum eModifiers 
+{
+	MDF_TEMPERATURE = 1,//must start at 1
+	MDF_BLOOD_REGEN,
+	MDF_BURNING,
+	MDF_HEALTH_REGEN,
+	MDF_TREMOR,
+	MDF_HUNGER,
+	MDF_FEVER,
+	MDF_COMMON_COLD,
+	MDF_THIRST,
+	MDF_BLEEDING,
+	MDF_BLINDED,
+	MDF_HEART_ATTACK,
+	MDF_STUFFED,
+	MDF_BONE_REGEN,
+	MDF_HEALTH,
+	MDF_POISONING,
+	MDF_HEMOLYTIC_REACTION,
+	MDF_STOMACH,
+	MDF_STAMINACALC,
+	MDF_IMMUNE_SYSTEM,
+	MDF_INFLUENZA,
+	MDF_SHOCK,
+	MDF_BROKEN_LEGS,
+	MDF_BROKEN_ARMS,
+	MDF_CHOLERA,
+	MDF_TESTING,
+	MDF_SALMONELLA,
+	MDF_BRAIN,
+	MDF_VOMITSTUFFED,
+	MDF_SALINE,
+	MDF_SHOCK_DAMAGE,
+	MDF_UNCONSCIOUSNESS,
+	MDF_WETNESS,
+	MDF_IMMUNITYBOOST,
+	MDF_ANTIBIOTICS,
+	MDF_TOXICITY,
+	MDF_BREATH_VAPOUR,
+	MDF_WOUND_INFECTION,//legacy reasons
+	MDF_WOUND_INFECTION1,
+	MDF_WOUND_INFECTION2,
+	MDF_DISINFECTION,
+	MDF_CHARCOAL,
+	MDF_MORPHINE,
+	MDF_PAINKILLERS,
+	MDF_EPINEPHRINE,
+	MDF_HEATBUFFER,
+	MDF_FATIGUE,
+	MDF_CONTAMINATION1,
+	MDF_CONTAMINATION2,
+	MDF_CONTAMINATION3,
+	MDF_AREAEXPOSURE,
+	MDF_MASK,
+	MDF_FLIES,
+	MDF_DROWNING,
+	// ---------------only count bellow
+	COUNT,
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/NotifierBase.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/NotifierBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..dee434a5e460b41f9fc9112245eae2e031cb1ca3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/NotifierBase.c
@@ -0,0 +1,207 @@
+class NotifierBase
+{
+	
+	float				m_DeltaT; // time in seconds since the last tick
+	ref Timer 			m_Timer1; // timer which can be used for whatever
+	PlayerBase			m_Player; //the player this Notifier belongs to
+	int					m_Type;
+	NotifiersManager	m_Manager;
+	int 				m_TendencyBufferSize = 3;//for best results, this should be somewhat aligned with modifier frequency
+	const int 			TENDENCY_BUFFER_SIZE = 30;//this needs to be bigger or same size as buffer size of any invidual buffer size
+	bool				m_ShowTendency;
+	bool				m_Active;
+	//private float		m_SecsToSound; //internal counter
+	//protected float		m_MinPauseBetweenSounds; //minimal amount of seconds that needs to pass till sound is played
+	//protected float		m_MaxPauseBetweenSounds; //maximal amount of seconds that can pass till sound is played
+	//private float		m_SecsSinceLastAnimation; //internal counter
+	//private float		m_SecsToAnimation; //internal counter
+	//protected float		m_MinPauseBetweenAnimations; //minimal amount of seconds that needs to pass till animation played
+	//protected float		m_MaxPauseBetweenAnimations; //maximal amount of seconds that can pass till animation is splayed
+	int					m_TickInterval;
+	int					m_TickIntervalLastTick;
+	float				m_TendencyBuffer[TENDENCY_BUFFER_SIZE];
+	int					m_TendencyBufferWriteIterator;
+	float 				m_LastTendency;
+	float				m_LastMA;
+	bool				m_FirstPass = true;
+	//int					m_TendencyID;
+	
+	PluginPlayerStatus 	m_ModulePlayerStatus;
+		
+	void NotifierBase(NotifiersManager manager)
+	{
+
+		//m_Timer1 = new Timer();
+		m_ModulePlayerStatus = PluginPlayerStatus.Cast(GetPlugin(PluginPlayerStatus));
+		m_Active = true; 
+		m_Manager = manager;
+		m_Player = manager.GetPlayer();
+		m_TickInterval = 1000;
+		manager.RegisterItself(GetNotifierType(), this);
+	}
+
+	bool IsTimeToTick(int current_time)
+	{
+		return ( current_time > m_TickIntervalLastTick + m_TickInterval );
+	}
+	
+	
+	VirtualHud GetVirtualHud()
+	{
+		return m_Player.GetVirtualHud();
+	}
+
+	int GetNotifierType()
+	{
+		return m_Type;
+	}
+
+	string GetName()
+	{
+		return this.ClassName() + " Notifier";
+	}
+
+	bool IsActive()
+	{
+		return m_Active;
+	}
+
+	void SetActive( bool state )
+	{
+		m_Active = state;
+		if ( !state ) HideBadge();
+	}
+
+	void DisplayTendency(float delta)
+	{
+	}
+
+	void AddToCyclicBuffer(float value)//for tendency
+	{
+		m_TendencyBuffer[m_TendencyBufferWriteIterator] = value;
+		m_TendencyBufferWriteIterator++;
+		if( m_TendencyBufferWriteIterator == m_TendencyBufferSize )
+		{
+			m_TendencyBufferWriteIterator = 0;
+			m_ShowTendency = true;
+		}
+	}
+	
+	float ReadFromCyclicBuffer(int index)
+	{
+		int indx = m_TendencyBufferWriteIterator + index;
+		if( indx >= m_TendencyBufferSize)
+		{
+			indx = indx - m_TendencyBufferSize;
+		}
+		return m_TendencyBuffer[indx];
+	}
+	
+	float GetDeltaAvaraged()//for tendency
+	{
+		array<float> values = new array<float>;
+		for(int i = 0; i < m_TendencyBufferSize; i++)
+		{
+			values.Insert(ReadFromCyclicBuffer(i));
+		}
+		//SmoothOutFloatValues(values);
+		
+		//--------------------------------------------------------------------------
+		
+		float values_sum = 0;
+		//PrintString("----------------------------");
+		//PrintString("tendency:" + this.ClassName() );
+		for(i = 0; i < values.Count(); i++)
+		{
+			float value = values.Get(i);
+			values_sum += value;
+			//PrintString( value.ToString() );
+		}
+		
+		float sma = values_sum / m_TendencyBufferSize;
+		if( m_FirstPass ) 
+		{
+			m_LastMA = sma;
+			m_FirstPass = false;
+		}
+		
+		float tnd = sma - m_LastMA;
+		m_LastMA = sma;
+		/*
+		PrintString(GetName()+" tendency:" + tnd.ToString() );
+		PrintString("----------------------------");
+		*/
+		return tnd;
+		
+		//--------------------------------------------------------------------------
+		
+	}
+	
+	void SmoothOutFloatValues(array<float> values)
+	{
+		float value1;
+		float value2;
+		for(int i = 0; i < values.Count() - 1; i++)
+		{
+			value1 = values.Get(i);
+			value2 = values.Get(i + 1);
+			float average = (value1 + value2) / 2;
+			values.Set(i, average);
+			values.Set(i + 1, average);
+		}
+		int index = values.Count() - 1;
+		values.Set(index, value2);
+	}
+
+	void OnTick(float current_time)
+	{
+		//------------
+		/*
+		float time = GetGame().GetTime();
+		Print("ticking notifier "+ this.ClassName() +" for player " + m_Player.ToString() + " at time:" + time.ToString());
+		*/
+		//------------
+		m_TickIntervalLastTick = current_time;
+		DisplayBadge();
+		AddToCyclicBuffer( GetObservedValue() );
+		if (m_ShowTendency) DisplayTendency( GetDeltaAvaraged() );
+
+	}
+	
+	protected int CalculateTendency(float delta, float inctresholdlow, float inctresholdmed, float inctresholdhigh, float dectresholdlow, float dectresholdmed, float dectresholdhigh)
+	{                                        	
+		int tendency = TENDENCY_STABLE;
+		if ( delta > inctresholdlow ) 	tendency = TENDENCY_INC_LOW;
+		if ( delta > inctresholdmed )  	tendency = TENDENCY_INC_MED;
+		if ( delta > inctresholdhigh ) 	tendency = TENDENCY_INC_HIGH;	
+		if ( delta < dectresholdlow )  	tendency = TENDENCY_DEC_LOW;
+		if ( delta < dectresholdmed )  	tendency = TENDENCY_DEC_MED;
+		if ( delta < dectresholdhigh ) 	tendency = TENDENCY_DEC_HIGH;
+		//Print(" " + delta + " tendency:  " + tendency +" " + this);
+		return tendency;
+	}
+	
+	
+	protected eBadgeLevel DetermineBadgeLevel(float value, float lvl_1, float lvl_2, float lvl_3)
+	{
+		eBadgeLevel level = eBadgeLevel.NONE;
+		if ( value >= lvl_1 ) 	level = eBadgeLevel.FIRST;
+		if ( value >= lvl_2 )  	level = eBadgeLevel.SECOND;
+		if ( value >= lvl_3 ) 	level = eBadgeLevel.THIRD;
+		return 	level;
+	}
+	
+
+	protected void DisplayBadge()
+	{
+	}
+
+	protected void HideBadge()
+	{
+	}
+
+	protected float GetObservedValue()
+	{
+		return 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/AgentsNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/AgentsNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba47a6eec044cb7908182145b10f94ca1163a472
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/AgentsNotfr.c
@@ -0,0 +1,42 @@
+/*
+class AgentsNotfr: NotifierBase
+{
+
+	private const float 	DEC_TRESHOLD_LOW 	= 0;
+	private const float 	DEC_TRESHOLD_MED 	= -0.5;
+	private const float 	DEC_TRESHOLD_HIGH	= -1;
+	private const float 	INC_TRESHOLD_LOW 	= 0;
+	private const float 	INC_TRESHOLD_MED 	= 0.5;
+	private const float 	INC_TRESHOLD_HIGH	= 1;
+	
+	void AgentsNotfr(NotifiersManager manager)
+	{
+		SetActive(true);
+		m_TendencyBufferSize = 3;//for best results, this should be somewhat aligned with modifier frequency
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_AGENT_INFECTION;
+	}
+	
+	override void DisplayTendency(float delta)
+	{
+		int tendency = CalculateTendency(delta, INC_TRESHOLD_LOW, INC_TRESHOLD_MED, INC_TRESHOLD_HIGH, DEC_TRESHOLD_LOW, DEC_TRESHOLD_MED, DEC_TRESHOLD_HIGH);
+		//GetVirtualHud().SetStatus(eDisplayElements.DELM_TDCY_BACTERIA,tendency);
+		
+		DisplayElementTendency dis_elm = DisplayElementTendency.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_TDCY_BACTERIA));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetTendency(tendency);
+		}
+	}
+	
+	override float GetObservedValue()
+	{
+		float count = m_Player.GetTotalAgentCount();
+		//Debug.Log( "GetObservedValue:" + count.ToString(),"Tendency");
+		return count;
+	}
+};*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/BleedingNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/BleedingNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..e6701e880072955f3be523aab45793c28f2308bd
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/BleedingNotfr.c
@@ -0,0 +1,34 @@
+class BleedingNotfr: NotifierBase
+{
+	void BleedingNotfr(NotifiersManager manager)
+	{
+		m_TendencyBufferSize = 8;
+		m_Active = false; 
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_BLEEDISH;
+	}
+
+	override void DisplayBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_BLEEDING));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.FIRST);
+		}
+	}
+
+	override void HideBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_BLEEDING));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/BloodNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/BloodNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..69525505918d593058f40186b7ee12655c3e92fb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/BloodNotfr.c
@@ -0,0 +1,42 @@
+class BloodNotfr: NotifierBase
+{
+	protected const float 	DEC_TRESHOLD_LOW 	= 0;
+	protected const float 	DEC_TRESHOLD_MED 	= -12;
+	protected const float 	DEC_TRESHOLD_HIGH	= -22;
+	protected const float 	INC_TRESHOLD_LOW 	= 0;
+	protected const float 	INC_TRESHOLD_MED 	= 3;
+	protected const float 	INC_TRESHOLD_HIGH	= 6;
+
+	void BloodNotfr(NotifiersManager manager)
+	{
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_BLOOD;
+	}
+
+	override void DisplayTendency(float delta)
+	{
+		int tendency = CalculateTendency(delta, INC_TRESHOLD_LOW, INC_TRESHOLD_MED, INC_TRESHOLD_HIGH, DEC_TRESHOLD_LOW, DEC_TRESHOLD_MED, DEC_TRESHOLD_HIGH);
+		
+		//DSLevels level = DetermineLevel( GetObservedValue(), PlayerConstants.THRESHOLD_BLOOD_WARNING,  PlayerConstants.THRESHOLD_BLOOD_CRITICAL, PlayerConstants.THRESHOLD_BLOOD_BLINKING, PlayerConstants.THRESHOLD_BLOOD_EXTRA );
+		DisplayElementTendency dis_elm = DisplayElementTendency.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_TDCY_BLOOD));
+		
+		EStatLevels blood_level = m_Player.GetStatLevelBlood();
+		
+		if( dis_elm )
+		{
+			dis_elm.SetTendency(tendency);
+			dis_elm.SetSeriousnessLevel(blood_level);
+			
+		}
+		
+	}
+
+	override float GetObservedValue()
+	{
+		float blood = m_Player.GetHealth("GlobalHealth","Blood");
+		return blood;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/FeverNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/FeverNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f09b8483515c5522bb87034ff60ba96697ca4d2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/FeverNotfr.c
@@ -0,0 +1,25 @@
+class FeverNotfr: NotifierBase
+{
+	void FeverNotfr(NotifiersManager manager)
+	{
+		m_Active = false; 
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_FEVERISH;
+	}
+
+	override void DisplayBadge()
+	{
+	//	Print("FEVER");
+		////GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_FEVER,DELM_LVL_1);
+	}
+
+	override void HideBadge()
+	{
+		
+		////GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_FEVER,DELM_LVL_0);
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/FracturedLegNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/FracturedLegNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..70d3c5f98e365b1088a16e33b57ab7517a58932e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/FracturedLegNotfr.c
@@ -0,0 +1,44 @@
+class FracturedLegNotfr: NotifierBase
+{
+	void FracturedLegNotfr(NotifiersManager manager)
+	{
+		m_Active = false;
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_FRACTURE;
+	}
+
+	override void SetActive( bool state )
+	{
+		if (state == true)
+		{
+			DisplayBadge();
+		}
+		else
+		{
+			HideBadge();
+		}
+			
+	}
+	
+	override void DisplayBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_FRACTURE));
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.FIRST);
+		}
+		
+	}
+
+	override void HideBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_FRACTURE));
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HealthNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HealthNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..b84babf423dd009f2e2e35958634e669c5480450
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HealthNotfr.c
@@ -0,0 +1,65 @@
+class HealthNotfr: NotifierBase
+{
+	/*
+	private const float	 	HEALTHY_BLOOD_TRESHOLD	= 5000;
+	private const float	 	HEALTHY_TRESHOLD		= 5000;
+	private const float	 	HEALING_ENERGY_TRESHOLD	= 4000;
+	private const float	 	HEALING_WATER_TRESHOLD	= 2500;
+	private const float	 	HEALING_BLOOD_TRESHOLD	= 5000;
+	*/
+	private const float 	DEC_TRESHOLD_LOW 			= 0;
+	private const float 	DEC_TRESHOLD_MED 			= -0.7;
+	private const float 	DEC_TRESHOLD_HIGH			= -1.3;
+	private const float 	INC_TRESHOLD_LOW 			= 0;
+	private const float 	INC_TRESHOLD_MED 			= 0.7;
+	private const float 	INC_TRESHOLD_HIGH			= 1.3;
+	
+		
+	void HealthNotfr(NotifiersManager manager)
+	{
+		m_TickInterval = 3000;
+		m_TendencyBufferSize = 6;
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_HEALTHY;
+	}
+
+	override void DisplayBadge()
+	{
+	}
+	
+	override void DisplayTendency(float delta)
+	{
+		int tendency = CalculateTendency(delta, INC_TRESHOLD_LOW, INC_TRESHOLD_MED, INC_TRESHOLD_HIGH, DEC_TRESHOLD_LOW, DEC_TRESHOLD_MED, DEC_TRESHOLD_HIGH);
+		//PrintString("tendency:" + tendency);
+		//GetVirtualHud().SetStatus(eDisplayElements.DELM_TDCY_HEALTH,tendency);
+		
+		//DSLevels level = DetermineLevel( GetObservedValue(), PlayerConstants.THRESHOLD_HEALTH_WARNING, PlayerConstants.THRESHOLD_HEALTH_CRITICAL, PlayerConstants.THRESHOLD_HEALTH_BLINKING, PlayerConstants.THRESHOLD_HEALTH_EXTRA);
+		
+		EStatLevels health_level = m_Player.GetStatLevelHealth();
+		DisplayElementTendency dis_elm = DisplayElementTendency.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_TDCY_HEALTH));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetSeriousnessLevel(health_level);
+			dis_elm.SetTendency(tendency);
+		}
+	}
+
+	override void HideBadge()
+	{
+		
+		////GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_HEALTHY,DELM_LVL_0);
+	}
+
+	override protected float GetObservedValue()
+	{
+		float health = m_Player.GetHealth("","Health");
+		//PrintString("health:" + health);
+		return health;
+	}
+	
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HeartbeatNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HeartbeatNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..fac5eb0484790d8047e0a0d2cf743dfe5b7fb97f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HeartbeatNotfr.c
@@ -0,0 +1,41 @@
+class HeartbeatNotfr: NotifierBase
+{
+	void HeartbeatNotfr(NotifiersManager manager)
+	{
+		m_Active = false; 
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_HEARTBEAT;
+	}
+
+	override void DisplayBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_HEARTBEAT));
+		
+		if( dis_elm )
+		{
+			if (m_Player.GetPulseType() == EPulseType.REGULAR) 
+			{
+				dis_elm.SetLevel(eBadgeLevel.FIRST);
+			}
+			else
+			{
+				dis_elm.SetLevel(eBadgeLevel.SECOND);
+			}
+		}
+	}
+
+	override void HideBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_HEARTBEAT));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HungerNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HungerNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..caa32f8bbb25a5031c081c93b459a15e02a3bd41
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/HungerNotfr.c
@@ -0,0 +1,60 @@
+class HungerNotfr: NotifierBase
+{
+	protected const float 	DEC_TRESHOLD_LOW 			= 0;
+	protected const float 	DEC_TRESHOLD_MED 			= -0.35;
+	protected const float 	DEC_TRESHOLD_HIGH			= -0.57;
+	protected const float 	INC_TRESHOLD_LOW 			= 0;
+	protected const float 	INC_TRESHOLD_MED 			= 0.35;
+	protected const float 	INC_TRESHOLD_HIGH			= 0.57;
+	
+	void HungerNotfr(NotifiersManager manager)
+	{
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_HUNGRY;
+	}
+
+	override void DisplayTendency(float delta)
+	{
+		//PrintString("delta:"+delta.ToString());
+		int tendency = CalculateTendency(delta, INC_TRESHOLD_LOW, INC_TRESHOLD_MED, INC_TRESHOLD_HIGH, DEC_TRESHOLD_LOW, DEC_TRESHOLD_MED, DEC_TRESHOLD_HIGH);
+		//GetVirtualHud().SetStatus(eDisplayElements.DELM_TDCY_ENERGY,tendency);
+		
+		//DSLevels level = DetermineLevel( GetObservedValue(), PlayerConstants.THRESHOLD_ENERGY_WARNING, PlayerConstants.THRESHOLD_ENERGY_CRITICAL, PlayerConstants.THRESHOLD_ENERGY_BLINKING, PlayerConstants.THRESHOLD_ENERGY_EXTRA );
+	
+		EStatLevels energy_level = m_Player.GetStatLevelEnergy();
+		DisplayElementTendency dis_elm = DisplayElementTendency.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_TDCY_ENERGY));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetTendency(tendency);
+			dis_elm.SetSeriousnessLevel(energy_level);
+			
+		}
+		
+		/*
+		Print("-----------------------------------------------------------");
+		Print("water:"+ typename.EnumToString(EStatLevels,m_Player.GetStatLevelWater()));
+		Print("energy:"+ typename.EnumToString(EStatLevels,m_Player.GetStatLevelEnergy()));
+		Print("health:"+ typename.EnumToString(EStatLevels,m_Player.GetStatLevelHealth()));
+		Print("blood:"+ typename.EnumToString(EStatLevels,m_Player.GetStatLevelBlood()));
+		*/
+	}
+
+	override void DisplayBadge()
+	{
+		
+	}
+
+	override void HideBadge()
+	{
+	}
+
+	
+	override float GetObservedValue()
+	{
+		return m_Player.GetStatEnergy().Get();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/InjuredLegNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/InjuredLegNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..8bfb8f3f7a940b7967e09134c1c960ecbab9c6e5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/InjuredLegNotfr.c
@@ -0,0 +1,37 @@
+class InjuredLegNotfr: NotifierBase
+{
+	void InjuredLegNotfr(NotifiersManager manager)
+	{
+		m_Active = true;
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_LEGS;
+	}
+
+	
+	override void DisplayBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_LEGS));
+		
+		
+		if ( dis_elm )
+		{
+			float legHealthInverted = 1 - Math.Min(m_Player.GetHealth01("LeftLeg",""), m_Player.GetHealth01("RightLeg",""));
+			int level = eBadgeLevel.NONE;
+			if (m_Player.GetBrokenLegs() == eBrokenLegs.NO_BROKEN_LEGS)
+				level =	DetermineBadgeLevel(legHealthInverted, 0.05, 0.35, 0.65);
+			dis_elm.SetLevel(level);
+		}
+	}
+
+	override void HideBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_LEGS));
+		if ( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/PillsNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/PillsNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..943a12ebe324f1149785c89e25963ff9f665d684
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/PillsNotfr.c
@@ -0,0 +1,34 @@
+class PillsNotfr: NotifierBase
+{
+	void PillsNotfr(NotifiersManager manager)
+	{
+		m_Active = false; 
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_PILLS;
+	}
+
+	override void DisplayBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_PILLS));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.FIRST);
+		}
+	}
+
+	override void HideBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_PILLS));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/SickNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/SickNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..125768b9975d472714a880600a21336e1a92ac88
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/SickNotfr.c
@@ -0,0 +1,34 @@
+class SickNotfr: NotifierBase
+{
+	void SickNotfr(NotifiersManager manager)
+	{
+		m_Active = false; 
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_SICK;
+	}
+
+	override void DisplayBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_SICK));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.FIRST);
+		}
+	}
+
+	override void HideBadge()
+	{
+		
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_SICK));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/StuffedNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/StuffedNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..a8516ac36f05a5d8e398126d39ef500a6dd66f1c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/StuffedNotfr.c
@@ -0,0 +1,34 @@
+class StuffedNotfr: NotifierBase
+{
+	void StuffedNotfr(NotifiersManager manager)
+	{
+		m_Active = true; 
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_STUFFED;
+	}
+
+	override void DisplayBadge()
+	{
+		float volume = m_Player.m_PlayerStomach.GetStomachVolume();
+		eBadgeLevel lvl = DetermineBadgeLevel(volume, PlayerConstants.BT_STOMACH_VOLUME_LVL3, PlayerConstants.BT_STOMACH_VOLUME_LVL3, PlayerConstants.BT_STOMACH_VOLUME_LVL3); 
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_STUFFED));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(lvl);
+		}
+	}
+
+	override void HideBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_STUFFED));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/ThirstNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/ThirstNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..069370ba1b60907e3e01082ee5d02bff42f87f6c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/ThirstNotfr.c
@@ -0,0 +1,73 @@
+class ThirstNotfr: NotifierBase
+{
+	private const float 	HYDRATED_TRESHOLD 			= 3500;
+	private const float 	THIRSTY_TRESHOLD 			= 2500;
+	private const float 	VERY_THIRSTY_TRESHOLD 		= 1500;
+	private const float 	FATALLY_THIRSTY_TRESHOLD 	= 0;
+	private const float 	DEC_TRESHOLD_LOW 			= 0;
+	private const float 	DEC_TRESHOLD_MED 			= -0.2;
+	private const float 	DEC_TRESHOLD_HIGH			= -0.85;
+	private const float 	INC_TRESHOLD_LOW 			= 0;
+	private const float 	INC_TRESHOLD_MED 			= 0.2;
+	private const float 	INC_TRESHOLD_HIGH			= 0.85;
+		
+	void ThirstNotfr(NotifiersManager manager)
+	{
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_THIRSTY;
+	}
+
+	
+	override void DisplayTendency(float delta)
+	{
+		//PrintString(delta.ToString());
+		int tendency = CalculateTendency(delta, INC_TRESHOLD_LOW, INC_TRESHOLD_MED, INC_TRESHOLD_HIGH, DEC_TRESHOLD_LOW, DEC_TRESHOLD_MED, DEC_TRESHOLD_HIGH);
+		//GetVirtualHud().SetStatus(eDisplayElements.DELM_TDCY_WATER,tendency);
+		
+		//DSLevels level = DetermineLevel( GetObservedValue(), PlayerConstants.THRESHOLD_WATER_WARNING, PlayerConstants.THRESHOLD_WATER_CRITICAL, PlayerConstants.THRESHOLD_WATER_BLINKING, PlayerConstants.THRESHOLD_WATER_EXTRA);
+		EStatLevels water_level = m_Player.GetStatLevelWater();
+		DisplayElementTendency dis_elm = DisplayElementTendency.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_TDCY_WATER));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetTendency(tendency);
+			dis_elm.SetSeriousnessLevel(water_level);
+			
+		}
+	}
+	
+	override void DisplayBadge()
+	{
+		float water = m_Player.GetStatWater().Get();
+		if (water >= HYDRATED_TRESHOLD)
+		{
+			//GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_THIRST,DELM_LVL_1);
+		}
+		else if (water <= THIRSTY_TRESHOLD)
+		{
+			//GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_THIRST,DELM_LVL_2);
+		}
+		else if (water <= VERY_THIRSTY_TRESHOLD)
+		{
+			//GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_THIRST,DELM_LVL_3);
+		}
+		else if (water <= FATALLY_THIRSTY_TRESHOLD)
+		{
+			//GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_THIRST,DELM_LVL_4);
+		}
+	}
+
+	override void HideBadge()
+	{
+		
+		//GetVirtualHud().SetStatus(eDisplayElements.DELM_NTFR_THIRST,DELM_LVL_0);
+	}
+	
+	override protected float GetObservedValue()
+	{
+		return m_Player.GetStatWater().Get();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/WarmthNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/WarmthNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..710e91749ce7ef644e56077ef473facce31bf56c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/WarmthNotfr.c
@@ -0,0 +1,60 @@
+class WarmthNotfr: NotifierBase
+{
+	private const float 	DEC_TRESHOLD_LOW 			= 0;
+	private const float 	DEC_TRESHOLD_MED 			= -0.2;
+	private const float 	DEC_TRESHOLD_HIGH			= -0.3;
+	private const float 	INC_TRESHOLD_LOW 			= 0;
+	private const float 	INC_TRESHOLD_MED 			= 0.2;
+	private const float 	INC_TRESHOLD_HIGH			= 0.3;
+		
+	void WarmthNotfr(NotifiersManager manager)
+	{
+		m_TendencyBufferSize = 6;
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_WARMTH;
+	}
+	
+	
+	protected DSLevelsTemp DetermineLevel(float value, float m_warning_treshold, float m_critical_treshold, float m_empty_treshold, float p_warning_treshold, float p_critical_treshold, float p_empty_treshold )
+	{
+		DSLevelsTemp level = DSLevelsTemp.NORMAL;
+		
+		if(value < 0)
+		{
+			if(value < m_warning_treshold) level = DSLevelsTemp.WARNING_MINUS;
+			if(value < m_critical_treshold) level = DSLevelsTemp.CRITICAL_MINUS;
+			if(value <= m_empty_treshold) level = DSLevelsTemp.BLINKING_MINUS;
+		}
+		else
+		{
+			if(value > p_warning_treshold) level = DSLevelsTemp.WARNING_PLUS;
+			if(value > p_critical_treshold) level = DSLevelsTemp.CRITICAL_PLUS;
+			if(value >= p_empty_treshold) level = DSLevelsTemp.BLINKING_PLUS;
+		}
+
+		return level;
+	}
+
+	override void DisplayTendency(float delta)
+	{
+		int tendency = CalculateTendency(delta, INC_TRESHOLD_LOW, INC_TRESHOLD_MED, INC_TRESHOLD_HIGH, DEC_TRESHOLD_LOW, DEC_TRESHOLD_MED, DEC_TRESHOLD_HIGH);
+		
+		DSLevelsTemp level = DetermineLevel( GetObservedValue(), PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING,  PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_CRITICAL, PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_EMPTY, PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_WARNING,  PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_CRITICAL, PlayerConstants.THRESHOLD_HEAT_COMFORT_PLUS_EMPTY );
+		
+		DisplayElementTendency dis_elm = DisplayElementTendency.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_TDCY_TEMPERATURE));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetTendency(tendency);
+			dis_elm.SetSeriousnessLevel(level);
+		}
+	}
+
+	override protected float GetObservedValue()
+	{
+		return m_Player.GetStatHeatComfort().Get();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/WetnessNotfr.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/WetnessNotfr.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ca70b043d2fc8e52fdbacbc84d7774b92e55cbc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/Notifiers/WetnessNotfr.c
@@ -0,0 +1,33 @@
+class WetnessNotfr: NotifierBase
+{
+	void WetnessNotfr(NotifiersManager manager)
+	{
+		m_Active = false;
+	}
+
+	override int GetNotifierType()
+	{
+		return eNotifiers.NTF_WETNESS;
+	}
+
+	override void DisplayBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_WET));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.FIRST);
+		}
+		
+	}
+
+	override void HideBadge()
+	{
+		DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_WET));
+		
+		if( dis_elm )
+		{
+			dis_elm.SetLevel(eBadgeLevel.NONE);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerNotifiers/NotifiersManager.c b/scripts/4_World/DayZ/Classes/PlayerNotifiers/NotifiersManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..6732bb5229395aea94a0e6911bb328c88cc12758
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerNotifiers/NotifiersManager.c
@@ -0,0 +1,118 @@
+enum eNotifiers
+{
+	NTF_HEALTHY,
+	NTF_BLEEDISH,
+	NTF_HUNGRY,
+	NTF_THIRSTY,
+	NTF_STUFFED,
+	NTF_SICK,
+	NTF_WETNESS,
+	NTF_WARMTH,
+	NTF_FEVERISH,
+	NTF_BLOOD,
+	NTF_LIVES,
+	NTF_STAMINA,
+	//NTF_AGENT_INFECTION,
+	NTF_PILLS,
+	NTF_HEARTBEAT,
+	NTF_FRACTURE,
+	NTF_LEGS,
+	//----------------------------
+	NTF_COUNT,// !!! LAST ITEM !!!
+
+}
+
+
+class NotifiersManager
+{
+	static const int 				MAX_COUNT = 64;
+	ref array<ref NotifierBase> 	m_Notifiers;
+	ref NotifierBase 				m_NotifiersStatic[MAX_COUNT];//introduced as a seperate array to allow for fast lookup, keeping the old one for quick looping through but also to keep modding compatibility
+	PlayerBase						m_Player;
+	ref VirtualHud					m_VirtualHud;
+	int								m_MinTickTime;
+	string 							m_System = "Notifiers";
+	
+	void NotifiersManager(PlayerBase player)
+	{
+		m_Player = player;
+
+		m_Notifiers = new array<ref NotifierBase>;
+
+		m_MinTickTime = MIN_TICK_NOTIFIERS;
+		Init();
+	}
+
+	void Init()
+	{
+		m_Notifiers.Insert(new HungerNotfr(this));
+		m_Notifiers.Insert(new ThirstNotfr(this));
+		m_Notifiers.Insert(new WarmthNotfr(this));
+		m_Notifiers.Insert(new WetnessNotfr(this));
+		m_Notifiers.Insert(new HealthNotfr(this));
+		m_Notifiers.Insert(new FeverNotfr(this));
+		m_Notifiers.Insert(new SickNotfr(this));
+		m_Notifiers.Insert(new StuffedNotfr(this));
+		m_Notifiers.Insert(new BloodNotfr(this));
+		m_Notifiers.Insert(new PillsNotfr(this));
+		m_Notifiers.Insert(new HeartbeatNotfr(this));
+		m_Notifiers.Insert(new FracturedLegNotfr(this));
+		m_Notifiers.Insert(new InjuredLegNotfr(this));
+		
+	}
+	
+	void RegisterItself(int notifier_id, NotifierBase modifier)
+	{
+		if(notifier_id >= MAX_COUNT)
+			Error("out of bounds for notifier id: " + notifier_id);
+		else
+			m_NotifiersStatic[notifier_id] = modifier;
+	}
+	
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+
+	VirtualHud GetVirtualHud()
+	{
+		return m_VirtualHud;
+	}
+	
+	NotifierBase FindNotifier( int type )
+	{
+		return m_NotifiersStatic[type];
+	}
+
+	void ActivateByType(int notifier, bool triggerEvent = true)
+	{
+		FindNotifier(notifier).SetActive(true);
+	}
+
+	void DeactivateByType(int notifier, bool triggerEvent = true)
+	{
+		FindNotifier(notifier).SetActive(false);
+	}
+
+	void OnScheduledTick()
+	{
+		if( !GetPlayer().IsPlayerSelected() ) return;
+		
+		TickNotifiers();
+	}
+
+	void TickNotifiers()
+	{
+		int current_time = GetGame().GetTime();
+
+		foreach(NotifierBase notifier: m_Notifiers)
+		{
+			if ( notifier.IsActive() && notifier.IsTimeToTick(current_time) )
+			{
+				notifier.OnTick(current_time);
+			}
+		}		
+
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatBase.c b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..7bb886e55e8a652ec92e5b56e8ff50f4dc53ea5d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatBase.c
@@ -0,0 +1,170 @@
+class PlayerStatBase
+{
+	int	m_Type;
+	void 	OnStoreSave( ParamsWriteContext ctx );
+	bool 	OnStoreLoad( ParamsReadContext ctx);
+	void 	OnRPC(ParamsReadContext ctx);
+	float 	Get();
+	string 	GetLabel();
+	void 	SetByFloat(float value);
+	void 	SetByFloatEx(float value, string system = "" );
+	bool	IsSynced();
+	array<PlayerStatRecord> GetRecords();
+	void 	Init(int id/*, PlayerStats manager*/);
+	void 	SerializeValue(array<ref StatDebugObject> objects, int flags);
+	float 	GetNormalized();
+	float 	GetMax();
+	float 	GetMin();
+	int		GetType()
+	{
+		return m_Type;
+	}
+};
+
+class PlayerStat<Class T> extends PlayerStatBase
+{
+	protected T 		m_MinValue;
+	protected T 		m_MaxValue;
+	protected T 		m_Value;
+	protected string 	m_ValueLabel;
+	protected int		m_Flags;
+	
+	ref array<PlayerStatRecord> m_Records;
+	PlayerStats 		m_Manager;
+	
+	
+	void PlayerStat(T min, T max,T init, string label, int flags)
+	{
+		m_MinValue 		= min;
+		m_MaxValue 		= max;
+		m_Value			= init;
+		m_ValueLabel 	= label;
+		m_Flags			= flags;
+		
+		m_Records = new array<PlayerStatRecord>;
+	}
+		
+	override void Init(int id/*, PlayerStats manager*/)
+	{
+		m_Type = id;
+		//m_Manager = manager;	
+	}
+	
+	override void SerializeValue(array<ref StatDebugObject> objects, int flags)
+	{
+		objects.Insert( new StatDebugObject(GetLabel(), Get(), eRemoteStatType.PLAYER_STATS) );
+	}
+	
+	PlayerStats GetManager()
+	{
+		return m_Manager;
+	}	
+	
+	void Set( T value, string system = "" )
+	{
+		/*
+		Print("setting stat: " + this.GetLabel() + "| value:" +value.ToString());
+		
+		if( this.GetLabel() == "Toxicity" )
+		{
+			DebugPrint.LogAndTrace("stack");
+		}
+		*/
+		if ( value > m_MaxValue )
+		{
+			m_Value = m_MaxValue;
+		}
+		else if (value < m_MinValue)
+		{
+			m_Value = m_MinValue;
+		}
+		else
+		{
+			m_Value = value;
+		}
+		//if( GetManager().GetAllowLogs() ) CreateRecord(value, system);
+	}
+	
+	void SetByFloat(float value, string system = "" )
+	{
+		T f = value;
+		Set(f,system);
+		
+	}
+	override void SetByFloatEx(float value, string system = "" )
+	{
+		SetByFloat(value, system);
+	}
+	/*
+	void SetByParam(Param param, string system = "" )
+	{
+		Class.CastTo(p1, param);
+		T v = p1.param1;
+		Set(v, system);
+	}
+	*/
+	void Add( T value, string system = "" )
+	{
+		Set(m_Value+value, system);
+	}
+
+	override float Get()
+	{
+		return m_Value;
+	}
+	
+	override string GetLabel()
+	{
+		return m_ValueLabel;
+	}
+
+	override float GetMax()
+	{
+		return m_MaxValue;
+	}
+
+	override float GetMin()
+	{
+		return m_MinValue;
+	}
+	
+	override float GetNormalized()
+	{
+		return Math.InverseLerp(GetMin(), GetMax(), Get());
+	}
+	
+	override array<PlayerStatRecord> GetRecords()
+	{
+		return m_Records;
+	}
+	
+	void CreateRecord(float value, string system)
+	{
+		m_Records.Insert( new PlayerStatRecord(value, GetGame().GetTime(), system ) );
+	}
+	
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		//ctx.Write(m_ValueLabel);
+		//PrintString("saving " + GetLabel()+" value:" +m_Value);
+		ctx.Write(m_Value);
+	}
+
+	override bool OnStoreLoad( ParamsReadContext ctx)
+	{
+		//string name;
+		
+		//ctx.Read(name);
+		T value;
+		if(ctx.Read(value))
+		{
+			m_Value = value;
+		}
+		else
+		{
+			return false;
+		}
+		//PrintString("loading " + GetLabel()+" value:" +m_Value);
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatRecord.c b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatRecord.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb6b3d110018bee63f889f8466db0fd00bc737cc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatRecord.c
@@ -0,0 +1,20 @@
+class PlayerStatRecord
+{
+	float 		m_Value;
+	float 		m_Time;
+	string		m_System;
+	
+	void PlayerStatRecord(float value, float time, string system)
+	{
+		m_Value = value;
+		m_Time = time;
+		m_System = system;
+	}
+	
+	string GetStringOutput()
+	{
+		return m_Time.ToString()+", " +m_Value.ToString() + ", " +m_System;
+		
+	}
+
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStats.c b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStats.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a120375dd8e92a151d47e111d37672862a94e55
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStats.c
@@ -0,0 +1,141 @@
+enum EPSstatsFlags
+{
+	EMPTY,
+};
+
+class PlayerStats
+{
+	ref array<ref PlayerStatBase> m_PlayerStats;
+	ref array<ref StatDebugObject> m_PlayerStatsDebug;
+	
+	//ref PlayerStatsPCO_current m_PCO = new PlayerStatsPCO_current();
+	ref PCOHandlerStats m_PCOhandler = new PCOHandlerStats();
+	
+	ref Timer m_SyncTimer;
+	Man m_Player;
+	bool m_AllowLogs;
+	string m_System = "Stats"; //debuging tag
+	
+	//int m_SystemVersion = 101;
+	
+	void PlayerStats(Man player)
+	{
+		Init(player);
+	}
+
+	void Init(Man player)
+	{
+		m_Player 		= player;
+	}
+
+	PlayerStatsPCO_Base GetPCO(int version = -1 )
+	{
+		return m_PCOhandler.GetPCO(version);
+	}
+	
+	void ~PlayerStats()
+	{
+		//if( GetGame() && GetGame().IsDebugActions() ) GatherAllRecords();
+	}
+	
+	
+	PlayerStatBase GetStatObject(int id)
+	{
+		PlayerStatsPCO_Base pco = GetPCO();
+		if ( pco )
+		{
+			return pco.GetStatObject(id);
+		}
+		else
+		{
+			return null;
+		}
+	}
+	
+/*
+	array<ref PlayerStatBase> Get()
+	{
+		return m_PlayerStats;
+	}
+*/
+	void SetAllowLogs(bool enable)
+	{
+		m_AllowLogs = enable;
+	}
+
+	bool GetAllowLogs()
+	{
+		return 	m_AllowLogs;	
+	}
+	
+	void GetDebugInfo( array<ref StatDebugObject> objects, int flags )
+	{
+		/*
+		for(int i = 0; i < m_PlayerStats.Count(); i++)
+		{
+			m_PlayerStats.Get(i).SerializeValue(objects, flags);
+		}
+		*/
+	}
+	
+	void GatherAllRecords()
+	{
+		/*
+		FileHandle file = OpenFile("$profile:StatRecords.log", FileMode.WRITE);
+		
+		FPrintln(file, "================================================================");
+		FPrintln(file," ================== " + m_Player.ToString() +" ================== ");
+		FPrintln(file, "================================================================");
+		
+		for(int i = 0; i < m_PlayerStats.Count(); i++)
+		{
+			array<PlayerStatRecord> records =  m_PlayerStats.Get(i).GetRecords();
+			
+			FPrintln(file, m_PlayerStats.Get(i).GetLabel() );
+			
+			for(int z = 0; z < records.Count(); z++)
+			{
+				PlayerStatRecord record = records.Get(z);
+				string output = record.GetStringOutput();
+				FPrintln(file, output);
+			}
+		}
+		*/
+	}
+	
+	void SaveStats( ParamsWriteContext ctx )
+	{
+		int current_version = GetGame().SaveVersion();
+		PlayerStatsPCO_Base pco = GetPCO(current_version);
+		
+		if ( pco )
+		{
+			pco.OnStoreSave(ctx);
+			//Print("Saving stats in version: "+ pco.GetVersion());
+		}
+		else
+		{
+			return;
+		}
+	}
+
+	bool LoadStats( ParamsReadContext ctx, int version )
+	{
+		PlayerStatsPCO_Base pco = GetPCO(version);
+		if (pco && pco.OnStoreLoad(ctx))
+		{
+			//Print("********* LoadStats loading version: " + pco.GetVersion());
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+		
+	}
+
+	void ResetAllStats()
+	{
+		GetPCO().ResetAllStats();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatsPCO.c b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatsPCO.c
new file mode 100644
index 0000000000000000000000000000000000000000..39c75f394d177be715efa3171506402ef789d350
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerStats/PlayerStatsPCO.c
@@ -0,0 +1,302 @@
+
+
+class PCOHandlerStats
+{
+	ref map<int, ref PlayerStatsPCO_Base> m_PCOs = new map<int, ref PlayerStatsPCO_Base>;
+	int m_HighestVersion;
+	
+	void PCOHandlerStats()
+	{
+		RegisterPCO(new PlayerStatsPCO_v100);
+		RegisterPCO(new PlayerStatsPCO_v101);
+		RegisterPCO(new PlayerStatsPCO_current);
+	}
+	
+	void RegisterPCO(PlayerStatsPCO_Base pco)
+	{
+		int version = pco.GetVersion();
+		
+		if( version > m_HighestVersion )
+		{
+			m_HighestVersion = version;
+		}
+		
+		m_PCOs.Insert(version, pco);
+	}
+	
+	PlayerStatsPCO_Base GetPCO(int version = -1)
+	{
+		//PlayerStatsPCO_Base pco;
+
+		if(version == -1)//no version set - fetch the highest version
+		{
+			return m_PCOs.Get(m_HighestVersion);
+		}
+		else if( !m_PCOs.Contains(version))//version set - version not present, fetch the closest lower version
+		{
+			for(int i = version; i > 100; i--)
+			{
+				if(m_PCOs.Contains(i))
+				{
+					//Print("fetching PCO version:"+ i);
+					return m_PCOs.Get(i);	
+				}
+			}
+			return null;
+		}
+		else//version set - version present, fetch it
+		{
+			//Print("fetching PCO version:"+ version);
+			return m_PCOs.Get(version);
+		}
+	}
+}
+
+
+class PlayerStatsPCO_Base
+{
+	void PlayerStatsPCO_Base()
+	{
+		Init();
+	}
+	
+	void Init();
+	
+	int GetVersion()
+	{
+		return -1;
+	}
+	
+	ref array<ref PlayerStatBase> m_PlayerStats = new array<ref PlayerStatBase>;
+	
+	PlayerStatBase GetStatObject(int id)
+	{
+		return m_PlayerStats.Get(id);
+	}
+	
+	void RegisterStat(int id, PlayerStatBase stat)
+	{
+		m_PlayerStats.InsertAt(stat, id);
+		stat.Init(id/*, this*/);
+	}
+	
+	void OnStoreSave ( ParamsWriteContext ctx )
+	{
+		for ( int i = 0; i < m_PlayerStats.Count(); i++ )
+		{
+			m_PlayerStats.Get(i).OnStoreSave(ctx);
+		}
+	}
+	
+	bool OnStoreLoad ( ParamsReadContext ctx )
+	{
+		for ( int i = 0; i < m_PlayerStats.Count(); i++ )
+		{
+			if(!m_PlayerStats.Get(i).OnStoreLoad(ctx))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	array<ref PlayerStatBase> Get()
+	{
+		return m_PlayerStats;
+	}
+	
+	void ResetAllStats()
+	{
+		m_PlayerStats.Clear();
+		Init();
+	}
+}
+
+//---------------------------------------------------------------
+//------------------------- version 100 -------------------------
+//---------------------------------------------------------------
+enum EPlayerStats_v100
+{
+	HEATCOMFORT,
+	TREMOR,
+	WET,
+	ENERGY,
+	WATER,
+	STOMACH_SOLID,
+	STOMACH_ENERGY,
+	STOMACH_WATER,
+	DIET,
+	STAMINA,
+	SPECIALTY,
+	BLOODTYPE,
+};
+
+
+class PlayerStatsPCO_v100 extends PlayerStatsPCO_Base
+{
+
+	override int GetVersion()
+	{
+		return 100;
+	}
+	
+	override void Init()
+	{
+		RegisterStat(EPlayerStats_v100.HEATCOMFORT,  	new PlayerStat<float>	(-1,					1,						0,						"HeatComfort",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.TREMOR,		  	new PlayerStat<float>	(0,						1,						0,						"Tremor",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.WET,  			new PlayerStat<int>		(0,						1,						0,						"Wet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.ENERGY,  			new PlayerStat<float>	(0,						20000,					600,					"Energy",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.WATER,  			new PlayerStat<float>	(0,						5000,					500,					"Water",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.STOMACH_SOLID,  	new PlayerStat<float>	(0,						5000,					0,						"StomachSolid",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.STOMACH_ENERGY,  	new PlayerStat<float>	(0,						40000,					0,						"StomachEnergy",	EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.STOMACH_WATER,  	new PlayerStat<float>	(0,						5000,					0,						"StomachWater",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.DIET,  			new PlayerStat<float>	(0,						5000,					2500,					"Diet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.STAMINA,  		new PlayerStat<float>	(0,						GameConstants.STAMINA_MAX,			100,					"Stamina",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.SPECIALTY,  		new PlayerStat<float>	(-1,					1,						0,						"Specialty",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v100.BLOODTYPE,  		new PlayerStat<int>		(0,						128,					BloodTypes.GenerateBloodType(),	"BloodType",		EPSstatsFlags.EMPTY) );
+	}
+	
+	void PlayerStatsPCO_v100()
+	{
+		
+	}
+
+};
+//---------------------------------------------------------------
+//------------------------- version 101 -------------------------
+//---------------------------------------------------------------
+
+enum EPlayerStats_v101
+{
+	HEATCOMFORT,
+	TREMOR,
+	WET,
+	ENERGY,
+	WATER,
+	STOMACH_SOLID,
+	STOMACH_ENERGY,
+	STOMACH_WATER,
+	DIET,
+	STAMINA,
+	SPECIALTY,
+	BLOODTYPE,
+	TOXICITY,
+};
+
+
+class PlayerStatsPCO_v101 extends PlayerStatsPCO_Base
+{
+	override int GetVersion()
+	{
+		return 101;
+	}
+	
+	override void Init()
+	{
+		RegisterStat(EPlayerStats_v101.HEATCOMFORT,  	new PlayerStat<float>	(-1,					1,						0,						"HeatComfort",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.TREMOR,		  	new PlayerStat<float>	(0,						1,						0,						"Tremor",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.WET,  			new PlayerStat<int>		(0,						1,						0,						"Wet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.ENERGY,  			new PlayerStat<float>	(0,						20000,					600,					"Energy",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.WATER,  			new PlayerStat<float>	(0,						5000,					500,					"Water",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.STOMACH_SOLID,  	new PlayerStat<float>	(0,						5000,					0,						"StomachSolid",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.STOMACH_ENERGY,  	new PlayerStat<float>	(0,						40000,					0,						"StomachEnergy",	EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.STOMACH_WATER,  	new PlayerStat<float>	(0,						5000,					0,						"StomachWater",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.DIET,  			new PlayerStat<float>	(0,						5000,					2500,					"Diet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.STAMINA,  		new PlayerStat<float>	(0,						GameConstants.STAMINA_MAX,			100,					"Stamina",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.SPECIALTY,  		new PlayerStat<float>	(-1,					1,						0,						"Specialty",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.BLOODTYPE,  		new PlayerStat<int>		(0,						128,					BloodTypes.GenerateBloodType(),	"BloodType",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v101.TOXICITY,  		new PlayerStat<float>	(0,						100,					0,						"Toxicity",			EPSstatsFlags.EMPTY) );
+	}
+};
+
+
+enum EPlayerStats_v106
+{
+	HEATCOMFORT,
+	TREMOR,
+	WET,
+	ENERGY,
+	WATER,
+	DIET,
+	STAMINA,
+	SPECIALTY,
+	BLOODTYPE,
+	TOXICITY,
+};
+
+class PlayerStatsPCO_v106 extends PlayerStatsPCO_Base
+{
+	override int GetVersion()
+	{
+		return 106;
+	}
+	
+	override void Init()
+	{
+		RegisterStat(EPlayerStats_v106.HEATCOMFORT,  	new PlayerStat<float>	(-1,	1,							0,								"HeatComfort",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.TREMOR,		  	new PlayerStat<float>	(0,		1,							0,								"Tremor",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.WET,  			new PlayerStat<int>		(0,		1,							0,								"Wet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.ENERGY,  		new PlayerStat<float>	(0,		20000,						600,							"Energy",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.WATER,  			new PlayerStat<float>	(0,		5000,						650,							"Water",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.DIET,  			new PlayerStat<float>	(0,		5000,						2500,							"Diet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.STAMINA,  		new PlayerStat<float>	(0,		GameConstants.STAMINA_MAX,	100,							"Stamina",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.SPECIALTY,  		new PlayerStat<float>	(-1,	1,							0,								"Specialty",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.BLOODTYPE,  		new PlayerStat<int>		(0,		128,						BloodTypes.GenerateBloodType(),	"BloodType",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v106.TOXICITY,  		new PlayerStat<float>	(0,		100,						0,								"Toxicity",			EPSstatsFlags.EMPTY) );
+	}
+};
+
+
+enum EPlayerStats_v115
+{
+	HEATCOMFORT,
+	TREMOR,
+	WET,
+	ENERGY,
+	WATER,
+	DIET,
+	STAMINA,
+	SPECIALTY,
+	BLOODTYPE,
+	TOXICITY,
+	HEATBUFFER,
+};
+
+class PlayerStatsPCO_v115 extends PlayerStatsPCO_Base
+{
+	override int GetVersion()
+	{
+		return 115;
+	}
+	
+	override void Init()
+	{
+		RegisterStat(EPlayerStats_v115.HEATCOMFORT,  	new PlayerStat<float>	(-1,	1,								0,								"HeatComfort",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.TREMOR,		  	new PlayerStat<float>	(0,		1,								0,								"Tremor",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.WET,  			new PlayerStat<int>		(0,		1,								0,								"Wet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.ENERGY,  		new PlayerStat<float>	(0,		PlayerConstants.SL_ENERGY_MAX,	600,							"Energy",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.WATER,  			new PlayerStat<float>	(0,		PlayerConstants.SL_WATER_MAX,	600,							"Water",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.DIET,  			new PlayerStat<float>	(0,		5000,							2500,							"Diet",				EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.STAMINA,  		new PlayerStat<float>	(0,		CfgGameplayHandler.GetStaminaMax(),		100,					"Stamina",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.SPECIALTY,  		new PlayerStat<float>	(-1,	1,								0,								"Specialty",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.BLOODTYPE,  		new PlayerStat<int>		(0,		128,							BloodTypes.GenerateBloodType(),	"BloodType",		EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.TOXICITY,  		new PlayerStat<float>	(0,		100,							0,								"Toxicity",			EPSstatsFlags.EMPTY) );
+		RegisterStat(EPlayerStats_v115.HEATBUFFER,  	new PlayerStat<float>	(-30,	30,								0,								"HeatBuffer",		EPSstatsFlags.EMPTY) );
+	}
+};
+
+
+//---------------------------------------------------------------
+//------------------------- version current -------------------------
+//---------------------------------------------------------------
+
+enum EPlayerStats_current: EPlayerStats_v115
+{
+	
+};
+
+//mod this class, it will always point to the latest version
+class PlayerStatsPCO_current extends PlayerStatsPCO_v115
+{
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerStats/StatDebugObject.c b/scripts/4_World/DayZ/Classes/PlayerStats/StatDebugObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e869ae9d7ed29051b676da8736fb7af16818192
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerStats/StatDebugObject.c
@@ -0,0 +1,39 @@
+class StatDebugObject
+{
+	string m_Name;
+	float m_Value;
+	eRemoteDebugType m_Type;
+	
+	void StatDebugObject(string name, float value, eRemoteDebugType type)
+	{
+		m_Name = name;
+		m_Value = value;
+		m_Type = type;
+	}
+	
+	void Debug()
+	{
+		PrintString("stat_type:"+ m_Name + "|stat_value:"+ m_Value.ToString());
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	string GetValue()
+	{
+		return m_Value.ToString();
+	}
+	
+	void SetType(eRemoteDebugType type)
+	{
+		m_Type = type;
+	}
+	
+	eRemoteDebugType GetType()
+	{
+		return m_Type;
+	}
+	
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerStomach.c b/scripts/4_World/DayZ/Classes/PlayerStomach.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ab9fabc5ef757ae202387bf45fb7389cd5830c4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerStomach.c
@@ -0,0 +1,459 @@
+class StomachItem
+{
+	ref NutritionalProfile m_Profile;
+	float m_Amount;
+	int m_FoodStage;
+	//bool m_IsLiquid;
+	string m_ClassName;
+	int m_Agents;
+	
+	void StomachItem(string class_name, float amount, NutritionalProfile profile,int foodstage, int agents)
+	{
+		m_Amount = amount;
+		m_Profile = profile;
+		//m_IsLiquid = is_liquid;
+		m_FoodStage = foodstage;
+		m_ClassName = class_name;
+		m_Agents = agents;
+	}
+	
+	string GetClassName()
+	{
+		return m_ClassName;
+	}
+	
+	/*
+	void SetLiquid(bool is_liquid)
+	{
+		m_IsLiquid = is_liquid;
+	}
+	
+	bool IsLiquid()
+	{
+		return m_IsLiquid;
+	}*/
+	
+
+	
+	int GetFoodStage()
+	{
+		return m_FoodStage;
+	}
+	
+	void SetFoodStage(int food_stage)
+	{
+		m_FoodStage = food_stage;
+	}
+	
+	// returns grams or ml's of this item/liquid
+	float GetAmount()
+	{
+		return m_Amount;
+	}
+	
+	// adds grams or ml's of this item/liquid
+	void AddAmount(float amount)
+	{
+		m_Amount += amount;
+	}
+	
+	void AddAgents(int agents)
+	{
+		m_Agents = m_Agents | agents;
+	}
+	
+	
+	// "digests" given amount, "outs" nutritional components, and returns 'true' if leads to complete item digestion(no amount left)
+	bool ProcessDigestion(float digestion_points, out float water, out float energy, out float toxicity, out float volume, out int agents, out float consumed_amount)
+	{
+		agents = m_Agents;
+		consumed_amount = GetNutritions(digestion_points, m_Profile, water, energy, toxicity );
+		m_Amount -= consumed_amount;
+		volume = m_Profile.GetFullnessIndex() * m_Amount;
+		return( m_Amount < 0.001 );
+	}
+	
+	float GetNutritions( float digestion_points, NutritionalProfile profile, out float water, out float energy, out float toxicity )
+	{	
+		float energy_per_unit = profile.GetEnergy() / 100;
+		float water_per_unit = profile.GetWaterContent() / 100;
+		float toxicity_per_unit = profile.GetToxicity();
+		float digestability = profile.GetDigestibility();
+		
+		if(digestability == 0)//if undefined
+		{
+			digestability = 1;
+		}
+		
+		float consumed_quantity = digestion_points * digestability;
+		
+		if( m_Amount < consumed_quantity )
+		{
+			consumed_quantity = m_Amount;
+		}
+		if ( consumed_quantity > 0 )
+		{
+			water = consumed_quantity * water_per_unit;
+			energy = consumed_quantity * energy_per_unit;
+			toxicity = consumed_quantity * toxicity_per_unit;
+		}
+		return consumed_quantity;
+	}
+}
+
+class PlayerStomach
+{
+	const int DIGESTING_WATER = 1;
+	const int DIGESTING_ENERGY = 2;
+	
+	const int quantity_bit_offset = 16;
+	const int id_bit_offset = 4;//based on food stage count(+1 for safe measure)
+	static int CHECKSUM;
+	const float DIGESTION_POINTS = PlayerConstants.DIGESTION_SPEED;
+	const int ACCEPTABLE_QUANTITY_MAX = 32768;
+	const int ACCEPTABLE_FOODSTAGE_MAX = FoodStageType.COUNT - 1;
+	static ref map<string, int> m_NamesToIDs = new map<string, int>;
+	static ref map<int, string> m_IDsToNames = new map<int, string>;
+	static const bool m_InitData = PlayerStomach.InitData();
+	ref array<ref StomachItem> m_StomachContents = new array<ref StomachItem>;
+	int m_AgentTransferFilter;//bit mask that prevents agents set in the mask from passing to the player
+	bool 	m_Digesting;
+	int 	m_DigestingType;
+	PlayerBase m_Player;
+	float m_StomachVolume;
+	const int STORAGE_VERSION = 106;
+	
+		
+	void PlayerStomach(PlayerBase player)
+	{
+		m_Player = player;
+	}
+
+	void ~PlayerStomach()
+	{
+		
+	}
+	
+	
+	float GetStomachVolume()
+	{
+		return m_StomachVolume;
+	}
+	
+	void ClearContents()
+	{
+		m_StomachContents.Clear();
+		m_StomachVolume = 0.0;
+	}
+	
+	void SetAgentTransferFilter(int filter_agents)
+	{
+		m_AgentTransferFilter;
+	}
+	
+	int GetAgentTransferFilter()
+	{
+		return m_AgentTransferFilter;
+	}
+	
+	static void RegisterItem(string classname, int id)
+	{
+		int hash = classname.Hash();
+		CHECKSUM = CHECKSUM^hash; //xor hash vs current checksum
+//		Print(classname);
+//		Print(CHECKSUM);
+		m_NamesToIDs.Insert(classname, id);
+		m_IDsToNames.Insert(id, classname);
+	}
+	
+	static string GetClassnameFromID(int id)
+	{
+		return m_IDsToNames.Get(id);
+	}
+	
+	static int GetIDFromClassname(string name)
+	{
+		if(!m_NamesToIDs.Contains(name))
+			return -1;
+		return m_NamesToIDs.Get(name);
+	}
+	
+	static bool InitData()
+	{
+		TStringArray all_paths = new TStringArray;
+		
+		all_paths.Insert("CfgVehicles");
+		all_paths.Insert("cfgLiquidDefinitions");
+		
+		string config_path;
+		string child_name;
+		int scope;
+		string path;
+		int consumable_count;
+		for(int i = 0; i < all_paths.Count(); i++)
+		{
+			config_path = all_paths.Get(i);
+			int children_count = GetGame().ConfigGetChildrenCount(config_path);
+			
+			for(int x = 0; x < children_count; x++)
+			{
+				GetGame().ConfigGetChildName(config_path, x, child_name);
+				path = config_path + " " + child_name;
+				scope = GetGame().ConfigGetInt( config_path + " " + child_name + " scope" );
+				bool should_check = 1;
+				if( config_path == "CfgVehicles" && scope == 0)
+				{
+					should_check = 0;
+				}
+				
+				if ( should_check )
+				{
+					bool has_nutrition = GetGame().ConfigIsExisting(path + " Nutrition");
+					bool has_stages = GetGame().ConfigIsExisting(path + " Food");
+					
+					if(has_nutrition || has_stages)
+					{
+						//Print("child name:" + child_name);
+						RegisterItem(child_name, consumable_count);//consumable_count value serves as an unique ID for each item
+						consumable_count++;
+					}
+				}
+			}
+		}
+		//Print("consumable_count " + consumable_count);
+		return true;
+	}
+	
+	int GetStorageVersion()
+	{
+		return STORAGE_VERSION;
+	}
+	
+	bool IsDigesting()
+	{
+		return (m_DigestingType != 0);
+	}
+	
+	int GetDigestingType()
+	{
+		return m_DigestingType;
+	}
+	
+	
+	void Update(float delta_time)
+	{
+		ProcessNutrients(delta_time);
+	}
+	
+	void ProcessNutrients(float delta_time)
+	{
+		StomachItem item;
+		int stomach_items_count = m_StomachContents.Count();
+		m_DigestingType = 0;
+		if(stomach_items_count == 0) 
+			return;
+		
+		float digestion_points_per_item = (DIGESTION_POINTS / stomach_items_count) * delta_time;
+		m_StomachVolume = 0;//reset, it's accumulated with each pass
+		for(int i = 0; i < m_StomachContents.Count(); i ++)
+		{
+			item = m_StomachContents.Get(i);
+			float water, energy, toxicity, volume, consumed_amount;
+			int agents;
+			if(item.ProcessDigestion( digestion_points_per_item, water, energy, toxicity, volume, agents, consumed_amount ))
+			{
+				m_StomachContents.Remove(i);
+				i--;
+			}
+			m_StomachVolume += volume;
+			m_Player.GetStatEnergy().Add(energy);
+			m_Player.GetStatWater().Add(water);
+			
+			if(energy > 0)
+			{
+				m_DigestingType = m_DigestingType | DIGESTING_ENERGY;
+			}
+			
+			if(water > 0)
+			{
+				m_DigestingType = m_DigestingType | DIGESTING_WATER;
+			}
+			
+			DigestAgents(agents, consumed_amount);
+		}
+	}
+
+	
+	void DigestAgents(int agents, float quantity)
+	{
+		if(!agents)
+			return;
+		agents = agents & (~m_AgentTransferFilter);//filter against the agent filter mask
+		int highest_bit = Math.Log2(agents) + 1;
+		for(int i = 0; i < highest_bit;i++)
+		{
+			int agent = (1 << i)& agents;
+			if( agent )
+			{
+				m_Player.m_AgentPool.DigestAgent(agent, quantity);
+			}
+		}
+	}
+	
+	void PrintUpdate()
+	{
+		Print("================================");
+		for(int i = 0; i < m_StomachContents.Count(); i++)
+		{
+			string itemname = m_StomachContents.Get(i).m_ClassName;
+			float amount = m_StomachContents.Get(i).GetAmount();
+			int food_stage = m_StomachContents.Get(i).GetFoodStage();
+			int agents = m_StomachContents.Get(i).m_Agents;
+			Print(">");
+			Print("itemname:" + itemname);
+			Print("amount:" + amount);
+			Print("food_stage:" + food_stage);
+			Print("agents:" + agents);
+			Print(">");
+		}
+		Print("m_StomachVolume:" + m_StomachVolume);
+		Print("================================");
+	}
+	
+	void AddToStomach(string class_name, float amount, int food_stage = 0, int agents = 0)
+	{
+		if (GetIDFromClassname(class_name) == -1)
+			return;
+		bool is_liquid;
+		
+		NutritionalProfile profile = Liquid.GetNutritionalProfileByName(class_name);
+		if(profile)
+		{
+			is_liquid = true;
+		}
+		else
+		{
+			profile = Edible_Base.GetNutritionalProfile(null,class_name, food_stage);
+		}
+		
+		if(profile)
+		{
+			// sanity checks start
+			if(amount > ACCEPTABLE_QUANTITY_MAX || amount < 0)
+			{
+				amount = 0;
+			}
+			if (food_stage < 0 || food_stage > ACCEPTABLE_FOODSTAGE_MAX)
+			{
+				food_stage = FoodStageType.RAW;
+			}
+			// sanity checks end
+			
+			agents = agents | profile.GetAgents();
+			bool found = false;
+			for(int i = 0; i < m_StomachContents.Count(); i++)
+			{
+				StomachItem stomach_item = m_StomachContents.Get(i);
+				if(stomach_item.GetClassName() == class_name )
+				{
+					if (is_liquid || stomach_item.GetFoodStage() == food_stage)
+					{
+						stomach_item.AddAmount(amount);
+						stomach_item.AddAgents(agents);
+						found = true;
+					}
+				}
+			}
+			
+			if(!found)
+			{
+				m_StomachContents.Insert(new StomachItem(class_name, amount, profile, food_stage, agents));
+			}
+		}
+	}
+	
+	void OnStoreSave(ParamsWriteContext ctx)
+	{
+		ctx.Write( PlayerStomach.CHECKSUM );
+		ctx.Write( m_StomachContents.Count() );
+		StomachItem stomach_item;
+		for(int i = 0; i < m_StomachContents.Count();i++)
+		{
+			stomach_item = m_StomachContents.Get(i);
+			int id = PlayerStomach.GetIDFromClassname(stomach_item.m_ClassName);
+			//Print("SAVE id:" + id);
+			//Print("SAVE id_bit_offset:" + id_bit_offset);
+			
+			int write_result = stomach_item.m_FoodStage | ( id << id_bit_offset );
+			write_result = write_result | ((int)stomach_item.m_Amount << quantity_bit_offset);
+			ctx.Write( write_result );
+			ctx.Write( stomach_item.m_Agents );
+			//Print("SAVE write_result:" + write_result);
+		}
+		//Print("SAVE CHECKSUM:" + PlayerStomach.CHECKSUM);
+	}
+	
+	bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		int checksum, count;
+		if(!ctx.Read(checksum))
+		{
+			return false;
+		}
+		
+		if(!ctx.Read(count))
+		{
+			return false;
+		}
+		for(int i = 0; i < count; i++)
+		{
+			int value, agents;
+			if(!ctx.Read(value) )
+			{
+				return false;
+			}	
+			if(!ctx.Read(agents) )
+			{
+				return false;
+			}
+			if(checksum == CHECKSUM)//if checksum matches, add to stomach, otherwise throw the data away but go through the de-serialization to keep the stream intact
+			{
+				int amount = value >> quantity_bit_offset;//isolate amount bits
+				int id_mask = Math.Pow(2, quantity_bit_offset) - 1;
+				int id = (id_mask & value) >> id_bit_offset;//isolate id bits
+				int food_mask = Math.Pow(2, id_bit_offset) - 1;
+				int food_stage = value & food_mask;
+				//Print("LOAD value:" + value);
+				//Print("LOAD id:" + id);
+				//Print("LOAD id_bit_offset:" + id_bit_offset);
+				//Print("LOAD food_stage:" + food_stage);
+				string classname = GetClassnameFromID(id);
+				AddToStomach(classname, amount, food_stage, agents);
+			}
+		}
+		//Print("LOAD checksum:" + checksum);
+		if(checksum != CHECKSUM)
+		{
+			Print("Stomach checksum fail");
+		}
+		return true;
+	}
+
+	int GetDebugObject(array<ref Param> object_out)
+	{
+		int count = m_StomachContents.Count();
+		for(int i = 0; i < m_StomachContents.Count();i++)
+		{
+			int id = PlayerStomach.GetIDFromClassname(m_StomachContents.Get(i).m_ClassName);
+			int food_stage = m_StomachContents.Get(i).m_FoodStage;
+			int agents = m_StomachContents.Get(i).m_Agents;
+			float amount = m_StomachContents.Get(i).m_Amount;
+			Param4<int,int,int,float> p4 = new Param4<int,int,int,float>(id, food_stage, agents, amount);
+			object_out.Insert(p4);
+		}
+		Param1<float> p1 = new Param1<float>(m_StomachVolume);
+		object_out.Insert(p1);
+		return count;
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/SmptAnimMeta.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/SmptAnimMeta.c
new file mode 100644
index 0000000000000000000000000000000000000000..dc4702f1c585883c68bcb8f02c25b7659029e6ab
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/SmptAnimMeta.c
@@ -0,0 +1,209 @@
+enum eAnimFinishType
+{
+	SUCCESS,
+	FAILURE,
+}
+
+class SmptAnimMetaBase
+{
+	bool	m_IsPlaying;
+	SymptomManager m_Manager;
+	PlayerBase m_Player;
+	int m_AnimID;
+	int m_SymptomType;
+	int m_StateType;
+	bool m_DestroyRequested;
+	bool m_Canceled;
+	
+	void SmptAnimMetaBase()
+	{
+	}
+	
+	void Init(ParamsReadContext ctx, SymptomManager manager, PlayerBase player)
+	{
+		m_Manager = manager;
+		m_Player = player;
+	}
+	
+	bool IsPlaying()
+	{
+		return m_IsPlaying;
+	}
+	
+	bool IsDestroyReqested()
+	{
+		return m_DestroyRequested;
+	}
+	
+	void AnimFinished(eAnimFinishType type)
+	{
+		m_DestroyRequested = true;
+		SymptomBase Symptom = m_Manager.GetCurrentPrimaryActiveSymptom();
+		
+		if( type == eAnimFinishType.FAILURE)//   <--------------- FAILED
+		{
+			if( m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+			{
+				if( Symptom ) 
+				{
+					Symptom.AnimationPlayFailed();
+				}
+			}
+		}
+		else if( type == eAnimFinishType.SUCCESS)//   <--------------- SUCCESS
+		{
+			if( m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+			{
+				if( Symptom )
+				{
+					Symptom.AnimationFinish();
+				}
+			}
+		}
+	}
+	
+	EAnimPlayState PlayRequest()
+	{
+		EAnimPlayState played = Play();
+		
+		if(played == EAnimPlayState.FAILED)
+		{
+			m_Manager.OnAnimationFinished(eAnimFinishType.FAILURE);
+		}
+		return played;
+	}
+	
+	protected EAnimPlayState Play();
+	
+	void Update(HumanMovementState movement_state);
+
+};
+
+class SmptAnimMetaFB extends SmptAnimMetaBase
+{
+	int m_StanceMask;
+	float m_Duration;
+	
+	void ~SmptAnimMetaFB()
+	{
+		if(m_Player)
+			m_Player.m_isFBsymptomPlaying = false;
+	}
+	
+	override void Init(ParamsReadContext ctx, SymptomManager manager, PlayerBase player)
+	{
+		super.Init(ctx, manager, player);
+		DayZPlayerSyncJunctures.ReadPlayerSymptomFBParams( ctx,  m_AnimID, m_StanceMask, m_Duration);
+	}
+	
+	override EAnimPlayState Play()
+	{
+		m_Canceled = false;
+		
+		HumanCommandActionCallback callback = m_Player.GetCommand_Action();
+		
+		if (!callback)
+		{
+			callback = m_Player.GetCommandModifier_Action();
+		}
+		if( callback )
+		{
+			callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+			m_Canceled = true;
+		}
+		
+		if(!m_Canceled)
+		{
+			SymptomCB anim_callback = SymptomCB.Cast(m_Player.StartCommand_Action(m_AnimID, SymptomCB, m_StanceMask));
+			
+			if(anim_callback)
+			{
+				anim_callback.Init(m_Duration, m_Player);
+				m_IsPlaying = true;
+				m_Player.m_isFBsymptomPlaying = true;
+				return EAnimPlayState.OK;
+			}
+			else
+			{
+				return EAnimPlayState.FAILED;
+			}
+		}
+		return EAnimPlayState.POSTPONED;
+	}
+}
+
+class SmptAnimMetaADD extends SmptAnimMetaBase
+{
+	bool m_CalledAnimStart;
+	override void Init(ParamsReadContext ctx, SymptomManager manager, PlayerBase player)
+	{
+		super.Init(ctx, manager, player);
+		DayZPlayerSyncJunctures.ReadPlayerSymptomADDParams( ctx, m_AnimID);
+	}
+	
+	override EAnimPlayState Play()
+	{
+		HumanCommandActionCallback callback = m_Player.GetCommand_Action();
+		if (!callback)
+		{
+			callback = m_Player.GetCommandModifier_Action();
+		}
+		if( !callback )
+		{
+			HumanCommandWeapons hcw = m_Player.GetCommandModifier_Weapons();
+			if (hcw && !hcw.IsActionFinished())
+				return EAnimPlayState.FAILED;
+			
+			HumanCommandAdditives ad = m_Player.GetCommandModifier_Additives();
+			if(ad)
+			{
+				//Print("------------------ Playing -----------------");
+				ad.StartModifier(m_AnimID);
+				m_IsPlaying = true;
+
+				return EAnimPlayState.OK;
+			}
+		}
+		return EAnimPlayState.FAILED;
+	}
+	
+	override void Update(HumanMovementState movement_state)
+	{
+		if( m_IsPlaying )
+		{
+			HumanCommandAdditives ad = m_Player.GetCommandModifier_Additives();
+			if(!ad || !ad.IsModifierActive())
+			{
+				//Print("------------------ Not Playing -----------------");
+				m_Manager.OnAnimationFinished();
+			}
+			else
+			{
+				if(!m_CalledAnimStart)
+				{
+					m_Manager.OnAnimationStarted();
+					m_CalledAnimStart = true;
+				}
+			}
+		}
+	}
+}
+
+
+class HeatComfortmMetaADD extends SmptAnimMetaADD
+{
+	override void Update(HumanMovementState movement_state)
+	{
+		//if( movement_state.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_WALK || movement_state.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_RUN || movement_state.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_SPRINT)
+		if( movement_state.m_iMovement != DayZPlayerConstants.MOVEMENTIDX_IDLE || movement_state.IsInProne())
+		{
+			HumanCommandAdditives ad = m_Player.GetCommandModifier_Additives();
+			if(ad && ad.IsModifierActive())
+			{
+				ad.CancelModifier();
+			}
+		}
+		
+		super.Update(movement_state);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateBase.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f3c148ca6e127c3267b685aa261535272c51d4bf
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateBase.c
@@ -0,0 +1,345 @@
+class SymptomBase
+{
+	const float MAX_TIME_ACTIVE_SAVEGUARD = 20;
+	int m_Priority;
+	SoundOnVehicle m_SoundObject;
+	bool m_PlayedSound;
+	bool m_IsActivated;
+	PlayerBase m_Player;
+	float m_ServerUpdateInterval = 1;
+	float m_ServerUpdateDelta;
+	bool m_IsTemplate = true;
+	float m_ActivatedTime;
+	int m_ID;//ID for the type of Symptom
+	int m_UID;//unique ID
+	bool m_IsClientOnly;
+	bool m_DestroyOnAnimFinish = true;
+	bool m_DestroyRequested = false;
+	int m_SymptomType = -1;
+	bool m_IsPersistent = false;
+	SymptomManager m_Manager;
+	bool m_SyncToClient = false;
+	float m_Duration;
+	bool m_AnimPlayRequested;
+	int m_MaxCount = -1;//how many symptoms of this type can be queued up at the same time, '-1' for unlimited
+
+	SymptomCB m_AnimCallback;
+	
+	ref array<Param> m_PersistentParams = new array<Param>;
+	
+	void SymptomBase()
+	{
+	}
+	
+	void ~SymptomBase()
+	{
+
+	}
+
+	void Init(SymptomManager manager, PlayerBase player, int uid)
+	{
+		m_Manager = manager;
+		m_Player = player;
+		m_UID = uid;
+		m_IsTemplate = false;
+		OnInit();
+	}
+	
+	int GetMaxCount()
+	{
+		return m_MaxCount;
+	}
+	
+	int GetUID()
+	{
+		return m_UID;
+	}
+
+	void OnOwnerKilled()
+	{
+		
+		
+	}
+	
+	bool CanBeInterupted()
+	{
+		if (m_AnimPlayRequested) 
+		{
+			//Print("--------- preventing interrupt ---------");
+			return false;
+		}
+		return true;
+	}
+	
+	bool IsClientOnly()
+	{
+		return m_IsClientOnly;
+	}
+	
+	
+	void SetDuration(float duration)
+	{
+		m_Duration = duration;
+	}
+	
+	float GetDuration()
+	{
+		return m_Duration;
+	}
+	
+	string GetName()
+	{
+		return this.ClassName();		
+	}
+
+	SymptomManager GetManager()
+	{
+		return m_Manager;
+	}
+	
+	int GetType()
+	{
+		return m_ID;
+	}
+	
+	void SetParam(Param p)
+	{
+	
+	}
+
+	bool IsSyncToClient()
+	{
+		return m_SyncToClient;		
+	}
+
+	void GetPersistentParams(array<Param> params)
+	{
+		for (int i = 0; i < m_PersistentParams.Count(); i++)
+		{
+			params.Insert(m_PersistentParams.Get(i));
+		}
+	}
+
+	void MakeParamObjectPersistent(Param object)
+	{
+		if ( !GetGame().IsServer() && !GetGame().IsMultiplayer() ) return;
+		
+		m_PersistentParams.Insert(object);
+	}
+	
+	bool IsPersistent()
+	{
+		return m_IsPersistent;
+	}
+	
+	bool IsPrimary()
+	{
+		if ( m_SymptomType == SymptomTypes.PRIMARY)
+			return true;
+		else return false;
+	}
+	
+	PlayerBase GetPlayer()
+	{
+		return m_Player;		
+	}
+
+	int GetPriority()
+	{
+		return m_Priority;
+	}
+	
+	bool OnConstructed(SymptomManager manager)
+	{
+		
+	}
+	
+	void OnDestructed()
+	{
+		if ( IsActivated() ) Deactivate();
+		if ( GetManager() ) m_Manager.OnSymptomExit(this, m_UID);
+	}
+
+	void Activate()
+	{
+		m_IsActivated = true;
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			OnGetActivatedServer(m_Player);
+			if ( GetGame().IsMultiplayer() )
+			{
+				if ( IsSyncToClient() ) 
+					SyncToClientActivated( GetType(), GetUID() );
+				#ifdef DIAG_DEVELOPER
+				GetManager().SendServerDebugToClient();
+				#endif
+			}
+		}
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			OnGetActivatedClient(m_Player);
+		}
+	}
+	
+	void Deactivate()
+	{
+		if ( !GetGame() ) return;
+		m_IsActivated = false;
+		if ( GetGame().IsServer() ) 
+		{
+			OnGetDeactivatedServer(m_Player);
+			if ( GetGame().IsMultiplayer() && IsSyncToClient() )
+			{
+				SyncToClientDeactivated( GetType(), GetUID() );
+			}
+		}
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			OnGetDeactivatedClient(m_Player);
+		}
+		
+	}
+	
+	bool IsActivated()
+	{
+		return m_IsActivated;
+	}
+	
+	
+	
+	void Update(float deltatime)
+	{
+		if ( GetGame().IsServer() ) 
+		{
+			m_ServerUpdateDelta += deltatime;
+			if (m_ServerUpdateDelta > m_ServerUpdateInterval )
+			{
+				m_ActivatedTime += m_ServerUpdateDelta;
+				OnUpdateServer(m_Player, m_ServerUpdateDelta);
+				m_ServerUpdateDelta = 0;
+			}
+		}
+		if ( GetGame().IsClient() )
+		{
+			OnUpdateClient(m_Player, deltatime);
+		}
+		if ( GetGame().IsServer() && !GetGame().IsMultiplayer() && !GetGame().IsMissionMainMenu() )
+		{
+			OnUpdateClient(m_Player, deltatime);
+		}
+		CheckDestroy();
+	}
+	
+	void PlayAnimationFB(int animation, int stance_mask, float running_time = -1)
+	{
+		DayZPlayerSyncJunctures.SendPlayerSymptomFB(m_Player, animation, GetType() , stance_mask, running_time );
+		m_AnimPlayRequested = true;
+	}
+	
+	void PlayAnimationADD(int type)
+	{
+		DayZPlayerSyncJunctures.SendPlayerSymptomADD(m_Player, type, GetType());
+		m_AnimPlayRequested = true;
+	}
+		
+	void PlaySound(EPlayerSoundEventID id)
+	{
+		GetPlayer().RequestSoundEvent(id);
+		m_PlayedSound = true;
+	}
+
+	void SyncToClientActivated( int SYMPTOM_id, int uid )
+	{
+		if ( !GetPlayer() ) return;
+		
+		CachedObjectsParams.PARAM2_INT_INT.param1 = SYMPTOM_id;
+		CachedObjectsParams.PARAM2_INT_INT.param2 = uid;
+		GetGame().RPCSingleParam(GetPlayer(), ERPCs.RPC_PLAYER_SYMPTOM_ON, CachedObjectsParams.PARAM2_INT_INT,true,GetPlayer().GetIdentity() );
+	}
+	
+	void SyncToClientDeactivated( int SYMPTOM_id, int uid )
+	{
+		if ( !GetPlayer() ) return;
+		CachedObjectsParams.PARAM2_INT_INT.param1 = SYMPTOM_id;
+		CachedObjectsParams.PARAM2_INT_INT.param2 = uid;
+		GetGame().RPCSingleParam(GetPlayer(), ERPCs.RPC_PLAYER_SYMPTOM_OFF, CachedObjectsParams.PARAM2_INT_INT,true,GetPlayer().GetIdentity() );
+	}
+
+	void CheckSoundFinished()
+	{
+		if (GetGame().IsServer())
+		{
+			if (m_PlayedSound && m_ActivatedTime >= m_Duration)
+				RequestDestroy();
+		}
+	}
+	
+	void CheckDestroy()
+	{
+		CheckSoundFinished();
+		if ( IsPrimary() && m_ActivatedTime > MAX_TIME_ACTIVE_SAVEGUARD)
+		{
+			RequestDestroy();
+		}
+		
+		if (m_DestroyRequested) 
+			Destroy();
+	}
+	
+	SmptAnimMetaBase SpawnAnimMetaObject()
+	{
+		return null;
+	}
+	
+
+	void RequestDestroy()
+	{
+		m_DestroyRequested = true;
+		//if(!IsActivated() ) Destroy();
+	}
+
+	void Destroy()
+	{
+		if (!m_IsTemplate)
+			OnDestructed();
+	}
+	
+	//!gets called upon animation Symptom exit
+	void AnimationFinish()
+	{
+		//Print("*********** OnAnimationFinish ************");
+		if ( m_DestroyOnAnimFinish ) RequestDestroy();
+		OnAnimationFinish();
+	}
+	
+	void AnimationPlayFailed()
+	{
+		OnAnimationPlayFailed();
+		AnimationFinish();
+	}
+	
+	void AnimationStart()
+	{
+		OnAnimationStart();
+	}
+	
+	protected void OnAnimationFinish();
+	protected void OnAnimationStart();
+	protected void OnAnimationPlayFailed();
+
+	
+	//!this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	void OnInit();
+	
+	//!gets called every frame
+	void OnUpdateServer(PlayerBase player, float deltatime);
+	bool CanActivate(){return true;}//server only
+	//!gets called every frame
+	void OnUpdateClient(PlayerBase player, float deltatime);
+	//!gets called once on an Symptom which is being activated
+	void OnGetActivatedServer(PlayerBase player);
+	void OnGetActivatedClient(PlayerBase player);
+	//!only gets called once on an active Symptom that is being deactivated
+	void OnGetDeactivatedServer(PlayerBase player);
+	void OnGetDeactivatedClient(PlayerBase player);
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateCB.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateCB.c
new file mode 100644
index 0000000000000000000000000000000000000000..b5993547075fab88c6ccc1f3962e6be8b088376c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateCB.c
@@ -0,0 +1,47 @@
+class SymptomCB extends HumanCommandActionCallback
+{
+	//int m_SymptomUID;
+	float m_RunTime;
+	float m_StartingTime;
+	PlayerBase m_Player;
+	
+	override void OnFinish(bool pCanceled)
+	{
+		if( m_Player && m_Player.GetSymptomManager())
+		{
+			m_Player.GetSymptomManager().OnAnimationFinished();
+		}
+	}
+	
+	
+	void Init(float run_time, PlayerBase player)
+	{
+		EnableCancelCondition(true);
+		m_RunTime = run_time * 1000;
+		m_StartingTime = GetGame().GetTime();
+		m_Player = player;
+		
+		if( m_Player && m_Player.GetSymptomManager())
+		{
+			m_Player.GetSymptomManager().OnAnimationStarted();
+		}
+	}
+	
+	bool CancelCondition()
+	{
+		if(m_RunTime > 0 && (GetGame().GetTime() > m_StartingTime + m_RunTime))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override bool IsSymptomCallback()
+	{
+		return true;
+	}
+	
+};
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateManager.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..c06828b9510060179b60afaf82a01fd3d3f4e30f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/StateManager.c
@@ -0,0 +1,937 @@
+enum AnimType 
+{
+	FULL_BODY = 1,
+	ADDITIVE,
+}
+
+enum SymptomIDs
+{
+	SYMPTOM_COUGH = 1,
+	SYMPTOM_VOMIT,
+	SYMPTOM_BLINDNESS,
+	SYMPTOM_BULLET_HIT,
+	SYMPTOM_BLEEDING_SOURCE,
+	SYMPTOM_BLOODLOSS,
+	SYMPTOM_SNEEZE,
+	SYMPTOM_FEVERBLUR,
+	SYMPTOM_LAUGHTER,
+	SYMPTOM_UNCONSCIOUS,
+	SYMPTOM_FREEZE,
+	SYMPTOM_HOT,
+	SYMPTOM_PAIN_LIGHT,
+	SYMPTOM_PAIN_HEAVY,
+	SYMPTOM_HAND_SHIVER,
+};
+
+enum SymptomTypes 
+{
+	PRIMARY,
+	SECONDARY
+};
+
+enum EAnimPlayState
+{
+	OK,
+	POSTPONED,
+	FAILED,
+};
+
+const int DEBUG_PADDING_OFFSET = 2;
+const int MAX_QUEUE_SIZE = 5; 
+
+class SymptomManager
+{
+	PlayerBase m_Player;
+	ref map<int, ref SymptomBase> m_AvailableSymptoms;
+	ref map<int, int> m_ActiveSymptomTypes;//for each type(symptom id), keep track of how many times it is in queue
+	
+	ref array<ref SymptomBase> m_SymptomQueuePrimary;
+	ref array<ref SymptomBase> m_SymptomQueueSecondary;
+
+	ref map<int , SymptomBase > m_SymptomsUIDs;
+
+	
+	ref array<ref Param> m_SymptomQueueServerDbg;
+	ref array<ref Param> m_SymptomQueueServerDbgPrimary;
+	ref array<ref Param> m_SymptomQueueServerDbgSecondary;
+	//ref array<string> m_SymptomQueueSecondaryServerDbg;
+	ref Timer m_Timer;
+
+	int m_ActiveSymptomIndexPrimary = -1;
+	int m_CurrentCommandID;
+	
+	const int STORAGE_VERSION = 121;
+	
+	bool m_ShowDebug = false;
+	bool m_ShowDebug2 = false;
+	
+	ref SmptAnimMetaBase m_AnimMeta;
+	
+	void Init()
+	{
+		RegisterSymptom(new CoughSymptom);
+		RegisterSymptom(new VomitSymptom);
+		RegisterSymptom(new BlindnessSymptom);
+		RegisterSymptom(new SneezeSymptom);
+		RegisterSymptom(new FeverBlurSymptom);
+		RegisterSymptom(new BloodLoss);
+		RegisterSymptom(new LaughterSymptom);
+		RegisterSymptom(new FreezeSymptom);
+		RegisterSymptom(new HotSymptom);
+		RegisterSymptom(new PainLightSymptom);
+		RegisterSymptom(new PainHeavySymptom);
+		RegisterSymptom(new HandShiversSymptom);
+		//RegisterSymptom(new BulletHitSymptom);
+	}
+	
+	int GetStorageVersion()
+	{
+		return STORAGE_VERSION;
+	}
+	
+	
+	void AutoactivateSymptoms()
+	{
+		if ( GetGame().IsClient() ) 
+		{
+			return;
+		}
+		
+		QueueUpSecondarySymptom(SymptomIDs.SYMPTOM_BLOODLOSS);
+	}
+	
+	void SymptomManager(PlayerBase player)
+	{
+		m_ActiveSymptomTypes = new map<int, int>;
+		m_SymptomsUIDs = new map<int , SymptomBase >;
+		m_SymptomQueuePrimary = new array<ref SymptomBase>;
+		m_SymptomQueueSecondary = new array<ref SymptomBase>;
+		m_SymptomQueueServerDbg = new array<ref Param>;
+		m_SymptomQueueServerDbgPrimary = new array<ref Param>;
+		m_SymptomQueueServerDbgSecondary = new array<ref Param>;
+		m_AvailableSymptoms = new map<int, ref SymptomBase>;
+		m_Player = player;
+		Init();
+		AutoactivateSymptoms();
+	}
+	
+	void OnPlayerKilled()
+	{
+		for (int i = 0; i < m_SymptomQueuePrimary.Count(); i++)
+		{
+			m_SymptomQueuePrimary.Get(i).OnOwnerKilled();
+		}
+		
+		for (i = 0; i < m_SymptomQueueSecondary.Count(); i++)
+		{
+			if (m_SymptomQueueSecondary.Get(i)) m_SymptomQueueSecondary.Get(i).OnOwnerKilled();
+		}
+	}
+
+	SymptomBase GetSymptomByUID(int SYMPTOM_uid)
+	{
+		return m_SymptomsUIDs.Get(SYMPTOM_uid);
+	}
+	
+	
+	void ~SymptomManager()
+	{
+	}
+
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+	
+	void RegisterSymptom(SymptomBase Symptom)
+	{
+		Symptom.Init(this, m_Player,0);
+		int id = Symptom.GetType();
+		
+		if ( m_AvailableSymptoms.Contains(id) )
+		{
+			Error("SymptomBase Symptom already registered !");
+			return;
+		}
+		
+		m_AvailableSymptoms.Insert(id, Symptom);
+		//PrintString("inserting id: "+ToString(id));
+	}
+
+	void OnAnimationFinished(eAnimFinishType type = eAnimFinishType.SUCCESS)
+	{
+		if ( m_AnimMeta )
+		{
+			m_AnimMeta.AnimFinished(type);
+		}
+	}
+	
+	void OnAnimationStarted()
+	{
+		if ( GetCurrentPrimaryActiveSymptom() )
+			GetCurrentPrimaryActiveSymptom().AnimationStart();
+	}
+	
+	int CreateUniqueID()
+	{
+		int uid = Math.RandomInt( 1, 2147483647);
+		if ( !IsUIDUsed(uid) ) return uid;
+		else return CreateUniqueID();
+	}
+
+	bool IsUIDUsed(int uid)
+	{
+		return m_SymptomsUIDs.Contains(uid);
+	}
+	
+	string GetSymptomName(int symptom_id)
+	{
+		return m_AvailableSymptoms.Get(symptom_id).GetName();
+	}
+	
+	SmptAnimMetaBase SpawnAnimMetaObject(int symptom_id)
+	{
+		SmptAnimMetaBase animMeta = m_AvailableSymptoms.Get(symptom_id).SpawnAnimMetaObject();
+		animMeta.m_StateType = symptom_id;
+		return animMeta;
+	}
+		
+	//! Exits a specific Symptom with a given UID
+	void RequestSymptomExit(int SYMPTOM_uid)
+	{
+		if ( m_SymptomsUIDs.Get(SYMPTOM_uid) ) m_SymptomsUIDs.Get(SYMPTOM_uid).RequestDestroy();
+	}
+
+	bool IsSymptomPrimary(int symptom_id)
+	{
+		return m_AvailableSymptoms.Get(symptom_id).IsPrimary();
+	}
+
+	void OnInputUserDataReceived(ParamsReadContext ctx)
+	{	
+	}
+
+	int GetCurrentCommandID()
+	{
+		return m_CurrentCommandID;
+	}
+	
+	void OnTick(float deltatime, int pCurrentCommandID, HumanMovementState movement_state)
+	{
+		// pCurrentCommandID might be the initial value, but the system itself requires
+		// current value, so retrieve the current value from player instead
+		m_CurrentCommandID = m_Player.GetCurrentCommandID();
+		if (m_ActiveSymptomIndexPrimary == -1)
+		{
+			m_ActiveSymptomIndexPrimary = FindFirstAvailableSymptomIndex();
+		}
+		
+		UpdateActiveSymptoms(deltatime);
+		
+		if ( m_AnimMeta )
+		{
+			if ( m_AnimMeta.IsDestroyReqested() )
+			{
+				m_AnimMeta = null;
+			}
+		}
+		
+		if ( m_AnimMeta )
+		{
+			
+			//anim requested
+			if ( !m_AnimMeta.IsPlaying() )
+			{
+				// not playing yet and not possible to play
+				SymptomBase symptom = m_AvailableSymptoms.Get( m_AnimMeta.m_StateType );
+				if ( symptom && !symptom.CanActivate() )
+				{
+					m_AnimMeta = null;
+				}
+				else if ( m_AnimMeta.PlayRequest() == EAnimPlayState.FAILED )
+				{
+					OnAnimationFinished(eAnimFinishType.FAILURE);
+				}
+			}
+			else
+			{
+				m_AnimMeta.Update(movement_state);
+			}
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		#ifndef SERVER //must be here !!!
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_PLAYER_SYMPTOMS_SHOW) )
+		{
+			//DisplayDebug(true);
+			array<ref Param> primary_debug = PrepareClientDebug(m_SymptomQueuePrimary);
+			array<ref Param> secondary_debug = PrepareClientDebug(m_SymptomQueueSecondary);
+
+			DisplayDebug1("Symptoms Client", 50, primary_debug, secondary_debug);
+			DisplayDebug2("Symptoms Server", 300, m_SymptomQueueServerDbgPrimary, m_SymptomQueueServerDbgSecondary);
+			ShowAvailableSymptoms();
+		}
+		else
+		{
+			CleanDebug1("Symptoms Client", 50);
+			CleanDebug2("Symptoms Server", 300);
+			CleanAvailableSymptoms();
+		}
+		#endif
+		#endif
+	}
+
+	void SetAnimation(ParamsReadContext ctx)
+	{
+		if (m_AnimMeta)
+		{
+			// animation meta already exists
+			// pass
+		}
+		else
+		{
+			int state_type;
+			if (ctx.Read(state_type))
+			{
+				m_AnimMeta = SpawnAnimMetaObject(state_type);
+				if (m_AnimMeta)
+				{
+					m_AnimMeta.Init(ctx, this, m_Player);
+				}
+			}
+		}
+	}
+	
+	void UpdateActiveSymptoms(float deltatime)
+	{	
+		//if( GetGame().IsClient() && !m_Player.IsPlayer() ) return;
+		//primary
+		if ( GetCurrentPrimaryActiveSymptom() )
+		{ 
+			if ( !GetCurrentPrimaryActiveSymptom().IsActivated() )
+			{
+				if ( GetCurrentPrimaryActiveSymptom().CanActivate() ) 
+					GetCurrentPrimaryActiveSymptom().Activate();
+			}
+			if ( GetCurrentPrimaryActiveSymptom().IsActivated() )
+			{
+				GetCurrentPrimaryActiveSymptom().Update(deltatime);
+			}
+		}
+		//secondary
+		for (int i = 0; i < m_SymptomQueueSecondary.Count(); i++)
+		{
+			if ( m_SymptomQueueSecondary.Get(i) && !m_SymptomQueueSecondary.Get(i).IsActivated() )
+			{
+				m_SymptomQueueSecondary.Get(i).Activate();
+			}
+			else
+			{
+				if (m_SymptomQueueSecondary.Get(i)) m_SymptomQueueSecondary.Get(i).Update(deltatime);
+			}
+		}
+	}
+	
+	
+	void OnSymptomExit(SymptomBase Symptom, int uid)
+	{
+		bool is_primary;
+		if ( Symptom )
+		{
+			is_primary = Symptom.IsPrimary();
+			DecreaseSymptomCount(Symptom.GetType());
+		}
+		
+		if ( m_SymptomsUIDs.Contains(uid) )
+		{
+			m_SymptomsUIDs.Remove(uid);		
+		}
+		else
+		{
+			Debug.LogError("Symptom with this UID does not exist", "PlayerSymptoms");
+		}
+		
+		if (is_primary)
+		{
+			for (int i = 0; i < m_SymptomQueuePrimary.Count(); i++)
+			{
+				if ( m_SymptomQueuePrimary.Get(i) == Symptom )
+				{
+					m_SymptomQueuePrimary.RemoveOrdered(i);
+					break;
+				}
+			}
+		}
+		else
+		{
+			for (i = 0; i < m_SymptomQueueSecondary.Count(); i++)
+			{
+				if ( m_SymptomQueueSecondary.Get(i) == Symptom )
+				{
+					m_SymptomQueueSecondary.RemoveOrdered(i);
+					break;
+				}
+			}
+		}
+		m_ActiveSymptomIndexPrimary = -1;
+		#ifdef DIAG_DEVELOPER
+		if ( GetGame() ) SendServerDebugToClient();
+		#endif
+	}
+	
+	
+	int GetSymptomMaxCount(int symptom_id)
+	{
+		return m_AvailableSymptoms.Get(symptom_id).GetMaxCount();
+	}
+	
+	
+	int GetSymptomCount(int symptom_id)
+	{
+		if ( m_ActiveSymptomTypes.Contains(symptom_id) )
+			return m_ActiveSymptomTypes.Get(symptom_id);
+		else 
+			return -1;
+	}
+	
+	void IncreaseSymptomCount(int symptom_id)
+	{
+		if ( m_ActiveSymptomTypes.Contains(symptom_id) )
+		{
+			m_ActiveSymptomTypes.Set(symptom_id, m_ActiveSymptomTypes.Get(symptom_id) + 1);
+		}
+		else
+		{
+			m_ActiveSymptomTypes.Insert(symptom_id, 1);
+		}
+	}
+	
+	void DecreaseSymptomCount(int symptom_id)
+	{
+		if ( m_ActiveSymptomTypes.Contains(symptom_id) )
+		{
+			if ( m_ActiveSymptomTypes.Get(symptom_id) == 1)
+				m_ActiveSymptomTypes.Remove(symptom_id);
+			else
+				m_ActiveSymptomTypes.Set(symptom_id, m_ActiveSymptomTypes.Get(symptom_id) - 1);
+		}
+	}
+
+	SymptomBase SpawnSymptom( int symptom_id, int uid = -1 )
+	{
+		if ( m_AvailableSymptoms.Get(symptom_id) )
+		{
+			SymptomBase Symptom = SymptomBase.Cast(m_AvailableSymptoms.Get(symptom_id).ClassName().ToType().Spawn());
+			if (uid == -1)
+			{
+				uid = CreateUniqueID();
+			}
+			Symptom.Init(this, m_Player,uid);
+			if ( m_SymptomsUIDs.Contains(uid) ) 
+				Error("Symptoms: Unique ID already exists !");
+			m_SymptomsUIDs.Insert(uid, Symptom);
+			IncreaseSymptomCount(symptom_id);
+			return Symptom;
+		}
+		
+		if ( !Symptom ) 
+		{
+			Error("Symptom not registered");
+		}
+		
+		return NULL;
+	}
+	
+	void CleanUpPrimaryQueue()
+	{
+		for (int i = 0; i < m_SymptomQueuePrimary.Count(); i++)
+		{
+			m_SymptomQueuePrimary.Get(i).RequestDestroy();
+		}
+		
+	}
+
+	SymptomBase QueueUpPrimarySymptom(int symptom_id, int uid = -1)
+	{
+		SymptomBase Symptom;
+		if ((GetSymptomCount(symptom_id) >= GetSymptomMaxCount(symptom_id)) && GetSymptomMaxCount(symptom_id) != -1)
+			return null;
+		for ( int i = 0; i < m_SymptomQueuePrimary.Count(); i++ )
+		{
+			if ( m_SymptomQueuePrimary.Get(i).CanBeInterupted() && ComparePriority( GetSymptomPriority(symptom_id), m_SymptomQueuePrimary.Get(i).GetPriority() ) == 1 )
+			{
+				Symptom = SpawnSymptom( symptom_id, uid );
+				m_SymptomQueuePrimary.InsertAt(Symptom,i);
+
+				if ( m_SymptomQueuePrimary.Count() > MAX_QUEUE_SIZE )
+				{
+					m_SymptomQueuePrimary.Get(MAX_QUEUE_SIZE).RequestDestroy();// no need to remove from the array, that's done via Symptom callback on destruct
+				}
+				break;
+			}
+		}
+		if ( !Symptom && m_SymptomQueuePrimary.Count() < MAX_QUEUE_SIZE) 
+		{
+			Symptom = SpawnSymptom( symptom_id, uid );
+			m_SymptomQueuePrimary.Insert(Symptom);
+		}
+		#ifdef DIAG_DEVELOPER
+		SendServerDebugToClient();
+		#endif
+		return Symptom;
+	}
+	
+	void QueueUpSecondarySymptom(int symptom_id, int uid = -1)
+	{
+		 QueueUpSecondarySymptomEx(symptom_id, uid);
+	}
+	
+	SymptomBase QueueUpSecondarySymptomEx(int symptom_id, int uid = -1)
+	{
+		if ((GetSymptomCount(symptom_id) >= GetSymptomMaxCount(symptom_id)) && GetSymptomMaxCount(symptom_id) != -1)
+			return null;
+		
+		if ( m_AvailableSymptoms.Get(symptom_id).IsPrimary() )
+			return null;
+		
+		SymptomBase Symptom = SpawnSymptom( symptom_id, uid);
+		
+		m_SymptomQueueSecondary.Insert(Symptom);
+		return Symptom;
+	}
+	
+	//! Removes a single Symptom
+	void RemoveSecondarySymptom(int symptom_id)
+	{
+		for (int i = 0; i < m_SymptomQueueSecondary.Count();i++)
+		{
+			if ( m_SymptomQueueSecondary.Get(i) && m_SymptomQueueSecondary.Get(i).GetType() == symptom_id )
+			{
+				m_SymptomQueueSecondary.Get(i).RequestDestroy();
+				return;
+			}
+		}
+	}
+	
+	SymptomBase GetCurrentPrimaryActiveSymptom()
+	{
+		if ( GetGame().IsServer() )
+		{ 
+			if ( m_ActiveSymptomIndexPrimary >= 0 && m_ActiveSymptomIndexPrimary < m_SymptomQueuePrimary.Count() )
+			{
+				if ( m_SymptomQueuePrimary.Get(m_ActiveSymptomIndexPrimary) ) return m_SymptomQueuePrimary.Get(m_ActiveSymptomIndexPrimary);
+			}
+		}
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( m_SymptomQueuePrimary.Count() > 0 ) 
+				return m_SymptomQueuePrimary.Get(0);
+		}
+		return NULL;
+	}
+	
+	int FindFirstAvailableSymptomIndex()
+	{
+		for (int i = 0; i < m_SymptomQueuePrimary.Count();i++)
+		{
+			if ( m_SymptomQueuePrimary.Get(i).CanActivate() )
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	int ComparePriority( int prio1, int prio2 )
+	{
+		if ( prio1 > prio2 )
+		{
+			return 1;
+		}
+		else if ( prio2 > prio1 )
+		{
+			return 2;
+		}
+		return 0;
+	}
+	
+	int GetSymptomPriority(int symptom_id)
+	{
+		return m_AvailableSymptoms.Get(symptom_id).GetPriority();
+	}
+	
+	void OnRPC(int rpc_type, ParamsReadContext ctx)
+	{
+		ctx.Read(CachedObjectsParams.PARAM2_INT_INT);
+		int symptom_id = CachedObjectsParams.PARAM2_INT_INT.param1;
+		int uid = CachedObjectsParams.PARAM2_INT_INT.param2;
+		
+		bool is_primary = m_AvailableSymptoms.Get(symptom_id).IsPrimary();
+		
+		if ( rpc_type == ERPCs.RPC_PLAYER_SYMPTOM_ON )
+		{
+			if ( is_primary )
+			{
+				CleanUpPrimaryQueue();
+				QueueUpPrimarySymptom(symptom_id,uid);
+			}
+			else
+			{
+				QueueUpSecondarySymptom(symptom_id,uid);
+			}
+		}
+		else if ( rpc_type == ERPCs.RPC_PLAYER_SYMPTOM_OFF )
+		{
+			if ( is_primary )
+			{
+				CleanUpPrimaryQueue();
+			}
+			else
+			{
+				RemoveSecondarySymptom( symptom_id );
+			}
+		}
+	}
+
+	void OnStoreSave( ParamsWriteContext ctx )
+	{
+		array<int> 		m_SaveQueue = new array<int>;
+
+		for ( int i = 0; i < m_SymptomQueuePrimary.Count(); i++ )
+		{
+			if ( m_SymptomQueuePrimary.Get(i).IsPersistent() )
+			{
+				m_SaveQueue.Insert( m_SymptomQueuePrimary.Get(i).GetType() );
+			}
+		}
+
+		for ( i = 0; i < m_SymptomQueueSecondary.Count(); i++ )
+		{
+			if ( m_SymptomQueueSecondary.Get(i).IsPersistent() )
+			{
+				m_SaveQueue.Insert( m_SymptomQueueSecondary.Get(i).GetType() );
+			}
+		}
+
+		ctx.Write( m_SaveQueue );
+	}
+
+	bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		array<int> m_SaveQueue;
+		
+		if (ctx.Read(m_SaveQueue))
+		{
+			for ( int i = 0; i < m_SaveQueue.Count(); i++ )
+			{
+				int id = m_SaveQueue.Get(i);
+	
+				if ( IsSymptomPrimary(id) )
+				{
+					QueueUpPrimarySymptom( id );
+				}
+				else
+				{
+					QueueUpSecondarySymptom( id );
+				}
+			}
+			return true;
+		}
+		else
+		{
+			return false;
+		}				
+	}
+	
+#ifdef DIAG_DEVELOPER
+	void OnRPCDebug(int rpc_type, ParamsReadContext ctx)
+	{
+		switch (rpc_type)
+		{
+			case ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG_ON:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+				{
+					if (IsSymptomPrimary(CachedObjectsParams.PARAM1_INT.param1))
+					{
+						QueueUpPrimarySymptom(CachedObjectsParams.PARAM1_INT.param1);
+					}
+					else
+					{
+						QueueUpSecondarySymptom(CachedObjectsParams.PARAM1_INT.param1);
+					}
+				}
+				break;
+			}
+			
+			case ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG_OFF:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					RequestSymptomExit(CachedObjectsParams.PARAM1_INT.param1);
+				break;
+			}
+			
+			case ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG:
+			{
+				int primary_Symptoms_count;
+				int secondary_Symptoms_count;
+				
+				int symptom_id;			
+	
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+				{
+					primary_Symptoms_count = CachedObjectsParams.PARAM1_INT.param1;
+				}
+				
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+				{
+					secondary_Symptoms_count = CachedObjectsParams.PARAM1_INT.param1;
+				}
+				
+				m_SymptomQueueServerDbg.Clear();
+				m_SymptomQueueServerDbgPrimary.Clear();
+				m_SymptomQueueServerDbgSecondary.Clear();
+	
+				int overall_count = primary_Symptoms_count + secondary_Symptoms_count;
+				for (int i = 0; i < overall_count ; ++i)
+				{
+					Param3<bool, int, int> p3 = new Param3<bool, int, int>(false,0,0);
+					ctx.Read(p3);
+					bool is_primary = p3.param1;				
+					
+					if (is_primary)  
+					{
+						m_SymptomQueueServerDbgPrimary.Insert(p3);//   m_SymptomQueueServerDbg.Insert(p3);
+					}
+					else
+					{
+						m_SymptomQueueServerDbgSecondary.Insert(p3);
+					}
+					//PrintString("elements m_SymptomQueueServerDbgPrimary:" + m_SymptomQueueServerDbgPrimary.Count());
+					//PrintString("elements m_SymptomQueueServerDbgSecondary:" + m_SymptomQueueServerDbgSecondary.Count());
+					
+				}
+				/*
+				for(i = 0; i < secondary_Symptoms_count; i++)
+				{
+					ctx.Read(CachedObjectsParams.PARAM1_STRING);
+					m_SymptomQueueSecondaryServerDbg.Insert(CachedObjectsParams.PARAM1_STRING.param1);				
+				}*/
+				break;
+			}
+		}
+	}
+	
+	void SendServerDebugToClient()
+	{
+		array<ref Param> debug_list = new array<ref Param>;
+		
+		Param1<int> p1 = new Param1<int>(0);
+		Param1<int> p2 = new Param1<int>(0);
+		
+		p1.param1 = m_SymptomQueuePrimary.Count();
+		p2.param1 = m_SymptomQueueSecondary.Count();
+		
+		debug_list.Insert(p1);
+		debug_list.Insert(p2);
+		
+		Param3<bool,int,int> p;	
+
+		bool is_primary;
+		int symptom_id;
+		int SYMPTOM_uid;
+
+		foreach ( SymptomBase symptom : m_SymptomQueuePrimary )
+		{
+			is_primary = symptom.IsPrimary();
+			symptom_id = symptom.GetType();
+			SYMPTOM_uid = symptom.GetUID();
+			
+			p = new Param3<bool,int,int>(is_primary, symptom_id, SYMPTOM_uid );
+			debug_list.Insert(p);
+		}
+
+		foreach ( SymptomBase secSymptom : m_SymptomQueueSecondary )
+		{
+			is_primary = secSymptom.IsPrimary();
+			symptom_id = secSymptom.GetType();
+			SYMPTOM_uid = secSymptom.GetUID();
+			
+			p = new Param3<bool,int,int>(is_primary, symptom_id, SYMPTOM_uid );
+			debug_list.Insert(p);
+		}
+		
+		GetGame().RPC(GetPlayer(), ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG, debug_list, true);
+	}
+	
+	void DebugRequestExitSymptom(int SYMPTOM_uid)
+	{		
+		CachedObjectsParams.PARAM1_INT.param1 = SYMPTOM_uid;
+		if (GetPlayer())
+			GetGame().RPCSingleParam(GetPlayer(), ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG_OFF, CachedObjectsParams.PARAM1_INT, true, GetPlayer().GetIdentity());
+	}
+	
+	array<ref Param> PrepareClientDebug(array<ref SymptomBase> Symptoms)
+	{
+		array<ref Param> debug_array = new array<ref Param>;
+		
+		Param3<bool, int, int> p3;
+		
+		for (int i = 0; i < Symptoms.Count(); i++)
+		{
+			bool is_primary		= Symptoms.Get(i).IsPrimary();
+			int symptom_id	 	= Symptoms.Get(i).GetType();
+			int SYMPTOM_uid 		= Symptoms.Get(i).GetUID();
+			
+			p3 = new Param3<bool,int,int>(is_primary, symptom_id, SYMPTOM_uid );
+			debug_array.Insert(p3);
+		}
+		return debug_array;
+	}
+
+	void DisplayDebug1(string name, int y_offset, array<ref Param> Symptoms_primary, array<ref Param> Symptoms_secondary)
+	{
+		string primary;
+		Param3<bool, int, int> p3 = new Param3<bool, int, int>(false,0,0);
+		
+		DbgUI.BeginCleanupScope();     
+        DbgUI.Begin(name, 50, y_offset);
+		DbgUI.Text("Primary: ");
+		
+		bool is_primary;
+		int symptom_id;
+		int SYMPTOM_uid;
+		string SYMPTOM_name;
+		
+		for (int i = 0; i < Symptoms_primary.Count(); i++)
+		{
+			p3 = Param3<bool, int, int>.Cast(Symptoms_primary.Get(i));
+			
+			is_primary = p3.param1;
+			symptom_id = p3.param2;
+			SYMPTOM_uid = p3.param3;
+			SYMPTOM_name = GetSymptomName(symptom_id);
+			
+			primary += SYMPTOM_name + " | ";
+		}
+		
+		DbgUI.Text(primary);
+		DbgUI.Text("Secondary: ");
+		for (i = 0; i < Symptoms_secondary.Count(); i++)
+		{
+			p3 = Param3<bool, int, int>.Cast(Symptoms_secondary.Get(i));
+			
+			is_primary = p3.param1;
+			symptom_id = p3.param2;
+			SYMPTOM_uid = p3.param3;
+			SYMPTOM_name = GetSymptomName(symptom_id);
+			DbgUI.Text(SYMPTOM_name);
+		}
+
+        DbgUI.End();
+        DbgUI.EndCleanupScope();		
+	}	
+
+	void DisplayDebug2(string name, int y_offset, array<ref Param> Symptoms_primary, array<ref Param> Symptoms_secondary)
+	{
+		string primary;
+		Param3<bool, int, int> p3 = new Param3<bool, int, int>(false,0,0);
+		
+		DbgUI.BeginCleanupScope();     
+        DbgUI.Begin(name, 50, y_offset);
+		DbgUI.Text("Primary: ");
+		
+		bool is_primary;
+		int symptom_id;
+		int SYMPTOM_uid;
+		string SYMPTOM_name;
+		
+		for (int i = 0; i < Symptoms_primary.Count(); i++)
+		{
+			p3 = Param3<bool, int, int>.Cast(Symptoms_primary.Get(i));
+			
+			is_primary = p3.param1;
+			symptom_id = p3.param2;
+			SYMPTOM_uid = p3.param3;
+			SYMPTOM_name = GetSymptomName(symptom_id);
+			
+			if (DbgUI.Button( i.ToString() + " " + SYMPTOM_name, 80))
+			{
+				DebugRequestExitSymptom(SYMPTOM_uid);
+			}
+		}
+
+		DbgUI.Text("Secondary: ");
+		for (i = 0; i < Symptoms_secondary.Count(); i++)
+		{
+			p3 = Param3<bool, int, int>.Cast(Symptoms_secondary.Get(i));
+			
+			is_primary = p3.param1;
+			symptom_id = p3.param2;
+			SYMPTOM_uid = p3.param3;
+			SYMPTOM_name = GetSymptomName(symptom_id);
+			
+			if (DbgUI.Button( i.ToString() + " " + SYMPTOM_name, 80))
+			{
+				DebugRequestExitSymptom(SYMPTOM_uid);
+			}
+		}
+
+        DbgUI.End();
+        DbgUI.EndCleanupScope();		
+	}
+
+	void ShowAvailableSymptoms()
+	{
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin("available Symptoms", 300, 50);
+		
+		for (int i = 0; i < m_AvailableSymptoms.Count(); i++)
+		{
+			SymptomBase Symptom = m_AvailableSymptoms.GetElement(i);
+			string SYMPTOM_name = Symptom.GetName();
+			int symptom_id = Symptom.GetType();
+			
+			if (DbgUI.Button( i.ToString() + " " + SYMPTOM_name, 80))
+			{
+				DebugRequestActivateSymptom(symptom_id);
+			}			
+		}
+		
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}	
+
+	void CleanAvailableSymptoms()
+	{
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin("available Symptoms", 300, 50);
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+	
+	void CleanDebug1(string name, int y_offset)
+	{
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin(name, 50, y_offset);
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+	
+	void CleanDebug2(string name, int y_offset)
+	{
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin(name, 50, y_offset);
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+
+	void DebugRequestActivateSymptom(int symptom_id)
+	{
+		CachedObjectsParams.PARAM1_INT.param1 = symptom_id;
+		if (GetPlayer())
+			GetGame().RPCSingleParam(GetPlayer(), ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG_ON, CachedObjectsParams.PARAM1_INT, true, GetPlayer().GetIdentity());		
+	}
+	
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/CoughState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/CoughState.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b1a5bbe5de7dd6bdf78c8c685cb74552e08f631
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/CoughState.c
@@ -0,0 +1,79 @@
+class CoughSymptom extends SymptomBase
+{
+	const int COUGH_BLOOD_LOSS = 50;
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 100;
+		m_ID = SymptomIDs.SYMPTOM_COUGH;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+	}
+	
+	bool IsContaminationActive()
+	{
+		return m_Player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION2) || m_Player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION3);
+	}
+	
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+	
+	override void OnAnimationStart()
+	{
+		if ( IsContaminationActive() )
+		{
+			PluginLifespan module_lifespan = PluginLifespan.Cast( GetPlugin( PluginLifespan ) );
+			module_lifespan.UpdateBloodyHandsVisibilityEx( m_Player, eBloodyHandsTypes.JUST_BLOOD );
+		}
+	}
+	
+	
+	override SmptAnimMetaBase SpawnAnimMetaObject()
+	{
+		return new SmptAnimMetaADD();
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if( m_Manager.GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_MOVE && !player.IsRaised() && player.GetCommand_Move() && player.GetCommand_Move() && !player.GetCommand_Move().IsOnBack())
+		{
+			PlayAnimationADD(1);
+		}
+		else
+		{
+			PlaySound(EPlayerSoundEventID.SYMPTOM_COUGH);
+		}
+		player.SpreadAgentsEx(3);
+		
+		if ( IsContaminationActive() )
+			player.AddHealth("","Blood", -COUGH_BLOOD_LOSS);
+	}
+
+	//!gets called once on a Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		//if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		//if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		//if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/FreezeState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/FreezeState.c
new file mode 100644
index 0000000000000000000000000000000000000000..f417c0449c01b793b951b187f513a876f3cea8b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/FreezeState.c
@@ -0,0 +1,74 @@
+class FreezeSymptom extends SymptomBase
+{
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 1;
+		m_ID = SymptomIDs.SYMPTOM_FREEZE;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+		m_MaxCount = 2;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+	
+	override void OnAnimationPlayFailed()
+	{
+		
+	}
+	
+	override bool CanActivate()
+	{
+		return true;
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{	
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+		HumanMovementState hms = new HumanMovementState();
+		player.GetMovementState(hms);
+		ItemBase item = m_Player.GetItemInHands();
+
+		if(!(item && item.IsHeavyBehaviour()) && m_Manager.GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_MOVE && hms.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_IDLE && !player.IsRestrained() )
+		{
+			PlayAnimationADD(2);
+		}
+		else
+		{
+			PlaySound(EPlayerSoundEventID.FREEZING);
+		}
+	}
+
+	//!gets called once on a Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+	
+	override SmptAnimMetaBase SpawnAnimMetaObject()
+	{
+		return new HeatComfortmMetaADD();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/HotState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/HotState.c
new file mode 100644
index 0000000000000000000000000000000000000000..d64913676aab654031c8db37c42bc8b11c2bf121
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/HotState.c
@@ -0,0 +1,74 @@
+class HotSymptom extends SymptomBase
+{
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 1;
+		m_ID = SymptomIDs.SYMPTOM_HOT;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+		m_MaxCount = 2;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+	
+	override void OnAnimationPlayFailed()
+	{
+		
+	}
+	
+	override bool CanActivate()
+	{
+		return true;
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+		HumanMovementState hms = new HumanMovementState();
+		player.GetMovementState(hms);
+		ItemBase item = m_Player.GetItemInHands();
+		
+		if(!(item && item.IsHeavyBehaviour()) && m_Manager.GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_MOVE && hms.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_IDLE && !player.IsRestrained() )
+		{
+			PlayAnimationADD(3);
+		}
+		else
+		{
+			PlaySound(EPlayerSoundEventID.HOT);
+		}
+	}
+
+	//!gets called once on a Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+	
+	override SmptAnimMetaBase SpawnAnimMetaObject()
+	{
+		return new HeatComfortmMetaADD();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/LaughterState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/LaughterState.c
new file mode 100644
index 0000000000000000000000000000000000000000..fea273f8a38846a1ecab71f4079cdf00c686bed0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/LaughterState.c
@@ -0,0 +1,50 @@
+class LaughterSymptom extends SymptomBase
+{
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 0;
+		m_ID = SymptomIDs.SYMPTOM_LAUGHTER;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+		m_Duration = 4;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+		int i = 1 + 1;
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+		PlaySound(EPlayerSoundEventID.SYMPTOM_LAUGHTER);
+		player.SpreadAgentsEx(3);
+	}
+
+	//!gets called once on a Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/PainHeavyState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/PainHeavyState.c
new file mode 100644
index 0000000000000000000000000000000000000000..559861f4455f64213e538f771aadc0d0fafeb350
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/PainHeavyState.c
@@ -0,0 +1,62 @@
+class PainHeavySymptom extends SymptomBase
+{
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 1;
+		m_ID = SymptomIDs.SYMPTOM_PAIN_HEAVY;
+		m_SyncToClient = true;
+		m_MaxCount = 2;
+		m_Duration = 1;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+	
+	override void OnAnimationPlayFailed()
+	{
+		
+	}
+	
+	override bool CanActivate()
+	{
+		return true;
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) 
+			Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+		
+		PlaySound(EPlayerSoundEventID.TAKING_DMG_HEAVY);
+	}
+
+	//!gets called once on a Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		//player.SpawnShockEffect(0.5);
+		player.SpawnDamageDealtEffect2();
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/PainLightState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/PainLightState.c
new file mode 100644
index 0000000000000000000000000000000000000000..6081122f5dab549796b553e352d3383e57400147
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/PainLightState.c
@@ -0,0 +1,64 @@
+class PainLightSymptom extends SymptomBase
+{
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 1;
+		m_ID = SymptomIDs.SYMPTOM_PAIN_LIGHT;
+		m_SyncToClient = true;
+		m_MaxCount = 2;
+		m_Duration = 1;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+	
+	override void OnAnimationPlayFailed()
+	{
+		
+	}
+	
+	override bool CanActivate()
+	{
+		return true;
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) 
+			Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+		
+		PlaySound(EPlayerSoundEventID.TAKING_DMG_LIGHT);
+	}
+
+	//!gets called once on a Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		//player.SpawnShockEffect(0.5);
+		CachedObjectsParams.PARAM2_FLOAT_FLOAT.param1 = 26;
+		CachedObjectsParams.PARAM2_FLOAT_FLOAT.param2 = 0.25;
+		player.SpawnDamageDealtEffect2(CachedObjectsParams.PARAM2_FLOAT_FLOAT);
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/SneezeState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/SneezeState.c
new file mode 100644
index 0000000000000000000000000000000000000000..861723466efc9ba0a5d18e1bf98a12d400f6af8a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/SneezeState.c
@@ -0,0 +1,61 @@
+class SneezeSymptom extends SymptomBase
+{
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 100;
+		m_ID = SymptomIDs.SYMPTOM_SNEEZE;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+		if( m_Manager.GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_MOVE && !player.IsRaised() && player.GetCommand_Move() && !player.GetCommand_Move().IsOnBack())
+		{
+			PlayAnimationADD(0);
+		}
+		else
+		{
+			PlaySound(EPlayerSoundEventID.SYMPTOM_SNEEZE);
+		}
+		player.SpreadAgentsEx(3);
+	}
+
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+		
+	override SmptAnimMetaBase SpawnAnimMetaObject()
+	{
+		return new SmptAnimMetaADD();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/VomitState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/VomitState.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef495d5017299e8020be2ba8d3848e16389b9256
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Primary/VomitState.c
@@ -0,0 +1,89 @@
+class VomitSymptom extends SymptomBase
+{
+	//just for the Symptom parameters set-up and gets called even if the Symptom doesn't execute, don't put any gameplay code in here
+	const int BLOOD_LOSS = 250;
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.PRIMARY;
+		m_Priority = 100;
+		m_ID = SymptomIDs.SYMPTOM_VOMIT;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+		m_Duration = 5;
+		m_MaxCount = 1;
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+
+	}
+	
+	bool IsContaminationActive()
+	{
+		return m_Player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION2) || m_Player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION3);
+	}
+	
+	override void OnAnimationStart()
+	{
+		if(m_Player)
+		{
+			m_Player.GetStatToxicity().Set(0);
+			if(m_Player.m_PlayerStomach)
+				m_Player.m_PlayerStomach.ClearContents();
+			
+			if (IsContaminationActive())
+			{
+				m_Player.AddHealth("","Blood", -BLOOD_LOSS);
+			}
+			
+		}
+		//Print("------------ vomit start -------------");
+	}
+	
+	override void OnAnimationFinish()
+	{
+		//! deplete stamina
+		m_Player.GetStaminaHandler().DepleteStamina(EStaminaModifiers.OVERALL_DRAIN);
+		
+		if (IsContaminationActive())
+		{
+			PluginLifespan module_lifespan = PluginLifespan.Cast( GetPlugin( PluginLifespan ) );
+			module_lifespan.UpdateBloodyHandsVisibilityEx( m_Player, eBloodyHandsTypes.JUST_BLOOD );
+		}
+	}
+	
+	override bool CanActivate()
+	{
+		return ( m_Manager.GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_MOVE || m_Manager.GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_ACTION );
+	}	
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		PlayAnimationFB(DayZPlayerConstants.CMD_ACTIONFB_VOMIT,DayZPlayerConstants.STANCEMASK_CROUCH, GetDuration() );
+		//timer.Run(10, this, "Destroy");
+		//if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		//if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		//if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());	
+	}
+	
+	override SmptAnimMetaBase SpawnAnimMetaObject()
+	{
+		return new SmptAnimMetaFB();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BlindnessState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BlindnessState.c
new file mode 100644
index 0000000000000000000000000000000000000000..85216bb613724e32720902d5967ae60c0034de01
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BlindnessState.c
@@ -0,0 +1,52 @@
+class BlindnessSymptom extends SymptomBase
+{
+	Material m_MatGauss;
+	const int BLUR_DURATION = 3000;
+	ref Param1<vector> m_Position = new Param1<vector>("0 0 0");
+	
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.SECONDARY;
+		m_Priority = 0;
+		m_ID = SymptomIDs.SYMPTOM_BLINDNESS;
+		m_DestroyOnAnimFinish = true;
+		m_IsPersistent = false;
+		MakeParamObjectPersistent(m_Position);
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+
+		
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+	
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+		PPERequesterBank.GetRequester(PPERequester_BurlapSackEffects).Stop(); //TODO - use different PPERequester when connected, otherwise it would interfere with burlapsack blindness
+	}
+	
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BloodLoss.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BloodLoss.c
new file mode 100644
index 0000000000000000000000000000000000000000..5dd9f36764807c4b0e62ed785ddb3d9e6e09ca1e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BloodLoss.c
@@ -0,0 +1,68 @@
+class BloodLoss extends SymptomBase
+{
+	Material m_MatGauss;
+	const int BLUR_DURATION = 3000;
+	float m_BloodSet;
+	PPERequester_BloodLoss m_RequesterBloodLoss;
+	
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.SECONDARY;
+		m_Priority = 0;
+		m_ID = SymptomIDs.SYMPTOM_BLOODLOSS;
+		m_DestroyOnAnimFinish = true;
+		m_IsPersistent = false;
+		m_SyncToClient = true;
+		m_BloodSet = -1;
+		
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			Class.CastTo(m_RequesterBloodLoss,PPERequester_BloodLoss.Cast(PPERequesterBank.GetRequester(PPERequester_BloodLoss)));
+		}
+		
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+	}
+
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+		if ( player.IsPlayerSelected() && player.GetTransferValues() && player.GetTransferValues().GetBlood() != m_BloodSet ) 
+		{
+			m_BloodSet = player.GetTransferValues().GetBlood();
+			if (m_BloodSet < 1.0)
+			{
+				m_RequesterBloodLoss.SetBloodLossLevel(m_BloodSet);
+			}
+			else
+			{
+				m_RequesterBloodLoss.Stop();
+			}
+		}
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+	
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BulletHitState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BulletHitState.c
new file mode 100644
index 0000000000000000000000000000000000000000..97b96dcafb1c3a2fbb0163b9034190d95cf6fa4c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/BulletHitState.c
@@ -0,0 +1,59 @@
+/*
+class BulletHitSymptom extends SymptomBase
+{
+	float m_HitDuration;
+	float m_BreakPoint;
+	float m_TimeActive;
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.SECONDARY;
+		m_Priority = 0;
+		m_ID = SymptomIDs.SYMPTOM_BULLET_HIT;
+		m_DestroyOnAnimFinish = true;
+		m_SyncToClient = false;
+		m_HitDuration = 0.4;
+		m_BreakPoint = 0.1;
+	}
+	
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+		m_TimeActive += deltatime;
+		if(m_TimeActive >= m_HitDuration)
+		{
+			RequestDestroy();
+		}
+		
+		float value;
+		
+		if( m_TimeActive <= m_BreakPoint )
+		{
+			value = Math.InverseLerp(0, m_BreakPoint, m_TimeActive);
+		}
+		else
+		{
+			float tmp_value = Math.InverseLerp(m_BreakPoint, m_HitDuration, m_TimeActive);
+			value = 1 - tmp_value;
+		}
+		
+		PPEffects.HitEffect(value);
+		
+	}
+	
+
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		//PPEffects.EnableBurlapSackBlindness();
+		//PPEffects.HitEffect(1);
+		
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		PPEffects.HitEffect(0);
+		Debug.Log("OnGetDeactivated CoughSymptom called", "PlayerSymptom");
+	}
+	
+}
+*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/FeverBlurState.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/FeverBlurState.c
new file mode 100644
index 0000000000000000000000000000000000000000..5132d1c874db0d47ca4245372f0ba8747e00f92a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/FeverBlurState.c
@@ -0,0 +1,95 @@
+class FeverBlurSymptom extends SymptomBase
+{
+	Material m_MatGauss;
+
+	float m_BlurDuration;
+	float m_BlurStrength;
+	float m_EffectTime;
+	float m_EffectStartTime;
+	float m_Time;
+	protected PPERequester_FeverEffects 	m_Requester;
+	
+	const float BLUR_STRENGTH_MIN = 0.15;
+	const float BLUR_STRENGTH_MAX = 0.25;
+	
+	const int BLUR_DURATION_TIME_MIN = 1.5;
+	const int BLUR_DURATION_TIME_MAX = 2.5;
+	
+	const int MIN_TIME_BETWEEN_EFFECTS = 25.0;
+	const int MAX_TIME_BETWEEN_EFFECTS = 35.0;
+
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.SECONDARY;
+		m_Priority = 0;
+		m_ID = SymptomIDs.SYMPTOM_FEVERBLUR;
+		m_DestroyOnAnimFinish = true;
+		m_IsPersistent = false;
+		m_SyncToClient = true;
+		
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			Class.CastTo(m_Requester,PPERequesterBank.GetRequester(PPERequester_FeverEffects));
+		}
+	}
+	
+	//!gets called every frame
+	override void OnUpdateServer(PlayerBase player, float deltatime)
+	{
+		//int i = 1 + 1;
+	}
+
+	
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+		m_Time += deltatime;
+		if ( m_EffectStartTime <= 0 )
+		{
+			m_EffectStartTime = Math.RandomFloatInclusive(MIN_TIME_BETWEEN_EFFECTS, MAX_TIME_BETWEEN_EFFECTS);
+			m_BlurDuration = Math.RandomFloatInclusive(BLUR_DURATION_TIME_MIN, BLUR_DURATION_TIME_MAX);
+			m_BlurStrength = Math.RandomFloat(BLUR_STRENGTH_MIN, BLUR_STRENGTH_MAX);
+			//PrintString("m_BlurDuration=" +m_BlurDuration.ToString());
+		}
+		
+		if ( m_EffectStartTime > 0 && m_Time > m_EffectStartTime )
+		{
+			m_EffectTime += deltatime / m_BlurDuration;
+			float cos_value = Math.Sin(m_EffectTime  * Math.PI);
+			float val = cos_value * m_BlurStrength;
+			//Print(val);
+			m_Requester.SetFeverIntensity(val);
+			//PrintString("cos=" +cos_value.ToString());
+			
+			if ( m_EffectTime >= 1 )
+			{
+				m_EffectTime = 0;
+				m_EffectStartTime = -1;
+				m_Time = 0;
+			}
+		}
+	}
+	
+	//!gets called once on an Symptom which is being activated
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetActivated", m_Player.ToString());
+	}
+
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+	
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+		m_Requester.Stop();
+		if (LogManager.IsSymptomLogEnable()) Debug.SymptomLog("n/a", this.ToString(), "n/a", "OnGetDeactivated", m_Player.ToString());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/HandShivers.c b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/HandShivers.c
new file mode 100644
index 0000000000000000000000000000000000000000..eed4185482f18abe6aef730597f7f8beab6900f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PlayerSymptoms/States/Secondary/HandShivers.c
@@ -0,0 +1,57 @@
+
+class HandShiversSymptom extends SymptomBase
+{
+	int m_ShakeLevel;
+	//this is just for the Symptom parameters set-up and is called even if the Symptom doesn't execute, don't put any gameplay code in here
+	override void OnInit()
+	{
+		m_SymptomType = SymptomTypes.SECONDARY;
+		m_Priority = 0;
+		m_ID = SymptomIDs.SYMPTOM_HAND_SHIVER;
+		m_SyncToClient = false;
+
+	}
+	
+	override void SetParam(Param p)
+	{
+		Param1<int> p1 = Param1<int>.Cast(p);
+		if ( p1 )
+		{
+			m_ShakeLevel = p1.param1;
+			
+			if ( m_ShakeLevel > PlayerBase.SHAKE_LEVEL_MAX )
+			{
+				m_ShakeLevel = PlayerBase.SHAKE_LEVEL_MAX;
+			}
+		}
+	}
+
+	
+	override void OnUpdateClient(PlayerBase player, float deltatime)
+	{
+	}
+
+	
+	override void OnGetActivatedServer(PlayerBase player)
+	{
+		player.SetShakesForced(m_ShakeLevel);
+	}
+	
+	override void OnGetDeactivatedServer(PlayerBase player)
+	{
+		player.SetShakesForced(0);
+	}
+
+	override void OnGetActivatedClient(PlayerBase player)
+	{
+
+		
+	}
+
+	//!only gets called once on an active Symptom that is being deactivated
+	override void OnGetDeactivatedClient(PlayerBase player)
+	{
+
+	}
+	
+}
diff --git a/scripts/4_World/DayZ/Classes/PropertyModifiers.c b/scripts/4_World/DayZ/Classes/PropertyModifiers.c
new file mode 100644
index 0000000000000000000000000000000000000000..faff97d62813b2ec886d86525e82fe3f78c59bd8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/PropertyModifiers.c
@@ -0,0 +1,74 @@
+class PropertyModifiers
+{
+	vector m_RecoilModifiers;
+	vector m_SwayModifiers;
+	vector m_SightMisalignment;
+	
+	float m_BarrelLength;
+	//ref Timer test_timer;
+	ItemBase m_OwnerItem;
+	float m_Weapon
+	
+	void PropertyModifiers(ItemBase owner)
+	{
+		//test_timer = new Timer();
+		//test_timer.Run(5, this, "Refresh", NULL, true);
+		m_OwnerItem = owner;
+		UpdateModifiers();
+		m_BarrelLength = CalculateBarrelLength(owner);
+	}
+	
+	//! Get Barrel Legth in mm
+	float GetBarrelLength()
+	{
+		//return m_BarrelLength * 1000:
+		return CalculateBarrelLength(m_OwnerItem) * 1000;
+	}
+	
+	float CalculateBarrelLength(ItemBase owner)
+	{
+		vector usti_hlavne_position = owner.GetSelectionPositionLS( "usti hlavne" );//usti hlavne
+		vector konec_hlavne_position = owner.GetSelectionPositionLS( "konec hlavne" );//konec hlavne
+		usti_hlavne_position = owner.ModelToWorld(usti_hlavne_position);
+		konec_hlavne_position = owner.ModelToWorld(konec_hlavne_position);
+		return vector.Distance(usti_hlavne_position, konec_hlavne_position);
+	}
+
+
+	void UpdateModifiers()
+	{
+		m_RecoilModifiers = GetModifierRaw(m_OwnerItem, "recoilModifier");
+		m_SwayModifiers = GetModifierRaw(m_OwnerItem, "swayModifier");
+		m_SightMisalignment = GetModifierRaw(m_OwnerItem, "sightMisalignmentModifier");
+		
+		for (int i = 0; i < m_OwnerItem.GetInventory().AttachmentCount(); i++)
+		{
+			ItemBase attachment = ItemBase.Cast(m_OwnerItem.GetInventory().GetAttachmentFromIndex(i));
+			
+			vector temp_value = PropertyModifiers.GetModifierRaw(attachment, "recoilModifier");
+			m_RecoilModifiers[0] = m_RecoilModifiers[0] * temp_value[0];
+			m_RecoilModifiers[1] = m_RecoilModifiers[1] * temp_value[1];
+			m_RecoilModifiers[2] = m_RecoilModifiers[2] * temp_value[2];
+			
+			temp_value = PropertyModifiers.GetModifierRaw(attachment, "swayModifier");
+			m_SwayModifiers[0] = m_SwayModifiers[0] * temp_value[0];
+			m_SwayModifiers[1] = m_SwayModifiers[1] * temp_value[1];
+			m_SwayModifiers[2] = m_SwayModifiers[2] * temp_value[2];
+			
+			temp_value = PropertyModifiers.GetModifierRaw(attachment, "sightMisalignmentModifier");
+			m_SightMisalignment[0] = m_SightMisalignment[0] * temp_value[0];
+			m_SightMisalignment[1] = m_SightMisalignment[1] * temp_value[1];
+			m_SightMisalignment[2] = m_SightMisalignment[2] * temp_value[2];
+		}
+	}
+
+	static vector GetModifierRaw(ItemBase item, string modifier_name, vector value = "1 1 1")
+	{
+		if( item.ConfigIsExisting(modifier_name) )
+		{
+			value = item.ConfigGetVector(modifier_name);
+		}
+		return value;
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/QuickBarBase.c b/scripts/4_World/DayZ/Classes/QuickBarBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..4768355bd26524be6230f4955924f5606b7f9a4b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/QuickBarBase.c
@@ -0,0 +1,290 @@
+const int MAX_QUICKBAR_SLOTS_COUNT = 10;
+// Script File
+class QuickBarItem
+{
+	EntityAI m_entity;
+	bool m_enabled;
+	
+	void QuickBarItem()
+	{
+		m_entity = NULL;
+		m_enabled = false;
+	}
+}
+
+class QuickBarBase
+{
+	protected ref QuickBarItem m_aQuickbarEnts[MAX_QUICKBAR_SLOTS_COUNT]; 
+	protected PlayerBase _player; 
+	protected int m_slotsCount;
+	
+	void QuickBarBase(PlayerBase player)
+	{
+		for (int i = 0; i < MAX_QUICKBAR_SLOTS_COUNT; i++)
+		{
+			m_aQuickbarEnts[i] = new QuickBarItem;
+			m_aQuickbarEnts[i].m_enabled = false;
+			m_aQuickbarEnts[i].m_entity = NULL;
+		}
+		
+		_player = player;
+		m_slotsCount = 0;
+	}
+//-------------------------------------------------------------		
+	void SetSize(int newSize)
+	{
+		int i = m_slotsCount;
+		if ( newSize == m_slotsCount )
+			return;
+		
+		if (newSize > MAX_QUICKBAR_SLOTS_COUNT)
+			newSize = MAX_QUICKBAR_SLOTS_COUNT;
+		
+		if ( newSize > i )
+		{	
+			for (; i < newSize; i++)
+			{
+				EntityAI entity = m_aQuickbarEnts[i].m_entity;
+				if ( entity != NULL && entity.GetHierarchyRootPlayer() == _player )
+				{
+					m_aQuickbarEnts[i].m_enabled = true;
+				}
+			}	
+		}
+		else
+		{	
+			for (i--; i >= newSize; i--)
+				m_aQuickbarEnts[i].m_enabled = false;
+		}
+		
+		m_slotsCount = newSize;
+		
+		if (_player.m_Hud)
+			_player.m_Hud.RefreshQuickbar(true);
+	}
+//-------------------------------------------------------------		
+	int GetNonEmptyCount()
+	{
+		int count = 0;
+		for ( int i = 0; i < m_slotsCount; i++ )
+		{
+			if (m_aQuickbarEnts[i].m_enabled)
+				count++;					
+		}
+		
+		return count;	
+	}
+//-------------------------------------------------------------		
+	EntityAI GetEntity(int index)
+	{
+		if (index < 0 || index >= m_slotsCount)
+			return NULL;
+		
+		if (m_aQuickbarEnts[index].m_enabled)
+			return m_aQuickbarEnts[index].m_entity;
+		
+		return NULL;
+	}
+	
+//-------------------------------------------------------------	
+	int GetSize()
+	{
+		return m_slotsCount;
+	}
+//-------------------------------------------------------------		
+	int FindEntityIndex(EntityAI entity)
+	{
+		for (int i = 0; i < MAX_QUICKBAR_SLOTS_COUNT; i++)
+		{
+			if (m_aQuickbarEnts[i].m_entity == entity)
+				return i;
+		}
+		
+		return -1;	
+	}
+//-------------------------------------------------------------
+	bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{
+		if ( userDataType == INPUT_UDT_QUICKABARSHORTCUT)
+		{
+			OnSetEntityRequest(ctx);
+			return true;
+		}
+		
+		return false;
+	}
+//-------------------------------------------------------------
+	void UpdateShotcutVisibility(int index)
+	{
+		m_aQuickbarEnts[index].m_enabled = CanAddAsShortcut(m_aQuickbarEnts[index].m_entity);
+		if (!m_aQuickbarEnts[index].m_enabled)
+			CancelContinuousUse(index);
+		
+		if (_player.m_Hud)
+			_player.m_Hud.RefreshQuickbar(true);
+	}
+//-------------------------------------------------------------
+	void SetShotcutEnable(int index, bool value)
+	{
+		m_aQuickbarEnts[index].m_enabled = value && CanAddAsShortcut(m_aQuickbarEnts[index].m_entity);
+		if (!m_aQuickbarEnts[index].m_enabled)
+			CancelContinuousUse(index);
+		
+		if (_player.m_Hud)
+			_player.m_Hud.RefreshQuickbar(true);
+	}
+//-------------------------------------------------------------
+	bool CanAddAsShortcut(EntityAI entity)
+	{
+		InventoryLocation loc = new InventoryLocation;
+		entity.GetInventory().GetCurrentInventoryLocation(loc);
+		EntityAI parent = loc.GetParent();
+		
+		return (entity && entity.GetHierarchyRootPlayer() == _player && parent.CanAssignAttachmentsToQuickbar() && entity.CanAssignToQuickbar());
+	}
+//-------------------------------------------------------------		
+	void SetEntityShortcut(EntityAI entity, int index, bool force = false)
+	{	
+		//Client	
+		if (GetGame().IsClient())
+		{		
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_QUICKABARSHORTCUT);
+				ctx.Write(entity);
+				ctx.Write(index);
+				ctx.Write(force);
+				ctx.Send();
+			
+				_SetEntityShortcut(entity, index, force);	
+			}
+		}
+		//Server
+		else if (GetGame().IsMultiplayer() && GetGame().IsServer())
+		{
+			DayZPlayerSyncJunctures.SendQuickbarSetShortcut(_player, entity, index, force);
+		}
+		else
+		{
+			// Single player
+			_SetEntityShortcut(entity,index,force);
+		}
+	}
+//-------------------------------------------------------------
+	void OnSetEntityNoSync(EntityAI entity, int index, bool force = false )
+	{
+		_SetEntityShortcut(entity, index, force);
+	}
+//-------------------------------------------------------------
+	//! Reaction on Rpc from server for set inicial state for quickbar
+	void OnSetEntityRPC(ParamsReadContext ctx)
+	{
+		Param2<Entity,int> param;
+		if (!ctx.Read(param))
+			return;
+		
+		EntityAI entity1 = EntityAI.Cast(param.param1);
+		_SetEntityShortcut(entity1, param.param2, false);
+	}
+//-------------------------------------------------------------
+	//! Reaction on SetEntityShortcut from client
+	void OnSetEntityRequest(ParamsReadContext ctx)
+	{
+		EntityAI eai = null;
+		if (!ctx.Read(eai))
+			return;
+		
+		int index = -1;
+		if (!ctx.Read(index))
+			return;
+		
+		bool force = false;
+		if (!ctx.Read(force))
+			return
+		
+		_SetEntityShortcut(eai, index, force);
+	}
+//-------------------------------------------------------------		
+	protected void _SetEntityShortcut(EntityAI entity, int index, bool force = false)
+	{
+		//TODO Check, if is in inventory
+		//if(entity.GetLoca)
+		if ( entity == NULL )
+		{
+			_RemoveEntity(index);
+			return;
+		}
+		
+		int i = FindEntityIndex(entity);
+		
+		if ( i != -1 )
+			_RemoveEntity(i);
+				
+		_RemoveEntity(index);
+		_SetEntity( entity, index, force);				
+	}
+//-------------------------------------------------------------		
+	void updateSlotsCount()
+	{
+		int slotsCount = _player.GetQuickBarBonus();
+		int attCount  = _player.GetInventory().AttachmentCount();
+		
+		for ( int i = 0; i < attCount; ++i)
+		{
+			slotsCount += _player.GetInventory().GetAttachmentFromIndex(i).GetQuickBarBonus();
+		}
+		
+		//max slots is 10
+		SetSize(Math.Min(slotsCount, 10));
+	}
+//-------------------------------------------------------------		
+	protected void _RemoveEntity(int index)
+	{
+		if ( index >= 0 && index < MAX_QUICKBAR_SLOTS_COUNT )
+		{
+			CancelContinuousUse(index);
+			
+			m_aQuickbarEnts[index].m_entity = NULL;
+			m_aQuickbarEnts[index].m_enabled = false;
+			
+			if (_player.m_Hud)
+				_player.m_Hud.RefreshQuickbar(true);
+		}
+	}
+//-------------------------------------------------------------		
+	protected void _SetEntity( EntityAI entity, int index, bool force = false)
+	{		
+		if ( index >= 0 && index < MAX_QUICKBAR_SLOTS_COUNT )
+		{		
+			if ( CanAddAsShortcut(entity) )
+			{
+				m_aQuickbarEnts[index].m_entity = entity;
+				m_aQuickbarEnts[index].m_enabled = true;
+			}
+			else
+			{
+				CancelContinuousUse(index);
+				m_aQuickbarEnts[index].m_enabled = false;
+			}
+			
+			if (_player.m_Hud)
+				_player.m_Hud.RefreshQuickbar(true);
+		}		
+	}
+//-------------------------------------------------------------	
+	void ~QuickBarBase()
+	{
+		
+	}
+//-------------------------------------------------------------	
+	protected void CancelContinuousUse(int index)
+	{
+		if (_player.m_QuickBarHold)
+		{
+			HumanInputController hic = _player.GetInputController();
+			if (hic && hic.IsQuickBarSlot() == index + 1)
+				_player.OnQuickBarContinuousUseEnd(index + 1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RainProcurementComponent.c b/scripts/4_World/DayZ/Classes/RainProcurementComponent.c
new file mode 100644
index 0000000000000000000000000000000000000000..a528cd45a94463bc43672204b4baf65cbda48f34
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RainProcurementComponent.c
@@ -0,0 +1,89 @@
+class RainProcurementComponentBase : Managed
+{
+	protected ItemBase 					m_ProcuringItem;	
+	protected RainProcurementHandler 	m_Handler;
+	protected bool 						m_IsUnderRoof;
+	protected bool 						m_IsActive;
+	protected int  						m_UpdateCounter;
+	protected const int 				UPDATE_ROOFCHECK_COUNT = 3; //do roofcheck every n updates
+	
+	void RainProcurementComponentBase(ItemBase procuringItem)
+	{
+		m_ProcuringItem = procuringItem;
+		Reset();
+		m_Handler = MissionBaseWorld.Cast(GetGame().GetMission()).GetRainProcurementHandler();
+	}
+	
+	//! Called on server to queue rain procurement (on next cycle end)
+	void StartRainProcurement()
+	{
+		#ifdef SERVER
+		Reset();
+		SetActive(true);
+		m_Handler.QueueStart(this);
+		#endif
+	}
+	
+	//! Called on server to queue rain procurement removal (on next cycle end)
+	void StopRainProcurement()
+	{
+		#ifdef SERVER
+		if (IsActive())
+		{
+			SetActive(false);
+			m_Handler.QueueStop(this);
+		}
+		#endif
+	}
+	
+	void OnUpdate(float deltaTime, float amount)
+	{
+		m_UpdateCounter++;
+		if (m_UpdateCounter == 0 || m_UpdateCounter == UPDATE_ROOFCHECK_COUNT)
+		{
+			m_UpdateCounter = 0;
+			UpdateIsUnderRoof();
+		}
+		ProcureLiquid(amount);
+	}
+	
+	protected void Reset()
+	{
+		m_UpdateCounter = -1;
+	}
+	
+	protected void ProcureLiquid(float amountBase, int liquidType = LIQUID_WATER)
+	{
+		if (!m_IsUnderRoof)
+		{
+			float actualAmount = amountBase * GetBaseLiquidAmount();
+			Liquid.FillContainerEnviro(m_ProcuringItem, liquidType, actualAmount);
+		}
+	}
+	
+	protected void UpdateIsUnderRoof() 
+	{
+		m_IsUnderRoof = MiscGameplayFunctions.IsUnderRoof(m_ProcuringItem);
+	}
+	
+	//! override this to get different amount per ProcureLiquid cycle
+	float GetBaseLiquidAmount()
+	{
+		return GameConstants.LIQUID_RAIN_AMOUNT_COEF_BASE;
+	}
+	
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+	
+	void SetActive(bool run)
+	{
+		//resets times on start
+		if (run)
+			Reset();
+		m_IsActive = run;
+	}
+};
+
+class RainProcurementComponentBarrel : RainProcurementComponentBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RainProcurementHandler.c b/scripts/4_World/DayZ/Classes/RainProcurementHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..86fdf15eab9eb3f1d7a56275cfb3c6172baeabda
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RainProcurementHandler.c
@@ -0,0 +1,165 @@
+class RainProcurementHandler : Managed
+{
+	protected MissionBaseWorld m_Mission;
+	protected ref set<RainProcurementComponentBase> m_ActiveComponents;
+	protected ref set<RainProcurementComponentBase> m_ChangedQueue;
+	protected ref set<int> m_CleanupQueue;
+	protected const int UPDATE_BATCH_SIZE = 20; //Tweak this to adjust max batch size
+	const int UPDATE_TIME = 10; //seconds
+	protected bool m_Update;
+	protected bool m_ProcessComponents;
+	protected bool m_ProcessingFinished;
+	protected int m_NextToProcessIdx;
+	protected float m_UpdateTimer;
+	protected float m_LiquidAmountCoef;
+	
+	void RainProcurementHandler(MissionBaseWorld mission)
+	{
+		m_Mission = mission;
+		m_Update = false;
+		m_ProcessComponents = false;
+		m_ProcessingFinished = true;
+		m_ActiveComponents = new set<RainProcurementComponentBase>;
+		m_ChangedQueue = new set<RainProcurementComponentBase>;
+		m_CleanupQueue = new set<int>;
+		m_NextToProcessIdx = 0;
+		m_UpdateTimer = 0;
+	}
+	
+	void QueueStart(RainProcurementComponentBase component)
+	{
+		m_ChangedQueue.Insert(component);
+		m_Update = true;
+	}
+	
+	void QueueStop(RainProcurementComponentBase component)
+	{
+		m_ChangedQueue.Insert(component);
+		m_Update = true;
+	}
+	
+	void Update(float timeslice)
+	{
+		if (!m_Update)
+			return;
+		
+		if (m_ProcessComponents)
+		{
+			if (m_ProcessingFinished) //do on start and after the batch is finished
+			{
+				m_LiquidAmountCoef = DetermineAmountCoef();
+				if (m_LiquidAmountCoef == 0) //skip processing when not raining
+				{
+					Reset();
+					return;
+				}
+			}
+			
+			m_ProcessingFinished = ProcessBatch();
+			
+			if (m_ProcessingFinished)
+			{
+				Reset();
+			}
+		}
+		else
+		{
+			m_UpdateTimer += timeslice;
+			if (m_UpdateTimer >= UPDATE_TIME)
+			{
+				HandleChangedComponents();
+				Cleanup();
+				CheckUpdating();
+				m_ProcessComponents = m_Update;
+				if (!m_Update)
+					Reset();
+			}
+		}
+	}
+	
+	//! returns 'true' when all the batches are finished
+	protected bool ProcessBatch()
+	{
+		bool ret = false;
+		int count = m_ActiveComponents.Count();
+		int target = (int)Math.Clamp(m_NextToProcessIdx + UPDATE_BATCH_SIZE,0,count);
+		
+		for (m_NextToProcessIdx; m_NextToProcessIdx < target; m_NextToProcessIdx++)
+		{
+			if (m_ActiveComponents[m_NextToProcessIdx])
+				m_ActiveComponents[m_NextToProcessIdx].OnUpdate(m_UpdateTimer, m_LiquidAmountCoef);
+			else
+				m_CleanupQueue.Insert(m_NextToProcessIdx);
+		}
+		
+		ret = target == count;
+		if (ret)
+		{
+			m_NextToProcessIdx = 0;
+		}
+		
+		return ret;
+	}
+	
+	protected void Cleanup()
+	{
+		int count = m_CleanupQueue.Count();
+		if (count == 0)
+			return;
+		
+		for (int i = count - 1; i > -1; i--)
+		{
+			m_ActiveComponents.Remove(m_CleanupQueue[i]);
+		}
+		m_CleanupQueue.Clear();
+	}
+	
+	protected void Reset()
+	{
+		m_ProcessComponents = false;
+		m_ProcessingFinished = true;
+		m_UpdateTimer = 0;
+	}
+	
+	protected void HandleChangedComponents()
+	{
+		RainProcurementComponentBase component;
+		int count = m_ChangedQueue.Count();
+		int idx;
+		
+		for (int  i = 0; i < count; i++)
+		{
+			component = m_ChangedQueue[i];
+			if (!component)
+				continue;
+			
+			if (component.IsActive())
+			{
+				m_ActiveComponents.Insert(component);
+			}
+			else
+			{
+				idx = m_ActiveComponents.Find(component);
+				if (idx != -1)
+					m_ActiveComponents.Remove(idx);
+			}
+		}
+		m_ChangedQueue.Clear();
+	}
+	
+	protected void CheckUpdating()
+	{
+		m_Update = m_ActiveComponents.Count() != 0;
+	}
+	
+	float GetLiquidAmountCoef()
+	{
+		return m_LiquidAmountCoef;
+	}
+	
+	//! scalable on handler level
+	float DetermineAmountCoef()
+	{
+		return GetGame().GetWeather().GetRain().GetActual();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RainProcurementManager.c b/scripts/4_World/DayZ/Classes/RainProcurementManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..8727211ac3660c39736e383eb09f7cefd3a4a630
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RainProcurementManager.c
@@ -0,0 +1,84 @@
+//!DEPRECATED, done through the RainProcurementHandler / component instead
+class RainProcurementManager
+{
+	protected 			ItemBase 	m_ProcuringItem;	
+	protected 			int 		m_IsUnderRoof;
+	protected	ref	Timer 		m_UpdateTimer;
+	protected 	const 	int 		RAIN_COEFFICIENT = 10;
+
+	void RainProcurementManager( ItemBase procuring_item )
+	{
+		m_ProcuringItem = procuring_item;
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	void InitRainProcurement()
+	{
+		m_IsUnderRoof = MiscGameplayFunctions.IsUnderRoof(m_ProcuringItem);
+
+		//m_ProcuringItem.SetQuantity(0); /*set to 0 for debug purposses*/
+
+		if ( !m_IsUnderRoof )
+		{
+			m_UpdateTimer = new Timer();
+			m_UpdateTimer.Run( 10, this, "RainProcurementCheck", NULL, true ); 
+		}
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void RainProcurementCheck()
+	{		
+		float rain_intensity = GetGame().GetWeather().GetRain().GetActual();
+		float fill_per_update = RAIN_COEFFICIENT * rain_intensity;
+
+		if ( rain_intensity > 0 ) 
+		{
+			if ( m_ProcuringItem.GetQuantity() < m_ProcuringItem.GetQuantityMax() )
+			{
+				Liquid.FillContainerEnviro( m_ProcuringItem, LIQUID_WATER, fill_per_update );
+
+				//Print( "Quantity of " + m_ProcuringItem + " is: " +  m_ProcuringItem.GetQuantity() );
+			}
+			else
+			{		
+				//Print("vesel full");		
+				StopRainProcurement();				
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------------------------
+	/*bool IsUnderRoof() 
+	{
+		vector minMax[2];
+		m_ProcuringItem.GetCollisionBox(minMax);
+
+		vector size = Vector(0,0,0);
+		size[1] = minMax[1][1] - minMax[0][1];
+
+		vector from = m_ProcuringItem.GetPosition() + size;  
+		vector ceiling = "0 20 0";
+		vector to = from + ceiling;
+		vector contact_pos;
+		vector contact_dir;
+
+		int contact_component;	
+	
+		return DayZPhysics.RaycastRV( from, to, contact_pos, contact_dir, contact_component, NULL, NULL, m_ProcuringItem );	
+	}*/
+
+	// ----------------------------------------------------------------------------------------
+	bool IsRunning()
+	{
+		return m_UpdateTimer != null;
+	}
+	
+	void StopRainProcurement()
+	{
+		if( !m_IsUnderRoof )
+		{
+			m_UpdateTimer.Stop();	
+		}
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RandomGeneratorSyncManager.c b/scripts/4_World/DayZ/Classes/RandomGeneratorSyncManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..19f8065437458f85e00ec643f3a845974dcc1352
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RandomGeneratorSyncManager.c
@@ -0,0 +1,44 @@
+enum RandomGeneratorSyncUsage
+{
+	RGSRecoil,
+	RGSJam,
+	RGSGeneric,
+	RGSAimingModel,
+	Count,
+}
+
+class RandomGeneratorSyncManager
+{
+	const int USAGE_COUNT = RandomGeneratorSyncUsage.Count;
+	
+	float randomValuesArray[USAGE_COUNT];
+	DayZPlayer m_player;
+	
+	void RandomGeneratorSyncManager(DayZPlayer player)
+	{
+		m_player = player;
+	}
+
+	void Update()
+	{
+		for(int i = 0; i < USAGE_COUNT; i++ )
+		{
+			randomValuesArray[i] = m_player.Random01();
+		}
+	}	
+	
+	
+	float GetRandom01(RandomGeneratorSyncUsage usage_index)
+	{
+		if(usage_index < USAGE_COUNT)
+		{
+			return randomValuesArray[usage_index];
+		}
+		return -1;
+	}
+	
+	float GetRandomInRange(RandomGeneratorSyncUsage usage_index, float min, float max)
+	{
+		return GetRandom01(usage_index)*(max - min) + min;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/CacheObject.c b/scripts/4_World/DayZ/Classes/Recipes/CacheObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..18cfe6db0a8ada53a406bbbde1740135d8a47a2f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/CacheObject.c
@@ -0,0 +1,107 @@
+
+class RecipeCacheData
+{
+	int m_Mask;
+	int m_BitCount;
+	
+	void RecipeCacheData(int mask)
+	{
+		SetMask(mask);
+	}
+	
+	int GetMask()
+	{
+		return m_Mask;
+	}
+	
+	int GetBitCount()
+	{
+		return m_BitCount;
+	}
+	
+	void SetMask(int mask)
+	{
+		m_Mask = mask;
+		m_BitCount = Math.GetNumberOfSetBits(mask);
+	}
+	
+}
+
+class CacheObject
+{
+	ref map<int, ref RecipeCacheData> m_Recipes;
+	ref array<int> m_RecipeIDs;
+	//RecipeCacheData data;
+	void CacheObject()
+	{
+		m_Recipes = new map<int, ref RecipeCacheData>;
+		m_RecipeIDs = new array<int>;
+	}
+
+	bool AddRecipe(int recipe_id, int mask)
+	{
+		RecipeCacheData data = m_Recipes.Get(recipe_id);
+		if(data)
+		{
+			UpdateMask(recipe_id, mask);
+		}
+		else
+		{
+			m_Recipes.Insert(recipe_id, new RecipeCacheData(mask));
+			m_RecipeIDs.Insert(recipe_id);
+
+		}
+		return true;
+	}
+
+
+	void UpdateMask(int recipe_id, int mask)
+	{
+		RecipeCacheData data = m_Recipes.Get(recipe_id);
+		data.SetMask(data.GetMask() | mask);
+		
+	}
+
+	
+	int GetNumberOfRecipes()
+	{
+		return m_Recipes.Count();
+	}
+	
+	array<int> GetRecipes()
+	{
+		return m_RecipeIDs;
+	}
+	
+	bool IsContainRecipe(int recipe_id)
+	{
+		return m_Recipes.Contains(recipe_id);
+	}
+	
+	int GetMaskByRecipeID(int recipe_id)
+	{
+		RecipeCacheData cache_data = m_Recipes.Get(recipe_id);
+		if(cache_data)
+			return cache_data.GetMask();
+		return 0;
+	}
+	
+	int GetBitCountByRecipeID(int recipe_id)
+	{
+		RecipeCacheData cache_data = m_Recipes.Get(recipe_id);
+		if(cache_data)
+			return cache_data.GetBitCount();
+		return 0;
+	}
+	
+	void DebugPrint()
+	{
+		for(int i = 0; i < m_Recipes.Count();i++)
+		{
+			Print("recipeID:"+m_Recipes.GetKey(i).ToString());
+			Print("mask:"+m_Recipes.GetElement(i).m_Mask.ToString());
+			Print("m_BitCount:"+m_Recipes.GetElement(i).m_BitCount.ToString());
+			
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/RecipeBase.c b/scripts/4_World/DayZ/Classes/Recipes/RecipeBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..841010c9092a2bc26e40c95a022c48bb3634a3b0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/RecipeBase.c
@@ -0,0 +1,658 @@
+const int MAX_NUMBER_OF_INGREDIENTS = 2;
+const int MAXIMUM_RESULTS = 10;
+const float DEFAULT_SPAWN_DISTANCE = 0.5;
+class RecipeBase
+{
+	string m_ItemsToCreate[MAXIMUM_RESULTS];
+	ref array<string> m_Ingredients[MAX_NUMBER_OF_INGREDIENTS];
+	ref array<string> m_SoundCategories[MAX_NUMBER_OF_INGREDIENTS];
+	
+	ItemBase m_Items[MAX_NUMBER_OF_INGREDIENTS];
+	
+	ItemBase m_IngredientsSorted[MAX_NUMBER_OF_INGREDIENTS]; //if the recipe is valid, this array will contain all ingredients sorted against the recipe ingredients
+	
+	//ref array<string> m_ItemsToCreate;
+	
+	//string m_Result;
+	ref array<ItemBase> m_IngredientsToBeDeleted = new array<ItemBase>;
+	string m_Name;
+	
+	int	m_ID;
+	int m_NumberOfResults;
+	float m_AnimationLength = 1;//animation length in relative time units
+	float m_Specialty = 0;// value > 0 for roughness, value < 0 for precision
+	bool m_IsInstaRecipe;//should this recipe be performed instantly without animation
+	//bool m_IsActionType;//will this recipe be also a user action(only set true if you know what you are doing)
+	bool m_AnywhereInInventory;//is this recipe valid even when neither of the items is in hands
+	//array<string> ptr;
+
+	float m_MinQuantityIngredient[MAX_NUMBER_OF_INGREDIENTS];
+	float m_MaxQuantityIngredient[MAX_NUMBER_OF_INGREDIENTS];
+	float m_MinDamageIngredient[MAX_NUMBER_OF_INGREDIENTS];
+	float m_MaxDamageIngredient[MAX_NUMBER_OF_INGREDIENTS];
+
+	bool m_IngredientUseSoftSkills[MAX_NUMBER_OF_INGREDIENTS];
+	float m_IngredientAddHealth[MAX_NUMBER_OF_INGREDIENTS];
+	float m_IngredientAddQuantity[MAX_NUMBER_OF_INGREDIENTS];
+	float m_IngredientSetHealth[MAX_NUMBER_OF_INGREDIENTS];
+	bool m_IngredientDestroy[MAX_NUMBER_OF_INGREDIENTS];
+	
+	
+	bool m_ResultSetFullQuantity[MAXIMUM_RESULTS];
+	float m_ResultSetQuantity[MAXIMUM_RESULTS];
+	float m_ResultSetHealth[MAXIMUM_RESULTS];
+	float m_ResultSpawnDistance[MAXIMUM_RESULTS];
+	int m_ResultToInventory[MAXIMUM_RESULTS];
+	int m_ResultInheritsHealth[MAXIMUM_RESULTS];
+	int m_ResultInheritsColor[MAXIMUM_RESULTS];
+	int	m_ResultReplacesIngredient[MAXIMUM_RESULTS];
+	bool m_ResultUseSoftSkills[MAXIMUM_RESULTS];
+	
+	
+
+	void RecipeBase()
+	{
+
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			m_Ingredients[i] = new array<string>;
+			m_SoundCategories[i] = new array<string>;
+			m_IngredientsSorted[i] = NULL;
+		}
+		
+		for(i = 0; i < MAXIMUM_RESULTS; i++)
+		{
+			m_ResultSpawnDistance[i] = DEFAULT_SPAWN_DISTANCE;
+		}
+
+		m_NumberOfResults = 0;
+		//m_IsActionType = false;
+		
+		m_Name = "RecipeBase default name";
+		Init();
+	}
+
+	void Init();
+
+	float GetLengthInSecs()
+	{
+		return m_AnimationLength * CRAFTING_TIME_UNIT_SIZE;
+	}
+	
+	float GetSpecialty()
+	{
+		return m_Specialty;
+	}
+	
+	bool IsRecipeAnywhere()
+	{
+		return m_AnywhereInInventory;		
+	}
+	
+	bool CheckIngredientMatch(ItemBase item1, ItemBase item2)
+	{
+		if( item1 == NULL || item2 == NULL ) return false;
+		
+		m_Items[0] = item1;
+		m_Items[1] = item2;
+		
+		bool found = false;
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)//all ingredients
+		{
+			found = false;
+			array<string> tempArray = m_Ingredients[i];
+			for(int x = 0; x < tempArray.Count(); x++)//particular ingredient array
+			{
+				for(int z = 0; z < MAX_NUMBER_OF_INGREDIENTS; z++)
+				{
+					if( m_Items[z] != NULL )
+					{
+						ItemBase item = m_Items[z];
+						if( tempArray.Get(x) == item.GetType() || GetGame().IsKindOf(item.GetType(),tempArray.Get(x)))
+						{
+							found = true;//we found a match
+							//m_IngredientsSorted.Insert(item);
+							m_IngredientsSorted[i] = item;
+							m_Items[z] = NULL;
+						}
+					}
+					if(found) break;//we found a match, no need to check the remaining ingredients
+				}
+				if(found) break;//we found a match, no need to check this m_Ingredient array
+			}
+			if(!found) return false;// no match within an m_Ingredient array, no reason to continue the search, recipe is invalid
+		}
+		if(found)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	void InsertIngredient(int index, string ingredient)
+	{
+		InsertIngredientEx(index, ingredient, "");
+	}
+	
+	void InsertIngredientEx(int index, string ingredient, string soundCategory)
+	{
+		array<string> ptr = m_Ingredients[index];
+		ptr.Insert(ingredient);
+		m_SoundCategories[index].Insert(soundCategory);
+	}
+	
+	void RemoveIngredient(int index, string ingredient)
+	{
+		array<string> ptr = m_Ingredients[index];
+		for(int i = 0; i < ptr.Count(); i++)
+		{
+			if(ptr[i] == ingredient)
+			{
+				ptr.Remove(i);
+				m_SoundCategories[index].Remove(i);
+				return;
+			}
+		}
+	}
+
+
+	void AddResult(string item)
+	{
+		m_ItemsToCreate[m_NumberOfResults] = item;
+		m_NumberOfResults++;
+	}
+
+	string GetName()
+	{
+		return m_Name;
+	}
+
+	bool IsInstaRecipe()
+	{
+		return m_IsInstaRecipe;
+	}
+	
+	
+
+	//spawns results in the world
+	void SpawnItems(ItemBase ingredients[], PlayerBase player, array<ItemBase> spawned_objects/*out*/)
+	{
+		//vector item_position = player.GetPosition() + ( player.GetDirection() * 1 );
+		//Debug.Log("SpawnItems called","recipes");
+		spawned_objects.Clear();//just to make sure
+		EntityAI object = NULL;
+		
+		for(int i = 0; i < m_NumberOfResults; i++)
+		{
+			string item_to_spawn = m_ItemsToCreate[i];
+			
+			if( m_ResultInheritsColor[i] != -1 )
+			{
+				ItemBase item = ingredients[m_ResultInheritsColor[i]];
+				//string class_name = item.GetType();
+				string color = item.ConfigGetString("color");
+				string new_class_name = m_ItemsToCreate[i] + color;
+				item_to_spawn = new_class_name;
+			}
+			
+			if( m_ResultToInventory[i] == -1 ) 
+			{
+				Debug.Log("  = "+m_ResultToInventory[i].ToString(),"recipes");
+				/*
+				InventoryLocation inv_loc = new InventoryLocation;
+				if (player.GetInventory().FindFirstFreeLocationForNewEntity(item_to_spawn, FindInventoryLocationType.ANY, inv_loc))
+				{
+					object = SpawnItemOnLocation(item_to_spawn, inv_loc, false);
+				}
+				*/
+				object = player.GetInventory().CreateInInventory(item_to_spawn);
+			}
+			else if (m_ResultToInventory[i] >= 0)
+			{
+				/*
+				object = player.SpawnEntityOnGroundOnCursorDir(item_to_spawn, 0.5);
+
+				ItemBase item_swap_with = ingredients[m_ResultToInventory[i]];
+				player.SwapEntities(true, item_swap_with, EntityAI.Cast(object));
+				*/
+			}
+			else if ( m_ResultToInventory[i] == -2 )
+			{
+				object = player.GetInventory().CreateEntityInCargo(item_to_spawn);
+			}
+			if( !object )
+			{
+				//spawning in inventory failed, spawning on the ground instead.....
+				object = player.SpawnEntityOnGroundOnCursorDir(item_to_spawn, m_ResultSpawnDistance[i]);
+				if( !object)
+				{
+					Error("failed to spawn entity "+item_to_spawn+" , make sure the classname exists and item can be spawned");
+				}
+			}
+			spawned_objects.Insert(ItemBase.Cast(object));
+			//Debug.Log("spawning item "+item_to_spawn,"recipes");
+			object = null;
+		}
+
+	}
+
+	//applies final modifications to results
+	void ApplyModificationsResults(ItemBase sorted[], array<ItemBase> results, ItemBase result, PlayerBase player)
+	{
+		float all_ingredients_health = 0;//this is used later in results
+		float all_ingredients_health01 = 0;//combined damage % of ingredients
+		int value_delta;
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			ItemBase ingrd = ItemBase.Cast(sorted[i]);
+			all_ingredients_health += ingrd.GetHealth("", "");//accumulate health of all ingredients, used in results
+			all_ingredients_health01 += ingrd.GetHealth01("", "");
+		}
+		//------------------- results ----------------------
+		for(i = 0; i < m_NumberOfResults; i++)
+		{
+			ItemBase res = results.Get(i);
+			if(!res)
+			{
+				continue;
+			}
+			
+			bool use_soft_skills = m_ResultUseSoftSkills[i];
+			
+			if( res.IsItemBase() )
+			{
+				value_delta = m_ResultSetQuantity[i];
+
+				ItemBase resIb = ItemBase.Cast(res);
+
+				if( use_soft_skills ) 
+				{
+					value_delta = player.GetSoftSkillsManager().AddSpecialtyBonus(value_delta, m_Specialty);
+				}
+				
+				if( !resIb.IsMagazine() )//is not a magazine
+				{
+					if( m_ResultSetFullQuantity[i] == 1 )//<------m_ResultSetFullQuantity
+					{
+						resIb.SetQuantityMax();
+					}
+					else if( value_delta != -1 )//<------m_ResultSetQuantity
+					{
+						resIb.SetQuantity( value_delta );
+					}
+				}
+				else//is magazine
+				{
+					Magazine mgzn = Magazine.Cast(resIb);
+					if( m_ResultSetFullQuantity[i] == 1 )//<------m_ResultSetFullQuantity
+					{
+						mgzn.ServerSetAmmoMax();
+					}
+					else if( value_delta != -1 )//<------m_ResultSetQuantity
+					{
+						mgzn.ServerSetAmmoCount( value_delta );
+					}
+				}
+			}
+			if( m_ResultSetHealth[i] != -1 )//<------m_ResultSetHealth
+			{
+				value_delta = m_ResultSetHealth[i];
+				if( use_soft_skills ) 
+				{
+					value_delta = player.GetSoftSkillsManager().AddSpecialtyBonus(value_delta, m_Specialty);
+				}
+				res.SetHealth("","",value_delta);
+			}
+			if( m_ResultInheritsHealth[i] != -1 )//<------m_ResultInheritsHealth
+			{
+				if( m_ResultInheritsHealth[i] >= 0 )
+				{
+					int ing_number = m_ResultInheritsHealth[i];
+					ItemBase ing = sorted[ing_number];
+					
+					if( ing )
+					{
+						//float ing_health = ing.GetHealth("","");
+						float ing_health01 = ing.GetHealth01("","");
+						res.SetHealth("", "", ing_health01 * res.GetMaxHealth("",""));
+						Debug.Log("Inheriting health from ingredient:"+m_ResultInheritsHealth[i].ToString(),"recipes");
+					}
+				}
+				else if( m_ResultInheritsHealth[i] == -2 )
+				{
+					//float average_health = all_ingredients_health / MAX_NUMBER_OF_INGREDIENTS;
+					float average_health01 = all_ingredients_health01 / MAX_NUMBER_OF_INGREDIENTS;
+					res.SetHealth("", "", average_health01 * res.GetMaxHealth("",""));
+				}
+			}
+
+			if( m_ResultReplacesIngredient[i] != -1 )//<------ResultReplacesIngredient
+			{
+				if( m_ResultReplacesIngredient[i] > -1 )
+				{
+					int ing_num = m_ResultReplacesIngredient[i];
+					ItemBase ingr = sorted[ing_num];
+					
+					if( ingr )
+					{
+						MiscGameplayFunctions.TransferItemProperties(ingr, res);
+						MiscGameplayFunctions.TransferInventory(ingr, res, player);
+					}
+				}
+			}
+		}
+	}
+	
+	
+	void DeleleIngredientsPass()
+	{
+		for(int i = 0; i < m_IngredientsToBeDeleted.Count(); i++)
+		{
+			ItemBase ingredient = m_IngredientsToBeDeleted.Get(i);
+			ingredient.Delete();
+		}
+		m_IngredientsToBeDeleted.Clear();
+	}
+	
+	//applies final modifications to ingredients
+	void ApplyModificationsIngredients(ItemBase sorted[], PlayerBase player)
+	{
+		//---------------------- ingredients ----------------------
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			ItemBase ingredient = sorted[i];
+			
+			if( m_IngredientDestroy[i] == 1 )//<------m_IngredientDestroy
+			{
+				if( ingredient ) m_IngredientsToBeDeleted.Insert(ingredient);
+				//ingredient.Delete();
+				//sorted[i] = NULL;
+			}
+			else
+			{
+				bool use_soft_skills = m_IngredientUseSoftSkills[i];
+				
+				if( m_IngredientAddHealth[i] != 0 )//<------m_IngredientAddHealth
+				{
+					float health_delta = m_IngredientAddHealth[i];
+					if( use_soft_skills ) 
+					{
+						if(health_delta <0) health_delta = player.GetSoftSkillsManager().SubtractSpecialtyBonus(health_delta, m_Specialty);
+						else 				health_delta = player.GetSoftSkillsManager().AddSpecialtyBonus(health_delta, m_Specialty);
+					}
+					ingredient.AddHealth("","",health_delta);
+				}
+				else if(m_IngredientSetHealth[i] != -1)//<------m_IngredientSetHealth
+				{
+					float new_health = m_IngredientSetHealth[i];
+					ingredient.SetHealth("","",new_health);
+				}
+				if( m_IngredientAddQuantity[i] != 0 )//<------m_IngredientAddQuantity
+				{
+					float quantity_delta = m_IngredientAddQuantity[i];
+					
+					if(	use_soft_skills )
+					{
+						if(quantity_delta <0) quantity_delta = player.GetSoftSkillsManager().SubtractSpecialtyBonus(quantity_delta, m_Specialty);
+						else 				quantity_delta = player.GetSoftSkillsManager().AddSpecialtyBonus(quantity_delta, m_Specialty);
+					}
+						
+					if( !ingredient.IsMagazine() )
+					{
+						ItemBase obj = ingredient;
+						bool isDestroyed = obj.AddQuantity(quantity_delta, true);
+						if( isDestroyed ) 
+						{
+							//if (obj) m_IngredientsToBeDeleted.Insert(obj);
+							continue;
+						}
+					}
+					else
+					{
+						Magazine mag = Magazine.Cast(ingredient);
+						int newQuantity = mag.GetAmmoCount() + quantity_delta;
+						if( newQuantity <= 0 )
+						{
+							if(mag) m_IngredientsToBeDeleted.Insert(mag);
+							continue;
+						}
+						else
+						{
+							mag.ServerSetAmmoCount( newQuantity );
+						}
+					}
+				}
+			}
+		}
+	}
+
+	//checks the recipe conditions
+	bool CheckConditions(ItemBase sorted[])
+	{
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			ItemBase ingredient = sorted[i];
+			if( !ingredient.IsMagazine() )
+			{
+				if( ingredient.GetQuantityMax() !=0 && m_MinQuantityIngredient[i] >= 0 && ingredient.GetQuantity() < m_MinQuantityIngredient[i] )
+				{
+					//Debug.Log("Recipe condition check failing1: m_MinQuantityIngredient","recipes");
+					return false;
+				}
+				if( m_MaxQuantityIngredient[i] >= 0 && ingredient.GetQuantity() > m_MaxQuantityIngredient[i] )
+				{
+					//Debug.Log("Recipe condition check failing1: m_MaxQuantityIngredient","recipes");
+					return false;
+				}
+			}
+			else
+			{
+				Magazine mag1 = Magazine.Cast(ingredient);
+				if( m_MinQuantityIngredient[i] >= 0 && mag1.GetAmmoCount() < m_MinQuantityIngredient[i] )
+				{
+					//Debug.Log("Recipe condition check failing1: m_MinQuantityIngredient[0]","recipes");
+					return false;
+				}
+				if( m_MaxQuantityIngredient[i] >= 0 && mag1.GetAmmoCount() > m_MaxQuantityIngredient[i] )
+				{
+					//Debug.Log("Recipe condition check failing1: m_MaxQuantityIngredient[0]","recipes");
+					return false;
+				}
+			}
+			int dmg3 = ingredient.GetHealthLevel();
+			if( m_MinDamageIngredient[i] >= 0 && ingredient.GetHealthLevel() < m_MinDamageIngredient[i] )
+			{
+				int dmg = ingredient.GetHealthLevel();
+				//Debug.Log("Recipe condition check failing1: m_MinDamageIngredient[0]","recipes");
+				return false;
+			}
+			if( m_MaxDamageIngredient[i] >= 0 && ingredient.GetHealthLevel() > m_MaxDamageIngredient[i] )
+			{
+				int dmg2 = ingredient.GetHealthLevel();
+				//Debug.Log("Recipe condition check failing1: m_MaxDamageIngredient[0]","recipes");
+				return false;
+			}
+		}
+		return true;
+	}
+
+	//checks overall validity of this recipe
+	bool CheckRecipe(ItemBase item1, ItemBase item2, PlayerBase player)
+	{
+		if( item1 == NULL || item2 == NULL )
+		{
+			Error("recipe invalid, at least one of the ingredients is NULL");
+			return false;
+		}
+		
+		ItemBase item_in_hand = player.GetItemInHands();
+		
+		if( !IsRecipeAnywhere() && (item1 != item_in_hand && item2 != item_in_hand) )
+		{
+			return false;
+		}
+		
+		m_IngredientsSorted[0] = item1;
+		m_IngredientsSorted[1] = item2;
+	
+		if( CanDo( m_IngredientsSorted, player ) && CheckConditions( m_IngredientsSorted ) )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	void OnSelectedRecipe(ItemBase item1, ItemBase item2, PlayerBase player)
+	{
+		if( item1 == NULL || item2 == NULL )
+		{
+			Error("CheckRecipe: recipe invalid, at least one of the ingredients is NULL");
+			//Debug.Log("recipe invalid, at least one of the ingredients is NULL","recipes");
+			return;
+		}
+		OnSelected(item1,item2,player);
+	}
+	
+	void OnSelected(ItemBase item1, ItemBase item2, PlayerBase player)
+	{
+		
+	}
+
+	//performs this recipe
+	void PerformRecipe(ItemBase item1, ItemBase item2, PlayerBase player)
+	{
+		if( item1 == NULL || item2 == NULL )
+		{
+			Error("PerformRecipe: recipe invalid, at least one of the ingredients is NULL");
+			Debug.Log("PerformRecipe: at least one of the ingredients is NULL","recipes");
+		}
+		/*
+		m_IngredientsSorted[0] = item1;
+		m_IngredientsSorted[1] = item2;
+		*/
+		
+		/*
+		Debug.Log("PerformRecipe Ingredient 1: "+ToString(item1.Ptr().GetType()),"recipes");
+		Debug.Log("PerformRecipe Ingredient 2: "+ToString(item2.Ptr().GetType()),"recipes");
+		*/
+		if( CheckRecipe(item1,item2,player) )
+		{
+			array<ItemBase> spawned_objects = new array<ItemBase>;
+			SpawnItems(m_IngredientsSorted, player,spawned_objects );
+			
+			ApplyModificationsResults(m_IngredientsSorted, spawned_objects, NULL, player);
+			ApplyModificationsIngredients(m_IngredientsSorted, player);
+			
+			ApplySoftSkillsSpecialty(player);
+			
+			Do( m_IngredientsSorted, player, spawned_objects, m_Specialty );
+			
+			
+			DeleleIngredientsPass();
+		}
+		else
+		{
+			Debug.Log("CheckRecipe failed on server","recipes");
+		}
+	}
+
+	void ApplySoftSkillsSpecialty(PlayerBase player)
+	{
+		player.GetSoftSkillsManager().AddSpecialty(m_Specialty);
+	}	
+	
+	bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		//Debug.Log("Called Can Do on a recipe id:" + m_ID.ToString(),"recipes");
+		for ( int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			if (ingredients[i].GetInventory() && ingredients[i].GetInventory().AttachmentCount() > 0)
+				return false;
+		}
+		
+		return true;
+	}
+
+	void Do(ItemBase ingredients[], PlayerBase player, array<ItemBase> results, float specialty_weight)
+	{
+		//Debug.Log("Called Do on a recipe id:" + m_ID.ToString(),"recipes");
+	}
+
+	int GetID()
+	{
+		return m_ID;
+	}
+
+
+	void SetID(int id)
+	{
+		m_ID = id;
+	}
+
+	void GetAllItems(array<string> items)
+	{
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			array<string> ptr = m_Ingredients[i];
+			
+			for(int x = 0; x < ptr.Count(); x++)
+			{
+				items.Insert( ptr.Get(x) );
+			}
+		}
+	}
+	
+	string GetSoundCategory(int ingredientIndex, ItemBase item)
+	{
+		string itemType = item.GetType();
+		array<string> ptr = m_Ingredients[ingredientIndex];
+		
+		for (int x = 0; x < ptr.Count(); x++)
+		{
+			if (GetGame().IsKindOf(itemType, ptr.Get(x)))
+			{
+				return m_SoundCategories[ingredientIndex].Get(x);
+			}
+		}
+		return "";
+	}
+	
+	
+	
+
+	bool IsItemInRecipe(string item)
+	{
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			array<string> ptr = m_Ingredients[i];
+			
+			for(int x = 0; x < ptr.Count(); x++)
+			{
+				if( ptr.Get(x) == item ) return true;
+			}
+		}
+		return false;
+	}
+	//! returns a mask which marks ingredient positions for a given item in this recipe(for example mask of value 3 [....000011] means this item is both ingredient 1 and 2 in this recipe[from right to left])
+	int GetIngredientMaskForItem(string item)
+	{
+		int mask = 0;
+		
+		for(int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+		{
+			array<string> ptr = m_Ingredients[i];
+			
+			for(int x = 0; x < ptr.Count(); x++)
+			{
+				if( ptr.Get(x) == item )
+				{
+					mask = ((int)Math.Pow(2, i)) | mask;
+				}
+			}
+		}
+		return mask;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachHolster.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachHolster.c
new file mode 100644
index 0000000000000000000000000000000000000000..9caf2c3f257576e9dca363993d1216506b64a990
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachHolster.c
@@ -0,0 +1,77 @@
+class AttachHolster extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_AttachHolster0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierBlank");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"CarrierHolsterSolo");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierHolster");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient1.IsEmpty() && ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachHolsterPouch.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachHolsterPouch.c
new file mode 100644
index 0000000000000000000000000000000000000000..34a72cb3272b65c7b2a38d8fa6720e921c5d4484
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachHolsterPouch.c
@@ -0,0 +1,77 @@
+class AttachHolsterPouch extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_AttachHolsterPouch0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierPouches");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"CarrierHolsterSolo");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierComplete");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient1.IsEmpty() && ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachPouch.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachPouch.c
new file mode 100644
index 0000000000000000000000000000000000000000..6fbf94257e133a7325667cb9915091acb9c719cf
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachPouch.c
@@ -0,0 +1,77 @@
+class AttachPouch extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_AttachPouch0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierBlank");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"CarrierPouches");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierPouches");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient1.IsEmpty() && ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachPouchesHolster.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachPouchesHolster.c
new file mode 100644
index 0000000000000000000000000000000000000000..1e5e7ae599d70328e3624249cca2cff3e9fb7c0e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/AttachPouchesHolster.c
@@ -0,0 +1,77 @@
+class AttachPouchesHolster extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_AttachPouchesHolster0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierHolster");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"CarrierPouches");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierComplete");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient1.IsEmpty() && ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/BloodTest.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/BloodTest.c
new file mode 100644
index 0000000000000000000000000000000000000000..caa87dd5ab252739fa84c8de2e0723dce7542ca4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/BloodTest.c
@@ -0,0 +1,78 @@
+class BloodTest extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#test_blood";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"BloodTestKit");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BloodSyringe");//you can insert multiple ingredients this way
+		InsertIngredient(1,"BloodBagFull");//you can insert multiple ingredients this way
+		InsertIngredient(1,"BloodBagIV");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		//AddResult("");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient2;
+		Class.CastTo(ingredient2, ingredients[1]);
+		string type;
+		bool positive
+		string blood_type_name = BloodTypes.GetBloodTypeName(ingredient2.GetLiquidType(), type, positive);
+		string message = "#blood_type_result " + blood_type_name;
+		PlayerBase pb_Player;
+		Class.CastTo(pb_Player, player);
+		BloodContainerBase blood_container = BloodContainerBase.Cast(ingredient2);
+		blood_container.SetBloodTypeVisible( true );
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CleanRags.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CleanRags.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1a041e25e978f719b6698dc0da8bd8056fccdfa
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CleanRags.c
@@ -0,0 +1,131 @@
+class CleanRags extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#clean";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Rag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Pot");//you can insert multiple ingredients this way
+		InsertIngredient(1,"CanisterGasoline");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Canteen");//you can insert multiple ingredients this way
+		InsertIngredient(1,"WaterBottle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Vodka");//you can insert multiple ingredients this way
+		InsertIngredient(1,"WaterPouch_ColorBase");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Barrel_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		//AddResult("");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase rags;
+		Class.CastTo(rags, ingredients[0]);
+		ItemBase container;
+		Class.CastTo(container, ingredients[1]);
+		
+		if ( container.GetLiquidType() == LIQUID_WATER && container.GetQuantity() > 0 && rags.GetHealthLevel() > 1)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		/*
+		this function will clean the rags and consume the appropriate amount of cleaning liquid,
+		if there is insufficient liquid to cover the "repair", the rags will only repair proportionally
+		*/
+		//TODO implement SS 2.0 to amount of liquid used
+		ItemBase rags;
+		Class.CastTo(rags, ingredients[0]);
+		ItemBase container;
+		Class.CastTo(container, ingredients[1]);
+		
+		float 	rags_health 	= rags.GetHealth("","");
+		int 	rags_quantity 	= rags.GetQuantity();
+		
+		float 	rags_combined_damage = (100 - rags_health) * rags_quantity;
+		
+		int 	liquid_quantity = container.GetQuantity();
+		int 	liquid_required = rags_combined_damage * 2;
+		
+		float 	used_ratio = 0;
+		float	heal = 0;
+		
+		if( liquid_quantity > liquid_required )
+		{
+			container.AddQuantity(-liquid_required);
+			heal = 	rags_combined_damage / rags_quantity;
+		}
+		else
+		{
+			container.SetQuantity(0);
+			used_ratio = liquid_quantity / liquid_required;
+			heal = 	(rags_combined_damage / rags_quantity) * used_ratio;
+			
+		}
+		heal = Math.Clamp(heal, 0, (70 - rags_health));
+		rags.AddHealth("", "",heal);
+		/*
+		Debug.Log("liquid_quantity: "+ToString(liquid_quantity),"recipes");
+		Debug.Log("used_ratio: "+ToString(used_ratio),"recipes");
+		Debug.Log("rags_combined_damage: "+ToString(rags_combined_damage),"recipes");
+		Debug.Log("liquid_required: "+ToString(liquid_required),"recipes");
+		Debug.Log("healing applied: "+ToString(heal),"recipes");
+		*/
+		
+		/*
+		PluginTransmissionAgents mta = GetPlugin(PluginTransmissionAgents);
+		mta.RemoveAllAgents(rags);
+		*/
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CleanWeapon.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CleanWeapon.c
new file mode 100644
index 0000000000000000000000000000000000000000..a68a1434e5ae0caca89af2cb33a6903ab03b8c18
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CleanWeapon.c
@@ -0,0 +1,86 @@
+class CleanWeapon extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#repair";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = 1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WeaponCleaningKit");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"DefaultWeapon");
+		InsertIngredient(1,"DefaultMagazine");
+		InsertIngredient(1,"ItemSuppressor");
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		//AddResult("");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		PluginRepairing module_repairing;
+		Class.CastTo(module_repairing, GetPlugin(PluginRepairing));
+		ItemBase ingredient1;
+		Class.CastTo(ingredient1, ingredients[0]);
+		ItemBase ingredient2;
+		Class.CastTo(ingredient2, ingredients[1]);
+		return module_repairing.CanRepair(ingredient1,ingredient2);
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		PluginRepairing module_repairing;
+		Class.CastTo(module_repairing, GetPlugin(PluginRepairing));
+		PlayerBase playerPB;
+		Class.CastTo(playerPB, player);
+		ItemBase ingredient1;
+		Class.CastTo(ingredient1, ingredients[0]);
+		ItemBase ingredient2;
+		Class.CastTo(ingredient2, ingredients[1]);
+		module_repairing.Repair(playerPB, ingredient1,ingredient2,m_Specialty);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandFlag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandFlag.c
new file mode 100644
index 0000000000000000000000000000000000000000..33aeb1a3022a28de68e1aaaa0be00b3cff38cfd0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandFlag.c
@@ -0,0 +1,111 @@
+class CraftArmbandFlag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_craftarmband0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.8;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = -1;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredient(0,"Flag_Base");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;
+		m_IngredientDestroy[0] = 1;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = 0;
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		//result1
+		AddResult("Armband_");
+		m_ResultSetFullQuantity[0] = false;
+		m_ResultSetQuantity[0] = -1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;
+		m_ResultUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("Armband_");//single result
+		m_ResultSetFullQuantity[1] = false;
+		m_ResultSetQuantity[1] = -1;
+		m_ResultSetHealth[1] = -1;
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;
+		m_ResultUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result3
+		AddResult("Armband_");//single result
+		m_ResultSetFullQuantity[2] = false;
+		m_ResultSetQuantity[2] = -1;
+		m_ResultSetHealth[2] = -1;
+		m_ResultInheritsHealth[2] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[2] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[2] = -2;
+		m_ResultUseSoftSkills[2] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[2] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)
+	{
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandRag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandRag.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e029b07d21f7b50baf3dd1b9b83345b6acb4f02
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandRag.c
@@ -0,0 +1,65 @@
+class CraftArmbandRag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_craftarmband0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = 1;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredientEx(0,"Rag" 			,			"ImprovisedCloth_craft");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;
+		m_IngredientDestroy[0] = 0;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"SewingKit");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = -5;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = 0;
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		//AddResult("CombatKnife");//additional results, must be processed individually in Do method (as "results" parameter)
+		
+		
+		AddResult("Armband_White");//single result
+		
+		m_ResultSetFullQuantity[0] = 0;
+		m_ResultSetQuantity[0] = -1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandRaincoat.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandRaincoat.c
new file mode 100644
index 0000000000000000000000000000000000000000..c5b6b0f548d310d2a36211de6ffd8284935c6f19
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArmbandRaincoat.c
@@ -0,0 +1,132 @@
+class CraftArmbandRaincoat extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_craftarmband0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.8;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = -1;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredient(0,"Raincoat_ColorBase");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;
+		m_IngredientDestroy[0] = 1;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = 0;
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		//result1
+		AddResult("Armband_");
+		m_ResultSetFullQuantity[0] = false;
+		m_ResultSetQuantity[0] = -1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;
+		m_ResultUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("Armband_");//single result
+		m_ResultSetFullQuantity[1] = false;
+		m_ResultSetQuantity[1] = -1;
+		m_ResultSetHealth[1] = -1;
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;
+		m_ResultUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result3
+		AddResult("Armband_");//single result
+		m_ResultSetFullQuantity[2] = false;
+		m_ResultSetQuantity[2] = -1;
+		m_ResultSetHealth[2] = -1;
+		m_ResultInheritsHealth[2] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[2] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[2] = -2;
+		m_ResultUseSoftSkills[2] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[2] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result4
+		AddResult("Armband_");//single result
+		m_ResultSetFullQuantity[3] = false;
+		m_ResultSetQuantity[3] = -1;
+		m_ResultSetHealth[3] = -1;
+		m_ResultInheritsHealth[3] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[3] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[3] = -2;
+		m_ResultUseSoftSkills[3] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[3] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result5
+		AddResult("Armband_");//single result
+		m_ResultSetFullQuantity[4] = false;
+		m_ResultSetQuantity[4] = -1;
+		m_ResultSetHealth[4] = -1;
+		m_ResultInheritsHealth[4] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[4] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[4] = -2;
+		m_ResultUseSoftSkills[4] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[4] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)
+	{
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArrow.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArrow.c
new file mode 100644
index 0000000000000000000000000000000000000000..b8aedba2071c377cc2ce674c5fb1925a2176884f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArrow.c
@@ -0,0 +1,66 @@
+class CraftArrow extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftArrow0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"ChickenFeather");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -1;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Ammo_ArrowPrimitive");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArrowBone.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArrowBone.c
new file mode 100644
index 0000000000000000000000000000000000000000..6b9c0fc9d31383246f900603c6bfd91dc33a0cf9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftArrowBone.c
@@ -0,0 +1,67 @@
+class CraftArrowBone extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftArrowBone0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Ammo_ArrowPrimitive");//you can insert multiple ingredients this way
+		//TODO check whether ammho has "quantity" that can be read here
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Bone");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -1;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Ammo_ArrowBoned");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBait.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBait.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8822f306000a21ce5c692d6d771d9334611457b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBait.c
@@ -0,0 +1,67 @@
+class CraftBait extends RecipeBase	
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBait0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Worm");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Hook");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Bait");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo( ItemBase ingredients[], PlayerBase player )//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBaseBallBatBarbed.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBaseBallBatBarbed.c
new file mode 100644
index 0000000000000000000000000000000000000000..897febea1f918fce6657b13b624de01d91a495f5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBaseBallBatBarbed.c
@@ -0,0 +1,76 @@
+class CraftBaseBallBatBarbed extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftBaseBallBatBarbed0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = 12;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredient(0,"BarbedWire");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;
+		m_IngredientDestroy[0] = true;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BaseballBat");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[1] = 0;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = true;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		//AddResult("CombatKnife");//additional results, must be processed individually in Do method (as "results" parameter)
+		
+		
+		AddResult("BarbedBaseballBat");//single result
+		m_ResultSetFullQuantity[0] = 0;
+		m_ResultSetQuantity[0] = -1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = 1; //(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = 0;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	
+	override void Do( ItemBase ingredients[], PlayerBase player, array<ItemBase> results, float specialty_weight )//gets called upon recipe's completion
+	{
+		ItemBase gloves = ItemBase.Cast(player.FindAttachmentBySlotName("Gloves"));
+		if ( gloves && !gloves.IsDamageDestroyed() )
+			return;
+
+		int rand = Math.RandomIntInclusive(0,9);
+		if ( rand == 0 )
+		{
+			rand = Math.RandomIntInclusive(0,1);
+			if ( rand == 0 && !player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll") )
+			{
+				player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("RightForeArmRoll");
+			}
+			else if ( rand == 1 && !player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("RightForeArmRoll") )
+			{
+				player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll");
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBaseBallBatNailed.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBaseBallBatNailed.c
new file mode 100644
index 0000000000000000000000000000000000000000..32b859df96ff49789e4bafbd6f61c6a1bdfa205a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBaseBallBatNailed.c
@@ -0,0 +1,59 @@
+class CraftBaseBallBatNailed extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftBaseBallBatNailed0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = 12;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredient(0,"Nail");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -12;
+		m_IngredientDestroy[0] = false;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BaseballBat");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[1] = 0;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = true;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		//AddResult("CombatKnife");//additional results, must be processed individually in Do method (as "results" parameter)
+		
+		
+		AddResult("NailedBaseballBat");//single result
+		m_ResultSetFullQuantity[0] = 0;
+		m_ResultSetQuantity[0] = -1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = 1; //(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = 1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return true;
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBloodBagIV.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBloodBagIV.c
new file mode 100644
index 0000000000000000000000000000000000000000..699e1dad21af1898108e1f2a6bbe1b12c8523376
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBloodBagIV.c
@@ -0,0 +1,81 @@
+class CraftBloodBagIV extends RecipeBase	
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBloodBagIV0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"StartKitIV");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BloodBagFull");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("BloodBagIV");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient2;
+		Class.CastTo(ingredient2, ingredients[1]);
+		ItemBase result;
+		Class.CastTo(result, results.Get(0));
+
+		BloodContainerBase bloodBag;
+
+		if ( Class.CastTo( bloodBag, ingredient2) )
+		{
+			if ( bloodBag.GetBloodTypeVisible() )
+				BloodContainerBase.Cast(result).SetBloodTypeVisible( true );
+		}
+		
+		if( result)
+			MiscGameplayFunctions.TransferItemProperties(ingredient2,result, true, true, false, true);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneBait.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneBait.c
new file mode 100644
index 0000000000000000000000000000000000000000..8bc778be6f2ff07b9e4f79ef2e5a8d77c7104350
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneBait.c
@@ -0,0 +1,67 @@
+class CraftBoneBait extends RecipeBase	
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBoneBait0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Worm");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BoneHook");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("BoneBait");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo( ItemBase ingredients[], PlayerBase player )//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneHook.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneHook.c
new file mode 100644
index 0000000000000000000000000000000000000000..af8a1ebeb59ad23a7a96884fc4616c7dd91afea1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneHook.c
@@ -0,0 +1,93 @@
+class CraftBoneHook extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBoneHook0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Bone");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");	
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("BoneHook");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneKnife.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..3d31729992e9a7afd127ade5d02c8a0d9c84930a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBoneKnife.c
@@ -0,0 +1,72 @@
+class CraftBoneKnife extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBoneKnife0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"Bone","BoneKnife_stone");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Stone");//you can insert multiple ingredients this way
+		InsertIngredient(1,"SmallStone");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("BoneKnife");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient0;
+		Class.CastTo(ingredient0, ingredients[0]);
+		ItemBase result;
+		Class.CastTo(result, results.Get(0));
+		MiscGameplayFunctions.TransferItemProperties(ingredient0,result, false, true, true, true);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBow.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBow.c
new file mode 100644
index 0000000000000000000000000000000000000000..98e54cab1a982a32f642bbedbfd8d57754228b91
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBow.c
@@ -0,0 +1,77 @@
+class CraftBow extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBow0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Rope");//you can insert multiple ingredients this way
+		//InsertIngredient(0,"ImprovisedRope");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("QuickieBow");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBurlapStrips.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBurlapStrips.c
new file mode 100644
index 0000000000000000000000000000000000000000..f71320b7568a71a94f19e8083bfea4d9d8b302d0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftBurlapStrips.c
@@ -0,0 +1,93 @@
+class CraftBurlapStrips extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftBurlapStrips0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"BurlapSack");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("BurlapStrip");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCamoNetShelter.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCamoNetShelter.c
new file mode 100644
index 0000000000000000000000000000000000000000..f88d057b06fa06698e076a07ebd89f80ecfab8ec
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCamoNetShelter.c
@@ -0,0 +1,76 @@
+class CraftCamoNetShelter extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftCamoNetShelter0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"CamoNet");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("CamoNetShelter");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCookingStand.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCookingStand.c
new file mode 100644
index 0000000000000000000000000000000000000000..ad1372b8ed545c07fe4a4c319ca9349ffa1ca936
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCookingStand.c
@@ -0,0 +1,74 @@
+class CraftCookingStand extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftCookingStand0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = -1;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = -1;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		
+		//ingredient 1
+		InsertIngredient(0,"WoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -2;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");
+		InsertIngredient(1,"SharpWoodenStick");
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("CookingStand");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if(ingredients[1].IsEmpty())
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCourierBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCourierBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..b8b93b83f987606578d6b9694d97ce4d5017cebc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftCourierBag.c
@@ -0,0 +1,68 @@
+class CraftCourierBag extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftCourierBag0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"BurlapSack");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Rope");//you can insert multiple ingredients this way
+		//InsertIngredient(1,"ImprovisedRope");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("CourierBag");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftDrysackBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftDrysackBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..482e91cbf224a60152cb597e1afd114012ab0c0c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftDrysackBag.c
@@ -0,0 +1,67 @@
+class CraftDrysackBag: RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftDrysackBag";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WaterproofBag_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Rope");//you can insert multiple ingredients this way
+	
+		m_IngredientAddHealth[1] = -10;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		
+		AddResult("DrysackBag_");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFenceKit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFenceKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..87a0939db3180957d05320c9884738c60aabdd11
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFenceKit.c
@@ -0,0 +1,76 @@
+class CraftFenceKit extends RecipeBase
+{	
+	override void Init()
+	{
+		//m_Name = "#STR_CraftHandDrillKit0";
+		m_Name = "#STR_craftfencebase0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"Rope","ShelterKit_craft");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -2;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("FenceKit");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if ( ingredients[0].GetInventory().IsAttachment() )
+			return false;
+		if ( ingredients[1].GetInventory().IsAttachment() )
+			return false;
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		/*ItemBase fence_kit = results[0];
+		Rope rope = Rope.Cast(fence_kit.GetInventory().CreateAttachment("Rope"));
+		MiscGameplayFunctions.TransferItemProperties(ingredients[0],rope);*/
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFireplace.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFireplace.c
new file mode 100644
index 0000000000000000000000000000000000000000..0926395fe278eb4a3d6f5ceacd362b55bdcbe256
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFireplace.c
@@ -0,0 +1,150 @@
+class CraftFireplace extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftFireplace0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"WoodenStick" , 		"FireplaceDeploy");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"Firewood" , 			"FireplaceDeploy_firewood");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"Rag" , 				"FireplaceDeploy");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"BandageDressing" ,	"FireplaceDeploy");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"Paper" ,			 	"FireplaceDeploy");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"ItemBook" , 			"FireplaceDeploy");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"Bark_Birch" , 		"FireplaceDeploy");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"Bark_Oak" , 			"FireplaceDeploy");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Firewood");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Rag");//you can insert multiple ingredients this way
+		InsertIngredient(1,"BandageDressing");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Paper");//you can insert multiple ingredients this way
+		InsertIngredient(1,"GiftWrapPaper");//you can insert multiple ingredients this way
+		InsertIngredient(1,"ItemBook");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Bark_Birch");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Bark_Oak");//you can insert multiple ingredients this way
+		InsertIngredient(1,"EyeMask_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Fireplace");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		if ( ingredient1.Type() == ingredient2.Type() || ingredient1.GetInventory().GetSlotId(0) == ingredient2.GetInventory().GetSlotId(0) )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+	override void Do( ItemBase ingredients[], PlayerBase player, array<ItemBase> results, float specialty_weight )//gets called upon recipe's completion
+	{
+		ItemBase result = ItemBase.Cast( results.Get( 0 ) );
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		//clear inventory reservation
+		if ( !GetGame().IsMultiplayer() )
+		{
+			InventoryLocation loc = new InventoryLocation;
+			ingredient1.GetInventory().GetCurrentInventoryLocation( loc );
+			player.GetInventory().ClearInventoryReservationEx( ingredient1, loc );
+			ingredient2.GetInventory().GetCurrentInventoryLocation( loc );
+			player.GetInventory().ClearInventoryReservationEx( ingredient2, loc );			
+		}
+		
+		//Ingredient 1
+		if ( ingredient1.GetQuantity() <= 0 )
+		{
+			if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			{
+				player.ServerTakeEntityToTargetAttachment( result, ingredient1 ); // multiplayer server side
+			}
+			else
+			{
+				player.LocalTakeEntityToTargetAttachment( result, ingredient1 ); // single player or multiplayer client side
+			}
+		}
+		else
+		{
+			string ingredient1_classname = ingredient1.GetType();
+			ItemBase attachment1 = ItemBase.Cast( result.GetInventory().CreateAttachment( ingredient1_classname ) );
+			MiscGameplayFunctions.TransferItemProperties( ingredient1, attachment1 );
+			attachment1.SetQuantity( 1 );
+			attachment1.SetCleanness(0);
+			
+			//set quantity to ingredient
+			ingredient1.AddQuantity( -1 );
+		}
+		
+		//Ingredient 2
+		if ( ingredient2.GetQuantity() <= 0 )
+		{
+			if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			{
+				player.ServerTakeEntityToTargetAttachment( result, ingredient2 ); // multiplayer server side
+			}
+			else
+			{
+				player.LocalTakeEntityToTargetAttachment( result, ingredient2 ); // single player or multiplayer client side
+			}
+		}
+		else
+		{
+			string ingredient2_classname = ingredient2.GetType();
+			ItemBase attachment2 = ItemBase.Cast( result.GetInventory().CreateAttachment( ingredient2_classname ) );
+			MiscGameplayFunctions.TransferItemProperties( ingredient2, attachment2 );
+			attachment2.SetQuantity( 1 );
+			attachment2.SetCleanness(0);
+			//set quantity to ingredient
+			ingredient2.AddQuantity( -1 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFishNetTrap.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFishNetTrap.c
new file mode 100644
index 0000000000000000000000000000000000000000..50732398c57f227a3e3e42b5efe10037c2c0607e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFishNetTrap.c
@@ -0,0 +1,67 @@
+class CraftFishNetTrap extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftFishNetTrap0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Netting");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+
+		//ingredient 2
+		InsertIngredient(1,"MetalWire");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -1;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+
+		//result1
+		AddResult("FishNetTrap");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFishingRod.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFishingRod.c
new file mode 100644
index 0000000000000000000000000000000000000000..e47777db97e81282894613ae390e6d0ee4ce12c2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftFishingRod.c
@@ -0,0 +1,78 @@
+class CraftFishingRod extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftFishingRod0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Rope");//you can insert multiple ingredients this way
+		//InsertIngredient(0,"ImprovisedRope");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"SharpWoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("ImprovisedFishingRod");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient2 = ingredients[1];
+		
+		if( ingredient2.IsEmpty() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGasMask_Filter_Improvised.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGasMask_Filter_Improvised.c
new file mode 100644
index 0000000000000000000000000000000000000000..d92336a385c4ed34159540ebe38bc177420dccd0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGasMask_Filter_Improvised.c
@@ -0,0 +1,67 @@
+class CraftGasMask_Filter_Improvised extends RecipeBase	
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftImprovisedFilter";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WaterBottle");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"NioshFaceMask");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GasMask_Filter_Improvised");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 0;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo( ItemBase ingredients[], PlayerBase player )//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieAttachment.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieAttachment.c
new file mode 100644
index 0000000000000000000000000000000000000000..6197c403f13a3e5c62eb60c82dc597a617b0b30b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieAttachment.c
@@ -0,0 +1,67 @@
+class CraftGhillieAttachment extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGhillieAttachment0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Netting");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BurlapStrip");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -2;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GhillieAtt_Tan");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieBushrag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieBushrag.c
new file mode 100644
index 0000000000000000000000000000000000000000..d5065d976ef0965a085697a3580904f0ce1ebccd
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieBushrag.c
@@ -0,0 +1,67 @@
+class CraftGhillieBushrag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGhillieBushrag0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 4;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Netting");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -2;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BurlapStrip");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -4;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GhillieBushrag_Tan");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieHood.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieHood.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f8935dd54f5a46c0807eeee0aa979b42ce8e7d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieHood.c
@@ -0,0 +1,67 @@
+class CraftGhillieHood extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGhillieHood0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Netting");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BurlapStrip");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -2;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GhillieHood_Tan");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieSuit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieSuit.c
new file mode 100644
index 0000000000000000000000000000000000000000..c76ac6f4c29966c393e933cceb2cbe3542c01e9f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieSuit.c
@@ -0,0 +1,67 @@
+class CraftGhillieSuit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGhillieSuit0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 4;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 10;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Netting");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -4;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BurlapStrip");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -10;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GhillieSuit_Tan");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieTop.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieTop.c
new file mode 100644
index 0000000000000000000000000000000000000000..76efdc59bf2851d558403ef851b1892184d4d2a7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGhillieTop.c
@@ -0,0 +1,67 @@
+class CraftGhillieTop extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGhillieTop0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 3;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 6;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Netting");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -3;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"BurlapStrip");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -6;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GhillieTop_Tan");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGorkaHelmetComplete.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGorkaHelmetComplete.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff6d5f8c4746ba71abfbace3db37855ad2135bee
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGorkaHelmetComplete.c
@@ -0,0 +1,66 @@
+class CraftGorkaHelmetComplete extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGorkaHelmetComplete0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GorkaHelmet");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"GorkaHelmetVisor");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("GorkaHelmetComplete_");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)
+	{
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGutsRope.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGutsRope.c
new file mode 100644
index 0000000000000000000000000000000000000000..3ef121c56a94911073b235b6ba7c2624f08d2139
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftGutsRope.c
@@ -0,0 +1,89 @@
+class CraftGutsRope extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftGutsRope0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 250;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Guts");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Rope");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftHandDrillKit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftHandDrillKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..acf5ecc4d43aa519f214a6f90bb49391d45efc98
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftHandDrillKit.c
@@ -0,0 +1,69 @@
+class CraftHandDrillKit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftHandDrillKit0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"Bark_Oak" 		, "HandDrill_craft");//you can insert multiple ingredients this way
+		InsertIngredientEx(0,"Bark_Birch" 		, "HandDrill_craft");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -1;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("HandDrillKit");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..ad2f567b76bca21ab77339424ab62e7075c62997
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedBag.c
@@ -0,0 +1,71 @@
+class CraftImprovisedBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftImprovisedBag0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 3;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -3;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"CourierBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("ImprovisedBag");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if (ingredients[1].IsEmpty())
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedExplosive.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedExplosive.c
new file mode 100644
index 0000000000000000000000000000000000000000..32c2cbbddbb901b30821710b0f5b31ddfc9564d2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedExplosive.c
@@ -0,0 +1,68 @@
+class CraftImprovisedExplosive extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftImprovisedExplosive";
+
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"SmallProtectorCase" , 			"ImprovisedExplosive");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -3;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"ElectronicRepairKit");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("ImprovisedExplosive");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedLeatherBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedLeatherBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..45bd291f5e7c6e34b6b031d140f7e8f3ea80059d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftImprovisedLeatherBag.c
@@ -0,0 +1,71 @@
+class CraftImprovisedLeatherBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftImprovisedLeatherBag0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 3;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -3;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"FurCourierBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("FurImprovisedBag");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if (ingredients[1].IsEmpty())
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLeatherCourierBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLeatherCourierBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..c0772765ecfecd53afb2cdc6ef15f66193f9b157
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLeatherCourierBag.c
@@ -0,0 +1,68 @@
+class CraftLeatherCourierBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftLeatherCourierBag0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WildboarPelt");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Rope");//you can insert multiple ingredients this way
+		//InsertIngredient(1,"ImprovisedRope");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("FurCourierBag");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLeatherSack.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLeatherSack.c
new file mode 100644
index 0000000000000000000000000000000000000000..297e2bf57d6feaeb33b30094280e2ad5d81cbc31
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLeatherSack.c
@@ -0,0 +1,65 @@
+class CraftLeatherSack extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftLeatherSack0";//"CRAFT LEATHER SACK";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"TannedLeather");//you can insert multiple ingredients this way
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -2;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LeatherSewingKit");//you can insert multiple ingredients this way
+	
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -10;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("LeatherSack_Brown");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLongTorch.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLongTorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..0796602870453b9e77f0f47d50fba19512fe437b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftLongTorch.c
@@ -0,0 +1,86 @@
+class CraftLongTorch extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftTorch0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Rag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"SharpWoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -1;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("LongTorch");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return super.CanDo(ingredients, player);
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+		
+		ItemBase rag = ingredients[0];
+		rag.SetCleanness(0);
+		Torch torch = Torch.Cast(results[0]);
+		torch.SetTorchDecraftResult(ingredients[1].GetType());
+		
+		if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+		{
+			player.ServerTakeEntityToTargetAttachment(torch, rag);
+			
+		}
+		else if ( !GetGame().IsMultiplayer() )
+		{
+			player.LocalTakeEntityToTargetAttachment(torch, rag);
+		}
+		
+		torch.StandUp();
+		torch.CraftingInit(rag.GetQuantity());
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftMetalWire.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftMetalWire.c
new file mode 100644
index 0000000000000000000000000000000000000000..ee7eace6ddb7cc6e0ac6b001558bf9ef55705eec
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftMetalWire.c
@@ -0,0 +1,72 @@
+class CraftMetalWire extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_craftMetalWire";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+		
+		m_AnywhereInInventory = false;//is this recipe valid even when neither of the items is in hands
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"BarbedWire");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Pliers");
+		
+		m_IngredientAddHealth[1] = -0.5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("MetalWire");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+	
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		// We will save the wire type for decrafting
+		MetalWire wire = MetalWire.Cast( results[0] );
+		if ( wire )
+		{
+			int health = wire.GetHealthLevel();
+			health++;
+			Print(health);
+			wire.SetHealth01("","", 1 - 0.3*health);
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRabbitSnare.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRabbitSnare.c
new file mode 100644
index 0000000000000000000000000000000000000000..7659c1fdc73863b9037a50791ffc353c8458037e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRabbitSnare.c
@@ -0,0 +1,69 @@
+class CraftRabbitSnare extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftRabbitSnare0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"MetalWire");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("RabbitSnareTrap");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		//turned off for beta
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRag.c
new file mode 100644
index 0000000000000000000000000000000000000000..eab165a28e10fe899e9dc247829ac4da4362af94
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRag.c
@@ -0,0 +1,110 @@
+class CraftRag extends RecipeBase	
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftRag0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(0,"Hacksaw");
+		InsertIngredient(0,"HandSaw");
+		InsertIngredient(0,"KitchenKnife");
+		InsertIngredient(0,"SteakKnife");
+		InsertIngredient(0,"HayHook");
+		InsertIngredient(0,"StoneKnife");
+		InsertIngredient(0,"Cleaver");
+		InsertIngredient(0,"CombatKnife");
+		InsertIngredient(0,"HuntingKnife");
+		InsertIngredient(0,"KukriKnife");
+		InsertIngredient(0,"FangeKnife");
+		InsertIngredient(0,"Machete");
+		InsertIngredient(0,"CrudeMachete");
+		InsertIngredient(0,"OrientalMachete");
+		InsertIngredient(0,"Screwdriver");
+		InsertIngredient(0,"Crowbar");
+		InsertIngredient(0,"Pickaxe");
+		InsertIngredient(0,"WoodAxe");
+		InsertIngredient(0,"Hatchet");
+		InsertIngredient(0,"FirefighterAxe");
+		InsertIngredient(0,"Sword");
+		InsertIngredient(0,"AK_Bayonet");
+		InsertIngredient(0,"M9A1_Bayonet");
+		InsertIngredient(0,"Mosin_Bayonet");
+		InsertIngredient(0,"SKS_Bayonet");	
+		InsertIngredient(0,"FarmingHoe");
+		InsertIngredient(0,"Shovel");
+		InsertIngredient(0,"FieldShovel");
+		InsertIngredient(0,"BoneKnife");	
+	
+		m_IngredientAddHealth[0] = -10;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		
+		InsertIngredientEx(1,"Inventory_Base" ,			 "Rags_craft");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Rag");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient2 = ingredients[1];
+		if( ingredient2.ConfigGetFloat("ragQuantity") > 0 && ingredient2.IsEmpty())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase result;
+		Class.CastTo(result, results.Get(0));
+		ItemBase ingredient2 = ingredients[1];
+		int quantity = ingredient2.ConfigGetFloat("ragQuantity");
+		
+		result.SetQuantity(quantity);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRagRope.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRagRope.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2cefd370ab39803c32daed2b2d71ad8f33e61b1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftRagRope.c
@@ -0,0 +1,67 @@
+class CraftRagRope extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftRagRope0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 6;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 6;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Rag");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -6;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Rag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -6;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Rope");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSalineBagIV.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSalineBagIV.c
new file mode 100644
index 0000000000000000000000000000000000000000..31e00a245a23e67fcb8737a7ef74a7c540ac18d8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSalineBagIV.c
@@ -0,0 +1,74 @@
+class CraftSalineBagIV extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftSalineBagIV0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"StartKitIV");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"SalineBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("SalineBagIV");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient2;
+		Class.CastTo(ingredient2, ingredients[1]);
+		ItemBase result;
+		Class.CastTo(result, results.Get(0));
+		
+		if( result )
+			MiscGameplayFunctions.TransferItemProperties(ingredient2,result, true, true, false, true);
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftShelterKit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftShelterKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..adc82e666ea07c734bf376c5e91a57bddc7c5286
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftShelterKit.c
@@ -0,0 +1,71 @@
+class CraftShelterKit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftShelterKit0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 4;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"Rope","ShelterKit_craft");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -4;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("ShelterKit");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if ( ingredients[0].GetInventory().IsAttachment() )
+			return false;
+		if ( ingredients[1].GetInventory().IsAttachment() )
+			return false;
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSmallFishTrap.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSmallFishTrap.c
new file mode 100644
index 0000000000000000000000000000000000000000..454778b9df648c2be7eedc16b294e25dfc142729
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSmallFishTrap.c
@@ -0,0 +1,93 @@
+class CraftSmallFishTrap extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftSmallFishTrap0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WaterBottle");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -10;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("SmallFishTrap");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSpearBone.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSpearBone.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1cace8bbc30fcf0f53a749d2f92c40a0d66a663
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSpearBone.c
@@ -0,0 +1,74 @@
+class CraftSpearBone extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftSpear0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"BoneKnife");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"SharpWoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------+
+		
+		//result1
+		AddResult("SpearBone");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = 1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase stick = ingredients[1];
+		
+		if(stick.GetInventory().AttachmentCount() == 0)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSpearStone.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSpearStone.c
new file mode 100644
index 0000000000000000000000000000000000000000..12af36c4958efe952a9525c66595e281c2c02328
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSpearStone.c
@@ -0,0 +1,74 @@
+class CraftSpearStone extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftSpear0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable che
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"StoneKnife");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"LongWoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"SharpWoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("SpearStone");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = 1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase stick = ingredients[1];
+		
+		if(stick.GetInventory().AttachmentCount() == 0)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSplint.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSplint.c
new file mode 100644
index 0000000000000000000000000000000000000000..1739a2cfb333dcf6efaaafe9d1583da6d8958abc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSplint.c
@@ -0,0 +1,116 @@
+class CraftSplint extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftSplint0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		//In the context of this recipe Check CanDo method as Rags can be stacked but bandages can't
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check 
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"BandageDressing");//you can insert multiple ingredients this way
+		InsertIngredient(0,"Rag");//you can insert multiple ingredients this way
+		InsertIngredient(0,"DuctTape");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -2;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Splint");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		if (ingredient1.Type() == BandageDressing)
+		{
+			if (ingredient1.GetQuantity() == ingredient1.GetQuantityMax())
+			{
+				return true;
+			}
+			return false;
+		}
+		
+		if (ingredient1.Type() == Rag)
+		{
+			if (ingredient1.GetQuantity() >= 4)
+				return true;
+			
+			return false;
+		}
+		
+		if (ingredient1.Type() == DuctTape)
+		{
+			if (ingredient1.GetQuantity() >= (ingredient1.GetQuantityMax()/2))
+				return true;
+			
+			return false;
+		}
+		
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+		
+		ItemBase ingredient1 = ingredients[0];
+		
+		if (ingredients[0].Type() == Rag)
+		{
+			//Print("Are we getting here?");
+			ingredient1.AddQuantity(-4);
+		}
+		
+		if (ingredients[0].Type() == BandageDressing)
+		{
+			//Print("We also get here then");
+			ingredient1.AddQuantity(-ingredient1.GetQuantityMax());
+		}
+		
+		if (ingredients[0].Type() == DuctTape)
+		{
+			//Print("We also get here then");
+			ingredient1.AddQuantity(-ingredient1.GetQuantityMax()/2);
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftStoneKnife.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftStoneKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..8bd182d430196aa402b7bf8388b3f64d0b0bc684
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftStoneKnife.c
@@ -0,0 +1,74 @@
+class CraftStoneKnife extends RecipeBase
+{	
+	override void Init()
+	{
+		
+		m_Name = "#STR_CraftStoneKnife0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"SmallStone");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"SmallStone");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Stone");//you can insert multiple ingredients this way
+
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("StoneKnife");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient0;
+		Class.CastTo(ingredient0, ingredients[0]);
+		ItemBase result;
+		Class.CastTo(result, results.Get(0));
+		MiscGameplayFunctions.TransferItemProperties(ingredient0,result, false, true, true, true);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSuppressor.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSuppressor.c
new file mode 100644
index 0000000000000000000000000000000000000000..34999d9d4b129d3e56aba4eb052373adf0f90c64
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftSuppressor.c
@@ -0,0 +1,67 @@
+class CraftSuppressor extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftSuppressor0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 25;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WaterBottle");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"DuctTape");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -25;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("ImprovisedSuppressor");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTannedLeather.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTannedLeather.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f6fb6e20ae69913db8bf88fd208b1d86b438cb3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTannedLeather.c
@@ -0,0 +1,115 @@
+class CraftTannedLeather extends RecipeBase
+{
+	float m_PercentageUsed = 0.05; 				//Variable used to define relative quantity of Lime used when crafting tanned leather
+	
+	//Init Leather crafting recipe
+	override void Init()
+	{
+		m_Name = "#STR_CraftTannedLeather0";
+		m_IsInstaRecipe = false;				//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;					//animation length in relative time units
+		m_Specialty = 0.02;						// value > 0 for roughness, value < 0 for precision
+		
+		m_AnywhereInInventory = true;
+		//conditions
+		m_MinDamageIngredient[0] = -1;			//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;			//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;		//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;		//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;			//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;			//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;		//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;		//-1 = disable check
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0, "Pelt_Base");		//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;			// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; 			// -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;		// 0 = do nothing
+		m_IngredientDestroy[0] = true;			//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;	// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1, "GardenLime");		//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;			// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; 			// -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;			// 0 = do nothing
+		m_IngredientDestroy[1] = false;			//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[1] = false;	// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("TannedLeather");				//add results here
+
+		m_ResultSetFullQuantity[0] = false;		//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1; 			//-1 = do nothing
+		m_ResultSetHealth[0] = -1;				//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;			// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;			// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;			//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;		// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;		// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+	
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		
+		//return true;
+		Pelt_Base ingredient1 = Pelt_Base.Cast(ingredients[0]);
+		ItemBase ingredient2 = ingredients[1]; //The garden lime
+		
+		//Evaluate the amount of Lime required to craft leather from Pelt (percentage based)
+		float yieldQuantity =  ingredient1.ConfigGetFloat("leatherYield");
+		float qtyModifier = (4 - ingredient1.GetHealthLevel(""))/4; // Normalize the health level so Pristine is 1 and Ruined is 0
+		yieldQuantity = yieldQuantity * qtyModifier;
+
+		float m_NeededQuantity = (ingredient2.GetQuantityMax() * m_PercentageUsed) * yieldQuantity; 
+		if( ingredient1.ConfigGetFloat("leatherYield") >= 0 && ingredient2.GetQuantity() >= m_NeededQuantity)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	
+	}
+
+	
+	override void Do( ItemBase ingredients[], PlayerBase player, array<ItemBase> results, float specialty_weight )//gets called upon recipe's completion
+	{
+		Debug.Log("Craft Tanned Leather","recipes");
+		
+		ItemBase result;
+		Class.CastTo(result, results.Get(0));
+		ItemBase ingredient1 = ingredients[0];
+		
+		//Set tanned leather output quantity
+		int quantity = ingredient1.ConfigGetFloat("leatherYield");
+		float qtyModifier = (4 - ingredient1.GetHealthLevel(""))/4; // Normalize the health level so Pristine is 1 and Ruined is 0
+		quantity = quantity * qtyModifier;
+
+		result.SetQuantity(quantity);
+		
+		//Use X% of GardenLime for each tanned leather item crafted
+		ItemBase gardenLime = ingredients[1];
+		float usedLime = (gardenLime.GetQuantityMax() * m_PercentageUsed) * quantity;
+		gardenLime.SetQuantity(gardenLime.GetQuantity() - usedLime);
+
+		result.SetHealthMax("","");
+		
+		//Split stack if returned quantity over Max stack
+		if (quantity > result.GetQuantityMax())
+		{
+			//Allow spawn of a second stack of tanned leather
+			MiscGameplayFunctions.CreateItemBasePiles("TannedLeather", player.GetPosition(), (quantity - 8), result.GetMaxHealth() ,false);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTerritoryFlagKit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTerritoryFlagKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e5c92293e51514029665cb923737fef75b30c3e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTerritoryFlagKit.c
@@ -0,0 +1,86 @@
+class CraftTerritoryFlagKit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#craft_territoryflag_kit";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 3;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"Rope","ShelterKit_craft");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -3;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("TerritoryFlagKit");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		/*int slot_id_junk;
+		string slot_string;
+		if ( ingredients[0].GetInventory().GetCurrentAttachmentSlotInfo(slot_id_junk,slot_string) )
+		{
+			return false;
+		}
+		if ( ingredients[1].GetInventory().GetCurrentAttachmentSlotInfo(slot_id_junk,slot_string) )
+		{
+			return false;
+		}*/
+		if ( ingredients[0].GetInventory().IsAttachment() )
+			return false;
+		if ( ingredients[1].GetInventory().IsAttachment() )
+			return false;
+		
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		/*ItemBase fence_kit = results[0];
+		Rope rope = Rope.Cast(fence_kit.GetInventory().CreateAttachment("Rope"));
+		MiscGameplayFunctions.TransferItemProperties(ingredients[0],rope);*/
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTorch.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..644305e5106aa6771ee08e07137d254768130118
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTorch.c
@@ -0,0 +1,89 @@
+class CraftTorch extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftTorch0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Rag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -1;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Torch");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+		
+		ItemBase rag = ingredients[0];
+		rag.SetCleanness(0);
+		Torch torch = Torch.Cast(results[0]);
+		if (torch)
+		{
+			torch.SetTorchDecraftResult(ingredients[1].GetType());
+			
+			if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+			{
+				player.ServerTakeEntityToTargetAttachment(torch, rag);
+			}
+			else if ( !GetGame().IsMultiplayer() )
+			{
+				int slotID = InventorySlots.GetSlotIdFromString("Rags");
+				player.PredictiveTakeEntityToTargetAttachmentEx(torch, rag,slotID);
+	
+			}
+			torch.StandUp();
+			torch.CraftingInit(rag.GetQuantity());
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTripWire.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTripWire.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab78143659138a4e2aa1ad5fa7312dc44d03a81d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTripWire.c
@@ -0,0 +1,80 @@
+class CraftTripWire extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftTripWire0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 2;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -2;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"MetalWire");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("TripwireTrap");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		// We will save the wire type for decrafting
+		TripwireTrap tripWire = TripwireTrap.Cast( results[0] );
+		if ( tripWire )
+		{
+			if ( ingredients[1].IsInherited( MetalWire ) )
+				tripWire.SetWireType( eWireMaterial.WIRE );
+			//Variants to make the trap out of rope or barbed wire
+			/*
+			else if ( ingredients[1].IsInherited( BarbedWire ) )
+				tripWire.SetWireType( eWireMaterial.BARBED_WIRE );
+			else if ( ingredients[1].IsInherited( Rope ) )
+				tripWire.SetWireType( eWireMaterial.ROPE );
+			*/
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTruck01DoubleWheel.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTruck01DoubleWheel.c
new file mode 100644
index 0000000000000000000000000000000000000000..63ac69eb46362c589fbfcb93057ef998417f3e37
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftTruck01DoubleWheel.c
@@ -0,0 +1,97 @@
+class CraftTruck01DoubleWheel extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_CraftTruck01DoubleWheel0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Truck_01_Wheel");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = -1;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Truck_01_Wheel");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = -1;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Truck_01_WheelDouble");//add results here
+		
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		Truck_01_Wheel ingredient1 = Truck_01_Wheel.Cast(ingredients[0]);
+		Truck_01_Wheel ingredient2 = Truck_01_Wheel.Cast(ingredients[1]);
+		
+		if (!ingredient1 || !ingredient2)
+			return false;
+		
+		if ( !ingredient1.GetHierarchyParent() || ingredient1.GetHierarchyParent() == ingredient1.GetHierarchyRootPlayer() ) 
+		{
+			if ( !ingredient2.GetHierarchyParent() || ingredient2.GetHierarchyParent() == ingredient2.GetHierarchyRootPlayer() )
+				return true;
+			else
+				return false;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		vector ingred_pos;
+		
+		if(ingredient1.GetHierarchyRootPlayer())
+		{
+			ingred_pos = ingredient2.GetPosition();
+		}
+		else
+		{
+			ingred_pos = ingredient1.GetPosition();
+		}
+		
+		ItemBase result1 = results.Get(0);
+		result1.SetPosition(ingred_pos);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWatchtowerKit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWatchtowerKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..c86beaf341259379ba999e3965068d39fbc0177d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWatchtowerKit.c
@@ -0,0 +1,75 @@
+class CraftWatchtowerKit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#craft_watchtower_kit";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 4;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredientEx(0,"Rope","ShelterKit_craft");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"WoodenStick");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Ammo_SharpStick");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -4;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WatchtowerKit");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if ( ingredients[0].GetInventory().IsAttachment() )
+			return false;
+		if ( ingredients[1].GetInventory().IsAttachment() )
+			return false;
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		/*ItemBase fence_kit = results[0];
+		Rope rope = Rope.Cast(fence_kit.GetInventory().CreateAttachment("Rope"));
+		MiscGameplayFunctions.TransferItemProperties(ingredients[0],rope);*/
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWitchHoodCoif.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWitchHoodCoif.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ba73793ebad96cbfeae6a978b4e0cd8f85bdfcd
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWitchHoodCoif.c
@@ -0,0 +1,67 @@
+class CraftWitchHoodCoif: RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftArmoredHood";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WitchHood_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Chainmail_Coif");//you can insert multiple ingredients this way
+	
+		m_IngredientAddHealth[1] = -10;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = true;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		
+		AddResult("WitchHoodCoif_");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWoodenCrate.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWoodenCrate.c
new file mode 100644
index 0000000000000000000000000000000000000000..6224d0ddd20d6a394fe2a7649241ca0c69c5ac0f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWoodenCrate.c
@@ -0,0 +1,67 @@
+class CraftWoodenCrate extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#craft " + "#STR_cfgvehicles_wooden_case0"; //oink, create proper string
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 8;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 16;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenPlank");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -8;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Nail");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -16;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenCrate");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWoodenPlank.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWoodenPlank.c
new file mode 100644
index 0000000000000000000000000000000000000000..699df9719dfe5f749a476bf078f06b38682fa2fb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CraftWoodenPlank.c
@@ -0,0 +1,67 @@
+class CraftWoodenPlank extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_CraftWoodenPlank0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.01;// value > 0 for roughness, value < 0 for precision
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenLog");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		
+		m_IngredientAddHealth[1] = -7;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenPlank");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 4;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutPepperSeeds.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutPepperSeeds.c
new file mode 100644
index 0000000000000000000000000000000000000000..22ab110661580deb54af6ae0643cec01bff01b56
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutPepperSeeds.c
@@ -0,0 +1,89 @@
+class CutOutPepperSeeds extends CutOutSeeds
+{	
+	override void Init()
+	{
+		m_Name = "#STR_cutoutseeds0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GreenBellPepper");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PepperSeeds");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 12;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -1;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		 super.Do( ingredients, player, results, specialty_weight);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutPumpkinSeeds.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutPumpkinSeeds.c
new file mode 100644
index 0000000000000000000000000000000000000000..8046a50fadab5a3114715107b7c5b79df6583dd8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutPumpkinSeeds.c
@@ -0,0 +1,150 @@
+class CutOutPumpkinSeeds extends CutOutSeeds
+{	
+	override void Init()
+	{
+		m_Name = "#STR_prepare0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Pumpkin");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"FarmingHoe");
+		InsertIngredient(1,"Shovel");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Hammer");
+		InsertIngredient(1,"Mace");
+		InsertIngredient(1,"Wrench");
+		InsertIngredient(1,"LugWrench");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"SledgeHammer");
+		InsertIngredient(1,"BaseballBat");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -0.5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PumpkinSeeds");//add results here
+		
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 12;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	
+		
+		//result2
+		AddResult("SlicedPumpkin");//add results here
+		
+		m_ResultSetFullQuantity[1] = true;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = 1;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	
+		AddResult("SlicedPumpkin");//add results here
+
+		m_ResultSetFullQuantity[2] = true;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[2] = -1;//-1 = do nothing
+		m_ResultSetHealth[2] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[2] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[2] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[2] = 1;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[2] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[2] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		if ( player.IsPlacingLocal() )
+			return false;
+		
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player, array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{		
+		ItemBase pumpkin = ingredients[0];
+
+		ItemBase slice1 = results[1];	
+		ItemBase slice2 = results[2];
+		
+		float quantityMultiplier = pumpkin.GetHealth01("",""); 
+		float quantityNorm = pumpkin.GetQuantity()/pumpkin.GetQuantityMax();
+		
+		quantityMultiplier *= quantityNorm;
+		
+		if ( pumpkin )
+		{
+			if ( slice1 )
+			{
+				slice1.SetQuantityNormalized(quantityMultiplier);
+				MiscGameplayFunctions.TransferItemProperties(pumpkin, slice1);
+			}
+			
+			if ( slice2 )
+			{
+				slice2.SetQuantityNormalized(quantityMultiplier);
+				MiscGameplayFunctions.TransferItemProperties(pumpkin, slice2);
+			}	
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutSeeds.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutSeeds.c
new file mode 100644
index 0000000000000000000000000000000000000000..b53f327c5af7b7a01747aee8ec31c03d617bf3b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutSeeds.c
@@ -0,0 +1,61 @@
+class CutOutSeeds extends RecipeBase
+{	
+	override void Init()
+	{
+		
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player, array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		// Adjusts quantity of results to the quantity of the 1st ingredient
+		Edible_Base item_ingredient = Edible_Base.Cast(ingredients[0]);
+		
+		float MaxQuantity = item_ingredient.GetQuantityMax();
+		float CurrentQuantity = item_ingredient.GetQuantity();
+		float qtPercentage = CurrentQuantity / MaxQuantity;
+		
+		FoodStageType stage = item_ingredient.GetFoodStageType();
+		
+		float seedMultiplier = Math.RandomFloat(0.5, 1);		
+		
+		//Set seeds amount proportional to ingredient quantity. No seeds if the is less that 30% of ingredient
+		if(qtPercentage < 0.3)
+			seedMultiplier = 0;
+		else
+			seedMultiplier *= qtPercentage;
+		
+		//Set seeds amount based on the stage of the ingredient
+		switch(stage)
+		{
+			case FoodStageType.BURNED:
+			case FoodStageType.BOILED:
+			case FoodStageType.BAKED:
+				seedMultiplier *= 0;
+				break;
+			case FoodStageType.DRIED:
+			case FoodStageType.ROTTEN:
+				seedMultiplier *= 0.5;
+				break;	
+			case FoodStageType.RAW:
+			default:
+				seedMultiplier *= 1;
+				break;
+		}
+		
+		ItemBase result = results[0];
+		float maxQuantity = result.GetQuantityMax();
+		float resultQty = m_ResultSetQuantity[0]/ maxQuantity;
+		resultQty *= seedMultiplier * maxQuantity;
+		
+		resultQty = Math.Ceil(resultQty);
+		
+		result.SetQuantity(resultQty);
+		
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutTomatoSeeds.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutTomatoSeeds.c
new file mode 100644
index 0000000000000000000000000000000000000000..7564487d01d5bcf8d565b8ad39ea6008c27e6e8a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutTomatoSeeds.c
@@ -0,0 +1,89 @@
+class CutOutTomatoSeeds extends CutOutSeeds
+{	
+	override void Init()
+	{
+		m_Name = "#STR_cutoutseeds0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Tomato");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("TomatoSeeds");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 8;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -1;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		super.Do( ingredients, player, results, specialty_weight);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutZucchiniSeeds.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutZucchiniSeeds.c
new file mode 100644
index 0000000000000000000000000000000000000000..daa4987def224e1015b268703be969c6dfdeb615
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/CutOutZucchiniSeeds.c
@@ -0,0 +1,93 @@
+class CutOutZucchiniSeeds extends CutOutSeeds
+{	
+	override void Init()
+	{
+		m_Name = "#STR_cutoutseeds0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Zucchini");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("ZucchiniSeeds");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 8;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -1;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		super.Do( ingredients, player, results, specialty_weight);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftArmband.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftArmband.c
new file mode 100644
index 0000000000000000000000000000000000000000..fae14e4b5c027d51a8882a8f0df8c99288ff5ca2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftArmband.c
@@ -0,0 +1,92 @@
+//redundant in addition to 'CraftRag' recipe
+
+class DeCraftArmband extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = -1;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredient(0,"Armband_ColorBase");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;
+		m_IngredientDestroy[0] = 0;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = 0;
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		
+		
+		AddResult("Rag");//single result
+		
+		m_ResultSetFullQuantity[0] = 0;
+		m_ResultSetQuantity[0] = 1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftBow.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftBow.c
new file mode 100644
index 0000000000000000000000000000000000000000..bc566c3b241571ee0ca4397b0f64461735116987
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftBow.c
@@ -0,0 +1,96 @@
+class DeCraftBow extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"QuickieBow");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("LongWoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCamoNetShelter.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCamoNetShelter.c
new file mode 100644
index 0000000000000000000000000000000000000000..f18386f3b91c530d6ca9f0ef7c4a404a9980ab47
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCamoNetShelter.c
@@ -0,0 +1,108 @@
+class DeCraftCamoNetShelter extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"CamoNetShelter");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");	
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("LongWoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("CamoNet");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierComplete.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierComplete.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e200159ecb5ef79d2fc88b3392c721d18b8090c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierComplete.c
@@ -0,0 +1,125 @@
+class DeCraftCarrierComplete extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierComplete");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");	
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierBlank");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("CarrierHolsterSolo");//add results here
+
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result3
+		AddResult("CarrierPouches");//add results here
+
+		m_ResultSetFullQuantity[2] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[2] = -1;//-1 = do nothing
+		m_ResultSetHealth[2] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[2] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[2] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[2] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[2] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[2] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		
+		if( ingredient1.IsEmpty())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierHolster.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierHolster.c
new file mode 100644
index 0000000000000000000000000000000000000000..49b357f1e5c0d20836fab6895d036a10a5398e22
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierHolster.c
@@ -0,0 +1,113 @@
+class DeCraftCarrierHolster extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierHolster");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierBlank");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("CarrierHolsterSolo");//add results here
+
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		
+		if( ingredient1.IsEmpty())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierPouches.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierPouches.c
new file mode 100644
index 0000000000000000000000000000000000000000..55cf3aacce2d9114e5897e3778facaa78234dd29
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCarrierPouches.c
@@ -0,0 +1,113 @@
+class DeCraftCarrierPouches extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"PlateCarrierPouches");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("PlateCarrierBlank");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("CarrierPouches");//add results here
+
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		
+		if( ingredient1.IsEmpty())
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCookingStand.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCookingStand.c
new file mode 100644
index 0000000000000000000000000000000000000000..ed185e4ed5871b1c3181cc4ecba8dd94d4c61195
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCookingStand.c
@@ -0,0 +1,96 @@
+class DeCraftCookingStand extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"CookingStand");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 5;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCourierBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCourierBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..483709e2c5ed1c3472d21ea5ab014ebc0b72749d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftCourierBag.c
@@ -0,0 +1,107 @@
+class DeCraftCourierBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"CourierBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("BurlapSack");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("Rope");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftDetonator.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftDetonator.c
new file mode 100644
index 0000000000000000000000000000000000000000..b998420926825be33fe1c49cf757ca51e5856be3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftDetonator.c
@@ -0,0 +1,78 @@
+//redundant in addition to 'CraftRag' recipe
+
+class DeCraftDetonator extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+
+		//conditions
+		m_MinDamageIngredient[0] = -1;
+		m_MaxDamageIngredient[0] = 3;
+		m_MinQuantityIngredient[0] = -1;
+		m_MaxQuantityIngredient[0] = -1;
+		
+		m_MinDamageIngredient[1] = -1;
+		m_MaxDamageIngredient[1] = 3;
+		m_MinQuantityIngredient[1] = -1;
+		m_MaxQuantityIngredient[1] = -1;
+		
+		
+		//ingredient 1
+		InsertIngredient(0,"RemoteDetonator");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;
+		m_IngredientDestroy[0] = 1;
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Screwdriver");//you can insert multiple ingredients this way
+
+		
+		m_IngredientAddHealth[1] = -5;
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;
+		m_IngredientDestroy[1] = 0;
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		// crafting multiple results
+		
+		
+		AddResult("Battery9V");//single result
+		
+		m_ResultSetFullQuantity[0] = 0;
+		m_ResultSetQuantity[0] = 1;
+		m_ResultSetHealth[0] = -1;
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Battery9V battery;
+		if (results.IsValidIndex(0))
+		{
+			battery  = Battery9V.Cast(results[0]);
+		}
+		if (battery)
+		{
+			if ( battery.GetCompEM() )
+			{
+				battery.GetCompEM().SetEnergy0To1(Math.RandomFloatInclusive(0.25,1));
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftFishNetTrap.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftFishNetTrap.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8746daa091a4c1fbc1b3ef564fc6d172429d632
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftFishNetTrap.c
@@ -0,0 +1,106 @@
+class DeCraftFishNetTrap extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 2;//animation length in relative time units
+		m_Specialty = -0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"FishNetTrap");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = -1;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+
+		//result1
+		AddResult("MetalWire");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	
+		// result 2
+		AddResult("Netting");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		// We don't allow dismantling if there is an item attached
+		return ingredients[0].GetInventory().AttachmentCount() == 0;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftFishingRod.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftFishingRod.c
new file mode 100644
index 0000000000000000000000000000000000000000..15ef3ecfade0e318aa5cb9992f16f7a3553a00ad
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftFishingRod.c
@@ -0,0 +1,106 @@
+class DeCraftFishingRod extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"ImprovisedFishingRod");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");	
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("LongWoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//result2
+		AddResult("Rope");//add results here
+
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieAttachment.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieAttachment.c
new file mode 100644
index 0000000000000000000000000000000000000000..05fdc43e25bb7003882d5a3f0eeca8211c75529b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieAttachment.c
@@ -0,0 +1,109 @@
+class DeCraftGhillieAttachment extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GhillieAtt_Tan");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieAtt_Woodland");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieAtt_Mossy");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Netting");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("BurlapStrip");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 1;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieBushrag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieBushrag.c
new file mode 100644
index 0000000000000000000000000000000000000000..225f75f85f4df8a4baf13313cfdaa7f9b63b851c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieBushrag.c
@@ -0,0 +1,110 @@
+class DeCraftGhillieBushrag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GhillieBushrag_Tan");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieBushrag_Woodland");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieBushrag_Mossy");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Netting");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 2;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("BurlapStrip");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 2;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieHood.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieHood.c
new file mode 100644
index 0000000000000000000000000000000000000000..50dea3975e1a7363537d34da58528eef6fd62293
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieHood.c
@@ -0,0 +1,110 @@
+class DeCraftGhillieHood extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GhillieHood_Tan");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieHood_Woodland");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieHood_Mossy");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Netting");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("BurlapStrip");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 1;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieSuit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieSuit.c
new file mode 100644
index 0000000000000000000000000000000000000000..cde2cfcb9f7776b13fca424c6e344269e4f29609
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieSuit.c
@@ -0,0 +1,109 @@
+class DeCraftGhillieSuit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GhillieSuit_Tan");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieSuit_Woodland");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieSuit_Mossy");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Netting");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 4;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("BurlapStrip");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 5;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieTop.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieTop.c
new file mode 100644
index 0000000000000000000000000000000000000000..1479778d30136d46d8dad2a0ea610f220bb76c43
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftGhillieTop.c
@@ -0,0 +1,110 @@
+class DeCraftGhillieTop extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"GhillieTop_Tan");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieTop_Woodland");//you can insert multiple ingredients this way
+		InsertIngredient(0,"GhillieTop_Mossy");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Netting");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 3;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("BurlapStrip");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 3;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftHandDrillKit.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftHandDrillKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..483f4a5f8b205a1829a40fec8774497b390d80ac
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftHandDrillKit.c
@@ -0,0 +1,96 @@
+class DeCraftHandDrillKit extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"HandDrillKit");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");	
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftImprovisedBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftImprovisedBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..6cb1a300e3679da17a2bf8774dcc494f68e3de94
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftImprovisedBag.c
@@ -0,0 +1,107 @@
+class DeCraftImprovisedBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"ImprovisedBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 3;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("BurlapSack");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftImprovisedLeatherBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftImprovisedLeatherBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..b29e9c4edc1902008e357ef112ae3b6b21bc7804
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftImprovisedLeatherBag.c
@@ -0,0 +1,107 @@
+class DeCraftImprovisedLeatherBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"FurImprovisedBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");
+		InsertIngredient(1,"BoneKnife");	
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("WildboarPelt");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 3;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftLeatherCourierBag.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftLeatherCourierBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..b80c72fdf24b73c8ab4146971cfb59b8641a26ba
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftLeatherCourierBag.c
@@ -0,0 +1,107 @@
+class DeCraftLeatherCourierBag extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"FurCourierBag");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"BoneKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WildboarPelt");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("Rope");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = false;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftLeatherSack.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftLeatherSack.c
new file mode 100644
index 0000000000000000000000000000000000000000..a2de80194766c9ad4ee4a5e56449f84319c21398
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftLeatherSack.c
@@ -0,0 +1,92 @@
+class DeCraftLeatherSack extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_DeCraftLeatherSack0";//"BREAK LEATHER SACK";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"LeatherSack_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("TannedLeather");//add results here
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value		
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].IsEmpty();
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSnareTrap.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSnareTrap.c
new file mode 100644
index 0000000000000000000000000000000000000000..4139c6b46ed92cded16913d31e977d2172921b87
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSnareTrap.c
@@ -0,0 +1,96 @@
+class DeCraftSnareTrap extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"RabbitSnareTrap");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("MetalWire");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return ingredients[0].GetInventory().AttachmentCount() == 0;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSpear.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSpear.c
new file mode 100644
index 0000000000000000000000000000000000000000..eaf7cfb188f5346da53772a14913a6571a60a16e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSpear.c
@@ -0,0 +1,96 @@
+class DeCraftSpear extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Spear");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("LongWoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSplint.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSplint.c
new file mode 100644
index 0000000000000000000000000000000000000000..4ce2306d6a4c03da0f9c8589608ddbc966aa6d47
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftSplint.c
@@ -0,0 +1,96 @@
+class DeCraftSplint extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Splint");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -5;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenStick");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftTripWire.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftTripWire.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b8e20f5d8fd354c7c694d5769b3cc45f1e0f1f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftTripWire.c
@@ -0,0 +1,97 @@
+class DeCraftTripWire extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"TripwireTrap");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Sickle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"KukriKnife");
+		InsertIngredient(1,"FangeKnife");
+		InsertIngredient(1,"Hacksaw");
+		InsertIngredient(1,"HandSaw");
+		InsertIngredient(1,"KitchenKnife");
+		InsertIngredient(1,"SteakKnife");
+		InsertIngredient(1,"HayHook");
+		InsertIngredient(1,"StoneKnife");
+		InsertIngredient(1,"Cleaver");
+		InsertIngredient(1,"CombatKnife");
+		InsertIngredient(1,"HuntingKnife");
+		InsertIngredient(1,"Machete");
+		InsertIngredient(1,"CrudeMachete");
+		InsertIngredient(1,"OrientalMachete");
+		InsertIngredient(1,"Screwdriver");
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"Pickaxe");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		InsertIngredient(1,"Sword");
+		InsertIngredient(1,"AK_Bayonet");
+		InsertIngredient(1,"M9A1_Bayonet");
+		InsertIngredient(1,"Mosin_Bayonet");
+		InsertIngredient(1,"SKS_Bayonet");	
+		InsertIngredient(1,"BoneKnife");
+		
+		m_IngredientAddHealth[1] = -12;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("MetalWire");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 0;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		// We don't allow dismantling if there is an item attached
+		return ingredients[0].GetInventory().AttachmentCount() == 0;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftTruck01DoubleWheel.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftTruck01DoubleWheel.c
new file mode 100644
index 0000000000000000000000000000000000000000..8482aa60c8b7b95b2189894387a50cc3e1822d19
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftTruck01DoubleWheel.c
@@ -0,0 +1,96 @@
+class DeCraftTruck01DoubleWheel extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_DeCraftTruck01DoubleWheel0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Truck_01_WheelDouble");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = -1;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"LugWrench");
+		
+		m_IngredientAddHealth[1] = -20;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("Truck_01_Wheel");//add results here
+		//m_ResultSpawnDistance[0] = 1.5;
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//result2
+		AddResult("Truck_01_Wheel");//add results here
+		//m_ResultSpawnDistance[1] = 2.5;
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = -1;//-1 = do nothing
+		m_ResultSetHealth[1] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[1] = -2;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		
+		if ( !ingredient1.GetHierarchyParent() )
+			return true;
+		else
+			return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient1 = ingredients[0];
+		
+		ItemBase result1 = results.Get(0);
+		
+		result1.SetPosition(ingredient1.GetPosition()- "0 0.16 0");
+		
+		ItemBase result2 = results.Get(1);
+		result2.SetPosition(ingredient1.GetPosition() + "0 0.12 0.1");
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftWoodenCrate.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftWoodenCrate.c
new file mode 100644
index 0000000000000000000000000000000000000000..f49f8f88844ca291bf06b5631253cdaf165fb28e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DeCraftWoodenCrate.c
@@ -0,0 +1,153 @@
+class DeCraftWoodenCrate extends RecipeBase
+{
+	override void Init()
+	{
+		m_Name = "#STR_breakdown0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"WoodenCrate");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = true;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Crowbar");
+		InsertIngredient(1,"WoodAxe");
+		InsertIngredient(1,"Hatchet");
+		InsertIngredient(1,"FirefighterAxe");
+		
+		m_IngredientAddHealth[1] = -20;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		AddResult("WoodenPlank");//add results here
+		
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = 2;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		
+		//result2
+		AddResult("Nail");//add results here
+		
+		m_ResultSetFullQuantity[1] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[1] = 6;// -1 = do nothing
+		m_ResultSetHealth[1] = -1;// -1 = do nothing
+		m_ResultInheritsHealth[1] = 1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[1] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[1] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[1] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+		//----------------------------------------------------------------------------------------------------------------------
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase crate;
+		Class.CastTo(crate, ingredients[0]);
+
+		if ( crate.GetInventory().CountInventory() > 1 )
+			return false;
+
+		return true;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase crate;
+		Class.CastTo(crate, ingredients[0]);
+		int hp = crate.GetHealthLevel("");
+
+		switch ( hp )
+		{
+			case GameConstants.STATE_PRISTINE:
+				results[0].SetQuantity(Math.RandomIntInclusive( 6, 8 ));
+				results[0].SetHealth( results[0].GetMaxHealth() * Math.RandomFloat( 0.6, 0.8 ));
+				results[1].SetQuantity(Math.RandomIntInclusive( 12, 16 ));
+				results[1].SetHealth( results[1].GetMaxHealth() * Math.RandomFloat( 0.6, 0.8 ));
+			break;
+
+			case GameConstants.STATE_WORN:
+				results[0].SetQuantity(Math.RandomIntInclusive( 5, 7 ));
+				results[0].SetHealth( results[0].GetMaxHealth() * Math.RandomFloat( 0.5, 0.8 ));
+				results[1].SetQuantity(Math.RandomIntInclusive( 9, 13 ));
+				results[1].SetHealth( results[1].GetMaxHealth() * Math.RandomFloat( 0.5, 0.8 ));
+			break;
+
+			case GameConstants.STATE_DAMAGED:
+				results[0].SetQuantity(Math.RandomIntInclusive( 4, 6 ));
+				results[0].SetHealth( results[0].GetMaxHealth() * Math.RandomFloat( 0.3, 0.6 ));
+				results[1].SetQuantity(Math.RandomIntInclusive( 6, 10 ));
+				results[1].SetHealth( results[1].GetMaxHealth() * Math.RandomFloat( 0.3, 0.6 ));
+			break;
+			
+			case GameConstants.STATE_BADLY_DAMAGED:
+				results[0].SetQuantity(Math.RandomIntInclusive( 3, 5 ));
+				results[0].SetHealth( results[0].GetMaxHealth() * Math.RandomFloat( 0.1, 0.3 ));
+				results[1].SetQuantity(Math.RandomIntInclusive( 3, 7 ));
+				results[1].SetHealth( results[1].GetMaxHealth() * Math.RandomFloat( 0.1, 0.3 ));
+			break;
+
+			//unnescessary? We do not allow recipe crafting with ruined items?
+			case GameConstants.STATE_RUINED:
+				results[0].SetQuantity(Math.RandomIntInclusive( 1, 2 ));
+				results[0].SetHealth( results[0].GetMaxHealth() * Math.RandomFloat( 0.05, 0.2 ));
+				results[1].SetQuantity(Math.RandomIntInclusive( 1, 4 ));
+				results[1].SetHealth( results[1].GetMaxHealth() * Math.RandomFloat( 0.05, 0.2 ));
+			break;
+
+			default:
+				results[0].SetQuantity(Math.RandomIntInclusive( 1, 2 ));
+				results[0].SetHealth( results[0].GetMaxHealth() * Math.RandomFloat( 0.05, 0.2 ));
+				results[1].SetQuantity(Math.RandomIntInclusive( 1, 4 ));
+				results[1].SetHealth( results[1].GetMaxHealth() * Math.RandomFloat( 0.05, 0.2 ));
+			break;
+		}
+		
+		/*
+		float originalPlanks = 8;
+		float originalNails = 16;
+
+		float hp = crate.GetHealth01("","Health");
+		originalPlanks *= hp;
+		originalNails *= hp;
+
+		int newPlanks = Math.Round( originalPlanks );
+		int newNails = Math.Round( originalNails );
+
+		m_ResultSetQuantity[0] = newPlanks;
+		m_ResultSetQuantity[1] = newNails;
+		*/
+		Debug.Log("Recipe Do method called","recipes");
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DisinfectItem.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DisinfectItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..b485c7e04535c626193d70b10fd9135ff43dedef
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DisinfectItem.c
@@ -0,0 +1,91 @@
+class DisinfectItem extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#disinfect";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"DisinfectantSpray");//you can insert multiple ingredients this way
+		InsertIngredient(0,"DisinfectantAlcohol");
+		InsertIngredient(0,"IodineTincture");
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Inventory_Base");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		//AddResult("");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+				
+		if ( !ingredient2.CanBeDisinfected() )
+			return false;
+		
+		if ( ingredient1.GetQuantity() < ingredient1.GetDisinfectQuantity() )
+		{
+			return false;
+		}
+
+		
+		int liquid_type = ingredient1.GetLiquidType();
+		return (liquid_type & LIQUID_DISINFECTANT);
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient1, ingredient2;
+		Class.CastTo(ingredient1, ingredients[0]);
+		
+
+		ingredient1.AddQuantity(-ingredient1.GetDisinfectQuantity());
+
+		Class.CastTo(ingredient2, ingredients[1]);
+		ingredient2.RemoveAllAgentsExcept(eAgents.BRAIN | eAgents.SALMONELLA | eAgents.CHOLERA);
+		ingredient2.SetCleanness(1);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/DrainLiquid.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DrainLiquid.c
new file mode 100644
index 0000000000000000000000000000000000000000..badbd0d7b7ee61c2af54764fd7422c099d50684e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/DrainLiquid.c
@@ -0,0 +1,109 @@
+class DrainLiquid extends RecipeBase
+{	
+	override void Init()
+	{
+		m_Name = "#STR_DrainLiquid0";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 1.5;//animation length in relative time units
+		m_Specialty = -0.01;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = 0;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[1] = 0;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Pot");//you can insert multiple ingredients this way
+		InsertIngredient(0,"CanisterGasoline");//you can insert multiple ingredients this way
+		InsertIngredient(0,"Canteen");//you can insert multiple ingredients this way
+		InsertIngredient(0,"WaterBottle");//you can insert multiple ingredients this way
+		InsertIngredient(0,"Vodka");//you can insert multiple ingredients this way
+		InsertIngredient(0,"WaterPouch_ColorBase");//you can insert multiple ingredients this way
+		InsertIngredient(0,"Barrel_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Pot");//you can insert multiple ingredients this way
+		InsertIngredient(1,"CanisterGasoline");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Canteen");//you can insert multiple ingredients this way
+		InsertIngredient(1,"WaterBottle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Vodka");//you can insert multiple ingredients this way
+		InsertIngredient(1,"WaterPouch_ColorBase");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Barrel_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = 0;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		//AddResult("");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		ItemBase ingredient1;
+		Class.CastTo(ingredient1, ingredients[0]);
+		ItemBase ingredient2;
+		Class.CastTo(ingredient2, ingredients[1]);
+
+		ItemBase source = NULL;
+		ItemBase target = NULL;
+		
+		ItemBase entity_in_hands = ItemBase.Cast(player.GetHumanInventory().GetEntityInHands());
+		
+		//condition always true for any bottle, another recipe needed for pouring TO handheld bottle
+		if( entity_in_hands == ingredient1 )
+		{
+			return Liquid.CanTransfer(ingredient2,ingredient1);
+		}
+		else
+		{
+			return Liquid.CanTransfer(ingredient1,ingredient2);
+		}
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient1 = ingredients[0];
+		ItemBase ingredient2 = ingredients[1];
+		
+		ItemBase entity_in_hands = ItemBase.Cast(player.GetHumanInventory().GetEntityInHands());
+		
+		if( entity_in_hands == ingredient1 )
+		{
+			Liquid.Transfer(ingredient2,ingredient1);
+		}
+		else
+		{
+			Liquid.Transfer(ingredient1,ingredient2);
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/Recipes/Recipes/ExtinguishTorch.c b/scripts/4_World/DayZ/Classes/Recipes/Recipes/ExtinguishTorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff8b6d567e5cd9e6eff947d97cdf9e4602a0ab82
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Recipes/Recipes/ExtinguishTorch.c
@@ -0,0 +1,89 @@
+class ExtinguishTorch extends RecipeBase	
+{	
+	override void Init()
+	{
+		m_Name = "#extinguish";
+		m_IsInstaRecipe = false;//should this recipe be performed instantly without animation
+		m_AnimationLength = 0.5;//animation length in relative time units
+		m_Specialty = 0.02;// value > 0 for roughness, value < 0 for precision
+		
+		
+		//conditions
+		m_MinDamageIngredient[0] = -1;//-1 = disable check
+		m_MaxDamageIngredient[0] = 3;//-1 = disable check
+		
+		m_MinQuantityIngredient[0] = -1;//-1 = disable check
+		m_MaxQuantityIngredient[0] = -1;//-1 = disable check
+		
+		m_MinDamageIngredient[1] = -1;//-1 = disable check
+		m_MaxDamageIngredient[1] = 3;//-1 = disable check
+		//TODO SS 2.0 should modify MinQuantity of liquid
+		m_MinQuantityIngredient[1] = 100;//-1 = disable check
+		m_MaxQuantityIngredient[1] = -1;//-1 = disable check
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//INGREDIENTS
+		//ingredient 1
+		InsertIngredient(0,"Torch");//you can insert multiple ingredients this way
+		InsertIngredient(0,"Broom");//you can insert multiple ingredients this way
+
+		m_IngredientAddHealth[0] = 0;// 0 = do nothing
+		m_IngredientSetHealth[0] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[0] = 0;// 0 = do nothing
+		m_IngredientDestroy[0] = false;//true = destroy, false = do nothing
+		m_IngredientUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this ingredient
+		
+		//ingredient 2
+		InsertIngredient(1,"Pot");//you can insert multiple ingredients this way
+		InsertIngredient(1,"CanisterGasoline");//you can insert multiple ingredients this way
+		InsertIngredient(1,"DisinfectantAlcohol");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Canteen");//you can insert multiple ingredients this way
+		InsertIngredient(1,"WaterBottle");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Vodka");//you can insert multiple ingredients this way
+		InsertIngredient(1,"WaterPouch_ColorBase");//you can insert multiple ingredients this way
+		InsertIngredient(1,"Barrel_ColorBase");//you can insert multiple ingredients this way
+		
+		m_IngredientAddHealth[1] = 0;// 0 = do nothing
+		m_IngredientSetHealth[1] = -1; // -1 = do nothing
+		m_IngredientAddQuantity[1] = -100;// 0 = do nothing
+		m_IngredientDestroy[1] = false;// false = do nothing
+		m_IngredientUseSoftSkills[1] = true;// set 'true' to allow modification of the values by softskills on this ingredient
+		//----------------------------------------------------------------------------------------------------------------------
+		
+		//result1
+		//AddResult("");//add results here
+
+		m_ResultSetFullQuantity[0] = false;//true = set full quantity, false = do nothing
+		m_ResultSetQuantity[0] = -1;//-1 = do nothing
+		m_ResultSetHealth[0] = -1;//-1 = do nothing
+		m_ResultInheritsHealth[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result will inherit health from ingredient number (value);(value) == -2 means this result will inherit health from all ingredients averaged(result_health = combined_health_of_ingredients / number_of_ingredients)
+		m_ResultInheritsColor[0] = -1;// (value) == -1 means do nothing; a (value) >= 0 means this result classname will be a composite of the name provided in AddResult method and config value "color" of ingredient (value)
+		m_ResultToInventory[0] = -2;//(value) == -2 spawn result on the ground;(value) == -1 place anywhere in the players inventory, (value) >= 0 means switch position with ingredient number(value)
+		m_ResultUseSoftSkills[0] = false;// set 'true' to allow modification of the values by softskills on this result
+		m_ResultReplacesIngredient[0] = -1;// value == -1 means do nothing; a value >= 0 means this result will transfer item propertiesvariables, attachments etc.. from an ingredient value
+	}
+
+	override bool CanDo(ItemBase ingredients[], PlayerBase player)//final check for recipe's validity
+	{
+		FlammableBase target = FlammableBase.Cast(ingredients[0]);
+		ItemBase container;
+		Class.CastTo(container, ingredients[1]);
+		
+		if ( container.GetLiquidType() & (GROUP_LIQUID_BLOOD | LIQUID_WATER | LIQUID_RIVERWATER | LIQUID_BEER) )
+		{
+			return target.IsIgnited();
+		}
+		return false;
+	}
+
+	override void Do(ItemBase ingredients[], PlayerBase player,array<ItemBase> results, float specialty_weight)//gets called upon recipe's completion
+	{
+		ItemBase ingredient1;
+		Class.CastTo(ingredient1, ingredients[0]);
+		if (ingredient1.HasEnergyManager())
+		{
+			ingredient1.GetCompEM().SwitchOff();
+			ingredient1.SetWetMax();
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/RecoilBase.c b/scripts/4_World/DayZ/Classes/RecoilBase/RecoilBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..78124b026f39076d711745827ee7ff86c5147797
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/RecoilBase.c
@@ -0,0 +1,206 @@
+class RecoilBase
+{
+	bool m_DebugMode;
+	
+	Weapon_Base m_Weapon;
+	PlayerBase m_Player;
+	protected bool m_DeleteRequested;
+	protected float m_Time;//how much time has elapsed since first update
+	protected float m_ReloadTime;//reload time config parameter of the weapon
+	protected vector m_RecoilModifier;
+	protected bool m_IsClient;
+	// for mouse offset
+	float m_MouseOffsetRangeMin;//in degrees min
+	float m_MouseOffsetRangeMax;//in degrees max
+	float m_MouseOffsetRelativeTime = 1;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	float m_HandsOffsetRelativeTime = 1;//[0..1] a time it takes to move the hands the required distance given by the curve relative to the reload time of the weapon(firing mode)
+	float m_CamOffsetRelativeTime = 1;//[0..1] a time it takes to move the camera the required distance relative to the reload time of the weapon(firing mode)
+	float m_CamOffsetDistance = 0.05;//how far the camera will travel along the z-axis in cm
+	float m_MouseOffsetDistance;//how far should the mouse travel
+	float m_TimeNormalized;
+	//protected float m_MouseOffsetResult;//in degrees max
+	protected vector m_MouseOffsetTarget;//move the mouse towards this point
+	protected vector m_MouseOffsetTargetAccum;//the overall mouse offset so far(all deltas accumulated)
+	protected float m_Angle;//result between the min and max
+	// mouse end
+	
+	protected ref array<vector> m_HandsCurvePoints;
+	
+	void RecoilBase(Weapon_Base weapon)
+	{
+		m_Weapon = weapon;
+		//m_DebugMode = false;
+		m_DebugMode = GetDayZGame().IsAimLogEnabled();
+		m_Player = PlayerBase.Cast(weapon.GetHierarchyRootPlayer());
+		m_HandsCurvePoints = new array<vector>;
+		Init();
+		PostInit(weapon);
+	}
+	
+	void Init();
+	
+	Weapon_Base GetWeapon()
+	{
+		return m_Weapon;
+	}
+	
+	void PostInit(Weapon_Base weapon)
+	{
+		int muzzleIndex = weapon.GetCurrentMuzzle();
+		m_Angle = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil, m_MouseOffsetRangeMin, m_MouseOffsetRangeMax);
+		m_RecoilModifier = GetRecoilModifier( GetWeapon() );
+		if(m_DebugMode) Print(m_Angle);
+		
+		m_ReloadTime = weapon.GetReloadTime(muzzleIndex);
+		m_MouseOffsetTarget = vector.YawToVector(m_Angle);
+		m_MouseOffsetTarget = m_MouseOffsetTarget * m_MouseOffsetDistance;
+		m_IsClient = !GetGame().IsDedicatedServer();
+		m_CamOffsetDistance *= m_RecoilModifier[2];
+	}
+	
+	//! Destroys this object next update tick
+	void Destroy()
+	{
+		m_DeleteRequested = true;
+	}
+	
+	// called externally per update, not to be overriden in children
+	void Update( SDayZPlayerAimingModel pModel, out float axis_mouse_x, out float axis_mouse_y, out float axis_hands_x, out float axis_hands_y, float pDt )
+	{
+		if( m_DeleteRequested )
+		{
+			delete this;
+		}
+			
+		m_TimeNormalized = Math.InverseLerp(0, m_ReloadTime, m_Time);
+		m_TimeNormalized = Math.Clamp(m_TimeNormalized, 0,0.99);
+		
+		ApplyMouseOffset(pDt, axis_mouse_x, axis_mouse_y);
+		ApplyHandsOffset(pDt, axis_hands_x, axis_hands_y);
+		if(m_IsClient)
+			ApplyCamOffset(pModel);
+		#ifdef DEVELOPER
+		if(m_DebugMode)
+			PrintString("RecoilBase | BEFORE | axis_mouse_y: " + axis_mouse_y.ToString());
+		#endif
+		axis_mouse_x = axis_mouse_x * m_RecoilModifier[0];
+		axis_mouse_y = axis_mouse_y * m_RecoilModifier[1];
+		
+		axis_hands_x = axis_hands_x * m_RecoilModifier[0];
+		axis_hands_y = axis_hands_y * m_RecoilModifier[1];
+		
+		#ifdef DEVELOPER
+		if(m_DebugMode)
+		{
+			PrintString("RecoilBase | AFTER | axis_mouse_y: " + axis_mouse_y.ToString());
+		}
+		#endif
+		m_Time += pDt;
+		
+		if( m_Time >= m_ReloadTime )
+		{
+			Destroy();
+		}
+	}
+	
+	void ApplyCamOffset(SDayZPlayerAimingModel pModel)
+    {
+        float time_rel = Math.Clamp(Math.InverseLerp(0, m_CamOffsetRelativeTime, m_TimeNormalized), 0, 1);
+        float offset = 0;
+        float time = Easing.EaseOutBack(time_rel);
+        if(time == 1)
+        {
+            offset = 0;
+        }
+        else
+        {
+            offset = Math.Lerp(0,m_CamOffsetDistance,time);
+        }
+        
+        pModel.m_fCamPosOffsetZ = offset;
+		
+		m_Player.GetCurrentCamera().SendRecoilOffsetZ(offset);
+    }
+	
+	void ApplyHandsOffset(float pDt, out float pRecResultX, out float pRecResultY)
+	{
+		float relative_time = m_TimeNormalized / Math.Clamp(m_HandsOffsetRelativeTime, 0.001,1);
+		vector pos_on_curve = GetPositionOnCurve(m_HandsCurvePoints, relative_time);
+
+		/*if(m_DebugMode)
+		{
+			PrintString("pos_on_curve: " + pos_on_curve.ToString());
+			PrintString("normalized time: " + m_TimeNormalized.ToString());
+			PrintString("elapsed time: " + m_Time.ToString());
+			PrintString("curve pos x: " + pos_on_curve[0].ToString());
+			PrintString("curve pos y: " + pos_on_curve[1].ToString());
+			PrintString("relative_time: " + relative_time.ToString());
+		}*/
+		
+		pRecResultX = pos_on_curve[0];
+		pRecResultY = pos_on_curve[1];
+	}
+	
+	void ApplyMouseOffset(float pDt, out float pRecResultX, out float pRecResultY)
+	{
+		#ifdef DEVELOPER
+		if(m_DebugMode)
+		{
+			bool b1 = m_MouseOffsetTargetAccum[1] < m_MouseOffsetTarget[1];
+			PrintString( "RecoilBase | ApplyMouseOffset processing: " + b1 );
+			PrintString( "RecoilBase | m_MouseOffsetTargetAccum : " + m_MouseOffsetTargetAccum.ToString() );
+			PrintString( "RecoilBase | m_MouseOffsetTarget : " + m_MouseOffsetTarget.ToString() );
+		}
+		#endif
+		
+		if( m_MouseOffsetTargetAccum[1] < m_MouseOffsetTarget[1] )
+		{
+			float relative_delta = pDt / m_ReloadTime / Math.Clamp(m_MouseOffsetRelativeTime, 0.001,1);
+			
+			float delta_mouse_offset_x = m_MouseOffsetTarget[0] * relative_delta;
+			float delta_mouse_offset_y = m_MouseOffsetTarget[1] * relative_delta;
+			
+			if( ( m_MouseOffsetTargetAccum[1] + delta_mouse_offset_y) > m_MouseOffsetTarget[1] )
+			{
+				delta_mouse_offset_x = m_MouseOffsetTarget[0] - m_MouseOffsetTargetAccum[0];
+				delta_mouse_offset_y = m_MouseOffsetTarget[1] - m_MouseOffsetTargetAccum[1];
+			}
+			
+			m_MouseOffsetTargetAccum[0] = m_MouseOffsetTargetAccum[0] + delta_mouse_offset_x;
+			m_MouseOffsetTargetAccum[1] = m_MouseOffsetTargetAccum[1] + delta_mouse_offset_y;
+			
+			pRecResultX = delta_mouse_offset_x;
+			pRecResultY = delta_mouse_offset_y;
+			
+			/*if(m_DebugMode)
+			{
+				PrintString( "delta x: "+ delta_mouse_offset_x );
+				PrintString( "delta y: "+ delta_mouse_offset_y );
+				PrintString( "target x: "+ m_MouseOffsetTarget[0] );
+				PrintString( "target y: "+ m_MouseOffsetTarget[1] );
+				PrintString( "accum x: "+ m_MouseOffsetTargetAccum[0] );
+				PrintString( "accum y: "+ m_MouseOffsetTargetAccum[1] );
+			}*/
+		}
+		#ifdef DEVELOPER
+		if(m_DebugMode)
+		{
+			PrintString( "RecoilBase | pRecResultY: " + pRecResultY );
+		}
+		#endif
+	}
+	
+	vector GetRecoilModifier(Weapon_Base weapon)
+	{
+		if( weapon )
+		{
+			return weapon.GetPropertyModifierObject().m_RecoilModifiers;
+		}
+		else return "1 1 1";
+	}
+	
+	vector GetPositionOnCurve(array<vector> points, float time)
+	{
+		return Math3D.Curve(ECurveType.CatmullRom, time, points);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/AUGRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/AUGRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..4464cd96dc06173d7f6597bd4f5b2d71868dbc91
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/AUGRecoil.c
@@ -0,0 +1,28 @@
+class AUGRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.5); point_1[1] = 1.2; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.4,0.35); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.65,-1.15); point_3[1] = 1.1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.35,-0.15); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 75;//in degrees min
+		m_MouseOffsetRangeMax = 125;//in degrees max
+		m_MouseOffsetDistance = 1.05;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.1;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.01;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ak101Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ak101Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bd36e7b031be36eb18bd3cb72ead0a4bcda7d5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ak101Recoil.c
@@ -0,0 +1,28 @@
+class Ak101Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,0.75); point_1[1] = 1.33; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1.33; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 1.6;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0125;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ak74Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ak74Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3d43e0ab201ede4260cdfaa6eeb0f06b79f49ac
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ak74Recoil.c
@@ -0,0 +1,28 @@
+class Ak74Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,0.75); point_1[1] = 1.33; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1.33; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 1.6;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0125;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/AkmRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/AkmRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..96174aa7dbe41460e786ad6ab8e158bcb01c9807
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/AkmRecoil.c
@@ -0,0 +1,28 @@
+class AkmRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,0.75); point_1[1] = 1.33; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1.33; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 1.6;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0125;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Aks74uRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Aks74uRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..d2638ecee500ad163fb45e861c3c37e258554b4a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Aks74uRecoil.c
@@ -0,0 +1,28 @@
+class Aks74uRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,0.75); point_1[1] = 1.33; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1.33; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 1.8;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0125;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/B95Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/B95Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..75798bd6bb7976e45a0203061620c76755b8741a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/B95Recoil.c
@@ -0,0 +1,28 @@
+class B95Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.5); point_1[1] = 1.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.5); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.9;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CZ527Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CZ527Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..6649ea03649d644666a5b7f0f903455f7b9efea4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CZ527Recoil.c
@@ -0,0 +1,28 @@
+class CZ527Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.5); point_1[1] = 1.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.5); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.1;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CZ550Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CZ550Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..552e2b2dd46eb5ef726946909bbd9f8df4720a9d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CZ550Recoil.c
@@ -0,0 +1,28 @@
+class CZ550Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,0.75); point_1[1] = 2.25; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.75); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.425;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 160;//in degrees max
+		m_MouseOffsetDistance = 2.25;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Colt1911Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Colt1911Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..402a100f1f2106f4133d37b600b1ccf99f221999
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Colt1911Recoil.c
@@ -0,0 +1,28 @@
+class Colt1911Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1,2); point_1[1] = 2; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 3; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.25,-1.75); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 90;//in degrees max
+		m_MouseOffsetDistance = 1.0;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.04;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CrossbowRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CrossbowRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..48ad09b0ce749d1467594ed1acda93046b15b6ba
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/CrossbowRecoil.c
@@ -0,0 +1,28 @@
+class CrossbowRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.45); point_1[1] = 3.0; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.12,0.2); point_2[1] = 2.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.45); point_3[1] = 1.0; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.05); point_4[1] = 0.45; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.05;
+		
+		m_MouseOffsetRangeMin = 85;//in degrees min
+		m_MouseOffsetRangeMax = 95;//in degrees max
+		m_MouseOffsetDistance = 0.6;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Cz75Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Cz75Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..dcdc7dfd4c2a426b28f80c65712ba18a44afff36
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Cz75Recoil.c
@@ -0,0 +1,28 @@
+class Cz75Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,3); point_1[1] = 3; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 4; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-2,-4); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.6,-0.2); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 60;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 0.9;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DEagleRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DEagleRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..75abf836a4208ee868d972559ebbf4a1907cffcc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DEagleRecoil.c
@@ -0,0 +1,28 @@
+class DEagleRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,2); point_1[1] = 4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 5.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.5,-2); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 70;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 2.5;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625; //0.03;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+				
+		m_CamOffsetDistance = 0.05;
+		m_CamOffsetRelativeTime = 0.5;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DefaultRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DefaultRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..264de460836959669f848f9daf0f3f8bdef23270
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DefaultRecoil.c
@@ -0,0 +1,15 @@
+class DefaultRecoil: RecoilBase
+{
+	override void Init()
+	{
+		m_HandsCurvePoints.Insert("0 0 0");//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert("0 1 0");
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.4;
+		
+		m_MouseOffsetRangeMin = 60;//in degrees min
+		m_MouseOffsetRangeMax = 120;//in degrees max
+		m_MouseOffsetDistance = 1;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DerringerRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DerringerRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..a861efb626bf4fd7922f85af37dec317afdb4b42
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/DerringerRecoil.c
@@ -0,0 +1,29 @@
+class DerringerRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1,2); point_1[1] = 4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.25,-0.5); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 135;//in degrees max
+		m_MouseOffsetDistance = 1.6;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.005;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.04;
+		m_CamOffsetRelativeTime = 0.125;
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/FALRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/FALRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..e4669696d69b02d7dae8d8e45850413e36274d32
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/FALRecoil.c
@@ -0,0 +1,28 @@
+class FALRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,0.75); point_1[1] = 1.3; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.6; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1.3; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 65;//in degrees min
+		m_MouseOffsetRangeMax = 145;//in degrees max
+		m_MouseOffsetDistance = 1.4;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.01;
+		m_CamOffsetRelativeTime = 1;	
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/FamasRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/FamasRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..f20f339f4073e5706f7d9c083fc6b7a6f13fb694
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/FamasRecoil.c
@@ -0,0 +1,28 @@
+class FamasRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.55); point_1[1] = 0.5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 0.25; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-1.25); point_3[1] = 0.15; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 150;//in degrees max
+		m_MouseOffsetDistance = 0.9;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.25;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.01;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Fnx45Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Fnx45Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..68b32bcfe880cb71a0bfbf79d4a67155952ede1f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Fnx45Recoil.c
@@ -0,0 +1,28 @@
+class Fnx45Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,2,4); point_1[1] = 4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-2,-5); point_3[1] = 3; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 105;//in degrees max
+		m_MouseOffsetDistance = 1.2;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.04;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/GlockRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/GlockRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..c730f3764a47595ff5963c77446a51cc8914678a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/GlockRecoil.c
@@ -0,0 +1,28 @@
+class GlockRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,1.5); point_1[1] = 2; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 3; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-2); point_3[1] = 1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0); point_4[1] = 0.5; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 40;//in degrees min
+		m_MouseOffsetRangeMax = 90;//in degrees max
+		m_MouseOffsetDistance = 1;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.04;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..12c9f66aba427366fc64bc1fbed7ad3fe15ba3ab
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18Recoil.c
@@ -0,0 +1,28 @@
+class Izh18Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.5); point_1[1] = 1.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.5); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.4;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18SawedOffRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18SawedOffRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..fcbac8c3f3db6b75b39389c5472ff9b4743b5eea
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18SawedOffRecoil.c
@@ -0,0 +1,28 @@
+class Izh18SawedOffRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.75,1); point_1[1] = 2.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 3; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-1); point_3[1] = 2.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 3;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.025;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18ShotgunRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18ShotgunRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..aa7e08417e315ce1a3daeadcf1faf48a7415bba2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh18ShotgunRecoil.c
@@ -0,0 +1,28 @@
+class Izh18ShotgunRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,2); point_1[1] = 5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 6; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.5,-2); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 70;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 3.5;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625; //0.03;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+				
+		m_CamOffsetDistance = 0.05;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh43Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh43Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..d35843be43c6b8a8f52bd0af619a7473a8a26147
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Izh43Recoil.c
@@ -0,0 +1,28 @@
+class Izh43Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,2); point_1[1] = 5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 6; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.5,-2); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 70;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 3.5;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625; //0.03;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+				
+		m_CamOffsetDistance = 0.05;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/LongHornRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/LongHornRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..c8042f4d486e1178e7947f52c23df02943c89454
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/LongHornRecoil.c
@@ -0,0 +1,29 @@
+class LongHornRecoil: RecoilBase
+{
+	
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,2); point_1[1] = 4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 5.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.5,-2); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 70;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 4.0;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625; //0.03;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+				
+		m_CamOffsetDistance = 0.05;
+		m_CamOffsetRelativeTime = 0.5;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M14Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M14Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ad17096a51e73f2992141f4f1bc7106af242d89
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M14Recoil.c
@@ -0,0 +1,29 @@
+class M14Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.35,0.65); point_1[1] = 1.4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.35,0.45); point_2[1] = 2.85; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.1,-0.5); point_3[1] = 1.2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.10); point_4[1] = 0.6; point_4[2] = 0;
+		
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1.2;
+		
+		m_MouseOffsetRangeMin = 75;//in degrees min
+		m_MouseOffsetRangeMax = 130;//in degrees max
+		m_MouseOffsetDistance = 1.7;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.65;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.03;
+		m_CamOffsetRelativeTime = 1.25;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M16A2Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M16A2Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..5441d46d44d54439cc4bed7b19e3afd27dc07474
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M16A2Recoil.c
@@ -0,0 +1,28 @@
+class M16A2Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.55); point_1[1] = 1.2; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-1.25); point_3[1] = 1.1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 50;//in degrees min
+		m_MouseOffsetRangeMax = 120;//in degrees max
+		m_MouseOffsetDistance = 1.0;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.01;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M4a1Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M4a1Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..b62c5c1b1424081baef1e87cef4a7cf52703175b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M4a1Recoil.c
@@ -0,0 +1,28 @@
+class M4a1Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.55); point_1[1] = 1.2; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-1.25); point_3[1] = 1.1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 50;//in degrees min
+		m_MouseOffsetRangeMax = 120;//in degrees max
+		m_MouseOffsetDistance = 1.4;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.01;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M79Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M79Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..7498a304756932f9a8f99adb9efeadcfb86168f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/M79Recoil.c
@@ -0,0 +1,28 @@
+class M79Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,1); point_1[1] = 1; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.05); point_4[1] = 0.5; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MagnumRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MagnumRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..67b5d934f523ba1d8545318d5f5874421f160cb7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MagnumRecoil.c
@@ -0,0 +1,29 @@
+class MagnumRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1,2); point_1[1] = 4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.25,-0.5); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 60;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.5;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.04;
+		m_CamOffsetRelativeTime = 1;
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MakarovRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MakarovRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..26eb1ed85859e5d3f67ecbb030095f791acb79a9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MakarovRecoil.c
@@ -0,0 +1,28 @@
+class MakarovRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1,2); point_1[1] = 2; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 3; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-2,-3); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 70;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 0.75;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.025;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MkiiRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MkiiRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..93125c3ead80e09c59796e2d020aa76e141bf17f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MkiiRecoil.c
@@ -0,0 +1,28 @@
+class MkiiRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,1); point_1[1] = 1; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.05); point_4[1] = 0.5; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 80;//in degrees max
+		m_MouseOffsetDistance = 0.65;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MosinRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MosinRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..adf00559db41b35c803f656613b41f089d2bb09e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MosinRecoil.c
@@ -0,0 +1,28 @@
+class MosinRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,0.75); point_1[1] = 2.5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.75); point_3[1] = 1.75; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;	
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.8;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+			
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MosinSawedOffRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MosinSawedOffRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..010cb4482e3595fc5a9669e4b5a0cad1de6e28aa
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/MosinSawedOffRecoil.c
@@ -0,0 +1,28 @@
+class MosinSawedOffRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1,1.25); point_1[1] = 4; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.25); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;	
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.75;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.025;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Mp133Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Mp133Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..daba76505ba87aa46ce7add56417827f14d4a181
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Mp133Recoil.c
@@ -0,0 +1,28 @@
+class Mp133Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,2); point_1[1] = 5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 6; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.5,-2); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 70;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 3;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625; //0.03;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+				
+		m_CamOffsetDistance = 0.05;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Mp5kRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Mp5kRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..4de8aa3527c1616be50e5912e30ae50d3649e023
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Mp5kRecoil.c
@@ -0,0 +1,28 @@
+class Mp5kRecoil: RecoilBase
+{
+	override void Init()
+	{		
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.65,1); point_1[1] = 1; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.7,0.8); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.4,-1); point_3[1] = 1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.3,-0.15); point_4[1] = 0.5; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.35;
+		
+		m_MouseOffsetRangeMin = 60;//in degrees min
+		m_MouseOffsetRangeMax = 145;//in degrees max
+		m_MouseOffsetDistance = 1.25;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.4;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0075;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/P1Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/P1Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..91029072fffd1be5a95d49b90cfca79939a4eeac
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/P1Recoil.c
@@ -0,0 +1,28 @@
+class P1Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.5,3); point_1[1] = 3; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 4; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-2,-4); point_3[1] = 2; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.6,-0.2); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.5;
+		
+		m_MouseOffsetRangeMin = 75;//in degrees min
+		m_MouseOffsetRangeMax = 105;//in degrees max
+		m_MouseOffsetDistance = 1.2;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.65;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/PP19Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/PP19Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..44e6e2c647622dc3322ef998e78722fa2ae28a0e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/PP19Recoil.c
@@ -0,0 +1,28 @@
+class PP19Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,1.25); point_1[1] = 1.25; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 1.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-1.5); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 60;//in degrees min
+		m_MouseOffsetRangeMax = 125;//in degrees max
+		m_MouseOffsetDistance = 1.2;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.4;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0075;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/RepeaterRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/RepeaterRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..865a8916ccb9391a8aed6f69f782c37f1146d502
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/RepeaterRecoil.c
@@ -0,0 +1,28 @@
+class RepeaterRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,0.75); point_1[1] = 2.5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.75); point_3[1] = 1.75; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;	
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.4;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+			
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ruger1022Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ruger1022Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..9d1ab90ce39b8feab7f52ef65b100295c1acc63b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ruger1022Recoil.c
@@ -0,0 +1,28 @@
+class Ruger1022Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,1); point_1[1] = 1; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 1.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.05); point_4[1] = 0.5; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 80;//in degrees max
+		m_MouseOffsetDistance = 0.20;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SKSRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SKSRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff1ce91c481ba799ccd0a8c84b44474d450d95f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SKSRecoil.c
@@ -0,0 +1,28 @@
+class SKSRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,0.75); point_1[1] = 1.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 2; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,-1.5); point_3[1] = 1.33; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 50;//in degrees min
+		m_MouseOffsetRangeMax = 120;//in degrees max
+		m_MouseOffsetDistance = 1.4;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.015;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SSG82Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SSG82Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..2f3f6a1f22cdf98a45f60e91a08640d27606a49d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SSG82Recoil.c
@@ -0,0 +1,28 @@
+class SSG82Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,0.75); point_1[1] = 1.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 1.0; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.75); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.225;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 120;//in degrees max
+		m_MouseOffsetDistance = 1.25;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0725;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/ScoutRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/ScoutRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..1429d4c2120ee28083855f245def92c56533810e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/ScoutRecoil.c
@@ -0,0 +1,28 @@
+class ScoutRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.5); point_1[1] = 1.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.5); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.1;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SiagaRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SiagaRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..73fb1f9f3f8452ebbcb70db1b553116a579e1c42
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SiagaRecoil.c
@@ -0,0 +1,28 @@
+class SiagaRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,1.0,1.5); point_1[1] = 3; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 4; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1.5,-2); point_3[1] = 1; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-0.25); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.4;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 130;//in degrees max
+		m_MouseOffsetDistance = 4.5;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.15;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.05; //0.0125;
+		m_CamOffsetRelativeTime = 0.5;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SkorpionRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SkorpionRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..721647853879eb860bb3aeeaec182deb2d3144e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SkorpionRecoil.c
@@ -0,0 +1,28 @@
+class Cz61Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.33,1.25); point_1[1] = 1.25; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-1,1); point_2[1] = 1.75; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-1.5); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 0.75;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.35;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0075;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SvdRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SvdRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d3afaedc9137d0aceaef7ea71d8ef62ddfd4577
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/SvdRecoil.c
@@ -0,0 +1,28 @@
+class SvdRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.2,0.5); point_1[1] = 0.75; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.2,0.2); point_2[1] = 0.25; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.1,0.5); point_3[1] = 0.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 1;
+		
+		m_MouseOffsetRangeMin = 45;//in degrees min
+		m_MouseOffsetRangeMax = 110;//in degrees max
+		m_MouseOffsetDistance = 1.8;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.5;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.015;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ump45Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ump45Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..591fb0b2f4bd03ecd65ed4c6c65b9960c9d8b3e6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Ump45Recoil.c
@@ -0,0 +1,28 @@
+class Ump45Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.4,1.15); point_1[1] = 0.9; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.85,0.55); point_2[1] = 0.85; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-1.15); point_3[1] = 0.95; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.6; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.4;
+		
+		m_MouseOffsetRangeMin = 55;//in degrees min
+		m_MouseOffsetRangeMax = 120;//in degrees max
+		m_MouseOffsetDistance = 1.2;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.4;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.0075;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/VSSRecoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/VSSRecoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a525741ace8ab9026504e3aaec26e30e2d3b313
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/VSSRecoil.c
@@ -0,0 +1,28 @@
+class VSSRecoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.25,0.55); point_1[1] = 0.5; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,0.5); point_2[1] = 0.7; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.75,-1.25); point_3[1] = 0.4; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 1; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.25;	
+		
+		m_MouseOffsetRangeMin = 65;//in degrees min
+		m_MouseOffsetRangeMax = 105;//in degrees max
+		m_MouseOffsetDistance = 0.7;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.25;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+		
+		m_CamOffsetDistance = 0.0075;
+		m_CamOffsetRelativeTime = 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Winchester70Recoil.c b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Winchester70Recoil.c
new file mode 100644
index 0000000000000000000000000000000000000000..047c80e4e261cfefe30ea4b8979204b1beb13b5b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RecoilBase/Recoils/Winchester70Recoil.c
@@ -0,0 +1,28 @@
+class Winchester70Recoil: RecoilBase
+{
+	override void Init()
+	{
+		vector point_1;
+		vector point_2;
+		vector point_3;
+		vector point_4;
+		point_1[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,0.5,0.75); point_1[1] = 2.25; point_1[2] = 0;
+		point_2[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.25,0.25); point_2[1] = 2.5; point_2[2] = 0;
+		point_3[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.75); point_3[1] = 1.5; point_3[2] = 0;
+		point_4[0] = m_Player.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSRecoil,-0.5,-0.1); point_4[1] = 0.75; point_4[2] = 0;
+		m_HandsCurvePoints.Insert(point_1);//forms a 2 dimensional spline(z is ignored)
+		m_HandsCurvePoints.Insert(point_2);
+		m_HandsCurvePoints.Insert(point_3);
+		m_HandsCurvePoints.Insert(point_4);
+		m_HandsCurvePoints.Insert("0 0 0");
+		m_HandsOffsetRelativeTime = 0.125;
+		
+		m_MouseOffsetRangeMin = 80;//in degrees min
+		m_MouseOffsetRangeMax = 100;//in degrees max
+		m_MouseOffsetDistance = 1.25;//how far should the mouse travel
+		m_MouseOffsetRelativeTime = 0.0625;//[0..1] a time it takes to move the mouse the required distance relative to the reload time of the weapon(firing mode)
+	
+		m_CamOffsetDistance = 0.02;
+		m_CamOffsetRelativeTime = 0.125;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RemotePlayerDebug/DamageData.c b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/DamageData.c
new file mode 100644
index 0000000000000000000000000000000000000000..1b0d7dd9d63e32464acdea114c0494f1eb18d818
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/DamageData.c
@@ -0,0 +1,30 @@
+class DamageData
+{
+	float m_ValueGlobal;
+	float m_ValueBlood;
+	float m_ValueShock;
+
+	void DamageData(float value_global, float value_blood, float value_shock)
+	{
+		m_ValueGlobal = value_global;
+		m_ValueBlood = value_blood;
+		m_ValueShock = value_shock;
+	}
+
+	float GetValueGlobal()
+	{
+		return m_ValueGlobal;
+	}
+	
+	float GetValueShock()
+	{
+		return m_ValueShock;
+	}
+	
+	float GetValueBlood()
+	{
+		return m_ValueBlood;
+	}
+	
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerDamageDebug.c b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerDamageDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..4021c229b0b3ed468985cec0cf0c68eb0a9d03e4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerDamageDebug.c
@@ -0,0 +1,74 @@
+class RemotePlayerDamageDebug
+{
+	const int MAX_DAMAGE_RECORDS = 5;
+	PlayerBase m_Player;
+	bool m_ChangedSinceSerialization;
+	
+	ref array<ref DamageData> m_DamageList = new array<ref DamageData>;
+	
+	void RemotePlayerDamageDebug(PlayerBase player)
+	{
+		m_Player = player;
+	}
+	
+	void AddDamage(float value_global, float value_blood, float value_shock)
+	{
+		m_ChangedSinceSerialization = true;
+		DamageData damage_data = new DamageData( value_global, value_blood, value_shock );
+		m_DamageList.InsertAt(damage_data,0);
+		if( m_DamageList.Count() > MAX_DAMAGE_RECORDS )
+		{
+			m_DamageList.RemoveOrdered(MAX_DAMAGE_RECORDS);
+		}
+	}
+	
+	void InsertDamageObject(DamageData damage_object)
+	{
+		m_DamageList.Insert(damage_object);
+	}
+	
+
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+	
+	
+	void Get(array<ref DamageData> damage_list)
+	{
+		for(int i = 0; i < m_DamageList.Count(); i++)
+		{
+			damage_list.Insert(m_DamageList.Get(i));
+		}
+	}
+	
+	void GetReversed(array<ref DamageData> damage_list)
+	{
+		int index = m_DamageList.Count() - 1;
+		for(; index >= 0; index--)
+		{
+			damage_list.Insert(m_DamageList.Get(index));
+		}
+	}
+	
+	void Serialize(array<ref RemotePlayerDamageDebug> list)
+	{
+		if( m_ChangedSinceSerialization )
+		{
+			list.Insert(this);
+		}
+		m_ChangedSinceSerialization = false;
+	}
+	
+	void Debug()
+	{
+		string output;
+		for(int i = 0; i < m_DamageList.Count(); i++)
+		{
+			output = output + m_DamageList.Get(i).ToString() + ", ";
+		}
+		PrintString("damage values for player " + m_Player.ToString()+":" + output);
+		
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerMeta.c b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerMeta.c
new file mode 100644
index 0000000000000000000000000000000000000000..9535caee50947925e2d2428fc138befaefaeb0ae
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerMeta.c
@@ -0,0 +1,31 @@
+class RemotePlayerMeta
+{
+	eRemoteDebugType 	m_DebugType;
+	PlayerBase 			m_Player;
+	
+	void RemotePlayerMeta(PlayerBase player, eRemoteDebugType type )
+	{
+		m_Player = player;
+		m_DebugType = type;
+	}
+	
+	void SetDebugType(eRemoteDebugType type)
+	{
+		m_DebugType = type;
+	}
+	
+	eRemoteDebugType GetDebugType(eRemoteDebugType type)
+	{
+		return m_DebugType;
+	}
+	
+	void SetPlayer(PlayerBase player)
+	{
+		m_Player = player;
+	}
+	
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerStatDebug.c b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerStatDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..334f8fc76237e202a7c89966dae90df10031600a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/RemotePlayerDebug/RemotePlayerStatDebug.c
@@ -0,0 +1,96 @@
+enum eRemoteStatType
+{
+	NONE,
+	DAMAGE_SYSTEM = 1,
+	PLAYER_STATS = 2,
+	OTHER = 4,
+}
+
+
+class RemotePlayerStatDebug
+{
+	PlayerBase m_Player;
+	ref array<ref StatDebugObject> m_Stats = new array<ref StatDebugObject>;
+	string m_Name;
+	vector m_Pos;
+	void RemotePlayerStatDebug(PlayerBase player)
+	{
+		m_Player = player;
+		Init();
+
+	}
+	
+	void Init()
+	{
+		UpdatePlayerStatsValues();
+		InjectDamageSystemValues();
+		m_Pos = m_Player.GetWorldPosition();
+		m_Name = m_Player.GetIdentity().GetName();
+	}
+	
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+	
+	void UpdatePlayerStatsValues()
+	{
+		m_Player.GetPlayerStats().GetDebugInfo(m_Stats, 0);
+	}
+	
+	void InjectDamageSystemValues()
+	{
+		m_Stats.Insert( new StatDebugObject("Health", m_Player.GetHealth("",""), eRemoteStatType.DAMAGE_SYSTEM) );
+		m_Stats.Insert( new StatDebugObject("Blood", m_Player.GetHealth("","Blood"), eRemoteStatType.DAMAGE_SYSTEM) );
+		m_Stats.Insert( new StatDebugObject("Shock", m_Player.GetHealth("","Shock"), eRemoteStatType.DAMAGE_SYSTEM) );
+	}
+	
+	void SerializeNames(array<string> names, eRemoteDebugType type)
+	{
+		for(int i = 0; i < m_Stats.Count(); i++)
+		{
+			if( type ==  eRemoteDebugType.ALL )
+			{
+				names.Insert(m_Stats.Get(i).GetName());
+			}
+			else if( type ==  eRemoteDebugType.DAMAGE_ONLY )
+			{
+				StatDebugObject obj = m_Stats.Get(i);
+				eRemoteStatType debug_type = obj.GetType();
+				if(debug_type == eRemoteStatType.DAMAGE_SYSTEM)
+				{
+					names.Insert(m_Stats.Get(i).GetName());
+				}
+			}
+		}
+	}
+	
+	void SerializeValues(array<string> values, eRemoteDebugType type)
+	{
+		for(int i = 0; i < m_Stats.Count(); i++)
+		{
+			if( type ==  eRemoteDebugType.ALL )
+			{
+				values.Insert(m_Stats.Get(i).GetValue());
+			}
+			else if( type ==  eRemoteDebugType.DAMAGE_ONLY )
+			{
+				StatDebugObject obj = m_Stats.Get(i);
+				eRemoteStatType debug_type = obj.GetType();
+				if(debug_type == eRemoteStatType.DAMAGE_SYSTEM)
+				{
+					values.Insert(m_Stats.Get(i).GetValue());
+				}
+			}
+		}
+	}
+	
+	void Debug()
+	{
+		for(int i = 0; i < m_Stats.Count(); i++)
+		{
+			m_Stats.Get(i).Debug();
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SceneEditor/SceneData.c b/scripts/4_World/DayZ/Classes/SceneEditor/SceneData.c
new file mode 100644
index 0000000000000000000000000000000000000000..e76c2e36e700176181b7280c61d3fdca2ac1084c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SceneEditor/SceneData.c
@@ -0,0 +1,393 @@
+class SceneData
+{
+	protected string	m_NameScene;
+	protected string	m_NameMission;
+	protected float 	m_InitTime;
+	protected int 		m_DateInitYear;
+	protected int		m_DateInitMonth;
+	protected int		m_DateInitDay;
+	protected int		m_DateInitHour;
+	protected int		m_DateInitMinute;
+	protected float 	m_WeaterInitOvercast;
+	protected float 	m_WeaterInitRain;
+	protected float 	m_WeaterInitFog;
+	protected float 	m_WeaterInitWindForce;
+	
+	protected ref array<ref SceneObject>	m_Objects;
+	protected ref array<ref ScenePlayer>	m_Players;
+	protected ref array<ref SceneObject>	m_AllObjs;
+	
+	//========================================
+	// Constructor -> SceneData
+	//========================================
+	void SceneData()
+	{
+		m_Objects = new array<ref SceneObject>;
+		m_Players = new array<ref ScenePlayer>;
+		m_AllObjs = new array<ref SceneObject>;
+	}
+	
+	//========================================
+	// GetSceneObjects
+	//========================================
+	array<ref SceneObject> GetSceneObjects()
+	{
+		return m_Objects;
+	}
+	
+	//========================================
+	// GetScenePlayers
+	//========================================
+	array<ref ScenePlayer> GetScenePlayers()
+	{
+		return m_Players;
+	}
+	
+	//========================================
+	// GetSceneObjectsAll
+	//========================================
+	array<ref SceneObject> GetSceneObjectsAll()
+	{
+		array<ref ScenePlayer> scene_players = GetScenePlayers();
+		array<ref SceneObject> scene_object = GetSceneObjects();
+		
+		m_AllObjs.Clear();
+		
+		foreach (auto p: scene_players)
+		{
+			m_AllObjs.Insert(p);
+		}
+		
+		foreach (auto o: scene_object)
+		{
+			m_AllObjs.Insert(o);
+		}
+		
+		
+		
+		return m_AllObjs;
+	}
+	
+	//========================================
+	// GetNameScene
+	//========================================
+	string GetNameScene()
+	{
+		return m_NameScene;
+	}
+	
+	//========================================
+	// SetNameScene
+	//========================================
+	void SetNameScene(string name)
+	{
+		m_NameScene = name;
+	}
+	
+	//========================================
+	// GetNameMission
+	//========================================
+	string GetNameMission()
+	{
+		return m_NameMission;
+	}
+	
+	//========================================
+	// SetNameMission
+	//========================================
+	void SetNameMission(string name)
+	{
+		m_NameMission = name;
+	}
+	
+	//========================================
+	// GetInitTime
+	//========================================
+	float GetInitTime()
+	{
+		return m_InitTime;
+	}
+	
+	//========================================
+	// SetInitTime
+	//========================================
+	void SetInitTime(float time)
+	{
+		m_InitTime = time;
+	}
+	
+	
+	//========================================
+	// GetInitYear
+	//========================================
+	int GetInitYear()
+	{
+		return m_DateInitYear;
+	}
+	
+	//========================================
+	// SetInitYear
+	//========================================
+	void SetInitYear(int value)
+	{
+		m_DateInitYear = value;
+		GetGame().GetWorld().SetDate( m_DateInitYear, m_DateInitMonth, m_DateInitDay, m_DateInitHour, m_DateInitMinute );
+	}
+	
+	//========================================
+	// GetInitMonth
+	//========================================
+	int GetInitMonth()
+	{
+		return m_DateInitMonth;
+	}
+	
+	//========================================
+	// SetInitMonth
+	//========================================
+	void SetInitMonth(int value)
+	{
+		m_DateInitMonth = value;
+		GetGame().GetWorld().SetDate( m_DateInitYear, m_DateInitMonth, m_DateInitDay, m_DateInitHour, m_DateInitMinute );
+	}
+	
+	//========================================
+	// GetInitDay
+	//========================================
+	int GetInitDay()
+	{
+		return m_DateInitDay;
+	}
+	
+	//========================================
+	// SetInitDay
+	//========================================
+	void SetInitDay(int value)
+	{
+		m_DateInitDay = value;
+		GetGame().GetWorld().SetDate( m_DateInitYear, m_DateInitMonth, m_DateInitDay, m_DateInitHour, m_DateInitMinute );
+	}
+	
+	//========================================
+	// GetInitHour
+	//========================================
+	int GetInitHour()
+	{
+		return m_DateInitHour;
+	}
+	
+	//========================================
+	// SetInitHour
+	//========================================
+	void SetInitHour(int value)
+	{
+		m_DateInitHour = value;
+		GetGame().GetWorld().SetDate( m_DateInitYear, m_DateInitMonth, m_DateInitDay, m_DateInitHour, m_DateInitMinute );
+	}
+	
+	//========================================
+	// GetInitMinute
+	//========================================
+	int GetInitMinute()
+	{
+		return m_DateInitMinute;
+	}
+	
+	//========================================
+	// SetInitMinute
+	//========================================
+	void SetInitMinute(int value)
+	{
+		m_DateInitMinute = value;
+		GetGame().GetWorld().SetDate( m_DateInitYear, m_DateInitMonth, m_DateInitDay, m_DateInitHour, m_DateInitMinute );
+	}
+	
+	//========================================
+	// GetInitOvercast
+	//========================================
+	float GetInitOvercast()
+	{
+		return m_WeaterInitOvercast;
+	}
+	
+	//========================================
+	// SetInitOvercast
+	//========================================
+	void SetInitOvercast(float value)
+	{
+		m_WeaterInitOvercast = value;
+		GetGame().GetWeather().GetOvercast().Set( value, 0, 1000 );
+	}
+	
+	//========================================
+	// GetInitRain
+	//========================================
+	float GetInitRain()
+	{
+		return m_WeaterInitRain;
+	}
+	
+	//========================================
+	// SetInitRain
+	//========================================
+	void SetInitRain(float value)
+	{
+		m_WeaterInitRain = value;
+		GetGame().GetWeather().GetRain().Set( value, 0, 1000 );
+	}
+	
+	//========================================
+	// GetInitFog
+	//========================================
+	float GetInitFog()
+	{
+		return m_WeaterInitFog;
+	}
+	
+	//========================================
+	// SetInitFog
+	//========================================
+	void SetInitFog(float value)
+	{
+		m_WeaterInitFog = value;
+		GetGame().GetWeather().GetFog().Set( value, 0, 1000 );
+	}
+	
+	//========================================
+	// GetInitWindForce
+	//========================================
+	float GetInitWindForce()
+	{
+		return m_WeaterInitWindForce;
+	}
+	
+	//========================================
+	// SetInitWindForce
+	//========================================
+	void SetInitWindForce(float value)
+	{
+		// The following method SetWindSpeed does not support smaller values than 0.1!
+		if (value > 0.1)
+		{
+			m_WeaterInitWindForce = value;
+		}
+		else
+		{
+			m_WeaterInitWindForce = 0.1;
+		}
+		
+		GetGame().GetWeather().SetWindSpeed( m_WeaterInitWindForce );
+	}
+	
+	//========================================
+	// CreateSceneObject
+	//========================================
+	SceneObject CreateSceneObject(string obj_name, vector pos)
+	{
+		SceneObject sc_obj = new SceneObject();
+		sc_obj.Init(obj_name, pos);
+		
+		if ( sc_obj != NULL )
+		{
+			m_Objects.Insert(sc_obj);
+				
+			return sc_obj;
+		}
+		
+		return NULL;
+	}
+	
+	//========================================
+	// CreateScenePlayer
+	//========================================
+	ScenePlayer CreateScenePlayer()
+	{
+		ScenePlayer sc_ply = new ScenePlayer();
+		sc_ply.Init(STRING_EMPTY, Vector(0,0,0));
+		
+		m_Players.Insert(sc_ply);
+//PrintString("CreateScenePlayer Add => "+ m_Players.Count().ToString() );
+		return sc_ply;
+	}
+	
+	//========================================
+	// Clear
+	//========================================
+	void Clear()
+	{
+		m_Objects.Clear();
+		m_Players.Clear();
+		m_AllObjs.Clear();
+	}
+	
+	//========================================
+	// AddObject
+	//========================================
+	SceneObject AddObject(EntityAI e)
+	{
+		SceneObject sc_obj = new SceneObject();
+		sc_obj.Init("player", e.GetPosition());
+		
+		sc_obj.LinkEntityAI( e );
+		
+		if ( sc_obj.IsPlayer() )
+		{
+			m_Players.Insert( ScenePlayer.Cast( sc_obj ) );
+		}
+		else
+		{
+			m_Objects.Insert( sc_obj );
+		}		
+		
+		return sc_obj;
+	}
+	
+	//========================================
+	// GetSceneObjectByEntityAI
+	//========================================
+	SceneObject GetSceneObjectByEntityAI(EntityAI e)
+	{
+		for ( int i = 0; i < m_Players.Count(); ++i )
+		{
+			EntityAI ply = m_Players.Get(i).GetObject();
+			
+			if ( ply != NULL && ply == e )
+			{
+				return m_Players.Get(i);
+			}	
+		}
+		
+		for ( int j = 0; j < m_Objects.Count(); ++j )
+		{
+			EntityAI obj = m_Objects.Get(j).GetObject();
+			
+			if ( obj != NULL && obj == e )
+			{
+				return m_Objects.Get(j);
+			}	
+		}
+		
+		return NULL;	
+	}
+	
+	//========================================
+	// DeleteSceneObject
+	//========================================
+	void DeleteSceneObject(SceneObject scene_object)
+	{
+		int index_p = m_Players.Find( ScenePlayer.Cast( scene_object ) );
+		
+		if ( index_p != -1 )
+		{
+			m_Players.Remove(index_p);
+		}
+		
+		
+		int index_o = m_Objects.Find(scene_object);
+		
+		if ( index_o != -1 )
+		{
+			m_Objects.Remove(index_o);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SceneEditor/SceneObject.c b/scripts/4_World/DayZ/Classes/SceneEditor/SceneObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..01b33b89a4cbcff964f50abea31bba3db4c37ad4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SceneEditor/SceneObject.c
@@ -0,0 +1,609 @@
+class SceneObject
+{
+	static const int	COLOR_OBJ_BBOX_NORMAL	= 0x00000000;
+	static const int	COLOR_OBJ_BBOX_SELECT	= 0x1f007C00;
+	
+	protected EntityAI						m_ObjectPtr;
+	protected Shape								m_DebugShapeBBox;
+	protected string							m_InitScript;
+	protected string							m_ObjectName;
+	protected string							m_ObjectNameOrigin;
+	
+	protected ref array<SceneObject>		m_LinkedSceneObjects;
+	protected ref map<SceneObject, Shape>	m_LinkedSceneObjectsShapes;
+	
+	ref array<int>							m_LinkedSceneObjectsIndices;
+	
+	//========================================
+	// SceneObject
+	//========================================
+	SceneObject Init(string obj_name, vector pos)
+	{
+		if (obj_name != STRING_EMPTY)
+		{
+			m_ObjectNameOrigin = obj_name;
+			
+			bool is_ai = GetGame().IsKindOf(obj_name, "DZ_LightAI");
+			
+			PluginDeveloper module_dev = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+			EntityAI e = module_dev.SpawnEntityOnGroundPos(PluginSceneManager.PLAYER, obj_name, 100, 0.0, pos);
+			
+			if (e != NULL)
+			{
+				if (e.IsInherited(ItemBase)) 
+				{		
+					ItemBase item = ItemBase.Cast(e);
+					if (item.HasQuantity())
+						item.SetQuantity(item.GetQuantityMax());
+				}
+				
+				m_ObjectName = e.GetType();
+				LinkEntityAI(e);
+			}
+			else if (obj_name != "player")
+			{
+				return NULL;
+			}
+		}
+		
+		m_LinkedSceneObjects = new array<SceneObject>;
+		m_LinkedSceneObjectsShapes = new map<SceneObject, Shape>;
+		m_LinkedSceneObjectsIndices = new array<int>;
+	
+		return this;
+	}
+	
+	//----------------------------------------
+	// GetObject
+	//----------------------------------------
+	EntityAI GetObject()
+	{
+		return m_ObjectPtr;
+	}
+	
+	//----------------------------------------
+	// GetName
+	//----------------------------------------
+	string GetName()
+	{
+		return m_ObjectName;
+	}
+	
+	//----------------------------------------
+	// IsPlayer
+	//----------------------------------------
+	bool IsPlayer()
+	{
+		return false;
+	}
+	
+	//----------------------------------------
+	// GetInitScript
+	//----------------------------------------
+	string GetInitScript()
+	{
+		return m_InitScript;
+	}
+	
+	//----------------------------------------
+	// SetInitScript
+	//----------------------------------------
+	void SetInitScript(string init_script)
+	{
+		m_InitScript = init_script;
+	}
+	
+	//========================================
+	// EditorShapeUpdatePos
+	//========================================
+	void EditorShapeUpdatePos()
+	{
+		if (m_DebugShapeBBox != NULL)
+		{		
+			vector mat[4];
+			GetObject().GetTransform(mat);
+		
+			if (m_DebugShapeBBox != NULL)
+			{
+				m_DebugShapeBBox.SetMatrix(mat);
+			}
+		}
+	}
+	
+	//========================================
+	// EditorShapeSetColor
+	//========================================
+	void EditorShapeSetColor(int color)
+	{
+		if (m_DebugShapeBBox)
+		{
+			m_DebugShapeBBox.SetColor(color);
+		}
+	}
+	
+	//========================================
+	// EditorShapeSelect
+	//========================================
+	void EditorShapeSelect()
+	{
+		EditorShapeSetColor(COLOR_OBJ_BBOX_SELECT);
+	}
+	
+	//========================================
+	// EditorShapeDeselect
+	//========================================
+	void EditorShapeDeselect()
+	{
+		EditorShapeSetColor(COLOR_OBJ_BBOX_NORMAL);
+	}
+	
+	//========================================
+	// GetSize
+	//========================================
+	vector GetSize()
+	{
+		vector size = Vector(1,1,1);
+		vector min_max[2];
+		
+		if (GetObject())
+		{	
+			GetObject().GetCollisionBox(min_max);
+			
+			size[0] = min_max[1][0] - min_max[0][0];
+			size[2] = min_max[1][2] - min_max[0][2];
+			size[1] = min_max[1][1] - min_max[0][1];
+			
+			return size;
+		}
+		else
+		{
+			Print("Error: SceneObject "+ m_ObjectNameOrigin +" dont has game object.");
+		}
+
+		return size;
+	}
+	
+	//========================================
+	// EditorShapeAdd
+	//========================================
+	void EditorShapeAdd()
+	{	
+		if (m_DebugShapeBBox != NULL)
+			return;
+		
+		vector min		= "0 0 0";
+		vector max		= "0 0 0";
+	
+		vector size = GetSize();
+		
+		float width		= size[0];
+		float height	= size[1];
+		float length	= size[2];		
+		
+		float width_h = width*0.5;
+		float lenght_h = length*0.5;
+		
+		min[0] = -width_h;
+		min[1] = 0;
+		min[2] = -lenght_h;
+		
+		max[0] = width_h;
+		max[1] = height;
+		max[2] = lenght_h;
+		
+		//Log("EditorShapeAdd -> "+m_ObjectPtr.Ptr().GetType());
+		
+		m_DebugShapeBBox = Debug.DrawBox(min, max);
+		EditorShapeUpdatePos();
+		EditorShapeDeselect();
+	}
+	
+	//========================================
+	// EditorShapeRemove
+	//========================================
+	void EditorShapeRemove()
+	{
+		if (m_DebugShapeBBox != NULL)
+		{
+			m_DebugShapeBBox.Destroy();
+			m_DebugShapeBBox = NULL;
+		}
+	}
+	
+	//========================================
+	// EditorLineRemove
+	//========================================
+	void EditorLineRemove(SceneObject obj)
+	{
+		for (int i = 0; i < m_LinkedSceneObjectsShapes.Count(); i++)
+		{
+			if (m_LinkedSceneObjectsShapes.GetKey(i) == obj)
+			{
+				m_LinkedSceneObjectsShapes.GetElement(i).Destroy();
+				m_LinkedSceneObjectsShapes.Remove(obj);
+				break;
+			}
+		}
+	}
+	
+	//========================================
+	// EditorLineAdd
+	//========================================
+	void EditorLineAdd(SceneObject obj)
+	{
+		if (obj.GetObject() != NULL && GetObject() != NULL)
+		{
+			if (m_LinkedSceneObjectsShapes.Contains(obj))
+			{
+				EditorLineRemove(obj);
+			}
+			
+			vector pos1 = obj.GetSize();
+			pos1[0] = 0; pos1[1] = pos1[1] / 2; pos1[2] = 0;
+			pos1 = pos1 + obj.GetObject().GetPosition();
+			
+			vector pos2 = GetSize();
+			pos2[0] = 0; pos2[1] = pos2[1] / 2; pos2[2] = 0;
+			pos2 = pos2 + GetObject().GetPosition();
+			
+			m_LinkedSceneObjectsShapes.Insert(obj, Debug.DrawArrow(pos1, pos2));
+		}
+	}
+	
+	//========================================
+	// LinkEntityAI
+	//========================================
+	void LinkEntityAI(EntityAI e)
+	{
+		m_ObjectPtr = e;
+	}
+	
+	//========================================
+	// IsLinkedWithSceneObject
+	//========================================
+	bool IsLinkedWithSceneObject(SceneObject scene_object)
+	{
+		int index = m_LinkedSceneObjects.Find(scene_object);
+		if (index >= 0)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	//========================================
+	// LinkEntityAI
+	//========================================
+	void LinkSceneObject(SceneObject scene_object, bool draw_line = true)
+	{
+		if (!IsLinkedWithSceneObject(scene_object))
+		{
+			if (draw_line)
+			{
+				EditorLineAdd(scene_object);
+			}
+			m_LinkedSceneObjects.Insert(scene_object);
+		}
+	}
+	
+	//========================================
+	// UnlinkSceneObject
+	//========================================
+	void UnlinkSceneObject(SceneObject scene_object)
+	{
+		int index = m_LinkedSceneObjects.Find(scene_object);
+		if (index >= 0 && index < m_LinkedSceneObjects.Count())
+		{
+			EditorLineRemove(scene_object);
+			m_LinkedSceneObjects.Remove(index);
+		}
+	}
+	
+	//========================================
+	// UnlinkAll
+	//========================================
+	void UnlinkAll()
+	{
+		int link_count = GetLinkedSceneObjectsCount();
+		
+		if (link_count > 0)
+		{
+			for (int i = 0; i < link_count; ++i)
+			{
+				PluginSceneManager.GetInstance().UnlinkSceneObjects(this, GetLinkedSceneObject(0));
+			}			
+		}
+	}
+		
+	//========================================
+	// GetLinkedSceneObjects
+	//========================================
+	array<SceneObject> GetLinkedSceneObjects()
+	{
+		return m_LinkedSceneObjects;
+	}
+	
+	//========================================
+	// GetLinkedSceneObjectsCount
+	//========================================
+	int GetLinkedSceneObjectsCount()
+	{
+		return m_LinkedSceneObjects.Count();
+	}
+	
+	//========================================
+	// GetLinkedSceneObject
+	//========================================
+	SceneObject GetLinkedSceneObject(int i)
+	{
+		return m_LinkedSceneObjects.Get(i);
+	}
+	
+	//========================================
+	// GetLinkedObject
+	//========================================
+	EntityAI GetLinkedObject(int i)
+	{
+		return GetLinkedSceneObject(i).GetObject();
+	}
+	
+	//========================================
+	// Destructor
+	//========================================
+	void ~SceneObject()
+	{
+		if (m_ObjectPtr && m_ObjectPtr != GetGame().GetPlayer())
+		{
+			GetGame().ObjectDelete(m_ObjectPtr);
+			m_ObjectPtr = NULL;
+		}
+		
+		for (int i = 0; i < m_LinkedSceneObjects.Count(); i++)
+		{
+			EditorLineRemove(m_LinkedSceneObjects.Get(i));
+		}
+		
+		EditorShapeRemove();
+	}
+	
+	//========================================
+	// GetTypeName
+	//========================================
+	string GetTypeName()
+	{
+		return m_ObjectPtr.GetType();
+	}
+	
+	//========================================
+	// PlaceOnSurface
+	//========================================
+	void PlaceOnSurface()
+	{
+		if (m_ObjectPtr)
+		{
+			if (GetGame().IsClient() && GetGame().IsMultiplayer())
+			{
+				Param par = new Param3<string, EntityAI, Param>("PlaceOnSurface" , m_ObjectPtr, NULL);
+				SceneObjectSynch(par);			
+			}
+			else
+			{
+				m_ObjectPtr.PlaceOnSurface();
+			}
+		}
+	}
+	
+	//========================================
+	// SetPosition
+	//========================================
+	void SetPosition(vector pos)
+	{
+		if (m_ObjectPtr) 
+		{
+			if (GetGame().IsClient() && GetGame().IsMultiplayer())
+			{
+				Param par = new Param3<string, EntityAI, Param>("SetPosition" , m_ObjectPtr, new Param1<vector>(pos));
+				SceneObjectSynch(par);			
+			}
+			else
+			{
+				m_ObjectPtr.SetPosition(pos);
+			}
+		}
+		PlaceOnSurface();
+		EditorShapeUpdatePos();
+	}
+	
+	//========================================
+	// GetPosition
+	//========================================
+	vector GetPosition()
+	{
+		if (m_ObjectPtr)
+			return m_ObjectPtr.GetPosition();
+		return Vector(0,0,0);
+	}
+	
+	//========================================
+	// GetHealth
+	//========================================
+	float GetHealth()
+	{
+		if (m_ObjectPtr)
+			return m_ObjectPtr.GetHealth("", "");
+		return 0;
+	}
+	
+	//========================================
+	// GetHealth
+	//========================================
+	float GetMaxHealth()
+	{
+		if (m_ObjectPtr)
+			return m_ObjectPtr.GetMaxHealth("", "");
+		return 0;
+	}
+	
+	//========================================
+	// SetHealth
+	//========================================
+	void SetHealth(float value)
+	{
+		if (m_ObjectPtr)
+		{
+			if (GetGame().IsClient() && GetGame().IsMultiplayer())
+			{
+				Param par = new Param3<string, EntityAI, Param>("SetHealth" , m_ObjectPtr, new Param1<float>(value));
+				SceneObjectSynch(par);			
+			}
+			else
+			{
+				m_ObjectPtr.SetHealth("", "", value);
+			}
+		}
+	}
+		
+	//========================================
+	// GetPositionAsString
+	//========================================
+	string GetPositionAsString()
+	{
+		if (m_ObjectPtr)
+			return m_ObjectPtr.GetPosition().ToString(false);
+		return Vector(0,0,0).ToString(false);
+	}
+	
+	//========================================
+	// SetPositionAsString
+	//========================================
+	void SetPositionAsString(string string_pos)
+	{
+		SetPosition(string_pos.ToVector());
+	}
+	
+	//========================================
+	// GetRotation
+	//========================================
+	float GetRotation()
+	{
+		if (m_ObjectPtr)
+		{
+			vector v = m_ObjectPtr.GetOrientation();
+			return v[0];
+		}
+
+		return 0;
+	}
+	
+	//========================================
+	// SetRotation
+	//========================================
+	void SetRotation(float rot)
+	{
+		if (m_ObjectPtr)
+		{
+			vector v = m_ObjectPtr.GetOrientation();
+			v[0] = rot;
+			m_ObjectPtr.SetOrientation(v);
+			EditorShapeUpdatePos();
+		}
+	}
+	
+	void SceneObjectSynch(Param p)
+	{
+		GetGame().RPCSingleParam(GetGame().GetPlayer(), ERPCs.RPC_SYNC_SCENE_OBJECT, p, true, NULL);
+	}
+	
+	//========================================
+	// AddRotation
+	//========================================
+	void AddRotation(float add_rot)
+	{
+		if (m_ObjectPtr)
+		{
+			if (GetGame().IsClient() && GetGame().IsMultiplayer())
+			{
+				Param par = new Param3<string, EntityAI, Param>("AddRotation" , m_ObjectPtr, new Param1<float>(add_rot));
+				SceneObjectSynch(par);			
+			}
+			else
+			{
+				vector v = m_ObjectPtr.GetOrientation();
+				v[0] = v[0] + add_rot;
+				m_ObjectPtr.SetOrientation(v);
+			
+				EditorShapeUpdatePos();
+			}
+		}		
+	}
+	
+	//========================================
+	// AddRotation
+	//========================================
+	void AddAttachment(string att_name)
+	{
+		GetObject().GetInventory().CreateAttachment(att_name);
+	}
+	
+	//========================================
+	// CanAttachment
+	//========================================
+	bool CanAttachment(EntityAI e)
+	{
+		return GetObject().GetInventory().CanAddAttachment(e);
+	}
+	
+	//========================================
+	// AddRotation
+	//========================================
+	void RemoveAttachment(EntityAI e)
+	{
+		GetGame().ObjectDelete(e);
+	}
+	
+	//========================================
+	// GetAttachments
+	//========================================
+	array<EntityAI> GetAttachments()
+	{
+		array<EntityAI> ret = new array<EntityAI>;
+		
+		for (int i = 0; i < GetObject().GetInventory().AttachmentCount(); ++i)
+		{
+			ret.Insert(GetObject().GetInventory().GetAttachmentFromIndex(i));
+		}
+		
+		return ret;
+	}
+	
+	//========================================
+	// GetConfigAttachments
+	//========================================
+	TStringArray GetConfigAttachments()
+	{
+		string			type_name = GetTypeName();
+		TStringArray	cfg_attachments = new TStringArray;
+		
+		string cfg_path;
+		
+		if (GetGame().ConfigIsExisting(CFG_VEHICLESPATH+" "+type_name))
+		{
+			cfg_path = CFG_VEHICLESPATH+" "+type_name+" attachments";
+		}
+		else if (GetGame().ConfigIsExisting(CFG_WEAPONSPATH+" "+type_name))
+		{
+			cfg_path = CFG_WEAPONSPATH+" "+type_name+" attachments";
+		}
+		else if (GetGame().ConfigIsExisting(CFG_MAGAZINESPATH+" "+type_name))
+		{
+			cfg_path = CFG_MAGAZINESPATH+" "+type_name+" attachments";
+		}
+		
+		GetGame().ConfigGetTextArray(cfg_path, cfg_attachments);
+		
+		return cfg_attachments;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/SceneEditor/ScenePlayer.c b/scripts/4_World/DayZ/Classes/SceneEditor/ScenePlayer.c
new file mode 100644
index 0000000000000000000000000000000000000000..9d7ad316169a8302887986007ab70a3ee6855eca
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SceneEditor/ScenePlayer.c
@@ -0,0 +1,10 @@
+class ScenePlayer extends SceneObject
+{
+	//----------------------------------------
+	// IsPlayer
+	//----------------------------------------
+	override bool IsPlayer()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ShockHandler.c b/scripts/4_World/DayZ/Classes/ShockHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..db490e4227cf880af423c20bbdc34216cb685f6e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ShockHandler.c
@@ -0,0 +1,187 @@
+class ShockHandler
+{	
+	protected float 						m_Shock;
+	protected float 						m_ShockValueMax;
+	protected float 						m_ShockValueThreshold;
+	protected PlayerBase					m_Player;
+	
+	protected const float 					UPDATE_THRESHOLD = 3; //NOTE : The lower, the more precise but the more synchronization
+	const float 							VALUE_CHECK_INTERVAL = 0.95; //in seconds 
+	protected float 						m_CumulatedShock;
+	private float							m_TimeSinceLastTick = VALUE_CHECK_INTERVAL + 1;
+	private float							m_ShockMultiplier = 1;
+	private float 							m_PrevVignette; //Previous vignette shock value
+	private	float 							m_LerpRes; //Lerp result
+	
+	private const int						LIGHT_SHOCK_HIT = 33;
+	private const int						MID_SHOCK_HIT = 67;
+	private const int						HEAVY_SHOCK_HIT = 100;
+	private const int 						INTENSITY_FACTOR = 1; //How intense the vignette effect will be, the higher the value, the stronger the effect
+	
+	//Pulsing effect
+	private const float 					PULSE_PERIOD = 0.5; //The time it takes for pulse to do a full cycle
+	private const float 					PULSE_AMPLITUDE = 0.05; //This is a multiplier, keep below 1 or expect the unexpected
+	private 	  float 					m_PulseTimer;
+	
+	protected ref Param1<float> 			m_Param;
+	
+	void ShockHandler(PlayerBase player)
+	{
+		m_Player = player;
+		m_Player.m_CurrentShock = m_Player.GetMaxHealth("", "Shock");
+		m_PrevVignette = m_Player.m_CurrentShock * 0.01; //Equivalent to divided by 100
+		m_ShockValueMax = m_Player.GetMaxHealth("", "Shock");
+		m_ShockValueThreshold = m_ShockValueMax * 0.95;
+		m_Param = new Param1<float>(0);
+	}
+
+	void Update(float deltaT)
+	{
+		m_TimeSinceLastTick += deltaT;
+		
+		m_PulseTimer += deltaT;
+		
+		if ( GetGame().IsClient() )
+		{
+			//Deactivate tunnel vignette when player falls unconscious
+			if ( m_Player.IsUnconscious() )
+			{
+				PPERequesterBank.GetRequester(PPERequester_TunnelVisionEffects).Stop();
+				return;
+			}
+			
+			//Deactivate if above visible threshold (also stops "zero bobbing" being sent all the time
+			if ( m_Player.m_CurrentShock >= m_ShockValueThreshold)
+			{
+				PPERequesterBank.GetRequester(PPERequester_TunnelVisionEffects).Stop();
+				return;
+			}
+			
+			//Add bobbing to create pulsing effect
+			float val = 0.0;
+			if ( m_Player.m_CurrentShock > m_ShockValueMax * 0.8)
+				val = MiscGameplayFunctions.Bobbing( PULSE_PERIOD, PULSE_AMPLITUDE, m_PulseTimer );
+			float val_adjusted;
+			
+			if ( m_Player.m_CurrentShock != (m_PrevVignette * 100) )
+			{
+				//Interpolate between previous level and currently synchronized shock level
+				m_LerpRes = LerpVignette( m_PrevVignette, NormalizeShockVal(m_Player.m_CurrentShock), m_TimeSinceLastTick );
+				
+				val_adjusted = 1 - Easing.EaseInQuart(m_LerpRes) + val;
+			}
+			else
+			{
+				val_adjusted = 1 - Easing.EaseInQuart( NormalizeShockVal(m_Player.m_CurrentShock)) + val;
+			}
+			
+			m_Param.param1 = val_adjusted;
+			PPERequesterBank.GetRequester(PPERequester_TunnelVisionEffects).Start(m_Param);
+		}
+		
+		if ( m_TimeSinceLastTick > VALUE_CHECK_INTERVAL )
+		{
+			//Play the shock hit event (multiply prevVignette by 100 to "Un-Normalize" value)
+			if ( GetGame().IsClient() )
+			{
+				ShockHitEffect( m_PrevVignette * 100 );
+				m_PrevVignette = m_Player.m_CurrentShock * 0.01;
+			}
+			
+			CheckValue( false );
+			m_TimeSinceLastTick = 0;
+		}
+	}
+	
+	float GetCurrentShock()
+	{
+		return m_Player.m_CurrentShock;
+	}
+	
+	float GetShock()
+	{
+		return m_Shock;
+	}
+	
+	void SetShock( float dealtShock )
+	{
+		m_Shock += dealtShock;
+		CheckValue( false );
+	}
+	
+	//Inflict shock damage
+	private void DealShock()
+	{
+		if ( GetGame().IsServer() )
+			m_Player.GiveShock( -m_CumulatedShock );
+	}
+	
+	//Passing a value of FALSE will only check the values, a value of TRUE will force a synchronization (don't use too often)
+	void CheckValue(bool forceUpdate)
+	{
+		m_CumulatedShock += m_Shock; // increment on both client and server
+		
+		if ( forceUpdate )
+			m_PrevVignette = NormalizeShockVal( m_Player.m_CurrentShock );
+		
+		if ( GetGame().IsServer() )
+		{	
+			m_Player.m_CurrentShock = m_Player.GetHealth("", "Shock");
+			
+			/*
+			if (m_Player.m_CurrentShock <= 0)
+				m_Player.SetHealthMax("", "Shock");
+			*/
+			if ( m_CumulatedShock >= UPDATE_THRESHOLD || forceUpdate )
+			{
+				m_CumulatedShock *= m_ShockMultiplier;
+				DealShock();
+				m_CumulatedShock = 0;
+				m_Shock = 0;
+			
+				Synchronize();
+			}
+		}
+	}
+	
+	protected void Synchronize()
+	{
+		DayZPlayerSyncJunctures.SendShock( m_Player, m_Player.m_CurrentShock );
+	}
+	
+	float SetMultiplier(float mult)
+	{
+		m_ShockMultiplier = mult;
+		return m_ShockMultiplier;
+	}
+	
+	private float NormalizeShockVal( float shock )
+	{
+		float base = m_Player.GetMaxHealth("", "Shock") * INTENSITY_FACTOR;
+		float normShock = shock / base;
+		return normShock;
+	}
+	
+	private float LerpVignette( float x, float y, float deltaT )
+	{
+		float output;
+		output = Math.Lerp( x, y, deltaT );
+		return output;
+	}
+	
+	//ONLY CLIENT SIDE
+	private void ShockHitEffect( float compareBase )
+	{
+		float shockDifference = compareBase - m_Player.m_CurrentShock;
+		//Print(shockDifference);
+		if ( shockDifference >= UPDATE_THRESHOLD )
+		{
+			if ( m_CumulatedShock < 25 )
+				m_Player.SpawnShockEffect( MiscGameplayFunctions.Normalize( LIGHT_SHOCK_HIT, 100 ) ); 
+			else if ( m_CumulatedShock < 50 )
+				m_Player.SpawnShockEffect( MiscGameplayFunctions.Normalize( MID_SHOCK_HIT, 100 ) );
+			else
+				m_Player.SpawnShockEffect( MiscGameplayFunctions.Normalize( HEAVY_SHOCK_HIT, 100 ) );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ShockHitReaction/ShockHitReaction.c b/scripts/4_World/DayZ/Classes/ShockHitReaction/ShockHitReaction.c
new file mode 100644
index 0000000000000000000000000000000000000000..1c245576df9778ed26392131b9f215bf64ae6d5f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ShockHitReaction/ShockHitReaction.c
@@ -0,0 +1,70 @@
+class ShockDealtEffect
+{
+	const float INTENSITY_COEF_OVERALL = 0.8; //intensity percentage multiplier
+	const float INTENSITY_COEF_BLUR = 1;
+	const float INTENSITY_COEF_COLOR = 0.2;
+	const float INTENSITY_COEF_VIGNETTE = 0.7;
+	const float DURATION_MIN = 0.6;
+	
+	ref Param3<float,float,float> m_EffectParam;
+	
+	float m_HitDuration;
+	float m_BreakPoint;
+	float m_TimeActive;
+	float m_ShockIntensityMax;
+	
+	void ShockDealtEffect(float intensity_max)
+	{
+		float duration_coef = Math.Clamp(intensity_max,DURATION_MIN,1);
+		m_HitDuration = 1 * duration_coef;
+		m_BreakPoint = 0.2 * duration_coef;
+		m_ShockIntensityMax = Math.Clamp(intensity_max,0,1);
+		
+		m_EffectParam = new Param3<float,float,float>(0,0,0);
+		//Print(intensity_max);
+		//Print("HitSyncDebug | ShockDealtEffect: " + GetGame().GetPlayer().GetSimulationTimeStamp());
+	}
+	
+	void ~ShockDealtEffect()
+	{
+		if (GetGame())
+			PPERequesterBank.GetRequester(PPERequester_ShockHitReaction).Stop();
+	}
+	
+	void Update(float deltatime)
+	{
+		float value;
+		
+		if ( m_TimeActive <= m_BreakPoint )
+		{
+			value = Math.InverseLerp(0, m_BreakPoint, m_TimeActive);
+		}
+		else
+		{
+			float tmp_value = Math.InverseLerp(m_BreakPoint, m_HitDuration, m_TimeActive);
+			value = 1 - tmp_value;
+		}
+		
+		m_TimeActive += deltatime;
+		value = Math.Clamp(value,0,1);
+		
+		//value calculations
+		float val = Math.Clamp(Math.Lerp(0, m_ShockIntensityMax, value),0,m_ShockIntensityMax);
+		float val_color = Math.Clamp(val * INTENSITY_COEF_COLOR,0,m_ShockIntensityMax);
+		
+		//Postprocess application
+		float blur = val * INTENSITY_COEF_OVERALL * INTENSITY_COEF_BLUR;
+		float factor = val_color * INTENSITY_COEF_OVERALL;
+		float vignette = val * INTENSITY_COEF_OVERALL * INTENSITY_COEF_VIGNETTE;
+		
+		m_EffectParam.param1 = blur;
+		m_EffectParam.param2 = vignette;
+		m_EffectParam.param3 = factor;
+		PPERequesterBank.GetRequester(PPERequester_ShockHitReaction).Start(m_EffectParam);
+		
+		if ( m_TimeActive >= m_HitDuration )
+		{
+			delete this;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoftSkillsManager.c b/scripts/4_World/DayZ/Classes/SoftSkillsManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..d260c7a1b63991c481278fa74d7aa21538e506d8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoftSkillsManager.c
@@ -0,0 +1,636 @@
+class SoftSkillsManager
+{	
+	protected PlayerBase			m_Player;
+	protected float 				m_SpecialtyLevel;
+	protected float 				m_RoughLevel;
+	protected float 				m_PreciseLevel;
+	 
+	protected bool					m_IsLinear;
+	protected bool					m_IsActive;
+	protected bool					m_IsCoolDown;
+
+	protected int 					m_UserActionsCounter;	
+
+	static protected const int 		DEFAULT_EFFICIENCY = 0;
+	static protected const float 	PRECISE_WEIGHT_LIMIT = -1; 
+	static protected const float 	ROUGH_WEIGHT_LIMIT = 1;
+	static protected const float 	COOLDOWN_TIMER = 5; //default 5, 
+
+	protected ref Timer 			m_CoolDownTimer = new Timer();
+
+	protected bool 				m_IsDebugMode;
+	protected float 				m_CoolDownValue;
+	protected float 				m_LastUAValue;
+	protected float 				m_ComponentBonusBefore;
+	protected float 				m_ComponentBonusAfter;
+	protected float 				m_GeneralBonusBefore;
+	protected float 				m_GeneralBonusAfter;
+
+	protected ref SoftSkillManagerDebug m_DebugWindow;
+
+	protected ref Timer 			m_SynchTimer;
+
+	void SoftSkillsManager( PlayerBase player )
+	{
+		m_Player = player;
+		m_IsCoolDown = false;
+		m_IsLinear = false;
+		m_IsActive = true;
+		m_IsDebugMode = false;
+	}
+
+	void InitSpecialty( float specialty_level )
+	{
+		SetSpecialtyLevel( specialty_level );
+		SynchSpecialtyLevel();
+	}
+
+	void ~SoftSkillsManager()
+	{		
+		delete m_CoolDownTimer;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float AddLinearPrecise( float specialty_weight )
+	{
+		m_SpecialtyLevel += specialty_weight; 
+		SetLastUAValue( specialty_weight );
+		m_SpecialtyLevel = Math.Clamp( m_SpecialtyLevel, PRECISE_WEIGHT_LIMIT, ROUGH_WEIGHT_LIMIT );
+
+		return m_SpecialtyLevel;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float AddLinearRough( float specialty_weight )
+	{
+		m_SpecialtyLevel += specialty_weight;
+		SetLastUAValue( specialty_weight );
+		m_SpecialtyLevel = Math.Clamp( m_SpecialtyLevel, PRECISE_WEIGHT_LIMIT, ROUGH_WEIGHT_LIMIT );
+
+		return m_SpecialtyLevel;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float AddExponentialPrecise( float specialty_weight )
+	{
+		m_UserActionsCounter -= 1;
+
+		if( m_UserActionsCounter == 0)
+		{
+			m_UserActionsCounter = -1;
+			m_SpecialtyLevel = 0;
+		}
+		
+		float adjusted_weight = specialty_weight / Math.Sqrt( Math.AbsInt( m_UserActionsCounter ) );
+	
+		SetLastUAValue( adjusted_weight );
+
+		m_SpecialtyLevel += adjusted_weight;
+		m_SpecialtyLevel = Math.Clamp( m_SpecialtyLevel, PRECISE_WEIGHT_LIMIT, ROUGH_WEIGHT_LIMIT );
+
+		return m_SpecialtyLevel;
+	}
+		
+	// ----------------------------------------------------------------------------------------
+	float AddExponentialRough( float specialty_weight )
+	{
+		m_UserActionsCounter += 1;
+			
+		if( m_UserActionsCounter == 0)
+		{
+			m_UserActionsCounter = 1;
+			m_SpecialtyLevel = 0;
+		}
+		
+		float adjusted_weight = specialty_weight / Math.Sqrt( Math.AbsInt( m_UserActionsCounter ) );
+
+		SetLastUAValue( adjusted_weight );
+
+		m_SpecialtyLevel += adjusted_weight;
+		m_SpecialtyLevel = Math.Clamp( m_SpecialtyLevel, PRECISE_WEIGHT_LIMIT, ROUGH_WEIGHT_LIMIT );
+
+		return m_SpecialtyLevel;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void AddSpecialty( float specialty_weight )
+	{
+		if( GetSoftSkillsState() )
+		{
+			if( !IsCoolDown() )
+			{	
+					if( specialty_weight < 0 )
+					{	
+						if( IsLinear() )
+						{
+							SetSpecialtyLevel( AddLinearPrecise( specialty_weight ) );	
+						}
+						else
+						{
+							 SetSpecialtyLevel( AddExponentialPrecise( specialty_weight ) );
+						}
+
+						m_Player.GetStatSpecialty().Set( m_SpecialtyLevel );
+						StartCoolDownTimer( Math.AbsFloat( ( specialty_weight * 100 ) ) * COOLDOWN_TIMER );
+						SynchSpecialtyLevel();
+					}
+					else if( specialty_weight > 0 )
+					{
+						if( IsLinear() )
+						{							
+							SetSpecialtyLevel( AddLinearRough( specialty_weight ) );
+						}
+						else
+						{						
+							SetSpecialtyLevel( AddExponentialRough( specialty_weight ) );		
+						}
+
+						m_Player.GetStatSpecialty().Set( m_SpecialtyLevel );
+						StartCoolDownTimer( Math.AbsFloat( ( specialty_weight * 100 ) ) * COOLDOWN_TIMER );
+						SynchSpecialtyLevel();
+					}
+					else
+					{
+						//if the specialty weight for a recipe or UA is set to 0, it will increase neither specialty, nor UA counter
+						return;
+					}
+				}
+			else
+			{
+				StartCoolDownTimer( Math.AbsFloat( ( specialty_weight * 100 ) ) * COOLDOWN_TIMER );		
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------------------------	
+	// Use AddSpecialtyBonus if you want to increase a value, based on the specialty level of the player. e.g. more harvested material
+	// limit_efficiency sets the max amount of bonus, the soft skill can provide: limit_efficiency = 2 is 50% bonus, limit_efficiency = 3 is 33% bonus etc
+	float AddSpecialtyBonus( float base_value, float specialty_weight, bool is_cacomponent = false, float limit_efficiency = 2 )
+	{	
+		if ( specialty_weight == 0 )
+		{
+			return base_value;	
+		}
+		
+		SetBonusBefore( is_cacomponent, base_value);
+
+		float adjusted_value;
+		
+		GetPreciseRoughLevels();
+
+		if ( limit_efficiency != 0 )
+		{
+			if ( specialty_weight < 0 )
+			{			
+				adjusted_value = base_value + ( ( base_value * m_PreciseLevel ) / limit_efficiency );
+			}
+			else
+			{
+				adjusted_value = base_value + ( ( base_value * m_RoughLevel ) / limit_efficiency );
+			}
+		}
+		else
+		{
+			if ( specialty_weight < 0 )
+			{			
+				adjusted_value = base_value + ( ( base_value * m_PreciseLevel ) );
+			}
+			else
+			{
+				adjusted_value = base_value + ( ( base_value * m_RoughLevel ) );
+			}
+		}
+
+		SetBonusAfter( is_cacomponent, adjusted_value );
+
+		return adjusted_value;
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	// Use SubtractSpecialtyBonus if you want to decrease a value, based on the specialty level of the player. e.g. faster harvesting time
+	// limit_efficiency sets the max amount of bonus, the soft skill can provide: limit_efficiency = 2 is 50% bonus, limit_efficiency = 3 is 33% bonus etc
+	float SubtractSpecialtyBonus( float base_value, float specialty_weight, bool is_cacomponent = false, float limit_efficiency = 2 )
+	{
+		if ( specialty_weight == 0 )
+		{
+			return base_value;	
+		}
+		
+		SetBonusBefore( is_cacomponent, base_value);
+
+		float adjusted_value;
+		
+		GetPreciseRoughLevels();
+
+		if ( limit_efficiency != 0 )
+		{
+			if ( specialty_weight < 0 )
+			{
+				adjusted_value = base_value - ( ( base_value * m_PreciseLevel  ) / limit_efficiency );
+			}
+			else
+			{
+				adjusted_value = base_value - ( ( base_value * m_RoughLevel ) / limit_efficiency );
+			}
+		}
+		else
+		{
+			if ( specialty_weight < 0 )
+			{
+				adjusted_value = base_value - ( ( base_value * m_PreciseLevel  ) );
+			}
+			else
+			{
+				adjusted_value = base_value - ( ( base_value * m_RoughLevel ) );
+			}
+		}
+
+		SetBonusAfter( is_cacomponent, adjusted_value );
+
+		return adjusted_value;	
+	}
+
+	// ----------------------------------------------------------------------------------------
+	// Use AdjustCraftingTime if you want to decrease time for recipe crafting
+	// limit_efficiency sets the max amount of bonus, the soft skill can provide: limit_efficiency = 2 is 50% bonus, limit_efficiency = 3 is 33% bonus etc
+	float AdjustCraftingTime( float base_time, float specialty_weight, float limit_efficiency = 2 )
+	{
+		if ( specialty_weight == 0 )
+		{
+			return base_time;	
+		}
+		
+		SetBonusBefore( false, base_time);
+
+		float adjusted_time;
+
+		GetPreciseRoughLevels();
+
+		if ( specialty_weight < 0 )
+		{
+			adjusted_time = base_time - ( ( base_time * m_PreciseLevel ) / limit_efficiency );
+		}
+		else
+		{
+			adjusted_time = base_time - ( ( base_time * m_RoughLevel ) / limit_efficiency );
+		}
+
+		SetBonusAfter( false, adjusted_time );
+
+		return adjusted_time;	
+	}
+
+	// ----------------------------------------------------------------------------------------
+	PlayerBase GetSoftSkillsPlayer()
+	{
+		return m_Player;
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	void SetSpecialtyLevel( float specialty_level )
+	{
+		m_SpecialtyLevel = specialty_level;
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	float GetSpecialtyLevel()
+	{
+		return m_SpecialtyLevel;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SynchSpecialtyLevel()
+	{	
+		#ifdef SERVER
+		Param1<float> specialty_level = new Param1<float>( m_SpecialtyLevel );
+		GetGame().RPCSingleParam( m_Player, ERPCs.RPC_SOFT_SKILLS_SPECIALTY_SYNC, specialty_level, true, m_Player.GetIdentity() );
+		#endif		
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetSoftSkillsState( bool state )
+	{
+		m_IsActive = state;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	bool GetSoftSkillsState()
+	{
+		return m_IsActive;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetLinearState( bool model )
+	{
+		m_IsLinear = model;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	bool IsLinear()
+	{
+		return m_IsLinear;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void GetPreciseRoughLevels()
+	{
+		if ( m_SpecialtyLevel > 0)
+		{
+			m_RoughLevel = m_SpecialtyLevel;
+			m_PreciseLevel = DEFAULT_EFFICIENCY;
+		}
+		else if ( m_SpecialtyLevel < 0)
+		{
+			m_RoughLevel = DEFAULT_EFFICIENCY;
+			m_PreciseLevel =  Math.AbsFloat( m_SpecialtyLevel );
+		}
+		else
+		{
+			m_RoughLevel = DEFAULT_EFFICIENCY;
+			m_PreciseLevel = DEFAULT_EFFICIENCY;
+		}
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void StartCoolDownTimer( float cooldown_value )
+	{
+		SetCoolDown( true );
+		SetCoolDownValue( cooldown_value );
+		m_CoolDownTimer.Run( cooldown_value, this, "SetCoolDown", new Param1<bool>( false ) );
+	}
+
+	// ----------------------------------------------------------------------------------------
+	bool IsCoolDown()
+	{
+		return m_IsCoolDown;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetCoolDown( bool cool_down )
+	{
+		m_IsCoolDown = cool_down;
+	}
+	
+// ----------------------------------------------------------------------------------------
+//	SoftSkillManagerDebug support
+// ----------------------------------------------------------------------------------------
+	void CreateDebugWindow( bool create )
+	{
+		if ( create )
+		{
+			m_DebugWindow = new SoftSkillManagerDebug( this );
+			SetIsDebug( create );
+		}
+		else
+		{
+			ResetDebugWindow();
+			SetIsDebug( create );
+			delete m_DebugWindow;
+		}
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	void SynchDebugStats()
+	{	
+		if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+		{
+			Param5<float, float, float, float, bool> debug_stats = new Param5<float, float, float, float, bool>( m_GeneralBonusBefore, m_GeneralBonusAfter, m_LastUAValue, m_CoolDownValue, m_IsCoolDown );
+			GetGame().RPCSingleParam( m_Player, ERPCs.RPC_SOFT_SKILLS_STATS_SYNC, debug_stats, true, m_Player.GetIdentity() );
+		}		
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetIsDebug( bool is_debug )
+	{
+		m_IsDebugMode = is_debug;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	bool IsDebug()
+	{
+		return m_IsDebugMode;
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	void SetCoolDownValue( float cooldown_value )
+	{
+		m_CoolDownValue = cooldown_value;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float GetCoolDownValue()
+	{
+		return m_CoolDownValue;
+	}
+	
+	// ----------------------------------------------------------------------------------------
+	float GetLastUAValue()
+	{
+		return m_LastUAValue;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetLastUAValue( float last_ua_value )
+	{
+		m_LastUAValue = last_ua_value;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetBonusBefore( bool is_cacomponent, float base_value)
+	{
+		if ( IsDebug() )
+		{
+			if ( is_cacomponent )
+			{
+				SetComponentBonusBefore(base_value);
+			}
+			else
+			{
+				SetGeneralBonusBefore(base_value);
+			}
+		}	
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetBonusAfter( bool is_cacomponent, float adjusted_value )
+	{
+		if ( IsDebug() )
+		{
+			if ( is_cacomponent )
+			{
+				SetComponentBonusAfter(adjusted_value);
+			}
+			else
+			{
+				SetGeneralBonusAfter(adjusted_value);
+			}
+		}
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float GetComponentBonusBefore()
+	{
+		return m_ComponentBonusBefore;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetComponentBonusBefore( float component_bonus_before )
+	{
+		m_ComponentBonusBefore = component_bonus_before;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float GetComponentBonusAfter()
+	{
+		return m_ComponentBonusAfter;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetComponentBonusAfter( float component_bonus_after )
+	{
+		m_ComponentBonusAfter = component_bonus_after;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float GetGeneralBonusBefore()
+	{
+		return m_GeneralBonusBefore;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetGeneralBonusBefore( float general_bonus_before )
+	{
+		m_GeneralBonusBefore = general_bonus_before;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	float GetGeneralBonusAfter()
+	{
+		return m_GeneralBonusAfter;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void SetGeneralBonusAfter( float general_bonus_after )
+	{
+		m_GeneralBonusAfter = general_bonus_after;
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void StartSynchTimer()
+	{
+		SetIsDebug( true );
+		m_SynchTimer = new Timer;
+		m_SynchTimer.Run( 2, this, "SynchDebugStats", NULL, true );
+	}
+
+	// ----------------------------------------------------------------------------------------
+	void StopSynchTimer()
+	{
+		SetIsDebug( false );
+		
+		if ( m_SynchTimer )
+		{
+			m_SynchTimer.Stop();
+			delete m_SynchTimer;
+		}
+	}
+		
+	// ----------------------------------------------------------------------------------------
+	void ResetDebugWindow()
+	{
+		SetSpecialtyLevel( 0 );
+		SetLastUAValue( 0 );
+		SetComponentBonusBefore( 0 );
+		SetComponentBonusAfter( 0 );
+		SetGeneralBonusBefore( 0 );
+		SetGeneralBonusAfter( 0 );
+		SetCoolDownValue( 0 );
+		
+		SynchSpecialtyLevel();
+	}
+}
+
+// ----------------------------------------------------------------------------------------
+//	SoftSkillManagerDebug
+// ----------------------------------------------------------------------------------------
+
+class SoftSkillManagerDebug
+{
+	SoftSkillsManager m_SoftSkillManager;
+	ref Widget m_PanelSoftSkills;
+	TextWidget SpecialtyTotal;
+	TextWidget SpecialtyChange;
+	TextWidget ComponentBonusBefore;
+	TextWidget ComponentBonusAfter;
+	TextWidget GeneralBonusBefore;
+	TextWidget GeneralBonusAfter;
+	TextWidget CoolDown;
+	TextWidget IsCoolDown;
+
+	void SoftSkillManagerDebug( SoftSkillsManager softskill_manager )
+	{					
+		m_SoftSkillManager = softskill_manager;
+		m_PanelSoftSkills = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_hud_debug_softskills.layout");
+		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Insert(this.OnUpdate);
+
+		Class.CastTo(SpecialtyTotal,  m_PanelSoftSkills.FindWidget("SpecialtyTotal"));
+		Class.CastTo(SpecialtyChange,  m_PanelSoftSkills.FindWidget("SpecialtyChange"));
+		Class.CastTo(ComponentBonusBefore,  m_PanelSoftSkills.FindWidget("ComponentBonusBefore"));
+		Class.CastTo(ComponentBonusAfter,  m_PanelSoftSkills.FindWidget("ComponentBonusAfter"));
+		Class.CastTo(GeneralBonusBefore,  m_PanelSoftSkills.FindWidget("GeneralBonusBefore"));
+		Class.CastTo(GeneralBonusAfter,  m_PanelSoftSkills.FindWidget("GeneralBonusAfter"));
+		Class.CastTo(CoolDown,  m_PanelSoftSkills.FindWidget("CoolDown"));
+		Class.CastTo(IsCoolDown,  m_PanelSoftSkills.FindWidget("IsCoolDown"));
+		
+		m_PanelSoftSkills.Show( true );
+		SpecialtyTotal.Show( true );
+		SpecialtyChange.Show( true );
+		ComponentBonusBefore.Show( true );
+		ComponentBonusAfter.Show( true );
+		GeneralBonusBefore.Show( true );
+		GeneralBonusAfter.Show( true );
+		CoolDown.Show( true );
+		IsCoolDown.Show( true );
+	}
+	
+	void ~SoftSkillManagerDebug()
+	{		
+		if ( GetGame() )
+		{
+			GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Remove(this.OnUpdate);
+		}
+		
+		delete m_PanelSoftSkills;
+	}
+
+	SoftSkillsManager GetActiveSoftSkillManager()
+	{
+		return m_SoftSkillManager;
+	}
+	
+	void OnUpdate()
+	{
+		if ( GetActiveSoftSkillManager().GetSoftSkillsPlayer().IsAlive() )
+		{
+			float speciality = GetActiveSoftSkillManager().GetSpecialtyLevel();
+			speciality = speciality * 100;
+			speciality = Math.Round( speciality );
+			speciality = speciality * 0.01;
+			
+			SpecialtyTotal.SetText( "Specialty level: " + speciality.ToString() );
+			SpecialtyChange.SetText( "Specialty change: " + GetActiveSoftSkillManager().GetLastUAValue() );
+			ComponentBonusBefore.SetText( "Component/craft default: " + GetActiveSoftSkillManager().GetComponentBonusBefore() );
+			ComponentBonusAfter.SetText( "Component/craft with bonus: " + GetActiveSoftSkillManager().GetComponentBonusAfter() );
+			GeneralBonusBefore.SetText( "General default: " + GetActiveSoftSkillManager().GetGeneralBonusBefore() );
+			GeneralBonusAfter.SetText( "General with bonus: " + GetActiveSoftSkillManager().GetGeneralBonusAfter() );
+			CoolDown.SetText( "CoolDown value: " + GetActiveSoftSkillManager().GetCoolDownValue() );
+			IsCoolDown.SetText( "Cooldown active: " + GetActiveSoftSkillManager().IsCoolDown() );
+		}
+		else
+		{
+			delete this;
+		}
+	}
+
+}
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/Events/MindStates.c b/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/Events/MindStates.c
new file mode 100644
index 0000000000000000000000000000000000000000..64b04db171452704cf7df5940400ff9619d4bfda
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/Events/MindStates.c
@@ -0,0 +1,71 @@
+class MindStateSoundEventBase extends InfectedSoundEventBase
+{
+	override bool CanPlay()
+	{
+		if( !super.CanPlay() )
+		{
+			return false;
+		}
+		return true;
+	}
+}
+
+class CalmIdleSoundEvent extends MindStateSoundEventBase
+{
+	void CalmIdleSoundEvent()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+		m_ID = EInfectedSoundEventID.MINDSTATE_CALM_IDLE;
+		m_SoundSetNameRoot = "CalmIdle";
+	}
+}
+
+class CalmMoveSoundEvent extends MindStateSoundEventBase
+{
+	void CalmMoveSoundEvent()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+		m_ID = EInfectedSoundEventID.MINDSTATE_CALM_MOVE;
+		m_SoundSetNameRoot = "CalmMove";
+	}
+}
+
+class DisturbedIdleSoundEvent extends MindStateSoundEventBase
+{
+	void DisturbedIdleSoundEvent()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+		m_ID = EInfectedSoundEventID.MINDSTATE_DISTURBED_IDLE;
+		m_SoundSetNameRoot = "DisturbedIdle";
+	}
+}
+
+class ChaseMoveSoundEvent extends MindStateSoundEventBase
+{
+	void ChaseMoveSoundEvent()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+		m_ID = EInfectedSoundEventID.MINDSTATE_CHASE_MOVE;
+		m_SoundSetNameRoot = "ChaseMove";
+	}
+}
+
+class AlertedIdleSoundEvent extends MindStateSoundEventBase
+{
+	void AlertedIdleSoundEvent()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+		m_ID = EInfectedSoundEventID.MINDSTATE_ALERTED_IDLE;
+		m_SoundSetNameRoot = "AlertedIdle";
+	}
+}
+
+class AlertedMoveSoundEvent extends MindStateSoundEventBase
+{
+	void AlertedMoveSoundEvent()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+		m_ID = EInfectedSoundEventID.MINDSTATE_ALERTED_MOVE;
+		m_SoundSetNameRoot = "AlertedMove";
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/InfectedSoundEventBase.c b/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/InfectedSoundEventBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..90e0569af5ff29bbdb40d1ed8a86304343403309
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/InfectedSoundEventBase.c
@@ -0,0 +1,72 @@
+enum EInfectedSoundEventType
+{
+	GENERAL,
+}
+
+class InfectedSoundEventBase extends SoundEventBase
+{
+	ZombieBase m_Infected;
+
+	void InfectedSoundEventBase()
+	{
+		m_Type = EInfectedSoundEventType.GENERAL;
+	}
+	
+	void ~InfectedSoundEventBase()
+	{
+		if (m_SoundSetCallback) m_SoundSetCallback.Stop();
+	}
+
+	void Init(ZombieBase pInfected)
+	{
+		m_Infected = pInfected;
+	}
+	
+	void SoftStop()
+	{
+		if (m_SoundSetCallback)
+		{
+			m_SoundSetCallback.Loop(false);
+			m_SoundSetCallback = null;
+		}
+	}
+
+	override void Stop()
+	{
+		if (m_SoundSetCallback)
+		{
+			m_SoundSetCallback.Stop();
+			m_SoundSetCallback = null;
+		}
+
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).RemoveByName(this, "PosUpdate");
+	}
+	
+	void PosUpdate()
+	{
+		if (m_SoundSetCallback)
+		{
+			m_SoundSetCallback.SetPosition(m_Infected.GetPosition());
+		}
+	}
+	
+	override bool Play()
+	{
+		string soundset_name;
+			
+		soundset_name = string.Format("%1_%2_SoundSet", m_Infected.ClassName(), m_SoundSetNameRoot);
+		m_SoundSetCallback = m_Infected.ProcessVoiceFX(soundset_name);
+		if ( m_SoundSetCallback )
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLaterByName(this, "PosUpdate", 0, true);
+			return true;
+		}
+		string error = "[%1] No sound callback for : \'%2\' in state: \'%3\' Please define relevant SoundSet in %4";
+		#ifdef DEVELOPER
+		Error(string.Format(error, "ERROR", m_Infected.ClassName(), m_SoundSetNameRoot, "Zombie_SoundSets.hpp"));
+		#else
+		PrintToRPT("" + string.Format(error, "WARNING", m_Infected.ClassName(), m_SoundSetNameRoot, "sounds/hpp/config.cpp"));
+		#endif
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/InfectedSoundEventHandler.c b/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/InfectedSoundEventHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..c772f0315a379332d562fd1adfff458d084ca6dc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/InfectedSoundEvents/InfectedSoundEventHandler.c
@@ -0,0 +1,125 @@
+enum EInfectedSoundEventID
+{
+	MINDSTATE_CALM_IDLE = 1,
+	MINDSTATE_CALM_MOVE,
+	MINDSTATE_DISTURBED_IDLE,
+	//MINDSTATE_CHASE_IDLE,
+	MINDSTATE_CHASE_MOVE,
+	MINDSTATE_ALERTED_IDLE,
+	MINDSTATE_ALERTED_MOVE,
+	//--------------
+	ENUM_COUNT,
+}
+
+class InfectedSoundEventHandler extends SoundEventHandler
+{
+	const int SOUND_EVENTS_MAX = EInfectedSoundEventID.ENUM_COUNT;
+	static ref InfectedSoundEventBase m_AvailableStates[SOUND_EVENTS_MAX];
+	ref InfectedSoundEventBase m_CurrentState;
+	ZombieBase m_Infected;
+	
+	void InfectedSoundEventHandler(ZombieBase pInfected)
+	{
+		m_Infected = pInfected;
+		m_AvailableStates[EInfectedSoundEventID.MINDSTATE_CALM_IDLE] = new CalmIdleSoundEvent();
+		m_AvailableStates[EInfectedSoundEventID.MINDSTATE_CALM_MOVE] = new CalmMoveSoundEvent();
+		m_AvailableStates[EInfectedSoundEventID.MINDSTATE_DISTURBED_IDLE] = new DisturbedIdleSoundEvent();
+		//m_AvailableStates[EInfectedSoundEventID.MINDSTATE_CHASE_IDLE] = new ChaseIdleSoundEvent();
+		m_AvailableStates[EInfectedSoundEventID.MINDSTATE_CHASE_MOVE] = new ChaseMoveSoundEvent();
+		m_AvailableStates[EInfectedSoundEventID.MINDSTATE_ALERTED_IDLE] = new AlertedIdleSoundEvent();
+		m_AvailableStates[EInfectedSoundEventID.MINDSTATE_ALERTED_MOVE] = new AlertedMoveSoundEvent();
+	}
+	
+	override static int GetSoundEventType(int id)
+	{
+		return m_AvailableStates[id].GetSoundEventType();
+	}
+	
+	override int GetCurrentStateEventID()
+	{
+		if (m_CurrentState)
+		{
+			return m_CurrentState.GetSoundEventID();
+		}
+		return -1;
+	}
+	
+	override int GetCurrentStateEventType()
+	{
+		if (m_CurrentState)
+		{
+			return m_CurrentState.GetSoundEventType();
+		}
+		return -1;
+	}
+	
+	void Stop()
+	{
+		if ( m_CurrentState )
+		{
+			m_CurrentState.Stop();
+		}
+	}
+	
+	void SoftStop()
+	{
+		if ( m_CurrentState )
+		{
+			m_CurrentState.SoftStop();
+		}
+	}
+	
+	bool IsPlaying()
+	{
+		if ( m_CurrentState && m_CurrentState.IsSoundCallbackExist() )
+		{
+			return true;
+		}
+
+		return false;
+	}
+	
+	override bool PlayRequest(int id, bool sent_from_server = false)
+	{
+		InfectedSoundEventBase requested_state = m_AvailableStates[id];
+
+		if ( !requested_state.CanPlay() )
+		{
+			return false;
+		}
+		
+		if (m_CurrentState)
+		{
+		 	if (!m_CurrentState.IsSoundCallbackExist())
+			{
+				//Print("Missing callback - cleanup and continue");
+				delete m_CurrentState;
+			}
+			
+			//! same sound event - skip
+			if (GetCurrentStateEventID() == id)
+			{
+				//Print("Same ID - skipping");
+				return false;
+			}
+		}
+		
+		if (m_CurrentState)
+		{
+			m_CurrentState.SoftStop();
+			m_CurrentState = InfectedSoundEventBase.Cast(requested_state.ClassName().ToType().Spawn());
+			m_CurrentState.Init(m_Infected);
+			m_CurrentState.Play();
+			return true;
+		}
+		else
+		{
+			m_CurrentState = InfectedSoundEventBase.Cast(requested_state.ClassName().ToType().Spawn());
+			m_CurrentState.Init(m_Infected);
+			m_CurrentState.Play();
+			return true;
+		}
+
+		return false;//should never get here
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/DamageEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/DamageEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..31c0a225b3a8e79cf8f37a6b41fbb830074ddd7a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/DamageEvents.c
@@ -0,0 +1,39 @@
+class DamageSoundEvents extends PlayerSoundEventBase
+{
+	
+	void DamageSoundEvents()
+	{
+		m_HasPriorityOverTypes = -1;//-1 for all
+		m_Type = EPlayerSoundEventType.DAMAGE;
+	}
+	
+	override bool CanPlay(PlayerBase player)
+	{
+		return true;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return true;
+	}
+}
+
+class DamageLightSoundEvent extends DamageSoundEvents
+{
+	void DamageLightSoundEvent()
+	{
+		
+		m_ID = EPlayerSoundEventID.TAKING_DMG_LIGHT;
+		m_SoundVoiceAnimEventClassID = 12;
+	}
+}
+
+class DamageHeavySoundEvent extends DamageSoundEvents
+{
+	void DamageHeavySoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.TAKING_DMG_HEAVY;
+		m_SoundVoiceAnimEventClassID = 13;
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/DrowningEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/DrowningEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..2780db8f7b0c3535a3a4a8e982dd68fc31bd3a46
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/DrowningEvents.c
@@ -0,0 +1,36 @@
+class DrowningSoundEventBase  extends PlayerSoundEventBase
+{
+	void DrowningEvents()
+	{
+		m_HasPriorityOverTypes = -1;//-1 for all
+		m_Type = EPlayerSoundEventType.DROWNING;
+	}
+	
+	override bool CanPlay(PlayerBase player)
+	{
+		return true;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id,EPlayerSoundEventType type_other )
+	{
+		return true;
+	}
+}
+
+class DrowningEvent1 extends DrowningSoundEventBase
+{
+	void DrowningEvent1()
+	{
+		m_ID = EPlayerSoundEventID.DROWNING_BREATH;
+		m_SoundVoiceAnimEventClassID = 901;
+	}
+}
+
+class DrowningEvent2 extends DrowningSoundEventBase
+{
+	void DrowningEvent2()
+	{
+		m_ID = EPlayerSoundEventID.DROWNING_PAIN;
+		m_SoundVoiceAnimEventClassID = 900;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/HeatComfortEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/HeatComfortEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..ca314d15814729773ef97a31e5e6fcd6c1595539
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/HeatComfortEvents.c
@@ -0,0 +1,32 @@
+class HeatComfortEventsBase extends PlayerSoundEventBase
+{
+	
+	void HeatComfortEventsBase()
+	{
+		m_HasPriorityOverTypes = EPlayerSoundEventType.DUMMY | EPlayerSoundEventType.INJURY | EPlayerSoundEventType.STAMINA | EPlayerSoundEventType.GENERAL;//-1 for all
+		m_Type = EPlayerSoundEventType.GENERAL;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id,EPlayerSoundEventType type_other )
+	{
+		return true;
+	}
+}
+
+class FreezingSoundEvent extends HeatComfortEventsBase
+{
+	void FreezingSoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.FREEZING;
+		m_SoundVoiceAnimEventClassID = 11;
+	}
+}
+
+class HotSoundEvent extends HeatComfortEventsBase
+{
+	void HotSoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.HOT;
+		m_SoundVoiceAnimEventClassID = 30;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/HoldBreathEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/HoldBreathEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..892818fdbd524f06b476df387feae3442fc79027
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/HoldBreathEvents.c
@@ -0,0 +1,67 @@
+class HoldBreathSoundEventBase extends PlayerSoundEventBase
+{
+	void HoldBreathSoundEventBase()
+	{
+		m_HasPriorityOverTypes = -1;
+	}
+	
+	override bool HasHoldBreathException()
+	{
+		return true;
+	}
+
+}
+
+
+class HoldBreathSoundEvent extends HoldBreathSoundEventBase
+{
+	void HoldBreathSoundEvent()
+	{
+		m_Type = EPlayerSoundEventType.GENERAL;
+		m_ID = EPlayerSoundEventID.HOLD_BREATH;
+		m_SoundVoiceAnimEventClassID = 20;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		if (other_state_id == EPlayerSoundEventID.RELEASE_BREATH)
+		{
+			return false;
+		}
+		return true;
+	}
+}
+
+class ExhaustedBreathSoundEvent extends HoldBreathSoundEventBase
+{
+	void ExhaustedBreathSoundEvent()
+	{
+		m_Type = EPlayerSoundEventType.GENERAL;
+		m_ID = EPlayerSoundEventID.EXHAUSTED_BREATH;
+		m_SoundVoiceAnimEventClassID = 22;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return false;
+	}
+}
+
+class ReleaseBreathSoundEvent extends HoldBreathSoundEventBase
+{
+	void ReleaseBreathSoundEvent()
+	{
+		m_Type = EPlayerSoundEventType.GENERAL;
+		m_ID = EPlayerSoundEventID.RELEASE_BREATH;
+		m_SoundVoiceAnimEventClassID = 21;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		if( other_state_id == EPlayerSoundEventID.HOLD_BREATH)
+		{
+			return false;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/InjuryEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/InjuryEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2291008b1a5d229e2647f3580d98713611186e1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/InjuryEvents.c
@@ -0,0 +1,49 @@
+class InjurySoundEvents extends PlayerSoundEventBase
+{
+	
+	void InjurySoundEvents()
+	{
+		m_HasPriorityOverTypes = -1;//-1 for all
+		m_Type = EPlayerSoundEventType.INJURY;
+	}
+	
+	override bool CanPlay(PlayerBase player)
+	{
+		return true;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id,EPlayerSoundEventType type_other )
+	{
+		return true;
+	}
+}
+
+class InjuryLightSoundEvent extends InjurySoundEvents
+{
+	void InjuryLightSoundEvent()
+	{
+		
+		m_ID = EPlayerSoundEventID.INJURED_LIGHT;
+		m_SoundVoiceAnimEventClassID = 28;
+	}
+}
+
+class InjuryMediumSoundEvent extends InjurySoundEvents
+{
+	void InjuryMediumSoundEvent()
+	{
+		
+		m_ID = EPlayerSoundEventID.INJURED_MEDIUM;
+		m_SoundVoiceAnimEventClassID = 28;
+	}
+}
+
+class InjuryHeavySoundEvent extends InjurySoundEvents
+{
+	void InjuryHeavySoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.INJURED_HIGH;
+		m_SoundVoiceAnimEventClassID = 28;
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/JumpEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/JumpEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..9be25360da0a88329d1da546a3459b411484e195
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/JumpEvents.c
@@ -0,0 +1,42 @@
+class JumpEventsBase extends PlayerSoundEventBase
+{
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return true;
+	}
+	
+	override bool CanPlay(PlayerBase player)
+	{
+		if( !super.CanPlay(player) )
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	override void OnPlay(PlayerBase player)
+	{
+		super.OnPlay(player);
+		if( player.CanSpawnBreathVaporEffect() )
+			player.SpawnBreathVaporEffect();
+	}
+	
+	override void OnEnd()
+	{
+		super.OnEnd();
+		//m_Player.GetStaminaSoundHandlerClient().PostponeStamina(1000);
+		if(m_Player)
+			StaminaSoundHandlerClient.Cast(m_Player.m_PlayerSoundManagerClient.GetHandler(eSoundHandlers.STAMINA)).PostponeStamina(1300);
+	}
+}
+
+class JumpSoundEvent extends JumpEventsBase
+{
+	void JumpSoundEvent()
+	{
+		m_HasPriorityOverTypes = -1;//-1 for all
+		m_Type = EPlayerSoundEventType.GENERAL;
+		m_ID = EPlayerSoundEventID.JUMP;
+		m_SoundVoiceAnimEventClassID = 18;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/MeleeAttack.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/MeleeAttack.c
new file mode 100644
index 0000000000000000000000000000000000000000..2df13f4aef767ca103886ca8bccaea2e890e70e3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/MeleeAttack.c
@@ -0,0 +1,48 @@
+class MeleeAttackSoundEvents extends PlayerSoundEventBase
+{
+	void MeleeAttackSoundEvents()
+	{
+		m_Type = EPlayerSoundEventType.MELEE;
+		m_HasPriorityOverTypes = -1;
+	}
+	
+	override bool CanPlay(PlayerBase player)
+	{
+		return true;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		if( type_other == EPlayerSoundEventType.DAMAGE )
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	override void OnEnd()
+	{
+		super.OnEnd();
+		if(m_Player)
+			StaminaSoundHandlerClient.Cast(m_Player.m_PlayerSoundManagerClient.GetHandler(eSoundHandlers.STAMINA)).PostponeStamina(800);
+	}
+}
+
+class MeleeAttackLightEvent extends MeleeAttackSoundEvents
+{
+	void MeleeAttackLightEvent()
+	{
+		m_ID = EPlayerSoundEventID.MELEE_ATTACK_LIGHT;
+		m_SoundVoiceAnimEventClassID = 16;
+	}
+}
+
+class MeleeAttackHeavyEvent extends MeleeAttackSoundEvents
+{
+	void MeleeAttackHeavyEvent()
+	{
+		m_ID = EPlayerSoundEventID.MELEE_ATTACK_HEAVY;
+		m_SoundVoiceAnimEventClassID = 17;
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/MiscEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/MiscEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..dc2bff47f663ed215b6db5cc0c4c579bcd20a924
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/MiscEvents.c
@@ -0,0 +1,21 @@
+class PickupHeavySoundEvent extends PlayerSoundEventBase
+{
+	void PickupHeavySoundEvent()
+	{
+		m_HasPriorityOverTypes = -1;//-1 for all
+		m_Type = EPlayerSoundEventType.STAMINA;
+		m_ID = EPlayerSoundEventID.PICKUP_HEAVY;
+		m_SoundVoiceAnimEventClassID = 19;
+	}
+}
+
+class ThirstSoundEvent extends PlayerSoundEventBase
+{
+	void ThirstSoundEvent()
+	{
+		m_HasPriorityOverTypes = EPlayerSoundEventType.DUMMY | EPlayerSoundEventType.STAMINA;//-1 for all
+		m_Type = EPlayerSoundEventType.GENERAL;
+		m_ID = EPlayerSoundEventID.THIRST;
+		m_SoundVoiceAnimEventClassID = 902;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/StaminaEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/StaminaEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..24d70fca2fdfc6936c35953914b0bd258ebbbf64
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/StaminaEvents.c
@@ -0,0 +1,145 @@
+class StaminaSoundEventBase extends PlayerSoundEventBase
+{
+	const int MAX_VOLUME = 4;
+	void StaminaSoundEventBase()
+	{
+		m_Type = EPlayerSoundEventType.STAMINA;
+		m_HasPriorityOverTypes = EPlayerSoundEventType.STAMINA;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return false;
+	}
+	
+	override void OnPlay(PlayerBase player)
+	{
+		super.OnPlay(player);
+		
+		MaskBase mask = MaskBase.Cast(player.GetInventory().FindAttachment(InventorySlots.GetSlotIdFromString("Mask")));
+		
+		float rel_volume = 1;
+		if (mask)
+		{
+			if (mask.IsExternalFilterAttached() || mask.HasIntegratedFilter())
+			{
+				rel_volume = Math.Lerp(MAX_VOLUME,1,mask.GetFilterQuantity01());
+			}
+		}
+		
+		if (m_SoundSetCallback)
+			m_SoundSetCallback.SetVolumeRelative(rel_volume);
+		
+		#ifdef DIAG_DEVELOPER
+		if (!DiagMenu.GetBool(DiagMenuIDs.MISC_BREATH_VAPOR_LVL))//disabled in debug, do not spawn particles
+			return;
+		#endif
+		
+		if ( player.CanSpawnBreathVaporEffect() ) 
+			player.SpawnBreathVaporEffect();
+		
+		
+		//!!! beware of the ifdef above , most likely you want to put your code above it, otherwise it might not get executed !!!
+		
+	}
+	
+
+}
+class StaminaDownLight extends StaminaSoundEventBase
+{
+	void StaminaDownLight()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_DOWN_LIGHT;
+		m_SoundVoiceAnimEventClassID = 1;
+	}
+}
+
+class StaminaDownHeavy extends StaminaSoundEventBase
+{
+	void StaminaDownHeavy()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_DOWN_HEAVY;
+		m_SoundVoiceAnimEventClassID = 2;
+	}
+}
+
+class StaminaUpHeavy extends StaminaSoundEventBase
+{
+	void StaminaUpHeavy()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_UP_HEAVY;
+		m_SoundVoiceAnimEventClassID = 3;
+	}
+}
+
+class StaminaUpLight extends StaminaSoundEventBase
+{
+	void StaminaUpLight()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_UP_LIGHT;
+		m_SoundVoiceAnimEventClassID = 4;
+	}
+}
+
+class StaminaUpEnd extends StaminaSoundEventBase
+{
+	void StaminaUpEnd()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_UP_END;
+		m_SoundVoiceAnimEventClassID = 26;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return false;
+	}
+}
+
+class StaminaNormalDummy extends StaminaSoundEventBase
+{
+	void StaminaNormalDummy()
+	{
+		m_HasPriorityOverTypes = 0;
+		m_Type = EPlayerSoundEventType.DUMMY;
+		m_ID = EPlayerSoundEventID.STAMINA_NORMAL_DUMMY;
+		m_IsDummyType = true;
+		m_DummySoundLength = 3000;//in ms
+	}
+}
+
+
+// Low filter
+class StaminaLowFilterBase extends StaminaSoundEventBase
+{
+	void StaminaLowFilterBase()
+	{
+		m_ProcessPlaybackEvent = true;
+	}
+}
+
+class StaminaLowFilterUpper extends StaminaLowFilterBase
+{
+	void StaminaLowFilterUpper()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_LOW_FILTER_UPPER;
+		m_SoundVoiceAnimEventClassID = 33;
+	}
+}
+
+class StaminaLowFilterMid extends StaminaLowFilterBase
+{
+	void StaminaLowFilterMid()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_LOW_FILTER_MID;
+		m_SoundVoiceAnimEventClassID = 32;
+	}
+}
+
+class StaminaLowFilterLower extends StaminaLowFilterBase
+{
+	void StaminaLowFilterLower()
+	{
+		m_ID = EPlayerSoundEventID.STAMINA_LOW_FILTER_LOWER;
+		m_SoundVoiceAnimEventClassID = 31;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/SymptomEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/SymptomEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..a4d3a5b2ca12cc826da867c87451d9162309f60d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/Events/SymptomEvents.c
@@ -0,0 +1,56 @@
+class SymptomSoundEventBase extends PlayerSoundEventBase
+{
+	void SymptomSoundEventBase()
+	{
+		m_Type = EPlayerSoundEventType.GENERAL;
+		m_HasPriorityOverTypes = -1;
+	}
+	
+	override bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return true;
+	}
+}
+
+class CoughSoundEvent extends SymptomSoundEventBase
+{
+	void CoughSoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.SYMPTOM_COUGH;
+		m_SoundVoiceAnimEventClassID = 8;
+	}
+}
+
+class LaugherSoundEvent extends SymptomSoundEventBase
+{
+	void LaugherSoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.SYMPTOM_LAUGHTER;
+		m_SoundVoiceAnimEventClassID = 10;
+	}
+}
+
+class SneezeSoundEvent extends SymptomSoundEventBase
+{
+	void SneezeSoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.SYMPTOM_SNEEZE;
+		m_SoundVoiceAnimEventClassID = 9;
+	}
+}
+
+
+class FatigueSoundEvent extends SymptomSoundEventBase
+{
+	void FatigueSoundEvent()
+	{
+		m_ID = EPlayerSoundEventID.SYMPTOM_FATIGUE;
+		m_SoundVoiceAnimEventClassID = 2;
+	}
+	
+	override void OnPlay(PlayerBase player)
+	{
+		super.OnPlay(player);
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/PlayerSoundEventBase.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/PlayerSoundEventBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..9e0904edca0ce7fc2a6b6cd3a88aa9e9d79c98d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/PlayerSoundEventBase.c
@@ -0,0 +1,201 @@
+enum EPlayerSoundEventType
+{
+	GENERAL 	= 0x00000001,
+	MELEE 		= 0x00000002,
+	STAMINA 	= 0x00000004,
+	DAMAGE 		= 0x00000008,
+	DUMMY 		= 0x00000010,
+	INJURY 		= 0x00000020,
+	DROWNING 	= 0x00000040,
+	//HEAT_COMFORT	= 0x00000080,
+}
+
+enum EPlayerSoundEventParam
+{
+	SKIP_CONTROLLED_PLAYER 	= 0x00000001,
+	HIGHEST_PRIORITY		= 0x00000002,
+	/*
+	STAMINA 	= 0x00000004,
+	DAMAGE 		= 0x00000008,
+	DUMMY 		= 0x00000010,
+	INJURY 		= 0x00000020,
+	HEAT_COMFORT	= 0x00000040,
+	*/
+	
+	// ONLY COUNT BELLOW
+	ENUM_COUNT,
+
+}
+
+class PlayerSoundEventBase extends SoundEventBase
+{
+	PlayerBase 	m_Player;
+	float		m_DummySoundLength;
+	float 		m_DummyStartTime;
+	bool		m_IsDummyType;
+	bool		m_ProcessPlaybackEvent;
+	float 		m_PlayTime;
+
+	ref HumanMovementState m_Hms = new HumanMovementState();
+	EPlayerSoundEventType m_HasPriorityOverTypes;
+	
+	bool IsDummy()
+	{
+		return m_IsDummyType;
+	}
+		
+	EPlayerSoundEventType GetPriorityOverTypes()
+	{
+		return m_HasPriorityOverTypes;
+	}
+	
+	// !can this event play during hold breath
+	bool HasHoldBreathException()
+	{
+		return false;
+	}
+	
+	void PlayerSoundEventBase()
+	{
+		m_Type = EPlayerSoundEventType.GENERAL;
+	}
+	
+	void ~PlayerSoundEventBase()
+	{
+		if(!m_SoundSetCallback) 
+			OnEnd();
+	}
+	
+	int GetSoundVoiceAnimEventClassID()
+	{
+		return m_SoundVoiceAnimEventClassID;
+	}
+	
+	bool HasPriorityOverCurrent(PlayerBase player, EPlayerSoundEventID other_state_id, EPlayerSoundEventType type_other)
+	{
+		return true;
+	}
+	
+	bool IsFinished()
+	{
+		if(IsDummy())
+		{
+			return IsDummyFinished();
+		}
+		else
+		{
+			return !IsSoundCallbackExist();
+		}
+	}
+	
+	bool IsDummyFinished()
+	{
+		return GetGame().GetTime() > (m_DummyStartTime + m_DummySoundLength);
+	}
+	
+	
+	void OnTick(float delta_time)
+	{
+		if ( m_SoundSetCallback )
+		{
+ 			m_SoundSetCallback.SetPosition(m_Player.GetPosition());
+			//---------- Playback event -------------
+			if( delta_time > 0 && m_ProcessPlaybackEvent )//delta_time 0 is for remotes
+			{
+				
+				m_PlayTime += delta_time;
+				//this is not 100% precise as the playback position is not obtained from the sound system
+				float playback01 = Math.Clamp(m_PlayTime / m_SoundSetCallback.GetLength(),0,1);
+				SendEvent(playback01);
+			//---------- Playback event -------------
+			}
+		}
+	}
+
+	bool CanPlay(PlayerBase player)
+	{
+		player.GetMovementState(m_Hms);
+		
+		if (player.IsHoldingBreath() && !HasHoldBreathException())
+		{
+			return false;
+		}
+		if (player.m_IsDrowning || (player.IsSwimming() && m_Hms.m_iMovement != 0))
+		{
+			return false;
+		} 
+		return true;
+	}
+	
+	void Init(PlayerBase player)
+	{
+		InitEx(player,0);
+	}
+	
+	void InitEx(PlayerBase player, int param)
+	{
+		m_Player = player;
+		m_Param = param;
+		if (param & EPlayerSoundEventParam.HIGHEST_PRIORITY)
+		{
+			m_HasPriorityOverTypes = -1;
+		}
+	}
+	
+	void OnEnd()
+	{
+		if(m_ProcessPlaybackEvent)
+			SendEvent(1);
+	}
+	
+	void SendEvent(float time)
+	{
+		if(m_PlayTime < 0 || !m_SoundSetCallback)//negative m_PlayTime value indicates the event has already been sent for playback01 = 1
+			return;
+		
+		m_Player.OnVoiceEventPlayback(this, m_SoundSetCallback, time);
+		if(time >= 1)
+			m_PlayTime = -float.MAX;
+	}
+	
+	void OnInterupt()
+	{
+
+	}
+	
+	override void OnPlay(PlayerBase player)
+	{
+		super.OnPlay(player);
+		//Print("start playing -------------------->" + m_Type);
+		player.OnVoiceEvent(this);
+		//m_Player.OnVoiceEventDuration(m_SoundSetCallback, 0);
+	}
+
+	override bool Play()
+	{
+		if(!super.Play())
+			return false;
+	
+		if( !IsDummy() )
+		{
+			m_SoundSetCallback = m_Player.ProcessVoiceEvent("","", m_SoundVoiceAnimEventClassID);
+			
+			if(m_SoundSetCallback)
+			{
+				AbstractWaveEvents events = AbstractWaveEvents.Cast(m_SoundSetCallback.GetUserData());
+				events.Event_OnSoundWaveEnded.Insert( OnEnd );
+				events.Event_OnSoundWaveStopped.Insert( OnInterupt );
+				return true;
+			}
+			else 
+				return false;
+		}
+		else
+		{
+			m_DummyStartTime = GetGame().GetTime();
+			return true;
+		}
+		return false;
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/PlayerSoundEventHandler.c b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/PlayerSoundEventHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..7f6ea56536df52afdbc7c75f8f089889268cd989
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/PlayerSoundEvents/PlayerSoundEventHandler.c
@@ -0,0 +1,196 @@
+enum EPlayerSoundEventID
+{
+	HOLD_BREATH = 1,
+	EXHAUSTED_BREATH,
+	RELEASE_BREATH,
+	STAMINA_DOWN_LIGHT,
+	STAMINA_DOWN_HEAVY,
+	STAMINA_UP_LIGHT,
+	STAMINA_UP_HEAVY,
+	STAMINA_UP_END,
+	STAMINA_NORMAL_DUMMY,
+	TAKING_DMG_LIGHT,
+	TAKING_DMG_HEAVY,
+	SYMPTOM_COUGH,
+	SYMPTOM_LAUGHTER,
+	SYMPTOM_SNEEZE,
+	JUMP,
+	MELEE_ATTACK_LIGHT,
+	MELEE_ATTACK_HEAVY
+	INJURED_LIGHT,
+	INJURED_MEDIUM,
+	INJURED_HIGH,
+	FREEZING,
+	HOT,
+	SYMPTOM_FATIGUE,
+	STAMINA_LOW_FILTER_UPPER,
+	STAMINA_LOW_FILTER_MID,
+	STAMINA_LOW_FILTER_LOWER,
+	DROWNING_BREATH,
+	DROWNING_PAIN,
+	PICKUP_HEAVY,
+	THIRST,
+	//--------------
+	// Count bellow, put enums above
+	//--------------
+	ENUM_COUNT,
+}
+
+class PlayerSoundEventHandler extends SoundEventHandler
+{
+	PlayerBase m_Player;
+	const int SOUND_EVENTS_MAX = EPlayerSoundEventID.ENUM_COUNT;
+	static ref PlayerSoundEventBase m_AvailableStates[SOUND_EVENTS_MAX];
+	static ref map<int,int> m_ConfigIDToScriptIDmapping = new ref map<int,int> ;
+	ref PlayerSoundEventBase m_CurrentState;
+	ref Timer m_UpdateTimer;
+	
+	
+	void PlayerSoundEventHandler(PlayerBase player)
+	{
+		m_Player = player;
+		
+		if(!m_UpdateTimer && !m_Player.IsControlledPlayer())
+		{
+			m_UpdateTimer = new Timer();
+			m_UpdateTimer.Run(1, this, "OnTick", null, true);//ticking for remotes, the controlled player is ticking on command handler at higher intervals
+		}
+		
+		RegisterState(new HoldBreathSoundEvent());
+		RegisterState(new ExhaustedBreathSoundEvent());
+		RegisterState(new FatigueSoundEvent());
+		RegisterState(new ReleaseBreathSoundEvent());
+		RegisterState(new StaminaDownLight());
+		RegisterState(new StaminaDownHeavy());
+		RegisterState(new StaminaUpLight());
+		RegisterState(new StaminaUpHeavy());
+		RegisterState(new StaminaUpEnd());
+		RegisterState(new DamageLightSoundEvent());
+		RegisterState(new DamageHeavySoundEvent());
+		RegisterState(new SneezeSoundEvent());
+		RegisterState(new LaugherSoundEvent());
+		RegisterState(new CoughSoundEvent());
+		RegisterState(new JumpSoundEvent());
+		RegisterState(new MeleeAttackLightEvent());
+		RegisterState(new MeleeAttackHeavyEvent());
+		RegisterState(new StaminaNormalDummy());
+		RegisterState(new InjuryLightSoundEvent());
+		RegisterState(new InjuryMediumSoundEvent());
+		RegisterState(new InjuryHeavySoundEvent());
+		RegisterState(new FreezingSoundEvent());
+		RegisterState(new HotSoundEvent());
+		RegisterState(new StaminaLowFilterUpper());
+		RegisterState(new StaminaLowFilterMid());
+		RegisterState(new StaminaLowFilterLower());
+		RegisterState(new DrowningEvent1());
+		RegisterState(new DrowningEvent2());
+		RegisterState(new PickupHeavySoundEvent());
+		RegisterState(new ThirstSoundEvent());
+
+
+	}
+	
+	void RegisterState(PlayerSoundEventBase state)
+	{
+		int index = state.GetSoundEventID();
+		m_AvailableStates[index] = state;
+		m_ConfigIDToScriptIDmapping.Insert(state.GetSoundVoiceAnimEventClassID(),index);
+	}
+	
+	
+	void OnTick(float delta_time)
+	{
+		if (m_CurrentState)
+		{ 
+			if( m_CurrentState.IsFinished())
+				m_CurrentState = null;
+			else
+				m_CurrentState.OnTick(delta_time);
+		}
+	}
+	
+	int ConvertAnimIDtoEventID(int anim_id)
+	{
+		return m_ConfigIDToScriptIDmapping.Get(anim_id);
+	}
+	
+	override static EPlayerSoundEventType GetSoundEventType(int id)
+	{
+		return m_AvailableStates[id].GetSoundEventType();
+	}
+	
+	override int GetCurrentStateEventID()
+	{
+		if(m_CurrentState)
+		{
+			return m_CurrentState.GetSoundEventID();
+		}
+		return -1;
+	}
+	
+	override int GetCurrentStateEventType()
+	{
+		if(m_CurrentState)
+		{
+			return m_CurrentState.GetSoundEventType();
+		}
+		return -1;
+	}
+
+	override bool PlayRequestEx(EPlayerSoundEventID id, bool sent_from_server = false, int param = 0)
+	{
+		if (id < 0 || id > (SOUND_EVENTS_MAX - 1))
+		{
+			Error("EPlayerSoundEventID out of bounds");
+		}
+
+		PlayerSoundEventBase requested_state = m_AvailableStates[id];
+		if ( sent_from_server && (param & EPlayerSoundEventParam.SKIP_CONTROLLED_PLAYER) && m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT )
+		{
+			return false;
+		}
+			
+		if ( !requested_state.CanPlay(m_Player) )
+		{
+			return false;
+		}
+
+		if (m_CurrentState)
+		{
+			if (param & EPlayerSoundEventParam.HIGHEST_PRIORITY)
+			{
+				m_CurrentState.Stop();
+			}
+			else
+			{
+				int current_type =  m_CurrentState.GetSoundEventType();
+				//int requested_type = requested_state.GetSoundEventType();
+				
+				if ( (requested_state.GetPriorityOverTypes() & current_type) == 0 )
+				{
+					return false;
+				}
+				if (!requested_state.HasPriorityOverCurrent(m_Player, id, current_type) )
+				{
+					return false;
+				}
+	
+				m_CurrentState.Stop();
+			}
+		}
+		m_CurrentState = PlayerSoundEventBase.Cast(requested_state.ClassName().ToType().Spawn());
+		m_CurrentState.InitEx(m_Player, param);
+		if (m_CurrentState.Play())
+		{
+			m_CurrentState.OnPlay(m_Player);
+		}
+		return true;
+	}
+	
+	
+	override bool PlayRequest(EPlayerSoundEventID id, bool sent_from_server = false)
+	{
+		return PlayRequestEx(id, sent_from_server);
+	}
+		
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundEvents/SoundEvents.c b/scripts/4_World/DayZ/Classes/SoundEvents/SoundEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..c1b09738bc394af9ba6b21e02cc10d18a011d087
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundEvents/SoundEvents.c
@@ -0,0 +1,91 @@
+class SoundEventBase
+{
+	AbstractWave 	m_SoundSetCallback;
+	int 			m_Type;
+	int 			m_ID;
+	int 			m_SoundVoiceAnimEventClassID;
+	bool 			m_RequestDestroy;
+	string 			m_SoundSetNameRoot;
+	bool 			m_SkipForControlledCharacter;
+	int				m_Param;
+	
+	
+	void ~SoundEventBase()
+	{
+		if(m_SoundSetCallback) m_SoundSetCallback.Stop();
+	}
+	
+	//obsolete function, now possible to set a param
+	bool IsSkipForControlled()
+	{
+		return m_SkipForControlledCharacter;
+	}
+	
+	void Tick()
+	{
+		if(!m_SoundSetCallback)
+		{
+			m_RequestDestroy = true;
+		}
+	}
+	
+	bool IsSoundCallbackExist()
+	{
+		if( m_SoundSetCallback )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool IsDestroyRequested()
+	{
+		return m_RequestDestroy;
+	}
+	
+	bool CanPlay()
+	{
+		return true;
+	}
+	
+	bool Play()
+	{
+		return true;
+	}
+	
+	void OnPlay(PlayerBase player);
+	
+	void Stop()
+	{
+		if(m_SoundSetCallback) 
+		{
+			m_SoundSetCallback.Stop();
+		}
+	}	
+
+	int GetSoundEventID()
+	{
+		return m_ID;
+	}
+
+	int GetSoundEventType()
+	{
+		return m_Type;
+	}
+	
+	AbstractWave GetSoundSetCallback()
+	{
+		return m_SoundSetCallback;
+	}
+}
+
+class SoundEventHandler
+{
+	static int GetSoundEventType(int id) { return -1; }
+	//void OnTick(float delta_time) {}
+	bool PlayRequest(EPlayerSoundEventID id, bool sent_from_server = false) { return true; }
+	bool PlayRequestEx(EPlayerSoundEventID id, bool sent_from_server = false, int param = 0){ return true; };
+	int GetCurrentStateEventID() { return -1; }
+	int GetCurrentStateEventType() { return -1; }
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundHandlers/FreezingSoundHandler.c b/scripts/4_World/DayZ/Classes/SoundHandlers/FreezingSoundHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc2aec009efa62768810044c6534cb72467fe3ad
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundHandlers/FreezingSoundHandler.c
@@ -0,0 +1,58 @@
+/*
+class FreezingSoundHandlerBase extends SoundHandlerBase
+{
+	override void Init()
+	{
+		m_Id = eSoundHandlers.FREEZING;
+	}
+	
+}
+
+//---------------------------
+// Client
+//---------------------------
+class FreezingSoundHandlerClient extends FreezingSoundHandlerBase
+{
+	const float SOUND_INTERVALS_LIGHT_MIN = 5;	const float SOUND_INTERVALS_LIGHT_MAX = 20;
+	float m_SoundTime;
+	EffectSound m_Sound;
+	ref HumanMovementState	hms = new HumanMovementState();
+	override void Update()
+	{
+		if( m_Player.GetShakeLevel() > 0 )
+		{
+			ProcessSound();
+		}
+	}
+	
+	void ProcessSound()
+	{
+		m_Player.GetMovementState(hms);
+		if (hms.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_IDLE)
+		{
+			//return;
+		}
+		
+		if( GetGame().GetTime() > m_SoundTime )
+		{
+			float offset_time = Math.RandomFloatInclusive(SOUND_INTERVALS_LIGHT_MIN, SOUND_INTERVALS_LIGHT_MAX) * 1000;
+			m_SoundTime = GetGame().GetTime() + offset_time;
+			PlaySound();
+		}
+	}
+	
+	void PlaySound()
+	{
+		//Print("------------- freezing  --------------");
+		m_Player.PlaySoundEvent(EPlayerSoundEventID.FREEZING);
+	}
+}
+
+
+//---------------------------
+// Server
+//---------------------------
+class FreezingSoundHandlerServer extends HungerSoundHandlerBase
+{
+	
+}*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundHandlers/HungerSoundHandler.c b/scripts/4_World/DayZ/Classes/SoundHandlers/HungerSoundHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..afa314d7756c457d0eb5954d1666eb1732d791a1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundHandlers/HungerSoundHandler.c
@@ -0,0 +1,60 @@
+class HungerSoundHandlerBase extends SoundHandlerBase
+{
+	override void Init()
+	{
+		m_Id = eSoundHandlers.HUNGER;
+	}
+	
+}
+
+//---------------------------
+// Client
+//---------------------------
+class HungerSoundHandlerClient extends HungerSoundHandlerBase
+{
+	const float SOUND_INTERVALS_LIGHT_MIN = 10;
+	const float SOUND_INTERVALS_LIGHT_MAX = 30;
+	float m_SoundTime;
+	EffectSound m_Sound;
+	
+	override void Update()
+	{
+		if ( m_Player.GetMixedSoundStates() & eMixedSoundStates.HUNGRY )
+		{
+			ProcessSound();
+		}
+	}
+	
+	void ProcessSound()
+	{
+		if ( GetGame().GetTime() > m_SoundTime)
+		{
+			float offset_time = Math.RandomFloatInclusive(SOUND_INTERVALS_LIGHT_MIN, SOUND_INTERVALS_LIGHT_MAX) * 1000;
+			m_SoundTime = GetGame().GetTime() + offset_time;
+			PlaySound();
+		}
+	}
+	
+	void PlaySound()
+	{
+		m_Sound = SEffectManager.PlaySoundOnObject("hungry_uni_Voice_Char_SoundSet", m_Player);
+		
+		if( m_Sound )
+		{
+			m_Sound.SetAutodestroy(true);
+		}
+		else
+		{
+			Debug.LogError("Missing sounset");
+		}
+	}
+}
+
+
+//---------------------------
+// Server
+//---------------------------
+class HungerSoundHandlerServer extends HungerSoundHandlerBase
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundHandlers/InjurySoundHandler.c b/scripts/4_World/DayZ/Classes/SoundHandlers/InjurySoundHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec86796e73943d82511faa5b0e3d9553208e2db3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundHandlers/InjurySoundHandler.c
@@ -0,0 +1,128 @@
+enum eInjurySoundZones
+{
+	NONE = 0,
+	LIGHT,
+	MEDIUM,
+	HEAVY,
+	
+	// PUT NEW STATES ABOVE
+	COUNT
+}
+
+class InjurySoundHandlerBase extends SoundHandlerBase
+{
+	override void Init()
+	{
+		m_Id = eSoundHandlers.INJURY;
+	}
+	
+}
+
+//---------------------------
+// Client
+//---------------------------
+class InjurySoundHandlerClient extends InjurySoundHandlerBase
+{
+	const float SOUND_INTERVALS_LIGHT_MIN 	= 15; const float SOUND_INTERVALS_LIGHT_MAX = 30;
+	const float SOUND_INTERVALS_MEDIUM_MIN 	= 10; const float SOUND_INTERVALS_MEDIUM_MAX = 25;
+	const float SOUND_INTERVALS_HEAVY_MIN	= 3; const float SOUND_INTERVALS_HEAVY_MAX = 12;
+	
+	ref HumanMovementState m_MovementState = new HumanMovementState;
+	eInjurySoundZones m_InjurySoundZone;
+	eInjuryHandlerLevels m_InjuryLevel;
+	float m_SoundTime;
+
+	
+	eInjurySoundZones DetermineInjuryZone(eInjuryHandlerLevels level)
+	{
+		if( level == eInjuryHandlerLevels.PRISTINE ) 
+			return eInjurySoundZones.NONE;
+		
+		m_Player.GetMovementState(m_MovementState);
+		int speed = m_MovementState.m_iMovement;
+		int stance = m_MovementState.m_iStanceIdx;
+		
+		//int stance_lvl_down = DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_CROUCH;
+		
+		if( speed == 0 ) 
+			return eInjurySoundZones.NONE;
+		
+		level--;// shift the level so that we play from higher damage
+		
+		if( stance ==  DayZPlayerConstants.STANCEIDX_PRONE || stance ==  DayZPlayerConstants.STANCEIDX_CROUCH )
+		{
+			level--;
+		}
+		
+		if( speed == DayZPlayerConstants.MOVEMENTIDX_WALK )
+		{
+			level--;
+		}
+		else if(speed == DayZPlayerConstants.MOVEMENTIDX_SPRINT)
+		{
+			level++;
+		}
+		level = Math.Clamp(level, eInjurySoundZones.NONE, eInjurySoundZones.HEAVY);
+		return level;
+	}
+	
+		
+	override void Update()
+	{
+		m_InjuryLevel = m_Player.m_HealthLevel;
+		
+		if( m_InjuryLevel != eInjuryHandlerLevels.PRISTINE )
+		{
+			eInjurySoundZones zone = DetermineInjuryZone(m_Player.m_HealthLevel);
+			ProcessSound(zone);
+		}
+	}
+	
+	void ProcessSound(eInjurySoundZones zone)
+	{
+		//Print("injury sound zone:"+ zone);
+		// process sound here
+		if( GetGame().GetTime() > m_SoundTime)
+		{
+			float offset_time;
+			if(zone == eInjurySoundZones.NONE)
+			{
+				offset_time = 3000;
+				m_SoundTime = GetGame().GetTime() + offset_time;
+				return;
+			}
+			if(zone == eInjurySoundZones.LIGHT)
+			{
+				offset_time = Math.RandomFloatInclusive(SOUND_INTERVALS_LIGHT_MIN, SOUND_INTERVALS_LIGHT_MAX) * 1000;
+			}
+			else if(zone == eInjurySoundZones.MEDIUM)
+			{
+				offset_time = Math.RandomFloatInclusive(SOUND_INTERVALS_MEDIUM_MIN, SOUND_INTERVALS_MEDIUM_MAX) * 1000;
+			}
+			else if(zone == eInjurySoundZones.HEAVY)
+			{
+				offset_time = Math.RandomFloatInclusive(SOUND_INTERVALS_HEAVY_MIN, SOUND_INTERVALS_HEAVY_MAX) * 1000;
+			}
+			m_SoundTime = GetGame().GetTime() + offset_time;
+			PlaySound(zone);
+		}
+	}
+	
+	void PlaySound(eInjurySoundZones zone)
+	{
+		m_Player.PlaySoundEvent(EPlayerSoundEventID.INJURED_LIGHT);
+	}
+	
+}
+
+
+//---------------------------
+// Server
+//---------------------------
+class InjurySoundHandlerServer extends InjurySoundHandlerBase
+{
+
+
+	
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundHandlers/PlayerSoundManager.c b/scripts/4_World/DayZ/Classes/SoundHandlers/PlayerSoundManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..c6cb75a2451e510485c44701e1296b0ec64ed62d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundHandlers/PlayerSoundManager.c
@@ -0,0 +1,158 @@
+
+const float SOUNDS_HEARING_DISTANCE = 50;
+
+enum eSoundHandlers
+{
+	STAMINA,
+	HUNGER,
+	INJURY,
+	THIRST,
+	//FREEZING,
+	
+	//------
+	// add stuff above !
+	//------
+	COUNT
+}
+
+
+
+class PlayerSoundManagerBase
+{
+	PlayerBase m_Player;
+	
+	const int MAX_HANDLERS_COUNT = eSoundHandlers.COUNT;
+	ref SoundHandlerBase m_Handlers[MAX_HANDLERS_COUNT];
+	
+	void PlayerSoundManagerBase(PlayerBase player)
+	{
+		m_Player = player;
+		Init();
+	}
+	
+	void RegisterHandler(SoundHandlerBase handler)
+	{
+		int index = handler.GetID();
+		m_Handlers[index] = handler;
+	}
+	
+	SoundHandlerBase GetHandler(eSoundHandlers id)
+	{
+		return m_Handlers[id];
+	}
+	
+	void Init()
+	{
+	
+	}
+	
+	void Update()
+	{
+	
+	}
+	
+
+}
+
+class PlayerSoundManagerServer extends PlayerSoundManagerBase
+{
+	//------------------------
+	// REGISTER HANDLER HERE 
+	//------------------------
+	override void Init()
+	{
+		RegisterHandler(new StaminaSoundHandlerServer(m_Player));
+		RegisterHandler(new HungerSoundHandlerServer(m_Player));
+		RegisterHandler(new ThirstSoundHandlerServer(m_Player));
+		RegisterHandler(new InjurySoundHandlerServer(m_Player));
+	}
+	
+	override void Update()
+	{
+		if( m_Player.IsUnconscious() )
+		{
+			return;
+		}
+		
+		for(int i = 0; i < (MAX_HANDLERS_COUNT - 1); i++)
+		{
+			m_Handlers[i].Update();
+		}
+	}
+}
+
+class PlayerSoundManagerClient extends PlayerSoundManagerBase
+{
+	ref Timer m_ClientCharacterTick = new Timer;
+	ref Timer m_ClientCharacterDistanceCheck = new Timer;
+	bool m_UpdateTimerRunning;
+
+	//------------------------
+	// REGISTER HANDLER HERE 
+	//------------------------
+	override void Init()
+	{
+		RegisterHandler(new StaminaSoundHandlerClient(m_Player));
+		RegisterHandler(new HungerSoundHandlerClient(m_Player));
+		RegisterHandler(new ThirstSoundHandlerClient(m_Player));
+		RegisterHandler(new InjurySoundHandlerClient(m_Player));
+		//RegisterHandler(new FreezingSoundHandlerClient(m_Player));
+	}
+	
+	void PlayerSoundManagerClient(PlayerBase player)
+	{
+		
+		if( !GetGame().IsDedicatedServer() ) 
+		{
+			m_ClientCharacterDistanceCheck.Run(2, this, "CheckAllowUpdate", null, true);
+		}
+	}
+	
+	void SetAllowUpdate(bool enable)
+	{
+		if( enable )
+		{
+			m_UpdateTimerRunning = true;
+			m_ClientCharacterTick.Run(0.03, this, "Update", null, true);
+		}
+		else
+		{
+			m_UpdateTimerRunning = false;
+			m_ClientCharacterTick.Stop();
+		}
+	}
+	
+	override void Update()
+	{
+		if( !m_Player.IsAlive() )
+		{
+			SetAllowUpdate(false);
+			return;
+		}
+
+#ifndef NO_GUI
+		for(int i = 0; i < MAX_HANDLERS_COUNT; i++)
+		{
+			m_Handlers[i].Update();
+		}
+#endif
+	}
+	
+	void CheckAllowUpdate()
+	{
+		if( GetGame().GetPlayer() )
+		{
+			bool is_at_hearing_distance = vector.Distance(GetGame().GetPlayer().GetPosition(), m_Player.GetPosition()) < SOUNDS_HEARING_DISTANCE;
+			
+			if( m_UpdateTimerRunning && !is_at_hearing_distance )
+			{
+				SetAllowUpdate(false);
+			}
+			else if( !m_UpdateTimerRunning && is_at_hearing_distance )
+			{
+				SetAllowUpdate(true);
+			}
+			//PrintString("distance:" + vector.Distance(GetGame().GetPlayer().GetPosition(), m_Player.GetPosition()).ToString());
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SoundHandlers/ThirstSoundHandler.c b/scripts/4_World/DayZ/Classes/SoundHandlers/ThirstSoundHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..496614998e8487e04f36fb9d5a2859114fcddc9b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SoundHandlers/ThirstSoundHandler.c
@@ -0,0 +1,51 @@
+class ThirstSoundHandlerBase extends SoundHandlerBase
+{
+	override void Init()
+	{
+		m_Id = eSoundHandlers.THIRST;
+	}
+	
+}
+
+//---------------------------
+// Client
+//---------------------------
+class ThirstSoundHandlerClient extends ThirstSoundHandlerBase
+{
+	const float SOUND_INTERVALS_LIGHT_MIN = 10;
+	const float SOUND_INTERVALS_LIGHT_MAX = 30;
+	float m_SoundTime;
+	EffectSound m_Sound;
+	
+	override void Update()
+	{
+		if ( m_Player.GetMixedSoundStates() & eMixedSoundStates.THIRSTY )
+		{
+			ProcessSound();
+		}
+	}
+	
+	void ProcessSound()
+	{
+		if ( GetGame().GetTime() > m_SoundTime)
+		{
+			float offset_time = Math.RandomFloatInclusive(SOUND_INTERVALS_LIGHT_MIN, SOUND_INTERVALS_LIGHT_MAX) * 1000;
+			m_SoundTime = GetGame().GetTime() + offset_time;
+			PlaySound();
+		}
+	}
+	
+	void PlaySound()
+	{
+		m_Player.PlaySoundEventEx(EPlayerSoundEventID.THIRST);
+	}
+}
+
+
+//---------------------------
+// Server
+//---------------------------
+class ThirstSoundHandlerServer extends ThirstSoundHandlerBase
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/SqfDebugWatcher.c b/scripts/4_World/DayZ/Classes/SqfDebugWatcher.c
new file mode 100644
index 0000000000000000000000000000000000000000..113ae02aae34b570897658fc22ba7495d7716d12
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/SqfDebugWatcher.c
@@ -0,0 +1,59 @@
+class SqfDebugWatcher
+{
+	private int m_Id;
+	private string m_SqfCommand;
+	
+	private bool m_IsRunning;
+		
+
+	void SqfDebugWatcher( int id, string sqf_command )
+	{
+		m_Id = id;
+		m_SqfCommand = sqf_command;
+		m_IsRunning = false;
+	}
+
+	int GetId()
+	{
+		return m_Id;
+	}
+
+	void SetId( int id )
+	{
+		m_Id = id;
+	}
+
+	string GetSqfCommand()
+	{
+		return m_SqfCommand;
+	}
+
+	void SetSqfCommand( string sqf_command )
+	{
+		m_SqfCommand = sqf_command;
+	}
+
+	bool IsRunning()
+	{
+		return m_IsRunning;
+	}
+
+	void Run()
+	{
+		m_IsRunning = true;
+	}
+
+	void Stop()
+	{
+		m_IsRunning = false;
+	}
+
+	void Execute()
+	{
+		if ( m_IsRunning && m_SqfCommand != "" )
+		{
+//			string sqf_command = "_result = " + m_SqfCommand + "; _resultStr = format ['%1', _result]; null = callFunction ['OnSqfDebugWatcherResult', " + m_Id.ToString() + ", _resultStr];";
+//			GetGame().ExecuteSQF( sqf_command );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/StaminaHandler.c b/scripts/4_World/DayZ/Classes/StaminaHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..dc9a9a14a2d832d532311e807ab4dcf10f945aee
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/StaminaHandler.c
@@ -0,0 +1,1052 @@
+enum EStaminaMultiplierTypes
+{
+	MASK = 1,
+	FATIGUE,
+	EPINEPHRINE,
+	DROWNING,
+}
+
+
+/**@class	Stamina Consumer
+ * @brief	Holds information about Stamina Consumer
+ *
+ * @param[in]	threshold	value needed to allow consume stamina
+ * @param[in]	state		keeps state of the consumer non-depleted/depleted
+ */
+class StaminaConsumer
+{
+	protected float m_ActivationThreshold;
+	protected float m_DrainThreshold
+	protected bool m_State;
+	
+	void StaminaConsumer(float threshold, float threshold2, bool state)
+	{
+		m_ActivationThreshold = threshold; //can be activated if above this threshold
+		m_DrainThreshold = threshold2; //can continually drain until it reaches this threshold
+		m_State = state;
+	}
+	
+	bool GetState() { return m_State; }
+	void SetState(bool state) { m_State = state; }
+	
+	float GetActivationThreshold() { return m_ActivationThreshold; }
+	void SetActivationThreshold(float threshold) { m_ActivationThreshold = threshold; }
+	
+	float GetDrainThreshold() { return m_DrainThreshold; }
+	void SetDrainThreshold(float threshold) { m_DrainThreshold = threshold; }	
+}
+
+class StaminaConsumers
+{
+	protected ref map<EStaminaConsumers, ref StaminaConsumer> m_StaminaConsumers;
+
+	void StaminaConsumers()
+	{
+		m_StaminaConsumers = new map<EStaminaConsumers, ref StaminaConsumer>;
+	}
+
+	void RegisterConsumer(EStaminaConsumers consumer, float threshold, float depletion_threshold = -1)
+	{
+		if (depletion_threshold == -1)
+		{
+			depletion_threshold = threshold;
+		}
+		
+		if ( !m_StaminaConsumers.Contains(consumer) )
+		{
+			//! init of StaminaConsumer - threshold, state
+			StaminaConsumer sc = new StaminaConsumer(threshold, depletion_threshold, true);
+			m_StaminaConsumers.Set(consumer, sc);
+		}
+	}
+
+	bool HasEnoughStaminaFor(EStaminaConsumers consumer, float curStamina, bool isDepleted, float cap)
+	{
+		if ( m_StaminaConsumers && m_StaminaConsumers.Contains(consumer) )
+		{
+			StaminaConsumer sc = m_StaminaConsumers.Get(consumer);
+			
+			if ( consumer != EStaminaConsumers.SPRINT )
+			{
+				if ( (isDepleted || (curStamina < sc.GetDrainThreshold()/* && curStamina < cap*/)) )
+				{
+					sc.SetState(false);
+					return false;
+				}
+			}
+			else
+			{
+				if ( !isDepleted )
+				{
+					if ( sc.GetState() ) 
+					{
+						sc.SetState(true);
+						return true;
+					}
+				}
+				else
+				{
+					sc.SetState(false);
+					return false;
+				}
+			}
+
+			if ( curStamina > sc.GetDrainThreshold() || curStamina == cap ) //Sometimes player can't go up to drain threshold
+			{
+				sc.SetState(true);
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	bool HasEnoughStaminaToStart(EStaminaConsumers consumer, float curStamina, bool isDepleted, float cap)
+	{
+		if ( m_StaminaConsumers && m_StaminaConsumers.Contains(consumer) )
+		{
+			StaminaConsumer sc = m_StaminaConsumers.Get(consumer);
+			
+			if ( (isDepleted || (curStamina < sc.GetActivationThreshold() && curStamina < cap)) )
+			{
+				sc.SetState(false);
+				return false;
+			}
+			else
+			{
+				sc.SetState(true);
+				return true;
+			}
+		}
+		
+		return false;
+	}
+}
+
+
+/**@class	Stamina Modifier
+ * @brief	Holds information about Stamina Modifier
+ *
+ * @param[in]	type	 	calculation method
+ * @param[in]	minValue	min value substracted from stamina (if type > 0)
+ * @param[in]	maxValue	max value substracted from stamina
+ * @param[in]	cooldown	how many seconds will not be the stamina replenishing after depleting
+ */
+class StaminaModifier
+{
+	bool m_InUse = false;
+	int m_Type;
+	float m_MinValue, m_MaxValue, m_Multiplier, m_Cooldown, m_StartTime, m_StartTimeAdjustment, m_Duration, m_ProgressTime, m_Tick;
+
+	void StaminaModifier(int type, float min, float max, float cooldown, float startTime = 0, float duration = 0)
+	{
+		m_Type = type;
+		m_MinValue = min;
+		m_MaxValue = max;
+		m_Cooldown = cooldown;
+		m_StartTimeAdjustment = startTime;
+		m_Duration = duration;
+		m_Tick = 1;
+	}
+	
+	int GetType() { return m_Type; }
+	
+	float GetMinValue() { return m_MinValue; }
+	void SetMinValue(float val) { m_MinValue = val; } 
+	
+	float GetMaxValue() { return m_MaxValue; }
+	void SetMaxValue(float val) { m_MaxValue = val; }
+	
+	float GetCooldown() { return m_Cooldown; }
+	void SetCooldown(float val) { m_Cooldown = val; }
+	
+	float GetStartTime() { return m_StartTime; } //Actual game time (progressive modifiers only)
+	void SetStartTime(float val) { m_StartTime = val; }
+	
+	float GetStartTimeAdjustment() {return m_StartTimeAdjustment;} //adjustment to current time (progressive modifiers only)
+	
+	float GetDuration() { return m_Duration; }
+	float GetDurationAdjusted() { return m_Duration / m_Tick; }
+	
+	bool IsInUse() { return m_InUse; }
+	void SetInUse(bool val) { m_InUse = val; }
+	
+	float GetRunTime() { return m_ProgressTime; }
+	void AddRunTime(float val) { m_ProgressTime += val; }
+	void SetRunTimeTick(float val) { m_Tick = val; }
+	void ResetRunTime() { m_ProgressTime = 0 }
+}
+
+class StaminaModifierExponential : StaminaModifier
+{
+	protected ref SMDataExponential m_SMDataEx;
+	
+	float GetBaseValue() { return m_SMDataEx.m_BaseValue; }
+	float GetExponent() { return m_SMDataEx.m_Exponent; }
+	float GetMultiplier() { return m_SMDataEx.m_Multiplier; }
+	override float GetCooldown() { return m_SMDataEx.m_Cooldown; }
+	override float GetStartTimeAdjustment() { return m_SMDataEx.m_StartTimeAdjustment; }
+	override float GetDuration() { return m_SMDataEx.m_Duration; }
+	override float GetDurationAdjusted() { return m_SMDataEx.m_Duration / m_Tick; }
+	
+	void SetData(SMDataExponential data) { m_SMDataEx = data; }
+}
+
+class StaminaModifiers
+{
+	const int FIXED 		= 0;
+	const int RANDOMIZED 	= 1;
+	const int LINEAR 		= 2; //Useful ONLY for regular, over-time stamina drain
+	const int EXPONENTIAL 	= 3; //Useful ONLY for regular, over-time stamina drain
+
+	protected ref map<EStaminaModifiers, ref StaminaModifier> m_StaminaModifiers;
+
+	void StaminaModifiers()
+	{
+		m_StaminaModifiers = new map<EStaminaModifiers, ref StaminaModifier>;
+	}
+
+	//! register single value modifier - depletes stamina for that value
+	void RegisterFixed(EStaminaModifiers modifier, float value, float cooldown = GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION)
+	{	
+		if ( !m_StaminaModifiers.Contains(modifier) )
+		{
+			//! init of StaminaModifier - type and min, max values (min is not relevant for that type)
+			StaminaModifier sm = new StaminaModifier(FIXED, -1, value, cooldown);
+			m_StaminaModifiers.Set(modifier, sm);
+		}
+	}
+	
+	//! register randomized modifier - stamina will be depleted by value between min and max value;
+	void RegisterRandomized(EStaminaModifiers modifier, float minValue, float maxValue, float cooldown = GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION)
+	{
+		if ( !m_StaminaModifiers.Contains(modifier) )
+		{
+			//! init of StaminaModifier - type, min, max values
+			StaminaModifier sm = new StaminaModifier(RANDOMIZED, minValue, maxValue, cooldown);
+			m_StaminaModifiers.Set(modifier, sm);
+		}
+	}
+	
+	//! register lerped modifier - depletes stamina for startValue, and, after a startTime, lerps to endValue over duration
+	void RegisterLinear(EStaminaModifiers modifier, float startValue, float endValue, float startTime, float duration, float cooldown = GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION)
+	{
+		StaminaModifier sm = new StaminaModifier(LINEAR, startValue, endValue, cooldown, startTime, duration);
+		m_StaminaModifiers.Set(modifier, sm);
+	}
+	
+	//! register exponential modifier - depletes stamina for startValue, and, after a startTime, lerps from 0 to exponent over duration
+	void RegisterExponential(EStaminaModifiers modifier, float startValue, float exponent, float startTime, float duration, float cooldown = GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION)
+	{
+		StaminaModifier sm = new StaminaModifier(EXPONENTIAL, startValue, exponent, cooldown, startTime, duration);
+		m_StaminaModifiers.Set(modifier, sm);
+	}
+	
+	//! register exponential modifier, extended parameters
+	void RegisterExponentialEx(EStaminaModifiers modifier, SMDataExponential data)
+	{
+		StaminaModifierExponential smex = new StaminaModifierExponential(EXPONENTIAL, data.m_BaseValue, data.m_Exponent, data.m_Cooldown, data.m_StartTimeAdjustment, data.m_Duration);
+		smex.SetData(data);
+		m_StaminaModifiers.Set(modifier, smex);
+	}
+	
+	StaminaModifier GetModifierData(EStaminaModifiers modifier)
+	{
+		return m_StaminaModifiers.Get(modifier);
+	}
+}
+
+
+class StaminaHandler
+{	
+	protected float 						m_PlayerLoad;
+	protected float 						m_StaminaDelta;
+	protected float 						m_Stamina;
+	protected float 						m_StaminaSynced; //guaranteed to be identical on server and client
+	protected float 						m_StaminaCap;
+	protected float							m_StaminaDepletion;
+	protected float 						m_StaminaDepletionMultiplier; //controls depletion rate
+	protected float 						m_StaminaRecoveryMultiplier; //controls recovery rate
+	protected float 						m_Time;
+	protected ref Param3<float,float,bool>	m_StaminaParams; 
+	protected ref HumanMovementState		m_State;
+	protected SHumanCommandMoveSettings 	m_HumanMoveSettings;
+	protected PlayerBase					m_Player;
+
+	protected bool 							m_Debug; 						//! DEPRECATED
+	protected bool							m_StaminaDepleted;
+
+	protected ref map<int,ref Timer> 		m_TimerMap;
+	ref map<EStaminaMultiplierTypes, float>	m_RegisteredDepletionModifiers;
+	ref set<EStaminaMultiplierTypes>		m_ActiveDepletionModifiers;
+	
+	ref map<EStaminaMultiplierTypes, float>	m_RegisteredRecoveryModifiers;
+	ref set<EStaminaMultiplierTypes>		m_ActiveRecoveryModifiers;
+	
+	protected bool							m_IsInCooldown;
+	
+	protected ref StaminaConsumers			m_StaminaConsumers;
+	protected ref StaminaModifiers			m_StaminaModifiers;
+	
+	#ifdef DIAG_DEVELOPER
+	protected bool 							m_StaminaDisabled;
+	#endif
+	
+	void StaminaHandler(PlayerBase player)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+			m_StaminaParams = new Param3<float,float,bool>(0,0, false);		
+
+		m_State 						= new HumanMovementState();
+		m_Player 						= player;
+		m_Stamina 						= CfgGameplayHandler.GetStaminaMax(); 
+		m_StaminaCap 					= CfgGameplayHandler.GetStaminaMax();
+		m_StaminaDepletion 				= 0;
+		m_StaminaDepletionMultiplier 	= 1;
+		m_StaminaRecoveryMultiplier 	= 1;
+		m_Time 							= 0;
+		m_StaminaDepleted				= false;
+		m_IsInCooldown					= false;
+		m_HumanMoveSettings				= m_Player.GetDayZPlayerType().CommandMoveSettingsW();
+
+		RegisterStaminaConsumers();
+		RegisterStaminaModifiers();
+		
+		m_TimerMap = new map<int,ref Timer>;
+		
+		//----------------- depletion --------------------
+		m_RegisteredDepletionModifiers = new map<EStaminaMultiplierTypes, float>;
+		m_ActiveDepletionModifiers = new set<EStaminaMultiplierTypes>;
+
+		//----------------- recovery --------------------
+		m_RegisteredRecoveryModifiers = new map<EStaminaMultiplierTypes, float>;
+		m_ActiveRecoveryModifiers = new set<EStaminaMultiplierTypes>;
+		
+		Init();
+	}
+	
+	
+	void Init()
+	{
+		//----------------- depletion --------------------
+		m_RegisteredDepletionModifiers.Insert(EStaminaMultiplierTypes.MASK, MaskMdfr.STAMINA_DEPLETION_MODIFIER);
+		m_RegisteredDepletionModifiers.Insert(EStaminaMultiplierTypes.FATIGUE, FatigueMdfr.STAMINA_DEPLETION_MULTIPLIER);
+		m_RegisteredDepletionModifiers.Insert(EStaminaMultiplierTypes.EPINEPHRINE, EpinephrineMdfr.STAMINA_DEPLETION_MULTIPLIER);
+		
+		//----------------- recovery --------------------
+		m_RegisteredRecoveryModifiers.Insert(EStaminaMultiplierTypes.MASK, MaskMdfr.STAMINA_RECOVERY_MODIFIER);
+		m_RegisteredRecoveryModifiers.Insert(EStaminaMultiplierTypes.FATIGUE, FatigueMdfr.STAMINA_RECOVERY_MULTIPLIER);
+		m_RegisteredRecoveryModifiers.Insert(EStaminaMultiplierTypes.DROWNING, DrowningMdfr.STAMINA_RECOVERY_MULTIPLIER);
+		
+	}
+	
+	void ActivateDepletionModifier(EStaminaMultiplierTypes type)
+	{
+		if (m_RegisteredDepletionModifiers.Contains(type))
+		{
+			m_ActiveDepletionModifiers.Insert(type);
+			RecalculateDepletionMultiplier();
+		}
+		else
+		{
+			Error("attempting to activate unregistered depletion modifier");
+		}
+	}	
+	
+	void DeactivateDepletionModifier(EStaminaMultiplierTypes type)
+	{
+		int index = m_ActiveDepletionModifiers.Find(type);
+		if (index != -1)
+		{
+			m_ActiveDepletionModifiers.Remove(index);
+			RecalculateDepletionMultiplier();
+		}
+	}
+	
+	void RecalculateDepletionMultiplier()
+	{
+		float value = 1;
+		
+		foreach (int multiplier: m_ActiveDepletionModifiers)
+		{
+			value *= m_RegisteredDepletionModifiers.Get(multiplier);
+		}
+
+		if (value != m_StaminaDepletionMultiplier)
+			SetDepletionMultiplier(value);
+	}
+	
+	void ActivateRecoveryModifier(EStaminaMultiplierTypes type)
+	{
+		if (m_RegisteredRecoveryModifiers.Contains(type))
+		{
+			m_ActiveRecoveryModifiers.Insert(type);
+			RecalculateRecoveryMultiplier();
+		}
+		else
+		{
+			Error("attempting to activate unregistered recovery modifier");
+		}
+	}
+
+	
+	void DeactivateRecoveryModifier(EStaminaMultiplierTypes type)
+	{
+		int index = m_ActiveRecoveryModifiers.Find(type);
+		if (index != -1)
+		{
+			m_ActiveRecoveryModifiers.Remove(index);
+			RecalculateRecoveryMultiplier();
+		}
+	}
+	
+	void RecalculateRecoveryMultiplier()
+	{
+		float value = 1;
+		
+		foreach (int multiplier: m_ActiveRecoveryModifiers)
+		{
+			value *= m_RegisteredRecoveryModifiers.Get(multiplier);
+		}
+
+		if (value != m_StaminaRecoveryMultiplier)
+		{
+			SetRecoveryMultiplier(value);
+		}
+	}
+	
+	void Update(float deltaT, int pCurrentCommandID)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (m_StaminaDisabled)
+			return;
+		#endif
+		if (m_Player)
+		{
+			// Calculates actual max stamina based on player's load
+			if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+			{
+				//! gets the actual players load
+				m_PlayerLoad = m_Player.GetWeightEx();
+
+				//! StaminaCap calculation starts when PlayerLoad exceeds STAMINA_WEIGHT_LIMIT_THRESHOLD
+				if (m_PlayerLoad >= CfgGameplayHandler.GetStaminaWeightLimitThreshold())
+				{
+					m_StaminaCap =  Math.Max((CfgGameplayHandler.GetStaminaMax() - (((m_PlayerLoad - CfgGameplayHandler.GetStaminaWeightLimitThreshold())/GameConstants.STAMINA_KG_TO_GRAMS) * CfgGameplayHandler.GetStaminaKgToStaminaPercentPenalty())),CfgGameplayHandler.GetStaminaMinCap());
+				}
+				else
+				{
+					m_StaminaCap = CfgGameplayHandler.GetStaminaMax();
+				}
+			}
+			
+			// Calculates stamina gain/loss based on movement and load
+			m_Player.GetMovementState(m_State);
+
+			switch (m_State.m_CommandTypeId)
+			{
+				case DayZPlayerConstants.COMMANDID_MOVE:
+					StaminaProcessor_Move(m_State);
+					break;
+				case DayZPlayerConstants.COMMANDID_LADDER:
+					StaminaProcessor_Ladder(m_State);
+					break;
+				case DayZPlayerConstants.COMMANDID_SWIM:
+					StaminaProcessor_Swimming(m_State);
+					break;
+				case DayZPlayerConstants.COMMANDID_FALL:	//! processed on event
+				case DayZPlayerConstants.COMMANDID_MELEE2:  //! processed on event
+				case DayZPlayerConstants.COMMANDID_CLIMB:	//! processed on event
+					break;
+				default:
+					if (!m_IsInCooldown)
+					{
+						m_StaminaDelta = GameConstants.STAMINA_GAIN_IDLE_PER_SEC;
+					}
+					break;
+			}
+			
+			//Sets current stamina & stores + syncs data with client
+			float temp = m_StaminaDelta * deltaT;
+			if (temp < 0)
+			{
+				temp *= m_StaminaDepletionMultiplier;
+			}
+			else
+			{
+				temp *= m_StaminaRecoveryMultiplier;
+			}
+			
+			m_Stamina = Math.Max(0, Math.Min((m_Stamina + temp), m_StaminaCap));
+			m_Stamina = m_Stamina - m_StaminaDepletion;
+
+			if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+			{
+				m_Player.GetStatStamina().Set(m_Stamina);
+				m_Time += deltaT;
+				
+				if (m_Time >= GameConstants.STAMINA_SYNC_RATE)
+				{
+					m_Time = 0;
+					SetStamina(m_Stamina);
+				}
+			}
+
+			#ifndef SERVER
+			m_Player.SetStamina(m_StaminaSynced, m_StaminaCap);
+			#endif
+
+			ApplyExhaustion();
+			CheckStaminaState();
+
+			m_StaminaDelta = 0;
+			m_StaminaDepletion = 0; // resets depletion modifier
+			
+		}
+	}
+	
+	//! deprecated use, StaminaHandler uses SyncJunctures now
+	void OnRPC(float stamina, float stamina_cap, bool cooldown)
+	{
+	}
+	
+	//! called from PlayerBase - syncs stamina values on server with client AND sets the value to match on server and client both (m_StaminaSynced guarantees identical values)
+	void OnSyncJuncture(int pJunctureID, ParamsReadContext pCtx)
+	{
+		switch ( pJunctureID )
+		{
+			case DayZPlayerSyncJunctures.SJ_STAMINA:
+				float stamina;
+				float stamina_cap;
+				bool cooldown;
+				
+				if (!pCtx.Read(stamina) || !pCtx.Read(stamina_cap) || !pCtx.Read(cooldown))
+				{
+					return;
+				}
+				
+				m_Stamina = stamina; //?
+				m_StaminaSynced = stamina;
+				
+				if (m_Player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+				{
+					return;
+				}
+				
+				if ( stamina_cap != m_StaminaCap )
+				{
+					m_StaminaCap = stamina_cap;
+				}
+				
+				m_IsInCooldown = cooldown;
+				m_Player.SetStamina(m_Stamina, m_StaminaCap);
+				break;
+			
+			case DayZPlayerSyncJunctures.SJ_STAMINA_MISC:
+				ReadAdditionalStaminaInfo(pCtx);
+				break;
+		}
+	}
+	
+	protected void StaminaProcessor_Move(HumanMovementState pHumanMovementState)
+	{
+		switch (pHumanMovementState.m_iMovement)
+		{
+			case DayZPlayerConstants.MOVEMENTIDX_SPRINT: //sprint
+				if (pHumanMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_ERECT)
+				{
+					m_StaminaDelta = -GameConstants.STAMINA_DRAIN_STANDING_SPRINT_PER_SEC * CfgGameplayHandler.GetSprintStaminaModifierErc();
+					SetCooldown(GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION);
+					break;
+				}
+				else if ( pHumanMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_CROUCH)
+				{
+					m_StaminaDelta = -GameConstants.STAMINA_DRAIN_CROUCHED_SPRINT_PER_SEC * CfgGameplayHandler.GetSprintStaminaModifierCro();
+					SetCooldown(GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION);
+					break;
+				}
+
+				m_StaminaDelta = GameConstants.STAMINA_GAIN_JOG_PER_SEC;
+				break;
+				
+			case DayZPlayerConstants.MOVEMENTIDX_RUN: //jog
+				if (m_Player.GetCurrentWaterLevel() >= m_HumanMoveSettings.m_fWaterLevelSpeedRectrictionHigh)
+				{
+					m_StaminaDelta = -GameConstants.STAMINA_DRAIN_STANDING_SPRINT_PER_SEC * CfgGameplayHandler.GetSprintStaminaModifierErc();
+					break;
+				}
+	
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = (GameConstants.STAMINA_GAIN_JOG_PER_SEC + CalcStaminaGainBonus());
+				}
+				break;
+				
+			case DayZPlayerConstants.MOVEMENTIDX_WALK: //walk
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = (GameConstants.STAMINA_GAIN_WALK_PER_SEC + CalcStaminaGainBonus());
+				}
+				break;
+				
+			case DayZPlayerConstants.MOVEMENTIDX_IDLE: //idle
+				if (m_Player.IsRolling())
+				{
+					m_StaminaDelta = GameConstants.STAMINA_GAIN_ROLL_PER_SEC;
+					break;
+				}
+
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = (GameConstants.STAMINA_GAIN_IDLE_PER_SEC + CalcStaminaGainBonus());
+				}
+				break;
+				
+			default:
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = GameConstants.STAMINA_GAIN_IDLE_PER_SEC;
+				}
+				break;
+		}
+	}
+	
+	protected void StaminaProcessor_Ladder(HumanMovementState pHumanMovementState)
+	{
+		switch (pHumanMovementState.m_iMovement)
+		{
+			case 2: //climb up (fast)
+				m_StaminaDelta = -GameConstants.STAMINA_DRAIN_LADDER_FAST_PER_SEC * CfgGameplayHandler.GetSprintLadderStaminaModifier();
+				SetCooldown(GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION);
+				break;
+				
+			case 1: //climb up (slow)
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = (GameConstants.STAMINA_GAIN_LADDER_PER_SEC + CalcStaminaGainBonus());
+				}
+				break;
+				
+			default:
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = GameConstants.STAMINA_GAIN_IDLE_PER_SEC + CalcStaminaGainBonus();
+				}
+				break;
+		}
+	}
+
+	protected void StaminaProcessor_Swimming(HumanMovementState pHumanMovementState)
+	{
+		switch (pHumanMovementState.m_iMovement)
+		{
+			case 3: //swim fast
+				m_StaminaDelta = -GameConstants.STAMINA_DRAIN_SWIM_FAST_PER_SEC * CfgGameplayHandler.GetSprintSwimmingStaminaModifier();
+				SetCooldown(GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION);
+				break;
+	
+				
+			case 2: //swim slow
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = (GameConstants.STAMINA_GAIN_SWIM_PER_SEC + CalcStaminaGainBonus());
+				}
+				break;
+				
+			default:
+				if (!m_IsInCooldown)
+				{
+					m_StaminaDelta = GameConstants.STAMINA_GAIN_IDLE_PER_SEC + CalcStaminaGainBonus();
+				}
+				break;
+		}
+	}
+	
+	//! stamina sync - server part
+	protected void SyncStamina(float stamina, float stamina_cap, bool cooldown)
+	{
+		m_Player.GetStatStamina().Set(m_Stamina);
+		ScriptJunctureData pCtx = new ScriptJunctureData();
+		pCtx.Write(m_Stamina);
+		pCtx.Write(m_StaminaCap);
+		pCtx.Write(m_IsInCooldown);
+		m_Player.SendSyncJuncture(DayZPlayerSyncJunctures.SJ_STAMINA,pCtx);
+	}
+	
+	//! Method to sync more info for stamina manager. Template parameter means it is very extendable for further use
+	protected void SyncAdditionalStaminaInfo(Param par)
+	{
+		Param2<float,float> p = Param2<float,float>.Cast(par);
+
+		ScriptJunctureData pCtx = new ScriptJunctureData();
+		pCtx.Write(p.param1);
+		pCtx.Write(p.param2);
+		m_Player.SendSyncJuncture(DayZPlayerSyncJunctures.SJ_STAMINA_MISC,pCtx);
+	}
+	
+	//! Order of read parameters must match the order of writing above
+	protected void ReadAdditionalStaminaInfo(ParamsReadContext pCtx)
+	{
+		float depletionMultiplier;
+		float recoveryMultiplier;
+		if (!pCtx.Read(depletionMultiplier) || !pCtx.Read(recoveryMultiplier))
+		{
+			return;
+		}
+		
+		m_StaminaDepletionMultiplier = depletionMultiplier;
+		m_StaminaRecoveryMultiplier = recoveryMultiplier;
+	}
+	
+	protected void RegisterStaminaConsumers()
+	{
+		m_StaminaConsumers = new StaminaConsumers();
+
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.HOLD_BREATH,
+			GameConstants.STAMINA_HOLD_BREATH_THRESHOLD_ACTIVATE,
+			GameConstants.STAMINA_HOLD_BREATH_THRESHOLD_DRAIN,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.SPRINT,
+			CfgGameplayHandler.GetStaminaMinCap() + 15,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.JUMP,
+			GameConstants.STAMINA_JUMP_THRESHOLD,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.VAULT,
+			GameConstants.STAMINA_VAULT_THRESHOLD,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.CLIMB,
+			GameConstants.STAMINA_CLIMB_THRESHOLD,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.MELEE_HEAVY,
+			GameConstants.STAMINA_MELEE_HEAVY_THRESHOLD,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.MELEE_EVADE,
+			GameConstants.STAMINA_MELEE_EVADE_THRESHOLD,
+		);
+		m_StaminaConsumers.RegisterConsumer(
+			EStaminaConsumers.ROLL,
+			GameConstants.STAMINA_ROLL_THRESHOLD,
+		);
+		m_StaminaConsumers.RegisterConsumer(EStaminaConsumers.DROWN, 0);
+		m_StaminaConsumers.RegisterConsumer(EStaminaConsumers.PUSH, 0);
+	}
+
+	protected void RegisterStaminaModifiers()
+	{
+		m_StaminaModifiers = new StaminaModifiers();
+
+		SMDataHoldBreath data = new SMDataHoldBreath();
+		m_StaminaModifiers.RegisterExponentialEx(
+			EStaminaModifiers.HOLD_BREATH,
+			data,
+		);
+		m_StaminaModifiers.RegisterExponentialEx(
+			EStaminaModifiers.PUSH_CAR,
+			data,
+		);
+		m_StaminaModifiers.RegisterFixed(EStaminaModifiers.DROWN, 10);
+		m_StaminaModifiers.RegisterFixed(
+			EStaminaModifiers.JUMP,
+			GameConstants.STAMINA_DRAIN_JUMP * CfgGameplayHandler.GetObstacleTraversalStaminaModifier(),
+		);
+		m_StaminaModifiers.RegisterFixed(
+			EStaminaModifiers.VAULT,
+			GameConstants.STAMINA_DRAIN_VAULT * CfgGameplayHandler.GetObstacleTraversalStaminaModifier(),
+		);
+		m_StaminaModifiers.RegisterFixed(
+			EStaminaModifiers.CLIMB,
+			GameConstants.STAMINA_DRAIN_CLIMB * CfgGameplayHandler.GetObstacleTraversalStaminaModifier(),
+		);
+		m_StaminaModifiers.RegisterFixed(
+			EStaminaModifiers.MELEE_LIGHT,
+			GameConstants.STAMINA_DRAIN_MELEE_LIGHT  * CfgGameplayHandler.GetMeleeStaminaModifier(),
+		);
+		m_StaminaModifiers.RegisterFixed(
+			EStaminaModifiers.MELEE_HEAVY,
+			GameConstants.STAMINA_DRAIN_MELEE_HEAVY  * CfgGameplayHandler.GetMeleeStaminaModifier(),
+		);
+		m_StaminaModifiers.RegisterFixed(
+			EStaminaModifiers.OVERALL_DRAIN,
+			CfgGameplayHandler.GetStaminaMax(),
+			5.0,
+		);
+		m_StaminaModifiers.RegisterRandomized(
+			EStaminaModifiers.MELEE_EVADE,
+			3 * CfgGameplayHandler.GetMeleeStaminaModifier(),
+			GameConstants.STAMINA_DRAIN_MELEE_EVADE * CfgGameplayHandler.GetMeleeStaminaModifier(),
+		);
+		m_StaminaModifiers.RegisterFixed(EStaminaModifiers.ROLL, GameConstants.STAMINA_DRAIN_ROLL);
+	}
+
+	//! Calulates stamina regain bonus coef based on current stamina cap and level
+	protected float CalcStaminaGainBonus()
+	{
+		if (m_StaminaDepletion > 0)
+			return 0;
+
+		if (m_Stamina > 25)
+			return Math.Min((m_Stamina/10),GameConstants.STAMINA_GAIN_BONUS_CAP); // exp version
+		else
+			return GameConstants.STAMINA_GAIN_BONUS_CAP; // linear version
+	}
+
+	protected void ApplyExhaustion()
+	{
+		//! sets exhaustion look of player based on stamina level
+		HumanCommandAdditives ad = m_Player.GetCommandModifier_Additives();
+		
+		float exhaustion_value = 1;
+		if (m_StaminaCap != 0)
+		{
+			exhaustion_value = 1 - ((m_Stamina / (m_StaminaCap * 0.01)) * 0.01);
+		}
+		
+		exhaustion_value = Math.Min(1, exhaustion_value);
+		if (ad)
+		{
+			// do not apply exhaustion on local client if player is in ADS/Optics (camera shakes)
+			if (m_Player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT && (m_Player.IsInOptics() || m_Player.IsInIronsights()))
+			{
+				ad.SetExhaustion(0, true);
+			}
+			else
+			{
+				ad.SetExhaustion(exhaustion_value, true);
+			}
+		}
+	}
+	
+	//! check if the stamina is completely depleted
+	protected void CheckStaminaState()
+	{
+		if (m_Stamina <= 0)
+		{
+			m_StaminaDepleted = true;
+			//! in case of complete depletion - start a cooldown timer before the regeneration cycle start
+			if (!m_IsInCooldown)
+			{
+				// set this only once
+				SetCooldown(GameConstants.STAMINA_REGEN_COOLDOWN_EXHAUSTION); 
+			}
+		}
+		else
+		{
+			m_StaminaDepleted = false;
+		}
+	}
+
+	//! set cooldown timer between each consume of stamina	
+	protected void SetCooldown(float time, int modifier = -1)
+	{
+		if ( m_StaminaDepleted || m_Stamina <= 0.0 )
+		{
+			ResetCooldown(modifier);
+			return;
+		}
+
+		m_IsInCooldown = true;
+		
+		Timer timer;
+		if (m_TimerMap.Find(modifier, timer) && timer.IsRunning())
+		{
+			timer.Stop();
+		}
+		else
+		{
+			timer = new ref Timer;
+			m_TimerMap.Set(modifier,timer);
+		}
+		timer.Run(time, this, "ResetCooldown",  new Param1<int>( modifier ));
+		//Print(m_TimerMap.Count());
+	}
+	
+	protected void ResetCooldown(int modifier = -1)
+	{
+		StaminaModifier sm = m_StaminaModifiers.GetModifierData(modifier);
+		if (sm)
+		{
+			//Print(modifier);
+			//Error("Error: No StaminaModifier found! | StaminaHandler | ResetCooldown");
+			sm.SetStartTime(-1);
+			sm.ResetRunTime();
+			sm.SetInUse(false);
+		}
+		m_IsInCooldown = false;
+	}
+	
+	Timer GetCooldownTimer(int modifier)
+	{
+		
+	}
+	
+	// ---------------------------------------------------
+	bool HasEnoughStaminaFor(EStaminaConsumers consumer)
+	{
+		return m_StaminaConsumers.HasEnoughStaminaFor(consumer, m_Stamina, m_StaminaDepleted, m_StaminaCap);
+	}
+	
+	bool HasEnoughStaminaToStart(EStaminaConsumers consumer)
+	{
+		return m_StaminaConsumers.HasEnoughStaminaToStart(consumer, m_Stamina, m_StaminaDepleted, m_StaminaCap);
+	}
+
+	void SetStamina(float stamina_value)
+	{
+		m_Stamina = Math.Clamp(stamina_value, 0, CfgGameplayHandler.GetStaminaMax());
+		SyncStamina(m_Stamina, m_StaminaCap, m_IsInCooldown);
+	}
+	
+	float GetStamina()
+	{
+		return m_Stamina;
+	}
+
+	float GetStaminaNormalized()
+	{
+		return m_Stamina / GetStaminaMax();
+	}
+
+	float GetSyncedStamina()
+	{
+		return m_StaminaSynced;
+	}
+	
+	float GetSyncedStaminaNormalized()
+	{
+		return GetSyncedStamina() / GetStaminaMax();
+	}
+	
+	float GetStaminaCap()
+	{
+		return m_StaminaCap;
+	}
+	
+	float GetStaminaMax()
+	{
+		return CfgGameplayHandler.GetStaminaMax();
+	}
+	
+	//obsolete, use ActivateDepletionModifier/DeactivateDepletionModifier instead
+	void SetDepletionMultiplier(float val)
+	{
+		if (m_StaminaDepletionMultiplier < 0)
+			m_StaminaDepletionMultiplier = 0;
+		m_StaminaDepletionMultiplier = val;
+		SyncAdditionalStaminaInfo(new Param2<float,float>(m_StaminaDepletionMultiplier,m_StaminaRecoveryMultiplier));
+	}
+	//obsolete, use ActivateRecoveryModifier/DeactivateRecoveryModifier instead
+	void SetRecoveryMultiplier(float val)
+	{
+		if (m_StaminaRecoveryMultiplier < 0)
+			m_StaminaRecoveryMultiplier = 0;
+		m_StaminaRecoveryMultiplier = val;
+		SyncAdditionalStaminaInfo(new Param2<float,float>(m_StaminaDepletionMultiplier,m_StaminaRecoveryMultiplier));
+	}
+	
+	float GetDepletionMultiplier()
+	{
+		return m_StaminaDepletionMultiplier;
+	}
+	
+	float GetRecoveryMultiplier()
+	{
+		return m_StaminaRecoveryMultiplier;
+	}
+	
+	void DepleteStamina(EStaminaModifiers modifier, float dT = -1)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (m_StaminaDisabled)
+			return;
+		#endif
+		float val = 0.0;
+		float current_time = m_Player.GetSimulationTimeStamp();
+		float valueProgress;
+		StaminaModifier sm = m_StaminaModifiers.GetModifierData(modifier);
+
+		// select by modifier type and drain stamina
+		switch (sm.GetType())
+		{
+			case m_StaminaModifiers.FIXED:
+				if (dT == -1)
+				{
+					dT = 1;
+				}
+				m_StaminaDepletion = m_StaminaDepletion + sm.GetMaxValue() * dT;
+
+				break;
+			
+			case m_StaminaModifiers.RANDOMIZED:
+				val = Math.RandomFloat(sm.GetMinValue(), sm.GetMaxValue());
+				m_StaminaDepletion = m_StaminaDepletion + val;
+
+				break;
+			
+			case m_StaminaModifiers.LINEAR:
+				if (!sm.IsInUse())
+				{
+					sm.SetStartTime(current_time + sm.GetStartTimeAdjustment()/dT);
+					sm.SetRunTimeTick(dT);
+					sm.SetInUse(true);
+				}
+				valueProgress = Math.Clamp((current_time - sm.GetStartTime())/sm.GetDurationAdjusted(), 0, 1 );
+				val = Math.Lerp(sm.GetMinValue(), sm.GetMaxValue(), valueProgress);
+				m_StaminaDepletion = m_StaminaDepletion + val;
+			
+				break;
+			
+			case m_StaminaModifiers.EXPONENTIAL:
+				StaminaModifierExponential smex;
+				if (!Class.CastTo(smex,sm))
+				{
+					ErrorEx("StaminaModifierExponential not found for modifier type: " + sm.GetType());
+					break;
+				}
+				
+				if (!smex.IsInUse())
+				{
+					smex.SetStartTime(current_time + smex.GetStartTimeAdjustment()/dT);
+					smex.SetRunTimeTick(dT);
+					smex.SetInUse(true);
+				}
+				valueProgress = Math.Clamp((current_time - smex.GetStartTime())/smex.GetDurationAdjusted(), 0, 1 );
+				float exp;
+				if (Math.AbsFloat(smex.GetBaseValue()) < 1)
+				{
+					exp = 1 - Math.Lerp(0, smex.GetExponent(), valueProgress);
+					val = Math.Pow(smex.GetBaseValue(),exp);
+				}
+				else
+				{
+					exp = Math.Lerp(Math.Min(0, smex.GetExponent()), Math.Max(0, smex.GetExponent()), valueProgress);
+					val = Math.Pow(smex.GetBaseValue(),exp) + smex.GetBaseValue() - 1;
+				}
+				
+				m_StaminaDepletion = m_StaminaDepletion + val;
+				m_StaminaDepletion *= smex.GetMultiplier();
+			
+				break;
+		}
+
+		//! run cooldown right after depletion
+		SetCooldown(sm.GetCooldown(),modifier);
+		m_StaminaDepletion = Math.Clamp(m_StaminaDepletion, 0, CfgGameplayHandler.GetStaminaMax());
+
+		m_StaminaDepletion = m_StaminaDepletion * m_StaminaDepletionMultiplier;
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	void SetStaminaDisabled(bool value)
+	{
+		m_StaminaDisabled = value;
+	}
+	#endif
+}
diff --git a/scripts/4_World/DayZ/Classes/StaminaModifierData.c b/scripts/4_World/DayZ/Classes/StaminaModifierData.c
new file mode 100644
index 0000000000000000000000000000000000000000..51ec88e6ddd18cf73b53e92112ea528a03186f22
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/StaminaModifierData.c
@@ -0,0 +1,44 @@
+//supplemental data struct for 'StaminaModifier' class
+class SMDataBase
+{
+	bool m_InUse = false;
+	int m_Type;
+	
+	void SMDataBase()
+	{
+		Init();
+	}
+	
+	//! Used to set values for the type
+	void Init();
+	
+	int GetType() { return m_Type; }
+	
+	bool IsInUse() { return m_InUse; }
+	void SetInUse(bool val) { m_InUse = val; }
+}
+
+class SMDataExponential : SMDataBase
+{
+	float m_BaseValue;
+	float m_Exponent;
+	float m_Multiplier;
+	float m_Cooldown;
+	float m_StartTimeAdjustment;
+	float m_Duration;
+	
+	override void Init()
+	{
+		m_BaseValue = GameConstants.STAMINA_DRAIN_HOLD_BREATH_START;
+		m_Exponent = GameConstants.STAMINA_DRAIN_HOLD_BREATH_EXPONENT;
+		m_Multiplier = CfgGameplayHandler.GetHoldBreathStaminaModifier();
+		m_Cooldown = GameConstants.STAMINA_REGEN_COOLDOWN_DEPLETION;
+		m_StartTimeAdjustment = PlayerSwayConstants.SWAY_TIME_IN + PlayerSwayConstants.SWAY_TIME_STABLE;
+		m_Duration = GameConstants.STAMINA_DRAIN_HOLD_BREATH_DURATION;
+	}
+}
+
+class SMDataHoldBreath : SMDataExponential
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/StaminaSoundHandler.c b/scripts/4_World/DayZ/Classes/StaminaSoundHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..23396254ef8c06d06505aadf1220118287f93f32
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/StaminaSoundHandler.c
@@ -0,0 +1,249 @@
+const float TICK_INTERVAL = 1;
+
+const float STAMINA_SOUND_TR1 = 0.55;
+const float STAMINA_SOUND_TR2 = 0.25;
+
+enum eStaminaZones
+{
+	ZONE0,
+	ZONE1,
+	ZONE2,
+}
+
+enum eStaminaTendency
+{
+	UP,
+	DOWN,
+}
+
+enum eStaminaState
+{
+	ZONE0_UP = 1,
+	ZONE0_DOWN,
+	ZONE1_UP,
+	ZONE1_DOWN,
+	ZONE2_UP,
+	ZONE2_DOWN,
+	//count bellow, add above
+	COUNT
+}
+
+
+class SoundHandlerBase
+{
+	eSoundHandlers m_Id;
+	PlayerBase m_Player;
+	
+	void Update();
+	
+	eSoundHandlers GetID()
+	{
+		return m_Id;
+	}
+	
+	void SoundHandlerBase(PlayerBase player)
+	{
+		m_Player = player;
+		Init();
+	}
+	
+	void Init();
+}
+
+class StaminaSoundHandlerBase extends SoundHandlerBase
+{
+
+	override void Init()
+	{
+		m_Id = eSoundHandlers.STAMINA;
+	}
+	
+	eStaminaState GetStaminaState(eStaminaTendency tendency, eStaminaZones zone)
+	{
+		eStaminaState stamina_state;
+		
+		zone = Math.Clamp(zone, eStaminaZones.ZONE0, eStaminaZones.ZONE2);
+		
+		if(zone == eStaminaZones.ZONE1 && tendency == eStaminaTendency.DOWN)
+		{
+			stamina_state = eStaminaState.ZONE1_DOWN;
+		}
+		
+		if(zone == eStaminaZones.ZONE1 && tendency == eStaminaTendency.UP)
+		{
+			stamina_state = eStaminaState.ZONE1_UP;
+		}
+		
+		if(zone == eStaminaZones.ZONE2 && tendency == eStaminaTendency.DOWN)
+		{
+			stamina_state = eStaminaState.ZONE2_DOWN;
+		}
+		
+		if(zone == eStaminaZones.ZONE2 && tendency == eStaminaTendency.UP)
+		{
+			stamina_state = eStaminaState.ZONE2_UP;
+		}
+		
+		if(zone == eStaminaZones.ZONE0 && tendency == eStaminaTendency.UP)
+		{
+			stamina_state = eStaminaState.ZONE0_UP;
+		}
+		
+		if(zone == eStaminaZones.ZONE0 && tendency == eStaminaTendency.DOWN)
+		{
+			stamina_state = eStaminaState.ZONE0_DOWN;
+		}
+	
+		return stamina_state;
+	}
+}
+
+
+//---------------------------
+// Server
+//---------------------------
+class StaminaSoundHandlerServer extends StaminaSoundHandlerBase
+{
+	float m_Stamina;
+	StaminaHandler m_StaminaHandler;
+	float m_StaminaLastValue;
+	int m_StaminaZoneOffset;
+	
+	void SetStaminaZoneOffset(int zone_offset)
+	{
+		m_StaminaZoneOffset = zone_offset;
+	}
+	
+	// ! Called from command handler
+	override void Update()
+	{
+		m_Stamina = m_Player.GetStaminaHandler().GetStamina();
+		float stamina_delta = m_StaminaLastValue - m_Stamina;
+		eStaminaTendency stamina_tendency;
+		eStaminaZones stamina_zone;
+		
+		//if( stamina_delta == 0 ) return;
+		
+		if( stamina_delta > 0 )
+		{
+			stamina_tendency = eStaminaTendency.DOWN;
+		}
+		if( stamina_delta <= 0 )
+		{
+			stamina_tendency = eStaminaTendency.UP;
+		}
+		
+		m_StaminaLastValue = m_Stamina;
+		
+		stamina_zone = GetZone(m_Stamina);
+		m_Player.SetStaminaState( GetStaminaState(stamina_tendency, stamina_zone + m_StaminaZoneOffset) );
+		
+		//EPlayerSoundEventID sound_event_id = GetPlayerSoundEventID();
+		/*
+		//PrintString("stamina delta " +stamina_delta.ToString());
+		//PrintString("stamina zone " +m_StaminaZone.ToString());
+		//PrintString("stamina tendency " +m_StaminaTendency.ToString());
+		*/
+		//PrintString(" sound event id " +sound_event_id.ToString());
+		
+		
+		//if( sound_event_id !=0 ) m_Player.SendSoundEvent(sound_event_id);
+	}
+
+	eStaminaZones GetZone(float stamina)
+	{
+		float stamina_normalized = Math.InverseLerp(0, m_Player.GetStaminaHandler().GetStaminaCap(), stamina);
+		stamina_normalized = Math.Clamp(stamina_normalized,0,1);
+		//PrintString(" stamina_normalized " +stamina_normalized.ToString());
+		eStaminaZones stamina_zone = eStaminaZones.ZONE0;
+		
+		if( stamina_normalized < STAMINA_SOUND_TR1)
+		{
+			stamina_zone = eStaminaZones.ZONE1;
+		}
+		
+		if( stamina_normalized < STAMINA_SOUND_TR2)
+		{
+			stamina_zone = eStaminaZones.ZONE2;
+		}
+		
+		return stamina_zone;
+	}
+}
+
+
+//---------------------------
+// Client
+//---------------------------
+class StaminaSoundHandlerClient extends StaminaSoundHandlerBase
+{
+	float m_PostponeTime = -1;
+
+	float m_LastTick;
+	bool m_UpdateTimerRunning;
+	bool m_StaminaUpEndPlayed = true;
+	ref Timer m_ClientCharacterTick = new Timer;
+	ref Timer m_ClientCharacterDistanceCheck = new Timer;
+	
+
+	void PostponeStamina(float time)
+	{
+		m_PostponeTime = GetGame().GetTime() + time;
+	}
+
+	
+	override void Update()
+	{
+		if( GetGame().GetTime() < m_PostponeTime || m_Player.GetPlayerSoundEventHandler().m_CurrentState )
+		{
+			return;
+		}
+		//Print(Math.RandomFloat01());	
+		eStaminaState stamina_state = m_Player.GetStaminaState();
+		switch(stamina_state)
+		{
+			case eStaminaState.ZONE1_DOWN:
+				if(m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_DOWN_LIGHT))
+				{
+					m_StaminaUpEndPlayed = false;
+				}
+			break;
+			
+			case eStaminaState.ZONE1_UP:
+				if(m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_UP_LIGHT))
+				{
+					m_StaminaUpEndPlayed = false;
+				}
+			break;
+			
+			case eStaminaState.ZONE2_DOWN:
+				if(m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_DOWN_HEAVY))
+				{
+					m_StaminaUpEndPlayed = false;
+				}
+			break;
+			
+			case eStaminaState.ZONE2_UP:
+				if(m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_UP_HEAVY))
+				{
+					m_StaminaUpEndPlayed = false;
+				}
+			break;
+			
+			case eStaminaState.ZONE0_UP:
+				if(!m_StaminaUpEndPlayed && m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_UP_END))
+				{
+					m_StaminaUpEndPlayed = true;
+				}
+				else
+				{
+					m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_NORMAL_DUMMY);
+				}
+			break;
+			
+			case eStaminaState.ZONE0_DOWN:
+				m_Player.PlaySoundEvent(EPlayerSoundEventID.STAMINA_NORMAL_DUMMY);
+			break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/StanceIndicator.c b/scripts/4_World/DayZ/Classes/StanceIndicator.c
new file mode 100644
index 0000000000000000000000000000000000000000..55a3aedc3a4cbe71c3e60f8b4aba70f929dacc44
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/StanceIndicator.c
@@ -0,0 +1,46 @@
+class StanceIndicator
+{	
+	protected ref HumanMovementState	m_State;
+	protected PlayerBase				m_Player;
+	
+	void StanceIndicator(PlayerBase player)
+	{
+		m_State = new HumanMovementState();
+		m_Player = player;
+	}
+	
+	void Update()
+	{
+		if ( m_Player )
+		{
+			m_Player.GetMovementState(m_State);
+			int player_stance = m_State.m_iStanceIdx;
+			int hud_stance_id = 1;
+			//if ( player_stance == DayZPlayerConstants.STANCEIDX_ERECT  || player_stance == DayZPlayerConstants.STANCEIDX_RAISEDERECT)  hud_stance_id = 1; 
+			if ( player_stance == DayZPlayerConstants.STANCEIDX_CROUCH || player_stance == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH)
+			{
+				hud_stance_id = 2;
+			}
+			if ( player_stance == DayZPlayerConstants.STANCEIDX_PRONE  || player_stance == DayZPlayerConstants.STANCEIDX_RAISEDPRONE) 
+			{
+				hud_stance_id = 3;
+			}
+			DisplayStance(hud_stance_id);
+			//Debug
+			//m_Player.MessageStatus(ToString(player) + "StanceIndicator.c || stance: " + ToString(player_stance));
+		}
+	}
+	
+	void DisplayStance(int stance)
+	{	
+		if ( m_Player )
+		{
+			DisplayElementBase stance_element = m_Player.GetVirtualHud().GetElement(eDisplayElements.DELM_STANCE);
+			if(stance_element)
+			{
+				stance_element.SetValue(stance);
+			}
+			//m_Player.GetVirtualHud().SetValue(eDisplayElements.DELM_STANCE, stance);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/ToggleSelections.c b/scripts/4_World/DayZ/Classes/ToggleSelections.c
new file mode 100644
index 0000000000000000000000000000000000000000..eccf98dd93441b0925b8a6a9d290ee24cb089532
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/ToggleSelections.c
@@ -0,0 +1,42 @@
+class ToggleAnimations
+{
+	protected string m_ToggleOff;
+	protected string m_ToggleOn;
+	int m_OpeningBit;
+	//ref protected array<string> 	m_ToggleOffLinkedAnimations;
+	//ref protected array<string> 	m_ToggleOnLinkedAnimations;
+	
+	void ToggleAnimations( string toggle_off, string toggle_on, int mask, array<string> linked_anims_off = null, array<string> linked_anims_on = null )
+	{
+		m_ToggleOff = toggle_off;
+		m_ToggleOn = toggle_on;
+		m_OpeningBit = mask;
+		//m_ToggleOffLinkedAnimations = linked_anims_off;
+		//m_ToggleOnLinkedAnimations = linked_anims_on;
+	}
+
+	string GetToggleOff()
+	{
+		return m_ToggleOff;
+	}
+
+	string GetToggleOn()
+	{
+		return m_ToggleOn;
+	}
+	
+	int GetOpeningBit()
+	{
+		return m_OpeningBit;
+	}
+	
+	/*array<string> GetLinkedOff()
+	{
+		return m_ToggleOffLinkedAnimations;
+	}
+	
+	array<string> GetLinkedOn()
+	{
+		return m_ToggleOnLinkedAnimations;
+	}*/
+}
diff --git a/scripts/4_World/DayZ/Classes/TransferValues.c b/scripts/4_World/DayZ/Classes/TransferValues.c
new file mode 100644
index 0000000000000000000000000000000000000000..21bbb70790d7eced1311608d8e6620250f5d8a8d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransferValues.c
@@ -0,0 +1,223 @@
+class TransferValues extends Managed
+{
+	const int TYPE_HEALTH 	= 1;
+	const int TYPE_BLOOD 	= 2;
+	
+	const float VALUE_CHECK_INTERVAL	 	= 5;
+	const float SENSITIVTY_PERCENTAGE 		= 1;//how much the value needs to change up/down from previous update to trigger a new update(in percent)
+
+	const int BLOOD_THRESHOLD_LOW = 3000;
+	PlayerBase m_Player;
+	float m_TimeSinceLastTick = VALUE_CHECK_INTERVAL + 1;
+	
+	float m_LastHealthUpdate;
+	float m_LastBloodUpdate;
+	
+	//float m_CumulatedHealthDiff;
+	//float m_CumulatedBloodDiff;
+
+	float m_HealthMaxValue;
+	float m_BloodMaxValue;
+	
+	float m_BloodClient;
+	float m_HealthClient;
+	
+	protected bool m_InitialSyncSent;
+	
+	void TransferValues(PlayerBase player)
+	{
+		m_Player = player;
+		m_InitialSyncSent = false;
+		Init();
+	}
+	
+	void Init()
+	{
+		m_LastHealthUpdate 	= 0;
+		m_LastBloodUpdate 	= 0;
+		m_HealthMaxValue 	= m_Player.GetMaxHealth("", "Health");
+		m_BloodMaxValue 	= m_Player.GetMaxHealth("", "Blood");
+		m_BloodClient 		= 0;
+		m_HealthClient 		= 0;
+	}
+	
+	void OnScheduledTick(float deltatime)
+	{
+		#ifdef DIAG_DEVELOPER
+		#ifndef SERVER
+		ShowDebugValues(DiagMenu.GetBool(DiagMenuIDs.TRANSFER_VALUES_SHOW));
+		#endif
+		#endif
+		
+		if ( GetGame().IsClient() ) return;
+		
+		m_TimeSinceLastTick += deltatime;
+		
+		if (!m_InitialSyncSent)
+		{
+			SendInitValues();
+		}
+		else if ( m_TimeSinceLastTick > VALUE_CHECK_INTERVAL )
+		{
+			/*
+			Print(m_TimeSinceLastTick.ToString());
+			Print(VALUE_CHECK_INTERVAL.ToString());
+			Print("--------------");
+			*/
+			m_TimeSinceLastTick = 0;
+			CheckValues();
+			
+			// send sync junctures if necessary
+			// TODO: !!!! event is sent too often, please fix it
+			/*
+			float damage = 1 - m_Player.GetHealth("", "") / 100;
+			DayZPlayerSyncJunctures.SendInjury(m_Player, true, damage);
+			*/
+		}
+	}
+	
+	void CheckValues()
+	{
+		CheckHealth();
+		CheckBlood();
+	}
+	
+	float GetBlood()
+	{
+		return m_BloodClient;
+		
+	}
+	
+	float GetHealth()
+	{
+		return m_HealthClient;
+	}
+	
+	void CheckHealth()
+	{
+		float health_current = m_Player.GetHealth("","Health");
+		float health_normalized = health_current / m_HealthMaxValue;
+		float difference_normalized = health_normalized - m_LastHealthUpdate;
+		float diff_abs = Math.AbsFloat(difference_normalized);
+		
+		if ( diff_abs > ( SENSITIVTY_PERCENTAGE / 100 ) )
+		{
+			SendValue(TYPE_HEALTH, health_normalized);
+			m_LastHealthUpdate = health_normalized;
+		}
+	}
+	
+	/*void CheckBlood()
+	{
+		float blood_current = m_Player.GetHealth("","Blood");
+		//float blood_normalized = blood_current / m_BloodMaxValue;
+		float blood_normalized = Math.InverseLerp(BLOOD_THRESHOLD_LOW, m_BloodMaxValue, blood_current);
+		blood_normalized = Math.Clamp(blood_normalized,0,1);
+		float difference_normalized = blood_normalized - m_LastBloodUpdate;
+		float diff_abs = Math.AbsFloat(difference_normalized);
+		m_CumulatedBloodDiff += diff_abs;
+		
+		//Print("DbgBlood | CheckBlood | m_CumulatedBloodDiff: " + m_CumulatedBloodDiff);
+		if( m_CumulatedBloodDiff > ( SENSITIVTY_PERCENTAGE /100 ) )
+		{
+			SendValue(TYPE_BLOOD, blood_normalized);
+			m_LastBloodUpdate = blood_normalized;
+			//Print("DbgBlood | CheckBlood | Sending blood: " + blood_normalized);
+			m_CumulatedBloodDiff = 0;
+		}
+		else
+		{
+			//Print("DbgBlood | CheckBlood | unsent values blood: " + blood_normalized);
+		}
+	}*/
+	
+	void CheckBlood()
+	{
+		float blood_current = m_Player.GetHealth("","Blood");
+		//float blood_normalized = blood_current / m_BloodMaxValue;
+		float blood_normalized = Math.InverseLerp(BLOOD_THRESHOLD_LOW, m_BloodMaxValue, blood_current);
+		blood_normalized = Math.Clamp(blood_normalized,0,1);
+		float difference_normalized = blood_normalized - m_LastBloodUpdate;
+		float diff_abs = Math.AbsFloat(difference_normalized);
+		
+		if ( diff_abs > ( SENSITIVTY_PERCENTAGE /100 ) )
+		{
+			SendValue(TYPE_BLOOD, blood_normalized);
+			m_LastBloodUpdate = blood_normalized;
+		}
+	}
+	
+	//! Sends values on object creation
+	void SendInitValues()
+	{
+		m_InitialSyncSent = true;
+		
+		//HP
+		float health_current = m_Player.GetHealth("","Health");
+		float health_normalized = health_current / m_HealthMaxValue;
+		SendValue(TYPE_HEALTH, health_normalized);
+		m_LastHealthUpdate = health_normalized;
+		
+		//Blood
+		float blood_current = m_Player.GetHealth("","Blood");
+		float blood_normalized = Math.InverseLerp(BLOOD_THRESHOLD_LOW, m_BloodMaxValue, blood_current);
+		blood_normalized = Math.Clamp(blood_normalized,0,1);
+		//Print("DbgBlood | SendInitValues | blood_normalized: " + blood_normalized);
+		SendValue(TYPE_BLOOD, blood_normalized);
+		m_LastBloodUpdate = blood_normalized;
+	}
+	
+	void SendValue(int value_type, float value)
+	{
+		CachedObjectsParams.PARAM2_INT_FLOAT.param1 = value_type;
+		CachedObjectsParams.PARAM2_INT_FLOAT.param2 = value;
+		
+		GetGame().RPCSingleParam(m_Player, ERPCs.RPC_DAMAGE_VALUE_SYNC, CachedObjectsParams.PARAM2_INT_FLOAT, true, m_Player.GetIdentity());
+	}
+
+	void ReceiveValue(int value_type, float value)
+	{
+		if ( value_type == TYPE_HEALTH )
+		{
+			m_HealthClient = value;
+		}
+		else if ( value_type == TYPE_BLOOD )
+		{
+			m_BloodClient = value;
+		}
+	}
+
+	void OnRPC(ParamsReadContext ctx)
+	{
+		ctx.Read(CachedObjectsParams.PARAM2_INT_FLOAT);
+		
+		int value_type 	= CachedObjectsParams.PARAM2_INT_FLOAT.param1;
+		float value 	= CachedObjectsParams.PARAM2_INT_FLOAT.param2;
+		
+		ReceiveValue(value_type, value);
+	}
+	
+	void ShowDebugValues(bool show)
+	{		
+		#ifdef DIAG_DEVELOPER
+		if ( show )
+		{		
+			DbgUI.BeginCleanupScope();     
+	        DbgUI.Begin("Values", 50, 50);
+			
+	        DbgUI.Text("Blood: " + m_BloodClient.ToString());
+			DbgUI.Text("Health: " + m_HealthClient.ToString());
+
+	        DbgUI.End();
+	        DbgUI.EndCleanupScope();
+		}
+		else
+		{
+			DbgUI.BeginCleanupScope();
+			DbgUI.Begin("Values", 50, 50);
+			DbgUI.End();
+	        DbgUI.EndCleanupScope();   
+		}
+		#endif
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/AgentBase.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/AgentBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..8de957b7c0e411e7a46cc1bda9f03467331325bc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/AgentBase.c
@@ -0,0 +1,128 @@
+class AgentBase extends MessageReceiverBase
+{
+	float	m_Type = 0;
+	float	m_Invasibility;					//how fast the agent grows when potent enough to grow
+	float 	m_TransferabilityIn;			//to the player
+	float	m_TransferabilityOut;			//from the player
+	float	m_Digestibility = 0.1;			//multiplier for agents digested in the player stomach from an infected item(agents_transfered = digested_amount(in grams or mls) * m_Digestibility)
+	int		m_MaxCount = 1;
+	float 	m_AutoinfectProbability = CalculateAutoinfectProbability(0);	// [0..1], 0 = zero chance, 1 = 100% chance of getting this agent once per hour
+	float 	m_TransferabilityAirOut; 		// transferibility airborne out
+	float 	m_AntibioticsResistance = 1;	//[0..1], 0 means antibiotics have full effect, 1 means no effect
+	
+	EStatLevels m_Potency = EStatLevels.MEDIUM;		//grow when player's immune system is at this level or lower
+	float m_DieOffSpeed = 1;						//how fast the agent dies off when not potent enough to grow(per sec)
+	
+	void AgentBase()
+	{
+		Init();
+	}
+	
+	void Init();
+	
+	int GetAgentType()
+	{
+		return m_Type;
+	}
+	
+	float GetDieOffSpeedEx(PlayerBase player)
+	{
+		return GetDieOffSpeed();
+	}
+	
+	EStatLevels GetPotencyEx(PlayerBase player)
+	{
+		return GetPotency();
+	}
+	
+	float GetInvasibilityEx(PlayerBase player)
+	{
+		return GetInvasibility();
+	}
+	
+	EStatLevels GetPotency()
+	{
+		return m_Potency;
+	}	
+	
+	float GetDieOffSpeed()
+	{
+		return m_DieOffSpeed;
+	}
+	
+	float GetAntiboticsResistance()
+	{
+		return m_AntibioticsResistance;
+	}
+	float GetAntibioticsResistanceEx(PlayerBase player)
+	{
+		return GetAntiboticsResistance();
+	}
+	
+	float GetInvasibility()
+	{
+		return m_Invasibility;
+	}
+	//should this agent grow based on invasibility even during antibiotics attack
+	bool GrowDuringAntibioticsAttack(PlayerBase player)
+	{
+		return true;//for legacy balancing reasons, set to true by default
+	}
+	
+	float GetDigestibility()
+	{
+		return m_Digestibility;
+	}
+
+	float CalculateAutoinfectProbability( float userprob )
+	{
+		return ( 1 - Math.Pow( 1 - userprob, ( 1 / 1200 ) ) );
+	}
+
+	bool AutoinfectCheck(float deltaT, PlayerBase player)
+	{
+		if ( m_AutoinfectProbability == 0.0 ) 
+			return false;
+		
+		float dice_throw = Math.RandomFloat01();
+		
+		if ( dice_throw < m_AutoinfectProbability )
+		{
+			return CanAutoinfectPlayer(player);
+		}
+		else 
+		{
+			return false;
+		}
+	}
+
+	bool CanAutoinfectPlayer(PlayerBase player)
+	{
+		return false;
+	}
+	
+	float GetTransferabilityIn()
+	{
+		return m_TransferabilityIn;
+	}
+
+	float GetTransferabilityOut()
+	{
+		return m_TransferabilityOut;
+	}	
+	
+	float GetTransferabilityAirOut()
+	{
+		return m_TransferabilityAirOut;
+	}
+
+	int GetMaxCount()
+	{
+		return m_MaxCount;
+	}
+
+	string GetName()
+	{
+		return ClassName();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/BrainAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/BrainAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..920ed8259d1756ef436bd5a0ba0c093688405cd7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/BrainAgent.c
@@ -0,0 +1,14 @@
+class BrainAgent extends AgentBase
+{
+	override void Init()
+	{
+		m_Type 					= eAgents.BRAIN;
+		m_Invasibility 			= 1;
+		m_TransferabilityIn		= 1;
+		m_TransferabilityOut	= 0;
+		m_AntibioticsResistance = 1;
+		m_MaxCount 				= 5000;
+		m_Potency 				= EStatLevels.GREAT;
+		m_DieOffSpeed 			= 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/ChemicalAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/ChemicalAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd401ff8149bd73e3f25771b9b896e93e32cc876
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/ChemicalAgent.c
@@ -0,0 +1,27 @@
+class ChemicalAgent extends AgentBase
+{
+	override void Init()
+	{
+		m_Type 					= eAgents.CHEMICAL_POISON;
+		m_Invasibility 			= 0;
+		m_TransferabilityIn		= 0.1;
+		m_TransferabilityOut	= 1;
+		m_TransferabilityAirOut	= 1;
+		m_AntibioticsResistance = 1;
+		m_MaxCount 				= 500;
+		m_Potency 				= EStatLevels.CRITICAL;
+		m_DieOffSpeed 			= 0.1;
+	}
+	
+	override float GetDieOffSpeedEx(PlayerBase player)
+	{
+		if( player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION2) || player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION3))
+		{
+			return 0;
+		}
+		else
+		{
+			return super.GetDieOffSpeedEx(player);//round-about way of getting the m_DieOffSpeed
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/CholeraAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/CholeraAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd8bbee6239abc85d04131a45fde479cee7be37c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/CholeraAgent.c
@@ -0,0 +1,14 @@
+class CholeraAgent extends AgentBase
+{
+	override void Init()
+	{
+		m_Type 					= eAgents.CHOLERA;
+		m_Invasibility 			= 0.15;
+		m_TransferabilityIn		= 0.1;
+		m_TransferabilityOut	= 0.1;
+		m_AntibioticsResistance = 0;
+		m_MaxCount 				= 1000;
+		m_Potency 				= EStatLevels.HIGH;
+		m_DieOffSpeed 			= 0.45;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/FoodPoisonAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/FoodPoisonAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..791a15b240edd319c815fce54a2e395ce77f56f8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/FoodPoisonAgent.c
@@ -0,0 +1,15 @@
+class FoodPoisonAgent extends AgentBase
+{
+	override void Init()
+	{
+		m_Type 					= eAgents.FOOD_POISON;
+		m_Invasibility 			= 1;
+		m_TransferabilityIn		= 1;
+		m_TransferabilityOut	= 0;
+		m_AntibioticsResistance = 0.5;
+		m_MaxCount 				= 400;
+		m_Potency 				= EStatLevels.CRITICAL;
+		m_DieOffSpeed 			= 1;
+		m_Digestibility 		= 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/InfluenzaAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/InfluenzaAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..4bad28d0a96246653f2f561063739d2c14cb617d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/InfluenzaAgent.c
@@ -0,0 +1,31 @@
+class InfluenzaAgent extends AgentBase
+{
+	const float INFLUENZA_AGENT_AUTOINFECT_THRESHOLD_HC = PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING;
+
+	override void Init()
+	{
+		m_Type 					= eAgents.INFLUENZA;
+		m_Invasibility 			= 0.33;
+		m_TransferabilityIn		= 1;
+		m_TransferabilityOut	= 1;
+		m_MaxCount 				= 1000;
+		m_Digestibility			= 0.1;
+		m_AntibioticsResistance = 0;
+		m_AutoinfectProbability = CalculateAutoinfectProbability( 0.40 );
+		m_TransferabilityAirOut = 1;
+		m_Potency 				= EStatLevels.MEDIUM;
+		m_DieOffSpeed 			= 0.66;
+	}
+
+	override bool CanAutoinfectPlayer(PlayerBase player)
+	{
+		if ( player.GetStatHeatComfort().Get() < INFLUENZA_AGENT_AUTOINFECT_THRESHOLD_HC )
+		{
+			return true;			
+		}
+		else
+		{
+			return false;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/NerveAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/NerveAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..df789a26a76be662f182d949e3d5118c2fe040a1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/NerveAgent.c
@@ -0,0 +1,18 @@
+class NerveAgent extends AgentBase
+{
+	override void Init()
+	{
+		m_Type 					= eAgents.NERVE_AGENT;
+		m_Invasibility 			= 0;
+		m_TransferabilityIn		= 0.1;
+		m_TransferabilityOut	= 1;
+		m_TransferabilityAirOut	= 0;
+		m_AntibioticsResistance = 0.5;//override in a func. GetAntiboticsResistance()
+		m_MaxCount 				= 500;
+		m_Potency 				= EStatLevels.CRITICAL;
+		m_DieOffSpeed 			= 0.1;
+	}
+	
+
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/SalmonellaAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/SalmonellaAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..6a9487c7c071fccbb06ae88aa6d8f13175d03b6e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/SalmonellaAgent.c
@@ -0,0 +1,14 @@
+class SalmonellaAgent extends AgentBase
+{
+	override void Init()
+	{
+		m_Type 					= eAgents.SALMONELLA;
+		m_Invasibility 			= 0.75;
+		m_TransferabilityIn		= 0.1;
+		m_TransferabilityOut	= 0.1;
+		m_AntibioticsResistance = 1;
+		m_MaxCount 				= 300;
+		m_Potency 				= EStatLevels.HIGH;
+		m_DieOffSpeed 			= 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/WoundAgent.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/WoundAgent.c
new file mode 100644
index 0000000000000000000000000000000000000000..6897a30e88cb26edb119e76ed0f9bc71bcd1d7c8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/Agents/WoundAgent.c
@@ -0,0 +1,33 @@
+class WoundAgent extends AgentBase
+{
+	static const float RESISTANCE_STAGE_1 = 1;
+	static const float RESISTANCE_STAGE_2 = 0.5;
+	
+	override void Init()
+	{
+		m_Type 					= eAgents.WOUND_AGENT;
+		m_Invasibility 			= 0.208;//to reach 250 in 20 mins
+		m_TransferabilityIn		= 1;
+		m_TransferabilityOut	= 0;
+		m_AntibioticsResistance = 0.5;//override in a func. GetAntiboticsResistance()
+		m_MaxCount 				= 500;
+		m_Potency 				= EStatLevels.GREAT;
+		m_DieOffSpeed 			= 1;
+	}
+	
+	override float GetAntibioticsResistanceEx(PlayerBase player)
+	{
+		if(player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION1))
+			return RESISTANCE_STAGE_1;
+		else
+			return RESISTANCE_STAGE_2;
+	}
+	
+	override bool GrowDuringAntibioticsAttack(PlayerBase player)
+	{
+		if(player.GetModifiersManager().IsModifierActive(eModifiers.MDF_WOUND_INFECTION1))
+			return true;
+		else
+			return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/TransmissionAgents/PlayerAgentPool/PlayerAgentPool.c b/scripts/4_World/DayZ/Classes/TransmissionAgents/PlayerAgentPool/PlayerAgentPool.c
new file mode 100644
index 0000000000000000000000000000000000000000..07357c313beef25203b7d24e00bf3df86fdd5674
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/TransmissionAgents/PlayerAgentPool/PlayerAgentPool.c
@@ -0,0 +1,298 @@
+class PlayerAgentPool
+{
+	ref map<int,float> m_VirusPool = new map<int,float>;
+	ref array<int> m_VirusPoolArray = new array<int>;
+	float m_LastTicked = 0;
+	float m_TotalAgentCount;
+	PlayerBase m_Player;
+	int m_AgentMask;
+		
+	const int STORAGE_VERSION = 100;
+	
+	PluginTransmissionAgents m_PluginTransmissionAgents = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+	
+	void PlayerAgentPool(PlayerBase player)
+	{
+		m_Player = player;
+	}
+
+	void ~PlayerAgentPool()
+	{
+		
+	}
+	
+	int GetStorageVersion()
+	{
+		return STORAGE_VERSION;
+	}
+	
+	void PrintAgents()
+	{
+		if( m_VirusPool )
+		{
+			for(int i = 0; i < m_VirusPool.Count(); i++)
+			{
+				Debug.Log("Agent: "+ m_VirusPool.GetKey(i).ToString(), "Agents");
+				Debug.Log("Count: "+ m_VirusPool.GetElement(i).ToString(), "Agents");
+			}
+		
+		}
+	}
+
+	void ImmuneSystemTick(float value, float deltaT)//this is a regular tick induced in the the player's immune system
+	{
+		SpawnAgents(deltaT);
+		GrowAgents(deltaT);
+	}
+	
+	void GrowAgents(float deltaT)
+	{
+		if ( !IsPluginManagerExists() )//check if modules are running
+			return;
+		
+		EStatLevels immunity_level = m_Player.GetImmunityLevel();
+		
+		m_TotalAgentCount = 0;
+		for(int i = 0; i < m_VirusPool.Count(); i++)
+		{	
+			int agent_id = m_VirusPool.GetKey(i);
+			int max_count = m_PluginTransmissionAgents.GetAgentMaxCount( agent_id );
+
+			EStatLevels agent_potency = m_PluginTransmissionAgents.GetAgentPotencyEx( agent_id, m_Player );
+			
+			float grow_delta;
+
+			if( agent_potency <= immunity_level )
+			{
+				bool grow_during_antibiotics = m_PluginTransmissionAgents.GrowDuringAntibioticsAttack(agent_id, m_Player);
+				if (m_Player.IsAntibioticsActive() && !grow_during_antibiotics)
+					continue;
+				float invasibility = m_PluginTransmissionAgents.GetAgentInvasibilityEx( agent_id, m_Player );
+				grow_delta = invasibility * deltaT;
+			}
+			else
+			{
+				float dieoff_speed = m_PluginTransmissionAgents.GetAgentDieOffSpeedEx( agent_id, m_Player );
+				grow_delta = -dieoff_speed * deltaT;
+			}
+
+			//Print( agent_id );
+			//Print( grow_delta );
+			
+			float old_count = m_VirusPool.Get( agent_id );
+			float new_count = old_count + grow_delta;
+			new_count = Math.Clamp(new_count, 0,max_count);
+			
+			m_TotalAgentCount += new_count;
+			SetAgentCount(agent_id, new_count);
+		}
+	}
+
+	void OnStoreSave(ParamsWriteContext ctx)
+	{
+		//Debug.Log("PlayerAgentPool OnStoreSave called", "Agents");
+		
+		ctx.Write( m_VirusPool.Count() );
+		for(int i = 0; i < m_VirusPool.Count();i++)
+		{
+			int key = m_VirusPool.GetKey(i);
+			int value = m_VirusPool.GetElement(i);
+			ctx.Write( key );
+			ctx.Write( value );
+		}
+	}
+	
+	bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		//Debug.Log("PlayerAgentPool OnStoreLoad called", "Agents");
+		int count;
+		
+		if(!ctx.Read(count))
+		{
+			return false;
+		}
+	
+		for(int i = 0; i < count;i++)
+		{
+			int key;
+			int value;
+			if(!ctx.Read(key))
+			{
+				return false;
+			}
+			
+			if(!ctx.Read(value))
+			{
+				return false;
+			}
+			
+			SetAgentCount( key,value );
+		}
+	
+		return true;
+	}
+	void DigestAgent(int agent_id, float count)
+	{
+		AddAgent(agent_id, m_PluginTransmissionAgents.GetAgentDigestibility(agent_id) * count);
+	}	
+	
+	void AddAgent(int agent_id, float count)
+	{
+		int max_count = m_PluginTransmissionAgents.GetAgentMaxCount(agent_id);
+		
+		if(	!m_VirusPool.Contains(agent_id) && count > 0 )//if it contains, maybe add count only ?
+		{
+			//m_VirusPool.Insert( agent_id, Math.Clamp(count,0,max_count) );
+			SetAgentCount(agent_id,count);
+		}
+		else
+		{
+			float new_value = m_VirusPool.Get(agent_id) + count;
+			//Print(new_value);
+			SetAgentCount(agent_id,new_value);
+		}
+	}
+
+/*
+	void RemoveAgent(int agent_id)
+	{
+		if(	m_VirusPool.Contains(agent_id) )
+		{
+			m_VirusPool.Remove( agent_id );
+		}
+	}
+	*/
+	void RemoveAgent(int agent_id)
+	{
+		SetAgentCount(agent_id, 0);
+	}
+	
+	void RemoveAllAgents()
+	{
+		m_AgentMask = 0;
+		m_VirusPool.Clear();
+	}
+	
+	/*
+	array<int GetAgents()
+	{
+		m_VirusPoolArray.Clear();
+		
+		for(int i = 0; i < m_VirusPool.Count();i++)
+		{
+			m_VirusPoolArray.Insert( m_VirusPool.GetKey(i) );
+		}
+		
+		return m_VirusPoolArray;
+	}
+	*/
+	
+	int GetAgents()
+	{
+		return m_AgentMask;
+	}
+
+	int GetSingleAgentCount(int agent_id)
+	{
+		if(	m_VirusPool.Contains(agent_id) )
+		{
+			return m_VirusPool.Get( agent_id );
+		}
+		else return 0;
+	}
+	
+	float GetTotalAgentCount()
+	{
+		float agent_count;
+		for(int i = 0; i < m_VirusPool.Count(); i++)
+		{
+			agent_count += m_VirusPool.GetElement(i);
+		}
+		return agent_count;
+	}
+	
+	void SpawnAgents(float deltaT)
+	{
+		int count = m_PluginTransmissionAgents.GetAgentList().Count();
+		for(int i = 0; i < count;i++)
+		{
+			AgentBase agent = m_PluginTransmissionAgents.GetAgentList().GetElement(i);
+			int agent_id = agent.GetAgentType();
+			
+			if( GetSingleAgentCount(agent_id)==0 && agent.AutoinfectCheck(deltaT, m_Player) )
+			{
+				AddAgent(agent_id,100);
+			}
+		}
+	}
+	
+
+	void SetAgentCount(int agent_id, float count)
+	{
+		if(count > 0)
+		{
+			//Debug.Log("+ growing agent"+ agent_id.ToString() +"to count: "+count.ToString(), "Agents");
+			m_VirusPool.Set( agent_id, count);
+			m_AgentMask = m_AgentMask | agent_id;
+		}
+		else
+		{
+			//Debug.Log("- REMOVING agent"+ agent_id.ToString(), "Agents");
+			m_VirusPool.Remove( agent_id );
+			m_AgentMask = m_AgentMask & ~agent_id;
+		}			
+		if(m_Player.m_Agents != m_AgentMask)
+		{
+			m_Player.m_Agents = m_AgentMask;
+			m_Player.SetSynchDirty();
+		}
+	}
+
+	void AntibioticsAttack(float attack_value)
+	{
+		for(int i = 0; i < m_VirusPool.Count(); i++)
+		{
+			int agent_id = m_VirusPool.GetKey(i);
+			float antibiotics_resistance = 1 - m_PluginTransmissionAgents.GetAgentAntiboticsResistanceEx(agent_id, m_Player);
+			float delta = attack_value * antibiotics_resistance;
+			float old_count = m_VirusPool.Get( agent_id );
+			float new_count = old_count - delta;
+			//PrintString("delta:"+delta.ToString());
+			//PrintString("old_count:"+old_count.ToString());
+			//PrintString("new_count:"+new_count.ToString());
+			SetAgentCount(agent_id, new_count);
+		}
+	}
+
+	
+	void RemoteGrowRequestDebug(ParamsReadContext ctx)
+	{
+		ctx.Read(CachedObjectsParams.PARAM1_INT);
+		int id = CachedObjectsParams.PARAM1_INT.param1;
+		int max = m_PluginTransmissionAgents.GetAgentMaxCount(Math.AbsInt(id));
+		int grow = max / 10;
+		if(id > 0)
+		{
+			AddAgent(id, grow);
+		}
+		else if( id < 0)
+		{
+			AddAgent(-id, -grow);
+		}
+	}
+	
+	void GetDebugObject(array<ref Param> object_out)
+	{
+		int count = m_PluginTransmissionAgents.GetAgentList().Count();
+		for(int i = 0; i < count;i++)
+		{
+			AgentBase agent = m_PluginTransmissionAgents.GetAgentList().GetElement(i);
+			string agent_name = agent.GetName();
+			int agent_id = agent.GetAgentType();
+			int max_agents = m_PluginTransmissionAgents.GetAgentMaxCount(agent_id);
+			string amount = GetSingleAgentCount(agent_id).ToString() + "/" + max_agents.ToString();
+			object_out.Insert( new Param3<string,string, int>(agent_name, amount, agent_id) );
+		}
+		object_out.InsertAt(new Param1<int>(count) ,0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UndergroundHandlerClient.c b/scripts/4_World/DayZ/Classes/UndergroundHandlerClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb424b087d555542da7115c8630ab8f4483348b3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UndergroundHandlerClient.c
@@ -0,0 +1,431 @@
+enum EUndergroundPresence
+{
+	NONE,//player is not interacting with underground at any level
+	OUTER,//player is on the outskirts of the underdound, some effects are already in effect, while others might not be
+	TRANSITIONING,//player has entered underground and is in the process of screen darkening transition
+	FULL//the player is now fully entered underground
+}
+
+class UndergroundHandlerClient
+{
+	const float LIGHT_BLEND_SPEED_IN = 5;
+	const float LIGHT_BLEND_SPEED_OUT = 1.75;
+	const float MAX_RATIO = 0.9;//how much max ratio between 0..1 can a single breadcrumb occupy 
+	const float RATIO_CUTOFF = 0;//what's the minimum ratio a breadcrumb needs to have to be considered when calculatiing accommodation
+	const float DISTANCE_CUTOFF = 5;//we ignore breadcrumbs further than this distance
+	const float ACCO_MODIFIER = 1;//when we calculate eye accommodation between 0..1 based on the breadcrumbs values and distances, we multiply the result by this modifier to get the final eye accommodation value
+	const float DEFAULT_INTERPOLATION_SPEED = 7;
+	const string UNDERGROUND_LIGHTING = "dz\\data\\lighting\\lighting_underground.txt";
+	protected ref AnimationTimer 	m_AnimTimerLightBlend;
+	
+	protected PlayerBase 				m_Player;
+	protected PPERUndergroundAcco 		m_Requester;
+	protected PPERequester_CameraNV 	m_NVRequester;
+	protected ref set<UndergroundTrigger> m_InsideTriggers = new set<UndergroundTrigger>();
+	
+	protected float 		m_EyeAccoTarget = 1;
+	protected float 		m_AccoInterpolationSpeed;
+	protected float 		m_EyeAcco = 1;
+	protected float 		m_LightingLerpTarget;
+	protected float 		m_LightingLerp;
+	protected EffectSound m_AmbientSound;
+	
+	protected UndergroundTrigger m_TransitionalTrigger;
+	
+	void UndergroundHandlerClient(PlayerBase player)
+	{
+		GetGame().GetWorld().LoadUserLightingCfg(UNDERGROUND_LIGHTING, "Underground");
+		m_Player = player;
+		m_NVRequester = PPERequester_CameraNV.Cast(PPERequesterBank.GetRequester( PPERequesterBank.REQ_CAMERANV));
+	}
+	
+	void ~UndergroundHandlerClient()
+	{
+		if (GetGame())
+		{
+			GetGame().GetWorld().SetExplicitVolumeFactor_EnvSounds2D(1, 0.5);
+			GetGame().GetWeather().SuppressLightningSimulation(false);
+			GetGame().GetWorld().SetUserLightingLerp(0);
+			if (m_AmbientSound)
+				m_AmbientSound.Stop();
+		}
+	}
+	
+	protected PPERUndergroundAcco GetRequester()
+	{
+		if (!m_Requester)
+		{
+			m_Requester = PPERUndergroundAcco.Cast(PPERequesterBank.GetRequester( PPERequesterBank.REQ_UNDERGROUND));
+			m_Requester.Start();
+		}
+		return m_Requester;
+	}
+	
+	void OnTriggerEnter(UndergroundTrigger trigger)
+	{
+		m_InsideTriggers.Insert(trigger);
+		OnTriggerInsiderUpdate();
+		
+	}
+	
+	void OnTriggerLeave(UndergroundTrigger trigger)
+	{
+	 	int index = m_InsideTriggers.Find(trigger);
+		if (index != -1)
+		{
+			m_InsideTriggers.Remove(index);
+		}
+		OnTriggerInsiderUpdate();
+	}
+	
+	protected void CalculateEyeAccoTarget()
+	{
+		if (m_TransitionalTrigger && m_TransitionalTrigger.m_Data.Breadcrumbs.Count() >= 2)
+		{
+			float closestDist = float.MAX;
+			float acco;
+			array<float> distances = new array<float>();
+			array<float> distancesInverted = new array<float>();
+
+			
+			int excludeMask = 0;
+			foreach (int indx, auto crumb:m_TransitionalTrigger.m_Data.Breadcrumbs)
+			{
+				if (indx > 32)//error handling for exceeding this limit is handled elsewhere
+					break;
+				
+				float dist = vector.Distance(m_Player.GetPosition(), crumb.GetPosition());
+				float crumbRadius = m_TransitionalTrigger.m_Data.Breadcrumbs[indx].Radius;
+				float maxRadiusAllowed = DISTANCE_CUTOFF;
+				
+				if (crumbRadius != -1)
+				{
+					maxRadiusAllowed = crumbRadius;
+				}
+				if (dist > maxRadiusAllowed)
+				{
+					excludeMask = (excludeMask | (1 << indx));
+				}
+				else if (m_TransitionalTrigger.m_Data.Breadcrumbs[indx].UseRaycast)
+				{
+					int idx = m_Player.GetBoneIndexByName("Head");
+					vector rayStart = m_Player.GetBonePositionWS(idx);
+					vector rayEnd = crumb.GetPosition();
+					vector hitPos, hitNormal;
+					float hitFraction;
+					Object hitObj;
+
+					if (DayZPhysics.RayCastBullet(rayStart, rayEnd,PhxInteractionLayers.TERRAIN | PhxInteractionLayers.ROADWAY| PhxInteractionLayers.BUILDING, null, hitObj, hitPos, hitNormal, hitFraction))
+					{
+						excludeMask = (excludeMask | (1 << indx));
+					}
+				}
+				
+				distances.Insert(dist);
+				
+				#ifdef DIAG_DEVELOPER
+				if ( DiagMenu.GetBool(DiagMenuIDs.UNDERGROUND_SHOW_BREADCRUMB) )
+				{
+					Debug.DrawSphere(crumb.GetPosition(),0.1, COLOR_RED, ShapeFlags.ONCE);
+				}
+				#endif
+			}
+			float baseDst = distances[0];
+			float sum = 0;
+			//Print(excludeMask);
+			foreach (float dst:distances)
+			{
+				if (dst == 0) 
+					dst = 0.1;
+				float dstInv = (baseDst / dst) * baseDst;
+				sum += dstInv;
+				distancesInverted.Insert(dstInv);
+			}
+			float sumCheck = 0;
+			float eyeAcco = 0;
+			foreach (int i, float dstInvert:distancesInverted)
+			{
+				/*
+				//Print(m_TransitionalTrigger.m_Data.Breadcrumbs[i].EyeAccommodation);
+				//Print(m_TransitionalTrigger.m_Data.Breadcrumbs.Count());
+				*/
+				if ((1 << i) & excludeMask)
+					continue;
+				float ratio = dstInvert / sum;
+				if (ratio > MAX_RATIO)
+					ratio = MAX_RATIO;
+				if (ratio > RATIO_CUTOFF)
+				{
+					#ifdef DIAG_DEVELOPER
+					if (DiagMenu.GetBool(DiagMenuIDs.UNDERGROUND_SHOW_BREADCRUMB) )
+					{
+						float intensity = (1-ratio) * 255;
+						Debug.DrawLine(GetGame().GetPlayer().GetPosition() + "0 1 0", m_TransitionalTrigger.m_Data.Breadcrumbs[i].GetPosition(),ARGB(0,255,intensity,intensity),ShapeFlags.ONCE);
+					}
+					#endif
+					eyeAcco += ratio * m_TransitionalTrigger.m_Data.Breadcrumbs[i].EyeAccommodation;
+					
+				}
+
+			}
+			m_EyeAccoTarget = eyeAcco * ACCO_MODIFIER;
+		}
+	}
+	
+	protected void ProcessEyeAcco(float timeSlice)
+	{
+		CalculateEyeAccoTarget();
+		bool reachedTarget = CalculateEyeAcco(timeSlice);
+		ApplyEyeAcco();
+		if(reachedTarget && !m_Player.m_UndergroundPresence)
+		{
+			GetRequester().Stop();
+			UpdateNVGRequester(1);
+			//m_NVRequester.SetUndergroundExposureCoef(1.0);
+			m_Player.KillUndergroundHandler();
+		}
+
+	}
+	
+	protected void ProcessLighting(float timeSlice)
+	{
+		#ifdef DEVELOPER
+		if (!DiagMenu.GetBool(DiagMenuIDs.UNDERGROUND_DISABLE_DARKENING) )
+		{
+			GetGame().GetWorld().SetUserLightingLerp(m_LightingLerp);
+		}
+		else
+		{
+			GetGame().GetWorld().SetUserLightingLerp(0);
+		}
+		#else
+		GetGame().GetWorld().SetUserLightingLerp(m_LightingLerp);
+		#endif
+	}
+	
+	protected void ProcessSound(float timeSlice)
+	{
+		GetGame().GetWorld().SetExplicitVolumeFactor_EnvSounds2D(m_EyeAcco, 0);
+		if (m_AmbientSound)
+		{
+			m_AmbientSound.SetSoundVolume(1-m_EyeAcco);
+			//Print(m_AmbientSound.GetSoundVolume());
+		}
+		else
+		{
+			m_Player.PlaySoundSetLoop(m_AmbientSound, "Underground_SoundSet",3,3);
+		}
+	}
+	
+	void Tick(float timeSlice)
+	{
+		if (!m_Player.IsAlive())
+			return;
+		
+		ProcessEyeAcco(timeSlice);
+		ProcessLighting(timeSlice);
+		ProcessSound(timeSlice);
+		
+		#ifdef DIAG_DEVELOPER
+		if ( DiagMenu.GetBool(DiagMenuIDs.UNDERGROUND_SHOW_BREADCRUMB) )
+		{
+			DisplayDebugInfo(GetGame().GetWorld().GetEyeAccom(), m_LightingLerp);
+		}
+		#endif
+		
+	}
+	
+	protected void ApplyEyeAcco()
+	{
+		#ifdef DIAG_DEVELOPER
+		if (!DiagMenu.GetBool(DiagMenuIDs.UNDERGROUND_DISABLE_DARKENING) )
+		{
+			GetRequester().SetEyeAccommodation(m_EyeAcco);
+		}
+		else
+		{
+			GetRequester().SetEyeAccommodation(1);
+		}
+		#else
+		GetRequester().SetEyeAccommodation(m_EyeAcco);
+		#endif
+		
+		float undergrounNVExposureCoef = m_EyeAcco;
+		if (m_LightingLerp >= 1.0 || GetDayZGame().GetWorld().IsNight())
+		{
+			undergrounNVExposureCoef = 1.0;
+		}
+		//m_NVRequester.SetUndergroundExposureCoef(undergrounNVExposureCoef);
+		UpdateNVGRequester(undergrounNVExposureCoef);
+	}
+	
+	protected void UpdateNVGRequester(float value)
+	{
+		m_NVRequester.SetUndergroundExposureCoef(value);
+	}
+	
+	protected bool CalculateEyeAcco(float timeSlice)
+	{
+		if (m_TransitionalTrigger || !m_Player.m_UndergroundPresence || (m_EyeAccoTarget == 1))
+		{
+			float accoDiff = m_EyeAccoTarget - m_EyeAcco;
+			float increase = accoDiff * m_AccoInterpolationSpeed * timeSlice;
+			m_EyeAcco += increase;
+			if (Math.AbsFloat(accoDiff) < 0.01)
+			{
+				m_EyeAcco = m_EyeAccoTarget;
+				return true;
+			}
+		}
+		else
+		{
+			m_EyeAcco = m_EyeAccoTarget;
+		}
+		return false;
+	}
+	
+	
+	
+	protected void OnTriggerInsiderUpdate()
+	{
+		EUndergroundTriggerType bestType = EUndergroundTriggerType.UNDEFINED;
+		m_TransitionalTrigger = null;
+		UndergroundTrigger bestTrigger;
+		m_EyeAccoTarget = 1;
+		m_AccoInterpolationSpeed = DEFAULT_INTERPOLATION_SPEED;
+
+		foreach (auto t:m_InsideTriggers)
+		{
+			if (t.m_Type > bestType)
+			{
+				bestTrigger = t;
+				bestType = t.m_Type; 
+			}
+		}
+		//Print(m_InsideTriggers.Count());
+		//Print(bestType);
+		if (bestTrigger)
+		{
+			if (bestTrigger.m_Type == EUndergroundTriggerType.TRANSITIONING)
+			{
+				m_TransitionalTrigger = bestTrigger;
+			}
+			m_EyeAccoTarget = bestTrigger.m_Accommodation;
+			if (bestTrigger.m_InterpolationSpeed != -1 && bestTrigger.m_InterpolationSpeed != 0)
+				m_AccoInterpolationSpeed = bestTrigger.m_InterpolationSpeed;
+		}
+		
+		SetUndergroundPresence(bestTrigger);
+	}
+	
+	
+	protected void SetUndergroundPresence(UndergroundTrigger trigger)
+	{
+		EUndergroundPresence newPresence = EUndergroundPresence.NONE;
+		EUndergroundPresence oldPresence = m_Player.m_UndergroundPresence;
+		
+		if (trigger)
+		{
+			if (trigger.m_Type == EUndergroundTriggerType.OUTER)
+			{
+				newPresence = EUndergroundPresence.OUTER;
+			}
+			else if (trigger.m_Type == EUndergroundTriggerType.TRANSITIONING)
+			{
+				newPresence = EUndergroundPresence.TRANSITIONING;
+			}
+			else if (trigger.m_Type == EUndergroundTriggerType.INNER)
+			{
+				newPresence = EUndergroundPresence.FULL;
+			}
+		}
+		
+		if (newPresence != oldPresence)//was there a change ?
+		{
+			OnUndergroundPresenceUpdate(newPresence,oldPresence);
+			m_Player.SetUnderground(newPresence);
+		}
+				
+		
+	}
+	
+	protected void EnableLights(bool enable)
+	{
+		foreach (ScriptedLightBase light:ScriptedLightBase.m_NightTimeOnlyLights)
+		{
+			light.SetVisibleDuringDaylight(enable);
+		}
+	}
+	
+	void OnUpdateTimerEnd();
+	
+	void OnUpdateTimerIn()
+	{
+		if (!m_AnimTimerLightBlend)
+			return;
+		float value01 = m_AnimTimerLightBlend.GetValue();
+		float result = Easing.EaseInQuint(value01);
+		m_LightingLerp = result;
+		
+	}
+	
+	void OnUpdateTimerOut()
+	{
+		if (!m_AnimTimerLightBlend)
+			return;
+		float value01 = m_AnimTimerLightBlend.GetValue();
+		float result = Easing.EaseOutCubic(value01);
+		m_LightingLerp = result;
+	}
+	
+	
+	protected void OnUndergroundPresenceUpdate(EUndergroundPresence newPresence, EUndergroundPresence oldPresence)
+	{
+		//Print("-----> On Undeground Presence update " + EnumTools.EnumToString(EUndergroundPresence, newPresence) + " " + EnumTools.EnumToString(EUndergroundPresence, oldPresence));
+		if (newPresence > EUndergroundPresence.NONE)
+		{
+			if (oldPresence == EUndergroundPresence.NONE)
+			{
+				EnableLights(true);
+			}
+			if (newPresence > EUndergroundPresence.OUTER && oldPresence <= EUndergroundPresence.OUTER)
+			{
+				GetGame().GetWeather().SuppressLightningSimulation(true);
+				m_Player.PlaySoundSetLoop(m_AmbientSound, "Underground_SoundSet",3,3);
+			}
+			if (newPresence == EUndergroundPresence.FULL)
+			{
+				m_AnimTimerLightBlend = new AnimationTimer();
+				m_AnimTimerLightBlend.Run(1, this, "OnUpdateTimerIn", "OnUpdateTimerEnd",0, false, LIGHT_BLEND_SPEED_IN);
+			}
+		}
+		if (newPresence < EUndergroundPresence.FULL && oldPresence == EUndergroundPresence.FULL)
+		{
+			m_AnimTimerLightBlend = new AnimationTimer();
+			m_AnimTimerLightBlend.Run(0, this, "OnUpdateTimerOut", "OnUpdateTimerEnd",m_LightingLerp, false, LIGHT_BLEND_SPEED_OUT);
+		}
+		if (newPresence <= EUndergroundPresence.OUTER && oldPresence > EUndergroundPresence.OUTER)
+		{
+			GetGame().GetWeather().SuppressLightningSimulation(false);
+			if (m_AmbientSound)
+				m_Player.StopSoundSet(m_AmbientSound);
+		}
+		if (newPresence == EUndergroundPresence.NONE && oldPresence >= EUndergroundPresence.OUTER)
+		{
+			GetGame().GetWorld().SetUserLightingLerp(0);
+			EnableLights(false);
+		}
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	protected void DisplayDebugInfo(float acco, float lighting)
+	{
+		if (acco < 0.0001)
+			acco = 0;
+		DbgUI.Begin(String("Underground Areas"), 20, 20);
+		DbgUI.Text(String("Eye Accomodation: " + acco.ToString()));
+		DbgUI.Text(String("Lighting lerp: " + lighting.ToString()));
+		DbgUI.End();
+	}
+	#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..a6602741c3471608c91f32e4ac2181fb0efd7d4f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionBase.c
@@ -0,0 +1,1085 @@
+enum ActionConditionMask
+{
+	ACM_NO_EXEPTION		= 0,
+	ACM_IN_VEHICLE		= 1,
+	ACM_ON_LADDER		= 2,
+	ACM_SWIMMING		= 4,
+	ACM_RESTRAIN		= 8,
+	ACM_RAISED			= 16,
+	ACM_ON_BACK			= 32,
+	ACM_THROWING		= 64,
+	ACM_LEANING			= 128,
+	ACM_BROKEN_LEGS		= 256,
+}
+class ActionReciveData
+{
+	ItemBase							m_MainItem;
+	ref ActionTarget					m_Target;
+}
+
+class ActionData
+{
+	void ActionData()
+	{
+		m_State = UA_NONE;
+	}
+	
+	ref ActionBase						m_Action;
+	ItemBase							m_MainItem;
+	ActionBaseCB 						m_Callback;
+	ref CABase							m_ActionComponent;
+	int									m_State;
+	ref ActionTarget					m_Target;
+	PlayerBase							m_Player;
+	int 								m_PossibleStanceMask;
+	ref array<ref InventoryLocation>	m_ReservedInventoryLocations;
+	int									m_RefreshReservationTimer;
+	int									m_RefreshJunctureTimer;
+	bool								m_WasExecuted;
+	bool								m_WasActionStarted;
+	bool								m_ReciveEndInput;
+}
+
+class ActionBase : ActionBase_Basic
+{	
+	//STATIC DATA
+	protected int					m_RefreshReservationTimerValue = 140;
+	// Configurable action parameters
+	protected string				m_Sound; //sound played at the beggining of action
+	protected string				m_Text;
+
+	protected bool					m_LockTargetOnUse;	//this parameter sets wheter player can perform actions on target while other player is already performing action on it. defaulted as true
+	protected bool 					m_FullBody; //tells whether action is full body or additive
+	protected int					m_StanceMask;
+	protected ref TStringArray		m_Sounds;			//User action sound is picked from this array randomly
+	ref CCIBase 					m_ConditionItem;	//Condition Component
+	ref CCTBase						m_ConditionTarget; 	//Condition Component
+	protected ActionInput			m_Input;
+	protected int 					m_ActionID;
+	protected int					m_VariantID;
+	int 							m_ConditionMask;
+	protected ref ActionVariantManager	m_VariantManager;
+
+	//RUNTIME DATA
+	protected ref Param1<string> 	m_MessageParam; //used for passing messages from server to client
+	//protected ref Param2<int,int>	m_MessagesParam;
+	
+	//SOFT SKILLS
+	protected float					m_SpecialtyWeight;
+	
+	//-----------------------------------------------------
+	// 	Action events and methods
+	//-----------------------------------------------------
+	void ActionBase() 
+	{
+		// definable
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE;
+		m_FullBody = false;
+		m_Sound = "";
+		m_Text = "default action text";
+		m_LockTargetOnUse = HasTarget();
+		// dont override
+		m_MessageParam = new Param1<string>("");
+		//m_MessagesParam = new Param2<int,int>(0,0);
+		m_Sounds = new TStringArray;
+		m_Input = null;
+		m_ActionID = 0;
+		InitConditionMask();
+	}
+	
+	bool IsLockTargetOnUse()
+	{
+		return m_LockTargetOnUse;
+	}
+	
+	void InitConditionMask()
+	{
+		m_ConditionMask = ActionConditionMask.ACM_NO_EXEPTION;
+		if (CanBeUsedInVehicle())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_IN_VEHICLE;
+		}
+		
+		if (CanBeUsedOnLadder())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_ON_LADDER;
+		}
+		
+		if (CanBeUsedSwimming())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_SWIMMING;
+		}
+		
+		if (CanBeUsedInRestrain())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_RESTRAIN;
+		}
+		
+		if (CanBeUsedRaised())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_RAISED;
+		}
+		
+		if (CanBeUsedOnBack())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_ON_BACK;
+		}
+		
+		if (CanBeUsedThrowing())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_THROWING;
+		}
+		
+		if (CanBeUsedLeaning())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_LEANING;
+		}
+		
+		if (CanBeUsedWithBrokenLegs())
+		{
+			m_ConditionMask |= ActionConditionMask.ACM_BROKEN_LEGS;
+		}
+	}
+	
+	bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL )
+	{
+		action_data = CreateActionData();
+		action_data.m_Action = this;
+		action_data.m_Player = player;
+		action_data.m_Target = target;
+		action_data.m_MainItem = item;
+		action_data.m_PossibleStanceMask = GetStanceMask(player);
+		action_data.m_ReservedInventoryLocations = new array<ref InventoryLocation>;
+		action_data.m_RefreshReservationTimer = m_RefreshReservationTimerValue;
+		action_data.m_WasExecuted = false;
+		action_data.m_WasActionStarted = false;
+		action_data.m_ReciveEndInput = false;
+		
+		ActionReciveData action_recive_data = player.GetActionManager().GetReciveData();
+		if ( action_recive_data )
+		{
+			HandleReciveData(action_recive_data,action_data);
+			
+			if ( UseMainItem() && MainItemAlwaysInHands() )
+			{
+				if ( player.GetItemInHands() != action_data.m_MainItem )
+				{
+					return false;
+				}
+			}
+		}
+		
+		if ( !Post_SetupAction( action_data ) )
+			return false;
+		
+		if ( (!GetGame().IsDedicatedServer()) && !IsInstant() )
+		{
+			if (!InventoryReservation(action_data))
+			{
+				ClearInventoryReservationEx(action_data);
+				return false;
+			}
+			
+			if ( LogManager.IsActionLogEnable() )
+			{
+				for ( int i = 0; i < action_data.m_ReservedInventoryLocations.Count(); i++)
+				{
+					Debug.ActionLog( InventoryLocation.DumpToStringNullSafe( action_data.m_ReservedInventoryLocations[i] ), action_data.m_Action.ToString() , "n/a", "LockInventoryList", action_data.m_Player.ToString() );
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	bool Post_SetupAction( ActionData action_data )
+	{
+		return true;
+	}
+	
+	void ActionCleanup( ActionData action_data )
+	{}
+	
+	typename GetInputType()
+	{
+		return DefaultActionInput;
+	}
+	
+	void SetInput( ActionInput  ai)
+	{
+		m_Input = ai;
+	}
+	
+	ActionData CreateActionData()
+	{
+		return new ActionData;
+	}
+			
+	void CreateConditionComponents() //Instantiates components, called once from ActionManager on actions construction
+	{
+		m_ConditionItem = new CCIDummy;
+		m_ConditionTarget = new CCTDummy;
+	}
+	
+	Object GetDisplayInteractObject(PlayerBase player, ActionTarget target)
+	{
+		return null;
+	}
+
+	//! Action is performed on target, not with item itself, when set to true.
+	//!   * target will be synced to server
+	//!   * UI: floating widget will be displayed at target pos
+	bool HasTarget()
+	{
+		return true;
+	}
+	
+	//! For UI: hiding of progress bar
+	bool HasProgress()
+	{
+		return true;
+	}
+	
+	//Action isn't synchronize to server 
+	bool IsLocal()
+	{
+		return false;
+	}
+	
+	//Action not using animation/callback action are executed instantly (OnStart)
+	bool IsInstant()
+	{
+		return false;
+	}
+
+	//! not using plane object - it's using multiple proxies
+	bool IsUsingProxies()
+	{
+		return false;
+	}
+	
+	bool RemoveForceTargetAfterUse()
+	{
+		return true;
+	}
+
+	int GetActionCategory()
+	{
+		return AC_UNCATEGORIZED;
+	}
+	
+	bool IsEat()
+	{
+		return false;
+	}
+	
+	bool IsDrink()
+	{
+		return false;
+	}
+	
+	bool IsShaveSelf()
+	{
+		return false;
+	}
+
+	string GetText() //text game displays in HUD hint 
+	{
+		return m_Text;
+	}
+	
+	bool CanBePerformedFromQuickbar()
+	{
+		return false;
+	}
+	
+	bool CanBePerformedFromInventory()
+	{
+		return false;
+	}
+	
+	bool CanBeSetFromInventory()
+	{
+		return !CanBePerformedFromInventory();
+	}
+	
+	bool CanBeUsedInRestrain()
+	{
+		return false;
+	}
+	 
+	bool CanBeUsedInVehicle()
+	{
+		return false;
+	}
+	
+	bool CanBeUsedOnBack()
+	{
+		return false;
+	}
+
+	bool CanBeUsedSwimming()
+	{
+		return false;
+	}
+	
+	bool CanBeUsedOnLadder()
+	{
+		return false;
+	}
+	
+	bool CanBeUsedRaised()
+	{
+		return false;
+	}
+	
+	bool CanBeUsedThrowing()
+	{
+		return false;
+	}
+	
+	bool CanBeUsedLeaning()
+	{
+		return true;
+	}
+	
+	bool CanBeUsedWithBrokenLegs()
+	{
+		return true;
+	}
+	
+	//! Is an action directly related to deployment/advanced placing
+	bool IsDeploymentAction()
+	{
+		return false;
+	}
+	
+	bool UseMainItem()
+	{
+		return true;
+	}
+	
+	bool MainItemAlwaysInHands()
+	{
+		return true;
+	}
+
+	protected bool ActionConditionContinue( ActionData action_data ) //condition for action
+	{
+		return ActionCondition(action_data.m_Player,action_data.m_Target,action_data.m_MainItem);
+	}
+	
+	protected bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		return true;
+	}
+	
+	void ApplyModifiers(ActionData action_data);
+	
+	int GetRefreshReservationTimerValue()
+	{
+		return m_RefreshReservationTimerValue;
+	}
+
+	void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		int componentIndex = -1;
+		int proxyBoneIdx = -1;
+		vector cursorHitPos = vector.Zero;
+
+		array<string> selectionNames = new array<string>();
+
+		Object targetObject = null;
+		Object targetParent = null;
+		
+		if (UseMainItem())
+		{
+			ctx.Write(action_data.m_MainItem);
+		}
+			
+		if (HasTarget() && !IsUsingProxies())
+		{
+			// callback data
+			targetObject = action_data.m_Target.GetObject();
+			ctx.Write(targetObject);
+			targetParent = action_data.m_Target.GetParent();
+			ctx.Write(targetParent);
+			componentIndex = action_data.m_Target.GetComponentIndex();
+			ctx.Write(componentIndex);
+			cursorHitPos = action_data.m_Target.GetCursorHitPos();
+			ctx.Write(cursorHitPos);
+		}
+		else if( HasTarget() && IsUsingProxies() )
+		{
+			//! get proxy bone idx from parent and selection we are looking at
+			//! ID is used for synchronisation to server where it's translated back to object
+			Entity entParent = Entity.Cast(action_data.m_Target.GetParent());
+			if (entParent)
+			{
+				action_data.m_Target.GetObject().GetActionComponentNameList(action_data.m_Target.GetComponentIndex(), selectionNames);
+				for (int s = 0; s < selectionNames.Count(); s++)
+				{
+					proxyBoneIdx = entParent.GetBoneIndex(selectionNames[s]);
+					if( proxyBoneIdx > -1 )
+					{
+						break;
+					}
+				}
+			}
+
+			ctx.Write(proxyBoneIdx);
+			targetParent = action_data.m_Target.GetParent();
+			ctx.Write(targetParent);
+			componentIndex = action_data.m_Target.GetComponentIndex();
+			ctx.Write(componentIndex);
+			cursorHitPos = action_data.m_Target.GetCursorHitPos();
+			ctx.Write(cursorHitPos);
+		}
+	}
+	
+	bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if ( !action_recive_data )
+		{
+			action_recive_data = new ActionReciveData;
+		}
+		Object actionTargetObject = null;
+		Object actionTargetParent = null;
+		int componentIndex = -1;
+		int proxyBoneIdx = -1;
+		vector cursorHitPos = vector.Zero;
+		ItemBase mainItem = null;
+		
+		ref ActionTarget target;
+		
+		if ( UseMainItem() )
+		{
+			if ( !ctx.Read(mainItem) )
+				return false;
+		}
+
+		if ( HasTarget() && !IsUsingProxies() )
+		{			
+			if ( !ctx.Read(actionTargetObject) )
+				return false;
+							
+			if ( !ctx.Read(actionTargetParent))
+				return false;
+
+			if ( !ctx.Read(componentIndex) )
+				return false;
+			
+			if ( !ctx.Read(cursorHitPos) )
+				return false;
+			
+			target = new ActionTarget(actionTargetObject, actionTargetParent, componentIndex, cursorHitPos, 0);
+			
+			action_recive_data.m_Target = target;
+		}
+		else if( HasTarget() && IsUsingProxies() )
+		{
+			if ( !ctx.Read(proxyBoneIdx) )
+				return false;
+							
+			if ( !ctx.Read(actionTargetParent))
+				return false;
+
+			if ( !ctx.Read(componentIndex) )
+				return false;
+			
+			if ( !ctx.Read(cursorHitPos) )
+				return false;
+
+			//! create target object from proxyBoneIdx synced from client
+			if ( proxyBoneIdx > -1 )
+			{
+				Entity entParent = Entity.Cast(actionTargetParent);
+
+				if (entParent)
+				{
+					actionTargetObject = entParent.GetBoneObject(proxyBoneIdx);		
+				}
+			}
+			else
+			{
+				return false;
+			}
+			
+			target = new ActionTarget(actionTargetObject, actionTargetParent, componentIndex, cursorHitPos, 0);
+						
+			action_recive_data.m_Target = target;
+		}
+
+		action_recive_data.m_MainItem = mainItem;
+		return true;
+	}
+	
+	void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		action_data.m_MainItem = action_recive_data.m_MainItem;
+		
+		if(HasTarget())
+		{
+			if (action_recive_data.m_Target)
+			{
+				action_data.m_Target = action_recive_data.m_Target;
+			}
+			else
+			{
+				Error("Action target not created.");
+				action_data.m_Target = new ActionTarget(NULL, NULL, -1, vector.Zero, 0);
+			}
+		}
+	}
+	
+	//----------------------------------------------------------------------------------------------
+	// Core methods don't override unless you know what you are doing
+	//----------------------------------------------------------------------------------------------		
+	// COMMANDS -----------------------------------------------------------------------		
+	protected int GetStanceMask(PlayerBase player)
+	{
+		if ( HasProneException() )
+		{
+			if ( player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_RAISEDERECT | DayZPlayerConstants.STANCEMASK_RAISEDCROUCH | DayZPlayerConstants.STANCEMASK_RAISEDPRONE))
+				return -1;
+			else if ( player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT))
+				return DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+			else
+				return DayZPlayerConstants.STANCEMASK_PRONE;
+		}
+		return m_StanceMask;
+	}
+	
+	bool IsFullBody(PlayerBase player)
+	{
+		if ( HasProneException() )
+		{
+			return !( player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT) );
+		}
+		return m_FullBody;
+	}
+	
+	// if it is set to true if action have special fullbody animation for prone and additive for crouch and erect
+	protected bool HasProneException()
+	{
+		return false;
+	}
+	
+	//	ACTION LOGIC -------------------------------------------------------------------
+	// called from actionmanager.c
+	void Start( ActionData action_data ) //Setup on start of action
+	{
+		action_data.m_State = UA_START;
+		
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog("Time stamp: " + action_data.m_Player.GetSimulationTimeStamp(), this.ToString() , "n/a", "OnStart", action_data.m_Player.ToString() );
+		}
+		
+		OnStart(action_data);
+		
+		if ( GetGame().IsServer() )
+		{
+			OnStartServer(action_data);
+			
+			string soundCat = GetSoundCategory(action_data);
+			if (soundCat)
+				action_data.m_Player.SetSoundCategoryHash(soundCat.Hash());
+		}
+		else
+		{
+			OnStartClient(action_data);
+		}	
+		
+		InformPlayers(action_data.m_Player,action_data.m_Target,UA_START);
+	}
+	
+	void End( ActionData action_data )
+	{
+		if ( action_data.m_Player )
+		{
+			OnEnd(action_data);
+			
+			if ( GetGame().IsServer() )
+			{
+				OnEndServer(action_data);
+			}
+			else
+			{
+				OnEndClient(action_data);
+			}
+			
+			action_data.m_Player.GetActionManager().OnActionEnd();
+		}
+	}
+	
+	void Interrupt(ActionData action_data)
+	{
+		End(action_data);
+	}
+	
+	void OnEndInput(ActionData action_data)
+	{}
+	
+	void EndInput(ActionData action_data)
+	{
+		action_data.m_ReciveEndInput = true;
+		OnEndInput(action_data);
+	}
+
+	void OnEndRequest(ActionData action_data)
+	{}
+	
+	void EndRequest(ActionData action_data)
+	{
+		OnEndRequest(action_data);
+	}
+	
+	bool CanReceiveAction(ActionTarget target)
+	{
+		bool result = true;
+		PlayerBase target_player = PlayerBase.Cast(target.GetObject());
+		
+		if (target_player)
+		{
+			result = !target_player.IsJumpInProgress();
+			result = result && !(target_player.GetCommand_Ladder() || target_player.GetCommand_Vehicle() || target_player.GetCommand_Swim());
+		}
+		
+		return result;
+	}
+	
+	static int ComputeConditionMask( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		int mask = 0;
+		if ( player.GetCommand_Vehicle() )
+		{
+			mask |= ActionConditionMask.ACM_IN_VEHICLE;
+		}
+		
+		if ( player.GetCommand_Ladder() )
+		{
+			mask |= ActionConditionMask.ACM_ON_LADDER;
+		}
+		
+		if ( player.IsRestrained() )
+		{
+			mask |= ActionConditionMask.ACM_RESTRAIN;
+		}
+		
+		if ( player.GetCommand_Swim() )
+		{
+			mask |= ActionConditionMask.ACM_SWIMMING;
+		}
+		
+		if ( player.IsRaised() )
+		{
+			mask |= ActionConditionMask.ACM_RAISED;
+		}
+		
+		if ( player.GetCommand_Move() && player.GetCommand_Move().IsOnBack() )
+		{
+			mask |= ActionConditionMask.ACM_ON_BACK;
+		}
+		
+		if ( player.GetThrowing().IsThrowingModeEnabled())
+		{
+			mask |= ActionConditionMask.ACM_THROWING;
+		}
+		
+		if (player.IsLeaning())
+		{
+			mask |= ActionConditionMask.ACM_LEANING;
+		}
+		
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+		{
+			mask |= ActionConditionMask.ACM_BROKEN_LEGS;
+		}
+		
+		return mask;
+	}
+
+	bool Can( PlayerBase player, ActionTarget target, ItemBase item, int condition_mask )
+	{
+		if ( ( (condition_mask & m_ConditionMask) != condition_mask ) || ( !IsFullBody(player) && !player.IsPlayerInStance(GetStanceMask(player)) ) || player.IsRolling() )
+			return false;
+		
+		if ( HasTarget() )
+		{
+			if(!FirearmActionBase.Cast(this))
+			{
+				EntityAI entity = EntityAI.Cast(target.GetObject());
+				if ( entity && !target.GetObject().IsMan() )
+				{
+					Man man = entity.GetHierarchyRootPlayer();
+					if ( man && man != player )
+						return false;
+				}
+			}
+			
+			if ( m_ConditionTarget && !m_ConditionTarget.Can(player, target))
+				return false;
+		}
+		
+		if ( m_ConditionItem && !m_ConditionItem.Can(player, item))
+			return false;
+		
+		if ( !ActionCondition(player, target, item) )
+			return false;
+		
+		if ( IsFullBody(player) )
+		{
+			int stanceIdx = DayZPlayerUtils.ConvertStanceMaskToStanceIdx(GetStanceMask(player));
+			if (stanceIdx != -1 && !DayZPlayerUtils.PlayerCanChangeStance(player, stanceIdx ))
+				return false;
+		}
+		
+		return true;
+	}
+	
+	bool Can(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		int condition_mask = ComputeConditionMask(player, target, item);
+		
+		return Can( player, target, item, condition_mask);
+	}
+	
+	protected bool CanContinue( ActionData action_data )
+	{
+		if (!action_data.m_Player.IsPlayerInStance(action_data.m_PossibleStanceMask) || !m_ConditionItem || !m_ConditionItem.CanContinue(action_data.m_Player,action_data.m_MainItem) || !m_ConditionTarget || !m_ConditionTarget.CanContinue(action_data.m_Player,action_data.m_Target))
+			return false;
+
+		return ActionConditionContinue(action_data);
+	}
+	
+	bool HasVariants()
+	{
+		return m_VariantManager != null;
+	}
+	
+	int GetVariantsCount()
+	{
+		if (m_VariantManager)
+			return m_VariantManager.GetActionsCount();
+
+		return 0;
+	}
+	
+	int GetVariants(out array<ref ActionBase> variants)
+	{
+		if (m_VariantManager)
+			return m_VariantManager.GetActions(variants);
+
+		return 0;
+	}
+	
+	void SetVariantID(int ID)
+	{
+		m_VariantID = ID;
+	}
+	
+	int GetVariantID()
+	{
+		return m_VariantID;
+	}
+	
+	void UpdateVariants(Object item, Object target, int componet_index)
+	{
+		if ( m_VariantManager )
+		{
+			m_VariantManager.UpdateVariants(item, target, componet_index);
+		}
+	}
+	
+	ActionVariantManager GetVariantManager()
+	{
+		if ( !m_VariantManager )
+			m_VariantManager = new ActionVariantManager(this.Type());
+		return m_VariantManager;
+	}
+	
+	// call only on client side for lock inventory before action
+	// return if has successfuly reserved inventory
+	bool InventoryReservation(ActionData action_data)
+	{
+		if ((IsLocal() || !UseAcknowledgment()) && IsInstant())
+			return true;
+		
+		//action_data.m_ReservedInventoryLocations = new array<ref InventoryLocation>;
+		bool success = true;
+		InventoryLocation targetInventoryLocation = NULL;
+		InventoryLocation handInventoryLocation = NULL;
+		
+		// lock target if it has target
+		if (HasTarget())
+		{
+			ItemBase targetItem;
+			if ( ItemBase.CastTo(targetItem,action_data.m_Target.GetObject()) )
+			{
+				targetInventoryLocation = new InventoryLocation;
+				targetItem.GetInventory().GetCurrentInventoryLocation(targetInventoryLocation);
+				if ( action_data.m_Player.GetInventory().HasInventoryReservation( targetItem, targetInventoryLocation) )
+				{
+					success = false;
+				}
+				else
+				{
+					action_data.m_Player.GetInventory().AddInventoryReservationEx( targetItem, targetInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+				}
+			}
+		}	
+		
+		handInventoryLocation = new InventoryLocation;
+		handInventoryLocation.SetHands(action_data.m_Player,action_data.m_Player.GetItemInHands());
+
+		if (action_data.m_Player.GetInventory().HasInventoryReservation( action_data.m_Player.GetItemInHands(), handInventoryLocation))
+		{
+			if (HasTarget())
+			{
+				action_data.m_Player.GetInventory().ClearInventoryReservation(targetItem, targetInventoryLocation);
+			}
+
+			success = false;
+		}
+		else
+		{
+			action_data.m_Player.GetInventory().AddInventoryReservationEx( action_data.m_Player.GetItemInHands(), handInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+		}
+		
+		if (success)
+		{
+			if (targetInventoryLocation)
+				action_data.m_ReservedInventoryLocations.Insert(targetInventoryLocation);
+			
+			if (handInventoryLocation)
+				action_data.m_ReservedInventoryLocations.Insert(handInventoryLocation);
+		}
+		
+		return success;
+	}
+
+	void ClearInventoryReservationEx(ActionData action_data)
+	{
+		if (action_data.m_ReservedInventoryLocations)
+		{
+			InventoryLocation il;
+			for ( int i = 0; i < action_data.m_ReservedInventoryLocations.Count(); i++)
+			{
+				il = action_data.m_ReservedInventoryLocations.Get(i);
+				EntityAI entity = il.GetItem();
+				action_data.m_Player.GetInventory().ClearInventoryReservationEx( il.GetItem() , il );
+			}
+
+			action_data.m_ReservedInventoryLocations.Clear();
+		}
+	}
+	
+	void RefreshReservations(ActionData action_data)
+	{
+		if (action_data.m_ReservedInventoryLocations)
+		{
+			InventoryLocation il;
+			for (int i = 0; i < action_data.m_ReservedInventoryLocations.Count(); i++)
+			{
+				il = action_data.m_ReservedInventoryLocations.Get(i);
+				EntityAI entity = il.GetItem();
+				action_data.m_Player.GetInventory().ExtendInventoryReservationEx(il.GetItem() , il, 10000);
+			}
+		}
+	}
+	
+	// action need first have permission from server before can start
+	bool UseAcknowledgment()
+	{
+		return true;
+	}
+	
+	//! DEPRECATED delivers message ids to clients based on given context
+	protected void InformPlayers( PlayerBase player, ActionTarget target, int state );
+		
+	void SendMessageToClient( Object reciever, string message ) //sends given string to client, don't use if not nescessary
+	{
+		PlayerBase man;
+		if (GetGame().IsServer() && Class.CastTo(man, reciever) && m_MessageParam && reciever.IsAlive() && message != "")
+		{
+			m_MessageParam.param1 = message;
+			GetGame().RPCSingleParam(man, ERPCs.RPC_USER_ACTION_MESSAGE, m_MessageParam, true, man.GetIdentity());
+		}
+	}
+	
+	// ActionCondition Rules
+	// ------------------------------------------------------
+	protected bool IsDamageDestroyed(ActionTarget target)
+	{
+		return target.GetObject() && target.GetObject().IsDamageDestroyed();
+	}
+
+	protected bool IsBuilding(ActionTarget target)
+	{
+		return target.GetObject() && target.GetObject().IsBuilding();
+	}
+	
+	protected bool IsTransport(ActionTarget target)
+	{
+		return target.GetObject() && target.GetObject().IsTransport();
+	}
+
+	protected bool IsInReach(PlayerBase player, ActionTarget target, float maxDistance = 1.0)
+	{
+		Object obj = target.GetObject();
+		if (!obj)
+			return false;
+			
+		float distanceRoot, distanceHead;
+		vector modelPos, worldPos, playerHeadPos;
+		
+		// we're using sq distance in comparison
+		maxDistance = maxDistance * maxDistance;
+		
+		// get position of Head bone
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+
+		array<string> componentNames = new array<string>();
+		obj.GetActionComponentNameList(target.GetComponentIndex(), componentNames);
+		foreach (string componentName : componentNames)
+		{
+			if (componentName.Contains("doorstwin"))
+				continue;
+
+			modelPos = obj.GetSelectionPositionMS(componentName);
+			worldPos = obj.ModelToWorld(modelPos);
+			
+			break;
+		}
+
+		distanceRoot = vector.DistanceSq(worldPos, player.GetPosition());
+		distanceHead = vector.DistanceSq(worldPos, playerHeadPos);
+	
+		return distanceRoot <= maxDistance || distanceHead <= maxDistance;
+	}
+	// ------------------------------------------------------
+	
+	
+	
+	// SOUNDS ------------------------------------------------------
+	SoundOnVehicle PlayActionSound( PlayerBase player )
+	{
+		if ( GetGame().IsServer() && player )
+		{
+			if ( m_Sound != "" )
+			{
+				return GetGame().CreateSoundOnObject(player, m_Sound, 6, false);
+			}
+			else if ( m_Sounds && m_Sounds.Count() > 0 )
+			{
+				int rand_num =  Math.RandomInt(0, m_Sounds.Count());
+				return GetGame().CreateSoundOnObject(player, m_Sounds.Get(rand_num), 6, false);
+			}
+		}
+
+		return NULL;
+	}
+	
+	void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+	}
+	
+	//sound category matches with a soundtable category in config, selects correct soundset
+	string GetSoundCategory(ActionData action_data)
+	{
+		return "";
+	}
+	
+	// EVENTS ------------------------------------------------
+	void OnUpdate(ActionData action_data)
+	{}
+	
+	void OnUpdateClient(ActionData action_data)
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if (action_data.m_RefreshReservationTimer > 0)
+			{
+				action_data.m_RefreshReservationTimer--;
+			}
+			else
+			{
+				action_data.m_RefreshReservationTimer = m_RefreshReservationTimerValue;
+				RefreshReservations(action_data);
+			}
+		}
+	}
+	
+	void OnUpdateServer(ActionData action_data)
+	{}
+	
+	void OnStart(ActionData action_data)
+	{
+		if (action_data.m_Player != NULL && action_data.m_Player.IsPlacingLocal() && !IsDeploymentAction())
+			action_data.m_Player.PlacingCancelLocal();
+	}
+	
+	void OnStartClient(ActionData action_data)
+	{}
+	
+	void OnStartServer(ActionData action_data)
+	{
+		
+	}
+	
+	void OnEnd(ActionData action_data)
+	{
+
+	}
+	
+	void OnEndClient(ActionData action_data)
+	{}
+	
+	void OnEndServer(ActionData action_data)
+	{
+	}
+
+	// SOFT SKILLS ------------------------------------------------
+	float GetSpecialtyWeight()
+	{
+		if(m_SpecialtyWeight == 0)
+		{
+#ifdef DEVELOPER
+			//Print("UserAction does not use SoftSkills");
+#endif
+		}	
+
+		return m_SpecialtyWeight;	
+	}
+	
+	int GetState( ActionData action_data )
+	{
+		return action_data.m_State;
+	}
+	
+	float GetProgress( ActionData action_data )
+	{
+		return -1;
+	}
+	
+	ActionInput GetInput()
+	{
+		return m_Input;
+	}
+	
+	void SetID(int actionId)
+	{
+		m_ActionID = actionId;
+	}
+	
+	int GetID()
+	{
+		return m_ActionID;
+	}
+	
+	string GetAdminLogMessage(ActionData action_data)
+	{
+		return "";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CABase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CABase.c
new file mode 100644
index 0000000000000000000000000000000000000000..2de0d958b8d542966fe16348f8f34edc03cb5f51
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CABase.c
@@ -0,0 +1,66 @@
+class CABase 
+{	
+	protected ActionBase				m_Action;
+	protected float 					m_LastTick;
+	protected ref Param					m_ACData;
+	protected ref Param2<float,float>	m_ProgressParam;
+	
+	void Init( ActionData action_data )
+	{
+		m_ProgressParam = new Param2<float,float>(0,0);
+		m_Action = action_data.m_Action;
+		if ( !m_ACData ) 
+		{
+			m_ACData = new Param;
+		}
+		m_LastTick = GetGame().GetTime();
+		Setup(action_data);
+	}
+	
+	void Setup( ActionData action_data  )
+	{
+	}
+
+	int Execute( ActionData action_data  )
+	{
+		return UA_ERROR;
+	}
+	
+	int Cancel( ActionData action_data )
+	{
+		return UA_CANCEL;
+	}
+
+	int Interrupt( ActionData action_data )
+	{
+		Cancel( action_data );
+		return UA_INTERRUPT;
+	}
+		
+	void SetACData(Param units) //overload this method if you want to send more than one parameter out of the action component
+	{
+		if ( m_ACData )
+		{
+			m_ACData = units;
+		}
+	}
+	
+	Param GetACData() 
+	{
+		if ( m_ACData ) 
+		{
+			return m_ACData;
+		}
+		return NULL;
+	}
+	
+	bool IsContinuousAction() //informs command callback whether action is looped or oneshot
+	{
+		return false;
+	}
+	
+	float GetProgress()
+	{
+		return 0;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a8576ae3b6a964747707613668b007ebfdf4634
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousBase.c
@@ -0,0 +1,14 @@
+class CAContinuousBase: CABase
+{			
+	override bool IsContinuousAction() //informs command callback whether action is looped or oneshot
+	{
+		return true;
+	}
+	
+	void OnCompletePogress(ActionData action_data)
+	{
+		ActionContinuousBase action = ActionContinuousBase.Cast(action_data.m_Action);
+		if(action)
+			action.OnFinishProgress(action_data);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousCraft.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousCraft.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c0c9ec9dc77689f9bec73e0b66e776bc0c9b9df
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousCraft.c
@@ -0,0 +1,67 @@
+class CAContinuousCraft : CAContinuousTime
+{		
+	override void Setup( ActionData action_data  )
+	{
+		m_TimeElpased = 0;
+		m_AdjustedTimeToComplete = 1000; //indication of arror if somting will be craft 1000 sec
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		WorldCraftActionData action_data_wc = WorldCraftActionData.Cast(action_data);	
+		
+		PluginRecipesManager module_recipes_manager;
+		Class.CastTo(module_recipes_manager, GetPlugin(PluginRecipesManager));
+		if( module_recipes_manager )
+		{
+			m_AdjustedTimeToComplete = module_recipes_manager.GetRecipeLengthInSecs( action_data_wc.m_RecipeID );
+			if( module_recipes_manager.GetIsInstaRecipe( action_data_wc.m_RecipeID) || module_recipes_manager.IsEnableDebugCrafting() )
+			{
+				m_AdjustedTimeToComplete = 0;
+			}
+			float specialty_weight = module_recipes_manager.GetRecipeSpecialty( action_data_wc.m_RecipeID );
+			m_AdjustedTimeToComplete = action_data.m_Player.GetSoftSkillsManager().AdjustCraftingTime( m_AdjustedTimeToComplete, specialty_weight );
+			
+			//PrintString("ttc:" + m_AdjustedTimeToComplete.ToString());
+		}
+	}
+	
+	override int Execute( ActionData action_data  )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_TimeElpased < m_AdjustedTimeToComplete )
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+		}
+		else
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_TimeElpased;
+				SetACData(m_SpentUnits);
+			}
+			OnCompletePogress(action_data);
+			return UA_FINISHED;
+		}
+		return UA_PROCESSING;
+	}
+	
+	override float GetProgress()
+	{	
+		if( m_AdjustedTimeToComplete > 0 )
+		{
+			//float progress = m_TimeElpased/m_AdjustedTimeToComplete;
+			return m_TimeElpased/m_AdjustedTimeToComplete;
+		}
+		return 1;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousDisinfectPlant.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousDisinfectPlant.c
new file mode 100644
index 0000000000000000000000000000000000000000..161dda83e8d59c14c67619044b95f74892b54868
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousDisinfectPlant.c
@@ -0,0 +1,137 @@
+class CAContinuousDisinfectPlant : CAContinuousQuantity
+{
+	protected float m_PlantNeededSpraying;
+	protected float	m_TimeToComplete;
+	protected float m_SpentQuantityTotal;
+	protected float m_StartQuantity;
+	protected PlantBase m_Plant;
+
+	void CAContinuousDisinfectPlant( float quantity_used_per_second )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		GardenBase garden_base;
+		ActionTarget target = action_data.m_Target;
+		if ( Class.CastTo(garden_base, target.GetObject()))
+		{
+			Slot slot;
+			
+			array<string> selections = new array<string>;
+			garden_base.GetActionComponentNameList(target.GetComponentIndex(), selections);
+			string selection;
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				selection = selections[s];
+				slot = garden_base.GetSlotBySelection( selection );
+				if (slot)
+					break;
+			}
+			
+			if ( slot && slot.GetPlant() )
+			{
+				m_Plant = PlantBase.Cast(slot.GetPlant());
+				if ( m_Plant )
+				{	
+					m_SpentQuantity = 0;
+					m_StartQuantity = action_data.m_MainItem.GetQuantity();
+					if ( !m_SpentUnits )
+					{ 
+						m_SpentUnits = new Param1<float>(0);
+					}
+					else
+					{	
+						m_SpentUnits.param1 = 0;
+					}
+					if ( action_data.m_MainItem )
+					{
+						m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+					}
+					if ( m_Plant ) 
+					{
+						m_PlantNeededSpraying = m_Plant.GetSprayUsage() - m_Plant.GetSprayQuantity();
+					}
+		
+					m_TimeToComplete = (Math.Min(m_PlantNeededSpraying,m_ItemQuantity))/m_QuantityUsedPerSecond;
+				}
+			}
+		}
+		
+		/*PlantBase target_PB;
+		if (Class.CastTo(target_PB, action_data.m_Target.GetObject()))
+		{
+			m_SpentQuantity = 0;
+			m_StartQuantity = action_data.m_MainItem.GetQuantity();
+			if ( !m_SpentUnits )
+			{ 
+				m_SpentUnits = new Param1<float>(0);
+			}
+			else
+			{	
+				m_SpentUnits.param1 = 0;
+			}
+			if ( action_data.m_MainItem )
+			{
+				m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+			}
+			if ( target_PB ) 
+			{
+				m_PlantNeededSpraying = target_PB.GetSprayUsage() - target_PB.GetSprayQuantity();
+			}
+
+			m_TimeToComplete = (Math.Min(m_PlantNeededSpraying,m_ItemQuantity))/m_QuantityUsedPerSecond;
+		}*/
+	}
+	
+	override int Execute( ActionData action_data  )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity < m_ItemQuantity  &&  m_SpentQuantity < m_PlantNeededSpraying )
+			{
+				m_SpentQuantity += m_QuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				float transfered_spray = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_SpentQuantity, m_Action.GetSpecialtyWeight(), true );
+				
+				m_SpentQuantityTotal += m_SpentQuantity;
+				
+				if ( m_Action ) 
+				{
+					/*PlantBase plant;
+					Class.CastTo(plant,  targetObject );*/
+					m_Plant.SprayPlant(transfered_spray);
+					//m_Action.SendMessageToClient(action_data.m_Player, plant.StopInfestation( transfered_spray ));
+				}
+				
+				CalcAndSetQuantity( action_data );
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override float GetProgress()
+	{	
+		//return (m_SpentQuantity*m_QuantityUsedPerSecond)/m_TimeToComplete;
+		return -(m_SpentQuantityTotal / m_StartQuantity);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousEmpty.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousEmpty.c
new file mode 100644
index 0000000000000000000000000000000000000000..69973d3b01b38839811986c7009320ca7fee1ee8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousEmpty.c
@@ -0,0 +1,114 @@
+class CAContinuousEmpty : CAContinuousBase
+{
+	protected float 				m_TargetUnits;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_AdjustedQuantityEmptiedPerSecond;
+	protected float 				m_QuantityEmptiedPerSecond;
+	protected bool 					m_WringingClothes;
+	protected ref Param1<float>		m_SpentUnits;
+	protected float 				m_TimeElpased;
+	protected float 				m_DefaultTimeStep = 0.25;
+	
+	void CAContinuousEmpty( float quantity_emptied_per_second )
+	{
+		m_QuantityEmptiedPerSecond = quantity_emptied_per_second;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+
+		if ( action_data.m_MainItem.IsClothing() )
+		{
+			m_WringingClothes = true;
+			
+			m_SpentQuantity = action_data.m_MainItem.GetWetMax() - action_data.m_MainItem.GetWet();
+			m_TargetUnits = action_data.m_MainItem.GetWetMax();
+		}
+		else
+		{
+			m_WringingClothes = false;
+			
+			m_SpentQuantity = action_data.m_MainItem.GetQuantityMin();
+			m_TargetUnits = action_data.m_MainItem.GetQuantity();
+		}
+		
+		m_AdjustedQuantityEmptiedPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityEmptiedPerSecond, m_Action.GetSpecialtyWeight(), true );
+	}
+	
+	override int Execute( ActionData action_data  )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_WringingClothes && action_data.m_MainItem.GetWet() >= action_data.m_MainItem.GetWetMax() )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total <= m_TargetUnits )
+			{
+				m_SpentQuantity += m_AdjustedQuantityEmptiedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+				}
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}	
+		}
+	}
+	
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player || !action_data.m_MainItem )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_CANCEL;
+	}	
+	
+	override float GetProgress()
+	{
+		return m_SpentQuantity_total / m_TargetUnits;
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+		m_SpentQuantity_total += m_SpentQuantity;
+		if (GetGame().IsServer())
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			
+			action_data.m_MainItem.AddQuantity(-m_SpentQuantity);
+		}	
+		m_SpentQuantity = 0;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousEmptyMagazine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousEmptyMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..27898de834b0a250c7d4ec2262ec13c6b4d69871
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousEmptyMagazine.c
@@ -0,0 +1,100 @@
+class CAContinuousEmptyMagazine : CAContinuousBase
+{
+	protected float 				m_TargetUnits;
+	protected float 				m_SpentQuantity;
+	protected float 				m_Time;
+	protected float 				m_TimeToEjectOneBullet;
+	protected ref Param1<float>	m_SpentUnits;
+	
+	void CAContinuousEmptyMagazine( float eject_time )
+	{
+		m_TimeToEjectOneBullet = eject_time;
+		m_Time = 0;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		m_SpentQuantity = 0;
+		Magazine itm;
+		Class.CastTo(itm, action_data.m_MainItem);
+		m_TargetUnits = itm.GetAmmoCount();			
+		
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_TargetUnits == 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity < m_TargetUnits )
+			{
+				m_Time += action_data.m_Player.GetDeltaT();
+				if ( m_Time > m_TimeToEjectOneBullet )
+				{
+					m_Time = 0;
+					m_SpentQuantity += 1;
+				}
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player || !action_data.m_MainItem )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_CANCEL;
+	}	
+		
+	override float GetProgress()
+	{	
+		//float progress = m_SpentQuantity/m_TargetUnits;
+		return m_SpentQuantity/m_TargetUnits;
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+		if ( GetGame().IsServer() )
+		{
+			if ( action_data.m_MainItem )
+			{
+				Magazine itm;
+				Class.CastTo(itm, action_data.m_MainItem);
+				if ( m_SpentUnits )
+				{
+					m_SpentUnits.param1 = m_SpentQuantity;
+					SetACData(m_SpentUnits);
+				}		
+				itm.ServerAddAmmoCount(-m_SpentQuantity);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFertilizeGardenSlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFertilizeGardenSlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..f97edd4d27f88457ec9d25dd27a2d3274ffda0b9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFertilizeGardenSlot.c
@@ -0,0 +1,117 @@
+class CAContinuousFertilizeGardenSlot : CAContinuousQuantity
+{
+	protected float m_SlotFertilizerNeed;
+	protected float	m_TimeToComplete;
+	protected float m_SpentQuantityTotal;
+	protected float m_StartQuantity;
+	protected Slot 	m_Slot;
+	protected string m_Selection;
+
+	void CAContinuousFertilizeGardenSlot( float quantity_used_per_second )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_TimeToComplete = 0;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		GardenBase target_GB;		
+		if ( Class.CastTo(target_GB,  action_data.m_Target.GetObject() ) )
+		{
+			m_SpentQuantity = 0;
+			m_StartQuantity = action_data.m_MainItem.GetQuantity();
+			
+			if ( !m_SpentUnits )
+			{
+				m_SpentUnits = new Param1<float>(0);
+			}
+			else
+			{	
+				m_SpentUnits.param1 = 0;
+			}
+			
+			if ( action_data.m_MainItem ) 
+				m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+			
+			if ( target_GB ) 
+			{
+				/*string selection = target_GB.GetActionComponentName(action_data.m_Target.GetComponentIndex());
+			
+				Slot slot = target_GB.GetSlotBySelection( selection );*/
+			
+				array<string> selections = new array<string>;
+				target_GB.GetActionComponentNameList(action_data.m_Target.GetComponentIndex(), selections);
+	
+				for (int s = 0; s < selections.Count(); s++)
+				{
+					//string selection = selections[s];
+					m_Selection = selections[s];
+					m_Slot = target_GB.GetSlotBySelection( m_Selection );
+					if (m_Slot)
+						break;
+				}
+				
+				
+				string item_type = action_data.m_MainItem.GetType();
+				float consumed_quantity = GetGame().ConfigGetFloat( "cfgVehicles " + item_type + " Horticulture ConsumedQuantity" );
+				
+				float max = m_Slot.GetFertilizerQuantityMax();
+				
+				m_SlotFertilizerNeed = max - consumed_quantity;
+			}
+			m_TimeToComplete = (Math.Min(m_SlotFertilizerNeed,m_ItemQuantity))/m_QuantityUsedPerSecond;
+		}
+	}
+	
+	
+	override int Execute( ActionData action_data  )
+	{		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_SpentQuantity >= m_ItemQuantity )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity <= m_ItemQuantity )
+			{
+				m_SpentQuantity += m_QuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				float val = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_SpentQuantity, m_Action.GetSpecialtyWeight(), true );
+				GardenBase garden_base;
+				Class.CastTo(garden_base,  action_data.m_Target.GetObject() );
+				//string selection = garden_base.GetActionComponentName(action_data.m_Target.GetComponentIndex());
+			
+				m_SpentQuantityTotal += m_SpentQuantity;
+				
+				if (GetGame().IsServer())
+				{
+					action_data.m_MainItem.AddQuantity( -m_SpentQuantity );		
+				}
+				
+				garden_base.Fertilize( action_data.m_Player, action_data.m_MainItem, val, m_Selection );
+
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override float GetProgress()
+	{	
+		/*if ( m_TimeToComplete == 0) //Prevent division by 0 case
+		{
+			return -1;
+		}*/
+		return -(m_SpentQuantityTotal / m_StartQuantity);
+		//return (m_SpentQuantity)/m_ItemQuantity;///(m_TimeToComplete * m_QuantityUsedPerSecond)/m_ItemQuantity;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFill.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFill.c
new file mode 100644
index 0000000000000000000000000000000000000000..a4dee65133caf7eef5133342e35afb34c4141175
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFill.c
@@ -0,0 +1,128 @@
+class CAContinuousFill : CAContinuousBase
+{
+	protected float 				m_TargetUnits;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_ItemQuantity;
+	protected float 				m_AdjustedQuantityFilledPerSecond;
+	protected float 				m_QuantityFilledPerSecond;
+	protected ref Param1<float>		m_SpentUnits;
+	protected float 				m_TimeElpased;
+	protected float 				m_DefaultTimeStep = 0.25;
+	protected int 					m_liquid_type;
+	
+	void CAContinuousFill( float quantity_filled_per_second , int liquid_type )
+	{
+		m_QuantityFilledPerSecond = quantity_filled_per_second;
+		m_liquid_type = liquid_type;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_TimeElpased = 0;
+		
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		float throughputCoef = action_data.m_MainItem.GetLiquidThroughputCoef();
+		EntityAI entity;
+		if (action_data.m_Target && action_data.m_Target.GetObject() && Class.CastTo(entity,action_data.m_Target.GetObject()))
+		{
+			throughputCoef = Math.Min(throughputCoef,entity.GetLiquidThroughputCoef());
+		}
+		m_QuantityFilledPerSecond *= throughputCoef;
+		
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+		m_TargetUnits = action_data.m_MainItem.GetQuantityMax() - action_data.m_MainItem.GetQuantity();	
+		m_AdjustedQuantityFilledPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityFilledPerSecond, m_Action.GetSpecialtyWeight(), true );
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( action_data.m_MainItem.GetQuantity() >= action_data.m_MainItem.GetQuantityMax() )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total < m_TargetUnits )
+			{
+				m_SpentQuantity += m_AdjustedQuantityFilledPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+					//Setup(action_data);	//reset data after repeat
+				}
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player || !action_data.m_MainItem )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_CANCEL;
+	}
+	
+	override int Interrupt( ActionData action_data )
+	{				
+		if ( GetGame().IsServer() )
+		{
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( UASoftSkillsWeight.PRECISE_LOW );
+		}
+		
+		return super.Interrupt( action_data );
+	}
+	
+	override float GetProgress()
+	{	
+		return m_SpentQuantity_total/m_TargetUnits;
+	}
+	//---------------------------------------------------------------------------
+	
+	void CalcAndSetQuantity(ActionData action_data)
+	{
+		m_SpentQuantity_total += m_SpentQuantity;
+		if (GetGame().IsServer())
+		{
+			if (m_SpentUnits)
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			
+			bool injectAgents = true;
+			if (action_data.m_Target.GetObject() && (action_data.m_Target.GetObject().GetWaterSourceObjectType() == EWaterSourceObjectType.WELL || action_data.m_Target.GetObject().IsWell()))
+				injectAgents = false;
+
+			Liquid.FillContainerEnviro(action_data.m_MainItem, m_liquid_type, m_SpentQuantity, injectAgents);
+		}
+
+		m_SpentQuantity = 0;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillBrakes.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillBrakes.c
new file mode 100644
index 0000000000000000000000000000000000000000..6af2960dfa21591408101347599220add8c972dc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillBrakes.c
@@ -0,0 +1,143 @@
+class CAContinuousFillBrakes : CAContinuousBase
+{
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_EmptySpace; //basically free capacity
+	protected float					m_TimeElpased;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected float 				m_DefaultTimeStep;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	protected PlayerBase 			m_Player;
+	
+	void CAContinuousFillBrakes( float quantity_used_per_second, float time_to_progress )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeStep = time_to_progress;
+	}
+	
+	//---------------------------------------------------------------------------
+	override void Setup( ActionData action_data )
+	{
+		m_Player = action_data.m_Player;
+		
+		Car car = Car.Cast(action_data.m_Target.GetObject());
+		
+		if ( !car )
+			return;
+		
+		m_TimeElpased = 0;
+		m_SpentQuantity = 0;
+		
+		if ( !m_SpentUnits )
+		{
+			m_SpentUnits = new Param1<float>( 0 );
+		}
+		else
+		{
+			m_SpentUnits.param1 = 0;
+		}
+
+		float oilCapacity = car.GetFluidCapacity( CarFluid.BRAKE );
+		float currentOil = car.GetFluidFraction( CarFluid.BRAKE );
+		currentOil = currentOil * oilCapacity;
+
+		m_EmptySpace = (oilCapacity - currentOil) * 1000;
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+
+		if ( m_EmptySpace <= m_ItemQuantity )
+			m_ItemQuantity = m_EmptySpace;
+
+	}
+
+	//---------------------------------------------------------------------------
+	override int Execute( ActionData action_data  )
+	{
+		Car car = Car.Cast(action_data.m_Target.GetObject());
+
+		if ( !car )
+			return UA_ERROR;
+
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total < m_ItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+					//Setup(action_data);	//reset data after repeat
+				}
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_INTERRUPT;
+	}	
+	
+	//---------------------------------------------------------------------------
+	override float GetProgress()
+	{
+		if ( m_ItemQuantity <= 0 )
+			return 1;
+
+		return -(m_SpentQuantity_total / m_ItemQuantity);
+	}
+	
+	//---------------------------------------------------------------------------
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+
+		m_SpentQuantity_total += m_SpentQuantity;
+	
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_SpentQuantity;
+			SetACData(m_SpentUnits);
+		}
+		
+		
+		if ( GetGame().IsServer() )
+		{
+			if ( action_data.m_MainItem ) // Item EngineOil gets deleted after full consumption
+				action_data.m_MainItem.AddQuantity( -m_SpentQuantity );
+			
+			Car car = Car.Cast(action_data.m_Target.GetObject());	
+			car.Fill( CarFluid.BRAKE, (m_SpentQuantity * 0.001) );
+		}
+		
+		m_SpentQuantity = 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillCoolant.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillCoolant.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a34a3cda74ee9dfdf0a9af8b15b3cb6f7f48ce1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillCoolant.c
@@ -0,0 +1,145 @@
+class CAContinuousFillCoolant : CAContinuousBase
+{
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_EmptySpace; //basically free capacity
+	protected float					m_TimeElpased;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected float 				m_DefaultTimeStep;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	protected PlayerBase 			m_Player;
+	
+	void CAContinuousFillCoolant( float quantity_used_per_second, float time_to_progress )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeStep = time_to_progress;
+	}
+	
+	//---------------------------------------------------------------------------
+	override void Setup( ActionData action_data )
+	{
+		m_Player = action_data.m_Player;
+		
+		Car car = Car.Cast(action_data.m_Target.GetParent());
+		
+		if ( !car )
+			return;
+		
+		m_TimeElpased = 0;
+		m_SpentQuantity = 0;
+		
+		if ( !m_SpentUnits )
+		{
+			m_SpentUnits = new Param1<float>( 0 );
+		}
+		else
+		{
+			m_SpentUnits.param1 = 0;
+		}
+		
+		m_QuantityUsedPerSecond *= Math.Min(action_data.m_MainItem.GetLiquidThroughputCoef(),car.GetLiquidThroughputCoef());
+		
+		float coolCapacity = car.GetFluidCapacity( CarFluid.COOLANT );
+		float currentCool = car.GetFluidFraction( CarFluid.COOLANT );
+		currentCool = currentCool * coolCapacity;
+
+		m_EmptySpace = (coolCapacity - currentCool) * 1000;
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+
+		if ( m_EmptySpace <= m_ItemQuantity )
+			m_ItemQuantity = m_EmptySpace;
+
+	}
+
+	//---------------------------------------------------------------------------
+	override int Execute( ActionData action_data  )
+	{
+		Car car = Car.Cast(action_data.m_Target.GetParent());
+
+		if ( !car )
+			return UA_ERROR;
+
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total < m_ItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+					//Setup(action_data);	//reset data after repeat
+				}
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_INTERRUPT;
+	}	
+	
+	//---------------------------------------------------------------------------
+	override float GetProgress()
+	{
+		if ( m_ItemQuantity <= 0 )
+			return 1;
+
+		return -(m_SpentQuantity_total / m_ItemQuantity);
+	}
+	
+	//---------------------------------------------------------------------------
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+
+		m_SpentQuantity_total += m_SpentQuantity;
+	
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_SpentQuantity;
+			SetACData(m_SpentUnits);
+		}
+
+		if ( GetGame().IsServer() )
+		{
+			if( action_data.m_MainItem )
+				action_data.m_MainItem.AddQuantity( -m_SpentQuantity );
+			
+			Car car = Car.Cast(action_data.m_Target.GetParent());
+			if( car )
+				car.Fill( CarFluid.COOLANT, (m_SpentQuantity * 0.001) );
+		}
+
+		m_SpentQuantity = 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillFuel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillFuel.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0144f9e42bfe893d5f7f63292cc979b54514bdc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillFuel.c
@@ -0,0 +1,137 @@
+class CAContinuousFillFuel : CAContinuousBase
+{
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_EmptySpace; //basically free capacity
+	protected float					m_TimeElpased;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected float 				m_DefaultTimeStep;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	protected PlayerBase 			m_Player;
+	
+	void CAContinuousFillFuel( float quantity_used_per_second, float time_to_progress )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeStep = time_to_progress;
+	}
+	
+	//---------------------------------------------------------------------------
+	override void Setup( ActionData action_data )
+	{
+		m_Player = action_data.m_Player;
+		
+		Car car = Car.Cast(action_data.m_Target.GetObject());
+		
+		m_TimeElpased = 0;
+		m_SpentQuantity = 0;
+		
+		if ( !m_SpentUnits )
+		{
+			m_SpentUnits = new Param1<float>( 0 );
+		}
+		else
+		{
+			m_SpentUnits.param1 = 0;
+		}
+		
+		m_QuantityUsedPerSecond *= Math.Min(action_data.m_MainItem.GetLiquidThroughputCoef(),car.GetLiquidThroughputCoef());
+		
+		float fuelCapacity = car.GetFluidCapacity( CarFluid.FUEL );
+		float currentFuel = car.GetFluidFraction( CarFluid.FUEL );
+		currentFuel = currentFuel * fuelCapacity;
+
+		m_EmptySpace = (fuelCapacity - currentFuel) * 1000;
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+
+		if ( m_EmptySpace <= m_ItemQuantity )
+			m_ItemQuantity = m_EmptySpace;
+
+	}
+
+	//---------------------------------------------------------------------------
+	override int Execute( ActionData action_data  )
+	{
+		Car car = Car.Cast(action_data.m_Target.GetObject());
+		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total < m_ItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+					//Setup(action_data);	//reset data after repeat
+				}
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_INTERRUPT;
+	}	
+	
+	//---------------------------------------------------------------------------
+	override float GetProgress()
+	{
+		if ( m_ItemQuantity <= 0 )
+			return 1;
+
+		return -(m_SpentQuantity_total / m_ItemQuantity);
+	}
+	
+	//---------------------------------------------------------------------------
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+
+		m_SpentQuantity_total += m_SpentQuantity;
+	
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_SpentQuantity;
+			SetACData(m_SpentUnits);
+		}
+		
+		
+		if ( GetGame().IsServer() )
+		{
+			Car car = Car.Cast(action_data.m_Target.GetObject());	
+			action_data.m_MainItem.AddQuantity( -m_SpentQuantity );
+			car.Fill( CarFluid.FUEL, (m_SpentQuantity * 0.001) );
+		}
+		
+		m_SpentQuantity = 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillOil.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillOil.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4436b2e7ae1b77c3eb87358ed68f6f02ef2ebbf
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillOil.c
@@ -0,0 +1,143 @@
+class CAContinuousFillOil : CAContinuousBase
+{
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_EmptySpace; //basically free capacity
+	protected float					m_TimeElpased;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected float 				m_DefaultTimeStep;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	protected PlayerBase 			m_Player;
+	
+	void CAContinuousFillOil( float quantity_used_per_second, float time_to_progress )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeStep = time_to_progress;
+	}
+	
+	//---------------------------------------------------------------------------
+	override void Setup( ActionData action_data )
+	{
+		m_Player = action_data.m_Player;
+		
+		Car car = Car.Cast(action_data.m_Target.GetObject());
+		
+		if ( !car )
+			return;
+		
+		m_TimeElpased = 0;
+		m_SpentQuantity = 0;
+		
+		if ( !m_SpentUnits )
+		{
+			m_SpentUnits = new Param1<float>( 0 );
+		}
+		else
+		{
+			m_SpentUnits.param1 = 0;
+		}
+
+		float oilCapacity = car.GetFluidCapacity( CarFluid.OIL );
+		float currentOil = car.GetFluidFraction( CarFluid.OIL );
+		currentOil = currentOil * oilCapacity;
+
+		m_EmptySpace = (oilCapacity - currentOil) * 1000;
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+
+		if ( m_EmptySpace <= m_ItemQuantity )
+			m_ItemQuantity = m_EmptySpace;
+
+	}
+
+	//---------------------------------------------------------------------------
+	override int Execute( ActionData action_data  )
+	{
+		Car car = Car.Cast(action_data.m_Target.GetObject());
+
+		if ( !car )
+			return UA_ERROR;
+
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total < m_ItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+					//Setup(action_data);	//reset data after repeat
+				}
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_INTERRUPT;
+	}	
+	
+	//---------------------------------------------------------------------------
+	override float GetProgress()
+	{
+		if ( m_ItemQuantity <= 0 )
+			return 1;
+
+		return -(m_SpentQuantity_total / m_ItemQuantity);
+	}
+	
+	//---------------------------------------------------------------------------
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+
+		m_SpentQuantity_total += m_SpentQuantity;
+	
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_SpentQuantity;
+			SetACData(m_SpentUnits);
+		}
+		
+		
+		if ( GetGame().IsServer() )
+		{
+			if ( action_data.m_MainItem ) // Item EngineOil gets deleted after full consumption
+				action_data.m_MainItem.AddQuantity( -m_SpentQuantity );
+			
+			Car car = Car.Cast(action_data.m_Target.GetObject());	
+			car.Fill( CarFluid.OIL, (m_SpentQuantity * 0.001) );
+		}
+		
+		m_SpentQuantity = 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillPowerGenerator.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillPowerGenerator.c
new file mode 100644
index 0000000000000000000000000000000000000000..79761098e8eec00fa3d2f7c6cf908c41e0de2b37
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFillPowerGenerator.c
@@ -0,0 +1,87 @@
+class CAContinuousFillPowerGenerator : CAContinuousFill
+{
+	void CAContinuousFillPowerGenerator( float quantity_filled_per_second , int liquid_type )
+	{
+		m_QuantityFilledPerSecond = quantity_filled_per_second;
+		m_liquid_type = liquid_type;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_TimeElpased = 0;
+		
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		EntityAI pg = EntityAI.Cast(action_data.m_Target.GetObject()); // get power generator
+		m_QuantityFilledPerSecond *= Math.Min(action_data.m_MainItem.GetLiquidThroughputCoef(),pg.GetLiquidThroughputCoef());
+		
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+		m_TargetUnits = pg.GetCompEM().GetEnergyMax() - pg.GetCompEM().GetEnergy();
+		m_AdjustedQuantityFilledPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityFilledPerSecond, m_Action.GetSpecialtyWeight(), true );
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		PowerGeneratorBase pg = PowerGeneratorBase.Cast(action_data.m_Target.GetObject()); // get power generator
+		
+		if ( pg.GetFuel() >= pg.GetMaxFuel() )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity_total < m_TargetUnits )
+			{
+				m_SpentQuantity += m_AdjustedQuantityFilledPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeStep )
+				{
+					CalcAndSetQuantity( action_data );
+					m_TimeElpased = 0;
+					//Setup(action_data);	//reset data after repeat
+				}
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+
+	override void CalcAndSetQuantity( ActionData action_data )
+	{
+		m_SpentQuantity_total += m_SpentQuantity;
+	
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_SpentQuantity;
+			SetACData(m_SpentUnits);
+		}
+		
+		
+		if ( GetGame().IsServer() )
+		{
+			PowerGeneratorBase pg = PowerGeneratorBase.Cast(action_data.m_Target.GetObject()); // get power generator
+			int consumed_fuel = pg.AddFuel( m_SpentQuantity );
+			action_data.m_MainItem.AddQuantity( -consumed_fuel );
+		}
+		
+		m_SpentQuantity = 0;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFish.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFish.c
new file mode 100644
index 0000000000000000000000000000000000000000..044d625354fbe8d1293f7b87cd263df538d9f618
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousFish.c
@@ -0,0 +1,23 @@
+class CAContinuousFish : CAContinuousBase
+{
+	protected FishingRod_Base m_Rod;
+	
+	override void Setup( ActionData action_data )
+	{
+		Class.CastTo(m_Rod, action_data.m_MainItem);
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( m_Rod != action_data.m_MainItem )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( GetGame().IsServer() ) 
+		{
+			m_Rod.AddPull(action_data.m_Player.GetDeltaT());
+		}
+		return UA_PROCESSING;	
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousLoadMagazine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousLoadMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..b1bb48258dd32e276b8aefec6765ad006e4d6286
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousLoadMagazine.c
@@ -0,0 +1,38 @@
+class CAContinuousLoadMagazine : CAContinuousRepeat
+{
+	protected float 				m_TargetUnits;
+	protected float 				m_SpentQuantity;
+	protected float 				m_ItemQuantity;
+	protected float					m_ItemMaxQuantity;
+	protected float 				m_SourceQuantity;
+	protected float 				m_QuantityFilledPerSecond;
+	//protected ref Param1<float>		m_SpentUnits;
+	
+	void CAContinuousLoadMagazine( float time_to_complete_action )
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		super.Setup(action_data);
+		m_SpentQuantity = 0;
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		Magazine itm;
+		Class.CastTo(itm, action_data.m_MainItem);
+		m_ItemQuantity = itm.GetAmmoCount();
+		m_ItemMaxQuantity = itm.GetAmmoMax();
+		Magazine trg;
+		Class.CastTo(trg,  action_data.m_Target.GetObject() );
+		m_SourceQuantity = trg.GetAmmoCount();
+		m_TargetUnits = itm.GetAmmoMax();		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousMineRock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousMineRock.c
new file mode 100644
index 0000000000000000000000000000000000000000..f3b3d48d13e51a0f751c62b2e0cfc8ad308301b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousMineRock.c
@@ -0,0 +1,21 @@
+class CAContinuousMineRock : CAContinuousMineWood
+{	
+	void CAContinuousMineRock(float time_between_drops)
+	{
+		m_TimeBetweenMaterialDrops = time_between_drops;
+	}
+	
+	override bool GetMiningData(ActionData action_data )
+	{
+		RockBase ntarget;
+		if ( Class.CastTo(ntarget, action_data.m_Target.GetObject()) )
+		{
+			m_AmountOfDrops = ntarget.GetAmountOfDrops(action_data.m_MainItem);
+			ntarget.GetMaterialAndQuantityMap(action_data.m_MainItem,m_MaterialAndQuantityMap);
+			m_DamageToMiningItemEachDrop = ntarget.GetDamageToMiningItemEachDrop(action_data.m_MainItem);
+			m_AdjustedDamageToMiningItemEachDrop = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_DamageToMiningItemEachDrop, m_Action.GetSpecialtyWeight(), true );
+			return true;
+		}
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousMineWood.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousMineWood.c
new file mode 100644
index 0000000000000000000000000000000000000000..73b878468a96e53e00fd597f8486951fcd3f77f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousMineWood.c
@@ -0,0 +1,252 @@
+class CAContinuousMineWood : CAContinuousBase
+{
+	protected float 				m_TimeElpased;
+	protected float 				m_AdjustedTimeBetweenMaterialDrops;
+	protected float 				m_CycleTimeOverride;
+	protected float 				m_TimeBetweenMaterialDrops;
+	protected float					m_DamageToMiningItemEachDrop;
+	protected float					m_AdjustedDamageToMiningItemEachDrop;
+	protected int 					m_AmountOfDrops;
+	protected int 					m_CurrentAssumedDrops;
+	protected ref map<string,int> 	m_MaterialAndQuantityMap;
+	protected float					m_TimeToComplete;
+	protected ref Param1<float>		m_SpentUnits;
+	protected bool					m_DataLoaded = false;
+	protected const int 			MINEDITEM_MAX = 5;
+	protected ItemBase				m_MinedItem[MINEDITEM_MAX];
+	protected ItemBase 				m_SecondaryItem;
+	
+	void CAContinuousMineWood(float time_between_drops)
+	{
+		m_TimeBetweenMaterialDrops = time_between_drops;
+		m_CycleTimeOverride = -1.0;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_TimeElpased = 0;
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		m_MaterialAndQuantityMap = new map<string,int>;
+		m_DataLoaded = GetMiningData(action_data);
+		
+		if (m_CycleTimeOverride > -1.0)
+		{
+			m_TimeBetweenMaterialDrops = m_CycleTimeOverride;
+			if (!action_data.m_MainItem) //hand action
+				m_TimeBetweenMaterialDrops = m_TimeBetweenMaterialDrops * 3;
+		}
+		m_AdjustedTimeBetweenMaterialDrops = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_TimeBetweenMaterialDrops, m_Action.GetSpecialtyWeight(), true );		
+		m_TimeToComplete = m_AmountOfDrops * m_AdjustedTimeBetweenMaterialDrops;
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		Object targetObject;
+		Class.CastTo(targetObject, action_data.m_Target.GetObject());
+		if ( !action_data.m_Player || !m_DataLoaded )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( (action_data.m_MainItem && action_data.m_MainItem.IsDamageDestroyed()) || targetObject.IsDamageDestroyed() )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_TimeElpased < m_AdjustedTimeBetweenMaterialDrops )
+			{
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+			}
+			else
+			{
+				if ( GetGame().IsServer() )
+				{
+					float damage = 0;
+					if (m_AmountOfDrops > 0)
+						damage = (1 / m_AmountOfDrops) * 100;
+					
+					targetObject.DecreaseHealth("", "", damage, targetObject.CanBeAutoDeleted());
+					CreatePrimaryItems(action_data);
+					if (action_data.m_MainItem)
+						action_data.m_MainItem.DecreaseHealth( "", "", m_AdjustedDamageToMiningItemEachDrop );
+					else
+					{
+						DamagePlayersHands(action_data.m_Player);
+					}
+					
+					if ( targetObject.IsDamageDestroyed() ) //client does not know the target is destroyed yet, happens on the next Execute!
+					{
+						if ( m_SpentUnits )
+						{
+							m_SpentUnits.param1 = m_TimeElpased;
+							SetACData(m_SpentUnits);
+						}
+						
+						if ( WoodBase.Cast(targetObject) )
+						{
+							WoodBase target_woodbase = WoodBase.Cast(targetObject);
+							
+							if (target_woodbase.GetSecondaryOutput() != "")
+								CreateSecondaryItems(action_data,target_woodbase.GetSecondaryOutput(),target_woodbase.GetSecondaryDropsAmount());
+						}
+						
+						if (action_data.m_MainItem)
+						{
+							targetObject.OnTreeCutDown( action_data.m_MainItem );
+						}
+						else
+						{
+							targetObject.OnTreeCutDown( action_data.m_Player );
+						}
+					}
+				}
+				
+				m_CurrentAssumedDrops++;
+				if (m_AmountOfDrops > 0 && m_CurrentAssumedDrops >= m_AmountOfDrops) //assumed end, client does not know the target is destroyed yet
+				{
+					OnCompletePogress(action_data);
+					return UA_FINISHED;
+				}
+				
+				m_TimeElpased = m_TimeElpased - m_AdjustedTimeBetweenMaterialDrops;
+				OnCompletePogress(action_data);
+			}
+			return UA_PROCESSING;
+		}
+	}
+	
+	override float GetProgress()
+	{
+		return m_TimeElpased/m_AdjustedTimeBetweenMaterialDrops;
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	bool GetMiningData(ActionData action_data )
+	{
+		MineActionData adata = MineActionData.Cast(action_data);
+		WoodBase ntarget;
+		if ( Class.CastTo(ntarget, action_data.m_Target.GetObject()) )
+		{
+			m_AmountOfDrops = ntarget.GetAmountOfDropsEx(action_data.m_MainItem,adata.m_HarvestType);
+			m_CurrentAssumedDrops = 0;
+			m_CycleTimeOverride = ntarget.GetCycleTimeOverride(); //TODO
+			ntarget.GetMaterialAndQuantityMapEx(action_data.m_MainItem,m_MaterialAndQuantityMap, adata.m_HarvestType);
+			m_DamageToMiningItemEachDrop = ntarget.GetDamageToMiningItemEachDropEx(action_data.m_MainItem, adata.m_HarvestType );
+			m_AdjustedDamageToMiningItemEachDrop = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_DamageToMiningItemEachDrop, m_Action.GetSpecialtyWeight(), true );
+			return true;
+		}
+		return false;
+	}
+	
+	void CreatePrimaryItems(ActionData action_data)
+	{
+		string material;
+		int increment;
+		for (int i = 0; i < m_MaterialAndQuantityMap.Count(); i++)
+		{
+			material = m_MaterialAndQuantityMap.GetKey(i);
+			
+			if (material != "")
+			{
+				increment = m_MaterialAndQuantityMap.GetElement(i);
+				
+				if ( !m_MinedItem[i] )
+				{
+					m_MinedItem[i] = ItemBase.Cast(GetGame().CreateObjectEx(material,action_data.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+					m_MinedItem[i].SetQuantity(increment);
+				}
+				else if (m_MinedItem[i].HasQuantity())
+				{
+					if ( m_MinedItem[i].IsFullQuantity() )
+					{
+						int stack_max = m_MinedItem[i].GetQuantityMax();
+						
+						increment -= stack_max - m_MinedItem[i].GetQuantity();
+						if (increment >= 1.0)
+						{
+							m_MinedItem[i] = ItemBase.Cast(GetGame().CreateObjectEx(material,action_data.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+							m_MinedItem[i].SetQuantity(increment,false);
+						}
+					}
+					else
+					{
+						m_MinedItem[i].AddQuantity(increment,false);
+					}
+				}
+				else
+				{
+					m_MinedItem[i] = ItemBase.Cast(GetGame().CreateObjectEx(material,action_data.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+				}
+			}
+		}
+	}
+	
+	void CreateSecondaryItems(ActionData action_data, string material_secondary = "", int quantity_secondary = -1)
+	{
+		if (material_secondary == "" || quantity_secondary <= 0)
+		{
+			return;
+		}
+		
+		m_SecondaryItem = ItemBase.Cast(GetGame().CreateObjectEx(material_secondary,action_data.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+		if ( !m_SecondaryItem.HasQuantity() )
+		{
+			CreateSecondaryItems(action_data,material_secondary,quantity_secondary - 1);
+			return;
+		}
+		
+		int increment = quantity_secondary;
+		int stack_max = m_SecondaryItem.GetQuantityMax();
+		int stacks_amount;
+		
+		stacks_amount = Math.Ceil(increment/stack_max);
+		
+		for (int i = 0; i < stacks_amount; i++)
+		{
+			if (increment > stack_max)
+			{
+				m_SecondaryItem.SetQuantity(stack_max);
+				increment -= stack_max;
+				m_SecondaryItem = ItemBase.Cast(GetGame().CreateObjectEx(material_secondary,action_data.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+			}
+			else
+			{
+				m_SecondaryItem.SetQuantity(increment);
+			}
+		}
+	}
+	
+	void DamagePlayersHands(PlayerBase player)
+	{
+		ItemBase gloves = ItemBase.Cast(player.FindAttachmentBySlotName("Gloves"));
+		if ( gloves && !gloves.IsDamageDestroyed() )
+		{
+			gloves.DecreaseHealth("","",m_AdjustedDamageToMiningItemEachDrop);
+		}
+		else
+		{
+			int rand = Math.RandomIntInclusive(0,9);
+			if ( rand == 0 )
+			{
+				rand = Math.RandomIntInclusive(0,1);
+				if ( rand == 0 && !player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll") )
+				{
+					player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("RightForeArmRoll");
+				}
+				else if ( rand == 1 && !player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("RightForeArmRoll") )
+				{
+					player.GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll");
+				}
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantity.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantity.c
new file mode 100644
index 0000000000000000000000000000000000000000..9053ec603d6a83623bedcf2f08b865bf27525573
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantity.c
@@ -0,0 +1,95 @@
+class CAContinuousQuantity : CAContinuousBase
+{
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_ItemMaxQuantity;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	void CAContinuousQuantity( float quantity_used_per_second )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_SpentQuantity = 0;
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}		
+		m_ItemMaxQuantity = action_data.m_MainItem.GetQuantityMax();
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+	}
+	
+	
+	override int Execute( ActionData action_data  )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity < m_ItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);		
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_INTERRUPT;
+	}	
+	
+	override float GetProgress()
+	{
+		//float progress = m_SpentQuantity/m_ItemQuantity;
+		return m_SpentQuantity/m_ItemQuantity;
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+		if ( GetGame().IsServer() )
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			
+			if (action_data.m_MainItem)
+			{
+				action_data.m_MainItem.AddQuantity(- m_SpentQuantity,false,false);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityBloodTransfer.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityBloodTransfer.c
new file mode 100644
index 0000000000000000000000000000000000000000..4330e1da361e0fa70fc3e148960e4b58c826fd1a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityBloodTransfer.c
@@ -0,0 +1,29 @@
+class CAContinuousQuantityBloodTransfer : CAContinuousQuantityRepeat
+{
+	override void CalcAndSetQuantity( ActionData action_data )
+	{
+		if ( GetGame().IsServer() )
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+
+			action_data.m_MainItem.AddQuantity( -m_SpentQuantity, false, false );
+
+			ActionGiveBloodData action_data_b = ActionGiveBloodData.Cast( action_data );
+
+			PlayerBase bloodtarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+			if ( !bloodtarget )
+				bloodtarget = action_data.m_Player;
+
+			
+			if( BloodTypes.MatchBloodCompatibility(action_data_b.m_ItemBloodType, bloodtarget.GetStatBloodType().Get()) )
+			{
+				bloodtarget.AddHealth("", "Blood", m_SpentQuantity);
+			}
+
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityEdible.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityEdible.c
new file mode 100644
index 0000000000000000000000000000000000000000..da61e1fd6ca7fc2021622a126f9e70b3b2e03cc8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityEdible.c
@@ -0,0 +1,68 @@
+class CAContinuousQuantityEdible : CAContinuousQuantityRepeat
+{
+	protected float 	m_InitItemQuantity;
+	protected float 	m_SpentQuantityTotal;
+	
+	void CAContinuousQuantityEdible( float quantity_used_per_second, float time_to_repeat )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeToRepeat = time_to_repeat;
+		m_InitItemQuantity = -1;
+		m_SpentQuantityTotal = 0;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		super.Setup( action_data );
+		
+		if (m_InitItemQuantity < 0)
+		{
+			m_InitItemQuantity = action_data.m_MainItem.GetQuantity();
+		}
+	}
+	
+	override void CalcAndSetQuantity( ActionData action_data )
+	{	
+		//Print("Munch!");
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_SpentQuantity;
+			SetACData(m_SpentUnits);
+			
+			m_SpentQuantityTotal += m_SpentQuantity;
+		}
+		//m_SpentQuantity = Math.Floor(m_SpentQuantity);
+
+		PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		if ( ntarget )
+		{
+			if ( GetGame().IsServer() ) 
+			{
+				//action_data.m_MainItem.Consume(targetObject, m_SpentQuantity);
+				ntarget.Consume(action_data.m_MainItem, m_SpentQuantity, EConsumeType.ITEM_CONTINUOUS);
+				
+			}
+		}
+		else
+		{
+			if ( GetGame().IsServer() ) 
+			{
+				//action_data.m_MainItem.Consume(action_data.m_Player, m_SpentQuantity);
+				action_data.m_Player.Consume(action_data.m_MainItem, m_SpentQuantity, EConsumeType.ITEM_CONTINUOUS);
+			}
+		}
+	}
+	
+	override float GetProgress()
+	{
+		//return super.GetProgress();
+		if (m_SpentQuantity > 0)
+		{
+			return Math.Clamp((1 - (m_InitItemQuantity - m_SpentQuantity - m_SpentQuantityTotal ) / m_InitItemQuantity), 0, 1);
+		}
+		else
+		{
+			return Math.Clamp((1 - (m_InitItemQuantity - m_SpentQuantityTotal ) / m_InitItemQuantity), 0, 1);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityExtinguish.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityExtinguish.c
new file mode 100644
index 0000000000000000000000000000000000000000..14220b5b865130af2a17028f187082d589e85bb3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityExtinguish.c
@@ -0,0 +1,49 @@
+class CAContinuousQuantityExtinguish : CAContinuousQuantityRepeat
+{
+	private float m_WetnessGainMultiplier = 1.0;
+	
+	void CAContinuousQuantityExtinguish(float quantity_used_per_second, float time_to_repeat, float wetness_gain_multiplier)
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeToRepeat 	= time_to_repeat;
+		m_WetnessGainMultiplier = wetness_gain_multiplier;
+	}
+	
+	override void CalcAndSetQuantity(ActionData action_data)
+	{	
+		if (GetGame().IsServer())
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			
+			Object targetObject = action_data.m_Target.GetObject();
+			if ( targetObject )
+			{
+				FireplaceBase fireplace = FireplaceBase.Cast(targetObject);
+				
+				//add wetness to fireplace targets
+				float wetness = (m_SpentQuantity / 1000) * m_WetnessGainMultiplier;
+				fireplace.AddWetnessToFireplace(wetness);
+				
+				//subtract quantity from water source
+				action_data.m_MainItem.AddQuantity(-m_SpentQuantity);
+			}
+		}
+	}
+	
+	override int Interrupt(ActionData action_data)
+	{				
+		if (GetGame().IsServer())
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty(UASoftSkillsWeight.ROUGH_MEDIUM);
+		
+		return super.Interrupt(action_data);
+	}
+	
+	void MultiplyQuantityUsed(float coef)
+	{
+		m_QuantityUsedPerSecond *= coef;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityLiquidTransfer.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityLiquidTransfer.c
new file mode 100644
index 0000000000000000000000000000000000000000..04ab169b9d02408daaf7febd60c7d3a02e7414ed
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityLiquidTransfer.c
@@ -0,0 +1,156 @@
+class CAContinuousQuantityLiquidTransfer : CAContinuousBase
+{
+	protected int 					m_TendencyDrain; //1 == drain, 0 == pour, -1 == cancel!
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_SpentQuantity_total;
+	protected float 				m_ItemMaxQuantity; //basically free capacity
+	protected float					m_TimeElpased;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected float 				m_DefaultTimeStep;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	void CAContinuousQuantityLiquidTransfer(float quantity_used_per_second, float time_to_progress, int drain = -1) //-1 used as a safeguard; if no valid value arrives, callback is canceled
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeStep = time_to_progress;
+		m_TendencyDrain = drain;
+	}
+	
+	override void Setup(ActionData action_data)
+	{
+		ItemBase target_item = ItemBase.Cast(action_data.m_Target.GetObject());
+		
+		m_TimeElpased = 0;
+		m_SpentQuantity = 0;
+		
+		if (!m_SpentUnits)
+		{
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{
+			m_SpentUnits.param1 = 0;
+		}
+		
+		m_QuantityUsedPerSecond *= Math.Min(action_data.m_MainItem.GetLiquidThroughputCoef(),target_item.GetLiquidThroughputCoef());
+		
+		if (m_TendencyDrain == 1)
+		{
+			if (target_item.GetQuantity() > (action_data.m_MainItem.GetQuantityMax() - action_data.m_MainItem.GetQuantity()))
+			{
+				m_ItemMaxQuantity = action_data.m_MainItem.GetQuantityMax() - action_data.m_MainItem.GetQuantity();
+			}
+			else
+			{
+				m_ItemMaxQuantity = target_item.GetQuantity();
+			}
+			
+			m_ItemQuantity = m_ItemMaxQuantity;
+		}
+		else if (m_TendencyDrain == 0)
+		{
+			if (action_data.m_MainItem.GetQuantity() > (target_item.GetQuantityMax() - target_item.GetQuantity()))
+			{
+				m_ItemMaxQuantity = target_item.GetQuantityMax() - target_item.GetQuantity();
+			}
+			else
+			{
+				m_ItemMaxQuantity = action_data.m_MainItem.GetQuantity();
+			}
+			
+			m_ItemQuantity = m_ItemMaxQuantity;
+		}
+	}
+	
+	
+	override int Execute(ActionData action_data )
+	{
+		ItemBase target_item = ItemBase.Cast(action_data.m_Target.GetObject());
+		
+		if (!action_data.m_Player || m_TendencyDrain == -1 || !action_data.m_Target)
+		{
+			return UA_ERROR;
+		}
+		
+		if (m_ItemQuantity <= 0)
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if (m_SpentQuantity_total < m_ItemQuantity)
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus(m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if (m_TimeElpased >= m_DefaultTimeStep)
+				{
+					CalcAndSetQuantity(action_data);
+					m_TimeElpased = 0;
+				}
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity(action_data);
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override int Cancel(ActionData action_data)
+	{
+		if (!action_data.m_Player || m_TendencyDrain == -1 || !action_data.m_Target || !action_data.m_Target.GetObject())
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity(action_data);
+		return UA_INTERRUPT;
+	}	
+	
+	override float GetProgress()
+	{
+		if (m_TendencyDrain)
+		{
+			return m_SpentQuantity_total / m_ItemMaxQuantity;
+		}
+		else
+		{
+			return -(m_SpentQuantity_total / m_ItemMaxQuantity);
+		}
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	void CalcAndSetQuantity(ActionData action_data)
+	{
+		ItemBase target_item = ItemBase.Cast(action_data.m_Target.GetObject());
+		m_SpentQuantity_total += m_SpentQuantity;
+		
+		if (GetGame().IsServer())
+		{
+			if (m_SpentUnits)
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			
+			//could move following stuff to action itself, if needed
+			if (m_TendencyDrain)
+			{
+				Liquid.Transfer(target_item, action_data.m_MainItem, m_SpentQuantity);
+			}
+			else
+			{
+				Liquid.Transfer(action_data.m_MainItem, target_item, m_SpentQuantity);
+			}
+		}
+		m_SpentQuantity = 0;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityRepeat.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityRepeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..6380ea768f10d994e93deb46a7fbb6206b390cf5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousQuantityRepeat.c
@@ -0,0 +1,108 @@
+class CAContinuousQuantityRepeat : CAContinuousBase
+{
+	protected float 				m_ItemQuantity;
+	protected float 				m_SpentQuantity;
+	protected float 				m_ItemMaxQuantity;
+	protected float					m_TimeElpased;
+	protected float 				m_QuantityUsedPerSecond;
+	protected float 				m_AdjustedQuantityUsedPerSecond;
+	protected float 				m_DefaultTimeToRepeat;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	void CAContinuousQuantityRepeat( float quantity_used_per_second, float time_to_repeat )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeToRepeat = time_to_repeat;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_TimeElpased = 0;
+		m_SpentQuantity = 0;
+		
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>( 0 );
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}		
+		
+		m_ItemMaxQuantity = action_data.m_MainItem.GetQuantityMax();
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+	}
+	
+	
+	override int Execute( ActionData action_data  )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity < m_ItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);		
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+				
+				if ( m_TimeElpased >= m_DefaultTimeToRepeat )
+				{
+					CalcAndSetQuantity( action_data );
+					Setup(action_data);	//reset data after repeat
+				}
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override int Cancel( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		if (GetProgress() > 0)
+		{
+			CalcAndSetQuantity( action_data );
+		}
+		return UA_CANCEL;
+	}	
+	
+	override float GetProgress()
+	{
+		//float progress = ( m_ItemQuantity - m_SpentQuantity ) / m_ItemMaxQuantity;
+		return ( m_ItemQuantity - m_SpentQuantity ) / m_ItemMaxQuantity;
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+		if ( GetGame().IsServer() )
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			
+			action_data.m_MainItem.AddQuantity( -m_SpentQuantity, false, false );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeat.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..f35fb65f2c877f992c442c0c82f2090ef5c1d106
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeat.c
@@ -0,0 +1,72 @@
+class CAContinuousRepeat : CAContinuousBase
+{
+	protected float				m_TimeElpased;
+	protected float				m_TotalTimeElpased;
+	protected float				m_TimeToComplete;
+	protected float				m_DefaultTimeToComplete;
+	protected ref Param1<float>	m_SpentUnits;
+	
+	void CAContinuousRepeat( float time_to_complete_action )
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+
+		m_TimeToComplete = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_DefaultTimeToComplete, m_Action.GetSpecialtyWeight(), true);		
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+
+		if ( m_TimeElpased < m_TimeToComplete )
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+			m_TotalTimeElpased += action_data.m_Player.GetDeltaT();
+			return UA_PROCESSING;
+		}
+		else
+		{
+			m_SpentUnits.param1 = m_TimeElpased;
+			SetACData(m_SpentUnits);
+			m_TimeElpased = m_TimeToComplete - m_TimeElpased;
+			OnCompletePogress(action_data);
+			return UA_PROCESSING;
+		}
+	}
+	
+	override int Cancel( ActionData action_data )
+	{
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_TotalTimeElpased;
+			SetACData(m_SpentUnits);
+		}
+		return UA_CANCEL;
+	}
+	
+	override float GetProgress()
+	{	
+		float progress = m_TimeElpased/m_TimeToComplete;
+		//Print("progress: " + progress + " | m_TimeElpased: " + m_TimeElpased + " | m_TimeToComplete: " + m_TimeToComplete);
+		return  progress;
+	}
+	
+	void SetProgress(float value)
+	{
+		m_TimeElpased = value;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeatFishing.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeatFishing.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e6f82292ab0a54e2db6dd8262378b3b35e50ea8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeatFishing.c
@@ -0,0 +1,44 @@
+class CAContinuousRepeatFishing : CAContinuousRepeat
+{
+	void CAContinuousRepeatFishing( float time_to_complete_action )
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		//Print("CAContinuousRepeatFishing | Execute");
+		if ( !action_data.m_Player )
+		{
+			//Print("CAContinuousRepeatFishing | UA_ERROR");
+			return UA_ERROR;
+		}
+
+		if ( m_TimeElpased < m_TimeToComplete )
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+			m_TotalTimeElpased += action_data.m_Player.GetDeltaT();
+			//Print("CAContinuousRepeatFishing | Execute | m_TimeElpased: " + m_TimeElpased);
+			return UA_PROCESSING;
+		}
+		else
+		{
+			m_SpentUnits.param1 = m_TimeElpased;
+			SetACData(m_SpentUnits);
+			m_TimeElpased = m_TimeToComplete - m_TimeElpased;
+			OnCompletePogress(action_data);
+			
+			FishingActionData fad = FishingActionData.Cast(action_data);
+			if (fad && fad.m_FishingResult != -1)
+			{
+				//Print("CAContinuousRepeatFishing | UA_FINISHED");
+				return UA_FINISHED;
+			}
+			else
+			{
+				//Print("CAContinuousRepeatFishing | UA_PROCESSING");
+				return UA_PROCESSING;
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeatStartEngine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeatStartEngine.c
new file mode 100644
index 0000000000000000000000000000000000000000..f81409cde13b85ac20cdded75c862ea426c497c3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousRepeatStartEngine.c
@@ -0,0 +1,45 @@
+class CAContinuousRepeatStartEngine : CAContinuousRepeat
+{
+	void CAContinuousRepeatStartEngine( float time_to_complete_action )
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		HumanCommandVehicle vehCommand = action_data.m_Player.GetCommand_Vehicle();
+		if( vehCommand )
+		{
+			Transport trans = vehCommand.GetTransport();
+			
+			if ( trans )
+			{
+				Car car;
+				if ( Class.CastTo(car, trans) && car.EngineIsOn() )
+				{
+					return UA_FINISHED;
+				}
+			}
+		}
+
+		if ( m_TimeElpased < m_TimeToComplete )
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+			m_TotalTimeElpased += action_data.m_Player.GetDeltaT();
+			return UA_PROCESSING;
+		}
+		else
+		{
+			m_SpentUnits.param1 = m_TimeElpased;
+			SetACData(m_SpentUnits);
+			m_TimeElpased = 0;
+			OnCompletePogress(action_data);
+			return UA_PROCESSING;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTime.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTime.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e692d4c67d75d2775de376889d99c48f835f98c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTime.c
@@ -0,0 +1,87 @@
+class CAContinuousTime : CAContinuousBase
+{
+	protected float 			m_LocalTimeElpased;
+	protected float				m_TimeElpased;
+	protected float				m_AdjustedTimeToComplete;
+	protected float				m_DefaultTimeToComplete;	
+	protected ref Param1<float>	m_SpentUnits;
+	
+	void CAContinuousTime( float time_to_complete_action )
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_TimeElpased = 0;
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		m_AdjustedTimeToComplete = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_DefaultTimeToComplete, m_Action.GetSpecialtyWeight(), true);
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( m_DefaultTimeToComplete < 0 ) //for infinite actions
+		{
+			return UA_PROCESSING;
+		}
+		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_TimeElpased < m_AdjustedTimeToComplete )
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+			return UA_PROCESSING;
+		}
+		else
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_TimeElpased;
+				SetACData(m_SpentUnits);
+			}
+			OnCompletePogress(action_data);
+			return UA_FINISHED;
+		}
+	}
+	
+	override int Cancel(ActionData action_data )
+	{
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_TimeElpased;
+			SetACData(m_SpentUnits);
+		}
+		if ( m_DefaultTimeToComplete < 0 ) //for infinite actions
+		{
+			return UA_FINISHED;
+		}
+		
+		return UA_CANCEL;
+	}
+
+	override float GetProgress()
+	{	
+		if ( m_AdjustedTimeToComplete != 0 )
+		{
+			//progress = m_TimeElpased/m_AdjustedTimeToComplete;
+			return m_TimeElpased/m_AdjustedTimeToComplete;
+		}
+		else
+		{
+			Print("USER ACTION COMPONENT CONTINUOUS TIME - WRONG TIME TO COMPLETE CALCULATION - Incorrect data for progress bar!");
+		}
+		return 1;
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTimeCooking.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTimeCooking.c
new file mode 100644
index 0000000000000000000000000000000000000000..c5d633244e9c92c5800965703daafacf0128f66f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTimeCooking.c
@@ -0,0 +1,123 @@
+class CAContinuousTimeCooking : CAContinuousBase
+{
+	const float TIME_DAMAGE_THRESHOLD = 5.0;
+
+	protected float 			m_LocalTimeElpased;
+	protected float				m_TimeElapsed;
+	protected float 			m_TimeElapsedRepeat;
+	protected float 			m_TimeElapsedDamage;
+	protected ref Param1<float>	m_SpentUnits;
+	
+	protected float 			m_TimeToCook;
+	protected float 			m_AdjustedTimeToCook;
+	protected Cooking			m_CookingProcess;
+	protected Edible_Base		m_ItemToCook;
+	protected float 			m_CookingUpdateTime;
+	protected float 			m_AdjustedCookingUpdateTime;
+	
+	void CAContinuousTimeCooking(float cooking_update_time)
+	{
+		m_CookingUpdateTime = cooking_update_time;
+	}
+	
+	override void Setup(ActionData action_data)
+	{
+		m_TimeElapsedRepeat = 0;
+		m_TimeElapsedDamage = 0;
+		
+		if (!m_SpentUnits)
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		//fireplace & cooking process
+		FireplaceBase fireplace	= FireplaceBase.Cast(action_data.m_Target.GetObject());
+		m_CookingProcess = fireplace.GetCookingProcess();
+		m_ItemToCook = m_CookingProcess.GetFoodOnStick(action_data.m_MainItem);
+		m_TimeToCook = m_CookingProcess.GetTimeToCook(m_ItemToCook, CookingMethodType.BAKING);
+		
+		//update elapsed time
+		m_TimeElapsed = m_ItemToCook.GetFoodStage().GetCookingTime();
+		
+		//SoftSkill implementation to hasten Cooking
+		m_AdjustedCookingUpdateTime = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus(m_CookingUpdateTime, m_Action.GetSpecialtyWeight(), true);
+		m_AdjustedTimeToCook = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus(m_TimeToCook, m_Action.GetSpecialtyWeight(), true);
+	}
+	
+	override int Execute(ActionData action_data)
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		int cooking_state_update = 0;
+		float cooking_time = m_ItemToCook.GetFoodStage().GetCookingTime();
+		if (m_TimeToCook > cooking_time)
+		{
+			m_TimeElapsed += action_data.m_Player.GetDeltaT();
+			m_TimeElapsedRepeat += action_data.m_Player.GetDeltaT();
+			
+			if (m_TimeElapsedRepeat >= m_AdjustedCookingUpdateTime)
+			{
+				cooking_state_update = m_CookingProcess.CookOnStick(m_ItemToCook, m_CookingUpdateTime);
+
+				if (GetGame().IsServer())
+				{
+					m_TimeElapsedDamage += m_TimeElapsedRepeat;
+
+					if (m_TimeElapsedDamage >= TIME_DAMAGE_THRESHOLD)
+					{
+						m_TimeElapsedDamage = 0;
+						action_data.m_MainItem.DecreaseHealth(GameConstants.FIRE_ATTACHMENT_DAMAGE_PER_SECOND * TIME_DAMAGE_THRESHOLD, false);
+					}
+				}
+				
+				if (cooking_state_update == 1)
+				{
+					Setup(action_data);
+					
+					if (GetGame().IsServer())
+					{
+						action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_Action.GetSpecialtyWeight());
+					}
+					else
+					{
+						if (m_ItemToCook.IsMeat() && m_ItemToCook.GetFoodStage().GetFoodStageType() == FoodStageType.BAKED)
+						{
+							GetGame().GetAnalyticsClient().OnActionCookedSteak();
+						}
+					}
+				}
+			
+				m_TimeElapsedRepeat = 0;
+			}				
+					
+			return UA_PROCESSING;
+		}
+		else
+		{
+			if (m_SpentUnits)
+			{
+				m_SpentUnits.param1 = m_TimeElapsed;
+				SetACData(m_SpentUnits);
+			}
+			OnCompletePogress(action_data);
+			return UA_FINISHED;
+		}
+	}
+	
+	override float GetProgress()
+	{			
+		if (m_AdjustedTimeToCook != 0)
+		{
+			return m_TimeElapsed/m_AdjustedTimeToCook;
+		}
+
+		return 1; 
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTransferQuantity.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTransferQuantity.c
new file mode 100644
index 0000000000000000000000000000000000000000..c6add90c7be5d85bc04170995bafb8417db6e9fe
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousTransferQuantity.c
@@ -0,0 +1,102 @@
+class CAContinuousTransferQuantity : CAContinuousBase
+{
+	protected float 				m_TargetUnits;
+	protected float 				m_SpentQuantity;
+	protected float 				m_ItemQuantity;
+	protected float 				m_SourceQuantity;
+	protected float 				m_QuantityFilledPerSecond;
+	protected float					m_TimeToComplete;
+	protected ref Param1<float>		m_SpentUnits;
+	
+	void CAContinuousTransferQuantity( float quantity_filled_per_second )
+	{
+		m_QuantityFilledPerSecond = quantity_filled_per_second;
+	}
+	
+	override void Setup( ActionData action_data )
+	{		
+		m_SpentQuantity = 0;
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+		ItemBase trg;
+		if ( Class.CastTo(trg, action_data.m_Target.GetObject()) )
+		{
+			m_SourceQuantity = trg.GetQuantity();
+		}
+		m_TargetUnits = action_data.m_MainItem.GetQuantityMax();	
+		m_TimeToComplete= (Math.Min((m_TargetUnits-m_ItemQuantity),m_SourceQuantity))/m_QuantityFilledPerSecond;
+	}
+	
+	override int Execute( ActionData action_data )
+	{		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		ItemBase trg;
+		Class.CastTo(trg, action_data.m_Target.GetObject());
+		if ( action_data.m_MainItem.GetQuantity() >= action_data.m_MainItem.GetQuantityMax() || trg.GetQuantity() == 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+		if ( m_SpentQuantity < m_TargetUnits && m_SpentQuantity < m_SourceQuantity )
+		{
+			m_SpentQuantity += m_QuantityFilledPerSecond * action_data.m_Player.GetDeltaT();
+			float val = m_ItemQuantity-m_SpentQuantity;
+			if ( m_Action ) m_Action.SendMessageToClient(action_data.m_Player, val.ToString());
+			return UA_PROCESSING;
+		}
+		else
+		{
+			CalcAndSetQuantity( action_data );
+			OnCompletePogress(action_data);
+			return UA_FINISHED;
+		}
+	}
+	}
+	
+	override override int Cancel( ActionData action_data )
+	{		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		CalcAndSetQuantity( action_data );
+		return UA_CANCEL;
+	}
+		
+	override float GetProgress()
+	{	
+		float progress = (m_SpentQuantity*m_QuantityFilledPerSecond)/m_TimeToComplete;
+		return (m_SpentQuantity*m_QuantityFilledPerSecond)/m_TimeToComplete;
+	}
+	//---------------------------------------------------------------------------
+	
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+		if ( GetGame().IsServer() )
+		{			
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_SpentQuantity;
+				SetACData(m_SpentUnits);
+			}
+			action_data.m_MainItem.AddQuantity(m_SpentQuantity);
+			ItemBase trg;
+			if ( Class.CastTo(trg, action_data.m_Target.GetObject()) )
+			{
+				trg.AddQuantity(-m_SpentQuantity,false,false);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWaterPlant.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWaterPlant.c
new file mode 100644
index 0000000000000000000000000000000000000000..580d837fa9ee2a4cd63c5e7f8a57a14e835addd6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWaterPlant.c
@@ -0,0 +1,79 @@
+class CAContinuousWaterPlant : CAContinuousQuantity
+{
+	protected float m_PlantThirstyness;
+	protected float	m_TimeToComplete;
+
+	void CAContinuousWaterPlant( float quantity_used_per_second )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		PlantBase target_PB;
+		if (Class.CastTo(target_PB, action_data.m_Target.GetObject()))
+		{
+			m_SpentQuantity = 0;
+			if ( !m_SpentUnits )
+			{ 
+				m_SpentUnits = new Param1<float>(0);
+			}
+			else
+			{	
+				m_SpentUnits.param1 = 0;
+			}
+			if ( action_data.m_MainItem )
+			{
+				m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+			}
+			if ( target_PB ) 
+			{
+				m_PlantThirstyness = target_PB.GetWaterMax() - target_PB.GetWater();
+			}
+
+			m_TimeToComplete = (Math.Min(m_PlantThirstyness,m_ItemQuantity))/m_QuantityUsedPerSecond;
+		}
+	}
+	
+	override int Execute( ActionData action_data  )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantity < m_ItemQuantity  &&  m_SpentQuantity < m_PlantThirstyness )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);		
+				m_SpentQuantity += m_QuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				
+				if ( m_Action ) 
+				{
+					PlantBase plant;
+					Class.CastTo(plant,  action_data.m_Target.GetObject() );
+					Slot slot = plant.GetSlot();
+					slot.GiveWater( m_SpentQuantity );
+				}
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override float GetProgress()
+	{	
+		//float progress = (m_SpentQuantity*m_QuantityUsedPerSecond)/m_TimeToComplete;
+		return (m_SpentQuantity*m_QuantityUsedPerSecond)/m_TimeToComplete;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWaterSlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWaterSlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..991eb8c62bda9bf8f52d3bfc6421b8f2f8b8fa1f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWaterSlot.c
@@ -0,0 +1,107 @@
+class CAContinuousWaterSlot : CAContinuousQuantity
+{
+	protected float m_PlantThirstyness;
+	protected float	m_TimeToComplete;
+	protected float m_SpentQuantityTotal;
+	protected float m_StartQuantity;
+	protected Slot 	m_Slot;
+
+	void CAContinuousWaterSlot( float quantity_used_per_second )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		GardenBase target_GB;
+			
+		if ( Class.CastTo(target_GB, action_data.m_Target.GetObject()) )
+		{
+			m_SpentQuantity = 0;
+			m_StartQuantity = action_data.m_MainItem.GetQuantity();
+			if ( !m_SpentUnits )
+			{ 
+				m_SpentUnits = new Param1<float>(0);
+			}
+			else
+			{	
+				m_SpentUnits.param1 = 0;
+			}
+			
+			if ( action_data.m_MainItem )
+				m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+			
+			if ( target_GB ) 
+			{
+				array<string> selections = new array<string>;
+				target_GB.GetActionComponentNameList(action_data.m_Target.GetComponentIndex(), selections);
+	
+				for (int s = 0; s < selections.Count(); s++)
+				{
+					string selection = selections[s];
+					m_Slot = target_GB.GetSlotBySelection( selection );
+					if (m_Slot)
+						break;
+				}
+			
+				m_PlantThirstyness = m_Slot.GetWaterUsage() - m_Slot.GetWater();
+			}
+			
+			m_TimeToComplete = (Math.Min(m_PlantThirstyness,m_ItemQuantity))/m_QuantityUsedPerSecond;
+			
+			if (m_TimeToComplete <= 0.1) // Division by zero prevention
+			{
+				m_TimeToComplete = 0.1;
+			}
+		}
+	}
+	
+	override int Execute( ActionData action_data  )
+	{
+		GardenBase target_GB;
+		Class.CastTo(target_GB,  action_data.m_Target.GetObject() );
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+		m_ItemMaxQuantity = action_data.m_MainItem.GetQuantityMax();
+		
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_ItemQuantity <= 0 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_Slot && m_SpentQuantity < m_ItemQuantity )
+			{
+				m_SpentQuantity += m_QuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				float water = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_SpentQuantity, m_Action.GetSpecialtyWeight(), true );
+				m_Slot.GiveWater( water );
+				
+				m_SpentQuantityTotal += m_SpentQuantity;
+				CalcAndSetQuantity( action_data );
+				
+				m_SpentQuantity = 0;
+				
+				return UA_PROCESSING;
+			}
+			else
+			{
+				CalcAndSetQuantity( action_data );
+				OnCompletePogress( action_data );
+				
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override float GetProgress()
+	{		
+		if ( m_ItemQuantity <= 0 )
+			return 1;
+		float progress = -(m_SpentQuantityTotal / m_StartQuantity);
+		return progress;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWringClothes.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWringClothes.c
new file mode 100644
index 0000000000000000000000000000000000000000..eda717c3a8c793420d004819c10f29772f29dcda
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAContinuousWringClothes.c
@@ -0,0 +1,82 @@
+class CAContinuousWringClothes : CAContinuousQuantityRepeat
+{
+	protected float 	m_InitItemQuantity;
+	protected float 	m_SpentQuantityTotal;
+	
+	void CAContinuousWringClothes( float quantity_used_per_second, float time_to_repeat )
+	{
+		m_QuantityUsedPerSecond = quantity_used_per_second;
+		m_DefaultTimeToRepeat = time_to_repeat;
+		m_InitItemQuantity = -1;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		super.Setup( action_data );
+		
+		if (m_InitItemQuantity < 0)
+		{
+			m_InitItemQuantity = action_data.m_MainItem.GetWet();
+		}
+	}
+	
+	
+	override int Execute( ActionData action_data  )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+				
+		float wetness = action_data.m_MainItem.GetWet();		
+		int trim_wetness = wetness * 100;		
+		float rounded_wetness = trim_wetness/100;
+		
+		if ( rounded_wetness <= 0.25 )
+		{
+			return UA_FINISHED;
+		}
+		else
+		{
+			if ( m_SpentQuantityTotal < m_InitItemQuantity )
+			{
+				m_AdjustedQuantityUsedPerSecond = action_data.m_Player.GetSoftSkillsManager().AddSpecialtyBonus( m_QuantityUsedPerSecond, m_Action.GetSpecialtyWeight(), true);
+				m_SpentQuantity += m_AdjustedQuantityUsedPerSecond * action_data.m_Player.GetDeltaT();
+				m_TimeElpased += action_data.m_Player.GetDeltaT();
+
+				if (m_TimeElpased > m_DefaultTimeToRepeat)
+				{
+					OnCompletePogress(action_data);
+					m_TimeElpased -= m_DefaultTimeToRepeat;
+				}
+					
+				
+				if ( GetGame().IsServer() )
+				{
+					if ( m_SpentUnits )
+					{
+						m_SpentUnits.param1 = m_SpentQuantity;
+						SetACData(m_SpentUnits);
+					}
+
+					action_data.m_MainItem.AddWet(-m_SpentQuantity);
+				}
+				
+				m_SpentQuantityTotal += m_SpentQuantity;
+				m_SpentQuantity = 0;
+
+				return UA_PROCESSING;
+			}
+			else
+			{
+				OnCompletePogress(action_data);
+				return UA_FINISHED;
+			}
+		}
+	}
+	
+	override float GetProgress()
+	{
+		return ((m_TimeElpased - m_DefaultTimeToRepeat) / m_DefaultTimeToRepeat) + 1;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CADummy.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CADummy.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a3030d12be9349cf527580d190bfed284a319e1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CADummy.c
@@ -0,0 +1,7 @@
+class CADummy : CABase 
+{	
+	override int Execute( ActionData action_data )
+	{
+		return UA_FINISHED;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAInteract.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAInteract.c
new file mode 100644
index 0000000000000000000000000000000000000000..e44f829fe931fd9e211791462c657da6154497f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAInteract.c
@@ -0,0 +1,7 @@
+class CAInteract : CABase
+{	
+	override int Execute( ActionData action_data )
+	{
+		return UA_FINISHED;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAInteractLoop.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAInteractLoop.c
new file mode 100644
index 0000000000000000000000000000000000000000..ebc412f9ca5b3e42cc15b1f63e2b0372b7e85b9b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CAInteractLoop.c
@@ -0,0 +1,52 @@
+class CAInteractLoop : CABase
+{	
+	protected float 			m_LocalTimeElpased;
+	protected float				m_TimeElpased;
+	protected float				m_TimeToComplete;
+	protected float				m_DefaultTimeToComplete;	
+	protected ref Param1<float>	m_SpentUnits;
+	
+	void CAInteractLoop( float time_to_complete_action )
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		m_TimeElpased = 0;
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		
+		m_TimeToComplete = action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( m_DefaultTimeToComplete, m_Action.GetSpecialtyWeight(), true);
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+		if ( m_TimeElpased < m_TimeToComplete )
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+			return UA_PROCESSING;
+		}
+		else
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_TimeElpased;
+				SetACData(m_SpentUnits);
+			}
+			return UA_FINISHED;
+		}
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUse.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUse.c
new file mode 100644
index 0000000000000000000000000000000000000000..94366b1f8b26de1ddd6677a10ced503cbe6c3978
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUse.c
@@ -0,0 +1,12 @@
+class CASingleUse : CASingleUseBase
+{	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+
+		return UA_FINISHED;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..a9764774458957eb2578b3b4927723a20b2ec130
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseBase.c
@@ -0,0 +1,3 @@
+class CASingleUseBase : CABase
+{	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseQuantity.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseQuantity.c
new file mode 100644
index 0000000000000000000000000000000000000000..33152c92a53cb771345936210d800b285d12a972
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseQuantity.c
@@ -0,0 +1,52 @@
+class CASingleUseQuantity : CASingleUseBase
+{	
+	protected float 				m_QuantityUsedPerAction;
+	protected float 				m_ItemQuantity;
+	protected ref Param1<float>	m_SpentUnits;
+
+	void CASingleUseQuantity( float quantity_used_per_action )
+	{
+		m_QuantityUsedPerAction = quantity_used_per_action;	
+	}
+	
+	override void Setup( ActionData action_data )
+	{
+		if ( !m_SpentUnits )
+		{ 
+			m_SpentUnits = new Param1<float>(0);
+		}
+		else
+		{	
+			m_SpentUnits.param1 = 0;
+		}
+		m_ItemQuantity = action_data.m_MainItem.GetQuantity();
+	}
+	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_Player )
+		{
+			return UA_ERROR;
+		}
+		
+
+		CalcAndSetQuantity( action_data );
+		return UA_FINISHED;	
+	}
+	
+	//---------------------------------------------------------------------------
+	
+	void CalcAndSetQuantity( ActionData action_data )
+	{
+		if ( GetGame().IsServer() )
+		{
+			if ( m_SpentUnits )
+			{
+				m_SpentUnits.param1 = m_QuantityUsedPerAction;
+				SetACData(m_SpentUnits);	
+			}
+
+			action_data.m_MainItem.AddQuantity(- m_QuantityUsedPerAction,false,false);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseQuantityEdible.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseQuantityEdible.c
new file mode 100644
index 0000000000000000000000000000000000000000..cbd2f15621bb82473d9f4ce8b7f88be86c406dc7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseQuantityEdible.c
@@ -0,0 +1,34 @@
+class CASingleUseQuantityEdible : CASingleUseQuantity
+{
+	void CASingleUseQuantityEdible( float quantity_used_per_action )
+	{
+		m_QuantityUsedPerAction = quantity_used_per_action;
+	}
+	
+	override void CalcAndSetQuantity(ActionData action_data )
+	{	
+		if ( m_SpentUnits )
+		{
+			m_SpentUnits.param1 = m_QuantityUsedPerAction;
+			SetACData(m_SpentUnits);	
+		}
+		
+		PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		if ( ntarget )
+		{
+			if ( GetGame().IsServer() ) 
+			{
+				//action_data.m_MainItem.Consume(ntarget, m_QuantityUsedPerAction);
+				ntarget.Consume(action_data.m_MainItem, m_QuantityUsedPerAction, EConsumeType.ITEM_SINGLE_TIME);
+			}
+		}
+		else
+		{
+			if ( GetGame().IsServer() ) 
+			{
+				//action_data.m_MainItem.Consume(action_data.m_Player, m_QuantityUsedPerAction);
+				action_data.m_Player.Consume(action_data.m_MainItem, m_QuantityUsedPerAction, EConsumeType.ITEM_SINGLE_TIME);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseTurnOnPlugged.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseTurnOnPlugged.c
new file mode 100644
index 0000000000000000000000000000000000000000..99e7cb33b91c63c75ec342e33c83aa185f9a96f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionComponents/CASingleUseTurnOnPlugged.c
@@ -0,0 +1,15 @@
+class CASingleUseTurnOnPlugged : CASingleUse
+{	
+	override int Execute( ActionData action_data )
+	{
+		if ( !action_data.m_MainItem )
+		{
+			return UA_ERROR;
+		}
+		if ( !action_data.m_MainItem.GetCompEM().CanWork() )
+		{
+			return UA_FINISHED;
+		}
+		return UA_FINISHED;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionConstructor.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionConstructor.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d0d211e9c61c7a5b609c0fbb7e6ae54a9493477
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionConstructor.c
@@ -0,0 +1,405 @@
+class ActionConstructor
+{
+	bool ConstructActions( out array<ref ActionBase> actionsArray, out map<typename, ActionBase> actionNameActionMap )
+	{
+		TTypenameArray action_array_names = new TTypenameArray;
+		RegisterActions(action_array_names);
+		Sort(action_array_names,action_array_names.Count());
+		
+		actionsArray = new array<ref ActionBase>;
+		actionNameActionMap = new map<typename, ActionBase>;
+		ActionBase new_action;
+		
+		for(int i = 0; i < action_array_names.Count(); i++)
+		{
+			new_action = ActionBase.Cast(action_array_names[i].Spawn());
+			if(new_action)
+			{
+				new_action.CreateConditionComponents();
+				new_action.SetID(actionsArray.Count());
+				actionsArray.Insert(new_action);
+				actionNameActionMap.Insert(action_array_names[i], new_action);
+			}
+		}
+		return true;
+	}
+	
+	void RegisterActions(TTypenameArray actions)
+	{
+		// SingleUse Actions	
+		actions.Insert(ActionOpen);
+		actions.Insert(ActionClose);
+		actions.Insert(ActionConsumeSingle);
+		actions.Insert(ActionForceConsumeSingle);
+		actions.Insert(ActionTurnOnChemlight);
+		actions.Insert(ActionMeasureTemperatureSelf);
+		actions.Insert(ActionMeasureTemperatureTarget);
+		actions.Insert(ActionDisinfectSelf);
+		actions.Insert(ActionDisinfectTarget);
+		actions.Insert(ActionPlugIn);
+		actions.Insert(ActionPlugIntoFence);
+		actions.Insert(ActionTogglePlaceObject);
+		actions.Insert(ActionTurnOnWhileInHands);
+		actions.Insert(ActionTurnOffWhileInHands);
+		actions.Insert(ActionPlantSeed);
+		actions.Insert(ActionDisinfectPlantBit);
+		actions.Insert(ActionTurnOnHeatpack);
+		actions.Insert(ActionTurnOnTransmitter);	
+		actions.Insert(ActionTurnOffTransmitter);
+		actions.Insert(ActionWashHandsItemContinuous);
+		actions.Insert(ActionTakeABiteCan);
+		actions.Insert(ActionForceABiteCan);
+		actions.Insert(ActionPlaceFireplaceIndoor);
+		actions.Insert(ActionPlaceOvenIndoor);
+		actions.Insert(ActionCreateIndoorFireplace);
+		actions.Insert(ActionCreateGreenhouseGardenPlot);
+		actions.Insert(ActionCreateIndoorOven);
+		actions.Insert(ActionAttach);
+		actions.Insert(ActionAttachOnProxy);
+		actions.Insert(ActionAttachOnTrap);
+		actions.Insert(ActionAttachWheels);
+		actions.Insert(ActionPlugTargetIntoThis);
+		actions.Insert(ActionInsertSparkplug);
+		actions.Insert(ActionEmptySeedsPack);
+		//actions.Insert(ActionWorldCraftSwitch);
+		//actions.Insert(ActionWorldLiquidActionSwitch);
+		actions.Insert(ActionAttachPowerSourceToPanel);
+//		actions.Insert(ActionAttachMetalWire);
+		actions.Insert(ActionInjectSelf);
+		actions.Insert(ActionInjectTarget);
+		actions.Insert(ActionInjectEpinephrineSelf);
+		actions.Insert(ActionInjectEpinephrineTarget);
+		actions.Insert(ActionInjectMorphineSelf);
+		actions.Insert(ActionInjectMorphineTarget);
+		actions.Insert(ActionHandcuffTarget);
+		//actions.Insert(ActionBuildPartSwitch);
+		actions.Insert(ActionAttachOnSelection);
+		actions.Insert(ActionTurnOnWeaponFlashlight);
+		actions.Insert(ActionTurnOffWeaponFlashlight);
+		actions.Insert(ActionNextCombinationLockDial);
+		actions.Insert(ActionAttachToConstruction);
+		actions.Insert(ActionTakeMaterialToHandsSwitch);
+		actions.Insert(ActionClapBearTrapWithThisItem);
+		actions.Insert(ActionDisarmMine);
+		actions.Insert(ActionPlaceFireplaceIntoBarrel);
+		actions.Insert(ActionStopEngine);
+		actions.Insert(ActionUnfoldMap);
+		actions.Insert(ActionFoldMap);
+		actions.Insert(ActionDropItem);
+		actions.Insert(ActionDropItemSimple);
+		actions.Insert(ActionSwitchSeats);
+		actions.Insert(ActionTurnOnHeadtorch);
+		actions.Insert(ActionTurnOffHeadtorch);
+		actions.Insert(ActionTurnOnHelmetFlashlight);
+		actions.Insert(ActionTurnOffHelmetFlashlight);
+		actions.Insert(ActionToggleNVG);
+		//actions.Insert(ActionSwitchMineWood);
+		actions.Insert(ActionAttachOnTentProxy);
+		actions.Insert(ActionTriggerRemotely);
+		actions.Insert(ActionDisarmExplosive);
+		actions.Insert(ActionDisarmExplosiveWithRemoteDetonator);
+		actions.Insert(ActionDisarmExplosiveWithRemoteDetonatorUnpaired);
+		actions.Insert(ActionEatPillFromBottle);
+		actions.Insert(ActionEatTabletFromWrapper);
+
+		// Continuous use actions
+		actions.Insert(ActionWorldCraft);
+		actions.Insert(ActionCraftImprovisedHandsCover);
+		actions.Insert(ActionCraftImprovisedHeadCover);
+		actions.Insert(ActionCraftImprovisedFeetCover);
+		actions.Insert(ActionCraftImprovisedFaceCover);
+		actions.Insert(ActionCraftImprovisedTorsoCover);
+		actions.Insert(ActionCraftImprovisedLegsCover);
+		actions.Insert(ActionCraftImprovisedEyePatch);
+		actions.Insert(ActionCraftRopeBelt);
+		actions.Insert(ActionDeCraftRopeBelt);
+		actions.Insert(ActionCraftBoneKnife);
+		actions.Insert(ActionCraftArmband);
+		actions.Insert(ActionCraftBoneKnifeEnv);
+		actions.Insert(ActionCraftStoneKnifeEnv);
+//		actions.Insert(ActionDigStash);
+		actions.Insert(ActionSkinning);
+		actions.Insert(ActionPlaceObject);
+		actions.Insert(ActionDeployObject);
+		actions.Insert(ActionDeployHuntingTrap);
+		actions.Insert(ActionMineTree);
+		actions.Insert(ActionMineBush);
+		actions.Insert(ActionMineRock);
+		actions.Insert(ActionMineRock1H);
+		actions.Insert(ActionDrinkDisinfectant);
+		actions.Insert(ActionForceDrinkDisinfectant);	
+		actions.Insert(ActionDrinkDisinfectant2);
+		actions.Insert(ActionDigGardenPlot);
+		actions.Insert(ActionDismantleGardenPlot);
+		actions.Insert(ActionWaterPlant);
+		actions.Insert(ActionFertilizeSlot);
+		actions.Insert(ActionDisinfectPlant);
+		actions.Insert(ActionFillObject);
+		actions.Insert(ActionDefibrilateSelf);
+		actions.Insert(ActionDefibrilateTarget);
+		actions.Insert(ActionTestBloodSelf);
+		actions.Insert(ActionTestBloodTarget);
+		actions.Insert(ActionGiveBloodSelf);
+		actions.Insert(ActionGiveBloodTarget);
+		actions.Insert(ActionGiveSalineSelf);
+		actions.Insert(ActionGiveSalineTarget);
+		actions.Insert(ActionCollectBloodSelf);
+		actions.Insert(ActionCollectBloodTarget);
+		actions.Insert(ActionCollectSampleSelf);
+		actions.Insert(ActionCollectSampleTarget);
+		actions.Insert(ActionCoverHeadSelf);
+		actions.Insert(ActionUncoverHeadSelf);
+		actions.Insert(ActionCoverHeadTarget);
+		actions.Insert(ActionShave);
+		actions.Insert(ActionSplintSelf);
+		actions.Insert(ActionSplintTarget);
+		actions.Insert(ActionConsume);
+		actions.Insert(ActionForceConsume);
+		actions.Insert(ActionForceDrink);
+		actions.Insert(ActionForceFeed);
+		actions.Insert(ActionForceFeedSmall);
+		actions.Insert(ActionEatBig);
+		actions.Insert(ActionEatMeat);
+		actions.Insert(ActionEatFruit);
+		actions.Insert(ActionDrink);
+		actions.Insert(ActionDrinkCookingPot);
+		actions.Insert(ActionBandageSelf);
+		actions.Insert(ActionBandageTarget);
+		actions.Insert(ActionRestrainTarget);
+		actions.Insert(ActionRestrainSelf);
+		actions.Insert(ActionUnrestrainTarget);
+		actions.Insert(ActionUnrestrainSelf);
+		actions.Insert(ActionPlaceOnGround);
+		actions.Insert(ActionForceDrinkAlcohol);
+		actions.Insert(ActionDrinkAlcohol);
+		//actions.Insert(ActionFishing);
+		actions.Insert(ActionFillBottleBase);
+		actions.Insert(ActionUpgradeTorchFromGasPump);
+		actions.Insert(ActionRefuelTorch);
+		actions.Insert(ActionTuneFrequency);
+		actions.Insert(ActionTuneRadioStation);
+		actions.Insert(ActionIgniteFireplaceByAir);
+		actions.Insert(ActionLightItemOnFire);
+		actions.Insert(ActionLightItemOnFireWithBlowtorch);
+		actions.Insert(ActionExtinguishFireplaceByLiquid);
+		actions.Insert(ActionExtinguishFireplaceByExtinguisher);
+		actions.Insert(ActionBurnSewSelf);
+		actions.Insert(ActionBurnSewTarget);
+		actions.Insert(ActionSewSelf);
+		actions.Insert(ActionSewTarget);
+		actions.Insert(ActionBuryAshes);
+		actions.Insert(ActionCookOnStick);
+		actions.Insert(ActionFillGeneratorTank);
+		actions.Insert(ActionSawPlanks);
+		actions.Insert(ActionBuryBody);
+		actions.Insert(ActionEatCan);
+		actions.Insert(ActionEatSmallCan);
+		actions.Insert(ActionForceFeedCan);
+		actions.Insert(ActionForceFeedMeat);
+		actions.Insert(ActionWaterGardenSlot);
+		actions.Insert(ActionWringClothes);
+		actions.Insert(ActionLoadMagazine);
+		actions.Insert(ActionEmptyMagazine);
+		actions.Insert(ActionBuildPart);
+		actions.Insert(ActionActionBuildPartNoTool);
+		actions.Insert(ActionDismantlePart);
+		actions.Insert(ActionDestroyPart);
+		actions.Insert(ActionCPR);
+		actions.Insert(ActionDrinkPondContinuous);
+		actions.Insert(ActionDrinkThroughContinuous);
+		actions.Insert(ActionEat);
+		actions.Insert(ActionEatSmall);
+		actions.Insert(ActionMineTreeBark);
+		actions.Insert(ActionDigWorms);
+		actions.Insert(ActionShaveTarget);
+		actions.Insert(ActionDrinkWellContinuous);
+		actions.Insert(ActionUncoverHeadTarget);
+		actions.Insert(ActionLockDoors);
+		actions.Insert(ActionUnlockDoors);
+		actions.Insert(ActionUnpackBox);
+		actions.Insert(ActionWashHandsWater);
+		actions.Insert(ActionWashHandsWell);
+		actions.Insert(ActionDrinkCan);
+		actions.Insert(ActionStripCarrierVest);
+		actions.Insert(ActionBuildOven);
+		actions.Insert(ActionDismantleOven);
+		actions.Insert(ActionBuildStoneCircle);
+		actions.Insert(ActionDismantleStoneCircle);
+		//actions.Insert(ActionWritePaper);
+		//actions.Insert(ActionReadPaper);
+		actions.Insert(ActionFillFuel);
+		//actions.Insert(ActionTransferLiquid);
+		actions.Insert(ActionDrainLiquid);
+		actions.Insert(ActionPourLiquid);
+		actions.Insert(ActionStartEngine);
+		actions.Insert(ActionRaiseMegaphone);
+		actions.Insert(ActionActivateTrap);
+		actions.Insert(ActionEmptyBottleBase);
+		actions.Insert(ActionEmptyCookingPot);
+		actions.Insert(ActionViewOptics);
+		actions.Insert(ActionToggleNVMode);
+		actions.Insert(ActionViewBinoculars);
+		actions.Insert(ActionFoldBaseBuildingObject);
+		//actions.Insert(ActionUseRangefinder);
+		//actions.Insert(ActionAttached);
+		actions.Insert(ActionMountBarbedWire);
+		actions.Insert(ActionUnmountBarbedWire);
+		actions.Insert(ActionDialCombinationLock);
+		actions.Insert(ActionDialCombinationLockOnTarget);
+		actions.Insert(ActionFillCoolant);
+		actions.Insert(ActionFillOil);
+		actions.Insert(ActionDestroyCombinationLock);
+		actions.Insert(ActionGagSelf);
+		actions.Insert(ActionGagTarget);
+		actions.Insert(ActionUngagSelf);
+		actions.Insert(ActionUngagTarget);
+		actions.Insert(ActionDigInStash);
+		actions.Insert(ActionDigOutStash);
+		actions.Insert(ActionMineBushByHand);
+		actions.Insert(ActionBreakLongWoodenStick);
+		actions.Insert(ActionFishingNew);
+		actions.Insert(ActionRepairTent);
+		actions.Insert(ActionRepairTentPart);
+		actions.Insert(ActionRepairPart);
+		actions.Insert(ActionRepairCarPart);
+		actions.Insert(ActionRepairCarPartWithBlowtorch);
+		actions.Insert(ActionRepairCarChassis);
+		actions.Insert(ActionRepairCarChassisWithBlowtorch);
+		actions.Insert(ActionRepairCarEngine);
+		actions.Insert(ActionRepairCarEngineWithBlowtorch);
+		actions.Insert(ActionRepairShelter);
+		actions.Insert(ActionRepairItemWithBlowtorch);
+		actions.Insert(ActionLockAttachment);
+		actions.Insert(ActionUnpackGift);
+		actions.Insert(ActionPackGift);
+		//actions.Insert(ActionEmptyBarrel);
+		actions.Insert(ActionAttachExplosivesTrigger);
+		actions.Insert(ActionArmExplosive);
+		actions.Insert(ActionTurnValve);
+		actions.Insert(ActionTurnValveUndergroundReservoir);
+		
+		// Interact actions
+		actions.Insert(ActionPullOutPlug);
+		actions.Insert(ActionUnplugThisByCord);
+		actions.Insert(ActionTurnOnWhileOnGround);
+		actions.Insert(ActionTurnOffWhileOnGround);
+		actions.Insert(ActionTurnOnPowerGenerator);
+		actions.Insert(ActionTurnOffPowerGenerator);
+		actions.Insert(ActionTurnOnSpotlight);
+		actions.Insert(ActionTurnOffSpotlight);
+		actions.Insert(ActionITest);
+		actions.Insert(ActionRemoveSeed);
+		actions.Insert(ActionRemovePlant);
+		actions.Insert(ActionHarvestCrops);
+		actions.Insert(ActionFoldObject);
+		actions.Insert(ActionRepositionPluggedItem);
+		//actions.Insert(ActionPickBerry);
+		actions.Insert(ActionTurnOnTransmitterOnGround);
+		actions.Insert(ActionTurnOffTransmitterOnGround);
+		actions.Insert(ActionTuneFrequencyOnGround);
+		actions.Insert(ActionToggleTentOpen);
+		actions.Insert(ActionPackTent);
+		//actions.Insert(ActionRepackTent);
+		actions.Insert(ActionOpenBarrel);
+		actions.Insert(ActionCloseBarrel);
+		actions.Insert(ActionOpenBarrelHoles);
+		actions.Insert(ActionCloseBarrelHoles);
+		actions.Insert(ActionTakeFireplaceIndoor);
+		actions.Insert(ActionTakeOvenIndoor);
+		actions.Insert(ActionOpenDoors);
+		actions.Insert(ActionCloseDoors);
+		actions.Insert(ActionLockedDoors);
+		actions.Insert(ActionEnterLadder);
+		actions.Insert(ActionExitLadder);
+		actions.Insert(ActionGetInTransport);
+		actions.Insert(ActionTakeItem);
+		actions.Insert(ActionDetachPowerSourceFromPanel);
+		actions.Insert(ActionSortAmmoPile);
+		actions.Insert(ActionSwapItemToHands);
+		actions.Insert(ActionTakeItemToHands);
+		actions.Insert(ActionTakeFireplaceFromBarrel);
+		actions.Insert(ActionOpenCarDoors);
+		actions.Insert(ActionCloseCarDoors);
+		actions.Insert(ActionOpenCarDoorsOutside);
+		actions.Insert(ActionCloseCarDoorsOutside);
+		//actions.Insert(ActionWashHandsWellOne);
+		//actions.Insert(ActionWashHandsWaterOne);
+		actions.Insert(ActionGetOutTransport);
+		actions.Insert(ActionAnimateSeats);
+		actions.Insert(ActionAnimateCarSelection);
+		actions.Insert(ActionSidePlateInteract);
+		actions.Insert(ActionDetach);
+		actions.Insert(ActionOpenFence);
+		actions.Insert(ActionCloseFence);
+		actions.Insert(ActionNextCombinationLockDialOnTarget);
+		actions.Insert(ActionTakeMaterialToHands);
+		//actions.Insert(ActionCheckPulse);
+		actions.Insert(ActionCheckPulseTarget);
+		actions.Insert(ActionUnpin);
+		actions.Insert(ActionPin);
+		actions.Insert(ActionTakeHybridAttachment);
+		actions.Insert(ActionTakeHybridAttachmentToHands);
+		actions.Insert(ActionWorldFlagActionSwitch);
+		actions.Insert(ActionRaiseFlag);
+		actions.Insert(ActionLowerFlag);
+		actions.Insert(ActionDeconstructShelter);
+		actions.Insert(ActionBuildShelter);
+		//actions.Insert(ActionHandsPartSwitch);
+		actions.Insert(ActionDetachFromTarget);
+		actions.Insert(ActionDetachFromTarget_SpecificSlot_WoodenLogs);
+		actions.Insert(ActionDetachFromTarget_SpecificSlot_WoodenPlanks);
+		actions.Insert(ActionDetachFromTarget_SpecificSlot_MetalSheets);
+		actions.Insert(ActionDetachFromTarget_SpecificSlotsCategory_Barrel);
+		actions.Insert(ActionDetachFromTarget_SpecificSlotsCategory_WoodenCrate);
+		actions.Insert(ActionTakeArrow);
+		actions.Insert(ActionTakeArrowToHands);
+		
+		//vehicle actions
+		actions.Insert(ActionSwitchLights);
+		actions.Insert(ActionCarHornShort);
+		actions.Insert(ActionCarHornLong);
+		actions.Insert(ActionPushCar);
+		
+		//Instant action - debug
+		actions.Insert(ActionDebug);
+			
+		//Weapon
+		actions.Insert(FirearmActionAttachMagazine);
+		actions.Insert(FirearmActionLoadMultiBullet);
+		actions.Insert(FirearmActionLoadBullet);
+		
+		actions.Insert(ActionLoadMagazineQuick);
+		actions.Insert(FirearmActionAttachMagazineQuick);
+		actions.Insert(FirearmActionMechanicManipulate);
+		actions.Insert(FirearmActionUnjam);
+		
+		actions.Insert(FirearmActionDetachMagazine);		
+		//actions.Insert(ActionAdvancedDetachMagazine);
+		
+		actions.Insert(FirearmActionLoadBulletQuick);
+		actions.Insert(FirearmActionLoadMultiBulletQuick);
+		actions.Insert(FirearmActionLoadMultiBulletRadial);
+
+		actions.Insert(ActionPullBodyFromTransport);
+		
+		actions.Insert(ActionPickupChicken);
+		actions.Insert(ActionSetAlarmClock);
+		actions.Insert(ActionTurnOnAlarmClock);
+		actions.Insert(ActionTurnOffAlarmClock);
+		
+		actions.Insert(ActionAttachWithSwitch);
+		
+		actions.Insert(ActionSetKitchenTimer);
+		actions.Insert(ActionResetKitchenTimer);
+		actions.Insert(ActionUseUndergroundPanel);
+		actions.Insert(ActionUseUndergroundLever);
+		actions.Insert(ActionUnrestrainTargetHands);
+		
+		actions.Insert(ActionCraftBolts);
+		actions.Insert(ActionCraftBoltsFeather);
+		
+		actions.Insert(ActionDeCraftWitchHoodCoif);
+		
+		actions.Insert(ActionDeCraftDrysackBag);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionInput.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionInput.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a2bc845de1cc0da0f9663caea3b4e61a11b95bf
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionInput.c
@@ -0,0 +1,947 @@
+enum ActionInputType
+{
+	AIT_CONTINUOUS,				//React to hold input and release after it
+	AIT_SINGLE,					//React to click input - single use actions
+	AIT_DOUBLECLICK,			//React to double click input - single use actions
+	AIT_HOLDSINGLE,				//React to hold input - single use actions
+	AIT_CLICKCONTINUOUS,		//React to click input for start and click for end
+	AIT_NOINPUTCONTROL,
+	AIT_INVENTORYINPUT,			//Inventory specific actions
+}
+
+class ForcedActionData
+{
+	ActionBase m_Action;
+	ref ActionTarget m_Target;
+	ItemBase m_Item;
+}
+
+class ActionInput : ActionInput_Basic
+{
+	UAIDWrapper m_input;			//Input ID automaticly generated from name.
+	int m_InputType;			//Use from action manager for handling input
+	int m_Priority;
+	bool m_DetectFromItem;		//Can be used action from item in hands?
+	bool m_DetectFromTarget;	//Can be used action from target in vicinity?
+	bool m_DetectFromPlayer;	//Can be used action from player?
+	bool m_Enabled;
+	bool m_JustActivate;
+	bool m_HasTarget;
+	
+	PlayerBase m_Player;
+	
+	ref ActionTarget m_ForcedTarget;
+	
+	ref ForcedActionData m_ForcedActionData;
+	
+	ref ActionTarget m_Target;
+	ItemBase m_MainItem;
+	int m_ConditionMask;
+	
+	bool m_Active;
+	
+	void ActionInput()
+	{
+		m_Active = false;
+		m_Enabled = true;
+		m_ForcedTarget = null;
+		m_ForcedActionData = null;
+		
+		m_HasTarget = false;
+		
+		m_JustActivate = false;
+		m_DetectFromTarget = false;
+		m_DetectFromItem = true;
+		m_DetectFromPlayer = true;
+		
+		m_Priority = 100;
+	}
+	
+	void Init(PlayerBase player, ActionManagerClient am)
+	{
+		m_Player = player;
+		
+		if ( LogManager.IsActionLogEnable())
+		{
+			Debug.ActionLog("n/a",this.ToString(), "n/a","Init()", player.ToString());
+		}
+		
+	}
+	
+	void SetEnablity(bool value)
+	{
+		m_Enabled = value;
+	}
+	
+	protected void SetInput(string input_name)
+	{
+		m_input = GetUApi().GetInputByName(input_name).GetPersistentWrapper();
+		
+		if ( LogManager.IsActionLogEnable())
+		{
+			if (m_input && m_input.InputP())
+				Debug.ActionLog("(+) input set to " + input_name ,this.ToString(), "n/a","SetInput()", "n/a");
+			else
+				Debug.ActionLog("(-) input is not set to " + input_name ,this.ToString(), "n/a","SetInput()","n/a");
+		}
+	}
+	
+	int GetInputType()
+	{
+		return m_InputType;
+	}
+	
+	UAInput GetUAInput()
+	{
+		return m_input.InputP();
+	}
+	
+	bool JustActivate()
+	{
+		return m_JustActivate;
+	}
+
+	bool IsActive()
+	{
+		return m_Active;
+	}
+		
+	bool WasEnded()
+	{
+		return !m_Active;
+	}
+	
+	void Update()
+	{
+		if(	!m_Enabled )
+		{
+			m_Active = false;
+			m_JustActivate = false;
+			return;
+		}
+		
+		switch ( m_InputType )
+		{
+			case ActionInputType.AIT_CONTINUOUS:
+				m_JustActivate = false;
+				if(m_Active)
+				{
+					m_Active = m_input.InputP().LocalHold();
+				}
+				else
+				{
+					m_Active = m_input.InputP().LocalHoldBegin();
+					m_JustActivate = m_Active;
+				}
+				break;
+			case ActionInputType.AIT_SINGLE:
+				m_Active = m_input.InputP().LocalClick();
+				m_JustActivate = m_Active;
+				break;
+			case ActionInputType.AIT_DOUBLECLICK:
+				m_Active = m_input.InputP().LocalDoubleClick();
+				m_JustActivate = m_Active;
+				break;
+			break;
+			case ActionInputType.AIT_HOLDSINGLE:
+				m_Active = m_input.InputP().LocalHoldBegin();
+				m_JustActivate = m_Active;
+				break;
+			break;
+			case ActionInputType.AIT_CLICKCONTINUOUS:
+				m_JustActivate = false;
+				if(m_Active)
+				{
+					if ( m_input.InputP().LocalClick() )
+					{
+						m_Active = false;
+					}
+				}
+				else
+				{
+					m_Active = m_input.InputP().LocalClick();
+					m_JustActivate = m_Active;
+				}
+				break;
+			break;
+			default:
+				break;
+		}
+	}
+	
+	void Reset()
+	{
+		m_Active = false;
+		ActionsSelectReset();
+	}
+	
+	void UpdatePossibleActions(PlayerBase player, ActionTarget target, ItemBase item, int action_condition_mask)
+	{	
+	}
+	
+	ActionBase GetAction()
+	{
+		return NULL;
+	}
+	
+	ActionTarget GetUsedActionTarget()
+	{
+		return m_Target;
+	}
+	
+	ItemBase GetUsedMainItem()
+	{
+		return m_MainItem;
+	}
+	
+	array<ActionBase> GetPossibleActions()
+	{
+		return NULL;
+	}
+	
+	ActionBase GetPossibleAction()
+	{
+		return NULL;
+	}
+	
+	int GetPossibleActionIndex()
+	{
+		return -1;
+	}
+	
+	bool HasTarget()
+	{
+		return false;
+	}
+	
+	void OnActionStart()
+	{
+		ActionsSelectReset();
+	}
+	
+	void OnActionEnd()
+	{
+		Reset();
+	}
+	
+	void ActionsSelectReset()
+	{}
+	
+	void ForceAction(ActionBase action, ActionTarget target, ItemBase item )
+	{
+		m_ForcedActionData = new ForcedActionData;
+		m_ForcedActionData.m_Action = action;
+		m_ForcedActionData.m_Target = target;
+		m_ForcedActionData.m_Item = item;
+	}
+	
+	void ForceActionTarget( ActionTarget target )
+	{
+		m_ForcedTarget = target;
+	}
+	
+	void ClearForcedAction()
+	{
+		m_ForcedActionData = null;
+	}
+	
+	void ClearForcedTarget()
+	{
+		m_ForcedTarget = NULL;
+	}
+	
+	bool ForceActionCheck(PlayerBase player)
+	{
+		if (m_ForcedActionData)
+		{
+			if (m_ForcedActionData.m_Action.Can(player, m_ForcedActionData.m_Target, m_ForcedActionData.m_Item))
+			{
+				m_MainItem = m_ForcedActionData.m_Item;
+				m_Target = m_ForcedActionData.m_Target;
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	void SelectNextAction()
+	{
+	}
+	
+	void SelectPrevAction()
+	{}
+	
+	int GetPossibleActionsCount()
+	{
+		return -1;
+	}
+	
+	bool HasInput()
+	{
+		return m_input != NULL;
+	}
+	
+	int GetPriority()
+	{
+		return m_Priority;
+	}
+}
+
+class StandardActionInput : ActionInput
+{
+	ref array<ActionBase>	m_SelectActions;
+	int 					m_selectedActionIndex;
+	
+	void StandardActionInput(PlayerBase player)
+	{
+		m_selectedActionIndex = 0;
+		m_SelectActions = new array<ActionBase>;
+	}
+	
+	override void ForceAction(ActionBase action, ActionTarget target, ItemBase item )
+	{
+		super.ForceAction(action, target, item);
+
+		m_selectedActionIndex = 0;
+	}
+	
+	void _GetSelectedActions( Object action_source_object, out array<ActionBase> select_actions_all, out bool has_any_action_target)
+	{
+		if ( !action_source_object )
+			return;
+		
+		array<ActionBase_Basic> possible_actions;
+		array<ref ActionBase> variant_actions;
+		action_source_object.GetActions(this.Type(), possible_actions);
+		ActionBase action;
+		
+		if(possible_actions)
+		{
+			for (int i = 0; i < possible_actions.Count(); i++)
+			{
+				action = ActionBase.Cast(possible_actions.Get(i));
+						
+				if ( action.HasVariants() )
+				{
+					action.UpdateVariants( m_MainItem, m_Target.GetObject(), m_Target.GetComponentIndex() );
+					action.GetVariants( variant_actions);
+					for (int j = 0; j < variant_actions.Count(); j++)
+					{
+						action = variant_actions[j];
+						if ( action.Can(m_Player, m_Target, m_MainItem, m_ConditionMask) )
+						{
+							select_actions_all.Insert(action);
+							if (action.HasTarget())
+								has_any_action_target = true;
+						}
+					}
+				}
+				else
+				{
+					if ( action.Can(m_Player, m_Target, m_MainItem, m_ConditionMask) )
+					{
+						select_actions_all.Insert(action);
+						if (action.HasTarget())
+							has_any_action_target = true;
+					}
+				}
+			}
+		}
+	}
+	
+	override void UpdatePossibleActions(PlayerBase player, ActionTarget target, ItemBase item, int action_condition_mask)
+	{
+		if ( ForceActionCheck(player))
+		{
+			m_SelectActions.Clear();
+			m_SelectActions.Insert(m_ForcedActionData.m_Action);
+			return;
+		}
+		
+		if(m_ForcedTarget)
+		{
+			target = m_ForcedTarget;
+		}
+
+		array<ActionBase> select_actions_all = new array<ActionBase>;
+		int i, last_index;
+		bool change = false;
+		m_HasTarget = false;
+		
+		m_MainItem = item;
+		m_Target = target;
+		m_ConditionMask = action_condition_mask;
+		
+		
+		if( m_DetectFromItem )
+		{
+			_GetSelectedActions( item, select_actions_all, m_HasTarget);
+		}
+		
+
+		if( m_DetectFromTarget )
+		{	
+			_GetSelectedActions( target.GetObject(), select_actions_all, m_HasTarget);
+			_GetSelectedActions( target.GetParent(), select_actions_all, m_HasTarget);
+		}
+		
+		if( m_DetectFromPlayer )
+		{
+			_GetSelectedActions( player, select_actions_all, m_HasTarget);
+		}
+		
+		if ( select_actions_all.Count() )
+		{
+			last_index = 0;
+			for ( i = 0; i < select_actions_all.Count(); i++ )
+			{
+				ActionBase action = select_actions_all[i];
+				if ( m_HasTarget )
+				{
+					if ( action.HasTarget() )
+					{
+						if ( m_SelectActions.Count() > last_index )
+						{
+							if ( m_SelectActions[last_index] != action )
+							{
+								change = true;
+								m_SelectActions[last_index] = action;
+							}
+						}
+						else
+						{
+							change = true;
+							m_SelectActions.Insert(action);
+						}
+						action.OnActionInfoUpdate(player, target, item);
+						last_index++;
+					}
+				}
+				else
+				{
+					if ( m_SelectActions.Count() > last_index )
+					{
+						if ( m_SelectActions[last_index] != action )
+						{
+							change = true;
+							m_SelectActions[last_index++] = action;
+						}
+					}
+					else
+					{
+						change = true;
+						m_SelectActions.Insert(action);
+					}
+					action.OnActionInfoUpdate(player, target, item);
+					last_index++;
+				}
+			}
+		}
+		else
+		{
+			m_selectedActionIndex = 0;
+			m_SelectActions.Clear();
+		}
+		
+		if (m_SelectActions.Count() > last_index)
+		{
+			change = true;
+			for (i = last_index; i < m_SelectActions.Count(); i++)
+			{
+				m_SelectActions.Remove(last_index);
+			}
+		}
+		
+		if ( change )
+		{
+			m_selectedActionIndex = 0;
+			m_Player.GetActionManager().SelectFirstActionCategory();
+		}
+	}
+	
+	override array<ActionBase> GetPossibleActions()
+	{
+		return m_SelectActions;
+	}
+	
+	override int GetPossibleActionsCount()
+	{
+		return m_SelectActions.Count();
+	}
+	
+	override bool HasTarget()
+	{
+		return m_HasTarget;
+	}
+	
+	override int GetPossibleActionIndex()
+	{
+		return m_selectedActionIndex;
+	}
+	
+	override ActionBase GetAction()
+	{
+		if (m_SelectActions.Count() > 0)
+			return m_SelectActions[m_selectedActionIndex];
+		return null;
+	}
+	
+	override void ActionsSelectReset()
+	{
+		m_SelectActions.Clear();
+		m_selectedActionIndex = 0;
+	}
+	
+	override void SelectNextAction()
+	{
+		if(m_SelectActions.Count())
+		{
+			m_selectedActionIndex++;
+			if(m_SelectActions.Count() <= m_selectedActionIndex )
+			{
+				m_selectedActionIndex = 0;
+			}
+		}
+	}
+	
+	override void SelectPrevAction()
+	{
+		if(m_SelectActions.Count())
+		{
+			m_selectedActionIndex--;
+			if(0 > m_selectedActionIndex )
+			{
+				m_selectedActionIndex = m_SelectActions.Count() - 1;
+			}
+		}
+	}
+
+}
+
+class ContinuousInteractActionInput : StandardActionInput
+{
+	void ContinuousInteractActionInput(PlayerBase player)
+	{
+		SetInput("UAAction");
+		m_Priority = 60;
+		m_InputType = ActionInputType.AIT_CONTINUOUS;
+		m_DetectFromTarget = true;
+		m_DetectFromItem = false;
+		m_DetectFromPlayer = true;
+	}
+};
+
+class InteractActionInput : ContinuousInteractActionInput
+{
+	void InteractActionInput(PlayerBase player)
+	{
+		m_InputType = ActionInputType.AIT_SINGLE;
+		m_Priority = 80;
+	}
+	
+	override void OnActionStart()
+	{
+		super.OnActionStart();
+		m_Active = false;
+	}
+	
+	override bool WasEnded()
+	{
+		return false;
+	}
+};
+
+class NoIndicationActionInputBase : ActionInput
+{
+	void NoIndicationActionInputBase(PlayerBase player)
+	{
+		m_DetectFromTarget = false;
+	}
+	
+	override void UpdatePossibleActions(PlayerBase player, ActionTarget target, ItemBase item, int action_condition_mask)
+	{
+		m_MainItem = item;
+		m_Target = target;
+		m_ConditionMask = action_condition_mask;
+	}
+	
+	override ActionBase GetAction()
+	{
+		if ( ForceActionCheck(m_Player) )
+			return m_ForcedActionData.m_Action;
+		
+		if(m_MainItem)
+		{
+			array<ActionBase_Basic> possible_actions;
+			ActionBase action;
+			
+			m_MainItem.GetActions(this.Type(), possible_actions);
+			if(possible_actions)
+			{
+				for (int i = 0; i < possible_actions.Count(); i++)
+				{
+					action = ActionBase.Cast(possible_actions.Get(i));
+					if ( action.Can(m_Player, m_Target, m_MainItem, m_ConditionMask) )
+					{
+						return action;
+					}
+				}
+			}
+		
+		}
+		return NULL;
+	}
+
+	override ActionBase GetPossibleAction()
+	{
+		return GetAction();
+	}
+}
+
+
+
+class ContinuousDefaultActionInput : StandardActionInput
+{
+	protected ActionBase m_SelectAction; //Do nothing only for back compatibilit, relevant only for inherited class
+	void ContinuousDefaultActionInput(PlayerBase player)
+	{
+		SetInput("UADefaultAction");
+		m_InputType = ActionInputType.AIT_CONTINUOUS;
+		m_Priority = 20;
+		m_DetectFromTarget = false;
+		m_DetectFromItem = true;
+		m_DetectFromPlayer = true;
+		
+		m_SelectAction = null;
+	}
+	
+	override ActionBase GetPossibleAction()
+	{
+		return m_SelectAction;
+	}
+	
+	override void ActionsSelectReset()
+	{
+		super.ActionsSelectReset();
+		m_SelectAction = NULL;
+	}
+};
+
+class DefaultActionInput : ContinuousDefaultActionInput
+{
+	void DefaultActionInput(PlayerBase player)
+	{
+		m_InputType = ActionInputType.AIT_SINGLE;
+		m_Priority = 40;
+	}
+	
+	override void OnActionStart()
+	{
+		super.OnActionStart();
+		m_Active = false;
+	}
+	
+	override bool WasEnded()
+	{
+		return false;
+	}
+};
+
+class DropActionInput : NoIndicationActionInputBase
+{
+	void DropActionInput(PlayerBase player)
+	{
+		SetInput("UADropitem");
+		m_InputType = ActionInputType.AIT_HOLDSINGLE;
+	}
+};
+
+class CarHornShortActionInput : ContinuousDefaultActionInput
+{
+	ref ActionTarget targetNew;
+
+	void CarHornShortActionInput(PlayerBase player)
+	{
+		SetInput("UACarHorn");
+		m_InputType 		= ActionInputType.AIT_SINGLE;
+		m_Priority 			= 100;
+		m_DetectFromItem 	= false;
+		m_DetectFromTarget	= false;
+		m_DetectFromPlayer	= false;
+	}
+	
+	override void UpdatePossibleActions(PlayerBase player, ActionTarget target, ItemBase item, int action_condition_mask)
+	{
+		if (ForceActionCheck(player))
+		{
+			m_SelectAction = m_ForcedActionData.m_Action;
+			return;
+		}
+		
+		m_SelectAction = null;
+		array<ActionBase_Basic> possibleActions;
+		ActionBase action;
+		int i;
+
+		m_MainItem = null;
+		if (player && player.IsInVehicle())
+		{
+			HumanCommandVehicle vehCommand = player.GetCommand_Vehicle();
+			if (vehCommand)
+			{
+				Transport trans = vehCommand.GetTransport();
+				if (trans)
+				{
+					targetNew = new ActionTarget(trans, null, -1, vector.Zero, -1);
+					ForceActionTarget(targetNew);
+				}
+			}
+			
+			if (!targetNew)
+			{
+				ClearForcedTarget();
+			}
+		}
+		
+		target = m_ForcedTarget;
+		m_Target = m_ForcedTarget;
+		
+		if (target && target.GetObject())
+		{
+			target.GetObject().GetActions(this.Type(), possibleActions);
+			if (possibleActions)
+			{
+				for (i = 0; i < possibleActions.Count(); i++)
+				{
+					action = ActionBase.Cast(possibleActions.Get(i));
+					if (action.Can(player, target, m_MainItem, action_condition_mask))
+					{
+						m_SelectAction = action;
+						return;
+					}
+				}
+			}
+		}
+	}
+	
+	override ActionBase GetAction()
+	{
+		return m_SelectAction;
+	}
+}
+
+class CarHornLongActionInput : CarHornShortActionInput
+{
+	void CarHornLongActionInput(PlayerBase player)
+	{
+		SetInput("UACarHorn");
+		m_InputType 		= ActionInputType.AIT_CONTINUOUS;
+		m_Priority 			= 101;
+		m_DetectFromItem 	= false;
+		m_DetectFromTarget	= false;
+		m_DetectFromPlayer	= false;
+	}
+}
+
+class ToggleLightsActionInput : DefaultActionInput
+{
+	ref ActionTarget target_new;
+	
+	void ToggleLightsActionInput(PlayerBase player)
+	{
+		SetInput("UAToggleHeadlight");
+		m_InputType = ActionInputType.AIT_SINGLE;
+		m_Priority = 100;
+	}
+	
+	override void UpdatePossibleActions(PlayerBase player, ActionTarget target, ItemBase item, int action_condition_mask)
+	{
+		if( ForceActionCheck(player) )
+		{
+			m_SelectAction = m_ForcedActionData.m_Action;
+			return;
+		}
+		//ForceActionTarget(player.m_PlayerLightManager.
+		
+		m_SelectAction = NULL;
+		array<ActionBase_Basic> possible_actions;
+		ActionBase action;
+		int i;
+
+		m_MainItem = NULL;
+		if ( player && !player.IsInVehicle() ) 
+		{
+			Clothing headgear = Clothing.Cast(player.FindAttachmentBySlotName("Headgear"));
+			Clothing eyewear = Clothing.Cast(player.FindAttachmentBySlotName("Eyewear"));
+			//TODO - extend this to allow for a switchable control over all possible light sources (depth 0 or 1 only?)
+			
+			if ( headgear && headgear.GetLightSourceItem() )
+			{
+				target_new = new ActionTarget(headgear, null, -1, vector.Zero, -1);
+				ForceActionTarget(target_new);
+			}
+			else if ( eyewear && eyewear.GetLightSourceItem() )
+			{
+				target_new = new ActionTarget(eyewear, null, -1, vector.Zero, -1);
+				ForceActionTarget(target_new);
+			}
+			else
+				ClearForcedTarget();
+		}
+		else if ( player && player.IsInVehicle() )
+		{
+			HumanCommandVehicle vehCommand = player.GetCommand_Vehicle();
+			if( vehCommand )
+			{
+				Transport trans = vehCommand.GetTransport();
+				if( trans )
+				{
+					target_new = new ActionTarget(trans, null, -1, vector.Zero, -1);
+					ForceActionTarget(target_new);
+				}
+			}
+			
+			if ( !target_new )
+				ClearForcedTarget();
+		}
+		
+		target = m_ForcedTarget;
+		m_Target = m_ForcedTarget;
+		
+		if(target && target.GetObject())
+		{
+			target.GetObject().GetActions(this.Type(), possible_actions);
+			if(possible_actions)
+			{
+				for (i = 0; i < possible_actions.Count(); i++)
+				{
+					action = ActionBase.Cast(possible_actions.Get(i));
+					if ( action.Can(player, target, m_MainItem, action_condition_mask) )
+					{
+						m_SelectAction = action;
+						return;
+					}
+				}
+			}
+		}
+	}
+	
+	override ActionBase GetAction()
+	{
+		return m_SelectAction;
+	}
+};
+
+class ToggleNVGActionInput : DefaultActionInput
+{
+	ref ActionTarget target_new;
+	
+	void ToggleNVGActionInput(PlayerBase player)
+	{
+		SetInput("UAToggleNVG");
+		m_InputType = ActionInputType.AIT_HOLDSINGLE;
+		m_Priority = 100;
+	}
+	
+	override void UpdatePossibleActions(PlayerBase player, ActionTarget target, ItemBase item, int action_condition_mask)
+	{
+		if( ForceActionCheck(player) )
+		{
+			m_SelectAction = m_ForcedActionData.m_Action;
+			return;
+		}
+		//ForceActionTarget(player.m_PlayerLightManager.
+		
+		m_SelectAction = NULL;
+		array<ActionBase_Basic> possible_actions;
+		ActionBase action;
+		int i;
+
+		m_MainItem = NULL;
+		if ( player ) 
+		{
+			Mich2001Helmet helmet = Mich2001Helmet.Cast(player.FindAttachmentBySlotName("Headgear"));
+			NVGHeadstrap headstrap = NVGHeadstrap.Cast(player.FindAttachmentBySlotName("Eyewear"));
+			if ( helmet )
+			{
+				//m_MainItem = Headtorch_ColorBase.Cast(player.FindAttachmentBySlotName("Headgear"));
+				target_new = new ActionTarget(helmet, null, -1, vector.Zero, -1);
+				ForceActionTarget(target_new);
+			}
+			else if ( headstrap )
+			{
+				target_new = new ActionTarget(headstrap, null, -1, vector.Zero, -1);
+				ForceActionTarget(target_new);
+			}
+			else
+				ClearForcedTarget();
+		}
+		
+		target = m_ForcedTarget;
+		m_Target = m_ForcedTarget;
+		
+		if(target && target.GetObject())
+		{
+			target.GetObject().GetActions(this.Type(), possible_actions);
+			if(possible_actions)
+			{
+				for (i = 0; i < possible_actions.Count(); i++)
+				{
+					action = ActionBase.Cast(possible_actions.Get(i));
+					if ( action.Can(player, target, m_MainItem, action_condition_mask) )
+					{
+						m_SelectAction = action;
+						return;
+					}
+				}
+			}
+		}
+	}
+	
+	override ActionBase GetAction()
+	{
+		return m_SelectAction;
+	}
+};
+
+class ContinuousWeaponManipulationActionInput : NoIndicationActionInputBase
+{
+	void ContinuousWeaponManipulationActionInput(PlayerBase player)
+	{
+		SetInput("UAReloadMagazine");
+		m_InputType = ActionInputType.AIT_CONTINUOUS;
+	}
+};
+
+class WeaponManipulationActionInput : NoIndicationActionInputBase
+{	
+	void WeaponManipulationActionInput(PlayerBase player)
+	{
+		SetInput("UAReloadMagazine");
+		m_InputType = ActionInputType.AIT_SINGLE;
+	}
+};
+
+class ExternalControlledActionInput : NoIndicationActionInputBase
+{	
+	void ExternalControlledActionInput(PlayerBase player)
+	{
+		//SetInput("UAReloadMagazine");
+		m_InputType = ActionInputType.AIT_NOINPUTCONTROL;
+	}
+};
+
+class InventoryOnlyActionInput : NoIndicationActionInputBase
+{	
+	void InventoryOnlyActionInput(PlayerBase player)
+	{
+		//SetInput("UAReloadMagazine");
+		m_InputType = ActionInputType.AIT_INVENTORYINPUT;
+	}
+};
+
+class QuickaBarActionInput : ExternalControlledActionInput
+{	
+};
+
+
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..209fb2900cb7ce744f40ef365eb89830060235b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerBase.c
@@ -0,0 +1,307 @@
+class TSelectableActionInfoArray extends array<ref TSelectableActionInfo>
+{
+	bool IsSameAs(TSelectableActionInfoArray other)
+	{
+		if (this.Count() != other.Count())
+		{
+			return false;
+		}
+		
+		for (int i = 0; i < Count(); ++i)
+		{
+			TSelectableActionInfo ai1 = this.Get(i);
+			TSelectableActionInfo ai2 = other.Get(i);
+			
+			if (ai1.param2 != ai2.param2)
+			{
+				return false;
+			}
+			
+			if (ai1.param3 != ai2.param3)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+}
+
+class ActionManagerBase
+{
+	PlayerBase									m_Player;
+	
+	protected ActionTarget						m_TestedActionTarget;
+	protected ItemBase							m_TestedActionItem;
+		
+	protected ActionBase						m_PrimaryAction;
+	protected ActionTarget						m_PrimaryActionTarget;
+	protected ItemBase							m_PrimaryActionItem;
+	protected ActionBase						m_SecondaryAction;
+	protected ActionTarget						m_SecondaryActionTarget;
+	protected ItemBase							m_SecondaryActionItem;
+	bool										m_PrimaryActionEnabled;
+	bool										m_SecondaryActionEnabled;
+	bool										m_TertiaryActionEnabled;
+	ref TSelectableActionInfoArray				m_SelectableActions;
+	int                             			m_SelectedActionIndex;
+	bool                            			m_SelectableActionsHasChanged;
+	bool										m_Interrupted;
+	static ref array<ref ActionBase>			m_ActionsArray;
+	static ref map<typename, ActionBase>		m_ActionNameActionMap;
+	protected bool								m_ActionWantEndRequest;
+	protected bool								m_ActionInputWantEnd;
+	protected bool								m_ActionsEnabled;
+	protected bool								m_ActionsAvaibale;
+		
+	//Pending actions waiting for acknowledgment
+	protected int 					m_PendingActionAcknowledgmentID;
+	
+	protected ref ActionData		m_CurrentActionData;
+
+	void ActionManagerBase(PlayerBase player)
+	{
+		m_Player = player;
+		if (m_Player)
+		{
+			m_SelectableActions = new TSelectableActionInfoArray();
+			m_SelectedActionIndex = 0;
+			m_SelectableActionsHasChanged = false;
+			
+			m_PendingActionAcknowledgmentID = -1;
+			
+			m_CurrentActionData = NULL;
+			m_Interrupted = false;
+			
+			ActionConstructor ac = new ActionConstructor();
+			if (!m_ActionsArray)
+			{
+				ac.ConstructActions(m_ActionsArray, m_ActionNameActionMap);
+			}
+
+			m_ActionWantEndRequest = false;
+			m_ActionInputWantEnd = false;
+		}
+		
+		m_ActionsEnabled = true;
+		m_ActionsAvaibale = true;
+	}
+	
+	ActionBase GetRunningAction()
+	{
+		if (m_CurrentActionData)
+			return m_CurrentActionData.m_Action;
+		
+		return null;
+	}
+	
+	ItemBase GetRunningActionMainitem()
+	{
+		if (m_CurrentActionData)
+			return m_CurrentActionData.m_MainItem;
+		
+		return null;
+	}
+	
+	void EnableActions(bool enable)
+	{
+		m_ActionsEnabled = enable;
+	}
+
+	void Update(int pCurrentCommandID)
+	{
+		if (m_CurrentActionData)
+		{
+			if (m_Interrupted)
+			{
+				LocalInterrupt();
+			}
+			else if (m_CurrentActionData.m_State != UA_AM_PENDING && m_CurrentActionData.m_State != UA_AM_REJECTED && m_CurrentActionData.m_State != UA_AM_ACCEPTED)
+			{
+				m_CurrentActionData.m_Action.OnUpdate(m_CurrentActionData);
+			}
+		}
+		else if (m_Interrupted)
+		{
+			m_Interrupted = false;
+		}
+	}
+	
+	void OnSyncJuncture(int pJunctureID, ParamsReadContext pCtx)
+	{
+		int AcknowledgmentID;
+		switch (pJunctureID)
+		{
+			case DayZPlayerSyncJunctures.SJ_ACTION_ACK_ACCEPT:
+				pCtx.Read(AcknowledgmentID);
+				if (m_CurrentActionData && AcknowledgmentID == m_PendingActionAcknowledgmentID)
+					m_CurrentActionData.m_State = UA_AM_ACCEPTED;
+				break;
+			case DayZPlayerSyncJunctures.SJ_ACTION_ACK_REJECT:
+				pCtx.Read(AcknowledgmentID);
+				if (m_CurrentActionData && AcknowledgmentID == m_PendingActionAcknowledgmentID)
+					m_CurrentActionData.m_State = UA_AM_REJECTED;
+				break;
+			case DayZPlayerSyncJunctures.SJ_ACTION_INTERRUPT:
+				m_Interrupted = true;
+				break;
+		}
+	}
+		
+	ActionTarget FindActionTarget();
+	void StartDeliveredAction();
+	
+	static ActionBase GetActionVariant(typename actionName)
+	{
+		if (m_ActionNameActionMap)
+		{
+			ActionBase base_action = m_ActionNameActionMap.Get(actionName);
+			ActionBase new_action = ActionBase.Cast(actionName.Spawn());
+			
+			new_action.CreateConditionComponents();
+			new_action.SetID(base_action.GetID());
+			new_action.SetInput(base_action.GetInput());
+			
+			return new_action;
+		}
+		return null;
+	}
+	
+	static ActionBase GetAction(typename actionName)
+	{
+		if (m_ActionNameActionMap)
+			return m_ActionNameActionMap.Get(actionName);
+		
+		return null;
+	}
+	
+	static ActionBase GetAction(int actionID)
+	{
+		return m_ActionsArray.Get(actionID);
+	}
+	
+	ActionBase GetContinuousAction()
+	{
+		return m_PrimaryAction;
+	}
+	
+	ActionBase GetSingleUseAction()
+	{
+		return m_SecondaryAction;
+	}
+	
+	TSelectableActionInfoArray GetSelectableActions()
+	{
+		return m_SelectableActions;
+	}
+
+	int GetSelectedActionIndex()
+	{
+		return m_SelectedActionIndex;
+	}
+	
+	typename GetSelectedActionCategory();
+	void SelectFirstActionCategory();
+	void SelectNextActionCategory();
+	void SelectPrevActionCategory();
+	void SelectNextAction();
+	void SelectPrevAction();
+	void RequestEndAction();
+	void EndActionInput();
+	
+	bool IsSelectableActionsChanged()
+	{
+		return m_SelectableActionsHasChanged;
+	}
+
+	//------------------------------------------------------
+	bool ActionPossibilityCheck(int pCurrentCommandID)
+	{	
+		if (!m_ActionsEnabled || m_Player.IsSprinting() || m_Player.IsUnconscious() || m_Player.GetCommandModifier_Action() || m_Player.GetCommand_Action() || m_Player.IsEmotePlaying() || m_Player.GetThrowing().IsThrowingAnimationPlaying() || m_Player.GetDayZPlayerInventory().IsProcessing() || m_Player.IsItemsToDelete())
+			return false;
+		
+		if (m_Player.GetWeaponManager().IsRunning())
+			return false;
+		
+		return (pCurrentCommandID == DayZPlayerConstants.COMMANDID_ACTION || pCurrentCommandID == DayZPlayerConstants.COMMANDID_MOVE || pCurrentCommandID == DayZPlayerConstants.COMMANDID_SWIM || pCurrentCommandID == DayZPlayerConstants.COMMANDID_LADDER || pCurrentCommandID == DayZPlayerConstants.COMMANDID_VEHICLE);
+	}	
+	//------------------------------------------------------
+	protected void SetActionContext(ActionTarget target, ItemBase item)
+	{
+		m_TestedActionTarget = target;
+		m_TestedActionItem = item;
+	}
+	
+	//------------------------------------------------------
+		
+	int GetActionState(ActionBase action)
+	{
+		if (m_CurrentActionData)
+		{
+			return m_CurrentActionData.m_State;
+		}
+		return UA_NONE;
+	}
+	
+	//---------------------------------
+	// EVENTS
+	//---------------------------------
+	void OnContinuousStart();
+	void OnContinuousCancel();
+	void OnSingleUse();
+	void Interrupt();
+
+	protected void LocalInterrupt()
+	{
+		if (m_CurrentActionData && m_CurrentActionData.m_Action)
+			m_CurrentActionData.m_Action.Interrupt(m_CurrentActionData);
+		else
+			m_Interrupted = false;
+	} 
+	
+	void OnInteractAction(); //Interact
+	void OnInstantAction(typename user_action_type, Param data = null);
+	
+	void OnActionEnd()
+	{
+		if (LogManager.IsActionLogEnable())
+		{
+			if (m_CurrentActionData)
+				Debug.ActionLog("n/a", m_CurrentActionData.m_Action.ToString() , "n/a", "OnActionEnd", m_CurrentActionData.m_Player.ToString());
+			Debug.ActionLog("Action data cleared ", this.ToString() , "n/a", "ActionEnd", m_CurrentActionData.m_Player.ToString());
+		}
+		if (m_CurrentActionData)
+			m_CurrentActionData.m_Action.ActionCleanup(m_CurrentActionData);
+		m_CurrentActionData = NULL;
+		
+		m_Player.ResetActionEndInput();
+	}
+	
+	void OnJumpStart();
+
+	bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{
+		return false;
+	}
+	
+	float GetActionComponentProgress()
+	{
+		if (m_CurrentActionData)
+			return m_CurrentActionData.m_Action.GetProgress(m_CurrentActionData);
+
+		return 0.0;
+	}
+	
+	int GetActionState()
+	{
+		if (m_CurrentActionData)
+			return m_CurrentActionData.m_Action.GetState(m_CurrentActionData);
+
+		return UA_NONE;
+	}
+	
+	ActionReciveData GetReciveData()
+	{
+		return null;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerClient.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d84ae9efda86d1ea7f273e1b9e0dd893711245b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerClient.c
@@ -0,0 +1,1286 @@
+typedef map<typename,ref array<ActionBase_Basic>>		TInputActionMap;
+typedef map<typename,ref ActionInput>					TTypeNameActionInputMap;
+
+class ActionManagerClient: ActionManagerBase 
+{
+	
+	//Last send AcknowledgmentID (client can send more requests before recive ackfor first action)
+	protected int 								m_LastAcknowledgmentID;
+	protected bool								m_ActionPossible;
+	protected ref array<ref InventoryLocation>	m_ReservedInventoryLocations;
+	protected ref InventoryActionHandler		m_InventoryActionHandler;
+	protected ref InventoryLocation				m_HandInventoryLocationTest;
+	protected ref TTypeNameActionInputMap		m_RegistredInputsMap;
+	protected ref array<ActionInput>			m_OrederedAllActionInput;
+	protected ref array<ActionInput>			m_OrderedStandartActionInputs;
+	protected ref array<ActionInput>			m_DefaultOrderOfActionInputs;
+	protected int 								m_SelectedActionInputToSrollIndex;
+	
+	protected ref ActionData 					m_PendingActionData;
+
+	protected bool 								m_ActionWantEndRequest_Send;		//Request to server was sended
+	protected bool								m_ActionInputWantEnd_Send;	
+
+	void ActionManagerClient(PlayerBase player) 
+	{
+		m_HandInventoryLocationTest = new InventoryLocation;
+		m_HandInventoryLocationTest.SetHands(player,null);
+		m_LastAcknowledgmentID = 1;
+		m_Targets	= new ActionTargets(player);
+		m_ReservedInventoryLocations = new array<ref InventoryLocation>;
+		m_InventoryActionHandler = new InventoryActionHandler(player);
+
+		m_ActionWantEndRequest_Send = false;
+		m_ActionInputWantEnd_Send = false;
+		RegisterInputs(player);
+		m_SelectedActionInputToSrollIndex = 0;
+	}
+	
+	//pCurrentCommandID is command ID at time of call command handler, some called methods can change actual true value (need call m_Player.GetCurrentCommandID() for actual command ID)
+	override void Update(int pCurrentCommandID)
+	{
+		m_InventoryActionHandler.OnUpdate();
+		super.Update(pCurrentCommandID);
+		int currentCommandID = m_Player.GetCurrentCommandID();
+		m_ActionPossible = ActionPossibilityCheck(currentCommandID);
+		
+		if (m_PendingActionData) //SP only
+		{
+			m_CurrentActionData = m_PendingActionData;
+			
+			m_CurrentActionData.m_Action.Start(m_CurrentActionData);
+			
+			if (m_CurrentActionData.m_Action.IsInstant())
+				OnActionEnd();
+			
+			m_PendingActionData = null;
+		}
+		
+		if (m_CurrentActionData)
+		{
+			if (m_CurrentActionData.m_State != UA_AM_PENDING && m_CurrentActionData.m_State != UA_AM_REJECTED && m_CurrentActionData.m_State != UA_AM_ACCEPTED)
+				m_CurrentActionData.m_Action.OnUpdateClient(m_CurrentActionData);
+			
+			switch (m_CurrentActionData.m_State)
+			{
+				case UA_AM_PENDING:
+					break;
+			
+				case UA_AM_ACCEPTED:
+					int condition_mask = ActionBase.ComputeConditionMask(m_Player, m_CurrentActionData.m_Target, m_CurrentActionData.m_MainItem);
+					
+					m_CurrentActionData.m_Action.ClearInventoryReservationEx(m_CurrentActionData);
+					bool can_be_action_done = ((condition_mask & m_CurrentActionData.m_Action.m_ConditionMask) == condition_mask);
+					// check currentCommandID before start or reject 
+					if (m_ActionPossible && can_be_action_done && currentCommandID != DayZPlayerConstants.COMMANDID_SWIM)
+					{
+						m_CurrentActionData.m_Action.InventoryReservation(m_CurrentActionData);
+						m_CurrentActionData.m_State = UA_START;
+						m_CurrentActionData.m_Action.Start(m_CurrentActionData);
+						
+						if (m_CurrentActionData.m_Action.IsInstant())
+							OnActionEnd();
+					}
+					else
+					{
+						OnActionEnd();
+					}
+					m_PendingActionAcknowledgmentID = -1;
+					break;
+				
+				case UA_AM_REJECTED:
+					OnActionEnd();
+					m_PendingActionAcknowledgmentID = -1;
+					break;
+			
+				default:
+					ProcessActionRequestEnd();
+					ProcessActionInputEnd();
+				break;
+			}
+		}
+		
+#ifdef DEVELOPER
+		if (DeveloperFreeCamera.IsFreeCameraEnabled())
+		{
+			m_ActionPossible = false;
+			ResetInputsActions();
+		}
+		else
+		{
+#endif
+			if (!m_CurrentActionData)
+			{
+				bool isMenuOpen = false;	
+#ifndef NO_GUI
+				isMenuOpen = GetGame().GetUIManager().IsMenuOpen(MENU_INVENTORY);
+#endif
+				if (m_Player.IsRaised() || isMenuOpen)
+				{
+					m_Targets.Clear();
+				}
+				else
+				{
+					m_Targets.Update();
+				}
+				FindContextualUserActions(currentCommandID);	
+			}
+		
+			InputsUpdate();
+#ifdef DEVELOPER
+		}
+#endif		
+
+	}
+	
+	void RegisterInputs(PlayerBase player)
+	{
+		if (!m_RegistredInputsMap)
+		{
+			m_RegistredInputsMap = new TTypeNameActionInputMap;
+
+			for (int i = 0; i < m_ActionsArray.Count(); i++)
+			{	
+				ActionBase action = m_ActionsArray.Get(i);
+				typename input_type_name = action.GetInputType();
+				ref ActionInput ai;
+			
+				ai = ActionInput.Cast(m_RegistredInputsMap.Get(input_type_name));
+				if (!ai)
+				{
+					ai = ActionInput.Cast(input_type_name.Spawn());
+					m_RegistredInputsMap.Insert(input_type_name, ai);
+				}
+				action.SetInput(ai);
+			}
+		
+			for (int j = 0; j < m_RegistredInputsMap.Count(); j++)
+			{
+				m_RegistredInputsMap.GetElement(j).Init(player, this);
+			}
+			SetActioninputOrder();
+		}
+		
+	}
+	
+	//Set order of inputs base of priority (output -> m_OrederedAllActionInput)
+	void SetActioninputOrder()
+	{
+		int i, j;
+		int priority;
+		ActionInput input;
+		m_OrederedAllActionInput = new array<ActionInput>;
+		
+		map<int, ref array<ActionInput>> temp_map_for_sort = new map<int, ref array<ActionInput>>;
+		array<int> array_of_priorities_to_sort = new array<int>;
+		ref array<ActionInput> same_priority_input_array;
+		
+		for (i = 0; i < m_RegistredInputsMap.Count(); i++)
+		{
+			input = m_RegistredInputsMap.GetElement(i);
+			priority = input.GetPriority();
+			same_priority_input_array = temp_map_for_sort.Get(priority);
+			if (same_priority_input_array)
+			{
+				same_priority_input_array.Insert(input);
+				continue;
+			}
+			
+			same_priority_input_array = new array<ActionInput>;
+			same_priority_input_array.Insert(input);
+			temp_map_for_sort.Insert(priority,same_priority_input_array);
+			array_of_priorities_to_sort.Insert(priority);
+		}
+		array_of_priorities_to_sort.Sort();
+		
+		for (i = 0; i < array_of_priorities_to_sort.Count(); i++)
+		{
+			priority = array_of_priorities_to_sort[i];
+			same_priority_input_array = temp_map_for_sort.Get(priority);
+			for (j = 0; j < same_priority_input_array.Count(); j++)
+			{
+				input = same_priority_input_array.Get(j);
+				m_OrederedAllActionInput.Insert(input);
+			}
+		}
+	
+		SetDefaultInputsOrder();
+	}
+	
+	//Order for user action inputs - will be dynamically change base on context (more complex handling viz set m_OrderedStandartActionInputs in UpdateActionCategoryPriority())
+	void SetDefaultInputsOrder()
+	{
+		int i, j;
+		m_DefaultOrderOfActionInputs = new array<ActionInput>;
+		m_OrderedStandartActionInputs = new array<ActionInput>;
+		ActionInput input = m_RegistredInputsMap.Get(ContinuousDefaultActionInput);
+		if (input)
+		{
+			m_OrderedStandartActionInputs.Insert(input);
+		}
+
+		input = m_RegistredInputsMap.Get(DefaultActionInput);
+		if (input)
+		{
+			m_OrderedStandartActionInputs.Insert(input);
+		}
+		
+		input = m_RegistredInputsMap.Get(ContinuousInteractActionInput);
+		if (input)
+		{
+			m_OrderedStandartActionInputs.Insert(input);
+		}
+		
+		input = m_RegistredInputsMap.Get(InteractActionInput);
+		if (input)
+		{
+			m_OrderedStandartActionInputs.Insert(input);
+		}
+		
+		for (i = 0; i < m_OrederedAllActionInput.Count(); i++)
+		{
+			for (j = 0; j < m_OrderedStandartActionInputs.Count(); j++)
+			{
+				if (m_OrederedAllActionInput[i] == m_OrderedStandartActionInputs[j])
+				{
+					m_DefaultOrderOfActionInputs.Insert(m_OrederedAllActionInput[i]);
+					break;
+				}
+			}
+		}
+	}
+	
+	static ActionVariantManager GetVariantManager(typename actionName)
+	{
+		ActionBase action = GetAction(actionName);
+		if (action)
+		{
+			return action.GetVariantManager();
+		}
+		//VME ACTION not exist typo most likely
+		return null;
+	}
+	
+	override void RequestEndAction()
+	{
+		if (!m_ActionWantEndRequest_Send)
+		{
+			m_ActionWantEndRequest = true;
+		}
+	}
+	
+	override void EndActionInput()
+	{
+		if (!m_ActionInputWantEnd_Send)
+		{
+			m_ActionInputWantEnd = true;
+		}
+	}
+	
+	void InputsUpdate()
+	{
+		ActionInput ain;
+		if (m_CurrentActionData)
+		{
+			if (!m_ActionInputWantEnd)
+			{
+				ActionInput ai = m_CurrentActionData.m_Action.GetInput();
+				ai.Update();
+				if (m_Player.IsQBControl())
+				{
+					if (ai.JustActivate())
+						m_Player.SetActionEndInput(m_CurrentActionData.m_Action);
+				}
+				else
+				{
+					if (ai.WasEnded() && (ai.GetInputType() == ActionInputType.AIT_CONTINUOUS || ai.GetInputType() == ActionInputType.AIT_CLICKCONTINUOUS))
+					{
+						EndActionInput();
+					}
+				}
+			}
+		}
+		else
+		{
+			if (m_ActionsAvaibale)
+			{
+				for (int i = 0; i < m_OrederedAllActionInput.Count();i++)
+				{
+					
+					ain = m_OrederedAllActionInput[i];
+					ain.Update();
+				
+					if (ain.JustActivate())
+					{
+						ActionBase action = ain.GetAction();
+						if (action)
+						{
+							ActionStart(action, ain.GetUsedActionTarget(), ain.GetUsedMainItem());
+							break;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	void ProcessActionRequestEnd()
+	{
+		if (m_ActionWantEndRequest)
+		{
+			if (GetGame().IsMultiplayer() && !m_CurrentActionData.m_Action.IsLocal())
+			{
+				if (!m_ActionWantEndRequest_Send && ScriptInputUserData.CanStoreInputUserData())
+				{
+					if (LogManager.IsActionLogEnable())
+					{	
+						Debug.ActionLog("Time stamp: " + m_Player.GetSimulationTimeStamp(), m_CurrentActionData.m_Action.ToString() , "n/a", "EndRequest", m_CurrentActionData.m_Player.ToString());
+					}
+					ScriptInputUserData ctx = new ScriptInputUserData;
+					ctx.Write(INPUT_UDT_STANDARD_ACTION_END_REQUEST);
+					ctx.Send();
+					
+					m_ActionWantEndRequest_Send = true;
+						
+					m_ActionWantEndRequest = false;
+					m_CurrentActionData.m_Action.EndRequest(m_CurrentActionData);
+				}
+			}
+			else
+			{
+				m_ActionWantEndRequest = false;
+				m_CurrentActionData.m_Action.EndRequest(m_CurrentActionData);
+			}
+		}
+	}
+	
+	void ProcessActionInputEnd()
+	{
+		if (m_ActionInputWantEnd)
+		{
+			if (GetGame().IsMultiplayer() && !m_CurrentActionData.m_Action.IsLocal())
+			{
+				if (!m_ActionInputWantEnd_Send && ScriptInputUserData.CanStoreInputUserData())
+				{
+					if (LogManager.IsActionLogEnable())
+					{
+						Debug.ActionLog("Time stamp: " + m_Player.GetSimulationTimeStamp(), m_CurrentActionData.m_Action.ToString() , "n/a", "EndInput", m_CurrentActionData.m_Player.ToString());
+					}
+					ScriptInputUserData ctxi = new ScriptInputUserData;
+					ctxi.Write(INPUT_UDT_STANDARD_ACTION_INPUT_END);
+					ctxi.Send();
+					
+					m_ActionInputWantEnd_Send = true;
+						
+					m_ActionInputWantEnd = false;
+					m_CurrentActionData.m_Action.EndInput(m_CurrentActionData);
+				}
+			}
+			else
+			{
+				if (!m_ActionInputWantEnd_Send)
+				{
+					m_ActionInputWantEnd_Send = true;
+					m_ActionInputWantEnd = false;
+					m_CurrentActionData.m_Action.EndInput(m_CurrentActionData);
+				}
+			}
+		}
+	}
+	
+	ActionBase GetPossibleAction(typename inputType)
+	{
+		ActionInput action_input = m_RegistredInputsMap.Get(inputType);
+		if (action_input)
+		{
+			return action_input.GetAction();
+		}
+		return NULL;
+	}
+	
+	array<ActionBase> GetPossibleActions(typename inputType)
+	{
+		ActionInput action_input = m_RegistredInputsMap.Get(inputType);
+		if (action_input)
+		{
+			return action_input.GetPossibleActions();
+		}
+		return NULL;
+	}
+	
+	int GetPossibleActionIndex(typename inputType)
+	{
+		ActionInput action_input = m_RegistredInputsMap.Get(inputType);
+		if (action_input)
+		{
+			return action_input.GetPossibleActionIndex();
+		}
+		return -1;
+	}
+	
+	int GetPossibleActionCount(typename inputType)
+	{
+		ActionInput action_input = m_RegistredInputsMap.Get(inputType);
+		if (action_input)
+		{
+			return action_input.GetPossibleActionsCount();
+		}
+		return 0;
+	}
+
+	//--------------------------------------------------------
+	// Alows to set different action to current contextual one
+	//--------------------------------------------------------	
+	void InjectAction(ActionBase action, ActionTarget target, ItemBase item)
+	{
+		ActionInput ai = action.GetInput();
+		ai.ForceAction(action, target, item);
+	}
+	
+	void InjectAction(typename actionType, ActionTarget target, ItemBase item)
+	{
+		ActionBase action = GetAction(actionType);
+		InjectAction(action, target, item);
+	}
+	
+	void EjectAction(ActionBase action)
+	{
+		ActionInput ai = action.GetInput();
+		ai.ClearForcedAction();
+	}
+	
+	void EjectAction(typename actionType)
+	{
+		ActionBase action = GetAction(actionType);
+		EjectAction(action);
+	}
+		
+	void ForceTarget(Object targetObject)
+	{
+		Object parent = null;
+		EntityAI targetEntity = EntityAI.Cast(targetObject);
+		if (targetEntity)
+			parent = targetEntity.GetHierarchyParent();
+		m_ForceTarget = new ActionTarget(targetObject, parent, -1, vector.Zero, -1);
+	}
+	
+	void ClearForceTarget()
+	{
+		m_ForceTarget = NULL;
+	}
+	
+			
+	//-------------------------------------------------------------------------
+	override ActionTarget FindActionTarget()
+	{
+		if (m_ForceTarget)
+			return m_ForceTarget;
+		
+		ActionTarget action_target;
+		action_target = NULL;
+		int targetsCount = m_Targets.GetTargetsCount();
+		if (targetsCount)
+		{
+			for (int i = 0; i < targetsCount; ++i)
+			{
+				action_target = m_Targets.GetTarget(i);
+				Object targetObject = action_target.GetObject();
+				Object targetParent = action_target.GetParent();
+				
+				if (targetParent)
+				{
+					break;
+				}
+				
+				if (targetObject)
+				{
+					break;
+				}
+			}
+		}
+		else
+		{
+			action_target = new ActionTarget(null, null, -1, vector.Zero, -1);
+		}
+		return action_target;
+	}
+	
+	ItemBase FindActionItem()
+	{
+		ItemBase item;
+		if (m_Player && m_Player.GetItemInHands() && m_Player.GetItemInHands().IsItemBase()) 
+		{
+			item = m_Player.GetItemInHands();
+		}
+		return item;
+	}
+	
+	protected bool HasHandInventoryReservation()
+	{
+		m_HandInventoryLocationTest.SetHands(m_Player,m_Player.GetItemInHands());
+		if (m_Player.GetHumanInventory().HasInventoryReservation(m_Player.GetItemInHands(),m_HandInventoryLocationTest))
+			return true;
+		return false;
+	}
+	
+	protected void FindContextualUserActions(int pCurrentCommandID)
+	{
+		// TODO: NEEDS OPTIMIZATION (focus on UpdatePossibleActions > CraftingManager::OnUpdate)
+		
+		m_ActionsAvaibale = false;
+		if (!m_ActionPossible || HasHandInventoryReservation() || GetGame().IsInventoryOpen())
+		{
+			ResetInputsActions();
+			return;
+		}
+		
+		if (!GetRunningAction())
+		{	
+			ActionBase action;
+			ActionTarget 	target;
+			ItemBase 		item;
+
+			// Gathering current inputs
+			m_ActionsAvaibale = true;
+			
+			item = FindActionItem();
+			target = FindActionTarget();
+			
+			int actionConditionMask = ActionBase.ComputeConditionMask(m_Player,target,item);
+			for (int i = 0; i < m_OrederedAllActionInput.Count();i++)
+			{
+				ActionInput ain = m_OrederedAllActionInput[i];
+				ain.UpdatePossibleActions(m_Player,target,item, actionConditionMask);
+			}
+			SetActionContext(target,item);
+		}
+	}
+	
+	//TOOD MW In progress
+	protected bool LockInventory(ActionData action_data)
+	{
+		bool success = false;
+		if (action_data.m_Action.IsInstant())
+		{
+			if (LogManager.IsActionLogEnable())
+			{
+				Debug.ActionLog("(-) Inventory lock - Not Used", action_data.m_Action.ToString() , "n/a", "LockInventory", action_data.m_Player.ToString());
+			}
+			success = true;
+		}
+		else
+		{
+			if (LogManager.IsActionLogEnable())
+			{
+				Debug.ActionLog("(X) Inventory lock", action_data.m_Action.ToString() , "n/a", "LockInventory", action_data.m_Player.ToString());
+			}
+			if (action_data.m_Action)
+			{
+				success = action_data.m_Action.InventoryReservation(action_data);
+			}
+		}
+		return success;
+	}
+	void UnlockInventory(ActionData action_data)
+	{
+		if (LogManager.IsActionLogEnable())
+		{
+			Debug.ActionLog("(O) Inventory unlock", action_data.m_Action.ToString() , "n/a", "UnlockInventory", action_data.m_Player.ToString());
+		}
+		if (action_data.m_Action)
+			action_data.m_Action.ClearInventoryReservationEx(action_data);
+	}
+	
+	protected void ActionStart(ActionBase action, ActionTarget target, ItemBase item, Param extra_data = NULL)
+	{
+		if (!m_CurrentActionData && action) 
+		{
+			m_ActionWantEndRequest_Send = false;
+			m_ActionInputWantEnd_Send = false;
+			m_ActionWantEndRequest = false;
+			m_ActionInputWantEnd = false;
+			
+			if (action.CanBePerformedFromQuickbar())
+				m_Player.SetActionEndInput(action);
+			
+			HandleInputsOnActionStart(action);
+
+			if (LogManager.IsActionLogEnable())
+			{
+				if ( target )
+				{
+					Debug.ActionLog("Item = " + item + ", " + target.DumpToString(), action.ToString() , "n/a", "ActionStart", m_Player.ToString());
+				}
+				else
+				{
+					Debug.ActionLog("Item = " + item + ", no target", action.ToString() , "n/a", "ActionStart", m_Player.ToString());
+				}
+			}
+			m_Interrupted = false;
+			if (GetGame().IsMultiplayer() && !action.IsLocal())
+			{
+				if (!ScriptInputUserData.CanStoreInputUserData())
+				{
+					DPrint("ScriptInputUserData already posted - ActionManagerClient");
+					
+					if (LogManager.IsActionLogEnable())
+					{
+						Debug.ActionLog("Cannot start because ScriptInputUserData is already used", action.ToString() , "n/a", "ActionStart", m_Player.ToString());
+					}
+					return;
+				}
+			}
+			
+			if (!action.SetupAction(m_Player, target, item, m_CurrentActionData, extra_data))
+			{
+				DPrint("Can not inicialize action" + action + " - ActionManagerClient");
+				m_CurrentActionData = NULL;
+				return;
+			}
+			
+			if (LogManager.IsActionLogEnable())
+			{
+				Debug.ActionLog("Action data created wait to start", action.ToString() , "n/a", "ActionStart", m_Player.ToString());
+			}
+
+			if (GetGame().IsMultiplayer() && !action.IsLocal())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_STANDARD_ACTION_START);
+				ctx.Write(action.GetID());
+
+				action.WriteToContext(ctx, m_CurrentActionData);
+					
+				if (action.UseAcknowledgment())
+				{
+					m_CurrentActionData.m_State = UA_AM_PENDING;
+					m_PendingActionAcknowledgmentID = ++m_LastAcknowledgmentID;
+						
+					ctx.Write(m_PendingActionAcknowledgmentID);
+				}
+					
+				ctx.Send();
+					
+				if (!action.UseAcknowledgment())
+				{
+					action.Start(m_CurrentActionData);
+					if (action.IsInstant())
+						OnActionEnd();
+				}
+			}
+			else
+			{
+				action.Start(m_CurrentActionData);
+				if (action.IsInstant())
+					OnActionEnd();
+			}
+		}
+	}
+
+	void HandleInputsOnActionStart(ActionBase action)
+	{
+		for (int i = 0; i < m_OrederedAllActionInput.Count();i++)
+		{
+			ActionInput ain = m_OrederedAllActionInput[i];
+			if (action.GetInput() == ain)
+			{
+				ain.OnActionStart();
+			}
+			else
+			{
+				ain.Reset();
+			}
+		}
+	}
+	
+	void HandleInputsOnActionEnd()
+	{
+		ResetInputsState();
+	}
+	
+	void ResetInputsState()
+	{
+		for (int i = 0; i < m_OrederedAllActionInput.Count();i++)
+		{
+			ActionInput ain = m_OrederedAllActionInput[i];
+			ain.Reset();
+		}
+	}
+	
+	void ResetInputsActions()
+	{
+		for (int i = 0; i < m_OrederedAllActionInput.Count();i++)
+		{
+			ActionInput ain = m_OrederedAllActionInput[i];
+			ain.ActionsSelectReset();
+		}
+	}
+
+	override void OnJumpStart()
+	{
+		if (m_CurrentActionData)
+		{
+			if (m_CurrentActionData.m_State == UA_AM_PENDING || m_CurrentActionData.m_State == UA_AM_REJECTED || m_CurrentActionData.m_State == UA_AM_ACCEPTED)
+			{
+				OnActionEnd();
+				m_PendingActionAcknowledgmentID = -1;
+			}
+			else
+			{
+				m_CurrentActionData.m_Action.Interrupt(m_CurrentActionData);
+			}
+		}
+	}
+	
+	//Instant Action (Debug Actions) ---------------------------------
+	override void OnInstantAction(typename user_action_type, Param data = NULL)
+	{
+		ActionBase action = GetAction(user_action_type);
+		if (action)
+		{
+			ActionStart(action,NULL,NULL, data);
+		}
+	}
+	
+#ifdef BOT
+	/// used for bots
+	void PerformAction(int user_action_id, ActionTarget target, ItemBase item, Param extraData = NULL)
+	{
+		ActionStart(GetAction(user_action_id), target, item, extraData);
+	}
+#endif
+	
+	void PerformActionStart(ActionBase action, ActionTarget target, ItemBase item, Param extra_data = NULL)
+	{
+		if (!GetGame().IsMultiplayer())
+		{
+			m_PendingActionData = new ActionData;
+	
+			if (!action.SetupAction(m_Player,target,item,m_PendingActionData,extra_data))
+				m_PendingActionData = null;
+		}
+		else
+			ActionStart(action, target, item, extra_data);
+	}
+	
+	override void OnActionEnd()
+	{
+		if (m_CurrentActionData)
+		{
+			UnlockInventory(m_CurrentActionData);
+			if (m_CurrentActionData.m_Action.RemoveForceTargetAfterUse())
+				m_InventoryActionHandler.DeactiveAction();
+			
+			super.OnActionEnd();
+			HandleInputsOnActionEnd();
+		}
+	}
+
+	void SetInventoryAction(ActionBase action_name, ItemBase target_item, ItemBase main_item)
+	{
+		m_InventoryActionHandler.SetAction(action_name, target_item, main_item);
+	}
+
+	void SetInventoryAction(ActionBase action_name, ActionTarget target, ItemBase main_item)
+	{
+		m_InventoryActionHandler.SetAction(action_name, target, main_item);
+	}
+	
+	void UnsetInventoryAction()
+	{
+		m_InventoryActionHandler.DeactiveAction();
+	}
+	
+	override typename GetSelectedActionCategory()
+	{
+		return m_OrderedStandartActionInputs[m_SelectedActionInputToSrollIndex].Type();
+	}
+	
+	void UpdateActionCategoryPriority()
+	{
+		int i;
+		int last_target_index = 0;
+		for (i = 0; i < m_DefaultOrderOfActionInputs.Count(); i++)
+		{
+			if (m_DefaultOrderOfActionInputs[i].HasTarget())
+			{
+				m_OrderedStandartActionInputs[last_target_index] = m_DefaultOrderOfActionInputs[i];
+				last_target_index++;
+			}
+		}
+		
+		for (i = 0; i < m_DefaultOrderOfActionInputs.Count(); i++)
+		{
+			if (!m_DefaultOrderOfActionInputs[i].HasTarget())
+			{
+				m_OrderedStandartActionInputs[last_target_index] = m_DefaultOrderOfActionInputs[i];
+				last_target_index++;
+			}
+		}
+	}
+	
+	override void SelectFirstActionCategory()
+	{
+		UpdateActionCategoryPriority();
+		m_SelectedActionInputToSrollIndex = 0;
+		
+		for (int index = 0; index < m_OrderedStandartActionInputs.Count(); index++)
+		{
+			if (m_OrderedStandartActionInputs[index].GetPossibleActionsCount() > 1)
+			{
+				m_SelectedActionInputToSrollIndex = index;
+				break;
+			}
+		}
+	}
+	
+	override void SelectNextActionCategory()
+	{
+		int index;
+		
+		for (index = m_SelectedActionInputToSrollIndex + 1; index != m_SelectedActionInputToSrollIndex;;)
+		{
+			if (++index >= m_OrderedStandartActionInputs.Count())
+			{
+				index = 0;
+			}
+			if (m_OrderedStandartActionInputs[index].GetPossibleActionsCount() > 1)
+			{
+				m_SelectedActionInputToSrollIndex = index;
+				break;
+			}
+		}		
+	}
+	
+	override void SelectPrevActionCategory()
+	{
+		int index;
+		
+		for (index = m_SelectedActionInputToSrollIndex; index != m_SelectedActionInputToSrollIndex;;)
+		{
+			if (--index < 0)
+			{
+				index = m_OrderedStandartActionInputs.Count() - 1;
+			}
+			
+			if (m_OrderedStandartActionInputs[index].GetPossibleActionsCount() > 1)
+			{
+				m_SelectedActionInputToSrollIndex = index;
+				break;
+			}
+		}
+	}
+	
+
+	override void SelectNextAction()
+	{
+		ActionInput ai;
+		if (m_SelectedActionInputToSrollIndex < m_OrderedStandartActionInputs.Count())
+		{
+			ai = m_OrderedStandartActionInputs[m_SelectedActionInputToSrollIndex];
+			if (ai && ai.GetPossibleActionsCount() > 1)
+			{
+				ai.SelectNextAction();
+			}
+		}	
+	}
+	
+	override void SelectPrevAction()
+	{
+		ActionInput ai;
+		if (m_SelectedActionInputToSrollIndex < m_OrderedStandartActionInputs.Count())
+		{
+			ai = m_OrderedStandartActionInputs[m_SelectedActionInputToSrollIndex];
+			if (ai && ai.GetPossibleActionsCount() > 1)
+			{
+				ai.SelectPrevAction();
+			}
+		}
+	}
+
+	bool CanPerformActionFromQuickbar(ItemBase mainItem, ItemBase targetItem)
+	{	
+		ItemBase itemInHand = m_Player.GetItemInHands();
+		ActionTarget target;
+		target = new ActionTarget(targetItem, null, -1, vector.Zero, -1);
+		bool hasTarget = targetItem != NULL;
+		
+		if (mainItem)
+		{
+			array<ActionBase_Basic> actions;
+			ActionBase picked_action;
+			int i;
+			
+			mainItem.GetActions(QuickaBarActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{			
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand))
+					{
+						if (hasTarget == picked_action.HasTarget())
+							return true;
+					}
+				}
+			}			
+			//First check continuous actions
+			mainItem.GetActions(ContinuousDefaultActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{			
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBePerformedFromQuickbar())
+					{
+						if (hasTarget == picked_action.HasTarget())
+							return true;
+					}
+				}
+			}
+			//second single use actions
+			mainItem.GetActions(DefaultActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.HasTarget() && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBePerformedFromQuickbar())
+					{
+						if (hasTarget == picked_action.HasTarget())
+							return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	void PerformActionFromQuickbar(ItemBase mainItem, ItemBase targetItem)
+	{
+		ItemBase itemInHand = m_Player.GetItemInHands();
+		ActionTarget target;
+		ItemBase parent = null;
+		if (targetItem)
+			parent = ItemBase.Cast(targetItem.GetHierarchyParent());
+		target = new ActionTarget(targetItem, parent, -1, vector.Zero, -1);
+		bool hasTarget = targetItem != NULL;
+		
+		if (mainItem)
+		{
+			ActionBase picked_action;
+			array<ActionBase_Basic> actions;
+			int i;
+					
+			mainItem.GetActions(QuickaBarActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.HasTarget() && picked_action.Can(m_Player,target, itemInHand))
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							ActionStart(picked_action, target, mainItem);
+							return;
+						}
+					}
+				}
+			}
+			
+			//First continuous actions
+			mainItem.GetActions(ContinuousDefaultActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.HasTarget() && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBePerformedFromQuickbar())
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							ActionStart(picked_action, target, mainItem);
+							return;
+						}
+					}
+				}
+			}
+			//Second check single use actions
+			mainItem.GetActions(DefaultActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBePerformedFromQuickbar())
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							ActionStart(picked_action, target, mainItem);
+							return;
+						}
+					}
+				}
+			}
+
+		}
+	}
+	
+	//TODO Variants support ???
+	bool CanPerformActionFromInventory(ItemBase mainItem, ItemBase targetItem)
+	{	
+		ItemBase itemInHand = m_Player.GetItemInHands();
+		ActionTarget target;
+		target = new ActionTarget(targetItem, null, -1, vector.Zero, -1);
+		bool hasTarget = targetItem != NULL;
+		
+		if (mainItem)
+		{
+			array<ActionBase_Basic> actions;
+			ActionBase picked_action;
+			int i;
+			
+			//First check single use actions
+			mainItem.GetActions(DefaultActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{			
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBePerformedFromInventory())
+					{
+						if (hasTarget == picked_action.HasTarget())
+							return true;
+					}
+				}
+			}
+			
+			//Inventory specific actions
+			mainItem.GetActions(InventoryOnlyActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{			
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand))
+					{
+						if (hasTarget == picked_action.HasTarget())
+							return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	//TODO Variants support ???
+	void PerformActionFromInventory(ItemBase mainItem, ItemBase targetItem)
+	{
+		ItemBase itemInHand = m_Player.GetItemInHands();
+		ActionTarget target;
+		target = new ActionTarget(targetItem, null, -1, vector.Zero, -1);
+		bool hasTarget = targetItem != NULL;
+		
+		if (mainItem)
+		{
+			ActionBase picked_action;
+			array<ActionBase_Basic> actions;
+			int i;
+			
+			//First check single use actions
+			mainItem.GetActions(DefaultActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBePerformedFromInventory())
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							ActionStart(picked_action, target, mainItem);
+							return;
+						}
+					}
+				}
+			}
+			
+			//Inventory specific actions
+			mainItem.GetActions(InventoryOnlyActionInput, actions);
+			if (actions)
+			{
+				for (i = 0; i < actions.Count(); i++)
+				{
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand))
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							ActionStart(picked_action, target, mainItem);
+							return;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	bool CanSetActionFromInventory(ItemBase mainItem, ItemBase targetItem)
+	{
+		ItemBase itemInHand = m_Player.GetItemInHands();
+		ActionTarget target;
+		EntityAI parent = null;
+		if (targetItem)
+		{
+			parent = targetItem.GetHierarchyParent();
+		}
+		target = new ActionTarget(targetItem, parent, -1, vector.Zero, -1);
+		bool hasTarget = targetItem != NULL;
+		
+		if (mainItem)
+		{
+			array<ActionBase_Basic> actions;
+			array<ref ActionBase> variant_actions;
+			ActionBase picked_action;
+			int variants_count,v;
+			
+			//First check single use actions
+			mainItem.GetActions(DefaultActionInput, actions);
+			if (actions)
+			{
+				for (int i = 0; i < actions.Count(); i++)
+				{			
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action.HasVariants())
+					{
+						picked_action.UpdateVariants(itemInHand, targetItem, -1);
+						picked_action.GetVariants(variant_actions);
+						for (v = 0; v < variant_actions.Count(); v ++)
+						{
+							picked_action = variant_actions[v];
+							if (picked_action && picked_action.CanBeSetFromInventory() && picked_action.Can(m_Player,target, itemInHand))
+							{
+								if (hasTarget == picked_action.HasTarget())
+									return true;
+							}
+						}
+					}
+					else
+					{
+						if (picked_action && picked_action.CanBeSetFromInventory() && picked_action.Can(m_Player,target, itemInHand))
+						{
+							if (hasTarget == picked_action.HasTarget())
+								return true;
+						}
+					}
+				}
+			}
+			//second continuous actions
+			mainItem.GetActions(ContinuousDefaultActionInput, actions);
+			if (actions)
+			{
+				for (int j = 0; j < actions.Count(); j++)
+				{
+					picked_action = ActionBase.Cast(actions[j]);
+					if (picked_action.HasVariants())
+					{
+						picked_action.UpdateVariants(itemInHand, targetItem, -1);
+						picked_action.GetVariants(variant_actions);
+						for (v = 0; v < variant_actions.Count(); v ++)
+						{
+							picked_action = variant_actions[v];
+							if (picked_action && picked_action.HasTarget() && picked_action.CanBeSetFromInventory() && picked_action.Can(m_Player,target, itemInHand))
+							{
+								if (hasTarget == picked_action.HasTarget())
+									return true;
+							}
+						}
+					}
+					else
+					{
+						if (picked_action && picked_action.HasTarget() && picked_action.CanBeSetFromInventory() && picked_action.Can(m_Player,target, itemInHand))
+						{
+							if (hasTarget == picked_action.HasTarget())
+								return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	//TODO fix for variants
+	void SetActionFromInventory(ItemBase mainItem, ItemBase targetItem)
+	{
+		ItemBase itemInHand = m_Player.GetItemInHands();
+		ActionTarget target;
+		target = new ActionTarget(targetItem, null, -1, vector.Zero, -1);
+		bool hasTarget = targetItem != NULL;
+		
+		if (mainItem)
+		{
+			array<ActionBase_Basic> actions;
+			ActionBase picked_action;
+			
+			//First check single use actions
+			mainItem.GetActions(DefaultActionInput, actions);
+			if (actions)
+			{
+				for (int i = 0; i < actions.Count(); i++)
+				{			
+					picked_action = ActionBase.Cast(actions[i]);
+					if (picked_action && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBeSetFromInventory())
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							SetInventoryAction(picked_action, target, itemInHand);
+							return;
+						}
+					}
+				}
+			}
+			//second continuous actions
+			mainItem.GetActions(ContinuousDefaultActionInput, actions);
+			if (actions)
+			{
+				for (int j = 0; j < actions.Count(); j++)
+				{
+					picked_action = ActionBase.Cast(actions[j]);
+					if (picked_action && picked_action.HasTarget() && picked_action.Can(m_Player,target, itemInHand) && picked_action.CanBeSetFromInventory())
+					{
+						if (hasTarget == picked_action.HasTarget())
+						{
+							SetInventoryAction(picked_action, target, itemInHand);
+							return;
+						}
+					}
+				}
+			}
+		}	
+	}
+	
+	override void Interrupt()
+	{
+		super.Interrupt();
+		
+		if (m_CurrentActionData)
+			m_Interrupted = true;
+	}
+	
+	//! client requests action interrupt
+	void RequestInterruptAction()
+	{
+		if (ScriptInputUserData.CanStoreInputUserData())
+		{
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			ctx.Write(INPUT_UDT_STANDARD_ACTION_END_REQUEST);
+			ctx.Write(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+			ctx.Send();
+		}
+	}
+	
+	private ref ActionTarget m_ForceTarget;
+	private ref ActionTargets m_Targets;
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerServer.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce724b9d89f7c83162a12efec49cc33efbdfe517
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionManagerServer.c
@@ -0,0 +1,341 @@
+class ActionManagerServer: ActionManagerBase
+{		
+	protected ActionBase 		m_PendingAction;
+	ref ActionReciveData		m_PendingActionReciveData;
+	
+	void ActionManagerServer(PlayerBase player)
+	{
+		m_PendingAction 			= null;
+		m_PendingActionReciveData 	= null;
+	}
+	
+	//------------------------------------------
+	//EVENTS 
+	//------------------------------------------
+	override void OnJumpStart()
+	{
+		if (m_CurrentActionData)
+		{
+			if (m_CurrentActionData.m_State == UA_AM_PENDING || m_CurrentActionData.m_State == UA_AM_REJECTED || m_CurrentActionData.m_State == UA_AM_ACCEPTED)
+			{
+				OnActionEnd();
+				m_PendingActionAcknowledgmentID = -1;
+			}
+			else
+			{
+				m_CurrentActionData.m_Action.Interrupt(m_CurrentActionData);
+			}
+		}
+	}
+
+	override bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{		
+		switch (userDataType)
+		{
+			case INPUT_UDT_STANDARD_ACTION_START:
+			{
+				bool success = true;
+				
+				int actionID = 0;
+				if (!ctx.Read(actionID))
+					return false;
+				
+				ActionBase recvAction = GetAction(actionID);
+				if (!recvAction)
+					return false;
+				
+				if (!recvAction.ReadFromContext(ctx, m_PendingActionReciveData))
+					success = false;
+				
+				m_PendingAction = recvAction;
+					
+				if (recvAction.UseAcknowledgment())
+				{
+					int ackID;
+					if (!ctx.Read(ackID))
+						success = false;
+						
+					m_PendingActionAcknowledgmentID = ackID;
+				}
+					
+				break;
+
+			}
+
+			case INPUT_UDT_STANDARD_ACTION_END_REQUEST:
+			{
+				//Debug.Log("Action want end request, STS = " + m_Player.GetSimulationTimeStamp());
+				int commandID = -10;
+				ctx.Read(commandID);
+				
+				if (commandID == DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT)
+				{
+					//Print("INPUT_UDT_STANDARD_ACTION_END_REQUEST | CMD_ACTIONINT_INTERRUPT");
+					Interrupt();
+				}
+				else
+				{
+					//Print("INPUT_UDT_STANDARD_ACTION_END_REQUEST | m_ActionWantEndRequest");
+					m_ActionWantEndRequest = true;
+				}
+			}
+			
+			case INPUT_UDT_STANDARD_ACTION_INPUT_END:
+			{
+				//Debug.Log("Action input ended, STS = " + m_Player.GetSimulationTimeStamp());
+				m_ActionInputWantEnd = true;
+			}
+			default:
+				return false;
+		}
+		
+		if (!success)
+		{
+			//Debug.Log("[AM] OnInputUserDataProcess INPUT_UDT_STANDARD_ACTION_START Error");
+			if (recvAction.UseAcknowledgment())
+			{
+				DayZPlayerSyncJunctures.SendActionAcknowledgment(m_Player, m_PendingActionAcknowledgmentID, false);
+			}
+			else
+			{
+				Interrupt();
+			}
+
+			return false;
+		}
+		return true;
+		
+	}
+	
+	override void StartDeliveredAction()
+	{
+		if (!m_CurrentActionData)
+		{
+			//! error - expected action data
+			return;
+		}
+		
+		m_Interrupted 			= false;
+
+		bool accepted 			= false;		
+		ActionBase pickedAction	= m_CurrentActionData.m_Action;
+		ActionTarget target		= m_CurrentActionData.m_Target;
+		ItemBase item			= m_CurrentActionData.m_MainItem;
+
+		if (LogManager.IsActionLogEnable())
+		{
+			Debug.ActionLog("Item = " + item + ", " + target.DumpToString(), pickedAction.ToString() , "n/a", "DeliveredAction", m_Player.ToString());
+		}
+
+		if (!m_Player.GetCommandModifier_Action() && !m_Player.GetCommand_Action() && !m_Player.IsSprinting() && pickedAction && pickedAction.Can(m_Player,target,item)) 
+		{
+			accepted = true;
+			if (pickedAction.HasTarget())
+			{
+				EntityAI targetEntity;
+				if (EntityAI.CastTo(targetEntity,target.GetObject()))
+				{
+					if (!AdvancedCommunication.Cast(targetEntity) && !Building.Cast(targetEntity) && pickedAction.IsLockTargetOnUse())
+					{
+						//Lock target
+						if (!GetGame().AddActionJuncture(m_Player, targetEntity, 10000))
+						{
+							accepted = false;
+						}
+					}
+				}
+			}
+		}
+		
+		if (accepted)
+		{
+			if (LogManager.IsActionLogEnable())
+			{
+				Debug.ActionLog("Action accepted", pickedAction.ToString() , "n/a", "CheckDeliveredAction", m_Player.ToString() );
+			}
+			//Debug.Log("[AM] Action acccepted");
+			if (pickedAction.UseAcknowledgment())
+			{
+				//Unlock target
+				m_CurrentActionData.m_State = UA_AM_PENDING;
+				DayZPlayerSyncJunctures.SendActionAcknowledgment(m_Player, m_PendingActionAcknowledgmentID, true);
+			}
+			else
+			{
+				m_CurrentActionData.m_State = UA_AM_ACCEPTED;
+			}
+		}
+		else
+		{
+			if (LogManager.IsActionLogEnable())
+			{
+				Debug.ActionLog("Action rejected", pickedAction.ToString() , "n/a", "CheckDeliveredAction", m_Player.ToString() );
+			}
+
+			if (pickedAction.UseAcknowledgment())
+			{
+				DayZPlayerSyncJunctures.SendActionAcknowledgment(m_Player, m_PendingActionAcknowledgmentID, false);
+			}
+			else
+			{
+				Interrupt();
+			}
+		}
+	}
+	
+	override void OnActionEnd()
+	{
+		//Debug.Log("Action ended - hard, STS = " + m_Player.GetSimulationTimeStamp());
+		if (m_CurrentActionData)
+		{
+			if ( m_CurrentActionData.m_Target )
+			{
+				EntityAI targetEntity;
+				if (targetEntity.CastTo(targetEntity, m_CurrentActionData.m_Target.GetObject()) && !Building.Cast(targetEntity))
+				{
+					GetGame().ClearJuncture(m_CurrentActionData.m_Player, targetEntity);
+				}
+			}
+
+			super.OnActionEnd();
+		}
+	}
+	
+	//pCurrentCommandID is command ID at time of call command handler, some called methods can change actual true value (need call m_Player.GetCurrentCommandID() for actual command ID)
+	override void Update(int pCurrentCommandID)
+	{
+		super.Update(pCurrentCommandID);
+		int currentCommandID = m_Player.GetCurrentCommandID();
+		
+		//Debug.Log("m_ActionWantEnd " + m_ActionInputWantEnd);
+		
+		if (m_PendingAction)
+		{
+			if (m_CurrentActionData)
+			{
+				DayZPlayerSyncJunctures.SendActionAcknowledgment(m_Player, m_PendingActionAcknowledgmentID, false);
+			}
+			else
+			{
+				m_ActionWantEndRequest 	= false;
+				m_ActionInputWantEnd 	= false;
+				
+				bool success 			= true;
+				ActionTarget target 	= new ActionTarget(null, null, -1, vector.Zero, 0); 
+					
+				if ( LogManager.IsActionLogEnable() )
+				{	
+					Debug.ActionLog("n/a", m_PendingAction.ToString() , "n/a", "HandlePendingAction", m_Player.ToString() );
+				}
+
+				if (!m_PendingAction.SetupAction(m_Player,target,m_Player.GetItemInHands(),m_CurrentActionData))
+				{
+					success = false;
+				}
+				//Debug.Log("[AM] Action data synced (" + m_Player + ") success: " + success);
+			
+				if (success)
+				{
+					StartDeliveredAction();
+				}
+				else
+				{
+					if (m_PendingAction.UseAcknowledgment())
+					{
+						DayZPlayerSyncJunctures.SendActionAcknowledgment(m_Player, m_PendingActionAcknowledgmentID, false);
+					}
+					else
+					{
+						Interrupt();
+					}
+				}
+			}
+
+			m_PendingAction 			= null;
+			m_PendingActionReciveData 	= null;
+		}
+	
+		if (m_CurrentActionData)
+		{			
+			if (m_CurrentActionData.m_State != UA_AM_PENDING && m_CurrentActionData.m_State != UA_AM_REJECTED && m_CurrentActionData.m_State != UA_AM_ACCEPTED)
+			{
+				m_CurrentActionData.m_Action.OnUpdateServer(m_CurrentActionData);
+				
+				if (m_CurrentActionData.m_RefreshJunctureTimer > 0)
+				{
+					m_CurrentActionData.m_RefreshJunctureTimer--;
+				}
+				else
+				{
+					m_CurrentActionData.m_RefreshJunctureTimer = m_CurrentActionData.m_Action.GetRefreshReservationTimerValue();
+					if (m_CurrentActionData.m_Target)
+					{
+						EntityAI targetEntity;
+						if ( targetEntity.CastTo(targetEntity, m_CurrentActionData.m_Target.GetObject()) && !Building.Cast(targetEntity) )
+						{
+							GetGame().ExtendActionJuncture(m_CurrentActionData.m_Player, targetEntity, 10000);
+						}
+					}
+				}
+			}
+			
+			//Debug.Log("m_CurrentActionData.m_State: " + m_CurrentActionData.m_State +" m_ActionWantEnd: " + m_ActionWantEndRequest );
+			switch (m_CurrentActionData.m_State)
+			{
+				case UA_AM_PENDING:
+					break;
+			
+				case UA_AM_ACCEPTED:
+					// check currentCommandID before start or reject 
+				
+					bool canActionPerform = m_CurrentActionData.m_Action.Can(m_Player, m_CurrentActionData.m_Target, m_CurrentActionData.m_MainItem);
+					if (canActionPerform && ActionPossibilityCheck(currentCommandID))
+					{
+						m_CurrentActionData.m_State = UA_START;
+						m_CurrentActionData.m_Action.Start(m_CurrentActionData);
+					
+						if (m_CurrentActionData.m_Action && m_CurrentActionData.m_Action.IsInstant())
+							OnActionEnd();
+					}
+					else
+					{
+						Interrupt();
+					}
+					m_PendingActionAcknowledgmentID = -1;
+					break;
+				
+				case UA_AM_REJECTED:
+					OnActionEnd();
+					m_PendingActionAcknowledgmentID = -1;
+					break;
+			
+				default:
+					if (m_ActionInputWantEnd)
+					{
+						m_ActionInputWantEnd = false;
+						m_CurrentActionData.m_Action.EndInput(m_CurrentActionData);
+					}
+				
+					if (m_ActionWantEndRequest)
+					{
+						m_ActionWantEndRequest = false;
+						m_CurrentActionData.m_Action.EndRequest(m_CurrentActionData);
+					}
+					break;
+			}
+		}
+	}
+	
+	override void Interrupt()
+	{
+		super.Interrupt();
+		
+		if (m_CurrentActionData)
+			DayZPlayerSyncJunctures.SendActionInterrupt(m_Player);
+	}
+	
+	override ActionReciveData GetReciveData()
+	{
+		return m_PendingActionReciveData;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionTargets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionTargets.c
new file mode 100644
index 0000000000000000000000000000000000000000..b78ea233d9887831c73cce9de0b28cf8f25c3671
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionTargets.c
@@ -0,0 +1,753 @@
+//! objects in vicinity - extended with secondary object which is parent of that Object
+class VicinityObjects
+{
+	private ref map<Object, Object> m_VicinityObjects;
+	
+	void VicinityObjects()
+	{
+		m_VicinityObjects = new map<Object, Object>;
+	}
+
+	//! stores VicinityObject to Hashmap - for storing of parent/child relationship
+	void StoreVicinityObject(Object object, Object parent = null)
+	{
+		//! completely remove items that are being placed or are holograms
+		ItemBase ib = ItemBase.Cast(object);
+		if (ib && (ib.IsBeingPlaced() || ib.IsHologram()))
+			return;
+
+		//! ignores plain objects
+		/*if(object && object.IsPlainObject())
+		{
+			Print("ERROR: VicinityObjects | StoreVicinityObject | IsPlainObject check fail");
+			return;
+		}*/
+		
+		if ( !m_VicinityObjects.Contains(object) )
+		{
+			//! init of VicinityObjects - object, parent(if exists)
+			m_VicinityObjects.Set(object, parent);
+		}
+	}
+
+	//! transform simple array of Objects to VicinityObjects hashmap
+	void TransformToVicinityObjects(array<Object> objects)
+	{
+		for (int i = 0; i < objects.Count(); i++)
+		{
+			if (objects[i].GetType() != "" && objects[i].CanBeActionTarget())
+			{
+				StoreVicinityObject(objects[i]);
+				//Print("storing, 2nd pass: " + objects[i]);
+			}
+		}
+	}
+	
+	void ClearVicinityObjects()
+	{
+		m_VicinityObjects.Clear();
+	}
+
+	//! return simple array of Objects in Vicinity
+	array< Object > GetVicinityObjects()
+	{
+		ref array<Object> vicinityObjects = new array<Object>;
+		for (int i = 0; i < m_VicinityObjects.Count(); i++)
+		{
+			//! filters out non-takeable items (won't be shown in vicinity)
+			ItemBase ib = ItemBase.Cast(GetObject(i));
+			if (ib && !ib.IsTakeable())
+				continue;
+
+			vicinityObjects.Insert(GetObject(i));
+		}
+		
+		return vicinityObjects;
+	}
+	
+	//! return simple array of Objects in Vicinity
+	array< Object > GetRawVicinityObjects()
+	{
+		ref array<Object> vicinityObjects = new array<Object>;
+		for (int i = 0; i < m_VicinityObjects.Count(); i++)
+		{
+			vicinityObjects.Insert(GetObject(i));
+		}
+		
+		return vicinityObjects;
+	}
+
+	//! returns VicinityObjects Key
+	Object GetObject(int i)
+	{
+		return m_VicinityObjects.GetKey(i);
+	}
+
+	//! returns VicinityObjects Element
+	Object GetParent(int i)
+	{
+		return m_VicinityObjects.GetElement(i);
+	}
+	
+	int Count()
+	{
+		return m_VicinityObjects.Count();
+	}
+	
+	void Remove(Object object)
+	{
+		m_VicinityObjects.Remove(object);
+	}
+	
+	void Remove(array<Object> objects)
+	{
+		for (int i = 0; i < objects.Count(); i++)
+		{
+			m_VicinityObjects.Remove(objects[i]);
+		}
+	}
+}
+
+class ActionTarget
+{
+	void ActionTarget(Object object, Object parent, int componentIndex, vector cursorHitPos, float utility)
+	{
+		m_Object = object;
+		m_Parent = parent;
+		m_ComponentIndex = componentIndex;
+		m_CursorHitPos = cursorHitPos;
+		m_Utility = utility;
+	} 
+
+	Object GetObject()
+		{ return m_Object; }
+
+	Object GetParent()
+		{ return m_Parent; }
+
+	bool IsProxy()
+	{
+		if (m_Parent)
+		 	return true;
+		return false;
+	}
+	
+	int GetComponentIndex()	
+		{ return m_ComponentIndex; }
+	
+	float GetUtility()
+		{ return m_Utility; }
+	
+	vector GetCursorHitPos()
+		{ return m_CursorHitPos; }
+	
+	void SetCursorHitPos(vector cursor_position)
+	{
+		m_CursorHitPos = cursor_position;
+	}
+	
+	void DbgPrintTargetDump()
+	{
+		Print(DumpToString());
+	}
+	
+	string DumpToString()
+	{
+		string res = "ActionTarget dump = {";
+		res = res + "m_Object: " + Object.GetDebugName(m_Object);
+		res = res + "; m_Parent: " + Object.GetDebugName(m_Parent);
+		res = res + "; m_ComponentIndex: " + m_ComponentIndex.ToString();
+		res = res + "; m_CursorHitPos: " + m_CursorHitPos.ToString();
+		res = res + "; m_Utility: " + m_Utility.ToString();
+		res = res + "}";
+		return res;
+	}
+	
+	private Object m_Object;		// object itself
+	private Object m_Parent;		// null or parent of m_Object
+	private int m_ComponentIndex;	// p3d Component ID or -1
+	private vector m_CursorHitPos;
+	private float m_Utility;
+};
+
+class ActionTargets
+{
+	void ActionTargets(PlayerBase player)
+	{
+		m_Player = player;
+		m_VicinityObjects = new VicinityObjects;
+		m_Targets = new array<ref ActionTarget>;
+		
+		m_Debug = false;
+	}
+	
+	static array<Object> GetVicinityObjects()
+	{
+		return m_VicinityObjects.GetVicinityObjects();
+	}
+	
+	void Clear()
+	{
+		m_Targets.Clear();
+	}
+	
+	void Update()
+	{	
+		int i;
+		
+		//! clear state
+		m_VicinityObjects.ClearVicinityObjects();
+		Clear();
+
+		Object cursorTarget = null;
+		EntityAI cursorTargetEntity = null;
+		array<Object> vicinityObjects = new array<Object>;
+		
+		//! camera & ray properties
+		int hitComponentIndex;
+		vector playerPos = m_Player.GetPosition();
+		vector headingDirection = MiscGameplayFunctions.GetHeadingVector(m_Player);
+
+		m_RayStart = GetGame().GetCurrentCameraPosition();
+		m_RayEnd = m_RayStart + GetGame().GetCurrentCameraDirection() * c_RayDistance;
+
+		RaycastRVParams rayInput = new RaycastRVParams(m_RayStart, m_RayEnd, m_Player);
+		rayInput.flags = CollisionFlags.ALLOBJECTS;
+		//rayInput.sorted = true;
+		array<ref RaycastRVResult> results = new array<ref RaycastRVResult>;
+
+		if ( DayZPhysics.RaycastRVProxy(rayInput, results) )
+		{
+			if ( results.Count() > 0 )
+			{
+				array<float> distance_helper = new array<float>;
+				array<float> distance_helper_unsorted = new array<float>;
+				float distance;
+				
+				for (i = 0; i < results.Count(); i++)
+				{
+					distance = vector.DistanceSq(results[i].pos, m_RayStart);
+					distance_helper.Insert(distance);
+					//Print("#" + i + " " + results.Get(i).obj);
+				}
+				//Print("--------------");
+				distance_helper_unsorted.Copy(distance_helper);
+				distance_helper.Sort();
+				
+				RaycastRVResult res;
+				
+				
+				for ( i = 0; i < results.Count(); i++)
+				{
+					res = results.Get(distance_helper_unsorted.Find(distance_helper[i])); //closest object
+					
+					cursorTarget = res.obj;
+					Class.CastTo(cursorTargetEntity,cursorTarget);
+					if (cursorTarget && !cursorTarget.CanBeActionTarget())
+						continue;
+					//! if the cursor target is a proxy
+					if ( res.hierLevel > 0 )
+					{
+						//! ignores attachments on player
+						if ( !res.parent.IsMan() )
+						{
+							m_VicinityObjects.StoreVicinityObject(res.obj, res.parent);
+							//Print("storing, 1st pass (hier > 0): " + res.obj);
+						}
+						else
+							continue;
+					}
+					else
+					{
+						m_VicinityObjects.StoreVicinityObject(res.obj, null);
+						//Print("storing, 1st pass: " + res.obj);
+					}
+					
+					m_HitPos = res.pos;
+					hitComponentIndex = res.component;
+					break;
+				}
+			}
+			//else
+				//Print("NO RESULTS FOUND!");
+		}
+		else
+		{
+			//Print("CAST UNSUCCESFUL");
+			cursorTarget = null;
+			m_HitPos = vector.Zero;
+			hitComponentIndex = -1;
+		}
+		
+		//Print(cursorTarget);
+		
+		//! spacial search
+		DayZPlayerCamera camera = m_Player.GetCurrentCamera();
+		if (camera && camera.GetCurrentPitch() <= -45) // Spatial search is a contributor to very heavy searching, limit it to when we are at least looking down
+			DayZPlayerUtils.GetEntitiesInCone(playerPos, headingDirection, c_ConeAngle, c_MaxTargetDistance, c_ConeHeightMin, c_ConeHeightMax, vicinityObjects);
+		
+		//! removes player from the vicinity
+		vicinityObjects.RemoveItem(m_Player);
+
+		//! transformation of array of Objects to hashmap (VicinityObjects)
+		//Print("m_VicinityObjects before" + m_VicinityObjects.Count());
+		m_VicinityObjects.TransformToVicinityObjects(vicinityObjects);
+		//Print("m_VicinityObjects after" + m_VicinityObjects.Count());
+		
+		//! removes Vicinity objects that are not directly visible from player position
+		FilterObstructedObjectsEx(cursorTarget, vicinityObjects);
+		
+		//! select & sort targets based on utility function
+		for ( i = 0; i < m_VicinityObjects.Count(); i++ )
+		{
+			Object object = m_VicinityObjects.GetObject(i);
+			Object parent = m_VicinityObjects.GetParent(i);
+
+			float utility = ComputeUtility(object, m_RayStart, m_RayEnd, cursorTarget, m_HitPos);
+			if ( utility > 0 )
+			{
+				int targetComponent = -1;
+				targetComponent = hitComponentIndex;
+
+				ActionTarget at = new ActionTarget(object, parent, targetComponent, m_HitPos, utility);
+				StoreTarget(at);
+			}
+			/*else
+				Print("utility < 0; object: " + object + " | parent: " + parent);*/
+		}
+
+		//! action target for surface actions (lowest utility)
+		if (m_HitPos == vector.Zero)
+		{
+			vector 		contact_pos, contact_dir, hitNormal;
+			int 		contactComponent;
+			float 		hitFraction;
+			Object 		hitObject;
+			
+			m_RayEnd = m_RayStart + GetGame().GetCurrentCameraDirection() * c_RayDistance * 3;
+			
+			PhxInteractionLayers collisionLayerMask = PhxInteractionLayers.ROADWAY|PhxInteractionLayers.TERRAIN|PhxInteractionLayers.WATERLAYER;
+			DayZPhysics.RayCastBullet(m_RayStart,m_RayEnd,collisionLayerMask,null,hitObject,contact_pos,hitNormal,hitFraction);
+			m_HitPos = contact_pos;
+		}
+		
+		m_Targets.Insert(new ActionTarget(null, null, -1, m_HitPos, 0));
+
+#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_ACTION_TARGETS_DEBUG))
+		{
+			ShowDebugActionTargets(true);
+			DrawDebugActionTargets(true);
+			DrawDebugCone(true);
+			DrawDebugRay(true);
+			DrawSelectionPos(DiagMenu.GetBool(DiagMenuIDs.MISC_ACTION_TARGETS_SELPOS_DEBUG));
+		}
+		else
+		{
+			ShowDebugActionTargets(false);
+			DrawDebugActionTargets(false);
+			DrawDebugCone(false);
+			DrawDebugRay(false);
+			DrawSelectionPos(false);
+		}
+#endif
+		//Print("--------------");
+	}
+	
+	private bool IsObstructed(Object object)
+	{
+		IsObjectObstructedCache cache = new IsObjectObstructedCache(m_RayStart, 1);
+		return IsObstructedEx(object, cache);
+	}
+	
+	private bool IsObstructedEx(Object object, IsObjectObstructedCache cache)
+	{
+		return MiscGameplayFunctions.IsObjectObstructedEx(object, cache);
+	}
+ 	
+	//! returns count of founded targets
+	int GetTargetsCount()
+		{ return m_Targets.Count(); }
+	
+	//! returns action target at index
+	ActionTarget GetTarget(int index)
+		{ return m_Targets.Get(index); }
+
+	//! inserts action into sorted array based on utility
+	private void StoreTarget(ActionTarget pActionTarget)
+	{
+		int index = FindIndexForStoring(pActionTarget.GetUtility());
+		m_Targets.InsertAt(pActionTarget, index);
+		//Print("StoreTarget; object: " + pActionTarget.GetObject() + " | parent: " + pActionTarget.GetParent() + " | idx: " + index);
+	}
+
+	//! binary search algorithm	
+	private int FindIndexForStoring(float value)
+	{
+		int left = 0;
+		int right = m_Targets.Count() - 1;
+		while ( left <= right )
+		{
+			int middle = (left + right) / 2;
+			float middleValue = m_Targets.Get(middle).GetUtility();
+			
+			if ( middleValue == value )
+				return middle;
+            else if ( middleValue < value )
+				right = middle - 1;
+            else
+				left = middle + 1;
+		}
+		
+		return left;
+	}
+	
+	//! computes utility of target
+	private float ComputeUtility(Object pTarget, vector pRayStart, vector pRayEnd, Object cursorTarget, vector hitPos)
+	{
+		//! out of reach
+		if (vector.DistanceSq(hitPos, m_Player.GetPosition()) > c_MaxTargetDistance * c_MaxTargetDistance)
+			return -1;
+
+		if (pTarget)
+		{
+			if ( pTarget == cursorTarget )
+			{
+				//! ground and static objects
+				if ( pTarget.GetType() == string.Empty )
+					return 0.01;
+
+				if ( pTarget.IsBuilding() )
+					return 0.25;
+
+				if ( pTarget.IsTransport() )
+					return 0.25;
+				
+				//!basebuilding objects
+				if (pTarget.CanUseConstruction())
+					return 0.85;
+
+				if ( pTarget.IsWell() )
+					return 0.9;
+
+				vector playerPosXZ = m_Player.GetPosition();
+				vector hitPosXZ = hitPos;
+				playerPosXZ[1] = 0;
+				hitPosXZ[1] = 0;
+				if ( vector.DistanceSq(playerPosXZ, hitPosXZ) <= c_MaxTargetDistance * c_MaxTargetDistance )
+					return c_UtilityMaxValue;
+			}
+
+			float distSqr = DistSqrPoint2Line(pTarget.GetPosition(), pRayStart, pRayEnd);
+			return (c_UtilityMaxDistFromRaySqr - distSqr) / c_UtilityMaxDistFromRaySqr;
+		}
+
+		return -1;
+	}
+
+	//! distance between point and line
+	private float DistSqrPoint2Line(vector pPoint, vector pL1, vector pL2)
+	{
+		vector v = pL2 - pL1;
+		vector w = pPoint - pL1;
+	
+		float c1 = vector.Dot(w,v);
+		float c2 = vector.Dot(v,v);
+
+		if ( c1 <= 0 || c2 == 0 )
+			return vector.DistanceSq(pPoint, pL1);
+
+		float b = c1 / c2;	
+		vector nearestPoint = pL1 + (v * b);
+		return vector.DistanceSq(pPoint, nearestPoint);		
+	}
+	
+	private void FilterObstructedObjectsEx(Object cursor_target, array<Object> vicinityObjects)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_ACTION_TARGETS_DEBUG))
+			CleanupDebugShapes(obstruction);
+		#endif
+
+		array<Object> obstructingObjects = new array<Object>;
+		MiscGameplayFunctions.FilterObstructingObjects(vicinityObjects, obstructingObjects);
+		
+		if ( obstructingObjects.Count() > 0 )
+		{
+			PlayerBase player = PlayerBase.Cast(g_Game.GetPlayer());
+					
+			int numObstructed = 0;
+			int mCount = m_VicinityObjects.Count();
+			
+			if (mCount > GROUPING_COUNT_THRESHOLD)
+			{
+				array<Object> filteredObjects = new array<Object>;
+				MiscGameplayFunctions.FilterObstructedObjectsByGrouping(m_RayStart, c_MaxTargetDistance, c_DistanceDelta, m_VicinityObjects.GetRawVicinityObjects(), vicinityObjects, filteredObjects);
+				m_VicinityObjects.ClearVicinityObjects();
+				m_VicinityObjects.TransformToVicinityObjects(filteredObjects);
+			}
+			else
+			{
+				FilterObstructedObjects(cursor_target);
+			}
+		}
+	}
+	
+	private void FilterObstructedObjects(Object cursor_target)
+	{
+		int numObstructed = 0;
+		int mCount = m_VicinityObjects.Count();
+		IsObjectObstructedCache cache = new IsObjectObstructedCache(m_RayStart, mCount);
+		mCount--;
+	
+		//! check if targets are not obstructed (eg.: wall)
+		for ( int i = mCount; i >= 0; --i )
+		{
+			Object object = m_VicinityObjects.GetObject(i);
+			Object parent = m_VicinityObjects.GetParent(i);
+
+			//! check for object obstruction(if the object is not a proxy - has no parent)
+			if (object && !parent)
+			{
+				//! when the number of obstructed items is higher than OBSTRUCTED_COUNT_THRESHOLD
+				//! remove do no run obstruction check and skip these items
+				if (numObstructed > OBSTRUCTED_COUNT_THRESHOLD && object != cursor_target)
+				{
+					m_VicinityObjects.Remove(object);
+					continue;
+				}
+
+				//! obstruction check
+				if (object != cursor_target && IsObstructedEx(object, cache))
+				{
+					m_VicinityObjects.Remove(object);
+					numObstructed++;
+				}
+
+				cache.ClearCache();
+			}
+		}
+	}
+	
+#ifdef DIAG_DEVELOPER
+	ref array<Shape> shapes = new array<Shape>();
+	ref array<Shape> dbgConeShapes = new array<Shape>();
+	ref array<Shape> rayShapes = new array<Shape>();
+	ref array<Shape> obstruction = new array<Shape>();
+	ref array<Shape> dbgPosShapes = new array<Shape>();
+	
+	void ShowDebugActionTargets(bool enabled)
+	{
+		int windowPosX = 0;
+		int windowPosY = 50;
+
+		Object obj;
+
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin("Action Targets", windowPosX, windowPosY);
+		if ( enabled )
+		{
+			for ( int i = 0; i < GetTargetsCount(); i++ )
+			{				
+				obj = m_Targets.Get(i).GetObject();
+				if ( obj )
+				{
+					float util = m_Targets.Get(i).GetUtility();
+					int compIdx = m_Targets.Get(i).GetComponentIndex();
+					string compName;
+					array<string> compNames = new array<string>;
+					compName = obj.GetActionComponentName(compIdx);
+					obj.GetActionComponentNameList(compIdx, compNames);
+
+					if ( compNames.Count() > 0 )
+					{
+						for ( int c = 0; c < compNames.Count(); c++ )
+						{
+							DbgUI.Text(obj.GetDisplayName() + " :: " + obj + " | util: " + util + " | compIdx: " + compIdx + " | compName: " + compNames[c] + "| wPos: " + obj.GetWorldPosition() );
+						}
+					}
+					else
+					{
+						DbgUI.Text(obj.GetDisplayName() + " :: " + obj + " | util: " + util + " | compIdx: " + compIdx + " | compName: " + compName + "| wPos: " + obj.GetWorldPosition() );					
+					}
+				}
+				else
+					continue;
+			}
+		}
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+
+	void DrawDebugActionTargets(bool enabled)
+	{
+		int s_id;
+		vector w_pos;
+		vector w_pos_sphr;
+		vector w_pos_lend;
+		Object obj;
+
+		if ( enabled )
+		{
+			CleanupDebugShapes(shapes);
+			
+			for ( int i = 0; i < GetTargetsCount(); i++ )
+			{
+				obj = m_Targets.Get(i).GetObject();
+				if ( obj )
+				{
+					w_pos = obj.GetPosition();
+					// sphere pos tweaks
+					w_pos_sphr = w_pos;
+					w_pos_sphr[1] = w_pos_sphr[1] + 0.5;
+					// line pos tweaks
+					w_pos_lend = w_pos;
+					w_pos_lend[1] = w_pos_lend[1] + 0.5;
+					
+					if ( i == 0 )
+					{
+						shapes.Insert( Debug.DrawSphere(w_pos_sphr, 0.03, COLOR_RED) );
+						shapes.Insert( Debug.DrawLine(w_pos, w_pos_lend, COLOR_RED) );
+					}
+					else
+					{
+						shapes.Insert( Debug.DrawSphere(w_pos_sphr, 0.03, COLOR_YELLOW) );
+						shapes.Insert( Debug.DrawLine(w_pos, w_pos_lend, COLOR_YELLOW) );
+					}
+				}
+			}
+		}
+		else
+			CleanupDebugShapes(shapes);
+	}
+	
+	private void DrawDebugCone(bool enabled)
+	{
+		// "cone" settings
+		vector start, end, endL, endR;
+		float playerAngle;
+		float xL,xR,zL,zR;
+		
+		if (enabled)
+		{
+			CleanupDebugShapes(dbgConeShapes);
+
+			start = m_Player.GetPosition();
+			playerAngle = MiscGameplayFunctions.GetHeadingAngle(m_Player);
+			
+			// offset position of the shape in height
+			start[1] = start[1] + 0.2;
+
+			endL = start;
+			endR = start;
+			xL = c_MaxTargetDistance * Math.Cos(playerAngle + Math.PI_HALF + c_ConeAngle * Math.DEG2RAD); // x
+			zL = c_MaxTargetDistance * Math.Sin(playerAngle + Math.PI_HALF + c_ConeAngle * Math.DEG2RAD); // z
+			xR = c_MaxTargetDistance * Math.Cos(playerAngle + Math.PI_HALF - c_ConeAngle * Math.DEG2RAD); // x
+			zR = c_MaxTargetDistance * Math.Sin(playerAngle + Math.PI_HALF - c_ConeAngle * Math.DEG2RAD); // z
+			endL[0] = endL[0] + xL;
+			endL[2] = endL[2] + zL;
+			endR[0] = endR[0] + xR;
+			endR[2] = endR[2] + zR;
+
+			dbgConeShapes.Insert( Debug.DrawLine(start, endL, COLOR_BLUE) );
+			dbgConeShapes.Insert( Debug.DrawLine(start, endR, COLOR_BLUE) ) ;
+			dbgConeShapes.Insert( Debug.DrawLine(endL, endR, COLOR_BLUE) );
+		}
+		else
+			CleanupDebugShapes(dbgConeShapes);		
+	}
+	
+	private void DrawSelectionPos(bool enabled)
+	{
+		if (enabled)
+		{
+			CleanupDebugShapes(dbgPosShapes);
+			if (GetTargetsCount() > 0 && GetTarget(0).GetUtility() > -1 )
+			{
+				ActionTarget at = GetTarget(0);
+				if (at.GetObject())
+				{
+					string compName = at.GetObject().GetActionComponentName(at.GetComponentIndex());
+					vector modelPos = at.GetObject().GetSelectionPositionMS(compName);
+					vector worldPos = at.GetObject().ModelToWorld(modelPos);
+					dbgPosShapes.Insert( Debug.DrawSphere(worldPos, 0.25, Colors.PURPLE, ShapeFlags.NOZBUFFER) );
+				}
+			}
+		}
+		else
+			CleanupDebugShapes(dbgPosShapes);
+	}
+
+	private void DrawDebugRay(bool enabled)
+	{
+		if (enabled)
+		{
+			CleanupDebugShapes(rayShapes);
+			rayShapes.Insert( Debug.DrawSphere(m_HitPos, Math.Sqrt(c_UtilityMaxDistFromRaySqr), COLOR_BLUE_A, ShapeFlags.TRANSP) );
+			rayShapes.Insert( Debug.DrawLine(m_RayStart, m_RayEnd, COLOR_BLUE) );
+		}
+		else
+			CleanupDebugShapes(rayShapes);
+	}
+
+	private void CleanupDebugShapes(array<Shape> shapesArr)
+	{
+		for ( int it = 0; it < shapesArr.Count(); ++it )
+		{
+			Debug.RemoveShape( shapesArr[it] );
+		}
+		
+		shapesArr.Clear();
+	}
+#endif
+	
+	//--------------------------------------------------------
+	// Members
+	//--------------------------------------------------------
+	//! player owner
+	private PlayerBase m_Player;
+	
+	//! selected & sorted targets by utility function
+	private ref array<ref ActionTarget> m_Targets;
+	
+	//! objects in vicinity
+	static private ref VicinityObjects m_VicinityObjects
+
+	private bool m_Debug
+	
+	private vector m_RayStart;
+	private vector m_RayEnd;
+	private vector m_HitPos;
+	
+	//--------------------------------------------------------
+	// Constants
+	//--------------------------------------------------------
+	//! searching properties
+	private const float c_RayDistance = 5.0;
+	private const float c_MaxTargetDistance = 3.0;
+	private const float c_MaxActionDistance = UAMaxDistances.DEFAULT;
+	private const float c_ConeAngle = 30.0;
+	private const float c_ConeHeightMin = -0.5;
+	private const float c_ConeHeightMax = 2.0;
+	private const float c_DistanceDelta = 0.3;
+	
+	//! utility constants
+	private const float c_UtilityMaxValue = 10000;
+	private const float c_UtilityMaxDistFromRaySqr = 0.8 * 0.8;
+
+	//! p3d 
+	private const string CE_CENTER 					= "ce_center";
+	private const float HEIGHT_OFFSET 				= 0.2;
+	
+	//! misc
+	private const int OBSTRUCTED_COUNT_THRESHOLD	= 3;
+	private const int GROUPING_COUNT_THRESHOLD		= 10;
+	
+	//! DEPRECATED
+	vector CalculateRayStart();
+};
+
+class ObjectGroup
+{
+	ref array<Object> Objects = new array<Object>;
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionVariantsManager.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionVariantsManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..59198db9a6950de8124278443b729db93b56d0f8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ActionVariantsManager.c
@@ -0,0 +1,55 @@
+class ActionVariantManager
+{
+	protected ref array<ref ActionBase> m_VariantActions;
+	protected typename m_type;
+	protected ref ScriptInvoker e_OnUpdate;
+	
+	void ActionVariantManager( typename type )
+	{
+		m_type = type;
+		m_VariantActions = new array<ref ActionBase>;
+		e_OnUpdate = new ScriptInvoker();
+	}
+	
+	ScriptInvoker GetOnUpdateInvoker()
+	{
+		return e_OnUpdate;
+	}
+	
+	void Clear()
+	{
+		m_VariantActions.Clear();
+	}
+	
+	void SetActionVariantCount( int count )
+	{
+		if ( count < m_VariantActions.Count() )
+		{
+			m_VariantActions.Clear();
+		}
+
+		for (int i = m_VariantActions.Count(); i < count; i++ )
+		{
+			ActionBase action = ActionManagerBase.GetActionVariant( m_type );
+			action.SetVariantID(i);
+			m_VariantActions.Insert(action);
+		}
+		
+	}
+	
+	int GetActions( out array<ref ActionBase> variants_action)
+	{
+		variants_action = m_VariantActions;
+		return m_VariantActions.Count();
+	}
+	
+	int GetActionsCount()
+	{
+		return m_VariantActions.Count();
+	}
+	
+	void UpdateVariants( Object item, Object target, int componet_index )
+	{
+		e_OnUpdate.Invoke( item, target, componet_index );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionConstants.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionConstants.c
new file mode 100644
index 0000000000000000000000000000000000000000..10cc3c3e9c7c9f5f38cfe3024374674c55a12b17
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionConstants.c
@@ -0,0 +1,158 @@
+/**@class	Constants for Quantity Consumed by action per action
+ */
+class UAQuantityConsumed
+{
+	const float DEFAULT = 1;
+	const float DISINFECT = 10;
+	const float EAT_SMALL = 10;
+	const float EAT_NORMAL = 15;
+	const float EAT_BIG = 25;
+	const float FILL_LIQUID = 200;
+	const float POUR_LIQUID = 100;
+	const float DRAIN_LIQUID = 100;
+	const float DRINK = 65;
+	const float BLOOD = 50;
+	const float SALINE = 100;
+	const float FUEL = 500;
+	const float FIREPLACE_EXTINGUISHER = 200;
+	const float FIREPLACE_LIQUID = 100;
+	const float GARDEN_FERTILIZE = 10;
+	const float GARDEN_WATER = 150;
+	const float GARDEN_DISINFECT_PLANT = 0.06;	
+};
+
+/**@class	Constants for Time spent while doing action
+ */
+class UATimeSpent
+{
+	const float DEFAULT 				= 1;
+	const float DEFAULT_PICK 			= 1.5;
+	const float DEFAULT_FILL 			= 8;
+	const float DEFAULT_SORT 			= 2;
+	const float DEFAULT_CONSTRUCT 		= 5;
+	const float DEFAULT_DECONSTRUCT 	= 15;
+	const float DEFAULT_REPAIR_CYCLE 	= 5;
+	const float DEFAULT_DESTROY 		= 60;
+	const float DEFAULT_PLACE 			= 0;
+	const float DEFAULT_DEPLOY 			= 5;
+	const float DEFAULT_CRAFT 			= 6;
+	const float DEFAULT_DECRAFT 		= 5;
+	
+	const float BANDAGE = 4;
+	const float ADD_FUEL_TO_TORCH = 4;
+	const float APPLY_SPLINT = 10;
+	const float SEW_WOUNDS = 2;
+	const float SEW_CUTS = 8;
+	const float COLLECT_BLOOD = 10;
+	const float COLLECT_SAMPLE = 3;
+	const float TEST_BLOOD = 5;
+	const float DEFIBRILATE = 3;
+	const float INJECT = 3;
+	const float MEASURE_TEMP = 12;
+	const float CHECK_PULSE = 5;
+	const float COVER_HEAD = 0.5;
+	const float RESTRAIN = 10;
+	const float UNRESTRAIN = 20;
+	const float SHAVE = 12.75;
+	const float SKIN = 10;
+	
+	const float BASEBUILDING_CONSTRUCT_FAST = 5;
+	const float BASEBUILDING_CONSTRUCT_MEDIUM = 7.5;
+	const float BASEBUILDING_CONSTRUCT_SLOW = 10;
+	const float BASEBUILDING_DECONSTRUCT_FAST = 10;
+	const float BASEBUILDING_DECONSTRUCT_MEDIUM = 12;
+	const float BASEBUILDING_DECONSTRUCT_SLOW = 15;
+	const float BASEBUILDING_REPAIR_FAST = 3;
+	const float BASEBUILDING_REPAIR_MEDIUM = 5;
+	const float BASEBUILDING_REPAIR_SLOW = 10;
+
+	const float DRINK_POND = 2.0;
+	const float DRINK_WELL = 3.5;
+
+	const float DIG_GARDEN = 4;
+	const float DIG_STASH = 10;
+	const float DIG_WORMS = 10;
+
+	const float BURY_ASHES = 6;
+	const float BURY_BODY = 12;
+
+	const float LOCK = 2;
+	const float UNLOCK = 2;
+	const float UNPACK = 2;
+	const float WASH_HANDS = 3;
+	const float WRING = 8;
+	const float DISARM_MINE = 15;
+	const float DISARM_EXPLOSIVE_REMOTE_PAIRED = 6;
+	const float DISARM_EXPLOSIVE_REMOTE_UNPAIRED = 12;
+	
+	const float MAG_EMPTY = 0.5;
+	const float MAG_LOAD = 0.5;
+	
+	const float FIREPLACE_IGNITE = 4;
+	//const float FIREPLACE_HANDDRILL = 8;
+	const float SALINE = 2;
+	const float BLOOD = 2;
+	
+	const float START_ENGINE = 0.5;
+	//const float INFINITE = -1;
+	
+	const float EXPLOSIVE_ARM = 6;
+};
+
+/**@class	Constants for maximal Distances where from the action can be done
+ */
+class UAMaxDistances
+{
+	const float SMALL = 1.3;
+	const float DEFAULT = 2.0;
+	const float REPAIR = 3.0;
+	const float LARGE = 8.0;
+	const float LADDERS = 1.3;
+	const float BASEBUILDING = 20;
+	const float BASEBUILDING_SHORT = 1.0;
+	const float EXPLOSIVE_REMOTE_ACTIVATION = 100.0;
+};
+
+/**@class	Constants for specialty weight and type
+ */
+class UASoftSkillsWeight
+{
+	const float ROUGH_LOW = 0.01;
+	const float ROUGH_MEDIUM = 0.02;
+	const float ROUGH_HIGH = 0.03;
+	const float PRECISE_LOW = -0.01;
+	const float PRECISE_MEDIUM = -0.02;
+	const float PRECISE_HIGH = -0.03;
+};
+
+/**@class	Constants for damage values that are applied to item when using certain action
+ */
+class UADamageApplied
+{
+	const float BUILD 			= 4;
+	const float DISMANTLE 		= 8;
+	const float REPAIR 			= 3;
+	const float DESTROY 		= 25;
+	const float SAW_LOCK 		= 150;
+	const float SKINNING 		= 4;
+	const float SAW_PLANKS		= 4;
+	const float DEFUSE_TOOLS	= 2;
+};
+
+/**@class	Constants for water type
+ */
+class UAWaterType
+{
+	const string SEA 	= "sea"; //! fake
+	const string FRESH 	= "fresh_water";
+	const string STILL 	= "still_water";
+
+	const string ALL 	= string.Format("%1|%2|%3", UAWaterType.SEA, UAWaterType.FRESH, UAWaterType.STILL);
+}
+
+/**@class	Miscelaneous constants for use in actions
+ */
+class UAMisc
+{
+	const float FLAG_STEP_INCREMENT = 0.2; //0..1
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionContinuousBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionContinuousBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..51c732bdab27d94e14f9a8b4e0a3ce0187db05ff
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionContinuousBase.c
@@ -0,0 +1,256 @@
+class ActionContinuousBaseCB : ActionBaseCB
+{	
+	bool m_inLoop = false;
+	bool m_callLoopEnd = false;
+		
+	bool CancelCondition()
+	{
+		if ( !m_ActionData )
+		{
+			return DefaultCancelCondition();
+		}
+		if ((GetState() == STATE_LOOP_LOOP || GetState() == STATE_LOOP_LOOP2 || m_inLoop) )
+		{
+			ActionContinuousBase actionS = ActionContinuousBase.Cast(m_ActionData.m_Action);	
+			if ( m_ActionData.m_State == UA_INITIALIZE )
+			{
+				actionS.OnStartAnimationLoop( m_ActionData );
+				m_ActionData.m_State = UA_PROCESSING;
+				m_callLoopEnd = true;
+			}
+			
+			if (!m_Interrupted)
+				actionS.Do(m_ActionData, m_ActionData.m_State);
+		}
+		else if (m_callLoopEnd == true)
+		{
+			ActionContinuousBase actionE = ActionContinuousBase.Cast(m_ActionData.m_Action);
+			actionE.OnEndAnimationLoop( m_ActionData );
+			m_callLoopEnd = false;
+		}
+		return DefaultCancelCondition();
+	}
+	
+	
+	override void OnAnimationEvent(int pEventID)	
+	{
+		if ( m_ActionData && m_ActionData.m_Action )
+		{
+			AnimatedActionBase action = AnimatedActionBase.Cast(m_ActionData.m_Action);
+#ifdef DEVELOPER
+			//Print("ActionInteractBase.c | OnAnimationEvent | OnAnimationEvent called");
+#endif
+			
+			if ( LogManager.IsActionLogEnable() )
+			{
+				Debug.ActionLog("Time stamp: " + m_ActionData.m_Player.GetSimulationTimeStamp() + " / " + pEventID, this.ToString() , "n/a", "OnAnimationEvent", m_ActionData.m_Player.ToString() );
+			}
+			
+			if ( !m_Interrupted && pEventID == UA_IN_START ) 
+			{
+				m_inLoop = true;
+			//ActionContinuousBase.Cast(action).OnStartLoop( m_ActionData );
+			}
+			else if ( !m_Interrupted && pEventID == UA_IN_END ) 
+			{
+			
+				m_inLoop = false;
+				//ActionContinuousBase.Cast(action).OnCompleteLoop( m_ActionData );
+			}
+			else if ( !m_Interrupted && pEventID == UA_ANIM_EVENT ) 
+			{
+				action.OnAnimationEvent( m_ActionData );
+				//action.OnCompleteLoop( m_ActionData );
+			}
+		}
+		else
+		{
+			//Debug.LogError("Call OnAnimationEvent ")
+		}
+	}
+	
+	override void InitActionComponent()
+	{
+		m_Interrupted = false;
+		m_Canceled = false;
+		m_inLoop = false;
+
+		CreateActionComponent();
+		if ( m_ActionData.m_ActionComponent ) 
+		{
+			m_ActionData.m_ActionComponent.Init(m_ActionData);		
+		}
+		m_ActionData.m_State = UA_INITIALIZE;
+		RegisterAnimationEvent("ActionExecStart", UA_IN_START);
+		RegisterAnimationEvent("ActionExecEnd", UA_IN_END);
+		RegisterAnimationEvent("ActionExec", UA_ANIM_EVENT);
+		EnableCancelCondition(true);
+		m_SoundObject = m_ActionData.m_Action.PlayActionSound(m_ActionData.m_Player);
+	}
+	
+	override void EndActionComponent()
+	{		
+		// TODO for second type animation SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+		if ( m_ActionData.m_State == UA_FINISHED )
+		{
+			SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+		}
+		else if (m_ActionData.m_State == UA_CANCEL )
+		{
+			ActionContinuousBase action = ActionContinuousBase.Cast(m_ActionData.m_Action);
+			if(action.HasAlternativeInterrupt())
+			{
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+			}
+			else
+			{
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			}
+			m_Canceled = true;
+			return;
+			//Cancel();
+		}
+		else
+		{
+			m_Canceled = true;
+			SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			return;
+		}
+		m_ActionData.m_State = UA_FINISHED;
+	}	
+	
+	void UserEndsAction()
+	{
+		if ( m_ActionData.m_ActionComponent ) 
+		{
+			m_ActionData.m_State = m_ActionData.m_ActionComponent.Cancel(m_ActionData);
+		}
+		EndActionComponent();
+	}
+};
+
+class ActionContinuousBase : AnimatedActionBase
+{
+	PluginAdminLog 	m_AdminLog; 
+	
+	void ActionContinuousBase() 
+	{
+		m_CallbackClass = ActionContinuousBaseCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EAT;
+		
+		if( GetGame() && GetGame().IsServer() )
+		{
+			m_AdminLog = PluginAdminLog.Cast( GetPlugin(PluginAdminLog) );
+		}
+	}
+	
+	override void OnEndInput( ActionData action_data )
+	{
+		ActionContinuousBaseCB callback;
+		if( Class.CastTo(callback, action_data.m_Callback) )
+		{
+			if ( callback.GetState() != callback.STATE_LOOP_END && callback.GetState() != callback.STATE_LOOP_END2 )
+			{
+				callback.UserEndsAction();
+			}
+		}
+	}
+	
+	bool HasAlternativeInterrupt()
+	{
+		return false;
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousDefaultActionInput;
+	}
+
+	override int GetActionCategory()
+	{
+		return AC_CONTINUOUS;
+	}
+	
+	void OnStartAnimationLoop( ActionData action_data )
+	{
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog("Time stamp: " + action_data.m_Player.GetSimulationTimeStamp(), this.ToString() , "n/a", "OnStartAnimationLoop", action_data.m_Player.ToString() );
+		}
+		
+		if (GetGame().IsServer())
+		{
+			OnStartAnimationLoopServer(action_data);
+		}
+		else
+		{
+			OnStartAnimationLoopClient(action_data);
+		}
+		action_data.m_WasExecuted = false;
+	}
+	
+	void OnEndAnimationLoop( ActionData action_data )
+	{
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog("Time stamp: " + action_data.m_Player.GetSimulationTimeStamp(), this.ToString() , "n/a", "OnEndAnimationLoop", action_data.m_Player.ToString() );
+		}
+		if (GetGame().IsServer())
+		{
+			OnEndAnimationLoopServer(action_data);
+		}
+		else
+		{
+			OnEndAnimationLoopClient(action_data);
+		}
+		action_data.m_WasExecuted = false;
+	}
+	
+	void OnFinishProgress( ActionData action_data )
+	{	
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog("Time stamp: " + action_data.m_Player.GetSimulationTimeStamp(), this.ToString() , "n/a", "OnFinishProgress", action_data.m_Player.ToString() );
+		}	
+		if (GetGame().IsServer())
+		{
+			OnFinishProgressServer(action_data);
+			
+			if ( m_AdminLog )
+			{
+				m_AdminLog.OnContinouousAction( action_data );
+			}
+		}
+		else
+		{
+			OnFinishProgressClient(action_data);
+		}
+		action_data.m_WasExecuted = false;
+	}
+	
+	
+	protected void OnStartAnimationLoopServer( ActionData action_data ) //method called on start main animation loop (after in animation part )
+	{
+		action_data.m_WasActionStarted  = true;
+	}
+	
+	protected void OnStartAnimationLoopClient( ActionData action_data ) //method called on start main animation loop (after in animation part )
+	{
+		action_data.m_WasActionStarted  = true;
+	}
+	
+	protected void OnEndAnimationLoopServer( ActionData action_data ) //method called on finish main animation loop (before out animation part )
+	{
+	}
+	protected void OnEndAnimationLoopClient( ActionData action_data ) //method called on finish main animation loop (before out animation part )
+	{
+	}
+	
+	protected void OnFinishProgressServer( ActionData action_data )
+	{
+	}
+	
+	protected void OnFinishProgressClient( ActionData action_data )
+	{
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInstantBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInstantBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a459a41880a8a6b0553f18ec39015ed6eec3113
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInstantBase.c
@@ -0,0 +1,7 @@
+class ActionInstantBase : ActionBase
+{
+	override bool IsInstant()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInteractBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInteractBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..55aad900dde5ddfc9c59e43651b003477016d62e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInteractBase.c
@@ -0,0 +1,96 @@
+class ActionInteractBaseCB : ActionBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAInteract;
+	}
+
+	override void OnAnimationEvent(int pEventID)	
+	{	
+#ifdef DIAG_DEVELOPER
+		if ( LogManager.IsActionLogEnable() )
+		{
+			if (m_ActionData)
+				Debug.ActionLog("n/a", m_ActionData.m_Action.ToString() , "n/a", "OnAnimationEvent", m_ActionData.m_Player.ToString() );
+		}
+#endif
+		if ( !m_Interrupted && pEventID == UA_ANIM_EVENT && m_ActionData && m_ActionData.m_Action ) 
+		{
+			AnimatedActionBase action = AnimatedActionBase.Cast(m_ActionData.m_Action);
+			action.OnAnimationEvent(m_ActionData);
+		}	
+	}
+	
+	override void InitActionComponent()
+	{
+#ifdef DIAG_DEVELOPER
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog("n/a", m_ActionData.m_Action.ToString() , "n/a", "InitActionComponent", m_ActionData.m_Player.ToString() );
+		}
+#endif
+		m_Interrupted = false;
+		m_Canceled = false;
+
+		CreateActionComponent();
+		if ( m_ActionData.m_ActionComponent ) 
+		{
+			m_ActionData.m_ActionComponent.Init(m_ActionData);
+		}
+		m_ActionData.m_State = UA_PROCESSING;
+		RegisterAnimationEvent("ActionExec", UA_ANIM_EVENT);
+		m_SoundObject = m_ActionData.m_Action.PlayActionSound(m_ActionData.m_Player);
+	}	
+	
+	override void EndActionComponent()
+	{
+		SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+		m_ActionData.m_State = UA_FINISHED;
+	}	
+};
+
+
+
+class ActionInteractBase : AnimatedActionBase
+{
+	//deprecated
+	string m_HUDCursorIcon;
+	
+	void ActionInteractBase() 
+	{
+		m_CallbackClass = ActionInteractBaseCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTObject(UAMaxDistances.DEFAULT);
+	}
+	
+	//deprecated
+	string GetHUDCursorIcon()
+	{
+		return "";
+	}
+	
+	override typename GetInputType()
+	{
+		return InteractActionInput;
+	}
+
+	override int GetActionCategory()
+	{
+		return AC_INTERACT;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override bool MainItemAlwaysInHands()
+	{
+		return false;
+	}	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInteractLoopBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInteractLoopBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3dbe4ac9d26730a90a17207106308eb567c6e25f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionInteractLoopBase.c
@@ -0,0 +1,44 @@
+class ActionInteractLoopBaseCB : ActionInteractBaseCB
+{
+	
+	bool CancelCondition()
+	{
+		if ( !m_ActionData )
+		{
+			return DefaultCancelCondition();
+		}
+		//SetCommand(DayZPlayerConstants.CMD_ACTIONINT_ACTIONLOOP);
+		//Print("cancel condition enabled: " + GetState().ToString() );
+		if ( !m_Interrupted && (GetState() == STATE_LOOP_LOOP || GetState() == STATE_LOOP_LOOP2) )
+		{	
+			AnimatedActionBase action = AnimatedActionBase.Cast(m_ActionData.m_Action);
+			action.Do(m_ActionData,m_ActionData.m_State);
+		}
+		return DefaultCancelCondition(); 
+	}
+	
+	override void OnAnimationEvent(int pEventID)	
+	{
+	}
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAInteract;
+	}
+	
+	override void InitActionComponent()
+	{
+		super.InitActionComponent();
+		EnableCancelCondition(true);
+	}
+	
+};
+
+class ActionInteractLoopBase : ActionInteractBase
+{	
+	void ActionInteractLoopBase() 
+	{
+		m_CallbackClass = ActionInteractLoopBaseCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionSequentialBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionSequentialBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..247844df0c4260320d448cee32fd5e8150502ebb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionSequentialBase.c
@@ -0,0 +1,79 @@
+class SequentialActionData : ActionData
+{
+	int m_Stage;
+	void MultiStageBaseActionData()
+	{
+		m_Stage = 0;
+	}
+}
+
+class ActionSequentialBase : ActionBase
+{
+	void ActionMultiStageBase() 
+	{
+	}
+	
+	override ActionData CreateActionData()
+	{
+		ActionData action_data = new SequentialActionData;
+		return action_data;
+	}
+	
+	override int GetStanceMask(PlayerBase player)
+	{
+		return DayZPlayerConstants.STANCEMASK_ALL;
+	}
+	
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+
+	override typename GetInputType()
+	{
+		return DefaultActionInput;
+	}
+	
+	override bool CanBePerformedFromInventory()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedRaised()
+	{
+		return true;
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		SequentialActionData ad = SequentialActionData.Cast( action_data );
+		OnStageStart( ad );
+	}
+	
+	void SetStage(int stage, SequentialActionData action_data)
+	{
+		OnStageEnd(action_data);
+		action_data.m_Stage = stage;
+		OnStageStart(action_data);
+	}
+	
+	void OnStageStart(SequentialActionData action_data)
+	{
+	}
+		
+	void OnStageEnd(SequentialActionData action_data)
+	{
+	}
+	
+	override float GetProgress( ActionData action_data )
+	{
+		return -1;
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionSingleUseBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionSingleUseBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..99c3391ff95ceaff2057ea373e516ad17c231ae0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/ActionSingleUseBase.c
@@ -0,0 +1,58 @@
+class ActionSingleUseBaseCB : ActionBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUse;
+	}
+
+	override void OnAnimationEvent(int pEventID)	
+	{
+		if ( m_ActionData )
+		{
+			if ( !m_Interrupted && pEventID == UA_ANIM_EVENT && m_ActionData.m_Action ) 
+			{
+				AnimatedActionBase action = AnimatedActionBase.Cast(m_ActionData.m_Action);
+				action.OnAnimationEvent(m_ActionData);
+			}
+		}
+	}
+	
+	override void InitActionComponent()
+	{
+		m_Interrupted = false;
+		m_Canceled = false;
+
+		CreateActionComponent();
+		if ( m_ActionData.m_ActionComponent )
+		{ 
+			m_ActionData.m_ActionComponent.Init(m_ActionData);
+		}
+		m_ActionData.m_State = UA_PROCESSING;
+		RegisterAnimationEvent("ActionExec", UA_ANIM_EVENT);
+		m_SoundObject = m_ActionData.m_Action.PlayActionSound(m_ActionData.m_Player);
+		}	
+	
+	override void EndActionComponent()
+	{
+		m_ActionData.m_State = UA_FINISHED;
+	}	
+};
+
+class ActionSingleUseBase : AnimatedActionBase
+{
+	void ActionSingleUseBase()
+	{
+		m_CallbackClass = ActionSingleUseBaseCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+	}
+
+	override typename GetInputType()
+	{
+		return DefaultActionInput;
+	} 
+
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionActivateTrap.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionActivateTrap.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b78a2adc8b1e5bc1ad941157930af28e1cfb686
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionActivateTrap.c
@@ -0,0 +1,134 @@
+class ActionActivateTrapCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_DEPLOY);
+	}
+	
+	override void InitActionComponent()
+	{
+		super.InitActionComponent();
+		
+		RegisterAnimationEvent("CraftingAction", UA_IN_CRAFTING);
+	}
+}
+
+class ActionActivateTrap : ActionContinuousBase
+{	
+	void ActionActivateTrap()
+	{
+		m_CallbackClass		= ActionActivateTrapCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Sound 			= "craft_universal_0";
+		m_SpecialtyWeight 	= UASoftSkillsWeight.PRECISE_LOW;
+
+		m_Text = "#activate";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool HasProgress()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		if (targetItem && targetItem.IsBeingPlaced())
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if (targetObject != null)
+		{
+			if (targetObject.IsInherited(TrapBase))
+			{
+				TrapBase trap = TrapBase.Cast(targetObject);
+				if (trap.IsActivable())
+					return true;
+			}
+			else if (targetObject.IsInherited(TrapSpawnBase))
+			{
+				TrapSpawnBase spawnTrap = TrapSpawnBase.Cast(targetObject);
+			
+				if (spawnTrap && !spawnTrap.IsActive())
+					return spawnTrap.IsPlaceableAtPosition(spawnTrap.GetPosition());
+			}
+		} 
+		
+		return false;
+	}
+	
+	override void OnStartAnimationLoop( ActionData action_data )
+	{
+		super.OnStartAnimationLoop( action_data );
+
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			TrapBase trap = TrapBase.Cast( action_data.m_Target.GetObject() );
+			if ( trap )
+			{
+				Param1<bool> play = new Param1<bool>( true );
+				GetGame().RPCSingleParam( trap, SoundTypeTrap.ACTIVATING, play, true );
+			}
+		}
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			TrapBase trap = TrapBase.Cast( action_data.m_Target.GetObject());
+			if ( trap )
+			{
+				Param1<bool> play = new Param1<bool>( false );
+				GetGame().RPCSingleParam( trap, SoundTypeTrap.ACTIVATING, play, true );
+			}
+		}
+	}
+	
+	override void OnEndAnimationLoop(ActionData action_data)
+	{
+		super.OnEndAnimationLoop(action_data);
+
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			TrapBase trap = TrapBase.Cast( action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>(false);
+			GetGame().RPCSingleParam(trap, SoundTypeTrap.ACTIVATING, play, true);
+		}
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		if (targetObject != null)
+		{
+			vector orientation = action_data.m_Player.GetOrientation();
+			vector position =  targetObject.GetPosition();
+			
+			if (targetObject.IsInherited(TrapBase))
+			{
+				TrapBase trap = TrapBase.Cast(targetObject);
+				trap.OnPlacementComplete(action_data.m_Player, position, orientation);
+				trap.StartActivate(action_data.m_Player);
+			}
+			else if (targetObject.IsInherited(TrapSpawnBase))
+			{
+				TrapSpawnBase spawnTrap = TrapSpawnBase.Cast( targetObject );
+				spawnTrap.OnPlacementComplete(action_data.m_Player, position, orientation);
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionArmExplosive.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionArmExplosive.c
new file mode 100644
index 0000000000000000000000000000000000000000..f111df9db5ab962510242ad5f6bf08bd79ad3861
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionArmExplosive.c
@@ -0,0 +1,66 @@
+class ActionArmExplosiveCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.EXPLOSIVE_ARM);
+	}
+	
+	override void InitActionComponent()
+	{
+		super.InitActionComponent();
+		
+		RegisterAnimationEvent("CraftingAction", UA_IN_CRAFTING);
+	}
+}
+
+class ActionArmExplosive : ActionContinuousBase
+{	
+	void ActionArmExplosive()
+	{
+		m_CallbackClass		= ActionArmExplosiveCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody			= true;
+		m_SpecialtyWeight	= UASoftSkillsWeight.PRECISE_LOW;
+		m_Text				= "#STR_ArmExplosive";
+		m_Sound				= "craft_universal_0";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget 	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem 	= new CCINotPresent();
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool HasProgress()
+	{
+		return true;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (target.GetParent())
+			return false;
+
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		if (targetItem && targetItem.IsBeingPlaced())
+			return false;
+
+		ExplosivesBase explosive = ExplosivesBase.Cast(target.GetObject());
+
+		return explosive && !explosive.GetArmed();
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		super.OnFinishProgressServer(action_data);
+
+		ExplosivesBase explosive = ExplosivesBase.Cast(action_data.m_Target.GetObject());
+		if (explosive)
+			explosive.OnPlacementComplete(action_data.m_Player, explosive.GetPosition(), action_data.m_Player.GetOrientation());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionAttachExplosivesTrigger.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionAttachExplosivesTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..4855f03340a3ae1467ccf51f317c876373ee1b18
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionAttachExplosivesTrigger.c
@@ -0,0 +1,141 @@
+class ActionAttachExplosivesTriggerCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.EXPLOSIVE_ARM);
+	}
+}
+
+class ActionAttachExplosivesTrigger : ActionContinuousBase
+{
+	void ActionAttachExplosivesTrigger()
+	{
+		m_CallbackClass		= ActionAttachExplosivesTriggerCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody			= true;
+		m_SpecialtyWeight	= UASoftSkillsWeight.PRECISE_LOW;
+
+		m_Text = "#STR_ArmExplosive";
+	}
+
+	override void CreateConditionComponents() 
+	{
+		m_ConditionTarget 	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem 	= new CCINonRuined();
+	}
+	
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		return true;
+	}
+	
+	override bool CanBeSetFromInventory()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (target.GetParent())
+		{
+			return false;
+		}
+		
+		if (ClaymoreMine.Cast(target.GetObject()))
+		{
+			return false;
+		}
+		
+		ExplosivesBase explosive = ExplosivesBase.Cast(target.GetObject());
+		if (explosive)
+		{
+			ClockBase timedTrigger;
+			if (ClockBase.CastTo(timedTrigger, item))
+			{
+				return timedTrigger.IsAlarmOn() && explosive.IsTimerDetonable() && explosive.CanBeArmed();
+			}
+			
+			return explosive.CanBeArmed();		
+		}
+		
+
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ClearInventoryReservationEx(action_data);
+		
+		ExplosivesBase explosive = ExplosivesBase.Cast(action_data.m_Target.GetObject());
+		if (explosive)
+		{
+			explosive.OnPlacementComplete(action_data.m_Player, explosive.GetPosition(), action_data.m_Player.GetOrientation());
+			explosive.UnlockTriggerSlots();
+		}
+		
+		if (action_data.m_MainItem.IsInherited(RemoteDetonator))
+		{
+			CreateRemoteDetonatorReceiverAsAttachment(action_data);
+
+			return;
+		}
+		else
+		{
+			AttachItem(action_data);
+		}
+	}
+	
+	override void OnFinishProgressClient(ActionData action_data)
+	{
+		ClearInventoryReservationEx(action_data);
+
+		ExplosivesBase explosive = ExplosivesBase.Cast(action_data.m_Target.GetObject());		
+		if (explosive)
+		{	
+			explosive.UnlockTriggerSlots();
+		}
+		
+		if (!action_data.m_MainItem.IsInherited(RemoteDetonator))
+		{
+			AttachItem(action_data);
+		}
+	}
+	
+	protected void CreateRemoteDetonatorReceiverAsAttachment(ActionData action_data)
+	{
+		ExplosivesBase explosive;
+		if (action_data.m_Target.IsProxy())
+		{
+			explosive = ExplosivesBase.Cast(action_data.m_Target.GetParent());
+		}
+		else
+		{
+			explosive = ExplosivesBase.Cast(action_data.m_Target.GetObject());
+		}
+		
+		if (explosive && action_data.m_MainItem)
+		{		
+			explosive.UnlockTriggerSlots();
+			RemoteDetonatorTrigger.SpawnInPlayerHands(action_data.m_Player, explosive);
+		}
+	}
+	
+	protected void AttachItem(ActionData action_data)
+	{
+		EntityAI targetEAI;	
+		if (action_data.m_Target.IsProxy())
+		{
+			targetEAI = EntityAI.Cast(action_data.m_Target.GetParent());
+		}
+		else
+		{
+			targetEAI = EntityAI.Cast(action_data.m_Target.GetObject());
+		}
+		
+		if (targetEAI && action_data.m_MainItem)
+		{
+			int slotId = InventorySlots.GetSlotIdFromString(action_data.m_MainItem.GetExplosiveTriggerSlotName());
+			action_data.m_Player.PredictiveTakeEntityToTargetAttachmentEx(targetEAI, action_data.m_MainItem, slotId);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBreakLongWoodenStick.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBreakLongWoodenStick.c
new file mode 100644
index 0000000000000000000000000000000000000000..768fc5b768b52e998cdc6c6acae54783c763a08e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBreakLongWoodenStick.c
@@ -0,0 +1,89 @@
+class ActionBreakLongWoodenStickCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_BREAK_STICKS = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_BREAK_STICKS,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_BREAK_STICKS);
+	}
+};
+
+class ActionBreakLongWoodenStick: ActionContinuousBase
+{
+	void ActionBreakLongWoodenStick()
+	{
+		m_CallbackClass = ActionBreakLongWoodenStickCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_split0";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (item.IsEmpty() && (!item.GetCompEM() || !item.GetCompEM().IsWorking()))
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		ItemBase startingItem = action_data.m_MainItem;
+		
+		BreakLongWoodenStick lambda = new BreakLongWoodenStick(action_data.m_MainItem, "WoodenStick", action_data.m_Player, 3);
+		action_data.m_Player.ServerReplaceItemInHandsWithNew(lambda);
+		
+		if (LongWoodenStick.Cast(startingItem) == null) // case if it is a broom
+		{
+			EntityAI longStick = action_data.m_Player.SpawnEntityOnGroundPos("LongWoodenStick", action_data.m_Player.GetPosition());
+			
+			ItemBase item_result;
+			Class.CastTo(item_result, longStick);
+			
+			MiscGameplayFunctions.TransferItemProperties(action_data.m_MainItem, item_result);
+		}
+	}
+};
+
+class BreakLongWoodenStick : ReplaceItemWithNewLambdaBase
+{
+	int m_ItemCount;
+	
+	void BreakLongWoodenStick(EntityAI old_item, string new_item_type, PlayerBase player, int count) 
+	{
+		m_ItemCount = count; 
+	}
+
+	override void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+
+		ItemBase sticks;
+		Class.CastTo(sticks, new_item);
+		
+		ItemBase ingredient;
+		Class.CastTo(ingredient, old_item);
+		
+		MiscGameplayFunctions.TransferItemProperties(ingredient, sticks);
+		
+		sticks.SetQuantity(m_ItemCount);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildOven.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildOven.c
new file mode 100644
index 0000000000000000000000000000000000000000..1e4c6ce0ad5974a30b93a26a010bacbf5c593e66
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildOven.c
@@ -0,0 +1,83 @@
+class ActionBuildOvenCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.DEFAULT_CONSTRUCT );
+	}
+}
+
+class ActionBuildOven: ActionContinuousBase
+{
+	void ActionBuildOven()
+	{
+		m_CallbackClass = ActionBuildOvenCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#build_oven";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool HasProgress()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object target_object = target.GetObject();
+			
+		if ( target_object && target_object.IsFireplace() )
+		{
+			FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+			
+			if ( fireplace_target.IsBaseFireplace() && fireplace_target.CanBuildOven() )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		Object target_object = action_data.m_Target.GetObject();
+		FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+		
+		if ( fireplace_target.CanBuildOven() )
+		{
+			ItemBase attached_item = ItemBase.Cast( fireplace_target.GetAttachmentByType( fireplace_target.ATTACHMENT_STONES ) );
+			
+			/*InventoryLocation inventory_location = new InventoryLocation;
+			attached_item.GetInventory().GetCurrentInventoryLocation( inventory_location );
+			fireplace_target.GetInventory().SetSlotLock( inventory_location.GetSlot(), true );*/
+			
+			//set oven state
+			fireplace_target.SetOvenState( true );
+			fireplace_target.SetOrientation( action_data.m_Player.GetOrientation() - "180 0 0" );
+			
+			// extend lifetime
+			fireplace_target.SetLifetimeMax( FireplaceBase.LIFETIME_FIREPLACE_STONE_OVEN );
+
+			//add specialty to soft skills
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildPart.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildPart.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5e257ad5605d9d90af56f36720512a5f46222b7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildPart.c
@@ -0,0 +1,241 @@
+class BuildPartActionReciveData : ActionReciveData
+{
+	string m_PartType;
+}
+
+class BuildPartActionData : ActionData
+{
+	string m_PartType;
+};
+
+class ActionBuildPartCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		float time = SetCallbackDuration(m_ActionData.m_MainItem);
+		m_ActionData.m_ActionComponent = new CAContinuousTime(time);
+	}
+	
+	float SetCallbackDuration(ItemBase item)
+	{
+		return UATimeSpent.BASEBUILDING_CONSTRUCT_MEDIUM;
+	}
+};
+
+class ActionBuildPart: ActionContinuousBase
+{
+	void ActionBuildPart()
+	{
+		m_CallbackClass = ActionBuildPartCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_ASSEMBLE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#build";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override void OnActionInfoUpdate(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ConstructionActionData construction_action_data = player.GetConstructionActionData();
+		ConstructionPart constrution_part = construction_action_data.GetBuildPartAtIndex(m_VariantID);
+			
+		if (constrution_part)
+		{
+			m_Text = "#build " + constrution_part.GetName();
+		}
+	}
+	
+	override bool CanBeUsedLeaning()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (player.IsPlacingLocal() || player.IsPlacingServer())
+			return false;
+		
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		//gate..
+		if (target.GetObject() && (!target.GetObject().CanUseConstructionBuild() || target.GetObject().CanUseHandConstruction()))
+			return false;
+		
+		if ((!GetGame().IsDedicatedServer()))
+		{
+			if (MiscGameplayFunctions.ComplexBuildCollideCheckClient(player, target, item, m_VariantID))
+			{
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
+	
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast(action_data.m_Target.GetObject());
+		Construction construction = base_building.GetConstruction();
+		string part_name = BuildPartActionData.Cast(action_data).m_PartType;
+		CollisionCheckData check_data = new CollisionCheckData;
+		
+		check_data.m_PartName = part_name;
+		check_data.m_AdditionalExcludes.Insert(action_data.m_Player);
+		
+		bool canBuild = construction.CanBuildPart(part_name, action_data.m_MainItem, true);
+		if (GetGame().IsServer())
+		{
+			bool collides = construction.IsCollidingEx(check_data);
+			
+			return !collides && canBuild;
+		}
+		else
+		{
+			return canBuild;
+		}
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast(action_data.m_Target.GetObject());
+		Construction construction = base_building.GetConstruction();
+		
+		string part_name = BuildPartActionData.Cast(action_data).m_PartType;
+		CollisionCheckData check_data = new CollisionCheckData;
+		
+		check_data.m_PartName = part_name;
+		check_data.m_AdditionalExcludes.Insert(action_data.m_Player);
+		
+		if (!construction.IsCollidingEx(check_data) && construction.CanBuildPart(part_name, action_data.m_MainItem, true)) //redundant at this point?
+		{
+			//build
+			construction.BuildPartServer(action_data.m_Player, part_name, AT_BUILD_PART);
+			//add damage to tool
+			action_data.m_MainItem.DecreaseHealth(UADamageApplied.BUILD, false);
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+		}
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+    {
+        return "Base_building";
+    }
+	
+	override ActionData CreateActionData()
+	{
+		BuildPartActionData action_data = new BuildPartActionData;
+		return action_data;
+	}
+	
+	//setup
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{	
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			SetBuildingAnimation(item);
+			
+			if (!GetGame().IsDedicatedServer())
+			{
+				ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+				BuildPartActionData.Cast(action_data).m_PartType = construction_action_data.GetBuildPartAtIndex(m_VariantID).GetPartName();
+			}
+			return true;
+		}
+		
+		return false;
+	}
+	
+	protected void SetBuildingAnimation(ItemBase item)
+	{
+		switch (item.Type())
+		{
+			case Pickaxe:
+			case Shovel:
+			case FarmingHoe:
+			case FieldShovel:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIG;
+				break;
+			case Pliers:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+				break;
+			case SledgeHammer:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_MINEROCK;
+				break;
+			default:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_ASSEMBLE;
+				break;
+		}
+	}
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		ctx.Write(BuildPartActionData.Cast(action_data).m_PartType);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data)
+	{
+		action_recive_data = new BuildPartActionReciveData;
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		string part_type;
+		if (ctx.Read(part_type))
+		{
+			BuildPartActionReciveData.Cast(action_recive_data).m_PartType = part_type;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+		
+		BuildPartActionData.Cast(action_data).m_PartType = BuildPartActionReciveData.Cast(action_recive_data).m_PartType;
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		string partName = BuildPartActionData.Cast(action_data).m_PartType;
+		
+		string message = string.Format("Built %1 on %2 with %3", partName, action_data.m_Target.GetObject().GetDisplayName(), action_data.m_MainItem.GetDisplayName());
+		return message;
+	}
+}
+
+class ActionActionBuildPartNoTool: ActionBuildPart
+{
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildStoneCircle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildStoneCircle.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7f6d72576545c909d91c169fca03549efbe515a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuildStoneCircle.c
@@ -0,0 +1,79 @@
+class ActionBuildStoneCircleCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.DEFAULT_CONSTRUCT );
+	}
+}
+
+class ActionBuildStoneCircle: ActionContinuousBase
+{
+	void ActionBuildStoneCircle()
+	{
+		m_CallbackClass = ActionBuildStoneCircleCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#build_stonecircle";
+		
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool HasProgress()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object target_object = target.GetObject();
+			
+		if ( target_object && target_object.IsFireplace() )
+		{
+			FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+			
+			if ( fireplace_target.IsBaseFireplace() && fireplace_target.CanBuildStoneCircle() )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		Object target_object = action_data.m_Target.GetObject();
+		FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+		
+		if ( fireplace_target.CanBuildStoneCircle() )
+		{
+			ItemBase attached_item = ItemBase.Cast( fireplace_target.GetAttachmentByType( fireplace_target.ATTACHMENT_STONES ) );
+			
+			/*InventoryLocation inventory_location = new InventoryLocation;
+			attached_item.GetInventory().GetCurrentInventoryLocation( inventory_location );
+			fireplace_target.GetInventory().SetSlotLock( inventory_location.GetSlot(), true );*/
+			
+			//set oven state
+			fireplace_target.SetStoneCircleState( true );
+			
+			// extend lifetime
+			fireplace_target.SetLifetimeMax( FireplaceBase.LIFETIME_FIREPLACE_STONE_CIRCLE );
+
+			//add specialty to soft skills
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuryAshes.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuryAshes.c
new file mode 100644
index 0000000000000000000000000000000000000000..b235233768c9365161309870e90a19cd9b11e553
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuryAshes.c
@@ -0,0 +1,68 @@
+class ActionBuryAshesCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.BURY_ASHES);
+	}
+}
+
+class ActionBuryAshes: ActionContinuousBase
+{
+	void ActionBuryAshes()
+	{
+		m_CallbackClass		= ActionBuryAshesCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#bury";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem		= new CCINonRuined();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (player.IsPlacingLocal())
+		{
+			return false;
+		}
+		
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+		{
+			return false;
+		}
+		
+		Fireplace fireplaceTarget = Fireplace.Cast(target.GetObject());
+		if (fireplaceTarget)
+		{
+			if (fireplaceTarget.HasAshes() && !fireplaceTarget.IsBurning() && fireplaceTarget.IsEmpty())
+			{
+				int liquidType;
+				string surfaceType;
+				GetGame().SurfaceUnderObject(fireplaceTarget, surfaceType, liquidType);
+				if (GetGame().IsSurfaceDigable(surfaceType))
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		//destroy fireplace with ashes
+		GetGame().ObjectDelete(action_data.m_Target.GetObject());
+
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 4);
+		
+		//add soft skill specialty
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty(UASoftSkillsWeight.ROUGH_LOW);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuryBody.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuryBody.c
new file mode 100644
index 0000000000000000000000000000000000000000..57ff3acf4920b2a14978069227548b728d878002
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionBuryBody.c
@@ -0,0 +1,71 @@
+class ActionBuryBodyCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.BURY_BODY);
+	}
+};
+
+class ActionBuryBody: ActionContinuousBase
+{	
+	void ActionBuryBody()
+	{
+		m_CallbackClass		= ActionBuryBodyCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#bury";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionTarget	= new CCTDummy();
+		m_ConditionItem		= new CCINonRuined();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (player.IsPlacingLocal())
+		{
+			return false;
+		}
+		
+		EntityAI bodyEAI;
+		Class.CastTo(bodyEAI, target.GetObject());
+		
+		if (bodyEAI && !bodyEAI.IsAlive() && (bodyEAI.IsInherited(DayZCreature) || bodyEAI.IsInherited(Man) || bodyEAI.IsInherited(DeadChicken_ColorBase) ) && !bodyEAI.GetParent())
+		{
+			int liquidType;
+			string surfaceType;
+			GetGame().SurfaceUnderObject(bodyEAI, surfaceType, liquidType);
+			
+			if (GetGame().IsSurfaceDigable(surfaceType))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool Can(PlayerBase player, ActionTarget target, ItemBase item, int condition_mask)
+	{
+		if (!super.Can(player, target, item, condition_mask))
+			return false;
+		
+		return player.CheckFreeSpace(vector.Forward, 1.0, false);
+	}
+
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{	
+		Object targetObject = action_data.m_Target.GetObject();
+		g_Game.ObjectDelete(targetObject);
+
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 4);
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionConsume.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionConsume.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d90d4bbcae8ecbc3c9fd07cd241114e9c16187c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionConsume.c
@@ -0,0 +1,52 @@
+class ActionConsumeCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.DEFAULT, UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionConsume: ActionContinuousBase
+{
+	void ActionConsume()
+	{
+		m_CallbackClass 	= ActionConsumeCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_EAT;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_EAT;
+
+		m_Text = "#eat";	
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINotRuinedAndEmpty();
+		m_ConditionTarget 	= new CCTSelf();
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{	
+		ItemBase item = action_data.m_MainItem;
+		
+		if (item && item.GetQuantity() <= 0.01)
+		{
+			item.SetQuantity(0);
+		}
+		else if (item && GetProgress(action_data) > 0)
+		{
+			// we don't want to inject an agent into an empty container
+			PlayerBase player = action_data.m_Player;
+			PluginTransmissionAgents plugin = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+			plugin.TransmitAgents(player, item, AGT_UACTION_TO_ITEM);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCookOnStick.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCookOnStick.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba8c9364bbb8ae8ec01dc0e30057a3a95062f11b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCookOnStick.c
@@ -0,0 +1,73 @@
+class ActionCookOnStickCB : ActionContinuousBaseCB
+{
+	private const float COOKING_ON_STICK_UPDATE_TIME = 1;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTimeCooking( COOKING_ON_STICK_UPDATE_TIME );
+	}
+};
+
+class ActionCookOnStick: ActionContinuousBase
+{
+	void ActionCookOnStick()
+	{
+		m_CallbackClass 	= ActionCookOnStickCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_GESTUREFB_CAMPFIRE;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_LOW;
+		
+		m_LockTargetOnUse 	= false;
+		m_Text 				= "#cook_on_stick";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem		= new CCINonRuined;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		FireplaceBase fireplace_target = FireplaceBase.Cast(target.GetObject());
+		Object targetObject = target.GetObject();
+		Edible_Base item_on_stick = Edible_Base.Cast(item.GetAttachmentByType(Edible_Base));
+		if (fireplace_target && fireplace_target.CanCookOnStick() && item_on_stick && item_on_stick.CanBeCookedOnStick())
+		{
+			//fireplace
+			if (fireplace_target.IsBaseFireplace())
+			{
+				Fireplace fireplace = Fireplace.Cast(fireplace_target);
+				if (!fireplace.IsOven() && fireplace_target.CanCookOnStick())
+				{
+					return true;
+				}
+			}
+			
+			//fireplace indoor
+			if (fireplace_target.IsFireplaceIndoor())
+			{
+				if (fireplace_target.CanCookOnStick()) 
+				{
+					return true;
+				}	
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		super.OnEndServer(action_data);
+		
+		ItemBase stick = action_data.m_MainItem;
+		Edible_Base item_on_stick = Edible_Base.Cast(stick.GetAttachmentByType(Edible_Base));
+
+		if (item_on_stick)
+		{
+			item_on_stick.MakeSoundsOnClient(false);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCoverHeadSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCoverHeadSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..5803fd3b2566cea3e38268b3ef3ada970c1ad131
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCoverHeadSelf.c
@@ -0,0 +1,60 @@
+class ActionCoverHeadSelfCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.COVER_HEAD);
+	}
+};
+
+class ActionCoverHeadSelf: ActionContinuousBase
+{	
+	void ActionCoverHeadSelf()
+	{
+		m_CallbackClass = ActionCoverHeadSelfCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_COVERHEAD_SELF;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE;
+		//m_Animation = "INJECTEPIPENS";
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#put_on_head";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSelf;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if (IsWearingHeadgear(player)) 
+			return false;
+
+		return true;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		ItemBase new_item;
+		if (Class.CastTo(new_item,action_data.m_Player.GetInventory().CreateAttachmentEx("BurlapSackCover",InventorySlots.HEADGEAR)))
+		{
+			MiscGameplayFunctions.TransferItemProperties(action_data.m_MainItem,new_item,true,false,true);
+			action_data.m_MainItem.Delete();
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+		}
+	}
+
+
+	bool IsWearingHeadgear( PlayerBase player )
+	{
+		if (player.GetInventory().FindAttachment(InventorySlots.HEADGEAR))
+		{
+			return true;
+		}
+		return false;		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCoverHeadTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCoverHeadTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..9a6e4a6947e09751f000621ad27d670361f91b76
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCoverHeadTarget.c
@@ -0,0 +1,75 @@
+class ActionCoverHeadTargetCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.COVER_HEAD);
+	}
+};
+
+class ActionCoverHeadTarget: ActionContinuousBase
+{	
+	void ActionCoverHeadTarget()
+	{
+		m_CallbackClass = ActionCoverHeadTargetCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_COVERHEAD_TARGET;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		//m_Animation = "INJECTEPIPENS";
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#put_on_targets_head";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);		
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		PlayerBase targetPlayer;
+		Class.CastTo(targetPlayer, target.GetObject());
+		if ( !IsWearingHeadgear(targetPlayer) ) 
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		PlayerBase ntarget;
+		
+		if (Class.CastTo(ntarget, action_data.m_Target.GetObject()) && CanReceiveAction(action_data.m_Target))
+		{
+			CoverHeadOfTargetPlayerLambda lambda = new CoverHeadOfTargetPlayerLambda(action_data.m_MainItem, "BurlapSackCover", ntarget);
+			action_data.m_Player.ServerReplaceItemInHandsWithNewElsewhere(lambda);
+
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+	
+	bool IsWearingHeadgear( PlayerBase player)
+	{
+		if ( player.GetInventory().FindAttachment(InventorySlots.HEADGEAR) )
+		{
+			return true;
+		}
+		return false;
+	}
+};
+
+class CoverHeadOfTargetPlayerLambda : TurnItemIntoItemLambda
+{
+	PlayerBase m_TargetPlayer;
+
+	void CoverHeadOfTargetPlayerLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+		m_TargetPlayer = player;
+		
+		InventoryLocation targetAtt = new InventoryLocation;
+		targetAtt.SetAttachment(m_TargetPlayer, NULL, InventorySlots.HEADGEAR);
+		OverrideNewLocation(targetAtt);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraft.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraft.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c34026ee20b056921f4fc3ea165f9e4f9c9f352
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraft.c
@@ -0,0 +1,79 @@
+class ActionCraftCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousCraft(0); //default value can be set in recipes
+	}
+};
+
+class ActionCraft: ActionContinuousBase
+{
+	bool m_HasStarted;
+		
+	ItemBase m_Item1;
+	ItemBase m_Item2;
+		
+	int m_RecipeID;
+	
+	void ActionCraft()
+	{
+		m_Sound = "craft_universal_0";
+		
+		m_CallbackClass = ActionCraftCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		
+		m_Text = "#craft";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}	
+		
+	//override void OnStart( ActionData action_data )
+	//{
+		/*
+		if( action_data.m_Player.GetCraftingMeta() ) 	
+		{
+			m_Item1 = action_data.m_Player.GetCraftingMeta().GetIngredient1();
+		 	m_Item2 = action_data.m_Player.GetCraftingMeta().GetIngredient2();
+			m_RecipeID = action_data.m_Player.GetCraftingMeta().GetRecipeID();
+			if(m_Item1 == NULL || m_Item2 == NULL || m_RecipeID < 0) return;
+		}
+		*/
+		//m_HasStarted = true;
+	//}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		/*if( !m_HasStarted )
+		{
+			if ( player.IsCraftingSetUp() )
+			{
+				return true;
+			}
+			return false;
+		}
+		else
+		{
+			return true;
+		}*/
+	}
+
+
+	
+	override void ApplyModifiers( ActionData action_data )
+	{
+	}
+
+
+
+	void CancelCraft(PlayerBase player)
+	{
+		//action_data.m_Player.SetCraftingReady(false);
+		//action_data.m_Player.DisableCrafting();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftArmband.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftArmband.c
new file mode 100644
index 0000000000000000000000000000000000000000..75edb4d856eb087ec68afd46c6fdbe9f47473c00
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftArmband.c
@@ -0,0 +1,49 @@
+class ActionCraftArmbandCB: ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.BANDAGE);
+	}
+}
+
+class ActionCraftArmband: ActionContinuousBase
+{
+	void ActionCraftArmband()
+	{
+		m_CallbackClass 	= ActionCraftArmbandCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.PRECISE_LOW;
+		m_Text 				= "#STR_craftarmband0";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget	= new CCTSelf();
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		return true;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{	
+		EntityAI armband = action_data.m_Player.SpawnEntityOnGroundPos("Armband_White", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-1);
+		
+		MiscGameplayFunctions.TransferItemProperties(action_data.m_MainItem, armband);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBolts.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBolts.c
new file mode 100644
index 0000000000000000000000000000000000000000..6da5994833ea1dc75b5f014cb97b3cc37ea7024b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBolts.c
@@ -0,0 +1,131 @@
+class ActionCraftBoltsCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT = 3.0;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(TIME_TO_CRAFT);
+	}
+};
+
+class ActionCraftBolts: ActionContinuousBase
+{
+	const ref set<string> CUTTING_TYPES = new set<string>();
+	
+	protected bool 				m_IsKnifeInHands;
+	protected Ammunition_Base 	m_ResultEntity;
+	
+	void InitCuttingTypes()
+	{
+		CUTTING_TYPES.Clear();
+		CUTTING_TYPES.Insert("Sickle");
+		CUTTING_TYPES.Insert("KukriKnife");
+		CUTTING_TYPES.Insert("FangeKnife");
+		CUTTING_TYPES.Insert("KitchenKnife");
+		CUTTING_TYPES.Insert("SteakKnife");
+		CUTTING_TYPES.Insert("StoneKnife");
+		CUTTING_TYPES.Insert("Cleaver");
+		CUTTING_TYPES.Insert("CombatKnife");
+		CUTTING_TYPES.Insert("HuntingKnife");
+		CUTTING_TYPES.Insert("Machete");
+		CUTTING_TYPES.Insert("CrudeMachete");
+		CUTTING_TYPES.Insert("OrientalMachete");
+		CUTTING_TYPES.Insert("WoodAxe");
+		CUTTING_TYPES.Insert("Hatchet");
+		CUTTING_TYPES.Insert("FirefighterAxe");
+		CUTTING_TYPES.Insert("AK_Bayonet");
+		CUTTING_TYPES.Insert("M9A1_Bayonet");
+		CUTTING_TYPES.Insert("SKS_Bayonet");
+		CUTTING_TYPES.Insert("BoneKnife");
+	}
+	
+	void ActionCraftBolts()
+	{
+		m_CallbackClass 	= ActionCraftBoltsCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody 			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_HIGH;
+		
+		m_Text = "#STR_CraftBolt0";
+
+		InitCuttingTypes();
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNonRuined();
+	}
+	
+	protected bool IsCuttingType(Object item)
+	{
+		return CUTTING_TYPES.Find(item.ClassName()) >= 0;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (IsCuttingType(item))
+		{
+			//knife in hands
+			if (target.GetObject())
+				return (target.GetObject().ClassName() == "WoodenStick");
+		}
+		else if (target.GetObject())
+		{
+			// material in hands
+			return IsCuttingType(target.GetObject());
+		}
+
+		return false;
+	}
+
+	override void OnStartServer(ActionData action_data)
+	{
+		m_IsKnifeInHands = IsCuttingType(action_data.m_MainItem);
+		m_ResultEntity = null;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ItemBase knife;
+		ItemBase material;
+
+		bool added = false;
+		
+		if (m_IsKnifeInHands)
+		{
+			//knife in hands
+			knife = action_data.m_MainItem;
+			material = ItemBase.Cast(action_data.m_Target.GetObject());
+		}
+		else
+		{
+			// material in hands
+			material = action_data.m_MainItem;
+			knife = ItemBase.Cast(action_data.m_Target.GetObject());
+		}
+		
+		if (!material || !knife)
+			return;
+		
+		if (m_ResultEntity)
+		{
+			if (m_ResultEntity.GetAmmoCount() < m_ResultEntity.GetAmmoMax())
+			{
+				m_ResultEntity.ServerAddAmmoCount(1);
+				added = true;
+			}
+		}
+		
+		if (!added)
+		{
+			m_ResultEntity = Ammunition_Base.Cast(action_data.m_Player.SpawnEntityOnGroundPos("Ammo_ImprovisedBolt_1", action_data.m_Player.GetPosition()));
+			m_ResultEntity.SetHealth("", "", material.GetHealth("", ""));
+			m_ResultEntity.ServerSetAmmoCount(1);
+		}
+		
+		material.AddQuantity(-1);
+		knife.AddHealth("","",-3);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoltsFeather.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoltsFeather.c
new file mode 100644
index 0000000000000000000000000000000000000000..25808c352958082a5abe7ca228f0acce248c5e78
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoltsFeather.c
@@ -0,0 +1,110 @@
+class ActionCraftBoltsFeatherCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT = 3.0;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(TIME_TO_CRAFT);
+	}
+};
+
+class ActionCraftBoltsFeather: ActionContinuousBase
+{
+	protected bool 				m_IsFeatherInHands;
+	protected Ammunition_Base 	m_ResultEntity;
+	
+	void ActionCraftBoltsFeather()
+	{
+		m_CallbackClass 	= ActionCraftBoltsFeatherCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_HIGH;
+
+		m_Text = "#STR_CraftBolt1";
+
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNonRuined();
+	}
+	
+	protected bool IsFeatherType(string itemInHandsType)
+	{
+		return itemInHandsType == "ChickenFeather";
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (IsFeatherType(item.ClassName()))
+		{
+			//feather in hands
+			if (target.GetObject())
+				return (target.GetObject().ClassName() == "Ammo_ImprovisedBolt_1");
+		}
+		else if (target.GetObject())
+		{
+			// bolt in hands
+			return IsFeatherType(target.GetObject().ClassName());
+		}
+		return false;
+	}
+
+	override void OnStartServer(ActionData action_data)
+	{
+		m_IsFeatherInHands = IsFeatherType(action_data.m_MainItem.ClassName());
+		m_ResultEntity = null;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ItemBase feather;
+		Ammunition_Base bolt;
+
+		bool added = false;
+		
+		if (m_IsFeatherInHands)
+		{
+			//feather in hands
+			feather = action_data.m_MainItem;
+			bolt = Ammunition_Base.Cast(action_data.m_Target.GetObject());
+		}
+		else
+		{
+			// bolt in hands
+			bolt = Ammunition_Base.Cast(action_data.m_MainItem);
+			feather = ItemBase.Cast(action_data.m_Target.GetObject());
+		}
+		
+		if (!bolt || !feather)
+			return;
+		
+		float dmg;
+		string type;
+		
+		bolt.ServerAcquireCartridge(dmg, type);
+		
+		if (m_ResultEntity)
+		{
+			type = m_ResultEntity.ConfigGetString("Ammo");
+			if (m_ResultEntity.GetAmmoCount() < m_ResultEntity.GetAmmoMax())
+			{
+				m_ResultEntity.ServerStoreCartridge(dmg, type);
+				added = true;
+			}
+		}
+		
+		if (!added)
+		{
+			m_ResultEntity = Ammunition_Base.Cast(action_data.m_Player.SpawnEntityOnGroundPos("Ammo_ImprovisedBolt_2", action_data.m_Player.GetPosition()));
+			type = m_ResultEntity.ConfigGetString("Ammo");
+			m_ResultEntity.ServerSetAmmoCount(0);
+			m_ResultEntity.ServerStoreCartridge(dmg, type);
+			m_ResultEntity.SetHealth01("", "", bolt.GetHealth01("", ""));
+		}
+
+		feather.AddQuantity(-1);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoneKnife.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoneKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..3455d45601f3a072b61e8f48e317df08c71b5083
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoneKnife.c
@@ -0,0 +1,54 @@
+class ActionCraftBoneKnifeCB : ActionContinuousBaseCB
+{	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_KNIFE,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_CRAFT);
+	}
+};
+
+class ActionCraftBoneKnife: ActionContinuousBase
+{
+	void ActionCraftBoneKnife()
+	{
+		m_CallbackClass = ActionCraftBoneKnifeCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftBoneKnife0";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() >= 2 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{		
+		EntityAI knife = action_data.m_Player.SpawnEntityOnGroundPos("BoneKnife", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-2);
+		
+		MiscGameplayFunctions.TransferItemProperties(action_data.m_MainItem, knife);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "BoneKnife_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoneKnifeEnv.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoneKnifeEnv.c
new file mode 100644
index 0000000000000000000000000000000000000000..f6c9535a83eaf11089113bedff938eed90bb5073
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftBoneKnifeEnv.c
@@ -0,0 +1,61 @@
+class ActionCraftBoneKnifeEnvCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_KNIFE = 5;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_KNIFE);
+	}
+};
+
+class ActionCraftBoneKnifeEnv: ActionContinuousBase
+{
+	void ActionCraftBoneKnifeEnv()
+	{
+		
+		m_CallbackClass = ActionCraftBoneKnifeEnvCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftBoneKnife0";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if ( targetObject.IsRock() )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI knife;
+		
+		knife = action_data.m_Player.SpawnEntityOnGroundPos("BoneKnife", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-1);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, knife);
+
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "BoneKnife_stone";
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedEyePatch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedEyePatch.c
new file mode 100644
index 0000000000000000000000000000000000000000..5275fccce5a84859607697cffaaba726aa974bf7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedEyePatch.c
@@ -0,0 +1,52 @@
+class ActionCraftImprovisedEyePatchCB : ActionContinuousBaseCB
+{	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_REPAIR_CYCLE);
+	}
+};
+
+class ActionCraftImprovisedEyePatch: ActionContinuousBase
+{
+	void ActionCraftImprovisedEyePatch()
+	{
+		m_CallbackClass = ActionCraftImprovisedEyePatchCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedEyePatch";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("EyePatch_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-1);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedFaceCover.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedFaceCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..1dd2771651a8ea00627f7eedcda1dc5f410ff483
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedFaceCover.c
@@ -0,0 +1,59 @@
+class ActionCraftImprovisedFaceCoverCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_CLOTHES,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_CLOTHES);
+	}
+};
+
+class ActionCraftImprovisedFaceCover: ActionContinuousBase
+{
+	void ActionCraftImprovisedFaceCover()
+	{
+		m_CallbackClass = ActionCraftImprovisedFaceCoverCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedFaceCover";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() >= 2 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("FaceCover_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-2);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedFeetCover.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedFeetCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..b570123a80fb3054acc9fc72b765f1ad1feec140
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedFeetCover.c
@@ -0,0 +1,59 @@
+class ActionCraftImprovisedFeetCoverCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_CLOTHES,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_CLOTHES);
+	}
+};
+
+class ActionCraftImprovisedFeetCover: ActionContinuousBase
+{
+	void ActionCraftImprovisedFeetCover()
+	{
+		m_CallbackClass = ActionCraftImprovisedFeetCoverCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedFeetCover";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() >= 2 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("FeetCover_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-2);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedHandsCover.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedHandsCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..3020ff1cff2f3e5a29d36555feefc90653a40362
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedHandsCover.c
@@ -0,0 +1,59 @@
+class ActionCraftImprovisedHandsCoverCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_CLOTHES,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_CLOTHES);
+	}
+};
+
+class ActionCraftImprovisedHandsCover: ActionContinuousBase
+{
+	void ActionCraftImprovisedHandsCover()
+	{
+		m_CallbackClass = ActionCraftImprovisedHandsCoverCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedHandsCover";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() >= 2 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("HandsCover_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-2);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedHeadCover.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedHeadCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ff34f9bfb84c3166b11c5917f81ee5b46480b47
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedHeadCover.c
@@ -0,0 +1,60 @@
+class ActionCraftImprovisedHeadCoverCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_CLOTHES,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_CLOTHES);
+	}
+};
+
+
+class ActionCraftImprovisedHeadCover: ActionContinuousBase
+{
+	void ActionCraftImprovisedHeadCover()
+	{
+		m_CallbackClass = ActionCraftImprovisedHeadCoverCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedHeadCover";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() >= 2 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("HeadCover_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-2);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedLegsCover.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedLegsCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..b28c3af7b6e58576ab3c5566264a0549a1b40f65
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedLegsCover.c
@@ -0,0 +1,59 @@
+class ActionCraftImprovisedLegsCoverCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_CLOTHES,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_CLOTHES);
+	}
+};
+
+class ActionCraftImprovisedLegsCover: ActionContinuousBase
+{
+	void ActionCraftImprovisedLegsCover()
+	{
+		m_CallbackClass = ActionCraftImprovisedLegsCoverCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedLegsCover";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() == 6 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("LegsCover_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-6);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedTorsoCover.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedTorsoCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..4582bdecd25e802ebdae410b15fdae7c169c06e0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftImprovisedTorsoCover.c
@@ -0,0 +1,59 @@
+class ActionCraftImprovisedTorsoCoverCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+	
+	override void CreateActionComponent()
+	{
+		//float adjusted_time = m_ActionData.m_Player.GetSoftSkillsManager().AdjustCraftingTime(TIME_TO_CRAFT_CLOTHES,UASoftSkillsWeight.ROUGH_HIGH);	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_CLOTHES);
+	}
+};
+
+class ActionCraftImprovisedTorsoCover: ActionContinuousBase
+{
+	void ActionCraftImprovisedTorsoCover()
+	{
+		m_CallbackClass = ActionCraftImprovisedTorsoCoverCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftImprovisedTorsoCover";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( item.GetQuantity() ==6 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI cover;
+		
+		cover = action_data.m_Player.SpawnEntityOnGroundPos("TorsoCover_Improvised", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.AddQuantity(-6);
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, cover);
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+	{
+		return "ImprovisedCloth_craft";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftRopeBelt.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftRopeBelt.c
new file mode 100644
index 0000000000000000000000000000000000000000..7cd0fef3e7ad18f82354a025b3e56bc637663a78
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftRopeBelt.c
@@ -0,0 +1,48 @@
+class ActionCraftRopeBeltCB : ActionContinuousBaseCB
+{	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(3);
+	}
+};
+
+class ActionCraftRopeBelt: ActionContinuousBase
+{
+	void ActionCraftRopeBelt()
+	{
+		m_CallbackClass = ActionCraftRopeBeltCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftRopeBelt";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{			
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI belt;
+		
+		belt = action_data.m_Player.SpawnEntityOnGroundPos("RopeBelt", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.Delete();
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, belt);
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftStoneKnifeEnv.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftStoneKnifeEnv.c
new file mode 100644
index 0000000000000000000000000000000000000000..9e7688a40e86391aced592c8142b3d4c87d0290d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCraftStoneKnifeEnv.c
@@ -0,0 +1,56 @@
+class ActionCraftStoneKnifeEnvCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_CRAFT_KNIFE = 5;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(TIME_TO_CRAFT_KNIFE);
+	}
+};
+
+class ActionCraftStoneKnifeEnv: ActionContinuousBase
+{
+	void ActionCraftStoneKnifeEnv()
+	{
+		
+		m_CallbackClass = ActionCraftStoneKnifeEnvCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#STR_CraftStoneKnife0";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if ( targetObject.IsRock() )
+		{
+			return true;
+		}
+		return false;
+		
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		EntityAI item_ingredient = action_data.m_MainItem;
+		EntityAI knife;
+		
+		knife = action_data.m_Player.SpawnEntityOnGroundPos("StoneKnife", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.Delete();
+		
+		MiscGameplayFunctions.TransferItemProperties(item_ingredient, knife);
+
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCreateGreenhouseGardenPlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCreateGreenhouseGardenPlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..434f774822e3f00ffd1ce1839898474b9021ba21
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionCreateGreenhouseGardenPlot.c
@@ -0,0 +1,108 @@
+class ActionCreateGreenhouseGardenPlotCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DIG_GARDEN);
+	}
+};
+
+class ActionCreateGreenhouseGardenPlot: ActionContinuousBase
+{
+	GardenPlot m_GardenPlot;
+	private const float CAMERA_PITCH_THRESHOLD = -30;
+	
+	void ActionCreateGreenhouseGardenPlot()
+	{
+		m_CallbackClass		= ActionCreateGreenhouseGardenPlotCB;
+		m_FullBody			= true;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#make_garden_plot";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( !target ) 
+			return false;
+		
+		if ( player.IsPlacingLocal() )
+			return false;
+
+		Object target_object = target.GetObject();
+		
+		Land_Misc_Greenhouse greenHouse = Land_Misc_Greenhouse.Cast( target_object );
+		Land_Misc_Polytunnel polytunnel = Land_Misc_Polytunnel.Cast( target_object) ;
+		
+		if ( target_object && ( greenHouse || polytunnel ) )
+		{
+			string action_selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+			//Update selections in model, name the desired part Soil to improve action condition check
+			if ( action_selection != "soil" )
+				return false;
+			
+			//check if there is any gardenplot objects in the current building
+			ref array<Object> nearest_objects = new array<Object>;
+			ref array<CargoBase> proxy_cargos = new array<CargoBase>;
+			vector pos = target_object.GetPosition();
+			pos[1] = pos[1] - 1; //Lower by one meter for check if plot already present
+			GetGame().GetObjectsAtPosition3D( pos, 2, nearest_objects, proxy_cargos );
+	
+			for ( int i = 0; i < nearest_objects.Count(); ++i )
+			{
+				Object object = nearest_objects.Get( i );
+				
+				if ( object.IsInherited( GardenPlot ) )
+				{
+					return false;
+				}
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		PlaceObjectActionData poActionData;
+		poActionData = PlaceObjectActionData.Cast(action_data);
+		EntityAI entity_for_placing = action_data.m_MainItem;
+		Object targetObject = action_data.m_Target.GetObject();
+		
+		vector position = targetObject.GetPosition();
+		
+		//Depending on where we dig the required height offset is not the same
+		Land_Misc_Greenhouse greenHouse = Land_Misc_Greenhouse.Cast( targetObject );
+		Land_Misc_Polytunnel polytunnel = Land_Misc_Polytunnel.Cast( targetObject) ;
+		
+		if ( polytunnel )
+			position[1] = position[1] - 1.15; //Lower Y position by roughly 1 meter to compensate for spawning location offset
+		else
+			position[1] = position[1] - 1.05;
+		
+		vector orientation = targetObject.GetOrientation();
+		
+		if ( GetGame().IsMultiplayer() )
+		{		
+			Land_Misc_Polytunnel tunnel = Land_Misc_Polytunnel.Cast(action_data.m_Target.GetObject());
+			if (tunnel)
+			{
+				m_GardenPlot = GardenPlot.Cast( GetGame().CreateObjectEx( "GardenPlotPolytunnel", position, ECE_KEEPHEIGHT ) );
+			}
+			else
+			{
+				m_GardenPlot = GardenPlot.Cast( GetGame().CreateObjectEx( "GardenPlotGreenhouse", position, ECE_KEEPHEIGHT ) );
+			}
+			
+			m_GardenPlot.SetOrientation( orientation );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftDrysackBag.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftDrysackBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..36408d42f82248e07807f40bcb9673a3e7e07ba4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftDrysackBag.c
@@ -0,0 +1,55 @@
+class ActionDeCraftDrysackBagCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{	
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_DECRAFT);
+	}
+}
+
+class ActionDeCraftDrysackBag: ActionContinuousBase
+{
+	void ActionDeCraftDrysackBag()
+	{
+		m_CallbackClass		= ActionDeCraftDrysackBagCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#dismantle";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return item.IsEmpty();
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data )
+	{
+		EntityAI mainItem = action_data.m_MainItem;
+		
+		string color = mainItem.ConfigGetString("color");
+		string className = "WaterproofBag_" + color;
+		
+		EntityAI result1 = action_data.m_Player.SpawnEntityOnGroundPos(className, action_data.m_Player.GetPosition());
+		EntityAI result2 = action_data.m_Player.SpawnEntityOnGroundPos("Rope", action_data.m_Player.GetPosition());
+		
+		if (!result1 || !result2)
+			return;
+		
+		MiscGameplayFunctions.TransferItemProperties(mainItem, result1);
+		MiscGameplayFunctions.TransferItemProperties(mainItem, result2);
+		
+		action_data.m_MainItem.Delete();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftRopeBelt.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftRopeBelt.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2b490700aedcaafc5b5866dad49fabd0ef93cfc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftRopeBelt.c
@@ -0,0 +1,50 @@
+class ActionDeCraftRopeBeltCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_DECRAFT);
+	}
+
+	//! DEPRECATED
+	private const float TIME_TO_CRAFT_CLOTHES = 5.0;
+}
+
+class ActionDeCraftRopeBelt : ActionContinuousBase
+{
+	void ActionDeCraftRopeBelt()
+	{
+		m_CallbackClass 	= ActionDeCraftRopeBeltCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_HIGH;
+
+		m_Text = "#STR_DeCraftRopeBelt";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{		
+		return item.GetInventory().AttachmentCount() == 0;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{		
+		EntityAI ropebelt = action_data.m_MainItem;
+		
+		EntityAI rope = action_data.m_Player.SpawnEntityOnGroundPos("Rope", action_data.m_Player.GetPosition());
+		action_data.m_MainItem.Delete();
+		
+		MiscGameplayFunctions.TransferItemProperties(ropebelt, rope);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftWitchHoodCoif.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftWitchHoodCoif.c
new file mode 100644
index 0000000000000000000000000000000000000000..8a10144db494139db7521fc2c0584917710c00f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDeCraftWitchHoodCoif.c
@@ -0,0 +1,56 @@
+class ActionDeCraftWitchHoodCoifCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_DECRAFT);
+	}
+}
+
+class ActionDeCraftWitchHoodCoif : ActionContinuousBase
+{
+	void ActionDeCraftWitchHoodCoif()
+	{
+		m_CallbackClass 	= ActionDeCraftWitchHoodCoifCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_HIGH;
+
+		m_Text = "#dismantle";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		EntityAI mainItem = action_data.m_MainItem;
+		
+		string color = mainItem.ConfigGetString("color");
+		string className = "WitchHood_" + color;
+		
+		EntityAI result1 = action_data.m_Player.SpawnEntityOnGroundPos(className, action_data.m_Player.GetPosition());
+		EntityAI result2 = action_data.m_Player.SpawnEntityOnGroundPos("Chainmail_Coif", action_data.m_Player.GetPosition());
+		
+		if (!result1 || !result2)
+			return;
+		
+		MiscGameplayFunctions.TransferItemProperties(mainItem, result1);
+		MiscGameplayFunctions.TransferItemProperties(mainItem, result2);
+		
+		action_data.m_MainItem.Delete();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDestroyCombinationLock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDestroyCombinationLock.c
new file mode 100644
index 0000000000000000000000000000000000000000..a59bcb0fec02f06d0a16b76f4793a2b784bb6dca
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDestroyCombinationLock.c
@@ -0,0 +1,70 @@
+class ActionDestroyCombinationLockCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(6.0);
+	}
+};
+
+class ActionDestroyCombinationLock: ActionContinuousBase
+{
+	static int CYCLES = 5;
+	void ActionDestroyCombinationLock()
+	{
+		m_CallbackClass = ActionDestroyCombinationLockCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DISASSEMBLE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_MEDIUM;
+		m_Text = "#destroy_combination_lock";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		string selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+		Fence fence = Fence.Cast( target_object );
+		
+		if ( fence && fence.IsLocked() && selection == "wall_interact" )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		Fence fence = Fence.Cast( action_data.m_Target.GetObject() );
+		if ( fence )
+		{
+			CombinationLock combination_lock = fence.GetCombinationLock();
+			if ( combination_lock )
+			{
+				combination_lock.AddHealth("","",-(combination_lock.GetMaxHealth("","")/CYCLES));
+				
+				if ( combination_lock.IsDamageDestroyed() )
+				{
+					combination_lock.UnlockServer( action_data.m_Player, fence );
+					GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( combination_lock.DestroyLock, 200, false );
+				}
+			}
+		}
+		
+		action_data.m_MainItem.DecreaseHealth( UADamageApplied.SAW_LOCK, false );
+		
+		//soft skills
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return " destroyed combination lock with " + action_data.m_MainItem.GetDisplayName();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDestroyPart.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDestroyPart.c
new file mode 100644
index 0000000000000000000000000000000000000000..c1c0ce0d2ad516308a080b698e6c314c0838ff68
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDestroyPart.c
@@ -0,0 +1,130 @@
+class ActionDestroyPartCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat( UATimeSpent.DEFAULT_DESTROY/ActionDestroyPart.Cast(m_ActionData.m_Action).CYCLES );
+	}
+};
+
+class ActionDestroyPart: ActionContinuousBase
+{
+	static int CYCLES = 4;
+	
+	void ActionDestroyPart()
+	{
+		m_CallbackClass = ActionDestroyPartCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DISASSEMBLE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;		
+		
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#destroy";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ConstructionActionData construction_action_data = player.GetConstructionActionData();	
+		m_Text = "#destroy " + construction_action_data.GetTargetPart();
+	}
+	
+	override bool CanBeUsedLeaning()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		return DestroyCondition( player, target, item, true );
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{	
+		return DestroyCondition( action_data.m_Player, action_data.m_Target, action_data.m_MainItem , false );
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( action_data.m_Target.GetObject() );
+		Construction construction = base_building.GetConstruction();
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		ConstructionPart construction_part = construction_action_data.GetTargetPart();
+		
+		if ( construction.CanDestroyPart( construction_part.GetPartName() ) )
+		{
+			//build
+			string part_name = construction_part.GetPartName();
+			string zone_name;
+			DamageSystem.GetDamageZoneFromComponentName(base_building,part_name,zone_name);
+			
+			if (zone_name != "")
+			{
+				base_building.AddHealth(zone_name,"Health",-(base_building.GetMaxHealth(zone_name,"")/CYCLES));
+				if ( base_building.GetHealth(zone_name,"Health") < 1 )
+					construction.DestroyPartServer( action_data.m_Player, construction_part.GetPartName(), AT_DESTROY_PART );
+			}
+			else
+			{
+				construction.DestroyPartServer( action_data.m_Player, construction_part.GetPartName(), AT_DESTROY_PART );
+			}
+			
+			//add damage to tool
+			action_data.m_MainItem.DecreaseHealth( UADamageApplied.DESTROY, false );
+		}
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	protected bool DestroyCondition( PlayerBase player, ActionTarget target, ItemBase item, bool camera_check )
+	{	
+		Object target_object = target.GetObject();
+		if ( target_object && target_object.CanUseConstruction() )
+		{
+			string part_name = target_object.GetActionComponentName( target.GetComponentIndex() );
+			
+			BaseBuildingBase base_building = BaseBuildingBase.Cast( target_object );
+			Construction construction = base_building.GetConstruction();		
+			ConstructionPart construction_part = construction.GetConstructionPartToDestroy( part_name );
+			
+			if ( construction_part )
+			{
+				//camera and position checks
+				if ( !player.GetInputController().CameraIsFreeLook() && IsInReach(player, target, UAMaxDistances.DEFAULT) && !player.GetInputController().CameraIsFreeLook() )
+				{
+					//Camera check (client-only)
+					if ( camera_check )
+					{
+						if ( GetGame() && ( !GetGame().IsDedicatedServer() ) )
+						{
+							if ( !base_building.IsFacingCamera( part_name ) )
+							{
+								return false;
+							}
+						}
+					}
+					
+					ConstructionActionData construction_action_data = player.GetConstructionActionData();
+					construction_action_data.SetTargetPart( construction_part );
+					
+					return true;				
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return " destroyed " + action_data.m_Target.GetObject().GetDisplayName() + " with " + action_data.m_MainItem.GetDisplayName();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDialCombinationLock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDialCombinationLock.c
new file mode 100644
index 0000000000000000000000000000000000000000..ccbb185def98e3759d9f79f610ebd682bf9b5cc2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDialCombinationLock.c
@@ -0,0 +1,64 @@
+class ActionDialCombinationLockCB : ActionContinuousBaseCB
+{
+	private const float REPEAT_AFTER_SEC = 0.5;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(REPEAT_AFTER_SEC);
+	}
+}
+
+class ActionDialCombinationLock: ActionContinuousBase
+{
+	void ActionDialCombinationLock()
+	{
+		m_CallbackClass 	= ActionDialCombinationLockCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONMOD_OPENITEM;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_OPENITEM;		
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text 				= "#dial_combination_lock";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget 	= new CCTNone();
+		m_ConditionItem 	= new CCINonRuined();
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnActionInfoUpdate(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ConstructionActionData constructionActionData = player.GetConstructionActionData();
+		m_Text = "#dial_combination_lock " + constructionActionData.GetDialNumberText();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		if (item.IsInherited(CombinationLock))
+		{
+			ConstructionActionData constructionActionData = player.GetConstructionActionData();
+			constructionActionData.SetCombinationLock(CombinationLock.Cast(item));
+	
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{	
+		//set dialed number
+		ConstructionActionData constructionActionData = action_data.m_Player.GetConstructionActionData();
+		CombinationLock combination_lock =  constructionActionData.GetCombinationLock();
+		combination_lock.DialNextNumber();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDialCombinationLockOnTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDialCombinationLockOnTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..e27ad6f28b460e8db0dc6897bfa6a49c57ff4450
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDialCombinationLockOnTarget.c
@@ -0,0 +1,78 @@
+class ActionDialCombinationLockOnTargetCB : ActionContinuousBaseCB
+{
+	private const float REPEAT_AFTER_SEC = 0.5;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(REPEAT_AFTER_SEC);
+	}
+}
+
+class ActionDialCombinationLockOnTarget: ActionContinuousBase
+{
+	void ActionDialCombinationLockOnTarget()
+	{
+		m_CallbackClass		= ActionDialCombinationLockOnTargetCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_OPENITEM;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_OPENITEM;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text 				= "#dial_combination_lock";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override void OnActionInfoUpdate(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ConstructionActionData constructionActionData = player.GetConstructionActionData();
+		m_Text = "#dial_combination_lock " + constructionActionData.GetDialNumberText();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target.GetObject())
+			return false;
+		
+		CombinationLock lock = CombinationLock.Cast(target.GetObject());
+		if (lock && lock.GetHierarchyParent() && Fence.Cast(lock.GetHierarchyParent()))
+		{
+			ConstructionActionData constructionActionData = player.GetConstructionActionData();
+			constructionActionData.SetCombinationLock(lock);
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{	
+		//set dialed number
+		ConstructionActionData constructionActionData = action_data.m_Player.GetConstructionActionData();
+		CombinationLock combination_lock = constructionActionData.GetCombinationLock();
+		if (combination_lock)
+		{
+			combination_lock.DialNextNumber();
+	
+			//check for unlock state
+			if (!combination_lock.IsLockedOnGate())
+			{
+				EntityAI target_entity = EntityAI.Cast(action_data.m_Target.GetObject());
+				combination_lock.UnlockServer(action_data.m_Player, target_entity.GetHierarchyParent());
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigGardenPlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigGardenPlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..079b61d81a0e257b96eb7dfd78792b822928e09b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigGardenPlot.c
@@ -0,0 +1,138 @@
+class ActionDigGardenPlotCB : ActiondeployObjectCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DIG_GARDEN);
+	}
+};
+
+class ActionDigGardenPlot: ActionDeployObject
+{	
+	GardenPlot m_GardenPlot;
+	
+	void ActionDigGardenPlot()
+	{
+		m_CallbackClass	= ActionDigGardenPlotCB;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		
+		m_Text = "#make_garden_plot";
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		//Client
+		if (!GetGame().IsDedicatedServer())
+		{
+			//Action not allowed if player has broken legs
+			if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+				return false;
+			
+			if (player.IsPlacingLocal())
+			{
+				Hologram hologram = player.GetHologramLocal();
+				GardenPlot item_GP;
+				Class.CastTo(item_GP,  hologram.GetProjectionEntity());	
+				CheckSurfaceBelowGardenPlot(player, item_GP, hologram);
+	
+				if (!hologram.IsColliding())
+				{
+					return true;
+				}
+			}
+			return false;
+		}
+		//Server
+		return true;
+	}
+
+	override void SetupAnimation(ItemBase item)
+	{
+		if (item)
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIG;
+		}
+	}
+	
+	void CheckSurfaceBelowGardenPlot(PlayerBase player, GardenPlot item_GP, Hologram hologram)
+	{
+		vector min_max[2];
+		item_GP.GetCollisionBox(min_max);
+		float offset = min_max[1][1] - min_max[0][1];
+		//Print(offset);
+		vector pos_adjusted = item_GP.GetPosition();
+		pos_adjusted[1] = pos_adjusted[1] + offset;
+		
+		if (item_GP.CanBePlaced(player, /*item_GP.GetPosition()*/pos_adjusted) )
+		{
+			if (item_GP.CanBePlaced(NULL, item_GP.CoordToParent(hologram.GetLeftCloseProjectionVector())))
+			{
+				if (item_GP.CanBePlaced(NULL, item_GP.CoordToParent(hologram.GetRightCloseProjectionVector())))
+				{
+					if (item_GP.CanBePlaced(NULL, item_GP.CoordToParent(hologram.GetLeftFarProjectionVector())))
+					{
+						if (item_GP.CanBePlaced(NULL, item_GP.CoordToParent(hologram.GetRightFarProjectionVector())))
+						{
+							hologram.SetIsCollidingGPlot(false);
+							
+							return;
+						}
+					}
+				}
+			}
+		}
+		
+		hologram.SetIsCollidingGPlot(true);
+	}
+	
+	override void DropDuringPlacing(PlayerBase player)
+	{
+	}
+	
+	override void OnFinishProgressClient(ActionData action_data)
+	{
+		PlaceObjectActionData poActionData;
+		poActionData = PlaceObjectActionData.Cast(action_data);
+		poActionData.m_AlreadyPlaced = true;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{	
+		PlaceObjectActionData poActionData;
+		poActionData = PlaceObjectActionData.Cast(action_data);
+		EntityAI entity_for_placing = action_data.m_MainItem;
+		vector position = action_data.m_Player.GetLocalProjectionPosition();
+		vector orientation = action_data.m_Player.GetLocalProjectionOrientation();
+				
+		if (GetGame().IsMultiplayer())
+		{
+			m_GardenPlot = GardenPlot.Cast(action_data.m_Player.GetHologramServer().PlaceEntity(entity_for_placing));
+			m_GardenPlot.SetOrientation(orientation);
+			action_data.m_Player.GetHologramServer().CheckPowerSource();
+			action_data.m_Player.PlacingCompleteServer();
+			
+			m_GardenPlot.OnPlacementComplete(action_data.m_Player);
+		}
+			
+		//local singleplayer
+		if (!GetGame().IsMultiplayer())
+		{						
+			m_GardenPlot = GardenPlot.Cast(action_data.m_Player.GetHologramLocal().PlaceEntity(entity_for_placing));
+			m_GardenPlot.SetOrientation(orientation);
+			action_data.m_Player.PlacingCompleteLocal();
+			
+			m_GardenPlot.OnPlacementComplete(action_data.m_Player);
+		}
+		
+		GetGame().ClearJuncture(action_data.m_Player, entity_for_placing);
+		action_data.m_MainItem.SetIsBeingPlaced(false);
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+		poActionData.m_AlreadyPlaced = true;
+		action_data.m_MainItem.SoundSynchRemoteReset();
+		
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 10);
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigInStash.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigInStash.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e851ff25c616144bd6089e3d647736c89cf586b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigInStash.c
@@ -0,0 +1,176 @@
+class ActionDigInStashCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DIG_STASH);
+	}
+};
+
+class ActionDigInStash: ActionContinuousBase
+{	
+	static float m_DigStashSlopeTolerance = 0.6;
+	
+	void ActionDigInStash()
+	{
+		m_CallbackClass		= ActionDigInStashCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text 				= "#bury";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget	= new CCTObject(UAMaxDistances.DEFAULT);
+		m_ConditionItem		= new CCINonRuined();
+	}
+	
+	override bool Can(PlayerBase player, ActionTarget target, ItemBase item, int condition_mask)
+	{
+		if (!super.Can(player, target, item, condition_mask))
+			return false;
+		
+		return player.CheckFreeSpace(vector.Forward, 1.0, false);
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ItemBase targetIB;
+		if (Class.CastTo(targetIB, target.GetObject()) && targetIB.CanBeDigged())
+		{
+			if (player.IsPlacingLocal())
+			{
+				return false;
+			}
+			
+			if (targetIB.IsRuined() || targetIB.GetInventory().IsAttachment())
+			{
+				return false;
+			}
+			
+			if (targetIB.GetInventory().IsAttachment())
+			{
+				return false;
+			}
+			
+			if (targetIB.IsInherited(UndergroundStash))
+			{
+				return false;
+			}
+
+			//! was initialized from inventory?
+			EntityAI entityToCheck = targetIB;
+			if (targetIB.GetInventory().IsInCargo())
+				entityToCheck = player;
+			
+			// here we check if a stash is nearby and block digging a new one in close proximity
+			array<Object> excludedObjects = new array<Object>;
+			excludedObjects.Insert(targetIB);
+			array<Object> nearbyObjects = new array<Object>;
+			// For now we exclude an area of 2 X 2 X 2 meters
+			if (GetGame().IsBoxColliding(entityToCheck.GetPosition(), entityToCheck.GetOrientation(), "2 2 2", excludedObjects, nearbyObjects))
+			{
+				for (int i = 0; i < nearbyObjects.Count(); i++)
+				{
+					if (nearbyObjects[i].IsInherited(UndergroundStash))
+					{
+						return false;
+					}
+				}
+			}
+			
+			// Check surface
+			int liquidType;
+			string surfaceType;
+			GetGame().SurfaceUnderObject(entityToCheck, surfaceType, liquidType);
+			if (!GetGame().IsSurfaceDigable(surfaceType))
+			{
+				return false;
+			}
+			else
+			{
+				//! Check slope angle
+				vector position = entityToCheck.GetPosition();
+				
+				array<vector> positions = new array<vector>;
+				positions.Insert(position + "0.5 0 0.5");
+				positions.Insert(position + "-0.5 0 0.5");
+				positions.Insert(position + "0.5 0 -0.5");
+				positions.Insert(position + "-0.5 0 -0.5");
+				
+				float difference = GetGame().GetHighestSurfaceYDifference(positions);
+				
+				return difference < m_DigStashSlopeTolerance;
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteClient(ActionData action_data)
+	{
+		super.OnExecuteClient(action_data);
+		
+		SpawnParticleShovelRaise(action_data);
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		super.OnExecuteServer(action_data);
+		
+		if (!GetGame().IsMultiplayer())
+		{
+			SpawnParticleShovelRaise(action_data);
+		}
+	}
+	
+	void SpawnParticleShovelRaise(ActionData action_data)
+	{
+		ParticleManager.GetInstance().PlayOnObject(ParticleList.DIGGING_STASH, action_data.m_Player);
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		EntityAI targetEntity = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (!targetEntity)
+		{
+			ErrorEx("Cannot get entity=" + targetEntity);
+			return;
+		}
+		
+		InventoryLocation targetIL = new InventoryLocation();
+		if (!targetEntity.GetInventory().GetCurrentInventoryLocation(targetIL))
+		{
+			ErrorEx("Cannot get inventory location of entity=" + targetEntity);
+			return;
+		}
+		
+		UndergroundStash stash = UndergroundStash.Cast(GetGame().CreateObjectEx("UndergroundStash", targetEntity.GetPosition(), ECE_PLACE_ON_SURFACE));  
+		if (stash)
+		{
+			stash.PlaceOnGround();
+			if (GameInventory.LocationCanRemoveEntity(targetIL))
+			{
+				action_data.m_Player.ServerTakeEntityToTargetCargo(stash, targetEntity);
+			}
+			else
+			{
+				Debug.Log(string.Format("Cannot remove entity=%1 obj from current location=%2", targetEntity, InventoryLocation.DumpToStringNullSafe(targetIL)));
+			}
+		}
+		else
+		{
+			ErrorEx("Stash not spawned!");
+		}
+		
+		//Apply tool damage
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 10);
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return string.Format("Player %1 Dug in %2 at position %3", action_data.m_Player, action_data.m_Target.GetObject(), action_data.m_Target.GetObject().GetPosition());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigOutStash.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigOutStash.c
new file mode 100644
index 0000000000000000000000000000000000000000..051cceebeab9a8586463da9806e5f4364281c1af
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigOutStash.c
@@ -0,0 +1,121 @@
+class ActionDigOutStashCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DIG_STASH);
+	}
+}
+
+class ActionDigOutStash: ActionContinuousBase
+{	
+	void ActionDigOutStash()
+	{
+		m_CallbackClass 	= ActionDigOutStashCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_DIGUPCACHE;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_LOW;
+		m_Text 				= "#dig_stash";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget	= new CCTObject(UAMaxDistances.DEFAULT);
+		m_ConditionItem 	= new CCINonRuined();
+	}
+	
+	override bool Can(PlayerBase player, ActionTarget target, ItemBase item, int condition_mask)
+	{
+		if (!super.Can(player, target, item, condition_mask))
+			return false;
+		
+		return player.CheckFreeSpace(vector.Forward, 1.0, false);
+	}
+	
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ItemBase target_IB;
+		if (Class.CastTo(target_IB, target.GetObject()))
+		{			
+			if (target_IB.CanBeDigged())
+			{
+				return target_IB.IsInherited(UndergroundStash);
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteClient(ActionData action_data)
+	{
+		super.OnExecuteClient(action_data);
+		
+		SpawnParticleShovelRaise(action_data);
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		super.OnExecuteServer(action_data);
+		
+		if (!GetGame().IsMultiplayer())
+		{
+			SpawnParticleShovelRaise(action_data);
+		}
+	}
+	
+	void SpawnParticleShovelRaise(ActionData action_data)
+	{
+		ParticleManager.GetInstance().PlayOnObject(ParticleList.DIGGING_STASH, action_data.m_Player);
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		EntityAI targetEntity = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (!targetEntity)
+		{
+			ErrorEx("Cannot get entity=" + targetEntity);
+			return;
+		}
+		
+		InventoryLocation target_IL = new InventoryLocation();
+		if (!targetEntity.GetInventory().GetCurrentInventoryLocation(target_IL))
+		{
+			ErrorEx("Cannot get inventory location of entity=" + targetEntity);
+			return;
+		}
+		
+		// Dig out of stash
+		UndergroundStash stash;
+		if (Class.CastTo(stash, targetEntity))
+		{
+			ItemBase stashedItem = stash.GetStashedItem();
+			if (stashedItem)
+			{
+				DigOutStashLambda lambda(stash, "", action_data.m_Player);
+				action_data.m_Player.ServerReplaceItemWithNew(lambda);
+			}
+			else
+				g_Game.ObjectDelete(stash);
+		}
+
+		//Apply tool damage
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 10);
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return string.Format("Player %1 Dug out %2 at position %3", action_data.m_Player, action_data.m_Target.GetObject(), action_data.m_Target.GetObject().GetPosition());
+	}
+}
+
+class DigOutStashLambda : DropEquipAndDestroyRootLambda
+{
+	void DigOutStashLambda(EntityAI old_item, string new_item_type, PlayerBase player) {}
+
+	override void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigWorms.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigWorms.c
new file mode 100644
index 0000000000000000000000000000000000000000..2154ed4a561c7d848372a3e3a7a7a767096a0e30
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDigWorms.c
@@ -0,0 +1,123 @@
+class ActionDigWormsCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		float time_spent;
+		time_spent = UATimeSpent.DIG_WORMS;
+		if (m_ActionData.m_MainItem.KindOf("Knife"))
+			time_spent = time_spent * 1.2;
+		
+		m_ActionData.m_ActionComponent = new CAContinuousTime(time_spent);
+	}
+};
+
+class ActionDigWorms: ActionContinuousBase
+{
+	void ActionDigWorms()
+	{
+		m_CallbackClass = ActionDigWormsCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_MEDIUM;
+		m_Text = "#dig_up_worms";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSurface(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool Can(PlayerBase player, ActionTarget target, ItemBase item, int condition_mask)
+	{
+		if (!super.Can(player, target, item, condition_mask))
+			return false;
+		
+		return player.CheckFreeSpace(vector.Forward, 0.8, false);
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (player.IsPlacingLocal())
+			return false;
+		
+		return IsTargetFertile(target) && IsPlayerOnGround(player);
+	}
+	
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		return IsPlayerOnGround(action_data.m_Player);
+	}
+	
+	override bool SetupAction( PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL )
+	{	
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			if (item)
+			{
+				SetDiggingAnimation(item);
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	override bool HasTarget()
+	{
+		return true;
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{	
+		ItemBase worms;
+		Class.CastTo(worms,  GetGame().CreateObjectEx("Worm", action_data.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+		worms.SetQuantity(10,false);
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 4);
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty(m_SpecialtyWeight);
+	}
+	
+	void SetDiggingAnimation( ItemBase item )
+	{
+		if (item.KindOf("Knife"))
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_1HD;
+			m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		}
+		else
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+			m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		}
+	}
+	
+	bool IsTargetFertile(ActionTarget target)
+	{
+		if (target)
+		{
+			string surface_type;
+			vector position;
+			position = target.GetCursorHitPos();
+			
+			GetGame().SurfaceGetType(position[0], position[2], surface_type);
+			
+			if (GetGame().IsSurfaceFertile(surface_type))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool IsPlayerOnGround(PlayerBase player)
+	{
+		vector position = player.GetPosition();
+		float heightDiff = GetGame().SurfaceY(position[0], position[2]);
+		heightDiff = position[1] - heightDiff;
+		
+		return heightDiff <= 0.4; // Player is considered on ground
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosive.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosive.c
new file mode 100644
index 0000000000000000000000000000000000000000..66ccde6a2c7108d977b6bed004681b7b038794b3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosive.c
@@ -0,0 +1,60 @@
+class ActionDisarmExplosiveCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DISARM_MINE);
+	}
+}
+
+class ActionDisarmExplosive : ActionContinuousBase
+{
+	void ActionDisarmExplosive()
+	{
+		m_CallbackClass	= ActionDisarmExplosiveCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody 		= true;
+		
+		m_Text 			= "#disarm";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTCursor();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target)
+		{
+			return false;
+		}
+		
+		ExplosivesBase explosive;
+		if (Class.CastTo(explosive, target.GetObject()) && item)
+		{		
+			return explosive.GetArmed() && explosive.CanBeDisarmed();
+		}
+
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ExplosivesBase explosive = ExplosivesBase.Cast(action_data.m_Target.GetObject());
+		ToolBase tool = ToolBase.Cast(action_data.m_MainItem);
+		
+		if (Math.RandomIntInclusive(0, 100) < tool.GetDisarmRate())
+		{
+			explosive.OnBeforeDisarm();
+			explosive.Disarm(true);
+		}
+		else
+		{
+			explosive.SetHealth("", "", 0.0);
+		}
+		
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, UADamageApplied.DEFUSE_TOOLS);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosiveWithRemoteDetonator.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosiveWithRemoteDetonator.c
new file mode 100644
index 0000000000000000000000000000000000000000..d4f417753820920279ec95fa1bcf9713e47f6c9f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosiveWithRemoteDetonator.c
@@ -0,0 +1,81 @@
+class ActionDisarmExplosiveWithRemoteDetonatorCB : ActionDisarmExplosiveCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DISARM_EXPLOSIVE_REMOTE_PAIRED);
+	}	
+}
+
+class ActionDisarmExplosiveWithRemoteDetonator : ActionDisarmExplosive
+{
+	void ActionDisarmExplosiveWithRemoteDetonator()
+	{
+		m_CallbackClass	= ActionDisarmExplosiveWithRemoteDetonatorCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody 		= true;
+		m_Text 			= "#disarm";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNonRuined();
+	}
+	
+	override bool CanBeSetFromInventory()
+	{
+		return true;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target)
+			return false;
+		
+		ExplosivesBase explosive = ExplosivesBase.Cast(target.GetObject());
+		if (!explosive)
+			return false;
+
+		if (explosive.IsRuined() || !explosive.GetArmed() || !explosive.CanBeDisarmed())
+			return false;
+		
+		if (explosive.GetAttachmentByType(KitchenTimer) || explosive.GetAttachmentByType(AlarmClock_ColorBase))
+			return false;
+
+		RemoteDetonatorTrigger rdt = RemoteDetonatorTrigger.Cast(item);
+		if (rdt && rdt.IsConnected())
+		{
+			if (explosive != rdt.GetControlledDevice())
+				return false;
+
+			ExplosivesBase controlledDevice = ExplosivesBase.Cast(rdt.GetControlledDevice());
+			if (controlledDevice && !controlledDevice.IsRuined() && controlledDevice.GetArmed())
+				return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ExplosivesBase explosive = ExplosivesBase.Cast(action_data.m_Target.GetObject());
+		ItemBase detonator = ItemBase.Cast(action_data.m_MainItem);
+		
+		explosive.OnBeforeDisarm();
+		
+		//! claymore has integrated detonator
+		if (explosive.IsInherited(ClaymoreMine))
+		{
+			explosive.Disarm();
+			explosive.SetTakeable(true);
+			detonator.Delete();
+			return;
+		}
+		
+		ReplaceDetonatorItemOnDisarmLambda lambda = new ReplaceDetonatorItemOnDisarmLambda(detonator, "RemoteDetonator");
+		MiscGameplayFunctions.TurnItemIntoItemEx(action_data.m_Player, lambda);
+		//! refresh IK, item changed
+		action_data.m_Player.GetItemAccessor().OnItemInHandsChanged();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosiveWithRemoteDetonatorUnpaired.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosiveWithRemoteDetonatorUnpaired.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf5addc0fc928fe5920a64546e592daf362ffe94
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmExplosiveWithRemoteDetonatorUnpaired.c
@@ -0,0 +1,93 @@
+class ActionDisarmExplosiveWithRemoteDetonatorUnpairedCB : ActionDisarmExplosiveCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DISARM_EXPLOSIVE_REMOTE_UNPAIRED);
+	}	
+}
+
+class ActionDisarmExplosiveWithRemoteDetonatorUnpaired : ActionDisarmExplosiveWithRemoteDetonator
+{
+	void ActionDisarmExplosiveWithRemoteDetonatorUnpaired()
+	{
+		m_CallbackClass	= ActionDisarmExplosiveWithRemoteDetonatorUnpairedCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody 		= true;
+		m_Text 			= "#disarm";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTCursor();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target)
+		{
+			return false;
+		}
+
+		//! explosives only
+		ExplosivesBase explosive = ExplosivesBase.Cast(target.GetObject());
+		if (!explosive)
+		{
+			return false;
+		}
+
+		if (explosive.IsRuined() || !explosive.GetArmed() || !explosive.CanBeDisarmed())
+		{
+			return false;
+		}
+		
+		if (explosive.GetAttachmentByType(KitchenTimer) || explosive.GetAttachmentByType(AlarmClock_ColorBase))
+		{
+			return false;
+		}
+		
+		RemoteDetonatorReceiver attachedReceiver = RemoteDetonatorReceiver.Cast(explosive.GetAttachmentByType(RemoteDetonatorReceiver));
+		if (!explosive.IsInherited(ClaymoreMine) && attachedReceiver && attachedReceiver.IsRuined())
+		{
+			return false;
+		}
+		
+		//! RD trigger
+		RemoteDetonatorTrigger rdt = RemoteDetonatorTrigger.Cast(item);
+		if (rdt && target.GetObject() != rdt.GetControlledDevice())
+		{
+			return true;
+		}
+		
+		//! RD kit
+		RemoteDetonator rd = RemoteDetonator.Cast(item);
+		if (rd && rd.IsKit())
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ExplosivesBase target = ExplosivesBase.Cast(action_data.m_Target.GetObject());
+		ItemBase detonator = ItemBase.Cast(action_data.m_MainItem);
+		
+		target.Disarm();
+		target.SetTakeable(true);
+		
+		//! claymore has integrated detonator
+		if (target.IsInherited(ClaymoreMine))
+		{
+			detonator.Delete();
+			return;
+		}
+		
+		ReplaceItemWithNewLambdaBase lambda = new ReplaceDetonatorItemLambda(detonator, "RemoteDetonator");
+		MiscGameplayFunctions.TurnItemIntoItemEx(action_data.m_Player, lambda);
+		//! refresh IK, item changed
+		action_data.m_Player.GetItemAccessor().OnItemInHandsChanged();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmMine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmMine.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0f3fa7cb87f072f8c72dfa2aad6c8f0a8e63e71
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisarmMine.c
@@ -0,0 +1,92 @@
+class ActionDisarmMineCB: ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DISARM_MINE);
+	}
+}
+
+class ActionDisarmMine: ActionContinuousBase
+{
+	void ActionDisarmMine()
+	{
+		m_CallbackClass	= ActionDisarmMineCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody 		= true;
+		
+		m_Text 			= "#disarm";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINonRuined;
+		m_ConditionTarget 	= new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (!target)
+		{
+			return false;
+		}
+
+		LandMineTrap targetMine;
+		if (Class.CastTo(targetMine, target.GetObject()) && item && IsInReach(player, target, UAMaxDistances.DEFAULT))
+		{		
+			return targetMine.IsActive() && targetMine.CanBeDisarmed();
+		}
+
+		return false;
+	}
+	
+	override void OnStartAnimationLoop(ActionData action_data)
+	{
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			LandMineTrap targetMine = LandMineTrap.Cast(action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>(true);
+			GetGame().RPCSingleParam(targetMine, SoundTypeMine.DISARMING, play, true);
+		}
+	}
+	
+	override void OnAnimationEvent(ActionData action_data)
+	{
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			LandMineTrap targetMine = LandMineTrap.Cast(action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>(true);
+			GetGame().RPCSingleParam(targetMine, SoundTypeMine.DISARMING, play, true);
+		}
+	}
+	
+	override void OnEndAnimationLoop( ActionData action_data )
+	{
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			LandMineTrap targetMine = LandMineTrap.Cast(action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>(false);
+			GetGame().RPCSingleParam(targetMine, SoundTypeMine.DISARMING, play, true);
+		}
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		LandMineTrap targetMine;
+		Class.CastTo(targetMine, action_data.m_Target.GetObject());
+		
+		ToolBase tool;
+		Class.CastTo(tool, action_data.m_MainItem);
+		
+		if (Math.RandomIntInclusive(0, 100) < tool.GetDisarmRate())
+		{
+			targetMine.Disarm();
+		}
+		else
+		{
+			targetMine.OnSteppedOn(action_data.m_Player);
+		}
+		
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 2);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisinfectPlant.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisinfectPlant.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a7dd3638052cfffa77d60ad9401cab5b5ac3dd7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDisinfectPlant.c
@@ -0,0 +1,100 @@
+class ActionDisinfectPlantCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousDisinfectPlant(UAQuantityConsumed.GARDEN_DISINFECT_PLANT);
+	}
+};
+
+class ActionDisinfectPlant: ActionContinuousBase
+{
+	PlantBase m_Plant;
+	
+	void ActionDisinfectPlant()
+	{
+		m_CallbackClass = ActionDisinfectPlantCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_SPRAYPLANT;
+		//m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody = true;
+		
+		m_Text = "#apply";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINotRuinedAndEmpty;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		GardenBase garden_base;
+		if ( Class.CastTo(garden_base, target.GetObject()))
+		{
+			Slot slot;
+			
+			array<string> selections = new array<string>;
+			garden_base.GetActionComponentNameList(target.GetComponentIndex(), selections);
+			string selection;
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				selection = selections[s];
+				slot = garden_base.GetSlotBySelection( selection );
+				if (slot)
+					break;
+			}
+			
+			if ( slot && slot.GetPlant() )
+			{
+				m_Plant = PlantBase.Cast(slot.GetPlant());
+				if ( m_Plant.IsGrowing()  &&  m_Plant.NeedsSpraying() )
+				{	
+					if ( m_Plant.GetPlantStateIndex() < 1 )
+						return false;
+					
+					if ( item.GetQuantity() > 0 )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+		/*PlantBase plant;
+		if ( Class.CastTo(plant,  target.GetObject() ) && !item.IsDamageDestroyed() )
+		{			
+			if ( plant.IsGrowing()  &&  plant.NeedsSpraying() )
+			{	
+				if ( item.GetQuantity() > 0 )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;*/
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data)
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		Param1<float> nacdata = Param1<float>.Cast( action_data.m_ActionComponent.GetACData() );
+		if (nacdata)
+		{
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+	
+	override void OnFinishProgressClient( ActionData action_data)
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		Param1<float> nacdata = Param1<float>.Cast( action_data.m_ActionComponent.GetACData() );
+		if (nacdata)
+		{
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleGardenPlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleGardenPlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..362aa83bd5c6f7e4a175dd499c5cd5adbe5e21d1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleGardenPlot.c
@@ -0,0 +1,59 @@
+class ActionDismantleGardenPlotCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.DIG_GARDEN );
+	}
+};
+
+class ActionDismantleGardenPlot: ActionContinuousBase
+{	
+	//GardenPlot m_GardenPlot;
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;//new CCINone;
+		m_ConditionTarget = new CCTCursorNoRuinCheck;
+	}
+	
+	void ActionDismantleGardenPlot()
+	{
+		m_CallbackClass	= ActionDismantleGardenPlotCB;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE;
+		
+		m_Text = "#remove_garden_plot";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		//Action not allowed if player has broken legs
+		if ( player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS )
+			return false;
+		
+		GardenPlot targetPlot = GardenPlot.Cast( target.GetObject() );
+		
+		if ( targetPlot && !player.IsPlacingLocal() )
+			return true;
+		else
+			return false;
+	}
+
+	void SetupAnimation( ItemBase item )
+	{
+		if ( item )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIG;
+		}
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		GardenPlot targetPlot = GardenPlot.Cast( action_data.m_Target.GetObject() );
+		targetPlot.Delete();
+		
+		if ( GetGame().IsServer() )
+			MiscGameplayFunctions.DealAbsoluteDmg( action_data.m_MainItem, 10 );
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleOven.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleOven.c
new file mode 100644
index 0000000000000000000000000000000000000000..70cd81333e37aec860a15228fc191485c5090324
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleOven.c
@@ -0,0 +1,91 @@
+class ActionDismantleOvenCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.DEFAULT_DECONSTRUCT );
+	}
+}
+
+class ActionDismantleOven: ActionContinuousBase
+{	
+	void ActionDismantleOven()
+	{
+		m_CallbackClass = ActionDismantleOvenCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		
+		m_Text = "#dismantle_oven";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	/*override bool HasProgress()
+	{
+		return false;
+	}*/
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object target_object = target.GetObject();
+		
+		if ( target_object && target_object.IsFireplace() )
+		{
+			FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+			
+			if ( fireplace_target.IsBaseFireplace() && fireplace_target.CanDismantleOven() )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+		
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		Object target_object = action_data.m_Target.GetObject();
+		FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+		
+		if ( fireplace_target.CanDismantleOven() )
+		{
+			ItemBase attached_item = ItemBase.Cast( fireplace_target.GetAttachmentByType( fireplace_target.ATTACHMENT_STONES ) );
+			
+			// for backward compatibility - for the cases built before slot locking was commented out for the stone att slot
+			InventoryLocation inventory_location = new InventoryLocation;
+			attached_item.GetInventory().GetCurrentInventoryLocation( inventory_location );			
+			fireplace_target.GetInventory().SetSlotLock( inventory_location.GetSlot(), false );
+
+			//set oven state
+			fireplace_target.SetOvenState( false );
+			
+			// extend lifetime (either back to stone circle lifetime or standard fireplace one)
+			if ( fireplace_target.HasStoneCircle() )
+			{
+				fireplace_target.SetLifetimeMax( FireplaceBase.LIFETIME_FIREPLACE_STONE_CIRCLE );
+			}
+			else
+			{
+				fireplace_target.SetLifetimeMax( 10800 );
+			}
+			
+			//add specialty to soft skills
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantlePart.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantlePart.c
new file mode 100644
index 0000000000000000000000000000000000000000..b1baa4e0e085616b7e076dd84b951185d121eb3f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantlePart.c
@@ -0,0 +1,218 @@
+class ActionDismantlePartCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		float time = SetCallbackDuration(m_ActionData.m_MainItem);
+		m_ActionData.m_ActionComponent = new CAContinuousTime( time );
+	}
+	
+	float SetCallbackDuration( ItemBase item )
+	{
+		/*switch( item.Type() )
+		{
+			case Pickaxe:
+			case Shovel:
+			case FieldShovel:
+				return UATimeSpent.BASEBUILDING_DECONSTRUCT_MEDIUM;
+			case FirefighterAxe:
+				return UATimeSpent.BASEBUILDING_DECONSTRUCT_FAST;
+			default:
+				return UATimeSpent.BASEBUILDING_DECONSTRUCT_SLOW;
+		}*/
+		return UATimeSpent.BASEBUILDING_DECONSTRUCT_SLOW;
+	}
+};
+
+class ActionDismantlePart: ActionContinuousBase
+{
+	void ActionDismantlePart()
+	{
+		m_CallbackClass = ActionDismantlePartCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DISASSEMBLE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;	
+		
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#dismantle";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;//CCTNonRuined( UAMaxDistances.BASEBUILDING );
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ConstructionActionData construction_action_data = player.GetConstructionActionData();
+		m_Text = "#dismantle " + construction_action_data.GetTargetPart().GetName();
+	}
+		
+	override string GetText()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( player )
+		{
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			ConstructionPart constrution_part = construction_action_data.GetTargetPart();
+			
+			if ( constrution_part )
+			{
+				return "#dismantle" + " " + constrution_part.GetName();
+			}
+		}
+		
+		return "";
+	}
+	
+	override bool CanBeUsedLeaning()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if ( player.IsPlacingLocal() )
+			return false;
+		
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		return DismantleCondition( player, target, item, true ) && player.m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_PRONE;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{	
+		return DismantleCondition( action_data.m_Player, action_data.m_Target, action_data.m_MainItem , false ) && action_data.m_Player.m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_PRONE;
+	}	
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( action_data.m_Target.GetObject() );
+		Construction construction = base_building.GetConstruction();
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		ConstructionPart construction_part = construction_action_data.GetTargetPart();
+		
+		if ( construction.CanDismantlePart( construction_part.GetPartName(), action_data.m_MainItem ) )
+		{
+			//build
+			construction.DismantlePartServer( action_data.m_Player, construction_part.GetPartName(), AT_DISMANTLE_PART );
+			
+			//add damage to tool
+			action_data.m_MainItem.DecreaseHealth( UADamageApplied.DISMANTLE, false );
+		}
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+		
+	//setup
+	override bool SetupAction( PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL )
+	{	
+		if ( super.SetupAction( player, target, item, action_data, extra_data ) )
+		{
+			SetBuildingAnimation( item );
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	protected void SetBuildingAnimation( ItemBase item )
+	{
+		switch ( item.Type() )
+		{
+			case Pickaxe:
+			case Shovel:
+			case FarmingHoe:
+			case FieldShovel:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIG;
+				break;
+			case Pliers:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+				break;				
+			default:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DISASSEMBLE;
+				break;
+		}
+	}	
+	
+	protected bool DismantleCondition( PlayerBase player, ActionTarget target, ItemBase item, bool camera_check )
+	{	
+		if ( player && !player.IsPlacingLocal() && !player.IsPlacingServer() )
+		{
+			Object target_object = target.GetObject();
+			EntityAI target_entity;
+			if ( target_object && target_object.CanUseConstruction() )
+			{
+				//invalid if is gate and is locked
+				if ( Class.CastTo(target_entity,target_object) && (target_entity.FindAttachmentBySlotName("Att_CombinationLock") || target_entity.FindAttachmentBySlotName("Material_FPole_Flag")) )
+				{
+					return false;
+				}
+				
+				string part_name = target_object.GetActionComponentName( target.GetComponentIndex() );
+				
+				BaseBuildingBase base_building = BaseBuildingBase.Cast( target_object );
+				Construction construction = base_building.GetConstruction();		
+				ConstructionPart construction_part = construction.GetConstructionPartToDismantle( part_name, item );
+				
+				if ( construction_part )
+				{
+					/*Print("DismantleCondition");
+					Print(part_name);
+					Print("construction_part.GetPartName: " + construction_part.GetPartName());
+					Print("construction_part.GetMainPartName: " + construction_part.GetMainPartName());
+					Print("-----");*/
+					
+					//invalid on gate if the gate is opened
+					if ( construction_part.IsGate() && base_building.IsOpened() )
+						return false;
+					
+					//camera and position checks
+					bool checked = false;
+					
+					if ( construction_part.IsBase() )
+						checked = true;
+					
+					if ( !checked && base_building.IsPlayerInside( player, part_name ) && !player.GetInputController().CameraIsFreeLook() )
+					{
+						//Camera check (client-only)
+						if ( camera_check )
+						{
+							if ( GetGame() && ( !GetGame().IsDedicatedServer() ) )
+							{
+								if ( base_building.IsFacingCamera( part_name ) )
+								{
+									return false;
+								}
+							}
+						}
+
+						checked = true;
+					}
+
+					if ( checked )
+					{
+						ConstructionActionData construction_action_data = player.GetConstructionActionData();
+						construction_action_data.SetTargetPart( construction_part );
+						
+						return true;
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		ConstructionPart construction_part = construction_action_data.GetTargetPart();
+		
+		string message = string.Format("Dismantled %1 from %2 with %3", construction_part.GetName(), action_data.m_Target.GetObject().GetDisplayName(), action_data.m_MainItem.GetDisplayName() );
+		return message;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleStoneCircle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleStoneCircle.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bafbc4ff005beb520c6c391ed557d08f6f9753d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDismantleStoneCircle.c
@@ -0,0 +1,74 @@
+class ActionDismantleStoneCircleCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.DEFAULT_DECONSTRUCT );
+	}
+}
+
+class ActionDismantleStoneCircle: ActionContinuousBase
+{	
+	void ActionDismantleStoneCircle()
+	{
+		m_CallbackClass = ActionDismantleStoneCircleCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#dismantle_stonecircle";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	/*override bool HasProgress()
+	{
+		return false;
+	}*/
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object target_object = target.GetObject();
+		
+		if ( target_object && target_object.IsFireplace() )
+		{
+			FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+			
+			if ( fireplace_target.IsBaseFireplace() && fireplace_target.CanDismantleStoneCircle() )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+		
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		Object target_object = action_data.m_Target.GetObject();
+		FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+		
+		if ( fireplace_target.CanDismantleStoneCircle() )
+		{
+			ItemBase attached_item = ItemBase.Cast( fireplace_target.GetAttachmentByType( fireplace_target.ATTACHMENT_STONES ) );
+
+			//set oven state
+			fireplace_target.SetStoneCircleState( false );
+			
+			// extend lifetime (but back to default of CE)
+			fireplace_target.SetLifetimeMax( 10800 );
+			
+			//add specialty to soft skills
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrainLiquid.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrainLiquid.c
new file mode 100644
index 0000000000000000000000000000000000000000..1490b18e9fd39dbf6ef8f69838c46eafdafaa646
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrainLiquid.c
@@ -0,0 +1,80 @@
+class ActionDrainLiquidCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_REPEAT = 0.25;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityLiquidTransfer(UAQuantityConsumed.DRAIN_LIQUID, TIME_TO_REPEAT, true);
+	}
+};
+
+class ActionDrainLiquid: ActionContinuousBase
+{
+	void ActionDrainLiquid()
+	{
+		m_CallbackClass = ActionDrainLiquidCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EMPTY_VESSEL;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_EMPTY_VESSEL;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#drain_liquid";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		ItemBase target_item = ItemBase.Cast(target.GetObject());
+		
+		if ( target_item && item )
+		{
+			return Liquid.CanTransfer(target_item,item);
+		}
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	
+	override void OnStartAnimationLoop( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Bottle_Base vessel_in_hands = Bottle_Base.Cast( action_data.m_Target.GetObject() );
+			Param1<bool> play = new Param1<bool>( true );
+
+			GetGame().RPCSingleParam( vessel_in_hands, SoundTypeBottle.EMPTYING, play, true );
+		}
+	}
+	
+	override void OnEndAnimationLoop( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Bottle_Base target_vessel = Bottle_Base.Cast( action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>( false );
+			GetGame().RPCSingleParam( target_vessel, SoundTypeBottle.EMPTYING, play, true );
+		}
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Bottle_Base target_vessel = Bottle_Base.Cast( action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>( false );
+			GetGame().RPCSingleParam( target_vessel, SoundTypeBottle.EMPTYING, play, true );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrink.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrink.c
new file mode 100644
index 0000000000000000000000000000000000000000..47f8f97493d19cb298d5cc847b4a02aaae7476b5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrink.c
@@ -0,0 +1,42 @@
+class ActionDrinkCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.DRINK,UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionDrink: ActionConsume
+{
+	void ActionDrink()
+	{
+		m_CallbackClass = ActionDrinkCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_DRINK;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_DRINK;
+		m_Text = "#drink";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINotRuinedAndEmpty;
+		m_ConditionTarget = new CCTSelf;
+	}
+
+	override bool IsDrink()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		return player.CanEatAndDrink();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkCan.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..087116032b658795a0349a688730bc4b095b6379
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkCan.c
@@ -0,0 +1,9 @@
+class ActionDrinkCan: ActionDrink
+{
+	void ActionDrinkCan()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_DRINK;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_DRINK;
+		m_Text = "#drink";
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkCookingPot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkCookingPot.c
new file mode 100644
index 0000000000000000000000000000000000000000..7c616909a0c21af0d0cceacc1c2080daabc43bf0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkCookingPot.c
@@ -0,0 +1,7 @@
+class ActionDrinkCookingPot: ActionDrink
+{
+	void ActionDrinkCookingPot()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_DRINK;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkPondContinuous.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkPondContinuous.c
new file mode 100644
index 0000000000000000000000000000000000000000..8e0d0e19df8b44096ebdb3df87d216cc95328cb9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkPondContinuous.c
@@ -0,0 +1,102 @@
+class ActionDrinkPondContinuousCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(UATimeSpent.DRINK_POND);
+	}
+}
+
+class ActionDrinkPondContinuous: ActionContinuousBase
+{
+	private const float WATER_DRANK_PER_SEC = 35;
+	protected const string ALLOWED_WATER_SURFACES = string.Format("%1|%2", UAWaterType.FRESH, UAWaterType.STILL);
+	
+	void ActionDrinkPondContinuous()
+	{
+		m_CallbackClass 	= ActionDrinkPondContinuousCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_DRINKPOND;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text 				= "#drink";
+	}
+	
+	override bool IsDrink()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTWaterSurface(UAMaxDistances.DEFAULT, ALLOWED_WATER_SURFACES);
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		if (item && item.IsHeavyBehaviour())
+			return false;
+
+		return player.CanEatAndDrink();
+	}
+
+	override void OnStart(ActionData action_data)
+	{
+		super.OnStart(action_data);
+		
+		action_data.m_Player.TryHideItemInHands(true);
+	}
+
+	override void OnEnd(ActionData action_data)
+	{
+		action_data.m_Player.TryHideItemInHands(false);
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		Param1<float> nacdata = Param1<float>.Cast(action_data.m_ActionComponent.GetACData());
+		float amount = UAQuantityConsumed.DRINK;
+		action_data.m_Player.Consume(null, amount, EConsumeType.ENVIRO_POND);
+	}
+
+	override void OnEndAnimationLoopServer(ActionData action_data)
+	{
+		if (action_data.m_Player.HasBloodyHands() && !action_data.m_Player.GetInventory().FindAttachment(InventorySlots.GLOVES))
+		{
+			action_data.m_Player.SetBloodyHandsPenalty();
+		}
+	}
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		if (HasTarget())
+		{
+			ctx.Write(action_data.m_Target.GetCursorHitPos());
+			return;
+		}
+		
+		ctx.Write(vector.Zero);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data)
+	{		
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		if (HasTarget())
+		{
+			vector cursorPosition;
+			if (!ctx.Read(cursorPosition))
+				return false;
+
+			action_recive_data.m_Target.SetCursorHitPos(cursorPosition);
+		}
+
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkThroughContinuous.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkThroughContinuous.c
new file mode 100644
index 0000000000000000000000000000000000000000..bbd80a4b3d67fdb23c80f7e56daec5161017b9ef
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkThroughContinuous.c
@@ -0,0 +1,19 @@
+class ActionDrinkThroughContinuous: ActionDrinkPondContinuous
+{
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTCursor(UAMaxDistances.SMALL);
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item && item.IsHeavyBehaviour())
+			return false;
+		
+		if (!player.CanEatAndDrink())
+			return false;
+		
+		return target.GetObject() && target.GetObject().GetWaterSourceObjectType() == EWaterSourceObjectType.THROUGH;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkWellContinuous.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkWellContinuous.c
new file mode 100644
index 0000000000000000000000000000000000000000..60f004def3acc77561ce99d3ca4503e8c9daaaac
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionDrinkWellContinuous.c
@@ -0,0 +1,82 @@
+class ActionDrinkWellContinuousCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(UATimeSpent.DRINK_WELL);
+	}
+}
+
+class ActionDrinkWellContinuous: ActionContinuousBase
+{	
+	void ActionDrinkWellContinuous()
+	{
+		m_CallbackClass = ActionDrinkWellContinuousCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_DRINKWELL;
+		m_FullBody 		= true;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_CROUCH;
+
+		m_Text = "#drink";
+	}
+	
+	override bool IsDrink()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTCursor(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item && item.IsHeavyBehaviour())
+			return false;
+		
+		if (!player.CanEatAndDrink())
+			return false;
+		
+		return target.GetObject() && (target.GetObject().GetWaterSourceObjectType() == EWaterSourceObjectType.WELL || target.GetObject().IsWell());
+	}
+
+	override void OnStart(ActionData action_data)
+	{
+		super.OnStart(action_data);
+		
+		action_data.m_Player.TryHideItemInHands(true);
+	}
+
+	override void OnEnd(ActionData action_data)
+	{
+		action_data.m_Player.TryHideItemInHands(false);
+	}
+
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		Param1<float> nacdata = Param1<float>.Cast(action_data.m_ActionComponent.GetACData());
+		if (nacdata)
+		{
+			float amount = UAQuantityConsumed.DRINK;
+			action_data.m_Player.Consume(null,amount, EConsumeType.ENVIRO_WELL);
+		}
+		
+		if (action_data.m_Player.HasBloodyHands() && !action_data.m_Player.GetInventory().FindAttachment(InventorySlots.GLOVES))
+		{
+			action_data.m_Player.SetBloodyHandsPenalty();
+		}
+	}
+
+	override void OnEndAnimationLoopServer(ActionData action_data)
+	{
+		if (action_data.m_Player.HasBloodyHands())
+		{
+			action_data.m_Player.InsertAgent(eAgents.CHOLERA, 1);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEat.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEat.c
new file mode 100644
index 0000000000000000000000000000000000000000..c417eab01dd95ecda0bcdbb4e185f0087ace79d3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEat.c
@@ -0,0 +1,89 @@
+class ActionEatBigCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_BIG, UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionEatBig: ActionConsume
+{
+	void ActionEatBig()
+	{
+		m_CallbackClass = ActionEatBigCB;
+		//m_Sound = "EatingSoft_0";
+		m_Text = "#eat";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	override int IsEat()
+	{
+		return true;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		return player.CanEatAndDrink();
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{	
+		super.OnEndServer(action_data);
+		
+		if ( action_data.m_Player.HasBloodyHandsEx() == eBloodyHandsTypes.SALMONELA && !action_data.m_Player.GetInventory().FindAttachment( InventorySlots.GLOVES ) && GetProgress(action_data) > 0 )
+		{
+			action_data.m_Player.SetBloodyHandsPenalty();
+		}
+	}
+};
+
+
+//-------------- Action Eat
+class ActionEatCB : ActionEatBigCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_NORMAL, UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionEat: ActionEatBig
+{
+	void ActionEat()
+	{
+		m_CallbackClass = ActionEatCB;
+	}
+	
+	
+};
+
+//-------------- Action Eat Small
+class ActionEatSmallCB : ActionEatBigCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_SMALL, UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionEatSmall: ActionEatBig
+{
+	void ActionEatSmall()
+	{
+		m_CallbackClass = ActionEatSmallCB;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatCan.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..d7915204856551f2bc3ccd55c095f9b4670a325b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatCan.c
@@ -0,0 +1,63 @@
+class ActionEatCanCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_BIG, UATimeSpent.DEFAULT);
+	}
+};
+
+
+class ActionEatCan: ActionEatBig
+{
+	void ActionEatCan()
+	{
+		m_CallbackClass = ActionEatCanCB;
+	}
+		
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return super.ActionCondition(player, target, item);
+		/* 
+		//if staging for cans is introduced
+		if ( item && item.IsOpen() )
+		{
+			return true;
+		}
+		return false;
+		*/
+	}
+};
+
+//-----------------SMALL BITES VARIANT-------------------
+
+class ActionEatSmallCanCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_SMALL, UATimeSpent.DEFAULT);
+	}
+};
+
+
+class ActionEatSmallCan: ActionEatBig
+{
+	void ActionEatSmallCan()
+	{
+		m_CallbackClass = ActionEatSmallCanCB;
+	}
+		
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		return true;
+		/* 
+		//if staging for cans is introduced
+		if ( item && item.IsOpen() )
+		{
+			return true;
+		}
+		return false;
+		*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatFruit.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatFruit.c
new file mode 100644
index 0000000000000000000000000000000000000000..de6e40cf06900a28904a2b551a5ffb7a87ff48ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatFruit.c
@@ -0,0 +1,32 @@
+class ActionEatFruitCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_NORMAL,UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionEatFruit: ActionEatBig
+{
+	void ActionEatFruit()
+	{
+		m_CallbackClass = ActionEatFruitCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EAT;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_EAT;
+	}
+		
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		Edible_Base food_item;
+
+		if ( Class.CastTo(food_item, item) )
+		{
+			if ( food_item.IsFruit() )
+				return true;
+		}
+
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatMeat.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..27b09dc8393c09034550bec06d5c98dcedb71592
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEatMeat.c
@@ -0,0 +1,31 @@
+class ActionEatMeatCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_NORMAL,UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionEatMeat: ActionEatBig
+{
+	void ActionEatMeat()
+	{
+		m_CallbackClass = ActionEatMeatCB;
+	}
+			
+	override void ApplyModifiers( ActionData action_data )
+	{
+		Edible_Base food_item = Edible_Base.Cast( action_data.m_MainItem );
+		if ( food_item )
+		{			
+			if ( food_item.IsMeat() && food_item.IsFoodRaw() )
+			{
+				PluginLifespan module_lifespan = PluginLifespan.Cast( GetPlugin( PluginLifespan ) );
+				if( module_lifespan )
+				{
+					module_lifespan.UpdateBloodyHandsVisibility( action_data.m_Player, true );
+				}
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyBottleBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyBottleBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5d648dd2b835f7214277a31461614c1021c1ff2d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyBottleBase.c
@@ -0,0 +1,89 @@
+class ActionEmptyBottleBaseCB : ActionContinuousBaseCB
+{	
+	bool m_RPCStopAlreadySent;//since stopping contains a sound tail, we need to stop it only once, this bool ensures that
+	override void CreateActionComponent()
+	{
+		float EmptiedQuantity;
+		Bottle_Base bottle = Bottle_Base.Cast(m_ActionData.m_MainItem);
+		if (bottle)
+			EmptiedQuantity = bottle.GetLiquidEmptyRate() * bottle.GetLiquidThroughputCoef();
+		m_ActionData.m_ActionComponent = new CAContinuousEmpty(EmptiedQuantity);
+	}
+};
+
+class ActionEmptyBottleBase: ActionContinuousBase
+{
+	void ActionEmptyBottleBase()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EMPTY_VESSEL;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		
+		m_CallbackClass = ActionEmptyBottleBaseCB;
+		m_FullBody = false;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#empty";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINotRuinedAndEmpty;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			return true;
+		
+		if (item.IsLiquidPresent())
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		if (action_data.m_MainItem.GetQuantity() > action_data.m_MainItem.GetQuantityMin())
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnStartAnimationLoop( ActionData action_data )
+	{
+		SendRPC(action_data,true);
+	}
+	
+	override void OnEndAnimationLoop( ActionData action_data )
+	{
+		SendRPC(action_data,false);
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		SendRPC(action_data,false);
+	}
+
+	protected void SendRPC(ActionData actionData, bool enable)
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			ActionEmptyBottleBaseCB comp = ActionEmptyBottleBaseCB.Cast(actionData.m_Callback);
+			if (comp.m_RPCStopAlreadySent)
+				return;
+			
+			Bottle_Base target_vessel = Bottle_Base.Cast( actionData.m_MainItem );
+			Param1<bool> play = new Param1<bool>( enable );
+			GetGame().RPCSingleParam( target_vessel, SoundTypeBottle.EMPTYING, play, true );
+			if (!enable)
+				comp.m_RPCStopAlreadySent = true;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyCookingPot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyCookingPot.c
new file mode 100644
index 0000000000000000000000000000000000000000..1ae868a9e1def00b2ec51f0bf3ba54a538218e2f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyCookingPot.c
@@ -0,0 +1,3 @@
+class ActionEmptyCookingPot: ActionEmptyBottleBase
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyMagazine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..3a738d511b579fab951f65291ca686029c83c72d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionEmptyMagazine.c
@@ -0,0 +1,158 @@
+class EmptyMagazineActionData : ActionData
+{
+	Magazine m_magazinePile;
+}
+
+class ActionEmptyMagazineCB : ActionContinuousBaseCB
+{	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(UATimeSpent.MAG_EMPTY);
+	}
+};
+
+class ActionEmptyMagazine: ActionContinuousBase
+{
+	void ActionEmptyMagazine()
+	{
+		m_CallbackClass = ActionEmptyMagazineCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EMPTYMAG;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_EMPTYMAG;
+		m_Text = "#empty_magazine";
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{
+		if ( super.SetupAction( player, target, item, action_data, extra_data))
+		{
+			EmptyMagazineActionData emActionData = EmptyMagazineActionData.Cast(action_data);
+			emActionData.m_magazinePile = NULL;
+			return true;
+		}
+		return false;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		EmptyMagazineActionData action_data = new EmptyMagazineActionData;
+		return action_data;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	bool CanEmpty(ItemBase item)
+	{
+		Magazine mag;
+		return ( item && Class.CastTo(mag, item) && mag.GetAmmoCount() > 0 );
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{	
+		return CanEmpty(action_data.m_MainItem);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Magazine itm;
+		return CanEmpty(item);
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		EmptyMagazineActionData emActionData = EmptyMagazineActionData.Cast(action_data);
+		
+		Magazine mag;
+		if (!Class.CastTo(mag, action_data.m_MainItem))
+			return;
+					
+		//float dmg;
+		//string bulletType;
+					
+		/*int ammoCount = mag.GetAmmoCount();
+		if(GetAmmoCount() > 0)
+		{
+			mag.Get
+			mag.SetAmmoCount( ammoCount - 1 );
+			array< Magazine > piles;
+					
+			if( !callback.m_magazinePile )
+			{
+				piles = MiscGameplayFunctions.CreateMagazinePilesFromBullet(bulletType, action_data.m_Player.GetPosition(),1,dmg);
+				if( piles.Count() > 0 )
+					callback.m_magazinePile = piles.Get(0);
+			}
+			else
+			{
+				if( callback.m_magazinePile.GetAmmoMax() > callback.m_magazinePile.GetAmmoCount() && (vector.Distance(action_data.m_Player.GetPosition(), callback.m_magazinePile.GetPosition()) < MAX_GROUND_PILE_DISTANCE ) )
+				{
+					callback.m_magazinePile.StoreCartridge(dmg, bulletType);
+				}
+				else
+				{
+					piles = MiscGameplayFunctions.CreateMagazinePilesFromBullet(bulletType, action_data.m_Player.GetPosition(),1,dmg);
+					if( piles.Count() > 0 )
+						callback.m_magazinePile = piles.Get(0);
+				}	
+			}
+						
+						
+						
+		}	*/
+					
+					
+					
+		//----Uncomment after AcquireCartridge will work
+			
+		float dmg;
+		string ammoType;
+						
+		if ( !mag.ServerAcquireCartridge(dmg,ammoType) )
+			return;
+					
+		mag.ApplyManipulationDamage();
+					
+		string magazineTypeName;
+		GetGame().ConfigGetText( "CfgAmmo " + ammoType + " spawnPileType" , magazineTypeName);
+					
+		if ( !DayZPlayerUtils.HandleStoreCartridge(action_data.m_Player, NULL, -1, dmg, ammoType, magazineTypeName, false) )
+		{
+			array< Magazine > piles;
+					
+			if ( !emActionData.m_magazinePile )
+			{
+				piles = MiscGameplayFunctions.CreateMagazinePilesFromBullet(ammoType,action_data.m_Player.GetPosition(),1,dmg);
+				if ( piles.Count() > 0 )
+					emActionData.m_magazinePile = piles.Get(0);
+			}
+			else
+			{				
+				if ( emActionData.m_magazinePile.GetAmmoMax() > emActionData.m_magazinePile.GetAmmoCount() && (vector.DistanceSq(action_data.m_Player.GetPosition(), emActionData.m_magazinePile.GetPosition()) < (UAMaxDistances.DEFAULT * UAMaxDistances.DEFAULT) ) )
+				{
+					emActionData.m_magazinePile.ServerStoreCartridge(dmg,ammoType);
+				}
+				else
+				{
+					piles = MiscGameplayFunctions.CreateMagazinePilesFromBullet(ammoType, action_data.m_Player.GetPosition(), 1, dmg);
+					if ( piles.Count() > 0 )
+						emActionData.m_magazinePile = piles.Get(0);
+				}	
+			}
+			//emActionData.m_magazinePile.SetSynchDirty();
+		}
+		//mag.SetSynchDirty();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionExtinguishFireplaceByExtinguisher.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionExtinguishFireplaceByExtinguisher.c
new file mode 100644
index 0000000000000000000000000000000000000000..53af6fc112b735437a3459eccfb4626378e120ad
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionExtinguishFireplaceByExtinguisher.c
@@ -0,0 +1,59 @@
+class ActionExtinguishFireplaceByExtinguisherCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_REPEAT			= 0.5;
+	private const float WETNESS_GAIN_MULTIPLIER = 0.5;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityExtinguish(UAQuantityConsumed.FIREPLACE_EXTINGUISHER, TIME_TO_REPEAT, WETNESS_GAIN_MULTIPLIER);
+		CAContinuousQuantityExtinguish.Cast(m_ActionData.m_ActionComponent).MultiplyQuantityUsed(m_ActionData.m_MainItem.GetLiquidThroughputCoef());
+	}
+}
+
+class ActionExtinguishFireplaceByExtinguisher : ActionContinuousBase
+{
+	void ActionExtinguishFireplaceByExtinguisher()
+	{
+		m_CallbackClass 	= ActionExtinguishFireplaceByExtinguisherCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_FIREESTINGUISHER;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_MEDIUM;
+
+		m_Text = "#extinguish";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTDummy();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		Object targetObject = target.GetObject();
+		if (targetObject.IsFireplace())
+		{
+			FireplaceBase fireplace = FireplaceBase.Cast(targetObject);
+			
+			if (fireplace.CanExtinguishFire() && !item.IsDamageDestroyed())
+				return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnStartAnimationLoop(ActionData action_data)
+	{
+		super.OnStartAnimationLoop(action_data);
+		
+		FireplaceBase fireplace = FireplaceBase.Cast(action_data.m_Target.GetObject());
+		fireplace.SetExtinguishingState();
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		FireplaceBase fireplace = FireplaceBase.Cast(action_data.m_Target.GetObject());		
+		fireplace.RefreshFireState();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionExtinguishFireplaceByLiquid.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionExtinguishFireplaceByLiquid.c
new file mode 100644
index 0000000000000000000000000000000000000000..45527f2eb9df03c0e8bde605c7e9af56b1183aaa
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionExtinguishFireplaceByLiquid.c
@@ -0,0 +1,61 @@
+class ActionExtinguishFireplaceByLiquidCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_REPEAT 			= 0.5;
+	private const float WETNESS_GAIN_MULTIPLIER	= 1.0;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityExtinguish(UAQuantityConsumed.FIREPLACE_LIQUID, TIME_TO_REPEAT, WETNESS_GAIN_MULTIPLIER);
+		CAContinuousQuantityExtinguish.Cast(m_ActionData.m_ActionComponent).MultiplyQuantityUsed(m_ActionData.m_MainItem.GetLiquidThroughputCoef());
+	}
+}
+
+class ActionExtinguishFireplaceByLiquid : ActionContinuousBase
+{
+	void ActionExtinguishFireplaceByLiquid()
+	{
+		m_CallbackClass 	= ActionExtinguishFireplaceByLiquidCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_EMPTY_VESSEL;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.ROUGH_MEDIUM;
+		m_FullBody 			= true;
+
+		m_Text 		= "#extinguish";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINotRuinedAndEmpty();
+		m_ConditionTarget 	= new CCTObject(UAMaxDistances.SMALL);
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		Object targetObject = target.GetObject();
+		
+		if (targetObject.IsFireplace())
+		{
+			FireplaceBase fireplace = FireplaceBase.Cast(targetObject);
+			
+			if (fireplace.CanExtinguishFire() && !item.IsDamageDestroyed() && (item.GetLiquidType() & (GROUP_LIQUID_BLOOD | LIQUID_WATER | LIQUID_RIVERWATER | LIQUID_BEER)))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnStartAnimationLoop(ActionData action_data)
+	{
+		super.OnStartAnimationLoop(action_data);
+		
+		FireplaceBase fireplace = FireplaceBase.Cast(action_data.m_Target.GetObject());
+		fireplace.SetExtinguishingState();
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		FireplaceBase fireplace = FireplaceBase.Cast(action_data.m_Target.GetObject());		
+		fireplace.RefreshFireState();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFertilizeSlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFertilizeSlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..920771cffdcbba14f14cfaafb5a9fa345c516b56
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFertilizeSlot.c
@@ -0,0 +1,65 @@
+class ActionFertilizeSlotCB : ActionContinuousBaseCB
+{
+	private const float QUANTITY_USED_PER_SEC = 10;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousFertilizeGardenSlot(QUANTITY_USED_PER_SEC);
+	}
+};
+
+class ActionFertilizeSlot: ActionContinuousBase
+{
+	void ActionFertilizeSlot()
+	{
+		m_CallbackClass = ActionFertilizeSlotCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_MEDIUM;
+		
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#fertilize_slot";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTDummy;
+		m_ConditionItem = new CCINonRuined;
+	}
+
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		GardenBase garden_base;
+		if ( Class.CastTo(garden_base, target.GetObject()))
+		{
+			Slot slot;
+			
+			array<string> selections = new array<string>;
+			garden_base.GetActionComponentNameList(target.GetComponentIndex(), selections);
+			string selection;
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				selection = selections[s];
+				slot = garden_base.GetSlotBySelection( selection );
+				if (slot)
+					break;
+			}
+			
+			if ( garden_base.NeedsFertilization( selection ) )
+			{
+				if ( item.GetQuantity() > 0 )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		// The functionality is in the Execute event of this user action's component.
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillBottleBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillBottleBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0ffc6b4744422c0b2ed51b6d87eb30091feb649
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillBottleBase.c
@@ -0,0 +1,121 @@
+class ActionFillBottleBaseCB : ActionContinuousBaseCB
+{
+	private int m_liquid_type;
+	private float m_BaseFillQuantity;
+	
+	override void CreateActionComponent()
+	{
+		m_liquid_type = ActionFillBottleBase.Cast(m_ActionData.m_Action).GetLiquidType(m_ActionData.m_Player, m_ActionData.m_Target, m_ActionData.m_MainItem);
+		
+		if (m_ActionData.m_Target.GetObject() && m_ActionData.m_Target.GetObject().IsFuelStation())
+		{
+			m_BaseFillQuantity = UAQuantityConsumed.FUEL;
+		}
+		else
+		{
+			m_BaseFillQuantity = UAQuantityConsumed.FILL_LIQUID;
+		}
+		m_ActionData.m_ActionComponent = new CAContinuousFill(m_BaseFillQuantity, m_liquid_type);
+	}
+};
+
+class ActionFillBottleBase: ActionContinuousBase
+{
+	private const float WATER_DEPTH = 0.5;
+	private const string ALLOWED_WATER_SURFACES = string.Format("%1|%2", UAWaterType.FRESH, UAWaterType.STILL);
+	
+	void ActionFillBottleBase()
+	{
+		m_CallbackClass		= ActionFillBottleBaseCB;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_FILLBOTTLEPOND;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.PRECISE_LOW;
+		m_Text				= "#fill";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone()
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item.IsFullQuantity())
+			return false;
+
+		Object targetObject = target.GetObject();
+		if (targetObject)
+		{
+			Land_FuelStation_Feed fuelstation = Land_FuelStation_Feed.Cast(targetObject);
+			if (fuelstation)
+			{
+				if (!fuelstation.HasFuelToGive())
+					return false;
+			}
+			if (vector.DistanceSq(player.GetPosition(), targetObject.GetPosition()) > UAMaxDistances.DEFAULT * UAMaxDistances.DEFAULT)
+				return false;
+			
+			if (targetObject.GetWaterSourceObjectType() != EWaterSourceObjectType.NONE || targetObject.GetWaterSourceObjectType() == EWaterSourceObjectType.THROUGH || targetObject.IsFuelStation())
+			{
+				return GetLiquidType(player, target, item) != -1;
+			}
+		}
+
+		CCTWaterSurface waterCheck = new CCTWaterSurface(UAMaxDistances.DEFAULT, ALLOWED_WATER_SURFACES);
+		if (waterCheck.Can(player, target))
+			return GetLiquidType(player, target, item) != -1;
+
+		return false;
+	}
+	
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		return action_data.m_MainItem.GetQuantity() < action_data.m_MainItem.GetQuantityMax();
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{	
+		SetupStance(player);
+	
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			if (action_data.m_Target.GetObject())
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_FILLBOTTLEWELL;
+			
+			return true;
+		}
+
+		return false;
+	}
+	
+	int GetLiquidType(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (target.GetObject() && target.GetObject().IsFuelStation())
+		{
+			if (Liquid.CanFillContainer(item, LIQUID_GASOLINE))
+				return LIQUID_GASOLINE;
+		}
+		else if ((!target.GetObject() || target.GetObject().IsWell() || target.GetObject().GetWaterSourceObjectType() == EWaterSourceObjectType.WELL || target.GetObject().GetWaterSourceObjectType() == EWaterSourceObjectType.THROUGH) && Liquid.CanFillContainer(item, LIQUID_WATER))
+		{
+			return LIQUID_WATER;
+		}
+		
+		return -1;
+	}
+	
+	void SetupStance(PlayerBase player)
+	{
+		//returns in format (totalWaterDepth, characterDepht, 0)
+		vector water_info = HumanCommandSwim.WaterLevelCheck(player, player.GetPosition());
+		if (water_info[1] > WATER_DEPTH)
+		{
+			m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		}
+		else
+		{
+			m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillGeneratorTank.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillGeneratorTank.c
new file mode 100644
index 0000000000000000000000000000000000000000..b9d4e1cc844a9c845747831a2d4647c83f424ab8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillGeneratorTank.c
@@ -0,0 +1,43 @@
+class ActionFillGeneratorTankCB : ActionContinuousBaseCB
+{
+	private const float QUANTITY_FILLED_PER_SEC = 400;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousFillPowerGenerator(QUANTITY_FILLED_PER_SEC, LIQUID_GASOLINE);
+	}
+};
+
+class ActionFillGeneratorTank: ActionContinuousBase
+{	
+	void ActionFillGeneratorTank()
+	{
+		m_CallbackClass = ActionFillGeneratorTankCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_EMPTY_VESSEL;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody = true;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#refuel";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		PowerGeneratorBase pg;
+		
+		if ( Class.CastTo(pg,target.GetObject()) )
+		{
+			if ( pg.CanAddFuel( item ) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..edb1277971a0e426503d83c5a09d99b93e0e625b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFillObject.c
@@ -0,0 +1,110 @@
+class ActionFillObjectCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_FILL);
+	}
+};
+
+class ActionFillObject: ActionContinuousBase
+{
+	protected int m_ActionState;
+
+	protected const int EMPTY 						= 0;
+	protected const int FILLED 						= 1;
+	
+	void ActionFillObject()
+	{
+		m_CallbackClass = ActionFillObjectCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DIG;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override void OnActionInfoUpdate(  PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		HescoBox hesco = HescoBox.Cast(target.GetObject());
+
+		if( hesco.GetState() == HescoBox.UNFOLDED )
+		{
+			m_Text =  "#empty";
+		}
+		else
+		{
+			m_Text =  "#fill";
+		}
+	}	
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( player.IsPlacingLocal() )
+			return false;
+		
+		HescoBox hesco;
+		if ( Class.CastTo(hesco,target.GetObject()) )
+		{
+			if ( hesco.CanBeFilledAtPosition( player.GetPosition() ) )
+			{
+				if ( hesco.GetState() == HescoBox.UNFOLDED )
+				{
+					m_ActionState = EMPTY;
+					return true;
+				}
+				else if( hesco.GetState() == HescoBox.FILLED)
+				{
+					m_ActionState = FILLED;
+					return true;					
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		HescoBox hesco;
+		
+		if ( Class.CastTo(hesco,action_data.m_Target.GetObject()) )
+		{
+			const float ITEM_DAMAGE = 0.05;
+			action_data.m_MainItem.DecreaseHealth ( "", "", action_data.m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus( ITEM_DAMAGE, this.GetSpecialtyWeight() )*100 );
+			
+			if ( hesco.GetState() == HescoBox.UNFOLDED )
+			{
+				hesco.Fill();
+			}
+			else if ( hesco.GetState() == HescoBox.FILLED )
+			{
+				hesco.Unfold();
+			}
+		}
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override void OnFinishProgressClient( ActionData action_data )
+	{
+		HescoBox hesco;
+		
+		if ( Class.CastTo(hesco,action_data.m_Target.GetObject()) )
+		{
+			if ( hesco.GetState() == HescoBox.UNFOLDED )
+			{
+				hesco.Fill();
+			}
+			else if ( hesco.GetState() == HescoBox.FILLED )
+			{
+				hesco.Unfold();
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFishing.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFishing.c
new file mode 100644
index 0000000000000000000000000000000000000000..482e9597880633fc51bfb7f8542b474ad3694277
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFishing.c
@@ -0,0 +1,54 @@
+/*class ActionFishingCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousFish;
+	}
+};
+
+class ActionFishing: ActionContinuousBase
+{
+	void ActionFishing()
+	{
+		m_CallbackClass = ActionFishingCB;
+		m_Sounds.Insert("FishStruggling_0");
+		m_Sounds.Insert("FishStruggling_1");
+		m_Sounds.Insert("FishStruggling_2");
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_MEDIUM;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_FISHING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+		
+	override string GetText()
+	{
+		return "#pull";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		FishingRod_Base nitem = FishingRod_Base.Cast( item );
+		if ( nitem.IsFishingActive() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnEndServer( ActionData action_data )
+	{
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};*/
+
+	
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFishingNew.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFishingNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..c26d44ae209b8080f1a3a192fdecfdf095ad535c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFishingNew.c
@@ -0,0 +1,355 @@
+class FishingActionData : ActionData
+{
+	const float FISHING_SUCCESS 		= 0.2;
+	const float FISHING_BAIT_LOSS 		= 0.02;
+	const float FISHING_HOOK_LOSS 		= 0.015;
+	const float FISHING_DAMAGE 			= 1.5;
+	const float FISHING_GARBAGE_CHANCE 	= 0.2;
+	
+	bool 		m_IsSurfaceSea;
+	bool 		m_IsBaitAnEmptyHook;
+	int 		m_FishingResult = -1;
+	float 		m_RodQualityModifier = 0;
+	ItemBase 	m_Bait;
+	
+	void InitBait(ItemBase item)
+	{
+		m_Bait = item;
+		m_IsBaitAnEmptyHook = !m_Bait.ConfigIsExisting("hookType");
+	}
+	
+	bool IsBaitEmptyHook()
+	{
+		return m_IsBaitAnEmptyHook;
+	}
+}
+
+class ActionFishingNewCB : ActionContinuousBaseCB
+{
+	FishingActionData 	m_ActionDataFishing;
+	ref array<string> 	m_JunkTypes = {
+		"Wellies_Black",
+		"Wellies_Brown",
+		"Wellies_Green",
+		"Wellies_Grey",
+		"Pot"
+	};
+	
+	override void CreateActionComponent()
+	{
+		EnableStateChangeCallback();
+		m_ActionData.m_ActionComponent = new CAContinuousRepeatFishing(3.0);
+	}
+	
+	override void EndActionComponent()
+	{
+		m_ActionDataFishing = FishingActionData.Cast(m_ActionData);
+		
+		if (!m_ActionDataFishing)
+		{
+			super.EndActionComponent();
+			return;
+		}
+		
+		if (m_ActionDataFishing.m_State == UA_FINISHED)
+		{
+			if (m_ActionDataFishing.m_FishingResult == 1)
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			else if (m_ActionDataFishing.m_FishingResult == 0)
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+		}
+		else if (m_ActionDataFishing.m_State == UA_CANCEL)
+		{
+			ActionContinuousBase action = ActionContinuousBase.Cast(m_ActionDataFishing.m_Action);
+			if (action.HasAlternativeInterrupt())
+			{
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+			}
+			else
+			{
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			}
+
+			m_Canceled = true;
+			return;
+		}
+		else
+		{
+			if (m_ActionDataFishing.m_FishingResult == 1)
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			else if (m_ActionDataFishing.m_FishingResult == 0)
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+		}
+
+		m_ActionDataFishing.m_State = UA_FINISHED;
+	}
+	
+	void HandleFishingResultSuccess()
+	{
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			ItemBase fish;
+
+			if (!m_ActionDataFishing.m_Bait)
+				m_ActionDataFishing.InitBait(ItemBase.Cast(m_ActionDataFishing.m_MainItem.FindAttachmentBySlotName("Hook")));
+			
+			if (!m_ActionDataFishing.IsBaitEmptyHook())
+			{
+				m_ActionDataFishing.m_Bait.AddHealth(-m_ActionDataFishing.FISHING_DAMAGE);
+				MiscGameplayFunctions.TurnItemIntoItem(m_ActionDataFishing.m_Bait,m_ActionDataFishing.m_Bait.ConfigGetString("hookType"),m_ActionDataFishing.m_Player);
+			}
+			else
+			{
+				m_ActionDataFishing.m_Bait.AddHealth(-m_ActionDataFishing.FISHING_DAMAGE);
+			}
+			
+			float rnd = Math.RandomFloatInclusive(0.0, 1.0);
+			if (rnd > m_ActionDataFishing.FISHING_GARBAGE_CHANCE)
+			{
+				if (m_ActionDataFishing.m_IsSurfaceSea)
+					fish = ItemBase.Cast(GetGame().CreateObjectEx("Mackerel",m_ActionDataFishing.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+				else
+					fish = ItemBase.Cast(GetGame().CreateObjectEx("Carp",m_ActionDataFishing.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+			}
+			else
+			{
+				if ( !m_ActionDataFishing.m_IsSurfaceSea )
+				{
+					string junkType = m_JunkTypes.Get(Math.RandomInt(0, m_JunkTypes.Count()));
+					fish = ItemBase.Cast(GetGame().CreateObjectEx(junkType, m_ActionDataFishing.m_Player.GetPosition(), ECE_PLACE_ON_SURFACE));
+					fish.SetHealth("", "Health", fish.GetMaxHealth("", "Health") * 0.1);
+				}
+			}
+			
+			if (fish)
+			{
+				//Print("---Caught something: " + fish + "---");
+				fish.SetWet(0.3);
+				if (fish.HasQuantity())
+				{
+					float coef = Math.RandomFloatInclusive(0.5, 1.0);
+					float item_quantity = fish.GetQuantityMax() * coef;
+					item_quantity = Math.Round(item_quantity);
+					fish.SetQuantity( item_quantity );
+					fish.InsertAgent(eAgents.CHOLERA);
+				}
+			}
+			
+			m_ActionDataFishing.m_MainItem.AddHealth(-m_ActionDataFishing.FISHING_DAMAGE);
+		}
+	}
+	
+	void HandleFishingResultFailure()
+	{
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			if (!m_ActionDataFishing.m_Bait)
+				m_ActionDataFishing.InitBait(ItemBase.Cast(m_ActionDataFishing.m_MainItem.FindAttachmentBySlotName("Hook")));
+			
+			if (Math.RandomFloatInclusive(0.0,1.0) > m_ActionDataFishing.FISHING_HOOK_LOSS) //loss of worm only
+			{
+				if (!m_ActionDataFishing.IsBaitEmptyHook())
+				{
+					m_ActionDataFishing.m_Bait.AddHealth(-m_ActionDataFishing.FISHING_DAMAGE);
+					MiscGameplayFunctions.TurnItemIntoItem(m_ActionDataFishing.m_Bait,m_ActionDataFishing.m_Bait.ConfigGetString("hookType"),m_ActionDataFishing.m_Player);
+				}
+			}
+			else //loss of the entire hook
+			{
+				m_ActionDataFishing.m_Bait.Delete();
+			}
+			
+			m_ActionDataFishing.m_MainItem.AddHealth(-m_ActionDataFishing.FISHING_DAMAGE);
+		}
+	}
+	
+	override void OnStateChange(int pOldState, int pCurrentState)
+	{
+		if (pCurrentState == STATE_NONE && m_ActionDataFishing)
+		{
+			if (m_ActionDataFishing.m_FishingResult == 1 && pOldState == STATE_LOOP_END)
+			{
+				HandleFishingResultSuccess();
+			}
+			else if (m_ActionDataFishing.m_FishingResult == 0 && pOldState == STATE_LOOP_END2)
+			{
+				HandleFishingResultFailure();
+			}
+		}
+	}
+};
+
+class ActionFishingNew: ActionContinuousBase
+{
+	private const string ALLOWED_WATER_SURFACES = string.Format("%1|%2", UAWaterType.SEA, UAWaterType.FRESH);
+
+	void ActionFishingNew()
+	{
+		m_CallbackClass 	= ActionFishingNewCB;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.PRECISE_MEDIUM;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_FISHING;
+		m_FullBody 			= true;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text 				= "#start_fishing";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTWaterSurface(UAMaxDistances.BASEBUILDING, ALLOWED_WATER_SURFACES);
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase bait;		
+		FishingRod_Base_New rod = FishingRod_Base_New.Cast(item);
+		
+		if (rod)
+			bait = ItemBase.Cast(rod.FindAttachmentBySlotName("Hook"));
+		
+		if (bait && !bait.IsRuined())
+			return true;
+		
+		return false;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		FishingActionData actionData = new FishingActionData();
+		return actionData;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = null)
+	{
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			vector cursorPosition = action_data.m_Target.GetCursorHitPos();
+			if (cursorPosition == vector.Zero)
+				cursorPosition = player.GetPosition();
+
+			if (GetGame().SurfaceIsSea(cursorPosition[0], cursorPosition[2]))
+			{
+				FishingActionData.Cast(action_data).m_IsSurfaceSea = true;
+			}
+
+			FishingRod_Base_New rod = FishingRod_Base_New.Cast(action_data.m_MainItem);
+			if (rod)
+			{
+				FishingActionData.Cast(action_data).m_RodQualityModifier = rod.GetFishingEffectivityBonus();
+				FishingActionData.Cast(action_data).InitBait(ItemBase.Cast(action_data.m_MainItem.FindAttachmentBySlotName("Hook")));
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		action_data.m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_ACTION);
+		FishingActionData.Cast(action_data).m_FishingResult = EvaluateFishingResult(action_data);
+	}
+	
+	override void OnFinishProgressClient( ActionData action_data )
+	{
+		action_data.m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_ACTION);
+		FishingActionData.Cast(action_data).m_FishingResult = EvaluateFishingResult(action_data);
+	}
+	
+	override void OnStartClient( ActionData action_data )
+	{
+		FishingRod_Base_New rod = FishingRod_Base_New.Cast(action_data.m_MainItem);
+		rod.AnimateFishingRod(true);
+	}
+	override void OnStartServer( ActionData action_data )
+	{
+		FishingRod_Base_New rod = FishingRod_Base_New.Cast(action_data.m_MainItem);
+		rod.AnimateFishingRod(true);
+	}
+	
+	override void OnEndClient( ActionData action_data )
+	{
+		FishingRod_Base_New rod = FishingRod_Base_New.Cast(action_data.m_MainItem);
+		rod.AnimateFishingRod(false);
+	}
+	override void OnEndServer( ActionData action_data )
+	{
+		FishingRod_Base_New rod = FishingRod_Base_New.Cast(action_data.m_MainItem);
+		rod.AnimateFishingRod(false);
+	}
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		if (HasTarget())
+		{
+			ctx.Write(action_data.m_Target.GetCursorHitPos());
+		}
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data)
+	{		
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		if (HasTarget())
+		{
+			vector cursor_position;
+			if (!ctx.Read(cursor_position))
+				return false;
+
+			action_recive_data.m_Target.SetCursorHitPos(cursor_position);
+		}
+		return true;
+	}
+	
+	int EvaluateFishingResult(ActionData action_data)
+	{
+		if (action_data.m_Player.IsQuickFishing())
+			return 1;
+		
+		FishingActionData fad = FishingActionData.Cast(action_data);
+		float rnd = fad.m_Player.GetRandomGeneratorSyncManager().GetRandom01(RandomGeneratorSyncUsage.RGSGeneric);
+		float daytimeModifier = 1;
+		float hookModifier = 1;
+		float chance;
+		
+		daytimeModifier = GetGame().GetDayTime();
+		if ((daytimeModifier > 18 && daytimeModifier < 22) || (daytimeModifier > 5 && daytimeModifier < 9))
+		{
+			daytimeModifier = 1;
+		}
+		else
+		{
+			daytimeModifier = 0.5;
+		}
+		
+		//fishing with an empty hook
+		if (fad.IsBaitEmptyHook())
+		{
+			hookModifier = 0.05;
+		}
+		
+		chance = 1 - (((fad.FISHING_SUCCESS * daytimeModifier) + fad.m_RodQualityModifier)) * hookModifier;
+		
+		if (rnd > chance)
+		{
+			return 1;
+		}
+		else if (rnd < fad.FISHING_BAIT_LOSS && !fad.IsBaitEmptyHook()) // restricts the loss of an empty hook (low chance is enough)
+		{
+			return 0;
+		}
+
+		return -1;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFoldBaseBuildingObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFoldBaseBuildingObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..d92c9469650f8ce4b7fab088b2eff3e7bd8d6dbc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionFoldBaseBuildingObject.c
@@ -0,0 +1,62 @@
+class ActionFoldBaseBuildingObjectCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.DEFAULT_DEPLOY );
+	}
+}
+
+class ActionFoldBaseBuildingObject: ActionContinuousBase
+{
+	void ActionFoldBaseBuildingObject()
+	{
+		m_CallbackClass = ActionFoldBaseBuildingObjectCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#fold";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		
+		if ( targetObject.CanUseConstruction() )
+		{
+			BaseBuildingBase base_building = BaseBuildingBase.Cast( targetObject );
+			
+			if ( base_building.CanFoldBaseBuildingObject() )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		ItemBase item;
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( action_data.m_Target.GetObject() );
+		
+		base_building.CreateConstructionKitInHands(action_data.m_Player);
+		base_building.DestroyConstruction();
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return " folded " + action_data.m_Target.GetObject().GetDisplayName();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceConsume.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceConsume.c
new file mode 100644
index 0000000000000000000000000000000000000000..acd8d488ae167e4d3cb3490d17529c268010da0c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceConsume.c
@@ -0,0 +1,42 @@
+class ActionForceConsumeCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.DEFAULT, UATimeSpent.DEFAULT);
+	}
+}
+
+class ActionForceConsume : ActionContinuousBase
+{
+	void ActionForceConsume()
+	{
+		m_CallbackClass = ActionForceConsumeCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_FORCEFEED;
+		m_StanceMask 	= DayZPlayerConstants.STANCEIDX_ERECT | DayZPlayerConstants.STANCEIDX_CROUCH;
+		m_FullBody 		= true;
+		m_Text 			= "#feed";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget 	= new CCTMan(UAMaxDistances.DEFAULT);
+		m_ConditionItem 	= new CCINonRuined();
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{	
+		if (action_data.m_MainItem && (action_data.m_MainItem.GetQuantity() <= 0.01))
+		{
+			action_data.m_MainItem.SetQuantity(0);
+		}
+	
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition(player, target, item))
+			return false;
+
+		return item.GetQuantity() > item.GetQuantityMin();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceDrink.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceDrink.c
new file mode 100644
index 0000000000000000000000000000000000000000..97af31eb47019dd063d7f373a880392b2e56c0d0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceDrink.c
@@ -0,0 +1,41 @@
+class ActionForceDrinkCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.DRINK,UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionForceDrink: ActionForceConsume
+{
+	void ActionForceDrink()
+	{
+		m_CallbackClass = ActionForceDrinkCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_EMPTY_VESSEL;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#give_drink";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (!super.ActionCondition( player, target, item))
+			return false;
+		
+		PlayerBase target_player = PlayerBase.Cast(target.GetObject());
+		
+		if (target_player)
+			return target_player.CanEatAndDrink();
+		else
+			return false;
+	}
+	
+};
+	
+	
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeed.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeed.c
new file mode 100644
index 0000000000000000000000000000000000000000..809710c164444ef445648866e7b9a0bc72d99f43
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeed.c
@@ -0,0 +1,96 @@
+class ActionForceFeedCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_NORMAL, UATimeSpent.DEFAULT);
+	}
+}
+
+class ActionForceFeed: ActionForceConsume
+{
+	void ActionForceFeed()
+	{
+		m_CallbackClass = ActionForceFeedCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_FORCEFEED;
+		m_FullBody 		= true;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;		
+		m_Text 			= "#feed";
+	}
+	
+	override void CreateConditionComponents() 
+	{
+		m_ConditionTarget 	= new CCTMan(UAMaxDistances.DEFAULT);
+		m_ConditionItem		= new CCINonRuined();
+	}
+	
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		PlayerBase targetPlayer = PlayerBase.Cast(target.GetObject());
+		
+		return targetPlayer && targetPlayer.CanEatAndDrink();
+	}
+	
+	
+	override void OnEndServer(ActionData action_data)
+	{	
+		super.OnEndServer(action_data);
+
+		if (action_data.m_Player.HasBloodyHands() && !action_data.m_Player.GetInventory().FindAttachment(InventorySlots.GLOVES))
+		{
+			Object targetPlayer = action_data.m_Target.GetObject();
+			PlayerBase target = PlayerBase.Cast(targetPlayer);
+			if (target)
+			{
+				target.SetBloodyHandsPenalty();
+			}
+		}
+	}
+};
+
+
+//-----------------SMALL BITES VARIANT-------------------
+
+class ActionForceFeedSmallCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_NORMAL,UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionForceFeedSmall: ActionForceConsume
+{
+	void ActionForceFeed()
+	{
+		m_CallbackClass = ActionForceFeedSmallCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_FORCEFEED;
+		m_FullBody		= true;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override void CreateConditionComponents() 
+	{
+		m_ConditionTarget	= new CCTMan(UAMaxDistances.DEFAULT);
+		m_ConditionItem		= new CCINonRuined();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		PlayerBase targetPlayer = PlayerBase.Cast(target.GetObject());
+		
+		return targetPlayer && targetPlayer.CanEatAndDrink();
+	}
+	
+		
+	override string GetText()
+	{
+		return "#feed";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeedCan.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeedCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..e3f63e6cbaf2b8ac0cf592ba673faaa32913e6ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeedCan.c
@@ -0,0 +1,7 @@
+class ActionForceFeedCan: ActionForceFeed
+{	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		return super.ActionCondition(player, target, item);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeedMeat.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeedMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab1e4cf601ee7c58933a14b7c90b90fa59ac8668
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionForceFeedMeat.c
@@ -0,0 +1,25 @@
+class ActionForceFeedMeatCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityEdible(UAQuantityConsumed.EAT_NORMAL,UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionForceFeedMeat: ActionForceConsume
+{
+	void ActionForceFeedMeat()
+	{
+		m_CallbackClass = ActionForceFeedMeatCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_FORCEFEED;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#feed";
+	}
+	
+	override void CreateConditionComponents() 
+	{
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionGagSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionGagSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf3db18e4171f0870f327debd7351503bb49e408
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionGagSelf.c
@@ -0,0 +1,67 @@
+class ActionGagSelf: ActionContinuousBase
+{	
+	void ActionGagSelf()
+	{
+		m_CallbackClass = ActionCoverHeadSelfCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_COVERHEAD_SELF;
+		//m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#gag_self";
+	}
+
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSelf;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (item.GetQuantity() > 1)
+			return false;
+		
+		if ( !IsWearingMask(player) ) 
+		{
+			ItemBase headgear = ItemBase.Cast(player.FindAttachmentBySlotName( "Headgear" ));
+			if ( headgear )
+			{		
+				bool headgear_restricted;
+				headgear_restricted = headgear.ConfigGetBool( "noMask" );
+				if (headgear_restricted)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		ItemBase new_item;
+		if (Class.CastTo(new_item,action_data.m_Player.GetInventory().CreateAttachmentEx("MouthRag",InventorySlots.MASK)))
+		{
+			MiscGameplayFunctions.TransferItemProperties(action_data.m_MainItem,new_item,true,false,true);
+			
+			action_data.m_MainItem.TransferModifiers(action_data.m_Player);
+			action_data.m_MainItem.Delete();
+		}
+	}
+
+	bool IsWearingMask( PlayerBase player)
+	{
+		if ( player.GetInventory().FindAttachment(InventorySlots.MASK) )
+		{
+			return true;
+		}
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionGagTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionGagTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..42ab52642fbc1b08e3ca9fbec8f68aaa0b833f17
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionGagTarget.c
@@ -0,0 +1,71 @@
+class ActionGagTarget: ActionContinuousBase
+{	
+	void ActionGagTarget()
+	{
+		m_CallbackClass = ActionCoverHeadTargetCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_COVERHEAD_TARGET;
+		//m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#gag_person";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);		
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (item.GetQuantity() > 1)
+			return false;
+		
+		PlayerBase targetPlayer;
+		Class.CastTo(targetPlayer, target.GetObject());
+		if ( !IsWearingMask(targetPlayer) ) 
+		{
+			ItemBase headgear = ItemBase.Cast(targetPlayer.FindAttachmentBySlotName( "Headgear" ));
+			if ( headgear )
+			{
+				bool headgear_restricted;
+				headgear_restricted = headgear.ConfigGetBool( "noMask" );
+				if (headgear_restricted)
+				{
+					return false;
+				}
+			}
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		PlayerBase ntarget;
+		Class.CastTo(ntarget, action_data.m_Target.GetObject());
+		
+		if (CanReceiveAction(action_data.m_Target))
+		{
+			ItemBase m_Gag;
+			if (Class.CastTo(m_Gag,ntarget.GetInventory().CreateAttachmentEx("MouthRag",InventorySlots.MASK)))
+			{
+				m_Gag.SetHealth01("", "", action_data.m_MainItem.GetHealth01("", ""));
+				
+				action_data.m_MainItem.TransferModifiers(ntarget);
+				action_data.m_MainItem.Delete();
+			}
+		}
+	}
+	
+	bool IsWearingMask( PlayerBase player)
+	{
+		if ( player.GetInventory().FindAttachment(InventorySlots.MASK) )
+		{
+			return true;
+		}
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionIgniteFireplaceByAir.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionIgniteFireplaceByAir.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd395601fbf45f184c18d948dab6e77ddf88a4e9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionIgniteFireplaceByAir.c
@@ -0,0 +1,65 @@
+class ActionIgniteFireplaceByAirCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.FIREPLACE_IGNITE );
+	}
+};
+
+class ActionIgniteFireplaceByAir: ActionContinuousBase
+{	
+	void ActionIgniteFireplaceByAir()
+	{
+		m_CallbackClass = ActionIgniteFireplaceByAirCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_BLOWFIREPLACE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;	
+		m_Text = "#blow_air_into_fireplace";
+	}
+
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINotPresent;
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+		
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		FireplaceBase fireplace_target = FireplaceBase.Cast( target_object );
+		
+		if ( target_object && target_object.IsFireplace() )
+		{
+			if ( fireplace_target.IsBaseFireplace() || fireplace_target.IsFireplaceIndoor() )
+			{				
+				if ( !fireplace_target.IsBurning() && fireplace_target.GetTemperature() >= fireplace_target.PARAM_MIN_TEMP_TO_REIGNITE )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		FireplaceBase fireplace_target = FireplaceBase.Cast( action_data.m_Target.GetObject() );
+
+		//start fire
+		fireplace_target.StartFire();
+		
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	bool SkipKindlingCheck()
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLightItemOnFire.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLightItemOnFire.c
new file mode 100644
index 0000000000000000000000000000000000000000..1006a6d195fc1c3c5e8c5a4ba1ee7228442fc0b5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLightItemOnFire.c
@@ -0,0 +1,165 @@
+class ActionLightItemOnFireCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.FIREPLACE_IGNITE );
+	}
+}
+
+class ActionLightItemOnFire: ActionContinuousBase
+{
+	void ActionLightItemOnFire()
+	{
+		m_CallbackClass = ActionLightItemOnFireCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_STARTFIRE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#ignite";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_ConditionItem = new CCINonRuined;
+	}
+
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+	
+	// Removed as a fix for igniting Torch by Matchbox through drag&drop in inventory
+	/*override bool CanBePerformedFromInventory()
+	{
+		return true;
+	}*/
+	
+	// Check if ignite candidate is in cargo of something or not.
+	bool IsItemInCargoOfSomething(ItemBase item)
+	{
+		if ( item.GetInventory() )
+		{
+			InventoryLocation loc = new InventoryLocation;
+			item.GetInventory().GetCurrentInventoryLocation(loc);
+			
+			if ( loc.GetIdx() > -1 )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		FireworksBase fireworks = FireworksBase.Cast( action_data.m_Target.GetObject() );
+		
+		if (fireworks)
+		{
+			return true;//something might begin occluding the item after the ignition began, we don't want that to cancel the ignition process, not the prettiest solution, but it works
+		}
+		else 
+		{
+			return ActionCondition(action_data.m_Player, action_data.m_Target,action_data.m_MainItem);
+		}
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		
+		if (targetItem && item)
+		{
+			// when igniting item on the ground with igniter in hands
+			if (!targetItem.IsIgnited() && !IsItemInCargoOfSomething(targetItem) && item.CanIgniteItem(targetItem) && targetItem.CanBeIgnitedBy(item))
+			{
+				// oven stage of standard fireplace
+				if (targetItem.IsKindOf("Fireplace"))
+				{
+					if (Fireplace.Cast(targetItem).IsOven())
+						return true;
+					
+					if (Fireplace.CanIgniteEntityAsFireplace(targetItem))
+						return true;
+
+					return false;
+				}
+				
+				return true;
+			}
+			// when igniting item in hands from something on ground
+			else if (!item.IsIgnited() && !IsItemInCargoOfSomething(item) && targetItem.CanIgniteItem(item) && item.CanBeIgnitedBy(targetItem))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		ItemBase target_item = ItemBase.Cast( action_data.m_Target.GetObject() );
+		ItemBase item = action_data.m_MainItem;
+		
+		bool is_ignition_successful;
+		ItemBase ignited_item;				//item that was lit on fire
+		ItemBase fire_source_item;			//item that was the source of fire
+		
+		if ( item.CanIgniteItem( target_item ) )
+		{
+			is_ignition_successful = target_item.IsThisIgnitionSuccessful( item );
+			ignited_item = target_item;
+			fire_source_item = item;
+		}
+		else if ( item.CanBeIgnitedBy( target_item ) )
+		{
+			is_ignition_successful = target_item.IsTargetIgnitionSuccessful( item );
+			ignited_item = item;
+			fire_source_item = target_item;			
+		}
+		
+		if ( is_ignition_successful )
+		{
+			fire_source_item.OnIgnitedTarget( ignited_item );
+			ignited_item.OnIgnitedThis( fire_source_item );			
+		}
+		else
+		{
+			fire_source_item.OnIgnitedTargetFailed( ignited_item );
+			ignited_item.OnIgnitedThisFailed( fire_source_item );			
+		}
+	}
+	
+	//setup
+	override bool SetupAction( PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL )
+	{	
+		if ( super.SetupAction( player, target, item, action_data, extra_data ) )
+		{
+			ItemBase target_item = ItemBase.Cast( target.GetObject() );
+			if ( target_item )
+			{
+				SetIgnitingAnimation( target_item );
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void SetIgnitingAnimation( ItemBase target_item )
+	{
+		if ( target_item.HasFlammableMaterial() )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_STARTFIRE;
+		}
+		else
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CRAFTING;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLightItemOnFireWithBlowtorch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLightItemOnFireWithBlowtorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f12dfac06855fbd373ead8f8eb621ecb23f9849
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLightItemOnFireWithBlowtorch.c
@@ -0,0 +1,88 @@
+class ActionLightItemOnFireWithBlowtorchCB : ActionLightItemOnFireCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.FIREPLACE_IGNITE);
+	}
+}
+
+class ActionLightItemOnFireWithBlowtorch : ActionLightItemOnFire
+{
+	void ActionLightItemOnFireWithBlowtorch()
+	{
+		m_CallbackClass = ActionLightItemOnFireWithBlowtorchCB;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		Blowtorch bt = Blowtorch.Cast(item);
+		if (!bt.HasEnoughEnergyForRepair(UATimeSpent.FIREPLACE_IGNITE))
+		{
+			return false;
+		}
+		
+		ItemBase target_item = ItemBase.Cast(target.GetObject());	
+		if (target_item && item)
+		{
+			// when igniting item on the ground with igniter in hands
+			if (!target_item.IsIgnited() && !IsItemInCargoOfSomething(target_item) && target_item.CanBeIgnitedBy(item))
+			{
+				// oven stage of standard fireplace
+				if (target_item.IsKindOf("Fireplace"))
+				{
+					if (Fireplace.Cast(target_item).IsOven())
+					{
+						return true;
+					}
+					
+					if (Fireplace.CanIgniteEntityAsFireplace(target_item))
+					{
+						return true;
+					}
+
+					return false;
+				}
+				
+				return true;
+			}
+			// when igniting item in hands from something on ground
+			else if (!item.IsIgnited() && !IsItemInCargoOfSomething(item) && target_item.CanIgniteItem(item) && item.CanBeIgnitedBy(target_item))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnUpdateServer(ActionData action_data)
+	{
+		super.OnUpdate(action_data);
+
+		if (action_data.m_State == UA_PROCESSING && !action_data.m_MainItem.GetCompEM().IsWorking())
+		{
+			Interrupt(action_data);
+		}
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		super.OnExecuteServer(action_data);
+
+		action_data.m_MainItem.GetCompEM().SwitchOn();
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		super.OnFinishProgressServer(action_data);
+		
+		action_data.m_MainItem.GetCompEM().SwitchOff();
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		super.OnEndServer(action_data);
+		
+		action_data.m_MainItem.GetCompEM().SwitchOff();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLoadMagazine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLoadMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb61c97c754bdf476e497df835b92d1e2252436b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLoadMagazine.c
@@ -0,0 +1,166 @@
+class ActionLoadMagazineCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(UATimeSpent.MAG_LOAD);
+	}
+};
+
+class ActionLoadMagazine: ActionContinuousBase
+{
+	void ActionLoadMagazine()
+	{
+		m_CallbackClass = ActionLoadMagazineCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_FILLMAG;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_FILLMAG;
+		m_Text = "#load_magazine";
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	bool CanLoadMagazine(ActionTarget target, ItemBase item)
+	{
+		Magazine trg;
+		Magazine itm;
+		return ( Class.CastTo(trg, target.GetObject()) && Class.CastTo(itm, item) && itm.GetAmmoCount() < itm.GetAmmoMax() && trg.GetAmmoCount() != 0 && itm.IsCompatiableAmmo( trg ) );
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return CanLoadMagazine(action_data.m_Target, action_data.m_MainItem);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return CanLoadMagazine(target, item);
+	}
+	
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		//Param1<float> timeSpendParam;
+		//if( !Class.CastTo(timeSpendParam, action_data.m_ActionComponent.GetACData()) ) return;
+		
+		Magazine trg;
+		Magazine itm;
+		if ( Class.CastTo(trg, action_data.m_Target.GetObject()) && Class.CastTo(itm, action_data.m_MainItem) )
+		{
+			float dmg;
+			string ammoType;
+						
+			if ( trg.ServerAcquireCartridge(dmg, ammoType) )
+			{
+				if ( !itm.ServerStoreCartridge(dmg, ammoType) )			
+					trg.ServerStoreCartridge(dmg, ammoType);
+				else
+					itm.ApplyManipulationDamage(); //damages magazine
+			}
+
+			trg.SetSynchDirty();
+			itm.SetSynchDirty();
+			//manipulationDamage
+			//if(trg.GetAmmoCount() > 0 )
+				//trg.SetSynchDirty();
+			//itm.SetSynchDirty();
+		}
+	}
+};
+
+class ActionLoadMagazineQuickCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(UATimeSpent.MAG_LOAD);
+	}
+};
+
+class ActionLoadMagazineQuick: ActionContinuousBase
+{
+	void ActionLoadMagazineQuick()
+	{
+		m_CallbackClass = ActionLoadMagazineQuickCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_FILLMAG;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_FILLMAG;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousWeaponManipulationActionInput;
+	} 
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	bool CanLoadMagazine( PlayerBase player, ItemBase item )
+	{
+		Magazine mag = Magazine.Cast( item );
+
+		return mag && player.GetWeaponManager().GetPreparedMagazine() != null && mag.GetAmmoCount() < mag.GetAmmoMax();
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return CanLoadMagazine(action_data.m_Player, action_data.m_MainItem);
+	}	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return CanLoadMagazine(player, item);
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		//Param1<float> timeSpendParam;
+		//if( !Class.CastTo(timeSpendParam, action_data.m_ActionComponent.GetACData()) ) return;
+					
+		Magazine itm = Magazine.Cast(action_data.m_MainItem);
+		Magazine trg = action_data.m_Player.GetWeaponManager().GetPreparedMagazine();
+					
+		if ( !itm || !trg )
+			return;
+					
+		float dmg;
+		string ammoType;
+						
+		if ( trg.ServerAcquireCartridge(dmg, ammoType) )
+		{
+			if ( !itm.ServerStoreCartridge(dmg, ammoType) )			
+				trg.ServerStoreCartridge(dmg, ammoType);
+			else
+				itm.ApplyManipulationDamage(); //damages magazine
+		}
+					
+		trg.SetSynchDirty();
+		itm.SetSynchDirty();
+		//manipulationDamage
+		//if(trg.GetAmmoCount() > 0 )
+			//trg.SetSynchDirty();
+		//itm.SetSynchDirty();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLockAttachment.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLockAttachment.c
new file mode 100644
index 0000000000000000000000000000000000000000..e4210ee34dc20ae365b19b33207a253b205394ea
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLockAttachment.c
@@ -0,0 +1,152 @@
+//Transfer locktypes from BasicDefines.hpp here. This is mostly for readability
+//NONE must be 0 as it is actively used below
+enum eLockTypes
+{
+	NONE = 0,
+	LOCK_SCREW = 1,
+	LOCK_BOLT = 2,
+	LOCK_NUT = 3,
+	LOCK_WIRE = 4
+}
+
+class ActionLockAttachmentCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.BASEBUILDING_REPAIR_FAST );
+	}
+};
+
+class ActionLockAttachment: ActionContinuousBase
+{
+	private const string LOCK_VERSION = "#widget_lock";
+	private const string UNLOCK_VERSION = "#widget_unlock";
+	private string m_Name = LOCK_VERSION;
+	
+	void ActionLockAttachment()
+	{
+		m_CallbackClass = ActionLockAttachmentCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_FullBody = true;
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase target_IB = ItemBase.Cast(target.GetObject());
+		if ( target_IB.IsLockedInSlot() )
+			m_Text = UNLOCK_VERSION;
+		else if ( target_IB.IsAlive() )
+			m_Text = LOCK_VERSION;
+		else
+			m_Text = "";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursorNoRuinCheck(UAMaxDistances.SMALL);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( !target ) 
+			return false;
+		
+		EntityAI parent_EAI = EntityAI.Cast(target.GetParent());
+		ItemBase target_IB = ItemBase.Cast(target.GetObject());
+		
+		array<int> compLock = item.m_CompatibleLocks;
+		int targetType = eLockTypes.NONE;
+		
+		if ( target_IB && parent_EAI )
+		{
+			//CAR DOOR HANDLING
+			//I don't really like this, but sometimes specifics have to be handled in generics
+			CarDoor targetDoor = CarDoor.Cast(target_IB);
+			if ( targetDoor )
+			{
+				InventoryLocation loc = new InventoryLocation();
+				bool isPresent = targetDoor.GetInventory().GetCurrentInventoryLocation( loc );
+				
+				if ( !isPresent || loc.GetSlot() == -1 )
+					return false;
+				
+				string slotName = InventorySlots.GetSlotName( loc.GetSlot() );
+				if ( slotName && CarScript.Cast( parent_EAI ).GetCarDoorsState( slotName ) != CarDoorState.DOORS_OPEN )
+					return false;
+			}
+			//END OF CAR DOOR SPECIFICS
+			
+			
+			if ( target_IB.IsLockedInSlot() )
+				m_Name = UNLOCK_VERSION;
+			else if ( target_IB.IsAlive() )
+				m_Name = LOCK_VERSION;
+			else if ( !target_IB.IsLockedInSlot() ) 
+				return false;
+			
+			targetType = target_IB.GetLockType();
+		
+			for (int i = 0; i < compLock.Count(); i++)
+			{
+				if ( targetType == compLock[i] && targetType != eLockTypes.NONE)
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override void OnStartAnimationLoop( ActionData action_data )
+	{
+		super.OnStartAnimationLoop( action_data );
+
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			ItemBase target_IB = ItemBase.Cast( action_data.m_Target.GetObject() );
+			Param2<bool, string> play = new Param2<bool, string>( true, action_data.m_MainItem.GetLockSoundSet() );
+			GetGame().RPCSingleParam( target_IB, ERPCs.RPC_SOUND_LOCK_ATTACH, play, true );
+		}
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			ItemBase target_IB = ItemBase.Cast( action_data.m_Target.GetObject() );
+			Param2<bool, string> play = new Param2<bool, string>( false, action_data.m_MainItem.GetLockSoundSet() );
+			GetGame().RPCSingleParam( target_IB, ERPCs.RPC_SOUND_LOCK_ATTACH, play, true );
+		}
+	}
+	
+	override void OnEndAnimationLoop( ActionData action_data )
+	{
+		super.OnEndAnimationLoop( action_data );
+
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			ItemBase target_IB = ItemBase.Cast( action_data.m_Target.GetObject() );
+			Param2<bool, string> play = new Param2<bool, string>( false, action_data.m_MainItem.GetLockSoundSet() );
+			GetGame().RPCSingleParam( target_IB, ERPCs.RPC_SOUND_LOCK_ATTACH, play, true );
+		}
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		ItemBase target_IB = ItemBase.Cast(action_data.m_Target.GetObject());
+		
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, 5);
+		
+		if (target_IB.IsLockedInSlot())
+		{
+			target_IB.UnlockFromParent();
+			return;
+		}
+		
+		target_IB.LockToParent();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLockDoors.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLockDoors.c
new file mode 100644
index 0000000000000000000000000000000000000000..590723ec618c0c9ac83600e8472f6d5227a8c220
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLockDoors.c
@@ -0,0 +1,71 @@
+class ActionLockDoorsCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.LOCK);
+	}
+};
+
+class ActionLockDoors: ActionContinuousBase
+{
+	void ActionLockDoors()
+	{
+		m_CallbackClass = ActionLockDoorsCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_HIGH;
+		m_Text = "#lock_door";
+	}
+	
+	override void CreateConditionComponents()
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( !target ) return false;
+		//if( IsDamageDestroyed(action_data.m_Target) ) return false;
+		if( !IsBuilding(target) ) return false;
+		if( !IsInReach(player, target, UAMaxDistances.DEFAULT) ) return false;
+
+		Building building;
+		if( Class.CastTo(building, target.GetObject()) )
+		{
+			int doorIndex = building.GetDoorIndex(target.GetComponentIndex());
+			if ( doorIndex != -1 )
+				return building.CanDoorBeLocked(doorIndex);
+		}		
+		return false;
+	}
+
+	protected void LockDoor(ActionTarget target)
+	{
+		Building building;
+
+		if ( Class.CastTo(building, target.GetObject()) )
+		{
+			int doorIndex = building.GetDoorIndex(target.GetComponentIndex());
+			if ( doorIndex != -1 )
+			{
+				building.LockDoor(doorIndex);
+			}		
+		}
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		LockDoor(action_data.m_Target);
+		
+		//Damage the Lockpick
+		//float dmg = action_data.m_MainItem.GetMaxHealth() * 0.04; //Multiply max health by 'x' amount depending on number of usages wanted (0.04 = 25)
+		
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		
+		float skillLevel = action_data.m_Player.GetSoftSkillsManager().GetSpecialtyLevel();
+		float appliedDamage = 5 + 2*skillLevel; 
+		MiscGameplayFunctions.DealAbsoluteDmg(action_data.m_MainItem, appliedDamage);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLowerFlag.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLowerFlag.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a39943d47111daabab8eaeab32e2e57065e5182
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionLowerFlag.c
@@ -0,0 +1,59 @@
+
+class ActionLowerFlag: ActionContinuousBase
+{
+	void ActionLowerFlag()
+	{
+		m_CallbackClass = ActionManipulateFlagCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_LOWER_FLAG;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#lower_flag";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTCursor;
+		m_ConditionItem = new CCINone;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		TerritoryFlag totem = TerritoryFlag.Cast( target.GetObject() );
+		if (!totem)
+		{
+			return false;
+		}
+		
+		float state = totem.GetAnimationPhase("flag_mast");
+		if ( totem.FindAttachmentBySlotName("Material_FPole_Flag") && state < 1 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		TerritoryFlag totem = TerritoryFlag.Cast( action_data.m_Target.GetObject() );
+		if ( totem )
+		{
+			totem.AnimateFlagEx(totem.GetAnimationPhase("flag_mast") + UAMisc.FLAG_STEP_INCREMENT, action_data.m_Player);
+			totem.AddRefresherTime01(-UAMisc.FLAG_STEP_INCREMENT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineBush.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineBush.c
new file mode 100644
index 0000000000000000000000000000000000000000..c4abe78a0c1cc262cab6000d5e5e90412d69d3aa
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineBush.c
@@ -0,0 +1,41 @@
+class ActionMineBushCB : ActionContinuousBaseCB
+{
+	protected const float TIME_BETWEEN_MATERIAL_DROPS_DEFAULT = 3;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousMineWood(TIME_BETWEEN_MATERIAL_DROPS_DEFAULT);
+	}
+};
+
+class ActionMineBush : ActionMineBase
+{
+	void ActionMineBush()
+	{
+		m_CallbackClass = ActionMineBushCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_HACKBUSH;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.SMALL);
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+			return true;
+		
+		Object targetObject = target.GetObject();
+		return targetObject.IsBush() && targetObject.IsCuttable();
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineBushByHand.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineBushByHand.c
new file mode 100644
index 0000000000000000000000000000000000000000..0240cc7d694b45b86886ade9383a85f9afb4e86c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineBushByHand.c
@@ -0,0 +1,25 @@
+class ActionMineBushByHand: ActionMineBush
+{
+	void ActionMineBushByHand()
+	{
+		m_CallbackClass = ActionMineBushCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+			return true;
+		
+		return (super.ActionCondition(player, target, item) && !item);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineRock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineRock.c
new file mode 100644
index 0000000000000000000000000000000000000000..25298767c201cf4c9e06c38a59faca59c6ea1b2c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineRock.c
@@ -0,0 +1,75 @@
+class ActionMineRockCB : ActionContinuousBaseCB
+{
+	private const float TIME_BETWEEN_MATERIAL_DROPS = 8;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousMineRock(TIME_BETWEEN_MATERIAL_DROPS);
+	}
+};
+
+class ActionMineRock: ActionMineBase
+{
+	void ActionMineRock()
+	{
+		m_CallbackClass = ActionMineRockCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_MINEROCK;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		//m_Text = "#mine";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINonRuined;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if ( targetObject.IsRock() )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+    {
+		ItemBase item = action_data.m_MainItem;
+        if (item.IsKindOf("Hammer"))
+		{
+			return "MinningLight";
+		}
+		else if (item.IsKindOf("MeatTenderizer"))
+		{
+			return "MinningHard";
+		}
+		
+		return "";
+    }
+	
+};
+
+class ActionMineRock1H : ActionMineRock
+{
+	void ActionMineRock1H()
+	{
+		m_CallbackClass = ActionMineRockCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_ASSEMBLE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineTree.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineTree.c
new file mode 100644
index 0000000000000000000000000000000000000000..df6b2a7a5f4c13fe6cbd8916ce55dc18da058058
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineTree.c
@@ -0,0 +1,101 @@
+class MineActionData : ActionData
+{
+	EHarvestType m_HarvestType = EHarvestType.NORMAL;
+}
+
+class ActionMineTreeCB : ActionContinuousBaseCB
+{
+	private const float TIME_BETWEEN_MATERIAL_DROPS_DEFAULT = 4;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousMineWood(TIME_BETWEEN_MATERIAL_DROPS_DEFAULT);
+	} 
+};
+
+class ActionMineBase : ActionContinuousBase
+{
+	EHarvestType m_HarvestType = EHarvestType.NORMAL;
+	
+	override ActionData CreateActionData()
+	{
+		MineActionData data = new MineActionData;
+		data.m_HarvestType = m_HarvestType;
+		return data;
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		m_Text =  "#harvest" + " " + GetYieldName(player, target, item);
+	}
+	
+	string GetYieldName( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		//given the circumstances, the implementation bellow is the path of least resistance
+		Object targetObject = target.GetObject();
+		WoodBase wood = WoodBase.Cast(targetObject);
+		RockBase rock = RockBase.Cast(targetObject);
+		string yieldName;
+		if (wood || rock)
+		{
+			map<string,int> output_map = new map<string,int>;
+			if (wood)
+			{
+				wood.GetMaterialAndQuantityMapEx(item, output_map, m_HarvestType);
+			}
+			else
+			{
+				rock.GetMaterialAndQuantityMap(item, output_map);
+			}
+			if (output_map.Count() > 0)
+			{
+				yieldName = MiscGameplayFunctions.GetItemDisplayName(output_map.GetKey(0));
+			}
+		}
+		return yieldName;
+	}
+	
+}
+	
+class ActionMineTree : ActionMineBase
+{
+	void ActionMineTree()
+	{
+		m_CallbackClass = ActionMineTreeCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_HACKTREE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+	}
+	
+	override void CreateConditionComponents()
+	{	
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.SMALL);
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		
+		return targetObject.IsTree() && targetObject.IsCuttable();
+	}
+	
+	//! not checking target damage anymore, callback takes care of that
+	override bool CanContinue(ActionData action_data)
+	{
+		if (!action_data.m_Player.IsPlayerInStance(action_data.m_PossibleStanceMask) || !m_ConditionItem || !m_ConditionItem.CanContinue(action_data.m_Player,action_data.m_MainItem))
+			return false;
+
+		return ActionConditionContinue(action_data);
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineTreeBark.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineTreeBark.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc4ce53340372693e9b0bdacf9d011c652796f6c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMineTreeBark.c
@@ -0,0 +1,11 @@
+class ActionMineTreeBark: ActionMineTree
+{			
+	void ActionMineTreeBark()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_CUTBARK;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_HarvestType = EHarvestType.BARK;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMountBarbedWire.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMountBarbedWire.c
new file mode 100644
index 0000000000000000000000000000000000000000..3bae8194ed4d22f2229a1dd3fd1f1863beb554ba
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionMountBarbedWire.c
@@ -0,0 +1,95 @@
+class ActionMountBarbedWireCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_CONSTRUCT);
+	}
+};
+
+class ActionMountBarbedWire: ActionContinuousBase
+{
+	float m_DamageAmount;
+	string m_SlotName;
+	
+	void ActionMountBarbedWire()
+	{
+		m_CallbackClass = ActionMountBarbedWireCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		
+		m_DamageAmount = 2;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_HIGH;
+		m_Text = "#mount";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.BASEBUILDING );
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object targetObject = target.GetObject();
+		
+		if ( targetObject && targetObject.CanUseConstruction() && targetObject.CanUseConstructionBuild() )
+		{
+			BaseBuildingBase base_building = BaseBuildingBase.Cast( targetObject );
+			
+			string selection = targetObject.GetActionComponentName( target.GetComponentIndex() );
+			
+			if ( selection.Length() > 0 )
+			{
+				BarbedWire barbed_wire = BarbedWire.Cast( base_building.FindAttachmentBySlotName( selection ) );
+				if ( barbed_wire && !barbed_wire.IsMounted() && !barbed_wire.IsRuined() )
+				{
+					m_SlotName = selection;
+					
+					return true;
+				}
+			}			
+		}
+		
+		return false;
+	}
+		
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( action_data.m_Target.GetObject() );
+		BarbedWire barbed_wire = BarbedWire.Cast( base_building.FindAttachmentBySlotName( m_SlotName ) );
+		
+		//mount and refresh parent
+		barbed_wire.SetMountedState( true );
+		
+		//solution for DamageSystem's case sensitivity
+		string zone = "invalid";
+		array<string> zones = new array<string>;
+		zones.Copy(base_building.GetEntityDamageZoneMap().GetKeyArray());
+		
+		string tmp = "";
+		string test = "";
+		for (int i = 0; i < zones.Count(); i++)
+		{
+			tmp = zones.Get(i);
+			test = tmp;
+			test.ToLower();
+			
+			if (test == m_SlotName)
+			{
+				zone = tmp;
+				break;
+			}
+		}
+		
+		base_building.SetHealth01(zone,"Health",barbed_wire.GetHealth01("","Health")); //attachment slot names and damagezone names must match
+		
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override string GetAdminLogMessage( ActionData action_data )
+	{
+		string message = string.Format("Player %1 Mounted BarbedWire on %2", action_data.m_Player, action_data.m_Target.GetObject().ClassName() );
+		return message;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPackGift.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPackGift.c
new file mode 100644
index 0000000000000000000000000000000000000000..ddd467ac1d0ce4199a3fd6e9692bf27377786e02
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPackGift.c
@@ -0,0 +1,153 @@
+class ActionPackGiftCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.UNPACK);
+	}
+};
+
+class ActionPackGift: ActionContinuousBase
+{	
+	void ActionPackGift()
+	{
+		m_CallbackClass = ActionPackGiftCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENITEM;
+		//m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#STR_Wrap";
+	}
+
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined;
+	}
+
+	override bool HasTarget()	
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase item_to_pack = ItemBase.Cast(target.GetObject());
+		if (!item_to_pack)
+			return false;
+		
+		if ( !item_to_pack.IsTakeable() ) return false;
+		if ( item_to_pack.IsBeingPlaced() ) return false;
+		if ( BaseBuildingBase.Cast(item_to_pack) ) return false;
+		if ( !item_to_pack.CanPutInCargo(null) ) return false;
+		
+		EntityAI tgt_parent = EntityAI.Cast( target.GetParent() );
+		
+		if ( tgt_parent )
+		{	
+			if ( item_to_pack.GetInventory().IsAttachment() )
+			{
+				if ( !item_to_pack.CanDetachAttachment(tgt_parent) || !tgt_parent.CanReleaseAttachment(item_to_pack) )
+					return false;
+			}
+			else
+			{
+				if ( !item_to_pack.CanRemoveFromCargo(tgt_parent) || !tgt_parent.CanReleaseCargo(item_to_pack) )
+					return false;
+			}
+		}
+
+		if ( item_to_pack.GetInventory().GetCargo() && item_to_pack.GetInventory().GetCargo().GetItemCount() > 0)
+			return false;
+		
+		if ( !item_to_pack.IsWeapon() && item_to_pack.GetInventory().AttachmentCount() > 0)
+			return false;
+		
+			
+		int x,y;
+		GetGame().GetInventoryItemSize( item_to_pack, x, y );
+			
+		if( x > 5 || y > 5 )
+			return false;
+
+		return true;
+	}
+	
+	override void OnFinishProgressClient( ActionData action_data )
+	{
+		PlayerBase player = action_data.m_Player;
+		ItemBase item_to_pack = ItemBase.Cast(action_data.m_Target.GetObject());
+		
+		player.RemoveQuickBarEntityShortcut(item_to_pack);
+		
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		ItemBase item_to_pack = ItemBase.Cast(action_data.m_Target.GetObject());
+		ItemBase item = action_data.m_MainItem;
+		PlayerBase player = action_data.m_Player;
+		string typeName;
+		
+		if (item_to_pack)
+		{
+			int x,y;
+			GetGame().GetInventoryItemSize( item_to_pack, x, y );
+			int rnd = Math.RandomIntInclusive(1, 4);
+			
+			ReplaceWithNewReciveCargoLambda lambda;
+			
+			if( x <= 2 && y <= 2 )
+			{
+				typeName = "GiftBox_Small_" + rnd;
+			}
+			else if( x <= 3 && y <= 3 )
+			{
+				typeName = "GiftBox_Medium_" + rnd;
+			}
+			else if( x <= 5 && y <= 5 )
+			{
+				typeName = "GiftBox_Large_" + rnd;
+			}
+			else return;
+			
+			
+			if(!GetGame().IsDedicatedServer())
+				player.RemoveQuickBarEntityShortcut(item_to_pack);
+			
+			lambda = new ReplaceWithNewReciveCargoLambda( item, typeName, player,item_to_pack);
+			player.ServerReplaceItemWithNew(lambda);
+			
+		}
+		
+
+	}
+};
+
+class ReplaceWithNewReciveCargoLambda : TurnItemIntoItemLambda
+{
+	protected EntityAI m_ItemToCargo;
+	void ReplaceWithNewReciveCargoLambda(EntityAI old_item, string new_item_type, PlayerBase player, EntityAI item_to_cargo) 
+	{ 
+		m_ItemToCargo = item_to_cargo;
+	}
+	
+	override void OnSuccess(EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		
+		InventoryLocation src = new InventoryLocation;
+		m_ItemToCargo.GetInventory().GetCurrentInventoryLocation(src);
+		InventoryLocation dst = new InventoryLocation;
+		
+		dst.SetCargo(new_item, m_ItemToCargo, 0,0,0,false);
+					
+		if ( dst.IsValid() )
+		{
+			if(GetGame().IsDedicatedServer())
+				m_Player.ServerTakeToDst(src,dst);
+			else
+				m_Player.LocalTakeToDst(src,dst);
+				
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPlaceObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPlaceObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..e25b8119312697f6700b333019d322d5eebe119f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPlaceObject.c
@@ -0,0 +1,26 @@
+class ActionPlaceObjectCB : ActiondeployObjectCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_PLACE);
+	}
+};
+
+class ActionPlaceObject: ActionDeployObject
+{		
+	void ActionPlaceObject()
+	{
+		m_CallbackClass	= ActionPlaceObjectCB;
+		m_Text = "#place_object";
+	}
+
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override void MoveEntityToFinalPositionSinglePlayer(ActionData action_data, InventoryLocation source, InventoryLocation destination)
+	{
+		action_data.m_Player.GetDayZPlayerInventory().RedirectToHandEvent(InventoryMode.LOCAL, source, destination);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPlaceOnGround.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPlaceOnGround.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b5a003f686ecffcd7d283bd675b409533839a38
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPlaceOnGround.c
@@ -0,0 +1,39 @@
+class ActionPlaceOnGroundCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_PLACE);
+	}
+};
+
+class ActionPlaceOnGround: ActionContinuousBase
+{
+	void ActionPlaceOnGround()
+	{
+		m_CallbackClass = ActionPlaceOnGroundCB;
+		m_Text = "#place_object";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionTarget = new CCTNone;
+		m_ConditionItem = new CCIDummy;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if ( player && player.IsAlive() && !item.IsDamageDestroyed() ) //&& IsConscious && IsNotCaptured
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		action_data.m_Player.DropItem(action_data.m_MainItem);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPourLiquid.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPourLiquid.c
new file mode 100644
index 0000000000000000000000000000000000000000..a746f655d5665b3f0fccc0af1934c9b346ff7f81
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPourLiquid.c
@@ -0,0 +1,81 @@
+class ActionPourLiquidCB : ActionContinuousBaseCB
+{
+	private const float TIME_TO_REPEAT = 0.25;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousQuantityLiquidTransfer(UAQuantityConsumed.DRAIN_LIQUID, TIME_TO_REPEAT, false);
+	}
+};
+
+class ActionPourLiquid: ActionContinuousBase
+{
+	void ActionPourLiquid()
+	{
+		m_CallbackClass = ActionPourLiquidCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EMPTY_VESSEL;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_EMPTY_VESSEL;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#pour_liquid";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		ItemBase target_item = ItemBase.Cast(target.GetObject());
+		
+		if ( target_item && item )
+		{
+				return Liquid.CanTransfer(item,target_item);;
+		}
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override void OnStartAnimationLoop( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Bottle_Base vessel_in_hands = Bottle_Base.Cast( action_data.m_Target.GetObject() );
+			Param1<bool> play = new Param1<bool>( true );
+
+			GetGame().RPCSingleParam( vessel_in_hands, SoundTypeBottle.POURING, play, true );
+		}
+	}
+	
+	override void OnEndAnimationLoop( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Bottle_Base target_vessel = Bottle_Base.Cast( action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>( false );
+
+			GetGame().RPCSingleParam( target_vessel, SoundTypeBottle.POURING, play, true );
+		}
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Bottle_Base target_vessel = Bottle_Base.Cast( action_data.m_Target.GetObject());
+			Param1<bool> play = new Param1<bool>( false );
+
+			GetGame().RPCSingleParam( target_vessel, SoundTypeBottle.POURING, play, true );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPushCar.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPushCar.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ab106fc856e0c1a8241bcbd97454f82482871d2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionPushCar.c
@@ -0,0 +1,307 @@
+class ActionPushCarDataReceiveData : ActionReciveData
+{
+	CarScript m_Car;
+}
+
+class ActionPushCarData : ActionData
+{
+	int m_PushDirection = -1;
+	int m_EndType 		= 0;
+
+	float m_HorizontalDirectionRandom 	= 1.0;
+	float m_VerticalDirectionRandom 	= 1.0;
+
+	vector m_Origin = "0 0 0";
+
+	bool m_NeedUpdate;
+	CarScript m_Car;
+}
+
+class CAContinuousRepeatPushCar : CAContinuousRepeat
+{
+	void CAContinuousRepeatPushCar(float time_to_complete_action)
+	{
+		m_DefaultTimeToComplete = time_to_complete_action;
+	}
+	
+	override int Execute(ActionData action_data)
+	{
+		if (!action_data.m_Player)
+			return UA_ERROR;
+
+		if (m_TimeElpased < m_TimeToComplete)
+		{
+			m_TimeElpased += action_data.m_Player.GetDeltaT();
+			m_TotalTimeElpased += action_data.m_Player.GetDeltaT();
+			return UA_PROCESSING;
+		}
+		else
+		{
+			m_SpentUnits.param1 = m_TimeElpased;
+			SetACData(m_SpentUnits);
+			m_TimeElpased = m_TimeToComplete - m_TimeElpased;
+			OnCompletePogress(action_data);
+
+			return UA_CANCEL;
+		}
+		
+		return UA_FINISHED;
+	}
+}
+
+class ActionPushCarCB : ActionContinuousBaseCB
+{
+	private static float PUSH_FORCE_IMPULSE_INCREMENT = 200.0;
+	private ActionPushCarData m_ActionDataPushCar;
+
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeatPushCar(10.0);
+	}
+	
+	override void ProgressActionComponent()
+	{
+		super.ProgressActionComponent();
+		
+		ActionPushCarData data = ActionPushCarData.Cast(m_ActionData);
+		ApplyForce(data);
+	}
+	
+	override void EndActionComponent()
+	{
+		m_ActionDataPushCar = ActionPushCarData.Cast(m_ActionData);
+		
+		if (!m_ActionDataPushCar)
+		{
+			super.EndActionComponent();
+			return;
+		}
+		
+		if (m_ActionDataPushCar.m_State == UA_FINISHED)
+		{
+			if (m_ActionDataPushCar.m_EndType == 1)
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+			else if (m_ActionDataPushCar.m_EndType == 0)
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+		}
+		else if (m_ActionDataPushCar.m_State == UA_CANCEL)
+		{
+			ActionContinuousBase action = ActionContinuousBase.Cast(m_ActionDataPushCar.m_Action);
+			if (action.HasAlternativeInterrupt())
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_FINISH);
+			else
+				SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+
+			return;
+		}
+
+		m_ActionDataPushCar.m_State = UA_FINISHED;
+	}
+	
+	protected void ApplyForce(ActionPushCarData actionData)
+	{	
+		CarScript car = actionData.m_Car;
+		
+		actionData.m_HorizontalDirectionRandom = Math.RandomFloat(1.0, 3.5);
+		actionData.m_VerticalDirectionRandom = Math.RandomFloat(-0.5, 0.5);
+		
+		float bodyMass = dBodyGetMass(car);
+		float invBodyMass = 1.0 / bodyMass;
+		float force = dBodyGetMass(car) * PUSH_FORCE_IMPULSE_INCREMENT * car.GetPushForceCoefficientMultiplier();
+		
+		float easedProgress = Easing.EaseInOutSine(actionData.m_ActionComponent.GetProgress());
+		
+		vector impulse 	= car.GetDirection() * force * (float)actionData.m_PushDirection;
+		impulse 		= impulse * invBodyMass;
+		impulse[0]	 	= impulse[0] * actionData.m_HorizontalDirectionRandom;
+		impulse[1] 		= impulse[1] * actionData.m_VerticalDirectionRandom;
+		impulse 		= impulse * easedProgress;
+		
+		actionData.m_Player.DepleteStamina(EStaminaModifiers.PUSH_CAR);
+
+		dBodyApplyImpulseAt(car, impulse, car.ModelToWorld(car.GetEnginePos()));	
+	}
+}
+
+class ActionPushCar : ActionContinuousBase
+{
+	void ActionPushCar()
+	{
+		m_CallbackClass	= ActionPushCarCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_VEHICLE_PUSH;
+		m_FullBody 		= true;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_ERECT;
+
+		m_Text = "#push_car";
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem		= new CCINotPresent();
+		m_ConditionTarget	= new CCTCursorNoRuinCheck(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return true;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		ActionPushCarData data = new ActionPushCarData();
+		return data;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_ERECT|DayZPlayerConstants.STANCEMASK_CROUCH))
+			return false;
+		
+		if (!player.GetSurfaceType())
+			return false;
+
+		if (!IsInReach(player, target, UAMaxDistances.SMALL))
+			return false;
+		
+		if (!player.CanConsumeStamina(EStaminaConsumers.PUSH))
+			return false;
+
+		CarScript car = GetCar(target);
+		if (car)
+		{
+			if (car.GetGear() != CarGear.NEUTRAL)
+				return false;
+
+			if (Math.AbsFloat(GetDirectionDot(car, player)) < 0.85)
+				return false;
+
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+		super.OnUpdate(action_data);
+
+		ActionPushCarData data = ActionPushCarData.Cast(action_data);		
+		if (data.m_NeedUpdate)
+		{
+			if (!data.m_Player.CanConsumeStamina(EStaminaConsumers.PUSH))
+			{
+				data.m_State 		= UA_CANCEL;
+				data.m_NeedUpdate 	= false;
+
+				return;
+			}
+	
+			if (vector.Distance(data.m_Car.GetPosition(), data.m_Origin) > 0.5)
+			{
+				data.m_State 		= UA_FINISHED;
+				data.m_EndType 		= 0;
+				data.m_NeedUpdate 	= false;
+			}
+		}
+	}
+	
+	override void OnStart(ActionData action_data)
+	{
+		super.OnStart(action_data);
+		
+		ActionPushCarData data 	= ActionPushCarData.Cast(action_data);
+		data.m_Car 				= GetCar(action_data.m_Target);
+		data.m_Origin 			= data.m_Car.GetPosition();
+		data.m_NeedUpdate 		= true;
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		super.OnStartServer(action_data);
+		
+		ActionPushCarData data = ActionPushCarData.Cast(action_data);
+
+		if (data.m_Car)
+		{
+			data.m_Car.SetBrake(0.0);
+			data.m_Car.SetHandbrake(0.0);
+			data.m_Car.SetBrakesActivateWithoutDriver(false);
+		}
+		
+		data.m_PushDirection = -1;
+		if (GetDirectionDot(data.m_Car, data.m_Player) > 0)
+			data.m_PushDirection = 1;
+		
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		super.OnEndServer(action_data);
+		
+		ActionPushCarData data = ActionPushCarData.Cast(action_data);
+		if (data.m_Car)
+			data.m_Car.SetBrakesActivateWithoutDriver(true);
+	}
+	
+	override void OnEndInput(ActionData action_data)
+	{
+		super.OnEndInput(action_data);
+		
+		ActionPushCarData data 	= ActionPushCarData.Cast(action_data);
+		data.m_State 			= UA_CANCEL;
+		data.m_EndType 			= 1;
+		data.m_NeedUpdate 		= false;
+	}
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		ActionPushCarData data = ActionPushCarData.Cast(action_data);
+		
+		ctx.Write(data.m_Car);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data)
+	{
+		if (!action_recive_data)
+			action_recive_data = new ActionPushCarDataReceiveData();
+		
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		CarScript car;
+		if (!ctx.Read(car))
+			return false;
+		
+		ActionPushCarDataReceiveData receiveData 	= ActionPushCarDataReceiveData.Cast(action_recive_data);
+		receiveData.m_Car			 				= car;
+		
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+
+		ActionPushCarDataReceiveData receiveData 	= ActionPushCarDataReceiveData.Cast(action_recive_data);
+		receiveData.m_Car			 				= receiveData.m_Car;
+	}
+	
+	private float GetDirectionDot(Object target, EntityAI player)
+	{
+		return vector.Dot(target.GetDirection(), player.GetDirection());
+	}
+	
+	private CarScript GetCar(ActionTarget target)
+	{
+		if (target.IsProxy())
+			return CarScript.Cast(target.GetParent());
+		
+		return CarScript.Cast(target.GetObject());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRaiseFlag.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRaiseFlag.c
new file mode 100644
index 0000000000000000000000000000000000000000..bc7b841cc49939b9994411def1707d4194b0ee84
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRaiseFlag.c
@@ -0,0 +1,65 @@
+class ActionManipulateFlagCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(1);
+	}
+};
+
+class ActionRaiseFlag: ActionContinuousBase
+{
+	void ActionRaiseFlag()
+	{
+		m_CallbackClass = ActionManipulateFlagCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_RAISE_FLAG;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#raise_flag";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTCursor;
+		m_ConditionItem = new CCINone;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		TerritoryFlag totem = TerritoryFlag.Cast( target.GetObject() );
+		if (!totem)
+			return false;
+		
+		float state = totem.GetAnimationPhase("flag_mast");
+		if ( totem.FindAttachmentBySlotName("Material_FPole_Flag") && state > 0 )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		TerritoryFlag totem = TerritoryFlag.Cast( action_data.m_Target.GetObject() );
+		if ( totem )
+		{
+			totem.AnimateFlagEx(totem.GetAnimationPhase("flag_mast") - UAMisc.FLAG_STEP_INCREMENT, action_data.m_Player);
+			totem.AddRefresherTime01(UAMisc.FLAG_STEP_INCREMENT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRaiseMegaphone.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRaiseMegaphone.c
new file mode 100644
index 0000000000000000000000000000000000000000..f485408969c22c14a0e30cd986917557d15c4d9e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRaiseMegaphone.c
@@ -0,0 +1,81 @@
+class ActionRaiseMegaphoneCB : ActionContinuousBaseCB
+{
+	private const float REPEAT_AFTER_SEC = -1.0;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( -1 );
+	}
+}
+
+class ActionRaiseMegaphone: ActionContinuousBase
+{
+	void ActionRaiseMegaphone()
+	{
+		m_CallbackClass = ActionRaiseMegaphoneCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_RAISEITEM;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_RAISEITEM;	
+		m_Text = "#raise_megaphone";	
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionTarget = new CCTNone;
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if ( item.IsTransmitter() ) 
+		{
+			ItemMegaphone megaphone = ItemMegaphone.Cast( item );
+			
+			if ( megaphone && megaphone.GetCompEM().IsWorking() ) 
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnStartServer( ActionData action_data )
+	{
+		ItemMegaphone megaphone = ItemMegaphone.Cast( action_data.m_MainItem );
+		megaphone.SetCanSpeak( true );
+	}
+		
+	override void OnEndServer( ActionData action_data )
+	{
+		ItemMegaphone megaphone = ItemMegaphone.Cast( action_data.m_MainItem );
+		megaphone.SetCanSpeak( false );
+	}
+	
+	override void OnStartClient( ActionData action_data )
+	{
+		ItemMegaphone megaphone = ItemMegaphone.Cast( action_data.m_MainItem );
+		megaphone.SetCanSpeak( true );
+	}
+		
+	override void OnEndClient( ActionData action_data )
+	{
+		ItemMegaphone megaphone = ItemMegaphone.Cast( action_data.m_MainItem );
+		megaphone.SetCanSpeak( false );
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRefuelTorch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRefuelTorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..fae5a6ca0733a764dce0444766d01818a6592e05
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Continuous/ActionRefuelTorch.c
@@ -0,0 +1,54 @@
+class ActionRefuelTorch: ActionSingleUseBase
+{	
+	void ActionRefuelTorch()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ATTACHITEM;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#STR_RefuelTorch0";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget	= new CCTNonRuined();
+		m_ConditionItem		= new CCINonRuined();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		Torch torch;
+		Rag rag;
+		Rag torchRag;
+		
+		if ((Class.CastTo(torch,target.GetObject()) && Class.CastTo(rag,item)) || (Class.CastTo(rag,target.GetObject()) && Class.CastTo(torch,item)))
+		{
+			if (Class.CastTo(torchRag,torch.GetRag()))
+			{
+				int slotId = InventorySlots.INVALID;
+				InventoryLocation lcn = new InventoryLocation();
+				torchRag.GetInventory().GetCurrentInventoryLocation(lcn);
+				slotId = lcn.GetSlot();
+				
+				return torch.GetInventory().GetSlotLock(slotId) && torch.GetRagQuantity() < torchRag.GetQuantityMax() && torch.IsRagDryEnough(rag);
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		Torch torch;
+		Rag rag;
+		Rag torchRag;
+		
+		if ((Class.CastTo(torch,action_data.m_Target.GetObject()) && Class.CastTo(rag,action_data.m_MainItem)) || (Class.CastTo(rag,action_data.m_Target.GetObject()) && Class.CastTo(torch,action_data.m_MainItem)))
+		{
+			Class.CastTo(torchRag,torch.GetRag());
+			
+			int qtyTransfer = torchRag.GetQuantityMax() - torch.GetRagQuantity(); //torch rag capacity
+			qtyTransfer = (int)Math.Clamp(rag.GetQuantity(),0,qtyTransfer);
+			torchRag.AddQuantity(qtyTransfer);
+			rag.AddQuantity(-qtyTransfer);
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Instant/ActionDebug.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Instant/ActionDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..b0b0563545b5168e61c541a76c5095b55f70bb45
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Instant/ActionDebug.c
@@ -0,0 +1,110 @@
+class ActionDebugReciveData : ActionReciveData
+{
+	ItemBase 	m_Item;
+	int			m_DebugActionID;
+	EntityAI	m_Entity;
+}
+
+class ActionDebugData : ActionData
+{
+	int			m_DebugActionID;
+	EntityAI	m_Entity;
+}
+
+class ActionDebug : ActionInstantBase
+{	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		ActionDebugData action_data = new ActionDebugData;
+		return action_data;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{
+		ActionDebugData action_data_d;
+		Class.CastTo( action_data_d, CreateActionData());
+		action_data_d.m_Action = this;
+		action_data_d.m_Player = player;
+		
+		if (!GetGame().IsDedicatedServer() )
+		{
+			ref Param2<EntityAI,int> ndata = Param2<EntityAI,int>.Cast( extra_data );
+			action_data_d.m_Entity = ndata.param1;
+			action_data_d.m_DebugActionID = ndata.param2;
+		}
+		
+		ActionReciveData action_recive_data = player.GetActionManager().GetReciveData();
+		if ( action_recive_data )
+		{
+			HandleReciveData(action_recive_data,action_data_d);
+		}
+		action_data = action_data_d;
+		
+		return true;
+	}
+	
+	override void WriteToContext (ParamsWriteContext ctx, ActionData action_data)
+	{
+		ActionDebugData action_data_d;
+		Class.CastTo( action_data_d, action_data );
+		
+		ctx.Write(action_data_d.m_Entity);
+		ctx.Write(action_data_d.m_DebugActionID);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if(!action_recive_data)
+		{
+			action_recive_data = new ActionDebugReciveData;
+		}
+		
+		ActionDebugReciveData action_recive_data_d = ActionDebugReciveData.Cast(action_recive_data);
+		
+		EntityAI ent;
+		int debugActionID;
+		
+		if(!ctx.Read(ent))
+			return false;
+		if(!ctx.Read(debugActionID))
+			return false;
+		
+		action_recive_data_d.m_Entity = ent;
+		action_recive_data_d.m_DebugActionID = debugActionID;
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		ActionDebugReciveData action_recive_data_d = ActionDebugReciveData.Cast(action_recive_data);
+		ActionDebugData action_data_d = ActionDebugData.Cast(action_data);
+		
+		action_data_d.m_Entity = action_recive_data_d.m_Entity;
+		action_data_d.m_DebugActionID = action_recive_data_d.m_DebugActionID;
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		ActionDebugData action_data_d;
+		Class.CastTo( action_data_d, action_data );
+		if (action_data_d.m_Entity && !action_data_d.m_Entity.IsSetForDeletion())
+			action_data_d.m_Entity.OnAction(action_data_d.m_DebugActionID,action_data_d.m_Player,NULL);
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return false;
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionBuildShelter.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionBuildShelter.c
new file mode 100644
index 0000000000000000000000000000000000000000..904a7aa9b46b167cc2af35388d7639ac7336bfc3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionBuildShelter.c
@@ -0,0 +1,327 @@
+class ActionBuildShelter: ActionContinuousBase
+{
+	string 						m_SoundsetBuildStart;
+	string 						m_SoundsetBuildLoop;
+	string 						m_SoundsetBuildFinish;
+	ref protected EffectSound 	m_BuildLoopSound;
+	
+	void ActionBuildShelter()
+	{
+		m_CallbackClass = ActionBuildPartCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_2HD;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#build_shelter_leather";
+	}
+	
+	void ~ActionBuildShelter()
+	{
+		DestroyActionLoopSound();
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+	
+	override string GetText()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( player )
+		{
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			ConstructionPart constrution_part = construction_action_data.GetBuildPartNoToolAtIndex(m_VariantID);
+			
+			if ( constrution_part )
+			{
+				string ret = "";
+				switch (constrution_part.GetName())
+				{
+					case "leather":
+						ret = "#build_shelter_leather";
+					break;
+					
+					case "fabric":
+						ret = "#build_shelter_fabric";
+					break;
+					
+					case "stick":
+						ret = "#build_shelter_stick";
+					break;
+				}
+			}
+		}
+		
+		return ret;
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			ConstructionPart constrution_part = construction_action_data.GetBuildPartNoToolAtIndex(m_VariantID);
+			
+			if ( constrution_part )
+			{
+				switch (constrution_part.GetName())
+				{
+					case "leather":
+						m_Text = "#build_shelter_leather";
+					break;
+					
+					case "fabric":
+						m_Text = "#build_shelter_fabric";
+					break;
+					
+					case "stick":
+						m_Text = "#build_shelter_stick";
+					break;
+				}
+			}
+	}
+	
+	override bool CanBeUsedLeaning()
+	{
+		return false;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		//Action not allowed if player has broken legs
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		if (target.GetObject() && !target.GetObject().CanUseConstructionBuild())
+			return false;
+		if ( player.IsPlacingLocal() || player.IsPlacingServer() )
+			return false;
+		
+		if ( (!GetGame().IsDedicatedServer()) )
+		{
+			if ( MiscGameplayFunctions.ComplexBuildCollideCheckClient(player, target, item, m_VariantID ) )
+			{
+				return true;
+			}
+			return false;
+		}
+		return true;
+	}
+	
+	//setup
+	override bool SetupAction( PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL )
+	{	
+		if ( super.SetupAction( player, target, item, action_data, extra_data ) )
+		{
+			if ( !GetGame().IsDedicatedServer() )
+			{
+				ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+				BuildPartActionData.Cast(action_data).m_PartType = construction_action_data.GetBuildPartNoToolAtIndex(m_VariantID).GetPartName();
+			}
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		BuildPartActionData action_data = new BuildPartActionData;
+		return action_data;
+	}
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		ctx.Write(BuildPartActionData.Cast(action_data).m_PartType);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		action_recive_data = new BuildPartActionReciveData;
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		string part_type;
+		if ( ctx.Read(part_type) )
+		{
+			BuildPartActionReciveData.Cast( action_recive_data ).m_PartType = part_type;
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+		
+		BuildPartActionData.Cast(action_data).m_PartType = BuildPartActionReciveData.Cast( action_recive_data ).m_PartType;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( action_data.m_Target.GetObject() );
+		Construction construction = base_building.GetConstruction();
+		string part_name = BuildPartActionData.Cast(action_data).m_PartType;
+		CollisionCheckData check_data = new CollisionCheckData;
+		
+		check_data.m_PartName = part_name;
+		check_data.m_AdditionalExcludes.Insert(action_data.m_Player);
+		
+		return !construction.IsCollidingEx( check_data ) && construction.CanBuildPart( part_name, action_data.m_MainItem, false );
+	}
+	
+	override void OnStart( ActionData action_data )
+	{
+		super.OnStart(action_data);
+		action_data.m_Player.TryHideItemInHands(true);
+	}
+	
+	override void OnStartClient( ActionData action_data )
+	{
+		super.OnStartClient(action_data);
+		
+		DetermineConstructionSounds(action_data);
+		PlayActionStartSound(action_data);
+	}
+	
+	override void OnStartAnimationLoopClient( ActionData action_data )
+	{
+		super.OnStartAnimationLoopClient(action_data);
+		
+		PlayActionLoopSound(action_data);
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		super.OnEnd(action_data);
+		action_data.m_Player.TryHideItemInHands(false);
+	}
+	
+	override void OnEndClient( ActionData action_data )
+	{
+		super.OnEndClient(action_data);
+		
+		StopActionLoopSound();
+		//DestroyActionLoopSound();
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( action_data.m_Target.GetObject() );
+		Construction construction = base_building.GetConstruction();
+		
+		string part_name = BuildPartActionData.Cast(action_data).m_PartType;
+		
+		if ( !construction.IsColliding( part_name ) && construction.CanBuildPart( part_name, action_data.m_MainItem, false ) )
+		{
+			//build
+			construction.BuildPartServer( action_data.m_Player, part_name, AT_BUILD_PART );
+		}
+		
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override void OnFinishProgressClient( ActionData action_data )
+	{
+		super.OnFinishProgressClient(action_data);
+		
+		PlayActionFinishSound(action_data);
+	}
+	
+	void DetermineConstructionSounds( ActionData action_data )
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		ConstructionPart constrution_part = construction_action_data.GetBuildPartNoToolAtIndex(m_VariantID);;
+		if (constrution_part)
+		{
+			switch (constrution_part.GetName())
+			{
+				case "leather":
+					m_SoundsetBuildStart = "Shelter_Leather_Build_Start_SoundSet";
+					m_SoundsetBuildLoop = "Shelter_Leather_Build_Loop_SoundSet";
+					m_SoundsetBuildFinish = "Shelter_Leather_Build_Finish_SoundSet";
+				break;
+				
+				case "fabric":
+					m_SoundsetBuildStart = "Shelter_Fabric_Build_Start_SoundSet";
+					m_SoundsetBuildLoop = "Shelter_Fabric_Build_Loop_SoundSet";
+					m_SoundsetBuildFinish = "Shelter_Fabric_Build_Finish_SoundSet";
+				break;
+				
+				case "stick":
+					m_SoundsetBuildStart = "Shelter_Wooden_Stick_Build_Start_SoundSet";
+					m_SoundsetBuildLoop = "Shelter_Wooden_Stick_Build_Loop_SoundSet";
+					m_SoundsetBuildFinish = "Shelter_Wooden_Stick_Build_Finish_SoundSet";
+				break;
+				
+				default:
+					m_SoundsetBuildStart = "";
+					m_SoundsetBuildLoop = "";
+					m_SoundsetBuildFinish = "";
+				break;
+			}
+		}
+	}
+	
+	void PlayActionStartSound( ActionData action_data )
+	{
+		EffectSound sound =	SEffectManager.PlaySound(m_SoundsetBuildStart, action_data.m_Target.GetObject().GetPosition());
+		sound.SetAutodestroy( true );
+	}
+	
+	void PlayActionLoopSound( ActionData action_data )
+	{
+		if ( !m_BuildLoopSound || !m_BuildLoopSound.IsSoundPlaying() )
+		{
+			m_BuildLoopSound = SEffectManager.PlaySound( m_SoundsetBuildLoop, action_data.m_Target.GetObject().GetPosition(), 0, 0, true );
+		}
+	}
+	
+	void StopActionLoopSound()
+	{
+		if (m_BuildLoopSound)
+		{
+			m_BuildLoopSound.SetSoundFadeOut(0.5);
+			m_BuildLoopSound.SoundStop();
+		}
+	}
+	
+	void DestroyActionLoopSound()
+	{
+		SEffectManager.DestroyEffect( m_BuildLoopSound );
+	}
+	
+	void PlayActionFinishSound( ActionData action_data )
+	{
+		EffectSound sound =	SEffectManager.PlaySound(m_SoundsetBuildFinish, action_data.m_Target.GetObject().GetPosition());
+		sound.SetAutodestroy( true );
+	}
+	
+	override string GetSoundCategory(ActionData action_data)
+    {
+        return "Base_building";
+    }
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseBarrel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseBarrel.c
new file mode 100644
index 0000000000000000000000000000000000000000..be1da1ebaa04bb44feb3ffe068fdb7dcb4fda399
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseBarrel.c
@@ -0,0 +1,47 @@
+class ActionCloseBarrel: ActionInteractBase
+{
+	void ActionCloseBarrel()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#close";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		if ( target_object.IsItemBase() )
+		{
+			Barrel_ColorBase ntarget = Barrel_ColorBase.Cast( target_object );
+			if( ntarget )
+			{
+				if ( !ntarget.IsLocked() && ntarget.IsOpen() )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		Barrel_ColorBase ntarget = Barrel_ColorBase.Cast( target_object );
+		
+		if( ntarget )
+		{
+			ntarget.DetermineAction(action_data.m_Player);
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		Barrel_ColorBase ntarget = Barrel_ColorBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.SoundSynchRemoteReset();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseBarrelHoles.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseBarrelHoles.c
new file mode 100644
index 0000000000000000000000000000000000000000..c22f6cf6710f2e07210804a598ef6a956655aa66
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseBarrelHoles.c
@@ -0,0 +1,47 @@
+class ActionCloseBarrelHoles: ActionInteractBase
+{
+	void ActionCloseBarrelHoles()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#close";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		if ( target_object.IsItemBase() )
+		{
+			BarrelHoles_ColorBase ntarget = BarrelHoles_ColorBase.Cast( target_object );
+			if( ntarget )
+			{			
+				if ( ntarget.IsOpen() )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		BarrelHoles_ColorBase ntarget = BarrelHoles_ColorBase.Cast( target_object );
+		
+		if( ntarget )
+		{
+			ntarget.Close();
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		BarrelHoles_ColorBase ntarget = BarrelHoles_ColorBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.SoundSynchRemoteReset();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseDoors.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseDoors.c
new file mode 100644
index 0000000000000000000000000000000000000000..445f0452c72e270283b6d4bb6e791c5ad2ef88fc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseDoors.c
@@ -0,0 +1,70 @@
+class ActionCloseDoors: ActionInteractBase
+{
+	ref NoiseParams m_NoisePar;
+	
+	void ActionCloseDoors()
+	{
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text 			= "#close";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTCursor();
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target)
+			return false;
+
+		if (!IsBuilding(target))
+			return false;
+		
+		Building building;
+		if (Class.CastTo(building, target.GetObject()))
+		{
+			int doorIndex = building.GetDoorIndex(target.GetComponentIndex());
+			if (doorIndex != -1)
+			{
+				if (!IsInReach(player, target, UAMaxDistances.DEFAULT))
+					return false;
+
+				return building.CanDoorBeClosed(doorIndex);
+			}
+		}		
+
+		return false;
+	}
+
+	override void OnStartServer(ActionData action_data)
+	{
+		Building building;
+		if (Class.CastTo(building, action_data.m_Target.GetObject()))
+		{
+			int doorIndex = building.GetDoorIndex(action_data.m_Target.GetComponentIndex());
+			if (doorIndex != -1)
+			{
+				if (building.CanDoorBeClosed(doorIndex))
+				{
+					building.CloseDoor(doorIndex);
+				}
+				
+			}
+		}
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		m_NoisePar = new NoiseParams();
+		m_NoisePar.LoadFromPath("CfgVehicles SurvivorBase NoiseActionDefault");
+		NoiseSystem noise = GetGame().GetNoiseSystem();
+		if (noise)
+		{
+			if (action_data.m_Player)
+				noise.AddNoisePos(action_data.m_Player, action_data.m_Target.GetObject().GetPosition(), m_NoisePar);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseFence.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseFence.c
new file mode 100644
index 0000000000000000000000000000000000000000..1295419bdcbc67e2e47ff8d670d6ca4e3d1c62d6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionCloseFence.c
@@ -0,0 +1,59 @@
+class ActionCloseFence: ActionInteractBase
+{
+	ref NoiseParams m_NoisePar;
+	const string SELECTION_INTERACT = "gate_interact";
+	
+	void ActionCloseFence()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#close";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		if ( targetObject && targetObject.CanUseConstruction() )
+		{
+			Fence fence = Fence.Cast( targetObject );
+			
+			if ( fence && fence.CanCloseFence() )
+			{
+				array<string> selections = new array<string>;
+				targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+				
+				for ( int i = 0; i < selections.Count(); i++ )
+				{
+					if ( selections[i] == SELECTION_INTERACT )
+						return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnStartServer( ActionData action_data )
+	{
+		Fence fence = Fence.Cast( action_data.m_Target.GetObject() );
+		fence.CloseFence();
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		m_NoisePar = new NoiseParams();
+		m_NoisePar.LoadFromPath("CfgVehicles SurvivorBase NoiseActionDefault");
+		NoiseSystem noise = GetGame().GetNoiseSystem();
+		if ( noise )
+		{
+			if ( action_data.m_Player )
+				noise.AddNoisePos(action_data.m_Player, action_data.m_Target.GetObject().GetPosition(), m_NoisePar);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetach.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetach.c
new file mode 100644
index 0000000000000000000000000000000000000000..794d1011d2db8107f7ccd9ed07acde3e10e41465
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetach.c
@@ -0,0 +1,113 @@
+class DetachActionData : ActionData
+{
+	int m_AttSlot;
+}
+
+class ActionDetach: ActionInteractBase
+{
+	string m_ItemName = "";
+
+	void ActionDetach()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS;
+		m_Text = "#take_to_hands";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursorNoRuinCheck();
+	}	
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase tgt_item = ItemBase.Cast( target.GetObject() );
+		EntityAI tgt_parent = EntityAI.Cast( target.GetParent() );
+		EntityAI tgt_entity = EntityAI.Cast( target.GetObject() );
+
+		if ( !tgt_item || !tgt_entity || !tgt_parent )
+			return false;
+
+		if ( !tgt_parent || !tgt_item.IsItemBase() || !tgt_item.IsTakeable() || tgt_item.IsBeingPlaced() )
+			return false;
+
+		if ( player.GetCommand_Vehicle() )
+			return false;
+
+		if ( player.GetInventory().CanAddEntityIntoHands(tgt_entity) ) //&& !player.GetInventory().CanAddEntityIntoInventory(tgt_entity) )
+		{
+			if ( tgt_entity.GetHierarchyRootPlayer() != player )
+			{
+				if ( tgt_entity.CanDetachAttachment( tgt_parent ) && tgt_parent.CanReleaseAttachment( tgt_entity ) )
+					return true;
+			}		
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if ( GetGame().IsMultiplayer() )
+			return;
+
+		ActionManagerClient am = ActionManagerClient.Cast(action_data.m_Player.GetActionManager());
+		am.UnlockInventory(action_data);
+
+		EntityAI ntarget = EntityAI.Cast(action_data.m_Target.GetObject());
+		action_data.m_Player.PredictiveTakeEntityToHands(ntarget);
+
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		ActionManagerClient am = ActionManagerClient.Cast(action_data.m_Player.GetActionManager());
+		am.UnlockInventory(action_data);
+
+		EntityAI ntarget = EntityAI.Cast(action_data.m_Target.GetObject());
+		action_data.m_Player.PredictiveTakeEntityToHands(ntarget);
+	}
+	
+	override void CreateAndSetupActionCallback( ActionData action_data )
+	{
+		EntityAI target = EntityAI.Cast(action_data.m_Target.GetObject());
+		ActionBaseCB callback;
+		if (!target)
+			return;
+		
+		if (target.IsHeavyBehaviour())
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			if( action_data.m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT) )
+			{
+				Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS,GetCallbackClassTypename()));
+			}
+			else
+			{
+				Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_PRONE));
+			}
+		}
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetachFromTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetachFromTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..d2f295dee64f1f993694705d51c246177785f146
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetachFromTarget.c
@@ -0,0 +1,243 @@
+class ActionDetachFromTarget: ActionInteractBase
+{
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+	
+	void ActionDetachFromTarget()
+	{
+		m_Text = "#take_to_hands";
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		DetachActionData action_data = new DetachActionData;
+		return action_data;
+	}
+	
+	int FindSlotIdToDetach(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI target_entity = EntityAI.Cast(target.GetObject());
+		
+		if ( player && target_entity )
+		{
+			array<string> selections = new array<string>();
+			target_entity.GetActionComponentNameList( target.GetComponentIndex(),selections );
+			
+			if ( target_entity && target_entity.GetInventory() && target_entity.GetInventory().AttachmentCount() > 0 )
+			{
+				for(int i = 0; i < selections.Count(); i++ )
+				{
+					int target_slot_id = InventorySlots.GetSlotIdFromString( selections[i] );
+					EntityAI att = target_entity.GetInventory().FindAttachment(target_slot_id);
+					
+					if ( att && player.GetInventory().CanAddEntityIntoHands(att) )
+					{
+						if ( att.CanDetachAttachment( target_entity ) && target_entity.CanReleaseAttachment( att ) )
+							return target_slot_id;
+					}
+				}		
+			}
+		}
+		return InventorySlots.INVALID;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{
+		int attSlotId = InventorySlots.INVALID;
+		if (!GetGame().IsDedicatedServer() )
+		{
+			attSlotId = FindSlotIdToDetach(player, target, item);
+		}
+		
+		if ( super.SetupAction( player, target, item, action_data, extra_data))
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				if(attSlotId != InventorySlots.INVALID)
+				{
+					DetachActionData action_data_a = DetachActionData.Cast(action_data);
+					action_data_a.m_AttSlot = attSlotId;
+					return true;
+				}
+				return false;
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( GetGame().IsMultiplayer() && GetGame().IsServer() ) return true;
+		
+		return FindSlotIdToDetach(player, target, item) != InventorySlots.INVALID);
+	}
+	
+	override Object GetDisplayInteractObject(PlayerBase player, ActionTarget target)
+	{
+		int target_slot_id = FindSlotIdToDetach(player, target, null);
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		
+		if(target_slot_id != InventorySlots.INVALID)
+		{
+			return target_entity.GetInventory().FindAttachment(target_slot_id);
+		}
+		return null;
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		Process(action_data);
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if(!GetGame().IsMultiplayer())
+			Process(action_data);
+	}
+
+	void Process( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+		
+		DetachActionData action_data_a = DetachActionData.Cast(action_data);
+		EntityAI target_entity = EntityAI.Cast( action_data_a.m_Target.GetObject() );
+				
+		ItemBase attachment = ItemBase.Cast(target_entity.GetInventory().FindAttachment(action_data_a.m_AttSlot));
+			
+		if(attachment)
+		{
+			float stackable = attachment.GetTargetQuantityMax();
+			if( stackable == 0 || stackable >= attachment.GetQuantity() )
+			{
+				//take to hands
+				action_data.m_Player.PredictiveTakeEntityToHands( attachment );
+			}
+			else if( stackable != 0 && stackable < attachment.GetQuantity() )
+			{
+				//split and take to hands
+				attachment.SplitIntoStackMaxHandsClient( action_data.m_Player );
+			}
+		}
+	}
+}
+
+class ActionDetachFromTarget_SpecificSlot: ActionDetachFromTarget
+{
+	string m_slotToDetach;
+	
+	override int FindSlotIdToDetach(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI target_entity = EntityAI.Cast(target.GetObject());
+		
+		if ( player && target_entity )
+		{
+			array<string> selections = new array<string>();
+			target_entity.GetActionComponentNameList( target.GetComponentIndex(),selections );
+			
+			if ( target_entity && target_entity.GetInventory() && target_entity.GetInventory().AttachmentCount() > 0 )
+			{
+				for(int i = 0; i < selections.Count(); i++ )
+				{
+					if( selections[i] == m_slotToDetach )
+					{
+						int target_slot_id = InventorySlots.GetSlotIdFromString( selections[i] );
+						EntityAI att = target_entity.GetInventory().FindAttachment(target_slot_id);
+					
+						if ( att && player.GetInventory().CanAddEntityIntoHands(att) )
+						{
+							if ( att.CanDetachAttachment( target_entity ) && target_entity.CanReleaseAttachment( att ) )
+								return target_slot_id;
+						}
+					}
+				}		
+			}
+		}
+		return InventorySlots.INVALID;
+	}
+}
+
+class ActionDetachFromTarget_SpecificSlotsCategory: ActionDetachFromTarget
+{
+	string m_slotsToDetach;
+	
+	override int FindSlotIdToDetach(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI target_entity = EntityAI.Cast(target.GetObject());
+		
+		if ( player && target_entity )
+		{
+			array<string> selections = new array<string>();
+			target_entity.GetActionComponentNameList( target.GetComponentIndex(),selections );
+			
+			if ( target_entity && target_entity.GetInventory() && target_entity.GetInventory().AttachmentCount() > 0 )
+			{
+				for(int i = 0; i < selections.Count(); i++ )
+				{
+					if (selections[i].Contains(m_slotsToDetach))
+					{
+						int target_slot_id = InventorySlots.GetSlotIdFromString( selections[i] );
+						EntityAI att = target_entity.GetInventory().FindAttachment(target_slot_id);
+					
+						if ( att && player.GetInventory().CanAddEntityIntoHands(att) )
+						{
+							if ( att.CanDetachAttachment( target_entity ) && target_entity.CanReleaseAttachment( att ) )
+								return target_slot_id;
+						}
+					}
+				}		
+			}
+		}
+		return InventorySlots.INVALID;
+	}
+}
+
+
+class ActionDetachFromTarget_SpecificSlot_WoodenLogs: ActionDetachFromTarget_SpecificSlot
+{
+	void ActionDetachFromTarget_SpecificSlot_WoodenLogs ()
+	{
+		m_slotToDetach = "truck_01_woodenlogs";
+	}
+}
+
+class ActionDetachFromTarget_SpecificSlot_WoodenPlanks: ActionDetachFromTarget_SpecificSlot
+{
+	void ActionDetachFromTarget_SpecificSlot_WoodenPlanks ()
+	{
+		m_slotToDetach = "truck_01_woodenplanks";
+	}
+}
+
+class ActionDetachFromTarget_SpecificSlot_MetalSheets: ActionDetachFromTarget_SpecificSlot
+{
+	void ActionDetachFromTarget_SpecificSlot_MetalSheets ()
+	{
+		m_slotToDetach = "truck_01_metalsheets";
+	}
+}
+
+class ActionDetachFromTarget_SpecificSlotsCategory_Barrel: ActionDetachFromTarget_SpecificSlotsCategory
+{
+	void ActionDetachFromTarget_SpecificSlotsCategory_Barrel ()
+	{
+		m_slotsToDetach = "truck_01_barrel";
+	}
+}
+
+class ActionDetachFromTarget_SpecificSlotsCategory_WoodenCrate: ActionDetachFromTarget_SpecificSlotsCategory
+{
+	void ActionDetachFromTarget_SpecificSlotsCategory_WoodenCrate ()
+	{
+		m_slotsToDetach = "truck_01_woodencrate";
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetachPowerSourceFromPanel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetachPowerSourceFromPanel.c
new file mode 100644
index 0000000000000000000000000000000000000000..65fb4d4ea603e08e9a8043c138cdc6a2cabd3de1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionDetachPowerSourceFromPanel.c
@@ -0,0 +1,57 @@
+
+class ActionDetachPowerSourceFromPanel: ActionInteractBase
+{
+	void ActionDetachPowerSourceFromPanel()
+	{
+		m_Text = "#detach_power_source";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		
+		if ( player && target_object )
+		{
+			EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+			string selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+			
+			
+			if ( target_entity && target_entity.GetInventory() && target_entity.GetInventory().AttachmentCount() > 0 && selection == "power_source" )	//has any power source attachment attached
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		Process(action_data);
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Process(action_data);
+	}
+
+	void Process( ActionData action_data )
+	{
+		EntityAI target_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		
+		EntityAI attachment;
+		int attachments_count = target_entity.GetInventory().AttachmentCount();
+		for ( int j = 0; j < attachments_count; j++ )				//find any attached power source
+		{
+			// @TODO: vezme prvni att?
+			attachment = target_entity.GetInventory().GetAttachmentFromIndex( j );
+			if ( attachment )
+				break;
+		}
+		
+		if ( attachment )
+		{
+			action_data.m_Player.PredictiveTakeEntityToHands(attachment );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionEnterLadder.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionEnterLadder.c
new file mode 100644
index 0000000000000000000000000000000000000000..b500723bb9f9299c9b67e9b4acf881ff81263a6a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionEnterLadder.c
@@ -0,0 +1,213 @@
+
+class ActionEnterLadder: ActionInteractBase
+{
+	private const string GEOM_LOD_NAME 	= LOD.NAME_GEOMETRY;
+	private	const string MEM_LOD_NAME 	= LOD.NAME_MEMORY;	
+
+	void ActionEnterLadder()
+	{
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#enter_ladder";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		//! is action_data.m_Target ? not on ladder and not falling ? 
+		if (!target || !target.GetObject() || player.GetCommand_Ladder() || player.GetCommand_Fall() )
+			return false;
+
+		Building building;
+		if (!Class.CastTo(building, target.GetObject()))
+			return false;
+
+		// TODO: direction tests
+		// Get memory LOD from p3d and save all its selections
+		LOD lod = building.GetLODByName(MEM_LOD_NAME);
+		if(lod == NULL)
+			return false;
+
+		array<Selection> memSelection	= new array<Selection>();
+		if(!lod.GetSelections(memSelection))
+			return false;
+
+		//!
+		string compName = building.GetActionComponentName( target.GetComponentIndex() );				
+		if( compName.Length() < 6 || compName.Substring(0,6) != "ladder" )
+		{
+			return false;
+		}
+				
+		// ze stringu compName dostat posledni cislo a to je index zebriku 
+				
+		//building.GetActionComponentNameList( action_data.m_Target.GetComponentIndex(), components );
+				
+		string condCompName = string.Format("%1_con", compName);
+		vector pos = player.GetPosition();
+		//Print(w);
+		bool found = false;
+		vector ladderEnterPointGlobal;
+		vector ladderDirPointGlobal;
+		float minDistanceSq = 100.0;
+				
+		string dirCompName = string.Format("%1_con_dir", compName);
+				
+		for ( int i = 0; i < memSelection.Count(); i++ )
+		{
+			if ( memSelection[i].GetName() == condCompName )
+			{
+					
+				for( int j = 0; j < memSelection[i].GetVertexCount(); j++ )
+				{
+					ladderEnterPointGlobal = building.ModelToWorld( memSelection[i].GetVertexPosition(lod, j) );
+					if( vector.DistanceSq(ladderEnterPointGlobal,pos) < UAMaxDistances.LADDERS * UAMaxDistances.LADDERS)
+					{
+						HumanCommandLadder.DebugDrawLadder(building, HumanCommandLadder.DebugGetLadderIndex(compName));
+						found = true;
+						break;
+					}
+				}
+			}
+		}
+		
+		if (found)
+		{
+			for (int k = 0; k < memSelection.Count(); k++)
+			{
+				if( memSelection[k].GetName() == dirCompName )
+				{
+					for( int l = 0; l < memSelection[k].GetVertexCount(); l++ )
+					{
+						vector dirPoint = building.ModelToWorld( memSelection[k].GetVertexPosition(lod, l) );
+						float dst = vector.DistanceSq(ladderEnterPointGlobal,dirPoint);
+						if(  dst < minDistanceSq)
+						{
+							minDistanceSq = dst;
+							ladderDirPointGlobal = dirPoint;
+						//HumanCommandLadder.DebugDrawLadder(building, HumanCommandLadder.DebugGetLadderIndex(compName));
+						//found = true;
+						}
+					}
+				}
+			}
+					
+			pos = pos - ladderEnterPointGlobal;
+			ladderDirPointGlobal = ladderDirPointGlobal - ladderEnterPointGlobal;
+						
+			float angle = Math.AbsFloat(pos.VectorToAngles()[0] - ladderDirPointGlobal.VectorToAngles()[0]);
+					
+			if ( angle < 90 || angle > 270)
+			{	
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		Building 	b;
+		Class.CastTo(b, action_data.m_Target.GetObject());
+		
+		if (b)
+		{
+			string compName 	= b.GetActionComponentName( action_data.m_Target.GetComponentIndex() );
+			int 	ladderIndex = HumanCommandLadder.DebugGetLadderIndex(compName);
+
+			LOD geomLod = action_data.m_Target.GetObject().GetLODByName(GEOM_LOD_NAME);
+			string ladderType = "metal";
+
+			for (int i = 0; i < geomLod.GetPropertyCount(); ++i)
+			{
+				if (geomLod.GetPropertyName(i) == "laddertype")
+				{
+					ladderType = geomLod.GetPropertyValue(i);
+					break;
+				}
+			}
+
+			action_data.m_Player.SetClimbingLadderType(ladderType);
+			action_data.m_Player.StartCommand_Ladder(b, ladderIndex );
+		}
+
+
+		/* if( GetGame().IsServer() )
+		{
+			OnStartServer(action_data);
+		}
+		else
+		{
+			OnStartClient(action_data);
+		}*/
+	}
+	
+/*	override void WriteToContext (ParamsWriteContext ctx,ActionTarget target)
+	{
+		ctx.Write(INPUT_UDT_STANDARD_ACTION);
+		ctx.Write(GetType());
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionManagerClient AM = ActionManagerClient.Cast( player.GetActionManager());
+		//ActionTarget target = AM.FindActionTarget();
+		Object targetObject = target.GetObject();
+		ctx.Write(targetObject);
+		Object targetParent = target.GetParent();
+		ctx.Write(targetParent);
+		int componentIndex = target.GetComponentIndex();
+		ctx.Write(componentIndex);
+	}
+
+	override void OnStartServer( ActionData action_data )
+	{
+		Print("psovis - server/single");
+		
+		Building building;
+		if ( Class.CastTo(building, action_data.m_Target.GetObject()) )
+		{
+			ref array<Selection> memSelections	= new array<Selection>();
+
+			// Get memory LOD from p3d and save all its selections
+			LOD lod = building.GetLODByName(MEM_LOD_NAME);
+			if(lod != NULL && lod.GetSelections(memSelections))
+			{						
+				Print("Memory selections:");
+				for( int i =0; i < memSelections.Count(); i++ )
+				{ 
+					if (memSelections[i].GetVertexCount() > 0)
+					{					
+						vector pos = memSelections[i].GetVertexPosition(lod, 0);
+						Print(memSelections[i].GetName());					
+						Print(pos);					
+					}						
+				}
+			}
+		}		
+	}*/
+	
+	/*override void OnStartClient( ActionData action_data )
+	{
+		Print("psovis - client");
+	}*/
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return false;
+	}
+	
+	override bool CanBeUsedSwimming()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionExitLadder.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionExitLadder.c
new file mode 100644
index 0000000000000000000000000000000000000000..60b4a746526abce5a1984add4032ab610bc227dc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionExitLadder.c
@@ -0,0 +1,55 @@
+class ActionExitLadder: ActionInteractBase
+{
+	void ActionExitLadder()
+	{
+		m_Text = "#exit_ladder";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+	    HumanCommandLadder cl = player.GetCommand_Ladder();
+		if (cl && cl.CanExit())
+		{
+			return true;
+		}
+		
+		//if ( action_data.m_Player.IsOnLadder() ) return true;
+		return false;
+	}
+
+	//! 
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+	    HumanCommandLadder cl = action_data.m_Player.GetCommand_Ladder();
+		if (cl)
+		{
+			cl.Exit();
+		}
+	}
+
+
+	/*override void OnCompleteServer( ActionData action_data )
+	{
+	}*/
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return false;
+	}
+
+	override bool CanBeUsedOnLadder()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionFoldObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionFoldObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..7d805d14dbc188df5d2ef927c441ade02e009ae4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionFoldObject.c
@@ -0,0 +1,45 @@
+class ActionFoldObject: ActionInteractBase
+{
+	void ActionFoldObject()
+	{
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_MEDIUM;
+		m_Text = "#fold";
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		if ( targetObject.IsInherited(HescoBox) )
+		{
+			HescoBox hesco = HescoBox.Cast( targetObject );
+			
+			if ( hesco.GetState() == HescoBox.UNFOLDED )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		HescoBox hesco = HescoBox.Cast( targetObject );
+		if ( hesco.GetState() == HescoBox.UNFOLDED )
+		{
+			hesco.Fold();
+		}
+		
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionGetInTransport.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionGetInTransport.c
new file mode 100644
index 0000000000000000000000000000000000000000..0abea65e96e5d7b7f6d330bfce0dfa1b44440e58
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionGetInTransport.c
@@ -0,0 +1,157 @@
+class ActionGetInTransport: ActionBase
+{
+	void ActionGetInTransport()
+	{
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#get_in_vehicle";
+	}
+
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone;
+		m_ConditionTarget	= new CCTCursorNoRuinCheck;
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		Transport trans	= null;
+
+		if (!target)
+		{
+			return false;
+		}
+
+		if (!Class.CastTo(trans, target.GetObject()))
+		{
+			return false;
+		}
+		
+		if (player.GetItemInHands() && player.GetItemInHands().IsHeavyBehaviour())
+		{
+			return false;
+		}
+
+		if (player.GetCommand_Vehicle())
+		{
+			return false;
+		}
+
+		int componentIndex	= target.GetComponentIndex();
+		int crew_index 		= trans.CrewPositionIndex(componentIndex);
+		if (crew_index < 0)
+		{
+			return false;
+		}
+
+		Human crew = trans.CrewMember(crew_index);
+		if (crew)
+		{
+			return false;
+		}
+		
+		if (!trans.CrewCanGetThrough(crew_index) || !trans.IsAreaAtDoorFree(crew_index))
+		{
+			return false;
+		}
+		
+		array<string> selections = new array<string>();
+		trans.GetActionComponentNameList(componentIndex, selections);
+		
+		for (int i = 0; i < selections.Count(); i++)
+		{
+			if (trans.CanReachSeatFromDoors(selections[i], player.GetPosition(), 1.0))
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	override void Start(ActionData action_data)
+	{
+		super.Start( action_data );
+		
+		Transport trans = Transport.Cast(action_data.m_Target.GetObject());
+		int componentIndex = action_data.m_Target.GetComponentIndex();
+		int crew_index = trans.CrewPositionIndex(componentIndex);
+		
+		
+		int seat = trans.GetSeatAnimationType(crew_index);
+		HumanCommandVehicle vehCommand = action_data.m_Player.StartCommand_Vehicle(trans, crew_index, seat);
+		if (vehCommand)
+		{
+			vehCommand.SetVehicleType(trans.GetAnimInstance());
+			
+			GetDayZGame().GetBacklit().OnEnterCar();
+			if (action_data.m_Player.GetInventory())
+			{
+				action_data.m_Player.GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+			}
+		}
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		CarScript car = CarScript.Cast(action_data.m_Target.GetObject());
+		if (car)
+		{
+			car.ForceUpdateLightsStart();
+		}
+	}
+
+	override bool CanBeUsedInRestrain()
+	{
+		return true;
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+
+		if (action_data.m_State == UA_START)
+		{
+			if (!action_data.m_Player.GetCommand_Vehicle() || !action_data.m_Player.GetCommand_Vehicle().IsGettingIn())
+			{
+				End(action_data);
+			}
+		}
+	}
+	
+	override int GetActionCategory()
+	{
+		return AC_INTERACT;
+	}
+	
+	override void OnEndClient(ActionData action_data)
+	{
+		if (action_data.m_Player.GetInventory())
+		{
+				action_data.m_Player.GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		}
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		if (action_data.m_Player.GetInventory())
+		{
+			action_data.m_Player.GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		}
+		
+		CarScript car = CarScript.Cast(action_data.m_Target.GetObject());
+		if (car)
+		{
+			car.ForceUpdateLightsEnd();
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionGetOutTransport.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionGetOutTransport.c
new file mode 100644
index 0000000000000000000000000000000000000000..59577d83deaa6da7c2ac51f093878d99190f3cd5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionGetOutTransport.c
@@ -0,0 +1,249 @@
+class GetOutTransportActionData : ActionData
+{
+	Car m_Car;
+	vector m_StartLocation;
+	float m_CarSpeed;
+	bool m_WasJumpingOut 	= false;
+	float m_DmgTaken 		= 0.0; 			// Damage taken by the player when jumping out of vehicle
+	float m_ShockTaken 		= 0.0; 			// Shock inflicted to the player when jumping out of vehicle
+}
+
+class ActionGetOutTransport : ActionBase
+{
+	//For the two following variables -> The HIGHER the value, the LOWER the output
+	int m_DmgFactor = 60; 				//value used to translate impact strength into actual damage (impact strength -> velocity squared)
+	int m_ShockFactor = 15; 			//Value used to translate impact strength into actual shock
+
+	//Variables used to determine the different speed levels for bleeding checks
+	const int LOW_SPEED_VALUE 			= 20;
+	const int HIGH_SPEED_VALUE			= 30;
+	
+	private const int HEALTH_LOW_SPEED_VALUE 	= 30;
+	private const int HEALTH_HIGH_SPEED_VALUE 	= 70;
+	
+	void ActionGetOutTransport()
+	{
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ALL;
+		m_Text		 = "#leave_vehicle";
+	}
+	
+	override ActionData CreateActionData()
+	{
+		ActionData data = new GetOutTransportActionData();
+		return data;
+	}
+
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTNone();
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		HumanCommandVehicle vehCommand = player.GetCommand_Vehicle();
+		if (vehCommand)
+		{
+			Transport trans = vehCommand.GetTransport();
+			if (trans)
+			{
+				int crewIndex = trans.CrewMemberIndex(player);
+				return crewIndex >= 0 && trans.CrewCanGetThrough(crewIndex) && trans.IsAreaAtDoorFree(crewIndex);
+			}
+		}
+
+		return false;
+	}
+
+	void ProcessGetOutActionData(Car car, GetOutTransportActionData got_action_data)
+	{
+		got_action_data.m_StartLocation = got_action_data.m_Player.GetPosition();
+		got_action_data.m_Car = car;
+		float carSpeed = car.GetSpeedometerAbsolute();
+		got_action_data.m_CarSpeed = carSpeed;
+		got_action_data.m_DmgTaken = (carSpeed * carSpeed) / m_DmgFactor; //When using multiplications, wrong value is returned
+		got_action_data.m_ShockTaken = (carSpeed * carSpeed) / m_ShockFactor;
+		got_action_data.m_WasJumpingOut = carSpeed > 8.0;
+	}
+
+	override void OnStart(ActionData action_data)
+	{
+		super.OnStart(action_data);
+
+		HumanCommandVehicle vehCommand = action_data.m_Player.GetCommand_Vehicle();
+		if (vehCommand)
+		{
+			Transport trans = vehCommand.GetTransport();
+			if (trans)
+			{
+				GetOutTransportActionData gotActionData = GetOutTransportActionData.Cast(action_data);
+
+				Car car;
+				if (Class.CastTo(car, trans))
+					ProcessGetOutActionData(car, gotActionData);
+
+				if (!gotActionData.m_WasJumpingOut)
+					vehCommand.GetOutVehicle();
+				else
+					vehCommand.JumpOutVehicle();
+				
+				if (car)
+					GetDayZGame().GetBacklit().OnLeaveCar();
+
+				if (action_data.m_Player.GetInventory())
+					action_data.m_Player.GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+			}
+		}
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		HumanCommandVehicle vehCommand = action_data.m_Player.GetCommand_Vehicle();
+		if (vehCommand)
+		{
+			Transport trans = vehCommand.GetTransport();
+			if (trans)
+			{
+				CarScript car;
+				if (Class.CastTo(car, trans))
+					car.ForceUpdateLightsStart();
+			}
+		}
+	}
+	
+	void Unhide(PlayerBase player);
+
+	override void OnUpdate(ActionData action_data)
+	{
+		if (action_data.m_State == UA_START)
+		{
+			if (!action_data.m_Player.GetCommand_Vehicle())
+				End(action_data);
+		}
+	}
+	
+	override bool CanBeUsedInRestrain()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedInVehicle()
+	{
+		return true;
+	}
+	
+	override int GetActionCategory()
+	{
+		return AC_INTERACT;
+	}
+	
+	override void OnEnd(ActionData action_data)
+	{
+		if (action_data.m_Player.GetInventory()) 
+			action_data.m_Player.GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		GetOutTransportActionData gotActionData = GetOutTransportActionData.Cast(action_data);
+		
+		if (gotActionData.m_WasJumpingOut)
+		{
+			float carSpeed = gotActionData.m_CarSpeed;
+			gotActionData.m_Player.OnJumpOutVehicleFinish(carSpeed);
+			
+			ApplyJumpOutDmg(action_data);
+			
+			vector posMS = gotActionData.m_Player.WorldToModel(gotActionData.m_Player.GetPosition());
+			gotActionData.m_Player.DamageAllLegs(gotActionData.m_DmgTaken); //Additionnal leg specific damage dealing
+
+			float healthCoef = Math.InverseLerp(HEALTH_LOW_SPEED_VALUE, HEALTH_HIGH_SPEED_VALUE, carSpeed);
+			healthCoef = Math.Clamp(healthCoef, 0.0, 1.0);
+			gotActionData.m_Player.ProcessDirectDamage(DamageType.CUSTOM, gotActionData.m_Player, "", "FallDamageHealth", posMS, healthCoef);
+		}
+
+		if (gotActionData.m_Car)
+		{
+			CarScript car;
+			if (Class.CastTo(car, gotActionData.m_Car))
+				car.ForceUpdateLightsEnd();
+		}
+	}
+	
+	//Manage all jumping out of vehicle damage logic
+	void ApplyJumpOutDmg(ActionData action_data)
+	{
+		GetOutTransportActionData gotActionData = GetOutTransportActionData.Cast(action_data);
+		PlayerBase player = gotActionData.m_Player;
+		
+		array<ClothingBase> equippedClothes = new array<ClothingBase>;
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("LEGS")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("BACK")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("VEST")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("HeadGear")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("Mask")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("BODY")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("FEET")));
+		equippedClothes.Insert(ClothingBase.Cast(player.GetItemOnSlot("GLOVES")));
+
+		// -----------------------------------------------
+
+		//Lower shock taken if player uses a helmet
+		ItemBase headGear = ClothingBase.Cast(player.GetItemOnHead());
+		HelmetBase helmet;
+		if (Class.CastTo(helmet, headGear))
+			gotActionData.m_ShockTaken *= 0.5;
+
+		// -----------------------------------------------
+		
+		int randNum; //value used for probability evaluation
+		randNum = Math.RandomInt(0, 100);
+		if (gotActionData.m_CarSpeed < LOW_SPEED_VALUE)
+		{
+			if (randNum < 20)
+				player.GiveShock(-gotActionData.m_ShockTaken); //To inflict shock, a negative value must be passed
+
+			randNum = Math.RandomIntInclusive(0, PlayerBase.m_BleedingSourcesLow.Count() - 1);
+			
+			player.m_BleedingManagerServer.AttemptAddBleedingSourceBySelection(PlayerBase.m_BleedingSourcesLow[randNum]);
+		}
+		else if (gotActionData.m_CarSpeed >= LOW_SPEED_VALUE && gotActionData.m_CarSpeed < HIGH_SPEED_VALUE)
+		{
+			if (randNum < 50)
+				player.GiveShock(-gotActionData.m_ShockTaken);
+
+			randNum = Math.RandomInt(0, PlayerBase.m_BleedingSourcesUp.Count() - 1);
+			
+			player.m_BleedingManagerServer.AttemptAddBleedingSourceBySelection(PlayerBase.m_BleedingSourcesUp[randNum]);
+		}
+		else if (gotActionData.m_CarSpeed >= HIGH_SPEED_VALUE)
+		{
+			if (!headGear)
+				player.m_BleedingManagerServer.AttemptAddBleedingSourceBySelection("Head");
+
+			if (randNum < 75)
+				player.GiveShock(-gotActionData.m_ShockTaken);
+		}
+		
+		//Damage all currently equipped clothes
+		foreach (ClothingBase cloth : equippedClothes)
+		{
+			//If no item is equipped on slot, slot is ignored
+			if (cloth == null)
+				continue;
+
+			cloth.DecreaseHealth(gotActionData.m_DmgTaken, false);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionHandsPartSwitch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionHandsPartSwitch.c
new file mode 100644
index 0000000000000000000000000000000000000000..28e85fca5cdb72f8c9d69baa2d52c17c05467ce8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionHandsPartSwitch.c
@@ -0,0 +1,61 @@
+// deprecated
+class ActionHandsPartSwitch: ActionSingleUseBase
+{
+	void ActionHandsPartSwitch()
+	{
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINone; //'CCINotPresent' to perfom with empty hands only
+		m_ConditionTarget = new CCTCursor;
+		m_Text = "#switch_to_the_next_part";
+	}
+		
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return InteractActionInput;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return false;
+	}
+	
+	//-------------------------------------------------
+	override void OnStartClient(ActionData action_data)
+	{
+		super.OnStartClient( action_data );
+		
+		SetNextIndex(action_data);
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		super.OnStartServer( action_data );
+		
+		if (!GetGame().IsMultiplayer())
+			SetNextIndex(action_data);
+	}
+	
+	void SetNextIndex(ActionData action_data)
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		construction_action_data.SetNextIndex();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionHarvestCrops.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionHarvestCrops.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb86b5cd24baa28b468fa1c7ed2abfc3095ee154
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionHarvestCrops.c
@@ -0,0 +1,100 @@
+class ActionHarvestCrops: ActionInteractBase
+{
+	PlantBase m_Plant;
+	
+	void ActionHarvestCrops()
+	{
+
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_MEDIUM;
+		/*m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_FullBody = true;*/
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	Slot GetPlantSlot(ActionTarget target)
+	{
+		GardenBase garden_base;
+		if ( Class.CastTo(garden_base, target.GetObject()))
+		{
+			Slot slot;
+			
+			array<string> selections = new array<string>;
+			garden_base.GetActionComponentNameList(target.GetComponentIndex(), selections);
+			string selection;
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				selection = selections[s];
+				slot = garden_base.GetSlotBySelection( selection );
+				if (slot)
+					break;
+			}
+			
+			if ( slot && slot.GetPlant() )
+			{
+				return slot;	
+			}
+		}
+		return null;
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		m_Text =  "#harvest";
+		
+		Slot slot = GetPlantSlot(target);
+		
+		if (slot)
+		{
+			m_Plant = PlantBase.Cast(slot.GetPlant());
+			m_Text+=  " " +  MiscGameplayFunctions.GetItemDisplayName(m_Plant.GetCropsType());
+		}
+
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.SMALL);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		GardenBase garden_base;
+		if ( Class.CastTo(garden_base, target.GetObject()))
+		{
+			Slot slot = GetPlantSlot(target);
+			
+			if (slot)
+			{
+				m_Plant = PlantBase.Cast(slot.GetPlant());
+				bool is_mature = m_Plant.IsMature();
+				bool is_spoiled = m_Plant.IsSpoiled();
+				bool has_crops = m_Plant.HasCrops();
+				int plant_state = m_Plant.GetPlantState();
+
+				if ( is_mature && has_crops )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if ( m_Plant )
+		{
+			m_Plant.Harvest( action_data.m_Player );
+
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionITest.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionITest.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3f04ee0e0662f11e0099da62c218be1266d78be
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionITest.c
@@ -0,0 +1,7 @@
+class ActionITest: ActionInteractBase
+{
+	void ActionITest()
+	{
+		m_Text = "#Take one";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionNextCombinationLockDialOnTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionNextCombinationLockDialOnTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..64f930cbff6f3cee7e304b509ea7e88a016eb763
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionNextCombinationLockDialOnTarget.c
@@ -0,0 +1,48 @@
+class ActionNextCombinationLockDialOnTarget: ActionInteractBase
+{
+	void ActionNextCombinationLockDialOnTarget()
+	{
+		m_Text = "#next_combination_lock_dial";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+	}
+
+	override bool IsInstant()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if (!target.GetObject())
+			return false;
+		
+		CombinationLock lock = CombinationLock.Cast( target.GetObject() );
+		if ( lock && lock.GetHierarchyParent() && Fence.Cast(lock.GetHierarchyParent()) )
+		{
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			construction_action_data.SetCombinationLock( lock );
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		//set next dial
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		CombinationLock combination_lock = construction_action_data.GetCombinationLock();
+		if ( combination_lock )
+		{
+			combination_lock.SetNextDial();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenBarrel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenBarrel.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d3075f488f6327d5cd1c64fa246d6358f68d456
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenBarrel.c
@@ -0,0 +1,46 @@
+class ActionOpenBarrel: ActionInteractBase
+{
+	void ActionOpenBarrel()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#open";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		if ( target_object.IsItemBase() )
+		{
+			Barrel_ColorBase ntarget = Barrel_ColorBase.Cast( target_object );
+			if( ntarget )
+			{
+				if( !ntarget.IsLocked() && !ntarget.IsOpen() )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		Barrel_ColorBase ntarget = Barrel_ColorBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.Open();
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		Barrel_ColorBase ntarget = Barrel_ColorBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.SoundSynchRemoteReset();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenBarrelHoles.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenBarrelHoles.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb7b4ca68385de8134561ddcf01c1234f2f1a409
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenBarrelHoles.c
@@ -0,0 +1,46 @@
+class ActionOpenBarrelHoles: ActionInteractBase
+{
+	void ActionOpenBarrelHoles()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#open";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		if ( target_object.IsItemBase() )
+		{
+			BarrelHoles_ColorBase ntarget = BarrelHoles_ColorBase.Cast( target_object );
+			if( ntarget )
+			{
+				if ( !ntarget.IsOpen() && !ntarget.DirectCookingSlotsInUse() )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		BarrelHoles_ColorBase ntarget = BarrelHoles_ColorBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.Open();
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		BarrelHoles_ColorBase ntarget = BarrelHoles_ColorBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.SoundSynchRemoteReset();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenDoors.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenDoors.c
new file mode 100644
index 0000000000000000000000000000000000000000..885dc3cf65d864968cebdc3f2fd589bb9f8f55ff
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenDoors.c
@@ -0,0 +1,89 @@
+class ActionOpenDoors: ActionInteractBase
+{
+	ref NoiseParams m_NoisePar;
+	
+	void ActionOpenDoors()
+	{
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text 			= "#open";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTCursor();
+	}
+
+	protected bool CheckIfDoorIsLocked()
+	{
+		return true;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target) 
+			return false;
+
+		if (!IsBuilding(target)) 
+			return false;
+
+		Building building;
+		if (Class.CastTo(building, target.GetObject()))
+		{
+			int doorIndex = building.GetDoorIndex(target.GetComponentIndex());
+			if (doorIndex != -1)
+			{
+				if (!IsInReach(player, target, UAMaxDistances.DEFAULT)) 
+					return false;
+				
+				return building.CanDoorBeOpened(doorIndex, CheckIfDoorIsLocked());
+
+			}
+		}
+
+		return false;
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		Building building;
+		if (Class.CastTo(building, action_data.m_Target.GetObject()))
+		{
+			int doorIndex = building.GetDoorIndex(action_data.m_Target.GetComponentIndex());
+			if (doorIndex != -1)
+			{
+				if (building.CanDoorBeOpened(doorIndex, CheckIfDoorIsLocked()))
+				{
+					building.OpenDoor(doorIndex);
+				}
+			}
+		}
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		m_NoisePar = new NoiseParams();
+		m_NoisePar.LoadFromPath("CfgVehicles SurvivorBase NoiseActionDefault");
+		NoiseSystem noise = GetGame().GetNoiseSystem();
+		if (noise)
+		{
+			if (action_data.m_Player)
+				noise.AddNoisePos(action_data.m_Player, action_data.m_Target.GetObject().GetPosition(), m_NoisePar);
+		}
+	}
+}
+
+class ActionLockedDoors : ActionOpenDoors
+{
+	override bool CheckIfDoorIsLocked()
+	{
+		return false;
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		//! Original action didn't add any noise to the NoiseSystem
+		//super.OnEndServer(action_data);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenFence.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenFence.c
new file mode 100644
index 0000000000000000000000000000000000000000..6599b83c60df47c0ff410525deb77c49639313ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionOpenFence.c
@@ -0,0 +1,59 @@
+class ActionOpenFence: ActionInteractBase
+{
+	ref NoiseParams m_NoisePar;
+	const string SELECTION_INTERACT = "gate_interact";
+	
+	void ActionOpenFence()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#open";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		if ( targetObject && targetObject.CanUseConstruction() )
+		{
+			Fence fence = Fence.Cast( targetObject );
+			
+			if ( fence && fence.CanOpenFence() )
+			{
+				array<string> selections = new array<string>;
+				targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+				
+				for ( int i = 0; i < selections.Count(); i++ )
+				{
+					if ( selections[i] == SELECTION_INTERACT )
+						return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		Fence fence = Fence.Cast( action_data.m_Target.GetObject() );
+		fence.OpenFence();
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		m_NoisePar = new NoiseParams();
+		m_NoisePar.LoadFromPath("CfgVehicles SurvivorBase NoiseActionDefault");
+		NoiseSystem noise = GetGame().GetNoiseSystem();
+		if ( noise )
+		{
+			if ( action_data.m_Player )
+				noise.AddNoisePos(action_data.m_Player, action_data.m_Target.GetObject().GetPosition(), m_NoisePar);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPackShelter.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPackShelter.c
new file mode 100644
index 0000000000000000000000000000000000000000..1820178becc260c8b0793b32756590df062dd99b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPackShelter.c
@@ -0,0 +1,84 @@
+class ActionDeconstructShelter : ActionContinuousBase
+{
+	void ActionDeconstructShelter()
+	{
+		m_CallbackClass		= ActionPackTentCB;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.PRECISE_LOW;
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_2HD;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text 				= "#pack_tent";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget 	= new CCTCursor(UAMaxDistances.DEFAULT);
+		m_ConditionItem 	= new CCINone();
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return true;
+	}
+	
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		return true;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		PlaceObjectActionData action_data = new PlaceObjectActionData();
+		return action_data;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		if (player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if (targetObject)
+		{
+			ShelterBase shelter = ShelterBase.Cast(targetObject);
+			return shelter && shelter.CanBePacked();
+		}
+
+		return false;
+	}
+	
+	override void OnStart(ActionData action_data)
+	{
+		super.OnStart(action_data);
+
+		action_data.m_Player.TryHideItemInHands(true);
+	}
+	
+	override void OnEnd(ActionData action_data)
+	{
+		super.OnEnd(action_data);
+
+		action_data.m_Player.TryHideItemInHands(false);
+	}
+	
+	override void OnFinishProgressServer(ActionData action_data)
+	{
+		ShelterBase shelter = ShelterBase.Cast(action_data.m_Target.GetObject());
+		if (shelter)
+			shelter.Deconstruct();
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return " packed " + action_data.m_Target.GetObject().GetDisplayName() + " with Hands ";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPackTent.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPackTent.c
new file mode 100644
index 0000000000000000000000000000000000000000..153b16e0c1fce94ec78cb8aba3fd8ffbe5569b58
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPackTent.c
@@ -0,0 +1,144 @@
+class ActionPackTentCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT_DEPLOY); //Use same time as Deploy
+	}
+}
+
+class ActionPackTent : ActionContinuousBase
+{
+	void ActionPackTent()
+	{
+		m_CallbackClass		= ActionPackTentCB;
+		m_SpecialtyWeight 	= UASoftSkillsWeight.PRECISE_LOW;
+		m_CommandUID		= 0;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#pack_tent";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursorParent(UAMaxDistances.DEFAULT);
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool IsUsingProxies()
+	{
+		return true;
+	}
+
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return true;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		Object targetParent = action_data.m_Target.GetParent();
+		TentBase tent = TentBase.Cast( targetParent );
+		return tent.CanBePacked();
+	}
+	
+	override ActionData CreateActionData()
+	{
+		PlaceObjectActionData action_data = new PlaceObjectActionData;
+		return action_data;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{	
+		if ( super.SetupAction(player, target, item, action_data, extra_data ))
+		{
+			PlaceObjectActionData poActionData;
+			poActionData = PlaceObjectActionData.Cast(action_data);
+			poActionData.m_AlreadyPlaced = false;
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_2HD; //Call the animation
+			return true;
+		}
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object targetObject = target.GetObject();
+		Object targetParent = target.GetParent();
+		
+		TentBase inventory_tent = TentBase.Cast(targetObject);
+		if (inventory_tent && inventory_tent.GetHierarchyRootPlayer())
+		{
+			return false; //tent is somewhere in player's inventory
+		}
+		
+		if ( player && targetObject && targetParent )
+		{
+			TentBase tent = TentBase.Cast( targetParent );
+			if ( tent.CanBePacked() )
+			{
+				array<string> selections = new array<string>;
+				targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+				
+				for ( int s = 0; s < selections.Count(); s++ )
+				{					
+					if ( selections[s] == "pack" )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override void Start( ActionData action_data ) //Setup on start of action
+	{
+		super.Start(action_data);
+		
+		if ( action_data.m_Player ) action_data.m_Player.TryHideItemInHands(true);
+	}
+	
+	override void OnExecute( ActionData action_data )
+	{
+		Object targetParent = action_data.m_Target.GetParent();
+		TentBase tent = TentBase.Cast( targetParent );
+		tent.SetIsBeingPacked(true);
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		Object targetParent = action_data.m_Target.GetParent();
+		TentBase tent = TentBase.Cast( targetParent );
+		tent.SetIsBeingPacked(false);
+		if ( action_data.m_Player ) action_data.m_Player.TryHideItemInHands(false);
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		//vector offset = Vector(1, 0, 0);
+		Object targetParent = action_data.m_Target.GetParent();
+		TentBase tent = TentBase.Cast( targetParent );
+		if (tent.CanBePacked())
+		{
+			tent.Pack( true );
+			tent.SetPosition( action_data.m_Player.GetPosition() /*+ offset*/ ); //Add offset to allign tent with player
+			tent.SetOrientation( action_data.m_Player.GetOrientation() );
+			tent.PlaceOnSurface();
+		}
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return " packed " + action_data.m_Target.GetParent().GetDisplayName() + " with Hands ";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPickBerry.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPickBerry.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a05a4e4c6e828126572335ace9e640729ac9b6b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPickBerry.c
@@ -0,0 +1,63 @@
+class ActionPickBerryCB : ActionInteractLoopBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAInteractLoop(UATimeSpent.DEFAULT_PICK);
+	}
+	/*override void OnAnimationEvent(int pEventID)	
+	{
+		Print("ActionInteractLoopBase.c | OnAnimationEvent | OnAnimationEvent called");
+		if ( !m_Interrupted && pEventID == UA_ANIM_EVENT ) 
+		{
+			SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+			m_State = UA_FINISHED;
+			m_ActionData.Do(this,m_State,m_ActionComponent,m_Player,m_Target,m_Item);
+		}	
+	}*/
+};
+
+class ActionPickBerry: ActionInteractLoopBase
+{
+	void ActionPickBerry()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_MEDIUM;
+		
+		m_CallbackClass = ActionPickBerryCB;
+		m_Text = "#harvest";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.DEFAULT);
+		m_ConditionItem = new CCINone;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object targetObject = target.GetObject();
+		if ( player && targetObject && targetObject.IsWoodBase() ) 
+		{
+			return true;
+		}
+		return false;
+	}
+
+	//deprecated
+	////override void OnCompleteServer( ActionData action_data )
+	//{
+		/*Object targetObject = action_data.m_Target.GetObject();
+		WoodBase ntarget = WoodBase.Cast( targetObject );
+		string drop_name = ntarget.GetMaterial(NULL);
+		float drop_quantity = ntarget.GetAmountOfMaterialPerDrop(action_data.m_MainItem);
+		
+		targetObject.DecreaseHealth( "", "", (1 / Math.Max(1,ntarget.GetAmountOfDrops(action_data.m_MainItem)))*100, true );
+				
+		ItemBase drop = ItemBase.Cast( GetGame().CreateObject(drop_name, action_data.m_Player.GetPosition(), false) );
+		drop.SetQuantity(drop_quantity, false);
+
+		action_data.m_Player.GetSoftSkillManager().AddSpecialty( m_SpecialtyWeight );*/
+	//}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPickupChicken.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPickupChicken.c
new file mode 100644
index 0000000000000000000000000000000000000000..2cd5e1bc59e41da23d159ae824d44c3e135304df
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPickupChicken.c
@@ -0,0 +1,50 @@
+class ActionPickupChicken: ActionInteractBase
+{
+	void ActionPickupChicken()
+	{
+		m_Text = "#take";
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( player.GetCommand_Vehicle() )
+			return false;
+		
+		Animal_GallusGallusDomesticus chicken;
+		if ( Class.CastTo( chicken, target.GetObject() ) )
+		{
+			return !chicken.IsAlive();
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		// We will switch the item
+		Animal_GallusGallusDomesticus targetChicken = Animal_GallusGallusDomesticus.Cast( action_data.m_Target.GetObject() );
+		if ( targetChicken )
+		{
+			DeadChicken_ColorBase deadChicken = DeadChicken_ColorBase.Cast( action_data.m_Player.GetHumanInventory().CreateInHands( targetChicken.GetDeadItemName() ) );
+			
+			if ( deadChicken == null )
+			{
+				deadChicken = DeadChicken_ColorBase.Cast( action_data.m_Player.GetHumanInventory().CreateInInventory( targetChicken.GetDeadItemName() ) );
+			
+				if ( deadChicken == null )
+					deadChicken = DeadChicken_ColorBase.Cast( GetGame().CreateObjectEx( targetChicken.GetDeadItemName(), targetChicken.GetPosition(), ECE_PLACE_ON_SURFACE, RF_ORIGINAL ) );
+			}
+			targetChicken.Delete();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPullBodyFromTransport.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPullBodyFromTransport.c
new file mode 100644
index 0000000000000000000000000000000000000000..61df08275c34693e4ddc23ed015dac7500ebd4ea
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPullBodyFromTransport.c
@@ -0,0 +1,64 @@
+class ActionPullBodyFromTransport: ActionInteractBase
+{
+	void ActionPullBodyFromTransport()
+	{
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_ALL;
+		m_Text 			= "#pull_out_body";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTNone();
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		PlayerBase targetPlayer = PlayerBase.Cast(target.GetObject());
+		if (!targetPlayer)
+			return false;
+		
+		if (targetPlayer.IsAlive())
+			return false;
+		
+		IEntity parent = targetPlayer.GetParent();
+		if (!parent || !parent.IsInherited(Transport))
+			return false;
+		
+		bool found = false;
+		Transport transportTarget = Transport.Cast(targetPlayer.GetParent());
+		for (int i = 0; i < transportTarget.CrewSize(); ++i)
+		{
+			if (transportTarget.CrewMember(i) == targetPlayer)
+			{
+				found = true;
+				break;
+			}
+		}
+		
+		return found && transportTarget.CrewCanGetThrough(i);
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		super.OnStartServer(action_data);
+		
+		DayZPlayerImplement player;
+		if (!Class.CastTo(player, action_data.m_Target.GetObject()))
+		{
+			return;
+		}
+		
+		player.TriggerPullPlayerOutOfVehicle();
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPullOutPlug.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPullOutPlug.c
new file mode 100644
index 0000000000000000000000000000000000000000..1216bf172339c0019ec68c1116d62b417112e48e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionPullOutPlug.c
@@ -0,0 +1,45 @@
+class ActionPullOutPlug : ActionInteractBase
+{
+	void ActionPullOutPlug()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+
+		m_Text = "#pull_out_plug";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		
+		if (targetEntity.HasEnergyManager())
+		{
+			string selection = targetEntity.GetActionComponentName(target.GetComponentIndex());
+			
+			
+			if (GetGame().IsServer())
+				return targetEntity.GetCompEM().GetPlugOwner(selection) != null;
+			else
+				return targetEntity.GetCompEM().IsSelectionAPlug(selection);
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{	
+		Object targetObject = action_data.m_Target.GetObject();
+		if (targetObject)
+		{
+			EntityAI targetEntity = EntityAI.Cast(targetObject);
+			string selection = targetObject.GetActionComponentName(action_data.m_Target.GetComponentIndex());
+			
+			EntityAI device = EntityAI.Cast(targetEntity.GetCompEM().GetPlugOwner(selection));
+			if (device)
+				device.GetCompEM().UnplugThis();
+			
+			// Disable Advanced Placement
+			if (action_data.m_Player.IsPlacingServer())
+				action_data.m_Player.PlacingCancelServer();
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRemovePlant.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRemovePlant.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf3baa2e7e110256f3375b30b85466e236fe2ffb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRemovePlant.c
@@ -0,0 +1,80 @@
+class ActionRemovePlant: ActionInteractBase
+{
+	PlantBase m_Plant;
+	
+	void ActionRemovePlant()
+	{
+		m_Text = "#remove_plant";
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.SMALL);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		GardenBase garden_base;
+		if ( Class.CastTo(garden_base, target.GetObject()))
+		{
+			Slot slot;
+			
+			array<string> selections = new array<string>;
+			garden_base.GetActionComponentNameList(target.GetComponentIndex(), selections);
+			string selection;
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				selection = selections[s];
+				slot = garden_base.GetSlotBySelection( selection );
+				if (slot)
+					break;
+			}
+			
+			if ( slot && slot.GetPlant() )
+			{
+				m_Plant = PlantBase.Cast(slot.GetPlant());
+				if ( m_Plant.IsGrowing()  ||  m_Plant.IsDry()  ||  !m_Plant.HasCrops() || m_Plant.IsSpoiled())
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+		/*Object targetObject = target.GetObject();
+		if ( targetObject != NULL && targetObject.IsInherited(PlantBase) )
+		{
+			PlantBase plant = PlantBase.Cast( targetObject );
+			
+			if ( plant.IsGrowing()  ||  plant.IsDry()  ||  !plant.HasCrops() || plant.IsSpoiled())
+			{
+				return true;
+			}
+		}
+		
+		return false;*/
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if ( m_Plant )
+		{
+			//m_Plant.RemovePlant();
+			
+			//New method allowing us to pass player position
+			m_Plant.RemovePlantEx( action_data.m_Player.GetPosition() );
+		}
+		/*Object targetObject = action_data.m_Target.GetObject();
+		if ( targetObject != NULL && targetObject.IsInherited(PlantBase) )
+		{
+			PlantBase plant = PlantBase.Cast( targetObject );
+			plant.RemovePlant();
+		}*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRemoveSeed.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRemoveSeed.c
new file mode 100644
index 0000000000000000000000000000000000000000..46e5d7ee89a59442e2fd698a215c1f6229e3c0f5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRemoveSeed.c
@@ -0,0 +1,137 @@
+class ActionRemoveSeed: ActionInteractBase
+{
+	SeedBase m_Seed;
+	
+	void ActionRemoveSeed()
+	{
+		m_Text = "#take";
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor(UAMaxDistances.SMALL);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( player.GetCommand_Vehicle() )
+			return false;
+		
+		GardenBase garden_base;
+		if ( Class.CastTo( garden_base, target.GetObject() ) )
+		{
+			Slot slot;
+			
+			array<string> selections = new array<string>;
+			garden_base.GetActionComponentNameList( target.GetComponentIndex(), selections );
+			string selection;
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				selection = selections[s];
+				slot = garden_base.GetSlotBySelection( selection );
+				if ( slot )
+					break;
+			}
+			
+			//Can only remove seed if slot is not watered to prevent VME
+			if ( slot && slot.GetSeed() )
+			{
+				if ( slot.GetWateredState() != 0 )
+					return false;
+				
+				m_Seed = SeedBase.Cast( slot.GetSeed() );
+				
+				if ( m_Seed )
+				{
+					if ( player.GetInventory().CanAddEntityIntoInventory( m_Seed ) && m_Seed.GetHierarchyRootPlayer() != player )
+						return true;
+					else
+						return player.GetInventory().CanAddEntityIntoHands( m_Seed );
+				}
+			}
+		}
+		return false;
+	}
+
+	override bool InventoryReservation(ActionData action_data)
+	{
+		bool success = true;
+		
+		InventoryLocation il = new InventoryLocation;
+		
+		if ( m_Seed )
+		{
+			action_data.m_Player.GetInventory().FindFreeLocationFor( m_Seed , FindInventoryLocationType.ANY, il );
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( m_Seed, il ) )
+			{
+				success = false;
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( m_Seed, il, GameInventory.c_InventoryReservationTimeoutMS );
+			}
+		}	
+		
+		if ( success )
+		{
+			if ( il )
+				action_data.m_ReservedInventoryLocations.Insert( il );
+		}
+		
+		return success;
+	}
+	
+	override void OnExecute( ActionData action_data )
+	{
+		if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+			return;
+		
+		PlayerBase player = action_data.m_Player;
+		float stackable;
+		InventoryLocation il;
+		
+		//We place in inventory
+		if ( !player.GetInventory().CanAddEntityIntoHands( m_Seed ) )
+		{
+			il = action_data.m_ReservedInventoryLocations.Get( 0 );
+			InventoryLocation targetInventoryLocation = new InventoryLocation;
+			m_Seed.GetInventory().GetCurrentInventoryLocation( targetInventoryLocation );
+			
+			stackable = m_Seed.GetTargetQuantityMax( il.GetSlot() );
+			
+			if ( stackable == 0 || stackable >= m_Seed.GetQuantity() )
+			{
+				player.PredictiveTakeToDst( targetInventoryLocation, il );
+			}
+			else
+			{
+				m_Seed.SplitIntoStackMaxToInventoryLocationClient( il );
+			}
+		}
+		else
+		{
+			//We place in hands
+			ClearInventoryReservationEx( action_data );
+			
+			stackable = m_Seed.GetTargetQuantityMax( -1 );
+			
+			if ( stackable == 0 || stackable >= m_Seed.GetQuantity() )
+			{
+				action_data.m_Player.PredictiveTakeEntityToHands( m_Seed );
+			}
+			else
+			{
+				il = new InventoryLocation;
+				il.SetHands( action_data.m_Player, m_Seed );
+				m_Seed.SplitIntoStackMaxToInventoryLocationClient( il );
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRepackTent.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRepackTent.c
new file mode 100644
index 0000000000000000000000000000000000000000..5268ce6bbc2c0ada5951b8c36a83196dac3e0a77
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRepackTent.c
@@ -0,0 +1,219 @@
+class ActionRepackTentCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime( UATimeSpent.UNPACK );
+	}
+	
+	void DropDuringRepacking()
+	{
+		vector orientation = m_ActionData.m_Player.GetOrientation();
+		vector position = m_ActionData.m_Player.GetPosition() + m_ActionData.m_Player.GetDirection();
+		vector rotation_matrix[3];
+		float direction[4];
+		InventoryLocation source = new InventoryLocation;
+		InventoryLocation destination = new InventoryLocation;
+		
+		Math3D.YawPitchRollMatrix( orientation, rotation_matrix );
+		Math3D.MatrixToQuat( rotation_matrix, direction );
+			
+		vector ground_position = position;
+		ground_position[1] = GetGame().SurfaceY(ground_position[0],ground_position[2]);
+		
+		if ( vector.DistanceSq( m_ActionData.m_Player.GetPosition(), ground_position ) > UAMaxDistances.DEFAULT * UAMaxDistances.DEFAULT)
+		{
+			if ( m_ActionData.m_MainItem.GetInventory().GetCurrentInventoryLocation( source ) )
+			{
+				destination.SetGroundEx( m_ActionData.m_MainItem, position, direction );
+				m_ActionData.m_Player.PredictiveTakeToDst(source, destination);
+			}
+		}
+		else
+		{
+			if ( m_ActionData.m_MainItem.GetInventory().GetCurrentInventoryLocation( source ) )
+			{
+				destination.SetGroundEx( m_ActionData.m_MainItem, ground_position, direction );
+				m_ActionData.m_Player.PredictiveTakeToDst(source, destination);
+			}
+		}
+	}
+};
+
+class ActionRepackTent: ActionContinuousBase
+{
+	EntityAI m_RepackedEntity;
+	bool m_IsFinished;
+	
+	void ActionRepackTent()
+	{
+		m_CallbackClass = ActionRepackTentCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_CommandUID = 0;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#repack_tent";
+	}
+
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override bool HasAlternativeInterrupt()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if ( !player.IsPlacingLocal() )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{	
+		SetupAnimation( item );
+		
+		if ( super.SetupAction(player, target, item, action_data, extra_data ))
+		{			
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		m_RepackedEntity = null;
+		m_IsFinished = false;
+	}
+	
+	override void OnFinishProgressServer( ActionData action_data )
+	{			
+		Param1<bool> play = new Param1<bool>( false );
+		GetGame().RPCSingleParam( action_data.m_MainItem, SoundTypeTent.REPACK, play, true );
+		
+		m_IsFinished = true;
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{		
+		if ( m_IsFinished )
+		{
+			if ( action_data.m_MainItem.IsInherited( TentBase ) ) 
+			{
+				RepackLambda lambda_back_pack = new RepackLambda(action_data.m_MainItem, "LargeTentBackPack", action_data.m_Player);
+				action_data.m_Player.ServerReplaceItemElsewhereWithNewInHands(lambda_back_pack);
+			}
+			
+			if (  action_data.m_MainItem.IsInherited( Clothing ) ) 
+			{
+				RepackLambda lambda_tent = new RepackLambda(action_data.m_MainItem, "LargeTent", action_data.m_Player);
+				action_data.m_Player.ServerReplaceItemElsewhereWithNewInHands(lambda_tent);
+			}
+		}
+		else
+		{
+			if ( GetGame().IsMultiplayer() )
+			{		
+				if ( action_data.m_MainItem )
+				{
+					action_data.m_Player.ServerTakeEntityToHands( action_data.m_MainItem );
+				}
+			}
+			else
+			{
+				if ( action_data.m_MainItem )
+				{
+					action_data.m_Player.LocalTakeEntityToHands( action_data.m_MainItem );
+				}
+			}
+		}
+	}
+	
+	void SetupAnimation( ItemBase item )
+	{
+		if ( item.IsHeavyBehaviour() )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_HEAVY;
+		}
+		else if ( item.IsOneHandedBehaviour() )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_1HD; 
+		}
+		else if ( item.IsTwoHandedBehaviour() )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_2HD;
+		}
+		else
+		{
+			Print("Error: check " + item + " behaviour");
+		}
+	}
+	
+	override void OnStartAnimationLoopClient( ActionData action_data )
+	{					
+		if ( action_data.m_Player.GetItemInHands() )
+			ActionRepackTentCB.Cast(action_data.m_Callback).DropDuringRepacking();
+	}
+	
+	override void OnStartAnimationLoopServer( ActionData action_data )
+	{
+		Param1<bool> play = new Param1<bool>( false );
+		if ( !GetGame().IsMultiplayer() )
+		{		
+			if ( action_data.m_Player.GetItemInHands() )
+				ActionRepackTentCB.Cast(action_data.m_Callback).DropDuringRepacking();
+		}		
+
+		if ( action_data.m_Player.GetItemInHands() )
+		{
+			play = new Param1<bool>( true );
+			GetGame().RPCSingleParam( action_data.m_MainItem, SoundTypeTent.REPACK, play, true );
+		}
+	}
+	
+	override void OnEndAnimationLoop( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			Param1<bool> play = new Param1<bool>( false );
+			GetGame().RPCSingleParam( action_data.m_MainItem, SoundTypeTent.REPACK, play, true );
+		}
+	}
+	
+	override string GetAdminLogMessage(ActionData action_data)
+	{
+		return " re-packed " + action_data.m_Target.GetObject().GetDisplayName() + " with Hands ";
+	}
+};
+
+class RepackLambda : TurnItemIntoItemLambda
+{
+	EntityAI m_RepackedNewEntity;
+	
+	void RepackLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+		InventoryLocation hands = new InventoryLocation;
+		hands.SetHands( player, null );
+		OverrideNewLocation( hands );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRepositionPluggedItem.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRepositionPluggedItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab77d167887e4dc77d8d4eb033e9218f7acf1afc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionRepositionPluggedItem.c
@@ -0,0 +1,102 @@
+class ActionRepositionPluggedItem : ActionInteractBase
+{
+	// Through this action players can reposition already placed electric devices without unplugging them from the power source.
+	void ActionRepositionPluggedItem()
+	{
+		m_CallbackClass = ActionInteractBaseCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+
+		m_Text = "#reposition";
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		EntityAI targetParent = EntityAI.Cast(targetItem.GetHierarchyParent());
+		if (!targetItem || !targetItem.IsTakeable() || targetItem.IsBeingPlaced() || (targetItem.GetCompEM() && !targetItem.GetCompEM().IsPlugged()) || ( targetItem.GetHierarchyParent() && !BaseBuildingBase.Cast(targetItem.GetHierarchyParent()) ) || ((targetParent && !targetItem.CanDetachAttachment(targetParent)) || (targetParent && !targetParent.CanReleaseAttachment(targetItem))))
+			return false;
+
+		if (targetItem.HasEnergyManager() && targetItem.GetCompEM().IsPlugged())
+			return player.GetInventory().CanAddEntityIntoHands(targetItem);
+		
+		return false;
+	}
+	
+	override bool CanContinue(ActionData action_data)
+	{
+		EntityAI ent = EntityAI.Cast(action_data.m_Target.GetObject());
+		return ent && ent.GetCompEM().GetCordLength() > 0;
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+
+		ItemBase ntarget = ItemBase.Cast(action_data.m_Target.GetObject());
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			action_data.m_Player.PlacingStartServer(ntarget);
+		else
+			action_data.m_Player.TogglePlacingLocal(ntarget);
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		InventoryLocation il = new InventoryLocation();
+		ItemBase ntarget = ItemBase.Cast(action_data.m_Target.GetObject());
+		ClearInventoryReservationEx(action_data);
+		
+		action_data.m_Player.PredictiveTakeEntityToHands(ntarget);
+	}
+	
+	override void OnExecuteClient(ActionData action_data)
+	{
+		InventoryLocation il = new InventoryLocation();
+		ItemBase ntarget = ItemBase.Cast(action_data.m_Target.GetObject());
+		ClearInventoryReservationEx(action_data);
+		
+		action_data.m_Player.PredictiveTakeEntityToHands(ntarget);
+	}
+	
+	override void CreateAndSetupActionCallback(ActionData action_data)
+	{
+		EntityAI target = EntityAI.Cast(action_data.m_Target.GetObject());
+		ActionBaseCB callback;
+		if (!target)
+			return;
+		
+		if (target.IsHeavyBehaviour())
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(), DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS,GetCallbackClassTypename()));
+		}
+
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+
+	//! DEPRECATED
+	protected ItemBase m_SourceForReplug;
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSetAlarmClock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSetAlarmClock.c
new file mode 100644
index 0000000000000000000000000000000000000000..a9f3a40a173449962eee24fb6295caa1eafe50b4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSetAlarmClock.c
@@ -0,0 +1,67 @@
+class ActionSetAlarmClockCB : ActionContinuousBaseCB
+{
+	const float TIME_TO_COMPLETE = 24.0;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(TIME_TO_COMPLETE);
+		AlarmClock_ColorBase alarm = AlarmClock_ColorBase.Cast(m_ActionData.m_MainItem);
+		CAContinuousRepeat.Cast(m_ActionData.m_ActionComponent).SetProgress(alarm.GetAnimationPhase("ClockAlarm") * TIME_TO_COMPLETE);
+	}
+};
+
+class ActionSetAlarmClock: ActionContinuousBase
+{
+	void ActionSetAlarmClock()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_SET_ALARM;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_SET_ALARM;
+		m_SpecialtyWeight = 0;
+		
+		m_CallbackClass = ActionSetAlarmClockCB;
+		m_Text = "#STR_SetAlarm0";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTSelf;
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}	
+	
+	override void OnStart(ActionData action_data)
+	{
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return true;
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		float progress = action_data.m_Callback.GetActionComponentProgress();
+		AlarmClock_ColorBase clock = AlarmClock_ColorBase.Cast(action_data.m_MainItem);
+		clock.SetAlarmTimeServer(progress);
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+		if (action_data.m_Callback)
+		{
+			float progress = action_data.m_Callback.GetActionComponentProgress();
+			AlarmClock_ColorBase alarm = AlarmClock_ColorBase.Cast(action_data.m_MainItem);
+			alarm.SetAnimationPhaseNow("ClockAlarm", progress);
+		}
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSetKitchenTimer.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSetKitchenTimer.c
new file mode 100644
index 0000000000000000000000000000000000000000..72f76935aeb7f15e5264a44c5fedf51f2123e1b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSetKitchenTimer.c
@@ -0,0 +1,66 @@
+class ActionSetKitchenTimerCB : ActionContinuousBaseCB
+{
+	const float TIME_TO_COMPLETE = 24.0;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousRepeat(TIME_TO_COMPLETE);
+		KitchenTimer clock = KitchenTimer.Cast(m_ActionData.m_MainItem);
+		CAContinuousRepeat.Cast(m_ActionData.m_ActionComponent).SetProgress(clock.GetAnimationPhase("ClockAlarm") * TIME_TO_COMPLETE);
+	}
+};
+
+class ActionSetKitchenTimer: ActionContinuousBase
+{
+	void ActionSetKitchenTimer()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_SET_KITCHENTIMER;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONMOD_SET_KITCHENTIMER;
+		m_SpecialtyWeight = 0;
+		
+		m_CallbackClass = ActionSetKitchenTimerCB;
+		m_Text = "#STR_SetTimer0";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionTarget = new CCTSelf;
+		m_ConditionItem = new CCINonRuined;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}	
+
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return true;
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		float progress = action_data.m_Callback.GetActionComponentProgress();
+		KitchenTimer clock = KitchenTimer.Cast(action_data.m_MainItem);
+		clock.SetAlarmTimeServer(progress);
+	}
+	
+	override void OnEndAnimationLoopServer( ActionData action_data )
+	{
+
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+		float progress = action_data.m_Callback.GetActionComponentProgress();
+		KitchenTimer clock = KitchenTimer.Cast(action_data.m_MainItem);
+		clock.SetAnimationPhaseNow("ClockAlarm", progress);
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSwapItemToHand.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSwapItemToHand.c
new file mode 100644
index 0000000000000000000000000000000000000000..45423dd4c75358626db2f28fe2ea614285eb5e38
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionSwapItemToHand.c
@@ -0,0 +1,61 @@
+/*class ActionSwapItemToHands: ActionInteractBase
+{
+	string m_ItemName = "";
+
+	void ActionSwapItemToHands()
+	{
+		m_MessageSuccess    = "";
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_CommandUIDProne   = DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS;
+
+		m_HUDCursorIcon     = CursorIcons.LootCorpse;
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTDummy();
+	}	
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override int GetType()
+	{
+		return AT_SWAP_ITEM_TO_HANDS;
+	}
+
+	override string GetText()
+	{
+		return "#swap_to_hands";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI entity;
+		ItemBase ih = player.GetItemInHands();
+		if ( ih && item && Class.CastTo(entity, target.GetObject()) )
+		{
+			bool canAdd = player.GetInventory().CanAddEntityIntoHands(entity);
+			
+			if ( entity && !player.GetInventory().CanAddEntityIntoInventory(entity) && entity.CanPutIntoHands(player) && !canAdd && entity.GetHierarchyRootPlayer() != player )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		EntityAI ntarget = EntityAI.Cast(action_data.m_Target.GetObject());
+		action_data.m_Player.LocalSwapEntities(ntarget, action_data.m_Player.GetItemInHands());
+	}
+	override void OnExecuteClient( ActionData action_data )
+	{
+		EntityAI ntarget = EntityAI.Cast(action_data.m_Target.GetObject());
+		action_data.m_Player.LocalSwapEntities(ntarget, action_data.m_Player.GetItemInHands());
+	}
+};*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeArrow.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeArrow.c
new file mode 100644
index 0000000000000000000000000000000000000000..44f83bc24e7f23aa2b0919ba1ddf5d3f77d030f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeArrow.c
@@ -0,0 +1,216 @@
+/*class TakeArrowActionReciveData : ActionReciveData
+{
+	EntityAI m_Arrow;
+}
+
+class TakeArrowActionData : ActionData
+{
+	EntityAI m_Arrow;
+}*/
+
+class ActionTakeArrow: ActionTakeItem
+{
+	void ActionTakeArrow()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_Text 				= "#take";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTObject(UAMaxDistances.DEFAULT);
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		if (!targetEntity || (targetEntity && targetEntity.IsManagingArrows() && !targetEntity.IsDamageDestroyed()))
+			return false;
+		
+		ArrowManagerBase arrowManager = targetEntity.GetArrowManager();
+		if (arrowManager)
+		{
+			ItemBase arrow = ItemBase.Cast(arrowManager.GetFirstArrow());
+			if (arrow)
+			{
+				if (player.GetInventory().CanAddEntityIntoInventory(arrow))
+					return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override Object GetDisplayInteractObject(PlayerBase player, ActionTarget target)
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		if (!targetEntity || (targetEntity && targetEntity.IsManagingArrows() && !targetEntity.IsDamageDestroyed()))
+			return null;
+		
+		ArrowManagerBase arrowManager = targetEntity.GetArrowManager();
+		if (arrowManager)
+		{
+			return arrowManager.GetFirstArrow();
+		}
+		
+		return null;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return false;
+	}
+	
+	override bool InventoryReservation(ActionData action_data)
+	{
+		bool success = true;
+		
+		InventoryLocation il = new InventoryLocation();
+		
+		EntityAI targetEntity;
+		if (EntityAI.CastTo(targetEntity, action_data.m_Target.GetObject()))
+		{
+			ArrowManagerBase arrowManager = targetEntity.GetArrowManager();
+			if (arrowManager)
+			{
+				ItemBase targetArrow = ItemBase.Cast(arrowManager.GetFirstArrow());
+				if (targetArrow)
+				{
+					action_data.m_Player.GetInventory().FindFreeLocationFor(targetArrow , FindInventoryLocationType.ANY, il);
+					if (action_data.m_Player.GetInventory().HasInventoryReservation(targetArrow, il))
+					{
+						success = false;
+					}
+					else
+					{
+						action_data.m_Player.GetInventory().AddInventoryReservationEx(targetArrow, il, GameInventory.c_InventoryReservationTimeoutMS);
+					}
+				}
+			}
+		}	
+		
+		if (success)
+		{
+			if (il)
+				action_data.m_ReservedInventoryLocations.Insert(il);
+		}
+		
+		return success;
+	}
+	
+	/*override ActionData CreateActionData()
+	{
+		ActionData action_data = new TakeArrowActionData;
+		return action_data;
+	}
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		TakeArrowActionData ad = TakeArrowActionData.Cast(action_data);
+		ctx.Write(ad.m_Arrow);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if (!action_recive_data)
+		{
+			action_recive_data = new TakeArrowActionReciveData;
+		}
+		
+		if (!super.ReadFromContext( ctx, action_recive_data ))
+			return false;
+		
+		TakeArrowActionReciveData recive_data_ta = TakeArrowActionReciveData.Cast( action_recive_data );
+
+		if (!ctx.Read(recive_data_ta.m_Arrow))
+			return false;
+		
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+		
+		TakeArrowActionReciveData recive_data_ta = TakeArrowActionReciveData.Cast(action_recive_data);
+		TakeArrowActionData action_data_ta = TakeArrowActionData.Cast(action_data);
+		
+		action_data_ta.m_Arrow = recive_data_ta.m_Arrow;
+	}*/
+	
+	override void OnExecuteClient(ActionData action_data)
+	{
+
+		InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);
+		
+		ItemBase arrow = ItemBase.Cast(il.GetItem());
+		InventoryLocation arrowInventoryLocation = new InventoryLocation;
+		arrow.GetInventory().GetCurrentInventoryLocation(arrowInventoryLocation);
+		
+		float stackable = arrow.GetTargetQuantityMax(il.GetSlot());
+		
+		if ( stackable == 0 || stackable >= arrow.GetQuantity() )
+		{
+			action_data.m_Player.PredictiveTakeToDst(arrowInventoryLocation, il);
+		}
+		else
+		{
+			arrow.SplitIntoStackMaxToInventoryLocationClient( il );
+		}
+	}
+	
+	/*override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = null)
+	{	
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			#ifndef SERVER
+			TakeArrowActionData action_data_ta = TakeArrowActionData.Cast(action_data);
+			InventoryLocation il = action_data_ta.m_ReservedInventoryLocations.Get(0);
+			action_data_ta.m_Arrow = il.GetItem();
+			#endif
+
+			return true;
+		}
+
+		return false;
+	}*/
+	
+	/*override void OnStartServer(ActionData action_data)
+	{
+		TakeArrowActionData action_data_ta = TakeArrowActionData.Cast(action_data);
+		action_data.m_Target.GetObject().RemoveChild(action_data_ta.m_Arrow);
+	}*/
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		//TakeArrowActionData action_data_ta = TakeArrowActionData.Cast(action_data);
+		//action_data.m_Target.GetObject().RemoveChild(action_data_ta.m_Arrow);
+		
+		if (GetGame().IsMultiplayer())
+			return;
+
+		InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);
+		ItemBase arrow = ItemBase.Cast(il.GetItem());
+		InventoryLocation arrowInventoryLocation = new InventoryLocation;
+		arrow.GetInventory().GetCurrentInventoryLocation(arrowInventoryLocation);
+		
+		EntityAI targetEntity = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (targetEntity)
+		{
+			targetEntity.RemoveChild(arrow);
+		}
+		
+		//float ammoMax = arrow.GetAmmoMax();
+		
+		//if ( stackable == 0 || ammoMax >= arrow.GetAmmoCount() )
+		//{
+			action_data.m_Player.PredictiveTakeToDst(arrowInventoryLocation, il);
+		/*}
+		else
+		{
+			arrow.SplitIntoStackMaxToInventoryLocationClient( il );
+		}*/
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeArrowToHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeArrowToHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..e08a639eeb81d8eafddb01b74e193d8c376d7f90
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeArrowToHands.c
@@ -0,0 +1,165 @@
+class ActionTakeArrowToHands: ActionInteractBase
+{
+	void ActionTakeArrowToHands()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS;
+		m_Text 				= "#take_to_hands";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTObject(UAMaxDistances.DEFAULT);
+	}	
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		if (!targetEntity || (targetEntity && targetEntity.IsManagingArrows() && !targetEntity.IsDamageDestroyed()))
+			return false;
+		
+		ArrowManagerBase arrowManager = targetEntity.GetArrowManager();
+		if (arrowManager)
+		{
+			ItemBase arrow = ItemBase.Cast(arrowManager.GetFirstArrow());
+			if (arrow && !arrow.IsSetForDeletion())
+			{
+				if (player.GetInventory().CanAddEntityIntoHands(arrow))
+					return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override Object GetDisplayInteractObject(PlayerBase player, ActionTarget target)
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		if (!targetEntity || (targetEntity && targetEntity.IsManagingArrows() && !targetEntity.IsDamageDestroyed()))
+			return null;
+		
+		ArrowManagerBase arrowManager = targetEntity.GetArrowManager();
+		if (arrowManager)
+		{
+			return arrowManager.GetFirstArrow();
+		}
+		
+		return null;
+	}
+	
+	override bool CanContinue(ActionData action_data)
+	{
+		return true;
+	}
+	
+	override bool InventoryReservation(ActionData action_data)
+	{
+		bool success = true;
+		
+		InventoryLocation il = new InventoryLocation();
+		
+		EntityAI targetEntity;
+		if (EntityAI.CastTo(targetEntity, action_data.m_Target.GetObject()))
+		{
+			ArrowManagerBase arrowManager = targetEntity.GetArrowManager();
+			if (arrowManager)
+			{
+				ItemBase targetArrow = ItemBase.Cast(arrowManager.GetFirstArrow());
+				if (targetArrow)
+				{
+					il.SetHands(action_data.m_Player,targetArrow);
+					if (action_data.m_Player.GetInventory().HasInventoryReservation(targetArrow, il))
+					{
+						success = false;
+					}
+					else
+					{
+						action_data.m_Player.GetInventory().AddInventoryReservationEx(targetArrow, il, GameInventory.c_InventoryReservationTimeoutMS);
+					}
+				}
+			}
+		}	
+		
+		if (success)
+		{
+			if (il)
+				action_data.m_ReservedInventoryLocations.Insert(il);
+		}
+		
+		return success;
+	}
+	
+	
+	override void OnExecute(ActionData action_data)
+	{
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			return;
+	
+		InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);
+		
+		ItemBase arrow = ItemBase.Cast(il.GetItem());
+		ClearInventoryReservationEx(action_data);
+		
+		float stackable = arrow.GetTargetQuantityMax(-1);
+		
+		if (stackable == 0 || stackable >= arrow.GetQuantity())
+		{
+			action_data.m_Player.PredictiveTakeEntityToHands(arrow);
+		}
+		else
+		{
+			arrow.SplitIntoStackMaxToInventoryLocationClient(il);
+		}
+	}
+	
+	override void CreateAndSetupActionCallback(ActionData action_data)
+	{
+		EntityAI target = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (!target)
+			return;
+		
+		ActionBaseCB callback;
+		
+		if (target.IsHeavyBehaviour())
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(), DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			if (action_data.m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT))
+			{
+				Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(m_CommandUID,GetCallbackClassTypename()));
+			}
+			else
+			{
+				Class.CastTo(callback, action_data.m_Player.StartCommand_Action(m_CommandUIDProne,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_PRONE));
+			}
+		}
+
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+	
+		
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeFireplaceFromBarrel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeFireplaceFromBarrel.c
new file mode 100644
index 0000000000000000000000000000000000000000..37be3b9ff4bd2d53981189d482aa26e465b13a8e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeFireplaceFromBarrel.c
@@ -0,0 +1,86 @@
+class ActionTakeFireplaceFromBarrel: ActionInteractBase
+{
+	void ActionTakeFireplaceFromBarrel()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#take_fireplace";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		
+		if ( target_object && target_object.IsFireplace() )
+		{
+			BarrelHoles_ColorBase fireplace_barrel = BarrelHoles_ColorBase.Cast( target_object );
+			
+			//check barrel fireplace state
+			if ( fireplace_barrel && fireplace_barrel.IsOpen() && !fireplace_barrel.HasAshes() && !fireplace_barrel.IsBurning() )
+			{
+				//check cargo and attachments
+				if ( fireplace_barrel.IsCargoEmpty() && fireplace_barrel.GetInventory().AttachmentCount() > 0 )
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		BarrelHoles_ColorBase fireplace_barrel = BarrelHoles_ColorBase.Cast( target_object );
+
+		string newTypeName = "Fireplace";		
+		InventoryLocation targetIL = new InventoryLocation;
+		bool found = action_data.m_Player.GetInventory().FindFirstFreeLocationForNewEntity( newTypeName, FindInventoryLocationType.ANY, targetIL );
+		if ( found )
+		{
+			// allow action only if there is place in inventory
+			auto lambda = TakeFireplaceFromBarrelLambda( fireplace_barrel, newTypeName, action_data.m_Player );
+			lambda.OverrideNewLocation( targetIL );
+			action_data.m_Player.ServerReplaceItemWithNew( lambda );
+		}
+	}
+}
+
+class TakeFireplaceFromBarrelLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+
+	void TakeFireplaceFromBarrelLambda ( EntityAI old_item, string new_item_type, PlayerBase player )
+	{
+		m_Player = player;
+	}
+	
+	override protected void RemoveOldItemFromLocation ()
+	{
+		// intentional no-operation
+		m_RemoveFromLocationPassed = true; // but indicate the operation to be success
+	}
+	override protected void UndoRemoveOldItemFromLocation ()
+	{
+		// undo nothing
+	}
+
+	override void CopyOldPropertiesToNew( notnull EntityAI old_item, EntityAI new_item )
+	{
+		super.CopyOldPropertiesToNew( old_item, new_item );
+
+		MiscGameplayFunctions.TransferInventory(old_item, new_item, m_Player);		
+	}
+	
+	override protected void DeleteOldEntity ()
+	{
+		// intentional no-operation
+	}
+	
+	override protected void CreateNetworkObjectInfo (EntityAI new_item)
+	{
+		super.CreateNetworkObjectInfo(new_item);
+		GetGame().RemoteObjectTreeCreate(m_OldItem); // re-create network for old item 
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeFireplaceIndoor.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeFireplaceIndoor.c
new file mode 100644
index 0000000000000000000000000000000000000000..9592857f509ee1a8d8b43b9be9ef174d6cf28fb3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeFireplaceIndoor.c
@@ -0,0 +1,64 @@
+class ActionTakeFireplaceIndoor: ActionInteractBase
+{
+	string m_NewItemTypeName = "Fireplace";
+
+	void ActionTakeFireplaceIndoor()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#take_fireplace";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		
+		//empty hands	--interact action base condition
+		if ( target_object && target_object.IsFireplace() )
+		{
+			FireplaceIndoor fireplace_indoor = FireplaceIndoor.Cast( target_object );
+	
+			if ( fireplace_indoor && !fireplace_indoor.HasAshes() && !fireplace_indoor.IsBurning() && fireplace_indoor.IsCargoEmpty() && !fireplace_indoor.DirectCookingSlotsInUse() )
+			{
+				InventoryLocation targetIL = new InventoryLocation;
+				bool found = player.GetInventory().FindFirstFreeLocationForNewEntity( m_NewItemTypeName, FindInventoryLocationType.ANY, targetIL );
+				return found;
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		FireplaceIndoor fireplace_indoor = FireplaceIndoor.Cast( target_object );
+		
+		TakeFireplaceFromIndoorLambda lambda( fireplace_indoor, m_NewItemTypeName, action_data.m_Player );
+		InventoryLocation targetIL = new InventoryLocation;
+		bool found = action_data.m_Player.GetInventory().FindFirstFreeLocationForNewEntity( m_NewItemTypeName, FindInventoryLocationType.ANY, targetIL );
+		if ( found )
+		{
+			// allow action only if there is place in inventory
+			lambda.OverrideNewLocation( targetIL );
+			action_data.m_Player.ServerReplaceItemWithNew( lambda );
+		}
+	}
+}
+
+class TakeFireplaceFromIndoorLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+
+	void TakeFireplaceFromIndoorLambda ( EntityAI old_item, string new_item_type, PlayerBase player )
+	{
+		m_Player = player;
+	}
+
+	override void CopyOldPropertiesToNew( notnull EntityAI old_item, EntityAI new_item )
+	{
+		super.CopyOldPropertiesToNew( old_item, new_item );
+
+		MiscGameplayFunctions.TransferInventory(old_item, new_item, m_Player);		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeHybridAttachment.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeHybridAttachment.c
new file mode 100644
index 0000000000000000000000000000000000000000..6ae3ca6933d66ffcb9dd33e4703ce637135346a8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeHybridAttachment.c
@@ -0,0 +1,146 @@
+
+class ActionTakeHybridAttachment: ActionInteractBase
+{
+	string m_ItemName = "";
+
+	void ActionTakeHybridAttachment()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_INVENTORY;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_INVENTORY;
+		m_Text = "#take";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI tgt_entity = EntityAI.Cast( target.GetObject() );
+		
+		if ( tgt_entity && BaseBuildingBase.Cast(tgt_entity) &&!tgt_entity.IsBeingPlaced() )
+		{
+			string component_name = tgt_entity.GetActionComponentName( target.GetComponentIndex() );
+			
+			/*if (!tgt_entity.GetInventory().HasInventorySlot(InventorySlots.GetSlotIdFromString(component_name)))
+				return false;*/
+			
+			ItemBase attachment = ItemBase.Cast(tgt_entity.FindAttachmentBySlotName(component_name));
+			
+			if ( attachment && player.GetInventory().CanAddEntityIntoInventory(attachment) && attachment.IsTakeable() )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+	
+	override bool InventoryReservation(ActionData action_data)
+	{
+		bool success = true;
+		
+		InventoryLocation il = new InventoryLocation;
+		
+		EntityAI tgt_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		string component_name = tgt_entity.GetActionComponentName( action_data.m_Target.GetComponentIndex() );
+		ItemBase attachment;
+		
+		if ( tgt_entity && ItemBase.CastTo(attachment, tgt_entity.FindAttachmentBySlotName(component_name)) )
+		{
+			action_data.m_Player.GetInventory().FindFreeLocationFor( attachment , FindInventoryLocationType.ANY, il );
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( attachment, il) )
+			{
+				success = false;
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( attachment, il, GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}	
+		
+		if ( success )
+		{
+			if( il )
+				action_data.m_ReservedInventoryLocations.Insert(il);
+		}
+		
+		return success;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		//Debug.Log("[Action DEBUG] Start time stamp: " + action_data.m_Player.GetSimulationTimeStamp());
+		EntityAI tgt_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		string component_name = tgt_entity.GetActionComponentName( action_data.m_Target.GetComponentIndex() );
+		ItemBase attachment;
+		
+		if ( tgt_entity && ItemBase.CastTo(attachment, tgt_entity.FindAttachmentBySlotName(component_name)) )
+		{
+			InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);	
+			InventoryLocation targetInventoryLocation = new InventoryLocation;
+			attachment.GetInventory().GetCurrentInventoryLocation(targetInventoryLocation);
+			ClearInventoryReservationEx(action_data);
+			//SplitItemUtils.TakeOrSplitToInventoryLocation( action_data.m_Player, il );
+			
+			float stackable = attachment.GetTargetQuantityMax(il.GetSlot());
+			
+			if( stackable == 0 || stackable >= attachment.GetQuantity() )
+			{
+				action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+			}
+			else
+			{
+				attachment.SplitIntoStackMaxToInventoryLocationClient( il );
+			}
+		}
+		//action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		//Debug.Log("[Action DEBUG] Start time stamp: " + action_data.m_Player.GetSimulationTimeStamp());
+		EntityAI tgt_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		string component_name = tgt_entity.GetActionComponentName( action_data.m_Target.GetComponentIndex() );
+		ItemBase attachment;
+		
+		if ( tgt_entity && ItemBase.CastTo(attachment, tgt_entity.FindAttachmentBySlotName(component_name)) )
+		{
+			InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);
+			InventoryLocation targetInventoryLocation = new InventoryLocation;
+			attachment.GetInventory().GetCurrentInventoryLocation(targetInventoryLocation);
+			ClearInventoryReservationEx(action_data);
+			//SplitItemUtils.TakeOrSplitToInventoryLocation( action_data.m_Player, il );
+			//action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+			float stackable = attachment.GetTargetQuantityMax(il.GetSlot());
+			
+			if( stackable == 0 || stackable >= attachment.GetQuantity() )
+			{
+				action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+			}
+			else
+			{
+				attachment.SplitIntoStackMaxToInventoryLocationClient( il );
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeHybridAttachmentToHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeHybridAttachmentToHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..5243a09377faddb2e1f647a061d1595620874d59
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeHybridAttachmentToHands.c
@@ -0,0 +1,126 @@
+class ActionTakeHybridAttachmentToHands: ActionInteractBase
+{
+	void ActionTakeHybridAttachmentToHands()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS;
+		m_Text = "#take_to_hands";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINotPresent;
+		m_ConditionTarget = new CCTCursor;
+	}	
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI tgt_entity = EntityAI.Cast( target.GetObject() );
+		
+		if ( tgt_entity && BaseBuildingBase.Cast(tgt_entity) &&!tgt_entity.IsBeingPlaced() /*&& BaseBuildingBase.Cast(tgt_entity).IsPlayerInside(player,"")*/ )
+		{
+			string component_name = tgt_entity.GetActionComponentName( target.GetComponentIndex() );
+			
+			ItemBase attachment = ItemBase.Cast(tgt_entity.FindAttachmentBySlotName(component_name));
+			
+			if ( attachment && player.GetInventory().CanAddEntityIntoHands(attachment) && attachment.IsTakeable() )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool CanContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		OnExecuteImpl(action_data);
+	}
+	
+	protected void OnExecuteImpl( ActionData action_data )
+	{
+		EntityAI tgt_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		string component_name = tgt_entity.GetActionComponentName( action_data.m_Target.GetComponentIndex() );
+		ItemBase attachment;
+		
+		if ( tgt_entity && ItemBase.CastTo(attachment, tgt_entity.FindAttachmentBySlotName(component_name)) )
+		{
+			ClearInventoryReservationEx(action_data);
+			float stackable = attachment.GetTargetQuantityMax(-1);
+			
+			if( stackable == 0 || stackable >= attachment.GetQuantity() )
+			{
+				//take to hands
+				action_data.m_Player.PredictiveTakeEntityToHands( attachment );
+			}
+			else if( stackable != 0 && stackable < attachment.GetQuantity() )
+			{
+				//split and take to hands
+				attachment.SplitIntoStackMaxHandsClient( action_data.m_Player );
+			}
+		}
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return; // multiplayer handled on client side via OnExecuteClient
+		else
+			OnExecuteImpl(action_data); // single player
+	}
+	
+	override void CreateAndSetupActionCallback( ActionData action_data )
+	{
+		EntityAI tgt_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		string component_name = tgt_entity.GetActionComponentName( action_data.m_Target.GetComponentIndex() );
+		ItemBase attachment;
+		bool heavy_item = false;
+		
+		if ( tgt_entity && ItemBase.CastTo(attachment, tgt_entity.FindAttachmentBySlotName(component_name)) )
+		{
+			ActionBaseCB callback;
+			if ( attachment && attachment.ConfigIsExisting("heavyItem") && attachment.ConfigGetBool("heavyItem") )
+			{
+				heavy_item = true;
+			}
+		}
+		
+		if( heavy_item )
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			if( action_data.m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT) )
+			{
+				Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS,GetCallbackClassTypename()));
+			}
+			else
+			{
+				Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_PRONE));
+			}
+		}
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeItem.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..edacc76466730579fa412cb8e3e09f0bdc95f3cc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeItem.c
@@ -0,0 +1,174 @@
+/*class ActionTakeItemReciveData : ActionReciveData
+{
+	ref InventoryLocation		m_InventoryLocation;
+}*/
+
+class ActionTakeItem: ActionInteractBase
+{
+	string m_ItemName = "";
+
+	void ActionTakeItem()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_INVENTORY;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_INVENTORY;
+		m_Text = "#take";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTObject(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase tgt_item = ItemBase.Cast( target.GetObject() );
+		if ( tgt_item && !tgt_item.IsTakeable() ) return false;
+		if ( tgt_item && tgt_item.IsBeingPlaced() ) return false;
+		
+		EntityAI tgt_parent = EntityAI.Cast( target.GetParent() );
+		EntityAI tgt_entity = EntityAI.Cast( target.GetObject() );
+		
+		if ( tgt_entity && (!tgt_parent || BaseBuildingBase.Cast(tgt_parent)) )
+		{
+			if ( tgt_entity && tgt_entity.IsItemBase() && player.GetInventory().CanAddEntityIntoInventory(tgt_entity) && tgt_entity.GetHierarchyRootPlayer() != player )
+			{
+				if ( tgt_parent && (!tgt_item.CanDetachAttachment(tgt_parent) || !tgt_parent.CanReleaseAttachment(tgt_item)) )
+					return false;
+				
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+	
+	/*override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);
+		il.WriteToContext(ctx);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if(!action_recive_data)
+		{
+			action_recive_data = new ActionTakeItemReciveData;
+		}
+		
+		if(super.ReadFromContext(ctx, action_recive_data))
+		{
+			ActionTakeItemReciveData recive_data_ti = ActionTakeItemReciveData.Cast(action_recive_data);
+			recive_data_ti.m_InventoryLocation = new InventoryLocation;
+			if(recive_data_ti.m_InventoryLocation.ReadFromContext(ctx))
+			{
+				return true;
+			}
+		}
+			
+		return false;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+		ActionTakeItemReciveData recive_data_ti = ActionTakeItemReciveData.Cast(action_recive_data);
+		action_data.m_ReservedInventoryLocations.Insert(recive_data_ti.m_InventoryLocation);
+	} */
+	
+	
+	
+	override bool InventoryReservation(ActionData action_data)
+	{
+		bool success = true;
+		
+		InventoryLocation il = new InventoryLocation;
+		
+		ItemBase targetItem;
+		if ( ItemBase.CastTo(targetItem, action_data.m_Target.GetObject()) )
+		{
+			action_data.m_Player.GetInventory().FindFreeLocationFor( targetItem , FindInventoryLocationType.ANY, il );
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( targetItem, il) )
+			{
+				success = false;
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( targetItem, il, GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}	
+		
+		if ( success )
+		{
+			if( il )
+				action_data.m_ReservedInventoryLocations.Insert(il);
+		}
+		
+		return success;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		//Debug.Log("[Action DEBUG] Start time stamp: " + action_data.m_Player.GetSimulationTimeStamp());
+		ItemBase ntarget = ItemBase.Cast(action_data.m_Target.GetObject());	
+		InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);	
+		InventoryLocation targetInventoryLocation = new InventoryLocation;
+		ntarget.GetInventory().GetCurrentInventoryLocation(targetInventoryLocation);
+		
+		//SplitItemUtils.TakeOrSplitToInventoryLocation( action_data.m_Player, il );
+		
+		float stackable = ntarget.GetTargetQuantityMax(il.GetSlot());
+		
+		if( stackable == 0 || stackable >= ntarget.GetQuantity() )
+		{
+			action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+		}
+		else
+		{
+			ClearInventoryReservationEx(action_data);
+			ntarget.SplitIntoStackMaxToInventoryLocationClient( il );
+		}
+		
+		//action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		//Debug.Log("[Action DEBUG] Start time stamp: " + action_data.m_Player.GetSimulationTimeStamp());
+		ItemBase ntarget = ItemBase.Cast(action_data.m_Target.GetObject());
+		InventoryLocation il = action_data.m_ReservedInventoryLocations.Get(0);
+		InventoryLocation targetInventoryLocation = new InventoryLocation;
+		ntarget.GetInventory().GetCurrentInventoryLocation(targetInventoryLocation);
+		
+		//SplitItemUtils.TakeOrSplitToInventoryLocation( action_data.m_Player, il );
+		//action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+		float stackable = ntarget.GetTargetQuantityMax(il.GetSlot());
+		
+		if( stackable == 0 || stackable >= ntarget.GetQuantity() )
+		{
+			action_data.m_Player.PredictiveTakeToDst(targetInventoryLocation, il);
+		}
+		else
+		{
+			ntarget.SplitIntoStackMaxToInventoryLocationClient( il );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeItemToHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeItemToHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..d2955d2c96fc9f83b5cc247482faaddef6fc17e6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeItemToHands.c
@@ -0,0 +1,233 @@
+class ActionTakeItemToHands: ActionInteractBase
+{
+	void ActionTakeItemToHands()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS;
+		m_Text 				= "#take_to_hands";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTObject(UAMaxDistances.DEFAULT);
+	}	
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		if (!targetItem)
+			return false;
+		
+		EntityAI targetParent = EntityAI.Cast(targetItem.GetHierarchyParent());
+		if (!targetItem.IsTakeable() || targetItem.IsBeingPlaced() || targetItem.IsSetForDeletion() || ( targetItem.GetHierarchyParent() && !BaseBuildingBase.Cast(targetParent) ) || ((targetParent && !targetItem.CanDetachAttachment(targetParent)) || (targetParent && !targetParent.CanReleaseAttachment(targetItem))))
+			return false;
+		
+		return player.GetInventory().CanAddEntityIntoHands(targetItem);
+	}
+	
+	override bool CanContinue(ActionData action_data)
+	{
+		return true;
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		super.OnEndServer(action_data);
+		
+		EntityAI takenEntity = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (takenEntity && takenEntity.GetCompEM() && takenEntity.IsElectricAppliance())
+			takenEntity.GetCompEM().UnplugThis();
+	}
+	
+	override void OnExecute(ActionData action_data)
+	{
+		if (GetGame().IsDedicatedServer())
+			return;
+	
+		ItemBase ntarget = ItemBase.Cast(action_data.m_Target.GetObject());
+		ClearInventoryReservationEx(action_data);
+		
+		float stackable = ntarget.GetTargetQuantityMax(-1);
+		
+		if (stackable == 0 || stackable >= ntarget.GetQuantity())
+		{
+			action_data.m_Player.PredictiveTakeEntityToHands(ntarget);
+		}
+		else
+		{
+			InventoryLocation il = new InventoryLocation();
+			il.SetHands(action_data.m_Player, ntarget);
+			ntarget.SplitIntoStackMaxToInventoryLocationClient(il);
+		}
+	}
+	
+	override void CreateAndSetupActionCallback(ActionData action_data)
+	{
+		EntityAI target = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (!target)
+			return;
+		
+		ActionBaseCB callback;
+		
+		if (target.IsHeavyBehaviour())
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(), DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			if (action_data.m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT))
+			{
+				Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(m_CommandUID,GetCallbackClassTypename()));
+			}
+			else
+			{
+				Class.CastTo(callback, action_data.m_Player.StartCommand_Action(m_CommandUIDProne,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_PRONE));
+			}
+		}
+
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+	
+		
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+}
+
+class ActionSwapItemToHands: ActionTakeItemToHands
+{
+	bool m_Executable;
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		if (!targetItem || !targetItem.IsTakeable() || targetItem.IsBeingPlaced())
+			return false;
+		
+		return player.GetInventory().CanSwapEntitiesEx(targetItem,item);
+	}
+	
+	override bool UseMainItem()
+	{
+		return true;
+	}
+	
+	override bool MainItemAlwaysInHands()
+	{
+		return true;
+	}
+	
+	override void CreateAndSetupActionCallback(ActionData action_data)
+	{
+		EntityAI target = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (!target)
+			return;
+		
+		ActionBaseCB callback;
+		
+		if (target.IsHeavyBehaviour())
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			return;
+		}
+
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+		
+		bool b1 = action_data.m_MainItem.ConfigGetString("physLayer") == "item_large";
+		action_data.m_MainItem.m_ThrowItemOnDrop = b1;
+		
+		EntityAI object = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (!object || !object.IsHeavyBehaviour())
+		{
+			action_data.m_Player.GetActionManager().Interrupt();
+		}
+		else
+			m_Executable = true;
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		if (!m_Executable)
+			return;
+		
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		PerformSwap(action_data);
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		if (!m_Executable)
+			return;
+		
+		PerformSwap(action_data);
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		if (m_Executable)
+		{
+			m_Executable = false;
+			return;
+		}
+		
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		PerformSwap(action_data);
+	}
+	
+	override void OnEndClient( ActionData action_data )
+	{
+		if (m_Executable)
+		{
+			m_Executable = false;
+			return;
+		}
+		
+		PerformSwap(action_data);
+	}
+	
+	void PerformSwap( ActionData action_data )
+	{
+		EntityAI ntarget = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (action_data.m_Player)
+		{
+			InventoryMode invMode = InventoryMode.PREDICTIVE;
+			if (action_data.m_Player.NeedInventoryJunctureFromServer(ntarget, ntarget.GetHierarchyParent(), action_data.m_Player))
+				invMode = InventoryMode.JUNCTURE;
+			
+			action_data.m_Player.TakeEntityToHandsImpl(invMode, ntarget);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeMaterialToHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeMaterialToHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..5367ddb7cee2a82cf843fc8f8e5d4ceba259bd80
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeMaterialToHands.c
@@ -0,0 +1,140 @@
+class ActionTakeMaterialToHands: ActionInteractBase
+{
+	void ActionTakeMaterialToHands()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS;
+		m_Text = "#take";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINotPresent;
+		m_ConditionTarget = new CCTCursor;
+	}	
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ConstructionActionData construction_action_data = player.GetConstructionActionData();
+		EntityAI attachment = construction_action_data.GetActualAttachmentToDetach();
+			
+		if ( attachment )
+		{
+			m_Text = "#take " + attachment.GetDisplayName();
+		}
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		if ( target_entity && target_entity.CanUseConstruction() )
+		{
+			BaseBuildingBase base_building = BaseBuildingBase.Cast( target_entity );
+			if(!base_building.IsPlayerInside(player,""))
+				return false;
+			
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			string main_part_name = target_entity.GetActionComponentName( target.GetComponentIndex() );
+			//Print(main_part_name);
+			
+			if ( GetGame().IsMultiplayer() || GetGame().IsServer() )
+			{
+				construction_action_data.RefreshAttachmentsToDetach( target_entity, main_part_name );
+			}
+			EntityAI attachment = construction_action_data.GetActualAttachmentToDetach();	
+			
+			if ( attachment && player.GetInventory().CanAddEntityIntoHands( attachment ) && attachment.GetHierarchyRootPlayer() != player )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool CanContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		OnExecuteImpl(action_data);
+	}
+	
+	protected void OnExecuteImpl( ActionData action_data )
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		ItemBase item_target = ItemBase.Cast( construction_action_data.GetActualAttachmentToDetach() );
+		if( item_target )
+		{
+			float stackable = item_target.GetTargetQuantityMax();
+			
+			if( stackable == 0 || stackable >= item_target.GetQuantity() )
+			{
+				//take to hands
+				action_data.m_Player.PredictiveTakeEntityToHands( item_target );
+			}
+			else if( stackable != 0 && stackable < item_target.GetQuantity() )
+			{
+				//split and take to hands
+				item_target.SplitIntoStackMaxHandsClient( action_data.m_Player );
+			}
+		}
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return; // multiplayer handled on client side via OnExecuteClient
+		else
+			OnExecuteImpl(action_data); // single player
+	}
+	
+	override void CreateAndSetupActionCallback( ActionData action_data )
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		EntityAI target = construction_action_data.GetActualAttachmentToDetach();
+		
+		bool heavy_item = false;
+		ActionBaseCB callback;
+		if ( target && target.ConfigIsExisting("heavyItem") && target.ConfigGetBool("heavyItem") )
+		{
+			heavy_item = true;
+		}
+			
+		if( heavy_item )
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_ERECT));
+		}
+		else
+		{
+			if( action_data.m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT) )
+			{
+				Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS,GetCallbackClassTypename()));
+			}
+			else
+			{
+				Class.CastTo(callback, action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS,GetCallbackClassTypename(),DayZPlayerConstants.STANCEMASK_PRONE));
+			}
+		}
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent();
+		action_data.m_Callback = callback;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeOvenIndoor.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeOvenIndoor.c
new file mode 100644
index 0000000000000000000000000000000000000000..641c730088c27e8393b0346420af1e91f2de21e7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTakeOvenIndoor.c
@@ -0,0 +1,64 @@
+class ActionTakeOvenIndoor: ActionInteractBase
+{
+	string m_NewItemTypeName = "Fireplace";
+
+	void ActionTakeOvenIndoor()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#take_fireplace";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		
+		//empty hands	--interact action base condition
+		if ( target_object && target_object.IsFireplace() )
+		{
+			OvenIndoor fireplace_indoor = OvenIndoor.Cast( target_object );
+	
+			if ( fireplace_indoor && !fireplace_indoor.HasAshes() && !fireplace_indoor.IsBurning() && fireplace_indoor.IsCargoEmpty() && !fireplace_indoor.DirectCookingSlotsInUse() )
+			{
+				InventoryLocation targetIL = new InventoryLocation;
+				bool found = player.GetInventory().FindFirstFreeLocationForNewEntity( m_NewItemTypeName, FindInventoryLocationType.ANY, targetIL );
+				return found;
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		OvenIndoor fireplace_indoor = OvenIndoor.Cast( target_object );
+		
+		TakeOvenFromIndoorLambda lambda( fireplace_indoor, m_NewItemTypeName, action_data.m_Player );
+		InventoryLocation targetIL = new InventoryLocation;
+		bool found = action_data.m_Player.GetInventory().FindFirstFreeLocationForNewEntity( m_NewItemTypeName, FindInventoryLocationType.ANY, targetIL );
+		if ( found )
+		{
+			// allow action only if there is place in inventory
+			lambda.OverrideNewLocation( targetIL );
+			action_data.m_Player.ServerReplaceItemWithNew( lambda );
+		}
+	}
+}
+
+class TakeOvenFromIndoorLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+
+	void TakeOvenFromIndoorLambda ( EntityAI old_item, string new_item_type, PlayerBase player )
+	{
+		m_Player = player;
+	}
+
+	override void CopyOldPropertiesToNew( notnull EntityAI old_item, EntityAI new_item )
+	{
+		super.CopyOldPropertiesToNew( old_item, new_item );
+
+		MiscGameplayFunctions.TransferInventory(old_item, new_item, m_Player);		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionToggleTentOpen.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionToggleTentOpen.c
new file mode 100644
index 0000000000000000000000000000000000000000..c550409f524d788331ce541dd79abc1ade8f2e07
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionToggleTentOpen.c
@@ -0,0 +1,86 @@
+class ActionToggleTentOpen: ActionInteractBase
+{
+	void ActionToggleTentOpen()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_Text = "#toggle_opening";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursorParent(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool IsUsingProxies()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object targetObject = target.GetObject();
+		Object targetParent = target.GetParent();
+
+		if ( player && targetObject && targetParent )
+		{
+			if ( targetParent.IsInherited(TentBase) ) 
+			{
+				array<string> selections = new array<string>;
+				targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+				TentBase tent = TentBase.Cast( targetParent );
+				
+				for (int s = 0; s < selections.Count(); s++)
+				{
+					if ( tent.CanToggleAnimations(selections[s]) )
+					{
+						//Print("nazov selekcie: " + selections[s]);
+						return true;
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		Object targetParent = action_data.m_Target.GetParent();
+
+		if ( targetParent && targetParent.IsInherited(TentBase) ) 
+		{
+			array<string> selections = new array<string>;
+			targetObject.GetActionComponentNameList(action_data.m_Target.GetComponentIndex(), selections);
+			
+			TentBase tent = TentBase.Cast( targetParent );
+			for ( int s = 0; s < selections.Count(); s++)
+			{
+				if ( tent.CanToggleAnimations(selections[s]) )
+				{
+					tent.ToggleAnimation( selections[s] );
+				}
+			}
+			
+			//regenerate pathgraph
+			tent.SetAffectPathgraph( true, false );
+			
+			if ( tent.CanAffectPathgraph() )
+			{
+				//Start update
+				tent.RegenerateNavmesh();
+			}
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		Object target_object = action_data.m_Target.GetObject();
+		TentBase ntarget = TentBase.Cast( target_object );
+		if( ntarget )
+		{
+			ntarget.SoundSynchRemoteReset();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTuneFrequencyOnGround.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTuneFrequencyOnGround.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a4d5244aa1e56dd8edd802d5f60336de3a4162a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTuneFrequencyOnGround.c
@@ -0,0 +1,52 @@
+class ActionTuneFrequencyOnGround : ActionInteractBase
+{
+	string m_RadioFreq;
+
+	void ActionTuneFrequencyOnGround()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_RadioFreq 		= string.Empty;
+		m_Text = "#tune_frequency";
+	}
+
+	override void OnActionInfoUpdate( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		Land_Radio_PanelBig transmitter = Land_Radio_PanelBig.Cast( target.GetObject() );
+		m_Text = "#tune_frequency | " + transmitter.GetTunedFrequency().ToString() + " MHz";
+	}
+
+	override typename GetInputType()
+	{
+		return ContinuousInteractActionInput;
+	}
+
+	override bool HasProgress()
+	{
+		return false;
+	}
+		
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		Land_Radio_PanelBig transmitter = Land_Radio_PanelBig.Cast( target_object );
+		string selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+		
+		if ( transmitter.GetCompEM().IsWorking() && selection == "control_panel" )
+		{
+			//transmitter.DisplayRadioInfo( transmitter.GetTunedFrequency().ToString(), player );
+			//m_RadioFreq = transmitter.GetTunedFrequency().ToString();
+			
+			return true;
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Land_Radio_PanelBig transmitter = Land_Radio_PanelBig.Cast( action_data.m_Target.GetObject() );
+		transmitter.SetNextFrequency( action_data.m_Player );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffPowerGenerator.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffPowerGenerator.c
new file mode 100644
index 0000000000000000000000000000000000000000..a2ce2cac062baf169b473476c3628c664f9f8031
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffPowerGenerator.c
@@ -0,0 +1,34 @@
+class ActionTurnOffPowerGenerator: ActionInteractBase
+{	
+	void ActionTurnOffPowerGenerator()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_Text = "#switch_off";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		ItemBase target_IB = ItemBase.Cast( targetObject );
+		
+		if ( target_IB.HasEnergyManager()  &&  target_IB.GetCompEM().CanSwitchOff() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		if ( targetObject )
+		{
+			ItemBase target_IB = ItemBase.Cast( targetObject );
+			target_IB.GetCompEM().SwitchOff();
+			target_IB.GetCompEM().InteractBranch(target_IB);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffSpotlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffSpotlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..a47cf559ddcb7c211ed9ae678f177c647b599fb2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffSpotlight.c
@@ -0,0 +1,31 @@
+class ActionTurnOffSpotlight: ActionInteractBase
+{	
+	void ActionTurnOffSpotlight()
+	{
+		m_Text = "#switch_off";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		string selection = targetObject.GetActionComponentName(target.GetComponentIndex());
+		ItemBase target_IB = ItemBase.Cast( target.GetObject() );
+		
+		if ( selection == Spotlight.SEL_REFLECTOR_COMP_U  &&  target_IB.HasEnergyManager()  &&  target_IB.GetCompEM().CanSwitchOff() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		if ( targetObject )
+		{
+			EntityAI target_EAI = EntityAI.Cast( targetObject );
+			target_EAI.GetCompEM().SwitchOff();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffTransmitterOnGround.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffTransmitterOnGround.c
new file mode 100644
index 0000000000000000000000000000000000000000..e58f0ce0f32eac2e11b4a9b7a9a206c8649f0275
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffTransmitterOnGround.c
@@ -0,0 +1,35 @@
+class ActionTurnOffTransmitterOnGround: ActionInteractBase
+{
+	void ActionTurnOffTransmitterOnGround()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#turn_off";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object target_object = target.GetObject();
+		if ( player && target_object && target_object.IsStaticTransmitter() )
+		{
+			EntityAI target_entity = EntityAI.Cast( target_object );
+			string selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+			
+			if ( target_entity.HasEnergyManager() && target_entity.GetCompEM().CanSwitchOff() && selection == "power_panel" )
+			{
+				AdvancedCommunication transmitter = AdvancedCommunication.Cast( target_object );
+				//transmitter.DisplayRadioInfo( "ON", player );
+				
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		AdvancedCommunication transmitter = AdvancedCommunication.Cast( action_data.m_Target.GetObject() );
+		transmitter.TurnOffTransmitter();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffWhileOnGround.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffWhileOnGround.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc79132f98e1d9a3e4486bc9e5cc507fa5760f41
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOffWhileOnGround.c
@@ -0,0 +1,35 @@
+class ActionTurnOffWhileOnGround: ActionInteractBase
+{	
+	void ActionTurnOffWhileOnGround()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#switch_off";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		
+		InventoryLocation loc = new InventoryLocation;
+		target_entity.GetInventory().GetCurrentInventoryLocation(loc);
+		
+		return ( player.IsAlive() && target_entity.HasEnergyManager() && target_entity.GetCompEM().CanSwitchOff()) && loc.GetType() == InventoryLocationType.GROUND );
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		EntityAI target_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		
+		if ( target_entity.GetCompEM().CanSwitchOff() )
+		{
+			target_entity.GetCompEM().SwitchOff();
+			
+			InformPlayers( action_data.m_Player, action_data.m_Target, UA_FINISHED );	//Success
+		}
+		else
+		{
+			InformPlayers( action_data.m_Player, action_data.m_Target, UA_FAILED );		//Already turned off
+		}	
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnPowerGenerator.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnPowerGenerator.c
new file mode 100644
index 0000000000000000000000000000000000000000..ecc13336a834f2d88136d7c0c2ffe913c1d3d5de
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnPowerGenerator.c
@@ -0,0 +1,34 @@
+class ActionTurnOnPowerGenerator: ActionInteractBase
+{	
+	void ActionTurnOnPowerGenerator()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_Text = "#switch_on";
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		PowerGeneratorBase pg = PowerGeneratorBase.Cast(target.GetObject());
+
+		if (pg)
+		{
+			if (pg.HasEnergyManager() && pg.GetCompEM().CanSwitchOn() && pg.HasSparkplug() && pg.GetCompEM().CanWork())
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		if (targetObject)
+		{
+			ItemBase target_IB = ItemBase.Cast(targetObject);
+			target_IB.GetCompEM().SwitchOn();
+			target_IB.GetCompEM().InteractBranch(target_IB);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnSpotlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnSpotlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..5df457b6a69278a1cc4bfdbf4d664d3b194ecdd8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnSpotlight.c
@@ -0,0 +1,38 @@
+class ActionTurnOnSpotlight: ActionInteractBase
+{	
+	void ActionTurnOnSpotlight()
+	{
+		m_Text = "#switch_on";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		ItemBase target_IB = ItemBase.Cast( targetObject );
+		
+		Spotlight s = Spotlight.Cast(target_IB);
+		
+		if (s  &&  s.IsFolded())
+				return false;
+		
+		int component_id = target.GetComponentIndex();
+		string selection = targetObject.GetActionComponentName(component_id);
+
+		if ( selection == Spotlight.SEL_REFLECTOR_COMP_U  &&  target_IB.HasEnergyManager()  &&  target_IB.GetCompEM().CanSwitchOn() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		if (targetObject)
+		{
+			EntityAI target_EAI = EntityAI.Cast( targetObject );
+			target_EAI.GetCompEM().SwitchOn();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnTransmitterOnGround.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnTransmitterOnGround.c
new file mode 100644
index 0000000000000000000000000000000000000000..408a219cca93f69967a06be1140ad85b4f427157
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnTransmitterOnGround.c
@@ -0,0 +1,35 @@
+class ActionTurnOnTransmitterOnGround: ActionInteractBase
+{
+	void ActionTurnOnTransmitterOnGround()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#turn_on";
+	}
+		
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		if ( player && target_object && target_object.IsStaticTransmitter() )
+		{
+			EntityAI target_entity = EntityAI.Cast( target_object );
+			string selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+			
+			if ( target_entity.HasEnergyManager() && target_entity.GetCompEM().CanSwitchOn() && selection == "power_panel" )
+			{
+				AdvancedCommunication transmitter = AdvancedCommunication.Cast( target_object );
+				//transmitter.DisplayRadioInfo( "OFF", player );
+				
+				return true;
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{
+		AdvancedCommunication transmitter = AdvancedCommunication.Cast( action_data.m_Target.GetObject() );
+		transmitter.TurnOnTransmitter();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnWhileOnGround.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnWhileOnGround.c
new file mode 100644
index 0000000000000000000000000000000000000000..be4e379a3471d13e1f05b0d4ff4870122edc1e5e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionTurnOnWhileOnGround.c
@@ -0,0 +1,35 @@
+class ActionTurnOnWhileOnGround: ActionInteractBase
+{
+	void ActionTurnOnWhileOnGround()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#switch_on";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		
+		InventoryLocation loc = new InventoryLocation;
+		target_entity.GetInventory().GetCurrentInventoryLocation(loc);
+		
+		return ( player.IsAlive()  &&  target_entity.HasEnergyManager()  &&  target_entity.GetCompEM().CanSwitchOn() && target_entity.GetCompEM().CanWork() && loc.GetType() == InventoryLocationType.GROUND );
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		EntityAI target_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		
+		if ( target_entity.GetCompEM().CanWork() )
+		{
+			target_entity.GetCompEM().SwitchOn();
+			
+			InformPlayers( action_data.m_Player, action_data.m_Target, UA_FINISHED );	//Success
+		}
+		else
+		{
+			InformPlayers( action_data.m_Player, action_data.m_Target, UA_FAILED );		//No power
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUnplugThisByCord.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUnplugThisByCord.c
new file mode 100644
index 0000000000000000000000000000000000000000..2cefb3ad5c826643df7b1e343838fa572a18ef1d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUnplugThisByCord.c
@@ -0,0 +1,46 @@
+class ActionUnplugThisByCord : ActionInteractBase
+{
+	void ActionUnplugThisByCord()
+	{
+		m_Text = "#unplug_by_cord";
+	}
+
+	override bool HasProgress()
+	{
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		ItemBase targetItem = ItemBase.Cast(target.GetObject());
+		
+		if (targetItem && targetItem.HasEnergyManager())
+		{
+			string selection = targetItem.GetActionComponentName(target.GetComponentIndex());			
+			if (selection == ComponentEnergyManager.SEL_CORD_PLUGGED)
+			{
+				return true;
+			}
+			
+			// Special case for unfolded spotlight
+			if (selection == Spotlight.SEL_CORD_PLUGGED_U)
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{	
+		ItemBase targetItem = ItemBase.Cast(action_data.m_Target.GetObject());
+		targetItem.GetCompEM().UnplugThis();
+		
+		if (targetItem.IsInherited(Spotlight))
+		{
+			targetItem.HideSelection(Spotlight.SEL_CORD_PLUGGED_U);
+			targetItem.ShowSelection(Spotlight.SEL_CORD_FOLDED_U);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUseUndergroundLever.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUseUndergroundLever.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e9d5c052a817e72c9d6165c70f3ce4a00ea71b2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUseUndergroundLever.c
@@ -0,0 +1,35 @@
+class ActionUseUndergroundLever: ActionInteractBase
+{
+	void ActionUseUndergroundLever()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#use";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Land_Underground_Panel trgt = Land_Underground_Panel.Cast(target.GetObject());
+		
+		if ( !trgt ) 
+			return false;
+		
+		return (trgt.CanInteract());
+	}
+
+	override void OnStartServer( ActionData action_data )
+	{
+		Land_Underground_Panel target =  Land_Underground_Panel.Cast(action_data.m_Target.GetObject());
+		
+		if (!target)
+			return;
+		
+		target.Interact();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUseUndergroundPanel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUseUndergroundPanel.c
new file mode 100644
index 0000000000000000000000000000000000000000..54723810496c9a09bcbaaebf3d3d87d541c7cdaa
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionUseUndergroundPanel.c
@@ -0,0 +1,42 @@
+class ActionUseUndergroundPanel: ActionSingleUseBase
+{
+	void ActionUseUndergroundPanel()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#use";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (item.IsDamageDestroyed())
+			return false;
+		Land_Underground_Panel trgt = Land_Underground_Panel.Cast(target.GetObject());
+		
+		if ( !trgt ) 
+			return false;
+		
+		if (trgt.ClassName() != "Land_Underground_Panel")
+			return false;
+		
+		return (trgt.CanInteract());
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		Land_Underground_Panel target =  Land_Underground_Panel.Cast(action_data.m_Target.GetObject());
+		
+		if (!target)
+			return;
+		
+		target.Interact();
+		PunchedCard.Cast(action_data.m_MainItem).OnUse();
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionWashHandsWaterOne.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionWashHandsWaterOne.c
new file mode 100644
index 0000000000000000000000000000000000000000..96af5041cb0211daefe08fd40f7d0e964dcfa7e3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionWashHandsWaterOne.c
@@ -0,0 +1,40 @@
+class ActionWashHandsWaterOneCB : ActionInteractLoopBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAInteractLoop(UATimeSpent.WASH_HANDS);
+	}
+};
+
+class ActionWashHandsWaterOne extends ActionInteractLoopBase
+{
+	void ActionWashHandsWaterOne()
+	{
+		m_CallbackClass		= ActionWashHandsWaterOneCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_WASHHANDSPOND;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#wash_hands";
+	}
+
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTWaterSurface(UAMaxDistances.DEFAULT, UAWaterType.ALL);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		// Other conditions are in CCTWaterSurface
+		return ( GetGame().IsMultiplayer() && GetGame().IsServer() ) || ( player.HasBloodyHands() && !player.GetItemInHands() && !player.GetItemOnSlot("Gloves") );
+	}
+
+	override void OnEndServer( ActionData action_data )
+	{
+		if (action_data.m_State == UA_FINISHED)
+		{
+			PluginLifespan module_lifespan = PluginLifespan.Cast( GetPlugin( PluginLifespan ) );
+			module_lifespan.UpdateBloodyHandsVisibility( action_data.m_Player, false );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionWashHandsWellOne.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionWashHandsWellOne.c
new file mode 100644
index 0000000000000000000000000000000000000000..9c72005751f7f58752b321ff3a490dbfff266566
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/ActionWashHandsWellOne.c
@@ -0,0 +1,40 @@
+class ActionWashHandsWellOneCB : ActionInteractLoopBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAInteractLoop(UATimeSpent.WASH_HANDS);
+	}
+}
+
+class ActionWashHandsWellOne extends ActionInteractLoopBase
+{
+	void ActionWashHandsWellOne()
+	{
+		m_CallbackClass		= ActionWashHandsWellOneCB;
+		m_CommandUID		= DayZPlayerConstants.CMD_ACTIONFB_WASHHANDSWELL;
+		m_FullBody			= true;
+		m_StanceMask		= DayZPlayerConstants.STANCEMASK_CROUCH;
+
+		m_Text = "#wash_hands";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTObject(UAMaxDistances.DEFAULT);
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return player.HasBloodyHands() && !player.GetItemInHands() && !player.GetItemOnSlot("Gloves") && target.GetObject() && (target.GetObject().GetWaterSourceObjectType() == EWaterSourceObjectType.WELL || target.GetObject().IsWell());
+	}
+
+	override void OnEndServer(ActionData action_data)
+	{
+		if (action_data.m_State == UA_FINISHED)
+		{
+			PluginLifespan moduleLifespan = PluginLifespan.Cast(GetPlugin(PluginLifespan));
+			moduleLifespan.UpdateBloodyHandsVisibility(action_data.m_Player, false);
+		}
+	}	
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionAnimateCarSelection.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionAnimateCarSelection.c
new file mode 100644
index 0000000000000000000000000000000000000000..786dc85d3eb5b3873b00641c7c0c5f1600b9d8b5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionAnimateCarSelection.c
@@ -0,0 +1,83 @@
+class ActionAnimateCarSelection: ActionInteractBase
+{
+	string m_AnimSource = "";
+
+	void ActionAnimateCarSelection()
+	{
+		m_CommandUID	= DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_ALL;
+		m_Text = "#manipulate";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem		= new CCINone;
+		m_ConditionTarget	= new CCTNone;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target)
+		{
+			return false;
+		}
+
+		if (!IsInReach(player, target, UAMaxDistances.DEFAULT))
+		{
+			return false;
+		}
+
+		Object targetObject = target.GetObject();
+		Entity targetEnt = Entity.Cast(targetObject);
+
+		array<string> selections = new array<string>();
+		targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+
+		CarScript car;
+		if (Class.CastTo(car, targetEnt))
+		{
+			for (int i = 0; i < selections.Count(); i++)
+			{
+				m_AnimSource = car.GetAnimSourceFromSelection(selections[i]);
+				if (m_AnimSource != "")
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		Entity targetEnt;
+		if (Class.CastTo(targetEnt, action_data.m_Target.GetObject()))
+		{
+			if (targetEnt.GetAnimationPhase(m_AnimSource) > 0.5)
+			{
+				targetEnt.SetAnimationPhase(m_AnimSource, 0.0);
+			}
+
+			if (targetEnt.GetAnimationPhase(m_AnimSource) <= 0.5)
+			{
+				targetEnt.SetAnimationPhase(m_AnimSource, 1.0);
+			}
+		}
+		
+		CarScript car;
+		if (Class.CastTo(car, action_data.m_Target.GetObject()))
+		{
+			car.ForceUpdateLightsStart();
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		CarScript car;
+		if (Class.CastTo(car, action_data.m_Target.GetObject()))
+		{
+			car.ForceUpdateLightsEnd();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionAnimateSeats.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionAnimateSeats.c
new file mode 100644
index 0000000000000000000000000000000000000000..6a86439ecaaa04b6994ed3076b9f5882fc2d0042
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionAnimateSeats.c
@@ -0,0 +1,71 @@
+class ActionAnimateSeats: ActionAnimateCarSelection
+{
+	void ActionAnimateSeats()
+	{
+		m_Text = "#move_seat";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( !target ) return false;
+		if( !IsInReach(player, target, UAMaxDistances.DEFAULT) ) return false;
+
+		Object targetObject = target.GetObject();
+		Entity targetEnt = Entity.Cast(targetObject);
+		Transport transport;
+		CarScript car;
+		int crewIdx;
+
+		//string selection = targetObject.GetActionComponentName(target.GetComponentIndex());
+		array<string> selections = new array<string>();
+		targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+
+		
+		if ( !Class.CastTo(transport, targetObject) )
+			return false;
+
+		if ( Class.CastTo(car, targetEnt) )
+		{
+			for (int i = 0; i < selections.Count(); i++)
+			{
+				m_AnimSource = car.GetAnimSourceFromSelection( selections[i]) ;
+				if ( m_AnimSource != "" )
+				{
+					//return true; //TODO:: NEED A LINK BETWEEN SeatBack and seat with crew after that we can REMOVE the return
+					
+					HumanCommandVehicle vehCmd = player.GetCommand_Vehicle();
+
+					if ( m_AnimSource == "SeatDriver" )
+					{
+						if ( transport.CrewMember( DayZPlayerConstants.VEHICLESEAT_DRIVER ) )
+							return false;
+
+						if ( !vehCmd && car.GetCarDoorsState( "NivaDriverDoors" ) == CarDoorState.DOORS_CLOSED )
+							return false;
+					}
+					
+					if ( m_AnimSource == "SeatCoDriver" )
+					{
+						if ( transport.CrewMember( DayZPlayerConstants.VEHICLESEAT_CODRIVER ) )
+							return false;
+
+						if ( !vehCmd && car.GetCarDoorsState( "NivaCoDriverDoors" ) == CarDoorState.DOORS_CLOSED )
+							return false;
+					}
+					
+					if ( !vehCmd && !transport.CanReachSeatFromDoors(selections[i], player.GetPosition(), 1.0) )
+						return false;
+
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+	
+	override bool CanBeUsedInVehicle()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCarDoors.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCarDoors.c
new file mode 100644
index 0000000000000000000000000000000000000000..bdee6aecf5db3ebb3c2436ae2953be02043a5837
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCarDoors.c
@@ -0,0 +1,133 @@
+class ActionCarDoors: ActionInteractBase
+{	
+	protected int m_CommandUIDPerCrewIdx[4];
+	protected bool m_IsOpening = true;
+	// --- Backwards compatibility 1.09 -> 1.10 (But please do not use these)
+	CarScript m_Car = null;
+	string m_AnimSource = "";
+	// ---
+	
+	void ActionCarDoors()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ALL;
+		m_LockTargetOnUse = false;
+	}
+
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINone;
+		m_ConditionTarget	= new CCTNone;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{		
+		CarScript car 		= null;
+		string animSource	= "";
+		
+		//! player inside vehicle
+		if (player && player.GetCommand_Vehicle())
+		{
+			if (Class.CastTo(car, player.GetCommand_Vehicle().GetTransport()))
+			{
+				int crewIdx = car.CrewMemberIndex(player);
+				
+				//! crewIdx sanity checks and see if there is a door
+				if (crewIdx < 0 || crewIdx > 3 || car.GetCarDoorsState(car.GetDoorInvSlotNameFromSeatPos(crewIdx)) == CarDoorState.DOORS_MISSING)
+				{
+					return false;
+				}
+
+				animSource = car.GetAnimSourceFromSelection(car.GetDoorSelectionNameFromSeatPos(crewIdx));
+				
+				//! see if door is in reach
+				if (!car.CanReachDoorsFromSeat(animSource, crewIdx) || !car.IsAreaAtDoorFree(crewIdx))
+				{
+					return false;
+				}
+				
+				m_CommandUID = m_CommandUIDPerCrewIdx[crewIdx];
+				
+				float animationPhaseInside = car.GetAnimationPhase(animSource);				
+				return (m_IsOpening && animationPhaseInside <= 0.5) || (!m_IsOpening && animationPhaseInside > 0.5);
+			}
+		}
+
+		return false;
+	}
+
+	override void OnStartServer(ActionData action_data)
+	{
+		PlayerBase player = action_data.m_Player;
+		
+		float phase;
+		if (m_IsOpening)
+		{
+			phase = 1.0;
+		}
+		else
+		{
+			phase = 0.0;
+		}
+		
+		string animSource = "";
+		
+		CarScript car;
+		if (player && player.GetCommand_Vehicle())
+		{
+			car = CarScript.Cast(player.GetCommand_Vehicle().GetTransport());
+			if (car)
+			{
+				int crewIdx = car.CrewMemberIndex(player);
+				animSource = car.GetAnimSourceFromSelection(car.GetDoorSelectionNameFromSeatPos(crewIdx));
+			}
+		}
+		
+		if (car)
+		{
+			car.ForceUpdateLightsStart();
+			car.SetAnimationPhase(animSource, phase);
+		}
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		CarScript car;
+		PlayerBase player = action_data.m_Player;
+		if (player && player.GetCommand_Vehicle())
+		{
+			car = CarScript.Cast(player.GetCommand_Vehicle().GetTransport());
+		}
+
+		if (car)
+		{
+			car.ForceUpdateLightsEnd();
+		}
+	}
+	
+	override void OnEnd(ActionData action_data)
+	{
+		if (m_Car || m_AnimSource.Length() > 0)
+		{
+			Error("[WARNING] m_Car and m_AnimSource are left for backwards compatibility to not crash mods that are using it, but should no longer be used.");
+		}
+	}
+	
+	override bool CanBeUsedInVehicle()
+	{
+		return true;
+	}
+	
+	protected void FillCommandUIDPerCrewIdx(int crewIdx0, int crewIdx1, int crewIdx2, int crewIdx3)
+	{
+		m_CommandUIDPerCrewIdx[0] = crewIdx0;
+		m_CommandUIDPerCrewIdx[1] = crewIdx1;
+		m_CommandUIDPerCrewIdx[2] = crewIdx2;
+		m_CommandUIDPerCrewIdx[3] = crewIdx3;
+	}
+	
+	protected void FillCommandUIDPerCrewIdx(int evenCrewIdx0, int unevenCrewIdx1)
+	{
+		FillCommandUIDPerCrewIdx(evenCrewIdx0, unevenCrewIdx1, evenCrewIdx0, unevenCrewIdx1);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCarDoorsOutside.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCarDoorsOutside.c
new file mode 100644
index 0000000000000000000000000000000000000000..82bc599513f49dbcfc132bfe142958c2ac61f6e0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCarDoorsOutside.c
@@ -0,0 +1,130 @@
+class ActionCarDoorsOutside: ActionInteractBase
+{	
+	protected int m_CommandUIDPerCrewIdx[4];
+	protected bool m_IsOpening = true;
+	
+	void ActionCarDoorsOutside()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ALL;
+		m_LockTargetOnUse = false;
+	}
+
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem		= new CCINone;
+		m_ConditionTarget	= new CCTNone;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{		
+		CarScript car = null;
+		
+		//! reach check from outside of car
+		if (!IsInReach(player, target, UAMaxDistances.DEFAULT))
+		{
+			return false;
+		}
+
+		//! player is outside of vehicle
+		if (Class.CastTo(car, target.GetParent()))
+		{
+			array<string> selections = new array<string>();
+				
+			CarDoor carDoor = CarDoor.Cast(target.GetObject());
+			if (carDoor)
+			{
+				carDoor.GetActionComponentNameList(target.GetComponentIndex(), selections);
+				
+				string animSource	= "";
+				
+				for (int i = 0; i < selections.Count(); i++)
+				{
+					animSource = car.GetAnimSourceFromSelection(selections[i]);
+					if (animSource != "")
+					{
+						int idx = car.GetSeatIndexFromDoor(animSource);
+						if (idx != -1 && !car.IsAreaAtDoorFree(idx))
+						{
+							return false;	//! player is looking at one of the doors, can't open if obstructed
+						}
+							
+						//! if player is in car and cannot reach doors
+						m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+							
+						float animationPhase = car.GetAnimationPhase(animSource);	
+						//! is in reach, should open the door
+						return (m_IsOpening && animationPhase <= 0.5 ) || ( !m_IsOpening && animationPhase > 0.5);
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		float phase;
+			
+		if (m_IsOpening)
+		{
+			phase = 1.0;
+		}
+		else
+		{
+			phase = 0.0;
+		}
+		
+		string animSource = "";
+		
+		CarScript car = CarScript.Cast(action_data.m_Target.GetParent());
+		if (car)
+		{
+			array<string> selections = new array<string>();				
+			CarDoor carDoor = CarDoor.Cast(action_data.m_Target.GetObject());
+			if (carDoor)
+			{
+				carDoor.GetActionComponentNameList(action_data.m_Target.GetComponentIndex(), selections);
+				for (int i = 0; i < selections.Count(); i++)
+				{
+					animSource = car.GetAnimSourceFromSelection(selections[i]);
+					if (animSource != "")
+					{
+						break;
+					}
+				}
+			}
+		}
+		
+		if (car)
+		{
+			car.ForceUpdateLightsStart();
+			car.SetAnimationPhase(animSource, phase);
+		}
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		CarScript car = CarScript.Cast(action_data.m_Target.GetParent());
+		if (car)
+		{
+			car.ForceUpdateLightsEnd();
+		}
+	}
+	
+	//--------- Not used for this class
+	protected void FillCommandUIDPerCrewIdx(int crewIdx0, int crewIdx1, int crewIdx2, int crewIdx3)
+	{
+		m_CommandUIDPerCrewIdx[0] = crewIdx0;
+		m_CommandUIDPerCrewIdx[1] = crewIdx1;
+		m_CommandUIDPerCrewIdx[2] = crewIdx2;
+		m_CommandUIDPerCrewIdx[3] = crewIdx3;
+	}
+	
+	protected void FillCommandUIDPerCrewIdx(int evenCrewIdx0, int unevenCrewIdx1)
+	{
+		FillCommandUIDPerCrewIdx(evenCrewIdx0, unevenCrewIdx1, evenCrewIdx0, unevenCrewIdx1);
+	}
+	//-----------------------------------
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCloseCarDoors.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCloseCarDoors.c
new file mode 100644
index 0000000000000000000000000000000000000000..9e875e6993b5bc59935c08b59cfbf5696dfa4328
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCloseCarDoors.c
@@ -0,0 +1,10 @@
+class ActionCloseCarDoors: ActionCarDoors
+{
+	void ActionCloseCarDoors()
+	{	
+		m_IsOpening 	= false;
+		
+		FillCommandUIDPerCrewIdx(DayZPlayerConstants.CMD_ACTIONMOD_DRIVER_DOOR_CLOSE, DayZPlayerConstants.CMD_ACTIONMOD_CODRIVER_DOORCLOSE);
+		m_Text = "#close";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCloseCarDoorsOutside.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCloseCarDoorsOutside.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b8ac6b149a68e057757630882a028d8d29e76d3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionCloseCarDoorsOutside.c
@@ -0,0 +1,10 @@
+class ActionCloseCarDoorsOutside: ActionCarDoorsOutside
+{
+	void ActionCloseCarDoorsOutside()
+	{	
+		m_IsOpening		= false;
+		
+		FillCommandUIDPerCrewIdx(DayZPlayerConstants.CMD_ACTIONMOD_DRIVER_DOOR_CLOSE, DayZPlayerConstants.CMD_ACTIONMOD_CODRIVER_DOORCLOSE);
+		m_Text = "#close";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionOpenCarDoors.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionOpenCarDoors.c
new file mode 100644
index 0000000000000000000000000000000000000000..be6edb85054acf78a94e6d01656942715d932ffc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionOpenCarDoors.c
@@ -0,0 +1,10 @@
+class ActionOpenCarDoors: ActionCarDoors
+{
+	void ActionOpenCarDoors()
+	{
+		m_IsOpening		= true;
+		
+		FillCommandUIDPerCrewIdx(DayZPlayerConstants.CMD_ACTIONMOD_DRIVER_DOOR_OPEN, DayZPlayerConstants.CMD_ACTIONMOD_CODRIVER_DOOROPEN);
+		m_Text = "#open";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionOpenCarDoorsOutside.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionOpenCarDoorsOutside.c
new file mode 100644
index 0000000000000000000000000000000000000000..01366f47660c8e364c108b312caf03ce3bbd7445
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionOpenCarDoorsOutside.c
@@ -0,0 +1,10 @@
+class ActionOpenCarDoorsOutside: ActionCarDoorsOutside
+{
+	void ActionOpenCarDoorsOutside()
+	{
+		m_IsOpening		= true;
+		
+		FillCommandUIDPerCrewIdx(DayZPlayerConstants.CMD_ACTIONMOD_DRIVER_DOOR_OPEN, DayZPlayerConstants.CMD_ACTIONMOD_CODRIVER_DOOROPEN);
+		m_Text = "#open";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionSidePlateInteract.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionSidePlateInteract.c
new file mode 100644
index 0000000000000000000000000000000000000000..5a4b66d7fa5d6d798437efa138983f8f35f1efa6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionSidePlateInteract.c
@@ -0,0 +1,8 @@
+class ActionSidePlateInteract: ActionAnimateCarSelection
+{
+	void ActionSidePlateInteract()
+	{
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask 	= DayZPlayerConstants.STANCEMASK_ALL;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionSwitchLights.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionSwitchLights.c
new file mode 100644
index 0000000000000000000000000000000000000000..9037fe82622d9abe572af97d6031c69a88448542
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Interact/Vehicles/ActionSwitchLights.c
@@ -0,0 +1,85 @@
+class ActionSwitchLights: ActionInteractBase
+{
+	void ActionSwitchLights()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_HEADLIGHT;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text 				= "#switch_lights";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override typename GetInputType()
+	{
+		return ToggleLightsActionInput;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		HumanCommandVehicle vehCommand = player.GetCommand_Vehicle();
+
+		if ( vehCommand )
+		{
+			Transport trans = vehCommand.GetTransport();
+			if ( trans )
+			{
+				CarScript car;
+				if ( Class.CastTo(car, trans) )
+				{
+					if ( car.CrewMemberIndex( player ) == DayZPlayerConstants.VEHICLESEAT_DRIVER )
+					{
+						if ( !car.IsScriptedLightsOn() )
+						{
+							EntityAI neededItem = null;
+
+							if ( car.IsVitalCarBattery() ) neededItem = car.FindAttachmentBySlotName("CarBattery");
+							if ( car.IsVitalTruckBattery() ) neededItem = car.FindAttachmentBySlotName("TruckBattery");
+							
+							if (neededItem && !neededItem.IsRuined())
+							{
+								return neededItem.GetCompEM() && neededItem.GetCompEM().GetEnergy() > 0;
+							}
+						}
+						else
+						{
+							return true;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		HumanCommandVehicle vehCommand = action_data.m_Player.GetCommand_Vehicle();
+		if ( vehCommand )
+		{
+			Transport trans = vehCommand.GetTransport();
+			if ( trans )
+			{
+				CarScript car;
+				if ( Class.CastTo(car, trans) )
+				{
+					car.ToggleHeadlights();
+				}
+			}
+		}
+	}
+	
+	override bool CanBeUsedInVehicle()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttach.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttach.c
new file mode 100644
index 0000000000000000000000000000000000000000..25b77ecc217d0aa887a4d36f2b14a9f6bf159e8b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttach.c
@@ -0,0 +1,112 @@
+class AttachActionData : ActionData
+{
+	int m_AttSlot;
+}
+
+
+class ActionAttach : ActionSingleUseBase
+{
+	void ActionAttach()
+	{
+		m_Text = "#attach";
+	}
+
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_ATTACHITEM;
+		m_StanceMask 		= DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		AttachActionData action_data = new AttachActionData();
+		return action_data;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = null)
+	{
+		InventoryLocation il = new InventoryLocation();
+		if (!GetGame().IsDedicatedServer())
+		{
+			EntityAI targetEntity;
+			if (target.IsProxy())
+			{
+				targetEntity = EntityAI.Cast(target.GetParent());
+			}
+			else
+			{
+				targetEntity = EntityAI.Cast(target.GetObject());
+			}
+			
+			if (!targetEntity.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.ATTACHMENT, il))
+				return false;
+		}
+			
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			#ifndef SERVER
+			AttachActionData action_data_a = AttachActionData.Cast(action_data);
+			action_data_a.m_AttSlot = il.GetSlot();
+			#endif
+
+			return true;
+		}
+
+		return false;
+	}
+	
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		if (targetEntity && item)
+		{
+			return targetEntity.GetInventory() && targetEntity.GetInventory().CanAddAttachment(item) && !targetEntity.CanUseConstruction());
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		ClearInventoryReservationEx(action_data);
+		AttachActionData action_data_a = AttachActionData.Cast(action_data);
+		AttachItem(action_data_a);
+	}
+	
+	override void OnExecuteClient(ActionData action_data)
+	{
+		ClearInventoryReservationEx(action_data);
+
+		AttachActionData action_data_a = AttachActionData.Cast(action_data);
+		AttachItem(action_data_a);
+	}
+	
+	protected void AttachItem(AttachActionData action_data)
+	{
+		EntityAI entity;	
+		if (action_data.m_Target.IsProxy())
+		{
+			entity = EntityAI.Cast(action_data.m_Target.GetParent());
+		}
+		else
+		{
+			entity = EntityAI.Cast(action_data.m_Target.GetObject());
+		}
+		
+		if (entity && action_data.m_MainItem)
+		{
+			action_data.m_Player.PredictiveTakeEntityToTargetAttachmentEx(entity, action_data.m_MainItem, action_data.m_AttSlot);
+		}
+	}
+	
+	override bool CanBeSetFromInventory()
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnProxy.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnProxy.c
new file mode 100644
index 0000000000000000000000000000000000000000..b6177b5d4cbee1280b63b515cc7d71d630d46709
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnProxy.c
@@ -0,0 +1,46 @@
+class ActionAttachOnProxy: ActionAttach
+{
+	void ActionAttachOnProxy()
+	{
+		m_Text = "#attach";
+	}
+	
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ATTACHITEM;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		Object targetObject = target.GetObject();
+		Object targetParent = target.GetParent();
+		EntityAI target_entity = EntityAI.Cast( targetParent );
+		EntityAI item_entity = item;
+		
+		if ( targetParent )
+		{
+			if ( target_entity && item_entity )
+			{
+				if ( target_entity.GetInventory() && target_entity.GetInventory().CanAddAttachment( item_entity ) )
+				{
+					return true;
+				}
+			}	
+		}
+		
+		return false;
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		super.OnExecuteClient( action_data );
+		
+		if ( action_data.m_Player.IsPlacingLocal() )
+		{
+			action_data.m_Player.TogglePlacingLocal();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnSelection.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnSelection.c
new file mode 100644
index 0000000000000000000000000000000000000000..b709f428980abeda03076c4e93ef38ea287799ed
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnSelection.c
@@ -0,0 +1,159 @@
+class ActionAttachOnSelection: ActionSingleUseBase
+{
+	void ActionAttachOnSelection()
+	{
+		m_Text = "#attach";
+	}
+	
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTCursor();
+	}
+	
+	override ActionData CreateActionData()
+	{
+		AttachActionData action_data = new AttachActionData();
+		return action_data;
+	}
+	
+	int FindSlotIdToAttachOrCombine(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		EntityAI targetEntity = EntityAI.Cast(target.GetObject());
+		if (targetEntity && item)
+		{
+			if (!targetEntity.GetInventory())
+				return InventorySlots.INVALID;
+
+			int slotsCount = item.GetInventory().GetSlotIdCount();			
+			array<string> selections = new array<string>();
+			targetEntity.GetActionComponentNameList(target.GetComponentIndex(), selections);
+
+			foreach (string selection : selections)
+			{
+				int slotId = -1;
+				if (!targetEntity.TranslateSlotFromSelection(selection, slotId))
+					slotId = InventorySlots.GetSlotIdFromString(selection);
+
+				if (slotId == -1)
+					continue;
+
+				for (int i=0; i < slotsCount; ++i)
+				{
+					int itemSlotId = item.GetInventory().GetSlotId(i);
+					if (slotId == itemSlotId)
+					{
+						ItemBase currentAttachment = ItemBase.Cast(targetEntity.GetInventory().FindAttachment(slotId));
+						if (currentAttachment)
+						{
+							if (currentAttachment.CanBeCombined(item))
+								return itemSlotId;
+						}
+						else
+						{
+							if (targetEntity.GetInventory() && targetEntity.GetInventory().CanAddAttachment(item))
+								return itemSlotId;
+						}	
+					}
+				}
+			}
+		}
+
+		return InventorySlots.INVALID;
+	}
+	
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = null)
+	{
+		int attSlotId = InventorySlots.INVALID;
+		if (!GetGame().IsDedicatedServer() )
+		{
+			attSlotId = FindSlotIdToAttachOrCombine(player, target, item);
+		}
+		
+		if (super.SetupAction( player, target, item, action_data, extra_data))
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				if (attSlotId != InventorySlots.INVALID)
+				{
+					AttachActionData action_data_a = AttachActionData.Cast(action_data);
+					action_data_a.m_AttSlot = attSlotId;
+					
+					return true;
+				}
+
+				return false;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			return true;
+		
+		if (target.GetObject() && target.GetObject().CanUseConstruction())
+			return false;
+		
+		return FindSlotIdToAttachOrCombine(player, target, item) != InventorySlots.INVALID;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		ClearInventoryReservationEx(action_data);
+		
+		AttachActionData action_data_a = AttachActionData.Cast(action_data);
+		EntityAI entity;
+
+		if (action_data.m_Target.IsProxy())
+		{
+			entity = EntityAI.Cast(action_data.m_Target.GetParent());
+		}
+		else
+		{
+			entity = EntityAI.Cast(action_data.m_Target.GetObject());
+		}
+		
+		if (entity && action_data.m_MainItem)
+		{
+			action_data.m_Player.PredictiveTakeEntityToTargetAttachmentEx(entity, action_data_a.m_MainItem, action_data_a.m_AttSlot);
+		}
+	}
+	
+	override void OnExecuteClient(ActionData action_data)
+	{
+		ClearInventoryReservationEx(action_data);
+		EntityAI targetEntity 	= EntityAI.Cast(action_data.m_Target.GetObject());
+		EntityAI itemEntity 	= action_data.m_MainItem;
+		
+		AttachActionData action_data_a = AttachActionData.Cast(action_data);
+		
+		ItemBase attachment = ItemBase.Cast(targetEntity.GetInventory().FindAttachment(action_data_a.m_AttSlot));
+		if (attachment)
+		{
+			attachment.CombineItemsClient(itemEntity);
+		}
+		else
+		{
+			ItemBase item_base	= ItemBase.Cast( itemEntity );
+			float stackable	= item_base.GetTargetQuantityMax( action_data_a.m_AttSlot );
+				
+			if (stackable == 0 || stackable >= item_base.GetQuantity())
+			{
+				action_data.m_Player.PredictiveTakeEntityToTargetAttachmentEx(targetEntity, itemEntity, action_data_a.m_AttSlot);
+			}
+			else if (stackable != 0 && stackable < item_base.GetQuantity())
+			{
+				item_base.SplitIntoStackMaxClient(targetEntity, action_data_a.m_AttSlot);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnTentProxy.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnTentProxy.c
new file mode 100644
index 0000000000000000000000000000000000000000..bce5fd691ff57b6c66e00d275f86b8b36e6a03f9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnTentProxy.c
@@ -0,0 +1,21 @@
+class ActionAttachOnTentProxy: ActionAttachOnProxy
+{
+	void ActionAttachOnTentProxy() {};
+	
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursorParent;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ATTACHITEM;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		TentBase tent = TentBase.Cast(target.GetParent());
+		if ( !tent )
+			return false;
+		
+		return super.ActionCondition(player,target,item);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnTrap.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnTrap.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ead520eab9e6201d8558471c651817a5b577061
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachOnTrap.c
@@ -0,0 +1,12 @@
+class ActionAttachOnTrap: ActionAttach
+{
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (target && !target.GetObject().IsInherited(TrapBase))
+		{
+			return false;
+		}
+		
+		return super.ActionCondition(player, target, item);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachPowerSourceToPanel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachPowerSourceToPanel.c
new file mode 100644
index 0000000000000000000000000000000000000000..a66c4ee334ed7c648935f4b89ba1ae0e1cb86d7f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachPowerSourceToPanel.c
@@ -0,0 +1,73 @@
+//!DEPRECATED
+class ActionAttachPowerSourceToPanel: ActionSingleUseBase
+{
+	void ActionAttachPowerSourceToPanel()
+	{
+		m_Text = "#attach";
+	}
+
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		if ( player && target_entity && item )
+		{			
+			if ( target_entity.IsStaticTransmitter() && target_entity.GetInventory().AttachmentCount() == 0 )	//has any power source attachment attached
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	protected void OnExecuteImpl( ActionData action_data )
+	{
+		EntityAI target_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		EntityAI item_entity = action_data.m_MainItem;
+		
+		//find inventory location for attachment
+		InventoryLocation target_location = new InventoryLocation;
+		if ( target_entity.GetInventory().FindFirstFreeLocationForNewEntity( item_entity.GetType(), FindInventoryLocationType.ATTACHMENT, target_location ) )
+		{
+			action_data.m_Player.PredictiveTakeEntityToTargetAttachmentEx( target_entity, item_entity, target_location.GetSlot() );
+		}
+	}
+
+	override void OnExecuteClient( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+		OnExecuteImpl(action_data);
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return; // multiplayer handled on client side via OnExecuteClient
+		else
+			OnExecuteImpl(action_data); // single player
+	}
+	
+	override void OnEndClient( ActionData action_data )
+	{
+		// Probably not needed since attaching is done server side.
+		/*
+		EntityAI target_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		EntityAI item_entity = EntityAI.Cast( action_data.m_MainItem );
+		
+		//find inventory location for attachment
+		InventoryLocation target_location = new InventoryLocation;
+		
+		if( target_entity.GetInventory().FindFirstFreeLocationForNewEntity( item_entity.GetType(), FindInventoryLocationType.ATTACHMENT, target_location ) )
+		{
+			//target_entity.PredictiveTakeEntityToTargetAttachmentEx( target_entity, item_entity, target_location.GetSlot() );
+			target_entity.LocalTakeEntityAsAttachmentEx( item_entity, target_location.GetSlot() );
+		}
+		*/
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachToConstruction.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachToConstruction.c
new file mode 100644
index 0000000000000000000000000000000000000000..0d636e7e9a1ef174b4f6e80e7b2fd8d3a02dde73
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachToConstruction.c
@@ -0,0 +1,121 @@
+class ActionAttachToConstruction: ActionSingleUseBase
+{
+	void ActionAttachToConstruction()
+	{
+		m_Text = "#attach";
+	}
+
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		AttachActionData action_data = new AttachActionData;
+		return action_data;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		
+		if ( target_entity && target_entity.CanUseConstruction() )
+		{
+			string selection = target_entity.GetActionComponentName( target.GetComponentIndex() );
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			int slot_id  = construction_action_data.GetAttachmentSlotFromSelection( player, target_entity, item, selection );
+			BaseBuildingBase base_building;
+			
+			if ( slot_id != -1 )
+			{
+				base_building = BaseBuildingBase.Cast( target_entity );
+				if ( base_building.CheckSlotVerticalDistance( slot_id, player ) && base_building.IsPlayerInside(player,"") )
+				{
+					construction_action_data.SetSlotId( slot_id );
+					
+					return true;
+				}
+			}
+			else if ( item.IsKindOf("CombinationLock") )
+			{
+				base_building = BaseBuildingBase.Cast( target_entity );
+				
+				//simpler hack
+				/*construction_action_data.SetSlotId( InventorySlots.GetSlotIdFromString("Att_CombinationLock") );
+				return true;*/
+				
+				InventoryLocation loc = new InventoryLocation;
+				bool found = base_building.GetInventory().FindFreeLocationFor(item,FindInventoryLocationType.ATTACHMENT,loc);
+				
+				if (found)
+				{
+					//Print("slot name: " + InventorySlots.GetSlotName(loc.GetSlot()) );
+					construction_action_data.SetSlotId( loc.GetSlot() );
+					
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnStartClient( ActionData action_data )
+	{
+		//set action initiator
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		construction_action_data.SetActionInitiator( action_data.m_Player );
+	}
+	
+	protected void OnExecuteImpl( ActionData action_data )
+	{
+		EntityAI target_entity = EntityAI.Cast( action_data.m_Target.GetObject() );
+		ItemBase item = ItemBase.Cast( action_data.m_MainItem );
+		
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		int slot_id = construction_action_data.GetSlotId();
+		
+		if ( slot_id != -1 )
+		{
+			ItemBase attachment = ItemBase.Cast( target_entity.GetInventory().FindAttachment( slot_id ) );
+			
+			if ( attachment )
+			{
+				//combine
+				attachment.CombineItemsClient( item );
+			}
+			else// if( target_entity.GetInventory().CanAddAttachmentEx( item, slot_id ) )
+			{
+				ItemBase item_base	= ItemBase.Cast( item );
+				float stackable	= item_base.GetTargetQuantityMax( slot_id );
+				
+				if( stackable == 0 || stackable >= item_base.GetQuantity() )
+				{
+					action_data.m_Player.PredictiveTakeEntityToTargetAttachmentEx(target_entity, item, slot_id);
+				}
+				else if( stackable != 0 && stackable < item_base.GetQuantity() )
+				{
+					item_base.SplitIntoStackMaxClient( target_entity, slot_id );
+				}
+			}
+		}
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+		OnExecuteImpl(action_data);
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() )
+		{
+			ClearInventoryReservationEx(action_data);
+			
+			OnExecuteImpl(action_data); // single player
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachWheels.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachWheels.c
new file mode 100644
index 0000000000000000000000000000000000000000..d544ed7931a160e4c7435e89c0766c4627d36a4b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachWheels.c
@@ -0,0 +1,101 @@
+// TODO: REMOVE -> Attach action handle it
+class ActionAttachWheels: ActionAttach
+{
+	int m_wheel_hub;
+	
+	void ActionAttachWheels()
+	{
+		m_wheel_hub = -1;
+		m_Text = "#attach";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		
+		string test = player.GetDisplayName();
+		string test2 = item.GetType();
+		string test3 = targetObject.GetDisplayName();
+		
+		if ( player && targetObject && item )
+		{
+			int componentIndex = target.GetComponentIndex();
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_1_1") )
+			{
+				Print( "Predni leve" );
+				m_wheel_hub = 0;
+				return true;
+			}
+
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_1_2") )
+			{
+				Print( "zadni leve" );
+				m_wheel_hub = 1;
+				return true;
+			}
+
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_1_3") )
+			{
+				Print( "prostredni leve" );
+				m_wheel_hub = 2;
+				return true;
+			}
+
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_1_4") )
+			{
+				Print( "druhe predni leve" );
+				m_wheel_hub = 3;
+				return true;
+			}
+			
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_2_1") )
+			{
+				Print( "Predni prave" );
+				m_wheel_hub = 4;
+				return true;
+			}
+
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_2_2") )
+			{
+				Print( "zadni prave" );
+				m_wheel_hub = 5;
+				return true;
+			}
+
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_2_3") )
+			{
+				Print( "prostredni prave" );
+				m_wheel_hub = 6;
+				return true;
+			}
+
+			if( targetObject.IsActionComponentPartOfSelection(componentIndex, "wheel_2_4") )
+			{
+				Print( "druhe predni prave" );
+				m_wheel_hub = 7;
+				return true;
+			}		
+		}
+		
+ 		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		EntityAI target_entity;
+		Class.CastTo(target_entity,  action_data.m_Target.GetObject() ); // cast to ItemBase
+		int slot_index	= action_data.m_MainItem.GetInventory().GetSlotId(0);
+		int test	= m_wheel_hub;
+		if (!target_entity.LocalTakeEntityAsAttachmentEx( action_data.m_MainItem, slot_index ))
+			target_entity.LocalTakeEntityAsAttachment( action_data.m_MainItem );
+	}
+	override void OnExecuteClient( ActionData action_data )
+	{
+		EntityAI target_entity;
+		Class.CastTo(target_entity,  action_data.m_Target.GetObject() ); // cast to ItemBase
+		int slot_index	= action_data.m_MainItem.GetInventory().GetSlotId(0);
+		int test	= m_wheel_hub;
+		if (!target_entity.LocalTakeEntityAsAttachmentEx( action_data.m_MainItem, slot_index ))
+			target_entity.LocalTakeEntityAsAttachment( action_data.m_MainItem );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachWithSwich.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachWithSwich.c
new file mode 100644
index 0000000000000000000000000000000000000000..c9f9a27a0eeaca34f516d481c326ad2a66943631
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionAttachWithSwich.c
@@ -0,0 +1,129 @@
+class ActionAttachWithSwitch: ActionAttach
+{
+	void ActionAttachWithSwitch()
+	{
+	}
+
+	override void CreateConditionComponents() 
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ATTACHITEM;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override typename GetInputType()
+	{
+		return InventoryOnlyActionInput;
+	}
+	
+	override bool CanBePerformedFromInventory()
+	{
+		return true;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		AttachActionData action_data = new AttachActionData;
+		return action_data;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{
+		ref InventoryLocation il = new InventoryLocation;
+		if (!GetGame().IsDedicatedServer())
+		{
+			EntityAI target_entity;
+			
+			if ( target.IsProxy() )
+			{
+				target_entity = EntityAI.Cast( target.GetParent() );
+			}
+			else
+			{
+				target_entity = EntityAI.Cast( target.GetObject() );
+			}
+			
+			if (!target_entity.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.ATTACHMENT, il ))
+				return false;
+		}
+			
+		if ( super.SetupAction( player, target, item, action_data, extra_data))
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				AttachActionData action_data_a = AttachActionData.Cast(action_data);
+				action_data_a.m_AttSlot = il.GetSlot();
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		if( !item.CanSwitchDuringAttach(target_entity) )
+			return false;
+		
+		if ( target_entity && item )
+		{
+			if ( target_entity.GetInventory() && target_entity.GetInventory().CanAddAttachment( item ) )
+			{
+				return true;
+			}
+		}	
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if (GetGame().IsMultiplayer())
+			return;
+		
+		ClearInventoryReservationEx(action_data);
+		AttachActionData action_data_a = AttachActionData.Cast(action_data);
+		EntityAI target_EAI;
+			
+		if ( action_data.m_Target.IsProxy() )
+		{
+			target_EAI = EntityAI.Cast( action_data_a.m_Target.GetParent() );
+		}
+		else
+		{
+			target_EAI = EntityAI.Cast( action_data_a.m_Target.GetObject() );
+		}
+		
+		if (target_EAI && action_data_a.m_MainItem)
+		{
+			ref InventoryLocation il = new InventoryLocation;
+			il.SetAttachment( target_EAI, action_data.m_MainItem, action_data_a.m_AttSlot );
+			action_data.m_Player.PredictiveForceSwapEntities( target_EAI, action_data.m_MainItem, il );
+		}
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+		AttachActionData action_data_a = AttachActionData.Cast(action_data);
+		
+		EntityAI target_EAI;
+			
+		if ( action_data.m_Target.IsProxy() )
+		{
+			target_EAI = EntityAI.Cast( action_data_a.m_Target.GetParent() );
+		}
+		else
+		{
+			target_EAI = EntityAI.Cast( action_data_a.m_Target.GetObject() );
+		}
+		
+		if (target_EAI && action_data_a.m_MainItem)
+		{
+			ref InventoryLocation il = new InventoryLocation;
+			il.SetAttachment( target_EAI, action_data.m_MainItem, action_data_a.m_AttSlot );
+			action_data.m_Player.PredictiveForceSwapEntities( target_EAI, action_data.m_MainItem, il );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionBuildPartSwitch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionBuildPartSwitch.c
new file mode 100644
index 0000000000000000000000000000000000000000..49f9a1c4ab2eccaad8c7c8fee7420d64d94d2e07
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionBuildPartSwitch.c
@@ -0,0 +1,64 @@
+// deprecated
+class ActionBuildPartSwitch: ActionSingleUseBase
+{
+	void ActionBuildPartSwitch()
+	{
+		//m_StanceMask = DayZPlayerConstants.STANCEMASK_NOTRAISED;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_FullBody = true;
+		m_Text = "#switch_to_the_next_part";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.BASEBUILDING);
+	}
+		
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedLeaning()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return false;
+	}
+	
+	//-------------------------------------------------
+	override void OnStartClient(ActionData action_data)
+	{
+		super.OnStartClient( action_data );
+		
+		SetNextIndex(action_data);
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		super.OnStartServer( action_data );
+		
+		if (!GetGame().IsMultiplayer())
+			SetNextIndex(action_data);
+	}
+	
+	void SetNextIndex(ActionData action_data)
+	{
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		construction_action_data.SetNextIndex();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionClapBearTrapWithThisItem.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionClapBearTrapWithThisItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..158c406bc5f71dd9ba7b4c4f33d28f0c3a5302d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionClapBearTrapWithThisItem.c
@@ -0,0 +1,40 @@
+class ActionClapBearTrapWithThisItem: ActionSingleUseBase
+{
+	void ActionClapBearTrapWithThisItem()
+	{
+		m_CommandUID	= DayZPlayerConstants.CMD_ACTIONFB_POKE;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_FullBody		= true;
+		m_Text			= "#trigger_bear_trap";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem		= new CCINonRuined;
+		m_ConditionTarget	= new CCTCursor;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!target)
+		{
+			return false;
+		}
+
+		BearTrap trap;
+		if (Class.CastTo(trap, target.GetObject()))
+		{		
+			return trap.IsActive() && trap.CanBeDisarmed() && IsInReach(player, target, UAMaxDistances.DEFAULT);
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		BearTrap trap;
+		Class.CastTo(trap, action_data.m_Target.GetObject());
+		
+		trap.Disarm();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionClose.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionClose.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff11fa70eed34db6c29c72cbda84bc030e74a221
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionClose.c
@@ -0,0 +1,58 @@
+class ActionClose: ActionSingleUseBase
+{
+	void ActionClose()
+	{
+		m_Text = "#close";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( item && item.IsOpen() ) 
+		{
+			return true;
+		}
+		return false;
+	}
+
+	//setup
+	override bool SetupAction( PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL )
+	{	
+		if( super.SetupAction( player, target, item, action_data, extra_data ) )
+		{
+			SetCloseAnimation( item );
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void SetCloseAnimation( ItemBase item )
+	{
+		switch( item.Type() )
+		{
+			case Compass:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_CLOSEITEM_ONCE;
+				break;
+			case TelescopicBaton:
+				m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+				break;
+		}
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		action_data.m_MainItem.Close();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionConsumeSingle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionConsumeSingle.c
new file mode 100644
index 0000000000000000000000000000000000000000..d12130566f9957fe8ec78edde7ccfde1eb64584e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionConsumeSingle.c
@@ -0,0 +1,63 @@
+class ActionConsumeSingleCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseQuantityEdible(UAQuantityConsumed.DEFAULT);
+	}
+};
+
+class ActionConsumeSingle: ActionSingleUseBase
+{
+	const int DEFAULT_CONSUMED_QUANTITY = 1;
+	
+	void ActionConsumeSingle()
+	{
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_LICKBATTERY;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_LICKBATTERY;
+
+		m_Text = "#eat";
+	}
+	
+	int GetConsumedQuantity()
+	{
+		return DEFAULT_CONSUMED_QUANTITY;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINotRuinedAndEmpty();
+		m_ConditionTarget 	= new CCTSelf();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		return super.ActionCondition(player, target, item) && player.CanEatAndDrink();
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		PlayerBase player = action_data.m_Player;
+		
+		if (player && action_data.m_MainItem)
+			player.Consume(action_data.m_MainItem, GetConsumedQuantity(), EConsumeType.ITEM_SINGLE_TIME);
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		if (action_data.m_MainItem && (action_data.m_MainItem.GetQuantity() <= 0))
+			action_data.m_MainItem.SetQuantity(0);
+		
+		if (action_data.m_Player.HasBloodyHandsEx() == eBloodyHandsTypes.SALMONELA && !action_data.m_Player.GetInventory().FindAttachment(InventorySlots.GLOVES) && GetProgress(action_data) > 0)
+			action_data.m_Player.SetBloodyHandsPenalty();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionCreateIndoorFireplace.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionCreateIndoorFireplace.c
new file mode 100644
index 0000000000000000000000000000000000000000..1086e5e45153f0051d5fb96709ea08bbe81037b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionCreateIndoorFireplace.c
@@ -0,0 +1,89 @@
+class ActionCreateIndoorFireplace: ActionSingleUseBase
+{
+	void ActionCreateIndoorFireplace()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#place_object";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( !target ) return false;
+
+		Object target_object = target.GetObject();
+		string action_selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+		BuildingWithFireplace building = BuildingWithFireplace.Cast( target_object );
+		
+		if ( target_object && building && action_selection.Contains( FireplaceIndoor.FIREPOINT_ACTION_SELECTION ) )
+		{
+			if ( !IsInReach(player, target, UAMaxDistances.DEFAULT) ) return false;
+			
+			vector fire_point_pos_world, fire_point_rot_world;
+			int fire_point_index = FireplaceIndoor.GetFirePointIndex( action_selection );
+			if ( FireplaceIndoor.CanPlaceFireplaceInSelectedSpot( building, fire_point_index, fire_point_pos_world, fire_point_rot_world ) )
+			{
+				float rot_deg = 0.0;
+				if ( building.HasSelection( FireplaceIndoor.FIREPOINT_PLACE_ROT + fire_point_index.ToString() ) )
+				{
+					vector diff = fire_point_rot_world - fire_point_pos_world;
+					diff[1] = 0.0;
+					diff.Normalize();
+					float dotp = vector.Dot( "0 0 1" , diff );
+					rot_deg = Math.Acos( dotp ) * Math.RAD2DEG;
+					if ( ( diff[0] < 0 ) && ( diff[2] < 0 ) )
+						rot_deg = 360.0 - rot_deg;
+					else if ( ( diff[0] < 0 ) && ( diff[2] > 0 ) )
+						rot_deg = 360.0 - rot_deg;
+
+					//Debug.DrawArrow( fire_point_pos_world, fire_point_pos_world + diff );
+				}
+				
+				float fire_point_dist = vector.Distance( fire_point_pos_world, player.GetPosition() );
+				if ( fire_point_dist <= 2 )
+				{
+					player.SetLastFirePoint( fire_point_pos_world );
+					player.SetLastFirePointIndex( fire_point_index );
+					player.SetLastFirePointRot( rot_deg );
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		Object obj = GetGame().CreateObjectEx( "FireplaceIndoor", action_data.m_Player.GetLastFirePoint(), ECE_PLACE_ON_SURFACE );
+	
+		int m_FirePointIndex = action_data.m_Player.GetLastFirePointIndex();
+		float m_FireplaceRot = action_data.m_Player.GetLastFirePointRot();
+		vector smoke_point_pos = action_data.m_Target.GetObject().GetSelectionPositionMS( FireplaceIndoor.FIREPOINT_SMOKE_POSITION + m_FirePointIndex.ToString() );
+		vector smoke_point_pos_world = action_data.m_Target.GetObject().ModelToWorld( smoke_point_pos );		
+		vector m_SmokePosition = smoke_point_pos_world;
+		
+		FireplaceIndoor fp_indoor = FireplaceIndoor.Cast( obj );
+		if ( fp_indoor )
+		{
+			fp_indoor.SetFirePointIndex( m_FirePointIndex );
+			fp_indoor.SetSmokePointPosition( m_SmokePosition );
+
+			vector fprot = vector.Zero;
+			fprot[0] = m_FireplaceRot;
+			fp_indoor.SetOrientation( fprot );
+
+			fp_indoor.Synchronize();
+			
+			//move item to target fireplace
+			action_data.m_Player.ServerTakeEntityToTargetAttachment(fp_indoor, action_data.m_MainItem);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionCreateIndoorOven.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionCreateIndoorOven.c
new file mode 100644
index 0000000000000000000000000000000000000000..420bd8317a481eebeca05a226c09aad4f315c7de
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionCreateIndoorOven.c
@@ -0,0 +1,89 @@
+class ActionCreateIndoorOven: ActionSingleUseBase
+{
+	void ActionCreateIndoorOven()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#place_object";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( !target ) return false;
+
+		Object target_object = target.GetObject();
+		string action_selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+		BuildingWithFireplace building = BuildingWithFireplace.Cast( target_object );
+		
+		if ( target_object && building && action_selection.Contains( OvenIndoor.OVENPOINT_ACTION_SELECTION ) )
+		{
+			if ( !IsInReach(player, target, UAMaxDistances.DEFAULT) ) return false;
+			
+			vector fire_point_pos_world, fire_point_rot_world;
+			int fire_point_index = OvenIndoor.GetFirePointIndex( action_selection );
+			if ( OvenIndoor.CanPlaceFireplaceInSelectedSpot( building, fire_point_index, fire_point_pos_world, fire_point_rot_world ) )
+			{
+				float rot_deg = 0.0;
+				if ( building.HasSelection( OvenIndoor.OVENPOINT_PLACE_ROT + fire_point_index.ToString() ) )
+				{
+					vector diff = fire_point_rot_world - fire_point_pos_world;
+					diff[1] = 0.0;
+					diff.Normalize();
+					float dotp = vector.Dot( "0 0 1" , diff );
+					rot_deg = Math.Acos( dotp ) * Math.RAD2DEG;
+					if ( ( diff[0] < 0 ) && ( diff[2] < 0 ) )
+						rot_deg = 360.0 - rot_deg;
+					else if ( ( diff[0] < 0 ) && ( diff[2] > 0 ) )
+						rot_deg = 360.0 - rot_deg;
+
+					//Debug.DrawArrow( fire_point_pos_world, fire_point_pos_world + diff );
+				}
+				
+				float fire_point_dist = vector.Distance( fire_point_pos_world, player.GetPosition() );
+				if ( fire_point_dist <= 2 )
+				{
+					player.SetLastFirePoint( fire_point_pos_world );
+					player.SetLastFirePointIndex( fire_point_index );
+					player.SetLastFirePointRot( rot_deg );
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		Object obj = GetGame().CreateObjectEx( "OvenIndoor", action_data.m_Player.GetLastFirePoint(), ECE_PLACE_ON_SURFACE );
+	
+		int m_FirePointIndex = action_data.m_Player.GetLastFirePointIndex();
+		float m_FireplaceRot = action_data.m_Player.GetLastFirePointRot();
+		vector smoke_point_pos = action_data.m_Target.GetObject().GetSelectionPositionMS( OvenIndoor.OVENPOINT_SMOKE_POSITION + m_FirePointIndex.ToString() );
+		vector smoke_point_pos_world = action_data.m_Target.GetObject().ModelToWorld( smoke_point_pos );		
+		vector m_SmokePosition = smoke_point_pos_world;
+		
+		OvenIndoor fp_indoor = OvenIndoor.Cast( obj );
+		if ( fp_indoor )
+		{
+			fp_indoor.SetFirePointIndex( m_FirePointIndex );
+			fp_indoor.SetSmokePointPosition( m_SmokePosition );
+
+			vector fprot = vector.Zero;
+			fprot[0] = m_FireplaceRot;
+			fp_indoor.SetOrientation( fprot );
+
+			fp_indoor.Synchronize();
+			
+			//move item to target fireplace
+			action_data.m_Player.ServerTakeEntityToTargetAttachment(fp_indoor, action_data.m_MainItem);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDisinfectPlantBit.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDisinfectPlantBit.c
new file mode 100644
index 0000000000000000000000000000000000000000..258e1ba290a2080a5bf7efba3d9b9a2e5b39ad19
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDisinfectPlantBit.c
@@ -0,0 +1,61 @@
+// TO DO: Remove this script!
+
+class ActionDisinfectPlantBitCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseQuantity(UAQuantityConsumed.GARDEN_DISINFECT_PLANT);
+	}
+};
+
+
+class ActionDisinfectPlantBit: ActionSingleUseBase
+{	
+	void ActionDisinfectPlantBit()
+	{
+		m_CallbackClass = ActionDisinfectPlantBitCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#apply";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		
+		if ( targetObject != NULL && targetObject.IsInherited(PlantBase) && !item.IsDamageDestroyed() )
+		{
+			PlantBase plant = PlantBase.Cast( targetObject );
+			
+			if ( plant.IsGrowing() && plant.NeedsSpraying() )
+			{	
+				if ( item.GetQuantity() > 0 )
+				{
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		
+		if ( targetObject != NULL && targetObject.IsInherited(PlantBase) )
+		{
+			
+			PlantBase plant = PlantBase.Cast( targetObject );
+			Param1<float> nacdata = Param1<float>.Cast( action_data.m_ActionComponent.GetACData() );
+			SendMessageToClient(action_data.m_Player, plant.StopInfestation( nacdata.param1 ));
+		}
+		
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDropItem.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDropItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..297809699d82d96c1d156ed7a007e96c25c7ed49
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDropItem.c
@@ -0,0 +1,90 @@
+class ActionDropItemCB : ActionSingleUseBaseCB
+{
+	override void EndActionComponent()
+	{
+		SetCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+		m_ActionData.m_State = UA_FINISHED;
+	}
+}
+
+class ActionDropItem : ActionSingleUseBase
+{
+	string m_ItemName = "";
+
+	void ActionDropItem()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_DROPITEM_HANDS;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_DROPITEM_HANDS;
+		m_CallbackClass 	= ActionDropItemCB;
+		m_Text 				= "#drop_item";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINone();
+		m_ConditionTarget 	= new CCTNone();
+	}
+	
+	override typename GetInputType()
+	{
+		return DropActionInput;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedThrowing()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return false;
+	}
+
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		return true;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		HumanCommandMove hcm = player.GetCommand_Move();
+		if (hcm && hcm.IsChangingStance())
+			return false;
+		
+		if (player.GetCommand_Vehicle())
+			return false;
+		
+		return player && item;
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		if (action_data.m_Player.IsPlacingServer())
+			action_data.m_Player.PlacingCancelServer();
+
+		if (!GetGame().IsMultiplayer()) 
+			PhysicalDropItem(action_data);
+	}
+	
+	override void OnExecuteClient(ActionData action_data)
+	{
+		super.OnExecuteClient(action_data);
+
+		PhysicalDropItem(action_data);
+	}
+	
+	void PhysicalDropItem( ActionData action_data )
+	{
+		action_data.m_Player.PhysicalPredictiveDropItem(action_data.m_Player.GetItemInHands());
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDropItemSimple.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDropItemSimple.c
new file mode 100644
index 0000000000000000000000000000000000000000..a9c717653b3a0021039235c5655c84331c515356
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionDropItemSimple.c
@@ -0,0 +1,34 @@
+class ActionDropItemSimple: ActionDropItem
+{
+	void ActionDropItemSimple() {}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool MainItemAlwaysInHands()
+	{
+		return false;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+		
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+
+		#ifndef SERVER
+		ClearInventoryReservationEx(action_data);
+		PhysicalDropItem(action_data);
+		#endif
+	}
+	
+	override void PhysicalDropItem(ActionData action_data)
+	{
+		action_data.m_Player.PredictiveDropEntity(action_data.m_MainItem);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionEmptySeedsPack.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionEmptySeedsPack.c
new file mode 100644
index 0000000000000000000000000000000000000000..50a38cbf2ecc1022b468dfdc96b0a393758193ea
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionEmptySeedsPack.c
@@ -0,0 +1,47 @@
+/*
+	User action for emptying packs of seeds (horticulture)
+*/
+
+
+class ActionEmptySeedsPack: ActionSingleUseBase
+{
+	void ActionEmptySeedsPack()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EMPTYSEEDSPACK;
+		m_FullBody = false;
+		m_Text = "#unbox";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return true;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		SeedPackBase item_SPB = SeedPackBase.Cast( action_data.m_MainItem );
+		
+		// The following careful script fixes an issue with VME with unknown repro.
+		
+		if (item_SPB)
+		{
+			PlayerBase player;
+			
+			if (action_data)
+				player = action_data.m_Player;
+			
+			item_SPB.EmptySeedPack( player );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldBandanaToHead.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldBandanaToHead.c
new file mode 100644
index 0000000000000000000000000000000000000000..000641cb9f968db5dc8469bf4d61d2eabba40048
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldBandanaToHead.c
@@ -0,0 +1,10 @@
+class ActionFoldBandanaToHead : ActionFoldEntityToSlot
+{
+	void ActionFoldBandanaToHead ()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_SlotID = InventorySlots.HEADGEAR;
+	}
+
+	override string GetText () { return "#bandana_to_head"; }
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldBandanaToMask.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldBandanaToMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..f05216633722de0811dfb7c60581efa8ceacb74b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldBandanaToMask.c
@@ -0,0 +1,10 @@
+class ActionFoldBandanaToMask : ActionFoldEntityToSlot
+{
+	void ActionFoldBandanaToMask ()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_SlotID = InventorySlots.MASK;
+	}
+
+	override string GetText () { return "#bandana_to_mask"; }
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldEntityToSlot.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldEntityToSlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..117aaf9fea550567541f0eb3e2e998e41859683f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldEntityToSlot.c
@@ -0,0 +1,55 @@
+class ActionFoldEntityToSlot : ActionSingleUseBase
+{
+	int m_SlotID = InventorySlots.INVALID;
+
+	override void CreateConditionComponents ()
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget () { return false; }
+
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI att = player.GetInventory().FindAttachment(m_SlotID);
+		if ( item && att == null )
+			return true;
+		return false;
+	}
+
+	override bool ActionConditionContinue ( ActionData action_data ) { return true; }
+
+	override void OnExecuteClient ( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+	}
+
+	override void OnExecuteServer ( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() )
+			ClearInventoryReservationEx(action_data);
+
+		ItemBase old_item = action_data.m_MainItem;
+		if (old_item.ConfigIsExisting("ChangeIntoOnAttach"))
+		{
+			string slot_name = InventorySlots.GetSlotName(m_SlotID);
+			string str = old_item.ChangeIntoOnAttach(slot_name);
+			if (str != "")
+			{
+				FoldBandanaToSlotLambda lambda = new FoldBandanaToSlotLambda(action_data.m_MainItem, str, action_data.m_Player, m_SlotID);
+				action_data.m_Player.ServerReplaceItemInHandsWithNewElsewhere(lambda);
+			}
+		}
+	}
+};
+
+class FoldBandanaToSlotLambda : TurnItemIntoItemLambda
+{
+	void FoldBandanaToSlotLambda (EntityAI old_item, string new_item_type, PlayerBase player, int slot)
+	{
+		InventoryLocation targetAtt = new InventoryLocation;
+		targetAtt.SetAttachment(player, NULL, slot);
+		OverrideNewLocation(targetAtt);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldMap.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldMap.c
new file mode 100644
index 0000000000000000000000000000000000000000..a964a2e5bcc2732a3976973a0cefa9e8dc6aa0f6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionFoldMap.c
@@ -0,0 +1,39 @@
+
+//dummy action. Unfold 'looped action' canceled from elswhere
+class ActionFoldMap: ActionBase
+{
+	void ActionFoldMap()
+	{
+		m_Text = "#fold_map";
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (player.m_hac && player.IsMapOpen())
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceABite.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceABite.c
new file mode 100644
index 0000000000000000000000000000000000000000..503c20940e2455fd0c00be81d78029809562c4eb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceABite.c
@@ -0,0 +1,44 @@
+class ActionForceABiteCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseQuantityEdible(UAQuantityConsumed.EAT_NORMAL);
+	}
+};
+
+class ActionForceABite: ActionForceConsumeSingle
+{
+	void ActionForceABite()
+	{		
+		m_CallbackClass = ActionForceABiteCB;
+		m_Text = "#feed_a_bite";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{	
+		if ( action_data.m_MainItem.GetQuantity() <= 0 )
+		{
+			action_data.m_MainItem.SetQuantity(0);
+		}
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (!super.ActionCondition( player, target, item))
+			return false;
+		
+		PlayerBase target_player = PlayerBase.Cast(target.GetObject());
+		
+		if (target_player)
+			return target_player.CanEatAndDrink();
+		else
+			return false;
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceABiteCan.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceABiteCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..263d7eddaf1215bee88249f84f89b93a74c5d778
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceABiteCan.c
@@ -0,0 +1,15 @@
+class ActionForceABiteCan: ActionForceABite
+{
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return true;
+		/* 
+		//if staging for cans is introduced
+		if ( item && item.IsOpen() )
+		{
+			return true;
+		}
+		return false;
+		*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceASip.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceASip.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f0193512618fc972e5ac9fd0974044f86adb416
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceASip.c
@@ -0,0 +1,15 @@
+class ActionForceASip: ActionForceABite
+{
+	void ActionForceASip()
+	{
+		m_Sounds.Insert("DrinkBottle_0");
+		m_Sounds.Insert("DrinkBottle_1");
+		m_Text = "#give_a_sip";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINotRuinedAndEmpty;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+	}	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceConsumeSingle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceConsumeSingle.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b598df69c6db498d6e7586a6b9477b2915f9bbc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionForceConsumeSingle.c
@@ -0,0 +1,71 @@
+class ActionForceConsumeSingleCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseQuantityEdible(UAQuantityConsumed.DEFAULT);
+	}
+}
+
+class ActionForceConsumeSingle : ActionSingleUseBase
+{
+	const int DEFAULT_CONSUMED_QUANTITY = 1;
+	
+	void ActionForceConsumeSingle()
+	{
+		m_CallbackClass = ActionForceConsumeSingleCB;
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONFB_INJECTIONTARGET;
+		m_StanceMask 	= DayZPlayerConstants.STANCEIDX_ERECT | DayZPlayerConstants.STANCEIDX_CROUCH;
+		m_FullBody 		= true;
+		m_Text			= "#feed";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget	= new CCTMan(UAMaxDistances.DEFAULT);
+	}
+		
+	int GetConsumedQuantity()
+	{
+		return DEFAULT_CONSUMED_QUANTITY;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		if (item.GetQuantity() <= item.GetQuantityMin())
+			return false;
+		
+		PlayerBase targetPlayer = PlayerBase.Cast(target.GetObject());
+		return targetPlayer && targetPlayer.CanEatAndDrink();
+	}
+	
+	override void OnEndServer(ActionData action_data)
+	{
+		if (action_data.m_MainItem && action_data.m_MainItem.GetQuantity() <= 0) 
+		{
+			action_data.m_MainItem.SetQuantity(0);
+		}
+		
+		if (action_data.m_Player.HasBloodyHands() && !action_data.m_Player.GetInventory().FindAttachment(InventorySlots.GLOVES))
+		{
+			PlayerBase target = PlayerBase.Cast(action_data.m_Target.GetObject());
+			if (target)
+			{
+				target.SetBloodyHandsPenalty();
+			}
+		}
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		PlayerBase target = PlayerBase.Cast(action_data.m_Target.GetObject());
+		
+		if (target && action_data.m_MainItem)
+		{
+			target.Consume(action_data.m_MainItem, GetConsumedQuantity(), EConsumeType.ITEM_SINGLE_TIME);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionHandcuffTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionHandcuffTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..04b23599ad8973784ead56ef22d48597d23e0ab3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionHandcuffTarget.c
@@ -0,0 +1,31 @@
+class ActionHandcuffTarget: ActionSingleUseBase
+{
+	void ActionHandcuffTarget()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_HANDCUFFTARGET;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#restrain";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		PlayerBase ntarget = PlayerBase.Cast(action_data.m_Target.GetObject());
+		//ntarget.SetCaptive();
+		action_data.m_MainItem.Delete();
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{	
+		GetGame().GetAnalyticsClient().OnActionRestrain();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionInstallSparkplug.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionInstallSparkplug.c
new file mode 100644
index 0000000000000000000000000000000000000000..926eff797daafd1c84abcd206c8790c280c7af19
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionInstallSparkplug.c
@@ -0,0 +1,42 @@
+/*
+	This is a generic user action for attaching sparkplug on any EntityAI object. The receiver must have a "sparkplug" selection in its View Geometry that the action_data.m_Player can look at.
+*/
+
+
+class ActionInsertSparkplug: ActionSingleUseBase
+{
+	void ActionInsertSparkplug()
+	{
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+		m_Text = "#attach";
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_EAI = EntityAI.Cast( target.GetObject() );
+		string selection = target_EAI.GetActionComponentName(target.GetComponentIndex());
+		
+		if ( selection == "sparkplug"  &&  target_EAI.GetInventory().CanAddAttachment(item) )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		EntityAI target_EAI = EntityAI.Cast( action_data.m_Target.GetObject() ); // cast to ItemBase
+		target_EAI.LocalTakeEntityAsAttachment (action_data.m_MainItem);
+	}
+	override void OnExecuteClient( ActionData action_data )
+	{
+		EntityAI target_EAI = EntityAI.Cast( action_data.m_Target.GetObject() ); // cast to ItemBase
+		target_EAI.LocalTakeEntityAsAttachment (action_data.m_MainItem);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionMeasureBattery.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionMeasureBattery.c
new file mode 100644
index 0000000000000000000000000000000000000000..848bbb1fe8aed8d6cd373ffee87a489b8a399651
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionMeasureBattery.c
@@ -0,0 +1,45 @@
+class ActionMeasureBattery: ActionSingleUseBase
+{
+
+	void ActionMeasureBattery()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LICKBATTERY;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_LICKBATTERY;
+		m_Text = "#lick_battery";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		
+		float energy = 0;
+		if ( action_data.m_MainItem.HasEnergyManager() ) 
+		{
+			energy = action_data.m_MainItem.GetCompEM().GetEnergy();
+		}
+		action_data.m_MainItem.TransferModifiers(action_data.m_Player);
+		if(energy > 0) 
+		{
+			InformPlayers(action_data.m_Player,action_data.m_Target,UA_FINISHED);
+		}
+		if(energy == 0) 
+		{
+			InformPlayers(action_data.m_Player,action_data.m_Target,UA_FAILED);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionNextCombinationLockDial.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionNextCombinationLockDial.c
new file mode 100644
index 0000000000000000000000000000000000000000..881d28fb7acbf9484b55066ea4e7b75fcea7c30e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionNextCombinationLockDial.c
@@ -0,0 +1,58 @@
+class ActionNextCombinationLockDial: ActionSingleUseBase
+{
+	void ActionNextCombinationLockDial()
+	{
+		m_Text = "#next_combination_lock_dial";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem		= new CCINonRuined;
+		m_ConditionTarget 	= new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( item.IsInherited( CombinationLock ) )
+		{
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			construction_action_data.SetCombinationLock( CombinationLock.Cast( item ) );
+
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		//set next dial
+		CombinationLock combination_lock = CombinationLock.Cast( action_data.m_MainItem );
+		if ( combination_lock )
+		{
+			combination_lock.SetNextDial();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionOpen.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionOpen.c
new file mode 100644
index 0000000000000000000000000000000000000000..90a1ccaae6f3282e7a155b8b96232bd8daf48376
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionOpen.c
@@ -0,0 +1,48 @@
+class ActionOpen: ActionSingleUseBase
+{
+	void ActionOpen()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_OPENITEM_ONCE;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_OPENITEM_ONCE;
+		//m_Animation = "open";
+		m_Text = "#open";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( item && !item.IsOpen() )
+		{ 
+			return true;
+		}
+		return false;
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if( !GetGame().IsMultiplayer() )
+			ClearInventoryReservationEx(action_data);
+		
+		action_data.m_MainItem.Open();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPin.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPin.c
new file mode 100644
index 0000000000000000000000000000000000000000..f1caa5e748a6e6b3e32347856cc4ef983c6ac66a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPin.c
@@ -0,0 +1,52 @@
+class ActionPin extends ActionSingleUseBase
+{
+	void ActionPin()
+	{
+		m_Text = "#pin";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		/*
+		if ( item.IsInherited(Grenade_Base) )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PINGRENAGE;
+		}
+		else
+		*/
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON;
+		}
+		
+		Grenade_Base grenade = Grenade_Base.Cast(item);
+		if( grenade )
+		{
+			if( !grenade.IsPinned() && grenade.IsPinnable() )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecute( ActionData action_data )
+	{
+		Grenade_Base grenade = Grenade_Base.Cast(action_data.m_MainItem);
+		if( grenade )
+		{
+			grenade.Pin();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceFireplaceIndoor.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceFireplaceIndoor.c
new file mode 100644
index 0000000000000000000000000000000000000000..473068f71c9e684ab9ef02588db4da3bdc22cdc6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceFireplaceIndoor.c
@@ -0,0 +1,123 @@
+class ActionPlaceFireplaceIndoor: ActionSingleUseBase
+{
+	void ActionPlaceFireplaceIndoor()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#place_object";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( !target ) return false;
+
+		Object target_object = target.GetObject();
+		string action_selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+		BuildingWithFireplace building = BuildingWithFireplace.Cast( target_object );
+		
+		if ( target_object && building && action_selection.Contains( FireplaceIndoor.FIREPOINT_ACTION_SELECTION ) )
+		{
+			if ( !IsInReach(player, target, UAMaxDistances.DEFAULT) ) return false;
+			
+			vector fire_point_pos_world, fire_point_rot_world;
+			int fire_point_index = FireplaceIndoor.GetFirePointIndex( action_selection );
+			if ( FireplaceIndoor.CanPlaceFireplaceInSelectedSpot( building, fire_point_index, fire_point_pos_world, fire_point_rot_world ) )
+			{
+				float rot_deg = 0.0;
+				if ( building.HasSelection( FireplaceIndoor.FIREPOINT_PLACE_ROT + fire_point_index.ToString() ) )
+				{
+					vector diff = fire_point_rot_world - fire_point_pos_world;
+					diff[1] = 0.0;
+					diff.Normalize();
+					float dotp = vector.Dot( "0 0 1" , diff );
+					rot_deg = Math.Acos( dotp ) * Math.RAD2DEG;
+					if ( ( diff[0] < 0 ) && ( diff[2] < 0 ) )
+						rot_deg = 360.0 - rot_deg;
+					else if ( ( diff[0] < 0 ) && ( diff[2] > 0 ) )
+						rot_deg = 360.0 - rot_deg;
+
+					//Debug.DrawArrow( fire_point_pos_world, fire_point_pos_world + diff );
+				}
+				
+				float fire_point_dist = vector.Distance( fire_point_pos_world, player.GetPosition() );
+				if ( fire_point_dist <= 2 )
+				{
+					player.SetLastFirePoint( fire_point_pos_world );
+					player.SetLastFirePointIndex( fire_point_index );
+					player.SetLastFirePointRot( rot_deg );
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		FireplaceBase fireplace_in_hands = FireplaceBase.Cast( action_data.m_MainItem );
+		
+		//replace fireplace with lambda
+		FireplaceToIndoorsLambda lambda = new FireplaceToIndoorsLambda( fireplace_in_hands, "FireplaceIndoor", action_data.m_Player, action_data.m_Player.GetLastFirePoint(), action_data.m_Target.GetObject() );
+		lambda.SetTransferParams( true, true, true );
+		action_data.m_Player.ServerReplaceItemInHandsWithNewElsewhere( lambda );
+
+		//add to soft skills
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+}
+
+
+class FireplaceToIndoorsLambda : TurnItemIntoItemLambda
+{
+	int 		m_FirePointIndex;
+	float		m_FireplaceRot;
+	vector 		m_SmokePosition;
+	
+	void FireplaceToIndoorsLambda( EntityAI old_item, string new_item_type, PlayerBase player, vector pos, Object target )
+	{
+		InventoryLocation gnd = new InventoryLocation;
+		vector mtx[4];
+		Math3D.MatrixIdentity4( mtx );
+		mtx[3] = pos;
+		gnd.SetGround( NULL, mtx );
+		OverrideNewLocation( gnd );
+		
+		//set fire point index and smoke point position in world
+		m_FirePointIndex = player.GetLastFirePointIndex();
+		m_FireplaceRot = player.GetLastFirePointRot();
+		
+		vector smoke_point_pos = target.GetSelectionPositionMS( FireplaceIndoor.FIREPOINT_SMOKE_POSITION + m_FirePointIndex.ToString() );
+		vector smoke_point_pos_world = target.ModelToWorld( smoke_point_pos );		
+		m_SmokePosition = smoke_point_pos_world;
+	}
+
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew( old_item, new_item );
+		
+		FireplaceIndoor fireplace_indoor = FireplaceIndoor.Cast( new_item );
+		if ( fireplace_indoor )
+		{
+			//set fire point index
+			fireplace_indoor.SetFirePointIndex( m_FirePointIndex );
+			
+			//get fire and smoke position
+			fireplace_indoor.SetSmokePointPosition( m_SmokePosition );
+
+			vector fprot = vector.Zero;
+			fprot[0] = m_FireplaceRot;
+			fireplace_indoor.SetOrientation( fprot );
+
+			//synchronize
+			fireplace_indoor.Synchronize();
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceFireplaceIntoBarrel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceFireplaceIntoBarrel.c
new file mode 100644
index 0000000000000000000000000000000000000000..659893931f630274bc407b6640acccfe46dc687a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceFireplaceIntoBarrel.c
@@ -0,0 +1,44 @@
+class ActionPlaceFireplaceIntoBarrel: ActionSingleUseBase
+{
+	void ActionPlaceFireplaceIntoBarrel()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.ROUGH_LOW;
+		m_Text = "#place_object";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.DEFAULT );
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object target_object = target.GetObject();
+		
+		if ( target_object && target_object.IsInherited( BarrelHoles_ColorBase ) )
+		{
+			BarrelHoles_ColorBase fireplace_barrel = BarrelHoles_ColorBase.Cast( target_object );
+			
+			if ( fireplace_barrel.IsOpen() && fireplace_barrel.GetInventory().AttachmentCount() == 0 && fireplace_barrel.IsCargoEmpty() )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		FireplaceBase fireplace_in_hands = FireplaceBase.Cast( action_data.m_MainItem );
+		BarrelHoles_ColorBase fireplace_barrel = BarrelHoles_ColorBase.Cast( action_data.m_Target.GetObject() );
+		
+		auto lambda = new MoveEquipToExistingItemAndDestroyOldRootLambda(fireplace_in_hands, "", action_data.m_Player, fireplace_barrel);
+		action_data.m_Player.ServerReplaceItemInHandsWithNewElsewhere(lambda);
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceOvenIndoor.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceOvenIndoor.c
new file mode 100644
index 0000000000000000000000000000000000000000..1320543c01d4815dae989428e5b66ada66d943b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlaceOvenIndoor.c
@@ -0,0 +1,125 @@
+class ActionPlaceOvenIndoor: ActionSingleUseBase
+{
+	void ActionPlaceOvenIndoor()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_Text = "#place_object";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTCursor;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( !target ) return false;
+
+		Object target_object = target.GetObject();
+		string action_selection = target_object.GetActionComponentName( target.GetComponentIndex() );
+		BuildingWithFireplace building = BuildingWithFireplace.Cast( target_object );
+		
+		if ( target_object && building && action_selection.Contains( OvenIndoor.OVENPOINT_ACTION_SELECTION ) )
+		{
+			if ( !IsInReach(player, target, UAMaxDistances.DEFAULT) ) return false;
+			
+			vector fire_point_pos_world, fire_point_rot_world;
+			int fire_point_index = OvenIndoor.GetFirePointIndex( action_selection );
+			if ( OvenIndoor.CanPlaceFireplaceInSelectedSpot( building, fire_point_index, fire_point_pos_world, fire_point_rot_world ) )
+			{
+				float rot_deg = 0.0;
+				if ( building.HasSelection( OvenIndoor.OVENPOINT_PLACE_ROT + fire_point_index.ToString() ) )
+				{
+					vector diff = fire_point_rot_world - fire_point_pos_world;
+					diff[1] = 0.0;
+					diff.Normalize();
+					float dotp = vector.Dot( "0 0 1" , diff );
+					rot_deg = Math.Acos( dotp ) * Math.RAD2DEG;
+					if ( ( diff[0] < 0 ) && ( diff[2] < 0 ) )
+						rot_deg = 360.0 - rot_deg;
+					else if ( ( diff[0] < 0 ) && ( diff[2] > 0 ) )
+						rot_deg = 360.0 - rot_deg;
+
+					//Debug.DrawArrow( fire_point_pos_world, fire_point_pos_world + diff );
+				}
+				
+				float fire_point_dist = vector.Distance( fire_point_pos_world, player.GetPosition() );
+				if ( fire_point_dist <= 2 )
+				{
+					player.SetLastFirePoint( fire_point_pos_world );
+					player.SetLastFirePointIndex( fire_point_index );
+					player.SetLastFirePointRot( rot_deg );
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		FireplaceBase fireplace_in_hands = FireplaceBase.Cast( action_data.m_MainItem );
+		
+		//replace fireplace with lambda
+		FireplaceToIndoorOvenLambda lambda = new FireplaceToIndoorOvenLambda( fireplace_in_hands, "OvenIndoor", action_data.m_Player, action_data.m_Player.GetLastFirePoint(), action_data.m_Target.GetObject() );
+		lambda.SetTransferParams( true, true, true );
+		action_data.m_Player.ServerReplaceItemInHandsWithNewElsewhere( lambda );
+
+		//add to soft skills
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+}
+
+
+class FireplaceToIndoorOvenLambda : TurnItemIntoItemLambda
+{
+	int 		m_FirePointIndex;
+	float		m_FireplaceRot;
+	vector 		m_SmokePosition;
+	
+	void FireplaceToIndoorOvenLambda( EntityAI old_item, string new_item_type, PlayerBase player, vector pos, Object target )
+	{
+		InventoryLocation gnd = new InventoryLocation;
+		vector mtx[4];
+		Math3D.MatrixIdentity4( mtx );
+		mtx[3] = pos;
+		gnd.SetGround( NULL, mtx );
+		OverrideNewLocation( gnd );
+		
+		//set fire point index and smoke point position in world
+		m_FirePointIndex = player.GetLastFirePointIndex();
+		m_FireplaceRot = player.GetLastFirePointRot();
+		
+		vector smoke_point_pos = target.GetSelectionPositionMS( OvenIndoor.OVENPOINT_SMOKE_POSITION + m_FirePointIndex.ToString() );
+		vector smoke_point_pos_world = target.ModelToWorld( smoke_point_pos );		
+		m_SmokePosition = smoke_point_pos_world;
+	}
+
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew( old_item, new_item );
+		
+		OvenIndoor fireplace_indoor = OvenIndoor.Cast( new_item );
+		if ( fireplace_indoor )
+		{
+			//set fire point index
+			fireplace_indoor.SetFirePointIndex( m_FirePointIndex );
+
+			// rotate fireplace
+			vector fprot = vector.Zero;
+			fprot[0] = m_FireplaceRot;
+			fireplace_indoor.SetOrientation( fprot );
+			Print(fireplace_indoor.GetOrientation());
+
+			// smoke pos (chimney)
+			fireplace_indoor.SetSmokePointPosition( m_SmokePosition );
+
+			//synchronize
+			fireplace_indoor.Synchronize();
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlantSeed.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlantSeed.c
new file mode 100644
index 0000000000000000000000000000000000000000..7b0b634c94f81385e6f20d5c1bdb62dd384588f2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlantSeed.c
@@ -0,0 +1,90 @@
+class ActionPlantSeed: ActionSingleUseBase
+{
+	void ActionPlantSeed()
+	{
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_MEDIUM;
+		
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_DROPITEM_HANDS;
+		m_FullBody = false;
+		m_Text = "#plant_seed";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTDummy;
+	}
+
+	override bool HasTarget()
+	{
+		return true;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		GardenBase targetObject = GardenBase.Cast( target.GetObject() );
+		
+		if ( targetObject && ( !targetObject.IsHologram() || !targetObject.IsBeingPlaced() ) )
+		{
+			array<string> selections = new array<string>;
+			targetObject.GetActionComponentNameList(target.GetComponentIndex(), selections);
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				string selection = selections[s];
+				Slot slot = targetObject.GetSlotBySelection( selection );
+				if (slot)
+				{
+					if ( item != NULL && item.GetQuantity() > 0 && targetObject.CanPlantSeed( selection ) )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Process(action_data);
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		//Process(action_data);
+	}
+
+	void Process( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		int slot_ID;
+		
+		if ( targetObject != NULL && targetObject.IsInherited(GardenBase) )
+		{
+			GardenBase garden_base = GardenBase.Cast( targetObject );
+			array<string> selections = new array<string>;
+			targetObject.GetActionComponentNameList(action_data.m_Target.GetComponentIndex(), selections);
+
+			for (int s = 0; s < selections.Count(); s++)
+			{
+				string selection = selections[s];
+				Slot slot = garden_base.GetSlotBySelection( selection );
+				if (slot)
+				{
+					slot_ID = slot.GetSlotId();
+					break;
+				}
+			}
+			
+			//int slot_ID = slot.GetSlotId();
+			
+			ItemBase seed_IB = ItemBase.Cast( action_data.m_MainItem );
+			
+			seed_IB.SplitIntoStackMax( garden_base, slot_ID, action_data.m_Player );
+		}
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugIn.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugIn.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc7694696f3b15c885d2ace69748f8f3d28a2669
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugIn.c
@@ -0,0 +1,90 @@
+class ActionPlugIn: ActionSingleUseBase
+{
+	void ActionPlugIn()
+	{
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_Text 			= "#plug_in";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (player.IsPlacingLocal())
+			return false;
+		
+		ItemBase targetIB = ItemBase.Cast(target.GetObject());
+		
+		//Prevent plugging to items in inventory
+		if (targetIB && targetIB.GetHierarchyRoot() == targetIB && item)
+		{
+			if (item.HasEnergyManager() && !item.GetCompEM().IsPlugged() && targetIB.HasEnergyManager() && targetIB.GetCompEM().CanReceivePlugFrom(item))
+			{
+				return true;
+			}
+			
+			ItemBase attachedDevice = GetAttachedDevice(targetIB);
+			//Will only ever affect batteries
+			if (attachedDevice)
+			{
+				return attachedDevice.GetCompEM().HasFreeSocket();
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		ItemBase targetIB = ItemBase.Cast(action_data.m_Target.GetObject());
+		
+		if (targetIB.HasEnergyManager())
+		{
+			ItemBase attachedDevice = GetAttachedDevice(targetIB);
+			if (attachedDevice)
+				targetIB = attachedDevice;
+			
+			action_data.m_MainItem.GetCompEM().PlugThisInto(targetIB);
+		
+			if (!action_data.m_Player.IsPlacingServer())
+			{
+				action_data.m_Player.PlacingStartServer(action_data.m_MainItem);
+
+				Process(action_data);
+			}
+		}
+	}
+	
+	void Process(ActionData action_data)
+	{
+		ItemBase targetIB = ItemBase.Cast(action_data.m_Target.GetObject());
+
+		targetIB.GetInventory().TakeEntityAsAttachment(InventoryMode.LOCAL, action_data.m_MainItem);
+	}
+	
+	override void OnExecuteClient(ActionData action_data)
+	{	
+		if (!action_data.m_Player.IsPlacingLocal())
+			action_data.m_Player.TogglePlacingLocal();
+		else
+			Process(action_data);
+	}
+	
+	ItemBase GetAttachedDevice(ItemBase parent)
+	{
+		if (parent.IsInherited(CarBattery) || parent.IsInherited(TruckBattery))
+		{
+			ItemBase parentAttachment = ItemBase.Cast(parent.GetAttachmentByType(MetalWire));
+			if (!parentAttachment)
+				parentAttachment = ItemBase.Cast(parent.GetAttachmentByType(BarbedWire));
+
+			return parentAttachment;
+		}
+		
+		return null;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugIntoFence.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugIntoFence.c
new file mode 100644
index 0000000000000000000000000000000000000000..531d4f3f30a2c3375a50abdc5841c71de989c739
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugIntoFence.c
@@ -0,0 +1,45 @@
+class ActionPlugIntoFence: ActionSingleUseBase
+{
+	void ActionPlugIntoFence()
+	{
+		m_Text = "#plug_in";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		
+		if ( targetObject  &&  item  &&  targetObject.IsInherited(BaseBuildingBase))
+		{
+			BaseBuildingBase target_BBB = BaseBuildingBase.Cast( targetObject );
+			
+			BarbedWire bw = BarbedWire.Cast( target_BBB.GetAttachmentByType(BarbedWire) );
+			
+			if ( bw  &&  bw.GetCompEM().CanReceivePlugFrom(item) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		Object targetObject = action_data.m_Target.GetObject();
+		ItemBase target_IB = ItemBase.Cast( targetObject );
+		BarbedWire bw = BarbedWire.Cast( target_IB.GetAttachmentByType(BarbedWire) );
+		action_data.m_MainItem.GetCompEM().PlugThisInto(bw);
+		
+		if ( !action_data.m_Player.IsPlacingServer() )
+		{
+			//action_data.m_Player.TogglePlacing( action_data.m_Target, action_data.m_MainItem );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugTargetIntoThis.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugTargetIntoThis.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5fd0d760c980cf773261a14a654efa002d2849d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionPlugTargetIntoThis.c
@@ -0,0 +1,112 @@
+class ActionPlugTargetIntoThis: ActionSingleUseBase
+{
+	bool m_Retoggle;
+	
+	void ActionPlugTargetIntoThis()
+	{
+		m_CommandUID 	= DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE;
+		m_Retoggle 		= false;
+		m_Text 			= "#connect_together";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool Can(PlayerBase player, ActionTarget target, ItemBase item)
+	{				
+		if (super.Can(player, target, item))
+		{		
+			if (player.IsPlacingLocal())
+			{				
+				m_Retoggle = true;
+				
+				player.GetHologramLocal().SetIsHidden(true);
+				player.GetHologramLocal().GetProjectionEntity().HideAllSelections();	
+			}
+		}
+		
+		if (!super.Can(player, target, item))
+		{
+			if (m_Retoggle)
+			{				
+				m_Retoggle = false;
+				
+				player.GetHologramLocal().SetIsHidden(false);
+				player.GetHologramLocal().GetProjectionEntity().ShowAllSelections();	
+			}
+		}
+		
+		return super.Can(player, target, item);
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{		
+		ItemBase targetIB = ItemBase.Cast(target.GetObject());
+		
+		//Prevent plugging to items in inventory
+		if (targetIB && targetIB.GetHierarchyRoot() == targetIB && item && targetIB.HasEnergyManager() && item.HasEnergyManager())
+		{
+			if (!targetIB.GetCompEM().IsPlugged() && item.GetCompEM().CanReceivePlugFrom(targetIB))
+			{
+				//hotfix, re-work entire action!
+				return targetIB.IsElectricAppliance();
+			}
+			
+			// Special case for vehicle batteries
+			if (item.IsInherited(VehicleBattery))
+			{
+				MetalWire metalWire = MetalWire.Cast(item.GetCompEM().GetPluggedDevice());
+				
+				if (metalWire && metalWire.GetCompEM().CanReceivePlugFrom(targetIB))
+				{
+					return true; // We can power the action_data.m_Target from vehicle battery because it has metal wire attached.
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool IsDeploymentAction()
+	{
+		return true;
+	}
+	
+	override void OnExecuteServer(ActionData action_data)
+	{
+		Process(action_data);
+	}
+	
+	override void OnExecuteClient(ActionData action_data)
+	{
+		m_Retoggle = false;
+	}
+
+	void Process(ActionData action_data)
+	{
+		ItemBase targetIB = ItemBase.Cast(action_data.m_Target.GetObject());
+
+		if (action_data.m_MainItem.IsInherited(VehicleBattery))
+		{
+			// Car/truck batteries can have a metal wire attached through which they can power common electric appliances
+			MetalWire metalWire = MetalWire.Cast(action_data.m_MainItem.GetCompEM().GetPluggedDevice());
+			if (metalWire)
+				targetIB.GetCompEM().PlugThisInto(metalWire);
+		}
+		else
+		{
+			// Everything else in general
+			targetIB.GetCompEM().PlugThisInto(action_data.m_MainItem);
+		}
+		
+		Spotlight spotlight;
+		if (Spotlight.CastTo(spotlight, targetIB))
+			spotlight.Unfold();
+		
+		targetIB.GetInventory().TakeEntityAsAttachment(InventoryMode.LOCAL, action_data.m_MainItem);
+		action_data.m_Player.ServerDropEntity(action_data.m_MainItem);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionReadPaper.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionReadPaper.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a022cce5184af66862600e7e1b08646fdf5ecef
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionReadPaper.c
@@ -0,0 +1,71 @@
+class ActionReadPaperCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		EnableStateChangeCallback();
+		m_ActionData.m_ActionComponent = new CAContinuousTime(-1.0);
+	}
+	
+	override void EndActionComponent()
+	{
+	}
+	
+	override void OnStateChange(int pOldState, int pCurrentState)
+	{
+		if (pCurrentState == STATE_NONE && (!GetGame().IsDedicatedServer()))
+		{
+			if (GetGame().GetUIManager() && GetGame().GetUIManager().IsMenuOpen(MENU_NOTE))
+				GetGame().GetUIManager().FindMenu(MENU_NOTE).Close();
+		}
+		else if (pCurrentState == STATE_LOOP_LOOP && pOldState != STATE_LOOP_LOOP && (!GetGame().IsMultiplayer() || GetGame().IsServer()))
+		{
+			ItemBase paper_item = ItemBase.Cast(m_ActionData.m_MainItem);
+			Param1<string> text = new Param1<string>(paper_item.GetWrittenNoteData().GetNoteText());
+			paper_item.RPCSingleParam(ERPCs.RPC_READ_NOTE, text, true,m_ActionData.m_Player.GetIdentity());
+		}
+	}
+};
+
+class ActionReadPaper: ActionContinuousBase
+{
+	void ActionReadPaper()
+	{
+		m_CallbackClass = ActionReadPaperCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_VIEWNOTE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_PRONE;
+		m_Text = "#read";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+		super.OnUpdate(action_data);
+		
+		if(!GetGame().IsDedicatedServer())
+		{
+			if (action_data.m_State == UA_FINISHED && GetGame().GetUIManager() && !GetGame().GetUIManager().IsMenuOpen(MENU_NOTE))
+			{
+				ActionManagerClient.Cast(action_data.m_Player.GetActionManager()).RequestEndAction();
+			}
+		}
+	}
+	
+	override void OnEndRequest(ActionData action_data)
+	{
+		if (action_data.m_Callback)
+		{
+			action_data.m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionRepairWithToolFromHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionRepairWithToolFromHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cc9c50c2d519124c63c064ceb3ef4a7eb1da0f5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionRepairWithToolFromHands.c
@@ -0,0 +1,41 @@
+// This is just a test action!
+class ActionRepairWithToolFromHands: ActionSingleUseBase
+{
+	void ActionRepairWithToolFromHands()
+	{
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_HIGH;
+		m_Text = "#repair";
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Object targetObject = target.GetObject();
+		if ( targetObject /*&&  targetObject.IsKindOf("ItemBase")*/ )
+		{
+			ItemBase item_to_repair = ItemBase.Cast( targetObject );
+			bool can_repair = item_to_repair.CanRepair(item);
+			return can_repair;
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		Object targetObject = action_data.m_Target.GetObject();
+		if ( targetObject  /* &&  targetObject.IsKindOf("ItemBase")*/ )
+		{
+			ItemBase item_to_repair = ItemBase.Cast( targetObject );
+			Param1<float> nacdata = Param1<float>.Cast( action_data.m_ActionComponent.GetACData() );
+			bool was_repaired = item_to_repair.Repair(action_data.m_Player, action_data.m_MainItem, nacdata.param1);
+		}
+
+		action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionResetKitchenTimer.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionResetKitchenTimer.c
new file mode 100644
index 0000000000000000000000000000000000000000..10b1cc53e9dd602ca781d420ce82f2485b4d4e2c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionResetKitchenTimer.c
@@ -0,0 +1,36 @@
+class ActionResetKitchenTimerClockCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseTurnOnPlugged;
+	}
+}
+
+class ActionResetKitchenTimer: ActionTurnOffWhileInHands
+{
+	void ActionResetKitchenTimer()
+	{
+		m_CallbackClass = ActionResetKitchenTimerClockCB;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_RESET_KITCHENTIMER;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONMOD_RESET_KITCHENTIMER;
+		m_Text = "#turn_off";
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+		
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ClockBase alarm = ClockBase.Cast(item);
+		return (alarm.IsRinging() || alarm.IsAlarmOn());
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{
+		ClockBase alarm = ClockBase.Cast(action_data.m_MainItem);
+		if (alarm)
+			alarm.TurnOff();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeABite.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeABite.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc047dcda4590fcb0f586b72fbb224d4441b3471
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeABite.c
@@ -0,0 +1,31 @@
+class ActionTakeABiteCB : ActionSingleUseBaseCB
+{
+	private const float QUANTITY_USED_PER_SEC2 = 50;
+	
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseQuantityEdible(QUANTITY_USED_PER_SEC2);
+	}
+};
+
+class ActionTakeABite: ActionConsumeSingle
+{
+	void ActionTakeABite()
+	{
+		m_CallbackClass = ActionTakeABiteCB;
+		m_Sound = "EatingSoft_0";
+		//m_Animation = "eat";
+		m_Text = "#take_a_bite";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSelf;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeABiteCan.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeABiteCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..485f0aa2f7f9028a01ccad510a26b486ceb4727e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeABiteCan.c
@@ -0,0 +1,15 @@
+class ActionTakeABiteCan: ActionTakeABite
+{
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return false;
+		/* 
+		//if staging for cans is introduced
+		if ( action_data.m_MainItem && action_data.m_MainItem.IsOpen() )
+		{
+			return true;
+		}
+		return false;
+		*/
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeASip.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeASip.c
new file mode 100644
index 0000000000000000000000000000000000000000..48a8224d74c106945a88adc07e17a3ebca0bd438
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeASip.c
@@ -0,0 +1,13 @@
+class ActionTakeASip: ActionTakeABite
+{
+	void ActionTakeASip()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_DRINK;
+		m_Text = "#take_a_sip";
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeMaterialToHandsSwitch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeMaterialToHandsSwitch.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e83659a7205922599d47ce92063f43ca561ea9f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTakeMaterialToHandsSwitch.c
@@ -0,0 +1,65 @@
+class ActionTakeMaterialToHandsSwitch: ActionSingleUseBase
+{
+	void ActionTakeMaterialToHandsSwitch()
+	{
+		m_Text = "#switch_to_next_material";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINotPresent;
+		m_ConditionTarget = new CCTNonRuined( UAMaxDistances.BASEBUILDING );
+	}
+		
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override bool UseAcknowledgment()
+	{
+		return true;
+	}
+
+	override typename GetInputType()
+	{
+		return InteractActionInput;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		EntityAI target_entity = EntityAI.Cast( target.GetObject() );
+		if ( target_entity && target_entity.CanUseConstruction() )
+		{
+			BaseBuildingBase base_building = BaseBuildingBase.Cast( target_entity );
+			if(!base_building.IsPlayerInside(player,""))
+				return false;
+			
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			
+			string main_part_name = target_entity.GetActionComponentName( target.GetComponentIndex() );
+			construction_action_data.RefreshAttachmentsToDetach( target_entity, main_part_name );
+			
+			if ( construction_action_data.GetAttachmentsToDetachCount() > 1 )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		//set next index
+		ConstructionActionData construction_action_data = action_data.m_Player.GetConstructionActionData();
+		construction_action_data.SetNextAttachmentIndex();
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleFishing.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleFishing.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd334042aa39701fb1d51e3efe727e9593b2aedb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleFishing.c
@@ -0,0 +1,56 @@
+/*class ActionToggleFishing: ActionSingleUseBase
+{
+	void ActionToggleFishing()
+	{
+		m_Sound = "CastingRod";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override string GetText()
+	{
+		return "TODO";
+	}
+
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return true;
+		
+		vector pos_cursor = target.GetCursorHitPos();
+		float distance = Math.AbsInt(vector.Distance(pos_cursor,player.GetPosition()));
+		if ( distance <= 2 )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		FishingRod_Base nitem = FishingRod_Base.Cast( action_data.m_MainItem );
+		if( action_data.m_MainItem.GetAnimationPhase("OpenRod") )
+		{
+			//nitem.DeactivateFishing();
+			action_data.m_MainItem.SetAnimationPhase("CloseRod",1);
+			action_data.m_MainItem.SetAnimationPhase("OpenRod",0);
+		}
+		else
+		{
+			//nitem.ActivateFishing();
+			action_data.m_MainItem.SetAnimationPhase("CloseRod",0);
+			action_data.m_MainItem.SetAnimationPhase("OpenRod",1);
+		}
+	}
+};*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleNVG.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleNVG.c
new file mode 100644
index 0000000000000000000000000000000000000000..93b411596b3d511629a1e1851e48d7b033d3c30f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleNVG.c
@@ -0,0 +1,59 @@
+class ActionToggleNVG: ActionBase
+{
+	void ActionToggleNVG()
+	{
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override typename GetInputType()
+	{
+		return ToggleNVGActionInput;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		NVGoggles goggles;
+		Clothing NVmount;
+		NVmount = Clothing.Cast(target.GetObject());
+		if ( !NVmount )
+			return false;
+		goggles = NVGoggles.Cast(NVmount.FindAttachmentBySlotName("NVG"));
+		if ( goggles )
+			return true;
+		
+		return false;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		NVGoggles goggles;
+		Clothing NVmount;
+
+		NVmount = Clothing.Cast(action_data.m_Target.GetObject());
+		goggles = NVGoggles.Cast(NVmount.FindAttachmentBySlotName("NVG"));
+		
+		goggles.RotateGoggles(goggles.m_IsLowered);
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleNVMode.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleNVMode.c
new file mode 100644
index 0000000000000000000000000000000000000000..27dfc0fd690f4f8354a8512fec490e1bcf17a6d5
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionToggleNVMode.c
@@ -0,0 +1,60 @@
+
+class ActionToggleNVMode: ActionSingleUseBase
+{
+	void ActionToggleNVMode()
+	{
+		//m_CallbackClass = ActionTurnOnTransmitterCB;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_ITEM_ON;
+		m_Text = "#switch_mode";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemOptics optics;
+		if ( Class.CastTo(optics,item) && optics.IsNVOptic() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{
+		SwitchMode(action_data);
+	}
+	
+	override void OnExecuteClient( ActionData action_data )
+	{
+		SwitchMode(action_data);
+	}
+	
+	void SwitchMode( ActionData action_data )
+	{
+		ItemOptics optics = ItemOptics.Cast(action_data.m_MainItem);
+		switch (optics.GetCurrentOpticMode())
+		{
+			case GameConstants.OPTICS_STATE_DAY:
+				optics.SetCurrentOpticMode(GameConstants.OPTICS_STATE_NIGHTVISION);
+				//TODO: animate
+			break;
+			
+			case GameConstants.OPTICS_STATE_NIGHTVISION:
+				optics.SetCurrentOpticMode(GameConstants.OPTICS_STATE_DAY);
+				//TODO: animate
+			break;
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTogglePlaceObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTogglePlaceObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0b34788e7ff6af4798a17debe23d13aede99167
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTogglePlaceObject.c
@@ -0,0 +1,60 @@
+class ActionTogglePlaceObject : ActionSingleUseBase
+{
+	void ActionTogglePlaceObject()
+	{
+		m_Text = "#toggle_placing";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool IsLocal()
+	{
+		return true;
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool IsDeploymentAction()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override bool CanBeUsedWithBrokenLegs()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		// not placeable if liquid is present; exception for barrels, for now
+		if (!item.IsKindOf("Barrel_ColorBase") && item.IsLiquidPresent())
+			return false;
+		
+		return true;
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+
+		action_data.m_Player.SetLocalProjectionPosition(action_data.m_Target.GetCursorHitPos());
+		action_data.m_Player.TogglePlacingLocal();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTriggerRemotely.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTriggerRemotely.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e6f545a1f67192b3c1645e30e660afaccb3eeed
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTriggerRemotely.c
@@ -0,0 +1,76 @@
+class ActionTriggerRemotely : ActionSingleUseBase
+{	
+	void ActionTriggerRemotely()
+	{
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_PRESS_TRIGGER;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_PRESS_TRIGGER;
+		m_Text 				= "#STR_Detonate";
+	}
+	
+	override void CreateConditionComponents()
+	{	
+		m_ConditionTarget	= new CCTNone();
+		m_ConditionItem		= new CCINonRuined();
+	}
+
+	override bool HasProgress()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		RemoteDetonatorTrigger rdt = RemoteDetonatorTrigger.Cast(item);
+		if (rdt && rdt.IsConnected())
+		{
+			ExplosivesBase controlledDevice = ExplosivesBase.Cast(rdt.GetControlledDevice());
+			if (controlledDevice && controlledDevice.GetPairDevice() != item)
+			{
+				rdt.UpdateLED(ERemoteDetonatorLEDState.OFF);
+
+				return false;
+			}
+
+			if (controlledDevice && !controlledDevice.IsRuined() && controlledDevice.GetArmed())
+			{
+				if (vector.DistanceSq(player.GetPosition(), controlledDevice.GetPosition()) <= Math.SqrFloat(UAMaxDistances.EXPLOSIVE_REMOTE_ACTIVATION))
+				{
+					rdt.UpdateLED(ERemoteDetonatorLEDState.LIT);
+					
+					return true;
+				}
+			}
+		}
+		
+		rdt.UpdateLED(ERemoteDetonatorLEDState.OFF);
+
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		super.OnExecuteServer(action_data);
+
+		RemoteDetonatorTrigger rdt = RemoteDetonatorTrigger.Cast(action_data.m_MainItem);
+		if (rdt && rdt.IsConnected()) 
+		{
+			ItemBase controlledDevice = ItemBase.Cast(rdt.GetControlledDevice());
+			if (controlledDevice && !controlledDevice.IsRuined())
+			{
+				controlledDevice.OnActivatedByItem(action_data.m_MainItem);
+				action_data.m_MainItem.SetAnimationPhase("trigger", 1);
+				action_data.m_MainItem.SetAnimationPhase("lever", 1);
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffAlarmClock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffAlarmClock.c
new file mode 100644
index 0000000000000000000000000000000000000000..14962fb07b2f45e41b52e911ed525973097a4787
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffAlarmClock.c
@@ -0,0 +1,36 @@
+class ActionTurnOffAlarmClockCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseTurnOnPlugged;
+	}
+}
+
+class ActionTurnOffAlarmClock: ActionTurnOffWhileInHands
+{
+	void ActionTurnOffAlarmClock()
+	{
+		m_CallbackClass = ActionTurnOffAlarmClockCB;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_STOP_ALARM;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_STOP_ALARM;
+		m_Text = "#turn_off";
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+		
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ClockBase alarm = ClockBase.Cast(item);
+		return (alarm.IsRinging() || alarm.IsAlarmOn());
+	}
+		
+	override void OnExecuteServer( ActionData action_data )
+	{
+		ClockBase alarm = ClockBase.Cast(action_data.m_MainItem);
+		if (alarm)
+			alarm.TurnOff();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffHeadtorch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffHeadtorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc90d999b3256800e6540c268cf7cc126ff4b45b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffHeadtorch.c
@@ -0,0 +1,62 @@
+class ActionTurnOffHeadtorch: ActionBase
+{
+	void ActionTurnOffHeadtorch()
+	{
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override typename GetInputType()
+	{
+		return ToggleLightsActionInput;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Headtorch_ColorBase headtorch;
+		headtorch = Headtorch_ColorBase.Cast(target.GetObject());
+		if ( !headtorch )
+			return false;
+		
+		if ( headtorch.HasEnergyManager() && headtorch.GetCompEM().CanSwitchOff() ) //TODO review conditions for turning off
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		Headtorch_ColorBase headtorch;
+		headtorch = Headtorch_ColorBase.Cast(action_data.m_Target.GetObject());
+		if ( headtorch.HasEnergyManager() )
+		{
+			if ( headtorch.GetCompEM().IsSwitchedOn() )
+			{
+				headtorch.GetCompEM().SwitchOff();
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffHelmetFlashlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffHelmetFlashlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..e116d630c52d6aadda327bcdeea607efebb35d19
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffHelmetFlashlight.c
@@ -0,0 +1,69 @@
+class ActionTurnOffHelmetFlashlight: ActionBase
+{
+	void ActionTurnOffHelmetFlashlight()
+	{
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override typename GetInputType()
+	{
+		return ToggleLightsActionInput;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Switchable_Base light;
+		Mich2001Helmet helmet;
+		helmet = Mich2001Helmet.Cast(target.GetObject());
+		if ( !helmet )
+			return false;
+		light = Switchable_Base.Cast(helmet.FindAttachmentBySlotName("helmetFlashlight"));
+		if ( !light )
+			return false;
+		
+		if ( light.HasEnergyManager() && light.GetCompEM().CanSwitchOff() ) //TODO review conditions for turning off
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		Switchable_Base light;// = Switchable_Base.Cast(action_data.m_MainItem.FindAttachmentBySlotName("helmetFlashlight"));
+		Mich2001Helmet helmet;
+		helmet = Mich2001Helmet.Cast(action_data.m_Target.GetObject());
+		light = Switchable_Base.Cast(helmet.FindAttachmentBySlotName("helmetFlashlight"));
+		
+		if ( light.HasEnergyManager() )
+		{
+			if ( light.GetCompEM().IsSwitchedOn() )
+			{
+				light.GetCompEM().SwitchOff();
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffTransmitter.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffTransmitter.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1c911edecf71f24dbc01fa60096483037616a30
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffTransmitter.c
@@ -0,0 +1,39 @@
+class ActionTurnOffTransmitterCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUse();
+	}
+}
+
+class ActionTurnOffTransmitter: ActionTurnOffWhileInHands
+{
+	void ActionTurnOffTransmitter()
+	{
+		m_CallbackClass 	= ActionTurnOffTransmitterCB;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_OFF;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_ITEM_OFF;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text 				= "#turn_off";
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item.IsTransmitter())
+		{
+			return item.HasEnergyManager() && item.GetCompEM().IsWorking();
+		}
+
+		return false;
+	}
+		
+	override void OnExecuteServer(ActionData action_data)
+	{
+		action_data.m_MainItem.GetCompEM().SwitchOff();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffWeaponFlashlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffWeaponFlashlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..224c29f8c1cf97c672f01d9fab9c2b889ae74050
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffWeaponFlashlight.c
@@ -0,0 +1,56 @@
+class ActionTurnOffWeaponFlashlight: ActionSingleUseBase
+{
+	ItemBase m_flashlight;
+	
+	void ActionTurnOffWeaponFlashlight()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_OFF;//CMD_ACTIONMOD_INTERACTONCE
+		m_Text = "#switch_off";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( item.IsInherited(Rifle_Base) )
+		{
+			//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LIGHTFLARE;
+			m_flashlight = ItemBase.Cast(item.FindAttachmentBySlotName("weaponFlashlight"));
+		}
+		else if (item.IsInherited(Pistol_Base))
+		{
+			//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LITCHEMLIGHT;
+			m_flashlight = ItemBase.Cast(item.FindAttachmentBySlotName("pistolFlashlight"));
+		}
+		else //is not valid item
+			return false;
+		
+		if ( m_flashlight && m_flashlight.HasEnergyManager() && m_flashlight.GetCompEM().CanSwitchOff() ) //TODO review conditions for turning off
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{		
+		if ( m_flashlight.HasEnergyManager() )
+		{
+			if ( m_flashlight.GetCompEM().IsSwitchedOn() )
+			{
+				m_flashlight.GetCompEM().SwitchOff();
+			}
+			Weapon_Base.Cast(action_data.m_MainItem).FlashlightOff(); //currently seems to be doing nothing
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffWhileInHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffWhileInHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..98174e8785b99d55fe502ed561dfd68480a0f2c3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOffWhileInHands.c
@@ -0,0 +1,54 @@
+class ActionTurnOffWhileInHands : ActionSingleUseBase
+{
+	void ActionTurnOffWhileInHands()
+	{
+		m_Text = "#switch_off";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item.IsInherited(Roadflare))
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_LIGHTFLARE;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_LIGHTFLARE;
+		}
+		else if (item.IsInherited(Chemlight_ColorBase))
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_LITCHEMLIGHT;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_LITCHEMLIGHT;
+		}
+		else if (item.IsInherited(GPSReceiver))
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_PRESS_TRIGGER;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_PRESS_TRIGGER;
+		}
+		else
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_ITEM_OFF;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_ITEM_OFF;
+		}
+		
+		return item.HasEnergyManager() && item.GetCompEM().CanSwitchOff();
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		action_data.m_MainItem.GetCompEM().SwitchOff();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnAlarmClock.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnAlarmClock.c
new file mode 100644
index 0000000000000000000000000000000000000000..817100bc52c51f3ad5fff35a4e4be66d1382be0d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnAlarmClock.c
@@ -0,0 +1,45 @@
+class ActionTurnOnAlarmClockCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseTurnOnPlugged;
+	}
+}
+
+class ActionTurnOnAlarmClock: ActionTurnOnWhileInHands
+{
+	void ActionTurnOnAlarmClock()
+	{
+		m_CallbackClass = ActionTurnOnAlarmClockCB;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_STOP_ALARM;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_STOP_ALARM;
+		m_Text = "#turn_on";
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+		
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		AlarmClock_ColorBase alarm = AlarmClock_ColorBase.Cast(item);
+		return (!alarm.IsAlarmOn() && !alarm.IsRinging());
+	}
+		
+	/*
+	override void OnExecuteClient( ActionData action_data )
+	{
+		AlarmClock_ColorBase alarm = AlarmClock_ColorBase.Cast(action_data.m_MainItem);
+		if (alarm)
+			alarm.TurnOnClient();
+	}
+	*/
+	
+	override void OnExecuteServer( ActionData action_data )
+	{
+		AlarmClock_ColorBase alarm = AlarmClock_ColorBase.Cast(action_data.m_MainItem);
+		if (alarm)
+			alarm.TurnOn();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnChemlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnChemlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..a41bcf986f6feb3435e569dc6b7e83ae14c93c52
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnChemlight.c
@@ -0,0 +1,8 @@
+class ActionTurnOnChemlight: ActionTurnOnWhileInHands
+{
+	void ActionTurnOnChemlight()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LITCHEMLIGHT;
+		m_Text = "#activate";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHeadtorch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHeadtorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..dfd7d554dbd6e1b9359b6c852dac124a6659f923
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHeadtorch.c
@@ -0,0 +1,62 @@
+class ActionTurnOnHeadtorch: ActionBase
+{
+	void ActionTurnOnHeadtorch()
+	{
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override typename GetInputType()
+	{
+		return ToggleLightsActionInput;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Headtorch_ColorBase headtorch;
+		headtorch = Headtorch_ColorBase.Cast(target.GetObject());
+		if ( !headtorch )
+			return false;
+		
+		if ( headtorch.HasEnergyManager() && headtorch.GetCompEM().CanSwitchOn() && headtorch.GetCompEM().CanWork() ) //TODO review conditions for turning off
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		Headtorch_ColorBase headtorch;
+		headtorch = Headtorch_ColorBase.Cast(action_data.m_Target.GetObject());
+		if ( headtorch.HasEnergyManager() )
+		{
+			if ( headtorch.GetCompEM().CanWork() )
+			{
+				headtorch.GetCompEM().SwitchOn();
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHeatpack.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHeatpack.c
new file mode 100644
index 0000000000000000000000000000000000000000..3982f30f77240913caed906e498115324bebea80
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHeatpack.c
@@ -0,0 +1,7 @@
+class ActionTurnOnHeatpack : ActionTurnOnWhileInHands
+{
+	void ActionTurnOnHeatpack()
+	{
+		m_Text = "#activate";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHelmetFlashlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHelmetFlashlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..843443066023f90e7f205bb1363ffa2729950697
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnHelmetFlashlight.c
@@ -0,0 +1,69 @@
+class ActionTurnOnHelmetFlashlight: ActionBase
+{
+	void ActionTurnOnHelmetFlashlight()
+	{
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	override typename GetInputType()
+	{
+		return ToggleLightsActionInput;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		Switchable_Base light;
+		Mich2001Helmet helmet;
+		helmet = Mich2001Helmet.Cast(target.GetObject());
+		if ( !helmet )
+			return false;
+		light = Switchable_Base.Cast(helmet.FindAttachmentBySlotName("helmetFlashlight"));
+		if ( !light )
+			return false;
+		
+		if ( light.HasEnergyManager() && light.GetCompEM().CanSwitchOn() && light.GetCompEM().CanWork() ) //TODO review conditions for turning off
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		Switchable_Base light;// = Switchable_Base.Cast(action_data.m_MainItem.FindAttachmentBySlotName("helmetFlashlight"));
+		Mich2001Helmet helmet;
+		helmet = Mich2001Helmet.Cast(action_data.m_Target.GetObject());
+		light = Switchable_Base.Cast(helmet.FindAttachmentBySlotName("helmetFlashlight"));
+		
+		if ( light.HasEnergyManager() )
+		{
+			if ( light.GetCompEM().CanWork() )
+			{
+				light.GetCompEM().SwitchOn();
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnTransmitter.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnTransmitter.c
new file mode 100644
index 0000000000000000000000000000000000000000..891ee16221b0822a1d809701a29cf9d7e33de6d3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnTransmitter.c
@@ -0,0 +1,33 @@
+class ActionTurnOnTransmitterCB : ActionSingleUseBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CASingleUseTurnOnPlugged();
+	}
+}
+
+class ActionTurnOnTransmitter : ActionTurnOnWhileInHands
+{
+	void ActionTurnOnTransmitter()
+	{
+		m_CallbackClass 	= ActionTurnOnTransmitterCB;
+		m_CommandUID        = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_ITEM_ON;
+		m_Text 				= "#turn_on";
+	}
+		
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item.IsTransmitter())
+		{
+			return item.HasEnergyManager() && !item.GetCompEM().IsWorking();
+		}
+		
+		return false;
+	}
+		
+	override void OnExecuteServer(ActionData action_data)
+	{
+		action_data.m_MainItem.GetCompEM().SwitchOn();
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnWeaponFlashlight.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnWeaponFlashlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a038e9a91ca098d084135d3796735bdef86d783
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnWeaponFlashlight.c
@@ -0,0 +1,56 @@
+class ActionTurnOnWeaponFlashlight: ActionSingleUseBase
+{
+	ItemBase m_flashlight;
+	
+	void ActionTurnOnWeaponFlashlight()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON;//CMD_ACTIONMOD_INTERACTONCE
+		m_Text = "#switch_on";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( item.IsInherited(Rifle_Base) )
+		{
+			//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LIGHTFLARE;
+			m_flashlight = ItemBase.Cast(item.FindAttachmentBySlotName("weaponFlashlight"));
+		}
+		else if (item.IsInherited(Pistol_Base))
+		{
+			//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LITCHEMLIGHT;
+			m_flashlight = ItemBase.Cast(item.FindAttachmentBySlotName("pistolFlashlight"));
+		}
+		else //is not valid item
+			return false;
+		
+		if ( m_flashlight && m_flashlight.HasEnergyManager() && m_flashlight.GetCompEM().CanSwitchOn() && m_flashlight.GetCompEM().CanWork() ) //TODO review conditions for turning off
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{
+		if ( m_flashlight.HasEnergyManager() )
+		{
+			if ( m_flashlight.GetCompEM().CanWork() )
+			{
+				m_flashlight.GetCompEM().SwitchOn();
+			}
+			Weapon_Base.Cast(action_data.m_MainItem).FlashlightOn();  //currently seems to be doing nothing
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnWhileInHands.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnWhileInHands.c
new file mode 100644
index 0000000000000000000000000000000000000000..d97dc3a57364b54b48b313a8a27b6346f826c86f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionTurnOnWhileInHands.c
@@ -0,0 +1,83 @@
+class ActionTurnOnWhileInHands : ActionSingleUseBase
+{
+	void ActionTurnOnWhileInHands()
+	{
+		m_Text = "#switch_on";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool HasProneException()
+	{
+		return true;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (item.IsInherited(Roadflare))
+		{
+			m_CommandUID		= DayZPlayerConstants.CMD_ACTIONMOD_LIGHTFLARE;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_LITCHEMLIGHT;
+		}
+		else if (item.IsInherited(Chemlight_ColorBase))
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_LITCHEMLIGHT;
+			m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_LITCHEMLIGHT;
+		}
+		else if (item.IsInherited(GPSReceiver))
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_PRESS_TRIGGER;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_PRESS_TRIGGER;
+		}
+		else if (item.IsInherited(Heatpack))
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_HEATPACK;
+			m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_HEATPACK;
+		}
+		else
+		{
+			m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON;
+			m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_ITEM_ON;
+		}
+		
+		return item.HasEnergyManager() && item.GetCompEM().CanSwitchOn() && item.GetCompEM().CanWork();
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		if ( action_data.m_MainItem.HasEnergyManager() )
+		{
+			if (action_data.m_MainItem.GetCompEM().CanWork())
+			{
+				action_data.m_MainItem.GetCompEM().SwitchOn();
+			}
+		}
+	}
+	
+	override void OnStartClient(ActionData action_data)
+	{
+		if (action_data.m_MainItem && action_data.m_MainItem.IsInherited(Roadflare))
+		{
+			Roadflare flare = Roadflare.Cast(action_data.m_MainItem);
+			flare.SetModelState(RoadflareModelStates.UNCAPPED_UNIGNITED);
+		}
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		if (action_data.m_MainItem && action_data.m_MainItem.IsInherited(Roadflare))
+		{
+			Roadflare flare = Roadflare.Cast(action_data.m_MainItem);
+			flare.SetModelState(RoadflareModelStates.UNCAPPED_UNIGNITED);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldBandana.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldBandana.c
new file mode 100644
index 0000000000000000000000000000000000000000..5d76d21dfed2e452824ff9b467f934092005f751
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldBandana.c
@@ -0,0 +1,16 @@
+class ActionUnfoldBandana : ActionUnfoldEntity
+{
+	void ActionUnfoldBandana ()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+		m_Text = "#bandana_unfold";
+	}
+};
+
+class UnfoldBandanaLambda : TurnItemIntoItemLambda
+{
+	void UnfoldBandanaLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldEntity.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldEntity.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7f2be16c342b0e6336938fa64cbab753d94abd1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldEntity.c
@@ -0,0 +1,56 @@
+
+class ActionUnfoldEntity : ActionSingleUseBase
+{
+	void ActionUnfoldEntity ()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS;
+	}
+
+	override void CreateConditionComponents ()
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget () { return false; }
+
+	override bool ActionCondition ( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if (item)
+			return true;
+		return false;
+	}
+
+	override bool ActionConditionContinue ( ActionData action_data ) { return true; }
+
+	override void OnExecuteClient ( ActionData action_data )
+	{
+		ClearInventoryReservationEx(action_data);
+	}
+
+	override void OnExecuteServer ( ActionData action_data )
+	{
+		if ( !GetGame().IsMultiplayer() )
+			ClearInventoryReservationEx(action_data);
+
+		ItemBase old_item = action_data.m_MainItem;
+		if (old_item.ConfigIsExisting("ChangeIntoOnDetach"))
+		{
+			string str = old_item.ChangeIntoOnDetach();
+			if (str  != "")
+			{
+				UnfoldEntityLambda lambda = new UnfoldEntityLambda(action_data.m_MainItem, str, action_data.m_Player);
+				lambda.SetTransferParams(true, true, true, false, 1);
+				action_data.m_Player.ServerReplaceItemInHandsWithNew(lambda);
+			}
+		}
+	}
+};
+
+class UnfoldEntityLambda : TurnItemIntoItemLambda
+{
+	void UnfoldEntityLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldMap.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldMap.c
new file mode 100644
index 0000000000000000000000000000000000000000..800271d0eb41340b48675127b0f6bf2341b6d233
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnfoldMap.c
@@ -0,0 +1,259 @@
+class ActionUnfoldMapCB : ActionBaseCB
+{
+	bool 								m_MapFolding;
+	bool 								m_HasReceivedEvent;
+	bool 								m_CancelCondition;
+	int 								m_InitMovementState;
+	int 								m_FinalMovementState;
+	
+	void ActionUnfoldMapCB()
+	{
+		RegisterAnimationEvent("ActionExec", UA_ANIM_EVENT);
+		EnableStateChangeCallback();
+		EnableCancelCondition(true);
+	}
+	
+	void ~ActionUnfoldMapCB()
+	{
+		if (GetGame() && GetGame().GetMission())
+		{
+			if (!CfgGameplayHandler.GetUse3DMap())
+			{
+				GetGame().GetMission().RemoveActiveInputExcludes({"map"}, false);
+			}
+			else
+			{
+				GetGame().GetMission().RemoveActiveInputExcludes({"loopedactions"}, false);
+			}
+			GetGame().GetMission().RemoveActiveInputRestriction(EInputRestrictors.MAP);
+		}
+		
+		if (!m_ActionData || !m_ActionData.m_Player)
+			return;
+		
+		ItemMap chernomap = ItemMap.Cast(m_ActionData.m_Player.GetItemInHands());
+		if (chernomap && m_ActionData.m_Player.IsMapOpen())
+		{
+			chernomap.SetMapStateOpen(false, m_ActionData.m_Player);
+		}
+	}
+	
+	override void SetActionData(ActionData action_data)
+	{
+		m_ActionData = action_data;
+		m_InitMovementState = m_ActionData.m_Player.m_MovementState.m_iStanceIdx;
+	}
+	
+	bool CancelCondition()
+	{
+		return m_CancelCondition;
+	}
+	
+	override void OnStateChange(int pOldState, int pCurrentState)
+	{
+		if (!m_ActionData || !m_ActionData.m_Player)
+			return;
+				
+		if ((pOldState == STATE_LOOP_IN && pCurrentState == STATE_LOOP_LOOP) && !m_HasReceivedEvent)
+		{
+			m_CancelCondition = true;
+		}
+	}
+	
+	override void OnAnimationEvent(int pEventID)
+	{
+		if (!m_ActionData || !m_ActionData.m_Player)
+			return;
+		
+		switch (pEventID)
+		{
+			case UA_ANIM_EVENT: 
+				m_HasReceivedEvent = true;
+				m_FinalMovementState = m_ActionData.m_Player.m_MovementState.m_iStanceIdx;
+				
+				if (StateCheck())
+				{
+					PerformMapChange();
+					m_CancelCondition = false; 
+				}
+				else
+				{
+					m_CancelCondition = true; 
+				}
+			break;
+		}
+	}
+	
+	override void OnFinish(bool pCanceled)	
+	{
+		if (m_ActionData && m_ActionData.m_Player)
+		{
+			if (m_ActionData && m_ActionData.m_ActionComponent)
+				m_ActionData.m_State = m_ActionData.m_ActionComponent.Interrupt(m_ActionData);
+			
+			if ((!GetGame().IsDedicatedServer()) && GetGame().GetUIManager() && GetGame().GetUIManager().IsMenuOpen(MENU_MAP))
+			{
+				GetGame().GetUIManager().FindMenu(MENU_MAP).Close();
+			}
+			
+			ActionUnfoldMap action = ActionUnfoldMap.Cast(m_ActionData.m_Action);
+			m_InitMovementState = -1;
+			m_FinalMovementState = -1;
+			
+			m_ActionData.m_Player.SetMapClosingSyncSet(false); //reset
+			
+			ItemMap chernomap = ItemMap.Cast(m_ActionData.m_Player.GetItemInHands());
+			if (chernomap && m_ActionData.m_Player.IsMapOpen())
+			{
+				chernomap.SetMapStateOpen(false, m_ActionData.m_Player);
+			}
+			
+			if (action)
+				action.End(m_ActionData);
+		}
+	}
+	
+	void PerformMapChange()
+	{
+		if (m_ActionData.m_Player.IsSwimming() || m_ActionData.m_Player.IsClimbing() || m_ActionData.m_Player.IsFalling() || m_ActionData.m_Player.IsClimbingLadder() || m_ActionData.m_Player.IsUnconscious() || m_ActionData.m_Player.IsRestrained())
+			return;
+		
+		ItemMap chernomap = ItemMap.Cast(m_ActionData.m_Player.GetItemInHands());
+		if (chernomap)
+		{
+			if (!m_ActionData.m_Player.IsMapOpen() && !m_MapFolding)
+			{
+				if (m_CancelCondition) //do not open when cancelling in progress
+					return;
+				
+				chernomap.SetMapStateOpen(true, m_ActionData.m_Player);
+		
+				if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+				{
+					//chernomap.SyncMapMarkers();
+				}
+	
+				if (!GetGame().IsDedicatedServer())
+				{
+					UIManager 	m_UIManager;
+					UIScriptedMenu 	mapMenu;
+					m_UIManager = GetGame().GetUIManager();
+					m_UIManager.CloseAll();
+					if (!CfgGameplayHandler.GetUse3DMap())
+					{
+						mapMenu = m_UIManager.EnterScriptedMenu(MENU_MAP, null);
+						mapMenu.InitMapItem(chernomap);
+						mapMenu.LoadMapMarkers();
+						GetGame().GetMission().AddActiveInputExcludes({"map"});
+					}
+					else
+					{
+						GetGame().GetMission().AddActiveInputExcludes({"loopedactions"});
+					}
+	
+					GetGame().GetMission().AddActiveInputRestriction(EInputRestrictors.MAP);
+				}			
+			}
+			else if (m_ActionData.m_Player.IsMapOpen())
+			{
+				chernomap.SetMapStateOpen(false, m_ActionData.m_Player);
+				m_MapFolding = true;
+				m_ActionData.m_Player.SetMapOpen(false);
+			}
+		}
+	}
+	
+	bool StateCheck()
+	{
+		return m_InitMovementState == m_FinalMovementState;
+	}
+}
+
+class ActionUnfoldMap: ActionBase
+{
+	void ActionUnfoldMap()
+	{
+		m_Text = "#unfold_map";
+	}
+	
+	override bool IsInstant()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTNone();
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (player.m_hac || player.IsMapOpen())
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+	
+	override void OnStartClient(ActionData action_data)
+	{
+		OpenMap(action_data);
+	}
+	
+	override void OnStartServer(ActionData action_data)
+	{
+		OpenMap(action_data);
+		ItemMap chernomap = ItemMap.Cast(action_data.m_MainItem);
+		chernomap.SyncMapMarkers();
+	}
+	
+	override void OnEndRequest(ActionData action_data)
+	{
+		action_data.m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_END);
+		action_data.m_State = UA_FINISHED;
+	}
+	
+	override void Interrupt(ActionData action_data)
+	{
+		if (action_data.m_Player.m_hac)
+		{
+			action_data.m_Player.m_hac.m_MapFolding = true;
+			action_data.m_Player.m_hac.PerformMapChange();
+			action_data.m_Player.m_hac.Cancel();
+		}
+		else //should never get here, End called from the callback
+		{
+			End(action_data);
+		}
+	}
+	
+	void OpenMap(ActionData action_data)
+	{
+		if (!action_data.m_Player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_PRONE))
+		{
+			action_data.m_Player.m_hac = ActionUnfoldMapCB.Cast(action_data.m_Player.AddCommandModifier_Action(DayZPlayerConstants.CMD_ACTIONMOD_VIEWMAP,ActionUnfoldMapCB));
+		}
+		else
+		{
+			action_data.m_Player.m_hac = ActionUnfoldMapCB.Cast(action_data.m_Player.StartCommand_Action(DayZPlayerConstants.CMD_ACTIONFB_VIEWMAP,ActionUnfoldMapCB,DayZPlayerConstants.STANCEMASK_PRONE));
+		}
+		
+		// sets player for associated callback to use
+		if (action_data.m_Player.m_hac)
+		{
+			action_data.m_Player.m_hac.SetActionData(action_data);
+			action_data.m_Callback = action_data.m_Player.m_hac;
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnpin.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnpin.c
new file mode 100644
index 0000000000000000000000000000000000000000..c8731aeb7914f57250ecda9ce255878ea6d6790d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionUnpin.c
@@ -0,0 +1,50 @@
+class ActionUnpin extends ActionSingleUseBase
+{
+	void ActionUnpin()
+	{
+		m_Text = "#unpin";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ( item.IsInherited(Grenade_Base) )
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_UNPINGRENAGE;
+		}
+		else
+		{
+			m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON;
+		}
+		
+		Grenade_Base grenade = Grenade_Base.Cast(item);
+		if( grenade )
+		{
+			if( grenade.IsPinned() )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecute( ActionData action_data )
+	{
+		Grenade_Base grenade = Grenade_Base.Cast(action_data.m_MainItem);
+		if( grenade )
+		{
+			grenade.Unpin();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWashHandsItem.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWashHandsItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..183609a46e57dc1b53a6f891714bb9fa89a81817
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWashHandsItem.c
@@ -0,0 +1,47 @@
+class ActionWashHandsItem: ActionSingleUseBase
+{
+	protected const float WASH_HANDS_AMOUNT = 250; //ml
+	
+	void ActionWashHandsItem()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_CLEANHANDSBOTTLE;
+		m_CommandUIDProne = DayZPlayerConstants.CMD_ACTIONFB_CLEANHANDSBOTTLE;
+		m_StanceMask        = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text = "#wash_hands";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINotRuinedAndEmpty;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool HasProneException()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		//Print(item.GetQuantity());
+		if ( player.GetItemOnSlot("Gloves") )
+			return false;
+		 
+		return player.HasBloodyHands() && ( item.GetQuantity() >= item.GetDisinfectQuantity() );
+	}
+
+	override void OnEndServer( ActionData action_data )
+	{
+		if (action_data.m_State != UA_INTERRUPT)
+		{
+			PluginLifespan module_lifespan = PluginLifespan.Cast( GetPlugin( PluginLifespan ) );
+			module_lifespan.UpdateBloodyHandsVisibility( action_data.m_Player, false );
+			action_data.m_MainItem.AddQuantity( -action_data.m_MainItem.GetDisinfectQuantity(), false );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldCraftCancel.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldCraftCancel.c
new file mode 100644
index 0000000000000000000000000000000000000000..57eaa98373179c8ba1982d57e2272c587bb36620
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldCraftCancel.c
@@ -0,0 +1,28 @@
+class ActionWorldCraftCancel: ActionSingleUseBase
+{
+	void ActionWorldCraftCancel()
+	{
+		m_Text = "#cancel";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		return player.GetCraftingManager().IsInventoryCraft();
+	}
+	
+	override void Start( ActionData action_data ) //Setup on start of action
+	{
+		super.Start( action_data );
+	}
+	
+	override bool IsLocal()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldCraftSwitch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldCraftSwitch.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b99d65f7b3ee0a0d6c95b21e739b8eec7566ff3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldCraftSwitch.c
@@ -0,0 +1,44 @@
+class ActionWorldCraftSwitch: ActionSingleUseBase
+{
+	void ActionWorldCraftSwitch()
+	{
+		m_Text = "#next_recipe";
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTObject(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool IsLocal()
+	{
+		return true;
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		if ( player.GetCraftingManager().GetRecipesCount() > 1 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void Start( ActionData action_data ) //Setup on start of action
+	{
+		super.Start( action_data );
+		action_data.m_Player.GetCraftingManager().SetNextRecipe();
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldFlagActionSwitch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldFlagActionSwitch.c
new file mode 100644
index 0000000000000000000000000000000000000000..ad8fb7e9285d5e74255742c390ba1875420a39be
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldFlagActionSwitch.c
@@ -0,0 +1,83 @@
+class FlagTendencyActionReciveData : ActionReciveData
+{
+	bool m_TendencyRecived;
+}
+
+class FlagTendencyActionData : ActionData
+{
+	bool m_Tendency;
+};
+
+class ActionWorldFlagActionSwitch: ActionSingleUseBase
+{
+	bool 	m_switch_to;
+	void ActionWorldFlagActionSwitch()
+	{
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTCursor;
+	}
+	
+	/*override string GetText()
+	{
+		if (!m_switch_to)
+			return  "#switch_to_flag_raise";
+		return "#switch_to_flag_lower";
+	}*/
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		TerritoryFlag totem = TerritoryFlag.Cast( target.GetObject() );
+		if (!totem)
+			return false;
+		
+		float state = totem.GetAnimationPhase("flag_mast");
+		
+		if ( totem && totem.FindAttachmentBySlotName("Material_FPole_Flag") )
+		{
+			if ( player.GetFlagTendencyRaise() && state < 1 )
+			{
+				m_switch_to = true;
+				return true;
+			}
+			else if ( !player.GetFlagTendencyRaise() && state > 0 )
+			{
+				m_switch_to = false;
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override void Start( ActionData action_data ) //Setup on start of action
+	{
+		super.Start( action_data );
+		
+		bool state = action_data.m_Player.GetFlagTendencyRaise();
+		action_data.m_Player.SetFlagTendencyRaise(!state);
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+	
+	override typename GetInputType()
+	{
+		return InteractActionInput;
+	}
+	
+	void SetFlagTendencyOnCurrentActionInvalid(bool state)
+	{
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldLiquidActionSwitch.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldLiquidActionSwitch.c
new file mode 100644
index 0000000000000000000000000000000000000000..3efec9f61432d5dbc91305cb7508b26232454903
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWorldLiquidActionSwitch.c
@@ -0,0 +1,86 @@
+//can be eventually extended to allow switching for multiple action types?
+class ActionWorldLiquidActionSwitch: ActionSingleUseBase
+{
+	bool 	m_switch_to;
+	void ActionWorldLiquidActionSwitch()
+	{
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE;
+	}
+	
+	override void CreateConditionComponents()  
+	{		
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNonRuined(UAMaxDistances.DEFAULT);
+	}
+	
+	/*override string GetText()
+	{
+		//return "#switch_to" + " " + m_switch_to;
+		if (!m_switch_to)
+			return  "#switch_to_liquid_drain";
+		return "#switch_to_liquid_pour";
+	}*/
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemBase target_item = ItemBase.Cast(target.GetObject());
+		if (Barrel_ColorBase.Cast(target_item) && !target_item.IsOpen())
+			return false;
+		
+		if ( target_item && item && Liquid.CanFillContainer( item, target_item.GetLiquidType(),true ) && Liquid.CanFillContainer( target_item, item.GetLiquidType(), true ) && !GetGame().IsInventoryOpen() ) //TODO find better condition than IsKindOf
+		{
+			if ( target_item.GetQuantity() > target_item.GetQuantityMin() && item.GetQuantity() < item.GetQuantityMax() && !player.GetLiquidTendencyDrain() && Liquid.CanFillContainer( item, target_item.GetLiquidType() ) )
+			{
+				if ( Liquid.CanFillContainer( target_item, item.GetLiquidType() ) )
+				{
+					m_switch_to = 0;//"#liquid_drain";
+					return true;
+				}
+				else
+				{
+					player.SetLiquidTendencyDrain(true);
+					return false;
+				}
+			}
+			if ( item.GetQuantity() > item.GetQuantityMin() && target_item.GetQuantity() < target_item.GetQuantityMax() && player.GetLiquidTendencyDrain() && Liquid.CanFillContainer( target_item, item.GetLiquidType() ) )
+			{
+				if ( Liquid.CanFillContainer( item, target_item.GetLiquidType() ) )
+				{
+					m_switch_to = 1;//"#liquid_pour";
+					return true;
+				}
+				else
+				{
+					player.SetLiquidTendencyDrain(false);
+					return false;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override void Start( ActionData action_data ) //Setup on start of action
+	{
+		super.Start( action_data );
+		bool state;
+		state = action_data.m_Player.GetLiquidTendencyDrain();
+		action_data.m_Player.SetLiquidTendencyDrain(!state);
+		
+		//Print(action_data.m_Player.GetLiquidTendencyDrain());
+	}
+	
+	override bool IsLocal()
+	{
+		return true;
+	}
+	
+	override bool IsInstant()
+	{
+		return true;
+	}
+	
+	override bool RemoveForceTargetAfterUse()
+	{
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWritePaper.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWritePaper.c
new file mode 100644
index 0000000000000000000000000000000000000000..369cce729ab383e659cb13b18a7dd50340fa21a4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionWritePaper.c
@@ -0,0 +1,109 @@
+class ActionWritePaperCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		EnableStateChangeCallback();
+		m_ActionData.m_ActionComponent = new CAContinuousTime(-1.0);
+	}
+	
+	override void EndActionComponent()
+	{
+	}
+	
+	override void OnStateChange(int pOldState, int pCurrentState)
+	{
+		if (pCurrentState == STATE_NONE && (!GetGame().IsDedicatedServer()))
+		{
+			if (GetGame().GetUIManager() && GetGame().GetUIManager().IsMenuOpen(MENU_NOTE))
+				GetGame().GetUIManager().FindMenu(MENU_NOTE).Close();
+		}
+		else if (pCurrentState == STATE_LOOP_LOOP && pOldState != STATE_LOOP_LOOP && (!GetGame().IsMultiplayer() || GetGame().IsServer()))
+		{
+			ItemBase paper_item;
+			if (m_ActionData.m_MainItem.ConfigIsExisting("writingColor"))
+			{
+				paper_item = ItemBase.Cast(m_ActionData.m_Target.GetObject());
+			}
+			else
+			{
+				paper_item = ItemBase.Cast(m_ActionData.m_MainItem);
+			}
+			Param1<string> text = new Param1<string>(paper_item.GetWrittenNoteData().GetNoteText());
+			paper_item.RPCSingleParam(ERPCs.RPC_WRITE_NOTE, text, true,m_ActionData.m_Player.GetIdentity());
+		}
+	}
+};
+
+class ActionWritePaper: ActionContinuousBase
+{
+	const float TARGET_DISTANCE = 2;
+	
+	void ActionWritePaper()
+	{
+		m_CallbackClass = ActionWritePaperCB;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_VIEWNOTE;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_PRONE;
+		m_Text = "#write_note";
+	}
+	
+	override void CreateConditionComponents()
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;//CCTNonRuined(TARGET_DISTANCE);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if ((item && item.ConfigIsExisting("writingColor") && target.GetObject() && Paper.Cast(target.GetObject())) || (target.GetObject() && target.GetObject().ConfigIsExisting("writingColor") && item && Paper.Cast(item)))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnStartClient( ActionData action_data )
+	{
+		if (action_data.m_Target.GetObject().ConfigIsExisting("writingColor"))
+		{
+			action_data.m_MainItem.GetWrittenNoteData().InitNoteInfo(ItemBase.Cast(action_data.m_Target.GetObject()),action_data.m_MainItem);
+		}
+		else
+		{
+			ItemBase.Cast(action_data.m_Target.GetObject()).GetWrittenNoteData().InitNoteInfo(action_data.m_MainItem,ItemBase.Cast(action_data.m_Target.GetObject()));
+		}
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		if (action_data.m_Target.GetObject().ConfigIsExisting("writingColor"))
+		{
+			action_data.m_MainItem.GetWrittenNoteData().InitNoteInfo(ItemBase.Cast(action_data.m_Target.GetObject()),action_data.m_MainItem);
+		}
+		else
+		{
+			ItemBase.Cast(action_data.m_Target.GetObject()).GetWrittenNoteData().InitNoteInfo(action_data.m_MainItem,ItemBase.Cast(action_data.m_Target.GetObject()));
+		}
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+		super.OnUpdate(action_data);
+		
+		if(!GetGame().IsDedicatedServer())
+		{
+			if (action_data.m_State == UA_FINISHED && GetGame().GetUIManager() && !GetGame().GetUIManager().IsMenuOpen(MENU_NOTE))
+			{
+				ActionManagerClient.Cast(action_data.m_Player.GetActionManager()).RequestEndAction();
+			}
+		}
+	}
+	
+	override void OnEndRequest(ActionData action_data)
+	{
+		if (action_data.m_Callback)
+		{
+			action_data.m_Callback.InternalCommand(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionZoomIn.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionZoomIn.c
new file mode 100644
index 0000000000000000000000000000000000000000..2c7d547e53161c41782b8e0f858b5fdce6f4c280
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionZoomIn.c
@@ -0,0 +1,37 @@
+class ActionZoomIn: ActionSingleUseBase
+{
+	void ActionZoomIn() 
+	{
+		m_Text = "#zoom_in";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemOptics optic;
+		if( Class.CastTo(optic, item) && !optic.IsInOptics() )
+		{ 
+			return true;
+		}
+		return false;
+	}
+
+	override void OnEndServer( ActionData action_data )
+	{
+		ItemOptics optic;
+		if( Class.CastTo(optic, action_data.m_MainItem) )
+		{
+			optic.EnterOptics(); 
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionZoomOut.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionZoomOut.c
new file mode 100644
index 0000000000000000000000000000000000000000..e57436bd300a2a9b8fd40b9659981733c8f4a731
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/ActionZoomOut.c
@@ -0,0 +1,37 @@
+class ActionZoomOut: ActionSingleUseBase
+{
+	void ActionZoomOut()
+	{
+		m_Text = "#zoom_out";
+	}
+	
+	override void CreateConditionComponents()
+	{
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTNone;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		ItemOptics optic;
+		if( Class.CastTo(optic, item) && optic.IsInOptics() )
+		{ 
+			return true;
+		}
+		return false;
+	}
+
+	override void OnEndServer( ActionData action_data )
+	{
+		ItemOptics optic;
+		if( Class.CastTo(optic, action_data.m_MainItem) )
+		{
+			optic.ExitOptics(); 
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteCharcoalTablets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteCharcoalTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..2fb1b5e034e34602ad245db6d45c242c7906cfa0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteCharcoalTablets.c
@@ -0,0 +1,12 @@
+class ActionBiteCharcoalTablets: ActionConsumeSingle
+{
+	void ActionBiteCharcoalTablets()
+	{
+		//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LICKBATTERY;
+	}
+
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_Player.m_ModifiersManager.DeactivateModifier(eModifiers.MDF_POISONING);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBitePainkillerTablets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBitePainkillerTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..705cfba7c9b4588a051307fce98a7bb382d17cbd
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBitePainkillerTablets.c
@@ -0,0 +1,12 @@
+class ActionBitePainkillerTablets: ActionConsumeSingle
+{
+	void ActionBitePainkillerTablets()
+	{
+		//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LICKBATTERY;
+	}
+
+	override void ApplyModifiers( ActionData action_data )
+	{
+		//player.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBitePurificationTablets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBitePurificationTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a4391003301dbcb5b32c17ce6e599264ff3712a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBitePurificationTablets.c
@@ -0,0 +1,12 @@
+class ActionBitePurificationTablets: ActionConsumeSingle
+{
+	void ActionBitePurificationTablets()
+	{
+		//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_LICKBATTERY;
+	}
+
+	override void ApplyModifiers( ActionData action_data )
+	{
+		//player.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteTetracyclineAntibiotics.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteTetracyclineAntibiotics.c
new file mode 100644
index 0000000000000000000000000000000000000000..4b5e6c72132b50431cd37b8cbf8f2cf6ca0a9a50
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteTetracyclineAntibiotics.c
@@ -0,0 +1,12 @@
+class ActionBiteTetracyclineAntibiotics: ActionConsumeSingle
+{
+	void ActionBiteTetracyclineAntibiotics()
+	{
+		//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EAT;
+	}
+
+	override void ApplyModifiers( ActionData action_data )
+	{
+		//player.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteVitaminBottle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteVitaminBottle.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5e23102148ccf1dae93c4f7560fb44851149946
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionBiteVitaminBottle.c
@@ -0,0 +1,12 @@
+class ActionBiteVitaminBottle: ActionConsumeSingle
+{
+	void ActionBiteVitaminBottle()
+	{
+		//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_EAT;
+	}
+
+	override void ApplyModifiers( ActionData action_data )
+	{
+		//player.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionDisinfectSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionDisinfectSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd97fbc72f66931ca11538ae8134ac672a19ac33
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionDisinfectSelf.c
@@ -0,0 +1,64 @@
+class ActionDisinfectSelfCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT);
+	}
+};
+
+class ActionDisinfectBase: ActionContinuousBase
+{
+	void Apply( ActionData action_data )
+	{
+		ItemBase item = action_data.m_MainItem;
+		item.AddQuantity(-item.GetDisinfectQuantity());
+		
+	}
+}
+
+
+class ActionDisinfectSelf: ActionDisinfectBase
+{
+	float m_GramsConsumedPerUse;//left for legacy reasons
+	
+	void ActionDisinfectSelf()
+	{
+		m_CallbackClass = ActionDisinfectSelfCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_STITCHUPSELF;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#disinfect_self";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSelf;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		return (player.IsBleeding() || (player.m_SyncedModifiers & eModifierSyncIDs.MODIFIER_SYNC_WOUND_INFECT_1) || (player.m_SyncedModifiers & eModifierSyncIDs.MODIFIER_SYNC_WOUND_INFECT_2));
+	}
+	
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{
+		
+		if( action_data.m_Player.GetModifiersManager().IsModifierActive(eModifiers.MDF_DISINFECTION))//effectively resets the timer
+		{
+			action_data.m_Player.GetModifiersManager().DeactivateModifier( eModifiers.MDF_DISINFECTION );
+		}
+		action_data.m_Player.GetModifiersManager().ActivateModifier( eModifiers.MDF_DISINFECTION );
+
+		Apply(action_data);
+	}
+
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionDisinfectTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionDisinfectTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..31005b50e89f14988552d74c0e145ad314850524
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionDisinfectTarget.c
@@ -0,0 +1,53 @@
+class ActionDisinfectTargetCB : ActionContinuousBaseCB
+{
+	override void CreateActionComponent()
+	{
+		m_ActionData.m_ActionComponent = new CAContinuousTime(UATimeSpent.DEFAULT);
+	}
+
+};
+
+class ActionDisinfectTarget: ActionDisinfectBase
+{	
+	void ActionDisinfectTarget()
+	{
+		m_CallbackClass = ActionDisinfectSelfCB;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_LOW;
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INTERACT;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#disinfect_target";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{
+		if( target)
+		{
+			PlayerBase target_player = PlayerBase.Cast(target.GetObject());
+			if(target_player)
+				return (target_player.IsBleeding() || (player.m_SyncedModifiers & eModifierSyncIDs.MODIFIER_SYNC_WOUND_INFECT_1) || (player.m_SyncedModifiers & eModifierSyncIDs.MODIFIER_SYNC_WOUND_INFECT_2));
+			
+		}
+		return false;
+	}
+
+	override void OnFinishProgressServer( ActionData action_data )
+	{	
+		PlayerBase target = PlayerBase.Cast(action_data.m_Target.GetObject());
+		
+		if ( target )
+		{
+			if (CanReceiveAction(action_data.m_Target))
+			{
+				target.GetModifiersManager().ActivateModifier(eModifiers.MDF_DISINFECTION);
+				Apply(action_data);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionEatPillFromBottle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionEatPillFromBottle.c
new file mode 100644
index 0000000000000000000000000000000000000000..167501fccba29a43b401dac34f67ee5d8023ed40
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionEatPillFromBottle.c
@@ -0,0 +1,10 @@
+class ActionEatPillFromBottle : ActionConsumeSingle
+{
+	void ActionEatPillFromBottle()
+	{
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_EAT_PILL;
+		m_CommandUIDProne	= DayZPlayerConstants.CMD_ACTIONFB_EAT_PILL;
+
+		m_Text = "#eat";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionEatTabletFromWrapper.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionEatTabletFromWrapper.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3e471ff91bfb3f1408534ad62e986b143242e50
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionEatTabletFromWrapper.c
@@ -0,0 +1,10 @@
+class ActionEatTabletFromWrapper : ActionConsumeSingle
+{
+	void ActionEatTabletFromWrapper()
+	{
+		m_CommandUID 		= DayZPlayerConstants.CMD_ACTIONMOD_EAT_TABLET;
+		m_CommandUIDProne 	= DayZPlayerConstants.CMD_ACTIONFB_EAT_TABLET;
+
+		m_Text = "#eat";
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteCharcoalTablets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteCharcoalTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..7c3fffb959a15c4ec6a9dd0d6c3bb2226f44d0c2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteCharcoalTablets.c
@@ -0,0 +1,8 @@
+class ActionForceBiteCharcoalTablets: ActionForceConsumeSingle
+{
+	override void ApplyModifiers( ActionData action_data )
+	{
+		PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		ntarget.m_ModifiersManager.DeactivateModifier(eModifiers.MDF_POISONING);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBitePainkillerTablets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBitePainkillerTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..d5a1ed5c7ec99ad08d9b721e84881360bc288d8b
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBitePainkillerTablets.c
@@ -0,0 +1,8 @@
+class ActionForceBitePainkillerTablets: ActionForceConsumeSingle
+{
+	override void ApplyModifiers( ActionData action_data )
+	{
+		PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		//target.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBitePurificationTablets.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBitePurificationTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c780e9b67b54c1f73c5439fb510b3230705131c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBitePurificationTablets.c
@@ -0,0 +1,8 @@
+class ActionForceBitePurificationTablets: ActionForceConsumeSingle
+{
+	override void ApplyModifiers( ActionData action_data )
+	{
+		PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		//target.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteTetracyclineAntibiotics.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteTetracyclineAntibiotics.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0e0ee01a02cbf377098dfc0c00bbc55595ca219
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteTetracyclineAntibiotics.c
@@ -0,0 +1,8 @@
+class ActionForceBiteTetracyclineAntibiotics: ActionForceConsumeSingle
+{
+	override void ApplyModifiers( ActionData action_data )
+	{
+		PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		//target.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteVitaminBottle.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteVitaminBottle.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f3ee0231e760ebf04ccafe38965638b6fae240f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionForceBiteVitaminBottle.c
@@ -0,0 +1,3 @@
+class ActionForceBiteVitaminBottle: ActionForceConsumeSingle
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectEpinephrineSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectEpinephrineSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..2c298ac21dd0d2092ef5fa18b353dd88bb20dd6a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectEpinephrineSelf.c
@@ -0,0 +1,9 @@
+class ActionInjectEpinephrineSelf: ActionInjectSelf
+{	
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_MainItem.OnApply(action_data.m_Player);
+		//action_data.m_Player.m_ModifiersManager.DeactivateModifier(eModifiers.MDF_HEART_ATTACK);
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectEpinephrineTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectEpinephrineTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..749ebe2e16fcc9c3cfa8c6c322ee8bdc58bb5d7a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectEpinephrineTarget.c
@@ -0,0 +1,13 @@
+class ActionInjectEpinephrineTarget: ActionInjectTarget
+{
+	void ActionInjectEpinephrineTarget()
+	{
+	}
+		
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_MainItem.OnApply( PlayerBase.Cast(action_data.m_Target.GetObject()));
+		//PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		//ntarget.GiveShock(100);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectMorphineSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectMorphineSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd230d0dcab685be3ee2b46ffcf9cf40b57b873f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectMorphineSelf.c
@@ -0,0 +1,8 @@
+class ActionInjectMorphineSelf: ActionInjectSelf
+{
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_MainItem.OnApply(action_data.m_Player);
+		//player.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectMorphineTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectMorphineTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..a342be9b1360914f8008aa6b676f11f3e2c970e2
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectMorphineTarget.c
@@ -0,0 +1,13 @@
+class ActionInjectMorphineTarget: ActionInjectTarget
+{
+	void ActionInjectMorphineTarget()
+	{
+	}
+		
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_MainItem.OnApply(PlayerBase.Cast(action_data.m_Target.GetObject()));
+		//PlayerBase ntarget = PlayerBase.Cast( target.GetObject() );
+		//target.m_ModifiersManager.ActivateModifier(eModifiers.MDF_CHEMICALPOISON);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..692a0b2dca647d305f5caa619e211814d31d5b82
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectSelf.c
@@ -0,0 +1,54 @@
+class ActionInjectSelf: ActionSingleUseBase
+{
+	void ActionInjectSelf()
+	{
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INJECTION;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_MEDIUM;
+		m_Text = "#inject";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTSelf;
+	}
+
+	override bool HasTarget()
+	{
+		return false;
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		if (action_data.m_MainItem)
+		{
+			ApplyModifiers(action_data);
+			action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		if (action_data.m_WasExecuted && action_data.m_MainItem )
+		{
+			action_data.m_MainItem.Delete();
+		}
+	}
+	
+	override void OnEndClient( ActionData action_data )
+	{
+		if (action_data.m_WasExecuted && action_data.m_MainItem )
+		{
+			action_data.m_MainItem.DeleteOnClient();
+		}
+	}
+	
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_MainItem.OnApply(action_data.m_Player);
+		//action_data.m_Player.m_ModifiersManager.DeactivateModifier(eModifiers.MDF_HEART_ATTACK);
+		
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectTarget.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectTarget.c
new file mode 100644
index 0000000000000000000000000000000000000000..c56ff1c1a3d410b71b4b20a7bc33bbc49641ad66
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Medical/ActionInjectTarget.c
@@ -0,0 +1,45 @@
+class ActionInjectTarget: ActionSingleUseBase
+{
+	void ActionInjectTarget()
+	{
+		m_SpecialtyWeight = UASoftSkillsWeight.PRECISE_MEDIUM;
+		
+		m_CommandUID = DayZPlayerConstants.CMD_ACTIONFB_INJECTIONTARGET;
+		m_FullBody = true;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH;
+		m_Text = "#inject_target";
+	}
+	
+	override void CreateConditionComponents()  
+	{	
+		m_ConditionItem = new CCINonRuined;
+		m_ConditionTarget = new CCTMan(UAMaxDistances.DEFAULT);
+	}
+
+	override void OnExecuteServer( ActionData action_data )
+	{	
+		if (CanReceiveAction(action_data.m_Target))
+		{
+			if (action_data.m_MainItem)
+			{
+				ApplyModifiers(action_data);
+				action_data.m_Player.GetSoftSkillsManager().AddSpecialty( m_SpecialtyWeight );
+			}
+		}
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		if (action_data.m_WasExecuted && action_data.m_MainItem )
+		{
+			action_data.m_MainItem.Delete();
+		}
+	}
+	
+	override void ApplyModifiers( ActionData action_data )
+	{
+		action_data.m_MainItem.OnApply( PlayerBase.Cast(action_data.m_Target.GetObject()));
+		//PlayerBase ntarget = PlayerBase.Cast( action_data.m_Target.GetObject() );
+		//ntarget.GiveShock(100);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Vehicles/ActionStopEngine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Vehicles/ActionStopEngine.c
new file mode 100644
index 0000000000000000000000000000000000000000..b455a9d53cd073e847453513711a93d2de4478d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Vehicles/ActionStopEngine.c
@@ -0,0 +1,63 @@
+class ActionStopEngine: ActionSingleUseBase
+{
+	void ActionStopEngine()
+	{
+		m_CommandUID	= DayZPlayerConstants.CMD_ACTIONMOD_STOPENGINE;
+		m_StanceMask	= DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT;
+		m_Text 			= "#stop_engine";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem		= new CCINone;
+		m_ConditionTarget	= new CCTNone;
+	}
+
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{	
+		HumanCommandVehicle vehCmd = player.GetCommand_Vehicle();			
+		if (vehCmd && vehCmd.GetVehicleSeat() == DayZPlayerConstants.VEHICLESEAT_DRIVER)
+		{
+			Transport trans = vehCmd.GetTransport();
+			if (trans)
+			{
+				Car car;
+				if (Class.CastTo(car, trans) && car.EngineIsOn())
+				{
+					return car.GetSpeedometerAbsolute() <= 8;
+				}
+			}
+		}
+
+		return false;
+	}
+
+	override void OnExecuteServer(ActionData action_data)
+	{
+		HumanCommandVehicle vehCmd = action_data.m_Player.GetCommand_Vehicle();
+		if (vehCmd)
+		{
+			Transport trans = vehCmd.GetTransport();
+			if (trans)
+			{
+				CarScript car;
+				if (Class.CastTo(car, trans))
+				{
+					car.EngineStop();
+				}
+			}
+		}	
+	}
+	
+	override void OnExecuteClient(ActionData action_data) {}
+	
+	override bool CanBeUsedInVehicle()
+	{
+		return true;
+	}
+	
+	override bool UseMainItem()
+	{
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Vehicles/ActionSwitchSeats.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Vehicles/ActionSwitchSeats.c
new file mode 100644
index 0000000000000000000000000000000000000000..c4836fe298aca7f6ba73c247779423fde60f69af
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/SingleUse/Vehicles/ActionSwitchSeats.c
@@ -0,0 +1,95 @@
+
+class ActionSwitchSeats: ActionBase
+{
+	void ActionSwitchSeats()
+	{
+		//m_CommandUID = DayZPlayerConstants.CMD_ACTIONMOD_STARTENGINE;
+		m_StanceMask = DayZPlayerConstants.STANCEMASK_ALL;
+		m_SpecialtyWeight = 1.0;
+		m_LockTargetOnUse = false;
+		m_Text = "#change_seat";
+	}
+
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINone;
+		m_ConditionTarget = new CCTObject;
+	}
+
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item )
+	{	
+		
+		Transport trans = null;
+		int nextSeatIdx = -1;
+		
+		HumanCommandVehicle vehCommand = player.GetCommand_Vehicle();
+
+		if ( !vehCommand  )
+			return false;
+		
+		int componentIndex = target.GetComponentIndex();
+
+		if ( !target )
+			return false;
+
+		if ( !Class.CastTo(trans, target.GetObject()) )
+			return false;
+
+		nextSeatIdx = trans.CrewPositionIndex( componentIndex );
+
+		if ( nextSeatIdx < 0 )
+			return false;
+
+		Human crew = trans.CrewMember( nextSeatIdx );
+		if ( crew )
+			return false;
+
+		if ( !trans.CanReachSeatFromSeat( trans.CrewMemberIndex( player ), nextSeatIdx ) )
+			return false;
+
+		return true;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		HumanCommandVehicle vehCommand = action_data.m_Player.GetCommand_Vehicle();
+		if ( vehCommand )
+		{
+			Transport trans;
+			if ( Class.CastTo(trans, action_data.m_Target.GetObject()) )
+			{
+				int nextSeat = trans.CrewPositionIndex( action_data.m_Target.GetComponentIndex() );
+				int seat = trans.GetSeatAnimationType( nextSeat );
+				if ( seat >= 0 )
+				{
+					//pTransportPositionIndex, int pVehicleSeat
+					vehCommand.SwitchSeat( nextSeat, seat );
+					if ( !GetGame().IsDedicatedServer() )
+					{
+
+						action_data.m_Player.OnVehicleSwitchSeat( nextSeat );
+					}
+				}
+			}
+		}
+	}
+	
+	override void OnUpdate(ActionData action_data)
+	{
+
+		if(action_data.m_State == UA_START)
+		{
+			HumanCommandVehicle hcv = action_data.m_Player.GetCommand_Vehicle();
+			if( !hcv || !action_data.m_Player.GetCommand_Vehicle().IsSwitchSeat() )
+			{
+				End(action_data);
+			}
+		}
+	}
+	
+	override bool CanBeUsedInVehicle()
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionAttachMagazine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionAttachMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f87b1b717dd02f656b10c81acb190df434097fa
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionAttachMagazine.c
@@ -0,0 +1,448 @@
+class AttachMagazineActionReciveData : ActionReciveData
+{
+	ref InventoryLocation  m_ilOldMagazine;
+}
+class AttachMagazineActionData : ActionData
+{
+	ref InventoryLocation  m_ilOldMagazine;
+	Magazine m_oldMagazine;
+}
+
+class FirearmActionAttachMagazine : FirearmActionBase
+{	
+	//-----------------------------------------------------
+	// 	Action events and methods
+	//-----------------------------------------------------
+	void FirearmActionAttachMagazine() 
+	{
+		m_Text = "#attach";
+	}	
+	
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		HumanCommandWeapons hcw = player.GetCommandModifier_Weapons();
+		Magazine mag = Magazine.Cast(target.GetObject());	
+		Weapon_Base wpn = Weapon_Base.Cast(item);	
+		return mag && (player.GetWeaponManager().CanAttachMagazine(wpn,mag) || player.GetWeaponManager().CanSwapMagazine(wpn,mag)) && (!hcw || hcw.GetRunningAction() != WeaponActions.RELOAD);
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		AttachMagazineActionData action_data = new AttachMagazineActionData;
+		return action_data;
+	}
+	
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		AttachMagazineActionData action_data_am = AttachMagazineActionData.Cast(action_data);
+		
+		action_data_am.m_ilOldMagazine.WriteToContext(ctx);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if (!action_recive_data)
+		{
+			action_recive_data = new AttachMagazineActionReciveData;
+		}
+		
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		InventoryLocation il = new InventoryLocation;		
+		if (!il.ReadFromContext(ctx))
+			return false;
+		
+		AttachMagazineActionReciveData recive_data_am = AttachMagazineActionReciveData.Cast(action_recive_data);
+		recive_data_am.m_ilOldMagazine = il;
+		
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		AttachMagazineActionReciveData recive_data_am = AttachMagazineActionReciveData.Cast(action_recive_data);
+		AttachMagazineActionData action_data_am = AttachMagazineActionData.Cast(action_data);
+		
+		action_data.m_MainItem = action_recive_data.m_MainItem;
+		if (!action_recive_data.m_Target)
+		{
+			action_data.m_Target = new ActionTarget(NULL, NULL, -1, vector.Zero, 0); 
+		}
+		else
+		{
+			action_data.m_Target = action_recive_data.m_Target;
+		}
+		action_data_am.m_ilOldMagazine = recive_data_am.m_ilOldMagazine;
+	}
+	
+	override bool Post_SetupAction( ActionData action_data )
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+			int muzzle_index = wpn.GetCurrentMuzzle();
+				
+			AttachMagazineActionData am_action_data = AttachMagazineActionData.Cast(action_data);
+			am_action_data.m_oldMagazine = wpn.GetMagazine(muzzle_index);
+				
+			InventoryLocation new_il = new InventoryLocation;
+
+			if (!action_data.m_Player.GetWeaponManager().PrepareInventoryLocationForMagazineSwap(wpn, Magazine.Cast(action_data.m_Target.GetObject()), new_il))
+			{
+				return false;
+			}
+			am_action_data.m_ilOldMagazine = new_il;
+		}
+		return true;
+	}
+	
+	override bool InventoryReservation( ActionData action_data)
+	{
+		if( (IsLocal() || !UseAcknowledgment()) && IsInstant() )
+			return true;
+		
+		bool success = true;
+		InventoryLocation oldMagTargetInventoryLocation = NULL;
+		InventoryLocation targetInventoryLocation = NULL;
+		InventoryLocation handInventoryLocation = NULL;
+		
+		PlayerBase player = action_data.m_Player;
+		AttachMagazineActionData am_action_data = AttachMagazineActionData.Cast(action_data);
+		
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		int muzzle_index = wpn.GetCurrentMuzzle();
+		
+		Magazine new_mag = Magazine.Cast(action_data.m_Target.GetObject());
+		
+		if (am_action_data.m_oldMagazine)
+		{
+			oldMagTargetInventoryLocation = new InventoryLocation;
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( am_action_data.m_oldMagazine, am_action_data.m_ilOldMagazine) )
+			{
+				success = false;
+			}
+			else
+			{
+				player.GetInventory().AddInventoryReservationEx(am_action_data.m_oldMagazine,am_action_data.m_ilOldMagazine,GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+		
+		if (success)
+		{
+			targetInventoryLocation = new InventoryLocation;
+			targetInventoryLocation.SetAttachment( wpn, new_mag, InventorySlots.MAGAZINE);
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( new_mag, targetInventoryLocation) )
+			{
+				success = false;
+				if (am_action_data.m_oldMagazine)
+				{
+					player.GetInventory().ClearInventoryReservation(am_action_data.m_oldMagazine,am_action_data.m_ilOldMagazine);
+				}
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( new_mag, targetInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+	
+		if (success)
+		{
+			handInventoryLocation = new InventoryLocation;
+			handInventoryLocation.SetHands(action_data.m_Player, wpn);
+		
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( wpn, handInventoryLocation) )
+			{
+				if (am_action_data.m_oldMagazine)
+				{
+					player.GetInventory().ClearInventoryReservation(am_action_data.m_oldMagazine,am_action_data.m_ilOldMagazine);
+				}
+				player.GetInventory().ClearInventoryReservation(new_mag, targetInventoryLocation);
+				success = false;
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( wpn, handInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+			}				
+		}
+		
+		if ( success )
+		{
+			if (am_action_data.m_ilOldMagazine)
+				action_data.m_ReservedInventoryLocations.Insert(am_action_data.m_ilOldMagazine);
+			
+			if (targetInventoryLocation)
+				action_data.m_ReservedInventoryLocations.Insert(targetInventoryLocation);
+			
+			if (handInventoryLocation)
+				action_data.m_ReservedInventoryLocations.Insert(handInventoryLocation);
+		}
+		
+		return success;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		AttachMagazineActionData action_data_am = AttachMagazineActionData.Cast(action_data);
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());	
+		ClearInventoryReservationEx(action_data);
+		if ( action_data.m_Player.GetWeaponManager().CanAttachMagazine(wpn,mag,false) )
+			action_data.m_Player.GetWeaponManager().AttachMagazine(mag, this);
+		else
+			action_data.m_Player.GetWeaponManager().SwapMagazineEx(mag, action_data_am.m_ilOldMagazine, this);
+		 InventoryReservation(action_data);
+	}
+	
+	override bool CanBePerformedFromInventory()
+	{
+		return true;
+	}
+	
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+};
+
+
+class FirearmActionAttachMagazineQuick : FirearmActionBase
+{	
+	void FirearmActionAttachMagazineQuick() 
+	{
+	}	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		HumanCommandWeapons hcw = player.GetCommandModifier_Weapons();
+		if (hcw && hcw.GetRunningAction() == WeaponActions.RELOAD)
+			return false;
+		
+		MagazineStorage mag = MagazineStorage.Cast(player.GetWeaponManager().GetPreparedMagazine());
+		
+		if (!mag)
+			return false;
+		
+		Weapon weapon = Weapon.Cast(item);
+		bool isLoadedMag = false;
+		
+		for (int i = 0, count = weapon.GetMuzzleCount(); i < count; ++i)
+			isLoadedMag |= ( mag == weapon.GetMagazine( i ) );
+		
+		return !isLoadedMag;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		AttachMagazineActionData action_data = new AttachMagazineActionData;
+		return action_data;
+	}
+	
+	
+	override void WriteToContext(ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		AttachMagazineActionData action_data_am = AttachMagazineActionData.Cast(action_data);
+		
+		action_data_am.m_ilOldMagazine.WriteToContext(ctx);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if (!action_recive_data)
+		{
+			action_recive_data = new AttachMagazineActionReciveData;
+		}
+		
+		super.ReadFromContext(ctx, action_recive_data);
+		
+		InventoryLocation il = new InventoryLocation;		
+		if (!il.ReadFromContext(ctx))
+			return false;
+		
+		AttachMagazineActionReciveData recive_data_am = AttachMagazineActionReciveData.Cast(action_recive_data);
+		recive_data_am.m_ilOldMagazine = il;
+		
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		AttachMagazineActionReciveData recive_data_am = AttachMagazineActionReciveData.Cast(action_recive_data);
+		AttachMagazineActionData action_data_am = AttachMagazineActionData.Cast(action_data);
+		
+		action_data.m_MainItem = action_recive_data.m_MainItem;
+		if (!action_recive_data.m_Target)
+		{
+			action_data.m_Target = new ActionTarget(NULL, NULL, -1, vector.Zero, 0); 
+		}
+		else
+		{
+			action_data.m_Target = action_recive_data.m_Target;
+		}
+		action_data_am.m_ilOldMagazine = recive_data_am.m_ilOldMagazine;
+	}
+	
+	override bool Post_SetupAction( ActionData action_data )
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+			int muzzle_index = wpn.GetCurrentMuzzle();
+				
+			AttachMagazineActionData am_action_data = AttachMagazineActionData.Cast(action_data);
+			am_action_data.m_oldMagazine = wpn.GetMagazine(muzzle_index);
+				
+			ActionTarget newTarget = new ActionTarget(action_data.m_Player.GetWeaponManager().GetPreparedMagazine(), null, -1, vector.Zero, -1);
+			action_data.m_Target = newTarget;
+				
+			InventoryLocation new_il = new InventoryLocation;
+
+			if (!action_data.m_Player.GetWeaponManager().PrepareInventoryLocationForMagazineSwap(wpn, Magazine.Cast(action_data.m_Target.GetObject()), new_il))
+			{
+				return false;
+			}
+			am_action_data.m_ilOldMagazine = new_il;
+		}
+		return true;
+	}
+	
+	override bool InventoryReservation( ActionData action_data)
+	{
+		if( (IsLocal() || !UseAcknowledgment()) && IsInstant() )
+			return true;
+		
+		bool success = true;
+		InventoryLocation oldMagTargetInventoryLocation = NULL;
+		InventoryLocation targetInventoryLocation = NULL;
+		InventoryLocation handInventoryLocation = NULL;
+		
+		PlayerBase player = action_data.m_Player;
+		AttachMagazineActionData am_action_data = AttachMagazineActionData.Cast(action_data);
+		
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		int muzzle_index = wpn.GetCurrentMuzzle();
+		
+		Magazine new_mag = Magazine.Cast(action_data.m_Target.GetObject());
+		
+		if (am_action_data.m_oldMagazine)
+		{
+			oldMagTargetInventoryLocation = new InventoryLocation;
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( am_action_data.m_oldMagazine, am_action_data.m_ilOldMagazine) )
+			{
+				success = false;
+			}
+			else
+			{
+				player.GetInventory().AddInventoryReservationEx(am_action_data.m_oldMagazine,am_action_data.m_ilOldMagazine,GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+		
+		if (success)
+		{
+			targetInventoryLocation = new InventoryLocation;
+			targetInventoryLocation.SetAttachment( wpn, new_mag, InventorySlots.MAGAZINE);
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( new_mag, targetInventoryLocation) )
+			{
+				success = false;
+				if (am_action_data.m_oldMagazine)
+				{
+					player.GetInventory().ClearInventoryReservation(am_action_data.m_oldMagazine,am_action_data.m_ilOldMagazine);
+				}
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( new_mag, targetInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+	
+		if (success)
+		{
+			handInventoryLocation = new InventoryLocation;
+			handInventoryLocation.SetHands(action_data.m_Player, wpn);
+		
+			if ( action_data.m_Player.GetInventory().HasInventoryReservation( wpn, handInventoryLocation) )
+			{
+				if (am_action_data.m_oldMagazine)
+				{
+					player.GetInventory().ClearInventoryReservation(am_action_data.m_oldMagazine,am_action_data.m_ilOldMagazine);
+				}
+				player.GetInventory().ClearInventoryReservation(new_mag, targetInventoryLocation);
+				success = false;
+			}
+			else
+			{
+				action_data.m_Player.GetInventory().AddInventoryReservationEx( wpn, handInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+			}				
+		}
+		
+		if ( success )
+		{
+			if (am_action_data.m_ilOldMagazine)
+				action_data.m_ReservedInventoryLocations.Insert(am_action_data.m_ilOldMagazine);
+			
+			if (targetInventoryLocation)
+				action_data.m_ReservedInventoryLocations.Insert(targetInventoryLocation);
+			
+			if (handInventoryLocation)
+				action_data.m_ReservedInventoryLocations.Insert(handInventoryLocation);
+		}
+		
+		return success;
+	}
+
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		AttachMagazineActionData action_data_am = AttachMagazineActionData.Cast(action_data);
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());	
+		ClearInventoryReservationEx(action_data);
+		if ( action_data.m_Player.GetWeaponManager().CanAttachMagazine(wpn,mag,false) )
+			action_data.m_Player.GetWeaponManager().AttachMagazine(mag, this);
+		else
+			action_data.m_Player.GetWeaponManager().SwapMagazineEx(mag, action_data_am.m_ilOldMagazine, this);
+		 InventoryReservation(action_data);
+	}
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousWeaponManipulationActionInput;
+	} 
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..a933a39dce6b47d9b184eecc09b3f3faa77b376c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionBase.c
@@ -0,0 +1,70 @@
+class FirearmActionBase : ActionBase
+{	
+	void FirearmActionBase();
+	
+	override int GetStanceMask(PlayerBase player)
+	{
+		return DayZPlayerConstants.STANCEMASK_ALL;
+	}
+	
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+
+	override typename GetInputType()
+	{
+		return DefaultActionInput;
+	}
+
+	override bool ActionConditionContinue(ActionData action_data)
+	{
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		return !wpn.IsIdle();
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		Weapon_Base wpn = Weapon_Base.Cast(item);
+		return wpn && wpn.CanProcessWeaponEvents() && !player.GetDayZPlayerInventory().IsProcessing();
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+
+		action_data.m_State = UA_PROCESSING;
+	}
+	
+	override bool CanBePerformedFromInventory()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedOnBack()
+	{
+		return true;
+	}
+	
+	override bool CanBeUsedRaised()
+	{
+		return true;
+	}
+
+	override void OnUpdate(ActionData action_data)
+	{
+		super.OnUpdate(action_data);
+
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		
+		if (!wpn || action_data.m_Player.GetItemInHands() != wpn || !action_data.m_Player.GetWeaponManager().IsRunning())
+		{
+			End(action_data);
+		}
+	}
+	
+	override float GetProgress(ActionData action_data)
+	{
+		return -1;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionDetachMagazine.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionDetachMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..b2442011e39eb54f5e55829262bb5590a6afca0e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionDetachMagazine.c
@@ -0,0 +1,366 @@
+class DetachMagActionReciveData : ActionReciveData
+{
+	ref InventoryLocation  m_ilMagazine;
+}
+class DetachMagActionData : ActionData
+{
+	ref InventoryLocation  m_ilMagazine;
+}
+
+class FirearmActionDetachMagazine_Old : FirearmActionBase
+{	
+	void FirearmActionDetachMagazine_Old() 
+	{
+	}	
+	
+	override bool HasTarget()
+	{
+		return true;
+	}
+	
+	override typename GetInputType()
+	{
+		return QuickaBarActionInput;
+	}
+	
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override bool InventoryReservation( ActionData action_data)
+	{
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());
+		InventoryLocation il = new InventoryLocation();
+		if( !action_data.m_Player.GetInventory().FindFreeLocationFor(mag, FindInventoryLocationType.ANY_CARGO, il) )
+			return false;
+		
+		if( !super.InventoryReservation( action_data) )
+			return false;
+
+		DetachMagActionData action_data_dm = DetachMagActionData.Cast(action_data);
+		if( !action_data.m_Player.GetInventory().AddInventoryReservationEx(mag,il,10000) )
+			return false;
+			
+		action_data_dm.m_ReservedInventoryLocations.Insert(il);
+		action_data_dm.m_ilMagazine = il;
+
+		return true;
+	}
+	
+	override ActionData CreateActionData()
+	{
+		ActionData action_data = new DetachMagActionData;
+		return action_data;
+	}
+	
+	override void WriteToContext (ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		DetachMagActionData action_data_dm;
+		DetachMagActionData.CastTo(action_data_dm, action_data);
+
+		action_data_dm.m_ilMagazine.WriteToContext(ctx);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if(!action_recive_data)
+		{
+			action_recive_data = new DetachMagActionReciveData;
+		}
+		
+		if(!super.ReadFromContext( ctx, action_recive_data ))
+			return false;
+		
+		DetachMagActionReciveData recive_data_dm;
+		recive_data_dm = DetachMagActionReciveData.Cast( action_recive_data );
+		
+		recive_data_dm.m_ilMagazine = new InventoryLocation;
+
+		if(!recive_data_dm.m_ilMagazine.ReadFromContext(ctx))
+			return false;
+		
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+		
+		DetachMagActionReciveData recive_data_dm = DetachMagActionReciveData.Cast(action_recive_data);
+		DetachMagActionData action_data_dm = DetachMagActionData.Cast(action_data);
+		
+		action_data_dm.m_ilMagazine = recive_data_dm.m_ilMagazine;
+	}
+	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		Magazine mag = Magazine.Cast(target.GetObject());
+		Weapon_Base wpn = Weapon_Base.Cast(item);
+		return mag && player.GetWeaponManager().CanDetachMagazine(wpn,mag);
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data)
+	{
+		return true;
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		DetachMagActionData action_data_dm = DetachMagActionData.Cast(action_data);
+		
+		Weapon_Base wpn = Weapon_Base.Cast( action_data.m_MainItem );
+		
+		action_data.m_Player.GetWeaponManager().DetachMagazine(action_data_dm.m_ilMagazine,this);
+	}
+};
+
+class AdvDetachMagActionReciveData : ActionReciveData
+{
+	ref InventoryLocation  m_ilWeapon;
+	ref InventoryLocation  m_ilMagazine;
+}
+class AdvDetachMagActionData : SequentialActionData
+{
+	ref InventoryLocation  m_ilWeapon = new InventoryLocation;
+	ref InventoryLocation  m_ilMagazine = new InventoryLocation;
+}
+
+class FirearmActionDetachMagazine : ActionSequentialBase
+{
+	void FirearmActionDetachMagazine()
+	{
+	}
+	
+	override ActionData CreateActionData()
+	{
+		ActionData action_data = new AdvDetachMagActionData;
+		return action_data;
+	}
+	
+
+	override bool InventoryReservation( ActionData action_data)
+	{
+		Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());
+		
+		InventoryLocation ilWpn = new InventoryLocation();
+		InventoryLocation ilMag = new InventoryLocation();
+		
+		
+		int ur_index = action_data.m_Player.GetHumanInventory().FindUserReservedLocationIndex(wpn);
+			
+		if(ur_index > -1)
+			action_data.m_Player.GetHumanInventory().GetUserReservedLocation(ur_index,ilWpn);
+		else
+		{
+			action_data.m_Player.GetInventory().FindFreeLocationFor(wpn, FindInventoryLocationType.ANY_CARGO | FindInventoryLocationType.ATTACHMENT, ilWpn);
+			
+			
+				//return false;
+		}
+		
+		if( !action_data.m_Player.GetInventory().FindFreeLocationFor(mag, FindInventoryLocationType.ANY_CARGO, ilMag) )
+			return false;
+		
+		if( !super.InventoryReservation( action_data ) )
+			return false;
+
+		AdvDetachMagActionData action_data_dm = AdvDetachMagActionData.Cast(action_data);
+		if( !action_data.m_Player.GetInventory().AddInventoryReservationEx(wpn,ilWpn,10000) )
+			return false;
+		
+		if( !action_data.m_Player.GetInventory().AddInventoryReservationEx(mag,ilMag,10000) )
+			return false;
+			
+		action_data_dm.m_ReservedInventoryLocations.Insert(ilWpn);
+		action_data_dm.m_ReservedInventoryLocations.Insert(ilMag);
+		action_data_dm.m_ilWeapon = ilWpn;
+		action_data_dm.m_ilMagazine = ilMag;
+
+		return true;
+	}
+	
+	override void WriteToContext (ParamsWriteContext ctx, ActionData action_data)
+	{
+		super.WriteToContext(ctx, action_data);
+		
+		AdvDetachMagActionData action_data_dm;
+		AdvDetachMagActionData.CastTo(action_data_dm, action_data);
+
+		action_data_dm.m_ilWeapon.WriteToContext(ctx);
+		action_data_dm.m_ilMagazine.WriteToContext(ctx);
+	}
+	
+	override bool ReadFromContext(ParamsReadContext ctx, out ActionReciveData action_recive_data )
+	{
+		if(!action_recive_data)
+		{
+			action_recive_data = new AdvDetachMagActionReciveData;
+		}
+		
+		if(!super.ReadFromContext( ctx, action_recive_data ))
+			return false;
+		
+		AdvDetachMagActionReciveData recive_data_dm;
+		recive_data_dm = AdvDetachMagActionReciveData.Cast( action_recive_data );
+		
+		recive_data_dm.m_ilWeapon = new InventoryLocation;
+		recive_data_dm.m_ilMagazine = new InventoryLocation;
+		
+		if(!recive_data_dm.m_ilWeapon.ReadFromContext(ctx))
+			return false;
+
+		if(!recive_data_dm.m_ilMagazine.ReadFromContext(ctx))
+			return false;
+		
+		return true;
+	}
+	
+	override void HandleReciveData(ActionReciveData action_recive_data, ActionData action_data)
+	{
+		super.HandleReciveData(action_recive_data, action_data);
+		
+		AdvDetachMagActionReciveData recive_data_dm = AdvDetachMagActionReciveData.Cast(action_recive_data);
+		AdvDetachMagActionData action_data_dm = AdvDetachMagActionData.Cast(action_data);
+		
+		action_data_dm.m_ilWeapon.Copy(recive_data_dm.m_ilWeapon);
+		action_data_dm.m_ilMagazine.Copy(recive_data_dm.m_ilMagazine);
+	}	
+	
+	
+	override typename GetInputType()
+	{
+		return QuickaBarActionInput;
+	}
+	
+	override void CreateConditionComponents() //Instantiates components, called once from ActionManager on actions construction
+	{
+		m_ConditionItem = new CCIDummy;
+		m_ConditionTarget = new CCTNone;
+	}
+	
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		Weapon_Base wpn = Weapon_Base.Cast( item );
+		int mi = wpn.GetCurrentMuzzle();
+		return wpn && wpn.GetMagazine(mi) == target.GetObject();
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data )
+	{
+		return true;
+	}
+	
+	override void OnStageStart(SequentialActionData action_data)
+	{
+		if( action_data.m_ReciveEndInput )
+		{
+			End( action_data );
+			return;
+		}
+		super.OnStageStart(action_data);
+		Weapon_Base wpn;
+		Magazine mag;
+		//InventoryLocation il = new InventoryLocation();
+		AdvDetachMagActionData action_data_dm = AdvDetachMagActionData.Cast(action_data);
+
+		switch (action_data.m_Stage)
+		{
+			case 0:
+				action_data.m_Player.GetWeaponManager().DetachMagazine(action_data_dm.m_ilMagazine,this);			
+				break;
+			
+			case 1:
+				if ( !action_data_dm.m_ilWeapon.IsValid() )
+				{
+					End( action_data );
+					break;
+				}
+				
+				wpn = Weapon_Base.Cast(action_data.m_MainItem);
+				mag = Magazine.Cast(action_data.m_Target.GetObject());
+			
+				action_data.m_Player.GetHumanInventory().ClearUserReservedLocation(wpn);
+				if ( ( !GetGame().IsDedicatedServer() ) && !mag.GetHierarchyParent() )
+				{
+					InventoryMode invMode = InventoryMode.PREDICTIVE;
+					
+					if ( action_data.m_Player.NeedInventoryJunctureFromServer(mag, action_data.m_Player, action_data.m_Player) || action_data.m_Player.NeedInventoryJunctureFromServer(wpn, action_data.m_Player, action_data.m_Player) )
+						invMode = InventoryMode.JUNCTURE;
+				
+					action_data.m_Player.GetInventory().ForceSwapEntities(invMode, mag, wpn, action_data_dm.m_ilWeapon);
+				}
+
+				End( action_data );
+				break;
+			default:
+				End( action_data );
+				break;
+		}
+	}
+	
+	override void OnUpdate( ActionData action_data )
+	{
+		super.OnUpdate( action_data );
+		
+		SequentialActionData ad = SequentialActionData.Cast(action_data);
+		if(ad)
+		{
+			switch (ad.m_Stage)
+			{
+				case 0:
+					Weapon_Base wpn = Weapon_Base.Cast(action_data.m_MainItem);
+		
+					if ( (!wpn || ad.m_Player.GetItemInHands()!=wpn || !ad.m_Player.GetWeaponManager().IsRunning()) && !ad.m_Player.IsJumpInProgress() )
+					{
+						SetStage(1, ad);
+					}
+					break;
+				case 1:
+					//action_data.m_Player.GetHandFs
+					
+					break;
+				default:
+					break;
+			}
+		}
+	}
+	
+	override void OnStartServer( ActionData action_data )
+	{
+		AdvDetachMagActionData action_data_dm = AdvDetachMagActionData.Cast(action_data);
+		GetGame().AddInventoryJunctureEx(action_data.m_Player, EntityAI.Cast(action_data.m_Target.GetObject()),action_data_dm.m_ilMagazine, true, 10000);
+	}
+	
+	override void OnEndServer( ActionData action_data )
+	{
+		GetGame().ClearJuncture(action_data.m_Player, EntityAI.Cast(action_data.m_Target.GetObject()));
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionLoadBullet.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionLoadBullet.c
new file mode 100644
index 0000000000000000000000000000000000000000..7d17274c5ad91de75e765052b4fd62266f75dc82
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionLoadBullet.c
@@ -0,0 +1,134 @@
+class FirearmActionLoadBullet : FirearmActionBase
+{	
+	void FirearmActionLoadBullet() 
+	{
+		m_Text = "#load_bullet";
+	}	
+	
+	override int GetActionCategory()
+	{
+		return AC_SINGLE_USE;
+	}
+	
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		HumanCommandWeapons hcw = player.GetCommandModifier_Weapons();
+		if (!target.GetObject())
+			return false;
+		
+		Magazine mag = null;
+		EntityAI entity = EntityAI.Cast(target.GetObject());
+		if (entity && entity.IsManagingArrows() && entity.IsDamageDestroyed())
+		{
+			ArrowManagerBase arrowManager = ArrowManagerBase.Cast(entity.GetArrowManager());
+			if (arrowManager)
+				mag = Magazine.Cast(arrowManager.GetFirstArrow());
+		}
+		else
+			mag = Magazine.Cast(target.GetObject());
+		
+		Weapon_Base weapon = Weapon_Base.Cast(item);
+		return mag && player.GetWeaponManager().CanLoadBullet(weapon, mag) && hcw && hcw.GetRunningAction() != WeaponActions.CHAMBERING;
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+
+		Magazine mag;
+		EntityAI entity = EntityAI.Cast(action_data.m_Target.GetObject());
+		if (entity && entity.IsManagingArrows() && entity.IsDamageDestroyed())
+		{
+			ArrowManagerBase arrowManager = ArrowManagerBase.Cast(entity.GetArrowManager());
+			if (arrowManager)
+			{
+				mag = Magazine.Cast(arrowManager.AcquireFirstArrow(false));
+			}
+		}
+		else
+			mag = Magazine.Cast(action_data.m_Target.GetObject());
+
+		action_data.m_Player.GetWeaponManager().LoadBullet(mag, this);
+	}
+	
+	override Object GetDisplayInteractObject(PlayerBase player, ActionTarget target)
+	{
+		EntityAI entity = EntityAI.Cast(target.GetObject());
+		if (!entity || (entity && entity.IsManagingArrows() && !entity.IsDamageDestroyed()))
+			return null;
+		
+		ArrowManagerBase arrowManager = entity.GetArrowManager();
+		if (arrowManager)
+			return arrowManager.GetFirstArrow();
+		
+		return null;
+	}
+	
+	override bool CanBePerformedFromInventory()
+	{
+		return true;
+	}
+	
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+}
+
+class FirearmActionLoadBulletQuick : FirearmActionBase
+{	
+	void FirearmActionLoadBulletQuick();
+	
+	override typename GetInputType()
+	{
+		return ContinuousWeaponManipulationActionInput;
+	} 
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem 	= new CCINonRuined();
+		m_ConditionTarget 	= new CCTSelf();
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+		
+	override bool ActionCondition(PlayerBase player, ActionTarget target, ItemBase item)
+	{
+		if (!super.ActionCondition(player, target, item))
+			return false;
+		
+		HumanCommandWeapons hcw = player.GetCommandModifier_Weapons();		
+		Weapon_Base weapon = Weapon_Base.Cast(item);
+
+		return player.GetWeaponManager().CanLoadBullet(weapon, player.GetWeaponManager().GetPreparedMagazine(), true) && hcw && hcw.GetRunningAction() != WeaponActions.CHAMBERING;
+	}
+	
+	override bool SetupAction(PlayerBase player, ActionTarget target, ItemBase item, out ActionData action_data, Param extra_data = NULL)
+	{
+		if (super.SetupAction(player, target, item, action_data, extra_data))
+		{
+			#ifndef SERVER
+			ActionTarget newTarget = new ActionTarget(player.GetWeaponManager().GetPreparedMagazine(), null, -1, vector.Zero, -1);
+			action_data.m_Target = newTarget;
+			#endif
+
+			return true;
+		}
+
+		return false;
+	}
+	
+	override void Start(ActionData action_data)
+	{
+		super.Start(action_data);
+		
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());
+		action_data.m_Player.GetWeaponManager().LoadBullet(mag, this);
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionLoadMultiBullet.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionLoadMultiBullet.c
new file mode 100644
index 0000000000000000000000000000000000000000..f80a574d12d36bb8cefa7918af1b3202f319634c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionLoadMultiBullet.c
@@ -0,0 +1,222 @@
+class FirearmActionLoadMultiBullet : FirearmActionBase
+{	
+	//-----------------------------------------------------
+	// 	Action events and methods
+	//-----------------------------------------------------
+	void FirearmActionLoadMultiBullet() 
+	{
+		m_Text = "#load_bullets";
+	}	
+	
+	override int GetActionCategory()
+	{
+		return AC_CONTINUOUS;
+	}
+	
+	/*string GetTargetDescription()
+	{
+		return "default target description";
+	}*/
+	
+	/*protected bool ActionConditionContinue( ActionData action_data ) //condition for action
+	{
+		return true;
+	}*/
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		Weapon_Base wpn = Weapon_Base.Cast(item);
+		Magazine mag = Magazine.Cast(target.GetObject());		
+		return mag && player.GetWeaponManager().CanLoadBullet(wpn,mag);
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());	
+
+		action_data.m_Player.GetWeaponManager().LoadMultiBullet(mag, this);
+
+	}
+	
+	override bool CanBePerformedFromInventory()
+	{
+		return false;
+	}
+	
+	override bool CanBeSetFromInventory()
+	{
+		return false;
+	}
+
+	override void OnEndInput( ActionData action_data )
+	{
+		action_data.m_Player.GetWeaponManager().LoadMultiBulletStop();
+	}
+
+	override bool CanBePerformedFromQuickbar()
+	{
+		return true;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	} 
+	
+	// action need first have permission from server before can start
+	/*bool UseAcknowledgment()
+	{
+		return true;
+	}*/
+
+	
+	/*override int GetState( ActionData action_data )
+	{
+		return UA_PROCESSING;
+	}*/
+	
+	/*override float GetProgress( ActionData action_data )
+	{
+		return -1;
+	}*/
+	
+	override typename GetInputType()
+	{
+		return ContinuousDefaultActionInput;
+	}
+};
+
+
+class FirearmActionLoadMultiBulletQuick : FirearmActionBase
+{	
+	//-----------------------------------------------------
+	// 	Action events and methods
+	//-----------------------------------------------------
+	void FirearmActionLoadMultiBulletQuick() 
+	{
+	}	
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousWeaponManipulationActionInput;
+	} 
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		Weapon_Base weapon = Weapon_Base.Cast( item );
+		return player.GetWeaponManager().CanLoadBullet(weapon ,player.GetWeaponManager().GetPreparedMagazine());
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		WeaponManager weaponManager = action_data.m_Player.GetWeaponManager();
+		int idx = 0;
+		Magazine mag = weaponManager.GetNextPreparedMagazine(idx);
+		Weapon weapon = Weapon.Cast(action_data.m_Player.GetItemInHands());
+		
+		int internalCount = weapon.GetInternalMagazineCartridgeCount(0);
+		int maxCount = weapon.GetInternalMagazineMaxCartridgeCount(0) + 1;
+		int total = mag.GetAmmoCount() + internalCount;
+		
+		if (total < maxCount)
+		{	
+			//Increment index for the first additional mag find, since GetNextPreparedMagazine does not do that
+			//Normally the mag at found index is combined right after, removing it from the suitable magazine array	
+			++idx;
+			Magazine additionalMag = weaponManager.GetNextPreparedMagazine(idx);
+
+			while ((additionalMag != null) && (total < maxCount))
+			{
+				total += additionalMag.GetAmmoCount();
+				mag.CombineItems(additionalMag);
+			 	additionalMag = weaponManager.GetNextPreparedMagazine(idx);
+			}
+		}
+
+		action_data.m_Player.GetWeaponManager().LoadMultiBullet(mag, this);
+	}
+	
+	override void OnEndInput( ActionData action_data )
+	{
+		action_data.m_Player.GetWeaponManager().LoadMultiBulletStop();
+	}
+};
+
+class FirearmActionLoadMultiBulletRadial : FirearmActionBase
+{	
+	//-----------------------------------------------------
+	// 	Action events and methods
+	//-----------------------------------------------------
+	void FirearmActionLoadMultiBulletRadial() 
+	{
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	override bool CanContinue( ActionData action_data )
+	{
+		if (!super.CanContinue( action_data ))
+			return false;
+		
+		return ActionCondition(action_data.m_Player, action_data.m_Target, action_data.m_MainItem);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		Weapon_Base wpn = Weapon_Base.Cast(item);
+		Magazine mag = Magazine.Cast(target.GetObject());		
+		return mag && player.GetWeaponManager().CanLoadBullet(wpn,mag);
+	}
+	
+	override void OnStart( ActionData action_data )
+	{
+		super.OnStart(action_data);
+		
+		Magazine mag = Magazine.Cast(action_data.m_Target.GetObject());	
+		action_data.m_Player.GetWeaponManager().LoadMultiBullet(mag, this);
+	}
+	
+	override void OnEnd( ActionData action_data )
+	{
+		action_data.m_Player.GetWeaponManager().LoadMultiBulletStop();
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionMechanicManipulate.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionMechanicManipulate.c
new file mode 100644
index 0000000000000000000000000000000000000000..bcefb81c7115ed23feeaf9e0858970607328bcf0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionMechanicManipulate.c
@@ -0,0 +1,60 @@
+class FirearmActionMechanicManipulate : FirearmActionBase
+{	
+	void FirearmActionLoadBulletQuick() 
+	{
+	}	
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override typename GetInputType()
+	{
+		return WeaponManipulationActionInput;
+	} 
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		bool result = false;
+		Weapon_Base wpn = Weapon_Base.Cast(item);
+		if ( player.GetWeaponManager().CanEjectBullet(wpn))
+		{
+			if( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			{
+				result = true;
+			}
+			else
+			{ 
+				if( player.GetWeaponManager().CanEjectBulletVerified() )
+				{
+					result = true;
+				}
+				player.GetWeaponManager().SetEjectBulletTryTimestamp();
+			}
+		}
+		return result;
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		action_data.m_Player.GetWeaponManager().EjectBulletVerified( this );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionUnjam.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionUnjam.c
new file mode 100644
index 0000000000000000000000000000000000000000..21068c3365fe6bb751465e1e9ee860ab2224051e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/Actions/Weapons/FirearmActionUnjam.c
@@ -0,0 +1,44 @@
+class FirearmActionUnjam : FirearmActionBase
+{	
+	void FirearmActionUnjam() 
+	{
+	}	
+	
+	override bool HasTarget()
+	{
+		return false;
+	}
+	
+	override typename GetInputType()
+	{
+		return ContinuousWeaponManipulationActionInput;
+	} 
+	
+	override void CreateConditionComponents()  
+	{
+		m_ConditionItem = new CCINonRuined();
+		m_ConditionTarget = new CCTSelf;
+	}
+	
+	override bool HasProgress()
+	{
+		return false;
+	}
+	
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		if (!super.ActionCondition( player, target, item ))
+			return false;
+		
+		Weapon_Base wpn = Weapon_Base.Cast(item);
+		return player.GetWeaponManager().CanUnjam(wpn);
+	}
+	
+	override void Start( ActionData action_data )
+	{
+		super.Start( action_data );
+		
+		action_data.m_Player.GetWeaponManager().Unjam( this );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/AnimatedActionBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/AnimatedActionBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b07fd11614ed9b71b5e28686f5c111219d519f91
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/AnimatedActionBase.c
@@ -0,0 +1,409 @@
+class ActionBaseCB : HumanCommandActionCallback
+{
+	protected ActionData				m_ActionData;
+	protected SoundOnVehicle 			m_SoundObject;//object of sound playing on entity
+	protected bool 						m_Canceled;//helps prevent doubled calling of actionbase End method
+	protected bool						m_Interrupted;//force callback to wait till action syncs its interruption
+		
+		
+	void ActionBaseCB()
+	{
+	}
+	
+	int GetPossileStanceMask()
+	{
+		return m_ActionData.m_PossibleStanceMask;
+	}
+	
+	//Command events
+	override void OnFinish(bool pCanceled)	
+	{
+		if ( LogManager.IsActionLogEnable() )
+		{
+			if ( m_ActionData)
+				Debug.ActionLog("Time stamp: " + m_ActionData.m_Player.GetSimulationTimeStamp(), m_ActionData.m_Action.ToString() , "n/a", "OnFinish", m_ActionData.m_Player.ToString() );
+			else
+				Debug.ActionLog("n/a", this.ToString() , "n/a", "OnFinish", "n/a" );
+		}
+		if ( m_SoundObject ) 
+		{
+			GetGame().ObjectDelete(m_SoundObject);
+		}
+		if ( m_ActionData && m_ActionData.m_Player )
+		{
+			if ( pCanceled ) 
+			{
+				m_ActionData.m_State = m_ActionData.m_ActionComponent.Interrupt(m_ActionData);
+			}
+			
+			AnimatedActionBase action = AnimatedActionBase.Cast(m_ActionData.m_Action);
+			
+			if(action)
+				action.End(m_ActionData);
+		}
+	}
+	
+	void SetCommand( int command_uid )
+	{		
+		InternalCommand(command_uid);
+	}
+
+	//---------------------------------------------------------------
+	//Action Component handlers
+	void CreateActionComponent() 
+	{
+		m_ActionData.m_ActionComponent = new CADummy;
+	}
+	
+	void InitActionComponent()
+	{
+	}
+	
+	void ProgressActionComponent()
+	{
+		if ( m_ActionData.m_ActionComponent )
+		{ 
+			m_ActionData.m_State = m_ActionData.m_ActionComponent.Execute(m_ActionData);
+		}
+	}	
+	
+	void EndActionComponent()
+	{
+	}	
+	
+	//// THIS Interrupt is use for initialize interrupt - WARNING Interrupt with parametr is used for handling interrupt
+	void Interrupt()
+	{
+		if ( GetGame().IsServer() )
+		{
+			if ( LogManager.IsActionLogEnable() )
+			{
+				Debug.ActionLog("n/a", this.ToString() , "n/a", "Interrupt", m_ActionData.m_Player.ToString() );	
+			}
+			if ( GetGame().IsMultiplayer() )
+			{
+				DayZPlayerSyncJunctures.SendActionInterrupt(m_ActionData.m_Player);
+			}
+		}
+		else
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_STANDARD_ACTION_END_REQUEST);
+				ctx.Write(DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT);
+				ctx.Send();
+			}
+		}
+		m_Interrupted = true;
+	}
+	
+	void SetActionData(ActionData action_data )
+	{
+		m_ActionData = action_data;
+	}
+	
+	override bool IsUserActionCallback()
+	{
+		return true;
+	}
+	
+	float GetActionComponentProgress()
+	{
+		if ( m_ActionData.m_ActionComponent )
+		{
+			return m_ActionData.m_ActionComponent.GetProgress();
+		}
+		return 0;
+	}
+	
+	int GetActionState()
+	{
+		return m_ActionData.m_State;
+	}
+	
+	ActionTarget GetTarget()
+	{
+		return m_ActionData.m_Target;
+	}
+};
+
+
+
+class AnimatedActionBase : ActionBase
+{	
+	protected int 					m_CommandUID;	//tells which command should be used for callback
+	protected int					m_CommandUIDProne;
+	protected typename 				m_CallbackClass; //tells which callback should be instantiated
+
+	
+	//-----------------------------------------------------
+	// 	Action events and methods
+	//-----------------------------------------------------
+	void AnimatedActionBase() 
+	{
+		// definable
+		m_CallbackClass = ActionBaseCB;
+	}
+	
+	protected void OnAlternativeEndServer( PlayerBase player ) //method called when action has not met conditions in action component
+	{
+	}
+	protected void OnAlternativeEndClient( PlayerBase player ) //method called when action has not met conditions in action component
+	{
+	}
+	
+	protected void OnInterruptServer( PlayerBase player ) //method called when action has not met conditions in action component
+	{
+	}
+	protected void OnInterruptClient( PlayerBase player ) //method called when action has not met conditions in action component
+	{
+	}
+	
+	protected void OnExecute( ActionData action_data )
+	{
+	}
+	
+	protected void OnExecuteServer( ActionData action_data )
+	{
+	}
+	
+	protected void OnExecuteClient( ActionData action_data )
+	{
+	}
+	
+	//TODO MW - add comment 
+	void OnAnimationEvent( ActionData action_data )
+	{
+		if (action_data && !action_data.m_WasExecuted)
+		{
+			ActionBase action = action_data.m_Action;
+			
+			if (action && ( !action.UseMainItem() || action_data.m_MainItem ) && ( !action.HasTarget() || action_data.m_Target ))
+			{
+				if ( LogManager.IsActionLogEnable() )
+				{
+					Debug.ActionLog("Time stamp: " + action_data.m_Player.GetSimulationTimeStamp(), this.ToString() , "n/a", "OnExecute", action_data.m_Player.ToString() );
+				}
+				OnExecute(action_data);
+			
+				if (GetGame().IsServer())
+					OnExecuteServer(action_data);
+				else
+					OnExecuteClient(action_data);
+
+				action_data.m_WasExecuted = true;
+				action_data.m_WasActionStarted  = true;
+			}
+		}
+	}
+	
+	override bool ActionConditionContinue( ActionData action_data ) //condition for action
+	{
+		return ActionCondition(action_data.m_Player,action_data.m_Target,action_data.m_MainItem);
+	}
+	
+	override bool ActionCondition( PlayerBase player, ActionTarget target, ItemBase item ) //condition for action
+	{
+		return true;
+	}
+	
+	//TODO MW - add comment 
+	protected int GetActionCommand( PlayerBase player )
+	{
+		if ( HasProneException() )
+		{
+			if ( player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT))
+				return m_CommandUID;
+			else
+				return m_CommandUIDProne;
+		}
+		return m_CommandUID;
+	}
+	
+	protected typename GetCallbackClassTypename()
+	{
+		return m_CallbackClass; 
+	}
+	
+	// if it is set to true if action have special fullbody animation for prone and additive for crouch and erect
+	override bool HasProneException()
+	{
+		return false;
+	}
+	
+	//TODO MW - add comment 
+	protected void CreateAndSetupActionCallback( ActionData action_data )
+	{
+		//Print("ActionBase.c | CreateAndSetupActionCallback | DBG ACTION CALLBACK CREATION CALLED");
+		ActionBaseCB callback;
+		if (  IsFullBody(action_data.m_Player) )
+		{
+			Class.CastTo(callback, action_data.m_Player.StartCommand_Action(GetActionCommand(action_data.m_Player),GetCallbackClassTypename(),GetStanceMask(action_data.m_Player)));	
+			//Print("ActionBase.c | CreateAndSetupActionCallback |  DBG command starter");		
+		}
+		else
+		{
+			Class.CastTo(callback, action_data.m_Player.AddCommandModifier_Action(GetActionCommand(action_data.m_Player),GetCallbackClassTypename()));
+			//Print("ActionBase.c | CreateAndSetupActionCallback |  DBG command modif starter: "+callback.ToString()+"   id:"+GetActionCommand().ToString());
+			
+		}
+		callback.SetActionData(action_data); 
+		callback.InitActionComponent(); //jtomasik - tohle mozna patri do constructoru callbacku?
+		action_data.m_Callback = callback;
+	}
+		
+		
+		
+	//	ACTION LOGIC -------------------------------------------------------------------
+	// called from actionmanager.c
+	override void Start( ActionData action_data ) //Setup on start of action
+	{
+		super.Start( action_data );
+		//Debug.Log("[Action DEBUG] Start time stamp: " + action_data.m_Player.GetSimulationTimeStamp());
+
+		if( !IsInstant() )
+		{
+			CreateAndSetupActionCallback(action_data);
+		}
+		/*Debug
+		SendMessageToClient( player, "ActionBase.c : Start");
+		Print("ActionBase.c : Start");
+		*/
+	}
+	
+	// THIS Interrupt is use for ACTUAL handling of intrrupt on action side - WARNING Interrupt without parametr is used for initialize interrupt
+	override void Interrupt( ActionData action_data )
+	{
+		if ( action_data.m_Callback )
+		{
+			action_data.m_Callback.Cancel();
+		}
+		else
+		{
+			End( action_data );
+		}
+	}
+	
+	void OnJumpStart()
+	{
+		
+	}
+		
+	// called from ActionBaseCB.c
+	void Do( ActionData action_data, int state )
+	{
+		if ( state == UA_ERROR || !action_data.m_Callback || !action_data.m_Player || !action_data.m_ActionComponent ) //jtomasik - tohle mozna muze byt v CancelCondtion metodu callbacku?
+		{
+#ifdef DIAG_DEVELOPER
+			if ( LogManager.IsActionLogEnable() )
+			{
+				Debug.ActionLog("ABRUPT CANCEL, CONDITIONS NOT MET", this.ToString() , "n/a", "Do", action_data.m_Player.ToString() );
+			}
+#endif
+			if ( action_data.m_Callback && action_data.m_Player )
+			{			
+				action_data.m_Callback.Interrupt();
+			}
+			else
+			{
+				Debug.ActionLog("PLAYER LOST", this.ToString() , "n/a", "Do", action_data.m_Player.ToString() );
+			}	
+		}
+		else
+		{
+			switch ( state )
+			{
+				case UA_PROCESSING:	
+					if ( CanContinue(action_data) )
+					{	
+						action_data.m_Callback.ProgressActionComponent();
+						InformPlayers(action_data.m_Player, action_data.m_Target, UA_PROCESSING);
+					}
+					else
+					{
+						action_data.m_Callback.Interrupt();
+						InformPlayers(action_data.m_Player, action_data.m_Target, UA_CANCEL);
+						Do(action_data, UA_CANCEL);
+					}
+					break;
+				
+				case UA_FINISHED:
+					InformPlayers(action_data.m_Player,action_data.m_Target,UA_FINISHED);
+					action_data.m_Callback.EndActionComponent();
+					break;
+				
+				case UA_CANCEL:
+					InformPlayers(action_data.m_Player,action_data.m_Target,UA_CANCEL);
+					action_data.m_Callback.EndActionComponent();
+					break;	
+				
+				case UA_INITIALIZE:
+					if ( !CanContinue(action_data) )
+					{						
+						action_data.m_Callback.Interrupt();
+						InformPlayers(action_data.m_Player, action_data.m_Target, UA_CANCEL);
+						Do(action_data, UA_CANCEL);
+					}
+				default:
+					Debug.ActionLog("Action component returned wrong value", this.ToString() , "n/a", "Do", action_data.m_Player.ToString() );
+					action_data.m_Callback.Interrupt();
+					break;
+			}
+		}
+	}
+	
+	// called from ActionBaseCB.c 
+	override void End( ActionData action_data )
+	{
+		if ( action_data.m_Player ) 
+		{
+			if ( GetGame().IsServer() )
+			{
+				OnEndServer(action_data);
+				action_data.m_Player.SetSoundCategoryHash(0);
+			}
+			else
+			{
+				OnEndClient(action_data);
+			}
+			OnEnd(action_data);
+			
+			// Xbox Achievemnts
+			if ( action_data.m_WasActionStarted )
+			{
+				if ( IsEat() )
+				{
+					GetGame().GetAnalyticsClient().OnActionEat();
+				}
+				else if ( IsDrink() )
+				{
+					GetGame().GetAnalyticsClient().OnActionDrink();
+				}
+				
+				action_data.m_WasActionStarted = false;
+			}
+			
+			action_data.m_Player.GetActionManager().OnActionEnd();
+			
+			
+		}
+		else
+		{
+			if ( LogManager.IsActionLogEnable() )
+			{
+				Debug.ActionLog("Ation could not be finished right at the end", this.ToString() , "n/a", "End", action_data.m_Player.ToString() );
+			}
+			action_data.m_Callback.Interrupt();
+		}
+	}
+	
+	override float GetProgress( ActionData action_data )
+	{
+		if ( action_data.m_ActionComponent )
+		{	 
+			return action_data.m_ActionComponent.GetProgress();
+		}
+		return 0;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..9b0ca1b0d0d74c383fb40d657fe62e0facf1d5d1
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIBase.c
@@ -0,0 +1,12 @@
+class CCIBase
+{
+	bool Can( PlayerBase player, ItemBase item )
+	{
+		return true;
+	}
+	
+	bool CanContinue( PlayerBase player, ItemBase item )
+	{
+		return ( Can(player,item) && item && item == player.GetItemInHands() );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIDummy.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIDummy.c
new file mode 100644
index 0000000000000000000000000000000000000000..86c7fc11a121443d488dd703cc32d2e95d32a78e
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIDummy.c
@@ -0,0 +1,7 @@
+class CCIDummy : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{
+		return item != null;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINonRuined.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINonRuined.c
new file mode 100644
index 0000000000000000000000000000000000000000..85dc183c15085abcd9617af6eeb6f74e397da34c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINonRuined.c
@@ -0,0 +1,7 @@
+class CCINonRuined : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{
+		return ( item && !item.IsDamageDestroyed() );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINone.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINone.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3d903b3b66577d77a93551141558865e2fa5a5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINone.c
@@ -0,0 +1,12 @@
+class CCINone : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{
+		return true;
+	}
+	
+	override bool CanContinue( PlayerBase player, ItemBase item )
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotEmpty.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotEmpty.c
new file mode 100644
index 0000000000000000000000000000000000000000..8462f5661e1d0e0b35ef3cef08e841e3917c03af
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotEmpty.c
@@ -0,0 +1,7 @@
+class CCINotEmpty : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{
+		return ( item && item.GetQuantity() > 0 );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotPresent.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotPresent.c
new file mode 100644
index 0000000000000000000000000000000000000000..5208102890abb2b2ace8d581be3210f875a5e0b0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotPresent.c
@@ -0,0 +1,12 @@
+class CCINotPresent : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{	
+		return !item;
+	}
+	
+	override bool CanContinue( PlayerBase player, ItemBase item )
+	{
+		return ( Can(player, item) );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotRuinedAndDry.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotRuinedAndDry.c
new file mode 100644
index 0000000000000000000000000000000000000000..f55de6c25ca3cef46bd94498a804b2bb8d6c882a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotRuinedAndDry.c
@@ -0,0 +1,7 @@
+class CCINotRuinedAndDry extends CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{
+		return ( item && !item.IsDamageDestroyed() && item.GetWet() <= 0 ) ;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotRuinedAndEmpty.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotRuinedAndEmpty.c
new file mode 100644
index 0000000000000000000000000000000000000000..acb896930ba88cf681effc6cf415e625b4413ddb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCINotRuinedAndEmpty.c
@@ -0,0 +1,7 @@
+class CCINotRuinedAndEmpty : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{
+		return ( item && !item.IsDamageDestroyed() && item.GetQuantity() > 0);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIPresent.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIPresent.c
new file mode 100644
index 0000000000000000000000000000000000000000..37f30a875340a68d77365c3b4a46135ad290d94a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/ItemConditionComponents/CCIPresent.c
@@ -0,0 +1,12 @@
+class CCIPresent : CCIBase
+{
+	override bool Can( PlayerBase player, ItemBase item )
+	{	
+		return item != null;
+	}
+	
+	override bool CanContinue( PlayerBase player, ItemBase item )
+	{
+		return ( Can(player, item) );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTBase.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..720c0e1545fa630135c707ee1137b0d3407ee7be
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTBase.c
@@ -0,0 +1,12 @@
+class CCTBase
+{
+	bool Can( PlayerBase player, ActionTarget target )
+	{
+		return true;
+	}
+	
+	bool CanContinue( PlayerBase player, ActionTarget target )
+	{
+		return Can(player, target);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursor.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursor.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5872f59898f172049e6625dc926f973460c9dbd
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursor.c
@@ -0,0 +1,35 @@
+class CCTCursor : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	//approximate head heights
+	const float HEIGHT_ERECT = 1.6;
+	const float HEIGHT_CROUCH = 1.05;
+	const float HEIGHT_PRONE = 0.66;
+	
+	void CCTCursor( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{
+		if (!target)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if (!targetObject)
+			targetObject = target.GetParent();
+		
+		if (!player || !targetObject || targetObject.IsDamageDestroyed())
+			return false;
+		
+		vector playerHeadPos;
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+		
+		float distanceRoot = vector.DistanceSq(target.GetCursorHitPos(), player.GetPosition());
+		float distanceHead = vector.DistanceSq(target.GetCursorHitPos(), playerHeadPos);
+		
+		return (distanceRoot <= m_MaximalActionDistanceSq || distanceHead <= m_MaximalActionDistanceSq);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorNoObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorNoObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..302c2647dfc0a8c0fe7e5a7ff42cb247e6533143
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorNoObject.c
@@ -0,0 +1,26 @@
+class CCTCursorNoObject : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	void CCTCursorNoObject ( float maximal_target_distance )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		if ( !target )
+			return false;
+			
+		if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			return true;
+		
+		vector playerHeadPos;
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+		
+		float distanceRoot = vector.DistanceSq(target.GetCursorHitPos(), player.GetPosition());
+		float distanceHead = vector.DistanceSq(target.GetCursorHitPos(), playerHeadPos);
+		
+		return ( distanceRoot <= m_MaximalActionDistanceSq || distanceHead <= m_MaximalActionDistanceSq );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorNoRuinCheck.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorNoRuinCheck.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d33030f8671307dfac2249e528cce5d9edc51b9
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorNoRuinCheck.c
@@ -0,0 +1,35 @@
+class CCTCursorNoRuinCheck : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	//approximate head heights
+	const float HEIGHT_ERECT = 1.6;
+	const float HEIGHT_CROUCH = 1.05;
+	const float HEIGHT_PRONE = 0.66;
+	
+	void CCTCursorNoRuinCheck( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{
+		if (!target)
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if (!targetObject)
+			targetObject = target.GetParent();
+		
+		if (!player || !targetObject)
+			return false;
+		
+		vector playerHeadPos;
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+		
+		float distanceRoot = vector.DistanceSq(target.GetCursorHitPos(), player.GetPosition());
+		float distanceHead = vector.DistanceSq(target.GetCursorHitPos(), playerHeadPos);
+		
+		return (distanceRoot <= m_MaximalActionDistanceSq || distanceHead <= m_MaximalActionDistanceSq);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorParent.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorParent.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d8d241f30bb5fb22ae779be810996c82eba1178
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTCursorParent.c
@@ -0,0 +1,32 @@
+class CCTCursorParent : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	//approximate head heights
+	const float HEIGHT_ERECT = 1.6;
+	const float HEIGHT_CROUCH = 1.05;
+	const float HEIGHT_PRONE = 0.66;
+	
+	void CCTCursorParent( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{
+		if( !target )
+			return false;
+		
+		Object parentObject = target.GetParent();
+		if ( !player || !parentObject || parentObject.IsDamageDestroyed() )
+			return false;
+		
+		vector playerHeadPos;
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+		
+		float distanceRoot = vector.DistanceSq(target.GetCursorHitPos(), player.GetPosition());
+		float distanceHead = vector.DistanceSq(target.GetCursorHitPos(), playerHeadPos);
+		
+		return ( distanceRoot <= m_MaximalActionDistanceSq || distanceHead <= m_MaximalActionDistanceSq );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTDummy.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTDummy.c
new file mode 100644
index 0000000000000000000000000000000000000000..fb38d4b3e12d3c1ed0af06d1bf307063588aedcb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTDummy.c
@@ -0,0 +1,7 @@
+class CCTDummy : CCTBase
+{
+	override bool Can( PlayerBase player, ActionTarget target )
+	{
+		return ( target && target.GetObject() );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTMan.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTMan.c
new file mode 100644
index 0000000000000000000000000000000000000000..71d293ee43becdaff1eed8e5db8e1f32e19d331f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTMan.c
@@ -0,0 +1,23 @@
+class CCTMan : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	protected bool m_MustBeAlive;
+	
+	void CCTMan ( float maximal_target_distance = UAMaxDistances.DEFAULT, bool must_be_alive = true )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;	
+		m_MustBeAlive = must_be_alive;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		if( !target )
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if ( !player || !targetObject || targetObject == player || !targetObject.IsMan() || !player.IsFacingTarget(targetObject) || ( m_MustBeAlive && targetObject.IsDamageDestroyed() ) )
+			return false;
+		
+		return ( vector.DistanceSq(targetObject.GetPosition(), player.GetPosition()) <= m_MaximalActionDistanceSq );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTNonRuined.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTNonRuined.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0a19e09401a0d3e2d98ae2f675f464c0deea0c8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTNonRuined.c
@@ -0,0 +1,21 @@
+class CCTNonRuined : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	void CCTNonRuined ( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{		
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		if( !target )
+			return false;
+		
+		Object targetObject = target.GetObject();
+		if ( !player || !targetObject || targetObject.IsMan() || targetObject.IsDamageDestroyed() )
+			return false;
+				
+		return ( vector.DistanceSq(targetObject.GetPosition(), player.GetPosition()) <= m_MaximalActionDistanceSq );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTNone.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTNone.c
new file mode 100644
index 0000000000000000000000000000000000000000..b358623da0df6696ebf55f018ba8dbfc34c53206
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTNone.c
@@ -0,0 +1,12 @@
+class CCTNone : CCTBase
+{
+	override bool Can( PlayerBase player, ActionTarget target )
+	{
+		return true;
+	}
+	
+	override bool CanContinue( PlayerBase player, ActionTarget target )
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTObject.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTObject.c
new file mode 100644
index 0000000000000000000000000000000000000000..a007a6c50eba7862f768595230a3e807c13300cc
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTObject.c
@@ -0,0 +1,49 @@
+class CCTObject : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	void CCTObject ( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{		
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		Object targetObject = target.GetObject();
+		if ( !targetObject || !player )
+			return false;
+		
+		vector playerHeadPos;
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+		
+		float distanceRoot = vector.DistanceSq(targetObject.GetPosition(), player.GetPosition());
+		float distanceHead = vector.DistanceSq(targetObject.GetPosition(), playerHeadPos);
+		
+		return ( distanceRoot <= m_MaximalActionDistanceSq || distanceHead <= m_MaximalActionDistanceSq );
+	}
+};
+
+class CCTParent : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	void CCTParent ( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{		
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		Object targetParent = target.GetParent();
+		if ( !targetParent || !player )
+			return false;
+		
+		vector playerHeadPos;
+		MiscGameplayFunctions.GetHeadBonePos(player, playerHeadPos);
+		
+		float distanceRoot = vector.DistanceSq(targetParent.GetPosition(), player.GetPosition());
+		float distanceHead = vector.DistanceSq(targetParent.GetPosition(), playerHeadPos);
+		
+		return ( distanceRoot <= m_MaximalActionDistanceSq || distanceHead <= m_MaximalActionDistanceSq );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTSelf.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTSelf.c
new file mode 100644
index 0000000000000000000000000000000000000000..a740d1e9b1e9f20fb0b12a0b682f0c906f248194
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTSelf.c
@@ -0,0 +1,12 @@
+class CCTSelf : CCTBase
+{
+	override bool Can( PlayerBase player, ActionTarget target )
+	{
+		return ( player && !player.IsDamageDestroyed());
+	}
+	
+	override bool CanContinue( PlayerBase player, ActionTarget target )
+	{
+		return Can(player, target);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTSurface.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTSurface.c
new file mode 100644
index 0000000000000000000000000000000000000000..2f7b2e461ccd4cbcd95c44bf5e7e02855244dc47
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTSurface.c
@@ -0,0 +1,24 @@
+class CCTSurface : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	void CCTSurface ( float maximal_target_distance = UAMaxDistances.DEFAULT )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		if( !target || (target && target.GetObject()) )
+			return false;
+		
+		if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			return true;
+		
+		vector hit_pos = target.GetCursorHitPos();
+		if (hit_pos == vector.Zero)
+			return false;
+		
+		return ( vector.DistanceSq(hit_pos, player.GetPosition()) <= m_MaximalActionDistanceSq );
+	}
+};
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTTree.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTTree.c
new file mode 100644
index 0000000000000000000000000000000000000000..ebb15bf44ed9e66ca22655b6f7bf4c3f24610eb4
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTTree.c
@@ -0,0 +1,24 @@
+class CCTTree : CCTBase
+{
+	protected float m_MaximalActionDistanceSq;
+	
+	void CCTTree ( float maximal_target_distance )
+	{
+		m_MaximalActionDistanceSq = maximal_target_distance * maximal_target_distance;
+	}
+	
+	override bool Can( PlayerBase player, ActionTarget target )
+	{	
+		if( !target )
+			return false;
+
+		Object targetObject = target.GetObject();
+		if ( !player || !targetObject || targetObject.IsDamageDestroyed() )
+			return false;
+		
+		if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+			return true;
+
+		return ( vector.DistanceSq(target.GetCursorHitPos(), player.GetPosition()) <= m_MaximalActionDistanceSq );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTWaterSurface.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTWaterSurface.c
new file mode 100644
index 0000000000000000000000000000000000000000..1291cfa011001cfdfa802eb137c6f9352790f543
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/TargetConditionsComponents/CCTWaterSurface.c
@@ -0,0 +1,57 @@
+class CCTWaterSurface : CCTBase
+{
+	protected const int HEIGHT_DIFF_LIMIT_METERS 	= 1.0;
+
+	protected float m_MaximalActionDistanceSq;
+	protected string m_SurfaceType; //!DEPRECATED
+	protected ref array<string> m_AllowedSurfaceList;
+	
+	void CCTWaterSurface(float maximal_target_distance = UAMaxDistances.DEFAULT, string surfaceType = "")
+	{
+		m_MaximalActionDistanceSq 	= maximal_target_distance * maximal_target_distance;
+		m_SurfaceType 				= surfaceType;
+		
+		m_AllowedSurfaceList		= new array<string>();
+		surfaceType.Split("|", m_AllowedSurfaceList);
+	}
+	
+	override bool Can(PlayerBase player, ActionTarget target)
+	{
+		if (!target || (target && target.GetObject()))
+			return false;
+		
+		//! use hit position from ActionTarget otherwise player's position
+		vector hitPosition = target.GetCursorHitPos();
+		if (hitPosition == vector.Zero)
+			hitPosition = player.GetPosition();
+		
+		string surfaceType;
+		float waterLevel = player.GetCurrentWaterLevel();
+		g_Game.SurfaceGetType3D(hitPosition[0], hitPosition[1] + waterLevel, hitPosition[2], surfaceType);
+
+		if (waterLevel > 0.0)
+			return Surface.AllowedWaterSurface(hitPosition[1] + waterLevel, surfaceType, m_AllowedSurfaceList);
+
+		float surfaceHeight = g_Game.SurfaceY(hitPosition[0], hitPosition[2]);		
+		//! special handling for sea
+		if (!surfaceType)
+		{
+			surfaceHeight = hitPosition[1];
+		}
+
+		float heightDiff = Math.AbsFloat(hitPosition[1] - surfaceHeight);
+		if (surfaceType != "" && heightDiff > HEIGHT_DIFF_LIMIT_METERS)
+			return false;
+		
+		float distSq = vector.DistanceSq(player.GetPosition(), hitPosition);
+		if (distSq > m_MaximalActionDistanceSq)
+			return false;
+
+		return Surface.AllowedWaterSurface(hitPosition[1], surfaceType, m_AllowedSurfaceList);
+	}
+	
+	override bool CanContinue(PlayerBase player, ActionTarget target)
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/UserActionsComponent/_constants.c b/scripts/4_World/DayZ/Classes/UserActionsComponent/_constants.c
new file mode 100644
index 0000000000000000000000000000000000000000..eaf0f76bd6b564f722e7114c6af977486b1a89cb
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/UserActionsComponent/_constants.c
@@ -0,0 +1,18 @@
+const int AC_UNCATEGORIZED						= 0;
+const int AC_SINGLE_USE							= 1;
+const int AC_CONTINUOUS							= 2;
+const int AC_INTERACT							= 3;
+
+const int AT_BUILD_PART							= 193;
+const int AT_DISMANTLE_PART						= 195;
+const int AT_DESTROY_PART						= 209;
+
+const int AT_WPN_ATTACH_MAGAZINE = 1501;
+const int AT_WPN_SWAP_MAGAZINE = 1502;
+const int AT_WPN_DETACH_MAGAZINE = 1503;
+const int AT_WPN_LOAD_BULLET = 1504;
+const int AT_WPN_UNJAM = 1505;
+const int AT_WPN_EJECT_BULLET = 1506;
+const int AT_WPN_LOAD_MULTI_BULLETS_START = 1507;
+const int AT_WPN_LOAD_MULTI_BULLETS_END   = 1508;
+const int AT_WPN_SET_NEXT_MUZZLE_MODE = 1509;
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementBadge.c b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementBadge.c
new file mode 100644
index 0000000000000000000000000000000000000000..017b7392e8377445afdd9fb752cc31ceb077a954
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementBadge.c
@@ -0,0 +1,13 @@
+class DisplayElementBadge extends DisplayElementBase
+{
+	void SetLevel(int level)
+	{
+		SetValue(level);
+	}
+	
+	override void UpdateHUD()
+	{
+		super.UpdateHUD();
+		m_ModulePlayerStatus.SetBadge(m_Key, m_Value);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementBase.c b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1b969ab12f745c5e21af7ec4007f015d0584479
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementBase.c
@@ -0,0 +1,90 @@
+class DisplayElementBase extends MessageReceiverBase
+{
+	int		m_Value;
+	int		m_ValueLast = -99999;
+	int 	m_Key = 0;
+	int		m_Type = 0;
+	int 	m_Range = 0;
+	int		m_Colors[7];
+	string 	m_Labels[7];
+	int		m_Pos = 1;
+	int		NUM_OF_BITS;
+	bool 	m_IsClientOnly = false;
+	PlayerBase m_Player;
+	
+	PluginPlayerStatus 	m_ModulePlayerStatus;
+
+	void DisplayElementBase(PlayerBase player)
+	{
+		m_System = "VirtualHud";
+		m_ModulePlayerStatus = PluginPlayerStatus.Cast(GetPlugin(PluginPlayerStatus));
+		m_Player = player;
+		//SetMaxValue();
+	}
+	
+	//for elements which get their value client side and can be updated much more quickly
+	bool IsClientOnly()
+	{
+		return m_IsClientOnly;
+	}
+	
+	bool IsValueChanged()
+	{
+		return !(m_Value == m_ValueLast);
+	}
+	
+	void UpdateHUD()
+	{
+		m_ValueLast = m_Value;
+	}
+	
+	int GetNumberOfBits()
+	{
+		return NUM_OF_BITS;
+	}
+	
+	void SetValue(int value, int range = 0)
+	{
+		m_Value = value;
+		if (range != 0 )
+		{
+			m_Range = range;
+		}
+	}
+
+	int GetValue()
+	{
+		return m_Value;
+	}
+
+	int BitToDec(int mask, int index, int length)
+	{
+		int value = mask & (GetCompareMask() << index);
+		value = value >> index;
+		return value;
+	}
+
+	int GetCompareMask()
+	{
+		int mask = Math.Pow(2, GetNumberOfBits() ) - 1;
+		return mask;
+	}
+	
+	int GetType()
+	{
+		return m_Type;
+	}
+	
+	int TranslateLevelToStatus(int level)
+	{
+		if( level == DSLevels.WARNING )
+			return 2;
+		if( level == DSLevels.CRITICAL )
+			return 3;
+		if( level == DSLevels.BLINKING )
+			return 4;
+		if( level == DSLevels.EXTRA )
+			return 5;
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementTendency.c b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementTendency.c
new file mode 100644
index 0000000000000000000000000000000000000000..59a1d50cb345d7009d122302230939d8bba0f1ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayElementTendency.c
@@ -0,0 +1,43 @@
+class DisplayElementTendency extends DisplayElementBase
+{
+	protected int TENDENCY_MASK = 7;// first x bits
+	protected int SERIOUSNESS_BIT_MASK = 7;// second x bits
+	protected int SERIOUSNESS_BIT_OFFSET = 3;//bit offset - points to where seriousness bit starts(TODO: get as log from mask)
+	
+	void DisplayElementTendency(PlayerBase player)
+	{
+		NUM_OF_BITS = 6;//the overall num of bits this element occupies(can be calculated from masks, better leave it explicit)
+	}
+	
+	void SetSeriousnessLevel( DSLevels level )
+	{
+		m_Value = (~(SERIOUSNESS_BIT_MASK << SERIOUSNESS_BIT_OFFSET)) & m_Value;//clear the last value
+		m_Value = (level << SERIOUSNESS_BIT_OFFSET)  | m_Value;
+	}
+	
+	override void UpdateHUD()
+	{
+		super.UpdateHUD();
+		int seriousness = m_Value >> SERIOUSNESS_BIT_OFFSET;
+		int tendency = TENDENCY_MASK & m_Value;
+		//PrintString(tendency.ToString());
+		
+		if(tendency > 3) 
+		{
+			tendency = -(tendency - 3);
+		}
+		/*
+		PrintString(this.ToString());
+		PrintString("ser:"+ seriousness.ToString());
+		PrintString("tnd:"+ tendency.ToString());
+		*/
+		m_ModulePlayerStatus.DisplayTendency(m_Key, tendency, TranslateLevelToStatus(seriousness));
+	}
+	
+	void SetTendency(int tendency)
+	{
+		m_Value = (~TENDENCY_MASK) & m_Value;//clear the last value
+		m_Value =  tendency | m_Value;//insert the new one
+		//PrintString(m_Value.ToString());
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/DisplayStatus.c b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayStatus.c
new file mode 100644
index 0000000000000000000000000000000000000000..deeb57e3354228d0135acd0caa6bea7dc929cd07
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/DisplayStatus.c
@@ -0,0 +1,231 @@
+enum DSLevels
+{
+	NORMAL = 0,//no bit, default
+	WARNING = 1,//first bit
+	CRITICAL = 2,//second bit
+	BLINKING = 3,//first + second bit
+	EXTRA = 4,//third bit
+}
+
+enum DSLevelsTemp
+{
+	NORMAL = 0,//no bit, default
+	WARNING_MINUS = 1,//
+	CRITICAL_MINUS = 2,//
+	BLINKING_MINUS = 3,//
+	WARNING_PLUS = 4,//
+	CRITICAL_PLUS = 5,//
+	BLINKING_PLUS = 6,//
+}
+
+class VirtualHud
+{
+	const int NUMBER_OF_MASKS = 2;//how many INT numbers we need to accommodate all elements
+	ref array<int> m_LastSentArray;
+	//ref map<int, ref DisplayElement> m_Elements;
+	const int NUMBER_OF_ELEMENTS = eDisplayElements.COUNT;
+	ref DisplayElementBase m_Elements[NUMBER_OF_ELEMENTS];
+	Mission mission;
+	Hud m_Hud;
+	int m_LastTick;
+	PlayerBase m_Player;
+	string m_System 		= "VirtualHud";
+	
+	ref array<ref Param> rpcParams;
+	
+	void VirtualHud(PlayerBase player)
+	{
+		m_Player 		= player;
+		m_LastTick		= 0;
+
+		RegisterElement(new BadgeStuffed(m_Player));
+		RegisterElement(new BadgeWet(m_Player));
+		RegisterElement(new BadgeSick(m_Player));
+		RegisterElement(new BadgePills(m_Player));
+		RegisterElement(new BadgePoisoned(m_Player));
+		RegisterElement(new BadgeFracture(m_Player));
+		RegisterElement(new TendencyHealth(m_Player));
+		RegisterElement(new TendencyBlood(m_Player));
+		RegisterElement(new TendencyTemperature(m_Player));
+
+		RegisterElement(new TendencyHunger(m_Player));
+		RegisterElement(new TendencyThirst(m_Player));
+		RegisterElement(new TendencyBacteria(m_Player));
+		RegisterElement(new BadgeHeartbeat(m_Player));
+		RegisterElement(new BadgeLegs(m_Player));
+
+
+		RegisterElement(new ElementStance(m_Player));// client only
+		RegisterElement(new BadgeBleeding(m_Player));// client only
+		
+
+		mission = GetGame().GetMission();
+		if ( mission )
+		{
+			m_Hud = mission.GetHud();
+		}
+		//UpdateStatus();
+	}
+	
+	
+	void OnScheduledTick()
+	{
+		if ( GetGame().IsServer() )
+		{
+			if (GetGame().GetTime() > (m_LastTick + VIRTUAL_HUD_UPDATE_INTERVAL))
+			{
+				SendRPC();
+				m_LastTick = GetGame().GetTime();
+			}
+		}
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			ImmediateUpdate();
+			//DisplayPresence();
+		}
+	}
+
+	void RegisterElement(DisplayElementBase element)
+	{
+		int id = element.GetType();
+		m_Elements[id] = element;
+		//Log("adding element:"+id.ToString());
+	}
+	
+	DisplayElementBase GetElement(eDisplayElements element_id)
+	{
+		if ( element_id < 0 || element_id >= NUMBER_OF_ELEMENTS )
+		{
+			return null;
+		}
+		return m_Elements[element_id];
+	}
+
+	//this will serialize all elements and 'compresses' them into integer(s) through bit shifting, these integers are placed into an array
+	void SerializeElements(ref array<int> mask_array)
+	{
+		int offset = 0;
+		int mask = 0;
+		
+		for (int i = 0; i < NUMBER_OF_ELEMENTS; i++)
+		{
+			if (  GetElement(i) && !GetElement(i).IsClientOnly() )
+			{
+				if ( (GetElement(i).GetNumberOfBits() + offset) > BIT_INT_SIZE )
+				{
+					mask_array.Insert(mask);
+					offset = 0;
+					mask = 0;
+				}
+				mask = mask | (GetElement(i).GetValue() << offset);
+				offset = offset + GetElement(i).GetNumberOfBits();
+			}
+		}
+		mask_array.Insert(mask);
+	}
+
+	void DeserializeElements(ref array<int> mask_array)//extracts elements from mask
+	{
+		int maskArrayIndex = 0;
+		int offset = 0;
+		int mask = 0;
+		
+		for (int i = 0; i < NUMBER_OF_ELEMENTS;i++)
+		{
+			if ( GetElement(i) && !GetElement(i).IsClientOnly() )
+			{
+				//Log("entity> " + ToString(GetElement(i)) );
+				if (offset + GetElement(i).GetNumberOfBits() > BIT_INT_SIZE)
+				{
+					maskArrayIndex++;
+					offset = 0;
+				}
+				mask = mask_array.Get(maskArrayIndex);
+				int value = BitToDec( mask, offset, GetElement(i).GetCompareMask() );
+				offset = offset + GetElement(i).GetNumberOfBits();
+				GetElement(i).SetValue( value );
+			}
+		}
+	}
+
+	int BitToDec(int mask, int index, int compareMask)
+	{
+		int value = mask & (compareMask << index);
+		value = value >> index;
+		return value;
+	}
+
+
+	void PrintElements()
+	{
+		for (int i = 0; i < NUMBER_OF_ELEMENTS; i++)
+		{
+			PrintString(i.ToString() +": "+ GetElement(i).m_Value.ToString() );
+		}
+	}
+
+	void SendRPC()
+	{
+		array<int> mask_array = new array<int>;
+		SerializeElements(mask_array);
+		if ( !m_LastSentArray || !AreArraysSame(m_LastSentArray, mask_array)  )
+		{
+			ScriptRPC rpc = new ScriptRPC();
+			rpc.Write(mask_array);
+			rpc.Send(m_Player, ERPCs.RPC_SYNC_DISPLAY_STATUS, false, m_Player.GetIdentity());
+			m_LastSentArray = mask_array;
+		}
+	}
+
+	bool AreArraysSame( notnull array<int> array_a, notnull array<int> array_b )
+	{
+		if ( array_a.Count() != array_b.Count() ) return false;
+		for (int i = 0; i  <array_a.Count(); i++)
+		{
+			if ( array_a.Get(i) != array_b.Get(i) )
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	void ImmediateUpdate()
+	{
+		for (int i = 0; i < NUMBER_OF_ELEMENTS;i++)
+		{
+			DisplayElementBase element = GetElement(i);
+			if ( element && element.IsClientOnly() && element.IsValueChanged() )
+				element.UpdateHUD();
+		}
+	}
+	
+	void UpdateStatus()
+	{
+		//Log("UpdateStatus called for entity: "+ToString(m_Player));
+		for (int i = 0; i < NUMBER_OF_ELEMENTS; i++)
+		{
+			DisplayElementBase element = GetElement(i);
+			if (  element && !element.IsClientOnly() && element.IsValueChanged() ) 
+			{
+				element.UpdateHUD();
+			}
+		}
+	}
+
+	void OnRPC(ParamsReadContext ctx)//on Client
+	{
+		//Log("OnRPC called");
+		array<int> mask_array = new array<int>;
+		ctx.Read(mask_array); 
+		DeserializeElements(mask_array);
+		UpdateStatus();
+	}
+
+	void Debug()
+	{
+		Log("debug");
+		PluginPlayerStatus 	m_ModulePlayerStatus = PluginPlayerStatus.Cast(GetPlugin(PluginPlayerStatus));
+		m_ModulePlayerStatus.DisplayTendency(NTFKEY_HUNGRY, 2);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeBleeding.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeBleeding.c
new file mode 100644
index 0000000000000000000000000000000000000000..b66b3c37b71a1604702c15f442d28fbbd3233b49
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeBleeding.c
@@ -0,0 +1,15 @@
+class BadgeBleeding extends DisplayElementBadge 
+{
+	void BadgeBleeding(PlayerBase player)
+	{
+		NUM_OF_BITS = 1;
+		m_Key 	= 	NTFKEY_BLEEDISH;
+		m_Type	=	eDisplayElements.DELM_BADGE_BLEEDING;
+		m_IsClientOnly = true;
+	}
+		
+	override void UpdateHUD()
+	{
+		super.UpdateHUD();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeFracture.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeFracture.c
new file mode 100644
index 0000000000000000000000000000000000000000..4588d23f16008078c2394106bda65bb758507d0a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeFracture.c
@@ -0,0 +1,9 @@
+class BadgeFracture extends DisplayElementBadge 
+{
+	void BadgeFracture(PlayerBase player)
+	{
+		NUM_OF_BITS = 1;
+		m_Key 	= 	NTFKEY_FRACTURE;
+		m_Type	=	eDisplayElements.DELM_BADGE_FRACTURE;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeHeartbeat.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeHeartbeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..09b1f5f36c39872a5041b29a5a2eae20e22faff3
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeHeartbeat.c
@@ -0,0 +1,14 @@
+class BadgeHeartbeat extends DisplayElementBadge 
+{
+	void BadgeHeartbeat(PlayerBase player)
+	{
+		NUM_OF_BITS = 2;
+		m_Key 	= 	NTFKEY_HEARTBEAT;
+		m_Type	=	eDisplayElements.DELM_BADGE_HEARTBEAT;
+	}
+		
+	override void UpdateHUD()
+	{
+		super.UpdateHUD();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeLegs.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeLegs.c
new file mode 100644
index 0000000000000000000000000000000000000000..08e645f7d4d2bfa47136bb8ae6ea713f29934a5c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeLegs.c
@@ -0,0 +1,9 @@
+class BadgeLegs extends DisplayElementBadge 
+{
+	void BadgeLegs(PlayerBase player)
+	{
+		NUM_OF_BITS = 2;
+		m_Key 	= 	NTFKEY_LEGS;
+		m_Type	=	eDisplayElements.DELM_BADGE_LEGS;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgePills.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgePills.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef6ffa868b4cdce3ce273d2a320932985c34ea1c
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgePills.c
@@ -0,0 +1,9 @@
+class BadgePills extends DisplayElementBadge 
+{
+	void BadgePills(PlayerBase player)
+	{
+		NUM_OF_BITS = 1;
+		m_Key 	= 	NTFKEY_PILLS;
+		m_Type	=	eDisplayElements.DELM_BADGE_PILLS;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgePoisoned.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgePoisoned.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe7304d84c9c0db8157a97377ee44a8559710a61
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgePoisoned.c
@@ -0,0 +1,9 @@
+class BadgePoisoned extends DisplayElementBadge 
+{
+	void BadgePoisoned(PlayerBase player)
+	{
+		NUM_OF_BITS = 1;
+		m_Key 	= 	NTFKEY_POISONED;
+		m_Type	=	eDisplayElements.DELM_BADGE_POISONED;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeSick.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeSick.c
new file mode 100644
index 0000000000000000000000000000000000000000..77e8a1b4078b6b54a864ae46c8532f80c2a98fde
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeSick.c
@@ -0,0 +1,9 @@
+class BadgeSick extends DisplayElementBadge 
+{
+	void BadgeSick(PlayerBase player)
+	{
+		NUM_OF_BITS = 1;
+		m_Key 	= 	NTFKEY_SICK;
+		m_Type	=	eDisplayElements.DELM_BADGE_SICK;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeStuffed.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeStuffed.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb28526dde9a3010156af5d83608ecd8a43210d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeStuffed.c
@@ -0,0 +1,9 @@
+class BadgeStuffed extends DisplayElementBadge 
+{
+	void BadgeStuffed(PlayerBase player)
+	{
+		NUM_OF_BITS = 2;
+		m_Key 	= 	NTFKEY_STUFFED;
+		m_Type	=	eDisplayElements.DELM_BADGE_STUFFED;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeWet.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeWet.c
new file mode 100644
index 0000000000000000000000000000000000000000..4c317e24a22e88ef98b7e9450c00a799cf09363a
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Badge/BadgeWet.c
@@ -0,0 +1,9 @@
+class BadgeWet extends DisplayElementBadge 
+{
+	void BadgeWet(PlayerBase player)
+	{
+		NUM_OF_BITS = 1;
+		m_Key 	= 	NTFKEY_WETNESS;
+		m_Type	=	eDisplayElements.DELM_BADGE_WET;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Misc/ElementStance.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Misc/ElementStance.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec49158c198142e0d40df58d098588a113d43679
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Misc/ElementStance.c
@@ -0,0 +1,15 @@
+class ElementStance extends DisplayElementBase 
+{
+	void ElementStance(PlayerBase player)
+	{
+		NUM_OF_BITS = 2;
+		m_Type		=	eDisplayElements.DELM_STANCE;
+		m_IsClientOnly = true;
+	}
+	
+	override void UpdateHUD()
+	{
+		super.UpdateHUD();
+		m_ModulePlayerStatus.SetStance( m_Value );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyBacteria.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyBacteria.c
new file mode 100644
index 0000000000000000000000000000000000000000..e4939eedc13bd19b4a2ef219b2c5f4c25b3e73e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyBacteria.c
@@ -0,0 +1,9 @@
+class TendencyBacteria extends DisplayElementTendency 
+{
+	void TendencyBacteria(PlayerBase player)
+	{
+		m_Type = eDisplayElements.DELM_TDCY_BACTERIA;
+		m_Key = NTFKEY_BACTERIA;
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyBlood.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyBlood.c
new file mode 100644
index 0000000000000000000000000000000000000000..6b1d8cee85e244c63d0b11e06db6460cf5ed5c78
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyBlood.c
@@ -0,0 +1,8 @@
+class TendencyBlood extends DisplayElementTendency 
+{
+	void TendencyBlood(PlayerBase player)
+	{
+		m_Type	=	eDisplayElements.DELM_TDCY_BLOOD;
+		m_Key = NTFKEY_BLEEDISH;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyHealth.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyHealth.c
new file mode 100644
index 0000000000000000000000000000000000000000..3c0dc1834fa4bababe07c2b1249bda5ffbde258f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyHealth.c
@@ -0,0 +1,9 @@
+class TendencyHealth extends DisplayElementTendency 
+{
+	void TendencyHealth(PlayerBase player)
+	{
+		m_Type	=	eDisplayElements.DELM_TDCY_HEALTH;
+		m_Key = NTFKEY_SICK;
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyHunger.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyHunger.c
new file mode 100644
index 0000000000000000000000000000000000000000..14910fd37b33703d9b66f00445032dab8f97f86f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyHunger.c
@@ -0,0 +1,8 @@
+class TendencyHunger extends DisplayElementTendency 
+{
+	void TendencyHunger(PlayerBase player)
+	{
+		m_Type	=	eDisplayElements.DELM_TDCY_ENERGY;
+		m_Key = NTFKEY_HUNGRY;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyTemperature.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyTemperature.c
new file mode 100644
index 0000000000000000000000000000000000000000..80e2107023e18b874f3956058120f178b0551894
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyTemperature.c
@@ -0,0 +1,24 @@
+class TendencyTemperature extends DisplayElementTendency 
+{
+	void TendencyTemperature(PlayerBase player)
+	{
+		TENDENCY_MASK = 7;// 3 bits
+		SERIOUSNESS_BIT_MASK = 7;// 3 bits
+		SERIOUSNESS_BIT_OFFSET = 3;//3 bit offset
+		NUM_OF_BITS = 6;		
+
+		m_Type	= eDisplayElements.DELM_TDCY_TEMPERATURE;
+		m_Key = NTFKEY_FEVERISH;
+	}
+	
+	override int TranslateLevelToStatus(int level)
+	{
+		if( level == DSLevelsTemp.WARNING_PLUS ) return 2;
+		if( level == DSLevelsTemp.CRITICAL_PLUS ) return 3;
+		if( level == DSLevelsTemp.BLINKING_PLUS ) return 4;
+		if( level == DSLevelsTemp.WARNING_MINUS ) return 5;
+		if( level == DSLevelsTemp.CRITICAL_MINUS ) return 6;
+		if( level == DSLevelsTemp.BLINKING_MINUS ) return 7;
+		return 1;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyThirst.c b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyThirst.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d31fefdd765972a912a4735554d5fc251e8832f
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/Elements/Tendency/TendencyThirst.c
@@ -0,0 +1,8 @@
+class TendencyThirst extends DisplayElementTendency 
+{
+	void TendencyThirst(PlayerBase player)
+	{
+		m_Type	=	eDisplayElements.DELM_TDCY_WATER;
+		m_Key = NTFKEY_THIRSTY;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/VirtualHud/_constants.c b/scripts/4_World/DayZ/Classes/VirtualHud/_constants.c
new file mode 100644
index 0000000000000000000000000000000000000000..b6f5f92f78caf925273b5e893f1ede6f801dd191
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/VirtualHud/_constants.c
@@ -0,0 +1,59 @@
+enum eBadgeLevel
+{
+	NONE,
+	FIRST,
+	SECOND,
+	THIRD,
+}
+
+enum eDisplayElements
+{
+	DELM_BADGE_STUFFED,
+	DELM_BADGE_WET,
+	DELM_BADGE_SICK,
+	DELM_BADGE_POISONED,
+	DELM_BADGE_FRACTURE,
+	DELM_BADGE_BLEEDING,
+	DELM_BADGE_PILLS,
+	DELM_BADGE_HEARTBEAT,
+	DELM_BADGE_LEGS,
+	DELM_TDCY_HEALTH,
+	DELM_TDCY_BLOOD,
+	DELM_TDCY_TEMPERATURE,
+	DELM_TDCY_ENERGY,
+	DELM_TDCY_WATER,
+	DELM_TDCY_BACTERIA,
+	//------------------
+	DELM_STANCE,
+	COUNT
+}
+
+//constants related to ui
+//key constants
+const int	NTFKEY_THIRSTY		= 1;
+const int	NTFKEY_HUNGRY		= 2;
+const int	NTFKEY_WARMTH		= 3;
+const int	NTFKEY_WETNESS		= 4;
+const int	NTFKEY_FRACTURE		= 5;
+const int	NTFKEY_HEALTHY		= 6;
+const int	NTFKEY_FEVERISH		= 7;
+const int	NTFKEY_SICK			= 8;
+const int	NTFKEY_STUFFED		= 9;
+const int	NTFKEY_BLEEDISH		= 10;
+const int	NTFKEY_BLOOD		= 11;
+const int	NTFKEY_LIVES		= 12;
+const int	NTFKEY_BACTERIA		= 13;
+const int	NTFKEY_POISONED		= 14;
+const int	NTFKEY_PILLS		= 15;
+const int	NTFKEY_HEARTBEAT 	= 16;
+const int	NTFKEY_LEGS 		= 17;
+
+//tendency 
+const int	TENDENCY_STABLE 	= 0;
+const int	TENDENCY_INC_LOW	= 1;
+const int	TENDENCY_INC_MED	= 2;
+const int	TENDENCY_INC_HIGH	= 3;
+const int	TENDENCY_DEC_LOW 	= 4;
+const int	TENDENCY_DEC_MED 	= 5;
+const int	TENDENCY_DEC_HIGH	= 6;
+
diff --git a/scripts/4_World/DayZ/Classes/WeaponDebug.c b/scripts/4_World/DayZ/Classes/WeaponDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..e8c43ee37f73155363a78a95f4f65e622c30c472
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/WeaponDebug.c
@@ -0,0 +1,441 @@
+enum eDebugMode
+{
+    NORMAL,
+	MUZZLE_FIRE,
+	CAMERA_MUZZLE_HYBRID,
+	COUNT
+};
+
+
+
+class WeaponDebug
+{
+	const int BUFFER_SIZE = 1000;
+	const float COLLISIONS_DISTANCE_TOLERANCE = 0.01;
+	const float MAX_MUZZLE_DISTANCE_TOLERANCE = 20;
+	const float CAMERA_BULLET_ORIGIN_OFFSET = 1;
+	const float CAMERA_TRACE_MIN_DISTANCE_TOLERANCE = 0.3;
+	
+	Weapon m_WeaponInHands;
+	int m_BufferIndex;
+	bool m_IsDrawKeyHeldDown;
+	bool m_IsLMBPressed;
+	bool m_IsToggleKeyPressed;
+	bool m_IsFireKeyPressed;
+	float m_TargetDistance;
+	eDebugMode m_CurrentMode;
+	vector m_AimTrailCyclic[BUFFER_SIZE];	
+	vector m_AimTrailOrdered[BUFFER_SIZE];
+	
+	ref map<int, string> m_DebugModesNames = new map<int, string>;
+	
+	//ref array<Selection> m_Selections = new array<Selection>();
+	
+	Shape m_Shape_usti;
+	Shape m_Shape_konec;
+	Shape m_ShapeFireDirection1;
+	Shape m_ShapeFireDirection2;
+	Shape m_HitShape;
+	Shape m_ShapeEye;
+	Shape m_ShapeTrailLines;
+	Shape m_ShapeFireDirCamera;
+	Shape m_HitShape2;
+	Shape m_HitShape3;
+	Shape m_HitShape4;
+	//Shape temp_shape;
+	Shape m_PermanentLine1;
+	Shape m_PermanentLine2;
+	
+	Shape m_PermanentShape1;
+	Shape m_PermanentShape2;
+	
+	Weapon GetWeaponInHands()
+	{
+		Weapon weapon_in_hands;
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if( player && player.GetItemInHands() ) Class.CastTo(weapon_in_hands,  player.GetItemInHands());
+		
+		return weapon_in_hands;
+	}
+	
+	void WeaponDebug()
+	{
+		m_DebugModesNames.Insert(eDebugMode.NORMAL, "Mode "+eDebugMode.NORMAL.ToString()+": shoot along the weapon barrel");
+		m_DebugModesNames.Insert(eDebugMode.MUZZLE_FIRE,"Mode "+eDebugMode.MUZZLE_FIRE.ToString()+": shoot from muzzle end to camera trace hit point");
+		m_DebugModesNames.Insert(eDebugMode.CAMERA_MUZZLE_HYBRID, "Mode "+eDebugMode.CAMERA_MUZZLE_HYBRID.ToString()+": shoot either from camera lens or from muzzle \n depending on the situation");
+	}
+	
+	void ~WeaponDebug()
+	{
+		RemoveAllShapes(true);
+		
+	}
+
+	void RemoveAllShapes(bool is_exit = false)
+	{
+		Debug.RemoveShape(m_Shape_usti);
+		Debug.RemoveShape(m_Shape_konec);
+		Debug.RemoveShape(m_ShapeFireDirection1);
+		Debug.RemoveShape(m_ShapeFireDirection2);
+		Debug.RemoveShape(m_ShapeEye);
+		Debug.RemoveShape(m_ShapeTrailLines);
+		Debug.RemoveShape(m_ShapeFireDirCamera);
+		Debug.RemoveShape(m_HitShape);
+		Debug.RemoveShape(m_HitShape2);
+		Debug.RemoveShape(m_HitShape3);
+		Debug.RemoveShape(m_HitShape4);
+		
+		if ( is_exit )
+		{
+			Debug.RemoveShape(m_PermanentLine1);
+			Debug.RemoveShape(m_PermanentLine2);
+			Debug.RemoveShape(m_PermanentShape1);
+			Debug.RemoveShape(m_PermanentShape2);
+		}
+	}
+
+
+	void OnCommandHandlerUpdate()
+	{
+			
+		m_IsLMBPressed = false;
+		m_IsFireKeyPressed = false;
+		
+		if (KeyState(KeyCode.KC_LWIN) == 1)
+		{
+			if (!m_IsDrawKeyHeldDown)
+			{
+				OnKeyDown(KeyCode.KC_LWIN);
+			}
+			m_IsDrawKeyHeldDown = true;
+		}
+		else
+		{
+			if ( m_IsDrawKeyHeldDown )
+			{
+				//OnKeyUp();
+			}
+			m_IsDrawKeyHeldDown = false;
+		}
+		
+		if (KeyState(KeyCode.KC_Z) == 1)
+		{
+			ClearKey(KeyCode.KC_Z);
+			CycleDebugMode();
+		}
+		
+		if (KeyState(KeyCode.KC_X) == 1)
+		{
+			m_IsFireKeyPressed = true;
+			ClearKey(KeyCode.KC_X);
+		}
+
+		if (GetMouseState(MouseState.LEFT) & MB_PRESSED_MASK)
+		{
+			m_IsLMBPressed = true;
+		}
+	}
+
+	void OnKeyDown(KeyCode key)
+	{
+		if (key == KeyCode.KC_X)
+		{
+		}
+	}
+	
+	void CycleDebugMode()
+	{
+		m_CurrentMode++;
+		if ( m_CurrentMode == eDebugMode.COUNT )
+		{
+			m_CurrentMode = 0;
+		}
+	
+	}
+	
+	void OnPostFrameUpdate()
+	{
+		if ( GetWeaponInHands() )
+		{
+			RemoveAllShapes();
+			Weapon weapon = GetWeaponInHands();
+			vector cameraDirection = GetGame().GetCurrentCameraDirection();
+			vector cameraPosition = GetGame().GetCurrentCameraPosition();
+			vector usti_hlavne_position = weapon.GetSelectionPositionMS( "usti hlavne" );//usti hlavne
+			vector konec_hlavne_position = weapon.GetSelectionPositionMS( "konec hlavne" );//konec hlavne
+			usti_hlavne_position = weapon.ModelToWorld(usti_hlavne_position);
+			konec_hlavne_position = weapon.ModelToWorld(konec_hlavne_position);
+			
+			if ( m_CurrentMode == eDebugMode.NORMAL ) 
+			{
+				DrawLineOfFire(konec_hlavne_position,usti_hlavne_position );
+			}
+			
+			if ( m_CurrentMode == eDebugMode.MUZZLE_FIRE ) 
+			{
+				DrawLineOfFireMuzzleToHit(usti_hlavne_position, cameraDirection, cameraPosition);
+			}
+			
+			if ( m_CurrentMode == eDebugMode.CAMERA_MUZZLE_HYBRID ) 
+			{
+				DrawLineOfFireCameraHybrid(usti_hlavne_position, cameraDirection, cameraPosition, konec_hlavne_position);
+			}
+			
+			if (m_IsDrawKeyHeldDown)
+			{
+				AddPosToCyclicBuffer(usti_hlavne_position);
+				OrderTrailArray();
+			}
+
+			m_ShapeTrailLines = Debug.DrawLines( m_AimTrailOrdered,BUFFER_SIZE, COLOR_YELLOW, ShapeFlags.NOZBUFFER );
+			
+		
+			DrawEyePoint(weapon);
+			DrawBarrelMemoryPoints(konec_hlavne_position,usti_hlavne_position );
+			DisplayGeneralInfo();
+			DisplayTargetInfo();
+			/*
+			vector pos;
+			weapon.GetProjectedCursorPos3d(pos);
+			Debug.RemoveShape(temp_shape);
+			temp_shape = Debug.DrawSphere(pos, 0.1, Colors.GREEN);
+			*/
+		}
+	}
+
+	void DrawBarrelMemoryPoints(vector begin_point, vector end_point)
+	{
+		if (!m_IsDrawKeyHeldDown)
+		{
+			m_Shape_usti = Debug.DrawSphere(end_point, 0.011, Colors.GREEN, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER);
+			m_Shape_konec = Debug.DrawSphere(begin_point, 0.011, Colors.GREEN, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER);
+		}
+	}
+
+
+	void DrawLineOfFire(vector begin_point, vector end_point)
+	{
+		vector contact_point;
+		vector contact_dir;
+		vector aim_point = end_point - begin_point;
+		int contact_component;
+		
+		aim_point = aim_point.Normalized() * 100;
+		aim_point = aim_point + end_point;
+		
+		m_ShapeFireDirection1 = Debug.DrawLine(end_point, aim_point);
+		m_ShapeFireDirection2 = Debug.DrawLine(begin_point, end_point, ShapeFlags.NOZBUFFER );
+		
+		if ( DayZPhysics.RaycastRV(end_point, aim_point, contact_point, contact_dir, contact_component, null, null, null, false, false, ObjIntersectFire) )
+		{	
+			m_HitShape = Debug.DrawSphere(contact_point, 0.04, COLOR_RED);
+		}
+		
+		if ( m_IsFireKeyPressed )
+		{
+			Debug.RemoveShape(m_PermanentLine1);
+			m_PermanentLine1 = Debug.DrawLine(end_point, contact_point, Colors.RED, ShapeFlags.NOZBUFFER );
+		}
+	}
+
+	void AddPosToCyclicBuffer(vector pos)
+	{
+		m_AimTrailCyclic[m_BufferIndex] = pos;
+		m_BufferIndex++;
+		if (m_BufferIndex == BUFFER_SIZE)
+		{
+			m_BufferIndex = 0;			
+		}
+	}	
+	
+	void OrderTrailArray()
+	{
+		int unordered_index;
+		
+		for (int i = 0; i < BUFFER_SIZE; i++)
+		{
+			unordered_index = m_BufferIndex + i;
+			if ( unordered_index >= BUFFER_SIZE )
+			{
+				unordered_index = unordered_index - BUFFER_SIZE;
+			}
+			m_AimTrailOrdered[i] = m_AimTrailCyclic[unordered_index];
+		}
+	}	
+	
+	void DrawEyePoint(Weapon weapon)
+	{
+		vector position = GetEyePointPosition(weapon);
+		m_ShapeEye = Debug.DrawSphere(position, 0.009, COLOR_BLUE, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER);
+	}
+
+	vector GetEyePointPosition(Weapon weapon)
+	{
+		string memory_point_name = weapon.ConfigGetString("memoryPointCamera");
+		ItemBase optics = weapon.GetAttachedOptics();
+		if (optics)
+		{
+			memory_point_name = optics.ConfigGetString("memoryPointCamera");
+			return optics.ModelToWorld(optics.GetSelectionPositionLS( memory_point_name ));
+		}
+		return weapon.ModelToWorld(weapon.GetSelectionPositionLS( memory_point_name ));
+		
+	}
+
+	void DisplayGeneralInfo()
+	{
+		DbgUI.Begin("sway weight", 50, 50);
+		DayZPlayerImplement player = DayZPlayerImplement.Cast(GetGame().GetPlayer());
+		float sway_weight = player.GetAimingModel().GetSwayWeight();
+		DbgUI.Text("value: " + sway_weight.ToString());
+		DbgUI.Text("Hold LWIN to draw debug line");
+		DbgUI.Text("Press X to simulate fire");
+		DbgUI.Text("Press Z to cycle debug modes");
+		DbgUI.Text("Debug " +m_DebugModesNames.Get(m_CurrentMode) );
+		DbgUI.Text("");
+		DbgUI.End();
+	}
+
+	void DisplayTargetInfo()
+	{
+		DbgUI.Begin("target distance", 50,200);
+		DbgUI.Text("value: " + m_TargetDistance.ToString());
+		DbgUI.End();
+	}
+
+		
+	void DrawLineOfFireMuzzleToHit(vector begin_point, vector camera_dir, vector camera_pos)
+	{
+		vector contact_point_cam_trace;
+		vector contact_point_muzzle_trace;
+		
+		vector contact_dir_muzzle;
+		vector contact_dir_camera;
+		
+		vector contact_point;
+		vector contact_dir;
+		
+		int contact_component;
+		int contact_component_muzzle;
+		
+		vector end_point = camera_pos + camera_dir * 1000;
+		Man player = GetGame().GetPlayer();
+		Object player_o;
+		Class.CastTo(player_o, player);
+		
+		if ( DayZPhysics.RaycastRV(camera_pos, end_point, contact_point_cam_trace, contact_dir_camera, contact_component,null, null, player_o , false, false, ObjIntersectFire, 0.1) )
+		{
+			m_ShapeFireDirCamera = Debug.DrawLine(begin_point, contact_point_cam_trace, Colors.RED, ShapeFlags.NOZBUFFER );
+			m_HitShape2 = Debug.DrawSphere(contact_point_cam_trace, 0.03, Colors.GREEN);
+			m_TargetDistance =  vector.Distance( player.GetPosition(), contact_point_cam_trace);
+			
+			if ( m_IsFireKeyPressed )
+			{
+				Debug.RemoveShape(m_PermanentLine1);
+				Debug.RemoveShape(m_PermanentLine2);
+				m_PermanentLine1 = Debug.DrawLine(begin_point, contact_point_cam_trace, Colors.RED, ShapeFlags.NOZBUFFER );
+				m_PermanentLine2 = Debug.DrawLine(camera_pos, contact_point_cam_trace, Colors.GREEN, ShapeFlags.NOZBUFFER );
+			}
+			
+		}
+		
+		else
+		{
+			m_ShapeFireDirCamera = Debug.DrawLine(begin_point, end_point, Colors.GREEN, ShapeFlags.NOZBUFFER );
+			m_TargetDistance = -1;
+		}
+		
+		if ( DayZPhysics.RaycastRV(begin_point, contact_point_cam_trace, contact_point_muzzle_trace, contact_dir_muzzle, contact_component_muzzle, null, null, null, false, false, ObjIntersectFire, 0.0) )
+		{
+			m_HitShape3 = Debug.DrawSphere(contact_point_muzzle_trace, 0.03, COLOR_RED);
+		}
+	}
+
+	void DrawLineOfFireCameraHybrid(vector usti_hlavne_position, vector camera_dir, vector camera_pos, vector konec_hlavne_position)
+	{
+		bool muzzle_shot;
+		vector contact_point_cam_trace;
+		vector contact_point_muzzle_trace;
+		
+		vector aim_at_position;
+		
+		vector contact_dir_muzzle;
+		vector contact_dir;
+		
+		vector contact_point;
+		
+		int contact_component;
+		int contact_component_muzzle;
+		
+		float distance_to_aim_at;
+		vector end_point = camera_pos + camera_dir * 100;
+		vector start_point = camera_pos + (CAMERA_BULLET_ORIGIN_OFFSET * camera_dir);
+		vector weapon_aim_direction = usti_hlavne_position - konec_hlavne_position;
+		weapon_aim_direction.Normalize();
+		
+		Man player = GetGame().GetPlayer();
+		Object player_o;
+		Class.CastTo(player_o, player);
+
+		if ( DayZPhysics.RaycastRV(start_point, end_point, contact_point_cam_trace, contact_dir, contact_component,null, null, player_o , false, false, ObjIntersectFire) )
+		{
+			m_TargetDistance = vector.Distance(start_point, contact_point_cam_trace);
+			aim_at_position = contact_point_cam_trace;
+			
+			if ( DayZPhysics.RaycastRV(usti_hlavne_position, contact_point_cam_trace, contact_point_muzzle_trace, contact_dir, contact_component,null, null, player_o , false, false, ObjIntersectFire, 0.05) )
+			{
+				float collision_distance = vector.Distance(contact_point_cam_trace, contact_point_muzzle_trace);
+				float muzzle_collision_distance = vector.Distance(usti_hlavne_position, contact_point_muzzle_trace);
+				
+				if ((collision_distance > 2 && muzzle_collision_distance < MAX_MUZZLE_DISTANCE_TOLERANCE) || m_TargetDistance < CAMERA_TRACE_MIN_DISTANCE_TOLERANCE)
+				{
+					muzzle_shot = true;
+					aim_at_position = contact_point_muzzle_trace;
+				}
+			}
+		}
+		
+		
+		
+		distance_to_aim_at = vector.Distance(camera_pos, aim_at_position);
+		
+		if ( m_IsFireKeyPressed )
+		{
+			Debug.RemoveShape(m_PermanentLine1);
+			Debug.RemoveShape(m_PermanentLine2);
+			Debug.RemoveShape(m_PermanentShape1);
+			
+			vector contact_point_temp;
+			
+			if (muzzle_shot)
+			{
+				m_PermanentLine1 = Debug.DrawLine(usti_hlavne_position, usti_hlavne_position + weapon_aim_direction * 5, Colors.RED, ShapeFlags.NOZBUFFER );
+				m_PermanentLine2 = Debug.DrawLine(camera_pos, contact_point_cam_trace, Colors.GREEN, ShapeFlags.NOZBUFFER );
+				PrintString("muzle shot");
+			}
+			else
+			{
+				vector dir = contact_point_cam_trace - camera_pos;
+				dir.Normalize();
+				dir = dir * 100;
+				float dst = vector.Distance(camera_pos, contact_point_cam_trace);
+				float dist2 = vector.Distance(camera_pos, contact_point_cam_trace);
+				
+				//m_PermanentShape1 = Debug.DrawSphere(start_point, 0.015,Colors.GREEN);
+				m_PermanentLine1 = Debug.DrawLine(start_point, contact_point_cam_trace + dir, Colors.RED, ShapeFlags.NOZBUFFER );
+				PrintString("camera shot");
+			}
+		}
+		
+		float clamped_distance = Math.Clamp(distance_to_aim_at, 0 , 100);
+		float distance_normalized = Math.InverseLerp(0, 100, clamped_distance);
+		float hit_sphere_size = Math.Lerp(0.025, 0.75, distance_normalized);
+		
+		Debug.RemoveShape(m_HitShape4);
+		Debug.RemoveShape(m_HitShape);
+		m_HitShape = Debug.DrawSphere(contact_point_cam_trace, 0.20,Colors.GREEN, ShapeFlags.TRANSP);
+		m_HitShape4 = Debug.DrawSphere(aim_at_position, hit_sphere_size);
+	
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Weapons/WeaponManager.c b/scripts/4_World/DayZ/Classes/Weapons/WeaponManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..4daf8c3141f8eb6cbf681f1637649e88844c571d
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Weapons/WeaponManager.c
@@ -0,0 +1,1302 @@
+class WeaponManager
+{
+	const float MAX_DROP_MAGAZINE_DISTANCE_SQ = 4;
+	
+	protected PlayerBase 					m_player;
+	
+	protected int							m_LastAcknowledgmentID;
+	
+	protected int 							m_PendingWeaponActionAcknowledgmentID;
+	protected Magazine 						m_PendingTargetMagazine;
+	protected ref InventoryLocation			m_TargetInventoryLocation;
+	protected int 							m_PendingWeaponAction; 
+	protected ref InventoryLocation			m_PendingInventoryLocation;
+	
+	protected bool							m_canEnd;
+	protected bool							m_justStart;
+	protected bool							m_InProgress;
+	protected bool							m_IsEventSended;
+	protected bool							m_WantContinue;
+	protected bool							m_InIronSight;
+	protected bool							m_InOptic;
+	protected bool 							m_readyToStart;
+	protected Weapon_Base					m_WeaponInHand;
+	protected MagazineStorage				m_MagazineInHand;
+	protected ActionBase					m_ControlAction;
+	protected int 							m_ForceEjectBulletTimestamp;
+	
+	protected const int 					FORCE_EJECT_BULLET_TIMEOUT = 2000;
+#ifdef DIAG_DEVELOPER	
+	protected int 							m_BurstOption;
+#endif
+	//Reload
+	protected ref array<Magazine>			m_MagazinePilesInInventory;
+	protected ref array<MagazineStorage>	m_MagazineStorageInInventory;
+	protected ref array<Magazine>			m_SuitableMagazines;
+	protected Magazine						m_PreparedMagazine;
+	
+	//Jamming
+	protected float m_NewJamChance;
+	protected bool m_WaitToSyncJamChance;
+	
+	
+	protected int m_AnimationRefreshCooldown;
+	
+	void WeaponManager(PlayerBase player)
+	{
+		m_ForceEjectBulletTimestamp = -1;
+		m_player = player;
+		m_PendingWeaponActionAcknowledgmentID = -1;
+		m_PendingTargetMagazine = NULL;
+		m_PendingInventoryLocation = NULL;
+		m_WeaponInHand = NULL;
+		m_MagazineInHand = NULL;
+		m_ControlAction = NULL;
+		m_PendingWeaponAction = -1;
+		m_LastAcknowledgmentID = 1;
+		m_InProgress = false;
+		m_WantContinue = true;
+		m_IsEventSended = false;
+		m_canEnd = false;
+		m_readyToStart = false;
+		m_AnimationRefreshCooldown = 0;
+		
+		m_NewJamChance = -1;
+		m_WaitToSyncJamChance = false;
+		
+		m_MagazinePilesInInventory = new array<Magazine>;
+		m_MagazineStorageInInventory = new array<MagazineStorage>;
+		m_SuitableMagazines = new array<Magazine>;
+		m_PreparedMagazine = null;
+		
+#ifdef DEVELOPER	
+		m_BurstOption = 0;
+#endif
+	}
+//----------------------------------------------------------------------------	
+// Weapon Action conditions
+//----------------------------------------------------------------------------	
+	bool CanFire(Weapon_Base wpn)
+	{
+		if( m_player.GetHumanInventory().GetEntityInHands() != wpn )
+			return false;
+		
+		if( m_player.IsLiftWeapon() || !m_player.IsRaised() || wpn.IsDamageDestroyed() || m_player.GetDayZPlayerInventory().IsProcessing() || !m_player.IsWeaponRaiseCompleted() || m_player.IsFighting() ) 
+			return false;
+		
+		return true;
+		
+	}
+	
+	
+	bool CanAttachMagazine(Weapon_Base wpn, Magazine mag, bool reservationCheck = true )
+	{	
+		if ( !wpn || !mag )
+			return false;
+		
+		if ( m_player.GetHumanInventory().GetEntityInHands() != wpn )
+			return false;
+		
+		if ( wpn.IsDamageDestroyed())
+			return false;
+		
+		//if ( mag.GetHierarchyRootPlayer() && mag.GetHierarchyRootPlayer() != m_player )
+			//return false;
+		
+		if( m_player.IsItemsToDelete())
+			return false;
+		
+		if ( reservationCheck && (m_player.GetInventory().HasInventoryReservation(wpn, null) || m_player.GetInventory().HasInventoryReservation(mag, null)))
+			return false;
+		
+		InventoryLocation invLoc;
+		invLoc = new InventoryLocation();
+		
+		mag.GetInventory().GetCurrentInventoryLocation(invLoc);
+		Weapon_Base wnp2;
+		
+
+		//magazine is already in weapon
+		if ( Class.CastTo(wnp2,  invLoc.GetParent()) )
+			return false;
+			
+		int muzzleIndex = wpn.GetCurrentMuzzle();
+		
+		if (wpn.CanAttachMagazine(muzzleIndex, mag))
+			return true;
+
+		return false;
+		
+	}
+//---------------------------------------------------------------------------	
+	
+	bool CanSwapMagazine(Weapon_Base wpn, Magazine mag, bool reservationCheck = true)
+	{
+		if ( !wpn || !mag )
+			return false;
+		
+		if ( m_player.GetHumanInventory().GetEntityInHands() != wpn )
+			return false;
+		
+		if ( mag.IsDamageDestroyed() || wpn.IsDamageDestroyed())
+			return false;
+		
+		//if ( mag.GetHierarchyRootPlayer() && mag.GetHierarchyRootPlayer() != m_player )
+			//return false;
+
+		if( m_player.IsItemsToDelete())
+			return false;
+		
+		if ( reservationCheck && (m_player.GetInventory().HasInventoryReservation(wpn, null) || m_player.GetInventory().HasInventoryReservation(mag, null)))
+			return false;
+		
+
+		InventoryLocation invLoc;
+		invLoc = new InventoryLocation();
+		
+		mag.GetInventory().GetCurrentInventoryLocation(invLoc);
+		Weapon_Base wnp2;
+		
+		//second magazine is already in weapon
+		if( Class.CastTo(wnp2,  invLoc.GetParent()) )
+			return false;		
+		
+		int muzzleIndex = wpn.GetCurrentMuzzle();	
+					
+		Magazine mag2;
+		if( !Class.CastTo(mag2, wpn.GetMagazine(muzzleIndex)) ) 
+			return false;
+		
+		if( GameInventory.CanSwapEntitiesEx( mag, mag2 ) )
+			return true;
+		
+		InventoryLocation il = new InventoryLocation();
+		
+		if( GameInventory.CanForceSwapEntitiesEx( mag, null, mag2, il ) )
+			return true;
+		
+		return false;
+	}
+//----------------------------------------------------------------------------			
+	bool CanDetachMagazine(Weapon_Base wpn, Magazine mag, bool reservationCheck = true)
+	{
+		if ( !wpn || !mag )
+			return false;
+		
+		if ( m_player.GetHumanInventory().GetEntityInHands() != wpn )
+			return false;
+		
+		if ( mag.GetHierarchyParent() != wpn )
+			return false;
+		
+		if( m_player.IsItemsToDelete())
+			return false;
+		
+		if ( reservationCheck && (m_player.GetInventory().HasInventoryReservation(wpn, null) || m_player.GetInventory().HasInventoryReservation(mag, null)))
+			return false;
+		
+		return true;
+	}
+//---------------------------------------------------------------------------
+	bool CanLoadBullet(Weapon_Base wpn, Magazine mag, bool reservationCheck = true)
+	{
+		if (!wpn || !mag)
+			return false;
+		
+		if (m_player.GetHumanInventory().GetEntityInHands() != wpn)
+			return false;
+		
+		if (mag.IsDamageDestroyed() || wpn.IsDamageDestroyed())
+			return false;
+		
+		if (wpn.IsJammed())
+			return false;
+	
+		if (m_player.IsItemsToDelete())
+			return false;
+		
+		if (reservationCheck && (m_player.GetInventory().HasInventoryReservation(wpn, null) || m_player.GetInventory().HasInventoryReservation(mag, null)))
+			return false;
+		
+		for (int i = 0; i < wpn.GetMuzzleCount(); i++)
+		{
+			if (wpn.CanChamberBullet(i, mag))
+				return true;
+		}
+		
+		return false;
+	}
+//---------------------------------------------------------------------------	
+	bool CanUnjam(Weapon_Base wpn, bool reservationCheck = true)
+	{
+		if( !wpn )
+			return false;
+		 
+		if( m_player.GetHumanInventory().GetEntityInHands() != wpn)
+			return false;
+		
+		if( wpn.IsDamageDestroyed())
+			return false;
+		
+		if( m_player.IsItemsToDelete())
+			return false;
+		
+		if ( reservationCheck && m_player.GetInventory().HasInventoryReservation(wpn, null))
+			return false;
+
+		
+		if( !wpn.IsJammed(/*wpn.GetCurrentMuzzle()*/) )
+			return false;
+		 
+		return true;
+	}
+	
+	bool CanEjectBullet(Weapon_Base wpn, bool reservationCheck = true)
+	{
+		if( !wpn )
+			return false;
+		 
+		if( m_player.GetHumanInventory().GetEntityInHands() != wpn)
+			return false;
+		
+		if( m_player.IsItemsToDelete())
+			return false;
+		
+		if( reservationCheck && m_player.GetInventory().HasInventoryReservation(wpn, null))
+			return false;
+		
+		if( !wpn.CanEjectBullet() )
+			return false;
+		
+		if( wpn.IsJammed(/*wpn.GetCurrentMuzzle()*/) )
+			return false;
+		 
+		return true;
+	}
+	
+	void SetEjectBulletTryTimestamp()
+	{
+		m_ForceEjectBulletTimestamp = GetGame().GetTime();
+	}
+//----------------------------------------------------------------------------
+	bool InventoryReservation( Magazine mag, InventoryLocation invLoc)
+	{
+		Weapon_Base weapon;
+		InventoryLocation ilWeapon = new InventoryLocation();
+		if (Weapon_Base.CastTo(weapon, m_player.GetItemInHands()) )
+		{
+			weapon.GetInventory().GetCurrentInventoryLocation(ilWeapon);
+			if ( m_player.GetInventory().HasInventoryReservation(weapon, ilWeapon) )
+			{
+				return false;
+			}
+			else
+			{
+				m_player.GetInventory().AddInventoryReservationEx(weapon,ilWeapon,GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+		
+		if( invLoc )
+		{
+			if ( m_player.GetInventory().HasInventoryReservation(invLoc.GetItem(),invLoc) )
+			{
+				m_player.GetInventory().ClearInventoryReservationEx(weapon, ilWeapon);
+				return false;
+			}
+			else
+			{
+				m_player.GetInventory().AddInventoryReservationEx(invLoc.GetItem(),invLoc,GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+		
+		if( mag )
+		{
+			m_TargetInventoryLocation = new InventoryLocation();
+			m_TargetInventoryLocation.SetAttachment( m_WeaponInHand, mag, InventorySlots.MAGAZINE);
+			
+			if ( m_player.GetInventory().HasInventoryReservation(mag, m_TargetInventoryLocation) )
+			//if ( !m_player.GetInventory().AddInventoryReservationEx( mag, m_TargetInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS) )
+			{
+				m_player.GetInventory().ClearInventoryReservationEx(weapon, ilWeapon);
+				if (invLoc)
+				{
+					m_player.GetInventory().ClearInventoryReservationEx(invLoc.GetItem(), invLoc);
+				}
+				return false;
+			}
+			else
+			{
+				m_player.GetInventory().AddInventoryReservationEx(mag, m_TargetInventoryLocation, GameInventory.c_InventoryReservationTimeoutMS);
+			}
+		}
+		m_PendingTargetMagazine = mag;
+		m_PendingInventoryLocation = invLoc;
+		
+		return true;
+	}
+	
+//----------------------------------------------------------------------------	
+// Weapon Actions	
+//----------------------------------------------------------------------------
+	bool AttachMagazine( Magazine mag , ActionBase control_action = NULL )
+	{
+		return StartAction(AT_WPN_ATTACH_MAGAZINE, mag, NULL, control_action);
+	}
+	
+	bool DetachMagazine( InventoryLocation invLoc, ActionBase control_action = NULL)
+	{
+		return StartAction(AT_WPN_DETACH_MAGAZINE, NULL, invLoc, control_action);
+	}
+	
+	bool SwapMagazine( Magazine mag, ActionBase control_action = NULL )
+	{
+		InventoryLocation il = new InventoryLocation();
+		if (PrepareInventoryLocationForMagazineSwap(m_WeaponInHand, mag, il) )
+		{
+			return StartAction(AT_WPN_SWAP_MAGAZINE, mag, il, control_action);
+		}
+		return false;
+	}
+	
+	bool SwapMagazineEx( Magazine mag, InventoryLocation invLoc, ActionBase control_action = NULL )
+	{
+		return StartAction(AT_WPN_SWAP_MAGAZINE, mag, invLoc, control_action);
+	}
+	
+	bool LoadBullet( Magazine mag, ActionBase control_action = NULL )
+	{
+		return StartAction(AT_WPN_LOAD_BULLET, mag, NULL, control_action);
+	}
+	
+	bool LoadMultiBullet( Magazine mag, ActionBase control_action = NULL )
+	{
+		return StartAction(AT_WPN_LOAD_MULTI_BULLETS_START, mag, NULL, control_action);
+	}
+	
+	void LoadMultiBulletStop( )
+	{
+		if(m_InProgress) m_WantContinue = false;
+	}
+	
+	bool Unjam( ActionBase control_action = NULL )
+	{
+		return StartAction(AT_WPN_UNJAM, NULL, NULL, control_action);
+	}
+
+	bool EjectBullet( ActionBase control_action = NULL )
+	{
+		return StartAction(AT_WPN_EJECT_BULLET, NULL, NULL, control_action);
+	}
+	
+	bool CanEjectBulletVerified()
+	{
+		int mi = m_WeaponInHand.GetCurrentMuzzle();
+		if( !m_WeaponInHand.IsChamberFiredOut(mi) && !m_WeaponInHand.IsChamberEmpty(mi) )
+		{
+			int actual_time = GetGame().GetTime();
+			if ( actual_time - m_ForceEjectBulletTimestamp > FORCE_EJECT_BULLET_TIMEOUT )
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+	
+	bool EjectBulletVerified( ActionBase control_action = NULL )
+	{
+		if ( m_WeaponInHand )
+		{	
+			int mi = m_WeaponInHand.GetCurrentMuzzle();
+			if ( !m_WeaponInHand.IsChamberFiredOut(mi) && !m_WeaponInHand.IsChamberEmpty(mi) )
+			{
+				m_ForceEjectBulletTimestamp = GetGame().GetTime();
+				return StartAction(AT_WPN_EJECT_BULLET, NULL, NULL, control_action);
+			}
+			else
+			{
+				return StartAction(AT_WPN_EJECT_BULLET, NULL, NULL, control_action);
+			}
+		}	
+		return false;
+	}
+	
+	bool SetNextMuzzleMode ()
+	{
+		return StartAction(AT_WPN_SET_NEXT_MUZZLE_MODE, NULL, NULL, NULL);
+	}
+	
+	void Fire(Weapon_Base wpn)
+	{
+		int mi = wpn.GetCurrentMuzzle();
+		if ( wpn.IsChamberFiredOut(mi) || wpn.IsJammed() || wpn.IsChamberEmpty(mi) )
+		{
+			wpn.ProcessWeaponEvent(new WeaponEventTrigger(m_player));
+			return;
+		}
+		
+		if (wpn.JamCheck(0))
+		{
+			wpn.ProcessWeaponEvent(new WeaponEventTriggerToJam(m_player));
+		}
+		else
+		{
+			wpn.ProcessWeaponEvent(new WeaponEventTrigger(m_player));
+		}
+	}
+	
+#ifdef DIAG_DEVELOPER
+	int GetBurstOption()
+	{
+		return m_BurstOption;
+	}
+	
+	void SetBurstOption(int value)
+	{
+		m_BurstOption = value;
+	}
+#endif	
+//-------------------------------------------------------------------------------------	
+// Synchronize - initialize from client side
+//-------------------------------------------------------------------------------------
+
+	//Client
+	private void Synchronize( )
+	{
+		if ( GetGame().IsClient() )
+		{
+			m_PendingWeaponActionAcknowledgmentID = ++m_LastAcknowledgmentID;
+			ScriptInputUserData ctx = new ScriptInputUserData;
+			
+			ctx.Write(INPUT_UDT_WEAPON_ACTION);
+			ctx.Write(m_PendingWeaponAction);
+			ctx.Write(m_PendingWeaponActionAcknowledgmentID);
+			
+			
+			switch (m_PendingWeaponAction)
+			{
+				case AT_WPN_ATTACH_MAGAZINE:
+				{	
+					ctx.Write(m_PendingTargetMagazine);
+					break;
+				}
+				case AT_WPN_SWAP_MAGAZINE:
+				{
+					ctx.Write(m_PendingTargetMagazine);
+					m_PendingInventoryLocation.WriteToContext(ctx);
+					break;
+				}
+				case AT_WPN_DETACH_MAGAZINE:
+				{
+					m_PendingInventoryLocation.WriteToContext(ctx);
+					break;
+				}
+				case AT_WPN_LOAD_BULLET:
+				{
+					ctx.Write(m_PendingTargetMagazine);
+					break;
+				}
+				case AT_WPN_LOAD_MULTI_BULLETS_START:
+				{
+					ctx.Write(m_PendingTargetMagazine);
+					break;
+				}
+				case AT_WPN_UNJAM:
+				{
+					break;
+				}
+				case AT_WPN_EJECT_BULLET:
+				{
+					break;
+				}
+				default: 
+				break;
+			}
+			ctx.Send();
+			//if( !m_player.GetDayZPlayerInventory().HasLockedHands() )
+			//	m_player.GetDayZPlayerInventory().LockHands();
+		}
+	}
+	
+
+	
+	void OnSyncJuncture(int pJunctureID, ParamsReadContext pCtx)
+	{
+		if (pJunctureID == DayZPlayerSyncJunctures.SJ_WEAPON_SET_JAMMING_CHANCE )
+		{
+			pCtx.Read(m_NewJamChance);
+		}
+		else
+		{
+			int AcknowledgmentID;
+			pCtx.Read(AcknowledgmentID);
+			if ( AcknowledgmentID == m_PendingWeaponActionAcknowledgmentID)
+			{
+				if (pJunctureID == DayZPlayerSyncJunctures.SJ_WEAPON_ACTION_ACK_ACCEPT)
+				{ 
+					m_readyToStart = true;
+				}
+				else if (pJunctureID == DayZPlayerSyncJunctures.SJ_WEAPON_ACTION_ACK_REJECT)
+				{
+					if(m_PendingWeaponAction >= 0 )
+					{
+						if(!(GetGame().IsServer() && GetGame().IsMultiplayer()))
+						{
+							InventoryLocation ilWeapon = new InventoryLocation();
+							ItemBase weapon = m_player.GetItemInHands();
+							weapon.GetInventory().GetCurrentInventoryLocation(ilWeapon);
+							m_player.GetInventory().ClearInventoryReservationEx(m_player.GetItemInHands(),ilWeapon);
+							
+							if( m_PendingTargetMagazine )
+							{
+								m_PendingTargetMagazine.GetInventory().ClearInventoryReservationEx(m_PendingTargetMagazine, m_TargetInventoryLocation );
+							}
+							
+							if( m_PendingInventoryLocation )
+							{
+								m_player.GetInventory().ClearInventoryReservationEx( NULL, m_PendingInventoryLocation );
+							}
+						}
+						m_PendingWeaponActionAcknowledgmentID = -1;
+						m_PendingTargetMagazine = NULL;
+						m_PendingWeaponAction = -1;
+						m_PendingInventoryLocation = NULL;
+						m_InProgress = false;
+					}
+				}
+			}
+		}
+	}
+	
+
+		//Server
+	bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{
+		Weapon_Base wpn;
+		int mi;
+		InventoryLocation il;
+		int slotID;
+		bool accepted = false;
+		if( userDataType == INPUT_UDT_WEAPON_ACTION)
+		{
+			if (!ctx.Read(m_PendingWeaponAction))
+				return false;
+			
+			if (!ctx.Read(m_PendingWeaponActionAcknowledgmentID))
+				return false;
+			
+			if(m_PendingTargetMagazine)
+			{
+				GetGame().ClearJuncture(m_player, m_PendingTargetMagazine);
+				m_PendingTargetMagazine = NULL;
+			}
+			m_InProgress = true;
+			m_IsEventSended = false;
+			Magazine mag = NULL;
+			
+			Weapon_Base.CastTo( wpn, m_player.GetItemInHands() );
+			if ( wpn )
+				mi = wpn.GetCurrentMuzzle();
+			
+			switch (m_PendingWeaponAction)
+			{
+				case AT_WPN_ATTACH_MAGAZINE:
+				{
+					if ( !ctx.Read(mag) )
+						break;
+					
+					if ( !mag || !wpn )
+						break;
+
+					slotID = wpn.GetSlotFromMuzzleIndex(mi);
+					il = new InventoryLocation();
+					il.SetAttachment(wpn,mag,slotID);
+					if( GetGame().AddInventoryJunctureEx(m_player, mag, il, false, 10000) )
+						accepted = true;
+
+					m_PendingTargetMagazine = mag;
+					break;
+				}
+				case AT_WPN_SWAP_MAGAZINE:
+				{
+					if ( !ctx.Read(mag) )
+						break;
+					
+					il = new InventoryLocation();
+					if (!il.ReadFromContext(ctx))
+						break;
+					
+					if ( !mag || !wpn )
+						break;
+
+					if ( !wpn.GetMagazine(mi) )
+						break;
+					
+					if ( GetGame().AddActionJuncture(m_player,mag,10000) )
+						accepted = true;
+					m_PendingInventoryLocation = il;
+					m_PendingTargetMagazine = mag;
+					
+					break;
+				}
+				case AT_WPN_DETACH_MAGAZINE:
+				{
+					il = new InventoryLocation();
+					if ( !il.ReadFromContext(ctx) )
+						break;
+					
+					if ( !il.IsValid() )
+						break;
+					
+					if ( !wpn )
+						break;
+					
+					Magazine det_mag = wpn.GetMagazine(mi);
+					mag = Magazine.Cast(il.GetItem());
+					if ( !det_mag || ( mag != det_mag) )
+						break;
+					
+					if( GetGame().AddInventoryJunctureEx(m_player, il.GetItem(), il, true, 10000))
+						accepted = true;
+					m_PendingInventoryLocation = il;
+					m_PendingTargetMagazine = mag;
+					break;
+				}
+				case AT_WPN_LOAD_BULLET:
+				{
+					ctx.Read(mag);
+					
+					if ( !mag )
+						break;
+					
+					if( GetGame().AddActionJuncture(m_player,mag,10000) )
+						accepted = true;
+					m_PendingTargetMagazine = mag;
+					break;
+				}
+				case AT_WPN_LOAD_MULTI_BULLETS_START:
+				{
+					ctx.Read(mag);
+					
+					if ( !mag )
+						break;
+					
+					if( GetGame().AddActionJuncture(m_player,mag,10000) )
+						accepted = true;
+					m_PendingTargetMagazine = mag;
+					break;
+				}
+				case AT_WPN_UNJAM:
+				{
+					accepted = true;
+					//Unjam();
+					break;
+				}
+				case AT_WPN_EJECT_BULLET:
+				{
+					accepted = true;
+					break;
+				}
+				case AT_WPN_SET_NEXT_MUZZLE_MODE:
+				{
+					accepted = true;
+					break;
+				}
+				default:
+					Error("unknown actionID=" + m_PendingWeaponAction);
+					break;
+			}
+			DayZPlayerSyncJunctures.SendWeaponActionAcknowledgment(m_player, m_PendingWeaponActionAcknowledgmentID, accepted);
+		}
+		
+		return accepted;
+	}
+	
+	bool StartAction(int action, Magazine mag, InventoryLocation il, ActionBase control_action = NULL)
+	{
+		//if it is controled by action inventory reservation and synchronization provide action itself
+		if(control_action)
+		{
+			m_ControlAction = ActionBase.Cast(control_action);
+			m_PendingWeaponAction = action;
+			m_InProgress = true;
+			m_IsEventSended = false;
+			m_PendingTargetMagazine = mag;
+			m_PendingInventoryLocation = il;
+			StartPendingAction();
+			
+			return true;
+		}
+		
+		
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			return false;
+		
+		if ( !ScriptInputUserData.CanStoreInputUserData() )
+			return false;
+		if ( !InventoryReservation(mag, il) )
+			return false;
+
+		m_PendingWeaponAction = action;
+		m_InProgress = true;
+		m_IsEventSended = false;
+		
+		if ( !GetGame().IsMultiplayer() )
+			m_readyToStart = true;
+		else
+			Synchronize();
+		
+		return true;
+	}
+	
+	void StartPendingAction()
+	{		
+		m_WeaponInHand = Weapon_Base.Cast(m_player.GetItemInHands());
+		if(!m_WeaponInHand)
+		{
+			OnWeaponActionEnd();
+			return;
+		}
+		switch (m_PendingWeaponAction)
+		{
+			case AT_WPN_ATTACH_MAGAZINE:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventAttachMagazine(m_player, m_PendingTargetMagazine) );
+				break;
+			}
+			case AT_WPN_SWAP_MAGAZINE:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventSwapMagazine(m_player, m_PendingTargetMagazine, m_PendingInventoryLocation) );
+				break;
+			}
+			case AT_WPN_DETACH_MAGAZINE:
+			{
+				Magazine mag = Magazine.Cast(m_PendingInventoryLocation.GetItem());
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventDetachMagazine(m_player, mag, m_PendingInventoryLocation) );
+				break;
+			}
+			case AT_WPN_LOAD_BULLET:
+			{
+				m_WantContinue = false;
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventLoad1Bullet(m_player, m_PendingTargetMagazine) );
+				break;
+			}
+			case AT_WPN_LOAD_MULTI_BULLETS_START:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventLoad1Bullet(m_player, m_PendingTargetMagazine) );
+				break;
+			}
+			case AT_WPN_LOAD_MULTI_BULLETS_END:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventContinuousLoadBulletEnd(m_player) );
+				break;
+			}
+			case AT_WPN_UNJAM:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventUnjam(m_player, NULL) );
+				break;
+			}
+			case AT_WPN_EJECT_BULLET:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventMechanism(m_player, NULL) );
+				break;
+			}
+			case AT_WPN_SET_NEXT_MUZZLE_MODE:
+			{
+				m_player.GetDayZPlayerInventory().PostWeaponEvent( new WeaponEventSetNextMuzzleMode(m_player, NULL) );
+				break;
+			}
+			default:
+				m_InProgress = false;
+				Error("unknown actionID=" + m_PendingWeaponAction);
+		}	
+		m_IsEventSended = true;
+		m_canEnd = false;
+	}
+	
+	bool IsRunning()
+	{
+		return m_InProgress;
+	}
+	
+	void SetRunning( bool value)
+	{
+		m_InProgress = value;
+	}
+	
+	void Refresh()
+	{
+		OnWeaponActionEnd();
+	}
+	
+	void Update( float deltaT )
+	{
+		if (m_WeaponInHand != m_player.GetItemInHands())
+		{
+			if( m_WeaponInHand )
+			{
+				m_SuitableMagazines.Clear();
+				OnWeaponActionEnd();
+			}
+			m_WeaponInHand = Weapon_Base.Cast(m_player.GetItemInHands());
+			if ( m_WeaponInHand )
+			{
+				m_MagazineInHand = null;
+				//SET new magazine
+				SetSutableMagazines();
+				m_WeaponInHand.SetSyncJammingChance(0);
+			}
+			m_AnimationRefreshCooldown = 0;
+		}
+		
+		if (m_WeaponInHand)
+		{
+			if(m_AnimationRefreshCooldown)
+			{
+				m_AnimationRefreshCooldown--;
+			
+				if( m_AnimationRefreshCooldown == 0)
+				{
+					RefreshAnimationState();
+				}
+			}
+		
+			if (!GetGame().IsMultiplayer())
+			{
+				m_WeaponInHand.SetSyncJammingChance(m_WeaponInHand.GetChanceToJam());
+			}
+			else
+			{
+				if ( m_NewJamChance >= 0)
+				{
+					m_WeaponInHand.SetSyncJammingChance(m_NewJamChance);
+					m_NewJamChance = -1;
+					m_WaitToSyncJamChance = false;
+				}
+				if (GetGame().IsServer() && !m_WaitToSyncJamChance )
+				{
+					float actual_chance_to_jam;
+					actual_chance_to_jam = m_WeaponInHand.GetChanceToJam();
+					if ( Math.AbsFloat(m_WeaponInHand.GetSyncChanceToJam() - m_WeaponInHand.GetChanceToJam()) > 0.001 )
+					{
+						DayZPlayerSyncJunctures.SendWeaponJamChance(m_player, m_WeaponInHand.GetChanceToJam());
+						m_WaitToSyncJamChance = true;
+					}
+				}
+			}
+			
+			if(m_readyToStart)
+			{
+				StartPendingAction();
+				m_readyToStart = false;
+				return;
+			}
+		
+			if( !m_InProgress || !m_IsEventSended )
+				return;
+		
+			if(m_canEnd)
+			{
+				if(m_WeaponInHand.IsIdle())
+				{
+					OnWeaponActionEnd();
+				}
+				else if(m_justStart)
+				{
+					m_InIronSight = m_player.IsInIronsights();
+					m_InOptic = m_player.IsInOptics();
+		
+					if(m_InIronSight || m_InOptic)
+					{
+						//'RequestResetADSSync' can be called here, if ADS reset is desired
+						m_player.ExitSights();
+					}
+				
+					m_justStart = false;
+				}
+			
+			}
+			else
+			{
+				m_canEnd = true;
+				m_justStart = true;
+			}
+		}
+		else
+		{
+			if ( m_MagazineInHand != m_player.GetItemInHands() )
+			{
+				m_MagazineInHand = MagazineStorage.Cast(m_player.GetItemInHands());
+				if ( m_MagazineInHand )
+				{
+					SetSutableMagazines();
+				}
+			}
+		
+		
+		}
+	}
+
+	void OnWeaponActionEnd()
+	{
+		if ( !m_InProgress )
+			return;
+		
+		if (!m_ControlAction)
+		{
+			if(GetGame().IsServer() && GetGame().IsMultiplayer())
+			{
+				if(m_PendingTargetMagazine)
+				{
+					GetGame().ClearJuncture(m_player,m_PendingTargetMagazine);
+				}
+			}
+			else
+			{
+				InventoryLocation il = new InventoryLocation();
+				il.SetHands(m_player,m_player.GetItemInHands());
+				m_player.GetInventory().ClearInventoryReservationEx(m_player.GetItemInHands(),il);
+						
+				if( m_PendingTargetMagazine )
+				{
+					m_player.GetInventory().ClearInventoryReservationEx(m_PendingTargetMagazine, m_TargetInventoryLocation );
+				}
+						
+				if( m_PendingInventoryLocation )
+				{
+					m_player.GetInventory().ClearInventoryReservationEx( m_PendingInventoryLocation.GetItem(), m_PendingInventoryLocation );
+				}
+			}
+		}
+		
+		m_ControlAction = NULL;
+		m_PendingWeaponAction = -1;
+		m_PendingTargetMagazine = NULL;
+		m_PendingInventoryLocation = NULL;
+		m_TargetInventoryLocation = NULL;
+		m_PendingWeaponActionAcknowledgmentID = -1;
+		//m_WeaponInHand = NULL;
+		m_InProgress = false;
+		m_readyToStart = false;
+		m_WantContinue = true;
+		
+	}
+	
+	void DelayedRefreshAnimationState(int delay)
+	{	
+		if(m_WeaponInHand)
+		{
+			if(delay == 0)
+			{
+				RefreshAnimationState();
+			}
+			m_AnimationRefreshCooldown = delay;
+		}
+	}
+	
+	void RefreshAnimationState()
+	{
+		if(m_WeaponInHand)
+		{
+			WeaponStableState state = WeaponStableState.Cast( m_WeaponInHand.GetCurrentState() );
+		
+			if (state)
+			{
+				HumanCommandWeapons hcw = m_player.GetCommandModifier_Weapons();
+				if (hcw)
+				{
+					hcw.SetInitState(state.m_animState);
+				}
+			}
+		}
+	}
+	
+	bool WantContinue()
+	{
+		return m_WantContinue;
+	}
+	
+	Magazine GetPreparedMagazine()
+	{
+		for (int i = 0; i < m_SuitableMagazines.Count(); i++)
+		{
+			if(!m_SuitableMagazines.Get(i) || m_SuitableMagazines.Get(i).IsRuined() )
+			{
+				m_SuitableMagazines.Remove(i);
+				i--;
+				continue;
+			}
+			if (m_SuitableMagazines.Get(i).GetAmmoCount() > 0)
+				return m_SuitableMagazines.Get(i);
+		}
+		
+		return null;
+	}
+	
+	Magazine GetNextPreparedMagazine( out int startIdx )
+	{
+		for (int i = startIdx; i < m_SuitableMagazines.Count(); i++)
+		{
+			if (m_SuitableMagazines.Get(i).GetAmmoCount() > 0)
+			{
+				startIdx = i;
+				return m_SuitableMagazines.Get(i);
+			}				
+		}
+		return null;
+	}
+	
+	void OnMagazineInventoryEnter(Magazine mag)
+	{
+		if (mag)
+		{
+			Weapon_Base weapon = Weapon_Base.Cast(mag.GetHierarchyParent());
+			
+			if (weapon)
+				return;
+		}
+		
+		int i;
+		MagazineStorage sMag = MagazineStorage.Cast(mag);
+		if(sMag)
+		{
+			for(i = 0; i < m_MagazineStorageInInventory.Count(); i++ ) 
+			{
+				MagazineStorage s_mag_i = m_MagazineStorageInInventory[i];
+				if(!s_mag_i)
+				{
+					m_MagazineStorageInInventory.RemoveOrdered(i);
+					i--;
+					continue;
+				}
+				
+				if(CompareMagazinesSuitability(s_mag_i,sMag)<0)
+					break;
+			}
+			m_MagazineStorageInInventory.InsertAt(sMag,i);
+			
+			SetSutableMagazines(); //TODO optimalize
+			return;
+		}
+		
+		if(mag)
+		{
+
+			for(i = 0; i < m_MagazinePilesInInventory.Count(); i++ ) 
+			{
+				Magazine mag_i = m_MagazinePilesInInventory[i];
+				if(!mag_i)
+				{
+					m_MagazinePilesInInventory.RemoveOrdered(i);
+					i--;
+					continue;
+				}
+				
+				
+				if(CompareMagazinesSuitability(mag_i,mag)<0)
+				{
+					break;
+				}
+			}
+			m_MagazinePilesInInventory.InsertAt(mag,i);
+			SetSutableMagazines(); //TODO optimalize
+		}
+		
+	}
+	
+	void OnMagazineInventoryExit(Magazine mag)
+	{
+		m_SuitableMagazines.RemoveItem(mag);
+
+		MagazineStorage sMag = MagazineStorage.Cast(mag);
+		if(sMag)
+		{
+			m_MagazineStorageInInventory.RemoveItem(sMag);
+			return;
+		}
+		
+		if(mag)
+		{
+			m_MagazinePilesInInventory.RemoveItem(mag);
+		}
+	}
+	
+	void OnMagazineAttach(Magazine mag)
+	{
+		OnMagazineInventoryExit(mag);
+	}
+	
+	void OnMagazineDetach(Magazine mag)
+	{
+		OnMagazineInventoryEnter(mag);
+	}
+	
+	int CompareMagazinesSuitability( Magazine mag1, Magazine mag2 )
+	{
+		return mag1.GetAmmoCount() - mag2.GetAmmoCount();
+	}
+	
+	void SortMagazineAfterLoad()
+	{
+		array<MagazineStorage>	magazines = new array<MagazineStorage>;
+		array<Magazine>	magazines_piles = new array<Magazine>;
+		int low_mag1, high_mag1;
+		int low_mag2, high_mag2;
+		int i, j;
+		
+		for(i = 0; i < m_MagazineStorageInInventory.Count(); i++ ) 
+		{
+			MagazineStorage mag = m_MagazineStorageInInventory.Get(i);
+			mag.GetNetworkID(low_mag1,high_mag1);
+			for( j = 0; j < magazines.Count(); j++)
+			{
+				magazines.Get(j).GetNetworkID(low_mag2,high_mag2);
+				if(low_mag1 > low_mag2)
+				{
+					break;
+				}
+				else if (low_mag1 == low_mag2)
+				{
+					if( high_mag1 > high_mag2 )
+					{
+						break;
+					}
+				}
+			}
+			magazines.InsertAt(mag,j);
+		}
+		
+		m_MagazineStorageInInventory.Clear();
+		m_MagazineStorageInInventory.Copy(magazines);
+		
+		for(i = 0; i < m_MagazinePilesInInventory.Count(); i++ ) 
+		{
+			Magazine pile = m_MagazinePilesInInventory.Get(i);
+			pile.GetNetworkID(low_mag1,high_mag1);
+			for( j = 0; j < magazines_piles.Count(); j++)
+			{
+				magazines_piles.Get(j).GetNetworkID(low_mag2,high_mag2);
+				if(low_mag1 > low_mag2)
+				{
+					break;
+				}
+				else if (low_mag1 == low_mag2)
+				{
+					if( high_mag1 > high_mag2 )
+					{
+						break;
+					}
+				}
+			}
+			magazines_piles.InsertAt(pile,j);
+		}
+		
+		m_MagazinePilesInInventory.Clear();
+		m_MagazinePilesInInventory.Copy(magazines_piles);
+	
+		SetSutableMagazines();
+	}
+	
+	void SetSutableMagazines()
+	{
+		m_SuitableMagazines.Clear();
+		int i;
+		
+		if (m_WeaponInHand)
+		{
+			int mi = m_WeaponInHand.GetCurrentMuzzle();
+			
+			for (i = 0; i < m_MagazineStorageInInventory.Count(); i++ )
+			{
+				MagazineStorage s_mag = m_MagazineStorageInInventory[i];
+				
+				if (!s_mag)	
+				{
+					m_MagazineStorageInInventory.RemoveOrdered(i);
+					i--;
+					continue;
+				}
+				
+				if ( m_WeaponInHand.TestAttachMagazine(mi, s_mag, false, true))
+					m_SuitableMagazines.Insert(s_mag);
+			}
+			
+			for (i = 0; i < m_MagazinePilesInInventory.Count(); i++ )
+			{
+				Magazine mag = m_MagazinePilesInInventory[i];
+				if (!mag)	
+				{
+					m_MagazinePilesInInventory.RemoveOrdered(i);
+					i--;
+					continue;
+				}
+				
+				if (m_WeaponInHand.CanChamberFromMag(mi, mag))
+					m_SuitableMagazines.Insert(mag);	
+			}
+//TODO m_MagazineStorageInInventory and m_MagazinePilesInInventory always sort
+		}
+		else if (m_MagazineInHand)
+		{
+			for (i = 0; i < m_MagazinePilesInInventory.Count(); i++ )
+			{
+				Magazine m_mag = m_MagazinePilesInInventory[i];
+				if (!m_mag)	
+				{
+					m_MagazinePilesInInventory.RemoveOrdered(i);
+					i--;
+					continue;
+				}
+				if (m_MagazineInHand.IsCompatiableAmmo( m_mag ))
+					m_SuitableMagazines.Insert(m_mag);
+			}
+		}
+		else
+		{
+			m_PreparedMagazine = null;
+		}
+	
+	}
+	
+	void OnLiftWeapon()
+	{
+		if( m_WeaponInHand )
+			m_WeaponInHand.ResetBurstCount();
+	}
+	
+	string GetCurrentModeName()
+	{
+		if( m_WeaponInHand )
+		{
+			int mi = m_WeaponInHand.GetCurrentMuzzle();
+			return m_WeaponInHand.GetCurrentModeName(mi);
+		}
+		return "";
+	}
+	
+	bool PrepareInventoryLocationForMagazineSwap( notnull Weapon_Base wpn, notnull Magazine new_mag, out InventoryLocation new_il )
+	{
+		int muzzleIndex = wpn.GetCurrentMuzzle();
+		Magazine old_mag = Magazine.Cast(wpn.GetMagazine(muzzleIndex));
+		InventoryLocation temp = new InventoryLocation();
+		
+		if (old_mag)
+		{
+			bool result = GameInventory.CanSwapEntitiesEx(new_mag, old_mag);
+			if ( result )
+			{
+				new_mag.GetInventory().GetCurrentInventoryLocation(new_il);
+				new_il.SetItem(old_mag);
+			}
+			else
+			{
+				result = GameInventory.CanForceSwapEntitiesEx(new_mag, null, old_mag, new_il);
+				float dir[4];
+				if ( !result )
+				{
+					new_il.SetGroundEx( old_mag,  m_player.GetPosition(), dir);
+				}
+			}
+		}
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Classes/Worlds/ChernarusPlus.c b/scripts/4_World/DayZ/Classes/Worlds/ChernarusPlus.c
new file mode 100644
index 0000000000000000000000000000000000000000..49fb93494659104e5a8b6b074180ddbf2a0d9c66
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Worlds/ChernarusPlus.c
@@ -0,0 +1,304 @@
+class ChernarusPlusData extends WorldData
+{
+	//----- weather vars
+	const float RAIN_THRESHOLD = 0.6;
+	const float STORM_THRESHOLD = 0.9;
+
+	const int OVERCAST_MIN_TIME = 600;
+	const int OVERCAST_MAX_TIME = 900;
+
+	const int RAIN_TIME_MIN = 60;
+	const int RAIN_TIME_MAX = 120;
+	
+	const int CLEAR_WEATHER = 1;
+	const int CLOUDY_WEATHER = 2;
+	const int BAD_WEATHER = 3;
+	
+	const int CLEAR_WEATHER_CHANCE = 30;
+	const int BAD_WEATHER_CHANCE = 80;
+		
+	protected int m_clearWeatherChance = CLEAR_WEATHER_CHANCE;
+	//protected int m_badCloudyChance = 80;
+	protected int m_badWeatherChance = BAD_WEATHER_CHANCE;
+	
+	protected int m_sameWeatherCnt = 0;
+	protected int m_stepValue = 5;
+	protected int m_chance = 50;
+
+	protected int m_choosenWeather = 1;
+	protected int m_lastWeather = 0;
+	
+	//All Chernarus firing coordinates 
+	protected static const ref array<vector> CHERNARUS_ARTY_STRIKE_POS = 
+	{
+		"-500.00 165.00 5231.69",
+		"-500.00 300.00 9934.41",
+		"10406.86 192.00 15860.00",
+		"4811.75 370.00 15860.00",
+		"-500.00 453.00 15860.00"
+	};
+
+	override void Init()
+	{
+		super.Init();
+
+		// new temperature curve settings
+		m_Sunrise_Jan = 8.54;
+		m_Sunset_Jan = 15.52;
+		m_Sunrise_Jul = 3.26;
+		m_Sunset_Jul = 20.73;
+
+		int tempIdx;
+		m_MinTemps = {-3,-2,0,4,9,14,18,17,12,7,4,0};
+		if (CfgGameplayHandler.GetEnvironmentMinTemps() && CfgGameplayHandler.GetEnvironmentMinTemps().Count() == 12)
+		{
+			for (tempIdx = 0; tempIdx < CfgGameplayHandler.GetEnvironmentMinTemps().Count(); tempIdx++)
+			{
+				m_MinTemps[tempIdx] = CfgGameplayHandler.GetEnvironmentMinTemps().Get(tempIdx);
+			}
+		}
+
+		m_MaxTemps = {3,5,7,14,19,24,26,25,21,16,10,5};
+		if (CfgGameplayHandler.GetEnvironmentMaxTemps() && CfgGameplayHandler.GetEnvironmentMaxTemps().Count() == 12)
+		{
+			for (tempIdx = 0; tempIdx < CfgGameplayHandler.GetEnvironmentMaxTemps().Count(); tempIdx++)
+			{
+				m_MaxTemps[tempIdx] = CfgGameplayHandler.GetEnvironmentMaxTemps().Get(tempIdx);
+			}
+		}
+
+		m_FiringPos = CHERNARUS_ARTY_STRIKE_POS;
+	}
+	
+	override bool WeatherOnBeforeChange( EWeatherPhenomenon type, float actual, float change, float time )
+	{
+		int phmnTime 	= 5;
+		int phmnLength 	= 10;
+		float phmnValue = 0;
+
+		m_Weather.SetStorm( 1.0, STORM_THRESHOLD, 45 );
+
+		m_Weather.SetRainThresholds( 0.0, 1.0, 60 );
+		m_Weather.SetWindMaximumSpeed( 20 );
+		m_Weather.SetWindFunctionParams( 0.1, 1.0, 20 );
+
+		switch (type)
+		{
+			//-----------------------------------------------------------------------------------------------------------------------------
+			case EWeatherPhenomenon.OVERCAST:
+
+				//went something goes wrong choose some default random weather	
+				phmnValue = Math.RandomFloatInclusive( 0.2, 0.7 );
+				phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+				phmnLength = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );	
+			
+				//----
+				//calculate next weather
+				m_chance = Math.RandomIntInclusive( 0, 100 );
+				
+				//--
+				if ( m_lastWeather == CLEAR_WEATHER )
+				{
+					m_clearWeatherChance -= ( m_stepValue * m_sameWeatherCnt);					//decrease the chance of the same weather
+				}
+
+				if ( m_lastWeather == CLOUDY_WEATHER )
+				{
+					m_clearWeatherChance += ( m_stepValue * m_sameWeatherCnt);					//increase the chance of the better weather
+					//m_badWeatherChance += ( m_stepValue * m_sameWeatherCnt);
+				}
+			
+				if ( m_lastWeather == BAD_WEATHER )
+				{
+					m_clearWeatherChance += m_stepValue;										//increase the chance of the better weather slightly
+					m_badWeatherChance += (( m_stepValue * m_sameWeatherCnt ) + m_stepValue  );	//decrease the chance of the same weather rapidly
+				}
+			
+				//----
+				if ( m_chance < m_clearWeatherChance )
+				{
+					m_choosenWeather = CLEAR_WEATHER;
+					if ( m_lastWeather == CLEAR_WEATHER )
+						m_sameWeatherCnt ++;
+				}
+				else if ( m_chance > m_badWeatherChance )
+				{
+					m_choosenWeather = BAD_WEATHER;
+					if ( m_lastWeather == BAD_WEATHER )
+						m_sameWeatherCnt ++;
+				}
+				else
+				{
+					m_choosenWeather = CLOUDY_WEATHER;
+					if ( m_lastWeather == CLOUDY_WEATHER )
+						m_sameWeatherCnt ++;
+				}
+
+				if ( m_choosenWeather != m_lastWeather )
+					m_sameWeatherCnt = 0;
+
+				m_clearWeatherChance = CLEAR_WEATHER_CHANCE;
+				m_badWeatherChance = BAD_WEATHER_CHANCE;
+
+				//----
+				//set choosen weather			
+				if ( m_choosenWeather == CLEAR_WEATHER  )
+				{
+					m_lastWeather = CLEAR_WEATHER;
+					
+					phmnValue = Math.RandomFloatInclusive( 0.0, 0.3 );
+					phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+					phmnLength = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+				}
+
+				if ( m_choosenWeather == CLOUDY_WEATHER )
+				{
+					m_lastWeather = CLOUDY_WEATHER;
+
+					phmnValue = Math.RandomFloatInclusive( 0.3, 0.6 );
+					phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+					phmnLength = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+				}
+			
+				if ( m_choosenWeather == BAD_WEATHER )
+				{
+					m_lastWeather = BAD_WEATHER;
+
+					phmnValue = Math.RandomFloatInclusive( 0.6, 1.0 );
+					phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+					phmnLength = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+				}
+
+				m_Weather.GetOvercast().Set( phmnValue, phmnTime, phmnLength );
+
+				Debug.WeatherLog(string.Format("Chernarus::Weather::Overcast:: (%1) overcast: %2", g_Game.GetDayTime(), actual));
+				Debug.WeatherLog(string.Format("Chernarus::Weather::Overcast::Rain:: (%1) %2", g_Game.GetDayTime(), m_Weather.GetRain().GetActual()));
+
+				return true;
+
+			//-----------------------------------------------------------------------------------------------------------------------------
+			case EWeatherPhenomenon.RAIN:
+
+				float actualOvercast = m_Weather.GetOvercast().GetActual();
+				
+				m_chance = Math.RandomIntInclusive( 0, 100 );
+				phmnValue = 0.2;
+				phmnTime = 90;
+				phmnLength = 30;
+			
+				if ( actualOvercast <= RAIN_THRESHOLD )
+				{
+					m_Weather.GetRain().Set( 0.0, RAIN_TIME_MIN, RAIN_TIME_MAX );
+					Debug.WeatherLog(string.Format("Chernarus::Weather::Rain::ForceEnd:: (%1) %2 -> 0", g_Game.GetDayTime(), actual));
+					return true;
+				}
+			
+				if ( actualOvercast > STORM_THRESHOLD )
+				{
+					phmnValue = Math.RandomFloatInclusive( 0.8, 1.0 );
+					phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+					phmnLength = 0;
+
+					m_Weather.GetRain().Set( phmnValue, phmnTime, phmnLength );
+					Debug.WeatherLog(string.Format("Chernarus::Weather::Rain::ForceStorm:: (%1) %2 -> %3", g_Game.GetDayTime(), actual, phmnValue));
+					return true;
+				}
+			
+				//make a differnce in "normal rain"
+				if ( actualOvercast < 0.75 )
+				{
+					if ( m_chance < 30 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.1, 0.3 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 60 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.2, 0.5 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 80 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.0, 0.2 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else //also have the chance to not have rain at all
+					{
+						phmnValue = 0;
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 120;
+					}
+				}
+				else
+				{
+					if ( m_chance < 25 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.5, 0.7 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 50 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.2, 0.4 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 75 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.4, 0.6 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else //also have the chance to not have rain at all
+					{
+						phmnValue = 0;
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 120;
+					}
+				}
+		
+				m_Weather.GetRain().Set( phmnValue, phmnTime, phmnLength );
+
+				Debug.WeatherLog(string.Format("Chernarus::Weather::Rain:: (%1) %2", g_Game.GetDayTime(), actual));
+
+				return true;
+
+			//-----------------------------------------------------------------------------------------------------------------------------
+			case EWeatherPhenomenon.FOG:
+
+				float fogMin = 0.0;
+				float fogMax = 0.15;
+				float fogTime = 1800.0;
+
+				float fogyMorning = Math.RandomFloatInclusive( 0.0, 1.0 );
+
+				if ( fogyMorning > 0.85 )
+				{
+					if ( (g_Game.GetDayTime() > 4 && g_Game.GetDayTime() < 7 ) )
+					{
+						fogMin = 0.10;
+						fogMax = 0.35;
+						fogTime = 300;
+					}
+				}
+
+				if ( m_Weather.GetOvercast().GetActual() < 0.3 )
+				{
+					fogMin = 0.0;
+					fogMax = 0.08;
+					fogTime = 900.0;
+				}
+
+				m_Weather.GetFog().Set( Math.RandomFloatInclusive( fogMin, fogMax ), fogTime, 0);
+				
+				Debug.WeatherLog(string.Format("Chernarus::Weather::Fog:: (%1) %2", g_Game.GetDayTime(), actual));
+
+				return true;
+		}
+
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Worlds/Enoch.c b/scripts/4_World/DayZ/Classes/Worlds/Enoch.c
new file mode 100644
index 0000000000000000000000000000000000000000..8e392e001cfc7b2346f76bb8cef9875049472dba
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Worlds/Enoch.c
@@ -0,0 +1,301 @@
+class EnochData extends WorldData
+{
+	const float RAIN_THRESHOLD = 0.6;
+	const float STORM_THRESHOLD = 0.85;
+
+	const int OVERCAST_MIN_TIME = 600;
+	const int OVERCAST_MAX_TIME = 900;
+
+	const int RAIN_TIME_MIN = 60;
+	const int RAIN_TIME_MAX = 120;
+	
+	const int CLEAR_WEATHER = 1;
+	const int CLOUDY_WEATHER = 2;
+	const int BAD_WEATHER = 3;
+
+	const int CLEAR_WEATHER_CHANCE = 50;
+	const int BAD_WEATHER_CHANCE = 75;
+			
+	protected int m_clearWeatherChance = CLEAR_WEATHER_CHANCE;
+	//protected int m_badCloudyChance = 80;
+	protected int m_badWeatherChance = BAD_WEATHER_CHANCE;
+	
+	protected int m_stepValue = 5;
+
+	protected int m_sameWeatherCnt = 0;
+	protected int m_chance = 50;
+
+	protected int m_choosenWeather = 1;
+	protected int m_lastWeather = 0;
+	
+	protected static const ref array<vector> LIVONIA_ARTY_STRIKE_POS = 
+	{ 
+		"7440.00 417.00 -500.00",
+		"-500.00 276.00 5473.00",
+		"-500.00 265.00 9852.00",
+		"4953.00 240.00 13300.00",
+		"9620.00 188.00 13300.00",
+		"13300.00 204.00 10322.00",
+		"13300.00 288.00 6204.00",
+		"13300.00 296.00 -500.00"
+	};
+
+	override void Init()
+	{
+		super.Init();
+
+		// new temperature curve settings
+		m_Sunrise_Jan = 8.4;
+		m_Sunset_Jan = 15.63;
+		m_Sunrise_Jul = 3.65;
+		m_Sunset_Jul = 20.35;
+
+		int tempIdx;
+		m_MinTemps = {-7,-7.4,-4.1,1.5,7,11.3,13.4,13.1,9.3,5.3,0.8,-3.6};
+		if (CfgGameplayHandler.GetEnvironmentMinTemps() && CfgGameplayHandler.GetEnvironmentMinTemps().Count() == 12)
+		{
+			for (tempIdx = 0; tempIdx < CfgGameplayHandler.GetEnvironmentMinTemps().Count(); tempIdx++)
+			{
+				m_MinTemps[tempIdx] = CfgGameplayHandler.GetEnvironmentMinTemps().Get(tempIdx);
+			}
+		}
+
+		m_MaxTemps = {-2.5,-2.1,2.3,9,15.5,19.4,20.9,20.4,16,10.5,4.2,0.1};
+		if (CfgGameplayHandler.GetEnvironmentMaxTemps() && CfgGameplayHandler.GetEnvironmentMaxTemps().Count() == 12)
+		{
+			for (tempIdx = 0; tempIdx < CfgGameplayHandler.GetEnvironmentMaxTemps().Count(); tempIdx++)
+			{
+				m_MaxTemps[tempIdx] = CfgGameplayHandler.GetEnvironmentMaxTemps().Get(tempIdx);
+			}
+		}
+
+		m_FiringPos = LIVONIA_ARTY_STRIKE_POS;
+	}
+	
+	override bool WeatherOnBeforeChange( EWeatherPhenomenon type, float actual, float change, float time )
+	{
+		int phmnTime 	= 5;
+		int phmnLength 	= 10;
+		float phmnValue = 0;
+
+		m_Weather.SetStorm( 1.0, STORM_THRESHOLD, 20 );
+
+		m_Weather.SetRainThresholds( 0.0, 1.0, 60 );
+		m_Weather.SetWindMaximumSpeed( 20 );
+		m_Weather.SetWindFunctionParams( 0.1, 1.0, 20 );
+		
+		switch (type)
+		{
+			//-----------------------------------------------------------------------------------------------------------------------------
+			case EWeatherPhenomenon.OVERCAST:
+		
+				//went something goes wrong choose some default random weather	
+				phmnValue = Math.RandomFloatInclusive( 0.1, 0.4 );
+				phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+				phmnLength = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );	
+			
+				//----
+				//calculate next weather
+				m_chance = Math.RandomIntInclusive( 0, 100 );
+				
+				//--
+				if ( m_lastWeather == CLEAR_WEATHER )
+				{
+					m_clearWeatherChance -= ( m_stepValue * m_sameWeatherCnt);					//decrease the chance of the same weather
+				}
+
+				if ( m_lastWeather == CLOUDY_WEATHER )
+				{
+					m_clearWeatherChance += ( m_stepValue * m_sameWeatherCnt);					//increase the chance of the better weather
+					m_badWeatherChance -= ( m_stepValue * m_sameWeatherCnt);
+				}
+			
+				if ( m_lastWeather == BAD_WEATHER )
+				{
+					m_clearWeatherChance += m_stepValue;										//increase the chance of the better weather slightly
+					m_badWeatherChance += ( m_stepValue * m_sameWeatherCnt );	//decrease the chance of the same weather
+				}
+			
+				//----
+				if ( m_chance < m_clearWeatherChance )
+				{
+					m_choosenWeather = CLEAR_WEATHER;
+					if ( m_lastWeather == CLEAR_WEATHER )
+						m_sameWeatherCnt ++;
+				}
+				else if ( m_chance > m_badWeatherChance )
+				{
+					m_choosenWeather = BAD_WEATHER;
+					if ( m_lastWeather == BAD_WEATHER )
+						m_sameWeatherCnt ++;
+				}
+				else
+				{
+					m_choosenWeather = CLOUDY_WEATHER;
+					if ( m_lastWeather == CLOUDY_WEATHER )
+						m_sameWeatherCnt ++;
+				}
+
+				if ( m_choosenWeather != m_lastWeather )
+					m_sameWeatherCnt = 0;
+
+				m_clearWeatherChance = CLEAR_WEATHER_CHANCE;
+				m_badWeatherChance = BAD_WEATHER_CHANCE;
+
+				//----
+				//set choosen weather			
+				if ( m_choosenWeather == CLEAR_WEATHER  )
+				{
+					m_lastWeather = CLEAR_WEATHER;
+					
+					phmnValue = Math.RandomFloatInclusive( 0.0, 0.3 );
+					phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+					phmnLength = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+				}
+
+				if ( m_choosenWeather == CLOUDY_WEATHER )
+				{
+					m_lastWeather = CLOUDY_WEATHER;
+
+					phmnValue = Math.RandomFloatInclusive( 0.3, 0.7 );
+					phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+					phmnLength = Math.RandomIntInclusive( 0, OVERCAST_MIN_TIME );
+				}
+			
+				if ( m_choosenWeather == BAD_WEATHER )
+				{
+					m_lastWeather = BAD_WEATHER;
+
+					phmnValue = Math.RandomFloatInclusive( 0.7, 1.0 );
+					phmnTime = Math.RandomIntInclusive( OVERCAST_MIN_TIME, OVERCAST_MAX_TIME );
+					phmnLength = Math.RandomIntInclusive( 0, OVERCAST_MIN_TIME );
+				}
+
+				m_Weather.GetOvercast().Set( phmnValue, phmnTime, phmnLength );
+
+				Debug.WeatherLog(string.Format("Enoch::Weather::Overcast:: (%1) overcast: %2", g_Game.GetDayTime(), actual));
+				Debug.WeatherLog(string.Format("Enoch::Weather::Overcast::Rain:: (%1) %2", g_Game.GetDayTime(), m_Weather.GetRain().GetActual()));
+
+				return true;
+
+			//-----------------------------------------------------------------------------------------------------------------------------
+			case EWeatherPhenomenon.RAIN:
+				float actualOvercast = m_Weather.GetOvercast().GetActual();
+				
+				m_chance = Math.RandomIntInclusive( 0, 100 );	
+				phmnValue = 0.2;
+				phmnTime = 90;
+				phmnLength = 30;
+			
+				if ( actualOvercast <= RAIN_THRESHOLD )
+				{
+					m_Weather.GetRain().Set( 0.0, RAIN_TIME_MIN, RAIN_TIME_MAX );
+					Debug.WeatherLog (string.Format("Enoch::Weather::Rain::ForceEnd:: (%1) %2 -> 0", g_Game.GetDayTime(), actual));
+					return true;
+				}
+			
+				if ( actualOvercast > STORM_THRESHOLD )
+				{
+					phmnValue = Math.RandomFloatInclusive( 0.8, 1.0 );
+					phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+					phmnLength = 0;
+
+					m_Weather.GetRain().Set( phmnValue, phmnTime, phmnLength );	
+					Debug.WeatherLog(string.Format("Enoch::Weather::Rain::ForceStorm:: (%1) %2 -> %3", g_Game.GetDayTime(), actual, phmnValue));
+					return true;
+				}
+			
+				//make a differnce in "normal rain"
+				if ( actualOvercast < 0.75 )
+				{
+					if ( m_chance < 30 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.1, 0.3 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 60 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.2, 0.4 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 85 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.0, 0.2 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else //also have the chance to not have rain at all
+					{
+						phmnValue = 0;
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 120;
+					}
+				}
+				else if ( actualOvercast < STORM_THRESHOLD )
+				{
+					if ( m_chance < 15 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.4, 0.6 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 50 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.2, 0.4 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else if ( m_chance < 90 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.6, 0.8 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else //also have the chance to not have rain at all
+					{
+						phmnValue = 0;
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 120;
+					}
+				}
+				else
+				{
+					if ( m_chance < 50 )
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.9, 1.0 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+					else
+					{
+						phmnValue = Math.RandomFloatInclusive( 0.8, 0.9 );
+						phmnTime = Math.RandomInt( RAIN_TIME_MIN, RAIN_TIME_MAX );
+						phmnLength = 0;
+					}
+				}
+		
+				m_Weather.GetRain().Set( phmnValue, phmnTime, phmnLength );
+
+				Debug.WeatherLog(string.Format("Enoch::Weather::Rain:: (%1) %2", g_Game.GetDayTime(), actual));
+				return true;
+			
+			//-----------------------------------------------------------------------------------------------------------------------------
+			case EWeatherPhenomenon.FOG:
+				int year, month, day, hour, minute;
+				GetGame().GetWorld().GetDate(year, month, day, hour, minute);
+				if (( hour >= 1 ) && ( hour <= 5 ))
+				{
+					m_Weather.GetFog().Set( 0.1, 1800, 0 );
+				} else {
+					m_Weather.GetFog().Set( 0.0, 1800, 0 );
+				}
+			
+				Debug.WeatherLog(string.Format("Enoch::Weather::Fog:: (%1) %2", g_Game.GetDayTime(), actual));
+
+				return true;
+		}
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Classes/Worlds/MainMenuWorldData.c b/scripts/4_World/DayZ/Classes/Worlds/MainMenuWorldData.c
new file mode 100644
index 0000000000000000000000000000000000000000..44f01b50879dddeabbb87ef5d3a0b34da8e02083
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/Worlds/MainMenuWorldData.c
@@ -0,0 +1,9 @@
+#ifdef PLATFORM_CONSOLE
+class MainMenuWorldData : WorldData
+{
+	override bool WeatherOnBeforeChange(EWeatherPhenomenon type, float actual, float change, float time)
+	{
+		return false;
+	}
+}
+#endif
diff --git a/scripts/4_World/DayZ/Classes/WrittenNoteData.c b/scripts/4_World/DayZ/Classes/WrittenNoteData.c
new file mode 100644
index 0000000000000000000000000000000000000000..d2fb4badebaf17d6cbdd479e36a1310da97718f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Classes/WrittenNoteData.c
@@ -0,0 +1,91 @@
+class WrittenNoteData
+{
+	protected ItemBase 	m_WritingImplement;
+	protected ItemBase	m_Paper;
+	//protected int 		m_Handwriting = -1;
+	protected string 	m_SimpleText;
+	
+	void WrittenNoteData(ItemBase parent)
+	{
+		
+	}
+	
+	void OnRPC( PlayerIdentity sender, int rpc_type, ParamsReadContext  ctx)
+	{
+		Param1<string> param = new Param1<string>("");
+		
+		//sent from server, executed on client
+		if (rpc_type == ERPCs.RPC_WRITE_NOTE)
+		{
+			if (ctx.Read(param))
+			{
+				SetNoteText(param.param1);
+			}
+			
+			g_Game.GetMission().SetNoteMenu(g_Game.GetUIManager().EnterScriptedMenu(MENU_NOTE, GetGame().GetUIManager().GetMenu())); //NULL means no parent
+			
+			ItemBase pen;
+			ItemBase paper;
+			//int handwriting;
+			
+			if (GetNoteInfo(pen,paper))
+			{
+				g_Game.GetMission().GetNoteMenu().InitNoteWrite(paper,pen,m_SimpleText);
+			}
+		}
+		//sent from client (NoteMenu), executed on server
+		if (rpc_type == ERPCs.RPC_WRITE_NOTE_CLIENT)
+		{
+			if (ctx.Read(param))
+			{
+				string old_string = m_SimpleText;
+				SetNoteText(param.param1);
+				DepleteWritingImplement(m_WritingImplement,old_string,m_SimpleText);
+			}
+		}
+		if (rpc_type == ERPCs.RPC_READ_NOTE)
+		{
+			if (ctx.Read(param))
+			{
+				SetNoteText(param.param1);
+			}
+			
+			g_Game.GetMission().SetNoteMenu(g_Game.GetUIManager().EnterScriptedMenu(MENU_NOTE, GetGame().GetUIManager().GetMenu())); //NULL means no parent
+			g_Game.GetMission().GetNoteMenu().InitNoteRead(m_SimpleText);
+		}
+	}
+	
+	void InitNoteInfo(ItemBase pen = null, ItemBase paper = null)
+	{
+		m_WritingImplement = pen;
+		m_Paper = paper;
+		//m_Handwriting = handwriting;
+	}
+	
+	bool GetNoteInfo(out ItemBase pen, out ItemBase paper)
+	{
+		pen = m_WritingImplement;
+		paper = m_Paper;
+		//handwriting = m_Handwriting;
+		return pen && paper;
+	}
+	
+	string GetNoteText()
+	{
+		return m_SimpleText;
+	}
+	
+	void SetNoteText(string text)
+	{
+		m_SimpleText = MiscGameplayFunctions.SanitizeString(text);
+	}
+	
+	void DepleteWritingImplement(notnull ItemBase pen,string old_text,string new_text)
+	{
+		float qty_per_char = 1.0;
+		float decrease = Math.Clamp((new_text.Length() - old_text.Length()),0,pen.GetQuantityMax());
+		pen.AddQuantity(-(qty_per_char * decrease));
+	}
+}
+
+//-----------------------
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/AdvancedCommunication.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/AdvancedCommunication.c
new file mode 100644
index 0000000000000000000000000000000000000000..a70d85be3e5ea55a966544bf61bd6c06302ceff2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/AdvancedCommunication.c
@@ -0,0 +1,160 @@
+class AdvancedCommunication extends EntityAI
+{
+	static ref map<typename, ref TInputActionMap> m_AdvComTypeActionsMap = new map<typename, ref TInputActionMap>;
+	TInputActionMap m_InputActionMap;
+	bool	m_ActionsInitialize;
+	
+	void AdvancedCommunication()
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			if(GetGame().GetPlayer())
+			{
+				m_ActionsInitialize = false;
+			}
+		}	
+	}
+
+	//HUD
+	/*
+	protected Hud GetHud( PlayerBase player )
+	{
+		if ( !player ) 
+		{
+			return NULL;
+		}
+		
+		return player.m_Hud;
+	}
+
+	void DisplayRadioInfo( string message, PlayerBase player )
+	{
+		Hud hud;
+		if ( player )
+		{
+			hud = GetHud( player );
+		}
+		
+		if ( hud ) 
+		{	
+			hud.SetWalkieTalkieText( message );
+			hud.ShowWalkieTalkie( 3 );
+		}
+	}
+	*/
+	
+	//control transmitter via user actions
+	void TurnOnTransmitter()
+	{
+		GetCompEM().SwitchOn();
+	}
+	
+	void TurnOffTransmitter()
+	{
+		GetCompEM().SwitchOff();
+	}
+	
+	void InitializeActions()
+	{
+		m_InputActionMap = m_AdvComTypeActionsMap.Get( this.Type() );
+		if(!m_InputActionMap)
+		{
+			TInputActionMap iam = new TInputActionMap;
+			m_InputActionMap = iam;
+			SetActions();
+			m_AdvComTypeActionsMap.Insert(this.Type(), m_InputActionMap);
+		}
+	}
+	
+	override void GetActions(typename action_input_type, out array<ActionBase_Basic> actions)
+	{
+		if(!m_ActionsInitialize)
+		{
+			m_ActionsInitialize = true;
+			InitializeActions();
+		}
+		
+		actions = m_InputActionMap.Get(action_input_type);
+	}
+	
+	void SetActions()
+	{
+		AddAction(ActionTurnOnTransmitterOnGround);
+		AddAction(ActionTurnOffTransmitterOnGround);
+		AddAction(ActionDetachPowerSourceFromPanel);
+	}
+	
+	void AddAction(typename actionName)
+	{
+		ActionBase action = ActionManagerBase.GetAction(actionName);
+
+		if (!action)
+		{
+			Debug.LogError("Action " + actionName + " dosn't exist!");
+			return;
+		}		
+		
+		typename ai = action.GetInputType();
+		if (!ai)
+		{
+			m_ActionsInitialize = false;
+			return;
+		}
+		
+		array<ActionBase_Basic> action_array = m_InputActionMap.Get( ai );
+		
+		if (!action_array)
+		{
+			action_array = new array<ActionBase_Basic>;
+			m_InputActionMap.Insert(ai, action_array);
+		}
+		
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog(action.ToString() + " -> " + ai, this.ToString() , "n/a", "Add action" );
+		}
+		action_array.Insert(action);
+	}
+	
+	void RemoveAction(typename actionName)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionBase action = player.GetActionManager().GetAction(actionName);
+		typename ai = action.GetInputType();
+		array<ActionBase_Basic> action_array = m_InputActionMap.Get( ai );
+		
+		if (action_array)
+		{
+			action_array.RemoveItem(action);
+		}
+	}
+}
+
+class PASReceiver extends AdvancedCommunication
+{
+	override bool IsInventoryVisible()
+	{
+		return false;
+	}
+};
+
+class PASBroadcaster extends AdvancedCommunication
+{
+	proto native void SwitchOn(bool onOff);
+	proto native bool IsOn();
+};
+
+class StaticTransmitter extends AdvancedCommunication
+{
+	proto native void SwitchOn(bool onOff);
+	proto native bool IsOn();
+	proto native void SetNextChannel();
+	proto native void SetPrevChannel();
+	proto native float GetTunedFrequency();
+	proto native void EnableBroadcast(bool state);
+	proto native void EnableReceive(bool state);
+	proto native bool IsBroadcasting();
+	proto native bool IsReceiving();
+	proto native int GetTunedFrequencyIndex();
+	proto native void SetFrequencyByIndex(int index);
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Lamp_City1_amp.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Lamp_City1_amp.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bfbb6c4879172f0e0046afc2b9e185d18e4d420
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Lamp_City1_amp.c
@@ -0,0 +1,3 @@
+class Land_Lamp_City1_amp extends PASReceiver
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Conc1_Amp.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Conc1_Amp.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ec00fa9a66140712c6396bb20621725d3d72a8a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Conc1_Amp.c
@@ -0,0 +1,3 @@
+class Land_Power_Pole_Conc1_Amp extends PASReceiver
+{
+}
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Conc4_Lamp_Amp.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Conc4_Lamp_Amp.c
new file mode 100644
index 0000000000000000000000000000000000000000..11dfd65572ff13c39e2a6102905c5b9b20a171b0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Conc4_Lamp_Amp.c
@@ -0,0 +1,3 @@
+class Land_Power_Pole_Conc4_Lamp_Amp extends PASReceiver
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Wood1_Amp.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Wood1_Amp.c
new file mode 100644
index 0000000000000000000000000000000000000000..5eac4f37487f5fa2a50b499adf0997a9719fc27c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Wood1_Amp.c
@@ -0,0 +1,3 @@
+class Land_Power_Pole_Wood1_Amp extends PASReceiver
+{
+}
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Wood1_Lamp_Amp.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Wood1_Lamp_Amp.c
new file mode 100644
index 0000000000000000000000000000000000000000..91c06e2ad533ad065f0a31bda2df3afa07b1696d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Power_Pole_Wood1_Lamp_Amp.c
@@ -0,0 +1,3 @@
+class Land_Power_Pole_Wood1_Lamp_Amp extends PASReceiver
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Radio_PanelBig.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Radio_PanelBig.c
new file mode 100644
index 0000000000000000000000000000000000000000..8589bf1557f748954c81c62db82c8496ad0bb34a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Radio_PanelBig.c
@@ -0,0 +1,87 @@
+class Land_Radio_PanelBig extends StaticTransmitter
+{
+	override bool DisableVicinityIcon()
+	{
+		return true;
+	}
+	
+	// --- SYSTEM EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		//store tuned frequency
+		ctx.Write( GetTunedFrequencyIndex() );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+
+		//--- Panel Radio data ---
+		//load and set tuned frequency
+		int tuned_frequency_idx;
+		if ( !ctx.Read( tuned_frequency_idx ) )
+		{
+			tuned_frequency_idx = 0;		//set default
+		}
+		SetFrequencyByIndex( tuned_frequency_idx );
+		//---
+		
+		return true;
+	}	
+	
+	//--- BASE
+	override bool IsStaticTransmitter()
+	{
+		return true;
+	}
+	
+	void SetNextFrequency( PlayerBase player = NULL )
+	{
+		SetNextChannel();
+		
+		/*
+		if ( player )
+		{
+			DisplayRadioInfo( GetTunedFrequency().ToString(), player );
+		}
+		*/
+	}
+
+	//--- POWER EVENTS
+	override void OnSwitchOn()
+	{
+		if ( !GetCompEM().CanWork() )
+		{
+			GetCompEM().SwitchOff();
+		}
+	}	
+	
+	override void OnWorkStart()
+	{
+		//turn on broadcasting/receiving
+		EnableBroadcast ( true );
+		EnableReceive ( true );
+		SwitchOn ( true );
+	}
+
+	override void OnWorkStop()
+	{
+		//auto switch off (EM)
+		GetCompEM().SwitchOff();
+		
+		//turn off broadcasting/receiving
+		EnableBroadcast ( false );
+		EnableReceive ( false );	
+		SwitchOn ( false );		
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTuneFrequencyOnGround);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Radio_PanelPAS.c b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Radio_PanelPAS.c
new file mode 100644
index 0000000000000000000000000000000000000000..97d1aa4a610efc0673589faabaa759962b2e90b4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/AdvancedCommunication/Land_Radio_PanelPAS.c
@@ -0,0 +1,89 @@
+class Land_Radio_PanelPAS extends PASBroadcaster
+{
+	//Sounds
+	const string SOUND_PAS_TURN_ON 			= "pastransmitter_turnon_SoundSet";
+	const string SOUND_PAS_TURN_OFF 		= "pastransmitter_turnoff_SoundSet";
+	const string SOUND_PAS_TURNED_ON 		= "pastransmitter_staticnoise_SoundSet";
+
+	protected EffectSound m_Sound;
+	protected EffectSound m_SoundLoop;
+	
+	//--- BASE
+	override bool IsStaticTransmitter()
+	{
+		return true;
+	}
+	
+	override bool DisableVicinityIcon()
+	{
+		return true;
+	}
+	
+	//--- POWER EVENTS
+	override void OnSwitchOn()
+	{
+		super.OnSwitchOn();
+		
+		if ( !GetCompEM().CanWork() )
+		{
+			GetCompEM().SwitchOff();
+		}
+		
+		//sound
+		SoundTurnOn();
+	}
+	
+	override void OnSwitchOff()
+	{
+		super.OnSwitchOff();
+		
+		//sound
+		SoundTurnOff();
+	}	
+	
+	override void OnWorkStart()
+	{
+		super.OnWorkStart();
+		
+		//turn off device
+		SwitchOn ( true ); // start send/receive voice
+		
+		//sound
+		SoundTurnedOnNoiseStart();
+	}
+	
+	override void OnWorkStop()
+	{
+		super.OnWorkStop();
+		
+		//turn off device
+		SwitchOn ( false ); // stop send/receive voice
+		
+		//sound
+		SoundTurnedOnNoiseStop();		
+	}
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	//Static noise when the radio is turned on
+	protected void SoundTurnedOnNoiseStart()
+	{
+		PlaySoundSetLoop( m_SoundLoop, SOUND_PAS_TURNED_ON, 1.0, 1.0 );
+	}
+
+	protected void SoundTurnedOnNoiseStop()
+	{
+		StopSoundSet( m_SoundLoop );
+	}
+	
+	protected void SoundTurnOn()
+	{
+		PlaySoundSet( m_Sound, SOUND_PAS_TURN_ON, 0, 0 );
+	}
+	
+	protected void SoundTurnOff()
+	{
+		PlaySoundSet( m_Sound, SOUND_PAS_TURN_OFF, 0, 0 );
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/BuildingWithFireplace.c b/scripts/4_World/DayZ/Entities/Building/BuildingWithFireplace.c
new file mode 100644
index 0000000000000000000000000000000000000000..99f1ef6a011d079318b9b0cee3052ef1644ebd32
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/BuildingWithFireplace.c
@@ -0,0 +1,6 @@
+class BuildingWithFireplace extends BuildingSuper
+{
+	void BuildingWithFireplace()
+	{
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/CrashBase.c b/scripts/4_World/DayZ/Entities/Building/CrashBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b6d94694e0ac97d180eb012460f1648bc2010fb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/CrashBase.c
@@ -0,0 +1,52 @@
+class CrashBase extends House
+{
+	Particle m_ParticleEfx;
+	static bool m_Init = Init();
+	
+	static bool Init()
+	{
+		CrashSoundSets.RegisterSoundSet("HeliCrash_Distant_SoundSet");
+		CrashSoundSets.RegisterSoundSet("SledgeCrash_Distant_SoundSet");
+		return true;
+	}
+	
+	override void EEOnCECreate()
+	{
+		super.EEOnCECreate();
+		RequestSoundEvent();
+	}
+	
+	void RequestSoundEvent()
+	{
+		Param3<bool, vector, int> playSound = new Param3<bool, vector, int>(true, GetPosition(), GetSoundSet().Hash());
+		GetGame().RPCSingleParam( null, ERPCs.RPC_SOUND_HELICRASH, playSound, true );
+	}
+	
+	// needs to have the soundset registered in CrashBase.Init()
+	string GetSoundSet()
+	{
+		return "HeliCrash_Distant_SoundSet";
+	}
+
+	override void EEInit()
+	{
+		super.EEInit();
+		//Setup for local sound tests
+		#ifdef DEVELOPER
+		if ( !GetGame().IsMultiplayer() )
+		{
+			EffectSound eff = SEffectManager.PlaySound( GetSoundSet(), GetPosition(), 0.1, 0.1 );
+			eff.SetAutodestroy(true);
+		}
+		#endif
+	}
+
+	override void EEDelete(EntityAI parent)
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( m_ParticleEfx )
+				m_ParticleEfx.Stop();
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/FuelStation.c b/scripts/4_World/DayZ/Entities/Building/FuelStation.c
new file mode 100644
index 0000000000000000000000000000000000000000..69da4a104d5a4803cc4b3de3ead95fb882495afc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/FuelStation.c
@@ -0,0 +1,17 @@
+class FuelStation extends BuildingSuper
+{
+	override bool IsBuilding()
+	{
+		return false;
+	}
+	
+	override bool IsFuelStation()
+	{
+		return true;
+	}
+	
+	override float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_FUELSTATION;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Industrial/Misc/Land_Misc_Through_Static.c b/scripts/4_World/DayZ/Entities/Building/Industrial/Misc/Land_Misc_Through_Static.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc77d04d29c70e5fbc2285d3abf949e0476bc643
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Industrial/Misc/Land_Misc_Through_Static.c
@@ -0,0 +1,18 @@
+class Land_Misc_Through_Static : BuildingSuper
+{
+	override EWaterSourceObjectType GetWaterSourceObjectType()
+	{
+		return EWaterSourceObjectType.THROUGH;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionDrink);
+
+		AddAction(ActionWashHandsWell);
+		AddAction(ActionDrinkThroughContinuous);
+		AddAction(ActionFillBottleBase);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks1.c b/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks1.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e75cc31ce650c554aba7e529534c9355ea17e68
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks1.c
@@ -0,0 +1,3 @@
+class Land_Mil_Barracks1 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks3.c b/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks3.c
new file mode 100644
index 0000000000000000000000000000000000000000..7963090e7fe2d9532bff81e8df98895870ba0259
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks3.c
@@ -0,0 +1,3 @@
+class Land_Mil_Barracks3 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks4.c b/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks4.c
new file mode 100644
index 0000000000000000000000000000000000000000..905f45c537c0b4b9dd12e795a33f98cd1bd390f3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Military/Houses/Mil_Barracks4.c
@@ -0,0 +1,3 @@
+class Land_Mil_Barracks4 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F1.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F1.c
new file mode 100644
index 0000000000000000000000000000000000000000..c28544dea2c08175ba148675090d0f134c6df692
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F1.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_1F1 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F3.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F3.c
new file mode 100644
index 0000000000000000000000000000000000000000..66c0276b3c82ac8c3e5106537ead43097b5e8381
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F3.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_1F3 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F4.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F4.c
new file mode 100644
index 0000000000000000000000000000000000000000..d95b05645914d0ce270a58eff7f03483583b6c72
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_1F4.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_1F4 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F1.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F1.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf277c6b5d11adbbc43c0004d2e6a94659e6a6b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F1.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_2F1 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F8.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F8.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab39a95fb48c2df651e311b47ad2dadc67416bdc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F8.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_2F8 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F9.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F9.c
new file mode 100644
index 0000000000000000000000000000000000000000..790a8b8f5b20545bb435010097d7adff64ef48e7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_2F9.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_2F9 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_3F2.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_3F2.c
new file mode 100644
index 0000000000000000000000000000000000000000..35715258d3135664f8696a58cc0a06304b255bdb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_3F2.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_3F2 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_5F.c b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_5F.c
new file mode 100644
index 0000000000000000000000000000000000000000..5bc6ea651bfc84950fe57983c4fada82ddba6988
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/HouseBlocks/HouseBlock_5F.c
@@ -0,0 +1,3 @@
+class Land_HouseBlock_5F extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_Airfield_Small_Control.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_Airfield_Small_Control.c
new file mode 100644
index 0000000000000000000000000000000000000000..b35ed5f9fb682fc2e88cb6336fbbbff98b3773c8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_Airfield_Small_Control.c
@@ -0,0 +1,3 @@
+class Land_Airfield_Small_Control extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1B01_Pub.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1B01_Pub.c
new file mode 100644
index 0000000000000000000000000000000000000000..8abe80305d1d43cce03ad6f14687fb0448aff413
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1B01_Pub.c
@@ -0,0 +1,3 @@
+class Land_House_1B01_Pub extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W01.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W01.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bb66f1ba04c831b469ebdf378ce5f36d98d580f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W01.c
@@ -0,0 +1,3 @@
+class Land_House_1W01 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W02.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W02.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a8ec50f255318907a2b7dc95e4f2658f18d9caa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W02.c
@@ -0,0 +1,3 @@
+class Land_House_1W02 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W03.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W03.c
new file mode 100644
index 0000000000000000000000000000000000000000..18bf5760fbd171daa27db508098a15191e1d9eee
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W03.c
@@ -0,0 +1,3 @@
+class Land_House_1W03 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W04.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W04.c
new file mode 100644
index 0000000000000000000000000000000000000000..c6a96f39aeadf1c749107848af8a44a2045799f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W04.c
@@ -0,0 +1,3 @@
+class Land_House_1W04 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W05.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W05.c
new file mode 100644
index 0000000000000000000000000000000000000000..de44d8e11cd739ffe7b7630e3fe06e364f1552e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W05.c
@@ -0,0 +1,3 @@
+class Land_House_1W05 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W06.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W06.c
new file mode 100644
index 0000000000000000000000000000000000000000..69c884b640db5832ab6fc991af71ccef16730e81
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W06.c
@@ -0,0 +1,3 @@
+class Land_House_1W06 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W08.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W08.c
new file mode 100644
index 0000000000000000000000000000000000000000..5fde2891f5980d5481e11685ea3dfd3d4bf08dad
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W08.c
@@ -0,0 +1,3 @@
+class Land_House_1W08 extends BuildingWithFireplace
+{
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W09.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W09.c
new file mode 100644
index 0000000000000000000000000000000000000000..89918038577e810cd3ec99f2b5d4603c750e9811
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W09.c
@@ -0,0 +1,3 @@
+class Land_House_1W09 extends BuildingWithFireplace
+{
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W10.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W10.c
new file mode 100644
index 0000000000000000000000000000000000000000..8ca26efb524bec1934bc76f569cbbf8009856701
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W10.c
@@ -0,0 +1,3 @@
+class Land_House_1W10 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W11.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W11.c
new file mode 100644
index 0000000000000000000000000000000000000000..7cc51164d6c3cd515e911daaff37f7e9e58253dd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W11.c
@@ -0,0 +1,3 @@
+class Land_House_1W11 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W12.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W12.c
new file mode 100644
index 0000000000000000000000000000000000000000..f612e69a61ce3830a3d044eea2f964335ffc6c39
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_1W12.c
@@ -0,0 +1,3 @@
+class Land_House_1W12 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2B01.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2B01.c
new file mode 100644
index 0000000000000000000000000000000000000000..2861ee8cc9b4d28ffb86dc7884b87d988735f66a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2B01.c
@@ -0,0 +1,3 @@
+class Land_House_2B01 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2W01.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2W01.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f7129dcb6c3c4532480acb8351694a9af1617b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2W01.c
@@ -0,0 +1,3 @@
+class Land_House_2W01 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2W02.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2W02.c
new file mode 100644
index 0000000000000000000000000000000000000000..1ffafeb567851bf4ee19810ce050e9feda886451
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_House_2W02.c
@@ -0,0 +1,3 @@
+class Land_House_2W02 extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_Village_Pub.c b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_Village_Pub.c
new file mode 100644
index 0000000000000000000000000000000000000000..b695e409cfe6b4c74ad3a3ece5d3dbc3d93ed3c1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Houses/Land_Village_Pub.c
@@ -0,0 +1,3 @@
+class Land_Village_Pub extends BuildingWithFireplace
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Greenhouse.c b/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Greenhouse.c
new file mode 100644
index 0000000000000000000000000000000000000000..41950133be20c3ac33167aaacf10c7a8d636410b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Greenhouse.c
@@ -0,0 +1,15 @@
+class Land_Misc_Greenhouse extends BuildingSuper
+{
+	void Land_Misc_Greenhouse()
+	{
+		
+	}
+}
+
+class Land_Misc_Polytunnel extends BuildingSuper
+{
+	void Land_Misc_Polytunnel()
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Well_Pump_Blue.c b/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Well_Pump_Blue.c
new file mode 100644
index 0000000000000000000000000000000000000000..40873251dbe08c1803d2468b18298ca33eebba2b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Well_Pump_Blue.c
@@ -0,0 +1,4 @@
+class Land_Misc_Well_Pump_Blue extends Well
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Well_Pump_Yellow.c b/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Well_Pump_Yellow.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b33f5ed177763a5f716c8dc0784c65f81acb9f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Residential/Misc/Land_Misc_Well_Pump_Yellow.c
@@ -0,0 +1,4 @@
+class Land_Misc_Well_Pump_Yellow extends Well
+{
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Signs.c b/scripts/4_World/DayZ/Entities/Building/Signs.c
new file mode 100644
index 0000000000000000000000000000000000000000..487e4bfa6dc46937d7ba71d5e284bd51e12c749a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Signs.c
@@ -0,0 +1,18 @@
+class Land_Bilboard_Base: House
+{
+	void Land_Bilboard_Base()
+	{
+		#ifndef SERVER
+		if (g_Game.GetBillboardHandler())
+		{
+			string texture = g_Game.GetBillboardHandler().GetTextureByType(GetType());
+			if (texture)
+			{
+				int index = GetHiddenSelectionIndex("advert");
+				if (index != -1)
+					SetObjectTexture(index, texture);	
+			}
+		}
+		#endif
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Specific/AnniversaryMusicSource.c b/scripts/4_World/DayZ/Entities/Building/Specific/AnniversaryMusicSource.c
new file mode 100644
index 0000000000000000000000000000000000000000..5580aac9e913ab3dad98646851e886dcde099a59
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Specific/AnniversaryMusicSource.c
@@ -0,0 +1,125 @@
+enum EAnniversaryMusicStates
+{
+	INVALID,
+	LIGHT,
+	INTENSE
+}
+
+class AnniversaryMusicSource : Building
+{
+	private const string SOUND_INTENSE 	= "AnniversaryMusic_Intense_SoundSet";
+	private const string SOUND_LIGHT 	= "AnniversaryMusic_Light_SoundSet";
+
+	#ifndef SERVER
+	protected EffectSound m_LightAmbientSound;
+	protected EffectSound m_IntenseAmbientSound;
+	#endif
+		
+	protected int m_MusicState;
+	protected int m_MusicStateLocal;
+	
+	void AnniversaryMusicSource()
+	{
+		m_MusicState 		= EAnniversaryMusicStates.INVALID;
+		m_MusicStateLocal 	= EAnniversaryMusicStates.INVALID;
+		
+		RegisterNetSyncVariableInt("m_MusicState", 0, EnumTools.GetEnumSize(EAnniversaryMusicStates));
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		#ifndef SERVER
+		if (m_LightAmbientSound)
+			SEffectManager.DestroyEffect(m_LightAmbientSound);
+		
+		if (m_IntenseAmbientSound)
+			SEffectManager.DestroyEffect(m_IntenseAmbientSound);
+		#endif
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if (m_MusicState != m_MusicStateLocal)
+		{
+			m_MusicStateLocal = m_MusicState;
+			#ifndef SERVER
+			UpdateMusic();
+			#endif
+		}
+	}
+	
+	void UpdateMusic()
+	{
+		#ifndef SERVER
+		if (!m_IntenseAmbientSound)
+			m_IntenseAmbientSound = SEffectManager.CreateSound(SOUND_INTENSE, GetPosition(), 0.5, 0.5, false);
+		
+		if (!m_LightAmbientSound)
+			m_LightAmbientSound = SEffectManager.CreateSound(SOUND_LIGHT, GetPosition(), 0.5, 0.5, true);
+		#endif
+
+		switch (m_MusicState)
+		{
+			case EAnniversaryMusicStates.LIGHT:
+				PlayLight();
+				break;
+			
+			case EAnniversaryMusicStates.INTENSE:
+				PlayIntense();
+				break;
+			
+			default:
+				StopAllMusic();
+				break;
+		}
+	}
+	
+	//just sync
+	void SetIntenseServer()
+	{
+		m_MusicState = EAnniversaryMusicStates.INTENSE;
+		SetSynchDirty();
+	}
+	
+	//just sync
+	void SetLightServer()
+	{
+		m_MusicState = EAnniversaryMusicStates.LIGHT;
+		SetSynchDirty();
+	}
+	
+	//just sync
+	void SetInvalidServer()
+	{
+		m_MusicState = EAnniversaryMusicStates.INVALID;
+		SetSynchDirty();
+	}
+	
+	void PlayIntense()
+	{
+		#ifndef SERVER
+		m_LightAmbientSound.SoundStop();
+		m_IntenseAmbientSound.SoundPlay();
+		#endif
+	}
+	
+	void PlayLight()
+	{
+		#ifndef SERVER
+		m_IntenseAmbientSound.SoundStop();
+		m_LightAmbientSound.SoundPlay();
+		#endif
+	}
+	
+	void StopAllMusic()
+	{
+		#ifndef SERVER
+		m_IntenseAmbientSound.SoundStop();
+		m_LightAmbientSound.SoundStop();
+		#endif
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/Specific/AnniversarySpotLight.c b/scripts/4_World/DayZ/Entities/Building/Specific/AnniversarySpotLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd7a6fface6bd572241799c7aab07d13a667232c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Specific/AnniversarySpotLight.c
@@ -0,0 +1,52 @@
+class AnniversarySpotLight : Building
+{
+	#ifndef SERVER
+	protected AnniversaryMainLight m_Light;	
+	#endif
+
+	protected bool m_LightState;
+	
+	void AnniversarySpotLight()
+	{
+		RegisterNetSyncVariableBool("m_LightState");
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+
+		#ifndef SERVER
+		if (m_LightState)
+		{
+			m_Light = AnniversaryMainLight.Cast(ScriptedLightBase.CreateLight(AnniversaryMainLight, GetPosition()));
+		}
+		else
+		{
+			if (m_Light)
+				m_Light.FadeOut(0.5);
+		}
+		#endif
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		#ifndef SERVER
+		if (m_Light)
+			m_Light.Destroy();
+		#endif
+	}
+	
+	void DeActivate()
+	{
+		m_LightState = false;
+		SetSynchDirty();
+	}
+	
+	void Activate()
+	{
+		m_LightState = true;
+		SetSynchDirty();		
+	}		
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Specific/Bonfire.c b/scripts/4_World/DayZ/Entities/Building/Specific/Bonfire.c
new file mode 100644
index 0000000000000000000000000000000000000000..de402be33372147c9fbfc9b0b2554ba560b16064
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Specific/Bonfire.c
@@ -0,0 +1,112 @@
+class Bonfire extends BuildingSuper
+{
+	const float TIMER_HEATING_UPDATE_INTERVAL		= 2;
+	const float PARAM_HEAT_RADIUS					= 15;
+	const float PARAM_FULL_HEAT_RADIUS				= 5;
+	const float	PARAM_MAX_TRANSFERED_TEMPERATURE	= 25;		//! maximum value for temperature that will be transfered to player (environment)
+	const float CONST_FIRE_TEMP						= 1000;
+
+	protected BonfireLight		m_Light;
+	protected Particle 			m_ParticleFire;
+	protected Particle 			m_ParticleSmoke;
+	protected EffectSound 		m_SoundFireLoop;
+	
+	//Heating related variables
+	protected ref Timer m_BonfireHeatingTimer;					//! DEPRECATED
+	
+	// UniversalTemperatureSource
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaConstant m_UTSLBonfire;
+	
+	override void EEInit()
+	{
+		super.EEInit();
+		
+		#ifndef SERVER
+		// object creation - create effects (light, particles, sound)
+		
+		// light
+		if (!m_Light)
+		{
+			m_Light = BonfireLight.Cast(ScriptedLightBase.CreateLight(BonfireLight, Vector(0,0,0), 1));
+			m_Light.AttachOnMemoryPoint(this, m_Light.m_MemoryPoint);
+			m_Light.FadeBrightnessTo(m_Light.m_FireBrightness, 0);
+			m_Light.FadeRadiusTo(m_Light.m_FireRadius, 0);
+		}
+		
+		// particles
+		if (!m_ParticleSmoke)
+		{
+			m_ParticleSmoke = ParticleManager.GetInstance().PlayOnObject(ParticleList.BONFIRE_SMOKE, this, GetMemoryPointPos("bonfire_smoke"), Vector(0,0,0), true);
+		}
+
+		if (!m_ParticleFire)
+		{
+			m_ParticleFire = ParticleManager.GetInstance().PlayOnObject(ParticleList.BONFIRE_FIRE, this, GetMemoryPointPos("bonfire_fire"), Vector(0,0,0), true);
+		}
+		
+		// sounds
+		if (!m_SoundFireLoop)
+		{
+			PlaySoundSetLoop(m_SoundFireLoop, "HeavyFire_SoundSet", 1.0, 2.0);
+		}
+		#endif
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_UpdateInterval	= TIMER_HEATING_UPDATE_INTERVAL;
+			m_UTSSettings.m_Updateable		= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= CONST_FIRE_TEMP;
+			m_UTSSettings.m_TemperatureCap	= PARAM_MAX_TRANSFERED_TEMPERATURE;
+			m_UTSSettings.m_RangeFull		= PARAM_FULL_HEAT_RADIUS;
+			m_UTSSettings.m_RangeMax		= PARAM_HEAT_RADIUS;
+			
+			m_UTSLBonfire 					= new UniversalTemperatureSourceLambdaConstant();
+			m_UTSource 						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLBonfire);
+			m_UTSource.SetActive(true);
+		}	
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+
+		#ifndef SERVER
+		// outside of bubble - do effects cleanup (light, particles, sound)
+		
+		// light
+		if (m_Light)
+		{
+			m_Light.FadeOut();
+		}
+		
+		// particles 
+		if (m_ParticleSmoke)
+		{
+			m_ParticleSmoke.Stop();
+		}
+
+		if (m_ParticleFire)
+		{
+			m_ParticleFire.Stop();
+		}
+			
+		// sounds 
+		if (m_SoundFireLoop)
+		{
+			m_SoundFireLoop.SoundStop();
+		}
+		#endif
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetActive(false);
+		}
+	}	
+	
+	//! DEPRECATED
+	protected void BonfireHeating() {};
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Specific/Land_FuelStation_Feed.c b/scripts/4_World/DayZ/Entities/Building/Specific/Land_FuelStation_Feed.c
new file mode 100644
index 0000000000000000000000000000000000000000..7b58e0bacfa35c0bb6fda60478310e4a81e231c5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Specific/Land_FuelStation_Feed.c
@@ -0,0 +1,35 @@
+class Land_FuelStation_Feed extends FuelStation
+{
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+
+	 	Explode(DT_EXPLOSION, "LandFuelFeed_Ammo");
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+		super.OnExplosionEffects(source, directHit, componentIndex, surface, pos, surfNormal, energyFactor, explosionFactor, isWater, ammoType);
+		if ( !GetGame().IsDedicatedServer() )
+		{	
+			vector n = surfNormal.VectorToAngles() + "0 90 0";
+			Particle p1 = ParticleManager.GetInstance().PlayInWorld(ParticleList.SMOKE_GENERIC_WRECK, pos);
+			p1.SetOrientation(n);
+		
+			Particle p2 = ParticleManager.GetInstance().PlayInWorld(ParticleList.EXPLOSION_LANDMINE, pos);
+			p2.SetOrientation(n);
+
+			Particle p3 = ParticleManager.GetInstance().PlayInWorld(ParticleList.IMPACT_METAL_RICOCHET, pos);
+			p3.SetOrientation(n);
+		
+			Particle p4 = ParticleManager.GetInstance().PlayInWorld(ParticleList.IMPACT_GRAVEL_RICOCHET, pos);
+			p4.SetOrientation(n);
+		}
+	}
+	
+	//! Returns true if this stand is functional
+	bool HasFuelToGive()
+	{
+		return !IsRuined();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Entrance.c b/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Entrance.c
new file mode 100644
index 0000000000000000000000000000000000000000..86b7d88d31f9048ebd27c0f988e6d74d52de51c6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Entrance.c
@@ -0,0 +1,585 @@
+enum EUndegroundEntranceState
+{
+	UNINITIALIZED,
+	CLOSED,//fully closed
+	//opening
+	OPENING_A,
+	OPENING_B,
+	OPENING_C,
+	OPENING_D,
+	OPENING_E,//fully open
+	OPENING_F,
+	OPENING_G,
+	//closing
+	CLOSING_A,
+	CLOSING_B,
+	CLOSING_C,
+	CLOSING_D,
+	CLOSING_E,
+	CLOSING_F,
+	CLOSING_G
+}
+
+enum EUndegroundDoorType
+{
+	MAIN,
+	SMALL,
+}
+
+class AlarmLight : SpotlightLight
+{
+	void AlarmLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(15);
+		SetBrightnessTo(10);
+		SetFlareVisible(false);
+		SetAmbientColor(1.0, 0.0, 0.0);
+		SetDiffuseColor(1.0, 0.0, 0.0);
+		SetLifetime(1000);
+		SetDisableShadowsWithinRadius(-1);
+		SetFadeOutTime(1);
+		SetCastShadow(false);
+		m_FadeInTime = 0.25;
+	}
+}
+
+//---------------------------------------------------------------------------------------------------------
+//------------------------------------ Land_Underground_EntranceBase --------------------------------------
+//---------------------------------------------------------------------------------------------------------
+
+class Land_Underground_EntranceBase : House
+{
+	EUndegroundEntranceState m_DoorState 		= EUndegroundEntranceState.CLOSED;
+	EUndegroundEntranceState m_DoorStatePrev 	= EUndegroundEntranceState.UNINITIALIZED;
+	float 									m_AnimPhase;
+	ref AnimationTimer 						m_AnimTimerDoorServer;
+	ref Timer								m_NavmeshTimer;
+	ref array<Land_Underground_Panel> 		m_ConnectedPanels;
+	EUndegroundDoorType						m_DoorType;
+
+	EntranceLight 							m_InteriorLight1;
+	EntranceLight 							m_InteriorLight2;
+	EntranceLight 							m_InteriorLight3;
+	
+	void Land_Underground_EntranceBase()
+	{
+		m_DoorType = EUndegroundDoorType.MAIN;
+		Land_Underground_Panel.RegisterEntrance(this);
+		RegisterNetSyncVariableFloat("m_AnimPhase", 0,1,5);
+		RegisterNetSyncVariableInt("m_DoorState", 0, EnumTools.GetLastEnumValue(EUndegroundEntranceState));
+		
+		#ifndef SERVER
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( CreateLights, 250);
+		#endif
+	}
+	
+	void CreateLights();
+	
+	void ~Land_Underground_EntranceBase()
+	{
+		Land_Underground_Panel.UnregisterEntrance(this);
+		#ifndef SERVER
+		CleanUpOnDeleteClient();
+		#endif
+	}
+	//---------------------
+	
+		
+	void CleanUpOnDeleteClient()
+	{
+		//anything we might have started playing when the door was activated
+		CleanUpOnClosedClient();
+	}
+	
+	
+	void CleanUpOnClosedClient();
+	
+	bool CanManipulate(Param param = null)
+	{
+		return m_DoorState == EUndegroundEntranceState.CLOSED;
+	}
+	
+	void Manipulate(Param param = null)
+	{
+		OpenServer();
+	}
+	
+	void NavmeshUpdate()
+	{
+	}
+	
+	void OnUpdateClient(float timeSlice);
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		#ifndef SERVER
+		OnUpdateClient(timeSlice);
+		#endif
+	}
+	
+	void OnUpdateServer()
+	{
+		m_AnimPhase = m_AnimTimerDoorServer.GetValue() / AdjustTime(GetOpeningTime());// make 0..1
+		SetAnimationPhaseNow("EntranceDoor",m_AnimPhase);
+
+		GetGame().GetWorld().UpdatePathgraphDoorByAnimationSourceName(this, "EntranceDoor");
+
+		SetSynchDirty();
+	}
+	
+	void GetConnectedPanels(array<Land_Underground_Panel> panels)
+	{
+		if (!Land_Underground_Panel.m_Panels)
+		{
+			return;
+		}
+		foreach (Land_Underground_Panel p:Land_Underground_Panel.m_Panels)
+		{
+			if (p.GetClosestDoor() == this)
+			{
+				panels.Insert(p);
+			}
+		}
+	}
+	
+	// checks whether we want to play this effect even when we are at a different(more advanced) state, as this effect is supposed to be playing over multiple states and was supposed to start during some earlier state switch
+	// param 'state' is the state this effect is supposed to be played in, and 'lastValidState' is the latests state where we still want to play this effect provided previous state for the client is UNINITIALIZED
+	// meaning the client just connected in/the item entered their multiplayer bubble
+	bool CheckShouldPlayPersistent(EUndegroundEntranceState state, EUndegroundEntranceState lastValidState)
+	{
+		return m_DoorState == state || ( IsInitDoorStateSync() && m_DoorState > state && m_DoorState <= lastValidState);
+	}
+	
+	float AdjustTime(float originalTime, float adjustedTime = -1)
+	{
+		#ifdef DIAG_DEVELOPER
+		float timeAccel = 1;
+		
+		if (adjustedTime != -1)
+		{
+			return adjustedTime;
+		}
+		if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.UNDERGROUND_ENTRANCE))
+		{
+			timeAccel = FeatureTimeAccel.GetFeatureTimeAccelValue();
+			return originalTime / timeAccel;
+		}
+		#endif
+		return originalTime;
+	}
+	
+	float GetOpeningTime()
+	{
+		return 30;
+	}
+	
+	void RequestLatentTransition(float time, EUndegroundEntranceState targetState = EUndegroundEntranceState.UNINITIALIZED)
+	{
+		if (targetState == EUndegroundEntranceState.UNINITIALIZED)
+		{
+			targetState = m_DoorState + 1;
+		}
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( SetDoorStateServer, time * 1000, false, targetState);
+	}
+	
+	void SetDoorStateServer(EUndegroundEntranceState newState)
+	{
+		m_DoorState = newState;
+		OnDoorStateChangedServer(newState);
+		SetSynchDirty();
+	}
+	
+	void OnDoorStateChangedServer(EUndegroundEntranceState newState);
+	
+	void OnDoorStateChangedClient(EUndegroundEntranceState newState, EUndegroundEntranceState prevState)
+	{
+		if (newState > EUndegroundEntranceState.CLOSED)
+		{
+			SetEventMask(EntityEvent.POSTSIMULATE);
+		}
+		else
+		{
+			ClearEventMask(EntityEvent.POSTSIMULATE);
+			CleanUpOnClosedClient();
+		}
+		
+		HandleAudioPlayback(newState, prevState);
+		HandleVisualPlayback(newState, prevState);
+		
+		if (!m_ConnectedPanels)
+		{
+			m_ConnectedPanels = new array<Land_Underground_Panel>();
+			GetConnectedPanels(m_ConnectedPanels);
+		}
+		foreach (Land_Underground_Panel p:m_ConnectedPanels)
+		{
+			p.OnDoorStateChangedClient(newState, prevState);
+		}
+	}
+	
+	void OpenServer(bool force = false)
+	{
+		GetGame().RegisterNetworkStaticObject(this);
+		if (m_DoorState == EUndegroundEntranceState.CLOSED || force)
+		{
+			SetDoorStateServer(EUndegroundEntranceState.OPENING_A);
+		}
+	}
+	
+	void HandleVisualPlayback(EUndegroundEntranceState newState, EUndegroundEntranceState prevState);
+	void HandleAudioPlayback(EUndegroundEntranceState newState, EUndegroundEntranceState prevState);
+	
+	void OnFinishedTimerServer();
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if (m_DoorState != m_DoorStatePrev)
+		{
+			OnDoorStateChangedClient(m_DoorState, m_DoorStatePrev);
+			m_DoorStatePrev = m_DoorState;
+		}
+	}
+	
+	bool IsInitDoorStateSync()
+	{
+		return m_DoorStatePrev == EUndegroundEntranceState.UNINITIALIZED;
+	}
+	
+	
+	#ifdef DEVELOPER
+	override string GetDebugText()
+	{
+		string debug_output;
+		
+		if (GetGame().IsDedicatedServer())
+		{
+			debug_output +=  "current state: " +  typename.EnumToString(EUndegroundEntranceState, m_DoorState) + "\n";
+			/*
+			if(GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ))
+				debug_output +=  "next stage timer: " + GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).GetRemainingTimeByName(this, "SetDoorStateServer").ToString();
+			*/
+		}
+		else
+		{
+			debug_output +=  "current state: " +  typename.EnumToString(EUndegroundEntranceState, m_DoorState) + "\n";
+		}
+		return debug_output;
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ACTIVATE_ENTITY, "Open", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DEACTIVATE_ENTITY, "Close", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.ACTIVATE_ENTITY)
+			{
+				if (m_DoorState == EUndegroundEntranceState.CLOSED)
+					OpenServer(true);
+			}
+			else if (action_id == EActions.DEACTIVATE_ENTITY)
+			{
+				// just for debug controls
+				if (!m_AnimTimerDoorServer)
+					m_AnimTimerDoorServer = new AnimationTimer();
+		
+				if (m_DoorState == EUndegroundEntranceState.OPENING_G)
+				{
+					GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).Remove(SetDoorStateServer);
+					SetDoorStateServer(EUndegroundEntranceState.CLOSING_A);
+				}
+			}
+		}
+		return false;
+	}
+	#endif
+}
+
+
+//---------------------------------------------------------------------------------------------------------
+//-------------------------------------- Land_Underground_Entrance ----------------------------------------
+//---------------------------------------------------------------------------------------------------------
+
+class Land_Underground_Entrance : Land_Underground_EntranceBase
+{
+	EffectSound 		m_SirenSound;
+	EffectSound 		m_DoorEngineSoundIn;
+	EffectSound 		m_DoorEngineSoundLoop;
+	EffectSound 		m_DoorEngineSoundOut;
+	EffectSound 		m_LockingSound;
+	EffectSound 		m_DoorMovementSoundIn;
+	EffectSound 		m_DoorMovementSoundLoop;
+	EffectSound 		m_DoorMovementSoundOut;
+
+	
+	AlarmLight			m_AlarmLight;
+	
+	const string SIREN_SOUNDSET 					= "UndergroundDoor_Alarm_Loop_SoundSet";
+	const string ENGINE_SOUNDSET_LOOP_IN			= "UndergroundDoor_ElectricMotor_Start_SoundSet";
+	const string ENGINE_SOUNDSET_LOOP				= "UndergroundDoor_ElectricMotor_Loop_SoundSet";
+	const string ENGINE_SOUNDSET_LOOP_OUT			= "UndergroundDoor_ElectricMotor_End_SoundSet";
+	const string LOCKING_SOUNDSET 					= "UndergroundDoor_Lock_SoundSet";
+	const string DOORMOVING_SOUNDSET_LOOP 			= "UndergroundDoor_DoorOpen_Loop_SoundSet";
+	const string DOORMOVING_SOUNDSET_LOOP_OUT 		= "UndergroundDoor_DoorOpen_End_SoundSet";
+	const string DOORMOVING_SOUNDSET_LOOP_IN 		= "UndergroundDoor_DoorOpen_Start_SoundSet";
+	
+	const float LIGHT_ROT_SPEED = -400;
+	
+	override void CreateLights()
+	{
+		m_InteriorLight1 = EntranceLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(EntranceLightMain1, this, "InteriorLightPos1"));
+		m_InteriorLight2 = EntranceLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(EntranceLightMain2, this, "InteriorLightPos2"));
+	}
+	
+	override void CleanUpOnClosedClient()
+	{
+		SEffectManager.DestroySound(m_SirenSound);
+		SEffectManager.DestroySound(m_LockingSound);
+		SEffectManager.DestroySound(m_DoorMovementSoundIn);
+		SEffectManager.DestroySound(m_DoorMovementSoundOut);
+		SEffectManager.DestroySound(m_DoorMovementSoundLoop);
+		SEffectManager.DestroySound(m_DoorEngineSoundIn);
+		SEffectManager.DestroySound(m_DoorEngineSoundOut);
+		SEffectManager.DestroySound(m_DoorEngineSoundLoop);
+		
+		if (m_AlarmLight && GetGame())
+		{
+			m_AlarmLight.Destroy();
+		}
+	}
+	
+	override void OnDoorStateChangedServer(EUndegroundEntranceState newState)
+	{
+		switch (newState)
+		{
+			case EUndegroundEntranceState.OPENING_A:
+				RequestLatentTransition(AdjustTime(3));
+			break;
+			case EUndegroundEntranceState.OPENING_B:
+				RequestLatentTransition(AdjustTime(2));
+			break;
+			case EUndegroundEntranceState.OPENING_C:
+				RequestLatentTransition(AdjustTime(1));
+			break;
+			case EUndegroundEntranceState.OPENING_D:
+				m_AnimTimerDoorServer = new AnimationTimer();
+				m_AnimTimerDoorServer.Run(AdjustTime(GetOpeningTime()), this, "OnUpdateServer", "OnFinishedTimerServer",0, false,/*1/ AdjustTime(1)*/ 1);
+				m_NavmeshTimer = new Timer();
+				m_NavmeshTimer.Run(3, this, "NavmeshUpdate", NULL, true);
+				RequestLatentTransition(AdjustTime(GetOpeningTime()));
+			break;
+			case EUndegroundEntranceState.OPENING_E:
+				m_AnimTimerDoorServer.Stop();
+				NavmeshUpdate();
+				m_NavmeshTimer = null;
+				RequestLatentTransition(AdjustTime(3));
+			break;
+			case EUndegroundEntranceState.OPENING_F:
+				RequestLatentTransition(AdjustTime(3));
+			break;		
+			case EUndegroundEntranceState.OPENING_G:
+				RequestLatentTransition(AdjustTime(300));
+			break;
+			case EUndegroundEntranceState.CLOSING_A:
+				RequestLatentTransition(AdjustTime(3));
+			break;
+			case EUndegroundEntranceState.CLOSING_B:
+				RequestLatentTransition(AdjustTime(3));
+			break;
+			case EUndegroundEntranceState.CLOSING_C:
+				m_NavmeshTimer = new Timer();
+				m_NavmeshTimer.Run(3, this, "NavmeshUpdate", NULL, true);
+				m_AnimTimerDoorServer.Run(0, this, "OnUpdateServer", "OnFinishedTimerServer", AdjustTime(GetOpeningTime()),false, /*1/ AdjustTime(1)*/ 1);
+				RequestLatentTransition(AdjustTime(GetOpeningTime()));
+			break;
+			case EUndegroundEntranceState.CLOSING_D:
+				NavmeshUpdate();
+				m_NavmeshTimer = null;
+				RequestLatentTransition(AdjustTime(2));
+			break;
+			case EUndegroundEntranceState.CLOSING_E:
+				RequestLatentTransition(AdjustTime(1));
+			break;
+			case EUndegroundEntranceState.CLOSING_F:
+				RequestLatentTransition(AdjustTime(3));
+			break;
+			case EUndegroundEntranceState.CLOSING_G:
+				RequestLatentTransition(0.25, EUndegroundEntranceState.CLOSED);
+			break;
+		}
+	}
+
+	vector GetLightPosition()
+	{
+		vector pos;
+		if (MemoryPointExists("SirenLightPos"))
+		{
+			pos = GetMemoryPointPos("SirenLightPos");
+			pos = ModelToWorld(pos);
+		}
+		else
+		{
+			ErrorEx("GetLightPosition could not locate memory point 'SirenLightPos'");
+		}
+		return pos;
+	}
+	
+	void SoundEnded(Effect eff)
+	{
+		if (eff == m_DoorMovementSoundIn)
+		{
+			PlaySoundSetAtMemoryPointLooped(m_DoorMovementSoundLoop, DOORMOVING_SOUNDSET_LOOP, "DoorEngineSoundPos");
+			m_DoorMovementSoundIn = null;
+		}
+		else if (eff == m_DoorEngineSoundIn)
+		{
+			PlaySoundSetAtMemoryPointLooped(m_DoorEngineSoundLoop, ENGINE_SOUNDSET_LOOP, "DoorEngineSoundPos");
+			m_DoorEngineSoundIn = null;
+		}
+	}
+
+	//do note that one-time effects are played even if the client connects and misses the state switch, ie. they are not connected the exact moment when the effect is supposed to be played(just after a state switch), but connect sometime later
+	//we can prevent such effects from playing by checking for IsInitDoorStateSync(), but that seems unnecessary as the issue is really small
+	override void HandleAudioPlayback(EUndegroundEntranceState newState, EUndegroundEntranceState prevState)
+	{
+		//Print("HandleAudioVisualPlayback " + newState + ", " + prevState);
+		//opening
+		if ( CheckShouldPlayPersistent(EUndegroundEntranceState.OPENING_A, EUndegroundEntranceState.OPENING_F))
+		{
+			PlaySoundSetAtMemoryPointLooped(m_SirenSound, SIREN_SOUNDSET, "SirenSoundPos",0.5,0.5);
+		}
+		if (newState == EUndegroundEntranceState.OPENING_B)
+		{
+			if (prevState == EUndegroundEntranceState.OPENING_A)//if they connected already during B, do not play the in
+			{
+				PlaySoundSetAtMemoryPoint(m_DoorEngineSoundIn, ENGINE_SOUNDSET_LOOP_IN, "DoorEngineSoundPos");
+				if (m_DoorEngineSoundIn)
+					m_DoorEngineSoundIn.Event_OnEffectEnded.Insert(SoundEnded);
+			}
+		}
+		
+		if (CheckShouldPlayPersistent(EUndegroundEntranceState.OPENING_B, EUndegroundEntranceState.OPENING_E))
+		{
+			if (!m_DoorEngineSoundLoop && !m_DoorEngineSoundIn)//missed playing of the IN soundset which automatically triggers playing of the loop(connected after ?)
+			{
+				PlaySoundSetAtMemoryPointLooped(m_DoorEngineSoundLoop, ENGINE_SOUNDSET_LOOP, "DoorEngineSoundPos");
+			}
+		}
+		if (newState == EUndegroundEntranceState.OPENING_C)
+		{
+			PlaySoundSetAtMemoryPoint(m_LockingSound, LOCKING_SOUNDSET, "DoorEngineSoundPos");
+		}
+		if (newState == EUndegroundEntranceState.OPENING_D)
+		{
+			if (prevState == EUndegroundEntranceState.OPENING_C)//if they connected already during C, do not play the in
+			{
+				PlaySoundSetAtMemoryPoint(m_DoorMovementSoundIn, DOORMOVING_SOUNDSET_LOOP_IN, "DoorEngineSoundPos");
+				if (m_DoorMovementSoundIn)
+					m_DoorMovementSoundIn.Event_OnEffectEnded.Insert(SoundEnded);
+			}
+			else if (!m_DoorMovementSoundIn && !m_DoorMovementSoundLoop)//missed playing of the IN soundset which automatically triggers playing of the loop(connected after ?)
+			{
+				PlaySoundSetAtMemoryPointLooped(m_DoorMovementSoundLoop, DOORMOVING_SOUNDSET_LOOP, "DoorEngineSoundPos");
+			}
+		}
+		
+		if (newState == EUndegroundEntranceState.OPENING_E)
+		{
+			StopSoundSet(m_DoorMovementSoundLoop);
+			PlaySoundSetAtMemoryPoint(m_DoorMovementSoundOut, DOORMOVING_SOUNDSET_LOOP_OUT, "DoorEngineSoundPos");
+		}
+		if (newState == EUndegroundEntranceState.OPENING_F)
+		{
+			StopSoundSet(m_DoorEngineSoundLoop);
+			PlaySoundSetAtMemoryPoint(m_DoorEngineSoundOut, ENGINE_SOUNDSET_LOOP_OUT, "DoorEngineSoundPos");
+		}
+		if (newState == EUndegroundEntranceState.OPENING_G)
+		{
+			StopSoundSet(m_SirenSound);
+		}
+		
+		//closing
+		if (CheckShouldPlayPersistent(EUndegroundEntranceState.CLOSING_A, EUndegroundEntranceState.CLOSING_F))
+		{
+			PlaySoundSetAtMemoryPointLooped(m_SirenSound, SIREN_SOUNDSET, "SirenSoundPos",0.5,0.5);
+		}
+		if (CheckShouldPlayPersistent(EUndegroundEntranceState.CLOSING_B, EUndegroundEntranceState.CLOSING_E))
+		{
+			if (prevState == EUndegroundEntranceState.CLOSING_A)//if they connected already during B, do not play the in
+			{
+				PlaySoundSetAtMemoryPoint(m_DoorEngineSoundIn, ENGINE_SOUNDSET_LOOP_IN, "DoorEngineSoundPos");
+				if (m_DoorEngineSoundIn)
+					m_DoorEngineSoundIn.Event_OnEffectEnded.Insert(SoundEnded);
+			}
+		}		
+		if ( newState == EUndegroundEntranceState.CLOSING_C)
+		{
+			if (prevState == EUndegroundEntranceState.CLOSING_B)//if they connected already during C, do not play the in
+			{
+				PlaySoundSetAtMemoryPoint(m_DoorMovementSoundIn, DOORMOVING_SOUNDSET_LOOP_IN, "DoorEngineSoundPos");
+				if (m_DoorMovementSoundIn)
+					m_DoorMovementSoundIn.Event_OnEffectEnded.Insert(SoundEnded);
+			}
+			else if (!m_DoorMovementSoundIn && !m_DoorMovementSoundLoop)//missed playing of the IN soundset which automatically triggers playing of the loop(connected after ?)
+			{
+				PlaySoundSetAtMemoryPointLooped(m_DoorMovementSoundLoop, DOORMOVING_SOUNDSET_LOOP, "DoorEngineSoundPos");
+			}
+		}
+		if (newState == EUndegroundEntranceState.CLOSING_D)
+		{
+			StopSoundSet(m_DoorMovementSoundLoop);
+			PlaySoundSetAtMemoryPoint(m_DoorMovementSoundOut, DOORMOVING_SOUNDSET_LOOP_OUT, "DoorEngineSoundPos");
+		}
+		if (newState == EUndegroundEntranceState.CLOSING_E)
+		{
+			PlaySoundSetAtMemoryPoint(m_LockingSound, LOCKING_SOUNDSET, "DoorEngineSoundPos");
+		}
+		if (newState == EUndegroundEntranceState.CLOSING_F)
+		{
+			StopSoundSet(m_DoorEngineSoundLoop);
+			PlaySoundSetAtMemoryPoint(m_DoorEngineSoundOut, ENGINE_SOUNDSET_LOOP_OUT, "DoorEngineSoundPos");
+		}
+		if (newState == EUndegroundEntranceState.CLOSING_G || newState == EUndegroundEntranceState.CLOSED)
+		{
+			StopSoundSet(m_SirenSound);
+		}
+	}
+	
+	override void OnUpdateClient(float timeSlice)
+	{
+		SetAnimationPhaseNow("EntranceDoor",m_AnimPhase);
+		if (m_AlarmLight)
+		{
+			vector newOri = m_AlarmLight.GetOrientation() + Vector(timeSlice * LIGHT_ROT_SPEED,0,0);
+			m_AlarmLight.SetOrientation(newOri);
+		}
+	}
+
+	override void HandleVisualPlayback(EUndegroundEntranceState newState, EUndegroundEntranceState prevState)
+	{
+		if ( CheckShouldPlayPersistent(EUndegroundEntranceState.OPENING_A, EUndegroundEntranceState.OPENING_F) || CheckShouldPlayPersistent(EUndegroundEntranceState.CLOSING_A, EUndegroundEntranceState.CLOSING_F))
+		{
+			m_AlarmLight = AlarmLight.Cast( ScriptedLightBase.CreateLight( AlarmLight, GetLightPosition()) );
+		}
+		if ( newState == EUndegroundEntranceState.CLOSING_G || newState == EUndegroundEntranceState.CLOSED || newState == EUndegroundEntranceState.OPENING_G )
+		{
+			if (m_AlarmLight)
+			{
+				m_AlarmLight.Destroy();
+			}
+		}
+	}
+	
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Panel.c b/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Panel.c
new file mode 100644
index 0000000000000000000000000000000000000000..a98ba95a1e8ef89434f45df92b8ea4ad5a007077
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Panel.c
@@ -0,0 +1,361 @@
+enum ELEDState
+{
+	OFF,
+	BLINKING,
+	ON,
+}
+
+enum ELEDColors
+{
+	RED,
+	GREEN,
+}
+
+class Land_Underground_Panel: House
+{
+	static ref set<Land_Underground_EntranceBase> 		m_Entrances;
+	static ref set<Land_Underground_Panel>				m_Panels;
+	
+	Land_Underground_EntranceBase m_LinkedDoor;
+	
+	const string COLOR_LED_OFF 		= "#(argb,8,8,3)color(0,0,0,1.0,co)";
+	const string COLOR_LED_GREEN	= "#(argb,8,8,3)color(0,1,0,1.0,co)";
+	const string COLOR_LED_RED 		= "#(argb,8,8,3)color(1,0,0,1.0,co)";
+	
+	const string SELECTION_NAME_LED_RED		= "LED_Red";
+	const string SELECTION_NAME_LED_GREEN	= "LED_Green";
+	
+	bool m_PanelWasUsed
+	bool m_PanelWasUsedPrev;
+	bool m_BlinkingFlipFlop;
+	ref Timer m_FlipFlopTimer;
+	
+	EffectSound 		m_ActivationSound;
+	
+	ELEDState m_LedStateRed;
+	ELEDState m_LedStateGreen;
+	
+	void Land_Underground_Panel()
+	{
+		RegisterNetSyncVariableBool("m_PanelWasUsed");
+		RegisterPanel(this);
+		SetLEDState(ELEDColors.RED, ELEDState.ON);
+		SetLEDState(ELEDColors.GREEN, ELEDState.OFF);
+	}
+	
+	void ~Land_Underground_Panel()
+	{
+		UnregisterPanel(this);
+	}
+	
+	bool CanInteract()
+	{
+		Land_Underground_EntranceBase door = GetLinkedDoor();
+		if (door)
+		{
+			return Land_Underground_EntranceBase.Cast(door).CanManipulate();
+		}
+		return false;
+	}
+	
+	void Interact()
+	{
+		Land_Underground_EntranceBase door = GetLinkedDoor();
+		if (door)
+		{
+			GetGame().RegisterNetworkStaticObject(this);
+			Land_Underground_EntranceBase.Cast(door).Manipulate();
+			GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( ResetPanelUsed, 500);
+			m_PanelWasUsed = true;
+			SetSynchDirty();
+		}
+		else
+		{
+			ErrorEx("Can't find the instance of entrance the panel is linkined to");
+		}
+	}
+	
+	static void RegisterEntrance(Land_Underground_EntranceBase entrance)
+	{
+		if (!m_Entrances)
+		{
+			m_Entrances = new set<Land_Underground_EntranceBase>();
+		}
+		m_Entrances.Insert(entrance);
+	}
+	
+	static void UnregisterEntrance(Land_Underground_EntranceBase entrance)
+	{
+		if (m_Entrances)
+		{
+			int index = m_Entrances.Find(entrance);
+			if (index != -1)
+			{
+				m_Entrances.Remove(index);
+			}
+			else
+			{
+				ErrorEx("Attempted to unregistered non-registered entrance");
+			}
+		}
+	}
+	
+	static void RegisterPanel(Land_Underground_Panel panel)
+	{
+		if (!m_Panels)
+		{
+			m_Panels = new set<Land_Underground_Panel>;
+		}
+		m_Panels.Insert(panel);
+	}
+	
+	static void UnregisterPanel(Land_Underground_Panel panel)
+	{
+		if (m_Panels)
+		{
+			int index = m_Panels.Find(panel);
+			if (index != -1)
+			{
+				m_Panels.Remove(index);
+			}
+			else
+			{
+				ErrorEx("Attempted to unregistered non-registered panel");
+			}
+		}
+	}
+
+	EUndegroundDoorType GetLinkedDoorType()
+	{
+		return GetLinkedDoor().m_DoorType;
+	}
+	
+	Land_Underground_EntranceBase GetLinkedDoor()
+	{
+		if (!m_LinkedDoor)
+			m_LinkedDoor = GetClosestDoor();
+		return m_LinkedDoor;
+	}
+	
+	Land_Underground_EntranceBase GetClosestDoor()
+	{
+		if (!m_Entrances)
+		{
+			return null;
+		}
+		
+		float closestDst = float.MAX;
+		Land_Underground_EntranceBase closestObj;
+		vector thisPos = GetPosition();
+		
+		foreach (Land_Underground_EntranceBase obj: m_Entrances)
+		{
+			float dist = vector.DistanceSq(thisPos, obj.GetPosition());
+			if (dist < closestDst)
+			{
+				closestDst = dist;
+				closestObj = obj;
+			}
+		}
+		
+		return closestObj;
+	}
+	
+	void SetLEDState(ELEDColors color, ELEDState state)
+	{
+		#ifndef SERVER
+		if (color == ELEDColors.RED)
+		{
+			if (m_LedStateRed != state)
+			{
+				m_LedStateRed = state;
+				OnLEDStateChanged();
+			}
+		}
+		else
+		{
+			if (m_LedStateGreen != state)
+			{
+				m_LedStateGreen = state;
+				OnLEDStateChanged();
+			}
+		}
+		#endif
+	}
+	
+	void SetBlinkingTimer(bool enable)
+	{
+		if (enable)
+		{
+			if (!m_FlipFlopTimer)
+			{
+				m_FlipFlopTimer = new Timer();
+				m_FlipFlopTimer.Run(0.1, this, "ToggleFlipFlop", NULL, true);
+			}
+		}
+		else
+		{
+			if (m_FlipFlopTimer)
+			{
+				m_FlipFlopTimer = null;
+			}
+		}
+	}
+	
+	void OnLEDStateChanged()
+	{
+		/*
+		Print("OnLEDStateChanged()");
+		Print("m_LedStateRed: " + m_LedStateRed);
+		Print("m_LedStateGreen: " + m_LedStateGreen);
+		*/
+		if (m_LedStateRed == ELEDState.BLINKING || m_LedStateGreen == ELEDState.BLINKING)
+		{
+			SetBlinkingTimer(true);
+		}
+		else
+		{
+			SetBlinkingTimer(false);
+		}
+		//red
+		if (m_LedStateRed == ELEDState.ON)
+		{
+			UpdateLED(SELECTION_NAME_LED_RED, COLOR_LED_RED);
+		}
+		else if (m_LedStateRed == ELEDState.OFF)
+		{
+			UpdateLED(SELECTION_NAME_LED_RED, COLOR_LED_OFF);
+		}
+		else if (m_LedStateRed == ELEDState.BLINKING)
+		{
+			if (m_BlinkingFlipFlop)
+			{
+				UpdateLED(SELECTION_NAME_LED_RED, COLOR_LED_RED);
+			}
+			else
+			{
+				UpdateLED(SELECTION_NAME_LED_RED, COLOR_LED_OFF);
+			}
+			
+		//green
+		}
+		if (m_LedStateGreen == ELEDState.ON)
+		{
+			UpdateLED(SELECTION_NAME_LED_GREEN, COLOR_LED_GREEN);
+		}
+		else if (m_LedStateGreen == ELEDState.OFF)
+		{
+			UpdateLED(SELECTION_NAME_LED_GREEN, COLOR_LED_OFF);
+		}
+		else if (m_LedStateGreen == ELEDState.BLINKING)
+		{
+			if(m_BlinkingFlipFlop)
+			{
+				UpdateLED(SELECTION_NAME_LED_GREEN, COLOR_LED_GREEN);
+			}
+			else
+			{
+				UpdateLED(SELECTION_NAME_LED_GREEN, COLOR_LED_OFF);
+			}
+			
+		}
+	}
+	
+	void ResetPanelUsed()
+	{
+		m_PanelWasUsed = false;
+		SetSynchDirty();
+	}
+	
+	void OnDoorStateChangedClient(EUndegroundEntranceState newState, EUndegroundEntranceState prevState)
+	{
+		switch (GetLinkedDoorType())
+		{
+			case EUndegroundDoorType.MAIN:
+			{
+				if (newState >= EUndegroundEntranceState.CLOSED && newState < EUndegroundEntranceState.OPENING_G)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.ON);
+				}
+				else if (newState == EUndegroundEntranceState.OPENING_G)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.OFF);
+				}
+				else if (newState >= EUndegroundEntranceState.CLOSING_A)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.BLINKING);
+				}
+				
+				if (newState == EUndegroundEntranceState.CLOSED)
+				{
+					SetLEDState(ELEDColors.GREEN, ELEDState.OFF);
+				}
+				else if (newState >= EUndegroundEntranceState.OPENING_A && newState < EUndegroundEntranceState.OPENING_G)
+				{
+					SetLEDState(ELEDColors.GREEN, ELEDState.BLINKING);
+				}
+				else if (newState >= EUndegroundEntranceState.OPENING_G)
+				{
+					SetLEDState(ELEDColors.GREEN, ELEDState.ON);
+				}
+			}
+			break;
+			case EUndegroundDoorType.SMALL:
+			{
+				if (newState == EUndegroundEntranceState.OPENING_A)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.ON);
+					SetLEDState(ELEDColors.GREEN, ELEDState.BLINKING);
+				}
+				else if (newState == EUndegroundEntranceState.OPENING_B)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.OFF);
+					SetLEDState(ELEDColors.GREEN, ELEDState.ON);
+				}
+				else if (newState == EUndegroundEntranceState.CLOSING_A)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.BLINKING);
+					SetLEDState(ELEDColors.GREEN, ELEDState.ON);
+				}
+				if (newState == EUndegroundEntranceState.CLOSING_B || newState == EUndegroundEntranceState.CLOSED)
+				{
+					SetLEDState(ELEDColors.RED, ELEDState.ON);
+					SetLEDState(ELEDColors.GREEN, ELEDState.OFF);
+				}
+			}
+			break;
+		}
+	}
+	
+	
+	protected void UpdateLED(string selection, string color)
+	{
+		int selectionIdx = GetHiddenSelectionIndex(selection);
+		SetObjectTexture(selectionIdx, color);
+		//Print("selection: " +selection + ", color: " + color +", selectionIdx: "+ selectionIdx);
+	}
+	
+	void ToggleFlipFlop()
+	{
+		m_BlinkingFlipFlop = !m_BlinkingFlipFlop;
+		OnLEDStateChanged();
+	}
+	
+	void OnPanelUsedSynchronized()
+	{
+		PlaySoundSet( m_ActivationSound, "UndergroundDoor_PanelActivation_SoundSet", 0, 0 );
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		if (m_PanelWasUsed != m_PanelWasUsedPrev)
+		{
+			if (m_PanelWasUsed)
+			{
+				OnPanelUsedSynchronized();
+			}
+			m_PanelWasUsedPrev = m_PanelWasUsed;
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Panel_Lever.c b/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Panel_Lever.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c0ffcdb7fea05c228e03ffa59f8e2971917b5b0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Underground/Entrance/Land_Underground_Panel_Lever.c
@@ -0,0 +1,29 @@
+class Land_Underground_Panel_Lever : Land_Underground_Panel
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUseUndergroundLever);
+	}
+
+	void ResetPhase(EntityAI target)
+	{
+		target.SetAnimationPhaseNow("PanelLever", 0);
+	}
+	
+	override void OnPanelUsedSynchronized()
+	{
+		super.OnPanelUsedSynchronized();
+		SetAnimationPhase("PanelLever", 1);
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( ResetPhase, 3000, false, this);
+		OnLEDStateChanged();
+	}
+	
+	override void Interact()
+	{
+		super.Interact();
+		GetGame().RegisterNetworkStaticObject(this);
+		GetGame().RegisterNetworkStaticObject(GetLinkedDoor());
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Building/Underground/Stairs/Land_Underground_Stairs_Exit.c b/scripts/4_World/DayZ/Entities/Building/Underground/Stairs/Land_Underground_Stairs_Exit.c
new file mode 100644
index 0000000000000000000000000000000000000000..38460e81428b369fe45a01ac4ca0d77e50682ae9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Underground/Stairs/Land_Underground_Stairs_Exit.c
@@ -0,0 +1,112 @@
+class Land_Underground_Stairs_Exit : Land_Underground_EntranceBase
+{
+	EffectSound 		m_LockingSound;
+	
+	EffectSound 		m_OpenSoundIn;
+	//EffectSound 		m_OpenSoundLoop;
+	EffectSound 		m_OpenSoundOut;
+
+	EffectSound 		m_CloseSoundIn;
+	EffectSound 		m_CloseSoundLoop;
+	EffectSound 		m_CloseSoundOut;
+
+	const string LOCKING_SOUNDSET 			= "UndergroundDoor_Lock_SoundSet";
+	const string OPENING_SOUNDSET_LOOP_IN 	= "UndergroundSmallExitDoor_Open_Start_SoundSet";
+	const string OPENING_SOUNDSET_LOOP 		= "UndergroundSmallExitDoor_Open_Loop_SoundSet";
+	const string OPENING_SOUNDSET_LOOP_OUT 	= "UndergroundSmallExitDoor_Open_End_SoundSet";
+	
+	const string CLOSING_SOUNDSET_LOOP_IN 	= "UndergroundSmallExitDoor_Close_Start_SoundSet";
+	const string CLOSING_SOUNDSET_LOOP 		= "UndergroundSmallExitDoor_Close_Loop_SoundSet";
+	const string CLOSING_SOUNDSET_LOOP_OUT	= "UndergroundSmallExitDoor_Close_End_SoundSet";
+	
+	void Land_Underground_Stairs_Exit()
+	{
+		m_DoorType = EUndegroundDoorType.SMALL;
+	}
+	
+	override void CleanUpOnClosedClient()
+	{
+		SEffectManager.DestroySound(m_LockingSound);
+		
+		SEffectManager.DestroySound(m_OpenSoundIn);
+		//SEffectManager.DestroySound(m_OpenSoundLoop);
+		SEffectManager.DestroySound(m_OpenSoundOut);
+		
+		SEffectManager.DestroySound(m_CloseSoundIn);
+		SEffectManager.DestroySound(m_CloseSoundLoop);
+		SEffectManager.DestroySound(m_CloseSoundOut);
+
+	}
+	
+	override float GetOpeningTime()
+	{
+		return AdjustTime(3);
+	}
+	
+	override void OnDoorStateChangedServer(EUndegroundEntranceState newState)
+	{
+		switch (newState)
+		{
+			case EUndegroundEntranceState.OPENING_A:
+				RequestLatentTransition(AdjustTime(1));
+				SetAnimationPhase("EntranceDoor",1);
+			break;
+			case EUndegroundEntranceState.OPENING_B:
+				GetGame().UpdatePathgraphRegionByObject(this);
+				RequestLatentTransition(AdjustTime(6), EUndegroundEntranceState.CLOSING_A);
+			break;
+			case EUndegroundEntranceState.CLOSING_A:
+				m_AnimTimerDoorServer = new AnimationTimer();
+				m_AnimTimerDoorServer.Run(0, this, "OnUpdateServer", "OnFinishedTimerServer", GetOpeningTime(), false,1/ AdjustTime(1));
+				RequestLatentTransition(AdjustTime(3));
+			break;
+			case EUndegroundEntranceState.CLOSING_B:
+				RequestLatentTransition(AdjustTime(1), EUndegroundEntranceState.CLOSED);
+				GetGame().UpdatePathgraphRegionByObject(this);	
+			break;
+		}
+	}
+	void SoundEnded(Effect eff)
+	{
+		if (eff == m_CloseSoundIn)
+		{
+			PlaySoundSetLoop( m_CloseSoundLoop, CLOSING_SOUNDSET_LOOP, 0, 0 );
+		}
+	}
+	
+	override void HandleAudioPlayback(EUndegroundEntranceState newState, EUndegroundEntranceState prevState)
+	{
+		if (newState == EUndegroundEntranceState.OPENING_A)
+		{
+			PlaySoundSet( m_LockingSound, LOCKING_SOUNDSET, 0, 0 );
+			PlaySoundSet( m_OpenSoundIn, OPENING_SOUNDSET_LOOP_IN, 0, 0 );
+		}
+		else if (newState == EUndegroundEntranceState.OPENING_B)
+		{
+			if (m_OpenSoundIn)
+				m_OpenSoundIn.Stop();
+			PlaySoundSet( m_OpenSoundOut, OPENING_SOUNDSET_LOOP_OUT, 0, 0 );
+		}
+		else if (newState == EUndegroundEntranceState.CLOSING_A)
+		{
+			PlaySoundSet( m_CloseSoundIn, CLOSING_SOUNDSET_LOOP_IN, 0, 0 );
+			if(m_CloseSoundIn)
+				m_CloseSoundIn.Event_OnEffectEnded.Insert(SoundEnded);
+		}
+		else if (newState == EUndegroundEntranceState.CLOSING_B)
+		{
+			if (m_CloseSoundLoop)
+				m_CloseSoundLoop.Stop();
+			PlaySoundSet( m_CloseSoundOut, CLOSING_SOUNDSET_LOOP_OUT, 0, 0 );
+			PlaySoundSet( m_LockingSound, LOCKING_SOUNDSET, 0, 0 );
+			
+		}
+	}
+	
+	override void CreateLights()
+	{
+		m_InteriorLight1 = EntranceLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(EntranceLightStairs1, this, "Light1"));
+		m_InteriorLight2 = EntranceLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(EntranceLightStairs2, this, "Light2"));
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Underground/Water/Land_Underground_WaterReservoir.c b/scripts/4_World/DayZ/Entities/Building/Underground/Water/Land_Underground_WaterReservoir.c
new file mode 100644
index 0000000000000000000000000000000000000000..7903d18ce8b29caf6b39b15ad730ab9106b28221
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Underground/Water/Land_Underground_WaterReservoir.c
@@ -0,0 +1,1335 @@
+class WaterLevelSettings
+{
+	int WaterLevel;
+	float Duration;
+	
+	void WaterLevelSettings(int pWaterLevel, float pDuration)
+	{
+		WaterLevel 	= pWaterLevel;
+		Duration	= pDuration;
+	}
+}
+
+class PressureLevelSettings
+{
+	int PressureLevel;
+	float Duration;
+	
+	void PressureLevelSettings(int pPressureLevel, float pDuration)
+	{
+		PressureLevel 	= pPressureLevel;
+		Duration		= pDuration;
+	}
+}
+
+class WaterLevelSnapshot
+{
+	float WaterHeight;
+	float RemainingDuration;
+}
+
+class Land_Underground_WaterReservoir : BuildingBase
+{
+	protected const string OBJECT_NAME_WATER_PLANE 				= "Land_Underground_WaterReservoir_Water";
+
+	protected const int WL_MIN 									= 0;
+	protected const int WL_ABOVE_PIPES							= 1;
+	protected const int WL_AVERAGE 								= 2;
+	protected const int WL_MAX 									= 3;
+	
+	protected const int PL_MIN 									= 0;
+	protected const int PL_AVERAGE 								= 1;
+	protected const int PL_MAX 									= 2;
+	
+	protected const int VALVES_COUNT							= 2;
+	protected const int VALVE_INDEX_DRAIN 						= 0;
+	protected const int VALVE_INDEX_FILL 						= 1;
+	
+	protected const int PIPES_BROKEN_COUNT						= 2;
+	protected const int PIPE_INDEX_BROKEN1						= 0;	//! main broken pipe
+	protected const int PIPE_INDEX_BROKEN2						= 1;	//! tighter broken pipe
+
+	protected const string ANIM_PHASE_VALVE_GAUGE_DRAIN 		= "ValveGauge1";
+	protected const string ANIM_PHASE_VALVE_GAUGE_FILL 			= "ValveGauge2";
+	protected const string ANIM_PHASE_VALVE_DRAIN 				= "Valve1";
+	protected const string ANIM_PHASE_VALVE_FILL 				= "Valve2";
+	protected const string VALVE_NAME_DRAIN 					= "valve1";
+	protected const string VALVE_NAME_FILL		 				= "valve2";
+	protected const string PIPE_NAME_BROKEN1	 				= "pipe_broken_1";
+	protected const string PIPE_NAME_BROKEN2	 				= "pipe_broken_2";
+	protected const string PIPE_NAME_LEAKING_DRAIN 				= "pipe_leaking_1";
+	protected const string PIPE_NAME_LEAKING_FILL				= "pipe_leaking_2";
+	
+	protected const string SOUND_NAME_PIPE_CREAKING				= "WaterObjectUndergroundPipeCreaking_SoundSet";
+	protected const string SOUND_NAME_VALVE_MANIPULATION		= "WaterObjectUndergroundValve_SoundSet";
+	protected const string SOUND_NAME_PIPE_SPRINKLING_START		= "WaterObjectUndergroundPipeSprinkling_Start_SoundSet";
+	protected const string SOUND_NAME_PIPE_SPRINKLING_END		= "WaterObjectUndergroundPipeSprinkling_End_SoundSet";
+	protected const string SOUND_NAME_PIPE_SPRINKLING_LOOP1		= "WaterObjectUndergroundPipeSprinkling_Loop1_SoundSet";
+	protected const string SOUND_NAME_PIPE_SPRINKLING_LOOP2		= "WaterObjectUndergroundPipeSprinkling_Loop2_SoundSet";
+	protected const string SOUND_NAME_UPIPE_SPRINKLING_START	= "WaterObjectUndergroundUnderwaterPipe_Start_SoundSet";
+	protected const string SOUND_NAME_UPIPE_SPRINKLING_END		= "WaterObjectUndergroundUnderwaterPipe_End_SoundSet";
+	protected const string SOUND_NAME_UPIPE_SPRINKLING_LOOP		= "WaterObjectUndergroundUnderwaterPipe_Loop_SoundSet";
+	protected const string SOUND_NAME_WATER_FILL_LOOP			= "WaterObjectUndergroundUnderwaterFill_Loop_SoundSet";
+	protected const string SOUND_NAME_WATER_DRAIN_LOOP			= "WaterObjectUndergroundUnderwaterEmpty_Loop_SoundSet";
+	
+	protected const int PARTICLE_DRAIN_PIPE_MAX_PRESSURE 		= ParticleList.WATER_SPILLING;
+	protected const int PARTICLE_FILL_PIPE_MAX_PRESSURE 		= ParticleList.WATER_SPILLING;
+	protected const int PARTICLE_FILL_PIPE_JET 					= ParticleList.WATER_JET;
+	protected const int PARTICLE_FILL_PIPE_JET_WEAK				= ParticleList.WATER_JET_WEAK;
+	
+	//! valve/pipe stages for water and pressure levels 
+	protected ref array<ref WaterLevelSettings> 				m_DrainValveWaterStageSettings;
+	protected ref array<ref PressureLevelSettings> 				m_DrainValvePressureStageSettings;
+	protected ref array<ref PressureLevelSettings>				m_DrainValvePressureDeanimationSettings; //! for deanimation purposes
+	protected ref array<ref WaterLevelSettings> 				m_FillValveWaterStageSettings;
+	protected ref array<ref PressureLevelSettings> 				m_FillValvePressureStageSettings;
+	protected ref array<ref PressureLevelSettings>				m_FillValvePressureDeanimationSettings; //! for deanimation purposes
+	protected ref WaterLevelSnapshot							m_WaterLevelSnapshot;
+	
+	//! pointing to specific stage for each valve/pipe
+	protected int m_DrainValveWaterLevelStageIndex;
+	protected int m_DrainValvePressureLevelStageIndex;
+	protected int m_FillValveWaterLevelStageIndex;
+	protected int m_FillValvePressureLevelStageIndex;
+
+	protected static const string WATER_LEVEL_MAX				= "water_level_max";
+	protected static const string WATER_LEVEL_AVERAGE			= "water_level_average";
+	protected static const string WATER_LEVEL_ABOVE_PIPES		= "water_level_above_pipes";
+	protected static const string WATER_LEVEL_MIN				= "water_level_min";
+	
+	protected const int WATER_LEVELS_COUNT						= 4;
+	protected const string WATER_LEVELS[WATER_LEVELS_COUNT] 	= {
+		WATER_LEVEL_MAX,
+		WATER_LEVEL_AVERAGE,
+		WATER_LEVEL_ABOVE_PIPES,
+		WATER_LEVEL_MIN
+	};
+
+	protected int 						m_ValveStatesPacked;
+	protected int 						m_ValveStatesPackedPrev;
+	protected int 						m_ValveManipulatedIndex;
+	protected int 						m_ValveManipulatedIndexPrev;
+	protected ref array<string> 		m_ValveNames;
+	protected ref array<bool> 			m_ValveStates;
+	protected ref map<string, vector> 	m_WaterLevelsAvailable;
+	protected int 						m_WaterLevelActual;
+	protected int 						m_WaterLevelPrev;
+	protected ref array<bool>			m_PressureAnimationRequests;
+	protected ref array<bool>			m_PressureDeanimationRequests;
+	protected ref array<float>			m_WaterLevelTimesAccumulated;
+	protected ref array<float>			m_PressureTimesAccumulated;
+	protected int 						m_LastActiveValve;
+
+	protected Object					m_SpawnedWaterObject;
+	protected vector 					m_WaterLevelDefault;
+	protected float 					m_WaterLevelHeightActual;
+	
+	//! VFX/SFX
+	protected bool						m_ValveManipulationSoundRequested;
+	protected ref EffectSound			m_ValveManipulationSound;
+	protected ref array<EffectSound>	m_PipeSounds;
+
+	protected bool 						m_PipeCreakingSoundRequested;
+	protected ref EffectSound			m_PipeCreakingSounds;
+	
+	protected bool 						m_PipeUnderwaterSoundRunning
+	protected ref EffectSound 			m_PipeUnderwaterSound;
+	
+	protected ref EffectSound 			m_WaterLevelMovementSound;
+	
+	protected const int PIPE_CREAKING_MIN_TIME_DELAY_MS		= 10000;
+	protected const int PIPE_CREAKING_MAX_TIME_DELAY_MS		= 15000;
+	protected const int PIPE_CREAKING_SOUND_LOCATIONS_COUNT = 4;
+	protected const string PIPE_CREAKING_SOUND_LOCATIONS[PIPE_CREAKING_SOUND_LOCATIONS_COUNT] = {
+		"pipe_creaking_sound_pos_1",
+		"pipe_creaking_sound_pos_2",
+		"pipe_creaking_sound_pos_3",
+		"pipe_creaking_sound_pos_4"
+	};
+	
+	protected ref ParticleSourceArray	m_ValveParticles;
+	protected ref ParticleSourceArray	m_PipeBrokenParticles;	
+	
+	void Land_Underground_WaterReservoir()
+	{
+		SetEventMask(EntityEvent.POSTSIMULATE);
+		
+		Init();
+	}
+	
+	void ~Land_Underground_WaterReservoir()
+	{
+		CleanSoundEffects();
+		CleanVisualEffects();
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		#ifndef SERVER
+		HandleSoundEffects();
+		HandleVisualEffects();
+		#endif
+		
+		if (!GetGame().IsServer())
+		{
+			return;
+		}
+		
+		int valve;
+		float waterHeight, pressureLevel;
+		WaterLevelSettings wlStageSettings, wlStageSettingsPrev;
+		PressureLevelSettings plStageSettings, plStageSettingsPrev;
+
+		//! In case where one of the valves is already running
+		//! - snapshot values; stop animation of that valve and continue with newly requested
+		for (valve = 0; valve < VALVES_COUNT; ++valve)
+		{
+			if (m_LastActiveValve != INDEX_NOT_FOUND && m_LastActiveValve != valve && m_ValveStates[valve] == true)
+			{
+				wlStageSettings 						= ActualWaterLevelStageSettings(valve);
+				m_WaterLevelSnapshot 					= new WaterLevelSnapshot();
+				m_WaterLevelSnapshot.WaterHeight 		= m_WaterLevelHeightActual;
+				m_WaterLevelSnapshot.RemainingDuration	= Math.Clamp(wlStageSettings.Duration - m_WaterLevelTimesAccumulated[valve], 0, wlStageSettings.Duration);
+				m_ValveStates[valve] 					= false;
+				m_PressureDeanimationRequests[valve]	= true;	//! will force that valve to start deanimation of gauge
+				break;
+			}
+		}
+		
+		//! water level course and animation
+		for (valve = 0; valve < VALVES_COUNT; ++valve)
+		{
+			if (m_ValveStates[valve] == true)
+			{
+				wlStageSettingsPrev	= PreviousWaterLevelStageSettings(valve);
+				wlStageSettings 	= ActualWaterLevelStageSettings(valve);
+
+				//! stay on the same level
+				if (wlStageSettings.Duration == -1.0)
+				{
+					m_ValveStates[valve] 				= false;
+					m_WaterLevelTimesAccumulated[valve] = 0;
+					m_WaterLevelSnapshot 				= null;
+					SyncValveVariables();
+					return;
+				}
+				
+				float adjustedWaterHeight 	= WaterLevelToHeight(wlStageSettingsPrev.WaterLevel);
+				float adjustedDuration		= wlStageSettings.Duration;
+				if (m_WaterLevelSnapshot)
+				{
+					adjustedWaterHeight	= m_WaterLevelSnapshot.WaterHeight;
+					adjustedDuration 	= wlStageSettings.Duration + m_WaterLevelSnapshot.RemainingDuration;
+				}
+				
+				if (m_WaterLevelTimesAccumulated[valve] <= adjustedDuration)
+				{
+					float start 	= adjustedWaterHeight;
+					float target 	= WaterLevelToHeight(wlStageSettings.WaterLevel);
+					waterHeight 	= Math.Lerp(start, target, Easing.EaseInOutSine(m_WaterLevelTimesAccumulated[valve] / adjustedDuration));
+		        	SetWaterLevelHeight(waterHeight);
+				}
+				else
+				{
+					m_WaterLevelTimesAccumulated[valve] = 0;
+					m_WaterLevelSnapshot 				= null;
+					AdvanceToNextWaterLevelStageSettings(valve);
+					SetSynchDirty();
+				}
+
+				m_WaterLevelTimesAccumulated[valve] = m_WaterLevelTimesAccumulated[valve] + AdjustTime(timeSlice);
+			}
+			else
+			{
+				m_WaterLevelTimesAccumulated[valve] = 0;
+				SyncValveVariables();
+			}
+		}
+		
+		int allValvesStates = 0;
+
+		//! pressure course and animation
+		for (valve = 0; valve < VALVES_COUNT; ++valve)
+		{
+			if (m_PressureAnimationRequests[valve] == true)
+			{
+				bool hasToBeDeanimated 	= m_PressureAnimationRequests[valve] == m_PressureDeanimationRequests[valve];
+				plStageSettingsPrev		= PreviousPressureLevelStageSettings(valve, hasToBeDeanimated);
+				plStageSettings 		= ActualPressureLevelStageSettings(valve, hasToBeDeanimated);
+				
+				//! stay on the same level
+				if (plStageSettings.Duration == -1.0)
+				{
+					m_PressureTimesAccumulated[valve] 	= 0;
+					m_PressureAnimationRequests[valve] 	= false;
+					SyncValveVariables();
+					return;
+				}
+				
+				if (m_PressureTimesAccumulated[valve] <= plStageSettings.Duration)
+				{
+					float plStart 	= PressureLevelToValue(plStageSettingsPrev.PressureLevel);
+					float plTarget 	= PressureLevelToValue(plStageSettings.PressureLevel);
+					pressureLevel 	= Math.Lerp(plStart, plTarget, m_PressureTimesAccumulated[valve] / plStageSettings.Duration);
+					SetValvePressureLevelGauge(valve, pressureLevel);
+				}
+				else
+				{
+					m_PressureTimesAccumulated[valve] = 0;
+					//! end of deanimation - overlapped activation of valves
+					if (hasToBeDeanimated && IsValvePressureLevelGaugeAtBase(valve))
+					{
+						m_PressureDeanimationRequests[valve] = false;
+						SetDefaultPressureLevelStageSettings(valve);
+					}
+					else
+					{
+						AdvanceToNextPressureLevelStageSettings(valve);
+						SetSynchDirty();
+					}
+				}
+	
+				m_PressureTimesAccumulated[valve] = m_PressureTimesAccumulated[valve] + AdjustTime(timeSlice);
+			}
+			else
+			{
+				m_PressureTimesAccumulated[valve] = 0;
+			}
+			
+			
+			allValvesStates += m_PressureAnimationRequests[valve];
+			if (allValvesStates == false)
+			{
+				SyncValveVariables();
+			}
+		}
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		m_ValveStates = UnpackBitsToArrayOfBoolStates(m_ValveStatesPacked, VALVES_COUNT);
+		
+		if (!m_ValveManipulationSoundRequested)
+			PlayValveManipulationSound();
+		
+		if (m_ValveManipulatedIndex == -1)
+			m_ValveManipulationSoundRequested = false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionTurnValveUndergroundReservoir);
+	}
+	
+	override bool HasTurnableValveBehavior()
+	{
+		return true;
+	}
+	
+	protected void Init()
+	{
+		m_ValveNames 							= new array<string>();
+		m_ValveStates 							= new array<bool>();
+		m_PressureAnimationRequests				= new array<bool>();
+		m_PressureDeanimationRequests			= new array<bool>();
+		m_WaterLevelTimesAccumulated			= new array<float>();
+		m_PressureTimesAccumulated				= new array<float>();
+		m_WaterLevelsAvailable					= new map<string, vector>();
+		m_DrainValveWaterStageSettings 			= new array<ref WaterLevelSettings>();	
+		m_DrainValvePressureStageSettings 		= new array<ref PressureLevelSettings>();		
+		m_DrainValvePressureDeanimationSettings	= new array<ref PressureLevelSettings>();		
+		m_FillValveWaterStageSettings 			= new array<ref WaterLevelSettings>();
+	 	m_FillValvePressureStageSettings		= new array<ref PressureLevelSettings>();
+	 	m_FillValvePressureDeanimationSettings	= new array<ref PressureLevelSettings>();
+		m_WaterLevelSnapshot 					= null;
+		
+		m_WaterLevelActual						= WL_AVERAGE;
+		m_WaterLevelPrev						= WL_AVERAGE;
+
+		m_LastActiveValve						= INDEX_NOT_FOUND;
+		m_ValveManipulatedIndex					= -1;
+		m_ValveManipulatedIndexPrev				= -1;
+		
+		m_PipeSounds							= new array<EffectSound>();
+		m_ValveParticles						= new ParticleSourceArray();
+		m_PipeBrokenParticles					= new ParticleSourceArray();
+		
+		//! pre-init arrays
+		int i = 0;
+		for (i = 0; i < VALVES_COUNT; ++i)
+		{
+			m_ValveNames.Insert("none");
+			m_ValveStates.Insert(false);
+			m_PressureAnimationRequests.Insert(false);
+			m_PressureDeanimationRequests.Insert(false);
+			m_WaterLevelTimesAccumulated.Insert(-1);
+			m_PressureTimesAccumulated.Insert(-1);
+			m_PipeSounds.Insert(null);
+			m_ValveParticles.Insert(null);
+		}
+		
+		for (i = 0; i < PIPES_BROKEN_COUNT; ++i)
+		{
+			m_PipeBrokenParticles.Insert(null);
+		}
+
+		RegisterNetSyncVariableInt("m_ValveStatesPacked", 0);
+		RegisterNetSyncVariableInt("m_ValveManipulatedIndex", -1, VALVES_COUNT - 1);
+		RegisterNetSyncVariableInt("m_WaterLevelActual", WL_MIN, WL_MAX);
+		RegisterNetSyncVariableInt("m_WaterLevelPrev", WL_MIN, WL_MAX);
+
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(LateInit, 250);
+	}
+	
+	protected void LateInit()
+	{
+		RegisterValve(VALVE_NAME_DRAIN, VALVE_INDEX_DRAIN);
+		RegisterValve(VALVE_NAME_FILL, VALVE_INDEX_FILL);
+
+		TranslateMemoryPointsToWaterLevels();
+		
+		ConfigureValvesAndGaugesCourse();
+		
+		m_WaterLevelDefault	= m_WaterLevelsAvailable[WATER_LEVEL_AVERAGE];
+
+		if (GetGame().IsServer())
+		{
+			m_SpawnedWaterObject = GetGame().CreateObjectEx(OBJECT_NAME_WATER_PLANE, m_WaterLevelDefault, ECE_CREATEPHYSICS);
+			m_SpawnedWaterObject.SetOrientation(GetOrientation());
+			SetWaterLevelHeight(m_WaterLevelDefault[1]);
+		}
+		
+		GetGame().RegisterNetworkStaticObject(this);
+		SetSynchDirty();
+	}
+	
+	protected void ConfigureValvesAndGaugesCourse()
+	{
+		//! drain - water level
+		m_DrainValveWaterStageSettings.Insert(new WaterLevelSettings(WL_AVERAGE, -1.0));
+		m_DrainValveWaterStageSettings.Insert(new WaterLevelSettings(WL_MIN, 40.0));
+		m_DrainValveWaterStageSettings.Insert(new WaterLevelSettings(WL_MIN, 200.0));
+		m_DrainValveWaterStageSettings.Insert(new WaterLevelSettings(WL_AVERAGE, 360.0));
+		
+		//! drain - pressure
+		m_DrainValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MIN, -1.0));
+		m_DrainValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MAX, 40.0));
+		m_DrainValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MAX, 200.0));
+		m_DrainValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MIN, 360.0));
+		
+		//! for deanimation purposes only while valves activation overllaps
+		m_DrainValvePressureDeanimationSettings.Insert(new PressureLevelSettings(PL_AVERAGE, -1));
+		m_DrainValvePressureDeanimationSettings.Insert(new PressureLevelSettings(PL_MIN, 5.0));
+		
+		//! fill - water level
+		m_FillValveWaterStageSettings.Insert(new WaterLevelSettings(WL_AVERAGE, -1.0));
+		m_FillValveWaterStageSettings.Insert(new WaterLevelSettings(WL_MAX, 40.0));
+		m_FillValveWaterStageSettings.Insert(new WaterLevelSettings(WL_MAX, 100.0));
+		m_FillValveWaterStageSettings.Insert(new WaterLevelSettings(WL_AVERAGE, 40.0));
+
+		//! fill - pressure
+		m_FillValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MAX, -1.0));
+		m_FillValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MIN, 40.0));
+		m_FillValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MIN, 100.0));
+		m_FillValvePressureStageSettings.Insert(new PressureLevelSettings(PL_MAX, 40.0));
+		
+		//! for deanimation purposes only while valves activation overllaps
+		m_FillValvePressureDeanimationSettings.Insert(new PressureLevelSettings(PL_AVERAGE, -1.0));
+		m_FillValvePressureDeanimationSettings.Insert(new PressureLevelSettings(PL_MAX, 5.0));
+	}
+	
+	override bool IsValveTurnable(int pValveIndex)
+	{
+		return !IsValveActive(pValveIndex) && IsValvePressureLevelGaugeAtBase(pValveIndex);
+	}
+	
+	protected bool IsAnyValveActive()
+	{
+		for (int i = 0; i < m_ValveStates.Count(); ++i)
+		{
+			if (m_ValveStates[i])
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	protected bool IsValveActive(int pValveIndex)
+	{
+		return pValveIndex >= 0 && pValveIndex <= VALVES_COUNT && m_ValveStates[pValveIndex];
+	}
+	
+	override int GetTurnableValveIndex(int pComponentIndex)
+	{
+		string targetedValveName = GetActionComponentName(pComponentIndex);
+		for (int i = 0; i < m_ValveNames.Count(); ++i)
+		{
+			if (m_ValveNames[i] == targetedValveName)
+			{
+				return i;
+			}
+		}
+		
+		return INDEX_NOT_FOUND;
+	}
+	
+	void OnValveManipulationStart(int pValveIndex)
+	{
+		if (GetGame().IsServer())
+		{
+			AnimateValve(pValveIndex, 1);
+			m_ValveManipulatedIndex = pValveIndex;
+			SetSynchDirty();
+		}
+	}
+	
+	void OnValveManipulationEnd(int pValveIndex)
+	{
+		if (GetGame().IsServer())
+		{
+			switch (pValveIndex)
+			{
+			case VALVE_INDEX_DRAIN:
+				m_ValveStates[pValveIndex]					= true;
+				m_PressureAnimationRequests[pValveIndex] 	= true;
+				m_DrainValveWaterLevelStageIndex 			= 1;
+				m_DrainValvePressureLevelStageIndex 		= 1;
+				SetLastActiveValve(pValveIndex);
+				AnimateValve(pValveIndex, 0);
+			break;
+			case VALVE_INDEX_FILL:
+				m_ValveStates[pValveIndex]					= true;
+				m_PressureAnimationRequests[pValveIndex] 	= true;
+				m_FillValveWaterLevelStageIndex 			= 1;
+				m_FillValvePressureLevelStageIndex 			= 1;
+				AnimateValve(pValveIndex, 0);
+				SetLastActiveValve(pValveIndex);
+			break;
+			}
+
+			SyncValveVariables();
+		}
+	}
+	
+	void OnValveManipulationCanceled(int pValveIndex)
+	{
+		if (GetGame().IsServer())
+		{
+			AnimateValve(pValveIndex, 0);
+			m_ValveManipulatedIndex = -1;
+			SetSynchDirty();
+		}	
+	}
+	
+	//! for the animation aligning
+	//! returns data in order: start point; direction point 
+	array<vector> GetValveAligningPointsWS(int pValveIndex)
+	{
+		vector posPoint, dirPoint = vector.Zero;
+		
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			posPoint = GetMemoryPointPosition(string.Format("%1_align_pos", VALVE_NAME_DRAIN));
+			dirPoint = GetMemoryPointPosition(string.Format("%1_align_dir", VALVE_NAME_DRAIN));
+		break;
+		case VALVE_INDEX_FILL:
+			posPoint = GetMemoryPointPosition(string.Format("%1_align_pos", VALVE_NAME_FILL));
+			dirPoint = GetMemoryPointPosition(string.Format("%1_align_dir", VALVE_NAME_FILL));
+		break;
+		}
+		
+		array<vector> valvePositions = new array<vector>();
+		valvePositions.Insert(posPoint);
+		valvePositions.Insert(dirPoint);
+
+		return valvePositions;
+	}
+
+	protected void SetLastActiveValve(int pValveIndex)
+	{
+		m_LastActiveValve = pValveIndex;
+	}
+	
+	protected void SetWaterLevelHeight(float pHeight)
+	{
+		if (GetGame() && GetGame().IsServer())
+		{
+			vector pos 					= Vector(m_WaterLevelDefault[0], pHeight, m_WaterLevelDefault[2]);
+			m_WaterLevelHeightActual	= pHeight;
+			m_WaterLevelActual			= HeightToWaterLevel(pHeight);
+
+			if (m_SpawnedWaterObject)
+			{
+				m_SpawnedWaterObject.SetPosition(pos);
+			}
+		}
+	}
+	
+	protected void RegisterValve(string pCompName, int pIndex)
+	{
+		m_ValveNames.Set(pIndex, pCompName);
+		m_ValveStates.Set(pIndex, false);
+		m_PressureAnimationRequests.Set(pIndex, 0);
+		m_PressureDeanimationRequests.Set(pIndex, 0);
+		m_WaterLevelTimesAccumulated.Set(pIndex, 0);
+		m_PressureTimesAccumulated.Set(pIndex, false);
+		m_PipeSounds.Set(pIndex, null);
+	}
+	
+	protected void TranslateMemoryPointsToWaterLevels()
+	{
+		m_WaterLevelsAvailable.Clear();
+		for (int i = 0; i < WATER_LEVELS_COUNT; ++i)
+		{
+			if (MemoryPointExists(WATER_LEVELS[i]))
+			{
+				if (!m_WaterLevelsAvailable.Contains(WATER_LEVELS[i]))
+				{
+					m_WaterLevelsAvailable.Insert(WATER_LEVELS[i], ModelToWorld(GetMemoryPointPos(WATER_LEVELS[i])));
+				}
+			}
+		}
+	}
+	
+	protected float WaterLevelToHeight(int pWaterLevel)
+	{
+		switch (pWaterLevel)
+		{
+		case WL_MIN:
+			return m_WaterLevelsAvailable[WATER_LEVEL_MIN][1];
+		case WL_ABOVE_PIPES:
+			return m_WaterLevelsAvailable[WATER_LEVEL_ABOVE_PIPES][1];		
+		case WL_AVERAGE:
+			return m_WaterLevelsAvailable[WATER_LEVEL_AVERAGE][1];
+		case WL_MAX:
+			return m_WaterLevelsAvailable[WATER_LEVEL_MAX][1];
+		}
+		
+		return 0;
+	}
+	
+	protected int HeightToWaterLevel(float pHeight)
+	{
+		if (pHeight <= m_WaterLevelsAvailable[WATER_LEVEL_MIN][1])
+		{
+			return WL_MIN;
+		}
+		else if (pHeight > m_WaterLevelsAvailable[WATER_LEVEL_MIN][1] && pHeight <= m_WaterLevelsAvailable[WATER_LEVEL_ABOVE_PIPES][1])
+		{
+			return WL_ABOVE_PIPES;
+		}
+		else if (pHeight > m_WaterLevelsAvailable[WATER_LEVEL_ABOVE_PIPES][1] && pHeight <= m_WaterLevelsAvailable[WATER_LEVEL_AVERAGE][1])
+		{
+			return WL_AVERAGE;
+		}
+		else if (pHeight < m_WaterLevelsAvailable[WATER_LEVEL_MAX][1] && pHeight >= m_WaterLevelsAvailable[WATER_LEVEL_AVERAGE][1])
+		{
+			return WL_AVERAGE;
+		}
+
+		return WL_MAX;
+	}
+	
+	protected float PressureLevelToValue(int pPressureLevel)
+	{
+		switch (pPressureLevel)
+		{
+		case PL_MIN:
+			return 0.0;
+		case PL_AVERAGE:
+			return 0.5;
+		case PL_MAX:
+			return 1.0;
+		}
+		
+		return 0.0;
+	}
+	
+	protected WaterLevelSettings PreviousWaterLevelStageSettings(int pValveIndex)
+	{
+		WaterLevelSettings wlStageSettings;
+
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			if (m_DrainValveWaterLevelStageIndex > 0)
+			{
+				wlStageSettings = m_DrainValveWaterStageSettings.Get(m_DrainValveWaterLevelStageIndex - 1);
+			}
+			else
+			{
+				wlStageSettings = m_DrainValveWaterStageSettings.Get(m_DrainValveWaterLevelStageIndex);
+			}
+		break;
+		case VALVE_INDEX_FILL:
+			if (m_FillValveWaterLevelStageIndex > 0)
+			{
+				wlStageSettings = m_FillValveWaterStageSettings.Get(m_FillValveWaterLevelStageIndex - 1);
+			}
+			else
+			{
+				wlStageSettings = m_FillValveWaterStageSettings.Get(m_FillValveWaterLevelStageIndex);
+			}
+		break;
+		}
+		
+		m_WaterLevelPrev = wlStageSettings.WaterLevel;
+		SetSynchDirty();
+		
+		return wlStageSettings;
+	}
+	
+	protected WaterLevelSettings ActualWaterLevelStageSettings(int pValveIndex)
+	{
+		WaterLevelSettings wlStageSettings;
+
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			wlStageSettings = m_DrainValveWaterStageSettings.Get(m_DrainValveWaterLevelStageIndex);
+		break;
+		case VALVE_INDEX_FILL:
+			wlStageSettings = m_FillValveWaterStageSettings.Get(m_FillValveWaterLevelStageIndex);
+		break;
+		}
+
+		return wlStageSettings;
+	}
+
+	protected void AdvanceToNextWaterLevelStageSettings(int pValveIndex)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			if (m_DrainValveWaterLevelStageIndex < m_DrainValveWaterStageSettings.Count() - 1)
+			{
+				m_DrainValveWaterLevelStageIndex++;
+			}
+			else
+			{
+				m_DrainValveWaterLevelStageIndex = 0;
+			}
+		break;
+		case VALVE_INDEX_FILL:
+			if (m_FillValveWaterLevelStageIndex < m_FillValveWaterStageSettings.Count() - 1)
+			{
+				m_FillValveWaterLevelStageIndex++;
+			}
+			else
+			{
+				m_FillValveWaterLevelStageIndex = 0;
+			}
+		break;
+		}
+	}
+	
+	protected PressureLevelSettings PreviousPressureLevelStageSettings(int pValveIndex, bool pDeanimationRequest = false)
+	{
+		PressureLevelSettings plStageSettings;
+
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			if (pDeanimationRequest)
+			{
+				plStageSettings = m_FillValvePressureDeanimationSettings[0];
+				return plStageSettings;
+			}
+			
+			if (m_DrainValvePressureLevelStageIndex > 0)
+			{
+				plStageSettings = m_DrainValvePressureStageSettings.Get(m_DrainValvePressureLevelStageIndex - 1);
+			}
+			else
+			{
+				plStageSettings = m_DrainValvePressureStageSettings.Get(m_DrainValvePressureLevelStageIndex);
+			}
+		break;
+		case VALVE_INDEX_FILL:
+			if (pDeanimationRequest)
+			{
+				plStageSettings = m_FillValvePressureDeanimationSettings[0];
+				return plStageSettings;
+			}
+
+			if (m_FillValvePressureLevelStageIndex > 0)
+			{
+				plStageSettings = m_FillValvePressureStageSettings.Get(m_FillValvePressureLevelStageIndex - 1);
+			}
+			else
+			{
+				plStageSettings = m_FillValvePressureStageSettings.Get(m_FillValvePressureLevelStageIndex);
+			}
+		break;
+		}
+		
+		return plStageSettings;
+	}
+	
+	protected PressureLevelSettings ActualPressureLevelStageSettings(int pValveIndex, bool pDeanimationRequest = false)
+	{
+		PressureLevelSettings plStageSettings;
+
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			if (pDeanimationRequest)
+			{
+				plStageSettings = m_DrainValvePressureDeanimationSettings[1];
+				return plStageSettings;
+			}
+
+			plStageSettings = m_DrainValvePressureStageSettings.Get(m_DrainValvePressureLevelStageIndex);
+		break;
+		case VALVE_INDEX_FILL:
+			if (pDeanimationRequest)
+			{
+				plStageSettings = m_FillValvePressureDeanimationSettings[1];
+				return plStageSettings;
+			}
+
+			plStageSettings = m_FillValvePressureStageSettings.Get(m_FillValvePressureLevelStageIndex);
+		break;
+		}
+
+		return plStageSettings;
+	}
+
+	protected void AdvanceToNextPressureLevelStageSettings(int pValveIndex)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			if (m_DrainValvePressureLevelStageIndex < m_DrainValvePressureStageSettings.Count() - 1)
+			{
+				m_DrainValvePressureLevelStageIndex++;
+			}
+			else
+			{
+				m_DrainValvePressureLevelStageIndex = 0;
+			}
+		break;
+		case VALVE_INDEX_FILL:
+			if (m_FillValvePressureLevelStageIndex < m_FillValvePressureStageSettings.Count() - 1)
+			{
+				m_FillValvePressureLevelStageIndex++;
+			}
+			else
+			{
+				m_FillValvePressureLevelStageIndex = 0;
+			}
+		break;
+		}
+	}
+	
+	protected void SetDefaultPressureLevelStageSettings(int pValveIndex)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			m_DrainValvePressureLevelStageIndex = 0;
+		break;
+		case VALVE_INDEX_FILL:
+			m_FillValvePressureLevelStageIndex = 0;
+		break;
+		}
+	}
+	
+	protected void AnimateValve(int pValveIndex, float pPhase)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			SetAnimationPhase(ANIM_PHASE_VALVE_DRAIN, pPhase);
+		break;
+		case VALVE_INDEX_FILL:
+			SetAnimationPhase(ANIM_PHASE_VALVE_FILL, pPhase);	
+		break;
+		}		
+	}
+	
+	protected void SetValvePressureLevelGauge(int pValveIndex, float pValue)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			SetAnimationPhase(ANIM_PHASE_VALVE_GAUGE_DRAIN, pValue);
+		break;
+		case VALVE_INDEX_FILL:
+			SetAnimationPhase(ANIM_PHASE_VALVE_GAUGE_FILL, pValue);	
+		break;
+		}
+	}
+	
+	protected float GetValvePressureLevelGauge(int pValveIndex)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			return GetAnimationPhase(ANIM_PHASE_VALVE_GAUGE_DRAIN);
+		break;
+		case VALVE_INDEX_FILL:
+			return GetAnimationPhase(ANIM_PHASE_VALVE_GAUGE_FILL);	
+		break;
+		}
+		
+		return 0;
+	}
+	
+	protected bool IsValvePressureLevelGaugeAtBase(int pValveIndex)
+	{
+		switch (pValveIndex)
+		{
+		case VALVE_INDEX_DRAIN:
+			return GetValvePressureLevelGauge(pValveIndex) <= 0.01;
+		break;
+		case VALVE_INDEX_FILL:
+			return GetValvePressureLevelGauge(pValveIndex) >= 0.99;
+		break;
+		}
+		
+		return 0.0;
+	}
+	
+	protected float AdjustTime(float originalTime)
+	{
+		#ifdef DIAG_DEVELOPER
+		float timeAccel = 1;
+		if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.UNDERGROUND_RESERVOIR))
+		{
+			timeAccel = FeatureTimeAccel.GetFeatureTimeAccelValue();
+			return originalTime * timeAccel;
+		}
+		#endif
+		return originalTime;
+	}
+
+	protected vector GetMemoryPointPosition(string pMemoryPoint)
+	{
+		vector pos = vector.Zero;
+
+		if (MemoryPointExists(pMemoryPoint))
+		{
+			pos = GetMemoryPointPos(pMemoryPoint);
+			pos = ModelToWorld(pos);
+		}
+		else
+		{
+			ErrorEx(string.Format("Memory point %1 not found, falling back to vector.Zero", pMemoryPoint));
+		}		
+		
+		return pos;
+	}
+	
+	protected void HandleSoundEffects()
+	{
+		HandleSoundEffectsPipeCreaking();
+		HandleSoundEffectsPipeSprinkling();
+		HandleSoundEffectsUnderwaterPipeSounds();
+		HandleSoundEffectsWaterLevelMovementSounds();
+	}
+	
+	protected void PlayValveManipulationSound()
+	{
+		switch (m_ValveManipulatedIndex)
+		{
+			case VALVE_INDEX_DRAIN:
+				m_ValveManipulationSoundRequested = PlaySoundSetAtMemoryPoint(m_ValveManipulationSound, SOUND_NAME_VALVE_MANIPULATION, VALVE_NAME_DRAIN);
+				break;
+			case VALVE_INDEX_FILL:
+				m_ValveManipulationSoundRequested = PlaySoundSetAtMemoryPoint(m_ValveManipulationSound, SOUND_NAME_VALVE_MANIPULATION, VALVE_NAME_FILL);
+				break;
+		}
+	}
+	
+	protected void HandleSoundEffectsPipeCreaking()
+	{
+		if (IsAnyValveActive())
+		{
+			if ((m_PipeCreakingSounds == null && !m_PipeCreakingSoundRequested) || !m_PipeCreakingSoundRequested)
+			{
+				m_PipeCreakingSoundRequested = true;
+				int randomDelay = Math.RandomInt(PIPE_CREAKING_MIN_TIME_DELAY_MS, PIPE_CREAKING_MAX_TIME_DELAY_MS);
+				GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(PlayPipeCreakingSoundOnLocation, randomDelay, false);
+			}
+		}
+		else
+		{
+			if (m_PipeCreakingSounds)
+			{
+				StopSoundSet(m_PipeCreakingSounds);
+				m_PipeCreakingSounds = null;
+			}
+		}
+	}
+	
+	protected void HandleSoundEffectsPipeSprinkling()
+	{	
+		if (!m_PipeSounds || m_PipeSounds.Count() == 0)
+		{
+			return;
+		}
+
+		EffectSound sndDrain, sndFill;
+		float drainPressureLevel = GetValvePressureLevelGauge(VALVE_INDEX_DRAIN);
+		if (drainPressureLevel >= 0.4 && drainPressureLevel < 0.8)
+		{
+			if (m_PipeSounds[VALVE_INDEX_DRAIN] == null)
+			{
+				PlaySoundSetAtMemoryPoint(sndDrain, SOUND_NAME_PIPE_SPRINKLING_START, VALVE_NAME_DRAIN, false, 0.0, 0.5);
+				m_PipeSounds[VALVE_INDEX_DRAIN] = sndDrain;
+				StopSoundSet(m_PipeSounds[VALVE_INDEX_DRAIN]);
+				m_PipeSounds[VALVE_INDEX_DRAIN] = null;
+				PlaySoundSetAtMemoryPointLooped(sndDrain, SOUND_NAME_PIPE_SPRINKLING_LOOP1, VALVE_NAME_DRAIN, 0.5, 0.5);
+				m_PipeSounds[VALVE_INDEX_DRAIN] = sndDrain;
+			}
+		}
+		
+		if (drainPressureLevel < 0.4)
+		{
+			if (m_PipeSounds[VALVE_INDEX_DRAIN] != null)
+			{
+				StopSoundSet(m_PipeSounds[VALVE_INDEX_DRAIN]);
+				m_PipeSounds[VALVE_INDEX_DRAIN] = null;
+			}
+		}
+
+		//! --------------------
+
+		float fillPressureLevel = GetValvePressureLevelGauge(VALVE_INDEX_FILL);
+		if (fillPressureLevel >= 0.4)
+		{
+			if (m_PipeSounds[VALVE_INDEX_FILL] == null)
+			{
+				PlaySoundSetAtMemoryPoint(sndFill, SOUND_NAME_PIPE_SPRINKLING_START, VALVE_NAME_FILL, false, 0.0, 0.5);
+				StopSoundSet(m_PipeSounds[VALVE_INDEX_FILL]);
+				m_PipeSounds[VALVE_INDEX_FILL] = null;
+				PlaySoundSetAtMemoryPointLooped(sndFill, SOUND_NAME_PIPE_SPRINKLING_LOOP2, VALVE_NAME_FILL, 0.5, 0.5);
+				m_PipeSounds[VALVE_INDEX_FILL] = sndFill;
+			}
+		}
+
+		if (fillPressureLevel < 0.4)
+		{
+			if (m_PipeSounds[VALVE_INDEX_FILL] != null)
+			{
+				StopSoundSet(m_PipeSounds[VALVE_INDEX_FILL]);
+				m_PipeSounds[VALVE_INDEX_FILL] = null;
+			}
+		}
+	}
+
+	protected void HandleSoundEffectsUnderwaterPipeSounds()
+	{
+		//! strong water jet sound only when fill valve activated
+		if (IsValveActive(VALVE_INDEX_FILL))
+		{
+			if ((m_WaterLevelActual == WL_ABOVE_PIPES) || (m_WaterLevelActual == WL_MAX && m_WaterLevelPrev == WL_AVERAGE))
+			{
+				if (m_PipeUnderwaterSound == null)
+				{
+					PlaySoundSetAtMemoryPoint(m_PipeUnderwaterSound, SOUND_NAME_UPIPE_SPRINKLING_START, PIPE_NAME_BROKEN1, false, 0.0, 0.5);
+					StopSoundSet(m_PipeUnderwaterSound);
+					m_PipeUnderwaterSound = null;
+					m_PipeUnderwaterSoundRunning = PlaySoundSetAtMemoryPointLooped(m_PipeUnderwaterSound, SOUND_NAME_UPIPE_SPRINKLING_LOOP, PIPE_NAME_BROKEN1, 0.0, 0.5);
+				}
+			}
+			else if (m_WaterLevelActual == m_WaterLevelPrev)
+			{
+				if (m_PipeUnderwaterSound)
+				{
+					StopSoundSet(m_PipeUnderwaterSound);
+					if (m_PipeUnderwaterSoundRunning)
+					{
+						PlaySoundSetAtMemoryPoint(m_PipeUnderwaterSound, SOUND_NAME_UPIPE_SPRINKLING_END, PIPE_NAME_BROKEN1, false, 0.0, 0.5);
+						m_PipeUnderwaterSoundRunning = false;
+					}
+				}
+			}
+		}
+	}
+	
+	protected void HandleSoundEffectsWaterLevelMovementSounds()
+	{
+		if (m_WaterLevelActual < m_WaterLevelPrev)
+		{
+			if (m_WaterLevelMovementSound == null)
+			{
+				PlaySoundSetAtMemoryPointLooped(m_WaterLevelMovementSound, SOUND_NAME_WATER_DRAIN_LOOP, PIPE_NAME_BROKEN1, 0.0, 0.5);
+			}
+		}
+		else if (m_WaterLevelActual > m_WaterLevelPrev)
+		{
+			if (m_WaterLevelMovementSound == null)
+			{
+				PlaySoundSetAtMemoryPointLooped(m_WaterLevelMovementSound, SOUND_NAME_WATER_FILL_LOOP, PIPE_NAME_BROKEN1, 0.0, 0.5);
+			}	
+		}
+		else if (m_WaterLevelActual == m_WaterLevelPrev)
+		{
+			if (m_WaterLevelMovementSound)
+			{
+				StopSoundSet(m_WaterLevelMovementSound);
+			}
+		}
+	}
+	
+	protected void CleanSoundEffects()
+	{
+		SEffectManager.DestroySound(m_PipeSounds[VALVE_INDEX_DRAIN]);
+		SEffectManager.DestroySound(m_PipeSounds[VALVE_INDEX_FILL]);
+	}
+	
+	protected void PlayPipeCreakingSoundOnLocation()
+	{
+		m_PipeCreakingSoundRequested = false;
+		int index = Math.RandomInt(0, PIPE_CREAKING_SOUND_LOCATIONS_COUNT);
+		PlaySoundSetAtMemoryPoint(m_PipeCreakingSounds, SOUND_NAME_PIPE_CREAKING, PIPE_CREAKING_SOUND_LOCATIONS[index]);
+	}
+	
+	protected void HandleVisualEffects()
+	{
+		if (GetValvePressureLevelGauge(VALVE_INDEX_DRAIN) >= 0.4)
+		{
+			if (m_ValveParticles[VALVE_INDEX_DRAIN] == null)
+			{
+				m_ValveParticles[VALVE_INDEX_DRAIN] = ParticleManager.GetInstance().PlayInWorldEx(PARTICLE_DRAIN_PIPE_MAX_PRESSURE, null, GetMemoryPointPosition(PIPE_NAME_LEAKING_DRAIN), GetOrientation() + "0 -90 165", true);
+			}
+		}
+		
+		if (GetValvePressureLevelGauge(VALVE_INDEX_DRAIN) <= 0.4)
+		{
+			if (m_ValveParticles[VALVE_INDEX_DRAIN] != null)
+			{
+				m_ValveParticles[VALVE_INDEX_DRAIN].StopParticle();
+				m_ValveParticles[VALVE_INDEX_DRAIN] = null;
+			}
+		}
+		
+		if (GetValvePressureLevelGauge(VALVE_INDEX_FILL) >= 0.4)
+		{
+			if (m_ValveParticles[VALVE_INDEX_FILL] == null)
+			{
+				m_ValveParticles[VALVE_INDEX_FILL] = ParticleManager.GetInstance().PlayInWorldEx(PARTICLE_FILL_PIPE_MAX_PRESSURE, null, GetMemoryPointPosition(PIPE_NAME_LEAKING_FILL), GetOrientation() + "0 90 -90", true);
+			}
+		}
+		
+		if (GetValvePressureLevelGauge(VALVE_INDEX_FILL) <= 0.4)
+		{
+			if (m_ValveParticles[VALVE_INDEX_FILL] != null)
+			{
+				m_ValveParticles[VALVE_INDEX_FILL].StopParticle();
+				m_ValveParticles[VALVE_INDEX_FILL] = null;
+			}
+		}
+		
+		
+		//! strong jet stream particle only when fill valve activated
+		if (IsValveActive(VALVE_INDEX_FILL))
+		{
+			if ((m_WaterLevelActual == WL_ABOVE_PIPES) || (m_WaterLevelActual == WL_MAX && m_WaterLevelPrev == WL_AVERAGE))
+			{
+				if (m_PipeBrokenParticles[PIPE_INDEX_BROKEN1] == null)
+				{
+					m_PipeBrokenParticles[PIPE_INDEX_BROKEN1] = ParticleManager.GetInstance().PlayInWorldEx(PARTICLE_FILL_PIPE_JET, null, GetMemoryPointPosition(PIPE_NAME_BROKEN1), GetOrientation() + "0 0 0", true);
+				}
+				
+				//! we don't need the weak jet stream
+				if (m_PipeBrokenParticles[PIPE_INDEX_BROKEN2])
+				{
+					m_PipeBrokenParticles[PIPE_INDEX_BROKEN2].StopParticle();
+					m_PipeBrokenParticles[PIPE_INDEX_BROKEN2] = null;
+				}
+			}
+		}
+		
+		//! weak jet stream
+		if ((m_WaterLevelActual == WL_ABOVE_PIPES && m_WaterLevelPrev == WL_AVERAGE))
+		{
+			if (m_PipeBrokenParticles[PIPE_INDEX_BROKEN2] == null)
+			{
+				m_PipeBrokenParticles[PIPE_INDEX_BROKEN2] = ParticleManager.GetInstance().PlayInWorldEx(PARTICLE_FILL_PIPE_JET_WEAK, null, GetMemoryPointPosition(PIPE_NAME_BROKEN2), GetOrientation() + "0 0 0", true);
+			}
+		}
+		
+		if (m_WaterLevelActual >= WL_AVERAGE)
+		{
+			for (int pipe = 0; pipe < m_PipeBrokenParticles.Count(); ++pipe)
+			{
+				if (m_PipeBrokenParticles[pipe])
+				{
+					m_PipeBrokenParticles[pipe].StopParticle();
+					m_PipeBrokenParticles[pipe] = null;
+				}
+			}
+		}
+	}
+	
+	protected void CleanVisualEffects()
+	{
+		for (int valve = 0; valve < VALVES_COUNT; ++valve)
+		{
+			if (m_ValveParticles[valve])
+			{
+				m_ValveParticles[valve].StopParticle();
+				m_ValveParticles[valve] = null;
+			}
+		}
+		
+		for (int pipe = 0; pipe < m_PipeBrokenParticles.Count(); ++pipe)
+		{
+			if (m_PipeBrokenParticles[pipe])
+			{
+				m_PipeBrokenParticles[pipe].StopParticle();
+				m_PipeBrokenParticles[pipe] = null;
+			}
+		}
+	}
+	
+
+	
+	protected void ResetState()
+	{
+		SetWaterLevelHeight(m_WaterLevelsAvailable[WATER_LEVEL_AVERAGE][1]);
+		SetValvePressureLevelGauge(VALVE_INDEX_DRAIN, 0.0);
+		SetValvePressureLevelGauge(VALVE_INDEX_FILL, 1.0);
+		m_DrainValveWaterLevelStageIndex 			= 0;
+		m_DrainValvePressureLevelStageIndex			= 0;
+		m_FillValveWaterLevelStageIndex				= 0;
+		m_FillValvePressureLevelStageIndex			= 0;
+		m_ValveStates								= {0, 0};
+		m_PressureAnimationRequests					= {0, 0};
+		m_PressureDeanimationRequests				= {0, 0};
+		m_WaterLevelTimesAccumulated				= {0, 0};
+		m_PressureTimesAccumulated					= {0, 0};
+		m_LastActiveValve							= -1;
+		m_WaterLevelHeightActual					= WaterLevelToHeight(WL_AVERAGE);
+		m_PipeCreakingSoundRequested				= false;
+		m_ValveManipulatedIndex						= -1;
+		m_ValveManipulatedIndexPrev					= -1;
+		SetSynchDirty();
+		CleanSoundEffects();
+	}
+	
+	protected void SyncValveVariables()
+	{
+		if (GetGame())
+		{
+			m_ValveStatesPacked = PackArrayOfBoolStatesIntoBits(m_ValveStates);
+			if (m_ValveStatesPacked != m_ValveStatesPackedPrev)
+			{
+				m_ValveStatesPackedPrev = m_ValveStatesPacked;
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	protected int PackArrayOfBoolStatesIntoBits(array<bool> pStates)
+	{
+		int packedBits = 0;
+   
+    	for (int i = 0; i < pStates.Count(); ++i)
+		{
+			if (pStates[i] == true)
+			{
+        		packedBits |= 1 << i;
+			}
+		}
+		
+		return packedBits;
+	}
+	
+	protected array<bool> UnpackBitsToArrayOfBoolStates(int pPackedBits, int pArrayLength)
+	{
+		array<bool> unpackedBools = new array<bool>();
+		for (int i = 0; i < pArrayLength; ++i)
+		{
+			if ((pPackedBits & 1 << i) != 0)
+			{
+				unpackedBools.Insert(true);
+			}
+			else
+			{
+				unpackedBools.Insert(false);
+			}
+		}
+		
+		return unpackedBools;
+	}
+	
+#ifdef DEVELOPER
+	override protected string GetDebugText()
+	{
+		string debug_output = "";
+		debug_output += string.Format("\nm_WaterLevelActual: %1", m_WaterLevelActual);
+		debug_output += string.Format("\nm_WaterLevelPrev: %1", m_WaterLevelPrev);
+		debug_output += string.Format("\nm_ValveManipulatedIndex: %1", m_ValveManipulatedIndex);
+
+		int valve;
+		for (valve = 0; valve < VALVES_COUNT; ++valve)
+		{
+			debug_output += string.Format("\nvalve %1 state:%2 | pressure req: %2", valve, m_ValveStates[valve], m_PressureAnimationRequests[valve]);
+		}
+
+		return debug_output;	
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SPECIALIZED_ACTION1, "Reset state", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SPECIALIZED_ACTION2, "Drain", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SPECIALIZED_ACTION3, "Fill", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.SPECIALIZED_ACTION1)
+			{
+				ResetState();
+				ActualWaterLevelStageSettings(VALVE_INDEX_DRAIN);
+				PreviousWaterLevelStageSettings(VALVE_INDEX_DRAIN);
+				ActualWaterLevelStageSettings(VALVE_INDEX_FILL);
+				PreviousWaterLevelStageSettings(VALVE_INDEX_FILL);
+			}
+			else if (action_id == EActions.SPECIALIZED_ACTION2)
+			{
+				ResetState();
+				m_ValveStates[VALVE_INDEX_DRAIN]				= 1;
+				m_PressureAnimationRequests[VALVE_INDEX_DRAIN]	= 1;
+				m_DrainValveWaterLevelStageIndex 				= 1;
+				m_DrainValvePressureLevelStageIndex 			= 1;
+				SetLastActiveValve(VALVE_INDEX_DRAIN);
+			}
+			else if (action_id == EActions.SPECIALIZED_ACTION3)
+			{
+				ResetState();
+				m_ValveStates[VALVE_INDEX_FILL]					= 1;
+				m_PressureAnimationRequests[VALVE_INDEX_FILL] 	= 1;
+				m_FillValveWaterLevelStageIndex 				= 1;
+				m_FillValvePressureLevelStageIndex 				= 1;
+				SetLastActiveValve(VALVE_INDEX_FILL);
+				SetSynchDirty();
+			}
+		}
+		return false;
+	}
+	
+	
+#endif
+}
+
+class Land_Underground_WaterReservoir_Water : BuildingBase {}
diff --git a/scripts/4_World/DayZ/Entities/Building/Well.c b/scripts/4_World/DayZ/Entities/Building/Well.c
new file mode 100644
index 0000000000000000000000000000000000000000..6be3c5c94cd545da7b107fadd8695349b6f63089
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Well.c
@@ -0,0 +1,30 @@
+class Well extends BuildingSuper
+{
+	override bool IsBuilding()
+	{
+		return false;
+	}
+	
+	override bool IsWell()
+	{
+		return GetWaterSourceObjectType() == EWaterSourceObjectType.WELL;
+	}
+	
+	override EWaterSourceObjectType GetWaterSourceObjectType()
+	{
+		return EWaterSourceObjectType.WELL;
+	}
+	
+	override float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_WELL;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionWashHandsWell);
+		AddAction(ActionDrinkWellContinuous);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Wrecks/StaticObj_Roadblock_Wood_Small.c b/scripts/4_World/DayZ/Entities/Building/Wrecks/StaticObj_Roadblock_Wood_Small.c
new file mode 100644
index 0000000000000000000000000000000000000000..92b256e04328359b35aa60a27f18ec1dcb21305f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Wrecks/StaticObj_Roadblock_Wood_Small.c
@@ -0,0 +1,46 @@
+class StaticObj_Roadblock_Wood_Small: House
+{		
+	PointLightBase m_BlinkingLight;
+	
+	override void EEInit()
+	{
+		super.EEInit();
+	
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			m_BlinkingLight = EntranceLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(Roadblock_Light, this, "Light"));
+		}
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( m_BlinkingLight )
+				m_BlinkingLight.Destroy();
+		}	
+	}
+};
+
+class Roadblock_Light extends PointLightBase
+{
+	protected float m_DefaultBrightness = 5.5;
+	protected float m_DefaultRadius = 20;
+	
+	void Roadblock_Light()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(m_DefaultRadius);
+		SetBrightnessTo(m_DefaultBrightness);
+		FadeIn(1);
+		SetFadeOutTime(2);
+		SetFlareVisible(false);
+		SetCastShadow(false);
+		SetAmbientColor(0.9, 0.9, 0.7);
+		SetDiffuseColor(0.9, 0.9, 0.7);
+		
+		SetBlinkingSpeed(1);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_MI8.c b/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_MI8.c
new file mode 100644
index 0000000000000000000000000000000000000000..a2abc2c99108d8d33ae8f0647e3655b31be5adfe
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_MI8.c
@@ -0,0 +1,17 @@
+//New russian helicopter crash site
+class Wreck_Mi8_Crashed extends CrashBase
+{
+	void Wreck_Mi8_Crashed()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			m_ParticleEfx = ParticleManager.GetInstance().PlayOnObject(ParticleList.SMOKING_HELI_WRECK, this, Vector(2, 0, -5));
+		}
+	}
+}
+
+//Old Russian helicopter crash site
+class Wreck_Mi8 extends CrashBase
+{
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_SantasSleigh.c b/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_SantasSleigh.c
new file mode 100644
index 0000000000000000000000000000000000000000..fa03ebfbea5fca9d23b11d20752f95c4486b9195
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_SantasSleigh.c
@@ -0,0 +1,91 @@
+//Christmas Event: Santa's Sleigh
+class Wreck_SantasSleigh extends CrashBase
+{
+	XmasSleighLight 		m_SleighLight;
+	
+	int m_MaxDeersAmount = 4;
+	int m_MinDeersAmount = 2;
+	int m_MaxDeersSpawnRange = 25;
+	int m_MinDeersSpawnRange = 5;
+
+	void Wreck_SantasSleigh()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			//particles - Aurora trail
+			m_ParticleEfx = ParticleManager.GetInstance().PlayOnObject(ParticleList.AURORA_SANTA_WRECK, this, Vector(0, 0, 0));
+			
+			//lights - green light
+			m_SleighLight = XmasSleighLight.Cast( ScriptedLightBase.CreateLight( XmasSleighLight, Vector(0, 0, 0) ) );
+			m_SleighLight.AttachOnMemoryPoint( this, "light" );
+		}
+	}
+	
+	// needs to have the soundset registered in CrashBase.Init()
+	override string GetSoundSet()
+	{
+		return "SledgeCrash_Distant_SoundSet";
+	}
+	
+	override void EEOnCECreate()
+	{
+		super.EEOnCECreate();
+		SpawnRandomDeerLater();
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( m_SleighLight )
+				m_SleighLight.Destroy();
+		}	
+	}
+	
+	void SpawnRandomDeerLater()
+	{
+		//SpawnRandomDeers();
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( SpawnRandomDeers, 0);
+	}
+	
+	//Spawn a random amount of (dead) deers around the sleigh
+	void SpawnRandomDeers()
+	{
+		EntityAI deer;
+		vector crash_pos = GetPosition();
+		
+		int deersAmount = Math.RandomIntInclusive(m_MinDeersAmount,m_MaxDeersAmount);
+		
+		for (int i = 0; i < m_MaxDeersAmount; i++)
+		{
+			vector deer_pos = RandomizePosition(crash_pos);
+			deer = EntityAI.Cast(GetGame().CreateObject("Animal_CervusElaphus", deer_pos,false, true));
+			deer.SetHealth01("","", 0);
+			vector orientation = deer.GetOrientation();
+			deer.SetOrientation(Vector(Math.RandomIntInclusive(0,360),orientation[1],orientation[2]));
+		}		
+	}
+	
+	//Return a new vector scattered around origin.
+	vector RandomizePosition(vector origin)
+	{		
+		int randX;
+		int randZ;
+		
+		randX = Math.RandomIntInclusive(m_MinDeersSpawnRange, m_MaxDeersSpawnRange);
+		if (Math.RandomIntInclusive(0,1) < 1)
+			randX = -randX;
+			
+		randZ = Math.RandomIntInclusive(m_MinDeersSpawnRange, m_MaxDeersSpawnRange);
+		if (Math.RandomIntInclusive(0,1) < 1)
+			randZ = -randZ; 
+			
+		origin[0] = origin[0] + randX;
+		origin[2] = origin[2] + randZ;
+		
+		return origin;
+	
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_UH1Y.c b/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_UH1Y.c
new file mode 100644
index 0000000000000000000000000000000000000000..3bb4f26e68ffcabb3b8ab41e28c334fc302b6c14
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Building/Wrecks/Wreck_UH1Y.c
@@ -0,0 +1,10 @@
+class Wreck_UH1Y extends CrashBase
+{
+	void Wreck_UH1Y()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			m_ParticleEfx = ParticleManager.GetInstance().PlayOnObject(ParticleList.SMOKING_HELI_WRECK, this, Vector(-0.5, 0, -1.0));
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ClutterCutter2x2.c b/scripts/4_World/DayZ/Entities/ClutterCutter2x2.c
new file mode 100644
index 0000000000000000000000000000000000000000..e12b5f831d31112fc9fdde455c943037b3484f1b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ClutterCutter2x2.c
@@ -0,0 +1 @@
+class ClutterCutter2x2 : BuildingSuper {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ClutterCutter6x6.c b/scripts/4_World/DayZ/Entities/ClutterCutter6x6.c
new file mode 100644
index 0000000000000000000000000000000000000000..959cc379dcbf7cc4dd2bdd571c41b1f2c874782f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ClutterCutter6x6.c
@@ -0,0 +1,10 @@
+class ClutterCutter6x6 : BuildingSuper
+{
+	void ClutterCutter6x6()
+	{
+	}
+	
+	void ~ClutterCutter6x6()
+	{
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ClutterCutterFireplace.c b/scripts/4_World/DayZ/Entities/ClutterCutterFireplace.c
new file mode 100644
index 0000000000000000000000000000000000000000..79e100e18e5a6ff39044ca1d5abc1f92603c004b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ClutterCutterFireplace.c
@@ -0,0 +1,3 @@
+class ClutterCutterFireplace : BuildingSuper
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/Building.c b/scripts/4_World/DayZ/Entities/Core/Inherited/Building.c
new file mode 100644
index 0000000000000000000000000000000000000000..2fb4b778031360bf039b18eb812ceeec7edb2f4f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/Building.c
@@ -0,0 +1,10 @@
+//-----------------------------------------------------------------------------
+class Fountain extends BuildingSuper
+{
+};
+
+//-----------------------------------------------------------------------------
+class Church extends BuildingSuper
+{
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/EntityAI.c b/scripts/4_World/DayZ/Entities/Core/Inherited/EntityAI.c
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/InventoryItem.c b/scripts/4_World/DayZ/Entities/Core/Inherited/InventoryItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..ed3e7904ea062f81c4b6b50de643867441542568
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/InventoryItem.c
@@ -0,0 +1,1188 @@
+
+//-----------------------------------------------------------------------------
+class ItemSuppressor extends InventoryItemSuper
+{
+};
+
+typedef ItemSuppressor SuppressorBase;
+
+//-----------------------------------------------------------------------------
+class ItemWatch extends InventoryItemSuper
+{
+};
+
+//-----------------------------------------------------------------------------
+class ItemTransmitter extends InventoryItemSuper
+{
+	proto native void SetNextChannel();
+	proto native void SetPrevChannel();
+	proto native float GetTunedFrequency();
+	proto native void EnableBroadcast(bool state);
+	proto native void EnableReceive(bool state);
+	proto native bool IsBroadcasting();
+	proto native bool IsReceiving();
+	proto native int GetTunedFrequencyIndex();
+	proto native void SetFrequencyByIndex(int index);
+};
+
+//-----------------------------------------------------------------------------
+class ItemMegaphone extends InventoryItemSuper
+{
+	proto native bool CanSpeak();
+	proto native void SetCanSpeak(bool onOff); 
+}
+
+//-----------------------------------------------------------------------------
+class ItemRadio extends InventoryItemSuper
+{
+	proto native void TuneNext();
+	proto native void TunePrev();
+};
+
+//-----------------------------------------------------------------------------
+class ItemBarrel extends InventoryItemSuper
+{
+};
+
+//-----------------------------------------------------------------------------
+class UnderSlugLauncher extends Weapon
+{
+};
+
+//-----------------------------------------------------------------------------
+class ItemGPS extends InventoryItemSuper
+{
+	bool IsTurnedOn()
+	{
+		return true;
+	}
+	
+	override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+
+		PlayerBase pb = PlayerBase.Cast(player);
+		if ( pb && IsTurnedOn() )
+		{
+			pb.MapNavigationItemInPossession(this);
+		}
+	}
+
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		PlayerBase pb = PlayerBase.Cast(player);
+		if ( pb )
+		{
+			pb.MapNavigationItemNotInPossession(this);
+		}
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		PlayerBase player = PlayerBase.Cast(parent);
+		if ( parent.GetHierarchyRoot() )
+		{
+			player = PlayerBase.Cast(parent.GetHierarchyRoot());			
+		}
+
+		if ( player && IsTurnedOn() )
+		{
+			player.MapNavigationItemInPossession(this);
+		}
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+
+		PlayerBase player = PlayerBase.Cast(parent);
+		if ( parent.GetHierarchyRoot() )
+		{
+			player = PlayerBase.Cast(parent.GetHierarchyRoot());			
+		}
+
+		if ( player )
+		{
+			player.MapNavigationItemNotInPossession(this);
+		}
+	}
+};
+
+//-----------------------------------------------------------------------------
+class ItemCompass extends InventoryItemSuper
+{
+	override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+		
+		if ( IsRuined() )
+		{
+			return;
+		}
+
+		PlayerBase pb = PlayerBase.Cast(player);
+		if ( pb )
+		{
+			pb.MapNavigationItemInPossession(this);
+		}
+	}
+
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+
+		if ( IsRuined() )
+		{
+			return;
+		}
+
+		PlayerBase pb = PlayerBase.Cast(player);
+		if ( pb )
+		{
+			pb.MapNavigationItemNotInPossession(this);
+		}
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if ( IsRuined() )
+		{
+			return;
+		}
+		
+		PlayerBase player = PlayerBase.Cast(parent);
+		if ( parent.GetHierarchyParent() )
+		{
+			player = PlayerBase.Cast(parent.GetHierarchyParent());			
+		}
+
+		if ( player )
+		{
+			player.MapNavigationItemInPossession(this);
+		}
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+
+		if ( IsRuined() )
+		{
+			return;
+		}
+
+		PlayerBase player = PlayerBase.Cast(parent);
+		if ( parent.GetHierarchyParent() )
+		{
+			player = PlayerBase.Cast(parent.GetHierarchyParent());			
+		}
+
+		if ( player )
+		{
+			player.MapNavigationItemNotInPossession(this);
+		}
+	}
+};
+
+//-----------------------------------------------------------------------------
+class CarWheel extends InventoryItemSuper
+{
+	protected string m_AttachSound = "Offroad_Wheel_Attach_SoundSet";
+	protected string m_DetachSound = "Offroad_Wheel_Remove_SoundSet";
+	
+	//! Returns current wheel radius.
+	proto native float GetRadius();
+
+	//! Returns wheel width.
+	proto native float GetWidth();
+
+	override bool DisplayNameRuinAttach()
+	{
+		return true;
+	}
+	
+	override bool ShowZonesHealth()
+	{
+		return true;
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel, newLevel, zone);
+		
+		if (newLevel ==  GameConstants.STATE_RUINED)
+		{
+			string newWheel = "";
+			switch (GetType())
+			{
+				case "HatchbackWheel":
+					newWheel = "HatchbackWheel_Ruined";
+					break;
+	
+				case "CivSedanWheel":
+					newWheel = "CivSedanWheel_Ruined";
+					break;
+	
+				case "Hatchback_02_Wheel":
+					newWheel = "Hatchback_02_Wheel_Ruined";
+					break;
+				
+				case "Sedan_02_Wheel":
+					newWheel = "Sedan_02_Wheel_Ruined";
+					break;
+	
+				case "Truck_01_Wheel":
+					newWheel = "Truck_01_Wheel_Ruined";
+					break;
+	
+				case "Truck_01_WheelDouble":
+					newWheel = "Truck_01_WheelDouble_Ruined";
+					break;
+
+				case "Offroad_02_Wheel":
+					newWheel = "Offroad_02_Wheel_Ruined";
+					break;
+			}
+			
+			if (newWheel != "")
+			{
+				//Unlock to allow creating a new item
+				if (IsLockedInSlot())
+					UnlockFromParent();
+				
+				IEntity child = GetChildren();
+				while (child)
+				{
+					RemoveChild(child, false);
+					vector matrix[4];
+					GetTransform(matrix);
+					GetInventory().DropEntityWithTransform(InventoryMode.SERVER, this, EntityAI.Cast(child), matrix);
+					child = GetSibling();
+				}
+
+				ReplaceWheelLambda lambda = new ReplaceWheelLambda(this, newWheel, null);
+				lambda.SetTransferParams(true, true, true);
+				GetInventory().ReplaceItemWithNew(InventoryMode.SERVER, lambda);
+			}
+		}
+	}
+	
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionDetach);
+		AddAction(ActionAttachOnSelection);
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		#ifndef SERVER
+		EffectSound effect = SEffectManager.PlaySound(m_AttachSound, GetPosition());
+		effect.SetAutodestroy(true);
+		#endif
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		#ifndef SERVER
+		EffectSound effect = SEffectManager.PlaySound(m_DetachSound, GetPosition());
+		effect.SetAutodestroy(true);
+		#endif
+	}
+};
+
+class CarWheel_Ruined : CarWheel
+{
+	override bool CanPutAsAttachment(EntityAI parent)
+	{
+		// So that the lambda can always put it to the Transport
+		if (parent.IsInherited(Transport) && parent.IsRuined())
+		{
+			InventoryLocation loc = new InventoryLocation();
+			if (GetInventory().GetCurrentInventoryLocation(loc))
+			{
+				return loc.GetType() == InventoryLocationType.UNKNOWN;
+			}
+			
+			return false;
+		}
+
+		if (!super.CanPutAsAttachment(parent))
+			return false;
+
+		return true;
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged( oldLevel, newLevel, zone );
+		#ifdef DEVELOPER
+		// used when fixing the whole car through debug
+		if (newLevel ==  GameConstants.STATE_PRISTINE)
+		{
+			string newWheel = "";
+			switch (GetType())
+			{
+				case "HatchbackWheel_Ruined":
+					newWheel = "HatchbackWheel";
+					break;
+	
+				case "CivSedanWheel_Ruined":
+					newWheel = "CivSedanWheel";
+					break;
+	
+				case "Hatchback_02_Wheel_Ruined":
+					newWheel = "Hatchback_02_Wheel";
+					break;
+				
+				case "Sedan_02_Wheel_Ruined":
+					newWheel = "Sedan_02_Wheel";
+					break;
+	
+				case "Truck_01_Wheel_Ruined":
+					newWheel = "Truck_01_Wheel";
+					break;
+	
+				case "Truck_01_WheelDouble_Ruined":
+					newWheel = "Truck_01_WheelDouble";
+					break;
+
+				case "Offroad_02_Wheel_Ruined":
+					newWheel = "Offroad_02_Wheel";
+					break;
+			}
+
+			if (newWheel != "")
+			{
+				//Unlock to allow creating a new item
+				if (IsLockedInSlot())
+					UnlockFromParent();
+
+				ReplaceWheelLambda lambda = new ReplaceWheelLambda(this, newWheel, null);
+				lambda.SetTransferParams(true, true, true);
+				GetInventory().ReplaceItemWithNew(InventoryMode.SERVER, lambda);
+			}
+		}
+		#endif
+	}
+	
+}
+
+class ReplaceWheelLambda : TurnItemIntoItemLambda
+{
+	vector m_oldOri;
+
+	void ReplaceWheelLambda(EntityAI old_item, string new_item_type, PlayerBase player);
+	
+	// No super, because we want to skip the LocationCanRemove check...
+	override protected bool CanExecuteLambda()
+	{
+		return m_OldItem != null;
+	}
+	
+	override void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+		m_oldOri = old_item.GetOrientation();
+	}
+	
+	override protected void OnSuccess(EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		
+		if (new_item)
+			new_item.SetOrientation(m_oldOri);
+	}
+}
+
+class Hatchback_02_Wheel extends CarWheel {};
+class Hatchback_02_Wheel_Ruined extends CarWheel_Ruined {};
+
+class Sedan_02_Wheel extends CarWheel {};
+class Sedan_02_Wheel_Ruined extends CarWheel_Ruined {};
+
+class HatchbackWheel extends CarWheel {};
+class HatchbackWheel_Ruined extends CarWheel_Ruined {};
+
+class CivSedanWheel extends CarWheel {};
+class CivSedanWheel_Ruined extends CarWheel_Ruined {};
+
+class Truck_01_Wheel extends CarWheel {};
+class Truck_01_Wheel_Ruined extends CarWheel_Ruined {};
+
+class Truck_01_WheelDouble extends CarWheel {};
+class Truck_01_WheelDouble_Ruined extends CarWheel_Ruined {};
+
+class Offroad_02_Wheel extends CarWheel {};
+class Offroad_02_Wheel_Ruined extends CarWheel_Ruined {};
+
+class CarDoor extends InventoryItemSuper
+{
+
+	override bool CanDetachAttachment(EntityAI parent)
+	{
+		InventoryLocation loc = new InventoryLocation();
+		
+		bool isPresent = GetInventory().GetCurrentInventoryLocation( loc );
+		
+		if ( !isPresent || loc.GetSlot() == -1 )
+			return false;
+		
+		string slotName = InventorySlots.GetSlotName( loc.GetSlot() );
+
+		if ( slotName && CarScript.Cast( parent ).GetCarDoorsState( slotName ) == CarDoorState.DOORS_OPEN )
+			return true;
+		
+		return false;
+	}
+
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if ( newLevel ==  GameConstants.STATE_RUINED && m_Initialized )
+		{
+			EffectSound sound_plug;
+			switch ( zone )
+			{
+				case "Window":
+					PlaySoundSet( sound_plug, "offroad_hit_window_small_SoundSet", 0, 0 );
+				break;
+			}
+		}
+	}
+	
+	override bool DisplayNameRuinAttach()
+	{
+		return true;
+	}
+	
+	override bool ShowZonesHealth()
+	{
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionAttachOnSelection);
+		AddAction(ActionDetach);
+	}
+	
+};
+
+//-------------------------------------
+class Hatchback_02_Door_1_1 extends CarDoor {};
+class Hatchback_02_Door_1_2 extends CarDoor {};
+class Hatchback_02_Door_2_1 extends CarDoor {};
+class Hatchback_02_Door_2_2 extends CarDoor {};
+class Hatchback_02_Hood extends CarDoor {};
+class Hatchback_02_Trunk extends CarDoor {};
+
+class Hatchback_02_Door_1_1_Black extends Hatchback_02_Door_1_1 {};
+class Hatchback_02_Door_1_2_Black extends Hatchback_02_Door_1_2 {};
+class Hatchback_02_Door_2_1_Black extends Hatchback_02_Door_2_1 {};
+class Hatchback_02_Door_2_2_Black extends Hatchback_02_Door_2_2 {};
+class Hatchback_02_Hood_Black extends Hatchback_02_Hood {};
+class Hatchback_02_Trunk_Black extends Hatchback_02_Trunk {};
+
+class Hatchback_02_Door_1_1_Blue extends Hatchback_02_Door_1_1 {};
+class Hatchback_02_Door_1_2_Blue extends Hatchback_02_Door_1_2 {};
+class Hatchback_02_Door_2_1_Blue extends Hatchback_02_Door_2_1 {};
+class Hatchback_02_Door_2_2_Blue extends Hatchback_02_Door_2_2 {};
+class Hatchback_02_Hood_Blue extends Hatchback_02_Hood {};
+class Hatchback_02_Trunk_Blue extends Hatchback_02_Trunk {};
+
+//-------------------------------------
+class Sedan_02_Door_1_1 extends CarDoor {};
+class Sedan_02_Door_1_2 extends CarDoor {};
+class Sedan_02_Door_2_1 extends CarDoor {};
+class Sedan_02_Door_2_2 extends CarDoor {};
+class Sedan_02_Hood extends CarDoor {};
+class Sedan_02_Trunk extends CarDoor {};
+
+class Sedan_02_Door_1_1_YellowRust extends CarDoor {};
+class Sedan_02_Door_1_2_YellowRust extends CarDoor {};
+class Sedan_02_Door_2_1_YellowRust extends CarDoor {};
+class Sedan_02_Door_2_2_YellowRust extends CarDoor {};
+class Sedan_02_Hood_YellowRust extends CarDoor {};
+class Sedan_02_Trunk_YellowRust extends CarDoor {};
+
+class Sedan_02_Door_1_1_Red extends Sedan_02_Door_1_1 {};
+class Sedan_02_Door_1_2_Red extends Sedan_02_Door_1_2 {};
+class Sedan_02_Door_2_1_Red extends Sedan_02_Door_2_1 {};
+class Sedan_02_Door_2_2_Red extends Sedan_02_Door_2_2 {};
+class Sedan_02_Hood_Red extends Sedan_02_Hood {};
+class Sedan_02_Trunk_Red extends Sedan_02_Trunk {};
+
+class Sedan_02_Door_1_1_RedRust extends Sedan_02_Door_1_1 {};
+class Sedan_02_Door_1_2_RedRust extends Sedan_02_Door_1_2 {};
+class Sedan_02_Door_2_1_RedRust extends Sedan_02_Door_2_1 {};
+class Sedan_02_Door_2_2_RedRust extends Sedan_02_Door_2_2 {};
+class Sedan_02_Hood_RedRust extends Sedan_02_Hood {};
+class Sedan_02_Trunk_RedRust extends Sedan_02_Trunk {};
+
+class Sedan_02_Door_1_1_Grey extends Sedan_02_Door_1_1 {};
+class Sedan_02_Door_1_2_Grey extends Sedan_02_Door_1_2 {};
+class Sedan_02_Door_2_1_Grey extends Sedan_02_Door_2_1 {};
+class Sedan_02_Door_2_2_Grey extends Sedan_02_Door_2_2 {};
+class Sedan_02_Hood_Grey extends Sedan_02_Hood {};
+class Sedan_02_Trunk_Grey extends Sedan_02_Trunk {};
+
+class Sedan_02_Door_1_1_GreyRust extends Sedan_02_Door_1_1 {};
+class Sedan_02_Door_1_2_GreyRust extends Sedan_02_Door_1_2 {};
+class Sedan_02_Door_2_1_GreyRust extends Sedan_02_Door_2_1 {};
+class Sedan_02_Door_2_2_GreyRust extends Sedan_02_Door_2_2 {};
+class Sedan_02_Hood_GreyRust extends Sedan_02_Hood {};
+class Sedan_02_Trunk_GreyRust extends Sedan_02_Trunk {};
+
+//-------------------------------------
+class HatchbackDoors_Driver extends CarDoor {};
+class HatchbackDoors_CoDriver extends CarDoor {};
+class HatchbackHood extends CarDoor {};
+class HatchbackTrunk extends CarDoor {};
+
+class HatchbackDoors_Driver_White extends HatchbackDoors_Driver {};
+class HatchbackDoors_CoDriver_White extends HatchbackDoors_CoDriver {};
+class HatchbackHood_White extends HatchbackHood {};
+class HatchbackTrunk_White extends HatchbackTrunk {};
+
+class HatchbackDoors_Driver_Blue extends HatchbackDoors_Driver {};
+class HatchbackDoors_CoDriver_Blue extends HatchbackDoors_CoDriver {};
+class HatchbackHood_Blue extends HatchbackHood {};
+class HatchbackTrunk_Blue extends HatchbackTrunk {};
+
+class HatchbackDoors_Driver_GreenRust extends HatchbackDoors_Driver {};
+class HatchbackDoors_CoDriver_GreenRust extends HatchbackDoors_CoDriver {};
+class HatchbackHood_GreenRust extends HatchbackHood {};
+class HatchbackTrunk_GreenRust extends HatchbackTrunk {};
+
+class HatchbackDoors_Driver_WhiteRust extends HatchbackDoors_Driver {};
+class HatchbackDoors_CoDriver_WhiteRust extends HatchbackDoors_CoDriver {};
+class HatchbackHood_WhiteRust extends HatchbackHood {};
+class HatchbackTrunk_WhiteRust extends HatchbackTrunk {};
+
+class HatchbackDoors_Driver_BlueRust extends HatchbackDoors_Driver {};
+class HatchbackDoors_CoDriver_BlueRust extends HatchbackDoors_CoDriver {};
+class HatchbackHood_BlueRust extends HatchbackHood {};
+class HatchbackTrunk_BlueRust extends HatchbackTrunk {};
+
+//-------------------------------------
+class CivSedanDoors_Driver extends CarDoor {};
+class CivSedanDoors_CoDriver extends CarDoor {};
+class CivSedanDoors_BackLeft extends CarDoor {};
+class CivSedanDoors_BackRight extends CarDoor {};
+class CivSedanHood extends CarDoor {};
+class CivSedanTrunk extends CarDoor {};
+
+class CivSedanDoors_Driver_Black extends CivSedanDoors_Driver {};
+class CivSedanDoors_CoDriver_Black extends CivSedanDoors_CoDriver {};
+class CivSedanDoors_BackLeft_Black extends CivSedanDoors_BackLeft {};
+class CivSedanDoors_BackRight_Black extends CivSedanDoors_BackRight {};
+class CivSedanHood_Black extends CivSedanHood {};
+class CivSedanTrunk_Black extends CivSedanTrunk {};
+
+class CivSedanDoors_Driver_Wine extends CivSedanDoors_Driver {};
+class CivSedanDoors_CoDriver_Wine extends CivSedanDoors_CoDriver {};
+class CivSedanDoors_BackLeft_Wine extends CivSedanDoors_BackLeft {};
+class CivSedanDoors_BackRight_Wine extends CivSedanDoors_BackRight {};
+class CivSedanHood_Wine extends CivSedanHood {};
+class CivSedanTrunk_Wine extends CivSedanTrunk {};
+
+
+class CivSedanDoors_Driver_WhiteRust extends CivSedanDoors_Driver {};
+class CivSedanDoors_CoDriver_WhiteRust extends CivSedanDoors_CoDriver {};
+class CivSedanDoors_BackLeft_WhiteRust extends CivSedanDoors_BackLeft {};
+class CivSedanDoors_BackRight_WhiteRust extends CivSedanDoors_BackRight {};
+class CivSedanHood_WhiteRust extends CivSedanHood {};
+class CivSedanTrunk_WhiteRust extends CivSedanTrunk {};
+
+class CivSedanDoors_Driver_WineRust extends CivSedanDoors_Driver {};
+class CivSedanDoors_CoDriver_WineRust extends CivSedanDoors_CoDriver {};
+class CivSedanDoors_BackLeft_WineRust extends CivSedanDoors_BackLeft {};
+class CivSedanDoors_BackRight_WineRust extends CivSedanDoors_BackRight {};
+class CivSedanHood_WineRust extends CivSedanHood {};
+class CivSedanTrunk_WineRust extends CivSedanTrunk {};
+
+class CivSedanDoors_Driver_BlackRust extends CivSedanDoors_Driver {};
+class CivSedanDoors_CoDriver_BlackRust extends CivSedanDoors_CoDriver {};
+class CivSedanDoors_BackLeft_BlackRust extends CivSedanDoors_BackLeft {};
+class CivSedanDoors_BackRight_BlackRust extends CivSedanDoors_BackRight {};
+class CivSedanHood_BlackRust extends CivSedanHood {};
+class CivSedanTrunk_BlackRust extends CivSedanTrunk {};
+
+
+//-------------------------------------
+class Truck_01_Door_1_1 extends CarDoor {};
+class Truck_01_Door_2_1 extends CarDoor {};
+class Truck_01_Door_Hood extends CarDoor {};
+
+class Truck_01_Door_1_1_Blue extends Truck_01_Door_1_1 {};
+class Truck_01_Door_2_1_Blue extends Truck_01_Door_2_1 {};
+class Truck_01_Door_Hood_Blue extends Truck_01_Door_Hood {};
+
+class Truck_01_Door_1_1_Orange extends Truck_01_Door_1_1 {};
+class Truck_01_Door_2_1_Orange extends Truck_01_Door_2_1 {};
+class Truck_01_Door_Hood_Orange extends Truck_01_Door_Hood {};
+
+class Truck_01_Door_1_1_GreenRust extends Truck_01_Door_1_1 {};
+class Truck_01_Door_2_1_GreenRust extends Truck_01_Door_2_1 {};
+class Truck_01_Hood_GreenRust extends Truck_01_Door_Hood {};
+
+class Truck_01_Door_1_1_BlueRust extends Truck_01_Door_1_1 {};
+class Truck_01_Door_2_1_BlueRust extends Truck_01_Door_2_1 {};
+class Truck_01_Hood_BlueRust extends Truck_01_Door_Hood {};
+
+class Truck_01_Door_1_1_OrangeRust extends Truck_01_Door_1_1 {};
+class Truck_01_Door_2_1_OrangeRust extends Truck_01_Door_2_1 {};
+class Truck_01_Hood_OrangeRust extends Truck_01_Door_Hood {};
+
+
+//-------------------------------------
+class Offroad_02_Door_1_1 extends CarDoor {};
+class Offroad_02_Door_1_2 extends CarDoor {};
+class Offroad_02_Door_2_1 extends CarDoor {};
+class Offroad_02_Door_2_2 extends CarDoor {};
+class Offroad_02_Trunk extends CarDoor {};
+
+class Offroad_02_Hood extends CarDoor
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionDetach);
+		RemoveAction(ActionAttachOnSelection);
+	}
+};
+
+class Offroad_02_Door_1_1_Rust extends CarDoor {};
+class Offroad_02_Door_1_2_Rust extends CarDoor {};
+class Offroad_02_Door_2_1_Rust extends CarDoor {};
+class Offroad_02_Door_2_2_Rust extends CarDoor {};
+class Offroad_02_Trunk_Rust extends CarDoor {};
+
+//-------------------------------------
+class CarRadiator extends InventoryItemSuper
+{
+	override bool DisplayNameRuinAttach()
+	{
+		return true;
+	}
+	
+	override bool ShowZonesHealth()
+	{
+		return true;
+	}
+
+	override void EEKilled(Object killer)
+	{
+		if ( GetGame().IsServer() )
+		{
+			Car car;
+			EntityAI parent = GetHierarchyParent();
+			
+			Class.CastTo( car, parent );
+
+		
+			if ( car )
+			{
+				float amount = car.GetFluidFraction( CarFluid.COOLANT );
+				float newAmount = Math.RandomFloat( amount * 0.2, amount * 0.75 );
+
+				car.Leak( CarFluid.COOLANT, newAmount );
+			}
+		}
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachOnSelection);
+		AddAction(ActionDetach);
+	}
+};
+
+class TruckRadiator extends CarRadiator {};
+
+class TruckExhaust extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttach);
+	}
+};
+
+class EngineBelt extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttach);
+	}
+};
+
+class BrakeFluid extends ItemBase {};
+
+class EngineOil extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionFillOil);
+	}
+};
+
+class TireRepairKit extends ItemBase {};
+
+class HeadlightH7 extends ItemBase
+{
+	override bool DisplayNameRuinAttach()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachOnSelection);
+		AddAction(ActionDetach);
+	}
+};
+
+class HeadlightH7_Box extends Box_Base {};
+
+class WindscreenBox extends ItemBase {};
+
+class GlowPlug extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDetach);
+		AddAction(ActionAttach);
+	}
+};
+
+class SparkPlug extends ItemBase
+{
+	override bool DisplayNameRuinAttach()
+	{
+		return true;
+	}
+	
+	override bool ShowZonesHealth()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachOnSelection);
+		AddAction(ActionDetach);
+	}
+};
+
+
+//-----------------------------------------------------------------------------
+class Clothing_Base extends ItemBase
+{
+	float m_ItemVisibilityModifier;
+	
+	void Clothing_Base()
+	{
+		m_ItemVisibilityModifier = ConfigGetFloat("visibilityModifier");
+	}
+	
+	void ~Clothing_Base()
+	{
+		HandleVoiceEffect(false, PlayerBase.Cast(GetHierarchyRootPlayer()));
+	}
+	
+	override bool IsClothing()
+	{
+		return true;
+	}
+
+	float GetItemVisibility()
+	{
+		return m_ItemVisibilityModifier;
+	}
+	
+	void UpdateNVGStatus(PlayerBase player, bool attaching = false, bool force_disable = false)
+	{
+		NVGoggles NVGAttachment;
+		NVGAttachment = NVGoggles.Cast(FindAttachmentBySlotName("NVG"));
+		bool has_nvg_slot;
+		for (int i = 0; i < GetInventory().GetAttachmentSlotsCount(); i++)
+		{
+			has_nvg_slot = GetInventory().GetAttachmentSlotId(i) == InventorySlots.GetSlotIdFromString("NVG");
+			if (has_nvg_slot)
+				break;
+		}
+		
+		if ( player && has_nvg_slot )
+		{
+			if ( NVGAttachment )
+			{
+				NVGAttachment.LoweredCheck();
+				
+				if ( attaching && NVGAttachment.m_Strap && NVGAttachment.m_IsLowered )
+				{
+					NVGAttachment.SetPlayer(player);
+					player.SetNVGLowered(true);
+					
+					if ( player.IsControlledPlayer() )
+					{
+						if ( NVGAttachment.IsWorking() )
+						{
+							player.AddActiveNV(NVTypes.NV_GOGGLES);
+							//player.RemoveActiveNV(NVTypes.NV_GOGGLES_OFF);
+						}
+						else
+						{
+							//player.AddActiveNV(NVTypes.NV_GOGGLES_OFF);
+							player.RemoveActiveNV(NVTypes.NV_GOGGLES);
+						}
+					}
+				}
+				else
+				{
+					NVGAttachment.SetPlayer(null);
+					player.SetNVGLowered(false);
+					
+					if ( player.IsControlledPlayer() )
+					{
+						player.RemoveActiveNV(NVTypes.NV_GOGGLES);
+						//player.RemoveActiveNV(NVTypes.NV_GOGGLES_OFF);
+					}
+				}
+			}
+			else if ( player.IsNVGWorking() && force_disable )
+			{
+				player.SetNVGLowered(false);
+				
+				if ( player.IsControlledPlayer() )
+				{
+					player.RemoveActiveNV(NVTypes.NV_GOGGLES);
+					//player.RemoveActiveNV(NVTypes.NV_GOGGLES_OFF);
+				}
+			}
+		}
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if ( slot_id == InventorySlots.HEADGEAR || slot_id == InventorySlots.MASK )
+			HandleVoiceEffect(true, PlayerBase.Cast(GetHierarchyRootPlayer()));
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		HandleVoiceEffect(false, PlayerBase.Cast(parent));
+	}
+	
+	//! Returns if this entity obsructs player's voice
+	bool IsObstructingVoice()
+	{
+		return false;
+	}
+	
+	//! This items has effect on player's voice
+	// Better name for this would have been "MufflePlayer" or "ChangeVoiceEffect" (Too late to change in case a mod already uses this)
+	void MutePlayer(PlayerBase player, bool state)
+	{
+		#ifdef SERVER
+		if (GetGame() && player.GetIdentity() != null)
+		{
+			GetGame().SetVoiceEffect(player, GetVoiceEffect(), state);
+		}
+		#endif
+	}
+	
+	//!
+	void HandleVoiceEffect(bool enable, PlayerBase player)
+	{
+		if ( IsObstructingVoice() && player )
+			MutePlayer(player, enable);
+	}
+	
+	//! The voice effect this item uses, default is 0 (none)
+	// Options: (VoiceEffectMumbling = 1, VoiceEffectExtortion = 2, VoiceEffectObstruction = 4)
+	int GetVoiceEffect()
+	{
+		return 0;
+	}
+	
+	bool IsGasMask()
+	{
+		return false;
+	}
+};
+
+//-----------------------------------------------------------------------------
+class Box_Base extends InventoryItemSuper
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionUnpackBox);
+	}
+};
+
+//-----------------------------------------------------------------------------
+class ItemGrenade extends InventoryItemSuper
+{
+	/**@fn		SetPinned
+	 * @brief	sets grenade to state GR_PINNED (if the state transition is possible)
+	 * @return	true if state already set or if state transition performed, false otherwise
+	 **/
+	proto native bool SetPinned ();
+	/**@fn		SetUnpinned
+	 * @brief	sets grenade to state GR_UNPINNED (if the state transition is possible)
+	 * @return	true if state already set or if state transition performed, false otherwise
+	 **/
+	proto native bool SetUnpinned ();
+	/**@fn		SetIgnited
+	 * @brief	sets grenade to state GR_TRIGGERED (if the state transition is possible)
+	 * @return	true if state already set or if state transition performed, false otherwise
+	 **/
+	proto native bool SetIgnited ();
+	/**@fn		IsPinned
+	 * @return	true if grenade is pinned
+	 **/
+	proto native bool IsPinned ();
+	/**@fn		IsActivated
+	 * @return	true if grenade is GR_TRIGGERED or GR_EXPLODED
+	 **/
+	proto native bool IsActivated ();
+};
+
+typedef ItemGrenade GrenadeBase;
+
+//-----------------------------------------------------------------------------
+class ItemMap extends InventoryItemSuper
+{
+	//protected ref array<vector,int,int,string> 	m_MarkerArray;
+	protected ref array<ref MapMarker> 	m_MapMarkerArray;
+	
+	string	m_TextureClosed;
+	string 	m_TextureOpened;
+	string 	m_TextureLegend;
+	string 	m_DisplayName;
+	string 	m_Description;
+	
+	void ItemMap()
+	{
+		InitMapState();
+	}
+	
+	void InitMapState()
+	{
+		string path = "CfgWorlds " + GetGame().GetWorldName();
+		
+		GetGame().ConfigGetText(path + " mapDisplayNameKey",m_DisplayName);
+		GetGame().ConfigGetText(path + " mapDescriptionKey",m_Description);
+		GetGame().ConfigGetText(path + " mapTextureClosed",m_TextureClosed);
+		GetGame().ConfigGetText(path + " mapTextureOpened",m_TextureOpened);
+		GetGame().ConfigGetText(path + " mapTextureLegend",m_TextureLegend);
+		
+		SetObjectTexture(0,m_TextureClosed);
+		SetObjectTexture(1,m_TextureOpened);
+		SetObjectTexture(2,m_TextureLegend);
+		
+		//m_MarkerArray = new ref array<vector,int,int,string>;
+		m_MapMarkerArray = new ref array<ref MapMarker>;
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+		{
+			SyncMapMarkers();
+		}
+	}
+	
+	override void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner)
+	{
+		super.OnItemLocationChanged(old_owner,new_owner);
+		
+		SetMapStateOpen(false, PlayerBase.Cast(old_owner));
+	}
+	
+	//! displays open/closed selections; 1 == opened
+	void SetMapStateOpen(bool state, PlayerBase player)
+	{
+		if (player)
+		{
+			player.SetMapOpen(state);
+			if (state)
+				player.OnItemInHandsChanged();
+		}
+		
+		if (state)
+		{
+			ShowSelection("map_opened");
+			HideSelection("map_closed");
+		}
+		else
+		{
+			ShowSelection("map_closed");
+			HideSelection("map_opened");
+		}
+	}
+	
+	bool GetMapStateAnimation()
+	{
+		if (GetAnimationPhase("map_opened") == 0)
+			return true;
+		return false;
+	}
+	
+	void SyncMapMarkers()
+	{
+		if (m_MapMarkerArray.Count() <= 0)
+			return;
+		
+		PlayerIdentity pid; 
+		//Param1<ref array<vector,int,int,string>> params = new Param1<ref array<vector,int,int,string>>( m_MarkerArray );
+		Param1<ref array<ref MapMarker>> params = new Param1<ref array<ref MapMarker>>( m_MapMarkerArray );
+		
+		if (GetGame().IsServer() && GetHierarchyRootPlayer()) //TODO do we need PlayerIdentity here?
+		{
+			pid = GetHierarchyRootPlayer().GetIdentity();
+			RPCSingleParam(ERPCs.RPC_SEND_MAP_MARKERS,params,true,pid);
+		}
+		else
+		{
+			RPCSingleParam(ERPCs.RPC_SEND_MAP_MARKERS,params,true);
+		}
+	}
+	
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(sender, rpc_type, ctx);
+		
+		//array<vector,int,int,string> tmp_array = new array<vector,int,int,string>;
+		//Param1<ref array<vector,int,int,string>> param = new Param1<ref array<vector,int,int,string>>(m_MarkerArray);
+		Param1<ref array<ref MapMarker>> params = new Param1<ref array<ref MapMarker>>( m_MapMarkerArray );
+		
+		if (rpc_type == ERPCs.RPC_SEND_MAP_MARKERS)
+		{
+			if (ctx.Read(params))
+			{
+				//Print("Map | OnRPC | m_MapMarkerArray_new count: " + m_MapMarkerArray_new.Count());
+			}
+		}
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+		
+		if (version >= 108 && !ctx.Read(m_MapMarkerArray))
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		ctx.Write(m_MapMarkerArray);		
+	}
+	
+	override bool NameOverride(out string output)
+	{
+		output = m_DisplayName;
+		
+		return true;
+	}
+	
+	override bool DescriptionOverride(out string output)
+	{
+		output = m_Description;
+		
+		return true;
+	}
+	
+	void InsertMarker(vector pos, string text, int color, int idx)
+	{
+		ref MapMarker marker = MapMarker(pos,text,color,idx);
+		m_MapMarkerArray.Insert(marker);
+	}
+	
+	array<ref MapMarker> GetMarkerArray()
+	{
+		return m_MapMarkerArray;
+	}
+};
+
+class MapMarker
+{
+	protected vector 	m_Position;
+	protected int  		m_Color;
+	protected int 		m_IconIdx;
+	protected string 	m_Text;
+	
+	void MapMarker(vector pos, string text, int color, int idx)
+	{
+		m_Position = pos;
+		m_Text = text;
+		m_Color = color;
+		m_IconIdx = idx;
+	}
+	
+	vector GetMarkerPos()
+	{
+		return m_Position;
+	}
+	
+	string GetMarkerText()
+	{
+		return m_Text;
+	}
+	
+	int GetMarkerColor()
+	{
+		return m_Color;
+	}
+	
+	int GetMarkerIcon()
+	{
+		return m_IconIdx;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/InventoryItemType.c b/scripts/4_World/DayZ/Entities/Core/Inherited/InventoryItemType.c
new file mode 100644
index 0000000000000000000000000000000000000000..96a5d1db3ff3e5c96138dbc057d00f2213d26393
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/InventoryItemType.c
@@ -0,0 +1,63 @@
+class CarWheelType extends InventoryItemType
+{
+};
+
+class ClothingType extends InventoryItemType
+{
+};
+
+class ItemWatchType extends InventoryItemType
+{
+};
+
+class ItemRadioType extends InventoryItemType
+{
+};
+
+class ItemTransmitterType extends ClothingType
+{
+};
+
+class ItemMegaphoneType extends InventoryItemType
+{
+};
+
+class ItemCompassType extends InventoryItemType
+{
+};
+
+class ItemGPSType extends InventoryItemType
+{
+};
+
+class ItemMapType extends InventoryItemType
+{
+};
+
+class ItemBookType extends InventoryItemType
+{
+};
+
+class ItemOpticsType extends InventoryItemType
+{
+};
+
+class ItemBarrelType extends InventoryItemType
+{
+};
+
+class ItemSuppressorType extends InventoryItemType
+{
+};
+
+class ItemGrenadeType extends InventoryItemType
+{
+};
+
+class WeaponType extends InventoryItemType
+{
+};
+
+class MagazineType extends InventoryItemType
+{
+};
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/ItemOptics.c b/scripts/4_World/DayZ/Entities/Core/Inherited/ItemOptics.c
new file mode 100644
index 0000000000000000000000000000000000000000..e8044e60966ef92165120bac67aee322be914ba1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/ItemOptics.c
@@ -0,0 +1,539 @@
+class ItemOptics extends InventoryItemSuper
+{
+	bool 				m_data_set;
+	bool 				m_allowsDOF; //true if optics DOES NOT have magnification (FOV >= DZPLAYER_CAMERA_FOV_IRONSIGHTS)
+	bool 				m_reddot_displayed
+	bool 				m_isNVOptic = false;
+	int 				m_CurrentOpticMode; //generic optic mode, currently used for NV optics only (could be expanded)
+	int 				m_CurrentOpticModeLocal; //local mirror for sync purposes;
+	int 				m_reddot_index;
+	float 				m_blur_float;
+	float 				m_nearplane_override; //override value for DayZPlayerCameraOptics only!
+	string 				m_optic_sight_texture;
+	string 				m_optic_sight_material;
+	string 				m_2D_preload_type;
+	ref array<float> 	m_mask_array;
+	ref array<float> 	m_lens_array;
+	ref array<float> 	m_OpticsDOFProperties;
+		
+	void ItemOptics()
+	{
+		m_mask_array = new array<float>;
+		m_lens_array = new array<float>;
+		m_OpticsDOFProperties = new array<float>;
+		
+		InitReddotData();
+		InitOpticsPPInfo();
+		InitCameraOverrideProperties();
+		InitOpticsDOFProperties(m_OpticsDOFProperties);
+		Init2DPreloadType();
+		InitOpticMode();
+		
+		m_CurrentOpticModeLocal = -1;
+		RegisterNetSyncVariableInt( "m_CurrentOpticMode", 0, 63 );
+	}
+	
+	/**@fn		EnterOptics
+	 * @brief	switches to optics mode if possible
+	 * @return true if success, false otherwise
+	 **/
+	proto native bool EnterOptics ();
+	
+	/**@fn		IsInOptics
+	 * @brief	is weapon in optics mode or not
+	 * @return true if in optics mode, false otherwise
+	 **/
+	proto native bool IsInOptics ();
+	
+	/**@fn		ExitOptics
+	 * @brief	switches out of optics mode (if possible)
+	 * @return true if success, false otherwise
+	 **/
+	proto native bool ExitOptics ();
+
+	/**@fn		HasWeaponIronsightsOverride
+	 * @brief	is weapon in optics mode or not
+	 * @return true if optics has defined override optics info for weapon
+	 **/
+	proto native bool HasWeaponIronsightsOverride ();
+	
+	/**@fn		UseWeaponIronsightsOverride
+	 * @brief	switches into ironsights override settings
+	 * @return  true if switching was successful
+	 **/
+	proto native bool UseWeaponIronsightsOverride(bool state);
+
+	/**@fn		IsUsingWeaponIronsightsOverride
+	 * @brief	is optics using ironsights override settings or not
+	 * @return  true if optics is using ironsights override settings
+	 **/
+	proto native bool IsUsingWeaponIronsightsOverride();
+
+		/**@fn		GetStepFOVCount
+	 * @brief	returns number of configured steps
+	 **/
+	proto native int GetStepFOVCount ();
+	
+	/**@fn		GetStepFOVIndex
+	 * @brief	returns index of currently used value in 'discretefov' config array
+	 * @return	index of currently used value in 'discretefov' config array
+	 **/
+	proto native int GetStepFOVIndex ();
+	
+	/**@fn		SetStepFOVIndex
+	 * @brief sets zoom to fov value defined at given in 'discretefov' config array
+	 * @param[in] index of configured step, range [0..cfg_max]
+	 * @return	true if zoom set
+	 **/
+	proto native bool SetStepFOVIndex (int step);
+	
+	/**@fn		StepFOVUp
+	 * @brief sets zoom to next defined (respective to current) value in zoom fov config array
+	 * @return	true if zoom set
+	 **/
+	proto native bool StepFOVUp ();
+	
+	/**@fn		StepFOVDown
+	 * @brief	sets zoom to previous (respective to current) defined value in zoom fov config array
+	 * @return	true if zoom set
+	 **/
+	proto native bool StepFOVDown ();
+
+	/**@fn		GetCurrentStepFOV
+	 * @brief	returns fov value at current index, or 'OpticsInfo.opticsZoomInit' config value (non-zooming optics)
+	 **/
+	proto native float GetCurrentStepFOV ();
+
+	/**@fn		GetStepZeroing
+	 * @brief	returns position of currently used value in zeroing config array
+	 * @return	 position of currently used value in zeroing config array
+	 **/
+	proto native int GetStepZeroing ();
+	
+	/**@fn		SetZeroing
+	 * @brief sets zeroing to value defined at given position in zeroing config array
+	 * @param[in] index of zeroing to set [0..cfg_max]
+	 * @return	true if zeroing set
+	 **/
+	proto native bool SetStepZeroing (int step);
+	
+	/**
+	 * @fn		StepZeroingUp
+	 * @brief sets zeroing to next defined (respective to current) value in zeroing config array
+	 * @return true if zeroing set
+	 **/
+	proto native bool StepZeroingUp ();
+	
+	/**
+	 * @fn		StepZeroingDown
+	 * @brief	sets zeroing to previous (respective to current) defined value in zeroing config array
+	 * @return true if zeroing set
+	 **/
+	proto native bool StepZeroingDown ();
+	
+	/**
+	 * @fn		GetCameraPoint
+	 * @brief	gets camera position & direction in model space of optics entity
+	 **/
+	proto native void GetCameraPoint (out vector pos, out vector dir);
+	
+	/**
+	 * @fn		GetZoomInit
+	 * @brief	gets FOV value, when entering optics
+	 **/
+	proto native float GetZoomInit();
+
+	/**
+	 * @fn		GetZoomMin
+	 * @brief	gets FOV minimum
+	 **/
+	proto native float GetZoomMin();
+
+	/**
+	 * @fn		GetZoomMax
+	 * @brief	gets FOV maximum
+	 **/
+	proto native float GetZoomMax();
+
+	/**
+	 * @fn		GetZeroingDistanceZoomMin
+	 * @brief	Gets Zeroing distance at opticsZoomMin
+	 **/
+	proto native float GetZeroingDistanceZoomMin();
+	
+	/**
+	 * @fn		GetZeroingDistanceZoomMax
+	 * @brief	Gets Zeroing distance at opticsZoomMax
+	 **/
+	proto native float GetZeroingDistanceZoomMax();
+
+	/**
+	 * @fn		SetZeroingClampDist
+	 * @brief	Sets zeroing clamp for the optics and updates the clamp if dist > 0. Used when attached to weapon.
+	 **/
+	proto native void SetZeroingClampDist(float dist);
+	
+	override void OnWorkStart()
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			ShowReddot(true);
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			ShowReddot(false);
+		}
+	}
+	
+	bool IsWorking()
+	{
+		if (GetCompEM() && GetCompEM().CanWork())
+			return true;
+		return false;
+	}
+	
+	void UpdateOpticsReddotVisibility()
+	{
+		if (IsWorking() && !m_reddot_displayed)
+		{
+			ShowReddot(true);
+		}
+		else if (!IsWorking() && m_reddot_displayed)
+		{
+			ShowReddot(false);
+		}
+	}
+	
+	override void OnWasAttached( EntityAI parent, int slot_id )
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		SetTakeable(false);
+		
+		Weapon wep;
+		if (Class.CastTo(wep,parent))
+		{
+			SetZeroingClampDist(wep.GetZeroingClamp(wep.GetCurrentMuzzle()));
+		}
+	}
+
+	override void OnWasDetached( EntityAI parent, int slot_id )
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		PlayerBase player;
+		if (PlayerBase.CastTo(player, GetHierarchyRootPlayer()))
+		{
+			player.SetReturnToOptics(false);
+		}
+		
+		SetTakeable(true);
+		
+		Weapon wep;
+		if (Class.CastTo(wep,parent))
+		{
+			SetZeroingClampDist(0.0);
+		}
+	}
+	
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		PlayerBase playerPB;
+		if (PlayerBase.CastTo(playerPB, player))
+		{
+			playerPB.SetReturnToOptics(false);
+		}
+		
+		SetTakeable(true);
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		ctx.Write(m_CurrentOpticMode);
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if ( !super.OnStoreLoad(ctx,version) )
+		{
+			return false;
+		}
+		m_IsStoreLoad = true;
+		
+		if ( version >= 126 )
+		{
+			if ( !ctx.Read(m_CurrentOpticMode) )
+			{
+				m_IsStoreLoad = false;
+				return false;
+			}
+		}
+		
+		OnOpticModeChange();
+		SetSynchDirty();
+		
+		m_IsStoreLoad = false;
+		return true;
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if (m_CurrentOpticModeLocal != m_CurrentOpticMode)
+		{
+			OnOpticModeChange();
+			m_CurrentOpticModeLocal = m_CurrentOpticMode;
+		}
+	} 
+	
+	void InitReddotData()
+	{
+		string path = "cfgVehicles " + GetType() + " OpticsInfo";
+		string temp;
+		
+		if (GetGame().ConfigIsExisting(path))
+		{
+			m_reddot_index = GetHiddenSelectionIndex("reddot");
+			if (GetGame().ConfigIsExisting(path + " opticSightTexture"))
+			{
+				GetGame().ConfigGetText(path + " opticSightTexture", temp);
+				m_optic_sight_texture = temp;
+				temp = "";
+			}
+			if (GetGame().ConfigIsExisting(path + " opticSightMaterial"))
+			{
+				GetGame().ConfigGetText(path + " opticSightMaterial", temp);
+				m_optic_sight_material = temp;
+				temp = "";
+			}
+		}
+		m_data_set = true;
+	}
+	
+	void ShowReddot(bool state)
+	{
+		if (GetGame().IsDedicatedServer())
+		{
+			ErrorEx("should not be called on the server!",ErrorExSeverity.INFO);
+			return;
+		}
+		
+		if (!m_data_set)
+		{
+			InitReddotData();
+		}
+		
+		// does not have reddot
+		if (m_reddot_index == -1)
+		{
+			return;
+		}
+		
+		if (state)
+		{
+			if (m_optic_sight_texture != "")
+				SetObjectTexture(m_reddot_index, m_optic_sight_texture);
+			if (m_optic_sight_material != "")
+				SetObjectMaterial(m_reddot_index, m_optic_sight_material);
+		}
+		else
+		{
+			SetObjectTexture(m_reddot_index, "");
+			SetObjectMaterial(m_reddot_index, "");
+		}
+		m_reddot_displayed = state;
+	}
+	
+	void InitOpticsPPInfo()
+	{
+		m_allowsDOF = InitDOFAvailability();
+		InitOpticsPP(m_mask_array, m_lens_array, m_blur_float);
+		
+		m_isNVOptic = ConfigGetBool("NVOptic");
+	}
+	
+	//! optics with more than 1x zoom do not allow DOF changes
+	bool InitDOFAvailability()
+	{
+		float fov_max;
+		string path = "cfgVehicles " + GetType() + " OpticsInfo";
+		
+		/*
+		Weapon_Base weapon = Weapon_Base.Cast(GetHierarchyParent());
+		if (!weapon)
+			return false; // no DOF for handheld optics
+		*/
+		fov_max = GetGame().ConfigGetFloat(path + " opticsZoomMax");
+		if (fov_max >= GameConstants.DZPLAYER_CAMERA_FOV_IRONSIGHTS)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	//! initializes values for optics' post-processes
+	void InitOpticsPP(out array<float> mask_array, out array<float> lens_array, out float blur_float)
+	{
+		string path = "cfgVehicles " + GetType() + " OpticsInfo";
+		GetGame().ConfigGetFloatArray(path + " PPMaskProperties", mask_array);
+		GetGame().ConfigGetFloatArray(path + " PPLensProperties", lens_array);
+		blur_float = GetGame().ConfigGetFloat(path + " PPBlurProperties");
+	}
+	
+	void InitCameraOverrideProperties()
+	{
+		string path = "cfgVehicles " + GetType() + " OpticsInfo";
+		if ( GetGame().ConfigIsExisting(path + " nearPlaneDistanceOverride") )
+		{
+			m_nearplane_override = Math.Max(GetGame().ConfigGetFloat(path + " nearPlaneDistanceOverride"),DayZPlayerCameraBase.CONST_NEARPLANE_OPTICS_MIN);
+		}
+		else
+		{
+			m_nearplane_override = DayZPlayerCameraOptics.CONST_NEARPLANE_OPTICS;
+		}
+	}
+	
+	//! Initializes DOF properties for optic's alternate ironsights (ACOG etc.)
+	bool InitOpticsDOFProperties (out array<float> temp_array)
+	{
+		if (GetGame().ConfigIsExisting("cfgVehicles " + GetType() + " OpticsInfo PPDOFProperties"))
+		{
+			GetGame().ConfigGetFloatArray("cfgVehicles " + GetType() + " OpticsInfo PPDOFProperties", temp_array);
+			return true;
+		}
+		else if (GetGame().ConfigIsExisting("cfgVehicles " + GetType() + " OpticsInfoWeaponOverride PPDOFProperties"))
+		{
+			GetGame().ConfigGetFloatArray("cfgVehicles " + GetType() + " OpticsInfoWeaponOverride PPDOFProperties", temp_array);
+			return true;
+		}
+		return false;
+	}
+	
+	//! returns 'true' for non-magnifying optics
+	bool AllowsDOF()
+	{
+		return m_allowsDOF;
+	}
+	
+	bool IsNVOptic()
+	{
+		return m_isNVOptic;
+	}
+	
+	int GetCurrentNVType()
+	{
+		/*
+		//TODO - implement this into NV optics and modify (KazuarOptic example below)
+		if (IsWorking())
+		{
+			switch (m_CurrentOpticMode)
+			{
+				case GameConstants.OPTICS_STATE_DAY:
+					return NVTypes.NV_OPTICS_KAZUAR_DAY;
+				
+				case GameConstants.OPTICS_STATE_NIGHTVISION:
+					return NVTypes.NV_OPTICS_KAZUAR_NIGHT;
+			}
+		}
+		else
+		{
+			return NVTypes.NV_OPTICS_OFF;
+		}
+		*/
+		return NVTypes.NONE;
+	}
+	
+	void SetCurrentOpticMode(int mode)
+	{
+		m_CurrentOpticMode = mode;
+		OnOpticModeChange();
+	}
+	
+	int GetCurrentOpticMode()
+	{
+		return m_CurrentOpticMode;
+	}
+	
+	//! optic-specific behaviour to be defined here (override)
+	void OnOpticModeChange(){}
+	void OnOpticEnter()
+	{
+		if ( GetGame() && !GetGame().IsDedicatedServer() )
+		{
+			HideSelection("hide");
+		}
+	}
+	void OnOpticExit()
+	{
+		if ( GetGame() && !GetGame().IsDedicatedServer() )
+		{
+			ShowSelection("hide");
+		}
+	}
+	
+	ref array<float> GetOpticsDOF()
+	{
+		return m_OpticsDOFProperties;
+	}
+	ref array<float> GetOpticsPPMask()
+	{
+		return m_mask_array;
+	}
+	ref array<float> GetOpticsPPLens()
+	{
+		return m_lens_array;
+	}
+	float GetOpticsPPBlur()
+	{
+		return m_blur_float;
+	}
+	
+	float GetNearPlaneValue()
+	{
+		return m_nearplane_override;
+	}
+	
+	void Init2DPreloadType()
+	{
+		string path = "cfgVehicles " + GetType() + " OpticsInfo preloadOpticType";
+		string type_2d;
+		
+		if ( GetGame().ConfigIsExisting(path) )
+		{
+			GetGame().ConfigGetText(path, type_2d);
+			m_2D_preload_type = type_2d;
+		}
+	}
+	
+	void InitOpticMode()
+	{
+		SetCurrentOpticMode(GameConstants.OPTICS_STATE_DAY);
+	}
+	
+	void UpdateSelectionVisibility() {}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionViewOptics);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateAttachment("Battery9V");
+	}
+}
+
+typedef ItemOptics OpticBase;
+
+
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/LightAI.c b/scripts/4_World/DayZ/Entities/Core/Inherited/LightAI.c
new file mode 100644
index 0000000000000000000000000000000000000000..4ec049bd0091a22dd87ac9a8a0340a0ec9a62008
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/LightAI.c
@@ -0,0 +1,9 @@
+//-----------------------------------------------------------------------------
+class Animal extends LightAISuper
+{
+};
+
+//-----------------------------------------------------------------------------
+class Zombie extends LightAISuper
+{
+};
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/Man.c b/scripts/4_World/DayZ/Entities/Core/Inherited/Man.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd7b8a5bdbdadd2ded0a4b3994b33b69d71de57b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/Man.c
@@ -0,0 +1,4 @@
+//-----------------------------------------------------------------------------
+class LightAI extends ManSuper
+{
+};
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/Plant.c b/scripts/4_World/DayZ/Entities/Core/Inherited/Plant.c
new file mode 100644
index 0000000000000000000000000000000000000000..43505359a4a1b0463e6d9a02e3b9fcdf979b42df
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/Plant.c
@@ -0,0 +1,95 @@
+/*enum PlantType
+{
+	TREE_HARD		= 0,
+	TREE_SOFT		= 1,
+	BUSH_HARD		= 2,	
+	BUSH_SOFT		= 3,
+}*/
+//-----------------------------------------------------------------------------
+/** \brief Specific tree class can be declared as: class TreeHard + _ + p3d filename (without extension) 
+@code
+//exapmle for tree DZ\plants2\tree\t_acer2s.p3d
+class TreeHard_t_acer2s: TreeHard 
+{
+};
+@endcode
+*/
+class TreeHard : PlantSuper
+{
+	override void OnTreeCutDown(EntityAI cutting_entity)
+	{
+		GetGame().RPCSingleParam(cutting_entity, PlantType.TREE_HARD, null, true);
+	}
+	
+	override bool IsTree()
+	{
+		return true;
+	}
+
+	override bool CanBeAutoDeleted()
+	{
+		return false;
+	}
+};
+
+//-----------------------------------------------------------------------------
+//! For specific tree declaration see description of \ref TreeHard
+class TreeSoft : PlantSuper
+{
+	override void OnTreeCutDown(EntityAI cutting_entity)
+	{
+		GetGame().RPCSingleParam(cutting_entity, PlantType.TREE_SOFT, null, true);
+	}
+	
+	override bool IsTree()
+	{
+		return true;
+	}
+
+	override bool CanBeAutoDeleted()
+	{
+		return false;
+	}
+};
+
+//-----------------------------------------------------------------------------
+//! For specific tree declaration see description of \ref TreeHard
+//! default values for hard bushes
+class BushHard : PlantSuper
+{
+	override void OnTreeCutDown(EntityAI cutting_entity)
+	{
+	
+		GetGame().RPCSingleParam(cutting_entity, PlantType.BUSH_HARD, null, true);
+	}
+	
+	override bool IsBush()
+	{
+		return true;
+	}
+	
+	override bool CanBeAutoDeleted()
+	{
+		return false;
+	}
+};
+
+//-----------------------------------------------------------------------------
+//! For specific tree declaration see description of \ref TreeHard
+class BushSoft : PlantSuper
+{
+	override void OnTreeCutDown(EntityAI cutting_entity)
+	{
+		GetGame().RPCSingleParam(cutting_entity, PlantType.BUSH_SOFT, null, true);
+	}
+	
+	override bool IsBush()
+	{
+		return true;
+	}
+
+		override bool CanBeAutoDeleted()
+	{
+		return false;
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Core/Inherited/Weapon.c b/scripts/4_World/DayZ/Entities/Core/Inherited/Weapon.c
new file mode 100644
index 0000000000000000000000000000000000000000..cfd2127b117f765b00220ac3839cbe969904c0a7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Core/Inherited/Weapon.c
@@ -0,0 +1,467 @@
+/**@class		Weapon
+ * @brief		script counterpart to engine's class Weapon
+ **/
+class Weapon extends InventoryItemSuper
+{
+	override bool IsWeapon() { return true; }
+	
+	/**@fn		Synchronize
+	 * @brief 	Force synchronizes the weapon state from Server to Client. Use with caution.
+	 **/
+	proto native void Synchronize();
+
+	/**@fn		GetMuzzleCount
+	 * @return	number of muzzles
+	 **/
+	proto native int GetMuzzleCount();
+	
+	/**@fn		GetMuzzleIndexFromMagazineSlot
+	 * @brief 	conversion slotId -> muzzleIndex
+	 * @param[in] magazineSlotId		slotId of the magazine slot
+	 * @return	muzzleIndex on success, -1 otherwise
+	 **/
+	//proto native int GetMuzzleIndexFromMagazineSlot (int magazineSlotId);
+	
+	/**@fn		GetSlotFromMuzzleIndex
+	 * @brief 	conversion muzzleIndex -> slotId
+	 * @param[in] muzzleIndex		muzzle index
+	 * @return	slotId on success, -1 otherwise
+	 **/
+	proto native int GetSlotFromMuzzleIndex(int muzzleIndex);
+	
+	/**@fn		GetCurrentMuzzle
+	 * @return	returns index of current muzzle
+	 **/
+	proto native int GetCurrentMuzzle();
+	
+	/**@fn		SetCurrentMuzzle
+	 * @brief 	sets index of active muzzle
+	 * @param[in] muzzleIndex
+	 **/
+	proto native void SetCurrentMuzzle(int muzzleIndex);
+	
+	proto native int GetMuzzleModeCount(int muzzleIndex);
+	proto native void SetMuzzleMode(int muzzleIndex, int modeIndex);
+	proto native void SetNextMuzzleMode(int muzzleIndex);
+	proto native int GetCurrentModeBurstSize(int muzzleIndex);
+	proto native bool GetCurrentModeAutoFire(int muzzleIndex);
+	proto native int GetCurrentMode(int muzzleIndex);
+	proto native void SetCurrentMode(int muzzleIndex, int mode);
+	
+	proto native owned string GetCurrentModeName(int muzzleIndex);
+
+	/**@fn		CanFire
+	 * @brief 	query whether the weapon can be fired or not
+	 * @return	true if fire possible
+	 **/
+	proto native bool CanFire(int muzzleIndex);
+	proto native bool Fire(int muzzleIndex, vector pos, vector dir, vector speed);
+	proto native bool DryFire(int muzzleIndex);
+	proto native bool DryDryFire(int muzzleIndex);
+	/**@fn		EjectCasing
+	 * @brief	ejects casing from chamber
+	 **/
+	proto native bool EjectCasing(int muzzleIndex);
+	/**@fn		EjectRound
+	 * @brief	ejects round from chamber
+	 **/
+	proto native bool CreateRound(int muzzleIndex);
+
+	/**@fn		IsChamberEmpty
+	 * @brief	detects empty chamber
+	 * @returns true if no cartridge in chamber
+	 **/
+	proto native bool IsChamberEmpty(int muzzleIndex);
+	/**@fn		IsChamberFiredOut
+	 * @brief	detects presence of fired out casing in chamber
+	 * @returns true if casing in chamber
+	 **/
+	proto native bool IsChamberFiredOut(int muzzleIndex);
+	/**@fn		IsChamberJammed
+	 * @brief	detects presence of damaged cartridge in chamber
+	 * @returns true if jammed
+	 **/
+	proto native bool IsChamberJammed(int muzzleIndex);
+	/**@fn		IsChamberEjectable
+	 * @brief	detects presence of ejectable cartridge in muzzle's chamber
+	 *
+	 * @returns true if eject-able
+	 **/
+	proto native bool IsChamberEjectable(int muzzleIndex);
+
+	/**@fn		IsChamberFull
+	 * @brief	maximum number of cartridges in chamber
+	 * @returns true if full
+	 **/
+	proto native bool IsChamberFull(int muzzleIndex);
+	bool IsChamberFullEx(int muzzleIndex)
+	{
+		return IsChamberFull(muzzleIndex);
+	}
+
+	/**@fn		HasInternalMagazine
+	 * @note 	passing in -1 will check all muzzles
+	 * @return	true if weapon has an internal magazine
+	 **/
+	proto native bool HasInternalMagazine(int muzzleIndex);
+
+	/**@fn		GetChamberCartridgeCount
+	 * @return	returns number of available cartridges in chamber
+	 **/
+	proto native int GetInternalMagazineCartridgeCount(int muzzleIndex);
+
+	/**@fn		GetChamberMaxCartridgeCount
+	 * @return	returns number of max cartridges in chamber
+	 **/
+	proto native int GetInternalMagazineMaxCartridgeCount(int muzzleIndex);
+	
+	/**@fn		IsInternalMagazineFull
+	 * @brief	maximum number of cartridges in internal magazine
+	 * @returns true if full
+	 **/
+	bool IsInternalMagazineFull(int muzzleIndex) { return GetInternalMagazineMaxCartridgeCount(muzzleIndex) == GetInternalMagazineCartridgeCount(muzzleIndex); }
+
+	/**@fn		GetTotalCartridgeCount
+	 * @return	returns number of available cartridges in chamber + internal magazine
+	 **/
+	proto native int GetTotalCartridgeCount(int muzzleIndex);
+
+	/**@fn		GetTotalMaxCartridgeCount
+	 * @return	returns number of max cartridges in chamber + internal magazine
+	 **/
+	proto native int GetTotalMaxCartridgeCount(int muzzleIndex);	
+
+	/**@fn		GetChamberAmmoTypeCount
+	 * @return	returns number of available ammo types for chambering
+	 **/
+	//proto native int GetChamberAmmoTypeCount(int muzzleIndex);
+
+	/**@fn		GetRandomChamberableAmmoTypeName
+	 * @param[in]
+	 * @return	returns the typename of a random ammo registered in 'chamberableFrom' in config
+	 **/
+	proto native owned string GetRandomChamberableAmmoTypeName(int muzzleIndex);
+
+
+	/**@fn		GetChamberAmmoTypeName
+	 * @param[in]
+	 * @return	returns name of i-th ammo type for chambering
+	 **/
+	proto native owned string GetChamberAmmoTypeName(int muzzleIndex);
+
+	/**@fn		GetCartridgeInfo
+	 * @brief	get info about the cartridge in the chamber of a muzzle
+	 * @param[in] muzzleIndex
+	 * @param[out] ammoDamage \p  damage of the ammo
+	 * @param[out] ammoTypeName \p	 type name of the ejected ammo
+	 * @return	true if info retrieved
+	 **/
+	proto bool GetCartridgeInfo(int muzzleIndex, out float ammoDamage, out string ammoTypeName);
+
+	/**@fn		GetInternalMagazineCartridgeInfo
+	 * @brief	get info about the cartridge in the internal magazine of a muzzle
+	 * @param[in] muzzleIndex
+	 * @param[in] cartridgeIndex	has to be 0 <= cartridgeIndex < GetInternalMagazineCartridgeCount()
+	 * @param[out] ammoDamage \p  damage of the ammo
+	 * @param[out] ammoTypeName \p	 type name of the ejected ammo
+	 * @return	true if info retrieved
+	 **/
+	proto bool GetInternalMagazineCartridgeInfo(int muzzleIndex, int cartridgeIndex, out float ammoDamage, out string ammoTypeName);
+	
+	/**@fn		PopCartridgeFromChamber
+	 * @brief	removes cartridge from chamber
+	 **/
+	proto bool PopCartridgeFromChamber(int muzzleIndex, out float ammoDamage, out string ammoTypeName);
+	
+	/**@fn		PushCartridgeToChamber
+	 * @brief	push cartridge to chamber
+	 **/
+	proto native bool PushCartridgeToChamber(int muzzleIndex, float ammoDamage, string ammoTypeName);
+	
+	/**@fn		EffectBulletShow
+	 * @brief	push effect cartridge to Weapon
+	 * @param[in] muzzleIndex
+	 * @param[in] ammoDamage \p  damage of the ammo
+	 * @param[in] ammoTypeName \p	 type name of the ammo
+	 **/
+	proto native void EffectBulletShow(int muzzleIndex, float dmg, string type);
+	
+	/**@fn		EffectBulletHide
+	 * @brief	reset effect cartridge in weapon
+	 * @param[in] muzzleIndex
+	 **/
+	proto native void EffectBulletHide(int muzzleIndex);
+	
+	
+	/**@fn		SetGroundAnimFrameIndex
+	 * @brief	sets animation frame for ground state when animation is specified in config
+	 **/
+	proto native void SetGroundAnimFrameIndex(int groundAnimFrameIndex);
+
+	/**@fn		PopCartridgeFromInternalMagazine
+	 * @brief	removes top-most cartridge from internal magazine
+	 **/
+	proto bool PopCartridgeFromInternalMagazine(int muzzleIndex, out float ammoDamage, out string ammoTypeName);
+	/**@fn		PushCartridgeToInternalMagazine
+	 * @brief	push cartridge into internal magazine
+	 **/
+	proto native bool PushCartridgeToInternalMagazine(int muzzleIndex, float ammoDamage, string ammoTypeName);
+	
+	/**@fn		CanAttachMagazine
+	 * @brief 	query if a magazine can be attached to weapon
+	 * @param[in] muzzleIndex
+	 * @param[in] mag		magazine to attach
+	 * @return	true if magazine can be attached
+	 **/		
+	proto native bool CanAttachMagazine(int muzzleIndex, Magazine mag);
+
+	/**@fn		TestAttachMagazine
+	 * @brief 	query if a magazine can be attached to weapon
+	 * @param[in] muzzleIndex
+	 * @param[in] mag		magazine to attach
+	 * @param[in] do_occupancy_test	  if false, skips test for presence of another magazine in weapon
+	 * @param[in] do_script_check	  if false, skips script conditions
+	 * @return	true if magazine can be attached
+	 **/		
+	proto native bool TestAttachMagazine(int muzzleIndex, Magazine mag, bool do_occupancy_test, bool do_script_check);
+
+	/**@fn		AttachMagazine
+	 * @brief 	perform attachment of a magazine to weapon
+	 * @param[in] muzzleIndex
+	 * @param[in] mag		magazine to attach
+	 * @return	true if magazine was attached
+	 **/		
+	proto native bool AttachMagazine(int muzzleIndex, Magazine mag);
+
+	/**@fn		GetMagazine
+	 * @param[in] muzzleIndex
+	 * @return	attached magazine
+	 **/		
+	proto native Magazine GetMagazine(int muzzleIndex);
+
+	/**@fn		GetReloadTime
+	 * @brief	defines time from one shot to another
+	 * @param[in] muzzleIndex
+	 * @return	reload time in seconds
+	 **/		
+	proto native float GetReloadTime(int muzzleIndex);
+
+	/**@fn		CanChamberFromMag
+	 * @brief 	query if a bullet from magazine can be loaded into chamber
+	 * @param[in] muzzleIndex
+	 * @param[in] mag		magazine to load from
+	 * @return	true if cartidge from mag can be put into chamber
+	 **/
+	proto native bool CanChamberFromMag(int muzzleIndex, Magazine mag);
+
+	/**@fn		GetChamberedCartridgeMagazineTypeName
+	 * @brief query the type of magazine the cartridge can be unloaded to
+	 * @param[in] muzzleIndex
+	 * @return entity type name
+	 **/
+	proto native owned string GetChamberedCartridgeMagazineTypeName(int muzzleIndex);
+	
+	/**@fn		GetRandomMagazineTypeName
+	 * @param[in]
+	 * @return	returns the typename of a random magazine in 'magazines' in config
+	 **/
+	proto native owned string GetRandomMagazineTypeName(int muzzleIndex);	
+	
+	/**@fn		GetMaxMagazineTypeName
+	 * @param[in]
+	 * @return	returns the typename of the magazine in 'magazines' in config with highest capacity
+	 **/
+	proto native owned string GetMaxMagazineTypeName(int muzzleIndex);
+	
+	/**@fn		GetMagazineTypeCount
+	 * @param[in]
+	 * @return	returns the number of magazines in 'magazines' in config
+	 **/
+	proto native int GetMagazineTypeCount(int muzzleIndex);
+
+	/**@fn		EnterOptics
+	 * @brief	switches to optics mode if possible
+	 * @return true if success, false otherwise
+	 **/
+	proto native bool EnterOptics();
+	/**@fn		IsInOptics
+	 * @brief	is weapon in optics mode or not
+	 * @return true if in optics mode, false otherwise
+	 **/
+	proto native bool IsInOptics();
+	/**@fn		ExitOptics
+	 * @brief	switches out of optics mode (if possible)
+	 * @return true if success, false otherwise
+	 **/
+	proto native bool ExitOptics();
+
+	/**@fn		GetZoom
+	 * @brief	returns current percentage of zoom
+	 * @return	current percentage of zoom
+	 **/
+	proto native float GetZoom();
+	/**@fn		SetZoom
+	 * @brief sets current zoom (in %)
+	 * @param[in] percent	\p	zoom to set in range [0.0f .. 100.0f]
+	 * @return	true if zoom set
+	 **/
+	proto native bool SetZoom(float percent);
+	/**@fn		ZoomIn
+	 * @brief	moves current zoom by 1% up
+	 * @return	true if zoom set
+	 **/
+	proto native bool ZoomIn();
+	/**@fn		ZoomOut
+	 * @brief	moves current zoom by 1% down
+	 * @return	true if zoom set
+	 **/
+	proto native bool ZoomOut();
+
+	/**@fn		GetStepZoom
+	 * @brief	returns position of currently used value in zoom config array
+	 * @return	position of currently used value in zoom config array
+	 **/
+	proto native int GetStepZoom();
+	/**@fn		SetStepZoom
+	 * @brief sets zoom to fov value defined at given position in zoom fov config array
+	 * @param[in] index of configured step, range [0..cfg_max]
+	 * @return	true if zoom set
+	 **/
+	proto native bool SetStepZoom(int step);
+	/**@fn		StepZoomIn
+	 * @brief sets zoom to next defined (respective to current) value in zoom fov config array
+	 * @return	true if zoom set
+	 **/
+	proto native bool StepZoomIn();
+	/**@fn		StepZoomOut
+	 * @brief	sets zoom to previous (respective to current) defined value in zoom fov config array
+	 * @return	true if zoom set
+	 **/
+	proto native bool StepZoomOut();
+
+	/**@fn		GetStepZeroing
+	 * @brief	returns position of currently used value in zeroing config array
+	 * @return	 position of currently used value in zeroing config array
+	 **/
+	proto native int GetStepZeroing(int muzzleIndex = 0);
+	/**@fn		SetZeroing
+	 * @brief sets zeroing to value defined at given position in zeroing config array
+	 * @param[in] index of zeroing to set [0..cfg_max]
+	 * @return	true if zeroing set
+	 **/
+	proto native bool SetStepZeroing(int muzzleIndex, int step);
+	/**
+	 * @fn		StepZeroingUp
+	 * @brief sets zeroing to next defined (respective to current) value in zeroing config array
+	 * @return true if zeroing set
+	 **/
+	proto native bool StepZeroingUp(int muzzleIndex = 0);
+	/**
+	 * @fn		StepZeroingDown
+	 * @brief	sets zeroing to previous (respective to current) defined value in zeroing config array
+	 * @return true if zeroing set
+	 **/
+	proto native bool StepZeroingDown(int muzzleIndex = 0);
+	/**@fn		GetCurrentZeroing
+	 * @brief	returns currently used value of zeroing in config array of weapon or attached optics
+	 * @return	 currently used value in zeroing
+	 **/	
+	proto native float GetCurrentZeroing(int muzzleIndex = 0);
+	/**@fn		GetZeroingClamp
+	 * @brief	returns maximum allowed discrete distance for the muzzle. Limits attached optics zeroing only! '0' if unclamped
+	 * @return	 maximum allowed discrete distance for the muzzle
+	 **/
+	proto native float GetZeroingClamp(int muzzleIndex = 0);
+	/**
+	 * @fn		FlashlightOn
+	 * @brief	attempt to turn on flashlight
+	 * @return true if set on, false otherwise (no flashlight, no power, etc)
+	 **/
+	proto native bool FlashlightOn();
+
+	/**
+	 * @fn		FlashlightOff
+	 * @brief	attempt to turn off flashlight
+	 * @return true if on -> off, false otherwise (no flashlight, no power, etc, already off)
+	 **/
+	proto native bool FlashlightOff();
+
+	/**
+	 * @fn		IsFlashlightOn
+	 * @brief	query state of flashlight
+	 * @return true if set on
+	 **/
+	proto native bool IsFlashlightOn();
+
+	/**@fn		GetAttachedLauncher
+	 * @return	returns attached launcher or null
+	 **/
+	proto native UnderSlugLauncher GetAttachedLauncher();
+	/**@fn		GetAttachedOptics
+	 * @return	returns attached optics or null
+	 **/
+	proto native ItemOptics GetAttachedOptics();
+	/**@fn		GetAttachedSuppressor
+	 * @return	returns attached suppressor or null
+	 **/
+	proto native ItemSuppressor GetAttachedSuppressor();
+	
+	/**
+	 * @fn		GetCameraPoint
+	 * @brief	gets camera position & direction in model space of weapon entity
+	 **/
+	proto native void GetCameraPoint(int muzzleIndex, out vector pos, out vector dir);
+
+	/**
+	 * @fn		GetZoomInit
+	 * @brief	gets FOV value, when entering optics
+	 **/
+	proto native float GetZoomInit(int muzzleIndex);
+
+	/**
+	 * @fn		GetZoomMin
+	 * @brief	gets FOV minimum
+	 **/
+	proto native float GetZoomMin(int muzzleIndex);
+
+	/**
+	 * @fn		GetZoomMax
+	 * @brief	gets FOV maximum
+	 **/
+	proto native float GetZoomMax(int muzzleIndex);
+
+	/**
+	 * @fn		GetZeroingDistanceZoomMin
+	 * @brief	Gets Zeroing distance at opticsZoomMin
+	 **/
+	proto native float GetZeroingDistanceZoomMin(int muzzleIndex);
+	
+	/**
+	 * @fn		GetZeroingDistanceZoomMax
+	 * @brief	Gets Zeroing distance at opticsZoomMax
+	 **/
+	proto native float GetZeroingDistanceZoomMax(int muzzleIndex);
+
+	proto native void SelectionBulletShow();
+	proto native void SelectionBulletHide();
+	proto native void SelectionMagazineShow();
+	proto native void SelectionMagazineHide();
+	
+	void StepZeroingUpAllMuzzles()
+	{
+		for (int i = 0; i < GetMuzzleCount(); i++)
+		{
+			StepZeroingUp(i);
+		}
+	}
+	
+	void StepZeroingDownAllMuzzles()
+	{
+		for (int i = 0; i < GetMuzzleCount(); i++)
+		{
+			StepZeroingDown(i);
+		}
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Creatures/Animals/AnimalBase.c b/scripts/4_World/DayZ/Entities/Creatures/Animals/AnimalBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c0b4c957229acc3d2a5dabe669169a1545b25aed
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Creatures/Animals/AnimalBase.c
@@ -0,0 +1,373 @@
+class AnimalBase extends DayZAnimal
+{
+	protected ref ArrowManagerBase m_ArrowManager;
+	
+	void AnimalBase()
+	{
+		m_ArrowManager = new ArrowManagerBase(this);
+	}
+	
+	override ArrowManagerBase GetArrowManager()
+	{
+		return m_ArrowManager;
+	}
+	
+	override bool IsRefresherSignalingViable()
+	{
+		return false;
+	}
+}
+
+class Animal_BosTaurus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Chest";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 5);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Belly", 25);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "CattleBellow_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "CattleMooA_SoundSet";
+	}
+}
+class Animal_BosTaurusF extends Animal_BosTaurus {}
+
+class Animal_CanisLupus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Chest";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 2);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs_Back", 75);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs_Front", 70);
+	}
+	
+	override bool IsDanger()
+	{
+		return true;
+	}
+	
+	override string CaptureSound()
+	{
+		return "WolfWhimper_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "WolfBark_SoundSet";
+	}
+}
+
+class Animal_CapraHircus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Chest";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 4);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "GoatBleat_B_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "GoatBleat_A_SoundSet";
+	}
+	
+}
+class Animal_CapraHircusF extends Animal_CapraHircus {}
+class Animal_CapraHircus_Spooky extends Animal_CapraHircus
+{
+	override string GetDestructionBehaviour()
+    {
+       	return "DestructionEffectSpookyGoat";
+   	}
+ 
+	override bool IsDestructionBehaviour()
+   	{	
+		return true;
+	}
+	
+	#ifndef SERVER
+	protected GoatLight m_EyeLight;
+	
+	override void EEInit()
+	{
+		if (!IsDamageDestroyed())//walking up to or connecting to already dead zombies check
+			m_EyeLight = GoatLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(GoatLight, this, "GoatLight"));
+	}
+
+	void ~Animal_CapraHircus_Spooky()
+	{
+		if (m_EyeLight)
+			m_EyeLight.Destroy();
+	}
+	override void OnDamageDestroyed(int oldLevel)
+	{
+		if (m_EyeLight)
+			m_EyeLight.FadeOut(15);
+			
+	}
+	#endif
+	
+	override bool ResistContaminatedEffect()
+	{
+		return true;
+	}
+}
+
+class Animal_CapreolusCapreolus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Chest";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 4);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "HareSquawk_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "HareChirp_SoundSet";
+	}
+}
+class Animal_CapreolusCapreolusF extends Animal_CapreolusCapreolus {}
+
+class Animal_CervusElaphus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Chest";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 2);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "DeerBleat_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "DeerRoar_SoundSet";
+	}
+}
+class Animal_CervusElaphusF extends Animal_CervusElaphus {}
+
+class Animal_GallusGallusDomesticus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Spine";
+		m_DefaultHitPositionComponent = "Spine";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Head", 1);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Head", 5);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Head", 20);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "LArm1", 33);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "RArm1", 33);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Spine", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "HenScream_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "HenCluck_X_SoundSet";
+	}
+	
+	override bool ReplaceOnDeath()
+	{
+		return true;
+	}
+	
+	override bool CanBeSkinned()
+	{
+		return false;
+	}
+	
+	override string GetDeadItemName()
+	{
+		return "DeadRooster";
+	}
+	
+	override bool KeepHealthOnReplace()
+	{
+		return false;
+	}
+}
+
+class Animal_GallusGallusDomesticusF extends Animal_GallusGallusDomesticus 
+{
+	override string GetDeadItemName()
+	{
+		return "DeadChicken_Brown";
+	}
+}
+
+class Animal_GallusGallusDomesticusF_Brown extends Animal_GallusGallusDomesticusF
+{
+	override string GetDeadItemName()
+	{
+		return "DeadChicken_Brown";
+	}
+}
+
+class Animal_GallusGallusDomesticusF_Spotted extends Animal_GallusGallusDomesticusF
+{
+	override string GetDeadItemName()
+	{
+		return "DeadChicken_Spotted";
+	}
+}
+
+class Animal_GallusGallusDomesticusF_White extends Animal_GallusGallusDomesticusF
+{
+	override string GetDeadItemName()
+	{
+		return "DeadChicken_White";
+	}
+}
+
+
+class Animal_OvisAries extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Chest";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 4);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 15);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 55);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "SheepBleat_E_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "SheepBleat_G_SoundSet";
+	}
+}
+class Animal_OvisAriesF extends Animal_OvisAries {}
+
+class Animal_SusDomesticus extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Spine";
+		m_DefaultHitPositionComponent = "Spine1";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 5);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Belly", 25);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Chest", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "HogSqueal_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "HogGrunt_G_SoundSet";
+	}
+}
+
+class Animal_SusScrofa extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Spine";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 3);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 55);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Belly", 15);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override string CaptureSound()
+	{
+		return "HogSqueal_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "HogGrunt_G_SoundSet";
+	}
+}
+
+class Animal_UrsusArctos extends AnimalBase
+{
+	override void RegisterHitComponentsForAI()
+	{
+		m_DefaultHitComponent = "Zone_Head";
+		m_DefaultHitPositionComponent = "Pelvis";
+		
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Head", 25);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Belly", 50);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Neck", 65);
+		DayZAIHitComponentHelpers.RegisterHitComponent(m_HitComponentsForAI, "Zone_Legs", 70);
+	}
+	
+	override bool IsDanger()
+	{
+		return true;
+	}
+	
+	override string CaptureSound()
+	{
+		return "BearSnarl_SoundSet";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "BearRoarShort_SoundSet";
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Creatures/Infected/DayZInfectedCfgBase.c b/scripts/4_World/DayZ/Entities/Creatures/Infected/DayZInfectedCfgBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..47811866bc5156ed9a0918bf321a39b9d3281f31
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Creatures/Infected/DayZInfectedCfgBase.c
@@ -0,0 +1,12 @@
+//-----------------------------------------------------------------------------------------------
+// DayZInfectedTypeCreate - main dayz type config
+//-----------------------------------------------------------------------------------------------
+
+void DayZInfectedTypeCreate(DayZInfectedType pType)
+{
+	//! register attacks
+	pType.RegisterAttacks();
+
+	//! melee hit components (cached in type)
+	pType.RegisterHitComponentsForAI();
+}
diff --git a/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieBase.c b/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..4e6b2dc18ffea65a7f33793e7b211ee19fab5aa7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieBase.c
@@ -0,0 +1,1150 @@
+class ZombieBase extends DayZInfected
+{
+	const float TARGET_CONE_ANGLE_CHASE = 20;
+	const float TARGET_CONE_ANGLE_FIGHT = 30;
+	const float ORIENTATION_SYNC_THRESHOLD = 30; //threshold for local heading/orientation sync
+	
+	const float	SHOCK_TO_STUN_MULTIPLIER = 2.82;
+
+	//! server / singleplayer properties
+	protected int m_StanceVariation = 0;
+	protected int m_LastMindState = -1;
+	protected float m_LastMovementSpeed = -1;
+	
+	protected bool m_KnuckleLand = false;
+	protected float m_KnuckleOutTimer = 0;
+
+	protected int m_MindState = -1;
+	protected int m_OrientationLocal = -1; //local 'companion' value for sync checking
+	protected int m_OrientationSynced = -1;
+	protected float m_OrientationTimer;
+	protected float m_MovementSpeed = -1;
+	
+	protected vector m_DefaultHitPosition;
+	protected float m_DeltaTime;
+	
+	protected AbstractWave m_LastSoundVoiceAW;
+	protected ref InfectedSoundEventHandler	m_InfectedSoundEventHandler;
+
+	protected ref array<Object> m_AllTargetObjects;
+	protected ref array<typename>m_TargetableObjects;
+	
+	//static ref map<int,ref array<string>> 	m_FinisherSelectionMap; //! which selections in the FireGeometry trigger which finisher on hit (when applicable)
+	
+	protected bool m_IsCrawling; //'DayZInfectedCommandCrawl' is transition to crawl only, 'DayZInfectedCommandMove' used after that, hence this VARIABLE_WET
+	
+	protected bool m_FinisherInProgress = false; //is this object being backstabbed?
+	
+	protected ref ArrowManagerBase m_ArrowManager;
+
+
+
+	//-------------------------------------------------------------
+	void ZombieBase()
+	{
+		Init();
+	}
+	
+	void Init()
+	{
+		SetEventMask(EntityEvent.INIT);
+		
+		m_IsCrawling = false;
+		
+		RegisterNetSyncVariableInt("m_MindState", -1, 4);
+		RegisterNetSyncVariableInt("m_OrientationSynced", 0, 359);
+		RegisterNetSyncVariableFloat("m_MovementSpeed", -1, 3);
+		RegisterNetSyncVariableBool("m_IsCrawling");
+		
+		//! sets default hit position and cache it here (mainly for impact particles)
+		m_DefaultHitPosition = SetDefaultHitPosition(GetDayZInfectedType().GetDefaultHitPositionComponent());
+
+		//! client only
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			m_LastSoundVoiceAW 			= null;
+			m_InfectedSoundEventHandler = new InfectedSoundEventHandler(this);
+		}
+
+		m_AllTargetObjects		= new array<Object>;
+		m_TargetableObjects 	= new array<typename>;
+		m_TargetableObjects.Insert(PlayerBase);
+		m_TargetableObjects.Insert(AnimalBase);
+		
+		m_OrientationTimer = 0;
+		
+		m_ArrowManager = new ArrowManagerBase(this);
+	}
+	
+	//! synced variable(s) handler
+	override void OnVariablesSynchronized()
+	{
+		DebugSound("[Infected @ " + this + "][OnVariablesSynchronized]");
+		HandleSoundEvents();
+		
+		if ( m_OrientationLocal != m_OrientationSynced )
+		{
+			m_OrientationLocal = m_OrientationSynced;
+		}
+	}
+
+	//-------------------------------------------------------------
+	override void EOnInit(IEntity other, int extra)
+	{
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			m_StanceVariation = Math.RandomInt(0, 4);
+	
+			DayZInfectedCommandMove moveCommand = GetCommand_Move();
+			moveCommand.SetStanceVariation(m_StanceVariation);
+		}
+	}
+	
+	override bool IsZombie()
+	{
+		return true;
+	}
+	
+	override bool IsDanger()
+	{
+		return true;
+	}
+	
+	override bool IsZombieMilitary()
+	{
+		return false;
+	}
+	
+	bool IsMale()
+	{
+		return true;
+	}
+	
+	override bool CanBeBackstabbed()
+	{
+		return true;
+	}
+	
+	//-------------------------------------------------------------
+	override AnimBootsType GetBootsType()
+	{
+		return AnimBootsType.Boots;
+	}
+	
+	override bool CanBeSkinned()
+	{
+		return false;
+	}
+	//-------------------------------------------------------------
+	override bool IsHealthVisible()
+	{
+		return false;
+	}
+	//-------------------------------------------------------------
+	override bool IsRefresherSignalingViable()
+	{
+		return false;
+	}
+
+	//! returns hit component for attacking AI
+	override string GetHitComponentForAI()
+	{
+		return GetDayZInfectedType().GetHitComponentForAI();
+	}
+
+	//! returns default hit component (fallback)
+	override string GetDefaultHitComponent()
+	{
+		return GetDayZInfectedType().GetDefaultHitComponent();
+	}
+
+	override vector GetDefaultHitPosition()
+	{
+		return m_DefaultHitPosition;
+	}
+	
+	protected vector SetDefaultHitPosition(string pSelection)
+	{
+		return GetSelectionPositionMS(pSelection);
+	}
+
+	//! returns suitable hit components for finisher attacks; DEPRECATED
+	override array<string> GetSuitableFinisherHitComponents()
+	{
+		return GetDayZInfectedType().GetSuitableFinisherHitComponents();
+	}
+	
+	int GetMindStateSynced()
+	{
+		return m_MindState;
+	}
+	
+	//! returns rounded zombie yaw for sync purposes
+	int GetOrientationSynced()
+	{
+		return m_OrientationSynced;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! CommandHandler
+	//! 
+
+	void CommandHandler(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		m_DeltaTime = pDt;
+		
+		//! for mods
+		if ( ModCommandHandlerBefore(pDt, pCurrentCommandID, pCurrentCommandFinished) )
+		{
+			return;
+		}
+
+		//! handle death
+		if ( pCurrentCommandID != DayZInfectedConstants.COMMANDID_DEATH )		
+		{
+			if ( HandleDeath(pCurrentCommandID) )
+				return;
+		}
+		else if (!pCurrentCommandFinished)
+		{
+			return;
+		}
+		
+
+		//! movement handler (just for sync now)
+		HandleMove(pCurrentCommandID);
+		HandleOrientation(pDt,pCurrentCommandID);
+		
+		//! handle finished commands
+		if (pCurrentCommandFinished)
+		{			
+			//! default behaviour after finish is to start move
+			DayZInfectedCommandMove moveCommand = StartCommand_Move();
+			moveCommand.SetStanceVariation(m_StanceVariation);
+			
+			return;
+		}
+		
+		//! for mods
+		if ( ModCommandHandlerInside(pDt, pCurrentCommandID, pCurrentCommandFinished) )
+		{
+			return;
+		}
+		
+		//! crawl transition
+		if ( HandleCrawlTransition(pCurrentCommandID) )
+		{
+			return;
+		}
+		
+		//! damage hits
+		if ( HandleDamageHit(pCurrentCommandID) )
+		{
+			return;
+		}
+		
+		DayZInfectedInputController inputController = GetInputController();
+		if ( inputController )
+		{
+			if ( HandleVault(pCurrentCommandID, inputController, pDt) )
+			{
+				return;
+			}
+			
+			if ( HandleMindStateChange(pCurrentCommandID, inputController, pDt) )
+			{
+				return;
+			}
+			
+			if ( FightLogic(pCurrentCommandID, inputController, pDt) )
+			{
+				return;
+			}
+		}
+		
+		//!
+		if ( ModCommandHandlerAfter(pDt, pCurrentCommandID, pCurrentCommandFinished) )
+		{
+			return;
+		}
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! CommandHandlerDebug
+	//! 
+
+	void  CommandHandlerDebug(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		if ( GetPluginManager() )
+		{
+			PluginDayZInfectedDebug infectedDebug = PluginDayZInfectedDebug.Cast(GetPluginManager().GetPluginByType(PluginDayZInfectedDebug));
+			if ( infectedDebug )
+				infectedDebug.CommandHandler(this);
+		}	
+	}
+	//-------------------------------------------------------------
+	//!
+	//! HandleMove
+	//!
+	
+	void HandleMove(int pCurrentCommandID)
+	{
+		DayZInfectedInputController ic = GetInputController();
+		m_MovementSpeed = ic.GetMovementSpeed();
+		if (Math.AbsFloat(m_LastMovementSpeed - m_MovementSpeed) >= 0.9 && m_LastMovementSpeed != m_MovementSpeed)
+		{
+			SetSynchDirty();
+		}
+		
+		m_LastMovementSpeed = m_MovementSpeed;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! HandleOrientation
+	//!
+	
+	void HandleOrientation(float pDt, int pCurrentCommandID)
+	{
+		m_OrientationTimer += pDt;
+		
+		int yaw = Math.Round(GetOrientation()[0]);
+		yaw = Math.NormalizeAngle(yaw);
+		
+		//atan2(sin(x-y), cos(x-y))
+		float angleSourceRad = m_OrientationSynced * Math.DEG2RAD;
+		float angleTargetRad = yaw * Math.DEG2RAD;
+		
+		float angleDiffRad = Math.Atan2(Math.Sin(angleTargetRad - angleSourceRad), Math.Cos(angleSourceRad - angleTargetRad));
+		angleDiffRad *= Math.RAD2DEG;
+		angleDiffRad = Math.Round(angleDiffRad);
+		
+		if (m_OrientationTimer >= 2.0 || m_OrientationSynced == -1 || Math.AbsInt(angleDiffRad) > ORIENTATION_SYNC_THRESHOLD)
+		{
+			m_OrientationTimer = 0.0;
+			
+			if (m_OrientationSynced == -1 || Math.AbsInt(angleDiffRad) > 5)
+			{
+				//Print("DbgSyncOrientation | HandleMove | original: " + m_OrientationSynced + " | target: " + yaw + " | diff: " + angleDiffRad);
+				m_OrientationSynced = yaw;
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! HandleDeath
+	//! 
+
+	float m_DamageHitDirection = 0;
+	int   m_DeathType = 0;
+
+	bool HandleDeath(int pCurrentCommandID)
+	{
+		if ( !IsAlive() || m_FinisherInProgress )
+		{
+			StartCommand_Death(m_DeathType, m_DamageHitDirection);
+			m_MovementSpeed = -1;
+			m_MindState = -1;
+			SetSynchDirty();
+			return true;
+		}
+
+		return false;
+	}	
+	
+	bool EvaluateDeathAnimationEx(EntityAI pSource, ZombieHitData data, out int pAnimType, out float pAnimHitDir)
+	{
+		bool ret = EvaluateDeathAnimation(pSource,data.m_DamageZone,data.m_AmmoType,pAnimType,pAnimHitDir);
+				
+		return ret;
+	}
+	
+	bool EvaluateDeathAnimation(EntityAI pSource, string pComponent, string pAmmoType, out int pAnimType, out float pAnimHitDir)
+	{
+		//! 
+		bool doPhxImpulse = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " doPhxImpulse") > 0;
+		
+		//! anim type
+		pAnimType = doPhxImpulse;
+		
+		//! direction
+		pAnimHitDir = ComputeHitDirectionAngle(pSource);
+		
+		//! add some impulse if needed
+		if ( doPhxImpulse )
+		{
+			vector impulse = 80 * m_TransportHitVelocity;
+			impulse[1] = 80 * 1.5;
+			//Print("Impulse: " + impulse.ToString());
+			
+			dBodyApplyImpulse(this, impulse);
+		}
+				
+		return true;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! HandleVault
+	//! 
+	
+	int m_ActiveVaultType = -1;
+	
+	int GetVaultType(float height)
+	{
+		if ( height <= 0.6 )
+			return 0;
+		else if ( height <= 1.1 )
+			return 1;
+		else if ( height <= 1.6 )
+			return 2;
+		else 
+			return 3;
+	}
+	
+	bool HandleVault(int pCurrentCommandID, DayZInfectedInputController pInputController, float pDt)
+	{
+		if ( pCurrentCommandID == DayZInfectedConstants.COMMANDID_VAULT )
+		{
+			DayZInfectedCommandVault vaultCmd = GetCommand_Vault();
+			if ( vaultCmd && vaultCmd.WasLand() )
+			{
+				m_KnuckleOutTimer = 0;
+				m_KnuckleLand = true;
+			}
+			if ( m_KnuckleLand )
+			{
+				m_KnuckleOutTimer += pDt;
+				if ( m_KnuckleOutTimer > 2.0 )
+					StartCommand_Vault(-1);
+			}
+			
+			return true;
+		}
+		
+		if ( pInputController.IsVault() )
+		{
+			float vaultHeight = pInputController.GetVaultHeight();
+			int vaultType = GetVaultType(vaultHeight);
+			m_KnuckleLand = false;
+			StartCommand_Vault(vaultType);
+			return true; 
+		}
+		
+		return false;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Mind state change
+	//! 
+
+	bool HandleMindStateChange(int pCurrentCommandID, DayZInfectedInputController pInputController, float pDt)
+	{
+		DayZInfectedCommandMove moveCommand = GetCommand_Move();
+		
+		m_MindState = pInputController.GetMindState();
+		if ( m_LastMindState != m_MindState )
+		{
+			switch ( m_MindState )
+			{
+			case DayZInfectedConstants.MINDSTATE_CALM:
+				if ( moveCommand && !moveCommand.IsTurning() )
+					moveCommand.SetIdleState(0);
+				break;
+
+			case DayZInfectedConstants.MINDSTATE_DISTURBED:
+				if ( moveCommand && !moveCommand.IsTurning() )
+					moveCommand.SetIdleState(1);
+				break;
+			
+			case DayZInfectedConstants.MINDSTATE_CHASE:
+				if ( moveCommand && !moveCommand.IsTurning() && (m_LastMindState < DayZInfectedConstants.MINDSTATE_CHASE) )
+					moveCommand.SetIdleState(2);
+				break;
+			}
+			
+			m_LastMindState = m_MindState;
+			m_AttackCooldownTime = 0.0;
+			SetSynchDirty();
+		}
+		return false;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! Sound (client only)
+	//!
+	
+	protected void HandleSoundEvents()
+	{
+		//! no sound handler - bail out
+		if ( !m_InfectedSoundEventHandler )
+		{
+			return;
+		}
+
+		//! infected is dead
+		if ( !IsAlive() )
+		{
+			//! stop all sounds
+			m_InfectedSoundEventHandler.Stop();
+			return;
+		}
+
+		switch ( m_MindState )
+		{
+		case DayZInfectedConstants.MINDSTATE_CALM:
+			m_InfectedSoundEventHandler.PlayRequest(EInfectedSoundEventID.MINDSTATE_CALM_MOVE);
+			break;
+		case DayZInfectedConstants.MINDSTATE_ALERTED:
+			m_InfectedSoundEventHandler.PlayRequest(EInfectedSoundEventID.MINDSTATE_ALERTED_MOVE);
+			break;
+		case DayZInfectedConstants.MINDSTATE_DISTURBED:
+			m_InfectedSoundEventHandler.PlayRequest(EInfectedSoundEventID.MINDSTATE_DISTURBED_IDLE);
+			break
+		case DayZInfectedConstants.MINDSTATE_CHASE:
+			m_InfectedSoundEventHandler.PlayRequest(EInfectedSoundEventID.MINDSTATE_CHASE_MOVE);
+			break;
+		default:
+			m_InfectedSoundEventHandler.Stop();
+			break;
+		}
+		
+		DebugSound("[Infected @ " + this + "][MindState]" + typename.EnumToString(DayZInfectedConstants, m_MindState));
+		DebugSound("[Infected @ " + this + "][SoundEventID]" + typename.EnumToString(EInfectedSoundEventID, m_InfectedSoundEventHandler.GetCurrentStateEventID()));
+	}
+
+	AbstractWave ProcessVoiceFX(string pSoundSetName)
+	{
+		SoundParams			soundParams;
+		SoundObjectBuilder	soundObjectBuilder;
+		SoundObject			soundObject;
+		if (!GetGame().IsDedicatedServer())
+		{
+			soundParams = new SoundParams( pSoundSetName );
+			if ( !soundParams.IsValid() )
+			{
+				//SoundError("Invalid sound set.");
+				return null;
+			}
+			
+			soundObjectBuilder = new SoundObjectBuilder( soundParams );
+			soundObject = soundObjectBuilder.BuildSoundObject();
+			AttenuateSoundIfNecessary(soundObject);
+
+			return PlaySound(soundObject, soundObjectBuilder);
+		}
+
+		return null;
+	}
+
+	override void OnSoundVoiceEvent(int event_id, string event_user_string)
+	{
+		//super.OnSoundVoiceEvent(event_id, event_user_string);
+		AnimSoundVoiceEvent voice_event = GetCreatureAIType().GetSoundVoiceEvent(event_id);
+		if (voice_event != null)
+		{
+			//! stop state sound when playing anim SoundVoice
+			if (m_InfectedSoundEventHandler) // && m_InfectedSoundEventHandler.IsPlaying())
+			{
+				m_InfectedSoundEventHandler.Stop();
+				DebugSound("[Infected @ " + this + "][SoundEvent] InfectedSoundEventHandler - stop all");
+			}
+
+			//! stop playing of old SoundVoice from anim (if any)
+			if (m_LastSoundVoiceAW != null)
+			{
+				DebugSound("[Infected @ " + this + "][AnimVoiceEvent] Stopping LastAW");
+				m_LastSoundVoiceAW.Stop();
+			}
+			
+			//! play new SoundVoice from anim
+			ProcessSoundVoiceEvent(voice_event, m_LastSoundVoiceAW);
+			
+			HandleSoundEvents();
+		}
+	}
+	
+	protected void ProcessSoundVoiceEvent(AnimSoundVoiceEvent sound_event, out AbstractWave aw)
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			SoundObjectBuilder objectBuilder = sound_event.GetSoundBuilder();
+			if (NULL != objectBuilder)
+			{
+				objectBuilder.AddEnvSoundVariables(GetPosition());
+				SoundObject soundObject = objectBuilder.BuildSoundObject();
+				AttenuateSoundIfNecessary(soundObject);
+				aw = PlaySound(soundObject, objectBuilder);
+			}
+		}
+		
+		if (GetGame().IsServer())
+		{
+			if (sound_event.m_NoiseParams != NULL)
+				GetGame().GetNoiseSystem().AddNoise(this, sound_event.m_NoiseParams);
+		}
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Combat
+	//! 
+	
+	EntityAI m_ActualTarget = null;
+	float m_AttackCooldownTime = 0;	
+	DayZInfectedAttackType m_ActualAttackType = null;
+	
+	bool FightLogic(int pCurrentCommandID, DayZInfectedInputController pInputController, float pDt)
+	{
+		if (pCurrentCommandID == DayZInfectedConstants.COMMANDID_MOVE)
+		{
+			// we attack only in chase & fight state
+			int mindState = pInputController.GetMindState();
+			if (mindState == DayZInfectedConstants.MINDSTATE_CHASE)
+			{
+				return ChaseAttackLogic(pCurrentCommandID, pInputController, pDt);
+			}
+			else if (mindState == DayZInfectedConstants.MINDSTATE_FIGHT)
+			{
+				return FightAttackLogic(pCurrentCommandID, pInputController, pDt);
+			}
+		}
+		else if (pCurrentCommandID == DayZInfectedConstants.COMMANDID_ATTACK)
+		{
+			DayZInfectedCommandAttack attackCommand = GetCommand_Attack();
+			if (attackCommand && attackCommand.WasHit())
+			{
+				if (m_ActualTarget != null)
+				{
+					if (m_ActualTarget.GetMeleeTargetType() == EMeleeTargetType.NONALIGNABLE)
+						return false;
+
+					bool playerInBlockStance = false;
+					vector targetPos = m_ActualTarget.GetPosition();
+					vector hitPosWS = targetPos;
+					vector zombiePos = GetPosition();
+
+					PlayerBase playerTarget = PlayerBase.Cast(m_ActualTarget);
+					if (playerTarget)
+					{
+						playerInBlockStance = playerTarget.GetMeleeFightLogic() && playerTarget.GetMeleeFightLogic().IsInBlock();
+					}
+
+					if (vector.DistanceSq(targetPos, zombiePos) <= m_ActualAttackType.m_Distance * m_ActualAttackType.m_Distance)
+					{
+						//! player is in block stance and facing the infected
+						if (playerInBlockStance && (Math.RAD2DEG * Math.AbsFloat(Math3D.AngleFromPosition(targetPos, MiscGameplayFunctions.GetHeadingVector(playerTarget), zombiePos))) <= GameConstants.AI_MAX_BLOCKABLE_ANGLE)
+						{
+							//! infected is playing heavy attack - decrease the dmg to light
+							if (m_ActualAttackType.m_IsHeavy == 1)
+							{
+								hitPosWS = m_ActualTarget.ModelToWorld(m_ActualTarget.GetDefaultHitPosition()); //! override hit pos by pos defined in type
+								DamageSystem.CloseCombatDamageName(this, m_ActualTarget, m_ActualTarget.GetHitComponentForAI(), "MeleeZombie", hitPosWS);
+							}
+							else
+							{
+								//! infected is playing light attack - do not send damage, play animation instead
+								hitPosWS = m_ActualTarget.ModelToWorld(m_ActualTarget.GetDefaultHitPosition());
+								DamageSystem.CloseCombatDamageName(this, m_ActualTarget, m_ActualTarget.GetHitComponentForAI(), "Dummy_Light", hitPosWS);
+							}
+						}
+						else
+						{
+							hitPosWS = m_ActualTarget.ModelToWorld(m_ActualTarget.GetDefaultHitPosition()); //! override hit pos by pos defined in type
+							DamageSystem.CloseCombatDamageName(this, m_ActualTarget, m_ActualTarget.GetHitComponentForAI(), m_ActualAttackType.m_AmmoType, hitPosWS);
+						}
+					}
+				}
+			}
+			
+			return true;
+		}
+				
+		return false;
+	}
+	
+	bool ChaseAttackLogic(int pCurrentCommandID, DayZInfectedInputController pInputController, float pDt)
+	{
+		// always update target - it can be destroyed		
+		m_ActualTarget = pInputController.GetTargetEntity();
+		
+		//! do not attack players in vehicle - hotfix
+		PlayerBase pb = PlayerBase.Cast(m_ActualTarget);
+		if ( pb && pb.GetCommand_Vehicle() )
+		{
+			return false;
+		}
+
+		if ( m_ActualTarget == NULL )
+			return false;
+	
+		vector targetPos = m_ActualTarget.GetPosition();
+		if ( !CanAttackToPosition(targetPos) )
+			return false;
+		
+		float targetDist = vector.Distance(targetPos, this.GetPosition());
+		int pitch = GetAttackPitch(m_ActualTarget);
+		
+		m_ActualAttackType = GetDayZInfectedType().ChooseAttack(DayZInfectedAttackGroupType.CHASE, targetDist, pitch);
+		if (m_ActualAttackType)
+		{
+			Object target = DayZPlayerUtils.GetMeleeTarget(this.GetPosition(), this.GetDirection(), TARGET_CONE_ANGLE_CHASE, m_ActualAttackType.m_Distance, -1.0, 2.0, this, m_TargetableObjects, m_AllTargetObjects);
+			//! target is outside the targeting cone; skip attack
+			if (m_ActualTarget != target)
+			{
+				m_AllTargetObjects.Clear();
+				return false;
+			}
+
+			StartCommand_Attack(m_ActualTarget, m_ActualAttackType.m_Type, m_ActualAttackType.m_Subtype);
+			m_AttackCooldownTime = m_ActualAttackType.m_Cooldown;
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool FightAttackLogic(int pCurrentCommandID, DayZInfectedInputController pInputController, float pDt)
+	{
+		// always update target - it can be destroyed		
+		m_ActualTarget = pInputController.GetTargetEntity();
+		
+		//! do not attack players in vehicle - hotfix
+		PlayerBase pb = PlayerBase.Cast(m_ActualTarget);
+		if (pb && pb.GetCommand_Vehicle())
+			return false;
+
+		if (m_AttackCooldownTime > 0)
+		{
+			m_AttackCooldownTime -= pDt * GameConstants.AI_ATTACKSPEED;
+			return false;
+		}
+					
+		if (m_ActualTarget == null)
+			return false;
+
+		vector targetPos = m_ActualTarget.GetPosition();
+		float targetDist = vector.Distance(targetPos, this.GetPosition());
+		int pitch = GetAttackPitch(m_ActualTarget);
+		
+		if (!CanAttackToPosition(targetPos))
+			return false;
+
+		m_ActualAttackType = GetDayZInfectedType().ChooseAttack(DayZInfectedAttackGroupType.FIGHT, targetDist, pitch);
+		if (m_ActualAttackType)
+		{
+			Object target = DayZPlayerUtils.GetMeleeTarget(this.GetPosition(), this.GetDirection(), TARGET_CONE_ANGLE_FIGHT, m_ActualAttackType.m_Distance, -1.0, 2.0, this, m_TargetableObjects, m_AllTargetObjects);
+			//! target is outside the targeting cone; skip attack
+			if (m_AllTargetObjects.Count() > 0 && m_AllTargetObjects[0] != m_ActualTarget)
+			{
+				m_AllTargetObjects.Clear();
+				return false;
+			}
+
+			StartCommand_Attack(m_ActualTarget, m_ActualAttackType.m_Type, m_ActualAttackType.m_Subtype);
+			m_AttackCooldownTime = m_ActualAttackType.m_Cooldown;
+			return true;
+		}
+
+		return false;
+	}
+
+	int GetAttackPitch(EntityAI target)
+	{
+		vector attackRefPos;
+
+		attackRefPos = target.GetDefaultHitPosition();
+		//! no default hit pos fallback
+		if ( attackRefPos != vector.Zero )
+		{
+			attackRefPos = target.ModelToWorld(attackRefPos);
+		}
+		else
+		{
+			attackRefPos = target.GetPosition();
+		}
+
+		// Now we have only erect stance, we need to get head position later too
+		float headPosY = GetPosition()[1];
+		headPosY += 1.8;
+		
+		float diff = Math.AbsFloat(attackRefPos[1] - headPosY);
+		
+		if ( diff < 0.3 )
+			return 0;
+		
+		if ( headPosY > attackRefPos[1] )
+			return -1;
+		else
+			return 1;
+	}
+		
+	//-------------------------------------------------------------
+	//!
+	//! Crawl transition
+	//! 
+	
+	int m_CrawlTransition = -1;
+	
+	bool HandleCrawlTransition(int pCurrentCommandID)
+	{
+		if ( m_CrawlTransition != -1 )
+		{
+			StartCommand_Crawl(m_CrawlTransition);
+			
+			m_CrawlTransition = -1;
+			m_IsCrawling = true;
+			SetSynchDirty();
+			return true;
+		}
+
+		return pCurrentCommandID == DayZInfectedConstants.COMMANDID_CRAWL;
+	}
+	
+	bool EvaluateCrawlTransitionAnimation(EntityAI pSource, string pComponent, string pAmmoType, out int pAnimType)
+	{
+		pAnimType = -1;
+		if ( pComponent == "LeftLeg" && GetHealth(pComponent, "Health") == 0 )
+			pAnimType = 0;
+		else if ( pComponent == "RightLeg" && GetHealth(pComponent, "Health") == 0 )
+			pAnimType = 2;
+		
+		if ( pAnimType != -1 )
+		{
+			vector targetDirection = GetDirection();
+			vector toSourceDirection = (pSource.GetPosition() - GetPosition());
+
+			targetDirection[1] = 0;
+			toSourceDirection[1] = 0;
+
+			targetDirection.Normalize();
+			toSourceDirection.Normalize();
+
+			float cosFi = vector.Dot(targetDirection, toSourceDirection);
+			if ( cosFi >= 0 ) // front
+				pAnimType++;
+		}
+		
+		return pAnimType != -1;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Damage hits
+	//! 
+	
+	bool m_DamageHitToProcess = false;
+	
+	bool m_DamageHitHeavy = false;
+	int m_DamageHitType = 0;
+	float m_ShockDamage = 0;
+	
+	const float HIT_INTERVAL_MIN = 0.3; 		// Minimum time in seconds before a COMMANDID_HIT to COMMANDID_HIT transition is allowed
+	float m_HitElapsedTime = HIT_INTERVAL_MIN;
+		
+	bool HandleDamageHit(int pCurrentCommandID)
+	{
+		if ( pCurrentCommandID == DayZInfectedConstants.COMMANDID_HIT )
+		{
+			// Throttle hit command up to a fixed rate
+			if ( m_HitElapsedTime < HIT_INTERVAL_MIN )
+			{
+				m_HitElapsedTime += m_DeltaTime;
+				m_DamageHitToProcess = false;
+				m_ShockDamage = 0;
+				return false;
+			}
+		}
+		
+		if ( m_DamageHitToProcess )
+		{
+			int randNum = Math.RandomIntInclusive(0, 100);
+			float stunChange = SHOCK_TO_STUN_MULTIPLIER * m_ShockDamage;
+			
+			if ( m_DamageHitHeavy || randNum <= stunChange || ( m_MindState == DayZInfectedConstants.MINDSTATE_CALM || m_MindState == DayZInfectedConstants.MINDSTATE_DISTURBED ) )
+			{
+				StartCommand_Hit(m_DamageHitHeavy, m_DamageHitType, m_DamageHitDirection);
+				m_HitElapsedTime = 0;
+			}
+			
+			m_DamageHitToProcess = false;
+			m_ShockDamage = 0;
+			m_HeavyHitOverride = false;
+			return true;
+		}
+
+		return false;
+	}
+
+	//! selects animation type and direction based on damage system data
+	bool EvaluateDamageHitAnimation(EntityAI pSource, string pComponent, string pAmmoType, out bool pHeavyHit, out int pAnimType, out float pAnimHitDir)
+	{
+		int invertHitDir = 0; //Used to flip the heavy hit animation direction
+		
+		//! heavy hit
+		pHeavyHit = ((GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " hitAnimation") > 0) || m_HeavyHitOverride);
+		invertHitDir = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " invertHitDir");
+		
+		//! anim type
+		pAnimType = 0; // belly
+		
+		if ( !pHeavyHit )
+		{
+			if ( pComponent == "Torso" ) // body
+				pAnimType = 1;
+			else if ( pComponent == "Head" ) // head		
+				pAnimType = 2;
+		}
+		
+		//! direction
+		//pAnimHitDir = ComputeHitDirectionAngle(pSource);
+		pAnimHitDir = ComputeHitDirectionAngleEx(pSource, invertHitDir);
+		//! shock GetDamage
+		//m_ShockDamage = GetGame().ConfigGetFloat( "CfgAmmo " + pAmmoType + " DamageApplied " + "Shock " + "damage");
+		return true;
+	}
+	
+	float ComputeHitDirectionAngle(EntityAI pSource)
+	{
+		vector targetDirection = GetDirection();
+		vector toSourceDirection = (pSource.GetPosition() - GetPosition());
+
+		targetDirection[1] = 0;
+		toSourceDirection[1] = 0;
+
+		targetDirection.Normalize();
+		toSourceDirection.Normalize();
+
+		float cosFi = vector.Dot(targetDirection, toSourceDirection);
+		vector cross = targetDirection * toSourceDirection;
+		
+		float dirAngle = Math.Acos(cosFi) * Math.RAD2DEG;
+		if ( cross[1] < 0 )
+			dirAngle = -dirAngle;
+		
+		return dirAngle;
+	}
+	
+	float ComputeHitDirectionAngleEx(EntityAI pSource, int invertHitDir = 0)
+	{
+		vector targetDirection = GetDirection();
+		vector toSourceDirection = (pSource.GetPosition() - GetPosition());
+
+		targetDirection[1] = 0;
+		toSourceDirection[1] = 0;
+
+		targetDirection.Normalize();
+		toSourceDirection.Normalize();
+
+		float cosFi = vector.Dot(targetDirection, toSourceDirection);
+		vector cross = targetDirection * toSourceDirection;
+		
+		float dirAngle = Math.Acos(cosFi) * Math.RAD2DEG;
+		
+		// We will invert direction of the hit
+		if ( invertHitDir > 0 )
+			dirAngle -= 180;
+
+		if ( cross[1] < 0 )
+			dirAngle = -dirAngle;
+		
+		return dirAngle;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Events from damage system
+	//! 
+
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		
+		m_TransportHitRegistered = false;
+		
+		if ( !IsAlive() )
+		{
+			ZombieHitData data = new ZombieHitData;
+			data.m_Component = component;
+			data.m_DamageZone = dmgZone;
+			data.m_AmmoType = ammo;
+			EvaluateDeathAnimationEx(source, data, m_DeathType, m_DamageHitDirection);
+		}
+		else
+		{
+			int crawlTransitionType = -1;
+			if ( EvaluateCrawlTransitionAnimation(source, dmgZone, ammo, crawlTransitionType) )
+			{
+				m_CrawlTransition = crawlTransitionType;
+				return;
+			}
+			
+			if ( EvaluateDamageHitAnimation(source, dmgZone, ammo, m_DamageHitHeavy, m_DamageHitType, m_DamageHitDirection) )
+			{
+				if ( dmgZone )
+					m_ShockDamage = damageResult.GetDamage( dmgZone, "Shock" );
+				m_DamageHitToProcess = true;
+				return;
+			}
+		}		
+	}
+	
+	override void EEHitByRemote(int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos)
+	{
+		super.EEHitByRemote(damageType, source, component, dmgZone, ammo, modelPos);
+	}
+
+	//! sound debug messages
+	protected void DebugSound(string s)
+	{
+		//Print(s);
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Phx contact event
+	//! 
+	
+	override protected void EOnContact(IEntity other, Contact extra)
+	{
+		if ( !IsAlive() )
+			return;
+
+		Transport transport = Transport.Cast(other);
+		if ( transport )
+		{
+			if ( GetGame().IsServer() )
+			{
+				RegisterTransportHit(transport);
+			}			
+		}
+	}
+	
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		if ( !IsAlive() )
+		{
+			return false;
+		}
+		return super.CanReceiveAttachment(attachment, slotId);
+	}
+	
+	override vector GetCenter()
+	{
+		return GetBonePositionWS( GetBoneIndexByName( "spine3" ) );
+	}
+	
+	//! returns true if backstab is in progress; used for suspending of AI targeting and other useful things besides
+	override bool IsBeingBackstabbed()
+	{
+		return m_FinisherInProgress;
+	}
+	
+	override void SetBeingBackstabbed(int backstabType)
+	{
+		// disable AI simulation
+		GetAIAgent().SetKeepInIdle(true);
+		
+		// select death animation
+		switch (backstabType)
+		{
+			case EMeleeHitType.FINISHER_LIVERSTAB:
+				m_DeathType = DayZInfectedDeathAnims.ANIM_DEATH_BACKSTAB;
+				break;
+				
+			case EMeleeHitType.FINISHER_NECKSTAB:
+				m_DeathType = DayZInfectedDeathAnims.ANIM_DEATH_NECKSTAB;	
+				break;
+				
+			default:
+				m_DeathType = DayZInfectedDeathAnims.ANIM_DEATH_DEFAULT;
+		}
+
+		// set flag - death command will be executed
+		m_FinisherInProgress = true;
+				
+		//Print("DbgZombies | DumbZombie on: " + GetGame().GetTime());
+	}
+	
+	//! returns true if crawling; 'DayZInfectedCommandCrawl' is only for the transition, after that it remains 'DayZInfectedCommandMove' (unreliable)
+	bool IsCrawling()
+	{
+		return m_IsCrawling;
+	}
+	
+	// called from command death when stealth attack wan't successful
+	void OnRecoverFromDeath()
+	{
+		// enable AI simulation again
+		GetAIAgent().SetKeepInIdle(false);
+
+		// reset flag
+		m_FinisherInProgress = false;
+		
+		//Print("DbgZombies | DumbZombie off: " + GetGame().GetTime());
+	}
+	
+	override void AddArrow(Object arrow, int componentIndex, vector closeBonePosWS, vector closeBoneRotWS)
+	{
+		CachedObjectsArrays.ARRAY_STRING.Clear();
+		GetActionComponentNameList(componentIndex, CachedObjectsArrays.ARRAY_STRING, "fire");
+		
+		int pivot = -1;
+		
+		
+		for (int i = 0; i < CachedObjectsArrays.ARRAY_STRING.Count() && pivot == -1; i++)
+		{
+			pivot = GetBoneIndexByName(CachedObjectsArrays.ARRAY_STRING.Get(i));
+		}
+		
+		vector parentTransMat[4];
+		vector arrowTransMat[4];
+		
+		if (pivot == -1)
+		{
+			GetTransformWS(parentTransMat);
+		}
+		else
+		{
+			vector rotMatrix[3];
+			Math3D.YawPitchRollMatrix(closeBoneRotWS * Math.RAD2DEG,rotMatrix);
+			
+			parentTransMat[0] = rotMatrix[0];
+			parentTransMat[1] = rotMatrix[1];
+			parentTransMat[2] = rotMatrix[2];
+			parentTransMat[3] = closeBonePosWS;
+		}
+		
+		arrow.GetTransform(arrowTransMat);
+		Math3D.MatrixInvMultiply4(parentTransMat, arrowTransMat, arrowTransMat);
+		// orthogonalize matrix - parent might be skewed
+		Math3D.MatrixOrthogonalize4(arrowTransMat);
+		arrow.SetTransform(arrowTransMat);
+		
+		AddChild(arrow, pivot);
+	}
+	
+	override bool IsManagingArrows()
+	{
+		return true;
+	}
+	
+	override ArrowManagerBase GetArrowManager()
+	{
+		return m_ArrowManager;
+	}
+}
+
+//! an extendable data container
+class ZombieHitData
+{
+	int m_Component;
+	string m_DamageZone;
+	string m_AmmoType;
+}
diff --git a/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieFemaleBase.c b/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieFemaleBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e4050dbf7f43825987b638319b36d11c7d531b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieFemaleBase.c
@@ -0,0 +1,129 @@
+class ZombieFemaleBase extends ZombieBase
+{
+	override bool IsMale()
+	{
+		return false;
+	}
+	
+	override string CaptureSound()
+	{
+		return "ZmbF_Normal_HeavyHit_Soundset";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "ZmbF_Normal_CallToArmsShort_Soundset";
+	}
+};
+
+class ZmbF_BlueCollarFat_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_CitizenANormal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_CitizenANormal_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_CitizenBSkinny_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_Clerk_Normal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_ClerkFat_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_Clerk_Normal_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_DoctorSkinny_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_HikerSkinny_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_JoggerSkinny_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_Runner_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_JournalistNormal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_JournalistNormal_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_MechanicNormal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_MilkMaidOld_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_MilkMaidOld_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_NurseFat_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_ParamedicNormal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_PatientOld_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_PoliceWomanNormal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_ShortSkirt_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_ShortSkirt_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_SkaterYoung_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_SkaterYoung_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_SurvivorNormal_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_SurvivorNormal_LT_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_VillagerOld_Base extends ZombieFemaleBase
+{
+};
+
+class ZmbF_VillagerOld_LT_Base extends ZombieFemaleBase
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieMaleBase.c b/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieMaleBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..033b9aee48ca4aaf01e30c064a0ed700ebb783da
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Creatures/Infected/ZombieMaleBase.c
@@ -0,0 +1,254 @@
+class ZombieMaleBase extends ZombieBase
+{
+	override string CaptureSound()
+	{
+		return "ZmbM_Normal_HeavyHit_Soundset";
+	}
+	
+	override string ReleaseSound()
+	{
+		return "ZmbM_Normal_CallToArmsShort_Soundset";
+	}
+	
+};
+
+//! Base class for eatch Infected type
+class ZmbM_CitizenASkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_CitizenASkinny_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_CitizenBFat_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_ClerkFat_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_ClerkFat_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_CommercialPilotOld_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_CommercialPilotOld_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_ConstrWorkerNormal_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_DoctorFat_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_FarmerFat_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_FarmerFat_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_FirefighterNormal_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_FishermanOld_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_HandymanNormal_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_HeavyIndustryWorker_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_HermitSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_HikerSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_HunterOld_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_Jacket_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_Jacket_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_JoggerSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM__Runner_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_JournalistSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_MechanicSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_MotobikerFat_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_OffshoreWorker_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_ParamedicNormal_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_PatientSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_PatrolNormal_Base extends ZombieMaleBase
+{
+	override bool IsZombieMilitary()
+	{
+		return true;
+	}
+};
+
+class ZmbM_PolicemanFat_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_PolicemanSpecForce_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_priestPopSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_PrisonerSkinny_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_SkaterYoung_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_SkaterYoung_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_Soldier_Base extends ZombieMaleBase
+{
+	override bool IsZombieMilitary()
+	{
+		return true;
+	}
+};
+
+class ZmbM_SoldierNormal_Base extends ZombieMaleBase
+{
+	override bool IsZombieMilitary()
+	{
+		return true;
+	}
+};
+
+class ZmbM_SurvivorDean_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_usSoldier_normal_Base extends ZombieMaleBase
+{
+	override bool IsZombieMilitary()
+	{
+		return true;
+	}
+};
+
+class ZmbM_VillagerOld_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_VillagerOld_LT_Base extends ZombieMaleBase
+{
+};
+
+class ZmbM_NBC_Yellow extends ZombieMaleBase
+{
+	override bool ResistContaminatedEffect()
+	{
+		return true;
+	}
+};
+
+class ZmbM_NBC_Grey extends ZombieMaleBase
+{
+	override bool ResistContaminatedEffect()
+	{
+		return true;
+	}
+	
+	override bool IsZombieMilitary()
+	{
+		return true;
+	}
+};
+
+class ZmbM_Mummy extends ZombieMaleBase
+{
+	#ifndef SERVER
+	protected ZombieMummyLight m_EyeLight;
+	
+	override void EEInit()
+	{
+		if (!IsDamageDestroyed())//walking up to or connecting to already dead zombies check
+			m_EyeLight = ZombieMummyLight.Cast(ScriptedLightBase.CreateLightAtObjMemoryPoint(ZombieMummyLight, this, "MummyLight"));
+	}
+
+	void ~ZmbM_Mummy()
+	{
+		if (m_EyeLight)
+			m_EyeLight.Destroy();
+	}
+	override void OnDamageDestroyed(int oldLevel)
+	{
+		if (m_EyeLight)
+			m_EyeLight.FadeOut(15);
+		
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( ChangeVisual, 1000);
+	}
+	
+	void ChangeVisual()
+	{
+		int index = GetHiddenSelectionIndex("camo");
+		
+		SetObjectMaterial(index, "dz\\characters\\zombies\data\\Mummy_dead.rvmat");
+		SetObjectTexture(index, "dz\\characters\\zombies\\data\\Mummy_dead_CO.paa");
+	}
+	#endif
+
+	override bool ResistContaminatedEffect()
+	{
+		return true;
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/DayZAnimalImplement.c b/scripts/4_World/DayZ/Entities/DayZAnimalImplement.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd1f8dca9d370ed7d2a6ddc04e7e36b84cc0f856
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZAnimalImplement.c
@@ -0,0 +1,8 @@
+class DayZAnimalCommandMoveModdable              extends DayZAnimalCommandMove {}
+class DayZAnimalCommandAttackModdable            extends DayZAnimalCommandAttack {}
+class DayZAnimalCommandJumpModdable              extends DayZAnimalCommandJump {}
+class DayZAnimalCommandLookAtModdable            extends DayZAnimalCommandLookAt {}
+class DayZAnimalCommandBehaviourModifierModdable extends DayZAnimalCommandBehaviourModifier {}
+class DayZAnimalCommandHitModdable               extends DayZAnimalCommandHit {}
+class DayZAnimalCommandDeathModdable             extends DayZAnimalCommandDeath {}
+class DayZAnimalCommandAnimCallbackModdable      extends DayZAnimalCommandAnimCallback {}
diff --git a/scripts/4_World/DayZ/Entities/DayZInfectedImplement.c b/scripts/4_World/DayZ/Entities/DayZInfectedImplement.c
new file mode 100644
index 0000000000000000000000000000000000000000..20bbce5dcb92be4e6db7555c9be934aca022f389
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZInfectedImplement.c
@@ -0,0 +1,6 @@
+class DayZInfectedCommandMoveModdable   extends DayZInfectedCommandMove {}
+class DayZInfectedCommandDeathModdable  extends DayZInfectedCommandDeath {}
+class DayZInfectedCommandHitModdable    extends DayZInfectedCommandHit {}
+class DayZInfectedCommandAttackModdable extends DayZInfectedCommandAttack {}
+class DayZInfectedCommandVaultModdable  extends DayZInfectedCommandVault {}
+class DayZInfectedCommandCrawlModdable  extends DayZInfectedCommandCrawl {}
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplement.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplement.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe4e77e9e78c2bf7e9bce39973a947d2f4335a8c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplement.c
@@ -0,0 +1,3631 @@
+/*
+DayZPlayerImplement
+
+this file is implemenation of dayzPlayer in script
+- logic of movement
+- camera switching logic
+
+*/
+
+class DayZPlayerCommandDeathCallback : HumanCommandDeathCallback
+{
+	//----------------------------------
+	// callbacks
+
+	override void 	OnSimulationEnd()
+	{
+		if (LogManager.IsSyncLogEnable()) syncDebugPrint("DZPI::OnSimulationEnd - trying to drop item");
+		
+		if (GetGame().IsServer())
+		{
+			EntityAI itemInHands = m_pPlayer.GetHumanInventory().GetEntityInHands();
+			if (itemInHands)
+			{
+				int boneIndex = m_pPlayer.GetBoneIndexByName("RightHand_Dummy");
+			
+				vector m4[4];
+				m_pPlayer.GetBoneTransformWS(boneIndex, m4);
+			
+				m_pPlayer.GetInventory().DropEntityWithTransform(InventoryMode.SERVER, m_pPlayer, itemInHands, m4);
+				
+				if (GetCEApi())
+				{
+					int deadBodyLifetime = GetCEApi().GetCEGlobalInt("CleanupLifetimeDeadPlayer");
+					if (deadBodyLifetime <= 0)
+					{
+						deadBodyLifetime = 3600;
+					}
+					itemInHands.SetLifetime(deadBodyLifetime);
+				}
+			}	
+		}
+	}
+
+	override bool ShouldSimulationBeDisabled()
+	{
+		return m_pPlayer.m_WasInVehicle == false;
+	}
+	
+	PlayerBase m_pPlayer;
+}
+
+class DayZPlayerVehicleCommandDeathCallback : HumanCommandDeathCallback
+{
+	override void OnSimulationEnd()
+	{
+		m_pPlayer.PhysicsEnableGravity(true);
+	}
+	
+	PlayerBase m_pPlayer;
+}
+
+class DeathEffectTimer extends Timer
+{
+	 override void Stop()
+	{
+		super.Stop();
+		
+		PPERequesterBank.GetRequester(PPERequester_DeathDarkening).Stop();
+	}
+};
+
+class DayZPlayerImplement extends DayZPlayer
+{
+	static const int DEAD_SCREEN_DELAY = 1000; 			//! DEPRECATED
+	static const float DEFAULT_DYING_TIME = 2.5; 		//! how long does it take to full death screen [s]
+	static const float DYING_PROGRESSION_TIME = 0.05; 	//! time step for gradual update of dead screen visibilibty up to full visbility [s]
+
+
+	ref HumanMovementState 					m_MovementState = new HumanMovementState();	//!< cached ptr for movement state
+	protected ref DayZPlayerImplementAiming				m_AimingModel;
+	protected ref DayZPlayerImplementMeleeCombat		m_MeleeCombat;
+	protected ref DayZPlayerMeleeFightLogic_LightHeavy	m_MeleeFightLogic;
+	protected ref DayZPlayerImplementSwimming			m_Swimming;
+	protected ref DayZPlayerImplementThrowing			m_Throwing;
+	protected ref DayZPlayerImplementJumpClimb			m_JumpClimb;
+	protected ref DayZPlayerImplementFallDamage			m_FallDamage;
+	protected ref PlayerSoundEventHandler 				m_PlayerSoundEventHandler;
+	protected SHumanCommandMoveSettings 				m_MoveSettings;
+	protected float 									m_FallYDiff;
+	protected float										m_SprintedTime;
+	protected float										m_SprintedTimePerStanceMin;
+	protected bool										m_SprintFull;
+	protected bool										m_IsRaised;
+	protected bool										m_ShouldReload;
+	protected bool										m_Camera3rdPerson;
+	protected bool										m_CameraZoomToggle;
+	protected bool										m_bADS;
+	private float 										m_WeaponRaiseTime; //! measures time from the weapon raise start to complete raise (once per)
+	protected bool 										m_WeaponRaiseCompleted;
+	protected ECameraZoomType							m_CameraEyeZoomLevel;
+	protected bool										m_WasIronsight; // was previously ironsights. Only used on weapons
+	protected bool										m_CameraIronsight; // Ironsight NOW!
+	protected bool										m_CameraOptics; // Optics NOW!
+
+	protected float 									m_DeathDarkeningCurrentTime;
+	protected bool										m_IsTryingHoldBreath;
+	protected bool										m_IsShootingFromCamera;
+	protected bool										m_PlayerSelected;
+	protected bool 										m_Suicide;
+	protected bool										m_IsUnconscious;
+	protected bool										m_ShouldBeUnconscious;
+	protected bool										m_IsUnconsciousFalling;
+	bool												m_UnconsciousDebug;
+	protected int			 							m_LastCommandBeforeUnconscious;
+	ref WeaponDebug										m_WeaponDebug;
+	ref DeathEffectTimer 								m_DeathEffectTimer;
+	ref Timer 											m_FightEndBlendTimer;
+	protected bool										m_ProcessFirearmMeleeHit;
+	protected bool										m_ContinueFirearmMelee;
+	protected bool 										m_LiftWeapon_player;
+	protected bool 										m_ProcessLiftWeapon;
+	protected bool 										m_ProcessLiftWeaponState;
+	protected int										m_LastSurfaceUnderHash;
+	protected Transport									m_TransportCache;
+	protected string 									m_ClimbingLadderType;
+	bool												m_isFBsymptomPlaying;
+	protected bool 										m_HandheldOpticsInUse;
+	protected bool 										m_ResetADS;
+	protected int										m_StepCounter;
+	protected int 										m_NextVoNNoiseTime;
+	protected ref array<ref SyncHitInfo>				m_SyncedHitDataArray;
+
+	// aiming model helpers	
+	protected bool										m_RaiseStarted = false;
+	protected bool										m_AimingFinisherStarted = false;
+	protected bool										m_IsWeapon;
+	
+	private float										m_CurrentWaterLevel;
+
+	bool												m_WasInVehicle;
+	protected bool										m_TriggerPullPlayerOutOfVehicleSynch;
+	protected bool										m_PullPlayerOutOfVehicleKeepsInLocalSpace = false;
+	protected int										m_PullPlayerOutOfVehicleState = -1;
+	int													m_ActionSoundCategoryHash;
+	
+	protected float										m_dT;
+	
+	//! constructor 
+	void 	DayZPlayerImplement()
+	{
+		m_SprintFull = false;
+		m_SprintedTime = 0;
+		m_SprintedTimePerStanceMin = PlayerConstants.FULL_SPRINT_DELAY_DEFAULT;
+		m_AimingModel = new DayZPlayerImplementAiming(this);
+		m_MeleeCombat = new DayZPlayerImplementMeleeCombat(this);
+		m_MeleeFightLogic = new DayZPlayerMeleeFightLogic_LightHeavy(this);
+		m_Swimming = new DayZPlayerImplementSwimming(this);		
+		m_Throwing = new DayZPlayerImplementThrowing(this);
+		m_JumpClimb = new DayZPlayerImplementJumpClimb(this);
+		m_FallDamage = new DayZPlayerImplementFallDamage(this);
+		m_ADSAutomationTimer = new Timer();
+		m_bADS = false;
+		m_WeaponRaiseCompleted = false;
+		SetOptics(false);
+		m_IsShootingFromCamera = true;
+		m_ProcessFirearmMeleeHit = false;
+		m_ContinueFirearmMelee = false;
+		m_WasIronsight = true; //initially uses ironsights by default
+		#ifdef PLATFORM_CONSOLE
+		m_Camera3rdPerson = !GetGame().GetWorld().Is3rdPersonDisabled();
+		#endif
+		m_LastSurfaceUnderHash = ("cp_gravel").Hash();
+		m_NextVoNNoiseTime = 0;
+		m_SyncedHitDataArray = new array<ref SyncHitInfo>;
+		m_CurrentWaterLevel = 0;
+		m_WeaponRaiseTime = 0;
+		
+		RegisterNetSyncVariableBoolSignal("m_TriggerPullPlayerOutOfVehicleSynch");
+	}
+
+	DayZPlayerImplementAiming GetAimingModel()
+	{
+		return m_AimingModel;
+	}
+
+	DayZPlayerImplementMeleeCombat GetMeleeCombat()
+	{
+		return m_MeleeCombat;
+	}
+	
+	DayZPlayerMeleeFightLogic_LightHeavy GetMeleeFightLogic()
+	{
+		return m_MeleeFightLogic;
+	}
+	
+	DayZPlayerImplementThrowing GetThrowing()
+	{
+		return m_Throwing;
+	}
+	
+	DayZPlayerImplementFallDamage GetFallDamage()
+	{
+		return m_FallDamage;
+	}
+	
+	void ~DayZPlayerImplement()
+	{
+	}
+
+	//! Legacy
+	override bool IsEyeZoom()
+	{
+		return GetEyeZoomLevel() > 0;
+	}
+	
+	override int GetEyeZoomLevel()
+	{
+		return m_CameraEyeZoomLevel;
+	}
+	
+	override bool IsShootingFromCamera()
+	{
+		return m_IsShootingFromCamera;
+	}
+	
+	void OverrideShootFromCamera(bool pState)
+	{
+		m_IsShootingFromCamera = pState;
+	}
+
+	bool IsInIronsights()
+	{
+		return m_CameraIronsight;
+	}
+	
+	bool IsInOptics()
+	{
+		return m_CameraOptics;
+	}
+	
+	override bool IsInThirdPerson()
+	{
+		return m_Camera3rdPerson;
+	}
+	
+	void SetIsInThirdPerson(bool state)
+	{
+		m_Camera3rdPerson = state;
+	}
+
+	bool IsFireWeaponRaised()
+	{
+		GetMovementState(m_MovementState);
+		if (m_MovementState)
+			return m_MovementState.IsRaised();
+		
+		return false;
+	}
+
+	bool IsTryingHoldBreath()
+	{
+		return m_IsTryingHoldBreath;
+	}
+
+	bool IsSprintFull()
+	{
+		return m_SprintFull;
+	}
+
+	void ShowWeaponDebug(bool show)
+	{
+		if (show)
+		{
+			m_WeaponDebug = new WeaponDebug;
+		}
+		else
+		{
+			m_WeaponDebug = null;
+		}
+	}
+
+	bool IsWeaponDebugEnabled()
+	{
+		return m_WeaponDebug != null;
+	}
+	
+	void SetFallYDiff(float value)
+	{
+		m_FallYDiff = value;
+	}
+	
+	override float GetCurrentWaterLevel()
+	{
+		return m_CurrentWaterLevel;
+	}
+	
+	override void SetCurrentWaterLevel(float pWaterLevel)
+	{
+		m_CurrentWaterLevel = pWaterLevel;
+	}
+
+	void SetIronsights(bool value)
+	{
+		Weapon_Base weapon = Weapon_Base.Cast(GetHumanInventory().GetEntityInHands());
+		if (weapon)
+		{
+			m_WasIronsight = m_CameraIronsight;
+		}
+		
+		m_CameraIronsight = value;
+		
+		if (value)
+		{
+			HumanCommandWeapons hcw = GetCommandModifier_Weapons();
+			if (hcw)
+			{
+				hcw.SetADS(true);
+			}
+		}
+	}
+	
+	void SetOptics(bool value)
+	{
+		m_CameraOptics = value;
+		
+		if (value)
+		{
+			HumanCommandWeapons hcw = GetCommandModifier_Weapons();
+			if (hcw)
+			{
+				hcw.SetADS(!IsHandheldOpticsInUse());
+			}
+		}
+	}
+	
+	void ExitSights()
+	{
+		ItemOptics optics = null;
+		EntityAI entityInHands = GetHumanInventory().GetEntityInHands();
+		Weapon weapon = Weapon.Cast(entityInHands);
+		if (weapon)
+		{
+			optics = weapon.GetAttachedOptics();
+		}
+		else
+		{
+			optics = ItemOptics.Cast(entityInHands);
+		}
+		
+		SetIronsights(false);
+		SetOptics(false);
+		
+		if (optics)
+		{
+			SwitchOptics(optics,false);
+		}
+		
+		HumanCommandWeapons hcw = GetCommandModifier_Weapons();
+		if (hcw)
+		{
+			hcw.SetADS(false);
+		}
+	}
+	
+	void SwitchOptics(ItemOptics optic, bool state)
+	{
+		if (optic)
+		{
+			if (state)
+			{
+				if (optic.HasEnergyManager())
+					optic.GetCompEM().SwitchOn();
+				optic.EnterOptics();
+				optic.OnOpticEnter();
+			}
+			else
+			{
+				optic.ExitOptics();
+				optic.OnOpticExit();
+				if (optic.HasEnergyManager())
+					optic.GetCompEM().SwitchOff();
+			}
+		}
+		
+		if (m_CameraOptics != state)
+		{
+			SetOptics(state);
+		}
+	}
+
+	void SetClimbingLadderType(string value)
+	{
+		m_ClimbingLadderType = value;
+	}
+
+	//! Implementations only! - used on PlayerBase
+	bool CanConsumeStamina(EStaminaConsumers consumer) {};
+	bool CanStartConsumingStamina(EStaminaConsumers consumer) {};
+	void DepleteStamina(EStaminaModifiers modifier, float dT = -1) {};
+	
+	bool IsInVehicle()
+	{
+		return m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_VEHICLE || (GetParent() != null && GetParent().IsInherited(Transport));
+	}
+	
+	bool IsSwimming()
+	{
+		return m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_SWIM;
+	}
+	
+	bool IsClimbingLadder()
+	{
+		return m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_LADDER;
+	}
+	
+	
+	bool PlaySoundEvent(EPlayerSoundEventID id, bool from_anim_system = false, bool is_from_server = false) {};
+	bool PlaySoundEventEx(EPlayerSoundEventID id, bool from_anim_system = false, bool is_from_server = false, int param = 0) {};
+
+	bool IsFBSymptomPlaying()
+	{
+		return m_isFBsymptomPlaying;
+	}
+	
+	float GetDeltaT()
+	{
+		return m_dT;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! HandleDeath
+	//! 
+
+	int m_DeathAnimType = -2;
+	float m_DeathHitDir = 0;
+	bool m_DeathJuctureSent = false;
+	
+	override string GetDebugText()
+	{
+		string text = super.GetDebugText();
+		text += "Parent: " + Object.GetDebugName(Object.Cast(GetParent())) + "\n";//keep
+		text += "IsSimulationDisabled: " + GetIsSimulationDisabled() + "\n";//keep
+		/*
+		text += "DamageDestroyed: " + IsDamageDestroyed() + "\n";
+		text += "DeathProcessed: " + IsDeathProcessed() + "\n";
+		text += "DeathConditionMet: " + IsDeathConditionMet() + "\n";
+		text += "PullOutOfVehicleState: " + m_PullPlayerOutOfVehicleState + "\n";
+		text += "PullOutOfVehicleSynch: " + m_TriggerPullPlayerOutOfVehicleSynch + "\n";
+		text += "Position: " + GetPosition() + "\n";*/
+		return text;
+	}
+
+	void TriggerPullPlayerOutOfVehicle()
+	{
+		if (!GetGame().IsServer())
+		{
+			return;
+		}
+		
+		Transport transport;
+		if (!Class.CastTo(transport, GetParent()))
+		{
+			return;
+		}
+		
+		int crewIdx = -1;
+		for (int i = 0; i < transport.CrewSize(); ++i)
+		{
+			if (transport.CrewMember(i) == this)
+			{
+				crewIdx = i;
+				break;
+			}
+		}
+		
+		if (crewIdx == -1)
+		{
+			return;
+		}
+
+		transport.CrewGetOut(crewIdx);
+		TriggerPullPlayerOutOfVehicleImpl();
+		
+		SetSynchDirty();
+	}
+
+	void TriggerPullPlayerOutOfVehicleImpl()
+	{
+		//! Reset the cooldown so simulation doesn't automatically get re-disabled
+		ResetDeathCooldown();
+
+		//! Synced to re-enable simulation on client as the death processing sets disable simulation to local only
+		DisableSimulation(false);
+
+		switch (GetInstanceType())
+		{
+			case DayZPlayerInstanceType.INSTANCETYPE_SERVER:
+			case DayZPlayerInstanceType.INSTANCETYPE_CLIENT:		//! Handle own client animation freeze
+			case DayZPlayerInstanceType.INSTANCETYPE_AI_SERVER:
+			case DayZPlayerInstanceType.INSTANCETYPE_AI_SINGLEPLAYER:
+				m_PullPlayerOutOfVehicleState = 0;
+				m_TriggerPullPlayerOutOfVehicleSynch = true;
+				break;
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		if (m_TriggerPullPlayerOutOfVehicleSynch && !GetGame().IsDedicatedServer())
+		{
+			TriggerPullPlayerOutOfVehicleImpl();
+		}
+
+		super.OnVariablesSynchronized();
+	}
+
+	bool	HandleDeath(int pCurrentCommandID)
+	{
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_DEATH)
+		{
+			switch (m_PullPlayerOutOfVehicleState)
+			{
+			case -1:
+				break;
+			case 0:
+				m_PullPlayerOutOfVehicleState = -1;
+
+				PhysicsSetSolid(true);
+				
+				//! Can't pull a body out of a car that is in water, don't need to handle that
+				DayZPlayerVehicleCommandDeathCallback callbackVeh;
+				Class.CastTo(callbackVeh, StartCommand_Death(DayZPlayerConstants.DEATH_PULL_OUT_TRANSPORT, 0, DayZPlayerVehicleCommandDeathCallback, m_PullPlayerOutOfVehicleKeepsInLocalSpace));
+				Class.CastTo(callbackVeh.m_pPlayer, this);
+				break;
+			}	
+
+			return true;
+		}
+		
+		if (m_DeathAnimType != -2 && g_Game.GetMissionState() == g_Game.MISSION_STATE_GAME)
+		{
+			if (!CommitedSuicide()) 	
+			{
+				int type = m_DeathAnimType;
+				if (type == DayZPlayerConstants.DEATH_DEFAULT) 
+					type = GetTypeOfDeath(pCurrentCommandID);
+
+				m_WasInVehicle = false;				
+				HumanCommandVehicle hcv = GetCommand_Vehicle();
+				if (hcv)
+				{
+					m_TransportCache = hcv.GetTransport();
+					m_WasInVehicle = !hcv.IsGettingIn() && !hcv.IsGettingOut();
+				}
+
+				bool keepInLocalSpace = false;
+				if (IsUnconscious() || m_WasInVehicle)
+				{
+					if (m_TransportCache)
+					{
+						m_TransportCache.CrewDeath(m_TransportCache.CrewMemberIndex(this));
+						m_TransportCache.MarkCrewMemberDead(m_TransportCache.CrewMemberIndex(this));
+					}
+				}
+				else
+				{
+					if (m_TransportCache)
+					{
+						m_TransportCache.CrewGetOut(m_TransportCache.CrewMemberIndex(this));
+						m_TransportCache.MarkCrewMemberDead(m_TransportCache.CrewMemberIndex(this));
+					}
+					
+					keepInLocalSpace = m_PullPlayerOutOfVehicleKeepsInLocalSpace;
+				}
+				
+				DisableSimulation(false);
+				GetItemAccessor().HideItemInHands(false);
+				m_TransportCache = null;
+
+				DayZPlayerCommandDeathCallback callback;
+				Class.CastTo(callback, StartCommand_Death(type, m_DeathHitDir, DayZPlayerCommandDeathCallback, keepInLocalSpace));
+				Class.CastTo(callback.m_pPlayer, this);
+			}
+			else
+			{
+				PhysicsSetRagdoll(true);
+			}
+			
+			// disable voice communication
+			GetGame().GetWorld().SetVoiceOn(false, false);
+			
+			return true;
+		}
+
+		return false;
+	}
+	
+	void	ResetDeathStartTime()
+	{
+		ResetDeathCooldown();
+	}
+	
+	int		GetTypeOfDeath(int pCurrentCommandID)
+	{
+		switch (pCurrentCommandID)
+		{
+			case DayZPlayerConstants.COMMANDID_SWIM:
+				return DayZPlayerConstants.DEATH_WATER;
+			case DayZPlayerConstants.COMMANDID_FALL:
+				return DayZPlayerConstants.DEATH_FALL;
+			case DayZPlayerConstants.COMMANDID_UNCONSCIOUS:
+				HumanCommandUnconscious hcu = GetCommand_Unconscious();
+				if (hcu)
+				{
+					if (hcu.IsOnLand())
+						return DayZPlayerConstants.DEATH_UNCON_ON_LAND;
+					if (hcu.IsInWater())
+						return DayZPlayerConstants.DEATH_UNCON_IN_WATER;
+				}
+
+				break;
+		}
+		
+		return DayZPlayerConstants.DEATH_BODY;
+	}
+	
+	void SendDeathJuncture(int pAnimTypeDeath, float pAnimHitDirDeath)
+	{
+		if (m_DeathJuctureSent)
+			return;
+		
+		DayZPlayerSyncJunctures.SendDeath(this, pAnimTypeDeath, pAnimHitDirDeath);
+		m_DeathJuctureSent = true;
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		SendDeathJuncture(-1, 0);
+		
+		super.EEKilled(killer);
+	}
+	
+	void ShowDeadScreen(bool show, float duration)
+	{		
+		#ifndef NO_GUI
+		if (show && IsPlayerSelected())
+		{
+			#ifdef PLATFORM_PS4
+			OnlineServices.SetMultiplayState(false);
+			#endif		
+			
+			string message = "";
+			if (!GetGame().GetMission().IsPlayerRespawning())
+			{
+				message = "#dayz_implement_dead";
+			}
+
+			#ifdef PLATFORM_CONSOLE
+			GetGame().GetUIManager().ScreenFadeIn(duration, message, FadeColors.DARK_RED, FadeColors.WHITE);
+			#else
+			GetGame().GetUIManager().ScreenFadeIn(duration, message, FadeColors.BLACK, FadeColors.WHITE);
+			#endif
+		}
+		else
+		{
+			GetGame().GetUIManager().ScreenFadeOut(duration);
+
+			if (duration > 0)
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(StopDeathDarkeningEffect, duration*1000, false);
+			else
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(StopDeathDarkeningEffect);
+		}
+		#endif
+	}
+	
+	override void StopDeathDarkeningEffect()
+	{
+		if (m_DeathEffectTimer && m_DeathEffectTimer.IsRunning())
+		{
+			m_DeathEffectTimer.Stop();
+			m_DeathEffectTimer = null;
+		}
+	}
+	
+	void SimulateDeath(bool state)
+	{
+		if (g_Game.GetMissionState() != DayZGame.MISSION_STATE_GAME)
+			return;
+		
+		LockControls(state);
+		
+		if (state)
+		{
+			float duration = DEFAULT_DYING_TIME;
+			if (m_KilledByHeadshot)
+			{
+				duration = 0;
+			}
+			
+			if (duration > DYING_PROGRESSION_TIME && !m_IsUnconscious)
+			{
+				if (!m_DeathEffectTimer)
+					m_DeathEffectTimer = new DeathEffectTimer();
+				
+				Param2<float,float> par = new Param2<float,float>(duration, DYING_PROGRESSION_TIME);
+				m_DeathEffectTimer.Run(DYING_PROGRESSION_TIME, this, "SetDeathDarknessLevel", par, true);
+			}
+			
+			ShowDeadScreen(state, duration);
+			
+			GetGame().GetSoundScene().SetSoundVolume(0,0);
+			GetGame().GetSoundScene().SetSpeechExVolume(0,0);
+			GetGame().GetSoundScene().SetMusicVolume(0,0);
+			GetGame().GetSoundScene().SetVOIPVolume(0,0);
+			GetGame().GetSoundScene().SetRadioVolume(0,0);
+		}
+		else
+		{
+			StopDeathDarkeningEffect();
+			ShowDeadScreen(state, 0);
+		}
+	}
+	
+	void LockControls(bool state)
+	{
+		if (state == true)
+		{
+			GetGame().GetInput().ChangeGameFocus(1, INPUT_DEVICE_MOUSE);
+			GetGame().GetInput().ChangeGameFocus(1, INPUT_DEVICE_KEYBOARD);
+			GetGame().GetInput().ChangeGameFocus(1, INPUT_DEVICE_GAMEPAD);
+			
+			if (GetGame().GetUIManager()) 	
+			{
+				GetGame().GetUIManager().ShowUICursor(true);
+				if (GetGame().GetUIManager().IsDialogVisible())
+					GetGame().GetUIManager().CloseDialog();
+			}
+		}
+		else
+		{
+			GetGame().GetInput().ChangeGameFocus(-1, INPUT_DEVICE_MOUSE);
+			GetGame().GetInput().ChangeGameFocus(-1, INPUT_DEVICE_KEYBOARD);
+			GetGame().GetInput().ChangeGameFocus(-1, INPUT_DEVICE_GAMEPAD);
+			
+			if (GetGame().GetUIManager())
+			{
+				if (GetGame().GetUIManager().GetMenu())
+				{
+					GetGame().GetUIManager().ShowUICursor(true);
+				}
+				else
+				{
+					GetGame().GetUIManager().ShowUICursor(false);
+				}
+			}
+		}
+	}
+	
+	void SetDeathDarknessLevel(float duration, float tick_time);
+	
+	void SendCompleteWeaponRaiseJuncture();
+	
+	void CompleteWeaponRaise()
+	{
+		m_WeaponRaiseTime = 0;
+		m_WeaponRaiseCompleted = true;
+	}
+	
+	void ResetWeaponRaiseProgress()
+	{
+		m_WeaponRaiseTime = 0;
+		m_WeaponRaiseCompleted = false;
+	}
+	
+	bool IsWeaponRaiseCompleted()
+	{
+		return m_WeaponRaiseCompleted;
+	}
+	
+	DayZPlayerInventory GetDayZPlayerInventory()
+	{
+		DayZPlayerInventory inv = DayZPlayerInventory.Cast(GetInventory());
+		return inv;
+	}
+
+	override void OnInputForRemote(ParamsReadContext ctx)
+	{
+		int userDataType = 0;
+		if (!ctx.Read(userDataType))
+		{
+			Error("DayZPlayer: OnInputForRemote - cannot read input type");
+			return;
+		}
+		
+		switch (userDataType)
+		{
+			case INPUT_UDT_WEAPON_REMOTE_EVENT:
+				GetDayZPlayerInventory().OnEventForRemoteWeapon(ctx);
+				break;
+			case INPUT_UDT_HAND_REMOTE_EVENT:
+				GetDayZPlayerInventory().OnHandEventForRemote(ctx);
+				break;
+			case INPUT_UDT_INVENTORY:
+				GetDayZPlayerInventory().OnInputUserDataForRemote(ctx);
+				break;
+			default:
+				Error("OnInputForRemote - unknown userDataType=" + userDataType);
+				break;
+		}
+	}
+
+	override void OnInputFromServer (ParamsReadContext ctx)
+	{
+		int userDataType = 0;
+		if (!ctx.Read(userDataType))
+		{
+			Error("DayZPlayer: OnInputFromServer - cannot read input type");
+			return;
+		}
+
+		switch (userDataType)
+		{
+			case INPUT_UDT_INVENTORY:
+				GetDayZPlayerInventory().OnServerInventoryCommand(ctx);
+				break;
+			default:
+				Error("OnInputFromServer - unknown userDataType=" + userDataType);
+				break;
+		}
+	}
+	void RequestSoundEvent(EPlayerSoundEventID id, bool from_server_and_client = false);
+	void RequestSoundEventEx(EPlayerSoundEventID id, bool from_server_and_client = false, int param = 0);
+	protected void SendSoundEvent(EPlayerSoundEventID id);
+	protected void SendSoundEventEx(EPlayerSoundEventID id, int param = 0);
+	
+	override void OnItemInHandsChanged()
+	{
+		//Print("inv: DayZPlayerImplement::OnItemInHandsChanged: "/* + GetHumanInventory().GetEntityInHands()*/);
+		StopWeaponEvent();
+		GetItemAccessor().OnItemInHandsChanged();
+		
+		if (!IsAlive())
+		{
+			//Print("inv: DayZPlayerImplement::OnItemInHandsChanged - human not alive! calling ResetWeaponInHands");
+			GetItemAccessor().ResetWeaponInHands();
+		}
+	}
+
+	WeaponManager GetWeaponManager() { return null; }
+
+	//-------------------------------------------------------------
+	//!
+	//! HandleWeapons
+	//!
+	void HandleWeapons(float pDt, Entity pInHands, HumanInputController pInputs, out bool pExitIronSights)
+	{
+		HumanCommandWeapons		hcw = GetCommandModifier_Weapons();
+    	GetDayZPlayerInventory().HandleWeaponEvents(pDt, pExitIronSights);
+
+		Weapon_Base weapon;
+		Class.CastTo(weapon, pInHands);
+		ItemOptics optic = weapon.GetAttachedOptics();
+		
+		CheckLiftWeapon();
+		ProcessLiftWeapon();
+		
+		GetMovementState(m_MovementState);
+		
+		// hold breath
+		if (pInputs.IsHoldBreath() && m_MovementState.IsRaised() && (IsInIronsights() || IsInOptics()))
+		{
+			m_IsTryingHoldBreath = true;
+		}
+		else
+		{
+			m_IsTryingHoldBreath = false;
+		}
+		
+		if (pInputs.IsFireModeChange())
+		{
+			GetWeaponManager().SetNextMuzzleMode();
+		}
+		if (pInputs.IsZeroingUp())
+		{
+			if (optic && (optic.IsInOptics() || optic.IsUsingWeaponIronsightsOverride()))
+			{
+				optic.StepZeroingUp();
+			}
+			else
+			{
+				weapon.StepZeroingUpAllMuzzles();
+			}
+		}
+		if (pInputs.IsZeroingDown())
+		{
+			if (optic && (optic.IsInOptics() || optic.IsUsingWeaponIronsightsOverride()))
+			{
+				optic.StepZeroingDown();
+			}
+			else
+			{
+				weapon.StepZeroingDownAllMuzzles();
+			}
+		}
+		
+		if (!m_LiftWeapon_player && (m_CameraIronsight || !weapon.CanEnterIronsights() || m_CameraOptics/*m_ForceHandleOptics*/)) 	// HACK straight to optics, if ironsights not allowed
+		{
+			if (optic)
+				HandleOptic(optic, false, pInputs, pExitIronSights);
+		}
+		
+		if (!m_MovementState.IsRaised())
+		{
+			m_IsFireWeaponRaised = false; //legacy reasons
+			if (weapon && weapon.IsInOptics())
+			{
+				weapon.ExitOptics();
+			}
+			
+			ResetWeaponRaiseProgress();
+
+			return; // if not raised => return
+		}
+		else
+		{
+			m_IsFireWeaponRaised = true; //legacy reasons
+			if (!IsWeaponRaiseCompleted())
+			{
+				m_WeaponRaiseTime += pDt;
+			}
+			
+			if (m_WeaponRaiseTime >= PlayerConstants.WEAPON_RAISE_BLEND_DELAY)
+			{
+				CompleteWeaponRaise();
+			}
+		}
+		
+		//! fire
+		if (GetWeaponManager().CanFire(weapon))
+		{
+			bool autofire = weapon.GetCurrentModeAutoFire(weapon.GetCurrentMuzzle()) && weapon.IsChamberEjectable(weapon.GetCurrentMuzzle());
+			int burst = weapon.GetCurrentModeBurstSize(weapon.GetCurrentMuzzle());
+			int burst_count = weapon.GetBurstCount();
+			if (!autofire && (burst < 2 || burst_count < 1))
+			{
+				if (pInputs.IsAttackButtonDown() && GetInputInterface().SyncedValue("UAWeaponMeleeAttack") == 0 && GetInputInterface().SyncedValue("UAHeavyMeleeAttack") == 0)
+				{
+					GetWeaponManager().Fire(weapon);
+				}
+			}
+			else if (autofire || burst > 1)
+			{
+#ifdef DIAG_DEVELOPER
+				int burst_option = GetWeaponManager().GetBurstOption();
+				if (burst_option == 0)
+				{
+#endif
+					if (pInputs.IsAttackButton() && GetInputInterface().SyncedValue("UAWeaponMeleeAttack") == 0 && GetInputInterface().SyncedValue("UAHeavyMeleeAttack") == 0)
+					{
+						if (autofire || burst_count < burst)
+						{
+							GetWeaponManager().Fire(weapon);
+						}
+					}
+					else
+					{
+						weapon.ResetBurstCount();	
+					}
+#ifdef DIAG_DEVELOPER
+				}
+				else if (burst_option == 1)
+				{
+					if (burst > 1 && burst_count == burst)
+					{
+						weapon.ResetBurstCount();	
+					}
+					else if (burst > 1 && burst_count < burst)
+					{
+						GetWeaponManager().Fire(weapon);	
+					}
+					else
+					{
+						//Autofire
+						if (pInputs.IsAttackButton())
+						{
+							GetWeaponManager().Fire(weapon);	
+						}						
+					}	
+				}
+#endif
+			}
+		}
+
+		#ifdef PLATFORM_CONSOLE
+		if (GetGame().GetInput().LocalRelease("UAFire", false) || m_ShouldReload)
+		{
+			if (!weapon.IsWaitingForActionFinish() && !IsFighting())
+			{
+				int muzzle_index = weapon.GetCurrentMuzzle();
+			
+				if (weapon.IsChamberFiredOut(muzzle_index))
+				{
+					if (weapon.CanProcessWeaponEvents())
+					{
+						if (GetWeaponManager().CanEjectBullet(weapon))
+						{
+							GetWeaponManager().EjectBullet();
+							pExitIronSights = true;
+							m_ShouldReload = false;
+						}
+					}
+				}
+			}
+			else
+			{
+				m_ShouldReload = true;
+			}
+		}
+		#endif
+	}
+	
+	void HandleOptic(notnull ItemOptics optic, bool inHands, HumanInputController pInputs, out bool pExitOptics)
+	{
+		UAInterface input = GetInputInterface();
+		if (!input)
+		{
+			return;
+		}
+
+		Weapon_Base weapon;
+		int FOVcount;
+		bool controllerPressIn;
+		bool controllerPressOut;
+		
+		if (input.SyncedPress_ID(UAZoomInOptics))
+		{
+			weapon = Weapon_Base.Cast(optic.GetHierarchyParent());
+			FOVcount = optic.GetStepFOVCount();
+			controllerPressIn = input.SyncedPress_ID(UAZoomInOpticsControllerHelper);
+		
+			if (weapon && m_CameraIronsight && !m_CameraOptics)
+			{
+				SetIronsights(false);
+				SwitchOptics(optic,true);
+				optic.SetStepFOVIndex(0);
+			}
+			else if (m_CameraOptics)
+			{
+				if (controllerPressIn) //controller
+				{
+					if (!optic.StepFOVUp())
+					{
+						if (FOVcount > 0)
+						{
+							optic.SetStepFOVIndex(0); //loop to minimum magnification
+						}
+						
+						if (weapon && weapon.CanEnterIronsights()) //loop into ironsights
+						{
+							SwitchOptics(optic,false);
+							pInputs.ResetFreeLookToggle();
+							SetIronsights(true);
+						}
+					}
+				}
+				else //m&k
+				{
+					optic.StepFOVUp();
+				}
+			}
+		}
+		
+		if (input.SyncedPress_ID(UAZoomOutOptics))
+		{
+			weapon = Weapon_Base.Cast(optic.GetHierarchyParent());
+			FOVcount = optic.GetStepFOVCount();
+			controllerPressOut = input.SyncedPress_ID(UAZoomOutOpticsControllerHelper);
+			if (m_CameraOptics)
+			{
+				if (!optic.StepFOVDown())
+				{
+					if (controllerPressOut)
+					{
+						if (FOVcount > 0 && (!weapon || !weapon.CanEnterIronsights()))
+						{
+							optic.SetStepFOVIndex(FOVcount - 1); //loop to maximum magnification
+						}
+					}
+					
+					if (weapon && weapon.CanEnterIronsights())
+					{
+						SwitchOptics(optic,false);
+						pInputs.ResetFreeLookToggle();
+						SetIronsights(true);
+					}
+				}
+			}
+			else if (controllerPressOut && weapon && m_CameraIronsight)
+			{
+				SwitchOptics(optic,true);
+				if (FOVcount > 0)
+				{
+					optic.SetStepFOVIndex(FOVcount - 1); //loop to maximum magnification
+				}
+			}
+		}
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! HandleDamageHit
+	//! 
+
+	bool m_DamageHitFullbody = false;
+	int m_DamageHitAnimType = -1.0;
+	float m_DamageHitDir = 0.0;
+	float m_DamageHealth = 0.0;
+	
+	const float HIT_INTERVAL_MIN = 0.3; 		// Minimum time in seconds before a COMMANDID_HIT to COMMANDID_HIT transition is allowed
+	float m_HitElapsedTime = HIT_INTERVAL_MIN;
+
+	bool IsInFullbodyDamageAnimation()
+	{
+		return (m_DamageHitFullbody && m_DamageHitAnimType != -1) || GetCommand_Damage() != null;
+	}
+
+	//! Must be ran at the start of CommandHandler before Jump is triggered
+	void EvaluateDamageHit(int pCurrentCommandID)
+	{
+		//! Reset damage hit to prevent animation from playing unnecessarily when it is already cancelled out
+		m_DamageHitAnimType = -1;
+
+		if (!m_SyncedHitDataArray || m_SyncedHitDataArray.Count() == 0)
+		{
+			return;
+		}
+		
+		//evaluate all hit data
+		SyncHitInfo data;
+		SyncHitInfo greatest_hit;
+		for (int i = 0; i < m_SyncedHitDataArray.Count(); i++)
+		{
+			data = m_SyncedHitDataArray[i];
+			m_DamageHitDir = data.m_HitDir;
+			
+			//client-side effects
+			#ifndef SERVER
+			if (IsAlive() && !IsUnconscious() && data.m_HasSource && GetGame().GetMission().GetHud() && GetGame().GetPlayer() == this) //only for controlled players
+			{
+				m_DamageHealth = data.m_HealthDamage;
+				if (m_DamageHealth > 0.0)
+				{
+					float rel = m_DamageHealth / (GetMaxHealth("","Health") * PlayerConstants.HEAVY_HIT_THRESHOLD);
+					GetGame().GetMission().GetHud().SpawnHitDirEffect(this,m_DamageHitDir,rel);
+				}
+			}
+			#endif
+			
+			if (!greatest_hit)
+			{
+				greatest_hit = data;
+			}
+			//else if (data.m_HealthDamage > greatest_hit.m_HealthDamage || (data.m_Fullbody && !greatest_hit.m_Fullbody)) //TODO - revisit cumulative calculation for animation evaluation purposes (stagger on shotgun to the chest)
+			else if (data.m_Fullbody) //temporary solution; last fullbody hit is used for animation purposes, some light hit otherwise
+			{
+				greatest_hit = data;
+			}
+		}
+		
+		m_SyncedHitDataArray.Clear();
+		m_DamageHealth = 0.0;
+
+		//! ignore hit impacts in prone (for now)
+		if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE || m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+		{
+			return;
+		}
+		
+		//general effects
+		m_DamageHitFullbody = greatest_hit.m_Fullbody;
+		m_DamageHitAnimType = greatest_hit.m_AnimType;
+		m_DamageHitDir = greatest_hit.m_HitDir;
+	}
+
+	bool HandleDamageHit(int pCurrentCommandID)
+	{
+		// Update elapsed time since hit first
+		if ( pCurrentCommandID == DayZPlayerConstants.COMMANDID_DAMAGE )
+		{
+			// Throttle heavy hit command up to a fixed rate
+			if ( m_HitElapsedTime < HIT_INTERVAL_MIN )
+			{
+				m_HitElapsedTime += m_dT;
+				ResetDamageHitState(false);
+				return false;
+			}
+		}
+		
+		// If transportcache is not null, player is unconscious inside of a car and should not head into a damage command
+		if (m_DamageHitAnimType != -1 && m_TransportCache == null && !CommitedSuicide())
+		{
+			HumanCommandVehicle vehCommand = GetCommand_Vehicle();		
+			if (m_DamageHitFullbody && (!vehCommand || vehCommand.IsGettingIn() || vehCommand.IsGettingOut()))
+			{
+				StartCommand_Damage(m_DamageHitAnimType, m_DamageHitDir);
+				ResetDamageHitState(true);
+				return true;
+			}
+			else
+			{
+				AddCommandModifier_Damage(m_DamageHitAnimType, m_DamageHitDir);
+				ResetDamageHitState(false);
+				return false;
+			}
+		}
+		
+		return pCurrentCommandID == DayZPlayerConstants.COMMANDID_DAMAGE;
+	}
+	
+	void ResetDamageHitState(bool resetTimer)
+	{
+		m_DamageHitAnimType = -1;
+		m_DamageHitFullbody = false;
+		
+		if (resetTimer)
+		{
+			m_HitElapsedTime = 0;
+		}
+	}
+
+	//! selects animation type and direction based on damage system data
+	bool EvaluateDeathAnimation(int pDamageType, EntityAI pSource, string pAmmoType, out int pAnimType, out float pAnimHitDir)
+	{
+		bool doPhxImpulse = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " doPhxImpulse") > 0;
+
+		pAnimType = DayZPlayerConstants.DEATH_DEFAULT;		
+		if (doPhxImpulse)
+			pAnimType = DayZPlayerConstants.DEATH_FAST;
+
+		//! direction
+		vector targetDirection = GetDirection();
+		vector toSourceDirection = (pSource.GetPosition() - GetPosition());
+
+		targetDirection[1] = 0;
+		toSourceDirection[1] = 0;
+
+		targetDirection.Normalize();
+		toSourceDirection.Normalize();
+
+		float cosFi = vector.Dot(targetDirection, toSourceDirection);
+		vector cross = targetDirection * toSourceDirection;
+
+		pAnimHitDir = Math.Acos(cosFi) * Math.RAD2DEG;
+		if (cross[1] < 0)
+			pAnimHitDir = -pAnimHitDir;
+		
+		return true;
+	}
+
+	//! selects animation type and direction based on damage system data
+	bool EvaluateDamageHitAnimation(TotalDamageResult pDamageResult, int pDamageType, EntityAI pSource, string pComponent, string pAmmoType, vector pModelPos, out int pAnimType, out float pAnimHitDir, out bool pAnimHitFullbody)
+	{
+		int invertHitDir = 0; //Used to flip the heavy hit animation direction
+		
+		pAnimType = 0;
+		pAnimHitFullbody = false; // additive anm
+		GetMovementState(m_MovementState);
+
+		switch (pDamageType)
+		{
+			case DT_CLOSE_COMBAT:
+				//! impact from infected attack will be light only
+			 	if (pSource.IsInherited(DayZInfected))
+					break;
+
+				pAnimType = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " hitAnimation");
+				invertHitDir = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " invertHitDir");
+				if (!IsUnconscious() && pAnimType == 1 && !m_MeleeFightLogic.IsInBlock())
+					pAnimHitFullbody = true;
+				break;
+
+			case DT_FIRE_ARM:
+				int impactBehaviour = 0;
+
+				if (!IsUnconscious() && GetHealth("", "Shock") > 25)
+				{
+					//! play full body when these coponents were hit
+					if (pComponent == "Torso" || pComponent == "Head")
+					{
+						impactBehaviour = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " impactBehaviour");
+						float fireDamage = pDamageResult.GetHighestDamage("Health");
+						float shockDamage = pDamageResult.GetHighestDamage("Shock");
+						if ((fireDamage > 80.0 || shockDamage > 40.0) && impactBehaviour == 1)
+							pAnimHitFullbody = true;
+					}
+				}
+
+				break;
+
+			case DT_EXPLOSION:
+				break;
+
+			case DT_CUSTOM:
+				pAnimType = GetGame().ConfigGetInt("cfgAmmo " + pAmmoType + " hitAnimation");
+				if (pAnimType == 1)
+					pAnimHitFullbody = true;
+				else
+					return false; //! skip evaluation of dmg hit animation
+
+				break;
+		}
+
+		//! direction
+		vector targetDirection = GetDirection();
+		vector toSourceDirection = (pSource.GetPosition() - GetPosition());
+
+		targetDirection[1] = 0;
+		toSourceDirection[1] = 0;
+
+		targetDirection.Normalize();
+		toSourceDirection.Normalize();
+
+		float cosFi = vector.Dot(targetDirection, toSourceDirection);
+		vector cross = targetDirection * toSourceDirection;
+
+		pAnimHitDir = Math.Acos(cosFi) * Math.RAD2DEG;
+		
+		// We will invert direction of the hit
+		if (invertHitDir > 0)
+			pAnimHitDir -= 180;
+		
+		if (cross[1] < 0)
+			pAnimHitDir = -pAnimHitDir;
+		
+		return true;
+	}
+
+	//! event from damage system
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		
+		m_TransportHitRegistered = false;
+		
+		if (!IsAlive())
+		{
+			int animTypeDeath;
+			float animHitDirDeath;
+			if (EvaluateDeathAnimation(damageType, source, ammo, animTypeDeath, animHitDirDeath))
+			{
+				SendDeathJuncture(animTypeDeath, animHitDirDeath);
+			}			
+			
+			if (!m_DeathSyncSent) //checked until the death is evaluated by 'OnCommandHandlerTick' higher up the road
+			{
+				Man killer = source.GetHierarchyRootPlayer();
+				
+				if (!m_KillerData) //only one player is considered killer in the event of crossfire
+				{
+					m_KillerData = new KillerData();
+					m_KillerData.m_Killer = killer;
+					m_KillerData.m_MurderWeapon = source;
+				}
+				
+				if (killer && killer.IsPlayer())
+				{
+					// was player killed by headshot?
+					if (dmgZone == "Brain")
+					{
+						m_KilledByHeadshot = true;
+						if (m_KillerData.m_Killer == killer)
+							m_KillerData.m_KillerHiTheBrain = true;
+					}
+				}
+			}
+		}
+		else
+		{
+			int animType;
+			float animHitDir;
+			bool animHitFullbody;
+			if (EvaluateDamageHitAnimation(damageResult, damageType, source, dmgZone, ammo, modelPos, animType, animHitDir, animHitFullbody))
+				DayZPlayerSyncJunctures.SendDamageHitEx(this, animType, animHitDir, animHitFullbody, damageResult, damageType, source, dmgZone, ammo, modelPos);
+			else
+			{
+				bool skipSoundRequest = false;
+				if (damageType == DamageType.CUSTOM && GetCommand_Fall())
+					skipSoundRequest = GetFallDamage().GetLandType() < HumanCommandFall.LANDTYPE_MEDIUM;
+
+				if (!skipSoundRequest)
+					RequestSoundEvent(EPlayerSoundEventID.TAKING_DMG_LIGHT);
+			}
+		}
+
+		// interupt melee for non-blocked hit or heavy hit
+		if (animHitFullbody)
+		{
+			HumanCommandMelee2 hcm = GetCommand_Melee2();
+			if (hcm)
+				hcm.Cancel();
+		}
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! This HeadingModel
+	//! 
+	float 	m_fLastHeadingDiff = 0;
+
+	//!
+	override bool	HeadingModel(float pDt, SDayZPlayerHeadingModel pModel)
+	{
+		if (!IsAlive())
+		{
+			return false;
+		}
+		
+		GetMovementState(m_MovementState);
+		
+		//! on ladder - do nothing 
+		if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_LADDER)
+		{
+			m_fLastHeadingDiff = 0;
+			return false;
+		}
+		if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_VEHICLE)
+		{
+			HumanCommandVehicle hmv = GetCommand_Vehicle();
+			if (hmv.IsGettingOut() || hmv.IsGettingIn())
+			{
+				return DayZPlayerImplementHeading.NoHeading(pDt, pModel, m_fLastHeadingDiff);
+			}
+			
+			m_fLastHeadingDiff = 0;
+			return false;
+		}
+		if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_UNCONSCIOUS)
+		{
+			HumanCommandUnconscious	hcu = GetCommand_Unconscious();
+			if (!hcu.IsWakingUp())
+			{
+				m_fLastHeadingDiff = 0;
+				//pModel.m_iCamMode = DayZPlayerConstants.CAMERAMODE_HEAD;
+				return false;
+			}
+		}
+		
+		if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_CLIMB)
+		{
+			m_fLastHeadingDiff = 0;
+			return false;
+		}
+		
+#ifdef DEVELOPER
+		int	actMenuValue = DiagMenu.GetEngineValue(DayZPlayerConstants.DEBUG_TURNSLIDE);
+		if (actMenuValue != 0)
+		{
+			//! this clamps heading 
+			return DayZPlayerImplementHeading.ClampHeading(pDt, pModel, m_fLastHeadingDiff);
+		}
+#endif
+		
+		if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+		{
+			m_fLastHeadingDiff = 0;
+			return false;
+		}
+
+		//! if it's standing from prone on back  
+		if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MOVE)
+		{
+			HumanCommandMove hcm = GetCommand_Move();
+			if (hcm.IsStandingFromBack())
+			{
+				m_fLastHeadingDiff = 0;
+				return false;
+			}
+		}
+		
+		HumanItemAccessor hia = GetItemAccessor();
+		HumanItemBehaviorCfg hibcfg = hia.GetItemInHandsBehaviourCfg();
+		if (hibcfg && hibcfg.m_StanceRotation[m_MovementState.m_iStanceIdx] == DayZPlayerConstants.ROTATION_DISABLE)
+		{
+			return DayZPlayerImplementHeading.NoHeading(pDt, pModel, m_fLastHeadingDiff);
+		}
+		if (IsUnconscious() || (GetCommand_Move() && GetCommand_Move().IsLeavingUncon()))
+		{
+			return DayZPlayerImplementHeading.NoHeading(pDt, pModel, m_fLastHeadingDiff);
+		}
+
+		return DayZPlayerImplementHeading.RotateOrient(pDt, pModel, m_fLastHeadingDiff);	
+	}
+
+
+	//-------------------------------------------------------------
+	//!
+	//! This Aiming Model
+	//! 
+	override bool	AimingModel(float pDt, SDayZPlayerAimingModel pModel)
+	{
+		GetMovementState(m_MovementState);
+		if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MELEE2)
+		{
+			HumanCommandMelee2 hcm = GetCommand_Melee2();
+			if (hcm.IsFinisher())
+			{
+				if (!m_AimingFinisherStarted)
+				{
+					m_AimingModel.OnFinisherBegin(pModel.m_fCurrentAimY);
+					m_AimingFinisherStarted = true;
+				}
+				m_AimingModel.ProcessStealthFilters(pDt, pModel);
+			}
+			
+			return true;
+		}
+
+		if (m_MovementState.IsRaised())
+		{
+			if (!m_RaiseStarted)
+			{
+				m_AimingModel.OnRaiseBegin(this);
+				m_RaiseStarted = true;
+			}
+			m_AimingModel.ProcessAimFilters(pDt, pModel, m_MovementState.m_iStanceIdx);
+			
+			return true;
+		}
+
+		m_RaiseStarted = false;
+		m_AimingFinisherStarted = false;
+
+		return true;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! Jump
+	//! 
+	
+	
+	//!
+	bool CanJump()
+	{
+		if (IsFBSymptomPlaying() || IsRestrained() || IsUnconscious() || IsInFBEmoteState())
+			return false;
+		
+		if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE || m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+			return false;
+		
+		if (IsRaised() && GetInputInterface().SyncedPress("UAGetOverControllerHelper")) //no raised jump on cotroller
+		{
+			return false;
+		}
+		
+		HumanItemBehaviorCfg hibcfg = GetItemAccessor().GetItemInHandsBehaviourCfg();
+		if (!hibcfg.m_bJumpAllowed)
+			return false;
+		
+		if (!DayZPlayerUtils.PlayerCanChangeStance(this, DayZPlayerConstants.STANCEIDX_ERECT) || !DayZPlayerUtils.PlayerCanChangeStance(this, DayZPlayerConstants.STANCEIDX_RAISEDERECT))
+			return false;
+		
+		HumanCommandMove hcm = GetCommand_Move();
+		if (hcm)
+		{
+			if (hcm.IsChangingStance())
+				return false;
+		}
+		
+		return true;
+	}
+
+	bool CanClimb(int climbType, SHumanCommandClimbResult climbRes)
+	{
+		if (IsFBSymptomPlaying() || IsRestrained() || IsUnconscious() || IsInFBEmoteState())
+			return false;
+		
+		if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE || m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+			return false;
+		
+		if (IsRaised() && GetInputInterface().SyncedPress("UAGetOverControllerHelper")) //no raised climb on cotroller
+		{
+			return false;
+		}
+		
+		HumanItemBehaviorCfg hibcfg = GetItemAccessor().GetItemInHandsBehaviourCfg();
+		if (!hibcfg.m_bJumpAllowed)
+			return false;
+		
+		if (climbRes)
+		{
+			EntityAI entity;
+			if (Class.CastTo(entity,climbRes.m_GrabPointParent) && entity.IsHologram())
+				return false;
+			if (Class.CastTo(entity,climbRes.m_ClimbStandPointParent) && entity.IsHologram())
+				return false;
+			if (Class.CastTo(entity,climbRes.m_ClimbOverStandPointParent) && entity.IsHologram())
+				return false;
+		}
+
+		return true;
+	}
+	
+
+	void OnJumpStart()
+	{
+	}
+	
+	void OnJumpEnd(int pLandType = 0)
+	{
+	}
+	
+	void StopHandEvent()
+	{
+		GetDayZPlayerInventory().CancelHandEvent();
+	}
+	
+	void StopWeaponEvent()
+	{
+		GetDayZPlayerInventory().CancelWeaponEvent();
+	}
+	
+	void AbortWeaponEvent()
+	{
+		GetDayZPlayerInventory().AbortWeaponEvent();
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! This is main command logic
+	//! 
+	void HandleADS()
+	{
+		if (!IsAlive())
+		{
+			if (m_CameraIronsight || m_CameraOptics)
+			{
+				ExitSights();
+			}
+			return;
+		}
+		
+		bool bADSToggle = false;
+		bool exitSights = false;
+		HumanInputController hic = GetInputController();
+		HumanItemAccessor 	hia = GetItemAccessor();
+		HumanCommandWeapons	hcw = GetCommandModifier_Weapons();
+		PlayerBase playerPB = PlayerBase.Cast(this);
+		GetMovementState(m_MovementState);
+		
+		if (playerPB.IsRolling())
+		{
+			exitSights = true;
+		}
+		
+		if (m_ResetADS || !hia.IsItemInHandsWeapon())
+		{
+			hic.ResetADS();
+			m_ResetADS = false;
+		}
+		
+		if (!m_MovementState.IsRaised() || m_LiftWeapon_player)
+		{
+			ResetWeaponRaiseProgress();
+			exitSights = true;
+		}
+		else
+		{
+			if (m_bADS != hic.WeaponADS())
+			{
+				m_bADS = hic.WeaponADS();
+				bADSToggle = true;
+			}
+			
+			if (m_bADS && !m_CameraIronsight && !m_CameraOptics)
+			{
+				//!artificial Auto-ADS delay
+				if (!IsWeaponRaiseCompleted())
+				{
+					bADSToggle = false;
+					exitSights = true;
+				}
+				else
+				{
+					bADSToggle = true;
+				}
+			}
+		}
+	
+		if (bADSToggle && !GetCommand_Melee2() && !GetThrowing().IsThrowingModeEnabled())
+		{
+			if (hia.IsItemInHandsWeapon() && playerPB.GetItemInHands() && playerPB.GetItemInHands().IsWeapon() && playerPB.GetWeaponManager() && !playerPB.GetWeaponManager().IsRunning())
+			{
+				Weapon_Base weapon = Weapon_Base.Cast(GetHumanInventory().GetEntityInHands());
+				ItemOptics optic = weapon.GetAttachedOptics();
+				bool switchToADS = false;
+				bool canUseIronsights = weapon.CanEnterIronsights();
+				bool canUseOptics = optic != NULL;
+				
+				if (canUseIronsights || canUseOptics)
+					switchToADS = m_bADS;
+				
+				// go to ironsights - disable ironsights when
+				//! if !raised
+				//! if sprinting
+				if (!m_MovementState.IsRaised() || m_MovementState.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_SPRINT)
+				{
+					switchToADS = false;
+				}
+				
+				// fixes camera switching during item transitions
+				if (IsLiftWeapon() || !IsRaised() || GetDayZPlayerInventory().IsProcessing() || !IsWeaponRaiseCompleted() || IsFighting())
+				{
+					exitSights = true;
+				}
+				else if (switchToADS) // enter ironsights or optics
+				{
+					// filter by usability
+					if (m_WasIronsight && !canUseIronsights)
+					{
+						m_WasIronsight = false;
+					}
+					else if (!m_WasIronsight && !canUseOptics)
+					{
+						m_WasIronsight = true;
+					}
+					
+					if (m_WasIronsight)
+					{
+						hic.ResetFreeLookToggle();
+						SwitchOptics(optic,false);
+						SetIronsights(true);
+					}
+					else if (!m_WasIronsight || (!canUseIronsights && canUseOptics))
+					{
+						SetIronsights(false);
+						SwitchOptics(optic,true);
+					}
+					else
+					{
+						exitSights = true;
+					}
+					
+					if (hcw && (m_CameraOptics/* || m_CameraIronsight*/))
+					{
+						hcw.SetADS(true);
+					}
+				}
+				else
+				{
+					exitSights = true;
+				}
+			}
+		}
+		
+		// leave ironsight and/ or optics
+		if (exitSights && !IsHandheldOpticsInUse() && (m_CameraIronsight || m_CameraOptics) || GetCommand_Melee2())
+		{
+			ExitSights();
+		}
+	}
+	
+	void HandleView()
+	{
+		if (!IsAlive())
+		{
+			if (m_CameraIronsight || m_CameraOptics)
+			{
+				ExitSights();
+			}
+			return;
+		}
+		
+		HumanInputController hic = GetInputController();
+	
+		bool camChange = hic.CameraViewChanged();
+		
+		if (IsRaised())
+		{
+			if (m_IsWeapon)
+			{
+				camChange = false;
+			}
+		}
+		
+		//! 3rd person camera
+		if (GetGame().GetWorld().Is3rdPersonDisabled())
+		{
+			m_Camera3rdPerson = false;
+		}
+		else if (camChange)
+		{
+			m_Camera3rdPerson = !m_Camera3rdPerson;
+		}
+		
+		// exits optics completely, comment to return to ADS
+		if (m_LiftWeapon_player && (m_CameraOptics || m_CameraIronsight))
+			ExitSights();
+		
+		if (IsPlayerInStance(DayZPlayerConstants.STANCEMASK_RAISEDPRONE) && (m_CameraOptics || m_CameraIronsight))
+			GetDayZPlayerType().SetVerticalMinimumAimLimit(DayZPlayerCameraIronsights.CONST_UD_MIN_BACK);
+		else
+			GetDayZPlayerType().SetVerticalMinimumAimLimit(DayZPlayerCameraIronsights.CONST_UD_MIN);
+		
+		if (hic.IsZoomToggle() && !m_MovementState.IsRaised())        
+		{
+			m_CameraEyeZoomLevel = ECameraZoomType.NORMAL;
+			if ((IsClimbingLadder() && Math.AbsInt(m_MovementState.m_iMovement) == 2) || (IsSwimming() && m_MovementState.m_iMovement == 3))
+			{
+				m_CameraEyeZoomLevel = ECameraZoomType.SHALLOW;
+			}
+			else if (!IsClimbingLadder() && !IsSwimming() && !IsInVehicle())
+			{
+				float pSpeed;
+				vector pLocalDirection;
+				hic.GetMovement(pSpeed ,pLocalDirection);
+				
+				if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_ERECT && pSpeed == 3)
+				{
+					m_CameraEyeZoomLevel = ECameraZoomType.SHALLOW;
+				}
+			}
+		}
+		else
+		{
+			m_CameraEyeZoomLevel = ECameraZoomType.NONE;
+		}
+		
+		if (m_MovementState.IsRaisedInProne())
+		{
+			float headingAngle = MiscGameplayFunctions.GetHeadingAngle(this);
+			float headingAngleDiffBlock = Math.AbsFloat(m_LastHeadingAngleBlock - headingAngle);
+			float headingAngleDiffBlock2 = Math.AbsFloat(m_LastHeadingAngleBlock2 - headingAngle);
+			float headingAngleDiff = 0.0;
+			
+			if (m_LastHeadingAngle * headingAngle < 0.0)
+			{
+				headingAngleDiff = Math.AbsFloat(m_LastHeadingAngle + headingAngle);
+			}
+			else
+			{
+				headingAngleDiff = Math.AbsFloat(m_LastHeadingAngle - headingAngle);
+			}
+			
+			if (headingAngleDiff > 0.2)
+			{
+				int time = GetGame().GetTime();
+				
+				float timefilterconstant = 400 - (headingAngleDiff * 100);
+				
+				if (headingAngleDiffBlock > 0.8 && time - m_LastBackSoundTime > timefilterconstant)
+				{
+					float volume = headingAngleDiff / 0.5;
+					if (volume > 1)
+					{
+						volume = 1;
+					}
+					if (volume < 0.25)
+					{
+						volume = 0.25;
+					}
+
+					m_SoundOffset = headingAngleDiff / 2;
+					if (m_SoundOffset > 0.25)
+					{
+						m_SoundOffset = 0.25;
+					}
+
+					string soundSetName = "Cloth_Body_longmove_TShirt_Soundset";
+					
+					string bodyClothName = "";
+					EntityAI attachment = GetInventory().FindAttachment(InventorySlots.BODY);
+					if (attachment)
+					{
+						bodyClothName = attachment.GetAttachmentSoundType();
+					}
+
+					if (bodyClothName != "")
+					{
+						string path = "CfgSoundTables CfgAttachmentSoundTables Cloth_Body_Longmove_LookupTable";
+						int soundCount = GetGame().ConfigGetChildrenCount(path);
+
+						for (int i = 0; i < soundCount; i++)
+						{
+							string name = "";
+							GetGame().ConfigGetChildName(path, i, name);
+							
+							if (name == bodyClothName)
+							{
+								TStringArray stringArray = new TStringArray();
+								GetGame().ConfigGetTextArray(path + " " + name + " soundSets", stringArray);
+								soundSetName = stringArray.Get(0);
+
+								delete stringArray;
+							}
+						}
+					}
+
+					SoundParams soundParams = new SoundParams(soundSetName);
+					SoundObjectBuilder soundObjectBuilder = new SoundObjectBuilder(soundParams);
+					
+					if (soundObjectBuilder != NULL)
+					{
+						SoundObject soundObject = soundObjectBuilder.BuildSoundObject();
+						
+						if (soundObject != NULL)
+						{
+							soundObject.SetPosition(GetPosition());
+
+							AbstractWave wave = GetGame().GetSoundScene().Play3D(soundObject, soundObjectBuilder);
+							wave.SetStartOffset(m_SoundOffset);
+							wave.SetVolumeRelative(volume);
+
+							m_LastBackSoundTime = GetGame().GetTime();
+							m_LastHeadingAngleBlock = headingAngle;
+						}
+					}
+				}
+
+				if (headingAngleDiffBlock2 > 1.5 && time - m_LastBackSoundTime2 > (timefilterconstant * 2))
+				{
+					float volume2 = headingAngleDiff * 2;
+					if (volume2 > 1)
+					{
+						volume2 = 1;
+					}
+
+					m_SoundOffset = headingAngleDiff / 1.8;
+					if (m_SoundOffset < 0.1)
+					{
+						m_SoundOffset = 0.1;
+					}
+					if (m_SoundOffset > 0.3)
+					{
+						m_SoundOffset = 0.3;
+					}
+
+					string soundSetName2 = "walkProne_noHS_asphalt_ext_Char_SoundSet";
+					string surfaceType = GetSurfaceType();
+
+					if (surfaceType != "")
+					{
+						string movementSurfaceType = "walkProne_" + surfaceType;
+						
+						string path2 = "CfgSoundTables CfgStepSoundTables walkProne_noHS_Char_LookupTable";
+						int soundCount2 = GetGame().ConfigGetChildrenCount(path2);
+
+						for (int i2 = 0; i2 < soundCount2; i2++)
+						{
+							string name2 = "";
+							GetGame().ConfigGetChildName(path2, i2, name2);
+							
+							if (name2 == movementSurfaceType)
+							{
+								TStringArray stringArray2 = new TStringArray();
+								GetGame().ConfigGetTextArray(path2 + " " + name2 + " soundSets", stringArray2);
+								soundSetName2 = stringArray2.Get(0);
+
+								delete stringArray2;
+							}
+						}
+					}
+
+					SoundParams soundParams2 = new SoundParams(soundSetName2);
+					SoundObjectBuilder soundObjectBuilder2 = new SoundObjectBuilder(soundParams2);
+					
+					if (soundObjectBuilder2 != NULL)
+					{
+						SoundObject soundObject2 = soundObjectBuilder2.BuildSoundObject();
+						
+						if (soundObject2 != NULL)
+						{
+							soundObject2.SetPosition(GetPosition());
+
+							AbstractWave wave2 = GetGame().GetSoundScene().Play3D(soundObject2, soundObjectBuilder2);
+							wave2.SetStartOffset(m_SoundOffset);
+							wave2.SetVolumeRelative(volume2);            
+
+							m_LastBackSoundTime2 = GetGame().GetTime();
+							m_LastHeadingAngleBlock2 = headingAngle;
+						}
+					}
+				}
+
+				m_LastHeadingAngle = headingAngle;
+			}
+		}
+	}
+
+	float m_LastHeadingAngleBlock;
+	float m_LastHeadingAngleBlock2;
+	float m_LastHeadingAngle;
+	int m_LastBackSoundTime;
+	int m_LastBackSoundTime2;
+	float m_SoundOffset;
+
+
+	//-------------------------------------------------------------
+	//!
+	//! ModOverrides
+	//! 
+	// these functions are for modded overide in script command mods 
+
+	bool	ModCommandHandlerBefore(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		return false;
+	}
+
+	bool	ModCommandHandlerInside(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		return false;
+	}
+	
+	bool	ModCommandHandlerAfter(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		return false;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! This is main command logic
+	//! 
+
+	
+	//! 
+	override void CommandHandler(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		m_dT = pDt;
+		
+		if (ModCommandHandlerBefore(pDt, pCurrentCommandID, pCurrentCommandFinished))
+		{
+			return;
+		}
+
+		HumanInputController hic = GetInputController();
+		EntityAI entityInHands = GetHumanInventory().GetEntityInHands();
+		GetMovementState(m_MovementState);
+		
+		bool isRaisedNow = m_MovementState.IsRaised();
+		bool isWeapon		= entityInHands	&& entityInHands.IsInherited(Weapon);
+		
+		bool updateAimingMdfr = false;
+		if (isWeapon != m_IsWeapon)
+		{
+			m_IsWeapon = isWeapon;
+			updateAimingMdfr = true;
+		}
+
+		if (isRaisedNow != m_IsRaised)
+		{
+			updateAimingMdfr = true;
+			m_IsRaised = m_MovementState.IsRaised();
+		}
+		
+		if (updateAimingMdfr)
+		{
+			if (isRaisedNow && isWeapon)
+				GetUApi().ActivateModificator("aiming");
+			else
+				GetUApi().DeactivateModificator("aiming");
+		}
+		
+		// handle ADS ironsights/optics transition logic
+		HandleADS();
+		
+		// handle weapons
+		if (hic)
+		{
+			ItemOptics opticInHands = ItemOptics.Cast(entityInHands);
+			if (isWeapon && (!m_ProcessFirearmMeleeHit || !m_ContinueFirearmMelee))
+			{
+				m_ProcessFirearmMeleeHit = false;
+				bool exitIronSights = false;
+				HandleWeapons(pDt, entityInHands, hic, exitIronSights);
+			}
+			else if (IsHandheldOpticsInUse() && m_CameraOptics && opticInHands)
+			{
+				bool exitOptic = false;
+				HandleOptic(opticInHands, true, hic, exitOptic);
+			}
+		}
+		
+		//! handle all Camera changes, switch + zoom
+		HandleView();
+		
+		if (m_MovementState.m_iMovement != m_MovementState.m_LocalMovement)
+		{
+			OnMovementChanged();
+			m_MovementState.m_LocalMovement = m_MovementState.m_iMovement;
+		}
+		
+		//! handle death with high priority
+		if (HandleDeath(pCurrentCommandID))
+		{
+			return;
+		}
+		
+		//! handle finished commands
+		if (pCurrentCommandFinished)
+		{
+			if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_UNCONSCIOUS)
+			{
+				if ((m_LastCommandBeforeUnconscious == DayZPlayerConstants.COMMANDID_VEHICLE) && (m_TransportCache != null))
+				{
+					int crew_index = m_TransportCache.CrewMemberIndex(this);
+					int seat = m_TransportCache.GetSeatAnimationType(crew_index);
+					StartCommand_Vehicle(m_TransportCache, crew_index, seat, true);
+					m_TransportCache = null;
+					return;
+				}
+			}
+			// start moving
+
+			// start falling ? (could happen after climbing)
+			if (PhysicsIsFalling(true))
+			{
+				StartCommand_Fall(0);
+				SetFallYDiff(GetPosition()[1]);
+				return;
+			}
+
+			//! default behaviour after finish is to start move
+			if (m_Swimming.m_bWasSwimming)
+			{
+				StartCommand_Swim();
+				return;
+			}
+
+			StartCommand_Move();
+			
+			if (GetHumanInventory().GetEntityInHands())
+				ForceStandUpForHeavyItems(GetHumanInventory().GetEntityInHands());
+			
+			return;
+		}
+	
+
+		//--------------------------------------------
+		//! debug test script command !PSOVIS
+
+		if (ModCommandHandlerInside(pDt, pCurrentCommandID, pCurrentCommandFinished))
+		{
+			return;
+		}
+		
+
+		//--------------------------------------------
+		// vehicle handling
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_VEHICLE)
+		{
+			HumanCommandVehicle hcv = GetCommand_Vehicle();
+			if (hcv.WasGearChange())
+			{
+				GearChangeActionCallback cb = GearChangeActionCallback.Cast(AddCommandModifier_Action(DayZPlayerConstants.CMD_ACTIONMOD_SHIFTGEAR, GearChangeActionCallback));
+				cb.SetVehicleCommand(hcv);
+			}
+			
+			return;
+		}
+		
+		//! Sprint attack limiting - player has to be in full sprint for at least 0.5s
+		//--------------------------------------------
+		HumanCommandMove hcm = GetCommand_Move();
+		if (hcm && hcm.GetCurrentMovementSpeed() > 2.99 && m_MovementState.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_SPRINT)
+		{
+			m_SprintedTime += pDt;
+			if (m_SprintedTime > m_SprintedTimePerStanceMin)
+			{
+				m_SprintFull = true;
+				m_SprintedTimePerStanceMin = PlayerConstants.FULL_SPRINT_DELAY_DEFAULT;
+			}
+			else
+				m_SprintFull = false;
+		}
+		else
+		{
+			m_SprintedTime = 0.0;
+			m_SprintFull = false;
+		}
+
+		//--------------------------------------------
+		// swimming handling
+		if (m_Swimming.HandleSwimming(pCurrentCommandID, hcm, m_MovementState))
+		{
+			m_JumpClimb.CheckAndFinishJump();
+			return;			
+		}
+		
+		//--------------------------------------------
+		// ladder handling
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_LADDER)
+		{
+			OnLadder(pDt, m_MovementState);
+			return;
+		}
+
+		//--------------------------------------------
+		// climb handling
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_CLIMB)
+		{
+			return;
+		}
+
+		//--------------------------------------------
+		// fall handling
+
+		if (IsAlreadyInFallingCommand(pCurrentCommandID))
+		{
+			if (IsLanded(pCurrentCommandID))
+			{
+				DayZPlayerType type = GetDayZPlayerType();
+				NoiseParams npar;
+
+				FallDamageData fallDamageData = new FallDamageData();
+				fallDamageData.m_Height = m_FallYDiff - GetPosition()[1];
+
+				// land
+				if (fallDamageData.m_Height < 0.5)
+				{
+					fallDamageData.m_LandType = HumanCommandFall.LANDTYPE_NONE; 
+					OnLand(pCurrentCommandID, fallDamageData);
+					npar = type.GetNoiseParamsLandLight();
+					AddNoise(npar);
+				}
+				else if (fallDamageData.m_Height < 3.0)
+				{
+					if (m_MovementState.IsInProne() || m_MovementState.IsInRaisedProne())
+						fallDamageData.m_LandType = HumanCommandFall.LANDTYPE_NONE;
+					else
+						fallDamageData.m_LandType = HumanCommandFall.LANDTYPE_LIGHT;
+					
+					OnLand(pCurrentCommandID, fallDamageData);
+					npar = type.GetNoiseParamsLandLight();
+					AddNoise(npar);
+				}
+				else if (fallDamageData.m_Height < 5.0)
+				{
+					fallDamageData.m_LandType = HumanCommandFall.LANDTYPE_MEDIUM;
+					OnLand(pCurrentCommandID, fallDamageData);
+					npar = type.GetNoiseParamsLandHeavy();
+					AddNoise(npar);
+				}
+				else
+				{
+					fallDamageData.m_LandType = HumanCommandFall.LANDTYPE_HEAVY;
+					OnLand(pCurrentCommandID, fallDamageData);
+					npar = type.GetNoiseParamsLandHeavy();
+					AddNoise(npar);
+				}
+				
+				if (fallDamageData.m_Height >= DayZPlayerImplementFallDamage.HEALTH_HEIGHT_LOW && GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+				{
+					OnPlayerRecievedHit();
+				}
+
+				m_FallDamage.HandleFallDamage(fallDamageData);
+				m_JumpClimb.CheckAndFinishJump(fallDamageData.m_LandType);
+			}
+
+			//! If we are not in fall command then something else is currently running and we can safely continue here, otherwise terminate here
+			if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_FALL)
+			{
+				return;
+			}
+		}
+		else if (PhysicsIsFalling(false)) 
+		{
+			// Not in a falling command but the controller is falling, start default fall
+			StartCommand_Fall(0);
+			SetFallYDiff(GetPosition()[1]);
+			return;
+		}
+
+		//--------------------------------------------
+		// handle jumping
+
+#ifndef NO_GUI
+#ifdef DEVELOPER
+		//! enable this later for everything
+
+		if (DiagMenu.GetEngineValue(DayZPlayerConstants.DEBUG_ENABLEJUMP))
+		{
+			SHumanCommandClimbSettings hcls = GetDayZPlayerType().CommandClimbSettingsW();
+			
+			if (m_MovementState.m_iMovement != DayZPlayerConstants.MOVEMENTIDX_IDLE)
+				hcls.m_fFwMaxDistance = 3;
+			else
+				hcls.m_fFwMaxDistance = 1.2;
+
+			SHumanCommandClimbResult 	ret;
+
+			//! debug draw climb heuristics
+			HumanCommandClimb.DoClimbTest(this, ret, 0x3);
+		}
+
+#endif
+#endif 
+
+		// start jump 
+		if (hic.IsJumpClimb())
+		{
+			m_JumpClimb.JumpOrClimb();
+
+			if (m_JumpClimb.WasSuccessful())
+			{
+				return;
+			}
+		}
+
+		HumanCommandAdditives ad = GetCommandModifier_Additives();
+	
+		bool force = false;
+#ifndef NO_GUI
+#ifdef DEVELOPER
+		//! force speaking for debug
+		force = DiagMenu.GetEngineValue(DayZPlayerConstants.DEBUG_ENABLETALKING);
+#endif
+#endif 
+		float amplitude = IsPlayerSpeaking();
+		
+		if (amplitude > 0.1 || force)
+		{	
+			if (ad)
+				ad.SetTalking(true);
+			
+			// add noises on server
+			if (GetGame().IsServer())
+			{
+				int now = GetGame().GetTime();
+				if (now >= m_NextVoNNoiseTime)
+				{
+					m_NextVoNNoiseTime = now + 1000;
+					
+					int voiceLevel = GetGame().GetVoiceLevel(this);
+					DayZPlayerType pt = GetDayZPlayerType();
+					
+					// add noise every second while talking 
+					NoiseParams vonpar;
+					switch (voiceLevel)
+					{
+						case VoiceLevelWhisper:
+							vonpar = pt.GetNoiseParamsWhisper();
+						break;
+						case VoiceLevelTalk:
+							vonpar = pt.GetNoiseParamsTalk();
+						break;
+						case VoiceLevelShout:
+							vonpar = pt.GetNoiseParamsShout();
+						break; 
+					}
+					AddNoise(vonpar);
+				}
+			}
+		}
+		else
+		{
+			if (ad)
+				ad.SetTalking(false);
+		}
+		
+		//--------------------------------------------
+		// anything whats handled by InputController
+
+		//! 
+
+		if (hic)
+		{
+			//! throwing handling
+			HumanCommandWeapons hcw = GetCommandModifier_Weapons();
+			m_Throwing.HandleThrowing(hic, hcw, entityInHands, pDt);
+			
+			//! melee
+			if (m_MeleeFightLogic.CanFight())
+			{
+				if (m_MeleeFightLogic.HandleFightLogic(pCurrentCommandID, hic, entityInHands, m_MovementState, m_ContinueFirearmMelee))
+				{
+					m_ProcessFirearmMeleeHit = isWeapon && (hic.IsMeleeWeaponAttack() || m_ProcessFirearmMeleeHit) || m_ContinueFirearmMelee;
+					return;
+				}
+			}
+		}
+
+
+		//!
+		if (ModCommandHandlerAfter(pDt, pCurrentCommandID, pCurrentCommandFinished))
+		{
+			return;
+		}
+	}
+	
+	void HideClothing(ItemOptics optic, bool state) {}
+
+	//-------------------------------------------------------------
+	//!
+	//! This is Debug functionality 
+	//! 
+
+	float 	m_TestDamageCounter 	= -1;	//! VKOSTIK - tady dat 0 misto -1
+	float 	m_DebugDirectionVal 	= -180;
+	bool	m_DebugTypeVal 			= false;
+
+	int 		m_DebugWeaponChangeStage = 0;
+	string	m_DebugWeaponChangeItem;
+	int			m_DebugWeaponChangeShowSlot;
+
+	//! 
+	void  CommandHandlerDebug(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)
+	{
+		if (GetPluginManager())
+		{
+			PluginDayzPlayerDebug playerDebug = PluginDayzPlayerDebug.Cast(GetPluginManager().GetPluginByType(PluginDayzPlayerDebug));
+			if (playerDebug)
+			{
+				playerDebug.CommandHandler();
+
+				//! debug handling of adding commands 
+				if (m_DebugWeaponChangeStage == 0)
+				{
+
+					// debug weapon change
+					int 		hideSlot;
+
+					if (playerDebug.IsWeaponChange(m_DebugWeaponChangeItem, hideSlot, m_DebugWeaponChangeShowSlot))
+					{
+						//Print("Change Weapon started: " + m_DebugWeaponChangeItem + "," + hideSlot.ToString() + "," + m_DebugWeaponChangeShowSlot.ToString());
+
+						HumanCommandWeapons	w = GetCommandModifier_Weapons();
+						w.StartAction(WeaponActions.HIDE, hideSlot);
+
+						m_DebugWeaponChangeStage = 1;
+					}
+				}
+				else if (m_DebugWeaponChangeStage == 1)
+				{
+					// wait for weapon hide to meet event 
+					HumanCommandWeapons	w2 = GetCommandModifier_Weapons();
+					if (w2 && w2.GetRunningAction() == WeaponActions.HIDE)
+					{
+						if (w2.IsEvent() == WeaponEvents.CHANGE_HIDE)
+						{
+							//! set item in hands
+							//Print("Change Weapon - hidden: ");
+
+							//! fuj
+							PlayerBase player = PlayerBase.Cast(this);
+							EntityAI item_in_hands = player.GetHumanInventory().GetEntityInHands();
+							if (item_in_hands != NULL && player.CanDropEntity(item_in_hands) && GetGame().GetPlayer().GetHumanInventory().CanRemoveEntityInHands())
+							{
+								player.PredictiveDropEntity(item_in_hands);
+							}
+
+							if (m_DebugWeaponChangeItem != "")
+							{
+								InventoryLocation dst = new InventoryLocation;
+								dst.SetHands(this, NULL);
+								EntityAI item = SpawnEntity(m_DebugWeaponChangeItem, dst,ECE_IN_INVENTORY,RF_DEFAULT);
+							}
+
+							//! start show
+							w2.StartAction(WeaponActions.SHOW, 3);
+
+							m_DebugWeaponChangeStage = 2;
+						}
+					}
+				}
+				else if (m_DebugWeaponChangeStage == 2)
+				{
+					HumanCommandWeapons	w3 = GetCommandModifier_Weapons();
+					if (w3 && w3.IsActionFinished())
+					{
+						m_DebugWeaponChangeStage = 0;
+					}
+				}
+			}
+		}
+	
+
+		//! damage test
+		if (m_TestDamageCounter >= 0)
+		{
+			if (m_TestDamageCounter > 3)
+			{
+				m_DebugDirectionVal = m_DebugDirectionVal + 90;
+				m_TestDamageCounter = 0;
+
+				if (m_DebugDirectionVal > 90)
+				{
+					m_DebugDirectionVal = -180;
+					m_DebugTypeVal		= !m_DebugTypeVal;
+				}
+
+				if (m_DebugTypeVal)
+				{
+					AddCommandModifier_Damage(0, m_DebugDirectionVal); // starts light
+				}
+				else
+				{
+					StartCommand_Damage(0, m_DebugDirectionVal); // starts heavy (full body)
+				}
+				// 0.. types
+				// from: -180 back, -90 left, 0 front, 90 right, 180 back 
+				//AddCommandModifier_Damage(0, directionVal); // starts light
+				//StartCommand_Damage(0, 0); // starts heavy (full body)
+			}
+
+			m_TestDamageCounter += pDt;
+		}
+
+
+#ifndef NO_GUI
+#ifdef DEVELOPER
+
+		// injury / exhaustion
+		{
+			HumanCommandAdditives ad = GetCommandModifier_Additives();
+
+			//! diag menu - injured
+			float v = DiagMenu.GetEngineRangeValue(DayZPlayerConstants.DEBUG_SHOWINJURY);
+			if (v > 0)
+			{
+				ad.SetInjured(v, true);
+			}
+
+			//! diag menu - injured
+			v = DiagMenu.GetEngineRangeValue(DayZPlayerConstants.DEBUG_SHOWEXHAUSTION);
+			if (v > 0)
+			{
+				ad.SetExhaustion(v, true);
+			}
+		}
+#endif
+#endif 
+
+	}
+
+
+
+	//-------------------------------------------------------------
+	//!
+	//! This is main camera selection logic
+	//! 
+	override int 	CameraHandler(int pCameraMode)
+	{
+		//! ironsights
+		if (!m_LiftWeapon_player)
+		{
+			ItemOptics optics = null;
+			EntityAI entityInHands = GetHumanInventory().GetEntityInHands();
+			Weapon weapon = Weapon.Cast(entityInHands);
+			if (weapon)
+				optics = weapon.GetAttachedOptics();
+			else if (entityInHands)
+				Class.CastTo(optics,entityInHands);
+			
+			if (m_CameraOptics && optics)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_OPTICS;
+			}
+			else if (m_CameraIronsight && weapon)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_IRONSIGHTS;
+			}
+		}	
+		
+		// If the logic above doesn't reach optics nor ironsights camera,
+		// yet weapon is still raised and ads is wanted, enforce 1pv camera
+		// as this will reduce erratic behaviour of camera switching in 3pv
+		HumanInputController hic = GetInputController();
+		if (m_Camera3rdPerson && m_IsWeapon && m_IsRaised && hic && hic.WeaponADS())
+		{
+			return DayZPlayerCameras.DAYZCAMERA_1ST;
+		}
+		
+		//uncon
+		if ( GetCurrentCommandID() == DayZPlayerConstants.COMMANDID_UNCONSCIOUS )
+		{
+			return DayZPlayerCameras.DAYZCAMERA_1ST_UNCONSCIOUS;
+		}
+		
+		HumanCommandVehicle vehicleCommand = GetCommand_Vehicle();
+		
+		if (!m_Camera3rdPerson)
+		{
+			if (vehicleCommand)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_1ST_VEHICLE;
+			}
+			
+			return DayZPlayerCameras.DAYZCAMERA_1ST;
+		}
+		else
+		{
+			if (vehicleCommand)
+			{
+				Transport transport = vehicleCommand.GetTransport();
+				if (transport && GetParent())
+				{
+					return transport.Get3rdPersonCameraType();
+				}
+			}
+			
+			//! get movement state 
+			GetMovementState(m_MovementState);
+			
+			//! VKOSTIK: v ostatnich commandech mimo COMMANDID_MOVE je 
+			//! m_MovementState.m_iStanceIdx - DayZPlayerConstants.STANCEIDX_ERECT
+			//! m_MovementState.m_iMovement = 0 (idle)
+
+			//! COMMANDID_ACTION returns stance right - ERECT/CROUCH
+
+			//! melee camera - not melee - stays in stance camera
+
+			if (m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_CLIMB)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_CLIMB;
+			}
+
+			if (m_JumpClimb.m_bIsJumpInProgress)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_JUMP;
+			}
+			
+			int targetStanceIndex = m_MovementState.m_iStanceIdx;
+			
+			//! special handling to allow the camera to fully blend before transitioning to the raised one
+			HumanCommandMove commandMove = GetCommand_Move();
+			if (commandMove && commandMove.IsChangingStance() && m_MovementState.IsRaised())
+			{
+				targetStanceIndex = m_MovementState.m_iStanceIdx - DayZPlayerConstants.STANCEIDX_RAISED;
+			}
+			
+			//		
+			// normal movement cameras			
+			if (targetStanceIndex == DayZPlayerConstants.STANCEIDX_CROUCH)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_CRO;
+			}
+			else if (targetStanceIndex == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_CRO_RAISED;
+			}
+			else if (targetStanceIndex == DayZPlayerConstants.STANCEIDX_PRONE)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_PRO;
+			}
+			else if (targetStanceIndex == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_PRO_RAISED;
+			}
+
+			if (targetStanceIndex == DayZPlayerConstants.STANCEIDX_RAISEDERECT)
+			{
+				if (m_IsWeapon) 
+				{
+					return DayZPlayerCameras.DAYZCAMERA_3RD_ERC_RAISED;
+				}
+				else
+				{
+					return DayZPlayerCameras.DAYZCAMERA_3RD_ERC_RAISED_MELEE;
+				}
+			}
+			else if (targetStanceIndex == DayZPlayerConstants.MOVEMENTIDX_SPRINT)
+			{
+				return DayZPlayerCameras.DAYZCAMERA_3RD_ERC_SPR;
+			}
+
+			// DayZPlayerConstants.STANCEIDX_ERECT
+			return DayZPlayerCameras.DAYZCAMERA_3RD_ERC;
+		}
+		
+		return DayZPlayerCameras.DAYZCAMERA_1ST;
+	}
+	
+	//! Event, called when HumanMovementState.m_iMovement changes...walk, run, sprint, etc..
+	void OnMovementChanged()//(int state_old, int state_new)
+	{
+		switch (m_MovementState.m_LocalMovement)
+		{
+			case DayZPlayerConstants.MOVEMENTIDX_CROUCH_RUN:
+			{
+				//OnCrouchRunEnd();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+			{
+				OnSprintEnd();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_RUN:
+			{
+				//OnRunEnd();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_WALK:
+			{
+				//OnWalkEnd();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+			{
+				//OnIdleEnd();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_SLIDE:
+			{
+				//OnSlideEnd();
+				break;
+			}
+		}
+		
+		switch (m_MovementState.m_iMovement)
+		{
+			case DayZPlayerConstants.MOVEMENTIDX_CROUCH_RUN:
+			{
+				//OnCrouchRunStart();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+			{
+				OnSprintStart();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_RUN:
+			{
+				//OnRunStart();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_WALK:
+			{
+				//OnWalkStart();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+			{
+				//OnIdleStart();
+				break;
+			}
+			case DayZPlayerConstants.MOVEMENTIDX_SLIDE:
+			{
+				//OnSlideStart();
+				break;
+			}
+		}
+	}
+	
+	void OnSprintStart()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			GetUApi().GetInputByID(UALeanLeft).Lock();
+			GetUApi().GetInputByID(UALeanRight).Lock();
+		}
+	}
+	
+	void OnSprintEnd()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			GetUApi().GetInputByID(UALeanLeft).Unlock();
+			GetUApi().GetInputByID(UALeanRight).Unlock();
+		}
+	}
+	//-------------------------------------------------------------
+	//!
+	//! Input userdata
+	//! 
+
+	void OnInputUserDataReceived(ParamsReadContext ctx)
+	{
+		int userDataTypeParam = 0;
+		if (!ctx.Read(userDataTypeParam))
+		{
+			Error("DayZPlayerImplement: cannot read input type");
+			return;
+		}
+
+		OnInputUserDataProcess(userDataTypeParam, ctx);
+	}
+
+	bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{
+		m_MeleeCombat.SetTargetObject(null);
+		m_MeleeCombat.SetHitPos(vector.Zero);
+		m_MeleeCombat.SetHitZoneIdx(-1);
+		m_MeleeCombat.SetFinisherType(-1);
+
+		if (userDataType == INPUT_UDT_MELEE_TARGET)
+		{
+			EntityAI target = null;
+			if (ctx.Read(target))
+			{
+				m_MeleeCombat.SetTargetObject(target);
+			}
+
+			vector hitPos = vector.Zero;
+			if (ctx.Read(hitPos))
+			{
+				m_MeleeCombat.SetHitPos(hitPos);
+			}
+
+			int hitZoneIdx = -1;
+			if (ctx.Read(hitZoneIdx))
+			{
+				m_MeleeCombat.SetHitZoneIdx(hitZoneIdx);
+			}
+
+			int finisherType = -1;
+			if (ctx.Read(finisherType))
+			{
+				m_MeleeCombat.SetFinisherType(finisherType);
+			}
+			
+			return true;
+		}
+
+		return false;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! SyncJunctures
+	//! 
+	void OnSyncJuncture(int pJunctureID, ParamsReadContext pCtx)
+	{
+		switch (pJunctureID)
+		{
+			case DayZPlayerSyncJunctures.SJ_DEATH:
+				if (m_DeathAnimType == -2)
+					DayZPlayerSyncJunctures.ReadDeathParams(pCtx, m_DeathAnimType, m_DeathHitDir);
+				break;
+				
+			case DayZPlayerSyncJunctures.SJ_DAMAGE_HIT:
+				SyncHitInfo data = new SyncHitInfo;
+				if (DayZPlayerSyncJunctures.ReadDamageHitParamsEx(pCtx, data) && data != null)
+				{
+					m_SyncedHitDataArray.Insert(data);
+				}
+				break;
+		}
+	}
+
+	AnimBootsType GetBootsType()
+	{
+		EntityAI boots = GetInventory().FindAttachment(InventorySlots.FEET);
+		if (boots)
+		{
+			switch (boots.GetAttachmentSoundType())
+			{
+				case "Sneakers":
+					return AnimBootsType.Sneakers;
+				case "Boots":
+					return AnimBootsType.Boots;
+			}
+		}
+
+		return AnimBootsType.None;
+	}
+	
+	//Get top body clothes
+	AnimUpperBodyType GetBodyAttachmentType()
+	{
+		EntityAI attachment = GetInventory().FindAttachment(InventorySlots.BODY);
+		if (attachment)
+		{
+			switch (attachment.GetAttachmentSoundType())
+			{
+				case "NylonJacket":
+					return AnimUpperBodyType.NylonJacket;
+				case "TShirt":
+					return AnimUpperBodyType.TShirt;
+				case "WoolShirt":
+					return AnimUpperBodyType.WoolShirt;
+				case "HeavyJacket":
+					return AnimUpperBodyType.HeavyJacket; 
+				case "LeatherJacket":
+					return AnimUpperBodyType.LeatherJacket;
+				case "Coat":
+					return AnimUpperBodyType.Coat;
+				case "ChemlonDress":
+					return AnimUpperBodyType.ChemlonDress;
+				case "Ghillie":
+					return AnimUpperBodyType.Ghillie;
+				case "Chainmail":
+					return AnimUpperBodyType.Chainmail;
+			}
+		}
+		
+		return AnimUpperBodyType.None;
+	}
+	
+	AnimBackType GetBackAttachmentType()
+	{
+		EntityAI back = GetInventory().FindAttachment(InventorySlots.BACK);
+		if (back)
+		{
+			switch (back.GetAttachmentSoundType())
+			{
+				case "Small":
+					return AnimBackType.Small;
+				case "Military":
+					return AnimBackType.Military;
+				case "Outdoor":
+					return AnimBackType.Outdoor;
+				case "Ghillie":
+					return AnimBackType.Ghillie; 
+			}
+		}
+		
+		return AnimBackType.None;
+	}
+	
+	//Get weapon on back
+	AnimRangedWeaponType GetShoulderAttachmentType()
+	{
+		EntityAI shoulderAttachment = GetInventory().FindAttachment(InventorySlots.SHOULDER);
+		EntityAI meleeAttachment = GetInventory().FindAttachment(InventorySlots.MELEE);
+		
+		AnimRangedWeaponType shoulderAttType = AnimRangedWeaponType.None;
+		AnimRangedWeaponType meleeAttType = AnimRangedWeaponType.None;
+		
+		if (shoulderAttachment)
+		{
+			switch (shoulderAttachment.GetAttachmentSoundType())
+			{
+				case "Shotgun":
+				{
+					shoulderAttType = AnimRangedWeaponType.Shotgun;
+					break;
+				}	
+				case "Rifle":
+				{
+					shoulderAttType = AnimRangedWeaponType.Rifle;
+					break;
+				}
+			}
+		}
+		if (meleeAttachment)
+		{
+			switch (meleeAttachment.GetAttachmentSoundType())
+			{
+				case "Shotgun":
+				{
+					meleeAttType = AnimRangedWeaponType.Shotgun;
+					break;
+				}
+				case "Rifle":
+				{
+					meleeAttType = AnimRangedWeaponType.Rifle;
+					break;
+				}
+			}
+		}
+		
+		if (shoulderAttType == AnimRangedWeaponType.Shotgun || meleeAttType == AnimRangedWeaponType.Shotgun)
+			return AnimRangedWeaponType.Shotgun;
+		
+		if (shoulderAttType == AnimRangedWeaponType.Rifle || meleeAttType == AnimRangedWeaponType.Rifle)
+			return AnimRangedWeaponType.Rifle;
+
+		return AnimRangedWeaponType.None;
+	}
+	
+	string GetSurfaceType(SurfaceAnimationBone limbType)
+	{
+		string surfaceType;
+		int liquidType;
+
+		g_Game.SurfaceUnderObjectByBone(this, limbType, surfaceType, liquidType);
+		
+		return surfaceType;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! Sounds
+	//! 
+
+	AbstractWave PlaySound(SoundObject so, SoundObjectBuilder sob)
+	{
+		if (so == null)
+			return null;
+
+		so.SetPosition(GetPosition());
+		AbstractWave wave = GetGame().GetSoundScene().Play3D(so, sob);
+		return wave;
+	}
+
+	void AddNoise(NoiseParams noisePar, float noiseMultiplier = 1.0)
+	{
+		if (noisePar != null)
+			GetGame().GetNoiseSystem().AddNoise(this, noisePar, noiseMultiplier);
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! Event Processing
+	//! 
+
+	void OnStepEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		DayZPlayerType type = GetDayZPlayerType();
+		ref HumanMovementState	state = new HumanMovementState();
+		GetMovementState(state);
+		
+		#ifndef SERVER
+		DayZPlayerTypeStepSoundLookupTable table = type.GetStepSoundLookupTable();
+		SoundObjectBuilder soundBuilder = NULL;
+		if (pUserInt < 100)
+		{
+			string surface;
+			if (pUserInt % 2 == 1)
+			{
+				surface = GetSurfaceType(SurfaceAnimationBone.LeftBackLimb);
+				if (surface.Length() == 0)//if no surface found, try other leg
+					surface = GetSurfaceType(SurfaceAnimationBone.RightBackLimb);
+			}
+			else
+			{
+				surface = GetSurfaceType(SurfaceAnimationBone.RightBackLimb);
+				if (surface.Length() == 0)//if no surface found, try other leg
+					surface = GetSurfaceType(SurfaceAnimationBone.LeftBackLimb);
+			}
+			
+			if (surface.Length() != 0)
+				m_LastSurfaceUnderHash = surface.Hash();
+				
+			soundBuilder = table.GetSoundBuilder(pUserInt, state.m_iMovement, m_LastSurfaceUnderHash, GetBootsType());
+		}
+		else
+		{
+			string surface2 = GetSurfaceType();
+			if (surface2.Length() != 0)
+				m_LastSurfaceUnderHash = surface2.Hash();
+			
+			soundBuilder = table.GetSoundBuilder(pUserInt, state.m_iMovement, m_LastSurfaceUnderHash, GetBootsType());
+		}
+
+		if (soundBuilder != NULL && GetGame().GetPlayer())
+		{
+			vector orientation = Vector(0, 0, 0);
+			vector edgeLength = Vector(1.5, 3.0, 1.5);
+			array<Object> excludedObjects = new array<Object>;
+			array<Object> collidedObjects = new array<Object>;
+			
+			if (GetGame().IsBoxColliding(GetPosition(), orientation, edgeLength, excludedObjects, collidedObjects))
+			{
+				for (int i = 0; i < collidedObjects.Count(); ++i)
+				{
+					string objectClass = collidedObjects.Get(i).GetType();
+					
+					if (objectClass.Contains("BushSoft") || objectClass.Contains("BushHard"))
+					{
+						for (int j = 0; j < type.GetVegetationSounds().Count(); ++j)
+						{
+							VegetationSound vegetationSound = type.GetVegetationSounds().Get(j);
+							
+							if (vegetationSound.GetAnimEventIds().Find(pUserInt) >= 0)
+							{
+								SoundObjectBuilder vegSoundObjectBuilder = vegetationSound.GetSoundObjectBuilder();
+								SoundObject vegSoundObject = vegetationSound.GetSoundObjectBuilder().BuildSoundObject();
+								
+								if (vegSoundObject != NULL)
+								{
+									AttenuateSoundIfNecessary(vegSoundObject);
+									PlaySound(vegSoundObject, vegSoundObjectBuilder);
+								}
+								
+								break;
+							}
+						}
+						
+						break;
+					}
+				}
+			}
+			
+			SoundObject soundObject = soundBuilder.BuildSoundObject();
+			if (soundObject != NULL)
+			{
+				AttenuateSoundIfNecessary(soundObject);
+				PlaySound(soundObject, soundBuilder);
+			}
+		}
+		#endif
+		
+		if (GetGame().IsServer())
+		{
+			m_StepCounter++;//move outside of server condition if needed on client as well
+
+			float noiseMultiplier = 0;
+			
+			NoiseParams noiseParams;
+			if (state.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_ERECT || state.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT)
+				noiseParams = type.GetNoiseParamsStand();
+			else if (state.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_CROUCH || state.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH)
+				noiseParams = type.GetNoiseParamsCrouch();
+			else if (state.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE || state.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+				noiseParams = type.GetNoiseParamsProne();
+			else
+			{
+				Debug.Log(string.Format("Wrong stance, id: %1 using backup with stand stance (id: 0)", state.m_iStanceIdx));
+				noiseParams = type.GetNoiseParamsStand();
+			}
+			
+			noiseMultiplier =  NoiseAIEvaluate.GetNoiseMultiplier(this);
+			
+			AddNoise(noiseParams, noiseMultiplier);
+			
+			if ((m_StepCounter % PlayerConstants.CHECK_EVERY_N_STEP) == 0)
+			{
+				ProcessFeetDamageServer(pUserInt);
+			}
+		}
+	}
+
+	void OnSoundEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		if (pEventType == "Sound")
+		{
+			ProcessSoundEvent(pEventType, pUserString, pUserInt);
+		}
+		else if (pEventType == "SoundWeapon")
+		{
+			ProcessWeaponEvent(pEventType, pUserString, pUserInt);
+		}
+		else if (pEventType == "SoundAttachment")
+		{
+			ProcessAttachmentEvent(pEventType, pUserString, pUserInt);
+		}
+		else if (pEventType == "SoundVoice")
+		{
+			if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT || GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_REMOTE)
+			{
+				int event_id = m_PlayerSoundEventHandler.ConvertAnimIDtoEventID(pUserInt);
+				if (event_id > 0)
+				{
+					PlaySoundEvent(event_id);
+					return;
+				}
+			}
+			ProcessVoiceEvent(pEventType, pUserString, pUserInt);
+		}
+		else
+		{
+			Debug.Log("OnSoundEvent: Unknown sound event \"" + pEventType + "\"");
+		}
+	}
+
+	void OnParticleEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		
+	}
+
+	
+	void ProcessWeaponEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		DayZPlayerType type = GetDayZPlayerType();
+		AnimSoundEvent soundEvent = null;
+
+		float quantity = 0;
+		
+		EntityAI entityInHands = GetHumanInventory().GetEntityInHands();
+		if (entityInHands && entityInHands.IsInherited(ItemBase))
+		{
+			ItemBase item;
+			Class.CastTo(item, entityInHands);
+			if (item.HasQuantity())
+				quantity = (float)item.GetQuantity() / (item.GetQuantityMax() - item.GetQuantityMin());
+			InventoryItemType invItemType = item.GetInventoryItemType();
+			soundEvent = invItemType.GetSoundEvent(pUserInt);
+		}
+
+		if (soundEvent == null)
+		{
+			quantity = 0;
+			soundEvent = type.GetSoundWeaponEvent(pUserInt);
+		}
+
+		if (soundEvent != null)
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				SoundObjectBuilder builder = soundEvent.GetSoundBuilderEx(m_ActionSoundCategoryHash);
+				if (builder)
+				{
+					builder.AddVariable("quantity", quantity);
+					builder.AddVariable("interior", IsSoundInsideBuilding());
+					
+					SoundObject soundObject = builder.BuildSoundObject();
+					if (soundObject != NULL)
+					{
+						AttenuateSoundIfNecessary(soundObject);
+						PlaySound(soundObject, builder);
+					}
+				}
+				else
+				{
+					//TODO:Userful error message
+				}
+			}
+			
+			if (GetGame().IsServer())
+			{
+				AddNoise(soundEvent.m_NoiseParams);
+			}
+		}
+	}
+
+	void ProcessAttachmentEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		DayZPlayerType type = GetDayZPlayerType();
+		DayZPlayerTypeAttachmentSoundLookupTable table = type.GetAttachmentSoundLookupTable();
+			
+		array<string> attachments = new array<string>();
+		pUserString.Split(",", attachments);
+		for (int i = 0; i < attachments.Count(); i++)
+		{
+			int attachmentHash = -1;
+			if (attachments[i] == "shoulder")
+				attachmentHash = GetShoulderAttachmentType();
+			else if (attachments[i] == "body")
+				attachmentHash = GetBodyAttachmentType();
+			else if (attachments[i] == "back")
+				attachmentHash = GetBackAttachmentType();
+			
+			SoundObjectBuilder soundBuilder = table.GetSoundBuilder(pUserInt, attachments[i], attachmentHash);
+			
+			if (soundBuilder != NULL)
+			{
+				SoundObject soundObject = soundBuilder.BuildSoundObject();
+				if (soundObject != NULL)
+				{
+					AttenuateSoundIfNecessary(soundObject);
+					PlaySound(soundObject, soundBuilder);
+				}
+			}
+		}
+	}
+
+	void SetVariablesLadderSoundObjectBuilder(SoundObjectBuilder soundObjectBuilder)
+	{
+		if (m_ClimbingLadderType == "wood")
+		{
+			soundObjectBuilder.AddVariable("laddertype", 1);
+		}
+		else
+		{
+			soundObjectBuilder.AddVariable("laddertype", 0);
+		}
+		
+		AnimBootsType pBoots = GetBootsType();
+		
+		if (pBoots == AnimBootsType.None)
+		{
+			soundObjectBuilder.AddVariable("bare", 1);
+			soundObjectBuilder.AddVariable("sneakers", 0);
+			soundObjectBuilder.AddVariable("boots", 0);
+		}
+		else if (pBoots == AnimBootsType.Sneakers)
+		{
+			soundObjectBuilder.AddVariable("bare", 0);
+			soundObjectBuilder.AddVariable("sneakers", 1);
+			soundObjectBuilder.AddVariable("boots", 0);
+		}
+		else if (pBoots == AnimBootsType.Boots)
+		{
+			soundObjectBuilder.AddVariable("bare", 0);
+			soundObjectBuilder.AddVariable("sneakers", 0);
+			soundObjectBuilder.AddVariable("boots", 1);
+		}
+	}
+
+	void ProcessSoundEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		DayZPlayerType type = GetDayZPlayerType();
+		DayZPlayerTypeAnimTable table = type.GetSoundTable();
+		AnimSoundEvent soundEvent;
+		if (table)
+		{
+			soundEvent = table.GetSoundEvent(pUserInt);
+		}
+		
+		if (soundEvent != NULL)
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				SoundObjectBuilder objectBuilder = soundEvent.GetSoundBuilder();
+				if (GetCommand_Ladder())
+				{
+					SetVariablesLadderSoundObjectBuilder(objectBuilder);
+				}
+				objectBuilder.AddEnvSoundVariables(GetPosition());
+
+				SoundObject soundObject = objectBuilder.BuildSoundObject();
+				if (soundObject != NULL)
+				{
+					AttenuateSoundIfNecessary(soundObject);
+					PlaySound(soundObject, objectBuilder);
+				}
+			}
+			
+			if (GetGame().IsServer())
+			{
+				if (soundEvent.m_NoiseParams != NULL)
+					GetGame().GetNoiseSystem().AddNoise(this, soundEvent.m_NoiseParams);
+			}
+		}
+	}
+	
+	
+
+	AbstractWave ProcessVoiceEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		#ifdef SERVER//none of this code needs to run on server, ifdef put here rather than before the method call to maintain mod compatibility
+		return null;
+		#endif
+		DayZPlayerType type = GetDayZPlayerType();
+		DayZPlayerTypeVoiceSoundLookupTable table = type.GetVoiceSoundLookupTable();
+		if (!table)
+			return null;
+		AbstractWave wave;
+		EntityAI mask = GetInventory().FindAttachment(InventorySlots.MASK);
+		EntityAI head_gear = GetInventory().FindAttachment(InventorySlots.HEADGEAR);
+		
+		string category;
+		if (mask || head_gear)
+		{
+			string category_mask;
+			string category_headgear;
+			
+			int priority_mask;
+			int priority_headgear;
+			
+			if (mask)
+			{
+				category_mask = mask.ConfigGetString("soundVoiceType");
+				priority_mask = mask.ConfigGetInt("soundVoicePriority");
+			}
+			if (head_gear)
+			{
+				category_headgear = head_gear.ConfigGetString("soundVoiceType");
+				priority_headgear = head_gear.ConfigGetInt("soundVoicePriority");
+			}
+			
+			if (priority_headgear >= priority_mask && category_headgear != "")
+			{
+				category = category_headgear;
+			}
+			else
+			{
+				category = category_mask;
+			}
+		}
+
+		if (category == "")
+		{
+			category = "none";
+		}
+		
+		SoundObjectBuilder soundBuilder = table.GetSoundBuilder(pUserInt, category.Hash());
+		
+		if (soundBuilder)
+		{
+			PlayerBase player = PlayerBase.Cast(this);
+			//this code block looks super shady, but it's the only way the sounds play correctly, god knows what's going on on c++ side
+			int maleVoiceType = 0;
+			int femaleVoiceType = 0;
+			if (player.IsMale())
+			{
+				maleVoiceType = player.GetVoiceType();
+			}
+			else
+			{
+				femaleVoiceType = player.GetVoiceType();
+			}
+
+			soundBuilder.AddVariable("male", maleVoiceType);
+			soundBuilder.AddVariable("female", femaleVoiceType);
+			
+			// end of weirdness
+			SoundObject soundObject = soundBuilder.BuildSoundObject();
+			if (soundObject != NULL)
+			{
+				AttenuateSoundIfNecessary(soundObject);
+				wave = PlaySound(soundObject, soundBuilder);
+			}
+
+		}
+		
+		return wave;
+	}
+	
+	void ProcessFeetDamageServer(int pUserInt);
+	
+
+	//-------------------------------------------------------------
+	//!
+	//! anti-cheat condition
+	//! 
+
+	bool CheckForTakeItem(EntityAI item)
+	{
+		bool restrained = IsRestrained(); // IsRestrained()
+		bool unconscious = IsUnconscious(); // IsRestrained()
+
+		ItemBase ib = ItemBase.Cast(item);
+		if (ib && (PlayerBase.DEBUG_INVENTORY_ACCESS || !IsAlive() || restrained || unconscious || ib.CanBeMovedOverride()))
+			return true;
+		return false;
+	}
+	
+	bool CheckForDropItem(EntityAI item)
+	{
+		/*
+		bool restrained = IsRestrained(); // IsRestrained()
+		bool unconscious = IsUnconscious(); // IsRestrained()
+		
+		ItemBase ib = ItemBase.Cast(item);
+		if (!IsAlive() || restrained || unconscious || ib.CanBeMovedOverride())
+			return true;
+		return false;
+		*/
+		return CheckForTakeItem(item); //the two functions are currently identical
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Player respawn
+	//! 
+	bool CheckForRespawn(EntityAI item)
+	{
+		PlayerBase player = PlayerBase.Cast(this);
+		if (!player)
+			return true;
+		
+		if (!IsAlive() || player.IsUnconscious())
+			return true;
+		return false;
+	}
+
+#ifdef DEVELOPER
+
+	// -------------------------------------------------------------------------
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(sender, rpc_type, ctx);
+
+		if (rpc_type == ERPCs.RPC_DAYZPLAYER_DEBUGSERVERWALK)
+		{
+			Print("ERPCs.RPC_DAYZPLAYER_DEBUGSERVERWALK");
+
+			Param1<bool> rp = new Param1<bool>(false);
+			ctx.Read(rp);
+
+			GetInputController().OverrideMovementSpeed(rp.param1, 1);
+			GetInputController().OverrideAimChangeX(rp.param1, 0.01);
+
+		}
+	}
+
+#endif
+
+	bool IsLanded(int pCurrentCommandID)
+	{
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_FALL)
+		{
+			HumanCommandFall fall = GetCommand_Fall();
+
+			if (fall)
+			{
+				return fall.PhysicsLanded();
+			}
+		}
+		
+		return false;
+	}
+
+	bool OnLand(int pCurrentCommandID, FallDamageData fallDamageData)
+	{
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_FALL)
+		{
+			HumanCommandFall fall = GetCommand_Fall();
+
+			if (fall)
+			{
+				fall.Land(fallDamageData.m_LandType);
+				return true;
+			}
+		}
+
+		return false;
+	}
+
+	bool IsAlreadyInFallingCommand(int pCurrentCommandID)
+	{
+		return pCurrentCommandID == DayZPlayerConstants.COMMANDID_FALL;
+	}
+	
+	//! movement sliding override, originally for FB gestures
+	void OverrideSlidePoseAngle(float value)
+	{
+		if (!m_MoveSettings)
+			m_MoveSettings = GetDayZPlayerType().CommandMoveSettingsW();
+		if (m_MoveSettings.m_fSlidingPoseAngle != value)
+		{
+			m_MoveSettings.m_fSlidingPoseAngle = value;
+			StartCommand_Move(); //nescessary, re-initializes with adjusted values
+		}
+	}
+	
+	float GetSlidePoseAngle()
+	{
+		return GetDayZPlayerType().CommandMoveSettingsW().m_fSlidingPoseAngle;
+	}
+	
+	void CheckAnimationOverrides()
+	{
+	}
+	
+	bool IsPlayerSelected()
+	{
+		return m_PlayerSelected;
+	}
+	
+	bool IsRestrained();
+	
+	//! Checks if fullbody animation or specific locked state is active in emote manager
+	bool IsInFBEmoteState();
+	
+	void SetSuicide(bool state)
+	{
+		m_Suicide = state;
+	}
+	
+	bool CommitedSuicide()
+	{
+		return m_Suicide;
+	}
+	
+	//!called every command handler tick when player is on ladder
+	void OnLadder(float delta_time, HumanMovementState pState);
+	
+	//-------------------------------------------------------------
+	//!
+	//! Phx contact event
+	//! 
+	
+	override protected void EOnContact(IEntity other, Contact extra)
+	{
+		if (!IsAlive())
+			return;
+		
+		if (GetParent() == other)
+			return;
+
+		Transport transport = Transport.Cast(other);
+		if (transport)
+		{
+			if (GetGame().IsServer())
+			{
+				RegisterTransportHit(transport);
+			}
+		}
+	}
+	
+	protected void AttenuateSoundIfNecessary(SoundObject soundObject)
+	{
+		if (GetGame().GetPlayer() != NULL && (IsSoundInsideBuilding() != GetGame().GetPlayer().IsSoundInsideBuilding() || IsCameraInsideVehicle() != GetGame().GetPlayer().IsCameraInsideVehicle()))
+		{
+			soundObject.SetKind(WaveKind.WAVEATTALWAYS);
+		}
+		else
+		{
+			soundObject.SetKind(WaveKind.WAVEEFFECTEX);
+		}
+	}
+	
+	void CheckLiftWeapon();
+	void ProcessLiftWeapon();
+	
+	void SetHandheldOpticsInUse(bool state)
+	{
+		m_HandheldOpticsInUse = state;
+	}
+	
+	bool IsHandheldOpticsInUse()
+	{
+		return m_HandheldOpticsInUse;
+	}
+	
+	bool IsLiftWeapon();
+	bool IsRaised()
+	{
+		return m_IsRaised;
+	}
+
+	bool IsFighting();
+	
+	//! ---------------- Checks if player can pick up heavy item -------------------------
+	// Will return true when the item is not heavy as well
+	bool CanPickupHeavyItem(notnull EntityAI item)
+	{
+		return !item.IsHeavyBehaviour() || (item.IsHeavyBehaviour() && DayZPlayerUtils.PlayerCanChangeStance(this, DayZPlayerConstants.STANCEIDX_ERECT));
+	}
+	
+	bool CanPickupHeavyItemSwap(notnull EntityAI item1, notnull EntityAI item2)
+	{
+		return CanPickupHeavyItem(item1) && CanPickupHeavyItem(item2);
+	}
+
+#ifdef DIAG_DEVELOPER
+	Weapon_Base SpawnWeaponInHands(string type)
+	{
+		return Weapon_Base.Cast(GetHumanInventory().CreateInHands(type));
+	}
+#endif
+	
+///////////////////////////////////
+//Obsolete stuff below this point//
+///////////////////////////////////
+	
+	protected bool										m_CameraEyeZoom; //DEPRECATED
+	ref Timer 											m_ADSAutomationTimer; //DEPRECATED
+	protected bool 										m_ADSTimerLaunched; //DEPRECATED
+	protected bool 										m_ProcessWeaponRaiseCompleted; //DEPRECATED
+	protected bool										m_IsFireWeaponRaised; //DEPRECATED, value still set for legacy reasons
+	void SetReturnToOptics(bool state); //DEPRECATED
+	void RunADSTimer(); //DEPRECATED
+	void StopADSTimer(); //DEPRECATED
+}
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementAiming.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementAiming.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3b799c0d5e66b0213dc3629bce82dc61ae1f95d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementAiming.c
@@ -0,0 +1,461 @@
+/* 
+DayZPlayerImplement
+
+this file is implemenation of dayzPlayer in script 
+- logic of movement 
+- camera switching logic
+
+*/
+
+enum eSwayStates
+{
+	DEFAULT,
+	HOLDBREATH_IN,
+	HOLDBREATH_STABLE,
+	HOLDBREATH_EXHAUSTED,
+	MAX
+}
+
+class PlayerSwayConstants
+{
+	static const float SWAY_MULTIPLIER_DEFAULT = 1.0;
+	static const float SWAY_MULTIPLIER_STABLE = 0.05;
+	static const float SWAY_MULTIPLIER_EXHAUSTED = 0.6;
+	static const float SWAY_TIME_IN = 1.5;
+	static const float SWAY_TIME_STABLE = 3.0;
+	static const float SWAY_TIME_EXHAUSTED = 1.5;
+	static const float SWAY_TIME_OUT = 0.5;
+	static const float SWAY_ROLL = 3;
+}
+
+class DayZPlayerImplementAiming
+{
+
+	//-------------------------------------------------------------
+	//!
+	//! This HeadingModel - Clamps heading
+	//!
+	
+	protected const float SWAY_WEIGHT_SCALER = 1;//use this to scale the sway effect up/down
+	protected float m_HorizontalNoise;
+	protected float m_HorizontalTargetValue;
+	protected float m_HorizontalNoiseVelocity[1] = {0};
+	protected DayZPlayerImplement	m_PlayerDpi;
+	protected PlayerBase m_PlayerPb;
+	protected float m_TotalTime;
+	protected float m_ReferenceTime = 0;
+	protected float m_SwayStateStartTime;
+	//protected float m_SwayStateStartTime[eSwayStates.MAX];
+	protected float m_LastSwayMultiplier = PlayerSwayConstants.SWAY_MULTIPLIER_DEFAULT;
+	protected float m_StateStartSwayMultiplier;
+	protected float m_HorizontalNoiseXAxisOffset;
+	protected float m_BreathingXAxisOffset;
+	protected float m_BreathingYAxisOffset;
+	protected bool m_HoldingBreathSet;
+	protected bool	m_AimNoiseAllowed = true;	
+	protected bool	m_ProceduralRecoilEnabled = true;	
+	protected ref RecoilBase m_CurrentRecoil;
+	protected int m_ShakeCount;
+	protected float m_SwayWeight;
+	protected float m_MaxVelocity;
+	protected ref KuruShake m_KuruShake;
+	protected float m_CamShakeX;
+	protected float m_CamShakeY;
+	protected vector m_SwayModifier = "1 1 1";//"max_speed_noise radius_noise overall_speed"
+	protected int m_SwayState = -1;
+	
+	protected float m_StealthAimY_Last;
+	protected float m_FilterVelocityStealthAimY[1] = {0};
+	
+	protected static float	m_AimXClampRanges[] = { -180, -20, 90, 	0, -50, 90,  180, -20, 90 };
+	
+	void DayZPlayerImplementAiming(DayZPlayerImplement player)
+	{
+		m_PlayerDpi = player;
+		Class.CastTo(m_PlayerPb, player);
+		UpdateSwayState(eSwayStates.DEFAULT);
+	}
+
+	void SetRecoil(Weapon_Base weapon)
+	{
+		if (m_ProceduralRecoilEnabled)
+		{
+			m_CurrentRecoil = weapon.SpawnRecoilObject();
+		}
+	}
+	
+	void RequestKuruShake(float amount)
+	{
+		if (!m_KuruShake)
+			m_KuruShake = new KuruShake(m_PlayerPb, amount);
+	}
+	
+	void OnRaiseBegin(DayZPlayerImplement player)
+	{
+		Weapon_Base weapon = Weapon_Base.Cast(player.GetHumanInventory().GetEntityInHands());
+		if (weapon)
+		{
+			m_SwayModifier = weapon.GetPropertyModifierObject().m_SwayModifiers;
+		}
+	}
+	
+	void OnFinisherBegin(float currentAimY)
+	{
+		m_StealthAimY_Last = currentAimY;
+		m_FilterVelocityStealthAimY[0] = 0;
+	}
+	
+	void OnSwayStateChange(int state)
+	{
+		switch (state)
+		{
+			case eSwayStates.HOLDBREATH_EXHAUSTED:
+				m_PlayerPb.OnHoldBreathExhausted();
+			break;
+			
+			default:
+			break;
+		}
+	}
+	
+	float GetSwayWeight()
+	{
+		return m_SwayWeight;		
+	}
+	
+	void SetAimNoiseAllowed(bool state)
+	{
+		m_AimNoiseAllowed = state;	
+	}
+	
+	bool IsAimNoiseAllowed()
+	{
+		return m_AimNoiseAllowed;	
+	}
+
+	void SetProceduralRecoilEnabled(bool state)
+	{
+		m_ProceduralRecoilEnabled = state;
+	}
+
+	bool IsProceduralRecoilEnabled()
+	{
+		return m_ProceduralRecoilEnabled;
+	}
+	
+	void SetCamShakeValues(float x_axis, float y_axis)
+	{
+		m_CamShakeX = x_axis;
+		m_CamShakeY = y_axis;
+	}
+
+	bool ProcessStealthFilters(float pDt, SDayZPlayerAimingModel pModel)
+	{		
+		m_StealthAimY_Last = Math.SmoothCD(m_StealthAimY_Last, 0, m_FilterVelocityStealthAimY, 0.3, 1000, pDt);
+		pModel.m_fAimYMouseShift = -(pModel.m_fCurrentAimY - m_StealthAimY_Last);
+		return true;
+	}
+	
+	bool ProcessAimFilters(float pDt, SDayZPlayerAimingModel pModel, int stance_index)
+	{
+		float breathing_offset_x;
+		float breathing_offset_y;
+		
+		float noise_offset_x;
+		float noise_offset_y;		
+		
+		float shake_offset_x;
+		float shake_offset_y;
+		
+		float recoil_offset_mouse_x;
+		float recoil_offset_mouse_y;
+		
+		float recoil_offset_hands_x;
+		float recoil_offset_hands_y;
+		
+		float kuru_offset_x;
+		float kuru_offset_y;
+		
+		float player_stamina = m_PlayerPb.GetStaminaHandler().GetSyncedStaminaNormalized();
+		
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("Player: " + m_PlayerPb + " | ProcessAimFilters | timestamp: " + m_PlayerPb.GetSimulationTimeStamp());
+		#endif
+		
+		//negates stamina effect during hold breath
+		if (m_PlayerPb.IsHoldingBreath())
+		{
+			player_stamina = 1;
+		}
+		float speed = CalculateSpeedMultiplier(player_stamina);
+		m_TotalTime += pDt * speed;
+		
+		if (m_PlayerPb.IsHoldingBreath() && !m_HoldingBreathSet)
+		{
+			m_ReferenceTime = m_TotalTime;
+		}
+		else if (!m_PlayerPb.IsHoldingBreath() && m_HoldingBreathSet)
+		{
+			m_ReferenceTime = m_TotalTime;
+		}
+		
+		float adjusted_sway_multiplier = CalculateSwayMultiplier();
+		m_LastSwayMultiplier = adjusted_sway_multiplier;
+		
+		m_SwayWeight = CalculateWeight(	stance_index, player_stamina, 0.5/*m_PlayerPb.m_CameraSwayModifier*/, m_PlayerPb.IsHoldingBreath()) * adjusted_sway_multiplier;
+
+		//! get sway
+		ApplyBreathingPattern(breathing_offset_x, breathing_offset_y, 3.0, m_TotalTime, m_SwayWeight);
+		ApplyHorizontalNoise(noise_offset_x, noise_offset_y, 0.2, 0.5, 3.0 * m_SwayModifier[0], speed, 3 * m_SwayModifier[1], m_SwayWeight, pDt);
+		
+		int shake_level = m_PlayerPb.GetShakeLevel();
+		if (shake_level != 0)
+		{
+			ApplyShakes(shake_offset_x, shake_offset_y, shake_level);
+		}
+
+		//! get recoil
+		if (m_CurrentRecoil)
+		{
+			m_CurrentRecoil.Update(pModel, recoil_offset_mouse_x, recoil_offset_mouse_y, recoil_offset_hands_x, recoil_offset_hands_y, pDt);
+		}
+		
+		if (m_KuruShake)
+		{
+			m_KuruShake.Update(pDt, kuru_offset_x, kuru_offset_y);
+		}
+		
+		//! hands offset
+		pModel.m_fAimXHandsOffset = breathing_offset_x + noise_offset_x + recoil_offset_hands_x + shake_offset_x + kuru_offset_x;
+		pModel.m_fAimYHandsOffset = breathing_offset_y + noise_offset_y + recoil_offset_hands_y + shake_offset_y + kuru_offset_y;
+		
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("breathing_offset_y: " + breathing_offset_y);
+		DbgPrintAimingImplement("noise_offset_y: " + noise_offset_y);
+		DbgPrintAimingImplement("recoil_offset_hands_y: " + recoil_offset_hands_y);
+		DbgPrintAimingImplement("shake_offset_y: " + shake_offset_y);
+		DbgPrintAimingImplement("kuru_offset_y: " + kuru_offset_y);
+		DbgPrintAimingImplement("pModel.m_fAimYHandsOffset: " + pModel.m_fAimYHandsOffset);
+		#endif
+		//! cam offset
+		pModel.m_fAimXCamOffset = -shake_offset_x - recoil_offset_hands_x - kuru_offset_x + m_CamShakeX;
+		pModel.m_fAimYCamOffset	= -shake_offset_y - recoil_offset_hands_y - kuru_offset_y + m_CamShakeY;
+		
+		
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("m_CamShakeY: " + m_CamShakeY);
+		DbgPrintAimingImplement("pModel.m_fAimYCamOffset: " + pModel.m_fAimYCamOffset);
+		#endif
+		
+		//! clamp aim ranges 
+		if (stance_index == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+		{
+			float newVal = DayZPlayerUtils.LinearRangeClamp(pModel.m_fCurrentAimX, pModel.m_fCurrentAimY, m_AimXClampRanges);
+			pModel.m_fAimYHandsOffset += newVal - pModel.m_fCurrentAimY;
+		}
+		float absAimY = Math.AbsFloat(pModel.m_fCurrentAimY);
+		pModel.m_fAimYHandsOffset = Math.Clamp(pModel.m_fAimYHandsOffset,absAimY - 89.9,89.9 - absAimY); //'90' leads to rounding errors down the line
+		
+		if (m_PlayerDpi.IsInOptics() && m_KuruShake)
+		{
+			//TODO - do not offset mouse
+		}
+		//! mouse offset
+		pModel.m_fAimXMouseShift = recoil_offset_mouse_x -kuru_offset_x / 10;
+		pModel.m_fAimYMouseShift = recoil_offset_mouse_y + kuru_offset_y / 10;
+
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("recoil_offset_mouse_y: " + recoil_offset_mouse_y);
+		DbgPrintAimingImplement("pModel.m_fAimYMouseShift: " + pModel.m_fAimYMouseShift);
+		#endif
+		
+		if (m_PlayerPb.IsHoldingBreath() && !m_HoldingBreathSet)
+		{
+			m_HoldingBreathSet = true;
+			m_HorizontalNoiseXAxisOffset = noise_offset_x;
+			m_BreathingXAxisOffset = breathing_offset_x;
+			m_BreathingYAxisOffset = breathing_offset_y;
+		}
+		else if (!m_PlayerPb.IsHoldingBreath() && m_HoldingBreathSet)
+		{
+			m_HoldingBreathSet = false;
+		}
+		
+		if (!m_PlayerPb.IsHoldingBreath() && m_LastSwayMultiplier == PlayerSwayConstants.SWAY_MULTIPLIER_DEFAULT && m_HorizontalNoiseXAxisOffset != 0)
+		{
+			m_HorizontalNoiseXAxisOffset = 0;
+			m_BreathingXAxisOffset = 0;
+			m_BreathingYAxisOffset = 0;
+		}
+		
+		if (m_PlayerPb.IsHoldingBreath())
+		{
+			m_PlayerPb.DepleteStamina(EStaminaModifiers.HOLD_BREATH,pDt*speed);
+		}
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("----------------------------");
+		#endif
+		return true;
+	}
+	
+	protected float CalculateSwayMultiplier()
+	{
+		float max;
+		float time;
+		float time_clamped;
+		float ret;
+		
+		if (m_PlayerPb.IsHoldingBreath())
+		{
+			time = m_TotalTime - m_ReferenceTime;
+			
+			if (time < PlayerSwayConstants.SWAY_TIME_IN)
+			{
+				UpdateSwayState(eSwayStates.HOLDBREATH_IN);
+				max = PlayerSwayConstants.SWAY_TIME_IN;
+				time_clamped = Math.Clamp((m_TotalTime - m_SwayStateStartTime),0,max);
+				ret = Math.Lerp(m_LastSwayMultiplier,PlayerSwayConstants.SWAY_MULTIPLIER_STABLE,time_clamped/max);
+			}
+			else if (time >= PlayerSwayConstants.SWAY_TIME_IN && time < (PlayerSwayConstants.SWAY_TIME_IN + PlayerSwayConstants.SWAY_TIME_STABLE))
+			{
+				UpdateSwayState(eSwayStates.HOLDBREATH_STABLE);
+				ret = PlayerSwayConstants.SWAY_MULTIPLIER_STABLE;
+			}
+			else
+			{
+				UpdateSwayState(eSwayStates.HOLDBREATH_EXHAUSTED);
+				max = PlayerSwayConstants.SWAY_TIME_EXHAUSTED;
+				time_clamped = Math.Clamp((m_TotalTime - m_SwayStateStartTime),0,max);
+				ret = Math.Lerp(PlayerSwayConstants.SWAY_MULTIPLIER_STABLE,PlayerSwayConstants.SWAY_MULTIPLIER_EXHAUSTED,(time_clamped/max));
+			}
+		}
+		else
+		{
+			UpdateSwayState(eSwayStates.DEFAULT);
+			max = PlayerSwayConstants.SWAY_TIME_OUT;
+			time_clamped = Math.Clamp((m_TotalTime - m_SwayStateStartTime),0,max);
+			ret = Math.Lerp(m_LastSwayMultiplier,1,time_clamped/max);
+		}
+		return ret;
+	}
+	
+	float CalculateSpeedMultiplier(float stamina)
+	{
+		return (((1.0 - stamina) * 3.0) + 1.0) * m_SwayModifier[2]; // just 'm_SwayModifier[2]' for HoldBreath
+	}
+	
+	protected bool UpdateSwayState(int state)
+	{
+		if (state != m_SwayState)
+		{
+			m_SwayState = state;
+			m_SwayStateStartTime = m_TotalTime;
+			m_StateStartSwayMultiplier = m_LastSwayMultiplier;
+			OnSwayStateChange(state);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	int GetCurrentSwayState()
+	{
+		return m_SwayState;
+	}
+
+	protected void ApplyBreathingPattern(out float x_axis, out float y_axis, float pAmplitude, float pTotalTime, float weight)
+	{
+
+		float multiplier = Math.Lerp(PlayerSwayConstants.SWAY_MULTIPLIER_DEFAULT,0,m_LastSwayMultiplier); //TODO revise
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("m_LastSwayMultiplier: " + m_LastSwayMultiplier);
+		DbgPrintAimingImplement("pAmplitude: " + pAmplitude);
+		DbgPrintAimingImplement("pTotalTime: " + pTotalTime);
+		DbgPrintAimingImplement("weight: " + weight);
+		DbgPrintAimingImplement("multiplier: " + multiplier);
+		#endif
+		
+		x_axis = (Math.Sin(pTotalTime) * pAmplitude / 4) * weight;
+		y_axis = (Math.Sin((pTotalTime) * 0.8 + 0.6) * pAmplitude) * weight;
+		#ifdef DEVELOPER 
+		DbgPrintAimingImplement("y_axis_midproduct: " + y_axis); 
+		#endif
+		x_axis += m_BreathingXAxisOffset * multiplier;
+		y_axis += m_BreathingYAxisOffset * multiplier;
+	}
+
+	protected void ApplyHorizontalNoise(out float x_axis, out float y_axis, float smooth_time,float max_velocity_low, float max_velocity_high, float velocity_modifier,  float max_distance, float weight, float pDt)
+	{
+		if (Math.AbsFloat(m_HorizontalTargetValue - m_HorizontalNoise) < 0.01)
+		{
+			//acquire new target
+			m_MaxVelocity = m_PlayerPb.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSAimingModel, max_velocity_low, max_velocity_high);
+
+			float r = m_PlayerPb.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSAimingModel, 0, 1);
+			m_HorizontalTargetValue = (r - 0.5) * 2 * max_distance;
+			m_HorizontalNoiseVelocity[0] = 0;
+		}
+
+		m_HorizontalNoise = Math.SmoothCD(m_HorizontalNoise, m_HorizontalTargetValue, m_HorizontalNoiseVelocity, smooth_time, m_MaxVelocity * velocity_modifier, pDt);
+		x_axis = m_HorizontalNoise * weight;
+		float multiplier = Math.Lerp(PlayerSwayConstants.SWAY_MULTIPLIER_DEFAULT,0,m_LastSwayMultiplier); //TODO revise
+		x_axis += m_HorizontalNoiseXAxisOffset * multiplier;
+	}
+	
+	protected void ApplyShakes(out float x_axis, out float y_axis, int level)
+	{
+		float weight = level / PlayerBase.SHAKE_LEVEL_MAX;
+		m_ShakeCount++;
+		int shakes_threshold = Math.Round(m_PlayerPb.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSAimingModel, 2, 4));
+		if (m_ShakeCount > shakes_threshold)
+		{
+			m_ShakeCount = 0;
+
+			float modifier = m_PlayerPb.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSAimingModel, 0.45, 0.9);
+			x_axis = modifier * weight * m_PlayerPb.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSAimingModel, 0, 1);
+			y_axis = modifier * weight * m_PlayerPb.GetRandomGeneratorSyncManager().GetRandomInRange(RandomGeneratorSyncUsage.RGSAimingModel, 0, 1);
+		}
+	}
+
+	protected float CalculateWeight(int stance_index, float current_stamina, float camera_sway_modifier, bool holding_breath)
+	{
+		if (m_PlayerDpi.GetCommand_Move() && m_PlayerDpi.GetCommand_Move().IsInRoll())//when the player is rolling, set a constant and disregard everything else
+		{
+			return PlayerSwayConstants.SWAY_ROLL;
+		}
+		float stance_modifier;
+		switch (stance_index)
+		{
+			case DayZPlayerConstants.STANCEIDX_RAISEDERECT:
+				stance_modifier = 0.5;
+			break;
+			case DayZPlayerConstants.STANCEIDX_RAISEDCROUCH:
+				stance_modifier = 0.75;
+			break;
+			case DayZPlayerConstants.STANCEIDX_RAISEDPRONE:
+				stance_modifier = 0.9;
+			break;
+			default:
+				stance_modifier = 0.75;
+				//Debug.LogError("stance mask out of definition");
+			break;
+		}
+		
+		#ifdef DEVELOPER
+		DbgPrintAimingImplement("current_stamina: " + current_stamina);
+		DbgPrintAimingImplement("camera_sway_modifier: " + camera_sway_modifier);
+		DbgPrintAimingImplement("holding_breath: " + holding_breath);
+		#endif
+		
+		return (1 - stance_modifier) * m_AimNoiseAllowed * camera_sway_modifier * SWAY_WEIGHT_SCALER;
+	}
+	
+	void DbgPrintAimingImplement(string val)
+	{
+		#ifdef DEVELOPER
+		if (GetDayZGame().IsAimLogEnabled())
+			Print("DayZPlayerImplementAiming | " + val);
+		#endif
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementFallDamage.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementFallDamage.c
new file mode 100644
index 0000000000000000000000000000000000000000..70b9f453a60051552efebbe9238e1b6467c7ca20
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementFallDamage.c
@@ -0,0 +1,369 @@
+class FallDamageData
+{
+	int m_LandType;
+	float m_Height;
+	float m_HealthCoef;
+	float m_ShockCoef;
+	float m_BrokenLegsCoef;
+	float m_BleedingHandsCoef;
+	float m_BleedingFeetCoef;
+	float m_BleedingLegsCoef;
+	float m_GlovesHealthCoef;
+	float m_ShoesHealthCoef;
+	float m_PantsHealthCoef;
+	float m_BleedingChanceCoef;
+	float m_BleedingChanceLegsCoef;
+}
+
+class DayZPlayerImplementFallDamage
+{
+	static const string	FALL_DAMAGE_AMMO_HEALTH = "FallDamageHealth";
+	static const string	FALL_DAMAGE_AMMO_SHOCK 	= "FallDamageShock";
+
+	static const string	FALL_DAMAGE_AMMO_HEALTH_ATTACHMENT			= "FallDamageHealthAttachment";
+	static const string	FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS	= "FallDamageHealthOtherAttachments";
+
+	const float		HEALTH_HEIGHT_LOW 		= 5;
+	const float		HEALTH_HEIGHT_HIGH 		= 14;
+
+	private const float		SHOCK_HEIGHT_LOW 		= 3;
+	private const float		SHOCK_HEIGHT_HIGH 		= 12;
+	private const float		BROKENLEGS_HEIGHT_LOW 	= 5;
+	private const float		BROKENLEGS_HEIGHT_HIGH 	= 9;
+	
+	private const float		GLOVES_HEALTH_HEIGHT_LOW 		= 5;
+	private const float		GLOVES_HEALTH_HEIGHT_HIGH 		= 15;
+	private const float		SHOES_HEALTH_HEIGHT_LOW 		= 2;
+	private const float		SHOES_HEALTH_HEIGHT_HIGH 		= 15;
+	private const float		PANTS_HEALTH_HEIGHT_LOW 		= 5;
+	private const float		PANTS_HEALTH_HEIGHT_HIGH 		= 16;
+	
+	private const float		BLEEDINGHANDS_HEIGHT_LOW 	= 5;
+	private const float		BLEEDINGFEET_HEIGHT_LOW 	= 3;
+	private const float		BLEEDINGLEGS_HEIGHT_LOW 	= 10;
+
+	private const float		RANDOM_THRESHOLD_HEALTH_LOW 		= 0.05;
+	private const float		RANDOM_THRESHOLD_HEALTH_HIGH 		= 0.1;
+	private const float		RANDOM_THRESHOLD_LEGS_LOW 			= 0.05;
+	private const float		RANDOM_THRESHOLD_LEGS_HIGH 			= 0.1;
+	private const float		RANDOM_THRESHOLD_ATTACHMENTS_LOW	= 0;
+	private const float		RANDOM_THRESHOLD_ATTACHMENTS_HIGH 	= 0.2;
+	
+	private const float     BLEEDING_CHANCE_HEIGHT_LOW		= 3;
+	private const float     BLEEDING_CHANCE_HEIGHT_HIGH		= 15;
+	
+	private static const float	BROKENLEGS_HEALTH_DAMAGE_MAX = 125;
+	
+	private static const string BLEEDING_HANDS_SELECTIONS[2] = {"LeftForeArmRoll", "RightForeArmRoll"};
+	private static const string BLEEDING_FEET_SELECTIONS[2] = {"LeftFoot", "RightFoot"};
+	private static const string BLEEDING_LEGS_SELECTIONS[2] = {"LeftLeg", "RightLeg"};
+	
+	private const int DAMAGE_TYPE_GLOBAL 		= 0;
+	private const int DAMAGE_TYPE_LEGS			= 1;
+	private const int DAMAGE_TYPE_ATTACHMENTS 	= 2;
+	
+	DayZPlayer 		m_Player;
+	private ref FallDamageData m_FallDamageData;
+	
+	#ifdef DIAG_DEVELOPER
+	bool m_Debug = false;
+	private static ref map<string, float> m_AmmoTypeData; 
+	#endif
+
+	void DayZPlayerImplementFallDamage(DayZPlayer pPlayer)
+	{
+		m_Player 	= pPlayer;
+		m_FallDamageData = new FallDamageData();
+		
+		#ifdef DIAG_DEVELOPER
+		PreloadAmmoTypeData();
+		#endif
+	}
+	
+	float GetHeight()
+	{
+		return m_FallDamageData.m_Height;
+	}
+
+	int GetLandType()
+	{
+		return m_FallDamageData.m_LandType;
+	}
+
+	void HandleFallDamage(FallDamageData pData)
+	{
+		m_FallDamageData = pData;
+		
+		m_FallDamageData.m_HealthCoef = Math.InverseLerp(HEALTH_HEIGHT_LOW, HEALTH_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_HealthCoef = Randomize(DAMAGE_TYPE_GLOBAL, m_FallDamageData.m_HealthCoef);
+		m_FallDamageData.m_HealthCoef = Math.Clamp(m_FallDamageData.m_HealthCoef, 0, 1);
+
+		m_FallDamageData.m_ShockCoef = Math.InverseLerp(SHOCK_HEIGHT_LOW, SHOCK_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_ShockCoef = Math.Clamp(m_FallDamageData.m_ShockCoef, 0, 1);
+
+		m_FallDamageData.m_BrokenLegsCoef = Math.InverseLerp(BROKENLEGS_HEIGHT_LOW, BROKENLEGS_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_BrokenLegsCoef = Randomize(DAMAGE_TYPE_LEGS, m_FallDamageData.m_BrokenLegsCoef);
+		m_FallDamageData.m_BrokenLegsCoef = Math.Clamp(m_FallDamageData.m_BrokenLegsCoef, 0, 1);
+
+		m_FallDamageData.m_BleedingHandsCoef = Math.InverseLerp(0, BLEEDINGHANDS_HEIGHT_LOW, pData.m_Height);
+		m_FallDamageData.m_BleedingHandsCoef = Math.Clamp(m_FallDamageData.m_BleedingHandsCoef, 0, 1);
+		
+		m_FallDamageData.m_BleedingFeetCoef = Math.InverseLerp(0, BLEEDINGFEET_HEIGHT_LOW, pData.m_Height);
+		m_FallDamageData.m_BleedingFeetCoef = Math.Clamp(m_FallDamageData.m_BleedingFeetCoef, 0, 1);
+
+		m_FallDamageData.m_BleedingLegsCoef = Math.InverseLerp(0, BLEEDINGLEGS_HEIGHT_LOW, pData.m_Height);
+		m_FallDamageData.m_BleedingLegsCoef = Math.Clamp(m_FallDamageData.m_BleedingLegsCoef, 0, 1);
+		
+		m_FallDamageData.m_GlovesHealthCoef = Math.InverseLerp(GLOVES_HEALTH_HEIGHT_LOW, GLOVES_HEALTH_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_GlovesHealthCoef = Randomize(DAMAGE_TYPE_ATTACHMENTS, m_FallDamageData.m_GlovesHealthCoef);
+		m_FallDamageData.m_GlovesHealthCoef = Math.Clamp(m_FallDamageData.m_GlovesHealthCoef, 0, 1);
+		
+		m_FallDamageData.m_ShoesHealthCoef = Math.InverseLerp(SHOES_HEALTH_HEIGHT_LOW, SHOES_HEALTH_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_ShoesHealthCoef = Randomize(DAMAGE_TYPE_ATTACHMENTS, m_FallDamageData.m_ShoesHealthCoef);
+		m_FallDamageData.m_ShoesHealthCoef = Math.Clamp(m_FallDamageData.m_ShoesHealthCoef, 0, 1);
+		
+		m_FallDamageData.m_PantsHealthCoef = Math.InverseLerp(PANTS_HEALTH_HEIGHT_LOW, PANTS_HEALTH_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_PantsHealthCoef = Randomize(DAMAGE_TYPE_ATTACHMENTS, m_FallDamageData.m_PantsHealthCoef);
+		m_FallDamageData.m_PantsHealthCoef = Math.Clamp(m_FallDamageData.m_PantsHealthCoef, 0, 1);
+		
+		m_FallDamageData.m_BleedingChanceCoef = Math.InverseLerp(BLEEDING_CHANCE_HEIGHT_LOW, BLEEDING_CHANCE_HEIGHT_HIGH, pData.m_Height);
+		m_FallDamageData.m_BleedingChanceCoef = Math.Clamp(m_FallDamageData.m_BleedingChanceCoef, 0, 0.7);
+		
+		m_FallDamageData.m_BleedingChanceLegsCoef = 0.15;
+		
+		if (GetGame().IsServer())
+		{
+			PlayerBase playerBase = PlayerBase.Cast(m_Player);
+			if (playerBase)
+			{
+				AttachBleedingToZonesByHeight(playerBase);
+				DamageAttachedGear(playerBase);
+				playerBase.DamageAllLegs(BROKENLEGS_HEALTH_DAMAGE_MAX * m_FallDamageData.m_BrokenLegsCoef);
+			}
+			
+			vector posMS = m_Player.WorldToModel(m_Player.GetPosition());
+
+			m_Player.ProcessDirectDamage(DamageType.CUSTOM, m_Player, "", FALL_DAMAGE_AMMO_HEALTH, posMS, m_FallDamageData.m_HealthCoef);
+			m_Player.ProcessDirectDamage(DamageType.CUSTOM, m_Player, "", FALL_DAMAGE_AMMO_SHOCK, posMS, m_FallDamageData.m_ShockCoef);
+
+			if (playerBase)
+				playerBase.ForceUpdateInjuredState();
+		}
+	}
+	
+	private float Randomize(int pType, float pValue)
+	{
+		Math.Randomize(GetGame().GetTime());
+		
+		int randomizedSign = -1;
+		if (Math.RandomIntInclusive(1, 2) % 2 == 1)
+			randomizedSign = 1;
+
+		float randomizationValue = 0;
+		switch (pType)
+		{
+			case DAMAGE_TYPE_GLOBAL:
+				randomizationValue = Math.RandomFloatInclusive(RANDOM_THRESHOLD_HEALTH_LOW, RANDOM_THRESHOLD_HEALTH_HIGH);
+				break;
+			case DAMAGE_TYPE_LEGS:
+				randomizationValue = Math.RandomFloatInclusive(RANDOM_THRESHOLD_LEGS_LOW, RANDOM_THRESHOLD_LEGS_HIGH);
+				break;
+			case DAMAGE_TYPE_ATTACHMENTS:
+				randomizationValue = Math.RandomFloatInclusive(RANDOM_THRESHOLD_ATTACHMENTS_LOW, RANDOM_THRESHOLD_ATTACHMENTS_HIGH);
+				break;
+		}
+		
+		return pValue + (randomizedSign * pValue * randomizationValue);
+	}
+	
+	private void AttachBleedingToZonesByHeight(notnull PlayerBase pPlayer)
+	{
+		Math.Randomize(GetGame().GetTime());
+
+			int bleedingSelectionIndex;
+			BleedingSourcesManagerServer bleedingManager = pPlayer.GetBleedingManagerServer();
+			if (Math.RandomFloatInclusive(0.0, 1.0) <= m_FallDamageData.m_BleedingChanceCoef && m_FallDamageData.m_BleedingHandsCoef == 1.0 && pPlayer.FindAttachmentBySlotName("Gloves") == null)
+			{
+				bleedingSelectionIndex = Math.RandomInt(0, 2);
+				bleedingManager.AttemptAddBleedingSourceBySelection(BLEEDING_HANDS_SELECTIONS[bleedingSelectionIndex]);
+			}
+			
+			if (Math.RandomFloatInclusive(0.0, 1.0) <= m_FallDamageData.m_BleedingChanceCoef && m_FallDamageData.m_BleedingFeetCoef == 1.0 && pPlayer.FindAttachmentBySlotName("Feet") == null)
+			{
+				
+				bleedingSelectionIndex = Math.RandomInt(0, 2);
+				bleedingManager.AttemptAddBleedingSourceBySelection(BLEEDING_FEET_SELECTIONS[bleedingSelectionIndex]);
+			}	
+			if (Math.RandomFloatInclusive(0.0, 1.0) <= m_FallDamageData.m_BleedingChanceLegsCoef && m_FallDamageData.m_BleedingLegsCoef == 1.0)
+			{
+				
+				bleedingSelectionIndex = Math.RandomInt(0, 2);
+				bleedingManager.AttemptAddBleedingSourceBySelection(BLEEDING_LEGS_SELECTIONS[bleedingSelectionIndex]);
+			}
+	}
+	
+	private void DamageAttachedGear(notnull PlayerBase pPlayer)
+	{
+		EntityAI gloves = pPlayer.FindAttachmentBySlotName("Gloves");
+		if (gloves)
+			gloves.ProcessDirectDamage(DT_CUSTOM, pPlayer, "", FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS, gloves.WorldToModel(gloves.GetPosition()), m_FallDamageData.m_GlovesHealthCoef);
+
+		EntityAI shoes = pPlayer.FindAttachmentBySlotName("Feet");
+		if (shoes)
+			shoes.ProcessDirectDamage(DT_CUSTOM, pPlayer, "", FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS, shoes.WorldToModel(shoes.GetPosition()), m_FallDamageData.m_ShoesHealthCoef);
+		
+		EntityAI pants = pPlayer.FindAttachmentBySlotName("Legs");
+		if (pants)
+			pants.ProcessDirectDamage(DT_CUSTOM, pPlayer, "", FALL_DAMAGE_AMMO_HEALTH_ATTACHMENT, pants.WorldToModel(pants.GetPosition()), m_FallDamageData.m_PantsHealthCoef);
+	}
+
+#ifdef DIAG_DEVELOPER
+	FallDamageDebugData GetFallDamageDebugData()
+	{
+		FallDamageDebugData data = new FallDamageDebugData();
+		data.Synch(this);
+
+		return data;
+	}
+	
+	void ShowFallDamageDebugInfo(bool enabled)
+	{
+		FallDamageDebugData data = GetFallDamageDebugData();
+		DisplayFallDamageDebugInfo(enabled, data);
+	}
+	
+	private static string LandTypeToString(int landType)
+	{
+		switch (landType)
+		{
+			case 1:
+				return "LIGHT";
+			case 2:
+				return "MEDIUM";
+			case 3:
+				return "HEAVY":
+		}
+		
+		return "NONE";
+	}
+	
+	private void PreloadAmmoTypeData()
+	{
+		if (m_AmmoTypeData == null)
+			m_AmmoTypeData = new ref map<string, float>();
+		
+		m_AmmoTypeData.Insert(FALL_DAMAGE_AMMO_HEALTH, GetValuesFromAmmoType(FALL_DAMAGE_AMMO_HEALTH)[0]);
+		m_AmmoTypeData.Insert(FALL_DAMAGE_AMMO_SHOCK, GetValuesFromAmmoType(FALL_DAMAGE_AMMO_SHOCK)[2]);
+		m_AmmoTypeData.Insert(FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS, GetValuesFromAmmoType(FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS)[0]);
+		m_AmmoTypeData.Insert(FALL_DAMAGE_AMMO_HEALTH_ATTACHMENT, GetValuesFromAmmoType(FALL_DAMAGE_AMMO_HEALTH_ATTACHMENT)[0]);
+	}
+	
+	private vector GetValuesFromAmmoType(string pAmmoType)
+	{
+		vector values = vector.Zero;
+		values[0] = GetGame().ConfigGetFloat(string.Format("CfgAmmo %1 DamageApplied Health damage", pAmmoType));
+		values[1] = GetGame().ConfigGetFloat(string.Format("CfgAmmo %1 DamageApplied Blood damage", pAmmoType));
+		values[2] = GetGame().ConfigGetFloat(string.Format("CfgAmmo %1 DamageApplied Shock damage", pAmmoType));
+		
+		return values;
+	}
+
+	static void DisplayFallDamageDebugInfo(bool enabled, FallDamageDebugData data)
+	{
+		int windowPosX = 10;
+		int windowPosY = 200;
+
+		DbgUI.Begin("Fall Damage (last)", windowPosX, windowPosY);
+		if (enabled)
+		{
+			DbgUI.Text(string.Format("Height:\t%1", Math.Clamp(data.m_Height, 0, float.MAX)));
+			DbgUI.Text(string.Format("Land Type:\t%1 (%2)", data.m_LandType, LandTypeToString(data.m_LandType)));
+			DbgUI.Text("");
+			DbgUI.Text("Health");
+			DbgUI.Text(string.Format("  coef:%1 dmg:%2", data.m_HealthCoef, m_AmmoTypeData[FALL_DAMAGE_AMMO_HEALTH] * data.m_HealthCoef));
+			DbgUI.Text("Shock");
+			DbgUI.Text(string.Format("  coef:%1 dmg:%2", data.m_ShockCoef, m_AmmoTypeData[FALL_DAMAGE_AMMO_SHOCK] * data.m_ShockCoef));
+			DbgUI.Text("Broken Legs:");
+			DbgUI.Text(string.Format("  coef:%1 dmg:%2", data.m_BrokenLegsCoef, BROKENLEGS_HEALTH_DAMAGE_MAX * data.m_BrokenLegsCoef));
+			DbgUI.Text("Gloves damage:");
+			DbgUI.Text(string.Format("  coef:%1 dmg:%2", data.m_GlovesHealthCoef, m_AmmoTypeData[FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS] * data.m_GlovesHealthCoef));
+			DbgUI.Text("Shoes damage:");
+			DbgUI.Text(string.Format("  coef:%1 dmg:%2", data.m_ShoesHealthCoef, m_AmmoTypeData[FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS] * data.m_ShoesHealthCoef));
+			DbgUI.Text("Pants damage:");
+			DbgUI.Text(string.Format("  coef:%1 dmg:%2" , data.m_PantsHealthCoef, m_AmmoTypeData[FALL_DAMAGE_AMMO_HEALTH_ATTACHMENT] * data.m_PantsHealthCoef));
+			DbgUI.Text("Bleeding coefs:");
+			DbgUI.Text(string.Format("  hands:%1", data.m_BleedingHandsCoef));
+			DbgUI.Text(string.Format("  feet:%1", data.m_BleedingFeetCoef));
+			DbgUI.Text(string.Format("  legs:%1", data.m_BleedingLegsCoef));
+			DbgUI.Text(string.Format("  H&F chance:%1", data.m_BleedingChanceCoef));
+			
+			
+		}
+		DbgUI.End();
+	}
+	
+	void FillDebugFallDamageData(FallDamageDebugData data)
+	{
+		data.m_Height 			= m_FallDamageData.m_Height;
+		data.m_LandType 		= m_FallDamageData.m_LandType;
+		data.m_HealthCoef 		= m_FallDamageData.m_HealthCoef;
+		data.m_ShockCoef 		= m_FallDamageData.m_ShockCoef;
+		data.m_BrokenLegsCoef 	= m_FallDamageData.m_BrokenLegsCoef;
+		data.m_GlovesHealthCoef = m_FallDamageData.m_GlovesHealthCoef;
+		data.m_ShoesHealthCoef 	= m_FallDamageData.m_ShoesHealthCoef;
+		data.m_PantsHealthCoef 	= m_FallDamageData.m_PantsHealthCoef;
+
+		data.m_BleedingHandsCoef 	= m_FallDamageData.m_BleedingHandsCoef;
+		data.m_BleedingFeetCoef 	= m_FallDamageData.m_BleedingFeetCoef;
+		data.m_BleedingLegsCoef 	= m_FallDamageData.m_BleedingLegsCoef;
+		data.m_BleedingChanceCoef 	= m_FallDamageData.m_BleedingChanceCoef;
+	}
+#endif
+	
+	//!
+	//! DEPRECATED
+	//!
+	const string 	FD_AMMO					= "FallDamage";	//!< ammo type used for damaging
+	const float		FD_DMG_FROM_HEIGHT		= 2.5;			//!< damage will not be taken into account bellow this HeightToDamage
+	const float		FD_MAX_DMG_AT_HEIGHT	= 15;			//!< height where player gets 100% damage
+	const float		FD_MAX_HEIGHT_LEG_BREAK = 8;			//!< height where legs break most of the time
+
+	void HandleFallDamage(float pHeight);
+	float DamageCoef(float pHeight);
+}
+
+#ifdef DIAG_DEVELOPER
+class FallDamageDebugData : Param
+{
+	int 	m_LandType;
+	float 	m_Height;
+	float 	m_HealthCoef;
+	float 	m_ShockCoef;
+	float 	m_BrokenLegsCoef;
+	float 	m_GlovesHealthCoef;
+	float 	m_ShoesHealthCoef;
+	float 	m_PantsHealthCoef;
+	float 	m_BleedingHandsCoef;
+	float 	m_BleedingFeetCoef;
+	float 	m_BleedingLegsCoef;
+	float	m_BleedingChanceCoef;
+	
+	void Synch(DayZPlayerImplementFallDamage fallDamage)
+	{
+		m_Height = fallDamage.GetHeight();
+		m_LandType = fallDamage.GetLandType();
+		
+		fallDamage.FillDebugFallDamageData(this);
+	}
+	
+	override bool Serialize(Serializer ctx)
+	{
+		return ctx.Write(m_Height) && ctx.Write(m_LandType) && ctx.Write(m_HealthCoef) && ctx.Write(m_ShockCoef) && ctx.Write(m_BrokenLegsCoef) && ctx.Write(m_GlovesHealthCoef) && ctx.Write(m_ShoesHealthCoef) && ctx.Write(m_PantsHealthCoef) && ctx.Write(m_BleedingHandsCoef) && ctx.Write(m_BleedingFeetCoef) && ctx.Write(m_BleedingLegsCoef);
+	}
+	
+	override bool Deserializer(Serializer ctx)
+	{
+		return ctx.Read(m_Height) && ctx.Read(m_LandType) && ctx.Read(m_HealthCoef) && ctx.Read(m_ShockCoef) && ctx.Write(m_BrokenLegsCoef) && ctx.Read(m_GlovesHealthCoef) && ctx.Read(m_ShoesHealthCoef) && ctx.Read(m_PantsHealthCoef) && ctx.Read(m_BleedingHandsCoef) && ctx.Read(m_BleedingFeetCoef) && ctx.Read(m_BleedingLegsCoef);
+	}
+}
+#endif
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementHeading.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementHeading.c
new file mode 100644
index 0000000000000000000000000000000000000000..e98bd7d7ca051a768f80023025709c52c5bbcc43
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementHeading.c
@@ -0,0 +1,132 @@
+/* 
+DayZPlayerImplement
+
+this file is implemenation of dayzPlayer in script 
+- logic of movement 
+- camera switching logic
+
+*/
+
+class DayZPlayerImplementHeading
+{
+
+	//-------------------------------------------------------------
+	//!
+	//! This HeadingModel - Clamps heading
+	//! 
+
+	//!
+	static bool	ClampHeading (float pDt, SDayZPlayerHeadingModel pModel, out float pLastHeadingDiff)
+	{
+		float		aDiff = pModel.m_fHeadingAngle - pModel.m_fOrientationAngle;
+		if (aDiff < -Math.PI)
+		{
+			aDiff += Math.PI2;
+		}
+		else if (aDiff > Math.PI)
+		{
+			aDiff -= Math.PI2;
+		}
+
+		// Print("Heading model: or: " + pModel.m_fOrientationAngle.ToString() + " head:" + pModel.m_fHeadingAngle.ToString() + " dif:" + aDiff.ToString());
+
+		if (pLastHeadingDiff < -Math.PI_HALF && aDiff > 0)
+		{
+			aDiff					= -Math.PI + 0.01;
+			pLastHeadingDiff		= aDiff;
+			pModel.m_fHeadingAngle 	= pModel.m_fOrientationAngle + aDiff;
+		
+        	// Print("-APA- : or: " + pModel.m_fOrientationAngle.ToString() + " head:" + pModel.m_fHeadingAngle.ToString() + " dif:" + aDiff.ToString());
+
+			return true;		// modify heading
+		}
+		else if (pLastHeadingDiff > Math.PI_HALF && aDiff < 0)
+		{
+			aDiff 					= Math.PI - 0.01;
+			pLastHeadingDiff		= aDiff;
+			pModel.m_fHeadingAngle 	= pModel.m_fOrientationAngle + aDiff;
+
+        	// Print("-APA- : or: " + pModel.m_fOrientationAngle.ToString() + " head:" + pModel.m_fHeadingAngle.ToString() + " dif:" + aDiff.ToString());
+
+			return true;		// modify heading
+		}
+
+		pLastHeadingDiff	= aDiff;
+		// Print("Heading model diff " + aDiff.ToString());
+		return false;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! This HeadingModel - Rotates orientations - so player slides 
+	//! 
+
+	static float 	CONST_ROTLIMIT = Math.PI * 0.95;
+
+	//!
+	static bool	RotateOrient (float pDt, SDayZPlayerHeadingModel pModel, out float pLastHeadingDiff)
+	{
+		float		aDiff = pModel.m_fHeadingAngle - pModel.m_fOrientationAngle;
+
+		while (aDiff < -Math.PI)
+		{
+			aDiff += Math.PI2;
+		}
+		while (aDiff > Math.PI)
+		{
+			aDiff -= Math.PI2;
+		}
+
+		// Print("Heading model: or: " + pModel.m_fOrientationAngle.ToString() + " head:" + pModel.m_fHeadingAngle.ToString() + " dif:" + aDiff.ToString());
+
+		if (pLastHeadingDiff < -Math.PI_HALF && aDiff > 0)
+		{
+			aDiff -= Math.PI2;
+		}
+		else if (pLastHeadingDiff > Math.PI_HALF && aDiff < 0)
+		{
+			aDiff += Math.PI2;
+		}
+
+		pLastHeadingDiff	= aDiff;		
+		if (aDiff < -CONST_ROTLIMIT)
+		{
+			// character is somehow stucked (happens in prone stance)
+			if (aDiff < -(Math.PI_HALF + CONST_ROTLIMIT))
+			{
+				pLastHeadingDiff = 0;
+				return false;
+			}
+			
+			pModel.m_fOrientationAngle += aDiff +  CONST_ROTLIMIT;
+			return true;
+		}
+		else if (aDiff > CONST_ROTLIMIT)
+		{
+			// character is somehow stucked (happens in prone stance)
+			if (aDiff > (Math.PI_HALF + CONST_ROTLIMIT))
+			{
+				pLastHeadingDiff = 0;
+				return false;
+			}
+			
+			pModel.m_fOrientationAngle += aDiff - CONST_ROTLIMIT;
+			return true;
+		}
+
+		// Print("Heading model diff " + aDiff.ToString());
+		return false;
+
+	}
+	
+	static bool NoHeading(float pDt, SDayZPlayerHeadingModel pModel, out float pLastHeadingDiff)
+	{
+		pLastHeadingDiff = 0;
+		pModel.m_fHeadingAngle = pModel.m_fOrientationAngle;
+		return true;
+	}
+
+
+
+}
+
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementJumpClimb.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementJumpClimb.c
new file mode 100644
index 0000000000000000000000000000000000000000..148c8c7729dad6dd6b497032e6da437e06a5f3a8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementJumpClimb.c
@@ -0,0 +1,113 @@
+class DayZPlayerImplementJumpClimb
+{
+	void DayZPlayerImplementJumpClimb(DayZPlayerImplement pPlayer)
+	{
+		m_Player = pPlayer;
+	}
+
+	//! Only valid immediately after 'JumpOrClimb' is called
+	bool WasSuccessful()
+	{
+		return m_bIsJumpInProgress || m_bWasClimb;
+	}
+	
+	//! Can't change to bool return
+	void JumpOrClimb()
+	{
+		//! Reset states
+		m_bWasClimb = false;
+
+		//! Early exit if the player is being heavy damaged so the stagger animation can't be skipped
+		if (m_Player.IsInFullbodyDamageAnimation())
+		{
+			return;
+		}
+
+		SHumanCommandClimbSettings hcls = m_Player.GetDayZPlayerType().CommandClimbSettingsW();
+		
+		if ( m_Player.m_MovementState.m_iMovement != DayZPlayerConstants.MOVEMENTIDX_IDLE )
+			hcls.m_fFwMaxDistance = 2.5;
+		else
+			hcls.m_fFwMaxDistance = 1.2;
+		
+		SHumanCommandClimbResult climbRes = new SHumanCommandClimbResult();
+		
+		HumanCommandClimb.DoClimbTest(m_Player, climbRes, 0);
+		if ( climbRes.m_bIsClimb || climbRes.m_bIsClimbOver )
+		{
+			int climbType = GetClimbType(climbRes.m_fClimbHeight);
+
+			if ( !m_Player.CanClimb( climbType,climbRes ) )
+				return;
+
+			if ( Climb(climbRes) )
+			{
+				if ( climbType == 1 )
+					m_Player.DepleteStamina(EStaminaModifiers.VAULT);
+				else if ( climbType == 2 )
+					m_Player.DepleteStamina(EStaminaModifiers.CLIMB);
+
+				return;
+			}
+		}
+		
+		if ( m_Player.CanJump() )
+		{
+			Jump();
+			m_Player.DepleteStamina(EStaminaModifiers.JUMP);
+		}
+	}
+	
+	void CheckAndFinishJump(int pLandType = 0)
+	{
+		if ( m_bIsJumpInProgress )
+		{
+			m_bIsJumpInProgress = false;
+			m_Player.OnJumpEnd(pLandType);
+		}
+	}
+	
+	private bool Climb(SHumanCommandClimbResult pClimbRes)
+	{
+		int climbType = GetClimbType(pClimbRes.m_fClimbHeight);	
+		if( climbType != -1 )
+		{
+			m_Player.StartCommand_Climb(pClimbRes, climbType);
+			m_Player.StopHandEvent();
+
+			m_bWasClimb = true;
+		}
+		
+		return climbType != -1;
+	}
+	
+	private void Jump()
+	{
+		m_bIsJumpInProgress = true;
+		m_Player.SetFallYDiff(m_Player.GetPosition()[1]);
+
+		m_Player.OnJumpStart();
+		m_Player.StartCommand_Fall(2.6);
+		m_Player.StopHandEvent();
+	}
+	
+	private int GetClimbType(float pHeight)
+	{
+		int climbType = -1;
+        if( pHeight < 1.1 )
+            climbType = 0;
+        else if( pHeight >= 1.1 && pHeight < 1.7 )
+            climbType = 1;
+        else if( pHeight >= 1.7 && pHeight < 2.75 )
+            climbType = 2;    
+        
+        return climbType;
+	}
+		
+	// Public variable members
+	bool m_bIsJumpInProgress = false;	
+	
+	// Private variable members
+	private DayZPlayerImplement m_Player;
+	private bool m_bWasClimb;
+}
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementMeleeCombat.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementMeleeCombat.c
new file mode 100644
index 0000000000000000000000000000000000000000..b76d9b3e20080a029c20bedf953260f91d177a42
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementMeleeCombat.c
@@ -0,0 +1,886 @@
+enum EMeleeHitType
+{
+	NONE = -1,
+
+	LIGHT,
+	HEAVY,
+	SPRINT,
+	KICK,
+	FINISHER_LIVERSTAB,
+	FINISHER_NECKSTAB,
+	FINISHER_GENERIC,
+
+	WPN_HIT,
+	WPN_HIT_BUTTSTOCK,
+	WPN_STAB,
+	WPN_STAB_FINISHER,
+}
+
+class DayZPlayerImplementMeleeCombat
+{
+	//! Target selection settings
+	protected const float				TARGETING_ANGLE_NORMAL	= 30.0; //!< Second Pass: Half angle of cone
+	protected const float				TARGETING_ANGLE_SPRINT	= 15.0; //!< Second Pass: Half angle of cone during sprint
+	protected const float				TARGETING_MIN_HEIGHT	= -2.0; //!< Second Pass: How deep the cone goes in meters from player position
+	protected const float				TARGETING_MAX_HEIGHT	= 2.0; 	//!< Second Pass: How high the cone goes in meters from player position
+	protected const float 				TARGETING_RAY_RADIUS_EX	= 0.5; 	//!< Second Pass: Max distance from ray projected from player looking direction
+	protected const float				TARGETING_RAY_RADIUS	= 0.25; //!< DEPRECATED: "HitZoneSelection"
+	protected const float				TARGETING_RAY_DIST		= 5.0; 	//!< DEPRECATED: "HitZoneSelection"
+	protected const float				TARGETING_RAY_DIST_SHORT= 2.0;	//!< DEPRECATED: "HitZoneSelection"
+
+	protected const float 				RANGE_EXTENDER_NORMAL	= 0.65; //!< General range extension
+	protected const float 				RANGE_EXTENDER_SPRINT	= 1.35; //!< General range extension while in sprint
+	
+	protected const string				DEFAULT_HIT_ZONE 		= "Torso"; //!< DEPRECATED: "HitZoneSelection"
+	
+	//! Target selecting "component"
+	protected ref MeleeTargeting		m_MeleeTargeting; //!< Contains logic for Second Pass
+	
+	//! Targets - types
+	protected Object					m_TargetObject; 		//!< Main target found during most recent TargetSelection
+	protected EMeleeTargetType			m_TargetType;  			//!< DEPRECATED: Was added but never used..?
+	protected ref array<Object> 		m_AllTargetObjects; 	//!< All potential targets found during most recent TargetSelection
+	
+	#ifdef DIAG_DEVELOPER
+	protected Object					m_PreviousTargetObject; 		//!< Main target found during most recent TargetSelection
+	protected ref array<Object> 		m_AllPreviousTargetObjects; 	//!< All potential targets found during most recent TargetSelection
+	#endif
+	
+	protected ref array<typename>		m_TargetableObjects; 	//!< Typenames of all directly/preferred targetable objects (1st Pass + 2nd Pass)
+	protected ref array<typename>		m_NonAlignableObjects; 	//!< Typenames of objects that can be targeted, but are not a priority (3rd Pass)
+	protected ref array<string>			m_BlacklistedDamageZones; //!< List of blacklisted damage zone names (cannot use indices due to the possible changes when p3d components are recalculated)
+	
+	//! Parent
+	protected DayZPlayerImplement		m_DZPlayer; //!< Player executing the melee
+
+	//! Weapons - cache
+	protected InventoryItem				m_Weapon; 		//!< Weapon used during most recent Update
+	protected int						m_WeaponMode; 	//!< WeaponMode used during most recent Update
+	protected float						m_WeaponRange; 	//!< WeaponRange used during most recent Update
+	
+	//! Misc - cache
+	protected bool 						m_ForceUntargetable;	//!< Forcing current target as untargetable
+	protected bool 						m_SprintAttack; 		//!< If most recent attack was a sprint attack
+	protected bool						m_WasHit; 				//!< If most recent attack was 
+	
+	protected vector 					m_RayStart; 	//!< Start position of most recent HitZoneSelectionRaycast
+	protected vector	 				m_RayEnd; 		//!< End position of most recent HitZoneSelectionRaycast
+	protected vector	 				m_RayEndShort; 	//!< DEPRECATED: "HitZoneSelection"
+	
+	protected EMeleeHitType				m_HitType; 	//!< Hit type of the most recent attack
+
+	//! Hit result - cache
+	protected int 						m_HitZoneIdx; 		//!< Most recent target HitZone index
+	protected int 						m_FinisherType;
+	protected string					m_HitZoneName; 		//!< Most recent target HitZone name
+	protected vector					m_HitPositionWS;	//!< Most recent target position
+	
+	#ifdef DIAG_DEVELOPER
+	protected int 						m_PreviousHitZoneIdx; 		//!< Most recent target HitZone index
+	protected string					m_PreviousHitZoneName; 		//!< Most recent target HitZone name
+	protected vector					m_PreviousHitPositionWS;	//!< Most recent target position
+	#endif
+	
+	private int 						m_DebugForcedFinisherType;
+
+	// ------------------------------------------------------------
+	// CONSTRUCTOR
+	// ------------------------------------------------------------
+
+	void DayZPlayerImplementMeleeCombat(DayZPlayerImplement player)
+	{
+		Init(player);
+	}
+	
+	void Init(DayZPlayerImplement player)
+	{
+		m_DZPlayer 		= player;
+		
+		m_MeleeTargeting = new MeleeTargeting;
+		
+		m_HitZoneName	= "";
+		m_HitZoneIdx 	= -1;
+		m_FinisherType	= -1;
+		m_HitPositionWS = vector.Zero;
+		
+		m_SprintAttack 	= false;
+		m_WasHit 		= false;
+		
+		m_TargetObject      = null;
+		m_TargetType		= EMeleeTargetType.ALIGNABLE;
+		m_AllTargetObjects 	= new array<Object>;
+		#ifdef DIAG_DEVELOPER
+		m_AllPreviousTargetObjects = new array<Object>;
+		#endif
+		
+		m_DebugForcedFinisherType =  -1;
+
+		m_TargetableObjects = new array<typename>; //checks against CONFIG hierarchy
+		m_TargetableObjects.Insert(DayZPlayer);
+		m_TargetableObjects.Insert(DayZInfected);
+		m_TargetableObjects.Insert(DayZAnimal);
+
+		m_NonAlignableObjects = new array<typename>;
+		m_NonAlignableObjects.Insert(Building);
+		m_NonAlignableObjects.Insert(Car);
+		m_NonAlignableObjects.Insert(CarWheel);
+		m_NonAlignableObjects.Insert(CarDoor);
+		m_NonAlignableObjects.Insert(TentBase);
+		m_NonAlignableObjects.Insert(BaseBuildingBase);
+		
+		m_BlacklistedDamageZones = new array<string>;
+		m_BlacklistedDamageZones.Insert("Brain");
+	}
+
+	void ~DayZPlayerImplementMeleeCombat() {}
+
+	// ------------------------------------------------------------
+	// PUBLIC
+	// ------------------------------------------------------------
+
+	EMeleeHitType GetHitType()
+	{
+		return m_HitType;
+	}
+
+	void SetHitZoneIdx(int pHitZone)
+	{
+		m_HitZoneIdx = pHitZone;
+	}
+	
+	EntityAI GetTargetEntity()
+	{
+		return EntityAI.Cast(m_TargetObject);
+	}
+
+	void SetTargetObject(Object pTarget)
+	{
+		m_TargetObject = pTarget;
+	}
+	
+	//! component idx
+	int GetHitZoneIdx()
+	{
+		return m_HitZoneIdx;
+	}
+	
+	vector GetHitPos()
+	{
+		return m_HitPositionWS;
+	}
+
+	void SetHitPos(vector pHitPos)
+	{
+		m_HitPositionWS = pHitPos;
+	}
+	
+	int GetFinisherType()
+	{
+		return m_FinisherType;
+	}
+	
+	void SetFinisherType(int pFinisherType)
+	{
+		m_FinisherType = pFinisherType;
+	}
+	
+	int GetWeaponMode()
+	{
+		return m_WeaponMode;
+	}
+	
+	void Reset(InventoryItem weapon, EMeleeHitType hitMask, bool wasHitEvent = false)
+	{
+		m_Weapon 					= weapon;
+		m_HitType 					= hitMask;
+		m_TargetType 				= EMeleeTargetType.ALIGNABLE;
+		m_SprintAttack 				= hitMask == EMeleeHitType.SPRINT;
+		m_WeaponMode 				= SelectWeaponMode(weapon);
+		m_WeaponRange 				= GetWeaponRange(weapon, m_WeaponMode);
+		m_WasHit 					= wasHitEvent;
+		
+		#ifdef DIAG_DEVELOPER
+		m_AllPreviousTargetObjects	= m_AllTargetObjects;
+		#endif
+		m_AllTargetObjects.Clear();
+	}
+	
+	void ResetTarget()
+	{
+		#ifdef DIAG_DEVELOPER
+		m_PreviousTargetObject 	= m_TargetObject;
+		m_PreviousHitPositionWS = m_HitPositionWS;
+		m_PreviousHitZoneIdx 	= m_HitZoneIdx;
+		m_PreviousHitZoneName 	= m_HitZoneName;
+		#endif
+		
+		InternalResetTarget();
+	}
+
+	void Update(InventoryItem weapon, EMeleeHitType hitMask, bool wasHitEvent = false)
+	{
+		Reset(weapon, hitMask, wasHitEvent);
+		
+		#ifndef SERVER
+		if (!ScriptInputUserData.CanStoreInputUserData())
+		{
+			//Error("DayZPlayerImplementMeleeCombat - ScriptInputUserData already posted");
+			return;
+		}
+		
+		TargetSelection();
+		SetFinisherType(TrySelectFinisherType(weapon, GetTargetEntity()));
+
+		//! Store target into input packet
+		if (GetGame().IsMultiplayer())
+		{
+			ScriptInputUserData ctx = new ScriptInputUserData();
+			ctx.Write(INPUT_UDT_MELEE_TARGET);
+			ctx.Write(m_TargetObject);
+			ctx.Write(m_HitPositionWS);
+			ctx.Write(m_HitZoneIdx);
+			ctx.Write(m_FinisherType);
+			ctx.Send();
+		}
+		#endif
+	}
+	
+	void CheckMeleeItem()
+	{
+		if (m_Weapon)
+		{
+			ItemBase item = ItemBase.Cast(m_Weapon.ProcessMeleeItemDamage(GetWeaponMode()));
+			
+			if (item && item.GetHierarchyRootPlayer())
+			{
+				PlayerBase.Cast(item.GetHierarchyRootPlayer()).SetCheckMeleeItem(item);
+			}
+			else if (m_Weapon && m_Weapon.GetHierarchyRootPlayer())
+			{
+				PlayerBase.Cast(m_Weapon.GetHierarchyRootPlayer()).SetCheckMeleeItem(ItemBase.Cast(m_Weapon));
+			}
+		}
+	}
+	
+	// ------------------------------------------------------------
+	// protected
+	// ------------------------------------------------------------
+
+	protected int SelectWeaponMode(InventoryItem weapon)
+	{
+		if (weapon)
+		{
+			//! melee with firearm
+			if (weapon.IsInherited(Weapon))
+			{
+				switch (m_HitType)
+				{
+					case EMeleeHitType.WPN_HIT:
+						return 0;
+					case EMeleeHitType.WPN_HIT_BUTTSTOCK:
+						return 1;
+					case EMeleeHitType.WPN_STAB:
+						return 2;
+				}
+			}
+			else
+			{
+				//! melee weapon attacks - gets mode from the item
+				switch (m_HitType)
+				{
+					case EMeleeHitType.LIGHT:
+						return weapon.GetMeleeMode();
+					case EMeleeHitType.HEAVY:
+						return weapon.GetMeleeHeavyMode();
+					case EMeleeHitType.SPRINT:
+						return weapon.GetMeleeSprintMode();
+				}
+			}
+		}
+
+		//! bare hand melee mode selection
+		switch (m_HitType)
+		{
+			case EMeleeHitType.HEAVY:
+				return 1;
+			case EMeleeHitType.SPRINT:
+				return 2;
+		}
+
+		return 0; //! default bare-hand light attack
+	}
+	
+	protected float GetWeaponRange(InventoryItem weapon, int weaponMode)
+	{
+		if ( weapon )
+			return weapon.GetMeleeCombatData().GetModeRange(weaponMode);
+		else
+			return m_DZPlayer.GetMeleeCombatData().GetModeRange(weaponMode);
+	}
+		
+	protected float GetRange()
+	{
+		return m_WeaponRange + RANGE_EXTENDER_NORMAL;
+	}
+	
+	protected float GetAngle()
+	{
+		if (m_SprintAttack)
+			return TARGETING_ANGLE_SPRINT;
+		else
+			return TARGETING_ANGLE_NORMAL;
+	}
+	
+	protected void TargetSelection()
+	{
+		// Prepare common variables
+		PlayerBase player = PlayerBase.Cast(m_DZPlayer);
+		vector pos = m_DZPlayer.GetPosition();
+		vector rayStart = m_DZPlayer.GetBonePositionWS(m_DZPlayer.GetBoneIndexByName("Head"));
+
+		vector cameraPos, cameraRot, cameraDir;
+		m_DZPlayer.GetCurrentCameraTransform(cameraPos, cameraDir, cameraRot);
+		vector dir = MiscGameplayFunctions.GetHeadingVector(player);
+		dir[1] = cameraDir[1];
+
+		// Calculate max distances
+		float dist = GetRange();
+		float angle = GetAngle();
+		float dist2 = Math.SqrFloat(dist);
+		
+		// There's generally 2 TargetSelection calls per animation
+		// First to obtain target to move towards during animation
+		// Second one is to see if that target is still in range before applying damage to it
+		// m_WasHit means the hit event occured, so this is the second call
+
+		if (m_WasHit && GetFinisherType() == -1)
+		{
+			// See if the component is still in range
+			if (CanObjectBeTargeted(m_TargetObject) && ( vector.DistanceSq(rayStart, m_TargetObject.GetDamageZonePos(m_HitZoneName)) <= dist2 ))
+			{
+				m_AllTargetObjects.Insert(m_TargetObject);
+				// This result should still be cached, so no need to fill it in again
+				return;
+			}
+		}
+		
+		// Find a new target
+		InternalResetTarget();
+		
+		Object target;
+		vector hitPos;
+		int hitZone;
+		
+		// First pass - Prefer what the player is looking at (only aligneable ones, we will try for nonaligneable later)
+		if (HitZoneSelectionRaycastHelper(hitPos, hitZone, target))
+		{
+			if (m_ForceUntargetable)
+			{
+				SetTarget(target, hitPos, hitZone);
+				return;
+			}
+
+			if (CanObjectBeTargeted(target) && vector.DistanceSq(rayStart, hitPos) <= dist2)
+			{
+				m_AllTargetObjects.Insert(target);
+				
+				SetTarget(target, hitPos, hitZone);
+				return;
+			}
+		}
+		
+		// Second pass - Try to obtain something aligneable closeby the player watching direction		
+		MeleeTargetData targetData = m_MeleeTargeting.GetMeleeTargetEx(new MeleeTargetSettings(pos, dist*0.75, angle, TARGETING_MIN_HEIGHT, TARGETING_MAX_HEIGHT, rayStart, dir, TARGETING_RAY_RADIUS_EX, m_DZPlayer, m_TargetableObjects), m_AllTargetObjects, m_BlacklistedDamageZones);
+
+		if (targetData)
+		{
+			SetTarget(targetData.Obj, targetData.HitPos, targetData.HitComponent);
+			return;
+		}
+		
+		// Third pass - We found no aligneable target, check if the target that we are directly looking at is nonalignable (big)
+		if (CanObjectBeTargeted(target, true) && vector.DistanceSq(rayStart, hitPos) <= dist2)
+		{
+			m_AllTargetObjects.Insert(target);
+
+			SetTarget(target, hitPos, hitZone);
+			return;
+		}
+	}
+	
+	/**
+	\brief General condition for finisher attacks
+		\param weapon \p Weapon used in the attack
+		\param target \p Target entity
+		\return \p int - type of finisher (-1 == no finisher)
+	*/
+	protected int TrySelectFinisherType(InventoryItem weapon, EntityAI target)
+	{
+		if (m_WasHit)
+			return -1;
+		
+		if (target)
+		{
+			vector dir = target.GetPosition() - m_DZPlayer.GetPosition();
+
+			IEntity hitEntity;
+			vector hitPos, hitNormal;
+			
+			float moveFraction = m_DZPlayer.CollisionMoveTest(dir, vector.Zero, 1.0, target, hitEntity, hitPos, hitNormal);
+			if (moveFraction < 1.0)
+				return -1;
+		}
+
+		//! perform only for finisher suitable weapons
+		if (target && target.CanBeBackstabbed() && weapon && (weapon.IsMeleeFinisher() || m_HitType == EMeleeHitType.WPN_STAB) && !weapon.IsRuined() )
+		{
+			bool playGenericFinisherAnimation = false;
+			ZombieBase targetZombie = ZombieBase.Cast(target);
+			if (targetZombie && m_DebugForcedFinisherType == -1)
+			{
+				//! check if attacker is in right pos and angle against victim
+				if (!IsEntityBehindEntityInAngle(m_DZPlayer, target, 60))
+				{
+					return -1;
+				}
+				
+				int mindState = targetZombie.GetMindStateSynced();
+				//! Check if the infected is aware of the player
+				if (mindState >= DayZInfectedConstants.MINDSTATE_DISTURBED)
+				{
+					return -1;
+				}
+			}
+
+			PlayerBase targetPlayer = PlayerBase.Cast(target);			
+			//! prone checks
+			if (targetZombie)
+			{
+				playGenericFinisherAnimation = targetZombie.IsCrawling();
+			}
+			else if (targetPlayer)
+			{
+				playGenericFinisherAnimation = targetPlayer.IsInProne();
+			}
+			else
+			{
+				playGenericFinisherAnimation = true;
+			}
+			
+			//! firearm
+			if (weapon.IsWeapon())
+			{
+				return EMeleeHitType.WPN_STAB_FINISHER;
+			}
+			else if (playGenericFinisherAnimation)
+			{
+				return EMeleeHitType.FINISHER_GENERIC;
+			}
+			else //specific hit depending on the component hit (gotten from the target)
+			{
+				return DetermineSpecificFinisherType(ItemBase.Cast(weapon));
+			}
+		}
+
+		return -1;
+	}
+	
+	protected int DetermineSpecificFinisherType(ItemBase weapon)
+	{
+		if (m_DebugForcedFinisherType > -1)
+		{
+			array<int> finishers = {
+				EMeleeHitType.FINISHER_LIVERSTAB,
+				EMeleeHitType.FINISHER_NECKSTAB
+			};
+
+			return finishers[m_DebugForcedFinisherType];
+		}
+		
+		if (!weapon || !weapon.GetValidFinishers() || weapon.GetValidFinishers().Count() == 0)
+		{
+			return EMeleeHitType.FINISHER_LIVERSTAB;
+		}
+		
+		PlayerBase player = PlayerBase.Cast(m_DZPlayer);
+		int idx = Math.Round(Math.Lerp(0, weapon.GetValidFinishers().Count() - 1, player.GetRandomGeneratorSyncManager().GetRandom01(RandomGeneratorSyncUsage.RGSGeneric)));
+		return weapon.GetValidFinishers()[idx];
+	}
+	
+	protected void InternalResetTarget()
+	{
+		m_TargetObject 	= null;
+		m_HitPositionWS = vector.Zero;
+		m_HitZoneIdx 	= -1;
+		m_HitZoneName 	= "";
+		SetFinisherType(-1);
+	}
+	
+	protected void SetTarget(Object obj, vector hitPos, int hitZone)
+	{
+		if (obj)
+		{
+			m_TargetObject 	= obj;
+			m_HitPositionWS = hitPos;
+			m_HitZoneIdx 	= hitZone;
+			m_HitZoneName 	= m_TargetObject.GetDamageZoneNameByComponentIndex(m_HitZoneIdx);
+		}
+	}
+	
+	protected bool CanObjectBeTargeted(Object obj, bool checkNonAligneAble = false)
+	{
+		return obj && obj.IsAlive() && ( obj.IsAnyInherited(m_TargetableObjects) || (checkNonAligneAble && obj.IsAnyInherited(m_NonAlignableObjects)) );
+	}
+	
+	protected bool HitZoneSelectionRaycastHelper(out vector hitPos, out int hitZone, out Object target)
+	{
+		return HitZoneSelectionRaycast(hitPos, hitZone, target, false);
+		// Not sure if desired, as it can give some results that feel a little odd
+		// But it will depend entirely on the player and situation..
+		// I guess the crosshair is hidden while melee anyways though
+		// || ( m_DZPlayer.IsInThirdPerson() && HitZoneSelectionRaycast(hitPos, hitZone, target, true);
+	}
+	
+	protected bool HitZoneSelectionRaycast(out vector hitPos, out int hitZone, out Object target, bool useCamera)
+	{
+		PlayerBase player = PlayerBase.Cast(m_DZPlayer);
+		
+		vector pos;
+		vector dir;
+		vector playerDir;
+		if (useCamera)
+		{ // What the player camera is looking at (crosshair)
+			vector cameraRotation;
+			player.GetCurrentCameraTransform(pos, dir, cameraRotation);
+			playerDir = dir;
+		}
+		else
+		{ // What the player himself is looking at
+			playerDir = MiscGameplayFunctions.GetHeadingVector(player);
+			dir = GetGame().GetCurrentCameraDirection();
+			MiscGameplayFunctions.GetHeadBonePos(player, pos);
+		}
+		
+		//! Prevents targeting of objects behind player
+		if (vector.Dot(dir, playerDir) < 0.5)
+		{
+			return false;
+		}
+
+		m_RayStart = pos;
+		m_RayEnd = m_RayStart + GetRange() * dir;
+		
+		// raycast
+		set<Object> hitObjects = new set<Object>;
+		vector hitNormal;
+		
+		if ( DayZPhysics.RaycastRV(m_RayStart, m_RayEnd, hitPos, hitNormal, hitZone, hitObjects, null, player, false, false, ObjIntersectIFire) && hitObjects.Count() > 0 )
+		{
+			target = hitObjects[0];
+			m_ForceUntargetable = false;
+
+			//! Opponent is inside car - targeting range is shorter in that case
+			PlayerBase playerTarget = PlayerBase.Cast(target);
+			if (playerTarget && playerTarget.IsInVehicle())
+			{
+				if (vector.DistanceSq(pos, hitPos) > Math.SqrFloat(GetRange() * 0.5))
+				{
+					m_ForceUntargetable = true;
+					target = null;
+					hitPos = vector.Zero;
+					hitZone = -1;
+				}
+			}
+
+			return true;
+		}
+		
+		return false;
+	}
+
+	//! DEPRECATED
+	protected void HitZoneSelection()
+	{
+		Object cursorTarget = null;
+		PlayerBase player = PlayerBase.Cast(m_DZPlayer);
+
+		// ray properties 
+		vector pos;
+		vector cameraDirection = GetGame().GetCurrentCameraDirection();
+
+		MiscGameplayFunctions.GetHeadBonePos(player, pos);
+		m_RayStart = pos;
+		m_RayEnd = pos + cameraDirection * TARGETING_RAY_DIST;
+		m_RayEndShort = pos + cameraDirection * TARGETING_RAY_DIST_SHORT;
+
+		// raycast
+		set<Object> hitObjects = new set<Object>;
+		int hitComponentIndex;
+		float hitFraction;
+		vector start, end, hitNormal, hitPosObstructed;
+		PhxInteractionLayers collisionLayerMask = PhxInteractionLayers.DEFAULT;
+		
+		if ( !DayZPhysics.RaycastRV(m_RayStart, m_RayEndShort, m_HitPositionWS, hitNormal, m_HitZoneIdx, hitObjects, null, player, false, false, ObjIntersectIFire) && !DayZPhysics.RaycastRV(m_RayStart, m_RayEnd, m_HitPositionWS, hitNormal, m_HitZoneIdx, hitObjects, null, player, false, false, ObjIntersectIFire, TARGETING_RAY_RADIUS) )
+		{
+			m_HitZoneIdx = -1;
+			//Print("HitZoneSelection failed");
+		}
+		else if ( hitObjects.Count() > 0 )
+		{
+			cursorTarget = hitObjects.Get(0);
+
+			//! make sure we are in range of the current weapon;				
+			vector playerPos = m_DZPlayer.GetPosition();
+			vector hitPos = m_HitPositionWS;
+			//! 2d only
+			playerPos[1] = 0;
+			hitPos[1] = 0;
+
+			//! just for building and transports (big objects)				
+			if ( cursorTarget.IsAnyInherited(m_NonAlignableObjects) && vector.Distance(playerPos, hitPos) <= GetWeaponRange(m_Weapon, GetWeaponMode()))
+			{
+				//! if no object in cone, set this object from raycast for these special cases
+				if (m_TargetObject == null)
+				{
+					m_TargetObject = cursorTarget;
+				}
+			}
+
+			if (cursorTarget == m_TargetObject)
+			{
+				m_HitZoneName = cursorTarget.GetDamageZoneNameByComponentIndex(m_HitZoneIdx);
+				//Print("hit object: " + m_TargetObject + " | component idx: " + m_HitZoneIdx + " | hitzone name: " + m_HitZoneName);
+			}
+			else
+			{
+				if (m_TargetObject == DayZInfected.Cast(m_TargetObject) || m_TargetObject == PlayerBase.Cast(m_TargetObject))
+				m_HitZoneName = DEFAULT_HIT_ZONE; //Default to torso if no zone is targeted 
+			}
+		}
+		else
+		{
+			m_HitZoneIdx = -1;
+			//Print("HitZoneSelection failed");
+		}
+	}
+
+	//! DEPRECATED - New function in MeleeTargeting
+	protected bool IsObstructed(Object object)
+	{
+		// check direct visibility of object (obstruction check)
+		PhxInteractionLayers collisionLayerMask = PhxInteractionLayers.BUILDING|PhxInteractionLayers.DOOR|PhxInteractionLayers.VEHICLE|PhxInteractionLayers.ROADWAY|PhxInteractionLayers.TERRAIN|PhxInteractionLayers.ITEM_SMALL|PhxInteractionLayers.ITEM_LARGE|PhxInteractionLayers.FENCE;
+		int hitComponentIndex;
+		float hitFraction;
+		vector start, end, hitNormal, hitPosObstructed;
+		Object hitObject = null;
+		PlayerBase player = PlayerBase.Cast(m_DZPlayer);
+
+		if (object)
+		{
+			MiscGameplayFunctions.GetHeadBonePos(player, start);
+			end = start + MiscGameplayFunctions.GetHeadingVector(player) * vector.Distance(player.GetPosition(), object.GetPosition());
+			
+			if ( end == start )
+				return true; //! not possible to trace when this happens (zero length raycast)
+
+			return DayZPhysics.RayCastBullet( start, end, collisionLayerMask, null, hitObject, hitPosObstructed, hitNormal, hitFraction);
+		}
+
+		return false;
+	}
+	
+	private bool IsEntityBehindEntityInAngle(EntityAI source, EntityAI target, float angle)
+	{
+		vector targetDirection = target.GetDirection();
+		ZombieBase targetZombie;
+		if (Class.CastTo(targetZombie, target))
+		{
+			targetDirection = Vector(targetZombie.GetOrientationSynced(),0,0);
+			targetDirection = targetDirection.AnglesToVector();
+		}
+		vector toSourceDirection = (source.GetPosition() - target.GetPosition());
+
+		targetDirection[1] = 0;
+		toSourceDirection[1] = 0;
+
+		targetDirection.Normalize();
+		toSourceDirection.Normalize();
+
+		float cosFi = vector.Dot(targetDirection, toSourceDirection);
+		vector cross = targetDirection * toSourceDirection;
+
+		int hitDir = Math.Acos(cosFi) * Math.RAD2DEG;
+		
+		if (cross[1] < 0)
+			hitDir = -hitDir;
+		
+		return hitDir <= (-180 + angle) || hitDir >= (180 - angle);
+	}
+	
+#ifdef DIAG_DEVELOPER
+	// ------------------------------------------------------------
+	// DEBUG
+	// ------------------------------------------------------------
+	protected ref array<Shape> dbgConeShapes = new array<Shape>();
+	protected ref array<Shape> dbgTargets = new array<Shape>();
+	protected ref array<Shape> hitPosShapes = new array<Shape>();
+	
+	void Debug(InventoryItem weapon, EMeleeHitType hitType)
+	{
+		CleanAllDebugShapes();
+		
+		if (!DiagMenu.GetBool(DiagMenuIDs.MELEE_DEBUG))
+			return;
+
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_CONTINUOUS) && (!GetGame().IsMultiplayer() || !GetGame().IsServer()))
+			Update(weapon, hitType);
+
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_SHOW_TARGETS))
+			ShowDebugMeleeTarget();
+		
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DRAW_TARGETS))
+			DrawDebugTargets();
+		
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DRAW_RANGE))
+		{
+			DrawDebugMeleeHitPosition();
+			DrawDebugMeleeCone();
+		}
+		
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DRAW_BLOCK_RANGE_AI))
+			DrawDebugBlockCone(GameConstants.AI_MAX_BLOCKABLE_ANGLE, COLOR_GREEN);
+		
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DRAW_BLOCK_RANGE_PVP))
+			DrawDebugBlockCone(GameConstants.PVP_MAX_BLOCKABLE_ANGLE, COLOR_YELLOW);
+	}
+	
+	int DebugGetForcedFinisherType()
+	{
+		return m_DebugForcedFinisherType;
+	}
+	
+	void DebugSetForcedFinisherType(int pFinisherType)
+	{
+		m_DebugForcedFinisherType = pFinisherType;
+	}	
+
+	//! shows target in DbgUI 'window'
+	protected void ShowDebugMeleeTarget()
+	{
+		int windowPosX = 0;
+		int windowPosY = 500;
+
+		DbgUI.Begin("Melee Target", windowPosX, windowPosY);
+		HumanCommandMelee2 hmc2 = m_DZPlayer.GetCommand_Melee2();
+		if (hmc2)		
+		{
+			DbgUI.Text("Current combo: " + hmc2.GetComboCount());
+		}
+
+		if (m_PreviousTargetObject)
+		{
+			DbgUI.Text("Previous Character: " + m_PreviousTargetObject.GetDisplayName());
+			DbgUI.Text("Previous HitZone: " + m_PreviousHitZoneName + "(" + m_PreviousHitZoneIdx + ")");
+			DbgUI.Text("Previous HitPosWS:" + m_PreviousHitPositionWS);
+			DbgUI.Text("Previous Distance:" + vector.Distance(m_PreviousHitPositionWS, m_DZPlayer.GetPosition()));
+		}
+
+		if (m_TargetObject)
+		{
+			DbgUI.Text("Character: " + m_TargetObject.GetDisplayName());
+			DbgUI.Text("HitZone: " + m_HitZoneName + "(" + m_HitZoneIdx + ")");
+			DbgUI.Text("HitPosWS:" + m_HitPositionWS);
+			DbgUI.Text("Distance:" + vector.Distance(m_HitPositionWS, m_DZPlayer.GetPosition()));
+		}
+		DbgUI.End();
+	}
+
+	//! shows debug sphere above the target
+	protected void DrawDebugTargets()
+	{
+		DrawDebugTargetsHelper(m_AllPreviousTargetObjects, m_PreviousTargetObject, COLOR_RED_A, COLOR_YELLOW_A);
+		DrawDebugTargetsHelper(m_AllTargetObjects, m_TargetObject, COLOR_RED, COLOR_YELLOW);
+	}
+	
+	protected void DrawDebugTargetsHelper(array<Object> allTargets, Object target, int colorMainTarget, int colorTarget)
+	{
+		for (int i = 0; i < allTargets.Count(); ++i )
+		{
+			if ( m_TargetObject && allTargets.Count() )
+			{
+				Object obj = allTargets[i];
+				vector w_pos = obj.GetPosition();
+				// sphere pos tweaks
+				vector w_pos_sphr = w_pos;
+				w_pos_sphr[1] = w_pos_sphr[1] + 1.8;
+				// line pos tweaks
+				vector w_pos_lend = w_pos;
+				w_pos_lend[1] = w_pos_lend[1] + 1.8;
+					
+				if ( obj == m_TargetObject )
+				{
+					dbgTargets.Insert( Debug.DrawSphere(w_pos_sphr, 0.05, colorMainTarget, ShapeFlags.NOOUTLINE) );
+					dbgTargets.Insert( Debug.DrawLine(w_pos, w_pos_lend, colorMainTarget) );
+				}
+				else
+				{
+					dbgTargets.Insert( Debug.DrawSphere(w_pos_sphr, 0.05, colorTarget, ShapeFlags.NOOUTLINE) );
+					dbgTargets.Insert( Debug.DrawLine(w_pos, w_pos_lend, colorTarget) );
+				}
+			}
+		}
+	}
+	
+	protected void DrawDebugMeleeHitPosition()
+	{	
+		if (m_PreviousTargetObject)
+			hitPosShapes.Insert( Debug.DrawSphere(m_PreviousHitPositionWS, 0.15, COLOR_YELLOW_A, ShapeFlags.NOOUTLINE|ShapeFlags.TRANSP) );
+		
+		if (m_TargetObject)
+			hitPosShapes.Insert( Debug.DrawSphere(m_HitPositionWS, 0.15, COLOR_YELLOW, ShapeFlags.NOOUTLINE|ShapeFlags.TRANSP) );			
+	}
+		
+	protected void DrawDebugMeleeCone()
+	{
+		// cone settings
+		float dist = GetRange();
+		vector start = m_DZPlayer.GetPosition();
+					
+		vector normDir = MiscGameplayFunctions.GetHeadingVector(PlayerBase.Cast(m_DZPlayer));
+		normDir[1] = 0;
+		normDir.Normalize();
+		float playerAngle = -Math.Atan2(normDir[0], normDir[2]);		
+			
+		dbgConeShapes.InsertArray(Debug.DrawCone(start, dist, GetAngle() * Math.DEG2RAD, playerAngle + Math.PI_HALF, COLOR_BLUE));
+	}
+
+	protected void DrawDebugBlockCone(float angle, int color)
+	{
+		// cone settings
+		float dist = 3;
+		vector start = m_DZPlayer.GetPosition();
+					
+		vector dir = GetGame().GetCurrentCameraDirection();
+		dir[1] = 0;
+		dir.Normalize();
+		float playerAngle = -Math.Atan2(dir[0], dir[2]);
+		
+		dbgConeShapes.InsertArray(Debug.DrawCone(start, dist, angle * Math.DEG2RAD, playerAngle + Math.PI_HALF, color));
+	}
+	
+	protected void CleanAllDebugShapes()
+	{
+		CleanupDebugShapes(dbgTargets);
+		CleanupDebugShapes(dbgConeShapes);
+		CleanupDebugShapes(hitPosShapes);
+	}
+
+	protected void CleanupDebugShapes(array<Shape> shapes)
+	{
+		for ( int it = 0; it < shapes.Count(); ++it )
+			Debug.RemoveShape( shapes[it] );
+
+		shapes.Clear();
+	}
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementSwimming.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementSwimming.c
new file mode 100644
index 0000000000000000000000000000000000000000..fb6d8d036cd2b0482fbe7bfc3aff41a3f7da77f4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementSwimming.c
@@ -0,0 +1,110 @@
+
+class DayZPlayerImplementSwimming
+{
+
+	DayZPlayer 					m_pPlayer;
+	SHumanCommandSwimSettings	m_pSettings;
+	bool						m_bWasSwimming = false; // important for shallow water, so we know if we should get back into swimming when other fullbody command (like damage) finished
+
+	void DayZPlayerImplementSwimming(DayZPlayer pPlayer)
+	{
+		m_pPlayer 	= pPlayer;
+		m_pSettings	= pPlayer.GetDayZPlayerType().CommandSwimSettingsW();
+	}
+
+	float  GetWaterDepth()
+	{
+		vector 	pp = m_pPlayer.GetPosition();
+		vector  wl = HumanCommandSwim.WaterLevelCheck(m_pPlayer, pp);
+
+		return wl[0];
+	}
+
+	float  GetCharacterDepth()
+	{
+		vector 	pp = m_pPlayer.GetPosition();
+		vector  wl = HumanCommandSwim.WaterLevelCheck(m_pPlayer, pp);
+
+		return wl[1];
+	}
+
+	bool CheckSwimmingStart(out vector waterLevel)
+	{
+		return DayZPlayerUtils.CheckWaterLevel(m_pPlayer,waterLevel) == EWaterLevels.LEVEL_SWIM_START;
+	}
+
+	//! ha
+	bool HandleSwimming(int pCurrentCommandID, HumanCommandMove pCMove, HumanMovementState pState)
+	{	
+		if ( pCurrentCommandID == DayZPlayerConstants.COMMANDID_UNCONSCIOUS || pCurrentCommandID == DayZPlayerConstants.COMMANDID_DAMAGE )
+			return false;
+		
+		m_bWasSwimming = false;
+
+		//! get water level 
+		if (pCurrentCommandID != DayZPlayerConstants.COMMANDID_SWIM)
+		{
+			vector wl;
+			if (CheckSwimmingStart(wl))
+			{
+				m_pPlayer.StartCommand_Swim();
+				m_bWasSwimming = true;
+				return true;
+			}
+			
+			//! now movement
+			if ((pCurrentCommandID == DayZPlayerConstants.COMMANDID_MOVE) && (pCMove != null))
+			{
+				pCMove.SetCurrentWaterLevel(wl[1]);
+				m_pPlayer.SetCurrentWaterLevel(wl[1]);
+				
+				if (wl[1] > m_pSettings.m_fToErectLevel && pState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_ERECT && pState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_RAISEDERECT )
+				{
+					if ( DayZPlayerUtils.PlayerCanChangeStance(m_pPlayer, DayZPlayerConstants.STANCEIDX_ERECT) )
+					{
+						pCMove.ForceStanceUp(DayZPlayerConstants.STANCEIDX_ERECT);
+					}
+					else
+					{
+						m_pPlayer.StartCommand_Swim();
+						m_bWasSwimming = true;
+						return true;
+					}
+				}
+				else if (wl[1] > m_pSettings.m_fToCrouchLevel && (pState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_PRONE || pState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE))
+				{
+					if ( DayZPlayerUtils.PlayerCanChangeStance(m_pPlayer, DayZPlayerConstants.STANCEIDX_CROUCH) )
+					{
+						pCMove.ForceStanceUp(DayZPlayerConstants.STANCEIDX_CROUCH);
+					}
+					else
+					{
+						m_pPlayer.StartCommand_Swim();
+						m_bWasSwimming = true;
+						return true;
+					}
+				}
+			}
+
+			// not handled 
+			return false;
+		}
+		else // if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_SWIM)
+		{
+			if (GetWaterDepth() < m_pSettings.m_fWaterLevelOut)
+			{
+				if (DayZPlayerUtils.PlayerCanChangeStance(m_pPlayer, DayZPlayerConstants.STANCEIDX_ERECT, true))
+				{
+					HumanCommandSwim hcs = m_pPlayer.GetCommand_Swim();
+					hcs.StopSwimming();
+					m_bWasSwimming = false;
+					return true;
+				}
+			}
+		
+			//! handled !
+			m_bWasSwimming = true;
+			return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementThrowing.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementThrowing.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a1e5abb2843ec1672e9be3aca7facb1243efb2d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementThrowing.c
@@ -0,0 +1,240 @@
+class DayZPlayerImplementThrowing
+{
+	void DayZPlayerImplementThrowing(DayZPlayer pPlayer)
+	{
+		m_Player = pPlayer;
+		SetThrowingModeEnabled(false);
+		
+		ResetState();
+	}
+	
+	void HandleThrowing(HumanInputController pHic, HumanCommandWeapons pHcw, EntityAI pEntityInHands, float pDt)
+	{
+		if ( !pEntityInHands && !m_bThrowingAnimationPlaying )
+		{
+			if ( m_bThrowingModeEnabled )
+			{
+				SetThrowingModeEnabled(false);
+				pHcw.SetThrowingMode(false);
+			}
+			
+			return;
+		}
+		
+		//! current state
+		SetThrowingModeEnabled(pHcw.IsThrowingMode());
+		
+		//! handle mode change
+		if ( pHic.IsThrowingModeChange() && CanChangeThrowingStance(pHic) )
+		{
+			ResetState();
+			
+			pHcw.SetActionProgressParams(0, 0);
+			pHcw.SetThrowingMode(!m_bThrowingModeEnabled);
+		}
+		
+		//! handle action
+		if ( m_bThrowingModeEnabled )
+		{
+			//! cancel throwing in case of raising hands or heavy item in hands
+			
+			if ( !CanContinueThrowingEx(pHic, pEntityInHands) )
+			{
+				SetThrowingModeEnabled(false);
+				ResetState();
+			
+				pHcw.SetActionProgressParams(0, 0);
+				pHcw.SetThrowingMode(false);
+				
+				return;
+			}
+			
+			//! check event for throw
+			if ( pHcw.WasItemLeaveHandsEvent() )
+			{
+				float lr = pHcw.GetBaseAimingAngleLR();
+				float ud = pHcw.GetBaseAimingAngleUD();
+				vector aimOrientation = m_Player.GetOrientation();
+				aimOrientation[0] = aimOrientation[0] + lr;
+				
+				//add 5 deg 
+				aimOrientation[1] = aimOrientation[1] + ud + 5;
+
+
+				m_Player.GetHumanInventory().ThrowEntity(pEntityInHands, aimOrientation.AnglesToVector(), c_fThrowingForceMin + m_fThrowingForce01 * (c_fThrowingForceMax - c_fThrowingForceMin));
+				return;
+			}
+
+			//! handle throw force
+			if ( !m_bThrowingAnimationPlaying )
+			{
+				if ( pHic.IsAttackButton() )
+				{
+					if ( !m_bThrowingInProgress )
+						m_bThrowingInProgress = true;
+					
+					m_fThrowingForce01 += pDt * c_fThrowingForceCoef;
+					if ( m_fThrowingForce01 > 1.0 )
+						m_fThrowingForce01 = 1.0;
+					
+					pHcw.SetActionProgressParams(m_fThrowingForce01, 0);
+				}
+				else
+				{
+					HumanCommandMove hcm = m_Player.GetCommand_Move();
+					bool standingFromBack = hcm && hcm.IsStandingFromBack();
+					
+					if ( m_bThrowingInProgress && !standingFromBack)
+					{
+						m_bThrowingInProgress = false;
+						
+						int throwType = 1;
+						
+						HumanItemBehaviorCfg itemCfg = m_Player.GetItemAccessor().GetItemInHandsBehaviourCfg();
+						itemCfg = m_Player.GetItemAccessor().GetItemInHandsBehaviourCfg();
+						if ( itemCfg )
+						{
+							switch ( itemCfg.m_iType )
+							{
+								case ItemBehaviorType.TWOHANDED:
+								case ItemBehaviorType.POLEARMS:
+									throwType = 2;
+									break;
+								case ItemBehaviorType.FIREARMS:
+									throwType = 3;
+							}
+						}
+						
+						pHcw.ThrowItem(throwType);
+						m_bThrowingAnimationPlaying = true;
+					}
+				}
+			}
+		}
+		else
+		{
+			ResetState();
+		}
+	}
+	
+	void ResetState()
+	{
+		m_fThrowingForce01 = 0;
+		m_bThrowingInProgress = false;
+		m_bThrowingAnimationPlaying = false;
+	}
+	
+	void SetThrowingModeEnabled(bool enable)
+	{
+		if (enable != m_bThrowingModeEnabled)
+		{
+			m_Player.OnThrowingModeChange(enable);
+		}
+		m_bThrowingModeEnabled = enable;
+	}
+	
+	bool IsThrowingModeEnabled()
+	{
+		return m_bThrowingModeEnabled;
+	}
+	
+	//! Throwing wind-up only (button hold)
+	bool IsThrowingInProgress()
+	{
+		return m_bThrowingInProgress;
+	}
+	
+	//! Throwing animation after button release
+	bool IsThrowingAnimationPlaying()
+	{
+		return m_bThrowingAnimationPlaying;
+	}
+	
+	bool CanChangeThrowingStance(HumanInputController pHic)
+	{
+		// basic stance has priority
+		if( pHic.IsStanceChange() )
+			return false;
+		
+		// don't change mode in raise
+		if( pHic.IsWeaponRaised() )
+			return false;
+			
+		// check if it's not a heavy item
+		HumanItemBehaviorCfg itemCfg = m_Player.GetItemAccessor().GetItemInHandsBehaviourCfg();
+		if( itemCfg && itemCfg.m_iType == ItemBehaviorType.HEAVY )
+			return false;
+		
+/*		HumanMovementState movementState = new HumanMovementState();
+		m_Player.GetMovementState(movementState);
+		if( movementState.IsInProne() )
+			return false;*/
+		
+		PlayerBase playerPB = PlayerBase.Cast(m_Player);
+		if( playerPB )
+		{
+			if( playerPB.GetEmoteManager().IsEmotePlaying() )
+				return false;
+		
+			if( playerPB.GetActionManager().GetRunningAction() != NULL )
+				return false;
+		
+			if( playerPB.IsRestrained() || playerPB.IsItemsToDelete())
+				return false;
+		
+			if( playerPB.GetDayZPlayerInventory().IsProcessing() )
+				return false;
+		
+			if( playerPB.GetWeaponManager().IsRunning() )
+				return false;
+		}
+		
+		if (!CheckFreeSpace() )
+			return false;
+
+		return true;
+	}
+	
+	bool CanContinueThrowing(HumanInputController pHic)
+	{
+		HumanItemBehaviorCfg itemInHandsCfg = m_Player.GetItemAccessor().GetItemInHandsBehaviourCfg();
+		bool boo = false;
+		UAInterface input_interface = m_Player.GetInputInterface();
+		if(input_interface && input_interface.SyncedPress("UAGear"))
+		{
+			boo = true;
+		}
+		if( boo || pHic.IsWeaponRaised() || (itemInHandsCfg && itemInHandsCfg.m_iType == ItemBehaviorType.HEAVY) )
+		{
+			return false;
+		}
+		
+		if (!CheckFreeSpace() )
+			return false;
+
+		return true;
+	}
+	
+	bool CanContinueThrowingEx(HumanInputController pHic, EntityAI pEntityInHands)
+	{
+		if ( pEntityInHands == null )
+			return false;
+		
+		return CanContinueThrowing(pHic);
+	}
+	
+	bool CheckFreeSpace()
+	{
+		return m_Player.CheckFreeSpace(vector.Forward, 0.7, false);
+	}
+	
+	private DayZPlayer m_Player;
+	private bool m_bThrowingModeEnabled;
+	private bool m_bThrowingInProgress;
+	private bool m_bThrowingAnimationPlaying;
+	private float m_fThrowingForce01;
+	
+	private const float c_fThrowingForceMin = 20.0;
+	private const float c_fThrowingForceMax = 90.0;
+	private const float c_fThrowingForceCoef = 1.0;
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerImplementVehicle.c b/scripts/4_World/DayZ/Entities/DayZPlayerImplementVehicle.c
new file mode 100644
index 0000000000000000000000000000000000000000..dcbe79f19c4142be1fe617bc60c1f4f967d13ff3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerImplementVehicle.c
@@ -0,0 +1,26 @@
+class GearChangeActionCallback : HumanCommandActionCallback
+{	
+	// Left for backwards compatibility, but never ever store HumanCommandVehicle in a variable used later
+	HumanCommandVehicle m_hcv;
+	
+	void SetVehicleCommand(HumanCommandVehicle hcv)
+	{
+		//m_hcv = hcv;
+		hcv.SetClutchState(true);
+	}
+	
+	//Command events
+	override void OnFinish(bool pCanceled)	
+	{
+		Human owner = GetHuman();
+		if (owner)
+		{
+			HumanCommandVehicle hcv = owner.GetCommand_Vehicle();
+			if (hcv)
+			{
+				hcv.SetClutchState(false);
+			}
+		}
+	}	
+};
+
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerSyncJunctures.c b/scripts/4_World/DayZ/Entities/DayZPlayerSyncJunctures.c
new file mode 100644
index 0000000000000000000000000000000000000000..97f9fc350a1e8a013926d45a61fccff0f2f554d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerSyncJunctures.c
@@ -0,0 +1,427 @@
+// *************************************************************************************
+// ! DayZPlayerSyncJunctures - sync junctures for dayz player - static functions
+// *************************************************************************************
+class DayZPlayerSyncJunctures
+{
+	static const int SJ_DAMAGE_HIT						= 0;
+	static const int SJ_INJURY							= 1;
+	static const int SJ_ACTION_INTERRUPT				= 2;
+	static const int SJ_PLAYER_STATES					= 3;
+	static const int SJ_QUICKBAR_SET_SHORTCUT			= 4;
+	static const int SJ_INVENTORY						= 5;
+	static const int SJ_ACTION_ACK_ACCEPT				= 6;
+	static const int SJ_ACTION_ACK_REJECT				= 7;
+	static const int SJ_WEAPON_ACTION_ACK_ACCEPT		= 8;
+	static const int SJ_WEAPON_ACTION_ACK_REJECT		= 9;
+	static const int SJ_WEAPON_SET_JAMMING_CHANCE		= 10;
+	static const int SJ_UNCONSCIOUSNESS					= 11;
+	static const int SJ_DEATH					     	= 12;
+	static const int SJ_PLAYER_FB_MODIFIER				= 13;
+	static const int SJ_PLAYER_ADD_MODIFIER				= 14;
+	static const int SJ_KURU_REQUEST					= 15;
+	static const int SJ_GESTURE_REQUEST					= 16;
+	static const int SJ_INVENTORY_REPAIR				= 17;
+	static const int SJ_WEAPON_LIFT						= 18;
+	static const int SJ_WEAPON_RAISE_COMPLETED			= 19;
+	static const int SJ_DELETE_ITEM						= 20;
+	static const int SJ_BROKEN_LEGS						= 21;
+	static const int SJ_SHOCK							= 22;
+	static const int SJ_STAMINA							= 23;
+	static const int SJ_STAMINA_MISC					= 24;
+	static const int SJ_ADS_RESET						= 25;
+	static const int SJ_INVENTORY_FAILURE				= 26;
+	#ifdef DEVELOPER
+	static const int SJ_DEBUG_GET_IN_CAR				= 200;
+	#endif
+	
+	
+	#ifdef DEVELOPER
+	//-------------------------------------------------------------
+	//!
+	//!Get in Car
+	//! 
+
+	static void SendGetInCar(DayZPlayer pPlayer, EntityAI car)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(car);
+		pPlayer.SendSyncJuncture(SJ_DEBUG_GET_IN_CAR, ctx);
+	}
+	
+	static bool ReadGetInCarParams(ParamsReadContext pCtx, out EntityAI car)
+	{
+		if (!pCtx.Read(car))
+			return false;
+		return true;
+	}
+	#endif
+	
+	//-------------------------------------------------------------
+	//!
+	//! Death
+	//! 
+
+	static void SendDeath(DayZPlayer pPlayer, int pType, float pHitDir)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		
+		ctx.Write(pType);
+		ctx.Write(pHitDir);
+		pPlayer.SendSyncJuncture(SJ_DEATH, ctx);
+	}
+	
+	static bool ReadDeathParams(ParamsReadContext pCtx, out int pType, out float pHitDir)
+	{
+		if (!pCtx.Read(pType))
+			return false;
+		if (!pCtx.Read(pHitDir))
+			return false;
+
+		return true;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! DamageHit
+	//! 
+
+	static void SendDamageHit(DayZPlayer pPlayer, int pType, float pHitDir, bool pFullbody)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		
+		ctx.Write(pType);
+		ctx.Write(pHitDir);
+		ctx.Write(pFullbody);
+		pPlayer.SendSyncJuncture(SJ_DAMAGE_HIT, ctx);
+	}
+	
+	static void SendDamageHitEx(DayZPlayer pPlayer, int pType, float pHitDir, bool pFullbody, TotalDamageResult pDamageResult, int pDamageType, EntityAI pSource, string pComponent, string pAmmoType, vector pModelPos)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		SyncHitInfo data = new SyncHitInfo;
+		
+		data.m_AnimType = pType;
+		data.m_HitDir = pHitDir;
+		data.m_Fullbody = pFullbody;
+		data.m_HasSource = pSource != null;
+		if ( !pDamageResult )
+		{
+			data.m_HealthDamage = -1.0;
+		}
+		else
+		{
+			data.m_HealthDamage = pDamageResult.GetHighestDamage("Health");
+		}
+		
+		ctx.Write(data);
+		pPlayer.SendSyncJuncture(SJ_DAMAGE_HIT, ctx);
+	}
+	
+	static bool ReadDamageHitParams(ParamsReadContext pCtx, out int pType, out float pHitDir, out bool pFullbody)
+	{
+		if (!pCtx.Read(pType))
+			return false;
+		if (!pCtx.Read(pHitDir))
+			return false;
+		if (!pCtx.Read(pFullbody))
+			return false;	
+		return true;
+	}
+	
+	static bool ReadDamageHitParamsEx(ParamsReadContext pCtx, out SyncHitInfo pData)
+	{
+		if (!pCtx.Read(pData))
+			return false;
+		return true;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! Injury
+	//! 
+	
+	static void SendInjury(DayZPlayer pPlayer, bool pEnable, eInjuryHandlerLevels level)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(pEnable);
+		ctx.Write(level);
+
+		pPlayer.SendSyncJuncture(SJ_INJURY, ctx);
+	}
+	
+	static bool ReadInjuryParams(ParamsReadContext pCtx, out bool pEnable, out eInjuryHandlerLevels level)
+	{
+		if ( !pCtx.Read(pEnable) )
+			return false; // error		
+		if ( !pCtx.Read(level) )
+			return false; // error
+		
+		return true;
+	}
+
+	//-------------------------------------------------------------
+	//!
+	//! Conscious / Unconscious
+	//! 
+	
+	static void SendPlayerUnconsciousness(DayZPlayer pPlayer, bool enable)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+
+		ctx.Write(enable);
+		
+		pPlayer.SendSyncJuncture(SJ_UNCONSCIOUSNESS, ctx);
+	}
+	
+	static bool ReadPlayerUnconsciousnessParams(ParamsReadContext pCtx, out bool enable)
+	{
+		if ( !pCtx.Read(enable) )
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Full body
+	//! 
+	
+	static void SendPlayerFBModifier(PlayerBase pPlayer, int type)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(type);
+		
+		pPlayer.SendSyncJuncture(SJ_PLAYER_FB_MODIFIER, ctx);
+	}
+	
+	static bool ReadPlayerFBModifier(ParamsReadContext pCtx, out int type)
+	{
+		if ( !pCtx.Read(type) )
+			return false; // error
+		return true;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Additive Symptoms
+	//!
+	
+	static void SendPlayerSymptomADD(DayZPlayer pPlayer, int type, int state_type)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(state_type);
+		ctx.Write(type);
+
+
+		pPlayer.SendSyncJuncture(SJ_PLAYER_ADD_MODIFIER, ctx);
+	}
+	
+	static bool ReadPlayerSymptomADDParams(ParamsReadContext pCtx, out int type)
+	{
+		if ( !pCtx.Read(type) )
+			return false; // error		
+		return true;
+	}
+	
+	
+	//-------------------------------------------------------------
+	//!
+	//! Full body Symptoms
+	//! 
+	
+	static void SendPlayerSymptomFB(DayZPlayer pPlayer, DayZPlayerConstants anim_id, int state_type, int stance_mask, float duration)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(state_type);
+		ctx.Write(anim_id);
+		ctx.Write(stance_mask);
+		ctx.Write(duration);
+		//ctx.Write(pPlayer);
+		
+		pPlayer.SendSyncJuncture(SJ_PLAYER_STATES, ctx);
+	}
+	
+	static bool ReadPlayerSymptomFBParams(ParamsReadContext pCtx, out DayZPlayerConstants anim_id, out int stance_mask, out float duration)
+	{
+		if ( !pCtx.Read(anim_id) )
+			return false; // error
+		if ( !pCtx.Read(stance_mask) )
+			return false; // error
+		if ( !pCtx.Read(duration) )
+			return false; // error
+		//if ( !pCtx.Read(pPlayer) )
+			//return false; // error
+		return true;
+	}
+
+
+	//-------------------------------------------------------------
+	//!
+	//! Action interrupt
+	//! 
+	
+	static void SendActionInterrupt(DayZPlayer pPlayer)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		pPlayer.SendSyncJuncture(SJ_ACTION_INTERRUPT, ctx);
+	}
+	
+	static bool ReadActionInterruptParams(ParamsReadContext pCtx)
+	{		
+		return true;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Action Acknowledgment
+	//! 
+	static void SendActionAcknowledgment(DayZPlayer pPlayer, int AckID, bool accept)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(AckID);
+		if (accept)
+			pPlayer.SendSyncJuncture(SJ_ACTION_ACK_ACCEPT, ctx);
+		else
+			pPlayer.SendSyncJuncture(SJ_ACTION_ACK_REJECT, ctx);
+	}
+	
+	
+	static void SendWeaponActionAcknowledgment(DayZPlayer pPlayer, int AckID, bool accept)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(AckID);
+		if (accept)
+			pPlayer.SendSyncJuncture(SJ_WEAPON_ACTION_ACK_ACCEPT, ctx);
+		else
+			pPlayer.SendSyncJuncture(SJ_WEAPON_ACTION_ACK_REJECT, ctx);
+	}
+		
+	//-------------------------------------------------------------
+	//!
+	//! Kuru Disease Shake
+	//! 
+	
+	static bool ReadKuruRequest(ParamsReadContext pCtx, out float amount)
+	{
+		if ( !pCtx.Read(amount) )
+			return false; // error		
+		return true;
+	}
+	
+	static void SendKuruRequest(DayZPlayer pPlayer, float amount)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(amount);
+		pPlayer.SendSyncJuncture(SJ_KURU_REQUEST, ctx);
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Quickbar
+	//! 
+	
+	static void SendQuickbarSetShortcut(DayZPlayer pPlayer, EntityAI item, int index, bool force = false )
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(item);
+		ctx.Write(index);
+		ctx.Write(force);
+
+		pPlayer.SendSyncJuncture(SJ_QUICKBAR_SET_SHORTCUT, ctx);
+	}
+	
+	static void SendWeaponJamChance(DayZPlayer pPlayer, float jamChance )
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(jamChance);
+
+		pPlayer.SendSyncJuncture(SJ_WEAPON_SET_JAMMING_CHANCE, ctx);
+	}
+
+	/*static bool ReadQuickbarSetShortcut(ParamsReadContext pCtx, out EntityAI item, out int index)
+	{	
+		Param2<EntityAI,int> shortcutParam = new Param2<EntityAI,int>(NULL,-1);
+		if( pCtx.Read(shortcutParam))
+		{
+			item = shortcutParam.param1;
+			index = shortcutParam.param2;
+			return true;	
+		}
+
+		return false;
+	}*/
+	
+	static void SendDeleteItem( DayZPlayer pPlayer, EntityAI item )
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(item);
+
+		pPlayer.SendSyncJuncture(SJ_DELETE_ITEM, ctx);
+	}
+	
+	
+	//-------------------------------------------------------------
+	//!
+	//! BrokenLegs
+	//! 
+	
+	static void SendBrokenLegs(DayZPlayer pPlayer, bool canPlaySound, eBrokenLegs currentState, eBrokenLegs localState)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(canPlaySound);
+		ctx.Write(currentState);
+		ctx.Write(localState);
+
+		pPlayer.SendSyncJuncture(SJ_BROKEN_LEGS, ctx);
+	}
+	
+	static bool ReadBrokenLegsParams(ParamsReadContext pCtx, out bool canPlaySound, out eBrokenLegs currentState, out eBrokenLegs localState)
+	{
+		if ( !pCtx.Read(canPlaySound) )
+			return false; // error		
+		if ( !pCtx.Read(currentState) )
+			return false; // error
+		if ( !pCtx.Read(localState) )
+			return false;
+		
+		return true;
+	}
+	
+	static void SendBrokenLegsEx(DayZPlayer pPlayer, int currentState)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(currentState);
+
+		pPlayer.SendSyncJuncture(SJ_BROKEN_LEGS, ctx);
+	}
+	
+	static bool ReadBrokenLegsParamsEx(ParamsReadContext pCtx, out int currentState)
+	{
+		if ( !pCtx.Read(currentState) )
+			return false;
+		
+		return true;
+	}
+	
+	//-------------------------------------------------------------
+	//!
+	//! Shock
+	//! 
+	
+	static void SendShock(DayZPlayer pPlayer, float shockValue)
+	{
+		ScriptJunctureData ctx = new ScriptJunctureData;
+		ctx.Write(shockValue);
+
+		pPlayer.SendSyncJuncture(SJ_SHOCK, ctx);
+	}
+	
+	static bool ReadShockParams(ParamsReadContext pCtx, out float shockValue)
+	{
+		if ( !pCtx.Read(shockValue) )
+			return false; // error
+		
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/DayZPlayerUtils.c b/scripts/4_World/DayZ/Entities/DayZPlayerUtils.c
new file mode 100644
index 0000000000000000000000000000000000000000..37632be5bc949c7583ba5166991f10a64d047770
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZPlayerUtils.c
@@ -0,0 +1,503 @@
+enum QueryFlags
+{
+	NONE,
+	//! Static objects are included in the query
+	STATIC,
+	//! Dynamic objects are included in the query
+	DYNAMIC,
+	//! Check only distance to object origins, not BB
+	ORIGIN_DISTANCE,
+	//! Only roadways are included in the query
+	ONLY_ROADWAYS,
+}
+
+// *************************************************************************************
+// ! DayZPlayerUtils - some utils used for dayz player - static functions
+// *************************************************************************************
+class DayZPlayerUtils
+{
+	//--------------------------------------------------
+	// Debug Draw
+	
+	//! enables debug draw in functions 
+	static proto native void 		EnableDebugDraw(bool pEnable);
+	static proto native void 		DrawDebugText(string text, vector pos, float size);
+
+	//! clear info - new draw starts
+	static proto native void 		DrawStartFrame();	
+	//! draws debug box (color=red)
+	static proto native void 		DrawDebugBox(vector pos, float size, int color);
+
+
+	//--------------------------------------------------
+	// animation override
+
+	//! overrides total animation translation
+	static proto native bool		DebugOverrideAnimationTranslation(string pAnimName, vector pTranslation);	
+	
+	//! overrides total animation rotation
+	static proto native bool		DebugOverrideAnimationRotation(string pAnimName, vector pRotation);	
+	
+	//! overrides total animation speed
+	static proto native bool		DebugOverrideAnimationSpeed(string pAnimName, float pSpeed);	
+
+
+	//--------------------------------------------------
+	// 
+
+	//! pLimits in form   Xvalue, Ymin, Ymax,   Xvalue1, Ymin1, Ymax1, .... 
+	//! sample 	0, 0, 5, 	1, 2, 3, 	2, 0, 1
+
+	//! for X <= 0 it clamps Y to Rangle (0,5) 	
+	//! for X == 0.5 it clamps Y to Rangle (1,4) 	
+	//! for X == 1 it clamps Y to Rangle (2,3) 	
+	//! for X == 1.5 it clamps Y to Rangle (1,2) 	
+	//! for X >= 2 it clamps Y to Rangle (0,1) 	
+	
+	static proto float 				LinearRangeClamp(float pValueX, float pValueY, float pLimits[]);
+
+
+
+
+	//--------------------------------------------------
+	// From Physics World
+
+	//! returns entities  overlapping/touching in AABB box -
+	static proto native void 		PhysicsGetEntitiesInBox(vector min, vector max, notnull out array<EntityAI> entList);
+
+
+
+
+	//--------------------------------------------------
+	// From Scene
+
+	//! returns entities overlapping/touching in AABB box - 
+	static proto native void 		SceneGetEntitiesInBox(vector min, vector max, notnull out array<EntityAI> entList, int flags = QueryFlags.DYNAMIC);
+
+
+
+	//--------------------------------------------------
+	// Custom player functions
+
+	/**@fn		GetEntitiesInCone
+	 * @brief	returns entities in height-extended 2D cone
+	 * @param[in]	angle 	\p 	angle in degrees
+	 * @param[in]	minHeigh	\p cone 3D-extension Y min
+	 * @param[in]	maxHeight	\p cone 3D-extension Y max
+	 * @note		the detection hits points/faces from ANY non-edit model geometry, including resolution LODs, regardless of animation hiding (scaling). That is why certain animated objects, like flags in folded state, get detected from significant distance away!
+	 **/
+	static proto native void 		GetEntitiesInCone(vector pos, vector dir, float angle, float dist, float minHeigh, float maxHeight, out array<Object> entList);
+
+
+
+	//! returns fight target
+	static Object 				GetMeleeTarget(vector pos, vector dir, float angle, float dist, float minHeight, float maxHeight, EntityAI pToIgnore, array<typename> targetableObjects, out array<Object> allTargets = NULL)
+	{
+		// Print("In: GetFightTarget");
+		InitCachedEntList();
+
+		GetEntitiesInCone(pos, dir, angle, dist, minHeight, maxHeight, m_CachedEntList);
+		
+		Object ret		= NULL;
+		Object obj 		= NULL;
+
+		float 		retVal 	= dist * 2;		// max value 
+		float 		tgAngle = Math.Tan(Math.DEG2RAD * angle);
+
+		// DrawStartFrame();
+		
+		foreach(auto ent: m_CachedEntList)
+		{		
+			if (ent == pToIgnore)
+			{
+				continue;
+			}
+			
+			Class.CastTo(obj, ent);
+			if(obj)
+			{
+				// check for targetable objects
+				if( !obj.IsAnyInherited(targetableObjects) )
+					{ continue; }
+				
+				if( !obj.IsAlive() )
+					{ continue; }
+			}
+
+			vector entpos = ent.GetPosition();
+
+			vector diff 		= entpos - pos;
+			float  cDistSq 		= diff.LengthSq();
+			if (cDistSq > dist*dist)	// out of distance
+			{
+				//Print("out of distance");
+				continue;
+			}
+
+			float  frontDist 	= diff[0]*dir[0] + diff[2]*dir[2];
+			if (frontDist < 0.1) 	// behind the pos/dist half plane or further than dist
+			{
+				//Print("behind the pos/dist half plane or further than dist");
+				continue;
+			}
+		
+			vector project  = pos + dir * frontDist;
+			vector posdiff = Vector(project[0] - entpos[0], 0, project[2] - entpos[2]);
+			float sideDist = posdiff.LengthSq();
+
+			if (sideDist > tgAngle)	// out of cone
+			{
+				//Print("out of cone");
+				continue;
+			}
+
+			float  sum  	= frontDist + sideDist;
+			if (sum < retVal)
+			{
+				ret 	= ent;
+				retVal 	= sum;
+			}
+			else
+			{
+				//Print("sum !< retVal");
+			}
+
+			// string txt 		= project.ToString() + ": " + sum.ToString(); 
+			// DrawDebugBox(project,0.01,0xffff0000);
+			// DrawDebugBox(entpos,0.01,0xffff0000);
+			// DrawDebugText(txt, project, 1.0);
+			allTargets.Insert(ent);
+		}
+
+		return ret;
+	}
+	
+	static proto native bool PlayerCanChangeStance(DayZPlayer pPlayer, int pTargetStance, bool forceCheck = false);
+	
+	//! inventory DayZPlayer utils
+	
+	/**@fn		FindMagazinesForAmmo
+	 * @brief	searches inventory for all magazines that can hold specified ammo type
+	 * @param[in]	player 	\p 	DayZPlayer
+	 * @param[in]	ammoTypeName	\p	type name of the cartridge
+	 * @param[out]	mags	\p	array filled with suitable magazines
+	 * @returns		true if found at least one
+	 **/
+	static proto native bool FindMagazinesForAmmo(DayZPlayer player, string ammoTypeName, out array<Magazine> mags);
+	
+	/*static bool HandleEjectMagazine (DayZPlayer player, Weapon weapon, int muzzleIndex)
+	{
+		int slotId = weapon.GetSlotFromMuzzleIndex(muzzleIndex);
+		EntityAI att = weapon.FindAttachment(slotId);
+		if (att)
+		{
+			InventoryLocation loc = new InventoryLocation;
+			if (player.FindFreeLocationFor(att, loc))
+			{
+				return weapon.EjectMagazine(muzzleIndex, loc);
+			}
+		}
+		return false;
+	}*/
+
+	static Magazine SelectStoreCartridge(DayZPlayer player, Weapon_Base weapon, int muzzleIndex, Magazine exclude_mag, float damage, string magTypeName)
+	{
+		if (damage < 1.0)
+		{
+			// find suitable heap / mag (but not the excluded one)
+			ref array<Magazine> mags = new array<Magazine>;
+			if (DayZPlayerUtils.FindMagazinesForAmmo(player, magTypeName, mags))
+			{
+				int sz = mags.Count();
+				for (int i = 0; i < sz; ++i)
+				{
+					Magazine mag_i = mags.Get(i);
+					if (mag_i != exclude_mag && mag_i.CanAddCartridges(1))
+					{
+						return mag_i;
+					}
+				}
+			}
+			
+			// create a new one in inventory
+			InventoryLocation inv_loc = new InventoryLocation;
+			if (player.GetInventory().FindFirstFreeLocationForNewEntity(magTypeName, FindInventoryLocationType.ANY, inv_loc))
+			{
+				EntityAI eai_inv = SpawnEntity(magTypeName, inv_loc, ECE_IN_INVENTORY, RF_DEFAULT);
+				if (eai_inv && eai_inv.IsInherited(Magazine))
+				{
+					Magazine mag_inv;
+					if (Class.CastTo(mag_inv, eai_inv))
+					{
+						mag_inv.ServerSetAmmoCount(0);
+						return mag_inv;
+					}
+				}
+			}
+		}
+
+		vector pos = player.GetPosition();
+		EntityAI eai_gnd = player.SpawnEntityOnGroundPos(magTypeName, pos);
+		if (eai_gnd && eai_gnd.IsInherited(Magazine))
+		{
+			Magazine mag_gnd;
+			if (Class.CastTo(mag_gnd, eai_gnd))
+			{
+				mag_gnd.ServerSetAmmoCount(0);
+				return mag_gnd;
+			}
+		}
+
+		return NULL;
+	}
+
+	static bool HandleDropMagazine(DayZPlayer player, Magazine mag)
+	{
+		vector m4[4];
+		Math3D.MatrixIdentity4(m4);
+
+		//! We don't care if a valid transform couldn't be found, we just want to preferably use it instead of placing on the player
+		GameInventory.PrepareDropEntityPos(player, mag, m4, false, -1);
+		InventoryLocation il_mag_next = new InventoryLocation;
+		il_mag_next.SetGround(mag, m4);
+		InventoryLocation il_mag_curr = new InventoryLocation;
+		if (mag.GetInventory().GetCurrentInventoryLocation(il_mag_curr))
+		{
+			return GameInventory.LocationSyncMoveEntity(il_mag_curr, il_mag_next);
+		}
+		else
+		{
+			Error("DayZPlayerUtils::HandleDropMagazine - cannot get current inv location of mag=" + mag);
+			return false;
+		}
+	}
+	
+	static bool HandleDropCartridge(DayZPlayer player, float damage, string cartTypeName, string magTypeName)
+	{
+		vector pos = player.GetPosition();
+		EntityAI entityGround = player.SpawnEntityOnGroundPos(magTypeName, pos);
+		if (entityGround && entityGround.IsInherited(Magazine))
+		{
+			Magazine magazineGround;
+			if (Class.CastTo(magazineGround, entityGround))
+			{
+				magazineGround.ServerSetAmmoCount(0);
+				magazineGround.SetHealth("", "", (1 - damage) * magazineGround.GetMaxHealth());
+				if (magazineGround.ServerStoreCartridge(damage, cartTypeName))
+					return true;
+			}
+		}
+
+		return false;
+	}
+
+	static bool HandleStoreCartridge(DayZPlayer player, Weapon_Base weapon, int muzzleIndex, float damage, string cartTypeName, string magTypeName, bool CanDrop = true)
+	{
+		if (damage < 1.0)
+		{
+			//! find suitable heap / mag
+			array<Magazine> magazines = new array<Magazine>();
+			if (DayZPlayerUtils.FindMagazinesForAmmo(player, magTypeName, magazines))
+			{	
+				int healthLevel = -1;
+				float testHeatlh = 1 - damage;
+				foreach (Magazine magazine : magazines)
+				{
+					if (healthLevel == -1)
+					{
+						if (magazine.CanAddCartridges(1))
+						{
+							int numberOfHealthLevels = magazine.GetNumberOfHealthLevels();
+							for (int i = 1; i < numberOfHealthLevels; i++)
+							{
+								if (magazine.GetHealthLevelValue(i) < testHeatlh)
+								{
+									healthLevel = i - 1;
+									break;
+								}
+							}
+						}
+					}
+					
+					if (magazine.GetHealthLevel() == healthLevel)
+					{
+						if (magazine.ServerStoreCartridge(damage, cartTypeName))
+							return true;
+					}
+				}
+			}
+				
+			//! create a new one in inventory
+			InventoryLocation inventoryLocation = new InventoryLocation();
+			if (player.GetInventory().FindFirstFreeLocationForNewEntity(magTypeName, FindInventoryLocationType.ANY, inventoryLocation))
+			{
+				EntityAI entityInventory = SpawnEntity(magTypeName, inventoryLocation, ECE_IN_INVENTORY, RF_DEFAULT);
+				if (entityInventory && entityInventory.IsInherited(Magazine))
+				{
+					Magazine magazineInventory;
+					if (Class.CastTo(magazineInventory, entityInventory))
+					{
+						magazineInventory.ServerSetAmmoCount(0);
+						magazineInventory.SetHealth("", "", (1 - damage) * magazineInventory.GetMaxHealth());
+						if (magazineInventory.ServerStoreCartridge(damage, cartTypeName))
+							return true;
+					}
+				}
+			}
+		
+			//! drop on ground
+			if (CanDrop)
+				return HandleDropCartridge(player, damage, cartTypeName, magTypeName);
+		}
+
+		return false;
+	}
+	
+	/**@fn		InitComponentCollisions
+	 * @brief	initializes table of component collisions
+	 * @param[in]	player 	\p 	DayZPlayer
+	 * @param[in]	boxes	\p	array filled with box @see ComponentCollisionBox
+	 * @param[in]	capsules	\p	array filled with capsules @see ComponentCollisionCapsule
+	 * @returns		true if success
+	 **/
+	static proto native bool InitComponentCollisions(Human player, array<ref ComponentCollisionBox> boxes, array<ref ComponentCollisionCapsule> capsules);
+
+	/**@fn		IsComponentCollisionInitialized
+	 * @returns		true if already initialized
+	 **/
+	static proto native bool IsComponentCollisionInitialized();
+
+	/**@fn		ClearComponentCollisions
+	 **/
+	static proto native void ClearComponentCollisions();
+
+	static proto native vector GetMemoryPointPositionBoneRelative(DayZPlayer pPlayer, int pBoneIndex, int pPointIndex);
+	
+	static void InitPlayerComponentCollisions(Human player)
+	{
+		if (IsComponentCollisionInitialized())
+			Error("DayZPlayerUtils.InitComponentCollisions: already initialized!");
+
+		array<ref ComponentCollisionBox> b = new array<ref ComponentCollisionBox>;
+		b.Insert(new ComponentCollisionBox(0.40, 0.31, 0.31, "Pelvis", "Spine2"));
+		b.Insert(new ComponentCollisionBox(0.40, 0.31, 0.31, "Spine3", "Neck"));
+
+		array<ref ComponentCollisionCapsule> c = new array<ref ComponentCollisionCapsule>;
+		c.Insert(new ComponentCollisionCapsule(0.11, "Neck1", "Head"));
+		c.Insert(new ComponentCollisionCapsule(0.09, "LeftArm", "LeftArmRoll"));
+		c.Insert(new ComponentCollisionCapsule(0.08, "LeftForeArm", "LeftHand"));
+		c.Insert(new ComponentCollisionCapsule(0.09, "RightArm", "RightArmRoll"));
+		c.Insert(new ComponentCollisionCapsule(0.08, "RightForeArm", "RightHand"));
+		c.Insert(new ComponentCollisionCapsule(0.11, "LeftUpLeg", "LeftUpLegRoll"));
+		c.Insert(new ComponentCollisionCapsule(0.10, "LeftLeg", "LeftFoot"));
+		c.Insert(new ComponentCollisionCapsule(0.11, "RightUpLeg", "RightUpLegRoll"));
+		c.Insert(new ComponentCollisionCapsule(0.10, "RightLeg", "RightFoot"));
+
+		DayZPlayerUtils.InitComponentCollisions(player, b, c);
+	}
+	
+	static int ConvertStanceMaskToStanceIdx(int stanceMask)
+	{
+		switch (stanceMask)
+		{
+			case stanceMask & DayZPlayerConstants.STANCEMASK_PRONE:
+				return DayZPlayerConstants.STANCEIDX_PRONE;
+			
+			case stanceMask & DayZPlayerConstants.STANCEMASK_CROUCH:
+				return DayZPlayerConstants.STANCEIDX_CROUCH;
+			
+			case stanceMask & DayZPlayerConstants.STANCEMASK_ERECT:
+				return DayZPlayerConstants.STANCEIDX_ERECT;
+			
+			case stanceMask & DayZPlayerConstants.STANCEMASK_RAISEDPRONE:
+				return DayZPlayerConstants.STANCEIDX_RAISEDPRONE;
+			
+			case stanceMask & DayZPlayerConstants.STANCEMASK_RAISEDCROUCH:
+				return DayZPlayerConstants.STANCEIDX_RAISEDCROUCH;
+			
+			case stanceMask & DayZPlayerConstants.STANCEMASK_RAISEDERECT:
+				return DayZPlayerConstants.STANCEIDX_RAISEDERECT;
+		}
+		
+		return -1;
+	}
+	
+	static EWaterLevels CheckWaterLevel(DayZPlayer pPlayer, out vector waterLevel)
+	{
+		SHumanCommandSwimSettings swimData = pPlayer.GetDayZPlayerType().CommandSwimSettingsW();
+		vector 	pp = pPlayer.GetPosition();
+		waterLevel = HumanCommandSwim.WaterLevelCheck(pPlayer, pp);
+		
+		if (waterLevel[1] < swimData.m_fToCrouchLevel)
+		{
+			return EWaterLevels.LEVEL_LOW;
+		}
+		else if (waterLevel[1] >= swimData.m_fToCrouchLevel && waterLevel[1] < swimData.m_fToErectLevel)
+		{
+			return EWaterLevels.LEVEL_CROUCH;
+		}
+		else// if (waterLevel[1] >= swimData.m_fToErectLevel)
+		{
+			//! if total water depth >= 1.5m && character is 1.5m in water 
+			if (waterLevel[0] >= swimData.m_fWaterLevelIn && waterLevel[1] >= swimData.m_fWaterLevelIn)
+			{
+				return EWaterLevels.LEVEL_SWIM_START;
+			}
+			else
+			{
+				return EWaterLevels.LEVEL_ERECT;
+			}
+		}
+	}
+	
+	//------------------------------------------------	
+	// private data	
+
+
+	private static ref array<Object> 	m_CachedEntList;
+
+
+	//! cannot be instantiated 
+	private void DayZPlayerUtils()	{};
+
+	//!
+	private static 	void InitCachedEntList()
+	{
+		if (m_CachedEntList == NULL)
+		{
+			m_CachedEntList = new array<Object>;	
+		}
+
+		m_CachedEntList.Clear();
+	}
+}
+
+class ComponentCollisionBox
+{
+	vector m_Offset;
+	string m_BoneName0;
+	string m_BoneName1;
+
+	void ComponentCollisionBox(float x, float y, float z, string b0, string b1)
+	{
+		m_Offset[0] = x;
+		m_Offset[1] = y;
+		m_Offset[2] = z;
+		m_BoneName0 = b0;
+		m_BoneName1 = b1;
+	}
+};
+
+class ComponentCollisionCapsule
+{
+	float m_Radius;
+	string m_BoneName0;
+	string m_BoneName1;
+
+	void ComponentCollisionCapsule(float r, string b0, string b1)
+	{
+		m_Radius = r;
+		m_BoneName0 = b0;
+		m_BoneName1 = b1;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/DayZSpectator.c b/scripts/4_World/DayZ/Entities/DayZSpectator.c
new file mode 100644
index 0000000000000000000000000000000000000000..42f0c8f39e856d00dc63978aff83d64b3efa8454
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/DayZSpectator.c
@@ -0,0 +1,60 @@
+class DayZSpectator : Camera
+{
+	private float m_SpeedMultiplier = 1.0;
+	
+	private float m_SendUpdateAcc = 0.0;
+	
+	void DayZSpectator()
+	{
+		SetEventMask(EntityEvent.FRAME);
+	}
+	
+	override void EOnFrame(IEntity other, float timeSlice)
+	{
+		if (GetUApi().GetInputByID(UACarShiftGearUp).LocalPress())
+			m_SpeedMultiplier = m_SpeedMultiplier + 2;
+		if (GetUApi().GetInputByID(UACarShiftGearDown).LocalPress())
+			m_SpeedMultiplier = m_SpeedMultiplier - 2;
+		
+		float speed = 5.0 * m_SpeedMultiplier;
+		if (GetUApi().GetInputByID(UATurbo).LocalValue())
+			speed *= 2;
+		
+		float forward = GetUApi().GetInputByID(UAMoveForward).LocalValue() - GetUApi().GetInputByID(UAMoveBack).LocalValue();
+		float strafe = GetUApi().GetInputByID(UAMoveRight).LocalValue() - GetUApi().GetInputByID(UAMoveLeft).LocalValue();
+		
+		vector direction = GetDirection();
+		vector directionAside = vector.Up * direction;
+		
+		vector oldPos = GetPosition();
+		vector forwardChange = forward * timeSlice * direction * speed;
+		vector strafeChange = strafe * timeSlice * directionAside * speed;
+		vector newPos = oldPos + forwardChange + strafeChange;
+		float yMin = GetGame().SurfaceRoadY(newPos[0], newPos[2]);
+		if (newPos[1] < yMin)
+			newPos[1] = yMin;
+		
+		SetPosition(newPos);
+		
+		float yawDiff = GetUApi().GetInputByID(UAAimLeft).LocalValue() - GetUApi().GetInputByID(UAAimRight).LocalValue();
+		float pitchDiff = GetUApi().GetInputByID(UAAimDown).LocalValue() - GetUApi().GetInputByID(UAAimUp).LocalValue();
+		vector oldOrient = GetOrientation();
+		vector newOrient = oldOrient;
+		newOrient[0] = newOrient[0] - Math.RAD2DEG * yawDiff * timeSlice;
+		newOrient[1] = newOrient[1] - Math.RAD2DEG * pitchDiff * timeSlice;
+		if (newOrient[1] < -89)
+			newOrient[1] = -89;
+		if (newOrient[1] > 89)
+			newOrient[1] = 89;
+		
+		SetOrientation(newOrient);
+		
+		if (m_SendUpdateAcc > 0.5)
+		{
+			GetGame().UpdateSpectatorPosition(newPos);
+			m_SendUpdateAcc = 0;
+		}
+		
+		m_SendUpdateAcc = m_SendUpdateAcc + timeSlice;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ExplosivesBase.c b/scripts/4_World/DayZ/Entities/ExplosivesBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..1fd05cec587a9ad683ab903315f7bb9b19ae382f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ExplosivesBase.c
@@ -0,0 +1,359 @@
+class ExplosiveLight : PointLightBase
+{
+	protected static float m_DefaultBrightness	= 10;
+	protected static float m_DefaultRadius		= 30;
+	
+	void ExplosiveLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo(m_DefaultRadius);
+		SetBrightnessTo(m_DefaultBrightness);
+		SetFlareVisible(false);
+		SetAmbientColor(1.0, 1.0, 0.3);
+		SetDiffuseColor(1.0, 1.0, 0.3);
+		SetLifetime(0.15);
+		SetDisableShadowsWithinRadius(-1);
+	}	
+}
+
+class ExplosivesBase : ItemBase
+{
+	protected const string DEFAULT_AMMO_TYPE 		= "Explosion_NonLethal";
+	protected const string ANIM_PHASE_VISIBILITY	= "Visibility";
+
+	protected bool 				m_Armed;
+	protected bool				m_Defused;
+	protected ref array<string>		m_AmmoTypes;
+	
+	protected ref Timer			m_DeleteTimer;
+	
+	//! light	
+	protected ExplosiveLight	m_Light;
+	
+	//! particle
+	protected Particle 					m_ParticleExplosion;
+	protected ref array<ParticleSource>	m_ParticleExplosionArr = {};
+	protected int						m_ParticleExplosionId;
+	protected vector					m_ParticlePosition;
+	protected vector					m_ParticleOrientation;
+	
+	void ExplosivesBase()
+	{
+		m_DeleteTimer 	= new Timer();
+		m_AmmoTypes 	= new array<string>();
+
+		SetAmmoType(DEFAULT_AMMO_TYPE);		
+		SetParticleExplosion(ParticleList.INVALID); //! no effect
+		SetParticlePosition(WorldToModel(GetPosition()));
+		SetParticleOrientation(vector.Zero);
+		
+		RegisterNetSyncVariableBool("m_Armed");
+		RegisterNetSyncVariableBool("m_Defused");
+	}
+	
+	
+	override bool IsExplosive()
+	{
+		return true;
+	}
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+		super.OnExplosionEffects(source, directHit, componentIndex, surface, pos, surfNormal, energyFactor, explosionFactor, isWater, ammoType);
+
+		if (m_ParticleExplosionId > ParticleList.INVALID)
+		{
+			EntityAI parent = this;
+			if (GetHierarchyParent())
+			{
+				parent = GetHierarchyParent();
+			}
+
+			ParticleSource p = ParticleManager.GetInstance().PlayOnObject(m_ParticleExplosionId, parent, m_ParticlePosition, m_ParticleOrientation);
+			m_ParticleExplosionArr.Insert(p);
+			m_ParticleExplosion = p;
+		}
+
+		CreateLight();
+	}
+
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		if (m_ParticleExplosion)
+		{
+			foreach (ParticleSource p : m_ParticleExplosionArr)
+			{
+				DestroyParticle(p);
+			}
+		}
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		
+		//! should be called only here to avoid multiple explosion calculations, call SetHealth("","",0.0) instead
+	 	InitiateExplosion();
+		
+		UnpairRemote();	
+	}
+	
+	override void OnCEUpdate()
+	{
+		super.OnCEUpdate();
+		
+		if (!IsRuined() && GetArmed() && GetPairDevice())
+		{
+			if (vector.DistanceSq(GetPosition(), GetPairDevice().GetPosition()) <= Math.SqrFloat(UAMaxDistances.EXPLOSIVE_REMOTE_ACTIVATION))
+			{
+				UpdateLED(ERemoteDetonatorLEDState.LIT);
+				
+				return;
+			}
+		}
+		
+		UpdateLED(ERemoteDetonatorLEDState.OFF);
+	}
+	
+	override void UnpairRemote()
+	{
+		if (GetRemotelyActivatedItemBehaviour())
+		{
+			if (GetPairDevice())
+			{
+				GetPairDevice().UnpairRemote();
+			}
+			GetRemotelyActivatedItemBehaviour().Unpair();
+		}
+			
+	}
+
+	override void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0")
+	{
+		super.OnPlacementComplete(player, position, orientation);
+		
+		if (GetGame().IsServer())
+		{
+			SetOrientation(orientation);
+			SetPosition(position);
+			PlaceOnSurface();
+		}
+	}
+	
+	protected void CreateLight()
+	{
+		m_Light = ExplosiveLight.Cast(ScriptedLightBase.CreateLight(ExplosiveLight, GetPosition()));
+	}
+	
+	protected void DestroyParticle(Particle p)
+	{
+		#ifndef SERVER
+		if (p != null)
+		{
+			p.Stop();
+		}
+		#endif
+	}
+	
+	protected void InitiateExplosion()
+	{
+		int count = m_AmmoTypes.Count();
+		for (int i = 0; i < count; i++)
+		{
+			Explode(DamageType.EXPLOSION, m_AmmoTypes[i]);
+		}
+
+		OnExplode();
+	}
+
+	protected void OnExplode()
+	{
+		if (GetGame().IsServer())
+		{
+			m_DeleteTimer.Run(0.25, this, "DeleteSafe");
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		if (!super.IsInventoryVisible())
+		{
+			return false;
+		}
+		
+		return GetAnimationPhase("Visibility") == 0;
+	}
+	
+	override bool IsTakeable()
+	{
+		return super.IsTakeable() && GetAnimationPhase("Visibility") == 0;
+	}
+	
+	bool IsTimerDetonable()
+	{
+		return false;
+	}
+	
+	void Arm()
+	{
+		SetArmed(true);
+		
+		OnArmed();
+	}
+	
+	void OnArmed();
+	
+	bool CanBeArmed()
+	{
+		return true;
+	}
+	
+	void Disarm(bool pWithTool = false)
+	{
+		SetArmed(false);
+		
+		OnDisarmed(pWithTool);
+	}
+
+	void OnBeforeDisarm();
+	void OnDisarmed(bool pWithTool);
+	
+	bool CanBeDisarmed()
+	{
+		return false;
+	}
+	
+	bool GetArmed()
+	{
+		return m_Armed;	
+	}
+
+	protected void SetArmed(bool state)
+	{
+		m_Armed = state;
+		SetSynchDirty();
+	}
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+		{
+			return false;
+		}
+
+		return IsTakeable();
+	}
+	
+	override bool CanPutIntoHands(EntityAI parent)
+	{
+		if (!super.CanPutIntoHands(parent))
+		{
+			return false;
+		}
+
+		return IsTakeable();
+	}
+
+	override bool CanRemoveFromHands(EntityAI parent)
+	{
+		return IsTakeable();
+	}
+	
+	bool GetDefused()
+	{
+		return m_Defused;	
+	}
+
+	protected void SetDefused(bool state)
+	{
+		m_Defused = state;
+		SetSynchDirty();
+	}
+	
+	void SetAmmoType(string pAmmoType)
+	{
+		SetAmmoTypes({pAmmoType});
+	}
+	
+	void SetAmmoTypes(array<string> pAmmoTypes)
+	{
+		m_AmmoTypes.Clear();
+		m_AmmoTypes = pAmmoTypes;
+	}
+	
+	void SetParticleExplosion(int particle)
+	{
+		m_ParticleExplosionId = particle;
+	}
+
+	//! set position for smoke particle - needs to be in Local Space 
+	void SetParticlePosition(vector local_pos)
+	{
+		m_ParticlePosition = local_pos;
+
+		if (GetHierarchyParent())
+		{
+			m_ParticlePosition = GetHierarchyParent().WorldToModel(GetPosition());
+		}
+	}
+	
+	void SetParticleOrientation(vector local_ori)
+	{
+		m_ParticleOrientation = local_ori;
+
+		if (GetHierarchyParent())
+		{
+			m_ParticleOrientation = GetHierarchyParent().WorldToModel(GetOrientation());
+		}
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		ctx.Write(m_Armed);
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+
+		if (version > 129)
+		{		
+			bool armed = false;
+			if (!ctx.Read(armed))
+			{
+				return false;
+			}
+		
+			SetArmed(armed);
+		}
+
+		return true;
+	}
+	
+	//! HELPERS
+	void UpdateLED(int pState);
+	bool HasLockedTriggerSlots()
+	{
+		return false;
+	}
+
+	void LockTriggerSlots();
+	void UnlockTriggerSlots();
+	
+	void LockExplosivesSlots();
+	void UnlockExplosivesSlots();
+	
+}
diff --git a/scripts/4_World/DayZ/Entities/ExplosivesBase/ClaymoreMine.c b/scripts/4_World/DayZ/Entities/ExplosivesBase/ClaymoreMine.c
new file mode 100644
index 0000000000000000000000000000000000000000..7449357c0499f255dddd7494b5c40bf72f0b3d10
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ExplosivesBase/ClaymoreMine.c
@@ -0,0 +1,325 @@
+class ClaymoreMine : ExplosivesBase
+{
+	protected const string ANIM_PHASE_PACKED	= "Bag";
+	protected const string ANIM_PHASE_DEPLOYED	= "Mine";
+	protected const string SELECTION_NAME_LED	= "LED";
+
+	protected ref RemotelyActivatedItemBehaviour 	m_RAIB;
+	protected ERemoteDetonatorLEDState 				m_LastLEDState;
+	
+	void ClaymoreMine()
+	{
+		m_RAIB = new RemotelyActivatedItemBehaviour(this);
+		
+		SetAmmoTypes({"ClaymoreMine_Ammo","ClaymoreMine_Secondary_Ammo"});
+		SetParticleExplosion(ParticleList.CLAYMORE_EXPLOSION);
+		SetParticleOrientation("90 0 0");
+
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdLow");
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdHigh");
+		UpdateLED(ERemoteDetonatorLEDState.OFF, true);
+	}
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		UpdateVisuals();
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+		RemoveDebugVisuals();
+#endif
+#endif
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+		RemoveDebugVisuals();
+#endif
+#endif
+	}
+
+	override protected void InitiateExplosion()
+	{
+		if (GetDefused())
+		{
+			return;
+		}
+		
+		super.InitiateExplosion();
+	}
+	
+	override void AfterStoreLoad()
+	{
+		super.AfterStoreLoad();
+		
+		UpdateVisuals();
+		if (GetArmed())
+		{
+			UpdateLED(ERemoteDetonatorLEDState.LIT, true);
+		}
+	}
+
+ 	override void OnVariablesSynchronized()
+    {
+        super.OnVariablesSynchronized();
+		
+		if (m_RAIB)
+		{
+			m_RAIB.OnVariableSynchronized();
+		}
+		
+		UpdateVisuals();
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+		
+		if (m_RAIB)
+		{
+			m_RAIB.Pair();
+		}
+	}
+	
+
+	
+	override RemotelyActivatedItemBehaviour GetRemotelyActivatedItemBehaviour()
+	{
+		return m_RAIB;
+	}
+	
+	override void PairRemote(notnull EntityAI trigger)
+	{
+		m_RAIB.Pair(trigger);
+	}
+	
+	override EntityAI GetPairDevice()
+	{
+		return m_RAIB.GetPairDevice();
+	}
+	
+	override bool CanBeDisarmed()
+	{
+		return GetArmed();
+	}
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (GetGame().IsServer())
+		{
+			if (m_RAIB.IsPaired() && GetArmed())
+			{
+				if (GetPairDevice() == item)
+				{
+					SetHealth("", "", 0.0);
+				}
+			}
+		}
+	}
+	
+	override void OnArmed()
+	{
+		super.OnArmed();
+
+		UpdateVisuals();
+		UpdateLED(ERemoteDetonatorLEDState.LIT, true);
+		
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+		// have to call this function a little later, after claymore transform has been finalized
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(DrawDamageZone, 500);
+#endif
+#endif
+	}
+	
+	override void OnDisarmed(bool pWithTool)
+	{
+		super.OnDisarmed(pWithTool);
+		
+#ifdef DIAG_DEVELOPER
+		RemoveDebugVisuals();
+#endif
+
+		SetDefused(pWithTool);
+		UnpairRemote();
+
+		if (pWithTool)
+		{
+			SetHealth("", "", 0.0);
+		}
+		
+		UpdateVisuals();
+		UpdateLED(ERemoteDetonatorLEDState.OFF, true);
+	}
+	
+	override void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0")
+	{
+		super.OnPlacementComplete(player, position, orientation);
+
+		if (GetGame().IsServer())
+		{
+			RemoteDetonatorTrigger rdt = RemoteDetonatorTrigger.SpawnInPlayerHands(player);
+			if (rdt)
+			{
+				PairWithDevice(rdt);
+				Arm();
+			}
+		}
+	}
+
+	protected void UpdateVisuals()
+	{
+		if (GetArmed() || GetDefused())
+		{
+			ShowSelection(ANIM_PHASE_DEPLOYED);
+			HideSelection(ANIM_PHASE_PACKED);
+			if (GetOnViewIndexChanged())
+			{
+				GetOnViewIndexChanged().Invoke();
+			}
+		}
+		else
+		{
+			HideSelection(ANIM_PHASE_DEPLOYED);
+			ShowSelection(ANIM_PHASE_PACKED);
+			if (GetOnViewIndexChanged())
+			{
+				GetOnViewIndexChanged().Invoke();
+			}
+		}
+	}
+	
+	protected void UpdateLED(ERemoteDetonatorLEDState pState, bool pForced = false)
+	{
+		if (pState != m_LastLEDState || pForced)
+		{
+			int selectionIdx = GetHiddenSelectionIndex(SELECTION_NAME_LED);
+
+			switch (pState)
+			{
+				case ERemoteDetonatorLEDState.LIT:
+					SetObjectTexture(selectionIdx, RemoteDetonator.COLOR_LED_LIT);
+				break;
+				default:
+					SetObjectTexture(selectionIdx, RemoteDetonator.COLOR_LED_OFF);
+				break;
+			}
+
+			m_LastLEDState = pState;
+		}
+	}
+
+	override bool IsTakeable()
+	{
+		return !GetArmed() && super.IsTakeable();
+	}
+	
+	override bool IsDeployable()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDeployObject);
+		AddAction(ActionArmExplosive);
+	}
+	
+	override int GetViewIndex()
+	{
+		if (MemoryPointExists("invView2"))
+		{
+			if (GetArmed())
+			{
+				return 1;
+			}
+		}
+		
+		return 0;
+	}
+	
+	override protected bool UsesGlobalDeploy()
+	{
+		return true;
+	}
+	
+	override string GetDeploySoundset()
+	{
+		return "placeClaymore_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		return "claymore_deploy_Soundset";
+	}
+	
+	override void OnDebugSpawn()
+	{
+		RemoteDetonatorTrigger rdt = RemoteDetonatorTrigger.Cast(SpawnEntityOnGroundPos("RemoteDetonatorTrigger", GetPosition() + GetDirection() * 0.5));
+		PairWithDevice(rdt);
+		Arm();
+	}
+	
+#ifdef DIAG_DEVELOPER	
+	//================================================================
+	// DEBUG
+	//================================================================
+	
+	protected Shape m_DamageZone;
+
+	override protected string GetDebugText()
+	{
+		string debug_output;
+		debug_output += string.Format("low net id: %1\n", m_RAIB.GetPairDeviceNetIdLow());
+		debug_output += string.Format("high net id: %1\n", m_RAIB.GetPairDeviceNetIdHigh());
+		debug_output += string.Format("pair device: %1\n", m_RAIB.GetPairDevice());
+
+		return debug_output;
+	}
+	
+	protected void DrawDamageZone()
+	{
+		if (!DiagMenu.GetBool(DiagMenuIDs.WEAPON_CLAYMORE_DEBUG))
+		{
+			return;
+		}
+		
+		auto game 					= GetGame();
+		string cfgPath 				= "CfgAmmo " + m_AmmoTypes[0];
+		float hitRange 				= game.ConfigGetFloat(cfgPath + " indirectHitRange");
+		float hitRangeMultiplier 	= game.ConfigGetFloat(cfgPath + " indirectHitRangeMultiplier");
+		float verticalAngle 		= game.ConfigGetFloat(cfgPath + " indirectHitAngle1");
+		float horizontalAngle 		= game.ConfigGetFloat(cfgPath + " indirectHitAngle2");
+		float range 				= hitRange * hitRangeMultiplier;
+		vector selfMatrix[4];
+
+		RemoveDebugVisuals();
+		
+		GetTransform(selfMatrix);		
+		m_DamageZone = Debug.DrawFrustum(horizontalAngle, verticalAngle, range);		
+		m_DamageZone.SetMatrix(selfMatrix);		
+	}
+	
+	void RemoveDebugVisuals()
+	{
+		if ( m_DamageZone )
+		{
+			m_DamageZone.Destroy();
+			m_DamageZone = null;
+		}
+	}
+#endif
+}
+
+class ClaymoreMinePlacing : ClaymoreMine {}
diff --git a/scripts/4_World/DayZ/Entities/ExplosivesBase/ImprovisedExplosive.c b/scripts/4_World/DayZ/Entities/ExplosivesBase/ImprovisedExplosive.c
new file mode 100644
index 0000000000000000000000000000000000000000..4cb597530788cc4af2d5392b36d3f6beb1ace8d6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ExplosivesBase/ImprovisedExplosive.c
@@ -0,0 +1,512 @@
+class ImprovisedExplosive : ExplosivesBase
+{
+	protected const float TIME_TRIGGER_INITIAL_DELAY_SECS 			= 0.1;
+	protected const float TIME_TRIGGER_TIMER_BASED_DELAY_SECS 		= 1.0;
+	protected const float TIME_TRIGGER_DELAY_SECS 					= 0.3;
+	
+	protected static const string SLOT_TRIGGER_ALARM_CLOCK	 		= "TriggerAlarmClock";
+	protected static const string SLOT_TRIGGER_KITCHEN_TIMER		= "TriggerKitchenTimer";
+	protected static const string SLOT_TRIGGER_REMOTE				= "TriggerRemoteDetonator_Receiver";
+	
+	protected static const string SLOT_EXPLOSIVE_A					= "IEDExplosiveA";
+	protected static const string SLOT_EXPLOSIVE_B					= "IEDExplosiveB";
+	
+	protected const int SLOT_EXPLOSIVE_COUNT						= 2;
+	protected const string SLOT_EXPLOSIVES[SLOT_EXPLOSIVE_COUNT] 	= {
+		SLOT_EXPLOSIVE_A,
+		SLOT_EXPLOSIVE_B
+	};
+	
+	protected const int SLOT_TRIGGERS_COUNT							= 3;
+	protected const string SLOT_TRIGGERS[SLOT_TRIGGERS_COUNT]		= {
+		SLOT_TRIGGER_ALARM_CLOCK,
+		SLOT_TRIGGER_KITCHEN_TIMER,
+		SLOT_TRIGGER_REMOTE
+	};
+	
+	protected const string ANIM_PHASE_TRIGGER_EMPTY					= "TriggerEmpty";
+	protected const string ANIM_PHASE_TRIGGER_TIMER					= "TriggerTimer";
+	protected const string ANIM_PHASE_TRIGGER_CLOCK					= "TriggerClock";
+	protected const string ANIM_PHASE_TRIGGER_REMOTE				= "TriggerRemote";
+	
+	protected ref RemotelyActivatedItemBehaviour m_RAIB;
+	
+	void ImprovisedExplosive()
+	{
+		m_RAIB = new RemotelyActivatedItemBehaviour(this);
+
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdLow");
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdHigh");
+	}
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		if (!g_Game.IsMultiplayer())
+			LockTriggerSlots();
+	}
+
+	override bool HasLockedTriggerSlots()
+	{
+		foreach (string triggerSlot : SLOT_TRIGGERS)
+			return GetInventory().GetSlotLock(InventorySlots.GetSlotIdFromString(triggerSlot));
+		
+		return false;
+	}
+	
+	override void LockTriggerSlots()
+	{
+		foreach (string triggerSlotName : SLOT_TRIGGERS)
+			GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(triggerSlotName), true);
+	}
+	
+	override void UnlockTriggerSlots()
+	{
+		foreach (string triggerSlotName : SLOT_TRIGGERS)
+			GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(triggerSlotName), false);
+	}
+	
+	override void LockExplosivesSlots()
+	{	
+		foreach (string explosiveSlotName : SLOT_EXPLOSIVES)
+			GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(explosiveSlotName), true);
+	}
+	
+	override void UnlockExplosivesSlots()
+	{	
+		foreach (string explosiveSlotName : SLOT_EXPLOSIVES)
+			GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(explosiveSlotName), false);
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+
+		if (version <= 134) // up to 1.21
+		{
+			foreach (string triggerSlotName : SLOT_TRIGGERS)
+			{
+				int slotId = InventorySlots.GetSlotIdFromString(triggerSlotName);
+				bool locked = GetInventory().GetSlotLock(slotId);
+				while (locked)
+				{
+					GetInventory().SetSlotLock(slotId, false);
+					locked = GetInventory().GetSlotLock(slotId);
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		LockTriggerSlots();
+	}
+	
+ 	override void OnVariablesSynchronized()
+    {
+        super.OnVariablesSynchronized();
+		
+		if (m_RAIB)
+		{
+			m_RAIB.OnVariableSynchronized();
+		}
+
+		
+		foreach (string slotName : SLOT_TRIGGERS)
+		{
+			EntityAI trigger = GetInventory().FindAttachmentByName(slotName);
+			if (trigger)
+			{
+				UpdateVisuals(trigger);
+				break;
+			}
+		}
+	}
+	
+	override void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0")
+	{
+		super.OnPlacementComplete(player, position, orientation);
+		
+		if (GetGame().IsServer())
+		{
+			SetOrientation(vector.Up);
+		}
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+
+		if (m_RAIB)
+		{
+			m_RAIB.Pair();
+		}
+	}
+	
+	override RemotelyActivatedItemBehaviour GetRemotelyActivatedItemBehaviour()
+	{
+		return m_RAIB;
+	}
+	
+	override void PairRemote(notnull EntityAI trigger)
+	{
+		m_RAIB.Pair(trigger);
+	}
+	
+	override EntityAI GetPairDevice()
+	{
+		return m_RAIB.GetPairDevice();
+	}
+	
+	override bool CanBeArmed()
+	{
+		if (GetArmed())
+			return false;
+		
+		if (!HasLockedTriggerSlots())
+			return false;
+
+		foreach (string slotName : SLOT_EXPLOSIVES)
+		{
+			EntityAI explosive = GetInventory().FindAttachmentByName(slotName);
+			if (explosive)
+				return true;
+		}
+		
+		return false;
+	}
+
+	override bool CanBeDisarmed()
+	{
+		return true;
+	}
+	
+	
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		InventoryLocation il = new InventoryLocation();
+		GetInventory().GetCurrentInventoryLocation(il);
+		
+		foreach (string slotName : SLOT_TRIGGERS)
+		{
+			if (slotId == InventorySlots.GetSlotIdFromString(slotName))
+			{
+				if (il.GetType() == InventoryLocationType.HANDS)
+					return false;
+			}
+		}
+
+		return !GetArmed();
+	}
+	
+	override bool CanDisplayAttachmentSlot(int slot_id)
+	{
+		string slotName = InventorySlots.GetSlotName(slot_id);
+
+		switch (slotName)
+		{
+			case SLOT_TRIGGER_ALARM_CLOCK:
+			case SLOT_TRIGGER_KITCHEN_TIMER:
+			case SLOT_TRIGGER_REMOTE:
+				return FindAttachmentBySlotName(slotName) != null;
+				break;
+		}
+
+		return true;
+	}
+	
+	override bool IsTimerDetonable()
+	{
+		return true;
+	}
+	
+	override bool IsTakeable()
+	{
+		return !GetArmed() && super.IsTakeable();
+	}
+	
+	override bool IsDeployable()
+	{
+		return !GetArmed();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDeployObject);
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel, newLevel, zone);
+
+		if (GetGame().IsServer())
+		{
+			if (newLevel == GameConstants.STATE_RUINED)
+			{
+				for (int attachmentIdx = 0; attachmentIdx < GetInventory().AttachmentCount(); attachmentIdx++)
+				{
+					ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(attachmentIdx));
+					if (attachment)
+					{
+						attachment.UnlockFromParent();
+						attachment.SetHealth("", "", 0.0);
+					}
+				}
+				
+				SetArmed(false);
+				SetTakeable(true);
+			}
+		}
+	}
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (GetGame().IsServer() && GetArmed())
+		{
+			bool isTimeTriggered = false;
+
+			array<ItemBase> attachmentsCache = new array<ItemBase>();
+			for (int attachmentIdx = 0; attachmentIdx < GetInventory().AttachmentCount(); attachmentIdx++)
+			{
+				ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(attachmentIdx));
+				if (attachment)
+					attachmentsCache.Insert(attachment);
+			}
+			
+			foreach (ItemBase attachment1 : attachmentsCache)
+				attachment1.UnlockFromParent();
+			
+			//! attachment special handling on disarm
+			foreach (ItemBase attachment2 : attachmentsCache)
+			{
+				if (attachment2.IsInherited(ClockBase))
+				{
+					isTimeTriggered = true;
+					break;
+				}
+			}
+			
+			//! go through attached explosives
+			foreach (ItemBase attachment3 : attachmentsCache)
+			{
+				if (attachment3)
+				{
+					vector dropExtents = "0.5 0.0 0.5";
+					if (isTimeTriggered)
+						dropExtents[1] = 0.15; //! hard-case blocks shells (result of deferred delete)
+
+					GetInventory().DropEntityInBounds(InventoryMode.SERVER, this, attachment3, dropExtents, 0, 0, 0);
+					attachment3.SetAnimationPhase(ANIM_PHASE_VISIBILITY, 1.0);
+					attachment3.SetTakeable(false);
+				}
+			}
+			
+			float delayFor = TIME_TRIGGER_INITIAL_DELAY_SECS;
+			if (isTimeTriggered)
+			{
+				delayFor = TIME_TRIGGER_INITIAL_DELAY_SECS + TIME_TRIGGER_TIMER_BASED_DELAY_SECS;
+				//! defer delete to allow ringing
+				GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(DeleteSafe, delayFor * 1000, false);
+			}
+			else
+			{
+				DeleteSafe();
+			}
+
+			//! final traverse - attached explosives activation
+			foreach (ItemBase attachment4 : attachmentsCache)
+			{
+				if (attachment4.IsAnyInherited({RemoteDetonator, ClockBase}))
+				{
+					//! defer damage to trigger attachments to allow ringing
+					GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(attachment4.DeleteSafe, delayFor * 1000, false);
+				}
+
+				if (attachment4 && !attachment4.IsAnyInherited({RemoteDetonator, ClockBase}))
+				{
+					Param1<ItemBase> params = new Param1<ItemBase>(attachment4);
+					GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLaterByName(attachment4, "OnActivatedByItem", delayFor * 1000, false, params);
+					delayFor += TIME_TRIGGER_DELAY_SECS;					
+				}
+			}
+		}
+	}
+	
+	//! not exploding itself, rely on attached explosives	
+	override protected void InitiateExplosion();
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+
+		switch (slot_name)
+		{
+			case SLOT_TRIGGER_ALARM_CLOCK:
+			case SLOT_TRIGGER_KITCHEN_TIMER:
+			case SLOT_TRIGGER_REMOTE:
+				OnTriggerAttached(FindAttachmentBySlotName(slot_name));
+				break;
+		}
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+
+		switch (slot_name)
+		{
+			case SLOT_TRIGGER_ALARM_CLOCK:
+			case SLOT_TRIGGER_KITCHEN_TIMER:
+			case SLOT_TRIGGER_REMOTE:
+				OnTriggerDetached(FindAttachmentBySlotName(slot_name));
+				break;
+		}
+	}
+	
+	override void OnBeforeDisarm()
+	{
+		UnlockExplosivesSlots();
+	}
+	
+	override void OnDisarmed(bool pWithTool)
+	{
+		super.OnDisarmed(pWithTool);
+		
+		UnpairRemote();
+		
+		array<ItemBase> attachmentsCache = new array<ItemBase>();
+		for (int attachmentIdx = 0; attachmentIdx < GetInventory().AttachmentCount(); attachmentIdx++)
+		{
+			ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(attachmentIdx));
+			if (attachment)
+			{
+				attachmentsCache.Insert(attachment);
+			}	
+		}
+		
+		foreach (ItemBase attachment1 : attachmentsCache)
+			attachment1.UnlockFromParent();
+		
+		//! attachment special handling on disarm
+		foreach (ItemBase attachment2 : attachmentsCache)
+		{
+			if (attachment2.IsInherited(ClockBase))
+			{
+				if (pWithTool)
+					GetInventory().DropEntity(InventoryMode.SERVER, this, attachment2);
+			}
+			
+			if (attachment2.IsInherited(RemoteDetonator))
+			{
+				if (pWithTool)
+				{
+					GetInventory().DropEntity(InventoryMode.SERVER, this, attachment2);
+					attachment2.SetHealth("", "", 0.0);
+				}
+				else
+				{
+					attachment2.Delete();
+				}
+			}
+		}
+		
+		LockTriggerSlots();
+		SetTakeable(true);
+	}
+	
+	override void UpdateLED(int pState)
+	{
+		RemoteDetonatorReceiver receiver = RemoteDetonatorReceiver.Cast(FindAttachmentBySlotName(SLOT_TRIGGER_REMOTE));
+		if (receiver)
+			receiver.UpdateLED(pState, true);
+	}
+	
+	protected void OnTriggerAttached(EntityAI entity)
+	{
+		UpdateVisuals(entity);
+		UpdateLED(ERemoteDetonatorLEDState.LIT);
+		
+		if (entity.IsInherited(ClockBase))
+			Arm();
+		
+		LockTriggerSlots();
+		LockExplosivesSlots();
+	}
+	
+	protected void OnTriggerDetached(EntityAI entity)
+	{
+		UpdateVisuals(null);
+		UpdateLED(ERemoteDetonatorLEDState.OFF);
+	}
+	
+	protected void UpdateVisuals(EntityAI entity)
+	{
+		if (entity)
+		{
+			if (entity.IsInherited(RemoteDetonator))
+			{
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_EMPTY, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_TIMER, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_CLOCK, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_REMOTE, 0.0);
+			}
+			else if (entity.IsInherited(AlarmClock_ColorBase))
+			{
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_EMPTY, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_TIMER, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_CLOCK, 0.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_REMOTE, 1.0);
+			}
+			else if (entity.IsInherited(KitchenTimer))
+			{
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_EMPTY, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_TIMER, 0.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_CLOCK, 1.0);
+				SetAnimationPhase(ANIM_PHASE_TRIGGER_REMOTE, 1.0);
+			}
+		}
+		else
+		{
+			SetAnimationPhase(ANIM_PHASE_TRIGGER_EMPTY, 0.0);
+			SetAnimationPhase(ANIM_PHASE_TRIGGER_TIMER, 1.0);
+			SetAnimationPhase(ANIM_PHASE_TRIGGER_CLOCK, 1.0);
+			SetAnimationPhase(ANIM_PHASE_TRIGGER_REMOTE, 1.0);
+		}
+	}
+	
+	override string GetDeploySoundset()
+	{
+		return "placeImprovisedExplosive_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		return "improvisedexplosive_deploy_SoundSet";
+	}
+	
+	override protected bool UsesGlobalDeploy()
+	{
+		return true;
+	}
+	
+#ifdef DEVELOPER
+	override protected string GetDebugText()
+	{
+		string debug_output;
+		debug_output += string.Format("low net id: %1\n", m_RAIB.GetPairDeviceNetIdLow());
+		debug_output += string.Format("high net id: %1\n", m_RAIB.GetPairDeviceNetIdHigh());
+		debug_output += string.Format("pair device: %1\n", m_RAIB.GetPairDevice());
+
+		return debug_output;
+	}
+#endif
+}
+
+class ImprovisedExplosivePlacing : ImprovisedExplosive {}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ExplosivesBase/Plastic_Explosive.c b/scripts/4_World/DayZ/Entities/ExplosivesBase/Plastic_Explosive.c
new file mode 100644
index 0000000000000000000000000000000000000000..8e28102bb9cc5d1f58c1136a119713c3e31a7af9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ExplosivesBase/Plastic_Explosive.c
@@ -0,0 +1,371 @@
+class Plastic_Explosive : ExplosivesBase
+{
+	protected const string SLOT_TRIGGER 					= "TriggerRemoteDetonator_Receiver";
+	protected const string ANIM_PHASE_TRIGGER_REMOTE 		= "TriggerRemote";
+	
+	protected bool m_UsedAsCharge;
+	
+	protected ref RemotelyActivatedItemBehaviour m_RAIB;
+
+	void Plastic_Explosive()
+	{
+		m_RAIB = new RemotelyActivatedItemBehaviour(this);
+		
+		SetAmmoType("Plastic_Explosive_Ammo");
+		SetParticleExplosion(ParticleList.PLASTIC_EXPLOSION);
+
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdLow");
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdHigh");
+	}
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		if (!g_Game.IsMultiplayer())
+			LockTriggerSlots();
+	}
+	
+	//! special behaviour - do not call super from ExplosivesBase
+	override void EEKilled(Object killer)	
+	{
+		//analytics (behaviour from EntityAI)
+		GetGame().GetAnalyticsServer().OnEntityKilled(killer, this);
+	}
+
+	override bool HasLockedTriggerSlots()
+	{
+		return GetInventory().GetSlotLock(InventorySlots.GetSlotIdFromString(SLOT_TRIGGER));
+	}
+	
+	override void LockTriggerSlots()
+	{
+		GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(SLOT_TRIGGER), true);
+	}
+	
+	override void UnlockTriggerSlots()
+	{
+		GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(SLOT_TRIGGER), false);
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+
+		if (version <= 134) // up to 1.21
+		{
+			int slotId = InventorySlots.GetSlotIdFromString(SLOT_TRIGGER);
+			bool locked = GetInventory().GetSlotLock(slotId);
+			while (locked)
+			{
+				GetInventory().SetSlotLock(slotId, false);
+				locked = GetInventory().GetSlotLock(slotId);
+			}
+		}
+		
+		return true;
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		LockTriggerSlots();
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if (m_RAIB)
+		{
+			m_RAIB.OnVariableSynchronized();
+		}
+		
+		int slotId = InventorySlots.GetSlotIdFromString(SLOT_TRIGGER);
+		UpdateVisuals(GetInventory().FindAttachment(slotId));
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+
+		if (m_RAIB)
+		{
+			m_RAIB.Pair();
+		}
+	}
+	
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		InventoryLocation il = new InventoryLocation();
+		GetInventory().GetCurrentInventoryLocation(il);
+		if (il.GetType() == InventoryLocationType.HANDS)
+		{
+			return false;
+		}
+	
+		ClockBase timer = ClockBase.Cast(attachment);
+		if (timer && !timer.IsAlarmOn())
+		{
+			return false;
+		}
+
+		return !GetArmed();
+	}
+	
+	override bool CanDisplayAttachmentSlot(int slot_id)
+	{
+		string slotName = InventorySlots.GetSlotName(slot_id);
+
+		switch (slotName)
+		{
+		case SLOT_TRIGGER:
+			return FindAttachmentBySlotName(slotName) != null;
+		break;
+		}
+
+		return true;
+	}
+	
+	override bool IsTakeable()
+	{
+		return !GetArmed() && super.IsTakeable();
+	}
+	
+	override bool IsDeployable()
+	{
+		return !GetArmed();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDeployObject);
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		m_UsedAsCharge = false;
+
+		if (parent && parent.IsInherited(ExplosivesBase))
+		{
+			m_UsedAsCharge = true;
+		}
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+
+		if (parent && !parent.IsInherited(ExplosivesBase))
+		{
+			m_UsedAsCharge = false;
+		}
+	}
+	
+	override bool EEOnDamageCalculated(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		//! ignores explosion damage from other Plastic_Explosive that are used as charge(like 2 PE fired via IED)
+		if (damageType == DamageType.EXPLOSION)
+		{
+			return !m_UsedAsCharge;
+		}
+		
+		return true;
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel, newLevel, zone);
+
+		if (GetGame().IsServer())
+		{
+			if (newLevel == GameConstants.STATE_RUINED)
+			{
+				for (int attachmentIdx = 0; attachmentIdx < GetInventory().AttachmentCount(); attachmentIdx++)
+				{
+					ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(attachmentIdx));
+					if (attachment)
+					{
+						attachment.UnlockFromParent();
+						attachment.SetHealth("", "", 0.0);
+					}
+				}
+				
+				SetArmed(false);
+				SetTakeable(true);
+			}
+		}
+	}
+	
+	override RemotelyActivatedItemBehaviour GetRemotelyActivatedItemBehaviour()
+	{
+		return m_RAIB;
+	}
+	
+	override void PairRemote(notnull EntityAI trigger)
+	{
+		m_RAIB.Pair(trigger);
+	}
+	
+
+	override EntityAI GetPairDevice()
+	{
+		return m_RAIB.GetPairDevice();
+	}
+	
+	override bool CanBeArmed()
+	{
+		if (!super.CanBeArmed())
+		{
+			return false;
+		}
+
+		return HasLockedTriggerSlots() && !GetArmed();
+	}
+	
+	override bool CanBeDisarmed()
+	{
+		return GetArmed();
+	}
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (GetGame().IsServer())
+		{
+			if (GetHealthLevel("") == GameConstants.STATE_RUINED)
+			{
+				return;
+			}
+			
+			if (item == this)
+			{
+				SetHealth("", "", 0.0);
+				InitiateExplosion();
+				return;
+			}
+			
+			if (m_RAIB.IsPaired() && GetArmed())
+			{
+				if (GetPairDevice() == item)
+				{
+					SetHealth("", "", 0.0);
+					InitiateExplosion();
+				}
+			}
+		}
+	}
+	
+	override void OnDisarmed(bool pWithTool)
+	{
+		super.OnDisarmed(pWithTool);
+		
+		UnpairRemote();
+		UpdateVisuals(null);
+		
+		for (int att = 0; att < GetInventory().AttachmentCount(); att++)
+		{
+			ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(att));
+			if (attachment)
+			{
+				attachment.UnlockFromParent();
+				if (attachment.IsInherited(RemoteDetonator))
+				{
+					if (pWithTool)
+					{
+						GetInventory().DropEntity(InventoryMode.SERVER, this, attachment);
+						attachment.SetHealth("", "", 0.0);
+					}
+					else
+					{
+						attachment.Delete();
+					}
+				}
+			}
+		}
+		
+		LockTriggerSlots();
+		SetTakeable(true);
+	}
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+
+		if (slot_name == SLOT_TRIGGER)
+			OnTriggerAttached(item);
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+
+		if (slot_name == SLOT_TRIGGER)
+			OnTriggerDetached(item);
+	}
+	
+	override void UpdateLED(int pState)
+	{
+		RemoteDetonatorReceiver receiver = RemoteDetonatorReceiver.Cast(FindAttachmentBySlotName(SLOT_TRIGGER));
+		if (receiver)
+		{
+			receiver.UpdateLED(pState, true);
+		}
+	}
+
+	protected void OnTriggerAttached(EntityAI entity)
+	{
+		Arm();
+		UpdateVisuals(entity);
+		UpdateLED(ERemoteDetonatorLEDState.LIT);
+		
+		for (int att = 0; att < GetInventory().AttachmentCount(); att++)
+		{
+			ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(att));
+			if (attachment)
+			{
+				attachment.LockToParent();
+			}
+		}
+	}
+	
+	protected void OnTriggerDetached(EntityAI entity)
+	{
+		UpdateVisuals(null);
+		UpdateLED(ERemoteDetonatorLEDState.OFF);
+	}
+	
+	protected void UpdateVisuals(EntityAI entity)
+	{
+		if (entity)
+		{
+			SetAnimationPhase(ANIM_PHASE_TRIGGER_REMOTE, 0.0);
+		}
+		else
+		{
+			SetAnimationPhase(ANIM_PHASE_TRIGGER_REMOTE, 1.0);
+		}
+	}
+	
+	
+	override string GetDeploySoundset()
+	{
+		return "placeImprovisedExplosive_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		return "improvisedexplosive_deploy_SoundSet";
+	}
+	
+	override protected bool UsesGlobalDeploy()
+	{
+		return true;
+	}
+}
+
+class Plastic_Explosive_Placing : Plastic_Explosive {}
diff --git a/scripts/4_World/DayZ/Entities/ExplosivesBase/RemoteDetonator.c b/scripts/4_World/DayZ/Entities/ExplosivesBase/RemoteDetonator.c
new file mode 100644
index 0000000000000000000000000000000000000000..59d6ebe329e09737f5060d3a5508e1e5b92ea366
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ExplosivesBase/RemoteDetonator.c
@@ -0,0 +1,348 @@
+enum ERemoteDetonatorLEDState
+{
+	OFF = 0,
+	LIT,
+}
+
+class RemoteDetonator : Inventory_Base
+{
+	const string COLOR_LED_OFF 		= "#(argb,8,8,3)color(0,0,0,1.0,co)";
+	const string COLOR_LED_LIT 		= "#(argb,8,8,3)color(1,0,0,1.0,co)";
+	const string SELECTION_NAME_LED = "LED";
+
+	protected ERemoteDetonatorLEDState m_LastLEDState;
+	
+	bool IsKit()
+	{
+		return true;
+	}
+	
+	void UpdateLED(ERemoteDetonatorLEDState pState, bool pForced = false)
+	{
+		int selectionIdx = GetHiddenSelectionIndex(SELECTION_NAME_LED);
+
+		switch (pState)
+		{
+		case ERemoteDetonatorLEDState.LIT:
+			SetObjectTexture(selectionIdx, COLOR_LED_LIT);
+		break;
+		default:
+			SetObjectTexture(selectionIdx, COLOR_LED_OFF);
+		}
+		
+		m_LastLEDState = pState;
+		SetSynchDirty();
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionAttachExplosivesTrigger);
+		AddAction(ActionDisarmExplosiveWithRemoteDetonatorUnpaired);
+	}
+}
+
+class RemoteDetonatorTrigger : RemoteDetonator
+{
+	protected const string ANIM_PHASE_TRIGGER = "trigger";
+	
+	protected bool m_LED;
+	protected ref RemotelyActivatedItemBehaviour m_RAIB;
+	
+	void RemoteDetonatorTrigger()
+	{
+		m_RAIB = new RemotelyActivatedItemBehaviour(this);		
+		m_RAIB.SetTrigger();
+		
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdLow");
+		RegisterNetSyncVariableInt("m_RAIB.m_PairDeviceNetIdHigh");
+		RegisterNetSyncVariableInt("m_LastLEDState", 0, EnumTools.GetEnumSize(ERemoteDetonatorLEDState));
+		
+		UpdateLED(m_LastLEDState);
+	}
+	
+	override bool IsKit()
+	{
+		return false;
+	}
+	
+ 	override void OnVariablesSynchronized()
+    {
+        super.OnVariablesSynchronized();
+
+		if (m_RAIB)
+		{
+			m_RAIB.OnVariableSynchronized();
+		}
+		
+		UpdateLED(m_LastLEDState);
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+		 
+		if (m_RAIB)
+		{
+			m_RAIB.Pair();
+		}
+	}
+	
+	override RemotelyActivatedItemBehaviour GetRemotelyActivatedItemBehaviour()
+	{
+		return m_RAIB;
+	}
+	
+	override void OnCEUpdate()
+	{
+		super.OnCEUpdate();
+		
+		if (!IsRuined() && IsConnected() && GetControlledDevice())
+		{
+			if (vector.DistanceSq(GetPosition(), GetControlledDevice().GetPosition()) <= Math.SqrFloat(UAMaxDistances.EXPLOSIVE_REMOTE_ACTIVATION))
+			{
+				UpdateLED(ERemoteDetonatorLEDState.LIT);
+				
+				return;
+			}
+		}
+		
+		UpdateLED(ERemoteDetonatorLEDState.OFF);
+	}
+	
+	override void PairRemote(notnull EntityAI trigger)
+	{
+		m_RAIB.Pair(trigger);
+	}
+	
+	override void UnpairRemote()
+	{
+		UpdateLED(ERemoteDetonatorLEDState.OFF);
+		m_RAIB.Unpair();
+	}
+
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (GetGame().IsServer())
+		{
+			if (m_RAIB.IsPaired() && !IsRuined())
+			{
+				ItemBase device = ItemBase.Cast(GetControlledDevice());
+				if (device && vector.DistanceSq(GetPosition(), device.GetPosition()) <= Math.SqrFloat(UAMaxDistances.EXPLOSIVE_REMOTE_ACTIVATION))
+				{
+					device.OnActivatedByItem(this);
+				}
+			}
+		}
+	}
+	
+	void SetControlledDevice(EntityAI pDevice)
+	{
+		m_RAIB.Pair(pDevice);
+	}
+
+	bool IsConnected()
+	{
+		return m_RAIB.IsPaired();
+	}
+	
+	EntityAI GetControlledDevice()
+	{
+		return m_RAIB.GetPairDevice();
+	}
+	
+	static RemoteDetonatorTrigger SpawnInPlayerHands(notnull EntityAI pEntity, EntityAI deviceToPair = null)
+	{
+		string type = "RemoteDetonatorTrigger";
+		RemoteDetonatorTrigger rdt;
+		PlayerBase player = PlayerBase.Cast(pEntity);
+		if (player)
+		{
+			ItemBase inHandsItem = player.GetItemInHands();
+			if (inHandsItem)
+			{
+				if (deviceToPair)
+				{
+					ReplaceDetonatorItemOnArmLambda onArmLambda = new ReplaceDetonatorItemOnArmLambda(inHandsItem, type);
+					onArmLambda.SetPairDevice(deviceToPair);
+					MiscGameplayFunctions.TurnItemIntoItemEx(player, onArmLambda);
+				}
+				else
+				{
+					ReplaceDetonatorItemLambda lambda = new ReplaceDetonatorItemLambda(inHandsItem, type);
+					MiscGameplayFunctions.TurnItemIntoItemEx(player, lambda);
+				}
+				
+
+				rdt = RemoteDetonatorTrigger.Cast(player.GetItemInHands());
+			}
+			else
+				rdt = RemoteDetonatorTrigger.Cast(player.GetHumanInventory().CreateInHands(type));
+			
+			//! item replaced, use different IK
+			if (player.GetItemInHands())
+				player.GetItemAccessor().OnItemInHandsChanged();
+		}
+		
+		return rdt;
+	}
+	
+	override void OnAnimationPhaseStarted(string animSource, float phase)
+	{
+		if (animSource == ANIM_PHASE_TRIGGER)
+		{
+			if (phase > 0.01)
+			{
+				UpdateLED(ERemoteDetonatorLEDState.OFF);
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		RemoveAction(ActionAttachExplosivesTrigger);
+
+		AddAction(ActionAttachOnTrap);
+		AddAction(ActionDisarmExplosiveWithRemoteDetonator);
+		AddAction(ActionTriggerRemotely);
+	}
+	
+#ifdef DIAG_DEVELOPER
+	override protected string GetDebugText()
+	{
+		string debug_output;
+		debug_output += string.Format("low net id: %1\n", m_RAIB.GetPairDeviceNetIdLow());
+		debug_output += string.Format("high net id: %1\n", m_RAIB.GetPairDeviceNetIdHigh());
+		debug_output += string.Format("pair device: %1\n", m_RAIB.GetPairDevice());
+		return debug_output;
+	}
+#endif
+}
+
+class RemoteDetonatorReceiver : RemoteDetonator
+{
+	void RemoteDetonatorReceiver()
+	{
+		UpdateLED(ERemoteDetonatorLEDState.OFF, true);
+	}
+	
+	override bool IsKit()
+	{
+		return false;
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		UpdateLED(ERemoteDetonatorLEDState.OFF);
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		
+		UpdateLED(ERemoteDetonatorLEDState.OFF, true);
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionAttachExplosivesTrigger);
+		RemoveAction(ActionDisarmExplosiveWithRemoteDetonatorUnpaired);
+	}
+}
+
+class ReplaceDetonatorItemLambda : ReplaceItemWithNewLambdaBase
+{
+	override void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+
+		MiscGameplayFunctions.TransferItemProperties(old_item, new_item);		
+	}
+}
+
+class ReplaceDetonatorItemOnArmLambda : ReplaceDetonatorItemLambda
+{
+	EntityAI m_PairDevice
+
+	void SetPairDevice(EntityAI device)
+	{
+		m_PairDevice = device;
+	}
+	
+	override void OnSuccess(EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		
+		RemoteDetonator detonator = RemoteDetonator.Cast(new_item);
+		if (detonator)
+		{
+			ExplosivesBase explosive = ExplosivesBase.Cast(m_PairDevice);
+			if (explosive)
+			{
+				ItemBase receiver = ItemBase.Cast(explosive.GetInventory().CreateAttachment("RemoteDetonatorReceiver"));
+				if (receiver)
+				{
+					MiscGameplayFunctions.TransferItemProperties(detonator, receiver);
+					receiver.LockToParent();
+					explosive.SetTakeable(false);
+					explosive.PairWithDevice(detonator);
+					explosive.Arm();
+				}
+			}
+		}
+	}
+	
+	override void OnAbort()
+	{
+		ExplosivesBase explosive = ExplosivesBase.Cast(m_PairDevice);
+		if (explosive)
+		{
+			explosive.LockTriggerSlots();
+			explosive.SetTakeable(true);
+		}
+	}
+}
+
+class ReplaceDetonatorItemOnDisarmLambda : ReplaceDetonatorItemLambda
+{
+	override void OnSuccess(EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		
+		RemoteDetonator detonator = RemoteDetonator.Cast(m_OldItem);
+		if (detonator)
+		{
+			if (detonator.GetRemotelyActivatedItemBehaviour())
+			{
+				ExplosivesBase explosive = ExplosivesBase.Cast(detonator.GetRemotelyActivatedItemBehaviour().GetPairDevice());
+				if (explosive)
+				{
+					explosive.Disarm();
+				}
+			}
+		}
+	}
+	
+	override void OnAbort()
+	{
+		super.OnAbort();
+		
+		RemoteDetonator detonator = RemoteDetonator.Cast(m_OldItem);
+		if (detonator)
+		{
+			if (detonator.GetRemotelyActivatedItemBehaviour())
+			{
+				ExplosivesBase explosive = ExplosivesBase.Cast(detonator.GetRemotelyActivatedItemBehaviour().GetPairDevice());
+				if (explosive)
+				{
+					explosive.LockExplosivesSlots();
+				}
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Archery/Archery_Base.c b/scripts/4_World/DayZ/Entities/Firearms/Archery/Archery_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..fad7106eb77f74b26da82a850c874bda9762b74d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Archery/Archery_Base.c
@@ -0,0 +1,13 @@
+/**@class		Archery_Base
+ * @brief		base for Archery
+ * @NOTE		name copies config base class
+ **/
+class Archery_Base : Weapon_Base
+{
+	void Archery_Base();
+	
+	override float GetChanceToJam()
+	{
+		return 0.0;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Archery/Crossbow.c b/scripts/4_World/DayZ/Entities/Firearms/Archery/Crossbow.c
new file mode 100644
index 0000000000000000000000000000000000000000..5766adc058fd4c34441bb07eeed09eaaf0405d91
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Archery/Crossbow.c
@@ -0,0 +1,213 @@
+enum XBAnimState
+{
+	uncocked 			= 0, 	///< default weapon state, closed and discharged
+	cocked		 		= 1,
+};
+
+enum XBStableStateID
+{
+	UNKNOWN				=  0,
+	UncockedEmpty		=  1,
+	CockedEmpty			=  2,
+	Loaded				=  3,
+}
+
+class XBUncockedEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Uncocked Empty UE"); } m_weapon.SetCharged(false); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Uncocked Empty UE"); } }
+	override int GetCurrentStateID () { return XBStableStateID.UncockedEmpty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class XBCockedEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Cocked Empty CE"); } m_weapon.SetCharged(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Cocked Empty CE"); } }
+	override int GetCurrentStateID () { return XBStableStateID.CockedEmpty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class XBLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Loaded L"); } m_weapon.SetCharged(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Loaded L"); } }
+	override int GetCurrentStateID () { return XBStableStateID.Loaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+
+/**@class		Crossbow_Base
+ * @brief		base for Crossbow
+ * @NOTE		name copies config base class
+ **/
+class Crossbow_Base : Archery_Base
+{
+	void Crossbow_Base();
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new CrossbowRecoil(this);
+	}
+	
+	override void InitStateMachine()
+	{
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_SPECIAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+
+		// setup state machine
+		// basic weapon states
+		WeaponStableState U = new XBUncockedEmpty(this, NULL, XBAnimState.uncocked);
+		WeaponStableState C = new XBCockedEmpty(this, NULL, XBAnimState.cocked);
+		WeaponStableState L = new XBLoaded(this, NULL, XBAnimState.cocked);
+		// unstable (intermediate) states
+		WeaponChargingStretch Mech_U = new WeaponChargingStretch(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		WeaponEjectBullet Mech_L = new WeaponEjectBullet(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_SPECIAL);
+		
+		WeaponChambering Chamber_U = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_OPENED);
+		WeaponChambering Chamber_C = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_CLOSED);
+		//CrossbowReChambering Chamber_L = new CrossbowReChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		
+		WeaponStateBase Trigger_U = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		WeaponStateBase Trigger_C = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+		WeaponStateBase Trigger_L = new WeaponFireLast(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		
+		WeaponStateBase Unjam_J = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		
+		//Charging
+		m_fsm.AddTransition(new WeaponTransition( C,			__M__,	C));
+		
+		m_fsm.AddTransition(new WeaponTransition( U,			__M__,	Mech_U));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_U,		_fin_,	U, null, new WeaponGuardWeaponDischarged(this)));		
+		m_fsm.AddTransition(new WeaponTransition(  Mech_U,		_fin_,	C ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_U,		_abt_,	U, null, new WeaponGuardWeaponDischarged(this)));		
+		m_fsm.AddTransition(new WeaponTransition(  Mech_U,		_abt_,	C ));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__M__,	Mech_L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	C, null, new WeaponGuardChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	L));	
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	C, null, new WeaponGuardChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	L));
+			
+		
+		//Chamber bolt
+		m_fsm.AddTransition(new WeaponTransition( U,			__L__,	Chamber_U));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_U,		_fin_,	L, null, new WeaponGuardChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_U,		_fin_,	C, null, new WeaponGuardWeaponCharged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_U,		_fin_,	U));	
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_U,		_abt_,	L, null, new WeaponGuardChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_U,		_abt_,	C, null, new WeaponGuardWeaponCharged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_U,		_abt_,	U));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C,			__L__,	Chamber_C));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C,		_fin_,	L, null, new WeaponGuardChamberFull(this)));		
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C,		_fin_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C,		_abt_,	L, null, new WeaponGuardChamberFull(this)));		
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C,		_abt_,	C));
+		
+		m_fsm.AddTransition(new WeaponTransition( C,			__T__,	Trigger_C));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C,	_fin_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C,	_abt_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C,	_dto_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C,	_abt_,	U));
+		
+		m_fsm.AddTransition(new WeaponTransition( U,			__T__,	Trigger_U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_U,	_fin_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_U,	_abt_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_U,	_dto_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_U,	_abt_,	U));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__T__,	Trigger_L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_fin_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_dto_,	U));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	U));
+
+		SelectionBulletHide();
+		EffectBulletHide(0);
+		
+		SetInitialState(U);
+		m_fsm.Start();
+	}
+	
+	override float GetChanceToJam()
+	{
+		return 0.0;
+	}
+	
+	override void OnDebugSpawnEx(DebugSpawnParams params)
+	{
+		//super.OnDebugSpawn();
+
+		
+
+		GetInventory().CreateInInventory( "ACOGOptic_6x" );
+		
+		EntityAI entity;
+
+		GameInventory inv = null;
+		if (params.m_Player)
+		{
+			inv = params.m_Player.GetInventory();
+		}
+
+		SpawnInInventoryOrGroundPos("Ammo_HuntingBolt", inv, GetPosition());
+		SpawnInInventoryOrGroundPos("Ammo_ImprovisedBolt_1", inv, GetPosition());
+		SpawnInInventoryOrGroundPos("Ammo_ImprovisedBolt_2", inv, GetPosition());
+			
+		SpawnInInventoryOrGroundPos("ACOGOptic", inv, GetPosition());
+		entity = SpawnInInventoryOrGroundPos("M68Optic", inv, GetPosition());
+		entity.GetInventory().CreateInInventory( "Battery9V" );
+		entity = SpawnInInventoryOrGroundPos("M4_T3NRDSOptic", inv, GetPosition());
+		entity.GetInventory().CreateInInventory( "Battery9V" );
+		entity = SpawnInInventoryOrGroundPos("ReflexOptic", inv, GetPosition());
+		entity.GetInventory().CreateInInventory( "Battery9V" );
+		entity = SpawnInInventoryOrGroundPos("StarlightOptic", inv, GetPosition());
+		entity.GetInventory().CreateInInventory( "Battery9V" );
+	}
+	
+	override bool CanBeUsedForSuicide()
+	{
+		float ammoDamage;
+		string ammoTypeName;
+		GetCartridgeInfo(GetCurrentMuzzle(), ammoDamage, ammoTypeName);
+		if (ammoTypeName == "Bullet_CupidsBolt")
+			return false;
+		
+		return super.CanBeUsedForSuicide();
+	}
+}
+
+class Crossbow : Crossbow_Base {}
+class Crossbow_Autumn : Crossbow_Base {}
+class Crossbow_Summer : Crossbow_Base {}
+class Crossbow_Black : Crossbow_Base {}
+class Crossbow_Wood : Crossbow_Base {}
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AK101.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AK101.c
new file mode 100644
index 0000000000000000000000000000000000000000..589f595b11ce4a37a36f0cd7299df783e1c4025c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AK101.c
@@ -0,0 +1,34 @@
+class AK101_Base : AKM_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Ak101Recoil(this);
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "AK_Bayonet" );
+		inventory.CreateInInventory( "AK_PlasticBttstck" );	
+		inventory.CreateInInventory( "AK_RailHndgrd" );
+		inventory.CreateInInventory( "PSO1Optic" );		
+		inventory.CreateInInventory( "UniversalLight" );	
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );	
+		
+		SpawnAttachedMagazine("Mag_AK101_30Rnd");
+	}
+};
+
+class AK101 : AK101_Base
+{
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AK74.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AK74.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd865a52e5b5efd871c1fdd7a249046eaad215c6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AK74.c
@@ -0,0 +1,33 @@
+class AK74_Base : AKM_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Ak74Recoil(this);
+	}
+	
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{		
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "AK74_WoodBttstck" );
+		inventory.CreateInInventory( "AK74_Hndgrd" );
+		inventory.CreateInInventory( "PSO1Optic" );
+		inventory.CreateInInventory( "AK_Bayonet" );
+		inventory.CreateInInventory( "Battery9V" );	
+			
+		SpawnAttachedMagazine("Mag_AK74_30Rnd");
+	}
+};
+
+class AK74 : AK74_Base
+{
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AKM.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AKM.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff71d772273eb103c54968bd204b0e3c1851d5e7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AKM.c
@@ -0,0 +1,58 @@
+class AKM_Base : RifleBoltFree_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new AkmRecoil(this);
+	}
+	
+	/*override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.RELOAD)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}*/
+	
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "AK_WoodBttstck" );
+		inventory.CreateInInventory( "AK_RailHndgrd" );
+		inventory.CreateInInventory( "AK_Bayonet" );
+		inventory.CreateInInventory( "UniversalLight" );
+		inventory.CreateInInventory( "KobraOptic" );
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		// Calling super for this one will just pick the 300 round mag
+		SpawnAttachedMagazine("Mag_AKM_Drum75Rnd");
+	}	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AKS74U.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AKS74U.c
new file mode 100644
index 0000000000000000000000000000000000000000..c353e0b1467c18e09d34f591a7ff1e4dd667e696
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AKS74U.c
@@ -0,0 +1,19 @@
+class AKS74U : AK74_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Aks74uRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "AKS74U_Bttstck" );
+			entity.GetInventory().CreateInInventory( "AK_Suppressor" );	
+			SpawnAttachedMagazine("Mag_AK74_30Rnd");		
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AUG.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AUG.c
new file mode 100644
index 0000000000000000000000000000000000000000..79fab1ae2fdfc96ee2694dae921916c3a353e23d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/AUG.c
@@ -0,0 +1,92 @@
+class Aug_Base : RifleBoltFree_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new AUGRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Mag_Aug_30Rnd", entity.GetPosition());
+		}
+	}
+	
+	override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.RELOAD)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET;
+				
+				case WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}	
+};
+
+class Aug extends Aug_Base
+{
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "UniversalLight" );
+		inventory.CreateInInventory( "Battery9V" );	
+		inventory.CreateInInventory( "ACOGOptic" );
+		inventory.CreateInInventory( "M4_Suppressor" );
+		
+		SpawnAttachedMagazine("Mag_Aug_30Rnd");
+	}	
+}
+
+class AugShort extends Aug_Base
+{
+	override bool CanEnterIronsights()
+	{
+		return true;
+	}
+	
+	override void AssembleGun()
+	{
+		super.AssembleGun();
+		
+		if ( !FindAttachmentBySlotName("weaponOpticsAug") )
+		{
+			GetInventory().CreateAttachment("AugOptic");
+		}
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		SpawnAttachedMagazine("Mag_Aug_30Rnd");
+	}	
+}
+
+
+class AugOptic: ItemOptics
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/FAL.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/FAL.c
new file mode 100644
index 0000000000000000000000000000000000000000..074a9f6da8a7b09fb8dfdf750bf2fdf6cdeee0bb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/FAL.c
@@ -0,0 +1,19 @@
+class FAL_Base : RifleBoltLock_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new FALRecoil(this);
+	}
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "Fal_OeBttstck" );
+		inventory.CreateInInventory( "M4_T3NRDSOptic" );	
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_FAL_20Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/FAMAS.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/FAMAS.c
new file mode 100644
index 0000000000000000000000000000000000000000..36e8567696e1a71772898d9e9443b5d8f5eead8d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/FAMAS.c
@@ -0,0 +1,42 @@
+class Famas_Base : RifleBoltFree_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new FamasRecoil(this);
+	}		
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		SpawnAttachedMagazine("Mag_Famas_25Rnd");
+	}
+	
+	/*override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.RELOAD)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}*/
+};
+
+class FAMAS : Famas_Base {};
+class SawedOffFAMAS : Famas_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M14.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M14.c
new file mode 100644
index 0000000000000000000000000000000000000000..fb0a1330c630e6427da8edb4592ebd5c76083c9f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M14.c
@@ -0,0 +1,18 @@
+class M14_Base : RifleBoltLock_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new M14Recoil(this);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "ReflexOptic" );
+		inventory.CreateInInventory( "ImprovisedSuppressor" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_M14_20Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M16A2.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M16A2.c
new file mode 100644
index 0000000000000000000000000000000000000000..ac573c6ca0928d610a2b4d6f67460a7adf50e7e7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M16A2.c
@@ -0,0 +1,13 @@
+class M16A2_Base : RifleBoltLock_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new M16A2Recoil(this);
+	}		
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		SpawnAttachedMagazine("Mag_STANAG_60Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M4A1.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M4A1.c
new file mode 100644
index 0000000000000000000000000000000000000000..6fcdccc1b7558141de21c9fd6aea57f272730eaf
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/M4A1.c
@@ -0,0 +1,22 @@
+class M4A1_Base : RifleBoltLock_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new M4a1Recoil(this);
+	}		
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "M9A1_Bayonet" );
+		inventory.CreateInInventory( "M4_OEBttstck" );	
+		inventory.CreateInInventory( "M4_RISHndgrd" );
+		inventory.CreateInInventory( "UniversalLight" );		
+		inventory.CreateInInventory( "M4_T3NRDSOptic" );	
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );	
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/OTS14.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/OTS14.c
new file mode 100644
index 0000000000000000000000000000000000000000..122e9cfe57c5b39a2fa14d51c80bdcadc0c529e5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/OTS14.c
@@ -0,0 +1,3 @@
+class OTS14 : Rifle_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/SKS.c b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/SKS.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba53ead774b9c1061247706e6a3c91d7210a3b5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/AutomaticRifle/SKS.c
@@ -0,0 +1,276 @@
+enum SKSAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	OPENED 				= 1,
+	JAMMED 				= 2,
+};
+
+enum SKSStableStateID
+{
+	UNKNOWN			=  0,
+	SKS_CLO_BU0		=  1,
+	SKS_CLO_BU1		=  2,
+	SKS_OPN_BU0		=  3,
+	SKS_JAM_BU1 	=  4
+}
+
+class SKS_CLO_BU0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull"); } }
+	override int GetCurrentStateID () { return SKSStableStateID.SKS_CLO_BU0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+
+};
+class SKS_CLO_BU1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet"); } }
+	override int GetCurrentStateID () { return SKSStableStateID.SKS_CLO_BU1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class SKS_OPN_BU0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { open nobull"); } m_weapon.SetWeaponOpen(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } open nobull"); } }
+	override int GetCurrentStateID () { return SKSStableStateID.SKS_OPN_BU0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class SKS_JAM_BU1 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet"); } }
+	override int GetCurrentStateID () { return SKSStableStateID.SKS_JAM_BU1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+/**@class		Rifle_Base
+ * @brief		base for rifles
+ * @NOTE		name copies config base class
+ **/
+class SKS_Base extends Rifle_Base
+{
+	ref WeaponStableState C0;
+	ref	WeaponStableState C1;
+	ref	WeaponStableState L0;
+	ref	WeaponStableState JF;
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new SKSRecoil(this);
+	}
+	
+	override void InitStateMachine()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD_CLIP, 0));
+	
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED)));//????
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)));
+		
+		//m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+
+		// setup state machine
+		// basic weapon states
+		// close-locked-jammed | nobullet-bullet | nomag-mag
+		// regexp: [CLJ][01][01]
+		C0 = new SKS_CLO_BU0(this, NULL, SKSAnimState.DEFAULT);
+		C1 = new SKS_CLO_BU1(this, NULL, SKSAnimState.DEFAULT);
+		L0 = new SKS_OPN_BU0(this, NULL, SKSAnimState.OPENED);
+		JF = new SKS_JAM_BU1(this, NULL, SKSAnimState.JAMMED);
+
+		// unstable (intermediate) states
+		WeaponChargingInnerMag Mech_C0 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponChargingInnerMag Mech_L0 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		WeaponChargingInnerMag Mech_C1 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		
+		//Fire
+		WeaponStateBase Trigger_C0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)); // cock without clip
+		WeaponFireAndChamberFromInnerMagazine Trigger_C1 = new WeaponFireAndChamberFromInnerMagazine(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL) );
+		WeaponStateBase Trigger_C1L = new WeaponFireLast(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST));
+		WeaponStateBase Trigger_L0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		
+		WeaponStateBase Trigger_C1J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM); 
+	
+		//Unjam
+		WeaponStateBase Unjam_JF = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+
+		//Chambering
+		LoopedChambering 	Chamber_C0 = new LoopedChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChambering 	Chamber_C1 = new LoopedChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChambering 	Chamber_L0 = new LoopedChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_OPENED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		
+		//WeaponStateBase chmMag = new WeaponChamberFromAttMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+
+		// order: Discharged-Charged | nobullet-bullet | nomag-mag
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( C0,			__M__,	Mech_C1)); // charge from dischg nobullet nomag
+
+		m_fsm.AddTransition(new WeaponTransition( C1,			__M__,	Mech_C1)); // charge from bullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( L0, 			__M__,	Mech_L0)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L0,		_fin_,	L0, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L0,		_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L0,		_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L0,		_abt_,	L0, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L0,		_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L0,		_abt_,	C1));
+		
+		
+				/*m_start = new WeaponCharging_Start(m_weapon, this, m_action, m_actionType);
+		m_onBE = new WeaponEjectBullet_Cartridge_W4T(m_weapon, this);
+		m_onBEFireOut = new WeaponEjectCasing_W4T(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+		m_chamber = new WeaponChamberFromInnerMag_W4T(m_weapon, this);*/
+		
+		
+		
+
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( C0, 			__T__,	Trigger_C0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_fin_,	C0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_dto_,	C0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_abt_,	C0));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__T__,	Trigger_C1, NULL, new WeaponGuardHasAmmoInnerMagazine(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_rto_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__T__,	Trigger_C1L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1L,	_fin_,	L0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1L,	_rto_,	L0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1L,	_abt_,	L0));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__TJ_,	Trigger_C1J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_fin_,	JF ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_rto_,	JF ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_abt_,	JF ));
+	
+		m_fsm.AddTransition(new WeaponTransition( L0,			__T__,	Trigger_L0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L0,	_fin_,	L0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L0,	_dto_,	L0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L0,	_abt_,	L0));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF,			__T__,	Trigger_JF)); // opened fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_fin_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_dto_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_abt_,	JF));
+
+
+		// load cartridge
+		m_fsm.AddTransition(new WeaponTransition( C0,			__L__,	Chamber_C0));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_fin_,	L0, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_abt_,	L0, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__L__,	Chamber_C1, NULL, new GuardNot(new WeaponGuardInnerMagazineFullShareChamber(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C1,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C1,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( L0,			__L__,	Chamber_L0, NULL, new GuardNot(new WeaponGuardInnerMagazineFullShareChamber(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L0,	_fin_,	L0, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L0,	_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L0,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L0,	_abt_,	L0, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L0,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L0,	_abt_,	C1));
+
+		
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( JF,			__U__,	Unjam_JF)); // unjam nomag
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	JF, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	JF, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	C1));
+
+		SetInitialState(C0);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+	}
+	
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PUScopeOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionLoadMultiBullet);
+
+		RemoveAction(FirearmActionLoadBulletQuick); // Easy reload
+		AddAction(FirearmActionLoadMultiBulletQuick); // Easy reload
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PUScopeOptic" );
+		inventory.CreateInInventory( "SKS_Bayonet" );
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifleExternalMagazine_Base.c b/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifleExternalMagazine_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..84d61e32014cd8477f5ae4b3ee8259deda9a4102
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifleExternalMagazine_Base.c
@@ -0,0 +1,459 @@
+enum BAREMAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	JAMMED 				= 1,
+};
+
+enum BAREMStableStateID
+{
+	UNKNOWN					=  0,
+	BAREM_CLO_BU0_MA0		=  1,
+	BAREM_CLO_BU1_MA0		=  2,
+	BAREM_CLO_BU1_MA1		=  3,
+	BAREM_CLO_BU0_MA1		=  4,
+	BAREM_CLO_BUF_MA0		=  5,
+	BAREM_CLO_BUF_MA1		=  6,
+	BAREM_JAM_BU1_MA0		=  7,
+	BAREM_JAM_BU1_MA1		=  8
+}
+
+class BAREM_CLO_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull nomag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_CLO_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class BAREM_CLO_BU1_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet nomag"); } super.OnEntry(e);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet nomag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_CLO_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class BAREM_CLO_BU1_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet mag"); } super.OnEntry(e);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet mag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_CLO_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class BAREM_CLO_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull mag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_CLO_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class BAREM_CLO_BUF_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close fireout bullet nomag"); } super.OnEntry(e);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close fireout bullet nomag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_CLO_BUF_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class BAREM_CLO_BUF_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close fireout bull mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close fireout bull mag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_CLO_BUF_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class BAREM_JAM_BU1_MA0 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet nomag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_JAM_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class BAREM_JAM_BU1_MA1 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet mag"); } }
+	override int GetCurrentStateID () { return BAREMStableStateID.BAREM_JAM_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+
+class BoltActionRifle_ExternalMagazine_Base : BoltActionRifle_Base
+{
+	ref WeaponStableState C00;
+	ref	WeaponStableState C10;
+	ref	WeaponStableState C01;
+	ref	WeaponStableState C11;
+	ref	WeaponStableState CF0;
+	ref	WeaponStableState CF1;
+	ref	WeaponStableState JF0;
+	ref	WeaponStableState JF1;
+	
+	override void InitStateMachine()
+	{
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH)));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)));
+		//m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+
+		// setup state machine
+		// basic weapon states
+		// close-jammed | nobullet-bullet-fireout bullet | nomag-mag
+		// regexp: [CLJ][01F][01]
+		C00 = new BAREM_CLO_BU0_MA0(this, NULL, RBLAnimState.DEFAULT);
+		C10 = new BAREM_CLO_BU1_MA0(this, NULL, RBLAnimState.DEFAULT);
+		C01 = new BAREM_CLO_BU0_MA1(this, NULL, RBLAnimState.DEFAULT);
+		C11 = new BAREM_CLO_BU1_MA1(this, NULL, RBLAnimState.DEFAULT);
+		CF0 = new BAREM_CLO_BUF_MA0(this, NULL, RBLAnimState.DEFAULT);
+		CF1 = new BAREM_CLO_BUF_MA1(this, NULL, RBLAnimState.DEFAULT);
+		JF0 = new BAREM_JAM_BU1_MA0(this, NULL, RBLAnimState.JAMMED);
+		JF1 = new BAREM_JAM_BU1_MA1(this, NULL, RBLAnimState.JAMMED);
+
+		// unstable (intermediate) states
+		WeaponStateBase Mech_C00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponStateBase Mech_C01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponStateBase Mech_C10 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponStateBase Mech_C11 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponStateBase Mech_CF0 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponStateBase Mech_CF1 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+	
+		WeaponStateBase Trigger_C00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)); // cock without clip
+		WeaponStateBase Trigger_C10 = new WeaponFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)); // cock with clip
+		WeaponStateBase Trigger_C11 = new WeaponFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		WeaponStateBase Trigger_C01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_CF0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_CF1 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF1 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+	
+		//Fire and jammed
+		WeaponStateBase Trigger_C10J = new WeaponFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)); // cock with clip
+		WeaponStateBase Trigger_C11J = new WeaponFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM));
+		// Unjam
+		WeaponStateBase Unjam_JF0 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		WeaponStateBase Unjam_JF1 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+
+
+		WeaponChambering Chamber_C00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		WeaponChambering Chamber_C01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		WeaponChambering Chamber_CF0 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		WeaponChambering Chamber_CF1 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+
+		WeaponAttachMagazine Attach_C00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET));
+		WeaponAttachMagazine Attach_CF0 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET));
+		WeaponAttachMagazine Attach_C10 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET));
+		WeaponAttachMagazine Attach_JF0 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET));
+	
+		WeaponReplacingMagAndChamberNext Reload_C11 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET));
+		WeaponReplacingMagAndChamberNext Reload_C01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET));
+		WeaponReplacingMagAndChamberNext Reload_CF1 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET));
+		WeaponReplacingMagAndChamberNext Reload_JF1 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET));
+	
+		WeaponDetachingMag Detach_C11 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_C01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_CF1 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_JF1 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		
+		//WeaponStateBase chmMag = new WeaponChamberFromAttMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __A__ = new WeaponEventAttachMagazine;
+		WeaponEventBase __D__ = new WeaponEventDetachMagazine;
+		WeaponEventBase __S__ = new WeaponEventSwapMagazine;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+
+		// order: Discharged-Charged | nobullet-bullet | nomag-mag
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( C00,				__M__,	Mech_C00)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C00,		_abt_,	C00));
+
+		m_fsm.AddTransition(new WeaponTransition( C10,				__M__,	Mech_C10)); // charge from bullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_fin_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_abt_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_abt_,	C10));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF0,				__M__,	Mech_CF0)); // charge from bullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF0,		_fin_,	CF0, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF0,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF0,		_abt_,	CF0, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF0,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__M__,	Mech_C11)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__M__,	Mech_C01)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF1,				__M__,	Mech_CF1)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF1,		_fin_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF1,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF1,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF1,		_abt_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF1,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CF1,		_abt_,	C11));
+		
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( C00,				__T__,	Trigger_C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_dto_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__T__,	Trigger_C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_fin_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_dto_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_abt_,	C01));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF0,				__T__,	Trigger_CF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CF0,		_fin_,	CF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CF0,		_dto_,	CF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CF0,		_abt_,	CF0));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF1,				__T__,	Trigger_CF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CF1,		_fin_,	CF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CF1,		_dto_,	CF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CF1,		_abt_,	CF1));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__T__,	Trigger_JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_dto_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_abt_,	JF0));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__T__,	Trigger_JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_fin_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_dto_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_abt_,	JF1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C10,				__T__,	Trigger_C10));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_fin_,	CF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_rto_,	CF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_abt_,	CF0));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__T__,	Trigger_C11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_fin_,	CF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_rto_,	CF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_abt_,	CF1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__TJ_,	Trigger_C11J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_fin_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_rto_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_abt_,	JF1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C10,				__TJ_,	Trigger_C10J ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_rto_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_abt_,	JF0));
+		
+
+		// load cartridge
+		m_fsm.AddTransition(new WeaponTransition( C00,				__L__,	Chamber_C00)); // chamber from closed=1
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	C10));
+
+		m_fsm.AddTransition(new WeaponTransition( C01,				__L__,	Chamber_C01)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF0,				__L__,	Chamber_CF0)); // chamber from closed=1
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF0,		_fin_,	CF0, NULL, new WeaponGuardCurrentChamberFiredOut(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF0,		_fin_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF0,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF0,		_abt_,	CF0, NULL, new WeaponGuardCurrentChamberFiredOut(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF0,		_abt_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF0,		_abt_,	C10));
+
+		m_fsm.AddTransition(new WeaponTransition( CF1,				__L__,	Chamber_CF1)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF1,		_fin_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF1,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF1,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF1,		_abt_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF1,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CF1,		_abt_,	C11));
+
+		// attach magazine (no mag in weapon)
+		m_fsm.AddTransition(new WeaponTransition( C00,				__A__,	Attach_C00, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b0/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C00));
+	
+		m_fsm.AddTransition(new WeaponTransition( C10,				__A__,	Attach_C10, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_abt_,	C10));
+
+		
+		m_fsm.AddTransition(new WeaponTransition( CF0,				__A__,	Attach_CF0, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_fin_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_abt_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CF0,		_abt_,	C00));
+			
+		
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__A__,	Attach_JF0, NULL, new WeaponGuardCanAttachMag(this))); // attach from JAM/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_abt_,	JF0));
+
+		// replace magazine
+		m_fsm.AddTransition(new WeaponTransition( C11,				__S__,	Reload_C11, NULL, new WeaponGuardCanSwapMag(this))); // swap in Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_abt_,	C10));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__S__,	Reload_C01, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF1,				__S__,	Reload_CF1, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_fin_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_abt_,	CF1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CF1,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__S__,	Reload_JF1, NULL, new WeaponGuardCanSwapMag(this))); // swap in Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_abt_,	JF0));
+	
+
+		// detach magazine
+		m_fsm.AddTransition(new WeaponTransition( C11,				__D__,	Detach_C11, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_abt_,	C10));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__D__,	Detach_C01, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CF1,				__D__,	Detach_CF1, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CF1,		_fin_,	CF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CF1,		_fin_,	CF0));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CF1,		_abt_,	CF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CF1,		_abt_,	CF0));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__D__,	Detach_JF1, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b1/m1 jammed
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_abt_,	JF0));
+		
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__U__,	Unjam_JF0)); // unjam nomag
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_fin_,	JF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_abt_,	JF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__U__,	Unjam_JF1)); // unjam with mag with ammo
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	JF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	JF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	C11));
+
+		SetInitialState(C00);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+		
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionDetachMagazine);
+		//AddAction(ActionAdvancedDetachMagazine);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifleInnerMagazine_Base.c b/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifleInnerMagazine_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b9b44534d9e9def7f2d4ab73df774505bd0c808
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifleInnerMagazine_Base.c
@@ -0,0 +1,221 @@
+enum BARIMAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	OPENED 				= 1,
+	JAMMED 				= 2,
+};
+
+enum BARIMStableStateID
+{
+	UNKNOWN				=  0,
+	EmptyDischarged		=  1,
+	LoadedCharged		=  2,
+	LoadedDischarged	=  3,
+	LoadedJammed		=  4,
+}
+
+
+class BARIMEmptyDischarged extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { EmptyDischarged C0"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } EmptyDischarged C0"); } }
+	override int GetCurrentStateID () { return BARIMStableStateID.EmptyDischarged; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class BARIMLoadedCharged extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedCharged C1"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedCharged C1"); } }
+	override int GetCurrentStateID () { return BARIMStableStateID.LoadedCharged; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class BARIMLoadedDischarged extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedDischarged D1"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedDischarged D1"); } }
+	override int GetCurrentStateID () { return BARIMStableStateID.LoadedDischarged; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class BARIMLoadedJammed extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedJammed JF"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedJammed JF"); } }
+	override int GetCurrentStateID () { return BARIMStableStateID.LoadedJammed; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+
+/**@class		BoltRifle_Base
+ * @brief		base for bolt action rifles
+ * @NOTE		name copies config base class
+ **/
+class BoltActionRifle_InnerMagazine_Base extends BoltActionRifle_Base
+{
+	ref WeaponStableState C0;
+	ref	WeaponStableState C1;
+	ref	WeaponStableState D1;
+	ref	WeaponStableState JF;
+	
+	
+	override void InitStateMachine ()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		
+		
+		C0 = new BARIMEmptyDischarged(this, NULL, BARIMAnimState.DEFAULT);
+		C1 = new BARIMLoadedCharged(this, NULL, BARIMAnimState.DEFAULT);
+		JF = new BARIMLoadedJammed(this, NULL, BARIMAnimState.JAMMED);
+		D1 = new BARIMLoadedDischarged(this, NULL, BARIMAnimState.DEFAULT);
+		
+		WeaponStateBase	Mech_C1 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase	Mech_D1 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		
+		LoopedChambering Chamber_C0 = new LoopedChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChambering Chamber_C1 = new LoopedChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChambering Chamber_D1 = new LoopedChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		
+		WeaponStateBase	Unjam_JF = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+		
+		WeaponStateBase	Trigger_C0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase	Trigger_C1 = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase	Trigger_D1 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase	Trigger_JF = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		
+		WeaponStateBase	Trigger_C1J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM);
+
+		
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase	__M__ = new WeaponEventMechanism;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		
+		// Mechanism
+//----------------------------------------
+		m_fsm.AddTransition(new WeaponTransition( C0,			__M__,	Mech_C1));
+				
+		m_fsm.AddTransition(new WeaponTransition( C1,			__M__,	Mech_C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( D1,			__M__,	Mech_D1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_D1,		_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_D1,		_fin_,	D1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_D1,		_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_D1,		_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_D1,		_abt_,	D1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_D1,		_abt_,	C1));
+		
+		
+//----------------------------------------
+		
+		m_fsm.AddTransition(new WeaponTransition( C0,			__L__,	Chamber_C0));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C0,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__L__,	Chamber_C1, NULL, new GuardNot(new WeaponGuardInnerMagazineFullShareChamber(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C1,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C1,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( D1,			__L__,	Chamber_D1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_D1,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_D1,	_abt_,	D1, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_D1,	_abt_,	C1));
+		
+//------------------------------------------
+		
+		m_fsm.AddTransition(new WeaponTransition( JF, 			__U__,	Unjam_JF));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	JF, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	JF, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	C1));
+		
+		
+//-----------------------------------------
+		
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( C0,			__T__,	Trigger_C0)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_fin_,	C0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_dto_,	C0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_abt_,	C0));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__T__,	Trigger_C1)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_fin_,	D1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_rto_,	D1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_abt_,	D1));
+		
+		m_fsm.AddTransition(new WeaponTransition( D1,			__T__,	Trigger_D1)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_D1,	_fin_,	D1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_D1,	_dto_,	D1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_D1,	_abt_,	D1));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF,			__T__,	Trigger_JF)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_fin_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_dto_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_abt_,	JF));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__TJ_,	Trigger_C1J)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_fin_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_rto_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_abt_,	JF));
+		
+//---------------------------------------------	
+		
+		SetInitialState(C0);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+	}	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionLoadMultiBullet);
+
+		RemoveAction(FirearmActionLoadBulletQuick); // Easy reload
+		AddAction(FirearmActionLoadMultiBulletQuick); // Easy reload
+
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifle_Base.c b/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifle_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..75935d0b0bbeec0ae3186bf3364cdbdf041100f9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/BoltActionRifle_Base.c
@@ -0,0 +1,13 @@
+/**@class		BoltRifle_Base
+ * @brief		base for bolt action rifles
+ * @NOTE		name copies config base class
+ **/
+class BoltActionRifle_Base extends Weapon_Base
+{
+	override float GetChanceToJam()
+	{
+		return 0.0;
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/BoltRifle_Base.c b/scripts/4_World/DayZ/Entities/Firearms/BoltRifle_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a779ffea6e2f4201082bbd3f2a8b6283992c35a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/BoltRifle_Base.c
@@ -0,0 +1,9 @@
+/**@class		BoltRifle_Base
+ * @brief		base for bolt action rifles
+ * @NOTE		name copies config base class
+ **/
+class BoltRifle_Base extends Weapon_Base
+{
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/CupidsBoltSimulation.c b/scripts/4_World/DayZ/Entities/Firearms/CupidsBoltSimulation.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8136ba4256265ded9748ec69f3ac64fbfedf60c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/CupidsBoltSimulation.c
@@ -0,0 +1,19 @@
+class CupidsBoltSimulation : Managed
+{
+	protected Particle m_ParticleTail;
+	
+	void OnFire(Entity entity)
+	{
+		if (m_ParticleTail)
+			m_ParticleTail.Stop();
+
+		m_ParticleTail = ParticleManager.GetInstance().PlayOnObject(ParticleList.BOLT_CUPID_TAIL, entity);
+		m_ParticleTail.SetWiggle(7, 0.3);
+	}
+	
+	void ~CupidsBoltSimulation()
+	{
+		if (m_ParticleTail)
+			m_ParticleTail.Stop();
+	}	
+}
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Debug.c b/scripts/4_World/DayZ/Entities/Firearms/Debug.c
new file mode 100644
index 0000000000000000000000000000000000000000..22863035e91b91d875378ceb775deffc5593092b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Debug.c
@@ -0,0 +1,37 @@
+void wpnPrint (string s)
+{
+#ifdef WPN_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see at least important info
+#else
+	//Print("" + s); // comment/uncomment to hide/see at least important info
+#endif
+}
+void wpnDebugPrint (string s)
+{
+#ifdef WPN_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void wpnDebugSpam (string s)
+{
+#ifdef WPN_DEBUG_SPAM
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void wpnDebugSpamALot (string s)
+{
+#ifdef WPN_DEBUG_SPAM_FREQ
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+// @NOTE: to see output from FSM transitions, go to:
+//			4_World/Entities/HFSMBase.c
+// @see fsmDebugPrint @see fsmDebugSpam
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/DoubleBarrel_Base.c b/scripts/4_World/DayZ/Entities/Firearms/DoubleBarrel_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..3521c2502bf82fc1b7c81fa59c606f32ad859715
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/DoubleBarrel_Base.c
@@ -0,0 +1,323 @@
+enum DoubleBarrelAnimState
+{
+	DEFAULT 			= 0,	///< default weapon state, closed and discharged
+};
+
+enum DoubleBarrelStableStateID
+{
+	UNKNOWN				=	0,
+	LoadedLoaded		=	1,
+	LoadedEmpty			=	2,
+	FireoutLoaded		=	3,
+	FireoutFireout		=	4,
+	FireoutEmpty		=	5,
+	EmptyEmpty			=	6,
+	EmptyLoaded			=	7,
+	EmptyFireout		=	8,
+}
+
+enum MuzzleIndex
+{
+	First				=	0,
+	Second				=	1,
+}
+
+class DoubleBarrelLoadedLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedLoaded L_L"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.First); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedLoaded L_L"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.LoadedLoaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L, MuzzleState.L}; }
+};
+class DoubleBarrelLoadedEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedEmpty L_E"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.First);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedEmpty L_E"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.LoadedEmpty; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L, MuzzleState.E}; }
+};
+class DoubleBarrelEmptyLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { EmptyLoaded E_L"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.Second);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } EmptyLoaded E_L"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.EmptyLoaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E, MuzzleState.L}; }
+};
+class DoubleBarrelFireoutLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { FireoutLoaded F_L"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.Second);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } FireoutLoaded F_L"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.FireoutLoaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F, MuzzleState.L}; }
+};
+class DoubleBarrelFireoutFireout extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { FireoutFireout F_F"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.First);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } FireoutFireout F_F"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.FireoutFireout; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F, MuzzleState.F}; }
+};
+
+class DoubleBarrelFireoutEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { FireoutEmpty F_E"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.First);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } FireoutEmpty F_E"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.FireoutEmpty; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F, MuzzleState.E}; }
+};
+
+class DoubleBarrelEmptyFireout extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { EmptyFireout E_F"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.First);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } EmptyFireout E_F"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.EmptyFireout; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E, MuzzleState.F}; }
+};
+
+class DoubleBarrelEmptyEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { EmptyEmpty E_E"); } super.OnEntry(e); m_weapon.SetCurrentMuzzle(MuzzleIndex.First);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } EmptyEmpty E_E"); } }
+	override int GetCurrentStateID () { return DoubleBarrelStableStateID.EmptyEmpty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E, MuzzleState.E}; }
+};
+
+
+
+class DoubleBarrel_Base : Rifle_Base
+{
+	ref WeaponStableState L_L;
+	ref WeaponStableState L_E;
+	ref WeaponStableState E_L;
+	ref WeaponStableState F_L;
+	ref WeaponStableState F_F;
+	ref WeaponStableState F_E;
+	ref WeaponStableState E_F;
+	ref WeaponStableState E_E;
+	
+	override void InitStateMachine()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_END));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_1));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_2));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_3));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_4));
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+	
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		
+
+	
+		// basic weapon states
+		L_L = new DoubleBarrelLoadedLoaded(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		L_E = new DoubleBarrelLoadedEmpty(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		E_L = new DoubleBarrelEmptyLoaded(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		F_L = new DoubleBarrelFireoutLoaded(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		F_F = new DoubleBarrelFireoutFireout(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		F_E = new DoubleBarrelFireoutEmpty(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		E_F = new DoubleBarrelEmptyFireout(this, NULL, DoubleBarrelAnimState.DEFAULT);
+		E_E = new DoubleBarrelEmptyEmpty(this, NULL, DoubleBarrelAnimState.DEFAULT);
+	
+		
+		WeaponStateBase		Mech = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		ChamberMultiBullet	Chamber_E = new ChamberMultiBullet(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_2,WeaponActionChamberingTypes.CHAMBERING_END);
+		ChamberMultiBullet	Chamber_L_E = new ChamberMultiBullet(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_3,WeaponActionChamberingTypes.CHAMBERING_END);
+		ChamberMultiBullet	Chamber_F_L = new ChamberMultiBullet(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_4,WeaponActionChamberingTypes.CHAMBERING_END);
+		ChamberMultiBullet	Chamber_E_L = new ChamberMultiBullet(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_1,WeaponActionChamberingTypes.CHAMBERING_END);
+		
+		WeaponStateBase		Unjam_J = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+		
+		WeaponStateBase		Trigger_L_E = new WeaponFireMultiMuzzle(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase		Trigger_E_L = new WeaponFireMultiMuzzle(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase		Trigger_F_L = new WeaponFireMultiMuzzle(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase		Trigger_L_L = new WeaponFireMultiMuzzle(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		
+		WeaponStateBase		Trigger_F_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase		Trigger_F_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase		Trigger_E_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase		Trigger_E_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		//WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase	__M__ = new WeaponEventMechanism;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		
+		m_fsm.AddTransition(new WeaponTransition( E_E,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( L_L,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( L_E,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( E_L,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( F_L,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( F_F,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( F_E,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition( E_F,			__M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_fin_,	E_E));
+		
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	F_F, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	F_E, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberEmpty(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	E_F, NULL, new GuardAnd( new WeaponGuardChamberEmpty(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	F_L, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	L_L, NULL, new GuardAnd( new WeaponGuardChamberFull(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	L_E, NULL, new GuardAnd( new WeaponGuardChamberFull(this, MuzzleIndex.First), new WeaponGuardChamberEmpty(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	E_L, NULL, new GuardAnd( new WeaponGuardChamberEmpty(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	E_E));
+		
+		m_fsm.AddTransition(new WeaponTransition( F_F,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition( F_E,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition( E_F,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition( E_E,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	L_E, NULL, new WeaponGuardChamberEmpty(this, MuzzleIndex.Second)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	L_L));
+		
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	F_F, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	F_E, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberEmpty(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	E_F, NULL, new GuardAnd( new WeaponGuardChamberEmpty(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	L_L, NULL, new GuardAnd( new WeaponGuardChamberFull(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	L_E, NULL, new GuardAnd( new WeaponGuardChamberFull(this, MuzzleIndex.First), new WeaponGuardChamberEmpty(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	E_E));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( L_E,			__L__,	Chamber_L_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L_E,	_abt_,	L_L, NULL, new WeaponGuardChamberFull(this, MuzzleIndex.Second)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L_E,	_abt_,	L_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L_E,	_fin_,	L_L, NULL, new WeaponGuardChamberFull(this, MuzzleIndex.Second)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L_E,	_fin_,	L_E));
+		
+		m_fsm.AddTransition(new WeaponTransition( E_L,			__L__,	Chamber_E_L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E_L,	_abt_,	L_L, NULL, new WeaponGuardChamberFull(this, MuzzleIndex.First)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E_L,	_abt_,	E_L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E_L,	_fin_,	L_L, NULL, new WeaponGuardChamberFull(this, MuzzleIndex.First)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E_L,	_fin_,	E_L));
+		
+		m_fsm.AddTransition(new WeaponTransition( F_L,			__L__,	Chamber_F_L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_abt_,	F_L, NULL, new WeaponGuardChamberFiredOut(this, MuzzleIndex.First)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_abt_,	L_L, NULL, new GuardAnd( new WeaponGuardChamberFull(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_abt_,	E_L, NULL, new GuardAnd( new WeaponGuardChamberEmpty(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_abt_,	L_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_fin_,	F_L, NULL, new WeaponGuardChamberFiredOut(this, MuzzleIndex.First)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_fin_,	L_L, NULL, new GuardAnd( new WeaponGuardChamberFull(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_fin_,	E_L, NULL, new GuardAnd( new WeaponGuardChamberEmpty(this, MuzzleIndex.First), new WeaponGuardChamberFull(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F_L,	_fin_,	L_E));
+		
+		m_fsm.AddTransition(new WeaponTransition( L_E,			__T__,	Trigger_L_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_E,	_fin_,	F_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_E,	_rto_,	F_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_E,	_abt_,	F_E));
+		
+		m_fsm.AddTransition(new WeaponTransition( E_L,			__T__,	Trigger_E_L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_L,	_fin_,	E_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_L,	_rto_,	E_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_L,	_abt_,	E_F));
+		
+		m_fsm.AddTransition(new WeaponTransition( F_L,			__T__,	Trigger_F_L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_L,	_fin_,	F_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_L,	_rto_,	F_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_L,	_abt_,	F_F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L_L,			__T__,	Trigger_L_L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_L,	_fin_,	F_F, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_L,	_rto_,	F_F, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_L,	_abt_,	F_F, NULL, new GuardAnd( new WeaponGuardChamberFiredOut(this, MuzzleIndex.First), new WeaponGuardChamberFiredOut(this, MuzzleIndex.Second))));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_L,	_fin_,	F_L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_L,	_rto_,	F_L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L_L,	_abt_,	F_L));
+		
+		m_fsm.AddTransition(new WeaponTransition( F_F,			__T__,	Trigger_F_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_F,	_fin_,	F_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_F,	_dto_,	F_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_F,	_abt_,	F_F));
+		
+		m_fsm.AddTransition(new WeaponTransition( F_E,			__T__,	Trigger_F_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_E,	_fin_,	F_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_E,	_dto_,	F_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F_E,	_abt_,	F_E));
+		
+		m_fsm.AddTransition(new WeaponTransition( E_F,			__T__,	Trigger_E_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_F,	_fin_,	E_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_F,	_dto_,	E_F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_F,	_abt_,	E_F));
+		
+		m_fsm.AddTransition(new WeaponTransition( E_E,			__T__,	Trigger_E_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_E,	_fin_,	E_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_E,	_dto_,	E_E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E_E,	_abt_,	E_E));
+		
+		
+		
+		SetInitialState(E_E);
+		
+		for(int i = 0; i < GetMuzzleCount(); i++)
+		{
+			HideBullet(i);
+		}
+		m_fsm.Start();
+	
+	}
+
+	override bool CanChamberBullet (int muzzleIndex, Magazine mag)
+	{
+		for(int i = 0; i < GetMuzzleCount(); i++)
+		{
+			if( CanChamberFromMag(i, mag) )
+			{
+				if(IsChamberEmpty(i))
+					return true;
+				
+				if(IsChamberFiredOut(i))
+					return true;
+			} 
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionLoadMultiBullet);
+
+		RemoveAction(FirearmActionLoadBulletQuick); // Easy reload
+		AddAction(FirearmActionLoadMultiBulletQuick); // Easy reload
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/Actions.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/Actions.c
new file mode 100644
index 0000000000000000000000000000000000000000..59f06e4ea1c50f2660c8e69a39acedef36df3434
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/Actions.c
@@ -0,0 +1,38 @@
+/**@class	WeaponActionBase
+ * @brief	represents action executed on transition just between OnExit from old state and OnEntry to new state
+ **/
+class WeaponActionBase
+{
+	/**@fn		Action
+	 * @brief	executed when transition occurs
+	 **/
+	void Action (WeaponEventBase e) { }
+};
+
+// FSM Actions /////////////////////////////////////////////////////////////////////////////////////////////////////////
+// fire
+class WeaponActionDryFire extends WeaponActionBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponActionDryFire (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override void Action (WeaponEventBase e)
+	{
+		Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " action=dry fire");
+		int mi = m_weapon.GetCurrentMuzzle();
+		m_weapon.DryFire(mi);
+	}
+};
+class WeaponActionDryDryFire extends WeaponActionBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponActionDryDryFire (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override void Action (WeaponEventBase e)
+	{
+		Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " action=dry dry fire");
+		int mi = m_weapon.GetCurrentMuzzle();
+		m_weapon.DryDryFire(mi);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/Events.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/Events.c
new file mode 100644
index 0000000000000000000000000000000000000000..60334a6b99bfbc12b166d72bb182df5be5c9bbae
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/Events.c
@@ -0,0 +1,430 @@
+/**@enum	WeaponEventID
+ * @brief	identifier for events.
+ * mainly for rpc purposes
+ **/
+enum WeaponEventID
+{
+	UNKNOWN,
+	MECHANISM,
+	TRIGGER,
+	TRIGGER_JAM,
+	TRIGGER_AUTO_START,
+	TRIGGER_AUTO_END,
+	LOAD1_BULLET,
+	CONTINUOUS_LOADBULLET_START,
+	CONTINUOUS_LOADBULLET_END,
+	UNJAM,
+	ATTACH_MAGAZINE,
+	UNJAMMING_FAILED_TIMEOUT,
+	UNJAMMING_TIMEOUT,
+	DETACH_MAGAZINE,
+	SWAP_MAGAZINE,
+	HUMANCOMMAND_ACTION_FINISHED,
+	HUMANCOMMAND_ACTION_ABORTED,
+	RELOAD_TIMEOUT,
+	DRY_FIRE_TIMEOUT,
+	SET_NEXT_MUZZLE_MODE,
+	ANIMATION_EVENT,
+};
+
+
+/**@class	WeaponEventBase
+ * @brief	represents event that triggers transition from state to state
+ **/
+class WeaponEventBase
+{
+	int m_eventID;
+	DayZPlayer m_player;
+	Magazine m_magazine;
+
+	void WeaponEventBase (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = 0; m_player = p; m_magazine = m; }
+	/// returns id from enum WeaponEventID
+	WeaponEventID GetEventID () { return m_eventID; }
+	/// returns animation event from anim engine, @see WeaponEvents
+	WeaponEvents GetAnimEvent () { return -1; }
+	/// returns eventID in upper 16 bits and AnimEvent in lower 16 bits
+	int GetPackedType ()
+	{
+		int animEvent = GetAnimEvent() & 0x0000ffff;
+		int evShl = m_eventID << 16;
+		return evShl | animEvent;
+	}
+
+	void ReadFromContext (ParamsReadContext ctx) { }
+	void WriteToContext (ParamsWriteContext ctx)
+	{
+		int packedType = GetPackedType();
+		ctx.Write(packedType);
+		ctx.Write(m_player);
+		ctx.Write(m_magazine);
+	}
+	
+	string DumpToString ()
+	{
+		string res = "{ WpnEv id=" + typename.EnumToString(WeaponEventID, GetEventID());
+		res = res + " pl=" + Object.GetDebugName(m_player);
+		res = res + " mag=" + Object.GetDebugName(m_magazine);
+		res = res + " }";
+		return res;
+	}
+};
+
+/**@brief		signalize mechanism manipulation
+ **/
+class WeaponEventMechanism extends WeaponEventBase
+{
+	void WeaponEventMechanism (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.MECHANISM; }
+};
+/**@brief		event when trigger pressed
+ **/
+class WeaponEventTrigger extends WeaponEventBase
+{
+	void WeaponEventTrigger (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.TRIGGER; }
+};
+/**@brief		event when trigger pressed
+ **/
+class WeaponEventTriggerToJam extends WeaponEventBase
+{
+	void WeaponEventTriggerToJam (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.TRIGGER_JAM; }
+};
+/**@brief		event when trigger pressed
+ **/
+class WeaponEventTriggerAutoStart extends WeaponEventBase
+{
+	void WeaponEventTriggerAutoStart (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.TRIGGER_AUTO_START; }
+};
+/**@brief		event when trigger pressed
+ **/
+class WeaponEventTriggerAutoEnd extends WeaponEventBase
+{
+	void WeaponEventTriggerAutoEnd (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.TRIGGER_AUTO_END; }
+};
+/**@brief		event when user wants to load 1 bullet
+ **/
+class WeaponEventLoad1Bullet extends WeaponEventBase
+{
+	void WeaponEventLoad1Bullet (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.LOAD1_BULLET; }
+};
+/**@brief		event when user wants to load N bullets
+ **/
+class WeaponEventContinuousLoadBulletStart extends WeaponEventBase
+{
+	void WeaponEventContinuousLoadBulletStart (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.CONTINUOUS_LOADBULLET_START; }
+};
+/**@brief		event when user wants to end loading of bullets
+ **/
+class WeaponEventContinuousLoadBulletEnd extends WeaponEventBase
+{
+	void WeaponEventContinuousLoadBulletEnd (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.CONTINUOUS_LOADBULLET_END; }
+};
+/**@brief		event when user wants to unjam weapon
+ **/
+class WeaponEventUnjam extends WeaponEventBase
+{
+	void WeaponEventUnjam (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.UNJAM; }
+};
+/**@brief		event when user wants to attach magazine
+ **/
+class WeaponEventAttachMagazine extends WeaponEventBase
+{
+	void WeaponEventAttachMagazine (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.ATTACH_MAGAZINE; }
+};
+/**@brief		triggered when unjamming timer expires
+ **/
+class WeaponEventUnjammingFailedTimeout extends WeaponEventBase
+{
+	void WeaponEventUnjammingFailedTimeout (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.UNJAMMING_FAILED_TIMEOUT; }
+};
+/**@brief		triggered when unjamming failed timer expires
+ **/
+class WeaponEventUnjammingTimeout extends WeaponEventBase
+{
+	void WeaponEventUnjammingTimeout (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.UNJAMMING_TIMEOUT; }
+};
+/**@brief		event when user wants to detach magazine
+ * @param dst \p  inventory location where the magazine will be stored
+ **/
+class WeaponEventDetachMagazine extends WeaponEventBase
+{
+	ref InventoryLocation m_dst;
+	void WeaponEventDetachMagazine (DayZPlayer p = NULL, Magazine m = NULL, InventoryLocation il = NULL) { m_eventID =  WeaponEventID.DETACH_MAGAZINE; m_dst = il; }
+
+	override void ReadFromContext (ParamsReadContext ctx)
+	{
+		m_dst = new InventoryLocation;
+		super.ReadFromContext(ctx);
+		m_dst.ReadFromContext(ctx);
+	}
+	override void WriteToContext (ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+		m_dst.WriteToContext(ctx);
+	}
+};
+/**@brief		event when user wants to swap magazine
+ **/
+class WeaponEventSwapMagazine extends WeaponEventBase
+{
+	ref InventoryLocation m_dst;
+	void WeaponEventSwapMagazine (DayZPlayer p = NULL, Magazine m = NULL, InventoryLocation il = NULL){ m_eventID = WeaponEventID.SWAP_MAGAZINE;m_dst = il; }
+	
+	override void ReadFromContext (ParamsReadContext ctx)
+	{
+		super.ReadFromContext(ctx);
+		m_dst = new InventoryLocation;
+		m_dst.ReadFromContext(ctx);
+	}
+	override void WriteToContext (ParamsWriteContext ctx)
+	{
+		super.WriteToContext(ctx);
+		m_dst.WriteToContext(ctx);
+	}
+};
+/**@brief		triggered when animation action finishes
+ **/
+class WeaponEventHumanCommandActionFinished extends WeaponEventBase
+{
+	void WeaponEventHumanCommandActionFinished (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.HUMANCOMMAND_ACTION_FINISHED; }
+};
+/**@brief		triggered when animation action aborts
+ **/
+class WeaponEventHumanCommandActionAborted extends WeaponEventBase
+{
+	void WeaponEventHumanCommandActionAborted (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.HUMANCOMMAND_ACTION_ABORTED; }
+};
+/**@brief		triggered when reload timer expires
+ **/
+class WeaponEventReloadTimeout extends WeaponEventBase
+{
+	void WeaponEventReloadTimeout (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.RELOAD_TIMEOUT; }
+};
+/**@brief		triggered when dry fire timer expires
+ **/
+class WeaponEventDryFireTimeout extends WeaponEventBase
+{
+	void WeaponEventDryFireTimeout (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.DRY_FIRE_TIMEOUT; }
+};
+
+/**@brief		triggered when dry fire timer expires
+ **/
+class WeaponEventSetNextMuzzleMode extends WeaponEventBase
+{
+	void WeaponEventSetNextMuzzleMode (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.SET_NEXT_MUZZLE_MODE; }
+};
+
+class WeaponEventAnimation extends WeaponEventBase
+{
+	WeaponEvents m_type; /// animation event from Human.WeaponEvents
+	void WeaponEventAnimation (DayZPlayer p = NULL, Magazine m = NULL) { m_eventID = WeaponEventID.ANIMATION_EVENT; }
+	override int GetAnimEvent () { return m_type; }
+};
+
+/// creates weapon fsm events
+WeaponEventBase WeaponEventFactory (WeaponEventID id, int aetype, DayZPlayer p = NULL, Magazine m = NULL)
+{
+	switch (id)
+	{
+		case WeaponEventID.UNKNOWN: return null;
+		case WeaponEventID.MECHANISM: return new WeaponEventMechanism(p, m);
+		case WeaponEventID.TRIGGER: return new WeaponEventTrigger(p, m);
+		case WeaponEventID.TRIGGER_JAM: return new WeaponEventTriggerToJam(p, m);
+		case WeaponEventID.LOAD1_BULLET: return new WeaponEventLoad1Bullet(p, m);
+		case WeaponEventID.CONTINUOUS_LOADBULLET_START: return new WeaponEventContinuousLoadBulletStart(p, m);
+		case WeaponEventID.CONTINUOUS_LOADBULLET_END: return new WeaponEventContinuousLoadBulletEnd(p, m);
+		case WeaponEventID.UNJAM: return new WeaponEventUnjam(p, m);
+		case WeaponEventID.ATTACH_MAGAZINE: return new WeaponEventAttachMagazine(p, m);
+		case WeaponEventID.UNJAMMING_FAILED_TIMEOUT: return new WeaponEventUnjammingFailedTimeout(p, m);
+		case WeaponEventID.UNJAMMING_TIMEOUT: return new WeaponEventUnjammingTimeout(p, m);
+		case WeaponEventID.DETACH_MAGAZINE: return new WeaponEventDetachMagazine(p, m);
+		case WeaponEventID.SWAP_MAGAZINE: return new WeaponEventSwapMagazine(p, m);
+		case WeaponEventID.HUMANCOMMAND_ACTION_FINISHED: return new WeaponEventHumanCommandActionFinished(p, m);
+		case WeaponEventID.HUMANCOMMAND_ACTION_ABORTED: return new WeaponEventHumanCommandActionAborted(p, m);
+		case WeaponEventID.RELOAD_TIMEOUT: return new WeaponEventReloadTimeout(p, m);
+		case WeaponEventID.DRY_FIRE_TIMEOUT: return new WeaponEventDryFireTimeout(p, m);
+		case WeaponEventID.SET_NEXT_MUZZLE_MODE: return new WeaponEventSetNextMuzzleMode(p, m);
+		case WeaponEventID.ANIMATION_EVENT: return WeaponAnimEventFactory(aetype, p, m);
+	}
+	return NULL;
+}
+
+/// creates animation system events
+WeaponEventBase WeaponAnimEventFactory (WeaponEvents type, DayZPlayer p = NULL, Magazine m = NULL)
+{
+	switch (type)
+	{
+		case WeaponEvents.ATTACHMENT_HIDE: return new WeaponEventAnimAttachmentHide(p, m);
+		case WeaponEvents.ATTACHMENT_SHOW: return new WeaponEventAnimAttachmentShow(p, m);
+		case WeaponEvents.BULLET_EJECT: return new WeaponEventAnimBulletEject(p, m);
+		case WeaponEvents.BULLET_HIDE: return new WeaponEventAnimBulletHide(p, m);
+		case WeaponEvents.BULLET_HIDE2: return new WeaponEventAnimBulletHide2(p, m);
+		case WeaponEvents.BULLET_IN_CHAMBER: return new WeaponEventAnimBulletInChamber(p, m);
+		case WeaponEvents.BULLET_IN_MAGAZINE: return new WeaponEventAnimBulletInMagazine(p, m);
+		case WeaponEvents.BULLET_SHOW: return new WeaponEventAnimBulletShow(p, m);
+		case WeaponEvents.BULLET_SHOW2: return new WeaponEventAnimBulletShow2(p, m);
+		case WeaponEvents.CANUNJAM_END: return new WeaponEventAnimCanUnjamEnd(p, m);
+		case WeaponEvents.CANUNJAM_START: return new WeaponEventAnimCanUnjamStart(p, m);
+		case WeaponEvents.COCKED: return new WeaponEventAnimCocked(p, m);
+		case WeaponEvents.MAGAZINE_ATTACHED: return new WeaponEventAnimMagazineAttached(p, m);
+		case WeaponEvents.MAGAZINE_DETACHED: return new WeaponEventAnimMagazineDetached(p, m);
+		case WeaponEvents.MAGAZINE_HIDE: return new WeaponEventAnimMagazineHide(p, m);
+		case WeaponEvents.MAGAZINE_SHOW: return new WeaponEventAnimMagazineShow(p, m);
+		case WeaponEvents.SLIDER_OPEN: return new WeaponEventAnimSliderOpen(p, m);
+		case WeaponEvents.UNJAMMED: return new WeaponEventAnimUnjammed(p, m);
+		case WeaponEvents.HAMMER_UNCOCKED: return new WeaponEventAnimHammerUncocked(p, m);
+		case WeaponEvents.HAMMER_COCKED: return new WeaponEventAnimHammerCocked(p, m);
+		case WeaponEvents.CYLINDER_ROTATE: return new WeaponEventCylinderRotate(p, m);
+		//case WeaponEvents.: return new WeaponEventAnim(p, m);
+	}
+	return NULL;
+}
+
+WeaponEventBase CreateWeaponEventFromContext (ParamsReadContext ctx)
+{
+	int packedType;
+	ctx.Read(packedType);
+	DayZPlayer player;
+	ctx.Read(player);
+	Magazine magazine;
+	ctx.Read(magazine);
+
+	WeaponEventID eventID = packedType >> 16;
+	WeaponEvents animEvent = packedType & 0x0000ffff;
+	WeaponEventBase b = WeaponEventFactory(eventID, animEvent, player, magazine);
+	b.ReadFromContext(ctx);
+	return b;
+}
+
+class WeaponEventAnimAttachmentHide extends WeaponEventAnimation
+{
+	void WeaponEventAnimAttachmentHide (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.ATTACHMENT_HIDE; }
+};
+
+class WeaponEventAnimAttachmentShow extends WeaponEventAnimation
+{
+	void WeaponEventAnimAttachmentShow (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.ATTACHMENT_SHOW; }
+};
+
+class WeaponEventAnimBulletEject extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletEject (DayZPlayer p = NULL, Magazine m = NULL) 
+	{ 
+		m_type = WeaponEvents.BULLET_EJECT; 
+		
+		// Particles for ejecting bullet casings
+		PlayerBase player = PlayerBase.Cast(p);
+		
+		if (player)
+		{
+			ItemBase weapon = player.GetItemInHands();
+			
+			if (weapon  &&  weapon.GetOverheatingValue() > 0)
+			{
+				Weapon_Base weapon_base = Weapon_Base.Cast(weapon);
+				ItemBase suppressor;
+				
+				if (weapon_base)
+					suppressor = weapon_base.GetAttachedSuppressor();
+				
+				ItemBase.PlayBulletCasingEjectParticles(weapon, "", weapon, suppressor, "CfgWeapons" );
+			}
+		}
+	}
+};
+
+class WeaponEventCylinderRotate extends WeaponEventAnimation
+{
+	void WeaponEventCylinderRotate (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.CYLINDER_ROTATE; }
+};
+
+class WeaponEventAnimBulletHide extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletHide (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.BULLET_HIDE; }
+};
+
+class WeaponEventAnimBulletHide2 extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletHide2 (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.BULLET_HIDE2; }
+};
+
+class WeaponEventAnimBulletInChamber extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletInChamber (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.BULLET_IN_CHAMBER; }
+};
+
+class WeaponEventAnimBulletInMagazine extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletInMagazine (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.BULLET_IN_MAGAZINE; }
+};
+
+class WeaponEventAnimBulletShow extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletShow (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.BULLET_SHOW; }
+};
+
+class WeaponEventAnimBulletShow2 extends WeaponEventAnimation
+{
+	void WeaponEventAnimBulletShow2 (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.BULLET_SHOW2; }
+};
+
+class WeaponEventAnimCanUnjamEnd extends WeaponEventAnimation
+{
+	void WeaponEventAnimCanUnjamEnd (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.CANUNJAM_END; }
+};
+
+class WeaponEventAnimCanUnjamStart extends WeaponEventAnimation
+{
+	void WeaponEventAnimCanUnjamStart (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.CANUNJAM_START; }
+};
+
+class WeaponEventAnimCocked extends WeaponEventAnimation
+{
+	void WeaponEventAnimCocked (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.COCKED; }
+};
+
+class WeaponEventAnimMagazineAttached extends WeaponEventAnimation
+{
+	void WeaponEventAnimMagazineAttached (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.MAGAZINE_ATTACHED; }
+};
+
+class WeaponEventAnimMagazineDetached extends WeaponEventAnimation
+{
+	void WeaponEventAnimMagazineDetached (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.MAGAZINE_DETACHED; }
+};
+
+class WeaponEventAnimMagazineHide extends WeaponEventAnimation
+{
+	void WeaponEventAnimMagazineHide (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.MAGAZINE_HIDE; }
+};
+
+class WeaponEventAnimMagazineShow extends WeaponEventAnimation
+{
+	void WeaponEventAnimMagazineShow (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.MAGAZINE_SHOW; }
+};
+
+class WeaponEventAnimSliderOpen extends WeaponEventAnimation
+{
+	void WeaponEventAnimSliderOpen (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.SLIDER_OPEN; }
+};
+
+class WeaponEventAnimUnjammed extends WeaponEventAnimation
+{
+	void WeaponEventAnimUnjammed (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.UNJAMMED; }
+};
+
+
+class WeaponEventAnimHammerUncocked extends WeaponEventAnimation
+{
+	void WeaponEventAnimHammerUncocked (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.HAMMER_UNCOCKED; }
+};
+
+class WeaponEventAnimHammerCocked extends WeaponEventAnimation
+{
+	void WeaponEventAnimHammerCocked (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.HAMMER_COCKED; }
+};
+
+/*
+class WeaponEventAnim extends WeaponEventAnimation
+{
+	void WeaponEventAnim (DayZPlayer p = NULL, Magazine m = NULL) { m_type = WeaponEvents.; }
+};
+*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/Guards.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/Guards.c
new file mode 100644
index 0000000000000000000000000000000000000000..a3c8a1c3d6794f43f5dcf22b789a61a340ccfcdd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/Guards.c
@@ -0,0 +1,609 @@
+/**@class	WeaponGuardBase
+ * @brief	represents guard on a transition from state to state
+ **/
+class WeaponGuardBase
+{
+	/**@fn		GuardCondition
+	 * @brief enable or disable transition based on condition
+	 * the guard is a boolean operation executed first and which can prevent the transition from firing by returning false
+	 * @return	true if transition is allowed
+	 **/
+	bool GuardCondition (WeaponEventBase e) { return true; }
+};
+
+class GuardAnd extends WeaponGuardBase
+{
+	ref WeaponGuardBase m_arg0;
+	ref WeaponGuardBase m_arg1;
+
+	void GuardAnd (WeaponGuardBase arg0 = NULL, WeaponGuardBase arg1 = NULL) { m_arg0 = arg0; m_arg1 = arg1; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		bool result = m_arg0.GuardCondition(e) && m_arg1.GuardCondition(e);
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - " + m_arg0.Type() + " && " + m_arg1.Type() + " = " + result); }
+		return result;
+	}
+};
+
+class GuardNot extends WeaponGuardBase
+{
+	ref WeaponGuardBase m_arg0;
+
+	void GuardNot (WeaponGuardBase arg0 = NULL) { m_arg0 = arg0; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		bool result = !m_arg0.GuardCondition(e);
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - ! " + m_arg0.Type() + " = " + result); }
+		return result;
+	}
+};
+
+class GuardOr extends WeaponGuardBase
+{
+	ref WeaponGuardBase m_arg0;
+	ref WeaponGuardBase m_arg1;
+
+	void GuardOr (WeaponGuardBase arg0 = NULL, WeaponGuardBase arg1 = NULL) { m_arg0 = arg0; m_arg1 = arg1; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		bool result = m_arg0.GuardCondition(e) || m_arg1.GuardCondition(e);
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - " + m_arg0.Type() + " || " + m_arg1.Type() + " = " + result); }
+		return result;
+	}
+};
+
+// guards /////////////////////////////////////////////////////////////////////////////////////////////////////////////
+
+class WeaponGuardJammed extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardJammed (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		/*int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.IsChamberJammed(mi))*/
+		if (m_weapon.IsJammed())
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - jammed"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - not jammed"); }
+		return false;
+	}
+};
+
+class WeaponGuardIsDestroyed extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardIsDestroyed (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		if (m_weapon.IsDamageDestroyed())
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - weapon destroyed"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - weapon not destroyed"); }
+		return false;
+	}
+}
+
+class WeaponGuardHasAmmo extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardHasAmmo (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		Magazine mag = m_weapon.GetMagazine(mi);
+		if (mag != NULL && mag.GetAmmoCount() > 0)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - has ammo"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - no ammo"); }
+		return false;
+	}
+};
+
+class WeaponGuardHasAmmoInnerMagazine extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardHasAmmoInnerMagazine (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.GetInternalMagazineCartridgeCount(mi) >= 1)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - has ammo in inner magazine"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - no ammo in inner magazine"); }
+		return false;
+	}
+};
+
+class WeaponGuardHasAmmoInEvent extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardHasAmmoInEvent (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		Magazine mag = e.m_magazine;
+		if (mag != NULL && mag.GetAmmoCount() > 0)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - has ammo in event"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - no ammo in event"); }
+		return false;
+	}
+};
+
+
+class WeaponGuardHasMag extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardHasMag (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		Magazine mag = m_weapon.GetMagazine(mi);
+		if (mag != NULL)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - has magazine"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - no magazine"); }
+		return false;
+	}
+};
+
+class WeaponGuardChamberEmpty extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	protected int m_muzzle;
+	void WeaponGuardChamberEmpty (Weapon_Base w = NULL, int muzzle_index = 0 ) { m_weapon = w; m_muzzle = muzzle_index; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		if (m_weapon.IsChamberEmpty(m_muzzle))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber (" + m_muzzle + ") empty"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber (" + m_muzzle + ") not empty"); }
+		return false;
+	}
+};
+
+class WeaponGuardCurrentChamberEmpty extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardCurrentChamberEmpty (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.IsChamberEmpty(mi))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber empty"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber not empty"); }
+		return false;
+	}
+};
+
+class WeaponGuardAnyChamberEmpty extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	protected int m_muzzle;
+	void WeaponGuardAnyChamberEmpty (Weapon_Base w = NULL, int muzzle_index = 0 ) { m_weapon = w; m_muzzle = muzzle_index; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		for (int i = 0; i < m_weapon.GetMuzzleCount(); i++)
+		{
+			if (m_weapon.IsChamberEmpty(i))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - multi chamber (" + i + ") empty"); }
+				return true;
+			}
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - no chamber empty"); }
+		return false;
+	}
+};
+
+class WeaponGuardChamberFull extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	protected int m_muzzle;
+	void WeaponGuardChamberFull (Weapon_Base w = NULL, int muzzle_index = 0 ) { m_weapon = w; m_muzzle = muzzle_index; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		if (m_weapon.IsChamberFull(m_muzzle))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber (" + m_muzzle + ") full"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber (" + m_muzzle + ") not full"); }
+		return false;
+	}
+};
+
+class WeaponGuardCurrentChamberFull extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardCurrentChamberFull (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.IsChamberFull(mi))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber full"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber not full"); }
+		return false;
+	}
+};
+
+
+class WeaponGuardInnerMagazineFull extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardInnerMagazineFull (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.IsInternalMagazineFull(mi))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - internal magazine full"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - internal magazine not full"); }
+		return false;
+	}
+};
+
+class WeaponGuardInnerMagazineFullShareChamber extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardInnerMagazineFullShareChamber (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		
+		if ( m_weapon.IsChamberFull(mi) && m_weapon.IsInternalMagazineFull(mi))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - internal magazine with share chamber is full"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - internal magazine with share chamber is not full"); }
+		return false;
+	}
+}; 
+
+class WeaponGuardChamberFiredOut extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	protected int m_muzzle;
+	void WeaponGuardChamberFiredOut (Weapon_Base w = NULL, int muzzle_index = 0 ) { m_weapon = w; m_muzzle = muzzle_index; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		if (m_weapon.IsChamberFiredOut(m_muzzle))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber (" + m_muzzle + ") fireout"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber (" + m_muzzle + ") not fireout"); }
+		return false;
+	}
+};
+
+class WeaponGuardCurrentChamberFiredOut extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardCurrentChamberFiredOut (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.IsChamberFiredOut(mi))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber fired out"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber not fired out"); }
+		return false;
+	}
+};
+
+class WeaponGuardAnyChamberFiredOut extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardAnyChamberFiredOut (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		for (int i = 0; i < m_weapon.GetMuzzleCount(); i++)
+		{
+			if (m_weapon.IsChamberFiredOut(i))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - multi chamber (" + i + ") fired out"); }
+				return true;
+			}
+		}
+
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - any chamber has not fired out"); }
+		return false;
+	}
+};
+
+class WeaponGuardCanAttachMag extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardCanAttachMag (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon && e.m_magazine && m_weapon.CanAttachMagazine(mi, e.m_magazine))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - can attach magazine"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - cannot attach magazine"); }
+		return false;
+	}
+};
+
+class WeaponGuardCanSwapMag extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardCanSwapMag (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		Magazine attached_mag = m_weapon.GetMagazine(mi);
+		if (m_weapon && e.m_magazine && e.m_magazine != attached_mag /*&& m_weapon.CanSwapMagazine(mi, e.m_magazine)*/)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - can swap magazine"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - cannot swap magazine"); }
+		return false;
+	}
+};
+
+class WeaponGuardCanDetachMag extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardCanDetachMag (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon && e.m_magazine && m_weapon.GetMagazine(mi)/* && m_weapon.CanDetachMagazine(mi, e.m_magazine)*/)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - can detach magazine"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - cannot detach magazine"); }
+		return false;
+	}
+};
+
+class WeaponGuardChamberHasRoomForMoreThanOne extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardChamberHasRoomForMoreThanOne (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.GetInternalMagazineMaxCartridgeCount(mi) - m_weapon.GetInternalMagazineCartridgeCount(mi) > 1)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has room for more than 1b"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has no room for more than 1b"); }
+		return false;
+	}
+};
+
+class WeaponGuardInternalMagazineHasRoomForBullet extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardInternalMagazineHasRoomForBullet (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.GetInternalMagazineMaxCartridgeCount(mi) - m_weapon.GetInternalMagazineCartridgeCount(mi) >= 1)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has room for bullet"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has no room for bullet"); }
+		return false;
+	}
+};
+
+class WeaponGuardChamberHasRoomForOne extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardChamberHasRoomForOne (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.GetTotalMaxCartridgeCount(mi) - m_weapon.GetTotalCartridgeCount(mi) == 1)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has room for 1b"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has no room for 1b"); }
+		return false;
+	}
+};
+
+class WeaponGuardChamberMultiHasRoomBulltet extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardChamberMultiHasRoomBulltet (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int i = m_weapon.GetMuzzleCount() - 1;
+		for ( ; i >= 0; i--)
+		{
+			if (m_weapon.GetTotalMaxCartridgeCount(i) - m_weapon.GetTotalCartridgeCount(i) >= 1)
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has room for 1b"); }
+				return true;
+			}
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has no room for 1b"); }
+		}
+		return false;
+	}
+};
+
+class WeaponGuardChamberMultiHasRoomBulltetIgnoreLast extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardChamberMultiHasRoomBulltetIgnoreLast (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int i = m_weapon.GetMuzzleCount() - 1;
+		bool emty_one = false;
+		for ( ; i >= 0; i--)
+		{
+			if (m_weapon.GetTotalMaxCartridgeCount(i) - m_weapon.GetTotalCartridgeCount(i) >= 1)
+			{
+				if ( !emty_one )
+				{
+					emty_one = true;
+				}
+				else
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has room for 1b"); }
+					return true;
+				}
+			}
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - chamber has no room for 1b"); }
+		}
+		return false;
+	}
+};
+
+
+class WeaponGuardHasAmmoInLoopedState extends WeaponGuardBase
+{
+	WeaponChambering_Base m_state;
+	void WeaponGuardHasAmmoInLoopedState (WeaponChambering_Base state) { m_state = state; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		Magazine mag = m_state.m_srcMagazine;
+		if (mag != NULL && mag.GetAmmoCount() > 0)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - has ammo in looped state"); }
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - no ammo in looped state"); }
+		return false;
+	}
+};
+
+class WeaponGuardMagazinesHaveEqualSizes extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	void WeaponGuardMagazinesHaveEqualSizes (Weapon_Base w = NULL) { m_weapon = w; }
+
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		Magazine mag = m_weapon.GetMagazine(mi);
+		Magazine mag2 = e.m_magazine;
+		if (mag != NULL && mag2 != NULL)
+		{
+			bool eq = magazinesHaveEqualSizes(mag, mag2);
+			if (eq)
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - same inventory sizes"); }
+				return true;
+			}
+
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - different inventory sizes"); }
+			return false;
+		}
+		Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " guard - mag == NULL or mag2 == NULL, cannot perform comparison");
+		return false;
+	}
+};
+
+class WeaponGuardWeaponCharged extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	
+	void WeaponGuardWeaponCharged (Weapon_Base w = NULL) { m_weapon = w; }
+	
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		return m_weapon.IsCharged();
+	}
+}
+
+class WeaponGuardWeaponDischarged extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	
+	void WeaponGuardWeaponDischarged (Weapon_Base w = NULL) { m_weapon = w; }
+	
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		return !m_weapon.IsCharged();
+	}
+}
+
+class WeaponGuardWeaponOpen extends WeaponGuardBase
+{
+	protected Weapon_Base m_weapon;
+	
+	void WeaponGuardWeaponOpen (Weapon_Base w = NULL) { m_weapon = w; }
+	
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		return m_weapon.IsWeaponOpen();
+	}
+}
+
+
+class WeaponGuardWeaponManagerWantContinue extends WeaponGuardBase
+{
+	override bool GuardCondition (WeaponEventBase e)
+	{
+		PlayerBase player = PlayerBase.Cast(e.m_player);
+		return player.GetWeaponManager().WantContinue();
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/BulletHide.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/BulletHide.c
new file mode 100644
index 0000000000000000000000000000000000000000..dbc14420505cb26968f917407a4d5bf94e7322f1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/BulletHide.c
@@ -0,0 +1,20 @@
+class BulletHide extends WeaponStateBase
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if(e)
+			m_weapon.SelectionBulletHide();
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+class BulletHide_W4T extends BulletHide
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/BulletShow.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/BulletShow.c
new file mode 100644
index 0000000000000000000000000000000000000000..b0d5171eccb9b134e2fda9e9f55e2ec7ed249b9c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/BulletShow.c
@@ -0,0 +1,40 @@
+class BulletShow extends WeaponStateBase
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if(e)
+			m_weapon.ShowBullet(0);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+class BulletShow2 extends WeaponStateBase
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if(e)
+			m_weapon.ShowBullet(1);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+class BulletShow_W4T extends BulletShow
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class BulletShow2_W4T extends BulletShow2
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/MagazineHide.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/MagazineHide.c
new file mode 100644
index 0000000000000000000000000000000000000000..e4b92c100bc04669b61eb764b608fa405c0282e0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/MagazineHide.c
@@ -0,0 +1,19 @@
+class MagazineHide extends WeaponStateBase
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		//m_weapon.HideMagazine();
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+class MagazineHide_W4T extends MagazineHide
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/MagazineShow.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/MagazineShow.c
new file mode 100644
index 0000000000000000000000000000000000000000..cbbba932b2cf29ef1d4c45e81eb4f3df91074c67
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/MagazineShow.c
@@ -0,0 +1,20 @@
+class MagazineShow extends WeaponStateBase
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+			m_weapon.ShowMagazine();
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+class MagazineShow_W4T extends MagazineShow
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleChambering.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleChambering.c
new file mode 100644
index 0000000000000000000000000000000000000000..3246f976c45dc01ae45bfc3931bf5a8baf5bdea7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleChambering.c
@@ -0,0 +1,100 @@
+class RifleChambering extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	Magazine m_srcMagazine; /// source of the cartridge
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectCasing m_eject;
+	ref WeaponChambering_Cartridge m_chamber;
+	ref WeaponChambering_W4T m_w4t;
+
+	void RifleChambering (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponEjectCasing(m_weapon, this);
+		m_chamber = new WeaponChambering_Cartridge(m_weapon, this);
+		m_w4t = new WeaponChambering_W4T(m_weapon, this);
+		// events
+		WeaponEventAnimBulletEject __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimBulletShow  __bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletInChamber __bc_ = new WeaponEventAnimBulletInChamber;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , __bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bc_, m_w4t));
+		m_fsm.AddTransition(new WeaponTransition(m_w4t    , _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			if (e.m_magazine != NULL)
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RifleChambering, taking mag from event e.mag=" + e.m_magazine.ToString()); }
+				m_srcMagazine = e.m_magazine;
+				m_chamber.m_srcMagazine = m_srcMagazine;
+			}
+		}
+		else
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RifleChambering (e=NULL), m_srcMagazine=" + m_srcMagazine.ToString()); }
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " m_srcMagazine=" + m_srcMagazine.ToString()); }
+		
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RifleChambering.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RifleChambering.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleEjectCasing.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleEjectCasing.c
new file mode 100644
index 0000000000000000000000000000000000000000..2b6b94268cdc17ede4df5c778fd4b5968deb24ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleEjectCasing.c
@@ -0,0 +1,41 @@
+class RifleEjectCasing extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponStartAction m_start;
+	ref WeaponEjectCasing m_eject;
+	ref BulletHide_W4T m_hideB;
+
+	void RifleEjectCasing (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponStartAction(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponEjectCasing(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+
+		// events
+		WeaponEventBase __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventBase __bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(m_start, __be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_eject, __bh_, m_hideB));
+		m_fsm.AddTransition(new WeaponTransition(m_hideB, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+};
+
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleReChambering.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleReChambering.c
new file mode 100644
index 0000000000000000000000000000000000000000..d15acc4714d83eca265b382e1b841b541d340be1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/RifleReChambering.c
@@ -0,0 +1,124 @@
+class RifleReChambering extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	Magazine m_dstMagazine; /// destination of the ejected cartridge
+	Magazine m_srcMagazine; /// source of the loaded cartridge
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectBullet_Cartridge m_eject;
+	ref WeaponChambering_Cartridge m_chamber;
+	ref WeaponChambering_W4T m_w4t;
+
+	void RifleReChambering (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponEjectBullet_Cartridge(m_weapon, this);
+		m_chamber = new WeaponChambering_Cartridge(m_weapon, this);
+		m_w4t = new WeaponChambering_W4T(m_weapon, this);
+		// events
+		WeaponEventAnimBulletEject __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimBulletShow  __bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletInChamber __bc_ = new WeaponEventAnimBulletInChamber;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , __bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bc_, m_w4t));
+		m_fsm.AddTransition(new WeaponTransition(m_w4t    , _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponRechamber, mag=" + e.m_magazine.ToString()); }
+			m_srcMagazine = e.m_magazine;
+			m_chamber.m_srcMagazine = m_srcMagazine;
+
+			// prepare magazine for ejected ammo
+			int mi = m_weapon.GetCurrentMuzzle();
+			string magazineTypeName = m_weapon.GetChamberedCartridgeMagazineTypeName(mi);
+			float damage = 0.0;
+			string type;
+			if (m_weapon.GetCartridgeInfo(mi, damage, type))
+			{
+				bool is_single_or_server = !GetGame().IsMultiplayer() || GetGame().IsServer();
+				if (is_single_or_server)
+				{
+					m_dstMagazine = DayZPlayerUtils.SelectStoreCartridge(e.m_player, m_weapon, mi, m_srcMagazine, damage, magazineTypeName);
+					if (!m_dstMagazine)
+					{
+						Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + "   WeaponRechamber - error, cannot prepare mag for catridge, magType=" + magazineTypeName);
+					}
+				}
+			}
+			m_eject.m_dstMagazine = m_dstMagazine;
+		}
+		super.OnEntry(e); // @NOTE: super after submachine init (prevent override from submachine start)
+
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+		m_dstMagazine = NULL;
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+		m_dstMagazine = NULL;
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponRechamber.SaveCurrentFSMState: cannot save m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponRechamber.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponRechamber.LoadCurrentFSMState: cannot read m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponRechamber.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponAttachMagazine.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponAttachMagazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..f6f46386c7c54b3f93c660db243a1171106ef1ef
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponAttachMagazine.c
@@ -0,0 +1,227 @@
+class RemoveNewMagazineFromInventory extends WeaponStateBase
+{
+	Magazine m_newMagazine; /// magazine that will be removed from inventory
+	ref InventoryLocation m_newSrc;
+
+	void RemoveNewMagazineFromInventory (Weapon_Base w = NULL, WeaponStateBase parent = NULL)
+	{
+		m_newMagazine = NULL;
+		m_newSrc = NULL;
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if(e)
+		{
+			if (!m_newSrc.IsValid())
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory m_newSrc=invalid, item not in bubble?");
+
+			if (m_newMagazine && m_newSrc && m_newSrc.IsValid())
+			{
+				InventoryLocation curr = new InventoryLocation;
+				m_newMagazine.GetInventory().GetCurrentInventoryLocation(curr);
+
+				if (m_newSrc.GetType() == InventoryLocationType.GROUND && curr.GetType() == InventoryLocationType.ATTACHMENT && curr.GetSlot() == InventorySlots.LEFTHAND)
+				{
+					// already in LH
+				}
+				else
+				{
+					InventoryLocation lhand = new InventoryLocation;
+					lhand.SetAttachment(e.m_player, m_newMagazine, InventorySlots.LEFTHAND);
+					if (GameInventory.LocationSyncMoveEntity(m_newSrc, lhand))
+					{
+						if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory, ok - new magazine removed from inv (inv->LHand)"); }
+					}
+					else
+						Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory, error - cannot new remove mag from inv");
+				}
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory, error - no magazines configured for replace (m_old=m_new=NULL)");
+		}
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_newMagazine = NULL;
+		m_newSrc = NULL;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_weapon.ShowMagazine();
+
+		m_newMagazine = NULL;
+		m_newSrc = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory.SaveCurrentFSMState: cannot write m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+
+		if (!OptionalLocationWriteToContext(m_newSrc, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory.SaveCurrentFSMState: cannot write m_newSrc for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory.LoadCurrentFSMState: cannot read m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+
+		if (!OptionalLocationReadFromContext(m_newSrc, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory.LoadCurrentFSMState: cannot read m_newSrc for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+
+class RemoveNewMagazineFromInventory_OnEntryShowMag extends RemoveNewMagazineFromInventory
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		if(e)
+			m_weapon.ShowMagazine();
+		super.OnEntry(e);
+	}
+};
+
+
+class WeaponAttachMagazine extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponStartAction m_start;
+	ref AttachNewMagazine m_attach;
+	ref WeaponChamberFromAttMag_W4T m_chamber;
+	ref WeaponCharging_CK m_onCK;
+	ref WeaponEjectCasing m_eject;
+
+	void WeaponAttachMagazine (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponStartAction(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponEjectCasing(m_weapon, this);
+		m_attach = new AttachNewMagazine(m_weapon, this);
+		m_chamber = new WeaponChamberFromAttMag_W4T(m_weapon, this);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+
+		// events: MS, MA, BE, CK
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __ms_ = new WeaponEventAnimMagazineShow;
+		WeaponEventBase __so_ = new WeaponEventAnimSliderOpen;
+		WeaponEventBase __ma_ = new WeaponEventAnimMagazineAttached;
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_fsm.AddTransition(new WeaponTransition(   m_start, __ms_, m_attach));
+		m_fsm.AddTransition(new WeaponTransition(   m_start, __so_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(   m_eject, __ms_, m_attach));
+		m_fsm.AddTransition(new WeaponTransition(  m_attach, __ck_, m_chamber, NULL, new GuardAnd(new WeaponGuardCurrentChamberEmpty(m_weapon), new WeaponGuardHasAmmo(m_weapon)))); // when opened, there is no __be_ event
+		m_fsm.AddTransition(new WeaponTransition(  m_attach, __ck_, m_onCK, NULL, new GuardAnd(new WeaponGuardCurrentChamberEmpty(m_weapon), new GuardNot(new WeaponGuardHasAmmo(m_weapon)))));
+		m_fsm.AddTransition(new WeaponTransition(  m_attach, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition( m_chamber, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition( m_onCK, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+		
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			Magazine mag = e.m_magazine;
+
+			InventoryLocation newSrc = new InventoryLocation;
+			mag.GetInventory().GetCurrentInventoryLocation(newSrc);
+		
+			// move to LH
+			InventoryLocation lhand = new InventoryLocation;
+			lhand.SetAttachment(e.m_player, mag, InventorySlots.LEFTHAND);
+			if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponAttachMagazine, ok - new magazine removed from inv (inv->LHand)"); }
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponAttachMagazine, error - cannot new remove mag from inv");
+
+			InventoryLocation il = new InventoryLocation;
+			il.SetAttachment(m_weapon, mag, InventorySlots.MAGAZINE);
+			m_attach.m_newMagazine = mag;
+			m_attach.m_newDst = il;
+		}
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		EntityAI leftHandItem = e.m_player.GetInventory().FindAttachment(InventorySlots.LEFTHAND);
+		Magazine mag = Magazine.Cast(leftHandItem);
+		
+		if(mag)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( mag , null );
+			InventoryLocation il = new InventoryLocation;
+			e.m_player.GetInventory().FindFreeLocationFor( mag, FindInventoryLocationType.CARGO, il );
+		
+			if(!il || !il.IsValid())
+			{
+				if (DayZPlayerUtils.HandleDropMagazine(e.m_player, mag))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponAttachMagazine, ok - no inventory space for old magazine - dropped to ground"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponAttachMagazine, error - cannot drop magazine from left hand after not found inventory space for old magazine");
+				
+			}
+			else
+			{
+				InventoryLocation oldSrc = new InventoryLocation;
+				mag.GetInventory().GetCurrentInventoryLocation(oldSrc);
+				
+				if (GameInventory.LocationSyncMoveEntity(oldSrc, il))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponAttachMagazine, ok - old magazine removed from wpn (LHand->inv)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponAttachMagazine, error - cannot remove old mag from wpn");
+			}
+		}
+		super.OnAbort(e);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChamberFromAttMag.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChamberFromAttMag.c
new file mode 100644
index 0000000000000000000000000000000000000000..71a206c9e6722bc4f74ccffb1263b8058b17503b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChamberFromAttMag.c
@@ -0,0 +1,86 @@
+
+// load bullet from att mag (no anim)
+class WeaponChamberFromAttMag extends WeaponStateBase
+{
+	void WeaponChamberFromAttMag (Weapon_Base w = NULL, WeaponStateBase parent = NULL, int action = -1, int actionType = -1)
+	{ }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if(e)
+		{
+			int mi = m_weapon.GetCurrentMuzzle();
+			m_weapon.SetCharged(true);
+			m_weapon.SetWeaponOpen(false);
+			pushToChamberFromAttachedMagazine(m_weapon, mi);
+		}
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+// load bullet from att mag (no anim)
+class WeaponChamberFromInnerMag extends WeaponStateBase
+{
+	void WeaponChamberFromInnerMag (Weapon_Base w = NULL, WeaponStateBase parent = NULL, int action = -1, int actionType = -1)
+	{ }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			int mi = m_weapon.GetCurrentMuzzle();
+			pushToChamberFromInnerMagazine(m_weapon, mi);
+		}
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+// load bullet from att mag (no anim)
+class WeaponChamberFromAttMagOnExit extends WeaponStateBase
+{
+	void WeaponChamberFromAttMagOnExit (Weapon_Base w = NULL, WeaponStateBase parent = NULL, int action = -1, int actionType = -1)
+	{ }
+
+	override void OnExit (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		pushToChamberFromAttachedMagazine(m_weapon, mi);
+
+		super.OnExit(e);
+	}
+};
+
+// load bullet from att mag (no anim)
+class WeaponEjectAndChamberFromAttMag extends WeaponEjectAllMuzzles
+{
+	void WeaponEjectAndChamberFromAttMag (Weapon_Base w = NULL, WeaponStateBase parent = NULL, int action = -1, int actionType = -1)
+	{ }
+
+	override void OnExit (WeaponEventBase e)
+	{
+		if (e)
+		{
+			int mi = m_weapon.GetCurrentMuzzle();
+			pushToChamberFromAttachedMagazine(m_weapon, mi);
+		}
+		super.OnExit(e);
+	}
+	override void OnAbort (WeaponEventBase e)
+	{
+		if (e)
+		{
+			int mi = m_weapon.GetCurrentMuzzle();
+			pushToChamberFromAttachedMagazine(m_weapon, mi);
+		}
+		super.OnAbort(e);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChambering.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChambering.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0c59b1f857c81ca44874ba64e9c28618bf44b3a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChambering.c
@@ -0,0 +1,1195 @@
+// load 1 bullet
+class WeaponChambering_Start extends WeaponStartAction
+{ 
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			m_weapon.SelectionBulletHide();
+			m_weapon.ForceSyncSelectionState();
+		}
+	}
+	
+	override bool IsWaitingForActionFinish()
+	{
+		return true;
+	}
+};
+
+class WeaponChambering_Base extends WeaponStateBase
+{
+	float m_damage;
+	string m_type;
+	string m_magazineType;
+	Magazine m_srcMagazine; /// source of the cartridge
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_damage))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot write m_damage for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Write(m_type))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot write m_type for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Write(m_magazineType))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot write m_magazineType for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot write m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_damage))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_damage for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_type))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_type for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_magazineType))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_magazineType for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+
+class WeaponChambering_Cartridge extends WeaponChambering_Base
+{
+	override bool IsWaitingForActionFinish () { return true; }
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (m_srcMagazine)
+			{
+				m_magazineType = m_srcMagazine.GetType();
+				
+				if (m_srcMagazine.ServerAcquireCartridge(m_damage, m_type))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, ok - cartridge acquired: dmg=" + m_damage + " type=" + m_type); }
+					m_weapon.SelectionBulletShow();
+					m_weapon.ShowBullet(m_weapon.GetCurrentMuzzle());
+					m_weapon.EffectBulletShow( m_weapon.GetCurrentMuzzle(), m_damage, m_type);
+					m_weapon.SetWeaponOpen(false);
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, error - cannot take cartridge from magazine");
+			}
+			else
+			{
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, error - no magazine to load from (m_srcMagazine=NULL)");
+			}
+		}
+	}
+
+	override void OnAbort(WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		
+		string magazineTypeName;
+		
+		if (m_magazineType.Length() > 0)
+			magazineTypeName = m_magazineType;
+		else
+			magazineTypeName = m_weapon.GetChamberAmmoTypeName(mi);
+		
+		if ( GetGame().IsServer() )
+		{
+			if (DayZPlayerUtils.HandleDropCartridge(e.m_player, m_damage, m_type, magazineTypeName))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, ok - aborting, chambering cartridge dropped to ground"); }
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, error - cannot abort removal from wpn (of old mag)");
+		}
+		
+		m_weapon.EffectBulletHide(mi);
+		m_weapon.SelectionBulletHide(); // force hide on abort
+		
+		m_magazineType = string.Empty;
+		m_type = string.Empty;
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		//if ( m_weapon.IsChamberFiredOut(mi) )
+		//	m_weapon.EjectCasing(mi);
+		if (m_weapon.PushCartridgeToChamber(mi, m_damage, m_type))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, ok - loaded chamber"); }
+		}
+		else
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, error - cannot load chamber chamber!"); }
+
+		m_weapon.SetCharged(true);
+		m_magazineType = string.Empty;
+		m_type = string.Empty;
+		super.OnExit(e);
+	}
+	
+};
+
+class WeaponChambering_Cartridge_ChambToMag extends WeaponChambering_Cartridge
+{
+	override void OnExit (WeaponEventBase e)
+	{
+		float ammoDamage;
+ 		string ammoTypeName;
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (m_weapon.IsChamberFull(mi))
+		{
+			m_weapon.PopCartridgeFromChamber(mi, ammoDamage, ammoTypeName);
+			if (m_weapon.PushCartridgeToInternalMagazine(mi, ammoDamage, ammoTypeName))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, ok - loaded chamber"); }
+			}
+			else
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, error - cannot load chamber chamber!"); }
+		}
+		
+		m_weapon.SetWeaponOpen(false);
+		super.OnExit(e);
+	}
+}
+
+//-----------MAGNUM-----------
+class WeaponChambering_MultiMuzzleMagnum extends WeaponChambering_Cartridge
+{
+	override bool IsWaitingForActionFinish () { return false; }
+	override void OnEntry(WeaponEventBase e)
+	{
+		super.OnEntry(e);
+
+		/*for(int i = 0; i < m_weapon.GetMuzzleCount(); i++ )
+		{
+			if(!m_weapon.IsChamberFull(i))
+			{
+				m_weapon.ShowBullet(i);
+				m_weapon.EffectBulletShow(i, m_damage, m_type);
+				return;
+			}
+		}*/
+	}
+	
+	override void OnExit(WeaponEventBase e)
+	{
+		m_weapon.SelectionBulletHide();
+		int muzzle = m_weapon.GetCurrentMuzzle();
+		
+		if (!m_weapon.IsChamberFull(muzzle))
+		{
+			if (m_weapon.PushCartridgeToChamber(muzzle, m_damage, m_type))
+			{
+				Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(m_weapon.GetAttachmentByType(Magnum_Cylinder));
+
+				if (cylinder)
+				{
+					string bullet = "bullet";
+					string bullet_nose = "bullet_nose";
+					
+					if (muzzle > 0)
+					{
+						bullet = string.Format("bullet_" + ( muzzle + 1 ));
+						bullet_nose = string.Format("bullet_nose_" + ( muzzle + 1 ));
+					}
+					cylinder.ShowSelection(bullet);
+					cylinder.ShowSelection(bullet_nose);
+				}
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_MultiMuzzleMagnum, ok - loaded chamber"); }
+			}
+			else
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_MultiMuzzleMagnum, error - cannot load chamber chamber!"); }
+			m_type = string.Empty;
+			return;
+		}
+		else
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_MultiMuzzleMagnum, error - cannot load chamber chamber!"); }
+		
+		//super.OnExit(e);
+	}
+}
+
+
+
+//----------------------------
+
+class WeaponChambering_MultiMuzzle extends WeaponChambering_Cartridge
+{
+	override bool IsWaitingForActionFinish () { return true; }
+	override void OnEntry(WeaponEventBase e)
+	{
+		super.OnEntry(e);
+
+		for(int i = 0; i < m_weapon.GetMuzzleCount(); i++ )
+		{
+			if(!m_weapon.IsChamberFull(i))
+			{
+				m_weapon.ShowBullet(i);
+				m_weapon.EffectBulletShow(i, m_damage, m_type);
+				return;
+			}
+		}
+	}
+	
+	override void OnExit (WeaponEventBase e)
+	{
+		for(int i = 0; i < m_weapon.GetMuzzleCount(); i++ )
+		{
+			if(!m_weapon.IsChamberFull(i))
+			{
+				if (m_weapon.PushCartridgeToChamber(i, m_damage, m_type))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, ok - loaded chamber"); }
+				}
+				else
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge, error - cannot load chamber chamber!"); }
+				m_type = string.Empty;
+				return;
+			}
+		}
+		
+		super.OnExit(e);
+	}
+}
+
+class WeaponChambering_MultiMuzzle_W4T extends WeaponChambering_MultiMuzzle
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+
+class WeaponChambering_Cartridge_InnerMag extends WeaponChambering_Base
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (m_srcMagazine)
+			{
+				m_magazineType = m_srcMagazine.GetType();
+				
+				if (m_srcMagazine.ServerAcquireCartridge(m_damage, m_type))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, ok - cartridge acquired: dmg=" + m_damage + " type=" + m_type); }		
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, error - cannot take cartridge from magazine");
+			}
+			else
+			{
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, error - no magazine to load from (m_srcMagazine=NULL)");
+			}
+			
+			m_weapon.SelectionBulletShow();
+			m_weapon.EffectBulletShow(m_weapon.GetCurrentMuzzle(),m_damage,m_type);
+		}
+	}
+
+	override void OnAbort(WeaponEventBase e)
+	{
+		int mi = m_weapon.GetCurrentMuzzle();
+		string magazineTypeName;
+		
+		if (m_magazineType.Length() > 0)
+			magazineTypeName = m_magazineType;
+		else
+			magazineTypeName = m_weapon.GetChamberAmmoTypeName(mi);
+		
+		if ( !GetGame().IsMultiplayer() || GetGame().IsServer() )
+		{
+			if (DayZPlayerUtils.HandleDropCartridge(e.m_player, m_damage, m_type, magazineTypeName))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, ok - aborting, chambering cartridge dropped to ground"); }
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, error - cannot abort removal from wpn (of old mag)");
+		}
+
+		m_weapon.SelectionBulletHide(); // force hide on abort
+		m_weapon.EffectBulletHide(m_weapon.GetCurrentMuzzle());
+
+		m_magazineType = string.Empty;
+		m_type = string.Empty;
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		float ammoDamage;
+ 		string ammoTypeName;
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (!m_weapon.IsInternalMagazineFull(mi))
+		{
+			if (m_weapon.PushCartridgeToInternalMagazine(mi, m_damage, m_type))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, ok - loaded chamber"); }
+			}
+			else
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering_Cartridge_InnerMag, error - cannot load chamber chamber!"); }
+		}
+		m_magazineType = string.Empty;
+		super.OnExit(e);
+	}
+};
+
+class WeaponChambering_W4T extends WeaponStateBase
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class WeaponChambering extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	Magazine m_srcMagazine; /// source of the cartridge
+	ref InventoryLocation m_srcMagazinePrevLocation;
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectCasing m_eject;
+	ref WeaponChambering_Cartridge m_chamber;
+	ref WeaponChambering_W4T m_w4t;
+	ref WeaponCharging_CK m_onCK;
+
+	void WeaponChambering (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_actionType);
+		m_chamber = new WeaponChambering_Cartridge(m_weapon, this);
+		m_w4t = new WeaponChambering_W4T(m_weapon, this);
+		m_eject = new WeaponEjectCasing(m_weapon, this);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+		// events
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventAnimBulletInChamber __bc_ = new WeaponEventAnimBulletInChamber;
+		WeaponEventAnimBulletShow  __bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletEject	__be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimCocked __ck_ = new WeaponEventAnimCocked;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __ck_, m_onCK));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_onCK  , __be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_onCK  , __bs_, m_chamber));	
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , __bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bc_, m_w4t));
+		m_fsm.AddTransition(new WeaponTransition(m_w4t    , _fin_, null));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			m_srcMagazine = e.m_magazine;
+			if (m_srcMagazine != NULL)
+			{
+				InventoryLocation newSrc = new InventoryLocation;
+				m_srcMagazine.GetInventory().GetCurrentInventoryLocation(newSrc);
+				
+				m_srcMagazinePrevLocation = newSrc;
+			
+				// move to LH
+				InventoryLocation lhand = new InventoryLocation;
+				lhand.SetAttachment(e.m_player, m_srcMagazine, InventorySlots.LEFTHAND);
+				if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - ammo pile removed from inv (inv->LHand)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, error - cannot remove ammo pile from inv");
+				
+				m_chamber.m_srcMagazine = m_srcMagazine;
+			} 
+			else
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering m_srcMagazine = NULL"); }
+			}
+		}
+		else
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering (e=NULL), m_srcMagazine=" + m_srcMagazine.ToString()); }
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(),leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - ammo pile removed from left hand to previous location (LHand->inv) - abort"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if(!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - no inventory space for ammo pile - dropped to ground - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - abort");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - ammo pile removed from left hand (LHand->inv) - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, error - cannot remove ammo pile from wpn - abort");
+					}
+				}
+			}
+		}
+		
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - ammo pile removed from left hand to previous location (LHand->inv) - exit"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if(!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - no inventory space for ammo pile - dropped to ground - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - exit");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, ok - ammo pile removed from left hand (LHand->inv) - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering, error - cannot remove ammo pile from wpn - exit");
+					}
+				}
+			}
+		}
+		
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationWriteToContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot write m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationReadFromContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+//----------------------------------------------
+//----------------------------------------------
+//----------------------------------------------
+class WeaponEndAction extends WeaponStartAction
+{
+	override bool IsWaitingForActionFinish()
+	{
+		return true;
+	}
+}
+
+class ChamberMultiBullet extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_startActionType;
+	int m_endActionType;
+	Magazine m_srcMagazine; /// source of the cartridge
+	ref InventoryLocation m_srcMagazinePrevLocation;
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectCasingMultiMuzzle m_eject;
+	ref WeaponChambering_Base m_chamber;
+	ref WeaponChambering_Base m_chamber_end;
+	ref LoopedChambering_Wait4ShowBullet2 m_w4sb2;
+	ref WeaponEndAction m_endLoop;
+	ref BulletShow_W4T m_showB;
+	ref BulletShow2_W4T m_showB2;
+
+	void ChamberMultiBullet (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int startActionType = -1, int endActionType = -1)
+	{
+		m_action = action;
+		m_startActionType = startActionType;
+		m_endActionType = endActionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_startActionType);
+		m_eject = new WeaponEjectCasingMultiMuzzle(m_weapon, this);
+		m_chamber = new WeaponChambering_MultiMuzzle_W4T(m_weapon, this);
+		m_chamber_end = new WeaponChambering_MultiMuzzle_W4T(m_weapon, this);
+		m_w4sb2 = LoopedChambering_Wait4ShowBullet2(m_weapon, this);
+		m_showB = new BulletShow_W4T(m_weapon, this);
+		m_showB2= new BulletShow2_W4T(m_weapon, this);
+		
+		m_endLoop = new WeaponEndAction(m_weapon, this, m_action, m_endActionType); // @NOTE: termination playing action - dummy?
+		// events
+		WeaponEventBase							_fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventContinuousLoadBulletStart	__lS_ = new WeaponEventContinuousLoadBulletStart;
+		WeaponEventContinuousLoadBulletEnd		__lE_ = new WeaponEventContinuousLoadBulletEnd;
+		WeaponEventAnimBulletShow				__bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletShow2				_bs2_ = new WeaponEventAnimBulletShow2;
+		WeaponEventAnimBulletHide				__bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventAnimBulletEject				__be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimBulletInChamber			__bc_ = new WeaponEventAnimBulletInChamber;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __be_, m_eject));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , __bs_, m_chamber));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bc_, m_w4sb2, NULL, new GuardAnd(new GuardAnd(new WeaponGuardHasAmmoInLoopedState(m_chamber), new WeaponGuardChamberMultiHasRoomBulltet(m_weapon)),new WeaponGuardWeaponManagerWantContinue())));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bc_, m_endLoop));
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2, __bs_, m_chamber));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2  , _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber  , _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_endLoop  , _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+		
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			m_srcMagazine = e.m_magazine;
+			if (m_srcMagazine != NULL)
+			{
+				InventoryLocation newSrc = new InventoryLocation;
+				m_srcMagazine.GetInventory().GetCurrentInventoryLocation(newSrc);
+				
+				m_srcMagazinePrevLocation = newSrc;
+			
+				// move to LH
+				InventoryLocation lhand = new InventoryLocation;
+				lhand.SetAttachment(e.m_player, m_srcMagazine, InventorySlots.LEFTHAND);
+				if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - ammo pile removed from inv (inv->LHand)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, error - cannot remove ammo pile from inv");
+				
+				m_chamber.m_srcMagazine = m_srcMagazine;
+			} 
+			else
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet m_srcMagazine = NULL"); }
+			}
+		}
+		else
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet (e=NULL), m_srcMagazine=" + m_srcMagazine.ToString()); }
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - ammo pile removed from left hand to previous location (LHand->inv) - exit"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if(!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - no inventory space for ammo pile - dropped to ground - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - exit");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - ammo pile removed from left hand (LHand->inv) - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, error - cannot remove ammo pile from wpn - exit");
+					}
+				}
+			}
+		}
+		
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	override void OnAbort (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - ammo pile removed from left hand to previous location (LHand->inv) - abort"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if(!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - no inventory space for ammo pile - dropped to ground - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - abort");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, ok - ammo pile removed from left hand (LHand->inv) - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet, error - cannot remove ammo pile from wpn - abort");
+					}
+				}
+			}
+		}
+		
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationWriteToContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet.SaveCurrentFSMState: cannot write m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationReadFromContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ChamberMultiBullet.LoadCurrentFSMState: cannot read m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+//------------------------------------------------------
+//------------------ROTATE------------------------------
+//------------------------------------------------------
+class WeaponCylinderRotate extends WeaponStateBase
+{	
+	bool FindNextFreeMuzzle(int currentMuzzle, out int nextMuzzle)
+	{
+		nextMuzzle = currentMuzzle;
+		int nMuzzles = m_weapon.GetMuzzleCount();
+		
+		for (int i = 0; i < nMuzzles; ++i)
+		{
+			--nextMuzzle;
+			nextMuzzle = Math.WrapInt(nextMuzzle, 0, nMuzzles);
+			if (m_weapon.IsChamberEmpty(nextMuzzle))
+				return true;
+		}
+		
+		return false;
+	}
+	
+	override void OnEntry(WeaponEventBase e)
+	{
+		int nextMuzzle;
+		if (FindNextFreeMuzzle(m_weapon.GetCurrentMuzzle(), nextMuzzle))
+		{
+			Magnum_Base magnum = Magnum_Base.Cast(m_weapon);
+			magnum.SetCylinderRotationAnimationPhase(magnum.GetCylinderRotation(nextMuzzle));
+			m_weapon.SetCurrentMuzzle(nextMuzzle);
+		}
+		else
+		{
+			Print("WTF");
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+};
+
+
+//------------------------------------------------------
+//------------------MAGNUM------------------------------
+//------------------------------------------------------
+class WeaponMagnumChambering extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_startActionType;
+	int m_endActionType;
+	Magazine m_srcMagazine; /// source of the cartridge
+	ref InventoryLocation m_srcMagazinePrevLocation;
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectAllMuzzles m_eject;
+	ref WeaponCylinderRotate m_rotate;
+	ref WeaponChambering_Base m_chamber;
+	ref LoopedChambering_Wait4ShowBullet2 m_w4sb2;
+	ref WeaponStartAction m_endLoop;
+	ref BulletHide_W4T m_hideB;
+
+	void WeaponMagnumChambering(Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int startActionType = -1, int endActionType = -1)
+	{
+		m_action = action;
+		m_startActionType = startActionType;
+		m_endActionType = endActionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_startActionType);
+		m_eject = new WeaponEjectAllMuzzles(m_weapon, this);
+		m_rotate = new WeaponCylinderRotate(m_weapon, this);
+		m_chamber = new WeaponChambering_MultiMuzzleMagnum(m_weapon, this);
+		m_w4sb2 = LoopedChambering_Wait4ShowBullet2(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_endLoop = new LoopedChambering_EndLoop(m_weapon, this, m_action, m_endActionType); // @NOTE: termination playing action - dummy?
+		// events
+		WeaponEventBase							_fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventContinuousLoadBulletStart	__lS_ = new WeaponEventContinuousLoadBulletStart;
+		WeaponEventContinuousLoadBulletEnd		__lE_ = new WeaponEventContinuousLoadBulletEnd;
+		WeaponEventCylinderRotate				__cr_ = new WeaponEventCylinderRotate;
+		WeaponEventAnimBulletShow				__bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletHide				__bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventAnimBulletEject				__be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimBulletInMagazine			__bM_ = new WeaponEventAnimBulletInMagazine;
+		WeaponEventAnimBulletShow2				_bs2_ = new WeaponEventAnimBulletShow2;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start,	__be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_start,	__cr_, m_rotate));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_eject,	__cr_, m_rotate));			
+		m_fsm.AddTransition(new WeaponTransition(m_rotate,	__be_, m_eject));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_eject, __bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_rotate, __bs_, m_chamber));		
+		
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bM_, m_w4sb2, null, new GuardAnd(new GuardAnd(new WeaponGuardHasAmmoInLoopedState(m_chamber), new WeaponGuardChamberMultiHasRoomBulltet(m_weapon)),new WeaponGuardWeaponManagerWantContinue())));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bM_, m_endLoop));
+		//m_fsm.AddTransition(new WeaponTransition(m_rotate, __bh_, m_chamber));
+		//m_fsm.AddTransition(new WeaponTransition(m_w4sb2, 	__bh_, m_hideB));
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2, 	__cr_, m_rotate));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_endLoop, _fin_, null));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2, 	_fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_rotate,  _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));		
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry(WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			
+			m_srcMagazine = e.m_magazine;
+			if (m_srcMagazine != NULL)
+			{
+				InventoryLocation newSrc = new InventoryLocation;
+				m_srcMagazine.GetInventory().GetCurrentInventoryLocation(newSrc);
+				
+				m_srcMagazinePrevLocation = newSrc;
+		
+				// move to LH
+				InventoryLocation lhand = new InventoryLocation;
+				lhand.SetAttachment(e.m_player, m_srcMagazine, InventorySlots.LEFTHAND);
+				if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - ammo pile removed from inv (inv->LHand)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, error - cannot remove ammo pile from inv");
+				
+				m_chamber.m_srcMagazine = m_srcMagazine;
+			} 
+			else
+			{
+				Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering m_srcMagazine = NULL");
+			}
+		}
+		else
+		{
+			Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering (e=NULL), m_srcMagazine=" + m_srcMagazine.ToString());
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+	
+	override void OnExit(WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - ammo pile removed from left hand to previous location (LHand->inv) - exit"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if ( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if (!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - no inventory space for ammo pile - dropped to ground - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - exit");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - ammo pile removed from left hand (LHand->inv) - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, error - cannot remove ammo pile from wpn - exit");
+					}
+				}
+			}
+		}
+		
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	
+	override void OnAbort(WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - ammo pile removed from left hand to previous location (LHand->inv) - abort"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if ( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if (!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - no inventory space for ammo pile - dropped to ground - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - abort");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering, ok - ammo pile removed from left hand (LHand->inv) - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot remove ammo pile from wpn - abort");
+					}
+				}
+			}
+		}
+		
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	
+	override bool SaveCurrentFSMState(ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationWriteToContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering.SaveCurrentFSMState: cannot write m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		
+		return true;
+	}
+
+	override bool LoadCurrentFSMState(ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationReadFromContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponMagnumChambering.LoadCurrentFSMState: cannot read m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChamberingLooped.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChamberingLooped.c
new file mode 100644
index 0000000000000000000000000000000000000000..6fbcef65127c5203749df14ed35c62ba3cc928a9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponChamberingLooped.c
@@ -0,0 +1,529 @@
+// load x bullets
+class LoopedChambering_EndLoop extends WeaponStartAction
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class LoopedChambering_Wait4ShowBullet2 extends WeaponStateBase
+{ 
+	override bool IsWaitingForActionFinish () { return false; }
+};
+
+class LoopedChambering extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_startActionType;
+	int m_endActionType;
+	Magazine m_srcMagazine; /// source of the cartridge
+	ref InventoryLocation m_srcMagazinePrevLocation;
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectCasing m_eject;
+	ref WeaponChambering_Base m_chamber;
+	ref LoopedChambering_Wait4ShowBullet2 m_w4sb2;
+	ref WeaponStartAction m_endLoop;
+	ref BulletHide_W4T m_hideB;
+
+	void LoopedChambering (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int startActionType = -1, int endActionType = -1)
+	{
+		m_action = action;
+		m_startActionType = startActionType;
+		m_endActionType = endActionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_startActionType);
+		m_eject = new WeaponEjectCasing(m_weapon, this);
+		m_chamber = new WeaponChambering_Cartridge_ChambToMag(m_weapon, this);
+		m_w4sb2 = LoopedChambering_Wait4ShowBullet2(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_endLoop = new LoopedChambering_EndLoop(m_weapon, this, m_action, m_endActionType); // @NOTE: termination playing action - dummy?
+		// events
+		WeaponEventBase							_fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventContinuousLoadBulletStart	__lS_ = new WeaponEventContinuousLoadBulletStart;
+		WeaponEventContinuousLoadBulletEnd		__lE_ = new WeaponEventContinuousLoadBulletEnd;
+		WeaponEventAnimBulletShow				__bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletHide				__bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventAnimBulletEject				__be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimBulletInMagazine			__bM_ = new WeaponEventAnimBulletInMagazine;
+		WeaponEventAnimBulletShow2				_bs2_ = new WeaponEventAnimBulletShow2;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start,	__be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_start,	__bs_, m_chamber));
+		m_fsm.AddTransition(new WeaponTransition(m_eject,	__bs_, m_chamber));
+		
+
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bM_, m_w4sb2, NULL, new GuardAnd(new GuardAnd(new WeaponGuardHasAmmoInLoopedState(m_chamber), new WeaponGuardInternalMagazineHasRoomForBullet(m_weapon)),new WeaponGuardWeaponManagerWantContinue())));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bM_, m_endLoop));
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2, 	__bh_, m_hideB));
+		m_fsm.AddTransition(new WeaponTransition(m_hideB, 	__bs_, m_chamber));
+
+		m_fsm.AddTransition(new WeaponTransition(m_endLoop, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_hideB, 	_fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2, 	_fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));			
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			
+			m_srcMagazine = e.m_magazine;
+			if (m_srcMagazine != NULL)
+			{
+				m_weapon.SelectionBulletHide();
+				InventoryLocation newSrc = new InventoryLocation;
+				m_srcMagazine.GetInventory().GetCurrentInventoryLocation(newSrc);
+				
+				m_srcMagazinePrevLocation = newSrc;
+		
+				// move to LH
+				InventoryLocation lhand = new InventoryLocation;
+				lhand.SetAttachment(e.m_player, m_srcMagazine, InventorySlots.LEFTHAND);
+				if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - ammo pile removed from inv (inv->LHand)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot remove ammo pile from inv");
+				
+				m_chamber.m_srcMagazine = m_srcMagazine;
+			} 
+			else
+			{
+				Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering m_srcMagazine = NULL");
+			}
+		}
+		else
+		{
+			Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering (e=NULL), m_srcMagazine=" + m_srcMagazine.ToString());
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - ammo pile removed from left hand to previous location (LHand->inv) - exit"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if(!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - no inventory space for ammo pile - dropped to ground - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - exit");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - ammo pile removed from left hand (LHand->inv) - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot remove ammo pile from wpn - exit");
+					}
+				}
+			}
+		}
+		
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	override void OnAbort (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - ammo pile removed from left hand to previous location (LHand->inv) - abort"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if( !done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if(!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - no inventory space for ammo pile - dropped to ground - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - abort");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, ok - ammo pile removed from left hand (LHand->inv) - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering, error - cannot remove ammo pile from wpn - abort");
+					}
+				}
+			}
+		}
+		
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationWriteToContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering.SaveCurrentFSMState: cannot write m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationReadFromContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChambering.LoadCurrentFSMState: cannot read m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+class LoopedChamberingEjectLast extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_startActionType;
+	int m_endActionType;
+	Magazine m_srcMagazine; /// source of the cartridge
+	ref InventoryLocation m_srcMagazinePrevLocation;
+
+	ref WeaponStateBase m_start;
+	ref WeaponEjectCasing m_eject;
+	ref WeaponChambering_Base m_chamber;
+	ref LoopedChambering_Wait4ShowBullet2 m_w4sb2;
+	ref WeaponStartAction m_endLoop;
+	ref BulletHide_W4T m_hideB;
+	ref WeaponChamberFromInnerMag_W4T m_chamberFromInnerMag;
+
+	void LoopedChamberingEjectLast (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int startActionType = -1, int endActionType = -1)
+	{
+		m_action = action;
+		m_startActionType = startActionType;
+		m_endActionType = endActionType;
+
+		// setup nested state machine
+		m_start = new WeaponChambering_Start(m_weapon, this, m_action, m_startActionType);
+		m_eject = new WeaponEjectCasing(m_weapon, this);
+		m_chamber = new WeaponChambering_Cartridge_InnerMag(m_weapon, this);
+		m_w4sb2 = new LoopedChambering_Wait4ShowBullet2(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_chamberFromInnerMag = new WeaponChamberFromInnerMag_W4T(m_weapon, this);
+		m_endLoop = new LoopedChambering_EndLoop(m_weapon, this, m_action, m_endActionType); // @NOTE: termination playing action - dummy?
+		// events
+		WeaponEventBase							_fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventContinuousLoadBulletStart	__lS_ = new WeaponEventContinuousLoadBulletStart;
+		WeaponEventContinuousLoadBulletEnd		__lE_ = new WeaponEventContinuousLoadBulletEnd;
+		WeaponEventAnimCocked					__wc_ = new WeaponEventAnimCocked;
+		WeaponEventAnimBulletShow				__bs_ = new WeaponEventAnimBulletShow;
+		WeaponEventAnimBulletHide				__bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventAnimBulletEject				__be_ = new WeaponEventAnimBulletEject;
+		WeaponEventAnimBulletInMagazine			__bM_ = new WeaponEventAnimBulletInMagazine;
+		WeaponEventAnimBulletShow2				_bs2_ = new WeaponEventAnimBulletShow2;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start  , __bs_, m_chamber));
+		
+
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bM_, m_w4sb2, NULL, new GuardAnd(new GuardAnd(new WeaponGuardHasAmmoInLoopedState(m_chamber), new WeaponGuardInternalMagazineHasRoomForBullet(m_weapon)),new WeaponGuardWeaponManagerWantContinue())));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, __bM_, m_endLoop));
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2,	__bh_, m_hideB));
+		m_fsm.AddTransition(new WeaponTransition(m_hideB,	__bs_, m_chamber));
+
+		m_fsm.AddTransition(new WeaponTransition(m_endLoop, _fin_, NULL));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_hideB,				__be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_endLoop,				__be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(m_eject,				__wc_, m_chamberFromInnerMag));
+		m_fsm.AddTransition(new WeaponTransition(m_chamberFromInnerMag,	_fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_hideB, 	_fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_w4sb2, 	_fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			m_srcMagazine = e.m_magazine;
+			if (m_srcMagazine != NULL)
+			{
+				InventoryLocation newSrc = new InventoryLocation;
+				m_srcMagazine.GetInventory().GetCurrentInventoryLocation(newSrc);
+				
+				m_srcMagazinePrevLocation = newSrc;
+		
+				// move to LH
+				InventoryLocation lhand = new InventoryLocation;
+				lhand.SetAttachment(e.m_player, m_srcMagazine, InventorySlots.LEFTHAND);
+				if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - ammo pile removed from inv (inv->LHand)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, error - cannot remove ammo pile from inv");
+				
+				m_chamber.m_srcMagazine = m_srcMagazine;
+			} 
+			else
+			{
+				Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast m_srcMagazine = NULL");
+			}
+		}
+		else
+		{
+			Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast (e=NULL), m_srcMagazine=" + m_srcMagazine.ToString());
+		}
+
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - ammo pile removed from left hand to previous location (LHand->inv) - exit"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if (!done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if (!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - no inventory space for ammo pile - dropped to ground - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - exit");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - ammo pile removed from left hand (LHand->inv) - exit"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, error - cannot remove ammo pile from wpn - exit");
+					}
+				}
+			}
+		}
+		
+		super.OnExit(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	override void OnAbort (WeaponEventBase e)
+	{
+		bool done = false;
+		if (m_srcMagazine)
+		{
+			e.m_player.GetInventory().ClearInventoryReservationEx( m_srcMagazine , m_srcMagazinePrevLocation );
+			
+			InventoryLocation leftHandIl = new InventoryLocation;
+			m_srcMagazine.GetInventory().GetCurrentInventoryLocation(leftHandIl);
+			if (leftHandIl.IsValid())
+			{
+				if (m_srcMagazinePrevLocation && m_srcMagazinePrevLocation.IsValid())
+				{
+					if (vector.DistanceSq(m_srcMagazinePrevLocation.GetPos(), leftHandIl.GetPos()) < WeaponManager.MAX_DROP_MAGAZINE_DISTANCE_SQ)
+					{
+						if (GameInventory.LocationCanMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+						{
+							if (GameInventory.LocationSyncMoveEntity(leftHandIl,m_srcMagazinePrevLocation))
+							{
+								if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - ammo pile removed from left hand to previous location (LHand->inv) - abort"); }
+								done = true;
+							}
+						}
+					}
+				}
+				
+				if (!done)
+				{
+					InventoryLocation il = new InventoryLocation;
+					e.m_player.GetInventory().FindFreeLocationFor( m_srcMagazine, FindInventoryLocationType.CARGO, il );
+			
+					if (!il || !il.IsValid())
+					{
+						if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_srcMagazine))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - no inventory space for ammo pile - dropped to ground - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, error - cannot drop ammo pile from left hand after not found inventory space for ammo pile - abort");
+					
+					}
+					else
+					{
+						if (GameInventory.LocationSyncMoveEntity(leftHandIl, il))
+						{
+							if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, ok - ammo pile removed from left hand (LHand->inv) - abort"); }
+						}
+						else
+							Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast, error - cannot remove ammo pile from wpn - abort");
+					}
+				}
+			}
+		}
+
+		super.OnAbort(e);
+		m_srcMagazine = NULL;
+		m_chamber.m_srcMagazine = NULL;
+		m_srcMagazinePrevLocation = NULL;
+	}
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationWriteToContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast.SaveCurrentFSMState: cannot write m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationReadFromContext(m_srcMagazinePrevLocation, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " LoopedChamberingEjectLast.LoadCurrentFSMState: cannot read m_srcMagazinePrevLocation for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponCharging.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponCharging.c
new file mode 100644
index 0000000000000000000000000000000000000000..19e94e96eeea7d967511028609dd554fab800914
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponCharging.c
@@ -0,0 +1,380 @@
+/**@class 	WeaponCharging
+ * @brief	charging of weapon without ammo to be chambered
+ */
+class WeaponCharging extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponCharging_Start m_start;
+	ref WeaponCharging_CK m_onCK;
+	ref WeaponChamberFromAttMag_W4T m_chamber;
+	ref WeaponEjectAndChamberFromAttMag m_ejectChamber;
+	ref WeaponEjectAllMuzzles m_eject;
+
+	void WeaponCharging (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponCharging_Start(m_weapon, this, m_action, m_actionType);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+		m_chamber = new WeaponChamberFromAttMag_W4T(m_weapon, this);
+		m_ejectChamber = new WeaponEjectAndChamberFromAttMag(m_weapon, this);
+		m_eject = new WeaponEjectAllMuzzles(m_weapon, this);
+
+		// events
+		WeaponEventBase __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventBase __bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_ejectChamber, NULL, new WeaponGuardHasAmmo(m_weapon) ));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_eject ));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, _fin_, NULL ));
+		
+		//m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_eject, NULL, new GuardNot(new WeaponGuardCurrentChamberEmpty(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon))); // some anims do not send BE event
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onCK)); // some anims do not send BE event
+		
+		m_fsm.AddTransition(new WeaponTransition(   m_ejectChamber, __ck_, m_onCK ));
+		m_fsm.AddTransition(new WeaponTransition(   m_ejectChamber, _fin_, NULL ));
+		m_fsm.AddTransition(new WeaponTransition(   m_eject, __ck_, m_onCK));
+		m_fsm.AddTransition(new WeaponTransition(   m_eject, _fin_, NULL));
+		
+		m_fsm.AddTransition(new WeaponTransition(   m_onCK, _fin_, NULL));
+		
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, NULL));
+
+		m_fsm.SetInitialState(m_start);
+	}
+};
+
+class WeaponCharging_Start extends WeaponStartAction
+{
+	override bool IsWaitingForActionFinish () 
+	{
+		return true; 
+	}
+};
+
+class WeaponCharging_BE extends WeaponStateBase
+{
+};
+
+class WeaponCharging_CK extends WeaponStateBase
+{
+	override bool IsWaitingForActionFinish () { return true; }
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		m_weapon.SetCharged(true);
+		m_weapon.SetWeaponOpen(false);
+	}
+};
+
+class WeaponEjectBullet_Cartridge extends WeaponStateBase
+{
+	Magazine m_dstMagazine; /// destination of the cartridge
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if(e)
+		{
+			DayZPlayer p = e.m_player;
+			int mi = m_weapon.GetCurrentMuzzle();
+
+			ejectBulletAndStoreInMagazine(m_weapon, mi, m_dstMagazine, p); // MP-safe
+		}
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet_Cartridge.SaveCurrentFSMState: cannot write m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet_Cartridge.LoadCurrentFSMState: cannot read m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+};
+
+class WeaponEjectBulletMultiMuzzle_Cartridge extends WeaponStateBase
+{
+	Magazine m_dstMagazine; /// destination of the cartridge
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if(e)
+		{
+			DayZPlayer p = e.m_player;
+			for(int i = 0; i < m_weapon.GetMuzzleCount(); i++)
+			{
+				m_weapon.CreateRound(i);
+				ejectBulletAndStoreInMagazine(m_weapon, i, m_dstMagazine, p); // MP-safe
+				m_weapon.EffectBulletHide(i);
+				m_weapon.HideBullet(i);
+			}
+		}		
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet_Cartridge.SaveCurrentFSMState: cannot write m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet_Cartridge.LoadCurrentFSMState: cannot read m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+};
+
+class WeaponEjectBullet_Cartridge_W4T extends WeaponEjectBulletMultiMuzzle_Cartridge
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+
+/**@class 	WeaponCharging
+ * @brief	charging of weapon without ammo to be chambered
+ */
+class WeaponChargingInnerMag extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponCharging_Start m_start;
+	ref WeaponEjectBullet_Cartridge_W4T m_onBE;
+	ref WeaponEjectCasing_W4T m_onBEFireOut;
+	ref BulletHide_W4T m_hideB;
+	ref WeaponCharging_CK m_onCK;
+	ref WeaponChamberFromInnerMag_W4T m_chamber;
+
+	void WeaponChargingInnerMag (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponCharging_Start(m_weapon, this, m_action, m_actionType);
+		m_onBE = new WeaponEjectBullet_Cartridge_W4T(m_weapon, this);
+		m_onBEFireOut = new WeaponEjectCasing_W4T(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+		m_chamber = new WeaponChamberFromInnerMag_W4T(m_weapon, this);
+
+		// events
+		WeaponEventBase __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventBase __bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_onBEFireOut, NULL, new WeaponGuardCurrentChamberFiredOut(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_onBE, NULL, new GuardNot(new WeaponGuardCurrentChamberEmpty(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_onBE, __bh_, m_hideB));
+		m_fsm.AddTransition(new WeaponTransition(  m_onBEFireOut, __bh_, m_hideB));
+		
+		//TODO after inner magazine rework this events must load new bullet
+		
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onBEFireOut, NULL, new GuardAnd(new GuardNot(new WeaponGuardCurrentChamberEmpty(m_weapon)), new WeaponGuardCurrentChamberFiredOut(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onBE, NULL, new GuardNot(new WeaponGuardCurrentChamberEmpty(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_chamber, NULL, new WeaponGuardHasAmmoInnerMagazine(m_weapon))); // some anims do not send BE event
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onCK)); // some anims do not send BE event
+		m_fsm.AddTransition(new WeaponTransition(   m_onBE, __ck_, m_chamber, NULL, new WeaponGuardHasAmmoInnerMagazine(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBE, __ck_, m_onCK));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBEFireOut, __ck_, m_chamber, NULL, new WeaponGuardHasAmmoInnerMagazine(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBEFireOut, __ck_, m_onCK));
+		m_fsm.AddTransition(new WeaponTransition(   m_hideB, __ck_, m_chamber, NULL, new WeaponGuardHasAmmoInnerMagazine(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(   m_hideB, __ck_, m_onCK));
+		
+		m_fsm.AddTransition(new WeaponTransition(  m_start, _fin_, NULL ));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBEFireOut, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBE, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(   m_hideB, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(   m_onCK, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(	m_chamber, _fin_, NULL));
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+
+/**@class 	WeaponCharging
+ * @brief	charging of weapon without ammo to be chambered
+ */
+class WeaponChargingMultiple extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponCharging_Start m_start;
+	ref WeaponEjectBullet_Cartridge_W4T m_onBE;
+	ref WeaponEjectCasing_W4T m_onBEFireOut;
+	ref BulletHide_W4T m_hideB;
+	ref WeaponCharging_CK m_onCK;
+	ref WeaponChamberFromAttMag_W4T m_chamber;
+
+	void WeaponChargingMultiple (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponCharging_Start(m_weapon, this, m_action, m_actionType);
+		m_onBE = new WeaponEjectBullet_Cartridge_W4T(m_weapon, this);
+		m_onBEFireOut = new WeaponEjectCasing_W4T(m_weapon, this);
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+		m_chamber = new WeaponChamberFromAttMag_W4T(m_weapon, this);
+
+		// events
+		WeaponEventBase __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventBase __bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_onBEFireOut, NULL, new WeaponGuardCurrentChamberFiredOut(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_onBE, NULL, new GuardNot(new WeaponGuardCurrentChamberEmpty(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_onBE, __bh_, m_hideB));
+		m_fsm.AddTransition(new WeaponTransition(  m_onBEFireOut, __bh_, m_hideB));
+		
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onBE, NULL, new GuardNot(new WeaponGuardCurrentChamberEmpty(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon))); // some anims do not send BE event
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onCK)); // some anims do not send BE event
+		m_fsm.AddTransition(new WeaponTransition(   m_onBE, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBE, __ck_, m_onCK));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBEFireOut, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBEFireOut, __ck_, m_onCK));
+		m_fsm.AddTransition(new WeaponTransition(   m_hideB, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(   m_hideB, __ck_, m_onCK));
+		
+		m_fsm.AddTransition(new WeaponTransition(   m_start, _fin_, NULL ));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBEFireOut, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(   m_onBE, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(   m_hideB, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(   m_onCK, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, NULL));
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+/**@class 	WeaponCharging
+ * @brief	charging of weapon without ammo to be chambered
+ */
+class WeaponChargingStretch extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponCharging_Start m_start;
+	ref WeaponCharging_CK m_onCK;
+
+	void WeaponChargingStretch (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponCharging_Start(m_weapon, this, m_action, m_actionType);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+
+		// events
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(  m_start, _fin_, NULL ));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __ck_, m_onCK)); // some anims do not send BE event
+		m_fsm.AddTransition(new WeaponTransition(   m_onCK, _fin_, NULL));
+
+		m_fsm.SetInitialState(m_start);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponDetachingMag.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponDetachingMag.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd47333b00ce7c9e43847e1311e60161ca94624d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponDetachingMag.c
@@ -0,0 +1,201 @@
+
+// detach magazine composite state
+class WeaponDetachingMag_1 extends WeaponStartAction
+{ };
+
+class WeaponDetachingMag_Store extends WeaponStateBase
+{
+	Magazine m_magazine; /// magazine that will be detached
+	ref InventoryLocation m_dst;
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		//if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + "  WeaponDetachingMag_Store, Detaching mag=" + m_magazine.ToString() +  "to loc=" + InventoryLocation.DumpToStringNullSafe(m_dst)); }
+		super.OnEntry(e);
+		if (e)
+		{
+			if (!m_magazine || !m_dst)
+			{
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store, error - no magazine to load from (m_magazine=NULL)");
+			}
+		}
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_magazine = NULL;
+		m_dst = NULL;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		InventoryLocation il = new InventoryLocation;
+		if (m_magazine.GetInventory().GetCurrentInventoryLocation(il))
+		{
+			if (GameInventory.LocationSyncMoveEntity(il, m_dst))
+			{
+				m_weapon.HideMagazine();
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store, ok - magazine removed from inv (inv->dst)"); }
+			}
+			else
+			{
+				// @TODO: drop on gnd
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store, error - cannot store detached magazine!");
+			}
+		}
+		else
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store, error - cannot get curr location");
+		}
+
+		m_magazine = NULL;
+		m_dst = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_magazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store.SaveCurrentFSMState: cannot write m_magazine for weapon=" + m_weapon);
+			return false;
+		}
+
+		if (!OptionalLocationWriteToContext(m_dst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store.SaveCurrentFSMState: cannot write m_st for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_magazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store.LoadCurrentFSMState: cannot read m_magazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!OptionalLocationReadFromContext(m_dst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store.LoadCurrentFSMState: cannot read m_dst for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+/*class WeaponDetachingMag_Store_W4T extends WeaponDetachingMag_Store
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};*/
+
+class WeaponDetachingMag extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	Magazine m_magazine; /// detached magazine
+	ref InventoryLocation m_dst; /// detached magazine destination
+
+	ref WeaponStateBase m_start;
+	ref WeaponDetachingMag_Store m_store;
+	ref MagazineHide_W4T m_hideM;
+
+	void WeaponDetachingMag (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponDetachingMag_1(m_weapon, this, m_action, m_actionType);
+		m_store = new WeaponDetachingMag_Store(m_weapon, this);
+		m_hideM = new MagazineHide_W4T(m_weapon, this);
+		// events
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __md_ = new WeaponEventAnimMagazineDetached;
+		WeaponEventBase __mh_ = new WeaponEventAnimMagazineHide;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_start, __md_, m_store));
+		m_fsm.AddTransition(new WeaponTransition(m_store, __mh_, m_hideM));
+		m_fsm.AddTransition(new WeaponTransition(m_hideM, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_store  , _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			WeaponEventDetachMagazine de;
+			if (Class.CastTo(de, e))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("WeaponDetachingMag type=" + typename.EnumToString(InventoryLocationType, de.m_dst.GetType())); }
+				m_magazine = e.m_magazine;
+				m_dst = de.m_dst;
+				
+				m_store.m_magazine = m_magazine;
+				m_store.m_dst = m_dst;
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("WeaponDetachingMag type=" + typename.EnumToString(InventoryLocationType, m_store.m_dst.GetType())); }
+			}
+		}
+		super.OnEntry(e); // @NOTE: super at the end (prevent override from submachine start)
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dst = NULL;
+		m_magazine = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_magazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag.SaveCurrentFSMState: cannot write m_magazine for weapon=" + m_weapon);
+			return false;
+		}
+
+		if (!OptionalLocationWriteToContext(m_dst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag.SaveCurrentFSMState: cannot write m_st for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_magazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag.LoadCurrentFSMState: cannot read m_magazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!OptionalLocationReadFromContext(m_dst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag.LoadCurrentFSMState: cannot read m_dst for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponEjectBullet.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponEjectBullet.c
new file mode 100644
index 0000000000000000000000000000000000000000..6a1291df93a64312c01969376ea74ea45e183b32
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponEjectBullet.c
@@ -0,0 +1,139 @@
+// eject
+//TODO MW delete this file
+class WeaponEjectBullet_Start extends WeaponStartAction
+{ };
+/*
+class WeaponEjectBullet_Cartridge extends WeaponStateBase
+{
+	Magazine m_dstMagazine; /// destination of the cartridge
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+
+		DayZPlayer p = e.m_player;
+		int mi = m_weapon.GetCurrentMuzzle();
+
+		ejectBulletAndStoreInMagazine(m_weapon, mi, m_dstMagazine, p); // MP-safe
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnExit(e);
+	}
+};
+*/
+/*
+class WeaponEjectBullet_Cartridge_W4T extends WeaponEjectBullet_Cartridge
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+*/
+class WeaponEjectBullet extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	Magazine m_dstMagazine; /// destination of the cartridge
+
+	ref WeaponEjectBullet_Start m_start;
+	ref WeaponEjectBullet_Cartridge_W4T m_eject; // @TODO: workaround for missing BH event
+	ref BulletHide_W4T m_hideB;
+	ref WeaponChamberFromAttMag_W4T m_chamber;
+
+	void WeaponEjectBullet (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponEjectBullet_Start(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponEjectBullet_Cartridge_W4T(m_weapon, this); // @TODO: workaround for missing BH event (_W4T)
+		m_hideB = new BulletHide_W4T(m_weapon, this);
+		m_chamber = new WeaponChamberFromAttMag_W4T(m_weapon, this);
+		
+		// events
+		WeaponEventBase __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventBase __bh_ = new WeaponEventAnimBulletHide;
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(  m_start, __be_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(  m_eject, __bh_, m_hideB));
+
+		m_fsm.AddTransition(new WeaponTransition(  m_eject, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(  m_hideB, __ck_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon)));
+
+		m_fsm.AddTransition(new WeaponTransition(  m_hideB, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(  m_eject, _fin_, NULL)); // @TODO: workaround for missing BH event
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_start  , _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			if (e.m_magazine)
+				m_dstMagazine = e.m_magazine;
+			m_eject.m_dstMagazine = m_dstMagazine;
+			
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet m_mag=" + m_dstMagazine.ToString() + ", e.mag=" + e.m_magazine.ToString()); }
+		}
+
+		super.OnEntry(e); // @NOTE: super after submachine init (prevent override from submachine start)
+		
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dstMagazine = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet.LoadCurrentFSMState: cannot write m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponEjectBullet.LoadCurrentFSMState: cannot read m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponEjectCasingAndChamberFromAttMag.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponEjectCasingAndChamberFromAttMag.c
new file mode 100644
index 0000000000000000000000000000000000000000..c34043e0b7a39bfc51752c7b69689fd2392b829c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponEjectCasingAndChamberFromAttMag.c
@@ -0,0 +1,147 @@
+
+class WeaponEjectCasing extends WeaponStateBase
+{
+	void WeaponEjectCasing (Weapon_Base w = NULL, WeaponStateBase parent = NULL) { }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ejected fired out casing"); }
+			int mi = m_weapon.GetCurrentMuzzle();
+			if(m_weapon.IsChamberFiredOut(mi))
+			{
+				m_weapon.EjectCasing(mi);
+			}
+			m_weapon.EffectBulletHide(mi);
+			m_weapon.SelectionBulletHide();
+		}
+	}
+};
+
+class WeaponEjectCasingMultiMuzzle extends WeaponStateBase
+{
+	void WeaponEjectCasingMultiMuzzle (Weapon_Base w = NULL, WeaponStateBase parent = NULL) { }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ejected fired out casing multi muzzle"); }
+			for( int i = 0; i < m_weapon.GetMuzzleCount(); i++ )
+			{
+				if(m_weapon.IsChamberFiredOut(i))
+				{
+					m_weapon.EjectCasing(i);
+					m_weapon.EffectBulletHide(i);
+					m_weapon.HideBullet(i);
+				}
+			}
+		}
+	}
+	
+	override bool IsWaitingForActionFinish()
+	{
+		return false;
+	}
+};
+
+class WeaponEjectCasing_W4T extends WeaponEjectCasingMultiMuzzle
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class WeaponEjectAllMuzzles extends WeaponStateBase
+{
+	Magazine m_dstMagazine;
+	void WeaponEjectAllMuzzles (Weapon_Base w = NULL, WeaponStateBase parent = NULL) { }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(m_weapon.GetAttachmentByType(Magnum_Cylinder));
+			if(cylinder)
+			{
+				cylinder.HideSelection("bullet");
+				cylinder.HideSelection("bullet_2");
+				cylinder.HideSelection("bullet_3");
+				cylinder.HideSelection("bullet_4");
+				cylinder.HideSelection("bullet_5");
+				cylinder.HideSelection("bullet_6");
+				
+				cylinder.HideSelection("bullet_nose");
+				cylinder.HideSelection("bullet_nose_2");
+				cylinder.HideSelection("bullet_nose_3");
+				cylinder.HideSelection("bullet_nose_4");
+				cylinder.HideSelection("bullet_nose_5");
+				cylinder.HideSelection("bullet_nose_6");
+			}
+			
+			
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ejected bullets from all muzzles"); }
+			for( int i = 0; i < m_weapon.GetMuzzleCount(); i++ )
+			{
+				if(m_weapon.IsChamberFiredOut(i))
+				{
+					m_weapon.EjectCasing(i);
+					m_weapon.EffectBulletHide(i);
+					m_weapon.HideBullet(i);
+					continue;
+				}
+				
+				if(!m_weapon.IsChamberEmpty(i))
+				{
+					DayZPlayer p = e.m_player;
+					if(m_dstMagazine && m_dstMagazine.GetAmmoCount() < m_dstMagazine.GetAmmoMax() )
+					{
+						m_weapon.CreateRound(i);
+						ejectBulletAndStoreInMagazine(m_weapon,i,m_dstMagazine,p);
+					}
+					else
+					{
+						m_weapon.CreateRound(i);
+						ejectBulletAndStoreInMagazine(m_weapon,i,null,p);
+					}
+					m_weapon.EffectBulletHide(i);
+					m_weapon.HideBullet(i);
+				}
+			}
+			m_weapon.SetWeaponOpen(false);
+			m_weapon.SetCharged(true);
+		}
+		//m_weapon.SelectionBulletHide();
+	}
+	
+	override bool IsWaitingForActionFinish () 
+	{ 
+		return false; 
+	}
+};
+
+// eject casing and load bullet from att mag (no anim)
+class WeaponEjectCasingAndChamberFromAttMag extends WeaponEjectCasing
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			int mi = m_weapon.GetCurrentMuzzle();
+			pushToChamberFromAttachedMagazine(m_weapon, mi);
+		}
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+class WeaponEjectCasingAndChamberFromAttMag_W4T extends WeaponEjectCasingAndChamberFromAttMag
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFire.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFire.c
new file mode 100644
index 0000000000000000000000000000000000000000..239f3ed3ebb8fd66caebae693f6ab154abfe8784
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFire.c
@@ -0,0 +1,354 @@
+// fire
+class WeaponDryFire extends WeaponStartAction
+{
+	float m_dtAccumulator;
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			m_dtAccumulator = 0;
+		}
+		m_weapon.ResetBurstCount();
+	}
+
+	override bool IsWaitingForActionFinish () { return true; }
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+		DayZPlayer p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+		if (p)
+		{
+			HumanInputController hic = p.GetInputController();
+
+			int muzzleIndex = m_weapon.GetCurrentMuzzle();
+			float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+			if ( hic.IsAttackButton() && m_dtAccumulator >= reloadTime)
+				if (m_weapon.CanProcessWeaponEvents())
+					m_weapon.ProcessWeaponEvent(new WeaponEventDryFireTimeout(p));
+		}
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+	
+};
+
+// fire
+class WeaponFire extends WeaponStartAction
+{
+	float m_dtAccumulator;
+
+	override bool IsWaitingForActionFinish () { return true; }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			m_dtAccumulator = 0;
+	
+			if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponFire bang!"); }
+			//m_weapon.Fire();
+			int mi = m_weapon.GetCurrentMuzzle();
+			if (TryFireWeapon(m_weapon, mi))
+			{
+				DayZPlayerImplement p;
+				if (Class.CastTo(p, e.m_player))
+					p.GetAimingModel().SetRecoil(m_weapon);
+				m_weapon.OnFire(mi);
+			}
+		}
+		super.OnEntry(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+
+		DayZPlayer p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+
+		int muzzleIndex = m_weapon.GetCurrentMuzzle();
+		float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+		if (m_dtAccumulator >= reloadTime)
+			if (m_weapon.CanProcessWeaponEvents())
+				m_weapon.ProcessWeaponEvent(new WeaponEventReloadTimeout(p));
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		if (e)
+			m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+	
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_weapon.ResetBurstCount();
+		super.OnAbort(e);
+	}
+};
+
+class WeaponFireWithEject extends WeaponFire
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0;
+
+		if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponFire bang!"); }
+		//m_weapon.Fire();
+		int mi = m_weapon.GetCurrentMuzzle();
+		if (TryFireWeapon(m_weapon, mi))
+		{
+			DayZPlayerImplement p;
+			if (Class.CastTo(p, e.m_player))
+				p.GetAimingModel().SetRecoil(m_weapon);
+			m_weapon.EjectCasing(mi);
+			m_weapon.EffectBulletHide(mi);
+			m_weapon.OnFire(mi);
+		}
+		super.OnEntry(e);
+	}
+}
+
+// fire
+class WeaponFireMultiMuzzle extends WeaponStartAction
+{
+	float m_dtAccumulator;
+
+	override bool IsWaitingForActionFinish () { return true; }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			m_dtAccumulator = 0;
+	
+			if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponFire bang bang!"); }
+
+			int mi = m_weapon.GetCurrentMuzzle();
+			int b = m_weapon.GetCurrentModeBurstSize(mi);
+			if (b > 1)
+			{
+				
+				for (int i = 0; i < b; i++)
+				{
+					if (TryFireWeapon(m_weapon, i))
+					{
+						DayZPlayerImplement p1;
+						if (Class.CastTo(p1, e.m_player))
+						p1.GetAimingModel().SetRecoil(m_weapon);
+						m_weapon.OnFire(i);
+					}
+				}
+			}
+			else
+			{
+				if (TryFireWeapon(m_weapon, mi))
+				{
+					DayZPlayerImplement p;
+					if (Class.CastTo(p, e.m_player))
+						p.GetAimingModel().SetRecoil(m_weapon);
+					m_weapon.OnFire(mi);
+				}
+			}
+			if(mi >= m_weapon.GetMuzzleCount() - 1 )
+				m_weapon.SetCurrentMuzzle(0);
+			else
+				m_weapon.SetCurrentMuzzle(mi + 1);
+		}
+		super.OnEntry(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+
+		DayZPlayer p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+
+		int muzzleIndex = m_weapon.GetCurrentMuzzle();
+		float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+		if (m_dtAccumulator >= reloadTime)
+			if (m_weapon.CanProcessWeaponEvents())
+				m_weapon.ProcessWeaponEvent(new WeaponEventReloadTimeout(p));
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		if (e)
+			m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+	
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_weapon.ResetBurstCount();
+		super.OnAbort(e);
+	}
+};
+
+
+class WeaponFireMagnum extends WeaponFireMultiMuzzle
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(m_weapon.GetAttachmentByType(Magnum_Cylinder));
+			Magnum_Ejector ejector = Magnum_Ejector.Cast(m_weapon.GetAttachmentByType(Magnum_Ejector));
+			if(cylinder && ejector)
+			{
+				float a;
+				int mi = m_weapon.GetCurrentMuzzle();
+				switch(mi)
+				{
+					case 0:
+						a = MAGNUM_ROTATION_POSITION_0;
+						break;
+					case 1:
+						a = MAGNUM_ROTATION_POSITION_5;
+						cylinder.ResetAnimationPhase("Rotate_Cylinder", MAGNUM_ROTATION_POSITION_6 );
+						ejector.ResetAnimationPhase("Rotate_Ejector", MAGNUM_ROTATION_POSITION_6 );
+						break;
+					case 2:
+						a = MAGNUM_ROTATION_POSITION_4;
+						break;
+					case 3:
+						a = MAGNUM_ROTATION_POSITION_3;
+						break;
+					case 4:
+						a = MAGNUM_ROTATION_POSITION_2;
+						break;
+					case 5:
+						a = MAGNUM_ROTATION_POSITION_1;
+						break;
+				}
+				cylinder.SetAnimationPhase("Rotate_Cylinder", a );
+				ejector.SetAnimationPhase("Rotate_Ejector", a );
+			}
+		}
+	}
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+
+		DayZPlayer p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+
+		int muzzleIndex = m_weapon.GetCurrentMuzzle();
+		float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+		if (m_dtAccumulator >= reloadTime)
+			if (m_weapon.CanProcessWeaponEvents())
+				m_weapon.ProcessWeaponEvent(new WeaponEventReloadTimeout(p));
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		if (e)
+			m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+};
+
+
+
+// fire to jam
+class WeaponFireToJam extends WeaponStartAction
+{
+	float m_dtAccumulator;
+
+	override bool IsWaitingForActionFinish () { return true; }
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			m_dtAccumulator = 0;
+
+			if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponFire bang! and jam?"); }
+			//m_weapon.Fire();
+			int mi = m_weapon.GetCurrentMuzzle();
+			if (TryFireWeapon(m_weapon, mi))
+			{
+				m_weapon.SetJammed(true);
+				DayZPlayerImplement p;
+				if (Class.CastTo(p, e.m_player))
+					p.GetAimingModel().SetRecoil(m_weapon);
+				m_weapon.OnFire(mi);
+			}
+		}
+		m_weapon.ResetBurstCount();
+		super.OnEntry(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+			m_dtAccumulator += dt;
+
+			DayZPlayer p;
+			Class.CastTo(p, m_weapon.GetHierarchyParent());
+
+			int muzzleIndex = m_weapon.GetCurrentMuzzle();
+			float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+			if (m_dtAccumulator >= reloadTime)
+				if (m_weapon.CanProcessWeaponEvents())
+					m_weapon.ProcessWeaponEvent(new WeaponEventReloadTimeout(p));
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+};
+
+
+class WeaponFireAndChamber extends WeaponFire
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (!m_weapon.IsJammed())
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ejected fired out casing"); }
+				int mi = m_weapon.GetCurrentMuzzle();
+				m_weapon.EjectCasing(mi);
+				m_weapon.EffectBulletHide(mi);
+				m_weapon.SelectionBulletHide();
+	
+				pushToChamberFromAttachedMagazine(m_weapon, mi);
+			}
+		}
+	}
+};
+
+class WeaponFireAndChamberFromInnerMagazine extends WeaponFire
+{
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		
+		if (!m_weapon.IsJammed())
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " ejected fired out casing"); }
+			int mi = m_weapon.GetCurrentMuzzle();
+			m_weapon.EjectCasing(mi);
+			m_weapon.EffectBulletHide(mi);
+			m_weapon.SelectionBulletHide();
+			
+			pushToChamberFromInnerMagazine(m_weapon, mi);
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireAndChamberNext.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireAndChamberNext.c
new file mode 100644
index 0000000000000000000000000000000000000000..30f6b597d215134eee32caf1363a935d0c104fa9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireAndChamberNext.c
@@ -0,0 +1,74 @@
+class WeaponFireAndChamberNext extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	float m_dtAccumulator;
+	ref WeaponFire m_fire;
+
+	void WeaponFireAndChamberNext (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_fire = new WeaponFireAndChamber(m_weapon, this, m_action, m_actionType);
+
+		// events
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventAnimBulletEject  __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventReloadTimeout __to_ = new WeaponEventReloadTimeout;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(m_fire, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_fire, __to_, NULL));
+
+		m_fsm.SetInitialState(m_fire);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+			m_dtAccumulator = 0;
+	}
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+		DayZPlayerImplement p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+		if( p )
+		{
+			HumanInputController hic = p.GetInputController();
+
+			int muzzleIndex = m_weapon.GetCurrentMuzzle();
+			float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+			
+			if ( m_dtAccumulator >= reloadTime && ( hic.IsAttackButton() || (m_weapon.GetBurstCount() < m_weapon.GetCurrentModeBurstSize(muzzleIndex))))
+			{
+				if (m_weapon.CanProcessWeaponEvents())
+				{
+					m_weapon.ProcessWeaponEvent(new WeaponEventReloadTimeout(p));
+				}
+			}
+		}
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		//m_weapon.ResetBurstCount();
+		m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+	
+	override void OnAbort (WeaponEventBase e)
+	{
+		m_weapon.ResetBurstCount();
+		super.OnAbort(e);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireAndChamberNextFromInnerMag.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireAndChamberNextFromInnerMag.c
new file mode 100644
index 0000000000000000000000000000000000000000..2eb0475a3e26d736a2904a86c763e03d61169e58
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireAndChamberNextFromInnerMag.c
@@ -0,0 +1,62 @@
+class WeaponFireAndChamberNextFromInnerMag extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	float m_dtAccumulator;
+	ref WeaponFire m_fire;
+
+	void WeaponFireAndChamberNextFromInnerMag (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_fire = new WeaponFireAndChamber(m_weapon, this, m_action, m_actionType);
+
+		// events
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventAnimBulletEject  __be_ = new WeaponEventAnimBulletEject;
+		WeaponEventReloadTimeout __to_ = new WeaponEventReloadTimeout;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(m_fire, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_fire, __to_, NULL));
+
+		m_fsm.SetInitialState(m_fire);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+			m_dtAccumulator = 0;
+	}
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+		DayZPlayer p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+		if( p )
+		{
+			HumanInputController hic = p.GetInputController();
+
+			int muzzleIndex = m_weapon.GetCurrentMuzzle();
+			float reloadTime = m_weapon.GetReloadTime(muzzleIndex);
+			if ( hic.IsAttackButton() && m_dtAccumulator >= reloadTime)
+				if (m_weapon.CanProcessWeaponEvents())
+					m_weapon.ProcessWeaponEvent(new WeaponEventReloadTimeout(p));
+		}
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireLast.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireLast.c
new file mode 100644
index 0000000000000000000000000000000000000000..def6469e8553c4a1feed009ba0836cdb0b55af57
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponFireLast.c
@@ -0,0 +1,45 @@
+
+class WeaponFireLast extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	
+	float m_dtAccumulator;
+	ref WeaponFireWithEject m_fire;
+
+	void WeaponFireLast (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_fire = new WeaponFireWithEject(m_weapon, this, m_action, m_actionType);
+
+		// events
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventReloadTimeout __to_ = new WeaponEventReloadTimeout;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(m_fire, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_fire, __to_, NULL));
+
+		m_fsm.SetInitialState(m_fire);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+			m_dtAccumulator = 0;
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0;
+		super.OnExit(e);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponReChamber.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponReChamber.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a9c17f017a27e3f7d1a05995b6ec9c5b0736711
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponReChamber.c
@@ -0,0 +1,106 @@
+
+// rechamber (== eject cartridge + load another + store the old one)
+class WeaponRechamber extends WeaponStateBase
+{
+	int m_actionEject;
+	int m_actionTypeEject;
+	int m_actionLoad;
+	int m_actionTypeLoad;
+	Magazine m_dstMagazine; /// destination of the ejected cartridge
+	Magazine m_srcMagazine; /// source of the loaded cartridge
+
+	ref WeaponEjectBullet m_eje;
+	ref WeaponChambering m_loa;
+
+	void WeaponRechamber (Weapon_Base w = NULL, WeaponStateBase parent = NULL, int actionEject = -1, int actionTypeEject = -1, int actionLoad = -1, int actionTypeLoad = -1)
+	{
+		m_actionEject = actionEject;
+		m_actionTypeEject = actionTypeEject;
+		m_actionLoad = actionLoad;
+		m_actionTypeLoad = actionTypeLoad;
+
+		// setup nested state machine
+		m_eje = new WeaponEjectBullet(m_weapon, this, m_actionEject, m_actionTypeEject);
+		m_loa = new WeaponChambering(m_weapon, this, m_actionLoad, m_actionTypeLoad);
+		// events
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(m_eje, _fin_, m_loa));
+		m_fsm.AddTransition(new WeaponTransition(m_loa, _fin_, NULL));
+
+		m_fsm.SetInitialState(m_eje);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e)
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponRechamber, mag=" + e.m_magazine.ToString()); }
+			m_srcMagazine = e.m_magazine;
+			m_loa.m_srcMagazine = m_srcMagazine;
+
+			// prepare magazine for ejected ammo
+			int mi = m_weapon.GetCurrentMuzzle();
+			string magazineTypeName = m_weapon.GetChamberedCartridgeMagazineTypeName(mi);
+			float damage = 0.0;
+			string type;
+			if (m_weapon.GetCartridgeInfo(mi, damage, type))
+			{
+				m_dstMagazine = DayZPlayerUtils.SelectStoreCartridge(e.m_player, m_weapon, mi, m_srcMagazine, damage, magazineTypeName);
+				if (!m_dstMagazine)
+				{
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + "   WeaponRechamber - error, cannot prepare mag for catridge, magType=" + magazineTypeName);
+				}
+			}
+
+			e.m_magazine = m_dstMagazine; // @NOTE: override event mag - @TODO
+		}
+		super.OnEntry(e); // @NOTE: super after submachine init (prevent override from submachine start)
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+		m_dstMagazine = NULL;
+		m_eje.m_dstMagazine = NULL;
+		m_loa.m_srcMagazine = NULL;
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot save m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Write(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.SaveCurrentFSMState: cannot save m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_dstMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_dstMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_srcMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponChambering.LoadCurrentFSMState: cannot read m_srcMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponReplacingMagAndChamberNext.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponReplacingMagAndChamberNext.c
new file mode 100644
index 0000000000000000000000000000000000000000..25121b90e95277f2044e827d20e5d0e15edec8f6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponReplacingMagAndChamberNext.c
@@ -0,0 +1,597 @@
+
+/**@class		DetachOldMagazine
+ * @brief		detaches old magazine from weapon and stores it in left hand (LH)
+ **/
+class DetachOldMagazine extends WeaponStateBase
+{
+	Magazine m_oldMagazine; /// magazine that will be detached
+	ref InventoryLocation m_newDst;
+
+	void DetachOldMagazine (Weapon_Base w = NULL, WeaponStateBase parent = NULL)
+	{
+		m_oldMagazine = NULL;
+		m_newDst = NULL;
+	}
+	
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		super.OnAbort(e);
+		m_oldMagazine = NULL;
+		m_newDst = NULL;
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		if (m_oldMagazine)
+		{
+			InventoryLocation il = new InventoryLocation();
+			e.m_player.GetInventory().FindFreeLocationFor( m_oldMagazine , FindInventoryLocationType.CARGO, il );			
+			
+			if (!m_newDst || !m_newDst.IsValid() || m_newDst.GetType() == InventoryLocationType.GROUND)
+			{
+				if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_oldMagazine))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, ok - no inventory space for old magazine - dropped to ground"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, error - cannot drop magazine from left hand after not found inventory space for old magazine");
+				
+			}
+			else
+			{
+				InventoryLocation oldSrc = new InventoryLocation();
+				m_oldMagazine.GetInventory().GetCurrentInventoryLocation(oldSrc);
+				
+				if (GameInventory.LocationSyncMoveEntity(oldSrc, m_newDst))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, ok - old magazine removed from wpn (LHand->inv)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, error - cannot remove old mag from wpn");
+			}
+		}
+
+		m_weapon.HideMagazine();
+		m_oldMagazine = NULL;
+		m_newDst = null;
+		super.OnExit(e);
+	}
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_oldMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.SaveCurrentFSMState: cannot write m_oldMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+				
+		if (!OptionalLocationWriteToContext(m_newDst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.SaveCurrentFSMState: cannot write m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_oldMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.LoadCurrentFSMState: cannot read m_oldMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationReadFromContext(m_newDst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.LoadCurrentFSMState: cannot read m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+/**@class		OldMagazineHide
+ * @brief		hides old magazine, but keep it in LH
+ * @note		on abort, old magazine is dropped to ground
+ **/
+class OldMagazineHide : MagazineHide
+{
+};
+
+/**@class		SwapOldAndNewMagazine
+ * @brief		old magazine to inventory, new to left hand
+ *
+ * stores old magazine in left hand somewhere in inventory (or drop to ground if necessary)
+ * and moves new magazine to left hand.
+ * on abort new magazine is dropped to ground.
+ **/
+class SwapOldAndNewMagazine extends WeaponStateBase
+{
+	Magazine m_newMagazine; /// magazine that will be dropped on abort
+	ref InventoryLocation m_newDst;
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		
+		if( e )
+		{
+			if (!m_newMagazine || !m_newDst || !m_newDst.IsValid())
+			{
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine, error - m_newMagazine(" + m_newMagazine + ") or destination(" + InventoryLocation.DumpToStringNullSafe(m_newDst) + ") is not set ");
+			}
+			else
+			{
+				e.m_player.GetInventory().ClearInventoryReservationEx( m_newMagazine , m_newDst );
+				m_weapon.ShowMagazine();
+				InventoryLocation lhand = new InventoryLocation();
+				lhand.SetAttachment(e.m_player, m_newMagazine, InventorySlots.LEFTHAND);
+			
+				if (GameInventory.LocationSyncMoveEntity(lhand, m_newDst))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine, ok - new magazine removed from inv (LHand->Att)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine, error - cannot remove new mag from LHand");
+			}
+		}
+	}
+	
+	override void OnAbort (WeaponEventBase e)
+	{
+		//m_weapon.HideMagazine();
+
+		m_newMagazine = NULL;
+		m_newDst = NULL;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_newMagazine = NULL;
+		m_newDst = NULL;
+
+		super.OnExit(e);
+	}
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine.SaveCurrentFSMState: cannot write m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!OptionalLocationWriteToContext(m_newDst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine.SaveCurrentFSMState: cannot write m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine.LoadCurrentFSMState: cannot read m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!OptionalLocationReadFromContext(m_newDst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " SwapOldAndNewMagazine.LoadCurrentFSMState: cannot read m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+
+		return true;
+	}
+};
+
+/**@class		AttachNewMagazine
+ * @brief		attach mag in LH into weapon
+ **/
+class AttachNewMagazine extends WeaponStateBase
+{
+	Magazine m_newMagazine; /// new magazine from inventory that will be attached
+	ref InventoryLocation m_newDst;
+
+	void AttachNewMagazine (Weapon_Base w = NULL, WeaponStateBase parent = NULL)
+	{
+		m_newMagazine = NULL;
+		m_newDst = NULL;
+	}
+	
+	override bool IsWaitingForActionFinish ()
+	{
+		return true;
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (m_newMagazine && m_newDst)
+			{
+				InventoryLocation il = new InventoryLocation();
+				if (m_newMagazine.GetInventory().GetCurrentInventoryLocation(il))
+				{
+					InventoryLocation lhand = new InventoryLocation();
+					lhand.SetAttachment(e.m_player, m_newMagazine, InventorySlots.LEFTHAND);
+					if (GameInventory.LocationSyncMoveEntity(il, m_newDst))
+					{
+						m_weapon.ShowMagazine();
+						if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine, ok - attached new magazine (LHand->dst)"); }
+					}
+					else
+					{
+						if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine, error - cannot attach new magazine!"); }
+					}
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine, error - cannot get curr location");
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine, error - no magazines configured for replace (m_new=NULL)");
+		}
+	}
+
+	override void OnAbort (WeaponEventBase e)
+	{
+		if (m_newMagazine && m_newDst)
+		{
+			if (DayZPlayerUtils.HandleDropMagazine(e.m_player, m_newMagazine))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store, ok - aborting, detached magazine dropped to ground"); }
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponDetachingMag_Store, error - cannot abort detaching of magazine");
+
+			m_weapon.HideMagazine(); // force hide on abort
+		}
+		
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine, aborting, but attached new magazine already in place"); }
+		m_newMagazine = NULL;
+		m_newDst = NULL;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_newMagazine = NULL;
+		m_newDst = NULL;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine.SaveCurrentFSMState: cannot write m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+
+		if (!OptionalLocationWriteToContext(m_newDst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine.SaveCurrentFSMState: cannot write m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine.LoadCurrentFSMState: cannot read m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!OptionalLocationReadFromContext(m_newDst, ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " AttachNewMagazine.LoadCurrentFSMState: cannot read m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+};
+
+class AttachNewMagazine_W4T extends WeaponStateBase
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+
+/**@class		WeaponReplacingMagAndChamberNext
+ * @brief		replace current magazine with new one
+ *
+ * replace magazine, i.e. eject curr magazine from weapon, attach another (store the old one) 
+ * and chamber next bullet from magazine (if possible)
+ **/
+class WeaponReplacingMagAndChamberNext extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+
+	ref WeaponStartAction m_start;
+	ref DetachOldMagazine m_detach;
+	ref OldMagazineHide m_hideOld;
+	ref SwapOldAndNewMagazine m_swapMags;
+	ref AttachNewMagazine_W4T m_attach;
+	ref WeaponChamberFromAttMag_W4T m_chamber;
+	ref WeaponCharging_CK m_onCK;
+	ref WeaponEjectCasing m_eject;
+
+	// substates configuration
+	Magazine m_oldMagazine; /// magazine that will be detached
+	Magazine m_newMagazine; /// magazine that will be attached
+	ref InventoryLocation m_newDst;
+
+	void WeaponReplacingMagAndChamberNext (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+		m_newMagazine = NULL;
+
+		// setup nested state machine
+		m_start = new WeaponStartAction(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponEjectCasing(m_weapon,this);
+		m_detach = new DetachOldMagazine(m_weapon, this);
+		m_hideOld = new OldMagazineHide(m_weapon, this);
+		m_swapMags = new SwapOldAndNewMagazine(m_weapon, this);
+		m_attach = new AttachNewMagazine_W4T(m_weapon, this);
+		m_chamber = new WeaponChamberFromAttMag_W4T(m_weapon, this);
+		m_onCK = new WeaponCharging_CK(m_weapon, this);
+
+		// events
+		WeaponEventBase __so_ = new WeaponEventAnimSliderOpen;
+		WeaponEventBase __md_ = new WeaponEventAnimMagazineDetached;
+		WeaponEventBase __mh_ = new WeaponEventAnimMagazineHide;
+		WeaponEventBase __ms_ = new WeaponEventAnimMagazineShow;
+		WeaponEventBase __ma_ = new WeaponEventAnimMagazineAttached;
+		WeaponEventBase __ck_ = new WeaponEventAnimCocked;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		m_fsm.AddTransition(new WeaponTransition(   m_start, __md_, m_detach));
+		m_fsm.AddTransition(new WeaponTransition(   m_start, __so_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(   m_eject, __md_, m_detach));
+		m_fsm.AddTransition(new WeaponTransition(  m_detach, __mh_, m_hideOld));
+		m_fsm.AddTransition(new WeaponTransition( m_hideOld, __ms_, m_swapMags));
+		m_fsm.AddTransition(new WeaponTransition(m_swapMags, __ma_, m_attach));
+		m_fsm.AddTransition(new WeaponTransition(  m_attach, __ck_, m_chamber, NULL, new GuardAnd(new WeaponGuardCurrentChamberEmpty(m_weapon), new WeaponGuardHasAmmo(m_weapon))));
+		m_fsm.AddTransition(new WeaponTransition(  m_attach, __ck_, m_onCK));
+		
+		m_fsm.AddTransition(new WeaponTransition(  m_attach, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition( m_chamber, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(    m_onCK, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_swapMags, _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_hideOld,  _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_detach,   _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_eject,    _fin_, null));
+		m_fsm.AddTransition(new WeaponTransition(m_start,    _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+	
+	override void OnEntry (WeaponEventBase e)
+	{
+		if (e != NULL)
+		{
+			WeaponEventSwapMagazine se;
+			if (Class.CastTo(se, e))
+			{
+				int mi = m_weapon.GetCurrentMuzzle();
+				m_oldMagazine = m_weapon.GetMagazine(mi);
+				m_newMagazine = se.m_magazine;
+				m_newDst = se.m_dst;
+				
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponReplacingMagAndChamberNext, m_oldMagazine= " + m_oldMagazine + " m_newMagazine= " + m_newMagazine + " m_oldMagazineDst= " + typename.EnumToString(InventoryLocationType, se.m_dst.GetType())); }
+				
+				InventoryLocation oldSrc = new InventoryLocation();
+				InventoryLocation newSrc = new InventoryLocation();
+
+				if (!m_newMagazine.GetInventory().GetCurrentInventoryLocation(newSrc))
+				{
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponReplacingMagAndChamberNext cannot get curr inv loc of NEW mag=" + Object.GetDebugName(m_newMagazine));
+				}
+				if (!m_oldMagazine.GetInventory().GetCurrentInventoryLocation(oldSrc))
+				{
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponReplacingMagAndChamberNext cannot get curr inv loc of OLD mag=" + Object.GetDebugName(m_oldMagazine));
+				}
+				
+				// move to LH
+				InventoryLocation lhand = new InventoryLocation();
+				lhand.SetAttachment(e.m_player, m_newMagazine, InventorySlots.LEFTHAND);
+				
+				if (GameInventory.LocationSyncMoveEntity(newSrc, lhand))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory, ok - new magazine removed from inv (inv->LHand)"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " RemoveNewMagazineFromInventory, error - cannot new remove mag from inv");
+
+				m_detach.m_oldMagazine = m_oldMagazine;
+				m_detach.m_newDst = m_newDst;
+
+				m_swapMags.m_newMagazine = m_newMagazine;
+				
+				oldSrc.SetItem(m_newMagazine);
+				m_swapMags.m_newDst = oldSrc;
+			}
+		}
+		super.OnEntry(e);
+	}
+	
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+		
+		EntityAI leftHandItem = e.m_player.GetInventory().FindAttachment(InventorySlots.LEFTHAND);
+		Magazine mag = Magazine.Cast(leftHandItem);
+		
+		if(mag)
+		{
+			if (m_newMagazine)
+				e.m_player.GetInventory().ClearInventoryReservationEx( m_newMagazine , null );
+			if (m_oldMagazine)
+				e.m_player.GetInventory().ClearInventoryReservationEx( m_oldMagazine , null );
+			
+			InventoryLocation il = new InventoryLocation();
+			
+			e.m_player.GetInventory().FindFreeLocationFor(mag, FindInventoryLocationType.CARGO, il);
+			
+			if (!il.IsValid())
+			{
+				if (DayZPlayerUtils.HandleDropMagazine(e.m_player, mag))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, ok - no inventory space for old magazine - dropped to ground - exit"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, error - cannot drop magazine from left hand after not found inventory space for old magazine - exit");
+				
+			}
+			else
+			{
+				InventoryLocation oldSrc = new InventoryLocation();
+				mag.GetInventory().GetCurrentInventoryLocation(oldSrc);
+				
+				if (GameInventory.LocationSyncMoveEntity(oldSrc, il))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, ok - old magazine removed from wpn (LHand->inv) - exit"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, error - cannot remove old mag from wpn - exit");
+			}
+		}
+
+		m_oldMagazine = NULL;
+		m_newMagazine = NULL;
+		m_newDst = NULL;
+	}
+	
+	override void OnAbort(WeaponEventBase e)
+	{
+		super.OnAbort(e);
+		
+		EntityAI leftHandItem = e.m_player.GetInventory().FindAttachment(InventorySlots.LEFTHAND);
+		Magazine mag = Magazine.Cast(leftHandItem);
+		
+		if (mag)
+		{
+			if (m_newMagazine)
+				e.m_player.GetInventory().ClearInventoryReservationEx( m_newMagazine , null );
+			if (m_oldMagazine)
+				e.m_player.GetInventory().ClearInventoryReservationEx( m_oldMagazine , null );
+			
+			InventoryLocation il = new InventoryLocation();
+			
+			e.m_player.GetInventory().FindFreeLocationFor(mag, FindInventoryLocationType.CARGO, il);
+		
+			if (!il.IsValid())
+			{
+				if (DayZPlayerUtils.HandleDropMagazine(e.m_player, mag))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, ok - no inventory space for old magazine - dropped to ground - abort"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, error - cannot drop magazine from left hand after not found inventory space for old magazine - abort");
+				
+			}
+			else
+			{
+				InventoryLocation oldSrc = new InventoryLocation();
+				mag.GetInventory().GetCurrentInventoryLocation(oldSrc);
+				
+				if (GameInventory.LocationSyncMoveEntity(oldSrc, il))
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, ok - old magazine removed from wpn (LHand->inv) - abort"); }
+				}
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine, error - cannot remove old mag from wpn - abort");
+			}
+		}
+	}
+	
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.SaveCurrentFSMState: cannot write m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+
+		if (!ctx.Write(m_oldMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.SaveCurrentFSMState: cannot write m_oldMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		
+		if (!m_newDst.WriteToContext(ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.SaveCurrentFSMState: cannot write m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+		
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_newMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.LoadCurrentFSMState: cannot read m_newMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_oldMagazine))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.LoadCurrentFSMState: cannot read m_oldMagazine for weapon=" + m_weapon);
+			return false;
+		}
+		m_newDst = new InventoryLocation;
+		
+		if (!m_newDst.ReadFromContext(ctx))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " DetachOldMagazine.LoadCurrentFSMState: cannot read m_newDst for weapon=" + m_weapon);
+			return false;
+		}
+		
+		return true;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStableState.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStableState.c
new file mode 100644
index 0000000000000000000000000000000000000000..bfc2f5464d2044457ab495edc09349c997b38d93
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStableState.c
@@ -0,0 +1,196 @@
+/**@class		WeaponStableState
+ * @brief	  represents weapon's stable state (i.e. the basic states that the weapon will spend the most time in)
+ *
+ * Stable states have associated animation states that they supposed to be in.
+ * If they are not, the SetWeaponAnimState is called on the weapon in order to
+ * set to required (configured) state
+ *
+ * @NOTE: OnExit from stable state, the weapon's animation state (@see
+ * Weapon_Base::m_weaponAnimState) is set to -1 (unknown) In case of action
+ * abort the final stable state is forced to set proper animation state
+ * according to configuration (@see m_animState)
+ **/
+
+enum MuzzleState
+{
+	//! UNKNOWN
+	U	= -1,
+	//! EMPTY
+	E	=  0,
+	//! FIRED
+	F	=  1,
+	//! LOADED
+	L	=  2
+}
+
+class WeaponStableState extends WeaponStateBase
+{
+	int m_animState;
+	
+	ref array<MuzzleState> m_muzzleHasBullet = new array<MuzzleState>();
+
+	void WeaponStableState(Weapon_Base w = NULL, WeaponStateBase parent = NULL, int anim_state = -1)
+	{
+		m_animState = anim_state;
+		InitMuzzleArray();
+		ValidateMuzzleArray();
+	}
+
+	void SyncAnimState()
+	{
+		int curr = m_weapon.GetWeaponAnimState();
+		if (curr != m_animState)
+		{
+			//if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " synchronizing anim state: " + curr + " --> " + m_animState);
+			PlayerBase p;
+			if (Class.CastTo(p, m_weapon.GetHierarchyParent()))
+			{
+				if (p.GetItemInHands() == m_weapon)
+				{
+					HumanCommandWeapons hcw = p.GetCommandModifier_Weapons();
+					if (hcw)
+					{
+						hcw.SetInitState(m_animState);
+						if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " state=" + m_weapon.GetCurrentState().Type() + " synchronized anim state: " + typename.EnumToString(PistolAnimState, curr) + " --> " + typename.EnumToString(PistolAnimState, m_animState));
+					}
+					else
+					{
+						Human wpnOwner = Human.Cast(m_weapon.GetHierarchyRootPlayer());
+						HumanCommandWeapons.StaticSetInitState(wpnOwner, m_animState);
+						if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " state=" + m_weapon.GetCurrentState().Type() + " synchronized remote anim state: " + typename.EnumToString(PistolAnimState, curr) + " --> " + typename.EnumToString(PistolAnimState, m_animState));
+					}
+				}
+				m_weapon.SetWeaponAnimState(m_animState);
+			}
+			else
+			{
+				m_weapon.SetGroundAnimFrameIndex(m_animState);
+			}		
+		}
+	}
+
+	override void OnEntry(WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		m_weapon.SetJammed(false);
+		if (e)
+			SyncAnimState();
+		m_weapon.ResetWeaponAnimState();
+	}
+	override void OnUpdate(float dt)
+	{
+		super.OnUpdate(dt);
+		SyncAnimState();
+	}
+	override void OnExit(WeaponEventBase e)
+	{
+		m_weapon.ResetWeaponAnimState();
+		super.OnExit(e);
+	}
+
+	override bool IsIdle() { return true; }
+
+	int GetCurrentStateID() { return 0; }
+	
+	/** \name Weapon state properties
+	*	Properties defining the state in several properties for other systems
+	*	Override these to set them up
+	*
+	*	Several systems depends on this:
+	*	WeaponFSM.RandomizeFSMState, which picks out a suitable FSM state when attaching magazine through CE
+	*	WeaponFSM.ValidateAndRepair, which will attempt to identify a desync and repair the FSM state if so
+	*
+	* @WARNING	So it is important to set these up correctly to prevent any desync of weapon FSM and actual wepon state
+	*/
+	//@{
+	
+	/**@brief Whether WeaponFSM.ValidateAndRepair should be applied on this state
+	 * @NOTE:   This property was implemented at the same time as ValARep
+	 *			To have it disabled by default
+	 *			In case there are modders who created their own state
+	 *			But potentially did not set up their properties correctly
+	 *			As having ValARep run on an improper setup would result in horrible VME spam and desync
+	 * @WARNING:	When enabling repair, it is imperative that all properties are set up correctly.
+	 **/
+	bool IsRepairEnabled() { return false; }
+	
+	/**@brief Whether there is a bullet in the chamber
+	 * @NOTE:   This should only be false when it is empty
+	 *			So this is true when there is a bullet in the chamber
+	 *			Regardless of the bullet being loaded, firedout or jammed
+	 **/
+    bool HasBullet() { return false; }
+	
+	//! Whether there is a magazine attached
+	bool HasMagazine() { return false; }
+	
+	//! Whether the gun is jammed
+	bool IsJammed() { return false; }
+	
+	//! Whether the gun is discharged
+	bool IsDischarged() { return false; }
+	
+	//! Whether the gun is open
+	bool IsWeaponOpen() { return false; }
+	
+	//! Override with the filling of m_muzzleHasBullet
+	void InitMuzzleArray() { m_muzzleHasBullet = { MuzzleState.U }; }
+	
+	//! Special one for when the weapon only has one singular state (like Magnum)
+	bool IsSingleState() { return false; }
+	
+	//@}
+	
+	/** \name Weapon state properties helpers
+	*	Several helpers for better access of certain properties
+	*/
+	//@{
+	
+	//! Get chamber state of the muzzle at index
+	MuzzleState GetMuzzleState(int idx) { return m_muzzleHasBullet[idx]; }	
+	int GetMuzzleStateCount() { return m_muzzleHasBullet.Count(); }	
+	bool IsChamberValid(int idx) { return m_muzzleHasBullet[idx] != MuzzleState.U; }
+	bool IsChamberFiredOut(int idx) { return m_muzzleHasBullet[idx] == MuzzleState.F; }
+	bool IsChamberFull(int idx) { return m_muzzleHasBullet[idx] != MuzzleState.E; }
+	
+	//@}
+	
+	//! Safety check and error message in case not set up correctly
+	void ValidateMuzzleArray()
+	{
+		// There is only one
+		if (IsSingleState())
+			return;
+		
+		bool failed = false;
+		
+		if (!failed)
+		{
+			foreach (MuzzleState state : m_muzzleHasBullet)
+			{
+				if ( state == MuzzleState.U )
+				{
+					failed = true;
+					break;
+				}
+			}
+		}
+		
+		if (failed)
+		{
+			ErrorExSeverity severity = ErrorExSeverity.ERROR;
+			
+			#ifdef DEVELOPER
+			if (DayZGame.m_IsPreviewSpawn)
+			{
+				// we do not want VMEs when spawning the item in order to visualize it for preview in script console
+				severity = ErrorExSeverity.INFO;
+			}
+			#endif
+			
+			ErrorEx("Muzzle array validation has failed. Please set up the correct muzzle states by overriding InitMuzzleArray.", severity);
+		}
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStartAction.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStartAction.c
new file mode 100644
index 0000000000000000000000000000000000000000..ada64b8a48ac87601f2b8d1c58a81d7114485c29
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStartAction.c
@@ -0,0 +1,53 @@
+/**@class 	WeaponStartAction
+ * @brief	simple class starting animation action specified by m_action and m_actionType
+ */
+class WeaponStartAction extends WeaponStateBase
+{
+	WeaponActions m_action; /// action to be played
+	int m_actionType; /// specific action sub-type
+
+	void WeaponStartAction (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			if (e.m_player)
+			{
+				HumanCommandWeapons hcw = e.m_player.GetCommandModifier_Weapons();
+				if (hcw)
+				{
+					HumanCommandAdditives ad = e.m_player.GetCommandModifier_Additives();
+					if (ad)
+						ad.CancelModifier();
+					
+					hcw.StartAction(m_action, m_actionType);
+		
+					if (hcw.GetRunningAction() == m_action && hcw.GetRunningActionType() == m_actionType)
+					{
+						if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("HCW: playing A=" + typename.EnumToString(WeaponActions, m_action) + " AT=" + WeaponActionTypeToString(m_action, m_actionType) + " fini=" + hcw.IsActionFinished()); }
+					}
+					else
+						Error("HCW: NOT playing A=" + typename.EnumToString(WeaponActions, m_action) + " AT=" + WeaponActionTypeToString(m_action, m_actionType) + " fini=" + hcw.IsActionFinished());
+				}
+				else
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("---: remote playing A=" + typename.EnumToString(WeaponActions, m_action) + " AT=" + WeaponActionTypeToString(m_action, m_actionType)); }
+			}
+			else
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("---: warning, no player wants to play A=" + typename.EnumToString(WeaponActions, m_action) + " AT=" + WeaponActionTypeToString(m_action, m_actionType)); }
+			}
+		}
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStateBase.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStateBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..4286cccd1179668cac0797a19f6714ebb9fd06b0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStateBase.c
@@ -0,0 +1,180 @@
+/**@class	WeaponStateBase
+ * @brief	represent weapon state base
+ *
+ * Class comes with entry/update/abort/exit hooks that can be overriden in custom states
+ *
+ * Class is ready for hierarchic composition, i.e. this state having a sub-machine running
+ * under hood. If no m_fsm member is configured, class acts as ordinary plain
+ * finite machine state.
+ **/
+class WeaponStateBase
+{
+	Weapon_Base m_weapon; /// weapon that this state relates to
+	WeaponStateBase m_parentState; /// hierarchical parent state of this state (or null)
+	ref WeaponFSM m_fsm; /// nested state machine (or null)
+	int m_InternalID = -1; /// internal state id used for load/restore
+
+	void WeaponStateBase (Weapon_Base w = NULL, WeaponStateBase parent = NULL) { m_weapon = w; m_parentState = parent; }
+
+	/**@fn		SetParentState
+	 * @brief	allows construction of hierarchical state machine
+	 **/
+	void SetParentState (WeaponStateBase parent) { m_parentState = parent; }
+	/**@fn		GetParentState
+	 * @return	state that owns this sub-state (or null if plain state)
+	 **/
+	WeaponStateBase GetParentState () { return m_parentState; }
+
+	bool HasFSM () { return m_fsm != NULL; }
+	WeaponFSM GetFSM () { return m_fsm; }
+
+	void SetInternalStateID (int i) { m_InternalID = i; }
+	int GetInternalStateID () { return m_InternalID; }
+
+	bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (HasFSM())
+		{
+			if (IsIdle())
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponStateBase::SaveCurrentFSMState - idle state, skipping other substates"); }
+				return m_fsm.SaveCurrentFSMState(ctx);
+			}
+			else
+			{
+				// if parent state is !idle (unstable) then save whole machine
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponStateBase::SaveCurrentFSMState - NOT idle state, saving full submachine state"); }
+				return m_fsm.SaveCurrentUnstableFSMState(ctx);
+			}
+			return false;
+		}
+		return true;
+	}
+
+	bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (HasFSM())
+		{
+			if (IsIdle())
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponStateBase::LoadCurrentFSMState - idle state, skipping other substates"); }
+				if (m_fsm.LoadCurrentFSMState(ctx, version))
+					return true;
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponStateBase::LoadCurrentFSMState - Cannot load stable state for weapon=" + this);
+			}
+			else
+			{
+				// if parent state is !idle (unstable) then load whole machine
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponStateBase::LoadCurrentFSMState - NOT idle state, loading full submachine state"); }
+				if (m_fsm.LoadCurrentUnstableFSMState(ctx, version))
+					return true;
+				else
+					Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponStateBase::LoadCurrentFSMState - Cannot load unstable state for weapon=" + this);
+			}
+			return false;
+		}
+		return true;
+	}
+
+	bool ProcessEvent (WeaponEventBase e)
+	{
+		if (HasFSM())
+			return m_fsm.ProcessEvent(e);
+		return false;
+	}
+	/**@fn		AddTransition
+	 * @brief	adds transition into m_fsm transition table
+	 **/
+	void AddTransition (WeaponTransition t)
+	{
+		if (HasFSM())
+			m_fsm.AddTransition(t);
+		else
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " adding transition to state without FSM. Configure FSM first.");
+	}
+
+
+	/**@fn		OnEntry
+	 * @brief	called upon entry to state
+	 * @NOTE	if state has (non-running) sub-machine, it's started on entry
+	 * @param[in] e	the event that triggered transition to this state
+	 **/
+	void OnEntry (WeaponEventBase e)
+	{
+		if (HasFSM() && !m_fsm.IsRunning())
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { " + this.Type().ToString() + "  Has Sub-FSM! Starting submachine..."); }
+			m_fsm.Start(e);
+		}
+		else
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { " + this.Type().ToString()); }
+	}
+
+	/**@fn		OnUpdate
+	 * @brief ongoing behavior, performed while being in the state
+	 *
+	 * @NOTE: this is supposed to be the Do() operation in UML speak
+	 **/
+	void OnUpdate (float dt)
+	{
+		if (HasFSM() && m_fsm.IsRunning())
+			m_fsm.GetCurrentState().OnUpdate(dt);
+	}
+
+	/**@fn		OnAbort
+	 * @brief called when abort signal arrives
+	 * @param[in] e	the event that triggered abort from this state
+	 **/
+	void OnAbort (WeaponEventBase e)
+	{
+		if (HasFSM() && m_fsm.IsRunning())
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " OnAbort " + this.Type().ToString() + "  Has Sub-FSM! Aborting submachine..."); }
+			m_fsm.Abort(e);
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } ABORTED " + this.Type().ToString()); }
+	}
+
+	/**@fn		OnExit
+	 * @brief called on exit from state
+	 * @param[in] e	the event that triggered transition from this state
+	 **/
+	void OnExit (WeaponEventBase e)
+	{
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } " + this.Type().ToString()); }
+	}
+
+	/**@fn		IsWaitingForActionFinish
+	 * @brief	waiting for active animation action/actionType finish
+	 * @return true if this state or active substate is waiting for finish signal
+	 **/
+	bool IsWaitingForActionFinish () { return HasFSM() && m_fsm.IsRunning() && m_fsm.GetCurrentState().IsWaitingForActionFinish(); }
+
+	/**@fn		IsIdle
+	 * @brief	idle state does not expect any animation events
+	 * @return	true if this state is idle
+	 **/
+	bool IsIdle () { return false; }
+	
+	/**@fn		IsBoltOpen
+	 * @return	true if weapon bolt is open
+	 **/
+	bool IsBoltOpen () { return false; }
+
+	/**@fn		OnSubMachineChanged
+	 * @brief	called when sub-machine has changed its state
+	 * @param[in]	src		from state (previous)
+	 * @param[in]	dst		to state (current)
+	 **/
+	void OnSubMachineChanged (WeaponStateBase src, WeaponStateBase dst) { }
+
+	/**@fn		OnStateChanged
+	 * @brief	called on current state when state machine has changed its state
+	 * @param[in]	src		from state (previous)
+	 * @param[in]	dst		to state (current)
+	 **/
+	void OnStateChanged (WeaponStateBase src, WeaponStateBase dst) { }
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStateJammed.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStateJammed.c
new file mode 100644
index 0000000000000000000000000000000000000000..c94538d86f8e14c05695d0e4c73abc44e987f86b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponStateJammed.c
@@ -0,0 +1,29 @@
+/**@class	WeaponStateJammed
+ * @brief	handle jamming state set jam/unjam state for weapon 
+ **/
+class WeaponStateJammed extends WeaponStableState
+{
+	/**@fn		OnEntry
+	 * @brief	called upon entry to state
+	 * @NOTE	if state has (non-running) sub-machine, it's started on entry
+	 * @param[in] e	the event that triggered transition to this state
+	 **/
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		m_weapon.SetJammed(true);
+	}
+
+
+	/**@fn		OnExit
+	 * @brief called on exit from state
+	 * @param[in] e	the event that triggered transition from this state
+	 **/
+	override void OnExit (WeaponEventBase e)
+	{
+		super.OnExit(e);
+		//m_weapon.SetJammed(false);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponUnjamming.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponUnjamming.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2ac49d25dcada4fa70f31e53991b0762a403aff
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/States/WeaponUnjamming.c
@@ -0,0 +1,232 @@
+class WeaponChamberFromAttMag_W4T extends WeaponChamberFromAttMag
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class WeaponChamberFromInnerMag_W4T extends WeaponChamberFromInnerMag
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class WeaponUnjamming_Start extends WeaponStartAction
+{
+	float m_dtAccumulator;
+	float m_jamTime;
+
+	void WeaponUnjamming_Start (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_dtAccumulator = 0.0;
+		m_jamTime = 0.0;
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		m_dtAccumulator += dt;
+
+		DayZPlayer p;
+		Class.CastTo(p, m_weapon.GetHierarchyParent());
+		if(p)
+		{
+			HumanInputController hic = p.GetInputController();
+			HumanCommandWeapons hcw = p.GetCommandModifier_Weapons();
+
+			if (m_dtAccumulator >= m_jamTime)
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " Unjammed!"); }
+				hcw.StartAction(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END);
+				m_weapon.ProcessWeaponEvent(new WeaponEventUnjammingTimeout(p));
+				return; // unjammed successfuly
+			}
+
+			
+			if (hic.IsReloadOrMechanismContinuousUse())
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " Unjamming..."); }
+			}
+			#ifndef PLATFORM_CONSOLE
+			#ifndef SERVER_FOR_CONSOLE
+			else
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " Unjamming failed, weapon still jammed"); }
+				hcw.StartAction(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_INTERRUPT);
+				m_weapon.ProcessWeaponEvent(new WeaponEventUnjammingFailedTimeout(p));
+			}
+			#endif
+			#endif
+		}
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+		m_jamTime = 0.0;
+		super.OnExit(e);
+	}
+};
+
+class WeaponUnjamming_Cartridge extends WeaponStateBase
+{
+	float m_damage;
+	string m_type;
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			m_type = string.Empty;
+			
+			float dmg;
+			string type;
+			
+			m_weapon.SetJammed(false);
+		
+			int mi = m_weapon.GetCurrentMuzzle();
+			
+			if (m_weapon.IsChamberFiredOut(mi))
+			{
+				m_weapon.EjectCasing(mi);
+				m_weapon.EffectBulletHide(mi);
+				m_weapon.SelectionBulletHide();
+			}
+			
+			if (!m_weapon.IsChamberEmpty(mi))
+			{
+				DayZPlayer p = e.m_player;
+	
+				m_weapon.CreateRound(mi);
+				ejectBulletAndStoreInMagazine(m_weapon, mi, null, p);
+				
+				m_weapon.EffectBulletHide(mi);
+				m_weapon.SelectionBulletHide();
+			}
+		}
+	}
+	override void OnExit (WeaponEventBase e)
+	{
+		m_type = string.Empty;
+		super.OnExit(e);
+	}
+
+	override bool SaveCurrentFSMState (ParamsWriteContext ctx)
+	{
+		if (!super.SaveCurrentFSMState(ctx))
+			return false;
+
+		if (!ctx.Write(m_damage))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponUnjamming_Cartridge.SaveCurrentFSMState: cannot write m_damage for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Write(m_type))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponUnjamming_Cartridge.SaveCurrentFSMState: cannot write m_type for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+	override bool LoadCurrentFSMState (ParamsReadContext ctx, int version)
+	{
+		if (!super.LoadCurrentFSMState(ctx, version))
+			return false;
+
+		if (!ctx.Read(m_damage))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponUnjamming_Cartridge.LoadCurrentFSMState: cannot read m_damage for weapon=" + m_weapon);
+			return false;
+		}
+		if (!ctx.Read(m_type))
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(m_weapon) + " WeaponUnjamming_Cartridge.LoadCurrentFSMState: cannot read m_type for weapon=" + m_weapon);
+			return false;
+		}
+		return true;
+	}
+
+};
+
+class WeaponUnjamming_Cartridge_W4T extends WeaponUnjamming_Cartridge
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+class WeaponUnjamming_W4T extends WeaponStateBase
+{
+	override bool IsWaitingForActionFinish () { return true; }
+};
+
+
+/**@class		WeaponUnjamming
+ * @brief		unjam submachine
+ **/
+class WeaponUnjamming extends WeaponStateBase
+{
+	WeaponActions m_action;
+	int m_actionType;
+	float m_dtAccumulator;
+	float m_jamTime;
+
+	ref WeaponUnjamming_Start m_start;
+	ref WeaponUnjamming_Cartridge_W4T m_eject;
+	ref WeaponUnjamming_W4T m_w4t;
+	ref WeaponChamberFromAttMag_W4T m_chamber;
+
+	void WeaponUnjamming (Weapon_Base w = NULL, WeaponStateBase parent = NULL, WeaponActions action = WeaponActions.NONE, int actionType = -1)
+	{
+		m_action = action;
+		m_actionType = actionType;
+
+		// setup nested state machine
+		m_start = new WeaponUnjamming_Start(m_weapon, this, m_action, m_actionType);
+		m_eject = new WeaponUnjamming_Cartridge_W4T(m_weapon, this);
+		m_chamber = new WeaponChamberFromAttMag_W4T(m_weapon, this);
+		m_w4t = new WeaponUnjamming_W4T(m_weapon, this);
+
+		// events
+		WeaponEventBase _uto_ = new WeaponEventUnjammingTimeout;
+		WeaponEventBase _fto_ = new WeaponEventUnjammingFailedTimeout;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __uj_ = new WeaponEventAnimUnjammed;
+
+		m_fsm = new WeaponFSM(this); // @NOTE: set owner of the submachine fsm
+		// transitions
+		m_fsm.AddTransition(new WeaponTransition(  m_start, _uto_, m_eject));
+		m_fsm.AddTransition(new WeaponTransition(  m_start, _fto_, m_w4t));
+		m_fsm.AddTransition(new WeaponTransition(  m_eject, __uj_, m_chamber, NULL, new WeaponGuardHasAmmo(m_weapon)));
+		m_fsm.AddTransition(new WeaponTransition(  m_eject, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(    m_w4t, _fin_, NULL));
+		m_fsm.AddTransition(new WeaponTransition(m_chamber, _fin_, NULL));
+		
+		// Safety exits
+		m_fsm.AddTransition(new WeaponTransition(m_start,    _fin_, null));	
+
+		m_fsm.SetInitialState(m_start);
+	}
+
+	override void OnEntry (WeaponEventBase e)
+	{
+		super.OnEntry(e);
+		if (e)
+		{
+			m_dtAccumulator = 0.0;
+			m_jamTime = 5.0; // @TODO: rand
+
+			m_start.m_dtAccumulator = m_dtAccumulator;
+			m_start.m_jamTime = m_jamTime;
+		}
+	}
+
+	override void OnExit (WeaponEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+		m_jamTime = 0.0;
+		super.OnExit(e);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FSM/weapon_utils.c b/scripts/4_World/DayZ/Entities/Firearms/FSM/weapon_utils.c
new file mode 100644
index 0000000000000000000000000000000000000000..6dc5417ce3ac6e0a6d148ed8587d9a3d7ce3396f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FSM/weapon_utils.c
@@ -0,0 +1,113 @@
+bool pushToChamberFromAttachedMagazine(Weapon_Base weapon, int muzzleIndex)
+{
+	Magazine mag = weapon.GetMagazine(muzzleIndex);
+	if (mag && !mag.IsDamageDestroyed())
+	{
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine, using attached magazine mag=" + mag.ToString()); }
+		float damage;
+		string type;
+		if (mag && mag.LocalAcquireCartridge(damage, type))
+		{
+			weapon.SelectionBulletShow();
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine, ok - cartridge acquired: dmg=" + damage + " type=" + type); }
+		}
+		else
+			Error("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine, error - cannot take cartridge from magazine");
+
+		if (weapon.PushCartridgeToChamber(muzzleIndex, damage, type))
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine, ok - loaded chamber"); }
+			return true;
+		}
+		else
+			Error("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine, error - cannot load chamber!");
+	}
+	else
+	{
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine - magazine destroyer or no attached"); }
+		//Error("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromAttachedMagazine, error - no magazine attached");
+	}
+	return false;
+}
+
+bool pushToChamberFromInnerMagazine(Weapon_Base weapon, int muzzleIndex)
+{
+
+	if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromInnerMagazine, using inner magazine."); }
+	float damage;
+	string type;
+	if (weapon.PopCartridgeFromInternalMagazine(muzzleIndex,damage, type))
+	{
+		weapon.SelectionBulletShow();
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromInnerMagazine, ok - cartridge acquired: dmg=" + damage + " type=" + type); }
+	}
+	else
+		Error("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromInnerMagazine, error - cannot take cartridge from magazine");
+
+	if (weapon.PushCartridgeToChamber(muzzleIndex, damage, type))
+	{
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromInnerMagazine, ok - loaded chamber"); }
+		return true;
+	}
+	else
+		Error("[wpnfsm] " + Object.GetDebugName(weapon) + " chamberFromInnerMagazine, error - cannot load chamber!");
+
+	return false;
+}
+
+void ejectBulletAndStoreInMagazine(Weapon_Base weapon, int muzzleIndex, Magazine mag, DayZPlayer p)
+{
+	float damage = 0;
+	string type = string.Empty;
+	string magazineTypeName = weapon.GetChamberedCartridgeMagazineTypeName(muzzleIndex);
+	if (weapon.EjectCartridge(muzzleIndex, damage, type))
+	{
+		if (LogManager.IsWeaponLogEnable())
+			wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " ejectBulletAndStoreInMagazine, ejected chambered cartridge");
+	}
+	else
+		Error("[wpnfsm] " + Object.GetDebugName(weapon) + " ejectBulletAndStoreInMagazine, error - cannot eject chambered cartridge!");
+
+	if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+	{
+		if (mag == null)
+		{
+			//! no magazine configured in parent state, looking in inventory
+			if (DayZPlayerUtils.HandleStoreCartridge(p, weapon, muzzleIndex, damage, type, magazineTypeName))
+			{
+				if (LogManager.IsWeaponLogEnable())
+					wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " ejectBulletAndStoreInMagazine, ok - cartridge stored in magazine");
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(weapon) + " ejectBulletAndStoreInMagazine, error - cannot store cartridge!");
+		}
+		else
+		{
+			if (mag.ServerStoreCartridge(damage, type))
+			{
+				mag.SetSynchDirty();
+				if (LogManager.IsWeaponLogEnable())
+					wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " ejectBulletAndStoreInMagazine, ok - cartridge stored in user defined magazine");
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(weapon) + " ejectBulletAndStoreInMagazine, error - cannot store cartridge in magazine");
+		}
+	}
+}
+
+bool magazinesHaveEqualSizes(notnull Magazine mag, notnull Magazine mag2)
+{
+	int w, h;
+	GetGame().GetInventoryItemSize(mag, w, h);
+	int w2, h2;
+	GetGame().GetInventoryItemSize(mag2, w2, h2);
+	if (w == w2 && h == h2)
+	{
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - same inventory sizes"); }
+		return true;
+	}
+
+	if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] guard - different inventory sizes"); }
+	return false;
+}
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/FlareSimulation.c b/scripts/4_World/DayZ/Entities/Firearms/FlareSimulation.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ce5fc22a3863e768babbbc7c32caf8c01a12f24
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/FlareSimulation.c
@@ -0,0 +1,143 @@
+class FlareSimulation : Managed
+{
+	protected Particle 			m_ParMainFire;
+	protected EffectSound 		m_BurningSound;
+	protected FlareLight		m_FlareLight;
+	const static float			MAX_FARLIGHT_DIST = 40;
+	const static float			MIN_FARLIGHT_DIST = 5; 
+	
+	static ref NoiseParams 		m_NoisePar; // Contains the noise data ( template and strength )
+	float 						m_LastNoiseTime = -1;
+	float 						m_NoiseTimer = 0;
+	const float 				NOISE_DELAY = 5; // How much time between two consecutive noise pings
+	
+	static protected typename 	m_ScriptedLight;
+	static protected int 		m_ParticleId;
+	
+	void FlareSimulation()
+	{
+		m_ScriptedLight	 = FlareLight;
+		m_ParticleId	 = ParticleList.FLAREPROJ_ACTIVATE;
+	}
+	
+	void OnActivation(Entity flare)
+	{
+		if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() )
+		{
+			m_FlareLight = FlareLight.Cast( ScriptedLightBase.CreateLight( m_ScriptedLight, Vector(0,0,0) ) );
+			if ( m_FlareLight )
+				m_FlareLight.AttachOnObject( flare );
+			
+			if (m_ParMainFire)
+				m_ParMainFire.Stop();
+	
+			m_ParMainFire = ParticleManager.GetInstance().PlayOnObject( m_ParticleId, flare );
+			m_ParMainFire.SetWiggle( 7, 0.3 );
+			
+			flare.PlaySoundSetLoop( m_BurningSound, "roadflareLoop_SoundSet", 0, 0 );
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			// Create and load noise parameters
+			m_NoisePar = new NoiseParams();
+			m_NoisePar.LoadFromPath("cfgWeapons Flaregun_Base NoiseFlare");
+		}
+	}
+	
+	void OnTermination(Entity flare)
+	{
+		//MiscGameplayFunctions.GenerateAINoiseAtPosition(flare.GetPosition(), NOISE_DELAY, m_NoisePar);
+	}
+	
+	void OnFire( Entity flare)
+	{
+		//m_ParMainFire = ParticleManager.GetInstance().PlayOnObject( ParticleList.FLAREPROJ_FIRE, flare);
+		//m_ParMainFire.SetWiggle( 7, 0.3);
+	}
+	
+	void Simulate( Entity flare )
+	{
+		DayZPlayer player = GetGame().GetPlayer();
+		if ( player )
+			vector playerPos = player.GetPosition();
+
+		float dist = vector.DistanceSq(flare.GetPosition(), playerPos);
+			
+		if ( ( dist <= MAX_FARLIGHT_DIST * MAX_FARLIGHT_DIST ) && ( dist > MIN_FARLIGHT_DIST * MIN_FARLIGHT_DIST ) )
+			m_ParMainFire.SetParameter( 0, EmitorParam.SIZE, MiscGameplayFunctions.Normalize(dist, MAX_FARLIGHT_DIST * MAX_FARLIGHT_DIST) );
+			
+		if ( dist <= MIN_FARLIGHT_DIST * MIN_FARLIGHT_DIST )
+			TurnOffDistantLight();
+
+		//CastFlareAINoise( flare.GetPosition() );
+	}
+	
+	void CastFlareAINoise( vector position )
+	{
+		if ( m_LastNoiseTime < 0 )
+			m_LastNoiseTime = GetGame().GetTime() * 0.0033;
+
+		float delta_time = GetGame().GetTime() * 0.0033 - m_LastNoiseTime;
+		m_LastNoiseTime = GetGame().GetTime() * 0.0033;
+		
+		m_NoiseTimer += delta_time;
+
+		if ( m_NoiseTimer >= NOISE_DELAY )
+		{
+			MiscGameplayFunctions.GenerateAINoiseAtPosition(position, NOISE_DELAY, m_NoisePar);
+		
+			m_NoiseTimer = 0;
+		}
+	}
+	
+	void TurnOffDistantLight()
+	{
+		if (m_ParMainFire)
+		{
+			m_ParMainFire.SetParameter(0, EmitorParam.LIFETIME, 0);
+			m_ParMainFire.SetParameter(0, EmitorParam.LIFETIME_RND, 0);
+			m_ParMainFire.SetParameter(0, EmitorParam.REPEAT, 0);
+			m_ParMainFire.SetParameter(0, EmitorParam.SIZE, 0);
+		}
+	}
+	
+	void ~FlareSimulation()
+	{
+		if (m_ParMainFire)
+			m_ParMainFire.Stop();
+		
+		if (m_BurningSound)
+			m_BurningSound.SoundStop();
+		
+		if (m_FlareLight)
+			m_FlareLight.FadeOut();
+	}
+}
+
+class FlareSimulation_Red : FlareSimulation
+{
+	void FlareSimulation_Red()
+	{
+		m_ScriptedLight	 = FlareLightRed;
+		m_ParticleId	 = ParticleList.FLAREPROJ_ACTIVATE_RED;
+	}
+}
+
+class FlareSimulation_Green : FlareSimulation
+{
+	void FlareSimulation_Green()
+	{
+		m_ScriptedLight	 = FlareLightGreen;
+		m_ParticleId	 = ParticleList.FLAREPROJ_ACTIVATE_GREEN;
+	}
+}
+
+class FlareSimulation_Blue : FlareSimulation
+{
+	void FlareSimulation_Blue()
+	{
+		m_ScriptedLight	 = FlareLightBlue;
+		m_ParticleId	 = ParticleList.FLAREPROJ_ACTIVATE_BLUE;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Launcher/M79.c b/scripts/4_World/DayZ/Entities/Firearms/Launcher/M79.c
new file mode 100644
index 0000000000000000000000000000000000000000..c90d8d234009583dd507a27395d2da2b13fe422d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Launcher/M79.c
@@ -0,0 +1,38 @@
+class M79_Base extends RifleSingleShotManual_Base
+{
+	void M79_Base ()
+	{
+	}
+	
+	override bool ShootsExplosiveAmmo()
+	{
+		return true;
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new M79Recoil(this);
+	}
+};
+
+class M79 extends M79_Base
+{
+	override void AssembleGun()
+	{
+		super.AssembleGun();
+		
+		if ( !FindAttachmentBySlotName("weaponOpticsAug") )
+		{
+			GetInventory().CreateAttachment("M79DummyOptics");
+		}
+	}
+};
+
+class M79DummyOptics extends ItemOptics
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		return true;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Machinegun/M249.c b/scripts/4_World/DayZ/Entities/Firearms/Machinegun/M249.c
new file mode 100644
index 0000000000000000000000000000000000000000..04373705cf25d0e16b8c2610bf3db09aca0efb5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Machinegun/M249.c
@@ -0,0 +1,3 @@
+class M249 : Weapon_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/1911.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/1911.c
new file mode 100644
index 0000000000000000000000000000000000000000..da6ba30157ba91b2b0f8d565e06cd9f562ac6073
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/1911.c
@@ -0,0 +1,21 @@
+class Colt1911_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Colt1911Recoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "TLRLight" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_1911_7Rnd");
+	}
+};
+
+class Colt1911 : Colt1911_Base {};
+class Engraved1911 : Colt1911_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/CZ75.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/CZ75.c
new file mode 100644
index 0000000000000000000000000000000000000000..ccc87fd2f841a692ecd8ca2a9b6a2bcd616ac8ff
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/CZ75.c
@@ -0,0 +1,20 @@
+class CZ75_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Cz75Recoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "FNP45_MRDSOptic" );
+		inventory.CreateInInventory( "TLRLight" );
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_CZ75_15Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/DE.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/DE.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e4bcefd00602c90c9c85559a742f4bdf486ebd6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/DE.c
@@ -0,0 +1,22 @@
+class Deagle_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new DEagleRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "PistolOptic" );
+		
+		SpawnAttachedMagazine("Mag_Deagle_9rnd");
+	}
+	
+};
+
+class Deagle : Deagle_Base {};
+class Deagle_Gold : Deagle_Base {};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/Derringer.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Derringer.c
new file mode 100644
index 0000000000000000000000000000000000000000..83f88dcc10a0d668f94aa1fa670aa82461689168
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Derringer.c
@@ -0,0 +1,9 @@
+class Derringer_Base : DoubleBarrel_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new DerringerRecoil(this);
+	}
+};
+
+class Derringer : Derringer_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/FNX45.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/FNX45.c
new file mode 100644
index 0000000000000000000000000000000000000000..04d1b2f7ed747d607dce4cfb0e1e6a20d9ae54fe
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/FNX45.c
@@ -0,0 +1,21 @@
+class FNX45_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Fnx45Recoil(this);
+	}
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "FNP45_MRDSOptic" );
+		inventory.CreateInInventory( "TLRLight" );
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_FNX45_15Rnd");
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/Flaregun.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Flaregun.c
new file mode 100644
index 0000000000000000000000000000000000000000..a0fdbada6052c8e1bd280f7874b261d55e3cd600
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Flaregun.c
@@ -0,0 +1,147 @@
+enum FLAREAnimState
+{
+	COCKED 		= 0, 	///< default weapon state, closed and discharged
+	UNCOCKED 	= 1, 	///< default weapon state, closed and discharged
+};
+
+enum FLAREStableStateID
+{
+	UNKNOWN				=  0,
+	Empty				=  1,
+	Fireout				=  2,
+	Loaded				=  3,
+}
+
+class FLAREEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Empty E"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Empty E"); } }
+	override int GetCurrentStateID () { return FLAREStableStateID.Empty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class FLAREFireout extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Fireout F"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Fireout F"); } }
+	override int GetCurrentStateID () { return FLAREStableStateID.Fireout; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class FLARELoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Loaded C"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Loaded C"); } }
+	override int GetCurrentStateID () { return FLAREStableStateID.Loaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+
+class Flaregun: Weapon_Base
+{
+	override void InitStateMachine()
+	{
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+
+		// setup state machine
+		// basic weapon states
+		WeaponStableState E = new FLAREEmpty(this, NULL, FLAREAnimState.UNCOCKED);
+		WeaponStableState F = new FLAREFireout(this, NULL, FLAREAnimState.UNCOCKED);
+		WeaponStableState L = new FLARELoaded(this, NULL, FLAREAnimState.COCKED);
+		// unstable (intermediate) states
+		WeaponStateBase Mech_F = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase Mech_L = new WeaponEjectBullet(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		
+		WeaponStateBase Chamber_E = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		WeaponStateBase Chamber_F = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		//WeaponStateBase Chamber_L = new RifleReChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		
+		WeaponStateBase Trigger_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		WeaponStateBase Trigger_L = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase Trigger_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( E,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition( F,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	E));
+		
+		// eject good cartridge
+		m_fsm.AddTransition(new WeaponTransition( L,			__M__,	Mech_L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	L));
+
+		m_fsm.AddTransition(new WeaponTransition( E,			__L__,	Chamber_F));
+		m_fsm.AddTransition(new WeaponTransition( F,			__L__,	Chamber_F));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	L));
+
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( E,			__T__,	Trigger_E)); // fire cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_dto_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_abt_,	E));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__T__,	Trigger_F)); // fire uncocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_dto_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__T__,	Trigger_L)); // a) fire if not jammed
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	F));
+		
+
+		// initial state setup
+		bool empty = true;
+		bool discharged = false; // @TODO:
+		WeaponStableState init_state = E;
+		if (empty)
+		{
+			if (!discharged)
+				init_state = E;
+		}
+		else
+		{
+			init_state = L; // can init state == load/jammed?
+		}
+		SetInitialState(init_state);
+
+		SelectionBulletHide();
+
+		m_fsm.Start();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/Glock.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Glock.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d97f946086f4b302a6719ff88b8351cb2b4d8de
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Glock.c
@@ -0,0 +1,21 @@
+class Glock19_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new GlockRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "FNP45_MRDSOptic" );
+		inventory.CreateInInventory( "TLRLight" );
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_Glock_15Rnd");
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/LongHorn.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/LongHorn.c
new file mode 100644
index 0000000000000000000000000000000000000000..ae3bafa1e713cef1632e6e4f00fa29bd19e14e5d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/LongHorn.c
@@ -0,0 +1,16 @@
+class LongHorn_Base : SingleShotPistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new LongHornRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		GetInventory().CreateInInventory( "PistolOptic" );
+	}	
+};
+
+class LongHorn : LongHorn_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/MKII.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/MKII.c
new file mode 100644
index 0000000000000000000000000000000000000000..51a44391da5e8c323cf0f2074006728e42041f5c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/MKII.c
@@ -0,0 +1,13 @@
+class MKII_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new MkiiRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/Magnum.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Magnum.c
new file mode 100644
index 0000000000000000000000000000000000000000..8dacc154304f0782c73628ff213ab30b567265ce
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Magnum.c
@@ -0,0 +1,405 @@
+const float MAGNUM_ROTATION_POSITION_M1 = -0.167;
+const float MAGNUM_ROTATION_POSITION_0 = 0.0;
+const float MAGNUM_ROTATION_POSITION_1 = 0.167;
+const float MAGNUM_ROTATION_POSITION_2 = 0.334;
+const float MAGNUM_ROTATION_POSITION_3 = 0.500;
+const float MAGNUM_ROTATION_POSITION_4 = 0.668;
+const float MAGNUM_ROTATION_POSITION_5 = 0.835;
+const float MAGNUM_ROTATION_POSITION_6 = 1.0;
+
+
+enum MagnumAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state
+};
+
+enum MagnumStableStateID
+{
+	UNKNOWN				=  0,
+	DEFAULT				=  1,
+}
+
+class Magnum_Static_State extends WeaponStableState
+{
+	bool init = false;
+	override void OnEntry(WeaponEventBase e) 
+	{		
+		if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { Magnum stable state"); } 
+		super.OnEntry(e);
+		if (init)
+		{
+			Magnum_Base magnum;
+			if (CastTo(magnum, m_weapon))
+			{
+				magnum.SyncCylinderRotation();
+				//magnum.SyncSelectionStateFromState();
+			}
+		}
+		init = true;
+	}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] }  Magnum stable state"); } }
+	override int GetCurrentStateID () { return MagnumStableStateID.DEFAULT; }
+	override bool HasBullet() { return m_weapon.IsChamberFull(m_weapon.GetCurrentMuzzle()); }
+	override bool HasMagazine() { return false; }
+	override bool IsJammed() { return m_weapon.IsJammed(); }
+	override bool IsSingleState() { return true; }
+};
+
+
+
+class Magnum_Base extends Weapon_Base
+{
+	ref WeaponStableState C;
+	int m_LastMuzzleloaded;
+	int m_ActiveMuzzle;
+	const string ATT_SLOT_CYLINDER = "RevolverCylinder";
+	const string ATT_SLOT_EJECTOR = "RevolverEjector";
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionLoadMultiBullet);
+
+		RemoveAction(FirearmActionLoadBulletQuick); // Easy reload
+		AddAction(FirearmActionLoadMultiBulletQuick); // Easy reload
+
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new MagnumRecoil(this);
+	}
+	
+	void Magnum_Base ()
+	{
+		m_LastMuzzleloaded = 0;
+		m_ActiveMuzzle = 0;
+		
+		/*m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionTypes.CHAMBERING_STARTLOOPABLE_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionTypes.CHAMBERING_ENDLOOPABLE));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionTypes.MECHANISM_SPECIAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionTypes.UNJAMMING_END));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionTypes.FIRE_COCKED));*/
+	}
+	
+	override void InitStateMachine ()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_SPECIAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+
+
+		// setup state machine
+		// basic weapon state
+		C = new Magnum_Static_State(this, NULL, MagnumAnimState.DEFAULT);
+
+
+		WeaponMagnumChambering Chamber = new WeaponMagnumChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP,WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		WeaponMagnumChambering Chamber_E = new WeaponMagnumChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED,WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		//WeaponMagnumChambering Chamber_CC00 = new WeaponMagnumChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_END);
+
+		WeaponCharging Mech = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		
+		WeaponStateBase	Trigger_normal = new WeaponFireMagnum(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase	Trigger_dry = new WeaponFireMagnum(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+		
+		// events
+
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		
+
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+	
+		m_fsm = new WeaponFSM();
+
+
+
+		m_fsm.AddTransition(new WeaponTransition( C,				__L__,	Chamber, null, new WeaponGuardAnyChamberFiredOut(this))); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber,	_fin_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber,	_abt_,	C));
+
+		
+		m_fsm.AddTransition(new WeaponTransition( C,				__L__,	Chamber_E)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	C));
+
+		
+		m_fsm.AddTransition(new WeaponTransition( C,				__M__,	Mech)); // charge from closed
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_fin_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Mech,		_abt_,	C));
+
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C,				__T__,	Trigger_normal, null, new GuardAnd (new WeaponGuardCurrentChamberFull(this), new GuardNot(new WeaponGuardCurrentChamberFiredOut(this))) )); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_normal,	_fin_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_normal, 	_dto_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_normal, 	_abt_,	C));
+		
+		m_fsm.AddTransition(new WeaponTransition( C,				__T__,	Trigger_dry)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_dry,	_fin_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_dry, 	_dto_,	C));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_dry, 	_abt_,	C));
+
+
+		SetInitialState(C);
+		SelectionBulletHide();
+		SetCurrentMuzzle(0);
+		//HideMagazine();
+		m_fsm.Start();
+	}
+	
+	override bool CanChamberBullet(int muzzleIndex, Magazine mag)
+	{
+		for (int i = 0; i < GetMuzzleCount(); i++)
+		{
+			if ( CanChamberFromMag(i, mag) )
+			{
+				if (IsChamberEmpty(i))
+					return true;
+				
+				if (IsChamberFiredOut(i))
+					return true;
+			} 
+		}
+		return false;
+	}
+	
+	override void AssembleGun()
+	{
+		super.AssembleGun();
+		
+		if ( !FindAttachmentBySlotName(ATT_SLOT_EJECTOR) )
+		{
+			GetInventory().CreateAttachment("Magnum_Ejector");
+		}
+		
+		if ( !FindAttachmentBySlotName(ATT_SLOT_CYLINDER) )
+		{
+			GetInventory().CreateAttachment("Magnum_Cylinder");
+		}
+
+		ForceSyncSelectionState();
+		SyncCylinderRotation();
+	}
+	
+	static float GetCylinderRotation(int muzzleIndex)
+	{
+		switch (muzzleIndex)
+		{
+			case 0:
+				return MAGNUM_ROTATION_POSITION_0;
+			case 1:
+				return MAGNUM_ROTATION_POSITION_5;
+			case 2:
+				return MAGNUM_ROTATION_POSITION_4;
+			case 3:
+				return MAGNUM_ROTATION_POSITION_3;
+			case 4:
+				return MAGNUM_ROTATION_POSITION_2;
+			case 5:
+				return MAGNUM_ROTATION_POSITION_1;
+		}
+		
+		ErrorEx(string.Format("Invalid muzzle index: %1", muzzleIndex));
+		
+		return MAGNUM_ROTATION_POSITION_0;
+	}
+	
+	void SetCylinderRotationAnimationPhase(float rot, bool reset = false)
+	{
+		Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(GetAttachmentByType(Magnum_Cylinder));
+		Magnum_Ejector ejector = Magnum_Ejector.Cast(GetAttachmentByType(Magnum_Ejector));
+		if (cylinder && ejector)
+		{
+			float anim_phase = cylinder.GetAnimationPhase("Rotate_Cylinder");
+			if ( Math.AbsFloat(anim_phase - rot) > 0.1 )
+			{
+				if (reset)
+				{
+					cylinder.ResetAnimationPhase("Rotate_Cylinder", rot );
+					ejector.ResetAnimationPhase("Rotate_Ejector", rot );				
+				}				
+				else if (rot == MAGNUM_ROTATION_POSITION_0)
+				{
+					cylinder.ResetAnimationPhase("Rotate_Cylinder", MAGNUM_ROTATION_POSITION_M1 );
+					ejector.ResetAnimationPhase("Rotate_Ejector", MAGNUM_ROTATION_POSITION_M1 );
+				}
+				
+				cylinder.SetAnimationPhase("Rotate_Cylinder", rot );
+				ejector.SetAnimationPhase("Rotate_Ejector", rot );
+			}
+		}
+	}
+	
+	void SyncCylinderRotation(bool reset = true)
+	{
+		SetCylinderRotationAnimationPhase(GetCylinderRotation(GetCurrentMuzzle()), reset);
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if (GetGame().IsClient())
+			return;
+		
+		SetAttachmentsHealth();
+	}
+	
+	//sets health of cylinder and ejector objects
+	void SetAttachmentsHealth()
+	{
+		EntityAI entity;
+		ItemBase attachment;
+		for (int i = 0; i < GetInventory().AttachmentCount(); i++)
+		{
+			entity = GetInventory().GetAttachmentFromIndex(i);
+			if ( Class.CastTo(attachment,entity) )
+			{
+				attachment.SetHealth01("","Health",GetHealth01());
+			}
+		}
+	}
+	
+	override void OnFire(int muzzle_index)
+	{
+		super.OnFire(muzzle_index);
+		Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(GetAttachmentByType(Magnum_Cylinder));
+		if (cylinder)
+		{
+			string bullet_nose = "bullet_nose";
+			if (muzzle_index > 0)
+				bullet_nose = string.Format("bullet_nose_" + (muzzle_index + 1));
+			cylinder.HideSelection(bullet_nose);
+		}
+	}
+	
+	override bool IsShowingChamberedBullet()
+	{
+		return false;
+	}
+	
+	override bool CanEjectBullet() 
+	{
+		for (int i = 0; i < GetMuzzleCount(); i++)
+		{
+			if (IsChamberFull(i))
+				return true;
+		}
+		return false;
+	}
+	
+	override void ShowBullet(int muzzleIndex)
+	{
+		super.ShowBullet(muzzleIndex);
+		
+		Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(GetAttachmentByType(Magnum_Cylinder));
+		if (cylinder)
+		{		
+			string bullet = "bullet";
+			if (muzzleIndex > 0)
+				bullet = string.Format("bullet_" + (muzzleIndex + 1));
+			
+			cylinder.ShowSelection(bullet);
+			
+			if (!IsChamberFiredOut(muzzleIndex))
+			{
+				string bullet_nose = "bullet_nose";
+				if (muzzleIndex > 0)
+					bullet_nose = string.Format("bullet_nose_" + (muzzleIndex + 1));
+				cylinder.ShowSelection(bullet_nose);
+			}
+		}
+	}
+	
+	override void HideBullet(int muzzleIndex)
+	{
+		super.HideBullet(muzzleIndex);
+		
+		Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(GetAttachmentByType(Magnum_Cylinder));
+		if (cylinder)
+		{		
+			string bullet = "bullet";
+			if (muzzleIndex > 0)
+				bullet = string.Format("bullet_" + (muzzleIndex + 1));
+			
+			cylinder.HideSelection(bullet);
+			
+			string bullet_nose = "bullet_nose";
+			if (muzzleIndex > 0)
+				bullet_nose = string.Format("bullet_nose_" + (muzzleIndex + 1));
+			cylinder.HideSelection(bullet_nose);
+		}
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_357", entity.GetPosition());
+		}
+	}
+};
+
+class Magnum extends Magnum_Base
+{
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		super.GetDebugActions(outputList);
+
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SPIN, "Spin", FadeColors.LIGHT_GREY));
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (GetGame().IsServer())
+		{
+			if (action_id == EActions.SPIN)
+			{
+				const float animPhaseOffset = 0.167;
+	
+				Magnum_Cylinder cylinder = Magnum_Cylinder.Cast(GetAttachmentByType(Magnum_Cylinder));
+				Magnum_Ejector ejector = Magnum_Ejector.Cast(GetAttachmentByType(Magnum_Ejector));
+		
+				if (cylinder)
+				{
+					float animPhase = cylinder.GetAnimationPhase("Rotate_Cylinder");
+					if (animPhase + animPhaseOffset > 1.0)
+					{
+						animPhase -= 1.0;
+						cylinder.ResetAnimationPhase("Rotate_Cylinder", animPhase);
+						ejector.ResetAnimationPhase("Rotate_Ejector", animPhase);
+					}
+	
+					cylinder.SetAnimationPhase("Rotate_Cylinder", animPhase);
+					ejector.ResetAnimationPhase("Rotate_Ejector", animPhase);
+				}
+			}
+		}
+		
+		return super.OnAction(action_id, player, ctx);
+	}
+}
+
+class SawedoffMagnum extends Magnum_Base {};
+class Magnum_Cylinder extends DummyItem {};
+class Magnum_Ejector extends DummyItem {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/Makarov.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Makarov.c
new file mode 100644
index 0000000000000000000000000000000000000000..b382ce5c581ad2c30920a0851ce02da2abdab962
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Makarov.c
@@ -0,0 +1,16 @@
+class MakarovIJ70_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new MakarovRecoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		
+		SpawnAttachedMagazine("Mag_IJ70_8Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/P1.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/P1.c
new file mode 100644
index 0000000000000000000000000000000000000000..80f52103a79256ce5253b659bc083966cd80b4c0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/P1.c
@@ -0,0 +1,10 @@
+class P1_Base : Pistol_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new P1Recoil(this);
+	}
+	
+};
+
+class P1 : P1_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/PMM.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/PMM.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3e1e1266dfb5fefc5c348c72542afa933ecef46
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/PMM.c
@@ -0,0 +1,3 @@
+class PMM : Pistol_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol/Red9.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Red9.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec803f06e37000cb40b9a4b89f1f16a65457aebf
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol/Red9.c
@@ -0,0 +1,3 @@
+class Red9 : Pistol_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/PistolAlt_Base.c b/scripts/4_World/DayZ/Entities/Firearms/PistolAlt_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..657105ab09233d60469f5a9701aa75d0b5008efa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/PistolAlt_Base.c
@@ -0,0 +1,2 @@
+class PistolAlt_Base extends Pistol_Base
+{}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Pistol_Base.c b/scripts/4_World/DayZ/Entities/Firearms/Pistol_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..a0e842bb8687c3ef9988169380594526cb0f3544
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Pistol_Base.c
@@ -0,0 +1,632 @@
+
+enum PistolAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	OPENED_DISCHARGED 	= 1, 	///< opened and discharged
+	CLOSED_CHARGED		= 2,	///< closed and charged
+	JAMMED				= 3		///< jammed weapon
+};
+
+// naming convention of the states respect following order:
+// closed/opened | charged/discharged | bullet/nobullet | magazine/nomag
+enum PistolStableStateID
+{
+	UNKNOWN				=  0,
+	CLO_DIS_BU0_MA0		=  1,
+	CLO_CHG_BU0_MA0		=  2,
+	CLO_CHG_BU1_MA0		=  3,
+	CLO_JAM_BU1_MA0		=  4,
+	OPE_DIS_BU0_MA0		=  5,
+	CLO_CHG_BU0_MA1		=  6,
+	CLO_DIS_BU0_MA1		=  7,
+	CLO_JAM_BU1_MA1		=  8,
+	CLO_CHG_BU1_MA1		=  9,
+	OPE_DIS_BU0_MA1		= 10,
+}
+
+class Pistol_CLO_DIS_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CD00 closed dischgd nobull nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CD00 closed dischgd nobull nomag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_DIS_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsDischarged () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class Pistol_CLO_CHG_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CC00 closed charged nobull nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CC00 closed charged nobull nomag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_CHG_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class Pistol_CLO_CHG_BU1_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CC10 closed charged bullet nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CC10 closed charged bullet nomag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_CHG_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class Pistol_CLO_JAM_BU1_MA0 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CJF0 closed jammed bullet nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CJF0 closed jammed bullet nomag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_JAM_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class Pistol_OPE_DIS_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { OD00 opened dischgd nobullet nomag"); } m_weapon.SetCharged(false); m_weapon.SetWeaponOpen(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } 0D00 opened dischgd nobullet nomag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.OPE_DIS_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsDischarged () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class Pistol_CLO_CHG_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CC01 closed charged nobullet mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CC01 closed charged nobullet mag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_CHG_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class Pistol_CLO_DIS_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CD01 closed dischgd nobullet mag"); } m_weapon.SetCharged(false); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CD01 closed dischgd nobullet mag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_DIS_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class Pistol_CLO_JAM_BU1_MA1 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CJF1 closed jammed bullet mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CJF1 closed jammed bullet mag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_JAM_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class Pistol_CLO_CHG_BU1_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { CC11 closed charged bullet mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } CC11 closed charged bullet mag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.CLO_CHG_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class Pistol_OPE_DIS_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] { OD01 opened dischgd nobullet mag"); } m_weapon.SetWeaponOpen(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnstate] } 0D01 opened dischgd nobullet mag"); } }
+	override int GetCurrentStateID () { return PistolStableStateID.OPE_DIS_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+
+
+/**@class		Pistol_Base
+ * @brief		base for semi auto weapons
+ * @NOTE		name copies config base class
+ **/
+class Pistol_Base extends Weapon_Base
+{
+	ref WeaponStableState CD00;
+	ref WeaponStableState CC00;
+	ref WeaponStableState CC10;
+	ref WeaponStableState CJF0;
+	ref WeaponStableState OD00;
+	ref WeaponStableState CD01;
+	ref WeaponStableState CC01;
+	ref WeaponStableState CC11;
+	ref WeaponStableState CJF1;
+	ref WeaponStableState OD01;
+	
+	override bool CanChamberBullet (int muzzleIndex, Magazine mag)
+	{
+		return super.CanChamberBullet(muzzleIndex,mag) && IsChamberEmpty(muzzleIndex);
+	}
+	
+	void Pistol_Base ()
+	{
+	}
+	
+	override void InitStateMachine ()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_BULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_BULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED_UNCOCKED));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM));
+
+		// setup state machine
+		// basic weapon states
+		// open-closed | discharged-charged | nobullet-bullet | nomag-mag
+		// regexp: [OC][CDJ][01][01]
+		CD00 = new Pistol_CLO_DIS_BU0_MA0(this, NULL, PistolAnimState.DEFAULT);
+		CC00 = new Pistol_CLO_CHG_BU0_MA0(this, NULL, PistolAnimState.CLOSED_CHARGED);
+		CC10 = new Pistol_CLO_CHG_BU1_MA0(this, NULL, PistolAnimState.CLOSED_CHARGED);
+		CJF0 = new Pistol_CLO_JAM_BU1_MA0(this, NULL, PistolAnimState.JAMMED);
+		OD00 = new Pistol_OPE_DIS_BU0_MA0(this, NULL, PistolAnimState.OPENED_DISCHARGED);
+		CD01 = new Pistol_CLO_DIS_BU0_MA1(this, NULL, PistolAnimState.DEFAULT);
+		CC01 = new Pistol_CLO_CHG_BU0_MA1(this, NULL, PistolAnimState.CLOSED_CHARGED);
+		CC11 = new Pistol_CLO_CHG_BU1_MA1(this, NULL, PistolAnimState.CLOSED_CHARGED);
+		CJF1 = new Pistol_CLO_JAM_BU1_MA1(this, NULL, PistolAnimState.JAMMED);
+		OD01 = new Pistol_OPE_DIS_BU0_MA1(this, NULL, PistolAnimState.OPENED_DISCHARGED);
+
+		// unstable (intermediate) states
+		WeaponCharging Mech_CD00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED_UNCOCKED);
+		WeaponCharging Mech_CC00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponCharging Mech_CD01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED_UNCOCKED);
+		WeaponCharging Mech_CC01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponCharging Mech_OD00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		WeaponCharging Mech_OD01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		
+		WeaponCharging Mech_CC10 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED); // eject with no mag
+		WeaponCharging Mech_CC11 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED); // eject with mag
+		
+		
+		WeaponDryFire Trigger_CC00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED); // cock without clip
+		WeaponDryFire Trigger_CD00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+		WeaponDryFire Trigger_OD00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		WeaponDryFire Trigger_CD01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+		WeaponDryFire Trigger_OD01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		WeaponDryFire Trigger_CC01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED); // cock with clip
+		WeaponDryFire Trigger_CJF0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		WeaponDryFire Trigger_CJF1 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		
+		WeaponFireAndChamberNext Trigger_CC11 = new WeaponFireAndChamberNext(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase Trigger_CC10 = new WeaponFireLast(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL); // fire last no mag
+		WeaponStateBase Trigger_CC11L = new WeaponFireLast(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST); // fire last with mag
+		
+		WeaponStateBase Trigger_CC10J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM); 
+		WeaponStateBase Trigger_CC11J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM);
+
+		WeaponStateBase Unjam_CJF0 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+		WeaponStateBase Unjam_CJF1 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+
+		WeaponChambering Chamber_CD00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED_UNCOCKED);
+		WeaponChambering Chamber_CC00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		WeaponChambering Chamber_OD00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED);
+		WeaponChambering Chamber_CD01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED_UNCOCKED);
+		WeaponChambering Chamber_CC01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		WeaponChambering Chamber_OD01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED);
+
+		WeaponAttachMagazine Attach_CC10 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_BULLET_CLOSED);
+		WeaponAttachMagazine Attach_CJF0 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_BULLET_CLOSED);
+		WeaponAttachMagazine Attach_CD00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_UNCOCKED);
+		WeaponAttachMagazine Attach_CC00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_COCKED);
+		WeaponAttachMagazine Attach_OD00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_OPENED);
+
+		WeaponReplacingMagAndChamberNext Reload_CD01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_UNCOCKED);
+		WeaponReplacingMagAndChamberNext Reload_CC01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_COCKED);
+		WeaponReplacingMagAndChamberNext Reload_CC11 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_BULLET_CLOSED);
+		WeaponReplacingMagAndChamberNext Reload_CJF1 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_BULLET_CLOSED);
+		WeaponReplacingMagAndChamberNext Reload_OD01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_OPENED);
+
+		WeaponDetachingMag Detach_CC11 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH);
+		WeaponDetachingMag Detach_CC01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH);
+		WeaponDetachingMag Detach_CD01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH);
+		WeaponDetachingMag Detach_OD01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH);
+		WeaponDetachingMag Detach_CJF1 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __A__ = new WeaponEventAttachMagazine;
+		WeaponEventBase __D__ = new WeaponEventDetachMagazine;
+		WeaponEventBase __S__ = new WeaponEventSwapMagazine;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+	
+		m_fsm = new WeaponFSM();
+		
+		//WeaponGuardWeaponDischarged
+		//WeaponGuardWeaponOpen
+
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( CD00,				__M__,	Mech_CD00)); // charge from closed
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD00,		_fin_,	CC00, NULL, new WeaponGuardWeaponDischarged(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD00,		_fin_,	CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD00,		_abt_,	CC00, NULL, new WeaponGuardWeaponDischarged(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD00,		_abt_,	CD00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC00,				__M__,	Mech_CC00)); // charge from charged
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC00,		_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC00,		_abt_,	CC00));
+
+		m_fsm.AddTransition(new WeaponTransition( OD00,				__M__,	Mech_OD00)); // charge from opened
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD00,		_fin_,	CD00, NULL, new WeaponGuardWeaponOpen(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD00,		_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD00,		_abt_,	CD00, NULL, new WeaponGuardWeaponOpen(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD00,		_abt_,	CC00));
+		
+		m_fsm.AddTransition(new WeaponTransition( OD01,				__M__,	Mech_OD01)); // charge from opened with mag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD01,		_fin_,	OD01, NULL, new WeaponGuardWeaponOpen(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD01,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD01,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD01,		_abt_,	OD01, NULL, new WeaponGuardWeaponOpen(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD01,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_OD01,		_abt_,	CC11));
+		
+		m_fsm.AddTransition(new WeaponTransition( CD01,				__M__,	Mech_CD01)); // charge from closed=1 with mag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD01,		_fin_,	CD01, NULL, new WeaponGuardWeaponDischarged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD01,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD01,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD01,		_abt_,	CD01, NULL, new WeaponGuardWeaponDischarged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD01,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CD01,		_abt_,	CC11));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC01, 			__M__,	Mech_CC01)); // charge from closed/charged with mag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC01,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC01,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC01,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC01,		_abt_,	CC11));
+		
+		// eject good cartridge
+		m_fsm.AddTransition(new WeaponTransition( CC10,				__M__,	Mech_CC10)); // eject chamber nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC10,		_fin_,	CC00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC10,		_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC10,		_abt_,	CC00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC10,		_abt_,	CC10));	
+		
+		m_fsm.AddTransition(new WeaponTransition( CC11,				__M__,	Mech_CC11 )); // eject with mag with ammo
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC11,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC11,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC11,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_CC11,		_abt_,	CC11));
+
+		// Trigger_CC11e
+		m_fsm.AddTransition(new WeaponTransition( CC00,				__T__,	Trigger_CC00)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC00,	_fin_,	CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC00, 	_dto_,	CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC00, 	_abt_,	CD00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CD00,				__T__,	Trigger_CD00)); // fire.uncocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CD00,	_fin_,  CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CD00,	_dto_,  CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CD00,	_abt_,  CD00));
+		
+		m_fsm.AddTransition(new WeaponTransition( OD00,				__T__,	Trigger_OD00)); // opened fire.uncocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_OD00,	_fin_,  OD00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_OD00,	_dto_,  OD00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_OD00,	_abt_,  OD00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CD01,				__T__,	Trigger_CD01)); // fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CD01,	_fin_,	CD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CD01,	_dto_,  CD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CD01,	_abt_,  CD01));
+		
+		m_fsm.AddTransition(new WeaponTransition( OD01,				__T__,	Trigger_OD01)); // opened fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_OD01,	_fin_,	OD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_OD01,	_dto_,	OD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_OD01,	_abt_,	OD01));
+		
+		m_fsm.AddTransition(new WeaponTransition( CJF0,				__T__,	Trigger_CJF0)); // opened fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CJF0,	_fin_,	CJF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CJF0,	_dto_,	CJF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CJF0,	_abt_,	CJF0));
+		
+		m_fsm.AddTransition(new WeaponTransition( CJF1,				__T__,	Trigger_CJF1)); // opened fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CJF1,	_fin_,	CJF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CJF1,	_dto_,	CJF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CJF1,	_abt_,	CJF1));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( CC10,				__T__,	Trigger_CC10)); // or fire.last (if not jammed)
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC10,	_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC10,	_rto_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC10,	_abt_,	CC00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC10,				__TJ_,	Trigger_CC10J)); // or fire.last (if not jammed)
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC10J,	_fin_,	CJF0 ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC10J,	_rto_,	CJF0 ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC10J,	_abt_,	CJF0 ));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( CC11, 			__T__,	Trigger_CC11, NULL, new WeaponGuardHasAmmo(this))); // fire.normal + chamber next
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11,	_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11,	_rto_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11,	_abt_,	CC11));
+
+		m_fsm.AddTransition(new WeaponTransition( CC11,				__T__,	Trigger_CC11L, NULL, new GuardNot(new WeaponGuardHasAmmo(this)))); // fire.last with mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11L,	_fin_,	OD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11L,	_rto_,	OD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11L,	_abt_,	OD01));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC11,				__TJ_,	Trigger_CC11J )); // fire.last with mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11J,	_fin_,	CJF1 ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11J,	_rto_,	CJF1 ));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC11J,	_abt_,	CJF1 ));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC01,				__T__,	Trigger_CC01)); // fire.cocked with mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC01,	_fin_,	CD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC01,	_dto_,	CD01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_CC01,	_abt_,	CD01));
+
+		// load cartridge
+		m_fsm.AddTransition(new WeaponTransition( CD00,				__L__,	Chamber_CD00)); // chamber from closed=1
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD00,	_fin_,	OD00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD00,	_fin_,	CD00, NULL, new WeaponGuardWeaponDischarged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD00,	_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD00,	_abt_,	OD00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD00,	_abt_,	CD00, NULL, new WeaponGuardWeaponDischarged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD00,	_abt_,	CC10));
+
+		m_fsm.AddTransition(new WeaponTransition( OD00,				__L__,	Chamber_OD00)); // chamber from opened
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD00,	_fin_,	OD00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD00,	_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD00,	_abt_,	OD00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD00,	_abt_,	CC10));
+
+		m_fsm.AddTransition(new WeaponTransition( CC00,				__L__,	Chamber_CC00)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC00,	_fin_,	OD00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC00,	_fin_,	CC00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC00,	_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC00,	_abt_,	OD00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC00,	_abt_,	CC00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC00,	_abt_,	CC10));
+		
+		// load cartridge with mag
+		m_fsm.AddTransition(new WeaponTransition( CD01,				__L__,	Chamber_CD01, NULL, new WeaponGuardHasMag(this))); // chamber from closed=1 with mag
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD01,	_fin_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD01,	_fin_,	CD01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD01,	_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD01,	_abt_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD01,	_abt_,	CD01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CD01,	_abt_,	CC11));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC01,				__L__,	Chamber_CC01, NULL, new WeaponGuardHasMag(this))); // chamber from closed=1 with mag
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC01,	_fin_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC01,	_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC01,	_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC01,	_abt_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC01,	_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_CC01,	_abt_,	CC11));
+		
+		m_fsm.AddTransition(new WeaponTransition( OD01,				__L__,	Chamber_OD01, NULL, new WeaponGuardHasMag(this))); // chamber from opened with mag
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD01,	_fin_,	OD01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD01,	_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD01,	_abt_,	OD01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_OD01,	_abt_,	CC11));
+
+		m_fsm.AddTransition(new WeaponTransition( CJF0,				__A__,	Attach_CJF0, NULL, new WeaponGuardCanAttachMag(this))); // attach from JAM/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CJF0,		_fin_,	CJF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CJF0,		_fin_,	CJF0));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CJF0,		_abt_,	CJF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CJF0,		_abt_,	CJF0));;
+
+// zdokumentovano az sem
+		// attach mag with no ammo
+		m_fsm.AddTransition(new WeaponTransition( CD00,				__A__,	Attach_CD00, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b0/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_fin_,	CD00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_fin_,	CD01, NULL, new WeaponGuardWeaponDischarged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_abt_,	CD00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_abt_,	CD00, NULL, new WeaponGuardWeaponDischarged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CD00,		_abt_,	CC11));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC10,				__A__,	Attach_CC10, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC10,		_fin_,	CC11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC10,		_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC10,		_abt_,	CC11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC10,		_abt_,	CC10));
+		
+		m_fsm.AddTransition(new WeaponTransition( OD00,				__A__,	Attach_OD00, NULL, new WeaponGuardCanAttachMag(this))); // attach from OPE/b0/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_fin_,	OD00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_fin_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_abt_,	OD00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_abt_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_OD00,		_abt_,	CC11));
+
+		m_fsm.AddTransition(new WeaponTransition( CC00, 			__A__,	Attach_CC00, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b0/m0 charged
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC00,		_fin_,	CC11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC00,		_fin_,	CC01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC00,		_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC00,		_abt_,	CC11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC00,		_abt_,	CC01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_CC00,		_abt_,	CC00));
+
+		// replace magazine
+		m_fsm.AddTransition(new WeaponTransition( CD01,				__S__,	Reload_CD01, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_fin_,	CC11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_fin_,	CC01, NULL, new WeaponGuardWeaponCharged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_fin_,	CD01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_fin_,	CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_abt_,	CC11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_abt_,	CC01, NULL, new WeaponGuardWeaponCharged(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_abt_,	CD01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CD01,		_abt_,	CD00));
+
+
+		m_fsm.AddTransition(new WeaponTransition( CC11, 			__S__,	Reload_CC11, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC11,		_fin_,	CC11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC11,		_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC11,		_abt_,	CC11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC11,		_abt_,	CC10));
+
+		m_fsm.AddTransition(new WeaponTransition( CC01, 			__S__,	Reload_CC01, NULL, new WeaponGuardCanSwapMag(this))); // CLO/b0/m1 swap with empty mag (no chamber)
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC01,		_fin_,	CC11, NULL, new WeaponGuardCurrentChamberFull(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC01,		_fin_,	CC01, NULL, new WeaponGuardHasMag(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC01,		_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC01,		_abt_,	CC11, NULL, new WeaponGuardCurrentChamberFull(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC01,		_abt_,	CC01, NULL, new WeaponGuardHasMag(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CC01,		_abt_,	CC00));
+	
+		m_fsm.AddTransition(new WeaponTransition( OD01, 			__S__,	Reload_OD01, NULL, new WeaponGuardCanSwapMag(this))); // OPE/b0/m1 swap with empty mag (no chamber)
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_fin_,	OD00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_fin_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_abt_,	OD00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_abt_,	OD01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_OD01,		_abt_,	CC11));
+
+		m_fsm.AddTransition(new WeaponTransition( CJF1,				__S__,	Reload_CJF1, NULL, new WeaponGuardCanSwapMag(this))); // swap in JAM/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CJF1,		_fin_,	CJF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CJF1,		_fin_,	CJF0));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CJF1,		_abt_,	CJF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_CJF1,		_abt_,	CJF0));
+
+
+		// detach magazine
+		m_fsm.AddTransition(new WeaponTransition( OD01,				__D__,	Detach_OD01, NULL, new WeaponGuardCanDetachMag(this))); // detach from OPE/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_OD01,		_fin_,	OD01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_OD01,		_fin_,	OD00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_OD01,		_abt_,	OD01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_OD01,		_abt_,	OD00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC11,				__D__,	Detach_CC11, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC11,		_fin_,	CC11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC11,		_fin_,	CC10));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC11,		_abt_,	CC11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC11,		_abt_,	CC10));
+		
+		m_fsm.AddTransition(new WeaponTransition( CC01,				__D__,	Detach_CC01, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC01,		_fin_,	CC01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC01,		_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC01,		_abt_,	CC01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CC01,		_abt_,	CC00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CD01,				__D__,	Detach_CD01, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b0/m1 dischg
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CD01,		_fin_,	CD01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CD01,		_fin_,	CD00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CD01,		_abt_,	CD01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CD01,		_abt_,	CD00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CJF1,				__D__,	Detach_CJF1, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b1/m1 jammed
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CJF1,		_fin_,	CJF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CJF1,		_fin_,	CJF0));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CJF1,		_abt_,	CJF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_CJF1,		_abt_,	CJF0));
+
+
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( CJF0,				__U__,	Unjam_CJF0)); // unjam nomag
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF0,		_fin_,	CJF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF0,		_fin_,	CC00));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF0,		_abt_,	CJF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF0,		_abt_,	CC00));
+		
+		m_fsm.AddTransition(new WeaponTransition( CJF1,				__U__,	Unjam_CJF1)); // unjam with mag with ammo
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF1,		_fin_,	CJF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF1,		_fin_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF1,		_fin_,	CC11));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF1,		_abt_,	CJF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF1,		_abt_,	CC01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_CJF1,		_abt_,	CC11));
+		
+
+		SetInitialState(CD00);
+		SelectionBulletHide();
+		HideMagazine();
+		m_fsm.Start();
+	}
+	
+	override float GetChanceToJam()
+	{
+		float chanceToJam = super.GetChanceToJam();
+		Magazine mag = GetMagazine(GetCurrentMuzzle());
+		
+		if(mag)
+		{
+			chanceToJam = chanceToJam + ((1.0 - chanceToJam) * mag.GetChanceToJam());
+		}
+		else
+		{
+			chanceToJam = chanceToJam + ((1.0 - chanceToJam) * 0.06);
+		}
+		
+		return chanceToJam;
+	}
+	
+	/*override bool GetInventoryHandAnimation(notnull InventoryLocation loc, out int value)
+	{
+		int id;
+		string name = "";
+		if ( loc.GetParent() && loc.GetParent().GetInventory().GetCurrentAttachmentSlotInfo(id,name) && name == "Hips" )
+		{
+			//value = WeaponHideShowTypes.HIDESHOW_SLOT_2HDRIGHTBACK;
+			value = WeaponHideShowTypes.HIDESHOW_SLOT_PISTOLBELT;
+			return true;
+		}
+		
+		return false;
+	}*/
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionDetachMagazine);
+		//AddAction(ActionAdvancedDetachMagazine);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/B95.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/B95.c
new file mode 100644
index 0000000000000000000000000000000000000000..0f99d6a46195ddb4a1065b3994e9e0f4512e6ffd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/B95.c
@@ -0,0 +1,27 @@
+class B95_base : DoubleBarrel_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new B95Recoil(this);
+	}
+	
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "HuntingOptic" );
+		
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_308Win", entity.GetPosition());
+		}
+	}
+	
+};
+class B95 : B95_base {};
+class SawedoffB95 extends B95_base {};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/CZ527.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/CZ527.c
new file mode 100644
index 0000000000000000000000000000000000000000..47860719cdb36bb23a512840d854bf4eb711d28e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/CZ527.c
@@ -0,0 +1,15 @@
+class CZ527_Base : BoltActionRifle_ExternalMagazine_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new CZ527Recoil(this);
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+
+		GetInventory().CreateAttachment("HuntingOptic");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/CZ550.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/CZ550.c
new file mode 100644
index 0000000000000000000000000000000000000000..89166ce6bcf23695f1387264c6232299aa893119
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/CZ550.c
@@ -0,0 +1,19 @@
+class CZ550_Base : BoltActionRifle_ExternalMagazine_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new CZ550Recoil(this);
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			GetInventory().CreateAttachment("HuntingOptic");
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Izh18.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Izh18.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2dd341832d44c7fe9fc5bfb7840d18b96817485
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Izh18.c
@@ -0,0 +1,27 @@
+/**@class		Izh18_Base
+ * @brief		base for Izh18
+ * @NOTE		name copies config base class
+ **/
+class Izh18_Base extends RifleSingleShot_Base
+{
+	void Izh18_Base ()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Izh18Recoil(this);
+	}
+					
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_762x39", entity.GetPosition());
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Mosin9130.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Mosin9130.c
new file mode 100644
index 0000000000000000000000000000000000000000..b07e26d6fcfa90d719d0f0d8dd38683eb845e4bf
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Mosin9130.c
@@ -0,0 +1,52 @@
+/**@class		Mosin9130
+ * @brief		base for Mosin
+ * @NOTE		name copies config base class
+ **/
+class Mosin9130_Base extends BoltActionRifle_InnerMagazine_Base
+{
+	void Mosin9130_Base ()
+	{
+	}
+	
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PUScopeOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+};
+
+
+class Mosin9130 extends Mosin9130_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new MosinRecoil(this);
+	}
+	
+				
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "PUScopeOptic" );
+		inventory.CreateInInventory( "Mosin_Compensator" );	
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_762x54", entity.GetPosition());
+		}
+	}
+};
+
+class SawedoffMosin9130_Base extends Mosin9130_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new MosinSawedOffRecoil(this);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Repeater.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Repeater.c
new file mode 100644
index 0000000000000000000000000000000000000000..b46569a572f24375040722f2f85c9f5e7a0e2220
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Repeater.c
@@ -0,0 +1,254 @@
+enum RPTAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	CHARGED 			= 1,
+	JAMMED 				= 2,
+};
+
+enum RPTStableStateID
+{
+	UNKNOWN				=  0,
+	EmptyDischarged		=  1,
+	LoadedCharged		=  2,
+	LoadedDischarged	=  3,
+	LoadedJammed		=  4,
+}
+
+
+class RPTEmptyDischarged extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { EmptyDischarged C0"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } EmptyDischarged C0"); } }
+	override int GetCurrentStateID () { return RPTStableStateID.EmptyDischarged; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RPTLoadedCharged extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedCharged C1"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedCharged C1"); } }
+	override int GetCurrentStateID () { return RPTStableStateID.LoadedCharged; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class RPTLoadedDischarged extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedDischarged D1"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedDischarged D1"); } }
+	override int GetCurrentStateID () { return RPTStableStateID.LoadedDischarged; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class RPTLoadedJammed extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { LoadedJammed JF"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } LoadedJammed JF"); } }
+	override int GetCurrentStateID () { return RPTStableStateID.LoadedJammed; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+/**@class	Mp133Shotgun_Base
+ * @brief	basic mp5 submachine gun
+ **/
+class Repeater_Base extends Rifle_Base
+{
+	ref WeaponStableState D0;
+	ref WeaponStableState C0;
+	ref	WeaponStableState C1;
+	ref	WeaponStableState DF;
+	ref	WeaponStableState JF;
+	
+	
+	override void InitStateMachine ()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		
+		D0 = new RPTEmptyDischarged(this, NULL, RPTAnimState.DEFAULT);
+		C0 = new RPTEmptyDischarged(this, NULL, RPTAnimState.CHARGED);
+		DF = new RPTLoadedDischarged(this, NULL, RPTAnimState.DEFAULT);
+		C1 = new RPTLoadedCharged(this, NULL, RPTAnimState.CHARGED);
+		JF = new RPTLoadedJammed(this, NULL, RPTAnimState.JAMMED);
+		
+		//WeaponStateBase	Mech_D0 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase	Mech_C1 = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		WeaponStateBase	Mech_DF = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		LoopedChamberingEjectLast Chamber_D0 = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChamberingEjectLast Chamber_C0 = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChamberingEjectLast Chamber_C1 = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_COCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChamberingEjectLast Chamber_DF = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		
+		WeaponStateBase	Unjam_JF = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+		
+		WeaponStateBase	Trigger_D0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase	Trigger_C0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase	Trigger_C1 = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase	Trigger_DF = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase	Trigger_JF = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		
+		WeaponStateBase	Trigger_C1J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM);
+
+		
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase	__M__ = new WeaponEventMechanism;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		
+		// Mechanism
+//----------------------------------------
+		m_fsm.AddTransition(new WeaponTransition( D0,			__M__,	Mech_DF));
+		m_fsm.AddTransition(new WeaponTransition( C0,			__M__,	Mech_C1));
+				
+		m_fsm.AddTransition(new WeaponTransition( C1,			__M__,	Mech_C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C1,		_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( DF,			__M__,	Mech_DF));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_DF,		_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_DF,		_fin_,	DF, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_DF,		_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_DF,		_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_DF,		_abt_,	DF, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_DF,		_abt_,	C1));
+		
+		
+//----------------------------------------
+		m_fsm.AddTransition(new WeaponTransition( C0,			__L__,	Chamber_D0));
+		
+		m_fsm.AddTransition(new WeaponTransition( D0,			__L__,	Chamber_D0));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_D0,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_D0,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_D0,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__L__,	Chamber_C1, NULL, new GuardNot(new WeaponGuardInnerMagazineFull(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C1,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C1,	_abt_,	C1));
+		
+		m_fsm.AddTransition(new WeaponTransition( DF,			__L__,	Chamber_DF, NULL, new GuardNot(new WeaponGuardInnerMagazineFull(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_DF,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_DF,	_abt_,	DF, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_DF,	_abt_,	C1));
+		
+//------------------------------------------
+		
+		m_fsm.AddTransition(new WeaponTransition( JF, 			__U__,	Unjam_JF));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	JF, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_fin_,	C1));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	JF, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	C0, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF,	_abt_,	C1));
+		
+		
+//-----------------------------------------
+		
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( D0,			__T__,	Trigger_D0)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_D0,	_fin_,	D0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_D0,	_dto_,	D0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_D0,	_abt_,	D0));
+		
+		m_fsm.AddTransition(new WeaponTransition( C0,			__T__,	Trigger_C0)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_fin_,	D0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_dto_,	D0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C0,	_abt_,	D0));
+		
+		m_fsm.AddTransition(new WeaponTransition( C1,			__T__,	Trigger_C1)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_fin_,	DF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_rto_,	DF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1,	_abt_,	DF));
+		
+		m_fsm.AddTransition(new WeaponTransition( DF,			__T__,	Trigger_DF)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_DF,	_fin_,	DF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_DF,	_dto_,	DF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_DF,	_abt_,	DF));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF,			__T__,	Trigger_JF)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_fin_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_dto_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF,	_abt_,	JF));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( JF,			__TJ_,	Trigger_C1J)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_fin_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_rto_,	JF));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C1J,	_abt_,	JF));
+		
+//---------------------------------------------	
+		
+		SetInitialState(D0);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+	}
+	
+	override bool CanChamberBullet (int muzzleIndex, Magazine mag)
+	{
+		return CanChamberFromMag(muzzleIndex, mag) && !IsInternalMagazineFull(muzzleIndex);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionLoadMultiBullet);
+
+		RemoveAction(FirearmActionLoadBulletQuick); // Easy reload
+		AddAction(FirearmActionLoadMultiBulletQuick); // Easy reload
+
+	}
+};
+
+class Repeater : Repeater_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new RepeaterRecoil(this);
+	}
+	
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_357", entity.GetPosition());
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Ruger1022.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Ruger1022.c
new file mode 100644
index 0000000000000000000000000000000000000000..d04c24b4ac04fabce70de699ee5c459ff1f31598
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Ruger1022.c
@@ -0,0 +1,43 @@
+class Ruger1022_Base : RifleBoltFree_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Ruger1022Recoil(this); //TODO
+	}
+	
+	/*override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.RELOAD)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}*/
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{		
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "HuntingOptic" );
+		
+		SpawnAttachedMagazine("Mag_Ruger1022_30Rnd");
+	}	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/SSG82.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/SSG82.c
new file mode 100644
index 0000000000000000000000000000000000000000..96c0d7c874c7b2f7c857a5ed4c4e2802adb9833c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/SSG82.c
@@ -0,0 +1,37 @@
+class SSG82_Base : BoltActionRifle_ExternalMagazine_Base
+{
+	override bool CanEnterIronsights()
+	{
+		return false;
+	}
+	
+	override void AssembleGun()
+	{
+		super.AssembleGun();
+		
+		if ( !FindAttachmentBySlotName("weaponOpticsAug") )
+		{
+			GetInventory().CreateAttachment("SSG82Optic");
+		}
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new SSG82Recoil(this);
+	}
+			
+	//Debug menu Spawn Ground Special
+	/*override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+	}*/
+};
+
+
+class SSG82Optic: ItemOptics
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		return true;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/SVD.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/SVD.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec9740164726d338a061b48f752e008e8ff59061
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/SVD.c
@@ -0,0 +1,27 @@
+class SVD_Base : RifleBoltLock_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new SvdRecoil(this);
+	}
+	
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KashtanOptic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "PSO1Optic" );
+		inventory.CreateInInventory( "AK_Suppressor" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_SVD_10Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/SawedoffIzh18.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/SawedoffIzh18.c
new file mode 100644
index 0000000000000000000000000000000000000000..7f835f75e1f0afe80a5cb3b70a6434132397457a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/SawedoffIzh18.c
@@ -0,0 +1,11 @@
+class SawedoffIzh18 extends Izh18_Base
+{
+	void SawedoffIzh18 ()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Izh18SawedOffRecoil(this);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Scout.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Scout.c
new file mode 100644
index 0000000000000000000000000000000000000000..7fb25ed9ab3ad20097a18c978e908b441ed8c20a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Scout.c
@@ -0,0 +1,15 @@
+class Scout_Base : BoltActionRifle_ExternalMagazine_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new ScoutRecoil(this);
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		GetInventory().CreateAttachment("ACOGOptic");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Trumpet.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Trumpet.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ed68ff452c9baeca8ba51283686877e12aad2e1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Trumpet.c
@@ -0,0 +1,3 @@
+class Trumpet : Rifle_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle/Winchester70.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Winchester70.c
new file mode 100644
index 0000000000000000000000000000000000000000..a614db6ee6edb6e7581bf2a586b204d6353db44a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle/Winchester70.c
@@ -0,0 +1,20 @@
+class Winchester70_Base : BoltActionRifle_InnerMagazine_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Winchester70Recoil(this);
+	}
+	
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "HuntingOptic" );	
+			entity.SpawnEntityOnGroundPos("Ammo_308Win", entity.GetPosition());
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/RifleBoltFree_Base.c b/scripts/4_World/DayZ/Entities/Firearms/RifleBoltFree_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef3257a32cc7cf97babeede2e0d6571352efe1aa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/RifleBoltFree_Base.c
@@ -0,0 +1,389 @@
+enum RBFAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	JAMMED 				= 1,
+};
+
+enum RBFStableStateID
+{
+	UNKNOWN				=  0,
+	RBF_CLO_BU0_MA0		=  1,
+	RBF_CLO_BU1_MA0		=  2,
+	RBF_CLO_BU1_MA1		=  3,
+	RBF_CLO_BU0_MA1		=  4,
+	RBF_JAM_BU1_MA0		=  5,
+	RBF_JAM_BU1_MA1		=  6
+}
+
+class RBF_CLO_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull nomag"); } }
+	override int GetCurrentStateID () { return RBFStableStateID.RBF_CLO_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RBF_CLO_BU1_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet nomag"); } super.OnEntry(e);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet nomag"); } }
+	override int GetCurrentStateID () { return RBFStableStateID.RBF_CLO_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class RBF_CLO_BU1_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { /*Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet mag");*/ super.OnEntry(e);}
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet mag"); } }
+	override int GetCurrentStateID () { return RBFStableStateID.RBF_CLO_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class RBF_CLO_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull mag"); } }
+	override int GetCurrentStateID () { return RBFStableStateID.RBF_CLO_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RBF_JAM_BU1_MA0 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet nomag"); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet nomag"); } }
+	override int GetCurrentStateID () { return RBFStableStateID.RBF_JAM_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class RBF_JAM_BU1_MA1 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { Print("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet mag"); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet mag"); } }
+	override int GetCurrentStateID () { return RBFStableStateID.RBF_JAM_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+
+/**@class		Rifle_Base
+ * @brief		base for rifles
+ * @NOTE		name copies config base class
+ **/
+class RifleBoltFree_Base extends Rifle_Base
+{
+	ref WeaponStableState C00;
+	ref	WeaponStableState C10;
+	ref	WeaponStableState C11;
+	ref	WeaponStableState C01;
+	ref	WeaponStableState JF0;
+	ref	WeaponStableState JF1;
+
+	void RifleBoltFree_Base ()
+	{
+	}
+	
+	
+	override void InitStateMachine()
+	{
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH)));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)));
+
+		// setup state machine
+		// basic weapon states
+		// close-locked-jammed | nobullet-bullet | nomag-mag
+		// regexp: [CLJ][01][01]
+		C00 = new RBF_CLO_BU0_MA0(this, NULL, RBLAnimState.DEFAULT);
+		C10 = new RBF_CLO_BU1_MA0(this, NULL, RBLAnimState.DEFAULT);
+		C11 = new RBF_CLO_BU1_MA1(this, NULL, RBLAnimState.DEFAULT);
+		C01 = new RBF_CLO_BU0_MA1(this, NULL, RBLAnimState.DEFAULT);
+		JF0 = new RBF_JAM_BU1_MA0(this, NULL, RBLAnimState.JAMMED);
+		JF1 = new RBF_JAM_BU1_MA1(this, NULL, RBLAnimState.JAMMED);
+
+		// unstable (intermediate) states
+		WeaponCharging Mech_C00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponCharging Mech_C01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+	
+		WeaponCharging Mech_C10 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponCharging Mech_C11 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		
+		WeaponStateBase Trigger_C00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)); // cock without clip
+		WeaponStateBase Trigger_C10 = new WeaponFireLast(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)); // cock with clip
+		WeaponFireAndChamberNext Trigger_C11 = new WeaponFireAndChamberNext(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		WeaponStateBase Trigger_C11L = new WeaponFireLast(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		WeaponStateBase Trigger_C01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF1 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		
+		
+		//Fire and jammed
+		WeaponStateBase Trigger_C10J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)); // cock with clip
+		WeaponStateBase Trigger_C11J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM));
+		// Unjam
+		WeaponStateBase Unjam_JF0 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		WeaponStateBase Unjam_JF1 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+
+
+		WeaponChambering Chamber_C00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		WeaponChambering Chamber_C01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+
+		WeaponAttachMagazine Attach_C00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET));
+		WeaponAttachMagazine Attach_C10 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET));
+		WeaponAttachMagazine Attach_JF0 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET));
+	
+		WeaponReplacingMagAndChamberNext Reload_C11 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET));
+		WeaponReplacingMagAndChamberNext Reload_C01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET));
+		WeaponReplacingMagAndChamberNext Reload_JF1 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET));
+	
+		WeaponDetachingMag Detach_C11 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_C01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_JF1 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+
+		// events
+		WeaponEventBase	__M__ = new WeaponEventMechanism;
+		WeaponEventBase	__T__ = new WeaponEventTrigger;
+		WeaponEventBase	__TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase	__U__ = new WeaponEventUnjam;
+		WeaponEventBase	__L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase	__A__ = new WeaponEventAttachMagazine;
+		WeaponEventBase	__D__ = new WeaponEventDetachMagazine;
+		WeaponEventBase	__S__ = new WeaponEventSwapMagazine;
+		WeaponEventBase	_fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase	_abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase	_rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase	_dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+
+		// order: Discharged-Charged | nobullet-bullet | nomag-mag
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( C00,				__M__,	Mech_C00)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C00,		_abt_,	C00));
+
+		m_fsm.AddTransition(new WeaponTransition( C10,				__M__,	Mech_C10)); // charge from bullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_fin_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_abt_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_abt_,	C10));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__M__,	Mech_C11)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__M__,	Mech_C01)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_abt_,	C11));
+		
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( C00,				__T__,	Trigger_C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_dto_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__T__,	Trigger_C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_fin_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_dto_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_abt_,	C01));
+		
+		m_fsm.AddTransition(new WeaponTransition( C10,				__T__,	Trigger_C10));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_rto_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__T__,	Trigger_JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_fin_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_rto_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_abt_,	JF1));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__T__,	Trigger_JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_rto_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_abt_,	JF0));
+
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__T__,	Trigger_C11, NULL, new WeaponGuardHasAmmo(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_rto_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__T__,	Trigger_C11L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11L,	_fin_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11L,	_rto_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11L,	_abt_,	C01));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__TJ_,	Trigger_C11J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_fin_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_rto_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_abt_,	JF1));
+		
+		m_fsm.AddTransition(new WeaponTransition( C10,				__TJ_,	Trigger_C10J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_rto_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_abt_,	JF0));
+		
+
+		// load cartridge
+		m_fsm.AddTransition(new WeaponTransition( C00,				__L__,	Chamber_C00)); // chamber from closed=1
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	C10));
+
+		m_fsm.AddTransition(new WeaponTransition( C01,				__L__,	Chamber_C01)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	C11));
+
+		// attach magazine (no mag in weapon)
+		m_fsm.AddTransition(new WeaponTransition( C00,				__A__,	Attach_C00, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b0/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C00));
+	
+		m_fsm.AddTransition(new WeaponTransition( C10,				__A__,	Attach_C10, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_abt_,	C10));
+		  
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__A__,	Attach_JF0, NULL, new WeaponGuardCanAttachMag(this))); // attach from JAM/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_abt_,	JF0));
+
+		// replace magazine
+		m_fsm.AddTransition(new WeaponTransition( C11,				__S__,	Reload_C11, NULL, new WeaponGuardCanSwapMag(this))); // swap in Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_abt_,	C10));	
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__S__,	Reload_C01, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C00));	
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__S__,	Reload_JF1, NULL, new WeaponGuardCanSwapMag(this))); // swap in Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_abt_,	JF0));
+	
+
+		// detach magazine
+		m_fsm.AddTransition(new WeaponTransition( C11,				__D__,	Detach_C11, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_abt_,	C10));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__D__,	Detach_C01, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__D__,	Detach_JF1, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b1/m1 jammed
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_abt_,	JF0));
+		
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__U__,	Unjam_JF0)); // unjam nomag
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_fin_,	JF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_abt_,	JF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_abt_,	C00));
+	
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__U__,	Unjam_JF1)); // unjam with mag with ammo
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	JF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	JF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	C11));
+
+		SetInitialState(C00);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+	}
+	
+	override float GetChanceToJam()
+	{
+		float chanceToJam = super.GetChanceToJam();
+		Magazine mag = GetMagazine(GetCurrentMuzzle());
+		
+		if(mag)
+		{
+			chanceToJam = chanceToJam + ((1.0 - chanceToJam) * mag.GetChanceToJam());
+		}
+		else
+		{
+			chanceToJam = chanceToJam + ((1.0 - chanceToJam) * 0.06);
+		}
+		
+		return chanceToJam;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionDetachMagazine);
+		//AddAction(ActionAdvancedDetachMagazine);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/RifleBoltLock_Base.c b/scripts/4_World/DayZ/Entities/Firearms/RifleBoltLock_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..fdac4e3b475d5732c1f0cc842b691f0819b160e2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/RifleBoltLock_Base.c
@@ -0,0 +1,507 @@
+enum RBLAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+	OPENED 				= 1,
+	JAMMED 				= 2,
+};
+
+enum RBLStableStateID
+{
+	UNKNOWN				=  0,
+	RBL_CLO_BU0_MA0		=  1,
+	RBL_CLO_BU1_MA0		=  2,
+	RBL_CLO_BU1_MA1		=  3,
+	RBL_CLO_BU0_MA1		=  4,
+	RBL_OPN_BU0_MA1		=  5,
+	RBL_OPN_BU0_MA0		=  6,
+	RBL_JAM_BU1_MA0		=  7,
+	RBL_JAM_BU1_MA1		=  8
+}
+
+class RBL_CLO_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull nomag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_CLO_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RBL_CLO_BU1_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet nomag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_CLO_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class RBL_CLO_BU1_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close bullet mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close bullet mag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_CLO_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class RBL_CLO_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { close nobull mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } close nobull mag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_CLO_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RBL_OPN_BU0_MA1 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { lock nobull mag"); } m_weapon.SetWeaponOpen(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } open nobull mag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_OPN_BU0_MA1; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RBL_OPN_BU0_MA0 extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { lock nobull nomag"); } m_weapon.SetWeaponOpen(true); super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } open nobull nomag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_OPN_BU0_MA0; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RBL_JAM_BU1_MA0 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet nomag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet nomag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_JAM_BU1_MA0; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class RBL_JAM_BU1_MA1 extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { jammed bullet mag"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } jammed bullet mag"); } }
+	override int GetCurrentStateID () { return RBLStableStateID.RBL_JAM_BU1_MA1; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return true; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+
+/**@class		Rifle_Base
+ * @brief		base for rifles
+ * @NOTE		name copies config base class
+ **/
+class RifleBoltLock_Base extends Rifle_Base
+{
+	ref WeaponStableState C00;
+	ref	WeaponStableState C10;
+	ref	WeaponStableState C11;
+	ref	WeaponStableState C01;
+	ref	WeaponStableState O00;
+	ref	WeaponStableState O01;
+	ref	WeaponStableState JF0;
+	ref	WeaponStableState JF1;
+
+	void RifleBoltLock_Base ()
+	{
+	}
+	
+	override void InitStateMachine()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET_OPEN)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET_OPEN)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH)));
+
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_CLOSED)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED)));//????
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END)));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)));
+		
+		//m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+
+		// setup state machine
+		// basic weapon states
+		// close-locked-jammed | nobullet-bullet | nomag-mag
+		// regexp: [CLJ][01][01]
+		C00 = new RBL_CLO_BU0_MA0(this, NULL, RBLAnimState.DEFAULT);
+		C10 = new RBL_CLO_BU1_MA0(this, NULL, RBLAnimState.DEFAULT);
+		C11 = new RBL_CLO_BU1_MA1(this, NULL, RBLAnimState.DEFAULT);
+		C01 = new RBL_CLO_BU0_MA1(this, NULL, RBLAnimState.DEFAULT);
+		O00 = new RBL_OPN_BU0_MA0(this, NULL, RBLAnimState.OPENED);
+		O01 = new RBL_OPN_BU0_MA1(this, NULL, RBLAnimState.OPENED);
+		JF0 = new RBL_JAM_BU1_MA0(this, NULL, RBLAnimState.JAMMED);
+		JF1 = new RBL_JAM_BU1_MA1(this, NULL, RBLAnimState.JAMMED);
+
+		// unstable (intermediate) states
+		WeaponCharging Mech_C00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponCharging Mech_C01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponCharging Mech_O00 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		WeaponCharging Mech_O01 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+	
+		WeaponCharging Mech_C10 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		WeaponCharging Mech_C11 = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, GetWeaponSpecificCommand(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		
+		WeaponStateBase Trigger_C00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY)); // cock without clip
+		WeaponStateBase Trigger_C10 = new WeaponFireLast(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL)); // cock with clip
+		WeaponFireAndChamberNext Trigger_C11 = new WeaponFireAndChamberNext(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		WeaponStateBase Trigger_C11L = new WeaponFireLast(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST));
+		WeaponStateBase Trigger_C01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_O00 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_O01 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF0 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		WeaponStateBase Trigger_JF1 = new WeaponDryFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+	
+		//Fire and jam
+		WeaponStateBase Trigger_C10J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM)); // cock with clip
+		WeaponStateBase Trigger_C11J = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM));
+		
+//		WeaponStateBase Trigger_C11J = new WeaponFire(this, NULL, WeaponActions.FIRE, GetWeaponSpecificCommand(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM));
+
+		WeaponStateBase Unjam_JF0 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		WeaponStateBase Unjam_JF1 = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, GetWeaponSpecificCommand(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+
+		WeaponChambering Chamber_C00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		WeaponChambering Chamber_C01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		WeaponChambering Chamber_O00 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_CLOSED));
+		WeaponChambering Chamber_O01 = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, GetWeaponSpecificCommand(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_CLOSED));
+
+		WeaponAttachMagazine Attach_C00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET));
+		WeaponAttachMagazine Attach_C10 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET));
+		WeaponAttachMagazine Attach_O00 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET_OPEN));//TODO Need add open animation
+		WeaponAttachMagazine Attach_JF0 = new WeaponAttachMagazine(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET));
+		
+		WeaponReplacingMagAndChamberNext Reload_C11 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET));
+		WeaponReplacingMagAndChamberNext Reload_C01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET));
+		WeaponReplacingMagAndChamberNext Reload_O01 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET_OPEN));//TODO Need add open animation
+		WeaponReplacingMagAndChamberNext Reload_JF1 = new WeaponReplacingMagAndChamberNext(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET));
+		
+		WeaponDetachingMag Detach_C11 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_C01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_O01 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		WeaponDetachingMag Detach_JF1 = new WeaponDetachingMag(this, NULL, WeaponActions.RELOAD, GetWeaponSpecificCommand(WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH));
+		
+		//WeaponStateBase chmMag = new WeaponChamberFromAttMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __A__ = new WeaponEventAttachMagazine;
+		WeaponEventBase __D__ = new WeaponEventDetachMagazine;
+		WeaponEventBase __S__ = new WeaponEventSwapMagazine;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+
+		// order: Discharged-Charged | nobullet-bullet | nomag-mag
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( C00, 				__M__,	Mech_C00)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C00,		_abt_,	C00));
+
+		m_fsm.AddTransition(new WeaponTransition( C10,				__M__,	Mech_C10)); // charge from bullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_fin_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10, 		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10,		_abt_,	C00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C10, 		_abt_,	C10));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__M__,	Mech_C11)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C11,		_abt_,	C11));
+		
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__M__,	Mech_C01)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_C01,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( O00,				__M__,	Mech_O00)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O00,		_fin_,	O00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O00,		_abt_,	O00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O00,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( O01,				__M__,	Mech_O01)); // charge from dischg nobullet nomag
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O01,		_fin_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O01,		_fin_,	C11)); 
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O01,		_abt_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_O01,		_abt_,	C11)); 
+
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( C00,				__T__,	Trigger_C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_dto_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C00,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__T__,	Trigger_C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_fin_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_dto_,	C01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C01,		_abt_,	C01));
+		
+		m_fsm.AddTransition(new WeaponTransition( C10,				__T__,	Trigger_C10));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_rto_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__T__,	Trigger_C11, NULL, new WeaponGuardHasAmmo(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_rto_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__T__,	Trigger_C11L));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11L,	_fin_,	O01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11L,	_rto_,	O01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11L,	_abt_,	O01));
+	
+		m_fsm.AddTransition(new WeaponTransition( O00,				__T__,	Trigger_O00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_O00,		_fin_,	O00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_O00,		_dto_,	O00));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_O00,		_abt_,	O00));
+		
+		m_fsm.AddTransition(new WeaponTransition( O01,				__T__,	Trigger_O01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_O01,		_fin_,	O01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_O01,		_dto_,	O01));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_O01,		_abt_,	O01));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__T__,	Trigger_JF0)); // opened fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_dto_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF0,		_abt_,	JF0));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__T__,	Trigger_JF1)); // opened fire.uncocked w mag
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_fin_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_dto_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_JF1,		_abt_,	JF1));
+		
+
+		m_fsm.AddTransition(new WeaponTransition( C10,				__TJ_,	Trigger_C10J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_rto_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C10J,	_abt_,	JF0));		
+		
+		m_fsm.AddTransition(new WeaponTransition( C11,				__TJ_,	Trigger_C11J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_fin_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_rto_,	JF1));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_C11J,	_abt_,	JF1));	
+
+
+		// load cartridge
+		m_fsm.AddTransition(new WeaponTransition( C00,				__L__,	Chamber_C00)); // chamber from closed=1
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	O00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	C00, NULL, new WeaponGuardChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	O00, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	C00, NULL, new WeaponGuardChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C00,		_abt_,	C10));
+
+		m_fsm.AddTransition(new WeaponTransition( C01,				__L__,	Chamber_C01)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	C01, NULL, new WeaponGuardChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	C01, NULL, new WeaponGuardChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_C01,		_abt_,	C11));
+	
+		m_fsm.AddTransition(new WeaponTransition( O00,				__L__,	Chamber_O00)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O00,		_fin_ , O00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O00,		_fin_ , C10));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O00,		_abt_ , O00, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O00,		_abt_ , C10));
+	
+		m_fsm.AddTransition(new WeaponTransition( O01,				__L__,	Chamber_O01)); // chamber from closed charged
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O01,		_fin_,	O01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O01,		_abt_,	O01, NULL, new WeaponGuardCurrentChamberEmpty(this) ));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_O01,		_abt_,	C11));
+
+		// attach magazine (no mag in weapon)
+		m_fsm.AddTransition(new WeaponTransition( C00,				__A__,	Attach_C00, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b0/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C00, NULL, new GuardNot(new WeaponGuardHasMag(this))) );
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C00, NULL, new GuardNot(new WeaponGuardHasMag(this))) );
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C00,		_abt_,	C11));		
+
+		m_fsm.AddTransition(new WeaponTransition( C10,				__A__,	Attach_C10, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_fin_,	C10 ));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Attach_C10,		_abt_,	C10 ));
+	
+		m_fsm.AddTransition(new WeaponTransition( O00,				__A__,	Attach_O00, NULL, new WeaponGuardCanAttachMag(this))); // attach from CLO/b0/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_fin_,	O00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_fin_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_abt_,	O00, NULL, new GuardNot(new WeaponGuardHasMag(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_abt_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_O00,		_abt_,	C11));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__A__,	Attach_JF0, NULL, new WeaponGuardCanAttachMag(this))); // attach from JAM/b1/m0
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Attach_JF0,		_abt_,	JF0));
+
+
+		// replace magazine
+		m_fsm.AddTransition(new WeaponTransition( C11,				__S__,	Reload_C11, NULL, new WeaponGuardCanSwapMag(this))); // swap in Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C11,		_abt_,	C10));
+
+	
+		m_fsm.AddTransition(new WeaponTransition( C01,				__S__,	Reload_C01, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C11, NULL, new WeaponGuardCurrentChamberFull(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_C01,		_abt_,	C00));
+		
+	
+		m_fsm.AddTransition(new WeaponTransition( O01,				__S__,	Reload_O01, NULL, new WeaponGuardCanSwapMag(this))); // swap in CLO/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_fin_,	O00, NULL, new GuardNot(new WeaponGuardHasMag(this))) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_fin_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_abt_,	O00, NULL, new GuardNot(new WeaponGuardHasMag(this))) );
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_abt_,	O01, NULL, new WeaponGuardWeaponOpen(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_O01,		_abt_,	C11));
+
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__S__,	Reload_JF1, NULL, new WeaponGuardCanSwapMag(this))); // swap in JAM/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Reload_JF1,		_abt_,	JF0));
+			
+      // @TODO: abort in jam
+
+		// detach magazine
+		m_fsm.AddTransition(new WeaponTransition( C11,				__D__,	Detach_C11, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b1/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_fin_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_fin_,	C10));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_abt_,	C11, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C11,		_abt_,	C10));
+		
+		m_fsm.AddTransition(new WeaponTransition( C01,				__D__,	Detach_C01, NULL, new WeaponGuardCanDetachMag(this))); // detach from Chg/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_fin_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01, 		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01,		_abt_,	C01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_C01, 		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( O01,				__D__,	Detach_O01, NULL, new WeaponGuardCanDetachMag(this))); // detach from Dic/b0/m1
+		m_fsm.AddTransition(new WeaponTransition(  Detach_O01,		_fin_,	O01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_O01,		_fin_,	O00));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_O01,		_abt_,	O01, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_O01,		_abt_,	O00));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__D__,	Detach_JF1, NULL, new WeaponGuardCanDetachMag(this))); // detach from CLO/b1/m1 jammed
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_fin_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_fin_,	JF0));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_abt_,	JF1, NULL, new WeaponGuardHasMag(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Detach_JF1,		_abt_,	JF0));
+
+
+
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( JF0,				__U__,	Unjam_JF0)); // unjam nomag
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_fin_,	JF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_fin_,	C00));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_abt_,	JF0, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF0,		_abt_,	C00));
+		
+		m_fsm.AddTransition(new WeaponTransition( JF1,				__U__,	Unjam_JF1)); // unjam with mag with ammo
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	JF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_fin_,	C11));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	JF1, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	C01, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_JF1,		_abt_,	C11));
+
+		SetInitialState(C00);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+	}
+	
+	override float GetChanceToJam()
+	{
+		float chanceToJam = super.GetChanceToJam();
+		Magazine mag = GetMagazine(GetCurrentMuzzle());
+		
+		if(mag)
+		{
+			chanceToJam = chanceToJam + ((1.0 - chanceToJam) * mag.GetChanceToJam());
+		}
+		else
+		{
+			chanceToJam = chanceToJam + ((1.0 - chanceToJam) * 0.06);
+		}
+		
+		return chanceToJam;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionDetachMagazine);
+		//AddAction(ActionAdvancedDetachMagazine);
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/RifleSingleShotManual_Base.c b/scripts/4_World/DayZ/Entities/Firearms/RifleSingleShotManual_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..c55abd25252df0ee0cb42ec6fe670be92f010601
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/RifleSingleShotManual_Base.c
@@ -0,0 +1,133 @@
+/**@class		Izh18_Base
+ * @brief		base for Izh18
+ * @NOTE		name copies config base class
+ **/
+class RifleSingleShotManual_Base extends RifleSingleShot_Base
+{
+	void RifleSingleShotManual_Base ()
+	{
+	}
+	
+	override void InitStateMachine()
+	{
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+
+		// setup state machine
+		// basic weapon states
+		WeaponStableState E = new RSSEmpty(this, NULL, RSSAnimState.DEFAULT);
+		WeaponStableState F = new RSSFireout(this, NULL, RSSAnimState.DEFAULT);
+		WeaponStableState J = new RSSJammed(this, NULL, RSSAnimState.DEFAULT);
+		WeaponStableState L = new RSSLoaded(this, NULL, RSSAnimState.DEFAULT);
+		// unstable (intermediate) states
+		WeaponStateBase Mech_E = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		WeaponStateBase Mech_F = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase Mech_L = new WeaponEjectBullet(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		
+		WeaponChambering Chamber_E = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		WeaponChambering Chamber_F = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED);
+		//WeaponStateBase Chamber_L = new RifleReChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		
+		WeaponStateBase Trigger_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+		WeaponStateBase Trigger_L = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase Trigger_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+
+		WeaponStateBase Trigger_LJ = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM);
+		
+		WeaponStateBase Unjam_J = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( E,			__M__,	Mech_E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_E,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_E,		_abt_,	E));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	E));
+		
+		// eject good cartridge
+		m_fsm.AddTransition(new WeaponTransition( L,			__M__,	Mech_L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	L));
+
+		// load bullet
+		m_fsm.AddTransition(new WeaponTransition( E,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	L));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__L__,	Chamber_F));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	L));
+
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( E,			__T__,	Trigger_E)); // fire cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_dto_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_abt_,	E));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__T__,	Trigger_F)); // fire uncocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_dto_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__T__,	Trigger_L)); // a) fire if not jammed
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__TJ_,	Trigger_LJ)); // a) fire if not jammed
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_fin_,	J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_abt_,	J));
+		
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( J,			__U__,	Unjam_J));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	J, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	E));
+
+		// initial state setup
+		bool empty = true;
+		bool discharged = false; // @TODO:
+		WeaponStableState init_state = E;
+		if (empty)
+		{
+			if (!discharged)
+				init_state = E;
+		}
+		else
+		{
+			init_state = L; // can init state == load/jammed?
+		}
+		SetInitialState(init_state);
+
+		SelectionBulletHide();
+
+		m_fsm.Start();
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/RifleSingleShot_Base.c b/scripts/4_World/DayZ/Entities/Firearms/RifleSingleShot_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..b21dd9e7ee8d9af3edc50247bf63096ddad0c4b1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/RifleSingleShot_Base.c
@@ -0,0 +1,194 @@
+enum RSSAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+};
+
+enum RSSStableStateID
+{
+	UNKNOWN				=  0,
+	Empty				=  1,
+	Fireout				=  2,
+	Loaded				=  3,
+	Jammed				=  4,
+}
+
+class RSSEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Empty E"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Empty E"); } }
+	override int GetCurrentStateID () { return RSSStableStateID.Empty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class RSSFireout extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Fireout F"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Fireout F"); } }
+	override int GetCurrentStateID () { return RSSStableStateID.Fireout; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class RSSLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Loaded C"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Loaded C"); } }
+	override int GetCurrentStateID () { return RSSStableStateID.Loaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class RSSJammed extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Jammed J"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Jammed J"); } }
+	override int GetCurrentStateID () { return RSSStableStateID.Jammed; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+/**@class		Izh18_Base
+ * @brief		base for Izh18
+ * @NOTE		name copies config base class
+ **/
+class RifleSingleShot_Base extends Rifle_Base
+{
+	void RifleSingleShot_Base ()
+	{
+	}
+	
+	override void InitStateMachine()
+	{
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED));
+
+		// setup state machine
+		// basic weapon states
+		WeaponStableState E = new RSSEmpty(this, NULL, RSSAnimState.DEFAULT);
+		WeaponStableState F = new RSSFireout(this, NULL, RSSAnimState.DEFAULT);
+		WeaponStableState J = new RSSJammed(this, NULL, RSSAnimState.DEFAULT);
+		WeaponStableState L = new RSSLoaded(this, NULL, RSSAnimState.DEFAULT);
+		// unstable (intermediate) states
+		WeaponStateBase Mech_F = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase Mech_L = new WeaponEjectBullet(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		
+		WeaponChambering Chamber_E = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		WeaponChambering Chamber_F = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		//WeaponStateBase Chamber_L = new RifleReChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		
+		WeaponStateBase Trigger_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+		WeaponStateBase Trigger_L = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase Trigger_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED);
+
+		WeaponStateBase Trigger_LJ = new WeaponFireToJam(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM);
+		
+		WeaponStateBase Unjam_J = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( E,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition( F,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	E));
+		
+		// eject good cartridge
+		m_fsm.AddTransition(new WeaponTransition( L,			__M__,	Mech_L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	L));
+
+		// load bullet
+		m_fsm.AddTransition(new WeaponTransition( E,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	L));
+
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__L__,	Chamber_F));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	L));
+
+
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( E,			__T__,	Trigger_E)); // fire cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_dto_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_abt_,	E));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__T__,	Trigger_F)); // fire uncocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_dto_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__T__,	Trigger_L)); // a) fire if not jammed
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__TJ_,	Trigger_LJ)); // a) fire if not jammed
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_fin_,	J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_abt_,	J));
+		
+		// unjam
+		m_fsm.AddTransition(new WeaponTransition( J,			__U__,	Unjam_J));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	J, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	E));
+
+		// initial state setup
+		bool empty = true;
+		bool discharged = false; // @TODO:
+		WeaponStableState init_state = E;
+		if (empty)
+		{
+			if (!discharged)
+				init_state = E;
+		}
+		else
+		{
+			init_state = L; // can init state == load/jammed?
+		}
+		SetInitialState(init_state);
+
+		SelectionBulletHide();
+
+		m_fsm.Start();
+	}
+	
+	override float GetChanceToJam()
+	{
+		return 0.0;
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Rifle_Base.c b/scripts/4_World/DayZ/Entities/Firearms/Rifle_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..eef1d38fc7e0d6fab69ebbcaceb8a779ad92fd55
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Rifle_Base.c
@@ -0,0 +1,46 @@
+enum DefaultAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+};
+
+/**@class		Rifle_Base
+ * @brief		base for rifles
+ * @NOTE		name copies config base class
+ **/
+class Rifle_Base extends Weapon_Base
+{
+	void Rifle_Base ()
+	{
+	}
+
+	override void InitStateMachine ()
+	{
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+
+		// setup state machine
+		// basic weapon states
+		WeaponStableState E = new WeaponStableState(this, NULL, DefaultAnimState.DEFAULT);
+
+		WeaponStateBase Mech = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+
+		m_fsm = new WeaponFSM();
+		// charging
+		m_fsm.AddTransition(new WeaponTransition(E		, __M__,	Mech));
+		m_fsm.AddTransition(new WeaponTransition(Mech	, _fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(Mech	, _abt_,	E));
+		
+		SetInitialState(E);
+
+		SelectionBulletHide();
+
+		m_fsm.Start();
+	}
+
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SMG/CZ61.c b/scripts/4_World/DayZ/Entities/Firearms/SMG/CZ61.c
new file mode 100644
index 0000000000000000000000000000000000000000..79aec7d12238f49a712fee0941da8a696b006003
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SMG/CZ61.c
@@ -0,0 +1,43 @@
+/**@class	CZ61_Base
+ * @brief	basic CZ61 Skorpion submachine gun
+ **/
+class CZ61_Base : RifleBoltLock_Base
+{
+	void CZ61()
+	{
+	}
+	
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Cz61Recoil(this);
+	}
+	
+	//some command is different for this weapon
+	override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.CHAMBERING)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_CLOSED:
+					return WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+
+		inventory.CreateInInventory( "PistolSuppressor" );
+		
+		SpawnAttachedMagazine("Mag_CZ61_20Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SMG/MP5.c b/scripts/4_World/DayZ/Entities/Firearms/SMG/MP5.c
new file mode 100644
index 0000000000000000000000000000000000000000..84a9e17ac2fc467881c6682d1438e1f98cdf6cb2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SMG/MP5.c
@@ -0,0 +1,59 @@
+
+/**@class	MP5K_Base
+ * @brief	basic mp5 submachine gun
+ **/
+class MP5K_Base : RifleBoltFree_Base
+{
+	void MP5K_Base ()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Mp5kRecoil(this);
+	}
+	
+	
+	override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.RELOAD)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET;
+				
+				case WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "MP5k_StockBttstck" );
+		inventory.CreateInInventory( "MP5_RailHndgrd" );
+		inventory.CreateInInventory( "MP5_Compensator" );
+		inventory.CreateInInventory( "ReflexOptic" );
+		inventory.CreateInInventory( "UniversalLight" );
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_MP5_30Rnd");
+	}
+};
+
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SMG/PM73Rak.c b/scripts/4_World/DayZ/Entities/Firearms/SMG/PM73Rak.c
new file mode 100644
index 0000000000000000000000000000000000000000..5497b94f588f14867eea62deca2c54626782ae96
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SMG/PM73Rak.c
@@ -0,0 +1,3 @@
+class PM73Rak_Base : Rifle_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SMG/PP19.c b/scripts/4_World/DayZ/Entities/Firearms/SMG/PP19.c
new file mode 100644
index 0000000000000000000000000000000000000000..7b8f81686e28b6f43272ccde75e368d7df4914dd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SMG/PP19.c
@@ -0,0 +1,52 @@
+/**@class	PP19_Base
+ * @brief	basic PP19 submachine gun
+ **/
+class PP19_Base : RifleBoltFree_Base
+{
+	void PP19_Base()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new PP19Recoil(this);
+	}
+	
+	//some command is different for this weapon
+	override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.CHAMBERING)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_CLOSED:
+					return WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}
+	
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "PP19_Bttstck" );
+		inventory.CreateInInventory( "KobraOptic" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_PP19_64Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SMG/UMP45.c b/scripts/4_World/DayZ/Entities/Firearms/SMG/UMP45.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e20b5bf556debec0a495955864acebf7203de34
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SMG/UMP45.c
@@ -0,0 +1,24 @@
+class UMP45_Base : RifleBoltLock_Base
+{ 
+	void UMP_Base()
+	{	
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Ump45Recoil(this);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "PistolSuppressor" );
+		inventory.CreateInInventory( "ReflexOptic" );
+		inventory.CreateInInventory( "UniversalLight" );
+		inventory.CreateInInventory( "Battery9V" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		SpawnAttachedMagazine("Mag_UMP_25Rnd");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SMG/VSS.c b/scripts/4_World/DayZ/Entities/Firearms/SMG/VSS.c
new file mode 100644
index 0000000000000000000000000000000000000000..bad7ea2be52ed93d0f531b831cdb0daf8a4695fe
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SMG/VSS.c
@@ -0,0 +1,39 @@
+class VSS_Base : RifleBoltFree_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new VSSRecoil(this);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "PSO1Optic" );	
+			SpawnAttachedMagazine("Mag_Vikhr_30Rnd");
+		}
+	}
+};
+
+class VSS : VSS_Base
+{
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+};
+class ASVAL : VSS_Base {};
+class Vikhr : VSS_Base
+{
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KazuarOptic.Cast(optic))
+			return true;
+		return super.CanEnterIronsights();
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Shotgun/IZH43.c b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/IZH43.c
new file mode 100644
index 0000000000000000000000000000000000000000..ed919110723341d49fc80a203c3f82b0d4c26011
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/IZH43.c
@@ -0,0 +1,25 @@
+class Izh43Shotgun_Base : DoubleBarrel_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Izh43Recoil(this);
+	}
+				
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_12gaPellets", entity.GetPosition());
+			entity.SpawnEntityOnGroundPos("Ammo_12gaSlug", entity.GetPosition());
+			entity.SpawnEntityOnGroundPos("Ammo_12gaRubberSlug", entity.GetPosition());
+		}
+	}
+};
+
+class Izh43Shotgun: Izh43Shotgun_Base {};
+class SawedoffIzh43Shotgun: Izh43Shotgun_Base {};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Izh18Shotgun.c b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Izh18Shotgun.c
new file mode 100644
index 0000000000000000000000000000000000000000..8222fda97b6b6af284861e9718d2ea3d7568514f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Izh18Shotgun.c
@@ -0,0 +1,25 @@
+/**@class		Izh18_Base
+ * @brief		base for Izh18Shotgun
+ * @NOTE		name copies config base class
+ **/
+class Izh18Shotgun_Base extends RifleSingleShot_Base
+{
+	void Izh18Shotgun_Base ()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Izh18ShotgunRecoil(this);
+	}
+					
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+
+	    SpawnEntityOnGroundPos("Ammo_12gaPellets", GetPosition());
+	    SpawnEntityOnGroundPos("Ammo_12gaSlug", GetPosition());
+	    SpawnEntityOnGroundPos("Ammo_12gaRubberSlug", GetPosition());
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Shotgun/MP133.c b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/MP133.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc51e6a932e397b3baa98d0e08970e992821d1f9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/MP133.c
@@ -0,0 +1,245 @@
+enum PumpShotgunAnimState
+{
+	DEFAULT 			= 0, 	///< default weapon state, closed and discharged
+};
+
+enum PumpShotgunStableStateID
+{
+	UNKNOWN		=  0,
+	Empty		=  1,
+	Fireout		=  2,
+	Loaded		=  3,
+	Jammed		=  4,
+}
+
+class PumpShotgunEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Empty E"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Empty E"); } }
+	override int GetCurrentStateID () { return PumpShotgunStableStateID.Empty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class PumpShotgunFireout extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Fireout F"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Fireout F"); } }
+	override int GetCurrentStateID () { return PumpShotgunStableStateID.Fireout; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class PumpShotgunLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Loaded C"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Loaded C"); } }
+	override int GetCurrentStateID () { return PumpShotgunStableStateID.Loaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+class PumpShotgunJammed extends WeaponStateJammed
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Jammed L_J"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Jammed L_J"); } }
+	override int GetCurrentStateID () { return PumpShotgunStableStateID.Jammed; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return true; }
+	override bool IsBoltOpen () { return true; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+
+/**@class	Mp133Shotgun_Base
+ * @brief	basic mp5 submachine gun
+ **/
+class Mp133Shotgun_Base : Rifle_Base
+{
+	ref WeaponStableState E;
+	ref WeaponStableState F;
+	ref WeaponStableState L;
+	ref WeaponStableState J;
+	
+	void Mp133Shotgun ()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Mp133Recoil(this);
+	}
+	
+	override void InitStateMachine ()
+	{
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END));
+	
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY));
+		
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_COCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE));
+	
+		// basic weapon states
+		E = new PumpShotgunEmpty(this, NULL, PumpShotgunAnimState.DEFAULT);
+		F = new PumpShotgunFireout(this, NULL, PumpShotgunAnimState.DEFAULT);
+		L = new PumpShotgunLoaded(this, NULL, PumpShotgunAnimState.DEFAULT);
+		J = new PumpShotgunJammed(this, NULL, PumpShotgunAnimState.DEFAULT);
+//--------------------------------------------------------------------------------------
+		WeaponStateBase		Mech_E = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase		Mech_F = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase		Mech_L = new WeaponChargingInnerMag(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+
+		LoopedChamberingEjectLast 	Chamber_E = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChamberingEjectLast 	Chamber_F = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		LoopedChamberingEjectLast 	Chamber_L = new LoopedChamberingEjectLast(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_COCKED, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE);
+		
+		WeaponStateBase		Unjam_J = new WeaponUnjamming(this, NULL, WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START);
+		
+		WeaponStateBase		Trigger_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase		Trigger_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		WeaponStateBase		Trigger_L = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase		Trigger_J = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY);
+		
+		WeaponStateBase		Trigger_LJ = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM);
+		
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase	__M__ = new WeaponEventMechanism;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _rto_ = new WeaponEventReloadTimeout;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		
+		// Mechanism
+		m_fsm.AddTransition(new WeaponTransition( E,			__M__,	Mech_L));
+//----------------------------------------	
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__M__,	Mech_L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	L));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	L));
+		
+//----------------------------------------		
+		
+		m_fsm.AddTransition(new WeaponTransition( E,			__L__,	Chamber_E));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_E,	_abt_,	L));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__L__,	Chamber_L, NULL, new GuardNot(new WeaponGuardInnerMagazineFull(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_L,	_abt_,	L));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__L__,	Chamber_F, NULL, new GuardNot(new WeaponGuardInnerMagazineFull(this))));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	L));
+
+		
+//-------------------------------------------
+		
+		m_fsm.AddTransition(new WeaponTransition( J, 			__U__,	Unjam_J));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	J, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_abt_,	J, NULL, new WeaponGuardJammed(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Unjam_J,		_abt_,	L));
+		
+//-----------------------------------------
+		
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( E,			__T__,	Trigger_E)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_dto_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_abt_,	E));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__T__,	Trigger_L)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_rto_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__TJ_,	Trigger_LJ)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_fin_,	J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_rto_,	J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_LJ,	_abt_,	J));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__T__,	Trigger_F)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_dto_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( J,			__T__,	Trigger_J)); // fire.cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_J,	_fin_,	J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_J,	_dto_,	J));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_J,	_abt_,	J));
+		
+//-----------------------------------------	
+		
+		SetInitialState(E);
+
+		SelectionBulletHide();
+		HideMagazine();
+
+		m_fsm.Start();
+	}
+	
+	override bool CanChamberBullet (int muzzleIndex, Magazine mag)
+	{
+		return CanChamberFromMag(muzzleIndex, mag) && !IsInternalMagazineFull(muzzleIndex);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionLoadMultiBullet);
+
+		RemoveAction(FirearmActionLoadBulletQuick); // Easy reload
+		AddAction(FirearmActionLoadMultiBulletQuick); // Easy reload
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "FNP45_MRDSOptic" );
+		inventory.CreateInInventory( "Battery9V" );
+		
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.SpawnEntityOnGroundPos("Ammo_12gaPellets", entity.GetPosition());
+			entity.SpawnEntityOnGroundPos("Ammo_12gaSlug", entity.GetPosition());
+			entity.SpawnEntityOnGroundPos("Ammo_12gaRubberSlug", entity.GetPosition());
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Remington12.c b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Remington12.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f88fd2f7594a1614366eb2109ba7d31be1afd0b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Remington12.c
@@ -0,0 +1,3 @@
+class Remington12 : Rifle_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Saiga.c b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Saiga.c
new file mode 100644
index 0000000000000000000000000000000000000000..576f85fab80a444fee1e554df14b7816e4bbb41b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/Saiga.c
@@ -0,0 +1,55 @@
+class Saiga_Base : RifleBoltFree_Base
+{
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new SiagaRecoil(this);
+	}
+	
+	/*override int GetWeaponSpecificCommand(int weaponAction ,int subCommand)
+	{
+		if ( weaponAction == WeaponActions.RELOAD)
+		{
+			switch (subCommand)
+			{
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET;
+				
+				case WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET:
+					return WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET;
+				
+				default:
+					return subCommand;
+			}
+		
+		}
+		return subCommand;
+	}*/
+	
+	override bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if ( optic && PSO1Optic.Cast(optic) || PSO11Optic.Cast(optic) || KashtanOptic.Cast(optic) || KazuarOptic.Cast(optic) )
+			return true;
+		return super.CanEnterIronsights();
+	}
+		
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		GameInventory inventory = GetInventory();
+		inventory.CreateInInventory( "Saiga_Bttstck" );
+		inventory.CreateInInventory( "KobraOptic" );
+		inventory.CreateInInventory( "Battery9V" );
+	}	
+}
+class Saiga : Saiga_Base
+{
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Shotgun/SawedoffIzh18Shotgun.c b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/SawedoffIzh18Shotgun.c
new file mode 100644
index 0000000000000000000000000000000000000000..fb560db7e50ff423313dd762f0ebce297ffdf831
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Shotgun/SawedoffIzh18Shotgun.c
@@ -0,0 +1,15 @@
+/**@class		SawedoffIzh18Shotgun
+ * @brief		base for SawedoffIzh18Shotgun
+ * @NOTE		name copies config base class
+ **/
+class SawedoffIzh18Shotgun extends Izh18Shotgun_Base
+{
+	void SawedoffIzh18Shotgun ()
+	{
+	}
+	
+	override RecoilBase SpawnRecoilObject()
+	{
+		return new Izh18ShotgunRecoil(this);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SingleShotPistol_Base.c b/scripts/4_World/DayZ/Entities/Firearms/SingleShotPistol_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..83f54fa1daf026eac89d3c85e7339b9df7f89167
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SingleShotPistol_Base.c
@@ -0,0 +1,147 @@
+enum SSPAnimState
+{
+	COCKED 		= 0, 	///< default weapon state, closed and discharged
+	UNCOCKED 	= 1, 	///< default weapon state, closed and discharged
+};
+
+enum SSPStableStateID
+{
+	UNKNOWN				=  0,
+	Empty				=  1,
+	Fireout				=  2,
+	Loaded				=  3,
+}
+
+class SSPEmpty extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Empty E"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Empty E"); } }
+	override int GetCurrentStateID () { return SSPStableStateID.Empty; }
+	override bool HasBullet () { return false; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.E}; }
+};
+class SSPFireout extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Fireout F"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Fireout F"); } }
+	override int GetCurrentStateID () { return SSPStableStateID.Fireout; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.F}; }
+};
+class SSPLoaded extends WeaponStableState
+{
+	override void OnEntry (WeaponEventBase e) { if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " { Loaded C"); } super.OnEntry(e); }
+	override void OnExit (WeaponEventBase e) { super.OnExit(e); if (LogManager.IsWeaponLogEnable()) { wpnPrint("[wpnfsm] " + Object.GetDebugName(m_weapon) + " } Loaded C"); } }
+	override int GetCurrentStateID () { return SSPStableStateID.Loaded; }
+	override bool HasBullet () { return true; }
+	override bool HasMagazine () { return false; }
+	override bool IsJammed () { return false; }
+	override bool IsBoltOpen () { return false; }
+	override bool IsRepairEnabled () { return true; }
+	override void InitMuzzleArray () { m_muzzleHasBullet = {MuzzleState.L}; }
+};
+
+class SingleShotPistol_Base: Weapon_Base
+{
+	override void InitStateMachine()
+	{
+		// setup abilities
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL));
+		m_abilities.Insert(new AbilityRecord(WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED));
+
+		// setup state machine
+		// basic weapon states
+		WeaponStableState E = new SSPEmpty(this, NULL, SSPAnimState.UNCOCKED);
+		WeaponStableState F = new SSPFireout(this, NULL, SSPAnimState.UNCOCKED);
+		WeaponStableState L = new SSPLoaded(this, NULL, SSPAnimState.COCKED);
+		// unstable (intermediate) states
+		WeaponStateBase Mech_F = new WeaponCharging(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED);
+		WeaponStateBase Mech_L = new WeaponEjectBullet(this, NULL, WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED);
+		
+		WeaponStateBase Chamber_E = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		WeaponStateBase Chamber_F = new WeaponChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		//WeaponStateBase Chamber_L = new RifleReChambering(this, NULL, WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED);
+		
+		WeaponStateBase Trigger_E = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+		WeaponStateBase Trigger_L = new WeaponFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL);
+		WeaponStateBase Trigger_F = new WeaponDryFire(this, NULL, WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED);
+
+
+		// events
+		WeaponEventBase __M__ = new WeaponEventMechanism;
+		WeaponEventBase __T__ = new WeaponEventTrigger;
+		WeaponEventBase __TJ_ = new WeaponEventTriggerToJam;
+		WeaponEventBase __L__ = new WeaponEventLoad1Bullet;
+		WeaponEventBase __U__ = new WeaponEventUnjam;
+		WeaponEventBase _fin_ = new WeaponEventHumanCommandActionFinished;
+		WeaponEventBase _abt_ = new WeaponEventHumanCommandActionAborted;
+		WeaponEventBase _dto_ = new WeaponEventDryFireTimeout;
+
+		m_fsm = new WeaponFSM();
+		// charging
+		m_fsm.AddTransition(new WeaponTransition( E,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition( F,			__M__,	Mech_F));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_F,		_abt_,	E));
+		
+		// eject good cartridge
+		m_fsm.AddTransition(new WeaponTransition( L,			__M__,	Mech_L));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Mech_L,		_abt_,	L));
+
+		m_fsm.AddTransition(new WeaponTransition( E,			__L__,	Chamber_F));
+		m_fsm.AddTransition(new WeaponTransition( F,			__L__,	Chamber_F));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_fin_,	L));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	F, NULL, new WeaponGuardCurrentChamberFiredOut(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	E, NULL, new WeaponGuardCurrentChamberEmpty(this)));
+		m_fsm.AddTransition(new WeaponTransition(  Chamber_F,	_abt_,	L));
+
+		// fire
+		m_fsm.AddTransition(new WeaponTransition( E,			__T__,	Trigger_E)); // fire cocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_fin_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_dto_,	E));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_E,	_abt_,	E));
+		
+		m_fsm.AddTransition(new WeaponTransition( F,			__T__,	Trigger_F)); // fire uncocked
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_dto_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_F,	_abt_,	F));
+		
+		m_fsm.AddTransition(new WeaponTransition( L,			__T__,	Trigger_L)); // a) fire if not jammed
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_fin_,	F));
+		m_fsm.AddTransition(new WeaponTransition(  Trigger_L,	_abt_,	F));
+		
+
+		// initial state setup
+		bool empty = true;
+		bool discharged = false; // @TODO:
+		WeaponStableState init_state = E;
+		if (empty)
+		{
+			if (!discharged)
+				init_state = E;
+		}
+		else
+		{
+			init_state = L; // can init state == load/jammed?
+		}
+		SetInitialState(init_state);
+
+		SelectionBulletHide();
+
+		m_fsm.Start();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Firearms/SmokeSimulation.c b/scripts/4_World/DayZ/Entities/Firearms/SmokeSimulation.c
new file mode 100644
index 0000000000000000000000000000000000000000..c31f6dea2a3a9ecb5a690bd2819d409a8e8a4baf
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/SmokeSimulation.c
@@ -0,0 +1,51 @@
+class SmokeSimulation : Managed
+{
+	protected Particle 			m_ParMainSmoke;
+	int particle_id;
+	
+	void SmokeSimulation()
+	{
+		particle_id = ParticleList.GRENADE_M18_PURPLE_LOOP;
+	}
+
+	void OnFire( Entity flare)
+	{
+		m_ParMainSmoke = ParticleManager.GetInstance().PlayOnObject( particle_id, flare);
+		m_ParMainSmoke.SetWiggle( 7, 0.3);
+	}
+
+	void ~SmokeSimulation()
+	{
+		if (m_ParMainSmoke)
+			m_ParMainSmoke.Stop();
+	}
+}
+
+class SmokeSimulation_Black : SmokeSimulation
+{
+	void SmokeSimulation_Black()
+	{
+		particle_id = ParticleList.GRENADE_M18_BLACK_LOOP;
+	}
+}
+class SmokeSimulation_White : SmokeSimulation
+{
+	void SmokeSimulation_White()
+	{
+		particle_id = ParticleList.GRENADE_M18_WHITE_LOOP;
+	}
+}
+class SmokeSimulation_Red : SmokeSimulation
+{
+	void SmokeSimulation_Red()
+	{
+		particle_id = ParticleList.GRENADE_M18_RED_LOOP;
+	}
+}
+class SmokeSimulation_Green : SmokeSimulation
+{
+	void SmokeSimulation_Green()
+	{
+		particle_id = ParticleList.GRENADE_M18_GREEN_LOOP;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Firearms/WeaponFSM.c b/scripts/4_World/DayZ/Entities/Firearms/WeaponFSM.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe80838a6660cbbf63b2df6bdf4f8f76ca4c7e34
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/WeaponFSM.c
@@ -0,0 +1,776 @@
+/**@class		WeaponFSM
+ * @brief		weapon finite state machine
+ **/
+class WeaponFSM extends HFSMBase<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase>
+{
+	private static const int MAX_SYNCHRONIZE_ATTEMPTS = 12;
+	private static const int MIN_SYNCHRONIZE_INTERVAL = 3000; // ms
+	private static const int RESET_SYNCHRONIZE_THRESHOLD = 3600000; // ms
+	private int m_SynchronizeAttempts;
+	private int m_LastSynchronizeTime;
+	
+	protected int m_NextStateId = 0; /// counter for InternalID: each state in a fsm is assigned an unique number
+	protected ref array<WeaponStateBase> m_UniqueStates = new array<WeaponStateBase>; /// unique list of states in this machine (automation of save/load)
+
+	protected void SetInternalID(WeaponStateBase state)
+	{
+		if (state && state.GetInternalStateID() == -1)
+		{
+			state.SetInternalStateID(m_NextStateId);
+
+			//if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] " + Object.GetDebugName(m_weapon) + " unique state=" + state + " has id=" + m_NextStateId); }
+			m_UniqueStates.Insert(state);
+			++m_NextStateId;
+		}
+	}
+
+	/**@fn		AddTransition
+	 * @brief	adds transition into transition table
+	 * As a side effect registers the state(s) into m_UniqueStates
+	 **/
+	override void AddTransition(FSMTransition<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> t)
+	{
+		super.AddTransition(t);
+
+		SetInternalID(t.m_srcState);
+		SetInternalID(t.m_dstState);
+	}
+	
+	override protected ProcessEventResult ProcessLocalTransition(FSMTransition<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> t, WeaponEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] (local) state=" + t.m_srcState.ToString() + "-------- event=" + e.ToString() + "[G=" + t.m_guard.ToString() +"]/A=" + t.m_action.ToString() + " --------|> dst=" + t.m_dstState.ToString());
+		
+		if (t.m_action)
+			t.m_action.Action(e);	// 2) execute transition action (if any)
+
+		m_State = t.m_dstState;		// 3) change state to new
+
+		if (t.m_dstState != NULL)
+		{
+			m_State.OnEntry(e);		// 4a) call onEntry on new state
+
+			if (GetOwnerState())
+				GetOwnerState().OnSubMachineChanged(t.m_srcState, t.m_dstState);	// 5a) notify owner state about change in submachine
+			
+			if (m_State)
+				m_State.OnStateChanged(t.m_srcState, t.m_dstState); // 5b) notify current state about change in machine
+
+			ValidateAndRepair();
+			return ProcessEventResult.FSM_OK;
+		}
+		else
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] terminating fsm: state=" + t.m_srcState.ToString() + " event=" + e.ToString());
+			
+			if (GetOwnerState())
+				GetOwnerState().OnSubMachineChanged(t.m_srcState, NULL);	// 5) notify owner state about change in submachine
+			ValidateAndRepair();
+			return ProcessEventResult.FSM_TERMINATED; // 4b) or terminate
+		}
+	}
+	
+	override protected ProcessEventResult ProcessAbortTransition(FSMTransition<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> t, WeaponEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] (local abort) state=" + t.m_srcState.ToString() + "-------- ABORT event=" + e.ToString() + "[G=" + t.m_guard.ToString() +"]/A=" + t.m_action.ToString() + " --------|> dst=" + t.m_dstState.ToString());
+		
+		if (t.m_action)
+			t.m_action.Action(e);	// 2) execute transition action (if any)
+
+		auto tmp = t.m_srcState.GetParentState();
+		if (tmp == t.m_dstState.GetParentState())
+		{
+			m_State = t.m_dstState;		// 3) change state to new (or NULL)
+
+			if (t.m_dstState != NULL)
+			{
+				m_State.OnEntry(e);		// 4a1) call onEntry on new state (see 4a2) )
+				ValidateAndRepair();
+				return ProcessEventResult.FSM_OK;
+			}
+			else
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] abort & terminating fsm: state=" + t.m_srcState.ToString() + " event=" + e.ToString());
+
+				return ProcessEventResult.FSM_TERMINATED; // 4b) or terminate
+			}
+		}
+		else
+		{
+			m_State = NULL;
+			ValidateAndRepair();
+			return ProcessEventResult.FSM_ABORTED; // 4c) or signal abort to parent (with appropriate transition)
+		}
+	}
+	
+	override WeaponStateBase ProcessAbortEvent (WeaponEventBase e, out ProcessEventResult result)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			if (GetOwnerState())
+				fsmDebugPrint("[hfsm] SUB! " + GetOwnerState().Type().ToString() + "::ProcessAbortEvent(" + e.Type().ToString() + ")");
+			else
+				fsmDebugPrint("[hfsm] root::ProcessAbortEvent(" + e.Type().ToString() + ")");
+		}
+		
+		// 1) look in submachine first (if any)
+		if (m_State && m_State.HasFSM())
+		{
+			HFSMBase<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> a = m_State.GetFSM();
+			ProcessEventResult subfsm_res;
+			WeaponStateBase abort_dst = a.ProcessAbortEvent(e, subfsm_res);
+
+			switch (subfsm_res)
+			{
+				case ProcessEventResult.FSM_OK:
+				{
+					if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] event processed by sub machine=" + m_State.ToString());
+
+					result = subfsm_res;		// 1.1) submachine accepted event
+					ValidateAndRepair();
+					return NULL;
+				}
+				case ProcessEventResult.FSM_ABORTED:
+				{
+					if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] aborted sub machine=" + m_State.ToString());
+					
+					m_State.OnAbort(e); // 1.2) submachine aborted, abort submachine owner (i.e. this)
+
+					if (GetOwnerState() == abort_dst.GetParentState())
+					{
+						if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] aborted sub machine=" + m_State.ToString() + " & abort destination reached.");
+
+						m_State = abort_dst;
+						m_State.OnEntry(e);		// 1.3) submachine aborted, call onEntry on new state (cross-hierarchy transition)
+						result = ProcessEventResult.FSM_OK;
+						ValidateAndRepair();
+						return NULL;
+					}
+					else
+					{
+						result = ProcessEventResult.FSM_ABORTED; // 1.4) submachine has aborted, look for destination state in parent
+						ValidateAndRepair();
+						return NULL;
+					}
+
+					break;
+				}
+				case ProcessEventResult.FSM_TERMINATED:
+				{
+					break; // submachine has finished, look for local transitions from exited submachine
+				}
+				case ProcessEventResult.FSM_NO_TRANSITION:
+				{
+					if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] aborted (but no transition) sub machine=" + m_State.ToString());
+
+					break; // submachine has no transition, look for transitions in local machine
+				}
+			}
+		}
+
+		// 2) local transitions
+		int i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] abort event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+
+			result = ProcessEventResult.FSM_NO_TRANSITION;
+			ValidateAndRepair();
+			return NULL;
+		}
+		
+		m_State.OnAbort(e);
+		
+		i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] abort event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+
+			result = ProcessEventResult.FSM_NO_TRANSITION;
+			ValidateAndRepair();
+			return NULL;
+		}
+
+		FSMTransition<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> t = m_Transitions.Get(i);
+		ProcessEventResult res = ProcessAbortTransition(t, e);
+		result = res;
+		switch (res)
+		{
+			case ProcessEventResult.FSM_OK:
+			{
+				//if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm] abort event processed by machine=" + m_State.ToString());
+				ValidateAndRepair();
+				return NULL; // machine accepted event
+			}
+			case ProcessEventResult.FSM_ABORTED:
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] aborted sub machine=" + m_State.ToString() + " will fall-through to dst=" + t.m_dstState);
+
+				ValidateAndRepair();
+				return t.m_dstState; // store destination state for parent(s)
+			}
+
+			case ProcessEventResult.FSM_TERMINATED:
+			{
+				if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] aborted & terminated sub machine=" + m_State.ToString());
+				
+				break; // submachine has finished, look for local transitions from exited submachine
+			}
+			case ProcessEventResult.FSM_NO_TRANSITION:
+			{	
+				break; // submachine has no transition, look for transitions in local machine
+			}
+		}
+		return NULL;
+	}	
+	
+	override ProcessEventResult ProcessEvent (WeaponEventBase e)
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			if (GetOwnerState())
+				fsmDebugPrint("[hfsm] SUB!::" + GetOwnerState().Type().ToString() + "::ProcessEvent(" + e.Type().ToString() + ")");
+			else
+				fsmDebugPrint("[hfsm] root::ProcessEvent(" + e.Type().ToString() + " =" + e.DumpToString());
+		}
+		
+		// 1) completion transitions have priority (if any)
+		if (m_HasCompletions)
+			ProcessCompletionTransitions();
+
+		// 2) submachine then (if any)
+		if (m_State && m_State.HasFSM())
+		{
+			ProcessEventResult subfsm_res = m_State.ProcessEvent(e);
+
+			switch (subfsm_res)
+			{
+				case ProcessEventResult.FSM_OK:
+				{
+					if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[hfsm] event processed by sub machine=" + m_State.ToString());
+					return subfsm_res; // submachine accepted event
+				}
+				case ProcessEventResult.FSM_TERMINATED:
+				{
+					break; // submachine has finished, look for local transitions from exited submachine
+				}
+				case ProcessEventResult.FSM_NO_TRANSITION:
+				{	
+					break; // submachine has no transition, look for transitions in local machine
+				}
+			}
+		}
+
+		// 3) local transitions
+		int i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+			
+			return ProcessEventResult.FSM_NO_TRANSITION;
+		}
+		
+		m_State.OnExit(e);
+		
+		// 3.5) find correct transition after handled exit
+		i = FindFirstUnguardedTransition(e);
+		if (i == -1)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) fsmDebugPrint("[hfsm] event has no transition: src=" + m_State.ToString() + " e=" + e.Type().ToString());
+			
+			return ProcessEventResult.FSM_NO_TRANSITION;
+		}
+
+		FSMTransition<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> row = m_Transitions.Get(i);
+		ProcessEventResult res;
+		if (row.m_dstState != NULL)
+		{
+			// this is regular transition
+			if (row.m_srcState.GetParentState() == row.m_dstState.GetParentState())
+				res = LocalTransition(i, e); // transition is within this state machine
+			else
+				Error("cross-hierarchy transition or misconfigured transition detected!");
+				//res = HierarchicTransition(i, e); // transition has to cross hierarchy
+		}
+		else
+		{
+			// this is terminating transition
+			if (row.m_srcState.GetParentState() == GetOwnerState())
+				res = LocalTransition(i, e); // terminating transition is within this state machine
+			else
+				Error("cross-hierarchy transition or misconfigured transition detected!");
+				//res = HierarchicTransition(i, e); // source node crosses hierarchy (terminate lies always within this machine)
+		}
+		return res;
+	}
+
+	/**@fn		FindStateForInternalID
+	 * @brief	retrieve base state that matches given internal id
+	 * @param[in]	id	the id stored in database during save
+	 **/
+	WeaponStateBase FindStateForInternalID(int id)
+	{
+		int state_count = m_UniqueStates.Count();
+		for (int idx = 0; idx < state_count; ++idx)
+		{
+			int state_id = m_UniqueStates.Get(idx).GetInternalStateID();
+			if (state_id == id)
+				return m_UniqueStates.Get(idx);
+		}
+		return null;
+	}
+
+	/**@fn		FindStableStateForID
+	 * @brief	load from database - reverse lookup for state from saved id
+	 * @param[in]	id	the id stored in database during save
+	 **/
+	WeaponStableState FindStableStateForID(int id)
+	{
+		if (id == 0)
+			return null;
+
+		int count = m_Transitions.Count();
+		for (int i = 0; i < count; ++i)
+		{
+			WeaponTransition trans = m_Transitions.Get(i);
+			WeaponStableState state = WeaponStableState.Cast(trans.m_srcState);
+			if (state && id == state.GetCurrentStateID())
+				return state;
+		}
+		return null;
+	}
+
+	protected bool LoadAndSetCurrentFSMState(ParamsReadContext ctx, int version)
+	{
+		int curr_state_id = -1;
+		if (!ctx.Read(curr_state_id))
+		{
+			Error("[wpnfsm] LoadCurrentFSMState - cannot read current state");
+			return false;
+		}
+
+		WeaponStateBase state = FindStateForInternalID(curr_state_id);
+		if (state)
+		{
+			Terminate();
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] synced current state=" + state + " id=" + curr_state_id); }	
+			m_State = state;	
+			Start(null, true);
+			return true;
+		}
+		else
+			Error("[wpnfsm] LoadCurrentFSMState - cannot find state for id=" + curr_state_id);
+		return false;
+
+	}
+
+	/**@fn		LoadCurrentFSMState
+	 * @brief	load current state of fsm
+	 **/
+	bool LoadCurrentFSMState(ParamsReadContext ctx, int version)
+	{
+		if (LoadAndSetCurrentFSMState(ctx, version))
+		{
+			bool res = m_State.LoadCurrentFSMState(ctx, version);
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] LoadCurrentFSMState - loaded current state=" + GetCurrentState()); }
+			return res;
+		}
+		return false;
+	}
+	
+	bool LoadCurrentUnstableFSMState(ParamsWriteContext ctx, int version)
+	{
+		if (LoadAndSetCurrentFSMState(ctx, version))
+		{
+			// read all substates
+			int state_count = m_UniqueStates.Count();
+			for (int idx = 0; idx < state_count; ++idx)
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] LoadCurrentUnstableFSMState " + idx + "/" + state_count + " id=" + m_UniqueStates.Get(idx).GetInternalStateID() + " state=" + m_UniqueStates.Get(idx)); }
+				if (!m_UniqueStates.Get(idx).LoadCurrentFSMState(ctx, version))
+					Error("[wpnfsm] LoadCurrentUnstableFSMState - cannot load unique state " + idx + "/" + state_count + " with id=" + m_UniqueStates.Get(idx).GetInternalStateID() + " state=" + m_UniqueStates.Get(idx));
+			}
+			return true;
+		}
+		return false;
+	}
+
+	/**@fn		SaveCurrentFSMState
+	 * @brief	save current state of fsm
+	 **/
+	bool SaveCurrentFSMState(ParamsWriteContext ctx)
+	{
+		WeaponStateBase state = GetCurrentState();
+		int curr_state_id = state.GetInternalStateID();
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] SaveCurrentFSMState - saving current state=" + GetCurrentState() + " id=" + curr_state_id); }
+
+		if (!ctx.Write(curr_state_id))
+		{
+			Error("[wpnfsm] SaveCurrentFSMState - cannot save curr_state_id=" + curr_state_id);
+			return false;
+		}
+
+		// write only current state
+		if (!state.SaveCurrentFSMState(ctx))
+		{
+			Error("[wpnfsm] SaveCurrentFSMState - cannot save currrent state=" +state);
+			return false;
+		}
+		return true;
+	}
+	
+	bool SaveCurrentUnstableFSMState(ParamsWriteContext ctx)
+	{
+		WeaponStateBase state = GetCurrentState();
+		int curr_state_id = state.GetInternalStateID();
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] SaveCurrentUnstableFSMState - saving current state=" + GetCurrentState() + " id=" + curr_state_id); }
+		
+		if (!ctx.Write(curr_state_id))
+		{
+			Error("[wpnfsm] SaveCurrentFSMState - cannot save curr_state_id=" + curr_state_id);
+			return false;
+		}
+
+		// write all substates
+		int state_count = m_UniqueStates.Count();
+		for (int idx = 0; idx < state_count; ++idx)
+		{
+			int state_id = m_UniqueStates.Get(idx).GetInternalStateID();
+			if (state_id != -1)
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugSpam("[wpnfsm] SaveCurrentUnstableFSMState " + idx + "/" + state_count + " id=" + state_id + " name=" + m_UniqueStates.Get(idx)); }
+				if (!m_UniqueStates.Get(idx).SaveCurrentFSMState(ctx))
+					Error("SaveCurrentUnstableFSMState - cannot save unique state=" + m_UniqueStates.Get(idx) + " idx=" + idx + "/" + state_count + " with id=" + state_id);
+			}
+			else
+				Error("[wpnfsm] SaveCurrentUnstableFSMState state=" + m_UniqueStates.Get(idx) + " with unassigned ID!");
+		}
+		return true;
+	}
+	
+    /**@fn		ValidateAndRepair
+	 * @brief	validate the state of the gun and repair if mismatch
+	 **/
+	void ValidateAndRepair()
+	{
+		Internal_ValidateAndRepair();
+	}
+	
+	/**@fn		Internal_ValidateAndRepair
+	 * @brief	validate the state of the gun and repair if mismatch
+	 * @return	bool whether it performed repairing or not
+	 **/
+	protected bool Internal_ValidateAndRepair()
+	{
+		bool repaired = false;
+		
+		// Only repair stable states
+		WeaponStableState state = WeaponStableState.Cast(m_State);				
+		if (state && state.IsRepairEnabled())
+		{		
+			Weapon_Base weapon = state.m_weapon;
+			if (weapon)
+			{				
+				repaired |= ValidateAndRepairHelper(weapon,
+						"MagazineRepair",
+						state.HasMagazine(), ( weapon.GetMagazine(0) != null ),
+						new WeaponEventAttachMagazine, new WeaponEventDetachMagazine,
+						state);
+				
+				repaired |= ValidateAndRepairHelper(weapon,
+						"JammedRepair",
+						state.IsJammed(), weapon.IsJammed(),
+						new WeaponEventTriggerToJam, new WeaponEventUnjam,
+						state);
+				
+				if (weapon.IsJammed())
+					return repaired;
+				
+				int nMuzzles = weapon.GetMuzzleCount();
+				switch (nMuzzles)
+				{
+					case 1:
+					{
+						repaired |= ValidateAndRepairHelper(weapon,
+							"ChamberFiredRepair",
+							state.IsChamberFiredOut(0), weapon.IsChamberFiredOut(0),
+							new WeaponEventTrigger, new WeaponEventMechanism,
+							state);
+					
+						repaired |= ValidateAndRepairHelper(weapon,
+							"ChamberRepair",
+							state.IsChamberFull(0), weapon.IsChamberFullEx(0),
+							new WeaponEventLoad1Bullet, new WeaponEventMechanism,
+							state);
+						
+						break;
+					}
+					default:
+					{		
+						for (int i = 0; i < nMuzzles; ++i)
+						{
+							repaired |= ValidateAndRepairHelper(weapon,
+								"ChamberFiredRepair",
+								state.IsChamberFiredOut(i), weapon.IsChamberFiredOut(i),
+								null, null, // A bit brute forced, not really any clean way to transition
+								state);
+					
+							repaired |= ValidateAndRepairHelper(weapon,
+								"ChamberRepair",
+								state.IsChamberFull(i), weapon.IsChamberFull(i),
+								null, null, // A bit brute forced, not really any clean way to transition
+								state);
+						}
+					
+						break;
+					}
+				}
+			}
+		}
+
+		return repaired;
+	}
+	
+	protected bool ValidateAndRepairHelper(Weapon_Base weapon, string name, bool stateCondition, bool gunCondition, WeaponEventBase e1, WeaponEventBase e2, out WeaponStableState state)
+	{
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + weapon.GetDebugName(weapon) + " ValidateAndRepair - " + name + " - " + m_State + " - state: " + stateCondition + " & weapon: " + gunCondition); }
+		
+		if (stateCondition != gunCondition)
+		{
+			WeaponStableState repairedState;
+			
+			// Seeing this message is not TOO bad, it just means this system is working
+			// It is simply being listed in the logs to identify how much the FSM state and weapon state still desyncs
+			// Which can be because of a myriad of causes, such as incorrectly set up transitions
+			// Or simply certain timings of certain actions or interrupts lined up perfectly, which can have repro rates such as 1/300
+			Error(string.Format("[wpnfsm] ValidateAndRepair Attempting to repair: %1 - %2 - %3 - state: %4 != weapon: %5",
+				weapon.GetDebugName(weapon), name, m_State, stateCondition, gunCondition));
+			
+			if (e1 && e2)
+				repairedState = ValidateAndRepairStateFinder(gunCondition, e1, e2, state);
+			
+			if (repairedState)
+			{
+				Terminate();
+				m_State = repairedState;
+				Start(null, true);
+				state = repairedState;
+				weapon.SyncSelectionState(state.HasBullet(), state.HasMagazine());
+				repairedState.SyncAnimState();
+
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + weapon.GetDebugName(weapon) + " ValidateAndRepair - " + name + " - Result - " + m_State); }
+				return true;
+			}
+			else
+			{
+				// Last ditch effort
+				if (m_SynchronizeAttempts < MAX_SYNCHRONIZE_ATTEMPTS)
+				{
+					int currentTime = g_Game.GetTime();
+					int timeDiff = currentTime - m_LastSynchronizeTime;
+					
+					// Careful with calling synchronize
+					if (timeDiff > MIN_SYNCHRONIZE_INTERVAL)
+					{
+						// If a lot of time passed since last attempt
+						// There is a possibility the weapon was fixed for a period
+						if (timeDiff > RESET_SYNCHRONIZE_THRESHOLD)
+							m_SynchronizeAttempts = 0;
+						
+						// Only call this on server or in SP
+						// Synchronize will ask the server for its FSM state anyways
+						if (g_Game.IsServer())
+							weapon.RandomizeFSMState();
+						
+						weapon.Synchronize();
+							
+						++m_SynchronizeAttempts;
+						m_LastSynchronizeTime = currentTime;
+					}
+				}
+				else
+				{
+					OnFailThresholdBreached(weapon, name, stateCondition, gunCondition);
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	protected void OnFailThresholdBreached(Weapon weapon, string name, bool stateCondition, bool gunCondition)
+	{
+		// Now seeing THIS one, after the one above, THIS one CAN be bad
+		// As the state was identified as being desynced with the actual weapon state
+		// But the system was unable to fix it, so the weapon is now working improperly or not at all
+		// There is even the possibility that this weapon is now permanently broken
+		Error(string.Format("[wpnfsm] %1 ValidateAndRepair THRESHOLD BREACH - %2 - %3 - state: %4 != weapon: %5",
+					weapon.GetDebugName(weapon), name, m_State, stateCondition, gunCondition));
+		
+		// At this point might even consider just deleting the weapon :c
+	}
+	
+	protected WeaponStableState ValidateAndRepairStateFinder(bool condition, WeaponEventBase e1, WeaponEventBase e2, WeaponStableState state)
+	{
+		WeaponStateBase interState;
+		if (condition)
+			interState = FindTransitionState(state, e1);
+		else
+			interState = FindTransitionState(state, e2);
+			
+		WeaponEventBase e = new WeaponEventHumanCommandActionFinished;
+		return WeaponStableState.Cast(FindGuardedTransitionState(interState, e));
+	}
+	
+	/**@fn		OnStoreLoad
+	 * @brief	load state of fsm
+	 **/
+	bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		int id = 0;
+		ctx.Read(id);
+		WeaponStableState state = FindStableStateForID(id);
+		if (state)
+		{
+			Terminate();
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] OnStoreLoad - loading current state=" + state + " id=" + id); }	
+			m_State = state;
+			Start(null, true);
+		}
+		else
+		{
+			Print("[wpnfsm] Warning! OnStoreLoad - cannot load curent weapon state, id=" + id);
+		}
+
+		return true;
+	}
+
+	/**@fn		GetCurrentStateID
+	 * @brief	tries to return identifier of current stable state
+	 *
+	 * if the weapon is in stable state, i.e. not reloading, firing, detaching, ... than
+	 * the identifier of the stable state is used directly.
+	 * otherwise if the weapon is in unstable state, than the function uses abort information
+	 * to determine the closest stable state that is coherent with weapon's state.
+	 *
+	 * @return	integer id that will be stored to database
+	 **/
+	int GetCurrentStableStateID()
+	{
+		// 1) if current state is stable state then return ID directly
+		WeaponStableState state = WeaponStableState.Cast(GetCurrentState());
+		if (state)
+			return state.GetCurrentStateID();
+
+		// 2) otherwise find closest stable state (by looking on abort event)
+		WeaponStateBase abort_dst = FindAbortDestinationState(new WeaponEventHumanCommandActionAborted(null));
+		WeaponStableState closest_stable_state = WeaponStableState.Cast(abort_dst);
+		
+		if (closest_stable_state)
+		{
+			Print("[wpnfsm] Save occured in fsm transition! current state=" + GetCurrentState() + " closes stable state=" + closest_stable_state + " id=" + closest_stable_state.GetCurrentStateID());
+			return closest_stable_state.GetCurrentStateID();
+		}		
+
+		Print("[wpnfsm] Warning! Save occured in fsm transition! GetCurrentStateID - cannot find closest weapon stable state.");
+		return 0;
+	}
+
+	/**@fn		GetCurrentStateID
+	 * @brief	return internal identifier of current state
+	 **/
+	int GetInternalStateID()
+	{
+		WeaponStateBase curr = GetCurrentState();
+		int id = 0;
+		if (curr)
+			id = curr.GetInternalStateID();
+		return id;
+	}
+
+	/**@fn		OnStoreSave
+	 * @brief	save state of fsm
+	 **/
+	void OnStoreSave(ParamsWriteContext ctx)
+	{
+		int id = GetCurrentStableStateID();
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugSpamALot("[wpnfsm] OnStoreSave - saving current state=" + GetCurrentState() + " id=" + id); }
+		ctx.Write(id);
+	}
+
+	/**@fn		RandomizeFSMState
+	 * @brief	Deprecated, use RandomizeFSMStateEx for better results
+	 **/
+	void RandomizeFSMState(bool hasBullet, bool hasMagazine, bool isJammed)
+	{
+		array<MuzzleState> muzzleStates;
+		if (hasBullet)
+			muzzleStates = { MuzzleState.L };
+		else
+			muzzleStates = { MuzzleState.E };
+		
+		RandomizeFSMStateEx(muzzleStates, hasMagazine, isJammed);
+	}
+	
+	/**@fn		RandomizeFSMStateEx
+	 * @brief	With the parameters given, selects a random suitable state for the FSM of the weapon
+	 * @NOTE:	It is better to use Weapon_Base.RandomizeFSMState instead of calling this one
+	 * @WARNING:	Weapon_Base.Synchronize call might be needed, if this method is called while clients are connected
+	 **/
+	void RandomizeFSMStateEx(array<MuzzleState> muzzleStates, bool hasMagazine, bool isJammed)
+	{
+		array<WeaponStableState> candidates = new array<WeaponStableState>;
+		int tc = m_Transitions.Count();
+		foreach (WeaponTransition trans : m_Transitions)
+		{
+			WeaponStableState state = WeaponStableState.Cast(trans.m_srcState);
+			if (state && state.HasMagazine() == hasMagazine && state.IsJammed() == isJammed)
+			{
+				if (state.IsSingleState())
+				{
+					// There is only one, insert it and stop
+					candidates.Insert(state);
+					break;
+				}
+				
+				int nMuzzles = muzzleStates.Count();
+				int nMuzzlesState = state.GetMuzzleStateCount();
+				if (nMuzzles != nMuzzlesState)
+				{
+					ErrorEx(string.Format("Number of muzzles on the weapon (%1) does not correspond with what state has configured (%2).", nMuzzles, nMuzzlesState));
+					continue;
+				}
+				
+				bool equal = true;
+				for (int i = 0; i < nMuzzles; ++i)
+				{
+					if (muzzleStates[i] != state.GetMuzzleState(i))
+					{
+						equal = false;
+						break;
+					}
+				}
+
+				if (equal)
+					candidates.Insert(state);
+			}
+		}
+
+		int cc = candidates.Count();
+		if (cc)
+		{
+			int randomIndex = Math.RandomInt(0, cc);
+			WeaponStableState selected = candidates.Get(randomIndex);
+			Terminate();
+			m_State = selected;
+			if (!Internal_ValidateAndRepair())
+				Start(null, true);
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] RandomizeFSMState - randomized current state=" + m_State + " id=" + selected.GetCurrentStateID()); }
+			selected.SyncAnimState();
+		}
+		else
+		{
+			if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] RandomizeFSMState - warning - cannot randomize, no states available"); }
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Firearms/Weapon_Base.c b/scripts/4_World/DayZ/Entities/Firearms/Weapon_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..388ef82995a7dab02c85b01c369e6f9746217b22
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Firearms/Weapon_Base.c
@@ -0,0 +1,1842 @@
+/**@class		AbilityRecord
+ * @brief		pair ( action, actionType )
+ **/
+class AbilityRecord
+{
+	int m_action; /// corresponds to Human::actions == RELOAD, MECHANISM, ...
+	int m_actionType; /// corresponds to Human::actionTypes == CHAMBERING_ONEBULLET_CLOSED, MECHANISM_CLOSED...
+	void AbilityRecord (int a, int at) { m_action = a; m_actionType = at; }
+};
+
+enum WeaponWithAmmoFlags
+{
+	//! Attached magazine will be full and no round will be chambered
+	NONE = 0,
+	//! Chambers bullets
+	CHAMBER = 1,
+	//! Maybe chambers bullets (sequential rng) example: 1 1 1 0 0 0
+	CHAMBER_RNG = 2,
+	//! Maybe chambers bullets (full random) example: 0 1 0 0 1 1 
+	CHAMBER_RNG_SPORADIC = 4,
+	//! Randomizes the quantity of the bullets in the spawned magazine
+	QUANTITY_RNG = 8,
+	//! Fully randomizes the ammo type instead of picking one random for the entire mag (needs to have type as empty string)
+	AMMO_MAG_RNG = 16,
+	//! Fully randomizes the ammo type instead of picking one random for all chambers (needs to have type as empty string)
+	AMMO_CHAMBER_RNG = 32,
+	//! Instead of randomizing when type is empty, it looks for the one which has the highest capacity
+	MAX_CAPACITY_MAG = 64,
+}
+
+typedef FSMTransition<WeaponStateBase, WeaponEventBase, WeaponActionBase, WeaponGuardBase> WeaponTransition; /// shorthand
+
+/**@class		Weapon_Base
+ * @brief		script base for all weapons
+ *
+ * @NOTE: this class is bound to core-config "Weapon_Base" config class
+ **/
+class Weapon_Base extends Weapon
+{
+	//! Full highest capacity magazine + chambered round
+	const int SAMF_DEFAULT = WeaponWithAmmoFlags.CHAMBER | WeaponWithAmmoFlags.MAX_CAPACITY_MAG;
+	//! Random bullet quantity + maybe chambered round
+	const int SAMF_RNG = WeaponWithAmmoFlags.CHAMBER_RNG | WeaponWithAmmoFlags.QUANTITY_RNG;
+	
+	protected const float DEFAULT_DAMAGE_ON_SHOT = 0.05;
+	protected ref array<ref AbilityRecord> m_abilities = new array<ref AbilityRecord>;		/// weapon abilities
+	protected ref WeaponFSM m_fsm;	/// weapon state machine
+	protected bool m_isJammed = false;
+	protected bool m_LiftWeapon = false;
+	protected bool m_BayonetAttached;
+	protected bool m_ButtstockAttached;
+	protected bool m_Charged = false;
+	protected bool m_WeaponOpen = false;
+	protected int m_BurstCount;
+	protected int m_BayonetAttachmentIdx;
+	protected int m_ButtstockAttachmentIdx;
+	protected int m_weaponAnimState = -1; /// animation state the weapon is in, -1 == uninitialized
+	protected int m_magazineSimpleSelectionIndex = -1;
+	protected int m_weaponHideBarrelIdx = -1; //index in simpleHiddenSelections cfg array
+	protected float m_DmgPerShot = 0; //default is set to zero, since C++ solution has been implemented. See 'damageBarrel' and 'barrelArmor' in configs.
+	protected float m_WeaponLength;
+	protected float m_WeaponLiftCheckVerticalOffset;
+	protected float m_ShoulderDistance;
+	protected vector m_LastLiftPosition;
+	ref array<int> m_bulletSelectionIndex = new array<int>;
+	ref array<float> m_DOFProperties;
+	ref array<float> m_ChanceToJam = new array<float>;
+	protected float m_ChanceToJamSync = 0;
+	protected ref PropertyModifiers m_PropertyModifierObject;
+	protected PhxInteractionLayers hit_mask = PhxInteractionLayers.CHARACTER | PhxInteractionLayers.BUILDING | PhxInteractionLayers.DOOR | PhxInteractionLayers.VEHICLE | PhxInteractionLayers.ROADWAY | PhxInteractionLayers.TERRAIN | PhxInteractionLayers.ITEM_SMALL | PhxInteractionLayers.ITEM_LARGE | PhxInteractionLayers.FENCE | PhxInteractionLayers.AI;
+
+	void Weapon_Base()
+	{
+		//m_DmgPerShot		= ConfigGetFloat("damagePerShot");
+		m_BayonetAttached 	= false;
+		m_ButtstockAttached = false;
+		m_BayonetAttachmentIdx = -1;
+		m_ButtstockAttachmentIdx = -1;
+		m_BurstCount = 0;
+		m_DOFProperties = new array<float>;
+		
+		if ( ConfigIsExisting("simpleHiddenSelections") )
+		{
+			TStringArray selectionNames = new TStringArray;
+			ConfigGetTextArray("simpleHiddenSelections",selectionNames);
+			m_weaponHideBarrelIdx = selectionNames.Find("hide_barrel");
+			m_magazineSimpleSelectionIndex = selectionNames.Find("magazine");
+			
+			int bulletIndex = selectionNames.Find("bullet");
+			if ( bulletIndex != -1 )
+			{ 
+				m_bulletSelectionIndex.Insert(bulletIndex);
+			
+				for (int i = 2; i < 100; i++)
+				{
+					bulletIndex = selectionNames.Find(string.Format("bullet%1",i));
+					if (bulletIndex != -1)
+					{
+						m_bulletSelectionIndex.Insert(bulletIndex);
+					}
+					else
+					{
+						break;
+					}
+				}
+			}
+		}
+		
+		InitWeaponLength();
+		InitWeaponLiftCheckVerticalOffset();
+		InitShoulderDistance();
+		InitDOFProperties(m_DOFProperties);
+		if (GetGame().IsServer())
+		{
+			InitReliability(m_ChanceToJam);
+		}
+		InitStateMachine();
+	}
+
+	void InitStateMachine() { }
+	
+	override void EEInit()
+	{
+		super.EEInit();
+		
+		if (GetGame().IsServer())
+		{
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Call( AssembleGun );
+		}
+	}
+	
+	void SetInitialState(WeaponStableState initState)
+	{
+		m_fsm.SetInitialState(initState);
+		SetCharged(!initState.IsDischarged());
+		SetWeaponOpen(!initState.IsWeaponOpen());
+		SetGroundAnimFrameIndex(initState.m_animState);
+	}
+	
+	bool IsCharged()
+	{
+		return m_Charged;
+	}
+	
+	void SetCharged(bool value)
+	{
+		m_Charged = value;
+	}	
+	
+	bool IsWeaponOpen()
+	{
+		return m_WeaponOpen;
+	}
+	
+	void SetWeaponOpen(bool value)
+	{
+		m_WeaponOpen = value;
+	}
+
+	override protected float GetWeightSpecialized(bool forceRecalc = false)
+	{
+		float baseWeight = GetInventoryAndCargoWeight(forceRecalc);
+		float ammoWeight;
+		float ammoDamage;
+		string bulletTypeName, ammoTypeName;
+		
+		int muzzleCount = GetMuzzleCount();
+		#ifdef DEVELOPER
+		if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+		{
+			WeightDebugData data1 = WeightDebug.GetWeightDebug(this);
+			data1.SetCalcDetails("TWPN: " + m_ConfigWeight+"(item weight) + " + baseWeight +"(contents weight)" );
+		}
+		#endif
+		for (int muzzleIndex = 0; muzzleIndex < muzzleCount; muzzleIndex++)
+		{
+			//chamber weight
+			if (!IsChamberEmpty(muzzleIndex))
+			{
+				ammoTypeName = GetChamberAmmoTypeName(muzzleIndex);
+				ammoWeight += g_Game.ConfigGetFloat(string.Format("CfgMagazines %1 weight", ammoTypeName));
+				
+				#ifdef DEVELOPER
+				if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+				{
+					WeightDebugData data2 = WeightDebug.GetWeightDebug(this);
+					data2.AddCalcDetails( g_Game.ConfigGetFloat("CfgMagazines " + ammoTypeName + " weight").ToString() +"(chamber weight)");
+				}
+				#endif
+			}
+			
+			//correctly calculates internal magazine weight based on the ammo type of each bullet
+			if (HasInternalMagazine(muzzleIndex))
+			{
+				#ifdef DEVELOPER
+				float debugInternalMagWeight;
+				#endif
+				int cartridgeCount = GetInternalMagazineCartridgeCount(muzzleIndex);
+				for (int cartridgeIndex = 0; cartridgeIndex < cartridgeCount; cartridgeIndex++)
+				{
+					GetInternalMagazineCartridgeInfo(muzzleIndex, cartridgeIndex, ammoDamage, bulletTypeName);
+					ammoWeight += Ammunition_Base.GetAmmoWeightByBulletType(bulletTypeName);
+					#ifdef DEVELOPER
+					debugInternalMagWeight += g_Game.ConfigGetFloat("CfgMagazines " + ammoTypeName + " weight");
+					#endif
+				}
+				#ifdef DEVELOPER
+
+				if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+				{
+					WeightDebugData data3 = WeightDebug.GetWeightDebug(this);
+					data3.AddCalcDetails(debugInternalMagWeight.ToString()+ "(internal mag weight)");
+				}
+				#endif
+			}
+			
+		}
+		return ammoWeight + baseWeight + GetConfigWeightModified();
+	}
+	//! override on weapons with some assembly required
+	void AssembleGun();
+
+	bool CanProcessAction(int action, int actionType)
+	{
+		return false; // @TODO
+	}
+	/**@fn		HasActionAbility
+	 * @brief	query if weapon supports action and actionType
+	 * @param[in]	action	\p	one of Human.actions (i.e. RELOAD, MECHANISM, ...)
+	 * @param[in]	actionType	\p	one of Human.actionTypes (i.e. CHAMBERING_ONEBULLET_CLOSED, MECHANISM_CLOSED...)
+	 * @return	true if weapon supports operation
+	 **/
+	bool HasActionAbility(int action, int actionType)
+	{
+		int count = GetAbilityCount();
+		for (int i = 0; i < count; ++i)
+		{
+			AbilityRecord rec = GetAbility(i);
+			if (rec.m_action == action && rec.m_actionType == actionType)
+				return true;
+		}
+		return false;
+	}
+	/**@fn		GetAbilityCount
+	 * @return number of stored abilities
+	 **/
+	int GetAbilityCount() { return m_abilities.Count(); }
+	/**@fn		GetAbility
+	 * @param[in]	index	\p	index into m_abilities storage
+	 * @return ability record
+	 **/
+	AbilityRecord GetAbility(int index) { return m_abilities.Get(index); }
+
+	/**@fn		CanProcessWeaponEvents
+	 * @return	true if weapon has running fsm
+	 **/
+	bool CanProcessWeaponEvents() { return m_fsm && m_fsm.IsRunning(); }
+
+	/**@fn		GetCurrentState
+	 * @brief		returns currently active state
+	 * @return	current state the FSM is in (or NULL)
+	 **/
+	WeaponStateBase GetCurrentState() { return m_fsm.GetCurrentState(); }
+
+	/**@fn		IsWaitingForActionFinish
+	 * @brief	returns true if state machine started playing action/actionType and waits for finish
+	 **/
+	bool IsWaitingForActionFinish()
+	{
+		return CanProcessWeaponEvents() && GetCurrentState().IsWaitingForActionFinish();
+	}
+
+	bool IsIdle()
+	{
+		return CanProcessWeaponEvents() && GetCurrentState().IsIdle();
+	}
+
+	/**@fn	ProcessWeaponEvent
+	 * @brief	weapon's fsm handling of events
+	 * @NOTE: warning: ProcessWeaponEvent can be called only within DayZPlayer::HandleWeapons (or ::CommandHandler)
+	 **/
+	bool ProcessWeaponEvent(WeaponEventBase e)
+	{
+		SyncEventToRemote(e);
+		
+		// @NOTE: synchronous events not handled by fsm
+		if (e.GetEventID() == WeaponEventID.SET_NEXT_MUZZLE_MODE)
+		{
+			SetNextMuzzleMode(GetCurrentMuzzle());
+			return true;
+		}
+
+		if (m_fsm.ProcessEvent(e) == ProcessEventResult.FSM_OK)
+			return true;
+
+		//if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("FSM refused to process event (no transition): src=" + GetCurrentState().ToString() + " event=" + e.ToString()); }
+		return false;
+	}
+	/**@fn	ProcessWeaponAbortEvent
+	 * @NOTE: warning: ProcessWeaponEvent can be called only within DayZPlayer::HandleWeapons (or ::CommandHandler)
+	 **/
+	bool ProcessWeaponAbortEvent(WeaponEventBase e)
+	{
+		SyncEventToRemote(e);
+		
+		ProcessEventResult aa;
+		m_fsm.ProcessAbortEvent(e, aa);
+		return aa == ProcessEventResult.FSM_OK;
+	}
+
+	bool CanChamberBullet(int muzzleIndex, Magazine mag)
+	{
+		return CanChamberFromMag(muzzleIndex, mag) && (!IsChamberFull(muzzleIndex) || IsChamberFiredOut(muzzleIndex) || !IsInternalMagazineFull(muzzleIndex));
+	}
+
+	void SetWeaponAnimState(int state)
+	{
+		m_weaponAnimState = state;
+		SetGroundAnimFrameIndex(state);
+	}
+	void ResetWeaponAnimState()
+	{
+		if (LogManager.IsWeaponLogEnable()) fsmDebugSpam("[wpnfsm] " + Object.GetDebugName(this) + " resetting anim state: " + typename.EnumToString(PistolAnimState, m_weaponAnimState) + " --> " + typename.EnumToString(PistolAnimState, -1));
+		m_weaponAnimState = -1;
+	}
+	int GetWeaponAnimState() { return m_weaponAnimState; }
+
+	void EEFired(int muzzleType, int mode, string ammoType)
+	{		
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			ItemBase suppressor = GetAttachedSuppressor();
+			
+			// Muzzle flash & overheating effects
+			ItemBase.PlayFireParticles(this, muzzleType, ammoType, this, suppressor, "CfgWeapons" );
+			IncreaseOverheating(this, ammoType, this, suppressor, "CfgWeapons");
+			
+			if (suppressor)
+			{
+				ItemBase.PlayFireParticles(this, muzzleType, ammoType, suppressor, NULL, "CfgVehicles" );
+				suppressor.IncreaseOverheating(this, ammoType, this, suppressor, "CfgVehicles");
+			}
+		}
+		
+		//obsolete, replaced by C++ solution!
+/*
+		if (GetGame().IsServer())
+		{
+			AddHealth("","Health",-m_DmgPerShot); //damages weapon
+			if (suppressor)
+				suppressor.AddHealth("","Health",-m_DmgPerShot); //damages suppressor; TODO add suppressor damage coeficient/parameter (?) to suppressors/weapons (?)
+		}
+*/		
+		//JamCheck(muzzleType);
+		
+		#ifdef DIAG_DEVELOPER
+		MiscGameplayFunctions.UnlimitedAmmoDebugCheck(this);
+		#endif
+	}
+	
+	bool JamCheck(int muzzleIndex )
+	{
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		if ( player )
+		{
+			float rnd = player.GetRandomGeneratorSyncManager().GetRandom01(RandomGeneratorSyncUsage.RGSJam);
+			//Print("Random Jam - " + rnd);
+			if (rnd < GetSyncChanceToJam())
+				return true;
+		}
+		return false;
+	}
+	
+	void ShowBullet(int muzzleIndex)
+	{
+		if ( m_bulletSelectionIndex.Count() > muzzleIndex )
+		{
+			SetSimpleHiddenSelectionState(m_bulletSelectionIndex[muzzleIndex],1);
+		}
+		else
+			SelectionBulletShow();
+	}
+	
+	void HideBullet(int muzzleIndex)
+	{
+		if ( m_bulletSelectionIndex.Count() > muzzleIndex )
+		{
+			SetSimpleHiddenSelectionState(m_bulletSelectionIndex[muzzleIndex],0);
+		}
+		else
+			SelectionBulletHide();
+	}
+	
+	bool IsJammed() { return m_isJammed; }
+	bool CanEjectBullet() {return true;}
+	void SetJammed(bool value) { m_isJammed = value; }
+	float GetSyncChanceToJam() { return m_ChanceToJamSync; }
+	float GetChanceToJam()
+	{
+		int level = GetHealthLevel();
+	
+		if (level >= 0 && level < m_ChanceToJam.Count())
+			return m_ChanceToJam[level];
+		else
+			return 0.0;
+	}
+	
+	void SyncSelectionState(bool has_bullet, bool has_mag)
+	{
+		if (has_bullet)
+		{	
+			string chamberedAmmoTypeName;
+			float chamberedAmmoDmg;
+			
+			if ( GetCartridgeInfo(0, chamberedAmmoDmg, chamberedAmmoTypeName) )
+			{
+				EffectBulletShow(0, chamberedAmmoDmg, chamberedAmmoTypeName);
+			}
+			//ShowBullet(0);
+			SelectionBulletShow();
+		}
+		else
+		{	
+			//HideBullet(0);
+			SelectionBulletHide();
+			EffectBulletHide(0);
+		}
+
+		if (has_mag)
+			ShowMagazine();
+		else
+			HideMagazine();
+	}
+	
+	/*override void EEOnAfterLoad()
+	{
+		super.EEOnAfterLoad();
+		
+		string chamberedAmmoTypeName;
+		float chamberedAmmoDmg;
+
+		if ( GetCartridgeInfo(0, chamberedAmmoDmg, chamberedAmmoTypeName) )
+		{
+			EffectBulletShow(0, chamberedAmmoDmg, chamberedAmmoTypeName);
+		}
+		
+	}*/
+	
+	void ForceSyncSelectionState()
+	{
+		int nMuzzles = GetMuzzleCount();
+		for (int i = 0; i < nMuzzles; ++i)
+		{
+			if (IsChamberFull(i))
+			{
+				ShowBullet(i);
+				float damage;
+				string ammoTypeName;
+				GetCartridgeInfo(i, damage, ammoTypeName);
+				EffectBulletShow(i, damage, ammoTypeName);
+			}
+			else
+			{
+				HideBullet(i);
+				EffectBulletHide(i);
+			}
+			
+			Magazine mag = GetMagazine(i);
+			if (mag)
+				ShowMagazine();
+			else
+				HideMagazine();
+		}
+	}
+
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+		
+		
+		if (version >= 113)
+		{
+			int current_muzzle = 0;
+			if (!ctx.Read(current_muzzle))
+			{
+				Error("Weapon.OnStoreLoad " + this + " cannot read current muzzle!");
+				return false;
+			}
+			
+			if (current_muzzle >= GetMuzzleCount() || current_muzzle < 0)
+				Error("Weapon.OnStoreLoad " + this + " trying to set muzzle index " + current_muzzle + " while it only has " + GetMuzzleCount() + " muzzles!");
+			else
+				SetCurrentMuzzle(current_muzzle);
+		}		
+		
+		if (version >= 105)
+		{
+			int mode_count = 0;
+			if (!ctx.Read(mode_count))
+			{
+				Error("Weapon.OnStoreLoad " + this + " cannot read mode count!");
+				return false;
+			}
+				
+			for (int m = 0; m < mode_count; ++m)
+			{
+				int mode = 0;
+				if (!ctx.Read(mode))
+				{
+					Error("Weapon.OnStoreLoad " + this + " cannot read mode[" + m + "]");
+					return false;
+				}
+				
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(this) + " OnStoreLoad - loaded muzzle[" + m + "].mode = " + mode); }
+				SetCurrentMode(m, mode);
+			}
+		}
+		
+		if ( version >= 106 )
+		{
+			if ( !ctx.Read(m_isJammed) )
+			{
+				Error("Weapon.OnStoreLoad cannot load jamming state");
+				return false;
+			}
+		}
+
+		if (m_fsm)
+		{
+			if (!m_fsm.OnStoreLoad(ctx, version))
+				return false;
+			
+			WeaponStableState wss = WeaponStableState.Cast(m_fsm.GetCurrentState());
+			if (wss)
+			{
+				SetGroundAnimFrameIndex(wss.m_animState);
+			}
+			
+		}
+		else
+		{
+			int dummy = 0;
+			if (!ctx.Read(dummy))
+				return false;
+		}
+
+		return true;
+	}
+
+	void SaveCurrentFSMState(ParamsWriteContext ctx)
+	{
+		if (m_fsm && m_fsm.IsRunning())
+		{
+			if (m_fsm.SaveCurrentFSMState(ctx))
+			{
+				if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(this) + " Weapon=" + this + " state saved."); }
+			}
+			else
+				Error("[wpnfsm] " + Object.GetDebugName(this) + " Weapon=" + this + " state NOT saved.");
+		}
+		else
+			Error("[wpnfsm] " + Object.GetDebugName(this) + " Weapon.SaveCurrentFSMState: trying to save weapon without FSM (or uninitialized weapon) this=" + this + " type=" + GetType());
+	}
+
+	bool LoadCurrentFSMState(ParamsReadContext ctx, int version)
+	{
+		if (m_fsm)
+		{
+			if (m_fsm.LoadCurrentFSMState(ctx, version))
+			{
+				WeaponStableState state = WeaponStableState.Cast(GetCurrentState());
+				if (state)
+				{
+					SyncSelectionState(state.HasBullet(), state.HasMagazine());
+					state.SyncAnimState();
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(this) + " Weapon=" + this + " stable state loaded and synced."); }
+					return true;
+				}
+				else
+				{
+					if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(this) + " Weapon=" + this + " unstable/error state loaded."); }
+					return false;
+				}
+			}
+			else
+			{
+				Error("[wpnfsm] " + Object.GetDebugName(this) + " Weapon=" + this + " did not load.");
+				return false;
+			}
+		}
+		else
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(this) + " Weapon.LoadCurrentFSMState: trying to load weapon without FSM (or uninitialized weapon) this=" + this + " type=" + GetType());
+			return false;
+		}
+	}
+
+	override void AfterStoreLoad()
+	{
+		if (m_fsm)
+		{
+			int mi = GetCurrentMuzzle();
+			Magazine mag = GetMagazine(mi);
+			bool has_mag = mag != null;
+			bool has_bullet = !IsChamberEmpty(mi);
+			SyncSelectionState(has_bullet, has_mag);
+		}
+	}
+
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		// current muzzle added in version 113
+		int current_muzzle = GetCurrentMuzzle();
+		ctx.Write(current_muzzle);
+		
+		// fire mode added in version 105
+		int mode_count = GetMuzzleCount();
+		ctx.Write(mode_count);
+		for (int m = 0; m < mode_count; ++m)
+			ctx.Write(GetCurrentMode(m));
+		
+		ctx.Write(m_isJammed);
+
+		if (m_fsm)
+			m_fsm.OnStoreSave(ctx);
+		else
+		{
+			int dummy = 0;
+			ctx.Write(dummy);
+		}
+	}
+
+	/**@fn		GetCurrentStateID
+	 * @brief	tries to return identifier of current state
+	 **/
+	int GetInternalStateID()
+	{
+		if (m_fsm)
+			return m_fsm.GetInternalStateID();
+		return 0;
+	}
+	
+	/**@fn		GetCurrentStableStateID
+	 * @brief	tries to return identifier of current stable state (or nearest stable state if unstable state is currently running)
+	 **/
+	int GetCurrentStableStateID()
+	{
+		if (m_fsm)
+		{
+			return m_fsm.GetCurrentStableStateID();
+		}
+		return 0;
+	}
+
+	/**@fn		RandomizeFSMState
+	 * @brief	With the parameters given, selects a random suitable state for the FSM of the weapon
+	 * @WARNING:	Weapon_Base.Synchronize call might be needed, if this method is called while clients are connected
+	 **/
+	void RandomizeFSMState()
+	{
+		if (m_fsm)
+		{
+			int mi = GetCurrentMuzzle();
+			Magazine mag = GetMagazine(mi);
+			bool has_mag = mag != null;
+			bool has_bullet = !IsChamberEmpty(mi);
+			bool has_jam = IsJammed();
+			array<MuzzleState> muzzleStates = GetMuzzleStates();
+			m_fsm.RandomizeFSMStateEx(muzzleStates, has_mag, has_jam);
+			ForceSyncSelectionState();
+		}
+	}
+
+	//! Helper method for RandomizeFSMState
+	protected array<MuzzleState> GetMuzzleStates()
+	{
+		array<MuzzleState> muzzleStates = new array<MuzzleState>;
+		
+		int nMuzzles = GetMuzzleCount();
+		for (int i = 0; i < nMuzzles; ++i)
+		{
+			MuzzleState state = MuzzleState.U;
+			if (IsChamberFiredOut(i))
+				state = MuzzleState.F;
+			else if (IsChamberFull(i))
+				state = MuzzleState.L;
+			else if (IsChamberEmpty(i))
+				state = MuzzleState.E;
+			else
+				ErrorEx(string.Format("Unable to identify chamber state of muzzle %1", i));
+			
+			muzzleStates.Insert(state);
+		}
+		
+		return muzzleStates;
+	}
+	
+	/** \name Weapon With Ammo
+	*	Helpers for spawning ammo/magazine in weapon
+	*	For the flags, either a combination of WeaponWithAmmoFlags can be used
+	*	Or one of the preset 'const int' with 'SAMF_' prefix (SAMF_DEFAULT, SAMF_RNG)
+	*/
+	//@{
+
+	/**@fn		CreateWeaponWithAmmo
+	 * @brief	Create weapon with ammo
+	 * @param[in]	weaponType		\p string	The weapon to create
+	 * @param[in]	magazineType	\p string	The magazine to attach or ammo to load, passing in empty string will select random
+	 * @param[in]	flags			\p int		Setup flags, please read WeaponWithAmmoFlags
+	 * @return	The created weapon
+	 **/
+	static Weapon_Base CreateWeaponWithAmmo( string weaponType, string magazineType = "", int flags = WeaponWithAmmoFlags.CHAMBER )
+    {   
+        Weapon_Base wpn = Weapon_Base.Cast(GetGame().CreateObjectEx( weaponType, vector.Zero, ECE_PLACE_ON_SURFACE ));
+    
+        if ( !wpn )
+		{
+			ErrorEx(string.Format("%1 does not exist or is not a weapon.", weaponType));
+            return null;
+		}
+    
+		wpn.SpawnAmmo(magazineType, flags);		
+		return wpn;
+    }
+	
+	/**@fn		SpawnAmmo
+	 * @brief	General method trying to attch magazine, fill inner magazine and fill chamber
+	 * @param[in]	magazineType	\p string	The magazine to attach or ammo to load, passing in empty string will select random
+	 * @param[in]	flags			\p int		Setup flags, please read WeaponWithAmmoFlags
+	 * @return	whether anything was spawned or done
+	 **/
+	bool SpawnAmmo( string magazineType = "", int flags = WeaponWithAmmoFlags.CHAMBER )
+	{
+		// Attempt internal mag
+		if ( HasInternalMagazine(-1) && FillInnerMagazine(magazineType, flags) )
+			return true;
+		
+		// Attempt mag attachment
+		if ( GetMagazineTypeCount(0) > 0 && SpawnAttachedMagazine(magazineType, flags) )
+			return true;
+		
+		// Attempt chamber
+		if ( FillChamber(magazineType, flags) )
+			return true;
+		
+		return false;
+	}
+	
+	/**@fn		SpawnAttachedMagazine
+	 * @brief	Try to spawn and attach a magazine
+	 * @param[in]	magazineType	\p string	The magazine to attach, passing in empty string will select random
+	 * @param[in]	flags			\p int		Setup flags, please read WeaponWithAmmoFlags
+	 * @return	The created magazine or null
+	 **/
+	Magazine SpawnAttachedMagazine( string magazineType = "", int flags = WeaponWithAmmoFlags.CHAMBER )
+	{
+		// Check if the gun has any magazines registered in config
+		if ( GetMagazineTypeCount(0) == 0 )
+		{
+			ErrorEx(string.Format("No 'magazines' config entry for %1.", this));
+			return null;
+		}
+		
+		// Randomize when no specific one is given
+		if ( magazineType == "" )
+		{
+			if ( flags & WeaponWithAmmoFlags.MAX_CAPACITY_MAG)
+				magazineType = GetMaxMagazineTypeName(0);
+			else
+				magazineType = GetRandomMagazineTypeName(0);
+		}
+		
+		EntityAI magAI = GetInventory().CreateAttachment(magazineType);
+		if (!magAI)
+		{
+			ErrorEx(string.Format("Failed to create and attach %1 to %2", GetDebugName(magAI), this));
+			return null;
+		}
+		
+		Magazine mag;
+		if (!CastTo(mag, magAI))
+		{
+			ErrorEx(string.Format("Expected magazine, created: %1", GetDebugName(magAI)));
+			return null;
+		}
+		
+		// Decide random quantity when enabled
+		if (flags & WeaponWithAmmoFlags.QUANTITY_RNG)
+			mag.ServerSetAmmoCount(Math.RandomIntInclusive(0, mag.GetAmmoMax()));
+		
+		// Fill chamber when flagged
+		bool chamberRng = (flags & WeaponWithAmmoFlags.CHAMBER_RNG);
+		bool chamber = (flags & WeaponWithAmmoFlags.CHAMBER) || chamberRng;		
+		if (chamber || chamberRng)
+		{
+			FillChamber(magazineType, flags);
+		}
+
+		// FSM cares about magazine state
+		RandomizeFSMState();
+		Synchronize();
+
+		return mag;
+	}
+
+	/**@fn		FillInnerMagazine
+	 * @brief	Try to fill the inner magazine
+	 * @param[in]	ammoType		\p string	The ammo to load, passing in empty string will select random
+	 * @note 		It is best to fill in the actual 'ammo', as in the ones usually prefixed by 'Bullet_', to skip searching for it
+	 * @param[in]	flags			\p int		Setup flags, please read WeaponWithAmmoFlags
+	 * @return	Whether any ammo was added to the gun or not
+	 **/
+	bool FillInnerMagazine( string ammoType = "", int flags = WeaponWithAmmoFlags.CHAMBER )
+	{
+		// Don't try to fill it when there are none
+		if (!HasInternalMagazine(-1))
+			return false;
+	
+		// Make sure the given ammoType is actually useable
+		if (ammoType != "")
+		{
+			if (!AmmoTypesAPI.MagazineTypeToAmmoType(ammoType, ammoType))
+				return false;
+		}
+		
+		
+		bool didSomething = false;		
+		int muzzCount = GetMuzzleCount();
+		
+		bool ammoRng = ammoType == "";
+		bool ammoFullRng = ammoRng && (flags & WeaponWithAmmoFlags.AMMO_MAG_RNG);
+		
+		// No full RNG flag, so pick one random and use only this one
+		if (ammoRng && !ammoFullRng)
+			ammoType = GetRandomChamberableAmmoTypeName(0);
+		
+		// Fill the internal magazine
+		for (int i = 0; i < muzzCount; ++i)
+		{
+			int ammoCount = GetInternalMagazineMaxCartridgeCount(i);
+			
+			// Decide random quantity when enabled
+			if ( flags & WeaponWithAmmoFlags.QUANTITY_RNG )
+				ammoCount = Math.RandomIntInclusive(0, ammoCount);
+			
+			// Only do the things when there is actually ammo to fill
+			if (ammoCount > 0)
+			{
+				// Push in the cartridges
+				for (int j = 0; j < ammoCount; ++j)
+				{
+					// Full random, decide a new one for every cartridge
+					if ( ammoFullRng )
+						ammoType = GetRandomChamberableAmmoTypeName(i);
+					
+					PushCartridgeToInternalMagazine(i, 0, ammoType);
+					didSomething = true;
+				}
+			}
+		}
+		
+		// Call the chamber method if asked for
+		bool chamber = (flags & WeaponWithAmmoFlags.CHAMBER) || (flags & WeaponWithAmmoFlags.CHAMBER_RNG);
+		if (chamber && FillChamber(ammoType, flags))
+		{
+			didSomething = true;
+		}
+		
+		// Does not need any FSM fixing, FSM does not care about inner magazines
+		
+		return didSomething;
+	}
+	
+	/**@fn		FillChamber
+	 * @brief	Try to fill the chamber
+	 * @param[in]	ammoType		\p string	The ammo to load, passing in empty string will select random
+	 * @note 		It is best to fill in the actual 'ammo', as in the ones usually prefixed by 'Bullet_', to skip searching for it
+	 * @param[in]	flags			\p int		Setup flags, please read WeaponWithAmmoFlags
+	 * @return	Whether any chamber was filled
+	 **/
+	bool FillChamber( string ammoType = "", int flags = WeaponWithAmmoFlags.CHAMBER )
+	{
+		// Quickly check if there are any chambers we can fill
+		int muzzCount = GetMuzzleCount();
+		bool anyEmpty = false;
+		
+		for (int m = 0; m < muzzCount; ++m)
+		{
+			if (IsChamberEmpty(m))
+			{
+				anyEmpty = true;
+				break;
+			}
+		}
+
+		if (!anyEmpty)
+			return false;
+		
+		// Make sure the given ammoType is actually useable
+		if (ammoType != "")
+			if (!AmmoTypesAPI.MagazineTypeToAmmoType(ammoType, ammoType))
+				return false;
+		
+		// Just so we don't '&' wastefully in a loop
+		bool didSomething = false;		
+		bool chamberFullRng = (flags & WeaponWithAmmoFlags.CHAMBER_RNG_SPORADIC);
+		bool chamberRng = (flags & WeaponWithAmmoFlags.CHAMBER_RNG);
+		bool chamber = (flags & WeaponWithAmmoFlags.CHAMBER);
+		
+		if (chamber || chamberRng || chamberFullRng)
+		{
+			int amountToChamber = muzzCount;
+			
+			// No need to do this for full rng, as that will roll for every muzzle
+			if (chamberRng)
+				amountToChamber = Math.RandomIntInclusive(0, muzzCount);
+			
+			bool chamberAmmoRng = (ammoType == "");
+			bool chamberAmmoFullRng = chamberAmmoRng && (flags & WeaponWithAmmoFlags.AMMO_CHAMBER_RNG);
+			
+			// No full RNG flag, so pick one random and use only this one
+			if (chamberAmmoRng && !chamberAmmoFullRng)
+				ammoType = GetRandomChamberableAmmoTypeName(0);
+			
+			for (int i = 0; i < muzzCount; ++i)
+			{
+				// Skip when there's already something in the chamber
+				if (!IsChamberEmpty(i))
+					continue;
+				
+				// Roll the rng when enabled
+				if (chamberFullRng)
+					chamber = Math.RandomIntInclusive(0, 1);
+				
+				// We chambering
+				if (chamber)
+				{
+					// Full random, decide a new one for every muzzle
+					if ( chamberAmmoFullRng )
+						ammoType = GetRandomChamberableAmmoTypeName(i);
+					
+					// Push it
+					PushCartridgeToChamber(i, 0, ammoType);
+					didSomething = true;
+					
+					// Stop chambering when we hit the desired amount
+					--amountToChamber;				
+					if (amountToChamber <= 0)
+						break;
+				}
+			}
+		}
+		
+		// Only fix the FSM and Synchronize when absolutely needed
+		if (!didSomething)
+			return false;
+		
+		// FSM cares about chamber state
+		RandomizeFSMState();		
+		Synchronize();
+		
+		return true;
+	}
+	
+	//@}
+	
+	
+	
+	/**
+	 * @brief Returns number of slots for attachments corrected for weapons
+	 **/
+	override int GetSlotsCountCorrect()
+	{
+		int ac = GetInventory().AttachmentCount();
+		int	sc = GetInventory().GetAttachmentSlotsCount() + GetMuzzleCount();
+		if (ac > sc) sc = ac; // fix of some weapons which has 1 attachments but 0 slots...
+		return sc;
+	};
+
+	PropertyModifiers GetPropertyModifierObject() 
+	{
+		if (!m_PropertyModifierObject)
+		{
+			m_PropertyModifierObject = new PropertyModifiers(this);
+		}
+		return m_PropertyModifierObject;
+	}
+	
+	void OnFire(int muzzle_index)
+	{
+/*
+		array<Man> players();
+		GetGame().GetPlayers(players);
+		
+		Man root = GetHierarchyRootPlayer();
+		
+		if (!root)
+		{
+			return;
+		}
+		
+		vector safePosition = root.GetPosition() + (root.GetDirection() * "0 1 0" * 3.0);
+		
+		Man other = null;
+		foreach (auto player : players)
+		{
+			if (player != GetHierarchyRootPlayer())
+			{
+				player.SetPosition(safePosition);
+			}
+		}
+*/
+
+		m_BurstCount++;
+	}
+	
+	void OnFireModeChange(int fireMode)
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			EffectSound eff;
+			
+			if ( fireMode == 0 )
+				eff = SEffectManager.PlaySound("Fire_Mode_Switch_Marked_Click_SoundSet", GetPosition());
+			else
+				eff = SEffectManager.PlaySound("Fire_Mode_Switch_Simple_Click_SoundSet", GetPosition());
+			
+			eff.SetAutodestroy(true);
+		}
+		
+		ResetBurstCount();
+	}
+	
+	void ValidateAndRepair()
+	{
+		if ( m_fsm )
+			m_fsm.ValidateAndRepair();
+	}
+	
+	override void OnInventoryEnter(Man player)
+	{
+		m_PropertyModifierObject = null;
+
+		ValidateAndRepair();
+		
+		super.OnInventoryEnter(player);
+	}
+	
+	override void OnInventoryExit(Man player)
+	{
+		m_PropertyModifierObject = null;
+		super.OnInventoryExit(player);
+	}
+
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+
+		GetPropertyModifierObject().UpdateModifiers();
+	}
+
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+
+		GetPropertyModifierObject().UpdateModifiers();
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+
+		if (newLoc.GetType() == InventoryLocationType.HANDS)
+		{
+			PlayerBase player;
+			if (newLoc.GetParent() && PlayerBase.CastTo(player, newLoc.GetParent()))
+			{ 
+				HumanCommandMove cm = player.GetCommand_Move();
+				if (cm)
+				{
+					cm.SetMeleeBlock(false);
+				}
+			}
+		}
+	}
+	
+	override void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner)
+	{
+		super.OnItemLocationChanged(old_owner,new_owner);
+		
+		// "resets" optics memory on optics
+		PlayerBase player;
+		if (PlayerBase.CastTo(player,old_owner))
+		{ 
+			player.SetReturnToOptics(false);
+			
+			//optics item state reset
+			ItemOptics optics;
+			if (Class.CastTo(optics,GetAttachedOptics()))
+			{
+				player.SwitchOptics(optics,false);
+			}
+		}
+
+		HideWeaponBarrel(false);
+	}
+	
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if ( !super.CanReleaseAttachment( attachment ) )
+			return false;
+		Magazine mag = Magazine.Cast(attachment);
+		if (mag)
+		{
+			PlayerBase player = PlayerBase.Cast( GetHierarchyRootPlayer() );
+			if ( player )
+			{
+				if ( player.GetItemInHands() == this )
+					return true;
+			}
+			return false;
+		}
+
+		return true;
+	}
+	
+	override bool CanRemoveFromHands(EntityAI parent)
+	{
+		if (IsIdle())
+		{
+			return true;
+		}
+		if (LogManager.IsWeaponLogEnable()) { wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(this) + " Weapon=" + this + " not in stable state=" + GetCurrentState().Type()); }
+		return false; // do not allow removal of weapon while weapon is busy
+	}
+
+	bool IsRemoteWeapon()
+	{
+		InventoryLocation il = new InventoryLocation;
+		if (GetInventory().GetCurrentInventoryLocation(il))
+		{
+			EntityAI parent = il.GetParent();
+			DayZPlayer dayzp = DayZPlayer.Cast(parent);
+			if (il.GetType() == InventoryLocationType.HANDS && dayzp)
+			{
+				bool remote = dayzp.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_REMOTE;
+				return remote;
+			}
+		}
+		return true;
+	}
+
+	void SyncEventToRemote(WeaponEventBase e)
+	{
+		DayZPlayer p = DayZPlayer.Cast(GetHierarchyParent());
+		if (p && p.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			ScriptRemoteInputUserData ctx = new ScriptRemoteInputUserData();
+
+			ctx.Write(INPUT_UDT_WEAPON_REMOTE_EVENT);
+			e.WriteToContext(ctx);
+
+			if (LogManager.IsWeaponLogEnable())
+				wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(this) + " send 2 remote: sending e=" + e + " id=" + e.GetEventID() + " p=" + e.m_player + "  m=" + e.m_magazine);
+
+			p.StoreInputForRemotes(ctx);
+		}
+	}
+
+	
+	RecoilBase SpawnRecoilObject()
+	{
+		return new DefaultRecoil(this);
+	}
+
+	int GetWeaponSpecificCommand(int weaponAction, int subCommand)
+	{
+		return subCommand;
+	}
+
+	bool CanFire()
+	{
+		if (!IsChamberEmpty(GetCurrentMuzzle()) && !IsChamberFiredOut(GetCurrentMuzzle()) && !IsJammed() && !m_LiftWeapon && !IsDamageDestroyed())
+			return true;
+		return false;
+	}
+			
+	bool CanEnterIronsights()
+	{
+		ItemOptics optic = GetAttachedOptics();
+		if (!optic)
+			return true;
+		
+		return optic.HasWeaponIronsightsOverride();
+	}
+	
+	//! Initializes DOF properties for weapon's ironsight/optics cameras
+	bool InitDOFProperties(out array<float> temp_array)
+	{
+		if (GetGame().ConfigIsExisting("cfgWeapons " + GetType() + " PPDOFProperties"))
+		{
+			GetGame().ConfigGetFloatArray("cfgWeapons " + GetType() + " PPDOFProperties", temp_array);
+			return true;
+		}
+		return false;
+	}
+	
+	bool InitReliability(out array<float> reliability_array)
+	{
+		if (GetGame().ConfigIsExisting("cfgWeapons " + GetType() + " Reliability ChanceToJam"))
+		{
+			GetGame().ConfigGetFloatArray("cfgWeapons " + GetType() + " Reliability ChanceToJam", reliability_array);
+			return true;
+		}
+		return false;
+	}
+	
+	//!gets weapon length from config for weaponlift raycast
+	bool InitWeaponLength()
+	{
+		if (ConfigIsExisting("WeaponLength"))
+		{
+			m_WeaponLength = ConfigGetFloat("WeaponLength");
+			return true;
+		}
+		m_WeaponLength = 0.8; //default value if not set in config; should not be zero
+		return false;
+	}
+	
+	//!gets weapon vertical offset from config for weaponlift raycast
+	bool InitWeaponLiftCheckVerticalOffset()
+	{
+		if (ConfigIsExisting("WeaponLiftCheckVerticalOffset"))
+		{
+			m_WeaponLiftCheckVerticalOffset = ConfigGetFloat("WeaponLiftCheckVerticalOffset");
+			return true;
+		}
+		m_WeaponLiftCheckVerticalOffset = 0.0; //no offset by default
+		return false;
+	}
+	
+	//!gets approximate weapon distance from shoulder from config
+	protected bool InitShoulderDistance()
+	{
+		if (ConfigIsExisting("ShoulderDistance"))
+		{
+			m_ShoulderDistance = ConfigGetFloat("ShoulderDistance");
+			return true;
+		}
+		
+		m_ShoulderDistance = 0;
+		return false;
+	}	
+	
+	ref array<float> GetWeaponDOF()
+	{
+		return m_DOFProperties;
+	}
+	
+	// lifting weapon on obstcles
+	bool LiftWeaponCheck(PlayerBase player)
+	{
+		int idx;
+		float distance;
+		float hit_fraction; //junk
+		vector start, end;
+		vector direction;
+		vector usti_hlavne_position;
+		vector trigger_axis_position;
+		vector hit_pos, hit_normal; //junk
+		Object obj;
+		ItemBase attachment;
+		HumanMovementState movementState = new HumanMovementState();
+		
+		bool wasLift = m_LiftWeapon;
+		vector lastLiftPosition = m_LastLiftPosition;
+		
+		m_LiftWeapon = false;
+		// not a gun, no weap.raise for now
+		if ( HasSelection("Usti hlavne") )
+			return false;
+		
+		if (!player)
+		{
+			Print("Error: No weapon owner, returning");
+			return false;
+		}
+		
+		// weapon not raised
+		player.GetMovementState(movementState);
+		if (!movementState.IsRaised())
+			return false;
+		
+		// suppress raising of weapon during melee attack preventing state inconsistency
+		if (movementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MELEE || movementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MELEE2)
+		{
+			return false;
+		}
+		
+		usti_hlavne_position = GetSelectionPositionLS( "Usti hlavne" ); 	// Usti hlavne
+		trigger_axis_position = GetSelectionPositionLS("trigger_axis");
+		
+		// If possible use aiming angles instead as these will work consistently
+		// and independently of any cameras, etc. 
+		HumanCommandWeapons hcw = player.GetCommandModifier_Weapons();
+		if (hcw)
+		{
+			vector yawPitchRoll = Vector(
+				hcw.GetBaseAimingAngleLR() + player.GetOrientation()[0],
+				hcw.GetBaseAimingAngleUD(),
+				0.0);
+			direction = yawPitchRoll.AnglesToVector();
+		}
+		else // Fallback to previously implemented logic
+		{
+			// freelook raycast
+			if (player.GetInputController().CameraIsFreeLook())
+			{
+				if (player.m_DirectionToCursor != vector.Zero)
+				{
+					direction = player.m_DirectionToCursor;
+				}
+				// if player raises weapon in freelook
+				else
+				{
+					direction = MiscGameplayFunctions.GetHeadingVector(player);
+				}
+			}
+			else
+			{
+				direction = GetGame().GetCurrentCameraDirection(); // exception for freelook. Much better this way!
+			}
+		}
+		
+		idx = player.GetBoneIndexByName("Neck"); //RightHandIndex1
+		if ( idx == -1 )
+			{ start = player.GetPosition()[1] + 1.5; }
+		else
+			{ start = player.GetBonePositionWS(idx); }
+		
+		
+		// Updated weapon lift detection code prototype
+		{
+			// 0: construct stable trasformation matrix that
+			// approximately aligns with the weapon transform
+			// without actually using the weapon as reference
+			// (as the weapon can be moved unpredictably by anims)
+			vector resTM[4];
+			resTM[0] = Vector(direction[0], 0, direction[2]).Normalized();
+			resTM[0] = vector.RotateAroundZeroDeg(resTM[0], vector.Up, 90);
+			resTM[2] = direction;
+			resTM[1] = resTM[2] * resTM[0]; 
+			resTM[3] = start;
+			
+			// Approximate the roll of leaning
+			HumanMovementState hms = new HumanMovementState();
+			player.GetMovementState(hms);
+			float leanAngle = hms.m_fLeaning * 35;
+			vector rotTM[3];
+			Math3D.YawPitchRollMatrix( Vector(0, 0, leanAngle), rotTM );
+			Math3D.MatrixMultiply3(resTM, rotTM, resTM);
+			
+			// Draw relative TM diagnostic
+			#ifdef DIAG_DEVELOPER
+			if (DiagMenu.GetValue(DiagMenuIDs.WEAPON_LIFT_DEBUG))
+			{
+				Shape.CreateArrow(resTM[3], resTM[3] + resTM[0], 0.05, COLOR_RED, ShapeFlags.ONCE);
+				Shape.CreateArrow(resTM[3], resTM[3] + resTM[1], 0.05, COLOR_GREEN, ShapeFlags.ONCE);
+				Shape.CreateArrow(resTM[3], resTM[3] + resTM[2], 0.05, COLOR_BLUE, ShapeFlags.ONCE);
+			}
+			#endif
+			
+			// 1: pick from predefined offset relative to
+			// the previously constructed transform 
+			float udAngle = Math.Asin(direction[1]) * Math.RAD2DEG;
+			
+			// offsets are [right, up, forward]
+			// values are based on what felt right after iterating
+			vector offsets[] = 
+			{ 
+				"0.11 0.17 0.0",  // offset while aiming down
+				"0.12 0.05 0.0", // offset while aiming forward
+				"0.112 0.03 0.0" // offset while aiming up
+			};
+			const int lastIndex = 2; // length of offsets - 1
+			
+			// <0,1> range of aiming
+			float a = Math.Clamp(Math.InverseLerp(DayZPlayerCamera1stPerson.CONST_UD_MIN, DayZPlayerCamera1stPerson.CONST_UD_MAX, udAngle), 0, 0.9999);
+			int lo = a * lastIndex;
+			int hi = Math.Clamp(lo+1, 0, lastIndex);
+			
+			// remap to current lo-hi range
+			float t = Math.Clamp(a * lastIndex - lo, 0, 1);
+			vector offset = vector.Lerp(offsets[lo], offsets[hi], t);
+			
+			// offsets are [right, up forward]
+			// additional offsets added to previous offsets per stance
+			vector stanceOffsets[] = 
+			{
+				"0 -0.015 0",	// erect
+				"0 0.03 0",	// crouch
+				"0 -0.04 0",// prone
+			};
+			
+			// 2. pick from predefined offsets based on stance,
+			// allows to even further approximate the alignment
+			int stanceOffsetIndex = hms.m_iStanceIdx;
+			if (stanceOffsetIndex >= DayZPlayerConstants.STANCEIDX_PRONE)
+				stanceOffsetIndex -= DayZPlayerConstants.STANCEIDX_RAISED;
+			
+			stanceOffsetIndex -= DayZPlayerConstants.STANCEIDX_ERECT;
+			offset += stanceOffsets[stanceOffsetIndex];
+			
+			// if any additional height offset is defined, apply it
+			if (m_WeaponLiftCheckVerticalOffset != 0)
+			{
+				offset[1] = offset[1] + m_WeaponLiftCheckVerticalOffset;
+			}
+			
+			// 3. use the offset as the start position.
+			// it will not be perfect, but it should reflect
+			// the actual weapon transform more accurately
+			start = offset.Multiply4(resTM);
+		}
+		
+		//! snippet below measures distance from "RightHandIndex1" bone for lifting calibration
+		/*usti_hlavne_position = ModelToWorld(usti_hlavne_position);
+		distance = vector.Distance(start,usti_hlavne_position);*/
+		distance = m_WeaponLength + GetEffectiveAttachmentLength();
+		
+		vector weaponStart = start + (m_ShoulderDistance * direction);
+		vector weaponEnd = weaponStart + (distance * direction);
+		
+		// Draw diagnostics: Script -> Weapon -> Weapon Lift
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetValue(DiagMenuIDs.WEAPON_LIFT_DEBUG))
+		{
+			vector diagNoAttachEnd = weaponStart + (m_WeaponLength * direction);
+			int diagPtsShpFlgs = ShapeFlags.ONCE | ShapeFlags.NOOUTLINE;
+			float diagPtsRadius = 0.025;
+			Shape.CreateSphere(COLOR_GREEN, diagPtsShpFlgs, weaponStart, diagPtsRadius);
+			Shape.CreateSphere(COLOR_YELLOW, diagPtsShpFlgs, diagNoAttachEnd, diagPtsRadius);
+			Shape.CreateSphere(COLOR_BLUE, diagPtsShpFlgs, weaponEnd, diagPtsRadius);
+		}
+		#endif
+		
+		// For the physical cast, extend the distance by x%
+		// to allow for smoother transition handling in some cases
+		end = weaponEnd + ((0.1 * distance) * direction);
+		
+		// Prepare raycast params and perform the cast in fire geo
+		RaycastRVParams rayParm = new RaycastRVParams(start, end, player, 0.04);
+		rayParm.flags = CollisionFlags.ALLOBJECTS;
+		rayParm.type = ObjIntersect.Fire;
+		
+		DbgUI.BeginCleanupScope();
+		array<ref RaycastRVResult> results = {};
+		if (!DayZPhysics.RaycastRVProxy(rayParm, results) || results.Count() == 0)
+		{
+			hit_pos = vector.Zero;
+			hit_fraction = 0;
+		}
+		else
+		{
+			RaycastRVResult res = results[0];
+			
+			#ifdef DIAG_DEVELOPER	// isect diag
+			if (DiagMenu.GetValue(DiagMenuIDs.WEAPON_LIFT_DEBUG) == 2)
+			{
+				DbgUI.Begin("Weapon Lift Diag");
+				{
+					if (res.surface)
+					{
+						DbgUI.Text("Intersection data:");
+						DbgUI.Text("  Name: " + res.surface.GetName());
+						DbgUI.Text("  EntryName: " + res.surface.GetEntryName());
+						DbgUI.Text("  SurfaceType: " + res.surface.GetSurfaceType());
+						
+						DbgUI.Text("  IsPassThrough: " + res.surface.IsPassthrough());
+						DbgUI.Text("  IsSolid: " + res.surface.IsSolid());
+					}
+					else
+					{
+						DbgUI.Text("Intersection with no surface");
+					}
+				}
+				DbgUI.End();
+			}
+			#endif	// !isect diag
+			
+			if (LiftWeaponRaycastResultCheck(res))
+			{
+				hit_pos = res.pos;
+				float len0 = (hit_pos - start).Length();
+				float len1 = (end - start).Length();
+				if (len0 <= 0 || len1 <= 0)
+				{
+					hit_fraction = 1;
+				}
+				else
+				{
+					hit_fraction = len0 / len1;
+				}
+			}
+			else
+			{
+				hit_pos = vector.Zero;
+				hit_fraction = 0;
+			}
+		}
+		
+		DbgUI.EndCleanupScope();
+		
+		// Draw diagnostics: Script -> Weapon -> Weapon Lift
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetValue(DiagMenuIDs.WEAPON_LIFT_DEBUG))
+		{
+			const vector epsilon = "0 0.0002 0"; // to overcome excessive z-fighting for diag
+			if (lastLiftPosition!=vector.Zero)
+			{
+				Shape.CreateArrow(start-epsilon, lastLiftPosition-epsilon, 0.05, COLOR_YELLOW, ShapeFlags.ONCE);
+			}
+			
+			Shape.CreateArrow(start, weaponEnd, 0.05, COLOR_WHITE, ShapeFlags.ONCE | ShapeFlags.NOZBUFFER );
+			
+			if (hit_fraction != 0)
+			{
+				Shape.CreateArrow(start+epsilon, hit_pos+epsilon, 0.05, COLOR_RED, ShapeFlags.ONCE);
+			}
+		}
+		#endif
+		
+		// Start by assuming that we want to retain state
+		bool wantsLift = wasLift;
+		
+		// Sq. distance of weapon movement required to trigger lift (in)
+		const float inThreshold = 0.002;
+		// Sq. distance of weapon movement required to trigger lift (out)
+		const float outThreshold = 0.003;
+		const float noIsctOutThreshold = 0.01;
+		
+		// Min angle in degrees change from last lift to stop lifting
+		// Base threshold of 0.75 degrees + 0.6 degrees per meter of weapon length
+		float angleThreshold = 0.75 + Math.Clamp( m_WeaponLength * 0.6, 0, 1.5 );
+		
+		// Update state when a hit is registered
+		if (hit_fraction != 0)
+		{
+			vector v1 = hit_pos - weaponEnd;
+			vector v2 = hit_pos - end;
+			float d = vector.Dot(v1, v2);
+			// But leave some threshold where previous state is kept
+			// to prevent excessive switches from occuring
+			if (!wasLift && d > inThreshold)
+			{
+				wantsLift = true;
+			}
+			else if (wasLift && d < -outThreshold)
+			{
+				wantsLift = false;
+			}
+			
+			m_LastLiftPosition = hit_pos;
+		}
+		else
+		{
+			// With no hit and no previous lift
+			if (lastLiftPosition == vector.Zero)
+			{
+				wantsLift = false;
+				m_LastLiftPosition = vector.Zero;
+			}
+			// See if previous hit wasn't very close to our current position,
+			// in which case simply don't lift the weapon
+			else
+			{
+				vector v3 = (lastLiftPosition - start).Normalized();
+				vector v4 = (end-start).Normalized();
+				float d2 = vector.Dot(v3, v4);
+				// no isect, angle delta check
+				if (Math.Acos(d2) > (angleThreshold * Math.DEG2RAD)) // if relative angle is > x degree, stop lifting
+				{
+					wantsLift = false;
+					m_LastLiftPosition = vector.Zero;
+				}
+				// no isect, distance check
+				else
+				{
+					float d3 = vector.Dot( lastLiftPosition - weaponEnd, (start-end).Normalized() );
+					if (d3 < -noIsctOutThreshold)
+					{
+						wantsLift = false;
+						m_LastLiftPosition = vector.Zero;
+					}
+				}
+			}
+		}
+		
+		// lift is desired
+		if (wantsLift)
+		{
+			//Print(distance);
+			m_LiftWeapon = true;
+			return true;
+		}
+		return false;
+	}
+	
+	//! Return whether provided material triggers weapon lift (true) or not (false).
+	bool LiftWeaponRaycastResultCheck(notnull RaycastRVResult res)
+	{
+		return res.surface.IsSolid();
+	}
+	
+	//! Returns effective length of attachments that influence total weapon length
+	float GetEffectiveAttachmentLength()
+	{
+		ItemBase attachment;
+		if (HasBayonetAttached())
+		{
+			int bayonetIndex = GetBayonetAttachmentIdx();
+			attachment = ItemBase.Cast(GetInventory().FindAttachment(bayonetIndex));
+		}
+		else
+		{
+			attachment = GetAttachedSuppressor();
+		}
+		
+		if (attachment)
+		{
+			return Math.Max(attachment.m_ItemModelLength + attachment.m_ItemAttachOffset, 0);
+		}
+		else
+		{
+			return 0;
+		}
+	}
+	
+	void SetSyncJammingChance( float jamming_chance )
+	{
+		m_ChanceToJamSync = jamming_chance;
+	}
+	
+	/**@fn		EjectCartridge
+	 * @brief	unload bullet from chamber or internal magazine
+	 *
+	 * @NOTE: 	EjectCartridge = GetCartridgeInfo + PopCartridge
+	 *
+	 * @param[in] muzzleIndex
+	 * @param[out] ammoDamage \p  damage of the ammo
+	 * @param[out] ammoTypeName \p	 type name of the ejected ammo
+	 * @return	true if bullet removed from chamber
+	 **/
+	bool EjectCartridge(int muzzleIndex, out float ammoDamage, out string ammoTypeName)
+	{
+		if (IsChamberEjectable(muzzleIndex))
+		{
+			if (PopCartridgeFromChamber(muzzleIndex, ammoDamage, ammoTypeName))
+				return true;
+		}
+		else if (GetInternalMagazineCartridgeCount(muzzleIndex) > 0)
+		{
+			if (PopCartridgeFromInternalMagazine(muzzleIndex, ammoDamage, ammoTypeName))
+				return true;
+		}
+		return false;
+	}
+	
+	bool CopyWeaponStateFrom(notnull Weapon_Base src)
+	{
+		float damage = 0.0;
+		string type;
+
+		for (int mi = 0; mi < src.GetMuzzleCount(); ++mi)
+		{
+			if (!src.IsChamberEmpty(mi))
+			{
+				if (src.GetCartridgeInfo(mi, damage, type))
+				{
+					PushCartridgeToChamber(mi, damage, type);
+				}
+			}
+			
+			for (int ci = 0; ci < src.GetInternalMagazineCartridgeCount(mi); ++ci)
+			{
+				if (src.GetInternalMagazineCartridgeInfo(mi, ci, damage, type))
+				{
+					PushCartridgeToInternalMagazine(mi, damage, type);
+				}
+			}
+		}
+		
+		int dummy_version = int.MAX;
+		PlayerBase parentPlayer = PlayerBase.Cast(src.GetHierarchyRootPlayer());
+		if (!parentPlayer)
+			dummy_version -= 1;
+		ScriptReadWriteContext ctx = new ScriptReadWriteContext;
+		src.OnStoreSave(ctx.GetWriteContext());
+		OnStoreLoad(ctx.GetReadContext(), dummy_version);
+		return true;
+	}
+	
+	//! attachment helpers (firearm melee)
+	override void SetBayonetAttached(bool pState, int slot_idx = -1)
+	{
+		m_BayonetAttached = pState;
+		m_BayonetAttachmentIdx = slot_idx;
+	}
+	
+	override bool HasBayonetAttached()
+	{
+		return m_BayonetAttached;
+	}
+	
+	override int GetBayonetAttachmentIdx()
+	{
+		return m_BayonetAttachmentIdx;
+	}
+	
+	override void SetButtstockAttached(bool pState, int slot_idx = -1)
+	{
+		m_ButtstockAttached = pState;
+		m_ButtstockAttachmentIdx = slot_idx;
+	}
+
+	override bool HasButtstockAttached()
+	{
+		return m_ButtstockAttached;
+	}
+	
+	override int GetButtstockAttachmentIdx()
+	{
+		return m_ButtstockAttachmentIdx;
+	}
+	
+	void HideWeaponBarrel(bool state)
+	{
+		if ( !GetGame().IsDedicatedServer() )//hidden for client only
+		{
+			ItemOptics optics = GetAttachedOptics();
+			if ( optics && !optics.AllowsDOF() && m_weaponHideBarrelIdx != -1 )
+			{
+				SetSimpleHiddenSelectionState(m_weaponHideBarrelIdx,!state);
+			}
+		}
+	}
+	
+	void ShowMagazine()
+	{
+		if (m_magazineSimpleSelectionIndex > -1)
+			SetSimpleHiddenSelectionState(m_magazineSimpleSelectionIndex,1);
+		else
+			SelectionMagazineShow();
+	}
+	
+	void HideMagazine()
+	{
+		if (m_magazineSimpleSelectionIndex > -1)
+			SetSimpleHiddenSelectionState(m_magazineSimpleSelectionIndex,0);
+		else
+			SelectionMagazineHide();
+	}
+	
+	override EntityAI ProcessMeleeItemDamage(int mode = 0)
+	{
+		EntityAI attachment;
+		
+		switch (mode)
+		{
+			case 0:
+				super.ProcessMeleeItemDamage();
+			break;
+			
+			case 1:
+				attachment = GetInventory().FindAttachment(m_ButtstockAttachmentIdx);
+			break;
+			
+			case 2:
+				attachment = GetInventory().FindAttachment(m_BayonetAttachmentIdx);
+			break;
+			
+			default:
+				super.ProcessMeleeItemDamage();
+			break;
+		}
+		
+		if (attachment)
+		{
+			attachment.ProcessMeleeItemDamage();
+			return attachment;
+		}
+		
+		return this;
+	}
+	
+	bool IsShowingChamberedBullet()
+	{
+		return true;
+	}
+	
+	int GetBurstCount()
+	{
+		return m_BurstCount;
+	}
+	
+	void ResetBurstCount()
+	{
+		m_BurstCount = 0;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(FirearmActionUnjam);
+		AddAction(FirearmActionAttachMagazine);
+		AddAction(FirearmActionLoadBullet);
+		AddAction(FirearmActionMechanicManipulate);
+		AddAction(ActionTurnOnWeaponFlashlight);
+		AddAction(ActionTurnOffWeaponFlashlight);
+
+		AddAction(FirearmActionAttachMagazineQuick); // Easy reload
+		AddAction(FirearmActionLoadBulletQuick); // Easy reload
+	}
+	
+	override bool CanBeUsedForSuicide()
+	{
+		if (!ConfigGetBool("isSuicideWeapon"))
+			return false;
+		
+		return super.CanBeUsedForSuicide();
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		SpawnAmmo("", SAMF_DEFAULT);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/Game/Super/Building.c b/scripts/4_World/DayZ/Entities/Game/Super/Building.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f8feac93a2ecb1233a0d34589eb0d5149a6b0fe
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Game/Super/Building.c
@@ -0,0 +1,92 @@
+class House : BuildingBase
+{
+	void House()
+	{
+	}
+}
+
+class BuildingBase : Building
+{
+	static ref map<typename, ref TInputActionMap> m_BuildingTypeActionsMap = new map<typename, ref TInputActionMap>;
+	TInputActionMap m_InputActionMap;
+	bool	m_ActionsInitialize;
+	
+	void BuildingBase()
+	{
+		m_ActionsInitialize = false;
+	}
+	
+	void InitializeActions()
+	{
+		m_InputActionMap = m_BuildingTypeActionsMap.Get( this.Type() );
+		if (!m_InputActionMap)
+		{
+			TInputActionMap iam = new TInputActionMap;
+			m_InputActionMap = iam;
+			SetActions();
+			m_BuildingTypeActionsMap.Insert(this.Type(), m_InputActionMap);
+		}
+	}
+	
+	override void GetActions(typename action_input_type, out array<ActionBase_Basic> actions)
+	{
+		if (!m_ActionsInitialize)
+		{
+			m_ActionsInitialize = true;
+			InitializeActions();
+		}
+		
+		actions = m_InputActionMap.Get(action_input_type);
+	}
+	
+	void SetActions()
+	{
+		//AddAction();
+	}
+	
+	void AddAction(typename actionName)
+	{
+		ActionBase action = ActionManagerBase.GetAction(actionName);
+
+		if (!action)
+		{
+			Debug.LogError("Action " + actionName + " dosn't exist!");
+			return;
+		}		
+		
+		typename ai = action.GetInputType();
+		if (!ai)
+		{
+			m_ActionsInitialize = false;
+			return;
+		}
+		ref array<ActionBase_Basic> action_array = m_InputActionMap.Get( ai );
+		
+		if (!action_array)
+		{
+			action_array = new array<ActionBase_Basic>;
+			m_InputActionMap.Insert(ai, action_array);
+		}
+		
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog(action.ToString() + " -> " + ai, this.ToString() , "n/a", "Add action" );
+		}
+		action_array.Insert(action);
+	}
+	
+	void RemoveAction(typename actionName)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionBase action = player.GetActionManager().GetAction(actionName);
+		typename ai = action.GetInputType();
+		ref array<ActionBase_Basic> action_array = m_InputActionMap.Get( ai );
+		
+		if (action_array)
+		{
+			action_array.RemoveItem(action);
+		}
+	}
+};
+
+typedef House BuildingSuper;
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Game/Super/InventoryItem.c b/scripts/4_World/DayZ/Entities/Game/Super/InventoryItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..79b7f13c67ff6681fe32cbfca764d1c9d82f1b2f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Game/Super/InventoryItem.c
@@ -0,0 +1,5 @@
+// #include "Scripts\Entities\ItemBase.c"
+
+typedef ItemBase InventoryItemBase;
+typedef ItemBase InventoryItemSuper;
+
diff --git a/scripts/4_World/DayZ/Entities/Game/Super/LightAI.c b/scripts/4_World/DayZ/Entities/Game/Super/LightAI.c
new file mode 100644
index 0000000000000000000000000000000000000000..69d3d0c8b0b17558d539a37d66b4273296144897
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Game/Super/LightAI.c
@@ -0,0 +1 @@
+typedef LightAIBase LightAISuper;
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Game/Super/Man.c b/scripts/4_World/DayZ/Entities/Game/Super/Man.c
new file mode 100644
index 0000000000000000000000000000000000000000..f1f9b32e256715d11dfad5f932eeab48466e427a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Game/Super/Man.c
@@ -0,0 +1 @@
+typedef ManBase ManSuper;
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Game/Super/Plant.c b/scripts/4_World/DayZ/Entities/Game/Super/Plant.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f0c94a2401c7808e4e7be221cab5388a8026389
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Game/Super/Plant.c
@@ -0,0 +1 @@
+typedef WoodBase PlantSuper;
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/GardenBase.c b/scripts/4_World/DayZ/Entities/GardenBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e9eb5dde9045b69bf21d47dcbc3a908073c91ea6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/GardenBase.c
@@ -0,0 +1,859 @@
+class GardenBase extends ItemBase //BuildingSuper
+{
+	// Paths to slot textures. Slots can have multiple states, so multiple textures must be generated
+	static const string SLOT_TEXTURE_DIGGED_WET_LIME		= "dz\\gear\\cultivation\\data\\soil_digged_wet_lime_CO.paa";
+	static const string SLOT_TEXTURE_DIGGED_WET_PLANT		= "dz\\gear\\cultivation\\data\\soil_digged_wet_plant_CO.paa";
+	
+	// Wet/dry material
+	static const string SLOT_MATERIAL_WET					= "dz\\gear\\cultivation\\data\\soil_cultivated_wet.rvmat";
+	static const string SLOT_MATERIAL_DRY					= "dz\\gear\\cultivation\\data\\soil_cultivated.rvmat";
+	
+	static const string SLOT_MATERIAL_LIMED_WET				= "dz\\gear\\cultivation\\data\\soil_cultivated_limed_wet.rvmat";
+	static const string SLOT_MATERIAL_LIMED_DRY				= "dz\\gear\\cultivation\\data\\soil_cultivated_limed.rvmat";
+	static const string SLOT_MATERIAL_COMPOST_WET			= "dz\\gear\\cultivation\\data\\soil_cultivated_compost_wet.rvmat";
+	static const string SLOT_MATERIAL_COMPOST_DRY			= "dz\\gear\\cultivation\\data\\soil_cultivated_compost.rvmat";
+	
+	// slot names -> MUST BE LOWERCASE
+	private static const string SLOT_SELECTION_DIGGED_PREFIX 	= "seedbase_";
+	private static const string SLOT_SELECTION_COVERED_PREFIX 	= "slotCovered_";
+	private static const string SLOT_MEMORY_POINT_PREFIX 		= "slot_";
+	private static const string SLOT_SEEDBASE_PREFIX 			= "seedbase_";
+	
+	
+	private static const int 	CHECK_RAIN_INTERVAL 			= 15;
+	
+	protected ref array<ref Slot> m_Slots;
+	protected int 	m_SlotFertilityState = 0; 	//Used to store fertility state of all slots
+	protected int 	m_SlotWateredState = 0; 	//Used to store fertility state of all slots
+	protected int 	m_MaxWateredStateVal = 0; 	//Used to store fertility state of all slots
+	protected float m_DefaultFertility = 1;
+	ref Timer 		m_CheckRainTimer;
+	
+	private static ref map<string,string> m_map_slots; // For the 'attachment slot -> plant slot' conversion. It is possible that this will be removed later.
+	
+	void GardenBase()
+	{		
+		RegisterNetSyncVariableInt("m_SlotFertilityState");
+		RegisterNetSyncVariableInt("m_SlotWateredState");
+		
+		m_map_slots = new map<string,string>;
+		
+		SetEventMask(EntityEvent.INIT); // Enable EOnInit event
+		
+		// Prepare m_map_slots
+		for (int i = 1;  i <= GetGardenSlotsCount() ;  ++i)
+		{
+			// m_map_slots is supposed to be: <input, output>
+			string input = SLOT_SEEDBASE_PREFIX + i.ToString();
+			string output = SLOT_MEMORY_POINT_PREFIX;
+			
+			if (i < 10)
+				output = output + "0"; // Example: '1' changes to '01'
+			
+			output = output + i.ToString();
+			
+			m_map_slots.Set(input, output);
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			CheckRainStart();
+		}
+		
+		InitializeSlots();
+		
+		SetMaxWaterStateVal();
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		SyncSlots();
+	}
+	
+	override bool HasProxyParts()
+	{
+		return true;
+	}
+	
+	override int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.HIDE_VICINITY;
+	}
+	
+	void SetBaseFertility(float value)
+	{
+		m_DefaultFertility = value;
+	}
+	
+	float GetBaseFertility()
+	{
+		return m_DefaultFertility;
+	}
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		CheckRainTick();
+		UpdateTexturesOnAllSlots();
+	}
+
+	void InitializeSlots()
+	{
+		m_Slots = new array<ref Slot>;
+		int slots_count = GetGardenSlotsCount();
+		
+		for ( int i = 0; i < slots_count; i++ )
+		{
+			Slot slot = new Slot(GetBaseFertility());
+			slot.SetSlotIndex(i);
+			int i1 = i + 1;
+			string name = "SeedBase_" + i1;
+			int slot_id = InventorySlots.GetSlotIdFromString(name);
+			slot.SetSlotId(slot_id);
+			slot.SetGarden(this);
+			slot.m_State = Slot.STATE_DIGGED;
+			m_Slots.Insert( slot );
+		}
+	}
+	
+	void SetMaxWaterStateVal()
+	{
+		int state = 0;
+		
+		for ( int i = 0; i < m_Slots.Count(); i++ )
+		{
+			state += 1 * Math.Pow( 2, i );
+		}
+		
+		m_MaxWateredStateVal = state;
+	}
+	
+	int GetMaxWaterStateVal()
+	{
+		return m_MaxWateredStateVal;
+	}
+	
+	void UpdateTexturesOnAllSlots()
+	{
+		int slots_count = GetGardenSlotsCount();
+		
+		for ( int i = 0; i < slots_count; i++ )
+		{
+			UpdateSlotTexture(i);
+		}
+	}
+
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( version <= 118 )
+			return true;
+		
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		if ( version < 102 )
+		{
+			float some_value;
+			ctx.Read( some_value ); // compatibility check
+		}
+		
+		int slots_count = GetGardenSlotsCount();
+		
+		for ( int i = 0; i < slots_count; i++ )
+		{
+			Slot slot = m_Slots.Get( i );
+
+			if ( !slot.OnStoreLoadCustom( ctx, version ) )
+				return false;
+
+			//Slot textures will be updated after store load
+			//UpdateSlotTexture( i );
+		}
+		
+		if ( version >= 119 )
+			ctx.Read( m_SlotFertilityState );
+		
+		if ( version >= 120 )
+			ctx.Read( m_SlotWateredState );
+		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{
+		super.AfterStoreLoad();
+	}
+	
+	override void EEOnAfterLoad()
+	{
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( SyncSlots, 500, false, this );
+		super.EEOnAfterLoad();
+	}
+	
+	void SyncSlots()
+	{
+		for ( int i = 0; i < GetGardenSlotsCount(); i++ )
+		{
+			// Read relevant bit
+			int fertilityState = (m_SlotFertilityState >> i) & 1;
+			m_Slots[i].SetFertilityState(fertilityState);
+			
+			int wateredState = (m_SlotWateredState >> i) & 1;
+			m_Slots[i].SetWateredState( wateredState );
+			
+			if ( fertilityState == eFertlityState.NONE )
+			{
+				m_Slots[i].SetFertilityType( "" );
+				m_Slots[i].SetFertilizerQuantity( 0 );
+			}
+			
+			if ( wateredState == eWateredState.DRY )
+			{
+				m_Slots[i].SetWater( 0 );
+			}
+			
+			UpdateSlotTexture( i );
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			SetSynchDirty();
+		}
+	}
+
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{
+		super.OnStoreSave( ctx );
+		
+		int slots_count = GetGardenSlotsCount();
+		
+		for ( int i = 0; i < slots_count; i++ )
+		{
+			Slot slot = m_Slots.Get( i );
+			
+			slot.OnStoreSaveCustom( ctx );
+		}
+		
+		ctx.Write(m_SlotFertilityState);
+		
+		ctx.Write( m_SlotWateredState );
+	}
+	
+	void PrintSlots()
+	{
+		Debug.Log("PRINT ALL SLOTS FROM...");
+		Debug.Log("" + this);
+		int slots = GetInventory().GetAttachmentSlotsCount();
+		Debug.Log("Nb Slots : " + slots);
+		
+		for ( int i = 0; i < slots ; i++ )
+		{
+			Slot slot = m_Slots.Get(i);
+			Debug.Log("i : " + i);
+			Debug.Log("Slot : " + slot);
+
+			float slot_fertility = slot.GetFertility();
+			float slot_fertility_usage = slot.GetFertilityMax();
+			string slot_fertility_type = slot.GetFertilityType();
+			float slot_water = slot.GetWater();
+			float slot_water_usage = slot.GetWaterUsage();
+			ItemBase slot_seed = slot.GetSeed();
+			ItemBase slot_plant = slot.GetPlant();
+			float slot_state= slot.GetState();
+			float slot_slot_Index = slot.GetSlotIndex();
+			float slot_slot_ID = slot.GetSlotId();
+			int   slot_wateredState = slot.GetWateredState();
+			int	  slot_FertilityState = slot.GetFertilityState();
+			
+			Debug.Log("Fertility : " + slot_fertility);
+			Debug.Log("Fertility Usage : " + slot_fertility_usage);
+			Debug.Log("Fertility Type : " + slot_fertility_type);
+			Debug.Log("Fertility State : " + slot_FertilityState);
+			Debug.Log("Water : " + slot_water);
+			Debug.Log("Water Usage : " + slot_water_usage);
+			Debug.Log("Watered State : " + slot_wateredState);
+			Debug.Log("Seed : " + slot_seed);
+			Debug.Log("Plant : " + slot_plant);
+			Debug.Log("State : " + slot_state);
+			Debug.Log("Slot Index : " + slot_slot_Index);
+			Debug.Log("Slot ID : " + slot_slot_ID);
+			Debug.Log("///////////////////////////");
+		}
+		
+		Debug.Log("END OF ALL SLOTS FOR...");
+		Debug.Log("" + this);
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo(parent) ) {return false;}
+		return false;
+	}
+
+	override bool CanPutIntoHands( EntityAI player )
+	{
+		if ( !super.CanPutIntoHands( parent ) )
+		{
+			return false;
+		}
+		return false;
+	}
+
+	override bool CanRemoveFromHands( EntityAI player )
+	{
+		return false;
+	}
+
+	int GetGardenSlotsCount()
+	{
+		return 0;
+	}
+
+	bool CanPlantSeed( string selection_component )
+	{
+		Slot slot = GetSlotBySelection( selection_component );
+		
+		if ( slot != NULL && slot.m_State == Slot.STATE_DIGGED )
+		{
+			return  true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	// Converts attachment slot name into plant slot name. Example: 'seedbase_1' -> 'component02'
+	string ConvertAttSlotToPlantSlot(string attach_slot)
+	{
+		// Give result
+		if ( m_map_slots.Contains(attach_slot) )
+		{
+			string return_value = m_map_slots.Get(attach_slot);
+			return return_value;
+		}
+		
+		return "";
+	}
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		string path = string.Format("CfgVehicles %1 Horticulture PlantType", item.GetType());
+		bool IsItemSeed = GetGame().ConfigIsExisting(path); // Is this item a seed?
+		
+		int slot_id = InventorySlots.GetSlotIdFromString(slot_name);
+		
+		if ( IsItemSeed ) 
+		{
+			string converted_slot_name;
+			
+			vector pos = GetPosition();
+			int index = GetSlotIndexByAttachmentSlot( slot_name );
+			
+			if (index < 10)
+			{
+				converted_slot_name = SLOT_MEMORY_POINT_PREFIX + "0" + index.ToString();
+			}
+			else
+			{
+				converted_slot_name = SLOT_MEMORY_POINT_PREFIX + index.ToString();
+			}
+			
+			PlantSeed( ItemBase.Cast( item ), converted_slot_name);
+		}
+		else if (g_Game.IsClient())
+		{
+			Slot slot = GetSlotByIndex(GetSlotIndexByAttachmentSlot( slot_name) - 1);
+			if (slot)
+			{
+				slot.SetPlant(PlantBase.Cast( item ));
+				slot.m_State = Slot.STATE_PLANTED;
+			}
+		}
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		slot_name.ToLower();
+
+		string path = string.Format("CfgVehicles %1 Horticulture PlantType", item.GetType());
+		bool IsItemSeed = GetGame().ConfigIsExisting(path); // Is this item a seed?
+		
+		string converted_slot_name = ConvertAttSlotToPlantSlot(slot_name);
+		Slot slot = GetSlotBySelection(converted_slot_name);
+		
+		if (slot)
+		{
+			if (IsItemSeed)
+			{
+				slot.SetSeed(NULL);				
+			}
+			
+			slot.SetState(Slot.STATE_DIGGED);		
+		}		
+	}
+	
+	// Plants the seed into slot (selection_component)
+	void PlantSeed( ItemBase seed, string selection_component )
+	{
+		int slot_index = GetSlotIndexBySelection( selection_component );
+		
+		if ( slot_index != -1 )
+		{
+			PluginHorticulture module_horticulture = PluginHorticulture.Cast( GetPlugin( PluginHorticulture ) );
+			string plant_type = module_horticulture.GetPlantType( seed );
+			
+			Slot slot = m_Slots.Get( slot_index );
+			slot.SetState(Slot.STATE_PLANTED);
+			slot.m_PlantType = plant_type;
+			slot.SetSeed(seed);
+			
+			if ( !slot.NeedsWater() )
+			{
+				seed.LockToParent();
+				//Take some small amount of time before making a plant out of seeds
+				Timer growthTimer = NULL;
+				growthTimer = new Timer( CALL_CATEGORY_SYSTEM );
+				Param createPlantParam = new Param1<Slot>(slot);
+				growthTimer.Run( 0.1, this, "CreatePlant", createPlantParam, false ); //Use a const for timer delay
+			}
+		}
+	}
+	
+	// Creates a plant
+	void CreatePlant(Slot slot )
+	{
+		if (g_Game.IsServer())
+		{
+			ItemBase seed = slot.GetSeed();
+			seed.UnlockFromParent();
+			GetGame().ObjectDelete(seed);
+
+			PlantBase plant = PlantBase.Cast( GetInventory().CreateAttachmentEx( slot.m_PlantType, slot.GetSlotId()) );
+		
+			int slot_index = slot.GetSlotIndex();
+			slot.SetPlant(plant);						
+			plant.Init( this, slot.GetFertility(), slot.m_HarvestingEfficiency, slot.GetWater() );
+			//ShowSelection(SLOT_SELECTION_COVERED_PREFIX + (slot_index + 1).ToStringLen(2));
+				
+			plant.LockToParent();
+		}
+	}
+		
+	void Fertilize( PlayerBase player, ItemBase item, float consumed_quantity, string selection_component )
+	{
+		Slot slot = GetSlotBySelection( selection_component );
+		
+		if ( slot != NULL )
+		{
+			string item_type = item.GetType();
+			
+			if ( slot.GetFertilityType() == ""  ||  slot.GetFertilityType() == item_type )
+			{
+				slot.SetFertilityType(item_type);
+				
+				float add_energy_to_slot = GetGame().ConfigGetFloat( string.Format("cfgVehicles %1 Horticulture AddEnergyToSlot", item_type) );
+				slot.m_FertilizerUsage = GetGame().ConfigGetFloat( string.Format("cfgVehicles %1 Horticulture ConsumedQuantity", item_type) );
+				
+				float coef = Math.Clamp( consumed_quantity / slot.m_FertilizerUsage, 0.0, 1.0 );
+				add_energy_to_slot = coef * add_energy_to_slot;
+				
+				slot.m_FertilizerQuantity += consumed_quantity;
+				slot.m_Fertility += add_energy_to_slot;
+				
+				if ( slot.GetFertilizerQuantity() >= slot.GetFertilizerQuantityMax() )
+				{
+					int slot_index = slot.GetSlotIndex();
+					
+					if (slot_index > -1)
+					{
+						UpdateSlotTexture( slot_index );
+						slot.SetFertilityState(eFertlityState.FERTILIZED);
+						// Set relevant bit
+						m_SlotFertilityState |= slot.GetFertilityState() << slot.GetSlotIndex();
+						
+						//TODO Boris: Add soft skill 2.0
+						//PluginExperience module_exp = GetPlugin(PluginExperience);
+						//slot.m_HarvestingEfficiency = module_exp.GetExpParamNumber(player, PluginExperience.EXP_FARMER_FERTILIZATION, "efficiency");
+					}
+				}
+			}
+			else
+			{
+				slot.SetFertilizerQuantity(0);
+				slot.SetFertilityType("");
+				slot.SetFertilityState(eFertlityState.NONE);
+			}
+			SetSynchDirty();
+		}
+	}
+
+	bool IsCorrectFertilizer( ItemBase item, string selection_component )
+	{
+		Slot slot = GetSlotBySelection( selection_component );
+		
+		if ( slot != NULL )
+		{
+			string item_type = item.GetType();
+			
+			if ( slot.GetFertilityType() == "" || slot.GetFertilityType() == item_type )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	bool NeedsFertilization( string selection_component )
+	{
+		Slot slot = GetSlotBySelection( selection_component );
+		
+		if ( slot )
+		{
+			if ( slot.GetFertilityState() == eFertlityState.NONE )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	void SlotWaterStateUpdate( Slot slot )
+	{
+		// Set relevant bit
+		m_SlotWateredState |= slot.GetWateredState() << slot.GetSlotIndex();
+		SetSynchDirty();
+	}
+
+	void UpdateSlotTexture( int slot_index )
+	{
+		// TO DO: Fix DAYZ-30633 here!
+		Slot slot = m_Slots.Get( slot_index );
+		
+		// Show / Hide selections according to DIGGED or COVERED states.
+		
+		if ( slot.IsDigged()  ||  slot.IsPlanted() )
+		{
+			string str_hide = SLOT_SELECTION_COVERED_PREFIX + (slot_index + 1).ToStringLen(2);
+			string str_show = SLOT_SELECTION_DIGGED_PREFIX + (slot_index + 1).ToStringLen(1);
+			
+			HideSelection( str_hide );
+			ShowSelection( str_show );
+		}		
+		
+		if ( slot.GetFertilityType() != "" )
+		{
+			SetSlotTextureFertilized( slot_index, slot.GetFertilityType() );
+		}
+		else 
+		{
+			SetSlotTextureDigged( slot_index );
+		}
+	}
+
+	void SetSlotTextureDigged( int slot_index )
+	{
+		TStringArray textures = GetHiddenSelectionsTextures();
+		
+		string str_digged = SLOT_SELECTION_DIGGED_PREFIX + (slot_index + 1).ToStringLen(1);
+		
+		ShowSelection( str_digged );
+		string texture = textures.Get(0);
+		SetObjectTexture( slot_index, texture );
+		
+		Slot slot = m_Slots.Get( slot_index );
+		
+		if ( slot.GetWateredState() == 0 )
+		{
+			// Set dry material
+			SetObjectMaterial( slot_index, SLOT_MATERIAL_DRY );
+		}
+		else
+		{
+			// Set wet material
+			SetObjectMaterial( slot_index, SLOT_MATERIAL_WET );
+		}
+	}
+
+	void SetSlotTextureFertilized( int slot_index, string item_type )
+	{
+		TStringArray textures = GetHiddenSelectionsTextures();
+		
+		int tex_id = GetGame().ConfigGetInt( string.Format("cfgVehicles %1 Horticulture TexId", item_type) );
+		
+		string str_show = SLOT_SELECTION_DIGGED_PREFIX + (slot_index + 1).ToStringLen(2);
+		
+		ShowSelection( str_show );
+		SetObjectTexture( slot_index, textures.Get(tex_id) );
+		
+		Slot slot = m_Slots.Get( slot_index );
+		
+		int slot_index_offset = 0;
+		
+		// Set material according to dry / wet states
+		if ( slot.GetWateredState() == 0 )
+		{
+			// Set dry material for garden lime
+			if ( slot.GetFertilityType() == "GardenLime" )
+			{
+				SetObjectMaterial( slot_index + slot_index_offset, SLOT_MATERIAL_LIMED_DRY ); 
+			}
+			else if ( slot.GetFertilityType() == "PlantMaterial" )
+			{
+				SetObjectMaterial( slot_index + slot_index_offset, SLOT_MATERIAL_COMPOST_DRY ); 
+			}
+		}
+		else
+		{
+			// Set dry material for compost
+			if ( slot.GetFertilityType() == "GardenLime" )
+			{
+				SetObjectMaterial( slot_index + slot_index_offset, SLOT_MATERIAL_LIMED_WET ); 
+			}
+			else if ( slot.GetFertilityType() == "PlantMaterial" )
+			{
+				SetObjectMaterial( slot_index + slot_index_offset, SLOT_MATERIAL_COMPOST_WET );
+			}
+		}
+	}
+	
+	void RemoveSlot( int index )
+	{
+		if ( m_Slots != NULL )
+		{	
+			Slot slot = m_Slots.Get( index );
+			PlantBase plant = slot.GetPlant();
+			
+			if ( plant )
+			{
+				plant.UnlockFromParent();
+				plant.m_MarkForDeletion = true;
+				GetGame().ObjectDelete( plant );
+			}
+			
+			slot.Init( GetBaseFertility() );
+			
+			// Clear relevant bit
+			slot.SetFertilityState(eFertlityState.NONE);
+			m_SlotFertilityState &= ~(1 << slot.GetSlotIndex());
+			
+			slot.SetWateredState( eWateredState.DRY );
+			m_SlotWateredState &= ~(1 << slot.GetSlotIndex());
+			
+			SetSynchDirty();
+			
+			HideSelection( SLOT_SELECTION_COVERED_PREFIX + (index + 1).ToStringLen(2) );
+			UpdateSlotTexture( index );
+		}
+	}
+
+	void RemoveSlotPlant( Object plant )
+	{
+		int index = GetSlotIndexByPlant( plant );
+		if ( index >= 0 )
+		{
+			RemoveSlot( index );
+		}
+	}
+
+	Slot GetSlotBySelection( string selection_component )
+	{
+		int slot_index = GetSlotIndexBySelection( selection_component );
+		
+		if ( slot_index > -1 )
+		{
+			return m_Slots.Get( slot_index );
+		}
+		else
+		{
+			return NULL;
+		}
+	}
+
+	// Returns slot array index by selection, starting from 0 as the first one.
+	int GetSlotIndexBySelection( string selection_component )
+	{
+		int slot_index = -1;
+		
+		if ( m_Slots != NULL )
+		{
+			string selection_component_lower = selection_component; 
+			selection_component_lower.ToLower();
+			
+			int start = selection_component_lower.IndexOf( SLOT_MEMORY_POINT_PREFIX );
+			
+			if ( start > -1 )
+			{
+				start += SLOT_MEMORY_POINT_PREFIX.Length();
+				int end = start + 2;
+				int length = selection_component.Length();
+				
+				if ( length >= end )
+				{
+					int length_add = length - end; // Hack-fix for inconsistent component names in p3d
+					int length_from_end = 2 + length_add;
+					string num_str = selection_component.Substring( start, length_from_end );
+					slot_index = num_str.ToInt();
+					
+					slot_index = slot_index - 1;
+				}
+			}
+		}
+		
+		return slot_index;
+	}
+	
+	int GetSlotIndexByAttachmentSlot( string att_slot )
+	{
+		int slot_index = -1;
+		
+		int start = "SeedBase_".Length();
+		int end = att_slot.Length();//start + 2;
+		int len = end - start;
+		
+		string num_str = att_slot.Substring( start, len );
+		slot_index = num_str.ToInt();
+		
+		return slot_index;
+	}
+
+	int GetSlotIndexByPlant( Object plant )
+	{
+		if ( m_Slots != NULL )
+		{
+			for ( int i = 0; i < m_Slots.Count(); i++ )
+			{
+				PlantBase found_plant = m_Slots.Get(i).GetPlant();
+				
+				if ( found_plant == plant )
+				{
+					return i;
+				}
+			}
+		}
+		
+		return -1;
+	}
+	
+	int GetNearestSlotIDByState( vector position, int slot_state)
+	{
+		float nearest_distance = 1000.0;
+		int nearest_slot_index = -1;
+		int slots_count = GetGardenSlotsCount();
+		for ( int i = 0; i < slots_count; i++ )
+		{
+			Slot slot = m_Slots.Get(i); // Move this line by a scope higher in this function after debugging
+			
+			vector slot_pos = GetSlotPosition( i );
+			float current_distance = vector.Distance( position, slot_pos );
+			
+			if ( current_distance < nearest_distance )
+			{
+				if ( slot != NULL && slot.m_State == slot_state )
+				{
+					nearest_distance = current_distance;
+					nearest_slot_index = i;
+				}
+			}
+		}
+		
+		return nearest_slot_index;
+	}
+
+	vector GetSlotPosition( int index )
+	{
+		string memory_point = SLOT_MEMORY_POINT_PREFIX + (index + 1).ToStringLen(2);
+		vector pos = this.GetSelectionPositionMS( memory_point );
+		
+		return this.ModelToWorld( pos );
+	}
+	
+	void CheckRainStart()
+	{
+		if ( !m_CheckRainTimer )
+			m_CheckRainTimer = new Timer( CALL_CATEGORY_SYSTEM );
+		
+		m_CheckRainTimer.Run( CHECK_RAIN_INTERVAL, this, "CheckRainTick", NULL, true );
+	}
+	
+	void CheckRainTick()
+	{
+		float rain_intensity = GetGame().GetWeather().GetRain().GetActual();
+			
+		float wetness = rain_intensity * 20 * CHECK_RAIN_INTERVAL;
+		
+		if (rain_intensity > 1  ||  rain_intensity < 0)
+			wetness = 0; // hackfix for weird values returned by weather system
+		
+		if (wetness == 0)
+			wetness = -0.1 * CHECK_RAIN_INTERVAL;
+		
+		int slots_count = GetGardenSlotsCount();
+		
+		if ( rain_intensity > 0 )
+		{
+			WaterAllSlots();
+			SetSynchDirty();
+		}
+		
+		for ( int i = 0; i < slots_count; i++ )
+		{
+			if ( m_Slots )
+			{
+				Slot slot = m_Slots.Get( i );
+				
+				if ( slot )
+				{
+					slot.GiveWater( wetness * Math.RandomFloat01() );
+				}
+			}
+		}
+	}
+	
+	//Used to update
+	void WaterAllSlots()
+	{
+		int state = 0;
+		
+		for ( int i = 0; i < m_Slots.Count(); i++ )
+		{
+			state += 1 * Math.Pow( 2, i );
+		}
+		
+		SetSlotWateredState( state );
+	}
+	
+	array<ref Slot> GetSlots()
+	{
+		return m_Slots;
+	}
+	
+	Slot GetSlotByIndex( int index )
+	{
+		return m_Slots.Get(index);
+	}
+	
+	int GetSlotWateredState()
+	{
+		return m_SlotWateredState;
+	}
+	
+	void SetSlotWateredState( int newState )
+	{
+		m_SlotWateredState = newState;
+	}
+	
+	override void SetActions()
+	{
+		AddAction(ActionHarvestCrops);
+		AddAction(ActionRemovePlant);
+		AddAction(ActionRemoveSeed);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/GardenBase/GardenPlot.c b/scripts/4_World/DayZ/Entities/GardenBase/GardenPlot.c
new file mode 100644
index 0000000000000000000000000000000000000000..b8a9613b85807763c7ee1f8ebaf64b320a442d0b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/GardenBase/GardenPlot.c
@@ -0,0 +1,154 @@
+class GardenPlot extends GardenBase
+{
+	Object 	m_ClutterCutter;
+	private const int GARDEN_SLOT_COUNT = 9;
+	
+	void GardenPlot()
+	{
+		SetBaseFertility(0.5);
+	}
+	
+	override void EEInit()
+	{	
+		super.EEInit();
+	}	
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{				
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+
+		if ( !m_ClutterCutter )
+		{		
+			m_ClutterCutter = GetGame().CreateObjectEx( "ClutterCutter6x6", GetPosition(), ECE_PLACE_ON_SURFACE );
+			m_ClutterCutter.SetOrientation( GetOrientation() );
+		}
+
+		return true;
+	}
+
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		if (m_ClutterCutter  &&  GetGame())
+		{
+			GetGame().ObjectDelete(m_ClutterCutter);
+			m_ClutterCutter = NULL;
+		}
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		return true;
+	}
+
+	override int GetGardenSlotsCount()
+	{
+		return GARDEN_SLOT_COUNT;
+	}
+
+	void RefreshSlots()
+	{
+		HideSelection("SeedBase_1");
+		HideSelection("SeedBase_2");
+		HideSelection("SeedBase_3");
+		HideSelection("SeedBase_4");
+		HideSelection("SeedBase_5");
+		HideSelection("SeedBase_6");
+		HideSelection("SeedBase_7");
+		HideSelection("SeedBase_8");
+		HideSelection("SeedBase_9");
+		HideSelection("slotCovered_01");
+		HideSelection("slotCovered_02");
+		HideSelection("slotCovered_03");
+		HideSelection("slotCovered_04");
+		HideSelection("slotCovered_05");
+		HideSelection("slotCovered_06");
+		HideSelection("slotCovered_07");
+		HideSelection("slotCovered_08");
+		HideSelection("slotCovered_09");
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementStarted( Man player )
+	{
+		RefreshSlots();
+	}
+	
+	override void OnHologramBeingPlaced( Man player )
+	{
+		RefreshSlots();
+	}
+	
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+				
+		PlayerBase player_base = PlayerBase.Cast( player );
+		//vector pos = player_base.GetLocalProjectionPosition();
+		//vector ori = player_base.GetLocalProjectionOrientation();
+			
+		if ( GetGame().IsServer() )
+		{
+			// To properly move the clutter cutter from spawn position, it must be deleted and created again.
+			if (m_ClutterCutter)
+			{
+				GetGame().ObjectDelete(m_ClutterCutter);
+				m_ClutterCutter = NULL;
+			}
+			
+			if (!m_ClutterCutter)
+			{		
+				m_ClutterCutter = GetGame().CreateObjectEx( "ClutterCutter6x6", GetPosition(), ECE_PLACE_ON_SURFACE );
+				m_ClutterCutter.SetOrientation( orientation );
+			}
+		}
+	}
+	
+	override bool CanBePlaced( Man player, vector position )
+	{
+		string surface_type;
+		GetGame().SurfaceGetType3D( position[0], position[1], position[2], surface_type );
+		
+		return GetGame().IsSurfaceFertile(surface_type);
+	}
+}
+
+//class GardenPlotOutside : GardenPlot {}
+class GardenPlotPolytunnel : GardenPlot
+{
+	private const int POLYTUNNEL_SLOT_COUNT = 13;
+	override int GetGardenSlotsCount()
+	{
+		return POLYTUNNEL_SLOT_COUNT;
+	}
+	
+	override void RefreshSlots()
+	{
+		HideSelection("SeedBase_1");
+		HideSelection("SeedBase_2");
+		HideSelection("SeedBase_3");
+		HideSelection("SeedBase_4");
+		HideSelection("SeedBase_5");
+		HideSelection("SeedBase_6");
+		HideSelection("SeedBase_7");
+		HideSelection("SeedBase_8");
+		HideSelection("SeedBase_9");
+		HideSelection("SeedBase_10");
+		HideSelection("SeedBase_11");
+		HideSelection("SeedBase_12");
+		HideSelection("SeedBase_13");
+	}
+}
+class GardenPlotGreenhouse : GardenPlot {}
+
+class GardenPlotPlacing extends GardenPlot
+{
+	override void EOnInit(IEntity other, int extra) {};
+	override void RefreshSlots() {};
+	override void SyncSlots() {};
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/GardenBase/PlantBase.c b/scripts/4_World/DayZ/Entities/GardenBase/PlantBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..da5a3c69b3374171ac51072b0440fe128c77addc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/GardenBase/PlantBase.c
@@ -0,0 +1,919 @@
+class PlantBase extends ItemBase
+{
+	// Plant states
+	static const int STATE_DRY 					= 0;
+	static const int STATE_GROWING 				= 1;
+	static const int STATE_MATURE 				= 2;
+	static const int STATE_SPOILED 				= 3;
+
+	private float 	m_SprayUsage; // How much spray is needed to stop infestation of plant
+	
+	private float 	m_InfestationChance;
+	
+	private int 	m_GrowthStagesCount; 
+	private int 	m_CropsCount;
+	private bool 	m_HasCrops;
+	private string 	m_CropsType; 
+	private float 	m_PlantMaterialMultiplier; 
+	
+	private int 	m_PlantState;
+	private int 	m_PlantStateIndex;
+	private float 	m_CurrentPlantMaterialQuantity;
+	
+	private bool 	m_IsInfested;
+	private float 	m_SprayQuantity;
+	bool 			m_MarkForDeletion = false;
+	
+	int 	m_DeleteDryPlantTime; 			// For how long in seconds can an unwatered plant exist before it disappears
+	int 	m_SpoiledRemoveTime;			// For how long in seconds a spoiled plant will exist
+	int 	m_FullMaturityTime;				// How much time needs plant to be full grown in seconds
+	int 	m_SpoilAfterFullMaturityTime;	// How long in seconds it takes for plant to be spoiled after it is full grown
+	int 	m_StateChangeTime;				// For how long in seconds will plant stay in one state before its going to next state
+	
+    ref Timer m_GrowthTimer = NULL;
+    ref Timer m_InfestationTimer = NULL;
+    ref Timer m_SpoilAfterFullMaturityTimer = NULL;
+    ref Timer m_SpoiledRemoveTimer = NULL;
+	ref Timer m_DeleteDryPlantTimer = NULL;
+	
+	private GardenBase m_GardenBase = NULL;
+	private ref Slot m_Slot = NULL;
+	
+	private PluginHorticulture m_ModuleHorticulture;
+	
+	private const float SPOIL_AFTER_MATURITY_TIME = 14400; //The time it takes for a fully grown plant to spoil, in seconds
+	
+	void PlantBase()
+	{
+		m_ModuleHorticulture = PluginHorticulture.Cast( GetPlugin( PluginHorticulture ) );
+		
+		m_SprayUsage = 5;
+		m_DeleteDryPlantTime = (60 * 10) + Math.RandomInt(0, 60 * 2);
+		m_SpoiledRemoveTime = (60 * 20) + Math.RandomInt(0, 60 * 5);
+		
+		//Must be between 0 and 1
+		m_InfestationChance = 0.2; // Temporarily disabled until its fixed. Infestation is not visualy persistent over server restarts and m_SpoiledRemoveTimer crashes when it's meant to delete the plant.
+		
+		string plant_type = this.GetType();
+		m_GrowthStagesCount = GetGame().ConfigGetInt( "cfgVehicles " + plant_type + " Horticulture GrowthStagesCount" );
+		m_CropsCount = GetGame().ConfigGetInt( "cfgVehicles " + plant_type + " Horticulture CropsCount" );
+		GetGame().ConfigGetText( "cfgVehicles " + plant_type + " Horticulture CropsType", m_CropsType );
+
+		m_PlantStateIndex = -1;
+		m_CurrentPlantMaterialQuantity = 0;
+		m_IsInfested = false;
+		m_SprayQuantity = 0.0;
+		m_HasCrops = true;
+		
+		SetTakeable( false );
+		
+		
+		RegisterNetSyncVariableBool("m_HasCrops");
+		RegisterNetSyncVariableInt("m_PlantState");
+		RegisterNetSyncVariableInt("m_PlantStateIndex");
+	}
+
+	void ~PlantBase()
+	{
+		if (!m_MarkForDeletion)
+		{
+			DestroyPlant();
+		}
+	}
+	
+	void Init( GardenBase garden_base, float fertility, float harvesting_efficiency, float water )
+	{
+		m_GardenBase = garden_base;
+		
+		m_FullMaturityTime += Math.RandomInt(-60,180);
+		float divided = /*(float) ((60 * 5) + Math.RandomInt(0, 60 * 1)) / fertility;*/ m_FullMaturityTime;
+		
+		//divided = (float)((60 * 30) + Math.RandomInt(0, 60 * 30)) * fertility;
+		m_SpoilAfterFullMaturityTime = SPOIL_AFTER_MATURITY_TIME; //divided;
+
+		divided = (float)((float)m_FullMaturityTime / ((float)m_GrowthStagesCount - 2.0));
+		m_StateChangeTime = divided;
+
+		float count = m_CropsCount * fertility * harvesting_efficiency;
+		m_CropsCount = (int)Math.Ceil( count );
+
+		m_PlantMaterialMultiplier = 0.1 * harvesting_efficiency;
+		
+		float rain_intensity = GetGame().GetWeather().GetRain().GetActual();
+		if ( rain_intensity > 0.0 )
+		{
+			CheckWater();
+		}
+		else
+		{
+			CheckWater();
+			
+			if ( NeedsWater() )
+			{
+				SetPlantState(STATE_DRY);
+				
+				if (GetGame().IsServer())
+				{
+					m_DeleteDryPlantTimer = new Timer( CALL_CATEGORY_SYSTEM );
+					m_DeleteDryPlantTimer.Run( m_DeleteDryPlantTime, this, "DeleteDryPlantTick", NULL, false );
+				}
+			}
+		}
+	}
+
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		//Print("Plant - OnStoreLoad - ");
+		
+		GardenBase garden = GardenBase.Cast( GetHierarchyParent() );
+		//Print(garden);
+		
+		int slot_index = -1;
+		ctx.Read( slot_index );
+		
+		//Print(slot_index);
+		
+		Slot slot = garden.GetSlotByIndex(slot_index);
+		//Print(slot);
+		
+		SetSlot(slot);
+
+		if ( !OnStoreLoadCustom( ctx, version ) )
+			return false;
+
+		return true;
+	}
+
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{
+		super.OnStoreSave( ctx );
+		
+		Slot slot = GetSlot();
+		
+		if (slot)
+		{
+			int slot_index = slot.GetSlotIndex();
+			slot.SetPlant(this); // hack
+			
+			ctx.Write( slot_index );
+			
+			OnStoreSaveCustom( ctx );
+		}
+		else
+		{
+			GetGame().ObjectDelete(this); // Plants that exist without a garden must be deleted. Otherwise they might cause problems.
+			Print("Warning! A plant existed without a garden. Therefore it was deleted from the world to prevent issues!");
+		}
+	}
+	
+	string GetCropsType()
+	{
+		return m_CropsType;
+	}
+	
+	
+	bool OnStoreLoadCustom( ParamsReadContext ctx, int version )
+	{
+		int loadInt;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 0;
+		
+		m_SprayUsage = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 5;
+		
+		m_DeleteDryPlantTime = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			 loadInt = 5;
+		m_SpoiledRemoveTime = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 300;
+		m_FullMaturityTime = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 300;
+		m_SpoilAfterFullMaturityTime = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			return false;
+		m_StateChangeTime = loadInt;
+		
+		float loadFloat = 0.0;
+		if ( !ctx.Read( loadFloat ) )
+			loadFloat = 0;
+		m_InfestationChance = loadFloat;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			return false;
+		m_GrowthStagesCount = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 1;
+		m_CropsCount = loadInt;
+		
+		string loadString = "";
+		if ( !ctx.Read( loadString ) )
+			return false;
+		m_CropsType = loadString;
+		
+		loadFloat = 0.0;
+		if ( !ctx.Read( loadFloat ) )
+			loadFloat = 1;
+		m_PlantMaterialMultiplier = loadFloat;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 1;
+		m_PlantState = loadInt;
+		
+		loadInt = 0;
+		if ( !ctx.Read( loadInt ) )
+			loadInt = 0;
+		m_PlantStateIndex = loadInt;
+		
+		loadFloat = 0.0;
+		if ( !ctx.Read( loadFloat ) )
+			loadFloat = 1;
+		m_CurrentPlantMaterialQuantity = loadFloat;
+		
+		bool loadBool = false;
+		if ( !ctx.Read( loadBool ) )
+			loadBool = false;
+		m_IsInfested = loadBool;
+		 
+		loadFloat = 0.0;
+		if ( !ctx.Read( loadFloat ) )
+			loadFloat = 0;
+		m_SprayQuantity = loadFloat;
+		
+		
+		
+		loadBool = false;
+		if ( ctx.Read( loadBool ) )
+		{
+			if ( loadBool )
+			{
+				if (GetGame().IsServer())
+				{
+					m_GrowthTimer = new Timer( CALL_CATEGORY_SYSTEM );
+					m_GrowthTimer.Run( m_StateChangeTime, this, "GrowthTimerTick", NULL, true );
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		
+		loadFloat = 0.0;
+		if ( ctx.Read( loadFloat ) )
+		{
+			if ( loadFloat > 0.0 )
+			{
+				if (GetGame().IsServer())
+				{
+					m_InfestationTimer = new Timer( CALL_CATEGORY_SYSTEM );
+					m_InfestationTimer.Run( loadFloat, this, "InfestationTimerTick", NULL, false );
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		
+		loadFloat = 0.0;
+		if ( ctx.Read( loadFloat ) )
+		{
+			if ( loadFloat > 0.0 )
+			{
+				if (GetGame().IsServer())
+				{
+					m_SpoilAfterFullMaturityTimer = new Timer( CALL_CATEGORY_SYSTEM );
+					m_SpoilAfterFullMaturityTimer.Run( loadFloat, this, "SetSpoiled", NULL, false );
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		
+		loadFloat = 0.0;
+		if ( ctx.Read( loadFloat ) )
+		{
+			if ( loadFloat > 0.0 )
+			{
+				if (GetGame().IsServer())
+				{
+					if (!m_SpoiledRemoveTimer)
+						m_SpoiledRemoveTimer = new Timer( CALL_CATEGORY_SYSTEM );
+					
+					m_SpoiledRemoveTimer.Run( loadFloat, this, "SpoiledRemoveTimerTick", NULL, false );
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		
+		loadFloat = 0.0;
+		if ( ctx.Read( loadFloat ) )
+		{
+			if ( loadFloat > 0.0 )
+			{
+				if (GetGame().IsServer())
+				{
+					m_DeleteDryPlantTimer = new Timer( CALL_CATEGORY_SYSTEM );
+					m_DeleteDryPlantTimer.Run( loadFloat, this, "DeleteDryPlantTick", NULL, false );
+				}
+			}
+		}
+		else
+		{
+			return false;
+		}
+		
+
+		UpdatePlant();
+		return true;
+	}
+
+	void OnStoreSaveCustom( ParamsWriteContext ctx )
+	{
+		ctx.Write( m_SprayUsage );
+		
+		ctx.Write( m_DeleteDryPlantTime );
+		
+		ctx.Write( m_SpoiledRemoveTime );
+		
+		ctx.Write( m_FullMaturityTime );
+		
+		ctx.Write( m_SpoilAfterFullMaturityTime );
+		
+		ctx.Write( m_StateChangeTime );
+		
+		ctx.Write( m_InfestationChance );
+		
+		ctx.Write( m_GrowthStagesCount );
+		
+		ctx.Write( m_CropsCount );
+		
+		ctx.Write( m_CropsType );
+		
+		ctx.Write( m_PlantMaterialMultiplier );
+		
+		ctx.Write( m_PlantState );
+		
+		ctx.Write( m_PlantStateIndex );
+		
+		ctx.Write( m_CurrentPlantMaterialQuantity );
+		
+		ctx.Write( m_IsInfested );
+		 
+		ctx.Write( m_SprayQuantity );
+		
+		bool saveBool = false;
+		if ( m_GrowthTimer != NULL )
+		{
+			saveBool = true;
+		}
+		ctx.Write( saveBool );
+		
+		float saveFloat = 0.0;
+		if ( m_InfestationTimer != NULL )
+		{
+			saveFloat = m_InfestationTimer.GetRemaining();
+		}
+		ctx.Write( saveFloat );
+		
+		saveFloat = 0.0;
+		if ( m_SpoilAfterFullMaturityTimer != NULL )
+		{
+			saveFloat = m_SpoilAfterFullMaturityTimer.GetRemaining();
+		}
+		ctx.Write( saveFloat );
+		
+		saveFloat = 0.0;
+		if ( m_SpoiledRemoveTimer != NULL )
+		{
+			saveFloat = m_SpoiledRemoveTimer.GetRemaining();
+		}
+		ctx.Write( saveFloat );
+		
+		saveFloat = 0.0;
+		if ( m_DeleteDryPlantTimer != NULL )
+		{
+			saveFloat = m_DeleteDryPlantTimer.GetRemaining();
+		}
+		ctx.Write( saveFloat );
+	}
+	
+	void PrintValues()
+	{
+		Print("PRINT ALL VALUES OF PLANT...");
+		Print(this);
+		
+		Print(m_HasCrops);
+		Print(m_PlantState);
+		Print(m_PlantStateIndex);
+		Print(m_CurrentPlantMaterialQuantity);
+		Print(m_IsInfested);
+		Print(m_SprayQuantity);
+		Print(m_Slot);
+		Print(m_GardenBase);
+		Print("----------------------------------------------------------");
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return super.CanPutInCargo(parent);
+	}
+
+	override bool CanPutIntoHands( EntityAI player )
+	{
+		return super.CanPutIntoHands(parent);
+	}
+
+	override bool CanRemoveFromHands( EntityAI player )
+	{
+		return false;
+	}
+
+	void ChangeInfestation( bool is_infested )
+	{
+		m_IsInfested = is_infested;
+		
+		string plant_type = GetType();
+		PlantMaterialHealth material = m_ModuleHorticulture.GetPlantMaterial( plant_type );
+		
+		if ( m_IsInfested )
+		{
+			if ( material.m_InfestedTex != "" )
+			{
+				SetObjectTexture( 0, material.m_InfestedTex );
+			}
+			if ( material.m_InfestedMat != "" )
+			{
+				SetObjectMaterial( 0, material.m_InfestedMat );
+			}
+		}
+		else 
+		{
+			if ( material.m_HealthyTex != "" )
+			{
+				SetObjectTexture( 0, material.m_HealthyTex );
+			}
+			if ( material.m_HealthyMat != "" )
+			{
+				SetObjectMaterial( 0, material.m_HealthyMat );
+			}
+		}
+	}
+
+	void UpdatePlant()
+	{
+		if ( m_PlantStateIndex > 0 )
+		{
+			string plant_state_index = m_PlantStateIndex.ToStringLen(2); 
+			string prev_plant_state_index = ( m_PlantStateIndex - 1 ).ToStringLen( 2 );
+			
+			// HIDING PREVIOUS PLANT STATE AND SHOWING THE CURRENT ONE
+			ShowSelection( "plantStage_" + plant_state_index ); // SHOW!
+			HideSelection( "plantStage_" + prev_plant_state_index ); // HIDE!
+			
+			// HIDING PREVIOUS CROPS STATE AND SHOWING THE CURRENT ONE
+			
+			if ( HasCrops() )
+			{
+				ShowSelection( "plantStage_" + plant_state_index + "_crops" ); // SHOW!
+				HideSelection( "plantStage_" + prev_plant_state_index + "_crops" ); // HIDE!
+			}
+			else
+			{
+				HideSelection( "plantStage_" + plant_state_index + "_crops" ); // HIDE!
+				HideSelection( "plantStage_" + prev_plant_state_index + "_crops" ); // HIDE!
+			}
+
+			// HIDING PREVIOUS SHADOW STATE AND SHOWING THE CURRENT ONE
+			ShowSelection( "plantStage_" + plant_state_index + "_shadow" ); // SHOW!
+			HideSelection( "plantStage_" + prev_plant_state_index + "_shadow" ); // HIDE!
+		}
+		
+		float float_plant_state_index = (float)m_PlantStateIndex;
+		m_CurrentPlantMaterialQuantity = m_PlantMaterialMultiplier * float_plant_state_index;
+	}
+
+	void GrowthTimerTick()
+	{
+		if ( IsGrowing() )
+		{
+			if ( m_PlantStateIndex < m_GrowthStagesCount - 2 )
+			{
+				m_PlantStateIndex++;
+				UpdatePlant();
+				SetSynchDirty();
+				
+				if ( m_PlantStateIndex == 0 )
+				{
+					float infestation_time_min = (float)m_FullMaturityTime * 0.2;
+					int int_infestation_time_min = (int)infestation_time_min;
+					
+					float infestation_time_max = (float)m_FullMaturityTime * 0.6;
+					int int_infestation_time_max = (int)infestation_time_max;
+					
+					if (GetGame().IsServer())
+					{
+						if (!m_InfestationTimer)
+							m_InfestationTimer = new Timer( CALL_CATEGORY_SYSTEM );
+						
+						m_InfestationTimer.Run( Math.RandomInt(int_infestation_time_min, int_infestation_time_max), this, "InfestationTimerTick", NULL, false );
+					}
+				}
+					
+				if ( m_PlantStateIndex == m_GrowthStagesCount - 2 )
+				{
+					if ( m_IsInfested )
+					{
+						SetSpoiled();
+					}
+					else
+					{
+						SetPlantState(STATE_MATURE);
+					}
+				}
+			}
+		}
+		else if ( IsMature() )
+		{
+			if (GetGame().IsServer())
+			{
+				if (!m_SpoilAfterFullMaturityTimer)
+					m_SpoilAfterFullMaturityTimer = new Timer( CALL_CATEGORY_SYSTEM );
+				
+				if ( !m_SpoilAfterFullMaturityTimer.IsRunning() )
+					m_SpoilAfterFullMaturityTimer.Run( m_SpoilAfterFullMaturityTime, this, "SetSpoiled", NULL, false );
+			}
+		}
+	}
+
+	void InfestationTimerTick()
+	{
+		float infestation_rnd = Math.RandomFloat01();
+		
+		if ( m_InfestationChance > infestation_rnd )
+		{
+			ChangeInfestation( true );
+		}
+	}
+
+	void SpoiledRemoveTimerTick()
+	{
+		if ( m_GrowthTimer != NULL )
+		{
+			m_GrowthTimer.Stop();
+		}
+		
+		RemoveSlot();
+	}
+	
+	void DeleteDryPlantTick()
+	{
+		/*if ( IsDry() )
+		{
+			RemoveSlot();
+		}*/
+	}
+
+	void SetSpoiled()
+	{
+		if ( IsSpoiled() == false )
+		{
+			m_PlantStateIndex++;
+			SetPlantState(STATE_SPOILED);
+			UpdatePlant();
+			SetSynchDirty();
+			
+			if (GetGame().IsServer())
+			{
+				if (!m_SpoiledRemoveTimer)
+					m_SpoiledRemoveTimer = new Timer( CALL_CATEGORY_SYSTEM );
+				
+				if (!m_SpoiledRemoveTimer.IsRunning())
+					m_SpoiledRemoveTimer.Run( m_SpoiledRemoveTime, this, "SpoiledRemoveTimerTick", NULL, false );
+			}
+		}
+	}
+
+	void CheckWater()
+	{
+		if ( !IsMature()  &&  !NeedsWater() )
+		{
+			if ( m_DeleteDryPlantTimer )
+			{
+				m_DeleteDryPlantTimer.Stop();
+			}
+			
+			SetPlantState(STATE_GROWING);
+			
+			if (GetGame().IsServer())
+			{
+				m_GrowthTimer = new Timer( CALL_CATEGORY_SYSTEM );
+				m_GrowthTimer.Run( m_StateChangeTime, this, "GrowthTimerTick", NULL, true );
+			}
+		}
+	}
+	
+	//NEW METHOD FOR PLANT SPRAYING
+	void SprayPlant( float consumed_quantity )
+	{
+		//Rework this to have something smooth
+		m_SprayQuantity += consumed_quantity;
+		
+		if ( !NeedsSpraying() )
+		{
+			if ( m_InfestationTimer != NULL )
+			{
+				m_InfestationTimer.Stop();
+			}
+			
+			m_IsInfested = false;
+			m_InfestationChance = 0;
+			
+			ChangeInfestation( false );
+			UpdatePlant();
+		}
+	}
+
+	//DEPRECATED
+	string StopInfestation( float consumed_quantity )
+	{
+		m_SprayQuantity += consumed_quantity;
+		
+		if ( !NeedsSpraying() )
+		{
+			if ( m_InfestationTimer != NULL )
+			{
+				m_InfestationTimer.Stop();
+			}
+			
+			m_IsInfested = false;
+			m_InfestationChance = 0;
+			
+			ChangeInfestation( false );
+			UpdatePlant();
+			
+			return "I've sprayed the plant a bit. Now it is enough spayed.";
+		}
+		else
+		{
+			return "I've sprayed the plant a bit.";
+		}
+	}
+
+	//DEPRECATED
+	void RemovePlant()
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			UnlockFromParent();
+			
+			if ( m_CurrentPlantMaterialQuantity > 0.0 )
+			{
+				vector pos = GetPosition();
+				ItemBase item = ItemBase.Cast( GetGame().CreateObjectEx( "PlantMaterial", pos, ECE_PLACE_ON_SURFACE ) );
+				item.SetQuantity( m_CurrentPlantMaterialQuantity * 1000.0 );
+			}
+			
+			RemoveSlot();
+		}
+	}
+	
+	void RemovePlantEx( vector pos )
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			UnlockFromParent();
+			
+			if ( m_CurrentPlantMaterialQuantity > 0.0 )
+			{
+				ItemBase item = ItemBase.Cast( GetGame().CreateObjectEx( "PlantMaterial", pos, ECE_PLACE_ON_SURFACE ) );
+				item.SetQuantity( m_CurrentPlantMaterialQuantity * 1000.0 );
+			}
+			
+			RemoveSlot();
+		}
+	}
+	
+	void DestroyPlant()
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			UnlockFromParent();
+			
+			RemoveSlot();
+		}
+	}
+
+	void Harvest( PlayerBase player )
+	{
+		//TODO Boris: Add soft skill 2.0
+		//PluginExperience module_exp = GetPlugin(PluginExperience);
+		//float harvesting_efficiency = module_exp.GetExpParamNumber(player, PluginExperience.EXP_FARMER_HARVESTING, "efficiency");
+		
+		//m_CropsCount = m_CropsCount * harvesting_efficiency;
+		
+		if ( !IsSpoiled() )
+		{
+			for ( int i = 0; i < m_CropsCount; i++ )
+			{
+				vector pos = player.GetPosition();
+				ItemBase item = ItemBase.Cast( GetGame().CreateObjectEx( m_CropsType, pos, ECE_PLACE_ON_SURFACE ) );
+				item.SetQuantity( item.GetQuantityMax() );
+			}
+		}
+		
+		m_HasCrops = false;
+		SetSynchDirty();
+		UpdatePlant();
+	}
+	
+	void SetPlantState(int state)
+	{
+		m_PlantState = state;
+		SetSynchDirty();
+	}
+	
+	int GetPlantState()
+	{
+		return m_PlantState;
+	}
+	
+	int GetPlantStateIndex()
+	{
+		return m_PlantStateIndex;
+	}
+	
+	float GetWater()
+	{
+		if ( GetSlot() )
+			return GetSlot().GetWater();
+
+		return 0;
+	}
+	
+	float GetWaterMax()
+	{
+		if ( GetSlot() )
+			return GetSlot().GetWaterUsage();
+
+		return 0;
+	}
+	
+	bool NeedsWater()
+	{
+		Slot slotPlant = m_Slot;
+		
+		if ( IsDry() && slotPlant && slotPlant.GetWater() < slotPlant.GetWaterUsage() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	bool NeedsSpraying()
+	{
+		if ( m_SprayQuantity < m_SprayUsage )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	float GetSprayQuantity()
+	{
+		return m_SprayQuantity;
+	}	
+
+	float GetSprayUsage()
+	{
+		return m_SprayUsage;
+	}	
+	
+	void RemoveSlot()
+	{
+		GardenBase garden = GardenBase.Cast( GetHierarchyParent() );
+		
+		if ( garden )
+		{
+			if (m_SpoiledRemoveTimer)
+			{
+				m_SpoiledRemoveTimer.Stop();
+				m_SpoiledRemoveTimer = NULL;
+			}
+			
+			garden.RemoveSlotPlant( this );
+		}
+	}
+	
+	void SetSlot(Slot slot)
+	{
+		if ( slot )
+		{
+			m_Slot = slot;
+		}
+	}
+	
+	Slot GetSlot()
+	{
+		return m_Slot;
+	}
+	
+	GardenBase GetGarden()
+	{
+		return m_GardenBase;
+	}
+
+	bool IsDry()
+	{
+		if ( GetPlantState() == STATE_DRY )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	bool IsGrowing()
+	{
+		if ( GetPlantState() == STATE_GROWING )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+
+	bool IsMature()
+	{
+		if ( GetPlantState() == STATE_MATURE )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	bool IsSpoiled()
+	{
+		if ( GetPlantState() == STATE_SPOILED )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	bool HasCrops()
+	{
+		return m_HasCrops;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionHarvestCrops);
+		AddAction(ActionRemovePlant);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/GardenBase/Slot.c b/scripts/4_World/DayZ/Entities/GardenBase/Slot.c
new file mode 100644
index 0000000000000000000000000000000000000000..dce0b973db8e22e8af1dd8c390b587778958956b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/GardenBase/Slot.c
@@ -0,0 +1,361 @@
+enum eFertlityState
+{
+	NONE = 0,
+	FERTILIZED = 1
+	//This will be used to set bit values (DO NOT ADD MORE VALUES)
+}
+
+enum eWateredState
+{
+	DRY = 0,
+	WET = 1
+	//Used to improve readability of watered state changes
+}
+
+class Slot
+{
+	static const int 		STATE_DIGGED 		= 1;
+	static const int 		STATE_PLANTED 		= 2;
+	
+	private int 			m_WaterQuantity;
+	static private int 		m_WaterNeeded 		= 190; // How much water is needed to water a plant from a bottle. Value is in mililitres
+	static private int 		m_WaterMax 			= 200; 
+	
+	float m_Fertility;
+	float m_FertilizerUsage;
+	float m_FertilizerQuantity;
+	int m_slotIndex;
+	int m_slotId;
+	
+	string m_FertilizerType;
+	int    m_FertilityState = eFertlityState.NONE;
+	int    m_WateredState = eWateredState.DRY;
+	string m_DiggedSlotComponent; // example: "Component02" for the 1st slot in GardenBase
+	string m_PlantType;
+	private ItemBase m_Seed;
+	private GardenBase m_Garden;
+	
+	float m_HarvestingEfficiency;
+	
+	int m_State;
+	
+	private PlantBase m_Plant;
+	
+	void Slot( float base_fertility )
+	{
+		m_Seed = NULL;
+		m_Plant = NULL;
+		m_WaterQuantity = 0.0;
+		Init( base_fertility );
+	}
+
+	void ~Slot()
+	{
+		if (m_Plant  &&  GetGame()) // GetGame() returns NULL when the game is being quit!
+		{
+			GetGame().ObjectDelete( GetPlant() );
+		}
+	}
+	
+	int GetSlotIndex()
+	{
+		return m_slotIndex;
+	}
+	
+	void SetSlotIndex(int index)
+	{
+		m_slotIndex = index;
+	}
+	
+	int GetSlotId()
+	{
+		return m_slotId;
+	}
+
+	void SetSlotId(int id)
+	{
+		m_slotId = id;
+	}
+	
+	void SetGarden(GardenBase garden)
+	{
+		m_Garden = garden;
+	}
+	
+	GardenBase GetGarden()
+	{
+		return m_Garden;
+	}
+	
+	void SetSeed(ItemBase seed)
+	{
+		m_Seed = seed;
+	}
+	
+	PlantBase GetPlant()
+	{
+		return m_Plant;
+	}
+	
+	void SetPlant(PlantBase plant)
+	{
+		m_Plant = plant;
+		
+		if (plant)
+		{
+			plant.SetSlot(this);
+		}
+	}
+	
+	//Used to force water level an go around sync issues
+	void SetWater( int val )
+	{
+		val = Math.Clamp( val, 0, m_WaterMax );
+		m_WaterQuantity = val;
+	}
+	
+	ItemBase GetSeed()
+	{
+		return m_Seed;
+	}
+	
+	bool HasSeed()
+	{
+		if (m_Seed)
+			return true;
+		
+		return false;
+	}
+	
+	void GiveWater( float consumed_quantity )
+	{
+		bool needed_water = NeedsWater();
+		m_WaterQuantity += consumed_quantity;
+		
+		if (m_WaterQuantity >= GetWaterMax())
+			m_WaterQuantity = GetWaterMax();
+		
+		if (m_WaterQuantity < 0)
+			m_WaterQuantity = 0;
+		
+		if ( !NeedsWater() )
+		{
+			if ( !GetPlant() )
+			{
+				if ( GetSeed() )
+				{
+					GetGarden().CreatePlant(this);
+				}
+				
+				// if there is no seed then do not create plant. Plant will be created when the seed is inserted into watered slot.
+			}
+		}
+		
+		if ( needed_water != NeedsWater() )
+		{
+			SetWateredState( eWateredState.WET );
+			GetGarden().UpdateSlotTexture( GetSlotIndex() );
+			if ( m_Garden.GetSlotWateredState() != m_Garden.GetMaxWaterStateVal() )
+				m_Garden.SlotWaterStateUpdate( this );
+		}
+	}
+	
+	bool NeedsWater()
+	{
+		if ( m_WaterQuantity < GetWaterUsage() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	bool CanBeWatered()
+	{
+		if ( m_WaterQuantity < GetWaterMax() )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	float GetWater()
+	{
+		return m_WaterQuantity;
+	}
+	
+	float GetFertility()
+	{
+		return m_Fertility;
+	}
+	
+	float GetFertilityMax()
+	{
+		return m_FertilizerUsage;
+	}
+	
+	void SetFertility(float fertility)
+	{
+		m_Fertility = fertility;
+	}
+	
+	float GetFertilizerQuantity()
+	{
+		return m_FertilizerQuantity;
+	}
+	
+	float GetFertilizerQuantityMax()
+	{
+		return m_FertilizerUsage;
+	}
+	
+	void SetFertilizerQuantity(float fertility)
+	{
+		m_FertilizerQuantity = fertility;
+	}
+	
+	string GetFertilityType()
+	{
+		return m_FertilizerType;
+	}
+	
+	void SetFertilityType(string type)
+	{
+		m_FertilizerType = type;
+	}
+	
+	int GetFertilityState()
+	{
+		return m_FertilityState;
+	}
+	
+	void SetFertilityState( int newState )
+	{
+		m_FertilityState = newState;
+	}
+	
+	int GetWateredState()
+	{
+		return m_WateredState;
+	}
+	
+	void SetWateredState( int newState )
+	{
+		m_WateredState = newState;
+		if ( m_WateredState == eWateredState.WET )
+			SetWater( GetWaterMax() );
+	}
+	
+	float GetWaterUsage()
+	{
+		return m_WaterNeeded;
+	}
+	
+	float GetWaterMax()
+	{
+		return m_WaterMax;
+	}
+	
+	int GetState()
+	{
+		return m_State;
+	}
+	
+	void SetState(int new_state)
+	{
+		m_State = new_state;
+	}
+	
+	bool IsDigged()
+	{
+		if (m_State == STATE_DIGGED)
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	bool IsPlanted()
+	{
+		if (m_State == STATE_PLANTED)
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void Init( float base_fertility )
+	{
+		m_Fertility = base_fertility;
+		m_FertilizerUsage = 200;
+		m_FertilizerQuantity = 0.0;
+		m_FertilizerType = "";
+		m_FertilityState = eFertlityState.NONE;
+		
+		m_WaterQuantity = 0;
+		m_WateredState = eWateredState.DRY;
+		
+		m_HarvestingEfficiency = 1.0;
+		//m_DiggedSlotComponent = "";
+		m_State = STATE_DIGGED;
+		m_Plant = NULL;
+	}
+
+	void SetSlotComponent(string component)
+	{
+		m_DiggedSlotComponent = component;
+	}
+
+	string GetSlotComponent()
+	{
+		return m_DiggedSlotComponent;
+	}
+	
+	bool OnStoreLoadCustom( ParamsReadContext ctx, int version )
+	{
+		if ( version < 102 )
+		{
+			ctx.Read( m_Fertility );
+			ctx.Read( m_FertilizerUsage );
+			ctx.Read( m_FertilizerQuantity );
+			
+			if ( !ctx.Read( m_FertilizerType ) )
+				m_FertilizerType = "";
+			
+			ctx.Read( m_HarvestingEfficiency );
+			ctx.Read( m_State );
+		}
+		
+		if ( version >= 102 )
+		{
+			ctx.Read( m_Fertility );       
+			ctx.Read( m_FertilizerUsage );
+			ctx.Read( m_FertilizerQuantity );       
+			ctx.Read( m_HarvestingEfficiency );
+			ctx.Read( m_State );
+			
+			if ( !ctx.Read( m_FertilizerType ) )
+			{
+				m_FertilizerType = "";
+			}
+		}
+		
+		return true;
+	}
+
+	void OnStoreSaveCustom( ParamsWriteContext ctx )
+	{
+		ctx.Write( m_Fertility );
+		ctx.Write( m_FertilizerUsage );
+		ctx.Write( m_FertilizerQuantity );
+		ctx.Write( m_HarvestingEfficiency );
+		ctx.Write( m_State );
+		ctx.Write( m_FertilizerType );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/FlashGrenade.c b/scripts/4_World/DayZ/Entities/Grenade_Base/FlashGrenade.c
new file mode 100644
index 0000000000000000000000000000000000000000..e62eea591f7dfce8e944e24a2842725e18694714
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/FlashGrenade.c
@@ -0,0 +1,93 @@
+class FlashGrenade extends Grenade_Base
+{
+	const float FX_RANGE_MAX_MULT = 1.0;
+	
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType)
+	{
+		super.OnExplosionEffects(source, directHit, componentIndex, surface, pos, surfNormal, energyFactor, explosionFactor, isWater, ammoType);
+
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+
+		if (player)
+		{
+			vector headPos 			= player.GetDamageZonePos("Head"); // animated position in the middle of the zone
+			float ammoRangeKill	 	= GetGame().ConfigGetFloat(string.Format("CfgAmmo %1 indirectHitRange", ammoType));
+			float ammoRangeMaxMult 	= 4.0;
+			
+			string indirectHitRangeMultiplier = string.Format("CfgAmmo %1 indirectHitRangeMultiplier", ammoType);
+			if (GetGame().ConfigIsExisting(indirectHitRangeMultiplier))
+			{
+				//! values less than 1.0 make no sense
+				ammoRangeMaxMult = Math.Clamp(GetGame().ConfigGetFloat(indirectHitRangeMultiplier), 1.0, float.MAX);
+			}
+
+			float ammoRangeMax = ammoRangeKill * ammoRangeMaxMult;
+			ammoRangeMax = Math.Clamp(ammoRangeMax * FX_RANGE_MAX_MULT, ammoRangeKill, ammoRangeMax);
+			
+			float dist			= vector.Distance(headPos, pos);
+			float distSq 		= vector.DistanceSq(headPos, pos);
+			float radiusMaxSq = Math.SqrFloat(ammoRangeMax);
+			
+			if (distSq <= radiusMaxSq)
+			{
+				// ignore collisions with parent if fireplace
+				InventoryItem invItem = InventoryItem.Cast(source);
+				EntityAI parent = invItem.GetHierarchyParent();
+				array<Object> excluded = new array<Object>;
+				
+				if (!parent || !parent.IsFireplace())
+					parent = null;
+				else if (parent)
+					excluded.Insert(parent);
+				
+				array<ref RaycastRVResult> results = new array<ref RaycastRVResult>;
+				excluded.Insert(this); //Ignore self for visibility check
+				
+				//There shouldn't be cases justifying we go further than first entry (if in fireplace, self does not impact)
+				RaycastRVParams rayParams	= new RaycastRVParams(pos, headPos, excluded[0]);
+				rayParams.flags				= CollisionFlags.ALLOBJECTS;
+				DayZPhysics.RaycastRVProxy(rayParams, results, excluded);
+
+				//! removes possible obstacles made by items around the grenade(or on the same position)
+				array<Object> hitObjects = new array<Object>;
+				for (int i = 0; i < results.Count(); i++)
+				{
+					if (results[i].obj && !results[i].obj.IsInherited(ItemBase))
+					{
+						hitObjects.Insert(results[i].obj);
+					}
+				}
+
+				//If player is not first index, object is between player and grenade
+				if (hitObjects.Count() && PlayerBase.Cast(hitObjects[0]))
+				{
+					float effectCoef;
+					if (ammoRangeMax == ammoRangeKill)
+					{
+						effectCoef = 1.0; //edge case, landed right on the edge
+					}
+					effectCoef = 1 - ((dist - ammoRangeKill) / (ammoRangeMax - ammoRangeKill));
+					effectCoef = Math.Clamp(effectCoef, 0.1, 100.0);
+
+					player.OnPlayerReceiveFlashbangHitStart(MiscGameplayFunctions.IsPlayerOrientedTowardPos(player, pos, 60));
+					player.GetFlashbangEffect().SetupFlashbangValues(effectCoef, effectCoef, effectCoef);
+				}
+			}
+		}
+	}
+
+	void FlashGrenade()
+	{
+		SetAmmoType("FlashGrenade_Ammo");
+		SetFuseDelay(2);
+		SetGrenadeType(EGrenadeType.ILLUMINATING);
+		SetParticleExplosion(ParticleList.GRENADE_M84);
+	}
+	
+	protected override void CreateLight()
+	{
+		m_Light = ExplosiveLight.Cast(ScriptedLightBase.CreateLight(FlashGrenadeLight, GetPosition()));
+	}
+
+	void ~FlashGrenade() {}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/Grenade_ChemGas.c b/scripts/4_World/DayZ/Entities/Grenade_Base/Grenade_ChemGas.c
new file mode 100644
index 0000000000000000000000000000000000000000..67bf6c4ab0dfa11c92178699f785961d39b6fa67
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/Grenade_ChemGas.c
@@ -0,0 +1,69 @@
+class Grenade_ChemGas : Grenade_Base
+{
+	protected bool 					m_Exploded;
+	protected ParticleSource 		m_ParticleExploded;
+	protected EffectSound 			m_ExplosionSound;
+	
+	
+	void Grenade_ChemGas()
+	{
+		SetParticleExplosion(ParticleList.RGD5);
+		SetGrenadeType(EGrenadeType.CHEMICAL);
+		m_Pinned = false;
+		SetPinnable(false);
+		Arm();
+	}
+
+	void ~Grenade_ChemGas();
+
+	override protected void OnExplode()
+	{
+		m_Exploded = true;
+		
+		if (GetGame().IsServer())
+		{
+			GetGame().CreateObject("ContaminatedArea_Local", GetPosition());
+		}
+	}
+	
+	protected string GetExplosionSoundSet()
+	{
+		return "Grenade_detonation_SoundSet";
+	}
+	
+	override void EOnContact(IEntity other, Contact extra)
+	{
+		if (GetGame().IsServer())
+		{
+			if (!m_Exploded)
+			{
+				OnActivateFinished();
+			}
+		}
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+	}
+	
+	override void OnDamageDestroyed(int oldLevel)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(Delete, 1000);
+		}
+		#ifndef SERVER
+		ClearFlags(EntityFlags.VISIBLE, false);
+		m_ParticleExploded = ParticleManager.GetInstance().PlayInWorld(ParticleList.GRENADE_CHEM_BREAK, GetPosition());
+		PlaySoundSet( m_ExplosionSound, GetExplosionSoundSet(), 0, 0 );
+		#endif
+
+	}
+	
+	override protected void Activate()
+	{
+		//we don't want base functionality here
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/M18SmokeGrenade_ColorBase.c b/scripts/4_World/DayZ/Entities/Grenade_Base/M18SmokeGrenade_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..caa47865afe3ac6d3847e857c4a43a4ca05a3f39
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/M18SmokeGrenade_ColorBase.c
@@ -0,0 +1,79 @@
+class M18SmokeGrenade_ColorBase extends SmokeGrenadeBase
+{
+	const string SOUND_SMOKE_START = "SmokegGrenades_M18_start_loop_SoundSet";
+	const string SOUND_SMOKE_LOOP = "SmokegGrenades_M18_active_loop_SoundSet";
+	const string SOUND_SMOKE_END = "SmokegGrenades_M18_end_loop_SoundSet";
+
+	void M18SmokeGrenade_ColorBase()
+	{
+		SetAmmoType("");
+		SetFuseDelay(2);
+		SetSoundSmokeStart(SOUND_SMOKE_START);
+		SetSoundSmokeLoop(SOUND_SMOKE_LOOP);
+		SetSoundSmokeEnd(SOUND_SMOKE_END);
+	}
+	
+	void ~M18SmokeGrenade_ColorBase() {}
+}
+
+class M18SmokeGrenade_Red extends M18SmokeGrenade_ColorBase
+{
+	void M18SmokeGrenade_Red()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_M18_RED_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_M18_RED_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_M18_RED_END);
+	}
+}
+
+// Used for calling in dynamic contaminated areas
+class M18SmokeGrenade_Red_Contaminated extends M18SmokeGrenade_Red
+{
+	override void OnWorkStop()
+	{
+		super.OnWorkStop();
+		
+		if ( GetGame().IsServer() )
+			GetCEApi().SpawnGroup( "ContaminatedArea_Dynamic", GetPosition() );
+	}
+}
+
+class M18SmokeGrenade_Green extends M18SmokeGrenade_ColorBase
+{
+	void M18SmokeGrenade_Green()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_M18_GREEN_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_M18_GREEN_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_M18_GREEN_END);
+	}
+}
+
+class M18SmokeGrenade_Yellow extends M18SmokeGrenade_ColorBase
+{
+	void M18SmokeGrenade_Yellow()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_M18_YELLOW_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_M18_YELLOW_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_M18_YELLOW_END);
+	}	
+}
+
+class M18SmokeGrenade_Purple extends M18SmokeGrenade_ColorBase
+{
+	void M18SmokeGrenade_Purple()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_M18_PURPLE_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_M18_PURPLE_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_M18_PURPLE_END);
+	}
+}
+
+class M18SmokeGrenade_White extends M18SmokeGrenade_ColorBase
+{
+	void M18SmokeGrenade_White()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_M18_WHITE_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_M18_WHITE_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_M18_WHITE_END);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/M67Grenade.c b/scripts/4_World/DayZ/Entities/Grenade_Base/M67Grenade.c
new file mode 100644
index 0000000000000000000000000000000000000000..5868242c3a59066fa0d62c15085773064925ffac
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/M67Grenade.c
@@ -0,0 +1,11 @@
+class M67Grenade extends Grenade_Base
+{
+	void M67Grenade()
+	{
+		SetAmmoType("M67Grenade_Ammo");
+		SetFuseDelay(4);
+		SetParticleExplosion(ParticleList.M67);
+	}
+
+	void ~M67Grenade() {}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/RDG2SmokeGrenade_ColorBase.c b/scripts/4_World/DayZ/Entities/Grenade_Base/RDG2SmokeGrenade_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f3a6b22ed849a6885ebc7bcf6ed579f906b39750
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/RDG2SmokeGrenade_ColorBase.c
@@ -0,0 +1,38 @@
+class RDG2SmokeGrenade_ColorBase extends SmokeGrenadeBase
+{
+	const string SOUND_SMOKE_START = "SmokegGrenades_RDG2_start_loop_SoundSet";
+	const string SOUND_SMOKE_LOOP = "SmokegGrenades_RDG2_active_loop_SoundSet";
+	const string SOUND_SMOKE_END = "SmokegGrenades_RDG2_end_loop_SoundSet";
+	
+	void RDG2SmokeGrenade_ColorBase()
+	{
+		SetAmmoType("");
+		SetFuseDelay(2);
+		SetParticlePosition("0 0.1 0");
+		SetSoundSmokeStart(SOUND_SMOKE_START);
+		SetSoundSmokeLoop(SOUND_SMOKE_LOOP);
+		SetSoundSmokeEnd(SOUND_SMOKE_END);
+	}
+	
+	void ~RDG2SmokeGrenade_ColorBase() {}
+};
+
+class RDG2SmokeGrenade_Black extends RDG2SmokeGrenade_ColorBase
+{
+	void RDG2SmokeGrenade_Black()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_RDG2_BLACK_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_RDG2_BLACK_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_RDG2_BLACK_END);
+	}
+}
+
+class RDG2SmokeGrenade_White extends RDG2SmokeGrenade_ColorBase
+{
+	void RDG2SmokeGrenade_White()
+	{
+		SetParticleSmokeStart(ParticleList.GRENADE_RDG2_WHITE_START);
+		SetParticleSmokeLoop(ParticleList.GRENADE_RDG2_WHITE_LOOP);
+		SetParticleSmokeEnd(ParticleList.GRENADE_RDG2_WHITE_END);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/RGD5Grenade.c b/scripts/4_World/DayZ/Entities/Grenade_Base/RGD5Grenade.c
new file mode 100644
index 0000000000000000000000000000000000000000..63e68da12554a7aa9d30d60baf8a2995b19c7f0c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/RGD5Grenade.c
@@ -0,0 +1,11 @@
+class RGD5Grenade extends Grenade_Base
+{
+	void RGD5Grenade()
+	{
+		SetAmmoType("RGD5Grenade_Ammo");
+		SetFuseDelay(4);
+		SetParticleExplosion(ParticleList.RGD5);
+	}
+
+	void ~RGD5Grenade() {}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Grenade_Base/SmokeGrenadeBase.c b/scripts/4_World/DayZ/Entities/Grenade_Base/SmokeGrenadeBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..55011aca1843cf32293a04c4da5508118e58eadc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Grenade_Base/SmokeGrenadeBase.c
@@ -0,0 +1,289 @@
+enum ESmokeGrenadeState
+{
+	NO_SMOKE 	= 0
+	START 	 	= 1,
+	LOOP 	 	= 2,
+	END			= 3,
+	//! ---
+	COUNT 		= 4
+}
+
+class SmokeGrenadeBase extends Grenade_Base
+{
+	protected ref Timer				m_TimerSmokeStart;
+	protected ref Timer				m_TimerSmokeLoop;
+	protected ref Timer				m_TimerSmokeEnd;
+	
+	protected ref Timer				m_TimerDefer;
+	
+	protected ESmokeGrenadeState	m_SmokeGrenadeState;
+	protected ESmokeGrenadeState	m_LastSmokeGrenadeState;
+
+	//! particle
+	protected Particle 				m_ParticleSmoke;
+	protected int					m_ParticleSmokeCurrentId;
+	protected int					m_ParticleSmokeStartId;
+	protected int					m_ParticleSmokeLoopId;
+	protected int					m_ParticleSmokeEndId;
+	protected vector				m_ParticleSmokePosition;
+	
+	//! sounds
+	protected EffectSound			m_SoundSmoke;
+	protected string				m_SoundSmokeStartId;
+	protected string				m_SoundSmokeLoopId;
+	protected string				m_SoundSmokeEndId;
+	
+	//! Noise
+	ref NoiseParams 				m_NoisePar;
+
+	void SetParticleSmokeCurrent(int particle)
+	{
+		m_ParticleSmokeCurrentId = particle;
+	}
+	
+	void SetParticleSmokeStart(int particle)
+	{
+		m_ParticleSmokeStartId = particle;
+	}
+
+	void SetParticleSmokeLoop(int particle)
+	{
+		m_ParticleSmokeLoopId = particle;
+	}
+
+	void SetParticleSmokeEnd(int particle)
+	{
+		m_ParticleSmokeEndId = particle;
+	}
+	
+	void SetSoundSmokeStart(string sound)
+	{
+		m_SoundSmokeStartId = sound;
+	}
+
+	void SetSoundSmokeLoop(string sound)
+	{
+		m_SoundSmokeLoopId = sound;
+	}
+
+	void SetSoundSmokeEnd(string sound)
+	{
+		m_SoundSmokeEndId = sound;
+	}	
+
+	protected void PlaySmokeParticle()
+	{
+		m_ParticleSmoke = ParticleManager.GetInstance().PlayOnObject(m_ParticleSmokeCurrentId, this, m_ParticlePosition, vector.Zero, true);
+	}
+
+	protected void SoundSmokeStart()
+	{
+		PlaySoundSetLoop(m_SoundSmoke, m_SoundSmokeStartId, 0.3, 1.0);
+	}
+	
+	protected void SoundSmokeLoop()
+	{
+		PlaySoundSetLoop(m_SoundSmoke, m_SoundSmokeLoopId, 0.3, 1.0);
+	}
+
+	protected void SoundSmokeEnd()
+	{
+		PlaySoundSetLoop(m_SoundSmoke, m_SoundSmokeEndId, 1.0, 1.0);
+	}
+	
+	//Stop
+	protected void SoundSmokeStop()
+	{
+		StopSoundSet(m_SoundSmoke);
+	}
+
+	protected void DestroySmokeGrenade()
+	{
+		SetSmokeGrenadeState(ESmokeGrenadeState.NO_SMOKE);
+		
+		if ( GetGame().IsServer() )
+		{
+			SetHealth("", "", 0);
+		}
+	}
+	
+	protected void RefreshParticlesAndSounds()
+	{
+		ESmokeGrenadeState state = GetSmokeGrenadeState();
+
+		if ( m_LastSmokeGrenadeState != state )
+		{
+			if ( state == ESmokeGrenadeState.START )
+			{
+				//Print("RefreshAudioVisual:: START");
+				SoundSmokeEnd();
+				SoundSmokeStart();
+				
+				DestroyParticle(m_ParticleSmoke);
+				SetParticleSmokeCurrent(m_ParticleSmokeStartId);
+				PlaySmokeParticle();
+			}
+			else if ( state == ESmokeGrenadeState.LOOP )
+			{
+				//Print("RefreshAudioVisual:: LOOP");
+				SoundSmokeStop();
+				SoundSmokeLoop();
+				
+				DestroyParticle(m_ParticleSmoke);
+				SetParticleSmokeCurrent(m_ParticleSmokeLoopId);
+				PlaySmokeParticle();
+			}
+			else if ( state == ESmokeGrenadeState.END )
+			{
+				//Print("RefreshAudioVisual:: END");
+				SoundSmokeStop();
+				SoundSmokeEnd();
+				
+				DestroyParticle(m_ParticleSmoke);
+				SetParticleSmokeCurrent(m_ParticleSmokeEndId);
+				PlaySmokeParticle();
+			}
+			else if ( state == ESmokeGrenadeState.NO_SMOKE )
+			{
+				//Print("RefreshAudioVisual:: NO_SMOKE");
+				SoundSmokeStop();
+
+				DestroyParticle(m_ParticleSmoke);
+			}
+			
+			m_LastSmokeGrenadeState = state;
+		}
+	}
+	
+	override void Unpin()
+	{
+		super.Unpin();
+		
+		Activate();
+
+	}
+	
+	override void OnActivateFinished()
+	{
+		if ( GetCompEM() && GetCompEM().CanWork() )
+		{
+			GetCompEM().SwitchOn();
+		}
+	}
+	
+	// When smoke starts
+	override void OnWorkStart()
+	{
+		SetSmokeGrenadeState(ESmokeGrenadeState.START);
+		
+		if ( GetGame().IsServer() )
+		{
+			m_NoisePar = new NoiseParams();
+			m_NoisePar.LoadFromPath("cfgVehicles " + GetType() + " NoiseSmokeGrenade");
+			NoiseSystem noise = GetGame().GetNoiseSystem();
+			if ( noise )
+			{
+				noise.AddNoisePos( this, GetPosition(), m_NoisePar );
+			}
+		}
+
+		Param1<ESmokeGrenadeState> par = new Param1<ESmokeGrenadeState>(ESmokeGrenadeState.LOOP);
+		m_TimerSmokeLoop.Run(5.0, this, "SetSmokeGrenadeState", par);
+	}
+	
+	//When grenade makes smoke
+	override void OnWork(float consumed_energy)
+	{
+		if ( GetGame().IsServer() )
+		{
+			NoiseSystem noise = GetGame().GetNoiseSystem();
+			if ( noise )
+			{
+				noise.AddNoisePos( this, GetPosition(), m_NoisePar);
+			}
+		}
+	}
+	
+	// When the smoke stops
+	override void OnWorkStop()
+	{
+		SetSmokeGrenadeState(ESmokeGrenadeState.END);
+
+		//! defer timer
+		m_TimerDefer.Run(5.0, this, "DestroySmokeGrenade");
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return !GetCompEM().IsWorking();
+	}
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		GetCompEM().SwitchOn();
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		RemoveAction(ActionPin);
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+
+		RefreshParticlesAndSounds();
+	}
+
+	override void OnExplosionEffects(Object source, Object directHit, int componentIndex, string surface, vector pos, vector surfNormal, float energyFactor, float explosionFactor, bool isWater, string ammoType) {}
+	
+	ESmokeGrenadeState GetSmokeGrenadeState()
+	{
+		return m_SmokeGrenadeState;
+	}
+
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+
+		SoundSmokeStop();
+		DestroyParticle(m_ParticleSmoke);
+	}
+
+	void SetSmokeGrenadeState(ESmokeGrenadeState state)
+	{
+		//Print("Setting SGS to: " + typename.EnumToString(ESmokeGrenadeState, state));
+
+		if ( GetGame().IsServer() )
+		{
+			if ( m_SmokeGrenadeState != state )
+			{
+				m_SmokeGrenadeState = state;
+				
+				//synchronize
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	void SmokeGrenadeBase()
+	{
+		m_SmokeGrenadeState = ESmokeGrenadeState.NO_SMOKE;
+
+		m_TimerSmokeLoop = new Timer;
+		m_TimerDefer = new Timer;
+
+		SetAmmoType("");
+		SetPinnable(false);
+		SetGrenadeType(EGrenadeType.CHEMICAL);
+		SetParticleSmokeStart(ParticleList.INVALID); //! no effect on base
+		SetParticleSmokeLoop(ParticleList.INVALID); //! no effect on base
+		SetParticleSmokeEnd(ParticleList.INVALID); //! no effect on base
+
+		RegisterNetSyncVariableInt("m_SmokeGrenadeState", ESmokeGrenadeState.NO_SMOKE, ESmokeGrenadeState.COUNT);
+	}
+	
+	void ~SmokeGrenadeBase();
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase.c b/scripts/4_World/DayZ/Entities/ItemBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e591691e37eb90503331ceb00609ed2a4fd14eba
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase.c
@@ -0,0 +1,4749 @@
+typedef ItemBase Inventory_Base;
+
+class DummyItem extends ItemBase
+{
+	override bool CanPutAsAttachment(EntityAI parent)
+	{
+		return true;
+	}
+};
+
+//const bool QUANTITY_DEBUG_REMOVE_ME = false;
+
+class ItemBase extends InventoryItem
+{
+	static ref map<typename, ref TInputActionMap> m_ItemTypeActionsMap = new map<typename, ref TInputActionMap>;
+	TInputActionMap m_InputActionMap;
+	bool	m_ActionsInitialize;
+	
+	static int	m_DebugActionsMask;
+	bool		m_RecipesInitialized;
+	// ============================================
+	// Variable Manipulation System
+	// ============================================
+	//ref map<string,string> 	m_ItemVarsString;
+	
+	int		m_VariablesMask;//this holds information about which vars have been changed from their default values
+	// Quantity
+	
+	float 	m_VarQuantity;
+	float 	m_VarQuantityPrev;//for client to know quantity changed during synchronization
+	int		m_VarQuantityInit;
+	int		m_VarQuantityMin;
+	int		m_VarQuantityMax;
+	int		m_Count;
+	float	m_VarStackMax;
+	float	m_StoreLoadedQuantity = float.LOWEST;
+	// Temperature
+	float 	m_VarTemperature;
+	float 	m_VarTemperatureInit;
+	float 	m_VarTemperatureMin;
+	float 	m_VarTemperatureMax;
+	// Wet
+	float 	m_VarWet;
+	float 	m_VarWetPrev;//for client to know wetness changed during synchronization
+	float 	m_VarWetInit;
+	float 	m_VarWetMin;
+	float 	m_VarWetMax;
+	// Cleanness
+	int		m_Cleanness;
+	int		m_CleannessInit;
+	int		m_CleannessMin;
+	int		m_CleannessMax;
+	// impact sounds
+	bool	m_WantPlayImpactSound;
+	bool	m_CanPlayImpactSound = true;
+	float	m_ImpactSpeed;
+	int		m_ImpactSoundSurfaceHash;
+	//
+	float	m_HeatIsolation;
+	float 	m_ItemModelLength;
+	float	m_ItemAttachOffset; // Offset length for when the item is attached e.g. to weapon
+	int 	m_VarLiquidType;
+	int 	m_ItemBehaviour = -1; // -1 = not specified; 0 = heavy item; 1= onehanded item; 2 = twohanded item
+	int 	m_QuickBarBonus = 0;
+	bool	m_IsBeingPlaced;
+	bool	m_IsHologram;
+	bool	m_IsPlaceSound;
+	bool	m_IsDeploySound;
+	bool	m_IsTakeable;
+	bool	m_IsSoundSynchRemote;
+	bool 	m_ThrowItemOnDrop;
+	bool 	m_ItemBeingDroppedPhys;
+	bool    m_CanBeMovedOverride;
+	bool 	m_FixDamageSystemInit = false; //can be changed on storage version check
+	bool 	can_this_be_combined = false; //Check if item can be combined
+	bool 	m_CanThisBeSplit = false; //Check if item can be split
+	bool	m_IsStoreLoad = false;
+	bool	m_CanShowQuantity;
+	bool	m_HasQuantityBar;
+	protected bool m_CanBeDigged;
+	protected bool m_IsResultOfSplit //! distinguish if item has been created as new or it came from splitting (server only flag)
+	
+	protected EffectSound m_DeployLoopSoundEx;
+	
+	string	m_SoundAttType;
+	// items color variables
+	int 	m_ColorComponentR;
+	int 	m_ColorComponentG;
+	int 	m_ColorComponentB;
+	int 	m_ColorComponentA;
+	//-------------------------------------------------------
+	
+	// light source managing
+	ItemBase m_LightSourceItem;
+	
+	ref TIntArray m_SingleUseActions;
+	ref TIntArray m_ContinuousActions;
+	ref TIntArray m_InteractActions;
+	
+	//==============================================
+	// agent system
+	private int	m_AttachedAgents;
+
+	//! appears to be deprecated, legacy code
+	void TransferModifiers(PlayerBase reciever);
+	
+	
+	// Weapons & suppressors particle effects
+	ref static map<int, ref array<ref WeaponParticlesOnFire>> 				m_OnFireEffect;
+	ref static map<int, ref array<ref WeaponParticlesOnBulletCasingEject>> 	m_OnBulletCasingEjectEffect;
+	ref map<int, ref array<ref WeaponParticlesOnOverheating>> 				m_OnOverheatingEffect;
+	ref static map<string, int> m_WeaponTypeToID;
+	static int m_LastRegisteredWeaponID = 0;
+	
+	// Overheating effects
+	bool 								m_IsOverheatingEffectActive;
+	float								m_OverheatingShots;
+	ref Timer 							m_CheckOverheating;
+	int 								m_ShotsToStartOverheating = 0; // After these many shots, the overheating effect begins
+	int 								m_MaxOverheatingValue = 0; // Limits the number of shots that will be tracked
+	float 								m_OverheatingDecayInterval = 1; // Timer's interval for decrementing overheat effect's lifespan
+	ref array <ref OverheatingParticle> m_OverheatingParticles;
+	
+	protected ref TStringArray m_HeadHidingSelections;
+	protected bool m_HideSelectionsBySlot;
+	
+	// Admin Log
+	PluginAdminLog			m_AdminLog;
+	
+	// misc
+	ref Timer 				m_PhysDropTimer;
+	
+	// Attachment Locking variables
+	ref array<int> 				m_CompatibleLocks = new array<int>;
+	protected int				m_LockType;
+	protected ref EffectSound 	m_LockingSound;
+	protected string 			m_LockSoundSet = "";
+	
+	protected EffectSound 		m_SoundPlace;
+	protected EffectSound 		m_SoundDeploy;
+	protected EffectSound 		m_SoundDeployFinish;
+	
+	// -------------------------------------------------------------------------
+	void ItemBase()
+	{
+		SetEventMask(EntityEvent.INIT); // Enable EOnInit event
+		InitItemVariables();
+
+		m_SingleUseActions = new TIntArray;
+		m_ContinuousActions = new TIntArray;
+		m_InteractActions = new TIntArray;
+		
+		if (!GetGame().IsDedicatedServer())
+		{
+			if (HasMuzzle())
+			{
+				LoadParticleConfigOnFire(GetMuzzleID());
+				
+				if (m_ShotsToStartOverheating == 0)
+				{
+					LoadParticleConfigOnOverheating(GetMuzzleID());
+				}
+			}
+			
+			PreLoadSoundAttachmentType();
+			m_ActionsInitialize = false;
+		}
+		
+		m_OldLocation = null;
+		
+		if (GetGame().IsServer())
+		{
+			m_AdminLog = PluginAdminLog.Cast(GetPlugin(PluginAdminLog));
+		}
+		
+		if (ConfigIsExisting("headSelectionsToHide"))
+		{
+			m_HeadHidingSelections = new TStringArray;
+			ConfigGetTextArray("headSelectionsToHide",m_HeadHidingSelections);
+		}
+		
+		m_HideSelectionsBySlot = false;
+		if (ConfigIsExisting("hideSelectionsByinventorySlot"))
+		{
+			m_HideSelectionsBySlot = ConfigGetBool("hideSelectionsByinventorySlot");
+		}
+		
+		
+		
+		m_QuickBarBonus = Math.Max(0, ConfigGetInt("quickBarBonus"));
+
+		m_IsResultOfSplit = false;
+	}
+	
+	void InitItemVariables()
+	{
+		m_VarQuantityInit = ConfigGetInt("varQuantityInit");
+		m_VarQuantity = m_VarQuantityInit;//should be by the CE, this is just a precaution
+		m_VarQuantityMin = ConfigGetInt("varQuantityMin");
+		m_VarQuantityMax = ConfigGetInt("varQuantityMax");
+		m_VarStackMax = ConfigGetFloat("varStackMax");
+		m_Count = ConfigGetInt("count");
+		
+		m_CanShowQuantity = ConfigGetBool("quantityShow");
+		m_HasQuantityBar = ConfigGetBool("quantityBar");
+		
+		m_VarTemperatureInit = ConfigGetFloat("varTemperatureInit");
+		m_VarTemperature = m_VarTemperatureInit;
+		m_VarTemperatureMin = ConfigGetFloat("varTemperatureMin");
+		m_VarTemperatureMax = ConfigGetFloat("varTemperatureMax");
+		
+		
+		m_CleannessInit = ConfigGetInt("varCleannessInit");
+		m_Cleanness = m_CleannessInit;
+		m_CleannessMin = ConfigGetInt("varCleannessMin");
+		m_CleannessMax = ConfigGetInt("varCleannessMax");
+		
+		m_WantPlayImpactSound = false;
+		m_ImpactSpeed = 0.0;
+		
+		m_VarWetInit = ConfigGetFloat("varWetInit");
+		m_VarWet = m_VarWetInit;
+		m_VarWetMin = ConfigGetFloat("varWetMin");
+		m_VarWetMax = ConfigGetFloat("varWetMax");
+		
+		m_VarLiquidType = GetLiquidTypeInit();
+		m_IsBeingPlaced = false;
+		m_IsHologram = false;
+		m_IsPlaceSound = false;
+		m_IsDeploySound = false;
+		m_IsTakeable = true;
+		m_IsSoundSynchRemote = false;
+		m_CanBeMovedOverride = false;
+		m_HeatIsolation = GetHeatIsolationInit();
+		m_ItemModelLength = GetItemModelLength();
+		m_ItemAttachOffset = GetItemAttachOffset();
+		m_CanBeDigged = ConfigGetBool("canBeDigged");
+		
+		ConfigGetIntArray("compatibleLocks", m_CompatibleLocks);
+		m_LockType = ConfigGetInt("lockType");
+		
+		//Define if item can be split and set ability to be combined accordingly
+		if (ConfigIsExisting("canBeSplit"))
+		{
+			can_this_be_combined = ConfigGetBool("canBeSplit");
+			m_CanThisBeSplit = can_this_be_combined;
+		}
+		
+		if (ConfigIsExisting("itemBehaviour"))
+			m_ItemBehaviour = ConfigGetInt("itemBehaviour");
+		
+		//RegisterNetSyncVariableInt("m_VariablesMask");
+		if (HasQuantity()) RegisterNetSyncVariableFloat("m_VarQuantity", GetQuantityMin(), m_VarQuantityMax);
+		RegisterNetSyncVariableFloat("m_VarTemperature", GetTemperatureMin(),GetTemperatureMax());
+		RegisterNetSyncVariableFloat("m_VarWet", GetWetMin(), GetWetMax(), 2);
+		RegisterNetSyncVariableInt("m_VarLiquidType");
+		RegisterNetSyncVariableInt("m_Cleanness",0,1);
+		
+		RegisterNetSyncVariableBoolSignal("m_WantPlayImpactSound");
+		RegisterNetSyncVariableFloat("m_ImpactSpeed");
+		RegisterNetSyncVariableInt("m_ImpactSoundSurfaceHash");
+		
+		RegisterNetSyncVariableInt("m_ColorComponentR", 0, 255);
+		RegisterNetSyncVariableInt("m_ColorComponentG", 0, 255);
+		RegisterNetSyncVariableInt("m_ColorComponentB", 0, 255);
+		RegisterNetSyncVariableInt("m_ColorComponentA", 0, 255);
+		
+		RegisterNetSyncVariableBool("m_IsBeingPlaced");
+		RegisterNetSyncVariableBool("m_IsTakeable");
+		RegisterNetSyncVariableBool("m_IsHologram");
+		
+		if (UsesGlobalDeploy())
+		{
+			RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+			RegisterNetSyncVariableBool("m_IsDeploySound");
+		}
+		
+		m_LockSoundSet = ConfigGetString("lockSoundSet");
+	}
+	
+	// allows for checking whether or not we can safely register net sync variables without causing VMEs for duplicate registration
+	protected bool UsesGlobalDeploy()
+	{
+		return false;
+	}
+	
+	override int GetQuickBarBonus()
+	{
+		return m_QuickBarBonus;
+	}
+
+	void InitializeActions()
+	{
+		m_InputActionMap = m_ItemTypeActionsMap.Get(this.Type());
+		if (!m_InputActionMap)
+		{
+			TInputActionMap iam = new TInputActionMap;
+			m_InputActionMap = iam;
+			SetActions();
+			m_ItemTypeActionsMap.Insert(this.Type(), m_InputActionMap);
+		}
+	}
+	
+	override void GetActions(typename action_input_type, out array<ActionBase_Basic> actions)
+	{
+		if (!m_ActionsInitialize)
+		{
+			m_ActionsInitialize = true;
+			InitializeActions();
+		}
+		
+		actions = m_InputActionMap.Get(action_input_type);
+	}
+	
+	void SetActions()
+	{
+		AddAction(ActionTakeItem);
+		AddAction(ActionTakeItemToHands);
+		AddAction(ActionWorldCraft);
+		AddAction(ActionDropItem);
+		AddAction(ActionAttachWithSwitch);
+	}
+	
+	void AddAction(typename actionName)
+	{
+		ActionBase action = ActionManagerBase.GetAction(actionName);
+
+		if (!action)
+		{
+			Debug.LogError("Action " + actionName + " dosn't exist!");
+			return;
+		}		
+		
+		typename ai = action.GetInputType();
+		if (!ai)
+		{
+			m_ActionsInitialize = false;
+			return;
+		}
+		
+		array<ActionBase_Basic> action_array = m_InputActionMap.Get(ai);		
+		if (!action_array)
+		{
+			action_array = new array<ActionBase_Basic>;
+			m_InputActionMap.Insert(ai, action_array);
+		}
+		if (LogManager.IsActionLogEnable())
+		{
+			Debug.ActionLog(action.ToString() + " -> " + ai, this.ToString() , "n/a", "Add action");
+		}
+		
+		if (action_array.Find(action) != -1)
+		{
+			Debug.Log("Action " + action.Type() + " already added to " + this + ", skipping!");
+		}
+		else
+		{
+			action_array.Insert(action);
+		}
+	}
+	
+	void RemoveAction(typename actionName)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionBase action = player.GetActionManager().GetAction(actionName);
+		typename ai = action.GetInputType();
+		array<ActionBase_Basic> action_array = m_InputActionMap.Get(ai);
+		
+		if (action_array)
+		{
+			action_array.RemoveItem(action);
+		}
+	}
+	
+	void OnItemInHandsPlayerSwimStart(PlayerBase player);
+	
+	ScriptedLightBase GetLight();
+	
+	// Loads muzzle flash particle configuration from config and saves it to a map for faster access
+	void LoadParticleConfigOnFire(int id)
+	{
+		if (!m_OnFireEffect)
+			m_OnFireEffect = new map<int, ref array<ref WeaponParticlesOnFire>>;
+		
+		if (!m_OnBulletCasingEjectEffect)
+			m_OnBulletCasingEjectEffect = new map<int, ref array<ref WeaponParticlesOnBulletCasingEject>>;
+		
+		string config_to_search = "CfgVehicles";
+		string muzzle_owner_config;
+		
+		if (!m_OnFireEffect.Contains(id))
+		{
+			if (IsInherited(Weapon))
+				config_to_search = "CfgWeapons";	
+			
+			muzzle_owner_config = config_to_search + " " + GetType() + " ";
+			
+			string config_OnFire_class = muzzle_owner_config + "Particles " + "OnFire ";
+			
+			int config_OnFire_subclass_count = GetGame().ConfigGetChildrenCount(config_OnFire_class);
+			
+			if (config_OnFire_subclass_count > 0)
+			{
+				array<ref WeaponParticlesOnFire> WPOF_array = new array<ref WeaponParticlesOnFire>;
+				
+				for (int i = 0; i < config_OnFire_subclass_count; i++)
+				{
+					string particle_class = "";
+					GetGame().ConfigGetChildName(config_OnFire_class, i, particle_class);
+					string config_OnFire_entry = config_OnFire_class + particle_class;
+					WeaponParticlesOnFire WPOF = new WeaponParticlesOnFire(this, config_OnFire_entry);
+					WPOF_array.Insert(WPOF);
+				}
+				
+				
+				m_OnFireEffect.Insert(id, WPOF_array);
+			}
+		}
+		
+		if (!m_OnBulletCasingEjectEffect.Contains(id))
+		{
+			config_to_search = "CfgWeapons"; // Bullet Eject efect is supported on weapons only.
+			muzzle_owner_config = config_to_search + " " + GetType() + " ";
+			
+			string config_OnBulletCasingEject_class = muzzle_owner_config + "Particles " + "OnBulletCasingEject ";
+			
+			int config_OnBulletCasingEject_count = GetGame().ConfigGetChildrenCount(config_OnBulletCasingEject_class);
+			
+			if (config_OnBulletCasingEject_count > 0  &&  IsInherited(Weapon))
+			{
+				array<ref WeaponParticlesOnBulletCasingEject> WPOBE_array = new array<ref WeaponParticlesOnBulletCasingEject>;
+				
+				for (i = 0; i < config_OnBulletCasingEject_count; i++)
+				{
+					string particle_class2 = "";
+					GetGame().ConfigGetChildName(config_OnBulletCasingEject_class, i, particle_class2);
+					string config_OnBulletCasingEject_entry = config_OnBulletCasingEject_class + particle_class2;
+					WeaponParticlesOnBulletCasingEject WPOBE = new WeaponParticlesOnBulletCasingEject(this, config_OnBulletCasingEject_entry);
+					WPOBE_array.Insert(WPOBE);
+				}
+				
+				
+				m_OnBulletCasingEjectEffect.Insert(id, WPOBE_array);
+			}
+		}
+	}
+	
+	// Loads muzzle flash particle configuration from config and saves it to a map for faster access
+	void LoadParticleConfigOnOverheating(int id)
+	{
+		if (!m_OnOverheatingEffect)
+			m_OnOverheatingEffect = new map<int, ref array<ref WeaponParticlesOnOverheating>>;
+		
+		if (!m_OnOverheatingEffect.Contains(id))
+		{
+			string config_to_search = "CfgVehicles";
+			
+			if (IsInherited(Weapon))
+				config_to_search = "CfgWeapons";
+			
+			string muzzle_owner_config = config_to_search + " " + GetType() + " ";
+			string config_OnOverheating_class = muzzle_owner_config + "Particles " + "OnOverheating ";
+			
+			if (GetGame().ConfigIsExisting(config_OnOverheating_class))
+			{
+				
+				m_ShotsToStartOverheating = GetGame().ConfigGetFloat(config_OnOverheating_class + "shotsToStartOverheating");
+				
+				if (m_ShotsToStartOverheating == 0)
+				{
+					m_ShotsToStartOverheating = -1; // This prevents futher readings from config for future creations of this item
+					string error = "Error reading config " + GetType() + ">Particles>OnOverheating - Parameter shotsToStartOverheating is configured wrong or is missing! Its value must be 1 or higher!";
+					Error(error);
+					return;
+				}
+				
+				m_OverheatingDecayInterval = GetGame().ConfigGetFloat(config_OnOverheating_class + "overheatingDecayInterval");
+				m_MaxOverheatingValue = GetGame().ConfigGetFloat(config_OnOverheating_class + "maxOverheatingValue");
+				
+				
+				
+				int config_OnOverheating_subclass_count = GetGame().ConfigGetChildrenCount(config_OnOverheating_class);
+				array<ref WeaponParticlesOnOverheating> WPOOH_array = new array<ref WeaponParticlesOnOverheating>;
+				
+				for (int i = 0; i < config_OnOverheating_subclass_count; i++)
+				{
+					string particle_class = "";
+					GetGame().ConfigGetChildName(config_OnOverheating_class, i, particle_class);
+					string config_OnOverheating_entry = config_OnOverheating_class + particle_class;
+					int  entry_type = GetGame().ConfigGetType(config_OnOverheating_entry);
+					
+					if (entry_type == CT_CLASS)
+					{
+						WeaponParticlesOnOverheating WPOF = new WeaponParticlesOnOverheating(this, config_OnOverheating_entry);
+						WPOOH_array.Insert(WPOF);
+					}
+				}
+				
+				
+				m_OnOverheatingEffect.Insert(id, WPOOH_array);
+			}
+		}
+	}
+	
+	float GetOverheatingValue()
+	{
+		return m_OverheatingShots;
+	}
+	
+	void IncreaseOverheating(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		if (m_MaxOverheatingValue > 0)
+		{
+			m_OverheatingShots++;
+			
+			if (!m_CheckOverheating)
+					m_CheckOverheating = new Timer(CALL_CATEGORY_SYSTEM);
+			
+			m_CheckOverheating.Stop();
+			m_CheckOverheating.Run(m_OverheatingDecayInterval, this, "OnOverheatingDecay");
+			
+			CheckOverheating(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+		}
+	}
+	
+	void CheckOverheating(ItemBase weapon = null, string ammoType = "", ItemBase muzzle_owner = null, ItemBase suppressor = null, string config_to_search = "")
+	{
+		if (m_OverheatingShots >= m_ShotsToStartOverheating  &&  IsOverheatingEffectActive())
+			UpdateOverheating(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+		
+		if (m_OverheatingShots >= m_ShotsToStartOverheating  &&  !IsOverheatingEffectActive())
+			StartOverheating(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+		
+		if (m_OverheatingShots < m_ShotsToStartOverheating  &&  IsOverheatingEffectActive())
+			StopOverheating(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+		
+		if (m_OverheatingShots > m_MaxOverheatingValue)
+		{
+			m_OverheatingShots = m_MaxOverheatingValue;
+		}
+	}
+	
+	bool IsOverheatingEffectActive()
+	{
+		return m_IsOverheatingEffectActive;
+	}
+	
+	void OnOverheatingDecay()
+	{
+		if (m_MaxOverheatingValue > 0)
+			m_OverheatingShots -= 1 + m_OverheatingShots / m_MaxOverheatingValue; // The hotter a barrel is, the faster it needs to cool down.
+		else
+			m_OverheatingShots--;
+		
+		if (m_OverheatingShots <= 0)
+		{
+			m_CheckOverheating.Stop();
+			m_OverheatingShots = 0;
+		}
+		else
+		{
+			if (!m_CheckOverheating)
+				m_CheckOverheating = new Timer(CALL_CATEGORY_GAMEPLAY);
+			
+			m_CheckOverheating.Stop();
+			m_CheckOverheating.Run(m_OverheatingDecayInterval, this, "OnOverheatingDecay");
+		}
+		
+		CheckOverheating(this, "", this);
+	}
+
+	void StartOverheating(ItemBase weapon = null, string ammoType = "", ItemBase muzzle_owner = null, ItemBase suppressor = null, string config_to_search = "")
+	{
+		m_IsOverheatingEffectActive = true;
+		ItemBase.PlayOverheatingParticles(this, ammoType, this, suppressor, "CfgWeapons");
+	}
+	
+	void UpdateOverheating(ItemBase weapon = null, string ammoType = "", ItemBase muzzle_owner = null, ItemBase suppressor = null, string config_to_search = "")
+	{
+		KillAllOverheatingParticles();
+		ItemBase.UpdateOverheatingParticles(this, ammoType, this, suppressor, "CfgWeapons");
+		UpdateAllOverheatingParticles();
+	}
+	
+	void StopOverheating(ItemBase weapon = null, string ammoType = "", ItemBase muzzle_owner = null, ItemBase suppressor = null, string config_to_search = "")
+	{
+		m_IsOverheatingEffectActive = false;
+		ItemBase.StopOverheatingParticles(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+	}
+	
+	void RegisterOverheatingParticle(Particle p, float min_heat_coef, float max_heat_coef, int particle_id, Object parent, vector local_pos, vector local_ori)
+	{
+		if (!m_OverheatingParticles)
+			m_OverheatingParticles = new array<ref OverheatingParticle>;
+		
+		OverheatingParticle OP = new OverheatingParticle();
+		OP.RegisterParticle(p);
+		OP.SetOverheatingLimitMin(min_heat_coef);
+		OP.SetOverheatingLimitMax(max_heat_coef);
+		OP.SetParticleParams(particle_id, parent, local_pos, local_ori);
+		
+		m_OverheatingParticles.Insert(OP);
+	}
+	
+	float GetOverheatingCoef()
+	{
+		if (m_MaxOverheatingValue > 0)
+			return (m_OverheatingShots - m_ShotsToStartOverheating) / m_MaxOverheatingValue;
+		
+		return -1;
+	}
+	
+	void UpdateAllOverheatingParticles()
+	{
+		if (m_OverheatingParticles)
+		{
+			float overheat_coef = GetOverheatingCoef();
+			int count = m_OverheatingParticles.Count();
+			
+			for (int i = count; i > 0; --i)
+			{
+				int id = i - 1;
+				OverheatingParticle OP = m_OverheatingParticles.Get(id);
+				Particle p = OP.GetParticle();
+				
+				float overheat_min = OP.GetOverheatingLimitMin();
+				float overheat_max = OP.GetOverheatingLimitMax();
+				
+				if (overheat_coef < overheat_min  &&  overheat_coef >= overheat_max)
+				{
+					if (p)
+					{
+						p.Stop();
+						OP.RegisterParticle(null);
+					}
+				}
+			}
+		}
+	}
+	
+	void KillAllOverheatingParticles()
+	{
+		if (m_OverheatingParticles)
+		{
+			for (int i = m_OverheatingParticles.Count(); i > 0; i--)
+			{
+				int id = i - 1;
+				OverheatingParticle OP = m_OverheatingParticles.Get(id);
+				
+				if (OP)
+				{
+					Particle p = OP.GetParticle();
+					
+					if (p)
+					{
+						p.Stop();
+					}
+					
+					delete OP;
+				}
+			}
+			
+			m_OverheatingParticles.Clear();
+			delete m_OverheatingParticles;
+		}
+	}
+	
+	//! Infection chance while/after using this item, originally used for wound infection after bandaging, params 'system' and 'param' can allow usage by other systems as well
+	float GetInfectionChance(int system = 0, Param param = null)
+	{
+		return 0.0;
+	}
+	
+	
+	float GetDisinfectQuantity(int system = 0, Param param1 = null)
+	{
+		return 250;//default value
+	}
+	
+	float GetFilterDamageRatio() 
+	{
+		return 0;
+	}
+	
+	//! Returns true if this item has a muzzle (weapons, suppressors)
+	bool HasMuzzle()
+	{
+		if (IsInherited(Weapon)  ||  IsInherited(SuppressorBase))
+			return true;
+		
+		return false;
+	}
+	
+	//! Returns global muzzle ID. If not found, then it gets automatically registered.
+	int GetMuzzleID()
+	{
+		if (!m_WeaponTypeToID)
+			m_WeaponTypeToID = new map<string, int>;
+		
+		if (m_WeaponTypeToID.Contains(GetType()))
+		{
+			return m_WeaponTypeToID.Get(GetType());
+		}
+		else 
+		{
+			// Register new weapon ID
+			m_WeaponTypeToID.Insert(GetType(), ++m_LastRegisteredWeaponID);
+		}
+		
+		return m_LastRegisteredWeaponID;
+	}
+	
+	/**
+	\brief Re-sets DamageSystem changes
+	\return storage version on which the config changes occured (default -1, to be overriden!)
+	\note Significant changes to DamageSystem in item configs have to be re-set by increasing the storage version and overriding this method. Default return is -1 (does nothing).
+	*/
+	int GetDamageSystemVersionChange()
+	{
+		return -1;
+	}
+	
+	
+	
+	// -------------------------------------------------------------------------
+	void ~ItemBase()
+	{
+		#ifndef SERVER
+		if (m_DeployLoopSoundEx)
+			m_DeployLoopSoundEx.SoundStop();
+		#endif
+		
+		if (GetGame() && GetGame().GetPlayer() && (!GetGame().IsDedicatedServer()))
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			int r_index = player.GetHumanInventory().FindUserReservedLocationIndex(this);
+
+			if (r_index >= 0)
+			{
+					InventoryLocation r_il = new InventoryLocation;
+					player.GetHumanInventory().GetUserReservedLocation(r_index,r_il);
+
+					player.GetHumanInventory().ClearUserReservedLocationAtIndex(r_index);
+					int r_type = r_il.GetType();
+					if (r_type == InventoryLocationType.CARGO || r_type == InventoryLocationType.PROXYCARGO)
+					{
+						r_il.GetParent().GetOnReleaseLock().Invoke(this);
+					}
+					else if (r_type == InventoryLocationType.ATTACHMENT)
+					{
+						r_il.GetParent().GetOnAttachmentReleaseLock().Invoke(this, r_il.GetSlot());
+					}
+			
+			}
+			
+			player.GetHumanInventory().ClearUserReservedLocation(this);
+		}
+		
+		SEffectManager.DestroyEffect(m_LockingSound);
+	}
+
+	
+	
+	// -------------------------------------------------------------------------
+	static int GetDebugActionsMask()
+	{
+		return ItemBase.m_DebugActionsMask;	
+	}
+	
+	static bool HasDebugActionsMask(int mask)
+	{
+		return ItemBase.m_DebugActionsMask & mask;	
+	}
+	
+	static void SetDebugActionsMask(int mask)
+	{
+		ItemBase.m_DebugActionsMask = mask;
+	}
+	
+	static void AddDebugActionsMask(int mask)
+	{
+		ItemBase.m_DebugActionsMask |= mask;
+	}
+	
+	static void RemoveDebugActionsMask(int mask)
+	{
+		ItemBase.m_DebugActionsMask &= ~mask;
+	}
+	
+	static void ToggleDebugActionsMask(int mask)
+	{
+		if (HasDebugActionsMask(mask))
+		{
+			RemoveDebugActionsMask(mask);
+		}
+		else
+		{
+			AddDebugActionsMask(mask);
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	void SetCEBasedQuantity()
+	{
+		if (GetEconomyProfile())
+		{
+			float q_max = GetEconomyProfile().GetQuantityMax();
+			if (q_max > 0)
+			{
+				float q_min = GetEconomyProfile().GetQuantityMin();
+				float quantity_randomized = Math.RandomFloatInclusive(q_min, q_max);
+				
+				if (HasComponent(COMP_TYPE_ENERGY_MANAGER))//more direct access for speed
+				{
+					ComponentEnergyManager comp = GetCompEM();
+					if (comp && (comp.GetEnergyMaxPristine() || comp.GetEnergyAtSpawn()))//checking for a potential for energy, we need to check both values, as both are optional, only when both are set to 0, we know the item can't have energy
+					{
+						//Print("setting EM quantity for " + this + " to " + quantity_randomized);
+						comp.SetEnergy0To1(quantity_randomized);
+					}
+					/*
+					else
+						Print("NOT setting EM quantity for " + this + " to " + quantity_randomized);
+					*/
+				}
+				else if (HasQuantity())
+				{
+					SetQuantityNormalized(quantity_randomized, false);
+					//PrintString("<==> Normalized quantity for item: "+ GetType()+", qmin:"+q_min.ToString()+"; qmax:"+q_max.ToString()+";quantity:" +quantity_randomized.ToString());
+				}
+				
+			}
+		}
+	}
+	
+	//! Locks this item in it's current attachment slot of its parent. This makes the "locked" icon visible in inventory over this item.
+	void LockToParent()
+	{
+		EntityAI parent = GetHierarchyParent();
+		
+		if (parent)
+		{
+			InventoryLocation inventory_location_to_lock = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation(inventory_location_to_lock);
+			parent.GetInventory().SetSlotLock(inventory_location_to_lock.GetSlot(), true);
+		}
+	}
+	
+	//! Unlocks this item from its attachment slot of its parent.
+	void UnlockFromParent()
+	{
+		EntityAI parent = GetHierarchyParent();
+		
+		if (parent)
+		{
+			InventoryLocation inventory_location_to_unlock = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation(inventory_location_to_unlock);
+			parent.GetInventory().SetSlotLock(inventory_location_to_unlock.GetSlot(), false);
+		}
+	}
+	
+	override void CombineItemsClient(EntityAI entity2, bool use_stack_max = true)
+	{
+		/*
+		ref Param1<EntityAI> item = new Param1<EntityAI>(entity2);
+		RPCSingleParam(ERPCs.RPC_ITEM_COMBINE, item, GetGame().GetPlayer());
+		*/
+		ItemBase item2 = ItemBase.Cast(entity2);
+		
+		if (GetGame().IsClient())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_ITEM_MANIPULATION);
+				ctx.Write(-1);
+				ItemBase i1 = this; // @NOTE: workaround for correct serialization
+				ctx.Write(i1);
+				ctx.Write(item2);
+				ctx.Write(use_stack_max);
+				ctx.Write(-1);
+				ctx.Send();
+				
+				if (IsCombineAll(item2, use_stack_max))
+				{
+					GetGame().GetPlayer().GetInventory().AddInventoryReservationEx(item2,null,GameInventory.c_InventoryReservationTimeoutShortMS);
+				}
+			}
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			CombineItems(item2, use_stack_max);
+		}
+	}
+	
+	bool IsLiquidPresent()
+	{
+		
+		return (GetLiquidType() != 0 && HasQuantity());
+	}
+	
+	bool IsLiquidContainer()
+	{
+		return (ConfigGetFloat("liquidContainerType") != 0);
+	}
+	
+	bool IsBloodContainer()
+	{
+		return false;
+	}
+	
+	bool IsNVG()
+	{
+		return false;
+	}
+	
+	//! explosive 
+	//! ------------
+	bool IsExplosive()
+	{
+		return false;
+	}
+	
+	string GetExplosiveTriggerSlotName()
+	{
+		return "";
+	}
+	
+	//! ------------
+	
+	bool IsLightSource()
+	{
+		return false;
+	}
+	
+	bool CanBeRepairedByCrafting()
+	{
+		return true;
+	}
+	
+	//--- ACTION CONDITIONS
+	//direction
+	bool IsFacingPlayer(PlayerBase player, string selection)
+	{
+		return true;
+	}
+	
+	bool IsPlayerInside(PlayerBase player, string selection)
+	{
+		return true;
+	}
+	
+	override bool CanObstruct()
+	{
+		PlayerBase player = PlayerBase.Cast(g_Game.GetPlayer());
+		return !player || !IsPlayerInside(player, "");
+	}
+	
+	override bool IsBeingPlaced()
+	{
+		return m_IsBeingPlaced;
+	}
+	
+	void SetIsBeingPlaced(bool is_being_placed)
+	{
+		m_IsBeingPlaced = is_being_placed;
+		if (!is_being_placed)
+			OnEndPlacement();
+		SetSynchDirty();
+	}
+	
+	//server-side
+	void OnEndPlacement() {}
+	
+	override bool IsHologram()
+	{
+		return m_IsHologram;
+	}
+	
+	bool CanBeDigged()
+	{
+		return m_CanBeDigged;
+	}
+	
+	bool CanMakeGardenplot()
+	{
+		return false;
+	}
+	
+	void SetIsHologram(bool is_hologram)
+	{
+		m_IsHologram = is_hologram;
+		SetSynchDirty();
+	}
+	/*
+	protected float GetNutritionalEnergy()
+	{
+		Edible_Base edible = Edible_Base.Cast(this);
+		return edible.GetFoodEnergy();
+	}
+	
+	protected float GetNutritionalWaterContent()
+	{
+		Edible_Base edible = Edible_Base.Cast(this);
+		return edible.GetFoodWater();
+	}
+	
+	protected float GetNutritionalIndex()
+	{
+		Edible_Base edible = Edible_Base.Cast(this);
+		return edible.GetFoodNutritionalIndex();
+	}
+	
+	protected float GetNutritionalFullnessIndex()
+	{
+		Edible_Base edible = Edible_Base.Cast(this);
+		return edible.GetFoodTotalVolume();
+	}
+	
+	protected float GetNutritionalToxicity()
+	{
+		Edible_Base edible = Edible_Base.Cast(this);
+		return edible.GetFoodToxicity();
+
+	}
+	*/
+	
+	
+	// -------------------------------------------------------------------------
+	override void OnMovedInsideCargo(EntityAI container)
+	{
+		super.OnMovedInsideCargo(container);
+		
+		MiscGameplayFunctions.RemoveAllAttachedChildrenByTypename(this, {Bolt_Base});
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc,newLoc);
+		
+		PlayerBase new_player = null;
+		PlayerBase old_player = null;
+		
+		if (newLoc.GetParent())
+			new_player = PlayerBase.Cast(newLoc.GetParent().GetHierarchyRootPlayer());
+		
+		if (oldLoc.GetParent())
+			old_player = PlayerBase.Cast(oldLoc.GetParent().GetHierarchyRootPlayer());
+		
+		if (old_player && oldLoc.GetType() == InventoryLocationType.HANDS)
+		{
+			int r_index = old_player.GetHumanInventory().FindUserReservedLocationIndex(this);
+
+			if (r_index >= 0)
+			{
+					InventoryLocation r_il = new InventoryLocation;
+					old_player.GetHumanInventory().GetUserReservedLocation(r_index,r_il);
+
+					old_player.GetHumanInventory().ClearUserReservedLocationAtIndex(r_index);
+					int r_type = r_il.GetType();
+					if (r_type == InventoryLocationType.CARGO || r_type == InventoryLocationType.PROXYCARGO)
+					{
+						r_il.GetParent().GetOnReleaseLock().Invoke(this);
+					}
+					else if (r_type == InventoryLocationType.ATTACHMENT)
+					{
+						r_il.GetParent().GetOnAttachmentReleaseLock().Invoke(this, r_il.GetSlot());
+					}
+			
+			}
+		}
+		
+		if (newLoc.GetType() == InventoryLocationType.HANDS)
+		{
+			if (new_player)
+				new_player.ForceStandUpForHeavyItems(newLoc.GetItem());
+			
+			if (new_player == old_player)
+			{
+				
+				if (oldLoc.GetParent() && !(oldLoc.GetParent() != new_player && oldLoc.GetType() == InventoryLocationType.ATTACHMENT) && new_player.GetHumanInventory().LocationGetEntity(oldLoc) == NULL)
+				{
+					if (oldLoc.GetType() == InventoryLocationType.CARGO)
+					{
+						if (oldLoc.GetParent().GetInventory().TestAddEntityInCargoExLoc(oldLoc, false, false, false, true, false, false))
+						{
+							new_player.GetHumanInventory().SetUserReservedLocation(this,oldLoc);
+						}
+					}
+					else
+					{
+						new_player.GetHumanInventory().SetUserReservedLocation(this,oldLoc);
+					}
+				}
+				
+				if (new_player.GetHumanInventory().FindUserReservedLocationIndex(this) >= 0)
+				{
+					int type = oldLoc.GetType();
+					if (type == InventoryLocationType.CARGO || type == InventoryLocationType.PROXYCARGO)
+					{
+						oldLoc.GetParent().GetOnSetLock().Invoke(this);
+					}
+					else if (type == InventoryLocationType.ATTACHMENT)
+					{
+						oldLoc.GetParent().GetOnAttachmentSetLock().Invoke(this, oldLoc.GetSlot());
+					}
+				}
+				if (!m_OldLocation)
+				{
+					m_OldLocation = new InventoryLocation;
+				}
+				m_OldLocation.Copy(oldLoc);
+			}
+			else
+			{
+				if (m_OldLocation)
+				{
+					m_OldLocation.Reset();
+				}
+			}
+			
+			GetGame().GetAnalyticsClient().OnItemAttachedAtPlayer(this,"Hands");	
+		}
+		else
+		{
+			if (new_player)
+			{
+				int res_index = new_player.GetHumanInventory().FindCollidingUserReservedLocationIndex(this, newLoc);
+				if (res_index >= 0)
+				{
+					InventoryLocation il = new InventoryLocation;
+					new_player.GetHumanInventory().GetUserReservedLocation(res_index,il);
+					ItemBase it = ItemBase.Cast(il.GetItem());
+					new_player.GetHumanInventory().ClearUserReservedLocationAtIndex(res_index);
+					int rel_type = il.GetType();
+					if (rel_type == InventoryLocationType.CARGO || rel_type == InventoryLocationType.PROXYCARGO)
+					{
+						il.GetParent().GetOnReleaseLock().Invoke(it);
+					}
+					else if (rel_type == InventoryLocationType.ATTACHMENT)
+					{
+						il.GetParent().GetOnAttachmentReleaseLock().Invoke(it, il.GetSlot());
+					}
+					//it.GetOnReleaseLock().Invoke(it);
+				}
+			}
+			else if (old_player && newLoc.GetType() == InventoryLocationType.GROUND && m_ThrowItemOnDrop)
+			{
+				//Print("---ThrowPhysically---");
+				//ThrowPhysically(old_player, vector.Zero);
+				m_ThrowItemOnDrop = false;
+			}
+		
+			if (m_OldLocation)
+			{
+				m_OldLocation.Reset();
+			}
+		}
+	}
+	
+	override void EOnContact(IEntity other, Contact extra)
+	{
+		if (m_CanPlayImpactSound)
+		{
+			int liquidType = -1;
+			float impactSpeed = ProcessImpactSoundEx(other, extra, m_ConfigWeight, m_ImpactSoundSurfaceHash, liquidType);
+			if (impactSpeed > 0.0)
+			{
+				m_ImpactSpeed  = impactSpeed;
+				#ifndef SERVER
+				PlayImpactSound(m_ConfigWeight, m_ImpactSpeed, m_ImpactSoundSurfaceHash);
+				#else
+				m_WantPlayImpactSound = true;
+				SetSynchDirty();
+				#endif
+				m_CanPlayImpactSound = (liquidType == -1);// prevents further playing of the sound when the surface is a liquid type
+			}
+		}
+		
+		#ifdef SERVER
+		if (GetCompEM() && GetCompEM().IsPlugged())
+		{
+			if (GetCompEM().GetCordLength() < vector.Distance(GetPosition(), GetCompEM().GetEnergySource().GetPosition()))
+				GetCompEM().UnplugThis();
+		}
+		#endif
+	}
+	
+	void RefreshPhysics();
+	
+	override void OnCreatePhysics()
+	{
+		RefreshPhysics();
+	}
+	
+	override void OnItemAttachmentSlotChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		
+	}
+	// -------------------------------------------------------------------------
+	override void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner)
+	{
+		super.OnItemLocationChanged(old_owner, new_owner);
+		
+		Man ownerPlayerOld = null;
+		Man ownerPlayerNew = null;
+	
+		if (old_owner)   
+		{
+			if (old_owner.IsMan())
+			{
+				ownerPlayerOld = Man.Cast(old_owner);
+			}
+			else
+			{
+				ownerPlayerOld = Man.Cast(old_owner.GetHierarchyRootPlayer());
+			}
+		}
+		
+		if (new_owner)
+		{
+			if (new_owner.IsMan())
+			{
+				ownerPlayerNew = Man.Cast(new_owner);
+			}
+			else
+			{
+				ownerPlayerNew = Man.Cast(new_owner.GetHierarchyRootPlayer());
+			}
+		}
+		
+		if (ownerPlayerOld != ownerPlayerNew)
+		{
+			if (ownerPlayerOld)
+			{
+				array<EntityAI> subItemsExit = new array<EntityAI>;
+				GetInventory().EnumerateInventory(InventoryTraversalType.PREORDER,subItemsExit);
+				for (int i = 0; i < subItemsExit.Count(); i++)
+				{
+					ItemBase itemExit = ItemBase.Cast(subItemsExit.Get(i));
+					itemExit.OnInventoryExit(ownerPlayerOld);
+				}
+			}
+
+			if (ownerPlayerNew)
+			{
+				array<EntityAI> subItemsEnter = new array<EntityAI>;
+				GetInventory().EnumerateInventory(InventoryTraversalType.PREORDER,subItemsEnter);
+				for (int j = 0; j < subItemsEnter.Count(); j++)
+				{
+					ItemBase itemEnter = ItemBase.Cast(subItemsEnter.Get(j));
+					itemEnter.OnInventoryEnter(ownerPlayerNew);
+				}
+			}
+		}
+	}
+
+	// -------------------------------------------------------------------------------
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		if (player)
+		{
+			OnInventoryExit(player);
+			
+			if (player.IsAlive())
+			{
+				int r_index = player.GetHumanInventory().FindUserReservedLocationIndex(this);
+				if (r_index >= 0)
+				{			
+					InventoryLocation r_il = new InventoryLocation;
+					player.GetHumanInventory().GetUserReservedLocation(r_index,r_il);
+	
+					player.GetHumanInventory().ClearUserReservedLocationAtIndex(r_index);
+					int r_type = r_il.GetType();
+					if (r_type == InventoryLocationType.CARGO || r_type == InventoryLocationType.PROXYCARGO)
+					{
+						r_il.GetParent().GetOnReleaseLock().Invoke(this);
+					}
+					else if (r_type == InventoryLocationType.ATTACHMENT)
+					{
+						r_il.GetParent().GetOnAttachmentReleaseLock().Invoke(this, r_il.GetSlot());
+					}
+				
+				}
+				
+				player.RemoveQuickBarEntityShortcut(this);
+			}
+		}
+	}
+	// -------------------------------------------------------------------------------
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+
+		//! item is able to explode in fire
+		if (killer && killer.IsFireplace() && CanExplodeInFire())
+		{
+			if (GetTemperature() >= GameConstants.ITEM_TEMPERATURE_TO_EXPLODE_MIN)
+			{
+				if (IsMagazine())
+				{
+					if (Magazine.Cast(this).GetAmmoCount() > 0)
+					{
+						ExplodeAmmo();
+					}
+				}
+				else
+				{
+					Explode(DamageType.EXPLOSION);
+				}
+			}
+		}
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		MiscGameplayFunctions.RemoveAllAttachedChildrenByTypename(this, {Bolt_Base});
+		
+		super.OnWasAttached(parent, slot_id);
+		
+		if (HasQuantity())
+			UpdateNetSyncVariableFloat("m_VarQuantity", GetQuantityMin(), m_VarQuantityMax);
+		
+		PlayAttachSound(InventorySlots.GetSlotName(slot_id));
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		if (HasQuantity())
+			UpdateNetSyncVariableFloat("m_VarQuantity", GetQuantityMin(), m_VarQuantityMax);
+	}
+	
+	override string ChangeIntoOnAttach(string slot)
+	{
+		int idx;
+		TStringArray inventory_slots = new TStringArray;
+		TStringArray attach_types = new TStringArray;
+		
+		ConfigGetTextArray("ChangeInventorySlot",inventory_slots);
+		if (inventory_slots.Count() < 1) //is string
+		{
+			inventory_slots.Insert(ConfigGetString("ChangeInventorySlot"));
+			attach_types.Insert(ConfigGetString("ChangeIntoOnAttach"));
+		}
+		else //is array
+		{
+			ConfigGetTextArray("ChangeIntoOnAttach",attach_types);
+		}
+		
+		idx = inventory_slots.Find(slot);
+		if (idx < 0)
+			return "";
+		
+		return attach_types.Get(idx);
+	}
+	
+	override string ChangeIntoOnDetach()
+	{
+		int idx = -1;
+		string slot;
+		
+		TStringArray inventory_slots = new TStringArray;
+		TStringArray detach_types = new TStringArray;
+		
+		this.ConfigGetTextArray("ChangeInventorySlot",inventory_slots);
+		if (inventory_slots.Count() < 1) //is string
+		{
+			inventory_slots.Insert(this.ConfigGetString("ChangeInventorySlot"));
+			detach_types.Insert(this.ConfigGetString("ChangeIntoOnDetach"));
+		}
+		else //is array
+		{
+			this.ConfigGetTextArray("ChangeIntoOnDetach",detach_types);
+			if (detach_types.Count() < 1)
+				detach_types.Insert(this.ConfigGetString("ChangeIntoOnDetach"));
+		}
+		
+		for (int i = 0; i < inventory_slots.Count(); i++)
+		{
+			slot = inventory_slots.Get(i);
+		}
+		
+		if (slot != "")
+		{
+			if (detach_types.Count() == 1)
+				idx = 0;
+			else
+				idx = inventory_slots.Find(slot);
+		}
+		if (idx < 0)
+			return "";
+	
+		return detach_types.Get(idx);
+	}
+	
+	void ExplodeAmmo()
+	{
+		//timer
+		ref Timer explode_timer = new Timer(CALL_CATEGORY_SYSTEM);
+		
+		//min/max time
+		float min_time = 1;
+		float max_time = 3;
+		float delay = Math.RandomFloat(min_time, max_time);
+		
+		explode_timer.Run(delay, this, "DoAmmoExplosion");
+	}
+	
+	void DoAmmoExplosion()
+	{
+		Magazine magazine = Magazine.Cast(this);
+		int pop_sounds_count = 6;
+		string pop_sounds[ 6 ] = { "ammopops_1","ammopops_2","ammopops_3","ammopops_4","ammopops_5","ammopops_6" };
+		
+		//play sound
+		int sound_idx = Math.RandomInt(0, pop_sounds_count - 1);
+		string sound_name = pop_sounds[ sound_idx ];
+		GetGame().CreateSoundOnObject(this, sound_name, 20, false);
+		
+		//remove ammo count
+		magazine.ServerAddAmmoCount(-1);
+		
+		//if condition then repeat -> ExplodeAmmo
+		float min_temp_to_explode	= 100;		//min temperature for item to explode
+				
+		if (magazine.GetAmmoCount() > 0 && GetTemperature() >= min_temp_to_explode)	//TODO ? add check for parent -> fireplace
+		{
+			ExplodeAmmo();
+		}
+	}
+	
+	// -------------------------------------------------------------------------------
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		
+		const int CHANCE_DAMAGE_CARGO = 4;
+		const int CHANCE_DAMAGE_ATTACHMENT = 1;
+		const int CHANCE_DAMAGE_NOTHING = 2;
+		
+		if (IsClothing() || IsContainer() || IsItemTent())
+		{
+			float dmg = damageResult.GetDamage("","Health") * -0.5;
+			int chances;
+			int rnd;
+			
+			if (GetInventory().GetCargo())
+			{
+				chances = CHANCE_DAMAGE_CARGO + CHANCE_DAMAGE_ATTACHMENT + CHANCE_DAMAGE_NOTHING;
+				rnd = Math.RandomInt(0,chances);
+				
+				if (rnd < CHANCE_DAMAGE_CARGO)
+				{
+					DamageItemInCargo(dmg);
+				}
+				else if (rnd < (chances - CHANCE_DAMAGE_NOTHING))
+				{
+					DamageItemAttachments(dmg);
+				}
+			}
+			else
+			{
+				chances = CHANCE_DAMAGE_ATTACHMENT + CHANCE_DAMAGE_NOTHING;
+				rnd = Math.RandomInt(0,chances);
+				
+				if (rnd < CHANCE_DAMAGE_ATTACHMENT)
+				{
+					DamageItemAttachments(dmg);
+				}
+			}
+		}
+	}
+	
+	bool DamageItemInCargo(float damage)
+	{
+		if (GetInventory().GetCargo())
+		{
+			int item_count = GetInventory().GetCargo().GetItemCount();
+			if (item_count > 0)
+			{
+				int random_pick = Math.RandomInt(0, item_count);
+				ItemBase item = ItemBase.Cast(GetInventory().GetCargo().GetItem(random_pick));
+				if (!item.IsExplosive())
+				{
+					item.AddHealth("","",damage);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	bool DamageItemAttachments(float damage)
+	{
+		int attachment_count = GetInventory().AttachmentCount();
+		if (attachment_count > 0)
+		{
+			int random_pick = Math.RandomInt(0, attachment_count);
+			ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(random_pick));
+			if (!attachment.IsExplosive())
+			{
+				attachment.AddHealth("","",damage);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	//----------------
+	override bool CanBeSplit()
+	{
+		if (m_CanThisBeSplit)
+			return (GetQuantity() > 1);
+		
+		return false;
+	}
+	
+	void SplitIntoStackMaxClient(EntityAI destination_entity, int slot_id )
+	{
+		if (GetGame().IsClient())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_ITEM_MANIPULATION);
+				ctx.Write(1);
+				ItemBase i1 = this; // @NOTE: workaround for correct serialization
+				ctx.Write(i1);
+				ctx.Write(destination_entity);
+				ctx.Write(true);
+				ctx.Write(slot_id);
+				ctx.Send();
+			}
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			SplitIntoStackMax(destination_entity, slot_id, PlayerBase.Cast(GetGame().GetPlayer()));
+		}
+	}
+
+	void SplitIntoStackMax(EntityAI destination_entity, int slot_id, PlayerBase player)
+	{
+		float split_quantity_new;
+		ref ItemBase new_item;
+		float quantity = GetQuantity();
+		float stack_max = GetTargetQuantityMax(slot_id);
+		InventoryLocation loc = new InventoryLocation;
+		
+		if (destination_entity && slot_id != -1 && InventorySlots.IsSlotIdValid(slot_id))
+		{
+			if (stack_max <= GetQuantity())
+				split_quantity_new = stack_max;
+			else
+				split_quantity_new = GetQuantity();
+
+			new_item = ItemBase.Cast(destination_entity.GetInventory().CreateAttachmentEx(this.GetType(), slot_id));
+			if (new_item)
+			{
+				new_item.SetResultOfSplit(true);
+				MiscGameplayFunctions.TransferItemProperties(this, new_item);
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);
+			}
+		}
+		else if (destination_entity && slot_id == -1)
+		{
+			if (quantity > stack_max)
+				split_quantity_new = stack_max;
+			else
+				split_quantity_new = quantity;
+			
+			if (destination_entity.GetInventory().FindFreeLocationFor(this, FindInventoryLocationType.ANY, loc))
+			{
+				Object o = destination_entity.GetInventory().LocationCreateEntity(loc, GetType(), ECE_IN_INVENTORY, RF_DEFAULT);
+				new_item = ItemBase.Cast(o);
+			}
+
+			if (new_item)
+			{
+				new_item.SetResultOfSplit(true);		
+				MiscGameplayFunctions.TransferItemProperties(this, new_item);
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);
+			}
+		}
+		else
+		{
+			if (stack_max != 0)
+			{
+				if (stack_max < GetQuantity())
+				{
+					split_quantity_new = GetQuantity() - stack_max;
+				}
+				
+				if (split_quantity_new == 0)
+				{
+					if (!GetGame().IsMultiplayer())
+						player.PhysicalPredictiveDropItem(this);
+					else
+						player.ServerDropEntity(this);
+					return;
+				}
+				
+				new_item = ItemBase.Cast(GetGame().CreateObjectEx(GetType(), player.GetWorldPosition(), ECE_PLACE_ON_SURFACE));
+				
+				if (new_item)
+				{
+					new_item.SetResultOfSplit(true);
+					MiscGameplayFunctions.TransferItemProperties(this, new_item);
+					SetQuantity(split_quantity_new);
+					new_item.SetQuantity(stack_max);
+					new_item.PlaceOnSurface();
+				}
+			}
+		}
+	}
+	
+	void SplitIntoStackMaxToInventoryLocationClient(notnull InventoryLocation dst)
+	{
+		if (GetGame().IsClient())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_ITEM_MANIPULATION);
+				ctx.Write(4);
+				ItemBase thiz = this; // @NOTE: workaround for correct serialization
+				ctx.Write(thiz);
+				dst.WriteToContext(ctx);
+				ctx.Send();
+			}
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			SplitIntoStackMaxToInventoryLocation(dst);
+		}
+	}
+	
+	void SplitIntoStackMaxCargoClient(EntityAI destination_entity, int idx, int row, int col)
+	{
+		if (GetGame().IsClient())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_ITEM_MANIPULATION);
+				ctx.Write(2);
+				ItemBase dummy = this; // @NOTE: workaround for correct serialization
+				ctx.Write(dummy);
+				ctx.Write(destination_entity);
+				ctx.Write(true);
+				ctx.Write(idx);
+				ctx.Write(row);
+				ctx.Write(col);
+				ctx.Send();
+			}
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			SplitIntoStackMaxCargo(destination_entity, idx, row, col);
+		}
+	}
+
+	void SplitIntoStackMaxToInventoryLocation(notnull InventoryLocation dst)
+	{
+		SplitIntoStackMaxToInventoryLocationEx(dst);
+	}
+	
+	ItemBase SplitIntoStackMaxToInventoryLocationEx(notnull InventoryLocation dst)
+	{
+		float quantity = GetQuantity();
+		float split_quantity_new;
+		ItemBase new_item;
+		if (dst.IsValid())
+		{
+			int slot_id = dst.GetSlot();
+			float stack_max = GetTargetQuantityMax(slot_id);
+			
+			if (quantity > stack_max)
+				split_quantity_new = stack_max;
+			else
+				split_quantity_new = quantity;
+			
+			new_item = ItemBase.Cast(GameInventory.LocationCreateEntity(dst, this.GetType(), ECE_IN_INVENTORY, RF_DEFAULT));
+			
+			if (new_item)
+			{
+				new_item.SetResultOfSplit(true);
+				MiscGameplayFunctions.TransferItemProperties(this,new_item);
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);
+			}
+			
+			return new_item;
+		}
+		
+		return null;
+	}
+	
+	void SplitIntoStackMaxCargo(EntityAI destination_entity, int idx, int row, int col)
+	{
+		float quantity = GetQuantity();
+		float split_quantity_new;
+		ref ItemBase new_item;
+		if (destination_entity)
+		{
+			float stackable = GetTargetQuantityMax();
+			if (quantity > stackable)
+				split_quantity_new = stackable;
+			else
+				split_quantity_new = quantity;
+			
+			new_item = ItemBase.Cast(destination_entity.GetInventory().CreateEntityInCargoEx(this.GetType(), idx, row, col, false));
+			if (new_item)
+			{
+				new_item.SetResultOfSplit(true);	
+				MiscGameplayFunctions.TransferItemProperties(this,new_item);
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);
+			}
+		}
+	}
+	
+	void SplitIntoStackMaxHandsClient(PlayerBase player)
+	{
+		if (GetGame().IsClient())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_ITEM_MANIPULATION);
+				ctx.Write(3);
+				ItemBase i1 = this; // @NOTE: workaround for correct serialization
+				ctx.Write(i1);
+				ItemBase destination_entity = this;
+				ctx.Write(destination_entity);
+				ctx.Write(true);
+				ctx.Write(0);
+				ctx.Send();
+			}
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			SplitIntoStackMaxHands(player);
+		}
+	}
+
+	void SplitIntoStackMaxHands(PlayerBase player)
+	{
+		float quantity = GetQuantity();
+		float split_quantity_new;
+		ref ItemBase new_item;
+		if (player)
+		{
+			float stackable = GetTargetQuantityMax();
+			if (quantity > stackable)
+				split_quantity_new = stackable;
+			else
+				split_quantity_new = quantity;
+			
+			EntityAI in_hands = player.GetHumanInventory().CreateInHands(this.GetType());
+			new_item = ItemBase.Cast(in_hands);
+			if (new_item)
+			{		
+				new_item.SetResultOfSplit(true);
+				MiscGameplayFunctions.TransferItemProperties(this,new_item);
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);
+			}
+		}
+	}
+	
+	void SplitItemToInventoryLocation(notnull InventoryLocation dst)
+	{
+		if (!CanBeSplit())
+			return;
+		
+		float quantity = GetQuantity();
+		float split_quantity_new = Math.Floor(quantity * 0.5);
+		
+		ItemBase new_item = ItemBase.Cast(GameInventory.LocationCreateEntity(dst, GetType(), ECE_IN_INVENTORY, RF_DEFAULT));
+
+		if (new_item)
+		{
+			if (new_item.GetQuantityMax() < split_quantity_new)
+			{
+				split_quantity_new = new_item.GetQuantityMax();
+			}
+			
+			new_item.SetResultOfSplit(true);
+			MiscGameplayFunctions.TransferItemProperties(this, new_item);
+			
+			if (dst.IsValid() && dst.GetType() == InventoryLocationType.ATTACHMENT && split_quantity_new > 1)
+			{
+				AddQuantity(-1);
+				new_item.SetQuantity(1);
+			}
+			else
+			{
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);				
+			}
+		}	
+	}
+	
+	void SplitItem(PlayerBase player)
+	{
+		if (!CanBeSplit())
+		{
+			return;
+		}
+		
+		float quantity = GetQuantity();
+		float split_quantity_new = Math.Floor(quantity / 2);
+		
+		InventoryLocation invloc = new InventoryLocation;
+		bool found = player.GetInventory().FindFirstFreeLocationForNewEntity(GetType(), FindInventoryLocationType.ATTACHMENT, invloc);
+		
+		ItemBase new_item;
+		new_item = player.CreateCopyOfItemInInventoryOrGroundEx(this, true);
+		
+		if (new_item)
+		{
+			if (new_item.GetQuantityMax() < split_quantity_new)
+			{
+				split_quantity_new = new_item.GetQuantityMax();
+			}
+			if (found && invloc.IsValid() && invloc.GetType() == InventoryLocationType.ATTACHMENT && split_quantity_new > 1)
+			{
+				AddQuantity(-1);
+				new_item.SetQuantity(1);
+			}
+			else
+			{
+				AddQuantity(-split_quantity_new);
+				new_item.SetQuantity(split_quantity_new);
+			}
+		}
+	}
+	
+	//! Called on server side when this item's quantity is changed. Call super.OnQuantityChanged(); first when overriding this event.
+	void OnQuantityChanged(float delta)
+	{
+		SetWeightDirty();
+		ItemBase parent = ItemBase.Cast(GetHierarchyParent());
+		
+		if (parent)
+		{
+			parent.OnAttachmentQuantityChangedEx(this, delta);
+		}		
+	}
+	
+	//! Called on server side when some attachment's quantity is changed. Call super.OnAttachmentQuantityChanged(item); first when overriding this event.
+	void OnAttachmentQuantityChanged(ItemBase item)
+	{
+		// insert code here
+	}
+	
+	//! Called on server side when some attachment's quantity is changed. Call super.OnAttachmentQuantityChanged(item); first when overriding this event.
+	void OnAttachmentQuantityChangedEx(ItemBase item , float delta)
+	{
+		OnAttachmentQuantityChanged(item);
+	}
+
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if (GetGame().IsServer())
+		{
+			if (newLevel == GameConstants.STATE_RUINED)
+			{
+				//! drops content of container when ruined in fireplace
+				EntityAI parent = GetHierarchyParent();
+				if (parent && parent.IsFireplace())
+				{
+					CargoBase cargo = GetInventory().GetCargo();
+					if (cargo)
+					{
+						for (int i = 0; i < cargo.GetItemCount(); ++i)
+						{
+							parent.GetInventory().TakeEntityToInventory(InventoryMode.SERVER, FindInventoryLocationType.CARGO, cargo.GetItem(i));
+						}
+					}
+				}
+			}
+			
+			if (IsResultOfSplit())
+			{
+				// reset the splitting result flag, return to normal item behavior
+				SetResultOfSplit(false);
+				return;
+			}
+
+			if (m_Cleanness != 0 && oldLevel < newLevel && newLevel != 0)
+			{
+				SetCleanness(0);//unclean the item upon damage dealt
+			}
+		}
+	}
+		
+	// just the split? TODO: verify
+	override void OnRightClick()
+	{
+		super.OnRightClick();
+		
+		if (CanBeSplit() && !GetDayZGame().IsLeftCtrlDown() && !GetGame().GetPlayer().GetInventory().HasInventoryReservation(this,null))
+		{
+			if (GetGame().IsClient())
+			{
+				if (ScriptInputUserData.CanStoreInputUserData())
+				{
+					vector m4[4];
+					PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+					
+					EntityAI root = GetHierarchyRoot();
+					
+					InventoryLocation dst = new InventoryLocation;
+					if (!player.GetInventory().FindFirstFreeLocationForNewEntity(GetType(), FindInventoryLocationType.CARGO, dst))
+					{						
+						if (root)
+						{
+							root.GetTransform(m4);
+							dst.SetGround(this, m4);
+						}
+						else
+							GetInventory().GetCurrentInventoryLocation(dst);
+					}
+					else
+					{
+						dst.SetCargo(dst.GetParent(), this, dst.GetIdx(), dst.GetRow(), dst.GetCol(), dst.GetFlip());
+						if (GetGame().GetPlayer().GetInventory().HasInventoryReservation(null, dst))
+						{
+							if (root)
+							{
+								root.GetTransform(m4);
+								dst.SetGround(this, m4);
+							}
+							else
+								GetInventory().GetCurrentInventoryLocation(dst);
+						}
+						else
+						{
+							GetGame().GetPlayer().GetInventory().AddInventoryReservationEx(null, dst, GameInventory.c_InventoryReservationTimeoutShortMS);
+						}
+					}
+					
+					ScriptInputUserData ctx = new ScriptInputUserData;
+					ctx.Write(INPUT_UDT_ITEM_MANIPULATION);
+					ctx.Write(4);
+					ItemBase thiz = this; // @NOTE: workaround for correct serialization
+					ctx.Write(thiz);
+					dst.WriteToContext(ctx);
+					ctx.Write(true); // dummy
+					ctx.Send();
+				}
+			}
+			else if (!GetGame().IsMultiplayer())
+			{
+				SplitItem(PlayerBase.Cast(GetGame().GetPlayer()));
+			}
+		}
+	}
+	
+	override bool CanBeCombined(EntityAI other_item, bool reservation_check = true, bool stack_max_limit = false)
+	{
+		//Print("CanBeCombined - " + this + ": " + GetQuantity() + " + " + other_item + ": " + other_item.GetQuantity());
+		//TODO: delete check zero quantity check after fix double posts hands fsm events
+		if (!other_item || GetType() != other_item.GetType() || (IsFullQuantity() && other_item.GetQuantity() > 0) || other_item == this)
+			return false;
+
+		if (GetHealthLevel() == GameConstants.STATE_RUINED || other_item.GetHealthLevel() == GameConstants.STATE_RUINED)	
+			return false;
+		
+		//can_this_be_combined = ConfigGetBool("canBeSplit");
+		if (!can_this_be_combined)
+			return false;
+
+		
+		Magazine mag = Magazine.Cast(this);
+		if (mag)
+		{
+			if (mag.GetAmmoCount() >= mag.GetAmmoMax())
+				return false;
+			
+			if (stack_max_limit)
+			{
+				Magazine other_mag = Magazine.Cast(other_item);
+				if (other_item)
+				{
+					if (mag.GetAmmoCount() + other_mag.GetAmmoCount() > mag.GetAmmoMax())
+						return false;
+				}
+			
+			}
+		}
+		else
+		{
+			//TODO: delete check zero quantity check after fix double posts hands fsm events
+			if (GetQuantity() >= GetQuantityMax() && other_item.GetQuantity() > 0 )	
+				return false;
+			
+			if (stack_max_limit && (GetQuantity() + other_item.GetQuantity()  > GetQuantityMax()))
+				return false;
+		}
+
+		PlayerBase player = null;
+		if (CastTo(player, GetHierarchyRootPlayer())) //false when attached to player's attachment slot
+		{
+			if (player.GetInventory().HasAttachment(this))
+				return false;
+			
+			if (player.IsItemsToDelete())
+				return false;
+		}
+
+		if (reservation_check && (GetInventory().HasInventoryReservation(this, null) || other_item.GetInventory().HasInventoryReservation(other_item, null)))
+			return false;
+		
+		int slotID;
+		string slotName;
+		if (GetInventory().GetCurrentAttachmentSlotInfo(slotID,slotName) && GetHierarchyParent().GetInventory().GetSlotLock(slotID))
+			return false;
+
+		return true;
+	}
+	
+	bool IsCombineAll(ItemBase other_item, bool use_stack_max = false)
+	{
+		return ComputeQuantityUsed(other_item, use_stack_max) == other_item.GetQuantity();
+	}
+	
+	bool IsResultOfSplit()
+	{
+		return m_IsResultOfSplit;
+	}
+	
+	void SetResultOfSplit(bool value)
+	{
+		m_IsResultOfSplit = value;
+	}
+	
+	int ComputeQuantityUsed(ItemBase other_item, bool use_stack_max = true)
+	{
+		return ComputeQuantityUsedEx(other_item, use_stack_max);
+	}
+	
+	float ComputeQuantityUsedEx(ItemBase other_item, bool use_stack_max = true)
+	{
+		float other_item_quantity = other_item.GetQuantity();
+		float this_free_space;
+			
+		float stack_max = GetQuantityMax();	
+		
+		this_free_space = stack_max - GetQuantity();
+			
+		if (other_item_quantity > this_free_space)
+		{
+			return this_free_space;
+		}
+		else
+		{
+			return other_item_quantity;
+		}
+	}
+	
+	void CombineItems(ItemBase other_item, bool use_stack_max = true)
+	{
+		if (!CanBeCombined(other_item, false))
+			return;
+		
+		if (!IsMagazine() && other_item)
+		{
+			float quantity_used = ComputeQuantityUsedEx(other_item,use_stack_max);
+			if (quantity_used != 0)
+			{
+				float hp1 = GetHealth01("","");
+				float hp2 = other_item.GetHealth01("","");
+				float hpResult = ((hp1*GetQuantity()) + (hp2*quantity_used));
+				hpResult = hpResult / (GetQuantity() + quantity_used);
+
+				hpResult *= GetMaxHealth();
+				Math.Round(hpResult);
+				SetHealth("", "Health", hpResult);
+
+				AddQuantity(quantity_used);
+				other_item.AddQuantity(-quantity_used);
+			}
+		}
+		OnCombine(other_item);
+	}
+
+	void OnCombine(ItemBase other_item)
+	{
+		#ifdef SERVER
+		if (!GetHierarchyRootPlayer() && GetHierarchyParent())
+			GetHierarchyParent().IncreaseLifetimeUp();
+		#endif
+	};
+
+	void GetRecipesActions(Man player, out TSelectableActionInfoArray outputList)
+	{
+		PlayerBase p = PlayerBase.Cast(player);
+			
+		array<int> recipesIds = p.m_Recipes;
+		PluginRecipesManager moduleRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+		if (moduleRecipesManager)
+		{
+			EntityAI itemInHands = player.GetHumanInventory().GetEntityInHands();
+			moduleRecipesManager.GetValidRecipes(ItemBase.Cast(this), ItemBase.Cast(itemInHands), recipesIds, p);
+		}
+
+		for (int i = 0;i < recipesIds.Count(); i++)
+		{
+			int key = recipesIds.Get(i);
+			string recipeName = moduleRecipesManager.GetRecipeName(key);
+			outputList.Insert(new TSelectableActionInfo(SAT_CRAFTING, key, recipeName));
+		}
+	}
+	
+	// -------------------------------------------------------------------------	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		super.GetDebugActions(outputList);
+			
+		//quantity
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ADD_QUANTITY, "Quantity +20%", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.REMOVE_QUANTITY, "Quantity -20%", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SET_QUANTITY_0, "Set Quantity 0", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SET_MAX_QUANTITY, "Set Quantity Max", FadeColors.LIGHT_GREY));
+		
+		//health
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ADD_HEALTH, "Health +20%", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.REMOVE_HEALTH, "Health -20%", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DESTROY_HEALTH, "Health 0", FadeColors.LIGHT_GREY));
+		//temperature
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ADD_TEMPERATURE, "Temperature +20", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.REMOVE_TEMPERATURE, "Temperature -20", FadeColors.LIGHT_GREY));
+		
+		//wet
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ADD_WETNESS, "Wetness +20", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.REMOVE_WETNESS, "Wetness -20", FadeColors.LIGHT_GREY));
+
+		//liquidtype
+		if (IsLiquidContainer())
+		{
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.LIQUIDTYPE_UP, "LiquidType Next", FadeColors.LIGHT_GREY));
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.LIQUIDTYPE_DOWN, "LiquidType Previous", FadeColors.LIGHT_GREY));
+		}
+		
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.MAKE_SPECIAL, "Make Special", FadeColors.LIGHT_GREY));
+		// watch
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.WATCH_ITEM, "Watch (CTRL-Z)", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.WATCH_PLAYER, "Watch Player", FadeColors.LIGHT_GREY));
+		
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "", FadeColors.RED));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DELETE, "Delete", FadeColors.RED));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "", FadeColors.RED));
+	}
+	
+	// -------------------------------------------------------------------------	
+	// -------------------------------------------------------------------------		
+	// -------------------------------------------------------------------------	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		super.OnAction(action_id, player, ctx);
+		if (action_id >= EActions.RECIPES_RANGE_START && action_id < EActions.RECIPES_RANGE_END)
+		{
+			PluginRecipesManager plugin_recipes_manager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+			int idWithoutOffset = action_id - EActions.RECIPES_RANGE_START;
+			PlayerBase p = PlayerBase.Cast(player);
+			if (EActions.RECIPES_RANGE_START  < 1000)
+			{
+				float anim_length = plugin_recipes_manager.GetRecipeLengthInSecs(idWithoutOffset);
+				float specialty_weight = plugin_recipes_manager.GetRecipeSpecialty(idWithoutOffset);
+			}
+		}
+		#ifndef SERVER
+		else if (action_id == EActions.WATCH_PLAYER)
+		{
+			PluginDeveloper.SetDeveloperItemClientEx(player);
+		}
+		#endif
+		if (GetGame().IsServer())
+		{
+			if (action_id >= EActions.DEBUG_ITEM_WATCH_BUTTON_RANGE_START && action_id < EActions.DEBUG_ITEM_WATCH_BUTTON_RANGE_END)
+			{
+				int id = action_id - EActions.DEBUG_ITEM_WATCH_BUTTON_RANGE_START;
+				OnDebugButtonPressServer(id + 1);
+			}
+			
+			else if (action_id >= EActions.DEBUG_AGENTS_RANGE_INJECT_START && action_id < EActions.DEBUG_AGENTS_RANGE_INJECT_END)
+			{
+				int agent_id = action_id - EActions.DEBUG_AGENTS_RANGE_INJECT_START;
+				InsertAgent(agent_id,100);
+			}
+	
+			else if (action_id >= EActions.DEBUG_AGENTS_RANGE_REMOVE_START && action_id < EActions.DEBUG_AGENTS_RANGE_REMOVE_END)
+			{
+				int agent_id2 = action_id - EActions.DEBUG_AGENTS_RANGE_REMOVE_START;
+				RemoveAgent(agent_id2);
+			}
+			
+			else if (action_id == EActions.ADD_QUANTITY)
+			{
+				if (IsMagazine())
+				{
+					Magazine mag = Magazine.Cast(this);
+					mag.ServerSetAmmoCount(mag.GetAmmoCount() + mag.GetAmmoMax() * 0.2);
+				}
+				else
+				{
+					AddQuantity(GetQuantityMax() * 0.2);
+				}
+				
+				if (m_EM)
+				{
+					m_EM.AddEnergy(m_EM.GetEnergyMax() * 0.2);
+				}
+				//PrintVariables();
+			}
+						
+			else if (action_id == EActions.REMOVE_QUANTITY) //Quantity -20%
+			{
+				if (IsMagazine())
+				{
+					Magazine mag2 = Magazine.Cast(this);
+					mag2.ServerSetAmmoCount(mag2.GetAmmoCount() - mag2.GetAmmoMax() * 0.2);
+				}
+				else
+				{
+					AddQuantity(- GetQuantityMax() * 0.2);
+				}
+				if (m_EM)
+				{
+					m_EM.AddEnergy(- m_EM.GetEnergyMax() * 0.2);
+				}
+				//PrintVariables();
+			}
+			
+			else if (action_id == EActions.SET_QUANTITY_0) //SetMaxQuantity
+			{
+				SetQuantity(0);
+				
+				if (m_EM)
+				{
+					m_EM.SetEnergy(0);
+				}
+			}
+			
+			else if (action_id == EActions.SET_MAX_QUANTITY) //SetMaxQuantity
+			{
+				SetQuantityMax();
+				
+				if (m_EM)
+				{
+					m_EM.SetEnergy(m_EM.GetEnergyMax());
+				}
+			}
+	
+			else if (action_id == EActions.ADD_HEALTH) 
+			{
+				AddHealth("","",GetMaxHealth("","Health")/5);
+			}
+			else if (action_id == EActions.REMOVE_HEALTH) 
+			{
+				AddHealth("","",-GetMaxHealth("","Health")/5);
+			}
+			else if (action_id == EActions.DESTROY_HEALTH) 
+			{
+				SetHealth01("","",0);
+			}
+			else if (action_id == EActions.WATCH_ITEM)
+			{
+				PluginItemDiagnostic mid = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+				mid.RegisterDebugItem(ItemBase.Cast(this), PlayerBase.Cast(player));
+				#ifdef DEVELOPER
+				SetDebugDeveloper_item(this);
+				#endif
+			}
+			
+			else if (action_id == EActions.ADD_TEMPERATURE)
+			{
+				AddTemperature(20);
+				//PrintVariables();
+			}
+			
+			else if (action_id == EActions.REMOVE_TEMPERATURE)
+			{
+				AddTemperature(-20);
+				//PrintVariables();
+			}
+			
+			else if (action_id == EActions.ADD_WETNESS)
+			{
+				AddWet(GetWetMax()/5);
+				//PrintVariables();
+			}
+			
+			else if (action_id == EActions.REMOVE_WETNESS)
+			{
+				AddWet(-GetWetMax()/5);
+				//PrintVariables();
+			}
+	
+			else if (action_id == EActions.LIQUIDTYPE_UP)
+			{
+				int curr_type = GetLiquidType();
+				SetLiquidType(curr_type * 2);
+				//AddWet(1);
+				//PrintVariables();
+			}
+			
+			else if (action_id == EActions.LIQUIDTYPE_DOWN)
+			{
+				int curr_type2 = GetLiquidType();
+				SetLiquidType(curr_type2 / 2);
+			}
+
+			else if (action_id == EActions.MAKE_SPECIAL)
+			{
+				auto debugParams = DebugSpawnParams.WithPlayer(player);
+				OnDebugSpawnEx(debugParams);
+			}
+			
+			else if (action_id == EActions.DELETE)
+			{
+				Delete();
+			}
+			
+		}
+
+		
+		return false;
+	}
+
+	// -------------------------------------------------------------------------
+	
+	
+	//! DEPRECATED use OnActivatedByItem below
+	//! Called when this item is activated from a trip wire that was stepped on.
+	void OnActivatedByTripWire();
+	
+	//! Called when this item is activated by other
+	void OnActivatedByItem(notnull ItemBase item);
+
+	//----------------------------------------------------------------
+	//returns true if item is able to explode when put in fire
+	bool CanExplodeInFire()
+	{
+		return false;
+	}
+	
+	//----------------------------------------------------------------
+	bool CanEat()
+	{
+		return true;
+	}
+	
+	//----------------------------------------------------------------
+	override bool IsIgnoredByConstruction()
+	{
+		return true;
+	}
+	
+	//----------------------------------------------------------------
+	//has FoodStages in config?
+	bool HasFoodStage()
+	{
+		string config_path = string.Format("CfgVehicles %1 Food FoodStages", GetType());
+		return GetGame().ConfigIsExisting(config_path);
+	}
+	
+	bool CanBeCooked()
+	{
+		return false;
+	}
+	
+	bool CanBeCookedOnStick()
+	{
+		return false;
+	}		
+	
+	//----------------------------------------------------------------
+	bool CanRepair(ItemBase item_repair_kit)
+	{
+		PluginRepairing module_repairing = PluginRepairing.Cast(GetPlugin(PluginRepairing));
+		return module_repairing.CanRepair(this, item_repair_kit);
+	}
+
+	//----------------------------------------------------------------
+	bool Repair(PlayerBase player, ItemBase item_repair_kit, float specialty_weight)
+	{
+		PluginRepairing module_repairing = PluginRepairing.Cast(GetPlugin(PluginRepairing));
+		return module_repairing.Repair(player, this, item_repair_kit, specialty_weight);
+	}
+
+	//----------------------------------------------------------------
+	int GetItemSize()
+	{
+		/*
+		vector v_size = this.ConfigGetVector("itemSize");
+		int v_size_x = v_size[0];
+		int v_size_y = v_size[1];
+		int size = v_size_x * v_size_y;
+		return size;
+		*/
+		
+		return 1;
+	}
+	
+	//----------------------------------------------------------------
+	//Override for allowing seemingly unallowed moves when two clients send a conflicting message simultaneously
+	bool CanBeMovedOverride()
+	{
+		return m_CanBeMovedOverride;
+	}
+	
+	//----------------------------------------------------------------
+	//Override for allowing seemingly unallowed moves when two clients send a conflicting message simultaneously
+	void SetCanBeMovedOverride(bool setting)
+	{
+		m_CanBeMovedOverride = setting;
+	}
+	
+	//----------------------------------------------------------------
+	/**
+	\brief Send message to owner player in grey color
+		\return \p void
+		@code
+			item_stone.MessageToOwnerStatus("Some Status Message");
+		@endcode
+	*/
+	void MessageToOwnerStatus(string text)
+	{
+		PlayerBase player = PlayerBase.Cast(this.GetHierarchyRootPlayer());
+		
+		if (player)
+		{
+			player.MessageStatus(text);
+		}
+	}
+
+	//----------------------------------------------------------------
+	/**
+	\brief Send message to owner player in yellow color
+		\return \p void
+		@code
+			item_stone.MessageToOwnerAction("Some Action Message");
+		@endcode
+	*/
+	void MessageToOwnerAction(string text)
+	{
+		PlayerBase player = PlayerBase.Cast(this.GetHierarchyRootPlayer());
+		
+		if (player)
+		{
+			player.MessageAction(text);
+		}
+	}
+
+	//----------------------------------------------------------------
+	/**
+	\brief Send message to owner player in green color
+		\return \p void
+		@code
+			item_stone.MessageToOwnerFriendly("Some Friendly Message");
+		@endcode
+	*/
+	void MessageToOwnerFriendly(string text)
+	{
+		PlayerBase player = PlayerBase.Cast(this.GetHierarchyRootPlayer());
+		
+		if (player)
+		{
+			player.MessageFriendly(text);
+		}
+	}
+
+	//----------------------------------------------------------------
+	/**
+	\brief Send message to owner player in red color
+		\return \p void
+		@code
+			item_stone.MessageToOwnerImportant("Some Important Message");
+		@endcode
+	*/
+	void MessageToOwnerImportant(string text)
+	{
+		PlayerBase player = PlayerBase.Cast(this.GetHierarchyRootPlayer());
+		
+		if (player)
+		{
+			player.MessageImportant(text);
+		}
+	}
+
+	override bool IsItemBase()
+	{
+		return true;
+	}
+
+	// Checks if item is of questioned kind
+	override bool KindOf(string tag)
+	{
+		bool found = false;
+		string item_name = this.GetType();
+		ref TStringArray item_tag_array = new TStringArray;
+		GetGame().ConfigGetTextArray("cfgVehicles " + item_name + " itemInfo", item_tag_array);	
+		
+		int array_size = item_tag_array.Count();
+		for (int i = 0; i < array_size; i++)
+		{
+			if (item_tag_array.Get(i) == tag)
+			{
+				found = true;
+				break;
+			}
+		}
+		return found;
+	}
+
+	
+	override void OnRPC(PlayerIdentity sender, int rpc_type,ParamsReadContext ctx) 
+	{
+		//Debug.Log("OnRPC called");
+		super.OnRPC(sender, rpc_type,ctx);
+			
+		//Play soundset for attachment locking (ActionLockAttachment.c)
+		switch (rpc_type)
+		{
+			#ifndef SERVER
+			case ERPCs.RPC_SOUND_LOCK_ATTACH:
+				Param2<bool, string> p = new Param2<bool, string>(false, "");
+					
+				if (!ctx.Read(p))
+					return;
+			
+				bool play = p.param1;
+				string soundSet = p.param2;
+				
+				if (play)
+				{
+					if (m_LockingSound)
+					{
+						if (!m_LockingSound.IsSoundPlaying())
+						{
+							m_LockingSound = SEffectManager.PlaySound(soundSet, GetPosition(), 0, 0, true);
+						}
+					}
+					else
+					{
+						m_LockingSound = SEffectManager.PlaySound(soundSet, GetPosition(), 0, 0, true);
+					}
+				}
+				else
+				{
+					SEffectManager.DestroyEffect(m_LockingSound);
+				}
+			
+			break;
+			#endif
+		
+		}
+		
+		if (GetWrittenNoteData())
+		{
+			GetWrittenNoteData().OnRPC(sender, rpc_type,ctx);
+		}
+	}
+
+	//-----------------------------
+	// VARIABLE MANIPULATION SYSTEM
+	//-----------------------------
+
+	void TransferVariablesFloat(array<float> float_vars)
+	{
+		DeSerializeNumericalVars(float_vars);
+	}
+		
+	array<float> GetVariablesFloat()
+	{
+		CachedObjectsArrays.ARRAY_FLOAT.Clear();
+		SerializeNumericalVars(CachedObjectsArrays.ARRAY_FLOAT);
+		return CachedObjectsArrays.ARRAY_FLOAT;
+	}
+
+	int NameToID(string name)
+	{
+		PluginVariables plugin = PluginVariables.Cast(GetPlugin(PluginVariables));
+		return plugin.GetID(name);
+	}
+
+	string IDToName(int id)
+	{
+		PluginVariables plugin = PluginVariables.Cast(GetPlugin(PluginVariables));
+		return plugin.GetName(id);
+	}
+
+	void OnSyncVariables(ParamsReadContext ctx)//with ID optimization
+	{
+		//Debug.Log("OnSyncVariables called for item:  "+ ToString(this.GetType()),"varSync");
+		//read the flags
+		//ref Param1<int> pflags = new Param1<int>(0);
+		int varFlags;
+		if (!ctx.Read(varFlags))
+			return;
+		
+		//ctx.Read(CachedObjectsParams.PARAM1_INT);
+		
+		//int varFlags = CachedObjectsParams.PARAM1_INT.param1;
+		//--------------
+		
+		
+		if (varFlags & ItemVariableFlags.FLOAT)
+		{
+			ReadVarsFromCTX(ctx);
+		}
+		/*
+		if (varFlags & ItemVariableFlags.STRING)
+		{
+			OnSyncStrings(ctx);
+		}
+		*/
+	}	
+		
+	void SerializeNumericalVars(array<float> floats_out)
+	{
+		// the order of serialization must be the same as the order of de-serialization
+		floats_out.Insert(m_VariablesMask);
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_QUANTITY))
+		{
+			floats_out.Insert(m_VarQuantity);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_TEMPERATURE))
+		{
+			floats_out.Insert(m_VarTemperature);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_WET))
+		{
+			floats_out.Insert(m_VarWet);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_LIQUIDTYPE))
+		{
+			floats_out.Insert(m_VarLiquidType);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_COLOR))
+		{
+			floats_out.Insert(m_ColorComponentR);
+			floats_out.Insert(m_ColorComponentG);
+			floats_out.Insert(m_ColorComponentB);
+			floats_out.Insert(m_ColorComponentA);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_CLEANNESS))
+		{
+			floats_out.Insert(m_Cleanness);
+		}
+		//--------------------------------------------
+	}
+	
+	void DeSerializeNumericalVars(array<float> floats)
+	{
+		// the order of serialization must be the same as the order of de-serialization
+		int index = 0;
+		int mask = Math.Round(floats.Get(index));
+		
+		index++;
+		//--------------------------------------------
+		if (mask & VARIABLE_QUANTITY)
+		{
+			if (m_IsStoreLoad)
+			{
+				m_StoreLoadedQuantity = floats.Get(index);
+			}
+			else
+			{
+				float quantity = floats.Get(index);
+				SetQuantity(quantity, true, false, false, false);
+			}
+			index++;
+		}
+		//--------------------------------------------
+		if (mask & VARIABLE_TEMPERATURE)
+		{
+			float temperature = floats.Get(index);
+			SetTemperature(temperature);
+			index++;
+		}
+		//--------------------------------------------
+		if (mask & VARIABLE_WET)
+		{
+			float wet = floats.Get(index);
+			SetWet(wet);
+			index++;
+		}
+		//--------------------------------------------
+		if (mask & VARIABLE_LIQUIDTYPE)
+		{
+			int liquidtype = Math.Round(floats.Get(index));
+			SetLiquidType(liquidtype);
+			index++;
+		}
+		//--------------------------------------------
+		if (mask & VARIABLE_COLOR)
+		{
+			m_ColorComponentR = Math.Round(floats.Get(index));
+			index++;
+			m_ColorComponentG = Math.Round(floats.Get(index));
+			index++;
+			m_ColorComponentB = Math.Round(floats.Get(index));
+			index++;
+			m_ColorComponentA = Math.Round(floats.Get(index));
+			index++;
+		}
+		if (mask & VARIABLE_CLEANNESS)
+		{
+			int cleanness = Math.Round(floats.Get(index));
+			SetCleanness(cleanness);
+			index++;
+		}
+		//--------------------------------------------
+	}
+
+	
+	void WriteVarsToCTX(ParamsWriteContext ctx)
+	{
+		ctx.Write(m_VariablesMask);
+
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_QUANTITY))
+		{
+			ctx.Write(m_VarQuantity);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_TEMPERATURE))
+		{
+			ctx.Write(m_VarTemperature);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_WET))
+		{
+			ctx.Write(m_VarWet);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_LIQUIDTYPE))
+		{
+			ctx.Write(m_VarLiquidType);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_COLOR))
+		{
+			ctx.Write(m_ColorComponentR);
+			ctx.Write(m_ColorComponentG);
+			ctx.Write(m_ColorComponentB);
+			ctx.Write(m_ColorComponentA);
+		}
+		//--------------------------------------------
+		if (IsVariableSet(VARIABLE_CLEANNESS))
+		{
+			ctx.Write(m_Cleanness);
+		}
+	}
+	
+	bool ReadVarsFromCTX(ParamsReadContext ctx, int version = -1)//with ID optimization
+	{
+		int numOfItems;
+		int intValue;
+		float value;
+		if (version <= 108 && version!= -1)
+		{
+			if (!ctx.Read(CachedObjectsParams.PARAM1_INT))
+				return false;
+		
+			numOfItems = CachedObjectsParams.PARAM1_INT.param1;
+			CachedObjectsArrays.ARRAY_FLOAT.Clear();
+		
+			for (int i = 0; i < numOfItems; i++)
+			{
+				if (!ctx.Read(CachedObjectsParams.PARAM1_FLOAT))
+					return false;
+				value = CachedObjectsParams.PARAM1_FLOAT.param1;
+			
+				CachedObjectsArrays.ARRAY_FLOAT.Insert(value);
+			}
+		
+			DeSerializeNumericalVars(CachedObjectsArrays.ARRAY_FLOAT);
+			return true;
+		}
+		else if (version <= 116 && version!= -1)
+		{
+			if (!ctx.Read(numOfItems))
+				return false;
+		
+			CachedObjectsArrays.ARRAY_FLOAT.Clear();
+		
+			for (int j = 0; j < numOfItems; j++)
+			{
+				if (!ctx.Read(value))
+					return false;
+				CachedObjectsArrays.ARRAY_FLOAT.Insert(value);
+			}
+		
+			DeSerializeNumericalVars(CachedObjectsArrays.ARRAY_FLOAT);
+			return true;		
+		}
+		else
+		{			
+			int mask;
+			if (!ctx.Read(mask))
+				return false;
+			
+			if (mask & VARIABLE_QUANTITY)
+			{
+				if (!ctx.Read(value))
+					return false;
+				
+				if (m_IsStoreLoad)
+				{
+					m_StoreLoadedQuantity = value;
+				}
+				else
+				{
+					SetQuantity(value, true, false, false, false);
+				}
+			}
+			//--------------------------------------------
+			if (mask & VARIABLE_TEMPERATURE)
+			{
+				if (!ctx.Read(value))
+					return false;
+				SetTemperature(value);
+			}
+			//--------------------------------------------
+			if (mask & VARIABLE_WET)
+			{
+				if (!ctx.Read(value))
+					return false;
+				SetWet(value);
+			}
+			//--------------------------------------------
+			if (mask & VARIABLE_LIQUIDTYPE)
+			{
+				if (!ctx.Read(intValue))
+					return false;
+				SetLiquidType(intValue);
+			}
+			//--------------------------------------------
+			if (mask & VARIABLE_COLOR)
+			{
+				if (!ctx.Read(intValue))
+					return false;
+				
+				m_ColorComponentR = intValue;
+				if (!ctx.Read(value))
+					return false;
+				
+				m_ColorComponentG = intValue;
+				if (!ctx.Read(value))
+					return false;
+				
+				m_ColorComponentB = intValue;
+				if (!ctx.Read(value))
+					return false;
+	
+				m_ColorComponentA = intValue;
+			}
+			//--------------------------------------------
+			if (mask & VARIABLE_CLEANNESS)
+			{
+				if (!ctx.Read(intValue))
+					return false;
+				SetCleanness(intValue);
+			}
+		}
+		return true;
+	}
+	
+	void SaveVariables(ParamsWriteContext ctx)
+	{
+		//Debug.Log("Saving Item Stage 0 "+ClassName(this)+" " + ToString(this));
+		
+		//first set the flags
+
+		int varFlags = 0;
+		
+		if (m_VariablesMask)
+			varFlags = ItemVariableFlags.FLOAT;
+
+		ctx.Write(varFlags);
+		//-------------------
+			
+		//now serialize the variables
+		
+		//floats
+		if (m_VariablesMask)
+			WriteVarsToCTX(ctx);
+	}
+
+		
+	//----------------------------------------------------------------
+	bool LoadVariables(ParamsReadContext ctx, int version = -1)
+	{
+		int varFlags;
+		if (version <= 108 && version != -1)
+		{
+			//read the flags
+			if (!ctx.Read(CachedObjectsParams.PARAM1_INT))
+			{
+				return false;
+			}
+			else
+			{
+				varFlags = CachedObjectsParams.PARAM1_INT.param1;
+				//--------------
+				if (varFlags & ItemVariableFlags.FLOAT)
+				{
+					if (!ReadVarsFromCTX(ctx, version))
+						return false;
+				}
+			}
+		}
+		else
+		{
+			//read the flags
+			if (!ctx.Read(varFlags))
+			{
+				return false;
+			}
+			else
+			{
+				//--------------
+				if (varFlags & ItemVariableFlags.FLOAT)
+				{
+					if (!ReadVarsFromCTX(ctx, version))
+						return false;
+				}
+			}		
+		}
+		return true;
+	}
+
+
+	//----------------------------------------------------------------
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		m_IsStoreLoad = true;
+		
+		if (GetDamageSystemVersionChange() != -1 && version < GetDamageSystemVersionChange())
+		{
+			m_FixDamageSystemInit = true;
+		}
+		
+		if (!super.OnStoreLoad(ctx, version))
+		{
+			m_IsStoreLoad = false;
+			return false;
+		}
+	
+		if (version >= 114)
+		{
+			bool hasQuickBarIndexSaved;
+			
+			if (!ctx.Read(hasQuickBarIndexSaved))
+			{
+				m_IsStoreLoad = false;
+				return false;
+			}
+			
+			if (hasQuickBarIndexSaved)
+			{
+				int itmQBIndex;
+				
+				//Load quickbar item bind
+				if (!ctx.Read(itmQBIndex))
+				{
+					m_IsStoreLoad = false;
+					return false;
+				}
+				
+				PlayerBase parentPlayer = PlayerBase.Cast(GetHierarchyRootPlayer());				
+				if (itmQBIndex != -1 && parentPlayer)
+					parentPlayer.SetLoadedQuickBarItemBind(this, itmQBIndex);
+			}
+		}
+		else
+		{
+			// Backup of how it used to be
+			PlayerBase player;
+			int itemQBIndex;
+			if (version == int.MAX)
+			{
+				if (!ctx.Read(itemQBIndex))
+				{
+					m_IsStoreLoad = false;
+					return false;
+				}
+			}
+			else if (Class.CastTo(player, GetHierarchyRootPlayer()))
+			{
+				//Load quickbar item bind
+				if (!ctx.Read(itemQBIndex))
+				{
+					m_IsStoreLoad = false;
+					return false;
+				}
+				if (itemQBIndex != -1 && player)
+					player.SetLoadedQuickBarItemBind(this,itemQBIndex);
+			}
+		}
+		
+		// variable management system
+		if (!LoadVariables(ctx, version))
+		{
+			m_IsStoreLoad = false;
+			return false;
+		}
+
+		//agent trasmission system
+		if (!LoadAgents(ctx, version))
+		{
+			m_IsStoreLoad = false;
+			return false;
+		}
+		if (version >= 132)
+		{
+			RemotelyActivatedItemBehaviour raib = GetRemotelyActivatedItemBehaviour();
+			if (raib)
+			{
+				if (!raib.OnStoreLoad(ctx,version))
+				{
+					m_IsStoreLoad = false;
+					return false;
+				}
+			}
+		}
+
+		m_IsStoreLoad = false;
+		return true;
+	}
+
+	//----------------------------------------------------------------
+
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		PlayerBase player;
+		if (PlayerBase.CastTo(player,GetHierarchyRootPlayer()))
+		{
+			ctx.Write(true); // Keep track of if we should actually read this in or not
+			//Save quickbar item bind
+			int itemQBIndex = -1;
+			itemQBIndex = player.FindQuickBarEntityIndex(this);
+			ctx.Write(itemQBIndex);	
+		}
+		else
+		{
+			ctx.Write(false); // Keep track of if we should actually read this in or not
+		}
+
+		SaveVariables(ctx);// variable management system
+		SaveAgents(ctx);//agent trasmission system
+		
+		RemotelyActivatedItemBehaviour raib = GetRemotelyActivatedItemBehaviour();
+		if (raib)
+		{
+			raib.OnStoreSave(ctx);
+		}
+	}
+	//----------------------------------------------------------------
+
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+		
+		if (m_FixDamageSystemInit)
+		{
+			PerformDamageSystemReinit();
+		}
+
+		if (m_StoreLoadedQuantity != float.LOWEST)
+		{
+			SetQuantity(m_StoreLoadedQuantity);
+			m_StoreLoadedQuantity = float.LOWEST;//IMPORTANT to do this !! we use 'm_StoreLoadedQuantity' inside SetQuantity to distinguish between initial quantity setting and the consequent(normal gameplay) calls
+		}
+	}
+	
+	override void EEOnAfterLoad()
+	{
+		super.EEOnAfterLoad();
+		
+		if (m_FixDamageSystemInit)
+		{
+			m_FixDamageSystemInit = false;
+		}
+		
+		if (GetRemotelyActivatedItemBehaviour())
+			GetRemotelyActivatedItemBehaviour().OnAfterLoad();
+	}
+	
+	bool CanBeDisinfected()
+	{
+		return false;
+	}
+	
+	
+	//----------------------------------------------------------------
+	override void OnVariablesSynchronized()
+	{
+		if (m_Initialized)
+		{	
+			#ifdef PLATFORM_CONSOLE
+			//bruteforce it is
+			if (m_CanThisBeSplit)
+			{
+				UIScriptedMenu menu = GetGame().GetUIManager().FindMenu(MENU_INVENTORY);
+				if (menu)
+				{
+					menu.Refresh();
+				}
+			}
+			#endif
+		}
+		
+		if (CanPlayDeployLoopSound())
+		{
+			PlayDeployLoopSoundEx();
+		}
+		
+		if (m_DeployLoopSoundEx && !CanPlayDeployLoopSound())
+		{
+			StopDeployLoopSoundEx();
+		}
+		
+		if (IsDeploySound())
+		{
+			PlayDeploySound();
+		}
+		
+		if (!dBodyIsDynamic(this) && m_WantPlayImpactSound)
+		{
+			PlayImpactSound(m_ConfigWeight, m_ImpactSpeed, m_ImpactSoundSurfaceHash);
+			m_WantPlayImpactSound = false;
+		}
+		
+		if (m_VarQuantity != m_VarQuantityPrev)
+		{
+			SetWeightDirty();
+			m_VarQuantityPrev = m_VarQuantity;
+		}
+		if (m_VarWet != m_VarWetPrev)
+		{
+			OnWetChanged(m_VarWet,m_VarWetPrev);
+			m_VarWetPrev = m_VarWet;
+		}
+	
+		super.OnVariablesSynchronized();
+	}
+
+	//-------------------------	Quantity
+	//----------------------------------------------------------------
+	//! Set item quantity[related to varQuantity... config entry], destroy_config = true > if the quantity reaches varQuantityMin or lower and the item config contains the varQuantityDestroyOnMin = true entry, the item gets destroyed. destroy_forced = true means item gets destroyed when quantity reaches varQuantityMin or lower regardless of config setting, returns true if the item gets deleted
+	bool SetQuantity(float value, bool destroy_config = true, bool destroy_forced = false, bool allow_client = false, bool clamp_to_stack_max = true)
+	{
+		if (!IsServerCheck(allow_client))
+			return false;
+		
+		if (!HasQuantity()) 
+			return false;
+		
+		if (IsLiquidContainer() && GetLiquidType() == 0)
+		{
+			Debug.LogError("No LiquidType specified, try setting 'varLiquidTypeInit' to a particular liquid type");
+			return false;
+		}
+		
+		float min = GetQuantityMin();
+		float max = GetQuantityMax();
+		
+		if (value <= (min + 0.001))
+			value = min;
+		
+		if (value == min)
+		{
+			if (destroy_config)
+			{
+				bool dstr = ConfigGetBool("varQuantityDestroyOnMin");
+				if (dstr)
+				{
+					m_VarQuantity = Math.Clamp(value, min, max);
+					this.Delete();
+					return true;
+				}
+			}
+			else if (destroy_forced)
+			{
+				m_VarQuantity = Math.Clamp(value, min, max);
+				this.Delete();
+				return true;
+			}
+			// we get here if destroy_config IS true AND dstr(config destroy param) IS false;
+			RemoveAllAgents();//we remove all agents when we got to the min value, but the item is not getting deleted
+		}
+		
+		float delta = m_VarQuantity;
+		m_VarQuantity = Math.Clamp(value, min, max);
+		
+		if (m_StoreLoadedQuantity == float.LOWEST)//any other value means we are setting quantity from storage
+		{
+			delta = m_VarQuantity - delta;
+			
+			if (delta)
+			{
+				OnQuantityChanged(delta);
+			}
+		}
+		
+		SetVariableMask(VARIABLE_QUANTITY);
+		
+		return false;
+	}
+
+	//----------------------------------------------------------------
+	//! add item quantity[related to varQuantity... config entry], destroy_config = true > if the quantity reaches varQuantityMin or lower and the item config contains the varQuantityDestroyOnMin = true entry, the item gets destroyed. destroy_forced = true means item gets destroyed when quantity reaches varQuantityMin or lower regardless of config setting, returns true if the item gets deleted
+	bool AddQuantity(float value, bool destroy_config = true, bool destroy_forced = false)
+	{	
+		return SetQuantity(GetQuantity() + value, destroy_config, destroy_forced);
+	}
+	//----------------------------------------------------------------
+	void SetQuantityMax()
+	{
+		float max = GetQuantityMax();
+		SetQuantity(max);
+	}
+	
+	override void SetQuantityToMinimum()
+	{
+		float min = GetQuantityMin();
+		SetQuantity(min);
+	}
+	//----------------------------------------------------------------
+	//! Sets quantity in normalized 0..1 form between the item's Min a Max values as defined by item's config(for Min 0 and Max 5000, setting 0.5 will result in value 2500)
+	void SetQuantityNormalized(float value, bool destroy_config = true, bool destroy_forced = false)
+	{
+		float value_clamped = Math.Clamp(value, 0, 1);//just to make sure
+		int result = Math.Round(Math.Lerp(GetQuantityMin(), GetQuantityMax(), value_clamped));
+		SetQuantity(result, destroy_config, destroy_forced);
+	}
+	
+	//----------------------------------------------------------------
+	//! Gets quantity in normalized 0..1 form between the item's Min a Max values as defined by item's config(for Min 0 and Max 5000, value 2500  will result in 0.5)
+	float GetQuantityNormalized()
+	{
+		return Math.InverseLerp(GetQuantityMin(), GetQuantityMax(),m_VarQuantity);
+	}
+
+	/*void SetAmmoNormalized(float value)
+	{
+		float value_clamped = Math.Clamp(value, 0, 1);
+		Magazine this_mag = Magazine.Cast(this);
+		int max_rounds = this_mag.GetAmmoMax();
+		int result = value * max_rounds;//can the rounded if higher precision is required
+		this_mag.SetAmmoCount(result);
+	}*/
+	//----------------------------------------------------------------
+	override int GetQuantityMax()
+	{
+		float max = 0;
+		
+		InventoryLocation il = new InventoryLocation;
+		if (GetInventory())
+			GetInventory().GetCurrentInventoryLocation(il);
+		
+		int slot = il.GetSlot();
+		
+		if (slot != -1)
+			max = InventorySlots.GetStackMaxForSlotId(slot);
+		
+		if (max <= 0)
+			max = m_VarStackMax;
+		
+		if (max <= 0)
+			max = m_VarQuantityMax;
+		
+		return max;
+	}
+	
+	override int GetTargetQuantityMax(int attSlotID = -1)
+	{
+		float quantity_max = 0;
+		
+		if (attSlotID != -1)
+			quantity_max = InventorySlots.GetStackMaxForSlotId(attSlotID);
+		
+		if (quantity_max <= 0)
+			quantity_max = m_VarStackMax;
+		
+		if (quantity_max <= 0)
+			quantity_max = m_VarQuantityMax;
+
+		return quantity_max;
+	}
+	//----------------------------------------------------------------
+	int GetQuantityMin()
+	{
+		return m_VarQuantityMin;
+	}
+	//----------------------------------------------------------------
+	int GetQuantityInit()
+	{
+		return m_VarQuantityInit;
+	}
+	
+	//----------------------------------------------------------------
+	bool HasQuantity()
+	{
+		return !(GetQuantityMax() - GetQuantityMin() == 0);
+	}
+
+	override float GetQuantity()
+	{
+		return m_VarQuantity;
+	}
+	
+	bool IsFullQuantity()
+	{
+		return GetQuantity() >= GetQuantityMax();
+	}
+	
+	//Calculates weight of single item without attachments and cargo
+	override float GetSingleInventoryItemWeightEx()
+	{
+		//this needs to be first stored inside local variables, when returned directly during inside  return call, the result is completely different due to enforce script bug
+		float weightEx = GetWeightEx();//overall weight of the item
+		float special = GetInventoryAndCargoWeight();//cargo and attachment weight
+		return weightEx - special;
+	}
+
+	// Obsolete, use GetSingleInventoryItemWeightEx() instead
+	float GetSingleInventoryItemWeight()
+	{
+		return GetSingleInventoryItemWeightEx();
+	}
+	
+	override protected float GetWeightSpecialized(bool forceRecalc = false)
+	{
+		if (m_CanThisBeSplit) //quantity determines size of the stack
+		{
+			#ifdef DEVELOPER
+			if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+			{
+				WeightDebugData data1 = WeightDebug.GetWeightDebug(this);
+				data1.SetCalcDetails("TIB1: " + GetConfigWeightModifiedDebugText() +" * " + GetQuantity()+"(quantity)");
+			}
+			#endif
+			
+			return GetQuantity() * GetConfigWeightModified();
+		}
+		else if (HasEnergyManager())// items with energy manager
+		{
+			#ifdef DEVELOPER
+			if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+			{
+				WeightDebugData data2 = WeightDebug.GetWeightDebug(this);
+				data2.SetCalcDetails("TIB2: "+super.GetWeightSpecialized(forceRecalc)+"(contents weight) + " + GetConfigWeightModifiedDebugText() +" + " + GetCompEM().GetEnergy()+"(energy) * " + ConfigGetFloat("weightPerQuantityUnit") +"(weightPerQuantityUnit)");
+			}
+			#endif
+			return super.GetWeightSpecialized(forceRecalc) + (GetCompEM().GetEnergy() * ConfigGetFloat("weightPerQuantityUnit")) + GetConfigWeightModified());
+		}
+		else//everything else
+		{
+			#ifdef DEVELOPER
+			if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+			{
+				WeightDebugData data3 = WeightDebug.GetWeightDebug(this);
+				data3.SetCalcDetails("TIB3: "+super.GetWeightSpecialized(forceRecalc)+"(contents weight) + " + GetConfigWeightModifiedDebugText() +" + " + GetQuantity()+"(quantity) * " + ConfigGetFloat("weightPerQuantityUnit") +"(weightPerQuantityUnit))");
+			}
+			#endif
+			return super.GetWeightSpecialized(forceRecalc) + (GetQuantity() * ConfigGetFloat("weightPerQuantityUnit")) + GetConfigWeightModified());
+		}
+	}
+
+	//! Returns the number of items in cargo, otherwise returns 0(non-cargo objects). Recursive.
+	int GetNumberOfItems()
+	{
+		int item_count = 0;
+		ItemBase item;
+		
+		if (GetInventory().GetCargo() != NULL)
+		{
+			item_count = GetInventory().GetCargo().GetItemCount();
+		}
+		
+		for (int i = 0; i < GetInventory().AttachmentCount(); i++)
+		{
+			Class.CastTo(item,GetInventory().GetAttachmentFromIndex(i));
+			if (item)
+				item_count += item.GetNumberOfItems();
+		}
+		return item_count;
+	}
+	
+	//! Obsolete, use GetWeightEx instead
+	float GetUnitWeight(bool include_wetness = true)
+	{
+		float weight = 0;
+		float wetness = 1;
+		if (include_wetness)
+			wetness += GetWet();
+		if (m_CanThisBeSplit) //quantity determines size of the stack
+		{
+			weight = wetness * m_ConfigWeight;
+		}
+		else if (ConfigGetFloat("liquidContainerType") > 0) //is a liquid container, default liquid weight is set to 1. May revisit later?
+		{
+			weight = 1;
+		}
+		return weight;
+	}
+	
+	void SetVariableMask(int variable)
+	{
+		m_VariablesMask = variable | m_VariablesMask; 
+		if (GetGame().IsServer()) 
+		{
+			SetSynchDirty();
+		}
+	}
+	
+	//!Removes variable from variable mask, making it appear as though the variable has never been changed from default
+	void RemoveItemVariable(int variable)
+	{
+		m_VariablesMask = ~variable & m_VariablesMask;
+	}
+	
+	//!'true' if this variable has ever been changed from default
+	bool IsVariableSet(int variable)
+	{
+		return (variable & m_VariablesMask);
+	}
+	
+	//-----------------------------------------------------------------
+	
+	override void ClearInventory()
+	{
+		if ((GetGame().IsServer() || !GetGame().IsMultiplayer()) && GetInventory())
+		{
+			GameInventory inv = GetInventory();
+			array<EntityAI> items = new array<EntityAI>;
+			inv.EnumerateInventory(InventoryTraversalType.INORDER, items);
+			for (int i = 0; i < items.Count(); i++)
+			{
+				ItemBase item = ItemBase.Cast(items.Get(i));
+				if (item)
+				{
+					GetGame().ObjectDelete(item);
+				}
+			}
+		}
+	}
+	
+	//-------------------------	Energy
+
+	//----------------------------------------------------------------
+	float GetEnergy()
+	{
+		float energy = 0;
+		if (HasEnergyManager())
+		{
+			energy = GetCompEM().GetEnergy();
+		}
+		return energy;
+	}
+	
+	
+	override void OnEnergyConsumed()
+	{
+		super.OnEnergyConsumed();
+		
+		ConvertEnergyToQuantity();
+	}
+
+	override void OnEnergyAdded() 
+	{
+		super.OnEnergyAdded();
+		
+		ConvertEnergyToQuantity();
+	}
+	
+	// Converts energy (from Energy Manager) to quantity, if enabled.
+	void ConvertEnergyToQuantity()
+	{
+		if (GetGame().IsServer() && HasEnergyManager() && GetCompEM().HasConversionOfEnergyToQuantity())
+		{
+			if (HasQuantity())
+			{
+				float energy_0to1 = GetCompEM().GetEnergy0To1();
+				SetQuantityNormalized(energy_0to1);
+			}
+		}
+	}
+
+	override void SetTemperature(float value, bool allow_client = false)
+	{
+		if (!IsServerCheck(allow_client)) 
+			return;
+
+		float min = GetTemperatureMin();
+		float max = GetTemperatureMax();
+		
+		float previousValue = m_VarTemperature;
+		
+		m_VarTemperature = Math.Clamp(value, min, max);
+		
+		if (previousValue != m_VarTemperature)
+			SetVariableMask(VARIABLE_TEMPERATURE);
+	}
+	//----------------------------------------------------------------
+	override void AddTemperature(float value)
+	{
+		SetTemperature(value + GetTemperature());
+	}
+	//----------------------------------------------------------------
+	override void SetTemperatureMax()
+	{
+		SetTemperature(m_VarTemperatureMax);
+	}
+	//----------------------------------------------------------------
+	override float GetTemperature()
+	{
+		return m_VarTemperature;
+	}
+	
+	override float GetTemperatureInit()
+	{
+		return m_VarTemperatureInit;
+	}
+	
+	override float GetTemperatureMin()
+	{
+		return m_VarTemperatureMin;
+	}
+
+	override float GetTemperatureMax()
+	{
+		return m_VarTemperatureMax;
+	}
+	//----------------------------------------------------------------
+	float GetHeatIsolationInit()
+	{
+		return ConfigGetFloat("heatIsolation");
+	}
+
+	float GetHeatIsolation()
+	{
+		return m_HeatIsolation;
+	}
+
+	float GetDryingIncrement(string pIncrementName)
+	{
+		string paramPath = string.Format("CfgVehicles %1 EnvironmentWetnessIncrements Drying %2", GetType(), pIncrementName);
+		if (GetGame().ConfigIsExisting(paramPath))
+			return GetGame().ConfigGetFloat(paramPath);
+		
+		return 0.0;
+	}
+	
+	float GetSoakingIncrement(string pIncrementName)
+	{
+		string paramPath = string.Format("CfgVehicles %1 EnvironmentWetnessIncrements Soaking %2", GetType(), pIncrementName);
+		if (GetGame().ConfigIsExisting(paramPath))
+			return GetGame().ConfigGetFloat(paramPath);
+		
+		return 0.0;
+	}
+	//----------------------------------------------------------------
+	override void SetWet(float value, bool allow_client = false)
+	{
+		if (!IsServerCheck(allow_client))
+			return;
+		
+		float min = GetWetMin();
+		float max = GetWetMax();
+		
+		float previousValue = m_VarWet;
+		
+		m_VarWet = Math.Clamp(value, min, max);
+		
+		if (previousValue != m_VarWet)
+		{
+			SetVariableMask(VARIABLE_WET);
+			OnWetChanged(m_VarWet, previousValue);
+		}
+	}
+	//----------------------------------------------------------------
+	override void AddWet(float value)
+	{
+		SetWet(GetWet() + value);
+	}
+	//----------------------------------------------------------------
+	override void SetWetMax()
+	{
+		SetWet(m_VarWetMax);
+	}
+	//----------------------------------------------------------------
+	override float GetWet()
+	{
+		return m_VarWet;
+	}
+	//----------------------------------------------------------------
+	override float GetWetMax()
+	{
+		return m_VarWetMax;
+	}
+	//----------------------------------------------------------------
+	override float GetWetMin()
+	{
+		return m_VarWetMin;
+	}
+	//----------------------------------------------------------------
+	override float GetWetInit()
+	{
+		return m_VarWetInit;
+	}
+	//----------------------------------------------------------------
+	override void OnWetChanged(float newVal, float oldVal)
+	{
+		EWetnessLevel newLevel = GetWetLevelInternal(newVal);
+		EWetnessLevel oldLevel = GetWetLevelInternal(oldVal);
+		if (newLevel != oldLevel)
+		{
+			OnWetLevelChanged(newLevel,oldLevel);
+		}
+	}
+	
+	override void OnWetLevelChanged(EWetnessLevel newLevel, EWetnessLevel oldLevel)
+	{
+		SetWeightDirty();
+	}
+	
+	override EWetnessLevel GetWetLevel()
+	{
+		return GetWetLevelInternal(m_VarWet);
+	}
+
+	//----------------------------------------------------------------
+	bool IsServerCheck(bool allow_client)
+	{
+		if (g_Game.IsServer())
+			return true;
+		
+		if (allow_client)
+			return true;
+
+		if (GetGame().IsClient() && GetGame().IsMultiplayer()) 
+		{
+			Error("Attempting to change variable client side, variables are supposed to be changed on server only !!");
+			return false;
+		}
+
+		return true;
+	}
+	
+	float GetItemModelLength()
+	{
+		if (ConfigIsExisting("itemModelLength"))
+		{
+			return ConfigGetFloat("itemModelLength");
+		}
+		return 0;
+	}
+	
+	float GetItemAttachOffset()
+	{
+		if (ConfigIsExisting("itemAttachOffset"))
+		{
+			return ConfigGetFloat("itemAttachOffset");
+		}
+		return 0;
+	}
+	
+	void SetCleanness(int value, bool allow_client = false)
+	{
+		if (!IsServerCheck(allow_client)) 
+			return;
+		
+		int previousValue = m_Cleanness;
+		
+		m_Cleanness = Math.Clamp(value, m_CleannessMin, m_CleannessMax);
+		
+		if (previousValue != m_Cleanness)
+			SetVariableMask(VARIABLE_CLEANNESS);
+	}
+	
+	
+	bool AllowFoodConsumption()
+	{
+		return true;
+	}
+	
+	//----------------------------------------------------------------
+	// ATTACHMENT LOCKING
+	// Getters relevant to generic ActionLockAttachment
+	int GetLockType()
+	{
+		return m_LockType;
+	}
+	
+	string GetLockSoundSet()
+	{
+		return m_LockSoundSet;
+	}
+
+	//----------------------------------------------------------------
+	//-------------------------	Color
+	// sets items color variable given color components
+	void SetColor(int r, int g, int b, int a)
+	{
+		m_ColorComponentR = r;
+		m_ColorComponentG = g;
+		m_ColorComponentB = b;
+		m_ColorComponentA = a;
+		SetVariableMask(VARIABLE_COLOR);
+	}
+	//! gets item's color variable as components
+	void GetColor(out int r,out int g,out int b,out int a)
+	{
+		r = m_ColorComponentR;
+		g = m_ColorComponentG;
+		b = m_ColorComponentB;
+		a = m_ColorComponentA;
+	}
+	
+	bool IsColorSet()
+	{
+		return IsVariableSet(VARIABLE_COLOR);
+	}
+	
+	//! Returns item's PROCEDURAL color as formated string, i.e. "#(argb,8,8,3)color(0.15,0.15,0.15,1.0,CO)"
+	string GetColorString()
+	{
+		int r,g,b,a;
+		GetColor(r,g,b,a);
+		r = r/255;
+		g = g/255;
+		b = b/255;
+		a = a/255;
+		return MiscGameplayFunctions.GetColorString(r, g, b, a);
+	}
+	//----------------------------------------------------------------
+	//-------------------------	LiquidType
+
+	void SetLiquidType(int value, bool allow_client = false)
+	{
+		if (!IsServerCheck(allow_client))
+			return;
+
+		m_VarLiquidType = value;
+		SetVariableMask(VARIABLE_LIQUIDTYPE);
+	}
+	
+	int GetLiquidTypeInit()
+	{
+		return ConfigGetInt("varLiquidTypeInit");
+	}
+	
+	int GetLiquidType()
+	{
+		return m_VarLiquidType;
+	}
+
+	// -------------------------------------------------------------------------
+	//! Event called on item when it is placed in the player(Man) inventory, passes the owner as a parameter
+	void OnInventoryEnter(Man player)
+	{
+		PlayerBase nplayer;
+		if (PlayerBase.CastTo(nplayer, player))
+		{
+			m_CanPlayImpactSound = true;
+			//nplayer.OnItemInventoryEnter(this);
+			nplayer.SetEnableQuickBarEntityShortcut(this,true);	
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	//! Event called on item when it is removed from the player(Man) inventory, passes the old owner as a parameter
+	void OnInventoryExit(Man player)
+	{
+		PlayerBase nplayer;
+		if (PlayerBase.CastTo(nplayer,player))
+		{		
+			//nplayer.OnItemInventoryExit(this);
+			nplayer.SetEnableQuickBarEntityShortcut(this,false);
+
+		}
+		
+		//if (!GetGame().IsDedicatedServer())
+		player.GetHumanInventory().ClearUserReservedLocationForContainer(this);
+		
+		
+		if (HasEnergyManager())
+		{
+			GetCompEM().UpdatePlugState(); // Unplug the el. device if it's necesarry.
+		}
+	}
+
+	// ADVANCED PLACEMENT EVENTS
+	override void OnPlacementStarted(Man player) 
+	{
+		super.OnPlacementStarted(player);
+		
+		SetTakeable(false);
+	}
+	
+	override void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0")
+	{
+		if (m_AdminLog)
+		{
+			m_AdminLog.OnPlacementComplete(player, this);
+		}
+		if (GetGame().IsServer())
+		{
+			SetIsDeploySound(true);
+		}
+		super.OnPlacementComplete(player, position, orientation);
+	}
+		
+	//-----------------------------
+	// AGENT SYSTEM
+	//-----------------------------
+	//--------------------------------------------------------------------------
+	bool ContainsAgent(int agent_id)
+	{
+		if (agent_id & m_AttachedAgents)
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	//--------------------------------------------------------------------------
+	override void RemoveAgent(int agent_id)
+	{
+		if (ContainsAgent(agent_id))
+		{
+			m_AttachedAgents = ~agent_id & m_AttachedAgents;
+		}
+	}
+
+	//--------------------------------------------------------------------------
+	override void RemoveAllAgents()
+	{
+		m_AttachedAgents = 0;
+	}
+	//--------------------------------------------------------------------------
+	override void RemoveAllAgentsExcept(int agents_to_keep_mask)
+	{
+		m_AttachedAgents = m_AttachedAgents & agent_to_keep;
+	}
+	// -------------------------------------------------------------------------
+	override void InsertAgent(int agent, float count = 1)
+	{
+		if (count < 1)
+			return;
+		//Debug.Log("Inserting Agent on item: " + agent.ToString() +" count: " + count.ToString());
+		m_AttachedAgents = (agent | m_AttachedAgents);
+	}
+	
+	//!transfer agents from another item
+	void TransferAgents(int agents)
+	{
+		m_AttachedAgents = (m_AttachedAgents | agents);
+	}
+	
+	// -------------------------------------------------------------------------
+	override int GetAgents()
+	{
+		return m_AttachedAgents;
+	}
+	//----------------------------------------------------------------------
+	
+	/*int GetContaminationType()
+	{
+		int contamination_type;
+		
+		const int CONTAMINATED_MASK = eAgents.CHOLERA | eAgents.INFLUENZA | eAgents.SALMONELLA | eAgents.BRAIN;
+		const int POISONED_MASK = eAgents.FOOD_POISON | eAgents.CHEMICAL_POISON;
+		const int NERVE_GAS_MASK = eAgents.CHEMICAL_POISON;
+		const int DIRTY_MASK = eAgents.WOUND_AGENT;
+		
+		Edible_Base edible = Edible_Base.Cast(this);
+		int agents = GetAgents();
+		if (edible)
+		{
+			NutritionalProfile profile = Edible_Base.GetNutritionalProfile(edible);
+			if (profile)
+			{
+				//Print("profile agents:" +profile.GetAgents());
+				agents = agents | profile.GetAgents();//merge item's agents with nutritional agents
+			}
+		}
+		if (agents & CONTAMINATED_MASK)
+		{
+			contamination_type = contamination_type | EContaminationTypes.ITEM_BADGE_CONTAMINATED;
+		}
+		if (agents & POISONED_MASK)
+		{
+			contamination_type = contamination_type | EContaminationTypes.ITEM_BADGE_POISONED;
+		}
+		if (agents & NERVE_GAS_MASK)
+		{
+			contamination_type = contamination_type | EContaminationTypes.ITEM_BADGE_NERVE_GAS;
+		}
+		if (agents & DIRTY_MASK)
+		{
+			contamination_type = contamination_type | EContaminationTypes.ITEM_BADGE_DIRTY;
+		}
+		
+		return agents;
+	}*/
+	
+	// -------------------------------------------------------------------------
+	bool LoadAgents(ParamsReadContext ctx, int version)
+	{
+		if (!ctx.Read(m_AttachedAgents))
+			return false;
+		return true;
+	}
+	// -------------------------------------------------------------------------
+	void SaveAgents(ParamsWriteContext ctx)
+	{
+		
+		ctx.Write(m_AttachedAgents);
+	}
+	// -------------------------------------------------------------------------
+	
+	
+	// returns item's protection level against enviromental hazard, for masks with filters, returns the filters protection for valid filter, otherwise 0
+	float GetProtectionLevel(int type, bool consider_filter = false, int system = 0)
+	{
+		if (IsDamageDestroyed() || (HasQuantity() && GetQuantity() <= 0))
+		{
+			return 0;
+		}
+		
+		if (GetInventory().GetAttachmentSlotsCount() != 0)//is it an item with attachable filter ?
+		{
+			ItemBase filter = ItemBase.Cast(FindAttachmentBySlotName("GasMaskFilter"));
+			if (filter)
+				return filter.GetProtectionLevel(type, false, system);//it's a valid filter, return the protection
+			else
+				return 0;//otherwise return 0 when no filter attached
+		}
+
+		string subclassPath, entryName;
+
+		switch (type)
+		{
+			case DEF_BIOLOGICAL:
+				entryName = "biological";
+				break;
+			case DEF_CHEMICAL:
+				entryName = "chemical";
+				break;	
+			default:
+				entryName = "biological";
+				break;
+		}
+		
+		subclassPath = "CfgVehicles " + this.GetType() + " Protection ";
+		
+		return GetGame().ConfigGetFloat(subclassPath + entryName);
+	}
+	
+	
+	
+	//! Called when entity is being created as new by CE/ Debug
+	override void EEOnCECreate()
+	{
+		//Print("EEOnCECreate");
+		if (!IsMagazine())
+			SetCEBasedQuantity();
+
+		SetZoneDamageCEInit();
+	}
+	
+	
+	//-------------------------
+	// OPEN/CLOSE USER ACTIONS
+	//-------------------------
+	//! Implementations only
+	void Open();
+	void Close();
+	bool IsOpen()
+	{
+		return true;
+	}
+
+	override bool CanDisplayCargo()
+	{
+		return IsOpen();
+	}
+	
+	
+	// ------------------------------------------------------------
+	// CONDITIONS
+	// ------------------------------------------------------------
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (parent)
+		{
+			if (parent.IsInherited(DayZInfected))
+				return true;
+
+			if (!parent.IsRuined())
+				return true;
+		}
+		
+		return true;
+	}	
+	
+	override bool CanPutAsAttachment(EntityAI parent)
+	{
+		if (!super.CanPutAsAttachment(parent))
+		{
+			return false;
+		}
+		
+		if (!IsRuined() && !parent.IsRuined())
+		{
+			return true;
+		}
+
+		return false;
+	}
+
+	override bool CanReceiveItemIntoCargo(EntityAI item)
+	{
+		//removed 15.06. coz of loading from storage -> after load items in cargo was lost -> waiting for proper solution
+		//if (GetHealthLevel() == GameConstants.STATE_RUINED)
+		//	return false;
+		
+		return super.CanReceiveItemIntoCargo(item);
+	}
+
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		//removed 15.06. coz of loading from storage -> after load items in cargo was lost -> waiting for proper solution
+		//if (GetHealthLevel() == GameConstants.STATE_RUINED)
+		//	return false;
+		
+		GameInventory attachmentInv = attachment.GetInventory();
+		if (attachmentInv && attachmentInv.GetCargo() && attachmentInv.GetCargo().GetItemCount() > 0)
+		{
+			if (GetHierarchyParent() && !GetHierarchyParent().IsInherited(PlayerBase))
+				return false;
+		}
+		
+		return super.CanReceiveAttachment(attachment, slotId);
+	}
+	
+	/*override bool CanLoadAttachment(EntityAI attachment)
+	{
+		//removed 15.06. coz of loading from storage -> after load items in cargo was lost -> waiting for proper solution
+		//if (GetHealthLevel() == GameConstants.STATE_RUINED)
+		//	return false;
+		
+		GameInventory attachmentInv = attachment.GetInventory();
+		if (attachmentInv && attachmentInv.GetCargo() && attachmentInv.GetCargo().GetItemCount() > 0)
+		{
+			bool boo = (GetHierarchyParent() && !GetHierarchyParent().IsInherited(PlayerBase));
+			ErrorEx("CanLoadAttachment | this: " + this + " | attachment: " + attachment + " | boo: " + boo,ErrorExSeverity.INFO);
+			
+			if (GetHierarchyParent() && !GetHierarchyParent().IsInherited(PlayerBase))
+				return false;
+		}
+		
+		return super.CanLoadAttachment(attachment);
+	}*/
+	
+	// Plays muzzle flash particle effects
+	static void PlayFireParticles(ItemBase weapon, int muzzle_index, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		int id = muzzle_owner.GetMuzzleID();
+		array<ref WeaponParticlesOnFire> WPOF_array = m_OnFireEffect.Get(id);
+		
+		if (WPOF_array)
+		{
+			for (int i = 0; i < WPOF_array.Count(); i++)
+			{
+				WeaponParticlesOnFire WPOF = WPOF_array.Get(i);
+				
+				if (WPOF)
+				{
+					WPOF.OnActivate(weapon, muzzle_index, ammoType, muzzle_owner, suppressor, config_to_search);
+				}
+			}
+		}
+	}
+	
+	// Plays bullet eject particle effects (usually just smoke, the bullet itself is a 3D model and is not part of this function)
+	static void PlayBulletCasingEjectParticles(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		int id = muzzle_owner.GetMuzzleID();
+		array<ref WeaponParticlesOnBulletCasingEject> WPOBE_array = m_OnBulletCasingEjectEffect.Get(id);
+		
+		if (WPOBE_array)
+		{
+			for (int i = 0; i < WPOBE_array.Count(); i++)
+			{
+				WeaponParticlesOnBulletCasingEject WPOBE = WPOBE_array.Get(i);
+				
+				if (WPOBE)
+				{
+					WPOBE.OnActivate(weapon, 0, ammoType, muzzle_owner, suppressor, config_to_search);
+				}
+			}
+		}
+	}
+	
+	// Plays all weapon overheating particles
+	static void PlayOverheatingParticles(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		int id = muzzle_owner.GetMuzzleID();
+		array<ref WeaponParticlesOnOverheating> WPOOH_array = weapon.m_OnOverheatingEffect.Get(id);
+		
+		if (WPOOH_array)
+		{
+			for (int i = 0; i < WPOOH_array.Count(); i++)
+			{
+				WeaponParticlesOnOverheating WPOOH = WPOOH_array.Get(i);
+				
+				if (WPOOH)
+				{
+					WPOOH.OnActivate(weapon, 0, ammoType, muzzle_owner, suppressor, config_to_search);
+				}
+			}
+		}
+	}
+	
+	// Updates all weapon overheating particles
+	static void UpdateOverheatingParticles(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		int id = muzzle_owner.GetMuzzleID();
+		array<ref WeaponParticlesOnOverheating> WPOOH_array = weapon.m_OnOverheatingEffect.Get(id);
+		
+		if (WPOOH_array)
+		{
+			for (int i = 0; i < WPOOH_array.Count(); i++)
+			{
+				WeaponParticlesOnOverheating WPOOH = WPOOH_array.Get(i);
+				
+				if (WPOOH)
+				{
+					WPOOH.OnUpdate(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+				}
+			}
+		}
+	}
+	
+	// Stops overheating particles
+	static void StopOverheatingParticles(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		int id = muzzle_owner.GetMuzzleID();
+		array<ref WeaponParticlesOnOverheating> WPOOH_array = weapon.m_OnOverheatingEffect.Get(id);
+		
+		if (WPOOH_array)
+		{
+			for (int i = 0; i < WPOOH_array.Count(); i++)
+			{
+				WeaponParticlesOnOverheating WPOOH = WPOOH_array.Get(i);
+				
+				if (WPOOH)
+				{
+					WPOOH.OnDeactivate(weapon, ammoType, muzzle_owner, suppressor, config_to_search);
+				}
+			}
+		}
+	}
+	
+	//----------------------------------------------------------------
+	//Item Behaviour - unified approach
+	override bool IsHeavyBehaviour()
+	{
+		if (m_ItemBehaviour == 0)
+		{	
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool IsOneHandedBehaviour()
+	{
+		if (m_ItemBehaviour == 1)
+		{
+			return true;	
+		}
+		
+		return false;
+	}
+	
+	override bool IsTwoHandedBehaviour()
+	{
+		if (m_ItemBehaviour == 2)
+		{
+			return true;
+		}
+			
+		return false;
+	}
+	
+	bool IsDeployable()
+	{
+		return false;
+	}
+	
+	//!how long it takes to deploy this item in seconds
+	float GetDeployTime()
+	{
+		return UATimeSpent.DEFAULT_DEPLOY;
+	}
+	
+
+	//----------------------------------------------------------------
+	// Item Targeting (User Actions)
+	override void SetTakeable(bool pState)
+	{
+		m_IsTakeable = pState;
+		SetSynchDirty();
+	}
+
+	override bool IsTakeable()
+	{
+		return m_IsTakeable;
+	}
+
+	//! Attachment Sound Type getting from config file
+	protected void PreLoadSoundAttachmentType()
+	{
+		string att_type = "None";
+
+		if (ConfigIsExisting("soundAttType"))
+		{
+			att_type = ConfigGetString("soundAttType");
+		}
+		
+		m_SoundAttType = att_type;
+	}
+	
+	override string GetAttachmentSoundType()
+	{	
+		return m_SoundAttType;
+	}
+	
+	//----------------------------------------------------------------
+	//SOUNDS FOR ADVANCED PLACEMNT
+	//----------------------------------------------------------------
+	
+	void SoundSynchRemoteReset()
+	{	
+		m_IsSoundSynchRemote = false;
+		
+		SetSynchDirty();
+	}
+	
+	void SoundSynchRemote()
+	{	
+		m_IsSoundSynchRemote = true;
+				
+		SetSynchDirty();
+	}
+	
+	bool IsSoundSynchRemote()
+	{	
+		return m_IsSoundSynchRemote;
+	}
+	
+	string GetDeploySoundset();	
+	string GetPlaceSoundset();
+	string GetLoopDeploySoundset();
+	string GetDeployFinishSoundset();
+	
+	void SetIsPlaceSound(bool is_place_sound)
+	{
+		m_IsPlaceSound = is_place_sound;
+	}
+	
+	bool IsPlaceSound()
+	{
+		return m_IsPlaceSound;
+	}
+	
+	void SetIsDeploySound(bool is_deploy_sound)
+	{
+		m_IsDeploySound = is_deploy_sound;
+	}
+	
+	bool IsDeploySound()
+	{
+		return m_IsDeploySound;
+	}
+	
+	void PlayDeployLoopSoundEx()
+	{		
+		if (!GetGame().IsDedicatedServer() && !m_DeployLoopSoundEx)
+		{		
+			m_DeployLoopSoundEx = SEffectManager.PlaySound(GetLoopDeploySoundset(), GetPosition());
+			if (m_DeployLoopSoundEx)
+				m_DeployLoopSoundEx.SetAutodestroy(true);
+			else
+				Debug.Log("dbgSounds | null m_DeployLoopSoundEx from sound set: " + GetLoopDeploySoundset());
+		}
+	}
+	
+	void StopDeployLoopSoundEx()
+	{
+		if (!GetGame().IsDedicatedServer())
+		{	
+			m_DeployLoopSoundEx.SetSoundFadeOut(0.5);
+			m_DeployLoopSoundEx.SoundStop();
+		}
+	}
+	
+	void PlayDeploySound()
+	{
+		if (!GetGame().IsDedicatedServer() && !m_SoundDeploy)
+		{
+			m_SoundDeploy = SEffectManager.PlaySound(GetDeploySoundset(), GetPosition());
+			if (m_SoundDeploy)
+				m_SoundDeploy.SetAutodestroy(true);
+			else
+				Debug.Log("dbgSounds | null m_SoundDeploy from sound set: " + GetDeploySoundset());
+		}
+	}
+	
+	void PlayDeployFinishSound()
+	{
+		if (!GetGame().IsDedicatedServer() && !m_SoundDeployFinish)
+		{
+			m_SoundDeployFinish = SEffectManager.PlaySound(GetDeployFinishSoundset(), GetPosition());
+			if (m_SoundDeployFinish)
+				m_SoundDeployFinish.SetAutodestroy(true);
+			else
+				Debug.Log("dbgSounds | null m_SoundDeployFinish from sound set: " + GetDeployFinishSoundset());
+		}
+	}
+	
+	void PlayPlaceSound()
+	{
+		if (!GetGame().IsDedicatedServer() && !m_SoundPlace)
+		{
+			m_SoundPlace = SEffectManager.PlaySound(GetPlaceSoundset(), GetPosition());
+			if (m_SoundPlace)
+				m_SoundPlace.SetAutodestroy(true);
+			else
+				Debug.Log("dbgSounds | null m_SoundPlace from sound set: " + GetPlaceSoundset());
+		}
+	}
+	
+	bool CanPlayDeployLoopSound()
+	{		
+		return IsBeingPlaced() && IsSoundSynchRemote();
+	}
+	
+	//! Plays sound on item attach. Be advised, the config structure may slightly change in 1.11 update to allow for more complex use.
+	void PlayAttachSound(string slot_type)
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			if (ConfigIsExisting("attachSoundSet"))
+			{
+				string cfg_path = "";
+				string soundset = "";
+				string type_name = GetType();
+				
+				TStringArray cfg_soundset_array = new TStringArray;
+				TStringArray cfg_slot_array = new TStringArray;
+				ConfigGetTextArray("attachSoundSet",cfg_soundset_array);
+				ConfigGetTextArray("attachSoundSlot",cfg_slot_array);
+				
+				if (cfg_soundset_array.Count() > 0 && cfg_soundset_array.Count() == cfg_slot_array.Count())
+				{
+					for (int i = 0; i < cfg_soundset_array.Count(); i++)
+					{
+						if (cfg_slot_array[i] == slot_type)
+						{
+							soundset = cfg_soundset_array[i];
+							break;
+						}
+					}
+				}
+				
+				if (soundset != "")
+				{
+					EffectSound sound =	SEffectManager.PlaySound(soundset, GetPosition());
+					sound.SetAutodestroy(true);
+				}
+			}
+		}
+	}
+	
+	void PlayDetachSound(string slot_type)
+	{
+		//TODO - evaluate if needed and devise universal config structure if so
+	}
+	
+	void OnApply(PlayerBase player);
+	
+	float GetBandagingEffectivity()
+	{
+		return 1.0;
+	};
+	//returns applicable selection
+	array<string> GetHeadHidingSelection()
+	{
+		return m_HeadHidingSelections;
+	}
+	
+	bool HidesSelectionBySlot()
+	{
+		return m_HideSelectionsBySlot;
+	}
+	
+	WrittenNoteData GetWrittenNoteData() {};
+	
+	void StopItemDynamicPhysics()
+	{
+		SetDynamicPhysicsLifeTime(0.01);
+		m_ItemBeingDroppedPhys = false;
+	}
+	
+	void PerformDamageSystemReinit()
+	{
+		array<string> zone_names = new array<string>;
+		GetDamageZones(zone_names);
+		for (int i = 0; i < zone_names.Count(); i++)
+		{
+			SetHealthMax(zone_names.Get(i),"Health");
+		}
+		SetHealthMax("","Health");
+	}
+	
+	//! Sets zone damages to match randomized global health set by CE (CE spawn only)
+	void SetZoneDamageCEInit()
+	{
+		float global_health = GetHealth01("","Health");
+		array<string> zones = new array<string>;
+		GetDamageZones(zones);
+		//set damage of all zones to match global health level
+		for (int i = 0; i < zones.Count(); i++)
+		{
+			SetHealth01(zones.Get(i),"Health",global_health);
+		}
+	}
+	
+	//!DEPRECATED in use, but returns correct values nontheless. Check performed elsewhere
+	bool IsCoverFaceForShave(string slot_name)
+	{
+		return IsExclusionFlagPresent(PlayerBase.GetFaceCoverageShaveValues());
+	}
+	
+	void ProcessItemWetness(float delta, bool hasParent, bool hasRootAsPlayer, ItemBase refParentIB)
+	{
+		if (!hasRootAsPlayer)
+		{
+			if (refParentIB)
+			{
+				// parent is wet
+				if ((refParentIB.GetWet() >= GameConstants.STATE_SOAKING_WET) && (m_VarWet < m_VarWetMax))
+					AddWet(delta * GameConstants.WETNESS_RATE_WETTING_INSIDE);
+				// parent has liquid inside
+				else if ((refParentIB.GetLiquidType() != 0) && (refParentIB.GetQuantity() > 0) && (m_VarWet < m_VarWetMax))
+					AddWet(delta * GameConstants.WETNESS_RATE_WETTING_LIQUID);
+				// drying
+				else if (m_VarWet > m_VarWetMin)						
+					AddWet(-1 * delta * GetDryingIncrement("ground") * 2);
+			}
+			else
+			{
+				// drying on ground or inside non-itembase (car, ...)
+				if (m_VarWet > m_VarWetMin)
+					AddWet(-1 * delta * GetDryingIncrement("ground"));
+			}
+		}
+	}
+	
+	void ProcessItemTemperature(float delta, bool hasParent, bool hasRootAsPlayer, ItemBase refParentIB)
+	{
+		if (!hasRootAsPlayer && GetTemperature() > GetTemperatureMin() && !IsFireplace())
+		{
+			if (refParentIB)
+			{
+				// cooling of an item inside other
+				if (GetTemperature() > refParentIB.GetTemperature())
+					AddTemperature(delta * GameConstants.TEMPERATURE_RATE_COOLING_INSIDE);
+			}
+			else
+			{
+				// cooling of an item on ground or inside non-itembase (car, ...)
+				AddTemperature(delta * GameConstants.TEMPERATURE_RATE_COOLING_INSIDE);
+			}
+		}
+	}
+	
+	// Backwards compatibility
+	void ProcessItemWetnessAndTemperature(float delta, bool hasParent, bool hasRootAsPlayer, ItemBase refParentIB)
+	{
+		ProcessItemWetness(delta, hasParent, hasRootAsPlayer, refParentIB);
+		ProcessItemTemperature(delta, hasParent, hasRootAsPlayer, refParentIB);
+	}
+	
+	void HierarchyCheck(out bool hasParent, out bool hasRootAsPlayer, out ItemBase refParentIB)
+	{
+		// hierarchy check for an item to decide whether it has some parent and it is in some player inventory
+		EntityAI parent = GetHierarchyParent();
+		if (!parent)
+		{
+			hasParent = false;
+			hasRootAsPlayer = false;
+		}
+		else
+		{
+			hasParent = true;
+			hasRootAsPlayer = (GetHierarchyRootPlayer() != null);
+			refParentIB = ItemBase.Cast(parent);
+		}
+	}
+	
+	protected void ProcessDecay(float delta, bool hasRootAsPlayer)
+	{
+		// this is stub, implemented on Edible_Base
+	}
+	
+	bool CanDecay() //Was protected, changed for access from TransferItemVariables method
+	{
+		// return true used on selected food clases so they can decay
+		return false;
+	}
+	
+	protected bool CanProcessDecay()
+	{
+		// this is stub, implemented on Edible_Base class
+		// used to determine whether it is still necessary for the food to decay
+		return false;
+	}
+	
+	protected bool CanHaveWetness()
+	{
+		// return true used on selected items that have a wetness effect
+		return false;
+	}
+	
+	protected bool CanHaveTemperature()
+	{
+		// return true used on selected items that have a temperature effect
+		return false;
+	}
+	
+	override void OnCEUpdate()
+	{
+		super.OnCEUpdate();
+
+		bool hasParent = false, hasRootAsPlayer = false;
+		ItemBase refParentIB;
+		
+		bool wwtu = g_Game.IsWorldWetTempUpdateEnabled();
+		bool foodDecay = g_Game.IsFoodDecayEnabled();
+		
+		if (wwtu || foodDecay)
+		{
+			bool processWetness = wwtu && CanHaveWetness();
+			bool processTemperature = wwtu && CanHaveTemperature();
+			bool processDecay  = foodDecay && CanDecay() && CanProcessDecay();
+			
+			if (processWetness || processTemperature || processDecay)
+			{
+				HierarchyCheck(hasParent, hasRootAsPlayer, refParentIB);
+			
+				if (processWetness)
+					ProcessItemWetness(m_ElapsedSinceLastUpdate, hasParent, hasRootAsPlayer, refParentIB);
+				
+				if (processTemperature)
+					ProcessItemTemperature(m_ElapsedSinceLastUpdate, hasParent, hasRootAsPlayer, refParentIB);
+			
+				if (processDecay)
+					ProcessDecay(m_ElapsedSinceLastUpdate, hasRootAsPlayer);	
+			}
+		}
+	}
+	
+	bool IsCargoException4x3(EntityAI item)
+	{
+		return (item.IsKindOf("Cauldron") || item.IsKindOf("Pot") || item.IsKindOf("FryingPan") || item.IsKindOf("SmallProtectorCase") || (item.IsKindOf("PortableGasStove") && item.FindAttachmentBySlotName("CookingEquipment")));
+	}
+	
+	void CopyScriptPropertiesFrom(EntityAI oldItem)
+	{
+		MiscGameplayFunctions.TransferItemProperties(oldItem, this);
+	}
+	
+	//! Adds a light source child
+	void AddLightSourceItem(ItemBase lightsource)
+	{
+		m_LightSourceItem = lightsource;
+	}
+	
+	void RemoveLightSourceItem()
+	{
+		m_LightSourceItem = null;
+	}
+	
+	ItemBase GetLightSourceItem()
+	{
+		return m_LightSourceItem;
+	}
+	
+	//! returns an array of possible finishers
+	array<int> GetValidFinishers()
+	{
+		return null;
+	}
+	
+	//! If we need a different (handheld)item action widget displayed, the logic goes in here
+	bool GetActionWidgetOverride(out typename name)
+	{
+		return false;
+	}
+	
+	bool PairWithDevice(notnull ItemBase otherDevice)
+	{
+		if (GetGame().IsServer())
+		{
+			ItemBase explosive = otherDevice;
+			RemoteDetonatorTrigger trg = RemoteDetonatorTrigger.Cast(this);
+			if (!trg)
+			{
+				trg = RemoteDetonatorTrigger.Cast(otherDevice);
+				explosive = this;
+			}
+			
+			explosive.PairRemote(trg);
+			trg.SetControlledDevice(explosive);
+			
+			int persistentID = RemotelyActivatedItemBehaviour.GeneratePersistentID();
+			trg.SetPersistentPairID(persistentID);
+			explosive.SetPersistentPairID(persistentID);
+			
+			return true;
+		}
+		return false;
+	}
+
+	#ifdef DEVELOPER
+	override void SetDebugItem()
+	{
+		super.SetDebugItem();
+		_itemBase = this;
+	}
+	#endif
+	
+	bool CanBeUsedForSuicide()
+	{
+		return true;
+	}
+}
+
+EntityAI SpawnItemOnLocation(string object_name, notnull InventoryLocation loc, bool full_quantity)
+{
+	EntityAI entity = SpawnEntity(object_name, loc, ECE_IN_INVENTORY, RF_DEFAULT);
+	if (entity)
+	{
+		bool is_item = entity.IsInherited(ItemBase);
+		if (is_item && full_quantity)
+		{
+			ItemBase item = ItemBase.Cast(entity);
+			item.SetQuantity(item.GetQuantityInit());
+		}
+	}
+	else
+	{
+		Print("Cannot spawn entity: " + object_name);
+		return NULL;
+	}
+	return entity;
+}
+
+void SetupSpawnedItem(ItemBase item, float health, float quantity)
+{
+	if (item)
+	{
+		if (health > 0)
+			item.SetHealth("", "", health);
+
+		
+		if (item.HasEnergyManager())
+		{
+			if (quantity >= 0)
+			{		
+				item.GetCompEM().SetEnergy0To1(quantity);
+			}
+			else
+			{
+				item.GetCompEM().SetEnergy(Math.AbsFloat(quantity));
+			}
+		}
+		else if (item.IsMagazine())
+		{
+			Magazine mag = Magazine.Cast(item);
+			if (quantity >= 0)
+			{		
+				mag.ServerSetAmmoCount(mag.GetAmmoMax() * quantity);
+			}
+			else
+			{		
+				mag.ServerSetAmmoCount(Math.AbsFloat(quantity));
+			}
+			
+		}
+		else
+		{
+			if (quantity >= 0)
+			{		
+				item.SetQuantityNormalized(quantity, false);
+			}
+			else
+			{
+				item.SetQuantity(Math.AbsFloat(quantity));
+			}
+			
+		}
+	}
+}
+
+#ifdef DEVELOPER
+ItemBase _itemBase;//watched item goes here(LCTRL+RMB->Watch)
+#endif
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/AmmoBoxes.c b/scripts/4_World/DayZ/Entities/ItemBase/AmmoBoxes.c
new file mode 100644
index 0000000000000000000000000000000000000000..786c1a2ba2598b8df83d373433262437e89ce71b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/AmmoBoxes.c
@@ -0,0 +1,16 @@
+class AmmoBox_556x45_20Rnd: Box_Base {};
+class AmmoBox_556x45Tracer_20Rnd: Box_Base {};
+class AmmoBox_308Win_20Rnd: Box_Base {};
+class AmmoBox_762x54_20Rnd: Box_Base {};
+class AmmoBox_762x54Tracer_20Rnd: Box_Base {};
+class AmmoBox_762x39_20Rnd: Box_Base {};
+class AmmoBox_762x39Tracer_20Rnd: Box_Base {};
+class AmmoBox_22_50Rnd: Box_Base {};
+class AmmoBox_357_20Rnd: Box_Base {};
+class AmmoBox_45ACP_25rnd: Box_Base {};
+class AmmoBox_9x19_25rnd:  Box_Base {};
+class AmmoBox_380_35rnd:  Box_Base {};
+class AmmoBox_00buck_10rnd:  Box_Base {};
+class AmmoBox_12gaSlug_10Rnd:  Box_Base {};
+class AmmoBox_545x39_20Rnd: Box_Base {};
+class AmmoBox_9x39_20Rnd: Box_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BandageDressing.c b/scripts/4_World/DayZ/Entities/ItemBase/BandageDressing.c
new file mode 100644
index 0000000000000000000000000000000000000000..03b8f85c48ee741e9f959c7e7ebdf425c359dfec
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BandageDressing.c
@@ -0,0 +1,77 @@
+class BandageDressing extends ItemBase
+{
+	//================================================================
+	// IGNITION ACTION
+	//================================================================
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( GetHierarchyParent() ) return false;
+		
+		return true;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		return false;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{
+		Fireplace.IgniteEntityAsFireplace( this, fire_source );
+	}
+
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		return Fireplace.CanIgniteEntityAsFireplace( this );
+	}	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBandageTarget);
+		AddAction(ActionBandageSelf);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+	
+	override float GetBandagingEffectivity()
+	{
+		return 2.0;
+	};
+	
+	override bool CanBeDisinfected()
+	{
+		return true;
+	}
+
+	override float GetInfectionChance(int system = 0, Param param = null)
+	{
+		if(m_Cleanness == 1)
+		{
+			return 0;
+		}
+		else
+		{
+			return 0.05;
+		}
+	}
+	
+	override void OnCombine(ItemBase other_item)
+	{
+		super.OnCombine(other_item);
+		if (m_Cleanness == 1 && other_item.m_Cleanness == 0)
+			SetCleanness(0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BarbedBaseballBat.c b/scripts/4_World/DayZ/Entities/ItemBase/BarbedBaseballBat.c
new file mode 100644
index 0000000000000000000000000000000000000000..d881263bac27dcab51645b5cb969b40a49f7c1cc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BarbedBaseballBat.c
@@ -0,0 +1,3 @@
+class BarbedBaseballBat extends Inventory_Base
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BarbedWire.c b/scripts/4_World/DayZ/Entities/ItemBase/BarbedWire.c
new file mode 100644
index 0000000000000000000000000000000000000000..69bc6e4fbb331710c1e76ed68a635fc05494d7f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BarbedWire.c
@@ -0,0 +1,456 @@
+class BarbedWire extends ItemBase
+{
+	// Sounds lists
+	const static int		SOUNDS_SPARK_COUNT							= 4;
+	const static int		SOUNDS_CUT_COUNT							= 3;
+	const static int		SOUNDS_COLLISION_COUNT						= 4;
+	const static int		SOUNDS_SHOCK_COUNT							= 4;
+	const static float		RANDOM_SPARK_INTERVAL						= 5.0; // TO DO! Currently not used.
+	
+	const static string 		m_SoundsSpark[SOUNDS_SPARK_COUNT] 			= {"electricFenceSpark1", "electricFenceSpark2", "electricFenceSpark3", "electricFenceSpark4"};
+	const static string 		m_SoundsCut[SOUNDS_CUT_COUNT] 				= {"barbedFenceCut1", "barbedFenceCut2", "barbedFenceCut3"};
+	const static string 		m_SoundsCollision[SOUNDS_COLLISION_COUNT]	= {"barbedFenceCollision1", "barbedFenceCollision2", "barbedFenceCollision3", "barbedFenceCollision4"};
+	const static string 		m_SoundsShock[SOUNDS_SHOCK_COUNT] 			= {"electricFenceShock1", "electricFenceShock2", "electricFenceShock3", "electricFenceShock4"};
+	const static string 		m_SoundBuzzLoop 							= "electricFenceBuzzLoop1";
+	ref protected EffectSound 	m_DeployLoopSound;
+	
+	SoundOnVehicle m_BuzzSoundLoop;
+	
+	ref Timer m_SparkEvent;
+	protected ref AreaDamageManager m_AreaDamage;
+	
+	protected bool m_TriggerActive;
+	protected bool m_IsPlaced;
+	
+	//mounting
+	protected bool m_IsMounted;
+	protected bool m_LastMountedState;
+	const string 				SOUND_MOUNT	= "putDown_BarbedWire_SoundSet";
+	protected EffectSound 		m_MountSound;
+	
+	
+	void BarbedWire()
+	{
+		m_SparkEvent 	= new Timer( CALL_CATEGORY_SYSTEM );
+		m_TriggerActive = false;
+		m_IsPlaced 		= false;
+		
+		//synchronized variables
+		RegisterNetSyncVariableBool( "m_IsSoundSynchRemote" );	
+		RegisterNetSyncVariableBool( "m_IsDeploySound" );
+		RegisterNetSyncVariableBool( "m_IsMounted" );
+	}
+	
+	void ~BarbedWire()
+	{
+		SEffectManager.DestroyEffect( m_DeployLoopSound );
+	}
+	
+	override void EEInit()
+	{
+		super.EEInit();
+	
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( UpdateAttachmentSlot, 100, false );
+	}
+	
+	bool IsMounted()
+	{
+		return GetSlotLockedState();
+	}
+	
+	protected bool GetSlotLockedState()
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( GetHierarchyParent() );
+		if ( base_building )
+		{
+			InventoryLocation inventory_location = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation( inventory_location );			
+			return base_building.GetInventory().GetSlotLock( inventory_location.GetSlot() );
+		}
+		
+		return false;	
+	}
+	
+	void SetMountedState( bool is_mounted )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " SetMountedState mounted=" + is_mounted);
+		
+		//lock slot
+		m_IsMounted = is_mounted;
+		LockAttachmentSlot( is_mounted );
+		SetTakeable( !is_mounted );
+		
+		//synchronize
+		Synchronize();
+	}
+	
+	protected void UpdateAttachmentSlot()
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( GetHierarchyParent() );
+		if ( base_building )
+		{
+			InventoryLocation inventory_location = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation( inventory_location );			
+			bool is_mounted = base_building.GetInventory().GetSlotLock( inventory_location.GetSlot() );
+			string slot_name = InventorySlots.GetSlotName( inventory_location.GetSlot() );
+			
+			base_building.UpdateAttachmentVisuals( slot_name, is_mounted );
+			base_building.UpdateAttachmentPhysics( slot_name, is_mounted );
+		}
+	}
+
+	protected void LockAttachmentSlot( bool lock_state )
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( GetHierarchyParent() );
+		if ( base_building )
+		{
+			InventoryLocation inventory_location = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation( inventory_location );			
+			base_building.GetInventory().SetSlotLock( inventory_location.GetSlot(), lock_state );
+			//string slot_name = InventorySlots.GetSlotName( inventory_location.GetSlot() );
+			//base_building.UpdateAttachmentVisuals( slot_name, lock_state );
+			//base_building.UpdateAttachmentPhysics( slot_name, lock_state );
+		}
+	}
+		
+	// --- SYNCHRONIZATION
+	void Synchronize()
+	{
+		if ( GetGame().IsServer() )
+		{
+			SetSynchDirty();
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if ( ( m_IsMounted && !m_LastMountedState ) || ( !m_IsMounted && m_LastMountedState ) )
+		{
+			//Play sound
+			PlaySoundSet( m_MountSound, SOUND_MOUNT, 0.1, 0.1 );
+		}
+		m_LastMountedState = m_IsMounted;
+		
+		if ( IsDeploySound() )
+		{
+			PlayDeploySound();
+		}
+		
+		if ( CanPlayDeployLoopSound() )
+		{
+			PlayDeployLoopSound();
+		}
+					
+		if ( m_DeployLoopSound && !CanPlayDeployLoopSound() )
+		{
+			StopDeployLoopSound();
+		}
+	}	
+
+	void PlayDeployLoopSound()
+	{		
+		if ( !GetGame().IsDedicatedServer() )
+		{		
+			if ( !m_DeployLoopSound || !m_DeployLoopSound.IsSoundPlaying() )
+			{
+				m_DeployLoopSound = SEffectManager.PlaySound( GetLoopDeploySoundset(), GetPosition() );
+			}
+		}
+	}
+	
+	void StopDeployLoopSound()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{	
+			m_DeployLoopSound.SetSoundFadeOut(0.5);
+			m_DeployLoopSound.SoundStop();
+		}
+	}
+	
+	// --- EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		//--- Barbed wire data ---
+		//is mounted (removed in ver. 105)
+		if ( version < 105 )
+		{
+			float is_mounted;
+			if ( !ctx.Read( is_mounted ) )
+			{
+				return false;
+			}			
+		}
+		//---
+		
+		return true;
+	}
+
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+				
+		//set mounted state based on locked slot after everything is loaded
+		SetMountedState( GetSlotLockedState() );
+	}
+
+	// ---
+	override void OnWorkStart()
+	{
+		SoundBuzzLoopStart();
+		if (m_TriggerActive)
+			{ DestroyDamageTrigger(); }
+
+		if (m_IsPlaced)
+		{
+			//TimerRandomSpark();
+			CreateElectrifiedDamageTrigger();
+		}
+	}	
+	
+	override void OnWorkStop()
+	{
+		SoundBuzzLoopStop();
+		if (m_TriggerActive)
+			{ DestroyDamageTrigger(); }
+		
+		if (m_IsPlaced)
+			{ CreateDamageTrigger(); }
+		
+		m_SparkEvent.Stop();
+	}
+
+	override void OnWork( float consumed_energy ) {}
+
+	override void OnIsPlugged(EntityAI source_device)
+	{
+		SoundCut();
+	}
+
+	override void OnIsUnplugged( EntityAI last_energy_source )
+	{
+		if (m_TriggerActive)
+			{ DestroyDamageTrigger(); }
+		SoundCut();
+	}
+	
+	override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+		HideSelection("placing");
+		ShowSelection("zbytek");
+		if (m_TriggerActive)
+			{ DestroyDamageTrigger(); }
+		GetCompEM().UnplugThis();
+		GetCompEM().UnplugAllDevices();
+	}
+	
+	// Area Damage triggers
+	// ---------------------------------------------------------			
+	protected void CreateElectrifiedDamageTrigger()
+	{
+		m_AreaDamage = new AreaDamageRegular(this);
+		m_AreaDamage.SetExtents("-1 0 -0.4", "1 0.7 0.4");
+		m_AreaDamage.SetLoopInterval(0.3);
+		m_AreaDamage.SetHitZones({"RightLeg", "LeftLeg", "RightFoot", "LeftFoot"});
+		m_AreaDamage.SetAmmoName("BarbedWireHit");
+		m_AreaDamage.Spawn();
+		m_TriggerActive = true;
+	}
+	
+	protected void CreateDamageTrigger()
+	{
+		m_AreaDamage = new AreaDamageOneTime(this);
+		m_AreaDamage.SetExtents("-1 0 -0.4", "1 0.7 0.4");
+		m_AreaDamage.SetHitZones({"RightLeg", "LeftLeg", "RightFoot", "LeftFoot"});
+		m_AreaDamage.SetAmmoName("BarbedWireHit");
+		m_AreaDamage.Spawn();
+		m_TriggerActive = true;
+	}
+	
+	protected void DestroyDamageTrigger()
+	{
+		m_AreaDamage.Destroy();
+		m_TriggerActive = false;
+	}
+	// ---------------------------------------------------------
+	
+	// Controls spawn of random sparks
+	/*
+	protected void TimerRandomSpark() // TO DO: Come up with randomized functionality.
+	{
+		if ( GetCompEM().IsSwitchedOn() )
+		{
+			int plugged_devices = GetCompEM().GetEnergySource().GetCompEM().GetPluggedDevicesCount();
+			float rnd_time = Math.RandomFloat(0.3, RANDOM_SPARK_INTERVAL / plugged_devices + 1.0);
+			m_SparkEvent.Run(rnd_time + 0.3, this, "Spark", NULL, true);
+		}
+	}
+	*/
+
+	// Spawns spark particle effect and plays sound.
+	void Spark()
+	{
+		ParticleManager.GetInstance().PlayOnObject( ParticleList.BARBED_WIRE_SPARKS, this);
+		SoundSpark();
+	}
+	
+	
+	// SOUNDS
+	// ---------------------------------------------------------
+	void SoundCut()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			int random_index = Math.RandomInt(0, SOUNDS_CUT_COUNT);
+			string sound_type = m_SoundsCut[random_index];
+			PlaySound(sound_type, 50);
+		}
+	}
+
+	// Plays sound
+	void SoundSpark()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			int random_index = Math.RandomInt(0, SOUNDS_SPARK_COUNT);
+			string sound_type = m_SoundsSpark[random_index];
+			PlaySound(sound_type, 50);
+		}
+	}
+
+	// Plays sound
+	void SoundBuzzLoopStart()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			if (!m_BuzzSoundLoop)
+			{
+				m_BuzzSoundLoop = PlaySoundLoop(m_SoundBuzzLoop, 50);
+			}
+		}
+	}
+
+	// Stops sound
+	void SoundBuzzLoopStop()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			if (m_BuzzSoundLoop)
+			{
+				GetGame().ObjectDelete(m_BuzzSoundLoop);
+				m_BuzzSoundLoop = NULL;
+			}
+		}
+	}
+	
+	// Plays an electric shock sound
+	void SoundElectricShock()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			int random_index = Math.RandomInt(0, SOUNDS_SHOCK_COUNT);
+			string sound_type = m_SoundsShock[random_index];
+			PlaySound(sound_type, 50);
+		}
+	}
+	
+	// Plays a collision sound
+	void SoundCollision()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			int random_index = Math.RandomInt(0, SOUNDS_COLLISION_COUNT);
+			string sound_type = m_SoundsCollision[random_index];
+			PlaySound(sound_type, 50);
+		}
+	}
+	// ---------------------------------------------------------
+
+	// Area Damage Pre/Post actions	
+	// ---------------------------------------------------------
+	override void PreAreaDamageActions()
+	{
+		if ( GetCompEM().IsPlugged() && GetCompEM().IsSwitchedOn() )
+		{
+			Spark();
+			SoundElectricShock();
+		}
+		SoundCollision();
+	}
+	
+	override void PostAreaDamageActions() 
+	{
+		//dmg to barbed wire here
+		MiscGameplayFunctions.DealAbsoluteDmg(this, 1000);
+	}
+	// ---------------------------------------------------------	
+	
+	
+	// TODO: proper handling can be done once the ticket DAYZ-26145 is resolved
+	override void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner)
+	{
+		super.OnItemLocationChanged(old_owner, new_owner);
+
+		if (m_TriggerActive)
+		{
+			DestroyDamageTrigger();
+			m_IsPlaced = false;
+		}
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+		
+		if ( GetGame().IsServer() )
+		{
+			ShowAllSelections();
+			HideSelection("zbytek");
+	
+			if (!GetHierarchyParent())
+			{
+				if (GetCompEM().IsPlugged() && GetCompEM().IsWorking() )
+					{ CreateElectrifiedDamageTrigger(); }
+				else
+					{ CreateDamageTrigger(); }
+				m_IsPlaced = true;
+			}
+			
+			SetIsDeploySound( true );
+		}	
+	}
+	
+	override string GetDeploySoundset()
+	{
+		return "placeBarbedWire_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		return "barbedwire_deploy_SoundSet";
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionRestrainTarget);
+		AddAction(ActionRestrainSelf);
+		AddAction(ActionAttachToConstruction);
+		
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..233625229096f512a4adfd5c12c465600763e5ee
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase.c
@@ -0,0 +1,46 @@
+class Bark_ColorBase extends ItemBase
+{
+	//================================================================
+	// IGNITION ACTION
+	//================================================================
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( GetHierarchyParent() ) return false;
+		
+		return true;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		return false;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{
+		Fireplace.IgniteEntityAsFireplace( this, fire_source );
+	}
+
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		return Fireplace.CanIgniteEntityAsFireplace( this );
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase/Bark_Birch.c b/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase/Bark_Birch.c
new file mode 100644
index 0000000000000000000000000000000000000000..fa96ab254674b4b2e0d501a5a7935867444cc612
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase/Bark_Birch.c
@@ -0,0 +1,66 @@
+class Bark_Birch extends Bark_ColorBase
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Plant", "Nails", "OakBark", "Lime", "Disinfectant", "Guts" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase/Bark_Oak.c b/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase/Bark_Oak.c
new file mode 100644
index 0000000000000000000000000000000000000000..36f99a17f69b03beb3a85d3d52b339bf9a538e9b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Bark_ColorBase/Bark_Oak.c
@@ -0,0 +1,66 @@
+class Bark_Oak extends Bark_ColorBase
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Plant", "Nails", "BirchBark", "Lime", "Disinfectant", "Guts" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Barrel_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Barrel_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3abde3b7b4b0f6eb68b6cc7e25c3503b23a26f81
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Barrel_ColorBase.c
@@ -0,0 +1,634 @@
+class Barrel_ColorBase : DeployableContainer_Base
+{
+	private bool m_IsLocked = false;
+	private ref Timer m_BarrelOpener;
+
+	protected ref RainProcurementComponentBarrel m_RainProcComponent; 
+	protected ref OpenableBehaviour m_Openable;
+	
+	void Barrel_ColorBase()
+	{
+		m_BarrelOpener = new Timer();
+
+		m_Openable = new OpenableBehaviour(false);
+		m_RainProcurement = new RainProcurementManager(this); //legacy reasons
+		m_RainProcComponent = new RainProcurementComponentBarrel(this);
+		
+		m_HalfExtents = Vector(0.30,0.85,0.30);
+
+		RegisterNetSyncVariableBool("m_Openable.m_IsOpened");
+		RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+		RegisterNetSyncVariableBool("m_IsPlaceSound");
+	}
+	
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+	
+	override void EECargoIn(EntityAI item)
+	{
+		super.EECargoIn(item);
+
+		MiscGameplayFunctions.SoakItemInsideParentContainingLiquidAboveThreshold(ItemBase.Cast(item), this);
+	}
+	
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		ctx.Write( m_Openable.IsOpened() );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		bool opened;
+		if ( version >= 110 && !ctx.Read( opened ) )
+		{
+			return false;
+		}
+		
+		if ( opened )
+		{
+			OpenLoad();
+		}
+		else
+		{
+			CloseLoad();
+		}
+		
+		return true;
+	}
+	
+	bool IsLocked()
+	{
+		return m_IsLocked;
+	}
+	
+	override void Open()
+	{
+		m_Openable.Open();
+		m_RainProcComponent.StartRainProcurement();
+		SoundSynchRemote();
+		SetTakeable(false);
+		
+		UpdateVisualState();
+	}
+	
+	void OpenLoad()
+	{
+		m_Openable.Open();
+		m_RainProcComponent.StartRainProcurement();
+		SetSynchDirty();
+		SetTakeable(false);
+		
+		UpdateVisualState();
+	}
+	
+	override void Close()
+	{
+		m_Openable.Close();
+		m_RainProcComponent.StopRainProcurement();
+		SoundSynchRemote();
+		SetTakeable(true);
+		
+		UpdateVisualState();
+	}
+	
+	void CloseLoad()
+	{
+		m_Openable.Close();
+		m_RainProcComponent.StopRainProcurement();
+		SetSynchDirty();
+		SetTakeable(true);
+		
+		UpdateVisualState();
+	}
+
+	override bool IsOpen()
+	{
+		return m_Openable.IsOpened();
+	}
+	
+	override void OnWasAttached( EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		Open();
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		Close();
+	}
+
+	protected void UpdateVisualState()
+	{
+		if ( IsOpen() )
+		{
+			SetAnimationPhase("Lid",1);
+			SetAnimationPhase("Lid2",0);
+		}
+		else
+		{
+			SetAnimationPhase("Lid",0);
+			SetAnimationPhase("Lid2",1);
+		}
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if ( IsPlaceSound() )
+		{
+			PlayPlaceSound();
+		}
+		else if ( IsSoundSynchRemote() && !IsBeingPlaced() && m_Initialized )
+		{
+			if ( IsOpen() )
+			{
+				SoundBarrelOpenPlay();
+			}
+			else if ( !IsOpen() )
+			{
+				SoundBarrelClosePlay();
+			}
+		}
+		UpdateVisualState();
+	}
+	
+	void SoundBarrelOpenPlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "barrel_open_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+	
+	void SoundBarrelClosePlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "barrel_close_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+
+	void Lock(float actiontime)
+	{
+		m_IsLocked = true;
+		m_BarrelOpener.Run(actiontime, this, "Unlock", NULL,false);
+	}
+	
+	void Unlock()
+	{
+		m_IsLocked = false;
+		Open();
+	}
+	
+	void DetermineAction ( PlayerBase player )
+	{
+		int slot_id;
+		ItemBase ingredient; 
+		slot_id = InventorySlots.GetSlotIdFromString("Lime");
+		ingredient = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+		if ( ingredient && GetQuantity() > 10000 ) 
+		{
+			TanPelts(ingredient, player);
+		}
+		else
+		{
+			slot_id = InventorySlots.GetSlotIdFromString("Material_Nails");
+			ingredient = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+			if ( ingredient && GetQuantity() > 10000 ) 
+			{
+				ColourLeatherClothes(ingredient, player, "Black");
+			}
+			else
+			{
+				slot_id = InventorySlots.GetSlotIdFromString("BirchBark");
+				ingredient = ItemBase.Cast( GetInventory().FindAttachment(slot_id) );
+				if ( ingredient && GetQuantity() > 10000 ) 
+				{
+					ColourLeatherClothes(ingredient, player, "Beige");
+				}
+				else
+				{
+					slot_id = InventorySlots.GetSlotIdFromString("OakBark");
+					ingredient = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+					if ( ingredient && GetQuantity() > 10000 ) 
+					{
+						ColourLeatherClothes(ingredient, player, "Brown");	
+					}
+					else
+					{
+						
+						slot_id = InventorySlots.GetSlotIdFromString("Disinfectant");
+						ingredient = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+						if ( ingredient && GetQuantity() > 10000 )
+						{
+							BleachClothes(ingredient, player);
+						}
+						else
+						{
+							slot_id = InventorySlots.GetSlotIdFromString("Plant");
+							ingredient = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+							slot_id = InventorySlots.GetSlotIdFromString("Guts");
+							ItemBase reactant = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+							if ( ingredient && reactant && GetQuantity() > 5000 )
+							{
+								ProduceFertilizer(ingredient,reactant,player);
+							}
+							else
+							{
+								slot_id = InventorySlots.GetSlotIdFromString("BerryR");
+								ItemBase ingredientR = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+								slot_id = InventorySlots.GetSlotIdFromString("Plant");
+								ItemBase ingredientG = ItemBase.Cast( GetInventory().FindAttachment(slot_id) );
+								slot_id = InventorySlots.GetSlotIdFromString("BerryB");
+								ItemBase ingredientB = ItemBase.Cast( GetInventory().FindAttachment(slot_id) ); 
+								if ( (ingredientR || ingredientG || ingredientB) && GetQuantity() > 10000) 
+								{
+									ColourClothes(ingredientR,ingredientG,ingredientB,player);	
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		Close();
+	}
+	
+	void ProduceFertilizer( ItemBase guts, ItemBase plant, PlayerBase player )
+	{	
+		float lime_quantity = plant.GetQuantity()*GameConstants.BAREL_LIME_PER_PLANT;
+		
+		guts.Delete();
+		plant.Delete();
+			
+		ItemBase lime = ItemBase.Cast( GetInventory().CreateInInventory("GardenLime") );
+
+		lime.SetQuantity(lime_quantity);
+		Lock(50);
+	}
+	
+	void TanPelts( ItemBase lime, PlayerBase player )
+	{
+		EntityAI item;		
+		int item_count = GetInventory().GetCargo().GetItemCount();
+		int pelt_count = 0;
+		int lime_amount = Math.Floor(lime.GetQuantity()/GameConstants.BAREL_LIME_PER_PELT);
+		
+			
+		for (int i = 0; i < item_count; i++)
+		{
+			item = GetInventory().GetCargo().GetItem(i);
+			if ( item.IsPeltBase() )
+			{
+				pelt_count = g_Game.ConfigGetInt("cfgVehicles " + item.GetType() + " peltGain");
+				if ( pelt_count <= lime_amount )
+				{
+					TanLeatherLambda lambda = new TanLeatherLambda(item, "TannedLeather", player, pelt_count);
+					lambda.SetTransferParams(true, true, true);
+					player.ServerReplaceItemWithNew(lambda);
+										
+					lime_amount -= pelt_count;
+					if ( lime_amount <= 0 )
+					{
+						lime.Delete();
+						break;
+					}
+				}
+			}
+		}	
+		if ( lime ) 
+		{
+			lime.SetQuantity(lime_amount*GameConstants.BAREL_LIME_PER_PELT);		
+		}
+		if ( pelt_count > 0 ) 
+		{
+			Lock(30);
+		}
+	}
+	
+	void ColourLeatherClothes( ItemBase color_source, PlayerBase player, string color )
+	{
+		EntityAI item;		
+		int item_count = GetInventory().GetCargo().GetItemCount();
+		string item_name = "";
+		
+		
+		for (int i = 0; i < item_count; i++)
+		{
+			item = GetInventory().GetCargo().GetItem(i);
+			if ( item.IsClothing() )
+			{	
+				if ( GetGame().ObjectIsKindOf (item, "LeatherSack_Natural") ) 
+				{
+					item_name = "Bag_LeatherSack_"+color;
+				}
+				else if ( GetGame().ObjectIsKindOf (item, "LeatherStorageVest_Natural") )
+				{
+					item_name = "Vest_LeatherStorage_"+color;
+				}
+				else if ( GetGame().ObjectIsKindOf (item, "LeatherJacket_Natural") ) 
+				{
+					item_name = "Top_LeatherJacket_"+color;
+				}
+				else if ( GetGame().ObjectIsKindOf (item, "LeatherPants_Natural") ) 
+				{
+					item_name = "Pants_LeatherPants_"+color;
+				}
+				else if ( GetGame().ObjectIsKindOf (item, "LeatherMoccasinsShoes_Natural") ) 
+				{
+					item_name = "Shoes_LeatherMoccasins_"+color;
+				}
+				else if ( GetGame().ObjectIsKindOf (item, "LeatherHat_Natural") ) 
+				{
+					item_name = "Hat_Leather_"+color;
+				}
+				if ( item_name != "" )
+				{
+					TurnItemIntoItemLambda lambda = new TurnItemIntoItemLambda(item, item_name, player);
+					lambda.SetTransferParams(true, true, true);
+					player.ServerReplaceItemWithNew(lambda);
+				}				
+			}	
+		}	
+		if ( item_name != "" ) 
+		{
+			Lock(20);	
+		}
+	}
+	
+	
+	void BleachClothes( ItemBase bleach, PlayerBase player )
+	{
+		EntityAI item;	
+		int bleach_amount = bleach.GetQuantity();
+		int item_count = GetInventory().GetCargo().GetItemCount();
+		string item_name = "";
+		
+		for (int i = 0; i < item_count; i++)
+		{
+			item = GetInventory().GetCargo().GetItem(i);
+			if ( item.IsClothing() )
+			{	
+				if ( bleach_amount >= GameConstants.BAREL_BLEACH_PER_CLOTH )
+				{
+					if ( ( GetGame().ObjectIsKindOf (item, "TShirt_ColorBase") && !GetGame().ObjectIsKindOf (item, "TShirt_White") ) || ( GetGame().ObjectIsKindOf (item, "Armband_ColorBase") && !GetGame().ObjectIsKindOf (item, "Armband_White") ) ) //cannot bleach white items...?
+					{	
+						int index = item.GetType().IndexOf("_");
+						string itemtype = item.GetType().Substring( 0, index + 1 );
+						ItemBase itemIB = ItemBase.Cast(item);
+						MiscGameplayFunctions.TurnItemIntoItem(itemIB,itemtype+"White",player);
+						
+						bleach_amount -= GameConstants.BAREL_BLEACH_PER_CLOTH;
+					}
+					if ( GetGame().IsKindOf (item.GetDisplayName(), "LeatherSack_ColorBase") ) 
+					{
+						item_name = "LeatherSack_Natural";
+					}
+					else if ( GetGame().IsKindOf (item.GetDisplayName(), "LeatherStorageVest_ColorBase") ) 
+					{
+						item_name = "LeatherStorageVest_Natural";
+					}
+					else if ( GetGame().IsKindOf (item.GetDisplayName(), "LeatherJacket_ColorBase") )
+					{
+						item_name = "LeatherJacket_Natural";
+					}
+					else if ( GetGame().IsKindOf (item.GetDisplayName(), "LeatherPants_ColorBase") ) 
+					{
+						item_name = "LeatherPants_Natural";
+					}
+					else if ( GetGame().IsKindOf (item.GetDisplayName(), "LeatherMoccasinsShoes_ColorBase") ) 
+					{
+						item_name = "LeatherMoccasinsShoes_Natural";
+					}
+					else if ( GetGame().IsKindOf (item.GetDisplayName(), "LeatherHat_ColorBase") ) 
+					{
+						item_name = "LeatherHat_Natural";
+					}
+					if ( item_name != "" )
+					{
+						TurnItemIntoItemLambda lambda = new TurnItemIntoItemLambda(item, item_name, player);
+						lambda.SetTransferParams(true, true, true);
+						player.ServerReplaceItemWithNew(lambda);
+						bleach_amount -= GameConstants.BAREL_BLEACH_PER_CLOTH;
+					}
+				}
+				else
+				{
+					bleach.Delete();
+					break;
+				}
+			}	
+		}	
+		if ( bleach )
+		{
+			bleach.SetQuantity(bleach_amount);		
+		}
+		if ( item_name != "" ) 
+		{
+			Lock(10);
+		}
+	}		
+	
+	void ColourClothes( ItemBase rci, ItemBase gci, ItemBase bci, PlayerBase player )
+	{
+		EntityAI item;		
+		float r = 0;
+		float g = 0;
+		float b = 0;
+		float a = 1; //alpha
+		int item_count = GetInventory().GetCargo().GetItemCount();
+		bool was_colored = false;
+		if ( rci ) 
+		{
+			r = rci.GetQuantity()/10; 
+			r = Math.Clamp(r, 0, 0.78); //TODO adjust clamp as needed, full RGB would result in a white item
+		}
+		if ( gci )
+		{ 
+			g = gci.GetQuantity()/10;
+			g = Math.Clamp(g, 0, 0.78);
+		}
+		if ( bci ) 
+		{
+			b = bci.GetQuantity()/10; 
+			b = Math.Clamp(b, 0, 0.78);
+		}
+		for (int i = 0; i < item_count; i++)
+		{
+			item = GetInventory().GetCargo().GetItem(i);
+			if ( item.IsClothing() )
+			{
+				if ( GetGame().ObjectIsKindOf (item, "TShirt_White") || GetGame().ObjectIsKindOf (item, "Armband_White") )
+				{
+					ItemBase itemIB = ItemBase.Cast(item);
+					int index = itemIB.GetType().IndexOf("_");
+					string itemtype = itemIB.GetType().Substring( 0, index + 1 );
+					
+					ColourClothesLambda clambda = new ColourClothesLambda(itemIB, itemtype + "Dyed", player, r, g, b, a);
+					clambda.SetTransferParams(true, true, true);
+					MiscGameplayFunctions.TurnItemIntoItemEx(player, clambda);
+					was_colored = true;
+				}
+			}	
+		}
+
+		if ( was_colored ) 
+		{
+			if ( rci ) 
+			{
+				//rci.AddQuantity(-r*10,true,false);
+				rci.Delete();
+			}
+			if ( gci ) 
+			{
+				//gci.AddQuantity(-g*10,true,false);
+				gci.Delete();
+			}
+			if ( bci ) 
+			{
+				//bci.AddQuantity(-b*10,true,false);
+				bci.Delete();
+			}
+			Lock(30);
+		}
+	}
+
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo( parent ))
+			return false;
+
+		if ( GetNumberOfItems() == 0 && !IsOpen() )
+			return true;
+
+		return false;
+	}
+	
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		if ( !super.CanPutIntoHands( parent ))
+			return false;
+
+		if ( GetNumberOfItems() == 0 && (GetInventory().IsAttachment() || !IsOpen()) )
+			return true;
+
+		return false;
+	}
+	
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if ( IsOpen() )
+			return super.CanReceiveItemIntoCargo( item );
+		
+		return false;
+	}
+	
+	override bool CanReleaseCargo( EntityAI attachment )
+	{
+		return IsOpen();
+	}
+	
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		if ( GetNumberOfItems() == 0)
+			return true;
+		return false;
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+			
+		SetIsPlaceSound( true );
+	}
+	
+	override string GetPlaceSoundset()
+	{
+		return "placeBarrel_SoundSet";
+	}
+	//================================================================
+	
+	override float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_BARREL;
+	}
+	
+	override void SetActions()
+	{
+		AddAction(ActionAttachOnSelection);
+		super.SetActions();
+		
+		AddAction(ActionOpenBarrel);
+		AddAction(ActionCloseBarrel);
+		
+	}
+	
+	override void OnDebugSpawn()
+	{
+		SetQuantityMax();
+	}
+	
+	/////////////////////////////////////
+	//OUBLIETTE OF THE DEPRECATED CODE//
+	///////////////////////////////////
+	ref RainProcurementManager m_RainProcurement; //DEPRECATED
+};
+
+class Barrel_Green: Barrel_ColorBase {};
+class Barrel_Blue: Barrel_ColorBase {};
+class Barrel_Red: Barrel_ColorBase {};
+class Barrel_Yellow: Barrel_ColorBase {};
+
+class ColourClothesLambda : TurnItemIntoItemLambda
+{
+	int r, g, b, a;
+	void ColourClothesLambda(EntityAI old_item, string new_item_type, PlayerBase player, int rr, int gg, int bb, int aa)
+	{ r = rr; g = gg; b = bb; a = aa; }
+
+	override void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+
+		//Print("ColourClothesLambda::OnCreated object=" + new_item);
+		ItemBase ib = ItemBase.Cast(new_item);
+		if ( new_item ) 
+		{	
+			new_item.SetObjectTexture(new_item.GetHiddenSelectionsData().GetHiddenSelectionIndex( "personality" ), MiscGameplayFunctions.GetColorString(r, g, b, a));
+			
+			//nitem.SetItemVariableString("varColor", color); //SYNCFAIL
+			ib.SetColor(r*255, g*255, b*255, a*255);
+		}
+	}
+};
+
+class TanLeatherLambda : TurnItemIntoItemLambda
+{
+	int m_PeltCount;
+
+	void TanLeatherLambda (EntityAI old_item, string new_item_type, PlayerBase player, int pelt_count) { m_PeltCount = pelt_count; }
+
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+
+		if (new_item) 
+		{							
+			ItemBase tanned_pelt = ItemBase.Cast( new_item );
+			tanned_pelt.SetQuantity(m_PeltCount);
+		}
+		else
+		{
+			Debug.LogError("TanLeatherLambda: failed to create new item","static");
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase.c b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b9032181d42e01351315612b4c3ebf144dc6a4d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase.c
@@ -0,0 +1,1239 @@
+//BASE BUILDING BASE
+class BaseBuildingBase extends ItemBase
+{
+	const string 		ANIMATION_DEPLOYED			= "Deployed";
+	
+	float 				m_ConstructionKitHealth;			//stored health value for used construction kit
+
+	ref Construction 	m_Construction;
+	
+	bool 				m_HasBase;
+	//variables for synchronization of base building parts (2x31 is the current limit)
+	int 				m_SyncParts01;								//synchronization for already built parts (31 parts)
+	int 				m_SyncParts02;								//synchronization for already built parts (+31 parts)
+	int 				m_SyncParts03;								//synchronization for already built parts (+31 parts)
+	int 				m_InteractedPartId;							//construction part id that an action was performed on
+	int					m_PerformedActionId;						//action id that was performed on a construction part
+	
+	//Sounds
+	//build
+	const string SOUND_BUILD_WOOD_LOG 			= "putDown_WoodLog_SoundSet";
+	const string SOUND_BUILD_WOOD_PLANK			= "putDown_WoodPlank_SoundSet";
+	const string SOUND_BUILD_WOOD_STAIRS		= "putDown_WoodStairs_SoundSet";
+	const string SOUND_BUILD_METAL				= "putDown_MetalPlank_SoundSet";
+	const string SOUND_BUILD_WIRE				= "putDown_BarbedWire_SoundSet";
+	//dismantle
+	const string SOUND_DISMANTLE_WOOD_LOG 		= "Crash_WoodPlank_SoundSet";
+	const string SOUND_DISMANTLE_WOOD_PLANK		= "Crash_WoodPlank_SoundSet";
+	const string SOUND_DISMANTLE_WOOD_STAIRS	= "Crash_WoodPlank_SoundSet";
+	const string SOUND_DISMANTLE_METAL			= "Crash_MetalPlank_SoundSet";
+	const string SOUND_DISMANTLE_WIRE			= "putDown_BarbedWire_SoundSet";
+	
+	protected EffectSound m_Sound;
+	
+	ref map<string, ref AreaDamageManager> m_DamageTriggers;
+	ref array<string> m_HybridAttachments;
+	ref array<string> m_Mountables;
+	
+	// Constructor
+	void BaseBuildingBase() 
+	{
+		m_DamageTriggers = new ref map<string, ref AreaDamageManager>;
+		
+		//synchronized variables
+		RegisterNetSyncVariableInt( "m_SyncParts01" );
+		RegisterNetSyncVariableInt( "m_SyncParts02" );
+		RegisterNetSyncVariableInt( "m_SyncParts03" );
+		RegisterNetSyncVariableInt( "m_InteractedPartId" );
+		RegisterNetSyncVariableInt( "m_PerformedActionId" );
+		RegisterNetSyncVariableBool( "m_HasBase" );
+		
+		//Construction init
+		ConstructionInit();
+		
+		if (ConfigIsExisting("hybridAttachments"))
+		{
+			m_HybridAttachments = new array<string>;
+			ConfigGetTextArray("hybridAttachments", m_HybridAttachments);
+		}
+		if (ConfigIsExisting("mountables"))
+		{
+			m_Mountables = new array<string>;
+			ConfigGetTextArray("mountables", m_Mountables);
+		}
+		
+		ProcessInvulnerabilityCheck(GetInvulnerabilityTypeString());
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+
+		foreach (AreaDamageManager areaDamage : m_DamageTriggers)
+		{
+			areaDamage.Destroy();
+		}
+		
+	}
+	
+	override string GetInvulnerabilityTypeString()
+	{
+		return "disableBaseDamage";
+	}
+	
+	override bool CanObstruct()
+	{
+		return true;
+	}
+	
+	override int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.HIDE_VICINITY;
+	}
+
+	// --- SYNCHRONIZATION
+	void SynchronizeBaseState()
+	{
+		if ( GetGame().IsServer() )
+		{
+			SetSynchDirty();
+		}
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " OnVariablesSynchronized");
+		super.OnVariablesSynchronized();
+
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( OnSynchronizedClient, 100, false );
+	}
+	
+	protected void OnSynchronizedClient()
+	{
+		//update parts
+		SetPartsFromSyncData();
+		
+		//update action on part
+		SetActionFromSyncData();
+		
+		//update visuals (client)
+		UpdateVisuals();
+	}
+	
+	//parts synchronization
+	void RegisterPartForSync( int part_id )
+	{
+		//part_id must starts from index = 1
+		int offset;
+		int mask;
+		
+		if ( part_id >= 1 && part_id <= 31 )		//<1,31> (31 parts)
+		{
+			offset = part_id - 1;
+			mask = 1 << offset;
+			
+			m_SyncParts01 = m_SyncParts01 | mask;				
+		}
+		else if ( part_id >= 32 && part_id <= 62  )	//<32,62> (31 parts)
+		{
+			offset = ( part_id % 32 );
+			mask = 1 << offset;
+			
+			m_SyncParts02 = m_SyncParts02 | mask;				
+		}
+		else if ( part_id >= 63 && part_id <= 93  )	//<63,93> (31 parts)
+		{
+			offset = ( part_id % 63 );
+			mask = 1 << offset;
+			
+			m_SyncParts03 = m_SyncParts03 | mask;				
+		}
+	}
+	
+	void UnregisterPartForSync( int part_id )
+	{
+		//part_id must starts from index = 1
+		int offset;
+		int mask;
+		
+		if ( part_id >= 1 && part_id <= 31 )		//<1,31> (31 parts)
+		{
+			offset = part_id - 1;
+			mask = 1 << offset;
+			
+			m_SyncParts01 = m_SyncParts01 & ~mask;			
+		}
+		else if ( part_id >= 32 && part_id <= 62  )	//<32,62> (31 parts)
+		{
+			offset = ( part_id % 32 );
+			mask = 1 << offset;
+			
+			m_SyncParts02 = m_SyncParts02 & ~mask;			
+		}
+		else if ( part_id >= 63 && part_id <= 93  )	//<63,93> (31 parts)
+		{
+			offset = ( part_id % 63 );
+			mask = 1 << offset;
+			
+			m_SyncParts03 = m_SyncParts03 & ~mask;			
+		}
+	}	
+	
+	bool IsPartBuildInSyncData( int part_id )
+	{
+		//part_id must starts from index = 1
+		int offset;
+		int mask;
+		
+		if ( part_id >= 1 && part_id <= 31 )		//<1,31> (31 parts)
+		{
+			offset = part_id - 1;
+			mask = 1 << offset;
+			
+			if ( ( m_SyncParts01 & mask ) > 0 )
+			{
+				return true;
+			}
+		}
+		else if ( part_id >= 32 && part_id <= 62  )	//<32,62> (31 parts)
+		{
+			offset = ( part_id % 32 );
+			mask = 1 << offset;
+			
+			if ( ( m_SyncParts02 & mask ) > 0 )
+			{
+				return true;
+			}
+		}
+		else if ( part_id >= 63 && part_id <= 93  )	//<63,93> (31 parts)
+		{
+			offset = ( part_id % 63 );
+			mask = 1 << offset;
+			
+			if ( ( m_SyncParts03 & mask ) > 0 )
+			{
+				return true;
+			}
+		}				
+	
+		return false;
+	}
+
+	protected void RegisterActionForSync( int part_id, int action_id )
+	{
+		m_InteractedPartId 	= part_id;
+		m_PerformedActionId = action_id;
+	}
+	
+	protected void ResetActionSyncData()
+	{
+		//reset data
+		m_InteractedPartId 	= -1;
+		m_PerformedActionId = -1;
+	}
+	
+	protected void SetActionFromSyncData()
+	{
+		if ( m_InteractedPartId > -1 && m_PerformedActionId > -1 )
+		{
+			ConstructionPart constrution_part = GetConstructionPartById( m_InteractedPartId );
+			int build_action_id = m_PerformedActionId;
+			
+			switch( build_action_id )
+			{
+				case AT_BUILD_PART		: OnPartBuiltClient( constrution_part.GetPartName(), build_action_id ); break;
+				case AT_DISMANTLE_PART	: OnPartDismantledClient( constrution_part.GetPartName(), build_action_id ); break;
+				case AT_DESTROY_PART	: OnPartDestroyedClient( constrution_part.GetPartName(), build_action_id ); break;
+			}
+		}
+	}
+	//------
+	
+	void SetPartFromSyncData( ConstructionPart part )
+	{
+		string key = part.m_PartName;
+		bool is_base = part.IsBase();
+		bool is_part_built_sync = IsPartBuildInSyncData( part.GetId() );
+		bsbDebugSpam("[bsb] " + GetDebugName(this) + " SetPartFromSyncData try to sync: built=" + is_part_built_sync + " key=" + key + " part=" + part.GetPartName() + " part_built=" + part.IsBuilt());
+		if ( is_part_built_sync )
+		{
+			if ( !part.IsBuilt() )
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " SetPartsFromSyncData +++ " + key);
+				GetConstruction().AddToConstructedParts( key );
+				GetConstruction().ShowConstructionPartPhysics(part.GetPartName());
+				
+				if (is_base)
+				{
+					if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + ANIMATION_DEPLOYED + " RM");
+					RemoveProxyPhysics( ANIMATION_DEPLOYED );
+				}
+			}
+		}
+		else
+		{
+			if ( part.IsBuilt() )
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " SetPartsFromSyncData --- " + key);
+				GetConstruction().RemoveFromConstructedParts( key );
+				GetConstruction().HideConstructionPartPhysics(part.GetPartName());
+			
+				if (is_base)
+				{
+					if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + ANIMATION_DEPLOYED + " ADD");
+					AddProxyPhysics( ANIMATION_DEPLOYED );
+				}
+			}
+		}
+
+		//check slot lock for material attachments	
+		GetConstruction().SetLockOnAttachedMaterials( part.GetPartName(), part.IsBuilt() );		//failsafe for corrupted sync/storage data			
+	}
+	
+	//set construction parts based on synchronized data
+	void SetPartsFromSyncData()
+	{
+		Construction construction = GetConstruction();
+		map<string, ref ConstructionPart> construction_parts = construction.GetConstructionParts();
+		
+		for ( int i = 0; i < construction_parts.Count(); ++i )
+		{
+			string key = construction_parts.GetKey( i );
+			ConstructionPart value = construction_parts.Get( key );
+			SetPartFromSyncData(value);
+		}
+		
+		//regenerate navmesh
+		UpdateNavmesh();		
+	}
+	
+	protected ConstructionPart GetConstructionPartById( int id )
+	{
+		Construction construction = GetConstruction();
+		map<string, ref ConstructionPart> construction_parts = construction.GetConstructionParts();
+		
+		for ( int i = 0; i < construction_parts.Count(); ++i )
+		{
+			string key = construction_parts.GetKey( i );
+			ConstructionPart value = construction_parts.Get( key );
+		
+			if ( value.GetId() == id )
+			{
+				return value;
+			}
+		}
+		
+		return NULL;
+	}
+	//
+	
+	//Base
+	bool HasBase()
+	{
+		return m_HasBase;
+	}
+	
+	void SetBaseState( bool has_base )
+	{
+		m_HasBase = has_base;
+	}
+	
+	override bool IsDeployable()
+	{
+		return true;
+	}
+	
+	bool IsOpened()
+	{
+		return false;
+	}
+	
+	//--- CONSTRUCTION KIT
+	ItemBase CreateConstructionKit()
+	{
+		ItemBase construction_kit = ItemBase.Cast( GetGame().CreateObjectEx( GetConstructionKitType(), GetKitSpawnPosition(), ECE_PLACE_ON_SURFACE ) );
+		if ( m_ConstructionKitHealth > 0 )
+		{
+			construction_kit.SetHealth( m_ConstructionKitHealth );
+		}
+		
+		return construction_kit;
+	}
+	
+	void CreateConstructionKitInHands(notnull PlayerBase player)
+	{
+		ItemBase construction_kit = ItemBase.Cast(player.GetHumanInventory().CreateInHands(GetConstructionKitType()));
+		if ( m_ConstructionKitHealth > 0 )
+		{
+			construction_kit.SetHealth( m_ConstructionKitHealth );
+		}
+	}
+	
+	protected vector GetKitSpawnPosition()
+	{
+		return GetPosition();
+	}
+	
+	protected string GetConstructionKitType()
+	{
+		return "";
+	}
+	
+	void DestroyConstructionKit( ItemBase construction_kit )
+	{
+		m_ConstructionKitHealth = construction_kit.GetHealth();
+		GetGame().ObjectDelete( construction_kit );
+	}
+	
+	//--- CONSTRUCTION
+	void DestroyConstruction()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " DestroyConstruction");
+		GetGame().ObjectDelete( this );
+	}	
+	
+	// --- EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		//sync parts 01
+		ctx.Write( m_SyncParts01 );
+		ctx.Write( m_SyncParts02 );
+		ctx.Write( m_SyncParts03 );
+		
+		ctx.Write( m_HasBase );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		//--- Base building data ---
+		//Restore synced parts data
+		if ( !ctx.Read( m_SyncParts01 ) )
+		{
+			m_SyncParts01 = 0;		//set default
+			return false;
+		}
+		if ( !ctx.Read( m_SyncParts02 ) )
+		{
+			m_SyncParts02 = 0;		//set default
+			return false;
+		}
+		if ( !ctx.Read( m_SyncParts03 ) )
+		{
+			m_SyncParts03 = 0;		//set default
+			return false;
+		}
+		
+		//has base
+		if ( !ctx.Read( m_HasBase ) )
+		{
+			m_HasBase = false;
+			return false;
+		}
+		//---
+
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();		
+		
+		if (!m_FixDamageSystemInit)
+		{
+			SetPartsAfterStoreLoad();
+		}
+	}
+	
+	void SetPartsAfterStoreLoad()
+	{
+		//update server data
+		SetPartsFromSyncData();
+		
+		//set base state
+		ConstructionPart construction_part = GetConstruction().GetBaseConstructionPart();
+		SetBaseState( construction_part.IsBuilt() ) ;
+			
+		//synchronize after load
+		SynchronizeBaseState();
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		if (m_FixDamageSystemInit)
+			return;
+		
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if (GetGame().IsMultiplayer() && !GetGame().IsServer())
+			return;
+		
+		Construction construction = GetConstruction();
+		string part_name = zone;
+		part_name.ToLower();
+		
+		if ( newLevel == GameConstants.STATE_RUINED )
+		{
+			ConstructionPart construction_part = construction.GetConstructionPart( part_name );
+			
+			if ( construction_part && construction.IsPartConstructed( part_name ) )
+			{
+				construction.DestroyPartServer( null, part_name, AT_DESTROY_PART );
+				construction.DestroyConnectedParts(part_name);
+			}
+			
+			//barbed wire handling (hack-ish)
+			if ( part_name.Contains("barbed") )
+			{
+				BarbedWire barbed_wire = BarbedWire.Cast( FindAttachmentBySlotName( zone ) );
+				if (barbed_wire)
+					barbed_wire.SetMountedState( false );
+			}
+		}
+	}
+	
+	override void EEOnAfterLoad()
+	{
+		if (m_FixDamageSystemInit)
+		{
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( SetPartsAfterStoreLoad, 500, false, this );
+		}
+		
+		super.EEOnAfterLoad();
+	}
+	
+	override void EEInit()
+	{
+		super.EEInit();
+		
+		// init visuals and physics
+		InitBaseState();
+		
+		//debug
+		#ifdef DEVELOPER
+		DebugCustomState();
+		#endif
+	}
+
+	override void EEItemAttached( EntityAI item, string slot_name )
+	{
+		super.EEItemAttached( item, slot_name );
+		
+		CheckForHybridAttachments( item, slot_name );
+		UpdateVisuals();
+		UpdateAttachmentPhysics( slot_name, false );
+	}
+	
+	override void EEItemDetached( EntityAI item, string slot_name )
+	{
+		super.EEItemDetached( item, slot_name );
+
+		UpdateVisuals();
+		UpdateAttachmentPhysics( slot_name, false );
+	}
+	
+	protected void OnSetSlotLock( int slotId, bool locked, bool was_locked )
+	{
+		string slot_name = InventorySlots.GetSlotName( slotId );
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint( "inv: OnSetSlotLock " + GetDebugName( this ) + " slot=" + slot_name + " locked=" + locked + " was_locked=" + was_locked );
+
+		UpdateAttachmentVisuals( slot_name, locked );
+		UpdateAttachmentPhysics( slot_name, locked );
+	}
+	
+	//ignore out of reach condition
+	override bool IgnoreOutOfReachCondition()
+	{
+		return true;
+	}
+	
+	//CONSTRUCTION EVENTS
+	//Build
+	void OnPartBuiltServer(notnull Man player, string part_name, int action_id)
+	{
+		ConstructionPart construtionPart = GetConstruction().GetConstructionPart(part_name);
+		
+		//check base state
+		if (construtionPart.IsBase())
+		{
+			SetBaseState(true);
+
+			//spawn kit
+			CreateConstructionKit();
+		}
+			
+		//register constructed parts for synchronization
+		RegisterPartForSync(construtionPart.GetId());
+		
+		//register action that was performed on part
+		RegisterActionForSync(construtionPart.GetId(), action_id);
+		
+		//synchronize
+		SynchronizeBaseState();
+
+		SetPartFromSyncData(construtionPart); // server part of sync, client will be synced from SetPartsFromSyncData
+		
+		UpdateNavmesh();
+		
+		//update visuals
+		UpdateVisuals();
+		
+		//reset action sync data
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(ResetActionSyncData, 100, false, this);
+	}
+	
+	void OnPartBuiltClient(string part_name, int action_id)
+	{
+		//play sound
+		SoundBuildStart( part_name );
+	}	
+	
+	//Dismantle
+	void OnPartDismantledServer(notnull Man player, string part_name, int action_id)
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " OnPartDismantledServer " + part_name);
+		ConstructionPart construtionPart = GetConstruction().GetConstructionPart(part_name);
+					
+		//register constructed parts for synchronization
+		UnregisterPartForSync(construtionPart.GetId());
+		
+		//register action that was performed on part
+		RegisterActionForSync(construtionPart.GetId(), action_id);
+		
+		//synchronize
+		SynchronizeBaseState();
+
+		// server part of sync, client will be synced from SetPartsFromSyncData
+		SetPartFromSyncData(construtionPart);
+		
+		UpdateNavmesh();
+		
+		//update visuals
+		UpdateVisuals();
+		
+		//reset action sync data
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(ResetActionSyncData, 100, false, this);
+		
+		//check base state
+		if (construtionPart.IsBase())
+		{
+			//Destroy construction
+			GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(DestroyConstruction, 200, false, this);
+		}		
+	}
+	
+	void OnPartDismantledClient( string part_name, int action_id )
+	{
+		//play sound
+		SoundDismantleStart( part_name );
+	}	
+	
+	//Destroy
+	void OnPartDestroyedServer(Man player, string part_name, int action_id, bool destroyed_by_connected_part = false)
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " OnPartDestroyedServer " + part_name);
+		ConstructionPart construtionPart = GetConstruction().GetConstructionPart(part_name);
+					
+		//register constructed parts for synchronization
+		UnregisterPartForSync(construtionPart.GetId());
+		
+		//register action that was performed on part
+		RegisterActionForSync(construtionPart.GetId(), action_id);
+		
+		//synchronize
+		SynchronizeBaseState();
+		
+		// server part of sync, client will be synced from SetPartsFromSyncData
+		SetPartFromSyncData(construtionPart);
+		
+		UpdateNavmesh();
+		
+		//update visuals
+		UpdateVisuals();
+		
+		//reset action sync data
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(ResetActionSyncData, 100, false, this);
+		
+		//check base state
+		if (construtionPart.IsBase())
+		{
+			//Destroy construction
+			GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(DestroyConstruction, 200, false, this);
+		}			
+	}
+	
+	void OnPartDestroyedClient( string part_name, int action_id )
+	{
+		//play sound
+		SoundDestroyStart( part_name );
+	}	
+	
+	// --- UPDATE
+	void InitBaseState()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " BaseBuildingBase::InitBaseState ");
+
+		InitVisuals();
+		UpdateNavmesh(); //regenerate navmesh
+		GetConstruction().InitBaseState();
+	}	
+	
+	void InitVisuals()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " InitVisuals");
+		//check base
+		if ( !HasBase() )
+		{
+			SetAnimationPhase( ANIMATION_DEPLOYED, 0 );
+		}
+		else
+		{
+			SetAnimationPhase( ANIMATION_DEPLOYED, 1 );
+		}
+		
+		GetConstruction().UpdateVisuals();
+	}
+
+	void UpdateVisuals()
+	{
+		array<string> attachmentSlots = new array<string>;
+
+		GetAttachmentSlots(this, attachmentSlots);
+		foreach (string slotName : attachmentSlots)
+		{
+			UpdateAttachmentVisuals(slotName, IsAttachmentSlotLocked(slotName));
+		}
+		
+		//check base
+		if (!HasBase())
+			SetAnimationPhase(ANIMATION_DEPLOYED, 0);
+		else
+			SetAnimationPhase(ANIMATION_DEPLOYED, 1);
+		
+		GetConstruction().UpdateVisuals();
+	}
+	
+	void UpdateAttachmentVisuals(string slot_name, bool is_locked)
+	{
+		string slotNameMounted = slot_name + "_Mounted";
+		EntityAI attachment = FindAttachmentBySlotName(slot_name);
+		
+		if (attachment)
+		{
+			BarbedWire barbedWire = BarbedWire.Cast(attachment);
+			if (barbedWire && barbedWire.IsMounted())
+				CreateAreaDamage(slotNameMounted);
+			else
+				DestroyAreaDamage(slotNameMounted);
+			
+			if (is_locked)
+			{
+				SetAnimationPhase(slotNameMounted, 0);
+				SetAnimationPhase(slot_name, 1);
+			}
+			else
+			{
+				SetAnimationPhase(slotNameMounted, 1);
+				SetAnimationPhase(slot_name, 0);
+			}
+		}
+		else
+		{
+			SetAnimationPhase(slotNameMounted, 1);
+			SetAnimationPhase(slot_name, 1);
+			
+			DestroyAreaDamage(slotNameMounted);
+		}
+	}
+	
+	// avoid calling this function on frequent occasions, it's a massive performance hit
+	void UpdatePhysics()
+	{
+		if (LogManager.IsBaseBuildingLogEnable())
+			bsbDebugPrint("[bsb] " + GetDebugName(this) + " BaseBuildingBase::UpdatePhysics");
+		
+		array<string> attachmentSlots = new array<string>;
+		GetAttachmentSlots(this, attachmentSlots);
+
+		if (LogManager.IsBaseBuildingLogEnable())
+			bsbDebugPrint("[bsb] " + GetDebugName(this) + " att_cnt=" + attachmentSlots.Count());
+
+		foreach (string slotName : attachmentSlots)
+		{
+			UpdateAttachmentPhysics(slotName, IsAttachmentSlotLocked(slotName));
+		}
+		
+		//check base
+		if (!HasBase())
+		{
+			if (LogManager.IsBaseBuildingLogEnable())
+				bsbDebugPrint("[bsb] " + GetDebugName(this) + ANIMATION_DEPLOYED + "  ADD");
+
+			AddProxyPhysics(ANIMATION_DEPLOYED);
+		}
+		else
+		{
+			if (LogManager.IsBaseBuildingLogEnable())
+				bsbDebugPrint("[bsb] " + GetDebugName(this) + ANIMATION_DEPLOYED + " RM");
+
+			RemoveProxyPhysics(ANIMATION_DEPLOYED);
+		}
+		
+		GetConstruction().UpdatePhysics();
+		UpdateNavmesh();
+	}
+	
+	void UpdateAttachmentPhysics( string slot_name, bool is_locked )
+	{
+		//checks for invalid appends; hotfix
+		if ( !m_Mountables || m_Mountables.Find(slot_name) == -1 )
+			return;
+		//----------------------------------
+		string slot_name_mounted = slot_name + "_Mounted";
+		EntityAI attachment = FindAttachmentBySlotName( slot_name );
+		
+		//remove proxy physics
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " Removing ATT SLOT=" + slot_name + " RM / RM");
+		RemoveProxyPhysics( slot_name_mounted );
+		RemoveProxyPhysics( slot_name );
+		
+		if ( attachment )
+		{
+			if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " Adding ATT=" + Object.GetDebugName(attachment));
+			if ( is_locked )
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " RM / RM");
+				AddProxyPhysics( slot_name_mounted );
+			}
+			else
+			{
+				if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] " + GetDebugName(this) + " ADD");
+				AddProxyPhysics( slot_name );
+			}
+		}
+	}
+	
+	protected void UpdateNavmesh()
+	{
+		SetAffectPathgraph( true, false );
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( GetGame().UpdatePathgraphRegionByObject, 100, false, this );
+	}
+	
+	override bool CanUseConstruction()
+	{
+		return true;
+	}
+	
+	override bool CanUseConstructionBuild()
+	{
+		return true;
+	}
+
+	protected bool IsAttachmentSlotLocked( EntityAI attachment )
+	{
+		if ( attachment )
+		{
+			InventoryLocation inventory_location = new InventoryLocation;
+			attachment.GetInventory().GetCurrentInventoryLocation( inventory_location );
+			
+			return GetInventory().GetSlotLock( inventory_location.GetSlot() );
+		}
+			
+		return false;
+	}
+	
+	protected bool IsAttachmentSlotLocked( string slot_name )
+	{
+		return GetInventory().GetSlotLock( InventorySlots.GetSlotIdFromString( slot_name ) );
+	}	
+	
+	//--- ATTACHMENT SLOTS
+	void GetAttachmentSlots( EntityAI entity, out array<string> attachment_slots )
+	{
+		string config_path = "CfgVehicles" + " " + entity.GetType() + " " + "attachments";
+		if ( GetGame().ConfigIsExisting( config_path ) )
+		{
+			GetGame().ConfigGetTextArray( config_path, attachment_slots );
+		}
+	}
+
+	bool CheckSlotVerticalDistance( int slot_id, PlayerBase player )
+	{
+		return true;
+	}
+		
+	protected bool CheckMemoryPointVerticalDistance( float max_dist, string selection, PlayerBase player )	
+	{
+		return true;
+	}
+	
+	protected bool CheckLevelVerticalDistance( float max_dist, string selection, PlayerBase player )	
+	{
+		return true;
+	}
+	
+	// --- INIT
+	void ConstructionInit()
+	{
+		if ( !m_Construction )
+		{
+			m_Construction = new Construction( this );
+		}
+		
+		GetConstruction().Init();
+	}
+	
+	Construction GetConstruction()
+	{
+		return m_Construction;
+	}
+	
+	//--- INVENTORY/ATTACHMENTS CONDITIONS
+	//attachments
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId )
+	{
+		return super.CanReceiveAttachment(attachment, slotId);
+	}
+	
+	bool HasAttachmentsBesidesBase()
+	{
+		int attachment_count = GetInventory().AttachmentCount();
+		if ( attachment_count > 0 )
+		{
+			if ( HasBase() && attachment_count == 1 )
+			{
+				return false;
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool ShowZonesHealth()
+	{
+		return true;
+	}
+	
+	//this into/outo parent.Cargo
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanRemoveFromCargo( EntityAI parent )
+	{
+		return false;
+	}
+
+	//hands
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	//--- ACTION CONDITIONS
+	//direction
+	override bool IsFacingPlayer( PlayerBase player, string selection )
+	{
+		return true;
+	}
+	
+	override bool IsPlayerInside( PlayerBase player, string selection )
+	{
+		return true;
+	}
+	
+	//! Some buildings can only be built from outside
+	bool MustBeBuiltFromOutside()
+	{
+		return false;
+	}
+	
+	//camera direction check
+	bool IsFacingCamera( string selection )
+	{
+		return true;
+	}
+	
+	//roof check
+	bool PerformRoofCheckForBase( string partName, PlayerBase player, out bool result )
+	{
+		return false;
+	}
+	
+	//selection->player distance check
+	bool HasProperDistance( string selection, PlayerBase player )
+	{
+		return true;
+	}
+		
+	//folding
+	bool CanFoldBaseBuildingObject()
+	{
+		if ( HasBase() || GetInventory().AttachmentCount() > 0 )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	ItemBase FoldBaseBuildingObject()
+	{
+		ItemBase item = CreateConstructionKit();
+		DestroyConstruction();
+
+		return item;
+	}
+	
+	//Damage triggers (barbed wire)
+	void CreateAreaDamage( string slot_name, float rotation_angle = 0 )
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			//destroy area damage if some already exists
+			DestroyAreaDamage( slot_name );
+			
+			//create new area damage
+			AreaDamageLoopedDeferred_NoVehicle areaDamage = new AreaDamageLoopedDeferred_NoVehicle( this );
+			areaDamage.SetDamageComponentType(AreaDamageComponentTypes.HITZONE);
+			
+			vector min_max[2];
+			if ( MemoryPointExists( slot_name + "_min" ) )
+			{
+				min_max[0] = GetMemoryPointPos( slot_name + "_min" );
+			}
+			if ( MemoryPointExists( slot_name + "_max" ) )
+			{
+				min_max[1] = GetMemoryPointPos( slot_name + "_max" );
+			}
+			
+			//get proper trigger extents (min<max)
+			vector extents[2];
+			GetConstruction().GetTriggerExtents( min_max, extents );
+			
+			//get box center
+			vector center;
+			center = GetConstruction().GetBoxCenter( min_max );
+			center = ModelToWorld( center );
+			
+			//rotate center if needed
+			vector orientation = GetOrientation();;
+			CalcDamageAreaRotation( rotation_angle, center, orientation );
+			
+			areaDamage.SetExtents( extents[0], extents[1] );
+			areaDamage.SetAreaPosition( center );
+			areaDamage.SetAreaOrientation( orientation );
+			areaDamage.SetLoopInterval( 1.0 );
+			areaDamage.SetDeferDuration( 0.2 );
+			areaDamage.SetHitZones( { "Torso","LeftHand","LeftLeg","LeftFoot","RightHand","RightLeg","RightFoot" } );
+			areaDamage.SetAmmoName( "BarbedWireHit" );
+			areaDamage.Spawn();
+			
+			m_DamageTriggers.Insert( slot_name, areaDamage );
+		}
+	}
+		
+	void CalcDamageAreaRotation( float angle_deg, out vector center, out vector orientation )
+	{
+		if ( angle_deg != 0 )
+		{
+			//orientation
+			orientation[0] = orientation[0] - angle_deg;
+			
+			//center
+			vector rotate_axis;
+			if ( MemoryPointExists( "rotate_axis" ) )
+			{
+				rotate_axis = ModelToWorld( GetMemoryPointPos( "rotate_axis" ) );
+			}			
+			float r_center_x = ( Math.Cos( angle_deg * Math.DEG2RAD ) * ( center[0] - rotate_axis[0] ) ) - ( Math.Sin( angle_deg * Math.DEG2RAD ) * ( center[2] - rotate_axis[2] ) ) + rotate_axis[0];
+			float r_center_z = ( Math.Sin( angle_deg * Math.DEG2RAD ) * ( center[0] - rotate_axis[0] ) ) + ( Math.Cos( angle_deg * Math.DEG2RAD ) * ( center[2] - rotate_axis[2] ) ) + rotate_axis[2];
+			center[0] = r_center_x;
+			center[2] = r_center_z;
+		}
+	}
+		
+	void DestroyAreaDamage( string slot_name )
+	{
+		if (GetGame() && GetGame().IsServer())
+		{
+			AreaDamageLoopedDeferred_NoVehicle areaDamage;
+			if (m_DamageTriggers.Find(slot_name, areaDamage))
+			{
+				if (areaDamage)
+				{
+					areaDamage.Destroy();
+				}
+				
+				m_DamageTriggers.Remove( slot_name );
+			}
+		}
+	}
+	
+	override bool IsIgnoredByConstruction()
+	{
+		return true;
+	}
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	protected void SoundBuildStart( string part_name )
+	{
+		PlaySoundSet( m_Sound, GetBuildSoundByMaterial( part_name ), 0.1, 0.1 );
+	}
+
+	protected void SoundDismantleStart( string part_name )
+	{
+		PlaySoundSet( m_Sound, GetDismantleSoundByMaterial( part_name ), 0.1, 0.1 );
+	}
+	
+	protected void SoundDestroyStart( string part_name )
+	{
+		PlaySoundSet( m_Sound, GetDismantleSoundByMaterial( part_name ), 0.1, 0.1 );
+	}
+	
+	protected string GetBuildSoundByMaterial( string part_name )
+	{
+		ConstructionMaterialType material_type = GetConstruction().GetMaterialType( part_name );
+		
+		switch ( material_type )
+		{
+			case ConstructionMaterialType.MATERIAL_LOG: 	return SOUND_BUILD_WOOD_LOG;
+			case ConstructionMaterialType.MATERIAL_WOOD: 	return SOUND_BUILD_WOOD_PLANK;
+			case ConstructionMaterialType.MATERIAL_STAIRS: 	return SOUND_BUILD_WOOD_STAIRS;
+			case ConstructionMaterialType.MATERIAL_METAL: 	return SOUND_BUILD_METAL;
+			case ConstructionMaterialType.MATERIAL_WIRE:	return SOUND_BUILD_WIRE;
+		}
+		
+		return "";
+	}
+	
+	protected string GetDismantleSoundByMaterial( string part_name )
+	{
+		ConstructionMaterialType material_type = GetConstruction().GetMaterialType( part_name );
+		
+		switch ( material_type )
+		{
+			case ConstructionMaterialType.MATERIAL_LOG: 	return SOUND_DISMANTLE_WOOD_LOG;
+			case ConstructionMaterialType.MATERIAL_WOOD: 	return SOUND_DISMANTLE_WOOD_PLANK;
+			case ConstructionMaterialType.MATERIAL_STAIRS: 	return SOUND_DISMANTLE_WOOD_STAIRS;
+			case ConstructionMaterialType.MATERIAL_METAL: 	return SOUND_DISMANTLE_METAL;
+			case ConstructionMaterialType.MATERIAL_WIRE:	return SOUND_DISMANTLE_WIRE;
+		}
+		
+		return "";
+	}
+	
+	//misc
+	void CheckForHybridAttachments( EntityAI item, string slot_name )
+	{
+		if (!GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			//if this is a hybrid attachment, set damage of appropriate damage zone. Zone name must match slot name...WIP
+			if (m_HybridAttachments && m_HybridAttachments.Find(slot_name) != -1)
+			{
+				SetHealth(slot_name,"Health",item.GetHealth());
+			}
+		}
+	}
+	
+	override int GetDamageSystemVersionChange()
+	{
+		return 111;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDetachFromTarget);
+		//AddAction(ActionTakeHybridAttachment);
+		//AddAction(ActionTakeHybridAttachmentToHands);
+		RemoveAction(ActionTakeItem);
+		RemoveAction(ActionTakeItemToHands);
+	}
+	
+	//================================================================
+	// DEBUG
+	//================================================================	
+	protected void DebugCustomState()
+	{
+	}
+	
+	//! Excludes certain parts from being built by OnDebugSpawn, uses Contains to compare
+	array<string> OnDebugSpawnBuildExcludes()
+	{
+		return null;
+	}
+	
+	override void OnDebugSpawn()
+	{
+		FullyBuild();
+	}
+	
+	void FullyBuild()
+	{
+		array<string> excludes = OnDebugSpawnBuildExcludes();
+		array<ConstructionPart> parts = GetConstruction().GetConstructionParts().GetValueArray();
+		
+		Man p;
+		
+		#ifdef SERVER
+		array<Man> players = new array<Man>;
+		GetGame().GetWorld().GetPlayerList(players);
+		if (players.Count())
+			p = players[0];
+		#else
+		p = GetGame().GetPlayer();
+		#endif
+		
+		foreach (ConstructionPart part : parts)
+		{
+			bool excluded = false;
+			string partName = part.GetPartName();
+			if (excludes)
+			{
+				foreach (string exclude : excludes)
+				{
+					if (partName.Contains(exclude))
+					{
+						excluded = true;
+						break;
+					}
+				}
+			}
+			
+			if (!excluded)
+			{
+				OnPartBuiltServer(p, partName, AT_BUILD_PART);
+			}
+		}
+		
+		GetConstruction().UpdateVisuals();
+	}
+}
+
+void bsbDebugPrint (string s)
+{
+#ifdef BSB_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+void bsbDebugSpam (string s)
+{
+#ifdef BSB_DEBUG_SPAM
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Fence.c b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Fence.c
new file mode 100644
index 0000000000000000000000000000000000000000..f9b443d00c64bf9045593620bd5cdb9446eeae4e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Fence.c
@@ -0,0 +1,904 @@
+class Fence extends BaseBuildingBase
+{
+	const int GATE_STATE_NONE 				= 0;
+	const int GATE_STATE_PARTIAL 			= 1;
+	const int GATE_STATE_FULL 				= 2;
+	
+	const string ATTACHMENT_SLOT_COMBINATION_LOCK 	= "Att_CombinationLock";
+	const string SOUND_GATE_OPEN_START				= "DoorWoodTowerOpen_SoundSet";
+	const string SOUND_GATE_CLOSE_START				= "DoorWoodTowerClose_start_SoundSet";
+	const string SOUND_GATE_CLOSE_END				= "DoorWoodTowerClose_end_SoundSet";
+
+	//gate openining
+	const float GATE_ROTATION_ANGLE_DEG 			= 100;
+	const float GATE_ROTATION_TIME_APPROX			= 2000;		//ms
+	
+	const float MAX_ACTION_DETECTION_ANGLE_RAD 		= 1.3;		//1.3 RAD = ~75 DEG
+	const float MAX_ACTION_DETECTION_DISTANCE 		= 2.0;		//meters
+	
+	typename ATTACHMENT_WOODEN_LOG			= WoodenLog;
+	typename ATTACHMENT_COMBINATION_LOCK	= CombinationLock;
+	
+	string ATTSLOT_CAMONET				= "Wall_Camonet";
+	string ATTSLOT_BARBEDWIRE_DOWN		= "Wall_Barbedwire_1";
+	string ATTSLOT_BARBEDWIRE_UP		= "Wall_Barbedwire_2";
+	
+	//protected bool m_HasHinges				= false;
+	//protected bool m_GateFullyConstructed 	= false;
+	protected bool m_ToDiscard 				= false; //for legacy OnStoreLoad handling
+	protected bool m_IsOpened 				= false;
+	protected bool m_IsOpenedClient			= false;
+	protected int m_GateState 				= 0;
+	
+	protected EffectSound m_SoundGate_Start;
+	protected EffectSound m_SoundGate_End;
+	
+	void Fence()
+	{
+		//synchronized variables
+		//RegisterNetSyncVariableBool( "m_HasHinges" );
+		//RegisterNetSyncVariableBool( "m_GateFullyConstructed" );
+		RegisterNetSyncVariableBool( "m_IsOpened" );
+		RegisterNetSyncVariableInt( "m_GateState" );
+	}
+	
+	override string GetConstructionKitType()
+	{
+		return "FenceKit";
+	}
+	
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+	
+	//Gate
+	bool HasHinges()
+	{
+		return m_GateState > GATE_STATE_NONE;
+	}
+	
+	bool HasFullyConstructedGate()
+	{
+		return m_GateState == GATE_STATE_FULL;
+	}
+	
+	void SetGateState( int state )
+	{
+		m_GateState = state;
+		SetSynchDirty();
+	}
+	
+	int GetGateState()
+	{
+		return m_GateState;
+	}
+	
+	int CheckGateState()
+	{
+		ConstructionPart gate_part = GetConstruction().GetGateConstructionPart();
+		int state = GATE_STATE_NONE;
+		if( gate_part.IsBuilt() )
+		{
+			ConstructionPart req_part;
+			array<string> req_parts = gate_part.GetRequiredParts();
+			for (int i = 0; i < req_parts.Count(); i++)
+			{
+				req_part = GetConstruction().GetConstructionPart(req_parts.Get(i));
+				if(!req_part.IsBuilt())
+					break;
+			}
+			
+			if( i != req_parts.Count() )
+			{
+				state = GATE_STATE_PARTIAL;
+			}
+			else
+			{
+				state = GATE_STATE_FULL;
+			}
+			
+		}
+		return state;
+	}
+	
+	void SetOpenedState( bool state )
+	{
+		m_IsOpened = state;
+	}
+	
+	override bool IsOpened()
+	{
+		return m_IsOpened;
+	}
+	
+	bool IsLocked()
+	{
+		CombinationLock combination_lock = GetCombinationLock();
+		if ( combination_lock && combination_lock.IsLocked() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool NameOverride(out string output)
+	{
+		if ( m_GateState != GATE_STATE_NONE )
+		{
+			output = "#str_cfgvehicles_construction_part_gate";  //changes object displayed name if in 'gate' state
+			output.ToUpper();
+			return true;
+		}
+		return false;
+	}
+//
+	CombinationLock GetCombinationLock()
+	{
+		CombinationLock combination_lock = CombinationLock.Cast( FindAttachmentBySlotName( ATTACHMENT_SLOT_COMBINATION_LOCK ) );
+		return combination_lock;
+	}
+	
+	CamoNet GetCamoNet()
+	{
+		CamoNet camonet = CamoNet.Cast( FindAttachmentBySlotName( "Wall_Camonet" ) );
+		return camonet;
+	}
+	
+	BarbedWire GetBarbedWire1()
+	{
+		BarbedWire barbedwire = BarbedWire.Cast( FindAttachmentBySlotName( "Wall_Barbedwire_1" ) );
+		return barbedwire;
+	}
+	
+	BarbedWire GetBarbedWire2()
+	{
+		BarbedWire barbedwire = BarbedWire.Cast( FindAttachmentBySlotName( "Wall_Barbedwire_2" ) );
+		return barbedwire;
+	}
+	
+	//--- CONSTRUCTION KIT
+	override vector GetKitSpawnPosition()
+	{
+		if ( MemoryPointExists( "kit_spawn_position" ) )
+		{
+			vector position;
+			position = GetMemoryPointPos( "kit_spawn_position" );
+			
+			return ModelToWorld( position );
+		}
+		
+		return GetPosition();
+	}	
+	
+	// --- INVENTORY
+	override bool CanDisplayAttachmentSlot( int slot_id )
+	{
+		if (!super.CanDisplayAttachmentSlot(slot_id))
+			return false;
+		
+		string slot_name = InventorySlots.GetSlotName(slot_id);
+		
+		if ( slot_name == "Att_CombinationLock" )
+		{
+			if ( !HasFullyConstructedGate() )
+			{
+				return false;
+			}
+		}
+		
+		if ( !GateAttachmentConditions(InventorySlots.GetSlotIdFromString(slot_name)) )
+			return false;
+		
+		return true;
+	}
+
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		if ( category_name == "Attachments" || category_name == "Material" )
+		{
+			if ( !HasBase() )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}	
+	// ---
+	
+	// --- EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		//write
+		ctx.Write( m_GateState );
+		ctx.Write( m_IsOpened );
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] OnStoreSave - build=" + m_GateState + " opened=" + m_IsOpened);
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+
+		//--- Fence data ---
+		//has gate
+		if (version < 110)
+		{
+			if ( !ctx.Read( m_ToDiscard ) )
+			{
+				m_ToDiscard = false;
+				return false;
+			}
+			m_GateState = GATE_STATE_NONE;
+		}
+		else if ( !ctx.Read( m_GateState ) )
+		{
+			m_GateState = GATE_STATE_NONE;
+			return false;
+		}
+		
+		//is opened
+		if ( !ctx.Read( m_IsOpened ) )
+		{
+			m_IsOpened = false;
+			return false;
+		}
+		
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] OnStoreLoad - build=" + m_GateState + " opened=" + m_IsOpened);
+		//---
+		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+		
+		//set gate state
+		ConstructionPart gate_part = GetConstruction().GetGateConstructionPart();
+		SetGateState( CheckGateState() );
+		
+		//update gate state visual
+		if ( IsOpened() )
+		{
+			OpenFence();
+		}
+		
+		UpdateVisuals();
+		
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] AfterStoreLoad - build=" + gate_part.IsBuilt() + " opened=" + IsOpened());
+	}	
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+
+		if ( m_IsOpenedClient != m_IsOpened )
+		{
+			m_IsOpenedClient = m_IsOpened;
+			
+			if ( m_IsOpenedClient )
+			{
+				OpenFence();
+			}
+			else
+			{
+				CloseFence();
+			}
+		}
+	}
+	
+	//--- BUILD EVENTS
+	//CONSTRUCTION EVENTS
+	override void OnPartBuiltServer( notnull Man player, string part_name, int action_id )
+	{
+		ConstructionPart constrution_part = GetConstruction().GetConstructionPart( part_name );
+		
+		super.OnPartBuiltServer( player, part_name, action_id );
+		
+		SetGateState(CheckGateState());
+		
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	override void OnPartDismantledServer( notnull Man player, string part_name, int action_id )
+	{
+		ConstructionPart constrution_part = GetConstruction().GetConstructionPart( part_name );
+		
+		//check gate state
+		if ( constrution_part.IsGate() )
+		{
+			if ( IsLocked() )
+			{
+				CombinationLock combination_lock = CombinationLock.Cast( FindAttachmentBySlotName( ATTACHMENT_SLOT_COMBINATION_LOCK ) );
+				combination_lock.UnlockServer( player , this );
+			}
+		}
+		
+		super.OnPartDismantledServer( player, part_name, action_id );
+		
+		SetGateState( CheckGateState() );
+		
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	override void OnPartDestroyedServer( Man player, string part_name, int action_id, bool destroyed_by_connected_part = false )
+	{
+		super.OnPartDestroyedServer( player, part_name, action_id );
+		
+		//check gate state
+		ConstructionPart constrution_part = GetConstruction().GetConstructionPart( part_name );
+		if ( constrution_part.IsGate() && destroyed_by_connected_part ) //avoids attachment dropping on regular hinges destruction
+		{
+			//drop regular attachments
+			HandleDropAttachment(GetBarbedWire1());
+			HandleDropAttachment(GetBarbedWire2());
+			HandleDropAttachment(GetCamoNet());
+			HandleDropAttachment(GetCombinationLock());
+			
+			//rotate back to place
+			if ( IsOpened() )
+				CloseFence();
+		}
+		if ( part_name == "wall_base_down" )
+		{
+			HandleDropAttachment(GetBarbedWire1());
+			HandleDropAttachment(GetCombinationLock());
+		}
+		if ( part_name == "wall_base_up" )
+		{
+			HandleDropAttachment(GetBarbedWire2());
+			HandleDropAttachment(GetCamoNet());
+			HandleDropAttachment(GetCombinationLock());
+		}
+		
+		SetGateState( CheckGateState() );
+		//update visuals (server)
+		UpdateVisuals();
+	}
+
+	//--- ATTACHMENT & CONDITIONS
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId )
+	{
+		if ( !super.CanReceiveAttachment(attachment, slotId) )
+			return false;
+		
+		//manage action initiator (AT_ATTACH_TO_CONSTRUCTION)
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if ( player )
+			{
+				ConstructionActionData construction_action_data = player.GetConstructionActionData();
+				
+				//reset action initiator
+				construction_action_data.SetActionInitiator( NULL );				
+			}
+		}
+		
+		//conditions
+		if ( attachment.Type() != ATTACHMENT_WOODEN_LOG )
+		{
+			if ( !HasBase() )
+			{
+				return false;
+			}
+		}
+		
+		if ( attachment.IsInherited( ATTACHMENT_COMBINATION_LOCK ) )
+		{
+			return ( HasFullyConstructedGate() && !IsOpened() );
+		}
+		
+		if ( !GateAttachmentConditions(slotId) )
+			return false;
+		
+		return true;
+	}
+	
+	//hands
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		if( !super.CanPutIntoHands( parent ) )
+		{
+			return false;
+		}
+		
+		if ( HasBase() )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override bool CanBeRepairedToPristine()
+	{
+		return true;
+	}
+	
+	//--- OPEN/CLOSE ACTIONS
+	bool CanOpenFence()
+	{
+		if ( HasHinges() && !IsOpened() && !IsLocked() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool CanCloseFence()
+	{
+		if ( HasHinges() && IsOpened() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void OpenFence()
+	{
+		//server or single player
+		if ( GetGame().IsServer() )
+		{
+			float value = GATE_ROTATION_ANGLE_DEG;
+			SetAnimationPhase( "Wall_Interact_Rotate", 				value );
+			SetAnimationPhase( "Wall_Barbedwire_1_Mounted_Rotate", 	value );
+			SetAnimationPhase( "Wall_Barbedwire_2_Mounted_Rotate", 	value );
+			SetAnimationPhase( "Wall_Camonet_Rotate", 				value );
+			SetAnimationPhase( "Wall_Gate_Rotate", 					value );
+			SetAnimationPhase( "Wall_Base_Down_Rotate", 			value );
+			SetAnimationPhase( "Wall_Base_Up_Rotate", 				value );
+			SetAnimationPhase( "Wall_Wood_Down_Rotate", 			value );
+			SetAnimationPhase( "Wall_Wood_Up_Rotate", 				value );
+			SetAnimationPhase( "Wall_Metal_Down_Rotate", 			value );
+			SetAnimationPhase( "Wall_Metal_Up_Rotate", 				value );
+			
+			SetOpenedState( true );
+			
+			//regenerate navmesh
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( UpdateNavmesh, GATE_ROTATION_TIME_APPROX, false );
+			
+			//synchronize
+			SynchronizeBaseState();
+		}
+		
+		//client or single player
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			//play sound
+			SoundGateOpenStart();
+		}
+		
+		//remove BarbedWire AreaDamageTrigger
+		UpdateBarbedWireAreaDamagePos(0,true);
+		
+		//add check
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Remove(CheckFenceClosed);
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( CheckFenceOpened, 0, true );
+	}
+	
+	void CloseFence()
+	{
+		//server or single player
+		if ( GetGame().IsServer() )
+		{
+			float value = 0;
+			SetAnimationPhase( "Wall_Interact_Rotate", 				value );
+			SetAnimationPhase( "Wall_Barbedwire_1_Mounted_Rotate", 	value );
+			SetAnimationPhase( "Wall_Barbedwire_2_Mounted_Rotate", 	value );
+			SetAnimationPhase( "Wall_Camonet_Rotate", 				value );
+			SetAnimationPhase( "Wall_Gate_Rotate", 					value );
+			SetAnimationPhase( "Wall_Base_Down_Rotate", 			value );
+			SetAnimationPhase( "Wall_Base_Up_Rotate", 				value );
+			SetAnimationPhase( "Wall_Wood_Down_Rotate", 			value );
+			SetAnimationPhase( "Wall_Wood_Up_Rotate", 				value );
+			SetAnimationPhase( "Wall_Metal_Down_Rotate", 			value );
+			SetAnimationPhase( "Wall_Metal_Up_Rotate", 				value );
+			
+			SetOpenedState( false );
+			
+			//regenerate navmesh
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( UpdateNavmesh, GATE_ROTATION_TIME_APPROX, false );
+			
+			//synchronize
+			SynchronizeBaseState();
+		}
+		
+		//client or single player
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			//play sound
+			SoundGateCloseStart();
+		}
+		
+		//remove BarbedWire AreaDamageTrigger
+		UpdateBarbedWireAreaDamagePos(0,true);
+		
+		//add check
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Remove(CheckFenceOpened);
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( CheckFenceClosed, 0, true );
+	}
+	
+	protected void CheckFenceOpened()
+	{
+		if ( GetAnimationPhase( "Wall_Gate_Rotate" ) == GATE_ROTATION_ANGLE_DEG )			//animation finished - open
+		{
+			UpdateBarbedWireAreaDamagePos(GetAnimationPhase( "Wall_Gate_Rotate" ));
+			//remove check
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Remove( CheckFenceOpened );
+		}
+	}
+	
+	protected void CheckFenceClosed()
+	{
+		if ( GetAnimationPhase( "Wall_Gate_Rotate" ) == 0 )			//animation finished - closed
+		{
+			//client or single player
+			if ( !GetGame().IsDedicatedServer() )
+			{
+				//play sound
+				if ( this ) SoundGateCloseEnd();
+			}
+			UpdateBarbedWireAreaDamagePos(GetAnimationPhase( "Wall_Gate_Rotate" ));
+			//remove check
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Remove( CheckFenceClosed );
+		}
+	}
+	
+	//Damage triggers
+	override void CreateAreaDamage( string slot_name, float rotation_angle = 0 )
+	{
+		if ( IsOpened() )
+		{
+			rotation_angle = 100;
+		}
+		
+		super.CreateAreaDamage( slot_name, rotation_angle );
+	}
+	
+	//BarbedWire update
+	void UpdateBarbedWireAreaDamagePos(float rotation_angle = 0, bool to_delete = false )
+	{
+		int slot_id;
+		string slot_name;
+		string slot_name_mounted;
+		if ( GetBarbedWire1() && GetBarbedWire1().IsMounted() )
+		{
+			GetBarbedWire1().GetInventory().GetCurrentAttachmentSlotInfo(slot_id,slot_name);
+			slot_name_mounted = slot_name + "_Mounted";
+			if (to_delete)
+			{
+				DestroyAreaDamage( slot_name_mounted );
+			}
+			else
+			{
+				super.CreateAreaDamage( slot_name_mounted, rotation_angle );
+			}
+		}
+		if ( GetBarbedWire2() && GetBarbedWire2().IsMounted() )
+		{
+			GetBarbedWire2().GetInventory().GetCurrentAttachmentSlotInfo(slot_id,slot_name);
+			slot_name_mounted = slot_name + "_Mounted";
+			if (to_delete)
+			{
+				DestroyAreaDamage( slot_name_mounted );
+			}
+			else
+			{
+				super.CreateAreaDamage( slot_name_mounted, rotation_angle );
+			}
+		}
+	}
+	
+	//Here deal damage to BarbedWire when entity taking damage from it
+	override void PostAreaDamageActions()
+	{
+		/*if (GetBarbedWire1())
+		{
+			//DecreaseHealth("Wall_BarbedWire_1", "", 1000); //why no dmg to wire???
+			//BarbedWire wire = GetBarbedWire1();
+			//wire.PostAreaDamageActions();
+			//Print(GetHealth("BarbedWire1", ""));
+		}*/
+	}
+	
+	//--- ACTION CONDITIONS
+	override bool IsPlayerInside( PlayerBase player, string selection )
+	{
+		vector player_pos = player.GetPosition();
+		vector fence_pos = GetPosition();
+		vector ref_dir = GetDirection();
+		ref_dir[1] = 0;
+		ref_dir.Normalize();
+		 
+		vector x[2];
+		vector b1,b2;
+		GetCollisionBox(x);
+		b1 = x[0];
+		b2 = x[1];
+
+		vector dir_to_fence = fence_pos - player_pos;
+		dir_to_fence[1] = 0;
+		float len = dir_to_fence.Length();
+
+		dir_to_fence.Normalize();
+		
+		vector ref_dir_angle = ref_dir.VectorToAngles();
+		vector dir_to_fence_angle = dir_to_fence.VectorToAngles();
+		vector test_angles = dir_to_fence_angle - ref_dir_angle;
+		
+		vector test_position = test_angles.AnglesToVector() * len;
+		
+		if(test_position[0] < b1[0] || test_position[0] > b2[0] || test_position[2] < 0.2 || test_position[2] > 2.2 )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	override bool IsFacingPlayer( PlayerBase player, string selection )
+	{
+		vector fence_pos = GetPosition();
+		vector player_pos = player.GetPosition();
+		vector ref_dir = GetDirection();
+		
+		//vector fence_player_dir = player_pos - fence_pos;
+		vector fence_player_dir = player.GetDirection();
+		fence_player_dir.Normalize();
+		fence_player_dir[1] = 0; 	//ignore height
+		
+		ref_dir.Normalize();
+		ref_dir[1] = 0;			//ignore height
+		
+		if ( ref_dir.Length() != 0 )
+		{
+			float angle = Math.Acos( fence_player_dir * ref_dir );
+			
+			if ( angle >= MAX_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool IsFacingCamera( string selection )
+	{
+		vector ref_dir = GetDirection();
+		vector cam_dir = GetGame().GetCurrentCameraDirection();
+		
+		//ref_dir = GetGame().GetCurrentCameraPosition() - GetPosition();
+		ref_dir.Normalize();
+		ref_dir[1] = 0;		//ignore height
+		
+		cam_dir.Normalize();
+		cam_dir[1] = 0;		//ignore height
+		
+		if ( ref_dir.Length() != 0 )
+		{
+			float angle = Math.Acos( cam_dir * ref_dir );
+			
+			if ( angle >= MAX_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	override bool HasProperDistance( string selection, PlayerBase player )
+	{
+		if ( MemoryPointExists( selection ) )
+		{
+			vector selection_pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			float distance = vector.Distance( selection_pos, player.GetPosition() );
+			if ( distance >= MAX_ACTION_DETECTION_DISTANCE )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	override bool CanUseConstructionBuild()
+	{
+		return !IsOpened();
+	}
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	protected void SoundGateOpenStart()
+	{
+		//client or single player
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlaySoundSet( m_SoundGate_Start, SOUND_GATE_OPEN_START, 0.1, 0.1 );
+		}
+	}
+
+	protected void SoundGateCloseStart()
+	{
+		//client or single player
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlaySoundSet( m_SoundGate_Start, SOUND_GATE_CLOSE_START, 0.1, 0.1 );
+		}
+	}
+
+	protected void SoundGateCloseEnd()
+	{
+		//client or single player
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlaySoundSet( m_SoundGate_End, SOUND_GATE_CLOSE_END, 0.1, 0.1 );
+		}
+	}
+	
+	void GateAttachmentsSanityCheck()
+	{
+		ConstructionPart wall_base_down = GetConstruction().GetConstructionPart("wall_base_down");
+		ConstructionPart wall_base_up = GetConstruction().GetConstructionPart("wall_base_up");
+		if(GetBarbedWire1() && !wall_base_down.IsBuilt())
+		{
+			HandleDropAttachment(GetBarbedWire1());
+			HandleDropAttachment(GetCombinationLock());
+		}
+		if( ( GetCamoNet() || GetBarbedWire2() ) && !wall_base_up.IsBuilt() )
+		{
+			HandleDropAttachment(GetBarbedWire2());
+			HandleDropAttachment(GetCamoNet());
+			HandleDropAttachment(GetCombinationLock());
+		}
+	}
+	
+	void HandleDropAttachment(ItemBase item)
+	{
+		BarbedWire wire;
+		CombinationLock lock;
+		if (Class.CastTo(wire,item)) //special barbed wire beh.
+		{
+			wire.SetMountedState( false );
+			GetInventory().DropEntity(InventoryMode.SERVER, this, wire);
+		}
+		else if (Class.CastTo(lock,item))
+		{
+			lock.UnlockServer(null,this);
+		}
+		else if (item)//generic behaviour
+		{
+			GetInventory().DropEntity(InventoryMode.SERVER, this, item);
+		}
+	}
+	
+	bool GateAttachmentConditions(int slotId)
+	{
+		if ( GetGateState() == GATE_STATE_PARTIAL )
+		{
+			ConstructionPart wall_base_down = GetConstruction().GetConstructionPart("wall_base_down");
+			ConstructionPart wall_base_up = GetConstruction().GetConstructionPart("wall_base_up");
+			string slot_name = InventorySlots.GetSlotName(slotId);
+			if ( !wall_base_up.IsBuilt() )
+			{
+				if ( slot_name == ATTSLOT_CAMONET || slot_name == ATTSLOT_BARBEDWIRE_UP )
+				{
+					return false;
+				}
+			}
+			if ( !wall_base_down.IsBuilt() )
+			{
+				if ( slot_name == ATTSLOT_BARBEDWIRE_DOWN )
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+	
+	//specific selection for camonet attaching (other ones might be animated via rotation!)
+	override bool TranslateSlotFromSelection(string selection_name, out int slot_id)
+	{
+		if ( selection_name == "wall_camonet_attach" )
+		{
+			slot_id = InventorySlots.GetSlotIdFromString("Wall_Camonet");
+			return true;
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPlaceObject);
+		AddAction(ActionFoldBaseBuildingObject);
+		//AddAction(ActionDialCombinationLockOnTarget);
+		//AddAction(ActionNextCombinationLockDialOnTarget);
+		AddAction(ActionOpenFence);
+		AddAction(ActionCloseFence);
+	}
+	
+	//================================================================
+	// DEBUG
+	//================================================================	
+	/*
+	override void DebugCustomState()
+	{
+		//debug
+		m_SyncParts01 = 881;		//full fence with gate
+		m_HasHinges = true;
+		m_HasBase = true;
+		
+		OnVariablesSynchronized();
+	}
+	*/
+	
+	//! Excludes certain parts from being built by OnDebugSpawn, uses Contains to compare
+	override array<string> OnDebugSpawnBuildExcludes()
+	{
+		array<string> excludes = {};
+		
+		#ifdef DIAG_DEVELOPER
+		bool bWood = DiagMenu.GetBool(DiagMenuIDs.BASEBUILDING_WOOD);
+		#else
+		bool bWood = false;
+		#endif
+		
+		if (bWood)
+		{
+			excludes.Insert("_metal_");
+		}
+		else
+		{
+			excludes.Insert("_wood_");
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		bool bGate = DiagMenu.GetBool(DiagMenuIDs.BASEBUILDING_GATE);
+		#else
+		bool bGate = false;
+		#endif
+		
+		if (bGate)
+		{
+			excludes.Insert("platform");
+		}
+		else
+		{
+			excludes.Insert("gate");
+		}
+		
+		return excludes;
+	}
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		GetInventory().CreateInInventory("CamoNet");
+		
+		for (int i = 0; i < 2; ++i)
+		{
+			BarbedWire wire = BarbedWire.Cast(GetInventory().CreateInInventory("BarbedWire"));		
+			wire.SetMountedState(true);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/ShelterSite.c b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/ShelterSite.c
new file mode 100644
index 0000000000000000000000000000000000000000..c519a564f0a118836ae43c2cb877d4c80cddd2f8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/ShelterSite.c
@@ -0,0 +1,174 @@
+class ShelterSite extends BaseBuildingBase
+{
+	const float MAX_ACTION_DETECTION_ANGLE_RAD 		= 1.3;		//1.3 RAD = ~75 DEG
+	const float MAX_ACTION_DETECTION_DISTANCE 		= 2.0;		//meters
+
+	void ShelterSite()
+	{
+	}
+
+	override string GetConstructionKitType()
+	{
+		return "ShelterKit";
+	}
+
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+
+	//--- CONSTRUCTION KIT
+	override vector GetKitSpawnPosition()
+	{
+		if ( MemoryPointExists( "kit_spawn_position" ) )
+		{
+			vector position;
+			position = GetMemoryPointPos( "kit_spawn_position" );
+			
+			return ModelToWorld( position );
+		}
+		
+		return GetPosition();
+	}
+
+	//--- BUILD EVENTS
+	//CONSTRUCTION EVENTS
+	override void OnPartBuiltServer( notnull Man player, string part_name, int action_id )
+	{
+		ConstructionPart constrution_part = GetConstruction().GetConstructionPart( part_name );
+		
+		string shelter_type = "";
+		switch (part_name)
+		{
+			case "leather": 
+				shelter_type = "ShelterLeather";
+			break;
+			
+			case "fabric": 
+				shelter_type = "ShelterFabric";
+			break;
+			
+			case "stick": 
+				shelter_type = "ShelterStick";
+			break;
+				
+			default: {};
+		}
+		
+		if (shelter_type != "")
+		{
+			GetConstruction().DropNonUsableMaterialsServer( player, part_name );
+			MiscGameplayFunctions.TurnItemIntoItem(this, shelter_type, PlayerBase.Cast(player));
+			
+			PluginAdminLog admin_log = PluginAdminLog.Cast( GetPlugin(PluginAdminLog) );
+			if (admin_log)
+			{
+				string playerPrefix = admin_log.GetPlayerPrefix(PlayerBase.Cast(player), player.GetIdentity());
+				admin_log.DirectAdminLogPrint(playerPrefix +" built " + shelter_type + " with Hands ");
+			}
+		}
+		//super.OnPartBuiltServer( part_name, action_id );
+	}
+	
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+
+	override bool CanBeRepairedToPristine()
+	{
+		return true;
+	}
+	
+	override bool CanUseHandConstruction()
+	{
+		return true;
+	}
+	
+	override bool MustBeBuiltFromOutside()
+	{
+		return true;
+	}
+	
+	override bool IsFacingCamera( string selection )
+	{
+		vector ref_dir = GetDirection();
+		vector cam_dir = GetGame().GetCurrentCameraDirection();
+		
+		//ref_dir = GetGame().GetCurrentCameraPosition() - GetPosition();
+		ref_dir.Normalize();
+		ref_dir[1] = 0;		//ignore height
+		
+		cam_dir.Normalize();
+		cam_dir[1] = 0;		//ignore height
+		
+		if ( ref_dir.Length() != 0 )
+		{
+			float angle = Math.Acos( cam_dir * ref_dir );
+			
+			if ( angle >= MAX_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	override bool IsPlayerInside( PlayerBase player, string selection )
+	{
+		vector player_pos = player.GetPosition();
+		vector object_pos = GetPosition();
+		vector ref_dir = GetDirection();
+		ref_dir[1] = 0;
+		ref_dir.Normalize();
+		
+		vector min,max;
+		min = -GetMemoryPointPos( "BoundingBox_min" );
+		max = -GetMemoryPointPos( "BoundingBox_max" );
+		
+		vector dir_to_object = object_pos - player_pos;
+		dir_to_object[1] = 0;
+		float len = dir_to_object.Length();
+		
+		dir_to_object.Normalize();
+		
+		vector ref_dir_angle = ref_dir.VectorToAngles();
+		vector dir_to_object_angle = dir_to_object.VectorToAngles();
+		vector test_angles = dir_to_object_angle - ref_dir_angle;
+		
+		vector test_position = test_angles.AnglesToVector() * len;
+		
+		if(test_position[0] > max[0] || test_position[0] < min[0] || test_position[2] > max[2] || test_position[2] < min[2] )
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	override bool HasProperDistance( string selection, PlayerBase player )
+	{
+		if ( MemoryPointExists( selection ) )
+		{
+			vector selection_pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			float distance = vector.Distance( selection_pos, player.GetPosition() );
+			if ( distance >= MAX_ACTION_DETECTION_DISTANCE )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPlaceObject);
+		AddAction(ActionFoldBaseBuildingObject);
+		AddAction(ActionBuildShelter);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Totem.c b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Totem.c
new file mode 100644
index 0000000000000000000000000000000000000000..93c2a8f9fd07c161efb35ccd6486026feb49aa54
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Totem.c
@@ -0,0 +1,587 @@
+class TerritoryFlag extends BaseBuildingBase
+{
+	const float MAX_ACTION_DETECTION_ANGLE_RAD 		= 1.3;		//1.3 RAD = ~75 DEG
+	const float MAX_ACTION_DETECTION_DISTANCE 		= 2.0;		//meters
+	
+	bool m_RefresherActive;
+	bool m_RefresherActiveLocal;
+	bool m_RefresherInitialized;
+	int m_RefresherTimeRemaining;
+	int m_RefreshTimeCounter;
+	
+	protected int m_FlagRefresherFrequency = GameConstants.REFRESHER_FREQUENCY_DEFAULT; 		//how often does the flag increase lifetimes
+	protected int m_FlagRefresherMaxDuration = GameConstants.REFRESHER_MAX_DURATION_DEFAULT; 	//how long will the refresher run; multiple of m_FlagRefresherFrequency by default
+	
+	void TerritoryFlag()
+	{
+		m_RefresherActive = false;
+		m_RefresherActiveLocal = false;
+		m_RefresherInitialized = false;
+		m_RefresherTimeRemaining = 0;
+		
+		if ( GetCEApi() )
+		{
+			InitRefresherData();
+		}
+		RegisterNetSyncVariableBool("m_RefresherActive");
+	}
+	
+	void ~TerritoryFlag()
+	{
+		RemoveRefresherPosition();
+	}
+	
+	void InitRefresherData()
+	{
+		int frequency = GetCEApi().GetCEGlobalInt("FlagRefreshFrequency");
+		int max_duration = GetCEApi().GetCEGlobalInt("FlagRefreshMaxDuration");
+		
+		if ( frequency > 0)
+		{
+			m_FlagRefresherFrequency = frequency;
+		}
+		if ( max_duration > 0 )
+		{
+			m_FlagRefresherMaxDuration = max_duration;
+		}
+		m_RefresherInitialized = true;
+	}
+	
+	override string GetConstructionKitType()
+	{
+		return "TerritoryFlagKit";
+	}
+	
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+	
+	/*override bool NameOverride(out string output)
+	{
+		if ( m_GateState != GATE_STATE_NONE )
+		{
+			output = "#str_cfgvehicles_construction_part_gate";  //changes object displayed name if in 'gate' state
+			output.ToUpper();
+			return true;
+		}
+		return false;
+	}*/
+	
+	//--- CONSTRUCTION KIT
+	override vector GetKitSpawnPosition()
+	{
+		if ( MemoryPointExists( "kit_spawn_position" ) )
+		{
+			vector position;
+			position = GetMemoryPointPos( "kit_spawn_position" );
+			
+			return ModelToWorld( position );
+		}
+		
+		return GetPosition();
+	}
+	
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		if ( category_name == "Base" && !HasBase() )
+			return true;
+		else if ( category_name == "Support" && HasBase() && !GetConstruction().IsPartConstructed("support") )
+			return true;
+		else if ( category_name == "Pole" && GetConstruction().IsPartConstructed("support") && !GetConstruction().IsPartConstructed("pole") )
+			return true;
+		else if ( category_name == "Flag" && GetConstruction().IsPartConstructed("pole") )
+			return true;
+		else
+			return false;
+	}
+	// ---
+	
+	// --- EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		ctx.Write( m_RefresherTimeRemaining );
+		ctx.Write( m_RefreshTimeCounter );
+		ctx.Write( m_FlagRefresherMaxDuration );
+		ctx.Write( m_RefresherActive );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		//int loaded_frequency;
+		int loaded_max_duration;
+		
+		if ( !ctx.Read( m_RefresherTimeRemaining ) )
+		{
+			return false;
+		}
+		
+		if ( !ctx.Read( m_RefreshTimeCounter ) )
+		{
+			return false;
+		}
+		
+		if ( !ctx.Read( loaded_max_duration ) )
+		{
+			return false;
+		}
+		
+		if ( version >= 118 && !ctx.Read( m_RefresherActive ) )
+		{
+			return false;
+		}
+		
+		CheckLoadedVariables(loaded_max_duration);
+		AnimateFlag(1 - GetRefresherTime01());
+		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{
+		super.AfterStoreLoad();
+		
+		if (!m_RefresherInitialized && GetCEApi())
+		{
+			InitRefresherData();
+		}
+		SetSynchDirty();
+		UpdateVisuals();
+	}
+	
+	override void OnCEUpdate()
+	{
+		super.OnCEUpdate();
+		
+		int time_elapsed_rounded = Math.Round(m_ElapsedSinceLastUpdate);
+		
+		if ( m_RefresherTimeRemaining > 0 )
+		{
+			m_RefreshTimeCounter += time_elapsed_rounded;
+			if ( m_RefreshTimeCounter >= m_FlagRefresherFrequency )
+			{
+				GetCEApi().RadiusLifetimeReset(GetPosition(),GameConstants.REFRESHER_RADIUS);
+				m_RefresherTimeRemaining = Math.Clamp(m_RefresherTimeRemaining - m_RefreshTimeCounter,0,m_FlagRefresherMaxDuration);
+				m_RefreshTimeCounter = 0; //possibly carry over the rest?
+				AnimateFlag( 1 - GetRefresherTime01() );
+			}
+		}
+		
+		SetRefresherActive(m_RefresherTimeRemaining > 0);
+	}
+	
+	//! Client-side, saves positions of active lifetime refreshers to MissionGameplay
+	void HandleRefreshers()
+	{
+		Mission mission = GetGame().GetMission();
+		if (!mission.m_ActiveRefresherLocations)
+			return;
+		
+		int idx = mission.m_ActiveRefresherLocations.Find(GetPosition());
+		if ( m_RefresherActive && idx == -1 )
+		{
+			InsertRefresherPosition();
+		}
+		else if ( !m_RefresherActive && idx > -1 )
+		{
+			RemoveRefresherPosition(idx);
+		}
+	}
+	
+	void SetRefresherActive(bool state)
+	{
+		if ( m_RefresherActive != state )
+		{
+			m_RefresherActive = state;
+			SetSynchDirty();
+			
+			//update on refresher activation / last update on refresher deactivation
+			GetCEApi().RadiusLifetimeReset(GetPosition(),GameConstants.REFRESHER_RADIUS); //TODO spammable!!!
+		}
+	}
+	
+	void InsertRefresherPosition()
+	{
+		Mission mission = GetGame().GetMission();
+		mission.m_ActiveRefresherLocations.Insert(GetPosition());
+	}
+	
+	void RemoveRefresherPosition(int idx = -2)
+	{
+		if (!GetGame() || (GetGame().IsMultiplayer() && GetGame().IsServer()) )
+			return;
+		
+		Mission mission = GetGame().GetMission();
+		if (!mission || !mission.m_ActiveRefresherLocations)
+			return;
+		
+		if (idx == -2)
+		{
+			idx = mission.m_ActiveRefresherLocations.Find(GetPosition());
+		}
+		
+		if (idx > -1)
+		{
+			mission.m_ActiveRefresherLocations.Remove(idx);
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if ( m_RefresherActive != m_RefresherActiveLocal )
+		{
+			HandleRefreshers();
+			m_RefresherActiveLocal = m_RefresherActive;
+		}
+	}
+	
+	//--- BUILD EVENTS
+	//CONSTRUCTION EVENTS
+	override void OnPartBuiltServer( notnull Man player, string part_name, int action_id )
+	{
+		//ConstructionPart constrution_part = GetConstruction().GetConstructionPart( part_name );
+		
+		super.OnPartBuiltServer( player, part_name, action_id );
+		
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	override void OnPartDismantledServer( notnull Man player, string part_name, int action_id )
+	{
+		ConstructionPart constrution_part = GetConstruction().GetConstructionPart( part_name );
+		
+		super.OnPartDismantledServer( player, part_name, action_id );
+		
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	override void OnPartDestroyedServer( Man player, string part_name, int action_id, bool destroyed_by_connected_part = false )
+	{
+		super.OnPartDestroyedServer( player, part_name, action_id );
+		
+		//update visuals (server)
+		UpdateVisuals();
+	}
+
+	//--- ATTACHMENT & CONDITIONS
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId ) //TODO
+	{
+		if ( !super.CanReceiveAttachment(attachment, slotId) )
+			return false;
+		
+		//manage action initiator (AT_ATTACH_TO_CONSTRUCTION)
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if ( player )
+			{
+				ConstructionActionData construction_action_data = player.GetConstructionActionData();
+				
+				//reset action initiator
+				construction_action_data.SetActionInitiator( NULL );				
+			}
+		}
+		
+		//conditions
+		string slot_name = InventorySlots.GetSlotName(slotId);
+		//flag item attachment
+		if ( slot_name == "Material_FPole_Flag" )
+		{
+			if ( GetConstruction().IsPartConstructed("pole") )
+				return true;
+			else
+				return false;
+		}
+		//materials
+		ConstructionPart part;
+		ConstructionPart part_lowest;
+		int part_id = -1;
+		for (int i = 0; i < GetConstruction().GetConstructionParts().Count(); i++)
+		{
+			part = GetConstruction().GetConstructionParts().GetElement(i);
+			if (!part.IsBuilt())
+			{
+				if (part_id == -1 || part_id > part.GetId())
+				{
+					part_lowest = part;
+					part_id = part.GetId();
+				}
+			}
+		}
+		
+		if (part_lowest /*&& !part_lowest.IsBuilt()*/)
+		{
+			string cfg_path = "cfgVehicles " + GetType() + " Construction " + part_lowest.GetMainPartName() + " " + part_lowest.GetPartName() + " Materials";
+			string material_path;
+			if ( GetGame().ConfigIsExisting(cfg_path) )
+			{
+				string child_name;
+				string child_slot_name;
+				for ( i = 0; i < GetGame().ConfigGetChildrenCount( cfg_path ); i++ )
+				{
+					GetGame().ConfigGetChildName( cfg_path, i, child_name );
+					material_path = "" + cfg_path + " " + child_name + " slot_name";
+					if ( GetGame().ConfigGetText(material_path,child_slot_name) && child_slot_name == slot_name )
+					{
+						return true;
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	//hands
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanBeRepairedToPristine()
+	{
+		return true;
+	}
+	
+	//--- ACTION CONDITIONS
+	override bool IsPlayerInside( PlayerBase player, string selection )
+	{
+		return true; //TODO
+		
+		vector player_pos = player.GetPosition();
+		vector fence_pos = GetPosition();
+		vector ref_dir = GetDirection();
+		ref_dir[1] = 0;
+		ref_dir.Normalize();
+		 
+		vector x[2];
+		vector b1,b2;
+		GetCollisionBox(x);
+		b1 = x[0];
+		b2 = x[1];
+
+		vector dir_to_fence = fence_pos - player_pos;
+		dir_to_fence[1] = 0;
+		float len = dir_to_fence.Length();
+
+		dir_to_fence.Normalize();
+		
+		vector ref_dir_angle = ref_dir.VectorToAngles();
+		vector dir_to_fence_angle = dir_to_fence.VectorToAngles();
+		vector test_angles = dir_to_fence_angle - ref_dir_angle;
+		
+		vector test_position = test_angles.AnglesToVector() * len;
+		
+		if(test_position[0] < b1[0] || test_position[0] > b2[0] || test_position[2] < 0.2 || test_position[2] > 2.2 )
+		{
+			return false;
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	override bool IsFacingPlayer( PlayerBase player, string selection )
+	{
+		return true; //TODO
+		
+		vector fence_pos = GetPosition();
+		vector player_pos = player.GetPosition();
+		vector ref_dir = GetDirection();
+		
+		//vector fence_player_dir = player_pos - fence_pos;
+		vector fence_player_dir = player.GetDirection();
+		fence_player_dir.Normalize();
+		fence_player_dir[1] = 0; 	//ignore height
+		
+		ref_dir.Normalize();
+		ref_dir[1] = 0;			//ignore height
+		
+		if ( ref_dir.Length() != 0 )
+		{
+			float angle = Math.Acos( fence_player_dir * ref_dir );
+			
+			if ( angle >= MAX_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool IsFacingCamera( string selection )
+	{
+		return false; //TODO
+		
+		vector ref_dir = GetDirection();
+		vector cam_dir = GetGame().GetCurrentCameraDirection();
+		
+		//ref_dir = GetGame().GetCurrentCameraPosition() - GetPosition();
+		ref_dir.Normalize();
+		ref_dir[1] = 0;		//ignore height
+		
+		cam_dir.Normalize();
+		cam_dir[1] = 0;		//ignore height
+		
+		if ( ref_dir.Length() != 0 )
+		{
+			float angle = Math.Acos( cam_dir * ref_dir );
+			
+			if ( angle >= MAX_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	override bool HasProperDistance( string selection, PlayerBase player )
+	{
+		//TODO
+		if ( MemoryPointExists( selection ) )
+		{
+			vector selection_pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			float distance = vector.Distance( selection_pos, player.GetPosition() );
+			if ( distance >= MAX_ACTION_DETECTION_DISTANCE )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	//TODO
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRaiseFlag);
+		AddAction(ActionLowerFlag);
+		AddAction(ActionFoldBaseBuildingObject);
+	}
+	
+	/*override void UpdateVisuals()
+	{
+		super.UpdateVisuals();
+	}*/
+	
+	//================================================================
+	// FLAG MANIPULATION + REFRESHER
+	//================================================================
+	void AnimateFlagEx(float delta, PlayerBase player = null)
+	{
+		float temp = Math.Clamp( delta,0,1 );
+		float phase_new;
+		if (temp < 0.01 || temp > 0.99)
+		{
+			phase_new = Math.Round(temp);
+		}
+		else
+			phase_new = temp;
+		
+		SetAnimationPhase("flag_mast",phase_new);
+		
+		if (player)
+			LogAnimateFlag(phase_new, player);
+		
+		GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString("Material_FPole_Flag"),phase_new != 1);
+		
+	}
+	
+	void AnimateFlag(float delta)
+	{
+		AnimateFlagEx(delta);
+	}
+	
+	protected void LogAnimateFlag(float newPhase, notnull PlayerBase player)
+	{
+		PluginAdminLog logs = PluginAdminLog.Cast(GetPlugin(PluginAdminLog));
+		if (newPhase == 0)
+		{
+			// at the top(it's inverted)
+			logs.TotemFlagChange(true, player, this);
+		}
+		else if (newPhase == 1)
+		{
+			// at the bottom(it's inverted)
+			logs.TotemFlagChange(false, player, this);
+		}
+
+	}
+	
+	void SetRefreshTimer01(float fraction)
+	{
+		float temp = Math.Clamp(m_FlagRefresherMaxDuration * fraction, 0, m_FlagRefresherMaxDuration);
+		m_RefresherTimeRemaining = Math.Round(temp);
+	}
+	
+	/*void AddRefresherTimeFlat(float seconds) //seconds?
+	{
+		float temp = Math.Clamp(m_RefresherTimeRemaining + seconds, 0, m_FlagRefresherMaxDuration);
+		m_RefresherTimeRemaining = Math.Round(temp);
+		SetRefresherActive(m_RefresherTimeRemaining > 0);
+	}*/
+	
+	void AddRefresherTime01(float fraction)
+	{
+		float temp = Math.Clamp(m_RefresherTimeRemaining + (fraction * m_FlagRefresherMaxDuration), 0, m_FlagRefresherMaxDuration);
+		m_RefresherTimeRemaining = Math.Round(temp);
+		SetRefresherActive(m_RefresherTimeRemaining > 0);
+		//Print(m_RefresherTimeRemaining);
+	}
+	
+	float GetRefresherTime01()
+	{
+		return m_RefresherTimeRemaining / m_FlagRefresherMaxDuration;
+	}
+	
+	void CheckLoadedVariables(int max_duration)
+	{
+		if (max_duration != m_FlagRefresherMaxDuration)
+		{
+			m_RefresherTimeRemaining = m_FlagRefresherMaxDuration * m_RefresherTimeRemaining / max_duration;
+		}
+	}
+	
+	//================================================================
+	// DEBUG
+	//================================================================	
+	/*
+	override void DebugCustomState()
+	{
+		//debug
+		m_SyncParts01 = 881;		//full fence with gate
+		m_HasHinges = true;
+		m_HasBase = true;
+		
+		OnVariablesSynchronized();
+	}
+	*/
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+
+		GetInventory().CreateInInventory("Flag_DayZ");
+		AnimateFlag(0);
+		AddRefresherTime01(1);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Watchtower.c b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Watchtower.c
new file mode 100644
index 0000000000000000000000000000000000000000..c819b6c479da86cddbaa9b14b2d5cf464b1b1b1a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BaseBuildingBase/Watchtower.c
@@ -0,0 +1,617 @@
+class Watchtower extends BaseBuildingBase
+{	
+	typename ATTACHMENT_BARBED_WIRE			= BarbedWire;
+	typename ATTACHMENT_CAMONET 			= CamoNet;
+	
+	const float MAX_FLOOR_VERTICAL_DISTANCE 		= 0.5;
+	
+	const float MIN_ACTION_DETECTION_ANGLE_RAD 		= 0.35;		//0.35 RAD = 20 DEG
+	const float MAX_ACTION_DETECTION_DISTANCE 		= 2.0;		//meters
+	
+	static const string BASE_VIEW_NAME				= "level_";
+	static const string BASE_WALL_NAME				= "_wall_";
+	static const string BASE_ROOF_NAME				= "_roof";
+	static const int	MAX_WATCHTOWER_FLOORS		= 3;
+	static const int	MAX_WATCHTOWER_WALLS		= 3;
+	
+	void Watchtower()
+	{
+	}
+	
+	override string GetConstructionKitType()
+	{
+		return "WatchtowerKit";
+	}		
+	
+	override int GetMeleeTargetType()
+	{
+		return EMeleeTargetType.NONALIGNABLE;
+	}
+	
+	/*override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		
+		if (component == -1)
+		{
+			Print("EEHitBy: " + this + "; damageType: "+ damageType +"; source: "+ source +"; component: "+ component +"; dmgZone: "+ dmgZone +"; ammo: "+ ammo +"; modelPos: "+ modelPos);
+			Print("GetDamage " + damageResult.GetDamage("","Health"));
+			Print("GetHighestDamage " + damageResult.GetHighestDamage("Health"));
+		}
+	}*/
+	
+	//overriden for the express purpose of handling view geometry (interaction) animations
+	override void UpdateVisuals()
+	{
+		super.UpdateVisuals();
+		
+		SetAnimationPhase( "level_1", 0); //always visible
+		SetAnimationPhase( "level_1_wall_1", 0); //always visible
+		SetAnimationPhase( "level_1_wall_2", 0); //always visible
+		SetAnimationPhase( "level_1_wall_3", 0); //always visible
+		
+		string part_name = "";
+		bool built = false;
+		
+		for ( int i = 1; i < MAX_WATCHTOWER_FLOORS; ++i )
+		{
+			//roof checks
+			part_name = "" + BASE_VIEW_NAME + i + BASE_ROOF_NAME;
+			built = GetConstruction().IsPartConstructed(part_name);
+			//Print(part_name);
+			//Print(built);
+			
+			//string tmp = "";
+			
+			if ( built )
+			{
+				SetAnimationPhase( BASE_VIEW_NAME + (i + 1), 0); //show
+				for ( int j = 1; j < MAX_WATCHTOWER_WALLS + 1; ++j )
+				{
+					//tmp = BASE_VIEW_NAME + (i + 1) + BASE_WALL_NAME + j;
+					//Print(tmp);
+					SetAnimationPhase( BASE_VIEW_NAME + (i + 1) + BASE_WALL_NAME + j, 0); //show
+				}
+			}
+			else
+			{
+				SetAnimationPhase( BASE_VIEW_NAME + (i + 1), 1 ); //hide
+				for ( j = 1; j < MAX_WATCHTOWER_WALLS + 1; ++j )
+				{
+					//tmp = BASE_VIEW_NAME + (i + 1) + BASE_WALL_NAME + j;
+					//Print(tmp);
+					SetAnimationPhase( BASE_VIEW_NAME + (i + 1) + BASE_WALL_NAME + j, 1); //hide
+				}
+			}
+		}
+	}
+	
+	//--- ATTACHMENT & CONDITIONS
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId )
+	{
+		if ( !super.CanReceiveAttachment( attachment, slotId ) )
+			return false;
+
+		//because CanReceiveAttachment() method can be called on all clients in the vicinity, vertical distance check needs to be skipped on clients that don't
+		//interact with the object through attach action (AT_ATTACH_TO_CONSTRUCTION)
+		PlayerBase player;
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			//check action initiator (AT_ATTACH_TO_CONSTRUCTION)
+			player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if ( player )
+			{
+				ConstructionActionData construction_action_data = player.GetConstructionActionData();
+				PlayerBase action_initiator = construction_action_data.GetActionInitiator();
+				
+				if ( action_initiator == player )			
+				{
+					construction_action_data.SetActionInitiator( NULL );				//reset action initiator
+				}
+				else
+				{
+					player = null;					//do not do vertical check (next)
+				}
+			}
+		}
+		//
+			
+		return CheckSlotVerticalDistance( slotId, player );
+	}
+	
+	//can put into hands
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanBeRepairedToPristine()
+	{
+		return true;
+	}
+	
+	override bool PerformRoofCheckForBase( string partName, PlayerBase player, out bool result )
+	{
+		if (CfgGameplayHandler.GetDisablePerformRoofCheck())
+			return false;
+		
+		if (partName != "level_1_base" && partName != "level_2_base" && partName != "level_3_base" && partName != "level_3_roof")
+		{
+			return false;
+		}
+		
+		vector center;
+		vector orientation = GetOrientation();
+		vector edge_length;
+		vector min_max[2];
+		ref array<Object> excluded_objects = new array<Object>;
+		ref array<Object> collided_objects = new array<Object>;
+		
+		excluded_objects.Insert( this );
+		excluded_objects.Insert( player );
+		
+		if ( partName == "level_2_base" )
+		{
+			min_max[0] = GetMemoryPointPos( "level_2_wall_1_down_min" );
+			min_max[1] = GetMemoryPointPos( "level_2_roof_max" );
+		}
+		else if ( partName == "level_3_base" )
+		{
+			min_max[0] = GetMemoryPointPos( "level_3_wall_1_down_min" );
+			min_max[1] = GetMemoryPointPos( "level_3_wall_2_up_max" );
+		}
+		else if ( partName == "level_3_roof" )
+		{
+			min_max[0] = GetMemoryPointPos( "level_3_roof_min" );
+			min_max[1] = GetMemoryPointPos( "level_3_roof_max" );
+		}
+		else
+		{
+			//min_max[0] = GetMemoryPointPos( "level_1_wall_1_up_min" );
+			//min_max[0] = GetMemoryPointPos( "level_1_wall_1_down_min" );
+			min_max[0] = GetMemoryPointPos( "level_1_collisioncheck_min" );
+			min_max[1] = GetMemoryPointPos( "level_1_roof_max" );
+		}
+		center = GetPosition();
+		center[1] = center[1] + ( min_max[1][1] + min_max[0][1] ) / 2;
+		
+		edge_length[0] = min_max[1][0] - min_max[0][0];
+		edge_length[2] = min_max[1][2] - min_max[0][2];
+		edge_length[1] = min_max[1][1] - min_max[0][1];
+		
+		result = false;
+		/*result = */GetGame().IsBoxCollidingGeometry( center, orientation, edge_length, ObjIntersectView, ObjIntersectGeom, excluded_objects, collided_objects );
+		if ( collided_objects.Count() > 0 )
+		{
+			foreach ( Object o : collided_objects )
+			{
+				if (Building.Cast(o))
+				{
+					result = true;
+				}
+			}
+		}
+		return true;
+	}
+	
+	// --- INVENTORY
+	override bool CanDisplayAttachmentSlot( int slot_id )
+	{
+		//super
+		if ( !super.CanDisplayAttachmentSlot( slot_id ) )
+			return false;
+
+		string slot_name = InventorySlots.GetSlotName(slot_id);
+		slot_name.ToLower();
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		//base attachments
+		if ( slot_name.Contains( "material_l1" ) || slot_name.Contains( "level_1_" ) )
+		{
+			if ( slot_name.Contains( "woodenlogs" ) )
+			{
+				return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_1", player );
+			}
+			else
+			{
+				return GetConstruction().IsPartConstructed( "level_1_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_1", player );
+			}
+		}
+		else if ( slot_name.Contains( "material_l2" ) || slot_name.Contains( "level_2_" ) )
+		{
+			if ( slot_name.Contains( "woodenlogs" ) )
+			{
+				return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+			}
+			else
+			{
+				return GetConstruction().IsPartConstructed( "level_2_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+			}
+		}
+		else if ( slot_name.Contains( "material_l3" ) || slot_name.Contains( "level_3_" ) )
+		{
+			if ( slot_name.Contains( "woodenlogs" ) )
+			{
+				return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+			}
+			else
+			{
+				return GetConstruction().IsPartConstructed( "level_3_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+			}
+		}
+				
+		return true;
+	}
+
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		//super
+		if ( !super.CanDisplayAttachmentCategory( category_name ) )
+			return false;
+		//
+	
+		category_name.ToLower();
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		//level 1
+		if ( category_name.Contains( "level_1" ) )
+		{
+			if ( category_name.Contains( "level_1_" ) )
+			{
+				return GetConstruction().IsPartConstructed( "level_1_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_1", player );
+			}
+			else
+			{
+				return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_1", player );
+			}
+		}
+		//level 2
+		if ( category_name.Contains( "level_2" ) )
+		{
+			if ( category_name.Contains( "level_2_" ) )
+			{
+				return GetConstruction().IsPartConstructed( "level_2_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+			}
+			else
+			{
+				return GetConstruction().IsPartConstructed( "level_1_roof" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+			}
+		}
+		//level 3
+		if ( category_name.Contains( "level_3" ) )
+		{
+			if ( category_name.Contains( "level_3_" ) )
+			{
+				return GetConstruction().IsPartConstructed( "level_3_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+			}
+			else
+			{
+				return GetConstruction().IsPartConstructed( "level_2_roof" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+			}
+		}
+		
+		return true;
+	}	
+	
+	//returns true if attachment slot position is within given range
+	override bool CheckSlotVerticalDistance( int slot_id, PlayerBase player )
+	{
+		string slot_name;
+		InventorySlots.GetSelectionForSlotId( slot_id , slot_name );		
+		slot_name.ToLower();
+		
+		//wall attachments
+		//level 1
+		if ( slot_name.Contains( "material_l1" ) || slot_name.Contains( "level_1_" ) )
+		{
+			if ( slot_name.Contains( "woodenlogs" ) )
+			{
+				return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_1", player );
+			}
+			else
+			{
+				return GetConstruction().IsPartConstructed( "level_1_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_1", player );
+			}
+		}
+		//level 2
+		if ( slot_name.Contains( "material_l2" ) || slot_name.Contains( "level_2_" ) )
+		{
+			if ( slot_name.Contains( "material_l2w" ) || slot_name.Contains( "level_2_wall" ) )
+			{
+				return GetConstruction().IsPartConstructed( "level_2_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+			}
+			else
+			{
+				if ( slot_name.Contains( "woodenlogs" ) )
+				{
+					return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+				}
+				else
+				{
+					return GetConstruction().IsPartConstructed( "level_1_roof" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_2", player );
+				}
+			}
+		}
+		//level 3
+		if ( slot_name.Contains( "material_l3" ) || slot_name.Contains( "level_3_" ) )
+		{
+			if ( slot_name.Contains( "material_l3w" ) || slot_name.Contains( "level_3_wall" ) )
+			{
+				return GetConstruction().IsPartConstructed( "level_3_base" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+			}
+			else
+			{
+				if ( slot_name.Contains( "woodenlogs" ) )
+				{
+					return CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+				}
+				else
+				{
+					return GetConstruction().IsPartConstructed( "level_2_roof" ) && CheckMemoryPointVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, "level_3", player );
+				}
+			}
+		}		
+	
+		return true;		
+	}
+	
+	//returns true if player->mem_point position is within given range
+	override bool CheckMemoryPointVerticalDistance( float max_dist, string selection, PlayerBase player )
+	{
+		if ( player )
+		{
+			//check vertical distance
+			vector player_pos = player.GetPosition();
+			vector pos;
+			
+			if ( MemoryPointExists( selection ) )
+			{
+				pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			}
+			
+			if ( Math.AbsFloat( player_pos[1] - pos[1] ) <= max_dist )
+			{
+				return true;
+			}
+			else
+			{
+				return false;
+			}
+		}			
+
+		return true;
+	}	
+	
+	override bool CheckLevelVerticalDistance( float max_dist, string selection, PlayerBase player )
+	{
+		if ( player )
+		{
+			if ( selection.Contains( "level_1_" ) )
+				return CheckMemoryPointVerticalDistance( max_dist, "level_1", player );
+			
+			if ( selection.Contains( "level_2_" ) )
+				return CheckMemoryPointVerticalDistance( max_dist, "level_2", player );
+			
+			if ( selection.Contains( "level_3_" ) )
+				return CheckMemoryPointVerticalDistance( max_dist, "level_3", player );
+		}
+		return false;
+	}
+	// ---	
+	override void AfterStoreLoad()
+	{
+		super.AfterStoreLoad();
+		
+		UpdateVisuals();
+	}
+	
+	override void OnPartBuiltServer( notnull Man player, string part_name, int action_id )
+	{
+		super.OnPartBuiltServer( player, part_name, action_id );
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	override void OnPartDismantledServer( notnull Man player, string part_name, int action_id )
+	{
+		super.OnPartDismantledServer( player, part_name, action_id );
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	override void OnPartDestroyedServer( Man player, string part_name, int action_id, bool destroyed_by_connected_part = false )
+	{
+		super.OnPartDestroyedServer( player, part_name, action_id );
+		//update visuals (server)
+		UpdateVisuals();
+	}
+	
+	//--- ACTION CONDITIONS
+	//returns dot product of player->construction direction based on existing/non-existing reference point
+	override bool IsFacingPlayer( PlayerBase player, string selection )
+	{
+		vector ref_pos;
+		vector ref_dir;
+		vector player_dir;
+		float dot;
+		bool has_memory_point = MemoryPointExists( selection );
+		
+		if ( has_memory_point )
+		{
+			ref_pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			ref_dir = ref_pos - GetPosition();
+		}
+		else
+		{
+			ref_pos = GetPosition();
+			ref_dir = ref_pos - player.GetPosition();
+		}
+		
+		ref_dir.Normalize();
+		ref_dir[1] = 0;				//ignore height
+		
+		player_dir = player.GetDirection();
+		player_dir.Normalize();
+		player_dir[1] = 0;			//ignore height
+		
+		if ( ref_dir.Length() != 0 )
+		{
+			dot = vector.Dot( player_dir, ref_dir );
+		}
+		
+		if ( has_memory_point )
+		{
+			if ( dot < 0 && Math.AbsFloat( dot ) > MIN_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+		else
+		{
+			if ( dot > 0 && Math.AbsFloat( dot ) > MIN_ACTION_DETECTION_ANGLE_RAD )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+		
+	override bool IsFacingCamera( string selection )
+	{
+		vector ref_pos;
+		vector ref_dir;
+		vector cam_dir = GetGame().GetCurrentCameraDirection();
+		
+		if ( MemoryPointExists( selection ) )
+		{
+			ref_pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			ref_dir = ref_pos - GetPosition();
+			
+			ref_dir.Normalize();
+			ref_dir[1] = 0;		//ignore height
+			
+			cam_dir[1] = 0;		//ignore height
+			
+			if ( ref_dir.Length() > 0.5 )		//if the distance (m) is too low, ignore this check
+			{
+				float dot = vector.Dot( cam_dir, ref_dir );
+			
+				if ( dot < 0 )	
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+	
+	override bool IsPlayerInside( PlayerBase player, string selection )
+	{
+		if ( selection != "")
+		{
+			CheckLevelVerticalDistance( MAX_FLOOR_VERTICAL_DISTANCE, selection, player );
+		}
+		vector player_pos = player.GetPosition();
+		vector tower_pos = GetPosition();
+		vector ref_dir = GetDirection();
+		ref_dir[1] = 0;
+		ref_dir.Normalize();
+		
+		vector min,max;
+		
+		min = -GetMemoryPointPos( "interact_min" );
+		max = -GetMemoryPointPos( "interact_max" );
+		
+		vector dir_to_tower = tower_pos - player_pos;
+		dir_to_tower[1] = 0;
+		float len = dir_to_tower.Length();
+		
+
+		dir_to_tower.Normalize();
+		
+		vector ref_dir_angle = ref_dir.VectorToAngles();
+		vector dir_to_tower_angle = dir_to_tower.VectorToAngles();
+		vector test_angles = dir_to_tower_angle - ref_dir_angle;
+		
+		vector test_position = test_angles.AnglesToVector() * len;
+		
+		if (test_position[0] > max[0] || test_position[0] < min[0] || test_position[2] > max[2] || test_position[2] < min[2] )
+		{
+			return false;
+		}
+
+		return true;
+	}
+	
+	override bool HasProperDistance( string selection, PlayerBase player )
+	{
+		if ( MemoryPointExists( selection ) )
+		{
+			vector selection_pos = ModelToWorld( GetMemoryPointPos( selection ) );
+			float distance = vector.Distance( selection_pos, player.GetPosition() );
+			if ( distance >= MAX_ACTION_DETECTION_DISTANCE )
+			{
+				return false;
+			}
+		}
+			
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPlaceObject);
+		AddAction(ActionFoldBaseBuildingObject);
+	}	
+	
+		
+	//================================================================
+	// DEBUG
+	//================================================================
+	
+	//! Excludes certain parts from being built by OnDebugSpawn, uses Contains to compare
+	override array<string> OnDebugSpawnBuildExcludes()
+	{
+		array<string> excludes;
+		
+		#ifdef DIAG_DEVELOPER
+		bool bWood = DiagMenu.GetBool(DiagMenuIDs.BASEBUILDING_WOOD);
+		#else
+		bool bWood = false;
+		#endif
+		
+		if (bWood)
+		{
+			excludes = {"_metal_"};
+		}
+		else
+		{
+			excludes = {"_wood_"};
+		}
+		
+		return excludes;
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		super.OnDebugSpawn();
+		
+		int i;
+				
+		for (i = 0; i < MAX_WATCHTOWER_FLOORS * MAX_WATCHTOWER_WALLS; ++i)
+		{
+			GetInventory().CreateInInventory("CamoNet");		
+		}	
+		
+		for (i = 0; i < 2 * MAX_WATCHTOWER_WALLS; ++i)
+		{
+			BarbedWire wire = BarbedWire.Cast(GetInventory().CreateInInventory("BarbedWire"));		
+			wire.SetMountedState(true);
+		}
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BaseballBat.c b/scripts/4_World/DayZ/Entities/ItemBase/BaseballBat.c
new file mode 100644
index 0000000000000000000000000000000000000000..a2f067947ffbe08ef3d6c5ff80b69faceed9d1d6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BaseballBat.c
@@ -0,0 +1,3 @@
+class BaseballBat extends Inventory_Base
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Battery9V.c b/scripts/4_World/DayZ/Entities/ItemBase/Battery9V.c
new file mode 100644
index 0000000000000000000000000000000000000000..95b37690defa7141abd1ccd605abce3fcaba5786
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Battery9V.c
@@ -0,0 +1,68 @@
+class Battery9V : ItemBase
+{
+	private int				m_Efficiency0To10; // Synchronized variable
+	static private float 	m_EfficiencyDecayStart = 0.1; // At this % of maximum energy the output of the battery starts to weaken.
+	
+	void Battery9V()
+	{
+		m_Efficiency0To10 = 10;
+		RegisterNetSyncVariableInt("m_Efficiency0To10");
+	}
+	
+	//! Returns efficiency of this battery. The value is synchronized from server to all clients and is accurate down to 0.1 units.
+	float GetEfficiency0To1()
+	{
+		return m_Efficiency0To10 / 10;
+	}
+	
+	//! Returns efficiency of this battery. The value is synchronized from server to all clients and is accurate down to 0.1 unit.
+	float GetEfficiencyDecayStart()
+	{
+		return m_EfficiencyDecayStart;
+	}
+	
+	
+	override void OnEnergyConsumed()
+	{
+		super.OnEnergyConsumed();
+		
+		if (GetGame().IsServer())
+		{
+			float energyCoef = GetCompEM().GetEnergy0To1();
+			
+			if (energyCoef < m_EfficiencyDecayStart && m_EfficiencyDecayStart > 0)
+			{
+				m_Efficiency0To10 = Math.Round((energyCoef / m_EfficiencyDecayStart) * 10);
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	// Not needed right now, but it will be useful if we add rechargable batteries.
+	override void OnEnergyAdded()
+	{
+		super.OnEnergyAdded();
+		
+		if (GetGame().IsServer())
+		{
+			float energyCoef = GetCompEM().GetEnergy0To1();
+			if (energyCoef < m_EfficiencyDecayStart && m_EfficiencyDecayStart > 0)
+			{
+				m_Efficiency0To10 = Math.Round((energyCoef / m_EfficiencyDecayStart) * 10);
+				SetSynchDirty();
+			}
+			else
+			{
+				m_Efficiency0To10 = 10;
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionMeasureBattery);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BatteryCharger.c b/scripts/4_World/DayZ/Entities/ItemBase/BatteryCharger.c
new file mode 100644
index 0000000000000000000000000000000000000000..c049cde0006075dd7e0e63c4b21fbf53484c389d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BatteryCharger.c
@@ -0,0 +1,449 @@
+class BatteryCharger extends ItemBase
+{
+	// Model selections
+	static protected const string SEL_CLIPS_CAR			= "clips_car_battery";
+	static protected const string SEL_CLIPS_TRUCK		= "clips_truck_battery";
+	static protected const string SEL_CLIPS_DETACHED	= "clips_detached";
+	static protected const string SEL_CLIPS_FOLDED		= "clips_folded";
+	static protected const string SEL_SWITCH_ON			= "switch_on";
+	static protected const string SEL_SWITCH_OFF		= "switch_off";
+	static protected const string SEL_CORD_PLUGGED		= "cord_plugged";
+	static protected const string SEL_CORD_FOLDED		= "cord_folded";
+	static protected const string SEL_LIGHT_STATE_1		= "light_stand_by";
+	static protected const string SEL_LIGHT_STATE_2		= "light_charging";
+	static protected const string SEL_LIGHT_STATE_3		= "light_charged";
+	
+	// glow materials
+	static protected const string RED_LIGHT_GLOW		= "dz\\gear\\camping\\data\\battery_charger_light_r.rvmat";
+	static protected const string GREEN_LIGHT_GLOW		= "dz\\gear\\camping\\data\\battery_charger_light_g.rvmat";
+	static protected const string YELLOW_LIGHT_GLOW		= "dz\\gear\\camping\\data\\battery_charger_light_y.rvmat";
+	static protected const string SWITCH_LIGHT_GLOW		= "dz\\gear\\camping\\data\\battery_charger_light_switch_on.rvmat";
+	static protected const string DEFAULT_MATERIAL 		= "dz\\gear\\camping\\data\\battery_charger.rvmat";
+	
+	protected const string 	ATTACHED_CLIPS_STATES[] 		= {SEL_CLIPS_CAR, SEL_CLIPS_TRUCK}; // TO DO: If it's required by design, add helicopter battery here and register its selection names.
+	protected const int 	ATTACHED_CLIPS_STATES_COUNT		= 2; // Reffers to this ^ array
+	
+	
+	
+	int 						m_BatteryEnergy0To100;
+	protected float 			m_ChargeEnergyPerSecond;
+	
+	static protected 	float 	m_BlinkingStatusLightInterval = 0.4; // How often the lights blink
+	ref 				Timer 	m_UpdateStatusLightsTimer;
+	protected 			bool 	m_BlinkingStatusLightIsOn = false;	// Status of one blinking light
+	
+	void BatteryCharger()
+	{
+		m_ChargeEnergyPerSecond = GetGame().ConfigGetFloat ("CfgVehicles " + GetType() + " ChargeEnergyPerSecond");
+		m_UpdateStatusLightsTimer = new Timer( CALL_CATEGORY_SYSTEM );
+		SwitchLightOff();
+		RegisterNetSyncVariableInt("m_BatteryEnergy0To100");
+		RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+		RegisterNetSyncVariableBool("m_IsPlaceSound");
+	}
+	
+	override bool IsElectricAppliance()
+	{
+		return true;
+	}
+
+	override void OnWork( float consumed_energy )
+	{
+		// Charging functionality
+		ItemBase battery = ItemBase.Cast( GetCompEM().GetPluggedDevice() );
+		
+		if ( battery )
+		{
+			if ( GetGame().IsServer() )
+			{
+				float battery_capacity = battery.GetCompEM().GetEnergyMax();
+				
+				if ( battery.GetCompEM().GetEnergy() < battery_capacity )
+				{
+					// Heat up the items so players know they are working.
+					this.SetTemperature(60); 
+					battery.SetTemperature(60);
+					
+					float charger_health = GetHealth("", "");
+					float energy_add = m_ChargeEnergyPerSecond * ( consumed_energy / GetCompEM().GetEnergyUsage() );
+					
+					#ifdef DIAG_DEVELOPER
+					if (FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.ENERGY_RECHARGE))
+					{
+						float timeAccel = FeatureTimeAccel.GetFeatureTimeAccelValue();
+						energy_add *= timeAccel;
+					}
+					#endif
+					
+					if ( GetCompEM().ConsumeEnergy(energy_add) ) // consumes energy from the power source
+					{
+						// There is enough of energy to use
+						energy_add = energy_add * ( 0.5 + charger_health*0.005 ); // Damaged charger works less efficiently - 50% damage causes 75% efficiency
+					}
+					else
+					{
+						// There is NOT enough of energy to use
+						energy_add = 0;
+					}
+					
+					battery.GetCompEM().AddEnergy( energy_add );
+				}
+				else
+				{
+					battery.GetCompEM().SetEnergy( battery_capacity );
+				}
+				m_BatteryEnergy0To100 = battery.GetCompEM().GetEnergy0To100();
+				SetSynchDirty();
+			}
+		}
+	}
+
+	override void OnWorkStart()
+	{
+		if ( GetGame().IsClient()  ||  !GetGame().IsMultiplayer() )
+		{
+			UpdateStatusLights();
+			m_UpdateStatusLightsTimer.Run( m_BlinkingStatusLightInterval/2 , this, "UpdateStatusLights", NULL, true);
+		}
+	}
+		
+	override void OnWorkStop()
+	{
+		if ( GetGame().IsClient()  ||  !GetGame().IsMultiplayer() )
+		{
+			UpdateStatusLights();
+			m_UpdateStatusLightsTimer.Stop();
+		}
+	}
+	
+	void UpdateStatusLights()
+	{
+		if ( GetGame().IsClient()  ||  !GetGame().IsMultiplayer() )
+		{
+			if (GetCompEM().IsWorking())
+			{
+				SwitchLightOn();
+				ItemBase battery = ItemBase.Cast( GetCompEM().GetPluggedDevice() );
+				
+				if (battery)
+				{
+					RedLightOff();
+					
+					if (m_BatteryEnergy0To100 <= 33)
+					{
+						// Less than 1/3 charged, yellow status light must repeatedly blink
+						
+						if (m_BlinkingStatusLightIsOn)
+							YellowLightOn();
+						else
+							YellowLightOff();
+						
+						m_BlinkingStatusLightIsOn = !m_BlinkingStatusLightIsOn;
+					}
+					else if (m_BatteryEnergy0To100 > 33  &&  m_BatteryEnergy0To100 <= 66)
+					{
+						// Less than 2/3 charged, yellow status light must glow
+						
+						YellowLightOn();
+					}
+					else if (m_BatteryEnergy0To100 > 66  &&  m_BatteryEnergy0To100 < 100)
+					{
+						// Less than 3/3 charged, yellow status light must glow, green light must blink
+						
+						YellowLightOn();
+						
+						if (m_BlinkingStatusLightIsOn)
+							GreenLightOn();
+						else
+							GreenLightOff();
+						
+						m_BlinkingStatusLightIsOn = !m_BlinkingStatusLightIsOn;
+					}
+					else if (m_BatteryEnergy0To100 >= 100)
+					{
+						// Fully charged, green light must glow
+						YellowLightOff();
+						GreenLightOn();
+					}
+				}
+				else
+				{
+					if (m_BlinkingStatusLightIsOn)
+						RedLightOn();
+					else
+						RedLightOff();
+					
+					m_BlinkingStatusLightIsOn = !m_BlinkingStatusLightIsOn;
+					
+					GreenLightOff();
+					YellowLightOff();
+				}
+			}
+			else
+			{
+				SwitchLightOff();
+				GreenLightOff();
+				RedLightOff();
+				YellowLightOff();
+			}
+		}
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}
+		// No "Take" action if the item is connected
+		if ( !GetCompEM().IsPlugged()  &&  !GetCompEM().GetPluggedDevice() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override bool CanPutIntoHands( EntityAI player ) 
+	{
+		if( !super.CanPutIntoHands( parent ) )
+		{
+			return false;
+		}
+		// No "Take into hands" action if the item is connected
+		if ( !GetCompEM().IsPlugged()  &&  !GetCompEM().GetPluggedDevice() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override void OnOwnSocketTaken( EntityAI device )
+	{
+		string att_type = device.GetType();
+		
+		if ( att_type == "CarBattery" )
+		{
+			HideAttachedClipsStates();
+			ShowSelection(SEL_CLIPS_CAR);
+		}
+		
+		if ( att_type == "TruckBattery" )
+		{
+			HideAttachedClipsStates();
+			ShowSelection(SEL_CLIPS_TRUCK);
+		}
+		
+		HideSelection(SEL_CLIPS_DETACHED);
+		HideSelection(SEL_CLIPS_FOLDED);
+	}
+
+	override void OnOwnSocketReleased( EntityAI device )
+	{
+		HideAttachedClipsStates();
+		ShowSelection(SEL_CLIPS_DETACHED);
+	}
+
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId ) 
+	{
+		if ( !super.CanReceiveAttachment(attachment, slotId) )
+			return false;
+		
+		ItemBase ibase;
+		Class.CastTo(ibase, attachment);
+		
+		// No attaching if the charger is in inventory!
+		PlayerBase charger_owner = PlayerBase.Cast( GetHierarchyRootPlayer() );
+		if ( charger_owner )
+			return false;
+		
+		// Only one attachment allowed
+		if ( GetCompEM().GetPluggedDevice() )
+			return false;
+		
+		if ( ibase.HasEnergyManager()  &&  ibase.GetCompEM().GetPluggedDevicesCount() >= 1 ) // Make sure nothing is plugged into the battery
+			return false;
+		
+		return true;
+	}
+	
+	override bool CanLoadAttachment( EntityAI attachment) 
+	{
+		if ( !super.CanLoadAttachment(attachment) )
+			return false;
+		
+		ItemBase ibase;
+		Class.CastTo(ibase, attachment);
+		
+		// Only one attachment allowed
+		if ( GetCompEM().GetPluggedDevice() )
+			return false;
+		
+		if ( ibase.HasEnergyManager()  &&  ibase.GetCompEM().GetPluggedDevicesCount() >= 1 ) // Make sure nothing is plugged into the battery
+			return false;
+		
+		return true;
+	}
+	
+	void HideAttachedClipsStates()
+	{
+		for ( int i = 0; i < ATTACHED_CLIPS_STATES_COUNT; i++ )
+		{
+			string selection = ATTACHED_CLIPS_STATES[i];
+			HideSelection(selection);
+		}
+	}
+	
+	
+	
+	// Control of status lights
+	// ON
+	void RedLightOn()
+	{
+		SetObjectMaterial( 0, RED_LIGHT_GLOW );
+	}
+	void GreenLightOn()
+	{
+		SetObjectMaterial( 2, GREEN_LIGHT_GLOW );
+	}
+	void YellowLightOn()
+	{
+		SetObjectMaterial( 1, YELLOW_LIGHT_GLOW );
+	}
+	void SwitchLightOn()
+	{
+		SetObjectMaterial( 3, SWITCH_LIGHT_GLOW );
+	}
+	// OFF
+	void RedLightOff()
+	{
+		SetObjectMaterial( 0, DEFAULT_MATERIAL );
+	}
+	void GreenLightOff()
+	{
+		SetObjectMaterial( 2, DEFAULT_MATERIAL );
+	}
+	void YellowLightOff()
+	{
+		SetObjectMaterial( 1, DEFAULT_MATERIAL );
+	}
+	void SwitchLightOff()
+	{
+		SetObjectMaterial( 3, DEFAULT_MATERIAL );
+	}
+	
+	
+	override void OnSwitchOn()
+	{
+		HideSelection(SEL_SWITCH_OFF);
+		ShowSelection(SEL_SWITCH_ON);
+	}
+	
+	override void OnSwitchOff()
+	{
+		HideSelection(SEL_SWITCH_ON);
+		ShowSelection(SEL_SWITCH_OFF);
+	}
+	
+	// Inventory manipulation
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		HideAttachedClipsStates();
+		HideSelection(SEL_CLIPS_FOLDED);
+		ShowSelection(SEL_CLIPS_DETACHED);
+	}
+	
+	override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+		
+		HideAttachedClipsStates();
+		HideSelection(SEL_CLIPS_DETACHED);
+		ShowSelection(SEL_CLIPS_FOLDED);
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+				
+		if ( IsPlaceSound() )
+		{
+			PlayPlaceSound();
+		}
+	}
+	
+	override void RefreshPhysics()
+	{
+		super.RefreshPhysics();
+		
+		if ( GetAttachmentByType(CarBattery) )
+		{
+			RemoveProxyPhysics( "battery" );
+			AddProxyPhysics( "battery" );
+		}
+		else
+			RemoveProxyPhysics( "battery" );
+	}
+		
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementStarted(Man player)
+	{	
+		super.OnPlacementStarted(player);
+		
+		SetAnimationPhase(SEL_CLIPS_DETACHED, 0);
+		SetAnimationPhase(SEL_CLIPS_FOLDED, 1);
+		SetAnimationPhase(SEL_SWITCH_ON, 1);
+		SetAnimationPhase(SEL_SWITCH_OFF, 1);
+		SetAnimationPhase(SEL_LIGHT_STATE_1, 1);
+		SetAnimationPhase(SEL_LIGHT_STATE_2, 1);
+		SetAnimationPhase(SEL_LIGHT_STATE_3, 1);
+	
+		array<string> selections = {
+			SEL_CORD_PLUGGED,
+			SEL_CORD_FOLDED,
+			SEL_CLIPS_DETACHED,
+			SEL_CLIPS_FOLDED
+		};
+		
+		PlayerBase playerPB = PlayerBase.Cast(player);
+		foreach (string selection : selections)
+		{		
+			if (GetGame().IsMultiplayer() && GetGame().IsServer())
+				playerPB.GetHologramServer().SetSelectionToRefresh(selection);		
+			else
+				playerPB.GetHologramLocal().SetSelectionToRefresh(selection);
+		}
+	}
+	
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+			
+		SetIsPlaceSound( true );
+	}
+	
+	override bool IsDeployable()
+	{
+		return true;
+	}
+	
+	override string GetPlaceSoundset()
+	{
+		return "placeBatteryCharger_SoundSet";
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionPlugIn);
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionUnplugThisByCord);
+		AddAction(ActionTurnOnWhileOnGround);		
+		AddAction(ActionTurnOffWhileOnGround);
+		AddAction(ActionPlaceObject);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BinocularsBase.c b/scripts/4_World/DayZ/Entities/ItemBase/BinocularsBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f752b74abd8b567b89632c89e9ebae0ea0b3e508
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BinocularsBase.c
@@ -0,0 +1,10 @@
+class BinocularsBase extends Weapon
+{	
+	/**
+	\brief Returns number of slots for attachments corrected for weapons
+	*/
+	override int GetSlotsCountCorrect()
+	{
+		return GetInventory().GetAttachmentSlotsCount();
+	};
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagEmpty.c b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagEmpty.c
new file mode 100644
index 0000000000000000000000000000000000000000..87595eadab221ae2a8d1532cb29533df8c925535
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagEmpty.c
@@ -0,0 +1,10 @@
+class BloodBagEmpty extends BloodContainerBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCollectBloodTarget);
+		AddAction(ActionCollectBloodSelf);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagFull.c b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagFull.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8f530efa8456cb530ed2723f6130b5af7b93629
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagFull.c
@@ -0,0 +1,7 @@
+class BloodBagFull extends BloodContainerBase
+{
+	void BloodBagFull()
+	{
+	
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagIV.c b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagIV.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ae2883a86337ee6bf268aaf4d56675fb3ed70a1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodBagIV.c
@@ -0,0 +1,10 @@
+class BloodBagIV extends BloodContainerBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionGiveBloodTarget);
+		AddAction(ActionGiveBloodSelf);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodContainerBase.c b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodContainerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..8688db2825d8bb5466b668cdf1c387076ab80660
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodContainerBase.c
@@ -0,0 +1,44 @@
+class BloodContainerBase extends ItemBase
+{
+	private bool m_IsBloodTypeVisible = false;
+	
+	void BloodContainerBase()
+	{
+		RegisterNetSyncVariableBool("m_IsBloodTypeVisible");
+	}
+	
+	override bool IsBloodContainer()
+	{
+		return true;
+	}
+	
+	void SetBloodTypeVisible( bool visible )
+	{
+		m_IsBloodTypeVisible = visible;
+		SetSynchDirty();
+	}
+	
+	bool GetBloodTypeVisible()
+	{
+		return m_IsBloodTypeVisible;
+	}	
+	
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{
+		super.OnStoreSave(ctx);
+
+		ctx.Write( m_IsBloodTypeVisible );
+	}
+
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+
+		bool is_blood_type_visible = false;
+		ctx.Read( is_blood_type_visible );
+		SetBloodTypeVisible( is_blood_type_visible );
+		
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodSyringe.c b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodSyringe.c
new file mode 100644
index 0000000000000000000000000000000000000000..dc0256b92853721c7ee7f84eb1ea4caa1fb3b49f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/BloodSyringe.c
@@ -0,0 +1,10 @@
+class BloodSyringe extends BloodContainerBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionGiveBloodTarget);
+		AddAction(ActionGiveBloodSelf);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/Syringe.c b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/Syringe.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ebcbb20b9edae5d472f6ad4448f4306c08d944c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BloodContainerBase/Syringe.c
@@ -0,0 +1,10 @@
+class Syringe extends BloodContainerBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCollectSampleTarget);
+		AddAction(ActionCollectSampleSelf);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Blowtorch.c b/scripts/4_World/DayZ/Entities/ItemBase/Blowtorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..fbd54606d8b8d90e6d7e341f8db3b8377815c911
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Blowtorch.c
@@ -0,0 +1,138 @@
+class Blowtorch extends ItemBase
+{
+	const string TEXTURE_FLAME 		= "dz\\gear\\cooking\\data\\flame_butane_ca.paa";
+	const string ANIM_PHASE_FLAME	= "FlameHide";
+	const string SOUND_BURNING 		= "Blowtorch_Loop_SoundSet";
+	
+	protected BlowtorchLight	m_Light;
+	
+	protected EffectSound 		m_SoundBurningLoop;
+
+	override void OnWorkStart()
+	{
+		super.OnWorkStart();
+
+		#ifndef SERVER
+		m_Light = BlowtorchLight.Cast(ScriptedLightBase.CreateLight(BlowtorchLight, "0 0 0"));
+		m_Light.AttachOnMemoryPoint(this, "light");
+		#endif
+
+		RefreshFlameVisual(true);
+		SoundBurningStart();
+	}
+	
+	override void OnWorkStop()
+	{
+		#ifndef SERVER
+		if (m_Light)
+		{
+			m_Light.FadeOut();
+		}
+		#endif
+		
+		RefreshFlameVisual(false);
+		SoundBurningStop();
+	}
+	
+	protected void RefreshFlameVisual(bool working = false)
+	{
+	    if (working)
+	    {
+	        SetObjectTexture(0, TEXTURE_FLAME);
+	        SetAnimationPhase(ANIM_PHASE_FLAME, 0.0);
+	    }
+	    else
+	    {
+	        SetObjectTexture(0, "");
+	        SetAnimationPhase(ANIM_PHASE_FLAME, 1.0);
+	    }
+	}
+	
+	protected void SoundBurningStart()
+	{
+		PlaySoundSetLoop(m_SoundBurningLoop, SOUND_BURNING, 0.1, 0.0);
+	}
+	
+	protected void SoundBurningStop()
+	{
+		StopSoundSet(m_SoundBurningLoop);
+	}	
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+		{
+			return false;
+		}
+
+		return !GetCompEM().IsSwitchedOn();
+	}
+	
+	override bool CanRemoveFromCargo(EntityAI parent)
+	{
+		return true;
+	}
+	
+	override bool IsIgnited()
+	{
+		return GetCompEM().IsWorking();
+	}
+	
+	override void OnIgnitedTarget(EntityAI ignited_item)
+	{
+		if (GetGame().IsServer())
+		{
+			if (GetGasCanister())
+			{
+				ComponentEnergyManager canisterEM = GetGasCanister().GetCompEM();
+				if (canisterEM)
+					canisterEM.AddEnergy(-1 * (GetCompEM().GetEnergyUsage() * UATimeSpent.FIREPLACE_IGNITE));
+			}
+		}
+	}
+	
+	override bool CanIgniteItem(EntityAI ignite_target = NULL)
+	{
+		return ignite_target.CanBeIgnitedBy(this);
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionLightItemOnFireWithBlowtorch);
+		AddAction(ActionRepairCarEngineWithBlowtorch);
+		AddAction(ActionRepairCarChassisWithBlowtorch);
+		AddAction(ActionRepairCarPartWithBlowtorch);
+		AddAction(ActionRepairItemWithBlowtorch);
+	}
+	
+	protected EntityAI GetGasCanister()
+	{
+		if (GetInventory().AttachmentCount() != 0)
+		{
+			return GetInventory().GetAttachmentFromIndex(0);
+		}
+		
+		return null;
+	}
+	
+	bool HasEnoughEnergyForRepair(float pTime)
+	{
+		if (GetGasCanister())
+		{
+			ComponentEnergyManager canisterEM = GetGasCanister().GetCompEM();
+			if (canisterEM)
+			{
+				return canisterEM.GetEnergy() > GetCompEM().GetEnergyUsage() * pTime;
+			}
+		}
+		
+		return false;
+	}
+	
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateInInventory("LargeGasCanister");
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BoneKnife.c b/scripts/4_World/DayZ/Entities/ItemBase/BoneKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..0f7358679601172186f3cc05fc44dd048b91079c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BoneKnife.c
@@ -0,0 +1,24 @@
+class BoneKnife extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionDigWorms);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/BrassKnuckles_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/BrassKnuckles_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e56dc540c44a52023e7daaaa53a534553fa8980f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/BrassKnuckles_ColorBase.c
@@ -0,0 +1,3 @@
+class BrassKnuckles_ColorBase extends Inventory_Base
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CableReel.c b/scripts/4_World/DayZ/Entities/ItemBase/CableReel.c
new file mode 100644
index 0000000000000000000000000000000000000000..259700c990d2fc4441fbd75a933635dba5225415
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CableReel.c
@@ -0,0 +1,143 @@
+class CableReel extends ItemBase
+{
+	bool m_ForceIntoHands;
+
+	static const string SEL_CORD_FOLDED 			= "cord_folded";
+	static const string SEL_CORD_PLUGGED 			= "cord_plugged";
+	
+	void CableReel () 
+	{
+		m_ForceIntoHands = false;
+		RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+		RegisterNetSyncVariableBool("m_IsPlaceSound");
+	}
+	
+	override bool IsElectricAppliance()
+	{
+		return true;
+	}
+	
+	void ForceIntoHandsNow( PlayerBase player ) 
+	{
+		m_ForceIntoHands = true;
+		player.LocalTakeEntityToHands(this); // Local, because ForceIntoHandsNow is executed on both, Client and Server
+		m_ForceIntoHands = false;
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo(parent) ) {return false;}
+		EntityAI owner_EAI = GetHierarchyParent();
+		if ( owner_EAI  &&  owner_EAI.IsKindOf("Fence"))
+		{
+			return true;
+		}
+		
+		bool allow_into_inv = !GetCompEM().IsPlugged();
+		return allow_into_inv;
+	}
+
+	override bool CanPutIntoHands ( EntityAI player ) 
+	{
+		if ( !super.CanPutIntoHands( parent ) )
+		{
+			return false;
+		}
+		if ( m_ForceIntoHands )
+		{
+			return true;
+		}
+		else
+		{
+			EntityAI owner_EAI = GetHierarchyParent();
+			if ( owner_EAI  &&  owner_EAI.IsKindOf("Fence"))
+			{
+				return true;
+			}
+		}
+		
+		return true;
+	}
+
+	// Event called on item when it is placed in the player(Man) inventory, passes the owner as a parameter
+	override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+		
+		PlayerBase player_PB;
+		Class.CastTo(player_PB, player);
+		if (player_PB.GetItemInHands() == this && GetCompEM().IsPlugged())
+		{
+			//player_PB.TogglePlacingLocal();
+			return;
+		}
+		
+		GetCompEM().UnplugAllDevices();		
+		
+		if (!player_PB.IsPlacingLocal())
+			GetCompEM().UnplugThis();
+	}
+	
+	override bool CanRemoveFromHands( EntityAI player ) 
+	{
+		return true;
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+						
+		if ( IsPlaceSound() )
+		{
+			PlayPlaceSound();
+		}
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementStarted(Man player)
+	{
+		super.OnPlacementStarted(player);
+
+		array<string> selections = {
+			SEL_CORD_PLUGGED,
+			SEL_CORD_FOLDED
+		};
+		
+		PlayerBase playerPB = PlayerBase.Cast(player);
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			playerPB.GetHologramServer().SetSelectionToRefresh(selections);		
+		else
+			if (playerPB.GetHologramLocal())
+				playerPB.GetHologramLocal().SetSelectionToRefresh(selections);
+	}
+	
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+		
+		SetIsPlaceSound( true );
+	}
+	
+	override string GetPlaceSoundset()
+	{
+		return "placeCableReel_SoundSet";
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		RemoveAction(ActionTakeItemToHands);
+		
+		AddAction(ActionPlugIn);
+		AddAction(ActionPlugTargetIntoThis);
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPullOutPlug);
+		AddAction(ActionUnplugThisByCord);
+		AddAction(ActionRepositionPluggedItem);
+		AddAction(ActionPlaceObject);
+		AddAction(ActionTakeItemToHands);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CamoNet.c b/scripts/4_World/DayZ/Entities/ItemBase/CamoNet.c
new file mode 100644
index 0000000000000000000000000000000000000000..c6c67d178ec579d8e72ef571309ac726d8adf449
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CamoNet.c
@@ -0,0 +1,11 @@
+class CamoNet extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachOnTentProxy); //tents
+		AddAction(ActionAttachOnSelection); //basebuilding
+		AddAction(ActionAttachToConstruction); //basebuilding 
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CattleProd.c b/scripts/4_World/DayZ/Entities/ItemBase/CattleProd.c
new file mode 100644
index 0000000000000000000000000000000000000000..9196fca3bc4578203629f7068e47fbc4c77bfcbc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CattleProd.c
@@ -0,0 +1,51 @@
+class CattleProd : ItemBase
+{
+	protected int m_MeleeMode;
+	protected int m_MeleeHeavyMode;
+	protected int m_MeleeSprintMode;
+
+	void CattleProd()
+	{
+		m_MeleeMode = 0;
+		m_MeleeHeavyMode = 1;
+		m_MeleeSprintMode = 2;
+	}
+
+	override void OnWorkStart()
+	{
+		//! melee modes in cfg (switched on state)
+		m_MeleeMode = 3;
+		m_MeleeHeavyMode = 4;
+		m_MeleeSprintMode = 5;
+	}
+	
+	override void OnWorkStop()
+	{
+		//! melee modes in cfg (switched off state)
+		m_MeleeMode = 0;
+		m_MeleeHeavyMode = 1;
+		m_MeleeSprintMode = 2;
+	}
+	
+	override int GetMeleeMode()
+	{
+		return m_MeleeMode;
+	}
+
+	override int GetMeleeHeavyMode()
+	{
+		return m_MeleeHeavyMode;
+	}
+	
+	override int GetMeleeSprintMode()
+	{
+		return m_MeleeSprintMode;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionTurnOnWhileInHands);
+		AddAction(ActionTurnOffWhileInHands);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/ChemLight.c b/scripts/4_World/DayZ/Entities/ItemBase/ChemLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d818453eecbe537b3dcdd40c5cbe536bf4437aa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/ChemLight.c
@@ -0,0 +1,206 @@
+class Chemlight_ColorBase : ItemBase
+{
+	string 					m_DefaultMaterial;
+	string 					m_GlowMaterial;
+	
+	ChemlightLight 			m_Light;
+	
+	private int				m_Efficiency0To10; // Synchronized variable
+	static private float 	m_EfficiencyDecayStart = 0.05; // At this % of maximum energy the output of the light starts to weaken.
+	
+	//! Returns efficiency. The value is synchronized from server to all clients and is accurate down to 0.1 units.
+	float GetEfficiency0To1()
+	{
+		return m_Efficiency0To10 / 10;
+	}
+	
+	//! Returns efficiency. The value is synchronized from server to all clients and is accurate down to 0.1 units.
+	float GetEfficiencyDecayStart()
+	{
+		return m_EfficiencyDecayStart;
+	}
+	
+	override void OnEnergyConsumed()
+	{
+		super.OnEnergyConsumed();
+		
+		if ( GetGame().IsServer() )
+		{
+			float energy_coef = GetCompEM().GetEnergy0To1();
+			
+			if ( energy_coef < m_EfficiencyDecayStart  &&  m_EfficiencyDecayStart > 0 )
+			{
+				m_Efficiency0To10 = Math.Round(  (energy_coef / m_EfficiencyDecayStart) * 10  );
+				SetSynchDirty();
+			}
+		}
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		SetObjectMaterial( 0, GetMaterialForDamageState(GetCompEM().IsWorking(),newLevel) );
+	}
+	
+	void Chemlight_ColorBase()
+	{
+		//materials
+		array<string> config_materials	= GetHiddenSelectionsMaterials();
+
+		if (config_materials.Count() == 2)
+		{
+			m_DefaultMaterial = config_materials[0];
+			m_GlowMaterial = config_materials[1];
+		}
+		else
+		{
+			string error = "Error! Item " + GetType() + " must have 2 entries in config array hiddenSelectionsMaterials[]. One for the default state, the other one for the glowing state. Currently it has " + config_materials.Count() + ".";
+			Error(error);
+		}
+		
+		m_Efficiency0To10 = 10;
+		RegisterNetSyncVariableInt("m_Efficiency0To10");
+	}
+	
+	void CreateLight()
+	{
+		SetObjectMaterial( 0, GetMaterialForDamageState(true) ); // must be server side!
+		
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			m_Light = ChemlightLight.Cast( ScriptedLightBase.CreateLight( ChemlightLight, "0 0 0") );
+			m_Light.AttachOnMemoryPoint(this, "light");
+			
+			string type = GetType();
+			
+			switch( type )
+			{
+				case "Chemlight_White": 
+					m_Light.SetColorToWhite();
+					break;
+				case "Chemlight_Red": 
+					m_Light.SetColorToRed();
+					break;
+				case "Chemlight_Green": 
+					m_Light.SetColorToGreen();
+					break;
+				case "Chemlight_Blue": 
+					m_Light.SetColorToBlue();
+					break;
+				case "Chemlight_Yellow": 
+					m_Light.SetColorToYellow();
+					break;
+					
+				default: { m_Light.SetColorToWhite(); };
+			}
+		}
+	}
+	
+	override void OnWorkStart()
+	{
+		
+	}
+	
+	// Inventory manipulation
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		StandUp();
+	}
+	
+	void StandUp()
+	{
+		if ( GetGame().IsServer()  &&  GetCompEM().IsWorking() )
+		{
+			vector ori_rotate = "0 0 0";
+			SetOrientation(ori_rotate);
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		SetObjectMaterial( 0, GetMaterialForDamageState(false) );
+		
+		if (m_Light)
+		{
+			m_Light.FadeOut();
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			//Safeguard if item is turned off by another event than running out of energy
+			if (GetCompEM().GetEnergy() > 0)
+				return;
+			
+			SetHealth(0);
+		}
+	}
+	
+	override void OnWork (float consumed_energy)
+	{
+		if (!m_Light)
+			CreateLight();
+		
+		// Handle fade out of chemlight
+		if (m_Light)
+		{
+			float efficiency = GetEfficiency0To1();
+			
+			if ( efficiency < 1 )
+			{
+				m_Light.SetIntensity( efficiency, GetCompEM().GetUpdateInterval() );
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnWhileInHands);
+	}
+	
+	string GetMaterialForDamageState(bool glowing,int healthLevel = -1)
+	{
+		int currentHealthLevel;
+		int suffixIndex;
+		string base;
+		
+		if (healthLevel == -1)
+			currentHealthLevel = GetHealthLevel();
+		else
+			currentHealthLevel = healthLevel;
+		
+		if (glowing)
+			base = m_GlowMaterial;
+		else
+			base = m_DefaultMaterial;
+		
+		suffixIndex = base.IndexOf(".rvmat");
+		if (suffixIndex == -1)
+		{
+			Error("Error - no valid rvmat found for chemlight");
+			return "";
+		}
+		base = base.Substring(0,suffixIndex);
+		
+		if (currentHealthLevel == GameConstants.STATE_BADLY_DAMAGED || currentHealthLevel == GameConstants.STATE_DAMAGED)
+		{
+			base = base + "_damage";
+		}
+		else if (currentHealthLevel == GameConstants.STATE_RUINED)
+		{
+			base = base + "_destruct";
+		}
+		
+		return base + ".rvmat";
+	}
+};
+
+class Chemlight_White: Chemlight_ColorBase {};
+class Chemlight_Red: Chemlight_ColorBase {};
+class Chemlight_Green: Chemlight_ColorBase {};
+class Chemlight_Blue: Chemlight_ColorBase {};
+class Chemlight_Yellow: Chemlight_ColorBase {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/ChernarusMap_Open.c b/scripts/4_World/DayZ/Entities/ItemBase/ChernarusMap_Open.c
new file mode 100644
index 0000000000000000000000000000000000000000..f802d28fb33a9a9841a55f6ec4165bdce06308f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/ChernarusMap_Open.c
@@ -0,0 +1,20 @@
+class ChernarusMap extends ItemMap
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnfoldMap);
+	}
+	
+	override bool GetActionWidgetOverride(out typename name)
+	{
+		if ( GetMapStateAnimation() ) //is map in the 'opened' state
+		{
+			name = ActionFoldMap;
+			return true;
+		}
+		return false;
+	}
+}
+class ChernarusMap_Open extends ItemMap {} //unused
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Cleaver.c b/scripts/4_World/DayZ/Entities/ItemBase/Cleaver.c
new file mode 100644
index 0000000000000000000000000000000000000000..02b502e97e263897867e9d58faaa6652dfdbd9df
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Cleaver.c
@@ -0,0 +1,31 @@
+class Cleaver extends ToolBase
+{
+	void Cleaver()
+	{
+	}
+	
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/ClockBase.c b/scripts/4_World/DayZ/Entities/ItemBase/ClockBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e462e66959e7607be7fe4bc4f7e28d36a5b68bd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/ClockBase.c
@@ -0,0 +1,325 @@
+enum EAlarmClockState
+{
+	UNSET,
+	SET,
+	RINGING,
+	//-----------
+	COUNT
+}
+
+class ClockBase : Inventory_Base
+{
+	float 				m_AlarmTime01;
+	int 				m_State = EAlarmClockState.UNSET;
+	static const float 	UPDATE_TICK_RATE 			= 1; // Clock update tick frequency
+	ref Timer 			m_TimerUpdate;
+	float				m_RingingDuration;
+	int 				m_StatePrev = -1;
+	
+	EffectSound 		m_RingingSoundLoop;
+	EffectSound 		m_TurnOnSound;
+	EffectSound 		m_DestoryedSound;
+	EffectSound 		m_HitSound;
+	EffectSound 		m_WorkingSound;
+
+	const float 		RINGING_DURATION_MAX 		= 60;//in secs, at or past this value, the clock stops ringing
+
+	void ClockBase()
+	{
+		Init();
+	}
+	
+	void ~ClockBase()
+	{
+		SEffectManager.DestroyEffect(m_WorkingSound);
+		SEffectManager.DestroyEffect(m_HitSound);
+		SEffectManager.DestroyEffect(m_DestoryedSound);
+		SEffectManager.DestroyEffect(m_TurnOnSound);
+		SEffectManager.DestroyEffect(m_RingingSoundLoop);
+	}
+	
+	void Init() 
+	{
+		RegisterNetSyncVariableInt("m_State", 0, EAlarmClockState.COUNT - 1);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachExplosivesTrigger);
+	}
+	
+	protected int GetAlarmInMin()
+	{
+		int alarm_hand_in_mins = ConvertAlarmHand01ToMins12h(m_AlarmTime01);
+		
+		int pass, hour, minute;
+		GetGame().GetWorld().GetDate(pass, pass, pass, hour, minute);
+		
+		int curr_time_in_minutes = ConvertTimeToMins12h(hour, minute);
+		int ring_in_mins = GetTimeDiffInMins12h(curr_time_in_minutes, alarm_hand_in_mins);
+		return ring_in_mins;
+	}
+	
+	static int ConvertAlarmHand01ToMins12h(float time01)
+	{
+		return Math.Lerp(0,12*60,time01);
+	}
+	
+	static int ConvertAlarmHand01ToMins(float time01, int mins_max/*what's the upper range in minutes we are trying to map the time01 to*/)
+	{
+		return Math.Lerp(0,mins_max,time01);
+	}
+	
+	static float ConvertMins12hToAlarmHand01(int mins)
+	{
+		return Math.InverseLerp(0,12*60,mins);
+	}
+
+	
+	static int ConvertTimeToMins12h(int hour, int minute)
+	{
+		if (hour >= 12)
+			hour -= 12;  
+		return hour * 60 + minute;
+	}
+	
+	static int GetTimeDiffInMins12h(int from_mins, int to_mins)
+	{
+		if (to_mins > from_mins)
+		{
+			return to_mins - from_mins;
+		}
+		else if (to_mins < from_mins)
+		{
+			return ((12 * 60) - from_mins) + to_mins;
+		}
+		else return 0;
+	}
+	
+	string GetToggleSound()
+	{
+		return "";
+	}
+	string GetRingingSound()
+	{
+		return "";
+	}
+	string GetHitSound()
+	{
+		return "";
+	}
+	string GetDestroyedSound()
+	{
+		return "";
+	}
+	string GetWorkingSound()
+	{
+		return "";
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		TurnOff();
+	}
+	
+	override void EEHitByRemote(int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos)
+	{
+		super.EEHitByRemote(damageType, source, component, dmgZone, ammo, modelPos);
+		PlaySoundSet( m_HitSound, GetHitSound(), 0, 0 );
+	}
+	
+	override void OnDamageDestroyed(int oldLevel)
+	{
+		super.OnDamageDestroyed(oldLevel);
+		
+		if (GetGame().IsClient())
+		{
+			OnRingingStopClient();
+
+			if (oldLevel != -1)
+			{
+				PlaySoundSet(m_DestoryedSound, GetDestroyedSound(), 0, 0);
+			}
+		}
+	}
+
+	protected void OnRingingStartServer()
+	{
+		ActivateParent();
+	}
+
+	protected void OnRingingStartClient()
+	{
+		PlaySoundSetLoop( m_RingingSoundLoop, GetRingingSound(), 0, 0 );
+
+		if (m_WorkingSound)
+		{
+			SEffectManager.DestroyEffect(m_WorkingSound);
+		}
+	}
+	
+	protected void OnRingingStopServer();
+	
+	protected void OnRingingStopClient()
+	{
+		SEffectManager.DestroyEffect(m_RingingSoundLoop);
+	}
+	
+	void SetAlarmInXMins(int in_mins)
+	{
+		int pass, hour, minute;
+		GetGame().GetWorld().GetDate(pass, pass, pass, hour, minute);
+		int mins12h = ConvertTimeToMins12h(hour, minute) + in_mins;
+		float time01 = ConvertMins12hToAlarmHand01(mins12h);
+		SetAlarmTimeServer(time01);
+		Arm();
+	}
+	
+	float GetRingingDurationMax()
+	{
+		return RINGING_DURATION_MAX;
+	}
+	
+	
+	protected void SetupTimerServer()
+	{
+		m_TimerUpdate = new Timer();
+		m_TimerUpdate.Run(UPDATE_TICK_RATE , this, "OnUpdate", null, true);
+	}
+	
+	protected void SetState(EAlarmClockState state)
+	{
+		m_State = state;
+		SetSynchDirty();
+	}
+
+	protected void Disarm()
+	{
+		SetState(EAlarmClockState.UNSET);
+	}
+	
+	protected void Arm()
+	{
+		SetupTimerServer();
+		SetState(EAlarmClockState.SET);
+		m_RingingDuration = 0;
+	}
+
+	protected void ActivateParent()
+	{
+		if (GetHierarchyParent())
+		{
+			ItemBase parent = ItemBase.Cast(GetHierarchyParent());
+			if (parent)
+			{
+				parent.OnActivatedByItem(this);
+			}
+		}
+	}
+	
+	protected void MakeRingingStart()
+	{
+		if (!m_TimerUpdate)
+			SetupTimerServer();
+		SetState(EAlarmClockState.RINGING);
+		
+		OnRingingStartServer();
+	}
+	
+	protected void MakeRingingStop()
+	{
+		SetState(EAlarmClockState.UNSET);
+		
+		OnRingingStopServer();
+	}
+
+	void TurnOnClient();
+
+	void TurnOffClient();
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if (m_State != m_StatePrev)//state changed
+		{
+			if (m_StatePrev == EAlarmClockState.RINGING)
+			{
+				OnRingingStopClient();
+			}
+			else if (m_State == EAlarmClockState.RINGING)
+			{
+				OnRingingStartClient();
+			}
+			if (m_State == EAlarmClockState.SET)
+			{
+				if (m_StatePrev != -1 || IsInitialized())
+				{	
+					PlaySoundSet( m_TurnOnSound, GetToggleSound(), 0, 0 );
+				}
+				if (GetWorkingSound())
+				{
+					PlaySoundSet( m_WorkingSound, GetWorkingSound(), 0, 0, true );
+				}
+			}
+			else if (m_State == EAlarmClockState.UNSET)
+			{
+				if (m_StatePrev == EAlarmClockState.SET)
+				{
+					if (m_WorkingSound)
+					{
+						SEffectManager.DestroyEffect(m_WorkingSound);
+					}
+					if (m_StatePrev != -1 || IsInitialized())
+					{	
+						PlaySoundSet( m_TurnOnSound, GetToggleSound(), 0, 0 );
+					}
+				}
+			}
+			m_StatePrev = m_State;
+		}
+	}
+	
+	
+	//---------------------------------------------------------------------------------------------------------
+	//---------------------------------------------- Public methods -------------------------------------------
+	//---------------------------------------------------------------------------------------------------------
+	
+	bool IsRinging()
+	{
+		return (m_State == EAlarmClockState.RINGING);
+	}
+	
+	bool IsAlarmOn()
+	{
+		return (m_State == EAlarmClockState.SET);
+	}
+	
+	void TurnOn()
+	{
+		Arm();
+	}
+
+	void TurnOff()
+	{
+		if ( IsRinging() )
+		{
+			MakeRingingStop();
+		}
+		else
+		{
+			Disarm();
+		}
+		
+		m_TimerUpdate = null;
+	}
+
+	void SetAlarmTimeServer(float time01)
+	{
+		SetAnimationPhaseNow("ClockAlarm", time01);
+		m_AlarmTime01 = time01;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AirborneMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AirborneMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..98bf79b068f3fe394ec884270e4553f21a80e247
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AirborneMask.c
@@ -0,0 +1,12 @@
+class AirborneMask extends MaskBase
+{
+	override bool IsObstructingVoice()
+	{
+		return true;
+	}
+	
+	override int GetVoiceEffect()
+	{
+		return VoiceEffectObstruction;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AliceBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AliceBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..2963fc57144ba00011feff1a4356b70b53010561
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AliceBag_ColorBase.c
@@ -0,0 +1,4 @@
+class AliceBag_ColorBase extends Backpack_Base {};
+class AliceBag_Green extends AliceBag_ColorBase {};
+class AliceBag_Black extends AliceBag_ColorBase {};
+class AliceBag_Camo extends AliceBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Armband_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Armband_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..905ed7c0cb41699b63feffa4b8fd08b0269d873f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Armband_ColorBase.c
@@ -0,0 +1,104 @@
+class Armband_ColorBase extends Clothing
+{
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}
+		if ( GetNumberOfItems() == 0 || !parent || parent.IsMan() )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( GetQuantity() <= 1 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+	
+	override void SwitchItemSelectionTextureEx(EItemManipulationContext context, Param par = null)
+	{
+		super.SwitchItemSelectionTextureEx(context, par);
+		
+		if (context == EItemManipulationContext.ATTACHING || context == EItemManipulationContext.UPDATE)
+		{
+			Param1<PlayerBase> data = Param1<PlayerBase>.Cast(par);
+			if (!data)
+			{
+				return;
+			}
+			
+			PlayerBase player = data.param1;
+			
+			int selection_idx = -1;
+			string texture;
+			
+			array<string> show_selections = new array<string>;
+			array<string> hide_selections = new array<string>;
+			
+			//has top
+			if (player.FindAttachmentBySlotName("Body"))
+			{
+				show_selections.Insert("camoMale_big_a");
+				show_selections.Insert("camoMale_big_b");
+				show_selections.Insert("camoFemale_big_a");
+				show_selections.Insert("camoFemale_big_b");
+				
+				hide_selections.Insert("camoMale_small_a");
+				hide_selections.Insert("camoMale_small_b");
+				hide_selections.Insert("camoFemale_small_a");
+				hide_selections.Insert("camoFemale_small_b");
+			}
+			//has no top
+			else
+			{
+				hide_selections.Insert("camoMale_big_a");
+				hide_selections.Insert("camoMale_big_b");
+				hide_selections.Insert("camoFemale_big_a");
+				hide_selections.Insert("camoFemale_big_b");
+				
+				show_selections.Insert("camoMale_small_a");
+				show_selections.Insert("camoMale_small_b");
+				show_selections.Insert("camoFemale_small_a");
+				show_selections.Insert("camoFemale_small_b");
+			}
+			
+			int i;
+			for (i = 0; i < show_selections.Count(); i++)
+			{
+				selection_idx = GetHiddenSelectionIndex(show_selections[i]);
+				texture = GetHiddenSelectionsData().GetHiddenSelectionsTextures()[selection_idx];
+				SetObjectTexture( selection_idx, texture );
+			}
+			
+			for (i = 0; i < hide_selections.Count(); i++)
+			{
+				selection_idx = GetHiddenSelectionIndex(hide_selections[i]);
+				SetObjectTexture( selection_idx, "" );
+			}
+		}
+	}
+};
+
+class Armband_Dyed extends Armband_ColorBase {};
+class Armband_White extends Armband_ColorBase {};
+class Armband_Yellow extends Armband_ColorBase {};
+class Armband_Orange extends Armband_ColorBase {};
+class Armband_Red extends Armband_ColorBase {};
+class Armband_Green extends Armband_ColorBase {};
+class Armband_Pink extends Armband_ColorBase {};
+class Armband_Blue extends Armband_ColorBase {};
+class Armband_Rex extends Armband_ColorBase {};
+class Armband_Zagorky extends Armband_ColorBase {};
+class Armband_Crook extends Armband_ColorBase {};
+class Armband_Black extends Armband_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Armband_White.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Armband_White.c
new file mode 100644
index 0000000000000000000000000000000000000000..15d6f7b93e955de54a3fb353d40b2a3b135316fc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Armband_White.c
@@ -0,0 +1,16 @@
+/*
+class Armband_White extends Armband_ColorBase
+{
+	void Armband_White()
+	{
+		//string color = GetItemVariableString("varColor"); //SYNCFAIL
+
+		if ( color != "" )
+		{
+			SetObjectTexture (0,color);
+			SetObjectTexture (1,color);
+			SetObjectTexture (2,color);
+		}
+	}
+}
+*/
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ArmyPouch_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ArmyPouch_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..60066546357c578a38f7174de7a5c486cc8a070d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ArmyPouch_ColorBase.c
@@ -0,0 +1,14 @@
+class ArmyPouch_ColorBase : Backpack_Base
+{
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateInInventory("Chemlight_Red");
+		EntityAI item = GetInventory().CreateInInventory("GPSReceiver");
+		item.GetInventory().CreateInInventory("Battery9V");
+		item = GetInventory().CreateEntityInCargo("PersonalRadio");
+		item.GetInventory().CreateInInventory("Battery9V");
+	}
+};
+class ArmyPouch_Green : ArmyPouch_ColorBase {};
+class ArmyPouch_Black : ArmyPouch_ColorBase {};
+class ArmyPouch_Camo : ArmyPouch_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AssaultBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AssaultBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..2026411c2ab980aa52f50a083950d9c97eeb6eef
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AssaultBag_ColorBase.c
@@ -0,0 +1,4 @@
+class AssaultBag_ColorBase extends Backpack_Base {};
+class AssaultBag_Ttsko extends AssaultBag_ColorBase {};
+class AssaultBag_Black extends AssaultBag_ColorBase {};
+class AssaultBag_Green extends AssaultBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AthleticShoes_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AthleticShoes_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6e30a2865e59f46f1ec3a3514a265d91ab225157
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AthleticShoes_ColorBase.c
@@ -0,0 +1,6 @@
+class AthleticShoes_ColorBase extends Shoes_Base {};
+class AthleticShoes_Blue extends AthleticShoes_ColorBase {};
+class AthleticShoes_Black extends AthleticShoes_ColorBase {};
+class AthleticShoes_Brown extends AthleticShoes_ColorBase {};
+class AthleticShoes_Green extends AthleticShoes_ColorBase {};
+class AthleticShoes_Grey extends AthleticShoes_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AviatorGlasses.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AviatorGlasses.c
new file mode 100644
index 0000000000000000000000000000000000000000..8cea0f46024c5a994f5486103ebbde4612037ac7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/AviatorGlasses.c
@@ -0,0 +1,7 @@
+class AviatorGlasses extends Glasses_Base 
+{
+	override int GetGlassesEffectID()
+	{
+		return PPERequesterBank.REQ_GLASSESAVIATOR;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BDUJacket.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BDUJacket.c
new file mode 100644
index 0000000000000000000000000000000000000000..ed1d4d26b813fffb27928f767bd3c96e7b0c9738
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BDUJacket.c
@@ -0,0 +1,8 @@
+class BDUJacket extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BDUPants.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BDUPants.c
new file mode 100644
index 0000000000000000000000000000000000000000..82aef66dd8e259ed90e52c3c7c1e536079ae3e24
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BDUPants.c
@@ -0,0 +1,8 @@
+class BDUPants extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Balaclava3Holes_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Balaclava3Holes_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..0193a81f350fa6d8ad29191624c74adbfc895a38
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Balaclava3Holes_ColorBase.c
@@ -0,0 +1,12 @@
+class Balaclava3Holes_ColorBase extends Mask_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class Balaclava3Holes_Beige extends Balaclava3Holes_ColorBase {};
+class Balaclava3Holes_Blue extends Balaclava3Holes_ColorBase {};
+class Balaclava3Holes_Black extends Balaclava3Holes_ColorBase {};
+class Balaclava3Holes_Green extends Balaclava3Holes_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BalaclavaMask_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BalaclavaMask_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e61a66b49698e0f7751be792c5c20f39959fec96
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BalaclavaMask_ColorBase.c
@@ -0,0 +1,15 @@
+class BalaclavaMask_ColorBase extends Mask_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class BalaclavaMask_Black extends BalaclavaMask_ColorBase {};
+class BalaclavaMask_Blackskull extends BalaclavaMask_ColorBase {};
+class BalaclavaMask_Beige extends BalaclavaMask_ColorBase {};
+class BalaclavaMask_Blue extends BalaclavaMask_ColorBase {};
+class BalaclavaMask_Green extends BalaclavaMask_ColorBase {};
+class BalaclavaMask_Pink extends BalaclavaMask_ColorBase {};
+class BalaclavaMask_White extends BalaclavaMask_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Ballerinas_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Ballerinas_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bf60d52081905cb7a6f3ee90153857d5e2c257d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Ballerinas_ColorBase.c
@@ -0,0 +1,5 @@
+class Ballerinas_ColorBase extends Shoes_Base {};
+class Ballerinas_Blue extends Ballerinas_ColorBase {};
+class Ballerinas_Red extends Ballerinas_ColorBase {};
+class Ballerinas_White extends Ballerinas_ColorBase {};
+class Ballerinas_Yellow extends Ballerinas_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BandanaMask_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BandanaMask_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..29d4f0206fd8160d596856e9338a0c36ab5935a4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BandanaMask_ColorBase.c
@@ -0,0 +1,8 @@
+/*
+class BandanaMask_ColorBase extends Clothing {};
+class BandanaMask_RedPattern extends BandanaMask_ColorBase {};
+class BandanaMask_BlackPattern extends BandanaMask_ColorBase {};
+class BandanaMask_PolkaPattern extends BandanaMask_ColorBase {};
+class BandanaMask_GreenPattern extends BandanaMask_ColorBase {};
+class BandanaMask_CamoPattern extends BandanaMask_ColorBase	 {};
+*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Bandana_Hybrid.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Bandana_Hybrid.c
new file mode 100644
index 0000000000000000000000000000000000000000..4dd59247eab699d2b4ba3b79b97afbd114a0d127
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Bandana_Hybrid.c
@@ -0,0 +1,23 @@
+/*class BandanaHybrid_ColorBase extends Clothing
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBandageTarget);
+		AddAction(ActionBandageSelf);
+	}
+	
+	void BandanaHybrid_ColorBase()
+	{
+
+	}
+};
+class BandanaHybrid_RedPattern extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_BlackPattern extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_PolkaPattern extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_Greenpattern extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_CamoPattern extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_Blue extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_Pink extends BandanaHybrid_ColorBase {};
+class BandanaHybrid_Yellow extends BandanaHybrid_ColorBase {};*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BaseballCap_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BaseballCap_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b2fc186c74cd1bf7828709202bdae03fa554546b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BaseballCap_ColorBase.c
@@ -0,0 +1,18 @@
+class BaseballCap_ColorBase extends HeadGear_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+
+class BaseballCap_Blue extends BaseballCap_ColorBase {};
+class BaseballCap_Beige extends BaseballCap_ColorBase {};
+class BaseballCap_Black extends BaseballCap_ColorBase {};
+class BaseballCap_Olive extends BaseballCap_ColorBase {};
+class BaseballCap_Pink extends BaseballCap_ColorBase {};
+class BaseballCap_Red extends BaseballCap_ColorBase {};
+class BaseballCap_Camo extends BaseballCap_ColorBase {};
+class BaseballCap_CMMG_Black extends BaseballCap_ColorBase {};
+class BaseballCap_CMMG_Pink extends BaseballCap_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BeanieHat_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BeanieHat_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba362d5014d4526e25b61eddb06d57f4e8ad83ce
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BeanieHat_ColorBase.c
@@ -0,0 +1,16 @@
+class BeanieHat_ColorBase extends HeadGear_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class BeanieHat_Beige extends BeanieHat_ColorBase {};
+class BeanieHat_Black extends BeanieHat_ColorBase {};
+class BeanieHat_Blue extends BeanieHat_ColorBase {};
+class BeanieHat_Brown extends BeanieHat_ColorBase {};
+class BeanieHat_Green extends BeanieHat_ColorBase {};
+class BeanieHat_Grey extends BeanieHat_ColorBase {};
+class BeanieHat_Pink extends BeanieHat_ColorBase {};
+class BeanieHat_Red extends BeanieHat_ColorBase {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Blouse_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Blouse_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..7680e54d301a2355733979d9631cec34eefae0fa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Blouse_ColorBase.c
@@ -0,0 +1,12 @@
+class Blouse_ColorBase extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class Blouse_Blue extends Blouse_ColorBase {};
+class Blouse_Green extends Blouse_ColorBase {};
+class Blouse_Violet extends Blouse_ColorBase {};
+class Blouse_White extends Blouse_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BomberJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BomberJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c21426aa9ecf2fdb488234ecc369eccfd231ebe9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BomberJacket_ColorBase.c
@@ -0,0 +1,15 @@
+class BomberJacket_ColorBase extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class BomberJacket_Black extends BomberJacket_ColorBase {};
+class BomberJacket_Brown extends BomberJacket_ColorBase {};
+class BomberJacket_Blue extends BomberJacket_ColorBase {};
+class BomberJacket_Grey extends BomberJacket_ColorBase {};
+class BomberJacket_Maroon extends BomberJacket_ColorBase {};
+class BomberJacket_Olive extends BomberJacket_ColorBase {};
+class BomberJacket_SkyBlue extends BomberJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BoonieHat_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BoonieHat_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6ddb453d58c1e0deca4f6a8f82d8e89731039450
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BoonieHat_ColorBase.c
@@ -0,0 +1,19 @@
+class BoonieHat_ColorBase extends HeadGear_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+}
+
+class BoonieHat_Black extends BoonieHat_ColorBase {};
+class BoonieHat_Blue extends BoonieHat_ColorBase {};
+class BoonieHat_DPM extends BoonieHat_ColorBase {};
+class BoonieHat_Dubok extends BoonieHat_ColorBase {};
+class BoonieHat_Flecktran extends BoonieHat_ColorBase {};
+class BoonieHat_NavyBlue extends BoonieHat_ColorBase {};
+class BoonieHat_Olive extends BoonieHat_ColorBase {};
+class BoonieHat_Orange extends BoonieHat_ColorBase {};
+class BoonieHat_Red extends BoonieHat_ColorBase {};
+class BoonieHat_Tan extends BoonieHat_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Breeches_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Breeches_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..76154b8684db8599860b5d9e50feba675d65f521
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Breeches_ColorBase.c
@@ -0,0 +1,18 @@
+class Breeches_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class Breeches_Pink extends Breeches_ColorBase {};
+class Breeches_Red extends Breeches_ColorBase {};
+class Breeches_White extends Breeches_ColorBase {};
+class Breeches_Green extends Breeches_ColorBase {};
+class Breeches_Browncheck extends Breeches_ColorBase {};
+class Breeches_Blue extends Breeches_ColorBase {};
+class Breeches_Blackcheck extends Breeches_ColorBase {};
+class Breeches_Black extends Breeches_ColorBase {};
+class Breeches_Beige extends Breeches_ColorBase {};
+class Breeches_Beetcheck extends Breeches_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BurlapSackCover.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BurlapSackCover.c
new file mode 100644
index 0000000000000000000000000000000000000000..85af4d14ebb1331e867b31828db3faacbd70f89b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/BurlapSackCover.c
@@ -0,0 +1,81 @@
+class BurlapSackCover extends HeadGear_Base
+{
+	PlayerBase m_Player;
+
+	void ~BurlapSackCover()
+	{
+		if (m_Player)
+		{
+			OnRemovedFromHead(m_Player);
+		}
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc,newLoc);
+		
+		if (GetGame().IsDedicatedServer() && newLoc.GetType() == InventoryLocationType.GROUND)
+		{
+			EntityAI newItem = EntityAI.Cast(GetGame().CreateObjectEx("BurlapSack",newLoc.GetPos(),ECE_PLACE_ON_SURFACE,RF_DEFAULT));
+			MiscGameplayFunctions.TransferItemProperties(this,newItem);
+			DeleteSafe();
+		}
+	}
+
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		Class.CastTo(m_Player, parent.GetHierarchyRootPlayer());
+
+		if ((!GetGame().IsDedicatedServer()) && m_Player && m_Player.IsControlledPlayer() && slot_id == InventorySlots.HEADGEAR)
+		{
+			PPERequesterBank.GetRequester(PPERequester_BurlapSackEffects).Start();
+			m_Player.SetInventorySoftLock(true);
+			m_Player.SetMasterAttenuation("BurlapSackAttenuation");
+			
+			if (GetGame().GetUIManager().IsMenuOpen(MENU_INVENTORY))
+			{
+				GetGame().GetMission().HideInventory();
+			}
+		}
+		SetInvisibleRecursive(true,m_Player,{InventorySlots.MASK,InventorySlots.EYEWEAR});
+	}
+
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+		
+		if (parent && parent != this)
+			return true;
+		
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		return false;
+	}
+
+	void OnRemovedFromHead(PlayerBase player)
+	{
+		if (player.IsControlledPlayer())
+		{
+			PPERequesterBank.GetRequester(PPERequester_BurlapSackEffects).Stop();
+			player.SetInventorySoftLock(false);
+			player.SetMasterAttenuation("");
+		}
+		SetInvisibleRecursive(false,player,{InventorySlots.MASK,InventorySlots.EYEWEAR});
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.HEADGEAR)
+		{
+			ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		}
+		return ret;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CanvasBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CanvasBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..da7d1e7b5b9b5f577a5a5680b148ee67ae5ca87b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CanvasBag_ColorBase.c
@@ -0,0 +1,13 @@
+class CanvasBag_ColorBase : Backpack_Base 
+{
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateInInventory("Chemlight_Red");
+		EntityAI item = GetInventory().CreateInInventory("GPSReceiver");
+		item.GetInventory().CreateInInventory("Battery9V");
+		item = GetInventory().CreateEntityInCargo("PersonalRadio");
+		item.GetInventory().CreateInInventory("Battery9V");
+	}
+};
+class CanvasBag_Olive : CanvasBag_ColorBase {};
+class CanvasBag_Medical : CanvasBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CanvasPants.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CanvasPants.c
new file mode 100644
index 0000000000000000000000000000000000000000..63d3c003e104c921ec83efce299ffc23c6c44bde
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CanvasPants.c
@@ -0,0 +1,27 @@
+class CanvasPants_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class CanvasPants_Beige extends CanvasPants_ColorBase {};
+class CanvasPants_Blue extends CanvasPants_ColorBase {};
+class CanvasPants_Grey extends CanvasPants_ColorBase {};
+class CanvasPants_Red extends CanvasPants_ColorBase {};
+class CanvasPants_Violet extends CanvasPants_ColorBase {};
+
+class CanvasPantsMidi_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class CanvasPantsMidi_Beige extends CanvasPantsMidi_ColorBase {};
+class CanvasPantsMidi_Blue extends CanvasPantsMidi_ColorBase {};
+class CanvasPantsMidi_Grey extends CanvasPantsMidi_ColorBase {};
+class CanvasPantsMidi_Red extends CanvasPantsMidi_ColorBase {};
+class CanvasPantsMidi_Violet extends CanvasPantsMidi_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CargoPants_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CargoPants_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..4fca89fd4d33fb680597ceb94168b8eff8711c3f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CargoPants_ColorBase.c
@@ -0,0 +1,13 @@
+class CargoPants_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class CargoPants_Beige extends CargoPants_ColorBase {};
+class CargoPants_Black extends CargoPants_ColorBase {};
+class CargoPants_Blue extends CargoPants_ColorBase {};
+class CargoPants_Green extends CargoPants_ColorBase {};
+class CargoPants_Grey extends CargoPants_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4f4b836f846f3c82c4d9d9978ccc625c79fd2d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail.c
@@ -0,0 +1 @@
+class Chainmail extends Top_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail_Coif.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail_Coif.c
new file mode 100644
index 0000000000000000000000000000000000000000..2936a363e7a1b882ddf16d3c615ca1ffad176eed
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail_Coif.c
@@ -0,0 +1,14 @@
+class Chainmail_Coif extends HeadGear_Base
+{
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.HEADGEAR)
+		{
+			ret.Insert(EAttExclusions.LEGACY_MASK_HEADGEAR); //same as 'noMask' used to be
+			
+			ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		}
+		return ret;
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail_Leggings.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail_Leggings.c
new file mode 100644
index 0000000000000000000000000000000000000000..37da861fe5b91fd1853e2c62301c3dcaed4f3275
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chainmail_Leggings.c
@@ -0,0 +1 @@
+class Chainmail_Leggings extends Pants_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChernarusSportShirt.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChernarusSportShirt.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7781b3d24d727f6c3bb31ad95e1653b2506353d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChernarusSportShirt.c
@@ -0,0 +1,8 @@
+class ChernarusSportShirt extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChestHolster.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChestHolster.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce168c76912bf03b90ddf51512cbbfe498720907
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChestHolster.c
@@ -0,0 +1 @@
+class ChestHolster extends Vest_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chestplate.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chestplate.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7fb618d0f61e5d8c3dcd0a38fe71fc6a3269b08
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Chestplate.c
@@ -0,0 +1 @@
+class Chestplate extends Vest_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChildBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChildBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..bbe19fe66de4d16532974b6e332729bafbdafb12
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChildBag_ColorBase.c
@@ -0,0 +1,4 @@
+class ChildBag_ColorBase extends Backpack_Base {};
+class ChildBag_Green extends ChildBag_ColorBase {};
+class ChildBag_Red extends ChildBag_ColorBase {};
+class ChildBag_Blue extends ChildBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChristmasHeadband_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChristmasHeadband_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..dcf943e923f51eb9d0c063d09a53f0cf76b21f20
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ChristmasHeadband_ColorBase.c
@@ -0,0 +1,6 @@
+class ChristmasHeadband_ColorBase extends HeadGear_Base
+{
+};
+class ChristmasHeadband_Antlers extends ChristmasHeadband_ColorBase {};
+class ChristmasHeadband_Trees extends ChristmasHeadband_ColorBase {};
+class ChristmasHeadband_Gingerbread extends ChristmasHeadband_ColorBase {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CivilianBelt.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CivilianBelt.c
new file mode 100644
index 0000000000000000000000000000000000000000..c02f734d17898ce9f948be0e985f28220ecc6bda
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CivilianBelt.c
@@ -0,0 +1,35 @@
+class CivilianBelt: Belt_Base
+{
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo( parent ) )
+		{
+			return false;
+		}
+		
+		return IsEmpty();
+	}
+	
+	override bool CanReceiveAttachment( EntityAI attachment,int slotId )
+	{
+		if( !super.CanReceiveAttachment( attachment, slotId ) )
+		{
+			return false;
+		}
+		
+		return !GetInventory().IsInCargo();
+	}
+		
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "NylonKnifeSheath" );
+			entity.GetInventory().CreateInInventory( "PlateCarrierHolster" );
+			entity.GetInventory().CreateInInventory( "Canteen" );
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CombatBoots_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CombatBoots_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..06fb066bc2c85e7bb49a2a4d933c960bd1787817
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CombatBoots_ColorBase.c
@@ -0,0 +1,6 @@
+class CombatBoots_ColorBase extends Shoes_Base {};
+class CombatBoots_Beige extends CombatBoots_ColorBase {};
+class CombatBoots_Black extends CombatBoots_ColorBase {};
+class CombatBoots_Brown extends CombatBoots_ColorBase {};
+class CombatBoots_Green extends CombatBoots_ColorBase {};
+class CombatBoots_Grey extends CombatBoots_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CourierBag.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CourierBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb622a7b3ecee59b74951cb6d9691b9a0c84a7e9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CourierBag.c
@@ -0,0 +1 @@
+class CourierBag : Backpack_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CowboyHat_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CowboyHat_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..beb82cef65052e7336f5ba250a4cc2b75eb7a9b1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CowboyHat_ColorBase.c
@@ -0,0 +1,5 @@
+class CowboyHat_ColorBase : HeadGear_Base {};
+class CowboyHat_Brown : CowboyHat_ColorBase {};
+class CowboyHat_black : CowboyHat_ColorBase {};
+class CowboyHat_darkBrown : CowboyHat_ColorBase {};
+class CowboyHat_green : CowboyHat_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CoyoteBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CoyoteBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c3f8d92382485130e492c211e756a2027cd7d4e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CoyoteBag_ColorBase.c
@@ -0,0 +1,3 @@
+class CoyoteBag_ColorBase extends Backpack_Base {};
+class CoyoteBag_Brown extends CoyoteBag_ColorBase {};
+class CoyoteBag_Green extends CoyoteBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CrookedNose.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CrookedNose.c
new file mode 100644
index 0000000000000000000000000000000000000000..c58a7e0a4c96c61b7a9d9a73a00e7dd43d065ce9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/CrookedNose.c
@@ -0,0 +1,22 @@
+class CrookedNose extends Mask_Base
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_0);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_1);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_2);
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_HEADGEAR_HELMET_0);
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		
+		//allows shaving
+		ret.RemoveItem(EAttExclusions.SHAVING_MASK_ATT_0);
+		return ret;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DallasMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DallasMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d138562ff04609c459491bc9c338412eff66502
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DallasMask.c
@@ -0,0 +1,11 @@
+class DallasMask extends ClothingBase
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_0);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_1);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_2);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DenimJacket.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DenimJacket.c
new file mode 100644
index 0000000000000000000000000000000000000000..e29f3ce843e9cc5efebf81bcf0ea83213ac415a9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DenimJacket.c
@@ -0,0 +1,8 @@
+class DenimJacket extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DesignerGlasses.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DesignerGlasses.c
new file mode 100644
index 0000000000000000000000000000000000000000..578792bd89ca17f3efa45549cefc5c643960aa1b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DesignerGlasses.c
@@ -0,0 +1,7 @@
+class DesignerGlasses extends Glasses_Base 
+{
+	override int GetGlassesEffectID()
+	{
+		return PPERequesterBank.REQ_GLASSESDESIGNER;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DressShoes_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DressShoes_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b1a14da2c934d7d68c9c6387b4ada348ad6042f8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DressShoes_ColorBase.c
@@ -0,0 +1,6 @@
+class DressShoes_ColorBase extends Shoes_Base {};
+class DressShoes_Beige extends DressShoes_ColorBase {};
+class DressShoes_Black extends DressShoes_ColorBase {};
+class DressShoes_Brown extends DressShoes_ColorBase {};
+class DressShoes_Sunburst extends DressShoes_ColorBase {};
+class DressShoes_White extends DressShoes_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DryBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DryBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3080909bd66cf53f5f8ceaba30f29e9dbb1c211b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DryBag_ColorBase.c
@@ -0,0 +1,7 @@
+class DryBag_ColorBase extends Backpack_Base {};
+class DryBag_Orange extends DryBag_ColorBase {};
+class DryBag_Yellow extends DryBag_ColorBase {};
+class DryBag_Blue extends DryBag_ColorBase {};
+class DryBag_Green extends DryBag_ColorBase {};
+class DryBag_Black extends DryBag_ColorBase {};
+class DryBag_Red extends DryBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DrysackBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DrysackBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..2ef35b434ac7ca5191ac27cfbda1565392329297
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DrysackBag_ColorBase.c
@@ -0,0 +1,29 @@
+class DrysackBag_ColorBase: Backpack_Base
+{
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionDeCraftDrysackBag);
+	}
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+		
+		if (parent && parent.IsKindOf("AmmoBox"))
+			return false;
+
+		return true;
+	}
+	
+};
+class DrysackBag_Green: DrysackBag_ColorBase {};
+class DrysackBag_Orange: DrysackBag_ColorBase {};
+class DrysackBag_Yellow: DrysackBag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DuffelBagSmall_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DuffelBagSmall_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7c320f69cf696107ec36abdfa5a703aeaa39f3a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/DuffelBagSmall_ColorBase.c
@@ -0,0 +1,14 @@
+class DuffelBagSmall_ColorBase : Backpack_Base 
+{
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateInInventory("Chemlight_Red");
+		EntityAI item = GetInventory().CreateInInventory("GPSReceiver");
+		item.GetInventory().CreateInInventory("Battery9V");
+		item = GetInventory().CreateEntityInCargo("PersonalRadio");
+		item.GetInventory().CreateInInventory("Battery9V");
+	}
+};
+class DuffelBagSmall_Green : DuffelBagSmall_ColorBase {};
+class DuffelBagSmall_Black : DuffelBagSmall_ColorBase {};
+class DuffelBagSmall_Camo : DuffelBagSmall_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/EyePatch_improvised.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/EyePatch_improvised.c
new file mode 100644
index 0000000000000000000000000000000000000000..920be83605160ff3c362ed2a21074d036a5b731d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/EyePatch_improvised.c
@@ -0,0 +1,14 @@
+class EyePatch_Improvised extends Glasses_Base
+{
+	override array<int> GetEffectWidgetTypes()
+	{
+		return {EffectWidgetsTypes.EYEPATCH_OCCLUDER};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FaceCover_improvised.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FaceCover_improvised.c
new file mode 100644
index 0000000000000000000000000000000000000000..20696151ee90ea39490fc7ba77a11bd980a99b20
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FaceCover_improvised.c
@@ -0,0 +1,8 @@
+class FaceCover_Improvised extends Mask_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FeetCover_improvised.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FeetCover_improvised.c
new file mode 100644
index 0000000000000000000000000000000000000000..9fd378dbea1ec5a0890af917048035dc3e61aa7c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FeetCover_improvised.c
@@ -0,0 +1,8 @@
+class FeetCover_Improvised extends Shoes_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FirefighterJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FirefighterJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6594f91e87cceab6137341f51213f341e4fad57b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FirefighterJacket_ColorBase.c
@@ -0,0 +1,10 @@
+class FirefighterJacket_ColorBase extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class FirefighterJacket_Beige extends FirefighterJacket_ColorBase {};
+class FirefighterJacket_Black extends FirefighterJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FirefightersPants_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FirefightersPants_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..ccf63aedf06dfeda83de8d88ee581ae8937b238f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FirefightersPants_ColorBase.c
@@ -0,0 +1,10 @@
+class FirefightersPants_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class FirefightersPants_Beige extends FirefightersPants_ColorBase {};
+class FirefightersPants_Black extends FirefightersPants_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FlatCap_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FlatCap_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..9daecd948bce1eb0452e140badf0f459bbc22b3f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FlatCap_ColorBase.c
@@ -0,0 +1,16 @@
+class FlatCap_ColorBase extends HeadGear_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class FlatCap_Black extends FlatCap_ColorBase {};
+class FlatCap_Blue extends FlatCap_ColorBase {};
+class FlatCap_Red extends FlatCap_ColorBase {};
+class FlatCap_Brown extends FlatCap_ColorBase {};
+class FlatCap_Grey extends FlatCap_ColorBase {};
+class FlatCap_BrownCheck extends FlatCap_ColorBase {};
+class FlatCap_GreyCheck extends FlatCap_ColorBase {};
+class FlatCap_BlackCheck extends FlatCap_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FurCourierBag.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FurCourierBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..f20f13bd633b9976dc9dbedfc5a1d77710c04afc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FurCourierBag.c
@@ -0,0 +1 @@
+class FurCourierBag : Backpack_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FurImprovisedBag.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FurImprovisedBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..c337aded523d847bfd202d9b3f7225a2a0dc873f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/FurImprovisedBag.c
@@ -0,0 +1 @@
+class FurImprovisedBag : Backpack_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GP5GasMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GP5GasMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..83c201ae303905681e8bc912d1a20f78b29f2ed4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GP5GasMask.c
@@ -0,0 +1,14 @@
+class GP5GasMask extends MaskBase
+{
+	override bool IsObstructingVoice()
+	{
+		return true;
+	}
+	
+	override int GetVoiceEffect()
+	{
+		return VoiceEffectObstruction;
+	}
+}
+
+class GP5GasMask_Filter : ItemBase {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GasMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GasMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..068693cc9a0a7e309db957fef2f9de0a28763c3a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GasMask.c
@@ -0,0 +1,23 @@
+class GasMask extends MaskBase
+{
+	override bool IsObstructingVoice()
+	{
+		return true;
+	}
+	
+	override int GetVoiceEffect()
+	{
+		return VoiceEffectObstruction;
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		if (GetGame().IsServer())
+		{
+			if( newLevel == GameConstants.STATE_RUINED )
+			{
+				SetQuantity(0);
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GasMask_Filter.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GasMask_Filter.c
new file mode 100644
index 0000000000000000000000000000000000000000..1d403dad1bd0dbc5726b04e625e9ae8bcb94064d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GasMask_Filter.c
@@ -0,0 +1,38 @@
+class GasMask_Filter : ItemBase
+{
+	/*
+	override void OnQuantityChanged(float delta)
+	{
+		super.OnQuantityChanged(delta);
+		
+		if (GetQuantity() == 0)
+		{
+			SetHealth("","",0);
+		}
+	}
+	*/
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		if (GetGame().IsServer())
+		{
+			if( newLevel == GameConstants.STATE_RUINED )
+			{
+				SetQuantity(0);
+			}
+		}
+	}
+	
+	override float GetFilterDamageRatio() 
+	{
+		return 0.09; //Health lost per quantity consumed
+	}
+}
+
+class GasMask_Filter_Improvised: GasMask_Filter
+{
+	override float GetFilterDamageRatio() 
+	{
+		return 0.25; //Health lost per quantity consumed
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieBushrag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieBushrag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..862158eab57bbfc401349db43bd05d8e791f08d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieBushrag_ColorBase.c
@@ -0,0 +1,4 @@
+class GhillieBushrag_ColorBase extends Backpack_Base {};
+class GhillieBushrag_Tan extends GhillieBushrag_ColorBase {};
+class GhillieBushrag_Woodland extends GhillieBushrag_ColorBase {};
+class GhillieBushrag_Mossy extends GhillieBushrag_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieHood_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieHood_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..1e3157aa14b87468724d7b9dab3229cb32be1e20
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieHood_ColorBase.c
@@ -0,0 +1,4 @@
+class GhillieHood_ColorBase extends HeadGear_Base {};
+class GhillieHood_Tan extends GhillieHood_ColorBase {};
+class GhillieHood_Woodland extends GhillieHood_ColorBase {};
+class GhillieHood_Mossy extends GhillieHood_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieSuit_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieSuit_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..07da6a0671dc007eca879aac654e64f56d824443
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieSuit_ColorBase.c
@@ -0,0 +1,4 @@
+class GhillieSuit_ColorBase extends Backpack_Base {};
+class GhillieSuit_Tan extends GhillieSuit_ColorBase {};
+class GhillieSuit_Woodland extends GhillieSuit_ColorBase {};
+class GhillieSuit_Mossy extends GhillieSuit_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieTop_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieTop_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..a56733e396f3f2364916e6b8c761ed8ca450ee86
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GhillieTop_ColorBase.c
@@ -0,0 +1,4 @@
+class GhillieTop_ColorBase extends Backpack_Base {};
+class GhillieTop_Tan extends GhillieTop_ColorBase {};
+class GhillieTop_Woodland extends GhillieTop_ColorBase {};
+class GhillieTop_Mossy extends GhillieTop_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GorkaEJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GorkaEJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..11cfbc80dbbbb38972450e7b7aee94266d2814ae
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GorkaEJacket_ColorBase.c
@@ -0,0 +1,12 @@
+class GorkaEJacket_ColorBase extends Top_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class GorkaEJacket_Summer extends GorkaEJacket_ColorBase {};
+class GorkaEJacket_Flat extends GorkaEJacket_ColorBase {};
+class GorkaEJacket_Autumn extends GorkaEJacket_ColorBase {};
+class GorkaEJacket_PautRev extends GorkaEJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GorkaPants_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GorkaPants_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..75d0fb1072266eaae54f14d084f6d67f35ac067a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GorkaPants_ColorBase.c
@@ -0,0 +1,12 @@
+class GorkaPants_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class GorkaPants_Summer extends GorkaPants_ColorBase {};
+class GorkaPants_Autumn extends GorkaPants_ColorBase {};
+class GorkaPants_Flat extends GorkaPants_ColorBase {};
+class GorkaPants_PautRev extends GorkaPants_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GreatHelm.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GreatHelm.c
new file mode 100644
index 0000000000000000000000000000000000000000..54e2c88f63d8cdd508ecc56912484679dd567d91
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GreatHelm.c
@@ -0,0 +1,34 @@
+class GreatHelm extends HelmetBase
+{
+	override array<int> GetEffectWidgetTypes()
+	{
+		return {EffectWidgetsTypes.HELMET_OCCLUDER/*,EffectWidgetsTypes.HELMET_BREATH*/};
+	}
+	
+	override bool IsObstructingVoice()
+	{
+		return true;
+	}
+	
+	override int GetVoiceEffect()
+	{
+		return VoiceEffectObstruction;
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.HEADGEAR)
+		{
+			ret.Insert(EAttExclusions.EXCLUSION_HEADGEAR_HELMET_0);
+			
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_0);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_1);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_2);
+			ret.Insert(EAttExclusions.EXCLUSION_HEADSTRAP_0);
+			
+			ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		}
+		return ret;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GuyFawkesMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GuyFawkesMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..2341f7424bed0b1f76be00aa59db4b328792203b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/GuyFawkesMask.c
@@ -0,0 +1,11 @@
+class GuyFawkesMask extends ClothingBase
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_0);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_1);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_2);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HandsCover_improvised.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HandsCover_improvised.c
new file mode 100644
index 0000000000000000000000000000000000000000..aabf6dad4ca709cc6518c610dcdbd5290b0a68de
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HandsCover_improvised.c
@@ -0,0 +1,8 @@
+class HandsCover_Improvised extends Gloves_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HeadBandana_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HeadBandana_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5db27a62b242f5ae25b63337977cb69d6c3e17d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HeadBandana_ColorBase.c
@@ -0,0 +1,8 @@
+/*
+class HeadBandana_ColorBase extends Clothing {};
+class HeadBandana_Green extends HeadBandana_ColorBase {};
+class HeadBandana_Black extends HeadBandana_ColorBase {};
+class HeadBandana_Blue extends HeadBandana_ColorBase {};
+class HeadBandana_Red extends HeadBandana_ColorBase {};
+class HeadBandana_Yellow extends HeadBandana_ColorBase {};
+*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HeadCover_improvised.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HeadCover_improvised.c
new file mode 100644
index 0000000000000000000000000000000000000000..8636f1bcc9aac55e20c2ebdee24bf4f491356135
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HeadCover_improvised.c
@@ -0,0 +1,8 @@
+class HeadCover_Improvised extends HeadGear_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_Black.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_Black.c
new file mode 100644
index 0000000000000000000000000000000000000000..cdea4880e7dcfe399b09cb2b1113c009d02c8565
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_Black.c
@@ -0,0 +1,12 @@
+class Headtorch_Black : Headtorch_ColorBase 
+{
+	override void OnLightCreated()
+	{
+		m_Light.SetColorToRed();
+	}
+
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateInInventory("Battery9V");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..73774c08fb616eb5513e2c5534bcb2b16e1ad04d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_ColorBase.c
@@ -0,0 +1,252 @@
+class Headtorch_ColorBase extends Clothing
+{
+	HeadtorchLight m_Light;
+	
+	static int		REFLECTOR_ID = 4;
+	static int		GLASS_ID = 5;
+	
+	static string 	LIGHT_OFF_GLASS 		= "dz\\characters\\headgear\\data\\HeadTorchGlass.rvmat";
+	static string 	LIGHT_OFF_REFLECTOR 	= "dz\\characters\\headgear\\data\\HeadTorch.rvmat";
+	static string 	LIGHT_ON_GLASS 			= "dz\\characters\\headgear\\data\\HeadTorchGlass_on.rvmat";
+	static string 	LIGHT_ON_GLASS_RED		= "dz\\characters\\headgear\\data\\HeadTorchGlass_on_red.rvmat";
+	static string 	LIGHT_ON_REFLECTOR 		= "dz\\characters\\headgear\\data\\HeadTorch_ON.rvmat";
+	static string 	LIGHT_ON_REFLECTOR_RED	= "dz\\characters\\headgear\\data\\HeadTorch_ON_red.rvmat";
+	
+	static vector m_OnHeadLocalPos = Vector(0.12,0.15,0);
+	static vector m_OnHeadLocalOri = Vector(0,90,0);
+	static string m_OffHeadLightPoint = "beamStart";
+	static string m_OffHeadLightTarget = "beamEnd";
+	
+	ref Timer m_Timer;
+	
+	void Headtorch_ColorBase()
+	{
+		if (GetGame().IsServer())
+		{
+			if (!m_Timer)
+				m_Timer = new Timer(CALL_CATEGORY_SYSTEM);
+			
+			m_Timer.Run(1 , this, "CheckParent", NULL, false);
+		}
+	}
+	
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_HEADSTRAP_0);
+	}
+	
+	void CheckParent()
+	{
+		EntityAI owner = GetHierarchyParent();
+		
+		// Spawn a battery in the headtorch if it's attached on a zombie and switch it on
+		if (owner  &&  owner.IsZombie())
+		{
+			GetInventory().CreateAttachment("Battery9V");
+			GetCompEM().SwitchOn();
+		}
+		
+		if (m_Timer)
+			m_Timer.Stop();
+		
+		m_Timer = null;
+	}
+	
+	override void OnWorkStart()
+	{
+		super.OnWorkStart();
+		
+		if (!GetGame().IsServer() || !GetGame().IsMultiplayer()) // Client side
+		{
+			CreateHeadtorchLight();
+		}
+		
+		if (IsInherited(Headtorch_Black))
+		{
+			SetObjectMaterial(GLASS_ID, LIGHT_ON_GLASS_RED);
+			SetObjectMaterial(REFLECTOR_ID, LIGHT_ON_REFLECTOR_RED);
+		}
+		else
+		{
+			SetObjectMaterial(GLASS_ID, LIGHT_ON_GLASS);
+			SetObjectMaterial(REFLECTOR_ID, LIGHT_ON_REFLECTOR);
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		super.OnWorkStop();
+		
+		if (!GetGame().IsServer() || !GetGame().IsMultiplayer()) // Client side
+		{
+			if (m_Light)
+				m_Light.FadeOut();
+			
+			m_Light = NULL;
+		}
+		
+		SetObjectMaterial(GLASS_ID, LIGHT_OFF_GLASS);
+		SetObjectMaterial(REFLECTOR_ID, LIGHT_OFF_REFLECTOR);
+	}
+
+	override void OnWork(float consumed_energy)
+	{
+		super.OnWork(consumed_energy);
+		
+		if (!GetGame().IsServer() || !GetGame().IsMultiplayer()) // Client side
+		{
+			Battery9V battery = Battery9V.Cast(GetCompEM().GetEnergySource());
+			
+			if (battery && m_Light)
+			{
+				float efficiency = battery.GetEfficiency0To1();
+				
+				if (efficiency < 1)
+				{
+					m_Light.SetIntensity(efficiency, GetCompEM().GetUpdateInterval());
+				}
+				else
+				{
+					m_Light.SetIntensity(1, 0);
+				}
+			}
+		}
+	}
+	
+	void OnLightCreated()
+	{
+		m_Light.SetColorToWhite();
+	}
+	
+	void CreateHeadtorchLight()
+	{
+		if (!m_Light)
+			m_Light = HeadtorchLight.Cast(ScriptedLightBase.CreateLight( HeadtorchLight, "0 0 0"));
+		
+		OnLightCreated();
+		
+		m_Light.PerformVisibilityCheck(this);
+		
+		EntityAI owner = GetHierarchyParent();
+		
+		if (owner)
+		{
+			if (owner.IsPlayer())
+			{
+				PlayerBase owner_PB = PlayerBase.Cast(owner);
+				ItemBase att_item = owner_PB.GetItemOnSlot("Eyewear");
+				
+				if (att_item == this)
+				{
+					AttachLightOnHead(owner_PB);
+				}
+				else
+				{
+					m_Light.AttachOnMemoryPoint(this, m_OffHeadLightPoint, m_OffHeadLightTarget);
+				}
+			}
+			else if (owner.IsZombie())
+			{
+				int slot_id = InventorySlots.GetSlotIdFromString("Eyewear");
+				EntityAI item_EAI = owner.GetInventory().FindAttachment(slot_id);
+				ItemBase item_IB = ItemBase.Cast(item_EAI);
+				
+				if (item_IB == this)
+				{
+					AttachLightOnHead(owner);
+				}
+			}
+		}
+		else
+		{
+			m_Light.AttachOnMemoryPoint(this, m_OffHeadLightPoint, m_OffHeadLightTarget);
+		}
+	}
+	
+	void AttachLightOnHead(EntityAI person)
+	{
+		if (person.IsPlayer())
+		{
+			PlayerBase player = PlayerBase.Cast(person);
+			int boneIdx = player.GetBoneIndexByName("Head");
+			
+			if (boneIdx != -1)
+			{
+				if (m_Light.GetParent())
+					m_Light.DetachFromParent();
+				
+				m_Light.SetPosition(m_OnHeadLocalPos);
+				m_Light.SetOrientation(m_OnHeadLocalOri);
+				
+				player.AddChild(m_Light, boneIdx);
+			}
+		}
+		else if (person.IsZombie())
+		{
+			if (m_Light.GetParent())
+				m_Light.DetachFromParent();
+			
+			m_Light.SetPosition(m_OnHeadLocalPos);
+			m_Light.SetOrientation(m_OnHeadLocalOri);
+			
+			person.AddChild(m_Light, 17);
+		}
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		PlayerBase player = PlayerBase.Cast(parent);
+
+		if (player)
+		{
+			if (m_Light)
+			{
+				AttachLightOnHead(player);
+			}
+		}
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		if (parent && (parent.IsPlayer() || parent.IsZombie()))
+		{
+			if (m_Light)
+			{
+				m_Light.DetachFromParent();
+				m_Light.AttachOnMemoryPoint(this, m_OffHeadLightPoint, m_OffHeadLightTarget);
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionTurnOnWhileInHands);
+		AddAction(ActionTurnOffWhileInHands);
+		AddAction(ActionTurnOnHeadtorch);
+		AddAction(ActionTurnOffHeadtorch);
+	}
+	
+	override bool IsLightSource()
+	{
+		return true;
+	}
+	
+	override ItemBase GetLightSourceItem()
+	{
+		return this;
+	}
+	
+	override void OnInvisibleSet(bool invisible)
+	{
+		if (m_Light)
+		{
+			m_Light.SetEnabled(!invisible);
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_Grey.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_Grey.c
new file mode 100644
index 0000000000000000000000000000000000000000..831f933263cd9bde3056038ec62033cea1daf748
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Headtorch_Grey.c
@@ -0,0 +1,7 @@
+class Headtorch_Grey : Headtorch_ColorBase 
+{
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateInInventory("Battery9V");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..473bf3e093e4f92fda254b01ce57411db3ec5d3a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase.c
@@ -0,0 +1,4 @@
+//! hard helmet base
+class HelmetBase extends HeadGear_Base
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/BallisticHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/BallisticHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb8d6a8afdadcf24803321e70e6169296c4bd82d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/BallisticHelmet_ColorBase.c
@@ -0,0 +1,9 @@
+class BallisticHelmet_ColorBase extends HelmetBase
+{
+};
+class BallisticHelmet_Green extends BallisticHelmet_ColorBase {};
+class BallisticHelmet_Black extends  BallisticHelmet_ColorBase {};
+class BallisticHelmet_UN extends BallisticHelmet_ColorBase {};
+class BallisticHelmet_BDU extends BallisticHelmet_ColorBase {};
+class BallisticHelmet_Desert extends BallisticHelmet_ColorBase {};
+class BallisticHelmet_Woodland extends BallisticHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/ConstructionHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/ConstructionHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5c529115b3126d9f83f026c886fa6301954ab6ec
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/ConstructionHelmet_ColorBase.c
@@ -0,0 +1,10 @@
+class ConstructionHelmet_ColorBase extends HelmetBase
+{
+};
+
+class ConstructionHelmet_Blue extends ConstructionHelmet_ColorBase {};
+class ConstructionHelmet_Lime extends ConstructionHelmet_ColorBase {};
+class ConstructionHelmet_Orange extends ConstructionHelmet_ColorBase {};
+class ConstructionHelmet_Red extends ConstructionHelmet_ColorBase {};
+class ConstructionHelmet_White extends ConstructionHelmet_ColorBase {};
+class ConstructionHelmet_Yellow extends ConstructionHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/DarkMotoHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/DarkMotoHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6df9ce5c47d22cfa98971f88d40cb0e3bf4b78e9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/DarkMotoHelmet_ColorBase.c
@@ -0,0 +1,49 @@
+class DarkMotoHelmet_ColorBase extends HelmetBase
+{
+	override array<int> GetEffectWidgetTypes()
+	{
+		return {EffectWidgetsTypes.MOTO_OCCLUDER/*,EffectWidgetsTypes.MOTO_BREATH*/};
+	}
+	
+	override bool IsObstructingVoice()
+	{
+		return true;
+	}
+	
+	override int GetVoiceEffect()
+	{
+		return VoiceEffectObstruction;
+	}
+	
+	override int GetGlassesEffectID()
+	{
+		return PPERequesterBank.REQ_MOTOHELMETBLACK;		
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.HEADGEAR)
+		{
+			ret.Insert(EAttExclusions.EXCLUSION_HEADGEAR_HELMET_0);
+			
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_0);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_1);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_2);
+			ret.Insert(EAttExclusions.EXCLUSION_HEADSTRAP_0);
+			
+			ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		}
+		return ret;
+	}
+}
+
+class DarkMotoHelmet_Black extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_Grey extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_Green extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_Lime extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_Blue extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_Red extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_White extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_Yellow extends DarkMotoHelmet_ColorBase {};
+class DarkMotoHelmet_YellowScarred extends DarkMotoHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/DirtBikeHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/DirtBikeHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..21227302c3d8ddf22075bebc513572cb4e65c1ac
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/DirtBikeHelmet_ColorBase.c
@@ -0,0 +1,34 @@
+class DirtBikeHelmet_ColorBase extends HelmetBase
+{
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "DirtBikeHelmet_Visor" );
+			entity.GetInventory().CreateInInventory( "DirtBikeHelmet_Mouthguard" );
+		}
+	}
+}
+
+class DirtBikeHelmet_Green extends DirtBikeHelmet_ColorBase {};
+class DirtBikeHelmet_Chernarus extends DirtBikeHelmet_ColorBase {};
+class DirtBikeHelmet_Khaki extends DirtBikeHelmet_ColorBase {};
+class DirtBikeHelmet_Police extends DirtBikeHelmet_ColorBase {};
+class DirtBikeHelmet_Red extends DirtBikeHelmet_ColorBase {};
+class DirtBikeHelmet_Black extends DirtBikeHelmet_ColorBase {};
+class DirtBikeHelmet_Blue extends DirtBikeHelmet_ColorBase {};
+
+class DirtBikeHelmet_Visor : ClothingBase {};
+class DirtBikeHelmet_Mouthguard : ClothingBase
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_2);
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/FirefightersHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/FirefightersHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f82367d6e14cbdc068af468e69103473077491a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/FirefightersHelmet_ColorBase.c
@@ -0,0 +1,4 @@
+class FirefightersHelmet_ColorBase extends HelmetBase {};
+class FirefightersHelmet_Red extends FirefightersHelmet_ColorBase {};
+class FirefightersHelmet_White extends FirefightersHelmet_ColorBase {};
+class FirefightersHelmet_Yellow extends FirefightersHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/GorkaHelmetComplete.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/GorkaHelmetComplete.c
new file mode 100644
index 0000000000000000000000000000000000000000..0d989a39b42eb6f036e47b5aa491596d6c4da43d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/GorkaHelmetComplete.c
@@ -0,0 +1,12 @@
+class GorkaHelmet extends HelmetBase
+{
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "GorkaHelmetVisor" );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/HockeyHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/HockeyHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..38b56af08cc9327f5b118a64a341cf0570a57bae
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/HockeyHelmet_ColorBase.c
@@ -0,0 +1,5 @@
+class HockeyHelmet_ColorBase extends HelmetBase {};
+class HockeyHelmet_Black extends HockeyHelmet_ColorBase {};
+class HockeyHelmet_Blue extends HockeyHelmet_ColorBase {};
+class HockeyHelmet_Red extends HockeyHelmet_ColorBase {};
+class HockeyHelmet_White extends HockeyHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/Mich2001Helmet.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/Mich2001Helmet.c
new file mode 100644
index 0000000000000000000000000000000000000000..d702578cd3b9013ea9d17c6a1ce76c966a156df0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/Mich2001Helmet.c
@@ -0,0 +1,31 @@
+class Mich2001Helmet extends HelmetBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnHelmetFlashlight); //use default light actions instead?
+		AddAction(ActionTurnOffHelmetFlashlight);
+		AddAction(ActionToggleNVG);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "NVGoggles" );
+			entity.GetInventory().CreateInInventory( "UniversalLight" );
+			entity.GetInventory().CreateInInventory( "Battery9V" );
+			entity.GetInventory().CreateInInventory( "Battery9V" );
+		}
+	}
+	
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_HEADSTRAP_0);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/MotoHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/MotoHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..787e8543004391af12658eead0783824607f2db5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/MotoHelmet_ColorBase.c
@@ -0,0 +1,43 @@
+class MotoHelmet_ColorBase extends HelmetBase
+{
+	override array<int> GetEffectWidgetTypes()
+	{
+		return {EffectWidgetsTypes.MOTO_OCCLUDER/*,EffectWidgetsTypes.MOTO_BREATH*/};
+	}
+
+	override bool IsObstructingVoice()
+	{
+		return true;
+	}
+	
+	override int GetVoiceEffect()
+	{
+		return VoiceEffectObstruction;
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.HEADGEAR)
+		{
+			ret.Insert(EAttExclusions.EXCLUSION_HEADGEAR_HELMET_0);
+			
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_0);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_1);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_2);
+			ret.Insert(EAttExclusions.EXCLUSION_HEADSTRAP_0);
+			
+			ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		}
+		return ret;
+	}
+}
+
+class MotoHelmet_Black extends MotoHelmet_ColorBase {};
+class MotoHelmet_Grey extends MotoHelmet_ColorBase {};
+class MotoHelmet_Green extends MotoHelmet_ColorBase {};
+class MotoHelmet_Lime extends MotoHelmet_ColorBase {};
+class MotoHelmet_Blue extends MotoHelmet_ColorBase {};
+class MotoHelmet_Red extends MotoHelmet_ColorBase {};
+class MotoHelmet_White extends MotoHelmet_ColorBase {};
+class MotoHelmet_Yellow extends MotoHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/SkateHelmet_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/SkateHelmet_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..754cd9a976be8b4e8a0fac3cf8fb46a56834fbe4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/SkateHelmet_ColorBase.c
@@ -0,0 +1,9 @@
+class SkateHelmet_ColorBase extends HelmetBase
+{
+}
+
+class SkateHelmet_Black extends SkateHelmet_ColorBase {};
+class SkateHelmet_Blue extends SkateHelmet_ColorBase {};
+class SkateHelmet_Gray extends SkateHelmet_ColorBase {};
+class SkateHelmet_Green extends SkateHelmet_ColorBase {};
+class SkateHelmet_Red extends SkateHelmet_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/Ssh68Helmet.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/Ssh68Helmet.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1244048e6356c428507845eba2330eab8d3479d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/Ssh68Helmet.c
@@ -0,0 +1,3 @@
+class Ssh68Helmet extends HelmetBase
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/ZSh3PilotHelmet.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/ZSh3PilotHelmet.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7084f8b5ea4b9bf008c2d8bc35b3cc15d569283
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HelmetBase/ZSh3PilotHelmet.c
@@ -0,0 +1,3 @@
+class ZSh3PilotHelmet extends HelmetBase
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HighCapacityVest_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HighCapacityVest_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c42fc1b4090f72be66ad84189c895e3e6b949c95
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HighCapacityVest_ColorBase.c
@@ -0,0 +1,3 @@
+class HighCapacityVest_ColorBase extends Vest_Base {};
+class HighCapacityVest_Black extends HighCapacityVest_ColorBase {};
+class HighCapacityVest_Olive extends HighCapacityVest_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingBootsLow_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingBootsLow_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6aaff9198bb7ba66f2a92261e18d2c556de3be96
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingBootsLow_ColorBase.c
@@ -0,0 +1,5 @@
+class HikingBootsLow_ColorBase extends Shoes_Base {};
+class HikingBootsLow_Black extends HikingBootsLow_ColorBase {};
+class HikingBootsLow_Blue extends HikingBootsLow_ColorBase {};
+class HikingBootsLow_Beige extends HikingBootsLow_ColorBase {};
+class HikingBootsLow_Grey extends HikingBootsLow_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingBoots_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingBoots_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..43f53437f0a8a5bfa5e0f653aa0fe2151cc102bb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingBoots_ColorBase.c
@@ -0,0 +1,3 @@
+class HikingBoots_ColorBase extends Shoes_Base {};
+class HikingBoots_Brown extends HikingBoots_ColorBase {};
+class HikingBoots_Black extends HikingBoots_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f27c54e895481f9df03dd6d491413ed4bd9948ba
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HikingJacket_ColorBase.c
@@ -0,0 +1,12 @@
+class HikingJacket_ColorBase extends Top_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class HikingJacket_Black extends HikingJacket_ColorBase {};
+class HikingJacket_Blue extends HikingJacket_ColorBase {};
+class HikingJacket_Red extends HikingJacket_ColorBase {};
+class HikingJacket_Green extends HikingJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HipPack_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HipPack_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..329cd70cb72513e5a33c42503a4d53209fac1071
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HipPack_ColorBase.c
@@ -0,0 +1,37 @@
+class HipPack_ColorBase : Belt_Base 
+{
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo( parent ) )
+		{
+			return false;
+		}
+		
+		return IsEmpty();
+	}
+	
+	override bool CanReceiveAttachment( EntityAI attachment,int slotId )
+	{
+		if( !super.CanReceiveAttachment( attachment, slotId ) )
+		{
+			return false;
+		}
+		
+		return !GetInventory().IsInCargo();
+	}
+	
+				
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "Canteen" );
+		}
+	}
+};
+class HipPack_Black : HipPack_ColorBase {};
+class HipPack_Green : HipPack_ColorBase {};
+class HipPack_Medical : HipPack_ColorBase {};
+class HipPack_Party : HipPack_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HockeyMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HockeyMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..6d3ca5456468e3c4aa4cb8f60f1343055793d4bd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HockeyMask.c
@@ -0,0 +1,12 @@
+class HockeyMask extends Mask_Base
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_0);
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_GLASSES_TIGHT_0);
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_GLASSES_REGULAR_0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Hoodie_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Hoodie_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c29275d582a503dc39ae91e62f51af518a2c88a3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Hoodie_ColorBase.c
@@ -0,0 +1,14 @@
+class Hoodie_ColorBase extends Top_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class Hoodie_Blue extends Hoodie_ColorBase {};
+class Hoodie_Black extends Hoodie_ColorBase {};
+class Hoodie_Brown extends Hoodie_ColorBase {};
+class Hoodie_Green extends Hoodie_ColorBase {};
+class Hoodie_Grey extends Hoodie_ColorBase {};
+class Hoodie_Red extends Hoodie_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HoxtonMask.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HoxtonMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..940afd021ff5e220b60232d066a698bf9b0f0042
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HoxtonMask.c
@@ -0,0 +1,19 @@
+class HoxtonMask extends ClothingBase
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		bool headgear_present = false;
+		
+		if ( parent.FindAttachmentBySlotName( "Headgear" ) )
+		{
+			headgear_present = parent.FindAttachmentBySlotName( "Headgear" ).ConfigGetBool( "noMask" );
+		}
+		
+		if ( ( GetNumberOfItems() == 0 || !parent || parent.IsMan() ) && !headgear_present )
+		{
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HunterPants_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HunterPants_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e0fa6c9e937ff92bb6eb2a78f1aa7cfc7eb8604c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HunterPants_ColorBase.c
@@ -0,0 +1,13 @@
+class HunterPants_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class HunterPants_Autumn extends HunterPants_ColorBase {};
+class HunterPants_Brown extends HunterPants_ColorBase {};
+class HunterPants_Spring extends HunterPants_ColorBase {};
+class HunterPants_Summer extends HunterPants_ColorBase {};
+class HunterPants_Winter extends HunterPants_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingBag.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..0cee21b81415be36d33142caf39868591c1df523
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingBag.c
@@ -0,0 +1,2 @@
+class HuntingBag : Backpack_Base {};
+class HuntingBag_Hannah : HuntingBag {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7d8f1c941e39cfaba44f0a5e027f982125eddb5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingJacket_ColorBase.c
@@ -0,0 +1,13 @@
+class HuntingJacket_ColorBase extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class HuntingJacket_Autumn extends HuntingJacket_ColorBase {};
+class HuntingJacket_Brown extends HuntingJacket_ColorBase {};
+class HuntingJacket_Spring extends HuntingJacket_ColorBase {};
+class HuntingJacket_Summer extends HuntingJacket_ColorBase {};
+class HuntingJacket_Winter extends HuntingJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingVest.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingVest.c
new file mode 100644
index 0000000000000000000000000000000000000000..689d6de21d8c4a042cbdea75c2a09269237ddcf7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/HuntingVest.c
@@ -0,0 +1 @@
+class HuntingVest extends Vest_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ImprovisedBag.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ImprovisedBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1ff4e73004bb3b5e924ed5a305487e702cda74e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/ImprovisedBag.c
@@ -0,0 +1 @@
+class ImprovisedBag : Backpack_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Jeans_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Jeans_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..74f9068e923822346f13a457ce1047bcbe91eba9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/Jeans_ColorBase.c
@@ -0,0 +1,29 @@
+class Jeans_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class Jeans_Black extends Jeans_ColorBase {};
+class Jeans_Blue extends Jeans_ColorBase {};
+class Jeans_Brown extends Jeans_ColorBase {};
+class Jeans_Green extends Jeans_ColorBase {};
+class Jeans_Grey extends Jeans_ColorBase {};
+class Jeans_BlueDark extends Jeans_ColorBase {};
+
+class ShortJeans_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class ShortJeans_Black extends ShortJeans_ColorBase {};
+class ShortJeans_Blue extends ShortJeans_ColorBase {};
+class ShortJeans_Brown extends ShortJeans_ColorBase {};
+class ShortJeans_Darkblue extends ShortJeans_ColorBase {};
+class ShortJeans_Green extends ShortJeans_ColorBase {};
+class ShortJeans_Red extends ShortJeans_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JoggingShoes_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JoggingShoes_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a2cd55406cc850651a253cebd8e7da53912d160
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JoggingShoes_ColorBase.c
@@ -0,0 +1,6 @@
+class JoggingShoes_ColorBase extends Shoes_Base {};
+class JoggingShoes_Black extends JoggingShoes_ColorBase {};
+class JoggingShoes_Blue extends JoggingShoes_ColorBase {};
+class JoggingShoes_Red extends JoggingShoes_ColorBase {};
+class JoggingShoes_Violet extends JoggingShoes_ColorBase {};
+class JoggingShoes_White extends JoggingShoes_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JumpsuitJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JumpsuitJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..14f282d8ad9c946b8849dbb9d0a94a14b22fcc87
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JumpsuitJacket_ColorBase.c
@@ -0,0 +1,12 @@
+class JumpsuitJacket_ColorBase extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class JumpsuitJacket_Blue extends JumpsuitJacket_ColorBase {};
+class JumpsuitJacket_Gray extends JumpsuitJacket_ColorBase {};
+class JumpsuitJacket_Green extends JumpsuitJacket_ColorBase {};
+class JumpsuitJacket_Red extends JumpsuitJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JumpsuitPants_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JumpsuitPants_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..96876e845410551289599c972d61a09116eaf54d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JumpsuitPants_ColorBase.c
@@ -0,0 +1,12 @@
+class JumpsuitPants_ColorBase extends Pants_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
+class JumpsuitPants_Blue extends JumpsuitPants_ColorBase {};
+class JumpsuitPants_Green extends JumpsuitPants_ColorBase {};
+class JumpsuitPants_Grey extends JumpsuitPants_ColorBase {};
+class JumpsuitPants_Red extends JumpsuitPants_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JungleBoots_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JungleBoots_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5f2fa4516df1e59287a2f4eb30fc93c8b5bf3e87
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/JungleBoots_ColorBase.c
@@ -0,0 +1,6 @@
+class JungleBoots_ColorBase extends Shoes_Base {};
+class JungleBoots_Beige extends JungleBoots_ColorBase {};
+class JungleBoots_Black extends JungleBoots_ColorBase {};
+class JungleBoots_Brown extends JungleBoots_ColorBase {};
+class JungleBoots_Green extends JungleBoots_ColorBase {};
+class JungleBoots_Olive extends JungleBoots_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/KnifeHolster.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/KnifeHolster.c
new file mode 100644
index 0000000000000000000000000000000000000000..1ec86f67177bb755d848d6d8e9aa9544f1994508
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/KnifeHolster.c
@@ -0,0 +1 @@
+class KnifeHolster: Clothing {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/KnifeSheaths.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/KnifeSheaths.c
new file mode 100644
index 0000000000000000000000000000000000000000..f730299c12356aec3a0c446fd834256ab5d4e84b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/KnifeSheaths.c
@@ -0,0 +1,2 @@
+class LeatherKnifeSheath: Belt_Base {};
+class NylonKnifeSheath: Belt_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LabCoat.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LabCoat.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce5ea8e36e724daf33ebbb8272e079f6ef6d60b1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LabCoat.c
@@ -0,0 +1,8 @@
+class LabCoat extends Top_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionWringClothes);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherBelt_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherBelt_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f068e60495509b081b708da246df3a5ff30cf48b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherBelt_ColorBase.c
@@ -0,0 +1,26 @@
+class LeatherBelt_ColorBase extends Belt_Base
+{
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo( parent ) )
+		{
+			return false;
+		}
+		
+		return IsEmpty();
+	}
+	
+	override bool CanReceiveAttachment( EntityAI attachment,int slotId )
+	{
+		if( !super.CanReceiveAttachment( attachment, slotId ) )
+		{
+			return false;
+		}
+		
+		return !GetInventory().IsInCargo();
+	}
+}
+class LeatherBelt_Beige extends LeatherBelt_ColorBase {};
+class LeatherBelt_Natural extends LeatherBelt_ColorBase {};
+class LeatherBelt_Brown extends LeatherBelt_ColorBase {};
+class LeatherBelt_Black extends LeatherBelt_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherGloves_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherGloves_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e8ffce3dbb519c89147960bdcd4341d8036274f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherGloves_ColorBase.c
@@ -0,0 +1,5 @@
+class LeatherGloves_ColorBase extends Gloves_Base {};
+class LeatherGloves_Natural extends LeatherGloves_ColorBase {};
+class LeatherGloves_Beige extends LeatherGloves_ColorBase {};
+class LeatherGloves_Black extends LeatherGloves_ColorBase {};
+class LeatherGloves_Brown extends LeatherGloves_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherHat_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherHat_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f97307d1fc7936386335733e4f386a825143934
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherHat_ColorBase.c
@@ -0,0 +1,24 @@
+class LeatherHat_ColorBase extends HeadGear_Base
+{
+	/*override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		bool is_mask_only = false;
+		
+		if ( parent.FindAttachmentBySlotName( "Mask" ) )
+		{
+			is_mask_only = parent.FindAttachmentBySlotName( "Mask" ).ConfigGetBool( "noHelmet" );
+		}
+		
+		if ( ( GetNumberOfItems() == 0 || !parent || parent.IsMan() ) && !is_mask_only )
+		{
+			return true;
+		}
+		return false;
+	}*/
+}
+
+class LeatherHat_Natural extends LeatherHat_ColorBase {};
+class LeatherHat_Beige extends LeatherHat_ColorBase {};
+class LeatherHat_Brown extends LeatherHat_ColorBase {};
+class LeatherHat_Black extends LeatherHat_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherJacket_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherJacket_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e2ebeb6b1da8a11698aab59b3ca7cb30512b53a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherJacket_ColorBase.c
@@ -0,0 +1,5 @@
+class LeatherJacket_ColorBase extends Top_Base {};
+class LeatherJacket_Natural extends LeatherJacket_ColorBase {};
+class LeatherJacket_Beige extends LeatherJacket_ColorBase {};
+class LeatherJacket_Brown extends LeatherJacket_ColorBase {};
+class LeatherJacket_Black extends LeatherJacket_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherJacket_Natural.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherJacket_Natural.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7623b0a555a1f03037c03209abff9c4daa447c4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherJacket_Natural.c
@@ -0,0 +1,5 @@
+/*
+class LeatherJacket_Natural extends Clothing
+{
+}
+*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherMoccasinsShoes_Natural.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherMoccasinsShoes_Natural.c
new file mode 100644
index 0000000000000000000000000000000000000000..0acd7446842c133516494e2b2fc7aeed3164f65f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing/LeatherMoccasinsShoes_Natural.c
@@ -0,0 +1,7 @@
+class LeatherMoccasinsShoes_Natural : Clothing
+{
+	override bool IsClothing()
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Clothing_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Clothing_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e88497abc4f044ad455c133c232c879628aae31
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Clothing_Base.c
@@ -0,0 +1,194 @@
+// I know the filename is stupid, but it's what the other files in this structure use..
+// And I can't really make it "class Clothing_Base extends Clothing"
+// since that will conflict with config and other parts of script and break mods :c
+class Clothing extends Clothing_Base
+{
+	override bool IsClothing()
+	{
+		return true;
+	}
+	
+	override bool CanHaveWetness()
+	{
+		return true;
+	}
+	
+	//! Used for 'glasses' (and other colored layers triggered by attach/detach in the InventorySlots.EYEWEAR)
+	int GetGlassesEffectID()
+	{
+		return -1;
+	}
+	
+	//----------------------------------------------------------------
+	// GameplayWidgetEffects
+	array<int> GetEffectWidgetTypes()
+	{
+		return null;
+	}
+	
+	// Conditions	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo( parent ) )
+			return false;
+		
+		return !parent || CanPutInCargoClothingConditions( parent );
+	}
+	
+	bool CanPutInCargoClothingConditions( EntityAI parent )
+	{
+		bool is_hidden_stash_exception = false;
+		
+		if ( parent.IsInherited( UndergroundStash ) )
+			is_hidden_stash_exception = true;
+		
+		if ( GetNumberOfItems() == 0 || !parent || parent.IsMan() || is_hidden_stash_exception )
+		{
+			EntityAI cargoParent = parent.GetHierarchyParent();
+			ClothingBase parentClothing = ClothingBase.Cast(parent);
+			if (cargoParent)
+				return !(parent.IsClothing() && cargoParent.IsClothing()) || ( parentClothing && parentClothing.SmershException(cargoParent) );
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if (!super.CanReceiveItemIntoCargo(item))
+			return false;
+		
+		return CanReceiveItemIntoCargoClothingConditions( item );
+	}
+	
+	bool CanReceiveItemIntoCargoClothingConditions( EntityAI item )
+	{
+		EntityAI hierarchyParent = GetHierarchyParent();
+		return !hierarchyParent || hierarchyParent.IsMan() || SmershException(hierarchyParent);
+	}
+	
+	//Kind of a hack but I don't have enough time left to do larger scale reworks, sorry
+	bool SmershException(EntityAI hierarchyParent)
+	{
+		EntityAI hp = hierarchyParent.GetHierarchyParent();
+		if (hp)
+		{
+			if (!hp.IsMan())
+				return false;
+		}
+		
+		return IsInherited(SmershBag) && hierarchyParent.IsInherited(SmershVest);
+	}
+	
+	override bool CanLoadItemIntoCargo(EntityAI item)
+	{
+		if (!super.CanLoadItemIntoCargo(item))
+			return false;
+		
+		return CanLoadItemIntoCargoClothingConditions(item);
+	}
+	
+	bool CanLoadItemIntoCargoClothingConditions(EntityAI item)
+	{
+		EntityAI parent = GetHierarchyParent();
+		
+		if ( parent && parent.IsInherited( UndergroundStash ) )
+			return true;
+				
+		return !parent || parent.IsMan() || SmershException(parent);
+	}
+	
+	//Method used to specify if a piece of eyeware can be worn under a gas mask
+	//! deprecated
+	bool CanWearUnderMask(EntityAI parent)
+	{
+		return true;
+	}
+	
+	// -------------------------------------------------------------------------
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel, newLevel, zone);
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlayerBase player_owner = PlayerBase.Cast(GetHierarchyParent());
+			
+			if( player_owner )
+			{
+				if( player_owner.m_CorpseState != 0 )
+				{
+					GetGame().GetCallQueue( CALL_CATEGORY_GUI ).CallLater( player_owner.UpdateCorpseState, 0, false);
+				}
+			}
+		}
+	}
+	
+	override void SwitchItemSelectionTextureEx(EItemManipulationContext context, Param par = null)
+	{
+		super.SwitchItemSelectionTextureEx(context, par);
+		
+		Param1<PlayerBase> data = Param1<PlayerBase>.Cast(par);
+		if (!data)
+		{
+			return;
+		}
+		
+		PlayerBase player = data.param1;
+		
+		int personality = GetHiddenSelectionIndex("personality");
+		if (personality >= 0)
+		{
+			string tone_mat = player.m_EmptyGloves.GetHiddenSelectionsMaterials().Get(0);
+			string tone_texture;
+			
+			if (player.m_CorpseState > PlayerConstants.CORPSE_STATE_FRESH)
+			{
+				tone_texture = player.m_DecayedTexture;
+			}
+			else
+			{
+				tone_texture = player.m_EmptyGloves.GetHiddenSelectionsTextures().Get(0);
+			}
+			
+			SetObjectMaterial( personality, tone_mat );
+			SetObjectTexture( personality, tone_texture );
+		}
+	}
+};
+
+  //////////////////////
+ //intermediate types//
+//////////////////////
+class Belt_Base : Clothing {};
+class Backpack_Base : Clothing {};
+class Glasses_Base : Clothing
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_GLASSES_REGULAR_0);
+	}
+};
+class Gloves_Base : Clothing {};
+class HeadGear_Base : Clothing {};
+class Mask_Base : Clothing
+{
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.MASK)
+		{
+			ret.Insert(EAttExclusions.SHAVING_MASK_ATT_0);
+		}
+		return ret;
+	}
+};
+class Pants_Base : Clothing {};
+class Shoes_Base : Clothing {};
+class Top_Base : Clothing {};
+class Vest_Base : Clothing {};
+
+typedef Clothing ClothingBase;
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CombatKnife.c b/scripts/4_World/DayZ/Entities/ItemBase/CombatKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..7f7a2e23841b21ab67a601e346c07517638b5050
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CombatKnife.c
@@ -0,0 +1,34 @@
+class CombatKnife extends ToolBase
+{
+	void CombatKnife()
+	{
+	}
+
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionDisarmMine);
+		AddAction(ActionDisarmExplosive);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CombinationLock.c b/scripts/4_World/DayZ/Entities/ItemBase/CombinationLock.c
new file mode 100644
index 0000000000000000000000000000000000000000..c13906f78e23e3a59ef27c875824285ee24012fc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CombinationLock.c
@@ -0,0 +1,501 @@
+enum LockAction
+{
+	NONE,
+	DIAL_NUMBER_CHANED,
+	DIAL_INDEX_CHANGED,
+	LOCKED,
+	UNLOCKED,
+	
+	COUNT
+}
+
+class CombinationLock extends ItemBase
+{
+	int m_LockDigits;					//how many digits will the combination contain
+	int m_Combination;					//actual combination that is dialed on lock
+	int m_CombinationLocked;			//combination that was dialed on lock before the shuffle
+	int m_DialIndex;					//index of current combination dial
+	protected bool m_IsLocked;
+	
+	protected LockAction m_LockActionPerformed 		= LockAction.NONE;
+	
+	protected bool m_IsInitialized;
+	
+	//Sounds
+	//build
+	const string SOUND_LOCK_OPEN 			= "combinationlock_open_SoundSet";
+	const string SOUND_LOCK_CLOSE 			= "combinationlock_close_SoundSet";
+	const string SOUND_LOCK_CHANGE_NUMBER	= "combinationlock_changenumber_SoundSet";
+	const string SOUND_LOCK_CHANGE_DIAL		= "combinationlock_changedial_SoundSet";
+
+	protected EffectSound m_Sound;
+
+	void CombinationLock()
+	{
+		SetBaseLockValues();
+		
+		//synchronized variables
+		int combination_length = Math.Pow( 10, m_LockDigits );
+		RegisterNetSyncVariableBool( "m_IsLocked" );
+		RegisterNetSyncVariableInt( "m_Combination", 0, combination_length - 1 );
+		RegisterNetSyncVariableInt( "m_DialIndex", 0, m_LockDigits - 1 );
+		RegisterNetSyncVariableInt( "m_LockActionPerformed", 0, LockAction.COUNT );
+	}
+	
+	protected void SetBaseLockValues()
+	{
+		//set lock init values
+		m_LockDigits 			= 3;
+		m_Combination		 	= 111;
+		m_CombinationLocked 	= 999;		
+		m_IsLocked 				= false;
+	}
+
+	override void EEInit()
+	{
+		super.EEInit();
+		
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( SetInitialized, 1000, false );
+		//SetInitialized();
+		
+		//set visual on init
+		UpdateVisuals();
+	}
+	
+	void SetInitialized()
+	{
+		m_IsInitialized = true;
+	}
+	
+	override bool IsInitialized()
+	{
+		return m_IsInitialized;
+	}
+	
+	override void OnItemLocationChanged( EntityAI old_owner, EntityAI new_owner ) 
+	{
+		super.OnItemLocationChanged( old_owner, new_owner );
+		
+		//Check combination lock
+		if ( GetGame().IsServer() )
+		{
+			if ( IsInitialized() && new_owner && new_owner.IsInherited( BaseBuildingBase ) )
+			{
+				LockServer( new_owner );
+			}
+		}		
+	}	
+	
+	// --- EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		//write data
+		ctx.Write( m_Combination );
+		ctx.Write( m_CombinationLocked );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		//--- Combination Lock data ---
+		//combination
+		if ( !ctx.Read( m_Combination ) )
+		{
+			m_Combination = 0;
+			return false;
+		}
+		
+		//combination locked
+		if ( !ctx.Read( m_CombinationLocked ) )
+		{
+			m_CombinationLocked = 0;
+			return false;
+		}
+		
+		//is lock attached
+		if ( version < 105 )					//removed in 105
+		{
+			bool is_lock_attached;
+			if ( !ctx.Read( is_lock_attached ) )
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();		
+		
+		//Check combination lock
+		if ( GetGame().IsServer() )
+		{
+			EntityAI parent = GetHierarchyParent();
+			if ( parent && parent.IsInherited( BaseBuildingBase ) )
+			{
+				LockServer( parent, true );
+			}
+		}		
+		
+		//synchronize
+		Synchronize();
+	}
+	
+	// --- SYNCHRONIZATION
+	void Synchronize()
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] CombinationLock.Synchronize " + " m_Combination=" + m_Combination + " m_CombinationLocked=" + m_CombinationLocked);
+		if ( GetGame().IsServer() )
+		{
+			SetSynchDirty();
+			GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( ResetActionVar, 1000);//synced var used to trigger client sound needs to be reset after triggering the sound
+			UpdateVisuals();
+		}
+	}
+
+	
+	void ResetActionVar()
+	{
+		m_LockActionPerformed = LockAction.NONE;
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		//update visuals (client)
+		UpdateVisuals();
+		
+		//update sound (client)
+		if (m_LockActionPerformed)
+			UpdateSound();
+		
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] CombinationLock.OnVariablesSynchronized " + " m_Combination=" + m_Combination + " m_CombinationLocked=" + m_CombinationLocked);
+	}
+	
+	void SetCombination( int combination )
+	{
+		m_Combination = combination;
+	}
+	
+	void SetCombinationLocked( int combination )
+	{
+		m_CombinationLocked = combination;
+	}
+	
+	int GetCombination()
+	{
+		return m_Combination;
+	}
+	
+	int GetLockDigits()
+	{
+		return m_LockDigits;
+	}
+	
+	// --- ACTIONS
+	void DialNextNumber()
+	{
+		string combination_text = m_Combination.ToString();
+		string dialed_text;
+		
+		//insert zeros to dials with 0 value
+		int length_diff = m_LockDigits - combination_text.Length();
+		for ( int i = 0; i < length_diff; ++i )
+		{
+			combination_text = "0" + combination_text;
+		}
+		
+		//assemble the whole combination with increased part
+		for ( int j = 0; j < combination_text.Length(); ++j )
+		{
+			if ( j == m_DialIndex )
+			{
+				int next_dialed_number = combination_text.Get( j ).ToInt() + 1;
+				if ( next_dialed_number > 9 )
+				{
+					next_dialed_number = 0;
+				}
+				
+				dialed_text += next_dialed_number.ToString();
+			}
+			else
+			{
+				dialed_text += combination_text.Get( j );
+			}
+		}
+		
+		//set new number		
+		SetCombination( dialed_text.ToInt() );
+		m_LockActionPerformed = LockAction.DIAL_INDEX_CHANGED;
+		CheckLockedStateServer();
+		
+		//synchronize
+		Synchronize();
+	}
+	
+	int GetDialIndex()
+	{
+		return m_DialIndex;
+	}
+	
+	void SetNextDial()
+	{
+		if ( m_LockDigits > 1 )
+		{
+			if ( m_DialIndex <= m_LockDigits - 2 )
+			{
+				m_DialIndex++;
+			}
+			else if ( m_DialIndex >= m_LockDigits >  - 1 )
+			{
+				m_DialIndex = 0;
+			}
+		}
+		else
+		{
+			m_DialIndex = 0;
+		}
+		
+		//performed action
+		m_LockActionPerformed = LockAction.DIAL_NUMBER_CHANED;
+		//synchronize
+		Synchronize();
+	}	
+	
+	//Lock lock
+	void LockServer( EntityAI parent, bool ignore_combination = false )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] CombinationLock.LockServer " + " m_Combination=" + m_Combination + " m_CombinationLocked=" + m_CombinationLocked);
+		if ( IsLockAttached() )
+		{
+			if ( !ignore_combination )
+			{
+				SetCombinationLocked( m_Combination );
+			
+				//set slot lock
+				InventoryLocation inventory_location = new InventoryLocation;
+				GetInventory().GetCurrentInventoryLocation( inventory_location );		
+				parent.GetInventory().SetSlotLock( inventory_location.GetSlot(), true );
+			
+				m_LockActionPerformed = LockAction.LOCKED;
+			}
+			ShuffleLock();
+			SetTakeable(false);
+			CheckLockedStateServer();
+			//synchronize
+			Synchronize();
+		}
+		
+		//reset performed action
+		//m_LockActionPerformed = LockAction.NONE;
+	}
+	
+	void UnlockServer( EntityAI player, EntityAI parent )
+	{
+		if (LogManager.IsBaseBuildingLogEnable()) bsbDebugPrint("[bsb] CombinationLock.UnlockServer " + " m_Combination=" + m_Combination + " m_CombinationLocked=" + m_CombinationLocked);
+		if ( IsLockAttached() )
+		{
+			Fence fence = Fence.Cast( parent );
+			
+			//set slot unlock
+			InventoryLocation inventory_location = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation( inventory_location );			
+			fence.GetInventory().SetSlotLock( inventory_location.GetSlot(), false );			
+	
+			//drop entity from attachment slot
+			if (player)
+				player.ServerDropEntity( this );
+			else
+				parent.GetInventory().DropEntity(InventoryMode.SERVER, parent, this);
+			SetPosition( fence.GetKitSpawnPosition() );
+			PlaceOnSurface();
+			
+			m_LockActionPerformed = LockAction.UNLOCKED;
+			SetTakeable(true);
+			CheckLockedStateServer();
+			//synchronize
+			Synchronize();
+		}
+		
+		//reset performed action
+		//m_LockActionPerformed = LockAction.NONE;		
+	}
+		
+	//Shuffle lock
+	void ShuffleLock()
+	{
+		string combination_text = m_Combination.ToString();
+		string shuffled_text;
+		
+		//insert zeros to dials with 0 value
+		int length_diff = m_LockDigits - combination_text.Length();
+		for ( int i = 0; i < length_diff; ++i )
+		{
+			combination_text = "0" + combination_text;
+		}
+		
+		//assemble the whole combination with increased part
+		for ( int j = 0; j < combination_text.Length(); ++j )
+		{
+			int dial_number = combination_text.Get( j ).ToInt();
+			dial_number = ( dial_number + Math.RandomInt( 1, 9 ) ) % 10;
+			shuffled_text = shuffled_text + dial_number.ToString();
+		}
+		
+		SetCombination( shuffled_text.ToInt() );
+	}
+	
+	bool IsLocked()
+	{
+		return m_IsLocked;
+	}
+	
+	void CheckLockedStateServer()
+	{
+		m_IsLocked = m_Combination != m_CombinationLocked;
+	}
+	
+	bool IsLockedOnGate()
+	{
+		Fence fence = Fence.Cast( GetHierarchyParent() );
+		if ( fence )
+		{
+			if ( IsLocked() )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool IsLockAttached()
+	{
+		Fence fence = Fence.Cast( GetHierarchyParent() );
+		if ( fence )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//destroy lock
+	void DestroyLock()
+	{
+		GetGame().ObjectDelete( this );
+	}
+		
+	// --- VISUALS
+	void UpdateVisuals()
+	{
+		//Client/Server
+		if ( IsLockedOnGate() )
+		{
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( HideItem, 		0, false );
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( ShowAttached, 	0, false );
+		}
+		else
+		{
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( ShowItem, 		0, false );
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( HideAttached, 	0, false );
+		}
+	}
+	
+	void UpdateSound()
+	{
+		//was locked
+		if ( m_LockActionPerformed == LockAction.LOCKED )
+		{
+			SoundLockClose();
+		}
+		
+		//was unlocked
+		if ( m_LockActionPerformed == LockAction.UNLOCKED )
+		{
+			SoundLockOpen();
+		}
+		
+		//next dial index
+		if ( m_LockActionPerformed == LockAction.DIAL_INDEX_CHANGED )
+		{
+			SoundLockChangeDial();
+		}		
+		
+		//dialed new number
+		if ( m_LockActionPerformed == LockAction.DIAL_NUMBER_CHANED )
+		{
+			SoundLockChangeNumber();
+		}
+	}
+	
+	//Show/Hide anims
+	protected void ShowItem()
+	{
+		SetAnimationPhase( "Combination_Lock_Item", 0 );
+		SetAnimationPhase( "Lock_Item_1", 			0 );
+		SetAnimationPhase( "Lock_Item_2", 			0 );
+	}
+	
+	protected void HideItem()
+	{
+		SetAnimationPhase( "Combination_Lock_Item", 1 );
+		SetAnimationPhase( "Lock_Item_1", 			1 );
+		SetAnimationPhase( "Lock_Item_2", 			1 );
+	}
+	
+	protected void ShowAttached()
+	{
+		SetAnimationPhase( "Combination_Lock_Attached", 0 );
+		SetAnimationPhase( "Lock_Attached_1", 			0 );
+		SetAnimationPhase( "Lock_Attached_2", 			0 );
+	}
+	
+	protected void HideAttached()
+	{
+		SetAnimationPhase( "Combination_Lock_Attached", 1 );
+		SetAnimationPhase( "Lock_Attached_1", 			1 );
+		SetAnimationPhase( "Lock_Attached_2", 			1 );
+	}	
+	// ---	
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	protected void SoundLockOpen()
+	{
+		PlaySoundSet( m_Sound, SOUND_LOCK_OPEN, 0, 0 );
+	}
+
+	protected void SoundLockClose()
+	{
+		PlaySoundSet( m_Sound, SOUND_LOCK_CLOSE, 0, 0 );
+	}
+	
+	void SoundLockChangeNumber()
+	{
+		PlaySoundSet( m_Sound, SOUND_LOCK_CHANGE_NUMBER, 0, 0 );
+	}
+
+	void SoundLockChangeDial()
+	{
+		PlaySoundSet( m_Sound, SOUND_LOCK_CHANGE_DIAL, 0, 0 );
+	}	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionAttachToConstruction);		
+		AddAction(ActionNextCombinationLockDial);
+		AddAction(ActionDialCombinationLock);
+		AddAction(ActionNextCombinationLockDialOnTarget);
+		AddAction(ActionDialCombinationLockOnTarget);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CombinationLock4.c b/scripts/4_World/DayZ/Entities/ItemBase/CombinationLock4.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3ba1af1d2a762bc4d822a00a31527704a337cbc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CombinationLock4.c
@@ -0,0 +1,11 @@
+class CombinationLock4 extends CombinationLock
+{
+	override void SetBaseLockValues()
+	{
+		//set lock init values
+		m_LockDigits 			= 4;
+		m_Combination		 	= 1111;
+		m_CombinationLocked 	= 9999;
+		m_IsLocked 				= false;
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Compass.c b/scripts/4_World/DayZ/Entities/ItemBase/Compass.c
new file mode 100644
index 0000000000000000000000000000000000000000..879e9a453f0f433937033656a65972c121dcb9e1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Compass.c
@@ -0,0 +1,62 @@
+class Compass : ItemCompass
+{
+	protected ref OpenableBehaviour m_Openable;
+	
+	void Compass()
+	{
+		m_Openable = new OpenableBehaviour(false);
+		
+		RegisterNetSyncVariableBool("m_Openable.m_IsOpened");
+		
+		UpdateVisualState();
+	}
+
+	override void Open()
+	{
+		m_Openable.Open();
+		SetSynchDirty();
+
+		UpdateVisualState();
+	}
+
+	override void Close()
+	{
+		m_Openable.Close();
+		SetSynchDirty();
+
+		UpdateVisualState();
+	}
+	
+	override bool IsOpen()
+	{
+		return m_Openable.IsOpened();
+	}
+
+	protected void UpdateVisualState()
+	{
+		if ( IsOpen() )
+		{
+			SetAnimationPhase("cover", 1.0);
+		}
+		else
+		{
+			SetAnimationPhase("cover", 0.0);
+		}
+	}
+	
+    override void OnVariablesSynchronized()
+    {
+        super.OnVariablesSynchronized();
+
+        UpdateVisualState();
+    }
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+		AddAction(ActionClose);
+		AddAction(ActionViewCompass);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Container_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..913aeeb24c681d697b64139dbd1060f00a9b9b74
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base.c
@@ -0,0 +1,98 @@
+class Container_Base : ItemBase
+{
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+
+		if (parent && (parent == this || GetType() == parent.GetType() || parent.GetInventory().IsCargoInHiearchy()))
+			return false;
+		
+		return true;
+	}
+
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if (!super.CanReceiveItemIntoCargo(item))
+			return false;
+		
+		//is 'this' somewhere in cargo?
+		if (GetInventory().IsCargoInHiearchy())
+			return false;
+		
+		return true;
+	}
+}
+
+class DeployableContainer_Base : Container_Base
+{
+	protected vector m_HalfExtents; // The Y value contains a heightoffset and not the halfextent !!!
+	
+	void DeployableContainer_Base()
+	{
+		m_HalfExtents = vector.Zero;
+		
+		ProcessInvulnerabilityCheck(GetInvulnerabilityTypeString());
+	}
+	
+	override string GetInvulnerabilityTypeString()
+	{
+		return "disableContainerDamage";
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPlaceObject);
+	}
+	
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		if (GetHealthLevel() == GameConstants.STATE_RUINED)
+			return false;
+		
+		return super.CanReceiveAttachment(attachment, slotId);
+	}
+	
+	override bool CanLoadAttachment(EntityAI attachment)
+	{
+		if (GetHealthLevel() == GameConstants.STATE_RUINED)
+			return false;
+		
+		return super.CanLoadAttachment(attachment);
+	}
+
+	override bool CanReceiveItemIntoCargo(EntityAI item)
+	{
+		if (GetHealthLevel() == GameConstants.STATE_RUINED)
+			return false;
+
+		return super.CanReceiveItemIntoCargo(item);
+	}
+	
+	override bool CanLoadItemIntoCargo(EntityAI item)
+	{
+		if (!super.CanLoadItemIntoCargo(item))
+			return false;
+
+		if (GetHealthLevel() == GameConstants.STATE_RUINED)
+			return false;
+
+		return true;
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if (newLevel == GameConstants.STATE_RUINED && !GetHierarchyParent())
+			MiscGameplayFunctions.DropAllItemsInInventoryInBounds(this, m_HalfExtents);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/AnniversaryBox.c b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/AnniversaryBox.c
new file mode 100644
index 0000000000000000000000000000000000000000..7baed5a1bf7b30cc367cd974c776588fb64ac5db
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/AnniversaryBox.c
@@ -0,0 +1,94 @@
+class AnniversaryBox extends Container_Base
+{
+	private const int SPAWN_SHIRTS_MAX = 60;
+	
+	#ifndef SERVER
+	protected AnniversaryBoxLight m_Light;
+	#endif
+	
+	override void DeferredInit()
+	{		
+		super.DeferredInit();		
+		
+		#ifndef SERVER
+		m_Light = AnniversaryBoxLight.Cast(ScriptedLightBase.CreateLight(AnniversaryBoxLight, "0 0 0"));
+		if (m_Light)
+			m_Light.AttachOnMemoryPoint(this, "light");
+		#endif
+				
+	}
+		
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		#ifndef SERVER
+		if (m_Light)
+			m_Light.Destroy();
+		#endif
+	}	
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override bool IsTakeable()
+	{
+		return false;
+	}
+	
+	override bool CanSwapEntities(EntityAI otherItem, InventoryLocation otherDestination, InventoryLocation destination)
+	{
+		return false;
+	}
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		return false;
+	}
+	
+	override bool DisableVicinityIcon()
+	{
+		if (GetAnimationPhase("lidclosing") == 1)
+		{
+			return true;
+		}
+		else
+			return false;	
+	}
+	
+	override bool CanDisplayCargo()
+	{
+		if (GetAnimationPhase("lidclosing") == 1)
+		{
+			return false;
+		}
+		else
+			return true;
+	}
+	
+	void EmtpyInventory()
+	{
+		if (GetGame().IsServer())//server or single player
+		{		
+			for ( int j = 0; j < GetInventory().GetCargo().GetItemCount(); j++ )
+			{
+				GetInventory().GetCargo().GetItem(j).Delete();
+			}
+		}
+	}
+	
+	void FillInventory()
+	{
+		if (GetGame().IsServer())//server or single player
+		{		
+			EntityAI ent = GetInventory().CreateInInventory("TShirt_10thAnniversary");
+			
+			for (int i = 0; ent && i < SPAWN_SHIRTS_MAX - 1; i++)
+			{
+				ent = GetInventory().CreateInInventory("TShirt_10thAnniversary");
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/EN5C_Bear_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/EN5C_Bear_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..abf690427b7c64981d42167d09f39319e46a8f51
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/EN5C_Bear_ColorBase.c
@@ -0,0 +1,35 @@
+class Bear_ColorBase extends Container_Base
+{
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}	
+		//better use something like super.GetName()
+		if ( parent && (parent.IsKindOf("Bear_ColorBase")) )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+}
+
+class Bear_Beige : Bear_ColorBase
+{
+}
+
+class Bear_Dark : Bear_ColorBase
+{
+}
+
+class Bear_Pink : Bear_ColorBase
+{
+}
+
+class Bear_White : Bear_ColorBase
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/EN5C_WaterproofBag_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/EN5C_WaterproofBag_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..5bae0a4d4a093dad27eda437fbb4c0feed51da62
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Container_Base/EN5C_WaterproofBag_ColorBase.c
@@ -0,0 +1,17 @@
+class WaterproofBag_ColorBase : Container_Base
+{
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+		
+		if (parent && (parent.IsKindOf("AmmoBox") || parent.IsKindOf("WaterproofBag_ColorBase")))
+			return false;
+		
+		return true;
+	}
+}
+
+class WaterproofBag_Yellow : WaterproofBag_ColorBase {};
+class WaterproofBag_Green : WaterproofBag_ColorBase {};
+class WaterproofBag_Orange : WaterproofBag_ColorBase {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CookingStand.c b/scripts/4_World/DayZ/Entities/ItemBase/CookingStand.c
new file mode 100644
index 0000000000000000000000000000000000000000..fc0594ed6d412727211b5a98cf283d8f432a561c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CookingStand.c
@@ -0,0 +1,4 @@
+class CookingStand extends TripodBase
+{
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/CrudeMachete.c b/scripts/4_World/DayZ/Entities/ItemBase/CrudeMachete.c
new file mode 100644
index 0000000000000000000000000000000000000000..029878e32d01716944722bcaa53fc5a7e81e847f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/CrudeMachete.c
@@ -0,0 +1,29 @@
+class CrudeMachete extends ToolBase
+{
+	void Machete()
+	{
+	}
+
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Defibrillator.c b/scripts/4_World/DayZ/Entities/ItemBase/Defibrillator.c
new file mode 100644
index 0000000000000000000000000000000000000000..a370dc777c8b1e752b798a2d92fcd77310323eb2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Defibrillator.c
@@ -0,0 +1,156 @@
+class Defibrillator extends ItemBase
+{
+	static const string	CHARGING_SOUND = 			"defibrillator_charge_SoundSet";
+	static const string	CHARGED_AND_READY_SOUND = 	"defibrillator_ready_SoundSet";
+	static const string	SHOCK_SOUND = 				"defibrillator_shock_SoundSet";
+	
+	bool m_IsCharged = false;
+	
+	static float m_ChargeTime = 5;
+	static float m_EnergyNeededToCharge = 20; 
+	
+	ref Timer m_ChargingTimer;
+	EffectSound m_ChargedAlarm;
+	EffectSound m_ChargingSound;
+	
+	void Defibrillator()
+	{
+		// Read all config parameters
+		//m_ChargeTime = GetTimeNeededToCharge();
+		m_EnergyNeededToCharge = GetEnergyNeededToCharge();
+	}
+	
+	void ~Defibrillator()
+	{
+		SEffectManager.DestroyEffect(m_ChargedAlarm);
+		SEffectManager.DestroyEffect(m_ChargingSound);		
+	}
+	
+	float GetTimeNeededToCharge()
+	{
+		string cfg_path = "CfgVehicles " + GetType() + " ";
+		return GetGame().ConfigGetFloat (cfg_path + "defibChargeTime");
+	}
+	
+	float GetEnergyNeededToCharge()
+	{
+		string cfg_path = "CfgVehicles " + GetType() + " ";
+		return GetGame().ConfigGetFloat (cfg_path + "defibEnergyNeededPerCharge");
+	}
+	
+	override void OnWorkStart()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+			m_ChargingSound = SEffectManager.PlaySoundOnObject(CHARGING_SOUND, this, 0, 0.15);
+		
+		float energy_needed = m_EnergyNeededToCharge / m_ChargeTime;
+		GetCompEM().SetEnergyUsage(energy_needed);
+		
+		if (!m_ChargingTimer)
+			m_ChargingTimer = new Timer( CALL_CATEGORY_GAMEPLAY );
+		
+		if ( !m_ChargingTimer.IsRunning() )
+		{
+			m_ChargingTimer.Run(m_ChargeTime, this, "OnIsCharged", NULL, false);
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		GetCompEM().SwitchOff();
+		GetCompEM().ResetEnergyUsage();
+		StopChargingTimer();
+		StopChargedAlarm();
+		StopChargingSound();
+		
+		m_IsCharged = false;
+	}
+	
+	void OnIsCharged()
+	{
+		if ( GetCompEM().IsWorking() )
+		{
+			if (!GetGame().IsMultiplayer()  ||  GetGame().IsClient())
+			{
+				//m_ChargedAlarm = PlaySoundLoop(CHARGED_AND_READY_SOUND, 40);
+				m_ChargedAlarm = SEffectManager.PlaySoundOnObject(CHARGED_AND_READY_SOUND, this);
+				m_ChargingSound.SoundStop();
+			}
+			GetCompEM().ResetEnergyUsage();
+			m_IsCharged = true;
+		}
+	}
+	
+	void StopChargedAlarm()
+	{
+		if (m_ChargedAlarm)
+		{
+			//GetGame().ObjectDelete(m_ChargedAlarm);
+			m_ChargedAlarm.SoundStop();
+			m_ChargedAlarm = NULL;
+		}
+	}	
+	
+	void StopChargingSound()
+	{
+		if(m_ChargingSound)
+		{
+			m_ChargingSound.SoundStop();
+		}
+	}
+	
+	void StopChargingTimer()
+	{
+		if (m_ChargingTimer)
+		{
+			m_ChargingTimer.Stop();
+			m_ChargingTimer = NULL;
+		}
+	}
+	
+	bool IsCharged()
+	{
+		return m_IsCharged;
+	}
+	
+	void DischargeServer(PlayerBase victim)
+	{
+		/*
+		bool has_heart_attack = victim.m_ModifiersManager.IsModifierActive(eModifiers.MDF_HEART_ATTACK);
+		
+		if ( has_heart_attack )
+		{
+			victim.m_ModifiersManager.DeactivateModifier ( eModifiers.MDF_HEART_ATTACK );
+		}
+		else
+		{
+			victim.m_ModifiersManager.ActivateModifier ( eModifiers.MDF_HEART_ATTACK );
+		}
+		*/
+		/*
+		if (!GetGame().IsMultiplayer()  ||  GetGame().IsClient())
+		{
+			SEffectManager.PlaySoundOnObject(SHOCK_SOUND, this);
+		}*/
+		
+		victim.SetPulseType(!victim.GetPulseType());
+		victim.SetHealth("","Shock",0);
+
+		GetCompEM().SwitchOff();
+	}
+	
+	void DischargeClient(PlayerBase victim)
+	{
+		SEffectManager.PlaySoundOnObject(SHOCK_SOUND, this);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnWhileInHands);
+		AddAction(ActionTurnOffWhileInHands);
+		AddAction(ActionDefibrilateTarget);
+		AddAction(ActionDefibrilateSelf);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ef4bdf79d6c2baad7a2dbd6097f60aa97ce3d06
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base.c
@@ -0,0 +1,821 @@
+class Edible_Base : ItemBase
+{
+	const string DIRECT_COOKING_SLOT_NAME 	= "DirectCooking";
+
+	const string SOUND_BAKING_START 		= "Baking_SoundSet";
+	const string SOUND_BAKING_DONE 			= "Baking_Done_SoundSet";
+	const string SOUND_BURNING_DONE 		= "Food_Burning_SoundSet";
+
+	protected bool m_MakeCookingSounds;
+	protected SoundOnVehicle m_SoundCooking; //! DEPRECATED
+	protected EffectSound m_SoundEffectCooking;
+	protected string m_SoundPlaying;
+	ref FoodStage m_FoodStage;
+	protected float m_DecayTimer;
+	protected float m_DecayDelta = 0.0;
+	protected FoodStageType m_LastDecayStage = FoodStageType.NONE;
+	
+	private CookingMethodType m_CookedByMethod;
+	
+	void Edible_Base()
+	{
+		if (HasFoodStage())
+		{
+			m_FoodStage = new FoodStage(this);
+			
+			RegisterNetSyncVariableInt("m_FoodStage.m_FoodStageType",  FoodStageType.NONE, FoodStageType.COUNT);
+			RegisterNetSyncVariableInt("m_FoodStage.m_SelectionIndex", 0, 6);
+			RegisterNetSyncVariableInt("m_FoodStage.m_TextureIndex",   0, 6);
+			RegisterNetSyncVariableInt("m_FoodStage.m_MaterialIndex",  0, 6);
+			RegisterNetSyncVariableFloat("m_FoodStage.m_CookingTime",  0, 600, 0);
+
+			m_SoundPlaying = "";
+			m_CookedByMethod = CookingMethodType.NONE;
+			RegisterNetSyncVariableInt("m_CookedByMethod", CookingMethodType.NONE, CookingMethodType.COUNT);
+			RegisterNetSyncVariableBool("m_MakeCookingSounds");
+		}
+	}
+	
+	override void EEInit()
+	{
+		super.EEInit();
+		
+		UpdateVisuals();
+	}
+
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		RemoveAudio();
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+
+		//! disable sounds (from cooking)		
+		if (oldLoc.GetType() == InventoryLocationType.ATTACHMENT || oldLoc.GetType() == InventoryLocationType.CARGO)
+		{
+			switch (oldLoc.GetParent().GetType())
+			{
+				case "FryingPan":
+				case "Pot":
+				case "Cauldron":
+				case "SharpWoodenStick":
+					MakeSoundsOnClient(false);
+				break;
+			}
+			
+			//! check for DirectCooking slot name
+ 			if (oldLoc.GetSlot() > -1 && InventorySlots.GetSlotName(oldLoc.GetSlot()).Contains(DIRECT_COOKING_SLOT_NAME))
+			{
+				MakeSoundsOnClient(false);
+			}
+		}
+	}
+
+	void UpdateVisuals()
+	{
+		if (GetFoodStage())
+		{
+			GetFoodStage().UpdateVisuals();
+		}
+	}
+	
+	bool Consume(float amount, PlayerBase consumer)
+	{
+		AddQuantity(-amount, false, false);
+		OnConsume(amount, consumer);
+
+		return true;
+	}
+	
+	void OnConsume(float amount, PlayerBase consumer);	
+	
+	//food staging
+	override bool CanBeCooked()
+	{
+		return false;
+	}
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+	
+	//================================================================
+	// SYNCHRONIZATION
+	//================================================================	
+	void Synchronize()
+	{
+		SetSynchDirty();
+			
+		if (GetGame().IsMultiplayer())
+		{
+			UpdateVisuals();
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		UpdateVisuals();
+
+		//update audio
+		if (m_MakeCookingSounds)
+		{
+			RefreshAudio();
+		}
+		else
+		{
+			RemoveAudio();
+		}
+	}
+
+	//================================================================
+	// AUDIO EFFECTS (WHEN ON DCS)
+	//================================================================	
+	void MakeSoundsOnClient(bool soundstate, CookingMethodType cookingMethod = CookingMethodType.NONE)
+	{
+		m_MakeCookingSounds = soundstate;
+		m_CookedByMethod 	= cookingMethod;
+
+		Synchronize();
+	}
+
+	protected void RefreshAudio()
+	{
+		string soundName = "";
+		
+		FoodStageType nextFoodState = GetNextFoodStageType(m_CookedByMethod);
+
+		switch (GetFoodStageType())
+		{
+			case FoodStageType.RAW:
+				soundName = SOUND_BAKING_START;
+				if (nextFoodState == FoodStageType.BOILED)
+					soundName = "";
+				break;
+			case FoodStageType.BAKED:
+				soundName = SOUND_BAKING_DONE;
+				break;
+			case FoodStageType.BURNED:
+				soundName = SOUND_BURNING_DONE;
+				break;
+			default:
+				soundName = "";
+				break;
+		}
+
+		SoundCookingStart(soundName);
+	}
+
+	protected void RemoveAudio()
+	{
+		m_MakeCookingSounds = false;
+		SoundCookingStop();
+	}
+
+	//================================================================
+	// SERIALIZATION
+	//================================================================	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{   
+		super.OnStoreSave(ctx);
+
+		if (GetFoodStage())
+		{
+			GetFoodStage().OnStoreSave(ctx);
+		}
+		
+		// food decay
+		ctx.Write(m_DecayTimer);
+		ctx.Write(m_LastDecayStage);
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+
+		if (GetFoodStage())
+		{
+			if (!GetFoodStage().OnStoreLoad(ctx, version))
+				return false;
+		}
+		
+		if (version >= 115)
+		{
+			if (!ctx.Read(m_DecayTimer))
+			{
+				m_DecayTimer = 0.0;
+				return false;
+			}
+			if (!ctx.Read(m_LastDecayStage))
+			{
+				m_LastDecayStage = FoodStageType.NONE;
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+		
+		Synchronize();
+	}	
+
+	//get food stage
+	FoodStage GetFoodStage()
+	{
+		return m_FoodStage;
+	}
+	
+	//food types
+	override bool IsMeat()
+	{
+		return false;
+	}
+	
+	override bool IsCorpse()
+	{
+		return false;
+	}
+	
+	override bool IsFruit()
+	{
+		return false;
+	}
+	
+	override bool IsMushroom()
+	{
+		return false;
+	}	
+	
+	//================================================================
+	// NUTRITIONAL VALUES
+	//================================================================	
+	//food properties
+	static float GetFoodTotalVolume(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			 return FoodStage.GetFullnessIndex(food_item.GetFoodStage());
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetFullnessIndex(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetFloat( class_path + " fullnessIndex" );
+
+	}
+	
+	static float GetFoodEnergy(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			 return FoodStage.GetEnergy(food_item.GetFoodStage());
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetEnergy(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetFloat( class_path + " energy" );			
+	}
+	
+	static float GetFoodWater(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			return FoodStage.GetWater(food_item.GetFoodStage());
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetWater(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetFloat( class_path + " water" );			
+	}
+	
+	static float GetFoodNutritionalIndex(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			return FoodStage.GetNutritionalIndex(food_item.GetFoodStage());	
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetNutritionalIndex(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetFloat( class_path + " nutritionalIndex" );		
+		
+	}
+	
+	static float GetFoodToxicity(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			return FoodStage.GetToxicity(food_item.GetFoodStage());
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetToxicity(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetFloat( class_path + " toxicity" );			
+	}
+	
+	static int GetFoodAgents(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			return FoodStage.GetAgents(food_item.GetFoodStage());
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetAgents(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetInt( class_path + " agents" );
+	}
+	
+	static float GetFoodDigestibility(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		Edible_Base food_item = Edible_Base.Cast(item);
+		if (food_item && food_item.GetFoodStage())
+		{
+			return FoodStage.GetDigestibility(food_item.GetFoodStage());
+		}
+		else if (classname != "" && food_stage)
+		{
+			return FoodStage.GetDigestibility(null, food_stage, classname);
+		}
+		string class_path = string.Format("cfgVehicles %1 Nutrition", classname);
+		return GetGame().ConfigGetInt( class_path + " digestibility" );
+	}
+	
+	static NutritionalProfile GetNutritionalProfile(ItemBase item, string classname = "", int food_stage = 0)
+	{
+		return new NutritionalProfile(GetFoodEnergy(item, classname, food_stage),GetFoodWater(item, classname, food_stage),GetFoodNutritionalIndex(item, classname, food_stage),GetFoodTotalVolume(item, classname, food_stage), GetFoodToxicity(item, classname, food_stage),  GetFoodAgents(item, classname,food_stage), GetFoodDigestibility(item, classname,food_stage));
+	}
+	
+	//================================================================
+	// FOOD STAGING
+	//================================================================
+	FoodStageType GetFoodStageType()
+	{
+		return GetFoodStage().GetFoodStageType();
+	}
+	
+	//food stage states
+	bool IsFoodRaw()
+	{
+		if ( GetFoodStage() ) 
+		{
+			return GetFoodStage().IsFoodRaw();
+		}
+		
+		return false;
+	}
+
+	bool IsFoodBaked()
+	{
+		if ( GetFoodStage() ) 
+		{
+			return GetFoodStage().IsFoodBaked();
+		}
+		
+		return false;
+	}
+	
+	bool IsFoodBoiled()
+	{
+		if ( GetFoodStage() ) 
+		{
+			return GetFoodStage().IsFoodBoiled();
+		}
+		
+		return false;
+	}
+	
+	bool IsFoodDried()
+	{
+		if ( GetFoodStage() ) 
+		{
+			return GetFoodStage().IsFoodDried();
+		}
+		
+		return false;
+	}
+	
+	bool IsFoodBurned()
+	{
+		if ( GetFoodStage() ) 
+		{
+			return GetFoodStage().IsFoodBurned();
+		}
+		
+		return false;
+	}
+	
+	bool IsFoodRotten()
+	{
+		if ( GetFoodStage() ) 
+		{
+			return GetFoodStage().IsFoodRotten();
+		}
+		
+		return false;
+	}				
+	
+	//food stage change
+	void ChangeFoodStage( FoodStageType new_food_stage_type )
+	{
+		GetFoodStage().ChangeFoodStage( new_food_stage_type );
+	}
+	
+	FoodStageType GetNextFoodStageType( CookingMethodType cooking_method )
+	{
+		return GetFoodStage().GetNextFoodStageType( cooking_method );
+	}
+	
+	string GetFoodStageName( FoodStageType food_stage_type )
+	{
+		return GetFoodStage().GetFoodStageName( food_stage_type );
+	}
+	
+	bool CanChangeToNewStage( CookingMethodType cooking_method )
+	{
+		return GetFoodStage().CanChangeToNewStage( cooking_method );
+	}
+	
+	//Use this to receive food stage from another Edible_Base
+	void TransferFoodStage( notnull Edible_Base source )
+	{
+		if ( !source.HasFoodStage())
+			return;
+		m_LastDecayStage = source.GetLastDecayStage();
+		ChangeFoodStage(source.GetFoodStage().GetFoodStageType());
+		m_DecayTimer = source.GetDecayTimer();
+		m_DecayDelta = source.GetDecayDelta();
+	}
+	
+	//================================================================
+	// COOKING
+	//================================================================
+	//cooking time
+	float GetCookingTime()
+	{
+		return GetFoodStage().GetCookingTime();
+	}
+	
+	void SetCookingTime( float time )
+	{
+		GetFoodStage().SetCookingTime( time );
+		
+		//synchronize when calling on server
+		Synchronize();
+	}
+	
+	//replace edible with new item (opening cans)
+	void ReplaceEdibleWithNew( string typeName )
+	{
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		if (player)
+		{
+			ReplaceEdibleWithNewLambda lambda = new ReplaceEdibleWithNewLambda(this, typeName, player);
+			player.ServerReplaceItemInHandsWithNew(lambda);
+		}
+		else
+			Error("ReplaceEdibleWithNew - cannot use edible without player");
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+
+	protected void SoundCookingStart(string sound_name)
+	{
+		#ifndef SERVER
+		if (m_SoundPlaying != sound_name)
+		{
+			SoundCookingStop();
+
+			m_SoundEffectCooking = SEffectManager.PlaySound(sound_name, GetPosition(), 0, 0, true);
+			m_SoundPlaying = sound_name;
+		}
+		#endif
+	}
+
+	protected void SoundCookingStop()
+	{
+		#ifndef SERVER
+		if (m_SoundEffectCooking)
+		{
+			m_SoundEffectCooking.Stop();
+			m_SoundEffectCooking = null;
+			m_SoundPlaying = "";
+		}
+		#endif
+	}
+	
+	override bool CanHaveTemperature()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return false;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return ( GetFoodStageType() != FoodStageType.ROTTEN );
+	}
+	
+	override void ProcessDecay( float delta, bool hasRootAsPlayer )
+	{
+		delta *= DayZGame.Cast(GetGame()).GetFoodDecayModifier();
+		m_DecayDelta += ( 1 + ( 1 - GetHealth01( "", "" ) ) );
+		if ( hasRootAsPlayer )
+			m_DecayDelta += GameConstants.DECAY_RATE_ON_PLAYER;
+		
+		/*Print( "-------------------------" );
+		Print( this );
+		Print( m_DecayTimer );
+		Print( m_DecayDelta );
+		Print( m_LastDecayStage );*/
+		
+		if ( IsFruit() || IsMushroom() )
+		{
+			// fruit, vegetables and mushrooms
+			if ( m_LastDecayStage != GetFoodStageType() )
+			{
+				switch ( GetFoodStageType() )
+				{
+					case FoodStageType.RAW:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_RAW_FRVG + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_RAW_FRVG * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.RAW;
+						break;
+					
+					case FoodStageType.BOILED:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_BOILED_FRVG + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_BOILED_FRVG * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.BOILED;
+						break;
+					
+					case FoodStageType.BAKED:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_BAKED_FRVG + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_BAKED_FRVG * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.BAKED;
+						break;
+					
+					case FoodStageType.DRIED:
+					case FoodStageType.BURNED:
+					case FoodStageType.ROTTEN:
+					default:
+						m_DecayTimer = -1;
+						m_LastDecayStage = FoodStageType.NONE;
+						return;
+				}
+				
+				//m_DecayTimer = m_DecayTimer / 1000.0;
+			}
+			
+			m_DecayTimer -= ( delta * m_DecayDelta );
+						
+			if ( m_DecayTimer <= 0 ) 
+			{
+				if ( m_LastDecayStage != FoodStageType.NONE )
+				{
+					// switch to decayed stage
+					if ( ( m_LastDecayStage == FoodStageType.BOILED ) || ( m_LastDecayStage == FoodStageType.BAKED ) )
+					{
+						ChangeFoodStage( FoodStageType.ROTTEN );
+					} 
+					if ( m_LastDecayStage == FoodStageType.RAW )
+					{
+						int rng = Math.RandomIntInclusive( 0, 100 );
+						if ( rng > GameConstants.DECAY_FOOD_FRVG_DRIED_CHANCE )
+						{
+							ChangeFoodStage( FoodStageType.ROTTEN );
+						}
+						else
+						{
+							if ( CanChangeToNewStage( FoodStageType.DRIED ) )
+							{
+								ChangeFoodStage( FoodStageType.DRIED );
+							}
+							else
+							{
+								ChangeFoodStage( FoodStageType.ROTTEN );
+							}
+						}
+					}
+				}
+			}
+
+		}
+		else if ( IsMeat() )
+		{
+			// meat
+			if ( m_LastDecayStage != GetFoodStageType() )
+			{
+				switch ( GetFoodStageType() )
+				{
+					case FoodStageType.RAW:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_RAW_MEAT + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_RAW_MEAT * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.RAW;
+						break;
+					
+					case FoodStageType.BOILED:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_BOILED_MEAT + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_BOILED_MEAT * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.BOILED;
+						break;
+					
+					case FoodStageType.BAKED:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_BAKED_MEAT + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_BAKED_MEAT * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.BAKED;
+						break;
+					
+					case FoodStageType.DRIED:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_DRIED_MEAT + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_DRIED_MEAT * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.DRIED;
+						break;
+
+					case FoodStageType.BURNED:
+					case FoodStageType.ROTTEN:
+					default:
+						m_DecayTimer = -1;
+						m_LastDecayStage = FoodStageType.NONE;
+						return;
+				}
+			}
+			
+			m_DecayTimer -= ( delta * m_DecayDelta );
+			
+			if ( m_DecayTimer <= 0 ) 
+			{
+				if ( m_LastDecayStage != FoodStageType.NONE )
+				{
+					// switch to decayed stage
+					if ( ( m_LastDecayStage == FoodStageType.DRIED ) || ( m_LastDecayStage == FoodStageType.RAW ) || ( m_LastDecayStage == FoodStageType.BOILED ) || ( m_LastDecayStage == FoodStageType.BAKED ) )
+					{
+						ChangeFoodStage( FoodStageType.ROTTEN );
+					}
+				}
+			}
+		}
+		else if ( IsCorpse() )
+		{
+			// corpse
+			if ( m_LastDecayStage != GetFoodStageType() )
+			{
+				switch ( GetFoodStageType() )
+				{
+					case FoodStageType.RAW:
+						m_DecayTimer = ( GameConstants.DECAY_FOOD_RAW_CORPSE + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_RAW_CORPSE * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+						m_LastDecayStage = FoodStageType.RAW;
+						break;
+
+					case FoodStageType.BURNED:
+					case FoodStageType.ROTTEN:
+					default:
+						m_DecayTimer = -1;
+						m_LastDecayStage = FoodStageType.NONE;
+						return;
+				}
+			}
+			
+			m_DecayTimer -= ( delta * m_DecayDelta );
+			
+			if ( m_DecayTimer <= 0 ) 
+			{
+				if ( m_LastDecayStage != FoodStageType.NONE )
+				{
+					// switch to decayed stage
+					if ( ( m_LastDecayStage == FoodStageType.DRIED ) || ( m_LastDecayStage == FoodStageType.RAW ) || ( m_LastDecayStage == FoodStageType.BOILED ) || ( m_LastDecayStage == FoodStageType.BAKED ) )
+					{
+						ChangeFoodStage( FoodStageType.ROTTEN );
+					}
+				}
+			}
+		}
+		else
+		{
+			// opened cans
+			m_DecayTimer -= ( delta * m_DecayDelta );
+
+			if ( ( m_DecayTimer <= 0 ) && ( m_LastDecayStage == FoodStageType.NONE ) )
+			{
+				m_DecayTimer = ( GameConstants.DECAY_FOOD_CAN_OPEN + ( Math.RandomFloat01() * ( GameConstants.DECAY_FOOD_DRIED_MEAT * ( GameConstants.DECAY_TIMER_RANDOM_PERCENTAGE / 100.0 ) ) ) );
+				m_LastDecayStage = FoodStageType.RAW;
+				//m_DecayTimer = m_DecayTimer / 1000.0;
+			}
+			else
+			{
+				if ( m_DecayTimer <= 0 )
+				{
+					InsertAgent(eAgents.FOOD_POISON, 1);
+					m_DecayTimer = -1;
+				}
+			}
+		}
+		
+		m_DecayDelta = 0.0;
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		super.GetDebugActions(outputList);
+		
+		if (HasFoodStage())
+		{
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.FOOD_STAGE_PREV, "Food Stage Prev", FadeColors.WHITE));
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.FOOD_STAGE_NEXT, "Food Stage Next", FadeColors.WHITE));
+		}
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		super.OnAction(action_id, player, ctx);
+		
+		if ( GetGame().IsServer() )
+		{
+			if ( action_id == EActions.FOOD_STAGE_PREV )
+			{
+				int food_stage_prev = GetFoodStageType() - 1;
+				if (food_stage_prev <= 0)
+				{
+					food_stage_prev = FoodStageType.COUNT - 1;
+				}
+				ChangeFoodStage(food_stage_prev);
+				return true;
+			}
+			else if ( action_id == EActions.FOOD_STAGE_NEXT )
+			{
+				int food_stage_next = GetFoodStageType() + 1;
+				if (food_stage_next >= FoodStageType.COUNT )
+				{
+					food_stage_next = FoodStageType.RAW;
+				}
+				ChangeFoodStage(food_stage_next);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override string GetDebugText()
+	{
+		string debug_output;
+
+		debug_output = super.GetDebugText();
+		
+		debug_output+="m_CookedByMethod:"+m_CookedByMethod+"\n";
+		debug_output+="m_MakeCookingSounds:"+m_MakeCookingSounds+"\n";
+
+		return debug_output;
+	}
+
+	//================================================================
+	// GENERAL GETTERS
+	//================================================================
+	
+	float GetDecayTimer()
+	{
+		return m_DecayTimer;
+	}
+	
+	float GetDecayDelta()
+	{
+		return m_DecayDelta;
+	}
+	
+	FoodStageType GetLastDecayStage()
+	{
+		return m_LastDecayStage;
+	}
+}
+
+class ReplaceEdibleWithNewLambda : TurnItemIntoItemLambda
+{
+	void ReplaceEdibleWithNewLambda(EntityAI old_item, string new_item_type, PlayerBase player) { }
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AgaricusMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AgaricusMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..9408def1621d9770279d2c2fb0e5b7f80ba8dc39
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AgaricusMushroom.c
@@ -0,0 +1,10 @@
+class AgaricusMushroom : MushroomBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AmanitaMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AmanitaMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a3060117a76ff7b0c052b23667daeaa2fe20ffb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AmanitaMushroom.c
@@ -0,0 +1,3 @@
+class AmanitaMushroom : MushroomBase
+{
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Apple.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Apple.c
new file mode 100644
index 0000000000000000000000000000000000000000..672b095fe55101306edfae5f2d6880bc47dabae6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Apple.c
@@ -0,0 +1,48 @@
+class Apple : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AuriculariaMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AuriculariaMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..79ded21fcc3660ac3dbdb83e86ca6c661bea9d02
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/AuriculariaMushroom.c
@@ -0,0 +1,10 @@
+class AuriculariaMushroom : MushroomBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BakedBeansCan.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BakedBeansCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..2f2de3289c6249a118146d9be3582cbd8556af27
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BakedBeansCan.c
@@ -0,0 +1,7 @@
+class BakedBeansCan : Edible_Base
+{
+	override void Open()
+	{
+		ReplaceEdibleWithNew("BakedBeansCan_Opened");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Banana.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Banana.c
new file mode 100644
index 0000000000000000000000000000000000000000..99ebdb2160099a03ed86930a4268478b53c7842a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Banana.c
@@ -0,0 +1,32 @@
+class Banana : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return false;
+	}
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BearSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BearSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..e88a9d8d986ada469294248f8d1e862e98f01cae
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BearSteakMeat.c
@@ -0,0 +1,33 @@
+class BearSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bitterlings.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bitterlings.c
new file mode 100644
index 0000000000000000000000000000000000000000..8a5a1420cb0704dadfb7c25c68cb9311ffa83766
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bitterlings.c
@@ -0,0 +1,30 @@
+class Bitterlings extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+
+	override bool CanBeCooked()
+	{
+		return true;
+	}	
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoarSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoarSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f91f552712ca8617abae18aeda7cb1de815c384
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoarSteakMeat.c
@@ -0,0 +1,33 @@
+class BoarSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoletusMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoletusMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..612df9df89dda7ea353b92dea5487ea4bfad78ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoletusMushroom.c
@@ -0,0 +1,10 @@
+class BoletusMushroom : MushroomBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..32443870009c130ffe02f3819334f74911726829
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base.c
@@ -0,0 +1,379 @@
+enum SoundTypeBottle
+{
+	POURING			= 1,
+	EMPTYING		= 0,	
+}
+
+class Bottle_Base extends Edible_Base
+{
+	//Particles
+	protected Particle 	m_ParticleCooking;
+	protected int 		m_ParticlePlaying 	= ParticleList.INVALID;
+	//Boiling
+	//waiting for proper particle effects
+	protected int PARTICLE_BOILING_EMPTY 	= ParticleList.COOKING_BOILING_EMPTY;
+	protected int PARTICLE_BOILING_START 	= ParticleList.COOKING_BOILING_START;
+	protected int PARTICLE_BOILING_DONE 	= ParticleList.COOKING_BOILING_DONE;
+	//Baking
+	protected int PARTICLE_BAKING_START 	= ParticleList.COOKING_BAKING_START;
+	protected int PARTICLE_BAKING_DONE 		= ParticleList.COOKING_BAKING_DONE;
+	//Drying
+	protected int PARTICLE_DRYING_START 	= ParticleList.COOKING_DRYING_START;
+	protected int PARTICLE_DRYING_DONE 		= ParticleList.COOKING_DRYING_DONE;
+	//Burning
+	protected int PARTICLE_BURNING_DONE		= ParticleList.COOKING_BURNING_DONE;
+	
+	//Sounds
+	protected EffectSound 	m_PouringLoopSound;
+	protected EffectSound 	m_EmptyingLoopSound;
+	
+	//cooking data
+	protected CookingMethodType 	m_CookingMethod;
+	protected bool 					m_CookingIsDone;
+	protected bool 					m_CookingIsEmpty;
+	protected bool 					m_CookingIsBurned;	
+	
+	//Boiling
+	const string SOUND_BOILING_EMPTY 		= "Boiling_SoundSet";
+	const string SOUND_BOILING_START 		= "Boiling_SoundSet";
+	const string SOUND_BOILING_DONE 		= "Boiling_Done_SoundSet";
+	const string SOUND_DRYING_START 		= "Drying_SoundSet";
+	const string SOUND_DRYING_DONE 			= "Drying_Done_SoundSet";
+	
+	float m_LiquidEmptyRate;
+	private const float QUANTITY_EMPTIED_PER_SEC_DEFAULT = 200; //default
+		
+	void Bottle_Base()
+	{
+		RegisterNetSyncVariableInt("m_CookingMethod", CookingMethodType.NONE, CookingMethodType.COUNT);
+		RegisterNetSyncVariableBool("m_CookingIsDone");
+		RegisterNetSyncVariableBool("m_CookingIsEmpty");
+		RegisterNetSyncVariableBool("m_CookingIsBurned");
+		
+		m_LiquidEmptyRate = QUANTITY_EMPTIED_PER_SEC_DEFAULT;
+	}
+	
+	void ~Bottle_Base()
+	{
+		SEffectManager.DestroyEffect(m_PouringLoopSound);
+		SEffectManager.DestroyEffect(m_EmptyingLoopSound);
+	}
+	
+	override void EEDelete( EntityAI parent )
+	{
+		super.EEDelete( parent );
+		
+		//remove audio visuals
+		RemoveAudioVisuals();
+	}	
+	
+	override void EECargoIn(EntityAI item)
+	{
+		super.EECargoIn(item);
+		
+		MiscGameplayFunctions.SoakItemInsideParentContainingLiquidAboveThreshold(ItemBase.Cast(item), this);
+	}
+	
+	//================================================================
+	// PARTICLES & SOUNDS
+	//================================================================
+	//Refreshes the audio and partcile effects on cooking pot
+	//is_done - is the food baked, boiled, dried?
+	//is_empty - is cooking quipment (cargo) empty?
+	//is_burned - is any of the food items in the cargo in burned food stage?
+	override void Synchronize()
+	{
+		SetSynchDirty();
+	}
+	
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx) 
+	{
+		super.OnRPC(sender, rpc_type, ctx);
+		
+		Param1<bool> p = new Param1<bool>(false);
+				
+		if (!ctx.Read(p))
+			return;
+		
+		bool play = p.param1;
+		switch (rpc_type)
+		{
+			case SoundTypeBottle.POURING:
+				if (play)
+					PlayPouringLoopSound();
+				else
+					StopPouringLoopSound();			
+
+				break;
+			
+			case SoundTypeBottle.EMPTYING:
+				if (play)
+					PlayEmptyingLoopSound();
+				else
+					StopEmptyingLoopSound();
+			
+				break;
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+
+		if (m_CookingMethod != CookingMethodType.NONE)
+		{
+			RefreshAudioVisuals(m_CookingMethod, m_CookingIsDone, m_CookingIsEmpty, m_CookingIsBurned);
+		}
+		else
+		{
+			RemoveAudioVisuals();
+		}
+	}
+	
+	void RemoveAudioVisualsOnClient()
+	{
+		m_CookingMethod	= CookingMethodType.NONE;
+		
+		Synchronize();
+	}
+	
+	void RefreshAudioVisualsOnClient( CookingMethodType cooking_method, bool is_done, bool is_empty, bool is_burned )
+	{
+		m_CookingMethod		= cooking_method;
+		m_CookingIsDone 	= is_done;
+		m_CookingIsEmpty	= is_empty;
+		m_CookingIsBurned	= is_burned;
+
+		Synchronize();
+	}
+	
+	void RefreshAudioVisuals(CookingMethodType cooking_method, bool is_done, bool is_empty, bool is_burned)
+	{
+		string soundName;
+		int particleId;
+		
+		//if at least one of the food items is burned
+		if (is_burned)
+		{
+			soundName 	= SOUND_BURNING_DONE;
+			particleId 	= PARTICLE_BURNING_DONE;
+		}
+		//proper cooking methods
+		else
+		{
+			switch (cooking_method)
+			{
+				case CookingMethodType.BOILING:
+					if (is_empty)
+					{
+						soundName 	= SOUND_BOILING_EMPTY;
+						particleId 	= PARTICLE_BOILING_EMPTY;
+					}
+					else
+					{
+						if (is_done)
+						{
+							soundName 	= SOUND_BOILING_DONE;
+							particleId 	= PARTICLE_BOILING_DONE;
+						}
+						else
+						{
+							soundName 	= SOUND_BOILING_START;
+							particleId 	= PARTICLE_BOILING_START;
+						}
+					}
+
+					break;
+
+				case CookingMethodType.BAKING:
+					if (is_done)
+					{
+						soundName 	= SOUND_BAKING_DONE;
+						particleId 	= PARTICLE_BAKING_DONE;
+					}
+					else
+					{
+						soundName 	= SOUND_BAKING_START;
+						particleId 	= PARTICLE_BAKING_START	;
+					}
+
+					break;
+
+				case CookingMethodType.DRYING:
+					if (is_done)
+					{
+						soundName 	= SOUND_DRYING_DONE;
+						particleId 	= PARTICLE_DRYING_DONE;
+					}
+					else
+					{
+						soundName 	= SOUND_DRYING_START;
+						particleId 	= PARTICLE_DRYING_START;
+					}
+				
+					break;
+				
+				default:
+					soundName = "";
+					particleId = ParticleList.NONE;
+
+					break;
+			}
+		}
+		
+		//play effects
+		ParticleCookingStart(particleId);
+		SoundCookingStart(soundName);
+	}
+	
+	void RemoveAudioVisuals()
+	{
+		ParticleCookingStop();
+		SoundCookingStop();
+	}
+	
+	//particles
+	void ParticleCookingStart(int particle_id)
+	{
+		#ifndef SERVER
+		if (m_ParticlePlaying != particle_id)
+		{
+			//stop previous particles
+			ParticleCookingStop();
+			
+			//create new
+			vector localPos = MiscGameplayFunctions.GetSteamPosition(GetHierarchyParent());
+			m_ParticleCooking = ParticleManager.GetInstance().PlayInWorld(particle_id, localPos);
+			m_ParticlePlaying = particle_id;
+		
+		}
+		#endif
+	}
+	
+	void ParticleCookingStop()
+	{
+		if (m_ParticleCooking && GetGame() && !GetGame().IsDedicatedServer())
+		{
+			m_ParticleCooking.Stop();
+			m_ParticleCooking = null;
+			m_ParticlePlaying = ParticleList.INVALID;
+		}
+	}
+		
+	void PlayPouringLoopSound()
+	{
+		if (!m_PouringLoopSound || !m_PouringLoopSound.IsSoundPlaying())
+		{
+			m_PouringLoopSound = SEffectManager.PlaySoundOnObject(GetPouringSoundset(), this, 0, 0, true);
+		}
+	}
+	
+	void StopPouringLoopSound()
+	{
+		if (m_PouringLoopSound)
+			m_PouringLoopSound.SoundStop();
+	}
+		
+	void PlayEmptyingLoopSound()
+	{
+		if (!m_EmptyingLoopSound || !m_EmptyingLoopSound.IsSoundPlaying())
+		{
+			m_EmptyingLoopSound = SEffectManager.PlaySoundOnObject(GetEmptyingLoopSoundset(), this, 0, 0, true);
+		}
+	}
+	
+	void StopEmptyingLoopSound()
+	{
+		if (m_EmptyingLoopSound)
+			m_EmptyingLoopSound.SoundStop();
+				
+		EffectSound sound =	SEffectManager.PlaySoundOnObject(GetEmptyingEndSoundset(), this);
+		sound.SetAutodestroy(true);
+	}
+		
+	string GetEmptyingLoopSoundset()
+	{		
+		vector pos = GetPosition();
+		string surfaceType = GetGame().GetPlayer().GetSurfaceType();
+		string soundSet = "";
+		
+		bool diggable = GetGame().IsSurfaceDigable(surfaceType);
+		
+		if (!diggable)
+		{
+			soundSet = GetEmptyingLoopSoundsetHard();
+		}
+		else if (diggable)
+		{
+			soundSet = GetEmptyingLoopSoundsetSoft();
+		}
+		else if (GetGame().SurfaceIsPond(pos[0], pos[2]) || GetGame().SurfaceIsSea(pos[0], pos[2]))
+		{
+			soundSet = GetEmptyingLoopSoundsetWater();
+		}
+		
+		return soundSet;
+	}
+	
+	string GetEmptyingEndSoundset()
+	{		
+		vector pos = GetPosition();
+		string surfaceType = GetGame().GetPlayer().GetSurfaceType();
+		string soundSet = "";
+		
+		bool diggable = GetGame().IsSurfaceDigable(surfaceType);
+		
+		if (!diggable)
+		{
+			soundSet = GetEmptyingEndSoundsetHard();
+		}
+		else if (diggable)
+		{
+			soundSet = GetEmptyingEndSoundsetSoft();
+		}
+		else if (GetGame().SurfaceIsPond(pos[0], pos[2]) || GetGame().SurfaceIsSea(pos[0], pos[2]))
+		{
+			soundSet = GetEmptyingEndSoundsetWater();
+		}
+		
+		return soundSet;
+	}
+
+	string GetPouringSoundset();
+	string GetEmptyingLoopSoundsetHard();
+	string GetEmptyingLoopSoundsetSoft();
+	string GetEmptyingLoopSoundsetWater();
+	string GetEmptyingEndSoundsetHard();
+	string GetEmptyingEndSoundsetSoft();
+	string GetEmptyingEndSoundsetWater();
+	
+	//! Returns base liquid empty rate (absolute)..preferrably use the 'GetLiquidThroughputCoef' instead
+	float GetLiquidEmptyRate()
+	{
+		return m_LiquidEmptyRate;
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionFillFuel);
+		AddAction(ActionFillCoolant);
+		AddAction(ActionFillGeneratorTank);
+		AddAction(ActionExtinguishFireplaceByLiquid);
+		AddAction(ActionFillBottleBase);
+		AddAction(ActionWaterGardenSlot);
+		AddAction(ActionWaterPlant);
+		AddAction(ActionForceDrink);
+		AddAction(ActionDrainLiquid);
+		AddAction(ActionPourLiquid);
+		AddAction(ActionWashHandsItemContinuous);
+		AddAction(ActionDrink);
+		AddAction(ActionEmptyBottleBase);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		SetQuantityMax();
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/CanisterGasoline.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/CanisterGasoline.c
new file mode 100644
index 0000000000000000000000000000000000000000..0eee7356b7e7ed9dae5c23f3050f78e13d7bbd56
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/CanisterGasoline.c
@@ -0,0 +1,71 @@
+class CanisterGasoline extends Bottle_Base
+{
+	void CanisterGasoline()
+	{
+	}
+	
+	void ~CanisterGasoline()
+	{
+	}
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override string GetPouringSoundset()
+	{
+		return "emptyVessle_CanisterGasoline_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetHard()
+	{
+		return "pour_HardGround_GasolineCanister_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetSoft()
+	{
+		return "pour_SoftGround_GasolineCanister_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetWater()
+	{
+		return "pour_Water_GasolineCanister_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetHard()
+	{
+		return "pour_End_HardGround_GasolineCanister_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetSoft()
+	{
+		return "pour_End_SoftGround_GasolineCanister_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetWater()
+	{
+		return "pour_End_Water_GasolineCanister_SoundSet";
+	}
+	
+	override float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_GASOLINECANISTER;
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}	
+		if ( parent && (parent.IsKindOf("CanisterGasoline"))/* && !(parent.IsKindOf("Container_Base"))*/)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override bool IsOpen()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Canteen.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Canteen.c
new file mode 100644
index 0000000000000000000000000000000000000000..f65aab175264aedde668255ed752599fc13d73f3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Canteen.c
@@ -0,0 +1,79 @@
+class Canteen extends Bottle_Base
+{
+	void Canteen()
+	{
+
+	}
+	
+	void ~Canteen()
+	{
+		
+	}
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override string GetPouringSoundset()
+	{
+		return "emptyVessle_Canteen_SoundSet";
+	}
+	
+		override string GetEmptyingLoopSoundsetHard()
+	{
+		return "pour_HardGround_Canteen_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetSoft()
+	{
+		return "pour_SoftGround_Canteen_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetWater()
+	{
+		return "pour_Water_Canteen_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetHard()
+	{
+		return "pour_End_HardGround_Canteen_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetSoft()
+	{
+		return "pour_End_SoftGround_Canteen_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetWater()
+	{
+		return "pour_End_Water_Canteen_SoundSet";
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo(parent) ) {return false;}	
+		if ( parent && (parent.IsKindOf("Canteen"))/* && !(parent.IsKindOf("Container_Base"))*/)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override bool IsOpen()
+	{
+		return true;
+	}
+	
+	override void EEOnCECreate()
+	{
+		super.EEOnCECreate();
+
+		int rand = Math.RandomInt(0, 10);
+		if (rand > 5)
+		{
+			InsertAgent(eAgents.CHOLERA, 1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Cauldron.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Cauldron.c
new file mode 100644
index 0000000000000000000000000000000000000000..491c7b96ab41e192ed108e27e4993d9da555dda4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Cauldron.c
@@ -0,0 +1,113 @@
+class Cauldron extends Bottle_Base
+{
+	void Cauldron()
+	{
+
+	}
+	
+	void ~Cauldron()
+	{
+
+	}
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override string GetPouringSoundset()
+	{
+		return "emptyVessle_Pot_SoundSet";
+	}
+	
+		override string GetEmptyingLoopSoundsetHard()
+	{
+		return "pour_HardGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetSoft()
+	{
+		return "pour_SoftGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetWater()
+	{
+		return "pour_Water_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetHard()
+	{
+		return "pour_End_HardGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetSoft()
+	{
+		return "pour_End_SoftGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetWater()
+	{
+		return "pour_End_Water_Pot_SoundSet";
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo( parent ) )
+			return false;
+		
+		if ( parent && IsCargoException4x3( parent ) )
+			return false;
+		
+		//is 'parent' somewhere in cargo?
+		if (parent && parent.GetInventory().IsCargoInHiearchy())
+			return false;
+		
+		return true;
+	}
+	
+	override bool CanReceiveItemIntoCargo(EntityAI item)
+	{
+		if ( !super.CanReceiveItemIntoCargo( item ) )
+			return false;
+
+		if ( IsCargoException4x3( item ) )
+			return false;
+		
+		//is 'this' somewhere in cargo?
+		if (GetInventory().IsCargoInHiearchy())
+			return false;
+
+		return true;
+	}
+	
+	override bool CanLoadItemIntoCargo(EntityAI item)
+	{
+		if ( !super.CanLoadItemIntoCargo( item ) )
+			return false;
+
+		if ( IsCargoException4x3( item ) )
+			return false;
+
+		return true;
+	}
+	
+	override bool IsOpen()
+	{
+		return true;
+	}
+	
+	override bool CanHaveWetness()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionDrink);
+		RemoveAction(ActionEmptyBottleBase);
+		AddAction(ActionDrinkCookingPot);
+		AddAction(ActionEmptyCookingPot);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Pot.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Pot.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bc51b8c079ee643aaf96b7228fc720bcab1781d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/Pot.c
@@ -0,0 +1,131 @@
+class Pot extends Bottle_Base
+{
+	void Pot();
+	void ~Pot();
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override string GetPouringSoundset()
+	{
+		return "emptyVessle_Pot_SoundSet";
+	}
+	
+		override string GetEmptyingLoopSoundsetHard()
+	{
+		return "pour_HardGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetSoft()
+	{
+		return "pour_SoftGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetWater()
+	{
+		return "pour_Water_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetHard()
+	{
+		return "pour_End_HardGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetSoft()
+	{
+		return "pour_End_SoftGround_Pot_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetWater()
+	{
+		return "pour_End_Water_Pot_SoundSet";
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo( parent ) )
+			return false;
+		
+		if ( parent && IsCargoException4x3( parent ) )
+			return false;
+		
+		//is 'parent' somewhere in cargo?
+		if (parent && parent.GetInventory().IsCargoInHiearchy())
+			return false;
+
+		return true;
+	}
+
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if ( !super.CanReceiveItemIntoCargo( item ) )
+			return false;
+		
+		if ( IsCargoException4x3( item ) )
+			return false;
+		
+		//is 'this' somewhere in cargo?
+		if (GetInventory().IsCargoInHiearchy())
+			return false;
+		
+		//can 'this' be attached to the item (->assumed smaller size than item)?
+		int slotId;
+		for (int i = 0; i < GetInventory().GetSlotIdCount(); i++)
+		{
+			slotId = GetInventory().GetSlotId(i);
+			if (item.GetInventory().HasAttachmentSlot(slotId))
+			{
+				//Print("CanReceiveItemIntoCargo | item " + item + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	override bool CanLoadItemIntoCargo( EntityAI item )
+	{
+		if ( !super.CanLoadItemIntoCargo( item ) )
+			return false;
+
+		if ( IsCargoException4x3( item ) )
+			return false;
+		
+		//can 'this' be attached to the item (->assumed smaller size than item)?
+		int slotId;
+		for (int i = 0; i < GetInventory().GetSlotIdCount(); i++)
+		{
+			slotId = GetInventory().GetSlotId(i);
+			if (item.GetInventory().HasAttachmentSlot(slotId))
+			{
+				//Print("CanLoadItemIntoCargo | item " + item + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+				return false;
+			}
+		}
+
+		return true;
+	}
+	
+	override bool IsOpen()
+	{
+		return true;
+	}
+	
+	override bool CanHaveWetness()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionDrink);
+		RemoveAction(ActionEmptyBottleBase);
+
+		AddAction(ActionDrinkCookingPot);
+		AddAction(ActionEmptyCookingPot);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/WaterBottle.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/WaterBottle.c
new file mode 100644
index 0000000000000000000000000000000000000000..de520cd02a33d514980a9116a6d0b9aa38685160
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Bottle_Base/WaterBottle.c
@@ -0,0 +1,79 @@
+class WaterBottle extends Bottle_Base
+{
+	void WaterBottle()
+	{
+
+	}
+	
+	void ~WaterBottle()
+	{
+		
+	}
+	
+	override bool IsContainer()
+	{
+		return true;
+	}
+	
+	override string GetPouringSoundset()
+	{
+		return "emptyVessle_WaterBottle_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetHard()
+	{
+		return "pour_HardGround_WatterBottle_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetSoft()
+	{
+		return "pour_SoftGround_WatterBottle_SoundSet";
+	}
+	
+	override string GetEmptyingLoopSoundsetWater()
+	{
+		return "pour_Water_WatterBottle_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetHard()
+	{
+		return "pour_End_HardGround_WatterBottle_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetSoft()
+	{
+		return "pour_End_SoftGround_WatterBottle_SoundSet";
+	}
+	
+	override string GetEmptyingEndSoundsetWater()
+	{
+		return "pour_End_Water_WatterBottle_SoundSet";
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}	
+		if ( parent && (parent.IsKindOf("WatterBottle"))/* && !(parent.IsKindOf("Container_Base"))*/)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override bool IsOpen()
+	{
+		return true;
+	}
+	
+	override void EEOnCECreate()
+	{
+		super.EEOnCECreate();
+
+		int rand = Math.RandomInt(0, 10);
+		if (rand > 5)
+		{
+			InsertAgent(eAgents.CHOLERA, 1);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoxCerealCrunchin.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoxCerealCrunchin.c
new file mode 100644
index 0000000000000000000000000000000000000000..225c8665d30f439cdc4079dcc8388e488fe16db0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/BoxCerealCrunchin.c
@@ -0,0 +1,15 @@
+class BoxCerealCrunchin extends Edible_Base
+{
+	void BoxCerealCrunchin()
+	{
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEat);
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Candycane_Colorbase.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Candycane_Colorbase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6a1030cac8f9061831f52b2be930b4f3bc86c4d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Candycane_Colorbase.c
@@ -0,0 +1,19 @@
+class Candycane_Colorbase extends Edible_Base
+{
+	void Candycane_Colorbase()
+	{
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionEat);
+		AddAction(ActionForceFeed);
+	}
+};
+class Candycane_Green extends Candycane_Colorbase {};
+class Candycane_Red extends Candycane_Colorbase {};
+class Candycane_RedGreen extends Candycane_Colorbase {};
+class Candycane_Yellow extends Candycane_Colorbase {};
+
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CaninaBerry.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CaninaBerry.c
new file mode 100644
index 0000000000000000000000000000000000000000..d12de6352a84a4ec6278d3a43f924e5f819d8087
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CaninaBerry.c
@@ -0,0 +1,62 @@
+class CaninaBerry extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	bool ConditionAttach ( EntityAI parent )
+	{
+		//if Barrel_ColorBase
+		if ( parent.IsInherited( Barrel_ColorBase ) )
+		{
+			Barrel_ColorBase barrel = Barrel_ColorBase.Cast( parent );
+			
+			if ( barrel.IsOpen() && !barrel.FindAttachmentBySlotName( "Nails" ) && !barrel.FindAttachmentBySlotName( "OakBark" ) && !barrel.FindAttachmentBySlotName( "BirchBark" ) && !barrel.FindAttachmentBySlotName( "Lime" ) && !barrel.FindAttachmentBySlotName( "Disinfectant" ) && !barrel.FindAttachmentBySlotName( "Guts" ) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool ConditionDetach ( EntityAI parent )
+	{
+		//if Barrel_ColorBase
+		if ( parent.IsInherited( Barrel_ColorBase ) )
+		{
+			Barrel_ColorBase barrel = Barrel_ColorBase.Cast( parent );
+			
+			if ( !barrel.IsOpen() )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEat);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Cannabis.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Cannabis.c
new file mode 100644
index 0000000000000000000000000000000000000000..ae02cf60082746930686e57598126e7586003e20
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Cannabis.c
@@ -0,0 +1,30 @@
+class Cannabis : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return false;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEat);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Carp.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Carp.c
new file mode 100644
index 0000000000000000000000000000000000000000..eafeb19f85c540557b048cd129245d10c4ff7ef6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Carp.c
@@ -0,0 +1,22 @@
+class Carp extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+
+	override bool CanBeCooked()
+	{
+		return false;
+	}	
+	
+	override bool IsCorpse()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CarpFilletMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CarpFilletMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..83adf7e3875c9ef3690db3bf764a5c31286672eb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CarpFilletMeat.c
@@ -0,0 +1,33 @@
+class CarpFilletMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CharcoalTablets.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CharcoalTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..c4750c97fed01139358212116c0ec0bff5e16c9e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CharcoalTablets.c
@@ -0,0 +1,17 @@
+class CharcoalTablets extends Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceConsumeSingle);
+		AddAction(ActionEatTabletFromWrapper);
+	}
+	
+	override void OnConsume(float amount, PlayerBase consumer)
+	{
+		if (!consumer.GetModifiersManager().IsModifierActive(eModifiers.MDF_CHARCOAL))
+			consumer.GetModifiersManager().ActivateModifier(eModifiers.MDF_CHARCOAL);
+		
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/ChickenBreastMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/ChickenBreastMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..eba8a64414b5f49e8f27326ae9f8c7476c05780d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/ChickenBreastMeat.c
@@ -0,0 +1,33 @@
+class ChickenBreastMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Chicken_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Chicken_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..8db39555da27aea7a6e79cc1b13077375cbef3be
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Chicken_ColorBase.c
@@ -0,0 +1,35 @@
+class DeadChicken_ColorBase extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+
+	override bool CanBeCooked()
+	{
+		return false;
+	}	
+	
+	override bool IsCorpse()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanBeSkinned()
+	{
+		if ( GetHealthLevel() == GameConstants.STATE_RUINED )
+			return false;
+
+		return true;
+	}
+}
+
+class DeadRooster extends DeadChicken_ColorBase {}
+class DeadChicken_White extends DeadChicken_ColorBase {}
+class DeadChicken_Spotted extends DeadChicken_ColorBase {}
+class DeadChicken_Brown extends DeadChicken_ColorBase {}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CowSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CowSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..d385d71395f4b51d81a341aefda80695cb228d45
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/CowSteakMeat.c
@@ -0,0 +1,33 @@
+class CowSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/DeerSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/DeerSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..231d26350c4446f2b78b9c36c2412fd308260aca
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/DeerSteakMeat.c
@@ -0,0 +1,33 @@
+class DeerSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/DisinfectantSpray.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/DisinfectantSpray.c
new file mode 100644
index 0000000000000000000000000000000000000000..eaad5a2977d6690e05c8aa8b1207cf2296e0d8e9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/DisinfectantSpray.c
@@ -0,0 +1,93 @@
+class DisinfectantSpray extends Edible_Base
+{
+	
+	override void InitItemVariables()
+	{
+		super.InitItemVariables();
+		can_this_be_combined = true;
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Plant", "Nails", "OakBark", "BirchBark", "Lime", "Guts" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override float GetDisinfectQuantity(int system = 0, Param param1 = null)
+	{
+		return (GetQuantityMax() * 0.15);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDisinfectTarget);
+		AddAction(ActionDisinfectSelf);;
+		AddAction(ActionDisinfectPlant);
+		AddAction(ActionWashHandsItemContinuous);
+		//AddAction(ActionForceDrinkDisinfectant);
+		//AddAction(ActionDrinkDisinfectant);
+		
+		
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/FoxSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/FoxSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..c98f709914be7db4900d86a6ac97e420e0341497
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/FoxSteakMeat.c
@@ -0,0 +1,33 @@
+class FoxSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/GoatSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/GoatSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..1e16c02cf47dfbaf7dcacf1a55552125db71c5ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/GoatSteakMeat.c
@@ -0,0 +1,33 @@
+class GoatSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/GreenBellPepper.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/GreenBellPepper.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e1865ba3c3115ce4dc6aa68df5ccb7ecf50a4db
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/GreenBellPepper.c
@@ -0,0 +1,48 @@
+class GreenBellPepper : Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+
+	override bool CanBeCooked()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEat);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Guts.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Guts.c
new file mode 100644
index 0000000000000000000000000000000000000000..1a51913f49be4db1f60148f9bbe9df5b2c58249b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Guts.c
@@ -0,0 +1,74 @@
+class Guts extends Edible_Base
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Nails", "OakBark", "BirchBark", "Lime", "Disinfectant" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatBig);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/HumanSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/HumanSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..3cbd84fd6a3cae420865b9750a95df414725dc74
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/HumanSteakMeat.c
@@ -0,0 +1,38 @@
+class HumanSteakMeat extends Edible_Base
+{
+	void HumanSteakMeat()
+	{
+		InsertAgent(eAgents.BRAIN, 1);
+	}
+	
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Kiwi.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Kiwi.c
new file mode 100644
index 0000000000000000000000000000000000000000..b91c2645db6ffd595d0b5602eefc5a9033fb0db8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Kiwi.c
@@ -0,0 +1,32 @@
+class Kiwi : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return false;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/LactariusMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/LactariusMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..e89fdb372424881e52201f3a3255d245a747e40e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/LactariusMushroom.c
@@ -0,0 +1,10 @@
+class LactariusMushroom : MushroomBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Lard.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Lard.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0e9103be9ee6f2423526063e3f5e5af0f2d6801
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Lard.c
@@ -0,0 +1,33 @@
+class Lard extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Mackerel.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Mackerel.c
new file mode 100644
index 0000000000000000000000000000000000000000..b57f0f3282e8514291722b69fbec8cd801a94aae
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Mackerel.c
@@ -0,0 +1,22 @@
+class Mackerel extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+
+	override bool CanBeCooked()
+	{
+		return false;
+	}	
+	
+	override bool IsCorpse()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MackerelFilletMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MackerelFilletMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..b913157e2b71275f8654f217b1776044ed311f3f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MackerelFilletMeat.c
@@ -0,0 +1,33 @@
+class MackerelFilletMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MacrolepiotaMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MacrolepiotaMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d6bfc50d382cc1e7ecf67249860759960ffca5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MacrolepiotaMushroom.c
@@ -0,0 +1,10 @@
+class MacrolepiotaMushroom : MushroomBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MouflonSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MouflonSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..a665fdb80497646b5dc7410851ca225924ee5757
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/MouflonSteakMeat.c
@@ -0,0 +1,33 @@
+class MouflonSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Orange.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Orange.c
new file mode 100644
index 0000000000000000000000000000000000000000..b8e0c5ff420f965c1d366a70beaf3a96017052df
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Orange.c
@@ -0,0 +1,32 @@
+class Orange : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return false;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PainkillerTablets.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PainkillerTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..65332ccb61f1c262efa9fac3763a0db7ab96b4db
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PainkillerTablets.c
@@ -0,0 +1,18 @@
+class PainkillerTablets extends Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceConsumeSingle);
+		AddAction(ActionEatTabletFromWrapper);
+	}
+	
+	override void OnConsume(float amount, PlayerBase consumer)
+	{
+		if (consumer.GetModifiersManager().IsModifierActive(eModifiers.MDF_PAINKILLERS)) // effectively resets the timer
+			consumer.GetModifiersManager().DeactivateModifier(eModifiers.MDF_PAINKILLERS, false);
+
+		consumer.GetModifiersManager().ActivateModifier(eModifiers.MDF_PAINKILLERS);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PeachesCan.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PeachesCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..93321c914658b56c791430c38c86c5b7c4a819ac
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PeachesCan.c
@@ -0,0 +1,13 @@
+class PeachesCan : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("PeachesCan_Opened");
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Pear.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Pear.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba57da9a99074f932b1ca6086b4821b92fb222cc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Pear.c
@@ -0,0 +1,48 @@
+class Pear : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+		
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PigSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PigSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..f67326f66c9dbde87e6ec7cf01c1d56cd0055a92
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PigSteakMeat.c
@@ -0,0 +1,33 @@
+class PigSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PleurotusMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PleurotusMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..e44ce2c5a6cd54d84118487a829046a7377d367c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PleurotusMushroom.c
@@ -0,0 +1,10 @@
+class PleurotusMushroom : MushroomBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Plum.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Plum.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3a90269b83b44541d56a68bddaa66f6c8e8b347
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Plum.c
@@ -0,0 +1,48 @@
+class Plum : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+		
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Potato.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Potato.c
new file mode 100644
index 0000000000000000000000000000000000000000..96d4f3cb69d98db3ddfe4474e0911e0e69a08df4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Potato.c
@@ -0,0 +1,48 @@
+class Potato : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PsilocybeMushroom.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PsilocybeMushroom.c
new file mode 100644
index 0000000000000000000000000000000000000000..b845042b042b7d3c3625e20ec7879f0ed921a895
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PsilocybeMushroom.c
@@ -0,0 +1,3 @@
+class PsilocybeMushroom : MushroomBase
+{
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Pumpkin.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Pumpkin.c
new file mode 100644
index 0000000000000000000000000000000000000000..39a5687723b2d79566628f3e1a85128b0b91f272
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Pumpkin.c
@@ -0,0 +1,22 @@
+class Pumpkin : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return false;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PurificationTablets.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PurificationTablets.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec229abdd8ca2ab1c0e388dcc4607599fa07083e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/PurificationTablets.c
@@ -0,0 +1,14 @@
+class PurificationTablets extends Edible_Base
+{
+/*
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceConsumeSingle);
+		AddAction(ActionConsumeSingle);
+		//AddAction(ActionForceFeed);
+		//AddAction(ActionEatBig);
+	}
+*/
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Rabbit.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Rabbit.c
new file mode 100644
index 0000000000000000000000000000000000000000..85a72c87e6b73a4908a57d13ae82025db5d9d088
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Rabbit.c
@@ -0,0 +1,22 @@
+class DeadRabbit extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+
+	override bool CanBeCooked()
+	{
+		return false;
+	}	
+	
+	override bool IsCorpse()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/RabbitLegMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/RabbitLegMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f0bfe2801755bc3cf9b72f87213f9d75aebeebe
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/RabbitLegMeat.c
@@ -0,0 +1,33 @@
+class RabbitLegMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SambucusBerry.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SambucusBerry.c
new file mode 100644
index 0000000000000000000000000000000000000000..e6ae429f794c6f306ae662398245ed349b974a17
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SambucusBerry.c
@@ -0,0 +1,62 @@
+class SambucusBerry extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	bool ConditionAttach ( EntityAI parent )
+	{
+		//if Barrel_ColorBase
+		if ( parent.IsInherited( Barrel_ColorBase ) )
+		{
+			Barrel_ColorBase barrel = Barrel_ColorBase.Cast( parent );
+			
+			if ( barrel.IsOpen() && !barrel.FindAttachmentBySlotName( "Nails" ) && !barrel.FindAttachmentBySlotName( "OakBark" ) && !barrel.FindAttachmentBySlotName( "BirchBark" ) && !barrel.FindAttachmentBySlotName( "Lime" ) && !barrel.FindAttachmentBySlotName( "Disinfectant" ) && !barrel.FindAttachmentBySlotName( "Guts" ) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool ConditionDetach ( EntityAI parent )
+	{
+		//if Barrel_ColorBase
+		if ( parent.IsInherited( Barrel_ColorBase ) )
+		{
+			Barrel_ColorBase barrel = Barrel_ColorBase.Cast( parent );
+			
+			if ( !barrel.IsOpen() )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEat);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Sardines.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Sardines.c
new file mode 100644
index 0000000000000000000000000000000000000000..153771a00b7e639aba0171c82cf88f2e63c0e954
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Sardines.c
@@ -0,0 +1,30 @@
+class Sardines extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+
+	override bool CanBeCooked()
+	{
+		return true;
+	}	
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SardinesCan.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SardinesCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..53e14a042604d5653d9065608cd8966bdee8a9e4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SardinesCan.c
@@ -0,0 +1,13 @@
+class SardinesCan : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("SardinesCan_Opened");
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SheepSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SheepSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..9bf56d36355f5326f7a74042b9d4329441246f2e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SheepSteakMeat.c
@@ -0,0 +1,33 @@
+class SheepSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SlicedPumpkin.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SlicedPumpkin.c
new file mode 100644
index 0000000000000000000000000000000000000000..0101d59595f3460e12be917f361dd65e40f83358
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SlicedPumpkin.c
@@ -0,0 +1,32 @@
+class SlicedPumpkin : Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SmallGuts.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SmallGuts.c
new file mode 100644
index 0000000000000000000000000000000000000000..b72f6801af81b7333e5add54beb76b080924e63f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SmallGuts.c
@@ -0,0 +1,74 @@
+class SmallGuts extends Edible_Base
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Nails", "OakBark", "BirchBark", "Lime", "Disinfectant" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatBig);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SpaghettiCan.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SpaghettiCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..b9f59ece7f35f5ee8eb71d37049fd164a8e0c267
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/SpaghettiCan.c
@@ -0,0 +1,12 @@
+class SpaghettiCan : Edible_Base
+{
+	override void Open()
+	{
+		ReplaceEdibleWithNew("SpaghettiCan_Opened");
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TacticalBaconCan.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TacticalBaconCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..541a2440464381639bbd75315b101e5ab54faa26
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TacticalBaconCan.c
@@ -0,0 +1,13 @@
+class TacticalBaconCan : Edible_Base
+{
+	override void Open()
+	{
+		ReplaceEdibleWithNew("TacticalBaconCan_Opened");
+	}
+	
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TetracyclineAntibiotics.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TetracyclineAntibiotics.c
new file mode 100644
index 0000000000000000000000000000000000000000..d3608883ca6325dd83fe6f297d059257a926eb1f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TetracyclineAntibiotics.c
@@ -0,0 +1,18 @@
+class TetracyclineAntibiotics : Edible_Base
+{
+	override void OnConsume(float amount, PlayerBase consumer)
+	{
+		if (consumer.GetModifiersManager().IsModifierActive(eModifiers.MDF_ANTIBIOTICS)) //effectively resets the timer
+			consumer.GetModifiersManager().DeactivateModifier(eModifiers.MDF_ANTIBIOTICS);
+
+		consumer.GetModifiersManager().ActivateModifier(eModifiers.MDF_ANTIBIOTICS);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceConsumeSingle);
+		AddAction(ActionEatTabletFromWrapper);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Tomato.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Tomato.c
new file mode 100644
index 0000000000000000000000000000000000000000..b170c6f150a5d020950fba199c54d25dcd630fde
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Tomato.c
@@ -0,0 +1,48 @@
+class Tomato : Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+
+	override bool CanBeCooked()
+	{
+		return true;
+	}	
+	
+	override bool IsFruit()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TunaCan.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TunaCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..556e959cda962c1699dcfc3afc32843de72c6db2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/TunaCan.c
@@ -0,0 +1,19 @@
+class TunaCan : Edible_Base
+{
+	override void Open()
+	{
+		ReplaceEdibleWithNew("TunaCan_Opened");
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/VitaminBottle.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/VitaminBottle.c
new file mode 100644
index 0000000000000000000000000000000000000000..9c461d76b9dbe488fce6ae1b8aa2529c3239a822
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/VitaminBottle.c
@@ -0,0 +1,29 @@
+class VitaminBottle : Edible_Base
+{
+	//Specify this item can only be combined but not split
+	override void InitItemVariables()
+	{
+		super.InitItemVariables();
+
+		can_this_be_combined = true;
+	}
+	
+	override void OnConsume(float amount, PlayerBase consumer)
+	{
+		if (consumer.GetModifiersManager().IsModifierActive(eModifiers.MDF_IMMUNITYBOOST)) //effectively resets the timer
+		{
+			consumer.GetModifiersManager().DeactivateModifier(eModifiers.MDF_IMMUNITYBOOST);
+		}
+
+		consumer.GetModifiersManager().ActivateModifier(eModifiers.MDF_IMMUNITYBOOST);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceConsumeSingle);
+		AddAction(ActionEatPillFromBottle);
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/WolfSteakMeat.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/WolfSteakMeat.c
new file mode 100644
index 0000000000000000000000000000000000000000..8ba5042783d14714567b4ff597a9c740148b5166
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/WolfSteakMeat.c
@@ -0,0 +1,33 @@
+class WolfSteakMeat extends Edible_Base
+{
+	override bool CanBeCooked()
+	{
+		return true;
+	}		
+	
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatMeat);
+		
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Worm.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Worm.c
new file mode 100644
index 0000000000000000000000000000000000000000..eebf5035b36a213e8133ba1042bd88a8760d5465
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Worm.c
@@ -0,0 +1,17 @@
+class Worm extends Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return false;
+	}
+
+	override bool CanBeCooked()
+	{
+		return false;
+	}	
+	
+	override bool IsMeat()
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Zucchini.c b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Zucchini.c
new file mode 100644
index 0000000000000000000000000000000000000000..f342cc89b8137e2057f6836ca62ea02b287b521a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Edible_Base/Zucchini.c
@@ -0,0 +1,48 @@
+class Zucchini : Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+
+	override bool CanBeCooked()
+	{
+		return true;
+	}	
+
+	override bool IsFruit()
+	{
+		return true;
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatFruit);
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/EyeMask_Colorbase.c b/scripts/4_World/DayZ/Entities/ItemBase/EyeMask_Colorbase.c
new file mode 100644
index 0000000000000000000000000000000000000000..637e344a764abd4fbaa740b2da5484bd99ff2b52
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/EyeMask_Colorbase.c
@@ -0,0 +1,52 @@
+class EyeMask_ColorBase : Glasses_Base 
+{
+	//================================================================
+	// IGNITION ACTION
+	//================================================================
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy(EntityAI igniter = null)
+	{
+		return !GetHierarchyParent();
+	}
+	
+	override bool CanIgniteItem(EntityAI ignite_target = null)
+	{
+		return false;
+	}
+	
+	override void OnIgnitedTarget(EntityAI ignited_item) {}
+	
+	override void OnIgnitedThis(EntityAI fire_source)
+	{
+		Fireplace.IgniteEntityAsFireplace(this, fire_source);
+	}
+
+	override bool IsThisIgnitionSuccessful(EntityAI item_source = null)
+	{
+		return Fireplace.CanIgniteEntityAsFireplace(this);
+	}
+	//================================================================
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+}
+
+class EyeMask_NewYears : EyeMask_ColorBase {}
+class EyeMask_Christmas : EyeMask_ColorBase {}
+class EyeMask_Dead : EyeMask_ColorBase {}
+class EyeMask_Yellow : EyeMask_ColorBase {}
+class EyeMask_Red : EyeMask_ColorBase {}
+class EyeMask_Blue : EyeMask_ColorBase {}
+class EyeMask_Black : EyeMask_ColorBase {}
+class EyeMask_Valentines : EyeMask_ColorBase {}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FangeKnife.c b/scripts/4_World/DayZ/Entities/ItemBase/FangeKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5c313eaee69bcb9b3625a7b8cc88f47de320b43
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FangeKnife.c
@@ -0,0 +1,28 @@
+class FangeKnife extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FenceKit.c b/scripts/4_World/DayZ/Entities/ItemBase/FenceKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..28fa7510f53a2183876b66605a9ee879c5ceb40d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FenceKit.c
@@ -0,0 +1,81 @@
+class FenceKit extends KitBase
+{
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		if ( !super.CanReceiveAttachment(attachment, slotId) )
+			return false;
+		
+		ItemBase att = ItemBase.Cast(GetInventory().FindAttachment(slotId));
+		if (att)
+			return false;
+		
+		return true;
+	}
+
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================			
+		
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+		
+		if ( GetGame().IsServer() )
+		{
+			//Create fence
+			
+			Fence fence = Fence.Cast( GetGame().CreateObjectEx( "Fence", GetPosition(), ECE_PLACE_ON_SURFACE ) );
+			fence.SetPosition( position );
+			fence.SetOrientation( orientation );
+			
+			//make the kit invisible, so it can be destroyed from deploy UA when action ends
+			HideAllSelections();
+			
+			SetIsDeploySound( true );
+		}	
+	}
+	
+	override bool DoPlacingHeightCheck()
+	{
+		return true;
+	}
+	
+	override float HeightCheckOverride()
+	{
+		return 2.54;
+	}
+	
+	override void DisassembleKit(ItemBase item)
+	{
+		if (!IsHologram())
+		{
+			ItemBase stick = ItemBase.Cast(GetGame().CreateObjectEx("WoodenStick",GetPosition(),ECE_PLACE_ON_SURFACE));
+			MiscGameplayFunctions.TransferItemProperties(this, stick);
+			stick.SetQuantity(2);
+			Rope rope = Rope.Cast(item);
+			CreateRope(rope);
+		}
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		SpawnEntityOnGroundPos("Shovel", GetPosition());
+		SpawnEntityOnGroundPos("Hammer", GetPosition());
+		SpawnEntityOnGroundPos("Hammer", GetPosition());
+		SpawnEntityOnGroundPos("Pliers", GetPosition());
+
+		SpawnEntityOnGroundPos("WoodenLog", GetPosition());
+		SpawnEntityOnGroundPos("WoodenLog", GetPosition());
+		SpawnEntityOnGroundPos("Nail", GetPosition());
+		SpawnEntityOnGroundPos("CamoNet", GetPosition());
+		SpawnEntityOnGroundPos("BarbedWire", GetPosition());
+		SpawnEntityOnGroundPos("BarbedWire", GetPosition());
+		SpawnEntityOnGroundPos("MetalWire", GetPosition());
+		SpawnEntityOnGroundPos("CombinationLock", GetPosition());
+		SpawnEntityOnGroundPos("WoodenPlank", GetPosition());
+		SpawnEntityOnGroundPos("WoodenPlank", GetPosition());
+		SpawnEntityOnGroundPos("WoodenPlank", GetPosition());
+		SpawnEntityOnGroundPos("WoodenPlank", GetPosition());
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FieldShovel.c b/scripts/4_World/DayZ/Entities/ItemBase/FieldShovel.c
new file mode 100644
index 0000000000000000000000000000000000000000..52172bac92b97d27a692d1944b8ae9471bb9361d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FieldShovel.c
@@ -0,0 +1,26 @@
+class FieldShovel extends ItemBase
+{
+	override bool CanMakeGardenplot()
+	{
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDigGardenPlot);
+		AddAction(ActionDismantleGardenPlot);
+		AddAction(ActionDismantlePart);
+		AddAction(ActionBuildPart);
+		AddAction(ActionBuryBody);
+		AddAction(ActionBuryAshes);
+		AddAction(ActionDigInStash);
+		AddAction(ActionDigOutStash);
+		AddAction(ActionFillObject);
+		AddAction(ActionDigWorms);
+		AddAction(ActionCreateGreenhouseGardenPlot);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FirefighterAxe.c b/scripts/4_World/DayZ/Entities/ItemBase/FirefighterAxe.c
new file mode 100644
index 0000000000000000000000000000000000000000..fbdc6fa719a818c2baf3754460897ccc9a474ab5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FirefighterAxe.c
@@ -0,0 +1,22 @@
+class FirefighterAxe extends ToolBase
+{
+	void FirefighterAxe()
+	{
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionMineTree);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionMineBush);
+		//AddAction(ActionRepairPart);
+		AddAction(ActionDismantlePart);
+		//AddAction(ActionBuildPart);
+		//AddAction(ActionDestroyPart);
+		//AddAction(ActionSawPlanks);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e0a1fc7642a3bb0d80bc9511efc20a8a4bc6e885
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase.c
@@ -0,0 +1,2793 @@
+enum FireplaceFireState
+{
+	NO_FIRE				= 1,
+	START_FIRE			= 2,
+	SMALL_FIRE			= 3,	
+	NORMAL_FIRE			= 4,
+	END_FIRE			= 5,
+	EXTINGUISHING_FIRE	= 6,
+	EXTINGUISHED_FIRE	= 7,
+	REIGNITED_FIRE		= 8,
+	
+	COUNT				= 9			//for net sync purposes
+}
+
+enum FirePlaceFailure
+{
+	WIND			= 0,
+	WET				= 1,	
+}
+
+class FireplaceBase extends ItemBase
+{
+	//State params
+	protected bool m_IsBurning 						= false;   
+	protected bool m_HasAshes						= false;
+	protected bool m_IsOven							= false;
+	protected bool m_HasStoneCircle 				= false;
+	protected bool m_RoofAbove 						= false;
+	protected bool m_NoIgnite 						= false;
+	protected int m_OvenAttachmentsLockState 		= -1;
+	protected FireplaceFireState m_FireState	 	= FireplaceFireState.NO_FIRE;
+	protected FireplaceFireState m_LastFireState 	= FireplaceFireState.NO_FIRE;		//for synchronization purposes
+	protected vector m_HalfExtents;
+	
+	//Fireplace params
+	protected float m_TemperatureLossMP				= 1.0;		//! determines how fast will the fireplace loose its temperature when cooling (lower is better)
+	protected float m_FuelBurnRateMP				= 1.0;		//! determines how fast will the fuel item burn before spending (lower is better)
+	
+	//cooking
+	protected ref Cooking m_CookingProcess;
+	
+	//
+	const float PARAM_SMALL_FIRE_TEMPERATURE 		= 150;		//! maximum fireplace temperature of a small fire (degree Celsius)
+	const float PARAM_NORMAL_FIRE_TEMPERATURE 		= 1000;		//! maximum fireplace temperature of a normal fire (degree Celsius)
+	const float PARAM_MIN_FIRE_TEMPERATURE 			= 30;		//! minimum fireplace temperature under which the fireplace is inactive (degree Celsius)
+	const float	PARAM_TEMPERATURE_INCREASE 			= 3;		//! how much will temperature increase when fireplace is burning (degree Celsius per second)
+	const float	PARAM_TEMPERATURE_DECREASE 			= 3;		//! how much will temperature decrease when fireplace is cooling (degree Celsius per second)
+	const float	PARAM_MAX_WET_TO_IGNITE 			= 0.2;		//! maximum wetness value when the fireplace can be ignited
+	const float PARAM_MIN_TEMP_TO_REIGNITE 			= 30;		//! minimum fireplace temperature under which the fireplace can be reignited using air only (degree Celsius)
+	const float	PARAM_IGNITE_RAIN_THRESHOLD 		= 0.1;		//! maximum rain value when the fireplace can be ignited
+	const float	PARAM_BURN_WET_THRESHOLD 			= 0.40;		//! maximum wetness value when the fireplace is able to burn
+	const float	PARAM_WET_INCREASE_COEF 			= 0.02;		//! value for calculating of  wetness that fireplace gain when raining
+	const float	PARAM_WET_HEATING_DECREASE_COEF 	= 0.01;		//! value for calculating wetness loss during heating process
+	const float	PARAM_WET_COOLING_DECREASE_COEF 	= 0.002;	//! value for calculating wetness loss during cooling process
+	const float	PARAM_FIRE_CONSUM_RATE_AMOUNT		= 0.5;		//! base value of fire consumption rate (how many base energy will be spent on each update)
+	const float	PARAM_BURN_DAMAGE_COEF				= 5.0;		//! value for calculating damage on items located in fireplace cargo
+	const float	PARAM_ITEM_HEAT_TEMP_INCREASE_COEF	= 10;		//! value for calculating temperature increase on each heat update interval (degree Celsius)
+	const float	PARAM_ITEM_HEAT_MIN_TEMP			= 40;		//! minimum temperature for items that can be heated in fireplace cargo or as attachments (degree Celsius)
+	const float PARAM_MAX_ITEM_HEAT_TEMP_INCREASE	= 200;		//! maximum value of temperature of items in fireplace when heating (degree Celsius)
+	const float PARAM_FULL_HEAT_RADIUS 				= 2.0;		//! radius in which objects are fully heated by fire
+	const float PARAM_HEAT_RADIUS 					= 4.0;		//! radius in which objects are heated by fire
+	const float PARAM_HEAT_THROUGH_AIR_COEF			= 0.1;		//! DEPRECATED value for calculation of heat transfered from fireplace through air to player (environment)
+	const float PARAM_MAX_TRANSFERED_TEMPERATURE	= 25;		//! maximum value for temperature that will be transfered to player (environment)
+	//! 
+	const int 	MIN_STONES_TO_BUILD_CIRCLE			= 8;		//! minimum amount of stones for circle
+	const int 	MIN_STONES_TO_BUILD_OVEN			= 16;		//! minimum amount of stones for oven
+	const int 	MAX_TEMPERATURE_TO_DISMANTLE_OVEN	= 40;		//! maximum temperature for dismantling oven
+	const float	MIN_CEILING_HEIGHT 					= 5;		//! min height of ceiling for fire to be ignited
+	//
+	const float TEMPERATURE_LOSS_MP_DEFAULT			= 1.0;
+	const float TEMPERATURE_LOSS_MP_STONES			= 0.90;		//10% boost
+	const float TEMPERATURE_LOSS_MP_OVEN			= 0.75;		//25% boost
+
+	const float FUEL_BURN_RATE_DEFAULT				= 1.0;
+	const float FUEL_BURN_RATE_STONES				= 0.92;
+	const float FUEL_BURN_RATE_OVEN					= 0.85;
+	
+	//! cooking
+	const float PARAM_COOKING_TEMP_THRESHOLD		= 100;		//! temperature threshold for starting coooking process (degree Celsius)
+	const float PARAM_COOKING_EQUIP_MAX_TEMP		= 250;		//! maximum temperature of attached cooking equipment (degree Celsius)
+	const float PARAM_COOKING_EQUIP_TEMP_INCREASE	= 10;		//! how much will temperature increase when attached on burning fireplace (degree Celsius)
+	//! 
+	const int 	TIMER_HEATING_UPDATE_INTERVAL 		= 3;		//! update interval duration of heating process (seconds)
+	const int 	TIMER_COOLING_UPDATE_INTERVAL 		= 2;		//! update interval duration of cooling process (seconds)
+	//! direct cooking slots
+	const int   DIRECT_COOKING_SLOT_COUNT			= 3;
+	const float	DIRECT_COOKING_SPEED				= 1.5;		// per second
+	const int   SMOKING_SLOT_COUNT					= 4;
+	const float SMOKING_SPEED 						= 1;		// per second
+
+	// stage lifetimes
+	const int   LIFETIME_FIREPLACE_STONE_CIRCLE		= 172800;
+	const int   LIFETIME_FIREPLACE_STONE_OVEN		= 604800;
+	
+	const float IGNITE_WIND_THRESHOLD				= 0.8; 		//fireplace can not be ignited above this multiple of max wind
+
+	//Timers
+	protected ref Timer m_HeatingTimer;
+	protected ref Timer m_CoolingTimer;
+	
+	// Light entity
+	protected FireplaceLight m_Light;
+	protected float m_LightDistance 				= 2000;
+	
+	//Attachments
+	protected ItemBase m_CookingEquipment;
+	protected ItemBase m_DirectCookingSlots[DIRECT_COOKING_SLOT_COUNT];
+	protected ItemBase m_SmokingSlots[SMOKING_SLOT_COUNT];
+	protected ref FireConsumable m_ItemToConsume;
+	
+	//Particles - default for FireplaceBase
+	protected int PARTICLE_FIRE_START 			= ParticleList.CAMP_FIRE_START;
+	protected int PARTICLE_OVEN_FIRE_START 		= ParticleList.CAMP_STOVE_FIRE_START;
+	protected int PARTICLE_SMALL_FIRE 			= ParticleList.CAMP_SMALL_FIRE;
+	protected int PARTICLE_NORMAL_FIRE			= ParticleList.CAMP_NORMAL_FIRE;
+	protected int PARTICLE_OVEN_FIRE 			= ParticleList.CAMP_STOVE_FIRE;
+	protected int PARTICLE_SMALL_SMOKE 			= ParticleList.CAMP_SMALL_SMOKE;
+	protected int PARTICLE_NORMAL_SMOKE			= ParticleList.CAMP_NORMAL_SMOKE;
+	protected int PARTICLE_FIRE_END 			= ParticleList.CAMP_FIRE_END;
+	protected int PARTICLE_OVEN_FIRE_END 		= ParticleList.CAMP_STOVE_FIRE_END;
+	protected int PARTICLE_STEAM_END			= ParticleList.CAMP_STEAM_2END;
+	protected int PARTICLE_STEAM_EXTINGUISHING	= ParticleList.CAMP_STEAM_EXTINGUISH_START;
+	protected int PARTICLE_NO_IGNITE_WIND		= ParticleList.CAMP_NO_IGNITE_WIND;
+	//
+	protected Particle m_ParticleFireStart;
+	protected Particle m_ParticleSmallFire;
+	protected Particle m_ParticleNormalFire;
+	protected Particle m_ParticleSmallSmoke;
+	protected Particle m_ParticleNormalSmoke;
+	protected Particle m_ParticleFireEnd;
+	protected Particle m_ParticleSteamEnd;
+	protected Particle m_ParticleSteamExtinguishing;
+	
+	//Sounds
+	const string SOUND_FIRE_HEAVY 				= "HeavyFire_SoundSet";
+	const string SOUND_FIRE_LIGHT				= "LightFire_SoundSet";
+	const string SOUND_FIRE_NO_FIRE				= "NoFuelFire_SoundSet";
+	const string SOUND_FIRE_EXTINGUISHING		= "ExtinguishByWater_SoundSet";
+	const string SOUND_FIRE_EXTINGUISHED		= "ExtinguishByWaterEnd_SoundSet";
+	
+	//
+	protected EffectSound m_SoundFireLoop;
+	protected EffectSound m_SoundFire;
+	//
+	
+	//Fuel
+	//Kindling / Fuel item types
+	protected static ref map<typename, ref FireConsumableType> 	m_FireConsumableTypes;
+	protected ref map<ItemBase, ref FireConsumable> 			m_FireConsumables;
+	
+	//Player action / status messages
+	const string MESSAGE_IGNITE_IGNIT_ITEM_DAMAGED 		= "You cannot start fire. Fireplace is ruined.";
+	const string MESSAGE_IGNITE_NO_KINDLING 			= "There needs to be some kindling to start a fire.";
+	const string MESSAGE_IGNITE_TOO_WET 				= "The fireplace is too wet to be ignited.";
+	const string MESSAGE_IGNITE_RAIN	 				= "The fire went out because of the rain.";
+	const string MESSAGE_IGNITE_WIND	 				= "The fire went out because of the wind.";
+	const string MESSAGE_IGNITE_IN_WATER 				= "I cannot ignite the fireplace in the water.";
+	const string MESSAGE_IGNITE_UNDER_LOW_ROOF 			= "I cannot ignite the fireplace here, the is not enough room.";
+	const string MESSAGE_REIGNITE_NO_KINDLING 			= "There needs to be some kindling to start a fire.";
+	const string MESSAGE_REIGNITE_RAIN	 				= "Cannot reignite fireplace in rain.";
+	const string MESSAGE_REIGNITE_TOO_WET 				= "The fireplace is too wet to be reignited.";
+	const string MESSAGE_BURY_ASHES_FAILED_NOT_EMPTY	= "Cannot bury ashes. There are sill items in it.";
+	const string MESSAGE_BURY_ASHES_FAILED_SURFACE		= "Cannot bury ashes on hard surface.";
+	const string MESSAGE_BURY_ASHES_FAILED_BURNING		= "Cannot bury ashes, the fireplace is still burning.";
+	const string MESSAGE_BURY_ASHES_FAILED_TOO_HOT		= "Cannot bury ashes, the fireplace is too hot.";
+	const string MESSAGE_CANNOT_BUILD_OVEN				= "Cannot build oven.";
+	const string MESSAGE_CANNOT_DISMANTLE_OVEN			= "Cannot dismantle oven.";
+	
+	//Visual animations
+	const string ANIMATION_ASHES 			= "Ashes";
+	const string ANIMATION_KINDLING			= "Kindling";
+	const string ANIMATION_STICKS			= "Sticks";
+	const string ANIMATION_WOOD 			= "Wood";
+	const string ANIMATION_BURNT_WOOD 		= "BurntWood";
+	const string ANIMATION_STONE			= "Stone";
+	const string ANIMATION_STONES 			= "StonesCircle";
+	const string ANIMATION_TRIPOD 			= "Tripod";
+	const string ANIMATION_OVEN 			= "Oven";
+	const string ANIMATION_INVENTORY	 	= "Inventory";
+	const string ANIMATION_COOKWARE_HANDLE 	= "handleRotate";
+	const string ANIMATION_CAULDRON_HANDLE 	= "handle1Rotate";
+
+	
+	//Visual textures and materials
+	const string MATERIAL_FIREPLACE_GLOW 		= "dz\\gear\\cooking\\data\\stoneground.rvmat";
+	const string MATERIAL_FIREPLACE_NOGLOW 		= "dz\\gear\\cooking\\data\\stonegroundnoemit.rvmat";
+	
+	//Attachment types
+	//Fuel
+	typename ATTACHMENT_STICKS			= WoodenStick;
+	typename ATTACHMENT_FIREWOOD		= Firewood;
+	//Kindling
+	typename ATTACHMENT_RAGS 					= Rag;
+	typename ATTACHMENT_BANDAGE 				= BandageDressing;
+	typename ATTACHMENT_BOOK 					= ItemBook;
+	typename ATTACHMENT_BARK_OAK 				= Bark_Oak;
+	typename ATTACHMENT_BARK_BIRCH 				= Bark_Birch;
+	typename ATTACHMENT_PAPER 					= Paper;
+	typename ATTACHMENT_GIFTWRAP				= GiftWrapPaper;
+	typename ATTACHMENT_PUNCHEDCARD				= PunchedCard;
+	typename ATTACHMENT_EYEMASK_COLORBASE		= EyeMask_ColorBase;
+	//Other
+	typename ATTACHMENT_TRIPOD 			= Tripod;
+	typename ATTACHMENT_COOKINGSTAND	= CookingStand;
+	typename ATTACHMENT_STONES 			= Stone;
+	typename ATTACHMENT_COOKING_POT 	= Pot;
+	typename ATTACHMENT_FRYING_PAN 		= FryingPan;
+	typename ATTACHMENT_CAULDRON	 	= Cauldron;
+	//
+	const string OBJECT_CLUTTER_CUTTER 	= "ClutterCutterFireplace";
+	protected Object m_ClutterCutter;
+	
+	//area damage
+	protected ref AreaDamageManager 	m_AreaDamage;
+	
+	//quantity
+	protected float m_TotalEnergy;
+	
+	// Noise
+	ref NoiseParams m_NoisePar;
+	private bool m_CanNoise = true; // Flip every fireplace update to limit amount of noise generation
+	
+	// UniversalTemperatureSource
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaFireplace m_UTSLFireplace;
+	
+	//================================================================
+	// INIT / STORE LOAD-SAVE
+	//================================================================
+	//Constructor
+	protected void FireplaceBase()
+	{
+		//STATIC: define kindling types
+		if (!m_FireConsumableTypes)
+		{
+			m_FireConsumableTypes = new ref map<typename, ref FireConsumableType>();
+			m_FireConsumableTypes.Insert(ATTACHMENT_RAGS, 				new FireConsumableType(ATTACHMENT_RAGS, 				14, 	true,	"Rags"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_BANDAGE, 			new FireConsumableType(ATTACHMENT_BANDAGE, 				14, 	true,	"MedicalBandage"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_BOOK, 				new FireConsumableType(ATTACHMENT_BOOK, 				36, 	true,	"Book"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_BARK_OAK, 			new FireConsumableType(ATTACHMENT_BARK_OAK, 			20, 	true,	"OakBark"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_BARK_BIRCH, 		new FireConsumableType(ATTACHMENT_BARK_BIRCH, 			14, 	true,	"BirchBark"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_PAPER, 				new FireConsumableType(ATTACHMENT_PAPER, 				10, 	true,	"Paper"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_GIFTWRAP, 			new FireConsumableType(ATTACHMENT_GIFTWRAP, 			10, 	true,	"GiftWrapPaper"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_PUNCHEDCARD,		new FireConsumableType(ATTACHMENT_PUNCHEDCARD, 			10, 	true,	"PunchedCard"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_EYEMASK_COLORBASE,	new FireConsumableType(ATTACHMENT_EYEMASK_COLORBASE, 	10, 	true,	"EyeMask_ColorBase"));
+			
+			//define fuel types
+			m_FireConsumableTypes.Insert(ATTACHMENT_STICKS, 		new FireConsumableType( ATTACHMENT_STICKS, 		40, 	false,	"WoodenStick"));
+			m_FireConsumableTypes.Insert(ATTACHMENT_FIREWOOD, 		new FireConsumableType( ATTACHMENT_FIREWOOD, 	100, 	false,	"Firewood"));
+		}
+
+		//calculate total energy
+		CalcAndSetTotalEnergy();
+		
+		//define fuel / kindling items (fire consumables)
+		m_FireConsumables = new ref map<ItemBase, ref FireConsumable>;
+		
+		//default burning parameters
+		SetTemperatureLossMP( TEMPERATURE_LOSS_MP_DEFAULT );
+		SetFuelBurnRateMP( FUEL_BURN_RATE_DEFAULT );
+		
+		//synchronized variables
+		RegisterNetSyncVariableBool( "m_IsBurning" );
+		RegisterNetSyncVariableBool( "m_HasAshes" );
+		RegisterNetSyncVariableBool( "m_IsOven" );
+		RegisterNetSyncVariableBool( "m_HasStoneCircle" );
+		RegisterNetSyncVariableBool( "m_RoofAbove" );
+		RegisterNetSyncVariableInt( "m_FireState", FireplaceFireState.NO_FIRE, FireplaceFireState.COUNT );
+		RegisterNetSyncVariableBool( "m_IsSoundSynchRemote" );
+		RegisterNetSyncVariableBool( "m_IsPlaceSound" );
+		RegisterNetSyncVariableBool( "m_NoIgnite" );
+		
+		m_HalfExtents = vector.Zero;
+	}
+	
+	protected void ~FireplaceBase()
+	{
+		DestroyAreaDamage();
+
+		if (GetLightEntity())
+		{
+			GetLightEntity().FadeOut();
+		}
+	}
+
+	override void EEInit()
+	{
+		super.EEInit();
+
+		//refresh visual on init
+		RefreshFireplaceVisuals();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_AffectStat		= true;
+			m_UTSSettings.m_ManualUpdate	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= PARAM_NORMAL_FIRE_TEMPERATURE;
+			m_UTSSettings.m_TemperatureCap	= PARAM_MAX_TRANSFERED_TEMPERATURE;
+			m_UTSSettings.m_RangeFull		= PARAM_FULL_HEAT_RADIUS;
+			m_UTSSettings.m_RangeMax		= PARAM_HEAT_RADIUS;
+			
+			m_UTSLFireplace = new UniversalTemperatureSourceLambdaFireplace();
+			m_UTSLFireplace.SetSmallFireplaceTemperatureMax(PARAM_SMALL_FIRE_TEMPERATURE);
+			m_UTSLFireplace.SetNormalFireplaceTemperatureMax(PARAM_NORMAL_FIRE_TEMPERATURE);
+
+			m_UTSource = new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLFireplace);
+		}		
+	}
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		//cookware
+		switch (item.Type())
+		{
+		case ATTACHMENT_CAULDRON:
+		case ATTACHMENT_COOKING_POT:
+		case ATTACHMENT_FRYING_PAN:
+			SetCookingEquipment(ItemBase.Cast(item));
+		break;
+		}
+	}
+
+	override void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner) 
+	{
+		super.OnItemLocationChanged(old_owner, new_owner);
+		
+		//refresh physics after location change (with delay)
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(RefreshFireplacePhysics);
+	}
+	
+	override void OnAttachmentRuined(EntityAI attachment)
+	{
+		switch (attachment.Type())
+		{
+		case ATTACHMENT_TRIPOD:
+		case ATTACHMENT_COOKINGSTAND:
+			int slot = InventorySlots.GetSlotIdFromString("CookingEquipment");
+			EntityAI ent = GetInventory().FindAttachment(slot);
+			if (ent)
+			{
+				switch (ent.Type())
+				{
+				case ATTACHMENT_COOKING_POT:
+				case ATTACHMENT_CAULDRON:
+				case ATTACHMENT_FRYING_PAN:
+					vector direction = ent.GetDirection();
+					float dot = vector.Dot(direction, vector.Forward);
+					
+					float angle = Math.Acos(dot);	
+					if (direction[0] < 0)
+					{
+						angle = -angle;
+					}
+			
+					float cos = Math.Cos(angle);
+					float sin = Math.Sin(angle);
+					GetInventory().DropEntityInBounds(InventoryMode.SERVER, this, ent, "2 0 2", angle, cos, sin);
+				break;
+				}
+			}
+
+			attachment.Delete();
+		break;
+		}
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+
+		SetFireState(FireplaceFireState.NO_FIRE);
+
+		// cleanup particles (for cases of leaving burning fplace and going back outside of network bubble)
+		#ifndef SERVER
+		StopAllParticlesAndSounds();
+		#endif
+	}	
+		
+	//on store save/load
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave(ctx);
+
+		//Save ashes state
+		ctx.Write( m_HasAshes );
+		
+		//Save temperature loss MP
+		ctx.Write( m_TemperatureLossMP );
+
+		//Save fuel burn rate MP
+		ctx.Write( m_FuelBurnRateMP );
+		
+		//Save burning state
+		ctx.Write( m_IsBurning );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+
+		//--- Fireplace data ---
+		//Load ashes state
+		if ( !ctx.Read( m_HasAshes ) )
+		{
+			m_HasAshes = false;			//set default
+			return false;
+		}
+		
+		//Load temperature loss MP
+		if ( !ctx.Read( m_TemperatureLossMP ) )
+		{
+			m_TemperatureLossMP = 1.0;	//set default
+			return false;
+		}
+		
+		//Load fuel burn rate MP
+		if ( !ctx.Read( m_FuelBurnRateMP ) )
+		{
+			m_FuelBurnRateMP = 1.0;		//set default
+			return false;
+		}
+		
+		//Load burning state, if true start fire
+		if ( !ctx.Read( m_IsBurning ) )
+		{
+			m_IsBurning = false;		//set default
+			return false;
+		}
+		//---
+		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+				
+		Synchronize();
+		
+		//start fire
+		if (IsBurning() )
+		{
+			if (GetGame() && GetGame().IsServer()) 
+			{
+				StartFire(true);			//will be auto-synchronized when starting fire
+			}
+		}		
+	}		
+	
+	//================================================================
+	// SYNCHRONIZATION
+	//================================================================	
+	void Synchronize()
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			SetSynchDirty();
+			
+			if ( GetGame().IsMultiplayer() && GetGame().IsServer() )
+			{
+				//Refresh visuals (on server)
+				GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Call( RefreshFireplaceVisuals );
+			}
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+
+		RefreshFireplaceVisuals();
+		RefreshFireParticlesAndSounds(false);
+		
+		if (IsPlaceSound())
+		{
+			PlayPlaceSound();
+		}
+		
+		if (IsBaseFireplace() && !IsOven())
+		{
+			if (m_IsBurning && !m_AreaDamage)
+			{
+				CreateAreaDamage();
+			}
+			else if (!m_IsBurning && m_AreaDamage)
+			{
+				DestroyAreaDamage();
+			}
+		}
+	}
+	
+	//================================================================
+	// BASE
+	//================================================================
+	
+	//States
+	//check fireplace types
+	override bool IsFireplace()
+	{
+		return true;
+	}
+	
+	bool IsBaseFireplace()
+	{
+		return false;
+	}
+	
+	bool IsBarrelWithHoles()
+	{
+		return false;
+	}
+	
+	bool IsFireplaceIndoor()
+	{
+		return false;
+	}
+
+	bool IsIndoorOven()
+	{
+		return false;
+	}
+	
+	override bool CanHaveWetness()
+	{
+		return true;
+	}
+	
+	override bool CanHaveTemperature()
+	{
+		return true;
+	}
+	
+	//cooking equipment
+	ItemBase GetCookingEquipment()
+	{
+		return m_CookingEquipment;
+	}
+	
+	void SetCookingEquipment(ItemBase equipment)
+	{
+		m_CookingEquipment = equipment;
+	}
+	
+	void ClearCookingEquipment(ItemBase pItem)
+	{
+		if (m_CookingProcess)
+		{
+			m_CookingProcess.TerminateCookingSounds(pItem);
+		}
+
+		SetCookingEquipment(null);
+	}
+	
+	//! DEPRECATED
+	void ClearCookingEquipment()
+	{
+		SetCookingEquipment(null);
+	}
+
+	bool DirectCookingSlotsInUse()
+	{
+		for (int i = 0; i < DIRECT_COOKING_SLOT_COUNT; i++)
+		{
+			if ( m_DirectCookingSlots[i] )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	bool SmokingSlotsInUse()
+	{
+		for (int i = 0; i < SMOKING_SLOT_COUNT; i++)
+		{
+			if ( m_SmokingSlots[i] )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+
+	//! [DEPRECATED]
+	void DestroyFireplace()
+	{
+		DeleteSafe();
+	}
+	
+	override bool IsPrepareToDelete()
+	{
+		return IsEmpty() && !IsBurning() && !HasAshes();
+	}
+	
+	override void EECargoOut(EntityAI item)
+	{
+		super.EECargoOut(item);
+
+		CheckForDestroy();
+	}
+	
+	//================================================================
+	// VISUAL
+	//================================================================
+	//Fireplace visual
+	void RefreshFireplaceVisuals()
+	{
+		if (IsHologram())
+		{
+			return;
+		}
+		
+		// Light
+		#ifndef SERVER
+		if (IsBurning() ) 
+		{
+			//turn light on
+			if (!GetLightEntity())
+			{
+				SetLightEntity(FireplaceLight.Cast(ScriptedLightBase.CreateLight(FireplaceLight, GetPosition(), 20)));
+				GetLightEntity().AttachOnMemoryPoint(this, "light");
+			}
+
+			if (GetLightEntity() && GetLightEntity().GetBrightness() > 0)
+			{
+				// change brightness based on the distance of player to the fireplace
+				Object player 	= GetGame().GetPlayer();
+				float lightDist = m_LightDistance;
+
+				if (IsOven())
+				{
+					lightDist = 50;
+				}
+
+				if (player)
+				{
+					if (vector.DistanceSq(player.GetPosition(), this.GetPosition()) > lightDist * lightDist)
+					{
+						GetLightEntity().FadeBrightnessTo(0, 5);
+					}
+					else
+					{
+						GetLightEntity().FadeBrightnessTo(FireplaceLight.m_FireplaceBrightness, 5);
+					}
+				}
+				
+				// The following solves an issue with the light point clipping through narrow geometry
+				if (IsItemTypeAttached(ATTACHMENT_STONES) || IsBarrelWithHoles() || IsFireplaceIndoor())
+				{
+					GetLightEntity().SetInteriorMode();
+				}
+				else
+				{
+					GetLightEntity().SetExteriorMode();
+				}
+			}
+		}
+		else
+		{
+			//turn light off
+			if (GetLightEntity())
+			{
+				GetLightEntity().FadeOut();
+			}
+		}
+		#endif
+		
+		//set default burn parameters based on fireplace type
+		if (IsBarrelWithHoles() || IsFireplaceIndoor() || IsIndoorOven() || IsOven())
+		{
+			SetFuelBurnRateMP(FUEL_BURN_RATE_OVEN);
+			SetTemperatureLossMP(TEMPERATURE_LOSS_MP_OVEN);
+		}
+		else if (HasStoneCircle())
+		{
+			SetFuelBurnRateMP(FUEL_BURN_RATE_STONES);
+			SetTemperatureLossMP(TEMPERATURE_LOSS_MP_STONES);
+		}
+		else
+		{
+			SetFuelBurnRateMP(FUEL_BURN_RATE_DEFAULT);
+			SetTemperatureLossMP(TEMPERATURE_LOSS_MP_DEFAULT);
+		}
+		
+		// Oven attachments
+		if (IsOven())
+		{
+			//lock attachment slots
+			if (!m_OvenAttachmentsLockState)
+			{
+				LockOvenAttachments(true);
+			}
+		}
+		else
+		{
+			//unlock attachment slots
+			if (m_OvenAttachmentsLockState)
+			{
+				LockOvenAttachments(false);
+			}
+		}
+		
+		//VISUAL STATES
+		//Fuel state
+		if ( GetGame().IsServer() ) // SetAnimationPhase should ideally be called on server only..
+		{
+			// Sticks state
+			if ( IsItemTypeAttached( ATTACHMENT_STICKS ) )
+				SetAnimationPhase( ANIMATION_STICKS, 0 );
+			else
+				SetAnimationPhase( ANIMATION_STICKS, 1 );
+			
+			// Firewood state
+			if ( IsItemTypeAttached( ATTACHMENT_FIREWOOD ) )
+			{
+				if ( IsBurning() && HasAshes() )
+				{
+					SetAnimationPhase( ANIMATION_BURNT_WOOD, 0 ); // Because this might not be set under certain circumstances
+					SetAnimationPhase( ANIMATION_WOOD, 1 );
+				}
+				
+				if ( IsWet() || !IsBurning() )
+				{
+					SetAnimationPhase( ANIMATION_BURNT_WOOD, 1 );
+					SetAnimationPhase( ANIMATION_WOOD, 0 );
+				}
+			}
+			else
+			{
+				SetAnimationPhase( ANIMATION_WOOD, 1 );
+				SetAnimationPhase( ANIMATION_BURNT_WOOD, 1 );		
+			}	
+				
+			// Kindling state
+			if ( GetKindlingCount() != 0 )
+				SetAnimationPhase( ANIMATION_KINDLING, 0 );
+			else
+				SetAnimationPhase( ANIMATION_KINDLING, 1 );
+	
+			// Ashes state
+			if ( HasAshes() )
+				SetAnimationPhase( ANIMATION_ASHES, 0 );
+			else
+				SetAnimationPhase( ANIMATION_ASHES, 1 );
+
+			// Stone variations
+			if (HasStones())
+			{
+				if (HasStoneCircle())
+				{
+					SetAnimationPhase(ANIMATION_STONES, 0);
+					SetAnimationPhase(ANIMATION_STONE, 1);
+				}
+				else if (IsOven())
+				{
+					SetAnimationPhase(ANIMATION_OVEN, 0);
+					SetAnimationPhase(ANIMATION_STONE, 1);
+				}
+				else
+				{
+					//! single stone; everything else hidden
+					SetAnimationPhase(ANIMATION_STONES, 1);
+					SetAnimationPhase(ANIMATION_OVEN, 1);
+					SetAnimationPhase(ANIMATION_STONE, 0);
+				}
+			}
+			else
+			{
+				SetAnimationPhase(ANIMATION_STONE, 1); //! hide stones stack completely
+			}
+		}
+		
+		//refresh physics (with delay)
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(RefreshFireplacePhysics);
+	}
+
+	protected void SetBurntFirewood()
+	{
+		if ( GetGame().IsServer() && IsInAnimPhase( ANIMATION_WOOD ) )
+		{
+			SetAnimationPhase( ANIMATION_WOOD, 1 );
+			SetAnimationPhase( ANIMATION_BURNT_WOOD, 0 );				
+		}	
+	}
+	
+	//Refresh fireplace object physics
+	void RefreshFireplacePhysics();
+	
+	protected void RefreshFireParticlesAndSounds( bool force_refresh )
+	{
+		FireplaceFireState fire_state = GetFireState();
+		
+		if ( m_LastFireState != fire_state || force_refresh )
+		{
+			switch ( fire_state )
+			{
+				case FireplaceFireState.START_FIRE:
+				{
+					//particles
+					ParticleFireStartStart();
+		
+					//sounds
+					SoundFireStop();
+					SoundFireLightStart();	
+					break;
+				}
+				case FireplaceFireState.SMALL_FIRE:
+				{
+					//particles
+					ParticleFireStartStop();
+					
+					ParticleSmallFireStart();
+					
+					if ( CanShowSmoke() ) 
+						ParticleSmallSmokeStart();
+					else
+						ParticleSmallSmokeStop();
+					
+					ParticleNormalFireStop();
+					ParticleNormalSmokeStop();
+					
+					ParticleSteamExtinguishingStop();
+					
+					//sounds
+					SoundFireStop();
+					SoundFireLightStart();
+					break;
+				}
+				case FireplaceFireState.NORMAL_FIRE:
+				{
+					//particles
+					ParticleFireStartStop();
+					
+					ParticleSmallFireStop();
+					ParticleSmallSmokeStop();
+					
+					ParticleNormalFireStart();
+					
+					if ( CanShowSmoke() ) 
+						ParticleNormalSmokeStart();
+					else
+						ParticleNormalSmokeStop();
+					
+					ParticleSteamExtinguishingStop();
+		
+					//sounds
+					SoundFireStop();
+					SoundFireHeavyStart();
+					break;
+				}
+				case FireplaceFireState.END_FIRE:
+				{
+					//particles
+					ParticleFireStartStop();
+					
+					ParticleSmallFireStop();
+					ParticleSmallSmokeStop();
+		
+					ParticleNormalFireStop();
+					ParticleNormalSmokeStop();
+		
+					ParticleFireEndStart();
+					
+					//sounds
+					SoundFireStop();
+					SoundFireNoFireStart();
+					break;
+				}
+				case FireplaceFireState.EXTINGUISHING_FIRE:		//TODO add steam particles when extinguishing
+				{
+					//particles
+					ParticleFireStartStop();
+					
+					ParticleSmallFireStop();
+					ParticleSmallSmokeStop();
+		
+					ParticleNormalFireStop();
+					ParticleNormalSmokeStop();	
+		
+					ParticleFireEndStop();
+					
+					ParticleSteamExtinguishingStart();
+					
+					//sounds
+					SoundFireStop();
+					SoundFireExtinguishingStart();
+					break;			
+				}
+				case FireplaceFireState.EXTINGUISHED_FIRE:		//TODO add steam particles when fireplace is extinguished
+				{
+					//particles
+					ParticleFireStartStop();
+					
+					ParticleSmallFireStop();
+					ParticleSmallSmokeStop();
+		
+					ParticleNormalFireStop();
+					ParticleNormalSmokeStop();	
+		
+					ParticleFireEndStop();
+					
+					ParticleSteamExtinguishingStop();
+					
+					if ( CanShowSmoke() ) 
+						ParticleSteamEndStart();
+					else
+						ParticleSteamEndStop();
+					
+					//sounds
+					SoundFireStop();
+					SoundFireExtinguishedStart();
+					SoundFireNoFireStart();
+					break;
+				}
+				case FireplaceFireState.REIGNITED_FIRE:
+				{
+					//particles
+					ParticleFireStartStart();
+					
+					ParticleSmallFireStop();
+					ParticleSmallSmokeStop();
+		
+					ParticleNormalFireStop();
+					ParticleNormalSmokeStop();	
+		
+					ParticleFireEndStop();
+					
+					ParticleSteamEndStop();
+					
+					//sounds
+					SoundFireStop();
+					break;
+				}
+				case FireplaceFireState.NO_FIRE:
+				{
+					//particles
+					ParticleFireStartStop();
+					
+					ParticleSmallFireStop();
+					ParticleSmallSmokeStop();
+		
+					ParticleNormalFireStop();
+					ParticleNormalSmokeStop();	
+		
+					ParticleFireEndStop();
+					
+					ParticleSteamEndStop();
+					ParticleSteamExtinguishingStop();
+					
+					//sounds
+					SoundFireStop();
+					break;
+				}
+			}
+			
+			m_LastFireState = fire_state;
+		}
+	}
+	
+	protected void StopAllParticlesAndSounds()
+	{
+		// go through all fireplace particles
+		if ( m_ParticleFireStart )
+			StopParticle( m_ParticleFireStart );
+		if ( m_ParticleSmallFire )
+			StopParticle( m_ParticleSmallFire );
+		if ( m_ParticleNormalFire )
+			StopParticle( m_ParticleNormalFire );
+		if ( m_ParticleSmallSmoke )
+			StopParticle( m_ParticleSmallSmoke );
+		if ( m_ParticleNormalSmoke )
+			StopParticle( m_ParticleNormalSmoke );
+		if ( m_ParticleFireEnd )
+			StopParticle( m_ParticleFireEnd );
+		if ( m_ParticleSteamEnd )
+			StopParticle( m_ParticleSteamEnd );
+		if ( m_ParticleSteamExtinguishing )
+			StopParticle( m_ParticleSteamExtinguishing );
+
+		// go through all fireplace sounds
+		if ( m_SoundFireLoop )
+			StopSoundSet( m_SoundFireLoop );
+		if ( m_SoundFire )
+			StopSoundSet( m_SoundFire );
+	}
+
+	bool CanShowSmoke()
+	{
+		return true;
+	}
+	
+	//Fireplace fire intensity
+	void RefreshFireState()
+	{
+		float temperature = GetTemperature();
+		
+		//if it's burning
+		if (IsBurning())
+		{
+			//Start fire
+			if (temperature <= PARAM_MIN_FIRE_TEMPERATURE)
+			{
+				if ( GetFireState() != FireplaceFireState.START_FIRE )
+				{
+					SetFireState( FireplaceFireState.START_FIRE );
+				}
+			}
+			//Small fire
+			else if (temperature <= PARAM_SMALL_FIRE_TEMPERATURE)
+			{
+				if ( GetFireState() != FireplaceFireState.SMALL_FIRE )
+				{
+					SetFireState( FireplaceFireState.SMALL_FIRE );
+				}
+			}
+			//Normal fire
+			else if (temperature > PARAM_SMALL_FIRE_TEMPERATURE)
+			{
+				if ( GetFireState() != FireplaceFireState.NORMAL_FIRE )
+				{
+					SetFireState( FireplaceFireState.NORMAL_FIRE );
+				}
+			}			
+		}
+	}
+
+	//================================================================
+	// PARTICLES & SOUNDS
+	//================================================================
+	//returns true if particle started, false if not
+	protected bool PlayParticle( out Particle particle, int particle_type, vector pos, bool worldpos = false )
+	{
+		if ( !particle && GetGame() && ( !GetGame().IsDedicatedServer() ) )
+		{
+			if ( !worldpos )
+			{
+				particle = ParticleManager.GetInstance().PlayOnObject( particle_type, this, pos );
+			}
+			else
+			{
+				particle = ParticleManager.GetInstance().PlayInWorld( particle_type, pos );
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//returns true if particle stopped, false if not
+	protected bool StopParticle( out Particle particle )
+	{
+		if ( particle && GetGame() && ( !GetGame().IsDedicatedServer() ) )
+		{
+			particle.Stop();
+			particle = NULL;
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//start fire
+	protected void ParticleFireStartStart()
+	{
+		if ( IsOven() )
+		{
+			PlayParticle( m_ParticleFireStart, PARTICLE_OVEN_FIRE_START, GetFireEffectPosition() );
+		}
+		else
+		{
+			PlayParticle( m_ParticleFireStart, PARTICLE_FIRE_START, GetFireEffectPosition() );
+		}
+	}
+	
+	protected void ParticleFireStartStop()
+	{
+		StopParticle( m_ParticleFireStart );
+	}
+	
+	//small fire
+	protected void ParticleSmallFireStart()
+	{
+		if ( IsOven() )
+		{
+			PlayParticle( m_ParticleSmallFire, PARTICLE_OVEN_FIRE, GetFireEffectPosition() );
+		}
+		else
+		{
+			PlayParticle( m_ParticleSmallFire, PARTICLE_SMALL_FIRE, GetFireEffectPosition() );	
+		}
+	}
+	
+	protected void ParticleSmallFireStop()
+	{
+		StopParticle( m_ParticleSmallFire );
+	}	
+	
+	//normal fire
+	protected void ParticleNormalFireStart()
+	{
+		if ( IsOven() )
+		{
+			PlayParticle( m_ParticleNormalFire, PARTICLE_OVEN_FIRE, GetFireEffectPosition() );
+		}
+		else
+		{
+			PlayParticle( m_ParticleNormalFire, PARTICLE_NORMAL_FIRE, GetFireEffectPosition() );
+		}
+	}
+	
+	protected void ParticleNormalFireStop()
+	{
+		StopParticle( m_ParticleNormalFire );
+	}
+	
+	//small smoke
+	protected void ParticleSmallSmokeStart()
+	{
+		PlayParticle( m_ParticleSmallSmoke, PARTICLE_SMALL_SMOKE, GetSmokeEffectPosition() );
+				
+		//calculate air resistance
+		float actual_height;
+		if ( GetCeilingHeight( actual_height ) )
+		{
+			float air_resistance = GetAirResistanceForSmokeParticles( actual_height );
+			
+			//alter smoke height
+			m_ParticleSmallSmoke.SetParameter( -1, EmitorParam.AIR_RESISTANCE, air_resistance );
+		}
+					
+		if ( IsRoofAbove() )
+		{
+			m_ParticleSmallSmoke.SetParameter( -1, EmitorParam.WIND, false );
+		}
+	}
+	
+	protected void ParticleSmallSmokeStop()
+	{
+		StopParticle( m_ParticleSmallSmoke );
+	}
+	
+	//normal smoke
+	protected void ParticleNormalSmokeStart()
+	{
+		PlayParticle( m_ParticleNormalSmoke, PARTICLE_NORMAL_SMOKE, GetSmokeEffectPosition() );
+		
+		//calculate air resistance
+		float actual_height;
+		if ( GetCeilingHeight( actual_height ) )
+		{		
+			float air_resistance = GetAirResistanceForSmokeParticles( actual_height );
+			
+			//alter smoke height
+			m_ParticleNormalSmoke.SetParameter( -1, EmitorParam.AIR_RESISTANCE, air_resistance );
+		}
+		
+		if ( IsRoofAbove() )
+		{
+			m_ParticleNormalSmoke.SetParameter( -1, EmitorParam.WIND, false );
+		}
+	}
+	
+	protected void ParticleNormalSmokeStop()
+	{
+		StopParticle( m_ParticleNormalSmoke );
+	}
+	
+	//fire end
+	protected void ParticleFireEndStart()
+	{
+		if ( IsOven() )
+		{
+			PlayParticle( m_ParticleFireEnd, PARTICLE_OVEN_FIRE_END, GetFireEffectPosition() );
+		}
+		else
+		{
+			PlayParticle( m_ParticleFireEnd, PARTICLE_FIRE_END, GetFireEffectPosition() );
+		}
+	}
+	
+	protected void ParticleFireEndStop()
+	{
+		StopParticle( m_ParticleFireEnd );
+	}
+	
+	protected void ParticleFireWindyNoIgniteStart()
+	{
+		if ( IsOven() )
+		{
+			PlayParticle( m_ParticleFireEnd, PARTICLE_OVEN_FIRE_END, GetFireEffectPosition() );
+		}
+		else
+		{
+			PlayParticle( m_ParticleFireEnd, PARTICLE_NO_IGNITE_WIND, GetFireEffectPosition() );
+		}
+	}
+	
+	//steam extinguishing
+	protected void ParticleSteamExtinguishingStart()
+	{
+		PlayParticle( m_ParticleSteamExtinguishing, PARTICLE_STEAM_EXTINGUISHING, GetFireEffectPosition() );
+	}
+	
+	protected void ParticleSteamExtinguishingStop()
+	{
+		StopParticle(m_ParticleSteamExtinguishing);
+	}	
+
+	//steam end
+	protected void ParticleSteamEndStart()
+	{
+		PlayParticle( m_ParticleSteamEnd, PARTICLE_STEAM_END, GetFireEffectPosition() );
+	}
+	
+	protected void ParticleSteamEndStop()
+	{
+		StopParticle( m_ParticleSteamEnd );
+	}
+	
+	protected void ParticleWetNoIgniteStart()
+	{
+		PlayParticle( m_ParticleSteamEnd, PARTICLE_STEAM_END, GetFireEffectPosition() );
+	}
+	
+	protected void ParticleWetNoIgniteStop()
+	{
+		StopParticle( m_ParticleSteamEnd );
+	}
+
+	bool GetCeilingHeight( out float actual_height )
+	{
+		vector from = this.GetPosition();
+		vector to = this.GetPosition();
+		from[1] = from[1] + 1.0;
+		to[1] = to[1] + MIN_CEILING_HEIGHT;
+		vector contactPos;
+		vector contactDir;
+		int contactComponent;
+		
+		bool hit = DayZPhysics.RaycastRV( from, to, contactPos, contactDir, contactComponent, NULL, NULL, this );
+		actual_height = vector.Distance( from, contactPos ) + 1.0;
+		
+		return hit;
+	}
+	
+	float GetAirResistanceForSmokeParticles( float actual_height )
+	{
+		float air_res;
+		actual_height = Math.Clamp( actual_height, 0, 36 );
+		
+		air_res = ( 6 - actual_height ) * 0.33;
+		air_res = Math.Clamp( air_res, 0, 2 );
+		
+		return air_res;
+	}
+	
+	//Particle Positions
+	//Get local fire and smoke effect position
+	protected vector GetFireEffectPosition()
+	{
+		return Vector( 0, 0.05, 0 );
+	}
+	
+	protected vector GetSmokeEffectPosition()
+	{
+		return Vector( 0, 0.05, 0 );
+	}
+
+	//================================================================
+	// SOUNDS
+	//================================================================
+	//Burning
+	//Start
+	protected void SoundFireLightStart()
+	{
+		PlaySoundSetLoop( m_SoundFireLoop, SOUND_FIRE_LIGHT, 1.0, 1.0 );
+	}
+	
+	protected void SoundFireHeavyStart()
+	{
+		PlaySoundSetLoop( m_SoundFireLoop, SOUND_FIRE_HEAVY, 1.0, 2.0 );
+	}
+
+	protected void SoundFireNoFireStart()
+	{
+		PlaySoundSetLoop( m_SoundFireLoop, SOUND_FIRE_NO_FIRE, 2.0, 2.0 );
+	}
+	
+	protected void SoundFireExtinguishedStart()
+	{
+		PlaySoundSet( m_SoundFire, SOUND_FIRE_EXTINGUISHED, 0.1, 0.1 );
+	}	
+	
+	protected void SoundFireWetNoIgniteStart()
+	{
+		PlaySoundSet( m_SoundFire, SOUND_FIRE_EXTINGUISHED, 0.1, 0.1 );
+	}	
+
+	protected void SoundFireExtinguishingStart()
+	{
+		PlaySoundSetLoop( m_SoundFireLoop, SOUND_FIRE_EXTINGUISHING, 1.0, 0.5 );
+	}
+	
+	protected void SoundFireWindyNoIgniteStart()
+	{
+		PlaySoundSet( m_SoundFire, "ExtinguishByWind_SoundSet", 0, 0 );
+	}	
+	
+	//Stop
+	protected void SoundFireStop()
+	{
+		StopSoundSet( m_SoundFireLoop );
+	}
+	
+	//================================================================
+	// FUEL / KINDLING
+	//================================================================
+	//Add to fire consumables
+	protected void AddToFireConsumables(ItemBase item)
+	{
+		m_FireConsumables.Insert(item, new FireConsumable(item, GetFireConsumableTypeEnergy(item)));		
+		CalcAndSetQuantity();
+	}
+
+	protected float GetFireConsumableTypeEnergy(ItemBase item)
+	{
+		FireConsumableType fireConsumableType = m_FireConsumableTypes.Get(item.Type());
+		if (!fireConsumableType)
+		{
+			//! support for inherited classes; second pass of lookup inside FireConsumableType
+			int count = m_FireConsumableTypes.Count();
+			for (int i = 0; i < count; ++i)
+			{
+				if (item.IsInherited(m_FireConsumableTypes.GetKey(i)))
+					fireConsumableType = m_FireConsumableTypes.GetElement(i);
+			}
+		}
+		
+		if (fireConsumableType)
+			return fireConsumableType.GetEnergy();
+
+		return 0;
+	}
+
+	//Remove from fire consumables
+	protected void RemoveFromFireConsumables(FireConsumable fire_consumable)
+	{
+		if (fire_consumable)
+		{
+			m_FireConsumables.Remove(fire_consumable.GetItem());
+			delete fire_consumable;
+		}
+		
+		CalcAndSetQuantity();
+	}
+	
+	protected FireConsumable GetFireConsumableByItem( ItemBase item )
+	{
+		return m_FireConsumables.Get(item);
+	}
+
+	//Set fuel / kindling to consume
+	//Sets the item with the lowest energy value as item that will be consumed next
+	//Returns reference to set fire consumable
+	protected FireConsumable SetItemToConsume()
+	{
+		if (m_FireConsumables.Count() == 0)
+		{
+			m_ItemToConsume = null;
+		}
+		else
+		{
+			for (int i = 0; i < m_FireConsumables.Count(); ++i)
+			{
+				ItemBase key = m_FireConsumables.GetKey(i);
+				FireConsumable fireConsumable = m_FireConsumables.Get(key);
+				
+				if (i == 0)
+				{
+					m_ItemToConsume = fireConsumable;
+				}
+				else
+				{
+					if (fireConsumable.GetEnergy() < m_ItemToConsume.GetEnergy())
+					{
+						m_ItemToConsume = fireConsumable;
+					}	
+				}
+			}
+		}
+		
+		//refresh visual
+		RefreshFireplaceVisuals();
+
+		return m_ItemToConsume;
+	}
+
+	protected FireConsumable GetItemToConsume()
+	{
+		return m_ItemToConsume;
+	}
+
+	//Spend item that is used as consumable for fire (fuel, kindling)
+	//if 'amount == 0', the whole quantity will be consumed (quantity -= 1 )
+	//debug
+	//int m_debug_fire_consume_time = 0;
+	protected void SpendFireConsumable(float amount)
+	{
+		//spend item
+		FireConsumable fireConsumable = GetItemToConsume();
+		
+		if (!fireConsumable)
+		{
+			//Set new item to consume
+			fireConsumable = SetItemToConsume();
+		}
+		
+		if (fireConsumable)
+		{
+			ItemBase item = fireConsumable.GetItem();
+			fireConsumable.SetRemainingEnergy(fireConsumable.GetRemainingEnergy() - amount);
+			
+			if (fireConsumable.GetRemainingEnergy() <= 0 || amount == 0)
+			{
+				//set ashes
+				if (!HasAshes())
+				{
+					SetAshesState(true);
+				}	
+				
+				if (item.IsAnyInherited({ItemBook, Paper, GiftWrapPaper, EyeMask_ColorBase}))
+				{
+					RemoveFromFireConsumables(fireConsumable);
+					item.Delete();
+				}
+				else
+				{
+					//if there is nothing left, delete and remove old consumable, set new fire consumable
+					if (item.GetQuantity() <= 1)
+					{
+						//remove item from fuel items
+						RemoveFromFireConsumables(fireConsumable);
+					}
+					else
+					{
+						fireConsumable.SetRemainingEnergy(fireConsumable.GetEnergy());
+					}
+					
+					item.AddQuantity(-1);
+					SetItemToConsume();
+				}
+			}
+		}
+		
+		CalcAndSetQuantity();
+	}
+
+	//! Returns count of all kindling type items (define in 'm_KindlingTypes') attached to fireplace
+	protected int GetKindlingCount()
+	{
+		int attachmentsCount = GetInventory().AttachmentCount();
+		int kindlingCount = 0;
+		
+		for (int i = 0; i < attachmentsCount; ++i)
+		{
+			ItemBase item = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(i));
+			
+			if (IsKindling(item))
+				kindlingCount++;
+		}
+		
+		return kindlingCount;
+	}
+
+	//! Returns count of all fuel type items (define in 'm_FuelTypes') attached to fireplace
+	protected int GetFuelCount()
+	{
+		int attachmentsCount = GetInventory().AttachmentCount();
+		int fuelCount = 0;
+		
+		for (int i = 0; i < attachmentsCount; ++i)
+		{
+			ItemBase item = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(i));
+			if (IsFuel(item))
+				fuelCount++;
+		}
+		
+		return fuelCount;
+	}
+
+	//! Returns if item attached to fireplace is kindling
+	protected bool IsKindling(ItemBase item)
+	{
+		FireConsumableType fireConsumableType = m_FireConsumableTypes.Get(item.Type());
+		if (!fireConsumableType)
+		{
+			//! support for inherited classes; second pass of lookup inside FireConsumableType
+			int count = m_FireConsumableTypes.Count();
+			for (int i = 0; i < count; ++i)
+			{
+				if (item.IsInherited(m_FireConsumableTypes.GetKey(i)))
+					fireConsumableType = m_FireConsumableTypes.GetElement(i);
+			}
+		}
+
+		return fireConsumableType && fireConsumableType.IsKindling();
+	}
+
+	//! Returns if item attached to fireplace is fuel
+	protected bool IsFuel(ItemBase item)
+	{
+		FireConsumableType fireConsumableType = m_FireConsumableTypes.Get(item.Type());
+		if (!fireConsumableType)
+		{
+			//! support for inherited classes; second pass of lookup inside FireConsumableType
+			int count = m_FireConsumableTypes.Count();
+			for (int i = 0; i < count; ++i)
+			{
+				if (item.IsInherited(m_FireConsumableTypes.GetKey(i)))
+					fireConsumableType = m_FireConsumableTypes.GetElement(i);
+			}
+		}
+
+		return fireConsumableType && !fireConsumableType.IsKindling();
+	}
+
+	//Has attachments of given type
+	bool IsItemTypeAttached(typename item_type)
+	{
+		return GetAttachmentByType(item_type) != null;
+	}
+
+	//Has attachments of required quantity
+	bool IsItemAttachedQuantity(typename item_type, float quantity)
+	{
+		ItemBase item = ItemBase.Cast(GetAttachmentByType(item_type));
+		
+		return item.GetQuantity() >= quantity;
+	}
+
+	//Has last attached item
+	bool HasLastAttachment()
+	{
+		return GetInventory().AttachmentCount() == 1;
+	}
+
+	//Has last fuel/kindling attached
+	bool HasLastFuelKindlingAttached()
+	{
+		return (GetFuelCount() + GetKindlingCount()) == 1;
+	}
+
+	
+	//================================================================
+	// FIRE STATE
+	//================================================================
+	//Is fireplace burning?
+	bool IsBurning()
+	{
+		return m_IsBurning;
+	}
+	
+	//Set burning state
+	protected void SetBurningState(bool is_burning)
+	{
+		m_IsBurning = is_burning;
+	}
+
+	//Are ashes present in fireplace?
+	bool HasAshes()
+	{
+		return m_HasAshes;
+	}
+
+	//Set ashes state
+	protected void SetAshesState(bool has_ashes)
+	{
+		m_HasAshes = has_ashes;
+
+		if (m_HasAshes)
+		{
+			SetBurntFirewood();
+		}
+	}
+
+	//Is in oven state
+	bool IsOven()
+	{
+		return m_IsOven;
+	}		
+	bool HasStoneCircle()
+	{
+		return m_HasStoneCircle;
+	}
+	
+	bool HasStones()
+	{
+		EntityAI attached_item = GetAttachmentByType(ATTACHMENT_STONES);
+
+		return attached_item && attached_item.GetQuantity() > 0;
+	}
+	
+	int GetAttachedStonesCount()
+	{
+		if (HasStones())
+		{
+			return GetAttachmentByType(ATTACHMENT_STONES).GetQuantity();
+		}
+		
+		return 0;
+	}
+
+	void SetOvenState( bool is_oven )
+	{
+		if ( m_IsOven != is_oven )
+		{
+			m_IsOven = is_oven;
+			m_RoofAbove = is_oven;
+			
+			GetInventory().SetSlotLock( InventorySlots.GetSlotIdFromString("Stones") , is_oven);
+			
+			Synchronize();
+		}
+	}
+	void SetStoneCircleState( bool has_stonecircle )
+	{
+		if ( m_HasStoneCircle != has_stonecircle )
+		{
+			m_HasStoneCircle = has_stonecircle;
+			
+			GetInventory().SetSlotLock( InventorySlots.GetSlotIdFromString("Stones") , has_stonecircle);
+			
+			Synchronize();
+		}
+	}
+	
+	//Temperature loss MP
+	protected float GetTemperatureLossMP()
+	{
+		return m_TemperatureLossMP;
+	}	
+	
+	protected void SetTemperatureLossMP( float value )
+	{
+		m_TemperatureLossMP = value;
+	}
+	
+	//Fuel burn rate MP
+	protected float GetFuelBurnRateMP()
+	{
+		return m_FuelBurnRateMP;
+	}	
+	
+	protected void SetFuelBurnRateMP( float value )
+	{
+		m_FuelBurnRateMP = value;
+	}
+	
+	//Get fire state 
+	protected int GetFireState()
+	{
+		return m_FireState;
+	}
+
+	//Sets fire state
+	protected void SetFireState( FireplaceFireState state )
+	{
+		if ( m_FireState != state )
+		{
+			m_FireState = state;
+			
+			Synchronize();
+		}
+	}
+		
+	void SetExtinguishingState()
+	{
+		SetFireState( FireplaceFireState.EXTINGUISHING_FIRE );
+	}
+
+	//================================================================
+	// FIRE PROCESS
+	//================================================================
+	
+	//Start the fire process
+	// 1. start heating
+	// 2. heating
+	// 3. stop heating
+	void StartFire(bool force_start = false)
+	{
+		//stop cooling process if active
+		if (m_CoolingTimer)
+		{
+			m_CoolingTimer.Stop();
+			m_CoolingTimer = null;
+		}
+		
+		//set under roof flag (was fire ignited under roof?)
+		if (MiscGameplayFunctions.IsUnderRoof(this))
+			m_RoofAbove = true;
+		
+		//start fire
+		if (!IsBurning() || force_start)
+		{
+			SetItemToConsume();
+			SetBurningState(true);
+			m_UTSource.SetActive(true);
+			StartHeating();
+			
+			//Update navmesh
+			if (!IsFireplaceIndoor())
+			{
+				SetAffectPathgraph(false, true);
+				GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(GetGame().UpdatePathgraphRegionByObject, 100, false, this);
+			}
+		}
+		
+		Synchronize();
+	}
+
+	//Start heating
+	protected void StartHeating()
+	{
+		//visual
+		SetObjectMaterial(0, MATERIAL_FIREPLACE_GLOW);
+		
+		if (IsWindy() && !IsRoofAbove() && !IsOven() && !IsBarrelWithHoles())
+		{
+			StopFire();
+			return;
+		}
+		
+		if (GetWet() > PARAM_BURN_WET_THRESHOLD)
+		{
+			StopFire(FireplaceFireState.EXTINGUISHED_FIRE);
+			return;
+		}
+		
+		//create area damage
+		if (IsBaseFireplace() && !IsOven())
+			CreateAreaDamage();
+		
+		m_HeatingTimer = new Timer(CALL_CATEGORY_GAMEPLAY);
+		m_HeatingTimer.Run(TIMER_HEATING_UPDATE_INTERVAL, this, "Heating", null, true);
+		
+		//Setup the noise parameters on fire start
+		m_NoisePar = new NoiseParams();
+		if (IsRoofAbove() || IsOven() || IsFireplaceIndoor()) //If we have a roof, we are probably inside
+			m_NoisePar.LoadFromPath("CfgVehicles FireplaceBase NoiseFireplaceSpecial");
+		else
+			m_NoisePar.LoadFromPath("CfgVehicles FireplaceBase NoiseFireplaceBase");
+	}
+
+	//Do heating
+	protected void Heating()
+	{
+		float temperature = GetTemperature();
+		float temperature_modifier = 0;
+		
+		//check burning conditions
+		if (GetWet() > PARAM_BURN_WET_THRESHOLD)
+		{
+			StopFire(FireplaceFireState.EXTINGUISHED_FIRE);
+			return; 
+		}
+		else
+		{
+			if (m_FireConsumables.Count() == 0)
+			{
+				StopFire();
+				return; 				
+			}
+		}
+		
+		//spend actual fire consumable
+		float amount = PARAM_FIRE_CONSUM_RATE_AMOUNT * GetFuelBurnRateMP() * TIMER_HEATING_UPDATE_INTERVAL;
+		SpendFireConsumable(amount);
+		
+		//set wetness if raining and alter temperature modifier (which will lower temperature increase because of rain)
+		float rain = GetGame().GetWeather().GetRain().GetActual();
+		if (rain >= PARAM_BURN_WET_THRESHOLD && !IsRoofAbove())
+		{
+			//set wet to fireplace
+			AddWetnessToFireplace(PARAM_WET_INCREASE_COEF * rain);
+			
+			//set temperature modifier
+			temperature_modifier = PARAM_TEMPERATURE_INCREASE * rain;
+		}
+		//subtract wetness when heating and not raining above
+		else
+		{
+			AddWetnessToFireplace(-PARAM_WET_HEATING_DECREASE_COEF);
+		}
+
+		// temperature via UniversalTemperatureSource
+		m_UTSLFireplace.SetFuelCount(GetFuelCount());
+		temperature = GetTemperature() + (PARAM_TEMPERATURE_INCREASE * TIMER_HEATING_UPDATE_INTERVAL) - temperature_modifier;
+		m_UTSLFireplace.SetCurrentTemperature(temperature);
+		m_UTSource.Update(m_UTSSettings, m_UTSLFireplace);
+		
+		//check fire state
+		if ( GetFireState() != FireplaceFireState.EXTINGUISHING_FIRE )
+		{
+			RefreshFireState();
+		}
+		
+		//damage cargo items
+		BurnItemsInFireplace();
+		
+		//manage cooking equipment (this applies only for case of cooking pot on a tripod)
+		if (HasCookingStand() && m_CookingEquipment)
+		{
+			float cook_equip_temp = m_CookingEquipment.GetTemperature();
+			
+			if ( cook_equip_temp >= PARAM_COOKING_TEMP_THRESHOLD )
+			{
+				//start cooking
+				CookWithEquipment();
+			}
+			
+			//DEBUG
+			/*
+			PlayerBase player = ( PlayerBase ) GetGame().GetPlayer();
+			string s_message = "cooking equipment temp = " + ftoa(cook_equip_temp) + " | PARAM_COOKING_TEMP_THRESHOLD = " + ftoa(PARAM_COOKING_TEMP_THRESHOLD);
+			if (player != NULL) {player.MessageAction (s_message);}
+			Print ( s_message );
+			*/
+			//set temperature to cooking equipment
+			cook_equip_temp = cook_equip_temp + PARAM_COOKING_EQUIP_TEMP_INCREASE;
+			if ( temperature <= PARAM_SMALL_FIRE_TEMPERATURE )
+			{
+				cook_equip_temp = Math.Clamp ( cook_equip_temp, PARAM_ITEM_HEAT_MIN_TEMP, PARAM_SMALL_FIRE_TEMPERATURE );
+			}
+			else
+			{
+				cook_equip_temp = Math.Clamp ( cook_equip_temp, PARAM_ITEM_HEAT_MIN_TEMP, PARAM_COOKING_EQUIP_MAX_TEMP );
+			}
+
+			m_CookingEquipment.SetTemperature( cook_equip_temp );
+		}
+
+		float cook_item_temp;
+		int i;
+		// manage cooking on direct cooking slots
+		if ( DirectCookingSlotsInUse() )
+		{
+			for ( i = 0; i < DIRECT_COOKING_SLOT_COUNT; i++ )
+			{
+				if ( m_DirectCookingSlots[i] )
+				{
+					cook_item_temp = m_DirectCookingSlots[i].GetTemperature();
+					if ( cook_item_temp >= PARAM_COOKING_TEMP_THRESHOLD )
+					{
+						CookOnDirectSlot( m_DirectCookingSlots[i], cook_item_temp, temperature );
+					}
+				}
+			}
+		}
+
+		// manage smoking slots
+		if ( SmokingSlotsInUse() )
+		{
+			for ( i = 0; i < SMOKING_SLOT_COUNT; i++ )
+			{
+				if ( m_SmokingSlots[i] )
+				{
+					SmokeOnSmokingSlot( m_SmokingSlots[i], cook_item_temp, temperature );
+				}
+			}
+		}
+		
+		//Make noise for AI, only at night
+		if ( GetGame().GetWorld().IsNight() && m_CanNoise )
+		{
+			NoiseSystem noise = GetGame().GetNoiseSystem();
+			if ( noise && m_NoisePar )
+			{
+				noise.AddNoisePos( this, GetPosition(), m_NoisePar);
+			}
+			m_CanNoise = false;
+		}
+		else
+			m_CanNoise = true;
+		
+		Synchronize();
+	}
+
+	//Stop the fire process
+	// 1. start cooling
+	// 2. cooling
+	// 3. stop cooling
+	void StopFire( FireplaceFireState fire_state = FireplaceFireState.END_FIRE )
+	{
+		StopHeating();
+		SpendFireConsumable(0);
+		SetBurningState(false);
+		StartCooling();
+		SetFireState(fire_state);
+		
+		//Update navmesh
+		if (!IsFireplaceIndoor())
+		{
+			SetAffectPathgraph(false, false);
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(GetGame().UpdatePathgraphRegionByObject, 100, false, this);
+		}
+		
+		Synchronize();
+	}
+	
+	protected void StopHeating()
+	{
+		if (!m_HeatingTimer)
+			return;
+		
+		m_HeatingTimer.Stop();
+		m_HeatingTimer = null;
+	}	
+
+	protected void StartCooling()
+	{
+		if (m_HeatingTimer)
+		{
+			m_HeatingTimer.Stop();
+			m_HeatingTimer = null;
+		}
+		
+		//Start cooling
+		m_CoolingTimer = new Timer(CALL_CATEGORY_GAMEPLAY);
+		m_CoolingTimer.Run(TIMER_COOLING_UPDATE_INTERVAL, this, "Cooling", null, true);
+	}
+
+	protected void Cooling()
+	{
+		float wetness = GetWet();
+		float temperature = GetTemperature();
+		float temperature_modifier = 0;
+		
+		if (!IsBurning() && temperature >= 10)
+		{
+			//check wetness
+			//set wetness if raining and alter temperature modifier (which will lower temperature increase because of rain)
+			float rain = GetGame().GetWeather().GetRain().GetActual();
+			if (IsRainingAbove() && !IsRoofAbove())
+			{
+				//set wet to fireplace
+				AddWetnessToFireplace(PARAM_WET_INCREASE_COEF * rain);
+
+				//set temperature modifier
+				temperature_modifier = temperature_modifier + ( PARAM_TEMPERATURE_DECREASE * rain );
+			}
+			else //subtract wetness
+			{
+				AddWetnessToFireplace(-PARAM_WET_COOLING_DECREASE_COEF);
+			}
+			
+			//calculate already obtained wetness (e.g. extinguished by water)
+			temperature_modifier = temperature_modifier + ( PARAM_TEMPERATURE_DECREASE * wetness );
+
+			// temperature via UniversalTemperatureSource
+			m_UTSLFireplace.SetFuelCount(GetFuelCount());
+			temperature = GetTemperature() - (PARAM_TEMPERATURE_DECREASE * TIMER_COOLING_UPDATE_INTERVAL) - temperature_modifier;
+			m_UTSLFireplace.SetCurrentTemperature(temperature);
+			m_UTSource.Update(m_UTSSettings, m_UTSLFireplace);
+			
+			//damage cargo items
+			BurnItemsInFireplace();
+			
+			//cook with equipment if temperature of equipment is still high
+			if ( m_CookingEquipment )
+			{
+				float cook_equip_temp = m_CookingEquipment.GetTemperature();
+				
+				if ( cook_equip_temp >= PARAM_COOKING_TEMP_THRESHOLD )
+				{
+					//cook
+					CookWithEquipment();
+				}
+			}
+
+			float cook_item_temp;
+			int i;
+
+			// manage cooking on direct cooking slots
+			if ( DirectCookingSlotsInUse() )
+			{
+				for ( i = 0; i < DIRECT_COOKING_SLOT_COUNT; i++ )
+				{
+					if ( m_DirectCookingSlots[i] )
+					{
+						cook_item_temp = m_DirectCookingSlots[i].GetTemperature();
+						if ( cook_item_temp >= PARAM_COOKING_TEMP_THRESHOLD )
+						{
+							CookOnDirectSlot( m_DirectCookingSlots[i], cook_item_temp, temperature );
+						}
+					}
+				}
+			}
+
+			// manage smoking slots
+			if ( SmokingSlotsInUse() )
+			{
+				for ( i = 0; i < SMOKING_SLOT_COUNT; i++ )
+				{
+					if ( m_SmokingSlots[i] )
+					{
+						SmokeOnSmokingSlot( m_SmokingSlots[i], cook_item_temp, temperature );
+					}
+				}
+			}
+
+			//Debug
+			//PlayerBase player = ( PlayerBase ) GetGame().GetPlayer();
+			//if (player != NULL) {player.MessageAction ( temperature.ToString() );}
+		}
+		else
+		{
+			//stop cooling
+			if (Math.AbsFloat(temperature) < 10)
+			{
+				StopCooling();
+				m_UTSource.SetActive(false);
+			}
+		}
+	}
+
+	protected void StopCooling()
+	{
+		//stop all fire visuals
+		SetFireState(FireplaceFireState.NO_FIRE);
+		SetObjectMaterial(0, MATERIAL_FIREPLACE_NOGLOW);
+		
+		//Stop cooling
+		m_CoolingTimer.Stop();
+		m_CoolingTimer = NULL;
+		
+		//destroy area damage
+		DestroyAreaDamage();
+
+		//remove cookware audio visuals
+		if (GetCookingEquipment())
+		{
+			Bottle_Base cooking_pot = Bottle_Base.Cast(GetCookingEquipment());
+			if ( cooking_pot )
+				cooking_pot.RemoveAudioVisualsOnClient();
+		}
+
+		if (DirectCookingSlotsInUse())
+		{
+			for ( int i = 0; i < DIRECT_COOKING_SLOT_COUNT; i++ )
+			{
+				if ( m_DirectCookingSlots[i] )
+				{
+					Bottle_Base cookingpot = Bottle_Base.Cast( m_DirectCookingSlots[i] );
+					if ( cookingpot )
+						cookingpot.RemoveAudioVisualsOnClient();
+
+					FryingPan fryingpan = FryingPan.Cast( m_DirectCookingSlots[i] );
+					if ( fryingpan )
+						fryingpan.RemoveAudioVisualsOnClient();
+
+					Edible_Base itsfood = Edible_Base.Cast( m_DirectCookingSlots[i] );
+					if ( itsfood )
+						itsfood.MakeSoundsOnClient( false );
+				}
+			}
+		}
+	}
+	
+	//================================================================
+	// COOKING
+	//================================================================
+	protected void CookWithEquipment()
+	{
+		if (m_CookingProcess == null)
+		{
+			m_CookingProcess = new Cooking();
+		}
+
+		m_CookingProcess.CookWithEquipment(m_CookingEquipment);
+	}
+
+	Cooking GetCookingProcess()
+	{
+		if (m_CookingProcess == null)
+		{
+			m_CookingProcess = new Cooking();
+		}
+		
+		return m_CookingProcess;
+	}
+	
+	protected void CookOnDirectSlot(ItemBase slot_item, float temp_equip, float temp_ext)
+	{
+		if (m_CookingProcess == null)
+		{
+			m_CookingProcess = new Cooking();
+		}
+		
+		m_CookingProcess.CookWithEquipment(slot_item);
+		
+		switch (slot_item.Type())
+		{
+		case ATTACHMENT_CAULDRON:
+		case ATTACHMENT_COOKING_POT:
+		case ATTACHMENT_FRYING_PAN:
+			float cookEquipTemp = temp_equip + PARAM_COOKING_EQUIP_TEMP_INCREASE;
+			if ( temp_ext <= PARAM_SMALL_FIRE_TEMPERATURE )
+			{
+				cookEquipTemp = Math.Clamp(cookEquipTemp, PARAM_ITEM_HEAT_MIN_TEMP, PARAM_SMALL_FIRE_TEMPERATURE);
+			}
+			else
+			{
+				cookEquipTemp = Math.Clamp(cookEquipTemp, PARAM_ITEM_HEAT_MIN_TEMP, PARAM_COOKING_EQUIP_MAX_TEMP);
+			}
+			slot_item.SetTemperature(cookEquipTemp);
+		break;
+		}
+	}
+	
+	protected void SmokeOnSmokingSlot( ItemBase slot_item, float temp_equip, float temp_ext )
+	{
+		if ( m_CookingProcess == NULL )
+		{
+			m_CookingProcess = new Cooking();
+		}
+		
+		// smoking slots accept only individual meat/fruit/veg items
+		Edible_Base ingr = Edible_Base.Cast( slot_item );
+		if ( ingr )
+		{
+			m_CookingProcess.SmokeItem( ingr, FireplaceBase.TIMER_HEATING_UPDATE_INTERVAL * FireplaceBase.SMOKING_SPEED );
+		}
+	}
+	
+	//================================================================
+	// FIRE VICINITY
+	//================================================================
+	//apply damage to all items, raise temperature to only specific items
+	protected void BurnItemsInFireplace()
+	{
+		//! cargo
+		CargoBase cargo = GetInventory().GetCargo();
+		for (int i = 0; i < cargo.GetItemCount(); i++)
+		{
+			ItemBase item = ItemBase.Cast(cargo.GetItem(i));
+			
+			//set damage
+			AddDamageToItemByFireEx(item, false, false);
+
+			if (item.GetHealth("", "Health") <= 0 && !item.IsKindOf("Grenade_Base"))
+			{
+				item.Delete();
+			}
+			
+			//add temperature
+			AddTemperatureToItemByFire(item);
+			
+			//remove wetness
+			AddWetnessToItem(item, -PARAM_WET_HEATING_DECREASE_COEF);
+		}
+		
+		//! attachments
+		for (int j = 0; j < GetInventory().AttachmentCount(); ++j)
+		{
+			ItemBase attachment = ItemBase.Cast(GetInventory().GetAttachmentFromIndex(j));
+			
+			//set damage
+			AddDamageToItemByFireEx(attachment, false, true);
+			
+			//add temperature
+			AddTemperatureToItemByFire(attachment);
+		
+			//remove wetness
+			AddWetnessToItem(attachment, -PARAM_WET_HEATING_DECREASE_COEF);
+		}
+	}
+
+	//add temperature to item by fire
+	protected void AddTemperatureToItemByFire(ItemBase item)
+	{
+		if (item.GetTemperatureMax() >= PARAM_ITEM_HEAT_MIN_TEMP)
+		{
+			float temperature = item.GetTemperature() + PARAM_ITEM_HEAT_TEMP_INCREASE_COEF;
+			temperature = Math.Clamp(temperature, PARAM_ITEM_HEAT_MIN_TEMP, PARAM_MAX_ITEM_HEAT_TEMP_INCREASE);
+			item.SetTemperature(temperature);
+		}
+	}
+
+	//! DEPRECATED
+	protected void AddTemperatureToFireplace(float amount) {};
+	
+	//add damage to item by fire
+	protected void AddDamageToItemByFireEx(ItemBase item, bool can_be_ruined, bool pAttachment)
+	{
+		if (!item)
+		{
+			return;		
+		}
+
+		if (GetTemperature() <= PARAM_ITEM_HEAT_MIN_TEMP)
+		{
+			return;
+		}
+
+		//! fireplace cargo only
+		if (!pAttachment)
+		{
+			//! cargo item attachments
+			GameInventory itemInventory = item.GetInventory();
+			if (itemInventory)
+			{
+				for (int i = 0; i < itemInventory.AttachmentCount(); ++i)
+				{
+					itemInventory.GetAttachmentFromIndex(i).AddHealth("", "", -PARAM_BURN_DAMAGE_COEF);
+				}
+			}
+
+			item.AddHealth("", "", -PARAM_BURN_DAMAGE_COEF);
+		}
+		else
+		{
+			float timerCoef = 1.0;
+			if (m_HeatingTimer && m_HeatingTimer.IsRunning())
+			{
+				timerCoef = TIMER_HEATING_UPDATE_INTERVAL;
+			}
+			else if (m_CoolingTimer && m_CoolingTimer.IsRunning())
+			{
+				timerCoef = TIMER_COOLING_UPDATE_INTERVAL;		
+			}
+
+			switch (item.Type())
+			{
+			case ATTACHMENT_TRIPOD:
+			case ATTACHMENT_COOKINGSTAND:
+			case ATTACHMENT_COOKING_POT:
+			case ATTACHMENT_CAULDRON:
+			case ATTACHMENT_FRYING_PAN:
+				item.DecreaseHealth(GameConstants.FIRE_ATTACHMENT_DAMAGE_PER_SECOND * timerCoef, false);
+			break;
+			}
+	
+			//! fuel & kindling		
+			if (IsFuel(item) || IsKindling(item))
+			{
+				if (item.GetHealthLevel() < GameConstants.STATE_BADLY_DAMAGED)
+				{
+					item.DecreaseHealth(PARAM_BURN_DAMAGE_COEF, false);
+				}
+			}
+			
+			//! cookable
+			if (item.CanBeCooked() && item.GetHealthLevel() >= GameConstants.STATE_BADLY_DAMAGED)
+			{
+				Edible_Base edible_item = Edible_Base.Cast( item );
+				edible_item.ChangeFoodStage(FoodStageType.BURNED);
+			}
+		}
+	}
+	
+	// DEPRECATED
+	protected void AddDamageToItemByFire(ItemBase item, bool can_be_ruined)
+	{
+		item.DecreaseHealth( PARAM_BURN_DAMAGE_COEF, false );
+
+		if ( item.CanBeCooked() & item.GetHealthLevel() >= GameConstants.STATE_BADLY_DAMAGED )
+		{
+			Edible_Base edible_item = Edible_Base.Cast( item );
+			edible_item.ChangeFoodStage( FoodStageType.BURNED );
+		}
+	}
+	
+	//add wetness on item
+	protected void AddWetnessToItem(ItemBase item, float amount)
+	{
+		float wetness = item.GetWet();
+		wetness = wetness + amount;
+		wetness = Math.Clamp(wetness, 0, 1); //wetness <0-1>
+		item.SetWet(wetness);
+	}
+	
+	//add wetness on fireplace
+	void AddWetnessToFireplace(float amount)
+	{
+		//add wetness
+		float wetness = GetWet();
+		wetness = wetness + amount;
+		wetness = Math.Clamp(wetness, 0, 1); //wetness <0-1>
+		SetWet(wetness);
+		
+		//decrease temperature
+		if (amount > 0)
+		{
+			float temperature = GetTemperature();
+			temperature = temperature * ( 1 - ( wetness * 0.5 ) );
+			temperature = Math.Clamp( temperature, PARAM_MIN_FIRE_TEMPERATURE, PARAM_NORMAL_FIRE_TEMPERATURE );
+			// temperature via UniversalTemperatureSource
+			m_UTSLFireplace.SetFuelCount(GetFuelCount());
+			m_UTSLFireplace.SetCurrentTemperature(temperature);
+		}
+	}	
+	
+	//! DEPRECATED
+	protected void TransferHeatToNearPlayers() {}
+	
+	//Create and Destroy damage radius around the fireplace when starting/stopping burning process
+	void CreateAreaDamage()
+	{
+		//destroy area damage if some already exists
+		DestroyAreaDamage();
+		
+		//create new area damage
+		m_AreaDamage = new AreaDamageLoopedDeferred( this );
+		m_AreaDamage.SetDamageComponentType(AreaDamageComponentTypes.HITZONE);
+		m_AreaDamage.SetExtents("-0.30 0 -0.30", "0.30 0.75 0.30");
+		m_AreaDamage.SetLoopInterval( 0.5 );
+		m_AreaDamage.SetDeferDuration( 0.5 );
+		m_AreaDamage.SetHitZones( { "Head","Torso","LeftHand","LeftLeg","LeftFoot","RightHand","RightLeg","RightFoot" } );
+		m_AreaDamage.SetAmmoName( "FireDamage" );
+		m_AreaDamage.Spawn();
+	}
+	
+	void DestroyAreaDamage()
+	{
+		if ( m_AreaDamage ) 
+		{
+			m_AreaDamage.Destroy();
+		}
+	}
+
+	//! DEPRECATED
+	bool IsFacingFireplace(PlayerBase player)
+	{
+		ErrorEx("Deprecated method", ErrorExSeverity.INFO);
+
+		return false;
+	}
+
+	//================================================================
+	// ACTIONS
+	//================================================================
+	// --- Actions / Action conditions
+	//Check if there is some kindling attached
+	bool HasAnyKindling()
+	{
+		return GetKindlingCount() > 0;
+	}
+
+	//Check if the weather is too windy
+	static bool IsWindy()
+	{
+		//check wind
+		float wind_speed = GetGame().GetWeather().GetWindSpeed();
+		float wind_speed_threshold = GetGame().GetWeather().GetWindMaximumSpeed() * FireplaceBase.IGNITE_WIND_THRESHOLD;
+
+		return ( wind_speed >= wind_speed_threshold );
+	}
+	
+	bool GetIgniteFailure()
+	{
+		return m_NoIgnite;
+	}
+	
+	void SetIgniteFailure( bool failure )
+	{
+		m_NoIgnite = failure;
+	}
+
+	//Check if the fireplace is too wet to be ignited
+	static bool IsEntityWet( notnull EntityAI entity_ai )
+	{
+		return ( entity_ai.GetWet() >= FireplaceBase.PARAM_MAX_WET_TO_IGNITE );
+	}
+	
+	bool IsWet()
+	{
+		return FireplaceBase.IsEntityWet( this );
+	}
+
+	//Check if there is any roof above fireplace
+	bool IsRoofAbove()
+	{
+		return m_RoofAbove;
+	}
+	
+	//check if fireplace is opened
+	override bool IsOpen()
+	{
+		return true;
+	}
+	
+	//Check if there is enough space for smoke
+	bool IsCeilingHighEnoughForSmoke()
+	{
+		return !MiscGameplayFunctions.IsUnderRoof( this, FireplaceBase.MIN_CEILING_HEIGHT );
+	}
+
+	//Check if it's raining and there is only sky above fireplace
+	static bool IsRainingAboveEntity( notnull EntityAI entity_ai )
+	{
+		return ( GetGame() && ( GetGame().GetWeather().GetRain().GetActual() >= FireplaceBase.PARAM_IGNITE_RAIN_THRESHOLD ) );
+	}
+	
+	bool IsRainingAbove()
+	{
+		return FireplaceBase.IsRainingAboveEntity( this );
+	}
+
+	//Check there is water surface bellow fireplace
+	static bool IsEntityOnWaterSurface(notnull EntityAI entity_ai)
+	{
+		vector fireplacePosition = entity_ai.GetPosition();
+		string surfaceType;
+		g_Game.SurfaceGetType3D(fireplacePosition[0], fireplacePosition[1] + g_Game.SurfaceGetSeaLevel(), fireplacePosition[2], surfaceType);
+		if (!surfaceType)
+		{
+			float waterLevelDiff = fireplacePosition[1] - g_Game.SurfaceGetSeaLevel();
+			return waterLevelDiff < 0.5;
+		}
+		else if (surfaceType.Contains("water"))
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	bool IsOnWaterSurface()
+	{
+		return FireplaceBase.IsEntityOnWaterSurface(this);
+	}
+	
+	//check if the surface is interior
+	static bool IsEntityOnInteriorSurface(notnull EntityAI entity_ai)
+	{
+		string surfaceType;
+		vector fireplacePosition = entity_ai.GetPosition();
+		GetGame().SurfaceGetType3D(fireplacePosition[0], fireplacePosition[1] + 1.0, fireplacePosition[2], surfaceType);
+		return (GetGame().ConfigGetInt("CfgSurfaces " + surfaceType + " interior") == 1);
+	}
+	bool IsOnInteriorSurface()
+	{
+		return FireplaceBase.IsEntityOnInteriorSurface( this );
+	}
+	
+	//Checks if has not additional items in it
+	override bool IsEmpty()
+	{
+		return ( GetInventory().GetCargo().GetItemCount() == 0 && GetInventory().AttachmentCount() == 0 );
+	}
+	
+	//Checks if it has no items in cargo
+	bool IsCargoEmpty()
+	{
+		return ( GetInventory().GetCargo().GetItemCount() == 0 );
+	}
+	
+	bool HasCookingStand()
+	{
+		return GetInventory().FindAttachment(InventorySlots.GetSlotIdFromString("CookingTripod")) != null;
+	}
+	
+	//Check if object is in animation phase
+	bool IsInAnimPhase( string anim_phase )
+	{
+		return GetAnimationPhase(anim_phase) == 0;
+	}
+	
+	bool IsSpaceFor(vector size)
+	{
+		array<Object> objs = {};
+		if (GetGame().IsBoxCollidingGeometry(GetWorldPosition() + Vector(0, size[1] * 0.5 + 0.1, 0), GetDirection().VectorToAngles(), size, ObjIntersect.View, ObjIntersect.Geom, {this}, objs))
+		{
+			foreach (Object obj : objs)
+			{
+				if (dBodyGetInteractionLayer(obj) == PhxInteractionLayers.ITEM_LARGE)
+					return false;
+			}
+		}
+		return true;
+	}
+	
+	
+	override bool CanSwapEntities(EntityAI otherItem, InventoryLocation otherDestination, InventoryLocation destination)
+	{
+		if (!otherDestination || otherDestination.GetParent() == this)
+		{
+			return false;
+		}
+		return true;
+	}
+
+	//Action condition for building oven
+	bool CanBuildOven()
+	{	
+		return !IsOven() && !IsBurning() && (GetAttachedStonesCount() >= MIN_STONES_TO_BUILD_OVEN) && !FindAttachmentBySlotName("CookingTripod") && !HasStoneCircle() && IsSpaceForOven();
+	}
+	
+	bool IsSpaceForOven()
+	{
+		const float size = 0.6;		
+		return IsSpaceFor(Vector(size, size, size));
+	}
+	
+	//Action condition for stone circle
+	bool CanBuildStoneCircle()
+	{
+		return !HasStoneCircle() && !IsOven() && !IsBurning() && (GetAttachedStonesCount() >= MIN_STONES_TO_BUILD_CIRCLE) && IsSpaceForCircle();
+	}
+	
+	bool IsSpaceForCircle()
+	{
+		return IsSpaceFor(Vector(0.9, 0.1, 0.9));
+	}
+	
+	//Action condition for dismantling oven
+	bool CanDismantleOven()
+	{
+		return ( IsOven() && !IsBurning() && !DirectCookingSlotsInUse() && !SmokingSlotsInUse() && GetTemperature() <= MAX_TEMPERATURE_TO_DISMANTLE_OVEN );
+	}
+	//Action condition for dismantling stone circle
+	bool CanDismantleStoneCircle()
+	{
+		return ( HasStoneCircle() && !IsOven() && !IsBurning() );
+	}
+	
+	bool CanCookOnStick()
+	{
+		return ( GetTemperature() >= PARAM_COOKING_TEMP_THRESHOLD );
+	}
+	
+	//Can extinguish fire
+	bool CanExtinguishFire()
+	{
+		return IsBurning();
+	}
+	
+	FireplaceLight GetLightEntity()
+	{
+		return m_Light;
+	}
+	
+	void SetLightEntity( FireplaceLight light )
+	{
+		m_Light = light;
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+		
+		if ( GetGame().IsServer() )
+		{
+			//remove grass
+			Object cc_object = GetGame().CreateObjectEx( OBJECT_CLUTTER_CUTTER , position, ECE_PLACE_ON_SURFACE );
+			cc_object.SetOrientation( orientation );
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( GetGame().ObjectDelete, 1000, false, cc_object );
+			
+			SetIsPlaceSound( true );
+		}
+	}
+	
+	override string GetPlaceSoundset()
+	{
+		return "placeFireplace_SoundSet";
+	}
+	
+	//================================================================
+	// QUANITTY
+	//================================================================
+	// calculates and sets total energy based on possible (fuel/kinidling) item attachments
+	protected void CalcAndSetTotalEnergy()
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			m_TotalEnergy = 0;
+			
+			foreach (FireConsumableType fireConsumableType : m_FireConsumableTypes)
+			{
+				string quantityConfigPath = string.Format("CfgVehicles %1 varQuantityMax", fireConsumableType.GetItemType().ToString());
+				string stackMaxConfigPath = string.Format("CfgSlots Slot_%1 stackMax", fireConsumableType.GetAttSlot());
+				if (GetGame().ConfigIsExisting(quantityConfigPath))
+				{
+					float quantityMax = GetGame().ConfigGetFloat(quantityConfigPath);
+				}
+				
+				if (GetGame().ConfigIsExisting(stackMaxConfigPath))
+				{
+					float stackMax = GetGame().ConfigGetFloat(stackMaxConfigPath);
+				}			
+				
+				//debug
+				//Print( fireConsumableType.GetItemType().ToString() + " quantityMax = " + quantityMax.ToString() + " [" + (quantity_max*fire_consumable_type.GetEnergy()).ToString()  + "] | stack_max = " + stack_max.ToString() + " [" + (stack_max*fire_consumable_type.GetEnergy()).ToString() + "]" );
+				
+				if (stackMax > 0)
+				{
+					m_TotalEnergy += stackMax * fireConsumableType.GetEnergy();
+				}
+				else
+				{
+					m_TotalEnergy += quantityMax * fireConsumableType.GetEnergy();
+				}
+			}
+			
+			//debug
+			//Print( "Total energy = " + m_TotalEnergy.ToString() );
+		}
+	}
+	
+	// calculates and sets current quantity based on actual (fuel/kinidling) item attachments
+	protected void CalcAndSetQuantity()
+	{
+		if (GetGame() && GetGame().IsServer())
+		{
+			float remainingEnergy;
+			
+			foreach (FireConsumable fireConsumable : m_FireConsumables)
+			{
+				float quantity = fireConsumable.GetItem().GetQuantity();
+				if (quantity > 0)
+				{
+					remainingEnergy += ((quantity - 1) * fireConsumable.GetEnergy()) + fireConsumable.GetRemainingEnergy();
+					//Print( fireConsumable.GetItem().GetType() + " remaining energy = " + ( ( ( quantity - 1 ) * fire_consumable.GetEnergy() ) + fire_consumable.GetRemainingEnergy() ).ToString() );
+				}
+				else
+				{
+					remainingEnergy += fireConsumable.GetRemainingEnergy();
+					//Print( fireConsumable.GetItem().GetType() + " remaining energy = " + ( fireConsumable.GetRemainingEnergy().ToString() ) );
+				}
+			}
+			
+			SetQuantity(remainingEnergy / m_TotalEnergy * GetQuantityMax());
+		}
+	}
+	
+	override void OnAttachmentQuantityChanged(ItemBase item)
+	{
+		super.OnAttachmentQuantityChanged(item);
+		
+		CalcAndSetQuantity();
+	}
+	
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if (!super.CanReleaseAttachment(attachment))
+			return false;
+		
+		ItemBase item = ItemBase.Cast(attachment);
+		if (IsKindling(item) || IsFuel(item))
+		{
+			return !IsBurning();
+		}
+		
+		return true;
+	}
+	
+	void LockOvenAttachments(bool lock)
+	{
+		//Print("LockOvenAttachments");
+		//string path_cooking_equipment = "" + CFG_VEHICLESPATH + " " + GetType() + " GUIInventoryAttachmentsProps CookingEquipment attachmentSlots";
+		string path_cooking_equipment = string.Format("%1 %2 GUIInventoryAttachmentsProps CookingEquipment attachmentSlots", CFG_VEHICLESPATH, GetType());
+		//string path_direct_cooking = "" + CFG_VEHICLESPATH + " " + GetType() + " GUIInventoryAttachmentsProps DirectCooking attachmentSlots";
+		string path_direct_cooking = string.Format("%1 %2 GUIInventoryAttachmentsProps DirectCooking attachmentSlots", CFG_VEHICLESPATH, GetType());
+		if ( GetGame().ConfigIsExisting(path_cooking_equipment) && GetGame().ConfigIsExisting(path_direct_cooking) )
+		{
+			array<string> arr_cooking_equipment = new array<string>;
+			array<string> arr_direct_cooking = new array<string>;
+			GetGame().ConfigGetTextArray(path_cooking_equipment,arr_cooking_equipment);
+			GetGame().ConfigGetTextArray(path_direct_cooking,arr_direct_cooking);
+			for ( int i = 0; i < arr_cooking_equipment.Count(); i++ )
+			{
+				if ( lock != GetInventory().GetSlotLock(InventorySlots.GetSlotIdFromString(arr_cooking_equipment[i])) )
+				{
+					GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(arr_cooking_equipment[i]),lock);
+					//Print("attachment lock: " + arr_cooking_equipment[i] + " " + lock);
+				}
+			}
+			
+			for ( i = 0; i < arr_direct_cooking.Count(); i++ )
+			{
+				if ( lock == GetInventory().GetSlotLock(InventorySlots.GetSlotIdFromString(arr_direct_cooking[i])) )
+				{
+					GetInventory().SetSlotLock(InventorySlots.GetSlotIdFromString(arr_direct_cooking[i]),!lock);
+					//Print("attachment lock: " + arr_direct_cooking[i] + " " + !lock);
+				}
+			}
+		}
+		m_OvenAttachmentsLockState = lock;
+	}
+	override bool DisassembleOnLastDetach()
+	{
+		return true;
+	}
+	
+	override void OnRPC( PlayerIdentity sender, int rpc_type, ParamsReadContext ctx ) 
+	{
+		super.OnRPC( sender, rpc_type, ctx );
+		
+		ref Param1<bool> p = new Param1<bool>(false);
+				
+		if (ctx.Read(p))
+		{
+			bool failure = p.param1;
+		}
+		
+		switch ( rpc_type )
+		{
+			case FirePlaceFailure.WIND:
+			
+				if ( failure )
+				{
+					ParticleFireWindyNoIgniteStart();
+					SoundFireStop();
+					SoundFireWindyNoIgniteStart();
+				}
+			
+			break;
+			
+			case FirePlaceFailure.WET:
+				
+				if ( failure )
+				{
+					ParticleWetNoIgniteStart();
+					SoundFireStop();
+					SoundFireWetNoIgniteStart();
+				}
+			
+			break;
+		}
+	}
+	
+	
+	//================================================================
+	// DEBUG
+	//================================================================
+			
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+			ItemBase firewood = ItemBase.Cast(GetInventory().CreateInInventory("Firewood"));
+ 			firewood.SetQuantity(firewood.GetQuantityMax());
+			
+			ItemBase sticks = ItemBase.Cast(GetInventory().CreateInInventory("WoodenStick"));
+ 			sticks.SetQuantity(sticks.GetQuantityMax());
+			
+			ItemBase stone = ItemBase.Cast(GetInventory().CreateInInventory("Stone"));
+ 			stone.SetQuantity(stone.GetQuantityMax());
+			
+			GetInventory().CreateInInventory("Rag");
+
+			SpawnEntityOnGroundPos("PetrolLighter", GetPosition());
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ACTIVATE_ENTITY, "Ignite", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DEACTIVATE_ENTITY, "Extinguish", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.ACTIVATE_ENTITY)
+			{
+				OnIgnitedThis(null);
+			}
+			else if (action_id == EActions.DEACTIVATE_ENTITY)
+			{
+				StopFire();
+			}
+		}
+		return false;
+	}
+	
+	
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..e80da612d808fef5551e36eb368b508e2e7535b8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase.c
@@ -0,0 +1,596 @@
+class BarrelHoles_ColorBase extends FireplaceBase
+{
+	//Visual animations
+	const string ANIMATION_OPENED 			= "LidOff";
+	const string ANIMATION_CLOSED			= "LidOn";
+	
+	protected bool m_IsOpenedClient			= false;
+	
+	protected ref OpenableBehaviour m_Openable;
+	
+	void BarrelHoles_ColorBase()
+	{
+		//Particles - default for FireplaceBase
+		PARTICLE_FIRE_START 	= ParticleList.BARREL_FIRE_START;
+		PARTICLE_SMALL_FIRE 	= ParticleList.BARREL_SMALL_FIRE;
+		PARTICLE_NORMAL_FIRE	= ParticleList.BARREL_NORMAL_FIRE;
+		PARTICLE_SMALL_SMOKE 	= ParticleList.BARREL_SMALL_SMOKE;
+		PARTICLE_NORMAL_SMOKE	= ParticleList.BARREL_NORMAL_SMOKE;
+		PARTICLE_FIRE_END 		= ParticleList.BARREL_FIRE_END;
+		PARTICLE_STEAM_END		= ParticleList.BARREL_FIRE_STEAM_2END;
+
+		m_Openable = new OpenableBehaviour(false);
+		
+		//synchronized variables
+		RegisterNetSyncVariableBool("m_Openable.m_IsOpened");
+		
+		ProcessInvulnerabilityCheck(GetInvulnerabilityTypeString());
+		
+		m_LightDistance = 50;
+	}
+	
+	override bool CanCookOnStick()
+	{
+		return false;
+	}
+	
+	override bool IsBaseFireplace()
+	{
+		return true;
+	}
+	
+	override void CreateAreaDamage()
+	{
+		DestroyAreaDamage();
+		
+		m_AreaDamage = new AreaDamageLoopedDeferred(this);
+		m_AreaDamage.SetDamageComponentType(AreaDamageComponentTypes.HITZONE);
+		m_AreaDamage.SetExtents("-0.15 0 -0.15", "0.15 0.75 0.15");
+		m_AreaDamage.SetLoopInterval(0.5);
+		m_AreaDamage.SetDeferDuration(0.5);
+		m_AreaDamage.SetHitZones({"Head","Torso","LeftHand","LeftLeg","LeftFoot","RightHand","RightLeg","RightFoot"});
+		m_AreaDamage.SetAmmoName("FireDamage");
+		m_AreaDamage.Spawn();
+	}
+	
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+	
+	override string GetInvulnerabilityTypeString()
+	{
+		return "disableContainerDamage";
+	}
+	
+	override void OnWasAttached( EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		Open();
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		Close();
+	}
+	
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		return GetNumberOfItems() == 0;
+	}
+	
+	
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+		
+		ctx.Write( m_Openable.IsOpened() );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		bool opened;
+		if ( version >= 110 && !ctx.Read( opened ) )
+		{
+			return false;
+		}
+		
+		if ( opened )
+		{
+			OpenLoad();
+		}
+		else
+		{
+			CloseLoad();
+		}
+		
+		return true;
+	}
+	
+	override bool IsBarrelWithHoles()
+	{
+		return true;
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if ( !IsBeingPlaced() )
+		{
+			//Refresh particles and sounds
+			RefreshFireParticlesAndSounds( false );
+			
+			//sound sync
+			if ( IsSoundSynchRemote() && !IsBeingPlaced() && m_Initialized )
+			{
+				if ( IsOpen() )
+				{
+					SoundBarrelOpenPlay();
+				}
+				
+				if ( !IsOpen() )
+				{
+					SoundBarrelClosePlay();
+				}
+			}
+			
+		}
+
+		UpdateVisualState();
+	}
+	
+	//ATTACHMENTS
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId )
+	{
+		ItemBase item = ItemBase.Cast( attachment );
+		
+		if ( GetHealthLevel() == GameConstants.STATE_RUINED || GetHierarchyRootPlayer() != null )
+			return false;
+
+		//direct cooking slots
+		if ( !IsOpen() )
+		{
+			if ( ( item.Type() == ATTACHMENT_CAULDRON ) || ( item.Type() == ATTACHMENT_COOKING_POT ) || ( item.Type() == ATTACHMENT_FRYING_PAN ) || ( item.IsKindOf( "Edible_Base" ) ) )
+			{
+				return super.CanReceiveAttachment(attachment, slotId);
+			}
+		}
+		else
+		{
+			if ( IsKindling( item ) || IsFuel( item ) )
+			{
+				return super.CanReceiveAttachment(attachment, slotId);
+			}
+		}
+
+		return false;
+	}
+	
+	override bool CanLoadAttachment( EntityAI attachment )
+	{
+		ItemBase item = ItemBase.Cast( attachment );
+		
+		if ( GetHealthLevel() == GameConstants.STATE_RUINED )
+			return false;
+
+		return super.CanLoadAttachment(attachment);
+	}
+
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			AddToFireConsumables(item_base);
+		}
+		
+		// direct cooking/smoking slots
+		bool edible_base_attached = false;
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "DirectCookingB":
+			m_DirectCookingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		case "DirectCookingC":
+			m_DirectCookingSlots[2] = item_base;
+			edible_base_attached = true;
+		break;
+
+		case "SmokingA":
+			m_SmokingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingC":
+			m_SmokingSlots[2] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingD":
+			m_SmokingSlots[3] = item_base;
+			edible_base_attached = true;
+		break;
+		}
+		
+		// reset cooking time (to prevent the cooking exploit)
+		if (GetGame().IsServer() && edible_base_attached)
+		{
+			Edible_Base edBase = Edible_Base.Cast(item_base);
+			if (edBase)
+			{
+				if (edBase.GetFoodStage())
+				{
+					edBase.SetCookingTime(0);
+				}
+			}
+		}
+
+		RefreshFireplaceVisuals();
+	}
+	
+	override bool IsPrepareToDelete()
+	{
+		return false;
+	}
+
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			RemoveFromFireConsumables(GetFireConsumableByItem(item_base));
+		}
+		
+		// direct cooking / smoking slots
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = null;
+		break;
+		case "DirectCookingB":
+			m_DirectCookingSlots[1] = null;
+		break;
+		case "DirectCookingC":
+			m_DirectCookingSlots[2] = null;
+		break;
+
+		case "SmokingA":
+			m_SmokingSlots[0] = null;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = null;
+		break;
+		case "SmokingC":
+			m_SmokingSlots[2] = null;
+		break;
+		case "SmokingD":
+			m_SmokingSlots[3] = null;
+		break;
+		}
+
+		// cookware-specifics (remove audio visuals)
+		if (item_base.Type() == ATTACHMENT_CAULDRON || item_base.Type() == ATTACHMENT_COOKING_POT)
+		{
+			ClearCookingEquipment(item_base);
+			Bottle_Base cooking_pot = Bottle_Base.Cast(item);
+			cooking_pot.RemoveAudioVisualsOnClient();	
+		}
+		if (item_base.Type() == ATTACHMENT_FRYING_PAN)
+		{
+			ClearCookingEquipment(item_base);
+			FryingPan frying_pan = FryingPan.Cast(item);
+			frying_pan.RemoveAudioVisualsOnClient();
+		}
+
+		RefreshFireplaceVisuals();
+	}
+	
+	//CONDITIONS
+	//this into/outo parent.Cargo
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo( parent ) )
+			return false;
+
+		if ( IsBurning() || !IsCargoEmpty() || DirectCookingSlotsInUse() || IsOpen() )
+			return false;
+		
+		return true;
+	}
+
+	override bool CanRemoveFromCargo( EntityAI parent )
+	{
+		return true;
+	}
+
+	//cargo item into/outo this.Cargo
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if ( GetHealthLevel() == GameConstants.STATE_RUINED )
+			return false;
+
+		if (!IsOpen())
+			return false;
+
+		return super.CanReceiveItemIntoCargo( item );
+	}
+	
+	override bool CanLoadItemIntoCargo( EntityAI item )
+	{
+		if (!super.CanLoadItemIntoCargo( item ))
+			return false;
+		
+		if ( GetHealthLevel() == GameConstants.STATE_RUINED )
+			return false;
+
+		if ( GetHierarchyParent() )
+			return false;
+
+		return true;
+	}
+
+	override bool CanReleaseCargo( EntityAI cargo )
+	{
+		return IsOpen();
+	}
+	
+	//hands
+	override bool CanPutIntoHands(EntityAI parent)
+	{
+		if (!super.CanPutIntoHands(parent))
+		{
+			return false;
+		}
+
+		if (IsBurning() || !IsCargoEmpty() || DirectCookingSlotsInUse() || SmokingSlotsInUse())
+		{
+			return false;
+		}
+		
+		if ( !GetInventory().IsAttachment() && IsOpen() )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	//INVENTORY DISPLAY CONDITIONS
+	override bool CanDisplayCargo()
+	{
+		//super
+		if( !super.CanDisplayCargo() )
+		{
+			return false;
+		}
+		//
+		
+		return IsOpen();
+	}
+
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		//super
+		if( !super.CanDisplayAttachmentCategory( category_name ) )
+		{
+			return false;
+		}
+		//
+		
+		if ( ( category_name == "CookingEquipment" ) || ( category_name == "Smoking" ) )
+		{
+			return !IsOpen();
+		}			
+		else
+		{
+			return IsOpen();
+		}
+		
+		return true;
+	}	
+	// ---	
+
+	//ACTIONS
+	override void Open()
+	{
+		m_Openable.Open();
+		
+		m_RoofAbove = false;
+		
+		SoundSynchRemote();
+		SetTakeable(false);
+		UpdateVisualState();
+	}
+	
+	void OpenLoad()
+	{
+		m_Openable.Open();
+		m_RoofAbove = false;
+		
+		SetSynchDirty();
+		SetTakeable(false);
+		UpdateVisualState();
+	}
+	
+	override void Close()
+	{
+		m_Openable.Close();
+		m_RoofAbove = true;
+		
+		SoundSynchRemote();
+		SetTakeable(true);
+		UpdateVisualState();
+	}
+	
+	void CloseLoad()
+	{
+		m_Openable.Close();
+		m_RoofAbove = true;
+		
+		SetSynchDirty();
+		SetTakeable(true);
+		UpdateVisualState();
+	}
+	
+	override bool IsOpen()
+	{
+		return m_Openable.IsOpened();
+	}
+	
+	protected void UpdateVisualState()
+	{
+		if ( IsOpen() )
+		{
+			SetAnimationPhase( ANIMATION_OPENED, 0 );
+			SetAnimationPhase( ANIMATION_CLOSED, 1 );
+		}
+		else
+		{
+			SetAnimationPhase( ANIMATION_OPENED, 1 );
+			SetAnimationPhase( ANIMATION_CLOSED, 0 );
+		}
+	}
+	
+	//Can extinguish fire
+	override bool CanExtinguishFire()
+	{
+		if ( IsOpen() && IsBurning() )
+		{
+			return true;
+		}
+		
+		return false;
+	}	
+	
+	//particles
+	override bool CanShowSmoke()
+	{
+		return IsOpen();
+	}
+	
+	// Item-to-item fire distribution
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( HasAnyKindling() && !IsBurning() && IsOpen() && !GetHierarchyParent() )
+		{
+			return true;
+		}
+			
+		return false;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		if ( IsBurning() && IsOpen() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool IsIgnited()
+	{
+		return IsBurning();
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{	
+		//remove grass
+		Object cc_object = GetGame().CreateObjectEx( OBJECT_CLUTTER_CUTTER , GetPosition(), ECE_PLACE_ON_SURFACE );
+		cc_object.SetOrientation ( GetOrientation() );
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( DestroyClutterCutter, 0.2, false, cc_object );
+		
+		//start fire
+		StartFire(); 
+	}
+
+	void SoundBarrelOpenPlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "barrel_open_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+	
+	void SoundBarrelClosePlay()
+	{
+		EffectSound sound =	SEffectManager.PlaySound( "barrel_close_SoundSet", GetPosition() );
+		sound.SetAutodestroy( true );
+	}
+	
+	void DestroyClutterCutter( Object clutter_cutter )
+	{
+		GetGame().ObjectDelete( clutter_cutter );
+	}	
+	
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		//check kindling
+		if ( !HasAnyKindling() && IsOpen() )
+		{
+			return false;
+		}
+		
+		//check surface
+		if ( IsOnWaterSurface() )
+		{
+			return false;
+		}
+
+		return true;	
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override string GetPlaceSoundset()
+	{
+		return "placeBarrel_SoundSet";
+	}
+	
+	override void SetActions()
+	{
+		AddAction(ActionAttachOnSelection);
+		super.SetActions();
+		
+		AddAction(ActionOpenBarrelHoles);
+		AddAction(ActionCloseBarrelHoles);
+		AddAction(ActionPlaceObject);
+		AddAction(ActionTogglePlaceObject);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		m_Openable.Open();
+		super.OnDebugSpawn();
+		m_Openable.Close();
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Blue.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Blue.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3f7ab0eec2ab1430649641d24591259243909b7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Blue.c
@@ -0,0 +1,4 @@
+class BarrelHoles_Blue extends BarrelHoles_ColorBase
+{
+
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Green.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Green.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f7380986dd9fe6dcb3d55e3bfe71c59ce8f7628
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Green.c
@@ -0,0 +1,4 @@
+class BarrelHoles_Green extends BarrelHoles_ColorBase
+{
+
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Red.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Red.c
new file mode 100644
index 0000000000000000000000000000000000000000..0aa0e4cfa952d3bd040dce90114ac783f7ef192c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Red.c
@@ -0,0 +1,4 @@
+class BarrelHoles_Red extends BarrelHoles_ColorBase
+{
+
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Yellow.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Yellow.c
new file mode 100644
index 0000000000000000000000000000000000000000..8386eade6f033a44bf262ed6ebaf30aff01f2039
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/BarrelHoles_ColorBase/BarrelHoles_Yellow.c
@@ -0,0 +1,4 @@
+class BarrelHoles_Yellow extends BarrelHoles_ColorBase
+{
+
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/Fireplace.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/Fireplace.c
new file mode 100644
index 0000000000000000000000000000000000000000..de1a792eeb86d7e60e726d93ed58010952ea24e6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/Fireplace.c
@@ -0,0 +1,769 @@
+class Fireplace extends FireplaceBase
+{
+	bool m_ContactEventProcessing;
+	
+	void Fireplace()
+	{
+		//Particles - default for FireplaceBase
+		PARTICLE_FIRE_START 	= ParticleList.CAMP_FIRE_START;
+		PARTICLE_SMALL_FIRE 	= ParticleList.CAMP_SMALL_FIRE;
+		PARTICLE_NORMAL_FIRE	= ParticleList.CAMP_NORMAL_FIRE;
+		PARTICLE_SMALL_SMOKE 	= ParticleList.CAMP_SMALL_SMOKE;
+		PARTICLE_NORMAL_SMOKE	= ParticleList.CAMP_NORMAL_SMOKE;
+		PARTICLE_FIRE_END 		= ParticleList.CAMP_FIRE_END;
+		PARTICLE_STEAM_END		= ParticleList.CAMP_STEAM_2END;
+		
+		SetEventMask( EntityEvent.CONTACT | EntityEvent.TOUCH );
+	}
+	
+	override bool IsBaseFireplace()
+	{
+		return true;
+	}
+	
+	override void EOnTouch( IEntity other, int extra )
+	{
+		ContactEvent( other, GetPosition() );
+	}
+	
+	override void EOnContact( IEntity other, Contact extra )
+	{
+		ContactEvent( other, extra.Position );
+	}
+	
+	void ContactEvent( IEntity other, vector position )
+	{		
+		if ( GetGame().IsServer() && !m_ContactEventProcessing && dBodyIsActive(this) && !IsSetForDeletion() )
+		{
+			m_ContactEventProcessing = true;
+			MiscGameplayFunctions.ThrowAllItemsInInventory(this, 0);
+			CheckForDestroy();
+			m_ContactEventProcessing = false;
+		}
+	}
+	
+	//attachments
+	override bool CanReceiveAttachment( EntityAI attachment, int slotId )
+	{
+		if ( !super.CanReceiveAttachment(attachment, slotId) )
+			return false;
+
+		ItemBase item = ItemBase.Cast( attachment );
+
+		//cookware
+		if ( ( item.Type() == ATTACHMENT_CAULDRON ) || ( item.Type() == ATTACHMENT_COOKING_POT ) )
+		{
+			if ( FindAttachmentBySlotName( "CookingTripod" ) || IsOven() ) 
+				return true;
+			return false;
+		}
+		if ( item.Type() == ATTACHMENT_FRYING_PAN )
+		{
+			if ( IsOven() ) 
+				return true;
+			return false;
+		}
+
+		// food on direct cooking slots
+		if ( item.IsKindOf( "Edible_Base" ) )
+		{
+			if ( IsOven() )
+				return true;
+			return false;
+		}
+		//tripod
+		
+		if ( item.IsInherited(TripodBase) )
+		{
+			if (!IsOven() && !GetHierarchyParent())
+				return true;
+			return false;
+		}
+		
+		//stones
+		if ( item.Type() == ATTACHMENT_STONES )
+		{
+			if ( !GetHierarchyParent() && !IsBurning() )
+				return true;
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override bool CanDisplayAttachmentSlot( int slot_id )
+	{
+		string slot_name = InventorySlots.GetSlotName(slot_id);
+		if ( super.CanDisplayAttachmentSlot(slot_id) )
+		{
+			if ( slot_name != "CookingEquipment" || FindAttachmentBySlotName( "CookingTripod" ) )
+				return true;
+		}
+		
+		return false;
+	}
+	
+	override bool CanLoadAttachment( EntityAI attachment )
+	{
+		if ( !super.CanLoadAttachment(attachment) )
+			return false;
+
+		ItemBase item = ItemBase.Cast( attachment );
+
+		//cookware
+		if ( ( item.Type() == ATTACHMENT_CAULDRON ) || ( item.Type() == ATTACHMENT_COOKING_POT ) )
+		{
+			//if ( IsItemTypeAttached( ATTACHMENT_TRIPOD ) /*|| IsOven()*/ ) 
+				return true;
+		}
+		if ( item.Type() == ATTACHMENT_FRYING_PAN )
+		{
+			//if ( IsOven() ) 
+				return true;
+		}
+
+		// food on direct cooking slots
+		//if ( IsOven() )
+		//{
+			if ( item.IsKindOf( "Edible_Base" ) )
+				return true;
+		//}
+		//tripod
+		if ( item.Type() == ATTACHMENT_TRIPOD )
+		{
+			if ( /*!IsOven() &&*/ GetHierarchyParent() == NULL )
+				return true;
+		}
+		
+		//stones
+		if ( item.Type() == ATTACHMENT_STONES )
+		{
+			if ( GetHierarchyParent() /*|| IsBurning()*/ )
+				return false;
+			
+			return true;
+		}
+		
+		return true;
+	}
+
+	override bool CanReleaseAttachment( EntityAI attachment )
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+		
+		ItemBase item = ItemBase.Cast(attachment);
+		//stones
+		if (item.Type() == ATTACHMENT_STONES)
+		{
+			if (IsBurning())
+			{
+				return false;
+			}
+
+			int stone_quantity = item.GetQuantity();
+			if (HasStoneCircle() && stone_quantity <= 8)
+			{
+				return false;
+			}
+
+			if (IsOven())
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			AddToFireConsumables(item_base);
+		}
+		
+		//cookware
+		if (item_base.Type() == ATTACHMENT_COOKING_POT)
+		{
+			SetCookingEquipment(item_base);
+			
+			//rotate handle (if not in 'Oven' stage)
+			if (GetGame().IsServer() && !IsOven())
+			{
+				item_base.SetAnimationPhase(ANIMATION_COOKWARE_HANDLE, 0);
+			}
+		}
+		if (item.Type() == ATTACHMENT_CAULDRON)
+		{
+			SetCookingEquipment(item_base);
+			
+			//rotate handle (if not in 'Oven' stage)
+			if (GetGame().IsServer() && !IsOven())
+			{
+				item_base.SetAnimationPhase(ANIMATION_CAULDRON_HANDLE, 0);
+			}
+		}
+
+		// direct cooking/smoking slots
+		bool edible_base_attached = false;
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "DirectCookingB":
+			m_DirectCookingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		case "DirectCookingC":
+			m_DirectCookingSlots[2] = item_base;
+			edible_base_attached = true;
+		break;
+
+		case "SmokingA":
+			m_SmokingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingC":
+			m_SmokingSlots[2] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingD":
+			m_SmokingSlots[3] = item_base;
+			edible_base_attached = true;
+		break;
+		}
+		
+		// reset cooking time (to prevent the cooking exploit)
+		if (GetGame().IsServer() && edible_base_attached)
+		{
+			Edible_Base edBase = Edible_Base.Cast(item_base);
+			if (edBase)
+			{
+				if (edBase.GetFoodStage())
+				{
+					edBase.SetCookingTime(0);
+				}
+			}
+		}
+		
+		//TODO
+		//add SetViewIndex when attaching various attachments
+		
+		RefreshFireplaceVisuals();
+	}
+
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			RemoveFromFireConsumables(GetFireConsumableByItem(item_base));
+		}
+
+		//cookware
+		if (item_base.Type() == ATTACHMENT_COOKING_POT)
+		{
+			ClearCookingEquipment(item_base);
+			
+			//rotate handle
+			if (GetGame().IsServer())
+			{
+				item_base.SetAnimationPhase(ANIMATION_COOKWARE_HANDLE, 1);
+			}
+			
+			//remove audio visuals
+			Bottle_Base cooking_pot = Bottle_Base.Cast(item);
+			cooking_pot.RemoveAudioVisualsOnClient();
+		}
+		if (item_base.Type() == ATTACHMENT_CAULDRON)
+		{
+			ClearCookingEquipment(item_base);
+
+			//rotate handle
+			if (GetGame().IsServer())
+			{
+				item_base.SetAnimationPhase(ANIMATION_CAULDRON_HANDLE, 1);
+			}
+			
+			//remove audio visuals
+			Bottle_Base cauldron = Bottle_Base.Cast( item );
+			cauldron.RemoveAudioVisualsOnClient();
+		}
+		if (item_base.Type() == ATTACHMENT_FRYING_PAN)
+		{
+			ClearCookingEquipment(item_base);
+
+			//remove audio visuals
+			FryingPan frying_pan = FryingPan.Cast(item);
+			frying_pan.RemoveAudioVisualsOnClient();
+		}
+
+		// direct cooking/smoking slots
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = null;
+		break;
+		case "DirectCookingB":
+			m_DirectCookingSlots[1] = null;
+		break;
+		case "DirectCookingC":
+			m_DirectCookingSlots[2] = null;
+		break;
+
+		case "SmokingA":
+			m_SmokingSlots[0] = null;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = null;
+		break;
+		case "SmokingC":
+			m_SmokingSlots[2] = null;
+		break;
+		case "SmokingD":
+			m_SmokingSlots[3] = null;
+		break;
+		}
+		
+		//no attachments left, no cargo items & no ashes are present
+		CheckForDestroy();
+		RefreshFireplaceVisuals();
+	}
+	
+	
+	override void SetCookingEquipment(ItemBase equipment)
+	{
+		super.SetCookingEquipment(equipment);
+		
+		TripodBase stand = TripodBase.Cast(FindAttachmentBySlotName("CookingTripod"));
+		if (stand)
+		{
+			if (equipment)
+				stand.LockToParent();
+			else
+				stand.UnlockFromParent();
+		}
+	}
+	
+	override void OnBeforeTryDelete() 
+	{
+		super.OnBeforeTryDelete();
+
+		MiscGameplayFunctions.DropAllItemsInInventoryInBounds(this, m_HalfExtents);
+	}
+
+	override bool IsPrepareToDelete()
+	{
+		return GetInventory().AttachmentCount() == 0 && !IsBurning() && !HasAshes();
+	}
+	
+	//CONDITIONS
+	//this into/outo parent.Cargo
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+		{
+			return false;
+		}
+		
+		if (HasAshes() || IsBurning() || HasStones() || HasStoneCircle() || IsOven() || !IsCargoEmpty() || HasCookingStand())
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+	override bool CanRemoveFromCargo( EntityAI parent )
+	{
+		return true;
+	}
+	
+	//cargo item into/outo this.Cargo
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if ( GetHierarchyParent() )
+			return false;
+		
+		return super.CanReceiveItemIntoCargo( item );
+	}
+	
+	override bool CanLoadItemIntoCargo( EntityAI item )
+	{
+		if (!super.CanLoadItemIntoCargo( item ))
+			return false;
+		
+		if ( GetHierarchyParent() )
+			return false;
+		
+		return true;
+	}
+	
+	//hands
+	override bool CanPutIntoHands(EntityAI parent)
+	{
+		if (!super.CanPutIntoHands(parent))
+		{
+			return false;
+		}
+		
+		if (HasAshes() || IsBurning() || HasStones() || HasStoneCircle() || IsOven() || !IsCargoEmpty() || HasCookingStand())
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		if ( !super.CanDisplayAttachmentCategory( category_name ) )
+			return false;
+		
+		if ( IsOven() )
+		{
+			if ( category_name == "CookingEquipment" )
+				return false;
+			if ( ( category_name == "DirectCooking" ) || ( category_name == "Smoking" ) )
+				return true;
+		}
+		else
+		{
+			if ( category_name == "CookingEquipment" )
+				return true;
+			if ( ( category_name == "DirectCooking" ) || ( category_name == "Smoking" ) )
+				return false;
+		}
+		return true;
+	}
+	
+	override bool CanAssignAttachmentsToQuickbar()
+	{
+		return false;
+	}
+	
+	override float HeightStartCheckOverride()
+	{
+		return 0.32;
+	}
+	
+	//particles
+	override bool CanShowSmoke()
+	{
+		return !IsOven();
+	}
+	
+	
+	void DestroyClutterCutter( Object clutter_cutter )
+	{
+		GetGame().ObjectDelete( clutter_cutter );
+	}
+	
+	override void RefreshPhysics()
+	{
+		super.RefreshPhysics();
+		
+		//Oven
+		if ( IsOven() )
+		{
+			RemoveProxyPhysics( ANIMATION_OVEN );
+			AddProxyPhysics( ANIMATION_OVEN );
+		}
+		else
+		{
+			RemoveProxyPhysics( ANIMATION_OVEN );
+		}
+		
+		//Tripod
+		if ( IsItemTypeAttached( ATTACHMENT_TRIPOD ) )
+		{
+			RemoveProxyPhysics( ANIMATION_TRIPOD );
+			AddProxyPhysics( ANIMATION_TRIPOD );
+		}
+		else
+		{
+			RemoveProxyPhysics( ANIMATION_TRIPOD );
+		}	
+	}
+	
+	override void RefreshFireplacePhysics()
+	{
+		RefreshPhysics();
+	}
+
+	//on store save/load
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave(ctx);
+		
+		if ( GetGame().SaveVersion() >= 110 )
+		{
+			// save stone circle state
+			ctx.Write( m_HasStoneCircle );
+			
+			// save stone oven state
+			ctx.Write( m_IsOven );
+		}
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+
+		if ( version >= 110 )
+		{
+			// read stone circle state
+			if ( !ctx.Read( m_HasStoneCircle ) )
+			{
+				m_HasStoneCircle = false;
+				return false;
+			}
+			// read stone oven state
+			if ( !ctx.Read( m_IsOven ) )
+			{
+				m_IsOven = false;
+				return false;
+			}
+		}		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+		
+		if ( IsBurning() )
+		{
+			if ( !m_ClutterCutter )
+			{
+				m_ClutterCutter = GetGame().CreateObjectEx( OBJECT_CLUTTER_CUTTER, GetPosition(), ECE_PLACE_ON_SURFACE );
+				m_ClutterCutter.SetOrientation( GetOrientation() );
+			}
+		}
+	}
+	
+	//================================================================
+	// IGNITION ACTION
+	//================================================================	
+	
+	// Item-to-item fire distribution
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy(EntityAI igniter = NULL)
+	{
+		return HasAnyKindling() && !IsBurning() && !GetHierarchyParent();
+	}
+	
+	override bool CanIgniteItem(EntityAI ignite_target = NULL)
+	{
+		return IsBurning();
+	}
+	
+	override bool IsIgnited()
+	{
+		return IsBurning();
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{	
+		//remove grass
+		Object cc_object = GetGame().CreateObjectEx( OBJECT_CLUTTER_CUTTER , GetPosition(), ECE_PLACE_ON_SURFACE );
+		cc_object.SetOrientation ( GetOrientation() );
+		GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).CallLater( DestroyClutterCutter, 200, false, cc_object );
+		
+		//start fire
+		StartFire();
+		
+		if ( fire_source )
+		{
+			Man player = fire_source.GetHierarchyRootPlayer();
+			
+			if ( player )
+			{
+				EFireIgniteType ignate_type = EFireIgniteType.Unknow;
+				
+				if ( fire_source.ClassName() == "Matchbox"  )
+				{
+					ignate_type = EFireIgniteType.Matchbox;
+				}
+				else if ( fire_source.ClassName() == "Roadflare"  )
+				{
+					ignate_type = EFireIgniteType.Roadflare;
+				}
+				else if ( fire_source.ClassName() == "HandDrillKit"  )
+				{
+					ignate_type = EFireIgniteType.HandDrill;
+				}
+				
+				
+				SyncEvents.SendPlayerIgnatedFireplace( player, ignate_type );
+			}
+		}
+	}
+
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		SetIgniteFailure( false );
+		Param1<bool> failure;
+		
+		//check kindling
+		if ( !HasAnyKindling() )
+		{
+			return false;
+		}
+		
+		//check roof
+		if ( !IsOven() )
+		{
+			if ( !IsCeilingHighEnoughForSmoke() && IsOnInteriorSurface() )
+			{
+				return false;
+			}
+		}
+		
+		//check surface
+		if ( IsOnWaterSurface() )
+		{
+			return false;
+		}
+
+		//check wetness
+		if ( IsWet() )
+		{
+			SetIgniteFailure( true );
+			
+			failure = new Param1<bool>( GetIgniteFailure() );
+			GetGame().RPCSingleParam( this, FirePlaceFailure.WET, failure, true );
+			return false;
+		}
+
+		// check if the fireplace isnt below a roof
+		//  excluding this check whein oven stage
+		if ( !IsOven() && !MiscGameplayFunctions.IsUnderRoof( this ) )
+		{
+			// if not, check if there is strong rain or wind
+			if ( IsRainingAbove() )
+			{
+				SetIgniteFailure( true );
+				
+				failure = new Param1<bool>( GetIgniteFailure() );
+				GetGame().RPCSingleParam( this, FirePlaceFailure.WET, failure, true );
+				return false;
+			}
+			
+			if ( IsWindy() )
+			{
+				SetIgniteFailure( true );
+				
+				failure = new Param1<bool>( GetIgniteFailure() );
+				GetGame().RPCSingleParam( this, FirePlaceFailure.WIND, failure, true );
+				return false;
+			}
+		}
+		
+		return true;	
+	}
+	
+	//================================================================
+	// FIREPLACE ENTITY
+	//================================================================	
+	static Fireplace IgniteEntityAsFireplace( notnull EntityAI entity, notnull EntityAI fire_source )
+	{
+		//get player
+		PlayerBase player = PlayerBase.Cast( fire_source.GetHierarchyRootPlayer() );
+		
+		//create fireplace
+		Fireplace fireplace = Fireplace.Cast( GetGame().CreateObjectEx( "Fireplace" , entity.GetPosition(), ECE_PLACE_ON_SURFACE ) );
+		
+		//attach
+		if ( !GetGame().IsMultiplayer() )		//clear inventory reservation (single player)
+		{
+			InventoryLocation loc = new InventoryLocation;
+			entity.GetInventory().GetCurrentInventoryLocation( loc );
+			player.GetInventory().ClearInventoryReservationEx( entity, loc );
+		}
+		
+		if ( GetGame().IsServer() && GetGame().IsMultiplayer() )
+		{
+			player.ServerTakeEntityToTargetAttachment( fireplace, entity ); // multiplayer server side
+		}
+		else
+		{
+			player.LocalTakeEntityToTargetAttachment( fireplace, entity ); // single player or multiplayer client side
+		}
+		
+		//start fire
+		fireplace.StartFire();
+		fireplace.OnIgnitedThis(fire_source);
+		
+		return fireplace;
+	}
+	
+	static bool CanIgniteEntityAsFireplace(notnull EntityAI entity)
+	{
+		//check ceiling (enough space for smoke)
+		if (MiscGameplayFunctions.IsUnderRoof(entity, FireplaceBase.MIN_CEILING_HEIGHT) && IsEntityOnInteriorSurface(entity))
+		{
+			return false;
+		}
+		
+		//check surface
+		if (FireplaceBase.IsEntityOnWaterSurface(entity))
+		{
+			return false;
+		}
+
+		if (!MiscGameplayFunctions.IsUnderRoof(entity))
+			return !FireplaceBase.IsRainingAboveEntity(entity);
+
+		return true;	
+	}
+
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override string GetPlaceSoundset()
+	{
+		return "placeFireplace_SoundSet";
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionPlaceFireplaceIntoBarrel);
+		AddAction(ActionPlaceFireplaceIndoor);
+		AddAction(ActionPlaceOvenIndoor);
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPlaceObject);
+		AddAction(ActionBuildOven);
+		AddAction(ActionDismantleOven);
+		AddAction(ActionBuildStoneCircle);
+		AddAction(ActionDismantleStoneCircle);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/FireplaceIndoor.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/FireplaceIndoor.c
new file mode 100644
index 0000000000000000000000000000000000000000..005a6405276bc7983fc6b92cc1edf0bb7dbb05a8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/FireplaceIndoor.c
@@ -0,0 +1,379 @@
+class FireplaceIndoor extends FireplaceBase
+{
+	protected float 				m_SmokePosX;
+	protected float 				m_SmokePosY;
+	protected float 				m_SmokePosZ;
+	protected int					m_FirePointIndex = 1;	//limited to 1 decimal place (1-9)
+	
+	static const string FIREPOINT_ACTION_SELECTION	= "fireplace_action";
+	static const string FIREPOINT_FIRE_POSITION 	= "fireplace_point";
+	static const string FIREPOINT_PLACE_ROT 		= "fireplace_rot";
+	static const string FIREPOINT_SMOKE_POSITION 	= "fireplace_smoke";
+	
+	void FireplaceIndoor()
+	{
+		//Particles - default for FireplaceBase
+		PARTICLE_FIRE_START 	= ParticleList.HOUSE_FIRE_START;
+		PARTICLE_SMALL_FIRE 	= ParticleList.HOUSE_SMALL_FIRE;
+		PARTICLE_NORMAL_FIRE	= ParticleList.HOUSE_NORMAL_FIRE;
+		PARTICLE_SMALL_SMOKE 	= ParticleList.HOUSE_SMALL_SMOKE;
+		PARTICLE_NORMAL_SMOKE	= ParticleList.HOUSE_NORMAL_SMOKE;
+		PARTICLE_FIRE_END 		= ParticleList.HOUSE_FIRE_END;
+		PARTICLE_STEAM_END		= ParticleList.HOUSE_FIRE_STEAM_2END;		
+		
+		//register sync variables
+		RegisterNetSyncVariableFloat( "m_SmokePosX", 0, 0, 2 );
+		RegisterNetSyncVariableFloat( "m_SmokePosY", 0, 0, 2 );
+		RegisterNetSyncVariableFloat( "m_SmokePosZ", 0, 0, 2 );
+		RegisterNetSyncVariableInt( "m_FirePointIndex", 0, 9 );
+		
+		m_LightDistance = 50;
+		m_RoofAbove = true;
+	}
+	
+	//================================================================
+	// ONSTORESAVE/LOAD/AFTERLOAD
+	//================================================================
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+
+		//fire point name
+		ctx.Write( m_FirePointIndex );
+		
+		//smoke position
+		ctx.Write( m_SmokePosX );
+		ctx.Write( m_SmokePosY );
+		ctx.Write( m_SmokePosZ );
+	}
+
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+
+		//--- Fireplace Indoor data ---
+		//fire point name
+		if ( !ctx.Read( m_FirePointIndex ) )
+		{
+			m_FirePointIndex = 1;		//set default
+			return false;
+		}
+		
+		//smoke position
+		if ( !ctx.Read( m_SmokePosX ) )
+		{
+			m_SmokePosX = 0;		//set default
+			return false;
+		}
+		if ( !ctx.Read( m_SmokePosY ) )
+		{
+			m_SmokePosY = 0;		//set default
+			return false;
+		}
+		if ( !ctx.Read( m_SmokePosZ ) )
+		{
+			m_SmokePosZ = 0;		//set default
+			return false;
+		}
+		//---
+
+		return true;
+	}
+		
+	//================================================================
+	// FIRE POINT (HOUSE)
+	// LIMITED TO 1 DECIMAL PLACE (0-9)
+	//================================================================
+	static int GetFirePointIndex( string action_selection )
+	{
+		int index_location = action_selection.Length() - 1;
+		return action_selection.Substring( index_location, 1 ).ToInt();
+	}
+	
+	void SetFirePointIndex( int fire_point_index )
+	{
+		m_FirePointIndex = fire_point_index;
+	}
+	
+	static bool CanPlaceFireplaceInSelectedSpot( Object building, int fire_point_index, out vector fire_point_pos_world, out vector fire_point_rot_world )
+	{
+		//Get fire point index position
+		vector fire_point_pos = building.GetSelectionPositionMS( FIREPOINT_FIRE_POSITION + fire_point_index.ToString() );
+		vector fire_point_rot = building.GetSelectionPositionMS( FIREPOINT_PLACE_ROT + fire_point_index.ToString() );
+		fire_point_pos_world = building.ModelToWorld( fire_point_pos );
+		fire_point_rot_world = building.ModelToWorld( fire_point_rot );
+		
+		//check if there is any FireplaceIndoor objects near selected fire point
+		ref array<Object> nearest_objects = new array<Object>;
+		ref array<CargoBase> proxy_cargos = new array<CargoBase>;
+		GetGame().GetObjectsAtPosition3D( fire_point_pos_world, 0.25, nearest_objects, proxy_cargos );
+
+		for ( int i = 0; i < nearest_objects.Count(); ++i )
+		{
+			Object object = nearest_objects.Get( i );
+			
+			if ( object.IsInherited( FireplaceIndoor ) )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	void SetSmokePointPosition( vector smoke_point_pos )
+	{
+		m_SmokePosX = smoke_point_pos[0];
+		m_SmokePosY = smoke_point_pos[1];
+		m_SmokePosZ = smoke_point_pos[2];
+	}
+	
+	//================================================================
+	// PARTICLES
+	//================================================================
+	override protected vector GetSmokeEffectPosition()
+	{
+		return Vector( m_SmokePosX, m_SmokePosY, m_SmokePosZ );
+	}
+	
+	//small smoke
+	override void ParticleSmallSmokeStart()
+	{
+		PlayParticle( m_ParticleSmallSmoke, PARTICLE_SMALL_SMOKE, GetSmokeEffectPosition(), true );
+	}
+	
+	//normal smoke
+	override void ParticleNormalSmokeStart()
+	{
+		PlayParticle( m_ParticleNormalSmoke, PARTICLE_NORMAL_SMOKE, GetSmokeEffectPosition(), true );
+	}	
+
+	//================================================================
+	// STATE
+	//================================================================
+	override bool IsFireplaceIndoor()
+	{
+		return true;
+	}
+
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		if ( IsKindling(item_base) || IsFuel(item_base))
+		{
+			AddToFireConsumables(item_base);
+		}
+		
+		// direct cooking slots, smoking slots
+		bool edible_base_attached = false;
+		switch ( slot_name )
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "DirectCookingB":
+			m_DirectCookingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		case "DirectCookingC":
+			m_DirectCookingSlots[2] = item_base;
+			edible_base_attached = true;
+		break;
+
+		case "SmokingA":
+			m_SmokingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingC":
+			m_SmokingSlots[2] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingD":
+			m_SmokingSlots[3] = item_base;
+			edible_base_attached = true;
+		break;
+		}
+		
+		// reset cooking time (to prevent the cooking exploit)
+		if (GetGame().IsServer() && edible_base_attached)
+		{
+			Edible_Base edBase = Edible_Base.Cast(item_base);
+			if (edBase)
+			{
+				if (edBase.GetFoodStage())
+				{
+					edBase.SetCookingTime(0);
+				}
+			}
+		}
+
+		RefreshFireplaceVisuals();
+	}
+
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			RemoveFromFireConsumables(GetFireConsumableByItem(item_base));
+		}
+		
+		CheckForDestroy();
+		
+		// direct cooking/smoking slots
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = null;
+		break;
+		case "DirectCookingB":
+			m_DirectCookingSlots[1] = null;
+		break;
+		case "DirectCookingC":
+			m_DirectCookingSlots[2] = null;
+		break;
+
+		case "SmokingA":
+			m_SmokingSlots[0] = null;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = null;
+		break;
+		case "SmokingC":
+			m_SmokingSlots[2] = null;
+		break;
+		case "SmokingD":
+			m_SmokingSlots[3] = null;
+		break;
+		}
+
+		// cookware-specifics (remove audio visuals)
+		if (item_base.Type() == ATTACHMENT_COOKING_POT)
+		{	
+			ClearCookingEquipment(item_base);
+			Bottle_Base cooking_pot = Bottle_Base.Cast(item);
+			cooking_pot.RemoveAudioVisualsOnClient();	
+		}
+		if (item_base.Type() == ATTACHMENT_CAULDRON)
+		{
+			ClearCookingEquipment(item_base);
+			Bottle_Base cauldron = Bottle_Base.Cast(item);
+			cauldron.RemoveAudioVisualsOnClient();	
+		}
+		if (item_base.Type() == ATTACHMENT_FRYING_PAN)
+		{
+			ClearCookingEquipment(item_base);
+			FryingPan frying_pan = FryingPan.Cast(item);
+			frying_pan.RemoveAudioVisualsOnClient();
+		}
+		
+		RefreshFireplaceVisuals();
+	}
+		
+	//================================================================
+	// CONDITIONS
+	//================================================================
+	//this into/outo parent.Cargo
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return false;
+	}
+
+	override bool CanRemoveFromCargo( EntityAI parent )
+	{
+		return true;
+	}
+	
+	//cargo item into/outo this.Cargo
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		return super.CanReceiveItemIntoCargo( item );
+	}
+
+	//hands
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanRemoveFromHands( EntityAI player ) 
+	{
+		return false;
+	}
+
+	// Item-to-item fire distribution
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( HasAnyKindling() && !GetHierarchyParent() )
+		{
+			return true;
+		}
+			
+		return false;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		if ( IsBurning() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool IsIgnited()
+	{
+		return IsBurning();
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{	
+		//start fire
+		StartFire(); 
+	}
+	
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		SetIgniteFailure( false );
+		Param1<bool> failure;
+		
+		//check kindling
+		if ( !HasAnyKindling() )
+		{
+			return false;
+		}
+		
+		//check wetness
+		if ( IsWet() )
+		{
+			SetIgniteFailure( true );
+			
+			failure = new Param1<bool>( GetIgniteFailure() );
+			GetGame().RPCSingleParam( this, FirePlaceFailure.WET, failure, true );
+			return false;
+		}
+		
+		return true;	
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/OvenIndoor.c b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/OvenIndoor.c
new file mode 100644
index 0000000000000000000000000000000000000000..4fd21304e8278c6289f58d6e84c0a33c0086c9bd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireplaceBase/OvenIndoor.c
@@ -0,0 +1,354 @@
+class OvenIndoor extends FireplaceBase
+{
+	protected float 				m_SmokePosX;
+	protected float 				m_SmokePosY;
+	protected float 				m_SmokePosZ;
+	protected int					m_FirePointIndex = 1;	//limited to 1 decimal place (1-9)
+	
+	static const string OVENPOINT_ACTION_SELECTION	= "oven_action";
+	static const string OVENPOINT_FIRE_POSITION 	= "oven_point";
+	static const string OVENPOINT_PLACE_ROT 		= "oven_rot";
+	static const string OVENPOINT_SMOKE_POSITION 	= "oven_smoke";
+	
+	void OvenIndoor()
+	{
+		//Particles - default for FireplaceBase
+		PARTICLE_FIRE_START 	= ParticleList.OVEN_FIRE_START;
+		PARTICLE_SMALL_FIRE 	= ParticleList.OVEN_SMALL_FIRE;
+		PARTICLE_NORMAL_FIRE	= ParticleList.OVEN_NORMAL_FIRE;
+		PARTICLE_SMALL_SMOKE 	= ParticleList.HOUSE_SMALL_SMOKE;
+		PARTICLE_NORMAL_SMOKE	= ParticleList.HOUSE_NORMAL_SMOKE;
+		PARTICLE_FIRE_END 		= ParticleList.OVEN_FIRE_END;
+		PARTICLE_STEAM_END		= ParticleList.BARREL_FIRE_STEAM_2END;
+		
+		//register sync variables
+		RegisterNetSyncVariableFloat( "m_SmokePosX", 0, 0, 2 );
+		RegisterNetSyncVariableFloat( "m_SmokePosY", 0, 0, 2 );
+		RegisterNetSyncVariableFloat( "m_SmokePosZ", 0, 0, 2 );
+		RegisterNetSyncVariableInt( "m_FirePointIndex", 0, 9 );
+		
+		m_LightDistance = 50;
+		m_RoofAbove = true;
+	}
+	
+	//================================================================
+	// ONSTORESAVE/LOAD/AFTERLOAD
+	//================================================================
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+
+		//fire point name
+		ctx.Write( m_FirePointIndex );
+		
+		//smoke position
+		ctx.Write( m_SmokePosX );
+		ctx.Write( m_SmokePosY );
+		ctx.Write( m_SmokePosZ );
+	}
+
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+
+		//--- Fireplace Indoor data ---
+		//fire point name
+		if ( !ctx.Read( m_FirePointIndex ) )
+		{
+			m_FirePointIndex = 1;		//set default
+			return false;
+		}
+		
+		//smoke position
+		if ( !ctx.Read( m_SmokePosX ) )
+		{
+			m_SmokePosX = 0;		//set default
+			return false;
+		}
+		if ( !ctx.Read( m_SmokePosY ) )
+		{
+			m_SmokePosY = 0;		//set default
+			return false;
+		}
+		if ( !ctx.Read( m_SmokePosZ ) )
+		{
+			m_SmokePosZ = 0;		//set default
+			return false;
+		}
+		//---
+
+		return true;
+	}
+		
+	//================================================================
+	// FIRE POINT (HOUSE)
+	// LIMITED TO 1 DECIMAL PLACE (0-9)
+	//================================================================
+	static int GetFirePointIndex( string action_selection )
+	{
+		int index_location = action_selection.Length() - 1;
+		return action_selection.Substring( index_location, 1 ).ToInt();
+	}
+	
+	void SetFirePointIndex( int fire_point_index )
+	{
+		m_FirePointIndex = fire_point_index;
+	}
+	
+	static bool CanPlaceFireplaceInSelectedSpot( Object building, int fire_point_index, out vector fire_point_pos_world, out vector fire_point_rot_world )
+	{
+		//Get fire point index position
+		vector fire_point_pos = building.GetSelectionPositionMS( OVENPOINT_FIRE_POSITION + fire_point_index.ToString() );
+		vector fire_point_rot = building.GetSelectionPositionMS( OVENPOINT_PLACE_ROT + fire_point_index.ToString() );
+		fire_point_pos_world = building.ModelToWorld( fire_point_pos );
+		fire_point_rot_world = building.ModelToWorld( fire_point_rot );
+		
+		//check if there is any FireplaceIndoor objects near selected fire point
+		ref array<Object> nearest_objects = new array<Object>;
+		ref array<CargoBase> proxy_cargos = new array<CargoBase>;
+		GetGame().GetObjectsAtPosition3D( fire_point_pos_world, 1, nearest_objects, proxy_cargos );
+
+		for ( int i = 0; i < nearest_objects.Count(); ++i )
+		{
+			Object object = nearest_objects.Get( i );
+			
+			if ( object.IsInherited( OvenIndoor ) )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	void SetSmokePointPosition( vector smoke_point_pos )
+	{
+		m_SmokePosX = smoke_point_pos[0];
+		m_SmokePosY = smoke_point_pos[1];
+		m_SmokePosZ = smoke_point_pos[2];
+	}
+	
+	//================================================================
+	// PARTICLES
+	//================================================================
+	override protected vector GetSmokeEffectPosition()
+	{
+		return Vector( m_SmokePosX, m_SmokePosY, m_SmokePosZ );
+	}
+	
+	//small smoke
+	override void ParticleSmallSmokeStart()
+	{
+		PlayParticle( m_ParticleSmallSmoke, PARTICLE_SMALL_SMOKE, GetSmokeEffectPosition(), true );
+	}
+	
+	//normal smoke
+	override void ParticleNormalSmokeStart()
+	{
+		PlayParticle( m_ParticleNormalSmoke, PARTICLE_NORMAL_SMOKE, GetSmokeEffectPosition(), true );
+	}
+
+	//================================================================
+	// STATE
+	//================================================================
+	override bool IsIndoorOven()
+	{
+		return true;
+	}
+
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+		
+		ItemBase item = ItemBase.Cast(attachment);
+		if (IsKindling(item) || IsFuel(item))
+		{
+			return !IsBurning();
+		}
+		
+		return true;
+	}
+
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			AddToFireConsumables(item_base);
+		}
+		
+		// direct cooking/smoking slots
+		bool edible_base_attached = false;
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingA":
+			m_SmokingSlots[0] = item_base;
+			edible_base_attached = true;
+		break;
+		case "SmokingB":
+			m_SmokingSlots[1] = item_base;
+			edible_base_attached = true;
+		break;
+		}
+		
+		// reset cooking time (to prevent the cooking exploit)
+		if (GetGame().IsServer() && edible_base_attached)
+		{
+			Edible_Base edBase = Edible_Base.Cast(item_base);
+			if (edBase)
+			{
+				if ( edBase.GetFoodStage())
+				{
+					edBase.SetCookingTime(0);
+				}
+			}
+		}
+
+		RefreshFireplaceVisuals();
+	}
+
+	override void EEItemDetached(EntityAI item, string slot_name) 
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		ItemBase item_base = ItemBase.Cast(item);
+		
+		if (IsKindling(item_base) || IsFuel(item_base))
+		{
+			RemoveFromFireConsumables(GetFireConsumableByItem(item_base));
+		}
+		
+		CheckForDestroy();
+
+		// direct cooking/smoking slots
+		switch (slot_name)
+		{
+		case "DirectCookingA":
+			m_DirectCookingSlots[0] = null;
+		break;
+		case "SmokingA":
+			m_SmokingSlots[0] = null;
+		break;
+
+		case "SmokingB":
+			m_SmokingSlots[1] = null;
+		break;
+		}
+
+		// cookware-specifics (remove audio visuals)
+		if (item_base.Type() == ATTACHMENT_COOKING_POT)
+		{
+			ClearCookingEquipment(item_base);
+			Bottle_Base cooking_pot = Bottle_Base.Cast(item);
+			cooking_pot.RemoveAudioVisualsOnClient();	
+		}
+		if (item_base.Type() == ATTACHMENT_CAULDRON)
+		{
+			ClearCookingEquipment(item_base);
+			Bottle_Base cauldron = Bottle_Base.Cast(item);
+			cauldron.RemoveAudioVisualsOnClient();	
+		}
+		if (item_base.Type() == ATTACHMENT_FRYING_PAN)
+		{
+			ClearCookingEquipment(item_base);
+			FryingPan frying_pan = FryingPan.Cast(item);
+			frying_pan.RemoveAudioVisualsOnClient();
+		}
+		
+		RefreshFireplaceVisuals();
+	}
+		
+	//================================================================
+	// CONDITIONS
+	//================================================================
+	//this into/outo parent.Cargo
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return false;
+	}
+
+	override bool CanRemoveFromCargo( EntityAI parent )
+	{
+		return true;
+	}
+
+	//hands
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanRemoveFromHands( EntityAI player ) 
+	{
+		return false;
+	}
+
+	// Item-to-item fire distribution
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( HasAnyKindling() && !GetHierarchyParent() )
+		{
+			return true;
+		}
+			
+		return false;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		if ( IsBurning() )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool IsIgnited()
+	{
+		return IsBurning();
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{	
+		//start fire
+		StartFire(); 
+	}
+	
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		//check kindling
+		if ( !HasAnyKindling() )
+		{
+			return false;
+		}
+		
+		//check wetness
+		if ( IsWet() )
+		{
+			return false;
+		}
+		
+		return true;	
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Firewood.c b/scripts/4_World/DayZ/Entities/ItemBase/Firewood.c
new file mode 100644
index 0000000000000000000000000000000000000000..9f9ec423970bd5378c3b1fb3ef578428a49d7682
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Firewood.c
@@ -0,0 +1,14 @@
+class Firewood extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FireworksBase.c b/scripts/4_World/DayZ/Entities/ItemBase/FireworksBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b1a71f89085868d55bb21e307a63571df8291aa9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FireworksBase.c
@@ -0,0 +1,165 @@
+
+enum EFireworksState
+{
+	DEFAULT,
+	PLACED,
+	IGNITED,
+	FIRING,
+	FINISHED
+}
+
+class FireworksBase: Inventory_Base
+{
+	protected  EFireworksState m_State;
+	protected  EFireworksState m_StatePrev;
+	protected ref Timer m_TimerEvent;
+	protected int m_RandomSeed;
+
+	void FireworksBase()
+	{
+		Init();
+	}
+	
+	override void EEOnCECreate()
+	{
+		StandUp();
+	}
+	
+	protected void Init();
+	
+
+	
+	override protected void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDeployObject);
+		AddAction(ActionLightItemOnFire);
+	}
+	
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	protected float GetMaxAllowedWetness()
+	{
+		return 0.1;
+	}
+	
+	protected EFireworksState GetState()
+	{
+		return m_State;
+	}
+	
+	protected void SetState(EFireworksState state)
+	{
+		if (state != m_StatePrev && GetGame().IsServer())
+		{
+			m_State = state;
+			SetSynchDirty();
+			OnStateChangedServer(state);
+			m_StatePrev = state;
+		}
+	}
+	
+	protected void OnStateChangedServer(EFireworksState currentState);
+	protected void OnStateChangedClient(EFireworksState currentState);
+
+	
+	override protected void OnInventoryEnter(Man player)
+	{
+		if (GetState() == EFireworksState.PLACED)
+		{
+			SetState(EFireworksState.DEFAULT);
+		}
+	}
+	
+	override protected void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		if (!IsBeingPlaced())
+			StandUp();
+	}
+	
+	protected void StandUp()
+	{
+		if (!IsRuined())
+		{
+			SetOrientation(vector.Zero);
+		}
+	}
+	
+	//! Executed on Server when some item ignited this one
+	override void OnIgnitedThis( EntityAI fire_source)
+	{
+		SetState(EFireworksState.IGNITED);
+	}
+	
+	// Checkes if Torch can be ignited
+	override protected bool CanBeIgnitedBy(EntityAI igniter = NULL)
+	{
+		if (GetWet() >= GetMaxAllowedWetness())
+		{
+			return false;
+		}
+		
+		if (MiscGameplayFunctions.IsUnderRoofEx(this, 60))
+		{
+			return false;
+		}
+		
+		if ((GetState() <= EFireworksState.PLACED) && vector.Dot(vector.Up,GetDirectionUp()) > 0.95)
+		{
+			return true;	
+		}
+		return false;
+	}
+	
+	//!Called periodically after the entity gets ignited
+	protected void OnEventServer(int type);
+	
+	protected float GetEventDelay()
+	{
+		return 0;
+	}
+	
+	override protected void OnVariablesSynchronized()
+	{
+		//Print("new state client: " + m_State);
+		super.OnVariablesSynchronized();
+		if (m_State != m_StatePrev)
+		{
+			OnStateChangedClient(m_State);
+			m_StatePrev = m_State;
+		}
+	}
+	
+	#ifdef DEVELOPER
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ACTIVATE_ENTITY, "Ignite", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.ACTIVATE_ENTITY)
+			{
+				OnIgnitedThis(null);
+			}
+			
+		}
+		return false;
+	}
+	#endif
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/FishingRod_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/FishingRod_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef07837d915e29a64ea067d90f197d90599651d2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/FishingRod_Base.c
@@ -0,0 +1,353 @@
+class FishingRod_Base_New : ItemBase
+{
+	void FishingRod_Base_New()
+	{
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionFishingNew);
+	}
+	
+	float GetFishingEffectivityBonus()
+	{
+		return 0.0;
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+	
+	void AnimateFishingRod(bool state) {}	
+	
+	override void OnDebugSpawn()
+	{
+		GetInventory().CreateAttachment("Bait");
+		for (int i = 0; i < 6; ++i)
+		{
+			GetGame().CreateObjectEx("Bait", GetPosition(), ECE_PLACE_ON_SURFACE);
+		}
+	}
+}
+
+class FishingRod_Base : ItemBase
+{
+	const string    ANIM_PHASE_OPENED = "OpenRod";	
+	const string    ANIM_PHASE_CLOSED = "CloseRod";
+	
+	const float 	BREAK_PULL = 36;
+	const float 	TOO_MUCH_PULL = 32;
+	const float 	HIGH_PULL = 22;
+	const float 	LOW_PULL = 18;
+	const float 	TOO_FEW_PULL = 8;
+	const float 	LOOSE_PULL = 0;
+	const int 		LOSS_BREAK = 0;
+	const int 		LOSS_LOOSE = 1;
+	const int 		WIN = 2;
+	const int 		INTERUPTED = 3;
+	const float		INIT_LINE_STRETCH = 15;
+	const float		MIN_FISHING_TIME = 100;
+	const float		MAX_FISHING_TIME = 150;
+	const int		FISH_PULL_CHANCE = 15;
+	const int		FISH_AGILITY = 15;
+	
+	int				m_FishProximity;
+	bool			m_Fishing;
+	ref Timer 		m_CyclerCatching;
+	ref Timer 		m_Cycler;
+	float 			m_Pull;
+	float			m_DeltaT;
+	bool			m_WasPulled;
+	bool			m_IsFishPulling;
+	float			m_PullTime;
+	float			m_FishPull;
+	int				m_FishingTime;
+	PlayerBase 		m_Player;
+	int				m_ChanceRange;
+	
+	void FishingRod_Base()
+	{
+		m_Fishing = false;
+	}
+	
+	void Init()
+	{
+		m_Player = PlayerBase.Cast( GetGame().GetPlayer() );
+		m_Pull = INIT_LINE_STRETCH;
+		m_IsFishPulling = false;
+		//TIMERDEPRECATED - randomized time of fishing
+		m_FishingTime = Math.RandomInt(MIN_FISHING_TIME,MAX_FISHING_TIME);
+		m_ChanceRange = FISH_AGILITY;
+		m_FishProximity = FISH_AGILITY;
+		//TIMERDEPRECATED	
+		if(!m_Cycler)
+		{
+			m_Cycler = new Timer();
+		}
+		if(!m_CyclerCatching)
+		{
+			m_CyclerCatching = new Timer();
+		}
+		m_CyclerCatching.Run(4, this, "Catching", NULL,true);
+		m_Player.Message("I have started fishing.", "colorFriendly");
+	}
+
+	bool IsFishingActive()
+	{
+		return m_Fishing;
+	}
+		
+	void ActivateFishing()
+	{
+		m_Fishing = true;
+		//Init();
+	}
+
+	void DeactivateFishing()
+	{
+		End(INTERUPTED);
+	}
+
+
+
+	void FishPull()
+	{
+		if ( !m_IsFishPulling )
+		{
+			float rand = Math.RandomInt(1, FISH_PULL_CHANCE);
+			if ( rand <= 2 && m_Pull <= TOO_MUCH_PULL && m_Pull >= TOO_FEW_PULL )
+			{
+				//TIMERDEPRECATED - randomizing timeframe to pull fish out
+				if ( Math.RandomInt(0, 1) )
+				{
+					m_FishPull = rand;
+				}
+				else
+				{
+					m_FishPull = -rand;
+				}
+				//TIMERDEPRECATED - randomizing timeframe to pull fish out
+				m_PullTime = Math.RandomInt(2, 6);
+				m_IsFishPulling = true;
+			}
+		}
+		else
+		{
+			m_PullTime--;
+			if (m_PullTime == 0)
+			{
+				m_IsFishPulling = false;
+			}
+		}
+	}
+
+	void Catching()
+	{
+		if(m_FishProximity == 0 && m_WasPulled)
+		{
+			m_CyclerCatching.Stop();
+			m_Cycler.Run(0.3, this, "Pulling", NULL,true);
+		}
+		else
+		{
+			if (m_WasPulled)
+			{
+				m_WasPulled = false;
+				m_ChanceRange++;
+			}
+			//TIMERDEPRECATED - randomized proximity of fish to 
+			m_FishProximity = Math.RandomInt(0,m_ChanceRange);
+			string fline = "";
+			for (int i = 0; i < m_FishProximity; i++)
+			{
+				fline += " .";
+			}
+			m_Player.Message("", "colorStatusChannel");
+			m_Player.Message("HOLD right mouse button to pull the fishing line", "colorAction");
+			m_Player.Message("", "colorStatusChannel");
+			m_Player.Message("", "colorStatusChannel");
+			m_Player.Message("", "colorStatusChannel");
+			m_Player.Message("Start pulling when J and <*)))>< meet:", "colorStatusChannel");
+			m_Player.Message("", "colorStatusChannel");
+			m_Player.Message("J"+fline+" <*)))><", "colorImportant");
+			if(m_ChanceRange > 0)
+			{
+				m_ChanceRange--;
+			}
+		}
+	}
+
+	void Pulling()
+	{	
+		float agent_speed_distance = vector.Distance("0 0 0",m_Player.GetModelSpeed());
+		if (m_Player.GetItemInHands() != this || !m_Player.IsInWater() || agent_speed_distance > 1 )
+		{
+			End(INTERUPTED);
+		}
+		else
+		{
+			if ( m_FishingTime <= 0)
+			{ 
+				ItemBase pcatch = ItemBase.Cast( m_Player.GetInventory().CreateInInventory("Carp") );
+				//ItemBase pcatch = ItemBase.Cast( m_Player.CreateInInventory("Carp","cargo_bait") );
+				pcatch.SetQuantity(800,false);
+				End(WIN);
+			}
+			else
+			{
+				FishPull();
+				if ( m_IsFishPulling )
+				{
+					m_Pull += m_FishPull;
+				}
+				if (m_WasPulled)
+				{
+					m_Pull += 1;
+				}
+				else
+				{
+					m_Pull -= 1;
+				}
+				m_WasPulled = false;
+				m_FishingTime--;
+				DisplayState();
+				if ( m_Pull <= LOOSE_PULL)
+				{
+					End(LOSS_LOOSE);
+				}
+				if ( m_Pull >= BREAK_PULL) 
+				{
+					End(LOSS_BREAK);
+				}
+			}
+		}
+	}
+
+	void End( int result )
+	{
+		m_Cycler.Stop();
+		m_CyclerCatching.Stop();
+		m_Fishing = false;
+		
+		switch (result)
+		{
+			case LOSS_BREAK:
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("The fish had broken the fishing line and swam away.", "colorImportant");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+			break;
+			
+			case LOSS_LOOSE:
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("The fish escaped.", "colorImportant");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+			break;
+			
+			case WIN:
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("I caught the fish!", "colorFriendly");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+			break;
+			
+			case INTERUPTED:
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("Fishing time is over.", "colorFriendly");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+				m_Player.Message("", "colorStatusChannel");
+			break;
+			
+			default:
+				Print("Wrong number");
+			break;
+		}
+	}
+
+	void AddPull(float delta)
+	{
+		m_DeltaT = delta;
+		m_WasPulled = true;
+	}
+
+	void DisplayState()
+	{
+		string fline = "";
+		for (int i = 0; i < m_Pull; i++)
+		{
+			fline += "-";
+		}
+		m_Player.Message("", "colorStatusChannel");
+		m_Player.Message("HOLD right mouse button to pull the fishing line", "colorAction");
+		m_Player.Message("RELEASE right mouse button to loosen the fishing line", "colorAction");
+		m_Player.Message("", "colorStatusChannel");
+		m_Player.Message("", "colorStatusChannel");
+		m_Player.Message("Fishing line stretch :", "colorStatusChannel");
+		m_Player.Message("", "colorStatusChannel");
+		if (m_Pull >= TOO_MUCH_PULL)
+		{
+			m_Player.Message("<"+fline+">", "colorImportant");
+		}
+		if ( m_Pull >= HIGH_PULL && m_Pull < TOO_MUCH_PULL)
+		{
+			m_Player.Message("<"+fline+">", "colorAction");
+		}
+		if ( m_Pull < HIGH_PULL && m_Pull > LOW_PULL)
+		{
+			m_Player.Message("<"+fline+">", "colorFriendly");
+		}
+		if ( m_Pull <= LOW_PULL && m_Pull > TOO_FEW_PULL)
+		{
+			m_Player.Message("<"+fline+">", "colorStatusChannel");
+		}
+		if (m_Pull <= TOO_FEW_PULL)
+		{
+			m_Player.Message("<"+fline+">", "colorImportant");
+		}
+	}
+	
+	// Conditions
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}
+		if ( GetAnimationPhase(ANIM_PHASE_CLOSED) > 0.5 )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		//AddAction(ActionToggleFishing);
+		//AddAction(ActionFishing);
+		//AddAction(ActionFishingNew);
+	}
+	
+	float GetFishingEffectivityBonus()
+	{
+		return 0.0;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Flag_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Flag_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..d72719bf0c80f09cfa4311ae26932e90d6bc241a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Flag_Base.c
@@ -0,0 +1,149 @@
+class Flag_Base extends ItemBase
+{
+	void Flag_Base()
+	{
+		//synchronized variables
+		//RegisterNetSyncVariableBool( "m_IsMounted" );
+		ShowSelection("folded");
+		HideSelection("unfolded");
+	}
+	
+	void ~Flag_Base()
+	{
+	}
+	
+	// --- SYNCHRONIZATION
+	void Synchronize()
+	{
+		if ( GetGame().IsServer() )
+		{
+			SetSynchDirty();
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		
+	}
+	
+	// --- EVENTS
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{   
+		super.OnStoreSave( ctx );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		return true;
+	}
+	
+	override void AfterStoreLoad()
+	{	
+		super.AfterStoreLoad();
+				
+		//set mounted state based on locked slot after everything is loaded
+		//SetMountedState( GetSlotLockedState() );
+	}
+	
+	/*override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+		
+		ShowSelection("folded");
+		HideSelection("unfolded");
+	}
+	
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		HideSelection("folded");
+		ShowSelection("unfolded");
+	}*/
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent,slot_id);
+		
+		HideSelection("folded");
+		ShowSelection("unfolded");
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent,slot_id);
+		
+		ShowSelection("folded");
+		HideSelection("unfolded");
+	}
+	
+	// SOUNDS
+	// ---------------------------------------------------------
+	//TODO
+	// ---------------------------------------------------------
+	
+	override int GetViewIndex()
+	{
+		if ( MemoryPointExists( "invView2" ) )
+		{		
+			InventoryLocation il = new InventoryLocation;
+			GetInventory().GetCurrentInventoryLocation( il );
+			InventoryLocationType type = il.GetType();
+			switch ( type )
+			{
+				case InventoryLocationType.ATTACHMENT:
+				{
+					return 1;
+				}
+				default:
+				{
+					return 0;
+				}
+			}
+		}
+		return 0;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttach);
+	}
+}
+
+class Flag_Chernarus extends Flag_Base {};
+class Flag_Chedaki extends Flag_Base {};
+class Flag_NAPA extends Flag_Base {};
+class Flag_CDF extends Flag_Base {};
+class Flag_Livonia extends Flag_Base {};
+class Flag_Altis extends Flag_Base {};
+class Flag_SSahrani extends Flag_Base {};
+class Flag_NSahrani extends Flag_Base {};
+class Flag_DayZ extends Flag_Base {};
+class Flag_LivoniaArmy extends Flag_Base {};
+class Flag_White extends Flag_Base {};
+class Flag_Bohemia extends Flag_Base {};
+class Flag_APA extends Flag_Base {};
+class Flag_UEC extends Flag_Base {};
+class Flag_Pirates extends Flag_Base {};
+class Flag_Cannibals extends Flag_Base {};
+class Flag_Bear extends Flag_Base {};
+class Flag_Wolf extends Flag_Base {};
+class Flag_BabyDeer extends Flag_Base {};
+class Flag_Rooster extends Flag_Base {};
+class Flag_LivoniaPolice extends Flag_Base {};
+class Flag_CMC extends Flag_Base {};
+class Flag_TEC extends Flag_Base {};
+class Flag_CHEL extends Flag_Base {};
+class Flag_Zenit extends Flag_Base {};
+class Flag_HunterZ extends Flag_Base {};
+class Flag_BrainZ extends Flag_Base {};
+class Flag_Rex extends Flag_Base {};
+class Flag_Zagorky extends Flag_Base {};
+class Flag_Crook extends Flag_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Flashlight.c b/scripts/4_World/DayZ/Entities/ItemBase/Flashlight.c
new file mode 100644
index 0000000000000000000000000000000000000000..dbd991bf80dc2edfd8c1a73fd5d0d864a97f71b3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Flashlight.c
@@ -0,0 +1,89 @@
+class Flashlight extends ItemBase
+{
+	FlashlightLight m_Light;
+	
+	static int		REFLECTOR_ID = 1;
+	static int		GLASS_ID = 2;
+	
+	static string 	LIGHT_OFF_GLASS = "dz\\gear\\tools\\data\\flashlight_glass.rvmat";
+	static string 	LIGHT_OFF_REFLECTOR = "dz\\gear\\tools\\data\\flashlight.rvmat";
+	static string 	LIGHT_ON_GLASS = "dz\\gear\\tools\\data\\flashlight_glass_on.rvmat";
+	static string 	LIGHT_ON_REFLECTOR = "dz\\gear\\tools\\data\\flashlight_glass_on.rvmat";
+	
+	override void OnWorkStart()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // Client side
+		{
+			m_Light = FlashlightLight.Cast(  ScriptedLightBase.CreateLight(FlashlightLight, "0 0 0", 0.08)  ); // Position is zero because light is attached on parent immediately.
+			m_Light.AttachOnMemoryPoint(this, "beamStart", "beamEnd");
+		}
+		
+		SetObjectMaterial(GLASS_ID, LIGHT_ON_GLASS);
+		SetObjectMaterial(REFLECTOR_ID, LIGHT_ON_REFLECTOR);
+		}
+	
+	override void OnWork( float consumed_energy )
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // Client side
+		{
+			Battery9V battery = Battery9V.Cast( GetCompEM().GetEnergySource() );
+			
+			if (battery  &&  m_Light)
+			{
+				float efficiency = battery.GetEfficiency0To1();
+				
+				if ( efficiency < 1 )
+				{
+					m_Light.SetIntensity( efficiency, GetCompEM().GetUpdateInterval() );
+				}
+				else
+				{
+					m_Light.SetIntensity( 1, 0 );
+				}
+			}
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // Client side
+		{
+			if (m_Light)
+				m_Light.FadeOut();
+			
+			m_Light = NULL;
+		}
+		
+		SetObjectMaterial(GLASS_ID, LIGHT_OFF_GLASS);
+		SetObjectMaterial(REFLECTOR_ID, LIGHT_OFF_REFLECTOR);
+		}
+	
+	// Inventory manipulation
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+		
+		if ( GetCompEM().IsWorking() )
+		{
+			if (player)
+			{
+				vector ori_rotate = player.GetOrientation();
+				ori_rotate = ori_rotate + Vector(270,0,0);
+				SetOrientation(ori_rotate);
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnWhileInHands);
+		AddAction(ActionTurnOffWhileInHands);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		Battery9V.Cast(GetInventory().CreateInInventory("Battery9V"));
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Camping/camping.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Camping/camping.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5dc0509f395d8634381d1dfb366f251597deb7a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Camping/camping.c
@@ -0,0 +1,34 @@
+class CamoNetShelter : ItemBase {};
+//cluttercutter classes
+class MediumTentClutterCutter: Static {};
+class LargeTentClutterCutter: Static {};
+class SeaChest: DeployableContainer_Base
+{
+	void SeaChest()
+	{
+		m_HalfExtents = Vector(0.2,0.5,0.4);
+	}
+	
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+};
+class WoodenCrate: DeployableContainer_Base
+{
+	void WoodenCrate()
+	{
+		m_HalfExtents = Vector(0.15,0.25,0.4);
+	}
+	
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+	
+	override void SetActions()
+	{
+		AddAction(ActionAttachOnSelection);
+		super.SetActions();
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Consumables/EasterEgg.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Consumables/EasterEgg.c
new file mode 100644
index 0000000000000000000000000000000000000000..d739c370711a9c0186bb8012202f6d05995d8a6f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Consumables/EasterEgg.c
@@ -0,0 +1,409 @@
+enum eCaptureState
+{
+	CAPTURE = 0,
+	RELEASE = 1,
+	STASIS = 2,
+	CAPTUREFX = 3,
+	RELEASEFX = 4,
+	
+	//Keep this last value at the end, add any new states before
+	END
+}
+
+class EasterEgg : Inventory_Base
+{
+	//Capture parameters
+	private DayZCreatureAI 			m_StoredCreature = null;
+	private string 					m_CreatureType;
+	private int 					m_CreatureHash = 0; //Used for sync
+	private int 					m_CaptureState = eCaptureState.STASIS;
+	private const vector 			CAPTURE_VELOCITY = { 0, 0, 0 };
+	
+	//VFX
+	protected Particle 				m_ParCapture;
+	private   float 				m_ParScale = 1;
+	private const float 			PARTICLE_SCALE_MULT = 0.1; //Used because we use DistanceSqr to get relevant scale
+	
+	//SFX
+	protected EffectSound 			m_CaptureSound; //Egg SFX
+	protected EffectSound 			m_CreatureSound; //Creature specific SFX
+	protected bool					m_DangerSound = false; //Used to determine if release animal is dangerous and play sound accordingly
+	
+	protected ref map<int, string>	m_CreatureSoundMap; //Store all possible creature sound sets mapped to their respective hash
+	protected int 					m_CaptureSoundHash; //Used to find capture sound set in map
+	protected int 					m_ReleaseSoundHash; //Used to find release sound set in map
+	
+	
+	void EasterEgg()
+	{
+		m_CreatureType = "";
+		SetEventMask( EntityEvent.CONTACT | EntityEvent.TOUCH );
+		SetFlags( EntityFlags.TRIGGER, false );
+		RegisterNetSyncVariableInt( "m_CaptureState", 0, eCaptureState.END );
+		RegisterNetSyncVariableInt( "m_CreatureHash", 0, 0 );
+		RegisterNetSyncVariableFloat( "m_ParScale", 0, 0, 0.1 );
+		RegisterNetSyncVariableBool( "m_DangerSound" );
+		RegisterNetSyncVariableInt( "m_CaptureSoundHash", 0, 0 );
+		RegisterNetSyncVariableInt( "m_ReleaseSoundHash", 0, 0 );
+		
+		RegisterSoundSetMap();
+	}
+	
+	void ~EasterEgg()
+	{
+		if ( m_ParCapture )
+			m_ParCapture.Stop();
+	}
+	
+	// ------------------------------
+	// CORE EXECUTION DEPENDING ON CURRENT STATE
+	// ------------------------------
+	void ContactEvent( IEntity other, vector pos )
+	{
+		switch ( m_CaptureState )
+		{
+			case eCaptureState.CAPTURE:
+			DayZCreatureAI capAnimal = DayZCreatureAI.Cast( other );
+			if ( capAnimal && capAnimal.IsAlive() )
+			{
+				if ( GetGame().IsServer() )
+					Capture( capAnimal );
+			}
+			else
+				m_CaptureState = eCaptureState.STASIS; //We did not capture anything, go back to stasis
+		break;
+		
+			case eCaptureState.RELEASE:
+			Release( pos );
+			PlayVFX();
+			PlaySFX( eCaptureState.RELEASE );
+		break;
+			
+			case eCaptureState.CAPTUREFX:
+			case eCaptureState.RELEASEFX:
+			//Intermediate state to play FX on next client side contact event
+			//Creates slight delay but saves network traffic
+			if ( m_CreatureHash != 0 )
+			{
+				//Make sure to go back in stasis
+				m_CaptureState = eCaptureState.STASIS;
+				SetSynchDirty();
+			}
+		break;
+			
+			case eCaptureState.STASIS:
+			//Do nothing here, feel free to add logic for fun fumble effects when nothing happens :) 
+			
+		break;
+			
+			default: //default in case state is somehow not initialized 
+			
+		break;
+		}
+	}
+	
+	//Used for capture
+	override void EOnTouch( IEntity other, int extra )
+	{
+		ContactEvent( other, GetPosition() );
+	}
+	
+	//Used for release
+	override void EOnContact( IEntity other, Contact extra )
+	{
+		ContactEvent( other, extra.Position );
+	}
+	
+	override void OnInventoryExit( Man player )
+	{
+		//Do not execute on simple drop as it may cause issues
+		PlayerBase player_PB = PlayerBase.Cast( player );
+		if ( player_PB && player_PB.GetThrowing().IsThrowingAnimationPlaying() )
+		{
+			if ( m_CreatureType != "" )
+				m_CaptureState = eCaptureState.RELEASE;
+			else
+				m_CaptureState = eCaptureState.CAPTURE;
+		}
+		else
+		{
+			m_CaptureState = eCaptureState.STASIS;
+		}
+		
+		//Make sure state is properly synchronized or VFX might bug out
+		SetSynchDirty();
+	}
+	
+	override void OnInventoryEnter( Man player )
+	{
+		//Make sure to stop particles once in inventory
+		if ( GetGame().IsClient() && m_ParCapture )
+		{
+			m_ParCapture.Stop();
+			m_ParCapture.Delete();
+		}
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+		
+		//DestroyEg();
+	}
+	
+	// ------------------------------
+	// CAPTURE AND RELEASE LOGIC
+	// ------------------------------
+	private void Capture( DayZCreatureAI capAnimal )
+	{
+		if ( !IsAlive() )
+		{
+			if ( m_ParCapture )
+				m_ParCapture.Delete();
+			Delete();
+			return;
+		}
+		
+		m_StoredCreature = capAnimal;
+		m_CreatureType = m_StoredCreature.GetType();
+		m_CreatureHash = m_CreatureType.Hash();
+		m_CaptureState = eCaptureState.CAPTUREFX;
+		m_DangerSound = m_StoredCreature.IsDanger();
+		m_CaptureSoundHash = m_StoredCreature.CaptureSound().Hash();
+		m_ReleaseSoundHash = m_StoredCreature.ReleaseSound().Hash();
+		
+		//Resize particle upon capture as there is enough delay to be sure value is synced 
+		ResizeParticle( capAnimal );
+		
+		SetSynchDirty();
+	
+		capAnimal.Delete();
+		SetQuantity( GetQuantityMax() );
+		SetVelocity( this, CAPTURE_VELOCITY );
+	}
+	
+	private void Release( vector pos )
+	{
+		if ( GetGame().IsServer() )
+		{
+			m_CaptureState = eCaptureState.RELEASEFX;
+			m_CreatureHash = 0;
+			SetSynchDirty();
+			
+			GetGame().CreateObject( m_CreatureType, pos, false, true );
+			m_CreatureType = "";
+			
+			DecreaseHealth( "", "", GetMaxHealth() * 0.4 );
+			SetQuantity( GetQuantityMin(), false );
+			SetVelocity( this, CAPTURE_VELOCITY );
+			
+			if ( !IsAlive() )
+			{
+				if ( m_ParCapture )
+					m_ParCapture.Delete();
+				Delete();
+			}
+		}
+	}
+	
+	// ------------------------------
+	// CAPTURE AND RELEASE EFFECTS
+	// ------------------------------
+	private void PlayVFX()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( !m_ParCapture && m_CaptureState != eCaptureState.STASIS )
+			{
+				//Ideally play a one time effect such as an explosion
+				m_ParCapture = ParticleManager.GetInstance().PlayInWorld( ParticleList.EASTER_EGG_ACTIVATE, GetPosition() );
+				
+				//Resize, -1 signifies ALL emitors
+				m_ParCapture.SetParameter( -1, EmitorParam.SIZE, m_ParScale );
+				m_ParCapture.SetWiggle( 7, 0.3 );
+			}
+		}
+	}
+	
+	private void ResizeParticle( DayZCreatureAI capAnimal )
+	{
+		//Determine particle scale depending on captured animal scale
+		vector mins, maxs;
+		capAnimal.GetWorldBounds( mins, maxs );
+		m_ParScale = vector.DistanceSq( mins, maxs );
+		
+		//Multiply to rescale down as fed values can be really large
+		m_ParScale *= PARTICLE_SCALE_MULT;
+	}
+	
+	private void PlaySFX( int releaseCase = eCaptureState.CAPTURE )
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			string soundSet = "";
+			if ( releaseCase == eCaptureState.CAPTURE )
+			{
+				PlaySoundSet( m_CaptureSound, "EasterEgg_Catch_SoundSet", 0, 0 );
+				
+				m_CreatureSoundMap.Find( m_CaptureSoundHash, soundSet );
+				PlaySoundSet( m_CreatureSound, soundSet, 0, 0 );
+			}
+			else
+			{
+				if ( !m_DangerSound )
+				{
+					PlaySoundSet( m_CaptureSound, "EasterEgg_Spawn_SoundSet", 0, 0 );
+					
+					m_CreatureSoundMap.Find( m_ReleaseSoundHash, soundSet );
+					PlaySoundSet( m_CreatureSound, soundSet, 0, 0 );
+				}
+				else
+				{
+					PlaySoundSet( m_CaptureSound, "EasterEgg_Spawn_Danger_SoundSet", 0, 0 );
+					
+					m_CreatureSoundMap.Find( m_ReleaseSoundHash, soundSet );
+					PlaySoundSet( m_CreatureSound, soundSet, 0, 0 );
+				}
+			}
+		}
+	}
+	
+	
+	override void OnVariablesSynchronized()
+	{
+		if ( m_CaptureState == eCaptureState.CAPTUREFX )
+		{
+			PlayVFX();
+			PlaySFX();
+		}
+		else if ( m_CaptureState == eCaptureState.RELEASEFX )
+		{
+			PlayVFX();
+			PlaySFX( eCaptureState.RELEASE );
+		}
+	}
+	
+	// ------------------------------
+	// SOUNDSET MAP REGISTRATION
+	// ------------------------------
+	void RegisterSoundSetMap()
+	{
+		//Register all possible creature sounds in map with their respective hash
+		string soundSet;
+		m_CreatureSoundMap = new map<int, string>;
+		
+		//Cow sounds
+		soundSet = "CattleMooA_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "CattleBellow_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		
+		//Deer sounds
+		soundSet = "DeerRoar_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "DeerBleat_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		
+		//Goat sounds
+		soundSet = "GoatBleat_A_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "GoatBleat_B_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		
+		//Hare sounds
+		soundSet = "HareChirp_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "HareSquawk_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Hen sounds
+		soundSet = "HenCluck_X_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "HenScream_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Hog sounds
+		soundSet = "HogGrunt_G_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "HogSqueal_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Sheep sounds
+		soundSet = "SheepBleat_G_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "SheepBleat_E_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Wolf sounds
+		soundSet = "WolfBark_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "WolfWhimper_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Zmb F sounds
+		soundSet = "ZmbF_Normal_CallToArmsShort_Soundset";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "ZmbF_Normal_HeavyHit_Soundset";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Zmb M sounds
+		soundSet = "ZmbM_Normal_CallToArmsShort_Soundset";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "ZmbM_Normal_HeavyHit_Soundset";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+
+		//Bear sounds
+		soundSet = "BearRoarShort_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+		soundSet = "BearSnarl_SoundSet";
+		m_CreatureSoundMap.Insert( soundSet.Hash(), soundSet );
+	}
+	
+	
+	// ------------------------------
+	// STORAGE SAVING AND LOADING 
+	// ------------------------------
+	override void OnStoreSave( ParamsWriteContext ctx )
+	{
+		super.OnStoreSave( ctx );
+		
+		ctx.Write( m_CaptureState );
+		ctx.Write( m_CreatureType );
+		ctx.Write( m_ParScale );
+		ctx.Write( m_DangerSound );
+		ctx.Write( m_CaptureSoundHash );
+		ctx.Write( m_ReleaseSoundHash );
+	}
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if ( !super.OnStoreLoad( ctx, version ) )
+			return false;
+		
+		if ( !ctx.Read( m_CaptureState ) )
+			return false;
+		
+		if ( !ctx.Read( m_CreatureType ) )
+			return false;
+		
+		if ( !ctx.Read( m_ParScale ) )
+			return false;
+		
+		if ( !ctx.Read( m_DangerSound ) )
+			return false;
+		
+		if ( !ctx.Read( m_CaptureSoundHash ) )
+			return false;
+		
+		if ( !ctx.Read( m_ReleaseSoundHash ) )
+			return false;
+		
+		return true;
+	}
+	
+	//Protection against dupers  during 1.12
+	private void DestroyEg()
+	{
+		Delete();
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Consumables/consumables.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Consumables/consumables.c
new file mode 100644
index 0000000000000000000000000000000000000000..dfa741e595a6d1f3bea5f41da032f57ac4ec5df9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Consumables/consumables.c
@@ -0,0 +1,199 @@
+class Bait: ItemBase {};
+class Bandana_ColorBase: Clothing
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBandageTarget);
+		AddAction(ActionBandageSelf);
+		AddAction(ActionWringClothes);
+	}
+	
+	void Bandana_ColorBase()
+	{
+
+	}
+		
+	override bool CanBeDisinfected()
+	{
+		return true;
+	}
+	
+	override float GetBandagingEffectivity()
+	{
+		return 0.5;
+	};
+	
+	override float GetInfectionChance(int system = 0, Param param = null)
+	{
+		if(m_Cleanness == 1)
+		{
+			return 0.00;
+		}
+		else
+		{
+			return 0.15;
+		}
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		switch (slotId)
+		{
+			case InventorySlots.HEADGEAR:
+				return ret;//no discernable conflict here
+			break;
+			
+			default:
+				ret.Insert(EAttExclusions.EXCLUSION_MASK_3);
+				
+				ret.Insert(EAttExclusions.SHAVING_MASK_ATT_0);
+			break;
+		}
+		return ret;
+	}
+};
+class Bandana_RedPattern: Bandana_ColorBase {};
+class Bandana_BlackPattern: Bandana_ColorBase {};
+class Bandana_PolkaPattern: Bandana_ColorBase {};
+class Bandana_Greenpattern: Bandana_ColorBase {};
+class Bandana_CamoPattern: Bandana_ColorBase {};
+class Bandana_Blue: Bandana_ColorBase {};
+class Bandana_Pink: Bandana_ColorBase {};
+class Bandana_Yellow: Bandana_ColorBase {};
+
+class BatteryD: ItemBase {};
+class Bone: ItemBase 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCraftBoneKnife);
+		AddAction(ActionCraftBoneKnifeEnv);
+	}
+};
+class BoneBait: ItemBase {};
+class BoneHook:  ItemBase {};
+class BurlapStrip: ItemBase {};
+class ButaneCanister: ItemBase {};
+class DuctTape: ItemBase 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRepairTent);
+		AddAction(ActionRepairShelter);
+		//AddAction(ActionRepairPart);
+		AddAction(ActionRestrainTarget);
+		AddAction(ActionRestrainSelf);
+	}
+};
+class Flashbang: ItemBase {};
+class Hook:  ItemBase {};
+class LargeGasCanister: ItemBase
+{
+	override bool CanSwitchDuringAttach(EntityAI parent)
+	{
+		return true;
+	}
+	
+	override string GetDestructionBehaviour()
+    {
+        return "DestructionEffectGasCanister";
+    }
+ 
+    override bool IsDestructionBehaviour()
+    {	
+		
+		if (GetQuantity() > 0)
+		{
+			return true;
+		}
+		        
+		else
+		{
+			return false;
+		}
+    }
+};
+
+class MediumGasCanister: ItemBase
+{
+	override bool CanSwitchDuringAttach(EntityAI parent)
+	{
+		return true;
+	}
+	
+	override string GetDestructionBehaviour()
+    {
+        return "DestructionEffectGasCanister";
+    }
+ 
+    override bool IsDestructionBehaviour()
+    {	
+		
+		if (GetQuantity() > 0)
+		{
+			return true;
+		}
+		        
+		else
+		{
+			return false;
+		}
+    }
+};
+
+class NailBox: Box_Base {};
+class Netting: ItemBase {};
+class SmallGasCanister: ItemBase
+{
+	override bool CanSwitchDuringAttach(EntityAI parent)
+	{
+		return true;
+	}
+	
+	override string GetDestructionBehaviour()
+    {
+        return "DestructionEffectGasCanister";
+    }
+ 
+    override bool IsDestructionBehaviour()
+    {	
+		
+		if (GetQuantity() > 0)
+		{
+			return true;
+		}
+		        
+		else
+		{
+			return false;
+		}
+    }
+};
+class SmallStone: ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCraftStoneKnifeEnv);
+	}
+};
+class Spraycan_ColorBase: ItemBase {};
+class Spraycan_Black: Spraycan_ColorBase {};
+class Spraycan_Green: Spraycan_ColorBase {};
+class TannedLeather: ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachToConstruction);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Containers/containers.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Containers/containers.c
new file mode 100644
index 0000000000000000000000000000000000000000..eeb8dde0401e782d279b6ce387443ceef3218c4b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Containers/containers.c
@@ -0,0 +1,76 @@
+class AmmoBox : Container_Base 
+{
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+		
+		if (parent && parent.IsKindOf("WaterproofBag_ColorBase"))
+			return false;
+
+		return true;
+	}
+}
+
+class FirstAidKit : Container_Base 
+{
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+}
+
+class PlateCarrierPouches : Container_Base
+{
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+		
+		if (parent && parent.IsKindOf("AmmoBox"))
+			return false;
+		
+		if (parent && parent.IsKindOf("PlateCarrierPouches"))
+			return false;
+
+		return true;
+	}
+
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if (!super.CanReceiveItemIntoCargo(item))
+			return false;
+		
+		if (GetInventory().IsAttachment())
+		{
+			return !GetHierarchyParent().GetInventory().IsInCargo() && (!item.GetInventory().GetCargo() || (item.GetInventory().GetCargo().GetItemCount() == 0 || item.IsContainer()));
+		}
+		
+		return !item.GetInventory().GetCargo() || (item.GetInventory().GetCargo().GetItemCount() == 0 || item.IsContainer());
+	}
+	
+	override bool CanLoadItemIntoCargo( EntityAI item )
+	{
+		if (!super.CanLoadItemIntoCargo(item))
+			return false;
+		
+		return !item.GetInventory().GetCargo() || (item.GetInventory().GetCargo().GetItemCount() == 0 || item.IsContainer());
+	}
+}
+
+class Refrigerator : WorldContainer_Base {};
+class RefrigeratorMinsk : WorldContainer_Base {};
+class SmallProtectorCase : Container_Base 
+{
+	override int GetDamageSystemVersionChange()
+	{
+		return 110;
+	}
+}
+
+class TrashCan : WorldContainer_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Crafting/crafting.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Crafting/crafting.c
new file mode 100644
index 0000000000000000000000000000000000000000..3bbd8a8eae2c5b612f69450660d13965c49de409
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Crafting/crafting.c
@@ -0,0 +1,116 @@
+class BurlapSack: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionCoverHeadTarget);
+		AddAction(ActionCoverHeadSelf);
+	}
+};
+class GorkaHelmetVisor: Inventory_Base
+{
+	override protected void InitGlobalExclusionValues()
+	{
+		super.InitGlobalExclusionValues();
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.EXCLUSION_MASK_2);
+		
+		AddSingleExclusionValueGlobal(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+	}
+};
+
+class ChickenFeather: Inventory_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionCraftBoltsFeather);
+	}
+};
+
+class LongWoodenStick: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionBreakLongWoodenStick);
+		AddAction(ActionAttachToConstruction);
+	}
+};
+
+class SharpWoodenStick: LongWoodenStick
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionCookOnStick);
+	}
+}
+
+class Rope: Inventory_Base
+{
+	ref InventoryLocation m_TargetLocation = new InventoryLocation;
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRestrainTarget);
+		AddAction(ActionCraftRopeBelt);
+		AddAction(ActionRestrainSelf);
+	}
+	
+	InventoryLocation GetTargetLocation()
+	{
+		return m_TargetLocation;
+	}
+	
+	void SetTargetLocation(InventoryLocation targetLocation)
+	{
+		m_TargetLocation.CopyLocationFrom(targetLocation, true);
+	}
+	
+	override bool CanAssignToQuickbar()
+	{
+		return (!GetInventory().IsAttachment());
+	}
+};
+
+class Spear : Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		
+	}
+};
+
+class SpearStone : Spear
+{
+
+};
+
+class SpearBone : Spear
+{
+
+};
+
+class Fabric : Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRepairTentPart);
+		AddAction(ActionAttachToConstruction);
+		AddAction(ActionRepairCarChassis);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Cultivation/cultivation.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Cultivation/cultivation.c
new file mode 100644
index 0000000000000000000000000000000000000000..a2a24395fb2ffc97616a6e01da2e5d77e35a20d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Cultivation/cultivation.c
@@ -0,0 +1,63 @@
+class AntiPestsSpray: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDisinfectPlantBit);
+		AddAction(ActionDisinfectPlant);
+		AddAction(ActionForceDrink);
+		AddAction(ActionDrink);
+	}
+};
+class CannabisSeeds : SeedBase{};
+class PepperSeeds : SeedBase{};
+class Plant_Cannabis : PlantBase {};
+class Plant_Pepper : PlantBase
+{
+	void Plant_Pepper()
+	{
+		m_FullMaturityTime = 2250;
+	}
+};
+class Plant_Potato : PlantBase
+{
+	void Plant_Potato()
+	{
+		m_FullMaturityTime = 2850;
+	}
+};
+class Plant_Pumpkin : PlantBase
+{
+	void Plant_Pumpkin()
+	{
+		m_FullMaturityTime = 2850;
+	}
+};
+class Plant_Tomato : PlantBase
+{
+	void Plant_Tomato()
+	{
+		m_FullMaturityTime = 1650;
+	}
+};
+class Plant_Zucchini : PlantBase
+{
+	void Plant_Zucchini()
+	{
+		m_FullMaturityTime = 1350;
+	}
+};
+class PumpkinSeeds : SeedBase{};
+class SeedBase : Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionPlantSeed);
+	}
+};
+class TomatoSeeds : SeedBase{};
+class ZucchiniSeeds : SeedBase{};
+class PotatoSeed : SeedBase{};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/SodaCan_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/SodaCan_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..56c35c5032d45cdb2942682ecdb5d5897ac95f57
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/SodaCan_ColorBase.c
@@ -0,0 +1,10 @@
+class SodaCan_ColorBase : Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceDrink);
+		AddAction(ActionDrinkCan);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/Vodka.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/Vodka.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f4282b01a86b0c9665390054921e11bc73282e3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/Vodka.c
@@ -0,0 +1 @@
+class Vodka: Bottle_Base {}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/WaterPouch_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/WaterPouch_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..9c71f25b0ddd047bdeb9fb3832a3e2f0194414a3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Drinks/WaterPouch_ColorBase.c
@@ -0,0 +1 @@
+class WaterPouch_ColorBase: Bottle_Base{};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/BakedBeansCan_Opened.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/BakedBeansCan_Opened.c
new file mode 100644
index 0000000000000000000000000000000000000000..a05291f7a16eb49dd8415e24c86335ddc4a6efc8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/BakedBeansCan_Opened.c
@@ -0,0 +1,20 @@
+class BakedBeansCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !(GetAgents() & eAgents.FOOD_POISON);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedCan);
+		AddAction(ActionEatCan);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/CannedFood.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/CannedFood.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f07dfdd1993586b8e9be55be2f5cadfc9823063
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/CannedFood.c
@@ -0,0 +1,332 @@
+//-------------Animal food-----------------------------------------------
+class DogFoodCan : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("DogFoodCan_Opened");
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class DogFoodCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+};
+
+class CatFoodCan: DogFoodCan
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("CatFoodCan_Opened");
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class CatFoodCan_Opened: DogFoodCan_Opened
+{
+
+};
+
+//-------------PorkCan-----------------------------------------------
+class PorkCan : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("PorkCan_Opened");
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class PorkCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+};
+
+//-------------Lunchmeat-----------------------------------------------
+class Lunchmeat : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("Lunchmeat_Opened");
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class Lunchmeat_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+};
+
+//-------------Unknown Food-----------------------------------------------
+class UnknownFoodCan : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("UnknownFoodCan_Opened");
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class UnknownFoodCan_Opened: Edible_Base
+{
+	void UnknownFoodCan_Opened()
+	{
+		InsertAgent(eAgents.FOOD_POISON, 1);
+	}
+	
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+};
+
+//-------------Pajka-----------------------------------------------
+class Pajka : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("Pajka_Opened");
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class Pajka_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+};
+
+//-------------Pate-----------------------------------------------
+class Pate : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("Pate_Opened");
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class Pate_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+};
+
+//-------------BrisketSpread-----------------------------------------------
+class BrisketSpread : Edible_Base
+{
+	override void Open()
+	{
+		//super.Open();
+		ReplaceEdibleWithNew("BrisketSpread_Opened");
+	}
+		
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionOpen);
+	}
+	
+	override bool IsOpen()
+	{
+		return false;
+	}
+}
+
+class BrisketSpread_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !( GetAgents() & eAgents.FOOD_POISON );
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmallCan);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/Marmalade.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/Marmalade.c
new file mode 100644
index 0000000000000000000000000000000000000000..807855ea1501f0c4277e9c5011eae2e4c3a8bfc1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/Marmalade.c
@@ -0,0 +1,10 @@
+class Marmalade: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatBig);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/MushroomBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/MushroomBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6c9a5e37e0829d3cc7da54ed5b865b82c5573d18
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/MushroomBase.c
@@ -0,0 +1,46 @@
+class MushroomBase : Edible_Base
+{
+	override bool CanBeCookedOnStick()
+	{
+		return true;
+	}
+
+	override bool CanBeCooked()
+	{
+		return true;
+	}	
+	
+	override bool IsMushroom()
+	{
+		return true;
+	}
+
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEat);
+	}
+	
+	override void EEOnCECreate()
+	{
+		int rand = Math.RandomInt(0,10);
+		
+		if ( rand > 6 )
+		{
+			ChangeFoodStage( FoodStageType.ROTTEN );
+			SetHealth( "", "", GetMaxHealth()*0.1 );
+		}
+		else if ( rand > 2 )
+		{
+			ChangeFoodStage( FoodStageType.DRIED );
+			SetHealth( "", "", GetMaxHealth()*0.4 );
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PackagedFood.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PackagedFood.c
new file mode 100644
index 0000000000000000000000000000000000000000..9d833bbe2fd39258ac6279d44ed07d2dfe14bf6b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PackagedFood.c
@@ -0,0 +1,32 @@
+class Honey: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmall);
+	}
+};
+
+class Zagorky_ColorBase: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmall);
+	}
+};
+
+class Snack_ColorBase: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedSmall);
+		AddAction(ActionEatSmall);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PeachesCan_Opened.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PeachesCan_Opened.c
new file mode 100644
index 0000000000000000000000000000000000000000..764f31dd6671c8224efb7ffbb47370c7997816a2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PeachesCan_Opened.c
@@ -0,0 +1,20 @@
+class PeachesCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !(GetAgents() & eAgents.FOOD_POISON);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedCan);
+		AddAction(ActionEatCan);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PowderedMilk.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PowderedMilk.c
new file mode 100644
index 0000000000000000000000000000000000000000..416e2f145231a3c39c5e3c76d4792b0118089017
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/PowderedMilk.c
@@ -0,0 +1,10 @@
+class PowderedMilk: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatBig);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/Rice.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/Rice.c
new file mode 100644
index 0000000000000000000000000000000000000000..dbdcc727233ca51ea856b6e51eb46201856cf3b4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/Rice.c
@@ -0,0 +1,10 @@
+class Rice: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeed);
+		AddAction(ActionEatBig);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/SardinesCan_Opened.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/SardinesCan_Opened.c
new file mode 100644
index 0000000000000000000000000000000000000000..31bf48b85e6aaa2fbbde2f3322c2fe1f0c517e36
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/SardinesCan_Opened.c
@@ -0,0 +1,20 @@
+class SardinesCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !(GetAgents() & eAgents.FOOD_POISON);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedCan);
+		AddAction(ActionEatCan);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/SpaghettiCan_Opened.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/SpaghettiCan_Opened.c
new file mode 100644
index 0000000000000000000000000000000000000000..ef77c32834810b59e08c9a7fcfacf0cc99d4f464
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/SpaghettiCan_Opened.c
@@ -0,0 +1,20 @@
+class SpaghettiCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !(GetAgents() & eAgents.FOOD_POISON);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedCan);
+		AddAction(ActionEatCan);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/TacticalBaconCan_Opened.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/TacticalBaconCan_Opened.c
new file mode 100644
index 0000000000000000000000000000000000000000..999dcaa2013f3591329b059bb69f3b220a4fc43d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/TacticalBaconCan_Opened.c
@@ -0,0 +1,10 @@
+class TacticalBaconCan_Opened: Edible_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedCan);
+		AddAction(ActionEatCan);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/TunaCan_Opened.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/TunaCan_Opened.c
new file mode 100644
index 0000000000000000000000000000000000000000..ea827080f7225b52c7bd6d023965df68d1a265d4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Food/TunaCan_Opened.c
@@ -0,0 +1,20 @@
+class TunaCan_Opened: Edible_Base
+{
+	override bool CanDecay()
+	{
+		return true;
+	}
+	
+	override bool CanProcessDecay()
+	{
+		return !(GetAgents() & eAgents.FOOD_POISON);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionForceFeedCan);
+		AddAction(ActionEatCan);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/AntiChemInjector.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/AntiChemInjector.c
new file mode 100644
index 0000000000000000000000000000000000000000..45c48d2eed9c8c39eb92be2ab174b39060ac2d2d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/AntiChemInjector.c
@@ -0,0 +1,28 @@
+class AntiChemInjector: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionInjectTarget);
+		AddAction(ActionInjectSelf);
+	}
+	
+	override void OnApply(PlayerBase player)
+	{
+		if (!player)
+			return;
+		player.GiveShock(100);
+		bool in_cont_stage3 = player.GetModifiersManager().IsModifierActive(eModifiers.MDF_CONTAMINATION3);
+		
+		if ( in_cont_stage3 )
+		{
+			player.m_AgentPool.SetAgentCount(eAgents.CHEMICAL_POISON, ContaminationStage2Mdfr.AGENT_THRESHOLD_ACTIVATE);//set the agent count to be the same as at the benigning of stage 2
+		}
+		else
+		{
+			player.m_AgentPool.SetAgentCount(eAgents.CHEMICAL_POISON, 0);
+		}
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/BloodTestKit.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/BloodTestKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..66f0159aba56368d55d0b4cdf0d69cd9e37c05c6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/BloodTestKit.c
@@ -0,0 +1,10 @@
+class BloodTestKit: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTestBloodTarget);
+		AddAction(ActionTestBloodSelf);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/CigarettePack_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/CigarettePack_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b6214faeb635d2fd7594e8b70430cc88835f8165
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/CigarettePack_ColorBase.c
@@ -0,0 +1,4 @@
+class CigarettePack_ColorBase: Inventory_Base {};
+class CigarettePack_Chernamorka: CigarettePack_ColorBase {};
+class CigarettePack_Merkur: CigarettePack_ColorBase {};
+class CigarettePack_Partyzanka: CigarettePack_ColorBase {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/ClearSyringe.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/ClearSyringe.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc7a5ab6c122e4c0876f9efc0a4b456c5bda4a9b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/ClearSyringe.c
@@ -0,0 +1 @@
+class ClearSyringe: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/DisinfectantAlcohol.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/DisinfectantAlcohol.c
new file mode 100644
index 0000000000000000000000000000000000000000..67ae09506da4726c70c273eaebff786300c9239c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/DisinfectantAlcohol.c
@@ -0,0 +1,25 @@
+class DisinfectantAlcohol: Edible_Base
+{
+	
+	override void InitItemVariables()
+	{
+		super.InitItemVariables();
+		can_this_be_combined = true;
+	}
+	
+	override float GetDisinfectQuantity(int system = 0, Param param1 = null)
+	{
+		return (GetQuantityMax() * 0.1);
+	}
+	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDisinfectTarget);
+		AddAction(ActionDisinfectSelf);
+		AddAction(ActionFillGeneratorTank);
+		AddAction(ActionWashHandsItemContinuous);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Epinephrine.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Epinephrine.c
new file mode 100644
index 0000000000000000000000000000000000000000..c5292920652c47603bd1014f06985a579e73bb1d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Epinephrine.c
@@ -0,0 +1,21 @@
+class Epinephrine: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionInjectEpinephrineTarget);
+		AddAction(ActionInjectEpinephrineSelf);
+	}
+	
+	override void OnApply(PlayerBase player)
+	{
+		if (!player)
+			return;
+		if( player.GetModifiersManager().IsModifierActive(eModifiers.MDF_EPINEPHRINE ) )//effectively resets the timer
+		{
+			player.GetModifiersManager().DeactivateModifier( eModifiers.MDF_EPINEPHRINE );
+		}
+		player.GetModifiersManager().ActivateModifier( eModifiers.MDF_EPINEPHRINE );
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/InjectionVial.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/InjectionVial.c
new file mode 100644
index 0000000000000000000000000000000000000000..8419eaa27d60166ef0ae335651a2a02145290fd7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/InjectionVial.c
@@ -0,0 +1 @@
+class InjectionVial: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/IodineTincture.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/IodineTincture.c
new file mode 100644
index 0000000000000000000000000000000000000000..027af37977145b29987c2e1bb6e533b9e191a410
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/IodineTincture.c
@@ -0,0 +1,23 @@
+class IodineTincture : Edible_Base
+{
+	
+	override void InitItemVariables()
+	{
+		super.InitItemVariables();
+		can_this_be_combined = true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDisinfectTarget);
+		AddAction(ActionDisinfectSelf);;
+		AddAction(ActionWashHandsItemContinuous);
+	}
+	
+	override float GetDisinfectQuantity(int system = 0, Param param1 = null)
+	{
+		return (GetQuantityMax() * 0.05);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Morphine.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Morphine.c
new file mode 100644
index 0000000000000000000000000000000000000000..5da3df84d7cab33b64d38050a4c51c839707286d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Morphine.c
@@ -0,0 +1,21 @@
+class Morphine: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionInjectMorphineTarget);
+		AddAction(ActionInjectMorphineSelf);
+	}
+	
+	override void OnApply(PlayerBase player)
+	{
+		if (!player)
+			return;
+		if( player.GetModifiersManager().IsModifierActive(eModifiers.MDF_MORPHINE ) )//effectively resets the timer
+		{
+			player.GetModifiersManager().DeactivateModifier( eModifiers.MDF_MORPHINE );
+		}
+		player.GetModifiersManager().ActivateModifier( eModifiers.MDF_MORPHINE );
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/SalineBag.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/SalineBag.c
new file mode 100644
index 0000000000000000000000000000000000000000..120b979369c605cfbe92360bbfa3698997e9ff3b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/SalineBag.c
@@ -0,0 +1 @@
+class SalineBag: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/SalineBagIV.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/SalineBagIV.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c27ff8e232da0fcde7047c4c60826cce9d9d3f1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/SalineBagIV.c
@@ -0,0 +1,10 @@
+class SalineBagIV: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionGiveSalineTarget);
+		AddAction(ActionGiveSalineSelf);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Splint.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Splint.c
new file mode 100644
index 0000000000000000000000000000000000000000..c0e5fcaa8f1c18dd6242093d1ae9782801b6e2e0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/Splint.c
@@ -0,0 +1,18 @@
+class Splint: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionSplintTarget);
+		AddAction(ActionSplintSelf);
+	}
+};
+
+class Splint_Applied: Clothing
+{
+	void ~Splint_Applied()
+	{
+		
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/StartKitIV.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/StartKitIV.c
new file mode 100644
index 0000000000000000000000000000000000000000..a08d793b43464ab8aad3ec0bad69876f8b100d9a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Medical/StartKitIV.c
@@ -0,0 +1 @@
+class StartKitIV: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Navigation/GPSReceiver.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Navigation/GPSReceiver.c
new file mode 100644
index 0000000000000000000000000000000000000000..76c286524ded141944373635248c65afbcfca504
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Navigation/GPSReceiver.c
@@ -0,0 +1,183 @@
+class GPSReceiver : ItemGPS
+{
+
+	const string DISPLAY_TEXTURE_PATH_FORMAT 	= "dz\\gear\\navigation\\data\\GPS_%1_ca.paa";
+	const string ANIM_PHASE_DISPLAY_HIDE 		= "DisplayState";
+
+	protected ref set<string> 		m_DisplayGridSelections;
+	protected ref set<string> 		m_DisplayAltSelections;
+	protected ref map<int, string> 	m_DisplayNumericSignTextureMap;
+	
+	//! cache
+	protected ref array<int> 		m_OrderedPositionNumbersLast;
+	protected ref array<int> 		m_AltitudeNumbersLast;
+	
+	void GPSReceiver()
+	{
+		m_OrderedPositionNumbersLast 	= new array<int>;
+		m_AltitudeNumbersLast 			= new array<int>;
+		
+		int i;
+		for (i = 0; i < MapNavigationBehaviour.DISPLAY_GRID_POS_MAX_CHARS_COUNT * 2; ++i)
+		{
+			m_OrderedPositionNumbersLast.Insert(0);
+		}
+		
+		for (i = 0; i < MapNavigationBehaviour.DISPLAY_ALT_MAX_CHARS_COUNT; ++i)
+		{
+			m_AltitudeNumbersLast.Insert(0);
+		}	
+		
+		m_DisplayGridSelections = new set<string>();
+		m_DisplayGridSelections.Insert("grid_1_0");
+		m_DisplayGridSelections.Insert("grid_1_1");
+		m_DisplayGridSelections.Insert("grid_1_2");
+		m_DisplayGridSelections.Insert("grid_2_0");
+		m_DisplayGridSelections.Insert("grid_2_1");
+		m_DisplayGridSelections.Insert("grid_2_2");
+		
+		m_DisplayAltSelections = new set<string>();
+		m_DisplayAltSelections.Insert("alt_0");
+		m_DisplayAltSelections.Insert("alt_1");
+		m_DisplayAltSelections.Insert("alt_2");
+		m_DisplayAltSelections.Insert("alt_3");
+		
+		m_DisplayNumericSignTextureMap = new map<int, string>();
+		for (i = -1; i < 11; i++)
+		{
+			
+			string texturePath = string.Format(DISPLAY_TEXTURE_PATH_FORMAT, i);
+			
+			//! translate numerical -1 to `-` texture
+			if (i == -1)
+			{
+				texturePath = string.Format(DISPLAY_TEXTURE_PATH_FORMAT, "dash");
+			}
+
+			m_DisplayNumericSignTextureMap.Insert(i, texturePath);
+		}
+	}
+	
+	protected void PositionalUpdate()
+	{
+		UpdateDisplayPosition();
+		UpdateDisplayElevation();
+	}
+	
+	//! need to be overriden, otherwise the item will be turned off when moved to cargo
+	override void OnMovedInsideCargo(EntityAI container);
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnWhileInHands);
+		AddAction(ActionTurnOffWhileInHands);
+	}
+	
+	override bool IsTurnedOn()
+	{
+		return GetCompEM() && GetCompEM().IsWorking();
+	}
+	
+	//------------------------------------------------------------------------------
+	override void OnWorkStart()
+	{
+		UpdateDisplayState(true);
+		
+		if (GetHierarchyRoot())
+		{
+			PlayerBase pb = PlayerBase.Cast(GetHierarchyRoot());
+			if (pb)
+			{
+				pb.MapNavigationItemInPossession(this);
+			}
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		UpdateDisplayState(false);
+
+		if (GetHierarchyRoot())
+		{
+			PlayerBase pb = PlayerBase.Cast(GetHierarchyRoot());
+			if (pb)
+			{
+				pb.MapNavigationItemNotInPossession(this);
+			}
+		}
+	}
+	
+	override void OnWork(float consumed_energy)
+	{
+		PositionalUpdate();
+	}
+	//------------------------------------------------------------------------------
+	
+	protected void UpdateDisplayState(bool pIsTurnedOn)
+	{
+		SetAnimationPhaseNow(ANIM_PHASE_DISPLAY_HIDE, !pIsTurnedOn);
+	}
+	
+	protected void UpdateDisplayPosition()
+	{
+		int selectionIndex;
+		string selectionName;
+		array<int> orderedPositionNumbers = MapNavigationBehaviour.OrderedPositionNumbersFromGridCoords(this);
+		
+		if (orderedPositionNumbers.DifferentAtPosition(m_OrderedPositionNumbersLast) != INDEX_NOT_FOUND)
+		{
+			for (int i = 0; i < m_DisplayGridSelections.Count(); ++i)
+			{
+				selectionName 	= m_DisplayGridSelections.Get(i);
+				selectionIndex 	= GetHiddenSelection(selectionName);
+				SetObjectTexture(selectionIndex, m_DisplayNumericSignTextureMap.Get(orderedPositionNumbers.Get(i)));
+			}
+			
+			m_OrderedPositionNumbersLast = orderedPositionNumbers;
+		}
+	}
+	
+	protected void UpdateDisplayElevation()
+	{
+		int selectionIndex;
+		string selectionName;
+		array<int> altitudeNumbers = MapNavigationBehaviour.OrderedAltitudeNumbersPosition(this);
+
+		if (altitudeNumbers.DifferentAtPosition(m_AltitudeNumbersLast) != INDEX_NOT_FOUND)
+		{
+			for (int i = 0; i < m_DisplayAltSelections.Count(); ++i)
+			{
+				selectionName 	= m_DisplayAltSelections.Get(i);
+				selectionIndex 	= GetHiddenSelection(selectionName);
+				SetObjectTexture(selectionIndex, m_DisplayNumericSignTextureMap.Get(altitudeNumbers.Get(i)));
+			}
+
+			m_AltitudeNumbersLast = altitudeNumbers;
+		}
+	}
+	
+	protected int GetHiddenSelection(string selection)
+	{	
+		int idx = GetHiddenSelectionIndex(selection);
+
+		if (idx != INDEX_NOT_FOUND)
+		{
+			return idx;
+		}
+		else
+		{
+			return 0;
+		}
+	}
+
+	//================================================================
+	// DEBUG
+	//================================================================
+			
+	override void OnDebugSpawn()
+	{
+		Battery9V.Cast(GetInventory().CreateInInventory("Battery9V"));
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Navigation/OrienteeringCompass.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Navigation/OrienteeringCompass.c
new file mode 100644
index 0000000000000000000000000000000000000000..a4e9b009b19005290eb89c117c110a8bae114d19
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Navigation/OrienteeringCompass.c
@@ -0,0 +1 @@
+class OrienteeringCompass: ItemCompass {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Optics/Binoculars.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Optics/Binoculars.c
new file mode 100644
index 0000000000000000000000000000000000000000..b5094b0f9543597e8d7b50ae6b97b4b4d5ade09b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Optics/Binoculars.c
@@ -0,0 +1,10 @@
+class Binoculars: ItemOptics
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionViewOptics);
+		AddAction(ActionViewBinoculars);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/AlarmClock.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/AlarmClock.c
new file mode 100644
index 0000000000000000000000000000000000000000..9ed00b1bfd73909abe2528403bd090863a037ffc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/AlarmClock.c
@@ -0,0 +1,207 @@
+class AlarmClock_ColorBase: ClockBase
+{
+	const string		RINGING_SOUND 				= "AlarmClock_Ring_Loop_SoundSet";
+	const string		TURN_TOGGLE_SOUND 			= "AlarmClock_Turn_Off_SoundSet";
+	const string		DESTROYED_SOUND 			= "AlarmClock_Destroyed_SoundSet";
+	const string		HIT_SOUND 					= "AlarmClock_Hit_SoundSet";
+
+	
+	static ref NoiseParams 	m_NoisePar;
+	static NoiseSystem		m_NoiseSystem;
+	
+	override void Init()
+	{
+		super.Init();
+		if ( GetGame().IsServer() )
+		{
+			m_NoiseSystem = GetGame().GetNoiseSystem();
+			if ( m_NoiseSystem && !m_NoisePar )
+			{
+				// Create and load noise parameters
+				m_NoisePar = new NoiseParams;
+				m_NoisePar.LoadFromPath("cfgVehicles " + GetType() + " NoiseAlarmClock");
+			}
+		}
+	}
+
+	void ~AlarmClock_ColorBase()
+	{
+		#ifndef SERVER
+		OnRingingStopClient();
+		#endif
+	}
+	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionSetAlarmClock);
+		AddAction(ActionTurnOnAlarmClock);
+		AddAction(ActionTurnOffAlarmClock);
+	}
+
+	override string GetToggleSound()
+	{
+		return TURN_TOGGLE_SOUND;
+	}
+	
+	override string GetRingingSound()
+	{
+		return RINGING_SOUND;
+	}
+	
+	override string GetDestroyedSound()
+	{
+		return DESTROYED_SOUND;
+	}
+	
+	override string GetHitSound()
+	{
+		return HIT_SOUND;
+	}
+
+	override string GetExplosiveTriggerSlotName()
+	{
+		return "TriggerAlarmClock";
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ACTIVATE_ENTITY, "SetAlarmAhead1Min", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.ACTIVATE_ENTITY)
+			{
+				SetAlarmInXMins(1);
+			}
+			
+		}
+		return false;
+	}
+
+	override string GetDebugText()
+	{
+		string debug_output;
+		
+		if( GetGame().IsDedicatedServer())
+		{
+			debug_output = "alarm in: " + GetAlarmInMin().ToString() + " mins" + "\n";
+			debug_output +=  "current state: " +  typename.EnumToString(EAlarmClockState, m_State) + "\n";;
+			debug_output +=  "ringing for " + m_RingingDuration.ToString()+ " secs" + "\n";
+			debug_output +=  "ringing max " + GetRingingDurationMax().ToString()+ " secs" + "\n";
+		}
+		else
+		{
+			debug_output = "this is client";
+		}
+		return debug_output;
+	}
+	
+	void OnUpdate()
+	{
+		if ( IsAlarmOn() )
+		{
+			//due to variable server time flow(day-night time accel), it's not possible to simply set a timer for X secs without some convoluted math/code, so we need to check at regular intervals
+			int alarm_hand_in_minutes = ConvertAlarmHand01ToMins12h(m_AlarmTime01);
+		
+			int pass, hour, minute;
+			GetGame().GetWorld().GetDate(pass, pass, pass, hour, minute);
+			
+			int curr_time_in_minutes = ConvertTimeToMins12h(hour, minute);
+			
+			//Print(GetAlarmInMin());
+			
+			if ( alarm_hand_in_minutes == curr_time_in_minutes )
+			{
+				MakeRingingStart();
+			}
+		}
+		
+		if ( IsRinging())
+		{
+			m_RingingDuration += UPDATE_TICK_RATE;
+			
+			if (m_RingingDuration >= GetRingingDurationMax())
+			{
+				TurnOff();
+			}
+			else if ( m_NoiseSystem )
+			{
+				m_NoiseSystem.AddNoiseTarget( GetPosition(), UPDATE_TICK_RATE, m_NoisePar);
+			}
+		}
+	}
+
+	protected void AnimateAlarmHand(float value)
+	{
+		SetAnimationPhaseNow("ClockAlarm", value);
+	}
+
+	
+	override bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+		
+		if (version < 126)
+		{
+			return true;
+		}
+
+		EAlarmClockState state;		
+		
+		if ( !ctx.Read( state ) )
+		{
+			return false;
+		}
+
+		float time;
+		
+		if ( !ctx.Read( time ) )
+		{
+			return false;
+		}
+
+		SetAlarmTimeServer(time);
+		SetState(state);
+		if ( state == EAlarmClockState.SET )
+		{
+			TurnOn();
+		}
+		else if (state == EAlarmClockState.RINGING )
+		{
+			MakeRingingStart();
+		}
+		
+		return true;
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		ctx.Write(m_State);
+		ctx.Write(m_AlarmTime01);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		TurnOn();
+		MakeRingingStart();
+	}
+
+};
+	
+class AlarmClock_Red : AlarmClock_ColorBase {};
+class AlarmClock_Blue : AlarmClock_ColorBase {};
+class AlarmClock_Green : AlarmClock_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Broom.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Broom.c
new file mode 100644
index 0000000000000000000000000000000000000000..e5f860cfd5c4bb1451e497accf4a00a9e1e88b51
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Broom.c
@@ -0,0 +1,147 @@
+class BroomBase : FlammableBase
+{
+	override void Init()
+	{
+		super.Init();
+		m_DecraftResult = "LongWoodenStick";
+		m_ParticleLocalPos = Vector(0, 1.2, 0);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionBreakLongWoodenStick);
+	}
+	
+	override bool CanReceiveUpgrade()
+	{
+		return false;
+	}
+	
+	override void OnWorkStart()
+	{
+		super.OnWorkStart();
+		CalculateQuantity();
+	}
+	
+	override void ApplyResultModifications(ItemBase result)
+	{
+		result.SetHealth(result.GetHealthLevelValue(2,""));
+		result.SetQuantity(1);
+	}
+	
+	override bool CanTransformIntoStick()
+	{
+		if ( GetGame().IsServer() && !IsIgnited() && GetEnergy() < 1 && !IsSetForDeletion())
+			return true;
+		else
+			return false;
+	}
+	
+	
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		
+		GetCompEM().SetEnergy0To1(GetHealth01("",""));
+	}
+	
+	
+	override void CalculateQuantity()
+	{
+		if (GetGame().IsServer())
+		{
+			float currentHealth01 = GetHealth01();
+			float currentEnergy01 = GetCompEM().GetEnergy0To1();
+		
+			//Health needs to copy internal energy, but only if that means it will be going down from its current value(the item can't heal itself after obtaining damage just because it has full internal energy)
+			SetHealth01("","",Math.Min(currentHealth01,currentEnergy01));
+			//Energy needs to copy health, but only if it is higher(in 01 terms) than health, that means if an item with full energy gets damaged and lit, the internal energy needs to be adjusted to follow the health. Situations where internal energy is lower than health are handled on the line above
+			GetCompEM().SetEnergy0To1(GetHealth01());
+		}
+	}
+	
+	override void UpdateParticle()
+	{
+		float normalizedQuant = GetQuantity() / GetQuantityMax();
+
+		if (!m_FireParticle)
+		{
+			m_FireParticle = ParticleManager.GetInstance().PlayOnObject(ParticleList.BROOM_TORCH_T1, this, m_ParticleLocalPos);
+		}
+		m_FireParticle.ScaleParticleParamFromOriginal(EmitorParam.VELOCITY, 1.0);
+		m_FireParticle.ScaleParticleParamFromOriginal(EmitorParam.VELOCITY_RND, 1.0);	
+		if (m_FireParticle)
+		{
+			float scale = Math.Max(normalizedQuant * 2.4, 0.4);
+			
+			m_FireParticle.ScaleParticleParamFromOriginal(EmitorParam.SIZE, scale);
+		}
+	}
+	
+	// DEBUG BELLOW
+	void DebugSetHealthAndEnergy(float time)
+	{
+		float max_energy = GetCompEM().GetEnergyMaxPristine();
+		float health01 = Math.InverseLerp(0, max_energy, time);
+		SetHealth01("","", health01);
+		GetCompEM().SetEnergy( time );
+	}
+
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BROOM_BURN_VERY_SHORT, "SetBurnTimeTo15Secs", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BROOM_BURN_SHORT, "SetBurnTimeTo1Min", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BROOM_BURN_MEDIUM, "SetBurnTimeTo10Min", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.BROOM_BURN_LONG, "SetBurnTimeToMax", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.BROOM_BURN_VERY_SHORT)
+			{
+				DebugSetHealthAndEnergy(15);
+				OnIgnitedThis(null);
+			}
+			else if (action_id == EActions.BROOM_BURN_SHORT)
+			{
+				DebugSetHealthAndEnergy(60);
+				OnIgnitedThis(null);
+			}
+			else if (action_id == EActions.BROOM_BURN_MEDIUM)
+			{
+				DebugSetHealthAndEnergy(600);
+				OnIgnitedThis(null);
+			}
+			else if (action_id == EActions.BROOM_BURN_LONG)
+			{
+				DebugSetHealthAndEnergy(GetCompEM().GetEnergyMaxPristine());
+				OnIgnitedThis(null);
+			}
+		}
+		return false;
+	}
+	
+}
+
+class Broom: BroomBase
+{
+	override string GetBurningMaterial()
+	{
+		return "DZ\\gear\\tools\\data\\broom_emissive.rvmat";
+	}
+	
+	override string GetBurntMaterial()
+	{
+		return "DZ\\gear\\tools\\data\\broom_burn.rvmat";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Broom_Birch.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Broom_Birch.c
new file mode 100644
index 0000000000000000000000000000000000000000..387bf780579555128da091635a04eb1ec5e6971f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Broom_Birch.c
@@ -0,0 +1,12 @@
+class Broom_Birch: BroomBase
+{
+	override string GetBurningMaterial()
+	{
+		return "DZ\\gear\\tools\\data\\broom_birch_emissive.rvmat";
+	}
+	
+	override string GetBurntMaterial()
+	{
+		return "DZ\\gear\\tools\\data\\broom_birch_burn.rvmat";
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/CanOpener.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/CanOpener.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2784e1b84f590bed9f764488c5a6b9829643a65
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/CanOpener.c
@@ -0,0 +1 @@
+class CanOpener: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Cassette.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Cassette.c
new file mode 100644
index 0000000000000000000000000000000000000000..33209158c0085f53e48a36cd427ccbd9359fc746
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Cassette.c
@@ -0,0 +1 @@
+class Cassette : Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Crowbar.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Crowbar.c
new file mode 100644
index 0000000000000000000000000000000000000000..98aba275304579ded4abfa468907d47053b9ca33
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Crowbar.c
@@ -0,0 +1,11 @@
+class Crowbar: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDismantlePart);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineRock1H);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/DoorTestCamera.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/DoorTestCamera.c
new file mode 100644
index 0000000000000000000000000000000000000000..19db051c4f7067a60fe17b919d22b3d2d37c8136
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/DoorTestCamera.c
@@ -0,0 +1 @@
+class DoorTestCamera: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ElectronicRepairKit.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ElectronicRepairKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..5254e742059bf364b8514e2b78c9c61a7173d3bd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ElectronicRepairKit.c
@@ -0,0 +1 @@
+class ElectronicRepairKit: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/EpoxyPutty.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/EpoxyPutty.c
new file mode 100644
index 0000000000000000000000000000000000000000..c342f00b150df17a9f5ac41e20309aa0017bb7ab
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/EpoxyPutty.c
@@ -0,0 +1,9 @@
+class EpoxyPutty: Inventory_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionRepairCarPart); //Heals ONLY global health for now
+		AddAction(ActionRepairCarChassis);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FarmingHoe.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FarmingHoe.c
new file mode 100644
index 0000000000000000000000000000000000000000..a74a50077d519c62e75aca7c321003746c089605
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FarmingHoe.c
@@ -0,0 +1,26 @@
+class FarmingHoe: ItemBase
+{
+	override bool CanMakeGardenplot()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDigGardenPlot);
+		AddAction(ActionDismantleGardenPlot);
+		AddAction(ActionDismantlePart);
+		AddAction(ActionBuildPart);
+		AddAction(ActionBuryBody);
+		AddAction(ActionBuryAshes);
+		AddAction(ActionDigOutStash);
+		AddAction(ActionDigInStash);
+		AddAction(ActionFillObject);
+		AddAction(ActionDigWorms);
+		AddAction(ActionCreateGreenhouseGardenPlot);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireExtinguisher.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireExtinguisher.c
new file mode 100644
index 0000000000000000000000000000000000000000..200e0ae41764c1757fa1c5ec27109e55905241c7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireExtinguisher.c
@@ -0,0 +1,10 @@
+class FireExtinguisher: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionExtinguishFireplaceByExtinguisher);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireworksLauncher.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireworksLauncher.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f13a9b24225c5cb21eb8d7f250c914ba1342adc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireworksLauncher.c
@@ -0,0 +1,699 @@
+class ExplosionLight : PointLightBase
+{
+	void ExplosionLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(60);
+		SetBrightnessTo(0.05);
+		SetFlareVisible(false);
+		SetAmbientColor(1.0, 1.0, 1.0);
+		SetDiffuseColor(1.0, 1.0, 1.0);
+		SetLifetime(2.1);
+		//SetDisableShadowsWithinRadius(-1);
+		SetFadeOutTime(1);
+		m_FadeInTime = 0.25;
+		SetFlickerSpeed(7);
+		//SetFlickerAmplitude(0.5);
+		SetFlickerAmplitudeMax(3);
+		SetFlickerAmplitudeMin(0);
+		SetCastShadow( false );
+	}
+}
+//-----------------------------------------------------------------------------------------------
+class FireworksLauncherClientEventBase
+{
+	void OnFired();
+}
+//-----------------------------------------------------------------------------------------------
+class FireworksLauncherClientEvent : FireworksLauncherClientEventBase
+{
+	protected ref Timer 			m_Timer = new Timer();
+	protected FireworksLauncher 	m_Item;
+	protected int 					m_Index;
+	protected vector				m_ExplosionPos;
+	protected EffectSound 			m_FireSound;
+	protected EffectSound 			m_ExplosionSound;
+	protected ParticleSource 		m_ParticleShot;
+	protected ParticleSource 		m_ParticleExplosion;
+	protected vector				m_ShotDir;
+	protected ExplosionLight		m_ExplosionLight;
+	protected ParticleSource 		m_ParticleAfterBurnEnd;
+	protected string				m_Color;
+	protected int 					m_RemainingExplosions = GetSecondaryExplosionCount();
+	protected ref array<ref FireworksLauncherClientEventBase> m_Events = new ref array<ref FireworksLauncherClientEventBase>;
+	#ifdef DEVELOPER
+	Shape 							m_ShotTrajectory;
+	#endif
+	
+	
+	// -----------------------------
+	// ------- Tweaking Start-------
+	// -----------------------------
+	
+	protected int GetSoundDelay()
+	{
+		return 0;
+	}
+	
+	protected int GetLightDelay()
+	{
+		return 0;
+	}
+	
+	protected float GetExplosionDistance()
+	{
+		return Math.RandomFloatInclusive(35,40);
+	}
+	
+	protected float GetShotDispersionAngle()
+	{
+		return Math.RandomFloatInclusive(-25,25);//this is rotated 360 degrees around the UP vector too
+	}
+	
+	protected string GetExplosionSoundSet()
+	{
+		return "FireworksLauncher_Explosion_SoundSet";
+	}
+	
+	protected float GetExplosionDelay()
+	{
+		return Math.RandomFloatInclusive(1.5,1.75);
+	}
+	
+	// -----------------------------
+	// ------- Tweaking End --------
+	// -----------------------------
+
+	
+	void FireworksLauncherClientEvent(FireworksLauncher item, int index)
+	{
+		m_Item = item;
+		m_Index = index;
+		
+		int colorSequenceLastIndex = m_Item.GetColorSequence().Length() - 1;
+		int coloreSequenceIndex = m_Index - 1;//shot index(m_Index) starts at 1
+		
+		if (colorSequenceLastIndex >= coloreSequenceIndex)
+		{
+			m_Color = m_Item.GetColorSequence().Get(coloreSequenceIndex);
+		}
+		else
+		{
+			Debug.LogError("Failed to obtain color from color sequence");
+			m_Color = "B";
+		}
+	}
+	
+	void ~FireworksLauncherClientEvent()
+	{
+		SEffectManager.DestroyEffect(m_FireSound);
+		SEffectManager.DestroyEffect(m_ExplosionSound);
+		if (m_ParticleAfterBurnEnd)
+		{
+			m_ParticleAfterBurnEnd.StopParticle();
+		}
+	}
+
+	override protected void OnFired()
+	{
+		m_Timer.Run(GetExplosionDelay(), this, "OnExplode", null);
+		m_Item.PlaySoundSet( m_FireSound, "FireworksLauncher_Shot_SoundSet", 0, 0 );
+		m_ParticleShot = ParticleManager.GetInstance().PlayInWorld(ParticleList.FIREWORKS_SHOT, GetShotPos());
+		m_ParticleShot.SetYawPitchRoll(Vector(Math.RandomFloatInclusive(0,360),GetShotDispersionAngle(),0));
+		
+		m_ParticleAfterBurnEnd = ParticleManager.GetInstance().PlayInWorld(ParticleList.FIREWORKS_AFTERBURN_END, GetShotPos());
+		if (m_ParticleAfterBurnEnd)
+			m_ParticleAfterBurnEnd.SetOwner(this);
+		m_ShotDir = m_ParticleShot.GetDirectionUp();
+		
+		#ifdef DEVELOPER
+		vector pts[2];
+		pts[0] = GetShotPos();
+		pts[1] = GetShotPos() + m_ShotDir * GetExplosionDistance();
+		//m_ShotTrajectory = Shape.CreateLines(COLOR_RED, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER, pts, 2);
+		#endif
+	}
+	
+	protected vector GetShotPos()
+	{
+		vector memPos; 
+		string memName = "Shot_" + m_Index;
+		
+		if (m_Item.MemoryPointExists(memName))
+		{
+			memPos = m_Item.GetMemoryPointPos(memName);
+			memPos = m_Item.ModelToWorld(memPos);
+		}
+		else
+		{
+			memPos = m_Item.GetPosition();//fallback to item's location
+			Debug.LogError("Missing shot memory point on Fireworks");
+		}
+		return memPos;
+	}
+	
+	protected void CalculateExplosionPosition()
+	{
+		m_ExplosionPos = GetShotPos() + m_ShotDir * GetExplosionDistance();
+	}
+	
+	protected vector GetExplosionPosition()
+	{
+		if (!m_ExplosionPos)
+		{
+			CalculateExplosionPosition();
+		}
+		return m_ExplosionPos;
+	}
+	
+	int GetSecondaryExplosionCount()
+	{
+		return 4;
+	}
+	
+	
+	protected void OnExplode()
+	{
+		#ifdef DEVELOPER
+		if (m_ShotTrajectory)
+		{
+			m_ShotTrajectory.Destroy();
+			m_ShotTrajectory = null;
+		}
+		#endif
+		m_ParticleAfterBurnEnd.Stop();
+
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( PlayExplosionSound, GetSoundDelay(), false);
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( SpawnLight, GetLightDelay(), false);
+		m_ParticleExplosion = ParticleManager.GetInstance().PlayInWorld(GetExplParticleFromSequence(), GetExplosionPosition());
+		
+		RequestSecondaryExplosion();
+		
+	}
+	
+	protected void RequestSecondaryExplosion()
+	{
+		if (m_RemainingExplosions> 0)
+		{
+			m_RemainingExplosions--;
+			GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( SpawnSecondaryExplosion, GetSecondaryExplosionDelay(), false);
+		}
+	}
+	
+	protected void SpawnSecondaryExplosion()
+	{
+		FireworksLauncherClientEventSecondary evnt = new FireworksLauncherClientEventSecondary(m_Item,m_Index);
+		evnt.Init(GetExplosionPosition());
+		evnt.OnExplode();
+		m_Events.Insert(evnt);
+		RequestSecondaryExplosion();
+	}
+	
+	protected int GetSecondaryExplosionDelay()
+	{
+		return Math.RandomIntInclusive(100,250);
+	}
+	
+	protected int GetExplParticleFromSequence()
+	{
+		switch (m_Color)
+		{
+			case "R":
+				return ParticleList.FIREWORKS_EXPLOSION_RED;
+			case "G":
+				return ParticleList.FIREWORKS_EXPLOSION_GREEN;
+			case "B":
+				return ParticleList.FIREWORKS_EXPLOSION_BLUE;
+			case "Y":
+				return ParticleList.FIREWORKS_EXPLOSION_YELLOW;
+			case "P":
+				return ParticleList.FIREWORKS_EXPLOSION_PINK;
+			default:
+				ErrorEx("Incorrect explosion particle color in the sequence");
+		}
+		return ParticleList.FIREWORKS_EXPLOSION_RED;
+	}
+	
+	protected void SetupLight(PointLightBase light)
+	{
+		switch (m_Color)
+		{
+			case "R":
+				light.SetDiffuseColor(255,51,51);
+				light.SetAmbientColor(255,51,51);
+				
+				break;
+			case "G":
+				light.SetDiffuseColor(0,255,128);
+				light.SetAmbientColor(0,255,128);
+				break;
+			case "B":
+				light.SetDiffuseColor(51,153,255);
+				light.SetAmbientColor(51,153,255);
+				break;
+			case "Y":
+				light.SetDiffuseColor(255,255,51);
+				light.SetAmbientColor(255,255,51);
+				break;
+			case "P":
+				light.SetDiffuseColor(255,102,255);
+				light.SetAmbientColor(255,102,255);
+				break;
+			default:
+				ErrorEx("Incorrect explosion particle color in the sequence");
+		}
+	}
+	
+	protected void SpawnLight()
+	{
+		m_ExplosionLight = ExplosionLight.Cast( ScriptedLightBase.CreateLight( ExplosionLight, GetExplosionPosition()) );
+		SetupLight(m_ExplosionLight);
+	}
+	
+	protected void PlayExplosionSound()
+	{
+		if (m_FireSound)
+		{
+			m_FireSound.Stop();
+		}
+		m_Item.PlaySoundSet( m_ExplosionSound, GetExplosionSoundSet(), 0, 0 );
+	}
+}
+//------------------------------------------------------------------------------------
+
+class FireworksLauncherClientEventSecondary : FireworksLauncherClientEvent
+{
+	protected vector m_ShotPos;
+	
+	override protected vector GetExplosionPosition()
+	{
+		return GetShotPos() + m_ShotDir * GetExplosionDistance();
+	}
+	
+	void Init(vector pos)
+	{
+		m_ShotPos = pos;
+		m_ShotDir[0] = Math.RandomFloatInclusive(-1,1);
+		m_ShotDir[1] = Math.RandomFloatInclusive(-1,1);
+		m_ShotDir[2] = Math.RandomFloatInclusive(-1,1);
+		m_ShotDir.Normalize();
+	}
+	override protected vector GetShotPos()
+	{
+		return m_ShotPos;
+	}
+	
+	override protected float GetExplosionDistance()
+	{
+		return Math.RandomFloatInclusive(10,15);
+	}
+	
+	override void OnExplode()
+	{
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( PlayExplosionSound, GetSoundDelay(), false);
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( SpawnLight, GetLightDelay(), false);
+		m_ParticleExplosion = ParticleManager.GetInstance().PlayInWorld(GetExplParticleFromSequence(), GetExplosionPosition());
+	}
+}
+
+class FireworksLauncher: FireworksBase
+{
+	int m_Index;//counts the shots
+	int m_IndexPrev;//counts the shots
+	int m_ColorSequenceIndex;
+	ref Timer m_TimerFuse;
+	ref array<ref FireworksLauncherClientEventBase> m_Events;
+	EffectSound 		m_FuseSoundStart;
+	EffectSound 		m_FuseSound;
+	ParticleSource 		m_ParticleFuse;
+	ParticleSource 		m_ParticleAfterBurnEnd;
+	ref array<string>				m_ColorSequence;
+	
+	void FireworksLauncher()
+	{
+		m_ColorSequence = new array<string>();
+		SetupColorSequences();
+		RegisterNetSyncVariableInt("m_State", 0, EnumTools.GetLastEnumValue(EFireworksState));
+		RegisterNetSyncVariableInt("m_Index", 0, GetMaxShots());
+		RegisterNetSyncVariableInt("m_RandomSeed", 0, 1023);
+		int lastIndex = m_ColorSequence.Count() - 1;
+		RegisterNetSyncVariableInt("m_ColorSequenceIndex", 0, lastIndex);
+		m_RandomSeed = Math.RandomInt(0,1023);
+		m_ColorSequenceIndex = Math.RandomIntInclusive(0, lastIndex);
+	}
+	
+	void ~FireworksLauncher()
+	{
+		SEffectManager.DestroyEffect(m_FuseSound);
+		SEffectManager.DestroyEffect(m_FuseSoundStart);
+	}
+	
+	override protected bool UsesGlobalDeploy()
+	{
+		return true;
+	}
+	
+	override bool IsDeployable()
+	{
+		return true;
+	}
+	
+	//!how long it takes to deploy this item in seconds
+	override float GetDeployTime()
+	{
+		return 2;
+	}
+	
+	protected void SetupColorSequences()
+	{
+		m_ColorSequence.Insert("RGBYPBRGBRGBYPBRGBRGBYPBRGBPBRGBRGBY");
+		m_ColorSequence.Insert("PGPYPBYPYPBYYPBRPYPBYYPBRGBPBRGRGBRB");
+		m_ColorSequence.Insert("YPBRPYPBYYPBRGBPBRGRGBRBGRPBRGBRYPBY");
+		m_ColorSequence.Insert("YRBGPRYPGRYBGRGRGBRBBYPYPBYRYPGRYGRP");
+		m_ColorSequence.Insert("BGRYPYRPBYYPYRBGPRYPGBYPBRGBPBRGBRGB");
+		m_ColorSequence.Insert("RYGRPBRGBYPBRRPBRGBBRBBYPYPRGBRGBRPY");
+		m_ColorSequence.Insert("GBRGBYRGBYPBRRPBRBYRYPGPYPRGBRGBRPYG");
+		m_ColorSequence.Insert("RYPBYYPBRGBYPBRGBRBGBPBRGRGBRBGRYPYR");
+		m_ColorSequence.Insert("PBRGBYPBRGBRBGBPBRGRGBRBGRYPYRRYPBYY");
+		m_ColorSequence.Insert("RGRGBRBBYPYPBYRYPGRYGRPYRBGPRYPGRYBG");
+		m_ColorSequence.Insert("RBYRYPGPYPRGBRGBRPYGGBRGBYRGBYPBRRPB");
+		m_ColorSequence.Insert("PRGBRGBRPYGGBRRBYRYPGPYGBYRGBYPBRRPB");
+	}
+	
+	string GetColorSequence()
+	{
+		if (m_ColorSequence.IsValidIndex(m_ColorSequenceIndex))
+		{
+			return m_ColorSequence.Get(m_ColorSequenceIndex);
+		}
+		else
+		{
+			ErrorEx("Failed to obtain color sequence");
+			return "RYPBYYPBRGBYPBRGBRBGBPBRGRGBRBGRYPYR";
+		}
+	}
+
+	
+	override protected void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0")
+	{
+		super.OnPlacementComplete(player, position, orientation);
+		if (GetGame().IsServer())
+		{
+			if (GetState() == EFireworksState.DEFAULT)
+			{
+				SetState(EFireworksState.PLACED);
+			}
+		}
+	}
+	
+	override protected float GetMaxAllowedWetness()
+	{
+		return GameConstants.STATE_WET;
+	}
+	
+	
+	override protected float GetEventDelay()
+	{
+		return Math.RandomFloatInclusive(3,3.35);
+	}
+	
+	protected string GetFuseSoundSet()
+	{
+		return "FireworksLauncher_Ignition_Loop_SoundSet";
+	}
+	
+	protected int GetMaxShots()
+	{
+		return 16;
+	}
+	
+	protected float GetFuseDelay()
+	{
+		return 3;
+	}
+	
+	protected string GetAmmoType()
+	{
+		return "Fireworks_Ammo";
+	}
+	
+	protected int GetDamageType()
+	{
+		return DamageType.EXPLOSION;
+	}
+		
+	
+	override protected void OnStateChangedServer(EFireworksState currentState)
+	{
+		switch (currentState)
+		{
+			case EFireworksState.PLACED:
+				break
+			case EFireworksState.IGNITED:
+				OnFuseIgnitedServer();
+				break
+			case EFireworksState.FIRING:
+				HideSelection("cover");
+				OnFiringStartServer();
+				break
+			case EFireworksState.FINISHED:
+				HideSelection("cover");//when loading from storage
+				break
+			default: {};
+		}
+	}
+	
+	override protected void OnStateChangedClient(EFireworksState currentState)
+	{
+		switch (currentState)
+		{
+			case EFireworksState.IGNITED:
+				OnFuseIgnitedClient();
+				break
+			case EFireworksState.PLACED:
+				break
+			case EFireworksState.FIRING:
+				OnFiringStartClient();
+				break
+			default: {};
+		}
+	}
+	
+	//! Executed on Server when some item ignited this one
+	override void OnIgnitedThis( EntityAI fire_source)
+	{
+		super.OnIgnitedThis(fire_source);
+		if (m_Events)
+		{
+			m_Events.Clear();
+		}
+		m_Index = 0;
+		
+		if (m_TimerEvent)
+		{
+			m_TimerEvent.Stop();
+		}
+	}
+	
+	override protected bool CanPutInCargo( EntityAI parent )
+	{
+		return (GetState() == EFireworksState.DEFAULT || (GetState() == EFireworksState.PLACED) || (GetState() == EFireworksState.FINISHED);
+	}
+	
+	override protected bool CanPutIntoHands( EntityAI parent )
+	{
+		return (GetState() == EFireworksState.DEFAULT || (GetState() == EFireworksState.PLACED) || (GetState() == EFireworksState.FINISHED);
+	}
+	
+	protected void OnFuseIgnitedServer()
+	{
+		int state = EFireworksState.FIRING;
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( SetState, GetFuseDelay()*1000, false, state);
+	}
+	
+	protected void OnFuseIgnitedClient()
+	{
+		m_ParticleFuse = ParticleManager.GetInstance().PlayInWorld(ParticleList.FIREWORKS_FUSE, GetPosition() + "0 0.15 0");
+		if (m_ParticleFuse)
+			m_ParticleFuse.SetOwner(this);
+		PlaySoundSet( m_FuseSoundStart, "FireworksLauncher_Ignition_Start_SoundSet", 0, 0 );
+		vector fuseStart;
+		vector fuseEnd;
+		
+		if (MemoryPointExists("Fuse_Start"))
+		{
+			fuseStart = GetMemoryPointPos("Fuse_Start");
+			fuseStart = ModelToWorld(fuseStart);
+		}
+		if (MemoryPointExists("Fuse_End"))
+		{
+			fuseEnd = GetMemoryPointPos("Fuse_End");
+			fuseEnd = ModelToWorld(fuseEnd);
+		}
+		
+		vector fuseDir = fuseEnd - fuseStart;
+		vector fuseOrientation[4];
+		vector ori = fuseDir.VectorToAngles();
+		m_ParticleFuse.SetOrientation(ori);
+		m_ParticleFuse.SetPosition(fuseStart);
+
+		PlaySoundSetLoop( m_FuseSound, GetFuseSoundSet(), 0, 0 );
+	}
+	
+	protected void OnFiringStartServer()
+	{
+		OnEventServer(0);
+	}
+	
+	protected void OnFiringStartClient()
+	{
+		if (m_ParticleFuse)
+		{
+			m_ParticleFuse.StopParticle(StopParticleFlags.IMMEDIATE);
+		}
+		if (m_FuseSound)
+		{
+			m_FuseSound.Stop();
+		}
+	}
+	
+	protected void OnFiringStop()
+	{
+		SetHealth01("","",0);
+	}
+	
+	//!Starts event timer
+	protected void RestartEventTimer()
+	{
+		if (!m_TimerEvent)
+		{
+			m_TimerEvent = new Timer();
+		}
+		m_TimerEvent.Run(GetEventDelay(), this, "OnEventServer", new Param1<int>(0));
+	}
+	
+	
+	override protected bool IsIgnited()
+	{
+		return GetState()==EFireworksState.IGNITED;
+	}
+	
+	override protected bool CanIgniteItem(EntityAI ignite_target = NULL)
+	{
+		return false;
+	}
+	
+	
+	
+	//!Called periodically but only after the entity gets ignited
+	override protected void OnEventServer(int type)
+	{
+		m_Index++;
+		DamageSystem.ExplosionDamage(this, NULL, GetAmmoType(), GetPosition(), GetDamageType());
+		
+		SetSynchDirty();
+		if (m_Index > GetMaxShots())
+		{
+			m_Index = GetMaxShots();
+			m_TimerEvent = null;
+			SetState(EFireworksState.FINISHED);
+		}
+		else
+		{
+			RestartEventTimer();
+		}
+	}
+	
+	protected void OnIndexChangedClient()
+	{
+		if (!m_Events)
+		{
+			m_Events = new array<ref FireworksLauncherClientEventBase>;
+		}
+		if (m_Index != 0 && m_State == EFireworksState.FIRING)//can only be true when restarting the device during debug calls
+		{
+			FireworksLauncherClientEventBase fireEvent = SpawnEvent();
+			m_Events.Insert(fireEvent);
+		}
+	}
+	
+	protected FireworksLauncherClientEventBase SpawnEvent()
+	{
+		FireworksLauncherClientEventBase evnt = new FireworksLauncherClientEvent(this,m_Index);
+		evnt.OnFired();
+		return evnt;
+	}
+	
+	override protected void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		//Print("index: " + m_Index);
+		if (m_Index != m_IndexPrev)
+		{
+			Math.Randomize(m_RandomSeed+m_Index);
+			OnIndexChangedClient();
+			m_IndexPrev = m_Index;
+		}
+	}
+	
+	override protected void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		ctx.Write(m_Index);
+		ctx.Write(m_State);
+	}
+	
+	
+	override protected bool OnStoreLoad( ParamsReadContext ctx, int version )
+	{
+		if (!super.OnStoreLoad(ctx, version))
+		{
+			return false;
+		}
+		
+		if (version >= 130)
+		{
+			if (!ctx.Read(m_Index))
+			{
+				return false;
+			}
+		
+			if (!ctx.Read(m_State))
+			{
+				return false;
+			}
+			
+			SetState(m_State);
+		}
+		return true;
+	}
+	
+	override string GetDeploySoundset()
+	{
+		return "placeFireworks_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		return "fireworks_deploy_SoundSet";
+	}
+	
+	#ifdef DEVELOPER
+	override protected string GetDebugText()
+	{
+		string debug_output;
+		
+		if( GetGame().IsDedicatedServer())
+		{
+			debug_output+= EnumTools.EnumToString(EFireworksState, m_State) +"\n";
+			debug_output+= "m_Index:" + m_Index +"\n";
+		}
+		else
+		{
+			
+		}
+		return debug_output;
+	}
+	
+	#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireworksLauncherAnniversary.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireworksLauncherAnniversary.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff9cbcb27c02685577f6f9e5b89ce8b1d6915116
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FireworksLauncherAnniversary.c
@@ -0,0 +1,164 @@
+class AnniversaryFireworksLauncherClientEvent: FireworksLauncherClientEvent
+{
+	override protected int GetExplParticleFromSequence()
+	{
+		switch (m_Color)
+		{
+			case "1":
+				return ParticleList.FIREWORKS_EXPLOSION_THANKS1;
+			case "2":
+				return ParticleList.FIREWORKS_EXPLOSION_THANKS2;
+			case "3":
+				return ParticleList.FIREWORKS_EXPLOSION_THANKS3;
+			case "4":
+				return ParticleList.FIREWORKS_EXPLOSION_THANKS4;
+			case "5":
+				return ParticleList.FIREWORKS_EXPLOSION_THANKS5;
+			default:
+				ErrorEx("Incorrect explosion particle color in the sequence");
+		}
+		return ParticleList.FIREWORKS_EXPLOSION_RED;
+	}
+	
+	override protected void SetupLight(PointLightBase light)
+	{
+		switch (m_Color)
+		{
+			case "1":
+				light.SetDiffuseColor(255,51,51);
+				light.SetAmbientColor(255,51,51);
+				
+				break;
+			case "2":
+				light.SetDiffuseColor(0,255,128);
+				light.SetAmbientColor(0,255,128);
+				break;
+			case "3":
+				light.SetDiffuseColor(51,153,255);
+				light.SetAmbientColor(51,153,255);
+				break;
+			case "4":
+				light.SetDiffuseColor(255,255,51);
+				light.SetAmbientColor(255,255,51);
+				break;
+			case "5":
+				light.SetDiffuseColor(255,102,255);
+				light.SetAmbientColor(255,102,255);
+				break;
+			default:
+				ErrorEx("Incorrect explosion particle color in the sequence");
+		}
+	}
+	
+	override protected void SpawnSecondaryExplosion()
+	{
+		AnniversaryFireworksLauncherClientEventSecondary evnt = new AnniversaryFireworksLauncherClientEventSecondary(m_Item,m_Index);
+		evnt.Init(GetExplosionPosition());
+		evnt.OnExplode();
+		m_Events.Insert(evnt);
+		RequestSecondaryExplosion();
+	}
+}
+//--------------------------------------------------------------------------------------
+class AnniversaryFireworksLauncherClientEventSecondary : AnniversaryFireworksLauncherClientEvent
+{
+	protected vector m_ShotPos;
+	
+	override protected vector GetExplosionPosition()
+	{
+		return GetShotPos() + m_ShotDir * GetExplosionDistance();
+	}
+	
+	void Init(vector pos)
+	{
+		m_ShotPos = pos;
+		m_ShotDir[0] = Math.RandomFloatInclusive(-1,1);
+		m_ShotDir[1] = Math.RandomFloatInclusive(-1,1);
+		m_ShotDir[2] = Math.RandomFloatInclusive(-1,1);
+		m_ShotDir.Normalize();
+	}
+	override protected vector GetShotPos()
+	{
+		return m_ShotPos;
+	}
+	
+	override protected float GetExplosionDistance()
+	{
+		return Math.RandomFloatInclusive(10,15);
+	}
+	
+	override void OnExplode()
+	{
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( PlayExplosionSound, GetSoundDelay(), false);
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( SpawnLight, GetLightDelay(), false);
+		m_ParticleExplosion = ParticleManager.GetInstance().PlayInWorld(GetExplParticleFromSequence(), GetExplosionPosition());
+	}
+}
+//--------------------------------------------------------------------------------------
+class Anniversary_FireworksLauncher: FireworksLauncher
+{
+	int sequence = 0;
+	
+	override protected void SetupColorSequences()
+	{
+		m_ColorSequence.Insert("1234512345123451234512345");
+	}
+	
+	override protected FireworksLauncherClientEventBase SpawnEvent()
+	{
+		FireworksLauncherClientEventBase evnt = new AnniversaryFireworksLauncherClientEvent(this,m_Index);
+		evnt.OnFired();
+		return evnt;
+	}
+	
+	override bool IsTakeable()
+	{
+		return false;
+	}
+	
+	override bool CanSwapEntities(EntityAI otherItem, InventoryLocation otherDestination, InventoryLocation destination)
+	{
+		return false;
+	}
+	
+	override bool DisableVicinityIcon()
+	{
+		return true;
+	}
+	
+	override protected int GetMaxShots()
+	{
+		return 25;
+	}
+	
+	override protected float GetFuseDelay()
+	{
+		return 1;
+	}
+	
+		//!Called periodically but only after the entity gets ignited
+	override protected void OnEventServer(int type)
+	{
+		m_Index++;
+		DamageSystem.ExplosionDamage(this, NULL, GetAmmoType(), GetPosition(), GetDamageType());
+		
+		if(m_Index > 16)
+		{
+			sequence++;
+			m_Index = 1;
+		}
+		
+		SetSynchDirty();
+		if (m_Index + (sequence*16)> GetMaxShots())
+		{
+			m_Index = GetMaxShots();
+			m_TimerEvent = null;
+			SetState(EFireworksState.FINISHED);
+		}
+		else
+		{
+			RestartEventTimer();
+		}
+	}
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FishingRod.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FishingRod.c
new file mode 100644
index 0000000000000000000000000000000000000000..a32ebaee9d00ac45b9da591ca55c505a3fd56b5a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/FishingRod.c
@@ -0,0 +1,21 @@
+class FishingRod : FishingRod_Base_New
+{
+	void FishingRod()
+	{
+	}
+	
+	override float GetFishingEffectivityBonus()
+	{
+		return 0.1;
+	}
+	
+	override void AnimateFishingRod(bool state)
+	{
+		SetAnimationPhase("AnimateRod",state);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+	}	
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HandSaw.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HandSaw.c
new file mode 100644
index 0000000000000000000000000000000000000000..eae7ba904a09e4dc2d97a6407c417643f2568b76
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HandSaw.c
@@ -0,0 +1,16 @@
+class HandSaw: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionMineBush);
+		AddAction(ActionSawPlanks);
+		AddAction(ActionDismantlePart);
+		//AddAction(ActionDestroyCombinationLock);
+		//AddAction(ActionDestroyPart);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineTreeBark);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HandcuffKeys.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HandcuffKeys.c
new file mode 100644
index 0000000000000000000000000000000000000000..b489335c0fe374bd34405a2d6f0e64590619d2d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HandcuffKeys.c
@@ -0,0 +1,9 @@
+class HandcuffKeys: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainTarget);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Handcuffs.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Handcuffs.c
new file mode 100644
index 0000000000000000000000000000000000000000..a632193708d291ef28c2b5c8d8179eed6bf5d75f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Handcuffs.c
@@ -0,0 +1,10 @@
+class Handcuffs: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRestrainTarget);
+		AddAction(ActionRestrainSelf);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HayHook.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HayHook.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5fa8a0218a07de0488568581384821cf477aec2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/HayHook.c
@@ -0,0 +1,10 @@
+class HayHook: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Iceaxe.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Iceaxe.c
new file mode 100644
index 0000000000000000000000000000000000000000..5da29a176f457985e0d04891a0f0c1a09bccc824
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Iceaxe.c
@@ -0,0 +1,17 @@
+class Iceaxe: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBuryAshes);
+		AddAction(ActionDigGardenPlot);
+		AddAction(ActionDismantleGardenPlot);
+		//AddAction(ActionMineRock1H);
+		AddAction(ActionDigWorms);
+		AddAction(ActionDismantlePart);
+		AddAction(ActionBuildPart);
+		AddAction(ActionSkinning);
+		AddAction(ActionCreateGreenhouseGardenPlot);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ImprovisedFishingRod.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ImprovisedFishingRod.c
new file mode 100644
index 0000000000000000000000000000000000000000..bd85d78819fb38fa9a6aaa313bc78a33370996f1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ImprovisedFishingRod.c
@@ -0,0 +1,7 @@
+class ImprovisedFishingRod: FishingRod_Base_New
+{
+	override void AnimateFishingRod(bool state)
+	{
+		SetAnimationPhase("AnimateRod",state);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/KitchenTimer.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/KitchenTimer.c
new file mode 100644
index 0000000000000000000000000000000000000000..59492400e2153a008d66ecb3bbcf55610639c381
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/KitchenTimer.c
@@ -0,0 +1,261 @@
+class KitchenTimer : ClockBase
+{
+	const string		RINGING_SOUND 				= "KitchenTimer_Ring_Loop_SoundSet";
+	const string		DESTROYED_SOUND 			= "AlarmClock_Destroyed_SoundSet";
+	const string		HIT_SOUND 					= "AlarmClock_Hit_SoundSet";
+	const string		WORKING_SOUND				= "KitchenTimer_Ticking_Loop_SoundSet";
+	
+	EffectSound 		m_RingingStopSound;
+	static ref NoiseParams 	m_NoisePar;
+	static NoiseSystem		m_NoiseSystem;
+
+	int 				m_AlarmInSecs;
+	
+	override void Init()
+	{
+		super.Init();
+	
+		if (GetGame().IsServer())
+		{
+			m_NoiseSystem = GetGame().GetNoiseSystem();
+			if ( m_NoiseSystem && !m_NoisePar)
+			{
+				// Create and load noise parameters
+				m_NoisePar = new NoiseParams;
+				m_NoisePar.LoadFromPath("cfgVehicles " + GetType() + " NoiseKitchenTimer");
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionSetKitchenTimer);
+		AddAction(ActionResetKitchenTimer);
+	}
+
+	override string GetExplosiveTriggerSlotName()
+	{
+		return "TriggerKitchenTimer";
+	}
+	
+	override string GetToggleSound()
+	{
+		return "";
+	}
+	
+	override string GetRingingSound()
+	{
+		return RINGING_SOUND;
+	}
+	
+	string GetRingingStopSound()
+	{
+		return "KitchenTimer_Ring_End_SoundSet";
+	}
+	
+	override string GetDestroyedSound()
+	{
+		return DESTROYED_SOUND;
+	}
+	
+	override string GetHitSound()
+	{
+		return HIT_SOUND;
+	}
+	
+	override string GetWorkingSound()
+	{
+		return WORKING_SOUND;
+	}
+	
+	int GetMinutesMax()
+	{
+		return 45;
+	}
+	
+	int Time01ToSeconds(float time01)
+	{
+		return Math.Lerp(0,GetMinutesMax() * 60, time01);
+	}
+	
+	
+	float SecondsTo01(int seconds)
+	{
+		return Math.InverseLerp(0,GetMinutesMax() * 60, seconds);
+	}
+	
+	override float GetRingingDurationMax()
+	{
+		return 60;
+	}
+	
+	override void TurnOff()
+	{
+		super.TurnOff();
+		SEffectManager.DestroyEffect(m_WorkingSound);
+	}
+		
+	void OnUpdate()
+	{
+		if (m_AlarmInSecs > 0)
+		{
+			m_AlarmInSecs -= UPDATE_TICK_RATE;
+			float time01 = SecondsTo01(m_AlarmInSecs);
+			SetAnimationPhaseNow("ClockAlarm", time01);
+			if (IsRinging())
+			{
+				MakeRingingStop();
+			}
+		}
+		else if (!IsRinging())
+		{
+			MakeRingingStart();
+		}
+		
+		if (IsRinging())
+		{
+			m_RingingDuration += UPDATE_TICK_RATE;
+			
+			if (m_RingingDuration >= GetRingingDurationMax())
+			{
+				TurnOff();
+			}
+			else if (m_NoiseSystem)
+			{
+				m_NoiseSystem.AddNoiseTarget(GetPosition(), UPDATE_TICK_RATE, m_NoisePar);
+			}
+		}
+	}
+	
+	override protected void Disarm()
+	{
+		super.Disarm();
+		SetAlarmTimeServerSecs(0);
+	}
+
+	override protected void OnRingingStopClient()
+	{
+		if (m_RingingSoundLoop)
+			PlaySoundSet(m_RingingStopSound, GetRingingStopSound(), 0, 0);
+
+		super.OnRingingStopClient();
+		
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+
+		if (version < 128)
+		{
+			return true;
+		}
+
+		EAlarmClockState state;		
+		
+		if (!ctx.Read(state))
+		{
+			return false;
+		}
+
+		int time;
+		if (!ctx.Read(time))
+		{
+			return false;
+		}
+
+		SetState(state);
+		
+		if (state == EAlarmClockState.SET)
+		{
+			SetAlarmTimeServerSecs(time);
+		}
+		else if (state == EAlarmClockState.RINGING)
+		{
+			MakeRingingStart();
+		}
+		
+		return true;
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		ctx.Write(m_State);
+		ctx.Write(m_AlarmInSecs);
+	}
+	
+	
+	
+	//---------------------------------------------------------------------------------------------------------
+	//---------------------------------------------- Public methods -------------------------------------------
+	//---------------------------------------------------------------------------------------------------------
+	
+	override void SetAlarmTimeServer(float time01)
+	{
+		SetAnimationPhaseNow("ClockAlarm", time01);
+		m_AlarmInSecs = Time01ToSeconds(time01);
+		
+		if (m_AlarmInSecs > 0)
+		{
+			TurnOn();
+		}
+	}
+	
+	void SetAlarmTimeServerSecs(int inSecs)
+	{
+		SetAlarmTimeServer(SecondsTo01(inSecs));
+	}
+	
+	
+	//----------------------------------
+	//------------- DEBUG --------------
+	//----------------------------------
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.ALARM_SET_AHEAD, "Set Alarm Ahead", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.LIGHT_GREY));
+		
+		super.GetDebugActions(outputList);
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (action_id == EActions.ALARM_SET_AHEAD)
+			{
+				SetAlarmTimeServerSecs(20);
+			}
+		}
+		return false;
+	}
+
+	override string GetDebugText()
+	{
+		string debug_output;
+		
+		if (GetGame().IsDedicatedServer())
+		{
+			debug_output = "alarm in: " + m_AlarmInSecs.ToString() + " secs" + "\n";
+			debug_output +=  "current state: " +  typename.EnumToString(EAlarmClockState, m_State) + "\n";
+			debug_output +=  "ringing for " + m_RingingDuration.ToString()+ " secs" + "\n";
+			debug_output +=  "ringing max " + GetRingingDurationMax().ToString()+ " secs" + "\n";
+		}
+		else
+		{
+			debug_output = "this is client";
+		}
+
+		return debug_output;
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/LeatherSewingKit.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/LeatherSewingKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..2835f50fbf8a0568e8ceb809fb2c464fb13be6d2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/LeatherSewingKit.c
@@ -0,0 +1,8 @@
+class LeatherSewingKit: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionRepairShelter);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Lockpick.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Lockpick.c
new file mode 100644
index 0000000000000000000000000000000000000000..386ba5a09392bca858f520f40f13651eba31fb46
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Lockpick.c
@@ -0,0 +1,18 @@
+class Lockpick: ToolBase
+{
+	void Lockpick()
+	{
+		m_MineDisarmRate = 90;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionLockDoors);
+		AddAction(ActionUnlockDoors);
+		AddAction(ActionDisarmMine);
+		AddAction(ActionDisarmExplosive);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/LugWrench.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/LugWrench.c
new file mode 100644
index 0000000000000000000000000000000000000000..5674ce64a8e52e3764a3073ec063421f5f80d701
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/LugWrench.c
@@ -0,0 +1,9 @@
+class LugWrench: Inventory_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionLockAttachment);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Mace.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Mace.c
new file mode 100644
index 0000000000000000000000000000000000000000..a9d8487fc29e3a6c0db857d55c903a3f7fb5eb69
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Mace.c
@@ -0,0 +1,9 @@
+class Mace extends Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionMineRock1H);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/MeatTenderizer.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/MeatTenderizer.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5b32b82335a23989a6c7b9f4fa22867cc73b06a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/MeatTenderizer.c
@@ -0,0 +1,13 @@
+class MeatTenderizer: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBuildPart);
+		AddAction(ActionRepairPart);
+		AddAction(ActionMineRock1H);
+
+
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/MessTin.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/MessTin.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a5fb7a0be69130a612e4e75fca00ced67d344ed
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/MessTin.c
@@ -0,0 +1 @@
+class MessTin: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ObsoleteFishingRod.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ObsoleteFishingRod.c
new file mode 100644
index 0000000000000000000000000000000000000000..6a0ba5b2dc928f4999907999a2423569ab823efd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/ObsoleteFishingRod.c
@@ -0,0 +1 @@
+class ObsoleteFishingRod: FishingRod_Base_New {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Paddle.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Paddle.c
new file mode 100644
index 0000000000000000000000000000000000000000..7d4df2e9bc4b5758f21255c04cd43e8e83a88627
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Paddle.c
@@ -0,0 +1,9 @@
+class Paddle: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Black.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Black.c
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Blue.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Blue.c
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_ColorBase.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_ColorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..4c7a7ab979efb32acf540028d3bfd3a6b379811d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_ColorBase.c
@@ -0,0 +1,13 @@
+class Pen_ColorBase: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionWritePaper);
+	}
+};
+class Pen_Black: Pen_ColorBase {};
+class Pen_Red: Pen_ColorBase {};
+class Pen_Green: Pen_ColorBase {};
+class Pen_Blue: Pen_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Green.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Green.c
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Red.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Pen_Red.c
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/SewingKit.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/SewingKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..dcd691a7a08c919944c415e9935cf9c8a33f5a68
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/SewingKit.c
@@ -0,0 +1,37 @@
+class SewingKit: Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRepairTent);
+		AddAction(ActionRepairShelter);
+		AddAction(ActionSewTarget);
+		AddAction(ActionSewSelf);
+	}
+
+	override float GetInfectionChance(int system = 0, Param param = null)
+	{
+		if(m_Cleanness == 1)
+		{
+			return 0;
+		}
+		else
+		{
+			return 0.3;
+		}
+		
+	}
+	
+	override bool CanBeDisinfected()
+	{
+		return true;
+	}
+	
+	override void OnCombine(ItemBase other_item)
+	{
+		super.OnCombine(other_item);
+		if (m_Cleanness == 1 && other_item.m_Cleanness == 0)
+			SetCleanness(0);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/WeaponCleaningKit.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/WeaponCleaningKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..323636f930798b5d944e5934ff1e0c720a1a6a3f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/WeaponCleaningKit.c
@@ -0,0 +1 @@
+class WeaponCleaningKit: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Whetstone.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Whetstone.c
new file mode 100644
index 0000000000000000000000000000000000000000..f6982fe5b0a4c3ce796fc63457a67a31418e97bc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Whetstone.c
@@ -0,0 +1 @@
+class Whetstone: Inventory_Base {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Wrench.c b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Wrench.c
new file mode 100644
index 0000000000000000000000000000000000000000..aca534e9ef7faed71f52b9d45675647ba38fddb4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Gear/Tools/Wrench.c
@@ -0,0 +1,10 @@
+class Wrench: Inventory_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionLockAttachment);
+		AddAction(ActionMineRock1H);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/GiftBox_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/GiftBox_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..02e5a701ef814e7114395ef3c0d83b77085c15e8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/GiftBox_Base.c
@@ -0,0 +1,76 @@
+class GiftBox_Base extends Container_Base
+{
+	protected vector m_HalfExtents; // The Y value contains a heightoffset and not the halfextent !!!
+	protected ref OpenableBehaviour m_Openable;
+	
+	void GiftBox_Base()
+	{
+		m_HalfExtents 	= vector.Zero;
+		m_Openable 		= new OpenableBehaviour(false);
+
+		RegisterNetSyncVariableBool("m_Openable.m_IsOpened");
+	}
+	
+	override bool CanReceiveItemIntoCargo(EntityAI item)
+	{
+		if (!super.CanReceiveItemIntoCargo(item))
+			return false;
+		
+		if (GameInventory.GetInventoryCheckContext() == InventoryCheckContext.DEFAULT)
+		{
+			if (!GetGame().IsDedicatedServer())
+				return IsOpen();
+		}
+		
+		return true;
+	}
+	
+	
+	override void Open()
+	{
+		m_Openable.Open();
+		SetSynchDirty();
+	}
+	
+	override void Close()
+	{
+		m_Openable.Close();
+		SetSynchDirty();
+	}
+	
+	override bool IsOpen()
+	{
+		return m_Openable.IsOpened();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionUnpackGift);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if (Class.CastTo(entity, this))
+		{
+			entity.GetInventory().CreateInInventory("Chemlight_Green");
+		}
+	}
+
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if (newLevel == GameConstants.STATE_RUINED && GetGame().IsServer())
+		{
+			MiscGameplayFunctions.DropAllItemsInInventoryInBounds(this, m_HalfExtents);
+			DeleteSafe();
+		}
+	}
+}
+
+class GiftBox_Small extends GiftBox_Base {}
+class GiftBox_Medium extends GiftBox_Base {}
+class GiftBox_Large extends GiftBox_Base {}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/GiftWrapPaper.c b/scripts/4_World/DayZ/Entities/ItemBase/GiftWrapPaper.c
new file mode 100644
index 0000000000000000000000000000000000000000..c95740ec5ed6d9e71421dd042a254127f7f40407
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/GiftWrapPaper.c
@@ -0,0 +1,47 @@
+class GiftWrapPaper extends ItemBase
+{
+	//================================================================
+	// IGNITION ACTION
+	//================================================================
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( GetHierarchyParent() ) return false;
+		
+		return true;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		return false;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{
+		Fireplace.IgniteEntityAsFireplace( this, fire_source );
+	}
+
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		return Fireplace.CanIgniteEntityAsFireplace( this );
+	}
+	
+	override void SetActions()
+	{
+		AddAction(ActionPackGift);
+		super.SetActions();
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Grenade_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Grenade_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..0220da16067fcf0fb8deb4c23731aafcd03f0334
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Grenade_Base.c
@@ -0,0 +1,306 @@
+enum EGrenadeType
+{
+	FRAGMENTATION = 0,
+	CHEMICAL,
+	ILLUMINATING,
+	NON_LETHAL
+}
+
+//! For backward compatibility
+class GrenadeLight : ExplosiveLight {}
+
+class FlashGrenadeLight : PointLightBase
+{
+	protected static float m_DefaultBrightness	= 50;
+	protected static float m_DefaultRadius		= 20;
+	
+	void FlashGrenadeLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(m_DefaultRadius);
+		SetBrightnessTo(m_DefaultBrightness);
+		SetFlareVisible(false);
+		SetAmbientColor(1.0, 1.0, 1.0);
+		SetDiffuseColor(1.0, 1.0, 1.0);
+		SetLifetime(0.35);
+		SetDisableShadowsWithinRadius(-1);
+	}
+}
+
+class Grenade_Base : ExplosivesBase
+{
+	protected const float DEFAULT_FUSE_DELAY 	= 10;
+
+	protected ref Timer		m_FuseTimer;
+	protected float			m_FuseDelay;
+	protected float 		m_RemainingFuseTime;
+	
+	protected bool			m_Pinned;
+	protected bool			m_Pinnable;
+	//protected bool		m_Explodable;	//! DEPRECATED; not used anywhere
+	
+	protected EGrenadeType	m_GrenadeType;
+
+	void Pin()
+	{
+		if (!m_Pinned && m_Pinnable)
+		{
+			OnPin();
+		}
+	}
+	
+	void Unpin()
+	{
+		if (m_Pinned)
+		{
+			OnUnpin();
+		}
+	}		
+	
+	//! DEPRECATED use OnActivatedByItem
+	override void OnActivatedByTripWire();
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (item == this)
+		{
+			OnActivateFinished();
+			return;
+		}
+
+		Unpin();
+	}
+	
+	bool IsPinned()
+	{
+		return m_Pinned;
+	}
+	
+	bool IsPinnable()
+	{
+		//! cannot be pinned once the fuse has started
+		if (m_FuseTimer.IsRunning())
+		{
+			return false;	
+		}
+		
+		return m_Pinnable;
+	}
+	
+	void ActivateImmediate()
+	{
+		OnActivateImmediate();
+	}
+	
+	void ActivateRandomTime()
+	{
+		float delay = Math.RandomFloat(1, 20);
+		delay *= 1000; //! to millis
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(ActivateImmediate, delay, false);
+	}
+	
+	void SetPinnable(bool state)
+	{
+		m_Pinnable = state;
+	}
+	
+	void SetFuseDelay(float delay)
+	{
+		m_FuseDelay = delay;
+	}
+
+	void SetGrenadeType(EGrenadeType type)
+	{
+		m_GrenadeType = type;
+	}
+	
+	EGrenadeType GetGrenadeType()
+	{
+		return m_GrenadeType;
+	}
+	
+	protected void Activate()
+	{
+		if (!m_FuseTimer.IsRunning())
+		{
+			//! run only the remaining part (already unpinned and pinned)
+			if (m_RemainingFuseTime > 0)
+			{
+				//Debug.Log(string.Format("Grenade activated num of seconds to explosion: %1", m_RemainingFuseTime));
+				m_FuseTimer.Run(m_RemainingFuseTime, this, "OnActivateFinished");
+			}
+			else
+			{
+				//Debug.Log(string.Format("Grenade activated num of seconds to explosion: %1", m_FuseDelay));
+				m_FuseTimer.Run(m_FuseDelay, this, "OnActivateFinished");
+			}
+
+		}
+	}
+
+	protected void Deactivate()
+	{
+		if (m_FuseTimer.IsRunning())
+		{
+			m_RemainingFuseTime = m_FuseTimer.GetRemaining();
+			m_FuseTimer.Stop();
+			OnDeactivate();
+		}
+	}
+	
+	protected override void InitiateExplosion()
+	{
+		switch (GetGrenadeType())
+		{
+			case EGrenadeType.FRAGMENTATION:
+			case EGrenadeType.ILLUMINATING:
+				for (int i = 0; i < m_AmmoTypes.Count(); i++)
+				{
+					Explode(DamageType.EXPLOSION, m_AmmoTypes[i]);
+				}
+			break;
+			case EGrenadeType.CHEMICAL:
+			case EGrenadeType.NON_LETHAL:
+			break;
+		}
+		
+		OnExplode();	
+	}
+
+	//! DEPRECATED - for backward compatibility only
+	protected void ExplodeGrenade(EGrenadeType grenade_type)
+	{
+		InitiateExplosion();
+	}
+
+	protected void OnPin()
+	{
+		m_Pinned = true;
+		if (GetGame().IsServer())
+		{
+			ForceFarBubble(false);
+			SetSynchDirty();
+		}
+
+		Deactivate();
+	}
+
+	protected void OnUnpin()
+	{
+		m_Pinned = false;
+		if (GetGame().IsServer())
+		{
+			ForceFarBubble(true);
+			SetSynchDirty();
+		}
+
+		OnActivateStarted();
+	}
+
+	protected void OnActivateStarted();
+	protected void OnActivateFinished()
+	{
+		if (GetGame().IsServer())
+		{
+			SetHealth("", "", 0.0); // causes explosion when grenade is destroyed
+			SetTakeable(false);
+		}
+	}
+	
+	protected void OnActivateImmediate()
+	{
+		if (GetGame().IsServer())
+		{
+			SetHealth("", "", 0.0); // causes explosion when grenade is destroyed
+			SetTakeable(false);
+		}
+	}
+	
+	protected void OnDeactivate();
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		if (GetGame().SaveVersion() >= 107)
+		{
+			ctx.Write(m_Pinned);
+		}
+	}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+		
+		bool pinned;
+		if (version >= 107)
+		{
+			if (!ctx.Read(pinned))
+			{
+				return false;
+			}
+			
+			m_Pinned = pinned;
+		}
+
+		return true;
+	}
+	
+	override bool CanBeArmed()
+	{
+		return false;
+	}
+	
+	override bool CanBeDisarmed()
+	{
+		return false;
+	}
+
+	override bool CanExplodeInFire()
+	{
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionUnpin);
+		AddAction(ActionPin);
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+
+		//! activate grenade when it leaves player hands (safety handle released)
+		if (newLoc.GetType() != InventoryLocationType.HANDS && !IsPinned())
+		{
+			Activate();
+		}
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if (parent.IsAnyInherited({TrapBase,ImprovisedExplosive}))
+		{
+			Deactivate();
+		}
+	}
+	
+	void Grenade_Base()
+	{
+		m_Pinned			= true;
+		m_FuseTimer			= new Timer;
+		m_RemainingFuseTime = -1;
+
+		SetPinnable(true);
+		SetFuseDelay(DEFAULT_FUSE_DELAY);
+		SetGrenadeType(EGrenadeType.FRAGMENTATION);
+		
+		RegisterNetSyncVariableBool("m_Pinned");
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Hacksaw.c b/scripts/4_World/DayZ/Entities/ItemBase/Hacksaw.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f21d06b8da6e1540178216afca773bc913f395f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Hacksaw.c
@@ -0,0 +1,16 @@
+class Hacksaw extends ToolBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionMineBush);
+		AddAction(ActionSawPlanks);
+		AddAction(ActionDismantlePart);
+		//AddAction(ActionDestroyCombinationLock);
+		//AddAction(ActionDestroyPart);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineTreeBark);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Hammer.c b/scripts/4_World/DayZ/Entities/ItemBase/Hammer.c
new file mode 100644
index 0000000000000000000000000000000000000000..3ab5b8d26cc9c02a9a9378cb6ea3873668c4422b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Hammer.c
@@ -0,0 +1,11 @@
+class Hammer extends Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRepairPart);
+		AddAction(ActionMineRock1H);
+		AddAction(ActionBuildPart);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/HandDrillKit.c b/scripts/4_World/DayZ/Entities/ItemBase/HandDrillKit.c
new file mode 100644
index 0000000000000000000000000000000000000000..4bc34f610ef5aea4486641abd44d3cac81ef79ca
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/HandDrillKit.c
@@ -0,0 +1,37 @@
+class HandDrillKit extends ItemBase
+{
+	//! Override this method and and check if the given item can be ignited. It is not necesarry to check here if the item is not in cargo of something.
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		return true;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+		if ( GetGame().IsServer() )
+		{
+			DecreaseHealth( 20 );
+		}
+	}	
+	
+	override void OnIgnitedTargetFailed( EntityAI target_item )
+	{
+		if ( GetGame().IsServer() )
+		{
+			DecreaseHealth( 20 );
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionLightItemOnFire);
+	}
+	
+	/*
+	override bool IsTargetIgnitionSuccessful( EntityAI item_target = NULL )
+	{
+	}
+	*/	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/HandcuffsLocked.c b/scripts/4_World/DayZ/Entities/ItemBase/HandcuffsLocked.c
new file mode 100644
index 0000000000000000000000000000000000000000..654f9378a4c8eecffc9faedfa03f270dbc80c486
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/HandcuffsLocked.c
@@ -0,0 +1,116 @@
+class RestrainingToolLocked extends ItemBase
+{
+	void ~RestrainingToolLocked()
+	{
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		if ( player && player.IsRestrained() )
+		{
+			player.SetRestrained(false);
+		}
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+		
+		if ( GetGame().IsServer() )
+		{
+			if ( oldLoc.IsValid() && oldLoc.GetParent() )
+			{
+				PlayerBase old_player = PlayerBase.Cast(oldLoc.GetParent().GetHierarchyRootPlayer());
+				if (old_player && old_player.IsRestrained())
+				{
+					old_player.SetRestrained(false);
+				}
+			}
+		}
+		
+		if ( newLoc.IsValid() )
+		{
+			if (newLoc.GetParent())
+			{
+				PlayerBase player = PlayerBase.Cast(newLoc.GetParent().GetHierarchyRootPlayer());
+			
+				if ( player )
+				{
+					if ( newLoc.GetType() == InventoryLocationType.HANDS )
+					{
+						if ( !player.IsRestrained() )
+						{
+							player.SetRestrained(true);
+							player.OnItemInHandsChanged();
+						}
+						
+						if (player.IsControlledPlayer())
+							player.OnRestrainStart();
+					}
+				}
+			}
+		}
+		
+		if ( GetGame().IsServer() )
+		{
+			if ( newLoc.GetType() != InventoryLocationType.HANDS )
+			{
+				if (oldLoc.GetParent())
+				{
+					PlayerBase old_p = PlayerBase.Cast(oldLoc.GetParent().GetHierarchyRootPlayer());
+					if (old_p)
+					{
+						MiscGameplayFunctions.TransformRestrainItem(this, null, old_p, old_p);
+						return;
+					}
+				}
+				
+				Delete();
+			}
+		}	
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		
+		InventoryLocation inventoryLocation = new InventoryLocation();
+		GetInventory().GetCurrentInventoryLocation(inventoryLocation);
+		if (!inventoryLocation || !inventoryLocation.IsValid())
+			return;
+
+		if (inventoryLocation.GetType() == InventoryLocationType.HANDS)
+		{
+			PlayerBase player = PlayerBase.Cast(inventoryLocation.GetParent());
+			if (player && player.IsRestrained())
+			{
+				player.SetRestrained(false);
+				MiscGameplayFunctions.TransformRestrainItem(this, null, player, player);
+			}
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionUnrestrainSelf);
+	}
+}
+
+class HandcuffsLocked extends RestrainingToolLocked
+{
+}
+
+class RopeLocked extends RestrainingToolLocked
+{
+}
+
+class DuctTapeLocked extends RestrainingToolLocked
+{
+}
+
+class MetalWireLocked extends RestrainingToolLocked
+{
+}
+
+class BarbedWireLocked extends RestrainingToolLocked
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Hatchet.c b/scripts/4_World/DayZ/Entities/ItemBase/Hatchet.c
new file mode 100644
index 0000000000000000000000000000000000000000..659f559ab1cc3202df8fbfc06c93a73280d09a99
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Hatchet.c
@@ -0,0 +1,19 @@
+class Hatchet extends ToolBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionMineTree);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionMineBush);
+		AddAction(ActionRepairPart);
+		AddAction(ActionDismantlePart);
+		AddAction(ActionBuildPart);
+		//AddAction(ActionDestroyPart);
+		//AddAction(ActionSawPlanks);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Head.c b/scripts/4_World/DayZ/Entities/ItemBase/Head.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8244462a8c2457191053fe9f9c6c5e54a4056c1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Head.c
@@ -0,0 +1,3 @@
+class Head : ItemBase
+{
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Heatpack.c b/scripts/4_World/DayZ/Entities/ItemBase/Heatpack.c
new file mode 100644
index 0000000000000000000000000000000000000000..4a8e35767898573a631684c3710e4ccc9c870e81
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Heatpack.c
@@ -0,0 +1,38 @@
+class Heatpack : ItemBase
+{
+	override bool CanHaveTemperature()
+	{
+		return true;
+	}
+	
+	override void OnWorkStart()
+	{
+		if (GetGame().IsServer())
+		{
+			SetTemperature(60);
+		}
+	}
+	
+	override void OnWork( float consumed_energy )
+	{
+		if (GetGame().IsServer())
+		{
+			SetTemperature(60);
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		if (GetGame().IsServer())
+		{
+			SetHealth(0);
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnHeatpack);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/HescoBox.c b/scripts/4_World/DayZ/Entities/ItemBase/HescoBox.c
new file mode 100644
index 0000000000000000000000000000000000000000..2a709174a49f9b892b18b43236e887cf4ae5875c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/HescoBox.c
@@ -0,0 +1,293 @@
+class HescoBox extends Inventory_Base
+{
+	static const int FOLDED            = 0;
+	static const int UNFOLDED 		   = 1;
+	static const int FILLED 		   = 2;
+	static const int PERCENTUAL_DAMAGE = 1;
+	
+	ref Timer 						m_Timer;
+	ref protected EffectSound 		m_DeployLoopSound;
+
+	protected int m_State;
+	
+	void HescoBox()
+	{
+		m_State = FOLDED;
+
+		//synchronized variables
+		RegisterNetSyncVariableInt( "m_State", FOLDED, FILLED );
+		RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+		RegisterNetSyncVariableBool("m_IsDeploySound");
+	}
+	
+	void ~HescoBox()
+	{
+		SEffectManager.DestroyEffect( m_DeployLoopSound );
+	}
+
+	override bool HasProxyParts()
+	{
+		return true;
+	}
+	
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		if( !super.CanPutIntoHands( parent ) )
+		{
+			return false;
+		}
+		return CanBeManipulated();
+	}
+		
+	void Synchronize()
+	{
+		SetSynchDirty();
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		//refresh visuals
+		RefreshVisuals();
+				
+		if ( IsDeploySound() )
+		{
+			PlayDeploySound();
+		}
+				
+		if ( CanPlayDeployLoopSound() )
+		{
+			PlayDeployLoopSound();
+		}
+					
+		if ( m_DeployLoopSound && !CanPlayDeployLoopSound() )
+		{
+			StopDeployLoopSound();
+		}
+	}
+	
+	void RefreshVisuals()
+	{
+	}
+
+	int GetState()
+	{
+		return m_State;
+	}
+	
+	void SetState( int state )
+	{
+		m_State = state;
+	}
+
+	bool CanBeFilledAtPosition( vector position )
+	{
+		string surface_type;
+		GetGame().SurfaceGetType( position[0], position[2], surface_type );
+		
+		return GetGame().IsSurfaceDigable(surface_type);
+	}
+
+	bool CanBeManipulated()
+	{
+		if ( GetState() == FOLDED )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	void Fold()
+	{
+		this.ShowSelection( "inventory" );
+		this.HideSelection( "placing" );
+		this.HideSelection( "filled" );
+		
+		SetState( FOLDED );
+		RefreshPhysics();
+		
+		if ( GetGame().IsServer() )
+		{
+			SetAllowDamage(true);
+			Synchronize();
+			float fold_damage = ( GetMaxHealth( "", "" ) / 100 ) * PERCENTUAL_DAMAGE;
+			DecreaseHealth( "", "", fold_damage );
+		}
+	}
+
+	void Unfold()
+	{
+		this.HideSelection( "inventory" );
+		this.ShowSelection( "placing" );
+		this.HideSelection( "filled" );
+		
+		SetState( UNFOLDED );
+		RefreshPhysics();
+		
+		if ( GetGame().IsServer() )
+		{
+			SetAllowDamage(true);
+			Synchronize();
+			float unfold_damage = ( GetMaxHealth( "", "" ) / 100 ) * PERCENTUAL_DAMAGE;
+			DecreaseHealth( "", "", unfold_damage );	
+		}
+	}
+
+	override void EEItemLocationChanged (notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged (oldLoc, newLoc);
+		
+		//RefreshPhysics();
+	}
+
+	override void RefreshPhysics()
+	{
+		super.RefreshPhysics();
+		
+		if ( this  &&  !ToDelete() )
+		{
+			RemoveProxyPhysics( "inventory" );
+			RemoveProxyPhysics( "placing" );
+			RemoveProxyPhysics( "filled" );
+			
+			int state = GetState();
+			
+			switch (state)
+			{
+				case UNFOLDED:
+					//ShowSelection( "placing" );
+					AddProxyPhysics( "placing" ); 
+					
+				return;
+				
+				case FOLDED:
+					AddProxyPhysics( "inventory" ); 
+				return;
+				
+				case FILLED:
+					AddProxyPhysics( "filled" ); 
+				return;
+			}
+		}
+	}
+
+	void Fill()
+	{
+		this.HideSelection( "inventory" );
+		this.HideSelection( "placing" );
+		this.ShowSelection( "filled" );
+		
+		SetState( FILLED );
+		RefreshPhysics();
+		
+		if ( GetGame().IsServer() )
+		{
+			Synchronize();
+			DecreaseHealth( "", "", 5 ); //TODO Daniel implement soft skill bonus via useraction
+			SetAllowDamage(false);
+		}
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{   
+		super.OnStoreSave(ctx);
+		
+		// Save state
+		ctx.Write( m_State );
+	}
+
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{   
+		if ( !super.OnStoreLoad(ctx, version) )
+			return false;
+		
+		// Load folded/unfolded state
+		int state = FOLDED;
+		if ( !ctx.Read(state) )
+			state = FOLDED;
+		
+		switch (state)
+		{
+			case FOLDED:
+			{
+				Fold();
+				break;
+			}
+			case UNFOLDED:
+			{
+				Unfold();
+				break;
+			}
+			case FILLED:
+			{
+				Fill();
+				break;
+			}
+		}
+		return true;
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementComplete( Man player, vector position = "0 0 0", vector orientation = "0 0 0" )
+	{
+		super.OnPlacementComplete( player, position, orientation );
+		
+		if ( GetGame().IsServer() )
+		{
+			Unfold();
+			
+			SetIsDeploySound( true );
+		}
+	}
+		
+	override bool IsDeployable()
+	{
+		return true;
+	}
+
+	override string GetDeploySoundset()
+	{
+		return "placeHescoBox_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		return "hescobox_deploy_SoundSet";
+	}
+	
+	void PlayDeployLoopSound()
+	{		
+		if ( !GetGame().IsDedicatedServer() )
+		{		
+			if ( !m_DeployLoopSound || !m_DeployLoopSound.IsSoundPlaying() )
+			{
+				m_DeployLoopSound = SEffectManager.PlaySound( GetLoopDeploySoundset(), GetPosition() );
+			}
+		}
+	}
+	
+	void StopDeployLoopSound()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{	
+			m_DeployLoopSound.SetSoundFadeOut(0.5);
+			m_DeployLoopSound.SoundStop();
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionFoldObject);
+		AddAction(ActionDeployObject);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/HuntingKnife.c b/scripts/4_World/DayZ/Entities/ItemBase/HuntingKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..c0720f396708c9b7def8de04cd19265621632d85
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/HuntingKnife.c
@@ -0,0 +1,30 @@
+class HuntingKnife extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionDisarmMine);
+		AddAction(ActionDisarmExplosive);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..546e348e93fa31a1d96d8b05f6f33d23c4f02038
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base.c
@@ -0,0 +1,3 @@
+class Inventory_Base extends ItemBase
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK74_Hndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK74_Hndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..6fda2542689ae8a739fc41e78f0c53e9c95a0b03
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK74_Hndgrd.c
@@ -0,0 +1,9 @@
+class AK74_Hndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_Bayonet.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_Bayonet.c
new file mode 100644
index 0000000000000000000000000000000000000000..dd34ab0fbf1070f2f8e00e7230e6a6e613f66267
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_Bayonet.c
@@ -0,0 +1,60 @@
+class AK_Bayonet extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.FindAttachmentBySlotName("suppressorImpro") == null && parent.FindAttachmentBySlotName("weaponMuzzleAK") == null )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(true,slot_id);
+		}		
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(false);
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionDisarmMine);
+		AddAction(ActionDisarmExplosive);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_PlasticHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_PlasticHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..56760ecbdf542ef5f5a20e3067b8ba22a41cf4fc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_PlasticHndgrd.c
@@ -0,0 +1,9 @@
+class AK_PlasticHndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_RailHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_RailHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..675e21a339c24f5c28eb073d1113b438cfcdfb0c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_RailHndgrd.c
@@ -0,0 +1,11 @@
+class AK_RailHndgrd extends Inventory_Base
+{
+	override bool CanDetachAttachment (EntityAI parent)
+	{
+		if ( Weapon_Base.Cast(parent) && parent.FindAttachmentBySlotName("weaponFlashlight")/*.IsKindOf("UniversalLight")*/ )
+		{
+			return false;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_WoodHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_WoodHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..f6bdb12698522750089d0e7de9b01aed4437271f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AK_WoodHndgrd.c
@@ -0,0 +1,9 @@
+class AK_WoodHndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AtlasBipod.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AtlasBipod.c
new file mode 100644
index 0000000000000000000000000000000000000000..baa951bff7d56f21b9cdd43308d7d57dd1fcab37
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/AtlasBipod.c
@@ -0,0 +1,31 @@
+class AtlasBipod extends Inventory_Base
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		bool m4_hndgrd = false;
+		bool ak_hndgrd = false;
+
+		if ( parent.FindAttachmentBySlotName("weaponHandguardM4") != NULL )
+		{
+			m4_hndgrd = parent.FindAttachmentBySlotName("weaponHandguardM4").IsKindOf("M4_RISHndgrd");
+		}
+		
+		if ( parent.FindAttachmentBySlotName("weaponHandguardAK") != NULL )
+		{
+			ak_hndgrd = parent.FindAttachmentBySlotName("weaponHandguardAK").IsKindOf("AK_RailHndgrd");
+		}
+
+		if ( m4_hndgrd || ak_hndgrd )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/BUISOptic.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/BUISOptic.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d23a5dfe86a21491e826efe94e497404fc31afc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/BUISOptic.c
@@ -0,0 +1,14 @@
+class BUISOptic extends ItemOptics
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.IsKindOf("M4A1_Base") )
+		{
+			return true;
+		}
+
+		return false;
+		//return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Candle.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Candle.c
new file mode 100644
index 0000000000000000000000000000000000000000..4ac90500eb5faa77d5d6d92458354f61a56a98d0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Candle.c
@@ -0,0 +1,12 @@
+class Candle extends Inventory_Base
+{
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if( !super.CanPutInCargo(parent) ) {return false;}
+		if (parent && !parent.HasSelection("flame"))
+		{
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/FryingPan.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/FryingPan.c
new file mode 100644
index 0000000000000000000000000000000000000000..53ebf83ff1f1b757496c36b10f18b4957e8ee466
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/FryingPan.c
@@ -0,0 +1,239 @@
+class FryingPan extends Inventory_Base
+{
+	// Cooking data
+	protected CookingMethodType 		m_CookingMethod;
+	protected bool 						m_CookingIsDone;
+	protected bool 						m_CookingIsEmpty;
+	protected bool 						m_CookingIsBurned;
+
+	// Particles
+	protected Particle 	m_ParticleCooking;
+	protected int 		m_ParticlePlaying 	= ParticleList.INVALID;
+
+	protected int PARTICLE_BAKING_START 	= ParticleList.COOKING_BAKING_START;
+	protected int PARTICLE_BAKING_DONE 		= ParticleList.COOKING_BAKING_DONE;
+	protected int PARTICLE_DRYING_START 	= ParticleList.COOKING_DRYING_START;
+	protected int PARTICLE_DRYING_DONE 		= ParticleList.COOKING_DRYING_DONE;
+	protected int PARTICLE_BURNING_DONE		= ParticleList.COOKING_BURNING_DONE;
+
+	// Sounds
+	protected SoundOnVehicle	m_SoundCooking;	//! DEPRECATED
+	protected EffectSound		m_SoundEffectCooking;
+	protected string			m_SoundPlaying = "";
+
+	const string SOUND_BAKING_START 	= "Baking_SoundSet";		//! DEPRECATED
+	const string SOUND_BAKING_DONE 		= "Baking_Done_SoundSet";	//! DEPRECATED
+	const string SOUND_DRYING_START 	= "Drying_SoundSet";		//! DEPRECATED
+	const string SOUND_DRYING_DONE 		= "Drying_Done_SoundSet";  	//! DEPRECATED
+	const string SOUND_BURNING_DONE 	= "Food_Burning_SoundSet"; 	//! DEPRECATED
+
+	void FryingPan()
+	{
+		RegisterNetSyncVariableInt( "m_CookingMethod", CookingMethodType.NONE, CookingMethodType.COUNT );
+		RegisterNetSyncVariableBool( "m_CookingIsDone" );
+		RegisterNetSyncVariableBool( "m_CookingIsEmpty" );
+		RegisterNetSyncVariableBool( "m_CookingIsBurned" );
+	}
+	void ~FryingPan() {}
+
+	override bool IsContainer()
+	{
+		return true;		
+	}
+	
+	override bool CanHaveTemperature()
+	{
+		return true;
+	}
+
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if ( !super.CanPutInCargo( parent ) )
+			return false;
+		
+		if ( parent && IsCargoException4x3( parent ) )
+			return false;
+		
+		//is 'parent' somewhere in cargo?
+		if (parent && parent.GetInventory().IsCargoInHiearchy())
+			return false;
+
+		return true;
+	}
+
+	override bool CanReceiveItemIntoCargo( EntityAI item )
+	{
+		if ( !super.CanReceiveItemIntoCargo( item ) )
+			return false;
+		
+		if ( IsCargoException4x3( item ) )
+			return false;
+		
+		//is 'this' somewhere in cargo?
+		if (GetInventory().IsCargoInHiearchy())
+			return false;
+		
+		//can 'this' be attached to the item (->assumed smaller size than item)?
+		int slotId;
+		for (int i = 0; i < GetInventory().GetSlotIdCount(); i++)
+		{
+			slotId = GetInventory().GetSlotId(i);
+			if (item.GetInventory().HasAttachmentSlot(slotId))
+			{
+				//Print("CanReceiveItemIntoCargo | item " + item + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	override bool CanLoadItemIntoCargo( EntityAI item )
+	{
+		if ( !super.CanLoadItemIntoCargo( item ) )
+			return false;
+
+		if ( IsCargoException4x3( item ) )
+			return false;
+		
+		//can 'this' be attached to the item (->assumed smaller size than item)?
+		int slotId;
+		for (int i = 0; i < GetInventory().GetSlotIdCount(); i++)
+		{
+			slotId = GetInventory().GetSlotId(i);
+			if (item.GetInventory().HasAttachmentSlot(slotId))
+			{
+				//Print("CanLoadItemIntoCargo | item " + item + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+
+	override void EEDelete( EntityAI parent )
+	{
+		super.EEDelete( parent );
+		
+		//remove audio visuals
+		RemoveAudioVisuals();
+	}
+
+	void Synchronize()
+	{
+		if ( GetGame() && GetGame().IsServer() )
+		{
+			SetSynchDirty();
+		}
+	}
+
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		//refresh audio visuals
+		if ( m_CookingMethod != CookingMethodType.NONE )
+		{
+			RefreshAudioVisuals( m_CookingMethod, m_CookingIsDone, m_CookingIsEmpty, m_CookingIsBurned );
+		}
+		else
+		{
+			RemoveAudioVisuals();
+		}
+	}
+
+	void RemoveAudioVisualsOnClient()
+	{
+		m_CookingMethod	= CookingMethodType.NONE;
+		
+		Synchronize();
+	}
+
+	void RefreshAudioVisualsOnClient( CookingMethodType cooking_method, bool is_done, bool is_empty, bool is_burned )
+	{
+		m_CookingMethod		= cooking_method;
+		m_CookingIsDone 	= is_done;
+		m_CookingIsEmpty	= is_empty;
+		m_CookingIsBurned	= is_burned;
+
+		Synchronize();
+	}
+
+	void RefreshAudioVisuals( CookingMethodType cooking_method, bool is_done, bool is_empty, bool is_burned )
+	{
+		int particleId;
+		
+		//if at least one of the food items is burned
+		if (is_burned)
+		{
+			particleId 	= PARTICLE_BURNING_DONE;
+		}
+		//proper cooking methods
+		else
+		{
+			if (cooking_method == CookingMethodType.BAKING)
+			{
+				if (is_done)
+					particleId = PARTICLE_BAKING_DONE;
+				else
+					particleId  = PARTICLE_BAKING_START;
+			}
+			else if (cooking_method == CookingMethodType.DRYING)
+			{
+				if (is_done)
+					particleId = PARTICLE_DRYING_DONE;
+				else
+					particleId = PARTICLE_DRYING_START;
+			}			
+		}
+		
+		ParticleCookingStart(particleId);
+	}
+	
+	void RemoveAudioVisuals()
+	{
+		ParticleCookingStop();
+	}
+
+	void ParticleCookingStart( int particle_id )
+	{
+		if ( m_ParticlePlaying != particle_id )
+		{
+			//stop previous particles
+			ParticleCookingStop();
+			
+			//create new
+			if ( GetGame() && ( !GetGame().IsDedicatedServer() ) )
+			{
+				vector local_pos = MiscGameplayFunctions.GetSteamPosition( GetHierarchyParent() );
+				//TODO set steam position to pot (proxy) memory point (new hierarchy needed)
+				//m_ParticleCooking = Particle.Create( particle_id, this, local_pos );
+				m_ParticleCooking = ParticleManager.GetInstance().PlayInWorld( particle_id, local_pos );
+				m_ParticlePlaying = particle_id;
+			}
+		}
+	}
+	void ParticleCookingStop()
+	{
+		if ( m_ParticleCooking && GetGame() && ( !GetGame().IsDedicatedServer() ) )
+		{
+			m_ParticleCooking.Stop();
+			m_ParticleCooking = NULL;
+			m_ParticlePlaying = ParticleList.INVALID;
+		}
+	}
+
+	//! DEPRECATED
+	protected void SoundCookingStart(string sound_name);
+	protected void SoundCookingStop();
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/GardenLime.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/GardenLime.c
new file mode 100644
index 0000000000000000000000000000000000000000..e00995fe239ac72356341c408fa34e7170c32410
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/GardenLime.c
@@ -0,0 +1,74 @@
+class GardenLime extends ItemBase
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Plant", "OakBark", "BirchBark", "Nails", "Disinfectant", "Guts" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		//AddAction(ActionClapBearTrapWithThisItem);
+		AddAction(ActionFertilizeSlot);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/GrozaGL_LowerReceiver.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/GrozaGL_LowerReceiver.c
new file mode 100644
index 0000000000000000000000000000000000000000..68510b6644a005778bbc681c32a9ff63b0cf2535
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/GrozaGL_LowerReceiver.c
@@ -0,0 +1,12 @@
+class GrozaGL_LowerReceiver extends ItemBase
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.FindAttachmentBySlotName("weaponMuzzleAK") == NULL )
+		{
+			return true;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/HuntingOptic.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/HuntingOptic.c
new file mode 100644
index 0000000000000000000000000000000000000000..d97f74c2c8249622a227df5b4f4d7ca5059b9ad1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/HuntingOptic.c
@@ -0,0 +1,73 @@
+class HuntingOptic extends ItemOptics
+{
+	EntityAI m_Parent;
+	
+	void HuntingOptic()
+	{
+		HideSelection("rings_ris");
+		HideSelection("rings_ris_pilot");
+	}
+	
+	override void OnWasAttached( EntityAI parent, int slot_id )
+	{
+		super.OnWasAttached(parent, slot_id);
+		m_Parent = parent;
+		if (!ParentUsesWinchesterTypeMount())
+		{
+			HideSelection("rings_winchester");
+			HideSelection("rings_winchester_pilot");
+			ShowSelection("rings_ris");
+			ShowSelection("rings_ris_pilot");
+		}
+	}
+	
+	override void OnWasDetached( EntityAI parent, int slot_id )
+	{
+		super.OnWasDetached(parent, slot_id);
+		m_Parent = null;
+		HideSelection("rings_ris");
+		HideSelection("rings_ris_pilot");
+		ShowSelection("rings_winchester");
+		ShowSelection("rings_winchester_pilot");
+	}
+	
+	override void HideSelection( string selection_name )
+	{
+		super.HideSelection( selection_name );
+		if (selection_name == "hide") //hides pilotview selections in order not to obstruct view
+		{
+			HideSelection("rings_ris_pilot");
+			HideSelection("rings_winchester_pilot");
+		}
+	}
+	
+	override void ShowSelection( string selection_name )
+	{
+		super.ShowSelection( selection_name );
+		if (selection_name == "hide")
+		{
+			if (!ParentUsesWinchesterTypeMount())
+			{
+				HideSelection("rings_winchester");
+				HideSelection("rings_winchester_pilot");
+				ShowSelection("rings_ris");
+				ShowSelection("rings_ris_pilot");
+			}
+			else
+			{
+				HideSelection("rings_ris");
+				HideSelection("rings_ris_pilot");
+				ShowSelection("rings_winchester");
+				ShowSelection("rings_winchester_pilot");
+			}
+		}
+	}
+	
+	bool ParentUsesWinchesterTypeMount()
+	{
+		if (m_Parent && m_Parent.ConfigIsExisting("winchesterTypeOpticsMount"))
+			return m_Parent.ConfigGetBool("winchesterTypeOpticsMount");
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M249_Hndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M249_Hndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..141da2e954b9ce4a405e3388bec3072220998fb8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M249_Hndgrd.c
@@ -0,0 +1,9 @@
+class M249_Hndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M249_RisHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M249_RisHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab7d23c89a0426651e6253c32494955d8bb8d6c6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M249_RisHndgrd.c
@@ -0,0 +1,9 @@
+class M249_RisHndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_CarryHandleOptic.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_CarryHandleOptic.c
new file mode 100644
index 0000000000000000000000000000000000000000..4161950c67c96215854f3783c3bde9d0843c4364
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_CarryHandleOptic.c
@@ -0,0 +1,13 @@
+class M4_CarryHandleOptic extends ItemOptics
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.IsKindOf("M4A1_Base") )
+		{
+			return true;
+		}
+
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_MPHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_MPHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..b6f8e73b2f9bfacc4058989ec05b470949ff3506
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_MPHndgrd.c
@@ -0,0 +1,9 @@
+class M4_MPHndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_PlasticHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_PlasticHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..0dcb26b6beb53f87b7ddf407dbed5af66c3eee03
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_PlasticHndgrd.c
@@ -0,0 +1,9 @@
+class M4_PlasticHndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_RISHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_RISHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..319ac7f82150f7df229e1e7443e36d68d9f891f2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M4_RISHndgrd.c
@@ -0,0 +1,11 @@
+class M4_RISHndgrd extends Inventory_Base
+{
+	override bool CanDetachAttachment (EntityAI parent)
+	{
+		if ( Weapon_Base.Cast(parent) && parent.FindAttachmentBySlotName("weaponFlashlight") )
+		{
+			return false;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M9A1_Bayonet.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M9A1_Bayonet.c
new file mode 100644
index 0000000000000000000000000000000000000000..c702dd24819a9c5881666812ec8b183ed0ac59d7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/M9A1_Bayonet.c
@@ -0,0 +1,60 @@
+class M9A1_Bayonet extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.FindAttachmentBySlotName("suppressorImpro") == null && parent.FindAttachmentBySlotName("weaponMuzzleM4") == null )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(true,slot_id);
+		}		
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(false);
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionDisarmMine);
+		AddAction(ActionDisarmExplosive);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_Compensator.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_Compensator.c
new file mode 100644
index 0000000000000000000000000000000000000000..167a1782bc7523e34e2527875347e7b09c7c1f89
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_Compensator.c
@@ -0,0 +1,12 @@
+class MP5_Compensator extends ItemSuppressor
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( !parent.FindAttachmentBySlotName("pistolMuzzle") )
+		{
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_PlasticHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_PlasticHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..b32ed415b5fbb00d58203be51fab8582d8e531a2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_PlasticHndgrd.c
@@ -0,0 +1,9 @@
+class MP5_PlasticHndgrd extends Inventory_Base
+{
+/*
+	override bool CanDetachAttachment( EntityAI attachment )
+	{
+		return false;
+	}
+*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_RailHndgrd.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_RailHndgrd.c
new file mode 100644
index 0000000000000000000000000000000000000000..a23dc51fa00ae157ef6d887e9ecbb4d09b9bc233
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/MP5_RailHndgrd.c
@@ -0,0 +1,11 @@
+class MP5_RailHndgrd extends Inventory_Base
+{
+	override bool CanDetachAttachment (EntityAI parent)
+	{
+		if ( Weapon_Base.Cast(parent) && parent.FindAttachmentBySlotName("weaponFlashlight")/*.IsKindOf("UniversalLight")*/ )
+		{
+			return false;
+		}
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Mosin_Bayonet.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Mosin_Bayonet.c
new file mode 100644
index 0000000000000000000000000000000000000000..39193f1ccbc7d955a4f0032f76809e774c9f991b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Mosin_Bayonet.c
@@ -0,0 +1,52 @@
+class Mosin_Bayonet extends Inventory_Base
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.FindAttachmentBySlotName("suppressorImpro") == null && parent.FindAttachmentBySlotName("weaponMuzzleMosin") == null )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(true,slot_id);
+		}		
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(false);
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Mosin_Compensator.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Mosin_Compensator.c
new file mode 100644
index 0000000000000000000000000000000000000000..27af8050908d831cc7ec0d551b1151e91ec05e63
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Mosin_Compensator.c
@@ -0,0 +1,12 @@
+class Mosin_Compensator extends ItemSuppressor
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.FindAttachmentBySlotName("suppressorImpro") == NULL && parent.FindAttachmentBySlotName("pistolMuzzle") == NULL )
+		{
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Nail.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Nail.c
new file mode 100644
index 0000000000000000000000000000000000000000..bde9a9d18f8aa19759d1c9a286c5e61a4c5a33ec
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Nail.c
@@ -0,0 +1,66 @@
+class Nails extends Inventory_Base
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		const int SLOTS_ARRAY = 8;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test = true;
+		string slot_names[SLOTS_ARRAY] = { "BerryR", "BerryB", "Plant", "OakBark", "BirchBark", "Lime", "Disinfectant", "Guts" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel slots are empty
+		for ( int i = 0; i < SLOTS_ARRAY ; i++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names[i]) != NULL )
+			{
+				slot_test = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test ) || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Optics.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Optics.c
new file mode 100644
index 0000000000000000000000000000000000000000..25e3a61b22e8da9b2738e04353811f7acbd4b974
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Optics.c
@@ -0,0 +1,158 @@
+class Crossbow_RedpointOptic : ItemOptics {};
+class LongrangeOptic : ItemOptics {};
+class PistolOptic : ItemOptics {};
+class GrozaOptic : ItemOptics {};
+class ACOGOptic : ItemOptics {};
+class ACOGOptic_6x : ItemOptics {};
+class KashtanOptic : ItemOptics {};
+class M68Optic : ItemOptics {};
+class M4_T3NRDSOptic : ItemOptics {};
+class FNP45_MRDSOptic : ItemOptics {};
+class ReflexOptic : ItemOptics {};
+class KobraOptic : ItemOptics {};
+
+class KazuarOptic: ItemOptics
+{
+	override void InitOpticMode() //TODO - decide whether to randomize on spawn and how to determine it (attachment etc.)
+	{
+		super.InitOpticMode();
+		
+		SetCurrentOpticMode(GameConstants.OPTICS_STATE_NIGHTVISION);
+	}
+	
+	override int GetCurrentNVType()
+	{
+		if (IsWorking())
+		{
+			switch (m_CurrentOpticMode)
+			{
+				case GameConstants.OPTICS_STATE_DAY:
+					return NVTypes.NV_OPTICS_KAZUAR_DAY;
+				
+				case GameConstants.OPTICS_STATE_NIGHTVISION:
+					return NVTypes.NV_OPTICS_KAZUAR_NIGHT;
+			}
+			Error("Undefined optic mode of " + this);
+			return NVTypes.NONE;
+		}
+		else
+		{
+			return NVTypes.NV_OPTICS_OFF;
+		}
+	}
+	
+	override void OnOpticModeChange()
+	{
+		super.OnOpticModeChange();
+		
+		UpdateSelectionVisibility();
+	}
+	
+	override void OnOpticEnter()
+	{
+		super.OnOpticEnter();
+		
+		HideSelection("hide_cover_pilot");
+	}
+	
+	override void UpdateSelectionVisibility()
+	{
+		super.UpdateSelectionVisibility();
+		
+		switch (GetCurrentOpticMode())
+		{
+			case GameConstants.OPTICS_STATE_NIGHTVISION:
+				HideSelection("hide_cover");
+				HideSelection("hide_cover_pilot");
+			break;
+			
+			case GameConstants.OPTICS_STATE_DAY:
+				ShowSelection("hide_cover");
+				if ( !GetGame().IsDedicatedServer() && !IsInOptics() ) //quick sanity check, just in case
+				{
+					ShowSelection("hide_cover_pilot");
+				}
+			break;
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionToggleNVMode);
+	}
+};
+
+class StarlightOptic: ItemOptics
+{
+	override void InitOpticMode() //TODO - decide whether to randomize on spawn and how to determine it (attachment etc.)
+	{
+		super.InitOpticMode();
+		
+		SetCurrentOpticMode(GameConstants.OPTICS_STATE_NIGHTVISION);
+	}
+	
+	override int GetCurrentNVType()
+	{
+		if (IsWorking())
+		{
+			switch (m_CurrentOpticMode)
+			{
+				case GameConstants.OPTICS_STATE_DAY:
+					return NVTypes.NV_OPTICS_STARLIGHT_DAY;
+				
+				case GameConstants.OPTICS_STATE_NIGHTVISION:
+					return NVTypes.NV_OPTICS_STARLIGHT_NIGHT;
+			}
+			Error("Undefined optic mode of " + this);
+			return NVTypes.NONE;
+		}
+		else
+		{
+			return NVTypes.NV_OPTICS_OFF;
+		}
+	}
+	
+	override void OnOpticModeChange()
+	{
+		super.OnOpticModeChange();
+		
+		UpdateSelectionVisibility();
+	}
+	
+	override void OnOpticEnter()
+	{
+		super.OnOpticEnter();
+		
+		HideSelection("hide_cover_pilot");
+	}
+	
+	override void UpdateSelectionVisibility()
+	{
+		super.UpdateSelectionVisibility();
+		
+		switch (GetCurrentOpticMode())
+		{
+			case GameConstants.OPTICS_STATE_NIGHTVISION:
+				HideSelection("hide_cover");
+				HideSelection("hide_cover_pilot");	
+			break;
+			
+			case GameConstants.OPTICS_STATE_DAY:
+				ShowSelection("hide_cover");
+				if ( !GetGame().IsDedicatedServer() && !IsInOptics() ) //quick sanity check, just in case
+				{
+					ShowSelection("hide_cover_pilot");
+				}
+			break;
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionToggleNVMode);
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PSO11Optic.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PSO11Optic.c
new file mode 100644
index 0000000000000000000000000000000000000000..84905fa90eb101b8bbc7e45cc865cad60599f02f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PSO11Optic.c
@@ -0,0 +1,3 @@
+class PSO11Optic extends ItemOptics
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PSO1Optic.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PSO1Optic.c
new file mode 100644
index 0000000000000000000000000000000000000000..41abf1f59d639b535a706128ba00ec947808853c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PSO1Optic.c
@@ -0,0 +1,3 @@
+class PSO1Optic extends ItemOptics
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PUScopeOptic.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PUScopeOptic.c
new file mode 100644
index 0000000000000000000000000000000000000000..4e228801de6e4fac4284002cf5862c1b11687527
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PUScopeOptic.c
@@ -0,0 +1,3 @@
+class PUScopeOptic extends ItemOptics
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PlantMaterial.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PlantMaterial.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d9d8e75f901a7a3c8b8cf3f362da20987c42803
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/PlantMaterial.c
@@ -0,0 +1,96 @@
+class PlantMaterial extends Inventory_Base
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if (!super.CanPutAsAttachment(parent))
+		{
+			return false;
+		}
+		/*const int SLOTS_ARRAY1 = 6;
+		const int SLOTS_ARRAY2 = 7;
+		bool is_barrel = false;
+		bool is_opened_barrel = false;
+		bool slot_test1 = true;
+		bool slot_test2 = true;
+		string slot_names1[SLOTS_ARRAY1] = { "Nails", "OakBark", "BirchBark", "Lime", "Disinfectant", "Guts" };
+		string slot_names2[SLOTS_ARRAY2] = { "BerryR", "BerryB", "Nails", "OakBark", "BirchBark", "Lime", "Disinfectant" };
+
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+
+		// all of the barrel attachment slots are empty (first set of ingredients)
+		for ( int idx1 = 0; idx1 < SLOTS_ARRAY1 ; idx1++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names1[idx1]) != NULL )
+			{
+				slot_test1 = false;
+				break;
+			}
+		}
+
+		// all of the barrel attachment slots are empty (second set of ingredients)	
+		for ( int idx2 = 0; idx2 < SLOTS_ARRAY2 ; idx2++ )
+		{
+			if ( parent.FindAttachmentBySlotName(slot_names2[idx2]) != NULL )
+			{
+				slot_test2 = false;
+				break;
+			}
+		}
+		
+		if ( ( is_opened_barrel && slot_test1 ) || ( is_opened_barrel && slot_test2) || !is_barrel )
+		{
+			return true;
+		}*/
+		
+		return false;
+	}
+
+	override bool CanDetachAttachment( EntityAI parent )
+	{
+		
+		/*bool is_barrel = false;
+		bool is_opened_barrel = false;
+		
+		// is barrel
+		if ( parent.IsKindOf("Barrel_ColorBase") )
+		{
+			is_barrel = true;
+		}
+
+		// is opened barrel				
+		if ( is_barrel && parent.GetAnimationPhase("Lid") == 1 )
+		{
+			is_opened_barrel = true;
+		}
+		
+		if ( is_opened_barrel || !is_barrel )
+		{
+			return true;
+		}*/
+		return false;
+	}	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionFertilizeSlot);
+	}
+	
+	override void InitItemVariables()
+	{
+		super.InitItemVariables();
+		can_this_be_combined = true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Red9Bttstck.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Red9Bttstck.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb739aefbb2cde93783b71a7c1096e79a987dfe0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/Red9Bttstck.c
@@ -0,0 +1,12 @@
+class Red9Bttstck extends Inventory_Base
+{
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( !parent.IsKindOf("PlateCarrierHolster") && !parent.IsKindOf("PlateCarrierComplete") && !parent.IsKindOf("CarrierHolsterSolo") && !parent.IsKindOf("ChestHolster") )
+		{
+			return true;
+		}
+		return false;
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/SKS_Bayonet.c b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/SKS_Bayonet.c
new file mode 100644
index 0000000000000000000000000000000000000000..2ba30976d0e2e1e5d20810f3e7fdef335eb3c702
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Inventory_Base/SKS_Bayonet.c
@@ -0,0 +1,58 @@
+class SKS_Bayonet extends Inventory_Base
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if(!super.CanPutAsAttachment(parent)) {return false;}
+		if ( parent.FindAttachmentBySlotName("suppressorImpro") == null && parent.FindAttachmentBySlotName("weaponMuzzle") == null )
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnWasAttached(EntityAI parent, int slot_id)
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(true,slot_id);
+		}		
+	}
+	
+	override void OnWasDetached(EntityAI parent, int slot_id)
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		if( parent.IsWeapon() )
+		{
+			parent.SetBayonetAttached(false);
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/ItemBook.c b/scripts/4_World/DayZ/Entities/ItemBase/ItemBook.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d2e93e6661b691d0ac5ec1bd4a195a59326040c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/ItemBook.c
@@ -0,0 +1,41 @@
+class ItemBook extends InventoryItemSuper
+{
+	override event bool OnUseFromInventory(Man owner)
+	{
+		return false;
+	}
+	
+	//================================================================
+	// IGNITION ACTION
+	//================================================================
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy( EntityAI igniter = NULL )
+	{
+		if ( GetHierarchyParent() ) return false;
+		
+		return true;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		return false;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+	}
+	
+	override void OnIgnitedThis( EntityAI fire_source )
+	{
+		Fireplace.IgniteEntityAsFireplace( this, fire_source );
+	}
+
+	override bool IsThisIgnitionSuccessful( EntityAI item_source = NULL )
+	{
+		return Fireplace.CanIgniteEntityAsFireplace( this );
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/KitBase.c b/scripts/4_World/DayZ/Entities/ItemBase/KitBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..c8013c9f739d7fcd95213c50aa0860a73451344c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/KitBase.c
@@ -0,0 +1,217 @@
+class KitBase extends ItemBase
+{
+	ref protected EffectSound 		m_DeployLoopSound;
+	protected bool 					m_DeployedRegularly;
+
+	void KitBase()
+	{
+		RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+		RegisterNetSyncVariableBool("m_IsDeploySound");
+	}
+
+	void ~KitBase()
+	{
+		SEffectManager.DestroyEffect( m_DeployLoopSound );
+	}
+
+	override bool IsBasebuildingKit()
+	{
+		return true;
+	}
+	
+	override bool HasProxyParts()
+	{
+		return true;
+	}
+	
+	override bool CanProxyObstruct()
+	{
+		return false;
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		if ( IsDeploySound() )
+		{
+			PlayDeploySound();
+		}
+				
+		if ( CanPlayDeployLoopSound() )
+		{
+			PlayDeployLoopSound();
+		}
+					
+		if ( m_DeployLoopSound && !CanPlayDeployLoopSound() )
+		{
+			StopDeployLoopSound();
+		}
+		
+		if ( m_DeployedRegularly && IsSoundSynchRemote() )
+		{
+			PlayDeployFinishSound();
+		}
+	}
+	
+	override void EEInit()
+	{
+		super.EEInit();
+		
+		//set visual on init
+		UpdateVisuals();
+		UpdatePhysics();
+		
+		if (GetGame().IsServer())
+		{
+			GetGame().GetCallQueue( CALL_CATEGORY_GAMEPLAY ).Call( AssembleKit );
+		}
+	}
+	
+	override bool DisassembleOnLastDetach()
+	{
+		return true;
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached( item, slot_name );
+		
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		if ( player && player.IsPlayerDisconnected() )
+			return;
+		
+		if (item && slot_name == "Rope")
+		{
+			if (GetGame().IsServer() && !m_DeployedRegularly)
+			{
+				DisassembleKit(ItemBase.Cast(item));
+				Delete();
+			}
+		}
+	}
+	
+	override void OnItemLocationChanged( EntityAI old_owner, EntityAI new_owner ) 
+	{
+		super.OnItemLocationChanged( old_owner, new_owner );
+		
+		//update visuals after location change
+		UpdatePhysics();
+	}
+	
+	override void OnEndPlacement()
+	{
+		m_DeployedRegularly = true;
+		SoundSynchRemote();
+	}
+	
+	override void OnPlacementCancelled( Man player )
+	{
+		super.OnPlacementCancelled(player);
+		m_DeployedRegularly = false;
+	}
+	
+	override bool IsDeployable()
+	{
+		return true;
+	}
+	
+	override bool CanAssignAttachmentsToQuickbar()
+	{
+		return false;
+	}
+	
+	override string GetDeploySoundset()
+	{
+		return "putDown_FenceKit_SoundSet";
+	}
+	
+	override string GetLoopDeploySoundset()
+	{
+		//return "BarbedWire_Deploy_loop_SoundSet";
+		return "Shelter_Site_Build_Loop_SoundSet";
+	}
+	
+	override string GetDeployFinishSoundset()
+	{
+		return "";
+	}
+	
+	override void RefreshPhysics()
+	{
+		super.RefreshPhysics();
+		
+		UpdatePhysics();
+	}
+	
+	//Update visuals and physics
+	void UpdateVisuals()
+	{
+		SetAnimationPhase( "Inventory", 0 );
+		SetAnimationPhase( "Placing", 1 );
+	}
+	
+	void UpdatePhysics()
+	{
+		AddProxyPhysics( "Inventory" );
+		RemoveProxyPhysics( "Placing" );		
+	}
+	
+	void PlayDeployLoopSound()
+	{		
+		if ( !GetGame().IsDedicatedServer() )
+		{		
+			if ( !m_DeployLoopSound || !m_DeployLoopSound.IsSoundPlaying() )
+			{
+				m_DeployLoopSound = SEffectManager.PlaySound( GetLoopDeploySoundset(), GetPosition() );
+			}
+		}
+	}
+	
+	void StopDeployLoopSound()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{	
+			m_DeployLoopSound.SetSoundFadeOut(0.5);
+			m_DeployLoopSound.SoundStop();
+		}
+	}
+	
+	void AssembleKit()
+	{
+		if (!IsHologram())
+		{
+			Rope rope = Rope.Cast(GetInventory().CreateAttachment("Rope"));
+		}
+	}
+	
+	void DisassembleKit(ItemBase item) {}
+	
+	void CreateRope(Rope rope)
+	{
+		if (!rope)
+			return;
+		
+		InventoryLocation targetLoc = rope.GetTargetLocation();
+		if (targetLoc && targetLoc.GetType() != InventoryLocationType.GROUND)
+		{
+			MiscGameplayFunctions.TransferItemProperties(this, rope);
+			return;
+		}
+		
+		EntityAI newRope = EntityAI.Cast(GetGame().CreateObjectEx(rope.GetType(), GetPosition(), ECE_PLACE_ON_SURFACE));
+		
+		if (newRope)
+			MiscGameplayFunctions.TransferItemProperties(this, newRope);
+		
+		rope.Delete();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDeployObject);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/KitchenKnife.c b/scripts/4_World/DayZ/Entities/ItemBase/KitchenKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..e3ffcc7026be8bb86264fbd1492c40d955ee0ec2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/KitchenKnife.c
@@ -0,0 +1,30 @@
+class KitchenKnife extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionDisarmMine);
+		AddAction(ActionDisarmExplosive);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/KukriKnife.c b/scripts/4_World/DayZ/Entities/ItemBase/KukriKnife.c
new file mode 100644
index 0000000000000000000000000000000000000000..3fdf404640e45a71098b83e065df1f61c9598c84
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/KukriKnife.c
@@ -0,0 +1,28 @@
+class KukriKnife extends ToolBase
+{
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionShaveTarget);
+		AddAction(ActionShave);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/LargeGasCannister.c b/scripts/4_World/DayZ/Entities/ItemBase/LargeGasCannister.c
new file mode 100644
index 0000000000000000000000000000000000000000..2096eb56855241c48822b3d9798030041a40830e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/LargeGasCannister.c
@@ -0,0 +1,7 @@
+class LargeGasCannister extends ItemBase
+{	
+	override bool CanExplodeInFire()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/LongTorch.c b/scripts/4_World/DayZ/Entities/ItemBase/LongTorch.c
new file mode 100644
index 0000000000000000000000000000000000000000..2f130461c950adc6704b81852706d14d9e26fae5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/LongTorch.c
@@ -0,0 +1,15 @@
+class LongTorch : Torch
+{
+	void LongTorch()
+	{
+		m_DecraftResult = "LongWoodenStick";
+		m_ParticleLocalPos = Vector(0, 0.83, 0);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionClapBearTrapWithThisItem);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Machete.c b/scripts/4_World/DayZ/Entities/ItemBase/Machete.c
new file mode 100644
index 0000000000000000000000000000000000000000..cc8681f608f96ec77f05f73aed2ea1afa62d851d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Machete.c
@@ -0,0 +1,29 @@
+class Machete extends ToolBase
+{
+	void Machete()
+	{
+	}
+
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Magazine/AmmunitionPiles.c b/scripts/4_World/DayZ/Entities/ItemBase/Magazine/AmmunitionPiles.c
new file mode 100644
index 0000000000000000000000000000000000000000..7c0210317930ac843b620f0fc79fe7babe85f18f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Magazine/AmmunitionPiles.c
@@ -0,0 +1,326 @@
+//!ammo pile base
+class Ammunition_Base: Magazine_Base
+{
+	static ref map<string, float> m_AmmoWeightByBulletType = new map<string, float>();
+	
+	static float GetAmmoWeightByBulletType(string bulletType)
+	{
+		if (m_AmmoWeightByBulletType.Contains(bulletType))
+		{
+			return m_AmmoWeightByBulletType.Get(bulletType);
+		}
+		else
+		{
+			float ammoWeight;
+			string ammoTypeName;
+			GetGame().ConfigGetText( string.Format("CfgAmmo %1 spawnPileType", bulletType) , ammoTypeName);
+			if (ammoTypeName)
+				ammoWeight = GetGame().ConfigGetFloat(string.Format("CfgMagazines %1 weight", ammoTypeName));
+			else
+				ErrorEx("empty 'spawnPileType' for bullet type:" + bulletType);
+			if (ammoWeight)
+				m_AmmoWeightByBulletType.Insert(bulletType, ammoWeight);
+			return ammoWeight;
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionSortAmmoPile);
+	}
+	
+	override bool IsAmmoPile()
+	{
+		return true;
+	}
+	
+	override protected float GetWeightSpecialized(bool forceRecalc = false)
+	{
+		#ifdef DEVELOPER
+		if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+		{
+			WeightDebugData data = WeightDebug.GetWeightDebug(this);
+			data.SetCalcDetails("TAmmo: ("+GetAmmoCount()+"(Ammo count) * "+ GetConfigWeightModifiedDebugText());
+		}
+		#endif
+		
+		return GetAmmoCount() * GetConfigWeightModified();
+	}
+	
+	override void SetQuantityToMinimum()
+	{
+		ServerSetAmmoCount(1);
+	}
+	
+	override void SetFromProjectile(ProjectileStoppedInfo info)
+	{
+		float dmgPerUse = GetGame().ConfigGetFloat("cfgAmmo " + info.GetAmmoType() + " dmgPerUse");
+		float totalDmg = info.GetProjectileDamage() + dmgPerUse;
+		float health = Math.Max(1 - totalDmg, 0);
+		
+		SetQuantityToMinimum();
+		SetHealth01("","", health);
+		
+		// SetCartridgeDamageAtIndex() MUST be called AFTER SetHealth01()!!
+		// otherwise, decreasing health by less than an entire health level get ignored
+		SetCartridgeDamageAtIndex(0, totalDmg);
+	}
+};
+
+class Ammo_45ACP: Ammunition_Base {};
+class Ammo_308Win: Ammunition_Base {};
+class Ammo_308WinTracer: Ammunition_Base {};
+class Ammo_9x19: Ammunition_Base {};
+class Ammo_380: Ammunition_Base {};
+class Ammo_556x45: Ammunition_Base {};
+class Ammo_556x45Tracer: Ammunition_Base {};
+class Ammo_762x54: Ammunition_Base {};
+class Ammo_762x54Tracer: Ammunition_Base {};
+class Ammo_762x39: Ammunition_Base {};
+class Ammo_762x39Tracer: Ammunition_Base {};
+class Ammo_9x39: Ammunition_Base {};
+class Ammo_22: Ammunition_Base {};
+class Ammo_12gaPellets: Ammunition_Base {};
+class Ammo_12gaSlug: Ammunition_Base {};
+class Ammo_357: Ammunition_Base {};
+class Ammo_545x39: Ammunition_Base {};
+class Ammo_545x39Tracer: Ammunition_Base {};
+class Bolt_Base: Ammunition_Base
+{
+	override bool IsInventoryVisible()
+	{
+		//! omitted super call is intended
+		return CanBeActionTarget();
+	}
+
+	override bool CanBeActionTarget()
+	{
+		if (super.CanBeActionTarget())
+		{
+			EntityAI parent = EntityAI.Cast(GetParent());
+			if (parent)
+			{
+				return !parent.IsManagingArrows();
+			}
+		}
+		return true;
+	}
+	
+	override void EEParentedTo(EntityAI parent)
+	{
+		if (!parent)
+			return;
+
+		ArrowManagerBase arrowManager = parent.GetArrowManager();
+		if (arrowManager)
+		{
+			arrowManager.AddArrow(this);	
+		}
+	}
+	
+	override void EEParentedFrom(EntityAI parent)
+	{
+		if (!parent)
+			return;
+
+		ArrowManagerBase arrowManager = parent.GetArrowManager(); 
+		if (arrowManager)
+		{
+			arrowManager.RemoveArrow(this);	
+		}
+	}
+}
+
+class Ammo_DartSyringe: Ammunition_Base {};
+class Ammo_Flare: Ammunition_Base {};
+class Ammo_RPG7_HE: Ammunition_Base {};
+class Ammo_RPG7_AP: Ammunition_Base {};
+class Ammo_LAW_HE: Ammunition_Base {};
+class Ammo_GrenadeM4 : Ammunition_Base {};
+
+//bolts
+class Ammo_HuntingBolt : Bolt_Base {}
+
+class Ammo_ImprovisedBolt_1 : Bolt_Base 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionCraftBoltsFeather);
+	}
+}
+
+class Ammo_ImprovisedBolt_2 : Bolt_Base {}
+class Ammo_CupidsBolt : Bolt_Base
+{
+	override void EEParentedTo(EntityAI parent)
+	{
+		Delete();
+	}
+	
+	override void EEParentedFrom(EntityAI parent);
+	
+	static void PlayOnHitParticle(vector position)
+	{
+		ParticleManager.GetInstance().PlayInWorld(ParticleList.BOLT_CUPID_HIT, position);
+	}
+}
+
+// 40mm
+
+class Ammo_40mm_Base: Ammunition_Base
+{
+	override bool IsTakeable()
+	{
+		return GetAnimationPhase("Visibility") == 0;
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		if (!super.IsInventoryVisible())
+		{
+			return false;
+		}
+		
+		return IsTakeable();
+	}
+};
+
+class Ammo_40mm_Explosive: Ammo_40mm_Base
+{
+	override bool ShootsExplosiveAmmo()
+	{
+		return true;
+	}
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (GetGame().IsServer())
+		{
+			DamageSystem.ExplosionDamage(this, null, "Explosion_40mm_Ammo", item.GetPosition(), DamageType.EXPLOSION);
+		}
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		DamageSystem.ExplosionDamage(this, null, "Explosion_40mm_Ammo", GetPosition(), DamageType.EXPLOSION);
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( DeleteSafe, 1000, false);
+	}
+	
+	override void OnDamageDestroyed(int oldLevel)
+	{
+		super.OnDamageDestroyed(oldLevel);
+		#ifndef SERVER
+		ClearFlags(EntityFlags.VISIBLE, false);
+		#endif
+	}
+}
+//class Ammo_40mm_Grenade_Gas: Ammo_40mm_Base {};
+class Ammo_40mm_ChemGas: Ammo_40mm_Base
+{
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		if (GetGame().IsServer())
+		{
+			GetGame().CreateObject("ContaminatedArea_Local", item.GetPosition());
+		}
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		GetGame().CreateObject("ContaminatedArea_Local", GetPosition());
+		GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallLater( DeleteSafe, 1000, false);
+	}
+	
+	override void OnDamageDestroyed(int oldLevel)
+	{
+		super.OnDamageDestroyed(oldLevel);
+		
+		#ifndef SERVER
+		ClearFlags(EntityFlags.VISIBLE, false);
+		ParticleManager.GetInstance().PlayInWorld(ParticleList.GRENADE_CHEM_BREAK, GetPosition());
+		#endif
+	}
+	
+	
+}
+
+class Ammo_40mm_Smoke_ColorBase: Ammo_40mm_Base
+{
+	protected Particle		m_ParticleSmoke;
+	protected float 		m_ParticleLifetime;
+	protected int			m_ParticleId;
+	protected bool			m_Activated;
+	
+	void Ammo_40mm_Smoke_ColorBase()
+	{
+		RegisterNetSyncVariableBool("m_Activated");
+	}
+	
+ 	override void OnVariablesSynchronized()
+    {
+        super.OnVariablesSynchronized();
+
+		if (m_Activated)
+		{
+			#ifndef SERVER
+			string particleStrIdentifier = GetGame().ConfigGetTextOut(string.Format("CfgMagazines %1 particleStrIdentifier", GetType()));
+			m_ParticleId = ParticleList.GetParticleIDByName(particleStrIdentifier);
+			if (m_ParticleId > 0)
+			{
+				m_ParticleSmoke = ParticleManager.GetInstance().PlayOnObject(m_ParticleId, this);
+				m_ParticleSmoke.SetWiggle(7, 0.3);
+			}
+			#endif
+		}
+	}
+	
+	protected void Activate()
+	{
+		m_ParticleLifetime = GetGame().ConfigGetFloat(string.Format("CfgMagazines %1 particleLifeTime", GetType()));		
+		m_Activated = true;
+		SetSynchDirty();
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(DeleteSafe, m_ParticleLifetime * 1000);
+	}
+
+	//! special behaviour - do not call super
+	override void EEKilled(Object killer)	
+	{
+		//analytics (behaviour from EntityAI)
+		GetGame().GetAnalyticsServer().OnEntityKilled(killer, this);
+	}
+
+	override void EEDelete(EntityAI parent)	
+	{
+		#ifndef SERVER	
+		if (m_ParticleSmoke)
+		{
+			m_ParticleSmoke.Stop();
+		}
+		#endif
+		
+		super.EEDelete(parent);
+	}
+	
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		return !m_Activated;
+	}
+	
+	override void OnActivatedByItem(notnull ItemBase item)
+	{
+		SetHealth("", "", 0.0);
+		Activate();
+	}
+}
+
+class Ammo_40mm_Smoke_Red: Ammo_40mm_Smoke_ColorBase {};
+class Ammo_40mm_Smoke_Green: Ammo_40mm_Smoke_ColorBase {};
+class Ammo_40mm_Smoke_White: Ammo_40mm_Smoke_ColorBase {};
+class Ammo_40mm_Smoke_Black: Ammo_40mm_Smoke_ColorBase {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Magazine/Magazine.c b/scripts/4_World/DayZ/Entities/ItemBase/Magazine/Magazine.c
new file mode 100644
index 0000000000000000000000000000000000000000..2d35b97c2446bb5c03dbcbb5bfc9e5d893676208
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Magazine/Magazine.c
@@ -0,0 +1,445 @@
+typedef Magazine Magazine_Base;
+
+enum CartridgeType
+{
+	None = 0,
+	Pistol = 1,
+	Intermediate = 2,
+	FullPower = 3,
+	Shell = 4
+}
+
+enum ProjectileType
+{
+	None = 0,
+	Tracer = 1,
+	AP = 2
+}
+
+
+class AmmoData
+{
+	bool m_IsValid;
+	CartridgeType m_CartridgeType;
+	ProjectileType m_ProjectileType;
+	
+	void AmmoData( string init_type )
+	{
+		m_IsValid = GetGame().ConfigIsExisting( "CfgMagazines " + init_type );
+		if ( m_IsValid )
+		{
+			m_CartridgeType = GetGame().ConfigGetInt( "CfgMagazines " + init_type + " iconCartridge" );
+			m_ProjectileType = GetGame().ConfigGetInt( "CfgMagazines " + init_type + " iconType" );
+		}
+	}
+}
+
+class Magazine : InventoryItemSuper
+{
+	protected static ref map<string, ref AmmoData>	m_AmmoData;
+	ref array<string>								m_CompatiableAmmo;
+	ref array<float> 								m_ChanceToJam;
+	protected float 								m_ManipulationDamage;
+	
+	void Magazine () 
+	{
+		m_ChanceToJam = new array<float>;
+		InitReliability(m_ChanceToJam);
+		m_ManipulationDamage = ConfigGetFloat("manipulationDamage");
+		m_CompatiableAmmo = new array<string>;
+		ConfigGetTextArray("ammoItems", m_CompatiableAmmo);
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( !m_AmmoData )
+				m_AmmoData = new map<string, ref AmmoData>;
+			
+			string classname = ClassName();
+			if ( !m_AmmoData.Contains(classname) )
+			{
+				ref AmmoData new_data = new AmmoData( classname );
+				if ( new_data.m_IsValid )
+					m_AmmoData.Insert( classname, new AmmoData( classname ) );
+			}
+		}
+	}
+
+	//! Gets magazine ammo count
+	proto native int GetAmmoCount();
+	//! Sets magazine ammo count
+	proto native void ServerSetAmmoCount(int ammoCount);
+	proto native void LocalSetAmmoCount(int ammoCount);
+
+	/**@fn		AcquireCartridge
+	 * @brief	acquires cartridge(damage, type) to magazine
+	 * @param[out] ammoDamage \p  damage of the ammo
+	 * @param[out] cartTypeName \p	 type name of the ejected ammo
+	 * @return	true if acquired
+	 **/
+	proto bool LocalAcquireCartridge(out float dmg, out string cartTypeName);
+	proto bool ServerAcquireCartridge(out float dmg, out string cartTypeName);
+	/**@fn		StoreCartridge
+	 * @brief	stores cartridge(damage, type) to magazine
+	 * @param[in] ammoDamage \p  damage of the cartridge
+	 * @param[in] cartTypeName \p	 type name of the stored cartridge
+	 * @return	true if stored
+	 **/
+	proto native bool LocalStoreCartridge(float ammoDamage, string cartTypeName);
+	proto native bool ServerStoreCartridge(float ammoDamage, string cartTypeName);
+
+	/**@fn		GetCartridgeAtIndex
+	 * @brief	queries cartridge(damage, type) info at specified index
+	 * @param[in] cartIndex \p  index of the cartridge.
+	 * @param[out] ammoDamage \p  damage of the cartridge
+	 * @param[out] cartTypeName \p	 type name of the cartridge
+	 * @return	true if index valid
+	 **/
+	proto bool GetCartridgeAtIndex(int cartIndex, out float dmg, out string cartTypeName);
+
+	/**@fn		SetCartridgeAtIndex
+	 * @brief	modifies cartridge(damage, type) info at specified index
+	 * @param[in] cartIndex \p  index of the cartridge.
+	 * @param[in] ammoDamage \p  damage of the cartridge
+	 * @param[in] cartTypeName \p	 type name of the cartridge
+	 * @return	true if index valid
+	 **/
+	proto bool SetCartridgeAtIndex(int cartIndex, out float dmg, out string cartTypeName);
+	
+	/**@fn		SetCartridgeDamageAtIndex
+	 * @brief	modifies cartridge damage info at specified index
+	 * @param[in] cartIndex \p  index of the cartridge.
+	 * @param[in] ammoDamage \p  damage of the cartridge
+	 * @return	true if index valid
+	 **/
+	proto bool SetCartridgeDamageAtIndex(int cartIndex, float dmg);
+
+	
+	static AmmoData GetAmmoData( string classname )
+	{
+		if ( !m_AmmoData )
+			m_AmmoData = new map<string, ref AmmoData>;
+		if ( !m_AmmoData.Contains(classname) )
+		{
+			ref AmmoData new_data = new AmmoData( classname );
+			if ( new_data.m_IsValid )
+				m_AmmoData.Insert( classname, new AmmoData( classname ) );
+			return new_data;
+		}
+		else
+		{
+			return m_AmmoData.Get( classname );
+		}
+	}
+	
+	bool IsCompatiableAmmo( ItemBase ammo )
+	{
+		if ( m_CompatiableAmmo && ammo )
+			return ( m_CompatiableAmmo.Find( ammo.GetType() ) > -1 );
+		else
+			return false;
+	}
+	
+	bool CanAddCartridges(int count)
+	{
+		int spc_avail = GetAmmoMax() - GetAmmoCount();
+		return count <= spc_avail;
+	}
+
+	//! Adds magazine ammo, MP safe
+	void ServerAddAmmoCount(int ammoCount)
+	{
+		ServerSetAmmoCount(GetAmmoCount() + ammoCount);
+	}
+	void LocalAddAmmoCount(int ammoCount)
+	{
+		LocalSetAmmoCount(GetAmmoCount() + ammoCount);
+	}
+	//! returns max rounds for this mag (returns "count" config value)
+	int GetAmmoMax()
+	{
+		return m_Count;
+	}
+	//! set max rounds for this mag
+	void ServerSetAmmoMax()
+	{
+		ServerSetAmmoCount( GetAmmoMax() );
+	}
+	void LocalSetAmmoMax()
+	{
+		LocalSetAmmoCount( GetAmmoMax() );
+	}
+	//! Returns if this entity is Magazine
+	override bool IsMagazine()
+	{
+		return true;
+	}
+	
+	
+	override bool CanBeSplit()
+	{
+		if ( m_CanThisBeSplit )
+			return ( GetAmmoCount() > 1 );
+
+		return false;
+	}
+	
+	bool InitReliability(out array<float> reliability_array)
+	{
+		if (GetGame().ConfigIsExisting("cfgMagazines " + GetType() + " Reliability ChanceToJam"))
+		{
+			GetGame().ConfigGetFloatArray("cfgMagazines " + GetType() + " Reliability ChanceToJam",reliability_array);
+			return true;
+		}
+		return false;
+	}
+	
+	float GetChanceToJam()
+	{
+		int level = GetHealthLevel();
+
+		if (level >= 0 && level < m_ChanceToJam.Count())
+			return m_ChanceToJam[level];
+		else
+			return 0.0;
+	}
+	
+	override void SplitItemToInventoryLocation( notnull InventoryLocation dst )
+	{
+		if ( !CanBeSplit() )
+			return;
+		
+		Magazine new_pile = Magazine.Cast( GameInventory.LocationCreateEntity( dst, GetType(), ECE_IN_INVENTORY, RF_DEFAULT ) );
+		if( new_pile )
+		{
+			MiscGameplayFunctions.TransferItemProperties(dst.GetItem(), new_pile);
+		
+			new_pile.ServerSetAmmoCount(0);
+			int quantity = GetAmmoCount();
+		
+			for (int i = 0; i < Math.Floor( quantity * 0.5 ); ++i)
+			{
+				float damage;
+				string cartrige_name;
+				ServerAcquireCartridge(damage, cartrige_name);
+				new_pile.ServerStoreCartridge(damage, cartrige_name);
+			}
+			new_pile.SetSynchDirty();
+			SetSynchDirty();
+		}
+	}
+
+	override void SplitItem(PlayerBase player)
+	{
+		if ( !CanBeSplit() )
+			return;
+
+		
+		Magazine new_pile = Magazine.Cast( player.CreateCopyOfItemInInventoryOrGround( this ) );
+		if( new_pile )
+		{
+			new_pile.ServerSetAmmoCount(0);
+			int quantity = this.GetAmmoCount();
+		
+			for (int i = 0; i < Math.Floor( quantity / 2 ); i++)
+			{
+				float damage;
+				string cartrige_name;
+				ServerAcquireCartridge(damage, cartrige_name);
+				new_pile.ServerStoreCartridge(damage, cartrige_name);
+			}
+			new_pile.SetSynchDirty();
+			SetSynchDirty();
+		}
+	}
+	
+	void ApplyManipulationDamage()
+	{
+		AddHealth("","Health",-m_ManipulationDamage);
+	}
+
+	override bool IsFullQuantity()
+	{
+		if ( GetAmmoCount() == GetAmmoMax() )
+		{
+			return true;			
+		}
+		else
+		{
+			return false;			
+		}
+	}
+	
+	override protected float GetWeightSpecialized(bool forceRecalc = false)
+	{
+		#ifdef DEVELOPER
+		if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+		{
+			WeightDebugData data = WeightDebug.GetWeightDebug(this);
+			data.SetCalcDetails("TMAG: ("+GetAmmoCount()+"(Ammo count) * " + ConfigGetFloat("weightPerQuantityUnit")+"(weightPerQuantityUnit)) + " + GetConfigWeightModifiedDebugText());
+		}
+		#endif
+		return GetConfigWeightModified() + (GetAmmoCount() * ConfigGetFloat("weightPerQuantityUnit"));
+	}
+	
+	override bool IsCombineAll( ItemBase other_item, bool use_stack_max = false)
+	{
+		Magazine other_magazine = Magazine.Cast(other_item);
+		int free_space = GetAmmoMax() - GetAmmoCount();
+		
+		return free_space >= other_magazine.GetAmmoCount();
+	}
+	
+	override void CombineItems( ItemBase other_item, bool use_stack_max = false )
+	{
+		if ( !CanBeCombined(other_item) )
+			return;
+		
+		if ( other_item.GetType() != GetType() )
+			return;
+		
+		Magazine other_magazine;
+		if ( Class.CastTo(other_magazine, other_item) )
+		{
+			//int other_item_quantity = other_magazine.GetAmmoCount();
+			int this_free_space = GetAmmoMax() - GetAmmoCount();
+			int numberOfTransferredBullets = 0;
+			int currentAmount = GetAmmoCount();
+			
+			for (int i = 0; i < this_free_space && other_magazine.GetAmmoCount() > 0 ; i++)
+			{
+				float damage;
+				string cartrige_name;
+				other_magazine.ServerAcquireCartridge(damage, cartrige_name);
+				if (ServerStoreCartridge(damage, cartrige_name))
+					++numberOfTransferredBullets;
+			}
+			
+			if (GetGame().IsServer())
+			{
+				float resultingHealth = (currentAmount * GetHealth() + numberOfTransferredBullets * other_magazine.GetHealth()) / GetAmmoCount();
+				SetHealth("", "", resultingHealth);
+			}
+			OnCombine(other_item);
+			other_magazine.SetSynchDirty();
+			SetSynchDirty();
+		}
+	}
+	
+	override bool CanDetachAttachment(EntityAI parent)
+	{
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		if (player)
+		{
+			Weapon_Base wpn = Weapon_Base.Cast(parent);
+			if (wpn)
+			{
+				return player.GetWeaponManager().CanDetachMagazine(wpn,this);
+			}
+		}
+		return super.CanDetachAttachment(parent);
+	}
+	
+	override void OnInventoryEnter(Man player)
+	{
+		super.OnInventoryEnter(player);
+		
+		PlayerBase p = PlayerBase.Cast(player);
+		p.GetWeaponManager().OnMagazineInventoryEnter(this);
+	}
+	
+	override void OnInventoryExit(Man player)
+	{
+		super.OnInventoryExit(player);
+
+		PlayerBase p = PlayerBase.Cast(player);
+		p.GetWeaponManager().OnMagazineInventoryExit(this);
+	}
+	
+	override void OnWasAttached( EntityAI parent, int slot_id )
+	{
+		super.OnWasAttached(parent, slot_id);
+		
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		Weapon_Base wpn = Weapon_Base.Cast(parent);
+		if (wpn && player)
+		{
+			player.GetWeaponManager().OnMagazineAttach(this);
+		}
+	}
+	
+	override void OnWasDetached( EntityAI parent, int slot_id )
+	{
+		super.OnWasDetached(parent, slot_id);
+		
+		PlayerBase player = PlayerBase.Cast(GetHierarchyRootPlayer());
+		Weapon_Base wpn = Weapon_Base.Cast(parent);
+		
+		if (wpn && player)
+		{
+			player.GetWeaponManager().OnMagazineDetach(this);
+		}
+	}
+	
+	override void EEHealthLevelChanged( int oldLevel, int newLevel, string zone )
+	{
+		super.EEHealthLevelChanged(oldLevel, newLevel, zone);
+		float damage = 1 - GetHealthLevelValue(newLevel) + 0.001;
+			
+		int cartridgeCount = GetAmmoCount();		
+		for (int i = 0; i < cartridgeCount; ++i)
+			SetCartridgeDamageAtIndex(i, damage);
+	}
+	
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		super.GetDebugActions(outputList);
+
+		if (GetAmmoCount() > 0)
+		{
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "", FadeColors.LIGHT_GREY));
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.PRINT_BULLETS, "Print Bullets", FadeColors.LIGHT_GREY));
+		}
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (GetGame().IsServer())
+		{
+			if (action_id == EActions.PRINT_BULLETS)
+			{
+				Magazine magazine;
+				Class.CastTo(magazine, this);
+				for (int i = 0; i < magazine.GetAmmoCount(); i++)
+				{
+					float damage;
+					string className;
+					magazine.GetCartridgeAtIndex(i, damage, className);
+					Debug.Log(string.Format("Bullet: %1, Damage %2", className, damage));
+				}
+			}
+		}
+		
+		return super.OnAction(action_id, player, ctx);
+	}
+	
+	override bool CanBeFSwaped()
+	{
+		Weapon_Base wpn = Weapon_Base.Cast(GetHierarchyParent());
+		if (wpn)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+}
+
+class MagazineStorage : Magazine
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionLoadMagazine);
+		AddAction(ActionEmptyMagazine);
+		AddAction(ActionLoadMagazineQuick);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Magazine/Magazines.c b/scripts/4_World/DayZ/Entities/ItemBase/Magazine/Magazines.c
new file mode 100644
index 0000000000000000000000000000000000000000..4d4457c8aa078ef64e5d79e54a6ac766885e1c45
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Magazine/Magazines.c
@@ -0,0 +1,62 @@
+class Mag_FNX45_15Rnd: MagazineStorage {};
+class Mag_357Speedloader_6Rnd: MagazineStorage {};
+class Mag_Deagle_9rnd: MagazineStorage {};
+class Mag_1911_7Rnd: MagazineStorage {};
+class Mag_CZ75_15Rnd: MagazineStorage {};
+class Mag_Glock_15Rnd: MagazineStorage {};
+class Mag_P1_8Rnd: MagazineStorage {};
+class Mag_IJ70_8Rnd: MagazineStorage {};
+class Mag_MP5_15Rnd: MagazineStorage {};
+class Mag_MP5_30Rnd: MagazineStorage {};
+class Mag_PM73_15Rnd: MagazineStorage {};
+class Mag_PM73_25Rnd: MagazineStorage {};
+class Mag_CZ61_20Rnd: MagazineStorage {};
+class Mag_MKII_10Rnd: MagazineStorage {};
+class Mag_ShockCartridge: MagazineStorage {};
+class Mag_Ruger1022_10Rnd: MagazineStorage {};
+class Mag_Ruger1022_15Rnd: MagazineStorage {};
+class Mag_Ruger1022_30Rnd: MagazineStorage {};
+class Mag_CLIP762x54_5Rnd: MagazineStorage {};
+class Mag_762x54Snaploader_2Rnd: MagazineStorage {};
+class Mag_308WinSnaploader_2Rnd: MagazineStorage {};
+class Mag_CLIP762x39_10Rnd: MagazineStorage {};
+class Mag_CLIP9x19_10Rnd: MagazineStorage {};
+class Mag_AKM_30Rnd: MagazineStorage {};
+class Mag_AKM_Drum75Rnd: MagazineStorage {};
+class Mag_AKM_Palm30Rnd: MagazineStorage {};
+class Mag_CZ527_5rnd: MagazineStorage {};
+class Mag_STANAG_30Rnd: MagazineStorage {};
+class Mag_STANAGCoupled_30Rnd: MagazineStorage {};
+class Mag_CMAG_10Rnd: MagazineStorage {};
+class Mag_CMAG_20Rnd: MagazineStorage {};
+class Mag_CMAG_30Rnd: MagazineStorage {};
+class Mag_CMAG_40Rnd: MagazineStorage {};
+class Mag_AK101_30Rnd: MagazineStorage {};
+class Mag_AK74_30Rnd: MagazineStorage {};
+class Mag_SVD_10Rnd: MagazineStorage {};
+class Mag_FAL_20Rnd: MagazineStorage {};
+class Mag_Scout_5Rnd: MagazineStorage {};
+class Mag_UMP_25Rnd: MagazineStorage {};
+class Mag_VSS_10Rnd: MagazineStorage {};
+class Mag_M249_Box200Rnd: MagazineStorage {};
+class Mag_12gaSnaploader_2Rnd: MagazineStorage {};
+class Mag_Saiga_5Rnd: MagazineStorage {};
+class Mag_Saiga_8Rnd: MagazineStorage {};
+class Mag_Saiga_Drum20Rnd: MagazineStorage {};
+class Mag_Arrows_Quiver: MagazineStorage {};
+class Mag_Bolts_Quiver: MagazineStorage {};
+class Mag_Dartgun_CO2 : MagazineStorage {};
+class Mag_Groza_20Rnd: MagazineStorage {};
+class Mag_MakarovPB_8Rnd: MagazineStorage {};
+class Mag_VAL_20Rnd: MagazineStorage {};
+class Mag_STANAG_60Rnd: MagazineStorage {};
+class Mag_AK74_45Rnd: MagazineStorage {};
+class Mag_FAMAS_25Rnd: MagazineStorage {};
+class Mag_Aug_30Rnd: MagazineStorage {};
+class Mag_PP19_64Rnd: MagazineStorage {};
+class Mag_CZ550_4rnd: MagazineStorage {};
+class Mag_CZ550_10rnd: MagazineStorage {};
+class Mag_SSG82_5rnd: MagazineStorage {};
+class Mag_M14_10Rnd: MagazineStorage {};
+class Mag_M14_20Rnd: MagazineStorage {};
+class Mag_Vikhr_30Rnd: MagazineStorage {};
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/MapNavigationBehaviour.c b/scripts/4_World/DayZ/Entities/ItemBase/MapNavigationBehaviour.c
new file mode 100644
index 0000000000000000000000000000000000000000..7027e61f6204a29526a4f342c336a207e6a8ee3b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/MapNavigationBehaviour.c
@@ -0,0 +1,191 @@
+enum EMapNavigationType
+{
+	BASIC 	= 0,
+	COMPASS	= 1,
+	GPS 	= 2,
+	ALL		= 4
+}
+
+class MapNavigationBehaviour
+{
+	const int RANDOM_DEVIATION_MIN 						= 4;
+	const int RANDOM_DEVIATION_MAX 						= 15;
+	
+	static const int DISPLAY_GRID_POS_MAX_CHARS_COUNT 	= 3;
+	static const int DISPLAY_ALT_MAX_CHARS_COUNT 		= 4;
+	
+	protected static const string GRID_SIZE_CFG_PATH	= "CfgWorlds %1 Grid Zoom1 stepX";
+
+	protected int					m_RandomPositionDeviationX;
+	protected int					m_RandomPositionDeviationZ;
+	protected EMapNavigationType	m_NavigationType;
+	protected PlayerBase			m_Player;
+	
+	protected ref array<EntityAI>	m_GPSInPossessionArr;
+	protected ref array<EntityAI>	m_CompassInPossessionArr;
+	
+	void MapNavigationBehaviour(PlayerBase pPlayer, EMapNavigationType pNavigationType = EMapNavigationType.BASIC)
+	{
+		m_Player 					= pPlayer;
+		m_NavigationType			= pNavigationType;
+		
+		m_GPSInPossessionArr 		= new array<EntityAI>();
+		m_CompassInPossessionArr	= new array<EntityAI>();
+	}
+	
+	protected void SetNavigationType(EMapNavigationType pType)
+	{
+		m_NavigationType = m_NavigationType | pType;
+	}
+	
+	protected void UnsetNavigationType(EMapNavigationType pType)
+	{
+		m_NavigationType = m_NavigationType & ~pType;
+	}
+
+	EMapNavigationType GetNavigationType()
+	{
+		return m_NavigationType;
+	}
+	
+	void OnItemInPlayerPossession(EntityAI item)
+	{
+		if (item.IsInherited(ItemGPS))
+		{
+			if (m_GPSInPossessionArr.Find(item) == INDEX_NOT_FOUND)
+			{
+				m_GPSInPossessionArr.Insert(item);
+				SetNavigationType(EMapNavigationType.GPS);
+			}
+		}
+		
+		if (item.IsInherited(ItemCompass))
+		{
+			if (m_CompassInPossessionArr.Find(item) == INDEX_NOT_FOUND)
+			{
+				m_CompassInPossessionArr.Insert(item);
+				SetNavigationType(EMapNavigationType.COMPASS);
+			}
+		}
+	}
+	
+	void OnItemNotInPlayerPossession(EntityAI item)
+	{
+		if (item.IsInherited(ItemGPS))
+		{
+			m_GPSInPossessionArr.RemoveItem(item);
+			if (m_GPSInPossessionArr.Count() == 0)
+			{
+				UnsetNavigationType(EMapNavigationType.GPS);
+			}
+		}
+		
+		if (item.IsInherited(ItemCompass))
+		{
+			m_CompassInPossessionArr.RemoveItem(item);
+			if (m_CompassInPossessionArr.Count() == 0)
+			{
+				UnsetNavigationType(EMapNavigationType.COMPASS);
+			}
+		}
+	}
+	
+	void RandomizePosition()
+	{
+		m_RandomPositionDeviationX 	= RandomizedDeviation();
+		m_RandomPositionDeviationZ 	= RandomizedDeviation();
+	}
+	
+	protected float RandomizedDeviation()
+	{
+		Math.Randomize(GetWorldTime() + Math.RandomIntInclusive(2, 4096));
+		if ((Math.RandomIntInclusive(0, 10) % 2) == 0)
+		{
+			return Math.RandomIntInclusive(-RANDOM_DEVIATION_MAX, -RANDOM_DEVIATION_MIN);
+		}
+		else
+		{
+			return Math.RandomIntInclusive(RANDOM_DEVIATION_MIN, RANDOM_DEVIATION_MAX);
+		}
+	}
+	
+	vector GetPositionRandomized()
+	{
+		vector realPosition = m_Player.GetPosition();
+		vector randomizedPosition = Vector(realPosition[0] + m_RandomPositionDeviationX, realPosition[1], realPosition[2] + m_RandomPositionDeviationZ);
+
+		return randomizedPosition;
+	}
+	
+	vector GetPositionReal()
+	{
+		return m_Player.GetPosition();
+	}
+	
+	static array<int> OrderedPositionNumbersFromGridCoords(EntityAI pEntity)
+	{
+		float gridSize = GetGame().ConfigGetFloat(string.Format(GRID_SIZE_CFG_PATH, GetGame().GetWorldName()));
+		int gridX, gridZ;
+		GetGame().GetWorld().GetGridCoords(pEntity.GetPosition(), gridSize, gridX, gridZ);
+		
+		gridX = Math.AbsInt(gridX);
+		gridZ = Math.AbsInt(gridZ);
+		
+		array<int> positions 	= new array<int>();
+		string gridXStr 		= gridX.ToStringLen(DISPLAY_GRID_POS_MAX_CHARS_COUNT);
+		string gridZStr 		= gridZ.ToStringLen(DISPLAY_GRID_POS_MAX_CHARS_COUNT);
+		
+		int i = 0;
+		int gridCoordNumber;
+		for (i = 0; i < gridXStr.Length(); ++i)
+		{
+			gridCoordNumber = gridXStr.Get(i).ToInt();
+			if (IsOutOfMap(pEntity))
+			{
+				gridCoordNumber = -1;
+			}
+
+			positions.Insert(gridCoordNumber);
+		}
+
+		for (i = 0; i < gridZStr.Length(); ++i)
+		{
+			gridCoordNumber = gridZStr.Get(i).ToInt();
+			if (IsOutOfMap(pEntity))
+			{
+				gridCoordNumber = -1;
+			}
+
+			positions.Insert(gridCoordNumber);
+		}
+		
+		return positions;
+	}
+	
+	static array<int> OrderedAltitudeNumbersPosition(EntityAI pEntity)
+	{
+		array<int> altArray = new array<int>();
+		float altF 			= pEntity.GetPosition()[1];
+		int altI 			= Math.Round(altF); 
+		string altString 	= altI.ToStringLen(DISPLAY_ALT_MAX_CHARS_COUNT);
+		
+		for (int i = 0; i < altString.Length(); ++i)
+		{
+			altArray.Insert(altString.Get(i).ToInt());
+		}
+		
+		return altArray;
+	}
+	
+	static bool IsOutOfMap(EntityAI pEntity)
+	{
+		vector worldPos = pEntity.GetPosition();
+
+		if (worldPos[0] < 0 || worldPos[0] > GetGame().GetWorld().GetWorldSize() || worldPos[2] < 0 || worldPos[2] > GetGame().GetWorld().GetWorldSize())
+		{
+			return true;
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Matchbox.c b/scripts/4_World/DayZ/Entities/ItemBase/Matchbox.c
new file mode 100644
index 0000000000000000000000000000000000000000..e137053e65d26de97c14fd3e6839a373ac3bdd51
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Matchbox.c
@@ -0,0 +1,45 @@
+class Matchbox extends ItemBase
+{
+	override void InitItemVariables()
+	{
+		super.InitItemVariables();
+		can_this_be_combined = true;
+	}
+	
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		if ( GetQuantity() > 0 && GetWet() < GameConstants.STATE_DAMP )
+			return true;
+		else
+			return false;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+		if ( GetGame().IsServer() )
+		{
+			AddQuantity( -1 );
+		}
+	}
+	
+	override void OnIgnitedTargetFailed( EntityAI target_item )
+	{
+		if ( GetGame().IsServer() )
+		{
+			AddQuantity( -1 );
+		}
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionLightItemOnFire);
+	}
+	
+	/*
+	override bool IsTargetIgnitionSuccessful( EntityAI item_target = NULL )
+	{
+	}
+	*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/MediumGasCannister.c b/scripts/4_World/DayZ/Entities/ItemBase/MediumGasCannister.c
new file mode 100644
index 0000000000000000000000000000000000000000..f21a9bdc1fa79cf3e511849ea724ee5954d472b7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/MediumGasCannister.c
@@ -0,0 +1,7 @@
+class MediumGasCannister extends ItemBase
+{
+	override bool CanExplodeInFire()
+	{
+		return true;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Megaphone.c b/scripts/4_World/DayZ/Entities/ItemBase/Megaphone.c
new file mode 100644
index 0000000000000000000000000000000000000000..6962297d6f8f860e307ac5a46b9d19d7b6f921df
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Megaphone.c
@@ -0,0 +1,45 @@
+class Megaphone extends ItemMegaphone
+{
+	override bool IsTransmitter()
+	{
+		return true;
+	}	
+
+	//--- POWER EVENTS	
+	override void OnSwitchOn()
+	{
+		if ( !GetCompEM().CanWork() )
+		{
+			GetCompEM().SwitchOff();
+		}
+	}	
+	
+	override void OnWorkStart()
+	{
+		//turn device on
+		SwitchOn ( true ); // Note: This is not Energy Manager function. This is engine function.
+	}
+	
+	override void OnWorkStop()
+	{
+		//auto switch off (EM)
+		GetCompEM().SwitchOff();
+		
+		//turn off device
+		SwitchOn ( false ); // Note: This is not Energy Manager function. This is engine function.
+	}
+	
+	//TODO add turn on/off actions
+	//proto native bool CanSpeak();
+	//proto native void SetCanSpeak(bool onOff); 
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnTransmitter);
+		AddAction(ActionTurnOffTransmitter);
+		AddAction(ActionRaiseMegaphone);
+	}	
+	
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/MetalPlate.c b/scripts/4_World/DayZ/Entities/ItemBase/MetalPlate.c
new file mode 100644
index 0000000000000000000000000000000000000000..9c5f5e863091cdaa002fc2be5fd2369e488d77f3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/MetalPlate.c
@@ -0,0 +1,10 @@
+class MetalPlate extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachToConstruction);
+		AddAction(ActionAttachOnSelection);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/MetalWire.c b/scripts/4_World/DayZ/Entities/ItemBase/MetalWire.c
new file mode 100644
index 0000000000000000000000000000000000000000..c8a7cea37895261483623c17daf841ddff4c3bfc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/MetalWire.c
@@ -0,0 +1,130 @@
+class MetalWire extends ItemBase
+{
+	static string SEL_WIRE_ROLLED	= "rolled";
+	static string SEL_WIRE_PREFIX	= "Att_";
+	static string SEL_WIRE_SUFIX	= "_plugged";
+	static string SEL_PLUG_SUFIX	= "_plug";
+	
+	void MetalWire()
+	{
+		
+	}
+	
+	override bool CanPutAsAttachment( EntityAI parent )
+	{
+		if (!super.CanPutAsAttachment(parent))
+			return false;
+		
+		if ( parent.IsInherited(VehicleBattery) )
+		{
+			EntityAI battery_owner = EntityAI.Cast( parent.GetHierarchyParent() );
+			
+			// Check for Not player as if parent is not player, battery is already attached and should not receive new attachment
+			if ( battery_owner && !battery_owner.IsInherited(PlayerBase) )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	void UpdateAllSelections()
+	{
+		HideAllSelections();
+		EntityAI energy_source = GetCompEM().GetEnergySource();
+		
+		if (energy_source)
+		{
+			string ES_model = energy_source.GetModelName();
+			EntityAI powered_device = GetCompEM().GetPluggedDevice();
+			
+			if (powered_device)
+			{
+				// Show metal wire selection
+				string selection_wire = SEL_WIRE_PREFIX + ES_model + SEL_WIRE_SUFIX;
+				ShowSelection(selection_wire);
+				
+				// Show plug selection
+				string selection_plug = SEL_WIRE_PREFIX + ES_model + SEL_PLUG_SUFIX;
+				selection_plug.ToLower();
+				ShowSelection(selection_plug);
+				
+				// Set plug's texture
+				int selection_index = GetHiddenSelectionIndex(selection_plug);
+				string texture_path = powered_device.GetCompEM().GetCordTextureFile();
+				SetObjectTexture( selection_index, texture_path );
+			}
+			else
+			{
+				// Show metal wire selection
+				string selection_wire2 = SEL_WIRE_PREFIX + ES_model;
+				ShowSelection(selection_wire2);
+			}
+		}
+		else
+		{
+			ShowSelection(SEL_WIRE_ROLLED);
+		}
+	}
+	
+	// Event called on item when it is placed in the player(Man) inventory, passes the owner as a parameter
+	override void OnInventoryEnter( Man player )
+	{
+		super.OnInventoryEnter( player );
+		
+		PlayerBase player_PB;
+		Class.CastTo( player_PB, player );
+		if ( player_PB.GetItemInHands() == this && GetCompEM().IsPlugged() )
+		{
+			return;
+		}
+		
+		//Only unplug if we are "powering" something
+		ItemBase powered_device = ItemBase.Cast( GetCompEM().GetPluggedDevice() );
+		if ( powered_device )
+		{
+			GetCompEM().UnplugAllDevices();		
+		
+			if ( !player_PB.IsPlacingLocal() )
+			{
+				GetCompEM().UnplugThis();
+			}
+		}
+	}
+	
+	// Called when THIS is attached to battery
+	override void OnIsPlugged(EntityAI source_device)
+	{
+		UpdateAllSelections();
+	}
+	
+	// Called when THIS is detached from battery
+	override void OnIsUnplugged(EntityAI last_energy_source)
+	{
+		UpdateAllSelections();
+		GetCompEM().UnplugAllDevices();
+	}
+	
+	// Called when some device is plugged into THIS
+	override void OnOwnSocketTaken( EntityAI device )
+	{
+		UpdateAllSelections();
+	}
+	
+	// Called when some device is unplugged from THIS
+	override void OnOwnSocketReleased( EntityAI device )
+	{
+		UpdateAllSelections();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionRestrainTarget);
+		AddAction(ActionRestrainSelf);
+		AddAction(ActionAttachToConstruction);
+		AddAction(ActionAttach);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/NVGoggles.c b/scripts/4_World/DayZ/Entities/ItemBase/NVGoggles.c
new file mode 100644
index 0000000000000000000000000000000000000000..89169ab102ba2355e7344a9e57d048a84623453b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/NVGoggles.c
@@ -0,0 +1,206 @@
+class NVGoggles extends PoweredOptic_Base
+{
+	bool 		m_IsLowered;
+	Clothing 	m_Strap;
+	ref Timer 	m_WorkCheckTimer;
+	
+	void NVGoggles()
+	{
+		RotateGoggles(true);
+		m_WorkCheckTimer = new Timer;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		RemoveAction(ActionViewOptics);
+		AddAction(ActionViewBinoculars);
+	}
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached( item, slot_name );
+		
+		if ( GetCompEM().CanWork() && m_IsLowered )
+			m_WorkCheckTimer.Run(0.1,this,"SwitchOnNVGCheck",null,true);
+			//GetCompEM().SwitchOn();
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached( item, slot_name );
+		
+		GetCompEM().SwitchOff();
+	}
+	
+	override void OnWasAttached( EntityAI parent, int slot_id )
+	{
+		super.OnWasAttached(parent, slot_id);
+		RotateGoggles(true);
+		
+		m_Strap = Clothing.Cast(parent);
+		/*if (m_Strap)
+			SetPlayer(PlayerBase.Cast(m_Strap.GetHierarchyParent()));*/
+	}
+	
+	override void OnWasDetached( EntityAI parent, int slot_id )
+	{
+		super.OnWasDetached(parent, slot_id);
+		RotateGoggles(true);
+		
+		PlayerBase player;
+		if ( m_Strap == parent && PlayerBase.CastTo(player, parent.GetHierarchyRootPlayer()) )
+		{
+			if ( parent && Clothing.Cast(parent) )
+			{
+				Clothing.Cast(parent).UpdateNVGStatus(player,false,true);
+			}
+		}
+		
+		m_Strap = null;
+		//SetPlayer(null);
+	}
+	
+	override void OnWorkStart()
+	{
+		PlayerBase player;
+		EntityAI headgear;
+		EntityAI glasses;
+		if ( m_Strap && PlayerBase.CastTo(player, m_Strap.GetHierarchyParent()) )
+		{
+			headgear = player.FindAttachmentBySlotName("Headgear");
+			glasses = player.FindAttachmentBySlotName("Eyewear");
+			
+			//adjust on load - ComponentEnergyManager stores the 'working' state independently
+			if ( !m_IsLowered )
+			{
+				RotateGoggles(false);
+			}
+			
+			if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() ) // Client side
+			{
+				if ( (headgear == m_Strap || glasses == m_Strap) && player.IsControlledPlayer() )
+				{
+					player.AddActiveNV(NVTypes.NV_GOGGLES);
+				}
+			}
+		}
+	}
+	
+	override void OnWorkStop()
+	{
+		PlayerBase player;
+		EntityAI headgear;
+		EntityAI glasses;
+		if ( m_Strap && PlayerBase.CastTo(player, m_Strap.GetHierarchyParent()) )
+		{
+			headgear = player.FindAttachmentBySlotName("Headgear");
+			glasses = player.FindAttachmentBySlotName("Eyewear");
+			
+			if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() ) // Client side
+			{
+				if ( (headgear == m_Strap || glasses == m_Strap) && player.IsControlledPlayer() )
+				{
+					player.RemoveActiveNV(NVTypes.NV_GOGGLES);
+				}
+			}
+		}
+	}
+	
+	override void OnWork( float consumed_energy )
+	{
+		//adjust on load - ComponentEnergyManager stores the 'working' state independently
+		if ( !m_IsLowered )
+		{
+			RotateGoggles(false);
+		}
+		
+		PlayerBase player;
+		EntityAI headgear;
+		EntityAI glasses;
+		if ( m_Strap && PlayerBase.CastTo(player, m_Strap.GetHierarchyParent()) )
+		{
+			headgear = player.FindAttachmentBySlotName("Headgear");
+			glasses = player.FindAttachmentBySlotName("Eyewear");
+			
+			if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() ) // Client side
+			{
+				if ( (headgear == m_Strap || glasses == m_Strap) && player.IsControlledPlayer() )
+				{
+					player.AddActiveNV(NVTypes.NV_GOGGLES);
+				}
+			}
+		}
+	}
+	
+	void LoweredCheck() //check for animation state, if another player lowered them first (or solve by synced variable)
+	{
+		if ( GetAnimationPhase("rotate") != m_IsLowered )
+		{
+			m_IsLowered = GetAnimationPhase("rotate");
+		}
+	}
+	
+	void RotateGoggles(bool state)
+	{
+		//if ( GetAnimationPhase("rotate") != state ) //useless?
+			SetAnimationPhase("rotate",!state);
+		m_IsLowered = !state;
+		
+		PlayerBase player;
+		int slot_id;
+		string slot_name;
+		if ( m_Strap && m_Strap.GetInventory().GetCurrentAttachmentSlotInfo(slot_id,slot_name) && PlayerBase.CastTo(player, m_Strap.GetHierarchyParent())/*&& slot_id == InventorySlots.EYEWEAR*/ )
+		{
+			player.SetNVGLowered(m_IsLowered);
+		}
+		
+		if ( GetCompEM() )
+		{
+			if ( !state && GetCompEM().CanWork() )
+				GetCompEM().SwitchOn();
+			else
+				GetCompEM().SwitchOff();
+		}
+	}
+	
+	void SwitchOnNVGCheck()
+	{
+		//Print("SwitchOnNVGCheck");
+		GetCompEM().SwitchOn();
+		if (GetCompEM().IsSwitchedOn())
+		{
+			m_WorkCheckTimer.Stop();
+		}
+	}
+	
+	override int GetCurrentNVType()
+	{
+		if (IsWorking())
+		{
+			//m_CurrentOpticMode
+			switch (m_CurrentOpticMode)
+			{
+				/*case GameConstants.OPTICS_STATE_DAY:
+					return NVTypes.NV_GOGGLES_WHATEVER;
+				
+				case GameConstants.OPTICS_STATE_NIGHTVISION:
+					return NVTypes.NV_GOGGLES;*/
+				default:
+					return NVTypes.NV_GOGGLES;
+			}
+			Error("Undefined optic mode of " + this);
+			return NVTypes.NONE;
+		}
+		else
+		{
+			return NVTypes.NV_GOGGLES_OFF;
+		}
+	}
+	
+	override bool IsNVG()
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Nail.c b/scripts/4_World/DayZ/Entities/ItemBase/Nail.c
new file mode 100644
index 0000000000000000000000000000000000000000..b40a0d32475aa1fa066f42b0b2d86ebc804f7cb0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Nail.c
@@ -0,0 +1,9 @@
+class Nail extends ItemBase
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttachToConstruction);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/NailedBaseballBat.c b/scripts/4_World/DayZ/Entities/ItemBase/NailedBaseballBat.c
new file mode 100644
index 0000000000000000000000000000000000000000..da73a6d0f7b1f388164284dbf6ad16d3e12add3b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/NailedBaseballBat.c
@@ -0,0 +1,3 @@
+class NailedBaseballBat extends Inventory_Base
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/OpenableBehaviour.c b/scripts/4_World/DayZ/Entities/ItemBase/OpenableBehaviour.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f0f9d85f7c19e457fb704868d2d283f1bfb9038
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/OpenableBehaviour.c
@@ -0,0 +1,34 @@
+class OpenableBehaviour
+{
+	protected bool m_IsOpened;
+	
+	void OpenableBehaviour(bool bState = true)
+	{
+		m_IsOpened = bState; //! initial value
+	}
+
+	void Open()
+	{
+		SetState(true);
+	}
+
+	void Close()
+	{
+		SetState(false);
+	}
+	
+	bool IsOpened()
+	{
+		return GetState();
+	}
+	
+	protected void SetState(bool bState)
+	{
+		m_IsOpened = bState;
+	}
+	
+	protected bool GetState()
+	{
+		return m_IsOpened;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/OrientalMachete.c b/scripts/4_World/DayZ/Entities/ItemBase/OrientalMachete.c
new file mode 100644
index 0000000000000000000000000000000000000000..5840a0a84830e98b6fc376d7405321a03f28b3f5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/OrientalMachete.c
@@ -0,0 +1,29 @@
+class OrientalMachete extends ToolBase
+{
+	void Machete()
+	{
+	}
+
+	override bool IsMeleeFinisher()
+	{
+		return true;
+	}
+	
+	override array<int> GetValidFinishers()
+	{
+		return {EMeleeHitType.FINISHER_LIVERSTAB,EMeleeHitType.FINISHER_NECKSTAB};
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionBurnSewTarget);
+		AddAction(ActionSkinning);
+		AddAction(ActionMineBush);
+		AddAction(ActionMineTreeBark);
+		AddAction(ActionBurnSewSelf);
+		AddAction(ActionDigWorms);
+		AddAction(ActionCraftBolts);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Paper.c b/scripts/4_World/DayZ/Entities/ItemBase/Paper.c
new file mode 100644
index 0000000000000000000000000000000000000000..5e827c13f0172d8e7b94e600245cb3c8756b106e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Paper.c
@@ -0,0 +1,74 @@
+class Paper extends ItemBase
+{
+	protected ref WrittenNoteData m_NoteContents;
+	
+	void Paper()
+	{
+		m_NoteContents = new WrittenNoteData(this);
+	}
+	
+	void ~Paper() {}
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{   
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+		
+		if (version >= 108 && !ctx.Read(m_NoteContents))
+			return false;
+				
+		return true;
+	}
+	
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		super.OnStoreSave(ctx);
+		
+		ctx.Write(m_NoteContents);		
+	}
+	
+	override WrittenNoteData GetWrittenNoteData()
+	{
+		return m_NoteContents;
+	}
+	
+	//================================================================
+	// IGNITION ACTION
+	//================================================================
+	override bool HasFlammableMaterial()
+	{
+		return true;
+	}
+	
+	override bool CanBeIgnitedBy(EntityAI igniter = null)
+	{
+		return !GetHierarchyParent();
+	}
+	
+	override bool CanIgniteItem(EntityAI ignite_target = null)
+	{
+		return false;
+	}
+	
+	override void OnIgnitedTarget(EntityAI ignited_item) {}
+	
+	override void OnIgnitedThis(EntityAI fire_source)
+	{
+		Fireplace.IgniteEntityAsFireplace(this, fire_source);
+	}
+
+	override bool IsThisIgnitionSuccessful(EntityAI item_source = null)
+	{
+		return Fireplace.CanIgniteEntityAsFireplace(this);
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionCreateIndoorFireplace);
+		AddAction(ActionCreateIndoorOven);
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/ParticleTest.c b/scripts/4_World/DayZ/Entities/ItemBase/ParticleTest.c
new file mode 100644
index 0000000000000000000000000000000000000000..478cbd94967a2ab314916e771de18c5b9f11b87f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/ParticleTest.c
@@ -0,0 +1,45 @@
+// Particle test for Maxman
+
+class ParticleTest extends ItemBase
+{
+	protected int	PARTICLE_PATH;
+	protected Particle 	m_Particle;
+	
+	// Constructor
+	void ParticleTest()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // Client side
+		{
+			string path = ParticleList.GetPathToParticles();
+			
+			
+			
+			
+			
+			// Enter particle ID to play when ParticleTest spawns
+			PARTICLE_PATH = ParticleList.DEBUG_DOT; 
+			
+			// Alternatively, uncomment the second line and enter particle filename without *.ptc suffix instead. Example: "menu_engine_fire" 
+			string particle_filename = "menu_engine_fire";
+			//PARTICLE_PATH = ParticleList.GetParticleID( path + particle_filename );
+			
+			
+			
+			
+			
+			m_Particle = ParticleManager.GetInstance().PlayOnObject( PARTICLE_PATH, this, GetPosition());
+		}
+	}
+
+	// Destructor
+	override void EEDelete(EntityAI parent)
+	{
+		super.EEDelete(parent);
+		
+		if (m_Particle  &&  GetGame()) // GetGame() is null when the game is being shut down
+		{
+			m_Particle.Stop();
+			GetGame().ObjectDelete(m_Particle);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Pelt_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/Pelt_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..589bf57608a4971f57e68bd49b1419a57a86a0f0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Pelt_Base.c
@@ -0,0 +1,27 @@
+class Pelt_Base extends ItemBase
+{	
+	override bool IsPeltBase()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionAttach);
+		AddAction(ActionDetach);
+	}
+}
+
+class WildboarPelt: Pelt_Base {  };
+class RabbitPelt: Pelt_Base {  };
+class CowPelt: Pelt_Base {  };
+class PigPelt: Pelt_Base {  };
+class DeerPelt: Pelt_Base {  };
+class GoatPelt: Pelt_Base {  };
+class BearPelt: Pelt_Base {  };
+class WolfPelt: Pelt_Base {  };
+class SheepPelt: Pelt_Base {  };
+class MouflonPelt: Pelt_Base {  };
+class FoxPelt: Pelt_Base {  };
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PetrolLighter.c b/scripts/4_World/DayZ/Entities/ItemBase/PetrolLighter.c
new file mode 100644
index 0000000000000000000000000000000000000000..83634f3df529ef98be4d455542d4cf85ef48dc57
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PetrolLighter.c
@@ -0,0 +1,39 @@
+class PetrolLighter extends ItemBase
+{
+	override bool CanIgniteItem( EntityAI ignite_target = NULL )
+	{
+		if ( GetQuantity() > 0 )
+			return true;
+		else
+			return false;
+	}
+	
+	override void OnIgnitedTarget( EntityAI ignited_item )
+	{
+		if ( GetGame().IsServer() )
+		{
+			AddQuantity( -0.5 );
+		}
+	}
+	
+	override void OnIgnitedTargetFailed( EntityAI target_item )
+	{
+		if ( GetGame().IsServer() )
+		{
+			AddQuantity( -0.5 );
+		}
+	}
+
+	/*
+	override bool IsTargetIgnitionSuccessful( EntityAI item_target = NULL )
+	{
+	}
+	*/
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionLightItemOnFire);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PickAxe.c b/scripts/4_World/DayZ/Entities/ItemBase/PickAxe.c
new file mode 100644
index 0000000000000000000000000000000000000000..30e9924213f524f70bdef5f11bf493471e92f01b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PickAxe.c
@@ -0,0 +1,27 @@
+class Pickaxe extends ItemBase
+{
+	override bool CanMakeGardenplot()
+	{
+		return true;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionDigGardenPlot);
+		AddAction(ActionDismantleGardenPlot);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionMineRock);
+		AddAction(ActionDismantlePart);
+		AddAction(ActionBuildPart);
+		AddAction(ActionBuryBody);
+		AddAction(ActionBuryAshes);
+		AddAction(ActionDigWorms);
+		AddAction(ActionSkinning);
+		AddAction(ActionDigOutStash);
+		AddAction(ActionDigInStash);
+		AddAction(ActionCreateGreenhouseGardenPlot);
+	}
+}	
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PileOfWoodenPlanks.c b/scripts/4_World/DayZ/Entities/ItemBase/PileOfWoodenPlanks.c
new file mode 100644
index 0000000000000000000000000000000000000000..a1e5384528ec2a1c022cc41ca5c6724eb28e2317
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PileOfWoodenPlanks.c
@@ -0,0 +1,108 @@
+class PileOfWoodenPlanks extends ItemBase
+{	
+	void PileOfWoodenPlanks()
+	{
+		if ( GetGame().IsServer() )
+		{
+			SetAllowDamage(false);
+		}
+	}
+	
+	// Shows/Hides selections. Call this in init or after every quantity change.
+	void UpdateSelections()
+	{
+		RemoveProxyPhysics( "stage_1" );
+		RemoveProxyPhysics( "stage_2" );
+		RemoveProxyPhysics( "stage_3" );
+		
+		// Show/Hide selections according to the current quantity
+		if ( this )
+		{
+			float quantity = GetQuantity();
+			float quantity_max = GetQuantityMax();
+			
+			if ( quantity > GetQuantityMax() *0.66 )
+			{
+				// Show 3/3 amount of planks
+				ShowSelection ( "stage_3" );
+				HideSelection ( "stage_2" );
+				HideSelection ( "stage_1" );
+				
+				AddProxyPhysics( "stage_3" );
+			}
+			
+			if ( quantity > quantity_max *0.33  &&  quantity <= quantity_max *0.66 )
+			{
+				// Show 2/3 amount of planks
+				HideSelection ( "stage_3" );
+				ShowSelection ( "stage_2" );
+				HideSelection ( "stage_1" );
+				
+				AddProxyPhysics( "stage_2" );
+			}
+			
+			if ( quantity > 0  &&  quantity <= quantity_max *0.33 )
+			{
+				// Show 1/3 amount of planks
+				HideSelection ( "stage_3" );
+				HideSelection ( "stage_2" );
+				ShowSelection ( "stage_1" );
+				
+				AddProxyPhysics( "stage_1" );
+			}
+			
+			if ( quantity == 0 )
+			{
+				// Show 0 planks. Object should be deleted now.
+				HideSelection ( "stage_3" );
+				HideSelection ( "stage_2" );
+				HideSelection ( "stage_1" );
+			}
+		}
+	}
+	
+	override void EEItemLocationChanged(notnull InventoryLocation oldLoc, notnull InventoryLocation newLoc)
+	{
+		super.EEItemLocationChanged(oldLoc, newLoc);
+		UpdateSelections();
+	}
+	
+	// Removes a number of long planks. Note that one (4m) long plank has the length of 3x normal planks!
+	// Returns the number of removed long planks
+	int RemovePlanks( int needed_planks )
+	{
+		// Make sure to not give more long planks than we have available
+		int available_planks = needed_planks;
+		if ( available_planks > GetQuantity() )
+		{
+			available_planks = GetQuantity();
+		}
+		
+		// Remove long planks from this object
+		AddQuantity( -available_planks, true ); // Autodelete enabled
+		
+		// Visual feedback
+		UpdateSelections();
+		
+		// Return the number of removed long planks
+		return available_planks;
+	}
+	
+	override bool CanPutIntoHands( EntityAI parent )
+	{
+		return false;
+	}
+	
+	override bool CanPutInCargo (EntityAI parent)
+	{
+		// Uncomment this if you want to make it possible to put the pile into V3S Cargo
+		/*
+		if ( parent.IsKindOf("V3S_Cargo") )
+			return true;
+		else
+			return false;
+		*/
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Pipe.c b/scripts/4_World/DayZ/Entities/ItemBase/Pipe.c
new file mode 100644
index 0000000000000000000000000000000000000000..20f0cdde1dcba6df07eb50559a95a8150fa687e1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Pipe.c
@@ -0,0 +1,3 @@
+class Pipe extends Inventory_Base
+{
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PipeWrench.c b/scripts/4_World/DayZ/Entities/ItemBase/PipeWrench.c
new file mode 100644
index 0000000000000000000000000000000000000000..3a724c2373903049c8c87a2ecc75fdef7bbd04f3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PipeWrench.c
@@ -0,0 +1,10 @@
+class PipeWrench extends Inventory_Base
+{
+	override void SetActions()
+	{
+		super.SetActions();
+		//AddAction(ActionDismantlePart);
+		//AddAction(ActionRepairCarEngine);
+		AddAction(ActionMineRock);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Pitchfork.c b/scripts/4_World/DayZ/Entities/ItemBase/Pitchfork.c
new file mode 100644
index 0000000000000000000000000000000000000000..fabdada173018f10b9f6baf0ffcae6648dfcaa44
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Pitchfork.c
@@ -0,0 +1,12 @@
+class Pitchfork extends ItemBase
+{
+	void Pitchfork()
+	{
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		AddAction(ActionClapBearTrapWithThisItem);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Pliers.c b/scripts/4_World/DayZ/Entities/ItemBase/Pliers.c
new file mode 100644
index 0000000000000000000000000000000000000000..e8551b0d272a470a01cfbe97f4f4b813a3fc0f2f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Pliers.c
@@ -0,0 +1,20 @@
+class Pliers extends ToolBase
+{
+	void Pliers()
+	{
+		m_MineDisarmRate = 100;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionDismantlePart);
+		AddAction(ActionBuildPart);
+		AddAction(ActionUnrestrainTarget);
+		AddAction(ActionMountBarbedWire);
+		AddAction(ActionUnmountBarbedWire);
+		AddAction(ActionLockAttachment);
+		AddAction(ActionDisarmExplosive);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PortableGasLamp.c b/scripts/4_World/DayZ/Entities/ItemBase/PortableGasLamp.c
new file mode 100644
index 0000000000000000000000000000000000000000..600af0e964935e1ef6d0f1328aef976095d7dad3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PortableGasLamp.c
@@ -0,0 +1,93 @@
+class PortableGasLamp extends ItemBase
+{
+	PortableGasLampLight	m_Light;
+	
+	private const string GAS_LIGHT_MATERIAL_ON 		= "dz\\gear\\cooking\\data\\GasLightOn.rvmat";
+	private const string GAS_LIGHT_MATERIAL_OFF 	= "dz\\data\\data\\default.rvmat";
+
+	//sound
+	const string SOUND_BURNING 		= "portablegaslamp_burn_SoundSet";
+	const string SOUND_TURN_ON		= "portablegaslamp_turn_on_SoundSet";
+	const string SOUND_TURN_OFF		= "portablegaslamp_turn_off_SoundSet";
+	
+	protected EffectSound m_SoundBurningLoop;
+	protected EffectSound m_SoundTurnOn;
+	protected EffectSound m_SoundTurnOff;
+	
+	//--- POWER EVENTS
+	override void OnSwitchOn()
+	{
+		super.OnSwitchOn();
+		
+		//sound (client only)
+		SoundTurnOn();
+	}
+
+	override void OnSwitchOff()
+	{
+		super.OnSwitchOff();
+		
+		//sound (client only)
+		SoundTurnOff();
+	}
+	
+	override void OnWorkStart()
+	{
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // client side
+		{
+			m_Light = PortableGasLampLight.Cast( ScriptedLightBase.CreateLight( PortableGasLampLight, "0 0 0") );
+			m_Light.AttachOnMemoryPoint(this, "light");
+		}
+		
+		//refresh visual
+		SetObjectMaterial( 0, GAS_LIGHT_MATERIAL_ON );
+		
+		//sound (client only)
+		SoundBurningStart();
+	}
+
+	override void OnWorkStop()
+	{
+		if (m_Light)
+			m_Light.FadeOut();
+		
+		//refresh visual
+		SetObjectMaterial( 0, GAS_LIGHT_MATERIAL_OFF );
+		
+		//sound (client only)
+		SoundBurningStop();
+	}
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	protected void SoundBurningStart()
+	{
+		PlaySoundSetLoop( m_SoundBurningLoop, SOUND_BURNING, 0.1, 0.3 );
+	}
+	
+	protected void SoundBurningStop()
+	{
+		StopSoundSet( m_SoundBurningLoop );
+	}	
+
+	protected void SoundTurnOn()
+	{
+		PlaySoundSet( m_SoundTurnOn, SOUND_TURN_ON, 0.1, 0.1 );
+	}
+	
+	protected void SoundTurnOff()
+	{
+		PlaySoundSet( m_SoundTurnOff, SOUND_TURN_OFF, 0.1, 0.1 );
+	}	
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnWhileInHands);
+		AddAction(ActionTurnOffWhileInHands);
+		AddAction(ActionTurnOnWhileOnGround);
+		AddAction(ActionTurnOffWhileOnGround);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PortableGasStove.c b/scripts/4_World/DayZ/Entities/ItemBase/PortableGasStove.c
new file mode 100644
index 0000000000000000000000000000000000000000..0a7d1e254fb553cdd53cd7d46ded1f552ad048c8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PortableGasStove.c
@@ -0,0 +1,435 @@
+class PortableGasStove extends ItemBase
+{
+	StoveLight	m_Light;
+	
+	protected const string FLAME_BUTANE_ON 			= "dz\\gear\\cooking\\data\\flame_butane_ca.paa";
+	protected const string FLAME_BUTANE_OFF 		= "";
+	typename ATTACHMENT_COOKING_POT 				= Pot;
+	typename ATTACHMENT_FRYING_PAN 					= FryingPan;
+	typename ATTACHMENT_CAULDRON	 				= Cauldron;
+	
+	//cooking
+	protected const float PARAM_COOKING_TEMP_THRESHOLD			= 100;		//temperature threshold for starting coooking process (degree Celsius)
+	protected const float PARAM_COOKING_EQUIP_TEMP_INCREASE		= 10;		//how much will temperature increase when attached on burning fireplace (degree Celsius)
+	protected const float PARAM_COOKING_EQUIP_MAX_TEMP			= 250;		//maximum temperature of attached cooking equipment (degree Celsius)
+	protected const float PARAM_COOKING_TIME_INC_COEF			= 0.5;		//cooking time increase coeficient, can be used when balancing how fast a food can be cooked
+	
+	private 		float m_TimeFactor;
+	//
+	ref Cooking m_CookingProcess;
+	ItemBase m_CookingEquipment;
+	
+	//sound
+	const string SOUND_BURNING 		= "portablegasstove_burn_SoundSet";
+	const string SOUND_TURN_ON		= "portablegasstove_turn_on_SoundSet";
+	const string SOUND_TURN_OFF		= "portablegasstove_turn_off_SoundSet";
+	
+	protected EffectSound m_SoundBurningLoop;
+	protected EffectSound m_SoundTurnOn;
+	protected EffectSound m_SoundTurnOff;
+	
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaConstant m_UTSLConst;
+	
+	//cooking equipment
+	ItemBase GetCookingEquipment()
+	{
+		return m_CookingEquipment;
+	}
+	
+	void SetCookingEquipment(ItemBase equipment)
+	{
+		m_CookingEquipment = equipment;
+	}
+	
+	void ClearCookingEquipment(ItemBase pItem)
+	{
+		if (m_CookingProcess)
+		{
+			m_CookingProcess.TerminateCookingSounds(pItem);
+		}
+
+		SetCookingEquipment(null);
+	}
+
+	//Destroy
+	void DestroyFireplace()
+	{
+		//delete object
+		GetGame().ObjectDelete(this);
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 1000;
+			m_UTSSettings.m_RangeFull		= 1;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 10;
+			
+			m_UTSLConst						= new UniversalTemperatureSourceLambdaConstant();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLConst);
+		}		
+	}
+	
+	//--- ATTACHMENTS
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		
+		//cookware
+		switch (item.Type())
+		{
+		case ATTACHMENT_CAULDRON:
+		case ATTACHMENT_COOKING_POT:
+		case ATTACHMENT_FRYING_PAN:
+			SetCookingEquipment(ItemBase.Cast(item));
+			RefreshFlameVisual(m_EM.IsSwitchedOn(), true);
+		break;
+		}
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		//cookware
+		switch (item.Type())
+		{
+		case ATTACHMENT_CAULDRON:
+		case ATTACHMENT_COOKING_POT:
+		case ATTACHMENT_FRYING_PAN:
+			RemoveCookingAudioVisuals();
+			//remove cooking equipment reference
+			ClearCookingEquipment(ItemBase.Cast(item));
+			RefreshFlameVisual(m_EM.IsSwitchedOn(), false);
+		break;
+		}
+	}
+	
+	//--- POWER EVENTS
+	override void OnSwitchOn()
+	{
+		super.OnSwitchOn();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 3.0);
+		}
+		
+		//sound (client only)
+		SoundTurnOn();
+	}
+
+	override void OnSwitchOff()
+	{
+		super.OnSwitchOff();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 5.0);
+		}
+		
+		//sound (client only)
+		SoundTurnOff();
+		if (m_CookingProcess && GetCookingEquipment())
+		{
+			m_CookingProcess.TerminateCookingSounds(GetCookingEquipment());
+		}
+	}
+	
+	override void OnWorkStart()
+	{
+		super.OnWorkStart();
+
+		#ifndef SERVER
+		m_Light = StoveLight.Cast(ScriptedLightBase.CreateLight(StoveLight, "0 0 0"));
+		m_Light.AttachOnMemoryPoint(this, "light");
+		#endif
+		
+		//refresh visual
+		RefreshFlameVisual(true, GetCookingEquipment() != null);
+		
+		//sound (client only)
+		SoundBurningStart();
+	}
+
+	override void OnWorkStop()
+	{
+		#ifndef SERVER
+		if (m_Light)
+		{
+			m_Light.FadeOut();
+		}
+		#endif
+		
+		//refresh visual
+		RefreshFlameVisual(false, false);
+		//stop steam particle
+		RemoveCookingAudioVisuals();		
+		//sound (client only)
+		SoundBurningStop();
+	}
+	
+	//on update 
+	override void OnWork(float consumed_energy)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.Update(m_UTSSettings, m_UTSLConst);
+		}
+
+		//manage cooking equipment
+		if (GetCookingEquipment())
+		{
+			if (GetGame() && GetGame().IsServer())
+			{
+				float cook_equip_temp = GetCookingEquipment().GetTemperature();
+				
+				//start cooking
+				if (cook_equip_temp >= PARAM_COOKING_TEMP_THRESHOLD)
+				{
+					m_TimeFactor = consumed_energy;
+					CookWithEquipment();
+				}				
+				
+				//set temperature to cooking equipment
+				cook_equip_temp = cook_equip_temp + (PARAM_COOKING_EQUIP_TEMP_INCREASE * consumed_energy);
+				cook_equip_temp = Math.Clamp(cook_equip_temp, 0, PARAM_COOKING_EQUIP_MAX_TEMP);
+				GetCookingEquipment().SetTemperature(cook_equip_temp);
+				//! damaging of cookware
+				GetCookingEquipment().DecreaseHealth(GameConstants.FIRE_ATTACHMENT_DAMAGE_PER_SECOND * GetCompEM().GetUpdateInterval(), false);
+			}
+		}
+	}
+	
+	void CookWithEquipment()
+	{
+		if (m_CookingProcess == null)
+		{
+			m_CookingProcess = new Cooking();
+		}
+		
+		m_CookingProcess.CookWithEquipment(GetCookingEquipment(), PARAM_COOKING_TIME_INC_COEF * m_TimeFactor);
+	}
+
+	protected void RefreshFlameVisual(bool working = false, bool hasAttachment = false)
+	{
+		if (!working)
+		{
+			SetObjectTexture(0, FLAME_BUTANE_OFF);
+			SetObjectTexture(1, FLAME_BUTANE_OFF);
+
+			return;
+		}
+		
+		if (!hasAttachment)
+		{
+			//! full size flame selection
+			SetObjectTexture(0, FLAME_BUTANE_ON);
+			SetObjectTexture(1, FLAME_BUTANE_OFF);
+		}
+		else
+		{
+			//! shrinked flame selection
+			SetObjectTexture(0, FLAME_BUTANE_OFF);
+			SetObjectTexture(1, FLAME_BUTANE_ON);
+		}
+	}
+
+	//================================================================
+	// PARTICLES
+	//================================================================	
+	//cooking equipment steam
+	protected void RemoveCookingAudioVisuals()
+	{
+		ItemBase cookEquipment = GetCookingEquipment();
+		if (cookEquipment)
+		{
+			switch (cookEquipment.Type())
+			{
+			case ATTACHMENT_CAULDRON:
+			case ATTACHMENT_COOKING_POT:
+				Bottle_Base cookingPot = Bottle_Base.Cast(cookEquipment);
+				cookingPot.RemoveAudioVisualsOnClient();
+			break;
+			case ATTACHMENT_FRYING_PAN:
+				FryingPan fryingPan = FryingPan.Cast(cookEquipment);
+				fryingPan.RemoveAudioVisualsOnClient();
+			break;
+			}
+		}
+	}
+	
+	//================================================================
+	// SOUNDS
+	//================================================================
+	protected void SoundBurningStart()
+	{
+		PlaySoundSetLoop(m_SoundBurningLoop, SOUND_BURNING, 0.1, 0.3);
+	}
+	
+	protected void SoundBurningStop()
+	{
+		StopSoundSet(m_SoundBurningLoop);
+	}	
+
+	protected void SoundTurnOn()
+	{
+		PlaySoundSet(m_SoundTurnOn, SOUND_TURN_ON, 0.1, 0.1);
+	}
+	
+	protected void SoundTurnOff()
+	{
+		PlaySoundSet(m_SoundTurnOff, SOUND_TURN_OFF, 0.1, 0.1);
+	}		
+		
+	//================================================================
+	// CONDITIONS
+	//================================================================
+	//this into/outo parent.Cargo
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		if (!super.CanPutInCargo(parent))
+			return false;
+		
+		if (GetCompEM().IsSwitchedOn())
+			return false;
+		
+		//can 'parent' be attached to 'this' (->assumed smaller size than 'this')?
+		if (parent)
+		{
+			int slotId;
+			for (int i = 0; i < GetInventory().GetAttachmentSlotsCount(); i++)
+			{
+				slotId = GetInventory().GetAttachmentSlotId(i);
+				if (parent.GetInventory().HasInventorySlot(slotId))
+				{
+					//Print("CanPutInCargo | parent " + parent + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+					return false;
+				}
+			}
+		}
+		
+		return true;
+	}
+	
+	override bool CanRemoveFromCargo(EntityAI parent)
+	{
+		return true;
+	}
+	
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		InventoryLocation loc = new InventoryLocation();
+		EntityAI ent = this;
+		EntityAI parent;
+		while (ent)
+		{
+			if (ent.GetInventory().GetCurrentInventoryLocation(loc) && loc.IsValid())
+			{
+				if (loc.GetType() == InventoryLocationType.CARGO)
+				{
+					parent = ent.GetHierarchyParent();
+					if (parent && parent.GetInventory().HasInventorySlot(slotId))
+					{
+						//Print("CanReceiveAttachment | parent " + parent + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+						return false;
+					}
+				}
+			}
+			
+			ent = ent.GetHierarchyParent();
+		}
+		
+		return super.CanReceiveAttachment(attachment, slotId);
+	}
+	
+	override bool CanLoadAttachment(EntityAI attachment)
+	{
+		int slotId;
+		for (int i = 0; i < attachment.GetInventory().GetSlotIdCount(); i++)
+		{
+			slotId = attachment.GetInventory().GetSlotId(i);
+			if (GetInventory().HasAttachmentSlot(slotId))
+			{
+				InventoryLocation loc = new InventoryLocation();
+				EntityAI ent = this;
+				EntityAI parent;
+				while (ent)
+				{
+					if (ent.GetInventory().GetCurrentInventoryLocation(loc) && loc.IsValid())
+					{
+						if (loc.GetType() == InventoryLocationType.CARGO)
+						{
+							parent = ent.GetHierarchyParent();
+							if (parent.GetInventory().HasInventorySlot(slotId))
+							{
+								//Print("CanLoadAttachment | parent " + parent + " matches in slot name: " + InventorySlots.GetSlotName(slotId) + " of " + this);
+								return false;
+							}
+						}
+					}
+					
+					ent = ent.GetHierarchyParent();
+				}
+			}
+		}
+		
+		return super.CanLoadAttachment(attachment);
+	}
+	
+	//hands
+	override bool CanPutIntoHands(EntityAI parent)
+	{
+		if (!super.CanPutIntoHands(parent))
+		{
+			return false;
+		}
+		
+		return !GetCompEM().IsSwitchedOn();
+	}	
+	
+	//================================================================
+	// ITEM-TO-ITEM FIRE DISTRIBUTION
+	//================================================================
+	
+	override bool IsIgnited()
+	{
+		return GetCompEM().IsWorking();
+	}
+	
+	override bool CanIgniteItem(EntityAI ignite_target = NULL)
+	{
+		return GetCompEM().IsWorking();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionLightItemOnFire);
+		AddAction(ActionTurnOnWhileOnGround);
+		AddAction(ActionTurnOffWhileOnGround);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if ( Class.CastTo(entity, this) )
+		{
+			GetInventory().CreateInInventory("LargeGasCanister");
+			GetInventory().CreateInInventory("Pot");
+
+			SpawnEntityOnGroundPos("WaterBottle", entity.GetPosition() + Vector(0.2, 0, 0));
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PowerGenerator.c b/scripts/4_World/DayZ/Entities/ItemBase/PowerGenerator.c
new file mode 100644
index 0000000000000000000000000000000000000000..480cd49ec02e4a0791e1fac9319a56176736d44f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PowerGenerator.c
@@ -0,0 +1,395 @@
+class PowerGeneratorBase extends ItemBase
+{
+	float						m_Fuel;
+	private static float		m_FuelTankCapacity; // Capacity in ml.
+	private static float		m_FuelToEnergyRatio; // Conversion ratio of 1 ml of fuel to X Energy
+	private int					m_FuelPercentage;
+	
+	static const string			START_SOUND = "powerGeneratorTurnOn_SoundSet";
+	static const string			LOOP_SOUND = "powerGeneratorLoop_SoundSet";
+	static const string			STOP_SOUND = "powerGeneratorTurnOff_SoundSet";
+	static const string 		SPARKPLUG_ATTACH_SOUND = "sparkplug_attach_SoundSet";
+	static const string 		SPARKPLUG_DETACH_SOUND = "sparkplug_detach_SoundSet";
+	
+	protected EffectSound 		m_EngineLoop;
+	protected EffectSound 		m_EngineStart;
+	protected EffectSound 		m_EngineStop;
+	ref Timer 					m_SoundLoopStartTimer;
+	ref protected Effect 		m_Smoke;
+	
+	ItemBase	m_SparkPlug; 	//! DEPRECATED Attached spark plug item
+	
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+	
+	// Constructor
+	void PowerGeneratorBase()	
+	{
+		SetEventMask(EntityEvent.INIT); // Enable EOnInit event
+		
+		m_FuelPercentage = 50;
+		RegisterNetSyncVariableInt("m_FuelPercentage");
+		RegisterNetSyncVariableBool("m_IsSoundSynchRemote");
+		RegisterNetSyncVariableBool("m_IsPlaceSound");
+	}
+	
+	void ~PowerGeneratorBase()
+	{
+		SEffectManager.DestroyEffect(m_Smoke);
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 80;
+			m_UTSSettings.m_RangeFull		= 1;
+			m_UTSSettings.m_RangeMax		= 2.5;
+			m_UTSSettings.m_TemperatureCap	= 8;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		if (GetGame().IsServer())
+		{
+			m_FuelPercentage = GetCompEM().GetEnergy0To100();
+			SetSynchDirty();
+		}
+
+		UpdateFuelMeter();
+	}
+	
+	override float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_GENERATOR;
+	}
+	
+	// Play the loop sound
+	void StartLoopSound()
+	{
+		if (GetGame().IsClient() || !GetGame().IsMultiplayer())
+		{
+			if (GetCompEM().IsWorking())
+			{
+				PlaySoundSetLoop(m_EngineLoop, LOOP_SOUND, 0, 0);
+				
+				// Particle
+				vector local_pos = "0.3 0.21 0.4";
+				vector local_ori = "270 0 0";
+				m_Smoke = new EffGeneratorSmoke();
+				SEffectManager.PlayOnObject(m_Smoke, this, local_pos, local_ori);
+			}
+		}
+	}
+	
+	// Taking item into inventory
+	override bool CanPutInCargo( EntityAI parent )
+	{
+		if (!super.CanPutInCargo(parent))
+		{
+			return false;
+		}
+
+		return CanManipulate();
+	}
+
+	// Taking item into inventory
+	override bool CanPutIntoHands(EntityAI player)
+	{
+		if(!super.CanPutIntoHands(parent))
+		{
+			return false;
+		}
+		return CanManipulate();
+	}
+
+	// Returns true/false if this item can be moved into inventory/hands
+	bool CanManipulate()
+	{
+		return GetCompEM().GetPluggedDevicesCount() == 0 && !GetCompEM().IsWorking();
+	}
+	
+	/*===================================
+					EVENTS
+	===================================*/
+	
+	// Init
+	override void OnInitEnergy()
+	{
+		m_FuelTankCapacity = GetGame().ConfigGetFloat ("CfgVehicles " + GetType() + " fuelTankCapacity");
+		m_FuelToEnergyRatio = GetCompEM().GetEnergyMax() / m_FuelTankCapacity; // Conversion ratio of 1 ml of fuel to X Energy
+		
+		UpdateFuelMeter();
+	}
+	
+	// Generator is working
+	override void OnWorkStart()
+	{
+		if (GetGame().IsClient() || !GetGame().IsMultiplayer())
+		{
+			if (IsInitialized())
+			{
+				PlaySoundSet(m_EngineStart, START_SOUND, 0, 0);
+			}
+			
+			if (!m_SoundLoopStartTimer)
+			{
+				m_SoundLoopStartTimer = new Timer(CALL_CATEGORY_SYSTEM);
+			}
+			
+			if (!m_SoundLoopStartTimer.IsRunning()) // Makes sure the timer is NOT running already
+			{
+				m_SoundLoopStartTimer.Run(1.5, this, "StartLoopSound", NULL, false);
+			}
+		}
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+
+	// Do work
+	override void OnWork(float consumed_energy)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+		}
+
+		if (GetGame().IsServer())
+		{
+			m_FuelPercentage = GetCompEM().GetEnergy0To100();
+			SetSynchDirty();
+		}
+		
+		UpdateFuelMeter();
+	}
+
+	// Turn off when this runs out of fuel
+	override void OnWorkStop()
+	{
+		if (GetGame().IsClient() || !GetGame().IsMultiplayer())
+		{
+			// Sound
+			PlaySoundSet(m_EngineStop, STOP_SOUND, 0, 0);
+			StopSoundSet(m_EngineLoop);
+			
+			// particle
+			SEffectManager.DestroyEffect(m_Smoke);
+			
+			// Fuel meter
+			UpdateFuelMeter();
+		}
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 20.0);
+		}
+	}
+	
+	// Called when this generator is picked up
+	override void OnItemLocationChanged(EntityAI old_owner, EntityAI new_owner) 
+	{
+		super.OnItemLocationChanged(old_owner, new_owner);
+		UpdateFuelMeter();
+	}
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+		GetCompEM().InteractBranch(this);
+		
+		ItemBase item_IB = ItemBase.Cast(item);
+		
+		if (item_IB.IsKindOf("Sparkplug") && IsInitialized())
+		{
+			ShowSelection("sparkplug_installed");
+			
+			#ifndef SERVER
+			EffectSound sound = SEffectManager.PlaySound(SPARKPLUG_ATTACH_SOUND, GetPosition());
+			sound.SetAutodestroy( true );
+			#endif
+		}
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		
+		GetCompEM().InteractBranch(this);
+		
+		ItemBase item_IB = ItemBase.Cast(item);
+		
+		if (item_IB.IsKindOf("Sparkplug"))
+		{
+			HideSelection("sparkplug_installed");
+			GetCompEM().SwitchOff();
+			
+			#ifndef SERVER
+			EffectSound sound = SEffectManager.PlaySound(SPARKPLUG_DETACH_SOUND, GetPosition());
+			sound.SetAutodestroy(true);
+			#endif
+		}
+	}
+	
+	/*================================
+				FUNCTIONS
+	================================*/
+	
+	void UpdateFuelMeter()
+	{
+		if (GetGame().IsClient() || !GetGame().IsMultiplayer())
+		{
+			SetAnimationPhase("dial_fuel", m_FuelPercentage * 0.01);
+		}
+	}
+	
+	// Adds energy to the generator
+	void SetFuel(float fuel_amount)
+	{
+		if (m_FuelTankCapacity > 0)
+		{
+			m_FuelToEnergyRatio = GetCompEM().GetEnergyMax() / m_FuelTankCapacity;
+			GetCompEM().SetEnergy(fuel_amount * m_FuelToEnergyRatio);
+			m_FuelPercentage = GetCompEM().GetEnergy0To100();
+			SetSynchDirty();
+			UpdateFuelMeter();
+		}
+		else
+		{
+			string error = string.Format("ERROR! Item %1 has fuel tank with 0 capacity! Add parameter 'fuelTankCapacity' to its config and set it to more than 0!", this.GetType());
+			DPrint(error);
+		}
+	}
+	
+	// Adds fuel (energy) to the generator
+	// Returns how much fuel was accepted
+	float AddFuel(float available_fuel)
+	{
+		if (available_fuel == 0)
+		{
+			return 0;
+		}
+		GetCompEM().InteractBranch(this);
+		float needed_fuel = GetMaxFuel() - GetFuel();
+		
+		if (needed_fuel > available_fuel)
+		{
+			SetFuel(GetFuel() + available_fuel);
+			return available_fuel; // Return used fuel amount
+		}
+		else
+		{
+			SetFuel(GetMaxFuel());
+			return needed_fuel;
+		}
+	}
+
+	// Check the bottle if it can be used to fill the tank
+	bool CanAddFuel(ItemBase container)
+	{
+		if (container)
+		{
+			// Get the liquid
+			int liquid_type	= container.GetLiquidType();
+			
+			// Do all checks
+			if ( container.GetQuantity() > 0 && GetCompEM().GetEnergy() < GetCompEM().GetEnergyMax() && (liquid_type & LIQUID_GASOLINE))
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+
+	// Returns fuel amount
+	float GetFuel()
+	{
+		return GetCompEM().GetEnergy() / m_FuelToEnergyRatio;
+	}
+
+	// Returns max fuel amount
+	float GetMaxFuel()
+	{
+		return m_FuelTankCapacity;
+	}
+
+	// Checks sparkplug
+	bool HasSparkplug()
+	{
+		int slot = InventorySlots.GetSlotIdFromString("SparkPlug");
+		EntityAI ent = GetInventory().FindAttachment(slot);
+
+		return ent && !ent.IsRuined();
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+				
+		UpdateFuelMeter();
+		
+		if (IsPlaceSound())
+		{
+			PlayPlaceSound();
+		}
+	}
+	
+	//================================================================
+	// ADVANCED PLACEMENT
+	//================================================================
+	
+	override void OnPlacementComplete(Man player, vector position = "0 0 0", vector orientation = "0 0 0")
+	{
+		super.OnPlacementComplete(player, position, orientation);
+			
+		SetIsPlaceSound(true);
+	}
+	
+	override string GetPlaceSoundset()
+	{
+		return "placePowerGenerator_SoundSet";
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionTogglePlaceObject);
+		AddAction(ActionPullOutPlug);
+		AddAction(ActionTurnOnPowerGenerator);
+		AddAction(ActionTurnOffPowerGenerator);
+		AddAction(ActionPlaceObject);
+	}
+	
+	//Debug menu Spawn Ground Special
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		if (Class.CastTo(entity, this))
+		{
+			entity.GetInventory().CreateInInventory("SparkPlug");
+		}
+		
+		SetFuel(GetMaxFuel());
+	}
+}
+
+
+class PowerGenerator extends PowerGeneratorBase
+{
+
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PoweredOptic_Base.c b/scripts/4_World/DayZ/Entities/ItemBase/PoweredOptic_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..f93bb12e7ac26d8d239c552da73685c75d6b8613
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PoweredOptic_Base.c
@@ -0,0 +1,14 @@
+class PoweredOptic_Base extends ItemOptics
+{
+	protected PlayerBase 				m_Player;
+	
+	void SetPlayer( PlayerBase player )
+	{
+		m_Player = player;
+	}
+	
+	PlayerBase GetPlayer()
+	{
+		return m_Player;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PumpkinHelmet.c b/scripts/4_World/DayZ/Entities/ItemBase/PumpkinHelmet.c
new file mode 100644
index 0000000000000000000000000000000000000000..133610a7944e427965535ac8314a78eff592356d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PumpkinHelmet.c
@@ -0,0 +1,112 @@
+// Have a spooky Halloween everyone!
+
+class PumpkinHelmet : HelmetBase
+{
+	void PumpkinHelmet()
+	{
+		SetEventMask(EntityEvent.INIT); // Enable EOnInit event
+	}
+	
+	override void OnMovedInsideCargo(EntityAI container)
+	{
+		UpdateGlowState();
+	}
+	
+	override void OnMovedWithinCargo(EntityAI container)
+	{
+		UpdateGlowState();
+	}
+	
+	override void OnRemovedFromCargo(EntityAI container)
+	{
+		UpdateGlowState();
+	}
+	
+	override void EOnInit( IEntity other, int extra)
+	{
+		UpdateGlowState();
+	}
+	
+	override void OnItemLocationChanged( EntityAI old_owner, EntityAI new_owner)
+	{
+		super.OnItemLocationChanged( old_owner, new_owner);
+		
+		UpdateGlowState();
+	}
+	
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		UpdateGlowState();
+	}
+	
+	void UpdateGlowState()
+	{
+		// Makes sure PumpkinHelmet doesn't glow when it's attached on head, or it's inside cargo.
+		
+		bool do_glow = true;
+
+		if ( IsDamageDestroyed() )
+		{
+			do_glow = false;
+		}
+		else
+		{
+			int id = InventorySlots.HEADGEAR;
+			InventoryLocation IL = new InventoryLocation();
+			GetInventory().GetCurrentInventoryLocation( IL );
+			
+			int id_2 = IL.GetSlot();
+			int id_cargo = IL.GetIdx();
+			
+			if ( id == id_2) // Pumpkin is attached on head
+				do_glow = false;
+			
+			if ( id_cargo != -1 ) // Pumpkin is in cargo
+				do_glow = false;
+		}
+
+		SetPilotLight(do_glow);
+	}
+	
+	override void UpdateNVGStatus(PlayerBase player, bool attaching = false, bool force_disable = false)
+	{
+		if ( !GetGame().IsDedicatedServer() ) //SP only
+		{
+			if (force_disable)
+			{
+				player.RemoveActiveNV(NVTypes.NV_PUMPKIN);
+			}
+			else
+			{
+				if ( attaching && (!player.IsNVGWorking() || player.GetNVType() != NVTypes.NV_PUMPKIN) )
+				{
+					player.AddActiveNV(NVTypes.NV_PUMPKIN);
+				}
+				else if ( !attaching && player.IsNVGWorking() )
+				{
+					player.RemoveActiveNV(NVTypes.NV_PUMPKIN);
+				}
+			}
+		}
+	}
+	
+	override protected set<int> GetAttachmentExclusionInitSlotValue(int slotId)
+	{
+		set<int> ret = super.GetAttachmentExclusionInitSlotValue(slotId);
+		if (slotId == InventorySlots.HEADGEAR)
+		{
+			ret.Insert(EAttExclusions.EXCLUSION_HEADGEAR_HELMET_0);
+			
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_1);
+			ret.Insert(EAttExclusions.EXCLUSION_MASK_2);
+			ret.Insert(EAttExclusions.EXCLUSION_HEADSTRAP_0);
+			
+			ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		}
+		return ret;
+	}
+};
+
+// boo!
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/PunchedCard.c b/scripts/4_World/DayZ/Entities/ItemBase/PunchedCard.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f01e2bb47f6831a3252aeaa4c768d394d9c6506
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/PunchedCard.c
@@ -0,0 +1,14 @@
+class PunchedCard : Paper 
+{
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionUseUndergroundPanel);
+	}
+	
+	void OnUse()
+	{
+		AddHealthLevel(1);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ItemBase/Radio.c b/scripts/4_World/DayZ/Entities/ItemBase/Radio.c
new file mode 100644
index 0000000000000000000000000000000000000000..60ea23904d06b3d8a1dfbb25e53bf21c5ad922a8
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ItemBase/Radio.c
@@ -0,0 +1,54 @@
+class Radio extends ItemRadio
+{
+	override bool IsTransmitter()
+	{
+		return true;
+	}
+	
+	//--- COMMON
+	bool CanOperate()
+	{
+		return GetCompEM().IsSwitchedOn();	
+	}
+	
+	//--- POWER EVENTS
+	override void OnSwitchOn()
+	{
+		//switch device on
+		SwitchOn ( true );
+	}
+
+	override void OnSwitchOff()
+	{
+		//switch device off
+		SwitchOn ( false );
+	}
+
+	override void OnWorkStop()
+	{
+		//turn off device
+		GetCompEM().SwitchOff();
+	}
+	
+	//--- RADIO ACTIONS
+	void TuneNextStation()
+	{
+		//tune next station
+		TuneNext();
+	}
+
+	void TunePreviousStation()
+	{
+		//tune previous station
+		TunePrev();
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+		
+		AddAction(ActionTurnOnTransmitter);
+		AddAction(ActionTurnOffTransmitter);
+		AddAction(ActionTuneRadioStation);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ManBase.c b/scripts/4_World/DayZ/Entities/ManBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f65e6a8dcb9865f6da39b4cbfd54d5e5b52f219c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase.c
@@ -0,0 +1,20 @@
+class ManBase extends DayZPlayerImplement // PSOVIS originaly extends Man
+{	
+	void ManBase()
+	{
+		//Print("PSOVIS: this is ManBase");
+	}
+
+	// -------------------------------------------------------------------------
+	// ! On Client, 'true' if this instance of a character is controlled by the player(ie. not a remote player)
+	bool IsControlledPlayer()
+	{
+		return( GetGame().GetPlayer() == this );
+	}
+
+	// -------------------------------------------------------------------------
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Feet.c b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Feet.c
new file mode 100644
index 0000000000000000000000000000000000000000..036cfd1347e44b34c1929f21aa4f264fade14761
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Feet.c
@@ -0,0 +1,35 @@
+class MaleFeet_Base extends InventoryItem {};
+class FemaleFeet_Base extends InventoryItem {};
+
+class MaleAdamFeet extends MaleFeet_Base {};
+class MaleBorisFeet extends MaleFeet_Base {};
+class MaleCyrilFeet extends MaleFeet_Base {};
+class MaleDenisFeet extends MaleFeet_Base {};
+class MaleEliasFeet extends MaleFeet_Base {};
+class MaleFrancisFeet extends MaleFeet_Base {};
+class MaleGuoFeet extends MaleFeet_Base {};
+class MaleHassanFeet extends MaleFeet_Base {};
+class MaleIndarFeet extends MaleFeet_Base {};
+class MaleJoseFeet extends MaleFeet_Base {};
+class MaleKaitoFeet extends MaleFeet_Base {};
+class MaleLewisFeet extends MaleFeet_Base {};
+class MaleManuaFeet extends MaleFeet_Base {};
+class MaleNikiFeet extends MaleFeet_Base {};
+class MaleOliverFeet extends MaleFeet_Base {};
+class MalePeterFeet extends MaleFeet_Base {};
+class MaleQuinnFeet extends MaleFeet_Base {};
+class MaleRolfFeet extends MaleFeet_Base {};
+class MaleSethFeet extends MaleFeet_Base {};
+class MaleTaikiFeet extends MaleFeet_Base {};
+class MaleDeanFeet extends MaleFeet_Base {};
+
+class FemaleEvaFeet extends FemaleFeet_Base {};
+class FemaleFridaFeet extends FemaleFeet_Base {};
+class FemaleGabiFeet extends FemaleFeet_Base {};
+class FemaleHelgaFeet extends FemaleFeet_Base {};
+class FemaleIrenaFeet extends FemaleFeet_Base {};
+class FemaleJudyFeet extends FemaleFeet_Base {};
+class FemaleKeikoFeet extends FemaleFeet_Base {};
+class FemaleLindaFeet extends FemaleFeet_Base {};
+class FemaleMariaFeet extends FemaleFeet_Base {};
+class FemaleNaomiFeet extends FemaleFeet_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Hands.c b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Hands.c
new file mode 100644
index 0000000000000000000000000000000000000000..1cdafa93e840d2da25697f5a34f4edd5776515a3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Hands.c
@@ -0,0 +1,35 @@
+class MaleHands_Base extends InventoryItem {};
+class FemaleHands_Base extends InventoryItem {};
+
+class MaleAdamHands extends MaleHands_Base {};
+class MaleBorisHands extends MaleHands_Base {};
+class MaleCyrilHands extends MaleHands_Base {};
+class MaleDenisHands extends MaleHands_Base {};
+class MaleEliasHands extends MaleHands_Base {};
+class MaleFrancisHands extends MaleHands_Base {};
+class MaleGuoHands extends MaleHands_Base {};
+class MaleHassanHands extends MaleHands_Base {};
+class MaleIndarHands extends MaleHands_Base {};
+class MaleJoseHands extends MaleHands_Base {};
+class MaleKaitoHands extends MaleHands_Base {};
+class MaleLewisHands extends MaleHands_Base {};
+class MaleManuaHands extends MaleHands_Base {};
+class MaleNikiHands extends MaleHands_Base {};
+class MaleOliverHands extends MaleHands_Base {};
+class MalePeterHands extends MaleHands_Base {};
+class MaleQuinnHands extends MaleHands_Base {};
+class MaleRolfHands extends MaleHands_Base {};
+class MaleSethHands extends MaleHands_Base {};
+class MaleTaikiHands extends MaleHands_Base {};
+class MaleDeanHands extends MaleHands_Base {};
+
+class FemaleEvaHands extends FemaleHands_Base {};
+class FemaleFridaHands extends FemaleHands_Base {};
+class FemaleGabiHands extends FemaleHands_Base {};
+class FemaleHelgaHands extends FemaleHands_Base {};
+class FemaleIrenaHands extends FemaleHands_Base {};
+class FemaleJudyHands extends FemaleHands_Base {};
+class FemaleKeikoHands extends FemaleHands_Base {};
+class FemaleLindaHands extends FemaleHands_Base {};
+class FemaleMariaHands extends FemaleHands_Base {};
+class FemaleNaomiHands extends FemaleHands_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Head.c b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Head.c
new file mode 100644
index 0000000000000000000000000000000000000000..d942e377fe0bda0ac50a826d688e4ad3eef114b2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Head.c
@@ -0,0 +1,157 @@
+class Head_Default extends Head
+{
+	bool m_handling_exception = false;
+	int m_beard_idx;
+	int m_hair_idx;
+	
+	ref map<int,ref SelectionTranslation> 			m_HeadHairHidingStateMap;
+	ref array<string> 								m_HeadHairSelectionArray;
+	
+	void Head_Default()
+	{
+		Init();
+	}
+	
+	void Init()
+	{
+		m_HeadHairHidingStateMap = new map<int,ref SelectionTranslation>;
+		m_HeadHairSelectionArray = new array<string>;
+		
+		ConfigGetTextArray("simpleHiddenSelections",m_HeadHairSelectionArray);
+		
+		m_beard_idx = m_HeadHairSelectionArray.Find("beard");
+		m_hair_idx = m_HeadHairSelectionArray.Find("hair");
+		if (!ConfigIsExisting("HairHiding"))
+			m_handling_exception = true;
+		
+		InitSelectionTranslation();
+	}
+	
+	void InitSelectionTranslation()
+	{
+		for (int i = 0; i < m_HeadHairSelectionArray.Count(); i++)
+		{
+			SelectionTranslation selTran = new SelectionTranslation(this,i);
+			selTran.SetSelectionState(true);
+			m_HeadHairHidingStateMap.Insert(i,selTran); //all considered "shown" on init
+		}
+	}
+	
+	bool GetHeadHideableSelections(out array<string> selections)
+	{
+		selections = m_HeadHairSelectionArray;
+		return true;
+	}
+	
+	int GetBeardIndex()
+	{
+		return m_beard_idx;
+	}
+	
+	int GetHairIndex()
+	{
+		return m_hair_idx;
+	}
+	
+	int GetSelectionIndex(string str)
+	{
+		return m_HeadHairSelectionArray.Find(str);
+	}
+	
+	bool IsHandlingException()
+	{
+		return m_handling_exception;
+	}
+};
+
+class SelectionTranslation
+{
+	bool 			m_SelectionState;
+	
+	bool 			m_TranslationFinished = false;
+	string 			m_BasePath;// = "cfgVehicles " + GetType() + " HairHiding";
+	ref array<int> 	m_TranslatedSelections;
+	Head_Default 	m_Head;
+	
+	void SelectionTranslation(Head_Default head, int idx)
+	{
+		m_Head = head;
+		m_BasePath = "cfgVehicles " + m_Head.GetType() + " HairHiding";
+		InitTranslatedSelections(idx);
+	}
+	
+	void InitTranslatedSelections(int idx)
+	{
+		if ( !m_Head.ConfigIsExisting("HairHiding") )
+			return;
+		
+		string path;
+		int selectionIdx = -1;
+		m_TranslatedSelections = new ref array<int>;
+		
+		//Hair
+		path = m_BasePath + " Group_Hair";
+		SearchAndTranslate(path,idx);
+		//Beard
+		path = m_BasePath + " Group_Beard";
+		SearchAndTranslate(path,idx);
+		//Hair + Beard
+		path = m_BasePath + " Group_HairBeard";
+		SearchAndTranslate(path,idx);
+		
+		//other
+		for (int i = 0; !m_TranslationFinished; i++)
+		{
+			path = m_BasePath + " Group_" + i;
+			if ( g_Game.ConfigIsExisting(path) )
+			{
+				SearchAndTranslate(path,idx);
+			}
+			else
+			{
+				m_TranslationFinished = true;
+			}
+		}
+	}
+	
+	bool SearchAndTranslate(string path, int idx)
+	{
+		if (!g_Game.ConfigIsExisting(path))
+			return false;
+		
+		array<string> tempArrayStr = new array<string>;
+		g_Game.ConfigGetTextArray(path + " memberSelections", tempArrayStr);
+		int indexInOriginalArray = -2;
+		
+		for (int i = 0; i < tempArrayStr.Count(); i++)
+		{
+			indexInOriginalArray = m_Head.m_HeadHairSelectionArray.Find(tempArrayStr.Get(i));
+			if ( idx == indexInOriginalArray ) //found it
+			{
+				g_Game.ConfigGetTextArray(path + " simpleSelectionName", tempArrayStr);
+				for (i = 0; i < tempArrayStr.Count(); i++)
+				{
+					m_TranslatedSelections.Insert(m_Head.m_HeadHairSelectionArray.Find(tempArrayStr.Get(i)));
+				}
+				m_TranslationFinished = true;
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	void SetSelectionState(bool state)
+	{
+		m_SelectionState = state;
+	}
+	
+	bool GetSelectionState()
+	{
+		return m_SelectionState;
+	}
+	
+	ref array<int> GetTranslatedSelections()
+	{
+		return m_TranslatedSelections;
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Legs.c b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Legs.c
new file mode 100644
index 0000000000000000000000000000000000000000..1235a1f13022270f806293722e40e8c4e6456476
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Legs.c
@@ -0,0 +1,34 @@
+class MaleLegs_Base extends InventoryItem {};
+class FemaleLegs_Base extends InventoryItem {};
+
+class MaleAdamLegs extends MaleLegs_Base {};
+class MaleBorisLegs extends MaleLegs_Base {};
+class MaleCyrilLegs extends MaleLegs_Base {};
+class MaleDenisLegs extends MaleLegs_Base {};
+class MaleEliasLegs extends MaleLegs_Base {};
+class MaleFrancisLegs extends MaleLegs_Base {};
+class MaleGuoLegs extends MaleLegs_Base {};
+class MaleHassanLegs extends MaleLegs_Base {};
+class MaleIndarLegs extends MaleLegs_Base {};
+class MaleJoseLegs extends MaleLegs_Base {};
+class MaleKaitoLegs extends MaleLegs_Base {};
+class MaleLewisLegs extends MaleLegs_Base {};
+class MaleManuaLegs extends MaleLegs_Base {};
+class MaleNikiLegs extends MaleLegs_Base {};
+class MaleOliverLegs extends MaleLegs_Base {};
+class MalePeterLegs extends MaleLegs_Base {};
+class MaleQuinnLegs extends MaleLegs_Base {};
+class MaleRolfLegs extends MaleLegs_Base {};
+class MaleSethLegs extends MaleLegs_Base {};
+class MaleTaikiLegs extends MaleLegs_Base {};
+
+class FemaleEvaLegs extends FemaleLegs_Base {};
+class FemaleFridaLegs extends FemaleLegs_Base {};
+class FemaleGabiLegs extends FemaleLegs_Base {};
+class FemaleHelgaLegs extends FemaleLegs_Base {};
+class FemaleIrenaLegs extends FemaleLegs_Base {};
+class FemaleJudyLegs extends FemaleLegs_Base {};
+class FemaleKeikoLegs extends FemaleLegs_Base {};
+class FemaleLindaLegs extends FemaleLegs_Base {};
+class FemaleMariaLegs extends FemaleLegs_Base {};
+class FemaleNaomiLegs extends FemaleLegs_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Torso.c b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Torso.c
new file mode 100644
index 0000000000000000000000000000000000000000..f08aacb90b27c5b4bb63d6514126193e9010fa56
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/BodyParts/Torso.c
@@ -0,0 +1,34 @@
+class MaleTorso_Base extends InventoryItem {};
+class FemaleTorso_Base extends InventoryItem {};
+
+class MaleAdamTorso extends MaleTorso_Base {};
+class MaleBorisTorso extends MaleTorso_Base {};
+class MaleCyrilTorso extends MaleTorso_Base {};
+class MaleDenisTorso extends MaleTorso_Base {};
+class MaleEliasTorso extends MaleTorso_Base {};
+class MaleFrancisTorso extends MaleTorso_Base {};
+class MaleGuoTorso extends MaleTorso_Base {};
+class MaleHassanTorso extends MaleTorso_Base {};
+class MaleIndarTorso extends MaleTorso_Base {};
+class MaleJoseTorso extends MaleTorso_Base {};
+class MaleKaitoTorso extends MaleTorso_Base {};
+class MaleLewisTorso extends MaleTorso_Base {};
+class MaleManuaTorso extends MaleTorso_Base {};
+class MaleNikiTorso extends MaleTorso_Base {};
+class MaleOliverTorso extends MaleTorso_Base {};
+class MalePeterTorso extends MaleTorso_Base {};
+class MaleQuinnTorso extends MaleTorso_Base {};
+class MaleRolfTorso extends MaleTorso_Base {};
+class MaleSethTorso extends MaleTorso_Base {};
+class MaleTaikiTorso extends MaleTorso_Base {};
+
+class FemaleEvaTorso extends FemaleTorso_Base {};
+class FemaleFridaTorso extends FemaleTorso_Base {};
+class FemaleGabiTorso extends FemaleTorso_Base {};
+class FemaleHelgaTorso extends FemaleTorso_Base {};
+class FemaleIrenaTorso extends FemaleTorso_Base {};
+class FemaleJudyTorso extends FemaleTorso_Base {};
+class FemaleKeikoTorso extends FemaleTorso_Base {};
+class FemaleLindaTorso extends FemaleTorso_Base {};
+class FemaleMariaTorso extends FemaleTorso_Base {};
+class FemaleNaomiTorso extends FemaleTorso_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera1stPerson.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera1stPerson.c
new file mode 100644
index 0000000000000000000000000000000000000000..d29e265b888fb4ae3819c3254ef6d920edd29b14
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera1stPerson.c
@@ -0,0 +1,124 @@
+// *************************************************************************************
+// ! DayZPlayerCamera1stPerson - 1st person camera
+// *************************************************************************************
+class DayZPlayerCamera1stPerson extends DayZPlayerCameraBase
+{
+	static const float 	CONST_UD_MIN	= -85.0;		//!< down limit
+	static const float 	CONST_UD_MAX	= 85.0;			//!< up limit
+
+	static const float 	CONST_LR_MIN	= -160.0;		//!< down limit
+	static const float 	CONST_LR_MAX	= 160.0;		//!< up limit
+
+
+	void 	DayZPlayerCamera1stPerson(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		m_iBoneIndex = pPlayer.GetBoneIndexByName("Head");
+		if (m_iBoneIndex == -1)
+		{
+			Print("DayZPlayerCamera1stPerson: main bone not found");
+		}
+		
+		m_OffsetLS = "0.04 0.04 0"; //x - up, y - forward
+	}
+	
+
+	//
+	override void 		OnActivate(DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+		super.OnActivate(pPrevCamera, pPrevCameraResult);
+
+		if (pPrevCamera)
+		{
+			vector baseAngles		= pPrevCamera.GetBaseAngles();
+			m_fUpDownAngle			= baseAngles[0]; 
+			m_fLeftRightAngle		= baseAngles[1]; 
+
+			vector addAngles		= pPrevCamera.GetAdditiveAngles();
+			m_fUpDownAngleAdd		= addAngles[0];
+			m_fLeftRightAngleAdd	= addAngles[1];
+		}
+	}
+
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		//! update angles from input
+		m_CurrentCameraYaw		= UpdateLRAngleUnlocked(m_fLeftRightAngle, m_fLeftRightAngleAdd, CONST_LR_MIN, CONST_LR_MAX, pDt);
+		m_CurrentCameraPitch	= UpdateUDAngleUnlocked(m_fUpDownAngle, m_fUpDownAngleAdd, CONST_UD_MIN, CONST_UD_MAX, pDt);
+		
+		//! 
+		Math3D.YawPitchRollMatrix(GetCurrentOrientation(), pOutResult.m_CameraTM);
+		pOutResult.m_CameraTM[3]		= m_OffsetLS;
+
+		pOutResult.m_iDirectBone 		= m_iBoneIndex;
+		pOutResult.m_iDirectBoneMode 	= 1;
+		pOutResult.m_fUseHeading 		= 1.0;
+		pOutResult.m_fInsideCamera 		= 1.0;
+
+		pOutResult.m_fNearPlane = 0.04; //0.07 default
+		
+		ProcessCameraShake(pDt, m_fLeftRightAngle, m_fUpDownAngleAdd);
+		
+		InitCameraOnPlayer();
+		StdFovUpdate(pDt, pOutResult);
+		UpdateCameraNV(PlayerBase.Cast(m_pPlayer));
+	}
+
+	override vector GetBaseAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngle;
+		a[1] = m_fLeftRightAngle;
+		a[2] = 0;
+		return a;
+	}
+
+	override vector GetAdditiveAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngleAdd;
+		a[1] = m_fLeftRightAngleAdd;
+		a[2] = 0;
+		return a;
+	}
+	
+	override string GetCameraName()
+	{
+		return "DayZPlayerCamera1stPerson";
+	}
+	
+	protected int		m_iBoneIndex;			//!< main bone
+	protected vector	m_OffsetLS;				//!< position offset 
+
+	protected float		m_fUpDownAngle;			//!< up down angle in rad
+	protected float		m_fUpDownAngleAdd;		//!< up down angle in rad
+	protected float		m_fLeftRightAngle;		//!< left right angle in rad (in freelook only)
+	protected float		m_fLeftRightAngleAdd;	//!< left right angle in rad (in freelook only)
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera1stPersonUnconscious - first person only unconscious
+// *************************************************************************************
+class DayZPlayerCamera1stPersonUnconscious extends DayZPlayerCamera1stPerson
+{
+	void DayZPlayerCamera1stPersonUnconscious(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		m_iBoneIndex		= pPlayer.GetBoneIndexByName ("Head");
+	}
+	
+	override void OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		super.OnUpdate(pDt, pOutResult);
+
+		pOutResult.m_iDirectBone 		= m_iBoneIndex;
+		pOutResult.m_iDirectBoneMode 	= 4;
+		pOutResult.m_fUseHeading 		= 0.0;
+		
+		vector rot;
+		rot[0] = 0;
+		rot[1] = 90;
+		rot[2] = 0;
+		
+		Math3D.YawPitchRollMatrix(rot, pOutResult.m_CameraTM);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera3rdPerson.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera3rdPerson.c
new file mode 100644
index 0000000000000000000000000000000000000000..fd5c55a0b82c8822126e91f6f8d7fd6efc17e35c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera3rdPerson.c
@@ -0,0 +1,571 @@
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPerson - base for 3rd person cameras
+// *************************************************************************************
+class DayZPlayerCamera3rdPerson extends DayZPlayerCameraBase
+{
+	static const float 	CONST_UD_MIN	= -85.0;		//!< down limit
+	static const float 	CONST_UD_MAX	= 85.0;			//!< up limit
+
+	static const float 	CONST_LR_MIN	= -160.0;		//!< down limit
+	static const float 	CONST_LR_MAX	= 160.0;		//!< up limit
+	
+	void 	DayZPlayerCamera3rdPerson(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		if (pInput.Camera3rdIsRightShoulder())
+		{
+			m_fCameraLRShoulder		= 1.0;
+		}
+		else
+		{
+			m_fCameraLRShoulder		= -1.0;
+		}
+
+		m_fCameraLRShoulderVel[0]	= 0.0;
+		m_CurrentCameraRoll			= 0.0;
+		m_WeaponSwayModifier		= 1;
+		m_fLeanDistance				= 0.3;
+		m_fPredictCollisionRadius   = 0.5;
+	}
+		
+
+	//
+	override void 		OnActivate(DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+		super.OnActivate(pPrevCamera, pPrevCameraResult);
+
+		if (pPrevCamera)
+		{
+			vector baseAngles		= pPrevCamera.GetBaseAngles();
+			m_fUpDownAngle			= baseAngles[0]; 
+			m_fLeftRightAngle		= baseAngles[1]; 
+
+			vector addAngles		= pPrevCamera.GetAdditiveAngles();
+			m_fUpDownAngleAdd		= addAngles[0];
+			m_fLeftRightAngleAdd	= addAngles[1];
+		}
+	}
+
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		m_pPlayer.GetMovementState(m_MovementState);
+
+		//! update angles from input 
+		m_CurrentCameraYaw		= UpdateLRAngleUnlocked(m_fLeftRightAngle, m_fLeftRightAngleAdd, CONST_LR_MIN, CONST_LR_MAX, pDt);
+		m_CurrentCameraPitch	= UpdateUDAngleUnlocked(m_fUpDownAngle, m_fUpDownAngleAdd, CONST_UD_MIN, CONST_UD_MAX, pDt);
+
+		ProcessCameraShake(pDt, m_fLeftRightAngle, m_fUpDownAngleAdd);
+
+		// update l/r offsets and set it as 
+		if (m_pInput.Camera3rdIsRightShoulder())
+		{
+			m_fCameraLRShoulder = Math.SmoothCD(m_fCameraLRShoulder, 1.0, m_fCameraLRShoulderVel, 0.14, 1000, pDt);
+		}
+		else
+		{
+			m_fCameraLRShoulder = Math.SmoothCD(m_fCameraLRShoulder, -1.0, m_fCameraLRShoulderVel, 0.14, 1000, pDt);
+		}
+
+		float 	shoulderDist = m_fCameraLRShoulder * m_fShoulderWidth + m_MovementState.m_fLeaning * m_fLeanDistance;
+		
+		//!		
+		Math3D.YawPitchRollMatrix(GetCurrentOrientation(), pOutResult.m_CameraTM);
+
+		//! base bone pos 
+		if (m_iBoneIndex != -1)
+		{
+			pOutResult.m_CameraTM[3]	= m_pPlayer.GetBonePositionMS(m_iBoneIndex);
+		}
+		else
+		{
+			pOutResult.m_CameraTM[3]	= "0 0 0";
+		}
+
+		//! apply shoulder dist
+		vector msOffset = m_CameraOffsetMS;
+		vector lsOffset = m_CameraOffsetLS;
+
+		if (m_bShoulderInLS)
+		{
+			lsOffset[0] = lsOffset[0] + shoulderDist;
+		}
+		else
+		{
+			msOffset[0] = msOffset[0] + shoulderDist;
+		}
+
+		// ls offset + ms offset + shoulder width			
+		pOutResult.m_CameraTM[3]	= pOutResult.m_CameraTM[3] + pOutResult.m_CameraTM[0] * lsOffset[0] + pOutResult.m_CameraTM[1] * lsOffset[1] + pOutResult.m_CameraTM[2] * lsOffset[2] + msOffset;
+
+		//! store distance 
+		pOutResult.m_fDistance 		= m_fDistance;
+		pOutResult.m_fUseHeading 	= 1.0;
+		pOutResult.m_fInsideCamera 	= 0.0;
+		pOutResult.m_fPredictCollisionRadius = m_fPredictCollisionRadius;
+		
+		InitCameraOnPlayer();
+		StdFovUpdate(pDt, pOutResult);
+		UpdateCameraNV(PlayerBase.Cast(m_pPlayer));
+	}
+
+	override vector GetBaseAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngle;
+		a[1] = m_fLeftRightAngle;
+		a[2] = 0;
+		return a;
+	}
+
+	override vector GetAdditiveAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngleAdd;
+		a[1] = m_fLeftRightAngleAdd;
+		a[2] = 0;
+		return a;
+	}
+	
+	override string GetCameraName()
+	{
+		return "DayZPlayerCamera3rdPerson";
+	}
+
+	//! runtime config
+	protected	int 	m_iBoneIndex = -1;	//!< main bone 
+	protected 	vector  m_CameraOffsetMS;	//!< model space offset
+	protected 	vector  m_CameraOffsetLS;	//!< local space offset
+	protected 	float 	m_fDistance;		//!< distance from start
+	protected 	float 	m_fShoulderWidth;	//!< shoulder camera widths
+	protected 	bool	m_bShoulderInLS;	//!< true - shoulder is in local space
+	protected 	float 	m_fRoll;			//!< camera roll (deprecated)
+	protected	float	m_fLeanDistance;	//!< shift on leaning
+
+
+	//! runtime values 
+	protected 	float 	m_fUpDownAngle;			//!< up down angle in rad
+	protected 	float 	m_fUpDownAngleAdd;		//!< up down angle in rad
+	protected 	float 	m_fLeftRightAngle;		//!< left right angle in rad (in freelook only)
+	protected 	float 	m_fLeftRightAngleAdd;	//!< left right angle in rad (in freelook only)
+
+	//! shoulder offsets
+	protected float 	m_fCameraLRShoulder;			// -1..1 shoulderness :)
+	protected float 	m_fCameraLRShoulderVel[1];		// 0
+	
+	//! collision prediction
+	protected float		m_fPredictCollisionRadius;
+	
+	//! movement state
+	ref HumanMovementState m_MovementState = new HumanMovementState();
+}
+
+
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonErc - 3rd person erected
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonErc extends DayZPlayerCamera3rdPerson
+{
+	void DayZPlayerCamera3rdPersonErc(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonErc");
+		
+		m_fDistance 		= 1.6;
+		m_CameraOffsetMS	= "0.0 1.4 0.0";
+		m_CameraOffsetLS	= "0.0 0.3 0.0";
+		m_fShoulderWidth	= 0.3;
+		m_fPredictCollisionRadius = 1.2;
+	}
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonJump - 3rd person jump
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonJump extends DayZPlayerCamera3rdPersonErc
+{
+	void DayZPlayerCamera3rdPersonJump(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonJump");
+		
+		//! runtime config
+		m_fDelay			= 0.15;
+		m_fDamping			= 0.25;
+		
+		//! runtime values
+		m_fJumpStartY		= pPlayer.GetOrigin()[1];
+		m_fJumpOffset		= 0;
+		m_fDelayTimer		= 0;
+	}
+	
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		super.OnUpdate(pDt, pOutResult);
+
+		float yPos = m_pPlayer.GetOrigin()[1];
+		float yDiff = yPos - m_fJumpStartY;
+		yDiff = Math.Clamp(yDiff, 0.0, 2.0);
+		
+		if( m_fDelayTimer < m_fDelay )
+		{
+			m_fDelayTimer += pDt;
+			m_fJumpOffset = yDiff;
+		}
+		else
+		{
+			m_fJumpOffset = Math.SmoothCD(m_fJumpOffset, -(m_fDamping * yDiff), m_jumpOffsetVelocity, 0.3, 1000, pDt);
+		}
+		
+		float newY = pOutResult.m_CameraTM[3][1] - m_fJumpOffset;
+		pOutResult.m_CameraTM[3][1] = newY;		
+	}
+
+	//! runtime config
+	float m_fDelay;
+	float m_fDamping;
+
+	//! runtime values
+	float m_fDelayTimer;
+	float m_fJumpStartY;
+	float m_fJumpOffset;
+	float m_jumpOffsetVelocity[1];	
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonJump - 3rd person jump
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonClimb extends DayZPlayerCamera3rdPersonErc
+{
+	void DayZPlayerCamera3rdPersonClimb(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonClimb");
+		m_fDistance 		= 1.0;
+		m_CameraOffsetMS	= "0.0 0.3 -0.6";
+		m_iBoneIndex		= pPlayer.GetBoneIndexByName("Spine");
+		m_fPredictCollisionRadius = 0.5;
+	}		
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonErc - 3rd person erected sprint
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonErcSpr extends DayZPlayerCamera3rdPersonErc
+{
+	void DayZPlayerCamera3rdPersonErcSpr(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonErcSpr");
+		
+		m_fDistance 		= 2.0;
+		m_CameraOffsetMS    = "0.0 1.3 0.0";
+		m_CameraOffsetLS	= "0.0 0.3 0.0";
+		m_fShoulderWidth	= 0.15;
+				
+		m_iPelvisBone	= pPlayer.GetBoneIndexByName("Pelvis");
+		if (m_iPelvisBone == -1)
+		{
+			Print("DayZPlayerCamera3rdPersonErcSpr: hips bone not found");
+		}
+
+		m_fTime = 0.0;
+	}
+
+
+
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		m_fTime += pDt * 5;
+		
+		vector 	tm[4];
+
+		m_pPlayer.GetBoneTransformLS(m_iPelvisBone, tm);
+		//! basically -> transform up vector (0,1,0) and read x coord -> and set is as roll
+		float 	xShift = tm[1][0];
+		m_CurrentCameraRoll = xShift * 3.0;	// 3 is just made up value i like :)
+
+		// m_CurrentCameraRoll = (sin(1.5 * m_fTime)); //  + 0.3 * sin(3.6 * m_fTime) + 0.2 * sin(0.7 * m_fTime)) / 1.3 * 3;
+
+		//! prev update 
+		super.OnUpdate(pDt, pOutResult);
+		
+		//pOutResult.m_fFovMultiplier = 1.2;
+	}
+	
+
+	protected int 	m_iPelvisBone;
+	protected float m_fTime;	
+
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonErcRaised - 3rd person erected raised
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonErcRaised extends DayZPlayerCamera3rdPersonErc
+{
+	void DayZPlayerCamera3rdPersonErcRaised(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonErcRaised");
+		m_fPredictCollisionRadius = 0.2;
+
+		if ( pPlayer.GetCurrentPerItemCameraUD () == DayZPlayerCameras.PERITEMUD_EMPTYHANDED )
+		{
+			// no item in hands 
+			m_fDistance 		= 1.2;
+			m_fShoulderWidth	= 0.4;
+			m_CameraOffsetMS    = "0.0 1.3 0.2";
+			m_CameraOffsetLS	= "0.0 0.3 0.0";
+			
+		}		
+		else if ( pPlayer.GetCurrentPerItemCameraUD () == DayZPlayerCameras.PERITEMUD_TWOHANDED )
+		{
+			// two handed
+			m_fDistance 		= 1.2;
+			m_fShoulderWidth	= 0.4;
+			m_CameraOffsetMS    = "0.0 1.3 0.2";
+			m_CameraOffsetLS	= "0.0 0.3 0.0";
+		}
+		else if ( pPlayer.GetCurrentPerItemCameraUD () == DayZPlayerCameras.PERITEMUD_ONEHANDED )
+		{
+			// one handed
+			m_fDistance 		= 1.2;
+			m_fShoulderWidth	= 0.4;
+			m_CameraOffsetMS    = "0.0 1.3 0.2";
+			m_CameraOffsetLS	= "0.0 0.3 0.0";
+		}
+		else
+		{
+			// weapons in hands			
+			m_fDistance 		= 0.8;
+			m_CameraOffsetMS    = "0.0 1.3 0.2";
+			m_CameraOffsetLS	= "0.0 0.3 0.0";
+			m_fShoulderWidth	= 0.5;
+		}		
+	}
+	
+	override bool IsCamera3rdRaised()
+	{
+		return true;
+	}
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonErcRaised - 3rd person erected raised
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonErcRaisedMelee extends DayZPlayerCamera3rdPersonErcRaised
+{
+	override void HandleShoulderCameraOverride(HumanInputController pInput)
+	{
+		//! override - stay at current state
+		pInput.Override3rdIsRightShoulder(HumanInputControllerOverrideType.ENABLED, pInput.Camera3rdIsRightShoulder());
+	}
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonCrouch - 3rd person crouch
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonCrouch extends DayZPlayerCamera3rdPerson
+{
+	static const float 	CONST_CAMERAMOVEMENTHEIGH = 0.4;	// 0 idle, 0.15 walk 0.3 run/sprint 
+
+	void DayZPlayerCamera3rdPersonCrouch (DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonCrouch");
+		
+		m_fDistance 		= 1.4;
+		m_CameraOffsetMS	= "0.0 0.7 0.1";
+		m_CameraOffsetLS	= "0.0 0.3 0.0";
+		m_fShoulderWidth	= 0.3;
+	}
+
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{				
+		m_pPlayer.GetMovementState(m_MovementState);
+
+		//! movement height 
+		float 	movement 	= (Limit(m_MovementState.m_iMovement, 1, 3) - 1.0) * 0.5;
+		movement 			*= CONST_CAMERAMOVEMENTHEIGH;
+		m_fCameraHeight		= Math.SmoothCD(m_fCameraHeight, movement, m_fCameraHeightVel, 0.2, 1000, pDt);
+		m_CameraOffsetMS[1] = 0.7 + m_fCameraHeight;		
+		
+		//! prev update 
+		super.OnUpdate(pDt, pOutResult);
+	}
+
+	protected float 	m_fCameraHeight;			// -1..1 shoulderness :)
+	protected float 	m_fCameraHeightVel[1];		// 0
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonCrouchRaised- 3rd person crouch raised
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonCrouchRaised extends DayZPlayerCamera3rdPersonCrouch
+{
+	void DayZPlayerCamera3rdPersonCrouchRaised(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonCrouchRaised");
+		
+		m_fDistance 		= 0.8;
+		m_CameraOffsetMS    = "0.0 0.8 0.1"; // being overwritten by m_CameraOffsetMS[1] from DayZPlayerCamera3rdPersonCrouch 
+		m_CameraOffsetLS	= "0.0 0.3 0.0";
+		m_fShoulderWidth	= 0.5;
+	}
+	
+	override bool IsCamera3rdRaised()
+	{
+		return true;
+	}
+}
+
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonProneRaised - 3rd person prone raised
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonProneBase extends DayZPlayerCamera3rdPerson
+{
+	protected vector m_BaseOffset
+	protected float  m_BaseOffsetVelX[1], m_BaseOffsetVelY[1], m_BaseOffsetVelZ[1];
+    protected float  m_LookAtLRAngle;
+	
+	float UpdateLRAngleLookAt(float pMin, float pMax, float pDt)
+	{
+		//! lr angle
+		if (m_pInput.CameraIsFreeLook() || m_bForceFreeLook)	
+		{
+			m_LookAtLRAngle	+= m_pInput.GetAimChange()[0] * Math.RAD2DEG;
+			m_LookAtLRAngle	= Limit(m_LookAtLRAngle, pMin, pMax);
+
+			m_fLRAngleVel[0]	= 0;	// reset filter
+		}
+		else
+		{
+			// smooth value back to 0 
+			m_LookAtLRAngle = Math.SmoothCD(m_LookAtLRAngle, 0, m_fLRAngleVel, 0.14, 1000, pDt);
+			// m_fLeftRightAngle	= 0.9 * (1.0 - pDt);			
+		}
+
+		return m_LookAtLRAngle;
+	}
+
+	override void OnActivate(DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+		super.OnActivate(pPrevCamera, pPrevCameraResult);
+
+		if (m_iBoneIndex != -1)
+		{
+			m_BaseOffset = m_pPlayer.GetBonePositionMS(m_iBoneIndex);
+		}
+		else
+		{
+			m_BaseOffset = "0 0 0";
+		}
+	}
+
+
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		//! update angles from input 
+		m_CurrentCameraPitch	= UpdateUDAngleUnlocked(m_fUpDownAngle, m_fUpDownAngleAdd, CONST_UD_MIN, CONST_UD_MAX, pDt);
+
+		float orientYaw			= m_pPlayer.GetOrientation()[0];
+		float headYaw			= m_pInput.GetHeadingAngle() * Math.RAD2DEG;	//! this is actually negative to yaw
+		m_CurrentCameraYaw		= -fixAngle_180_180(orientYaw + headYaw);		
+
+		// Print("OY: " + orientYaw.ToString() + " HY: " + headYaw.ToString());
+	
+		// update l/r offsets and set it as 
+		
+		ProcessCameraShake(pDt, m_fLeftRightAngle, m_fUpDownAngleAdd);
+		
+		if (m_pInput.Camera3rdIsRightShoulder())
+		{
+			m_fCameraLRShoulder = Math.SmoothCD(m_fCameraLRShoulder, 1.0, m_fCameraLRShoulderVel, 0.14, 1000, pDt);
+		}
+		else
+		{
+			m_fCameraLRShoulder = Math.SmoothCD(m_fCameraLRShoulder, -1.0, m_fCameraLRShoulderVel, 0.14, 1000, pDt);
+		}
+
+		float 	shoulderDist = m_fCameraLRShoulder * m_fShoulderWidth;
+		
+		//! 
+		Math3D.YawPitchRollMatrix(GetCurrentOrientation(), pOutResult.m_CameraTM);
+
+		//! base bone pos 
+		if (m_iBoneIndex != -1)
+		{
+			vector bonePos = m_pPlayer.GetBonePositionMS(m_iBoneIndex);
+			m_BaseOffset[0] = Math.SmoothCD(m_BaseOffset[0], bonePos[0], m_BaseOffsetVelX, 0.14, 1000, pDt);
+			m_BaseOffset[1] = Math.SmoothCD(m_BaseOffset[1], bonePos[1], m_BaseOffsetVelY, 0.14, 1000, pDt);
+			m_BaseOffset[2] = Math.SmoothCD(m_BaseOffset[2], bonePos[2], m_BaseOffsetVelZ, 0.14, 1000, pDt);
+		}
+
+		//! apply shoulder dist
+		vector msOffset = m_CameraOffsetMS;
+		vector lsOffset = m_CameraOffsetLS;
+		
+		lsOffset[0] = lsOffset[0] + shoulderDist;
+
+		// ls offset + ms offset + shoulder width			
+		pOutResult.m_CameraTM[3] = m_BaseOffset + pOutResult.m_CameraTM[0] * lsOffset[0] + pOutResult.m_CameraTM[1] * lsOffset[1] + pOutResult.m_CameraTM[2] * lsOffset[2] + msOffset;
+
+		m_CurrentCameraYaw = UpdateLRAngleLookAt(-180, 180, pDt);
+		Math3D.YawPitchRollMatrix(GetCurrentOrientation(), pOutResult.m_CameraTM);
+
+		//! store distance 
+		pOutResult.m_fDistance 		= m_fDistance;
+		pOutResult.m_fUseHeading 	= 1.0;
+		pOutResult.m_fInsideCamera 	= 0.0;
+		pOutResult.m_fPositionModelSpace = 1.0;
+		pOutResult.m_bUpdateWhenBlendOut	= false;
+		
+		InitCameraOnPlayer();
+		StdFovUpdate(pDt, pOutResult);
+		UpdateCameraNV(PlayerBase.Cast(m_pPlayer));
+	}
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonProne - 3rd person prone
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonProne extends DayZPlayerCamera3rdPersonProneBase
+{
+	void DayZPlayerCamera3rdPersonProne(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonProne");
+		m_iBoneIndex		= pPlayer.GetBoneIndexByName ("Camera3rd_Helper");
+		m_fDistance 		= 1.0;
+		m_CameraOffsetMS	= "0.0 0.4 0.0";
+		m_CameraOffsetLS	= "0.0 0.2 0.0";
+		m_fShoulderWidth	= 0.5;
+	}
+
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonProneRaised - 3rd person prone raised
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonProneRaised extends DayZPlayerCamera3rdPersonProneBase
+{
+	void DayZPlayerCamera3rdPersonProneRaised(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonProneRaised");
+		m_iBoneIndex		= pPlayer.GetBoneIndexByName ("Camera3rd_Helper");
+		m_fDistance 		= 1.0;
+		m_CameraOffsetMS	= "0.0 0.4 0.0";
+		m_CameraOffsetLS	= "0.0 0.2 0.0";
+		m_fShoulderWidth	= 0.5;
+	}
+	
+	override bool IsCamera3rdRaised()
+	{
+		return true;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameraIronsights.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameraIronsights.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ea03a5a3d2b8321bb8c82e2e31570cb59a36bf7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameraIronsights.c
@@ -0,0 +1,606 @@
+
+//! this is main camera class 
+class DayZPlayerCameraIronsights extends DayZPlayerCameraBase
+{
+	static const float 	CONST_UD_MIN	= -85.0;		//!< down limit
+	static const float 	CONST_UD_MAX	= 85.0;			//!< up limit
+	static const float 	CONST_UD_MIN_BACK = -25.0;		//!< down limit on back
+
+	static const float 	CONST_LR_MIN	= -160.0;		//!< down limit
+	static const float 	CONST_LR_MAX	= 160.0;			//!< up limit
+	
+	protected 	bool 			m_isEntering 	= false;
+	protected	bool			m_opticsHasWeaponOverride = false;
+	protected ref array<float> 	temp_array; //DOF only
+	
+	protected PPERequester_CameraADS m_RequesterADS;
+
+	//! camera dynamics
+	float m_velocityYaw[1];
+	float m_velocityPitch[1];
+	float m_dynamicsStrength;
+	float m_dynamicsSmoothTime;
+	vector m_SightMisalignmentModifier;
+	
+	float m_movementTimeAcc;
+	float m_movementAmplitudeX;
+	float m_movementAmplitudeY;
+	float m_movementFrequencyX;
+	float m_movementFrequencyY;
+	
+
+	void 	DayZPlayerCameraIronsights(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		if (!temp_array)
+			temp_array = new array<float>;
+		m_iBoneIndex = pPlayer.GetBoneIndexByName("RightHand_Dummy");
+		
+		if (m_iBoneIndex == -1)
+		{
+			Print("DayZPlayerCamera1stPerson: main bone not found");
+		}
+
+		m_dynamicsStrength = 2;
+		m_dynamicsSmoothTime = 0.3;
+		
+		SetupSightEntities();
+		GetCurrentSightInfo(m_OpticsCamPos, m_OpticsCamDir);
+		m_isEntering = true;
+		m_WeaponSwayModifier = 0.5;
+		
+		m_movementTimeAcc = 0;
+		m_movementAmplitudeX = 1;
+		m_movementAmplitudeY = 1;
+		m_movementFrequencyX = 1;
+		m_movementFrequencyY = 2;
+		
+		Class.CastTo(m_RequesterADS,PPERequester_CameraADS.Cast(PPERequesterBank.GetRequester(PPERequester_CameraADS)));
+		
+		Init();
+	}
+	
+	void SetupSightEntities()
+	{		
+		EntityAI inHands = m_pPlayer.GetHumanInventory().GetEntityInHands();
+		if (inHands)
+		{
+			m_weaponUsed = Weapon_Base.Cast(inHands);
+			if( m_weaponUsed )
+			{
+				m_SightMisalignmentModifier = m_weaponUsed.GetPropertyModifierObject().m_SightMisalignment;
+				m_dynamicsStrength = m_dynamicsStrength * m_SightMisalignmentModifier[0];
+				m_dynamicsSmoothTime = m_dynamicsSmoothTime * m_SightMisalignmentModifier[1];
+				m_opticsUsed = m_weaponUsed.GetAttachedOptics();
+				if( m_opticsUsed )
+				{
+					m_opticsHasWeaponOverride = m_opticsUsed.HasWeaponIronsightsOverride();
+				}
+			}
+			else
+			{
+				m_opticsUsed = ItemOptics.Cast(inHands);
+			}
+		}
+	}
+	
+	//
+	override void OnActivate (DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+		super.OnActivate(pPrevCamera, pPrevCameraResult);
+
+		if (pPrevCamera)
+		{
+			vector baseAngles		= pPrevCamera.GetBaseAngles();
+			m_fUpDownAngle			= baseAngles[0]; 
+			m_fLeftRightAngle		= baseAngles[1]; 
+
+			vector addAngles		= pPrevCamera.GetAdditiveAngles();
+			m_fUpDownAngleAdd		= addAngles[0];
+			m_fLeftRightAngleAdd	= addAngles[1];
+		}
+	}
+
+	EntityAI GetCurrentSightEntity ()
+	{
+		if (m_opticsHasWeaponOverride)
+			return m_opticsUsed;
+		
+		return m_weaponUsed;
+	}
+
+	bool GetCurrentSightInfo (out vector camPos, out vector camDir)
+	{
+		EntityAI e = GetCurrentSightEntity();
+		if (e)
+		{
+			if (e == m_weaponUsed)
+			{
+				m_weaponUsed.GetCameraPoint(m_weaponUsed.GetCurrentMuzzle(), camPos, camDir);
+				return true;
+			}
+			else if (e == m_opticsUsed)
+			{
+				m_opticsUsed.UseWeaponIronsightsOverride(m_opticsHasWeaponOverride);
+				m_opticsUsed.GetCameraPoint(camPos, camDir);
+				return true;
+			}
+		}
+		else
+		{
+			ErrorEx("No sight entity found in " + this,ErrorExSeverity.INFO);
+		}
+		return false;
+	}
+	
+	//	
+	override void 		OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		//! update angles from input 
+		float min;
+		DayZPlayerImplement player = DayZPlayerImplement.Cast(GetGame().GetPlayer());
+		if (player && player.IsPlayerInStance(DayZPlayerConstants.STANCEMASK_RAISEDPRONE))
+			min = CONST_UD_MIN_BACK;
+		else
+			min = CONST_UD_MIN;
+
+		m_CurrentCameraYaw		= UpdateLRAngleUnlocked(m_fLeftRightAngle, m_fLeftRightAngleAdd, CONST_LR_MIN, CONST_LR_MAX, pDt);
+		m_CurrentCameraPitch	= UpdateUDAngleUnlocked(m_fUpDownAngle, m_fUpDownAngleAdd, min, CONST_UD_MAX, pDt);
+
+		// get model space transform matrix of the gun's eye vector 
+		vector matTM[4];
+		HumanItemAccessor hia = m_pPlayer.GetItemAccessor();
+		if(GetCurrentSightEntity())
+			hia.WeaponGetCameraPointBoneRelative(GetCurrentSightEntity(), m_OpticsCamPos, m_OpticsCamDir, m_iBoneIndex, matTM);
+		
+		// aim change based on character movement
+		vector aimChangeYPR;
+		float aimChangeX = m_pInput.GetAimDelta(pDt)[0] * Math.RAD2DEG;
+		float aimChangeY = m_pInput.GetAimDelta(pDt)[1] * Math.RAD2DEG;
+
+		HumanCommandMove hcm = m_pPlayer.GetCommand_Move();
+		if (hcm)
+		{
+			float speed = hcm.GetCurrentMovementSpeed();
+			
+			if( speed > 0 )
+				m_movementTimeAcc += pDt;
+			else
+				m_movementTimeAcc = 0;
+			
+			aimChangeX += m_movementAmplitudeX * speed * Math.Sin(Math.PI2 * m_movementFrequencyX * m_movementTimeAcc);
+			aimChangeY += m_movementAmplitudeY * speed * Math.Sin(Math.PI2 * m_movementFrequencyY * m_movementTimeAcc);
+		}
+
+		aimChangeYPR[0] = Math.SmoothCD(aimChangeYPR[0], -(m_dynamicsStrength * aimChangeY), m_velocityYaw, m_dynamicsSmoothTime, 1000, pDt);
+		aimChangeYPR[1] = Math.SmoothCD(aimChangeYPR[1], -(m_dynamicsStrength * aimChangeX), m_velocityPitch, m_dynamicsSmoothTime, 1000, pDt);
+		aimChangeYPR[2] = 0;
+
+		vector dynamics[4];
+		Math3D.YawPitchRollMatrix(aimChangeYPR, dynamics);
+		dynamics[3] = vector.Zero;
+		
+		// aiming model offsets
+		vector aimingMatTM[4];
+		hia.WeaponGetAimingModelDirTm(aimingMatTM);
+		
+		// final offset matrix
+		Math3D.MatrixMultiply4(dynamics, aimingMatTM, dynamics);
+		Math3D.MatrixMultiply4(dynamics, matTM, pOutResult.m_CameraTM);
+			
+		AdjustCameraParameters(pDt, pOutResult);
+		UpdateBatteryOptics(GetCurrentSightEntity());
+		UpdateCameraNV(PlayerBase.Cast(m_pPlayer));
+
+		if(m_CameraShake)
+		{
+			float x,y;
+			m_CameraShake.Update(pDt, x, y);
+			DayZPlayerImplement.Cast(m_pPlayer).GetAimingModel().SetCamShakeValues(x, y);
+		}
+	}
+
+	override vector GetBaseAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngle;
+		a[1] = m_fLeftRightAngle;
+		a[2] = 0;
+		return a;
+	}
+
+	override vector GetAdditiveAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngleAdd;
+		a[1] = m_fLeftRightAngleAdd;
+		a[2] = 0;
+		return a;
+	}
+	
+	void AdjustCameraParameters(float pDt, inout DayZPlayerCameraResult pOutResult)
+	{
+		pOutResult.m_iDirectBone 			= m_iBoneIndex;
+		pOutResult.m_iDirectBoneMode 		= 4;
+	
+		pOutResult.m_fFovAbsolute = HoldBreathFOVEffect(pDt);
+		
+		pOutResult.m_bUpdateWhenBlendOut	= false;
+		pOutResult.m_fDistance 				= 0;
+		pOutResult.m_fUseHeading 			= 0;
+		pOutResult.m_fInsideCamera 			= 1.0;
+		pOutResult.m_fShootFromCamera		= m_fShootFromCamera;
+		
+		pOutResult.m_fNearPlane = 0.04; //0.07 default
+	}
+	
+	float HoldBreathFOVEffect(float pDt)
+	{
+		if (m_pPlayer.IsHoldingBreath())
+		{
+			m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GameConstants.DZPLAYER_CAMERA_FOV_EYEZOOM, m_fFovAbsVel, 0.1, 1000, pDt);
+		}
+		else if (m_isEntering) //sets FOV immediatelly to avoid "floating camera" effect
+		{
+			m_fFovAbsolute = GameConstants.DZPLAYER_CAMERA_FOV_IRONSIGHTS;
+			m_isEntering = false;
+		}
+		else
+		{
+			m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GameConstants.DZPLAYER_CAMERA_FOV_IRONSIGHTS, m_fFovAbsVel, 0.1, 1000, pDt);
+		}
+
+		return m_fFovAbsolute;
+	}
+	
+	// sets PP for ironsights and optics (override) cameras
+	override void SetCameraPP(bool state, DayZPlayerCamera launchedFrom)
+	{
+		//Print("SetCameraPP - ADS");
+		if (PlayerBase.Cast(m_pPlayer) && launchedFrom.Type() != PlayerBase.Cast(m_pPlayer).GetCurrentPlayerCamera().Type())
+		{
+			//Print("DayZPlayerCameraIronsights | SetCameraPP | skipping, wrong camera type active!");
+			return;
+		}
+		
+		//if (!state || !m_weaponUsed || (PlayerBase.Cast(m_pPlayer) && launchedFrom != PlayerBase.Cast(m_pPlayer).GetCurrentPlayerCamera()))
+		if (!state || !m_weaponUsed)
+		{
+			m_RequesterADS.Stop();
+			
+			if (IsCameraNV())
+			{
+				SetNVPostprocess(GetCameraNVType());
+			}
+			else
+			{
+				SetNVPostprocess(NVTypes.NONE);
+			}
+		}
+		else
+		{
+			temp_array = {false, 0.0, 0.0, 0.0, 0.0, 1.0};
+			
+			if (m_weaponUsed.GetWeaponDOF() || (m_opticsUsed && m_opticsUsed.GetOpticsDOF()))
+			{
+				if (m_opticsUsed && m_opticsUsed.GetOpticsDOF().Count() == 6)
+				{
+					temp_array = m_opticsUsed.GetOpticsDOF();
+				}
+				else
+				{
+					temp_array = m_weaponUsed.GetWeaponDOF();
+				}
+				if (temp_array.Count() != 6)
+					temp_array = {false, 0.0, 0.0, 0.0, 0.0, 1.0};
+			}
+			
+			m_RequesterADS.SetValuesIronsights(temp_array); //DOF only
+			
+			if (IsCameraNV())
+			{
+				SetNVPostprocess(GetCameraNVType());
+			}
+			else
+			{
+				SetNVPostprocess(NVTypes.NONE);
+			}
+		}
+		
+		if (m_weaponUsed)
+		{
+			m_weaponUsed.HideWeaponBarrel(false);
+		}
+	}
+	
+	override string GetCameraName()
+	{
+		return "DayZPlayerCameraIronsights";
+	}
+	
+	override void SetCameraPPDelay(DayZPlayerCamera pPrevCamera)
+	{
+		if (pPrevCamera.GetCameraName() == "DayZPlayerCamera1stPerson")
+		{
+			//Print("---ironsights---DayZPlayerCamera1stPerson");
+			m_CameraPPDelay = DayZPlayerCameras.TIME_CAMERACHANGE_01;
+		}
+		else if (pPrevCamera.GetCameraName() == "DayZPlayerCameraOptics")
+		{
+			m_CameraPPDelay = 0;
+		}
+		else
+		{
+			//Print("---ironsights---else");
+			m_CameraPPDelay = DayZPlayerCameras.TIME_CAMERACHANGE_02;
+		}
+	}
+	
+	void UpdateBatteryOptics(EntityAI entity)
+	{
+		ItemOptics optics = ItemOptics.Cast(entity);
+		if (optics)
+			optics.UpdateOpticsReddotVisibility();
+	}
+
+	//! settings
+	protected	float	m_fShootFromCamera = 0.0;
+	
+	//! runtime values 
+	protected	int 	m_iBoneIndex;				//!< right hand dummy bone index
+	protected	vector	m_OpticsCamPos;
+	protected	vector	m_OpticsCamDir;
+
+	protected 	float 	m_fUpDownAngle;				//!< up down angle in rad
+	protected 	float 	m_fUpDownAngleAdd;			//!< up down angle in rad
+	protected 	float 	m_fLeftRightAngle;			//!< left right angle in rad (in freelook only)
+	protected 	float 	m_fLeftRightAngleAdd;		//!< left right angle in rad (in freelook only)
+
+}
+
+class DayZPlayerCameraOptics : DayZPlayerCameraIronsights
+{
+	static const float 	CONST_NEARPLANE_OPTICS = 0.06; //Default near plane value for this camera
+	protected float m_RecoilOffsetZ = 0.0;
+	
+	void DayZPlayerCameraOptics(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		if (!temp_array)
+			temp_array = new array<float>;
+		m_fShootFromCamera = 0;
+	}
+	
+	override void Init()
+	{
+		if (m_opticsUsed && m_opticsUsed.IsNVOptic() && m_opticsUsed.IsWorking())
+		{
+			SetCameraNV(true);
+		}
+		else
+		{
+			SetCameraNV(false);
+		}
+	}
+	
+	override EntityAI GetCurrentSightEntity ()
+	{
+		return m_opticsUsed;
+	}
+
+	override bool GetCurrentSightInfo (out vector camPos, out vector camDir)
+	{
+		if (m_opticsUsed)
+		{
+			m_opticsUsed.UseWeaponIronsightsOverride(false);
+			m_opticsUsed.GetCameraPoint(camPos, camDir);
+			return true;
+		}
+		return false;
+	}
+
+	override void OnActivate (DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+		super.OnActivate(pPrevCamera,pPrevCameraResult);
+		
+		PlayerBase player = PlayerBase.Cast(m_pPlayer);
+		if (player && m_opticsUsed)
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(player.HideClothing,m_CameraPPDelay*1000,false,m_opticsUsed,true);
+		}
+	}
+	
+	override void AdjustCameraParameters(float pDt, inout DayZPlayerCameraResult pOutResult)
+	{
+		pOutResult.m_iDirectBone 			= m_iBoneIndex;
+		pOutResult.m_iDirectBoneMode 		= 4;
+	
+		pOutResult.m_fFovAbsolute = HoldBreathFOVEffect(pDt);
+		
+		pOutResult.m_bUpdateWhenBlendOut	= false;
+		pOutResult.m_fDistance 				= 0;
+		pOutResult.m_fUseHeading 			= 0;
+		pOutResult.m_fInsideCamera 			= 1.0;
+		pOutResult.m_fShootFromCamera		= m_fShootFromCamera;
+		
+		if (!m_opticsUsed)
+			pOutResult.m_fNearPlane = Math.Clamp(CONST_NEARPLANE_OPTICS - m_RecoilOffsetZ, CONST_NEARPLANE_OPTICS, 10.0);
+		else
+			pOutResult.m_fNearPlane = Math.Clamp(m_opticsUsed.GetNearPlaneValue() - m_RecoilOffsetZ, CONST_NEARPLANE_OPTICS, 10.0); //some sufficiently nonsensical max
+	}
+	
+	override float HoldBreathFOVEffect(float pDt)
+	{
+		//hotfix; two cameras exist and update simultaneously during transition, even if optics/weapons is no longer present!
+		/*PlayerBase player = PlayerBase.Cast(m_pPlayer);
+		if (player && player.GetCurrentCamera() != this)
+			return 0.6;*/
+		
+		ItemOptics optics = ItemOptics.Cast( GetCurrentSightEntity() );
+		if (optics)
+		{
+			if (optics.GetCurrentStepFOV() >= GameConstants.DZPLAYER_CAMERA_FOV_EYEZOOM && (m_pPlayer.IsHoldingBreath() || m_pPlayer.GetEyeZoomLevel()))
+			{
+				m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GameConstants.DZPLAYER_CAMERA_FOV_EYEZOOM, m_fFovAbsVel, 0.1, 1000, pDt);
+			}
+			else if (m_isEntering) //sets FOV immediatelly to avoid "floating camera" effect
+			{
+				m_fFovAbsolute = optics.GetCurrentStepFOV();
+				m_isEntering = false;
+			}
+			else
+			{
+				m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, optics.GetCurrentStepFOV(), m_fFovAbsVel, 0.1, 1000, pDt);
+				//m_fFovAbsolute = optics.GetCurrentStepFOV();
+			}
+			return m_fFovAbsolute;
+		}
+		else
+		{
+			//Error("optic camera, but there is no optic item or optic on weapon"); //camera update ticks on transitions as well, caused problems
+			return 0.6;  //TODO figure some other way to get original FOV here!
+		}
+	}
+	
+	override void SetCameraPP(bool state,DayZPlayerCamera launchedFrom)
+	{
+		//Print("SetCameraPP - optics");
+		if (PlayerBase.Cast(m_pPlayer) && launchedFrom.Type() != PlayerBase.Cast(m_pPlayer).GetCurrentPlayerCamera().Type())
+		{
+			//Print("DayZPlayerCameraOptics | SetCameraPP | skipping, wrong camera type active!");
+			return;
+		}
+		
+		if (!state || !m_opticsUsed)
+		{
+			m_RequesterADS.Stop();
+			
+			if (IsCameraNV())
+			{
+				SetNVPostprocess(GetCameraNVType());
+			}
+			else
+			{
+				SetNVPostprocess(NVTypes.NONE);
+			}
+			
+			if (m_weaponUsed)
+			{
+				m_weaponUsed.HideWeaponBarrel(false);
+			}
+		}
+		else
+		{
+			array<float> lens_values = new array<float>;
+			array<float> mask_values = new array<float>;
+			float gauss = 0.0;
+			temp_array = {false, 0.0, 0.0, 0.0, 0.0, 1.0};
+			
+			// 1x scopes only
+			if (m_opticsUsed.AllowsDOF() && !NVGoggles.Cast(m_opticsUsed))
+			{
+				if (m_weaponUsed)
+				{
+					if (m_opticsUsed.GetOpticsDOF().Count() == 6)
+					{
+						temp_array = m_opticsUsed.GetOpticsDOF();
+					}
+					else
+					{
+						temp_array = m_weaponUsed.GetWeaponDOF(); //TODO should some optics have own DOF settings (different eye point)?
+					}
+					
+					if (temp_array.Count() != 6)
+						temp_array = {false, 0.0, 0.0, 0.0, 0.0, 1.0};
+				}
+				
+				m_RequesterADS.SetValuesIronsights(temp_array); //DOF only
+				
+				// optics NV mode
+				if (m_opticsUsed.IsNVOptic())
+				{
+					SetCameraNV(true);
+					SetNVPostprocess(m_opticsUsed.GetCurrentNVType());
+				}
+				else
+				{
+					if (IsCameraNV())
+					{
+						SetNVPostprocess(GetCameraNVType());
+					}
+					else
+					{
+						SetNVPostprocess(NVTypes.NONE);
+					}
+				}
+			}
+			else //magnifying scopes
+			{
+				// optics mask
+				if (m_opticsUsed.GetOpticsPPMask() && m_opticsUsed.GetOpticsPPMask().Count() == 4)
+				{
+					mask_values = m_opticsUsed.GetOpticsPPMask();
+				}
+				
+				//optics lens
+				if (m_opticsUsed.GetOpticsPPLens() && m_opticsUsed.GetOpticsPPLens().Count() == 4)
+				{
+					lens_values = m_opticsUsed.GetOpticsPPLens();
+				}
+				
+				//optics blur
+				if (m_opticsUsed.GetOpticsPPBlur() != 0)
+				{
+					gauss = m_opticsUsed.GetOpticsPPBlur();
+				}
+				
+				m_RequesterADS.SetValuesOptics(mask_values,lens_values,gauss);
+				
+				// optics NV mode
+				if (m_opticsUsed.IsNVOptic())
+				{
+					SetCameraNV(true);
+					SetNVPostprocess(m_opticsUsed.GetCurrentNVType());
+				}
+				else
+				{
+					SetNVPostprocess(NVTypes.NONE); //magnifying optics do not combine with other NV sources (would render NV optics obsolete)
+				}
+			}
+			
+			if (m_weaponUsed)
+			{
+				m_weaponUsed.HideWeaponBarrel(true);
+			}
+		}
+	}
+	
+	override string GetCameraName()
+	{
+		return "DayZPlayerCameraOptics";
+	}
+	
+	override void SetCameraPPDelay(DayZPlayerCamera pPrevCamera)
+	{
+		if (pPrevCamera.GetCameraName() == "DayZPlayerCameraIronsights")
+		{
+			m_CameraPPDelay = DayZPlayerCameras.TIME_CAMERACHANGE_02 - 0.05;
+		}
+		else if (pPrevCamera.GetCameraName() == "DayZPlayerCamera1stPerson")
+		{
+			m_CameraPPDelay = DayZPlayerCameras.TIME_CAMERACHANGE_02 - 0.05; //changed to accomodate handheld optics, had to be changed here also
+		}
+		else if (!pPrevCamera.IsCamera3rdRaised())
+		{
+			m_CameraPPDelay = DayZPlayerCameras.TIME_CAMERACHANGE_03 - 0.05;
+		}
+		else
+		{
+			m_CameraPPDelay = DayZPlayerCameras.TIME_CAMERACHANGE_02 - 0.05;
+		}
+	}
+	
+	override void SendRecoilOffsetZ(float offset)
+	{
+		m_RecoilOffsetZ = offset;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameraVehicles.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameraVehicles.c
new file mode 100644
index 0000000000000000000000000000000000000000..7953f26792886201a2bf0d8d7acf2f7e06a2df36
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameraVehicles.c
@@ -0,0 +1,181 @@
+// *************************************************************************************
+// ! DayZPlayerCamera1stPersonVehicle - first person in vehicle
+// *************************************************************************************
+class DayZPlayerCamera1stPersonVehicle extends DayZPlayerCamera1stPerson
+{
+	override void OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		super.OnUpdate(pDt, pOutResult);
+
+		pOutResult.m_fUseHeading 		= 0.0;
+		pOutResult.m_bUpdateEveryFrame 	= GetGame().IsPhysicsExtrapolationEnabled();
+	}
+}
+
+// *************************************************************************************
+// ! DayZPlayerCamera3rdPersonVehicle - 3rd person in vehicle (generic)
+// *************************************************************************************
+class DayZPlayerCamera3rdPersonVehicle extends DayZPlayerCameraBase
+{
+	static const float 	CONST_UD_MIN	= -85.0;		//!< down limit
+	static const float 	CONST_UD_MAX	= 85.0;			//!< up limit
+
+	static const float 	CONST_LR_MIN	= -160.0;		//!< down limit
+	static const float 	CONST_LR_MAX	= 160.0;		//!< up limit
+	
+	const float CONST_LINEAR_VELOCITY_STRENGTH		= 0.025;
+	const float CONST_ANGULAR_VELOCITY_STRENGTH		= 0.025;
+
+	const float CONST_ANGULAR_LAG_YAW_STRENGTH		= 4.0;
+	const float CONST_ANGULAR_LAG_PITCH_STRENGTH	= 1.5;
+	const float CONST_ANGULAR_LAG_ROLL_STRENGTH		= 0.0;
+
+	void DayZPlayerCamera3rdPersonVehicle( DayZPlayer pPlayer, HumanInputController pInput )
+	{
+		//Print("new camera: DayZPlayerCamera3rdPersonVehicle");
+
+		m_fDistance 		= 4.0;
+		m_CameraOffsetMS	= "0.0 1.3 0.0";
+		
+		HumanCommandVehicle vehicleCommand = pPlayer.GetCommand_Vehicle();
+		if ( vehicleCommand )
+		{
+			Transport transport = vehicleCommand.GetTransport();
+			if ( transport )
+			{
+				m_Transport			= transport;
+				m_fDistance			= transport.GetTransportCameraDistance();
+				m_CameraOffsetMS	= transport.GetTransportCameraOffset();
+			}
+		}
+	}
+	
+	override void OnActivate( DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult )
+	{
+		if (pPrevCamera)
+		{
+			vector baseAngles		= pPrevCamera.GetBaseAngles();
+			m_fUpDownAngle			= baseAngles[0]; 
+			m_fLeftRightAngle		= baseAngles[1]; 
+
+			vector addAngles		= pPrevCamera.GetAdditiveAngles();
+			m_fUpDownAngleAdd		= addAngles[0];
+			m_fLeftRightAngleAdd	= addAngles[1];
+		}
+		
+		m_LagOffsetPosition = vector.Zero;
+		m_fLagOffsetVelocityX[0] = 0;
+		m_fLagOffsetVelocityY[0] = 0;
+		m_fLagOffsetVelocityZ[0] = 0;
+	}
+
+	override void OnUpdate( float pDt, out DayZPlayerCameraResult pOutResult )
+	{
+		//! get player transform
+		vector playerTransformWS[4];
+		m_pPlayer.GetTransform(playerTransformWS);
+
+		//! get vehicle and set it as ignore entity for camera collision solver
+		IEntity vehicle = m_Transport;
+		pOutResult.m_CollisionIgnoreEntity = vehicle;
+		
+		//! update camera offset
+		vector cameraPosition = vector.Zero;
+		if ( vehicle )
+		{
+			vector vehiclePositionWS = vehicle.GetOrigin();
+			vector vehiclePositionMS = vehiclePositionWS.InvMultiply4(playerTransformWS);
+			cameraPosition = vehiclePositionMS + m_CameraOffsetMS;
+		}
+
+		//! orientation LS
+		m_CurrentCameraYaw		= UpdateLRAngleUnlocked(m_fLeftRightAngle, m_fLeftRightAngleAdd, CONST_LR_MIN, CONST_LR_MAX, pDt);
+		m_CurrentCameraPitch	= UpdateUDAngleUnlocked(m_fUpDownAngle, m_fUpDownAngleAdd, CONST_UD_MIN, CONST_UD_MAX, pDt);
+		m_CurrentCameraRoll		= 0;
+				
+		//! create LS lag from vehicle velocities	
+		vector posDiffLS = vector.Zero;
+		vector rotDiffLS =  vector.Zero;
+
+		if ( vehicle )
+		{
+			vector posDiffWS = GetVelocity(vehicle) * CONST_LINEAR_VELOCITY_STRENGTH;
+			posDiffLS = posDiffWS.InvMultiply3(playerTransformWS);
+
+			vector rotDiffWS = dBodyGetAngularVelocity(vehicle) * Math.RAD2DEG * CONST_ANGULAR_VELOCITY_STRENGTH;
+			rotDiffLS = rotDiffWS.InvMultiply3(playerTransformWS);
+		}		
+			
+		//! smooth it!
+		m_LagOffsetPosition[0] = Math.SmoothCD(m_LagOffsetPosition[0], posDiffLS[0], m_fLagOffsetVelocityX, 0.3, 1000, pDt);
+		m_LagOffsetPosition[1] = Math.SmoothCD(m_LagOffsetPosition[1], posDiffLS[1], m_fLagOffsetVelocityY, 0.3, 1000, pDt);
+		m_LagOffsetPosition[2] = Math.SmoothCD(m_LagOffsetPosition[2], posDiffLS[2], m_fLagOffsetVelocityZ, 0.3, 1000, pDt);
+
+		m_LagOffsetOrientation[0] = Math.SmoothCD(m_LagOffsetOrientation[0], rotDiffLS[1], m_fLagOffsetVelocityYaw, 0.3, 1000, pDt);
+		m_LagOffsetOrientation[1] = Math.SmoothCD(m_LagOffsetOrientation[1], rotDiffLS[2], m_fLagOffsetVelocityPitch, 0.3, 1000, pDt);
+		m_LagOffsetOrientation[2] = Math.SmoothCD(m_LagOffsetOrientation[2], rotDiffLS[0], m_fLagOffsetVelocityRoll, 0.3, 1000, pDt);
+		
+		//! setup orientation
+		vector rot;
+		rot[0] = CONST_ANGULAR_LAG_YAW_STRENGTH		* m_LagOffsetOrientation[0];
+		rot[1] = CONST_ANGULAR_LAG_PITCH_STRENGTH	* m_LagOffsetOrientation[1];
+		rot[2] = CONST_ANGULAR_LAG_ROLL_STRENGTH	* m_LagOffsetOrientation[2];
+	
+		Math3D.YawPitchRollMatrix(GetCurrentOrientation() + rot, pOutResult.m_CameraTM);
+
+		//! setup position		
+		pOutResult.m_CameraTM[3] = cameraPosition - m_LagOffsetPosition;
+		
+		//! setup rest
+		pOutResult.m_fDistance 			= m_fDistance;
+		pOutResult.m_fUseHeading 		= 0.0;
+		pOutResult.m_fInsideCamera 		= 0.0;
+		pOutResult.m_fIgnoreParentRoll 	= 1.0;
+		pOutResult.m_bUpdateEveryFrame 	= GetGame().IsPhysicsExtrapolationEnabled();
+		
+		StdFovUpdate(pDt, pOutResult);
+		
+		super.OnUpdate(pDt, pOutResult);
+	}
+
+	override vector GetBaseAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngle;
+		a[1] = m_fLeftRightAngle;
+		a[2] = 0;
+		return a;
+	}
+
+	override vector GetAdditiveAngles()
+	{
+		vector a;
+		a[0] = m_fUpDownAngleAdd;
+		a[1] = m_fLeftRightAngleAdd;
+		a[2] = 0;
+		return a;
+	}
+
+	//! runtime config
+	protected 	vector  m_CameraOffsetMS;	//!< model space offset
+	protected 	float 	m_fDistance;		//!< distance from start
+	
+	//! runtime values 
+	protected 	float 	m_fUpDownAngle;			//!< up down angle in rad
+	protected 	float 	m_fUpDownAngleAdd;		//!< up down angle in rad
+	protected 	float 	m_fLeftRightAngle;		//!< left right angle in rad
+	protected 	float 	m_fLeftRightAngleAdd;	//!< left right angle in rad
+	
+	//! lag offsets
+	protected	vector	m_LagOffsetPosition;
+	protected	vector	m_LagOffsetOrientation;
+	protected	float	m_fLagOffsetVelocityX[1];
+	protected	float	m_fLagOffsetVelocityY[1];
+	protected	float	m_fLagOffsetVelocityZ[1];
+	protected	float	m_fLagOffsetVelocityYaw[1];
+	protected	float	m_fLagOffsetVelocityPitch[1];
+	protected	float	m_fLagOffsetVelocityRoll[1];
+	
+	//! cache
+	protected Transport m_Transport;
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera_Base.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..baf56bb8fc7f76666eaaea418455c32e5be93296
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCamera_Base.c
@@ -0,0 +1,565 @@
+//! limit function
+float 	Limit(float pV, float pMin, float pMax)
+{
+	if (pV >= pMin && pV <= pMax)
+	{
+		return pV;
+	}
+	else if (pV < pMin)
+	{
+		return pMin;
+	}
+	else
+	{
+		return pMax;
+	}	
+}
+
+
+float fixAngle_PI_PI(float pAngle)
+{
+	while (pAngle > Math.PI)
+	{
+
+		pAngle -=  Math.PI2;
+	}
+
+	while (pAngle < -Math.PI)
+	{
+
+		pAngle +=  Math.PI2;
+	}
+
+	return pAngle;
+}
+
+float fixAngle_180_180(float pAngle)
+{
+	while (pAngle > 180)
+	{
+
+		pAngle -=  360;
+	}
+
+	while (pAngle < -180)
+	{
+
+		pAngle +=  360;
+	}
+
+	return pAngle;
+}
+
+
+enum NVTypes
+{
+	NONE = 0,
+	NV_GOGGLES,
+	NV_GOGGLES_OFF,
+	NV_OPTICS_ON,
+	NV_OPTICS_OFF,
+	NV_PUMPKIN,
+	NV_OPTICS_KAZUAR_DAY,
+	NV_OPTICS_KAZUAR_NIGHT,
+	NV_OPTICS_STARLIGHT_DAY,
+	NV_OPTICS_STARLIGHT_NIGHT,
+	MAX
+}
+
+class DayZPlayerCameraBase extends DayZPlayerCamera
+{
+	static const float 	CONST_NEARPLANE_OPTICS_MIN = 0.04; //Minimal safe near plane value, artifacts on the far plane otherwise!
+
+	protected 	Weapon_Base		m_weaponUsed;
+	protected 	ItemOptics 		m_opticsUsed;
+	protected	ref CameraShake		m_CameraShake;
+	
+	//! constructor must be same 
+	void 	DayZPlayerCameraBase(DayZPlayer pPlayer, HumanInputController pInput)
+	{
+		m_fLRAngleVel[0] = 0;
+		m_fUDAngleVel[0] = 0;
+		m_fFovAbsVel[0] = 0;
+		m_WeaponSwayModifier = 1;
+		
+		m_fFovAbsolute = GetDayZGame().GetFOVByZoomType(m_pPlayer.GetEyeZoomLevel());
+		//!
+		/*
+		{
+			int perItemCamUD = pPlayer.GetCurrentPerItemCameraUD();
+			string 		a	= "Per Item Camera User Data: " + perItemCamUD.ToString();
+			Print(a);
+		}
+		*/
+		m_CameraPPDelay = 0;
+
+		m_CommandWeapons = pPlayer.GetCommandModifier_Weapons();
+		Init();
+		HandleShoulderCameraOverride(pInput);
+	};
+	
+	//disabled by default, overrides on select 3rd person cameras
+	void HandleShoulderCameraOverride(HumanInputController pInput)
+	{
+		//! disable override
+		m_pInput.Override3rdIsRightShoulder(HumanInputControllerOverrideType.DISABLED, false);
+	}
+	
+	void ProcessCameraShake(float delta, out float leftRight, out float upDown)
+	{
+		if (m_CameraShake)
+		{
+			float x,y;
+			m_CameraShake.Update(delta, x, y);
+			leftRight += x;
+			upDown += y;
+		}
+	}
+	
+	void Init()
+	{
+		PlayerBase player = PlayerBase.Cast(m_pPlayer);
+		if ( player && player.IsNVGWorking() != IsCameraNV() )
+		{
+			SetCameraNV(player.IsNVGWorking());
+			SetCameraNVType(player.GetNVType());
+		}
+	}
+
+	float UpdateUDAngleUnlocked(out float pAngle, out float pAngleAdd, float pMin, float pMax, float pDt)
+	{
+		float target = m_CommandWeapons.GetBaseAimingAngleUD();
+		
+		if (m_pInput.CameraIsTracking())	
+ 		{
+			pAngleAdd = m_pInput.GetTracking()[1] * Math.RAD2DEG;
+			pAngle = target;
+ 
+			m_fUDAngleVel[0] = 0;
+ 		}
+		else
+		{
+			if (Math.AbsFloat(pAngleAdd) > 0.001)
+			{
+				pAngleAdd 	= pAngle + pAngleAdd - target;
+				pAngle 		= target;
+			}
+			
+			if (m_pInput.CameraIsFreeLook())	
+	 		{
+				pAngleAdd += m_pInput.GetAimDelta(pDt)[1] * Math.RAD2DEG;
+	 
+				m_fUDAngleVel[0] = 0;
+	 		}
+	 		else
+	 		{
+				pAngleAdd = Math.SmoothCD(pAngleAdd, 0.0, m_fUDAngleVel, 0.14, 1000, pDt);
+			}
+	
+			if (!m_pInput.CameraIsFreeLook())
+			{
+				pAngle += m_pInput.GetAimDelta(pDt)[1] * Math.RAD2DEG;
+	 		}
+		}
+		
+		pAngle = Limit(pAngle, pMin, pMax);
+		pAngleAdd = Limit(pAngle + pAngleAdd, pMin, pMax) - pAngle;
+		return pAngle + pAngleAdd;
+ 	}
+
+	float UpdateLRAngleUnlocked(out float pAngle, out float pAngleAdd, float pMin, float pMax, float pDt)
+	{
+		float target = 0;
+		
+		if (m_pInput.CameraIsTracking())	
+ 		{
+			pAngleAdd = m_pInput.GetTracking()[0] * Math.RAD2DEG;
+			pAngle = target;
+ 
+			m_fUDAngleVel[0] = 0;
+ 		}
+		else
+		{
+			if (Math.AbsFloat(pAngleAdd) > 0.001)
+			{
+				pAngleAdd 	= pAngle + pAngleAdd - target;
+				pAngle 		= target;
+			}
+			
+			if (m_pInput.CameraIsFreeLook() || m_bForceFreeLook)	
+	 		{
+				pAngleAdd += m_pInput.GetAimDelta(pDt)[0] * Math.RAD2DEG;
+	 
+				m_fLRAngleVel[0] = 0;
+	 		}
+	 		else
+	 		{
+				pAngleAdd = Math.SmoothCD(pAngleAdd, 0.0, m_fLRAngleVel, 0.14, 1000, pDt);
+			}
+			
+			pAngleAdd = pAngleAdd + pAngle;
+		}
+		
+		pAngle = Limit(pAngle, pMin, pMax);
+		pAngleAdd = Limit(pAngle + pAngleAdd, pMin, pMax) - pAngle;
+		
+		return pAngle + pAngleAdd;
+ 	}
+
+	float UpdateUDAngle(out float pAngle, out float pAngleAdd, float pMin, float pMax, float pDt)
+	{
+		if (Math.AbsFloat(pAngleAdd) > 0.001)
+		{
+			float aimingUDAngle = m_CommandWeapons.GetBaseAimingAngleUD();
+
+			//!	pAngle + pAngleAdd == aimingUDAngle + aimingUDAdd
+			//! now we set pAngleAdd to be the differenc from aimingAngle and we change camera angle to be the aiming angle
+
+			// override actual angle
+			pAngleAdd 	= pAngle + pAngleAdd - aimingUDAngle;
+			pAngle 		= aimingUDAngle;
+
+			// Print("Angle: " + pAngle.ToString() + " Aim: " + actualUDAngle.ToString() );
+		}
+
+		//! lr angle
+		if( m_pInput.CameraIsFreeLook() )	
+		{
+			pAngleAdd 	+= m_pInput.GetAimChange()[1] * Math.RAD2DEG;
+			pAngleAdd	= Limit(pAngleAdd, pMin, pMax);
+
+			m_fUDAngleVel[0]	= 0;
+		}
+		else
+		{
+			if( m_pInput.CameraIsTracking() )
+			{
+				pAngleAdd 	= m_pInput.GetTracking()[1] * Math.RAD2DEG;
+				pAngleAdd	= Limit(pAngleAdd, pMin, pMax);
+
+				m_fUDAngleVel[0]	= 0;
+			}
+			else
+			{	
+				//! update it in degrees
+				pAngle 	+= m_pInput.GetAimChange()[1] * Math.RAD2DEG;
+				pAngle 	= Limit(pAngle, pMin, pMax);
+
+				pAngleAdd	= Math.SmoothCD(pAngleAdd, 0, m_fUDAngleVel, 0.14, 1000, pDt);
+			}
+		}
+		
+		/*{
+			float change = m_pInput.GetAimChange()[1] * Math.RAD2DEG;
+
+			Print ("Script: Camera ud angle: " +  pAngle.ToString() + " change: " + change.ToString() );
+		}*/		
+
+		return Limit(pAngle + pAngleAdd, pMin, pMax);
+	}
+
+	float UpdateLRAngle(float pAngle, float pMin, float pMax, float pDt)
+	{
+		//! lr angle
+		if (m_pInput.CameraIsFreeLook() || m_bForceFreeLook)	
+		{
+			//!
+			pAngle	+= m_pInput.GetAimChange()[0] * Math.RAD2DEG;
+			pAngle	= Limit(pAngle, pMin, pMax);
+
+			m_fLRAngleVel[0]	= 0;	// reset filter
+
+		}
+		else
+		{
+			if( m_pInput.CameraIsTracking() )
+			{
+				pAngle = m_pInput.GetTracking()[0] * Math.RAD2DEG;
+				pAngle	= Limit(-pAngle, pMin, pMax);
+				
+				m_fLRAngleVel[0]	= 0;	// reset filter
+			}
+			else
+			{	
+				// smooth value back to 0 
+				pAngle		= Math.SmoothCD(pAngle, 0, m_fLRAngleVel, 0.14, 1000, pDt);
+				// m_fLeftRightAngle	= 0.9 * (1.0 - pDt);			
+			}
+		}
+
+		return pAngle;
+	}
+
+	
+
+	void StdFovUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		//! change abs FOV for naked eye zoom
+		switch (m_pPlayer.GetEyeZoomLevel())
+		{
+			// ordered in likelihood of occurance for perf. reasons
+			case ECameraZoomType.NONE:
+				m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GetDayZGame().GetFOVByZoomType(ECameraZoomType.NONE), m_fFovAbsVel, 0.1, 1000, pDt);
+				break;
+			case ECameraZoomType.NORMAL:
+				m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GetDayZGame().GetFOVByZoomType(ECameraZoomType.NORMAL), m_fFovAbsVel, 0.1, 1000, pDt);
+				break;
+			case ECameraZoomType.SHALLOW:
+				m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GetDayZGame().GetFOVByZoomType(ECameraZoomType.SHALLOW), m_fFovAbsVel, 0.1, 1000, pDt);
+				break;
+			default:
+				m_fFovAbsolute = Math.SmoothCD(m_fFovAbsolute, GetDayZGame().GetFOVByZoomType(ECameraZoomType.NONE), m_fFovAbsVel, 0.1, 1000, pDt);
+				break;
+		}
+		
+		pOutResult.m_fFovAbsolute = m_fFovAbsolute;
+
+		//! switch shooting from camera to weapon (firearms)
+		if (!m_pPlayer.IsShootingFromCamera())
+		{
+			pOutResult.m_fShootFromCamera = 0.0;
+		}
+	}
+
+	override void SpawnCameraShakeProper(float strength, float radius, float smoothness, float radius_decay_speed)
+	{
+		m_CameraShake = new CameraShake(strength, radius, smoothness, radius_decay_speed);
+	}	
+
+	override void OnUpdate(float pDt, out DayZPlayerCameraResult pOutResult)
+	{
+		if (!m_pPlayer || !PlayerBase.Cast(m_pPlayer))
+		{
+			Debug.Log("DayZPlayerCameraBase | OnUpdate | no player!");
+			return;
+		}
+		
+		if (PlayerBase.Cast(m_pPlayer).GetCurrentCamera() != this)
+		{
+			//Print("DayZPlayerCameraBase | OnUpdate | unused camera! | " + this + "/" + PlayerBase.Cast(m_pPlayer).GetCurrentCamera());
+			return;
+		}
+		
+		super.OnUpdate(pDt, pOutResult);
+		StdFovUpdate(pDt, pOutResult);
+		UpdateCameraNV(PlayerBase.Cast(m_pPlayer));
+		InitCameraOnPlayer();
+	}
+
+	override void OnActivate(DayZPlayerCamera pPrevCamera, DayZPlayerCameraResult pPrevCameraResult)
+	{
+		InitCameraOnPlayer(true);
+		SetCameraPPDelay(pPrevCamera);
+		
+		if (DayZPlayerCameraBase.Cast(pPrevCamera) && DayZPlayerCameraBase.Cast(pPrevCamera).IsCameraNV() && !IsCameraNV())
+		{
+			PPERequesterBank.GetRequester(PPERequesterBank.REQ_CAMERANV).Start( new Param1<int>(PPERequester_CameraNV.NV_TRANSITIVE) );
+		}
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(SetCameraPP,m_CameraPPDelay*1000,false,true,this); // this takes care of weapon/optics postprocessing
+		DayZPlayerCameraOptics optic_camera;
+		if (DayZPlayerCamera.CastTo(optic_camera,pPrevCamera))
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(PlayerBase.Cast(m_pPlayer).HideClothing,null,false);
+		}
+	}
+	
+	float GetWeaponSwayModifier()
+	{
+		return m_WeaponSwayModifier;
+	}
+	
+	override string GetCameraName()
+	{
+		return "DayZPlayerCameraBase";
+	}
+	
+	void SetCameraPPDelay(DayZPlayerCamera pPrevCamera)
+	{
+	}
+	
+	void SetCameraNV(bool nightvision)
+	{
+		m_IsNightvision = nightvision;
+	}
+	
+	bool IsCameraNV()
+	{
+		return m_IsNightvision;
+	}
+	
+	void SetCameraNVType(int type)
+	{
+		m_NightvisionType = type;
+	}
+	
+	int GetCameraNVType()
+	{
+		return m_NightvisionType;
+	}
+	
+	void UpdateCameraNV(PlayerBase player)
+	{
+		if ( !player )
+			return;
+		
+		if ( player.IsNVGWorking() != IsCameraNV() || player.GetNVType() != GetCameraNVType() )
+		{
+			SetCameraNV(player.IsNVGWorking());
+			SetCameraNVType(player.GetNVType());
+			SetCameraPP(true, this);
+		}
+	}
+	
+	//! by default sets camera PP to zero, regardless of parameter. Override if needed.
+	void SetCameraPP(bool state, DayZPlayerCamera launchedFrom)
+	{
+		PPERequesterBank.GetRequester(PPERequester_CameraADS).Stop();
+		
+		if (IsCameraNV())
+		{
+			SetNVPostprocess(GetCameraNVType());
+		}
+		else
+		{
+			SetNVPostprocess(NVTypes.NONE);
+		}
+		
+		m_weaponUsed = Weapon_Base.Cast(m_pPlayer.GetHumanInventory().GetEntityInHands());
+		if (m_weaponUsed)
+		{
+			m_weaponUsed.HideWeaponBarrel(false);
+		}
+	}
+	
+	override float GetCurrentYaw()
+	{
+		return m_CurrentCameraYaw;
+	}
+	
+	override float GetCurrentPitch()
+	{
+		return m_CurrentCameraPitch;
+	}
+	
+	override float GetCurrentRoll()
+	{
+		return m_CurrentCameraRoll;
+	}
+	
+	void ForceFreelook(bool state)
+	{
+		m_bForceFreeLook = state;
+	}
+	
+	//TODO - better handling of distinct occluder types
+	//! DayZPlayerCameraOptics handles this separately, otherwise it takes active NVType from PlayerBase::GetCameraNVType
+	void SetNVPostprocess(int NVtype)
+	{
+		//Print("+++Setting NV type: " + NVtype + " +++");
+		switch (NVtype)
+		{
+			case NVTypes.NONE:
+			{
+				PPERequesterBank.GetRequester(PPERequester_CameraNV).Stop();
+				if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				{
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.NVG_OCCLUDER});
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.PUMPKIN_OCCLUDER});
+				}
+			}
+			break;
+			
+			//night-vision modes
+			case NVTypes.NV_OPTICS_KAZUAR_NIGHT:
+			case NVTypes.NV_OPTICS_STARLIGHT_NIGHT:
+			case NVTypes.NV_OPTICS_ON:
+			{
+				PPERequesterBank.GetRequester(PPERequesterBank.REQ_CAMERANV).Start( new Param1<int>(PPERequester_CameraNV.NV_DEFAULT_OPTICS) );
+				if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				{
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.NVG_OCCLUDER});
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.PUMPKIN_OCCLUDER});
+				}
+			}
+			break;
+			
+			//daytime filter modes
+			case NVTypes.NV_OPTICS_KAZUAR_DAY:
+			case NVTypes.NV_OPTICS_STARLIGHT_DAY:
+			{
+				PPERequesterBank.GetRequester(PPERequesterBank.REQ_CAMERANV).Start( new Param1<int>(PPERequester_CameraNV.NV_DAYTIME_OPTICS) );
+				if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				{
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.NVG_OCCLUDER});
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.PUMPKIN_OCCLUDER});
+				}
+			}
+			break;
+			
+			case NVTypes.NV_GOGGLES_OFF:
+			case NVTypes.NV_OPTICS_OFF:
+			{
+				PPERequesterBank.GetRequester(PPERequesterBank.REQ_CAMERANV).Start( new Param1<int>(PPERequester_CameraNV.NV_NO_BATTERY) );
+				if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				{
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.NVG_OCCLUDER});
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.PUMPKIN_OCCLUDER});
+				}
+			}
+			break;
+			
+			case NVTypes.NV_GOGGLES:
+			{
+				PPERequesterBank.GetRequester(PPERequesterBank.REQ_CAMERANV).Start( new Param1<int>(PPERequester_CameraNV.NV_DEFAULT_GLASSES) );
+				if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				{
+					GetGame().GetMission().GetEffectWidgets().AddActiveEffects({EffectWidgetsTypes.NVG_OCCLUDER});
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.PUMPKIN_OCCLUDER});
+				}
+			}
+			break;
+			
+			case NVTypes.NV_PUMPKIN:
+			{
+				PPERequesterBank.GetRequester(PPERequesterBank.REQ_CAMERANV).Start( new Param1<int>(PPERequester_CameraNV.NV_PUMPKIN) );
+				if (GetGame().GetMission() && GetGame().GetMission().GetEffectWidgets())
+				{
+					GetGame().GetMission().GetEffectWidgets().AddActiveEffects({EffectWidgetsTypes.PUMPKIN_OCCLUDER});
+					GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.NVG_OCCLUDER});
+				}
+			}
+			break;
+		}
+		
+		if (PlayerBaseClient.Cast(m_pPlayer))
+		{
+			PlayerBaseClient.Cast(m_pPlayer).SwitchPersonalLight(NVtype < 1);
+		}
+	}
+	
+	void InitCameraOnPlayer(bool force = false)
+	{
+		PlayerBase player = PlayerBase.Cast(m_pPlayer);
+		if (!player.GetCurrentPlayerCamera() || (force && player.GetCurrentPlayerCamera() != this))
+		{
+			player.OnCameraChanged(this);
+		}
+	}
+	
+	protected float 				m_fLRAngleVel[1];
+	protected float 				m_fUDAngleVel[1];
+	protected float					m_fFovAbsVel[1];
+	protected float					m_fFovAbsolute;
+	protected bool					m_bForceFreeLook;
+	protected float					m_WeaponSwayModifier;
+	protected float 				m_CameraPPDelay;
+
+	protected float 				m_CurrentCameraYaw;
+	protected float 				m_CurrentCameraPitch;
+	protected float 				m_CurrentCameraRoll;
+
+	protected HumanCommandWeapons	m_CommandWeapons;
+	protected bool 					m_IsNightvision;
+	protected int 					m_NightvisionType;
+}
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameras.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameras.c
new file mode 100644
index 0000000000000000000000000000000000000000..52701cd9e01bb00dc0e35cd80ad95f0e05bb370d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCameras.c
@@ -0,0 +1,171 @@
+class DayZPlayerCameras
+{
+	static const int 	DAYZCAMERA_1ST 						= 1;		//!< 1st person camera
+	static const int 	DAYZCAMERA_3RD_ERC 					= 2;		//!< 3rd - standing
+	static const int 	DAYZCAMERA_3RD_ERC_SPR 				= 3;		//!< 3rd - standing sprint
+	static const int 	DAYZCAMERA_3RD_ERC_RAISED 			= 4;		//!< 3rd - standing raised
+	static const int 	DAYZCAMERA_3RD_CRO 					= 5;		//!< 3rd - crouch
+	static const int 	DAYZCAMERA_3RD_CRO_RAISED 			= 6;		//!< 3rd - crouch
+	static const int 	DAYZCAMERA_3RD_PRO 					= 7;		//!< 3rd - laying
+	static const int 	DAYZCAMERA_3RD_PRO_RAISED   		= 8; 		//!< 3rd - laying raised
+	static const int 	DAYZCAMERA_3RD_ERC_RAISED_MELEE   	= 9; 		//!< 3rd - laying raised
+	static const int 	DAYZCAMERA_IRONSIGHTS				= 10;		//!< ironsights camera
+	static const int 	DAYZCAMERA_OPTICS					= 11;		//!< optics
+	static const int 	DAYZCAMERA_1ST_UNCONSCIOUS			= 12;		//!< unconscious
+	static const int	DAYZCAMERA_3RD_JUMP					= 13;		//!< jump
+	static const int	DAYZCAMERA_3RD_CLIMB				= 14;		//!< climb / vault
+	
+	static const int	DAYZCAMERA_1ST_VEHICLE				= 30;		//!< vehicle 1st person
+	static const int	DAYZCAMERA_3RD_VEHICLE				= 31;		//!< generic vehicle 3rd person
+	
+	static const int 	PERITEMUD_INVALID 			= -1;		//! uninitialized / invalid per item camera user data
+	static const int 	PERITEMUD_EMPTYHANDED 		= 20;		//! for empty hands
+	static const int 	PERITEMUD_ONEHANDED 		= 25;		//! for empty hands
+	static const int 	PERITEMUD_TWOHANDED 		= 30;		//! for two handed items
+	
+	// some times for camera changes
+	static const float 	TIME_CAMERACHANGE_01 				= 0.1;
+	static const float 	TIME_CAMERACHANGE_02 				= 0.2;
+	static const float 	TIME_CAMERACHANGE_03 				= 0.3;
+	
+
+	static ref map<int,float>								m_TransitionTimes = new map<int,float>;
+
+
+	//! called from DayZPlayerTypeCreate() fn	
+	// temporary moved out of the 
+	static void 	RegisterCameras(DayZPlayerType pType)
+	{
+		pType.ResetCameraCreators();
+
+		//! 
+		//! this registers camera ids for camera script class implementation
+		//! which camera is used at the time is specified by DayzPlayerImplement.CamraHandler which returns id 
+		//!
+		pType.RegisterCameraCreator(DAYZCAMERA_1ST, DayZPlayerCamera1stPerson);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_ERC, DayZPlayerCamera3rdPersonErc);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_ERC_SPR, DayZPlayerCamera3rdPersonErcSpr);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_ERC_RAISED, DayZPlayerCamera3rdPersonErcRaised);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_CRO, DayZPlayerCamera3rdPersonCrouch);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_CRO_RAISED, DayZPlayerCamera3rdPersonCrouchRaised);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_PRO, DayZPlayerCamera3rdPersonProne);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_PRO_RAISED, DayZPlayerCamera3rdPersonProneRaised);
+		pType.RegisterCameraCreator(DAYZCAMERA_IRONSIGHTS, DayZPlayerCameraIronsights);
+		pType.RegisterCameraCreator(DAYZCAMERA_OPTICS, DayZPlayerCameraOptics);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_ERC_RAISED_MELEE, DayZPlayerCamera3rdPersonErcRaisedMelee);
+		pType.RegisterCameraCreator(DAYZCAMERA_1ST_UNCONSCIOUS, DayZPlayerCamera1stPersonUnconscious);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_JUMP, DayZPlayerCamera3rdPersonJump);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_CLIMB, DayZPlayerCamera3rdPersonClimb);
+		
+		pType.RegisterCameraCreator(DAYZCAMERA_1ST_VEHICLE, DayZPlayerCamera1stPersonVehicle);
+		pType.RegisterCameraCreator(DAYZCAMERA_3RD_VEHICLE, DayZPlayerCamera3rdPersonVehicle);
+
+		
+		//! Blend times when changing cameras
+		//! 3rd person erected camera transition
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_CRO, 0.4, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_PRO, 0.8, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_PRO_RAISED, 0.8, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_ERC_RAISED, 0.2, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_ERC_RAISED_MELEE, 0.2, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_ERC_SPR, 0.6, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_RAISED, DAYZCAMERA_3RD_ERC_SPR, 0.7, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_RAISED, DAYZCAMERA_3RD_PRO_RAISED, 0.8, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_SPR, DAYZCAMERA_3RD_ERC, 0.3, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_SPR, DAYZCAMERA_3RD_CRO, 0.3, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_SPR, DAYZCAMERA_3RD_PRO, 0.5, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_SPR, DAYZCAMERA_3RD_ERC_RAISED, 0.3, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_SPR, DAYZCAMERA_3RD_JUMP, 0.1, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_JUMP, DAYZCAMERA_3RD_ERC_SPR, 0.2, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_JUMP, 0.05, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_JUMP, DAYZCAMERA_3RD_ERC, 0.3, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_3RD_CLIMB, 0.3, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CLIMB, DAYZCAMERA_3RD_ERC, 0.3, false);
+
+		//! 3rd person crouch camera transitions
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO, DAYZCAMERA_3RD_ERC, 0.4, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO, DAYZCAMERA_3RD_PRO, 0.6, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO, DAYZCAMERA_3RD_CRO_RAISED, 0.2, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO, DAYZCAMERA_3RD_ERC_SPR, 0.6, false);
+		
+		//! 3rd person prone camera transitions
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO, DAYZCAMERA_3RD_ERC, 0.9, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO, DAYZCAMERA_3RD_CRO, 0.7, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO, DAYZCAMERA_3RD_PRO_RAISED, 0.2, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO, DAYZCAMERA_3RD_ERC_SPR, 0.6, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_3RD_CRO, 0.7, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_3RD_CRO_RAISED, 0.7, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_3RD_ERC, 0.9, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_3RD_ERC_RAISED, 0.9, false);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_3RD_ERC_RAISED_MELEE, 0.9, false);
+		
+		//! vehicle cameras
+		RegisterTransitionTime(DAYZCAMERA_3RD_VEHICLE, DAYZCAMERA_3RD_ERC, 0.7, false);
+
+		//! ironsights camera transitions
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_RAISED, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_02, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO_RAISED, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_02, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_02, true);
+		RegisterTransitionTime(DAYZCAMERA_1ST, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_01, true);
+		
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_02, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_02, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO, DAYZCAMERA_IRONSIGHTS, TIME_CAMERACHANGE_02, true);
+		
+		//! optics camera transitions
+		RegisterTransitionTime(DAYZCAMERA_IRONSIGHTS, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_02, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC_RAISED, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_03, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO_RAISED, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_03, true);
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO_RAISED, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_03, true);
+		
+		RegisterTransitionTime(DAYZCAMERA_1ST, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_02, true); 	//handheld optics only
+		RegisterTransitionTime(DAYZCAMERA_3RD_ERC, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_02, true);	//handheld optics only
+		RegisterTransitionTime(DAYZCAMERA_3RD_CRO, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_02, true);	//handheld optics only
+		RegisterTransitionTime(DAYZCAMERA_3RD_PRO, DAYZCAMERA_OPTICS, TIME_CAMERACHANGE_02, true);	//handheld optics only
+		
+		//Uncon camera transitions
+		RegisterTransitionTime(DAYZCAMERA_1ST_UNCONSCIOUS, DAYZCAMERA_3RD_PRO, 1.0, false);
+		RegisterTransitionTime(DAYZCAMERA_1ST_UNCONSCIOUS, DAYZCAMERA_1ST, 0.1, false);
+		RegisterTransitionTime(DAYZCAMERA_1ST_UNCONSCIOUS, DAYZCAMERA_1ST_VEHICLE, 0.5, false);
+		RegisterTransitionTime(DAYZCAMERA_1ST_UNCONSCIOUS, DAYZCAMERA_3RD_VEHICLE, 1.0, false);
+		
+		//! register function to handle camera changes 
+		pType.RegisterCameraOnChangeFnStatic(DayZPlayerCameras, "OnCameraChange");
+	}
+
+
+	//! static function to set time to table
+	static void 	RegisterTransitionTime(int pFrom, int pTo, float pTime, bool pTwoWay)
+	{
+		int 	key = (pFrom * 65536) + pTo;
+		m_TransitionTimes.Set(key, pTime);
+		if (pTwoWay)
+		{
+			RegisterTransitionTime(pTo, pFrom, pTime, false);	
+		}
+	}
+
+	//! static function to get time from table
+	static float 	GetTransitionTime(int pFrom, int pTo)
+	{
+		int 	key = (pFrom * 65536) + pTo;
+		float 	val;
+
+		if (m_TransitionTimes.Find(key, val))
+		{
+			return val;
+		}
+		else 
+		{
+			return 0.3;
+		}
+	}
+
+
+
+	static float 	OnCameraChange(DayZPlayer pPlayer, int pFrom, int pTo)
+	{
+		float transTime = GetTransitionTime(pFrom, pTo);
+		return transTime;
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCfgBase.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCfgBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..d5b4df66ec127dbfe55c488c8b1ea59a8bf0e26c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCfgBase.c
@@ -0,0 +1,1503 @@
+//-----------------------------------------------------------------------------------------------
+// DayZPlayerTypeCreate - main dayz type config
+//-----------------------------------------------------------------------------------------------
+
+void DayZPlayerTypeCreate(DayZPlayerType pType)
+{
+	DayZPlayerTypeUtils.DayZPlayerTypeCreate(pType);
+}
+
+void DayZPlayerTypeInitMovement(DayZPlayerType pType)
+{
+	DayZPlayerTypeUtils.DayZPlayerTypeInitMovement(pType);
+}
+
+class DayZPlayerTypeUtils
+{
+	static void DayZPlayerTypeCreate(DayZPlayerType pType)
+	{
+		//! register all item types
+		DayZPlayerTypeRegisterItems(pType);
+	
+		//! register all sounds
+		DayZPlayerTypeRegisterSounds(pType);
+		
+		//! register camera creators
+		DayZPlayerCameras.RegisterCameras(pType);
+	 
+		//! other configs 
+		pType.SetLookLimits(-85, 85, -160, 160);	
+		pType.SetAimLimits(-85, 85, -180, 180);		
+		pType.SetCameraShootParams(250, 0.01, 0.866);
+		pType.RegisterHitComponentsForAI();
+	}
+	
+	static void DayZPlayerTypeInitMovement(DayZPlayerType pType)
+	{
+		//! set move settings: 
+		SHumanCommandMoveSettings hmcs = pType.CommandMoveSettingsW();
+	
+		//! run sprint (SHIFT HOLD) filter 
+		hmcs.m_fRunSpringTimeout			= CfgGameplayHandler.GetMovementTimeToSprint();			//!< filter span value		[s]
+		hmcs.m_fRunSpringMaxChange			= 8.0;													//!< filter speed value		[val/s]
+	
+		//! WSAD direction filter 
+		hmcs.m_fDirFilterTimeout			= CfgGameplayHandler.GetMovementTimeToStrafeJog();		//!< direction filter timeout [s]
+		hmcs.m_fDirFilterSprintTimeout 		= CfgGameplayHandler.GetMovementTimeToStrafeSprint();	//!< sprint direction filter timeout [s]
+		hmcs.m_fDirFilterSpeed				= Math.DEG2RAD * 360; 									//!< direction filter max rot speed [rad/s]
+		hmcs.m_fMaxSprintAngle				= Math.DEG2RAD * 45.01;									//!< max sprint angle [rad]
+	
+		hmcs.m_fTurnAngle 					= 45;				//!< this is when char starts tu turn
+		hmcs.m_fTurnEndUpdateNTime			= 0.7;				//!< this is end norm time (turn amount is not updated after this time)
+		hmcs.m_fTurnNextNTime				= 0.9;				//!< this is norm time when new turn from old turn is evaluated again (turn->turn)
+	
+	
+		hmcs.m_fHeadingChangeLimiterIdle 	= 500000; 			//!<
+		hmcs.m_fHeadingChangeLimiterWalk 	= 2000;				//!<
+		hmcs.m_fHeadingChangeLimiterRun		= 1500;				//!<
+		
+		hmcs.m_fLeaningSpeed				= 4.5;				//!<
+	
+		hmcs.m_fWaterLevelSpeedRectrictionLow	= 0.5;			//!< Water level (in meters) - m_iMaxSpeedNormal_WaterLevelLow and m_iMaxSpeedFast_WaterLevelLow are applied when character is deeper
+		hmcs.m_fWaterLevelSpeedRectrictionHigh	= 1.0;			//!< Water level (in meters) - m_iMaxSpeedNormal_WaterLevelHigh and m_iMaxSpeedFast_WaterLevelHigh are applied when character is deeper
+		
+		hmcs.m_iMaxSpeedNormal_WaterLevelLow	= -1;			//!< Max movement speed for m_fWaterLevelSpeedRectrictionLow when character doesn't want to sprint (-1 means no change)
+		hmcs.m_iMaxSpeedFast_WaterLevelLow		= -1;			//!< Max movement speed for m_fWaterLevelSpeedRectrictionLow when character wants to sprint (-1 means no change)
+		hmcs.m_iMaxSpeedNormal_WaterLevelHigh	= 1;			//!< Max movement speed for m_fWaterLevelSpeedRectrictionHigh when character doesn't want to sprint (-1 means no change)
+		hmcs.m_iMaxSpeedFast_WaterLevelHigh		= 2;			//!< Max movement speed for m_fWaterLevelSpeedRectrictionHigh when character wants to sprint (-1 means no change)
+	
+		//--------------------------------------------------------------
+	    //! animation speed settings example
+		// DayZPlayerUtils.DebugOverrideAnimationSpeed("dz/anims/anm/player/moves/rifles/p_rfl_erc_runF_low.anm", 2.0);
+		//DayZPlayerUtils.DebugOverrideAnimationTranslation("dz/anims/anm/player/moves/rifles/p_rfl_erc_runF_low.anm", "0 0 10" );
+		
+		//Melee evades
+		//LEFT
+		//DayZPlayerUtils.DebugOverrideAnimationSpeed("dz/anims/anm/player/moves/unarmed/p_erc_evadeL_ras.anm", 2.0);
+		//DayZPlayerUtils.DebugOverrideAnimationTranslation("dz/anims/anm/player/moves/unarmed/p_erc_evadeL_ras.anm", "0 0 10");
+		
+		//RIGHT
+		//DayZPlayerUtils.DebugOverrideAnimationSpeed("dz/anims/anm/player/moves/unarmed/p_erc_evadeR_ras.anm", 1);
+		//DayZPlayerUtils.DebugOverrideAnimationTranslation("dz/anims/anm/player/moves/unarmed/p_erc_evadeR_ras.anm", "2 0 0");
+		
+		//BACK
+		//DayZPlayerUtils.DebugOverrideAnimationSpeed("dz/anims/anm/player/moves/unarmed/p_erc_evadeB_ras.anm", 2.0);
+		//DayZPlayerUtils.DebugOverrideAnimationTranslation("dz/anims/anm/player/moves/unarmed/p_erc_evadeB_ras.anm", "0 0 10");
+	}
+}
+
+
+//-----------------------------------------------------------------------------------------------
+// ITEMS 
+//-----------------------------------------------------------------------------------------------
+enum ItemBehaviorType
+{
+	EMPTYHANDED,
+	ONEHANDED,
+	TWOHANDED,
+	PISTOLS,
+	FIREARMS,
+	HEAVY,
+	POLEARMS
+};
+
+class DayzPlayerItemBehaviorCfg extends HumanItemBehaviorCfg
+{
+	void DayzPlayerItemBehaviorCfg()
+	{
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ALL;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_ERECT] 			= DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN | DayZPlayerConstants.MOVEMENT_SPRINT;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_CROUCH] 		= DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_SPRINT;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_PRONE] 			= DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDERECT] 	= DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN | DayZPlayerConstants.MOVEMENT_SPRINT;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDCROUCH] 	= DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDPRONE] 	= DayZPlayerConstants.MOVEMENT_IDLE;
+
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_ERECT] 			= DayZPlayerConstants.ROTATION_ENABLE;
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_CROUCH] 			= DayZPlayerConstants.ROTATION_ENABLE;
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_PRONE] 			= DayZPlayerConstants.ROTATION_ENABLE;
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_RAISEDERECT] 	= DayZPlayerConstants.ROTATION_ENABLE;
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_RAISEDCROUCH] 	= DayZPlayerConstants.ROTATION_ENABLE;
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_RAISEDPRONE] 	= DayZPlayerConstants.ROTATION_ENABLE;
+
+		
+		//! per item camera user data to be uninitialized
+		m_iPerItemCameraUserData 		= DayZPlayerCameras.PERITEMUD_INVALID;
+		//! rotational delay to camera direction in move only (filter)
+		m_fMoveHeadingFilterSpan 		= CfgGameplayHandler.GetMovementRotationSpeedJog();
+		m_fMoveHeadingSprintFilterSpan 	= CfgGameplayHandler.GetMovementRotationSpeedSprint();
+		m_fMoveHeadingProneFilterSpan 	= 0.7;
+		m_fMoveHeadingFilterSpeed		= Math.DEG2RAD * 360;	// 720 deg / sec
+
+		m_fMeleeEvadeHeadingFilterSpan	= 0.07;
+		m_fMeleeEvadeHeadingFilterSpeed	= Math.DEG2RAD * 1440;	// 720 deg / sec
+
+		m_bAttackLean = false;
+		m_bJumpAllowed = true;
+	}
+
+	void 	SetIKTwoHanded()
+	{
+		SetIKStance(DayZPlayerConstants.STANCEIDX_ERECT, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_CROUCH, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_PRONE, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDERECT, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDCROUCH, false, false, false);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDPRONE, false, true, true);
+
+		SetIKMelee(DayZPlayerConstants.MELEE_LIGHT, false, true, true);
+		SetIKMelee(DayZPlayerConstants.MELEE_HEAVY, false, true, true);
+	}
+
+	void 	SetIKPoleArms()
+	{
+		SetIKStance(DayZPlayerConstants.STANCEIDX_ERECT, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_CROUCH, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_PRONE, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDERECT, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDCROUCH, false, false, false);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDPRONE, false, true, true);
+		
+		SetIKMelee(DayZPlayerConstants.MELEE_LIGHT, false, false, false);
+		SetIKMelee(DayZPlayerConstants.MELEE_HEAVY, false, false, false);
+	}
+
+	void 	SetPistols()
+	{
+		m_iType = ItemBehaviorType.PISTOLS;
+		
+		SetIKStance(DayZPlayerConstants.STANCEIDX_ERECT, false, true, false);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_CROUCH, false, true, false);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_PRONE, false, true, false);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDERECT, true, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDCROUCH, true, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDPRONE, true, true, true);
+
+		SetIK(DayZPlayerConstants.STANCEIDX_RAISEDERECT, DayZPlayerConstants.MOVEMENTIDX_SPRINT, false, true, false);
+
+		SetIKMelee(DayZPlayerConstants.MELEE_LIGHT, false, true, true);
+		SetIKMelee(DayZPlayerConstants.MELEE_HEAVY, false, true, true);
+	}
+
+	void 	SetFirearms()
+	{
+		m_iType = ItemBehaviorType.FIREARMS;
+		
+		SetIKStance(DayZPlayerConstants.STANCEIDX_ERECT, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_CROUCH, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_PRONE, false, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDERECT, true, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDCROUCH, true, true, true);
+		SetIKStance(DayZPlayerConstants.STANCEIDX_RAISEDPRONE, true, true, true);
+	
+		SetIKMelee(DayZPlayerConstants.MELEE_LIGHT, false, true, true);
+		SetIKMelee(DayZPlayerConstants.MELEE_HEAVY, false, true, true);
+	}
+
+	void	SetEmptyHanded()
+	{
+		m_iType = ItemBehaviorType.EMPTYHANDED;
+		
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDERECT | DayZPlayerConstants.STANCEMASK_RAISEDPRONE;
+		m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_EMPTYHANDED;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN;
+		
+		SetIKAll(false, false, false);
+
+		m_bAttackLean = true;
+	}
+	
+	void	SetTwoHanded()
+	{
+		m_iType = ItemBehaviorType.TWOHANDED;
+
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDERECT | DayZPlayerConstants.STANCEMASK_RAISEDPRONE;
+	  	m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_TWOHANDED;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN;
+
+		SetIKTwoHanded();
+
+		m_bAttackLean = true;
+	}
+
+	void	SetToolsOneHanded()
+	{
+		m_iType = ItemBehaviorType.ONEHANDED;
+
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDERECT | DayZPlayerConstants.STANCEMASK_RAISEDPRONE;
+		m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_ONEHANDED;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN;
+		
+		SetIKAll(false, true, false);
+		
+		m_bAttackLean = true;
+	}
+
+	void	SetRestrained()
+	{
+		m_iType = ItemBehaviorType.EMPTYHANDED;
+		
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE;
+		m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_ONEHANDED;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_ERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_SPRINT;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_CROUCH] = DayZPlayerConstants.MOVEMENT_IDLE  | DayZPlayerConstants.MOVEMENT_WALK;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_PRONE] = DayZPlayerConstants.MOVEMENT_IDLE;
+		
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_PRONE] = DayZPlayerConstants.ROTATION_DISABLE;
+		
+		SetIKAll(false, true, true);
+		
+		m_bAttackLean = false;
+	}
+
+	void	SetSurrender()
+	{
+		m_iType = ItemBehaviorType.EMPTYHANDED;
+		
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE;
+		m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_EMPTYHANDED;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_ERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_CROUCH] = DayZPlayerConstants.MOVEMENT_IDLE;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_PRONE] = DayZPlayerConstants.MOVEMENT_IDLE;
+		
+		m_StanceRotation[DayZPlayerConstants.STANCEIDX_PRONE] = DayZPlayerConstants.ROTATION_DISABLE;
+
+		m_bAttackLean = false;
+	}
+	
+	void	SetHeavyItems()
+	{
+		m_iType = ItemBehaviorType.HEAVY;
+
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT;
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_ERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK;
+		m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_TWOHANDED;
+	  
+		SetIKAll(false, true, true);
+		
+		m_bAttackLean = true;
+		m_bJumpAllowed = false;
+	}
+	
+	void	SetPoleArms()
+	{
+		m_iType = ItemBehaviorType.POLEARMS;
+
+		m_iStanceMask = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDERECT | DayZPlayerConstants.STANCEMASK_RAISEDPRONE;
+	  	m_iPerItemCameraUserData = DayZPlayerCameras.PERITEMUD_TWOHANDED;
+
+		m_StanceMovements[DayZPlayerConstants.STANCEIDX_RAISEDERECT] = DayZPlayerConstants.MOVEMENT_IDLE | DayZPlayerConstants.MOVEMENT_WALK | DayZPlayerConstants.MOVEMENT_RUN;
+
+		SetIKPoleArms();
+
+		m_bAttackLean = true;
+	}
+}
+
+
+class ModItemRegisterCallbacks
+{
+	void RegisterEmptyHanded(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterOneHanded(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterTwoHanded(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterRestrained(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterSurrender(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterHeavy(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterPistol(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterFireArms(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterArcheryItem(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+	
+	void RegisterPoleArms(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+    void RegisterLauncher(DayZPlayerType pType, DayzPlayerItemBehaviorCfg pBehavior);
+
+	void RegisterCustom(DayZPlayerType pType);
+
+	void CustomBoneRemapping(DayZPlayerType pType);
+}
+
+void DayZPlayerTypeRegisterItems(DayZPlayerType pType)
+{
+	GetGame().ProfilerStart("DayZPlayerTypeRegisterItems");
+	
+	ModItemRegisterCallbacks modCallbacks = new ModItemRegisterCallbacks();
+		
+	//! behaviour 
+	DayzPlayerItemBehaviorCfg 	emptyHanded = new DayzPlayerItemBehaviorCfg;
+	emptyHanded.SetEmptyHanded();
+	
+	DayzPlayerItemBehaviorCfg 	toolsOneHanded = new DayzPlayerItemBehaviorCfg;
+	toolsOneHanded.SetToolsOneHanded();
+	
+	DayzPlayerItemBehaviorCfg 	twoHanded = new DayzPlayerItemBehaviorCfg;
+	twoHanded.SetTwoHanded();
+	
+	DayzPlayerItemBehaviorCfg 	restrained = new DayzPlayerItemBehaviorCfg;
+	restrained.SetRestrained();
+	
+	DayzPlayerItemBehaviorCfg 	surrender = new DayzPlayerItemBehaviorCfg;
+	surrender.SetSurrender();
+	
+	DayzPlayerItemBehaviorCfg 	heavyItemBehaviour = new DayzPlayerItemBehaviorCfg;
+	heavyItemBehaviour.SetHeavyItems();
+	
+	DayzPlayerItemBehaviorCfg 	poleArms = new DayzPlayerItemBehaviorCfg;
+	poleArms.SetPoleArms();
+	
+	//! set the default - use default instance set + default behaviour - empty hands
+	pType.SetDefaultItemInHandsProfile("", emptyHanded);
+
+	//! reset previous setup 
+	pType.ResetItemInHandsProfiles();
+	
+	//! custom emptyhanded - really needed?
+	modCallbacks.RegisterEmptyHanded(pType, emptyHanded);
+
+	//! complete root of any item not specified here
+	{
+		pType.AddItemInHandsProfileIK("Inventory_Base", "dz/anims/workspaces/player/player_main/player_main_1h.asi", toolsOneHanded, "dz/anims/anm/player/ik/gear/apple.anm");
+	}
+
+	//! Pistols (RH,LH IK)
+	{
+		DayzPlayerItemBehaviorCfg 	pistolItemBehaviour = new DayzPlayerItemBehaviorCfg;
+
+		pistolItemBehaviour.SetPistols();
+		
+		pType.AddItemInHandsProfileIK("Colt1911_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_1911.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/1911.anm", "dz/anims/anm/player/reloads/1911/w_1911_states.anm");
+		pType.AddItemInHandsProfileIK("CZ75_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_cz75.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/CZ75.anm", "dz/anims/anm/player/reloads/CZ75/w_CZ75_states.anm");
+		pType.AddItemInHandsProfileIK("DartGun",			"dz/anims/workspaces/player/player_main/weapons/player_main_x2dartgun.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/X2.anm");
+		pType.AddItemInHandsProfileIK("Derringer_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_derringer.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/derringer.anm", "dz/anims/anm/player/reloads/Derringer/w_derringer_states.anm");
+		pType.AddItemInHandsProfileIK("Flaregun_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_flaregun.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/flaregun.anm", "dz/anims/anm/player/reloads/Flaregun/w_Flaregun_states.anm");
+		pType.AddItemInHandsProfileIK("FNX45_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_fnp45.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/fnp45.anm", "dz/anims/anm/player/reloads/FNP45/w_fnp45_states.anm");
+		pType.AddItemInHandsProfileIK("Glock19_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_glock.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/Glock19.anm", "dz/anims/anm/player/reloads/Glock/w_Glock19_states.anm");
+		pType.AddItemInHandsProfileIK("LongHorn_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_longhorn.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/longhorn.anm", "dz/anims/anm/player/reloads/longhorn/w_longhorn_states.anm");
+		pType.AddItemInHandsProfileIK("Magnum_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_magnum.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/magnum.anm", "dz/anims/anm/player/reloads/magnum/w_magnum_states.anm");
+		pType.AddItemInHandsProfileIK("MKII_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_rugermk2.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/MK2.anm", "dz/anims/anm/player/reloads/RugerMK2/w_MK2_states.anm");
+		pType.AddItemInHandsProfileIK("pb6p9",				"dz/anims/workspaces/player/player_main/weapons/player_main_pb6p9.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/PB6P9.anm");
+		pType.AddItemInHandsProfileIK("MakarovIJ70_Base",	"dz/anims/workspaces/player/player_main/weapons/player_main_ij70.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/ij70.anm", "dz/anims/anm/player/reloads/IJ70/w_IJ70_states.anm");
+		pType.AddItemInHandsProfileIK("P1_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_p1.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/P1.anm", "dz/anims/anm/player/reloads/p1/w_states_p1.anm");
+		pType.AddItemInHandsProfileIK("Red9_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_mauserred9.asi",	pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/Red9.anm");
+		pType.AddItemInHandsProfileIK("Shockpistol_Base",	"dz/anims/workspaces/player/player_main/weapons/player_main_taser.asi",			pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/Shockpistol.anm");
+		pType.AddItemInHandsProfileIK("Deagle_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_deagle.asi",		pistolItemBehaviour, "dz/anims/anm/player/ik/weapons/Deagle.anm", "dz/anims/anm/player/reloads/Deagle/w_Deagle_states.anm");
+		
+		modCallbacks.RegisterPistol(pType, pistolItemBehaviour);
+	}
+
+	//! Firearms (RH,LH IK)		
+	{
+		DayzPlayerItemBehaviorCfg 	fireArmsItemBehaviour = new DayzPlayerItemBehaviorCfg;
+		
+		fireArmsItemBehaviour.SetFirearms();
+		
+		pType.AddItemInHandsProfileIK("AKS74U",				"dz/anims/workspaces/player/player_main/weapons/player_main_ak74u.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/AKS74U.anm", "dz/anims/anm/player/reloads/AK74U/w_AKS74U_states.anm");
+		pType.AddItemInHandsProfileIK("AK74_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_ak101.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/ak101.anm", "dz/anims/anm/player/reloads/AK101/w_AK101_states.anm");
+		pType.AddItemInHandsProfileIK("AK101_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_ak101.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/ak101.anm", "dz/anims/anm/player/reloads/AK101/w_AK101_states.anm");
+		pType.AddItemInHandsProfileIK("AKM_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_akm.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/akm.anm", "dz/anims/anm/player/reloads/AKM/w_akm_states.anm");
+		pType.AddItemInHandsProfileIK("Aug_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_aug.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/aug.anm", "dz/anims/anm/player/reloads/aug/w_aug_states.anm");
+		pType.AddItemInHandsProfileIK("B95_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_b95.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/b95.anm", "dz/anims/anm/player/reloads/B95/w_B95_states.anm"); 
+		pType.AddItemInHandsProfileIK("CZ61_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_cz61.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/CZ61.anm", "dz/anims/anm/player/reloads/cz61/w_cz61_states.anm");
+		pType.AddItemInHandsProfileIK("CZ527_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_cz527.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/cz527.anm", "dz/anims/anm/player/reloads/cz527/w_CZ527_states.anm");
+		pType.AddItemInHandsProfileIK("CZ550_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_cz550.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/cz550.anm", "dz/anims/anm/player/reloads/cz550/w_CZ550_states.anm");
+		pType.AddItemInHandsProfileIK("FAL_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_fnfal.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/fn_fal.anm",  "dz/anims/anm/player/reloads/FNFal/w_FNFal_states.anm");
+		pType.AddItemInHandsProfileIK("Izh18_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_izh18.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/izh18.anm", "dz/anims/anm/player/reloads/IZH18/w_izh18_states.anm");
+		pType.AddItemInHandsProfileIK("M4A1_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_m4a1.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/m4a1_ik.anm", "dz/anims/anm/player/reloads/M4A1/w_M4A1_states.anm");
+		pType.AddItemInHandsProfileIK("M249_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_m249.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/M249.anm");
+		pType.AddItemInHandsProfileIK("Mosin9130_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_mosin1903.asi",		fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/mosin9130.anm","dz/anims/anm/player/reloads/Mosin_1903/w_mosin1903_states.anm");
+		pType.AddItemInHandsProfileIK("SawedoffMosin9130_Base",	"dz/anims/workspaces/player/player_main/weapons/player_main_mosin1903.asi",	fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/mosin9130.anm","dz/anims/anm/player/reloads/Mosin_1903/w_mosin1903_states.anm");
+		pType.AddItemInHandsProfileIK("MP5K_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_mp5.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/mp5k.anm","dz/anims/anm/player/reloads/mp5/w_mp5k_states.anm");
+		pType.AddItemInHandsProfileIK("PM73Rak_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_pm73.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/pm63rak.anm");
+		pType.AddItemInHandsProfileIK("Repeater_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_repeater.asi",		fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/repeater.anm", "dz/anims/anm/player/reloads/repeater/w_repeater_states.anm");
+		pType.AddItemInHandsProfileIK("Ruger1022_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_ruger1022.asi",		fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/ruger1022.anm", "dz/anims/anm/player/reloads/ruger1022/w_Ruger1022_states.anm");
+		pType.AddItemInHandsProfileIK("SKS_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_sks.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/SKS.anm", "dz/anims/anm/player/reloads/SKS/w_SKS_states.anm");
+		pType.AddItemInHandsProfileIK("SVD_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_svd.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/svd.anm","dz/anims/anm/player/reloads/SVD/w_SVD_states.anm");
+		pType.AddItemInHandsProfileIK("Trumpet_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_trumpet.asi",		fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/trumpet.anm");
+		pType.AddItemInHandsProfileIK("UMP45_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_ump45.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/ump.anm","dz/anims/anm/player/reloads/UMP45/w_UMP45_states.anm");
+		pType.AddItemInHandsProfileIK("VSS",				"dz/anims/workspaces/player/player_main/weapons/player_main_vss.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/VSS.anm","dz/anims/anm/player/reloads/VSS/w_VSS_states.anm");
+		pType.AddItemInHandsProfileIK("Vikhr",				"dz/anims/workspaces/player/player_main/weapons/player_main_Vikhr.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/Vikhr.anm","dz/anims/anm/player/reloads/Vikhr/w_Vikhr_states.anm");
+		pType.AddItemInHandsProfileIK("Winchester70_Base",	"dz/anims/workspaces/player/player_main/weapons/player_main_winchester70.asi",	fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/winchester70.anm", "dz/anims/anm/player/reloads/Winchester70/w_winchester70_states.anm");
+		pType.AddItemInHandsProfileIK("ASVAL",				"dz/anims/workspaces/player/player_main/weapons/player_main_as_val.asi",		fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/VAL.anm","dz/anims/anm/player/reloads/VAL/w_VAL_states.anm");
+		pType.AddItemInHandsProfileIK("Scout_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_Scout.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/Scout.anm", "dz/anims/anm/player/reloads/Scout/w_scout_states.anm");
+		pType.AddItemInHandsProfileIK("M16A2_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_m16a2.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/M16A2_ik.anm", "dz/anims/anm/player/reloads/m16a2/w_m16a2_states.anm");
+		pType.AddItemInHandsProfileIK("Famas_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_famas.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/famas.anm", "dz/anims/anm/player/reloads/famas/w_famas_states.anm");
+		pType.AddItemInHandsProfileIK("PP19_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_PP19.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/bizon.anm", "dz/anims/anm/player/reloads/Bizon/w_bizon_states.anm");
+		pType.AddItemInHandsProfileIK("SSG82_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_ssg82.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/ssg82.anm", "dz/anims/anm/player/reloads/SSG82/w_SSG82_states.anm");
+		pType.AddItemInHandsProfileIK("M14_Base",			"dz/anims/workspaces/player/player_main/weapons/player_main_m14.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/M14_ik.anm","dz/anims/anm/player/reloads/M14/w_M14_states.anm");
+
+		//! Shotguns
+		pType.AddItemInHandsProfileIK("Izh18Shotgun_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_izh18_Spartan.asi",	fireArmsItemBehaviour,	"dz/anims/anm/player/ik/weapons/izh18_Spartan.anm", "dz/anims/anm/player/reloads/IZH18Spartan/w_izh18Spartan_states.anm");
+		pType.AddItemInHandsProfileIK("Izh43Shotgun_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_izh43.asi",			fireArmsItemBehaviour,	"dz/anims/anm/player/ik/weapons/izh43.anm", "dz/anims/anm/player/reloads/IZH43/w_IZH43_states.anm");
+		pType.AddItemInHandsProfileIK("Mp133Shotgun_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_mp133.asi",			fireArmsItemBehaviour,	"dz/anims/anm/player/ik/weapons/mp133.anm","dz/anims/anm/player/reloads/MP133/w_mp133_states.anm");
+		pType.AddItemInHandsProfileIK("Mp133Shotgun_PistolGrip","dz/anims/workspaces/player/player_main/weapons/player_main_mp133grip.asi",		fireArmsItemBehaviour,	"dz/anims/anm/player/ik/weapons/mp133_pistol_grip.anm");
+		pType.AddItemInHandsProfileIK("Saiga_Base",				"dz/anims/workspaces/player/player_main/weapons/player_main_Saiga.asi",			fireArmsItemBehaviour,	"dz/anims/anm/player/ik/weapons/Saiga.anm", "dz/anims/anm/player/reloads/Saiga/w_Saiga_states.anm");
+
+		//! Launchers		
+		pType.AddItemInHandsProfileIK("M79",					"dz/anims/workspaces/player/player_main/weapons/player_main_m79.asi",			fireArmsItemBehaviour, "dz/anims/anm/player/ik/weapons/m79.anm", "dz/anims/anm/player/reloads/m79/w_m79_states.anm");
+
+		modCallbacks.RegisterFireArms(pType, fireArmsItemBehaviour);
+	}
+	
+	//! Archery (RH,LH IK)
+	{
+		DayzPlayerItemBehaviorCfg 	archeryItemBehaviour = new DayzPlayerItemBehaviorCfg;
+		
+		//! Bows
+		pType.AddItemInHandsProfileIK("PVCBow",				"dz/anims/workspaces/player/player_main/player_main_bow.asi",					archeryItemBehaviour,	"dz/anims/anm/player/ik/weapons/bow_erc_IK.anm");
+		pType.AddItemInHandsProfileIK("QuickieBow",			"dz/anims/workspaces/player/player_main/weapons/player_main_bow_quicky.asi",	archeryItemBehaviour, 	"dz/anims/anm/player/ik/weapons/bow_erc_IK.anm");
+		pType.AddItemInHandsProfileIK("RecurveBow",			"dz/anims/workspaces/player/player_main/weapons/player_main_bow_recurve.asi",	archeryItemBehaviour,	"dz/anims/anm/player/ik/weapons/bow_erc_recurve_IK.anm");
+		pType.AddItemInHandsProfileIK("Crossbow_Base",		"dz/anims/workspaces/player/player_main/weapons/player_main_crossbow.asi",		fireArmsItemBehaviour,	"dz/anims/anm/player/ik/weapons/crossbow.anm", "dz/anims/anm/player/reloads/Crossbow/w_crossbow_states.anm");
+
+		//! Arrows
+		pType.AddItemInHandsProfileIK("Ammo_ArrowComposite",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/gear/arrow_hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_ArrowBolt",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/gear/arrow_bolt.anm");
+		pType.AddItemInHandsProfileIK("Ammo_ArrowBoned",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/gear/arrow_hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_ArrowPrimitive",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/gear/arrow_hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_SharpStick",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/gear/arrow_hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_HuntingBolt",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/ammunition/Bolt_Hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_ImprovisedBolt_1",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/ammunition/Bolt_Hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_ImprovisedBolt_2",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/ammunition/Bolt_Hunting.anm");
+		pType.AddItemInHandsProfileIK("Ammo_CupidsBolt",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,		"dz/anims/anm/player/ik/ammunition/Bolt_Hunting.anm");
+		
+		//! Arrows
+		pType.AddItemInHandsProfileIK("Mag_Arrows_Quiver",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/9mm_25rnd_box.anm");
+		pType.AddItemInHandsProfileIK("Mag_Bolts_Quiver",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",	toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/9mm_25rnd_box.anm");
+
+		modCallbacks.RegisterArcheryItem(pType, archeryItemBehaviour);
+	}
+	
+	//! Launchers
+	{
+		DayzPlayerItemBehaviorCfg 	launcherItemBehaviour = new DayzPlayerItemBehaviorCfg;
+
+		//!pType.AddItemInHandsProfile("GP25Base", "dz/anims/workspaces/player/player_main/weapons/player_main_m72law.asi", launcherItemBehaviour);	
+		//!pType.AddItemInHandsProfile("LAWBase", "dz/anims/workspaces/player/player_main/weapons/player_main_m72law.asi", launcherItemBehaviour);	
+		//!pType.AddItemInHandsProfile("M203Base", "dz/anims/workspaces/player/player_main/weapons/player_main_m72law.asi", launcherItemBehaviour);
+		//!pType.AddItemInHandsProfile("RPG7Base", "dz/anims/workspaces/player/player_main/weapons/player_main_m72law.asi", launcherItemBehaviour);
+		
+		modCallbacks.RegisterLauncher(pType, launcherItemBehaviour);
+	}
+
+	//! Ammunition
+	{
+		pType.AddItemInHandsProfileIK("Ammunition_Base",			"dz/anims/workspaces/player/player_main/player_main_1h.asi", toolsOneHanded,					"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		
+		
+		//! Boxes
+		pType.AddItemInHandsProfileIK("AmmoBox_9x19_25rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/9mm_25rnd_box.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_00buck_10rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/00Buck_10RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_762x39_20Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/762x39_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_762x54_20Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/762_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_22_50Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/22_50RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_556x45_20Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/556x20_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_357_20Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/357_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_545x39_20Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/545x39_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_380_35rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/380auto_35RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_45ACP_25rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/45acp_25rnd_box.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_308Win_20Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/308Win_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_9x39_20Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/9x39_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_9x39AP_20Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,		 	"dz/anims/anm/player/ik/ammunition/9x39_20RoundBox.anm");
+
+		// New ammobox classes
+		pType.AddItemInHandsProfileIK("AmmoBox_556x45Tracer_20Rnd",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/556x20_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_308WinTracer_20Rnd",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/308Win_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_762x54Tracer_20Rnd",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/762_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_762x39Tracer_20Rnd",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/762x39_20RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_12gaSlug_10Rnd",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/00Buck_10RoundBox.anm");
+		pType.AddItemInHandsProfileIK("AmmoBox_545x39Tracer_20Rnd",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/545x39_20RoundBox.anm");
+
+		//! Loose Rounds
+		pType.AddItemInHandsProfileIK("Ammo_9x19",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9mm_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_357",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/357_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_22",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/22_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_380",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9mm_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_45ACP",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9mm_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_762x39",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/762x39_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_762x54",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/762x54_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_556x45",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/556x45_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_Flare",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/Flare_SingleRound.anm");
+		pType.AddItemInHandsProfileIK("Ammo_545x39",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/545x39_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_9x39",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9x39_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_9x39AP",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",		toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9x39_LooseRounds.anm");
+		
+		// New ammo classes
+		pType.AddItemInHandsProfileIK("Ammo_308Win",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9x39_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_308WinTracer",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/9x39_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_556x45Tracer",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/556x45_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_762x54Tracer",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/762x54_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_762x39Tracer",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/762x39_LooseRounds.anm");
+		pType.AddItemInHandsProfileIK("Ammo_545x39Tracer",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/545x39_LooseRounds.anm");
+		
+		pType.AddItemInHandsProfileIK("Ammo_12gaPellets",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/12ga_00buck.anm");
+		pType.AddItemInHandsProfileIK("Ammo_12gaSlug",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded, 		"dz/anims/anm/player/ik/ammunition/12ga_00buck.anm");
+		
+		pType.AddItemInHandsProfileIK("Ammo_40mm_Base",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded,			"dz/anims/anm/player/ik/ammunition/40mm_Grenade.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Ammo_LAW_HE",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Ammo_LAW_HE",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",				toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+	}
+
+	//! Attachments
+	{	
+		//! light
+		pType.AddItemInHandsProfileIK("UniversalLight",				"dz/anims/workspaces/player/player_main/props/player_main_1h_flashlight.asi",	toolsOneHanded,			"dz/anims/anm/player/ik/attachments/light/universallight.anm");
+		pType.AddItemInHandsProfileIK("TLRLight",					"dz/anims/workspaces/player/player_main/props/player_main_1h_flashlight.asi",	toolsOneHanded,			"dz/anims/anm/player/ik/attachments/light/tlrlight.anm");
+	
+		//! magazine
+		pType.AddItemInHandsProfileIK("Magazine_Base",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm");
+		pType.AddItemInHandsProfileIK("Mag_IJ70_8Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ij70.anm");
+		pType.AddItemInHandsProfileIK("Mag_FNX45_15Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_fnp45.anm");
+		pType.AddItemInHandsProfileIK("Mag_MP5_15Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_mp5_15rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_MP5_30Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_mp5_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_MKII_10Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_mk2.anm");
+		pType.AddItemInHandsProfileIK("Mag_AKM_Drum75Rnd",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_akm_drum.anm");
+		pType.AddItemInHandsProfileIK("Mag_CLIP762x39_10Rnd",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/clip_762x39_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CLIP762x54_5Rnd",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/clip_762x54_5Rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CLIP9x19_10Rnd",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/clip_9x19_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CZ75_15Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_CZ75.anm");
+		pType.AddItemInHandsProfileIK("Mag_P1_8Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_p1.anm");
+		pType.AddItemInHandsProfileIK("Mag_PM73_15Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_pm73_15rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_PM73_25Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_pm73_15rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_1911_7Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_1911.anm");
+		pType.AddItemInHandsProfileIK("Mag_762x54Snaploader_2Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/snaploader_762.anm");
+		pType.AddItemInHandsProfileIK("Mag_308WinSnaploader_2Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/snaploader_762.anm");
+		pType.AddItemInHandsProfileIK("Mag_12gaSnaploader_2Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/snaploader.anm");
+		pType.AddItemInHandsProfileIK("Mag_357Speedloader_6Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/357_speedloader.anm");
+		pType.AddItemInHandsProfileIK("Mag_SVD_10Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_svd.anm");
+		pType.AddItemInHandsProfileIK("Mag_UMP_25Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ump45.anm");
+		pType.AddItemInHandsProfileIK("Mag_CZ61_20Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz61_20rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CZ527_5rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz527.anm");
+		pType.AddItemInHandsProfileIK("Mag_AKM_30Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_akm_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_AKM_Palm30Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_akm_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_STANAG_30Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_stanag30.anm");
+		pType.AddItemInHandsProfileIK("Mag_STANAGCoupled_30Rnd",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_stanag30_coupled.anm");
+		pType.AddItemInHandsProfileIK("Mag_AK74_30Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_akm_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_AK101_30Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_akm_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CMAG_10Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cmag_10rnd.anm");
+		
+		pType.AddItemInHandsProfileIK("Mag_CMAG_20Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cmag_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CMAG_30Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cmag_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CMAG_40Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cmag_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Ruger1022_10Rnd",				"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ruger1022_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Ruger1022_15Rnd",				"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ruger1022_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Ruger1022_30Rnd",				"dz/anims/workspaces/player/player_main/props/player_main_mp5k_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ruger1022_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_FAL_20Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_fal_20rnd.anm");
+
+		pType.AddItemInHandsProfileIK("Mag_VSS_10Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_vss_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Glock_15Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_glock19_15rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Saiga_5Rnd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_saiga_5rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Saiga_8Rnd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_saiga_8rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_Saiga_Drum20Rnd",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_saiga_drum.anm");
+		pType.AddItemInHandsProfileIK("Mag_Deagle_9rnd",					"dz/anims/workspaces/player/player_main/props/player_main_fnp45_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_fnp45.anm");
+		pType.AddItemInHandsProfileIK("Mag_VAL_20Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_vss_10rnd.anm"); //todo placeholder
+		pType.AddItemInHandsProfileIK("Mag_Vikhr_30Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_vss_10rnd.anm"); //todo placeholder
+		pType.AddItemInHandsProfileIK("Mag_Scout_5Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz527.anm");
+		pType.AddItemInHandsProfileIK("Mag_STANAG_60Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz527.anm");
+		pType.AddItemInHandsProfileIK("Mag_AK74_45Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz527.anm");
+		pType.AddItemInHandsProfileIK("Mag_FAMAS_25Rnd",					"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz527.anm");
+		pType.AddItemInHandsProfileIK("Mag_Aug_30Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cmag_10rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_PP19_64Rnd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ruger1022_30rnd.anm");
+		pType.AddItemInHandsProfileIK("Mag_CZ550_4rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz550.anm");
+		pType.AddItemInHandsProfileIK("Mag_CZ550_10rnd",					"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_cz550.anm");
+		pType.AddItemInHandsProfileIK("Mag_SSG82_5rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_ssg82.anm");
+		pType.AddItemInHandsProfileIK("Mag_M14_10Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_svd.anm");
+		pType.AddItemInHandsProfileIK("Mag_M14_20Rnd",						"dz/anims/workspaces/player/player_main/props/player_main_STANAG_mag.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/magazines/magazine_svd.anm");
+		
+		//! muzzle
+		pType.AddItemInHandsProfileIK("AK_Bayonet",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/bayonet_ak.anm");
+		pType.AddItemInHandsProfileIK("M9A1_Bayonet",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/combatknife.anm");
+		pType.AddItemInHandsProfileIK("Mosin_Bayonet",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/bayonet_mosin.anm");
+		pType.AddItemInHandsProfileIK("SKS_Bayonet",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/bayonet_sks.anm");
+		pType.AddItemInHandsProfileIK("Mosin_Compensator",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/muzzle/compensator_mosin.anm");
+		pType.AddItemInHandsProfileIK("MP5_Compensator",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/muzzle/compensator_mp5k.anm");
+		pType.AddItemInHandsProfileIK("ImprovisedSuppressor",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/muzzle/suppressor_bottle.anm");
+		pType.AddItemInHandsProfileIK("M4_Suppressor",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/muzzle/suppressor_556.anm");
+		pType.AddItemInHandsProfileIK("AK_Suppressor",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/muzzle/suppressor_545.anm");
+		pType.AddItemInHandsProfileIK("PistolSuppressor",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/attachments/muzzle/suppressor_45acp.anm");
+		pType.AddItemInHandsProfileIK("Groza_Barrel_Short",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured	
+		pType.AddItemInHandsProfileIK("Groza_Barrel_Grip",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Groza_Barrel_Suppressor",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",					toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+
+		//! optic
+		pType.AddItemInHandsProfileIK("M4_CarryHandleOptic",				"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_m4_carryhandle.anm");
+		pType.AddItemInHandsProfileIK("BUISOptic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_buis.anm");
+		pType.AddItemInHandsProfileIK("M68Optic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_m68_cco.anm");
+		pType.AddItemInHandsProfileIK("FNP45_MRDSOptic",					"dz/anims/workspaces/player/player_main/props/player_main_1h_scope_kobra.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_fnp45_mrd.anm");
+		pType.AddItemInHandsProfileIK("ACOGOptic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_acog.anm");
+		pType.AddItemInHandsProfileIK("PUScopeOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_puscope.anm");
+		pType.AddItemInHandsProfileIK("LongrangeOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_longrange.anm");
+		pType.AddItemInHandsProfileIK("HuntingOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_hunting_scope_12x.anm");
+		pType.AddItemInHandsProfileIK("PSO1Optic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_pso1.anm");
+		pType.AddItemInHandsProfileIK("PSO11Optic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_pso1.anm");
+		pType.AddItemInHandsProfileIK("M4_T3NRDSOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_t3n_rds.anm");
+		pType.AddItemInHandsProfileIK("PistolOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_pistol.anm");
+		pType.AddItemInHandsProfileIK("KashtanOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_kashtan.anm");
+		pType.AddItemInHandsProfileIK("Crossbow_RedpointOptic",				"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_red_point.anm");
+		pType.AddItemInHandsProfileIK("ReflexOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_reflex.anm");
+		pType.AddItemInHandsProfileIK("GrozaOptic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_ots14.anm");
+		pType.AddItemInHandsProfileIK("KobraOptic",							"dz/anims/workspaces/player/player_main/props/player_main_1h_scope_kobra.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_kobra.anm");
+		pType.AddItemInHandsProfileIK("KazuarOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_1PN51.anm"); 
+		pType.AddItemInHandsProfileIK("ACOGOptic_6x",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/attachments/optic/optic_acog.anm");
+		pType.AddItemInHandsProfileIK("StarlightOptic",						"dz/anims/workspaces/player/player_main/props/player_main_1h_scope.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/optic_starlight.anm");
+		
+		//! support		
+		pType.AddItemInHandsProfileIK("M4_OEBttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_m4_oe.anm");
+		pType.AddItemInHandsProfileIK("M4_MPBttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_m4_mp.anm");
+		pType.AddItemInHandsProfileIK("M4_CQBBttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_m4_cqb.anm");
+		pType.AddItemInHandsProfileIK("M4_PlasticHndgrd",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_m4_plastic.anm");
+		pType.AddItemInHandsProfileIK("M4_RISHndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_m4_ris.anm");
+		pType.AddItemInHandsProfileIK("M4_MPHndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_m4_mp.anm");
+		pType.AddItemInHandsProfileIK("AK_WoodBttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_ak_wood.anm");
+		pType.AddItemInHandsProfileIK("AK_FoldingBttstck",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_ak_folding.anm");
+		pType.AddItemInHandsProfileIK("AK_PlasticBttstck",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_ak_plastic.anm");
+		pType.AddItemInHandsProfileIK("AK_WoodHndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_ak_wood.anm");
+		pType.AddItemInHandsProfileIK("AK_RailHndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_ak_rail.anm");
+		pType.AddItemInHandsProfileIK("AK_PlasticHndgrd",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_ak_plastic.anm");
+		pType.AddItemInHandsProfileIK("AK74_WoodBttstck",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_ak_wood.anm");
+		pType.AddItemInHandsProfileIK("AK74_Hndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_ak_wood.anm");
+		pType.AddItemInHandsProfileIK("AKS74U_Bttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_aks.anm");
+		pType.AddItemInHandsProfileIK("MP5k_StockBttstck",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_mp5_stock.anm");
+		pType.AddItemInHandsProfileIK("MP5_PlasticHndgrd",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_mp5k_plastic.anm");
+		pType.AddItemInHandsProfileIK("MP5_RailHndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_mp5k_rail.anm");
+		pType.AddItemInHandsProfileIK("Red9Bttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_ak_folding.anm");
+		pType.AddItemInHandsProfileIK("Fal_OeBttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_fal_oe.anm");
+		pType.AddItemInHandsProfileIK("Fal_FoldingBttstck",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_fal_folding.anm");
+		pType.AddItemInHandsProfileIK("Saiga_Bttstck",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/buttstock_saiga_folding.anm");
+		pType.AddItemInHandsProfileIK("M249_Hndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_m249.anm");
+		pType.AddItemInHandsProfileIK("M249_RisHndgrd",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/handguard_m249_ris.anm");
+		pType.AddItemInHandsProfileIK("M249_Bipod",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/bipod_m249.anm");
+		pType.AddItemInHandsProfileIK("AtlasBipod",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/bipod_atlas.anm");
+		pType.AddItemInHandsProfileIK("GhillieAtt_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/attachments/support/ghillie_wrap.anm");
+		pType.AddItemInHandsProfileIK("Groza_LowerReceiver",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/gear/banana.anm");
+		pType.AddItemInHandsProfileIK("GrozaGL_LowerReceiver",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/gear/banana.anm");
+	}
+	
+	//! Explosives
+	{
+		pType.AddItemInHandsProfileIK("RGD5Grenade",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/explosives/rgd5.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("M67Grenade",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/explosives/grenade.anm");
+		pType.AddItemInHandsProfileIK("M18SmokeGrenade_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/explosives/smokegrenade.anm");
+		pType.AddItemInHandsProfileIK("Grenade_Base",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured	
+		pType.AddItemInHandsProfileIK("FlashGrenade",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/explosives/flashbang.anm");
+		pType.AddItemInHandsProfileIK("RDG2SmokeGrenade_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/explosives/rdg2.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Grenade_ChemGas",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/explosives/POX_grenade.anm");
+		pType.AddItemInHandsProfileIK("Plastic_Explosive",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/explosives/PlasticExplosive.anm");
+		pType.AddItemInHandsProfileIK("ClaymoreMine",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/explosives/Claymore.anm");
+
+		pType.AddItemInHandsProfileIK("ImprovisedExplosive",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/explosives/ImprovisedExplosive.anm");
+	}
+
+	//! Tools
+	{
+		pType.AddItemInHandsProfileIK("Flashlight",							"dz/anims/workspaces/player/player_main/props/player_main_1h_flashlight.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/flashlight.anm");
+		pType.AddItemInHandsProfileIK("Pen_ColorBase",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/pen.anm");
+		pType.AddItemInHandsProfileIK("CanOpener",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/CanOpener.anm");
+		pType.AddItemInHandsProfileIK("Heatpack",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/Heatpack.anm");
+		pType.AddItemInHandsProfileIK("MessTin",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/mess_tin.anm");
+	    pType.AddItemInHandsProfileIK("Pliers",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/pliers.anm");
+		pType.AddItemInHandsProfileIK("Lockpick",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/lockpick.anm");
+		pType.AddItemInHandsProfileIK("WeaponCleaningKit",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/cleaning_kit_wood.anm");
+		pType.AddItemInHandsProfileIK("SewingKit",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/sewing_kit.anm");
+		pType.AddItemInHandsProfileIK("LeatherSewingKit",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/leather_sewing_kit.anm");
+		pType.AddItemInHandsProfileIK("Handcuffs",							"dz/anims/workspaces/player/player_main/props/player_main_1h_handcuffs.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/handcuffs.anm");
+		pType.AddItemInHandsProfileIK("HandcuffKeys",						"dz/anims/workspaces/player/player_main/props/player_main_1h_keys.asi",				toolsOneHanded,			"dz/anims/anm/player/ik/gear/handcuff_keys.anm");
+		pType.AddItemInHandsProfileIK("Cassette",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/cassette.anm");
+		pType.AddItemInHandsProfileIK("FieldShovel",						"dz/anims/workspaces/player/player_main/props/player_main_1h_handshovel.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/CSLA_Field_Shovel.anm");
+		pType.AddItemInHandsProfileIK("Crowbar",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/crowbar.anm");
+		pType.AddItemInHandsProfileIK("Hammer",								"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/hammer_ik.anm");
+		pType.AddItemInHandsProfileIK("MeatTenderizer",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/meat_tenderizer.anm");
+		pType.AddItemInHandsProfileIK("Wrench",								"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/wrench.anm");
+		pType.AddItemInHandsProfileIK("LugWrench",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/Lug_wrench.anm");
+		pType.AddItemInHandsProfileIK("Pipe",								"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/metal_pipe.anm");
+		pType.AddItemInHandsProfileIK("Screwdriver",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/screwdriver.anm");
+		pType.AddItemInHandsProfileIK("Sickle",								"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/sickle.anm");
+		pType.AddItemInHandsProfileIK("Hacksaw",							"dz/anims/workspaces/player/player_main/props/player_main_1h_hacksaw.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/hacksaw.anm");
+		pType.AddItemInHandsProfileIK("KitchenKnife",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/kitchenknife.anm");
+		pType.AddItemInHandsProfileIK("HuntingKnife",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/kitchenknife.anm"); 
+		pType.AddItemInHandsProfileIK("CombatKnife",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/combatknife.anm"); 
+		pType.AddItemInHandsProfileIK("SteakKnife",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/steak_knife.anm");
+		pType.AddItemInHandsProfileIK("HayHook",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/hay_hook.anm");
+		pType.AddItemInHandsProfileIK("StoneKnife",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/stone_knife.anm");
+		pType.AddItemInHandsProfileIK("BoneKnife",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/steak_knife.anm");
+		pType.AddItemInHandsProfileIK("Iceaxe",								"dz/anims/workspaces/player/player_main/props/player_main_1h_iceaxe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/Ice_Axe.anm"); // wrong pose
+		pType.AddItemInHandsProfileIK("Hatchet",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/Hatchet.anm"); 
+		pType.AddItemInHandsProfileIK("Machete",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/machete.anm"); 
+		pType.AddItemInHandsProfileIK("BrassKnuckles_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/brassknuckles.anm");
+		pType.AddItemInHandsProfileIK("TelescopicBaton",					"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/TelescopicBaton.anm");
+		pType.AddItemInHandsProfileIK("PoliceBaton",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/TelescopicBaton.anm");
+		pType.AddItemInHandsProfileIK("CattleProd",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/banana.anm"); //Needs Config
+		pType.AddItemInHandsProfileIK("StunBaton",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/TelescopicBaton.anm"); //Needs Config
+		pType.AddItemInHandsProfileIK("Cleaver",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/kitchenknife.anm");
+		pType.AddItemInHandsProfileIK("FishingRod",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/fishingrod.anm");
+		pType.AddItemInHandsProfileIK("ImprovisedFishingRod",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/ImprovisedFishingRod.anm");
+		pType.AddItemInHandsProfileIK("ObsoleteFishingRod",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_light.asi",			twoHanded,				"dz/anims/anm/player/ik/gear/ImprovisedFishingRod.anm");
+		pType.AddItemInHandsProfileIK("Mace",								"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/flanged_mace.anm");
+		pType.AddItemInHandsProfileIK("TireRepairKit",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/TireRepairKit.anm");
+		pType.AddItemInHandsProfileIK("HandSaw",							"dz/anims/workspaces/player/player_main/props/player_main_1h_hacksaw.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/handsaw.anm");
+		pType.AddItemInHandsProfileIK("ElectronicRepairKit",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/electronic_repair_kit.anm");
+		pType.AddItemInHandsProfileIK("EpoxyPutty",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/Epoxy_Putty.anm");
+		pType.AddItemInHandsProfileIK("KukriKnife",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/kukriknife.anm");
+		pType.AddItemInHandsProfileIK("FangeKnife",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_knife.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/fangeknife.anm");
+		pType.AddItemInHandsProfileIK("CrudeMachete",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/machete.anm");
+		pType.AddItemInHandsProfileIK("OrientalMachete",					"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,			"dz/anims/anm/player/ik/gear/machete.anm");
+		pType.AddItemInHandsProfileIK("AlarmClock_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/Clock.anm");
+		pType.AddItemInHandsProfileIK("KitchenTimer",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/KitchenTimer.anm");
+		pType.AddItemInHandsProfileIK("RemoteDetonator",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/Detonator.anm");
+		pType.AddItemInHandsProfileIK("RemoteDetonatorTrigger",				"dz/anims/workspaces/player/player_main/props/player_main_1h_detonator.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/DetonatorTrigger.anm");
+		pType.AddItemInHandsProfileIK("RemoteDetonatorReceiver",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/DetonatorReceiver.anm");
+		pType.AddItemInHandsProfileIK("Blowtorch",							"dz/anims/workspaces/player/player_main/props/player_main_1h_blowtorch.asi",		toolsOneHanded,			"dz/anims/anm/player/ik/gear/BlowTorch.anm");
+		pType.AddItemInHandsProfileIK("Whetstone",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,			"dz/anims/anm/player/ik/gear/WoodenStick.anm");
+		
+		//! Tools two handed
+		pType.AddItemInHandsProfileIK("PipeWrench",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_pipewrench.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/pipewrench.anm");
+		pType.AddItemInHandsProfileIK("Shovel",								"dz/anims/workspaces/player/player_main/weapons/player_main_2h_shovel.asi",			twoHanded,				"dz/anims/anm/player/ik/two_handed/Shovel.anm");
+		pType.AddItemInHandsProfileIK("FarmingHoe",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_farminghoe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/farming_hoe.anm");
+		pType.AddItemInHandsProfileIK("SledgeHammer",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_sledgehammer.asi",	twoHanded,				"dz/anims/anm/player/ik/two_handed/sledge_hammer.anm");
+		pType.AddItemInHandsProfileIK("Broom",								"dz/anims/workspaces/player/player_main/weapons/player_main_2h_fireaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/broom.anm");
+		pType.AddItemInHandsProfileIK("Broom_Birch",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_fireaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/broom.anm");
+		pType.AddItemInHandsProfileIK("Paddle",								"dz/anims/workspaces/player/player_main/weapons/player_main_2h_fireaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/paddle.anm"); 
+		pType.AddItemInHandsProfileIK("FirefighterAxe",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_fireaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/FirefighterAxe.anm");
+		pType.AddItemInHandsProfileIK("WoodAxe",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_woodaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/woodaxe.anm");
+		pType.AddItemInHandsProfileIK("Pitchfork",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_spear.asi",			poleArms,				"dz/anims/anm/player/ik/two_handed/pitchfork.anm");		
+		pType.AddItemInHandsProfileIK("Pickaxe",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_pickaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/pickaxe.anm");
+		pType.AddItemInHandsProfileIK("Sword",								"dz/anims/workspaces/player/player_main/weapons/player_main_2h_bat.asi",			twoHanded,				"dz/anims/anm/player/ik/two_handed/medieval_sword.anm");
+		pType.AddItemInHandsProfileIK("BaseballBat",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_bat.asi",			twoHanded,				"dz/anims/anm/player/ik/two_handed/baseballbat.anm");	
+		pType.AddItemInHandsProfileIK("NailedBaseballBat",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_bat.asi",			twoHanded,				"dz/anims/anm/player/ik/two_handed/baseballbat.anm");	
+		pType.AddItemInHandsProfileIK("BarbedBaseballBat",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_bat.asi",			twoHanded,				"dz/anims/anm/player/ik/two_handed/baseballbat.anm");		
+		pType.AddItemInHandsProfileIK("HockeyStick",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_fireaxe.asi",		twoHanded,				"dz/anims/anm/player/ik/two_handed/hockey_stick.anm");	
+		pType.AddItemInHandsProfileIK("Chainsaw",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/two_handed/chainsaw.anm"); 
+		pType.AddItemInHandsProfileIK("FireExtinguisher",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,				"dz/anims/anm/player/ik/two_handed/fire_extinguisher.anm");	
+		pType.AddItemInHandsProfileIK("FireworksLauncher",					"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/explosives/FireworksLauncher.anm"); 
+	}
+
+	//! Camping
+	{
+		//! Camping 1handed
+		pType.AddItemInHandsProfileIK("BarbedWire",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/gear/barbed_wire.anm");
+		pType.AddItemInHandsProfileIK("BatteryCharger",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/gear/battery_charger.anm");
+		pType.AddItemInHandsProfileIK("XmasLights",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/gear/christmas_lights.anm");
+		pType.AddItemInHandsProfileIK("FenceKit",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/gear/fence_kit_folded.anm");
+		pType.AddItemInHandsProfileIK("CombinationLock",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/camping/combinationlock.anm");
+		pType.AddItemInHandsProfileIK("Flag_Base",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/camping/flag.anm");
+		pType.AddItemInHandsProfileIK("Fabric",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/camping/fabric.anm");
+		
+		//! Camping 2handed
+		pType.AddItemInHandsProfileIK("CableReel",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/two_handed/cable_reel.anm");
+		pType.AddItemInHandsProfileIK("Spotlight",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/two_handed/spotlight.anm");
+		pType.AddItemInHandsProfileIK("MediumTent",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded, 				"dz/anims/anm/player/ik/two_handed/tent_medium_packed.anm");
+		pType.AddItemInHandsProfileIK("CamoNet",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/two_handed/camo_net.anm");
+	
+		//! Camping heavy	
+		
+		pType.AddItemInHandsProfileIK("LargeTentBackPack",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/tent_large.anm");
+		pType.AddItemInHandsProfileIK("Barrel_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/55galDrum.anm");
+		pType.AddItemInHandsProfileIK("BarrelHoles_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/55galDrum.anm");
+		pType.AddItemInHandsProfileIK("CarTent",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/car_tent_packed.anm");
+		pType.AddItemInHandsProfileIK("LargeTent",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/tent_large.anm");
+		pType.AddItemInHandsProfileIK("PartyTent",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/tent_party_packed.anm");
+	//pType.AddItemInHandsProfileIK("CamoNet",								"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/camo_net.anm");
+	//pType.AddItemInHandsProfileIK("CamoNetShelter",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("PowerGenerator",						"dz/anims/workspaces/player/player_main/props/player_main_heavy_generator.asi",		heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/generator.anm");
+		pType.AddItemInHandsProfileIK("HescoBox",							"dz/anims/workspaces/player/player_main/props/player_main_heavy_generator.asi",		heavyItemBehaviour, 	"dz/anims/anm/player/ik/heavy/hesco_box.anm");
+		pType.AddItemInHandsProfileIK("Fence",								"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour, 	"dz/anims/anm/player/ik/heavy/fence.anm");
+		pType.AddItemInHandsProfileIK("WoodenLog",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour, 	"dz/anims/anm/player/ik/heavy/wooden_log.anm");
+		pType.AddItemInHandsProfileIK("MetalPlate",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/metal_sheet.anm");
+		pType.AddItemInHandsProfileIK("SeaChest",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/sea_chest.anm");
+		pType.AddItemInHandsProfileIK("WoodenCrate",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/heavy/wooden_crate.anm");
+	}	
+
+	//! Vehicles
+	{
+		//! Vehicles 1handed
+		pType.AddItemInHandsProfileIK("SparkPlug",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/vehicles/sparkplug.anm");
+		pType.AddItemInHandsProfileIK("GlowPlug",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/vehicles/sparkplug.anm");
+		pType.AddItemInHandsProfileIK("HeadlightH7_Box",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/vehicles/HeadlightH7_Box.anm");		
+		pType.AddItemInHandsProfileIK("HeadlightH7",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 		"dz/anims/anm/player/ik/vehicles/HeadlightH7.anm");		
+		
+		//! Vehicles 2handed 
+		pType.AddItemInHandsProfileIK("CarBattery",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/two_handed/BatteryCar.anm"); 
+		pType.AddItemInHandsProfileIK("TruckBattery",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/vehicles/BatteryTruck.anm"); 
+		pType.AddItemInHandsProfileIK("CarRadiator",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				"dz/anims/anm/player/ik/vehicles/radiator_car.anm"); 
+		
+		//! Vehicles Heavy
+		pType.AddItemInHandsProfileIK("TruckRadiator",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/radiator_truck.anm"); 
+	
+		//! Vehicles heavy	
+		//! Hatchback	
+		pType.AddItemInHandsProfileIK("HatchbackWheel",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback/hatchback_wheel.anm");
+		pType.AddItemInHandsProfileIK("HatchbackWheel_Ruined",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback/hatchback_wheeldestroyed.anm");
+		pType.AddItemInHandsProfileIK("HatchbackDoors_Driver",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback/hatchback_driverdoor.anm");
+		pType.AddItemInHandsProfileIK("HatchbackDoors_CoDriver",			"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback/hatchback_codriverdoor.anm");
+		pType.AddItemInHandsProfileIK("HatchbackHood",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback/hatchback_hood.anm");
+		pType.AddItemInHandsProfileIK("HatchbackTrunk",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback/hatchback_trunk.anm");
+
+		//! v3s	
+		pType.AddItemInHandsProfileIK("Truck_01_Wheel",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_Wheel.anm");
+		pType.AddItemInHandsProfileIK("Truck_01_Wheel_Ruined",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_Wheel_Ruined.anm");
+		pType.AddItemInHandsProfileIK("Truck_01_WheelDouble",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_WheelDouble.anm");
+		pType.AddItemInHandsProfileIK("Truck_01_WheelDouble_Ruined",		"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_WheelDouble_Ruined.anm");
+		pType.AddItemInHandsProfileIK("Truck_01_Door_1_1",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_Door_1_1.anm");
+		pType.AddItemInHandsProfileIK("Truck_01_Door_2_1",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_Door_2_1.anm");
+		pType.AddItemInHandsProfileIK("Truck_01_Hood",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/v3s/Truck_01_hood.anm");
+
+		//! sedan	
+		pType.AddItemInHandsProfileIK("CivSedanWheel",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_wheel.anm");
+		pType.AddItemInHandsProfileIK("CivSedanWheel_Ruined",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_wheeldestroyed.anm");
+		pType.AddItemInHandsProfileIK("CivSedanDoors_Driver",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_driverdoor.anm");
+		pType.AddItemInHandsProfileIK("CivSedanDoors_CoDriver",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_codriverdoor.anm");
+		pType.AddItemInHandsProfileIK("CivSedanDoors_BackLeft",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_passengerL_door.anm");
+		pType.AddItemInHandsProfileIK("CivSedanDoors_BackRight",			"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_passengerR_door.anm");
+		pType.AddItemInHandsProfileIK("CivSedanHood",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_hood.anm");
+		pType.AddItemInHandsProfileIK("CivSedanTrunk",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan/sedan_trunk.anm");
+
+		//! Hatchback_02	
+		pType.AddItemInHandsProfileIK("Hatchback_02_Wheel",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Wheel.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Wheel_Ruined",			"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Wheel.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Door_1_1",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Door_driver.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Door_2_1",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Door_CoDriver.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Door_2_2",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Door_PassengerR.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Door_1_2",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Door_PassengerL.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Hood",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Hood.anm");
+		pType.AddItemInHandsProfileIK("Hatchback_02_Trunk",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/hatchback_02/Hatchback_02_Trunk.anm");
+
+       //! sedan_02 
+		pType.AddItemInHandsProfileIK("Sedan_02_Wheel",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_wheel.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Wheel_Ruined",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_wheel_ruined.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Door_1_1",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_driver_door.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Door_2_1",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_codriver_door.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Door_1_2",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_passengerL_door.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Door_2_2",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_passengerR_door.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Hood",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_Hood.anm");
+		pType.AddItemInHandsProfileIK("Sedan_02_Trunk",						"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/sedan_02/sedan_02_Trunk.anm");
+		
+	 //! offroad_02 
+		pType.AddItemInHandsProfileIK("Offroad_02_Wheel",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_Wheel.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Wheel_Ruined",			"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_Wheel.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Door_1_1",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_DriverDoor.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Door_2_1",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_CoDriverDoor.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Door_1_2",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_PassengerLDoor.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Door_2_2",				"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_PassengerRDoor.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Hood",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_Hood.anm");
+		pType.AddItemInHandsProfileIK("Offroad_02_Trunk",					"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,		"dz/anims/anm/player/ik/vehicles/offroad_02/offroad_02_Trunk.anm");
+	}	
+	
+	//! Consumables	
+	{	
+		pType.AddItemInHandsProfileIK("Paper",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/paper.anm");
+		pType.AddItemInHandsProfileIK("DuctTape",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/duct_tape.anm");
+		pType.AddItemInHandsProfileIK("Bandana_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/BandanaFH_ground.anm");
+		pType.AddItemInHandsProfileIK("Rag",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/Rags.anm");
+		pType.AddItemInHandsProfileIK("BurlapStrip",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/burlap_strips.anm");
+		pType.AddItemInHandsProfileIK("SmallStone",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/SmallStone.anm");
+		pType.AddItemInHandsProfileIK("BatteryD",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/battery_d.anm");
+		pType.AddItemInHandsProfileIK("Battery9V",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/9v_battery.anm");
+		pType.AddItemInHandsProfileIK("SmallGasCanister",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/GasCannisterSmall.anm");
+		pType.AddItemInHandsProfileIK("MediumGasCanister",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,		 		"dz/anims/anm/player/ik/gear/GasCannisterLarge.anm");  
+		pType.AddItemInHandsProfileIK("LargeGasCanister",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/GasCannisterLarge.anm");	
+		pType.AddItemInHandsProfileIK("Spraycan_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/spraycan.anm");
+		pType.AddItemInHandsProfileIK("Matchbox",							"dz/anims/workspaces/player/player_main/props/player_main_1h_matchbox.asi",			toolsOneHanded, 			"dz/anims/anm/player/ik/gear/Matchbox.anm");
+		pType.AddItemInHandsProfileIK("NailBox",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/Nails_box.anm");
+		pType.AddItemInHandsProfileIK("Roadflare",							"dz/anims/workspaces/player/player_main/props/player_main_1h_torch.asi",			toolsOneHanded, 			"dz/anims/anm/player/ik/gear/roadflare.anm");
+		pType.AddItemInHandsProfileIK("Chemlight_ColorBase",				"dz/anims/workspaces/player/player_main/props/player_main_1h_torch.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/chemlight.anm");
+		pType.AddItemInHandsProfileIK("Hook",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/bait_worm_pinned.anm");
+		pType.AddItemInHandsProfileIK("BoneHook",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/bone_hook.anm");
+		pType.AddItemInHandsProfileIK("Nail",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Nails_loose_10.anm");
+		pType.AddItemInHandsProfileIK("Bone",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/pile_of_bones.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Bait",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/bait_worm_pinned.anm");
+		pType.AddItemInHandsProfileIK("BoneBait",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Netting",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/netting.anm");
+		pType.AddItemInHandsProfileIK("ButaneCanister",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/ButanCanister.anm");	
+		pType.AddItemInHandsProfileIK("Bark_Oak",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Bark_oak.anm");
+		pType.AddItemInHandsProfileIK("Bark_Birch",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Bark_birch.anm");
+		pType.AddItemInHandsProfileIK("RabbitPelt",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Pelt_Rabbit.anm");
+		pType.AddItemInHandsProfileIK("PigPelt",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/Pelt_Pig.anm");
+		pType.AddItemInHandsProfileIK("EasterEgg",							"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/apple.anm");
+		pType.AddItemInHandsProfileIK("GiftWrapPaper",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Bark_birch.anm");
+		pType.AddItemInHandsProfileIK("PunchedCard",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/PunchedCard.anm");
+			
+		//! Consumables two handed	
+		pType.AddItemInHandsProfileIK("Stone",								"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded, 					"dz/anims/anm/player/ik/two_handed/stone.anm");
+		pType.AddItemInHandsProfileIK("Firewood",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/firewood.anm");
+		pType.AddItemInHandsProfileIK("Pelt_Base",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured	
+		pType.AddItemInHandsProfileIK("TannedLeather",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded, 					"dz/anims/anm/player/ik/two_handed/tanned_leather.anm");	
+		pType.AddItemInHandsProfileIK("WoodenPlank",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,					"dz/anims/anm/player/ik/two_handed/wooden_plank.anm"); 
+		pType.AddItemInHandsProfileIK("PileOfWoodenPlanks",					"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,					"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("GardenLime",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/gardenlime.anm");
+		pType.AddItemInHandsProfileIK("CowPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Cow.anm");
+		pType.AddItemInHandsProfileIK("DeerPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Deer.anm");
+		//pType.AddItemInHandsProfileIK("RabbitPelt",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Rabbit.anm");//
+		pType.AddItemInHandsProfileIK("FoxPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Fox.anm");
+		pType.AddItemInHandsProfileIK("WildboarPelt",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Wildboar.anm");
+		pType.AddItemInHandsProfileIK("GoatPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,					"dz/anims/anm/player/ik/two_handed/Pelt_Goat.anm");
+		pType.AddItemInHandsProfileIK("MouflonPelt",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Mouflon.anm");
+		pType.AddItemInHandsProfileIK("BearPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Bear.anm");
+		pType.AddItemInHandsProfileIK("WolfPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Wolf.anm");
+		pType.AddItemInHandsProfileIK("SheepPelt",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				 	"dz/anims/anm/player/ik/two_handed/Pelt_Sheep.anm");
+
+
+	}	
+	
+	//! Containers	
+	{	
+		pType.AddItemInHandsProfileIK("FirstAidKit",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/first_aid_kit.anm");	
+		pType.AddItemInHandsProfileIK("SmallProtectorCase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/protector_case.anm");	
+		pType.AddItemInHandsProfileIK("AmmoBox",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/AmmoBox.anm"); 
+		pType.AddItemInHandsProfileIK("Bear_ColorBase",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/TeddyBear.anm");
+		pType.AddItemInHandsProfileIK("ChildBag_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/child_g.anm");
+		pType.AddItemInHandsProfileIK("SmershBag",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/smersh_g.anm");
+		pType.AddItemInHandsProfileIK("GhillieBushrag_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/GhillieBushrag.anm");
+		pType.AddItemInHandsProfileIK("GhillieSuit_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/GhillieBushrag.anm");
+		pType.AddItemInHandsProfileIK("GhillieTop_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/GhillieBushrag.anm");
+		//pType.AddItemInHandsProfileIK("WaterproofBag_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/WaterproofBag.anm");
+
+	
+		//! Containers - 2handed		
+		pType.AddItemInHandsProfileIK("ArmyPouch_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,				    "dz/anims/anm/player/ik/two_handed/armypouch.anm");
+		pType.AddItemInHandsProfileIK("WaterproofBag_ColorBase",			"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/WaterproofBag.anm");	
+		pType.AddItemInHandsProfileIK("TaloonBag_ColorBase",				"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/taloon_g.anm");	
+		pType.AddItemInHandsProfileIK("TortillaBag",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/tortilla_g.anm");	
+		pType.AddItemInHandsProfileIK("HuntingBag",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/hunting_g.anm");
+		pType.AddItemInHandsProfileIK("AssaultBag_ColorBase",				"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/assault_g.anm");
+		pType.AddItemInHandsProfileIK("MountainBag_ColorBase",				"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/mountain_g.anm");
+		pType.AddItemInHandsProfileIK("CoyoteBag_ColorBase",				"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/coyote_g.anm");
+		pType.AddItemInHandsProfileIK("AliceBag_ColorBase",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/alice_g.anm");
+		pType.AddItemInHandsProfileIK("DryBag_ColorBase",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/drybag_g.anm");
+		pType.AddItemInHandsProfileIK("CanisterGasoline",					"dz/anims/workspaces/player/player_main/props/player_main_2h_jerrycan.asi",			twoHanded,					"dz/anims/anm/player/ik/two_handed/jerrycan.anm");
+		pType.AddItemInHandsProfileIK("CourierBag",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/courier_bag.anm");
+		pType.AddItemInHandsProfileIK("ImprovisedBag",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/improvised_courier_bag.anm");
+		pType.AddItemInHandsProfileIK("FurCourierBag",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/fur_courier_bag.anm");
+		pType.AddItemInHandsProfileIK("FurImprovisedBag",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/improvised_courier_bag.anm");
+		pType.AddItemInHandsProfileIK("LeatherSack_ColorBase",				"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/leather_sack.anm");
+		pType.AddItemInHandsProfileIK("GiftBox_Small",						"dz/anims/workspaces/player/player_main/props/player_main_2h_pot.asi",				twoHanded,					"dz/anims/anm/player/ik/two_handed/Cauldron.anm"); //TODO - placeholder, make a proper IK
+		pType.AddItemInHandsProfileIK("GiftBox_Medium",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,					"dz/anims/anm/player/ik/two_handed/BatteryCar.anm"); //TODO - placeholder, make a proper IK
+		pType.AddItemInHandsProfileIK("GiftBox_Large",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,					"dz/anims/anm/player/ik/vehicles/BatteryTruck.anm"); //TODO - placeholder, make a proper IK
+		pType.AddItemInHandsProfileIK("SlingBag_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_2h.asi",	           			twoHanded,					"dz/anims/anm/player/ik/two_handed/slingbag.anm");
+		pType.AddItemInHandsProfileIK("DuffelBagSmall_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_2h.asi",	                	twoHanded,					"dz/anims/anm/player/ik/two_handed/duffelbagsmall.anm");
+		pType.AddItemInHandsProfileIK("CanvasBag_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_2h.asi",                    	twoHanded,					"dz/anims/anm/player/ik/two_handed/canvasbag.anm");
+		pType.AddItemInHandsProfileIK("DrysackBag_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_2h.asi",                     	twoHanded,					"dz/anims/anm/player/ik/two_handed/drysackbag.anm");
+		
+		//! Containers - Heavy	
+		pType.AddItemInHandsProfileIK("TrashCan",							"dz/anims/workspaces/player/player_main/player_main_heavy.asi",						heavyItemBehaviour,			"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+	}	
+	
+	//! Cooking	
+	{	
+		pType.AddItemInHandsProfileIK("ClutterCutterFireplace",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured	
+		pType.AddItemInHandsProfileIK("BarrelHoles_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Tripod",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Cooking_Tripod.anm");		
+		pType.AddItemInHandsProfileIK("FryingPan",							"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/frying_pan.anm");		
+		pType.AddItemInHandsProfileIK("PortableGasStove",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/gas_cooker.anm");	
+		pType.AddItemInHandsProfileIK("PortableGasLamp",					"dz/anims/workspaces/player/player_main/props/player_main_1h_torch.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/GasLight.anm");
+		pType.AddItemInHandsProfileIK("Candle",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/candle.anm");
+		pType.AddItemInHandsProfileIK("PetrolLighter",						"dz/anims/workspaces/player/player_main/props/player_main_1h_lighter.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/petrol_lighter.anm");	
+		pType.AddItemInHandsProfileIK("FireplaceIndoor",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/FireplaceIndoor.anm");
+			
+		//! Cooking two handed	
+		pType.AddItemInHandsProfileIK("Pot",								"dz/anims/workspaces/player/player_main/props/player_main_2h_pot.asi",				twoHanded,					"dz/anims/anm/player/ik/two_handed/CookingPot.anm");
+		pType.AddItemInHandsProfileIK("Cauldron",							"dz/anims/workspaces/player/player_main/props/player_main_2h_cauldron.asi",			twoHanded,					"dz/anims/anm/player/ik/two_handed/Cauldron.anm");
+		pType.AddItemInHandsProfileIK("FireplaceBase",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/Fireplace.anm"); 
+		
+	}	
+	
+	//! Crafting	
+	{	
+		pType.AddItemInHandsProfileIK("Rope",								"dz/anims/workspaces/player/player_main/props/player_main_1h_rope.asi",				toolsOneHanded,				"dz/anims/anm/player/ik/gear/Rope.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("ImprovisedRope",						"dz/anims/workspaces/player/player_main/props/player_main_1h_rope.asi",				toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("MetalWire",							"dz/anims/workspaces/player/player_main/props/player_main_1h_rope.asi",				toolsOneHanded,				"dz/anims/anm/player/ik/gear/metalwire.anm");
+		pType.AddItemInHandsProfileIK("Torch",								"dz/anims/workspaces/player/player_main/props/player_main_1h_torch.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/torch.anm");
+		pType.AddItemInHandsProfileIK("ChickenFeather",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/petrol_lighter.anm");	
+		pType.AddItemInHandsProfileIK("GorkaHelmetVisor",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/Maska_glass_g.anm");
+		pType.AddItemInHandsProfileIK("HandDrillKit",						"dz/anims/workspaces/player/player_main/props/player_main_1h_handdrillkit.asi",		toolsOneHanded, 			"dz/anims/anm/player/ik/gear/hand_drill_kit.anm");
+		pType.AddItemInHandsProfileIK("WoodenStick",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/WoodenStick.anm"); 
+		pType.AddItemInHandsProfileIK("LongWoodenStick",					"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/LongWoodenStick.anm");
+		pType.AddItemInHandsProfileIK("SharpWoodenStick",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_spear.asi",			poleArms,					"dz/anims/anm/player/ik/two_handed/advanced_spear.anm"); //this is the original IK ("dz/anims/anm/player/ik/gear/LongWoodenStick.anm");
+		pType.AddItemInHandsProfileIK("BurlapSack",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/bp_burlap_sack.anm");
+		pType.AddItemInHandsProfileIK("LongTorch",							"dz/anims/workspaces/player/player_main/props/player_main_1h_torch.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/longTorch.anm");
+		pType.AddItemInHandsProfileIK("GasMask_Filter_Improvised",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/soda_can.anm");
+		
+		//! Crafting 2hd	
+		pType.AddItemInHandsProfileIK("Spear",								"dz/anims/workspaces/player/player_main/weapons/player_main_2h_spear.asi",			poleArms,				 	"dz/anims/anm/player/ik/two_handed/advanced_spear.anm"); 
+	}	
+	
+	//! Cultivation	
+	{	
+		pType.AddItemInHandsProfileIK("TomatoSeedsPack",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/zucchini_seeds_pack.anm");
+		pType.AddItemInHandsProfileIK("SeedBase",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/Seeds_Tomato.anm");
+		pType.AddItemInHandsProfileIK("PepperSeedsPack",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/zucchini_seeds_pack.anm");
+		pType.AddItemInHandsProfileIK("PumpkinSeedsPack",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/zucchini_seeds_pack.anm");
+		pType.AddItemInHandsProfileIK("ZucchiniSeedsPack",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/zucchini_seeds_pack.anm");
+		pType.AddItemInHandsProfileIK("CannabisSeedsPack",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/zucchini_seeds_pack.anm");
+		pType.AddItemInHandsProfileIK("AntiPestsSpray",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/DesinfectantSpray.anm"); 
+		pType.AddItemInHandsProfileIK("ParticleTest",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("PlantMaterial",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/plant_material.anm");
+	}	
+		
+	//! Drinks	
+	{	
+		pType.AddItemInHandsProfileIK("Bottle_Base",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/water_bottle.anm");
+		pType.AddItemInHandsProfileIK("Canteen",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/canteen.anm");	
+		pType.AddItemInHandsProfileIK("WaterBottle",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/water_bottle.anm");	
+		pType.AddItemInHandsProfileIK("WaterPouch_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/waterpouch.anm");	
+		pType.AddItemInHandsProfileIK("SodaCan_ColorBase",					"dz/anims/workspaces/player/player_main/props/player_main_1h_sodacan.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/soda_can.anm");	
+	}	
+		
+	//! Food	
+	{	
+		//! Food animal corpses	
+		pType.AddItemInHandsProfileIK("Carp",								"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/carp_live.anm");
+		pType.AddItemInHandsProfileIK("Sardines",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/sardines_live.anm");
+		pType.AddItemInHandsProfileIK("Mackerel",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/carp_live.anm");	
+		pType.AddItemInHandsProfileIK("Worm",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/bait_worm.anm");
+		pType.AddItemInHandsProfileIK("DeadChicken_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/chicken.anm");
+		pType.AddItemInHandsProfileIK("DeadRabbit",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/rabbit.anm");
+		pType.AddItemInHandsProfileIK("DeadRooster",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/rooster.anm");
+		
+		//! Food cans	
+		pType.AddItemInHandsProfileIK("BakedBeansCan",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/food_can.anm");
+		pType.AddItemInHandsProfileIK("BakedBeansCan_Opened",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/food_can_opened.anm");
+		pType.AddItemInHandsProfileIK("PeachesCan",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/food_can.anm");
+		pType.AddItemInHandsProfileIK("PeachesCan_Opened",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/food_can_opened.anm");
+		pType.AddItemInHandsProfileIK("TacticalBaconCan",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/food_can.anm");
+		pType.AddItemInHandsProfileIK("TacticalBaconCan_Opened",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/food_can_opened.anm");
+		pType.AddItemInHandsProfileIK("SpaghettiCan",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/food_can.anm");
+		pType.AddItemInHandsProfileIK("SpaghettiCan_Opened",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/food_can_opened.anm");
+		pType.AddItemInHandsProfileIK("SardinesCan",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/sardines.anm");
+		pType.AddItemInHandsProfileIK("SardinesCan_Opened",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/sardines.anm");
+		pType.AddItemInHandsProfileIK("TunaCan",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/tuna.anm");
+		pType.AddItemInHandsProfileIK("TunaCan_Opened",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/tuna.anm");
+		pType.AddItemInHandsProfileIK("DogFoodCan",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("DogFoodCan_Opened",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("CatFoodCan",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("CatFoodCan_Opened",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("PorkCan",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("PorkCan_Opened",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("Lunchmeat",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("Lunchmeat_Opened",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan250g.anm");
+		pType.AddItemInHandsProfileIK("UnknownFoodCan",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/food_can.anm");
+		pType.AddItemInHandsProfileIK("UnknownFoodCan_Opened",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/food_can_opened.anm");
+		pType.AddItemInHandsProfileIK("Pajka",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan100g.anm");
+		pType.AddItemInHandsProfileIK("Pajka_Opened",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan100g.anm");
+		pType.AddItemInHandsProfileIK("Pate",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan100g.anm");
+		pType.AddItemInHandsProfileIK("Pate_Opened",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan100g.anm");
+		pType.AddItemInHandsProfileIK("BrisketSpread",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan100g.anm");
+		pType.AddItemInHandsProfileIK("BrisketSpread_Opened",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/foodcan100g.anm");
+		pType.AddItemInHandsProfileIK("Honey",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/marmalade.anm");
+		pType.AddItemInHandsProfileIK("Zagorky_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/zagorky.anm");
+		pType.AddItemInHandsProfileIK("Snack_ColorBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/BloodBag_Sealed.anm");
+		pType.AddItemInHandsProfileIK("Crackers",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/saltycrackers.anm");
+		
+		pType.AddItemInHandsProfileIK("Candycane_Colorbase",				"dz/anims/workspaces/player/player_main/props/player_main_1h_candycane.asi",		toolsOneHanded,				"dz/anims/anm/player/ik/gear/candycane.anm");
+
+		//! Food fruits		
+		pType.AddItemInHandsProfileIK("Apple",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/apple.anm");
+		pType.AddItemInHandsProfileIK("Banana",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Orange",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/orange.anm");	
+		pType.AddItemInHandsProfileIK("Tomato",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/tomato_fresh.anm");
+		pType.AddItemInHandsProfileIK("GreenBellPepper",					"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/pepper_green_fresh.anm");
+		pType.AddItemInHandsProfileIK("Zucchini",							"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/zucchini_fresh.anm");
+		pType.AddItemInHandsProfileIK("Pumpkin",							"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,					"dz/anims/anm/player/ik/two_handed/pumpkin_fresh.anm");
+		pType.AddItemInHandsProfileIK("SlicedPumpkin",						"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/pumpkin_sliced.anm"); 
+		pType.AddItemInHandsProfileIK("Potato",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/potato_fresh.anm");
+		pType.AddItemInHandsProfileIK("PotatoSeed",							"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/potato_fresh.anm");
+		pType.AddItemInHandsProfileIK("Kiwi",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/kiwi.anm");
+		pType.AddItemInHandsProfileIK("SambucusBerry",						"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/berries.anm");
+		pType.AddItemInHandsProfileIK("CaninaBerry",						"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/poisonousberries.anm");
+		pType.AddItemInHandsProfileIK("Cannabis",							"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/berries.anm");
+		pType.AddItemInHandsProfileIK("Plum",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/plum.anm");
+		pType.AddItemInHandsProfileIK("Pear",								"dz/anims/workspaces/player/player_main/props/player_main_1h_fruit.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/pear.anm");  
+				
+		//! Food meats			
+		pType.AddItemInHandsProfileIK("HumanSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_human.anm");
+		pType.AddItemInHandsProfileIK("GoatSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("MouflonSteakMeat",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");	
+		pType.AddItemInHandsProfileIK("BoarSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("PigSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("DeerSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("WolfSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("BearSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");	
+		pType.AddItemInHandsProfileIK("CowSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("SheepSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("FoxSteakMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_steak.anm");
+		pType.AddItemInHandsProfileIK("ChickenBreastMeat",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_breast.anm");
+		pType.AddItemInHandsProfileIK("RabbitLegMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/meat_leg.anm");
+		pType.AddItemInHandsProfileIK("CarpFilletMeat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/carp_fillet_raw.anm");
+		pType.AddItemInHandsProfileIK("MackerelFilletMeat",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/mackerel_fillet.anm"); 
+		pType.AddItemInHandsProfileIK("Lard",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/lard.anm");
+		
+		//! Food mushrooms	
+		pType.AddItemInHandsProfileIK("AgaricusMushroom",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/mushroom_agaricus.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("AuriculariaMushroom",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/mushroom_auricularia.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("AmanitaMushroom",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/mushroom_amanita.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("MacrolepiotaMushroom",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Mushroom_boletus.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("LactariusMushroom",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/mushroom_lactarius.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("PsilocybeMushroom",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/mushroom_psilocybe.anm");
+		pType.AddItemInHandsProfileIK("BoletusMushroom",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Mushroom_boletus.anm");		
+		//! Food basic	
+		pType.AddItemInHandsProfileIK("Edible_Base",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("BoxCerealCrunchin",					"dz/anims/workspaces/player/player_main/props/player_main_1h_food_box.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/box_cereal.anm");
+		pType.AddItemInHandsProfileIK("PowderedMilk",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/powdered_milk.anm");
+		pType.AddItemInHandsProfileIK("SmallGuts",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/guts_animal_small.anm"); 
+		pType.AddItemInHandsProfileIK("Guts",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/guts_animal.anm");
+		pType.AddItemInHandsProfileIK("Rice",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/rice.anm");
+		pType.AddItemInHandsProfileIK("Marmalade",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/marmalade.anm");
+	}
+	
+	//! Medical 
+	{
+		pType.AddItemInHandsProfileIK("Bottle_Base",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("BandageDressing",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/bandage_dressing.anm");
+		pType.AddItemInHandsProfileIK("DisinfectantSpray",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/DesinfectantSpray.anm");
+		pType.AddItemInHandsProfileIK("DisinfectantAlcohol",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/disinfectant_alcohol.anm");
+		pType.AddItemInHandsProfileIK("PurificationTablets",				"dz/anims/workspaces/player/player_main/props/player_main_1h_tablets.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/Water_purification_tablets.anm");
+		pType.AddItemInHandsProfileIK("CharcoalTablets",					"dz/anims/workspaces/player/player_main/props/player_main_1h_tablets.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/charcoal_tablets.anm");
+		pType.AddItemInHandsProfileIK("PainkillerTablets",					"dz/anims/workspaces/player/player_main/props/player_main_1h_tablets.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/painkillers2.anm");
+		pType.AddItemInHandsProfileIK("VitaminBottle",						"dz/anims/workspaces/player/player_main/props/player_main_1h_pills.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/VitaminBottle.anm");
+		pType.AddItemInHandsProfileIK("IodineTincture",						"dz/anims/workspaces/player/player_main/props/player_main_1h_pills.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/VitaminBottle.anm");
+		pType.AddItemInHandsProfileIK("TetracyclineAntibiotics",			"dz/anims/workspaces/player/player_main/props/player_main_1h_tablets.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/tetracycline_tablets.anm");
+		pType.AddItemInHandsProfileIK("Epinephrine",						"dz/anims/workspaces/player/player_main/props/player_main_1h_morphine.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/morphine.anm");
+		pType.AddItemInHandsProfileIK("Morphine",							"dz/anims/workspaces/player/player_main/props/player_main_1h_morphine.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/morphine.anm");
+		pType.AddItemInHandsProfileIK("Syringe",							"dz/anims/workspaces/player/player_main/props/player_main_1h_syringe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/Syringe_Empty.anm");
+		pType.AddItemInHandsProfileIK("ClearSyringe",						"dz/anims/workspaces/player/player_main/props/player_main_1h_syringe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/Syringe_Full.anm");
+		pType.AddItemInHandsProfileIK("BloodSyringe",						"dz/anims/workspaces/player/player_main/props/player_main_1h_syringe.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/Syringe_Full.anm");
+		pType.AddItemInHandsProfileIK("InjectionVial",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/InjectionVial.anm");
+		pType.AddItemInHandsProfileIK("SalineBag",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/SalineBag.anm");
+		pType.AddItemInHandsProfileIK("StartKitIV",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/StartKit.anm");
+		pType.AddItemInHandsProfileIK("SalineBagIV",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/TransfusionKit.anm");
+		pType.AddItemInHandsProfileIK("BloodBagEmpty",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/BloodBag_Sealed.anm");
+		pType.AddItemInHandsProfileIK("BloodBagFull",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/BloodBag_Full.anm");
+		pType.AddItemInHandsProfileIK("BloodBagIV",							"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/BloodBag_Full_IV.anm");
+		pType.AddItemInHandsProfileIK("BloodTestKit",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/BloodTest_Kit.anm");
+		pType.AddItemInHandsProfileIK("Splint",								"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/improvised_fixture.anm");
+		pType.AddItemInHandsProfileIK("Thermometer",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/thermometer.anm");
+		pType.AddItemInHandsProfileIK("CigarettePack_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("AntiChemInjector",					"dz/anims/workspaces/player/player_main/props/player_main_1h_morphine.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/morphine.anm");
+		
+		//! Medical two handed
+		pType.AddItemInHandsProfileIK("Defibrillator",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/defibrillator.anm");
+	}
+
+	//! Navigation
+	{
+		pType.AddItemInHandsProfileIK("ChernarusMap",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/Map_chernarus.anm");
+		pType.AddItemInHandsProfileIK("Compass",							"dz/anims/workspaces/player/player_main/props/player_main_1h_compass.asi",			toolsOneHanded, 			"dz/anims/anm/player/ik/gear/compass.anm");
+		pType.AddItemInHandsProfileIK("OrienteeringCompass",				"dz/anims/workspaces/player/player_main/props/player_main_1h_compass.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/compass_modern.anm");
+		pType.AddItemInHandsProfileIK("GPSReceiver",						"dz/anims/workspaces/player/player_main/props/player_main_1h_GPSReciever.asi",		toolsOneHanded, 			"dz/anims/anm/player/ik/gear/GPSReciever.anm");
+	}
+	
+	//! Optic
+	{
+		pType.AddItemInHandsProfileIK("Binoculars",							"dz/anims/workspaces/player/player_main/props/player_main_1h_binocular.asi",		toolsOneHanded,				"dz/anims/anm/player/ik/gear/binoculars.anm");
+		pType.AddItemInHandsProfileIK("Rangefinder",						"dz/anims/workspaces/player/player_main/props/player_main_1h_rangefinder.asi",		toolsOneHanded,				"dz/anims/anm/player/ik/gear/rangefinder.anm");
+		pType.AddItemInHandsProfileIK("NVGoggles",							"dz/anims/workspaces/player/player_main/props/player_main_1h_nightvision.asi",		toolsOneHanded,				"dz/anims/anm/player/ik/gear/NVGoggle.anm");
+	}
+
+	//! Radio
+	{
+		pType.AddItemInHandsProfileIK("Transmitter_Base",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/TransfusionKit.anm");
+		pType.AddItemInHandsProfileIK("StaticRadio",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,				"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("Megaphone",							"dz/anims/workspaces/player/player_main/props/player_main_1h_megaphone.asi",		toolsOneHanded,				"dz/anims/anm/player/ik/gear/megaphone.anm");
+		pType.AddItemInHandsProfileIK("PersonalRadio",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded, 			"dz/anims/anm/player/ik/gear/PersonalRadio.anm");
+		pType.AddItemInHandsProfileIK("Radio",								"dz/anims/workspaces/player/player_main/props/player_main_1h_radio.asi",			toolsOneHanded,				"dz/anims/anm/player/ik/gear/Radio.anm");  
+       
+	   //! Radio heavy
+		pType.AddItemInHandsProfileIK("BaseRadio",							"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,					"dz/anims/anm/player/ik/two_handed/BaseRadio.anm"); 
+	}
+
+	//! Traps
+	{
+		pType.AddItemInHandsProfileIK("LandMineTrap",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/landmine.anm");
+		pType.AddItemInHandsProfileIK("SmallFishTrap",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/improvised_fish_trap.anm");
+		pType.AddItemInHandsProfileIK("FishNetTrap",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/banana.anm"); // Not configured
+		pType.AddItemInHandsProfileIK("TripwireTrap",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/tripwire.anm");
+		pType.AddItemInHandsProfileIK("RabbitSnareTrap",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/rabbit_snare_folded.anm");
+    
+		//! Traps two handed
+		pType.AddItemInHandsProfileIK("BearTrap",						"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,						"dz/anims/anm/player/ik/two_handed/beartrap_g.anm");
+	}
+	
+	//! Clothes
+	    pType.AddItemInHandsProfileIK("Skirt_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/Skirt.anm");
+	    pType.AddItemInHandsProfileIK("NBCJacketBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/ushanka_hat.anm");
+	    pType.AddItemInHandsProfileIK("NBCPantsBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/camping/fabric.anm");
+	    pType.AddItemInHandsProfileIK("LegsCover_Improvised",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/ReflexVest.anm");
+		pType.AddItemInHandsProfileIK("Chainmail_Leggings",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/ReflexVest.anm");
+		pType.AddItemInHandsProfileIK("Chainmail",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/Chainmail.anm");
+		pType.AddItemInHandsProfileIK("TorsoCover_Improvised",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/CombatGloves.anm");
+		pType.AddItemInHandsProfileIK("Chestplate",						"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",	twoHanded,						"dz/anims/anm/player/ik/two_handed/chestplate.anm");
+		
+	
+	//! Headgear
+	{
+		pType.AddItemInHandsProfileIK("GorkaHelmet",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/gorka_helmet.anm");
+		pType.AddItemInHandsProfileIK("GorkaHelmetComplete",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/gorka_helmet_complete.anm");
+		pType.AddItemInHandsProfileIK("FirefightersHelmet_ColorBase",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/firehelmet.anm");
+		pType.AddItemInHandsProfileIK("BallisticHelmet_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/ballistic_helmet.anm");
+		pType.AddItemInHandsProfileIK("BallisticHelmet_BDU",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/moto_helmet.anm");
+		pType.AddItemInHandsProfileIK("BallisticHelmet_Desert",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/moto_helmet.anm");
+		pType.AddItemInHandsProfileIK("BallisticHelmet_Woodland",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/moto_helmet.anm");
+		pType.AddItemInHandsProfileIK("ZSh3PilotHelmet",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/ZSh3_helmet.anm");
+		pType.AddItemInHandsProfileIK("ConstructionHelmet_ColorBase",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/construction_helmet.anm");
+		pType.AddItemInHandsProfileIK("BurlapSackCover",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/burlap_cover.anm");
+		pType.AddItemInHandsProfileIK("Ushanka_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/ushanka_hat.anm");
+		pType.AddItemInHandsProfileIK("MotoHelmet_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/moto_helmet.anm");
+		pType.AddItemInHandsProfileIK("DarkMotoHelmet_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/moto_helmet.anm");
+		pType.AddItemInHandsProfileIK("MilitaryBeret_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/military_beret.anm");
+		pType.AddItemInHandsProfileIK("CowboyHat_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/cowboy_hat.anm");
+		pType.AddItemInHandsProfileIK("BoonieHat_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/boonie_hat.anm");
+		pType.AddItemInHandsProfileIK("LeatherHat_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/leatherhat.anm");
+		pType.AddItemInHandsProfileIK("PilotkaCap",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/pilotka_cap.anm");
+		pType.AddItemInHandsProfileIK("TankerHelmet",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/tanker_helmet.anm");
+		pType.AddItemInHandsProfileIK("SkateHelmet_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/skate_helmet.anm");
+		pType.AddItemInHandsProfileIK("PrisonerCap",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/prisoner_cap.anm");
+		pType.AddItemInHandsProfileIK("GreatHelm",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/greathelm.anm");
+		pType.AddItemInHandsProfileIK("NorseHelm",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/NorseHelm.anm");
+		pType.AddItemInHandsProfileIK("Ssh68Helmet",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/ssh68_helmet.anm");
+		pType.AddItemInHandsProfileIK("DirtBikeHelmet_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_helmet.anm");
+		pType.AddItemInHandsProfileIK("DirtBikeHelmet_Visor",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm");
+		pType.AddItemInHandsProfileIK("DirtBikeHelmet_Mouthguard",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_mouthguard.anm");
+		pType.AddItemInHandsProfileIK("NioshFaceMask",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/nioshface_mask.anm");
+		pType.AddItemInHandsProfileIK("DallasMask",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dallas_mask.anm");
+		pType.AddItemInHandsProfileIK("HoxtonMask",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dallas_mask.anm");
+		pType.AddItemInHandsProfileIK("WolfMask",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dallas_mask.anm");
+		pType.AddItemInHandsProfileIK("AviatorGlasses",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/aviators_glasses.anm");
+		pType.AddItemInHandsProfileIK("ThinFramesGlasses",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/aviators_glasses.anm");
+		pType.AddItemInHandsProfileIK("ThickFramesGlasses",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/aviators_glasses.anm");
+		pType.AddItemInHandsProfileIK("SportGlasses",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/aviators_glasses.anm");
+		pType.AddItemInHandsProfileIK("DesignerGlasses",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/aviators_glasses.anm");	
+		pType.AddItemInHandsProfileIK("BalaclavaMask_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/balaclava_mask.anm");
+		//pType.AddItemInHandsProfileIK("BandanaMask_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/bandana_mask.anm");
+		pType.AddItemInHandsProfileIK("BaseballCap_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/baseball_cap.anm");
+		pType.AddItemInHandsProfileIK("BeanieHat_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/beanie_hat.anm");
+		pType.AddItemInHandsProfileIK("FlatCap_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/flat_cap.anm");
+		pType.AddItemInHandsProfileIK("MedicalScrubsHat_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/medicalScrubs_hat.anm");
+		pType.AddItemInHandsProfileIK("PoliceCap",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/police_cap.anm");
+		pType.AddItemInHandsProfileIK("RadarCap_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/radar_cap.anm");
+		pType.AddItemInHandsProfileIK("ZmijovkaCap_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/zmijovka_cap.anm");
+		pType.AddItemInHandsProfileIK("GasMask",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/gas_mask.anm");
+		pType.AddItemInHandsProfileIK("PumpkinHelmet",					"dz/anims/workspaces/player/player_main/player_main_2h.asi",						twoHanded,						"dz/anims/anm/player/ik/two_handed/PumpkinHelmet.anm");
+		pType.AddItemInHandsProfileIK("NVGHeadstrap",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/NVG_Headstrap.anm");
+		pType.AddItemInHandsProfileIK("Headtorch_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/head_torch.anm");
+		pType.AddItemInHandsProfileIK("Balaclava3Holes_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/balaclava_3holes.anm");
+		pType.AddItemInHandsProfileIK("WitchHat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/cowboy_hat.anm");
+		pType.AddItemInHandsProfileIK("WitchHood_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/zmijovka_cap.anm");
+		pType.AddItemInHandsProfileIK("CrookedNose",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/balaclava_mask.anm");
+		pType.AddItemInHandsProfileIK("HockeyMask",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("Mich2001Helmet",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/ballistic_helmet.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("GP5GasMask",						"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,					"dz/anims/anm/player/ik/gear/carp_live.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("WeldingMask",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/book.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("SurgicalMask",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/book.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("AirborneMask",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/book.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("HockeyHelmet_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/book.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("NBCHoodBase",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm");
+		pType.AddItemInHandsProfileIK("DarkMotoHelmet_YellowScarred",	"dz/anims/workspaces/player/player_main/weapons/player_main_1h_pipe.asi",			toolsOneHanded,					"dz/anims/anm/player/ik/gear/moto_helmet.anm");
+		pType.AddItemInHandsProfileIK("FaceCover_Improvised",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm");
+		pType.AddItemInHandsProfileIK("HeadCover_Improvised",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/beanie_hat.anm");
+		pType.AddItemInHandsProfileIK("EyePatch_Improvised",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/Eyepatch.anm");
+		pType.AddItemInHandsProfileIK("MimeMask_Male",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("MimeMask_Female",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm"); //Temporary
+		pType.AddItemInHandsProfileIK("EyeMask_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/Eyepatch.anm");
+		pType.AddItemInHandsProfileIK("Chainmail_Coif",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/chainmail_coif.anm");
+		pType.AddItemInHandsProfileIK("WitchHoodCoif_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/clothing/witchhood_coif.anm");
+		pType.AddItemInHandsProfileIK("MorozkoHat",						"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/MorozkoHat.anm");
+		pType.AddItemInHandsProfileIK("WinterCoif_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/WinterCoif.anm");
+		pType.AddItemInHandsProfileIK("OKZKCap_ColorBase",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/OKZKCap.anm");
+		pType.AddItemInHandsProfileIK("PetushokHat_ColorBase",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/PetushokHat.anm");
+		pType.AddItemInHandsProfileIK("ChristmasHeadband_ColorBase",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/dirtbike_visor.anm");
+	}
+
+	//! Belts
+	{
+		pType.AddItemInHandsProfileIK("CivilianBelt",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded,					"dz/anims/anm/player/ik/clothing/belts/civ_belt_g.anm");
+		pType.AddItemInHandsProfileIK("MilitaryBelt",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded,					"dz/anims/anm/player/ik/clothing/belts/mil_belt_g.anm");
+		pType.AddItemInHandsProfileIK("RopeBelt",				"dz/anims/workspaces/player/player_main/props/player_main_1h_rope.asi",						toolsOneHanded,					"dz/anims/anm/player/ik/gear/banana.anm");
+		pType.AddItemInHandsProfileIK("NylonKnifeSheath",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded,					"dz/anims/anm/player/ik/clothing/belts/nylon_KnifeSheath.anm");
+		pType.AddItemInHandsProfileIK("LeatherKnifeSheath",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded,					"dz/anims/anm/player/ik/clothing/belts/leather_KnifeSheath.anm");
+		pType.AddItemInHandsProfileIK("LeatherBelt_ColorBase",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded,					"dz/anims/anm/player/ik/clothing/belts/leather_belt.anm");
+		pType.AddItemInHandsProfileIK("HipPack_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded,					"dz/anims/anm/player/ik/clothing/belts/hippack.anm");
+
+	}
+	
+	//! Gloves
+	{
+		pType.AddItemInHandsProfileIK("WorkingGloves_Black",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/WorkingGloves.anm");
+		pType.AddItemInHandsProfileIK("WorkingGloves_Beige",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/WorkingGloves.anm");
+		pType.AddItemInHandsProfileIK("WorkingGloves_Brown",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/WorkingGloves.anm");
+		pType.AddItemInHandsProfileIK("WorkingGloves_Yellow",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/WorkingGloves.anm");
+		pType.AddItemInHandsProfileIK("TacticalGloves_Black",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/TacticalGloves.anm");
+		pType.AddItemInHandsProfileIK("TacticalGloves_Beige",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/TacticalGloves.anm");
+		pType.AddItemInHandsProfileIK("TacticalGloves_Green",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/TacticalGloves.anm");
+		pType.AddItemInHandsProfileIK("NBCGloves_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/NBCGloves.anm");
+		pType.AddItemInHandsProfileIK("SurgicalGloves_Blue",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/SurgicalGloves.anm");
+		pType.AddItemInHandsProfileIK("SurgicalGloves_LightBlue",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/SurgicalGloves.anm");
+		pType.AddItemInHandsProfileIK("SurgicalGloves_Green",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/SurgicalGloves.anm");
+		pType.AddItemInHandsProfileIK("SurgicalGloves_White",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/SurgicalGloves.anm");
+		pType.AddItemInHandsProfileIK("LeatherGloves_Natural",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("LeatherGloves_Beige",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("LeatherGloves_Black",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("LeatherGloves_Brown",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("OMNOGloves_Gray",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/CombatGloves.anm");
+		pType.AddItemInHandsProfileIK("OMNOGloves_Brown",			"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/CombatGloves.anm");
+		pType.AddItemInHandsProfileIK("HandsCover_Improvised",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("WoolGloves_ColorBase",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("WoolGlovesFingerless_ColorBase", "dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/LeatherGloves.anm");
+		pType.AddItemInHandsProfileIK("PaddedGloves_ColorBase", 	"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/PaddedGloves.anm");
+		
+	}
+
+	//! Shoe
+	{
+		pType.AddItemInHandsProfileIK("FeetCover_Improvised",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/NBCGloves.anm");
+		pType.AddItemInHandsProfileIK("MedievalBoots",		        "dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/gear/MedievalBoots.anm");
+
+	}
+
+	//! Vest
+	{
+		pType.AddItemInHandsProfileIK("BallisticVest",				"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",		twoHanded,						"dz/anims/anm/player/ik/two_handed/vest_ballistic.anm");
+		pType.AddItemInHandsProfileIK("HighCapacityVest_ColorBase",	"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",		twoHanded,						"dz/anims/anm/player/ik/two_handed/vest_highcapacity.anm");
+		pType.AddItemInHandsProfileIK("PoliceVest",					"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",		twoHanded,						"dz/anims/anm/player/ik/two_handed/vest_police.anm");
+		pType.AddItemInHandsProfileIK("PressVest_ColorBase",		"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",		twoHanded,						"dz/anims/anm/player/ik/two_handed/vest_press.anm");
+		pType.AddItemInHandsProfileIK("UKAssVest_ColorBase",		"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",		twoHanded,						"dz/anims/anm/player/ik/two_handed/vest_ukassault.anm");
+		pType.AddItemInHandsProfileIK("PlateCarrierVest",			"dz/anims/workspaces/player/player_main/weapons/player_main_2h_extinguisher.asi",		twoHanded,						"dz/anims/anm/player/ik/two_handed/vest_police.anm");
+        pType.AddItemInHandsProfileIK("HuntingVest",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/clothing/HuntingVest.anm");
+        pType.AddItemInHandsProfileIK("ReflexVest",					"dz/anims/workspaces/player/player_main/player_main_1h.asi",							toolsOneHanded,					"dz/anims/anm/player/ik/clothing/ReflexVest.anm");
+	}
+
+	//! Clothing attachments (holsters, plates)
+	{
+		pType.AddItemInHandsProfileIK("PlateCarrierPouches",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded, 				"dz/anims/anm/player/ik/gear/plate_carrier_pouches_g.anm");
+		pType.AddItemInHandsProfileIK("CarrierHolsterSolo",		"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded, 			    "dz/anims/anm/player/ik/gear/plate_carrier_holster.anm");
+		pType.AddItemInHandsProfileIK("PlateCarrierHolster",	"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded, 			    "dz/anims/anm/player/ik/gear/plate_carrier_holster.anm");
+	}
+
+	//! Others
+	{
+		pType.AddItemInHandsProfileIK("Book_Base",				"dz/anims/workspaces/player/player_main/player_main_1h.asi",								toolsOneHanded, 				"dz/anims/anm/player/ik/gear/book.anm");
+	}
+
+	//! Restrained items
+	{
+		pType.AddItemInHandsProfileIK("HandcuffsLocked",		"dz/anims/workspaces/player/player_main/player_main_1h_restrained.asi",						restrained, 					"dz/anims/anm/player/ik/gear/handcuffslocked.anm");
+		pType.AddItemInHandsProfileIK("RopeLocked",				"dz/anims/workspaces/player/player_main/player_main_1h_restrained.asi",						restrained, 					"dz/anims/anm/player/ik/gear/bp_rope_tied.anm");
+		pType.AddItemInHandsProfileIK("DuctTapeLocked",			"dz/anims/workspaces/player/player_main/player_main_1h_restrained.asi",						restrained, 					"dz/anims/anm/player/ik/gear/DuctTape_tied.anm");
+		pType.AddItemInHandsProfileIK("MetalWireLocked",		"dz/anims/workspaces/player/player_main/player_main_1h_restrained.asi",						restrained, 					"dz/anims/anm/player/ik/gear/Metalwire_tied.anm");
+		pType.AddItemInHandsProfileIK("BarbedWireLocked",		"dz/anims/workspaces/player/player_main/player_main_1h_restrained.asi",						restrained, 					"dz/anims/anm/player/ik/gear/Barbed_wire_tied.anm");
+	}
+
+	//! Surrender items (dummy!)
+	{
+		pType.AddItemInHandsProfileIK("SurrenderDummyItem",		"dz/anims/workspaces/player/player_main/player_main_surrender.asi",	surrender,	"");
+	}
+
+	
+	//! custom one handed
+    modCallbacks.RegisterOneHanded(pType, toolsOneHanded);
+
+	//! custom two handed
+	modCallbacks.RegisterTwoHanded(pType, twoHanded);
+
+	//! custom pole arms
+	modCallbacks.RegisterPoleArms(pType, twoHanded);
+
+	//! custom restrained
+    modCallbacks.RegisterRestrained(pType, restrained);
+
+	//! custom surrender - really needed?
+    modCallbacks.RegisterSurrender(pType, surrender);
+
+	//! custom heavy
+    modCallbacks.RegisterHeavy(pType, heavyItemBehaviour);
+
+	//! custom behaviours
+	modCallbacks.RegisterCustom(pType);
+
+	
+	//!===========================================================
+	// bone Remaps
+
+	{
+		// mapping "weaponBone" -> "humanBone" 
+		//Base classes
+		array<string> rifleBoneRemap = { "bolt", "Weapon_Bolt", "magazine", "Weapon_Magazine", "trigger", "Weapon_Trigger", "charging", "Weapon_Bone_01", "bullet", "Weapon_Bullet", "mag_release", "Weapon_Bone_02", "boltrelease", "Weapon_Bone_03"};
+		pType.AddItemBoneRemap("Rifle_Base", rifleBoneRemap);
+
+		array<string> pistolBoneRemap ={ "bolt", "Weapon_Bolt", "magazine", "Weapon_Magazine", "bullet","Weapon_Bullet", "trigger", "Weapon_Trigger", "hammer", "Weapon_Bone_01" };
+		pType.AddItemBoneRemap("Pistol_Base", pistolBoneRemap);
+
+		array<string> PistolAltBoneRemap ={ "bolt", "Weapon_Bolt", "magazine", "Weapon_Magazine", "bullet","Weapon_Bullet", "trigger", "Weapon_Trigger", "hammer", "Weapon_Bone_01", "barrel", "Weapon_Bone_2" };
+		pType.AddItemBoneRemap("PistolAlt_Base", PistolAltBoneRemap);
+
+		array<string> ShotgunBoneRemap ={ "bolt", "Weapon_Bolt", "pump", "Weapon_Bone_01","feedRamp", "Weapon_Bone_02", "trigger", "Weapon_Trigger","bullet", "Weapon_Bullet", "boltrelease", "Weapon_Bone_03"};
+		pType.AddItemBoneRemap("Mp133Shotgun_Base", ShotgunBoneRemap);
+
+		array<string> BoltActionRifleBoneRemap ={ "bolthandle", "Weapon_Bolt", "boltbody", "Weapon_Bone_04", "boltbodyS", "Weapon_Bone_05", "trigger", "Weapon_Trigger","bullet", "Weapon_Bullet", "magazine", "Weapon_Magazine"};
+		pType.AddItemBoneRemap("BoltActionRifle_Base", BoltActionRifleBoneRemap);
+
+		//Specific weapons
+		//Rifles
+		array<string> izh18BoneRemap = { "release", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger","ejector","Weapon_Bone_03","bullet", "Weapon_Bullet" };
+		pType.AddItemBoneRemap("Izh18_Base", izh18BoneRemap);
+
+		array<string> B95BoneRemap = { "release", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger","ejector","Weapon_Bone_03","bullet", "Weapon_Bullet", "bullet2", "Weapon_Bone_04", "snaploader", "Weapon_Bone_05"};
+		pType.AddItemBoneRemap("B95_Base", B95BoneRemap);
+
+		array<string> SKSBoneRemap = { "bolt", "Weapon_Bolt", "trigger", "Weapon_Trigger", "bullet", "Weapon_Bullet", "follower", "Weapon_Bone_02", "clip", "Weapon_Magazine", "cliprounds", "Weapon_Bone_01"};
+		pType.AddItemBoneRemap("SKS_Base", SKSBoneRemap);
+
+		//Pistols
+		array<string> DerringerBoneRemap = { "release", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger","hammer","Weapon_Bone_03","bullet", "Weapon_Bullet", "bullet2", "Weapon_Bone_04", "snaploader", "Weapon_Bone_05"};
+		pType.AddItemBoneRemap("Derringer_Base", DerringerBoneRemap);
+
+		array<string> MagnumBoneRemap ={ "bolt", "Weapon_Bolt", "magazine", "Weapon_Magazine", "bullet","Weapon_Bullet", "trigger", "Weapon_Trigger", "hammer", "Weapon_Bone_01","cylinder_arm", "Weapon_Bone_03" ,"ejector", "Weapon_Bone_04" };
+		pType.AddItemBoneRemap("Magnum_Base", MagnumBoneRemap);
+
+		array<string> FlaregunBoneRemap = { "hammer", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger" ,"bullet", "Weapon_Bullet" };
+		pType.AddItemBoneRemap("Flaregun_Base", FlaregunBoneRemap);
+
+		array<string> LongHornBoneRemap = { "latch", "Weapon_Bone_01", "hammer", "Weapon_Bone_02", "reload", "Weapon_Bolt"/*, "hammer", "Weapon_Bone_01",*/, "trigger","Weapon_Trigger","bullet", "Weapon_Bullet" };
+		pType.AddItemBoneRemap("LongHorn_Base", LongHornBoneRemap);
+
+		//Shotguns
+		array<string> Izh18ShotgunBoneRemap = { "release", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger","ejector","Weapon_Bone_03","bullet", "Weapon_Bullet" };
+		pType.AddItemBoneRemap("Izh18Shotgun_Base", Izh18ShotgunBoneRemap);
+
+		array<string> Izh43BoneRemap = { "release", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger","ejector","Weapon_Bone_03","bullet", "Weapon_Bullet", "bullet2", "Weapon_Bone_04", "snaploader", "Weapon_Bone_05", "trigger2", "Weapon_Bone_06"};
+		pType.AddItemBoneRemap("Izh43Shotgun_Base", Izh43BoneRemap);
+
+		//Launchers
+		array<string> M79BoneRemap = { "release", "Weapon_Bone_02", "barrel", "Weapon_Bone_01", "trigger", "Weapon_Trigger","extractor","Weapon_Bone_03","bullet", "Weapon_Bullet", "charging", "Weapon_Bone_04", };
+		pType.AddItemBoneRemap("M79_Base", M79BoneRemap);
+
+		//Archery
+		array<string> CrossbowBoneRemap ={ "bullet", "Weapon_Bullet", "trigger", "Weapon_Trigger", "chord", "Weapon_Bone_01", "shutter", "Weapon_Bolt" };
+		pType.AddItemBoneRemap("Crossbow_Base", CrossbowBoneRemap);
+
+		//array<string> M4A1BoneRemap ={ "bolt", "Weapon_Bolt", "magazine", "Weapon_Magazine", "trigger", "Weapon_Trigger","charginghandle", "Weapon_Bone_01","bullet","Weapon_Bullet", };
+		//pType.AddItemBoneRemap("M4A1_Base", M4A1BoneRemap);
+
+		// mod remapping
+		modCallbacks.CustomBoneRemapping(pType);
+	}
+
+	//!===========================================================
+	// bone Remaps
+
+	//
+	pType.DebugPreloadAnimationInstances();
+	
+	GetGame().ProfilerStop("DayZPlayerTypeRegisterItems");
+
+}
+
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCfgSounds.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCfgSounds.c
new file mode 100644
index 0000000000000000000000000000000000000000..e1bd35e8ca5ba680aa621e3664585f8208f0eca1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerCfgSounds.c
@@ -0,0 +1,360 @@
+class DayZPlayerTypeStepSoundLookupTableImpl extends DayZPlayerTypeStepSoundLookupTable
+{
+	void DayZPlayerTypeStepSoundLookupTableImpl()
+	{
+		m_pSoundTableInstances = new map<int, ref StepSoundLookupTable>;
+		m_pSoundTables = new map<int, StepSoundLookupTable>;
+		
+		string stepsCfgPath = "CfgVehicles SurvivorBase AnimEvents Steps ";
+		int stepsCount = GetGame().ConfigGetChildrenCount(stepsCfgPath);
+		for(int i = 0; i < stepsCount; i++)
+		{
+			string stepName;
+			GetGame().ConfigGetChildName(stepsCfgPath, i, stepName);
+			string stepPath = stepsCfgPath + stepName + " ";
+			int id = GetGame().ConfigGetInt(stepPath + "id");
+			
+			string tableName;
+			GetGame().ConfigGetText(stepPath + "soundLookupTable", tableName);
+
+			
+			StepSoundLookupTable table = m_pSoundTableInstances.Get(tableName.Hash());
+			if(table == NULL)
+			{
+				table = new StepSoundLookupTable();
+				table.LoadTable(tableName);
+				m_pSoundTableInstances.Insert(tableName.Hash(), table);
+			}
+			m_pSoundTables.Insert(id, table);
+		}
+	}
+
+	override SoundObjectBuilder GetSoundBuilder(int eventId, int pMovement, int pSurfaceHash, AnimBootsType pBoots)
+	{
+		SoundLookupTable table = m_pSoundTables.Get(eventId);
+		if(table == NULL)
+			return NULL;
+		
+		SoundObjectBuilder soundBuilder = table.GetSoundBuilder(pSurfaceHash);
+		if(soundBuilder == NULL)
+			return NULL;
+		
+		if (pMovement == DayZPlayerConstants.MOVEMENTIDX_WALK)
+		{
+			soundBuilder.AddVariable("walk", 1);
+			soundBuilder.AddVariable("run", 0);
+			soundBuilder.AddVariable("sprint", 0);
+		}
+		else if (pMovement == DayZPlayerConstants.MOVEMENTIDX_RUN)
+		{
+			soundBuilder.AddVariable("walk", 0);
+			soundBuilder.AddVariable("run", 1);
+			soundBuilder.AddVariable("sprint", 0);
+		}
+		else if (pMovement == DayZPlayerConstants.MOVEMENTIDX_SPRINT)
+		{
+			soundBuilder.AddVariable("walk", 0);
+			soundBuilder.AddVariable("run", 0);
+			soundBuilder.AddVariable("sprint", 1);
+		}
+		else
+		{
+			soundBuilder.AddVariable("walk", 0);
+			soundBuilder.AddVariable("run", 0);
+			soundBuilder.AddVariable("sprint", 0);
+		}
+		
+		if (pBoots == AnimBootsType.None)
+		{
+			soundBuilder.AddVariable("bare", 1);
+			soundBuilder.AddVariable("sneakers", 0);
+			soundBuilder.AddVariable("boots", 0);
+		}
+		else if (pBoots == AnimBootsType.Sneakers)
+		{
+			soundBuilder.AddVariable("bare", 0);
+			soundBuilder.AddVariable("sneakers", 1);
+			soundBuilder.AddVariable("boots", 0);
+		}
+		else if (pBoots == AnimBootsType.Boots)
+		{
+			soundBuilder.AddVariable("bare", 0);
+			soundBuilder.AddVariable("sneakers", 0);
+			soundBuilder.AddVariable("boots", 1);
+		}
+		
+		return soundBuilder;
+	}
+	
+	static DayZPlayerTypeStepSoundLookupTableImpl GetInstance()
+	{
+		if(m_instance == NULL)
+			m_instance = new DayZPlayerTypeStepSoundLookupTableImpl();
+
+		return m_instance;
+	}
+
+	private static ref DayZPlayerTypeStepSoundLookupTableImpl m_instance;
+	private autoptr map<int, ref StepSoundLookupTable> m_pSoundTableInstances;//unique tables
+	private autoptr map<int, StepSoundLookupTable> m_pSoundTables;//pointers to tables above
+}
+
+
+class DayZPlayerTypeAttachmentSoundLookupTableImpl extends DayZPlayerTypeAttachmentSoundLookupTable
+{
+	void DayZPlayerTypeAttachmentSoundLookupTableImpl()
+	{
+		m_pSoundTableInstances = new map<int, ref AttachmentSoundLookupTable>;
+		m_pSoundTables = new map<int, AttachmentSoundLookupTable>();
+		
+		string attachCfgPath = "CfgVehicles SurvivorBase AnimEvents Attachments ";
+		int attachCount = GetGame().ConfigGetChildrenCount(attachCfgPath);
+		for(int i = 0; i < attachCount; i++)
+		{
+			string defName;
+			GetGame().ConfigGetChildName(attachCfgPath, i, defName);
+			string defPath = attachCfgPath + defName + " ";
+			
+			string slotName;
+			GetGame().ConfigGetText(defPath + "slot", slotName);
+			
+			int id = GetGame().ConfigGetInt(defPath + "id");
+			
+			string tableName;
+			GetGame().ConfigGetText(defPath + "soundLookupTable", tableName);
+			
+			AttachmentSoundLookupTable table = m_pSoundTableInstances.Get(tableName.Hash());
+			if(table == NULL)
+			{
+				table = new AttachmentSoundLookupTable();
+				table.LoadTable(tableName);
+				m_pSoundTableInstances.Insert(tableName.Hash(), table);
+			}
+
+			m_pSoundTables.Insert((slotName + id).Hash(), table);
+		}
+	}
+	
+	override SoundObjectBuilder GetSoundBuilder(int eventId, string slotName, int attachmentHash)
+	{
+		SoundLookupTable table = m_pSoundTables.Get((slotName + eventId).Hash());
+		if(table == NULL)
+			return NULL;
+		
+		SoundObjectBuilder soundBuilder = table.GetSoundBuilder(attachmentHash);
+		if(soundBuilder == NULL)
+			return NULL;
+		
+		return soundBuilder;
+	}
+	
+	static DayZPlayerTypeAttachmentSoundLookupTableImpl GetInstance()
+	{
+		if(m_instance == NULL)
+			m_instance = new DayZPlayerTypeAttachmentSoundLookupTableImpl();
+
+		return m_instance;
+	}
+	
+	private static ref DayZPlayerTypeAttachmentSoundLookupTableImpl m_instance;
+	private autoptr map<int, ref AttachmentSoundLookupTable> m_pSoundTableInstances;
+	private autoptr map<int, AttachmentSoundLookupTable> m_pSoundTables;
+}
+
+
+
+
+class DayZPlayerTypeVoiceSoundLookupTableImpl extends DayZPlayerTypeVoiceSoundLookupTable
+{
+	void DayZPlayerTypeVoiceSoundLookupTableImpl()
+	{
+		// this produces 2 maps: 
+		// 1) map where the key is 'ID' of anim event and the value is sound lookup table
+		// 2) map of unique lookup table instances where the table name hash is a key, and a lookup table is the value
+		m_pSoundTableInstances = new map<int, ref PlayerVoiceLookupTable>;
+		m_pSoundTables = new map<int, PlayerVoiceLookupTable>();
+		
+		string cfgPath = "CfgVehicles SurvivorBase AnimEvents SoundVoice ";
+		int childCount = GetGame().ConfigGetChildrenCount(cfgPath);
+		//Print("childCount:" + childCount);
+		for(int i = 0; i < childCount; i++)
+		{
+			string defName;
+			GetGame().ConfigGetChildName(cfgPath, i, defName);
+			string defPath = cfgPath + defName + " ";
+			
+			int id = GetGame().ConfigGetInt(defPath + "id");
+			
+			string tableName;
+			GetGame().ConfigGetText(defPath + "soundLookupTable", tableName);
+			
+			PlayerVoiceLookupTable table = m_pSoundTableInstances.Get(tableName.Hash());
+			if(table == NULL)
+			{
+				table = new PlayerVoiceLookupTable();
+				table.LoadTable(tableName);
+				m_pSoundTableInstances.Insert(tableName.Hash(), table);
+				
+				string noiseName;
+				if(GetGame().ConfigGetText(defPath + "noise", noiseName))
+				{
+					NoiseParams np = new NoiseParams;
+					np.Load(noiseName);
+					table.SetNoiseParam(np);
+				}
+			}
+
+			m_pSoundTables.Insert(id, table);
+		}
+	}
+	
+	override SoundObjectBuilder GetSoundBuilder(int eventId, int parameterHash)
+	{
+		PlayerVoiceLookupTable table = m_pSoundTables.Get(eventId);
+		if(table == NULL)
+			return NULL;
+		
+		SoundObjectBuilder soundBuilder = table.GetSoundBuilder(parameterHash);
+		if(soundBuilder == NULL)
+			return NULL;
+		
+		return soundBuilder;
+	}
+	
+	override NoiseParams GetNoiseParams(int eventId)
+	{
+		PlayerVoiceLookupTable table = m_pSoundTables.Get(eventId);
+		if(table == NULL)
+			return NULL;
+		
+		return table.GetNoiseParam();
+	}
+	
+	static DayZPlayerTypeVoiceSoundLookupTableImpl GetInstance()
+	{
+		if(m_instance == NULL)
+			m_instance = new DayZPlayerTypeVoiceSoundLookupTableImpl();
+
+		return m_instance;
+	}
+	
+	private static ref DayZPlayerTypeVoiceSoundLookupTableImpl m_instance;
+	private autoptr map<int, ref PlayerVoiceLookupTable> m_pSoundTableInstances;
+	private autoptr map<int, PlayerVoiceLookupTable> m_pSoundTables;
+}
+
+
+
+class DayZPlayerTypeSoundTableImpl extends DayZPlayerTypeAnimTable
+{
+	void DayZPlayerTypeSoundTableImpl()
+	{
+		m_animSoundEvents = new array<ref AnimSoundEvent>;
+		
+		string soundsCfgPath = "CfgVehicles SurvivorBase AnimEvents Sounds ";
+
+		int soundCount = GetGame().ConfigGetChildrenCount(soundsCfgPath);
+		for(int i = 0; i < soundCount; i++)
+		{
+			string soundName;
+			GetGame().ConfigGetChildName(soundsCfgPath, i, soundName);			
+			string soundPath = soundsCfgPath + soundName + " ";
+			AnimSoundEvent soundEvent = new AnimSoundEvent(soundPath);
+			if(soundEvent.IsValid())
+				m_animSoundEvents.Insert(soundEvent);
+		}
+	}
+	
+	override AnimSoundEvent GetSoundEvent(int event_id)
+	{
+		for(int i = 0; i < m_animSoundEvents.Count(); i++)
+		{
+			AnimSoundEvent soundEvent = m_animSoundEvents.Get(i);
+			if(soundEvent.m_iID == event_id)
+			{
+				return soundEvent;
+			}
+		}
+
+		return NULL;
+	}
+	
+	static DayZPlayerTypeSoundTableImpl GetInstance()
+	{
+		if(m_instance == NULL)
+			m_instance = new DayZPlayerTypeSoundTableImpl();
+
+		return m_instance;
+	}
+	
+	private static ref DayZPlayerTypeSoundTableImpl m_instance;
+	private ref array<ref AnimSoundEvent> m_animSoundEvents;
+}
+
+/*
+class DayZPlayerTypeSoundVoiceTableImpl extends DayZPlayerTypeAnimTable
+{
+	void DayZPlayerTypeSoundVoiceTableImpl()
+	{
+		m_animSoundEvents = new map<int, ref AnimSoundEvent>;
+		
+		string soundsCfgPath = "CfgVehicles SurvivorBase AnimEvents SoundVoice ";
+
+		int soundCount = GetGame().ConfigGetChildrenCount(soundsCfgPath);
+		for(int i = 0; i < soundCount; i++)
+		{
+			string soundName;
+			GetGame().ConfigGetChildName(soundsCfgPath, i, soundName);			
+			string soundPath = soundsCfgPath + soundName + " ";
+			AnimSoundEvent soundEvent = new AnimSoundEvent(soundPath);
+			if(soundEvent.IsValid())
+				m_animSoundEvents.Insert(soundEvent.m_iID, soundEvent);
+		}
+	}
+	
+	override AnimSoundEvent GetSoundEvent(int event_id)
+	{
+		AnimSoundEvent soundEvent = m_animSoundEvents.Get(event_id);
+		return soundEvent;
+	}
+	
+	ref map<int, ref AnimSoundEvent> m_animSoundEvents;
+}
+*/
+
+void DayZPlayerTypeRegisterSounds(DayZPlayerType pType)
+{
+	GetGame().ProfilerStart("DayZPlayerTypeRegisterSounds");
+	//! register events
+	pType.RegisterStepEvent("Step", 0.2);
+
+	pType.RegisterSoundEvent("Sound", -1);
+	pType.RegisterSoundEvent("SoundWeapon", 0.2);
+	pType.RegisterSoundEvent("SoundVoice", -1);
+	if(!GetGame().IsDedicatedServer())//attachments don't generate noise, so we can ignore them on server
+		pType.RegisterSoundEvent("SoundAttachment", 0.2);
+	
+	
+	DayZPlayerTypeVoiceSoundLookupTableImpl voiceTable2 = DayZPlayerTypeVoiceSoundLookupTableImpl.GetInstance();
+	pType.RegisterVoiceSoundLookupTable(voiceTable2);
+	
+	if(!GetGame().IsDedicatedServer())//sounds are unnecessary on server
+	{
+		pType.RegisterParticleEvent("Particle", -1);
+		//! load and register step sound lookup table
+		DayZPlayerTypeStepSoundLookupTableImpl stepTable = DayZPlayerTypeStepSoundLookupTableImpl.GetInstance();
+		pType.RegisterStepSoundLookupTable(stepTable);
+		
+		DayZPlayerTypeAttachmentSoundLookupTableImpl attachTable = DayZPlayerTypeAttachmentSoundLookupTableImpl.GetInstance();
+		pType.RegisterAttachmentSoundLookupTable(attachTable);
+		
+
+		
+		DayZPlayerTypeSoundTableImpl soundTable = DayZPlayerTypeSoundTableImpl.GetInstance();
+		pType.RegisterSoundTable(soundTable);
+		
+		//DayZPlayerTypeSoundVoiceTableImpl voiceTable = new DayZPlayerTypeSoundVoiceTableImpl();
+		//pType.RegisterSoundVoiceTable(voiceTable);
+	}
+	GetGame().ProfilerStop("DayZPlayerTypeRegisterSounds");
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerMeleeFightLogic_LightHeavy.c b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerMeleeFightLogic_LightHeavy.c
new file mode 100644
index 0000000000000000000000000000000000000000..572f91f32e3e006ea8b99627d1da40503027d99c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/DayZPlayer/DayZPlayerMeleeFightLogic_LightHeavy.c
@@ -0,0 +1,963 @@
+//! Light / Heavy punches
+enum EFightLogicCooldownCategory
+{
+	EVADE = 0
+}
+
+class DayZPlayerMeleeFightLogic_LightHeavy
+{
+	//! cooldown timers settings
+	const float EVADE_COOLDOWN			= 0.5;
+	
+	//
+	const float CLOSE_TARGET_DISTANCE	= 1.5;
+	
+	//! dummy ammo types 
+	const string DUMMY_LIGHT_AMMO		= "Dummy_Light";
+	const string DUMMY_HEAVY_AMMO		= "Dummy_Heavy";
+
+	protected PlayerBase							m_Player;
+	protected ref DayZPlayerImplementMeleeCombat	m_MeleeCombat;
+	protected EMeleeHitType							m_HitType;
+	protected ref map <int, ref Timer>				m_CooldownTimers;
+	protected Mission 								m_Mission;
+
+	protected bool									m_IsInBlock;
+	protected bool									m_IsEvading;
+
+	protected bool									m_IsInComboRange;	
+	protected bool 									m_WasPreviousHitProcessed;
+	
+	void DayZPlayerMeleeFightLogic_LightHeavy(DayZPlayerImplement player)
+	{
+		Init(player);
+	}
+	
+	void Init(DayZPlayerImplement player)
+	{
+		m_DZPlayer					= player;
+		m_Player 					= PlayerBase.Cast(player);
+		m_MeleeCombat				= m_Player.GetMeleeCombat();
+		m_Mission					= GetGame().GetMission();
+
+		m_IsInBlock 				= false;
+		m_IsEvading	 				= false;
+		m_WasPreviousHitProcessed	= false;
+		m_HitType					= EMeleeHitType.NONE;
+		
+		RegisterCooldowns();
+	}
+
+	void ~DayZPlayerMeleeFightLogic_LightHeavy() {}
+
+	bool IsInBlock()
+	{
+		return m_IsInBlock;
+	}
+	
+	void SetBlock(bool block)
+	{
+		m_IsInBlock = block;
+	}
+	
+	bool IsEvading()
+	{
+		return m_IsEvading;
+	}
+	
+	bool GetCurrentHitType()
+	{
+		return m_HitType;
+	}
+	
+	bool CanFight()
+	{
+		if (m_Player.IsEmotePlaying())
+			return false;
+		
+		if (m_Player.GetActionManager() && m_Player.GetActionManager().GetRunningAction())
+			return false;
+
+		return true;
+	}
+
+	protected void RegisterCooldowns()
+	{
+		m_CooldownTimers = new map<int, ref Timer>();
+		m_CooldownTimers.Insert(EFightLogicCooldownCategory.EVADE, new Timer(CALL_CATEGORY_SYSTEM)); // evades
+	}
+
+	protected EMeleeHitType GetAttackTypeFromInputs(HumanInputController pInputs)
+	{
+		if (pInputs.IsMeleeFastAttackModifier() && m_Player.CanConsumeStamina(EStaminaConsumers.MELEE_HEAVY))
+		{
+			return EMeleeHitType.HEAVY;
+		}
+
+		return EMeleeHitType.LIGHT;
+	}
+	
+	protected EMeleeHitType GetAttackTypeByWeaponAttachments(EntityAI pEntity)
+	{
+		if (!m_Player.CanConsumeStamina(EStaminaConsumers.MELEE_HEAVY))
+		{
+			return EMeleeHitType.NONE;
+		}
+
+		//! use stabbing if the bayonet/knife is attached to firearm
+		if (pEntity.HasBayonetAttached())
+		{
+			return EMeleeHitType.WPN_STAB;
+		}
+		else if (pEntity.HasButtstockAttached())
+		{
+			return EMeleeHitType.WPN_HIT_BUTTSTOCK;
+		}
+
+		return EMeleeHitType.WPN_HIT;
+	}
+	
+	protected float GetAttackTypeByDistanceToTarget(EntityAI pTarget, EMeleeTargetType pTargetType = EMeleeTargetType.ALIGNABLE)
+	{
+		if (pTargetType == EMeleeTargetType.NONALIGNABLE)
+		{
+			return 1.0;
+		}
+
+		//! target in short distance - in place attack
+		if (IsShortDistance(pTarget, Math.SqrFloat(CLOSE_TARGET_DISTANCE)))
+		{
+			return 1.0;
+		}
+				
+		//! target is far from the player - forward movement attack
+		return 0.0;
+	}
+	
+	bool HandleFightLogic(int pCurrentCommandID, HumanInputController pInputs, EntityAI pEntityInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{
+		HumanInventoryWithFSM invFSM = HumanInventoryWithFSM.Cast(m_Player.GetHumanInventory());
+		if (invFSM && !invFSM.IsIdle())
+			return false;
+
+		HumanCommandMove hcm 		= m_Player.GetCommand_Move();
+		InventoryItem itemInHands	= InventoryItem.Cast(pEntityInHands);
+		bool isFireWeapon			= itemInHands && itemInHands.IsWeapon();
+		
+		//! Check if we need to damage
+		if (HandleHitEvent(pCurrentCommandID, pInputs, itemInHands, pMovementState, pContinueAttack))
+			return false;
+
+		//! Actually pressing a button to start a melee attack
+		if ((pInputs.IsAttackButtonDown() && !isFireWeapon) || (pInputs.IsMeleeWeaponAttack() && isFireWeapon) || (pContinueAttack && isFireWeapon))
+		{
+			//Debug.MeleeLog(m_Player, string.Format("HandleFightLogic[1] attackButtonDown=%1, meleeWeaponAttack=%2, pContinueAttack=%3, isFireWeapon=%4", pInputs.IsAttackButtonDown(), pInputs.IsMeleeWeaponAttack(), pContinueAttack, isFireWeapon));
+			
+			//! do not perform attacks when blocking
+			if (m_IsInBlock || m_IsEvading)
+				return false;
+			
+			//! if the item in hands cannot be used as melee weapon
+			if (itemInHands && !itemInHands.IsMeleeWeapon() && !isFireWeapon)
+				return false;
+			
+			//! Currently not performing any attacks, so here we start the initial
+			if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_MOVE)
+			{
+				//Debug.MeleeLog(m_Player, "HandleFightLogic[1a]");
+				//! melee with firearm
+				if (isFireWeapon)
+				{
+					return HandleInitialFirearmMelee(pCurrentCommandID, pInputs, itemInHands, pMovementState, pContinueAttack);
+				}
+				else
+				{
+					//! first attack in raised erc (light or heavy if modifier is used). Also added support for finishers
+					if (pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT)
+					{
+						return HandleInitialMeleeErc(pCurrentCommandID, pInputs, itemInHands, pMovementState, pContinueAttack);
+					}
+					//! kick from raised pne
+					else if (pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+					{
+						return HandleProneKick(pCurrentCommandID, pInputs, itemInHands, pMovementState, pContinueAttack);
+					}
+					//! sprint attack in erc stance
+					else if (pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_ERECT && m_Player.IsSprintFull())
+					{
+						return HandleSprintAttack(pCurrentCommandID, pInputs, itemInHands, pMovementState, pContinueAttack);
+					}
+				}
+			}
+			//! combo hits - when we are already in Melee command and clicking UseButton
+			else if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_MELEE2)
+			{
+				m_IsInComboRange = m_Player.GetCommand_Melee2().IsInComboRange();
+				if (m_IsInComboRange)
+				{
+					return HandleComboHit(pCurrentCommandID, pInputs, itemInHands, pMovementState, pContinueAttack);
+				}
+			}
+		}
+		//! evade and blocking logic
+		else if (!isFireWeapon && pCurrentCommandID == DayZPlayerConstants.COMMANDID_MOVE)
+		{
+			//! evades in raised erc stance while moving
+			if (pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT)
+			{
+				int roll = pInputs.IsMeleeLREvade();
+				if (roll != 0)
+				{
+					//! not enough stamina to do evades
+					if (!m_Player.CanConsumeStamina(EStaminaConsumers.MELEE_EVADE))
+					{
+						return false;
+					}
+					
+					float angle;
+					if (roll == 1)
+					{
+						angle = -90;	// left
+					}
+					else
+					{
+						angle = 90;		// right
+					}
+	
+					// start melee evade
+					m_IsEvading = true;
+					SetCooldown(EVADE_COOLDOWN, EFightLogicCooldownCategory.EVADE);
+					hcm.StartMeleeEvadeA(angle);
+					m_Player.DepleteStamina(EStaminaModifiers.MELEE_EVADE);
+					
+					//Inflict shock when sidestepping with broken legs
+					if (m_Player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+					{
+						m_Player.m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_LIGHT_MELEE_SHOCK);
+						m_Player.m_ShockHandler.CheckValue(true);
+					}
+				}
+			}
+
+			//! stand up when crouching and raised pressed
+			if (pInputs.IsWeaponRaised() && pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_CROUCH)
+			{
+				//Debug.MeleeLog(m_Player, "HandleFightLogic[2b]");
+				if (DayZPlayerUtils.PlayerCanChangeStance(m_Player, DayZPlayerConstants.STANCEIDX_RAISEDERECT))
+				{
+					//Debug.MeleeLog(m_Player, "HandleFightLogic[2c]");
+					hcm.ForceStance(DayZPlayerConstants.STANCEIDX_RAISEDERECT);
+					
+					return false;
+				}
+			}
+
+			//! blocks in raised erc/pro stance
+			//! (bare hand or with melee weapon only)
+			if (!isFireWeapon && (pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT || pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDPRONE))
+			{
+				float angle2;
+
+				if (hcm.GetCurrentInputAngle(angle2) && (angle2 < -130.0 || angle2 > 130))
+				{
+					hcm.SetMeleeBlock(true);
+					SetBlock(true);
+				}
+				else
+				{
+					hcm.SetMeleeBlock(false);
+					SetBlock(false);
+				}
+			}
+			else
+			{
+				hcm.SetMeleeBlock(false);
+				SetBlock(false);
+			}
+		}
+
+		return false;
+	}
+
+	//! Handle the event that our melee hit something
+	protected bool HandleHitEvent(int pCurrentCommandID, HumanInputController pInputs, InventoryItem itemInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{
+		//! Check if we need to damage
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_MELEE2)
+		{
+			HumanCommandMelee2 hmc2a = m_Player.GetCommand_Melee2();
+			if (hmc2a)
+			{
+				//! on anim event Hit received
+				if (hmc2a.WasHit())
+				{
+					//Debug.MeleeLog(m_Player, "HandleHitEvent[START]");
+					//Debug.MeleeLog(m_Player, string.Format("HandleHitEvent[1] target=%1, hitPos=%2, hitZoneIdx=%3, finisherType=%4", m_MeleeCombat.GetTargetEntity(), m_MeleeCombat.GetHitPos().ToString(), m_MeleeCombat.GetHitZoneIdx(), m_MeleeCombat.GetFinisherType()));
+					if (m_MeleeCombat.GetFinisherType() == -1)
+					{
+						//Debug.MeleeLog(m_Player, string.Format("HandleHitEvent[2] target=%1, hitPos=%2, hitZoneIdx=%3, finisherType=%4", m_MeleeCombat.GetTargetEntity(), m_MeleeCombat.GetHitPos().ToString(), m_MeleeCombat.GetHitZoneIdx(), m_MeleeCombat.GetFinisherType()));
+						//! re-target (enemy can have moved out of range or disappeared)
+						m_MeleeCombat.Update(itemInHands, m_HitType, true);
+					}
+
+					//! evaluate hit - selection of cfg 'ammo' type
+					EvaluateHit(itemInHands);					
+					
+					//Get gloves
+					ClothingBase gloves;
+					if (m_HitType == EMeleeHitType.KICK)
+					{
+						//We kick so "gloves" will be the shoes
+						gloves = ClothingBase.Cast(m_Player.GetItemOnSlot("FEET"));
+					}
+					else
+					{
+						gloves = ClothingBase.Cast(m_Player.GetItemOnSlot("GLOVES"));
+					}
+					
+					//If we hit something, inflict damage
+					DamageHands(m_Player, gloves, itemInHands);
+					
+					m_MeleeCombat.ResetTarget();
+					
+					EnableControls();
+					
+					m_WasPreviousHitProcessed = true;
+					
+					//Debug.MeleeLog(m_Player, "HandleHitEvent[END]");
+					
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	//! NOTE: Only singular (or first) hits, combo attacks are handled in combo
+	protected bool HandleInitialFirearmMelee(int pCurrentCommandID, HumanInputController pInputs, InventoryItem itemInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{	
+		//! don't allow bash to interfere with actions like chambering or ejecting bullets
+		Weapon_Base weapon = Weapon_Base.Cast(itemInHands);
+		if (weapon.IsWaitingForActionFinish())
+			return false;		
+		
+		HumanCommandMove hcm = m_Player.GetCommand_Move();
+		
+		//! perform firearm melee from raised erect or continue with attack after character stand up from crouch
+		if (hcm.GetCurrentMovementSpeed() <= 2.05 && (pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT || pContinueAttack) && !m_Player.IsFighting())
+		{
+			m_HitType = GetAttackTypeByWeaponAttachments(itemInHands);
+			if ( m_HitType == EMeleeHitType.NONE )
+				return false; //! exit if there is no suitable attack
+			
+			m_MeleeCombat.Update(itemInHands, m_HitType);
+
+			EntityAI target;
+			EMeleeTargetType targetType;
+			GetTargetData(target, targetType);
+			float attackByDistance = GetAttackTypeByDistanceToTarget(target, targetType);
+
+			m_Player.StartCommand_Melee2(target, m_HitType == EMeleeHitType.WPN_STAB, attackByDistance, m_MeleeCombat.GetHitPos());			
+			m_Player.DepleteStamina(EStaminaModifiers.MELEE_HEAVY);
+			DisableControls();
+
+			pContinueAttack = false; // reset continueAttack flag
+
+			return true;
+		}				
+		//! char stand up when performing firearm melee from crouch
+		else if ( pMovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH )
+		{
+			if (hcm)
+			{
+				hcm.ForceStance(DayZPlayerConstants.STANCEIDX_RAISEDERECT);
+				pContinueAttack = true;
+				return false;
+			}
+		}
+		
+		return false;
+	}
+	
+	//! First attack in raised erc (light or heavy if modifier is used). Also added support for finishers
+	protected bool HandleInitialMeleeErc(int pCurrentCommandID, HumanInputController pInputs, InventoryItem itemInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{
+		//Debug.MeleeLog(m_Player, "HandleInitialMeleeErc[1]");
+		
+		m_HitType = GetAttackTypeFromInputs(pInputs);
+		m_MeleeCombat.Update(itemInHands, m_HitType);
+		
+		//Debug.MeleeLog(m_Player, string.Format("HandleInitialMeleeErc[2] %1", EnumTools.EnumToString(EMeleeHitType, m_HitType)));
+		
+		EntityAI target;
+		EMeleeTargetType targetType;
+		GetTargetData(target, targetType);
+		float attackByDistance = GetAttackTypeByDistanceToTarget(target, targetType);
+		
+		// finisher attack hittype override
+		int finisherType = m_MeleeCombat.GetFinisherType();
+		if (finisherType != -1)
+		{
+			int animationType = DetermineFinisherAnimation(finisherType);
+			if (animationType > -1)
+			{
+				//Debug.MeleeLog(m_Player, string.Format("HandleInitialMeleeErc[3a] target=%1, finisherType=%2, animationType=%3, hitPositionWS=%4", target, finisherType, animationType, m_MeleeCombat.GetHitPos().ToString()));
+				m_Player.StartCommand_Melee2(target, animationType, attackByDistance, m_MeleeCombat.GetHitPos());
+			}
+			else
+			{
+				//Debug.MeleeLog(m_Player, string.Format("HandleInitialMeleeErc[3b] target=%1, finisherType=%2, animationType=%3, hitPositionWS=%4", target, finisherType, (m_HitType == EMeleeHitType.HEAVY).ToString(), m_MeleeCombat.GetHitPos().ToString()));
+				m_Player.StartCommand_Melee2(target, m_HitType == EMeleeHitType.HEAVY, attackByDistance, m_MeleeCombat.GetHitPos());
+			}
+			
+			m_HitType = finisherType;
+			target.SetBeingBackstabbed(finisherType);
+		}
+		else
+		{
+			//Debug.MeleeLog(m_Player, string.Format("HandleInitialMeleeErc[3d] target=%1, animationType=%2, hitPositionWS=%3", target, (m_HitType == EMeleeHitType.HEAVY).ToString(), m_MeleeCombat.GetHitPos().ToString()));
+			m_Player.StartCommand_Melee2(target, m_HitType == EMeleeHitType.HEAVY, attackByDistance, m_MeleeCombat.GetHitPos());
+		}
+		
+		if (m_HitType == EMeleeHitType.HEAVY)
+		{
+			m_Player.DepleteStamina(EStaminaModifiers.MELEE_HEAVY);
+			if (m_Player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			{	
+				m_Player.m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_HEAVY_MELEE_SHOCK);
+				m_Player.m_ShockHandler.CheckValue(true);
+			}
+		}
+		else
+		{
+			m_Player.DepleteStamina(EStaminaModifiers.MELEE_LIGHT);
+			if (m_Player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			{
+				m_Player.m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_LIGHT_MELEE_SHOCK);
+				m_Player.m_ShockHandler.CheckValue(true);
+			}
+		}	
+
+		m_WasPreviousHitProcessed = false;
+		
+		DisableControls();
+		
+		return true;
+	}
+	
+	//! kick from raised pne
+	protected bool HandleProneKick(int pCurrentCommandID, HumanInputController pInputs, InventoryItem itemInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{
+		HumanCommandWeapons hcw = m_Player.GetCommandModifier_Weapons();
+
+		float hcw_angle = hcw.GetBaseAimingAngleLR();
+		//! check if player is on back
+		//! (situation where the player is raised in prone and on back is not in anim graph)
+		if ( ( hcw_angle < -90 || hcw_angle > 90 ) && m_Player.GetBrokenLegs() != eBrokenLegs.BROKEN_LEGS )
+		{
+			// targetting
+			m_HitType = EMeleeHitType.KICK;
+			m_MeleeCombat.Update(itemInHands, m_HitType);
+
+			EntityAI target;
+			EMeleeTargetType targetType;
+			GetTargetData(target, targetType);
+			float attackByDistance = GetAttackTypeByDistanceToTarget(target, targetType);
+
+			// command
+			m_Player.StartCommand_Melee2(target, false, attackByDistance, m_MeleeCombat.GetHitPos());
+			m_Player.DepleteStamina(EStaminaModifiers.MELEE_HEAVY);
+			DisableControls();
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//! sprint attack in erc stance
+	protected bool HandleSprintAttack(int pCurrentCommandID, HumanInputController pInputs, InventoryItem itemInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{
+		//! targetting
+		m_HitType = EMeleeHitType.SPRINT;
+		m_MeleeCombat.Update(itemInHands, m_HitType);
+
+		EntityAI target;
+		EMeleeTargetType targetType;
+		GetTargetData(target, targetType);
+		float attackByDistance = GetAttackTypeByDistanceToTarget(target, targetType);
+
+		//! command
+		//Debug.MeleeLog(m_Player, string.Format("HandleSprintAttack[1] target=%1, animationType=%2, hitPositionWS=%3", target, false, m_MeleeCombat.GetHitPos().ToString()));
+		m_Player.StartCommand_Melee2(target, false, attackByDistance, m_MeleeCombat.GetHitPos());
+		m_Player.DepleteStamina(EStaminaModifiers.MELEE_HEAVY);
+		DisableControls();
+
+		return true;
+	}
+	
+	//! combo hits - when we are already in Melee command and clicking UseButton
+	protected bool HandleComboHit(int pCurrentCommandID, HumanInputController pInputs, InventoryItem itemInHands, HumanMovementState pMovementState, out bool pContinueAttack)
+	{
+		//Debug.MeleeLog(m_Player, "HandleComboHit::");
+
+		//! no suitable attack - skip that
+		if (m_HitType == EMeleeHitType.NONE)
+			return false;
+		
+		//! No combos for the finisher command
+		if (m_MeleeCombat.GetFinisherType() > -1)
+			return false;
+		
+		EntityAI target;
+		EMeleeTargetType targetType;
+		GetTargetData(target, targetType);
+		float attackByDistance = GetAttackTypeByDistanceToTarget(target, targetType);
+		
+		//! select if the next attack will light or heavy (based on input/attachment modifier)
+		if (itemInHands && itemInHands.IsWeapon())
+		{
+			m_HitType = GetAttackTypeByWeaponAttachments(itemInHands);			
+		}
+		else
+		{
+			m_HitType = GetAttackTypeFromInputs(pInputs);
+		}
+
+		//! targetting
+		//Debug.MeleeLog(m_Player, string.Format("HandleComboHit:: %1", EnumTools.EnumToString(EMeleeHitType, m_HitType)));
+		//! wait for the previous hit commit before hitting again
+		if (m_WasPreviousHitProcessed)
+		{
+		  m_MeleeCombat.Update(itemInHands, m_HitType);
+		}
+
+		//! continue 'combo' - left hand attacks
+		bool isHeavy = (m_HitType == EMeleeHitType.HEAVY || m_HitType == EMeleeHitType.WPN_STAB);	
+		m_Player.GetCommand_Melee2().ContinueCombo(isHeavy, attackByDistance, target, m_MeleeCombat.GetHitPos());				
+		DisableControls();
+		
+		//! broken legs shock
+		if (m_Player.GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+		{
+			float shock = PlayerConstants.BROKEN_LEGS_HEAVY_MELEE_SHOCK;
+			
+			if (!isHeavy)
+				shock = PlayerConstants.BROKEN_LEGS_LIGHT_MELEE_SHOCK;
+			
+			m_Player.m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_HEAVY_MELEE_SHOCK);
+			m_Player.m_ShockHandler.CheckValue(true);
+		}
+
+		//! stamina depletion per attack
+		switch (m_HitType)
+		{
+			case EMeleeHitType.HEAVY:
+			case EMeleeHitType.SPRINT:
+			case EMeleeHitType.WPN_STAB:
+			case EMeleeHitType.WPN_HIT_BUTTSTOCK:
+			case EMeleeHitType.WPN_HIT:
+				m_Player.DepleteStamina(EStaminaModifiers.MELEE_HEAVY);
+				break;
+			default:
+				m_Player.DepleteStamina(EStaminaModifiers.MELEE_LIGHT);
+				break;
+		}
+
+		m_IsInComboRange = false;
+
+		return true;
+	}
+
+	protected void EvaluateHit(InventoryItem weapon)
+	{
+		EntityAI target = m_MeleeCombat.GetTargetEntity();
+	
+		if (target)
+		{
+			if (target.IsInherited(DayZPlayer))
+			{
+				EvaluateHit_Player(weapon, target);
+			}
+			else if (target.IsInherited(DayZInfected))
+			{
+				EvaluateHit_Infected(weapon, target);
+			}
+			else if (target.GetMeleeTargetType() == EMeleeTargetType.NONALIGNABLE)
+			{
+				EvaluateHit_NonAlignableObjects(weapon, target);
+			}
+			else
+			{
+				EvaluateHit_Common(weapon, target);
+			}
+			
+			m_MeleeCombat.CheckMeleeItem();
+		}
+	}
+
+	protected void EvaluateHit_Player(InventoryItem weapon, Object target)
+	{
+		int hitZoneIdx = m_MeleeCombat.GetHitZoneIdx();
+		int weaponMode = m_MeleeCombat.GetWeaponMode();
+		int forcedWeaponMode = -1;
+		vector hitPosWS;
+		bool forcedDummy = false;
+
+		PlayerBase targetPlayer = PlayerBase.Cast(target);
+		//! Melee Hit/Impact modifiers
+		if (targetPlayer)
+		{
+			vector targetPos = targetPlayer.GetPosition();
+			vector agressorPos = m_Player.GetPosition();
+			
+			// We get the angle from which an infected hit the blocking player
+			float hitAngle = Math.RAD2DEG * Math.AbsFloat(Math3D.AngleFromPosition(targetPos, MiscGameplayFunctions.GetHeadingVector(targetPlayer), agressorPos));
+							
+			//! if the oponnent is in Melee Block shift the damage down
+			if (targetPlayer.GetMeleeFightLogic() && targetPlayer.GetMeleeFightLogic().IsInBlock() && hitAngle <= GameConstants.PVP_MAX_BLOCKABLE_ANGLE)
+			{
+				if (weaponMode > 0)
+				{
+					forcedWeaponMode = --weaponMode; // Heavy -> Light shift
+				}
+				else
+					forcedDummy = true; // dummy hits, cannot shift lower than 0
+			}
+		}
+
+		EvaluateHit_Common(weapon, target, forcedDummy, forcedWeaponMode);
+	}
+	
+	protected void EvaluateHit_Infected(InventoryItem weapon, Object target)
+	{
+		//If the finisher attack haven't been performed, then use normal hit
+		if (!EvaluateFinisherAttack(weapon, target))
+			EvaluateHit_Common(weapon, target);
+	}
+	
+	//! Check and evaluate stealth kill, if applicable
+	protected bool EvaluateFinisherAttack(InventoryItem weapon, Object target)
+	{
+		//Debug.MeleeLog(m_Player, string.Format("EvaluateFinisherAttack[1] target=%1, hitPos=%2, hitZoneIdx=%3, finisherType=%4", m_MeleeCombat.GetTargetEntity(), m_MeleeCombat.GetHitPos().ToString(), m_MeleeCombat.GetHitZoneIdx(), m_MeleeCombat.GetFinisherType()));
+		
+		if (m_MeleeCombat.GetFinisherType() > -1)
+		{
+			if (GetGame().IsServer())
+				DamageSystem.CloseCombatDamage(m_Player, target, m_MeleeCombat.GetHitZoneIdx(), DetermineFinisherAmmo(m_MeleeCombat.GetFinisherType()), m_MeleeCombat.GetHitPos(), ProcessDirectDamageFlags.NO_ATTACHMENT_TRANSFER);
+				
+			return true;
+		}
+
+		return false;
+	}
+	
+	protected void EvaluateHit_Common(InventoryItem weapon, Object target, bool forcedDummy=false, int forcedWeaponMode = -1)
+	{
+		int hitZoneIdx = m_MeleeCombat.GetHitZoneIdx();
+		int weaponMode = m_MeleeCombat.GetWeaponMode();
+		vector hitPosWS;
+		string ammo;
+		
+		if (forcedWeaponMode > -1)
+			weaponMode = forcedWeaponMode;
+
+		EntityAI targetEntity = EntityAI.Cast(target);
+
+		//! check if we need to use dummy hit
+		if (!DummyHitSelector(m_HitType, ammo) && !forcedDummy)
+		{
+			//! normal hit with applied damage to targeted component
+			if (hitZoneIdx >= 0)
+			{
+				hitPosWS = targetEntity.ModelToWorld(targetEntity.GetDefaultHitPosition());
+				
+				if (WeaponDestroyedCheck(weapon, ammo))
+				{
+					DamageSystem.CloseCombatDamage(m_Player, target, hitZoneIdx, ammo, hitPosWS);
+					//Debug.MeleeLog(m_Player, string.Format("EvaluateHit_Common[a]::CloseCombatDamage:: target: %1, hitzone: %2, ammo: %3", target, hitZoneIdx, ammo));
+				}
+				else
+				{
+					m_Player.ProcessMeleeHit(weapon, weaponMode, target, hitZoneIdx, hitPosWS);
+					//Debug.MeleeLog(m_Player, string.Format("EvaluateHit_Common[b]::ProcessMeleeHit:: target: %1, hitzone: %2, meleeMode: %3, forcedWeaponMode:%4", target, hitZoneIdx, weaponMode));
+				}
+			}
+		}
+		else
+		{
+			//! play hit animation for dummy hits
+			if (GetGame().IsServer() && targetEntity)
+			{
+				DummyHitSelector(m_HitType, ammo);
+				hitPosWS = targetEntity.ModelToWorld(targetEntity.GetDefaultHitPosition()); //! override hit pos by pos defined in type
+				DamageSystem.CloseCombatDamage(m_Player, target, hitZoneIdx, ammo, hitPosWS);
+				//Debug.MeleeLog(m_Player, string.Format("EvaluateHit_Common[c]::CloseCombatDamage:: target: %1, hitzone: %2, meleeMode: %3, ammo: %4", target, hitZoneIdx, weaponMode, ammo));
+			}
+		}
+	}
+
+	protected void EvaluateHit_NonAlignableObjects(InventoryItem weapon, Object target)
+	{
+		int hitZoneIdx = m_MeleeCombat.GetHitZoneIdx();
+		vector hitPosWS;
+		string ammo;
+		
+		if (hitZoneIdx >= 0)
+		{
+			if (WeaponDestroyedCheck(weapon,ammo))
+				DamageSystem.CloseCombatDamage(m_Player, target, hitZoneIdx, ammo, m_MeleeCombat.GetHitPos());
+			else
+				m_Player.ProcessMeleeHit(weapon, m_MeleeCombat.GetWeaponMode(), target, hitZoneIdx, m_MeleeCombat.GetHitPos());
+		}
+
+		return;
+	}
+	
+	bool WeaponDestroyedCheck(InventoryItem weapon, out string ammo)
+	{
+		if (!weapon)
+			return false;
+		
+		Weapon_Base firearm = Weapon_Base.Cast(weapon);
+		ItemBase bayonet = ItemBase.Cast(weapon.GetInventory().FindAttachment(weapon.GetBayonetAttachmentIdx()));
+		
+		if ( firearm && bayonet && bayonet.IsRuined() )
+		{
+			ammo = bayonet.GetRuinedMeleeAmmoType();
+			return true;
+		}
+		else if (weapon.IsRuined())
+		{
+			ammo = weapon.GetRuinedMeleeAmmoType();
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+
+	protected void GetTargetData(out EntityAI target, out EMeleeTargetType targetType)
+	{
+		target = m_MeleeCombat.GetTargetEntity();
+		targetType = EMeleeTargetType.ALIGNABLE; //! default
+		
+		// If there is no hitzone defined, then we won't be able to hit the target anyways..
+		if (m_MeleeCombat.GetHitZoneIdx() < 0)
+		{
+			target = null;
+		}
+		
+		if ( target )
+		{
+			targetType = target.GetMeleeTargetType();
+		}
+
+		//! nullify target for nonalignable objects (big objects)
+		if ( targetType == EMeleeTargetType.NONALIGNABLE )
+		{
+			target = null;
+		}
+	}
+
+	//! evaluation of hit player vs. player
+	protected bool DummyHitSelector(EMeleeHitType hitType, out string ammoType)
+	{
+		switch (hitType)
+		{
+		//! in case of kick (on back or push from erc) change the ammo type to dummy
+		case EMeleeHitType.KICK:
+			ammoType = DUMMY_HEAVY_AMMO;
+			return true;
+		break;
+		}
+		
+		ammoType = DUMMY_LIGHT_AMMO;
+		
+		return false;
+	}
+	
+	//! DEPRECATED - moved into DayZPlayerImplementMeleeCombat
+	protected bool IsBehindEntity(int angle, DayZPlayer source, Object target)
+	{
+		return false;
+	}
+
+	protected void SetCooldown(float time, EFightLogicCooldownCategory cooldownCategory)
+	{
+		//! stops currently running cooldown timer (for specific category)
+		if ( m_CooldownTimers.Get(cooldownCategory).IsRunning() )
+		{
+			m_CooldownTimers.Get(cooldownCategory).Stop();
+		}
+		
+		//! param for ResetCooldown
+		Param1<int> param = new Param1<int>(cooldownCategory);
+		m_CooldownTimers.Get(cooldownCategory).Run(time, this, "ResetCooldown", param);
+	}
+	
+	protected void ResetCooldown(EFightLogicCooldownCategory cooldownCategory)
+	{
+		switch (cooldownCategory)
+		{
+		case EFightLogicCooldownCategory.EVADE:
+			m_IsEvading = false;
+		break;
+		}
+	}
+
+	protected void EnableControls();
+	protected void DisableControls();
+	
+	protected void DamageHands(DayZPlayer DZPlayer, ClothingBase gloves, InventoryItem itemInHands)
+	{
+		EntityAI target = m_MeleeCombat.GetTargetEntity();
+		
+		//We did not hit anything
+		if (itemInHands || !target || !DZPlayer)
+			return;
+		
+		//Check if server side
+		if (GetGame().IsServer())
+		{
+			int randNum;
+			
+			//If gloves, damage gloves
+			if (gloves && gloves.GetHealthLevel() < GameConstants.STATE_RUINED)
+			{
+				gloves.DecreaseHealth("", "", 1);
+			}
+			else
+			{
+				//Do not add bleeding if hitting player, zombie or animal
+				if (PlayerBase.Cast(target) || DayZCreatureAI.Cast(target))
+					return;
+				
+				BleedingSourcesManagerServer bleedingManager;
+				
+				//We don't inflict bleeding to hands when kicking
+				if (m_HitType != EMeleeHitType.KICK)
+				{
+					//If no gloves, inflict hand damage and bleeding
+					//m_Player.DecreaseHealth("hands", "", 10); IN CASE WE WANT TO DO STUFF WITH HAND HEALTH
+					
+					//Random bleeding source
+					randNum = Math.RandomIntInclusive(1, 15);
+					switch (randNum)
+					{
+						case 1:
+							if (m_Player)
+							{
+								bleedingManager = m_Player.GetBleedingManagerServer();
+								if (bleedingManager)
+									bleedingManager.AttemptAddBleedingSourceBySelection("RightForeArmRoll");
+							}
+							break;
+						
+						case 2:
+							if (m_Player)
+							{
+								bleedingManager = m_Player.GetBleedingManagerServer();
+								if (bleedingManager)
+									bleedingManager.AttemptAddBleedingSourceBySelection("LeftForeArmRoll");
+							}
+							break;
+					}
+				}
+				else
+				{
+					//Random bleeding source
+					randNum = Math.RandomIntInclusive(1, 15);
+					//We only add bleeding to left foot as character kicks with left foot
+					switch (randNum)
+					{
+						case 1:
+							if (m_Player)
+							{
+								bleedingManager = m_Player.GetBleedingManagerServer();
+								if (bleedingManager)
+									bleedingManager.AttemptAddBleedingSourceBySelection("LeftToeBase");
+							}
+							break;
+						
+						case 2:
+							if (m_Player)
+							{
+								bleedingManager = m_Player.GetBleedingManagerServer();
+								if (bleedingManager)
+									bleedingManager.AttemptAddBleedingSourceBySelection("LeftFoot");
+							}
+							break;
+					}
+				}
+			}
+		}
+	}
+	
+	//! DEPRECATED
+	int GetFinisherType(InventoryItem weapon, EntityAI target)
+	{
+		return -1;
+	}
+	
+	//! DEPRECATED
+	bool IsHitTypeFinisher(int type)
+	{
+		return false;
+	}
+	
+	//! Picks a specific finisher animation. Not used for mounted bayonet stabs
+	int DetermineFinisherAnimation(int finisher_type)
+	{
+		int animation = -1;
+		
+		switch (finisher_type)
+		{
+			case EMeleeHitType.FINISHER_LIVERSTAB:
+				animation = HumanCommandMelee2.HIT_TYPE_FINISHER;
+			break;
+			
+			case EMeleeHitType.FINISHER_NECKSTAB:
+				animation = HumanCommandMelee2.HIT_TYPE_FINISHER_NECK;
+			break;
+		}
+		
+		return animation;
+	}
+	
+	//! Picks a specific finisher ammo fot the hit type. This gets synchronized and guides further behaviour of the target.
+	string DetermineFinisherAmmo(int finisher_type)
+	{
+		string ret = "";
+		
+		switch (finisher_type)
+		{
+			case EMeleeHitType.FINISHER_NECKSTAB:
+				ret = "FinisherHitNeck";
+				break;
+			
+			default:
+				ret = "FinisherHit";
+				break;
+		}
+
+		return ret;
+	}
+	
+	//! DEPRECATED
+	int DetermineSpecificFinisherType(ItemBase weapon, int component)
+	{
+		return -1;
+	}
+	
+	protected bool IsShortDistance(EntityAI pTarget, float pDistanceSq)
+	{
+		return pTarget && vector.DistanceSq(m_Player.GetPosition(), m_MeleeCombat.GetHitPos()) <= pDistanceSq || vector.DistanceSq(m_Player.GetBonePositionWS(m_Player.GetBoneIndexByName("Head")), m_MeleeCombat.GetHitPos()) <= pDistanceSq)
+	}
+	
+	//! DEPRECATED
+	protected DayZPlayerImplement					m_DZPlayer;
+	protected bool 									m_IsFinisher;
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/LightAIBase.c b/scripts/4_World/DayZ/Entities/ManBase/LightAIBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..6386103ee4db15ee709225a0acdf08e80b197a1a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/LightAIBase.c
@@ -0,0 +1,4 @@
+class LightAIBase extends LightAI
+{
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/PlayerBase.c b/scripts/4_World/DayZ/Entities/ManBase/PlayerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..23a474f0c14065cb995e7dcaeb47a6c616d6fdfb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/PlayerBase.c
@@ -0,0 +1,9325 @@
+class PlayerBase extends ManBase
+{
+	const int 						SIMPLIFIED_SHOCK_CAP = 63;
+	const int 						SHAKE_LEVEL_MAX = 7;					
+	private int						m_LifeSpanState;
+	private int						m_LastShavedSeconds;
+	private int						m_BloodType;
+	private bool					m_HasBloodTypeVisible;
+	private bool					m_LiquidTendencyDrain; //client-side only - Obsolete
+	private bool 					m_FlagRaisingTendency;
+	private int						m_HasBloodyHandsVisible;
+	private int						m_FaceCoveredForShaveLayers = 0; //DEPRECATED
+	protected bool					m_HasHeatBuffer;
+	protected bool 					m_PlayerLoaded;
+	protected bool 					m_PlayerDisconnectProcessed;
+	protected bool 					m_ProcessUIWarning;
+	protected int 					m_LocalRefreshAnimStateIdx;
+	protected int 					m_RefreshAnimStateIdx;
+	private int 					m_StoreLoadVersion;
+	const int 						ACT_STORE_SAVE_VERSION = 4;
+	protected int 					m_LifespanLevelLocal; //control variable for change calls
+	protected int 					m_AnimCommandStarting; //signals the command that is about to start the next frame (e.g. Swim, Fall...)
+	EUndergroundPresence			m_UndergroundPresence;
+	
+	private PluginPlayerStatus		m_ModulePlayerStatus;
+	PluginConfigEmotesProfile 		m_ConfigEmotesProfile;
+	private PluginLifespan 			m_ModuleLifespan;
+	protected PluginPresenceNotifier  m_PresenceNotifier;
+	
+	protected ref UndergroundHandlerClient	m_UndergroundHandler;
+	ref PlayerStats 				m_PlayerStats;
+	PluginRecipesManager 			m_ModuleRecipesManager;
+	ref BleedingSourcesManagerServer 	m_BleedingManagerServer;
+	ref BleedingSourcesManagerRemote 	m_BleedingManagerRemote;
+	ref ModifiersManager			m_ModifiersManager;
+	ref NotifiersManager 			m_NotifiersManager;
+	ref protected ActionManagerBase	m_ActionManager;
+	//ref PlayerLightManager 			m_PlayerLightManager;
+	ref PlayerAgentPool				m_AgentPool;
+	int								m_Agents;
+	ref Environment					m_Environment;
+	ref EmoteManager 				m_EmoteManager;
+	ref SymptomManager				m_SymptomManager;
+	ref VirtualHud 					m_VirtualHud;
+	ref StaminaHandler				m_StaminaHandler;
+	ref InjuryAnimationHandler		m_InjuryHandler;
+	ref ShockHandler				m_ShockHandler; //New shock handler
+	ref SoftSkillsManager			m_SoftSkillsManager;
+	ref StanceIndicator				m_StanceIndicator;
+	ref TransferValues				m_TrasferValues;
+	ref DebugMonitorValues			m_DebugMonitorValues;
+	const int 						OVERLOAD_LIMIT = 30000;
+	float 							m_CargoLoad;
+	float							m_VisibilityCoef;
+	float 							m_OriginalSlidePoseAngle;
+	int								m_SoundEvent;
+	int								m_SoundEventParam;
+	int 							m_FliesIndex;
+	bool							m_SoundEventSent;	
+	ref Param2<float,float>			m_UAProgressParam;
+	ref Param2<int,int> 			m_UAParam;
+	ref Param3<float,float,bool>	m_StaminaParam;
+	ref Param1<string> 				m_UAParamMessage;
+	ref Param1<float> 				m_UnconParam;
+	ref Param1<float> 				m_DeathDarkeningParam;
+	ref DamageDealtEffect			m_DamageDealtEffect;
+	ref EffectRadial				m_EffectRadial;
+	ref FlashbangEffect				m_FlashbangEffect;
+	ref ShockDealtEffect 			m_ShockDealtEffect;
+	ref EffectParticle 				m_FliesEff;
+	ref TInputActionMap				m_InputActionMap; // Backwards compatibility
+	ref TInputActionMap				m_InputActionMapControled;
+	ref TInputActionMap				m_InputActionMapAsTarget;
+	bool							m_ActionsInitialize;
+	//ref CraftingMeta 				m_CraftingMeta;
+	ref HiddenSelectionsData		m_EmptyGloves;
+	ref WeaponManager				m_WeaponManager;
+	ref CraftingManager 			m_CraftingManager;
+	ref ArrowManagerPlayer			m_ArrowManager;
+	ref InventoryActionHandler 		m_InventoryActionHandler;
+	ref protected QuickBarBase		m_QuickBarBase;
+	ref PlayerSoundManagerServer	m_PlayerSoundManagerServer;
+	ref PlayerSoundManagerClient	m_PlayerSoundManagerClient;
+	ref HeatComfortAnimHandler		m_HCAnimHandler;
+	ref EffectSound					m_SoundFliesEffect;
+	bool 							m_QuickBarHold;
+	bool							m_QuickBarFT = false;
+	Hud 							m_Hud;
+	protected int 					m_RecipePick;
+	protected bool					m_IsHoldingBreath;
+	protected bool					m_IsInWater;
+	float							m_LastPostFrameTickTime;
+	//AbstractWave 					m_SaySoundWave;
+	ref Timer						m_DeathCheckTimer;
+	bool 							m_CorpseProcessing;
+	int 							m_CorpseState;
+	protected int 					m_CorpseStateLocal;
+	
+	int 							m_PersistentFlags;
+	int								m_StaminaState;
+	float							m_UnconsciousTime;
+	int 							m_ShockSimplified;
+	float							m_CurrentShock; //Used to synchronize shock between server and client
+	bool							m_IsRestrained;
+	bool 							m_IsRestrainStarted;
+	bool 							m_IsRestrainPrelocked;
+	bool							m_ImmunityBoosted;
+	bool							m_AreHandsLocked; //Currently only used to block quickbar usage after canceling placement
+	float							m_UnconsciousVignetteTarget = 2;
+	float							m_CameraSwayModifier = 0.2;
+	float 							m_LastShockHitTime;
+	DayZPlayerCameraBase 			m_CurrentCamera;
+	int								m_BleedingBits;
+	vector 							m_DirectionToCursor;
+	vector 							m_DefaultHitPosition;
+	int								m_DiseaseCount;
+	int								m_HealingsCount;
+	protected bool					m_AllowQuickRestrain;
+	protected bool					m_AllowQuickFishing;
+	protected int					m_Shakes;
+	protected int					m_ShakesForced;
+	int								m_BreathVapour;
+	int 							m_HealthLevel;
+	int 							m_MixedSoundStates;
+	int 							m_QuickBarBonus = 0;
+	bool							m_IsVehicleSeatDriver;
+	float							m_UnconsciousEndTime = 0;
+	int								m_BleedingSourceCount;
+	Head_Default 					m_CharactersHead;
+	EPulseType						m_PulseType;
+	PlayerBase						m_CheckPulseLastTarget;
+	int 							m_ForceInjuryAnimMask;
+	//string 						m_sOpticsType;
+	bool 							m_HideHairAnimated;
+	string 							m_DecayedTexture;
+	protected ref array<EntityAI>	m_ItemsToDelete;
+	int								m_BrokenLegState = eBrokenLegs.NO_BROKEN_LEGS; //Describe the current leg state, can go bellow 0, cannot be used directly to obtain broken legs state, use GetBrokenLegs() instead
+	int								m_LocalBrokenState = eBrokenLegs.NO_BROKEN_LEGS;
+	bool							m_BrokenLegsJunctureReceived;
+	ref EffectSound 				m_BrokenLegSound;
+	const string 					SOUND_BREAK_LEG = "broken_leg_SoundSet";
+	bool							m_CanPlayBrokenLegSound; //Used to check if sound has already been played
+	static bool						DEBUG_INVENTORY_ACCESS = false;
+	static ref array<string>		m_BleedingSourcesLow; //Stores all LOWER body part bleeding sources
+	static ref array<string>		m_BleedingSourcesUp; //Stores all UPPER body part bleeding sources EXCLUDING HEAD
+	float 							m_UnconRefillModifier = 1;
+	ref protected RandomGeneratorSyncManager m_RGSManager;
+	int 							m_AntibioticsActive;//ref count for antibiotics activation
+	
+	// CONTAMINATED AREA RELATED 
+	bool 							m_ContaminatedAreaEffectEnabled;
+	const string 					CONTAMINATED_AREA_AMBIENT = "ContaminatedArea_SoundSet";//obsolete, use EffectTrigger::GetAmbientSoundsetName() instead
+	EffectSound 					m_AmbientContamination;
+	protected int					m_ContaminatedAreaCount;
+	protected int					m_EffectAreaCount;
+	protected bool					m_InsideEffectArea;
+	protected bool					m_InsideEffectAreaPrev;
+	protected EffectTrigger			m_CurrentEffectTrigger;
+	
+	static ref array<Man> 			m_ServerPlayers = new array<Man>;
+	protected bool 					m_CanDisplayHitEffectPPE;
+	
+	protected string				m_CachedPlayerName;//cached from player identity
+	protected string				m_CachedPlayerID;//cached from player identity
+	
+	
+	#ifdef DIAG_DEVELOPER
+	int m_IsInsideTrigger;
+	bool m_CanBeTargetedDebug; //server-side only
+	ref array<EntityAI> m_PresetItems = new array<EntityAI>;
+	bool m_PresetSpawned;
+	ref CameraToolsMenuClient m_CameraToolsMenuClient;
+	#endif	
+	
+	#ifdef DEVELOPER
+	Transport m_GetInVehicleTransportDebug;
+	#endif
+	
+	#ifdef BOT
+	ref Bot							m_Bot;
+	#endif
+	
+	//Temp QuickBar load	
+	ref array<ref Param2<EntityAI,int> >	m_aQuickBarLoad;
+	
+	//hologram
+	ref Hologram m_HologramServer;
+	ref Hologram m_HologramLocal;
+	vector m_LocalProjectionPosition = "0 0 0 ";
+	vector m_LocalProjectionOrientation = "0 0 0 "; 
+
+	//Sheduler
+	float m_LastTick = -1;
+	int m_AddModifier = -1;
+	//crafting start
+	int m_RecipeID = -1;
+	EntityAI m_Item1;
+	EntityAI m_Item2;
+	bool m_IsCraftingReady;
+	float m_RecipeAnimLength;
+	vector m_CraftingInitialPos;
+	ref array<int> m_Recipes;
+	//crafting end
+	ref SoundParams m_SaySoundParams;
+	ref SoundObjectBuilder m_SaySoundBuilder;
+	ref SoundObject m_SaySoundObject;
+	string m_SaySoundLastSetName;
+	//input control
+	bool m_ActionQBControl;
+	
+	//Action data for base building actions
+	ref ConstructionActionData m_ConstructionActionData;
+	//Action data for fireplace (indoor)
+	vector m_LastFirePoint;
+	float m_LastFirePointRot;
+	int m_LastFirePointIndex;
+	
+	bool ItemToInventory;
+	bool m_IsFighting = false;
+	bool m_IsDrowning;//Set only via the setter SetDrowning
+
+	// debug monitor
+	int m_DebugMonitorEnabled;
+	
+	//map
+	ActionUnfoldMapCB m_hac;
+	bool m_MapOpen;
+	bool m_MapCloseRequestProcessed; //DEPRECATED
+	protected bool m_MapClosingSyncSent;
+	protected float m_LastMapScale = -1.0;
+	protected vector m_LastMapPos;
+	protected ref MapNavigationBehaviour 	m_MapNavigationBehaviour;
+	
+	//inventory soft locking
+	protected bool 					m_InventorySoftLocked; //obsolete, count should be checked instead. Left in here for legacy's sake.
+	protected int 					m_InventorySoftLockCount = 0;
+	static ref TStringArray			m_QBarItems;
+	
+	//Analytics
+	string							m_DatabaseID;
+	ref Timer						m_AnalyticsTimer;
+	
+	//! melee stats
+	protected bool 					m_MeleeDebug;
+	//protected bool 					m_CheckMeleeItem;
+	protected ItemBase 				m_CheckMeleeItem;
+	
+	//! user actions last message
+	protected string 				m_UALastMessage;
+	protected ref Timer 			m_UALastMessageTimer;
+	
+	bool 							m_WorkingNVGHeadset; //Deprecated
+	bool 							m_LoweredNVGHeadset;
+	protected ref array<int> 		m_ActiveNVTypes;
+	//bool 							m_PreviousNVGState;
+	int								m_SyncedModifiers;			
+	int								m_SyncedModifiersPrev;			
+	PluginAdminLog 					m_AdminLog; 
+	ref PlayerStomach m_PlayerStomach;
+	
+	protected static Particle m_ContaminatedAroundPlayer;
+	protected static Particle m_ContaminatedAroundPlayerTiny;
+	
+	protected PlayerStat<float> m_StatWater;
+	protected PlayerStat<float> m_StatToxicity;
+	protected PlayerStat<float> m_StatEnergy;
+	protected PlayerStat<float> m_StatHeatComfort;
+	protected PlayerStat<float> m_StatTremor;
+	protected PlayerStat<int> m_StatWet
+	protected PlayerStat<int> m_StatBloodType
+	protected PlayerStat<float> m_StatDiet
+	protected PlayerStat<float> m_StatStamina
+	protected PlayerStat<float> m_StatSpecialty
+	protected PlayerStat<float> m_StatHeatBuffer
+	
+	//!effect widgets
+	protected GameplayEffectWidgets_base 	m_EffectWidgets;
+	protected ref array<int> 				m_ProcessAddEffectWidgets;
+	protected ref array<int> 				m_ProcessRemoveEffectWidgets;
+	
+	//postprocess processing
+	protected ref array<int> 				m_ProcessAddGlassesEffects;
+	protected ref array<int> 				m_ProcessRemoveGlassesEffects;
+	
+	void PlayerBase()
+	{	
+		Init();
+	}
+	
+	void Init()
+	{
+		SetEventMask(EntityEvent.INIT|EntityEvent.POSTFRAME|EntityEvent.FRAME);
+		m_StoreLoadVersion = 0;
+		m_IsCraftingReady = false;
+		m_Recipes = new array<int>;
+		m_LastShavedSeconds = 0;
+		m_BloodType = 0;
+		m_HasBloodTypeVisible = false;
+		m_LifeSpanState = 0;
+		m_LifespanLevelLocal = -1;
+		m_CorpseState = 0;
+		m_CorpseStateLocal = 0;
+		m_HasBloodyHandsVisible = 0;
+		m_PlayerLoaded = false;
+		m_PlayerSelected = false;
+		m_ProcessUIWarning = false;
+		m_FlagRaisingTendency = true;
+		m_LiquidTendencyDrain = false;
+		m_UAParamMessage = new Param1<string>("");
+		m_UnconParam = new Param1<float>(0);
+		m_DeathDarkeningParam = new Param1<float>(0);
+		m_UAParam = new Param2<int,int>(0,0);
+		m_UAProgressParam = new Param2<float,float>(0,0);
+		m_QuickBarBase = new QuickBarBase(this);
+		m_QuickBarBonus = Math.Max(ConfigGetInt("quickBarBonus"), 0);
+		m_CargoLoad = 0;
+		m_VisibilityCoef = 1.0;
+		m_Hud = GetGame().GetMission().GetHud();
+		m_RecipePick = 0;
+		m_ActionQBControl = false;
+		m_QuickBarHold = false;
+		m_HideHairAnimated = true;
+		m_WorkingNVGHeadset = false;
+		m_LoweredNVGHeadset = false;
+		m_AreHandsLocked = false;
+		m_ItemsToDelete = new array<EntityAI>;
+		m_AnimCommandStarting = HumanMoveCommandID.None;
+		m_EmptyGloves = new HiddenSelectionsData(ConfigGetString("emptyGloves"));
+		m_CanDisplayHitEffectPPE = true;
+		
+		#ifdef DIAG_DEVELOPER
+			m_CanBeTargetedDebug = true;
+			//RegisterNetSyncVariableBool("m_CanBeTargetedDebug");
+		#endif
+		
+		m_AnalyticsTimer = new Timer(CALL_CATEGORY_SYSTEM);
+
+		m_StaminaHandler = new StaminaHandler(this);//current stamina calculation
+		m_InjuryHandler = new InjuryAnimationHandler(this);
+		m_ShockHandler = new ShockHandler(this); //New shock handler
+		m_HCAnimHandler = new HeatComfortAnimHandler(this);
+		m_PlayerStats = new PlayerStats(this);//player stats
+		m_ArrowManager = new ArrowManagerPlayer(this);
+		
+		if (GetGame().IsServer())
+		{
+			m_PlayerStomach = new PlayerStomach(this);
+			m_NotifiersManager = new NotifiersManager(this); // player notifiers 
+			m_AgentPool = new PlayerAgentPool(this); // agent pool manager
+			m_BleedingManagerServer = new BleedingSourcesManagerServer(this);
+			m_Environment = new Environment(this);//environment effects on player
+			m_ModifiersManager = new ModifiersManager(this); // player modifiers 
+			m_PlayerSoundManagerServer = new PlayerSoundManagerServer(this);
+			m_VirtualHud = new VirtualHud(this);
+			
+			m_AdminLog = PluginAdminLog.Cast(GetPlugin(PluginAdminLog));
+		}
+		
+		m_SymptomManager = new SymptomManager(this); // state manager
+		m_ModuleRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+		
+		m_TrasferValues = new TransferValues(this);
+		m_EmoteManager = new EmoteManager(this);
+		m_SoftSkillsManager = new SoftSkillsManager(this);//Soft Skills calculation
+		
+		m_WeaponManager = new WeaponManager(this);
+		m_DebugMonitorValues = new DebugMonitorValues(this);
+		m_RGSManager = new RandomGeneratorSyncManager(this);
+		
+		if (!GetGame().IsDedicatedServer())
+		{
+			m_MeleeDebug = false;
+			m_UALastMessage = "";
+			m_UALastMessageTimer = new Timer;
+			m_InventoryActionHandler = new InventoryActionHandler(this);
+			m_BleedingManagerRemote = new BleedingSourcesManagerRemote(this);
+			m_PlayerSoundManagerClient = new PlayerSoundManagerClient(this);
+			m_StanceIndicator = new StanceIndicator(this);
+			m_ActionsInitialize = false;
+			ClientData.AddPlayerBase(this);
+
+			m_ProcessAddEffectWidgets = new array<int>;
+			m_ProcessRemoveEffectWidgets = new array<int>;
+			m_ActiveNVTypes = new array<int>;
+			m_ProcessAddGlassesEffects = new array<int>;
+			m_ProcessRemoveGlassesEffects = new array<int>;
+		}
+
+		m_ActionManager = NULL;
+		//m_PlayerLightManager = NULL;
+		
+		m_ConfigEmotesProfile = PluginConfigEmotesProfile.Cast(GetPlugin(PluginConfigEmotesProfile));
+		
+		if (GetDayZGame().IsDebug())
+		{
+			PluginConfigDebugProfileFixed m_ConfigDebugProfileFixed = PluginConfigDebugProfileFixed.Cast(GetPlugin(PluginConfigDebugProfileFixed));
+			PluginConfigDebugProfile m_ConfigDebugProfile = PluginConfigDebugProfile.Cast(GetPlugin(PluginConfigDebugProfile));
+			PluginDeveloper m_Developer = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+			
+			PlayerBase player = this;
+			
+			if (m_ConfigDebugProfile)
+			{
+				string default_preset = m_ConfigDebugProfile.GetDefaultPreset();
+				if (player && default_preset != "")
+				{
+					TStringArray preset_array = new TStringArray;
+					m_ConfigDebugProfileFixed.GetPresetItems(default_preset, preset_array);
+					
+					bool is_preset_fixed = true;
+					if (preset_array.Count() == 0)
+					{
+						m_ConfigDebugProfile.GetPresetItems(default_preset, preset_array);
+						is_preset_fixed = false;
+					}
+					
+					if (preset_array.Count() > 0)
+					{
+						m_Developer.ClearInventory(player);
+						
+						for (int i = 0; i < preset_array.Count(); i++)
+						{
+							float health = -1;
+							int quantity = -1;
+							if (is_preset_fixed)
+							{
+								health = m_ConfigDebugProfileFixed.GetItemHealth(default_preset, i);
+								quantity = m_ConfigDebugProfileFixed.GetItemQuantity(default_preset, i);
+							}
+							else
+							{
+								health = m_ConfigDebugProfile.GetItemHealth(default_preset, i);
+								quantity = m_ConfigDebugProfile.GetItemQuantity(default_preset, i);
+							}
+							m_Developer.SpawnEntityInPlayerInventory(player, preset_array.Get(i), health, quantity);
+						}
+					}
+				}
+			}
+		}
+		
+		m_MapNavigationBehaviour			= new MapNavigationBehaviour(this);
+		
+		m_ModulePlayerStatus	= PluginPlayerStatus.Cast(GetPlugin(PluginPlayerStatus));
+		m_ModuleLifespan		= PluginLifespan.Cast(GetPlugin(PluginLifespan));
+		
+		m_BleedingSourcesLow = new array<string>;
+		m_BleedingSourcesLow.Insert("RightToeBase");
+		m_BleedingSourcesLow.Insert("RightFoot");
+		m_BleedingSourcesLow.Insert("LeftToeBase");
+		m_BleedingSourcesLow.Insert("LeftFoot");
+		m_BleedingSourcesLow.Insert("RightUpLegRoll");
+		m_BleedingSourcesLow.Insert("RightUpLeg");
+		m_BleedingSourcesLow.Insert("RightLegRoll");
+		m_BleedingSourcesLow.Insert("RightLeg");
+		m_BleedingSourcesLow.Insert("LeftUpLegRoll");
+		m_BleedingSourcesLow.Insert("LeftUpLeg");
+		m_BleedingSourcesLow.Insert("LeftLegRoll");
+		m_BleedingSourcesLow.Insert("LeftLeg");
+		
+		m_BleedingSourcesUp = new array<string>;
+		m_BleedingSourcesUp.Insert("RightForeArmRoll");
+		m_BleedingSourcesUp.Insert("LeftForeArmRoll");
+		m_BleedingSourcesUp.Insert("RightForeArm");
+		m_BleedingSourcesUp.Insert("RightArmRoll");
+		m_BleedingSourcesUp.Insert("RightArm");
+		m_BleedingSourcesUp.Insert("RightShoulder");
+		m_BleedingSourcesUp.Insert("LeftForeArm");
+		m_BleedingSourcesUp.Insert("LeftArmRoll");
+		m_BleedingSourcesUp.Insert("LeftArm");
+		m_BleedingSourcesUp.Insert("LeftShoulder");
+		m_BleedingSourcesUp.Insert("Spine3");
+		m_BleedingSourcesUp.Insert("Spine2");
+		m_BleedingSourcesUp.Insert("Spine1");
+		m_BleedingSourcesUp.Insert("Spine");
+		m_BleedingSourcesUp.Insert("Pelvis");
+		m_BleedingSourcesUp.Insert("Neck");
+		
+		RegisterNetSyncVariableInt("m_LifeSpanState", LifeSpanState.BEARD_NONE, LifeSpanState.COUNT);
+		RegisterNetSyncVariableInt("m_BloodType", 0, 128);
+		RegisterNetSyncVariableInt("m_ShockSimplified",0, SIMPLIFIED_SHOCK_CAP);
+		RegisterNetSyncVariableInt("m_SoundEvent",0, EPlayerSoundEventID.ENUM_COUNT - 1);
+		RegisterNetSyncVariableInt("m_SoundEventParam", 0, ((EPlayerSoundEventParam.ENUM_COUNT - 1) * 2) - 1);
+		RegisterNetSyncVariableInt("m_StaminaState",0, eStaminaState.COUNT - 1);
+		RegisterNetSyncVariableInt("m_BleedingBits");
+		RegisterNetSyncVariableInt("m_Shakes", 0, SHAKE_LEVEL_MAX);
+		RegisterNetSyncVariableInt("m_BreathVapour", 0, BREATH_VAPOUR_LEVEL_MAX);
+		RegisterNetSyncVariableInt("m_HealthLevel", eInjuryHandlerLevels.PRISTINE, eInjuryHandlerLevels.RUINED);
+		RegisterNetSyncVariableInt("m_MixedSoundStates", 0, eMixedSoundStates.COUNT - 1);
+		RegisterNetSyncVariableInt("m_CorpseState",-PlayerConstants.CORPSE_STATE_DECAYED,PlayerConstants.CORPSE_STATE_DECAYED);//do note the negative min, negative sign denotes a special meaning
+		RegisterNetSyncVariableInt("m_RefreshAnimStateIdx",0,3);
+		RegisterNetSyncVariableInt("m_BrokenLegState", -eBrokenLegs.BROKEN_LEGS_SPLINT, eBrokenLegs.BROKEN_LEGS_SPLINT);
+		RegisterNetSyncVariableInt("m_SyncedModifiers", 0, ((eModifierSyncIDs.LAST_INDEX - 1) * 2) - 1);
+		RegisterNetSyncVariableInt("m_HasBloodyHandsVisible", 0, eBloodyHandsTypes.LAST_INDEX - 1);
+		RegisterNetSyncVariableInt("m_ActionSoundCategoryHash");
+		
+		RegisterNetSyncVariableBool("m_IsUnconscious");
+		RegisterNetSyncVariableBool("m_IsRestrained");
+		RegisterNetSyncVariableBool("m_IsInWater");
+		RegisterNetSyncVariableBool("m_InsideEffectArea");
+		
+		RegisterNetSyncVariableBool("m_HasBloodTypeVisible");
+		//RegisterNetSyncVariableBool("m_LiquidTendencyDrain");
+		RegisterNetSyncVariableBool("m_IsRestrainStarted");
+		RegisterNetSyncVariableBool("m_IsRestrainPrelocked");
+		RegisterNetSyncVariableBool("m_HasHeatBuffer");
+		
+		RegisterNetSyncVariableFloat("m_CurrentShock"); //Register shock synchronized variable
+		
+		m_OriginalSlidePoseAngle = GetSlidePoseAngle();
+		
+		//! sets default hit position and cache it here (mainly for impact particles)
+		m_DefaultHitPosition = SetDefaultHitPosition(GetDayZPlayerType().GetDefaultHitPositionComponent());
+		
+		m_DecayedTexture = ConfigGetString("decayedTexture");
+		m_FliesIndex = -1;
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(this.OnPlayerLoaded);
+	}
+	
+	void IncreaseAntibioticsCount()
+	{
+		m_AntibioticsActive++;
+	}	
+	
+	void DecreaseAntibioticsCount()
+	{
+		m_AntibioticsActive--;
+		if (m_AntibioticsActive < 0)
+		{
+			m_AntibioticsActive = 0;
+			Error("DecreaseAntibioticsCount called more times than IncreaseAntibioticsCount (should be equal) - check your code, forcing clamp to 0");
+		}
+	}
+	
+	bool IsAntibioticsActive()
+	{
+		return (m_AntibioticsActive > 0);
+	}
+	
+	void SetSoundCategoryHash(int hash)
+	{
+		m_ActionSoundCategoryHash = hash;
+		SetSynchDirty();
+	}
+	
+	
+	void RequestTriggerEffect(EffectTrigger trigger, int ppeIdx = -1, int aroundId = ParticleList.CONTAMINATED_AREA_GAS_AROUND, int tinyId = ParticleList.CONTAMINATED_AREA_GAS_TINY,  string soundset = "",  bool partDynaUpdate = false, int newBirthRate = 0, bool forceUpdate = false)
+	{
+		//do note multiple triggers can be calling this method within a single frame depending on the contaminated area setup and dynamic gameplay events(such as gas grenades being deployed)
+		
+		if (!m_InsideEffectArea)
+			return;
+		bool allow = false;
+		if (!m_CurrentEffectTrigger)
+		{
+			allow = true;
+		}
+		else if (trigger == m_CurrentEffectTrigger && forceUpdate)
+		{
+			allow = true;
+			//Print("ON Enabling effect FORCED " + trigger);
+		}
+		else if (trigger.GetEffectsPriority() >  m_CurrentEffectTrigger.GetEffectsPriority())
+		{
+			RemoveCurrentEffectTrigger();
+			allow = true;
+		}
+		if (allow)
+		{
+			/*
+			Print("--------------------------------------------------");
+			Print("ON Enabling effect " + trigger);
+			Print("------------> soundset " + soundset);
+			Print("--------------------------------------------------");
+			*/
+			m_CurrentEffectTrigger = trigger;
+			SetContaminatedEffectEx( true, ppeIdx, aroundId, tinyId, soundset,partDynaUpdate, newBirthRate );
+		}
+	}
+	
+	
+	void RemoveCurrentEffectTrigger()
+	{
+		if (m_CurrentEffectTrigger)
+		{
+			/*
+			Print("--------------------------------------------------");
+			Print("OFF Disabling effect");
+			Print("--------------------------------------------------");
+			*/
+			SetContaminatedEffectEx( false, m_CurrentEffectTrigger.m_PPERequester );
+			m_CurrentEffectTrigger = null;
+		}
+	}
+	
+	void IncreaseContaminatedAreaCount()
+	{
+		if (m_ContaminatedAreaCount == 0)
+			OnContaminatedAreaEnterServer();
+		m_ContaminatedAreaCount++;
+	}
+	
+	void DecreaseContaminatedAreaCount()
+	{
+		m_ContaminatedAreaCount--;
+		if (m_ContaminatedAreaCount <= 0)
+		{
+			m_ContaminatedAreaCount = 0;
+			OnContaminatedAreaExitServer();
+		}
+	}	
+	void IncreaseEffectAreaCount()
+	{
+		if (m_EffectAreaCount == 0)
+		{
+			m_InsideEffectArea = true;
+			SetSynchDirty();
+			OnPlayerIsNowInsideEffectAreaBeginServer();
+		}
+		m_EffectAreaCount++;
+	}
+	
+	void DecreaseEffectAreaCount()
+	{
+		m_EffectAreaCount--;
+		if (m_EffectAreaCount <= 0)
+		{
+			m_EffectAreaCount = 0;
+			m_InsideEffectArea = false;
+			SetSynchDirty();
+			OnPlayerIsNowInsideEffectAreaEndServer();
+		}
+	}
+	
+	
+	protected void OnContaminatedAreaEnterServer()
+	{
+		GetModifiersManager().ActivateModifier( eModifiers.MDF_AREAEXPOSURE );
+		//Print("Contaminated ENTERED <------------------------------------------------------------- FINAL");
+	}
+	
+	protected void OnContaminatedAreaExitServer()
+	{
+		GetModifiersManager().DeactivateModifier( eModifiers.MDF_AREAEXPOSURE );
+		//Print("Contaminated LEFT <------------------------------------------------------------- FINAL");
+	}	
+	
+	protected void OnPlayerIsNowInsideEffectAreaBeginServer()
+	{
+		//Print("ANY EFFECT AREA ENTERED <------------------------------------------------------------- FINAL");
+	}
+	
+	protected void OnPlayerIsNowInsideEffectAreaEndServer()
+	{
+		//Print("ANY EFFECT AREA LEFT <------------------------------------------------------------- FINAL");
+	}
+	
+	protected void OnPlayerIsNowInsideEffectAreaBeginClient()
+	{
+		//Print("ANY EFFECT AREA ENTERED CLIENT <------------------------------------------------------------- FINAL");
+	}
+	
+	protected void OnPlayerIsNowInsideEffectAreaEndClient()
+	{
+		RemoveCurrentEffectTrigger();
+		//Print("ANY EFFECT AREA LEFT CLIENT <------------------------------------------------------------- FINAL");
+	}
+	
+	//! Returns item that's on this player's attachment slot. Parameter slot_type should be a string from config parameter 'itemInfo[]' like "Legs", "Headgear" and so on.
+	ItemBase GetItemOnSlot(string slot_type)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString(slot_type);
+		EntityAI item_EAI = this.GetInventory().FindAttachment(slot_id);
+		ItemBase item_IB = ItemBase.Cast(item_EAI);
+		
+		if (item_EAI  &&  !item_IB)
+		{
+			string str = "Warning! GetItemOnSlot() >> found item on slot " + slot_type + " can't be cast to ItemBase! Found item is " + item_EAI.GetType() + " and the player is " + GetType() + "!";
+			Error(str);
+			return null;
+		}
+		
+		return item_IB;
+	}
+	
+	//! Returns item on player's head. For an example, a headtorch.
+	ItemBase GetItemOnHead()
+	{
+		return GetItemOnSlot("Headgear");
+	}
+	
+	override int GetQuickBarBonus()
+	{
+		return m_QuickBarBonus;
+	}
+	
+	//--------------------------------------------------------------------------
+	// Inventory overrides
+	//--------------------------------------------------------------------------
+	override bool CanDropEntity (notnull EntityAI item)
+	{
+		if (GetInventory().HasInventoryReservation(item, null))
+		{
+			return false;
+		}
+		
+		if (IsRestrained())
+		{
+			if (GetHumanInventory().GetEntityInHands() == item)
+				return false;
+		}
+		
+		return true; 
+	}
+
+	//--------------------------------------------------------------------------
+	// PLAYER DAMAGE EVENT HANDLING
+	//--------------------------------------------------------------------------
+	
+	int GetBreathVapourLevel()
+	{
+		return m_BreathVapour;
+	}
+	
+	// adds state to and syncs sound states variable which is used to generate sound client-side
+	void UnsetMixedSoundState(eMixedSoundStates state)
+	{
+		int bit_mask_remove = ~state;
+		
+		eMixedSoundStates new_states = m_MixedSoundStates & bit_mask_remove;
+
+		if (new_states != m_MixedSoundStates)
+		{
+			m_MixedSoundStates = new_states;
+			SetSynchDirty();
+		}
+	}
+	
+	// adds state to and syncs sound states variable which is used to generate sound client-side
+	void SetMixedSoundState(eMixedSoundStates state)
+	{
+		eMixedSoundStates new_states = m_MixedSoundStates | state;
+		
+		if (new_states != m_MixedSoundStates)
+		{
+			m_MixedSoundStates = new_states;
+			SetSynchDirty();
+		}
+	}
+	
+	override bool IsPlayer()
+	{
+		return true;
+	}
+	
+	bool IsBleeding()
+	{
+		return (m_BleedingBits != 0);
+	}
+	
+	void SetBleedingBits(int bits)
+	{
+		if (m_BleedingBits != bits)
+		{
+			if (m_BleedingBits == 0)
+			{
+				OnBleedingBegin();
+			}
+			else if (bits == 0)
+			{
+				OnBleedingEnd();
+			}
+		}
+		m_BleedingBits = bits;
+		SetSynchDirty();
+	}
+	
+	int GetBleedingBits()
+	{
+		return m_BleedingBits;
+	}
+	
+	void IncreaseDiseaseCount()
+	{
+		m_DiseaseCount++;
+	}
+	
+	void DecreaseDiseaseCount()
+	{
+		m_DiseaseCount--;
+	}	
+	
+	void IncreaseHealingsCount()
+	{
+		m_HealingsCount++;
+	}
+	
+	void DecreaseHealingsCount()
+	{
+		m_HealingsCount--;
+	}
+	
+	
+	bool HasHealings()
+	{
+		return m_HealingsCount;//0 for no healings, 1+ for healings, gets truncated to 1
+	}
+	
+	bool HasDisease()
+	{
+		return m_DiseaseCount;//0 for no disease, 1+ for disease, gets truncated to 1
+	}
+	
+	
+	EPulseType GetPulseType()
+	{
+		return m_PulseType;
+	}
+	
+	void SetPulseType(EPulseType pulse_type)
+	{
+		m_PulseType = pulse_type;
+	}
+	
+	void QueueAddEffectWidget(array<int> effects)
+	{
+		m_ProcessAddEffectWidgets.InsertArray(effects);
+	}
+	
+	void QueueRemoveEffectWidget(array<int> effects)
+	{
+		m_ProcessRemoveEffectWidgets.InsertArray(effects);
+	}
+	
+	void QueueAddGlassesEffect(int id)
+	{
+		m_ProcessAddGlassesEffects.Insert(id);
+	}
+	
+	void QueueRemoveGlassesEffect(int id)
+	{
+		m_ProcessRemoveGlassesEffects.Insert(id);
+	}
+	
+	DamageDealtEffect GetDamageDealtEffect()
+	{
+		return m_DamageDealtEffect;
+	}
+	
+	override void SpawnDamageDealtEffect()
+	{
+		if (m_DamageDealtEffect)
+		{
+			delete m_DamageDealtEffect;
+		}
+		
+		if (m_CanDisplayHitEffectPPE)
+		{
+			m_DamageDealtEffect = new DamageDealtEffect();
+		}
+	}
+	
+	void SpawnDamageDealtEffect2(Param param1 = null, Param param2 = null)
+	{
+		if (m_EffectRadial)
+		{
+			delete m_EffectRadial;
+		}
+		
+		m_EffectRadial = new EffectRadial(param1,param2);
+	}
+	
+	FlashbangEffect GetFlashbangEffect()
+	{
+		return m_FlashbangEffect;
+	}
+	
+	void SpawnFlashbangEffect(PlayerBase player, bool visual)
+	{
+		if (m_FlashbangEffect)
+		{
+			m_FlashbangEffect.Stop();
+			delete m_FlashbangEffect;
+		}
+		
+		m_FlashbangEffect = new FlashbangEffect(player, visual);
+	}
+	
+	ShockDealtEffect GetShockEffect()
+	{
+		return m_ShockDealtEffect;
+	}
+	
+	void SpawnShockEffect(float intensity_max)
+	{
+		if (m_ShockDealtEffect)
+		{
+			delete m_ShockDealtEffect;
+		}
+		
+		m_ShockDealtEffect = new ShockDealtEffect(intensity_max);
+	}
+	
+	override void EEKilled(Object killer)
+	{
+		//Print(Object.GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " event EEKilled, player has died at STS=" + GetSimulationTimeStamp());
+		
+		if (m_AdminLog)
+		{
+			m_AdminLog.PlayerKilled(this, killer);
+		}
+		
+		if (GetBleedingManagerServer()) 
+			delete GetBleedingManagerServer();
+		
+		if (GetModifiersManager())
+			GetModifiersManager().DeactivateAllModifiers();
+
+		// kill character in database
+		if (GetHive())
+		{
+			GetHive().CharacterKill(this);
+		}
+	
+		// disable voice communication
+		GetGame().EnableVoN(this, false); 
+		if (!GetGame().IsDedicatedServer())
+			ClientData.RemovePlayerBase(this);
+		GetSymptomManager().OnPlayerKilled();
+		
+		if (GetEconomyProfile() && !m_CorpseProcessing && m_CorpseState == 0 && GetGame().GetMission().InsertCorpse(this))
+		{
+			m_CorpseProcessing = true;
+			//Print("EEKilled - processing corpse");
+		}
+		
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+		{
+			if (GetGame().GetMission())
+			{
+				GetGame().GetMission().SyncRespawnModeInfo(GetIdentity());
+			}
+		}
+		
+		super.EEKilled(killer);
+	}
+
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+		
+		if (m_AdminLog)
+		{
+			m_AdminLog.PlayerHitBy(damageResult, damageType, this, source, component, dmgZone, ammo);
+		}
+		
+		if (damageResult != null && damageResult.GetDamage(dmgZone, "Shock") > 0)
+		{
+			m_LastShockHitTime = GetGame().GetTime();
+			
+			if (!IsUnconscious())
+			{
+				if (GetGame().ConfigIsExisting("cfgAmmo " + ammo + " unconRefillModifier"))
+				{
+					m_UnconRefillModifier = GetGame().ConfigGetInt("cfgAmmo " + ammo + " unconRefillModifier");
+				}
+				else
+				{
+					m_UnconRefillModifier = 1;
+				}
+			}
+		}
+		
+		 //! DT_EXPLOSION & FlashGrenade
+		if (damageType == DT_EXPLOSION && ammo == "FlashGrenade_Ammo")
+		{
+			GetStaminaHandler().DepleteStamina(EStaminaModifiers.OVERALL_DRAIN);
+		}
+		
+		//new bleeding computation
+		//---------------------------------------
+		if (damageResult != null && GetBleedingManagerServer())
+		{
+			float dmg = damageResult.GetDamage(dmgZone, "Blood");
+			GetBleedingManagerServer().ProcessHit(dmg, source, component, dmgZone, ammo, modelPos);
+		}
+		//---------------------------------------
+		
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DEBUG))
+			Print("EEHitBy() | " + GetDisplayName() + " hit by " + source.GetDisplayName() + " to " + dmgZone);
+		
+		PluginRemotePlayerDebugServer plugin_remote_server = PluginRemotePlayerDebugServer.Cast(GetPlugin(PluginRemotePlayerDebugServer));
+		if (plugin_remote_server)
+		{
+			plugin_remote_server.OnDamageEvent(this, damageResult);
+		}
+		#endif
+		
+		if (GetGame().IsDebugMonitor())
+			m_DebugMonitorValues.SetLastDamage(source.GetDisplayName());
+		
+		if (m_ActionManager)
+			m_ActionManager.Interrupt();
+		
+		int transferShockToDamageCoef = g_Game.ConfigGetInt(string.Format("%1 %2 DamageApplied transferShockToDamage", CFG_AMMO, ammo));
+		if (transferShockToDamageCoef == 1)
+		{
+			//Print("PlayerBase | EEHitBy | nonlethal hit");
+			AddHealth("", "Health", -ConvertNonlethalDamage(damageResult.GetDamage(dmgZone, "Shock"), damageType));
+			if (dmgZone != "Head")
+				AddHealth(dmgZone, "Health", -damageResult.GetDamage(dmgZone, "Shock")); //Also deal damage to zone health, no dmg reduction
+		}
+		
+		if (GetGame().IsServer())
+		{
+			if (GetHealth("RightLeg", "Health") <= 1 || GetHealth("LeftLeg", "Health") <= 1 || GetHealth("RightFoot", "Health") <= 1 || GetHealth("LeftFoot", "Health") <= 1)
+			{
+				if (GetModifiersManager().IsModifierActive(eModifiers.MDF_BROKEN_LEGS))//effectively resets the modifier
+				{
+					GetModifiersManager().DeactivateModifier(eModifiers.MDF_BROKEN_LEGS);
+				}
+				GetModifiersManager().ActivateModifier(eModifiers.MDF_BROKEN_LEGS);
+			}
+			
+			if (ammo == "Bullet_CupidsBolt" && IsAlive())
+			{
+				DamageSystem.ResetAllZones(this);
+				m_ModifiersManager.ResetAll();
+				m_ModifiersManager.ActivateModifier(eModifiers.MDF_IMMUNITYBOOST);
+				
+				// bleeding sources
+				if (m_BleedingManagerServer)
+					m_BleedingManagerServer.RemoveAllSources();
+				
+				// Stats
+				if (GetPlayerStats())
+				{
+					int bloodType 		= GetStatBloodType().Get();
+					float energyValue 	= GetStatEnergy().Get();
+					float waterValue 	= GetStatWater().Get();
+					float heatBuffer	= GetStatHeatBuffer().Get();
+					float heatComfort	= GetStatHeatComfort().Get();
+
+					GetPlayerStats().ResetAllStats();
+
+					GetStatBloodType().Set(bloodType);
+					GetStatWater().Set(waterValue);
+					GetStatEnergy().Set(energyValue);
+					GetStatHeatBuffer().Set(heatBuffer);
+					GetStatHeatComfort().Set(heatComfort);
+				}
+	
+				// Agents
+				if (m_AgentPool)
+					m_AgentPool.RemoveAllAgents();
+				
+				if (m_StaminaHandler)
+					m_StaminaHandler.SetStamina(GameConstants.STAMINA_MAX);
+				
+				// uncon
+				if (IsUnconscious())
+					DayZPlayerSyncJunctures.SendPlayerUnconsciousness(this, false);
+			}
+		}
+		
+		m_ShockHandler.CheckValue(true);
+		
+		//analytics
+		GetGame().GetAnalyticsServer().OnEntityHit(source, this);
+	}
+	
+	override void EEHitByRemote(int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos)
+	{
+		super.EEHitByRemote(damageType, source, component, dmgZone, ammo, modelPos);
+
+		if (m_MeleeFightLogic.IsInBlock())
+		{
+			EffectSound sound = SEffectManager.PlaySoundOnObject("BlockingAttack_SoundSet", this);
+			sound.SetAutodestroy(true);
+		}
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		SEffectManager.DestroyEffect(m_FliesEff);
+		StopSoundSet(m_SoundFliesEffect);
+
+		if (GetArrowManager())
+			GetArrowManager().ClearArrows();
+	}
+
+	override protected float ConvertNonlethalDamage(float damage, DamageType damageType)
+	{
+		return damage * GameConstants.NL_DAMAGE_FIREARM_CONVERSION_PLAYERS;
+	}
+	
+	/** Call only on client or single player PlayerBase
+ 	 *  (as GetGame().GetPlayer())
+	 */
+	override void OnReceivedHit(ImpactEffectsData hitData)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			float shakeStrength = Math.InverseLerp(0, 500, hitData.m_InSpeed.Length());
+			GetCurrentCamera().SpawnCameraShake(shakeStrength);
+			OnPlayerRecievedHit();
+		}
+					
+		if (hitData.m_AmmoType == "Bullet_CupidsBolt")
+			Ammo_CupidsBolt.PlayOnHitParticle(hitData.m_Position);
+
+			//ParticleManager.GetInstance().PlayInWorld(ParticleList.BOLT_CUPID_HIT, hitData.m_Position);
+	}
+
+	// DEPRECATED by method above
+	override void OnPlayerRecievedHit()
+	{
+		#ifndef NO_GUI
+		if (m_MeleeFightLogic.IsInBlock())
+		{
+			EffectSound sound = SEffectManager.PlaySoundOnObject("BlockingAttack_SoundSet", this);
+			sound.SetAutodestroy(true);
+			return;
+		}
+
+		SpawnDamageDealtEffect();
+		CachedObjectsParams.PARAM2_FLOAT_FLOAT.param1 = 32;
+		CachedObjectsParams.PARAM2_FLOAT_FLOAT.param2 = 0.3;
+		SpawnDamageDealtEffect2(CachedObjectsParams.PARAM2_FLOAT_FLOAT);
+		
+		CloseMapEx(true);		
+		#endif
+	}
+	
+	void OnPlayerReceiveFlashbangHitStart(bool visual)
+	{
+		SpawnFlashbangEffect(this, visual);
+	}
+
+	void OnPlayerReceiveFlashbangHitEnd() {}
+
+	//--------------------------------------------------------------------------	
+	//! Melee helpers
+	//--------------------------------------------------------------------------
+
+	//! select & return hit component for attacking AI
+	override string GetHitComponentForAI()
+	{
+		return GetDayZPlayerType().GetHitComponentForAI();
+	}
+
+	//! returns default hit component (fallback)
+	override string GetDefaultHitComponent()
+	{
+		return GetDayZPlayerType().GetDefaultHitComponent();
+	}
+	
+	override vector GetDefaultHitPosition()
+	{
+		return m_DefaultHitPosition;
+	}
+	
+	//! returns list of suitable finisher hit components (defined on base entity/entity type)
+	override array<string> GetSuitableFinisherHitComponents()
+	{
+		return GetDayZPlayerType().GetSuitableFinisherHitComponents();
+	}
+	
+	protected vector SetDefaultHitPosition(string pSelection)
+	{
+		return GetSelectionPositionMS(pSelection);
+	}
+
+	//--------------------------------------------------------------------------
+	//!DEPRECATED!
+	void AddPossibleCoverFaceForShave()
+	{
+		 m_FaceCoveredForShaveLayers++;
+	}
+	//!DEPRECATED!
+	void RemovePossibleCoverFaceForShave()
+	{
+		 m_FaceCoveredForShaveLayers--;
+	} 
+	//--------------------------------------------------------------------------
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+
+		ItemBase itemIB = ItemBase.Cast(item);
+		SwitchItemSelectionTexture(item, slot_name);
+		Param1<PlayerBase> p = new Param1<PlayerBase>(this);
+		item.SwitchItemSelectionTextureEx(EItemManipulationContext.ATTACHING, p);
+		m_QuickBarBase.updateSlotsCount();
+		CalculateVisibilityForAI();
+		UpdateShoulderProxyVisibility(item, slot_name);
+		
+		HideHairSelections(itemIB,true);
+		
+		GetGame().GetAnalyticsClient().OnItemAttachedAtPlayer(item, slot_name);
+		Clothing clothing = Clothing.Cast(item);
+		if (clothing)
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				if (clothing.GetEffectWidgetTypes())
+				{
+					QueueAddEffectWidget(clothing.GetEffectWidgetTypes());
+				}
+				
+				if (clothing.GetGlassesEffectID() > -1)
+				{
+					QueueAddGlassesEffect(clothing.GetGlassesEffectID());
+				}
+				
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(UpdateCorpseStateVisual, 200, false);//sometimes it takes a while to load in
+				UpdateCorpseStateVisual();//....but if possible, we don't want a delay
+			}
+			else if (GetGame().IsServer())
+			{
+				if (clothing.IsGasMask())
+				{
+					GetModifiersManager().ActivateModifier(eModifiers.MDF_MASK);
+				}
+			}
+			
+			clothing.UpdateNVGStatus(this,true);
+		}
+		
+		AdjustBandana(item,slot_name);
+	}
+	
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		super.EEItemDetached(item, slot_name);
+		ItemBase item_base = ItemBase.Cast(item);
+		SwitchItemSelectionTexture(item, slot_name);
+		item.SwitchItemSelectionTextureEx(EItemManipulationContext.DETACHING);
+		m_QuickBarBase.updateSlotsCount();
+		CalculateVisibilityForAI();
+		
+		HideHairSelections(item_base,false);
+		
+		Clothing clothing = Clothing.Cast(item);
+		
+		if (clothing)
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				if (clothing.GetEffectWidgetTypes())
+				{
+					QueueRemoveEffectWidget(clothing.GetEffectWidgetTypes());
+				}
+				
+				if (clothing.GetGlassesEffectID() > -1)
+				{
+					QueueRemoveGlassesEffect(clothing.GetGlassesEffectID());
+				}
+			}
+			
+			if (GetGame().IsServer())
+			{
+				if (clothing.IsGasMask())
+				{
+					GetModifiersManager().DeactivateModifier(eModifiers.MDF_MASK);
+				}
+			}
+			
+			clothing.UpdateNVGStatus(this);
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(UpdateCorpseStateVisual, 200, false);//sometimes it takes a while to load in
+			UpdateCorpseStateVisual();//....but if possible, we don't want a delay
+		}
+	}
+	
+	void SwitchItemTypeAttach(EntityAI item, string slot)
+	{
+		//Print("SwitchItemTypeAttach: " + item.GetType());
+		if (!GetGame().IsServer())
+			return;
+		
+		/*InventoryLocation invloc = new InventoryLocation;
+		
+		item.GetInventory().GetCurrentInventoryLocation(invloc);
+		//Print(invloc.DumpToString());
+		if (item.ConfigIsExisting("ChangeIntoOnAttach") && invloc.GetType() != InventoryLocationType.UNKNOWN)
+		{
+			string str = item.ChangeIntoOnAttach(slot);
+			if (str != "")
+			{
+				string typestr = item.GetType();
+				MiscGameplayFunctions.TurnItemIntoItem(ItemBase.Cast(item), str, this);
+			}
+		}*/
+	}
+	
+	void SwitchItemTypeDetach(EntityAI item, string slot)
+	{
+		//Print("SwitchItemTypeDetach: " + item.GetType());
+	}
+	
+	void UpdateShoulderProxyVisibility(EntityAI item, string slot_name)
+	{
+		string slot = slot_name;
+		bool boo;
+		boo = item.IsWeapon();
+		
+		if (slot == "Melee")
+		{
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_MELEE_RIFLE,boo);
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_MELEE_MELEE,!boo);
+		}
+		else if (slot == "Shoulder")
+		{
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_SHOULDER_RIFLE,boo);
+			SetSimpleHiddenSelectionState(SIMPLE_SELECTION_SHOULDER_MELEE,!boo);
+		}
+	}
+	
+	override void SwitchItemSelectionTexture(EntityAI item, string slot_name)
+	{
+		super.SwitchItemSelectionTexture(item,slot_name);
+		
+		//shirt + armband
+		EntityAI armband = FindAttachmentBySlotName("Armband");
+		if (slot_name == "Body" && armband)
+		{
+			Param1<PlayerBase> p = new Param1<PlayerBase>(this);
+			armband.SwitchItemSelectionTextureEx(EItemManipulationContext.UPDATE,p);
+		}
+	}
+	
+	void RemoveAllItems()
+	{
+		array<EntityAI> itemsArray = new array<EntityAI>;
+		ItemBase item;
+		GetInventory().EnumerateInventory(InventoryTraversalType.PREORDER, itemsArray);
+		
+		for (int i = 0; i < itemsArray.Count(); i++)
+		{
+			Class.CastTo(item, itemsArray.Get(i));
+			if (item && !item.IsInherited(SurvivorBase))	GetInventory().LocalDestroyEntity(item);
+		}
+	}
+	
+	bool GetHitPPEEnabled()
+	{
+		return m_CanDisplayHitEffectPPE;
+	}
+	
+	void SetHitPPEEnabled(bool enabled)
+	{
+		m_CanDisplayHitEffectPPE = enabled;
+	}
+	
+	bool IsMale()
+	{
+		if (ConfigGetBool("woman") != 1)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	int GetVoiceType()
+	{
+		int voice_type = ConfigGetInt("voiceType");
+		
+		if (voice_type == 0)
+		{
+			voice_type = 1;
+		}
+		
+		return voice_type;
+	}
+	
+	PlayerSoundManagerServer GetPlayerSoundManagerServer()
+	{
+		return m_PlayerSoundManagerServer;
+	}
+		
+	
+	UndergroundHandlerClient GetUndergroundHandler()
+	{
+		if (!m_UndergroundHandler && IsAlive())
+		{
+			m_UndergroundHandler = new UndergroundHandlerClient(this);
+		}
+		
+		return m_UndergroundHandler;
+	}
+	
+	void KillUndergroundHandler()
+	{
+		m_UndergroundHandler = null;
+	}
+	// --------------------------------------------------
+	// User Actions
+	//---------------------------------------------------
+	void SetActions(out TInputActionMap InputActionMap)
+	{
+		AddAction(ActionOpenDoors, InputActionMap);
+		AddAction(ActionCloseDoors, InputActionMap);
+		AddAction(ActionLockedDoors, InputActionMap);
+		AddAction(ActionEnterLadder, InputActionMap);
+		AddAction(ActionExitLadder, InputActionMap);
+		
+		//-----------CheckIfCanMOveToTarget----------
+		AddAction(ActionStartEngine, InputActionMap);
+		AddAction(ActionStopEngine, InputActionMap);
+		AddAction(ActionSwitchSeats, InputActionMap);
+		AddAction(ActionOpenCarDoors,InputActionMap);
+		AddAction(ActionCloseCarDoors,InputActionMap);
+		AddAction(ActionUncoverHeadSelf, InputActionMap);
+		AddAction(ActionDrinkPondContinuous, InputActionMap);
+		AddAction(ActionIgniteFireplaceByAir, InputActionMap);
+		AddAction(ActionMineBushByHand, InputActionMap);
+		
+		AddAction(ActionUngagSelf, InputActionMap);
+		AddAction(ActionWashHandsWater, InputActionMap);
+		AddAction(ActionGetOutTransport, InputActionMap);
+		
+		AddAction(ActionUnrestrainTargetHands, InputActionMap);
+		AddAction(ActionTakeArrow, InputActionMap);
+		AddAction(ActionTakeArrowToHands, InputActionMap);
+	}
+	
+	void SetActions() // Backwards compatibility, not recommended to use
+	{
+	}
+	
+	void SetActionsRemoteTarget(out TInputActionMap InputActionMap)
+	{
+		AddAction(ActionCPR, InputActionMap);
+		AddAction(ActionUncoverHeadTarget, InputActionMap);
+		AddAction(ActionUngagTarget, InputActionMap);
+		AddAction(ActionPullBodyFromTransport, InputActionMap);
+		AddAction(ActionCheckPulseTarget, InputActionMap);
+	}
+	
+	void SetActionsRemoteTarget() // Backwards compatibility, not recommended to use
+	{
+	}
+	
+	void InitializeActions()
+	{
+		// Backwards compatibility
+		if (IsControlledPlayer())
+		{
+			m_InputActionMap = new TInputActionMap;
+			SetActions();
+		}
+		else
+		{
+			m_InputActionMap = new TInputActionMap;
+			SetActionsRemoteTarget();
+		}
+		//////////////////////////
+		
+		m_InputActionMapControled = new TInputActionMap;
+		SetActions(m_InputActionMapControled);
+
+		m_InputActionMapAsTarget = new TInputActionMap;
+		SetActionsRemoteTarget(m_InputActionMapAsTarget);
+	}
+	
+	override void GetActions(typename action_input_type, out array<ActionBase_Basic> actions)
+	{
+		if (!m_ActionsInitialize)
+		{
+			m_ActionsInitialize = true;
+			InitializeActions();
+		}
+
+		// Backwards compatibility
+		array<ActionBase_Basic> bcActions = m_InputActionMap.Get(action_input_type);
+		if (!bcActions)
+		{
+			if (IsControlledPlayer())
+				actions = m_InputActionMapControled.Get(action_input_type);
+			else
+				actions = m_InputActionMapAsTarget.Get(action_input_type);
+		}
+		else
+		{
+			if (!actions)
+				actions = new array<ActionBase_Basic>();
+			
+			if (IsControlledPlayer())
+				actions.InsertAll(m_InputActionMapControled.Get(action_input_type));
+			else
+				actions.InsertAll(m_InputActionMapAsTarget.Get(action_input_type));
+			
+			actions.InsertAll(bcActions);
+		}
+	}
+	
+	void AddAction(typename actionName, out TInputActionMap InputActionMap)
+	{
+		ActionBase action = GetActionManager().GetAction(actionName);
+
+		typename ai = action.GetInputType();
+		if (!ai)
+		{
+			m_ActionsInitialize = false;
+			return;
+		}
+		
+		ref array<ActionBase_Basic> action_array = InputActionMap.Get(ai);
+		
+		if (!action_array)
+		{
+			action_array = new array<ActionBase_Basic>;
+			InputActionMap.Insert(ai, action_array);
+		}
+		action_array.Insert(action);
+	}
+	
+	void AddAction(typename actionName) // Backwards compatibility, not recommended to use
+	{
+		AddAction(actionName, m_InputActionMap);
+	}
+	
+	void RemoveAction(typename actionName, out TInputActionMap InputActionMap)
+	{
+		ActionBase action = GetActionManager().GetAction(actionName);
+		typename ai = action.GetInputType();
+		ref array<ActionBase_Basic> action_array = InputActionMap.Get(ai);
+		
+		if (action_array)
+		{
+			for (int i = 0; i < action_array.Count(); i++)
+			{
+				if (action == action_array.Get(i))
+				{
+					action_array.Remove(i);
+				}
+			}
+			action_array = new array<ActionBase_Basic>;
+			InputActionMap.Insert(ai, action_array);
+		}
+		action_array.Insert(action); 
+	}
+	
+	void RemoveAction(typename actionName) // Backwards compatibility, not recommended to use
+	{
+		RemoveAction(actionName, m_InputActionMap);
+	}
+	
+	int GetCurrentRecipe()
+	{
+		return m_RecipePick;
+	}
+	
+	void SetNextRecipe()
+	{
+		m_RecipePick++;
+	}
+	
+	void SetFirstRecipe()
+	{
+		m_RecipePick = 0;
+	}
+	
+	//---------------------------------------------------
+	
+	
+	ActionManagerBase GetActionManager()
+	{
+		return m_ActionManager;
+	}
+	
+	EmoteManager GetEmoteManager()
+	{
+		return m_EmoteManager;
+	}
+	
+	RandomGeneratorSyncManager GetRandomGeneratorSyncManager()
+	{
+		return m_RGSManager;
+	}
+	
+	//!called every command handler tick when player is on ladder
+	override void OnLadder(float delta_time, HumanMovementState pState)
+	{
+		ProcessHandDamage(delta_time, pState);
+	}
+	
+	void ProcessHandDamage(float delta_time, HumanMovementState pState)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+		{
+			if (pState.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_SLIDE)
+			{
+				//Print("sliding down");
+				EntityAI gloves = GetInventory().FindAttachment(InventorySlots.GLOVES);
+			
+				if (gloves && gloves.GetHealthLevel() < 4)
+				{
+					gloves.AddHealth("","", PlayerConstants.GLOVES_DAMAGE_SLIDING_LADDER_PER_SEC * delta_time);
+					return;
+				}
+				
+				if (Math.RandomFloat01() < PlayerConstants.CHANCE_TO_BLEED_SLIDING_LADDER_PER_SEC * delta_time)
+				{
+					if (Math.RandomFloat01() < 0.5)
+					{
+						if (GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftForeArmRoll"))
+						{
+							SendSoundEvent(EPlayerSoundEventID.INJURED_LIGHT);
+						}
+					}
+					else
+					{
+						if (GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("RightForeArmRoll"))
+						{
+							SendSoundEvent(EPlayerSoundEventID.INJURED_LIGHT);
+						}
+					}
+				}
+				
+			}
+		}
+	}
+	
+	override void ProcessFeetDamageServer(int pUserInt)
+	{
+		//InventorySlots.HEADGEAR
+		EntityAI shoes = GetInventory().FindAttachment(InventorySlots.FEET);
+		
+		string surface;	int liquid;
+		GetGame().SurfaceUnderObject(this, surface, liquid);
+		float modifier_surface = Surface.GetParamFloat(surface, "footDamage");
+		
+		if (shoes && shoes.GetHealthLevel() < 4)
+		{
+			shoes.AddHealth("", "", -1 * modifier_surface * PlayerConstants.SHOES_MOVEMENT_DAMAGE_PER_STEP * (float)PlayerConstants.CHECK_EVERY_N_STEP);
+
+			return;
+		}
+
+		float rnd = Math.RandomFloat01();
+		float modifier_movement = GetFeetDamageMoveModifier();
+		float chance = modifier_movement * modifier_surface * PlayerConstants.BAREFOOT_MOVEMENT_BLEED_MODIFIER * (float)PlayerConstants.CHECK_EVERY_N_STEP;
+		if (rnd < chance)
+		{
+			if (pUserInt % 2 == 0)
+			{
+				if (GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("RightFoot"))
+					SendSoundEvent(EPlayerSoundEventID.INJURED_LIGHT);
+				
+			}
+			else
+			{
+				if (GetBleedingManagerServer().AttemptAddBleedingSourceBySelection("LeftFoot"))
+					SendSoundEvent(EPlayerSoundEventID.INJURED_LIGHT);
+			}
+		}
+	}
+	
+	float GetFeetDamageMoveModifier()
+	{
+		float modifier;
+		switch(m_MovementState.m_iMovement)
+		{
+			case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+				modifier = 1;
+				break
+			case DayZPlayerConstants.MOVEMENTIDX_RUN:
+				modifier = 0.5;
+				break 
+			case DayZPlayerConstants.MOVEMENTIDX_WALK:
+				modifier = 0;
+				break
+		}
+		return modifier;
+	}
+	
+	void SetStamina(int value, int range)
+	{
+		if (m_ModulePlayerStatus)
+			m_ModulePlayerStatus.SetStamina(value, range);
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	void SetStaminaDisabled(bool value)
+	{
+		if (m_StaminaHandler)
+			m_StaminaHandler.SetStaminaDisabled(value);
+	}
+	#endif
+	
+	void SetQuickRestrain(bool enable)
+	{
+		m_AllowQuickRestrain = enable;
+	}
+	
+	void SetQuickFishing(bool enable)
+	{
+		m_AllowQuickFishing = enable;
+	}
+	
+	bool IsQuickRestrain()
+	{
+		return m_AllowQuickRestrain;
+	}
+	
+	bool IsQuickFishing()
+	{
+		return m_AllowQuickFishing;
+	}
+	
+	PlayerStats GetPlayerStats()
+	{
+		return m_PlayerStats;	
+	}
+
+	CraftingManager GetCraftingManager()
+	{
+		return m_CraftingManager;		
+	}
+	
+	StaminaHandler GetStaminaHandler()
+	{
+		return m_StaminaHandler;		
+	}
+	
+	override WeaponManager GetWeaponManager()
+	{
+		return m_WeaponManager;		
+	}
+	
+	override ArrowManagerBase GetArrowManager()
+	{
+		return m_ArrowManager;
+	}
+	
+	bool CanBeRestrained()
+	{
+		if (IsInVehicle() || IsRaised() || IsSwimming() || IsClimbing() || IsClimbingLadder() || IsRestrained() || !GetWeaponManager() || GetWeaponManager().IsRunning() || !GetActionManager() || GetActionManager().GetRunningAction() != null || IsMapOpen())
+		{
+			return false;
+		}
+		if (GetThrowing() && GetThrowing().IsThrowingModeEnabled())
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	void SetRestrainStarted(bool restrain_started)
+	{
+		m_IsRestrainStarted = restrain_started;
+		SetSynchDirty();
+	}
+	
+	bool IsRestrainStarted()
+	{
+		return m_IsRestrainStarted;
+	}
+	
+	void SetRestrainPrelocked(bool restrain_prelock)
+	{
+		m_IsRestrainPrelocked = restrain_prelock;
+		SetSynchDirty();
+	}
+	
+	bool IsRestrainPrelocked()
+	{
+		return m_IsRestrainPrelocked;
+	}
+	
+	void SetRestrained(bool	is_restrained)
+	{
+		m_IsRestrained = is_restrained;
+		SetSynchDirty();
+	}
+	
+	override bool IsRestrained()
+	{
+		return m_IsRestrained;
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		return true;
+	}
+	
+	bool CanManipulateInventory()
+	{
+		if (IsControlledPlayer())
+		{
+			return !IsRestrained() && !IsRestrainPrelocked();
+		}
+		return true;
+	}
+	
+	override bool CanReleaseAttachment (EntityAI attachment)
+	{
+		return super.CanReleaseAttachment(attachment);
+	}
+	
+	override bool CanReleaseCargo (EntityAI cargo)
+	{
+		return super.CanReleaseCargo(cargo);
+	}
+	
+	override bool CanReceiveItemIntoCargo(EntityAI item)
+	{
+		return super.CanReceiveItemIntoCargo(item);
+	}
+	
+	override bool CanSwapItemInCargo (EntityAI child_entity, EntityAI new_entity)
+	{
+		return super.CanSwapItemInCargo(child_entity, new_entity);
+	}
+	
+	override bool CanReceiveItemIntoHands(EntityAI item_to_hands)
+	{
+		if (IsInVehicle())
+			return false;
+		
+		if (!CanPickupHeavyItem(item_to_hands))
+			return false;
+		
+		return super.CanReceiveItemIntoHands(item_to_hands);
+	}
+	
+	override bool CanSaveItemInHands(EntityAI item_in_hands)
+	{
+		return super.CanSaveItemInHands(item_in_hands);
+	}
+	
+	override bool CanReleaseFromHands(EntityAI handheld)
+	{
+		return super.CanReleaseFromHands(handheld);
+	}
+	
+	int GetCraftingRecipeID()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			return GetCraftingManager().GetRecipeID();
+		}
+		else
+		{
+			return m_RecipeID;
+		}		
+	}
+	
+	void SetCraftingRecipeID(int recipeID)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			GetCraftingManager().SetRecipeID(recipeID);
+		}
+		else
+		{
+			m_RecipeID = recipeID;			
+		}		
+	}
+	
+	// --------------------------------------------------
+	// Action data for base building actions
+	//---------------------------------------------------	
+	ConstructionActionData GetConstructionActionData()
+	{
+		return m_ConstructionActionData;
+	}
+	
+	void ResetConstructionActionData()
+	{
+		if (m_ConstructionActionData)
+		{
+			m_ConstructionActionData.ResetActionIndexes();
+		}
+	}
+	
+	// --------------------------------------------------
+	// Action data for fireplace (indoor)
+	//---------------------------------------------------	
+	vector GetLastFirePoint()
+	{
+		return m_LastFirePoint;
+	}	
+	float GetLastFirePointRot()
+	{
+		return m_LastFirePointRot;
+	}	
+	int GetLastFirePointIndex()
+	{
+		return m_LastFirePointIndex;
+	}
+
+	void SetLastFirePoint(vector last_fire_point)
+	{
+		m_LastFirePoint = last_fire_point;
+	}
+	void SetLastFirePointRot(float last_fire_point_rot)
+	{
+		m_LastFirePointRot = last_fire_point_rot;
+	}
+	void SetLastFirePointIndex(int last_fire_point_index)
+	{
+		m_LastFirePointIndex = last_fire_point_index;
+	}
+
+	// --------------------------------------------------
+	// QuickBar
+	//---------------------------------------------------
+	
+	void RemoveQuickBarEntityShortcut(EntityAI entity)
+	{
+		int index = m_QuickBarBase.FindEntityIndex(entity);
+		if (index != -1)
+			m_QuickBarBase.SetEntityShortcut(entity,-1);
+	}
+	//---------------------------------------------------
+	void SetEnableQuickBarEntityShortcut(EntityAI entity, bool value)
+	{
+		int index = m_QuickBarBase.FindEntityIndex(entity);
+		if (index != -1)
+			m_QuickBarBase.SetShotcutEnable(index,value);
+
+	}
+	//---------------------------------------------------
+	int FindQuickBarEntityIndex(EntityAI entity)
+	{
+		int index;
+		index = m_QuickBarBase.FindEntityIndex(entity);
+
+		if (m_QuickBarBase.GetEntity(index) == NULL)
+			return -1;
+
+		return index;
+	}
+	//---------------------------------------------------
+	
+	int GetQuickBarSize()
+	{
+		return m_QuickBarBase.GetSize();
+	}
+	//---------------------------------------------------	
+	EntityAI GetQuickBarEntity(int index)
+	{
+		return m_QuickBarBase.GetEntity(index);
+	}
+	//---------------------------------------------------
+	void UpdateQuickBarEntityVisibility(EntityAI entity)
+	{
+		int i = FindQuickBarEntityIndex(entity);
+		if (i >= 0)
+			m_QuickBarBase.UpdateShotcutVisibility(i);
+	}
+	//---------------------------------------------------
+	void SetQuickBarEntityShortcut(EntityAI entity, int index, bool force = false)
+	{
+		m_QuickBarBase.SetEntityShortcut(entity, index, force);
+	}
+	//---------------------------------------------------
+	void OnQuickbarSetEntityRequest(ParamsReadContext ctx)
+	{
+		m_QuickBarBase.OnSetEntityRequest(ctx);
+	}
+	//---------------------------------------------------	
+
+	// Applies splint on all limbs.
+	void ApplySplint()
+	{
+		float add_health_coef = 0.33;
+		// The idea is to slightly increase health of broken limb so the player is still limping. Using more splints will help but each time less. 100% recovery can be achieved only through long term healing.
+		if (GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+		{
+			AddHealth("LeftLeg", 	"Health",	(GetMaxHealth("LeftLeg", "Health")  - GetHealth("LeftLeg", "Health") ) * add_health_coef 	);
+			AddHealth("RightLeg",	"Health",	(GetMaxHealth("RightLeg", "Health") - GetHealth("RightLeg", "Health")) * add_health_coef 	);
+			AddHealth("RightFoot",	"Health",	(GetMaxHealth("RightFoot", "Health") - GetHealth("RightFoot", "Health")) * add_health_coef 	);
+			AddHealth("LeftFoot",	"Health",	(GetMaxHealth("LeftFoot", "Health") - GetHealth("LeftFoot", "Health")) * add_health_coef 	);
+		}
+	}
+	
+	void ProcessDrowning(float dT)
+	{
+		GetStaminaHandler().DepleteStamina(EStaminaModifiers.DROWN,dT);
+		
+		#ifndef SERVER
+		//PP EFFECTS
+		PPERequester_Drowning req = PPERequester_Drowning.Cast(PPERequesterBank.GetRequester(PPERequesterBank.REQ_DROWNING));
+		req.SetStamina01(GetStaminaHandler().GetStaminaNormalized());
+		#endif
+	}
+	
+	void SpawnDrowningBubbles()
+	{
+		if (!GetDrowningWaterLevelCheck())
+			return;
+		float bubbleFrequency 	= Math.Lerp(PlayerConstants.DROWNING_BUBBLE_FREQUENCY_MIN, PlayerConstants.DROWNING_BUBBLE_FREQUENCY_MAX, GetStaminaHandler().GetSyncedStaminaNormalized());
+		int boneIdx 			= GetBoneIndexByName("Head");
+		
+		if (boneIdx != -1)
+		{
+			Particle p = ParticleManager.GetInstance().PlayInWorld(ParticleList.DROWNING_BUBBLES, "-0.03 0.15 0");
+			if (p)
+				AddChild(p, boneIdx);
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(SpawnDrowningBubbles, bubbleFrequency);
+		}
+	}
+	
+	void ProcessHoldBreath(float dT)
+	{
+		if (IsTryingHoldBreath() && CanStartConsumingStamina(EStaminaConsumers.HOLD_BREATH))
+		{
+			if (!m_IsHoldingBreath)
+			{
+				OnHoldBreathStart();
+				m_IsHoldingBreath = true;
+			}
+		}
+		else if (!IsTryingHoldBreath() || !CanConsumeStamina(EStaminaConsumers.HOLD_BREATH))
+		{
+			if (m_IsHoldingBreath) OnHoldBreathEnd();
+			m_IsHoldingBreath = false;
+		}
+	}
+	
+	void OnHoldBreathStart()
+	{
+		//SendSoundEvent(SoundSetMap.GetSoundSetID("holdBreath_male_Char_SoundSet"));
+		RequestSoundEventEx(EPlayerSoundEventID.HOLD_BREATH, true, EPlayerSoundEventParam.SKIP_CONTROLLED_PLAYER);
+	}
+	
+	void OnHoldBreathExhausted()
+	{
+		RequestSoundEventEx(EPlayerSoundEventID.EXHAUSTED_BREATH, true, EPlayerSoundEventParam.SKIP_CONTROLLED_PLAYER);
+	}
+	
+	void OnHoldBreathEnd()
+	{
+		//SendSoundEvent(SoundSetMap.GetSoundSetID("releaseBreath_male_Char_SoundSet"));
+		RequestSoundEventEx(EPlayerSoundEventID.RELEASE_BREATH, true, EPlayerSoundEventParam.SKIP_CONTROLLED_PLAYER);
+	}
+	
+	override bool IsHoldingBreath()
+	{
+		return m_IsHoldingBreath;
+	}
+	
+	override bool IsRefresherSignalingViable()
+	{
+		return false;
+	}
+	
+	eMixedSoundStates GetMixedSoundStates()
+	{
+		return m_MixedSoundStates;
+	}
+	
+	AbstractWave SaySoundSet(string name)
+	{
+		if (m_SaySoundLastSetName != name)
+		{
+			m_SaySoundParams = new SoundParams(name);
+			m_SaySoundBuilder = new SoundObjectBuilder(m_SaySoundParams);
+
+			m_SaySoundLastSetName = name;
+		}
+		
+		m_SaySoundObject = m_SaySoundBuilder.BuildSoundObject();
+		m_SaySoundObject.SetPosition(GetPosition());
+		return GetGame().GetSoundScene().Play3D(m_SaySoundObject, m_SaySoundBuilder);
+	}
+
+	EntityAI FindCargoByBaseType(string searched_item)
+	{
+		EntityAI attachment;
+		string item_name;
+		int attcount = this.GetInventory().AttachmentCount();
+		
+		for (int att = 0; att < attcount; att++)
+		{	
+			attachment = GetInventory().GetAttachmentFromIndex(att);
+			if (attachment.IsItemBase())
+			{
+				item_name = attachment.GetType();
+				if (GetGame().IsKindOf(item_name, searched_item))
+				{
+					return attachment;
+				}
+			}
+		}
+		return NULL;
+	}
+
+	void InitEditor()
+	{
+		if (GetGame().IsDebug())
+		{
+			if (!GetGame().IsMultiplayer()  &&  GetGame().GetPlayer()  &&  GetGame().GetPlayer().GetID() == this.GetID())
+			{
+				PluginSceneManager scene_editor = PluginSceneManager.Cast(GetPlugin(PluginSceneManager));
+				scene_editor.InitLoad();
+			}
+		}
+	}
+	
+	//---------------------------------------------------------------------------------------------------------------------------
+	void OnPlayerLoaded()
+	{
+		InitEditor();
+		
+		if (GetGame().IsMultiplayer() || GetGame().IsServer())
+		{
+			if (m_ModuleLifespan)
+			{
+				m_ModuleLifespan.SynchLifespanVisual(this, m_LifeSpanState, m_HasBloodyHandsVisible, m_HasBloodTypeVisible, m_BloodType);
+			}
+		}
+		
+		if (IsControlledPlayer())//true only on client for the controlled character
+		{
+			if (!m_VirtualHud)
+				m_VirtualHud = new VirtualHud(this);
+			if (m_Hud)
+			{
+				m_Hud.UpdateBloodName();
+				PPERequesterBank.GetRequester(PPERequester_DeathDarkening).Stop();
+				PPERequesterBank.GetRequester(PPERequester_ShockHitReaction).Stop();
+				PPERequesterBank.GetRequester(PPERequester_UnconEffects).Stop(); //TODO - stop en mass...check if effects do not terminate (spawning inside of contaminated area)?!
+				GetGame().GetUIManager().CloseAll();
+				GetGame().GetMission().SetPlayerRespawning(false);
+				GetGame().GetMission().OnPlayerRespawned(this);
+				
+				m_Hud.ShowHudUI(true);
+				m_Hud.ShowQuickbarUI(true);
+				m_Hud.UpdateQuickbarGlobalVisibility();
+			}
+			m_EffectWidgets = GetGame().GetMission().GetEffectWidgets();
+		}
+		if (!GetGame().IsDedicatedServer())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(UpdateCorpseStateVisual, 2000, false);//sometimes it takes a while to load in
+			m_PlayerSoundEventHandler = new PlayerSoundEventHandler(this);
+		}
+		int slot_id = InventorySlots.GetSlotIdFromString("Head");
+		m_CharactersHead = Head_Default.Cast(GetInventory().FindPlaceholderForSlot(slot_id));
+		CheckHairClippingOnCharacterLoad();
+		UpdateHairSelectionVisibility();
+		PreloadDecayTexture();
+		
+		Weapon_Base wpn = Weapon_Base.Cast(GetItemInHands());
+		if (wpn)
+			wpn.ValidateAndRepair();
+		/*
+		PreloadDecayTexture();
+		UpdateCorpseStateVisual();
+		*/
+		m_PlayerLoaded = true;
+		
+		//Print("PlayerBase | OnPlayerLoaded()");
+		
+	}
+	
+	void SetPlayerDisconnected(bool state)
+	{
+		m_PlayerDisconnectProcessed = state;
+	}
+	
+	bool IsPlayerDisconnected()
+	{
+		return m_PlayerDisconnectProcessed;
+	}
+
+	// --------------------------------------------------
+	// Advanced placement
+	//---------------------------------------------------
+	
+	//get hologram
+	Hologram GetHologramServer()
+	{
+		return m_HologramServer;
+	}
+	
+	Hologram GetHologramLocal()
+	{
+		return m_HologramLocal;
+	}
+	
+	void PlacingStartServer(ItemBase item)
+	{
+		if (item)
+		{
+			m_HologramServer = new Hologram(this, GetLocalProjectionPosition(), item);
+			GetHologramServer().SetProjectionPosition(GetLocalProjectionPosition());
+			GetHologramServer().SetProjectionOrientation(GetLocalProjectionOrientation());
+			GetHologramServer().GetProjectionEntity().OnPlacementStarted(this);
+			GetHologramServer().CheckPowerSource();
+			GetHologramServer().RefreshVisual();
+		}
+	}
+	
+	void PlacingStartLocal(ItemBase item)
+	{
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			return;
+		
+		if (item)
+		{
+			m_HologramLocal = new Hologram(this, GetLocalProjectionPosition(), item);
+			GetHologramLocal().GetProjectionEntity().OnPlacementStarted(this);
+		}
+	}
+	
+	void PlacingCancelServer()
+	{
+		EntityAI entityInHands = GetHumanInventory().GetEntityInHands();
+		
+		if (IsPlacingServer())
+		{
+			GetHologramServer().CheckPowerSource();
+			GetHologramServer().GetParentEntity().OnPlacementCancelled(this);
+			SetLocalProjectionPosition(vector.Zero);
+			
+			delete m_HologramServer;
+
+			return;
+		}
+		else if (entityInHands && entityInHands.HasEnergyManager())
+		{
+			if (entityInHands.GetCompEM().IsPlugged())
+				entityInHands.OnPlacementCancelled(this);
+		}
+	}
+	
+	//Called when item placement is canceled, will prevent quickbar usage until the item the player was placing is back in hands
+	void LockHandsUntilItemHeld()
+	{
+		m_AreHandsLocked = true;
+	}
+	
+	void PlacingCancelLocal()
+	{
+		EntityAI entityInHands = GetHumanInventory().GetEntityInHands();
+		if (entityInHands && entityInHands.HasEnergyManager())
+		{
+			if (entityInHands.GetCompEM().IsPlugged())
+				entityInHands.OnPlacementCancelled(this);
+		}
+		
+		SetLocalProjectionPosition(vector.Zero);
+
+		delete m_HologramLocal;
+	}
+	
+	void PlacingCompleteServer()
+	{
+		SetLocalProjectionPosition(vector.Zero);
+		delete m_HologramServer;	
+	}
+	
+	void PlacingCompleteLocal()
+	{
+		SetLocalProjectionPosition(vector.Zero);
+		delete m_HologramLocal;
+	}
+	
+	bool IsPlacingServer()
+	{
+		if (m_HologramServer)
+			return true;
+
+		return false;			
+	}
+	
+	bool IsPlacingLocal()
+	{
+		if (m_HologramLocal)
+			return true;
+		
+		return false;			
+	}
+	
+	void SetDrowning(bool enable)
+	{
+		if (enable != m_IsDrowning)
+		{
+			if (enable)
+				OnDrowningStart();
+			else
+				OnDrowningEnd();
+		}
+
+		m_IsDrowning = enable;
+	}
+	
+	void OnDrowningStart()
+	{
+		#ifndef SERVER
+		if (IsControlledPlayer())
+		{
+			PPERequester_Drowning req = PPERequester_Drowning.Cast(PPERequesterBank.GetRequester(PPERequesterBank.REQ_DROWNING));
+			req.Start();
+		}
+		//Particles
+		SpawnDrowningBubbles();
+		#endif
+	}
+	
+	void OnDrowningEnd()
+	{
+		#ifndef SERVER
+		if (IsControlledPlayer())
+		{
+			PPERequester_Drowning req = PPERequester_Drowning.Cast(PPERequesterBank.GetRequester(PPERequesterBank.REQ_DROWNING));
+			req.Stop();
+		}
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(SpawnDrowningBubbles);
+		#endif
+	}
+	
+	bool TogglePlacingServer(int userDataType, ParamsReadContext ctx)
+	{	
+		if (userDataType == INPUT_UDT_ADVANCED_PLACEMENT)
+		{
+			PlacingCancelServer();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void RequestResetADSSync()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT && GetGame().IsMultiplayer())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				ctx.Write(INPUT_UDT_RESET_ADS);
+				ctx.Send();
+			}
+		}
+		else if (!GetGame().IsMultiplayer())
+		{
+			m_ResetADS = true;
+		}
+	}
+	
+	//! server only
+	bool ResetADSPlayerSync(int userDataType, ParamsReadContext ctx)
+	{
+		if (userDataType == INPUT_UDT_RESET_ADS)
+		{
+			ScriptJunctureData pCtx = new ScriptJunctureData;
+			SendSyncJuncture(DayZPlayerSyncJunctures.SJ_ADS_RESET,pCtx);
+			return true;
+		}
+		
+		return false;	
+	}
+	
+	override bool CanPlaceItem(EntityAI item)
+	{
+		if (m_UndergroundPresence > EUndergroundPresence.NONE)
+		{
+			TStringSet disallowedUndergroundTypes = CfgGameplayHandler.GetDisallowedTypesInUnderground();
+			foreach (string t: disallowedUndergroundTypes)
+			{
+				if (item.IsKindOf(t))
+					return false;
+			}
+		}
+		return true;
+	}
+	
+	void SetUnderground(EUndergroundPresence presence)
+	{
+		m_UndergroundPresence = presence;
+	}
+	
+	void TogglePlacingLocal(ItemBase item = null)
+	{	
+		if (IsPlacingLocal())
+		{
+			if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT && GetGame().IsMultiplayer())
+			{
+				if (ScriptInputUserData.CanStoreInputUserData())
+				{
+					ScriptInputUserData ctx = new ScriptInputUserData;
+					ctx.Write(INPUT_UDT_ADVANCED_PLACEMENT);
+					ctx.Send();
+				}
+			}
+			PlacingCancelLocal();
+		}
+		else if (!item)
+		{
+			PlacingStartLocal(GetItemInHands());
+		}
+		else
+		{
+			PlacingStartLocal(item);
+		}
+	}
+
+	void SetLocalProjectionPosition(vector local_position)
+	{
+		m_LocalProjectionPosition = local_position;
+	}
+	
+	void SetLocalProjectionOrientation(vector local_orientation)
+	{
+		m_LocalProjectionOrientation = local_orientation;
+	}
+	
+	vector GetLocalProjectionPosition()
+	{
+		return m_LocalProjectionPosition;
+	}
+	
+	vector GetLocalProjectionOrientation()
+	{
+		return m_LocalProjectionOrientation;
+	}
+	
+	//! DEPRECATED
+	void AddToEnvironmentTemperature(float pTemperature) {};
+
+	// ------------------------------------------------------------------------
+
+	//! water contact (driven by Environment)
+	void SetInWater(bool pState)
+	{
+		m_IsInWater = pState;
+		SetSynchDirty();
+	}
+
+	bool IsInWater()
+	{
+		return m_IsInWater;
+	}
+
+	// -------------------------------------------------------------------------
+	void ~PlayerBase()
+	{
+		if (GetGame() && (!GetGame().IsDedicatedServer()))
+		{
+			ClientData.RemovePlayerBase(this);
+			SetContaminatedEffectEx(false);
+		}
+		
+		SEffectManager.DestroyEffect(m_FliesEff);
+		StopSoundSet(m_SoundFliesEffect);
+	}
+
+	void OnCameraChanged(DayZPlayerCameraBase new_camera)
+	{
+		m_CameraSwayModifier = new_camera.GetWeaponSwayModifier();
+		m_CurrentCamera = new_camera;
+	}
+	
+	DayZPlayerCamera GetCurrentPlayerCamera()
+	{
+		return m_CurrentCamera;
+	}
+	
+	bool IsCurrentCameraAimedAtGround()
+	{
+		if (!m_CurrentCamera)
+			return false;
+		
+		return m_CurrentCamera.GetCurrentPitch() < PlayerConstants.CAMERA_THRESHOLD_PITCH;
+	} 
+	
+	BleedingSourcesManagerServer GetBleedingManagerServer()
+	{
+		return m_BleedingManagerServer;
+	}
+	
+	BleedingSourcesManagerRemote GetBleedingManagerRemote()
+	{
+		return m_BleedingManagerRemote;
+	}
+
+	SymptomManager GetSymptomManager()
+	{
+		return m_SymptomManager;
+	}
+	VirtualHud GetVirtualHud()
+	{
+		if (!m_VirtualHud)
+		{
+			m_VirtualHud = new VirtualHud(this);
+		}
+		return m_VirtualHud;
+	}
+
+	TransferValues GetTransferValues()
+	{
+		return m_TrasferValues;
+	}
+
+	DebugMonitorValues GetDebugMonitorValues()
+	{
+		return m_DebugMonitorValues;
+	}
+	
+	// -------------------------------------------------------------------------
+	/*bool  IsCraftingSetUp()
+	{
+		return m_IsCraftingReady;
+	}*/
+	// -------------------------------------------------------------------------
+	/*void  PerformRecipe()
+	{*/
+		/*
+		Debug.Log("Ingredient1: "+ToString(m_Item1.Ptr().GetType()),"recipes");
+		Debug.Log("Ingredient2: "+ToString(m_Item2.Ptr().GetType()),"recipes");
+		*/
+		/*int id = GetCraftingMeta().GetRecipeID();
+		ItemBase item1 = GetCraftingMeta().GetIngredient1();
+		ItemBase item2 = GetCraftingMeta().GetIngredient2();
+		
+		Debug.Log("PerformRecipe called on player: "+ string.ToString(this),"recipes");
+		
+		if (m_ModuleRecipesManager)
+		{
+			if (!item1 || !item2)
+			{
+				Debug.Log("PerformRecipe: At least one of the object links is now null, not performing the recipe","recipes");
+			}
+			else
+			{
+
+				m_ModuleRecipesManager.PerformRecipeServer(id, item1,item2,this);
+			}
+			RequestCraftingDisable();
+		}
+	}*/
+	// -------------------------------------------------------------------------
+	/*float GetCraftingSetUpDistance()
+	{
+		return Math.AbsFloat(vector.Distance(GetCraftingMeta().GetInitPos(), GetPosition()));
+	}*/
+	// -------------------------------------------------------------------------
+
+	/*void RequestCraftingSetup(int id, EntityAI item1, EntityAI item2, int craft_type)
+	{
+		if (!GetGame().IsDedicatedServer()) 
+		{
+			SetUpCraftingClient(id,item1,item2,craft_type);
+			SendCraftingMeta();
+		}
+
+	}*/
+
+	/*void RequestCraftingDisable()
+	{
+		if (GetGame().IsServer()) 
+		{
+			SendDisableRequestToClient();
+			DisableCrafting();
+		}
+
+	}*/
+	
+	/*private void SendDisableRequestToClient()
+	{
+		GetGame().RPCSingleParam(this, ERPCs.RPC_CRAFTING_DISABLE, NULL,this);
+	}*/
+
+	/*private void OnReceiveDisableRequest()
+	{
+		DisableCrafting();
+	}*/
+	
+	/*private void SendCraftingMeta()
+	{
+		array<ref Param> params = new array<ref Param>;
+		CraftingMeta cm = GetCraftingMeta();
+		cm.SerializeValues(params);
+		GetGame().RPC(this, ERPCs.RPC_CRAFTING_SETUP, params,this);
+	}*/
+
+	/*private void OnReceiveCraftingMeta(ParamsReadContext ctx)
+	{
+		CreateCraftingMeta(0,NULL,NULL,"0 0 0", 0,0);
+		GetCraftingMeta().DeserializeValuesCtx(ctx);
+		SetUpCraftingServer();
+		
+	}*/
+	// -------------------------------------------------------------------------
+	/*private void SetUpCraftingServer()
+	{
+		if (GetGame().IsMultiplayer() && GetGame().IsServer()) 
+		{
+			m_IsCraftingReady = true;
+			m_ModuleRecipesManager.OnCraftingSetUpServer(GetCraftingMeta(), this);
+		}
+	}*/
+	
+	/*private void SetUpCraftingClient(int id, EntityAI item1, EntityAI item2, int craft_type)
+	{
+		if (!GetGame().IsDedicatedServer()) 
+		{
+			m_IsCraftingReady = true;
+			
+			float specialty_weight = m_ModuleRecipesManager.GetRecipeSpecialty(id);
+			float length = m_ModuleRecipesManager.GetRecipeLengthInSecs(id);
+			CreateCraftingMeta(id, item1, item2, GetPosition(), length, specialty_weight);
+			m_ModuleRecipesManager.OnCraftingSetUpClient(GetCraftingMeta(), this);
+			Debug.Log("SetUpCrafting2 called for id: "+ id.ToString()+ " on player: "+ this.ToString(),"recipes");
+			if (craft_type != AT_WORLD_CRAFT)
+			{
+				ActionManagerClient mngr = GetActionManager();
+				mngr.DisableActions();
+				ActionTarget actionTarget;		
+				if (item2 == GetItemInHands()) 
+				{
+					actionTarget = new ActionTarget(item1, -1, vector.Zero, -1);
+					mngr.InjectContinuousAction(craft_type,actionTarget,item2);
+				}
+				else
+				{
+					actionTarget = new ActionTarget(item2, -1, vector.Zero, -1);
+					mngr.InjectContinuousAction(craft_type,actionTarget,item1);
+				}
+			}			
+		}
+
+	}*/
+
+	// -------------------------------------------------------------------------
+	/*void DisableCrafting()
+	{
+		m_IsCraftingReady = false;
+		if (!GetGame().IsDedicatedServer()) 
+		{	
+			ActionManagerClient mngr = GetActionManager();
+			if (mngr) 
+			{
+				mngr.EnableActions();
+				GetCraftingMeta() = NULL;
+			}
+		}
+	}*/
+	
+	//--------------------------------------------------------------------------
+	void OnScheduledTick(float deltaTime)
+	{
+		if (!IsPlayerSelected() || !IsAlive()) 
+			return;
+		if (m_ModifiersManager)
+			m_ModifiersManager.OnScheduledTick(deltaTime);
+		if (m_NotifiersManager) 
+			m_NotifiersManager.OnScheduledTick();
+		if (m_TrasferValues) 
+			m_TrasferValues.OnScheduledTick(deltaTime);
+		if (m_VirtualHud) 
+			m_VirtualHud.OnScheduledTick();
+		if (GetBleedingManagerServer()) 
+			GetBleedingManagerServer().OnTick(deltaTime);
+		if (m_Environment)
+			m_Environment.Update(deltaTime);
+
+		// Check if electric device needs to be unplugged
+		ItemBase heldItem = GetItemInHands();
+		if (heldItem && heldItem.HasEnergyManager() && heldItem.GetCompEM().IsPlugged())
+		{
+			// Now we know we are working with an electric device which is plugged into a power source.
+			EntityAI placed_entity = heldItem;
+					
+			// Unplug the device when the player is too far from the power source.
+			placed_entity.GetCompEM().UpdatePlugState();
+		}
+	}
+	
+	void OnCommandHandlerTick(float delta_time, int pCurrentCommandID)
+	{
+		if (!IsAlive())
+		{
+			if (!m_DeathSyncSent && m_KillerData)
+			{
+				SyncEvents.SendEntityKilled(this, m_KillerData.m_Killer, m_KillerData.m_MurderWeapon, m_KillerData.m_KillerHiTheBrain);
+				//Print("Sending Death Sync, yay! Headshot by killer = " + m_KillerData.m_KillerHiTheBrain);
+				//Print("And was he killed by headshot in general? = " + m_KilledByHeadshot);
+				m_DeathSyncSent = true;
+			}
+			return;
+		}
+		if (m_DebugMonitorValues)
+			m_DebugMonitorValues.OnScheduledTick(delta_time);
+		if (GetSymptomManager())
+			GetSymptomManager().OnTick(delta_time, pCurrentCommandID, m_MovementState);//needs to stay in command handler tick as it's playing animations
+		//if (GetBleedingManagerServer()) GetBleedingManagerServer().OnTick(delta_time);
+		
+		DayZPlayerInstanceType instType = GetInstanceType();		
+		if (instType == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{ 
+			if (m_PlayerSoundEventHandler)
+				m_PlayerSoundEventHandler.OnTick(delta_time);
+	
+			if (m_ProcessRemoveEffectWidgets && m_ProcessRemoveEffectWidgets.Count() > 0)
+			{
+				m_EffectWidgets.RemoveActiveEffects(m_ProcessRemoveEffectWidgets);
+			}
+			
+			if (m_ProcessAddEffectWidgets && m_ProcessAddEffectWidgets.Count() > 0)
+			{
+				m_EffectWidgets.AddActiveEffects(m_ProcessAddEffectWidgets);
+			}
+			
+			HandleGlassesEffect();
+			
+			if (m_ContaminatedAreaEffectEnabled)
+				ContaminatedParticleAdjustment();
+			
+			#ifdef DIAG_DEVELOPER
+			if (m_WeaponDebug)
+			{
+				m_WeaponDebug.OnCommandHandlerUpdate();
+			}
+			#endif
+	
+			m_ProcessAddEffectWidgets.Clear(); //clears array for remotes as well
+			m_ProcessRemoveEffectWidgets.Clear(); //clears array for remotes as well
+		}
+		
+		m_AnimCommandStarting = HumanMoveCommandID.None;
+
+		if (CfgGameplayHandler.GetAllowStaminaAffectInertia())
+			UpdateMovementInertia();
+	}
+	
+	//! Update movement inertia based on stamina available
+	void UpdateMovementInertia()
+	{
+		HumanCommandMove hcm = GetCommand_Move();
+		if (hcm)
+		{
+			float staminaPercentage = GetStaminaHandler().GetSyncedStaminaNormalized();
+			hcm.SetTurnSpanSprintModifier(2 - staminaPercentage);
+			hcm.SetRunSprintFilterModifier((2 - staminaPercentage) * 0.5);
+			hcm.SetDirectionSprintFilterModifier(2 - staminaPercentage);				
+		}
+	}
+	
+	bool m_ShowDbgUI = true;
+	int m_DbgListSelection = 0;
+	float m_DbgSliderValue = 0.0;
+	ref array<string> m_DbgOptions = {"jedna", "dva", "tri"};
+	
+	NotifiersManager GetNotifiersManager()
+	{
+		return m_NotifiersManager;
+	}
+
+	//--------------------------------------------------------------------------
+	void OnTick()
+	{
+		float deltaT = (GetGame().GetTime() - m_LastTick) * 0.001;
+		if (m_LastTick < 0)
+			deltaT = 0; //first tick protection
+
+		m_LastTick = GetGame().GetTime();
+		
+		OnScheduledTick(deltaT);				
+	}
+
+	// -------------------------------------------------------------------------
+	override void EEItemIntoHands(EntityAI item)
+	{
+		super.EEItemIntoHands(item);
+
+		if (item)
+		{
+			MiscGameplayFunctions.RemoveAllAttachedChildrenByTypename(item, {Bolt_Base});
+
+			Weapon_Base w;
+			if (Class.CastTo(w, item))
+			{
+				w.ResetWeaponAnimState();
+				
+				HumanCommandMove cm = GetCommand_Move();
+				if (cm)
+				{
+					cm.SetMeleeBlock(false);
+					GetMeleeFightLogic().SetBlock(false);
+				}
+			}
+
+			//! fixes situation where raise is canceling some manipulation with heavy item(ex. TakeItemToHands), forces normal stance
+			if (item.IsHeavyBehaviour() && IsRaised())
+			{
+				HumanCommandMove cm2 = GetCommand_Move();
+				if (cm2)
+				{
+					cm2.ForceStance(DayZPlayerConstants.STANCEIDX_ERECT);
+				}
+			}
+			
+			OnItemInHandsChanged();
+		}
+	}
+	
+	override void EEItemOutOfHands(EntityAI item)
+	{
+		super.EEItemOutOfHands(item);
+
+		if (IsPlacingLocal())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(TogglePlacingLocal);
+		}
+		
+		OnItemInHandsChanged();
+	}
+	
+	PlayerStomach GetStomach()
+	{
+		return m_PlayerStomach;
+	}
+	
+	override void CommandHandler(float pDt, int pCurrentCommandID, bool pCurrentCommandFinished)	
+	{
+		EvaluateDamageHit(pCurrentCommandID);
+
+		// lower implement 
+		super.CommandHandler(pDt,pCurrentCommandID,pCurrentCommandFinished);
+
+		HumanInputController hic = GetInputController();
+		
+		CheckZeroSoundEvent();
+		CheckSendSoundEvent();
+		
+		ProcessADDModifier();
+
+		if (m_BrokenLegsJunctureReceived)//was there a change in broken legs state ?
+		{
+			m_BrokenLegsJunctureReceived = false;
+			bool initial = m_BrokenLegState < 0;//negative values indicate initial activation
+
+			if (GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			{
+				DropHeavyItem();
+				if (initial)
+				{
+					BrokenLegForceProne();
+					hic.ResetADS();
+					GetUApi().GetInputByID(UATempRaiseWeapon).Supress();
+					ExitSights();
+				}
+			}
+		}
+			
+		GetDayZPlayerInventory().HandleInventory(pDt);
+		
+		if (IsFireWeaponRaised() || m_IsHoldingBreath)
+		{
+			ProcessHoldBreath(pDt);
+		}
+
+		ActionManagerBase		mngr = GetActionManager();
+		
+		if (m_AreHandsLocked && GetHumanInventory().GetEntityInHands())
+		{
+			m_AreHandsLocked = false;
+		}
+		
+		// freelook camera memory for weapon raycast
+		if (hic.CameraIsFreeLook() && m_DirectionToCursor == vector.Zero)
+		{
+			m_DirectionToCursor = GetGame().GetCurrentCameraDirection();
+		}
+		else if (!hic.CameraIsFreeLook() && m_DirectionToCursor != vector.Zero)
+		{
+			m_DirectionToCursor = vector.Zero;
+		}
+		
+		if (m_WeaponManager)
+		{
+			m_WeaponManager.Update(pDt);
+		}
+		if (m_EmoteManager && IsPlayerSelected()) 
+		{
+			m_EmoteManager.Update(pDt);	
+		}
+		if (m_RGSManager)
+		{
+			 m_RGSManager.Update();
+		}
+		if (m_StanceIndicator) 
+		{
+			m_StanceIndicator.Update();
+		}
+		if (m_StaminaHandler) 
+		{
+			m_StaminaHandler.Update(pDt, pCurrentCommandID);
+		}
+		if (m_InjuryHandler)
+		{
+			m_InjuryHandler.Update(pDt);
+		}
+		if (m_HCAnimHandler)
+		{
+			m_HCAnimHandler.Update(pDt, m_MovementState);
+		}
+		if (m_ShockHandler)
+		{
+			m_ShockHandler.Update(pDt);
+		}
+			
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+		{
+			GetPlayerSoundManagerServer().Update();
+			ShockRefill(pDt);
+			FreezeCheck();
+		}
+		
+		GetHumanInventory().Update(pDt);
+		if (m_IsDrowning)
+		{
+			ProcessDrowning(pDt);
+		}
+		UpdateDelete();
+		
+		HandleDamageHit(pCurrentCommandID);
+		
+		if (mngr && hic)
+		{
+			mngr.Update(pCurrentCommandID);
+
+			HumanCommandUnconscious		hcu = GetCommand_Unconscious();
+			HumanCommandVehicle			hcv = GetCommand_Vehicle();
+
+			if (!m_UnconsciousDebug)
+			{
+				//! When the player should be and is unconscious 
+				if (m_ShouldBeUnconscious && m_IsUnconscious)
+				{
+					if (hcu)
+					{
+						//! Player can start floating while unconscious
+						m_Swimming.m_bWasSwimming |= hcu.IsInWater();
+					}
+
+					if (m_Swimming.m_bWasSwimming)
+					{
+						m_LastCommandBeforeUnconscious = DayZPlayerConstants.COMMANDID_SWIM;
+					}
+
+					OnUnconsciousUpdate(pDt, m_LastCommandBeforeUnconscious);
+				}
+				//! When the player will be unconscious, or is being blocked from being unconscious
+				else if (m_ShouldBeUnconscious)
+				{
+					//! If the player is getting in/out or switching seats, delay unconsciousness until after animation has finished
+					bool isTransitioning = hcv && (hcv.IsGettingIn() || hcv.IsGettingOut() || hcv.IsSwitchSeat());
+
+					if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_UNCONSCIOUS)
+					{
+						OnUnconsciousUpdate(pDt, m_LastCommandBeforeUnconscious);
+
+						m_IsUnconscious = true;
+						OnUnconsciousStart();
+					}
+					//! Death gate - prevent unlikely occurence of death -> unconsciousness transition
+					//! Fall gate - prevent unconciousness animation from playing while falling, doesn't look good
+					//! Transition gate - prevent unconciousness while previous command is transitioning
+					else if (pCurrentCommandID != DayZPlayerConstants.COMMANDID_DEATH && pCurrentCommandID != DayZPlayerConstants.COMMANDID_FALL && !isTransitioning)
+					{
+						m_LastCommandBeforeUnconscious = pCurrentCommandID;
+
+						if (hcv)
+						{
+							m_TransportCache = hcv.GetTransport();	
+						}
+						
+						//! TODO: rework vehicle command Knockout back to force player prone after they have exited the vehicle
+						m_JumpClimb.CheckAndFinishJump();
+						StartCommand_Unconscious(0);
+						SetFallYDiff(GetPosition()[1]);
+					}
+				}
+				//! When the player is waking up
+				else if (m_IsUnconscious)
+				{
+					//! Make sure the player is actually unconscious
+					if (hcu && pCurrentCommandID == DayZPlayerConstants.COMMANDID_UNCONSCIOUS)
+					{
+						OnUnconsciousUpdate(pDt, m_LastCommandBeforeUnconscious);
+
+						//! protection for a player being broken when attempting to wake them up too early into unconsciousness
+						if (m_UnconsciousTime > 2)
+						{
+							int wakeUpStance = DayZPlayerConstants.STANCEIDX_PRONE;
+
+							//! Don't set the stance if we are swimming or in a vehicle, stance change animation could play
+							if (m_Swimming.m_bWasSwimming || m_LastCommandBeforeUnconscious == DayZPlayerConstants.COMMANDID_VEHICLE)
+								wakeUpStance = -1;
+
+							hcu.WakeUp(wakeUpStance);
+
+							m_IsUnconscious = false;
+							OnUnconsciousStop(pCurrentCommandID);
+						}
+					}
+					else
+					{
+						//! Maybe instead error out or notify of possible desync?
+						if (IsAlive())
+						{
+							m_IsUnconscious = false;
+							OnUnconsciousStop(pCurrentCommandID);
+						}
+					}
+				}
+			}
+			
+			// quickbar use
+			int quickBarSlot = hic.IsQuickBarSlot();
+			if (quickBarSlot && IsAlive())
+			{
+				if (hic.IsQuickBarSingleUse())
+				{
+					OnQuickBarSingleUse(quickBarSlot);
+					//Print("PlayerBase.c IsQuickBarSingleUse - slot: " + quickBarSlot.ToString());
+				}
+				if (hic.IsQuickBarContinuousUseStart() && ((!GetGame().IsDedicatedServer()) && !GetGame().GetUIManager().GetMenu()))
+				{
+					OnQuickBarContinuousUseStart(quickBarSlot);
+					//Print("PlayerBase.c IsQuickBarContinuousUseStart - slot: " + quickBarSlot.ToString());
+				}
+				if (hic.IsQuickBarContinuousUseEnd() && ((!GetGame().IsDedicatedServer())))
+				{
+					OnQuickBarContinuousUseEnd(quickBarSlot);
+					//Print("PlayerBase.c IsQuickBarContinuousUseEnd - slot: " + quickBarSlot.ToString());
+				}
+			}
+			
+			/*if ((pCurrentCommandID == DayZPlayerConstants.COMMANDID_ACTION || pCurrentCommandID == DayZPlayerConstants.COMMANDID_MOVE || pCurrentCommandID == DayZPlayerConstants.COMMANDID_LADDER || pCurrentCommandID == DayZPlayerConstants.COMMANDID_SWIM)) 
+			{
+				mngr.Update(); // checks for suitable action and sets it
+			}*/
+		}
+		if (m_StaminaHandler && hic)
+		{
+			//! SPRINT: enable/disable - based on stamina; disable also when raised
+			if (!CanConsumeStamina(EStaminaConsumers.SPRINT) || !CanSprint())
+			{
+				hic.LimitsDisableSprint(true);
+			}
+			else
+			{
+				hic.LimitsDisableSprint(false);
+			}
+		}
+
+		//map closing - feel free to move to different "update" if it does not belong here
+		if (IsMapOpen())
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				if (!CfgGameplayHandler.GetUse3DMap() && !GetGame().GetUIManager().IsMenuOpen(MENU_MAP))
+				{
+					CloseMapEx(false);
+				}
+				else if (CfgGameplayHandler.GetUse3DMap())
+				{
+					if (IsMapCallbackCancelInput())
+					{
+						CloseMapEx(true);
+					}
+					else if (IsMapCallbackEndInput())
+					{
+						CloseMapEx(false);
+					}
+				}
+			}
+		}
+		
+		
+#ifdef BOT
+		if (m_Bot)
+			m_Bot.OnUpdate(pDt);
+#endif
+		
+		if (m_CheckMeleeItem && (!GetGame().IsDedicatedServer()))
+		{
+			CheckMeleeItemDamage(m_CheckMeleeItem);
+			SetCheckMeleeItem();
+		}
+		
+		#ifdef DEVELOPER
+		TryGetInVehicleDebug();
+		#endif
+		
+		OnCommandHandlerTick(pDt, pCurrentCommandID);
+	}
+	
+	#ifdef DEVELOPER
+	
+	void SetGetInVehicleDebug(EntityAI ent)
+	{
+		m_GetInVehicleTransportDebug = Transport.Cast(ent);
+	}
+	
+	void TryGetInVehicleDebug()
+	{
+		if (m_GetInVehicleTransportDebug)
+		{
+			HumanCommandVehicle vehCommand = StartCommand_Vehicle(m_GetInVehicleTransportDebug, 0, 0);
+			if (vehCommand)
+			{
+				vehCommand.SetVehicleType(m_GetInVehicleTransportDebug.GetAnimInstance());
+			}
+			m_GetInVehicleTransportDebug = null;
+		}
+	}
+	#endif
+	
+	//MAP handling
+	//! DEPRECATED; terminates map animation callback and re-enables controls
+	void CloseMap()
+	{
+		CloseMapEx(false);
+	}
+	
+	void CloseMapEx(bool cancelled)
+	{
+		if (m_hac && !GetMapClosingSyncSent())
+		{
+			if (ScriptInputUserData.CanStoreInputUserData())
+			{
+				if (GetGame().IsMultiplayer() && GetGame().IsClient())
+				{
+					ActionManagerClient mngr_client;
+					CastTo(mngr_client, GetActionManager());
+					
+					if (cancelled)
+					{
+						mngr_client.RequestInterruptAction();
+					}
+					else
+					{
+						mngr_client.RequestEndAction();
+					}
+					
+					GetGame().GetMission().RemoveActiveInputExcludes({"map"});
+					GetGame().GetMission().RemoveActiveInputRestriction(EInputRestrictors.MAP);
+				}
+				else if (!GetGame().IsMultiplayer())
+				{
+					int command_ID = DayZPlayerConstants.CMD_ACTIONINT_END;
+					if (cancelled)
+					{
+						command_ID = DayZPlayerConstants.CMD_ACTIONINT_INTERRUPT;
+					}
+					m_hac.InternalCommand(command_ID);
+				}
+				SetMapClosingSyncSet(true);
+			}
+		}
+		
+		if (!GetGame().IsDedicatedServer())
+		{
+			if (GetGame().GetUIManager().IsMenuOpen(MENU_MAP))
+			{
+				GetGame().GetUIManager().FindMenu(MENU_MAP).Close();
+				if (m_Hud)
+				{
+					m_Hud.ShowHudPlayer(true);
+					m_Hud.ShowQuickbarPlayer(true);
+				}
+				
+				GetGame().GetMission().RemoveActiveInputExcludes({"map"});
+				GetGame().GetMission().RemoveActiveInputRestriction(EInputRestrictors.MAP);
+			}
+		}
+	}
+	
+	void SetMapOpen(bool state)
+	{
+		m_MapOpen = state;
+	}
+	
+	bool IsMapOpen()
+	{
+		return m_MapOpen;
+	}
+	
+	void SetMapClosingSyncSet(bool state)
+	{
+		m_MapClosingSyncSent = state;
+	}
+	
+	bool GetMapClosingSyncSent()
+	{
+		return m_MapClosingSyncSent;
+	}
+	
+	bool IsMapCallbackCancelInput()
+	{
+		if (IsRaised() || (GetUApi().GetInputByID(UAUIMenu).LocalPress() || GetUApi().GetInputByID(UAGear).LocalPress()))
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	bool IsMapCallbackEndInput()
+	{
+		if (GetUApi().GetInputByID(UADefaultAction).LocalPress())
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	MapNavigationBehaviour GetMapNavigationBehaviour()
+	{
+		return m_MapNavigationBehaviour;
+	}
+	
+	void MapNavigationItemInPossession(EntityAI item)
+	{
+		if (GetMapNavigationBehaviour())
+		{
+			GetMapNavigationBehaviour().OnItemInPlayerPossession(item);
+		}
+	}
+	
+	void MapNavigationItemNotInPossession(EntityAI item)
+	{
+		if (GetMapNavigationBehaviour())
+		{
+			GetMapNavigationBehaviour().OnItemNotInPlayerPossession(item);
+		}
+	}
+	
+	void SetCheckMeleeItem(ItemBase item = null)
+	{
+		m_CheckMeleeItem = item;
+	}
+	
+	/*
+	void AirTemperatureCheck()
+	{
+		if (!m_Environment.IsTemperatureSet())
+			return;
+		float air_temperature = m_Environment.GetTemperature();
+		int level = 0;//default
+		if (MiscGameplayFunctions.IsValueInRange(air_temperature, PlayerConstants.BREATH_VAPOUR_THRESHOLD_HIGH, PlayerConstants.BREATH_VAPOUR_THRESHOLD_LOW))
+		{
+			float value = Math.InverseLerp(PlayerConstants.BREATH_VAPOUR_THRESHOLD_LOW, PlayerConstants.BREATH_VAPOUR_THRESHOLD_HIGH,air_temperature);
+			value = Math.Clamp(value,0,1);
+			level = Math.Round(Math.Lerp(1,BREATH_VAPOUR_LEVEL_MAX,value));
+		}
+		else if (air_temperature < PlayerConstants.BREATH_VAPOUR_THRESHOLD_HIGH)
+		{
+			level = BREATH_VAPOUR_LEVEL_MAX;
+		}
+		if (level != m_BreathVapour)
+		{
+			m_BreathVapour = level;
+			SetSynchDirty();
+		}
+	}
+	*/
+	
+	void SetShakesForced(int value)
+	{
+		m_ShakesForced = value;
+	}
+	
+	void FreezeCheck()
+	{
+		int level;
+		if (m_ShakesForced > 0)
+		{
+			level = m_ShakesForced;
+		}
+		else
+		{
+			float heat_comfort = GetStatHeatComfort().Get();
+			if (heat_comfort <= PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING)
+			{
+				float value = Math.InverseLerp(PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_WARNING, PlayerConstants.THRESHOLD_HEAT_COMFORT_MINUS_CRITICAL,heat_comfort);
+				level = Math.Lerp(1,7,value);
+				level = Math.Clamp(value,1,7);
+				/*
+				value = Math.Clamp(value,0,1);
+				level = Math.Round(value * SHAKE_LEVEL_MAX);//translate from normalized value to levels
+				*/
+			}
+		}
+		if (level != m_Shakes)
+		{
+			m_Shakes = level;
+			SetSynchDirty();
+		}
+	}
+
+	override bool IsLanded(int pCurrentCommandID)
+	{
+		if (super.IsLanded(pCurrentCommandID))
+		{
+			return true;
+		}
+
+		//! Handle fall damage for unconscious
+		if (pCurrentCommandID == DayZPlayerConstants.COMMANDID_UNCONSCIOUS)
+		{
+			bool wasFalling = m_IsUnconsciousFalling;
+			m_IsUnconsciousFalling = PhysicsIsFalling(false);
+			return wasFalling && !m_IsUnconsciousFalling;
+		}
+
+		//! No fall damage for players currently being damaged, animation is temporary
+
+		return false;
+	}
+
+	override bool OnLand(int pCurrentCommandID, FallDamageData fallDamageData)
+	{
+		if (super.OnLand(pCurrentCommandID, fallDamageData))
+		{
+			return true;
+		}
+
+		//! Nothing happens for unconscious
+		//! Nothing happens for being damaged
+
+		return false;
+	}
+
+	override bool IsAlreadyInFallingCommand(int pCurrentCommandID)
+	{
+		if (super.IsAlreadyInFallingCommand(pCurrentCommandID))
+		{
+			return true;
+		}
+
+		//! Don't switch to falling command if unconscious 
+		//! Don't switch to falling command if being damaged
+		return pCurrentCommandID == DayZPlayerConstants.COMMANDID_UNCONSCIOUS || pCurrentCommandID == DayZPlayerConstants.COMMANDID_DAMAGE;
+	}
+	
+	void OnUnconsciousStart()
+	{
+		CloseInventoryMenu();
+		
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			SetInventorySoftLock(true);
+			if (m_LastCommandBeforeUnconscious != DayZPlayerConstants.COMMANDID_VEHICLE)
+			{
+				EntityAI entity_in_hands = GetHumanInventory().GetEntityInHands();
+				if (entity_in_hands && CanDropEntity(entity_in_hands) && !IsRestrained())
+				{
+					DropItem(ItemBase.Cast(entity_in_hands));
+				}
+			}
+			GetGame().GetSoundScene().SetSoundVolume(0,2);
+			m_EffectWidgets.AddSuspendRequest(EffectWidgetSuspends.UNCON);
+		}
+		
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || (!GetGame().IsMultiplayer() && GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT))
+		{
+			SetSynchDirty();
+			
+			if (m_LastCommandBeforeUnconscious == DayZPlayerConstants.COMMANDID_VEHICLE)
+			{
+				if (m_TransportCache)
+					m_TransportCache.MarkCrewMemberUnconscious(m_TransportCache.CrewMemberIndex(this));
+			}
+			 
+			// disable voice communication
+			GetGame().EnableVoN(this, false);
+			
+			if (m_AdminLog)
+			{
+				m_AdminLog.UnconStart(this);
+			}
+			
+			// When we fall uncon we force out of block
+			if (GetMeleeFightLogic())
+			{
+				GetMeleeFightLogic().SetBlock(false);
+			}
+		}
+		
+		SetMasterAttenuation("UnconsciousAttenuation");
+	}
+	
+	void OnUnconsciousStop(int pCurrentCommandID)
+	{	
+		m_UnconRefillModifier =1;
+		SetSynchDirty();
+		m_UnconsciousTime = 0;
+		m_UnconsciousVignetteTarget = 2;
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT) 
+		{
+			if (pCurrentCommandID != DayZPlayerConstants.COMMANDID_DEATH)
+			{
+				GetGame().GetSoundScene().SetSoundVolume(g_Game.m_volume_sound,1);
+				PPERequesterBank.GetRequester(PPERequester_UnconEffects).Stop();
+				GetGame().GetMission().GetHud().ShowHudUI(true);
+				GetGame().GetMission().GetHud().ShowQuickbarUI(true);
+				if (GetGame().GetUIManager().IsDialogVisible())
+				{
+					GetGame().GetUIManager().CloseDialog();
+				}
+				if (GetGame().GetUIManager().IsMenuOpen(MENU_RESPAWN_DIALOGUE))
+				{
+					GetGame().GetUIManager().FindMenu(MENU_RESPAWN_DIALOGUE).Close();
+				}
+			}
+			SetInventorySoftLock(false);
+			m_EffectWidgets.RemoveSuspendRequest(EffectWidgetSuspends.UNCON);
+		}
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			// enable voice communication
+			if (IsAlive())
+				GetGame().EnableVoN(this, true);
+			
+			if (m_AdminLog)
+			{
+				m_AdminLog.UnconStop(this);
+			}
+		}
+		
+		SetMasterAttenuation("");
+	}
+
+	void OnUnconsciousUpdate(float pDt, int last_command)
+	{
+		m_UnconsciousTime += pDt;
+		if (GetGame().IsServer())
+		{
+			int shock_simplified = SimplifyShock();
+			
+			if (m_ShockSimplified != shock_simplified)
+			{
+				m_ShockSimplified = shock_simplified;
+				SetSynchDirty();
+			}
+
+			if (m_UnconsciousTime > PlayerConstants.UNCONSCIOUS_IN_WATER_TIME_LIMIT_TO_DEATH && last_command == DayZPlayerConstants.COMMANDID_SWIM)
+			{
+				SetHealth("","",-100);
+			}
+		}
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			GetGame().GetMission().GetHud().ShowHudUI(false);
+			GetGame().GetMission().GetHud().ShowQuickbarUI(false);
+			if (GetPulseType() == EPulseType.REGULAR)
+			{
+				float shock_simple_normalized = GetSimplifiedShockNormalized();
+	
+				float sin = Math.Sin(m_UnconsciousTime * 0.3);
+				float sin_normalized = (sin + 1) / 2;
+				if (sin_normalized < 0.05)
+				{
+					m_UnconsciousVignetteTarget = (1 - shock_simple_normalized / 3) * 2/*vignette max*/;
+				}
+				float vignette = Math.Lerp(2,m_UnconsciousVignetteTarget, sin_normalized);
+				//PrintString(m_UnconsciousVignetteTarget.ToString());
+				m_UnconParam.param1 = vignette;
+				PPERequesterBank.GetRequester(PPERequester_UnconEffects).Start(m_UnconParam);
+			}
+		}
+	}
+	
+	int SimplifyShock()
+	{
+		int shock = Math.Lerp(0, SIMPLIFIED_SHOCK_CAP, GetHealth("","Shock") / GetMaxHealth("","Shock"));
+		shock = Math.Clamp(shock, 0, SIMPLIFIED_SHOCK_CAP);
+		return shock;
+	}
+	
+	float GetSimplifiedShockNormalized()
+	{
+		return (m_ShockSimplified / SIMPLIFIED_SHOCK_CAP);
+	}
+	
+   	override bool IsUnconscious()
+	{
+		return m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_UNCONSCIOUS || m_IsUnconscious;
+	}
+	
+	override bool CanBeTargetedByAI(EntityAI ai)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (!m_CanBeTargetedDebug)
+		{
+			return false;
+		}
+		#endif
+		
+		return super.CanBeTargetedByAI(ai) && !IsUnconscious() && !IsInVehicle();
+	}
+	
+	void GiveShock(float shock)
+	{
+		AddHealth("","Shock",shock);
+	}
+	
+	
+	void OnRestrainStart()
+	{
+		CloseInventoryMenu();
+		GetGame().GetMission().RemoveActiveInputExcludes({"inventory"},true);
+		GetGame().GetMission().RemoveActiveInputRestriction(EInputRestrictors.INVENTORY);
+	}
+	
+	//! functionality moved to ShockMdfr::OnTick
+	void ShockRefill(float pDt);
+	
+	//BrokenLegs
+	// -----------------------
+
+	eBrokenLegs GetBrokenLegs()
+	{
+		return Math.AbsInt(m_BrokenLegState);//negative value denotes first time activation
+	}
+	
+	//Server side
+	void SetBrokenLegs(int stateId)
+	{
+		m_BrokenLegState = stateId;
+		
+		DayZPlayerSyncJunctures.SendBrokenLegsEx(this, stateId);
+		eBrokenLegs state = GetBrokenLegs();//m_BrokenLegState can go bellow 0, cannot be used directly
+		
+		if (state == eBrokenLegs.NO_BROKEN_LEGS)
+		{
+			m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.BROKEN_LEGS;
+			m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.BROKEN_LEGS_SPLINT;
+		}
+		else if (state == eBrokenLegs.BROKEN_LEGS)
+		{
+			SetLegHealth();
+		}
+		else if (state == eBrokenLegs.BROKEN_LEGS_SPLINT)
+		{
+			// handle splint here
+		}
+
+		SetSynchDirty();
+	}
+
+	//Update of state
+	void UpdateBrokenLegs(int stateId)
+	{
+		eBrokenLegs state = GetBrokenLegs();
+		//Raise broken legs flag and force to prone
+		if (state != eBrokenLegs.NO_BROKEN_LEGS)
+		{
+			if (state == eBrokenLegs.BROKEN_LEGS_SPLINT)
+			{
+				if (m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_PRONE)
+				{
+					m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.PRONE_ANIM_OVERRIDE;
+					m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.BROKEN_LEGS;
+					m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask | eInjuryOverrides.BROKEN_LEGS_SPLINT;
+				}
+				m_InjuryHandler.CheckValue(false);
+
+			}
+			else if (state == eBrokenLegs.BROKEN_LEGS)
+			{
+
+				if (m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_PRONE)
+				{
+					m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.PRONE_ANIM_OVERRIDE;
+					m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.BROKEN_LEGS_SPLINT;
+					m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask | eInjuryOverrides.BROKEN_LEGS;
+				}
+				
+				BrokenLegWalkShock();
+				m_InjuryHandler.CheckValue(false);
+
+			}
+		}
+		else if (state == eBrokenLegs.NO_BROKEN_LEGS)
+		{
+			m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.BROKEN_LEGS;
+			m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.BROKEN_LEGS_SPLINT;
+		}
+		
+	}
+	
+	void BreakLegSound()
+	{
+		PlaySoundSet(m_BrokenLegSound, SOUND_BREAK_LEG, 0.1, 0.1);
+	}
+	void BrokenLegForceProne(bool forceOverride = false)
+	{
+		if (!IsInWater() && !IsSwimming() && !IsClimbingLadder() && !IsInVehicle() && !IsClimbing() && DayZPlayerUtils.PlayerCanChangeStance(this, DayZPlayerConstants.STANCEIDX_PRONE))
+		{
+			if (m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_PRONE && m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+			{
+				EntityAI attachment;
+				Class.CastTo(attachment, GetItemOnSlot("Splint_Right"));
+				if (attachment && attachment.GetType() == "Splint_Applied")
+				{
+					attachment.Delete();
+				}
+				
+				m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_INITIAL_SHOCK);
+				m_ShockHandler.CheckValue(true);
+				
+				
+				if (m_ShockHandler.GetCurrentShock() >= 25) //Prevent conflict with unconsciousness by not forcing prone when going uncon (25 shock or less left)
+				{
+					
+					//calcels user action
+					HumanCommandActionCallback cmd = GetCommand_Action();
+					if (cmd)
+					{
+						cmd.Cancel();
+					}
+					
+					StopHandEvent();
+					//Get command move and verify not null
+					HumanCommandMove hcm = StartCommand_Move();//not sure why this is here
+					hcm = GetCommand_Move(); 
+					if (hcm)
+					{
+						hcm.ForceStance(DayZPlayerConstants.STANCEIDX_PRONE);
+					}
+				}
+			}
+		}
+
+		m_JumpClimb.CheckAndFinishJump();
+	}
+	
+	//Used to inflict shock when player is walking (only inflicted on Update timer)
+	void BrokenLegWalkShock()
+	{
+		//No need to pursue here if player is prone as the following logic is not applied
+		if (m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_PRONE && m_MovementState.m_iStanceIdx != DayZPlayerConstants.STANCEIDX_RAISEDPRONE)
+		{
+			float avgLegHealth = GetHealth("RightLeg","") + GetHealth("LeftLeg","") + GetHealth("RightFoot","") + GetHealth("LeftFoot","");
+			avgLegHealth *= 0.25; //divide by 4 to make the average leg health;
+			
+			if (IsSwimming())
+			{
+				//swimming other than forward is not detectable in script other than through velocity check
+				vector v;
+				PhysicsGetVelocity(v);
+				
+				if (v.LengthSq() > 0)
+				{
+					m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_SHOCK_SWIM);
+				}
+			}
+			else if (m_MovementState.m_iMovement != 0)
+			{
+				if (IsClimbingLadder())
+				{
+					MovingShock(avgLegHealth, PlayerConstants.BROKEN_LEGS_HIGH_SHOCK_WALK, PlayerConstants.BROKEN_LEGS_MID_SHOCK_WALK, PlayerConstants.BROKEN_LEGS_LOW_SHOCK_WALK);
+				}
+				else if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_ERECT || m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT)
+				{
+					if (m_MovementState.m_iMovement > 1)//only jog and faster
+					{
+						MovingShock(avgLegHealth, PlayerConstants.BROKEN_LEGS_HIGH_SHOCK_WALK, PlayerConstants.BROKEN_LEGS_MID_SHOCK_WALK, PlayerConstants.BROKEN_LEGS_LOW_SHOCK_WALK);
+					}
+				}
+				else if (m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_CROUCH || m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH)
+				{
+					//any speed other than idle
+					MovingShock(avgLegHealth, PlayerConstants.BROKEN_LEGS_HIGH_SHOCK_WALK * PlayerConstants.BROKEN_CROUCH_MODIFIER, PlayerConstants.BROKEN_LEGS_MID_SHOCK_WALK * PlayerConstants.BROKEN_CROUCH_MODIFIER, PlayerConstants.BROKEN_LEGS_LOW_SHOCK_WALK * PlayerConstants.BROKEN_CROUCH_MODIFIER);
+				}
+			}
+			else 
+			{
+				//Here apply shock if player is standing or crouched and STANDING STILL
+				m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_STAND_SHOCK);
+			}
+			
+			m_ShockHandler.CheckValue(true);
+		}
+	}
+	
+	//Always use the same thresholds but allow passing of different shock values
+	void MovingShock(float legHealth, float highShock, float midShock, float lowShock)
+	{
+		if (legHealth <= PlayerConstants.BROKEN_LEGS_LOW_HEALTH_THRESHOLD)
+		{
+			//Inflict "high shock"
+			m_ShockHandler.SetShock(highShock);
+		}
+		else if (legHealth >= PlayerConstants.BROKEN_LEGS_HIGH_HEALTH_THRESHOLD)
+		{
+			//Inflict "low shock"
+			m_ShockHandler.SetShock(lowShock);
+		}
+		else
+		{
+			//If neither high nore low, inflict "mid shock"
+			m_ShockHandler.SetShock(midShock);
+		}
+	}
+	
+	void DealShock(float dmg)
+	{
+		Param1<float> damage = new Param1<float>(0);
+		damage.param1 = dmg;
+		GetGame().RPCSingleParam(this, ERPCs.RPC_SHOCK, damage, true, GetIdentity());
+	}
+	
+	//Prevent player from picking up heavy items when legs are broken
+	override bool CanPickupHeavyItem(notnull EntityAI item)
+	{
+		if (item.IsHeavyBehaviour() && (GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS || GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS_SPLINT))
+			return false;
+
+		return super.CanPickupHeavyItem(item);
+	}
+	
+	//Set all leg zones' health to 0 in order to limit emergent behaviour and prevent confusion as to how broken legs really work
+	void SetLegHealth()
+	{
+		SetHealth("RightLeg", "", 0);
+		SetHealth("RightFoot", "", 0);
+		SetHealth("LeftLeg", "", 0);
+		SetHealth("LeftFoot", "", 0);
+	}
+	
+	void DropHeavyItem()
+	{
+		ItemBase itemInHands = GetItemInHands();
+		if (itemInHands && itemInHands.IsHeavyBehaviour())
+			DropItem(itemInHands);
+	}
+	
+	bool IsWearingSplint()
+	{
+		EntityAI attachment;
+		Class.CastTo(attachment, GetItemOnSlot("Splint_Right"));
+		if (attachment && attachment.GetType() == "Splint_Applied")
+		{
+			return true;
+		}
+		return false;		
+	}
+	
+	// -----------------------
+	
+		
+	override void OnCommandSwimStart()
+	{
+		ItemBase itemInHands = GetItemInHands();
+		if (itemInHands)
+		{
+			if (itemInHands.IsHeavyBehaviour())
+			{
+				TryHideItemInHands(false);
+				DropHeavyItem();
+			}
+			else
+			{
+				TryHideItemInHands(true);
+			}
+			itemInHands.OnItemInHandsPlayerSwimStart(this);
+		}
+		m_AnimCommandStarting = HumanMoveCommandID.CommandSwim;
+		
+		if (GetInventory())
+			GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+		
+		CloseInventoryMenu();
+		GetDayZGame().GetBacklit().OnSwimmingStart();
+		
+		AbortWeaponEvent();
+		GetWeaponManager().DelayedRefreshAnimationState(10);
+		RequestHandAnimationStateRefresh();
+		
+		GetGame().GetMission().AddActiveInputExcludes({"swimming"});
+	}
+	
+	override void OnCommandSwimFinish()
+	{
+		TryHideItemInHands(false, true);
+		
+		if (GetInventory())
+			GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		
+		GetDayZGame().GetBacklit().OnSwimmingStop();
+		
+		GetWeaponManager().RefreshAnimationState();
+		
+		GetGame().GetMission().RemoveActiveInputExcludes({"swimming"});
+	}
+	
+	override void OnCommandLadderStart()
+	{
+		m_AnimCommandStarting = HumanMoveCommandID.CommandLadder;
+		TryHideItemInHands(true);
+		
+		if (GetInventory())
+			GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+		
+		CloseInventoryMenu();
+		
+		GetGame().GetMission().AddActiveInputExcludes({"ladderclimbing"});
+	}
+	
+	override void OnCommandLadderFinish()
+	{
+		TryHideItemInHands(false, true);
+		
+		if (GetInventory())
+			GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		
+		GetGame().GetMission().RemoveActiveInputExcludes({"ladderclimbing"});
+	}
+	
+	override void OnCommandFallStart()
+	{
+		m_AnimCommandStarting = HumanMoveCommandID.CommandFall;
+		
+		if (GetInventory())
+			GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+		
+		CloseInventoryMenu();
+		
+		AbortWeaponEvent();		
+		GetWeaponManager().DelayedRefreshAnimationState(10);
+		RequestHandAnimationStateRefresh();
+	}
+	
+	override void OnCommandFallFinish()
+	{
+		if (GetInventory())
+			GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		
+		GetWeaponManager().RefreshAnimationState();
+	}
+	
+	override void OnCommandClimbStart()
+	{
+		m_AnimCommandStarting = HumanMoveCommandID.CommandClimb;
+		
+		if (GetInventory())
+			GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+		
+		CloseInventoryMenu();
+		
+		AbortWeaponEvent();
+		GetWeaponManager().DelayedRefreshAnimationState(10);
+		RequestHandAnimationStateRefresh();
+	}
+	
+	override void OnCommandClimbFinish()
+	{
+		if (GetInventory())
+			GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		
+		GetWeaponManager().RefreshAnimationState();
+	}
+	
+	override void OnCommandVehicleStart()
+	{
+		m_AnimCommandStarting = HumanMoveCommandID.CommandVehicle;
+		
+		if (GetInventory())
+			GetInventory().LockInventory(LOCK_FROM_SCRIPT);
+		
+		CloseInventoryMenu();
+		
+		ItemBase itemInHand = GetItemInHands();
+		EntityAI itemOnHead = FindAttachmentBySlotName("Headgear");
+
+		if (itemInHand && itemInHand.GetCompEM())
+			itemInHand.GetCompEM().SwitchOff();
+
+		TryHideItemInHands(true);
+
+		if (itemOnHead && itemOnHead.GetCompEM())
+			itemOnHead.GetCompEM().SwitchOff();
+		
+		HumanCommandVehicle hcv = GetCommand_Vehicle();
+		if (hcv && hcv.GetVehicleSeat() == DayZPlayerConstants.VEHICLESEAT_DRIVER)
+			OnVehicleSeatDriverEnter();
+		
+		GetGame().GetMission().AddActiveInputExcludes({"vehicledriving"});
+	}
+	
+	override void OnCommandVehicleFinish()
+	{
+		if (GetInventory())
+			GetInventory().UnlockInventory(LOCK_FROM_SCRIPT);
+		
+		TryHideItemInHands(false, true);
+		
+		if (m_IsVehicleSeatDriver)
+			OnVehicleSeatDriverLeft();
+		
+		GetGame().GetMission().RemoveActiveInputExcludes({"vehicledriving"});
+	}	
+	
+	override void OnCommandMelee2Start()
+	{
+		m_AnimCommandStarting = HumanMoveCommandID.CommandMelee2;
+		m_IsFighting = true;
+		
+		AbortWeaponEvent();	
+		GetWeaponManager().DelayedRefreshAnimationState(10);
+		RequestHandAnimationStateRefresh();
+	}
+	
+	override void OnCommandMelee2Finish()
+	{
+		RunFightBlendTimer();
+		
+		GetWeaponManager().RefreshAnimationState();
+		
+	}
+	
+	override void OnCommandDeathStart()
+	{	
+		m_AnimCommandStarting = HumanMoveCommandID.CommandDeath;
+
+		AbortWeaponEvent();	
+		GetWeaponManager().DelayedRefreshAnimationState(10);
+		RequestHandAnimationStateRefresh();
+	}
+	
+	override void OnJumpStart()
+	{
+		m_ActionManager.OnJumpStart();
+		
+		AbortWeaponEvent();
+		GetWeaponManager().DelayedRefreshAnimationState(10);
+		RequestHandAnimationStateRefresh();
+		CloseMapEx(true);
+	}
+	
+	override void OnJumpEnd(int pLandType = 0)
+	{
+		if (m_PresenceNotifier)
+		{
+			switch (pLandType)
+			{
+				case HumanCommandFall.LANDTYPE_NONE:
+				case HumanCommandFall.LANDTYPE_LIGHT:
+					m_PresenceNotifier.ProcessEvent(EPresenceNotifierNoiseEventType.LAND_LIGHT);
+					break;
+				case HumanCommandFall.LANDTYPE_MEDIUM:
+				case HumanCommandFall.LANDTYPE_HEAVY:
+					m_PresenceNotifier.ProcessEvent(EPresenceNotifierNoiseEventType.LAND_HEAVY);
+					break;
+			}
+		}
+		
+		GetWeaponManager().RefreshAnimationState();
+	}
+	
+	bool IsStance(int stance, int stanceMask)
+	{
+		return ((1 << stance) & stanceMask) != 0;
+	}
+	
+	override void OnStanceChange(int previousStance, int newStance)
+	{
+		int prone = DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDPRONE;
+		int notProne = DayZPlayerConstants.STANCEMASK_ERECT | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_RAISEDERECT | DayZPlayerConstants.STANCEMASK_RAISEDCROUCH;
+
+		if (IsStance(previousStance, DayZPlayerConstants.STANCEMASK_PRONE) && IsStance(newStance, DayZPlayerConstants.STANCEMASK_ERECT))
+			m_SprintedTimePerStanceMin = PlayerConstants.FULL_SPRINT_DELAY_FROM_PRONE;
+		
+		if (IsStance(previousStance, DayZPlayerConstants.STANCEMASK_PRONE) && IsStance(previousStance, DayZPlayerConstants.STANCEMASK_CROUCH) || (IsStance(previousStance, DayZPlayerConstants.STANCEMASK_CROUCH) && IsStance(newStance, DayZPlayerConstants.STANCEMASK_ERECT)))
+			m_SprintedTimePerStanceMin = PlayerConstants.FULL_SPRINT_DELAY_FROM_CROUCH;
+		
+		if ((IsStance(previousStance, prone) && IsStance(newStance, notProne)) || (IsStance(previousStance, notProne) && IsStance(newStance, prone)))
+		{
+			AbortWeaponEvent();
+			GetWeaponManager().RefreshAnimationState();
+		}
+	}
+	
+	override bool CanChangeStance(int previousStance, int newStance)
+	{
+		// Check if the player is playing a throwing animation
+		if (GetThrowing().IsThrowingAnimationPlaying())
+		{
+			return false;
+		}
+		
+		// don't allow base stance change, only raised hands change
+		if (IsRolling()) 
+		{
+			if (Math.AbsInt(previousStance - newStance) == 3)
+				return true;
+			
+			return false;
+		}
+	
+	    // Check if the player is going to crouch or raised crouch
+	    if (newStance == DayZPlayerConstants.STANCEIDX_CROUCH || newStance == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH) 
+	    {
+	        return GetCurrentWaterLevel() <= GetDayZPlayerType().CommandSwimSettingsW().m_fToErectLevel;
+	    }
+	
+	    // Check if the player is going to prone
+	    if (newStance == DayZPlayerConstants.STANCEIDX_PRONE || newStance == DayZPlayerConstants.STANCEIDX_RAISEDPRONE) 
+	    {
+	        return GetCurrentWaterLevel() <= GetDayZPlayerType().CommandSwimSettingsW().m_fToCrouchLevel;
+	    }
+
+	    // The player can change stance if none of the conditions above are met
+	    return true;
+	}
+
+	
+	override void OnCommandMoveStart()
+	{
+		if (GetGame().IsServer())
+		{
+			//In case player changes stance through a different command, we refresh the anim overrides
+			int prone = DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDPRONE;
+			if (!IsPlayerInStance(prone))
+			{
+				m_InjuryHandler.m_ForceInjuryAnimMask = m_InjuryHandler.m_ForceInjuryAnimMask & ~eInjuryOverrides.PRONE_ANIM_OVERRIDE;
+				ForceUpdateInjuredState();
+			}
+		}
+	}
+	
+	override bool CanRoll()
+	{
+		if (!CanConsumeStamina(EStaminaConsumers.ROLL)) 
+			return false;
+		
+		if (IsInFBEmoteState() || m_EmoteManager.m_MenuEmote)
+		{
+			return false;
+		}
+		
+		return IsPlayerInStance(DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_RAISEDPRONE) && GetCommand_Move() && !GetCommand_Move().IsOnBack();
+	}
+	
+	override void OnRollStart(bool isToTheRight)
+	{
+		DepleteStamina(EStaminaModifiers.ROLL);
+		
+		if (GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+			m_ShockHandler.SetShock(PlayerConstants.BROKEN_LEGS_ROLL_SHOCK);
+	}
+	
+	override void OnRollFinish()
+	{
+	}
+	
+	void OnJumpOutVehicleFinish(float carSpeed)
+	{ 
+		string surfaceType;
+		int liquidType;
+		GetGame().SurfaceUnderObject(this, surfaceType, liquidType);
+	}
+		
+	void OnVehicleSwitchSeat(int seatIndex)
+	{
+		if (seatIndex == DayZPlayerConstants.VEHICLESEAT_DRIVER)
+		{
+			OnVehicleSeatDriverEnter();
+		}
+		else
+		{
+			OnVehicleSeatDriverLeft();
+		}
+	}
+	
+	void OnVehicleSeatDriverEnter()
+	{
+		m_IsVehicleSeatDriver = true;
+		if (m_Hud)
+			m_Hud.ShowVehicleInfo();
+	}
+	
+	void OnVehicleSeatDriverLeft()
+	{
+		m_IsVehicleSeatDriver = false;
+		if (m_Hud)
+			m_Hud.HideVehicleInfo();
+	}
+	
+	override void OnThrowingModeChange(bool change_to_enabled)
+	{
+		if (change_to_enabled)
+		{
+			PlacingCancelLocal();
+			PlacingCancelServer();
+		}
+	}
+	
+	override void EOnFrame(IEntity other, float timeSlice)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			#ifndef NO_GUI
+			m_Hud.Update(timeSlice);
+			m_Hud.ToggleHeatBufferPlusSign(m_HasHeatBuffer);
+			
+			if (IsControlledPlayer() && m_EffectWidgets && m_EffectWidgets.IsAnyEffectRunning())
+			{
+				m_EffectWidgets.Update(timeSlice);
+			}
+			#endif
+
+			if (m_UndergroundHandler)
+				m_UndergroundHandler.Tick(timeSlice);
+		}
+	}
+	
+	override void EOnPostFrame(IEntity other, int extra)
+	{
+		float delta_time = (GetGame().GetTime() - m_LastPostFrameTickTime) / 1000;
+		m_LastPostFrameTickTime = GetGame().GetTime();
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			if (GetDamageDealtEffect())
+			{
+				if (IsAlive())
+					GetDamageDealtEffect().Update(delta_time);
+				else
+					delete GetDamageDealtEffect();
+			}
+			
+			if (m_EffectRadial)
+			{
+				if (IsAlive())
+				{
+					m_EffectRadial.Update(delta_time);
+				}
+				else
+					m_EffectRadial = null;
+			}
+				
+			
+			if (GetFlashbangEffect())
+			{
+				if (IsAlive())
+				{
+					GetFlashbangEffect().Update(delta_time);
+				}
+				else
+				{
+					GetFlashbangEffect().Stop();
+					delete GetFlashbangEffect();
+				}
+			}
+			
+			if (GetShockEffect())
+			{
+				if (IsAlive())
+					GetShockEffect().Update(delta_time);
+				else
+					delete GetShockEffect();
+			}
+
+			m_InventoryActionHandler.OnUpdate();
+		}
+			
+		#ifdef DIAG_DEVELOPER			
+		DiagOnPostFrame(other, extra);
+		#endif
+	}
+	
+#ifdef DIAG_DEVELOPER	
+	protected void DiagOnPostFrame(IEntity other, int extra)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			if (m_WeaponDebug)
+			{
+				m_WeaponDebug.OnPostFrameUpdate();
+			}
+
+			if (GetBleedingManagerRemote())
+			{
+				GetBleedingManagerRemote().OnUpdate();
+			}
+			
+			if (m_MeleeCombat)
+			{
+				if (DiagMenu.GetBool(DiagMenuIDs.MELEE_DEBUG))
+				{
+					m_MeleeDebug = true;
+					m_MeleeCombat.Debug(GetItemInHands(), m_MeleeCombat.GetHitType());
+				}
+				else if (!DiagMenu.GetBool(DiagMenuIDs.MELEE_DEBUG) && m_MeleeDebug)
+				{
+					m_MeleeDebug = false;
+					m_MeleeCombat.Debug(GetItemInHands(), m_MeleeCombat.GetHitType());
+				}
+			}
+			
+			if (DiagMenu.GetBool(DiagMenuIDs.SOUNDS_ITEM_IMPACT_SOUNDS))
+				InventoryItem.DrawImpacts();
+			
+			if (GetPluginManager())
+			{
+				PluginDrawCheckerboard drawCheckerboard = PluginDrawCheckerboard.Cast(GetPluginManager().GetPluginByType(PluginDrawCheckerboard));
+				if (drawCheckerboard && !drawCheckerboard.IsActive())
+				{
+					drawCheckerboard.ShowWidgets(DiagMenu.GetBool(DiagMenuIDs.MISC_DRAW_CHECKERBOARD));
+				}
+			}
+
+			if (m_PresenceNotifier)
+			{
+				m_PresenceNotifier.EnableDebug(DiagMenu.GetBool(DiagMenuIDs.MISC_PRESENCE_NOTIFIER_DBG));
+			}
+			
+			if (DiagMenu.GetBool(DiagMenuIDs.TRIGGER_PLAYER_DEBUG))
+			{
+				vector minmax[2];
+				GetCollisionBox(minmax);
+				
+				int color = COLOR_RED_A;
+				if (m_IsInsideTrigger)
+					color = COLOR_GREEN_A;
+				
+				Shape dbgShape = Debug.DrawBoxEx(minmax[0], minmax[1], color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE|ShapeFlags.ONCE);
+				
+				vector mat[4];
+				GetTransform(mat);
+				dbgShape.CreateMatrix(mat);
+				dbgShape.SetMatrix(mat);
+			}
+		}
+		
+		if (m_Environment && m_Environment.m_Debug)
+		{
+			#ifdef SERVER
+			EnvDebugData envDebugData = m_Environment.GetEnvDebugData();
+			GetGame().RPCSingleParam(this, ERPCs.DIAG_MISC_ENVIRONMENT_DEBUG_DATA, envDebugData, false, GetIdentity());
+			#else
+			m_Environment.ShowEnvDebugPlayerInfo(DiagMenu.GetBool(DiagMenuIDs.MISC_ENVIRONMENT_DEBUG));
+			#endif
+		}
+		
+		if (m_FallDamage && m_FallDamage.m_Debug)
+		{
+			#ifdef SERVER
+			FallDamageDebugData fallDamageDebugData = m_FallDamage.GetFallDamageDebugData();
+			GetGame().RPCSingleParam(this, ERPCs.DIAG_MISC_FALLDAMAGE_DEBUG_DATA, fallDamageDebugData, false, GetIdentity());
+			#else
+			m_FallDamage.ShowFallDamageDebugInfo(DiagMenu.GetBool(DiagMenuIDs.MISC_FALLDAMAGE_DEBUG));
+			#endif
+		}
+	}
+	
+	override void OnEnterTrigger(ScriptedEntity trigger)
+	{
+		super.OnEnterTrigger(trigger);
+
+		++m_IsInsideTrigger;
+	}
+	
+	override void OnLeaveTrigger(ScriptedEntity trigger)
+	{
+		super.OnLeaveTrigger(trigger);
+
+		--m_IsInsideTrigger;
+	}
+#endif
+
+	void StaminaHUDNotifier(bool show)
+	{
+		if (m_Hud)
+			m_Hud.SetStaminaBarVisibility(show);
+	}
+	
+	override void DepleteStamina(EStaminaModifiers modifier, float dT = -1)
+	{
+		if (GetStaminaHandler())
+			GetStaminaHandler().DepleteStamina(modifier,dT);		
+	}
+
+	override bool CanConsumeStamina(EStaminaConsumers consumer)
+	{
+		if (!GetStaminaHandler()) return false;
+		
+		bool val = (GetStaminaHandler().HasEnoughStaminaFor(consumer) /*&& !IsOverloaded()*/ && !IsRestrained() && !IsInFBEmoteState());
+		
+		if (!val)
+			StaminaHUDNotifier(false);
+
+		return val;
+	}
+	
+	override bool CanStartConsumingStamina(EStaminaConsumers consumer)
+	{
+		if (!GetStaminaHandler()) return false;
+		
+		bool val = (GetStaminaHandler().HasEnoughStaminaToStart(consumer) && !IsRestrained() && !IsInFBEmoteState());
+		
+		if (!val)
+			StaminaHUDNotifier(false);
+
+		return val;
+	}
+	
+	//! DEPRECATED
+	bool HasStaminaRemaining()
+	{
+		if (!GetStaminaHandler())
+			return false;
+		
+		return GetStaminaHandler().GetStamina() > 0;
+	}
+	
+	override bool CanClimb(int climbType, SHumanCommandClimbResult climbRes)
+	{
+		if (GetBrokenLegs() == eBrokenLegs.BROKEN_LEGS)
+		{
+			return false;
+		}
+			
+		if (climbType == 1 && !CanConsumeStamina(EStaminaConsumers.VAULT))
+			return false;
+		
+		if (climbType == 2 && (!CanConsumeStamina(EStaminaConsumers.CLIMB) || GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS))
+			return false;
+
+		if (climbType > 0 && m_InjuryHandler && m_InjuryHandler.GetInjuryAnimValue() >= InjuryAnimValues.LVL3)
+			return false;
+
+		return super.CanClimb(climbType,climbRes);
+	}
+
+	override bool CanJump()
+	{
+		if (GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS)
+		{	
+			return false;
+		}
+		
+		if (!CanConsumeStamina(EStaminaConsumers.JUMP))
+			return false;
+
+		//! disables jump when player is significantly injured
+		if (m_InjuryHandler && m_InjuryHandler.GetInjuryAnimValue() >= InjuryAnimValues.LVL3)
+			return false;
+		
+		if (IsInFBEmoteState() || m_EmoteManager.m_MenuEmote)
+		{
+			return false;
+		}	
+
+		return super.CanJump();
+	}
+	
+	bool IsJumpInProgress()
+	{
+		return m_JumpClimb.m_bIsJumpInProgress;
+	}
+	
+	bool IsTargetInActiveRefresherRange(EntityAI target)
+	{
+		array<vector> temp = new array<vector>;
+		temp = GetGame().GetMission().GetActiveRefresherLocations();
+		int count = temp.Count();
+		if (count > 0)
+		{
+			vector pos = target.GetPosition();
+			for (int i = 0; i < count; i++)
+			{
+				if (vector.Distance(pos,temp.Get(i)) < GameConstants.REFRESHER_RADIUS)
+					return true;
+			}
+			
+			return false;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	void RequestHandAnimationStateRefresh()
+	{
+		if ((GetGame().IsMultiplayer() && GetGame().IsServer()))
+		{
+			m_RefreshAnimStateIdx++;
+			if (m_RefreshAnimStateIdx > 3)
+				m_RefreshAnimStateIdx = 0;
+			SetSynchDirty();
+		}
+	}
+	
+	void RefreshHandAnimationState(int delay = 0)
+	{
+		if (delay == 0)
+		{
+			GetItemAccessor().OnItemInHandsChanged(true);
+			GetItemAccessor().ResetWeaponInHands();
+		}
+		else
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(RefreshHandAnimationState,delay,false,0);
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	// 		USER ACTIONS
+	// -------------------------------------------------------------------------
+
+	bool IsFacingTarget(Object target)
+	{
+		vector pdir = GetDirection();
+		vector ptv = target.GetPosition() - GetPosition();
+		pdir.Normalize();
+		ptv.Normalize();
+
+		if (Math.AbsFloat(pdir[0]-ptv[0]) < 0.5 && Math.AbsFloat(pdir[2]-ptv[2]) < 0.5)
+		{
+			return true;
+		}
+		return false;
+	}
+
+	//---------------------------------------------------------
+	void OnQuickBarSingleUse(int slotClicked)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+			return;
+		
+		if (m_AreHandsLocked)
+			return; //Player is in the short window of time after interrupting placement of an item and before getting it back in hands
+
+		if (GetInventory().IsInventoryLocked() || IsEmotePlaying())
+			return;
+		
+		if (GetThrowing().IsThrowingModeEnabled() || GetThrowing().IsThrowingAnimationPlaying())
+			return;
+		
+		if (IsRaised() || GetCommand_Melee() || IsSwimming() || IsClimbingLadder() || IsClimbing() || IsRestrained() || IsRestrainPrelocked())
+			return;
+		
+		if (GetDayZPlayerInventory().IsProcessing() || IsItemsToDelete())
+			return;
+		
+		if (GetActionManager().GetRunningAction() != null)
+			return;
+		
+		if (GetWeaponManager() && GetWeaponManager().IsRunning())
+			return;
+		
+		if (!ScriptInputUserData.CanStoreInputUserData())
+			return;
+		
+		//TODO MW change locking method
+		//if (GetDayZPlayerInventory().HasLockedHands())
+		//	return;
+			
+		EntityAI quickBarEntity = GetQuickBarEntity(slotClicked - 1);//GetEntityInQuickBar(slotClicked - 1);
+		
+		if (!quickBarEntity)
+			return;
+		
+		Magazine mag;
+		Weapon_Base wpn;
+		
+		if (Class.CastTo(mag, quickBarEntity) && Class.CastTo(wpn, mag.GetHierarchyParent()))
+			return;
+
+		EntityAI inHandEntity = GetHumanInventory().GetEntityInHands();
+				
+		if (!GetDayZPlayerInventory().IsIdle())
+			return; // player is already performing some animation
+
+		InventoryLocation handInventoryLocation = new InventoryLocation;
+		handInventoryLocation.SetHands(this,quickBarEntity);
+		if (this.GetInventory().HasInventoryReservation(quickBarEntity, handInventoryLocation))
+			return;
+		
+		if (inHandEntity == quickBarEntity)
+		{
+			if (GetHumanInventory().CanRemoveEntityInHands())
+			{
+				if (LogManager.IsSyncLogEnable()) syncDebugPrint("[QB] Stash - PredictiveMoveItemFromHandsToInventory HND=" + Object.GetDebugName(inHandEntity));
+				PredictiveMoveItemFromHandsToInventory();
+			}
+		}
+		else
+		{
+			InventoryLocation invLocQBItem = new InventoryLocation;
+			quickBarEntity.GetInventory().GetCurrentInventoryLocation(invLocQBItem);
+			if (GetInventory().HasInventoryReservation(quickBarEntity,invLocQBItem))
+				return;
+				
+			if (inHandEntity)
+			{
+				InventoryLocation Reserved_Item_il = new InventoryLocation;
+				
+				InventoryLocation inHandEntityFSwapDst = new InventoryLocation;
+				inHandEntity.GetInventory().GetCurrentInventoryLocation(inHandEntityFSwapDst);
+
+				int index = GetHumanInventory().FindUserReservedLocationIndex(inHandEntity);
+				if (index >= 0)
+					GetHumanInventory().GetUserReservedLocation(index, Reserved_Item_il);
+				
+				if (Reserved_Item_il)
+					inHandEntityFSwapDst.CopyLocationFrom(Reserved_Item_il, true);
+				
+				if (index < 0 && GameInventory.CanSwapEntitiesEx(quickBarEntity, inHandEntity))
+				{
+					if (LogManager.IsSyncLogEnable()) syncDebugPrint("[QB] PredictiveSwapEntities QB=" + Object.GetDebugName(quickBarEntity) + " HND=" + Object.GetDebugName(inHandEntity));
+					PredictiveSwapEntities(quickBarEntity, inHandEntity);
+				}
+				else if (GameInventory.CanForceSwapEntitiesEx(quickBarEntity, handInventoryLocation, inHandEntity, inHandEntityFSwapDst))
+				{
+					if (LogManager.IsSyncLogEnable()) syncDebugPrint("[QB] Swap - PredictiveForceSwapEntities HND=" + Object.GetDebugName(inHandEntity) +  " QB=" + Object.GetDebugName(quickBarEntity) + " fswap_dst=" + InventoryLocation.DumpToStringNullSafe(inHandEntityFSwapDst));
+					PredictiveForceSwapEntities(quickBarEntity, inHandEntity, inHandEntityFSwapDst);
+				}
+			}
+			else
+			{
+				if (GetInventory().HasInventoryReservation(quickBarEntity,handInventoryLocation))
+					return;
+				
+				if (GetInventory().CanAddEntityIntoHands(quickBarEntity))
+				{
+					if (LogManager.IsSyncLogEnable()) syncDebugPrint("[QB] Stash - PredictiveTakeEntityToHands QB=" + Object.GetDebugName(quickBarEntity));
+					PredictiveTakeEntityToHands(quickBarEntity);
+				}
+			}
+		}	
+	}
+	//---------------------------------------------------------
+	void OnQuickBarContinuousUseStart(int slotClicked)
+	{
+		if (GetInventory().IsInventoryLocked())
+			return;
+		
+		if (IsSwimming() || IsClimbingLadder() || GetCommand_Melee() || IsClimbing() || IsRestrained() || IsRestrainPrelocked())
+			return;
+		
+		ItemBase quickBarItem = ItemBase.Cast(GetQuickBarEntity(slotClicked - 1));
+
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			ItemBase itemInHands = ItemBase.Cast(GetHumanInventory().GetEntityInHands());
+
+			if (itemInHands != quickBarItem)
+			{
+				ActionManagerClient amc = ActionManagerClient.Cast(GetActionManager());
+
+				if (amc.CanPerformActionFromQuickbar(itemInHands, quickBarItem))
+				{
+					amc.PerformActionFromQuickbar(itemInHands, quickBarItem);
+				}
+				else
+				{
+					if (IsRaised() || GetCommand_Melee())
+						return;
+
+					amc.ForceTarget(quickBarItem);
+					m_QuickBarFT = true;
+				}
+			}
+		}
+		m_QuickBarHold = true;
+	}
+	//---------------------------------------------------------
+	void OnQuickBarContinuousUseEnd(int slotClicked)
+	{
+		if (m_QuickBarHold)
+		{
+			if ( GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+			{
+				ActionManagerClient am = ActionManagerClient.Cast(GetActionManager());
+				
+				if (m_ActionQBControl)
+				{
+					ActionBase action = am.GetRunningAction(); 
+					if (action)
+					{
+						if (!action.GetInput().IsActive())
+						{
+							am.EndActionInput();
+						}
+					
+					}
+				}
+				
+				if (m_QuickBarFT)
+				{
+					am.ClearForceTarget();
+					m_QuickBarFT = false;
+				}
+			}
+		}
+		m_QuickBarHold = false;
+	}
+	void SetActionEndInput(ActionBase action)
+	{
+		m_ActionQBControl = !action.GetInput().IsActive();
+	}
+	
+	bool IsQBControl()
+	{
+		return m_ActionQBControl;
+	}
+	void ResetActionEndInput()
+	{
+		m_ActionQBControl = false;
+	}
+	
+	//---------------------------------------------------------
+	//	RADIAL QUICKBAR AND RELOAD ACTIONS
+	//---------------------------------------------------------
+	//the same functionality as normal quick bar slot key press
+	void RadialQuickBarSingleUse(int slotClicked)
+	{
+		OnQuickBarSingleUse(slotClicked);				
+	}
+	
+	//removed the need for holding down quick bar slot key
+	void RadialQuickBarCombine(int slotClicked)
+	{
+		EntityAI quickBarEntity = GetQuickBarEntity(slotClicked - 1);
+		EntityAI entity_in_hands = GetHumanInventory().GetEntityInHands();
+		
+		ReloadWeapon(entity_in_hands, quickBarEntity);	
+	}
+
+	//removed the need for holding down quick bar slot key
+	void QuickReloadWeapon(EntityAI weapon)
+	{
+		EntityAI magazine = GetMagazineToReload(weapon);
+		ReloadWeapon(weapon, magazine);
+	}
+	
+	//Reload weapon with given magazine
+	void ReloadWeapon(EntityAI weapon, EntityAI magazine)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			ActionManagerClient mngr_client;
+			CastTo(mngr_client, GetActionManager());
+			
+			if (mngr_client && FirearmActionLoadMultiBulletRadial.Cast(mngr_client.GetRunningAction()))
+			{
+				mngr_client.Interrupt();
+			}
+			else if (GetHumanInventory().GetEntityInHands()!= magazine)
+			{
+				Weapon_Base wpn;
+				Magazine mag;
+				Class.CastTo(wpn,  weapon);
+				Class.CastTo(mag,  magazine);
+				if (GetWeaponManager().CanUnjam(wpn))
+				{
+					GetWeaponManager().Unjam();
+				}
+				else if (GetWeaponManager().CanAttachMagazine(wpn, mag))
+				{
+					GetWeaponManager().AttachMagazine(mag);
+				}
+				else if (GetWeaponManager().CanSwapMagazine(wpn, mag))
+				{
+					GetWeaponManager().SwapMagazine(mag);
+				}
+				else if (GetWeaponManager().CanLoadBullet(wpn, mag))
+				{
+					//GetWeaponManager().LoadMultiBullet(mag);
+
+					ActionTarget atrg = new ActionTarget(mag, this, -1, vector.Zero, -1.0);
+					if (mngr_client && !mngr_client.GetRunningAction() && mngr_client.GetAction(FirearmActionLoadMultiBulletRadial).Can(this, atrg, wpn))
+						mngr_client.PerformActionStart(mngr_client.GetAction(FirearmActionLoadMultiBulletRadial), atrg, wpn);
+				}
+			}
+		}		
+	}
+
+	//returns compatible magazine from player inventory with highest ammo count
+	EntityAI GetMagazineToReload(EntityAI weapon)
+	{
+		Weapon_Base weapon_base = Weapon_Base.Cast(weapon);
+		WeaponManager weapon_manager = GetWeaponManager();
+		EntityAI magazine_to_reload;
+		
+		EntityAI ammo_magazine;				//magazine
+		int last_ammo_magazine_count;
+		int ammo_magazine_count;
+		
+		EntityAI ammo_pile;					//ammo pile
+		int last_ammo_pile_count;
+		int ammo_pile_count;
+		
+		//Get all magazines in (player) inventory
+		for (int att_i = 0; att_i < GetInventory().AttachmentCount(); ++att_i)
+		{
+			EntityAI attachment = GetInventory().GetAttachmentFromIndex(att_i);
+			ref CargoBase attachment_cargo = attachment.GetInventory().GetCargo();
+			
+			if (attachment_cargo)
+			{
+				for (int cgo_i = 0; cgo_i < attachment_cargo.GetItemCount(); ++cgo_i)
+				{
+					EntityAI cargo_item = attachment_cargo.GetItem(cgo_i);
+					
+					//check for proper magazine
+					if (cargo_item.IsMagazine())
+					{
+						Magazine magazine = Magazine.Cast(cargo_item);
+						ammo_pile_count = magazine.GetAmmoCount();
+						
+						//magazines (get magazine with max ammo count)
+						if (weapon_manager.CanAttachMagazine(weapon_base, magazine) || weapon_manager.CanSwapMagazine(weapon_base, magazine))
+						{
+							if (ammo_pile_count > 0)
+							{
+								if (last_ammo_magazine_count == 0)
+								{
+									ammo_magazine = magazine;
+									last_ammo_magazine_count = ammo_pile_count;
+								}
+								else
+								{
+									if (last_ammo_magazine_count < ammo_pile_count)
+									{
+										ammo_magazine = magazine;
+										last_ammo_magazine_count = ammo_pile_count;
+									}
+								}
+							}
+						}	
+						//bullets (get ammo pile with min ammo count)
+						else if (weapon_manager.CanLoadBullet(weapon_base, magazine))
+						{
+							if (ammo_pile_count > 0)
+							{
+								if (last_ammo_pile_count == 0)
+								{
+									ammo_pile = magazine;
+									last_ammo_pile_count = ammo_pile_count;
+								}
+								else
+								{
+									if (last_ammo_pile_count > ammo_pile_count)
+									{
+										ammo_pile = magazine;
+										last_ammo_pile_count = ammo_pile_count;
+									}
+								}
+							}
+						}							
+					}
+				}
+			}
+		}
+
+		//prioritize magazine
+		if (ammo_magazine)
+		{
+			return ammo_magazine;		
+		}
+		
+		return ammo_pile;
+	}
+	//---------------------------------------------------------
+	
+	
+	//---------------------------------------------------------
+	void OnSpawnedFromConsole()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+		{
+			GetGame().GetMission().AddDummyPlayerToScheduler(this);
+			OnSelectPlayer();
+		}
+	}
+	
+	//---------------------------------------------------------
+	//Obsolete
+	bool GetLiquidTendencyDrain()
+	{
+		return m_LiquidTendencyDrain;
+	}
+	//---------------------------------------------------------
+	//Obsolete
+	void SetLiquidTendencyDrain(bool state)
+	{
+		m_LiquidTendencyDrain = state;
+	}
+	
+	//---------------------------------------------------------
+	//! DEPRECATED
+	bool GetFlagTendencyRaise()
+	{
+		return m_FlagRaisingTendency;
+	}
+	//---------------------------------------------------------
+	//! DEPRECATED
+	void SetFlagTendencyRaise(bool state)
+	{
+		m_FlagRaisingTendency = state;
+	}
+	
+	override SoundOnVehicle PlaySound(string sound_name, float range, bool create_local = false)
+	{
+		return BetaSound.SaySound(this, sound_name, range, false);
+	}
+	
+	float GetPlayerLoad()
+	{
+		return GetWeightEx();
+	}
+	
+	bool IsOverloaded()
+	{
+		return GetWeightEx() >= OVERLOAD_LIMIT;
+	}
+
+	void SetPlayerLoad(float load)//Deprecated
+	{
+		m_CargoLoad = load;
+		//Print("m_CargoLoad: " + m_CargoLoad);
+		//Log(ToString(this) + "'s load weight is " + ftoa(m_CargoLoad) + " g.", LogTemplates.TEMPLATE_PLAYER_WEIGHT);
+	}
+
+	//Deprecated, will be overrid by other method calls (in order to ensure stamina calculation is properly set)
+	void AddPlayerLoad(float addedload)//Deprecated
+	{
+		float newload = GetPlayerLoad() + addedload;
+		SetPlayerLoad(newload);
+		
+		// Do not need -> Log is in SetPlayerLoad
+		//PrintString(ToString(this) + "'s load weight is " + ToString(m_CargoLoad) + " g.");
+	}
+
+	bool IsItemInInventory(EntityAI entity)
+	{
+		return GetInventory().HasEntityInInventory(entity);
+	}
+
+	override bool NeedInventoryJunctureFromServer(notnull EntityAI item, EntityAI currParent, EntityAI newParent)
+	{
+		if (GetGame().IsMultiplayer())
+		{
+			DayZPlayerInstanceType t = GetInstanceType();
+			switch (t)
+			{
+				case DayZPlayerInstanceType.INSTANCETYPE_AI_SINGLEPLAYER:
+					return false;
+				case DayZPlayerInstanceType.INSTANCETYPE_CLIENT:
+				case DayZPlayerInstanceType.INSTANCETYPE_SERVER:
+				case DayZPlayerInstanceType.INSTANCETYPE_AI_SERVER:
+				case DayZPlayerInstanceType.INSTANCETYPE_AI_REMOTE:
+				case DayZPlayerInstanceType.INSTANCETYPE_REMOTE:
+					return true; // Might help mitigate "megabugged" (desync)
+				
+					if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " NeedInventoryJunctureFromServer item=" + Object.GetDebugName(item) + " currPar=" + currParent + " newPar=" + newParent);
+					
+					bool i_owned = GetHumanInventory().HasEntityInInventory(item);
+					
+					bool cp_owned = false;
+					if (currParent)
+						cp_owned = GetHumanInventory().HasEntityInInventory(currParent);
+					
+					bool np_owned = false;
+					if (newParent)
+						np_owned = GetHumanInventory().HasEntityInInventory(newParent);
+
+					bool all_owned = i_owned && cp_owned && (np_owned || (newParent == null));
+					if (LogManager.IsSyncLogEnable()) syncDebugPrint("[syncinv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " NeedInventoryJunctureFromServer=" + !all_owned + " i_pwn=" + i_owned + " cp_pwn=" + cp_owned + " np_pwn=" + np_owned);
+					
+					return !all_owned;
+				default:
+					Error("[syncinv] unsupported instance type t=" + t);
+					break;
+			}
+		}
+		return false;
+	}
+	
+	
+	override protected float GetWeightSpecialized(bool forceRecalc = false)
+	{
+		float totalWeight = super.GetWeightSpecialized(forceRecalc);
+		
+		ItemBase itemHands = GetItemInHands();
+		if (itemHands) // adds weight of item carried in hands
+		{
+			totalWeight += itemHands.GetWeightEx(forceRecalc);
+		}
+		#ifdef DEVELOPER
+		if (WeightDebug.m_VerbosityFlags & WeightDebugType.RECALC_FORCED)
+		{
+			float itemInHandsWeight = totalWeight - super.GetWeightSpecialized(forceRecalc);
+			WeightDebugData dta = WeightDebug.GetWeightDebug(this);
+			dta.SetCalcDetails("TMan: " + (super.GetWeightSpecialized(forceRecalc)+ itemInHandsWeight) +"(contents weight[includes item in hands])");
+		}
+		#endif
+		return totalWeight;
+	}
+	
+	void CalculateVisibilityForAI()
+	{
+		const int VISIBILITY_SLOTS_COUNT = 10;
+
+		int attcount = GetInventory().AttachmentCount();
+		float sumVisibility = 0;
+		float countVisibility = 0;
+		float visibilityMean = 0;
+
+		if (attcount > 0)
+		{
+			for (int att = 0; att < attcount; att++)
+			{
+				EntityAI attachment = GetInventory().GetAttachmentFromIndex(att);
+				if (attachment.IsClothing())
+				{
+					ClothingBase clothing;
+					Class.CastTo(clothing, attachment);
+					sumVisibility += clothing.GetItemVisibility();
+					countVisibility++;
+				}
+			}
+
+			visibilityMean = (sumVisibility + (VISIBILITY_SLOTS_COUNT - countVisibility)) / VISIBILITY_SLOTS_COUNT;
+			SetVisibilityCoef(visibilityMean);
+		}
+		else
+		{
+			visibilityMean = 1;
+			SetVisibilityCoef(visibilityMean);
+		}
+	}
+	
+	void SetVisibilityCoef(float pVisibility)
+	{
+		m_VisibilityCoef = pVisibility;
+	}
+	
+	float GetVisibilityCoef()
+	{
+		return m_VisibilityCoef;
+	}
+
+	
+	int GetShakeLevel()
+	{
+		return m_Shakes;
+	}
+	
+	
+	EStatLevels GetStatLevelHealth()
+	{
+		float health = GetHealth("","");
+		return GetStatLevel(health, PlayerConstants.SL_HEALTH_CRITICAL, PlayerConstants.SL_HEALTH_LOW, PlayerConstants.SL_HEALTH_NORMAL, PlayerConstants.SL_HEALTH_HIGH);
+	}
+	
+	EStatLevels GetStatLevelToxicity()
+	{
+		float toxicity = GetStatToxicity().Get();
+		return GetStatLevel(toxicity, PlayerConstants.SL_HEALTH_CRITICAL, PlayerConstants.SL_HEALTH_LOW, PlayerConstants.SL_HEALTH_NORMAL, PlayerConstants.SL_HEALTH_HIGH);
+	}
+	
+	EStatLevels GetStatLevelBlood()
+	{
+		float blood = GetHealth("","Blood");
+		return GetStatLevel(blood, PlayerConstants.SL_BLOOD_CRITICAL, PlayerConstants.SL_BLOOD_LOW, PlayerConstants.SL_BLOOD_NORMAL, PlayerConstants.SL_BLOOD_HIGH);
+	}
+	
+	EStatLevels GetStatLevelEnergy()
+	{
+		float energy = GetStatEnergy().Get();
+		return GetStatLevel(energy, PlayerConstants.SL_ENERGY_CRITICAL, PlayerConstants.SL_ENERGY_LOW, PlayerConstants.SL_ENERGY_NORMAL, PlayerConstants.SL_ENERGY_HIGH);
+	}
+	
+	EStatLevels GetStatLevelWater()
+	{
+		float water = GetStatWater().Get();
+		return GetStatLevel(water, PlayerConstants.SL_WATER_CRITICAL, PlayerConstants.SL_WATER_LOW, PlayerConstants.SL_WATER_NORMAL, PlayerConstants.SL_WATER_HIGH);
+	}
+	
+	//!returns player's immunity level
+	/*
+	EStatLevels GetImmunityLevel()
+	{
+		float immunity = GetImmunity();
+		
+		EStatLevels level; 
+		if (immunity > PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_HIGH)
+		{
+			level = EStatLevels.GREAT;
+		}
+		else if (immunity > PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_NORMAL)
+		{
+			level = EStatLevels.HIGH;
+		}
+		else if (immunity > PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_LOW)
+		{
+			level = EStatLevels.MEDIUM;
+		}
+		else if (immunity > PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_CRITICAL)
+		{
+			level = EStatLevels.LOW;
+		}
+		else
+		{
+			level = EStatLevels.CRITICAL;
+		}
+		
+		if (m_ImmunityBoosted && level != EStatLevels.GREAT)
+		{
+			level--;
+		}
+		return level;
+	}
+	*/
+	
+	EStatLevels GetImmunityLevel()
+	{
+		float immunity = GetImmunity();
+		if (m_ImmunityBoosted)
+			return EStatLevels.GREAT;
+		return GetStatLevel(immunity, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_CRITICAL, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_LOW, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_NORMAL, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_HIGH);
+	}
+	
+	//-------------------------------------
+	float GetBordersImmunity()
+	{
+		float immunity = GetImmunity();
+		float immmunity_max = 1;
+		return GetStatLevelBorders(immunity, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_CRITICAL, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_LOW, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_NORMAL, PlayerConstants.IMMUNITY_THRESHOLD_LEVEL_HIGH, immmunity_max);
+	}
+	
+	
+	float GetStatBordersHealth()
+	{
+		float health = GetHealth("","");
+		float health_max = GetMaxHealth("","");
+		return GetStatLevelBorders(health, PlayerConstants.SL_HEALTH_CRITICAL, PlayerConstants.SL_HEALTH_LOW, PlayerConstants.SL_HEALTH_NORMAL, PlayerConstants.SL_HEALTH_HIGH, health_max);
+	}
+	
+	float GetStatBordersToxicity()
+	{
+		float toxicity = GetStatToxicity().Get();
+		float toxicity_max = GetStatToxicity().GetMax();
+		return GetStatLevelBorders(toxicity, PlayerConstants.SL_HEALTH_CRITICAL, PlayerConstants.SL_HEALTH_LOW, PlayerConstants.SL_HEALTH_NORMAL, PlayerConstants.SL_HEALTH_HIGH, toxicity_max);
+	}
+	
+	float GetStatBordersBlood()
+	{
+		float blood = GetHealth("","Blood");
+		float blood_max = GetMaxHealth("","Blood");
+		return GetStatLevelBorders(blood, PlayerConstants.SL_BLOOD_CRITICAL, PlayerConstants.SL_BLOOD_LOW, PlayerConstants.SL_BLOOD_NORMAL, PlayerConstants.SL_BLOOD_HIGH, blood_max);
+	}
+	
+	float GetStatBordersEnergy()
+	{
+		float energy = GetStatEnergy().Get();
+		float energy_max = GetStatEnergy().GetMax();
+		return GetStatLevelBorders(energy, PlayerConstants.SL_ENERGY_CRITICAL, PlayerConstants.SL_ENERGY_LOW, PlayerConstants.SL_ENERGY_NORMAL, PlayerConstants.SL_ENERGY_HIGH, energy_max);
+	}
+	
+	float GetStatBordersWater()
+	{
+		float water = GetStatWater().Get();
+		float water_max = GetStatWater().GetMax();
+		return GetStatLevelBorders(water, PlayerConstants.SL_WATER_CRITICAL, PlayerConstants.SL_WATER_LOW, PlayerConstants.SL_WATER_NORMAL, PlayerConstants.SL_WATER_HIGH, water_max);
+	}
+	
+	//------------------------------------
+	
+	float GetStatLevelBorders(float stat_value, float critical, float low, float normal, float high, float max)
+	{
+		if (stat_value <= critical)
+		{	
+			return Math.InverseLerp(0, critical, stat_value);
+		}
+		if (stat_value <= low)
+		{
+			return Math.InverseLerp(critical, low, stat_value);
+		}
+		if (stat_value <= normal)
+		{
+			return Math.InverseLerp(low, normal, stat_value);
+		}
+		if (stat_value <= high)
+		{
+			return Math.InverseLerp(normal, high, stat_value);
+		}
+		return Math.InverseLerp(high, max, stat_value);
+	}
+	
+	EStatLevels GetStatLevel(float stat_value, float critical, float low, float normal, float high)
+	{
+		if (stat_value <= critical)
+		{
+			return EStatLevels.CRITICAL;
+		}
+		if (stat_value <= low)
+		{
+			return EStatLevels.LOW;
+		}
+		if (stat_value <= normal)
+		{
+			return EStatLevels.MEDIUM;
+		}
+		if (stat_value <= high)
+		{
+			return EStatLevels.HIGH;
+		}
+		return EStatLevels.GREAT;
+	}
+	
+	void SetImmunityBoosted(bool boosted)
+	{
+		m_ImmunityBoosted = boosted;
+	}
+	
+	
+	
+	//!returns player's immunity strength between 0..1
+	float GetImmunity()
+	{
+		float immunity;
+		if (GetPlayerStats()) 
+		{
+			float max_health = GetMaxHealth("GlobalHealth", "Health") + 0.01;//addition to prevent divisioin by zero in case of some messup
+			float max_blood = GetMaxHealth("GlobalHealth", "Blood") + 0.01;//addition to prevent divisioin by zero in case of some messup
+			float energy_normalized = GetStatEnergy().Get() / PlayerConstants.SL_ENERGY_MAX;
+			float water_normalized = GetStatWater().Get() / PlayerConstants.SL_WATER_MAX;
+			float health_normalized = GetHealth("GlobalHealth", "Health") / max_health;
+			float blood_normalized = GetHealth("GlobalHealth", "Blood") / max_blood;
+			immunity = energy_normalized + water_normalized + health_normalized + blood_normalized;
+			immunity = immunity / 4;//avg
+			immunity =  Math.Clamp(immunity,0,1);
+		}
+		return immunity;
+	}
+	
+	bool IsSprinting()
+	{
+		return m_MovementState.m_iMovement == DayZPlayerConstants.MOVEMENT_SPRINT);
+	}
+
+	bool CanSprint()
+	{
+		ItemBase item = GetItemInHands();
+		if (IsRaised() || (item && item.IsHeavyBehaviour()))
+			return false;
+		
+		if (item && GetThrowing() && GetThrowing().IsThrowingModeEnabled())
+			return false;
+		
+		if (GetBrokenLegs() != eBrokenLegs.NO_BROKEN_LEGS)
+			return false;
+		
+		return true;
+	}
+	
+	bool IsInProne()
+	{
+		return m_MovementState.IsInProne();
+	}
+	
+	bool IsInRasedProne()
+	{
+		return m_MovementState.IsInRaisedProne();
+	}	
+	
+	bool IsLeaning()
+	{
+		return m_MovementState.IsLeaning();
+	}	
+	
+	bool IsRolling()
+	{
+		return GetCommand_Move() && GetCommand_Move().IsInRoll());
+	}
+	
+	/*
+	override bool IsRaised()
+	{
+		//GetMovementState(m_MovementState);
+		return m_MovementState.IsRaised();
+	}
+	*/
+	
+	
+	
+	bool IsClimbing()
+	{
+		return m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_CLIMB;
+	}
+	
+	bool IsFalling()
+	{
+		return m_MovementState.m_CommandTypeId == DayZPlayerConstants.COMMANDID_FALL;
+	}
+	override bool IsFighting()
+	{
+		return m_IsFighting;
+	}
+	
+	bool IsEmotePlaying()
+	{
+		if (m_EmoteManager)
+		{
+			return m_EmoteManager.IsEmotePlaying();
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	override bool IsIgnoredByConstruction()
+	{
+		return IsRuined();
+	}
+	
+	/*!
+	Returns whether the specified movement command(s) are starting the next frame.
+	Use caution when using this for anything player animation-related, some commands may require the movement state to be truly active (wait until next update)
+	*/
+	bool AnimCommandCheck(HumanMoveCommandID mask)
+	{
+		return m_AnimCommandStarting & mask;
+	}
+	
+	void RunFightBlendTimer()
+	{
+		if (!m_FightEndBlendTimer)
+			m_FightEndBlendTimer = new Timer();
+		if (!m_FightEndBlendTimer.IsRunning())
+		{
+			m_FightEndBlendTimer.Run(PlayerConstants.MELEE2_MOVEMENT_BLEND_DELAY,this,"EndFighting");
+		}
+	}
+	
+	void EndFighting()
+	{
+		m_IsFighting = false;
+	}
+	
+	bool CheckMeleeItemDamage(ItemBase item)
+	{
+		//on-hit drop of melee weapons
+		//bayonets & buttstocks
+		if (item && item.GetHierarchyParent() && item.GetHierarchyParent().IsWeapon() && item.IsRuined()/*&& item.FindAttachmentBySlotName()*/)
+		{
+			PlayAttachmentDropSound();
+			return DropItem(item);
+		}
+		//handheld items themselves
+		if (item && item == GetItemInHands() && item.IsRuined())
+		{
+			return PredictiveDropEntity(item);
+		}
+		return false;
+	}
+	
+	void PlayAttachmentDropSound()
+	{
+		//TODO
+	}
+	
+	// -------------------------------------------------------------------------
+	override void RPC(int rpc_type, array<ref Param> params, bool guaranteed, PlayerIdentity recipient = NULL)
+	{
+		super.RPC(rpc_type, params, guaranteed, recipient);
+	}
+
+	// -------------------------------------------------------------------------
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(sender, rpc_type, ctx);
+		
+		switch (rpc_type)
+		{
+			#ifndef SERVER
+			
+			case ERPCs.RPC_SYNC_DISPLAY_STATUS:
+				if (GetVirtualHud()) 
+				{
+					GetVirtualHud().OnRPC(ctx);
+				}
+			break;
+	  
+			case ERPCs.RPC_PLAYER_SYMPTOM_ON:
+				if (GetSymptomManager()) 
+				{
+					GetSymptomManager().OnRPC(ERPCs.RPC_PLAYER_SYMPTOM_ON, ctx);
+				}
+			break;
+			 
+			case ERPCs.RPC_PLAYER_SYMPTOM_OFF:
+				if (GetSymptomManager()) 
+				{
+					GetSymptomManager().OnRPC(ERPCs.RPC_PLAYER_SYMPTOM_OFF, ctx);
+				}
+			break;
+			
+			case ERPCs.RPC_DAMAGE_VALUE_SYNC:
+				if (m_TrasferValues) 
+					m_TrasferValues.OnRPC(ctx);
+			break; 
+			
+			case ERPCs.RPC_USER_ACTION_MESSAGE:
+				if (!GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT) 
+				{
+					break;
+				}
+				if (ctx.Read(m_UAParamMessage))
+				{
+					string actiontext = m_UAParamMessage.param1;
+					MessageAction(actiontext);
+				}
+			break;
+			
+			case ERPCs.RPC_SOFT_SKILLS_SPECIALTY_SYNC:
+				ref Param1<float> p_synch = new Param1<float>(0);
+				ctx.Read(p_synch);
+				float specialty_level = p_synch.param1;
+				GetSoftSkillsManager().SetSpecialtyLevel(specialty_level);
+			break;
+
+			case ERPCs.RPC_SOFT_SKILLS_STATS_SYNC:
+				ref Param5<float, float, float, float, bool> p_debug_synch = new Param5<float, float ,float, float, bool>(0, 0, 0, 0, false);
+				ctx.Read(p_debug_synch);
+				float general_bonus_before = p_debug_synch.param1;
+				float general_bonus_after = p_debug_synch.param2;
+				float last_UA_value = p_debug_synch.param3;
+				float cooldown_value = p_debug_synch.param4;
+				float cooldown_active = p_debug_synch.param5;
+				GetSoftSkillsManager().SetGeneralBonusBefore(general_bonus_before);
+				GetSoftSkillsManager().SetGeneralBonusAfter(general_bonus_after);
+				GetSoftSkillsManager().SetLastUAValue(last_UA_value);
+				GetSoftSkillsManager().SetCoolDownValue(cooldown_value);
+				GetSoftSkillsManager().SetCoolDown(cooldown_active);
+			break;
+	
+			case ERPCs.RPC_WARNING_ITEMDROP:
+			{
+				if (GetGame().IsClient() && GetGame().GetUIManager() && !GetGame().GetUIManager().FindMenu(MENU_WARNING_ITEMDROP))
+				{
+					GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(GetGame().GetUIManager().EnterScriptedMenu,MENU_WARNING_ITEMDROP,null);
+					GetGame().GetMission().AddActiveInputExcludes({"menu"});
+				}
+				break;
+			}	
+			
+			case ERPCs.RPC_WARNING_TELEPORT:
+			{
+				if (GetGame().IsClient() && GetGame().GetUIManager() && !GetGame().GetUIManager().FindMenu(MENU_WARNING_TELEPORT))
+				{
+					GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Call(GetGame().GetUIManager().EnterScriptedMenu,MENU_WARNING_TELEPORT,null);
+					GetGame().GetMission().AddActiveInputExcludes({"menu"});
+				}
+				break;
+			}	
+			case ERPCs.RPC_INIT_SET_QUICKBAR:
+				ref Param1<int> count = new Param1<int>(0); 
+				if (ctx.Read(count));
+				{
+					for (int i = 0; i < count.param1 ; i++)
+					{
+						m_QuickBarBase.OnSetEntityRPC(ctx);	
+					}
+				}
+			break;
+			
+			case ERPCs.RPC_SYNC_THERMOMETER:
+			{
+				float value;
+				if (ctx.Read(value))
+					m_Hud.SetTemperature(value.ToString() + "#degrees_celsius");
+				break;
+			}
+			
+			
+			case ERPCs.RPC_CHECK_PULSE:
+				ctx.Read(CachedObjectsParams.PARAM1_INT);
+				EPulseType pulse;
+				if ((CachedObjectsParams.PARAM1_INT.param1 & ActionCheckPulse.TARGET_IRREGULAR_PULSE_BIT) == 0)
+				{
+					pulse = EPulseType.REGULAR;
+				}
+				else
+				{
+					pulse = EPulseType.IRREGULAR;
+				}
+			
+				int blood_level = ~ActionCheckPulse.TARGET_IRREGULAR_PULSE_BIT & CachedObjectsParams.PARAM1_INT.param1;
+				if (m_CheckPulseLastTarget)
+				{
+					m_CheckPulseLastTarget.SetLastUAMessage(ActionCheckPulse.GetPulseMessage(pulse, blood_level));
+				}
+			break;
+			
+			//! uses contants outside of ERPCs !!!!
+			//woodcutting
+			case PlantType.TREE_HARD:
+				SoundHardTreeFallingPlay();
+			break;
+			
+			case PlantType.TREE_SOFT:
+				SoundSoftTreeFallingPlay();
+			break;
+			
+			case PlantType.BUSH_HARD:
+				SoundHardBushFallingPlay();
+			break;
+			
+			case PlantType.BUSH_SOFT:
+				SoundSoftBushFallingPlay();
+			break;
+			
+			case ERPCs.RPC_DEBUG_MONITOR_FLT:
+				if (m_DebugMonitorValues)
+				{
+					m_DebugMonitorValues.OnRPCFloat(ctx);
+				}
+			break;
+			
+			case ERPCs.RPC_DEBUG_MONITOR_STR:
+				if (m_DebugMonitorValues) 
+				{
+					m_DebugMonitorValues.OnRPCString(ctx);
+				}
+			break;
+			#endif
+
+			
+			/*
+			case ERPCs.RPC_CRAFTING_INVENTORY_INSTANT:
+				ref Param3<int, ItemBase, ItemBase> craftParam = new Param3<int, ItemBase, ItemBase>(-1, NULL, NULL);
+				if (ctx.Read(craftParam))
+				{
+					m_ModuleRecipesManager.PerformRecipeServer(craftParam.param1, craftParam.param2, craftParam.param3, this);				
+				}
+			break;
+			*/
+						
+
+			
+			#ifdef DIAG_DEVELOPER
+			case ERPCs.DEV_RPC_AGENT_RESET:
+			{
+				bool val;
+				if (ctx.Read(val))
+					m_AgentPool.RemoveAllAgents();
+				break;
+			}
+						
+			case ERPCs.DEV_PLAYER_DEBUG_REQUEST:
+			{
+				PluginRemotePlayerDebugServer plugin_remote_server = PluginRemotePlayerDebugServer.Cast(GetPlugin(PluginRemotePlayerDebugServer));
+				plugin_remote_server.OnRPC(ctx, this);
+				break;
+			}
+			
+			case ERPCs.DEV_PLAYER_DEBUG_DATA:
+			{
+				PluginRemotePlayerDebugClient plugin_remote_client = PluginRemotePlayerDebugClient.Cast(GetPlugin(PluginRemotePlayerDebugClient));
+				PluginDeveloper plugin_dev = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+				if (plugin_dev.m_ScriptConsole)	
+					plugin_dev.m_ScriptConsole.OnRPCEx(rpc_type, ctx);
+				else
+					plugin_remote_client.OnRPC(ctx);				
+				break;
+			}
+			
+			case ERPCs.DEV_AGENT_GROW:
+			{
+				m_AgentPool.RemoteGrowRequestDebug(ctx);
+				break;
+			}	
+
+			case ERPCs.RPC_ITEM_DIAG_CLOSE:
+			{
+				PluginItemDiagnostic mid = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+				mid.StopWatchRequest(this);
+				break;
+			}
+			
+			//! Universal Temperature Sources debug
+			case ERPCs.DEV_REQUEST_UTS_DEBUG:
+			{
+				PluginUniversalTemperatureSourceServer plugin_uts_server = PluginUniversalTemperatureSourceServer.Cast(GetPlugin(PluginUniversalTemperatureSourceServer));
+				plugin_uts_server.OnRPC(ctx, this);
+				break;
+			}
+			
+			case ERPCs.DEV_UTS_DEBUG_DATA:
+			{
+				PluginUniversalTemperatureSourceClient plugin_uts_client = PluginUniversalTemperatureSourceClient.Cast(GetPlugin(PluginUniversalTemperatureSourceClient));
+				plugin_uts_client.OnRPC(ctx);
+				break;
+			}
+			//! ---
+			#endif
+			
+			#ifdef DEVELOPER
+			case ERPCs.DEV_RPC_SERVER_SCRIPT:
+			{
+				//PluginItemDiagnostic plugin = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+				//SetDebugDeveloper_item(plugin.GetWatchedItem(this));//!! needs to be inside DEVELOPER ifdef
+				
+				if (ctx.Read(CachedObjectsParams.PARAM1_STRING))
+				{
+					_player = this;
+					string code = CachedObjectsParams.PARAM1_STRING.param1;
+					bool success = GetGame().ExecuteEnforceScript("void scConsMain() \n{\n" + code + "\n}\n", "scConsMain");
+					CachedObjectsParams.PARAM1_BOOL.param1 = success;
+					RPCSingleParam(ERPCs.DEV_RPC_SERVER_SCRIPT_RESULT, CachedObjectsParams.PARAM1_BOOL,true, GetIdentity());
+				}
+				break;
+			}
+			
+			case ERPCs.DEV_RPC_SERVER_SCRIPT_RESULT:
+			{
+				PluginDeveloper dev = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+				if (dev.m_ScriptConsole)
+						dev.m_ScriptConsole.OnRPCEx(rpc_type, ctx);
+				break;
+			}
+			
+			case ERPCs.DEV_SET_DEV_ITEM:
+			{
+				Param1<EntityAI> ent = new Param1<EntityAI>(null);
+				if (ctx.Read(ent) && ent.param1)
+				{
+					PluginItemDiagnostic mid2 = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+					mid2.RegisterDebugItem(ent.param1, this);
+				}
+				//SetDebugDeveloper_item(this);
+				break;
+			}
+
+			case ERPCs.RPC_ITEM_DIAG:
+			{
+				Param1<EntityAI> p1 = new Param1<EntityAI>(null);
+				if (ctx.Read(p1))
+				{
+					PluginItemDiagnostic plgn = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+					plgn.OnRPC(p1.param1, ctx);
+				}
+				break;
+			}
+			#endif
+		}
+	
+		#ifdef DIAG_DEVELOPER
+			PluginDeveloper module_rc = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+			if (module_rc) 
+				module_rc.OnRPC(this, rpc_type, ctx);		
+			
+			PluginDeveloperSync module_rcs = PluginDeveloperSync.Cast(GetPlugin(PluginDeveloperSync));
+			if (module_rcs) 
+				module_rcs.OnRPC(this, rpc_type, ctx);
+		
+			#ifdef SERVER
+				PluginDiagMenu plugin_diag_menu = PluginDiagMenu.Cast(GetPlugin(PluginDiagMenuServer));
+			#else
+				PluginDiagMenu plugin_diag_menu = PluginDiagMenu.Cast(GetPlugin(PluginDiagMenuClient));
+			#endif
+		
+			if (plugin_diag_menu) 
+				plugin_diag_menu.OnRPC(this, rpc_type, ctx);
+		#endif
+	}
+	
+	override void OnGameplayDataHandlerSync()
+	{
+		super.OnGameplayDataHandlerSync();
+		
+		UpdateLighting();
+		//Print("setting respawn to " + CfgGameplayHandler.GetDisableRespawnDialog());
+		GetGame().GetMission().SetRespawnModeClient(CfgGameplayHandler.GetDisableRespawnDialog());//TODO: maybe move to mission/game ?
+		SetHitPPEEnabled(CfgGameplayHandler.GetHitIndicationPPEEnabled());
+	}
+	
+	void UpdateLighting()
+	{
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			WorldLighting wLighting = mission.GetWorldLighting();
+			if (wLighting)
+				wLighting.SetGlobalLighting(CfgGameplayHandler.GetLightingConfig());
+		}
+	}
+	
+	void SetContaminatedEffectEx(bool enable, int ppeIdx = -1, int aroundId = ParticleList.CONTAMINATED_AREA_GAS_AROUND, int tinyId = ParticleList.CONTAMINATED_AREA_GAS_TINY,  string soundset = "",  bool partDynaUpdate = false, int newBirthRate = 0)
+	{
+		if (enable) // enable
+		{
+			// We assume that if this is set to true the PPE is already active
+			if (m_ContaminatedAreaEffectEnabled == enable)
+				return;
+			
+			if (aroundId !=0)
+			{
+				if (!m_ContaminatedAroundPlayer)
+				{
+					m_ContaminatedAroundPlayer = ParticleManager.GetInstance().PlayInWorld(aroundId, GetPosition());
+				}
+				// First entry in an area with dynamic tweaks to particles
+				if (partDynaUpdate)
+				{
+					m_ContaminatedAroundPlayer.SetParameter(0, EmitorParam.BIRTH_RATE, newBirthRate);
+				}
+			}
+			
+			if (!m_ContaminatedAroundPlayerTiny && tinyId !=0)
+			{
+				m_ContaminatedAroundPlayerTiny = ParticleManager.GetInstance().PlayInWorld(tinyId,  GetPosition());
+			}
+			
+			if (ppeIdx != -1)
+			{
+				PPERequesterBase ppeRequester;
+				if (Class.CastTo(ppeRequester, PPERequesterBank.GetRequester(ppeIdx)))
+					ppeRequester.Start();
+			}
+			
+			// We start playing the ambient sound
+			if (!m_AmbientContamination && soundset != "")
+				PlaySoundSetLoop(m_AmbientContamination, soundset, 0.1, 0.1);
+			
+		}
+		else // disable
+		{
+			if (m_ContaminatedAroundPlayer)
+			{
+				m_ContaminatedAroundPlayer.Stop();
+				m_ContaminatedAroundPlayer = null;
+			}
+			
+			if (m_ContaminatedAroundPlayerTiny)
+			{
+				m_ContaminatedAroundPlayerTiny.Stop();
+				m_ContaminatedAroundPlayerTiny = null;
+			}
+			if (ppeIdx != -1)
+				PPERequesterBank.GetRequester(ppeIdx).Stop(new Param1<bool>(true)); //fade out
+			
+			// We stop the ambient sound
+			if (m_AmbientContamination)
+				StopSoundSet(m_AmbientContamination);
+			
+			// We make sure to reset the state
+		}
+		m_ContaminatedAreaEffectEnabled = enable;
+	}
+	
+	void SetContaminatedEffect(bool enable, int ppeIdx = -1, int aroundId = ParticleList.CONTAMINATED_AREA_GAS_AROUND, int tinyId = ParticleList.CONTAMINATED_AREA_GAS_TINY, bool partDynaUpdate = false, int newBirthRate = 0)
+	{
+		SetContaminatedEffectEx(enable, ppeIdx, aroundId, tinyId, "", partDynaUpdate, newBirthRate);
+	}
+	
+	// -------------------------------------------------------------------------
+	void UpdateCorpseState()
+	{
+		UpdateCorpseStateVisual();
+		if (m_CorpseState > 0)
+			SetDecayEffects(Math.AbsInt(m_CorpseState));
+		else if (m_CorpseState < 0)
+			SetDecayEffects();//no params means remove the effects
+		m_CorpseStateLocal = m_CorpseState;
+	}
+
+	// -------------------------------------------------------------------------
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel, newLevel, zone);
+		if (!GetGame().IsDedicatedServer())
+		{
+			if (newLevel == GameConstants.STATE_RUINED)
+			{
+				ClearLastUAMessage();
+			}
+			if (m_CorpseState != 0)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallLater(UpdateCorpseState, 0, false);
+			}
+		}
+	}
+	
+	
+	// -------------------------------------------------------------------------
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		if (m_ModuleLifespan)
+		{
+			m_ModuleLifespan.SynchLifespanVisual(this, m_LifeSpanState, m_HasBloodyHandsVisible, m_HasBloodTypeVisible, m_BloodType);
+			
+			if (m_LifespanLevelLocal != m_LifeSpanState) //client solution, lifespan level changed
+			{
+				m_LifespanLevelLocal = m_LifeSpanState;
+				UpdateHairSelectionVisibility();
+			}	
+		}
+		
+		CheckSoundEvent();
+		if (GetBleedingManagerRemote() && IsPlayerLoaded())
+		{
+			GetBleedingManagerRemote().OnVariablesSynchronized(GetBleedingBits());
+		}
+		
+		if (m_CorpseStateLocal != m_CorpseState && (IsPlayerLoaded() || IsControlledPlayer()))
+		{
+			UpdateCorpseState();
+		}
+		
+		if (m_RefreshAnimStateIdx != m_LocalRefreshAnimStateIdx)
+		{
+			RefreshHandAnimationState(396); //mean animation blend time
+			m_LocalRefreshAnimStateIdx = m_RefreshAnimStateIdx;
+		}
+		if (m_InsideEffectArea != m_InsideEffectAreaPrev)
+		{
+			if (m_InsideEffectArea)
+			{
+				OnPlayerIsNowInsideEffectAreaBeginClient();
+			}
+			else
+			{
+				OnPlayerIsNowInsideEffectAreaEndClient();
+			}
+			m_InsideEffectAreaPrev = m_InsideEffectArea;
+		}
+		
+		//-------MODIFIERS START--------
+		if (m_SyncedModifiers != m_SyncedModifiersPrev)
+		{
+			int diff = (m_SyncedModifiers & ~m_SyncedModifiersPrev) | (~m_SyncedModifiers & m_SyncedModifiersPrev);//XOR gets us a mask for modifiers that changed by either deactivating, or activating
+
+			if (eModifierSyncIDs.MODIFIER_SYNC_DROWNING & diff)//has this modifier's status as active/inactive changed ?
+			{
+				if (eModifierSyncIDs.MODIFIER_SYNC_DROWNING & m_SyncedModifiers)//is this modifier currently active ? if so, it means it's been just activated
+				{
+					SetDrowning(true);
+				}
+				else
+				{
+					SetDrowning(false);
+				}
+				
+			}
+			
+			m_SyncedModifiersPrev = m_SyncedModifiers;
+		}
+		//-------MODIFIERS END--------
+		
+		HandleBrokenLegsSync();
+		
+		//! Remotely Activated Item Behaviour refresh on item is in hands
+		ItemBase itemHands = GetItemInHands();
+		if (itemHands)
+		{
+			RemotelyActivatedItemBehaviour raib = itemHands.GetRemotelyActivatedItemBehaviour();
+			if (raib)
+			{
+				raib.OnVariableSynchronized();
+			}
+		}	
+	}
+	
+	//! Checks whether modifier (which has syncing enabled) is currently active, works on both Client and Server
+	bool IsSyncedModifierActive(eModifierSyncIDs modifier)
+	{
+		return (m_SyncedModifiers & m_SyncedModifiersPrev);
+	}
+	
+	void HandleBrokenLegsSync()
+	{
+		if (m_BrokenLegState != m_LocalBrokenState)
+		{
+			m_LocalBrokenState = m_BrokenLegState;
+			bool initial = (m_BrokenLegState < 0);
+			int state = GetBrokenLegs();
+			if (state == eBrokenLegs.BROKEN_LEGS)
+			{
+				//Print(m_BrokenLegState);
+				if (initial)// <0 values indicate initial activation
+				{
+					//Print("synced variables - inital activation of broken legs");
+					BreakLegSound();
+				}
+				else
+				{
+					//Print("synced variables - secondary activation of broken legs");
+				}
+			}
+		}
+	}
+	
+	
+	void FixAllInventoryItems()
+	{
+		array<EntityAI> items = new array<EntityAI>;
+		GetInventory().EnumerateInventory(InventoryTraversalType.INORDER, items);
+		foreach	(EntityAI item : items)
+		{
+			item.SetHealthMax("","");
+		}
+	}
+	
+	
+	void OnInventoryMenuOpen()
+	{
+	
+	}
+	
+	void OnInventoryMenuClose()
+	{
+	
+	}
+	
+	//--------------------------------------------------------------------------
+	void OnSelectPlayer()
+	{
+		//Print("PlayerBase | OnSelectPlayer()");
+		m_PlayerSelected = true;
+		
+		m_QuickBarBase.updateSlotsCount();
+		
+		m_WeaponManager.SortMagazineAfterLoad();
+
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+		{
+			PlayerIdentity identity = GetIdentity();
+			
+			if (identity)
+			{
+				m_CachedPlayerID = identity.GetId();
+				m_CachedPlayerName  = identity.GetName();
+			}
+			
+			//! add callbacks for ai target system
+			SetAITargetCallbacks(new AITargetCallbacksPlayer(this));
+
+			array<ref Param> params = new array<ref Param>;	
+			if (m_aQuickBarLoad)
+			{
+				int count = m_aQuickBarLoad.Count();
+				Param1<int> paramCount = new Param1<int>(count);
+				params.Insert(paramCount);
+				for (int i = 0; i < count; i++)
+				{
+					m_QuickBarBase.OnSetEntityNoSync(m_aQuickBarLoad.Get(i).param1,m_aQuickBarLoad.Get(i).param2);
+					params.Insert(m_aQuickBarLoad.Get(i));
+				}					
+							
+				if (count > 0 && GetGame().IsMultiplayer())
+				{
+					GetGame().RPC(this, ERPCs.RPC_INIT_SET_QUICKBAR, params, true, identity);
+				}
+				m_aQuickBarLoad = NULL;
+			}		
+			
+			GetSoftSkillsManager().InitSpecialty(GetStatSpecialty().Get());
+			GetModifiersManager().SetModifiers(true);
+			
+			SetSynchDirty();
+			
+			if (GetGame().IsMultiplayer())
+			{
+				//Drop item warning
+				if (m_ProcessUIWarning)
+				{
+					GetGame().RPCSingleParam(this, ERPCs.RPC_WARNING_ITEMDROP, null, true, identity);
+					m_ProcessUIWarning = false;
+				}
+				
+				GetGame().GetMission().SyncRespawnModeInfo(identity);
+			}
+		}
+		
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			m_ActionManager = new ActionManagerServer(this);
+			m_ConstructionActionData = new ConstructionActionData();
+			
+			CheckForGag();
+		}
+		else if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			m_ActionManager = new ActionManagerClient(this);
+			m_CraftingManager = new CraftingManager(this,m_ModuleRecipesManager);
+			m_ConstructionActionData = new ConstructionActionData();
+			
+		}
+		else if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_SINGLEPLAYER)
+		{
+			m_ActionManager = new ActionManagerServer(this);
+		}
+		
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			//m_PlayerLightManager = new PlayerLightManager(this);
+			if (GetGame().GetMission())
+			{
+				GetGame().GetMission().ResetGUI();
+				// force update player
+				GetDayZGame().GetBacklit().UpdatePlayer(true);
+			}
+					
+			m_DeathCheckTimer = new Timer();
+			m_DeathCheckTimer.Run(0.1, this, "CheckDeath", null, true);
+			PPEManagerStatic.GetPPEManager().StopAllEffects(PPERequesterCategory.ALL);
+			CheckForBurlap();
+			
+			int characterCount = GetGame().GetMenuData().GetCharactersCount() - 1;
+			int idx = GetGame().GetMenuData().GetLastPlayedCharacter();
+			if (idx == GameConstants.DEFAULT_CHARACTER_MENU_ID || idx > characterCount)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(SetNewCharName);
+			}
+
+			GetGame().GetMission().EnableAllInputs(true);
+			
+			m_PresenceNotifier = PluginPresenceNotifier.Cast(GetPlugin(PluginPresenceNotifier));
+			m_PresenceNotifier.Init(this);
+			OnGameplayDataHandlerSync();//only here for legacy reasons
+		}
+		
+#ifdef BOT
+		m_Bot = new Bot(this);
+		m_Bot.Start(true, new MyBotTrigger(this));
+#endif
+	}
+		
+	override void SimulateDeath(bool state)
+	{
+		super.SimulateDeath(state);
+
+		m_UndergroundHandler = null;
+		if (m_EffectWidgets)
+		{
+			m_EffectWidgets.StopAllEffects();
+			m_EffectWidgets.ClearSuspendRequests();
+		}
+	}
+	
+	void SetNewCharName()
+	{
+		g_Game.GetMenuData().SaveCharacter(false, true);
+		g_Game.GetMenuData().SetCharacterName(g_Game.GetMenuData().GetLastPlayedCharacter(), g_Game.GetMenuDefaultCharacterData(false).GetCharacterName());
+		g_Game.GetMenuData().SaveCharactersLocal();
+	}
+
+	void CheckForBurlap()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			BurlapSackCover attachment;
+			Class.CastTo(attachment, GetInventory().FindAttachment(InventorySlots.HEADGEAR));
+			
+			PPERequester_BurlapSackEffects req;
+			if (Class.CastTo(req,PPERequesterBank.GetRequester(PPERequesterBank.REQ_BURLAPSACK)))
+			{
+				if (attachment)
+				{
+					req.Start();
+				}
+				else if (req.IsRequesterRunning())
+				{
+					PPERequesterBank.GetRequester(PPERequester_BurlapSackEffects).Stop();
+				}
+			}
+		}
+	}
+	
+	void CheckForGag()
+	{
+		#ifdef SERVER
+		Clothing item;
+		Class.CastTo(item, GetInventory().FindAttachment(InventorySlots.MASK));
+		if (!item)
+		{
+			Class.CastTo(item, GetInventory().FindAttachment(InventorySlots.HEADGEAR));
+		}
+		
+		if (item && item.IsObstructingVoice())
+		{
+			item.MutePlayer(this,true);
+		}
+		else //should probably check for relevant types before removing mumbling and obstruction specifically..
+		{
+			GetGame().SetVoiceEffect(this, VoiceEffectMumbling, false);
+			GetGame().SetVoiceEffect(this, VoiceEffectObstruction, false);
+		}
+		#endif
+	}
+	
+	void UpdateMaskBreathWidget(notnull MaskBase mask, bool is_start = false)
+	{
+		if (is_start)
+			m_EffectWidgets.ResetMaskUpdateCount();
+		float resistance = 0;
+		if (mask.HasIntegratedFilter() || mask.IsExternalFilterAttached())
+			resistance = 1 - mask.GetFilterQuantity01();
+
+		
+		m_EffectWidgets.OnVoiceEvent(resistance);
+		m_EffectWidgets.IncreaseMaskUpdateCount();
+	
+	}
+	
+	
+	// -------------------------------------------------------------------------
+	void OnVoiceEvent(PlayerSoundEventBase voice_event)
+	{
+		if (m_EffectWidgets)
+		{
+			MaskBase mask = MaskBase.Cast(GetInventory().FindAttachment(InventorySlots.MASK));
+			if (mask)
+			{
+				UpdateMaskBreathWidget(mask, true);
+				//m_EffectWidgets.SetBreathIntensityStamina(GetStaminaHandler().GetStaminaCap(),GetStaminaHandler().GetStamina());
+			}
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	//! called every cmd handler tick during a playback of PlayerSoundEvent, m_ProcessPlaybackEvent needs to be enabled on the PlayerSoundEvent
+	void OnVoiceEventPlayback(PlayerSoundEventBase voice_event, AbstractWave callback, float playback_time)
+	{
+		if (m_EffectWidgets)
+		{
+			MaskBase mask = MaskBase.Cast(GetInventory().FindAttachment(InventorySlots.MASK));
+			if (mask)
+			{
+				if (m_EffectWidgets.m_MaskWidgetUpdateCount < 2 && callback.GetLength() > 2 && playback_time > 0.5 )
+					UpdateMaskBreathWidget(mask);
+			}
+		}
+	}
+	
+
+	// -------------------------------------------------------------------------
+	override bool OnInputUserDataProcess(int userDataType, ParamsReadContext ctx)
+	{
+		if (super.OnInputUserDataProcess(userDataType, ctx))
+			return true;
+		
+		if (m_QuickBarBase.OnInputUserDataProcess(userDataType, ctx))
+			return true;
+		
+		if (m_WeaponManager.OnInputUserDataProcess(userDataType, ctx))
+			return true;
+
+		if (HandleRemoteItemManipulation(userDataType, ctx))
+			return true;
+		
+		if (userDataType == INPUT_UDT_INVENTORY && GetHumanInventory().OnInputUserDataProcess(ctx))
+			return true;
+		
+		if (TogglePlacingServer(userDataType, ctx))
+			return true;
+		
+		if (ResetADSPlayerSync(userDataType, ctx))
+			return true;
+		
+		string uid;
+		bool mute;
+		if (userDataType == INPUT_UDT_USER_MUTE_XBOX)
+		{
+			if (ctx.Read(uid) && ctx.Read(mute))
+			{
+				GetGame().MutePlayer(uid, GetIdentity().GetPlainId(), mute);
+				// commented because plainID should not be present in logs
+				//Print("Player: " + GetIdentity().GetId() + " set mute for " + uid + " to " + mute);
+			}
+		}
+		
+		if (m_EmoteManager && userDataType == INPUT_UDT_GESTURE)
+			return m_EmoteManager.OnInputUserDataProcess(userDataType, ctx);
+		
+		if (userDataType == INPUT_UDT_WEAPON_LIFT_EVENT)
+			return ReadLiftWeaponRequest(userDataType, ctx);
+		
+		if (m_ActionManager)
+			return m_ActionManager.OnInputUserDataProcess(userDataType, ctx);
+		return false;
+	}
+	
+	float GetHealthRegenSpeed()
+	{
+		float blood =  GetHealth("GlobalHealth", "Blood");
+		float blood_scale_normalized = Math.InverseLerp(PlayerConstants.BLOOD_THRESHOLD_FATAL, GetMaxHealth("", "Blood"), blood);
+		blood_scale_normalized = Math.Clamp(blood_scale_normalized,0,1);
+		return Math.Lerp(PlayerConstants.HEALTH_REGEN_MIN, PlayerConstants.HEALTH_REGEN_MAX, blood_scale_normalized);
+	}
+
+	bool HandleRemoteItemManipulation(int userDataType, ParamsReadContext ctx)
+	{
+		if (userDataType == INPUT_UDT_ITEM_MANIPULATION)
+		{
+			int type = -1;
+			ItemBase item1 = null;
+			ItemBase item2 = null;
+			bool use_stack_max = false;
+			int slot_id = -1;
+
+			if (!ctx.Read(type))
+				return false;
+			
+			if (type == 4)
+			{
+				if (!ctx.Read(item1))
+					return false;
+				InventoryLocation dst = new InventoryLocation;
+				if (dst.ReadFromContext(ctx))
+				{
+					//Print(InventoryLocation.DumpToStringNullSafe(dst));
+					bool dummy;
+					if (ctx.Read(dummy))
+						item1.SplitItemToInventoryLocation(dst);
+					else
+						item1.SplitIntoStackMaxToInventoryLocation(dst);
+					return true;
+				}
+				return false;
+			}
+			
+			if (!ctx.Read(item1))
+				return false;
+			if (!ctx.Read(item2))
+				return false;
+			if (!ctx.Read(use_stack_max))
+				return false;
+			if (!ctx.Read(slot_id))
+				return false;
+			
+			if (type == -1 && item1 && item2)//combine
+			{
+				item1.CombineItems(item2, use_stack_max);
+			}
+			else if (type == 1 && item1)
+			{
+				if (use_stack_max)
+					item1.SplitIntoStackMax(item2, slot_id, this);
+				else
+					item1.SplitItem(this);
+			}
+			else if (type == 2 && item1)
+			{
+				int row, col;
+				if (!ctx.Read(row))
+					return false;
+				if (!ctx.Read(col))
+					return false;
+				item1.SplitIntoStackMaxCargo(item2, slot_id, row, col);
+			}
+			else if (type == 3 && item1)
+			{
+				item1.SplitIntoStackMaxHands(this);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	// -------------------------------------------------------------------------
+	ItemBase GetItemInHands()
+	{
+		if (GetHumanInventory())
+		{
+			return ItemBase.Cast(GetHumanInventory().GetEntityInHands());
+		}
+		return null;
+		
+	}
+
+	//--------------------------------------------------------------------------
+
+
+	override EntityAI SpawnEntityOnGroundPos(string object_name, vector pos)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || !GetGame().IsMultiplayer())
+		{
+			bool is_AI = GetGame().IsKindOf(object_name, "DZ_LightAI");
+			if (is_AI)
+			{
+				return SpawnAI(object_name, pos);
+			}
+			else
+			{
+				InventoryLocation inv_loc = new InventoryLocation;
+				vector mtx[4];
+				Math3D.MatrixIdentity4(mtx);
+				mtx[3] = pos;
+				inv_loc.SetGround(NULL, mtx);
+				//return GetGame().SpawnEntity(object_name, inv_loc, ECE_PLACE_ON_SURFACE, RF_DEFAULT);
+				return EntityAI.Cast(GetGame().CreateObjectEx(object_name, inv_loc.GetPos(), ECE_PLACE_ON_SURFACE));
+			}
+		}
+		return null;
+	}
+
+	EntityAI SpawnEntityOnGroundOnCursorDir(string object_name, float distance)
+	{
+		vector position = GetPosition() + (GetDirection() * distance);
+		return SpawnEntityOnGroundPos(object_name, position);
+	}
+
+	EntityAI SpawnAI(string object_name, vector pos)
+	{
+		bool is_ai = GetGame().IsKindOf(object_name, "DZ_LightAI");
+		if (is_ai)
+		{
+			return EntityAI.Cast(GetGame().CreateObjectEx(object_name, pos, ECE_PLACE_ON_SURFACE|ECE_INITAI|ECE_EQUIP_ATTACHMENTS));
+		}
+		return NULL;
+	}
+
+	/**
+	\brief Spawn item on server side
+		\param object_name \p string Name of item class
+		\param spawn_type \int(const) Type of spawning const: SPAWNTYPE_GROUND, SPAWNTYPE_HANDS, SPAWNTYPE_INVENTORY
+		\param full_quantity \bool Spawn with full quantity of item
+		\param distance \float Distance of spawn position from player (Only if spawn_type = SPAWNTYPE_GROUND)
+		\returns \p ItemBase Spawned item
+		@code
+			PlayerBase player = GetGame().GetPlayer();
+			
+			player.SpawnItem("Fruit_Apple", SPAWNTYPE_GROUND, true, 5);
+		@endcode
+	*/
+	/*EntityAI SpawnItem (string object_name, bool full_quantity, float distance = 0, bool usePosition = false, vector pos = "0 0 0", EntityAI attachmentObject = NULL)
+	{
+		EntityAI entity = NULL;
+
+		// Creat Object
+		bool is_ai = GetGame().IsKindOf(object_name, "DZ_LightAI");
+		vector item_position;
+		if (usePosition)
+		{
+			item_position = pos;
+		}
+		else
+		{
+			item_position = GetPosition() + (GetDirection() * distance);
+		}
+		entity = GetGame().CreateObject(object_name, item_position, false, is_ai);
+
+		if (!entity)
+		{
+			string s = "Cannot spawn entity: "+object_name;
+			Print(s);
+			//g_Game.GetUIManager().ShowDialog("Spawn error", "Cannot spawn item: "+object_name, 0, DBT_OK, DBB_YES, DMT_EXCLAMATION, this);
+			return NULL;
+		}
+
+		if (entity.IsInherited(ItemBase))
+		{
+			ItemBase item = entity;
+
+			// Set full quantity
+			if (full_quantity)
+			{
+				item.SetQuantity(item.GetQuantityMax());
+			}
+
+			// Spawn In Inventory
+			if (spawn_type == SPAWNTYPE_INVENTORY)
+			{
+				TakeItemToInventory(item);
+			}
+			// Spawn In Hands
+			if (spawn_type == SPAWNTYPE_HANDS)
+			{
+				TakeItemToHands(item);
+			}
+			// Spawn As Attachment
+			if (spawn_type == SPAWNTYPE_ATTACHMENT)
+			{
+				Object cursor_obj = GetCursorObject();
+				if (cursor_obj != NULL && cursor_obj.IsInherited(EntityAI))
+				{
+					EntityAI eai = (EntityAI)cursor_obj;
+					eai.TakeEntityAsAttachment(item);
+				}
+				else if (attachmentObject != NULL)
+				{
+					attachmentObject.TakeEntityAsAttachment(item);
+				}
+			}
+		}
+
+		return entity;
+	}*/
+
+	//--------------------------------------------------------------------------
+	bool DropItem(ItemBase item)
+	{
+		bool can_be_dropped = CanDropEntity(item);
+		if (can_be_dropped)
+		{
+			can_be_dropped = PredictiveDropEntity(item);
+		}
+
+		vector 	pos_spawn	= GetPosition() + GetDirection();
+		pos_spawn[0]		= pos_spawn[0] + Math.RandomFloat(-0.2, 0.2);
+		pos_spawn[2]		= pos_spawn[2] + Math.RandomFloat(-0.2, 0.2);
+
+		item.SetPosition(pos_spawn);
+		item.PlaceOnSurface();
+		return can_be_dropped;
+	}
+
+	// -------------------------------------------------------------------------
+	/**
+	/brief Creates \p ItemBase in players inventory. If player dont have enough slots for new item, item will be created on the ground under player.
+		\param item_name \p string Class name of ItemBase in configs
+		\returns \p ItemBase Created item
+		@code
+			ItemBase item = g_Game.GetPlayer().CreateInInventory("Consumable_GardenLime", "cargo_weapon");
+		@endcode
+	*/
+	
+	
+	EntityAI CreateInInventory(string item_name, string cargo_type = "", bool full_quantity = false) // TODO: Create item in cargo
+	{
+		InventoryLocation inv_loc = new InventoryLocation;
+		if (GetInventory().FindFirstFreeLocationForNewEntity(item_name, FindInventoryLocationType.ANY, inv_loc))
+		{
+			return SpawnItemOnLocation(item_name, inv_loc, full_quantity);
+		}
+		return NULL;
+	}
+
+
+	// -------------------------------------------------------------------------
+	/**
+	/brief Creates copy of \p ItemBase in players inventory. If player dont have enough slots for new item, item will be created on the ground under player.
+		\param item_name \p string Class name of ItemBase in configs
+		\returns \p ItemBase Created item
+		@code
+			ItemBase item = g_Game.GetPlayer().CreateInInventory("Consumable_GardenLime", "cargo_weapon");
+		@endcode
+	*/
+	/*ItemBase CopyInventoryItem(ItemBase orig_item)
+	{
+		ItemBase item = ItemBase.Cast(GetInventory().CreateInInventory(orig_item.GetType()));
+		if (item == NULL)
+		{
+			return NULL;
+		}
+
+		// Copy of quantity
+		item.SetQuantity(orig_item.GetQuantity());
+
+		// Copy of damage
+		item.SetHealth("", "", orig_item.GetHealth("", ""));
+
+		return item;
+	}*/
+	
+	ItemBase CreateCopyOfItemInInventory (ItemBase src)
+	{
+		InventoryLocation loc = new InventoryLocation;
+		string t = src.GetType();
+		if (GetInventory().FindFirstFreeLocationForNewEntity(t, FindInventoryLocationType.CARGO, loc))
+		{
+			bool locked = GetGame().HasInventoryJunctureDestination(this, loc);
+			if (locked)
+			{
+				Print("Warning: Split: CreateCopyOfItemInInventory - Cannot create entity at locked inventory at loc=" + InventoryLocation.DumpToStringNullSafe(loc));
+				return null;
+			}
+			ItemBase dst = ItemBase.Cast(GetInventory().LocationCreateLocalEntity(loc, t, ECE_IN_INVENTORY, RF_DEFAULT));
+			if (dst)
+			{
+				MiscGameplayFunctions.TransferItemProperties(src, dst);
+
+				GetGame().RemoteObjectTreeCreate(dst);
+				
+				Print("CreateCopyOfItemInInventory - created " + dst.GetName() + " at loc=" + InventoryLocation.DumpToStringNullSafe(loc));
+			}
+			return dst;
+		}
+		return NULL;
+	}
+	
+	ItemBase CreateCopyOfItemInInventoryOrGround(ItemBase src)
+	{
+		return CreateCopyOfItemInInventoryOrGroundEx(src, false);
+	}
+	
+	ItemBase CreateCopyOfItemInInventoryOrGroundEx(ItemBase src, bool markItemAsSplitResult = false)
+	{
+		ItemBase dst = CreateCopyOfItemInInventory(src);
+		if (!dst)
+		{
+			dst = ItemBase.Cast(SpawnEntityOnGroundPos(src.GetType(), this.GetPosition()));
+			dst.PlaceOnSurface();
+			dst.SetResultOfSplit(markItemAsSplitResult);
+			MiscGameplayFunctions.TransferItemProperties(src, dst);
+		}
+		
+		return dst;
+	}
+
+
+
+	// -------------------------------------------------------------------------
+	/**
+	colorStatusChannel
+	colorAction
+	colorFriendly
+	colorImportant
+	*/
+	void Message(string text, string style)
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			GetGame().ChatMP(this, text, style);
+		}
+		else
+		{
+			GetGame().Chat(text, style);
+		}
+	}
+
+	// -------------------------------------------------------------------------
+	void MessageStatus(string text)
+	{
+		Message(text, "colorStatusChannel");
+	}
+
+	// -------------------------------------------------------------------------
+	void MessageAction(string text)
+	{
+		Message(text, "colorAction");
+	}
+
+	// -------------------------------------------------------------------------
+	void MessageFriendly(string text)
+	{
+		Message(text, "colorFriendly");
+	}
+
+	// -------------------------------------------------------------------------
+	void MessageImportant(string text)
+	{
+		Message(text, "colorImportant");
+	}
+
+	void CloseInventoryMenu()
+	{
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+#ifndef NO_GUI
+			UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+			if (menu && (menu.GetID() == MENU_INVENTORY || menu.GetID() == MENU_INSPECT))
+			{
+				GetGame().GetUIManager().CloseAll();
+				GetGame().GetMission().RemoveActiveInputExcludes({"inventory"},false);
+				GetGame().GetMission().RemoveActiveInputRestriction(EInputRestrictors.INVENTORY);
+			}
+#endif
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	/**
+	/brief Delete all items in inventory
+		\returns \p void
+		@code
+			PlayerBase player = GetGame().GetPlayer();
+			player.ClearInventory();
+		@endcode
+	*/
+	override void ClearInventory()
+	{
+		if ((GetGame().IsServer() || !GetGame().IsMultiplayer()) && GetInventory())
+		{
+			GameInventory inv = PlayerBase.Cast(this).GetInventory();
+			array<EntityAI> items = new array<EntityAI>;
+			inv.EnumerateInventory(InventoryTraversalType.INORDER, items);
+			for (int i = 0; i < items.Count(); i++)
+			{
+				ItemBase item = ItemBase.Cast(items.Get(i));
+				if (item)
+				{
+					GetGame().ObjectDelete(item);
+				}
+			}
+
+			ItemBase item_in_hands = ItemBase.Cast(GetHumanInventory().GetEntityInHands());
+
+			if (item_in_hands)
+			{
+				LocalDestroyEntityInHands();
+			}
+		}
+	}
+	
+	//! Drops all clothes/wearables this character is carrying on themselves.
+	void DropAllItems()
+	{
+		array<EntityAI> itemsArray = new array<EntityAI>;
+		ItemBase item;
+		GetInventory().EnumerateInventory(InventoryTraversalType.LEVELORDER, itemsArray);
+		int count = itemsArray.Count();
+		
+		for (int i = 0; i < itemsArray.Count(); i++)
+		{
+			Class.CastTo(item, itemsArray.Get(i));
+			
+			if (item  &&  !item.IsInherited(SurvivorBase))	
+			{
+				ServerDropEntity(item);
+			}
+		}
+	}
+
+	string GetPlayerClass()
+	{
+		string type;
+		GetGame().ObjectGetType(this, type);
+		return type;
+	}
+
+	// --------------------------------------------------
+	// Lifespan
+	//---------------------------------------------------
+	
+	void ShavePlayer()
+	{
+		SetLastShavedSeconds(StatGet(AnalyticsManagerServer.STAT_PLAYTIME));
+
+		m_ModuleLifespan.UpdateLifespan(this, true);
+	}
+
+	bool CanShave()
+	{
+		if (!HasCoveredFaceForShave() && GetLifeSpanState())
+		{
+			return true;
+		}
+		else
+		{
+			return false;			
+		}
+	}
+	
+	
+	override void OnParticleEvent(string pEventType, string pUserString, int pUserInt)
+	{
+		super.OnParticleEvent(pEventType ,pUserString, pUserInt);
+		
+		if (!GetGame().IsDedicatedServer())
+		{
+			if (pUserInt == 123456) // 123456 is ID for vomiting effect. The current implementation is WIP.
+			{
+				PlayerBase player = PlayerBase.Cast(this);
+				int boneIdx = player.GetBoneIndexByName("Head");
+				
+				if (boneIdx != -1)
+				{
+					EffectParticle eff;
+				
+					if (m_SyncedModifiers & eModifierSyncIDs.MODIFIER_SYNC_CONTAMINATION2)
+					{
+						eff = new EffVomitBlood();
+					}
+					else
+					{
+						eff = new EffVomit();
+					}
+					
+					eff.SetDecalOwner(player);
+					eff.SetAutodestroy(true);
+					SEffectManager.PlayInWorld(eff, vector.Zero);
+					Particle p = eff.GetParticle();
+					player.AddChild(p, boneIdx);
+				}
+			}
+		}
+	}
+	
+	
+	bool CanSpawnBreathVaporEffect()
+	{
+		if (!ToDelete() && IsAlive() && !IsSwimming() && !m_IsDrowning)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+
+	void ProcessADDModifier()
+	{
+		if (m_AddModifier != -1)
+		{
+			HumanCommandAdditives ad = GetCommandModifier_Additives();
+			if (ad)
+				ad.StartModifier(m_AddModifier);
+			
+			m_AddModifier = -1;
+		}
+	}
+	
+	void SpawnBreathVaporEffect()
+	{
+		//Print("SpawnBreathVaporEffect:"+GetGame().GetTime());
+		int boneIdx = GetBoneIndexByName("Head");
+		if (boneIdx != -1)
+		{
+			Particle p;
+			switch (m_BreathVapour)
+			{
+				case 1:
+					p = ParticleManager.GetInstance().PlayInWorld(ParticleList.BREATH_VAPOUR_LIGHT, "-0.03 0.15 0");
+					break;
+				case 2:
+					p = ParticleManager.GetInstance().PlayInWorld(ParticleList.BREATH_VAPOUR_MEDIUM, "-0.03 0.15 0");
+					break;
+				case 3:
+					p = ParticleManager.GetInstance().PlayInWorld(ParticleList.BREATH_VAPOUR_HEAVY, "-0.03 0.15 0");
+					break;
+				default:
+					break;
+			}
+			
+			if (p)
+				AddChild(p, boneIdx);
+		}
+	}
+	
+	// returns 'true' if the player is submerged under water deep enough so that we consider him/her to be eligible for drowning, do note some other conditions may apply for actual drowning to be turned on
+	bool GetDrowningWaterLevelCheck()
+	{
+		int index = GetBoneIndexByName("head");
+		vector pos = GetBonePositionWS(index);
+		float depth = g_Game.GetWaterDepth(pos);
+		
+		if (IsSwimming())
+		{
+			return depth > PlayerConstants.DROWNING_SWIMMING_THRESHOLD;
+		}
+		else if (IsUnconscious())
+		{
+			return depth > PlayerConstants.DROWNING_UNCONSCIOUS_THRESHOLD;
+		}
+		return depth > PlayerConstants.DROWNING_DEFAULT_THRESHOLD;
+	}
+
+	void SetLifeSpanStateVisible(int show_state)
+	{
+		bool state_changed;
+		if (show_state != m_LifeSpanState)
+			state_changed = true;
+		m_LifeSpanState = show_state;
+		SetSynchDirty();
+		
+		if (state_changed) //server only, client solution in OnVariablesSynchronized()
+		{
+			//SendLifespanSyncEvent(m_LifeSpanState);
+			
+			UpdateHairSelectionVisibility();
+		}
+	}
+	
+	int GetLifeSpanState()
+	{
+		return m_LifeSpanState;
+	}
+	
+	int GetLastShavedSeconds()
+	{
+		return m_LastShavedSeconds;
+	}
+
+	void SetLastShavedSeconds(int last_shaved_seconds)
+	{
+		m_LastShavedSeconds = last_shaved_seconds;
+	}
+	
+	bool HasCoveredFaceForShave()
+	{
+		return IsExclusionFlagPresent(GetFaceCoverageShaveValues());
+	}
+	
+	//! returns a set of face covering values
+	static set<int> GetFaceCoverageShaveValues()
+	{
+		set<int> ret = new set<int>;
+		ret.Insert(EAttExclusions.SHAVING_MASK_ATT_0);
+		ret.Insert(EAttExclusions.SHAVING_HEADGEAR_ATT_0);
+		//ret.Insert(EAttExclusions.SHAVING_EYEWEAR_ATT_0);
+		
+		return ret;
+	}
+	
+	eBloodyHandsTypes HasBloodyHandsEx()
+	{
+		return m_HasBloodyHandsVisible;
+	}
+	
+	bool HasBloodyHands()
+	{
+		return m_HasBloodyHandsVisible;
+	}
+
+	void SetBloodyHands(bool show)
+	{
+		SetBloodyHandsBase(show);
+	}
+	
+	void SetBloodyHandsEx(eBloodyHandsTypes type)
+	{
+		SetBloodyHandsBase(type);
+	}
+	
+	private void SetBloodyHandsBase(int type)
+	{
+		m_HasBloodyHandsVisible = type;
+		SetSynchDirty();
+		
+		#ifdef DIAG_DEVELOPER
+		#ifndef SERVER
+		if (IsControlledPlayer())
+		{
+			bool enable = type;
+			DiagMenu.SetValue(DiagMenuIDs.LIFESPAN_BLOODY_HANDS, enable);
+		}
+		#endif
+		#endif
+	}
+	
+	void SetBloodyHandsPenalty()
+	{
+		InsertAgent(eAgents.SALMONELLA, 1);
+	}
+	
+	bool HasBloodTypeVisible()
+	{
+		return m_HasBloodTypeVisible;
+	}
+	
+	void SetBloodTypeVisible(bool show)
+	{
+		m_HasBloodTypeVisible = show;
+		SetSynchDirty();
+	}
+			
+	int GetBloodType()
+	{
+		return m_BloodType;
+	}
+	
+	void SetBloodType(int blood_type)
+	{
+		m_BloodType = blood_type;
+		SetSynchDirty();
+	}
+
+	// --------------------------------------------------
+	// Soft Skills
+	//---------------------------------------------------
+	
+	SoftSkillsManager GetSoftSkillsManager()
+	{
+		return m_SoftSkillsManager;
+	}
+	
+	void CheckDeath()
+	{
+		if (IsPlayerSelected() && !IsAlive())
+		{
+			SimulateDeath(true);
+			m_DeathCheckTimer.Stop();
+		}
+	}
+	
+	// -------------------------------------------------------------------------
+	
+	// --------------------------------------------------
+	// AI Presence
+	//---------------------------------------------------
+	
+	//! Return actual noise presence of player
+	int GetNoisePresenceInAI()
+	{
+		if (m_PresenceNotifier)
+		{
+			return m_PresenceNotifier.GetNoisePresence();
+		}
+
+		return 0;
+	}
+
+	// is a bit on in the persistent flags
+	bool IsPersistentFlag(PersistentFlag bit)
+	{
+		return (m_PersistentFlags & bit);
+	}
+	// turn on/off a bit in the persistent flag
+	void SetPersistentFlag(PersistentFlag bit, bool enable)
+	{
+		if (enable)//turn on bit
+			m_PersistentFlags = (m_PersistentFlags | bit);
+		else//turn off bit
+			m_PersistentFlags = ((~bit) & m_PersistentFlags);
+		
+	}
+
+	
+	// -------------------------------------------------------------------------
+
+	int GetStoreLoadVersion()
+	{
+		return m_StoreLoadVersion;
+	}
+
+	override void OnStoreSave(ParamsWriteContext ctx)
+	{
+		//Print("OnStoreSave");
+		if (GetGame().SaveVersion() < 102)
+		{
+			ctx.Write(ACT_STORE_SAVE_VERSION);//to be removed after we push 102+
+		}
+
+		super.OnStoreSave(ctx);
+
+		GetHumanInventory().OnStoreSave(ctx); // FSM of hands
+		OnStoreSaveLifespan(ctx);
+
+		if (GetDayZGame().IsServer() && GetDayZGame().IsMultiplayer())
+		{
+			GetPlayerStats().SaveStats(ctx);// save stats
+			m_ModifiersManager.OnStoreSave(ctx);// save modifiers
+			m_AgentPool.OnStoreSave(ctx);//save agents
+			GetSymptomManager().OnStoreSave(ctx);//save states
+			if (GetBleedingManagerServer())
+			{
+				GetBleedingManagerServer().OnStoreSave(ctx);//save bleeding sources
+			}
+			m_PlayerStomach.OnStoreSave(ctx);
+			ctx.Write(GetBrokenLegs());
+			//ctx.Write(m_LocalBrokenState);
+			SaveAreaPersistenceFlag(ctx);
+
+			HumanCommandLadder ladder = GetCommand_Ladder();
+			if (ladder)
+			{
+				ctx.Write(true);
+				ctx.Write(ladder.GetLogoutPosition());
+			}
+			else
+			{
+				ctx.Write(false);
+			}
+			
+			ArrowManagerPlayer arrowManager = ArrowManagerPlayer.Cast(GetArrowManager());
+			arrowManager.Save(ctx);
+		}
+	}
+
+	
+	void SaveAreaPersistenceFlag(ParamsWriteContext ctx)
+	{
+		if (GetModifiersManager())
+			SetPersistentFlag(PersistentFlag.AREA_PRESENCE, GetModifiersManager().IsModifierActive(eModifiers.MDF_AREAEXPOSURE));//set the flag for player's presence in contaminated area
+		ctx.Write(m_PersistentFlags);
+	}
+	
+	
+	override bool OnStoreLoad(ParamsReadContext ctx, int version)
+	{
+		//Print("---- PlayerBase OnStoreLoad START ----, version: "+version);
+		m_aQuickBarLoad = new array<ref Param2<EntityAI,int>>;
+		
+		// todo :: this should be after base call !!!!
+		if (version < 102)//write removed in v. 102
+		{
+			if (!ctx.Read(m_StoreLoadVersion))
+				return false;
+		}
+
+		if (!super.OnStoreLoad(ctx, version))
+			return false;
+
+		// FSM of hands
+		if (!GetHumanInventory().OnStoreLoad(ctx, version))
+			return false;
+
+		if (!OnStoreLoadLifespan(ctx, version))
+			return false;
+
+		if (GetDayZGame().IsServer() && GetDayZGame().IsMultiplayer())
+		{
+			if (!GetPlayerStats().LoadStats(ctx, version)) // load stats
+			{
+				Print("---- failed to load PlayerStats  ----");
+				return false;
+			}
+			
+			if (version < m_ModifiersManager.GetStorageVersion())//load modifiers !! WILL CANCEL REST OF STREAM IF UNSUPPORTED VERSION !!
+			{
+				Print("---- failed to load ModifiersManager, unsupported version   ----");
+				return false;
+			}
+			else
+			{
+				if (!m_ModifiersManager.OnStoreLoad(ctx, version))
+				{
+					Print("---- failed to load ModifiersManager, read fail  ----");
+					return false;
+				}
+			}
+			
+			if (version < m_AgentPool.GetStorageVersion())//load agents !! WILL CANCEL REST OF STREAM IF UNSUPPORTED VERSION !!
+			{
+				Print("---- failed to load AgentPool, unsupported version   ----");
+				return false;
+			}
+			else
+			{
+				if (!m_AgentPool.OnStoreLoad(ctx, version))
+				{
+					Print("---- failed to load AgentPool, read fail  ----");
+					return false;
+				}
+			}
+			
+			
+			if (version < GetSymptomManager().GetStorageVersion())//load symptoms !! WILL CANCEL REST OF STREAM IF UNSUPPORTED VERSION !!
+			{
+				Print("---- failed to load SymptomManager, unsupported version   ----");
+				return false;
+			}
+			else
+			{
+				if (!GetSymptomManager().OnStoreLoad(ctx, version))
+				{
+					Print("---- failed to load SymptomManager, read fail  ----");
+					return false;
+				}
+			}
+			
+			if (version < GetBleedingManagerServer().GetStorageVersion())//load bleeding manager !! WILL CANCEL REST OF STREAM IF UNSUPPORTED VERSION !!
+			{
+				Print("---- failed to load BleedingManagerServer, unsupported version  ----");
+				return false;
+			}
+			else
+			{
+				if (!GetBleedingManagerServer().OnStoreLoad(ctx, version))
+				{
+					Print("---- failed to load BleedingManagerServer, read fail  ----");
+					return false;
+				}
+			}
+			
+			if (version < m_PlayerStomach.GetStorageVersion())//load PlayerStomach !! WILL CANCEL REST OF STREAM IF UNSUPPORTED VERSION !!
+			{
+				Print("---- failed to load PlayerStomach, unsupported version  ----");
+				return false;
+			}
+			else
+			{
+				if (!m_PlayerStomach.OnStoreLoad(ctx, version))
+				{
+					Print("---- failed to load PlayerStomach, read fail  ----");
+					return false;
+				}
+			}
+			
+			//Check for broken leg value
+			if (version >= 116)
+			{
+				if (!ctx.Read(m_BrokenLegState))
+				{
+					return false;
+				}
+				if (version <= 126)// WHILE >= 116
+				{
+					if (!ctx.Read(m_LocalBrokenState))
+					{
+						return false;
+					}
+				}
+			}
+			//Check for broken leg value
+			if (version >= 125 && (!ctx.Read(m_PersistentFlags)))
+			{
+				Print("---- failed to load Persistent Flags, read fail  ----");
+				return false;
+			}
+
+			if (version >= 131)
+			{
+				bool onLadder;
+				if (!ctx.Read(onLadder))
+				{
+					return false;
+				}
+
+				if (onLadder)
+				{
+					vector position;
+					if (!ctx.Read(position))
+					{
+						return false;
+					}
+
+					Hive hive = GetHive();
+					if (!hive || !hive.CharacterIsLoginPositionChanged(this))
+					{
+						SetPosition(position);
+					}
+				}
+			}
+		
+			if (version >= 134)
+			{
+				ArrowManagerPlayer arrowManager = ArrowManagerPlayer.Cast(GetArrowManager());
+				arrowManager.Load(ctx);
+			}
+		}
+		
+		Print("---- PlayerBase OnStoreLoad SUCCESS ----");
+		return true;
+	}
+
+	override void AfterStoreLoad()
+	{
+		GetHumanInventory().OnAfterStoreLoad();
+		if (m_EmoteManager)
+		{
+			m_EmoteManager.AfterStoreLoad();
+		}
+	}
+
+	void OnStoreSaveLifespan(ParamsWriteContext ctx)
+	{		
+		ctx.Write(m_LifeSpanState);	
+		ctx.Write(m_LastShavedSeconds);	
+		ctx.Write(m_HasBloodyHandsVisible);
+		ctx.Write(m_HasBloodTypeVisible);
+		ctx.Write(m_BloodType);
+	}
+
+	bool OnStoreLoadLifespan(ParamsReadContext ctx, int version)
+	{	
+		int lifespan_state = 0;
+		if (!ctx.Read(lifespan_state))
+			return false;
+		m_LifeSpanState = lifespan_state;
+		
+		int last_shaved = 0;
+		if (!ctx.Read(last_shaved))
+			return false;
+		m_LastShavedSeconds = last_shaved;
+		
+		if (version < 122)
+		{
+			bool bloody_hands_old;
+			if (!ctx.Read(bloody_hands_old))
+			return false;
+			m_HasBloodyHandsVisible = bloody_hands_old;
+		}
+		else
+		{
+			int bloody_hands = 0;
+			if (!ctx.Read(bloody_hands))
+				return false;
+			m_HasBloodyHandsVisible = bloody_hands;
+		}
+		
+		
+		bool blood_visible = false;
+		if (!ctx.Read(blood_visible))
+			return false;
+		m_HasBloodTypeVisible = blood_visible;
+		
+		int blood_type = 0;
+		if (!ctx.Read(blood_type))
+			return false;
+		m_BloodType = blood_type;
+
+		return true;
+	}
+	
+	vector m_PlayerOldPos;
+	void UpdatePlayerMeasures()
+	{
+		int hour, minute, second;
+		GetHourMinuteSecond(hour, minute, second);
+		float distance;
+		distance = StatGet(AnalyticsManagerServer.STAT_DISTANCE);
+		if (m_AnalyticsTimer)
+		{
+			StatsEventMeasuresData data = new StatsEventMeasuresData();
+			data.m_CharacterId = g_Game.GetDatabaseID();
+			data.m_TimeInterval = m_AnalyticsTimer.GetRemaining();
+			data.m_DaytimeHour = hour;
+			data.m_PositionStart = m_PlayerOldPos;
+			data.m_PositionEnd = GetPosition();
+			data.m_DistanceOnFoot = distance;
+			Analytics.PlayerMeasures(data);
+		}
+
+		m_PlayerOldPos = GetPosition();
+	}
+
+	void OnConnect()
+	{
+		Debug.Log("Player connected:"+this.ToString(),"Connect");
+
+		// analytics
+		GetGame().GetAnalyticsServer().OnPlayerConnect(this);
+		
+		m_PlayerOldPos = GetPosition();
+		if (m_AnalyticsTimer)
+			m_AnalyticsTimer.Run(60, this, "UpdatePlayerMeasures", null, true);
+		
+		//construction action data
+		ResetConstructionActionData();
+	}
+	
+	void OnReconnect()
+	{
+		Debug.Log("Player reconnected:"+this.ToString(),"Reconnect");
+		
+		//construction action data
+		
+		ResetConstructionActionData();	
+	}
+	
+	void OnDisconnect()
+	{
+		Debug.Log("Player disconnected:"+this.ToString(),"Connect");
+		
+		// analytics
+		// force update of the stats
+		// if player disconnect too soon, UpdatePlayersStats() is not called
+		GetGame().GetAnalyticsServer().OnPlayerDisconnect(this);
+		
+		StatsEventDisconnectedData data = new StatsEventDisconnectedData();
+		data.m_CharacterId = g_Game.GetDatabaseID();
+		data.m_Reason = "Disconnected";
+		Analytics.PlayerDisconnected(data);
+		
+		if (m_AnalyticsTimer)
+			m_AnalyticsTimer.Stop();
+		UpdatePlayerMeasures();
+		
+		SetPlayerDisconnected(true);
+	}
+
+	void SetModifiers(bool enable)
+	{
+		GetModifiersManager().SetModifiers(enable);
+	}
+
+	bool Consume(ItemBase source, float amount, EConsumeType consume_type)
+	{
+		PluginTransmissionAgents plugin = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+		int agents;
+		if (consume_type == EConsumeType.ENVIRO_POND || consume_type == EConsumeType.ENVIRO_WELL)
+		{
+			if (consume_type == EConsumeType.ENVIRO_POND)
+			{
+				agents = agents | eAgents.CHOLERA;
+				//plugin.TransmitAgents(NULL, this, AGT_WATER_POND, amount);
+			}
+			m_PlayerStomach.AddToStomach(Liquid.GetLiquidClassname(LIQUID_WATER), amount, 0 , agents);
+			
+			
+			return true;
+		}
+		
+		Edible_Base edible_item = Edible_Base.Cast(source);
+		if (!edible_item)
+		{
+			return false;
+		}
+		agents = edible_item.GetAgents();
+		if (consume_type == EConsumeType.ITEM_SINGLE_TIME || consume_type == EConsumeType.ITEM_CONTINUOUS)
+		{
+			if (consume_type == EConsumeType.ITEM_SINGLE_TIME)
+			{
+				plugin.TransmitAgents(edible_item, this, AGT_UACTION_CONSUME, amount);
+			}
+			/*
+			else
+			{
+				plugin.TransmitAgents(edible_item, this, AGT_UACTION_TO_PLAYER, amount);
+			}
+			*/
+			if (edible_item.IsLiquidContainer())
+			{
+				int liquid_type = edible_item.GetLiquidType();
+				string liquidClassName = Liquid.GetLiquidClassname(liquid_type);
+				if (liquidClassName.Length() == 0)
+					Error("Error! Trying to add unknown liquid to stomach with item=" + Object.GetDebugName(edible_item) + " consume_type=" + consume_type + " liquid_type=" + liquid_type);
+				m_PlayerStomach.AddToStomach(liquidClassName, amount, 0, agents);
+			}
+			else 
+			{
+				int food_stage_type;
+				if (edible_item.GetFoodStage())
+				{
+					food_stage_type = edible_item.GetFoodStage().GetFoodStageType();
+				}
+				m_PlayerStomach.AddToStomach(source.GetType(), amount, food_stage_type, agents);
+			}
+			edible_item.Consume(amount, this);
+			return true;
+
+		}
+		/*
+		if (consume_type == EConsumeType.ITEM_CONTINUOUS)
+		{
+			if (edible_item)
+			{
+				plugin.TransmitAgents(edible_item, this, AGT_UACTION_TO_PLAYER, amount);
+				edible_item.Consume(amount, this);
+				//ProcessNutritions(edible_item.GetNutritionalProfile(),amount);
+				m_PlayerStomach.AddToStomach(source.GetType(), amount, edible_item.GetNutritionalProfile());
+				return true;
+			}
+		}
+		*/
+		return false;
+	}
+	
+	/*
+	void ProcessNutritions(NutritionalProfile profile, float consumedquantity)
+	{	
+		float energy_per_unit = profile.GetEnergy() / 100;
+		float water_per_unit = profile.GetWaterContent() / 100;
+		float nutritions = profile.GetNutritionalIndex();
+		float fullness_index = profile.GetFullnessIndex();
+		float toxicity = profile.GetToxicity();
+		bool is_liquid = profile.IsLiquid();
+		
+		if (consumedquantity > 0)
+		{
+			float water_consumed = consumedquantity * water_per_unit;
+			GetStatStomachVolume().Add(consumedquantity * fullness_index);
+			GetStatStomachEnergy().Add(consumedquantity * energy_per_unit);
+			GetStatStomachWater().Add(water_consumed);
+			GetStatToxicity().Add(consumedquantity * toxicity);
+		}
+		else
+		{
+			Print("ProcessNutritions - ZERO VOLUME! Fix config");
+		}
+	}
+	*/
+	
+	void ShowUnconsciousScreen(bool show)
+	{
+	#ifndef NO_GUI
+		if (show)
+		{
+			GetGame().GetUIManager().ScreenFadeIn(0, "You are Unconscious", FadeColors.BLACK, FadeColors.WHITE);
+			PrintString("Fade in");
+		}
+		else
+		{
+			GetGame().GetUIManager().ScreenFadeOut(0);
+			PrintString("Fade out");
+		}
+	#endif
+	}
+	
+	override void RequestSoundEventEx(EPlayerSoundEventID id, bool from_server_and_client = false, int param = 0)
+	{
+		if (from_server_and_client && GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			PlaySoundEventEx(id, false, false, param);
+			return;
+		}
+		SendSoundEventEx(id, param);
+	}
+	
+	override void RequestSoundEvent(EPlayerSoundEventID id, bool from_server_and_client = false)
+	{
+		RequestSoundEventEx(id, from_server_and_client);
+	}
+
+	override protected void SendSoundEvent(EPlayerSoundEventID id)
+	{
+		SendSoundEventEx(id);
+	}
+	
+	override protected void SendSoundEventEx(EPlayerSoundEventID id, int param = 0)
+	{
+		if (!GetGame().IsServer())
+		{
+			return;
+		}
+		m_SoundEvent = id;
+		m_SoundEventParam = param;
+		SetSynchDirty();
+		
+		if (!GetGame().IsMultiplayer()) 
+		{
+			CheckSoundEvent();
+		}
+		
+		//PrintString(GetGame().GetTime().ToString() + " Set SoundEvent, id:" + id.ToString());
+	}
+	
+	void CheckZeroSoundEvent()
+	{
+		if (m_SoundEvent != 0 && m_SoundEventSent)
+		{
+			m_SoundEvent = 0;
+			m_SoundEventParam = 0;
+			m_SoundEventSent = false;
+			SetSynchDirty();
+		}
+	}
+	
+	void CheckSendSoundEvent()
+	{
+		if (m_SoundEvent!= 0 && !m_SoundEventSent)
+		{
+			m_SoundEventSent = true;
+		}
+	}
+	
+	override bool PlaySoundEvent(EPlayerSoundEventID id, bool from_anim_system = false, bool is_from_server = false)
+	{
+		return PlaySoundEventEx(id, from_anim_system, is_from_server);
+	}
+	
+	override bool PlaySoundEventEx(EPlayerSoundEventID id, bool from_anim_system = false, bool is_from_server = false, int param = 0)
+	{
+		if (!m_PlayerSoundEventHandler)
+			return false;
+
+		return m_PlayerSoundEventHandler.PlayRequestEx(id, is_from_server, param);
+	}
+	
+	PlayerSoundEventHandler GetPlayerSoundEventHandler()
+	{
+		return m_PlayerSoundEventHandler;
+	}
+	
+	void OnBleedingBegin();
+	void OnBleedingEnd();
+	
+	void OnBleedingSourceAdded()
+	{
+		m_BleedingSourceCount++;
+		if (IsControlledPlayer())
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_BLEEDING));
+				if (dis_elm)
+				{
+					dis_elm.SetValue(GetBleedingSourceCount());
+				}
+				
+				
+				//Print("----------bleeding_SoundSet----------");
+				SEffectManager.PlaySoundOnObject("bleeding_SoundSet", this);
+			}
+		}
+	}
+	
+	void OnBleedingSourceRemoved()
+	{
+		m_BleedingSourceCount--;
+		if (GetGame().IsServer())
+		{
+			ArrowManagerBase arrowManager = GetArrowManager();
+			if (GetBleedingSourceCount() > 0)
+			{
+				arrowManager.DropFirstArrow();
+			}
+			else
+			{
+				arrowManager.DropAllArrows();
+			}
+		}
+		
+		if (IsControlledPlayer())
+		{
+			if (!GetGame().IsDedicatedServer())
+			{
+				//Print("GetBleedingSourceCount() "+GetBleedingSourceCount());
+				DisplayElementBadge dis_elm = DisplayElementBadge.Cast(GetVirtualHud().GetElement(eDisplayElements.DELM_BADGE_BLEEDING));
+				if (dis_elm)
+				{
+					dis_elm.SetValue(GetBleedingSourceCount());
+				}
+			}
+		}
+	}
+	
+	
+	void OnBleedingSourceRemovedEx(ItemBase item)
+	{
+		OnBleedingSourceRemoved();
+	}
+	
+	int GetBleedingSourceCount()
+	{
+		return m_BleedingSourceCount;
+	}
+
+	// for debug purposes, should reset some systems like Modifiers, Stats, Damage etc.....
+	void ResetPlayer(bool set_max)
+	{
+		#ifdef DIAG_DEVELOPER
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			GetStomach().ClearContents();
+
+			DamageSystem.ResetAllZones(this);
+			GetModifiersManager().ResetAll();
+			
+			// bleeding sources
+			if (m_BleedingManagerServer)
+				m_BleedingManagerServer.RemoveAllSources();
+			
+			// Stats
+			if (GetPlayerStats())
+			{
+				int bloodType = GetStatBloodType().Get();
+				GetPlayerStats().ResetAllStats();
+				GetStatBloodType().Set(bloodType);
+			}
+
+			// Agents
+			if (m_AgentPool)
+				m_AgentPool.RemoveAllAgents();
+			
+			if (m_StaminaHandler)
+				m_StaminaHandler.SetStamina(GameConstants.STAMINA_MAX);
+			
+			// uncon
+			if (IsUnconscious())
+				DayZPlayerSyncJunctures.SendPlayerUnconsciousness(this, false);
+			
+			// set max
+			if (set_max)
+			{
+				GetStatWater().Set(GetStatWater().GetMax());
+				GetStatEnergy().Set(GetStatEnergy().GetMax());
+			}
+			
+			// fix up inventory
+			FixAllInventoryItems();
+			
+			//remove bloody hands
+			PluginLifespan moduleLifespan = PluginLifespan.Cast(GetPlugin(PluginLifespan));
+			moduleLifespan.UpdateBloodyHandsVisibilityEx(this, eBloodyHandsTypes.CLEAN);
+			
+			if (GetArrowManager())
+				GetArrowManager().ClearArrows();
+
+		}
+
+		// client + single + server
+		HumanCommandVehicle vehCmd = GetCommand_Vehicle();
+		if (vehCmd)
+		{
+			CarScript car = CarScript.Cast(vehCmd.GetTransport());
+			if (car)
+			{
+				car.FixEntity();
+			}
+		}
+		#endif
+	}
+	
+	void CheckSoundEvent()
+	{
+		if (m_SoundEvent != 0)
+		{
+			PlaySoundEventEx(m_SoundEvent, false, true,m_SoundEventParam);
+			m_SoundEvent = 0;
+			m_SoundEventParam = 0;
+		}
+	}
+	
+	void TestSend()
+	{
+		if (GetGame().IsClient()) return;
+		RequestSoundEvent(1234);
+		//Math.RandomInt(1,4096)
+	}
+	
+	void SetStaminaState(eStaminaState state)
+	{
+		if (state != m_StaminaState)
+		{
+			m_StaminaState = state;
+			//PrintString("m_StaminaState:"+m_StaminaState.ToString());
+			SetSynchDirty();
+		}
+	}
+	
+	int GetStaminaState()
+	{
+		return m_StaminaState;
+	}
+	
+	void UpdateQuickBarExtraSlots()
+	{
+		m_QuickBarBase.updateSlotsCount();
+	}
+
+	bool Save()
+	{
+		// saved player must be alive and not captive
+		if (GetPlayerState() == EPlayerStates.ALIVE && !IsRestrained())
+		{
+			GetHive().CharacterSave(this);
+			Debug.Log("Player "+this.ToString()+ " saved as alive");
+			
+			return true;
+		}
+		return false;		
+	}
+
+	// agent transfer
+	
+	static ref array<Object> SPREAD_AGENTS_OBJECTS = new array<Object>;
+	static ref array<CargoBase> SPREAD_AGENTS_PROXY_CARGOS = new array<CargoBase>;
+	
+	
+	//! chance between [0..1] , distance in meters
+	void SpreadAgentsEx(float distance = 3,float chance = 0.25)
+	{
+		if (Math.RandomFloat01() > chance)
+			return;
+		
+		GetGame().GetPlayers(m_ServerPlayers);
+		float dist_check = distance * distance;//make it sq
+		PluginTransmissionAgents plugin = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+		
+		foreach (Man target: m_ServerPlayers)
+		{
+			if (vector.DistanceSq(GetWorldPosition(), target.GetWorldPosition()) < dist_check && target != this)
+			{
+				plugin.TransmitAgents(this, target, AGT_AIRBOURNE_BIOLOGICAL, 1);
+			}
+		}
+	}
+	
+	void SpreadAgents()//legacy method
+	{
+		SpreadAgentsEx(3,1);
+	}
+
+	//--------------------------------------------------------------------------------------------
+	override int GetAgents()
+	{
+		return m_AgentPool.GetAgents();
+	}
+
+	//--------------------------------------------------------------------------------------------
+	override void RemoveAgent(int agent_id) //removes a single agent type from the player agent pool
+	{
+		m_AgentPool.RemoveAgent(agent_id);
+	}
+
+	//--------------------------------------------------------------------------------------------
+	override void RemoveAllAgents()
+	{
+		m_AgentPool.RemoveAllAgents();
+	}
+
+
+	//--------------------------------------------------------------------------------------------
+	override void InsertAgent(int agent, float count = 1) //adds a single agent type to the player agent pool
+	{
+		m_AgentPool.AddAgent(agent,count);
+	}
+
+	//--------------------------------------------------------------------------------------------
+	int GetSingleAgentCount(int agent_id)
+	{
+		return m_AgentPool.GetSingleAgentCount(agent_id);
+	}
+
+	//--------------------------------------------------------------------------------------------
+	float GetSingleAgentCountNormalized(int agent_id)
+	{
+		int max_count = PluginTransmissionAgents.GetAgentMaxCount(agent_id);
+		return m_AgentPool.GetSingleAgentCount(agent_id) / max_count;
+	}
+
+	float GetTotalAgentCount()
+	{
+		return m_AgentPool.GetTotalAgentCount();
+	}
+
+	void PrintAgents()
+	{
+		m_AgentPool.PrintAgents();
+	}
+
+	void ImmuneSystemTick(float value, float deltaT)
+	{
+		m_AgentPool.ImmuneSystemTick(value, deltaT);
+	}
+	
+	void AntibioticsAttack(float value)
+	{
+		m_AgentPool.AntibioticsAttack(value);
+	}
+
+	//Get aim (player crosshair) position
+	vector GetAimPosition()
+	{
+		float min_distance = 0.5;		//min distance, default = 5m
+		
+		vector from = GetGame().GetCurrentCameraPosition();
+		vector to = from + (GetGame().GetCurrentCameraDirection() * min_distance);
+		vector contactPos;
+		vector contactDir;
+		int contactComponent;
+		
+		DayZPhysics.RaycastRV(from, to, contactPos, contactDir, contactComponent, NULL, NULL, NULL, false, true);
+		
+		return contactPos;
+	}
+
+	
+	bool CanEatAndDrink()
+	{
+		ItemBase mask = ItemBase.Cast(GetInventory().FindAttachment(InventorySlots.MASK));
+		return (!mask || (mask && mask.AllowFoodConsumption()));
+	}
+	
+	//get modifier manager
+	ModifiersManager GetModifiersManager()
+	{
+		return m_ModifiersManager;
+	}
+
+	PlayerStat<float> GetStatWater()
+	{
+		if (!m_StatWater && GetPlayerStats())
+		{
+			m_StatWater = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.WATER));
+		}
+		return m_StatWater;
+	}
+	
+	PlayerStat<float> GetStatToxicity()
+	{
+		if (!m_StatToxicity && GetPlayerStats())
+		{
+			m_StatToxicity = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.TOXICITY));
+		}
+		return m_StatToxicity;
+	}
+
+	PlayerStat<float> GetStatEnergy()
+	{
+		if (!m_StatEnergy && GetPlayerStats()) 
+		{
+			m_StatEnergy = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.ENERGY));
+		}
+		return m_StatEnergy;
+	}
+	
+	PlayerStat<float> GetStatHeatComfort()
+	{
+		if (!m_StatHeatComfort && GetPlayerStats()) 
+		{
+			m_StatHeatComfort = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.HEATCOMFORT));
+		}
+		return m_StatHeatComfort;
+	}
+	
+	PlayerStat<float> GetStatTremor()
+	{
+		if (!m_StatTremor && GetPlayerStats()) 
+		{
+			m_StatTremor = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.TREMOR));
+		}
+		return m_StatTremor;
+	}
+	
+	PlayerStat<int> GetStatWet()
+	{
+		if (!m_StatWet && GetPlayerStats()) 
+		{
+			m_StatWet = PlayerStat<int>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.WET));
+		}
+		return m_StatWet;
+	}
+	
+	PlayerStat<float> GetStatDiet()
+	{
+		if (!m_StatDiet && GetPlayerStats()) 
+		{
+			m_StatDiet = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.DIET));
+		}
+		return m_StatDiet;
+	}
+	
+	PlayerStat<float> GetStatStamina()
+	{
+		if (!m_StatStamina && GetPlayerStats()) 
+		{
+			m_StatStamina = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.STAMINA));
+		}
+		return m_StatStamina;
+	}
+		
+	PlayerStat<float> GetStatSpecialty()
+	{
+		if (!m_StatSpecialty && GetPlayerStats()) 
+		{
+			m_StatSpecialty = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.SPECIALTY));
+		}
+		return m_StatSpecialty;
+	}
+	
+	PlayerStat<int> GetStatBloodType()
+	{
+		if (!m_StatBloodType && GetPlayerStats()) 
+		{
+			m_StatBloodType = PlayerStat<int>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.BLOODTYPE));
+		}
+		return m_StatBloodType;
+	}
+	
+	PlayerStat<float> GetStatHeatBuffer()
+	{
+		if (!m_StatHeatBuffer && GetPlayerStats()) 
+		{
+			m_StatHeatBuffer = PlayerStat<float>.Cast(GetPlayerStats().GetStatObject(EPlayerStats_current.HEATBUFFER));
+		}
+		return m_StatHeatBuffer;
+	}
+	
+	void ToggleHeatBufferVisibility(bool show)
+	{
+		m_HasHeatBuffer = show;
+		SetSynchDirty();
+	}
+	
+	//! UA Last Message
+	string GetLastUAMessage()
+	{
+		return m_UALastMessage;
+	}
+
+	void SetLastUAMessage(string pMsg)
+	{
+		m_UALastMessage = pMsg;
+
+		if (m_UALastMessageTimer.IsRunning())
+		{
+			m_UALastMessageTimer.Stop();
+		}
+		
+		m_UALastMessageTimer.Run(PlayerConstants.LAST_UA_MSG_LIFETIME, this, "ClearLastUAMessage", null);
+	}
+
+	protected void ClearLastUAMessage()
+	{
+		if (m_UALastMessageTimer.IsRunning())
+		{
+			m_UALastMessageTimer.Stop();
+		}
+		
+		m_UALastMessage = "";
+	}
+
+	//! -------------------------------------------------------------------------
+	//! Injured stat
+	
+	//! update injured state immediately
+	void ForceUpdateInjuredState()
+	{
+		m_InjuryHandler.CheckValue(true);
+	}
+	
+	// -------------------------------------------------------------------------
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		PluginTransmissionAgents pluginTransmissionAgents = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+		
+		string name;
+		int id;
+		map<int,string> agentList = pluginTransmissionAgents.GetSimpleAgentList();
+		
+		for (int i = 0; i < agentList.Count(); i++)
+		{
+			name = agentList.GetElement(i);
+			id = agentList.GetKey(i);
+			
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DEBUG_AGENTS_RANGE_INJECT_START + id, "Inject " + name, Colors.WHITE));
+			outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DEBUG_AGENTS_RANGE_REMOVE_START + id, "Remove " + name, Colors.WHITE));
+		}
+	}		
+
+	//-------------------------------------------------------------
+	//!
+	//! SyncJunctures
+	//! 
+
+	override void OnSyncJuncture(int pJunctureID, ParamsReadContext pCtx)
+	{
+		super.OnSyncJuncture(pJunctureID, pCtx);
+			
+		switch(pJunctureID)
+		{
+			case DayZPlayerSyncJunctures.SJ_INJURY:
+				eInjuryHandlerLevels level;
+				bool enable;
+				DayZPlayerSyncJunctures.ReadInjuryParams(pCtx, enable, level);
+				m_InjuryHandler.SetInjuryCommandParams(enable, level);
+				break;
+			case DayZPlayerSyncJunctures.SJ_PLAYER_STATES:
+				GetSymptomManager().SetAnimation(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_QUICKBAR_SET_SHORTCUT:		
+				OnQuickbarSetEntityRequest(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_INVENTORY:
+				GetInventory().OnInventoryJunctureFromServer(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_INVENTORY_REPAIR:
+				GetInventory().OnInventoryJunctureRepairFromServer(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_INVENTORY_FAILURE:
+				GetInventory().OnInventoryJunctureFailureFromServer(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_ACTION_INTERRUPT:
+			case DayZPlayerSyncJunctures.SJ_ACTION_ACK_ACCEPT:
+			case DayZPlayerSyncJunctures.SJ_ACTION_ACK_REJECT:
+				m_ActionManager.OnSyncJuncture(pJunctureID,pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_WEAPON_ACTION_ACK_ACCEPT:
+			case DayZPlayerSyncJunctures.SJ_WEAPON_ACTION_ACK_REJECT:
+			case DayZPlayerSyncJunctures.SJ_WEAPON_SET_JAMMING_CHANCE:
+				m_WeaponManager.OnSyncJuncture(pJunctureID,pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_UNCONSCIOUSNESS:
+				DayZPlayerSyncJunctures.ReadPlayerUnconsciousnessParams(pCtx, m_ShouldBeUnconscious);
+				break;
+			case DayZPlayerSyncJunctures.SJ_PLAYER_ADD_MODIFIER:
+				GetSymptomManager().SetAnimation(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_KURU_REQUEST:
+				float amount;
+				if (DayZPlayerSyncJunctures.ReadKuruRequest(pCtx, amount))
+				{
+					if (GetAimingModel() && IsFireWeaponRaised()) 
+					{
+						GetAimingModel().RequestKuruShake(amount);
+					}
+				}
+				break;
+			case DayZPlayerSyncJunctures.SJ_GESTURE_REQUEST :
+				m_EmoteManager.OnSyncJuncture(pJunctureID, pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_WEAPON_LIFT:
+				SetLiftWeapon(pJunctureID, pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_ADS_RESET:
+				m_ResetADS = true;
+				break;
+			case DayZPlayerSyncJunctures.SJ_DELETE_ITEM:
+				SetToDelete(pCtx);
+				break;
+			case DayZPlayerSyncJunctures.SJ_BROKEN_LEGS:
+				m_BrokenLegsJunctureReceived = true;
+				DayZPlayerSyncJunctures.ReadBrokenLegsParamsEx(pCtx, m_BrokenLegState);
+			break;
+			case DayZPlayerSyncJunctures.SJ_SHOCK :
+				DayZPlayerSyncJunctures.ReadShockParams(pCtx, m_CurrentShock);
+			break;
+			case DayZPlayerSyncJunctures.SJ_STAMINA:
+				m_StaminaHandler.OnSyncJuncture(pJunctureID, pCtx);
+			break;
+			case DayZPlayerSyncJunctures.SJ_STAMINA_MISC:
+				m_StaminaHandler.OnSyncJuncture(pJunctureID, pCtx);
+			break;
+			#ifdef DEVELOPER
+			case DayZPlayerSyncJunctures.SJ_DEBUG_GET_IN_CAR:
+				EntityAI car;
+				DayZPlayerSyncJunctures.ReadGetInCarParams(pCtx, car);
+				SetGetInVehicleDebug(car);
+			break;
+			#endif
+		}
+	}
+	
+	bool IsItemsToDelete()
+	{
+		return m_ItemsToDelete.Count() > 0;
+	}
+	
+	void SetToDelete(ParamsReadContext pCtx)
+	{
+		EntityAI item; 
+		pCtx.Read(item);
+		AddItemToDelete(item);
+	}
+	
+	override void AddItemToDelete(EntityAI item)
+	{
+		if (item)
+		{
+			item.SetPrepareToDelete();
+			m_ItemsToDelete.Insert(item);
+		}
+	}
+	
+	bool CanDeleteItems()
+	{
+		return !(IsEmotePlaying() || GetThrowing().IsThrowingAnimationPlaying() || GetDayZPlayerInventory().IsProcessing() || (GetActionManager() && GetActionManager().GetRunningAction()));
+	}
+	
+	override void JunctureDeleteItem(EntityAI item)
+	{
+		DayZPlayerSyncJunctures.SendDeleteItem(this, item);
+	} 
+	
+	void UpdateDelete()
+	{
+		int count = m_ItemsToDelete.Count();
+		if (count > 0)
+		{
+			if (CanDeleteItems())
+			{
+				EntityAI itemToDelete;
+				
+				if (GetGame().IsClient() && GetGame().IsMultiplayer())
+				{
+					InventoryLocation il = new InventoryLocation();
+					for (int i = count - 1; i >= 0 ; i--)
+					{
+						itemToDelete = m_ItemsToDelete.Get(i);
+						if (itemToDelete != null)
+						{
+							itemToDelete.GetInventory().GetCurrentInventoryLocation(il);
+						}
+						
+						if (itemToDelete == null || (GetItemInHands() == null && il.GetType() == InventoryLocationType.UNKNOWN))
+						{
+							m_ItemsToDelete.Remove(i);
+						}
+					}
+				}
+				else
+				{
+					for (int j = count - 1; j >= 0 ; j--)
+					{
+						itemToDelete = m_ItemsToDelete.Get(j);
+						if (itemToDelete == null)
+						{
+							m_ItemsToDelete.Remove(j);
+						}
+						else
+						{
+							itemToDelete.Delete();
+							m_ItemsToDelete.Remove(j);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	override bool	HeadingModel(float pDt, SDayZPlayerHeadingModel pModel)
+	{
+		//! during fullbody gestures - disables character turning
+		if (GetEmoteManager().IsControllsLocked() || (GetActionManager() && GetActionManager().GetRunningAction() && GetActionManager().GetRunningAction().IsFullBody(this)))
+		{
+			HumanItemAccessor hia = GetItemAccessor();
+			HumanItemBehaviorCfg hibcfg = hia.GetItemInHandsBehaviourCfg();
+			if (hibcfg && hibcfg.m_StanceRotation[m_MovementState.m_iStanceIdx] == DayZPlayerConstants.ROTATION_DISABLE)
+			{
+				return DayZPlayerImplementHeading.NoHeading(pDt, pModel, m_fLastHeadingDiff);
+			}
+			else
+			{
+				m_fLastHeadingDiff = 0;
+				return DayZPlayerImplementHeading.ClampHeading(pDt, pModel, m_fLastHeadingDiff);
+			}
+		}
+		
+		return super.HeadingModel(pDt, pModel);
+	}
+	
+	override bool IsInventorySoftLocked()
+	{
+		return m_InventorySoftLockCount > 0;
+	}
+	
+	//! 'soft lock' meaning inventory screen cannot be displayed, but mechanically, inventory operations are still possible
+	override void SetInventorySoftLock(bool status)
+	{
+		if (status)
+			m_InventorySoftLockCount++;
+		else
+			m_InventorySoftLockCount--;
+		
+		if (m_InventorySoftLockCount < 0)
+			m_InventorySoftLockCount = 0;
+		
+		m_InventorySoftLocked = IsInventorySoftLocked();
+	}
+	
+	void SetLoadedQuickBarItemBind(EntityAI entity, int index)
+	{
+		if (m_aQuickBarLoad)
+			m_aQuickBarLoad.Insert(new Param2<EntityAI, int>(entity,index));
+	}
+	
+	override bool IsLiftWeapon()
+	{
+		return m_LiftWeapon_player;
+	}
+	
+	//Server
+	bool ReadLiftWeaponRequest(int userDataType, ParamsReadContext ctx)
+	{
+		bool state;
+		ctx.Read(state);
+		
+		ScriptJunctureData pCtx = new ScriptJunctureData;
+		pCtx.Write(state);
+		
+		SendSyncJuncture(DayZPlayerSyncJunctures.SJ_WEAPON_LIFT, pCtx);
+		
+		return true;
+	}
+	
+	void SetLiftWeapon(int pJunctureID, ParamsReadContext ctx)
+	{
+		bool state;
+		ctx.Read(state);
+		
+		m_ProcessLiftWeaponState = state;
+		m_ProcessLiftWeapon = true;
+		
+		//Print("SetLiftWeapon | STS: " + GetSimulationTimeStamp());
+	}
+	
+	//! Client-side only
+	void SendLiftWeaponSync(bool state)
+	{
+		HumanCommandWeapons	hcw;
+		//SP version
+		if (!GetGame().IsMultiplayer())
+		{
+			m_LiftWeapon_player = state;
+		
+			hcw = GetCommandModifier_Weapons();
+			if (hcw)
+				hcw.LiftWeapon(state);
+			
+			GetWeaponManager().OnLiftWeapon();
+			
+			return;
+		}
+		
+		ScriptInputUserData ctx = new ScriptInputUserData;
+		
+		if (GetGame().IsMultiplayer() && GetGame().IsClient() && !ctx.CanStoreInputUserData())
+		{
+			//Print("ctx unavailable");
+			return;
+		}
+		else if (GetGame().IsMultiplayer() && GetGame().IsClient() && ctx.CanStoreInputUserData())
+		{
+			//Print("sending ECB cancel request");
+			ctx.Write(INPUT_UDT_WEAPON_LIFT_EVENT);
+			ctx.Write(state);
+			ctx.Send();
+		}
+	}
+	
+	override void CheckLiftWeapon()
+	{
+		// lift weapon check
+		if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			Weapon_Base weap;
+			if (Weapon_Base.CastTo(weap, GetItemInHands()))
+			{				
+				bool limited = weap.LiftWeaponCheck(this);
+
+				if (limited && !m_LiftWeapon_player)
+					SendLiftWeaponSync(true);
+				else if (!limited && m_LiftWeapon_player)
+					SendLiftWeaponSync(false);
+			}
+			else if (m_LiftWeapon_player)
+			{
+				SendLiftWeaponSync(false);
+			}
+		}
+	}
+	
+	override void ProcessLiftWeapon()
+	{
+		if (m_ProcessLiftWeapon)
+		{
+			HumanCommandWeapons	hcw = GetCommandModifier_Weapons();
+			if (hcw)
+				hcw.LiftWeapon(m_ProcessLiftWeaponState);
+			
+			GetWeaponManager().OnLiftWeapon();
+			m_LiftWeapon_player = m_ProcessLiftWeaponState;
+			m_ProcessLiftWeapon = false;
+			
+			//Debug.Log("SimulationStamp_server: " + this.GetSimulationTimeStamp());
+		}
+	}
+	
+	//! state 'true' == hide
+	override void HideClothing(ItemOptics optic, bool state)
+	{
+		super.HideClothing(optic, state);
+		array<int> clothingArray = new array<int>;
+		Clothing clothes;
+		
+		if (state && DayZPlayerCameraOptics.Cast(m_CurrentCamera))
+		{
+			if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+			{
+				clothingArray.Insert(InventorySlots.BACK);
+				clothingArray.Insert(InventorySlots.SHOULDER);
+				clothingArray.Insert(InventorySlots.MELEE);
+				if (optic && optic.GetCurrentStepFOV() < GameConstants.DZPLAYER_CAMERA_FOV_IRONSIGHTS)
+				{
+					clothingArray.Insert(InventorySlots.BODY);
+					clothingArray.Insert(InventorySlots.VEST);
+				}
+				
+				SetInvisibleRecursive(true,this,clothingArray);
+			}
+		}
+		//showing should be instant (called directly, not via CallLater)
+		else
+		{
+			if (GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+			{
+				clothingArray = {InventorySlots.BACK,InventorySlots.BODY,InventorySlots.VEST,InventorySlots.SHOULDER,InventorySlots.MELEE};
+				
+				SetInvisibleRecursive(false,this,clothingArray);
+			}
+		}
+	}
+	
+	void RequestUnconsciousness(bool enable)
+	{
+		DayZPlayerSyncJunctures.SendPlayerUnconsciousness(this, enable);
+	}
+	
+	override void SetDeathDarknessLevel(float duration, float tick_time)
+	{
+		super.SetDeathDarknessLevel(duration, tick_time);
+		
+		if (IsControlledPlayer())
+		{
+			float actual_tick = tick_time;
+			if (GetDamageDealtEffect())
+				m_DamageDealtEffect = null;
+		
+			if (GetFlashbangEffect())
+				m_FlashbangEffect = null;
+			
+			float progress;
+			if (duration > 0)
+				progress = 1 - ((duration - m_DeathDarkeningCurrentTime) / duration);
+			
+			m_DeathDarkeningCurrentTime += actual_tick;
+			
+			if (!IsAlive() && IsPlayerSelected())
+			{
+				m_DeathDarkeningParam.param1 = progress;
+				PPERequesterBank.GetRequester(PPERequester_DeathDarkening).Start(m_DeathDarkeningParam);
+			}
+			
+			if (m_DeathDarkeningCurrentTime >= duration)
+			{
+				StopDeathDarkeningEffect();
+			}
+		}
+		else
+		{
+			StopDeathDarkeningEffect();
+		}
+	}
+	
+	override bool IsInFBEmoteState()
+	{
+		if (!IsEmotePlaying())
+			return false;
+		if ((m_EmoteManager.m_Callback && m_EmoteManager.m_Callback.m_IsFullbody) || m_EmoteManager.m_IsSurrendered)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	//! ends surrender, originally intended for surrender->restrained transitioning
+	void EndSurrenderRequest(SurrenderData data = null)
+	{
+		if (m_EmoteManager)
+			m_EmoteManager.EndSurrenderRequest(data);
+	}
+	
+	bool IsSurrendered()
+	{
+		if (m_EmoteManager)
+			return m_EmoteManager.m_IsSurrendered;
+		
+		return false;
+	}
+	
+	bool IsPlayerLoaded()
+	{
+		return m_PlayerLoaded;
+	}
+	
+	//disconnected, caused problems. Awaiting refactor
+	override void CheckAnimationOverrides()
+	{
+		//FB gesture slideposeangle override
+		if (IsInFBEmoteState() && IsControlledPlayer() && IsPlayerSelected())
+		{
+			OverrideSlidePoseAngle(Math.PI2);
+		}
+		else if (!IsInFBEmoteState() && IsControlledPlayer() && IsPlayerSelected())
+		{
+			OverrideSlidePoseAngle(m_OriginalSlidePoseAngle);
+		}
+		
+		//+add more, if needed
+	}
+	
+	/*void OnSurrenderEnd()
+	{
+	}*/
+	
+	bool CanRedirectToWeaponManager (notnull EntityAI item, out bool isActionPossible)
+	{
+		isActionPossible = false;
+		Magazine mag = Magazine.Cast(item);
+		Weapon_Base wpn = Weapon_Base.Cast(item.GetHierarchyParent());
+		if (mag && wpn)
+		{
+			if (GetWeaponManager().CanDetachMagazine(wpn, mag))
+			{
+				//Print("[inv] PlayerBase.CanRedirectToWeaponManager OK, can detach mag=" + mag + " from wpn=" + wpn);
+				isActionPossible = true;
+			}
+			else
+			{
+				//Print("[inv] PlayerBase.CanRedirectToWeaponManager cannot detach mag=" + mag + " from wpn=" + wpn);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	// Inventory actions with redirection to weapon manager
+	override bool PredictiveTakeEntityToTargetInventory (notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		bool can_detach;
+		if (CanRedirectToWeaponManager(item,can_detach))
+		{
+			InventoryLocation il = new InventoryLocation();
+			if (can_detach && target.GetInventory().FindFreeLocationFor(item, flags, il))
+			{
+				return GetWeaponManager().DetachMagazine(il);
+			}
+			return false;
+		}
+		return super.PredictiveTakeEntityToTargetInventory(target, flags, item);
+	}
+
+	override bool PredictiveTakeEntityToInventory (FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		bool can_detach;
+		if (CanRedirectToWeaponManager(item,can_detach))
+		{
+			InventoryLocation il = new InventoryLocation();
+			if (can_detach && GetInventory().FindFreeLocationFor(item, flags, il))
+			{
+				return GetWeaponManager().DetachMagazine(il);
+			}
+			return false;
+		}
+		return super.PredictiveTakeEntityToInventory(flags, item);
+	}
+	
+	override bool PredictiveTakeEntityToTargetAttachment (notnull EntityAI target, notnull EntityAI item)
+	{
+		Weapon_Base parentWpn = Weapon_Base.Cast(target);
+		Magazine mag = Magazine.Cast(item);
+		if (parentWpn && mag)
+		{
+			if (GetWeaponManager().CanAttachMagazine(parentWpn, mag))
+				return GetWeaponManager().AttachMagazine(mag);
+
+			return false;
+		}
+		return super.PredictiveTakeEntityToTargetAttachment(target, item);
+	}
+	
+	override bool PredictiveTakeEntityToTargetAttachmentEx (notnull EntityAI target, notnull EntityAI item, int slot)
+	{
+		Weapon_Base parentWpn = Weapon_Base.Cast(target);
+		Magazine mag = Magazine.Cast(item);
+		if (parentWpn && mag)
+		{
+			if (target.CanReceiveAttachment(item,slot) && GetWeaponManager().CanAttachMagazine(parentWpn, mag))
+				return GetWeaponManager().AttachMagazine(mag);
+
+			return false;
+		}
+		return super.PredictiveTakeEntityToTargetAttachmentEx(target, item,slot);
+	}
+	
+	override bool PredictiveTakeEntityToTargetCargo (notnull EntityAI target, notnull EntityAI item)
+	{
+		bool can_detach;
+		if (CanRedirectToWeaponManager(item,can_detach))
+		{
+			InventoryLocation il = new InventoryLocation();
+			if (can_detach && target.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.CARGO, il))
+			{
+				return GetWeaponManager().DetachMagazine(il);	
+			}
+			return false;	
+		}
+		return super.PredictiveTakeEntityToTargetCargo(target,item);
+	}
+	
+	override bool PredictiveTakeEntityToTargetCargoEx (notnull CargoBase cargo, notnull EntityAI item, int row, int col)
+	{
+		bool can_detach;
+		if (CanRedirectToWeaponManager(item, can_detach))
+		{
+			if (can_detach)
+			{
+				InventoryLocation dst = new InventoryLocation;
+				dst.SetCargoAuto(cargo, item, row, col, item.GetInventory().GetFlipCargo());
+
+				return GetWeaponManager().DetachMagazine(dst);
+			}
+			return false;
+		}		
+		return super.PredictiveTakeEntityToTargetCargoEx (cargo, item, row, col);
+	}
+	
+	override bool PredictiveDropEntity (notnull EntityAI item)
+	{
+		bool can_detach;
+		if (CanRedirectToWeaponManager(item,can_detach))
+		{
+			if (can_detach)
+			{
+				vector m4[4];
+				Math3D.MatrixIdentity4(m4);
+				
+				//! We don't care if a valid transform couldn't be found, we just want to preferably use it instead of placing on the player
+				GameInventory.PrepareDropEntityPos(this, item, m4, false, GameConstants.INVENTORY_ENTITY_DROP_OVERLAP_DEPTH);
+				InventoryLocation il = new InventoryLocation;
+				il.SetGround(item, m4);
+				return GetWeaponManager().DetachMagazine(il);
+			}
+			return false;
+		}
+		return super.PredictiveDropEntity(item);
+	}
+	
+	override bool PredictiveSwapEntities (notnull EntityAI item1, notnull EntityAI item2)
+	{
+		ForceStandUpForHeavyItemsSwap(item1, item2);
+		//Print("PlayerBase | PredictiveSwapEntities");
+		Magazine swapmag1 = Magazine.Cast(item1);
+		Magazine swapmag2 = Magazine.Cast(item2);
+
+		if (swapmag1 && swapmag2)
+		{
+			Weapon_Base parentWpn;
+
+			if (Class.CastTo(parentWpn, swapmag1.GetHierarchyParent()))
+			{
+				if (GetWeaponManager().CanSwapMagazine(parentWpn, swapmag2))
+				{
+					Print("[inv] PlayerBase.PredictiveSwapEntities: swapping mag1=" + swapmag1 + " to parent wpn=" + parentWpn + " of mag1=" + swapmag1);
+					return GetWeaponManager().SwapMagazine(swapmag2);
+				}
+				else
+				{
+					Print("[inv] PlayerBase.PredictiveSwapEntities: can not swap magazines");
+					return false;
+				}
+			}
+
+			if (Class.CastTo(parentWpn, swapmag2.GetHierarchyParent()))
+			{
+				if (GetWeaponManager().CanSwapMagazine(parentWpn, swapmag1))
+				{
+					Print("[inv] PlayerBase.PredictiveSwapEntities: swapping mag1=" + swapmag1 + " to parent wpn=" + parentWpn + " of mag2=" + swapmag2);
+					return GetWeaponManager().SwapMagazine(swapmag1);
+				}
+				else
+				{
+					Print("[inv] PlayerBase.PredictiveSwapEntities: can not swap magazines");
+					return false;
+				}
+			}
+		}
+		
+		EntityAI item_hands;
+		EntityAI item_ground;
+		if (IsSwapBetweenHandsAndGroundLargeItem(item1,item2,item_hands,item_ground) && !m_ActionManager.GetRunningAction())
+		{
+			ActionManagerClient mngr_client;
+			CastTo(mngr_client,m_ActionManager);
+			
+			ActionTarget atrg = new ActionTarget(item_ground,null,-1,vector.Zero,-1.0);
+			if (mngr_client.GetAction(ActionSwapItemToHands).Can(this,atrg,ItemBase.Cast(item_hands)))
+			{
+				mngr_client.PerformActionStart(mngr_client.GetAction(ActionSwapItemToHands),atrg,ItemBase.Cast(item_hands));
+				return true;
+			}
+			return super.PredictiveSwapEntities(item1, item2);
+		}
+		else
+			return super.PredictiveSwapEntities(item1, item2);
+	}
+	
+	override bool PredictiveForceSwapEntities (notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		ForceStandUpForHeavyItemsSwap(item1, item2);
+
+		InventoryLocation il = new InventoryLocation;	
+		if (item1.IsHeavyBehaviour() && item1.GetInventory().GetCurrentInventoryLocation(il) && il.GetType() == InventoryLocationType.GROUND && !m_ActionManager.GetRunningAction())
+		{		
+			//Print("override bool PredictiveForceSwapEntities (notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)");
+			ActionManagerClient mngr_client;
+			CastTo(mngr_client,m_ActionManager);
+			
+			ActionTarget atrg = new ActionTarget(item1,null,-1,vector.Zero,-1.0);
+			if (mngr_client.GetAction(ActionSwapItemToHands).Can(this,atrg,ItemBase.Cast(item2)))
+			{
+				mngr_client.PerformActionStart(mngr_client.GetAction(ActionSwapItemToHands),atrg,ItemBase.Cast(item2));
+			}
+			return true;
+		}
+		else
+			return super.PredictiveForceSwapEntities(item1, item2, item2_dst);
+	}
+	
+	override void PredictiveTakeEntityToHands(EntityAI item)
+	{
+		if (item.IsHeavyBehaviour() && !m_ActionManager.GetRunningAction() && !item.GetHierarchyParent())
+		{
+			ActionManagerClient mngr_client;
+			if (CastTo(mngr_client,m_ActionManager))
+			{
+				ActionTarget atrg = new ActionTarget(item,null,-1,vector.Zero,-1.0);
+				
+				if (mngr_client.GetAction(ActionTakeItemToHands).Can(this,atrg,null))
+				{
+					mngr_client.PerformActionStart(mngr_client.GetAction(ActionTakeItemToHands),atrg,null);
+				}
+				/*).Can(this,
+				mngr_client.ActionStart(mngr_client.GetAction(ActionTakeItemToHands),mngr_client.FindActionTarget(),null);
+				return;*/
+			}
+		}
+		else
+			super.PredictiveTakeEntityToHands(item);
+	}
+
+	override bool PredictiveTakeToDst (notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		EntityAI item = src.GetItem();
+		if (item)
+		{
+			bool can_detach;
+		
+			if (CanRedirectToWeaponManager(item,can_detach))
+			{
+				if (can_detach)
+				{
+					return GetWeaponManager().DetachMagazine(dst);	
+				}
+				return false;	
+			}
+			return super.PredictiveTakeToDst(src,dst);
+		}
+		return false;
+	}
+	
+	bool IsSwapBetweenHandsAndGroundLargeItem(notnull EntityAI item1, notnull EntityAI item2, out EntityAI item_hands, out EntityAI item_ground)
+	{
+		InventoryLocation il = new InventoryLocation;
+		if (item1.GetInventory().GetCurrentInventoryLocation(il) && il.GetType() == InventoryLocationType.HANDS)
+			item_hands = item1;
+		if (item2.GetInventory().GetCurrentInventoryLocation(il) && il.GetType() == InventoryLocationType.HANDS)
+			item_hands = item2;
+		if (item1.GetInventory().GetCurrentInventoryLocation(il) && il.GetType() == InventoryLocationType.GROUND)
+			item_ground = item1;
+		if (item2.GetInventory().GetCurrentInventoryLocation(il) && il.GetType() == InventoryLocationType.GROUND)
+			item_ground = item2;
+		
+		return item_hands && item_ground && item_ground.IsHeavyBehaviour();
+	}
+	
+	//! Dynamic hair hiding
+	void SetHairLevelToHide(int level, bool state, bool was_debug = false)
+	{
+		if (was_debug && GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+			return;
+		
+		if (!m_CharactersHead)
+		{
+			ErrorEx("No valid head detected on character!");
+			return;
+		}
+		
+		if (level == -1) //hide/show ALL
+		{
+			m_HideHairAnimated = !m_HideHairAnimated;
+			for (int i = 0; i < m_CharactersHead.m_HeadHairSelectionArray.Count(); ++i)
+			{
+				//m_CharactersHead.SetSimpleHiddenSelectionState(i,m_HideHairAnimated);
+				SelectionTranslation stt = SelectionTranslation.Cast(m_CharactersHead.m_HeadHairHidingStateMap.Get(i));
+				stt.SetSelectionState(m_HideHairAnimated);
+				m_CharactersHead.m_HeadHairHidingStateMap.Set(i, stt);
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+				PluginDiagMenuClient diagmenu = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+				diagmenu.m_HairHidingStateMap.Set(i, m_HideHairAnimated);
+#endif
+#endif
+			}
+		}
+		else //hide/show selected level only
+		{
+			bool switchState;
+			if (was_debug)
+			{
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+				PluginDiagMenuClient diagmenuu = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+				switchState = !diagmenuu.m_HairHidingStateMap.Get(level);
+				diagmenuu.m_HairHidingStateMap.Set(level, switchState);
+#endif
+#endif
+			}
+			else
+			{
+				switchState = !state;
+			}
+			//m_CharactersHead.SetSimpleHiddenSelectionState(level,switchState);
+			stt = SelectionTranslation.Cast(m_CharactersHead.m_HeadHairHidingStateMap.Get(level));
+			stt.SetSelectionState(switchState);
+			m_CharactersHead.m_HeadHairHidingStateMap.Set(level, stt); //nescessary?
+		}
+	}
+	
+	void HideHairSelections(ItemBase item, bool state)
+	{
+		if (!item || !item.GetHeadHidingSelection() || !m_CharactersHead)
+			return;
+		
+		int slot_id; //item currently attached (or detaching from) here
+		string slot_name; //item currently attached (or detaching from) here
+		string str
+		int idx = 0;
+		int i;
+		int count;
+		item.GetInventory().GetCurrentAttachmentSlotInfo(slot_id,slot_name);
+		
+		if (item.HidesSelectionBySlot())
+		{
+			count = item.GetInventory().GetSlotIdCount();
+			for (i = 0; i < count; i++)
+			{
+				if (item.GetInventory().GetSlotId(i) == slot_id)
+				{
+					str = item.GetHeadHidingSelection().Get(i);
+					idx = m_CharactersHead.m_HeadHairSelectionArray.Find(str);
+					if (idx != -1)
+						SetHairLevelToHide(idx,state);
+					#ifdef DEVELOPER
+					else
+						Debug.Log("No valid selection '" + str + "' found on head of " + GetType() + ". Verify the p3d, model config, and the 'HAIR_HIDING_SELECTIONS' macro in basicDefines.");
+					#endif
+				}
+			}
+		}
+		else
+		{
+			count = item.GetHeadHidingSelection().Count();
+			for (i = 0; i < count; i++)
+			{
+				str = item.GetHeadHidingSelection().Get(i);
+				idx = m_CharactersHead.m_HeadHairSelectionArray.Find(str);
+				if (idx != -1)
+					SetHairLevelToHide(idx,state);
+				#ifdef DEVELOPER
+				else
+					Debug.Log("No valid selection '" + str + "' found on head of " + GetType() + ". Verify the p3d, model config, and the 'HAIR_HIDING_SELECTIONS' macro in basicDefines.");
+				#endif
+			}
+		}
+		UpdateHairSelectionVisibility();
+	}
+	
+	void UpdateHairSelectionVisibility(bool was_debug = false)
+	{
+		if (!m_CharactersHead)
+			return;
+		bool shown;
+		bool exception_hidden = false;
+		int i;
+		int count = m_CharactersHead.m_HeadHairHidingStateMap.Count();
+		SelectionTranslation stt;
+		
+		//hide/show beard
+		if (IsMale() && m_CharactersHead.GetBeardIndex() > -1 && !was_debug)
+		{
+			SetHairLevelToHide(m_CharactersHead.GetBeardIndex(),GetLifeSpanState() != LifeSpanState.BEARD_EXTRA);
+		}
+		
+		//show all first
+		for (i = 0; i < count; i++)
+		{
+			m_CharactersHead.SetSimpleHiddenSelectionState(i,true);
+		}
+		//then carve it up
+		for (i = 0; i < count; i++)
+		{
+			stt = m_CharactersHead.m_HeadHairHidingStateMap.Get(i);
+			shown = stt.GetSelectionState();
+			if (!shown)
+			{
+				if (/*IsMale() && */!m_CharactersHead.IsHandlingException())
+				{
+					m_CharactersHead.SetSimpleHiddenSelectionState(i,shown);
+					UpdateTranslatedSelections(stt);
+					//Print("hidden idx: " + i);
+				}
+				else
+				{
+					exception_hidden = true;
+				}
+			}
+		}
+		
+		//exceptions handled differently; hides hair
+		if (exception_hidden)
+		{
+			m_CharactersHead.SetSimpleHiddenSelectionState(m_CharactersHead.GetHairIndex(),false);
+			if (IsMale())
+				m_CharactersHead.SetSimpleHiddenSelectionState(m_CharactersHead.GetBeardIndex(),false);
+		}
+	}
+	
+	void UpdateTranslatedSelections(SelectionTranslation stt)
+	{
+		int index;
+		array<int> translatedSelectinosArray = stt.GetTranslatedSelections();
+		for (int i = 0; i < translatedSelectinosArray.Count(); i++)
+		{
+			index = translatedSelectinosArray.Get(i);
+			//if (index > -1)
+				m_CharactersHead.SetSimpleHiddenSelectionState(index,false); //safe this way, only hiding/carving from shown parts
+		}
+	}
+	
+	//! helper method for re-checking hairhiding on character load
+	void CheckHairClippingOnCharacterLoad()
+	{
+		ItemBase headgear = ItemBase.Cast(GetInventory().FindAttachment(InventorySlots.HEADGEAR));
+		ItemBase mask = ItemBase.Cast(GetInventory().FindAttachment(InventorySlots.MASK));
+		
+		HideHairSelections(headgear,true);
+		HideHairSelections(mask,true);
+	}
+	
+	bool IsNVGWorking()
+	{
+		return m_ActiveNVTypes && m_ActiveNVTypes.Count() > 0;
+	}
+	
+	bool IsNVGLowered()
+	{
+		return m_LoweredNVGHeadset;
+	}
+	
+	int GetNVType()
+	{
+		if (!m_ActiveNVTypes || m_ActiveNVTypes.Count() == 0)
+		{
+			return NVTypes.NONE;
+		}
+		else
+		{
+			return m_ActiveNVTypes[m_ActiveNVTypes.Count() - 1];
+		}
+	}
+	
+	array<int> GetNVTypesArray()
+	{
+		return m_ActiveNVTypes;
+	}
+	
+	//!Deprecated
+	void SetNVGWorking(bool state)
+	{
+		//Deprecated, below is for legacy's sake
+		AddActiveNV(NVTypes.NV_GOGGLES);
+	}
+	
+	void SetNVGLowered(bool state)
+	{
+		m_LoweredNVGHeadset = state;
+	}
+	
+	void AddActiveNV(int type)
+	{
+		if (!m_ActiveNVTypes || (GetGame().IsMultiplayer() && GetGame().IsServer()))
+		{
+			#ifdef DEVELOPER
+				Error("AddActiveNV | illegal server-side call!");
+			#endif
+			
+			return;
+		}
+		
+		if (m_ActiveNVTypes.Find(type) == -1) //TODO - set instead?
+			m_ActiveNVTypes.Insert(type);
+	}
+	
+	void RemoveActiveNV(int type)
+	{
+		if (!m_ActiveNVTypes || (GetGame().IsMultiplayer() && GetGame().IsServer()))
+		{
+			#ifdef DEVELOPER
+				Error("RemoveActiveNV | illegal server-side call!");
+			#endif
+			
+			return;
+		}
+		
+		if (m_ActiveNVTypes.Find(type) != -1) //TODO - set instead?
+			m_ActiveNVTypes.RemoveItem(type);
+	}
+	
+	void ResetActiveNV()
+	{
+		m_ActiveNVTypes.Clear();
+	}
+	
+#ifdef DEVELOPER
+	override string GetDebugText()
+	{
+		string text = super.GetDebugText();
+		/*
+		text += "GetMovementTimeToStrafeJog:" +  CfgGameplayHandler.GetMovementTimeToStrafeJog() + "\n";
+		text += "GetMovementTimeToStrafeSprint:" +  CfgGameplayHandler.GetMovementTimeToStrafeSprint()+ "\n";
+		
+		SHumanCommandMoveSettings moveSettings = GetDayZPlayerType().CommandMoveSettingsW();
+		if (moveSettings)
+		{
+			text += "hmcs.m_fDirFilterTimeout:" + moveSettings.m_fDirFilterTimeout + "\n";
+			text += "hmcs.m_fDirFilterSprintTimeout:" + moveSettings.m_fDirFilterSprintTimeout+ "\n";
+		}*/
+		
+		return text;
+	}
+
+	
+	
+	void DEBUGRotateNVG()
+	{
+		NVGoggles nvg;
+		
+		if (FindAttachmentBySlotName("Eyewear"))
+		{
+			nvg = NVGoggles.Cast(FindAttachmentBySlotName("Eyewear").FindAttachmentBySlotName("NVG"));
+		}
+		else if (FindAttachmentBySlotName("Headgear"))
+		{
+			nvg = NVGoggles.Cast(FindAttachmentBySlotName("Headgear").FindAttachmentBySlotName("NVG"));
+		}
+		
+		if (nvg)
+		{
+			nvg.RotateGoggles(nvg.m_IsLowered);
+		}
+	}
+#endif
+	
+	void AdjustBandana(EntityAI item, string slot_name)
+	{
+		if (Bandana_ColorBase.Cast(item))
+		{
+			if (slot_name == "Headgear")
+			{
+				item.SetSimpleHiddenSelectionState(0,1);
+				item.SetSimpleHiddenSelectionState(1,0);
+			}
+			else if (slot_name == "Mask")
+			{
+				item.SetSimpleHiddenSelectionState(0,0);
+				item.SetSimpleHiddenSelectionState(1,1);
+			}
+		}
+	}
+	
+	//client-side
+	void UpdateCorpseStateVisual()
+	{
+		//Print("---Prettying up corpses... | " + GetGame().GetTime() + " | " + this + " | " + GetType() + "---");
+		//Print("m_DecayedTexture = " + m_DecayedTexture);
+		int state = Math.AbsInt(m_CorpseState);//negative sign denotes a special meaning(state was forced to a live player), but we are only intetested in the positive value here
+		if (state == PlayerConstants.CORPSE_STATE_DECAYED)
+		{
+			EntityAI bodypart;
+			ItemBase item;
+			
+			string path;
+			int idx;
+			int slot_id;
+			array<string> bodyparts = {"Gloves","Body","Legs","Feet"};
+			
+			for (int i = 0; i < bodyparts.Count(); i++)
+			{
+				slot_id = InventorySlots.GetSlotIdFromString(bodyparts.Get(i));
+				bodypart = GetInventory().FindPlaceholderForSlot(slot_id);
+				item = ItemBase.Cast(GetInventory().FindAttachment(slot_id));
+				
+				if (bodypart)
+				{
+					path = "cfgVehicles " + bodypart.GetType();
+					idx = bodypart.GetHiddenSelectionIndex("personality");
+					if (idx > -1)
+					{
+						bodypart.SetObjectTexture(idx,m_DecayedTexture);
+					}
+				}
+				if (item)
+				{
+					path = "cfgVehicles " + item.GetType();
+					idx = item.GetHiddenSelectionIndex("personality");
+					if (idx > -1)
+					{
+						item.SetObjectTexture(idx,m_DecayedTexture);
+					}
+				}
+			}
+			
+			SetFaceTexture(m_DecayedTexture);
+		}
+	}
+	
+	void SetDecayEffects(int effect = -1)
+	{
+		int boneIdx = GetBoneIndexByName("Spine2");
+		Particle p;
+		
+		switch (effect)
+		{
+			case PlayerConstants.CORPSE_STATE_MEDIUM :
+				//play medium sound/flies particle
+				if (!m_FliesEff)
+					m_FliesEff = new EffSwarmingFlies();
+				
+				if (m_FliesEff && !SEffectManager.IsEffectExist(m_FliesIndex))
+				{
+					m_FliesEff.SetDecalOwner(this);
+					m_FliesIndex = SEffectManager.PlayOnObject(m_FliesEff, this, "0 0.25 0");
+					p = m_FliesEff.GetParticle();
+					AddChild(p, boneIdx);
+					if (!m_SoundFliesEffect)
+					{
+						PlaySoundSetLoop(m_SoundFliesEffect, "Flies_SoundSet", 1.0, 1.0);
+//						ErrorEx("DbgFlies | CORPSE_STATE_MEDIUM | m_SoundFliesEffect created! " + m_SoundFliesEffect,ErrorExSeverity.INFO);
+					}
+				}
+			break;
+			case PlayerConstants.CORPSE_STATE_DECAYED :
+				//play serious sound/flies particle
+				if (!m_FliesEff)
+					m_FliesEff = new EffSwarmingFlies();
+				
+				if (m_FliesEff && !SEffectManager.IsEffectExist(m_FliesIndex))
+				{
+					m_FliesEff.SetDecalOwner(this);
+					m_FliesIndex = SEffectManager.PlayOnObject(m_FliesEff, this, "0 0.25 0");
+					p = m_FliesEff.GetParticle();
+					AddChild(p, boneIdx);
+					if (!m_SoundFliesEffect)
+					{
+						PlaySoundSetLoop(m_SoundFliesEffect, "Flies_SoundSet", 1.0, 1.0);
+//						ErrorEx("DbgFlies | CORPSE_STATE_DECAYED | m_SoundFliesEffect created! " + m_SoundFliesEffect,ErrorExSeverity.INFO);
+					}
+				}
+			break;
+			//remove
+			default:
+				SEffectManager.DestroyEffect(m_FliesEff);
+//				ErrorEx("DbgFlies | StopSoundSet | exit 3 ",ErrorExSeverity.INFO);
+				StopSoundSet(m_SoundFliesEffect);
+			break;
+		}
+	}
+	
+	void PreloadDecayTexture()
+	{
+		int idx;
+		int slot_id;
+		
+		idx = GetHiddenSelectionIndex("decay_preload");
+		if (idx > -1)
+		{
+			SetObjectTexture(idx,m_DecayedTexture);
+			//Print("'decay_preload'" + m_DecayedTexture +" loaded on " + GetModelName());
+		}
+		else
+		{
+			//Print("No 'decay_preload' selection found on " + this);
+		}
+	}
+	
+	void SetLastMapInfo(float scale, vector pos)
+	{
+		m_LastMapScale = scale;
+		m_LastMapPos = pos;
+	}
+	
+	bool GetLastMapInfo(out float scale, out vector pos)
+	{
+		scale = m_LastMapScale;
+		pos = m_LastMapPos;
+		
+		return m_LastMapScale != -1.0;
+	}
+	
+	override bool PhysicalPredictiveDropItem(EntityAI entity, bool heavy_item_only = true)
+	{
+		vector dir;
+		ItemBase item = ItemBase.Cast(entity);
+		
+		if (GetItemInHands() == item) //from hands
+		{
+			//HOTFIX
+			return PredictiveDropEntity(item);
+
+			if (entity.ConfigGetString("physLayer") != "item_large" && heavy_item_only)
+			{
+				return PredictiveDropEntity(item);
+			}
+			else
+			{
+				dir = GetOrientation();
+				//item.m_ItemBeingDropped = true;
+				return GetHumanInventory().ThrowEntity(item,dir,0);
+			}
+		}
+		else //from anywhere else
+		{
+			ActionManagerClient mngr_client;
+			if (CastTo(mngr_client,m_ActionManager))
+			{
+				ActionTarget atrg = new ActionTarget(null, null, -1, vector.Zero, -1);
+				if (mngr_client.GetAction(ActionDropItemSimple).Can(this,atrg,item))
+				{
+					//Param1<bool> p1 = new Param1<bool>(false);
+					//p1.param1 = heavy_item_only;
+					mngr_client.PerformActionStart(mngr_client.GetAction(ActionDropItemSimple),atrg,item/*,p1*/);
+					return true;
+				}
+				return false;
+			}
+			else
+				return true;
+		}
+	}
+	
+	override void SetProcessUIWarning(bool state)
+	{
+		m_ProcessUIWarning = state;
+	}
+	
+	void dmgDebugPrint(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		/*Print("ProjectileDebugging | Damage Health: " + damageResult.GetDamage(dmgZone,"Health") + " | Component: " + component + " | Zone: " + dmgZone + "| Timestamp: " + GetSimulationTimeStamp());
+		Print("ProjectileDebugging | speedCoef: " + speedCoef);
+		Print("ProjectileDebugging | GetWorldTime(): " + GetWorldTime());
+		Print("-----------------------------------------------");*/
+	}
+	
+	//Use this method to process additionnal dmg to legs specifically (must use the dmg system to fire relevant events)
+	//Legzone is a dummy to inflict damage once and NOT transfer damage to other zones. All leg zones will drop to 0 anyway
+	void DamageAllLegs(float inputDmg)
+	{
+		array<string> legZones = new array<string>;
+		legZones.Insert("LeftLeg");
+		legZones.Insert("RightLeg");
+		legZones.Insert("RightFoot");
+		legZones.Insert("LeftFoot");
+		
+		for (int i = 0; i < legZones.Count(); i++)
+		{
+			DecreaseHealth(legZones[i],"",inputDmg);
+		}
+	}
+	
+	//! tries to hide item in player's hands, some exceptions for various movement states
+	void TryHideItemInHands(bool hide, bool force = false)
+	{
+		if (!hide && ((!IsSwimming() && !IsClimbingLadder() && !IsInVehicle() && !AnimCommandCheck(HumanMoveCommandID.CommandSwim | HumanMoveCommandID.CommandLadder | HumanMoveCommandID.CommandVehicle)) || force))
+		{
+			GetItemAccessor().HideItemInHands(false);
+		}
+		else
+		{
+			GetItemAccessor().HideItemInHands(true);
+		}
+	}
+	
+	//!
+	bool CheckAndExecuteStackSplit(FindInventoryLocationType flags, notnull EntityAI item, notnull EntityAI target)
+	{
+		float stackable = item.GetTargetQuantityMax();
+		if (!(stackable == 0 || stackable >= item.GetQuantity()))
+		{
+			InventoryLocation il = new InventoryLocation;
+			if (target && target.GetInventory().FindFreeLocationFor(item, flags, il))
+			{
+				ItemBase itemB;
+				if (CastTo(itemB, item))
+				{
+					itemB.SplitIntoStackMaxToInventoryLocationClient(il);
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	bool CheckAndExecuteStackSplitToInventoryLocation(InventoryLocation il, notnull EntityAI item)
+	{
+		float stackable = item.GetTargetQuantityMax();
+		if (!(stackable == 0 || stackable >= item.GetQuantity()))
+		{
+			ItemBase itemB;
+			if (CastTo(itemB, item))
+			{
+				itemB.SplitIntoStackMaxToInventoryLocationClient(il);
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override protected bool TakeEntityToInventoryImpl(InventoryMode mode, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(flags, item, this))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2Inv(SPLIT) item=" + GetDebugName(item));
+			return true;
+		}
+		
+		return super.TakeEntityToInventoryImpl(mode, flags, item);
+	}
+	
+	override protected bool TakeEntityToCargoImpl(InventoryMode mode, notnull EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(FindInventoryLocationType.CARGO, item, this))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2Cgo(SPLIT) item=" +GetDebugName(item));
+			return true;
+		}
+		
+		return super.TakeEntityToCargoImpl(mode, item);
+	}
+	
+	override protected bool TakeEntityAsAttachmentImpl(InventoryMode mode, notnull EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(FindInventoryLocationType.ATTACHMENT, item, this))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2Att(SPLIT) item=" + GetDebugName(item));
+			return true;
+		}
+		
+		return super.TakeEntityAsAttachmentImpl(mode, item);
+	}
+	
+	override void TakeEntityToHandsImpl(InventoryMode mode, EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(FindInventoryLocationType.HANDS, item, this))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2Hands(SPLIT) item=" + GetDebugName(item));
+			return;
+		}
+		
+		super.TakeEntityToHandsImpl(mode, item);
+	}
+	
+	override protected bool TakeEntityToTargetInventoryImpl(InventoryMode mode, notnull EntityAI target, FindInventoryLocationType flags, notnull EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(flags, item, target))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2TargetInv(SPLIT) item=" + GetDebugName(item));
+			return true;
+		}
+		
+		return super.TakeEntityToTargetInventoryImpl(mode, target, flags, item);
+	}
+	
+	override protected bool TakeEntityToTargetCargoImpl(InventoryMode mode, notnull EntityAI target, notnull EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(FindInventoryLocationType.CARGO, item, target))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2TargetCgo(SPLIT) item=" + GetDebugName(item));
+			return true;
+		}
+		
+		return super.TakeEntityToTargetCargoImpl(mode, target, item);
+	}
+	
+	override protected bool TakeEntityToTargetAttachmentImpl(InventoryMode mode, notnull EntityAI target, notnull EntityAI item)
+	{
+		if (CheckAndExecuteStackSplit(FindInventoryLocationType.ATTACHMENT, item, target))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2TargetAtt(SPLIT) item=" + GetDebugName(item));
+			return true;
+		}
+		
+		return super.TakeEntityToTargetAttachmentImpl(mode, target, item);
+	}
+	
+	override protected bool TakeToDstImpl(InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (CheckAndExecuteStackSplitToInventoryLocation(dst, dst.GetItem()))
+		{
+			if (LogManager.IsSyncLogEnable()) syncDebugPrint("[inv] " + GetDebugName(this) + " STS=" + GetSimulationTimeStamp() + " Take2Dst(SPLIT) item=" + GetDebugName(dst.GetItem()));
+			return true;
+		}
+		
+		return super.TakeToDstImpl(mode, src, dst);
+	}
+	
+	override vector GetCenter()
+	{
+		return GetBonePositionWS(GetBoneIndexByName("spine3"));
+	}
+	
+	
+	// contaminated areas - temp stuff 
+	void ContaminatedParticleAdjustment()
+	{
+		if (GetCommand_Move() && m_ContaminatedAroundPlayer && m_ContaminatedAroundPlayerTiny)
+		{
+			float playerSpeed = GetCommand_Move().GetCurrentMovementSpeed();
+			//Print(playerSpeed);
+			
+			// 1 - prone, crouch 
+			// 2 - jog 
+			// 3 - sprint 
+			float particleLifetime = 5.25;
+			float particleSpeed = 0.25;
+			if (playerSpeed >= 1)
+			{
+				particleLifetime = 3.5;
+				particleSpeed = 3.25;
+			}
+			if (playerSpeed >= 2)
+			{
+				particleLifetime = 2.5;
+				particleSpeed = 5.25;
+			}
+			if (playerSpeed >= 3)
+			{
+				particleLifetime = 1.5;
+				particleSpeed = 8.25;
+			}
+			m_ContaminatedAroundPlayer.SetParameter(0, EmitorParam.LIFETIME, particleLifetime);
+			m_ContaminatedAroundPlayer.SetParameter(1, EmitorParam.LIFETIME, particleLifetime);
+			m_ContaminatedAroundPlayer.SetParameter(2, EmitorParam.LIFETIME, particleLifetime);
+			m_ContaminatedAroundPlayer.SetParameter(3, EmitorParam.LIFETIME, particleLifetime);
+			
+			m_ContaminatedAroundPlayerTiny.SetParameter(0, EmitorParam.VELOCITY, particleSpeed);
+			vector transform[4];
+			GetTransform(transform);
+			m_ContaminatedAroundPlayer.SetTransform(transform);
+			m_ContaminatedAroundPlayerTiny.SetTransform(transform);
+		}
+	}
+	
+	void HandleGlassesEffect()
+	{
+		if (!IsControlledPlayer())
+			return;
+		int i;
+		
+		if (m_ProcessRemoveGlassesEffects)
+		{
+			for (i = 0; i < m_ProcessRemoveGlassesEffects.Count(); i++)
+			{
+				PPERequesterBank.GetRequester(m_ProcessRemoveGlassesEffects[i]).Stop();
+			}
+			m_ProcessRemoveGlassesEffects.Clear();
+		}
+		
+		if (m_ProcessAddGlassesEffects)
+		{
+			for (i = 0; i < m_ProcessAddGlassesEffects.Count(); i++)
+			{
+				PPERequesterBank.GetRequester(m_ProcessAddGlassesEffects[i]).Start();
+			}
+			m_ProcessAddGlassesEffects.Clear();
+		}
+	}
+	
+	override void AddArrow(Object arrow, int componentIndex, vector closeBonePosWS, vector closeBoneRotWS)
+	{
+		CachedObjectsArrays.ARRAY_STRING.Clear();
+		GetActionComponentNameList(componentIndex, CachedObjectsArrays.ARRAY_STRING, LOD.NAME_FIRE);
+		
+		int pivot = componentIndex;
+		int newPivot = -1;
+		string compName;
+		for (int i = 0; i < CachedObjectsArrays.ARRAY_STRING.Count() && newPivot == -1; i++)
+		{
+			compName = CachedObjectsArrays.ARRAY_STRING.Get(i);
+			newPivot = GetBoneIndexByName(compName);
+			
+		}
+		
+		if (newPivot != -1)
+		{
+			pivot = newPivot;
+			
+		}
+		
+		vector parentTransMat[4];
+		vector arrowTransMat[4];
+		
+		arrow.GetTransform(arrowTransMat);
+		
+		if (pivot == -1)
+		{
+			GetTransformWS(parentTransMat);
+		}
+		else
+		{
+			vector rotMatrix[3];
+			Math3D.YawPitchRollMatrix(closeBoneRotWS * Math.RAD2DEG,rotMatrix);
+			
+			parentTransMat[0] = rotMatrix[0];
+			parentTransMat[1] = rotMatrix[1];
+			parentTransMat[2] = rotMatrix[2];
+			parentTransMat[3] = closeBonePosWS;
+		}
+		
+		Math3D.MatrixInvMultiply4(parentTransMat, arrowTransMat, arrowTransMat);
+		Math3D.MatrixOrthogonalize4(arrowTransMat);
+		arrow.SetTransform(arrowTransMat);
+		
+		AddChild(arrow, pivot);
+		
+		#ifdef SERVER
+		// creating bleeding source
+		BleedingSourcesManagerServer bleedingManager = GetBleedingManagerServer();
+		if (bleedingManager)
+		{
+			if (!bleedingManager.AttemptAddBleedingSourceBySelection(compName))
+				bleedingManager.AttemptAddBleedingSourceBySelection("Pelvis");//fallback, if we can't attach bleeding source to the fallback location because there already is another one, it's fine, we are just trying make sure there is at least one
+		}
+		#endif
+	}
+	
+	override bool IsManagingArrows()
+	{
+		return true;
+	}	
+	
+	string GetCachedName()
+	{
+		return m_CachedPlayerName;
+	}
+	
+	string GetCachedID()
+	{
+		return m_CachedPlayerID;
+	}
+}
+
+
+#ifdef DEVELOPER
+
+PlayerBase _player;
+#endif
diff --git a/scripts/4_World/DayZ/Entities/ManBase/PlayerBase/AITargetCallbacksPlayer.c b/scripts/4_World/DayZ/Entities/ManBase/PlayerBase/AITargetCallbacksPlayer.c
new file mode 100644
index 0000000000000000000000000000000000000000..326b37217578e7d2318b998f794b7c2206e848dc
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/PlayerBase/AITargetCallbacksPlayer.c
@@ -0,0 +1,134 @@
+class AITargetCallbacksPlayer : AITargetCallbacks
+{
+	void AITargetCallbacksPlayer(PlayerBase pPlayer)
+	{
+		m_Player = pPlayer;
+		
+		m_iHeadBoneIndex = m_Player.GetBoneIndexByName("Head");
+		m_iChestBoneIndex = m_Player.GetBoneIndexByName("Spine3");
+	}
+	
+	override vector GetHeadPositionWS() 
+	{ 
+		if (m_iHeadBoneIndex != -1)
+			return m_Player.GetBonePositionWS(m_iHeadBoneIndex);
+		else
+			return m_Player.GetPosition() + "0 1.7 0";
+	}
+	
+	override vector GetVisionPointPositionWS(EntityAI pApplicant) 
+	{ 
+		DayZInfected infected = DayZInfected.Cast(pApplicant);
+		if (infected)
+		{
+			DayZInfectedInputController ic = infected.GetInputController();
+			if (ic)
+			{
+				int mindState = ic.GetMindState();
+				if (mindState >= DayZInfectedConstants.MINDSTATE_ALERTED)
+				{
+					return GetHeadPositionWS();
+				}
+				else
+				{
+					if (m_iChestBoneIndex != -1)
+						return m_Player.GetBonePositionWS(m_iChestBoneIndex);
+				}				
+			}
+		}
+		
+		return m_Player.GetPosition() + "0 1 0";
+	}
+	
+	override float GetMaxVisionRangeModifier(EntityAI pApplicant)
+	{ 
+		HumanMovementState state = new HumanMovementState();
+		m_Player.GetMovementState(state);
+		
+		float mod = 1.0;
+		float speedCoef = PlayerConstants.AI_VISIBILITY_RUN;
+		float stanceCoef = PlayerConstants.AI_VISIBILITY_STANDING;
+		float playerVisCoef = 1.0; //Use disabled since 1.12
+		
+		//! player speed mofifications
+		switch (AITargetCallbacksPlayer.StanceToMovementIdxTranslation(state))
+		{
+			case DayZPlayerConstants.MOVEMENTIDX_WALK:
+				speedCoef = PlayerConstants.AI_VISIBILITY_WALK;
+				break;
+				
+			case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+				speedCoef = PlayerConstants.AI_VISIBILITY_IDLE;
+				break;
+		}
+		
+		//! stance modification
+		switch (state.m_iStanceIdx)
+		{
+			case DayZPlayerConstants.STANCEIDX_CROUCH:
+			case DayZPlayerConstants.STANCEIDX_RAISEDCROUCH:
+				stanceCoef = PlayerConstants.AI_VISIBILITY_CROUCH;
+				break;
+				
+			case DayZPlayerConstants.STANCEIDX_PRONE:
+			case DayZPlayerConstants.STANCEIDX_RAISEDPRONE:
+				stanceCoef = PlayerConstants.AI_VISIBILITY_PRONE;
+				break;
+		}
+		
+		//! mean value of the coefs
+		mod = (speedCoef + stanceCoef) / 2;
+		
+		return mod;
+	}
+	
+	//! Translates players speed (idx) and corrects it by current stance
+	//! used mainly for visibility/audibility of player to AI
+	static int StanceToMovementIdxTranslation(HumanMovementState pState)
+	{
+		int movementSpeed = 0;
+
+		switch (pState.m_iStanceIdx)
+		{
+		case DayZPlayerConstants.STANCEIDX_CROUCH:
+			switch (pState.m_iMovement)
+			{
+				case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+					movementSpeed = DayZPlayerConstants.MOVEMENTIDX_IDLE;
+					break;
+
+				case DayZPlayerConstants.MOVEMENTIDX_WALK:
+				case DayZPlayerConstants.MOVEMENTIDX_RUN:
+					movementSpeed = DayZPlayerConstants.MOVEMENTIDX_WALK;
+					break;
+
+				case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+					movementSpeed = DayZPlayerConstants.MOVEMENTIDX_CROUCH_RUN;
+					break;
+			}
+			break;
+
+		case DayZPlayerConstants.STANCEIDX_PRONE:
+			switch (pState.m_iMovement)
+			{
+				case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+					movementSpeed = DayZPlayerConstants.MOVEMENTIDX_IDLE;
+					break;
+
+				default:
+					movementSpeed = DayZPlayerConstants.MOVEMENTIDX_WALK;
+					break;
+			}
+			break;
+
+		default:
+			movementSpeed = pState.m_iMovement;
+		}
+		
+		return movementSpeed;
+	}
+	
+	private PlayerBase m_Player;
+	private int m_iHeadBoneIndex;
+	private int m_iChestBoneIndex;
+}
diff --git a/scripts/4_World/DayZ/Entities/ManBase/PlayerBase/SurvivorBase.c b/scripts/4_World/DayZ/Entities/ManBase/PlayerBase/SurvivorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff3c683ed8280faaad9b27ecc333ba4fba26ee6a
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/PlayerBase/SurvivorBase.c
@@ -0,0 +1,7 @@
+class SurvivorBase extends PlayerBaseClient
+{
+	override int GetHideIconMask()
+	{
+		return EInventoryIconVisibility.HIDE_VICINITY;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ManBase/PlayerBaseClient.c b/scripts/4_World/DayZ/Entities/ManBase/PlayerBaseClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..22a087bf416e050a55e73d226c53ddff5a73a1b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ManBase/PlayerBaseClient.c
@@ -0,0 +1,80 @@
+class PlayerBaseClient extends PlayerBase
+{	
+	static ScriptedLightBase 	m_PersonalLight;
+	static bool 				m_PersonalLightEnabledOnCurrentServer = false; // "disablePersonalLight" in server.cfg decides if this is true or false
+	static bool 				m_PersonalLightDisabledByDebug = false;
+	static bool 				m_PersonalLightIsSwitchedOn = true;
+	
+	//! Creates PL if it doesn't exist already.
+	static void CreatePersonalLight()
+	{
+		if (!m_PersonalLight && ( !GetGame().IsServer() || !GetGame().IsMultiplayer() ))
+		{
+			m_PersonalLight = ScriptedLightBase.CreateLight(PersonalLight, "0 0 0");
+		}
+	}
+	
+	/*
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(sender, rpc_type, ctx);
+		
+		switch( rpc_type )
+		{
+			case ERPCs.RPC_TOGGLE_PERSONAL_LIGHT:
+			{
+				Param1<bool> is_enabled = new Param1<bool>(false);
+				
+				if (ctx.Read(is_enabled))
+				{
+					m_PersonalLightEnabledOnCurrentServer = is_enabled.param1;
+					UpdatePersonalLight();
+				}
+				
+				break;
+			}
+		}
+	}*/
+	
+	override void OnGameplayDataHandlerSync()
+	{
+		super.OnGameplayDataHandlerSync();
+		m_PersonalLightEnabledOnCurrentServer = !CfgGameplayHandler.GetDisablePersonalLight();
+		UpdatePersonalLight();
+		UpdateHitDirectionValues();
+	}
+	
+	
+	//! Controls the ON/OFF switch of the Personal Light. PL will still shine only if the server allows it.
+	static void SwitchPersonalLight(bool state)
+	{
+		if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() )
+		{
+			m_PersonalLightIsSwitchedOn = state;
+			UpdatePersonalLight();
+		}
+	}
+	
+	//! Updates state of PL
+	static void UpdatePersonalLight()
+	{
+		string param;
+		
+		CreatePersonalLight();
+		
+		 // Allow PL unless it's disabled by debug or client-side starting parameter
+		if ( !GetCLIParam("disablePersonalLight", param) && !m_PersonalLightDisabledByDebug && m_PersonalLightIsSwitchedOn )
+		{
+			m_PersonalLight.SetEnabled(m_PersonalLightEnabledOnCurrentServer);
+		}
+		else	
+		{
+			m_PersonalLight.SetEnabled(false);
+		}
+	}
+	
+	static void UpdateHitDirectionValues()
+	{
+		HitDirectionEffectBase.CheckValues();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/RockBase.c b/scripts/4_World/DayZ/Entities/RockBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..81ad6417e55b16f1cad850a660ad86fed0d96fd9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/RockBase.c
@@ -0,0 +1,175 @@
+class RockBase : Object 
+{
+	override bool IsRock()
+	{
+		return true;
+	}
+	
+	override bool CanBeAutoDeleted()
+	{
+		return false;
+	}
+
+	int GetAmountOfDrops(ItemBase item)
+	{
+		return -1;
+	}
+	
+	/* Defines the yield of the action*/
+	void GetMaterialAndQuantityMap(ItemBase item, out map<string,int> output_map)
+	{
+		if (item == null)
+		{
+			return;
+		}
+		
+		switch (item.GetType())
+		{
+		case "Pickaxe":
+		case "SledgeHammer":
+		case "Hammer":
+		case "Mace":
+			output_map.Insert("Stone",1);
+			break;
+ 		case "PipeWrench":
+		case "Wrench":
+		case "Screwdriver":
+		case "Crowbar":
+		case "MeatTenderizer":
+			output_map.Insert("SmallStone",1);
+			break;
+		}
+	}
+
+	/*Return value defines how much damage the item will take*/
+	float GetDamageToMiningItemEachDrop(ItemBase item)
+	{
+		if (item)
+		{
+			switch (item.GetType())
+			{
+			case "SledgeHammer":
+			case "Pickaxe":
+				return 20;
+			case "Wrench":
+			case "Screwdriver":
+			case "MeatTenderizer":
+				return 25;
+			case "PipeWrench":
+			case "Crowbar":
+				return 50;
+			case "Hammer":
+			case "Mace":
+				return 40;
+			}
+		}
+
+		return 25;
+	}
+};
+
+	class Static_stone1: RockBase {};
+	class Static_stone2: RockBase {};
+	class Static_stone3: RockBase {};
+	class Static_stone4: RockBase {};
+	class Static_stone5: RockBase {};
+	class Static_rock_apart1: RockBase {};
+	class Static_rock_apart2: RockBase {};
+	class Static_rock_bright_apart1: RockBase {};
+	class Static_rock_bright_apart2: RockBase {};
+	class Static_rock_bright_monolith1: RockBase {};
+	class Static_rock_bright_monolith2: RockBase {};
+	class Static_rock_bright_monolith3: RockBase {};
+	class Static_rock_bright_monolith4: RockBase {};
+	class Static_rock_bright_spike1: RockBase {};
+	class Static_rock_bright_spike2: RockBase {};
+	class Static_rock_bright_spike3: RockBase {};
+	class Static_rock_bright_wallh1: RockBase {};
+	class Static_rock_bright_wallh2: RockBase {};
+	class Static_rock_bright_wallh3: RockBase {};
+	class Static_rock_bright_wallv: RockBase {};
+	class Static_rock_monolith1: RockBase {};
+	class Static_rock_monolith2: RockBase {};
+	class Static_rock_monolith3: RockBase {};
+	class Static_rock_monolith4: RockBase {};
+	class Static_rock_spike1: RockBase {};
+	class Static_rock_spike2: RockBase {};
+	class Static_rock_spike3: RockBase {};
+	class Static_rock_wallh1: RockBase {};
+	class Static_rock_wallh2: RockBase {};
+	class Static_rock_wallh3: RockBase {};
+	class Static_rock_wallv: RockBase {};
+	class Static_rock_stone6: RockBase{};
+	class Static_rock_stone6_moss: RockBase{};
+	class Static_rock_stone7: RockBase{};
+	class Static_rock_stone7_moss: RockBase{};
+	class Static_rock_stone8: RockBase{};
+	class Static_rock_stone8_moss: RockBase{};
+	class Static_rock_stone9: RockBase{};
+	class Static_rock_stone9_moss: RockBase{};
+	class Static_rock_stone10: RockBase{};
+	class Static_rock_stone10_moss: RockBase{};
+// 	currently unused rocks
+/*
+	
+	class Static_stone5_Trail_B: RockBase {};
+	class Static_stone5_Trail_G: RockBase {};
+	class Static_stone5_Trail_R: RockBase {};
+	class Static_stone5_Trail_Y: RockBase {};
+	class Static_stones_erosion: RockBase {};
+*/
+
+
+//jtomasik - it would be blast being able just to inherit it from RockBase, but the way static objects are handled most likely don't allow it? ask p cimo
+// obsolete
+/*class Static_r2_boulder1: RockBase
+{
+};
+class Static_r2_boulder2: RockBase
+{
+};
+class Static_small_stone_01_f: RockBase
+{
+};
+class Static_small_stone_02_f: RockBase
+{
+};
+class Static_stone_small_f: RockBase
+{
+};
+class Static_stone_small_w: RockBase
+{
+};
+class Static_bluntstone_01: RockBase
+{
+};
+class Static_bluntstone_01_lc: RockBase
+{
+};
+class Static_bluntstone_02: RockBase
+{
+};
+class Static_bluntstone_02_lc: RockBase
+{
+};
+class Static_bluntstone_03: RockBase
+{
+};
+class Static_SharpStone_01: RockBase
+{
+};
+class Static_sharpstone_01_lc: RockBase
+{
+};
+class Static_sharpstone_02: RockBase
+{
+};
+class Static_sharpstone_02_lc: RockBase
+{
+};
+class Static_sharpstone_03: RockBase
+{
+};
+class Static_sharpstone_03_lc: RockBase
+{
+};*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/BarbedWireTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/BarbedWireTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..64fca554dae0307ac7a31848153894d41ef8acb1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/BarbedWireTrigger.c
@@ -0,0 +1,87 @@
+//! DEPRECATED UNUSED prototype for damage by BarbedWire, do not use as example
+class BarbedWireTrigger : Trigger
+{
+	ItemBase 			m_ParentBarbedWire;
+	const static int	SOUNDS_COLLISION_COUNT						= 4;
+	const static int	SOUNDS_SHOCK_COUNT							= 4;
+	const static string m_SoundsCollision[SOUNDS_COLLISION_COUNT]	= {"barbedFenceCollision1", "barbedFenceCollision2", "barbedFenceCollision3", "barbedFenceCollision4"};
+	const static string m_SoundsShock[SOUNDS_SHOCK_COUNT] 			= {"electricFenceShock1", "electricFenceShock2", "electricFenceShock3", "electricFenceShock4"};
+
+	// When a player / AI touches the Barbed Wire
+	override void OnEnter( Object obj )
+	{
+		if ( g_Game.IsServer() )
+		{
+			if ( m_ParentBarbedWire )
+			{
+				if ( obj.IsInherited(PlayerBase) )
+				{
+					// When a player touches the barbed wire
+					string cfg = "CfgVehicles BarbedWire barbedWireShockEnergyConsumption";
+					float needed_energy = GetGame().ConfigGetFloat(cfg);
+					bool energy_consumed = m_ParentBarbedWire.GetCompEM().ConsumeEnergy(needed_energy);
+					PlayerBase player = PlayerBase.Cast( obj );
+					
+					if ( energy_consumed )
+					{
+						// TO DO: 
+						//		-Do electrical damage.
+						//		-Cause bleeding?
+						//		-Do some damage!
+						
+						player.MessageImportant( "*SCRATCH and ELECTROCUTION*" );
+						
+						// Play sound
+						SoundCollision();
+						SoundElectricShock();
+					}
+					else
+					{
+						// TO DO: 
+						//		-Cause bleeding?
+						//		-Do some damage!
+						
+						player.MessageImportant( "*SCRATCH*" );
+						
+						// Play sound
+						SoundCollision();
+					}
+				}
+				else
+				{
+					// When an AI Agent touches the barbed wire
+					if ( obj.IsInherited(ManBase) )
+					{
+						ManBase AI_unit = ManBase.Cast( obj );
+						AI_unit.SetHealth("", "", 0);
+					}
+				}
+			}
+		}
+	}
+	
+	// Sets parent object for this trigger
+	void SetParentObject( ItemBase wire )
+	{
+		if ( g_Game.IsServer() )
+		{
+			m_ParentBarbedWire = wire;
+		}
+	}
+
+	// Plays an electric shock sound
+	void SoundElectricShock()
+	{
+		int random_index = Math.RandomInt(0, SOUNDS_SHOCK_COUNT);
+		string sound_type = m_SoundsShock[random_index];
+		PlaySound(sound_type, 50);
+	}
+	
+	// Plays a collision sound
+	void SoundCollision()
+	{
+		int random_index = Math.RandomInt(0, SOUNDS_COLLISION_COUNT);
+		string sound_type = m_SoundsCollision[random_index];
+		PlaySound(sound_type, 50);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/ContaminatedTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/ContaminatedTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..29d2a87964744131b7652cbe12509fc9b1d14003
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/ContaminatedTrigger.c
@@ -0,0 +1,178 @@
+// In this file you will find both Static and Dynamic contaminated area triggers
+class ContaminatedTrigger extends EffectTrigger
+{
+	const float DAMAGE_TICK_RATE = 10;//deal damage every n-th second
+	
+	// ----------------------------------------------
+	// 				TRIGGER EVENTS
+	// ----------------------------------------------
+	
+	override void OnEnterServerEvent( TriggerInsider insider )
+	{
+		super.OnEnterServerEvent( insider );
+		//Print("Entered A " + GetType());
+		if ( insider )
+		{
+			DayZCreatureAI creature = DayZCreatureAI.Cast( insider.GetObject() );
+			
+			if (creature)
+				creature.IncreaseEffectTriggerCount();
+		}
+		
+	}
+
+	override void OnLeaveServerEvent( TriggerInsider insider )
+	{
+		super.OnLeaveServerEvent( insider );
+		//Print("Left A " + GetType());
+		if ( insider )
+		{
+			DayZCreatureAI creature = DayZCreatureAI.Cast( insider.GetObject() );
+			
+			if (creature)
+				creature.DecreaseEffectTriggerCount();
+			
+		}
+	}
+	
+	override void OnEnterClientEvent( TriggerInsider insider )
+	{
+		super.OnEnterClientEvent( insider );
+	}
+	
+	override void OnLeaveClientEvent( TriggerInsider insider )
+	{
+		super.OnLeaveClientEvent( insider );
+	}
+	
+	
+	override void OnStayStartServerEvent(int nrOfInsiders)
+	{
+		m_TimeAccuStay += m_DeltaTime;
+		if (m_TimeAccuStay > DAMAGE_TICK_RATE)
+		{
+			m_DealDamageFlag = true;
+			//this is where we would normally reset the m_TimeAccuStay, but we need the value as deltaT when dealing damage to the insiders, so we reset it only after the insider update in OnStayFinishServerEvent
+		}
+
+	}
+	
+	override void OnStayFinishServerEvent()
+	{
+		if(m_DealDamageFlag)//the flag was previously set to true, the insiders have been updated at this point, reset the flag and the timer as well
+		{
+			m_TimeAccuStay = 0;
+			m_DealDamageFlag = false;
+		}
+	}
+
+	override void OnStayServerEvent(TriggerInsider insider, float deltaTime) 
+	{
+		if ( m_DealDamageFlag )
+		{
+			DayZCreatureAI creature = DayZCreatureAI.Cast( insider.GetObject());
+			if(creature && creature.m_EffectTriggerCount != 0)
+				creature.DecreaseHealth("", "", GameConstants.AI_CONTAMINATION_DMG_PER_SEC * m_TimeAccuStay / creature.m_EffectTriggerCount);// we devide by m_EffectTriggerCount for multiple trigger presence(overlapping triggers)
+		}
+	}
+	
+	override string GetAmbientSoundsetName()
+	{
+		return "ContaminatedArea_SoundSet";
+	}
+
+	
+}
+
+class ContaminatedTrigger_Dynamic : ContaminatedTrigger
+{
+	protected int m_AreaState; // Used to get the state from linked area and update effects
+	
+	void ContaminatedTrigger_Dynamic()
+	{
+		RegisterNetSyncVariableInt("m_AreaState");
+		
+		// Register in the trigger effect manager
+		m_Manager = TriggerEffectManager.GetInstance();
+		m_Manager.RegisterTriggerType( this );
+	}
+	
+	void SetAreaState( int state )
+	{
+		m_AreaState = state;
+		SetSynchDirty();
+	}
+	
+	
+	override protected void OnStayClientEvent(TriggerInsider insider, float deltaTime) 
+	{
+		//no super, overriding parent behaviour
+		if ( insider.GetObject().IsMan() )
+		{
+			PlayerBase playerInsider = PlayerBase.Cast( insider.GetObject() );
+			
+			// We will only handle the controlled player, as effects are only relevant to this player instance
+			if ( playerInsider.IsControlledPlayer() )
+			{
+				// We check if we are not in the standard LIVE state
+				bool nonDefaultState = m_AreaState > eAreaDecayStage.LIVE;
+				if ( nonDefaultState )
+				{
+					// if not we check the specific state and update local effect values
+					int localPartBirthRate;
+					if ( m_AreaState == eAreaDecayStage.DECAY_START )
+						localPartBirthRate = 20;
+					else
+						localPartBirthRate = 10;
+					
+					playerInsider.RequestTriggerEffect(this, m_PPERequester, m_AroundPartId, m_TinyPartId, GetAmbientSoundsetName(), nonDefaultState, localPartBirthRate );
+				}
+				else
+					playerInsider.RequestTriggerEffect(this, m_PPERequester, m_AroundPartId, m_TinyPartId, GetAmbientSoundsetName() );
+			}
+		}
+	}
+
+	
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		
+		// Is the controlled player inside when trigger is synchronized
+		for ( int i = 0; i < GetInsiders().Count(); i++ )
+		{
+			PlayerBase playerInsider = PlayerBase.Cast( m_insiders.Get( i ).GetObject() );
+			if ( playerInsider )
+			{
+				if ( playerInsider.IsControlledPlayer() )
+				{
+					// Update Local particle effects
+					bool nonDefaultState = m_AreaState > eAreaDecayStage.LIVE;
+					if ( nonDefaultState )
+					{
+						int localPartBirthRate;
+						if ( m_AreaState == eAreaDecayStage.DECAY_START )
+							localPartBirthRate = 20;
+						else
+							localPartBirthRate = 10;
+						
+						//Update the local effects
+						playerInsider.RequestTriggerEffect(this, m_PPERequester, m_AroundPartId, m_TinyPartId, GetAmbientSoundsetName(), nonDefaultState, localPartBirthRate, true );
+					}
+					return;
+				}
+			}
+		}
+	}
+}
+
+
+class ContaminatedTrigger_Local : ContaminatedTrigger
+{
+	override string GetAmbientSoundsetName()
+	{
+		return "";
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/CylinderTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/CylinderTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..11e7e2b56954d9130ae3b08da210204c3033aefb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/CylinderTrigger.c
@@ -0,0 +1,25 @@
+//! Trigger with cylinder shape
+class CylinderTrigger : Trigger
+{
+	override void EOnInit(IEntity other, int extra)
+	{
+		SetCollisionCylinder(1, 0.5);
+	}
+	
+#ifdef DEVELOPER
+	override protected Shape DrawDebugShape(vector pos, vector min, vector max, float radius, int color)
+	{
+		float height = max[1];
+		
+		Shape dbgShape = Debug.DrawCylinder(Vector(0, height * 0.5, 0), radius, height, color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE|ShapeFlags.DOUBLESIDE);
+		
+		vector mat[4];
+		GetTransform( mat );
+		dbgShape.CreateMatrix( mat );
+		dbgShape.SetMatrix( mat );
+		
+		dbgTargets.Insert( dbgShape );
+		return dbgShape;
+	}
+#endif
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/EffectTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/EffectTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..1b004ee4fea23774be91dd890391faf8ddd58d41
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/EffectTrigger.c
@@ -0,0 +1,194 @@
+// Base class for "Effect triggers"
+// Registers in TriggerEffectManager and handles parameter setting through cfgEffectArea.json file
+class EffectTrigger : CylinderTrigger
+{
+	int 					m_AroundPartId; // The main particles spawned around player when in trigger
+	int 					m_TinyPartId; // The smaller particles spawned around player when in trigger
+	int 					m_PPERequester; // The Post Processing used when player is in trigger
+	float 					m_DeltaTime;
+	float 					m_TimeAccuStay;
+	bool 					m_DealDamageFlag;
+	TriggerEffectManager 	m_Manager;
+	EffectArea 				m_EffectArea;
+	int						m_EffectsPriority;
+	
+	void EffectTrigger()
+	{
+		RegisterNetSyncVariableInt("m_AroundPartId");
+		RegisterNetSyncVariableInt("m_TinyPartId");
+		RegisterNetSyncVariableInt("m_PPERequester");
+		RegisterNetSyncVariableInt("m_EffectsPriority");
+		
+		m_Manager = TriggerEffectManager.GetInstance();
+		m_Manager.RegisterTriggerType( this );
+	}
+	
+	// ----------------------------------------------
+	// 				CUSTOM EVENTS
+	// ----------------------------------------------
+
+	void SetLocalEffects( int aroundPartId, int tinyPartId, int ppeRequesterIdx )
+	{
+		m_AroundPartId = aroundPartId;
+		m_TinyPartId = tinyPartId;
+		m_PPERequester = ppeRequesterIdx;
+		
+		SetSynchDirty();
+	}
+	
+	EffectArea GetEffectArea()
+	{
+		return m_EffectArea;
+	}
+	
+	void Init(EffectArea area, int priority)
+	{
+		m_EffectArea = area;
+		m_EffectsPriority = priority;
+	}
+	
+	int GetEffectsPriority()
+	{
+		return m_EffectsPriority;
+	}
+	
+	string GetAmbientSoundsetName()
+	{
+		return "";
+	}
+	
+	void SetupClientEffects(bool enable, notnull PlayerBase player)
+	{
+		if ( !m_Manager.IsPlayerInTriggerType( player, this ) )
+		{
+			if (enable)
+			{
+				player.SetContaminatedEffectEx( true, m_PPERequester, m_AroundPartId, m_TinyPartId, GetAmbientSoundsetName() );
+			}
+			else
+			{
+				player.SetContaminatedEffectEx( false, m_PPERequester );
+			}
+		}
+	}
+	
+	
+	// ----------------------------------------------
+	// 				TRIGGER EVENTS
+	// ----------------------------------------------
+	
+	override void EOnFrame(IEntity other, float timeSlice)
+	{
+		m_DeltaTime = timeSlice;
+	}
+	
+	override bool CanAddObjectAsInsider(Object object)
+	{
+		#ifdef SERVER
+		DayZCreatureAI creature = DayZCreatureAI.Cast( object );
+		if(creature)
+		{
+			return !creature.ResistContaminatedEffect();
+		}
+		else
+		{
+			PlayerBase player = PlayerBase.Cast(object);
+			return player != null;
+		}
+		#else
+		PlayerBase player = PlayerBase.Cast(object);
+		return (player && player.IsControlledPlayer());
+		#endif
+	}
+	
+	override protected void OnStayClientEvent(TriggerInsider insider, float deltaTime) 
+	{
+		super.OnStayClientEvent(insider, deltaTime);
+		PlayerBase player = PlayerBase.Cast(insider.GetObject());
+		if (player)
+			player.RequestTriggerEffect(this, m_PPERequester, m_AroundPartId, m_TinyPartId, GetAmbientSoundsetName() );
+	}
+	
+	override void OnEnterServerEvent( TriggerInsider insider )
+	{
+		super.OnEnterServerEvent( insider );
+		
+		// We don't need to test the trigger count as Modifiers handle such cases already
+		if ( insider )
+		{
+			PlayerBase playerInsider = PlayerBase.Cast( insider.GetObject() );
+			
+			if(playerInsider)
+			{
+				
+				m_Manager.OnPlayerEnter( playerInsider, this );
+			}
+
+		}
+		
+	}
+	
+	override void OnEnterClientEvent( TriggerInsider insider )
+	{
+		super.OnEnterClientEvent( insider );
+		
+		if ( insider )
+		{
+			PlayerBase playerInsider = PlayerBase.Cast( insider.GetObject() );
+			
+			// We will only handle the controlled player, as effects are only relevant to this player instance
+			if (playerInsider && playerInsider.IsControlledPlayer() )
+			{
+				//SetupClientEffects(true, playerInsider);
+				// We then handle the update of player trigger state in manager
+				m_Manager.OnPlayerEnter( playerInsider, this );
+			}
+		}
+	}
+
+	
+	override void OnLeaveServerEvent( TriggerInsider insider )
+	{
+		super.OnLeaveServerEvent( insider );
+		
+		if ( insider )
+		{
+			PlayerBase playerInsider = PlayerBase.Cast( insider.GetObject() );
+			
+			if ( playerInsider )
+				m_Manager.OnPlayerExit( playerInsider, this );
+		}
+	}
+	
+	
+	
+	override void OnLeaveClientEvent( TriggerInsider insider )
+	{
+		super.OnLeaveClientEvent( insider );
+		
+		if ( insider )
+		{
+			// Make sure you pass the set variable for PPE effect
+			// It will not remove the correct one if START and STOP don't point to the same Requester
+			PlayerBase playerInsider = PlayerBase.Cast( insider.GetObject() );
+			
+			// We will only handle the controlled player, as effects are only relevant to this player instance
+			if ( playerInsider && playerInsider.IsControlledPlayer() )
+			{
+				// We first handle the update of player trigger state in manager
+				m_Manager.OnPlayerExit( playerInsider, this );
+				//SetupClientEffects(false, playerInsider);
+			}
+		}
+	}
+	
+	// We remove from trigger update DEAD or RESISTANT entities to limit the amount of entities to update
+	override bool ShouldRemoveInsider( TriggerInsider insider )
+	{
+		return !insider.GetObject().IsAlive();
+	}
+	
+	// Used to apply the desired effect to all entities present in one trigger of the specified type
+	// NOTE : This is really not optimal, if you want to add new trigger types, you will have to test for them...
+	static void TriggerEffect( EntityAI insider, typename triggerType ) {}
+}
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/ManTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/ManTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..028d9f13149e13e2cea217445e33d7f3c1546616
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/ManTrigger.c
@@ -0,0 +1,15 @@
+//! Trigger only accepting Object which IsMan()
+class ManTrigger : Trigger
+{
+	override void EOnInit(IEntity other, int extra)
+	{
+		SetExtents("-2 -2 -2", "2 2 2");
+	}
+	
+	override protected bool CanAddObjectAsInsider(Object object)
+	{
+		return object.IsMan();
+	}
+	
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/SphereTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/SphereTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..332098d037857299f531681d9f03c11550226990
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/SphereTrigger.c
@@ -0,0 +1,17 @@
+//! Trigger with spherical shape
+class SphereTrigger : Trigger
+{
+	override void EOnInit(IEntity other, int extra)
+	{
+		SetCollisionSphere(3);
+	}
+	
+#ifdef DEVELOPER
+	override protected Shape DrawDebugShape(vector pos, vector min, vector max, float radius, int color)
+	{
+		Shape dbgShape = Debug.DrawSphere(pos, radius, color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE|ShapeFlags.NOOUTLINE|ShapeFlags.DOUBLESIDE);
+		dbgTargets.Insert( dbgShape );
+		return dbgShape;
+	}
+#endif
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/SpookyTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/SpookyTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..d71d4f47789c73fb0283c0e445782ad7fb5e8648
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/SpookyTrigger.c
@@ -0,0 +1,33 @@
+class SpookyTrigger extends EffectTrigger
+{
+
+}
+
+class SpookyTrigger23 extends SpookyTrigger
+{
+	protected static ref SpookyTriggerEventsHandler m_EventsHandler;
+
+	override void OnEnterClientEvent( TriggerInsider insider )
+	{
+		super.OnEnterClientEvent( insider );
+		//Print("------------------------ >Entering ");
+		PlayerBase player = PlayerBase.Cast(insider.GetObject());
+		m_EventsHandler = new SpookyTriggerEventsHandler(player);
+	}
+	
+	
+	override void OnLeaveClientEvent( TriggerInsider insider )
+	{
+		super.OnLeaveClientEvent( insider );
+		//Print("------------------------ >Leaving ");
+		m_EventsHandler = null;
+	}
+	
+	override protected void OnStayClientEvent(TriggerInsider insider, float deltaTime) 
+	{
+		super.OnStayClientEvent(insider, deltaTime);
+		//this should be getting called only on the controlled player, as the controlled player should be the only entity, which gets added as insider client-side
+		if (m_EventsHandler)
+			m_EventsHandler.Update(deltaTime);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TrapTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TrapTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..e15027c9af8cba0c4ac69bd30ef4af55d1a09031
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TrapTrigger.c
@@ -0,0 +1,97 @@
+//! Trigger used by traps
+class TrapTrigger : Trigger
+{
+	bool m_Enabled = false;
+	TrapBase m_ParentObj;
+	
+	#ifdef DEVELOPER
+	bool m_CanSendDbg = true;
+	#endif
+	
+	void TrapTrigger()
+	{
+		int mask = GetEventMask();
+		mask &= ~EntityEvent.INIT;
+		SetEventMask(mask);
+	}
+	
+	void SetParentObject( TrapBase obj )
+	{
+		if (GetGame().IsServer())
+		{
+			m_ParentObj = obj;
+		}
+	}
+	
+	override protected bool CanAddObjectAsInsider(Object object)
+	{
+		return m_Enabled && object.IsInherited(EntityAI) && m_ParentObj && m_ParentObj.IsActive() && m_ParentObj.GetTrapTrigger() == this;
+	}
+	
+	override protected void OnEnterServerEvent(TriggerInsider insider)
+	{
+		#ifdef DEVELOPER
+		m_CanSendDbg = false;
+		#endif
+		
+		if (m_ParentObj && m_ParentObj.IsActive())
+		{
+			m_ParentObj.SnapOnObject(EntityAI.Cast(insider.GetObject()));
+		}
+	}
+	
+	override protected void OnLeaveServerEvent(TriggerInsider insider)
+	{
+		if (m_ParentObj && m_ParentObj.IsActive())
+		{
+			m_ParentObj.RemoveFromObject(EntityAI.Cast(insider.GetObject()));
+		}
+	}
+	
+	//! prevents insider adding in the wrong position, HOTFIX
+	void SetEnabled()
+	{
+		m_Enabled = true;
+	}
+	
+	#ifdef DEVELOPER
+	override void DebugSendDmgTrigger()
+	{
+		if ( m_CanSendDbg )
+			super.DebugSendDmgTrigger();
+	}
+	
+	#endif
+}
+
+// Used for tripwire type traps, where we want to allow players to go through
+class TripWireTrigger : TrapTrigger
+{
+	override protected void OnEnterServerEvent( TriggerInsider insider )
+	{
+		PlayerBase playerInsider = PlayerBase.Cast(insider.GetObject());
+		
+		if (playerInsider)
+		{
+			// If the player is jogging / sprinting while standing with or without hands raised, tripwire will trigger
+			bool isErect = ( playerInsider.m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_ERECT || playerInsider.m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDERECT || playerInsider.m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_RAISEDCROUCH ); 
+			bool isJogging = ( playerInsider.m_MovementState.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_RUN || playerInsider.m_MovementState.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_SPRINT );
+			if (isJogging && isErect) 
+			{
+				super.OnEnterServerEvent(insider);
+				return;
+			}
+			
+			// Special handling of crouch sprint
+			if ( playerInsider.m_MovementState.m_iStanceIdx == DayZPlayerConstants.STANCEIDX_CROUCH && playerInsider.m_MovementState.m_iMovement == DayZPlayerConstants.MOVEMENTIDX_SPRINT )
+			{
+				super.OnEnterServerEvent(insider);
+				return;
+			}
+		}
+		else
+		{
+			super.OnEnterServerEvent(insider);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/Trigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/Trigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..501e00b43bab20845863ed409103eb7490752c49
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/Trigger.c
@@ -0,0 +1,492 @@
+//! The object which is in a trigger and its metadata
+class TriggerInsider
+{
+	ref OLinkT insider; // DEPRECATED
+	
+	//! Object that data belongs to
+	protected Object m_Object;
+	
+	//! Last time the object was seen in ms
+	int timeStamp;
+	
+	//! Time the object was first seen in seconds
+	float timeEntered;
+	
+	//! Last time the object was updated in seconds, is used for calculating deltaTime
+	float lastUpdated;
+	
+	void TriggerInsider(Object obj)
+	{
+		insider = new OLinkT(obj);
+		m_Object = obj;
+	}
+	
+	void ~TriggerInsider()
+    {
+    }
+
+	Object GetObject()
+	{
+		return m_Object;
+	}
+};
+
+#ifdef DIAG_DEVELOPER
+typedef Param7<vector, vector, vector, vector, float, string, array<ref TriggerInsider>> DebugTriggerInfo;
+#endif
+
+//! Scripted Trigger
+class Trigger : TriggerEvents
+{
+	//! DEPRECATED
+	const int TIMEOUT = 1000;
+	//! The objects and their metadata which are currently inside the Trigger
+	ref array<ref TriggerInsider> m_insiders;
+	
+	#ifdef DIAG_DEVELOPER
+	bool m_Local;//is this trigger spawning on client only ?
+	string 						m_DebugAreaType;
+	ref array<ref TriggerInsider> m_dbgInsiders;
+	#endif
+	
+	//! ctor
+	private void Trigger()
+	{
+		SetEventMask(EntityEvent.INIT /*| EntityEvent.TOUCH*/ | EntityEvent.FRAME | EntityEvent.ENTER | EntityEvent.LEAVE );
+		SetFlags(EntityFlags.TRIGGER, false);
+		
+		m_insiders = new array<ref TriggerInsider>;		
+	}
+	
+	//! dtor
+	private void ~Trigger()
+	{
+		#ifdef DIAG_DEVELOPER
+		CleanupDebugShapes(dbgTargets);
+		#endif
+	}
+
+	/** \name IEntity events
+ 		Usage of IEntity events
+	*/
+	//@{
+	//! Set the default extents of the Trigger only once it is properly initialized
+	override void EOnInit(IEntity other, int extra)
+	{
+		SetExtents("-2 -4 -2", "2 4 2");
+	}
+	
+	//! When an Object touches the Trigger, we want to register it being inside the Trigger -> Replaced by EOnEnter
+	/*override void EOnTouch(IEntity other, int extra)
+	{
+		Object obj;
+		if (Class.CastTo(obj, other) && CanAddObjectAsInsider(obj))
+			AddInsider(obj);
+	}*/
+	
+	//! We want to update the insiders every frame (or do we?)
+	override void EOnFrame(IEntity other, float timeSlice)
+	{
+		UpdateInsiders(TIMEOUT);
+	}
+	
+	//! When an Object enters the trigger add it to Insiders
+	override void EOnEnter(IEntity other, int extra)
+	{
+		Object obj;
+		if (Class.CastTo(obj, other) && CanAddObjectAsInsider(obj))
+			AddInsider(obj);
+	}
+	
+	//! When an Object exits the trigger remove it from Insiders
+	override void EOnLeave(IEntity other, int extra)
+	{
+		Object obj;
+		if (Class.CastTo(obj, other))
+			RemoveInsiderByObject(obj);
+	}
+	//@}
+	
+	
+	/** \name Trigger configuration
+ 		Basic configuration and data API
+	*/
+	//@{
+	//! Set the size of the Trigger, avoid using SetCollisionBox directly
+	void SetExtents(vector mins, vector maxs)
+	{
+		SetCollisionBox(mins, maxs);
+	}
+	
+	//! Get the radius of the CollisionBox, simply left for backwards compatibility
+	float GetRadius(vector min, vector max)
+	{
+		return GetCollisionRadius();			
+	}
+	
+	//! Get the current TriggerInsider array, left for backwards compatibility, moved down from ManTrigger
+	array<ref TriggerInsider> GetInsiders()
+	{
+		return m_insiders;
+	}
+	
+	//! Gets the TriggerInsider for the Object if it exists
+	TriggerInsider GetInsiderForObject(Object object)
+	{
+		TriggerInsider ins;
+		
+		for ( int n = 0; n < m_insiders.Count(); ++n )
+		{
+			ins = m_insiders[n];
+			if (ins.GetObject() == object)
+				return ins;
+		}
+		
+		return null;
+	}
+	
+	//! Gets the index in m_insiders for the Object
+	int GetInsiderIndexForObject(Object object)
+	{
+		TriggerInsider ins;
+		
+		for ( int n = 0; n < m_insiders.Count(); ++n )
+		{
+			ins = m_insiders[n];
+			if (ins.GetObject() == object)
+				return n;
+		}
+		
+		return -1;
+	}
+	//@}
+	
+	
+	/** \name TriggerEvents, backwards compatibility calling
+ 		Implementation for backwards compatibility with old Trigger system
+	*/
+	//@{
+	override protected void OnEnterBeginEvent(TriggerInsider insider)
+	{
+		// Call the old event for backwards compatibility
+		OnEnter(insider.GetObject());
+	}
+	
+	override protected void OnLeaveBeginEvent(TriggerInsider insider)
+	{
+		// Call the old event for backwards compatibility
+		OnLeave(insider.GetObject());
+	}	
+	//@}
+
+	
+	/** \name DEPRECATED Events
+ 		left for backwards compatibility
+	*/
+	//@{
+	void OnEnter(Object obj) {}
+	
+	void OnLeave(Object obj) {}
+	//@}
+	
+	
+	/** \name TriggerInsider conditions
+ 		Conditions applied to TriggerInsider for if it can be added or should be removed
+	*/
+	//@{
+	//! Condition whether an Object can be added as TriggerInsider (checked before calling AddInsider)
+	protected bool CanAddObjectAsInsider(Object object)
+	{
+		return true;
+	}
+	
+	//! Condition whether a TriggerInsider should still be updated or not (checked in update loop and before adding)
+	protected bool ShouldRemoveInsider(TriggerInsider insider)
+	{
+		return false;
+	}
+	
+	//! Condition whether a TriggerInsider should still be updated or not, skips OnLeaveEvent (checked in update loop and before adding)
+	protected bool ShouldRemoveInsiderNoLeave(TriggerInsider insider)
+	{
+		return false;
+	}
+	//@}
+	
+	
+	/** \name TriggerInsider processing
+ 		Logic and processing of adding, removing and updating a TriggerInsider
+	*/
+	//@{
+	//! Used for easily overriding TriggerInsider creation without rewriting AddInsider
+	protected TriggerInsider CreateInsider(Object obj)
+	{
+		return new TriggerInsider(obj);
+	}
+	
+	//! Adding of new TriggerInsider
+	protected void AddInsider(Object obj)
+	{
+		if ( !obj )
+			return;	
+
+		// Already in?
+		if ( GetInsiderForObject( obj ) )
+		{
+			Error(string.Format("[WARNING] :: [Trigger] :: [%1] :: Insider (%2) is already inside.", GetDebugName(this), GetDebugName(obj)));
+			return;
+		}
+			
+		// New Object entered! Fill the data.
+		TriggerInsider insider = CreateInsider(obj);
+		insider.timeStamp = g_Game.GetTime();
+		insider.timeEntered = g_Game.GetTickTime();
+		insider.lastUpdated = insider.timeEntered;
+		
+		// Don't add if it is going to be removed anyways..
+		if ( ShouldRemoveInsider(insider) || ShouldRemoveInsiderNoLeave(insider) )
+			return;
+		
+		// Keep track of the Object as long as it is inside the Trigger
+		int index = m_insiders.Insert(insider);
+		
+		// Call the enter event to signal this Object entered
+		Enter(insider);
+		obj.OnEnterTrigger(this);
+		
+		#ifdef TRIGGER_DEBUG_NORMAL
+		Debug.TriggerLog(string.Format("%1: inserted at index %2", GetDebugName(obj), index), "Trigger", "", "AddInsider", GetDebugName(this));
+		#endif
+	}
+	
+	//! Removing of TriggerInsider
+	protected void RemoveInsider(TriggerInsider insider, int index = -1)
+	{
+		Leave(insider);
+		insider.GetObject().OnLeaveTrigger(this);
+		
+		#ifdef TRIGGER_DEBUG_NORMAL
+		Debug.TriggerLog(string.Format("%1: removing at index %2", GetDebugName(insider.GetObject()), index), "Trigger", "", "RemoveInsider", GetDebugName(this));
+		#endif	
+		
+		if (index >= 0)
+			m_insiders.Remove(index);
+		else
+			m_insiders.RemoveItemUnOrdered(insider);
+	}
+	
+	//! Removing of TriggerInsider through Object
+	protected void RemoveInsiderByObject(Object object)
+	{
+		TriggerInsider ins;
+		for ( int n = 0; n < m_insiders.Count(); ++n )
+		{
+			ins = m_insiders[n];
+			if (ins.GetObject() == object)
+			{
+				RemoveInsider(ins, n);
+				return;
+			}
+		}
+		
+		// As EOnLeave can call this, it is perfectly valid that this Object is not found on Script side
+		// because of "ShouldRemoveInsider" and "ShouldRemoveInsiderNoLeave"
+	}
+	
+	//! Update the current TriggerInsider inside the Trigger, timeout paramter is deprecated
+	protected void UpdateInsiders(int timeout)
+	{
+		#ifdef DIAG_DEVELOPER
+		DebugSendDmgTrigger();
+		#endif
+
+		// Don't do anything if there aren't any insiders
+		if ( m_insiders.Count() == 0 )
+			return;
+		
+		// Mark the beginning of the update loop
+		StayStart(m_insiders.Count());
+		
+		// Iterate over the current insiders, backwards because we are deleting
+		for ( int n = m_insiders.Count() - 1; n >= 0 ; --n)
+		{
+			TriggerInsider insider = m_insiders.Get(n);
+			Object obj = insider.GetObject();
+			
+			// Check if the Object still exists or should be removed without calling OnLeaveEvent
+			if ( !obj || ShouldRemoveInsiderNoLeave(insider) )
+			{
+				#ifdef TRIGGER_DEBUG_BASIC
+				Debug.TriggerLog(string.Format("%1: removed with no Leave.", GetDebugName(obj)), "Trigger", "", "UpdateInsiders", GetDebugName(this));
+				#endif
+				
+				m_insiders.Remove(n);
+				continue;
+			}
+			
+			// Check if Object left the Trigger or should be removed regardless
+			if ( ShouldRemoveInsider(insider) )
+			{
+				RemoveInsider(insider, n);
+				continue;
+			}
+			
+			// Call the OnStayEvent, Object is still inside the Trigger and can be updated
+			// Pass in the time since the Object was last updated (or entered)
+			float currentTime = g_Game.GetTickTime();
+			Stay(insider, currentTime - insider.lastUpdated);
+			insider.lastUpdated = currentTime;
+		}
+		
+		// Mark the end of the update loop
+		StayFinish();
+	}
+	//@}
+	
+	/** \name DEBUGGING
+		General internal debugging functionality
+	*/
+	//@{
+	override void OnRPC(PlayerIdentity sender, int rpc_type, ParamsReadContext ctx)
+	{	
+		super.OnRPC(sender, rpc_type, ctx);
+
+		#ifdef DIAG_DEVELOPER
+		switch (rpc_type)
+		{
+			case ERPCs.DIAG_TRIGGER_DEBUG:
+				DebugTriggerInfo data = new DebugTriggerInfo(vector.Zero, vector.Zero, vector.Zero, vector.Zero, 0, "", null);
+			
+				if (ctx.Read(data))
+					DebugDmgTrigger(data.param1, data.param2, data.param3, data.param4, data.param5, data.param6, data.param7);
+			break;
+		}
+		#endif
+	}
+	
+#ifdef DIAG_DEVELOPER
+	void DebugSendDmgTrigger()
+	{		
+		vector minmax[2];
+		GetCollisionBox(minmax);
+		
+		DebugTriggerInfo data = new DebugTriggerInfo(vector.Zero, vector.Zero, vector.Zero, vector.Zero, 0, "", null);
+		data.param1 = GetWorldPosition();
+		data.param2 = GetOrientation();		
+		data.param3 = minmax[0];
+		data.param4 = minmax[1];
+		data.param5 = GetCollisionRadius();		
+		data.param6 = m_DebugAreaType;
+		data.param7 = m_insiders;
+		
+		if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			PluginDiagMenuServer.SendDataToSubscribersServer(this, ESubscriberSystems.TRIGGERS, ERPCs.DIAG_TRIGGER_DEBUG, data, false);
+		else if (!GetGame().IsMultiplayer() || m_Local)
+			DebugDmgTrigger(data.param1, data.param2, data.param3, data.param4, data.param5, data.param6, data.param7);
+	}
+	
+	protected ref array<Shape> dbgTargets = new array<Shape>();
+	
+	void DebugDmgTrigger( vector pos, vector orientation, vector min, vector max, float radius, string dmgType, array<ref TriggerInsider> insiders)
+	{
+		CleanupDebugShapes(dbgTargets);
+
+		bool enableDebug = DiagMenu.GetBool(DiagMenuIDs.TRIGGER_DEBUG);
+		if (enableDebug)
+		{
+			if (GetGame().IsMultiplayer() && GetGame().IsServer())
+			{
+				return;
+			}
+			
+			vector w_pos, w_pos_sphr, w_pos_lend;
+			
+			w_pos = pos;
+			// sphere pos tweaks
+			w_pos_sphr = w_pos;
+			// line pos tweaks
+			w_pos_lend = w_pos;
+			
+			//Find way to change colour of box depending on ammoType in a more elegant fashion
+			m_DebugAreaType = dmgType;
+			Shape dbgShape;			
+			
+			switch ( m_DebugAreaType )
+			{
+				case "FireDamage":
+					dbgShape = DrawDebugShape(pos, min, max, radius, COLOR_RED_A);
+				break;
+				
+				case "BarbedWireHit":
+					dbgShape = DrawDebugShape(pos, min, max, radius, COLOR_BLUE_A);
+				break;
+				
+				default:
+					dbgShape = DrawDebugShape(pos, min, max, radius, COLOR_GREEN_A);
+				break;
+			}
+			
+			if (GetGame().IsMultiplayer() || GetGame().IsServer())
+				m_dbgInsiders = insiders;
+		
+			if (m_dbgInsiders.Count() > 0)
+			{
+				//Change colour to make state clearer
+				dbgShape.SetColor(COLOR_YELLOW_A);
+				
+				for (int i = 0; i < m_dbgInsiders.Count(); i++)
+				{
+					EntityAI insider_EAI = EntityAI.Cast(m_dbgInsiders[i].GetObject());
+					if (insider_EAI)
+					{
+						vector insiderPos = insider_EAI.GetWorldPosition() + "0 0.1 0";						
+						dbgTargets.Insert(Debug.DrawArrow(w_pos, insiderPos));
+					}
+				}
+			}
+		}
+	}
+	
+	protected Shape DrawDebugShape(vector pos, vector min, vector max, float radius, int color)
+	{
+		Shape dbgShape;
+
+		switch (GetTriggerShape())
+		{
+			case TriggerShape.BOX:
+				dbgShape = Debug.DrawBoxEx(min, max, color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE);
+	
+				vector mat[4];
+				GetTransform(mat);
+				dbgShape.CreateMatrix(mat);
+				dbgShape.SetMatrix(mat);
+				break;
+			case TriggerShape.CYLINDER:
+				dbgShape = Debug.DrawCylinder(pos, radius, max[1], color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE);
+				break;
+			case TriggerShape.SPHERE:
+				dbgShape = Debug.DrawSphere(pos, radius, color, ShapeFlags.TRANSP|ShapeFlags.NOZWRITE);
+				break;
+			default:
+				ErrorEx("TriggerShape not found", ErrorExSeverity.WARNING);
+				break;
+		}
+
+		dbgTargets.Insert(dbgShape);
+	
+		return dbgShape;
+	}
+	
+	protected void CleanupDebugShapes(array<Shape> shapes)
+	{
+		foreach (Shape shape : shapes)
+		{
+			Debug.RemoveShape(shape);
+		}
+
+		shapes.Clear();
+	}
+	
+#endif
+	//@}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TriggerEffectManager.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TriggerEffectManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..f7dbc614c0a9a364760d75b096f95ab0858583dd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TriggerEffectManager.c
@@ -0,0 +1,121 @@
+// Used for Effect based triggers ( such as Contaminated areas )
+// Allows us to unify these triggers and treat Enter / Exit events as if all triggers were one
+class TriggerEffectManager
+{
+	static ref TriggerEffectManager m_This;
+	
+	// Player map will only be handled client side as it is most relevant
+	ref map<string, ref map<PlayerBase, int>> m_PlayerInsiderMap; // Used to keep track of which players are in which effects
+
+	void TriggerEffectManager()
+	{
+		m_PlayerInsiderMap = new map<string, ref map<PlayerBase, int>>;
+	}
+	
+	static void DestroyInstance()
+	{
+		m_This = null;
+	}
+	
+	// This is a SINGLETON so, if we can't get the instance, we create it
+	static TriggerEffectManager GetInstance()
+	{
+		if ( !m_This )
+			m_This = new TriggerEffectManager();
+
+		return m_This;
+	}
+	
+	void RegisterTriggerType( EffectTrigger effectTrigger )
+	{
+		if ( !m_PlayerInsiderMap.Contains( effectTrigger.GetType() ) )
+		{
+			map<PlayerBase, int> playerMap = new map<PlayerBase, int>;
+			m_PlayerInsiderMap.Insert( effectTrigger.GetType(), playerMap );
+			
+			//Debug.Log( "We have : " + m_PlayerInsiderMap.Count() + " triggers");
+		}
+	}
+
+	// When a player enters a trigger using this class, we add player to map or increase its trigger count
+	void OnPlayerEnter( notnull PlayerBase player, notnull EffectTrigger trigger )
+	{
+		string trigger_type = trigger.GetType();
+		
+		map<PlayerBase, int> playerMap;
+		if ( m_PlayerInsiderMap.Find( trigger_type, playerMap) )
+		{
+			if ( playerMap )
+			{ 
+				if ( playerMap.Contains( player ) )
+				{
+					int newTriggerCount = playerMap.Get( player ) + 1;
+					playerMap.Set( player, newTriggerCount );
+					//Debug.Log("We increase the amount of triggers a player is in");
+				}
+				else
+				{
+					// First time this player enters this type of trigger, we set the trigger count to 1
+					playerMap.Insert( player, 1 );
+					if (trigger.GetEffectArea())
+						trigger.GetEffectArea().OnPlayerEnterServer(player, trigger);
+					//Debug.Log("We insert a player");
+				}
+				
+				//m_PlayerInsiderMap.Set( trigger_type, playerMap );
+			}
+			else
+			{
+				// We didn't have the map yet, we create it and register this player in it
+				playerMap = new map<PlayerBase, int>;
+				playerMap.Insert( player, 1 );
+				if (trigger.GetEffectArea())
+					trigger.GetEffectArea().OnPlayerEnterServer(player, trigger);
+				m_PlayerInsiderMap.Insert( trigger_type, playerMap );
+			}
+		}
+	}
+	
+	void OnPlayerInsideEffectAreaEnter(PlayerBase player);
+	void OnPlayerInsideEffectAreaExit(PlayerBase player);
+	
+	// Same as OnPlayerEnter, but we decrease trigger count on each trigger leave and remove player from map when count is 0
+	void OnPlayerExit( notnull PlayerBase player, notnull EffectTrigger trigger )
+	{
+		string trigger_type = trigger.GetType();
+		
+		map<PlayerBase, int> playerMap;
+		if ( m_PlayerInsiderMap.Find( trigger_type, playerMap ) && playerMap )
+		{
+			if ( playerMap.Contains( player ))
+			{
+				if( playerMap.Get( player ) > 1 )
+				{
+					//Debug.Log("We reduced the amount of triggers the player is in");
+					playerMap.Set( player, playerMap.Get( player ) - 1 );
+				}
+				else
+				{
+					// The player left the last trigger of this type they were in
+					playerMap.Remove( player );
+					if (trigger.GetEffectArea())
+						trigger.GetEffectArea().OnPlayerExitServer(player,trigger);
+					player.RemoveCurrentEffectTrigger();
+					//Debug.Log("We removed this player from this trigger type");
+				}
+			}
+			//m_PlayerInsiderMap.Set( trigger_type, playerMap );
+
+		}
+	}
+	
+	bool IsPlayerInTriggerType( notnull PlayerBase player, notnull EffectTrigger trigger )
+	{
+		map<PlayerBase, int> playerMap;
+		if ( m_PlayerInsiderMap.Find( trigger.GetType(), playerMap ) )
+		{
+			return playerMap != null && playerMap.Contains( player );
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TriggerEvents.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TriggerEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..f776b57bfe5e5cc30b093c9bb66fb91f33712754
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/TriggerEvents.c
@@ -0,0 +1,152 @@
+//! Events API for triggers, keep in sync with AreaDamageEvents for consistency
+//! NOTE: The deltaTime passed in is the one for the Insider specifically.
+class TriggerEvents : ScriptedEntity
+{	
+	protected ref ScriptInvoker		m_OnEnterInvoker;
+	protected ref ScriptInvoker		m_OnLeaveInvoker;
+	
+	ScriptInvoker GetOnEnterInvoker()
+	{
+		if ( !m_OnEnterInvoker )
+			m_OnEnterInvoker = new ScriptInvoker;
+		return m_OnEnterInvoker;
+	}
+	
+	ScriptInvoker GetOnLeaveInvoker()
+	{
+		if ( !m_OnLeaveInvoker )
+			m_OnLeaveInvoker = new ScriptInvoker;
+		return m_OnLeaveInvoker;
+	}
+	
+	/** \name OnEnter
+ 		Called when an object enters the trigger
+	*/
+	///@{
+	protected void Enter(TriggerInsider insider)
+	{
+		#ifdef TRIGGER_DEBUG_BASIC
+		Debug.TriggerLog(GetDebugName(insider.GetObject()), "TriggerEvents", "", "Enter", GetDebugName(this));
+		#endif
+		
+		OnEnterBeginEvent(insider);
+		
+		if (m_OnEnterInvoker)
+			m_OnEnterInvoker.Invoke(insider);
+		
+		if ( GetGame().IsServer() )
+			OnEnterServerEvent(insider);
+		else
+			OnEnterClientEvent(insider);
+		
+		OnEnterEndEvent(insider);
+	}	
+	protected void OnEnterBeginEvent(TriggerInsider insider) {}
+	protected void OnEnterServerEvent(TriggerInsider insider) {}
+	protected void OnEnterClientEvent(TriggerInsider insider) {}
+	protected void OnEnterEndEvent(TriggerInsider insider) {}
+	///@}
+	
+	/** \name OnStayStart
+ 		Called at the beginning of an update loop
+	*/
+	///@{
+	protected void StayStart(int nrOfInsiders)
+	{
+		#ifdef TRIGGER_DEBUG_SPAM
+		Debug.TriggerLog(nrOfInsiders.ToString(), "TriggerEvents", "", "StayStart", GetDebugName(this));
+		#endif
+		
+		OnStayStartBeginEvent(nrOfInsiders);
+		
+		if ( GetGame().IsServer() )
+			OnStayStartServerEvent(nrOfInsiders);
+		else
+			OnStayStartClientEvent(nrOfInsiders);
+		
+		OnStayStartEndEvent(nrOfInsiders);
+	}	
+	protected void OnStayStartBeginEvent(int nrOfInsiders) {}
+	protected void OnStayStartServerEvent(int nrOfInsiders) {}
+	protected void OnStayStartClientEvent(int nrOfInsiders) {}
+	protected void OnStayStartEndEvent(int nrOfInsiders) {}
+	///@}
+	
+	/** \name OnStay
+ 		Called in the update loop
+	*/
+	///@{
+	protected void Stay(TriggerInsider insider, float deltaTime)
+	{
+		#ifdef TRIGGER_DEBUG_SPAM
+		Debug.TriggerLog(GetDebugName(insider.GetObject()), "TriggerEvents", "", "Stay", GetDebugName(this));
+		#endif
+		
+		OnStayBeginEvent(insider, deltaTime);
+		
+		if ( GetGame().IsServer() )
+			OnStayServerEvent(insider, deltaTime);
+		else
+			OnStayClientEvent(insider, deltaTime);
+		
+		OnStayEndEvent(insider, deltaTime);
+	}	
+	protected void OnStayBeginEvent(TriggerInsider insider, float deltaTime) {}
+	protected void OnStayServerEvent(TriggerInsider insider, float deltaTime) {}
+	protected void OnStayClientEvent(TriggerInsider insider, float deltaTime) {}
+	protected void OnStayEndEvent(TriggerInsider insider, float deltaTime) {}
+	///@}
+	
+	/** \name OnStayFinish
+ 		Called at the end of an update loop
+	*/
+	///@{
+	protected void StayFinish()
+	{
+		#ifdef TRIGGER_DEBUG_SPAM
+		Debug.TriggerLog("", "TriggerEvents", "", "StayFinish", GetDebugName(this));
+		#endif
+		
+		OnStayFinishBeginEvent();
+		
+		if ( GetGame().IsServer() )
+			OnStayFinishServerEvent();
+		else
+			OnStayFinishClientEvent();
+		
+		OnStayFinishEndEvent();
+	}	
+	protected void OnStayFinishBeginEvent() {}
+	protected void OnStayFinishServerEvent() {}
+	protected void OnStayFinishClientEvent() {}
+	protected void OnStayFinishEndEvent() {}
+	///@}
+	
+	/** \name OnLeave
+ 		Called when an object leaves the trigger
+	*/
+	///@{
+	protected void Leave(TriggerInsider insider)
+	{
+		#ifdef TRIGGER_DEBUG_BASIC
+		Debug.TriggerLog(GetDebugName(insider.GetObject()), "TriggerEvents", "", "Leave", GetDebugName(this));
+		#endif
+		
+		OnLeaveBeginEvent(insider);
+		
+		if (m_OnLeaveInvoker)
+			m_OnLeaveInvoker.Invoke(insider);
+		
+		if ( GetGame() && GetGame().IsServer() )
+			OnLeaveServerEvent(insider);
+		else
+			OnLeaveClientEvent(insider);
+		
+		OnLeaveEndEvent(insider);
+	}	
+	protected void OnLeaveBeginEvent(TriggerInsider insider) {}
+	protected void OnLeaveServerEvent(TriggerInsider insider) {}
+	protected void OnLeaveClientEvent(TriggerInsider insider) {}
+	protected void OnLeaveEndEvent(TriggerInsider insider) {}
+	///@}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/UndergroundTrigger.c b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/UndergroundTrigger.c
new file mode 100644
index 0000000000000000000000000000000000000000..00427852f8b2dce8719f1044cbdbb22902e2576c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedEntities/Triggers/UndergroundTrigger.c
@@ -0,0 +1,183 @@
+//! This entity exists both client andserver side
+//! when it enters into player's bubble and gets instantiated client-side, it will locally spawn UndergroundTrigger, which is the actual trigger
+class UndergroundTriggerCarrier extends UndergroundTriggerCarrierBase
+{
+	ref JsonUndergroundAreaTriggerData m_Data;
+	UndergroundTrigger m_Trigger;
+	
+	void UndergroundTriggerCarrier()
+	{
+		RegisterNetSyncVariableInt("m_TriggerIndex", -1, 255);
+	}
+	
+	void ~UndergroundTriggerCarrier()
+	{
+		if (m_Trigger && !m_Trigger.IsSetForDeletion() && GetGame())
+		{
+			//RemoveChild(m_Trigger);
+			m_Trigger.Delete();
+		}
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+		if (!m_Trigger)
+		{
+			SpawnTrigger();
+		}
+	}
+		
+	bool CanSpawnTrigger()
+	{
+		return UndergroundAreaLoader.m_JsonData && m_TriggerIndex != -1;
+	}
+	
+	void RequestDelayedTriggerSpawn()
+	{
+		//Print("RequestDelayedTriggerSpawn() " + this);
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(SpawnTrigger, 100);
+	}
+	
+	void SpawnTrigger()
+	{
+		
+		if (!CanSpawnTrigger())
+		{
+			RequestDelayedTriggerSpawn();
+			return;
+		}
+		
+		if (UndergroundAreaLoader.m_JsonData.Triggers && UndergroundAreaLoader.m_JsonData.Triggers.IsValidIndex(m_TriggerIndex))
+		{
+			JsonUndergroundAreaTriggerData data = UndergroundAreaLoader.m_JsonData.Triggers[m_TriggerIndex];
+			UndergroundTrigger trigger = UndergroundTrigger.Cast(GetGame().CreateObjectEx( "UndergroundTrigger", GetPosition(), ECE_LOCAL ));
+			if (trigger)
+			{
+				#ifdef DIAG_DEVELOPER
+				trigger.m_Local = true;
+				#endif
+				trigger.SetPosition(vector.Zero);
+				AddChild(trigger,-1);
+				trigger.Init(data);
+				
+				m_Trigger = trigger;
+			}
+		}
+	}
+
+}
+
+enum EUndergroundTriggerType
+{
+	UNDEFINED,
+	TRANSITIONING,
+	OUTER,
+	INNER
+}
+
+class UndergroundTrigger : ManTrigger
+{
+	ref JsonUndergroundAreaTriggerData m_Data;
+	
+	EUndergroundTriggerType m_Type;
+	float m_Accommodation;
+	float m_InterpolationSpeed;
+	
+	void Init(JsonUndergroundAreaTriggerData data)
+	{
+		m_Data = data;
+		//Print("Spawning trigger " + this + "at pos: " + GetPosition());
+		vector extMax = data.GetSize() * 0.5;
+		vector extMin = -extMax;
+		SetExtents(extMin, extMax);
+		m_Accommodation = data.EyeAccommodation;
+		m_InterpolationSpeed = data.InterpolationSpeed;
+
+		if (data.Breadcrumbs && data.Breadcrumbs.Count() > 0) //TODO: simpler check
+		{
+			if (data.Breadcrumbs.Count() > 32)
+			{
+				ErrorEx("max 'Breadcrumb' count is 32, found: " + data.Breadcrumbs.Count());
+			}
+			m_Type = EUndergroundTriggerType.TRANSITIONING;
+		}
+		else
+		{
+			if (m_Accommodation == 1)
+			{
+				m_Type = EUndergroundTriggerType.OUTER;
+			}
+			else
+			{
+				m_Type = EUndergroundTriggerType.INNER;
+			}
+		}
+	}
+
+	override protected bool CanAddObjectAsInsider(Object object)
+	{
+		if (!super.CanAddObjectAsInsider(object))
+		{
+			return false;
+		}
+		
+		PlayerBase player = PlayerBase.Cast(object);
+		return player.IsControlledPlayer();
+	}
+	
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		//disable parent behaviour
+	}
+	
+	
+	
+	
+	#ifdef DEVELOPER
+	override protected void OnEnterServerEvent(TriggerInsider insider) 
+	{
+		#ifndef SERVER//to make it work in single during development
+		OnEnterClientEvent(insider);
+		#endif
+	}
+	override protected void OnLeaveServerEvent(TriggerInsider insider) 
+	{
+		#ifndef SERVER//to make it work in single during development
+		OnLeaveClientEvent(insider);
+		#endif
+	}
+	#endif
+	
+	override protected void OnEnterClientEvent(TriggerInsider insider) 
+	{
+		//Print("OnEnterClientEvent " + this);
+		//return;
+		PlayerBase player = PlayerBase.Cast(insider.GetObject());
+		if (player)
+		{
+			UndergroundHandlerClient handler = player.GetUndergroundHandler();
+			if (handler)
+			{
+				handler.OnTriggerEnter(this);
+			}
+		}
+	}
+	
+	override protected void OnLeaveClientEvent(TriggerInsider insider) 
+	{
+		//Print("OnLeaveClientEvent " + this);
+		//return;
+		PlayerBase player = PlayerBase.Cast(insider.GetObject());
+		if (player)
+		{
+			UndergroundHandlerClient handler = player.GetUndergroundHandler();
+			if (handler)
+			{
+				handler.OnTriggerLeave(this);
+			}
+		}
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..8639cc9f727fdce1576110eda7c63eebcadecc2e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase.c
@@ -0,0 +1,729 @@
+/*
+Please remember that:
+-Lights work only on client side!
+-Lights with Brightness or Radius of 0 (or less) are automatically deleted
+-Lights are very performance heavy. Especially if they cast shadows. Use them carefully!
+
+Script author: Boris Vacula
+*/
+
+class ScriptedLightBase extends EntityLightSource
+{
+	float 		m_LifetimeStart;
+	float 		m_LifetimeEnd = -1; // -1 makes this light permanent
+	float 		m_FadeOutTime = -1;
+	float 		m_FadeInTime = -1;
+	float 		m_Radius;
+	float 		m_RadiusTarget;
+	float 		m_Brightness;
+	float 		m_BrightnessPulse; // flicker effect
+	float 		m_BrightnessPulseSpeed;
+	float 		m_BrightnessPulseAmplitudeMax;
+	float 		m_BrightnessPulseAmplitudeMin;
+	float 		m_BrightnessTarget;
+	float 		m_BrightnessSpeedOfChange = 1;
+	float 		m_RadiusSpeedOfChange = 1;
+	float 		m_OptimizeShadowsRadius = 0; // Within this range between the light source and camera the shadows will be automatically disabled to save on performance
+	
+	float 		m_DancingShadowsAmplitude;
+	float 		m_DancingShadowsSpeed;
+	
+	float		m_BlinkingSpeed;
+	
+	bool 		m_IsDebugEnabled = false;
+	
+	Object 		m_Parent; // Attachment parent
+	vector 		m_LocalPos; // Local position to my attachment parent
+	vector 		m_LocalOri; // Local orientation to my attachment parent
+	vector 		m_DancingShadowsLocalPos;
+	
+	ref Timer 	m_DeleteTimer;
+	
+	static ref set<ScriptedLightBase> m_NightTimeOnlyLights = new set<ScriptedLightBase>();
+	
+	//! Constructor. Everything here is executed before the constructor of all children.
+	void ScriptedLightBase()
+	{
+		m_LifetimeStart = GetGame().GetTime();
+		SetEnabled(true);
+		SetEventMask(EntityEvent.FRAME);
+		SetEventMask(EntityEvent.INIT);
+	}
+	
+	void ~ScriptedLightBase()
+	{
+		if (m_NightTimeOnlyLights)
+		{
+			int index = m_NightTimeOnlyLights.Find(this);
+			if (index != -1)
+			{
+				m_NightTimeOnlyLights.Remove(index);
+			}
+		}
+	}
+	
+	override void EOnInit(IEntity other, int extra)
+	{
+		if (!IsVisibleDuringDaylight())
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			if (player && player.m_UndergroundPresence)
+				SetVisibleDuringDaylight(true);
+			m_NightTimeOnlyLights.Insert(this);
+		}
+	}
+	
+	override bool IsScriptedLight()
+	{
+		return true;
+	}
+	
+	void UpdateMode()
+	{
+		ItemBase item = ItemBase.Cast(m_Parent);
+		if (item)
+		{
+			InventoryLocation il = new InventoryLocation;
+			item.GetInventory().GetCurrentInventoryLocation( il );
+			string slotName;
+			if (il.GetType() == InventoryLocationType.GROUND)
+			{
+				slotName = "Ground";
+			}
+			else if (il.GetSlot() != -1)
+			{
+				slotName = InventorySlots.GetSlotName(il.GetSlot());
+			}
+			UpdateLightMode(slotName);			
+		}
+	}
+	
+	private void UpdateLightMode(string slotName);
+	
+	//! Correct way of deleting light from memory. It is necesarry to have this delay due to hierarchy.
+	private void DeleteLightWithDelay()
+	{
+		DetachFromParent(); // This is the reason for the delay
+		
+		if (GetGame())
+		{
+			if (!m_DeleteTimer)
+				m_DeleteTimer = new Timer( CALL_CATEGORY_SYSTEM );
+	
+			m_DeleteTimer.Run( 0.03 , this, "DeleteLightNow", NULL, true);
+		}
+		
+	}
+	
+	// Deletes light now. Do not call this directly. Call Destroy() instead. Otherwise you might get errors related to hierarchy.
+	private void DeleteLightNow()
+	{
+		GetGame().ObjectDelete(this);
+	}
+	
+	//! Attaches this light on the parent entity, with optional position and orientation offset.
+	void AttachOnObject(Object parent, vector local_pos = "0 0 0", vector local_ori = "0 0 0")
+	{
+		if (!parent)
+		{
+			if (m_Parent)
+			{
+				m_Parent.RemoveChild(this);
+			}
+			
+			return;
+		}
+		else
+		{
+			if (m_Parent)
+			{
+				m_Parent.RemoveChild(this);
+			}
+		}
+		
+		m_Parent = parent;
+		m_LocalPos = local_pos;
+		m_LocalOri = local_ori;
+		SetOrientation(local_ori);
+		SetPosition(local_pos);
+		parent.AddChild(this, -1);
+		parent.Update();
+	}
+	
+	//! Returns attachment parent
+	Object GetAttachmentParent()
+	{
+		return m_Parent;
+	}
+	
+	//! Attaches this light on the parent entity's memory point, with optional direction target memory point.
+	void AttachOnMemoryPoint(Object parent, string memory_point_start, string memory_point_target = "")
+	{
+		if (parent.MemoryPointExists(memory_point_start))
+		{
+			m_LocalPos = parent.GetMemoryPointPos(memory_point_start);
+			vector local_ori;
+			
+			if (memory_point_target != "" )
+			{
+				if (parent.MemoryPointExists(memory_point_target))
+				{
+					vector target_pos = parent.GetSelectionPositionLS(memory_point_target);
+					target_pos = vector.Direction(m_LocalPos, target_pos);
+					local_ori = target_pos.VectorToAngles();
+				}
+				else
+				{
+					ErrorEx("memory point 'memory_point_target' not found when attaching light");
+				}
+			}
+			AttachOnObject(parent, m_LocalPos, local_ori);	
+			UpdateMode();
+		}
+		else
+		{
+			ErrorEx("memory point 'memory_point_start' not found when attaching light");
+		}
+	}
+	
+	//! Detaches this light from its parent entity.
+	void DetachFromParent()
+	{
+		if (!m_Parent)
+		{
+			m_Parent = Object.Cast( GetParent() );
+		}
+		
+		if (m_Parent)
+		{
+			if ( !m_Parent.ToDelete()  &&  !ToDelete() )
+			{
+				m_Parent.RemoveChild(this);
+			}
+		}
+		
+		m_Parent = null;
+		m_LocalPos = Vector(0,0,0);
+		m_LocalOri = Vector(0,0,0);
+	}
+	
+	static ScriptedLightBase CreateLightAtObjMemoryPoint(typename name, notnull Object target, string memory_point_start, string memory_point_target = "", vector global_pos = "0 0 0", float fade_in_time_in_s = 0)
+	{
+		ScriptedLightBase light;
+		if (target.MemoryPointExists(memory_point_start))
+		{
+			light = CreateLight(name, global_pos, fade_in_time_in_s);
+			light.AttachOnMemoryPoint(target, memory_point_start, memory_point_target);
+		}
+		return light;
+	}
+	
+	//! Creates an instance of light on the given position. Optionally, use fade_in_time_in_s parameter to make the light fade into existence.
+	static ScriptedLightBase CreateLight(typename name, vector global_pos = "0 0 0", float fade_in_time_in_s = 0)
+	{
+		ScriptedLightBase light_instance;
+		
+		if ( !GetGame().IsServer()  ||  !GetGame().IsMultiplayer() ) // Client side
+		{
+			light_instance = ScriptedLightBase.Cast( GetGame().CreateObject(name.ToString(), global_pos, true) );
+			
+			if (!light_instance)
+			{
+				Error("Error! Light entity of name " + name.ToString() + " cannot be spawned! This name is incorrect or not inherited from ScriptedLightBase." );
+				return null;
+			}
+			
+			if (fade_in_time_in_s != 0)
+			{
+				light_instance.FadeIn(fade_in_time_in_s);
+			}
+		}
+		else // Server side
+		{
+			if ( GetGame().IsDebug() )
+			{
+				Error("An instance of ScriptedLightBase was attempted to spawn on server side! Lights are CLIENT SIDE ONLY!");
+			}
+		}
+		
+		return light_instance;
+	}
+	
+	//! Sets the brightness of the light
+	void SetBrightnessTo(float value)
+	{
+		m_Brightness = value;
+		m_BrightnessTarget = value;
+		SetBrightness(m_Brightness * m_BrightnessPulse);
+		CorrectLightPulseDuringDaylight();
+	}
+	
+	//! Call this after using SetBrightness(...) to fix light's intensity during daytime
+	void CorrectLightPulseDuringDaylight()
+	{
+		if (m_Brightness < 100)
+		{
+			float v = m_Brightness * 0.01;
+			
+			if (v > 0)
+			{
+				float brightness_compesation = 1 / v;
+				float compenset_brightness = (m_Brightness * m_BrightnessPulse) * brightness_compesation;
+				SetBrightness(compenset_brightness);
+				SetPulseCoef(v);
+			}
+		}
+		else
+		{
+			SetPulseCoef(1);
+		}
+	}
+	
+	//! Fades the brightness of the light to the given value.
+	void FadeBrightnessTo( float value, float time_in_s )
+	{
+		m_BrightnessTarget = value;
+		
+		if (time_in_s == 0)
+		{
+			m_BrightnessSpeedOfChange = 9999;
+		}
+		else
+		{
+			m_BrightnessSpeedOfChange = Math.AbsFloat(m_Brightness - m_BrightnessTarget) / time_in_s;
+		}
+	}
+	
+	//! Sets the radius of the light
+	void SetRadiusTo(float value)
+	{
+		m_Radius = value;
+		m_RadiusTarget = value;
+		SetRadius(m_Radius);
+	}
+	
+	//! Fades the radius of the light to the given value.
+	void FadeRadiusTo( float value, float time_in_s )
+	{
+		m_RadiusTarget = value;
+		
+		if (time_in_s == 0)
+		{
+			m_RadiusSpeedOfChange = 9999;
+		}
+		else
+		{
+			m_RadiusSpeedOfChange = Math.AbsFloat(m_Radius - m_RadiusTarget) / time_in_s;
+		}
+	}
+	
+	//! Switches off the light and deletes it from memory
+	void Destroy()
+	{
+		ClearEventMask(EntityEvent.FRAME);
+		SetEnabled(false);
+		if (m_Parent)
+			DeleteLightWithDelay();
+		else
+			DeleteLightNow();
+	}
+	
+	//! Makes the light destroy itself after the given time in seconds. The light will fade out if it's set to do so with SetFadeOutTime(...)
+	void SetLifetime(float life_in_s)
+	{
+		if(GetGame())
+			m_LifetimeEnd = GetGame().GetTime() + life_in_s * 1000;
+	}
+	
+	//! Sets the fade out time in seconds. Fade out begins automatically as the light nears the end of its life time, or when method FadeOut() is called.
+	void SetFadeOutTime(float time_in_s)
+	{
+		m_FadeOutTime = time_in_s * 1000;
+	}
+	
+	//! Starts the fade out process and destroys the light when its done. Optional parameter allows you to set time of this fade out in seconds. If not set, then default value (from SetFadeOutTime(...)) is used.
+	void FadeOut(float time_in_s = -1)
+	{
+		float time_in_ms = time_in_s * 1000;
+		
+		if (time_in_s == -1)
+		{
+			float kill_time_in_s = m_FadeOutTime*0.001;
+			
+			FadeBrightnessTo(0, kill_time_in_s);
+			FadeRadiusTo(0, kill_time_in_s);
+			SetLifetime(kill_time_in_s);
+		}
+		else
+		{
+			FadeBrightnessTo(0, time_in_s);
+			FadeRadiusTo(0, time_in_s);
+			SetLifetime(time_in_s);
+		}
+	}
+	
+	//! Makes the light fade into existence. Works only at the moment the light is created. Consider using FadeBrightnessTo(...) and FadeRadiusTo(...) at anytime later during lifetime.
+	void FadeIn(float time_in_s)
+	{
+		float brightness = m_Brightness;
+		SetBrightnessTo(0);
+		FadeBrightnessTo(brightness, time_in_s);
+	}
+	
+	//! Prolongs the lifetime of the light in seconds. Use negative number to shorten its lifetime.
+	void AddLifetime(float life_in_s)
+	{
+		m_LifetimeEnd += life_in_s * 1000;
+	}
+	
+	//! Override this for custom functionality
+	void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		// ... 
+	}
+	
+	//! On frame event. If you want to control your light within your own rules then override the event OnFrameLightSource and put your code there.
+	override void EOnFrame(IEntity other, float timeSlice)
+	{
+		// Control lifetime of the light
+		int current_time = GetGame().GetTime();
+		
+		if ( CheckLifetime(current_time) )
+		{
+			SetRadius(m_Radius);
+		}
+		else
+		{
+			return;
+		}
+		
+		HandleFlickering(current_time - m_LifetimeStart, timeSlice);
+		HandleDancingShadows(current_time - m_LifetimeStart, timeSlice);
+		CheckFadeOut(current_time);
+		HandleBrightnessFadeing(timeSlice);
+		HandleRadiusFadeing(timeSlice);
+		
+		CheckIfParentIsInCargo();
+		TryShadowOptimization();
+		OnFrameLightSource(other, timeSlice);
+		
+		HandleBlinking(current_time);
+	}
+	
+	//! Sets the maximum range of the point light within the dancing shadows effect
+	void SetDancingShadowsAmplitude(float max_deviation_in_meters)
+	{
+		m_DancingShadowsAmplitude = Math.AbsFloat(max_deviation_in_meters);
+	}
+	
+	//! Sets the maximum speed of the point light within the dancing shadows effect
+	void SetDancingShadowsMovementSpeed(float speed_in_meters_per_frame)
+	{
+		m_DancingShadowsSpeed = Math.AbsFloat(speed_in_meters_per_frame);
+	}
+	
+	//! Returns max movement range of pointlight within the dancing shadow effect
+	float GetDancingShadowsAmplitude()
+	{
+		return m_DancingShadowsAmplitude;
+	}
+	
+	//! Returns max movement speed of pointlight within the dancing shadow effect
+	float GetDancingShadowsMovementSpeed()
+	{
+		return m_DancingShadowsSpeed;
+	}
+	
+	//! Enables some debug functionality of this light
+	void EnableDebug(bool state)
+	{
+		m_IsDebugEnabled = state;
+	}
+	
+	// Handles subtle movement of the light point to create the effect of dancing shadows
+	void HandleDancingShadows(float time, float timeSlice)
+	{
+		if (m_DancingShadowsAmplitude > 0)
+		{
+			for (int i = 0; i < 3; i++ )
+			{
+				m_DancingShadowsLocalPos[i] = m_DancingShadowsLocalPos[i] +  ( Math.RandomFloat(-m_DancingShadowsSpeed,m_DancingShadowsSpeed) * timeSlice) ;
+				
+				if (m_DancingShadowsLocalPos[i] > m_DancingShadowsAmplitude)
+					m_DancingShadowsLocalPos[i] = m_DancingShadowsAmplitude;
+				
+				if (m_DancingShadowsLocalPos[i] < -m_DancingShadowsAmplitude)
+					m_DancingShadowsLocalPos[i] = -m_DancingShadowsAmplitude;
+				
+			}
+			
+			if (m_Parent  &&  !m_Parent.ToDelete())
+			{
+				// In order to move with the light, it must be detached from its parent first
+				
+				m_Parent.RemoveChild(this);
+				SetPosition(m_LocalPos + m_DancingShadowsLocalPos);
+				
+				m_Parent.AddChild(this, -1);
+				m_Parent.Update();
+			}
+			
+			if (m_IsDebugEnabled)
+			{
+				Particle p = ParticleManager.GetInstance().PlayInWorld( ParticleList.DEBUG_DOT, GetPosition() );
+				p.SetParticleParam( EmitorParam.SIZE, 0.01);
+			}
+		}
+		else
+		{
+			m_DancingShadowsLocalPos = Vector(0,0,0);
+		}
+	}
+	
+	// Updates flickering light
+	void HandleFlickering(float time, float timeSlice)
+	{
+		if (m_BrightnessPulseAmplitudeMax > 0)
+		{
+			m_BrightnessPulse += ( Math.RandomFloat(-m_BrightnessPulseSpeed, m_BrightnessPulseSpeed) ) * timeSlice;
+			
+			if (m_BrightnessPulse < m_BrightnessPulseAmplitudeMin + 1)
+				m_BrightnessPulse = m_BrightnessPulseAmplitudeMin + 1;
+			
+			if (m_BrightnessPulse > m_BrightnessPulseAmplitudeMax + 1)
+				m_BrightnessPulse = m_BrightnessPulseAmplitudeMax + 1;
+			
+		}
+		else
+		{
+			m_BrightnessPulse = 1;
+		}
+	}
+	
+	//! Sets speed of light flickering (random brightness coefficient change per second)
+	void SetFlickerSpeed(float speed)
+	{
+		m_BrightnessPulseSpeed = speed;
+	}
+	
+	//! Sets the change coefficient of flickering light. (0.0 - 1.0 values, result of greater values are period time of light off )
+	void SetFlickerAmplitude(float coef)
+	{
+		m_BrightnessPulseAmplitudeMax = Math.AbsFloat(coef);
+		m_BrightnessPulseAmplitudeMin = -Math.AbsFloat(coef);
+	}
+	
+	void SetFlickerAmplitudeMax(float coef)
+	{
+		m_BrightnessPulseAmplitudeMax = coef;
+	}
+	
+	void SetFlickerAmplitudeMin(float coef)
+	{
+		m_BrightnessPulseAmplitudeMin = coef;
+	}
+	
+	//! Returns flicker speed
+	float GetFlickerSpeed()
+	{
+		return m_BrightnessPulseSpeed;
+	}
+	
+	//! Returns flicker amplitude maximum
+	float GetFlickerAmplitudeCoefMax()
+	{
+		return m_BrightnessPulseAmplitudeMax;
+	}
+	
+	//! Returns flicker amplitude minimum
+	float GetFlickerAmplitudeCoefMin()
+	{
+		return m_BrightnessPulseAmplitudeMin;
+	}
+	
+	//! Optimizes shadows by disabling them on this light source while it's within the given radius around the camera.
+	void TryShadowOptimization()
+	{
+		if (m_OptimizeShadowsRadius > 0)
+		{
+			float distance_to_camera = vector.Distance( GetPosition(), GetGame().GetCurrentCameraPosition() );
+			
+			if (distance_to_camera < m_OptimizeShadowsRadius)
+			{
+				SetCastShadow(false);
+			}
+			else
+			{
+				SetCastShadow(true);
+			}
+		}
+	}
+	
+	//! When the light source gets within this radius (radius_in_m) around the camera, then it's shadows are disabled.
+	void SetDisableShadowsWithinRadius(float radius_in_m)
+	{
+		m_OptimizeShadowsRadius = radius_in_m;
+	}
+	
+	//! Returns the range you put inside SetDisableShadowsWithinRadius(...)
+	float GetDisableShadowsWithinRadius()
+	{
+		return m_OptimizeShadowsRadius;
+	}
+	
+	void CheckIfParentIsInCargo()
+	{
+		// TO DO: OPTIMIZE AND REFACTOR! THIS MUST BE HANDLED IN AN EVENT, NOT PER FRAME!
+		
+		if (m_Parent)
+		{
+			EntityAI parent_EAI = EntityAI.Cast( m_Parent );
+			
+			if (parent_EAI) // Check if the Cast was successfull
+			{
+				GameInventory GI = parent_EAI.GetInventory();
+				
+				if (GI) // Prevents handling of light on the parent item when it's projected in inventory as the item in inventory character's hands.
+				{
+					bool is_in_cargo = GI.IsInCargo();
+					
+					if (!is_in_cargo)
+					{
+						EntityAI parent2 = parent_EAI.GetHierarchyParent();
+						
+						if (parent2  &&  parent2.GetInventory())
+						{
+							is_in_cargo = parent2.GetInventory().IsInCargo();
+						}
+					}
+					
+					if ( is_in_cargo )
+					{
+						SetEnabled(false);
+					}
+					else
+					{
+						SetEnabled(true);
+					}
+				}
+			}
+		}
+	}
+	
+	// Destroys this light if it's past it lifetime
+	private bool CheckLifetime(int current_time)
+	{
+		if ( current_time > m_LifetimeEnd  &&  m_LifetimeEnd != -1 )
+		{
+			Destroy();
+			return false;
+		}
+		
+		return true;
+	}
+	
+	// Handles fade out effect at the end of lifetime
+	private void CheckFadeOut( int current_time)
+	{
+		// Control fade out of the light
+		if ( m_FadeOutTime != -1  &&  m_LifetimeEnd != -1  &&  current_time > m_LifetimeEnd - m_FadeOutTime )
+		{
+			m_FadeOutTime = -1;
+			m_FadeInTime = -1; // Stop fade in process
+			float time_left_in_s = (m_LifetimeEnd - current_time) * 0.001;
+			FadeBrightnessTo(0, time_left_in_s);
+			FadeRadiusTo(0, time_left_in_s);
+		}
+	}
+	
+	// handles fading of brightness
+	private void HandleBrightnessFadeing(float timeSlice)
+	{
+		if ( m_Brightness != m_BrightnessTarget )
+		{
+			float brightness_difference = m_Brightness - m_BrightnessTarget;
+			
+			if (brightness_difference > m_BrightnessSpeedOfChange*timeSlice)
+				brightness_difference = m_BrightnessSpeedOfChange*timeSlice;
+			
+			if (brightness_difference < -m_BrightnessSpeedOfChange*timeSlice)
+				brightness_difference = -m_BrightnessSpeedOfChange*timeSlice;
+			
+			m_Brightness -= brightness_difference;
+			
+			if ( m_Brightness > 0  ||  m_BrightnessTarget > 0)
+			{
+				SetBrightness(m_Brightness * m_BrightnessPulse);
+				CorrectLightPulseDuringDaylight();
+			}
+			else
+			{
+				Destroy();
+				return;
+			}
+		}
+		else
+		{
+			SetBrightness(m_Brightness * m_BrightnessPulse);
+			CorrectLightPulseDuringDaylight();
+		}
+	}
+	
+	// handles fading of radius
+	private void HandleRadiusFadeing(float timeSlice)
+	{
+		if ( m_Radius != m_RadiusTarget )
+		{
+			float radius_difference = m_Radius - m_RadiusTarget;
+			
+			if (radius_difference > m_RadiusSpeedOfChange*timeSlice)
+				radius_difference = m_RadiusSpeedOfChange*timeSlice;
+			
+			if (radius_difference < -m_RadiusSpeedOfChange*timeSlice)
+				radius_difference = -m_RadiusSpeedOfChange*timeSlice;
+			
+			m_Radius -= radius_difference;
+			
+			if ( m_Radius > 0  ||  m_RadiusTarget > 0)
+			{
+				SetRadius(m_Radius);
+			}
+			else
+			{
+				Destroy();
+				return;
+			}
+		}
+		else
+		{
+			SetRadius(m_Radius);
+		}
+	}
+	
+	//! Sets blinking speed (no blinking if speed <= 0)
+	void SetBlinkingSpeed(float _speed)
+	{
+		m_BlinkingSpeed = _speed;
+	}
+	
+	//! Returns the speed of blinks
+	float GetBlinkingSpeed()
+	{
+		return m_BlinkingSpeed;
+	}
+	
+	// handles blinking. Turns light  on and off on regular intervals
+	private void HandleBlinking(float time)
+	{
+		if ( m_BlinkingSpeed <= 0 )
+			return;
+		
+		float multiplier;
+
+		multiplier = Math.Sin(time * 0.001 * m_BlinkingSpeed);		// Oscillate the multiplier overtime (time normalized to sec)
+		multiplier = (multiplier + 1)/2;							// Normalized the value to 0-1 
+		
+		multiplier = Math.Round(multiplier);						// Rounding to 0 or 1 to make it blink instantly	
+		SetBrightness(m_Brightness * multiplier);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..0f7552e860d397c1c638f30ec08876184ae6622e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase.c
@@ -0,0 +1,7 @@
+class PointLightBase extends ScriptedLightBase
+{
+	void PointLightBase()
+	{
+		SetLightType(LightSourceType.PointLight); // This function must be called in constructor of the light!
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/AnniversaryBoxLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/AnniversaryBoxLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab187f7b024e1f5fe4f61f820cf729dcd0836ce0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/AnniversaryBoxLight.c
@@ -0,0 +1,12 @@
+class AnniversaryBoxLight extends PointLightBase
+{
+	void AnniversaryBoxLight()
+	{
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( 1 );
+		SetBrightnessTo( 3 );
+		SetCastShadow( false );
+		SetAmbientColor( 0.9, 0.85, 0.4 );
+		SetDiffuseColor( 0.9, 0.85, 0.4 );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/AnniversaryMainLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/AnniversaryMainLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..a4160f312bf713b157ed65896e3bab1184eb0fb4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/AnniversaryMainLight.c
@@ -0,0 +1,12 @@
+class AnniversaryMainLight : PointLightBase
+{
+	void AnniversaryMainLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo(50);
+		SetBrightnessTo(8);
+		SetCastShadow(false);
+		SetAmbientColor(1, 0.87, 0.6);
+		SetDiffuseColor(1, 0.87, 0.6);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BlowtorchLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BlowtorchLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..63f505af912c263512c6efbaa6a5d0b700676078
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BlowtorchLight.c
@@ -0,0 +1,21 @@
+class BlowtorchLight : PointLightBase
+{
+	void BlowtorchLight()
+	{
+		SetVisibleDuringDaylight( false );
+		SetRadiusTo( 1 );
+		SetBrightnessTo( 3.0 );
+		SetCastShadow( true );
+		SetFadeOutTime( 0.2 );
+		SetDiffuseColor( 0.2, 0.45, 0.7 );
+		SetAmbientColor( 0.2, 0.45, 0.7 );
+		SetFlareVisible( false );
+		SetFlickerAmplitude( 0.35 );
+		SetFlickerSpeed( 0.55 );
+		SetDancingShadowsMovementSpeed( 0.05 );
+		SetDancingShadowsAmplitude( 0.03 );
+		EnableHeatHaze( true);
+		SetHeatHazeRadius( 0.08 );
+		SetHeatHazePower( 0.015 );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BonfireLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BonfireLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8f564832866c6299e4713827988fe6c6412e371
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BonfireLight.c
@@ -0,0 +1,27 @@
+class BonfireLight extends PointLightBase
+{
+	static float m_FireRadius = 40;
+	static float m_FireBrightness = 15.0;
+	static string m_MemoryPoint = "bonfire_fire";
+	
+	void BonfireLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(m_FireRadius);
+		SetBrightnessTo(m_FireBrightness);
+		SetCastShadow(false);
+		SetFadeOutTime(1);
+		SetDiffuseColor(1.0, 0.45, 0.25);
+		SetAmbientColor(1.0, 0.45, 0.25);
+		SetFlareVisible(false);
+		SetFlickerAmplitude(0.55);
+		SetFlickerSpeed(0.75);
+		SetDancingShadowsMovementSpeed(0.1);
+		SetDancingShadowsAmplitude(0.03);
+	}
+	
+	override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BrightnessTestLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BrightnessTestLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..5322d4eeef7668de26e161e0a2e76c5f5f04349f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/BrightnessTestLight.c
@@ -0,0 +1,30 @@
+// Test case for light sources not working during daytime as expected
+
+class BrightnessTestLight extends PointLightBase
+{
+	float m_Timer = 0;
+	
+	void BrightnessTestLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo( 30 );
+		SetCastShadow(true);
+		SetDiffuseColor(1, 1, 1);
+		SetAmbientColor(1, 1, 1);
+
+		SetBrightnessTo(10);
+	}
+	
+	override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		m_Timer += timeSlice;
+		
+		float pulse = Math.AbsFloat( Math.Cos( m_Timer) );
+		
+		if (pulse > 0)
+		{
+			Print(pulse);
+			SetBrightnessTo(pulse);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/ChemlightLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/ChemlightLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..7de81604c9922b4d5dd15739438e5bba1ba7f702
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/ChemlightLight.c
@@ -0,0 +1,51 @@
+class ChemlightLight extends PointLightBase
+{
+	private static float m_DefaultBrightness = 1.5;
+	private static float m_DefaultRadius = 7.5;
+	
+	void ChemlightLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo(m_DefaultRadius);
+		SetBrightnessTo(m_DefaultBrightness);
+		FadeIn(1);
+		SetFadeOutTime(2);
+		SetFlareVisible(false);
+	}
+	
+	void SetIntensity( float coef, float time )
+	{
+		FadeBrightnessTo(m_DefaultBrightness * coef, time);
+		FadeRadiusTo(m_DefaultRadius * coef, time);
+	}
+	
+	void SetColorToWhite()
+	{
+		SetAmbientColor(0.9, 0.9, 1.0);
+		SetDiffuseColor(0.9, 0.9, 1.0);
+	}
+	
+	void SetColorToRed()
+	{
+		SetAmbientColor(1.0, 0.3, 0.2);
+		SetDiffuseColor(1.0, 0.3, 0.2);
+	}
+	
+	void SetColorToGreen()
+	{
+		SetAmbientColor(0.3, 1.0, 0.2);
+		SetDiffuseColor(0.3, 1.0, 0.2);
+	}
+	
+	void SetColorToBlue()
+	{
+		SetAmbientColor(0.3, 0.3, 1.0);
+		SetDiffuseColor(0.3, 0.3, 1.0);
+	}
+	
+	void SetColorToYellow()
+	{
+		SetAmbientColor(1.0, 1.0, 0.3);
+		SetDiffuseColor(1.0, 1.0, 0.3);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/EntranceLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/EntranceLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..12adbb698281c114766577af161a17d3c735e431
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/EntranceLight.c
@@ -0,0 +1,36 @@
+class EntranceLight extends PointLightBase
+{
+	protected float m_DefaultBrightness = 0.5;
+	protected float m_DefaultRadius = 5.5;
+	
+	void EntranceLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(m_DefaultRadius);
+		SetBrightnessTo(m_DefaultBrightness);
+		FadeIn(1);
+		SetFadeOutTime(2);
+		SetFlareVisible(false);
+		SetCastShadow(false);
+		SetAmbientColor(0.9, 0.9, 0.7);
+		SetDiffuseColor(0.9, 0.9, 0.7);
+	}
+}
+
+class EntranceLightStairs1 : EntranceLight
+{
+	void EntranceLightStairs1()
+	{				
+		SetRadiusTo(10);
+		SetBrightnessTo(0.5);
+		SetCastShadow(true);
+		SetAmbientColor(1.0, 0.4, 0.4);
+		SetDiffuseColor(1.0, 0.4, 0.4);
+	}
+}
+
+class EntranceLightStairs2 : EntranceLight { }
+
+class EntranceLightMain1 : EntranceLight { }
+
+class EntranceLightMain2 : EntranceLight { }
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/FireplaceLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/FireplaceLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b290499e0846bf114e9666e8067d7328892d25d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/FireplaceLight.c
@@ -0,0 +1,42 @@
+class FireplaceLight extends PointLightBase
+{
+	static float m_FireplaceRadius = 25;
+	static float m_FireplaceBrightness = 4.75;
+	
+	void FireplaceLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo( m_FireplaceRadius );
+		SetBrightnessTo(m_FireplaceBrightness);
+		SetCastShadow(true);
+		SetFadeOutTime(5);
+		SetDiffuseColor(1.3, 0.35, 0.15);
+		SetAmbientColor(1.3, 0.35, 0.15);
+		SetFlareVisible(false);
+		SetFlickerAmplitude(0.3);
+		SetFlickerSpeed(0.9);
+		SetExteriorMode();
+		EnableHeatHaze(true);
+		SetHeatHazeRadius(0.23);
+		SetHeatHazePower(0.010);
+	}
+	
+	// Use this mode when the light is in tight space like barrel, chimney or improvsed oven
+	void SetInteriorMode()
+	{
+		SetDancingShadowsMovementSpeed(0.05);
+		SetDancingShadowsAmplitude(0.05);
+	}
+	
+	// Use this mode when fireplace is on the ground with plenty of space for the light to wiggle around
+	void SetExteriorMode()
+	{
+		SetDancingShadowsMovementSpeed(0.25);
+		SetDancingShadowsAmplitude(0.10);
+	}
+	
+	/*override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/FlareLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/FlareLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..ae597e0b8007433d77c6f88429138cef770a93e4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/FlareLight.c
@@ -0,0 +1,69 @@
+class FlareLight extends PointLightBase
+{
+	static float 	m_FlareRadius = 100;
+	static float 	m_FlareBrightness = 10.0;
+	static string 	m_MemoryPoint = "light";
+	
+	void FlareLight()
+	{
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( m_FlareRadius );
+		SetBrightnessTo( m_FlareBrightness );
+		FadeIn( 1 );
+		SetFadeOutTime( 0.2 );
+		SetDiffuseColor( 0.7, 0.7, 0.3 );
+		SetAmbientColor( 0.7, 0.7, 0.3 );
+		SetFlareVisible( false );
+		SetFlickerAmplitude( 0.9 );
+		SetFlickerSpeed( 0.3 );
+		SetDancingShadowsMovementSpeed( 0.5 );
+		SetDancingShadowsAmplitude( 0.15 );
+		//SetLifetime( 50 );
+		EnableLinear( true );
+		EnableHeatHaze( true );
+		SetHeatHazeRadius( 0.1 );
+		SetHeatHazePower( 0.02 );
+		#ifdef PLATFORM_WINDOWS
+			SetCastShadow( true );
+		#else
+			SetCastShadow( false );
+		#endif
+		
+	}
+}
+
+class FlareLightRed extends FlareLight
+{
+	
+	void FlareLightRed()
+	{
+		SetDiffuseColor( 1.0, 0.3, 0.3 );
+		SetAmbientColor( 1.0, 0.3, 0.3 );
+	}
+}
+
+class FlareLightGreen extends FlareLight
+{	
+	void FlareLightGreen()
+	{
+		SetDiffuseColor( 0.3, 1.0, 0.3 );
+		SetAmbientColor( 0.3, 1.0, 0.3 );
+	}
+}
+
+class FlareLightBlue extends FlareLight
+{
+	void FlareLightBlue()
+	{
+		SetDiffuseColor( 0.3, 0.3, 1.0 );
+		SetAmbientColor( 0.3, 0.3, 1.0 );
+	}
+}
+
+class FlareLightContamination extends FlareLightRed
+{
+	void FlareLightContamination()
+	{
+		SetLifetime( 20 );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/GoatLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/GoatLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..fa41822d762a3fad0a3d31c8273eee0862ff79d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/GoatLight.c
@@ -0,0 +1,18 @@
+class GoatLight extends PointLightBase
+{
+	void GoatLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(1.6);
+		SetBrightnessTo(3.1);
+		SetCastShadow(false);
+		SetFadeOutTime(15);
+		SetDiffuseColor(0.85, 0.1, 0.1);
+		SetAmbientColor(0.85, 0.1, 0.1);
+		SetFlareVisible(false);
+		SetFlickerAmplitude(0.35);
+		SetFlickerSpeed(0.25);
+		SetDancingShadowsMovementSpeed(0.05);
+		SetDancingShadowsAmplitude(0.03);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/MuzzleFlashLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/MuzzleFlashLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..705c509ae0be01213c4ea8aee4b9ad46acaa42aa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/MuzzleFlashLight.c
@@ -0,0 +1,56 @@
+class MuzzleFlashLight extends PointLightBase
+{
+	static float m_Lifetime = 0.04;
+	
+	void MuzzleFlashLight()
+	{
+		SetLifetime(m_Lifetime);
+		FadeIn(m_Lifetime * 0.5);
+		SetFadeOutTime(m_Lifetime * 0.5);
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo( 15 );
+		SetBrightnessTo(1);
+		SetCastShadow(false);
+		SetAmbientColor(0.76, 0.68, 0.31);
+		SetDiffuseColor(0.76, 0.68, 0.31);
+		SetFlareVisible(false);
+	}
+}
+
+class MuzzleFlashLight_1 extends PointLightBase
+{
+	static float m_Lifetime = 0.08;
+	
+	void MuzzleFlashLight_1()
+	{
+		SetLifetime( m_Lifetime );
+		FadeIn( m_Lifetime * 0.2 );
+		SetFadeOutTime( m_Lifetime * 0.2 );
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( 17 );
+		SetBrightnessTo( 0.5 );
+		SetCastShadow( false );
+		SetAmbientColor( 0.56, 0.42, 0.3 );
+		SetDiffuseColor( 0.56, 0.42, 0.3 );
+		SetFlareVisible( false );
+	}
+}
+
+class MuzzleFlashLight_2 extends PointLightBase
+{
+	static float m_Lifetime = 0.01;
+	
+	void MuzzleFlashLight_2()
+	{
+		SetLifetime( m_Lifetime );
+		FadeIn( m_Lifetime * 0.1 );
+		SetFadeOutTime( m_Lifetime * 0.1 );
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( 12 );
+		SetBrightnessTo( 0.2 );
+		SetCastShadow( false );
+		SetAmbientColor( 0.36, 0.32, 0.13 );
+		SetDiffuseColor( 0.36, 0.32, 0.13 );
+		SetFlareVisible( false );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PartyLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PartyLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..5208c43093519d3c0c2a08f193959aacaf896503
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PartyLight.c
@@ -0,0 +1,26 @@
+class PartyLight extends PointLightBase
+{
+	float m_Timer = 0;
+	
+	void PartyLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo( 30 );
+		SetBrightnessTo(1.0);
+		SetCastShadow(true);
+		//SetLifetime(600);
+		SetFadeOutTime(1);
+	}
+	
+	override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		float valS = Math.AbsFloat(Math.Sin(m_Timer * Math.PI2));
+		float valC = Math.AbsFloat(Math.Cos(m_Timer * Math.PI2));
+		float valT = Math.AbsFloat(Math.Tan(m_Timer * Math.PI2));
+		SetDiffuseColor(valS, valC, valT);
+		SetAmbientColor(valS, valC, valT);
+		
+		
+		m_Timer += timeSlice;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PersonalLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PersonalLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..6cd82a8cbd3fe4f3d60de7b3075cf9b615fbc255
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PersonalLight.c
@@ -0,0 +1,47 @@
+class PersonalLight extends PointLightBase
+{	
+	void PersonalLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo( 3 );
+		SetBrightnessTo(0.38);
+		SetDiffuseColor(0.2, 0.23, 0.25);
+		SetCastShadow(false);
+		EnableSpecular(false);
+		EnableLinear(true);
+		SetFlareVisible(false);
+	}
+	
+	override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		if ( GetGame()  &&  IsEnabled() )
+		{
+			vector pos = GetGame().GetCurrentCameraPosition();
+			pos += Vector( 0, -0.4, 0 );
+			
+			SetPosition( pos );
+		}
+	}
+	
+	// Experiment with dynamic range of Personal Light based on distance between camera and player's character.
+	/*override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		if ( GetGame()  &&  IsEnabled() )
+		{
+			vector pos = GetGame().GetCurrentCameraPosition();
+			vector dir = GetGame().GetCurrentCameraDirection();
+			
+			SetPosition(pos);
+			
+			DayZPlayer plr = GetGame().GetPlayer();
+			if (plr)
+			{
+				vector pos_plr = plr.GetPosition() + Vector(0, 1.64, 0);
+				float distance = vector.Distance( pos_plr, pos );
+				//Print(distance);
+				float radius = 20.0 + distance;
+				SetRadiusTo( radius );
+			}
+		}
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PortableGasLampLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PortableGasLampLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..15f0b56df5c1379db61b55daf1961da3dad8dc9e
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/PortableGasLampLight.c
@@ -0,0 +1,26 @@
+class PortableGasLampLight extends PointLightBase
+{
+	static float m_TorchRadius = 15;
+	static float m_TorchBrightness = 5.0;
+	
+	void PortableGasLampLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo( m_TorchRadius );
+		SetBrightnessTo(m_TorchBrightness);
+		SetCastShadow(true);
+		FadeIn(0.5);
+		SetFadeOutTime(0.1);
+		SetDiffuseColor(1.0, 0.7, 0.5);
+		SetAmbientColor(1.0, 0.7, 0.5);
+		SetFlickerAmplitude(0.3);
+		SetFlickerSpeed(0.75);
+		SetDancingShadowsMovementSpeed(0.005);
+		SetDancingShadowsAmplitude(0.003);
+	}
+	
+	/*override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/RoadflareLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/RoadflareLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..4557998150a4431cb7192362f7d2112488bef736
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/RoadflareLight.c
@@ -0,0 +1,31 @@
+class RoadflareLight extends PointLightBase
+{
+	static float 	m_RoadflareRadius = 30;
+	static float 	m_RoadflareBrightness = 8.5;
+	static string 	m_MemoryPoint = "light";
+	
+	void RoadflareLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo( m_RoadflareRadius );
+		SetBrightnessTo(m_RoadflareBrightness);
+		SetCastShadow(true);
+		FadeIn(1);
+		SetFadeOutTime(1);
+		SetDiffuseColor(1.0, 0.3, 0.3);
+		SetAmbientColor(1.0, 0.3, 0.3);
+		SetFlareVisible(true);
+		SetFlickerAmplitude(0.2);
+		SetFlickerSpeed(1.5);
+		SetDancingShadowsMovementSpeed(0.1);
+		SetDancingShadowsAmplitude(0.015);
+		EnableHeatHaze(true);
+		SetHeatHazeRadius(0.1);
+		SetHeatHazePower(0.02);
+	}
+	
+	/*override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/StoveLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/StoveLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..6dcc9b7f3ce24986190c1e0c0d13e8bea5afe6aa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/StoveLight.c
@@ -0,0 +1,21 @@
+class StoveLight extends PointLightBase
+{
+	void StoveLight()
+	{
+		SetVisibleDuringDaylight( false );
+		SetRadiusTo( 1 );
+		SetBrightnessTo( 3.0 );
+		SetCastShadow( true );
+		SetFadeOutTime( 0.2 );
+		SetDiffuseColor( 0.2, 0.45, 0.7 );
+		SetAmbientColor( 0.2, 0.45, 0.7 );
+		SetFlareVisible( false );
+		SetFlickerAmplitude( 0.35 );
+		SetFlickerSpeed( 0.55 );
+		SetDancingShadowsMovementSpeed( 0.05 );
+		SetDancingShadowsAmplitude( 0.03 );
+		EnableHeatHaze( true);
+		SetHeatHazeRadius( 0.08 );
+		SetHeatHazePower( 0.015 );
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/TorchLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/TorchLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..8edb376a94b63a46ead33a9afab5568225f38ed5
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/TorchLight.c
@@ -0,0 +1,29 @@
+class TorchLight extends PointLightBase
+{
+	static float m_TorchRadius = 30;
+	static float m_TorchBrightness = 5.0;
+	
+	void TorchLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo( m_TorchRadius );
+		SetBrightnessTo(m_TorchBrightness);
+		SetCastShadow(true);
+		SetFadeOutTime(1);
+		SetDiffuseColor(1.3, 0.35, 0.15);
+		SetAmbientColor(1.3, 0.35, 0.15);
+		SetFlareVisible(false);
+		SetFlickerAmplitude(0.55);
+		SetFlickerSpeed(0.75);
+		SetDancingShadowsMovementSpeed(0.1);
+		SetDancingShadowsAmplitude(0.03);
+		EnableHeatHaze(true);
+		SetHeatHazeRadius(0.08);
+		SetHeatHazePower(0.015);
+	}
+	
+	override void OnFrameLightSource(IEntity other, float timeSlice)
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/XmasSleighLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/XmasSleighLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..61c61b58177b992ddecf6e11c78675e5a2ad6a6d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/XmasSleighLight.c
@@ -0,0 +1,14 @@
+class XmasSleighLight extends PointLightBase
+{
+	void XmasSleighLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo(24);
+		SetBrightnessTo(3);
+		SetCastShadow(false);
+		SetDiffuseColor(0.7, 0.7, 1.0);
+		SetFlareVisible(false);
+		SetFlickerAmplitude(0.5);
+		SetFlickerSpeed(1);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/XmasTreeLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/XmasTreeLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..9033eb9aae11d92ce3428862ce947e155b4a8feb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/XmasTreeLight.c
@@ -0,0 +1,13 @@
+class XmasTreeLight extends PointLightBase
+{
+	void XmasTreeLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo( 12 );
+		SetBrightnessTo( 0.50 );
+		SetCastShadow(false);
+		SetDiffuseColor(1.2, 1.0, 0.7);
+		SetDancingShadowsMovementSpeed(0.005);
+		SetDancingShadowsAmplitude(0.003);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/ZombieMummyLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/ZombieMummyLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..600a165e46e2c4f16c26fc40a0f413a12b21abde
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/PointLightBase/ZombieMummyLight.c
@@ -0,0 +1,18 @@
+class ZombieMummyLight extends PointLightBase
+{
+	void ZombieMummyLight()
+	{
+		SetVisibleDuringDaylight(false);
+		SetRadiusTo(2.1);
+		SetBrightnessTo(3.1);
+		SetCastShadow(false);
+		SetFadeOutTime(15);
+		SetDiffuseColor(0.6, 0.5, 0.1);
+		SetAmbientColor(0.6, 0.5, 0.1);
+		SetFlareVisible(false);
+		SetFlickerAmplitude(0.35);
+		SetFlickerSpeed(0.25);
+		SetDancingShadowsMovementSpeed(0.05);
+		SetDancingShadowsAmplitude(0.03);
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3f0697b5f2b191bbf3d78149fd57ce8255b93ec4
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase.c
@@ -0,0 +1,7 @@
+class SpotLightBase extends ScriptedLightBase
+{
+	void SpotLightBase()
+	{
+		SetLightType(LightSourceType.SpotLight); // This function must be called in constructor of the light!
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..52ae2de3f8600f43adc2ac16d37a0c182896452f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase.c
@@ -0,0 +1,47 @@
+class CarLightBase extends SpotLightBase
+{
+	// What follows are just default light parameters which are overwriten down in the hierarchy in constructors.
+	// 'Segregated' means value for a light source that consists of 1 bulb (ex.: when 1 of 2 headlights are destroyed)
+	// 'Aggregated' means value for 1 light source that consists of 2 bulbs (ex.: when both headlights are shining, or brake & reverse lights are shining at once)
+	// Aggregating lights saves a lot of performance
+	
+	float		m_SegregatedBrightness = 20;
+	float		m_SegregatedRadius = 66;
+	float		m_SegregatedAngle = 90;
+	vector		m_SegregatedColorRGB = Vector(1.0, 0.8, 0.6);
+	
+	float		m_AggregatedBrightness = 30;
+	float		m_AggregatedRadius = 100;
+	float		m_AggregatedAngle = 100;
+	vector		m_AggregatedColorRGB = Vector(1.0, 0.8, 0.6);
+	
+	void CarLightBase()
+	{
+		SetVisibleDuringDaylight(true);
+		SetCastShadow(true);
+		SetFlareVisible(true);
+		FadeIn(0.3);
+		SetFadeOutTime(0.25);
+		
+	}
+	
+	void AggregateLight()
+	{
+		SetRadiusTo(m_AggregatedRadius);
+		SetSpotLightAngle(m_AggregatedAngle);
+		SetBrightnessTo(m_AggregatedBrightness);
+		SetAmbientColor(m_AggregatedColorRGB[0], m_AggregatedColorRGB[1], m_AggregatedColorRGB[2]);
+		SetDiffuseColor(m_AggregatedColorRGB[0], m_AggregatedColorRGB[1], m_AggregatedColorRGB[2]);
+		SetFlareVisible(false);
+	}
+	
+	void SegregateLight()
+	{
+		SetRadiusTo(m_SegregatedRadius);
+		SetSpotLightAngle(m_SegregatedAngle);
+		SetBrightnessTo(m_SegregatedBrightness);
+		SetAmbientColor(m_SegregatedColorRGB[0], m_SegregatedColorRGB[1], m_SegregatedColorRGB[2]);
+		SetDiffuseColor(m_SegregatedColorRGB[0], m_SegregatedColorRGB[1], m_SegregatedColorRGB[2]);
+		SetFlareVisible(true);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..33e5ce5a36bd715b9ea46a81531ce322aa048139
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase.c
@@ -0,0 +1,55 @@
+class CarRearLightBase extends CarLightBase
+{
+	// Brake light only. These are just some default values which are overwritten down the hierarchy.
+	float 	m_SegregatedBrakeBrightness = 2;
+	float 	m_SegregatedBrakeRadius = 6;
+	float 	m_SegregatedBrakeAngle = 180;
+	vector 	m_SegregatedBrakeColorRGB = Vector(1, 0.05, 0.05);
+	
+	void CarRearLight()
+	{
+		// These are just some default values which can be overwrittend down in the hierarchy.
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 10;
+		m_SegregatedAngle = 180;
+		m_SegregatedColorRGB = Vector(1.0, 1.0, 1.0);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 2.5;
+		m_AggregatedRadius = 12;
+		m_AggregatedAngle = 180;
+		m_AggregatedColorRGB = Vector(1.0, 0.5, 0.5);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.1);
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		EnableSpecular(false); // Specular is disabled because it causes ugly shining on cars
+		
+		SegregateLight();
+	}
+	
+	void SetAsSegregatedBrakeLight()
+	{
+		SetRadiusTo(m_SegregatedBrakeRadius);
+		SetSpotLightAngle(m_SegregatedBrakeAngle);
+		SetBrightnessTo(m_SegregatedBrakeBrightness);
+		SetAmbientColor(m_SegregatedBrakeColorRGB[0], m_SegregatedBrakeColorRGB[1], m_SegregatedBrakeColorRGB[2]);
+		SetDiffuseColor(m_SegregatedBrakeColorRGB[0], m_SegregatedBrakeColorRGB[1], m_SegregatedBrakeColorRGB[2]);
+		SetFadeOutTime(0.1);
+		SetFlareVisible(false);
+	}
+	
+	void SetAsSegregatedReverseLight()
+	{
+		SetRadiusTo(m_SegregatedRadius);
+		SetSpotLightAngle(m_SegregatedAngle);
+		SetBrightnessTo(m_SegregatedBrightness);
+		SetAmbientColor(m_SegregatedColorRGB[0], m_SegregatedColorRGB[1], m_SegregatedColorRGB[2]);
+		SetDiffuseColor(m_SegregatedColorRGB[0], m_SegregatedColorRGB[1], m_SegregatedColorRGB[2]);
+		SetFadeOutTime(0.1);
+		SetFlareVisible(false);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/CivilianSedanRearLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/CivilianSedanRearLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..70de38656785c8988773e0f673bb45ca37a5727c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/CivilianSedanRearLight.c
@@ -0,0 +1,31 @@
+class CivilianSedanRearLight extends CarRearLightBase
+{
+	void CivilianSedanRearLight()
+	{
+		// Brake light only
+		m_SegregatedBrakeBrightness = 1;
+		m_SegregatedBrakeRadius = 6;
+		m_SegregatedBrakeAngle = 270;
+		m_SegregatedBrakeColorRGB = Vector(1, 0.6, 0.05);
+		
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 13;
+		m_SegregatedAngle = 180;
+		m_SegregatedColorRGB = Vector(1.0, 1.0, 0.8);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 2.5;
+		m_AggregatedRadius = 15;
+		m_AggregatedAngle = 180;
+		m_AggregatedColorRGB = Vector(1.0, 0.8, 0.6);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.1);
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Hatchback_02RearLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Hatchback_02RearLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ba68370d6aa0c3f1108909c005c50da47bee905
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Hatchback_02RearLight.c
@@ -0,0 +1,31 @@
+class Hatchback_02RearLight extends CarRearLightBase
+{
+	void Hatchback_02RearLight()
+	{
+		// Brake light only
+		m_SegregatedBrakeBrightness = 1;
+		m_SegregatedBrakeRadius = 6;
+		m_SegregatedBrakeAngle = 270;
+		m_SegregatedBrakeColorRGB = Vector(1, 0.05, 0.05);
+		
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 13;
+		m_SegregatedAngle = 180;
+		m_SegregatedColorRGB = Vector(1.0, 1.0, 1.0);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 2.5;
+		m_AggregatedRadius = 15;
+		m_AggregatedAngle = 180;
+		m_AggregatedColorRGB = Vector(1.0, 0.5, 0.5);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.1);
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/OffroadHatchbackRearLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/OffroadHatchbackRearLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..418f97c2ca0d9cbf2944f7f57595304d13ff82e1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/OffroadHatchbackRearLight.c
@@ -0,0 +1,31 @@
+class OffroadHatchbackRearLight extends CarRearLightBase
+{
+	void OffroadHatchbackRearLight()
+	{
+		// Brake light only
+		m_SegregatedBrakeBrightness = 1;
+		m_SegregatedBrakeRadius = 6;
+		m_SegregatedBrakeAngle = 180;
+		m_SegregatedBrakeColorRGB = Vector(1, 0.05, 0.05);
+		
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 13;
+		m_SegregatedAngle = 180;
+		m_SegregatedColorRGB = Vector(1.0, 1.0, 1.0);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 2.5;
+		m_AggregatedRadius = 15;
+		m_AggregatedAngle = 180;
+		m_AggregatedColorRGB = Vector(1.0, 0.5, 0.5);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.1);
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Offroad_02RearLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Offroad_02RearLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bc74886f0004684bc8b935495abed308a196ad3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Offroad_02RearLight.c
@@ -0,0 +1,32 @@
+class Offroad_02RearLight extends CarRearLightBase
+{
+	void Offroad_02RearLight()
+	{
+		// Brake light only
+		m_SegregatedBrakeBrightness = 6;
+		m_SegregatedBrakeRadius = 6;
+		m_SegregatedBrakeAngle = 220;
+		m_SegregatedBrakeColorRGB = Vector(0.95, 0.15, 0.13);
+		
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 15;
+		m_SegregatedAngle = 160;
+		m_SegregatedColorRGB = Vector(0.64, 0.60, 0.62);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 7;
+		m_AggregatedRadius = 18;
+		m_AggregatedAngle = 170;
+		m_AggregatedColorRGB = Vector(1.0, 0.4, 0.5);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.05);
+
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		
+		SegregateLight();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Sedan_02RearLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Sedan_02RearLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..3afd347f394eae00c52e846375eff8f4fca273f6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Sedan_02RearLight.c
@@ -0,0 +1,32 @@
+class Sedan_02RearLight extends CarRearLightBase
+{
+	void Sedan_02RearLight()
+	{
+		// Brake light only
+		m_SegregatedBrakeBrightness = 5;
+		m_SegregatedBrakeRadius = 6;
+		m_SegregatedBrakeAngle = 160;
+		m_SegregatedBrakeColorRGB = Vector(0.95, 0.16, 0.05);
+		
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 10;
+		m_SegregatedAngle = 120;
+		m_SegregatedColorRGB = Vector(0.80, 0.85, 0.9);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 5;
+		m_AggregatedRadius = 10;
+		m_AggregatedAngle = 160;
+		m_AggregatedColorRGB = Vector(0.9, 0.4, 0.5);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.05);
+
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Truck_01RearLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Truck_01RearLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..b30b5324461b1e6632790d9967a43bd15b23fd6d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CarRearLightBase/Truck_01RearLight.c
@@ -0,0 +1,32 @@
+class Truck_01RearLight extends CarRearLightBase
+{
+	void Truck_01RearLight()
+	{
+		// Brake light only
+		m_SegregatedBrakeBrightness = 5;
+		m_SegregatedBrakeRadius = 6;
+		m_SegregatedBrakeAngle = 160;
+		m_SegregatedBrakeColorRGB = Vector(0.75, 0.16, 0.05);
+		
+		// Reverse light only
+		m_SegregatedBrightness = 2;
+		m_SegregatedRadius = 10;
+		m_SegregatedAngle = 120;
+		m_SegregatedColorRGB = Vector(0.80, 0.85, 0.9);
+		
+		// Brake & Revese lights combined
+		m_AggregatedBrightness = 5;
+		m_AggregatedRadius = 10;
+		m_AggregatedAngle = 160;
+		m_AggregatedColorRGB = Vector(0.85, 0.35, 0.45);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.05);
+
+		SetVisibleDuringDaylight(false);
+		SetCastShadow(false);
+		SetFlareVisible(false);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CivilianSedanFrontLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CivilianSedanFrontLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..a4cf00ee68ee2cccaf92d88d2e8aa8b0ce731ba0
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/CivilianSedanFrontLight.c
@@ -0,0 +1,20 @@
+class CivilianSedanFrontLight extends CarLightBase
+{
+	void CivilianSedanFrontLight()
+	{
+		m_SegregatedBrightness = 5;
+		m_SegregatedRadius = 65;
+		m_SegregatedAngle = 90;
+		m_SegregatedColorRGB = Vector(1.0, 0.8, 0.8);
+		
+		m_AggregatedBrightness = 10;
+		m_AggregatedRadius = 80;
+		m_AggregatedAngle = 100;
+		m_AggregatedColorRGB = Vector(1.0, 0.8, 0.8);
+		
+		FadeIn(0.3);
+		SetFadeOutTime(0.25);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Hatchback_02FrontLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Hatchback_02FrontLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..17dbe1c89cac21841c4932d995da6635d8d26b29
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Hatchback_02FrontLight.c
@@ -0,0 +1,20 @@
+class Hatchback_02FrontLight extends CarLightBase
+{
+	void Hatchback_02FrontLight()
+	{
+		m_SegregatedBrightness = 6;
+		m_SegregatedRadius = 65;
+		m_SegregatedAngle = 80;
+		m_SegregatedColorRGB = Vector(0.8, 0.8, 1);
+		
+		m_AggregatedBrightness = 12;
+		m_AggregatedRadius = 90;
+		m_AggregatedAngle = 90;
+		m_AggregatedColorRGB = Vector(0.8, 0.8, 1);
+		
+		FadeIn(0.3);
+		SetFadeOutTime(0.25);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/OffroadHatchbackFrontLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/OffroadHatchbackFrontLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..35c4e9c6ad1df03253b2822e3a2075061ddf00fa
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/OffroadHatchbackFrontLight.c
@@ -0,0 +1,20 @@
+class OffroadHatchbackFrontLight extends CarLightBase
+{
+	void OffroadHatchbackFrontLight()
+	{
+		m_SegregatedBrightness = 5;
+		m_SegregatedRadius = 55;
+		m_SegregatedAngle = 110;
+		m_SegregatedColorRGB = Vector(1.0, 0.8, 0.6);
+		
+		m_AggregatedBrightness = 10;
+		m_AggregatedRadius = 75;
+		m_AggregatedAngle = 120;
+		m_AggregatedColorRGB = Vector(1.0, 0.8, 0.6);
+		
+		FadeIn(0.3);
+		SetFadeOutTime(0.25);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Offroad_02FrontLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Offroad_02FrontLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b05fbe50b9c4111b1dda2e147b6bf2ccea949bf
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Offroad_02FrontLight.c
@@ -0,0 +1,20 @@
+class Offroad_02FrontLight extends CarLightBase
+{
+	void Offroad_02FrontLight()
+	{
+		m_SegregatedBrightness = 5;
+		m_SegregatedRadius = 75;
+		m_SegregatedAngle = 90;
+		m_SegregatedColorRGB = Vector(0.85, 0.85, 0.58);
+		
+		m_AggregatedBrightness = 10;
+		m_AggregatedRadius = 100;
+		m_AggregatedAngle = 120;
+		m_AggregatedColorRGB = Vector(0.85, 0.85, 0.58);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.05);
+		
+		SegregateLight();
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Sedan_02FrontLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Sedan_02FrontLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ea98ccede537b7296d29997e02cabd895de0222
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Sedan_02FrontLight.c
@@ -0,0 +1,20 @@
+class Sedan_02FrontLight extends CarLightBase
+{
+	void Sedan_02FrontLight()
+	{
+		m_SegregatedBrightness = 4;
+		m_SegregatedRadius = 75;
+		m_SegregatedAngle = 90;
+		m_SegregatedColorRGB = Vector(0.95, 0.95, 0.78);
+		
+		m_AggregatedBrightness = 8;
+		m_AggregatedRadius = 100;
+		m_AggregatedAngle = 120;
+		m_AggregatedColorRGB = Vector(0.95, 0.95, 0.78);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.05);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Truck_01FrontLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Truck_01FrontLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..3d869a4040b684bfad5bd23373ae251d00beb942
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/CarLightBase/Truck_01FrontLight.c
@@ -0,0 +1,20 @@
+class Truck_01FrontLight extends CarLightBase
+{
+	void Truck_01FrontLight()
+	{
+		m_SegregatedBrightness = 4;
+		m_SegregatedRadius = 75;
+		m_SegregatedAngle = 90;
+		m_SegregatedColorRGB = Vector(0.90, 0.90, 0.68);
+		
+		m_AggregatedBrightness = 8;
+		m_AggregatedRadius = 100;
+		m_AggregatedAngle = 120;
+		m_AggregatedColorRGB = Vector(0.90, 0.90, 0.68);
+		
+		FadeIn(0.1);
+		SetFadeOutTime(0.05);
+		
+		SegregateLight();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/FlashlightLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/FlashlightLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..0cb3bab73ba65cf8f0cec15ddaa7fd7ade97b2f6
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/FlashlightLight.c
@@ -0,0 +1,23 @@
+class FlashlightLight extends SpotLightBase
+{
+	private static float m_DefaultBrightness = 4;
+	private static float m_DefaultRadius = 25;
+	
+	void FlashlightLight()
+	{
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( m_DefaultRadius );
+		SetSpotLightAngle( 110 );
+		SetCastShadow( true );
+		EnableSpecular( true );
+		SetBrightnessTo( m_DefaultBrightness );
+		SetFadeOutTime( 0.15 );
+		SetAmbientColor( 0.9, 0.85, 0.75 );
+		SetDiffuseColor( 0.9, 0.85, 0.75 );
+	}
+	
+	void SetIntensity( float coef, float time )
+	{
+		FadeBrightnessTo(m_DefaultBrightness * coef, time);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/HeadtorchLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/HeadtorchLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..852a51656210ee3474fed0fc8b0581043a2e8715
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/HeadtorchLight.c
@@ -0,0 +1,49 @@
+class HeadtorchLight extends SpotLightBase
+{
+	private static float m_DefaultBrightness = 3;
+	private static float m_DefaultRadius = 20;
+	
+	void HeadtorchLight()
+	{
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( m_DefaultRadius );
+		SetSpotLightAngle( 95 );
+		SetCastShadow( true );
+		FadeIn( 0.06 );
+		SetBrightnessTo( m_DefaultBrightness );
+		SetAmbientColor( 0.92, 0.85, 0.58 );
+		SetDiffuseColor( 0.92, 0.85, 0.58 );
+		SetFadeOutTime( 0.1 );
+		//SetDisableShadowsWithinRadius(0.25); // Idea for optimization: Uncomment this to disable shadows from Headtorch while it's on player's head during 1P view.
+	}
+	
+	void SetColorToWhite()
+	{
+		SetAmbientColor( 0.92, 0.85, 0.86 );
+		SetDiffuseColor( 0.92, 0.85, 0.86 );
+	}
+	
+	void SetColorToRed()
+	{
+		SetAmbientColor( 1.0, 0.2, 0.2 );
+		SetDiffuseColor( 1.0, 0.2, 0.2 );
+	}
+	
+	void SetIntensity( float coef, float time )
+	{
+		FadeBrightnessTo( m_DefaultBrightness * coef, time );
+		FadeRadiusTo( m_DefaultRadius * coef, time );
+	}
+	
+	void PerformVisibilityCheck(EntityAI owner)
+	{
+		if (!owner.IsFlagSet(EntityFlags.VISIBLE) && IsEnabled())
+		{
+			SetEnabled(false);
+		}
+		else if (owner.IsFlagSet(EntityFlags.VISIBLE) && !IsEnabled())
+		{
+			SetEnabled(true);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/PistollightLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/PistollightLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..50222076f3fffae26ee64b6676ff44fa41fc6ab1
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/PistollightLight.c
@@ -0,0 +1,42 @@
+class PistollightLight extends SpotLightBase
+{
+	private static float m_DefaultBrightness = 5.25;
+	private static float m_DefaultRadius = 18;
+	private static float m_DefaultAngle = 100;
+	
+	
+	void PistollightLight()
+	{
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( m_DefaultRadius );
+		SetSpotLightAngle( m_DefaultAngle );
+		SetCastShadow( true );
+		SetBrightnessTo( m_DefaultBrightness );
+		SetFadeOutTime( 0.05 );
+		SetAmbientColor( 0.92, 0.88, 0.82 );
+		SetDiffuseColor( 0.92, 0.88, 0.82 );
+		SetDisableShadowsWithinRadius( 1.2 );
+	}
+	
+	void SetIntensity( float coef, float time )
+	{
+		FadeBrightnessTo( m_DefaultBrightness * coef, time );
+		FadeRadiusTo( m_DefaultRadius * coef, time );
+	}
+	
+	override void UpdateLightMode( string slotName )
+	{
+		switch ( slotName )
+		{
+			case "weaponFlashlight":
+				SetSpotLightAngle( m_DefaultAngle/2 );
+				SetRadiusTo( m_DefaultRadius * 1.8 );
+			break;
+			
+			default:
+				SetSpotLightAngle( m_DefaultAngle );
+				SetRadiusTo( m_DefaultRadius );
+			break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/SpotlightLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/SpotlightLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a9680fbd786c6e909904a6a033798375f0bf029
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/SpotlightLight.c
@@ -0,0 +1,15 @@
+class SpotlightLight extends SpotLightBase
+{
+	void SpotlightLight()
+	{
+		SetVisibleDuringDaylight(true);
+		SetRadiusTo(60);
+		SetSpotLightAngle(140);
+		SetCastShadow(true);
+		SetBrightnessTo(20.0);
+		SetFadeOutTime(0.3);
+		FadeIn(0.2);
+		SetAmbientColor(0.8, 0.9, 1.0);
+		SetDiffuseColor(0.8, 0.9, 1.0);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/UniversallightLight.c b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/UniversallightLight.c
new file mode 100644
index 0000000000000000000000000000000000000000..253b69bd1fa86eddef1e580e564c92dc45c98cad
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/ScriptedLightBase/SpotLightBase/UniversallightLight.c
@@ -0,0 +1,41 @@
+class UniversallightLight extends SpotLightBase
+{
+	private static float m_DefaultBrightness = 6.05;
+	private static float m_DefaultRadius = 25;
+	private static float m_DefaultAngle = 100;
+	
+	void UniversallightLight()
+	{
+		SetVisibleDuringDaylight( true );
+		SetRadiusTo( m_DefaultRadius );
+		SetSpotLightAngle( m_DefaultAngle );
+		SetCastShadow( true );
+		SetBrightnessTo( m_DefaultBrightness );
+		SetFadeOutTime( 0.15 );
+		SetAmbientColor( 0.95, 0.88, 0.8 );
+		SetDiffuseColor( 0.95, 0.88, 0.8 );
+		SetDisableShadowsWithinRadius( 1.2 );
+	}
+	
+	void SetIntensity( float coef, float time )
+	{
+		FadeBrightnessTo( m_DefaultBrightness * coef, time );
+		FadeRadiusTo( m_DefaultRadius * coef, time );
+	}
+	
+	override void UpdateLightMode( string slotName )
+	{
+		switch (slotName)
+		{
+			case "weaponFlashlight":
+				SetSpotLightAngle( m_DefaultAngle/2 );
+				SetRadiusTo( m_DefaultRadius * 1.8 );
+			break;
+			
+			default:
+				SetSpotLightAngle( m_DefaultAngle );
+				SetRadiusTo( m_DefaultRadius );
+			break;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/SyncHitInfo.c b/scripts/4_World/DayZ/Entities/SyncHitInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..0e9a9331b7e50babfca9113457aa3f196732d1cd
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/SyncHitInfo.c
@@ -0,0 +1,10 @@
+//! extendable type to allow for smarter hit data syncing
+class SyncHitInfo extends Managed
+{
+	int m_AnimType;
+	float m_HitDir;
+	float m_HealthDamage;
+	bool m_Fullbody;
+	//ref TotalDamageResult m_DamageResult;
+	bool m_HasSource;
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/UndergroundStash.c b/scripts/4_World/DayZ/Entities/UndergroundStash.c
new file mode 100644
index 0000000000000000000000000000000000000000..7b32e07a7fb906754aade2fd6d0cb7a53fd53d96
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/UndergroundStash.c
@@ -0,0 +1,58 @@
+class UndergroundStash extends ItemBase
+{
+	void UndergroundStash() {}
+	
+	void PlaceOnGround()
+	{
+		vector pos = GetPosition();
+		pos[1] = GetGame().SurfaceRoadY(pos[0], pos[2]);
+		pos[1] = pos[1] + 0.22;
+		SetPosition(pos);
+	}
+	
+	ItemBase GetStashedItem()
+	{
+		ItemBase item;		
+		if (GetInventory().GetCargo().GetItemCount() > 0)
+		{
+			item = ItemBase.Cast(GetInventory().GetCargo().GetItem(0));
+		}
+
+		return item;
+	}
+	
+	override bool CanDisplayCargo()
+	{
+		return false;
+	}
+	
+	override bool CanPutInCargo(EntityAI parent)
+	{
+		return false;
+	}
+	
+	override bool CanReleaseCargo(EntityAI cargo)
+	{
+		return false;
+	}
+	
+	override bool CanReceiveItemIntoHands(EntityAI item_to_hands)
+	{
+		return false;
+	}
+	
+	override bool CanSaveItemInHands(EntityAI item_in_hands)
+	{
+		return false;
+	}
+	
+	override bool CanPutIntoHands(EntityAI parent)
+	{
+		return false;
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/CarScript.c b/scripts/4_World/DayZ/Entities/Vehicles/CarScript.c
new file mode 100644
index 0000000000000000000000000000000000000000..bb490cd3550376d48876686014b7101419edc144
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/CarScript.c
@@ -0,0 +1,2706 @@
+enum CarDoorState
+{
+	DOORS_MISSING,
+	DOORS_OPEN,
+	DOORS_CLOSED
+}
+
+enum CarHeadlightBulbsState
+{
+	NONE,
+	LEFT,
+	RIGHT,
+	BOTH
+}
+
+enum CarRearLightType
+{
+	NONE,
+	BRAKES_ONLY,
+	REVERSE_ONLY,
+	BRAKES_AND_REVERSE
+}
+
+enum CarEngineSoundState
+{
+	NONE,
+	STARTING,
+	START_OK,
+	START_NO_FUEL,
+	START_NO_BATTERY,
+	START_NO_SPARKPLUG,
+	STOP_OK,
+	STOP_NO_FUEL
+}
+
+enum ECarHornState
+{
+	OFF 	= 0,
+	SHORT	= 1,
+	LONG	= 2
+}
+
+#ifdef DIAG_DEVELOPER
+enum EVehicleDebugOutputType
+{
+	NONE,
+	DAMAGE_APPLIED = 1,
+	DAMAGE_CONSIDERED = 2,
+	CONTACT = 4
+	//OTHER = 8
+	//OTHER = 16
+}
+
+class CrashDebugData
+{
+	static ref array<ref CrashDebugData> m_CrashData = new array<ref CrashDebugData>;
+	static ref CrashDebugData m_CrashDataPoint;
+	//data is recorded on server, upon request, sent to the client
+	static void SendData(PlayerBase player)
+	{
+		/*
+		m_CrashData.Clear();
+		CrashDebugData fakeData = new CrashDebugData();
+		fakeData.m_VehicleType = "FakeVehicle";
+		m_CrashData.Insert(fakeData);
+		*/
+		GetGame().RPCSingleParam(player, ERPCs.DIAG_VEHICLES_DUMP_CRASH_DATA_CONTENTS, new Param1<array<ref CrashDebugData>>(m_CrashData), true, player.GetIdentity());
+	}
+	
+	//this is client requesting to dump the data it previously received from the server
+	static void DumpDataArray(array<ref CrashDebugData> dataArray)
+	{
+		Print("Vehicle; DamageType; Damage; Zone; Momentum; Momentum Prev; Momentum Delta; Speedometer; SpeedWorld; SpeedWorld Prev; SpeedWorld Delta; Velocity; Velocity Prev; Velocity Dot; TimeStamp (ms); CrewDamageBase; ShockTemp; DMGHealth; DMGShock");
+		foreach (CrashDebugData data:dataArray)
+		{
+			DumpData(data);
+		}
+	}
+	
+	static void DumpData(CrashDebugData data)
+	{
+		string output = data.m_VehicleType+";"+data.m_DamageType+";"+data.m_Damage+";"+data.m_Zone+";"+data.m_MomentumCurr+";"+data.m_MomentumPrev+";"+data.m_MomentumDelta+";"+data.m_Speedometer;
+		output += ";"+data.m_SpeedWorld+";"+data.m_SpeedWorldPrev+";"+data.m_SpeedWorldDelta+";"+data.m_VelocityCur;
+		output += ";"+data.m_VelocityPrev+";"+data.m_VelocityDot+";"+data.m_Time+";"+data.m_CrewDamageBase+";"+data.m_ShockTemp+";"+data.m_DMGHealth+";"+data.m_DMGShock;
+		Print(output);
+	}
+		
+	string m_VehicleType;
+	string m_DamageType;
+	float m_Damage;
+	string m_Zone;
+	float m_MomentumCurr;
+	float m_MomentumPrev;
+	float m_MomentumDelta;
+	float m_Speedometer;
+	float m_SpeedWorld;
+	float m_SpeedWorldPrev;
+	float m_SpeedWorldDelta;
+	vector m_VelocityCur;
+	vector m_VelocityPrev;
+	float m_VelocityDot;
+	float m_Time;
+	float m_CrewDamageBase;
+	float m_ShockTemp;
+	float m_DMGHealth;
+	float m_DMGShock;
+}
+
+#endif
+class CarContactData
+{
+	vector localPos;
+	IEntity other;
+	float impulse;
+	
+	void CarContactData(vector _localPos, IEntity _other, float _impulse)
+	{
+		localPos	= _localPos;
+		other		= _other;
+		impulse		= _impulse;
+	}
+}
+
+typedef map<string, ref array<ref CarContactData>> CarContactCache
+
+#ifdef DEVELOPER 
+CarScript _car;
+#endif
+
+/*!
+	Base script class for all motorized wheeled vehicles.
+*/
+class CarScript extends Car
+{
+	#ifdef DIAG_DEVELOPER
+	static EVehicleDebugOutputType DEBUG_OUTPUT_TYPE;
+	bool m_ContactCalled;
+	#endif
+	static ref map<typename, ref TInputActionMap> m_CarTypeActionsMap = new map<typename, ref TInputActionMap>;
+	TInputActionMap m_InputActionMap;
+	bool	m_ActionsInitialize;
+	protected float m_MomentumPrevTick;
+	protected vector m_VelocityPrevTick;
+	ref CarContactCache m_ContactCache;
+
+	protected float m_Time;
+
+	static float DROWN_ENGINE_THRESHOLD = 0.5;
+	static float DROWN_ENGINE_DAMAGE = 350.0;
+	
+	static const string MEMORY_POINT_NAME_CAR_HORN 	= "pos_carHorn";
+	
+	//! keeps ammount of each fluid
+	protected float m_FuelAmmount;
+	protected float m_CoolantAmmount;
+	protected float m_OilAmmount;
+	protected float m_BrakeAmmount;
+
+	//!
+	//protected float m_dmgContactCoef = 0.023;
+	protected float m_dmgContactCoef = 0.058;
+	protected float m_EnviroHeatComfortOverride;
+
+	//!
+	protected float m_DrownTime;
+	static vector m_DrownEnginePos;
+	
+	//!
+	protected float m_EngineHealth;
+	protected float m_RadiatorHealth;
+	protected float m_FuelTankHealth;
+	protected float m_BatteryHealth;
+	protected float m_PlugHealth;
+	
+	protected EntityAI m_Radiator;
+	
+	protected float	m_BatteryConsume = 15; 				//Battery energy consumption upon engine start
+	protected float m_BatteryContinuousConsume = 0.25; 	//Battery consumption with lights on and engine is off
+	protected float m_BatteryRecharge = 0.15; 			//Battery recharge rate when engine is on
+	private	  float m_BatteryTimer = 0; 				//Used to factor energy consumption / recharging
+	private const float BATTERY_UPDATE_DELAY = 100;
+	protected float m_BatteryEnergyStartMin = 5.0;		// Minimal energy level of battery required for start
+
+	//! Particles
+	protected ref EffVehicleSmoke m_coolantFx;
+	protected ref EffVehicleSmoke m_engineFx;
+	protected ref EffVehicleSmoke m_exhaustFx;
+		
+	protected int m_enginePtcFx;
+	protected int m_coolantPtcFx;
+	protected int m_exhaustPtcFx;
+	
+	protected vector m_exhaustPtcPos;
+	protected vector m_exhaustPtcDir;
+	protected vector m_enginePtcPos;
+	protected vector m_coolantPtcPos;
+	
+	protected vector m_fuelPos;
+
+	protected vector m_enginePos;
+	protected vector m_frontPos;
+	protected vector m_backPos;
+	protected vector m_side_1_1Pos;
+	protected vector m_side_1_2Pos;
+	protected vector m_side_2_1Pos;
+	protected vector m_side_2_2Pos;	
+	
+	//!Sounds
+	string m_EngineStartOK 				= "";
+	string m_EngineStartBattery 		= "";
+	string m_EngineStartPlug 			= "";
+	string m_EngineStartFuel 			= "";
+	string m_EngineStopFuel 			= "";
+	
+	string m_CarDoorOpenSound 			= "";
+	string m_CarDoorCloseSound 			= "";
+	string m_CarSeatShiftInSound 		= "";
+	string m_CarSeatShiftOutSound 		= "";
+	
+	string m_CarHornShortSoundName 		= "";
+	string m_CarHornLongSoundName		= "";
+	
+	ref EffectSound m_CrashSoundLight;
+	ref EffectSound m_CrashSoundHeavy;
+	ref EffectSound m_WindowSmall;
+	ref EffectSound m_WindowLarge;
+	private ref EffectSound m_PreStartSound;
+
+	protected ref EffectSound m_CarHornSoundEffect;
+	protected ref NoiseParams m_NoisePar;
+	protected NoiseSystem m_NoiseSystem;
+	
+	protected bool m_PlayCrashSoundLight;
+	protected bool m_PlayCrashSoundHeavy;
+	
+	protected bool m_HeadlightsOn;
+	protected bool m_HeadlightsState;
+	protected bool m_BrakesArePressed;
+	protected bool m_RearLightType;
+	
+	protected bool m_ForceUpdateLights;
+	protected bool m_EngineStarted;
+	protected bool m_EngineDestroyed;
+	
+	protected int m_CarHornState;
+	
+	CarLightBase 		m_Headlight;
+	CarRearLightBase 	m_RearLight;
+	
+	// Memory points
+	static string m_ReverseLightPoint				= "light_reverse";
+	static string m_LeftHeadlightPoint				= "light_left";
+	static string m_RightHeadlightPoint				= "light_right";
+	static string m_LeftHeadlightTargetPoint		= "light_left_dir";
+	static string m_RightHeadlightTargetPoint		= "light_right_dir";
+	static string m_DrownEnginePoint 				= "drown_engine";
+	
+	// Model selection IDs for texture/material changes
+	// If each car needs different IDs, then feel free to remove the 'static' flag and overwrite these numbers down the hierarchy
+	static const int SELECTION_ID_FRONT_LIGHT_L 	= 0;
+	static const int SELECTION_ID_FRONT_LIGHT_R 	= 1;
+	static const int SELECTION_ID_BRAKE_LIGHT_L 	= 2;
+	static const int SELECTION_ID_BRAKE_LIGHT_R 	= 3;
+	static const int SELECTION_ID_REVERSE_LIGHT_L 	= 4;
+	static const int SELECTION_ID_REVERSE_LIGHT_R 	= 5;
+	static const int SELECTION_ID_TAIL_LIGHT_L 		= 6;
+	static const int SELECTION_ID_TAIL_LIGHT_R 		= 7;
+	static const int SELECTION_ID_DASHBOARD_LIGHT 	= 8;
+	
+	protected bool m_EngineBeforeStart;
+	protected bool m_EngineStartDoOnce;
+
+	protected bool m_EngineZoneReceivedHit;
+	
+	protected ref set<int> m_UnconsciousCrewMemberIndices;
+	protected ref set<int> m_DeadCrewMemberIndices;
+	
+	#ifdef DEVELOPER 
+	private const int DEBUG_MESSAGE_CLEAN_TIME_SECONDS = 10;
+	private float m_DebugMessageCleanTime;
+	private string m_DebugContactDamageMessage;
+	#endif
+	
+	void CarScript()
+	{
+#ifdef DEVELOPER 
+		_car = this;
+#endif
+
+		SetEventMask(EntityEvent.POSTSIMULATE);
+		
+		m_ContactCache = new CarContactCache;
+		
+		m_Time = 0;
+		// sets max health for all components at init
+		m_EngineHealth = 1;
+		m_FuelTankHealth = 1;
+		m_RadiatorHealth = -1;
+		m_BatteryHealth = -1;
+		m_PlugHealth = -1;
+
+		m_enginePtcFx = -1;
+		m_coolantPtcFx = -1;
+		m_exhaustPtcFx = -1;
+
+		m_EnviroHeatComfortOverride = 0;
+
+		m_PlayCrashSoundLight = false;
+		m_PlayCrashSoundHeavy = false;
+		
+		m_CarHornState = ECarHornState.OFF;
+		
+		m_UnconsciousCrewMemberIndices 	= new set<int>();
+		m_DeadCrewMemberIndices 		= new set<int>();
+		
+		RegisterNetSyncVariableBool("m_HeadlightsOn");
+		RegisterNetSyncVariableBool("m_BrakesArePressed");
+		RegisterNetSyncVariableBool("m_ForceUpdateLights");
+		RegisterNetSyncVariableBool("m_EngineZoneReceivedHit");
+		RegisterNetSyncVariableBoolSignal("m_PlayCrashSoundLight");
+		RegisterNetSyncVariableBoolSignal("m_PlayCrashSoundHeavy");
+		RegisterNetSyncVariableInt("m_CarHornState", ECarHornState.OFF, ECarHornState.LONG);
+		
+		if ( MemoryPointExists("ptcExhaust_end") )
+		{
+			m_exhaustPtcPos = GetMemoryPointPos("ptcExhaust_end");
+			if ( MemoryPointExists("ptcExhaust_start") )
+			{
+				vector exhaustStart = GetMemoryPointPos("ptcExhaust_start");
+				vector tempOri = vector.Direction( exhaustStart, m_exhaustPtcPos);
+
+				m_exhaustPtcDir[0] = -tempOri[2];
+				m_exhaustPtcDir[1] = tempOri[1];
+				m_exhaustPtcDir[2] = tempOri[0];
+				
+				m_exhaustPtcDir = m_exhaustPtcDir.Normalized().VectorToAngles();
+			}
+		}
+		else
+		{
+			m_exhaustPtcPos = "0 0 0";
+			m_exhaustPtcDir = "1 1 1";
+		}
+	
+		if ( MemoryPointExists("ptcEnginePos") )
+			m_enginePtcPos = GetMemoryPointPos("ptcEnginePos");
+		else
+			m_enginePtcPos = "0 0 0";		
+
+		if ( MemoryPointExists("ptcCoolantPos") )
+			m_coolantPtcPos = GetMemoryPointPos("ptcCoolantPos");
+		else
+			m_coolantPtcPos = "0 0 0";
+
+		if ( MemoryPointExists("refill") )
+			m_fuelPos = GetMemoryPointPos("refill");
+		else
+			m_fuelPos = "0 0 0";
+		
+		if ( MemoryPointExists("drown_engine") )
+			m_DrownEnginePos = GetMemoryPointPos("drown_engine");
+		else
+			m_DrownEnginePos = "0 0 0";	
+
+		if ( MemoryPointExists("dmgZone_engine") )
+			m_enginePos = GetMemoryPointPos("dmgZone_engine");
+		else
+			m_enginePos = "0 0 0";
+
+		if ( MemoryPointExists("dmgZone_front") )
+			m_frontPos = GetMemoryPointPos("dmgZone_front");
+		else
+			m_frontPos = "0 0 0";
+
+		if ( MemoryPointExists("dmgZone_back") )
+			m_backPos = GetMemoryPointPos("dmgZone_back");
+		else
+			m_backPos = "0 0 0";		
+				
+		if ( MemoryPointExists("dmgZone_fender_1_1") )
+			m_side_1_1Pos = GetMemoryPointPos("dmgZone_fender_1_1");
+		else
+			m_side_1_1Pos = "0 0 0";
+
+		if ( MemoryPointExists("dmgZone_fender_1_2") )
+			m_side_1_2Pos = GetMemoryPointPos("dmgZone_fender_1_2");
+		else
+			m_side_1_2Pos = "0 0 0";
+		
+		if ( MemoryPointExists("dmgZone_fender_2_1") )
+			m_side_2_1Pos = GetMemoryPointPos("dmgZone_fender_2_1");
+		else
+			m_side_2_1Pos = "0 0 0";
+
+		if ( MemoryPointExists("dmgZone_fender_2_2") )
+			m_side_2_2Pos = GetMemoryPointPos("dmgZone_fender_2_2");
+		else
+			m_side_2_2Pos = "0 0 0";
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+
+		if (GetGame().IsServer())
+		{
+			m_NoiseSystem = GetGame().GetNoiseSystem();
+			if (m_NoiseSystem && !m_NoisePar)
+			{
+				m_NoisePar = new NoiseParams();
+				m_NoisePar.LoadFromPath("cfgVehicles " + GetType() + " NoiseCarHorn");
+			}
+		}
+	}
+	
+	#ifdef DIAG_DEVELOPER
+	
+	override void FixEntity()
+	{
+		if (GetGame().IsServer())
+		{
+			FillUpCarFluids();
+			//server and single
+			
+			for (int i = 5; i > 0; i--)//there is a problem with wheels when performed only once, this solves it
+				super.FixEntity();
+			if (!GetGame().IsMultiplayer())
+			{
+				//single
+				SEffectManager.DestroyEffect(m_engineFx);
+			}
+		}
+		else
+		{
+			//MP client
+			SEffectManager.DestroyEffect(m_engineFx);	
+		}
+	}
+	#endif
+	
+	
+	vector GetEnginePosWS()
+	{
+		return ModelToWorld( m_DrownEnginePos );
+	}
+	
+	vector GetCoolantPtcPosWS()
+	{
+		return ModelToWorld( m_coolantPtcPos );
+	}
+
+	vector GetRefillPointPosWS()
+	{
+		return ModelToWorld( m_fuelPos );
+	}
+	
+	vector GetEnginePointPosWS()
+	{	
+		return ModelToWorld( m_enginePos );
+	}
+	vector GetFrontPointPosWS()
+	{	
+		return ModelToWorld( m_frontPos );
+	}
+	vector GetBackPointPosWS()
+	{	
+		return ModelToWorld( m_backPos );
+	}
+	vector Get_1_1PointPosWS()
+	{	
+		return ModelToWorld( m_side_1_1Pos );
+	}
+	vector Get_1_2PointPosWS()
+	{	
+		return ModelToWorld( m_side_1_2Pos );
+	}
+	vector Get_2_1PointPosWS()
+	{	
+		return ModelToWorld( m_side_2_1Pos );
+	}
+	vector Get_2_2PointPosWS()
+	{	
+		return ModelToWorld( m_side_2_2Pos );
+	}
+	
+	override float GetLiquidThroughputCoef()
+	{
+		return LIQUID_THROUGHPUT_CAR_DEFAULT;
+	}
+
+	//here we should handle the damage dealt in OnContact event, but maybe we will react even in that event 
+	override void EEHitBy(TotalDamageResult damageResult, int damageType, EntityAI source, int component, string dmgZone, string ammo, vector modelPos, float speedCoef)
+	{
+		super.EEHitBy(damageResult, damageType, source, component, dmgZone, ammo, modelPos, speedCoef);
+
+		ForceUpdateLightsStart();
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(ForceUpdateLightsEnd, 100, false);
+
+		SetEngineZoneReceivedHit(dmgZone == "Engine");
+	}
+
+	override void EEDelete(EntityAI parent)
+	{
+		#ifndef SERVER
+		CleanupEffects();
+		#endif
+	}
+	
+	void ~CarScript()
+	{
+		#ifndef SERVER
+		CleanupEffects();
+		#endif
+	}
+	
+	void CleanupEffects()
+	{
+		SEffectManager.DestroyEffect(m_coolantFx);
+		SEffectManager.DestroyEffect(m_exhaustFx);
+		SEffectManager.DestroyEffect(m_engineFx);
+			
+		if (m_Headlight)
+			m_Headlight.Destroy();
+			
+		if (m_RearLight)
+			m_RearLight.Destroy();
+			
+		SEffectManager.DestroyEffect(m_CrashSoundLight);
+		SEffectManager.DestroyEffect(m_CrashSoundHeavy);
+		SEffectManager.DestroyEffect(m_WindowSmall);
+		SEffectManager.DestroyEffect(m_WindowLarge);
+		CleanupSound(m_CarHornSoundEffect);
+	}
+	
+	void CleanupSound(EffectSound sound)
+	{
+		SEffectManager.DestroyEffect(sound);
+	}
+
+	override void GetDebugActions(out TSelectableActionInfoArrayEx outputList)
+	{
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_HORN_START_SHORT, "Car Horn Start Short", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_HORN_START_LONG, "Car Horn Start Long", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_HORN_STOP, "Car Horn Stop", FadeColors.LIGHT_GREY));
+
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "Car Fuel", FadeColors.RED));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_FUEL_FULL, "Full", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_FUEL_EMPTY, "Empty", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_FUEL_INCREASE, "10% increase", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_FUEL_DECREASE, "10% decrease", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.RED));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "Car Cooler", FadeColors.RED));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_COOLANT_FULL, "Full", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_COOLANT_EMPTY, "Empty", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_COOLANT_INCREASE, "10% increase", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.CAR_COOLANT_DECREASE, "10% decrease", FadeColors.LIGHT_GREY));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.RED));
+		
+		super.GetDebugActions(outputList);
+		
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.SEPARATOR, "___________________________", FadeColors.RED));
+		outputList.Insert(new TSelectableActionInfoWithColor(SAT_DEBUG_ACTION, EActions.DELETE, "Delete", FadeColors.RED));
+	}
+	
+	override bool OnAction(int action_id, Man player, ParamsReadContext ctx)
+	{
+		if (super.OnAction(action_id, player, ctx))
+			return true;
+
+		if (!GetGame().IsServer())
+		{
+			return false;
+		}
+
+		switch (action_id)
+		{
+			case EActions.CAR_HORN_START_SHORT:
+				SetCarHornState(ECarHornState.SHORT);
+				return true;
+			case EActions.CAR_HORN_START_LONG:
+				SetCarHornState(ECarHornState.LONG);
+				return true;
+			case EActions.CAR_HORN_STOP:
+				SetCarHornState(ECarHornState.OFF);
+				return true;
+
+			case EActions.CAR_FUEL_FULL:
+				Fill(CarFluid.FUEL, GetFluidCapacity(CarFluid.FUEL));
+				return true;
+			case EActions.CAR_FUEL_EMPTY:
+				LeakAll(CarFluid.FUEL);
+				return true;
+			case EActions.CAR_FUEL_INCREASE:
+				Fill(CarFluid.FUEL, GetFluidCapacity(CarFluid.FUEL) * 0.1);
+				return true;
+			case EActions.CAR_FUEL_DECREASE:
+				Leak(CarFluid.FUEL, GetFluidCapacity(CarFluid.FUEL) * 0.1);
+				return true;
+
+			case EActions.CAR_COOLANT_FULL:
+				Fill(CarFluid.COOLANT, GetFluidCapacity(CarFluid.COOLANT));
+				return true;
+			case EActions.CAR_COOLANT_EMPTY:
+				LeakAll(CarFluid.COOLANT);
+				return true;
+			case EActions.CAR_COOLANT_INCREASE:
+				Fill(CarFluid.COOLANT, GetFluidCapacity(CarFluid.COOLANT) * 0.1);
+				return true;
+			case EActions.CAR_COOLANT_DECREASE:
+				Leak(CarFluid.COOLANT, GetFluidCapacity(CarFluid.COOLANT) * 0.1);
+				return true;
+			case EActions.DELETE:
+				Delete();
+				return true;
+		}
+	
+		return false;
+	}
+	
+	override void OnVariablesSynchronized()
+	{
+		super.OnVariablesSynchronized();
+				
+		if (GetCrashHeavySound())
+		{
+			PlayCrashHeavySound();
+		}
+		else if (GetCrashLightSound())
+		{
+			PlayCrashLightSound();
+		}
+		
+		HandleCarHornSound(m_CarHornState);
+		
+		UpdateLights();
+	}
+	
+	void CreateCarDestroyedEffect()
+	{
+		if ( !SEffectManager.IsEffectExist( m_enginePtcFx ) && GetGame().GetWaterDepth( GetEnginePosWS() ) <= 0 )
+		{
+			m_engineFx = new EffEngineSmoke();
+			m_engineFx.SetParticleStateHeavy();
+			m_enginePtcFx = SEffectManager.PlayOnObject( m_engineFx, this, m_enginePtcPos, Vector(0,0,0));
+		}
+	}
+	
+	override void EEItemAttached(EntityAI item, string slot_name)
+	{
+		super.EEItemAttached(item, slot_name);
+
+		switch (slot_name)
+		{
+			case "Reflector_1_1":
+				if (GetGame().IsServer())
+				{
+					SetHealth("Reflector_1_1", "Health", item.GetHealth());
+				}
+				break;
+			case "Reflector_2_1":
+				if (GetGame().IsServer())
+				{
+					SetHealth("Reflector_2_1", "Health", item.GetHealth());
+				}
+				break;
+			case "CarBattery":
+			case "TruckBattery":
+				if (GetGame().IsServer())
+				{
+					m_BatteryHealth = item.GetHealth01();
+				}
+				break;
+			case "SparkPlug":
+			case "GlowPlug":
+				if (GetGame().IsServer())
+				{
+					m_PlugHealth = item.GetHealth01();
+				}
+				break;
+			case "CarRadiator":
+				if (GetGame().IsServer())
+				{
+					m_RadiatorHealth = item.GetHealth01();
+				}
+				
+				m_Radiator = item;
+				break;
+		}
+		
+		if (GetGame().IsServer())
+		{
+			Synchronize();
+		}
+
+		UpdateHeadlightState();
+		UpdateLights();
+	}
+	
+	// Updates state of attached headlight bulbs for faster access
+	void UpdateHeadlightState()
+	{
+		EntityAI bulb_L = FindAttachmentBySlotName("Reflector_1_1");
+		EntityAI bulb_R = FindAttachmentBySlotName("Reflector_2_1");
+		
+		if (bulb_L && !bulb_L.IsRuined() && bulb_R && !bulb_R.IsRuined())
+		{
+			m_HeadlightsState = CarHeadlightBulbsState.BOTH;
+		}
+		else if (bulb_L && !bulb_L.IsRuined())
+		{
+			m_HeadlightsState = CarHeadlightBulbsState.LEFT;
+		}
+		else if (bulb_R && !bulb_R.IsRuined())
+		{
+			m_HeadlightsState = CarHeadlightBulbsState.RIGHT;
+		}
+		else if ((!bulb_L || bulb_L.IsRuined()) && (!bulb_R || bulb_R.IsRuined()))
+		{
+			m_HeadlightsState = CarHeadlightBulbsState.NONE;
+		}
+	}
+
+	override void EEItemDetached(EntityAI item, string slot_name)
+	{
+		switch (slot_name)
+		{
+		case "CarBattery":
+		case "TruckBattery":
+			m_BatteryHealth = -1;
+			if (GetGame().IsServer())
+			{
+				if (EngineIsOn())
+				{
+					EngineStop();
+				}
+				
+				if (IsScriptedLightsOn())
+				{
+					ToggleHeadlights();
+				}
+			}
+		break;
+		case "SparkPlug":
+		case "GlowPlug":
+			m_PlugHealth = -1;
+			if (GetGame().IsServer() && EngineIsOn())
+			{
+				EngineStop();
+			}
+		break;
+		case "CarRadiator":
+			m_Radiator = null;
+			if (GetGame().IsServer())
+			{
+				LeakAll(CarFluid.COOLANT);
+
+				if (m_DamageZoneMap.Contains("Radiator"))
+				{
+					SetHealth("Radiator", "Health", 0);
+				}
+			}
+		break;
+		}
+		
+		if (GetGame().IsServer())
+		{
+			Synchronize();
+		}
+		
+		UpdateHeadlightState();
+		UpdateLights();
+	}
+	
+	override void OnAttachmentRuined(EntityAI attachment)
+	{
+		super.OnAttachmentRuined(attachment);
+		
+		UpdateHeadlightState();
+		UpdateLights();
+	}
+	
+	override bool CanReceiveAttachment(EntityAI attachment, int slotId)
+	{
+		if (!super.CanReceiveAttachment(attachment, slotId))
+			return false;
+		
+		InventoryLocation attachmentInventoryLocation = new InventoryLocation();
+		attachment.GetInventory().GetCurrentInventoryLocation(attachmentInventoryLocation);
+		if (attachmentInventoryLocation.GetParent() == null)
+		{
+			return true;
+		}
+		
+		if (attachment && attachment.Type().IsInherited(CarWheel))
+		{
+			string slotSelectionName;
+			InventorySlots.GetSelectionForSlotId(slotId, slotSelectionName);
+
+			switch (slotSelectionName)
+			{
+				case "wheel_spare_1":
+				case "wheel_spare_2":
+					return CanManipulateSpareWheel(slotSelectionName);
+					break;
+			}
+		}
+		
+		return true;
+	}
+
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+
+		if (EngineIsOn() && IsMoving())
+		{
+			return false;
+		}
+
+		if (attachment && attachment.Type().IsInherited(CarWheel))
+		{
+			InventoryLocation attachmentInventoryLocation = new InventoryLocation();
+			attachment.GetInventory().GetCurrentInventoryLocation(attachmentInventoryLocation);
+
+			string slotSelectionName;
+			InventorySlots.GetSelectionForSlotId(attachmentInventoryLocation.GetSlot(), slotSelectionName);
+
+			switch (slotSelectionName)
+			{
+				case "wheel_spare_1":
+				case "wheel_spare_2":
+					return CanManipulateSpareWheel(slotSelectionName);
+					break;
+			}
+		}
+
+		return true;
+	}
+	
+	protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		return false;
+	}
+
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		m_Time += timeSlice;
+		
+		if (GetGame().IsServer())
+		{
+			HandleByCrewMemberState(ECrewMemberState.UNCONSCIOUS);
+			HandleByCrewMemberState(ECrewMemberState.DEAD);
+
+			#ifdef DIAG_DEVELOPER
+			if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.CONTACT)
+			{
+				if (m_ContactCalled)
+				{
+					Debug.Log("Momentum delta: " + (GetMomentum() - m_MomentumPrevTick));
+					Debug.Log("--------------------------------------------------------------------");
+					m_ContactCalled = false;
+				}
+			}
+			#endif
+			
+			
+			CheckContactCache();
+			m_VelocityPrevTick = GetVelocity(this);
+			m_MomentumPrevTick = GetMomentum();
+			#ifdef DEVELOPER
+			m_DebugMessageCleanTime += timeSlice;
+			if (m_DebugMessageCleanTime >= DEBUG_MESSAGE_CLEAN_TIME_SECONDS)
+			{
+				m_DebugMessageCleanTime = 0;
+				m_DebugContactDamageMessage = "";
+			}
+			#endif
+		}
+		
+		if ( m_Time >= GameConstants.CARS_FLUIDS_TICK )
+		{
+			m_Time = 0;
+
+			CarPartsHealthCheck();
+
+			//First of all check if the car should stop the engine
+			if (GetGame().IsServer() && EngineIsOn())
+			{
+				if ( GetFluidFraction(CarFluid.FUEL) <= 0 || m_EngineHealth <= 0 )
+					EngineStop();
+
+				CheckVitalItem(IsVitalCarBattery(), "CarBattery");
+				CheckVitalItem(IsVitalTruckBattery(), "TruckBattery");
+				CheckVitalItem(IsVitalSparkPlug(), "SparkPlug");
+				CheckVitalItem(IsVitalGlowPlug(), "GlowPlug");
+			}
+			
+			if (GetGame().IsServer())
+			{
+				if (IsVitalFuelTank())
+				{
+					if (m_FuelTankHealth == GameConstants.DAMAGE_RUINED_VALUE && m_EngineHealth > GameConstants.DAMAGE_RUINED_VALUE)
+					{
+						SetHealth("Engine", "Health", GameConstants.DAMAGE_RUINED_VALUE);
+					}
+				}
+			}
+
+			//! actions runned when the engine on
+			if ( EngineIsOn() )
+			{
+				if ( GetGame().IsServer() )
+				{
+					float dmg;
+
+					if ( EngineGetRPM() >= EngineGetRPMRedline() )
+					{
+						if (EngineGetRPM() > EngineGetRPMMax())
+							AddHealth( "Engine", "Health", -GetMaxHealth("Engine", "") * 0.05 ); //CAR_RPM_DMG
+							
+						dmg = EngineGetRPM() * 0.001 * Math.RandomFloat( 0.02, 1.0 );  //CARS_TICK_DMG_MIN; //CARS_TICK_DMG_MAX
+						ProcessDirectDamage(DamageType.CUSTOM, null, "Engine", "EnviroDmg", vector.Zero, dmg);
+						SetEngineZoneReceivedHit(true);
+					}
+					else
+					{
+						SetEngineZoneReceivedHit(false);
+					}
+
+					//! leaking of coolant from radiator when damaged
+					if ( IsVitalRadiator() )
+					{
+						if ( GetFluidFraction(CarFluid.COOLANT) > 0 && m_RadiatorHealth < 0.5 ) //CARS_LEAK_THRESHOLD
+							LeakFluid( CarFluid.COOLANT );
+					}
+
+					if ( GetFluidFraction(CarFluid.FUEL) > 0 && m_FuelTankHealth < GameConstants.DAMAGE_DAMAGED_VALUE )
+						LeakFluid( CarFluid.FUEL );
+
+					if ( GetFluidFraction(CarFluid.BRAKE) > 0 && m_EngineHealth < GameConstants.DAMAGE_DAMAGED_VALUE )
+						LeakFluid( CarFluid.BRAKE );
+
+					if ( GetFluidFraction(CarFluid.OIL) > 0 && m_EngineHealth < GameConstants.DAMAGE_DAMAGED_VALUE )
+						LeakFluid( CarFluid.OIL );
+
+					if ( m_EngineHealth < 0.25 )
+						LeakFluid( CarFluid.OIL );
+
+					if ( IsVitalRadiator() )
+					{
+						if ( GetFluidFraction( CarFluid.COOLANT ) < 0.5 && GetFluidFraction( CarFluid.COOLANT ) >= 0 )
+						{
+							dmg = ( 1 - GetFluidFraction(CarFluid.COOLANT) ) * Math.RandomFloat( 0.02, 10.00 );  //CARS_DMG_TICK_MIN_COOLANT; //CARS_DMG_TICK_MAX_COOLANT
+							AddHealth( "Engine", "Health", -dmg );
+							SetEngineZoneReceivedHit(true);
+						}
+					}
+				}
+				
+				//FX only on Client and in Single
+				if (!GetGame().IsDedicatedServer())
+				{
+					if (!SEffectManager.IsEffectExist(m_exhaustPtcFx))
+					{
+						m_exhaustFx = new EffExhaustSmoke();
+						m_exhaustPtcFx = SEffectManager.PlayOnObject( m_exhaustFx, this, m_exhaustPtcPos, m_exhaustPtcDir );
+						m_exhaustFx.SetParticleStateLight();
+					}
+				
+					if (IsVitalRadiator() && GetFluidFraction(CarFluid.COOLANT) < 0.5)
+					{
+						if (!SEffectManager.IsEffectExist(m_coolantPtcFx))
+						{
+							m_coolantFx = new EffCoolantSteam();
+							m_coolantPtcFx = SEffectManager.PlayOnObject(m_coolantFx, this, m_coolantPtcPos, vector.Zero);
+						}
+
+						if (m_coolantFx)
+						{
+							if (GetFluidFraction(CarFluid.COOLANT) > 0)
+								m_coolantFx.SetParticleStateLight();
+							else
+								m_coolantFx.SetParticleStateHeavy();
+						}
+					}
+					else
+					{
+						if (SEffectManager.IsEffectExist(m_coolantPtcFx))
+							SEffectManager.Stop(m_coolantPtcFx);
+					}
+				}
+			}
+			else
+			{
+				//FX only on Client and in Single
+				if ( !GetGame().IsDedicatedServer() )
+				{
+					if (SEffectManager.IsEffectExist(m_exhaustPtcFx))
+					{
+						SEffectManager.Stop(m_exhaustPtcFx);
+						m_exhaustPtcFx = -1;
+					}
+					
+					if (SEffectManager.IsEffectExist(m_coolantPtcFx))
+					{
+						SEffectManager.Stop(m_coolantPtcFx);
+						m_coolantPtcFx = -1;
+					}
+				}
+			}
+		}
+	}
+	
+	void OnBrakesPressed()
+	{
+		UpdateLights();
+	}
+	
+	void OnBrakesReleased()
+	{
+		UpdateLights();
+	}
+	
+	override void OnUpdate( float dt )
+    {
+		if ( GetGame().IsServer() )
+		{
+			ItemBase battery = GetBattery();
+			if ( battery )
+			{
+				if ( EngineIsOn() )
+				{
+					m_BatteryTimer += dt;
+					if ( m_BatteryTimer >= BATTERY_UPDATE_DELAY )
+					{
+						battery.GetCompEM().ConsumeEnergy(GetBatteryRechargeRate() * m_BatteryTimer);
+						m_BatteryTimer = 0;
+					}
+				}
+				else if ( !EngineIsOn() && IsScriptedLightsOn() )
+				{
+					m_BatteryTimer += dt;
+					if ( m_BatteryTimer >= BATTERY_UPDATE_DELAY )
+					{
+						battery.GetCompEM().ConsumeEnergy(GetBatteryRuntimeConsumption() * m_BatteryTimer);
+						m_BatteryTimer = 0;
+						
+						if ( battery.GetCompEM().GetEnergy() <= 0 )
+						{
+							ToggleHeadlights();
+						}
+					}
+				}
+			}
+			
+			if ( GetGame().GetWaterDepth( GetEnginePosWS() ) > 0 )
+			{
+				m_DrownTime += dt;
+				if ( m_DrownTime > DROWN_ENGINE_THRESHOLD )
+				{
+					// *dt to get damage per second
+					AddHealth( "Engine", "Health", -DROWN_ENGINE_DAMAGE * dt);
+					SetEngineZoneReceivedHit(true);
+				}
+			}
+			else
+			{
+				m_DrownTime = 0;
+			}
+		}
+
+		// For visualisation of brake lights for all players
+		float brake_coef = GetBrake();
+		if ( brake_coef > 0 )
+		{
+			if ( !m_BrakesArePressed )
+			{
+				m_BrakesArePressed = true;
+				SetSynchDirty();
+				OnBrakesPressed();
+			}
+		}
+		else
+		{
+			if ( m_BrakesArePressed )
+			{
+				m_BrakesArePressed = false;
+				SetSynchDirty();
+				OnBrakesReleased();
+			}
+		}
+		
+		if ( (!GetGame().IsDedicatedServer()) && m_ForceUpdateLights )
+		{
+			UpdateLights();
+			m_ForceUpdateLights = false;
+		}
+    }
+	
+	override void EEKilled(Object killer)
+	{
+		super.EEKilled(killer);
+		m_EngineDestroyed = true;
+	}
+	
+	//! WARNING: Can be called very frequently in one frame, use with caution
+	override void OnContact( string zoneName, vector localPos, IEntity other, Contact data )
+	{
+		if (GetGame().IsServer())
+		{
+			#ifdef DIAG_DEVELOPER
+			m_ContactCalled = true;
+			if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.CONTACT)
+			{
+				string output = "Zone: " + zoneName + " | Impulse:" + data.Impulse;
+				Debug.Log(output);
+			}
+			#endif
+			if (m_ContactCache.Count() == 0)
+			{
+				array<ref CarContactData> ccd = new array<ref CarContactData>;
+				m_ContactCache.Insert(zoneName, ccd);
+				float momentumDelta = GetMomentum() - m_MomentumPrevTick;
+				float dot = vector.Dot(m_VelocityPrevTick.Normalized(), GetVelocity(this).Normalized());
+				if (dot < 0)
+				{
+					momentumDelta = m_MomentumPrevTick;
+				}
+				
+				ccd.Insert(new CarContactData(localPos, other, momentumDelta));
+			}
+		}
+	}
+	
+	//! Responsible for damaging the car according to contact events from OnContact
+	void CheckContactCache()
+	{
+		
+		int contactZonesCount = m_ContactCache.Count();
+		
+		if (contactZonesCount == 0)
+			return;
+		
+		
+		for (int i = 0; i < contactZonesCount; ++i)
+		{
+			string zoneName = m_ContactCache.GetKey(i);
+			array<ref CarContactData> data = m_ContactCache[zoneName];
+
+			float dmg = Math.AbsInt(data[0].impulse * m_dmgContactCoef);
+			float crewDmgBase = Math.AbsInt((data[0].impulse / dBodyGetMass(this)) * 1000 * m_dmgContactCoef);// calculates damage as if the object's weight was 1000kg instead of its actual weight
+
+			#ifdef DIAG_DEVELOPER
+			CrashDebugData.m_CrashDataPoint = new CrashDebugData();
+			CrashDebugData.m_CrashDataPoint.m_VehicleType = GetDisplayName();
+			CrashDebugData.m_CrashDataPoint.m_Damage = dmg;
+			CrashDebugData.m_CrashDataPoint.m_Zone = zoneName;
+			CrashDebugData.m_CrashDataPoint.m_MomentumCurr = GetMomentum();
+			CrashDebugData.m_CrashDataPoint.m_MomentumPrev = m_MomentumPrevTick;
+			CrashDebugData.m_CrashDataPoint.m_MomentumDelta = data[0].impulse;
+			CrashDebugData.m_CrashDataPoint.m_SpeedWorld = GetVelocity(this).Length() * 3.6;
+			CrashDebugData.m_CrashDataPoint.m_SpeedWorldPrev = m_VelocityPrevTick.Length() * 3.6;
+			CrashDebugData.m_CrashDataPoint.m_SpeedWorldDelta = (m_VelocityPrevTick.Length() - GetVelocity(this).Length()) * 3.6;
+			CrashDebugData.m_CrashDataPoint.m_VelocityCur = GetVelocity(this);
+			CrashDebugData.m_CrashDataPoint.m_VelocityPrev = m_VelocityPrevTick;
+			CrashDebugData.m_CrashDataPoint.m_VelocityDot = vector.Dot(m_VelocityPrevTick.Normalized(), GetVelocity(this).Normalized());
+			CrashDebugData.m_CrashDataPoint.m_Time = GetGame().GetTime();
+			
+
+			
+			if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.DAMAGE_CONSIDERED)
+			{
+				Debug.Log("--------------------------------------------------");
+				Debug.Log("Vehicle:" + GetDisplayName());
+				Debug.Log("DMG: " + dmg);
+				Debug.Log("zoneName : "+ zoneName);
+				Debug.Log("momentumCurr : "+ GetMomentum());
+				Debug.Log("momentumPrev : "+ m_MomentumPrevTick);
+				Debug.Log("momentumDelta : "+ data[0].impulse);
+				Debug.Log("speed(km/h): "+ GetVelocity(this).Length() * 3.6);
+				Debug.Log("speedPrev(km/h): "+ m_VelocityPrevTick.Length() * 3.6);
+				Debug.Log("speedDelta(km/h) : "+ (m_VelocityPrevTick.Length() - GetVelocity(this).Length()) * 3.6);
+				Debug.Log("velocityCur.): "+ GetVelocity(this));
+				Debug.Log("velocityPrev.): "+ m_VelocityPrevTick);
+				Debug.Log("velocityDot): "+ vector.Dot(m_VelocityPrevTick.Normalized(), GetVelocity(this).Normalized()));
+				Debug.Log("GetGame().GetTime(): "+ GetGame().GetTime());
+				Debug.Log("--------------------------------------------------");
+			}
+			#endif
+			if ( dmg < GameConstants.CARS_CONTACT_DMG_MIN )
+				continue;
+
+			int pddfFlags;
+			#ifdef DIAG_DEVELOPER
+			CrashDebugData.m_CrashData.Insert(CrashDebugData.m_CrashDataPoint);
+			CrashDebugData.m_CrashDataPoint.m_Speedometer =  GetSpeedometer();
+			//Print("Crash data recorded");
+			#endif
+			if (dmg < GameConstants.CARS_CONTACT_DMG_THRESHOLD)
+			{			
+				#ifdef DIAG_DEVELOPER
+				CrashDebugData.m_CrashDataPoint.m_DamageType = "Small";
+				if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.DAMAGE_APPLIED)
+					Debug.Log(string.Format("[Vehiles:Damage]:: DMG %1 to the %2 zone is SMALL (threshold: %3), SPEEDOMETER: %4, TIME: %5", dmg, zoneName, GameConstants.CARS_CONTACT_DMG_MIN, GetSpeedometer(), GetGame().GetTime() ));
+				#endif
+				SynchCrashLightSound(true);
+				pddfFlags = ProcessDirectDamageFlags.NO_TRANSFER;
+			}
+			else
+			{
+				#ifdef DIAG_DEVELOPER
+				CrashDebugData.m_CrashDataPoint.m_DamageType = "Big";
+				if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.DAMAGE_APPLIED)
+					Debug.Log(string.Format("[Vehiles:Damage]:: DMG %1 to the %2 zone is BIG (threshold: %3), SPEED: %4, TIME: %5", dmg, zoneName, GameConstants.CARS_CONTACT_DMG_THRESHOLD, GetSpeedometer(), GetGame().GetTime() ));
+				#endif
+				DamageCrew(crewDmgBase);
+				SynchCrashHeavySound(true);
+				pddfFlags = 0;
+			}
+			
+			#ifdef DEVELOPER
+			m_DebugContactDamageMessage += string.Format("%1: %2\n", zoneName, dmg);
+			#endif
+			
+			ProcessDirectDamage(DT_CUSTOM, null, zoneName, "EnviroDmg", "0 0 0", dmg, pddfFlags);
+		}
+		
+		UpdateHeadlightState();
+		UpdateLights();
+		
+		m_ContactCache.Clear();
+		
+	}
+	
+	//! Responsible for damaging crew in a car crash
+	void DamageCrew(float dmg)
+	{
+		for ( int c = 0; c < CrewSize(); ++c )
+		{
+			Human crew = CrewMember( c );
+			if ( !crew )
+				continue;
+
+			PlayerBase player;
+			if ( Class.CastTo(player, crew ) )
+			{
+				if ( dmg > GameConstants.CARS_CONTACT_DMG_KILLCREW )
+				{		
+					#ifdef DIAG_DEVELOPER
+					CrashDebugData.m_CrashDataPoint.m_CrewDamageBase = dmg;
+					CrashDebugData.m_CrashDataPoint.m_DMGHealth = -100;
+					if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.DAMAGE_APPLIED)
+					{
+						Debug.Log("--------------------------------------------------");
+						Debug.Log("Killing the player");
+						Debug.Log("Crew DMG Base: " + dmg);
+						Debug.Log("--------------------------------------------------");
+
+					}
+					#endif
+					player.SetHealth(0.0);
+				}
+				else
+				{
+					float shockTemp = Math.InverseLerp(GameConstants.CARS_CONTACT_DMG_THRESHOLD, GameConstants.CARS_CONTACT_DMG_KILLCREW, dmg);
+					shockTemp = Math.Clamp(shockTemp,0,1);
+					float shock = Math.Lerp( 50, 150, shockTemp );
+					float hp = Math.Lerp( 2, 100, shockTemp );
+
+					#ifdef DIAG_DEVELOPER
+					CrashDebugData.m_CrashDataPoint.m_CrewDamageBase = dmg;
+					CrashDebugData.m_CrashDataPoint.m_ShockTemp = shockTemp;
+					CrashDebugData.m_CrashDataPoint.m_DMGHealth = hp;
+					CrashDebugData.m_CrashDataPoint.m_DMGShock = shock;
+					if (DEBUG_OUTPUT_TYPE & EVehicleDebugOutputType.DAMAGE_APPLIED)
+					{
+						Debug.Log("--------------------------------------------------");
+						Debug.Log("Crew DMG Base: " + dmg);
+						Debug.Log("Crew shockTemp: " + shockTemp);
+						Debug.Log("Crew DMG Health: " + hp);
+						Debug.Log("Crew DMG Shock: " + shock);
+						Debug.Log("--------------------------------------------------");
+					}
+					#endif
+					
+					player.AddHealth("", "Shock", -shock );
+					player.AddHealth("", "Health", -hp );
+				}
+			}
+		}
+	}
+
+	/*!
+		Gets called every sound simulation step.
+		In this callback, user can modify behaviour of sound controllers
+		The higher the return value is the more muted sound is.
+	*/
+	override float OnSound( CarSoundCtrl ctrl, float oldValue )
+	{
+		switch (ctrl)
+		{
+		case CarSoundCtrl.ENGINE:
+			if (!m_EngineStarted)
+			{
+				return 0.0;
+			}
+		break;
+		}
+		
+		return oldValue;
+	}
+	
+	override void OnAnimationPhaseStarted(string animSource, float phase)
+	{
+		#ifndef SERVER
+		HandleDoorsSound(animSource, phase);
+		HandleSeatAdjustmentSound(animSource, phase);
+		#endif
+	}
+	
+	protected void HandleDoorsSound(string animSource, float phase)
+	{
+		switch (animSource)
+		{
+			case "doorsdriver":
+			case "doorscodriver":
+			case "doorscargo1":
+			case "doorscargo2":
+			case "doorshood":
+			case "doorstrunk":
+				EffectSound sound;
+				if (phase == 0)
+					sound = SEffectManager.PlaySound(m_CarDoorOpenSound, GetPosition());
+				else
+					sound = SEffectManager.PlaySound(m_CarDoorCloseSound, GetPosition());
+				
+				if (sound)
+					sound.SetAutodestroy(true);
+
+				break;
+		}
+	}
+	
+	protected void HandleSeatAdjustmentSound(string animSource, float phase)
+	{
+		switch (animSource)
+		{
+			case "seatdriver":
+			case "seatcodriver":
+				EffectSound sound;
+				if (phase == 0)
+					sound = SEffectManager.PlaySound(m_CarSeatShiftInSound, GetPosition());
+				else
+					sound = SEffectManager.PlaySound(m_CarSeatShiftOutSound, GetPosition());
+				
+				if (sound)
+					sound.SetAutodestroy(true);
+
+				break;
+		}
+	}
+	
+	
+	protected void HandleCarHornSound(ECarHornState pState)
+	{
+		switch (pState)
+		{
+		case ECarHornState.SHORT:
+			PlaySoundSet(m_CarHornSoundEffect, m_CarHornShortSoundName, 0, 0, false);
+		break;
+		case ECarHornState.LONG:
+			PlaySoundSet(m_CarHornSoundEffect, m_CarHornLongSoundName, 0, 0, true);
+		break;
+		default:
+			CleanupSound(m_CarHornSoundEffect);
+		break;
+		}
+	}
+	
+	void HandleEngineSound(CarEngineSoundState state)
+	{
+		#ifndef SERVER
+		PlayerBase player = null;
+		EffectSound sound = null;
+		WaveKind waveKind = WaveKind.WAVEEFFECT;
+
+		switch (state)
+		{
+			case CarEngineSoundState.STARTING:
+				m_PreStartSound = SEffectManager.PlaySound("Offroad_02_Starting_SoundSet", ModelToWorld(GetEnginePos()));
+				m_PreStartSound.SetSoundFadeOut(0.15);
+				break;
+			case CarEngineSoundState.START_OK:
+				// play different sound based on selected camera
+				if (Class.CastTo(player, CrewMember(0)))
+				{
+					if (!player.IsCameraInsideVehicle())
+					{
+						waveKind = WaveKind.WAVEEFFECTEX;
+					}
+		
+					sound = SEffectManager.CreateSound(m_EngineStartOK, ModelToWorld(GetEnginePos()));
+					if (sound)
+					{
+						sound.SetSoundWaveKind(waveKind);
+						sound.SoundPlay();
+						sound.SetAutodestroy(true);
+					}
+				}
+				
+				//! postpone the engine sound played from c++ on soundcontroller (via OnSound override)
+				GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(SetEngineStarted, 1000, false, true);
+				break;
+				
+			case CarEngineSoundState.START_NO_FUEL:
+				sound = SEffectManager.PlaySound("offroad_engine_failed_start_fuel_SoundSet", ModelToWorld(GetEnginePos()));
+				sound.SetAutodestroy(true);
+				break;
+				
+			case CarEngineSoundState.START_NO_BATTERY:
+				sound = SEffectManager.PlaySound("offroad_engine_failed_start_battery_SoundSet", ModelToWorld(GetEnginePos()));
+				sound.SetAutodestroy(true);
+				break;
+				
+			case CarEngineSoundState.START_NO_SPARKPLUG:
+				sound = SEffectManager.PlaySound("offroad_engine_failed_start_sparkplugs_SoundSet", ModelToWorld(GetEnginePos()));
+				sound.SetAutodestroy(true);
+				break;
+				
+			case CarEngineSoundState.STOP_OK:
+			case CarEngineSoundState.STOP_NO_FUEL:
+				// play different sound based on selected camera
+				if (Class.CastTo(player, CrewMember(0)))
+				{
+					if (!player.IsCameraInsideVehicle())
+					{
+						waveKind = WaveKind.WAVEEFFECTEX;
+					}
+					
+					sound = SEffectManager.CreateSound(m_EngineStopFuel, ModelToWorld(GetEnginePos()));
+					if (sound)
+					{
+						sound.SetSoundWaveKind(waveKind);
+						sound.SoundPlay();
+						sound.SetAutodestroy(true);
+					}
+				}
+			
+				SetEngineStarted(false);
+				break;
+		}
+		#endif
+	}
+	
+	override void MarkCrewMemberUnconscious(int crewMemberIndex)
+	{
+		set<int> crewMemberIndicesCopy = new set<int>();
+		crewMemberIndicesCopy.Copy(m_UnconsciousCrewMemberIndices);
+		crewMemberIndicesCopy.Insert(crewMemberIndex);
+
+		m_UnconsciousCrewMemberIndices = crewMemberIndicesCopy;
+	}
+	
+	override void MarkCrewMemberDead(int crewMemberIndex)
+	{
+		set<int> crewMemberIndicesCopy = new set<int>();
+		crewMemberIndicesCopy.Copy(m_DeadCrewMemberIndices);
+		crewMemberIndicesCopy.Insert(crewMemberIndex);
+
+		m_DeadCrewMemberIndices = crewMemberIndicesCopy;
+	}
+	
+	override void HandleByCrewMemberState(ECrewMemberState state)
+	{
+		switch (state)
+		{
+			case ECrewMemberState.UNCONSCIOUS:
+				foreach (int unconsciousCrewMemberIndex : m_UnconsciousCrewMemberIndices)
+				{
+					if (unconsciousCrewMemberIndex == DayZPlayerConstants.VEHICLESEAT_DRIVER)
+					{
+						EngineStop();
+						SetBrake(0.5);
+					}
+					
+					m_UnconsciousCrewMemberIndices.RemoveItem(unconsciousCrewMemberIndex);
+				}
+
+				break
+			
+			case ECrewMemberState.DEAD:
+				foreach (int deadCrewMemberIndex : m_DeadCrewMemberIndices)
+				{
+					if (deadCrewMemberIndex == DayZPlayerConstants.VEHICLESEAT_DRIVER)
+					{
+						EngineStop();
+						SetBrake(0.5);
+					}
+					
+					m_DeadCrewMemberIndices.RemoveItem(deadCrewMemberIndex);
+				}
+
+				break
+		}
+	}
+
+	//! DEPRECATED	
+	float GetEnviroHeatComfortOverride();
+
+	/*!
+		Gets called everytime when the specified vehicle's fluid
+		changes its current value eg. when car is consuming fuel.
+
+		This callback is called on both server and client.
+	*/
+	override void OnFluidChanged(CarFluid fluid, float newValue, float oldValue)
+	{
+		switch ( fluid )
+		{
+		case CarFluid.FUEL:
+			m_FuelAmmount = newValue;
+			break;
+
+		case CarFluid.OIL:
+			m_OilAmmount = newValue;
+			break;
+
+		case CarFluid.BRAKE:
+			m_BrakeAmmount = newValue;
+			break;
+
+		case CarFluid.COOLANT:
+			m_CoolantAmmount = newValue;
+			break;
+		}
+	}
+
+	/*!
+		Gets called everytime the game wants to start the engine.
+		This callback is called on server only.
+
+		\return true if the engine can start, false otherwise.
+	*/
+	override bool OnBeforeEngineStart()
+	{
+		EntityAI item = null;
+		
+		if (m_EngineStartDoOnce)
+		{
+			m_EngineStartDoOnce = false;
+			return m_EngineBeforeStart;
+		}
+		
+		if (GetFluidFraction(CarFluid.FUEL) <= 0)
+		{
+			HandleEngineSound(CarEngineSoundState.START_NO_FUEL);
+			return false;
+		}
+		
+		if (IsVitalCarBattery() || IsVitalTruckBattery())
+		{
+			item = GetBattery();
+			if (!item || (item && (item.IsRuined() || item.GetCompEM().GetEnergy() < m_BatteryEnergyStartMin)))
+			{
+				m_EngineStartDoOnce = true;
+				HandleEngineSound(CarEngineSoundState.START_NO_BATTERY);
+				return false;
+			}
+		}
+
+		if (IsVitalSparkPlug())
+		{
+			item = FindAttachmentBySlotName("SparkPlug");
+			if (!item || (item && item.IsRuined()))
+			{
+				m_EngineStartDoOnce = true;
+				HandleEngineSound(CarEngineSoundState.START_NO_SPARKPLUG);
+				return false;
+			}
+		}
+	
+		if (IsVitalGlowPlug())
+		{
+			item = FindAttachmentBySlotName("GlowPlug");
+			if (!item || (item && item.IsRuined()))
+			{
+				m_EngineStartDoOnce = true;
+				HandleEngineSound(CarEngineSoundState.START_NO_SPARKPLUG);
+				return false;
+			}
+		}
+		
+		if (!m_EngineBeforeStart)
+		{
+			m_EngineBeforeStart = true;
+			HandleEngineSound(CarEngineSoundState.STARTING);
+		}
+
+		return true;
+	}
+
+	override void OnGearChanged(int newGear, int oldGear)
+	{
+		//Debug.Log(string.Format("OnGearChanged newGear=%1,oldGear=%2", newGear, oldGear));
+		UpdateLights(newGear);
+	}
+	
+	//! Gets called everytime the engine starts.
+	override void OnEngineStart()
+	{
+		ItemBase battery = GetBattery();
+		if (GetGame().IsServer() && battery)
+		{
+			battery.GetCompEM().ConsumeEnergy(GetBatteryConsumption());
+		}
+		
+		UpdateLights();
+		
+		HandleEngineSound(CarEngineSoundState.START_OK);
+		
+		m_EngineBeforeStart = false;
+	}
+
+	//! Gets called everytime the engine stops.
+	override void OnEngineStop()
+	{
+		UpdateLights();
+		
+		HandleEngineSound(CarEngineSoundState.STOP_OK);
+		SetEngineZoneReceivedHit(false);
+		
+		m_EngineBeforeStart = false;
+	}
+
+	/*!
+		DEPRECATED Gets called everytime the game wants to switch the lights.
+		\return true when lights can be switched, false otherwise.
+	*/
+	bool OnBeforeSwitchLights( bool toOn )
+	{
+		return true;
+	}
+	
+	//! Propper way to get if light is swiched on. Use instead of IsLightsOn().
+	bool IsScriptedLightsOn()
+	{
+		return m_HeadlightsOn;
+	}
+	
+	//! Switches headlights on/off, including the illumination of the control panel and synchronizes this change to all clients.
+	void ToggleHeadlights()
+	{
+		m_HeadlightsOn = !m_HeadlightsOn;
+		SetSynchDirty();
+	}
+	
+	void UpdateLights(int new_gear = -1)
+	{
+		#ifndef SERVER
+		UpdateLightsClient(new_gear);
+		#endif
+		UpdateLightsServer(new_gear);
+	}
+	
+	void UpdateLightsClient(int newGear = -1)
+	{
+		int gear;
+		
+		if (newGear == -1)
+		{
+			gear = GetGear();
+		}
+		else
+		{
+			gear = newGear;
+		}
+		
+		if (m_HeadlightsOn)
+		{
+			if (!m_Headlight && m_HeadlightsState != CarHeadlightBulbsState.NONE)
+			{
+				m_Headlight = CreateFrontLight();
+			}
+			
+			if (m_Headlight)
+			{
+				switch (m_HeadlightsState)
+				{
+				case CarHeadlightBulbsState.LEFT:
+					m_Headlight.AttachOnMemoryPoint(this, m_LeftHeadlightPoint, m_LeftHeadlightTargetPoint);
+					m_Headlight.SegregateLight();
+					break;
+				case CarHeadlightBulbsState.RIGHT:
+					m_Headlight.AttachOnMemoryPoint(this, m_RightHeadlightPoint, m_RightHeadlightTargetPoint);
+					m_Headlight.SegregateLight();
+					break;
+				case CarHeadlightBulbsState.BOTH:
+					vector local_pos_left = GetMemoryPointPos(m_LeftHeadlightPoint);
+					vector local_pos_right = GetMemoryPointPos(m_RightHeadlightPoint);
+					
+					vector local_pos_middle = (local_pos_left + local_pos_right) * 0.5;
+					m_Headlight.AttachOnObject(this, local_pos_middle);
+					m_Headlight.AggregateLight();
+					break;
+				default:
+					m_Headlight.FadeOut();
+					m_Headlight = null;
+				}
+			}
+		}
+		else
+		{
+			if (m_Headlight)
+			{
+				m_Headlight.FadeOut();
+				m_Headlight = null;
+			}
+		}
+			
+		// brakes & reverse
+		switch (gear)
+		{
+			case CarGear.REVERSE:
+			case CarAutomaticGearboxMode.R:
+				if (m_BrakesArePressed)
+					m_RearLightType = CarRearLightType.BRAKES_AND_REVERSE;
+				else
+					m_RearLightType = CarRearLightType.REVERSE_ONLY;
+				break;
+			default:
+				if (m_BrakesArePressed)
+					m_RearLightType = CarRearLightType.BRAKES_ONLY;
+				else
+					m_RearLightType = CarRearLightType.NONE;
+		}
+
+		//Debug.Log(string.Format("m_BrakesArePressed=%1, m_RearLightType=%2", m_BrakesArePressed.ToString(), EnumTools.EnumToString(CarRearLightType, m_RearLightType)));
+
+		if (!m_RearLight && m_RearLightType != CarRearLightType.NONE && m_HeadlightsState != CarHeadlightBulbsState.NONE)
+		{
+			if (EngineIsOn() || m_RearLightType == CarRearLightType.BRAKES_ONLY || m_RearLightType == CarRearLightType.BRAKES_AND_REVERSE)
+			{	
+				m_RearLight = CreateRearLight();
+				vector localPos = GetMemoryPointPos(m_ReverseLightPoint);
+				m_RearLight.AttachOnObject(this, localPos, "180 0 0");
+			}
+		}
+
+		// rear lights
+		if (m_RearLight && m_RearLightType != CarRearLightType.NONE && m_HeadlightsState != CarHeadlightBulbsState.NONE)
+		{
+			switch (m_RearLightType)
+			{
+				case CarRearLightType.BRAKES_ONLY:
+					BrakesRearLight();
+					break;
+				case CarRearLightType.REVERSE_ONLY:
+					if (EngineIsOn())
+						ReverseRearLight();
+					else
+						NoRearLight();
+
+					break;
+				case CarRearLightType.BRAKES_AND_REVERSE:
+					if (EngineIsOn())
+						BrakeAndReverseRearLight();
+					else
+						BrakesRearLight();
+	
+					break;
+				default:
+					NoRearLight();
+			}
+		}
+		else
+		{
+			if (m_RearLight)
+			{
+				NoRearLight();
+			}
+		}
+	}
+	
+	void UpdateLightsServer(int newGear = -1)
+	{
+		int gear;
+		
+		if (newGear == -1)
+		{
+			gear = GetGear();
+			if (GearboxGetType() == CarGearboxType.AUTOMATIC)
+			{
+				gear = GearboxGetMode();
+			}
+		}
+		else
+		{
+			gear = newGear;
+		}
+		
+		if (m_HeadlightsOn)
+		{
+			DashboardShineOn();
+			TailLightsShineOn();
+			
+			switch (m_HeadlightsState)
+			{
+			case CarHeadlightBulbsState.LEFT:
+				LeftFrontLightShineOn();
+				RightFrontLightShineOff();
+				break;
+			case CarHeadlightBulbsState.RIGHT:
+				LeftFrontLightShineOff();
+				RightFrontLightShineOn();
+				break;
+			case CarHeadlightBulbsState.BOTH:
+				LeftFrontLightShineOn();
+				RightFrontLightShineOn();
+				break;
+			default:
+				LeftFrontLightShineOff();
+				RightFrontLightShineOff();
+			}
+			
+			//Debug.Log(string.Format("m_HeadlightsOn=%1, m_HeadlightsState=%2", m_HeadlightsOn.ToString(), EnumTools.EnumToString(CarHeadlightBulbsState, m_HeadlightsState)));
+		}
+		else
+		{
+			TailLightsShineOff();
+			DashboardShineOff();
+			LeftFrontLightShineOff();
+			RightFrontLightShineOff();
+		}
+			
+
+		// brakes & reverse
+		switch (gear)
+		{
+			case CarGear.REVERSE:
+			case CarAutomaticGearboxMode.R:
+				if (m_BrakesArePressed)
+					m_RearLightType = CarRearLightType.BRAKES_AND_REVERSE;
+				else
+					m_RearLightType = CarRearLightType.REVERSE_ONLY;
+				break;
+			default:
+				if (m_BrakesArePressed)
+					m_RearLightType = CarRearLightType.BRAKES_ONLY;
+				else
+					m_RearLightType = CarRearLightType.NONE;
+		}
+
+		//Debug.Log(string.Format("m_BrakesArePressed=%1, m_RearLightType=%2", m_BrakesArePressed.ToString(), EnumTools.EnumToString(CarRearLightType, m_RearLightType)));
+			
+		
+		// rear lights
+		if (m_RearLightType != CarRearLightType.NONE && m_HeadlightsState != CarHeadlightBulbsState.NONE)
+		{
+			switch (m_RearLightType)
+			{
+				case CarRearLightType.BRAKES_ONLY:
+					ReverseLightsShineOff();
+					BrakeLightsShineOn();
+					break;
+				case CarRearLightType.REVERSE_ONLY:
+					if (EngineIsOn())
+					{
+						ReverseLightsShineOn();
+						BrakeLightsShineOff();
+					}
+					else
+					{
+						ReverseLightsShineOff();
+						BrakeLightsShineOff();
+					}
+					break;
+				case CarRearLightType.BRAKES_AND_REVERSE:
+					if (EngineIsOn())
+					{
+						BrakeLightsShineOn();
+						ReverseLightsShineOn();
+					}
+					else
+					{
+						ReverseLightsShineOff();
+						BrakeLightsShineOn();
+					}
+					break;
+				default:
+					ReverseLightsShineOff();
+					BrakeLightsShineOff();
+			}
+		}
+		else
+		{
+			ReverseLightsShineOff();
+			BrakeLightsShineOff();
+		}
+	}
+	
+	protected void BrakesRearLight()
+	{
+		m_RearLight.SetAsSegregatedBrakeLight();
+	}
+	
+	protected void ReverseRearLight()
+	{
+		m_RearLight.SetAsSegregatedReverseLight();
+	}
+	
+	protected void BrakeAndReverseRearLight()
+	{
+		m_RearLight.AggregateLight();
+		m_RearLight.SetFadeOutTime(1);
+	}
+	
+	protected void NoRearLight()
+	{
+		m_RearLight.FadeOut();
+		m_RearLight = null;
+	}
+	
+	protected void LeftFrontLightShineOn()
+	{
+		string material = ConfigGetString("frontReflectorMatOn");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_FRONT_LIGHT_L, material);
+		}
+	}
+	
+	protected void RightFrontLightShineOn()
+	{
+		string material = ConfigGetString("frontReflectorMatOn");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_FRONT_LIGHT_R, material);
+		}
+	}
+	
+	protected void LeftFrontLightShineOff()
+	{
+		string material = ConfigGetString("frontReflectorMatOff");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_FRONT_LIGHT_L, material);
+		}
+	}
+	
+	protected void RightFrontLightShineOff()
+	{
+		string material = ConfigGetString("frontReflectorMatOff");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_FRONT_LIGHT_R, material);
+		}
+	}
+	
+	protected void ReverseLightsShineOn()
+	{
+		string material = ConfigGetString("ReverseReflectorMatOn");
+			
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_REVERSE_LIGHT_L, material);
+			SetObjectMaterial(SELECTION_ID_REVERSE_LIGHT_R, material);
+		}
+	}
+	
+	protected void ReverseLightsShineOff()
+	{
+		string material = ConfigGetString("ReverseReflectorMatOff");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_REVERSE_LIGHT_L, material);
+			SetObjectMaterial(SELECTION_ID_REVERSE_LIGHT_R, material);
+		}
+	}
+	
+	protected void BrakeLightsShineOn()
+	{
+		string material = ConfigGetString("brakeReflectorMatOn");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_BRAKE_LIGHT_L, material);
+			SetObjectMaterial(SELECTION_ID_BRAKE_LIGHT_R, material);
+		}
+	}
+	
+	protected void BrakeLightsShineOff()
+	{
+		string material = ConfigGetString("brakeReflectorMatOff");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_BRAKE_LIGHT_L, material);
+			SetObjectMaterial(SELECTION_ID_BRAKE_LIGHT_R, material);
+		}
+	}
+	
+	protected void TailLightsShineOn()
+	{
+		string material = ConfigGetString("TailReflectorMatOn");
+		string materialOff = ConfigGetString("TailReflectorMatOff");
+		
+		if (material && materialOff)
+		{
+			if (m_HeadlightsState == CarHeadlightBulbsState.LEFT)
+			{
+				SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_L, material);
+				SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_R, materialOff);
+			}
+			else if (m_HeadlightsState == CarHeadlightBulbsState.RIGHT)
+			{
+				SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_L, materialOff);
+				SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_R, material);
+			}
+			else if (m_HeadlightsState == CarHeadlightBulbsState.BOTH)
+			{
+				SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_L, material);
+				SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_R, material);
+			}
+		}
+	}
+	
+	protected void TailLightsShineOff()
+	{
+		string material = ConfigGetString("TailReflectorMatOff");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_L, material);
+			SetObjectMaterial(SELECTION_ID_TAIL_LIGHT_R, material);
+		}
+	}
+	
+	protected void DashboardShineOn()
+	{
+		string material = ConfigGetString("dashboardMatOn");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_DASHBOARD_LIGHT, material);
+		}
+	}
+	
+	protected void DashboardShineOff()
+	{
+		string material = ConfigGetString("dashboardMatOff");
+		
+		if (material)
+		{
+			SetObjectMaterial(SELECTION_ID_DASHBOARD_LIGHT, material);
+		}
+	}
+	
+	// Override this for a car-specific light type
+	protected CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast(ScriptedLightBase.CreateLight(OffroadHatchbackFrontLight));
+	}
+	
+	// Override this for a car-specific light type
+	protected CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast(ScriptedLightBase.CreateLight(OffroadHatchbackFrontLight));
+	}
+	
+	protected void CheckVitalItem( bool isVital, string itemName )
+	{
+		if ( !isVital )
+			return;
+
+		EntityAI item = FindAttachmentBySlotName(itemName);
+
+		if ( !item )
+			EngineStop();
+		else if ( item.IsRuined() )
+			EngineStop();
+	}
+
+	protected void LeakFluid(CarFluid fluid)
+	{
+		float ammount = 0;
+		
+		switch (fluid)
+		{
+			case CarFluid.COOLANT:
+				ammount = (1- m_RadiatorHealth) * Math.RandomFloat(0.02, 0.05);//CARS_LEAK_TICK_MIN; CARS_LEAK_TICK_MAX
+				Leak(fluid, ammount);
+			break;
+			
+			case CarFluid.OIL:
+				ammount =  ( 1 - m_EngineHealth ) * Math.RandomFloat(0.02, 1.0);//CARS_LEAK_OIL_MIN; CARS_LEAK_OIL_MAX
+				Leak(fluid, ammount);
+			break;
+			
+			case CarFluid.FUEL:
+				ammount = ( 1 - m_FuelTankHealth ) * Math.RandomFloat(0.02, 0.05);//CARS_LEAK_TICK_MIN; CARS_LEAK_TICK_MAX
+				Leak(fluid, ammount);
+			break;
+		}
+	}
+
+	protected void CarPartsHealthCheck()
+	{
+		if (GetGame().IsServer())
+		{
+			if (HasRadiator())
+			{
+				m_RadiatorHealth = GetRadiator().GetHealth01("", "");
+			}
+			else
+			{
+				m_RadiatorHealth = 0;
+			}
+			
+			m_EngineHealth 		= GetHealth01("Engine", "");
+			m_FuelTankHealth 	= GetHealth01("FuelTank", "");
+		}
+	}
+	
+	bool GetCrashLightSound()
+	{
+		return m_PlayCrashSoundLight;
+	}
+	
+	void SynchCrashLightSound(bool play)
+	{
+		if (m_PlayCrashSoundLight != play)
+		{
+			m_PlayCrashSoundLight = play;
+			SetSynchDirty();
+		}
+	}
+
+	void PlayCrashLightSound()
+	{
+		PlaySoundEx("offroad_hit_light_SoundSet", m_CrashSoundLight, m_PlayCrashSoundLight);
+	}
+
+	bool GetCrashHeavySound()
+	{
+		return m_PlayCrashSoundHeavy;
+	}
+
+	void SynchCrashHeavySound(bool play)
+	{
+		if (m_PlayCrashSoundHeavy != play)
+		{
+			m_PlayCrashSoundHeavy = play;
+			SetSynchDirty();
+		}
+	}
+	
+	void PlayCrashHeavySound()
+	{
+		PlaySoundEx("offroad_hit_heavy_SoundSet", m_CrashSoundHeavy, m_PlayCrashSoundHeavy);
+	}
+	
+	void PlaySoundEx(string soundset, EffectSound sound, out bool soundbool)
+	{
+		#ifndef SERVER
+		if (!sound)
+		{
+			sound =	SEffectManager.PlaySoundCachedParams(soundset, GetPosition());
+			if( sound )
+			{
+				sound.SetAutodestroy(true);
+			}
+		}
+		else
+		{
+			if (!sound.IsSoundPlaying())
+			{
+				sound.SetPosition(GetPosition());
+				sound.SoundPlay();
+			}
+		}
+		
+		soundbool = false;
+		#endif
+	}
+	
+	void PlaySound(string soundset, ref EffectSound sound, out bool soundbool)
+	{
+		PlaySoundEx(soundset, sound, soundbool);
+	}
+	
+	string GetAnimSourceFromSelection( string selection )
+	{
+		return "";
+	}
+	
+	string GetDoorConditionPointFromSelection( string selection )
+	{
+		switch( selection )
+		{
+			case "seat_driver":
+				return "seat_con_1_1";
+			break;
+			case "seat_codriver":
+				return "seat_con_2_1";
+			break;
+			case "seat_cargo1":
+				return "seat_con_1_2";
+			break;
+			case "seat_cargo2":
+				return "seat_con_2_2";
+			break;
+		}
+		
+		return "";
+	}
+	
+	string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		return "";
+	}
+	
+	string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		return "";
+	}
+	
+	int GetCrewIndex( string selection )
+	{
+		return -1;
+	}
+
+	override bool CanReachSeatFromDoors( string pSeatSelection, vector pFromPos, float pDistance = 1.0 )
+	{
+		string conPointName = GetDoorConditionPointFromSelection(pSeatSelection);
+		if (conPointName.Length() > 0)
+		{
+			if ( MemoryPointExists(conPointName) )
+			{
+				vector conPointMS = GetMemoryPointPos(conPointName);
+				vector conPointWS = ModelToWorld(conPointMS);
+				
+				//! skip the height for now
+				conPointWS[1] = 0;
+				pFromPos[1] = 0;
+				
+				if (vector.Distance(pFromPos, conPointWS) <= pDistance)
+				{
+					return true;
+				}
+			}
+		}
+
+		return false;		
+	}
+
+	bool IsVitalCarBattery()
+	{
+		return true;
+	}
+	
+	bool IsVitalTruckBattery()
+	{
+		return true;
+	}
+	
+	bool IsVitalSparkPlug()
+	{
+		return true;
+	}
+	
+	bool IsVitalGlowPlug()
+	{
+		return true;
+	}
+	
+	bool IsVitalEngineBelt()
+	{
+		return true;
+	}
+	
+	bool IsVitalRadiator()
+	{
+		return true;
+	}
+	
+	bool IsVitalFuelTank()
+	{
+		return true;
+	}
+	
+	bool HasRadiator()
+	{
+		return m_Radiator != null;
+	}
+	
+	EntityAI GetRadiator()
+	{
+		return m_Radiator;
+	}
+	
+	bool IsMoving()
+	{
+		return GetSpeedometerAbsolute() > 3.5;
+	}
+	
+	bool IsHandbrakeActive()
+	{
+		return GetHandbrake() > 0.0;
+	}
+
+	//! camera type
+	override int Get3rdPersonCameraType()
+	{
+		return DayZPlayerCameras.DAYZCAMERA_3RD_VEHICLE;
+
+	}
+
+	void SetEngineStarted(bool started)
+	{
+		m_EngineStarted = started;
+	}
+
+	int GetCarDoorsState(string slotType)
+	{
+		return -1;
+	}
+	
+	CarDoorState TranslateAnimationPhaseToCarDoorState(string animation)
+	{
+		if (GetAnimationPhase(animation) > 0.5)
+		{
+			return CarDoorState.DOORS_OPEN;
+		}
+		else
+		{
+			return CarDoorState.DOORS_CLOSED;
+		}
+	}
+
+	string GetActionCompNameCoolant()
+	{
+		return "radiator";
+	}
+
+	float GetActionDistanceCoolant()
+	{
+		return 2.0;
+	}
+
+	string GetActionCompNameFuel()
+	{
+		return "refill";
+	}
+
+	float GetActionDistanceFuel()
+	{
+		return 1.5;
+	}
+	
+	string GetActionCompNameOil()
+	{
+		return "carradiator";
+	}
+
+	float GetActionDistanceOil()
+	{
+		return 2.0;
+	}
+	
+	string GetActionCompNameBrakes()
+	{
+		return "carradiator";
+	}
+
+	float GetActionDistanceBrakes()
+	{
+		return 2.0;
+	}
+	
+	void InitializeActions()
+	{
+		m_InputActionMap = m_CarTypeActionsMap.Get( this.Type() );
+		if (!m_InputActionMap)
+		{
+			TInputActionMap iam = new TInputActionMap;
+			m_InputActionMap = iam;
+			SetActions();
+			m_CarTypeActionsMap.Insert(this.Type(), m_InputActionMap);
+		}
+	}
+	
+	override void GetActions(typename action_input_type, out array<ActionBase_Basic> actions)
+	{
+		if (!m_ActionsInitialize)
+		{
+			m_ActionsInitialize = true;
+			InitializeActions();
+		}
+		
+		actions = m_InputActionMap.Get(action_input_type);
+	}
+	
+	void SetActions()
+	{
+		AddAction(ActionOpenCarDoorsOutside);
+		AddAction(ActionCloseCarDoorsOutside);
+		AddAction(ActionGetInTransport);
+		AddAction(ActionSwitchLights);
+		AddAction(ActionCarHornShort);
+		AddAction(ActionCarHornLong);
+		AddAction(ActionPushCar);
+	}
+	
+	void AddAction(typename actionName)
+	{
+		ActionBase action = ActionManagerBase.GetAction(actionName);
+
+		if (!action)
+		{
+			Debug.LogError("Action " + actionName + " dosn't exist!");
+			return;
+		}		
+		
+		typename ai = action.GetInputType();
+		if (!ai)
+		{
+			m_ActionsInitialize = false;
+			return;
+		}
+		array<ActionBase_Basic> action_array = m_InputActionMap.Get(ai);
+		
+		if (!action_array)
+		{
+			action_array = new array<ActionBase_Basic>;
+			m_InputActionMap.Insert(ai, action_array);
+		}
+		
+		if ( LogManager.IsActionLogEnable() )
+		{
+			Debug.ActionLog(action.ToString() + " -> " + ai, this.ToString() , "n/a", "Add action" );
+		}
+		action_array.Insert(action);
+	}
+	
+	void RemoveAction(typename actionName)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionBase action = player.GetActionManager().GetAction(actionName);
+		typename ai = action.GetInputType();
+		array<ActionBase_Basic> action_array = m_InputActionMap.Get(ai);
+		
+		if (action_array)
+		{
+			action_array.RemoveItem(action);
+		}
+	}
+	
+	override bool IsInventoryVisible()
+	{
+		return ( GetGame().GetPlayer() && ( !GetGame().GetPlayer().GetCommand_Vehicle() || GetGame().GetPlayer().GetCommand_Vehicle().GetTransport() == this ) );
+	}
+
+	override void EEHealthLevelChanged(int oldLevel, int newLevel, string zone)
+	{
+		super.EEHealthLevelChanged(oldLevel,newLevel,zone);
+		
+		if (newLevel == GameConstants.STATE_RUINED && oldLevel != newLevel)
+		{
+			bool dummy;
+			switch ( zone )
+			{
+			case "WindowLR":
+			case "WindowRR":
+				if (m_Initialized)
+				{
+					PlaySoundEx("offroad_hit_window_small_SoundSet", m_WindowSmall, dummy);
+				}
+			break;
+			
+			case "WindowFront":
+			case "WindowBack":
+			case "WindowFrontLeft":
+			case "WindowFrontRight":
+				if (m_Initialized)
+				{
+					PlaySoundEx("offroad_hit_window_large_SoundSet", m_WindowLarge, dummy);
+				}
+			break;
+
+			case "Engine":
+				#ifndef SERVER
+				CreateCarDestroyedEffect();
+				#endif
+			break;
+			}
+		}
+	}
+	
+	override void EEOnCECreate()
+	{
+
+		float maxVolume = GetFluidCapacity( CarFluid.FUEL );
+		float amount = Math.RandomFloat(0.0, maxVolume * 0.35 );
+
+		Fill( CarFluid.FUEL, amount );
+	}
+	
+	void ForceUpdateLightsStart()
+	{
+		if (!m_ForceUpdateLights)
+		{
+			m_ForceUpdateLights = true;
+			SetSynchDirty();
+		}
+	}
+	
+	void ForceUpdateLightsEnd()
+	{
+		if (m_ForceUpdateLights)
+		{
+			m_ForceUpdateLights = false;
+			SetSynchDirty();
+		}
+	}
+	
+	//Get the engine start battery consumption
+	float GetBatteryConsumption()
+	{
+		return m_BatteryConsume;
+	}
+	
+	float GetBatteryRuntimeConsumption()
+	{
+		return m_BatteryContinuousConsume;
+	}
+	
+	float GetBatteryRechargeRate()
+	{
+		return -m_BatteryRecharge;
+	}
+	
+	ItemBase GetBattery()
+	{
+		if (IsVitalCarBattery()) 
+		{
+			return ItemBase.Cast(FindAttachmentBySlotName("CarBattery"));
+		}
+		else if (IsVitalTruckBattery())
+		{
+			return ItemBase.Cast(FindAttachmentBySlotName("TruckBattery"));
+		}
+		
+		return null;
+	}
+	
+	void SetCarHornState(int pState)
+	{
+		m_CarHornState = pState;
+		SetSynchDirty();
+		
+		if (GetGame().IsServer())
+		{
+			GenerateCarHornAINoise(pState);
+		}
+	}
+	
+
+	
+	protected void GenerateCarHornAINoise(int pState)
+	{
+		if (pState != ECarHornState.OFF)
+		{
+			if (m_NoiseSystem && m_NoisePar)
+			{
+				float noiseMultiplier = 1.0;
+				if (pState == ECarHornState.LONG)
+					noiseMultiplier = 2.0;
+
+				m_NoiseSystem.AddNoiseTarget(GetPosition(), 5, m_NoisePar, noiseMultiplier);
+			}
+		}
+	}
+
+	override vector GetDefaultHitPosition()
+	{
+		return vector.Zero;
+	}
+
+	void SetEngineZoneReceivedHit(bool pState)
+	{
+		m_EngineZoneReceivedHit = pState;
+		SetSynchDirty();
+	}
+	
+	bool HasEngineZoneReceivedHit()
+	{
+		return m_EngineZoneReceivedHit;
+	}
+	
+	float GetMomentum()
+	{
+		return GetVelocity(this).Length() * dBodyGetMass(this);
+	}
+	
+	float GetPushForceCoefficientMultiplier()
+	{
+		return 1.0;
+	}
+
+#ifdef DEVELOPER
+	override protected string GetDebugText()
+	{
+		string debug_output = super.GetDebugText();
+		if (GetGame().IsServer())
+		{
+			debug_output += m_DebugContactDamageMessage + "\n";
+		}
+		debug_output += "Entity momentum: " + GetMomentum();
+
+		return debug_output;	
+	}
+#endif
+
+	protected void SpawnUniversalParts()
+	{
+		GetInventory().CreateInInventory("HeadlightH7");
+		GetInventory().CreateInInventory("HeadlightH7");
+		GetInventory().CreateInInventory("HeadlightH7");
+		GetInventory().CreateInInventory("HeadlightH7");
+
+		if (IsVitalCarBattery())
+		{
+			GetInventory().CreateInInventory("CarBattery");
+			GetInventory().CreateInInventory("CarBattery");
+		}
+
+		if (IsVitalTruckBattery())
+		{
+			GetInventory().CreateInInventory("TruckBattery");
+			GetInventory().CreateInInventory("TruckBattery");
+		}
+
+		if (IsVitalRadiator())
+		{
+			GetInventory().CreateInInventory("CarRadiator");
+			GetInventory().CreateInInventory("CarRadiator");
+		}
+
+		if (IsVitalSparkPlug())
+		{
+			GetInventory().CreateInInventory("SparkPlug");
+			GetInventory().CreateInInventory("SparkPlug");
+		}
+
+		if (IsVitalGlowPlug())
+		{
+			GetInventory().CreateInInventory("GlowPlug");
+			GetInventory().CreateInInventory("GlowPlug");
+		}
+	}
+
+	protected void SpawnAdditionalItems()
+	{
+		GetInventory().CreateInInventory("Wrench");
+		GetInventory().CreateInInventory("LugWrench");
+		GetInventory().CreateInInventory("Screwdriver");
+		GetInventory().CreateInInventory("EpoxyPutty");
+
+		GetInventory().CreateInInventory("CanisterGasoline");
+
+		EntityAI ent;
+		ItemBase container;
+		ent = GetInventory().CreateInInventory("CanisterGasoline");
+		if (Class.CastTo(container, ent))
+		{
+			container.SetLiquidType(LIQUID_WATER, true);
+		}
+
+		ent = GetInventory().CreateInInventory("Blowtorch");
+		if (ent)
+		{
+			ent.GetInventory().CreateInInventory("LargeGasCanister");
+		}
+
+		ent = GetInventory().CreateInInventory("Blowtorch");
+		if (ent)
+		{
+			ent.GetInventory().CreateInInventory("LargeGasCanister");
+		}
+	}
+
+	protected void FillUpCarFluids()
+	{
+		Fill(CarFluid.FUEL, 200.0);
+		Fill(CarFluid.COOLANT, 200.0);
+		Fill(CarFluid.OIL, 200.0);
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/HelicopterScript.c b/scripts/4_World/DayZ/Entities/Vehicles/HelicopterScript.c
new file mode 100644
index 0000000000000000000000000000000000000000..a7f27d1e41cb6683a07e7f778c013a37e5c2ec50
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/HelicopterScript.c
@@ -0,0 +1,35 @@
+/*!
+	Base script class for helicopters.
+*/
+class HelicopterScript extends HelicopterAuto
+{
+	void HelicopterScript()
+	{
+		SetEventMask(EntityEvent.POSTSIMULATE);
+	}
+
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+	}
+
+	/*!
+		Gets called everytime the game wants to start the engine.
+		This callback is called on server only.
+
+		\return true if the engine can start, false otherwise.
+	*/
+	bool OnBeforeEngineStart()
+	{
+		return true;
+	}
+
+	//! Gets called everytime the engine starts.
+	void OnEngineStart()
+	{
+	}
+
+	//! Gets called everytime the engine stops.
+	void OnEngineStop()
+	{
+	}
+};
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/CivilianSedan.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/CivilianSedan.c
new file mode 100644
index 0000000000000000000000000000000000000000..5fde12aa87ff71b9dace8bf7fd9f84193f216fcb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/CivilianSedan.c
@@ -0,0 +1,478 @@
+class CivilianSedan extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void CivilianSedan()
+	{
+		//m_dmgContactCoef		= 0.065;
+		
+		m_EngineStartOK 		= "CivilianSedan_engine_start_SoundSet";
+		m_EngineStartBattery	= "CivilianSedan_engine_failed_start_battery_SoundSet";
+		m_EngineStartPlug		= "CivilianSedan_engine_failed_start_sparkplugs_SoundSet";
+		m_EngineStartFuel		= "CivilianSedan_engine_failed_start_fuel_SoundSet";
+		m_EngineStopFuel		= "offroad_engine_stop_fuel_SoundSet";
+
+		m_CarDoorOpenSound		= "offroad_door_open_SoundSet";
+		m_CarDoorCloseSound		= "offroad_door_close_SoundSet";
+		
+		m_CarHornShortSoundName = "CivilianSedan_Horn_Short_SoundSet";
+		m_CarHornLongSoundName	= "CivilianSedan_Horn_SoundSet";
+		
+		SetEnginePos("0 0.7 1.6");
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+	
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.SEDAN;
+	}
+	
+	override float GetTransportCameraDistance()
+	{
+		return 4.5;
+	}
+
+	override int GetSeatAnimationType(int posIdx)
+	{
+		switch (posIdx)
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		case 2:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 3:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_R;
+		}
+
+		return 0;
+	}
+	
+	// Override for car-specific light type
+	override CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast( ScriptedLightBase.CreateLight(CivilianSedanFrontLight) );
+	}
+	
+	// Override for car-specific light type
+	override CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast( ScriptedLightBase.CreateLight(CivilianSedanRearLight) );
+	}
+	
+	override bool CanReleaseAttachment( EntityAI attachment )
+	{
+		if( !super.CanReleaseAttachment( attachment ) )
+			return false;
+		
+		string attType = attachment.GetType();
+		
+		if ( EngineIsOn() || GetCarDoorsState("CivSedanHood") == CarDoorState.DOORS_CLOSED )
+		{
+			if ( attType == "CarRadiator" || attType == "CarBattery" || attType == "SparkPlug")
+				return false;
+		}
+
+		return true;
+	}
+
+	override protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		return GetCarDoorsState("CivSedanTrunk") != CarDoorState.DOORS_CLOSED;
+	}
+	
+	override bool CanDisplayAttachmentCategory(string category_name)
+	{
+		//super
+		if (!super.CanDisplayAttachmentCategory(category_name))
+			return false;
+		//
+	
+		category_name.ToLower();		
+		if (category_name.Contains("engine"))
+		{
+			if (GetCarDoorsState("CivSedanHood") == CarDoorState.DOORS_CLOSED)
+				return false;
+		}
+				
+		return true;
+	}
+	
+	override bool CanDisplayCargo()
+	{
+		if ( !super.CanDisplayCargo() )
+			return false;
+		
+		if ( GetCarDoorsState("CivSedanTrunk") == CarDoorState.DOORS_CLOSED )
+			return false;
+		
+		return true;
+	}
+	
+	override int GetCarDoorsState( string slotType )
+	{
+		CarDoor carDoor;
+
+		Class.CastTo( carDoor, FindAttachmentBySlotName( slotType ) );
+		if (!carDoor)
+		{
+			return CarDoorState.DOORS_MISSING;
+		}
+	
+		switch (slotType)
+		{
+		case "CivSedanDriverDoors":
+			return TranslateAnimationPhaseToCarDoorState("DoorsDriver");
+			break;
+		
+		case "CivSedanCoDriverDoors":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCoDriver");
+			break;
+
+		case "CivSedanCargo1Doors":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo1");
+			break;
+
+		case "CivSedanCargo2Doors":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo2");
+			break;
+		
+		case "CivSedanTrunk":
+			return TranslateAnimationPhaseToCarDoorState("DoorsTrunk");
+			break;
+		
+		case "CivSedanHood":
+			return TranslateAnimationPhaseToCarDoorState("DoorsHood");
+			break;
+		}
+
+		return CarDoorState.DOORS_MISSING;
+	}
+	
+
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		switch( posIdx )
+		{
+			case 0:
+				if ( GetCarDoorsState("CivSedanDriverDoors") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+			
+			case 1:
+				if ( GetCarDoorsState("CivSedanCoDriverDoors") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 2:
+				if ( GetCarDoorsState("CivSedanCargo1Doors") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 3:
+				if ( GetCarDoorsState("CivSedanCargo2Doors") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+		}
+
+		return false;
+	}
+
+	override string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "doors_driver";
+		break;
+		case 1:
+			return "doors_codriver";
+		break;
+		case 2:
+			return "doors_cargo1";
+		break;
+		case 3:
+			return "doors_cargo2";
+		break;
+		}
+		
+		return super.GetDoorSelectionNameFromSeatPos(posIdx);
+	}
+
+	override string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "CivSedanDriverDoors";
+		break;
+		case 1:
+			return "CivSedanCoDriverDoors";
+		break;
+		case 2:
+			return "CivSedanCargo1Doors";
+		break;
+		case 3:
+			return "CivSedanCargo2Doors";
+		break;
+		}
+		
+		return super.GetDoorInvSlotNameFromSeatPos(posIdx);
+	}
+
+	// 0 full ambient and engine sound
+	// 1 zero ambient and engine sound
+	override float OnSound(CarSoundCtrl ctrl, float oldValue)
+	{
+		switch (ctrl)
+		{
+		case CarSoundCtrl.DOORS:
+			float newValue = 0;
+			if (GetCarDoorsState("CivSedanDriverDoors") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("CivSedanCoDriverDoors") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+		
+			if (GetCarDoorsState("CivSedanCargo1Doors") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("CivSedanCargo2Doors") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+		
+			if (GetHealthLevel("WindowFront") == GameConstants.STATE_RUINED)
+			{
+				newValue -= 0.6;
+			}
+
+			if (GetHealthLevel("WindowBack") == GameConstants.STATE_RUINED)
+			{
+				newValue -= 0.6;
+			}
+		
+			return Math.Clamp(newValue, 0, 1);
+		break;
+		}
+
+		return super.OnSound(ctrl, oldValue);
+	}
+
+	override string GetAnimSourceFromSelection(string selection)
+	{
+		switch (selection)
+		{
+			case "doors_driver":
+				return "DoorsDriver";
+			case "doors_codriver":
+				return "DoorsCoDriver";
+			case "doors_cargo1":
+				return "DoorsCargo1";
+			case "doors_cargo2":
+				return "DoorsCargo2";
+			case "doors_hood":
+				return "DoorsHood";
+			case "doors_trunk":
+				return "DoorsTrunk";
+		}
+
+		return "";
+	}
+
+	override bool IsVitalTruckBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+	
+	override bool CanReachSeatFromSeat(int currentSeat, int nextSeat)
+	{
+		switch (currentSeat)
+		{
+			case 0:
+				return nextSeat == 1;
+	
+			case 1:
+				return nextSeat == 0;
+	
+			case 2:
+				return nextSeat == 3;
+	
+			case 3:
+				return nextSeat == 2;
+		}
+		
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat( string pDoorsSelection, int pCurrentSeat )
+	{
+		switch (pCurrentSeat)
+		{
+			case 0:
+				return pDoorsSelection == "DoorsDriver";
+	
+			case 1:
+	 			return pDoorsSelection == "DoorsCoDriver";
+	
+			case 2:
+				return pDoorsSelection == "DoorsCargo1";
+	
+			case 3:
+				return pDoorsSelection == "DoorsCargo2";
+		}
+		
+		return false;		
+	}
+
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+
+		GetInventory().CreateInInventory("CivSedanDoors_Driver");
+		GetInventory().CreateInInventory("CivSedanDoors_CoDriver");
+		GetInventory().CreateInInventory("CivSedanDoors_BackLeft");
+		GetInventory().CreateInInventory("CivSedanDoors_BackRight");
+		GetInventory().CreateInInventory("CivSedanHood");
+		GetInventory().CreateInInventory("CivSedanTrunk");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+	}
+	
+	override float GetPushForceCoefficientMultiplier()
+	{
+		return 1.5;
+	}
+}
+
+class CivilianSedan_Wine extends CivilianSedan
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+
+		GetInventory().CreateInInventory("CivSedanDoors_Driver_Wine");
+		GetInventory().CreateInInventory("CivSedanDoors_CoDriver_Wine");
+		GetInventory().CreateInInventory("CivSedanDoors_BackLeft_Wine");
+		GetInventory().CreateInInventory("CivSedanDoors_BackRight_Wine");
+		GetInventory().CreateInInventory("CivSedanHood_Wine");
+		GetInventory().CreateInInventory("CivSedanTrunk_Wine");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+	}
+}
+
+class CivilianSedan_Black extends CivilianSedan
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+
+		GetInventory().CreateInInventory("CivSedanDoors_Driver_Black");
+		GetInventory().CreateInInventory("CivSedanDoors_CoDriver_Black");
+		GetInventory().CreateInInventory("CivSedanDoors_BackLeft_Black");
+		GetInventory().CreateInInventory("CivSedanDoors_BackRight_Black");
+		GetInventory().CreateInInventory("CivSedanHood_Black");
+		GetInventory().CreateInInventory("CivSedanTrunk_Black");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("CivSedanWheel");
+		GetInventory().CreateInInventory("CivSedanWheel");
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Hatchback_02.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Hatchback_02.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7e8aea6c707187c84cf16038528a90c29f1092b
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Hatchback_02.c
@@ -0,0 +1,452 @@
+class Hatchback_02 extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void Hatchback_02()
+	{
+		//m_dmgContactCoef		= 0.070;
+
+		m_EngineStartOK			= "Hatchback_02_engine_start_SoundSet";
+		m_EngineStartBattery	= "Hatchback_02_engine_failed_start_battery_SoundSet";
+		m_EngineStartPlug		= "Hatchback_02_engine_failed_start_sparkplugs_SoundSet";
+		m_EngineStartFuel		= "Hatchback_02_engine_failed_start_fuel_SoundSet";
+		m_EngineStopFuel		= "offroad_engine_stop_fuel_SoundSet";
+		
+		m_CarDoorOpenSound		= "offroad_door_open_SoundSet";
+		m_CarDoorCloseSound		= "offroad_door_close_SoundSet";
+		
+		m_CarHornShortSoundName = "Hatchback_02_Horn_Short_SoundSet";
+		m_CarHornLongSoundName	= "Hatchback_02_Horn_SoundSet";
+		
+		SetEnginePos("0 0.7 1.4");
+	}
+
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.GOLF;
+	}
+
+	override int GetSeatAnimationType(int posIdx)
+	{
+		switch (posIdx)
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		case 2:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 3:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_R;
+		}
+
+		return 0;
+	}
+	
+	// Override for car-specific light type
+	override CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast(ScriptedLightBase.CreateLight(Hatchback_02RearLight));
+	}
+	
+	// Override for car-specific light type
+	override CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast(ScriptedLightBase.CreateLight(Hatchback_02FrontLight));
+	}
+
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+		
+		if (EngineIsOn() || GetCarDoorsState("Hatchback_02_Hood") == CarDoorState.DOORS_CLOSED)
+		{
+			string attType = attachment.GetType();
+			if (attType == "CarRadiator" || attType == "CarBattery" || attType == "SparkPlug")
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+	
+	override protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		return GetCarDoorsState("Hatchback_02_Trunk") != CarDoorState.DOORS_CLOSED;
+	}
+
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		//super
+		if ( !super.CanDisplayAttachmentCategory( category_name ) )
+		return false;
+		//
+	
+		category_name.ToLower();		
+		if ( category_name.Contains("engine") )
+		{
+			if ( GetCarDoorsState("Hatchback_02_Hood") == CarDoorState.DOORS_CLOSED )
+				return false;
+		}
+				
+		return true;
+	}
+
+	override bool CanDisplayCargo()
+	{
+		if ( !super.CanDisplayCargo() )
+			return false;
+		
+		if ( GetCarDoorsState("Hatchback_02_Trunk") == CarDoorState.DOORS_CLOSED )
+			return false;
+		
+		return true;
+	}
+
+	override int GetCarDoorsState(string slotType)
+	{
+		CarDoor carDoor;
+
+		Class.CastTo(carDoor, FindAttachmentBySlotName(slotType));
+		if (!carDoor)
+		{
+			return CarDoorState.DOORS_MISSING;
+		}
+	
+		switch (slotType)
+		{
+		case "Hatchback_02_Door_1_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsDriver");
+			
+		case "Hatchback_02_Door_2_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCoDriver");
+		
+		case "Hatchback_02_Door_1_2":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo1");
+		
+		case "Hatchback_02_Door_2_2":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo2");
+		
+		case "Hatchback_02_Hood":
+			return TranslateAnimationPhaseToCarDoorState("DoorsHood");
+			
+		case "Hatchback_02_Trunk":
+			return TranslateAnimationPhaseToCarDoorState("DoorsTrunk");
+		}
+
+		return CarDoorState.DOORS_MISSING;
+	}
+	
+
+	override bool CrewCanGetThrough(int posIdx)
+	{
+		switch (posIdx)
+		{
+		case 0:
+			if (GetCarDoorsState("Hatchback_02_Door_1_1") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+
+			return true;
+		
+		case 1:
+			if (GetCarDoorsState("Hatchback_02_Door_2_1") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+
+			return true;
+
+		case 2:
+			if (GetCarDoorsState("Hatchback_02_Door_1_2") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+
+			return true;
+
+		case 3:
+			if (GetCarDoorsState("Hatchback_02_Door_2_2") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+
+			return true;
+		}
+
+		return false;
+	}
+
+	override string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "doors_driver";
+		break;
+		case 1:
+			return "doors_codriver";
+		break;
+		case 2:
+			return "doors_cargo1";
+		break;
+		case 3:
+			return "doors_cargo2";
+		break;
+		}
+		
+		return super.GetDoorSelectionNameFromSeatPos(posIdx);
+	}
+
+	override string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "Hatchback_02_Door_1_1";
+		break;
+		case 1:
+			return "Hatchback_02_Door_2_1";
+		break;
+		case 2:
+			return "Hatchback_02_Door_1_2";
+		break;
+		case 3:
+			return "Hatchback_02_Door_2_2";
+		break;
+		}
+		
+		return super.GetDoorInvSlotNameFromSeatPos(posIdx);
+	}
+	
+	override float OnSound(CarSoundCtrl ctrl, float oldValue)
+	{
+		switch (ctrl)
+		{
+		case CarSoundCtrl.DOORS:
+			float newValue = 0;
+			if (GetCarDoorsState("Hatchback_02_Door_1_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("Hatchback_02_Door_2_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+		
+			if (GetCarDoorsState("Hatchback_02_Door_1_2") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("Hatchback_02_Door_2_2") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+		
+			return Math.Clamp(newValue, 0, 1);
+		break;
+		}
+
+		return super.OnSound(ctrl, oldValue);
+	}
+	
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch( selection )
+		{
+		case "doors_driver":
+			return "DoorsDriver";
+		case "doors_codriver":
+			return "DoorsCoDriver";
+		case "doors_cargo1":
+			return "DoorsCargo1";
+		case "doors_cargo2":
+			return "DoorsCargo2";
+		case "doors_hood":
+			return "DoorsHood";
+		case "doors_trunk":
+			return "DoorsTrunk";
+		}
+
+		return "";
+	}
+
+
+	override bool IsVitalTruckBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+	
+	override bool CanReachSeatFromSeat(int currentSeat, int nextSeat)
+	{
+		switch (currentSeat)
+		{
+			case 0:
+				return nextSeat == 1;
+			case 1:
+				return nextSeat == 0;
+			case 2:
+				return nextSeat == 3;
+			case 3:
+				return nextSeat == 2;
+		}
+		
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat(string pDoorsSelection, int pCurrentSeat)
+	{
+		switch (pCurrentSeat)
+		{
+			case 0:
+				return pDoorsSelection == "DoorsDriver";
+			case 1:
+				return pDoorsSelection == "DoorsCoDriver";
+			case 2:
+				return pDoorsSelection == "DoorsCargo1";
+			case 3:
+				return pDoorsSelection == "DoorsCargo2";
+		}
+		
+		return false;
+	}
+
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+		
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+
+		GetInventory().CreateInInventory("Hatchback_02_Door_1_1");
+		GetInventory().CreateInInventory("Hatchback_02_Door_1_2");
+		GetInventory().CreateInInventory("Hatchback_02_Door_2_1");
+		GetInventory().CreateInInventory("Hatchback_02_Door_2_2");
+		GetInventory().CreateInInventory("Hatchback_02_Hood");
+		GetInventory().CreateInInventory("Hatchback_02_Trunk");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+	}
+}
+
+class Hatchback_02_Black extends Hatchback_02
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+
+		GetInventory().CreateInInventory("Hatchback_02_Door_1_1_Black");
+		GetInventory().CreateInInventory("Hatchback_02_Door_1_2_Black");
+		GetInventory().CreateInInventory("Hatchback_02_Door_2_1_Black");
+		GetInventory().CreateInInventory("Hatchback_02_Door_2_2_Black");
+		GetInventory().CreateInInventory("Hatchback_02_Hood_Black");
+		GetInventory().CreateInInventory("Hatchback_02_Trunk_Black");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+	}
+};
+
+class Hatchback_02_Blue extends Hatchback_02
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+
+		GetInventory().CreateInInventory("Hatchback_02_Door_1_1_Blue");
+		GetInventory().CreateInInventory("Hatchback_02_Door_1_2_Blue");
+		GetInventory().CreateInInventory("Hatchback_02_Door_2_1_Blue");
+		GetInventory().CreateInInventory("Hatchback_02_Door_2_2_Blue");
+		GetInventory().CreateInInventory("Hatchback_02_Hood_Blue");
+		GetInventory().CreateInInventory("Hatchback_02_Trunk_Blue");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+		GetInventory().CreateInInventory("Hatchback_02_Wheel");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/OffroadHatchback.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/OffroadHatchback.c
new file mode 100644
index 0000000000000000000000000000000000000000..6877baa196d57252a5d328bc977a223b3ac8462c
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/OffroadHatchback.c
@@ -0,0 +1,516 @@
+class OffroadHatchback extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void OffroadHatchback()
+	{
+		//m_dmgContactCoef 		= 0.075;
+	
+		m_EngineStartOK 		= "offroad_engine_start_SoundSet";
+		m_EngineStartBattery 	= "offroad_engine_failed_start_battery_SoundSet";
+		m_EngineStartPlug 		= "offroad_engine_failed_start_sparkplugs_SoundSet";
+		m_EngineStartFuel 		= "offroad_engine_failed_start_fuel_SoundSet";
+		m_EngineStopFuel 		= "offroad_engine_stop_fuel_SoundSet";
+		
+		m_CarDoorOpenSound 		= "offroad_door_open_SoundSet";
+		m_CarDoorCloseSound 	= "offroad_door_close_SoundSet";
+		m_CarSeatShiftInSound 	= "Offroad_SeatShiftIn_SoundSet";
+		m_CarSeatShiftOutSound 	= "Offroad_SeatShiftOut_SoundSet";
+		
+		m_CarHornShortSoundName = "Offroad_Horn_Short_SoundSet";
+		m_CarHornLongSoundName	= "Offroad_Horn_SoundSet";
+		
+		SetEnginePos("0 0.7 1.2");
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+	
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.HATCHBACK;
+	}
+	
+	override float GetTransportCameraDistance()
+	{
+		return 3.5;
+	}
+
+	override int GetSeatAnimationType( int posIdx )
+	{
+		switch (posIdx)
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		case 2:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 3:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_R;
+		}
+
+		return 0;
+
+	}
+	
+	
+	override CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast( ScriptedLightBase.CreateLight(OffroadHatchbackRearLight) );
+	}
+	
+	override CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast( ScriptedLightBase.CreateLight(OffroadHatchbackFrontLight) );
+	}
+
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+		
+		if (EngineIsOn() || GetCarDoorsState("NivaHood") == CarDoorState.DOORS_CLOSED)
+		{
+			string attType = attachment.GetType();
+			if (attType == "CarRadiator" || attType == "CarBattery" || attType == "SparkPlug")
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+	
+	override protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		return GetCarDoorsState("NivaHood") != CarDoorState.DOORS_CLOSED;
+	}
+
+	override bool CanDisplayAttachmentCategory( string category_name )
+	{
+		if (!super.CanDisplayAttachmentCategory(category_name))
+		{
+			return false;
+		}
+	
+		category_name.ToLower();		
+		if (category_name.Contains("engine"))
+		{
+			if (GetCarDoorsState("NivaHood") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+		}
+				
+		return true;
+	}
+	
+	override bool CanDisplayCargo()
+	{
+		if (!super.CanDisplayCargo())
+		{
+			return false;
+		}
+		
+		if (GetCarDoorsState("NivaTrunk") == CarDoorState.DOORS_CLOSED)
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+	override int GetCarDoorsState(string slotType)
+	{
+		CarDoor carDoor;
+		
+		Class.CastTo(carDoor, FindAttachmentBySlotName(slotType));
+		if (!carDoor)
+		{
+			return CarDoorState.DOORS_MISSING;
+		}
+
+		switch (slotType)
+		{
+			case "NivaDriverDoors":
+				return TranslateAnimationPhaseToCarDoorState("DoorsDriver");
+				
+			case "NivaCoDriverDoors":
+				return TranslateAnimationPhaseToCarDoorState("DoorsCoDriver");
+				
+			case "NivaHood":
+				return TranslateAnimationPhaseToCarDoorState("DoorsHood");
+				
+			case "NivaTrunk":
+				return TranslateAnimationPhaseToCarDoorState("DoorsTrunk");
+		}
+
+		return CarDoorState.DOORS_MISSING;
+	}
+	
+	override bool CrewCanGetThrough(int posIdx)
+	{
+		CarDoor carDoor;
+		switch (posIdx)
+		{
+			case 0:
+				if (GetCarDoorsState("NivaDriverDoors") == CarDoorState.DOORS_CLOSED)
+					return false;
+				else if (GetAnimationPhase("SeatDriver") > 0.5)
+					return false;
+	
+				return true;
+	
+			case 1:
+				if (GetCarDoorsState("NivaCoDriverDoors") == CarDoorState.DOORS_CLOSED)
+					return false;
+				else if (GetAnimationPhase("SeatCoDriver") > 0.5)
+					return false;
+	
+				return true;
+	
+			case 2:
+				if (GetCarDoorsState("NivaDriverDoors") == CarDoorState.DOORS_CLOSED)
+					return false;
+				else if (GetAnimationPhase("SeatDriver") <= 0.5)
+					return false;
+	
+				return true;
+	
+			case 3:
+				if (GetCarDoorsState("NivaCoDriverDoors") == CarDoorState.DOORS_CLOSED)
+					return false;
+				else if (GetAnimationPhase("SeatCoDriver") <= 0.5)
+					return false;
+	
+				return true;
+		}
+
+		return false;
+	}
+
+	override string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		switch (posIdx)
+		{
+			case 0:
+			case 2:
+				return "doors_driver";
+			case 1:
+			case 3:
+				return "doors_codriver";
+		}
+		
+		return super.GetDoorSelectionNameFromSeatPos(posIdx);
+	}
+
+	override string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		switch (posIdx)
+		{
+			case 0:
+			case 2:
+				return "NivaDriverDoors";
+			case 1:
+			case 3:
+				return "NivaCoDriverDoors";
+		}
+		
+		return super.GetDoorInvSlotNameFromSeatPos(posIdx);
+	}
+	
+	// 0 full ambient and engine sound
+	// 1 zero ambient and engine sound
+	override float OnSound(CarSoundCtrl ctrl, float oldValue)
+	{
+		float tempCap = 0.0;
+
+		switch (ctrl)
+		{
+		case CarSoundCtrl.DOORS:
+			float newValue = 0;
+			if (GetCarDoorsState("NivaDriverDoors") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.5;
+			}
+
+			if (GetCarDoorsState("NivaCoDriverDoors") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.5;
+			}
+
+			if (GetCarDoorsState("NivaTrunk") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.3;
+			}
+		
+			if (GetHealthLevel("WindowFront") == GameConstants.STATE_RUINED)
+			{
+				newValue -= 0.6;
+			}
+
+			if (GetHealthLevel("WindowLR") == GameConstants.STATE_RUINED)
+			{
+				newValue -= 0.2;
+			}
+		
+			if (GetHealthLevel("WindowRR") == GameConstants.STATE_RUINED)
+			{
+				newValue -= 0.2;
+			}
+
+			return Math.Clamp(newValue, 0, 1);
+		break;
+		}
+
+		return super.OnSound(ctrl, oldValue);
+	}
+
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch (selection)
+		{
+		case "doors_driver":
+			return "DoorsDriver";
+		case "doors_codriver":
+			return "DoorsCoDriver";
+		case "doors_hood":
+			return "DoorsHood";
+		case "doors_trunk":
+			return "DoorsTrunk";
+		case "seatback_driver":
+			return "SeatDriver";
+		case "seatback_codriver":
+			return "SeatCoDriver";
+		}
+
+		return "";
+	}
+	
+	override string GetDoorConditionPointFromSelection(string selection)
+	{
+		switch (selection)
+		{
+			case "seat_driver":
+			case "seatback_driver":
+			case "seat_cargo1":
+				return "seat_con_1_1";
+			case "seat_codriver":
+			case "seatback_codriver":
+			case "seat_cargo2":
+				return "seat_con_2_1";
+		}
+		
+		return "";
+	}
+
+	override int GetCrewIndex(string selection)
+	{
+		switch (selection)
+		{
+			case "seatback_driver":
+				return 0;
+			case "seatback_codriver":
+				return 1;
+		}
+
+		return -1;
+	}
+
+	override bool IsVitalTruckBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+	
+	override bool CanReachSeatFromSeat(int currentSeat, int nextSeat)
+	{
+		if (nextSeat == 0 && GetAnimationPhase("SeatDriver") > 0.5)
+			return false;
+		
+		if (nextSeat == 1 && GetAnimationPhase("SeatCoDriver") > 0.5)
+			return false;
+		
+		switch (currentSeat)
+		{
+			case 0:
+				return nextSeat == 1;
+	
+			case 1:
+				return nextSeat == 0;
+	
+			case 2:
+				return nextSeat == 3;
+	
+			case 3:
+				return nextSeat == 2;
+		}
+		
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat( string pDoorsSelection, int pCurrentSeat )
+	{
+		switch (pCurrentSeat)
+		{
+			case 0:
+				return pDoorsSelection == "DoorsDriver";
+	
+			case 1:
+				return pDoorsSelection == "DoorsCoDriver";
+	
+			case 2:
+				return pDoorsSelection == "DoorsDriver";
+	
+			case 3:
+				return pDoorsSelection == "DoorsCoDriver";
+		}
+		
+		return false;		
+	}
+	
+	override int GetSeatIndexFromDoor( string pDoorSelection )
+	{
+		switch (pDoorSelection)
+		{
+			case "DoorsDriver":
+				return 0;
+			case "DoorsCoDriver":
+				return 1;
+		}
+
+		return -1;
+	}
+	
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionAnimateSeats);
+	}
+	
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel" );
+		GetInventory().CreateInInventory("HatchbackWheel");
+
+		GetInventory().CreateInInventory("HatchbackDoors_Driver");
+		GetInventory().CreateInInventory("HatchbackDoors_CoDriver");
+		GetInventory().CreateInInventory("HatchbackHood");
+		GetInventory().CreateInInventory("HatchbackTrunk");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+	}
+}
+
+class OffroadHatchback_White extends OffroadHatchback
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+
+		GetInventory().CreateInInventory("HatchbackDoors_Driver_White");
+		GetInventory().CreateInInventory("HatchbackDoors_CoDriver_White");
+		GetInventory().CreateInInventory("HatchbackHood_White");
+		GetInventory().CreateInInventory("HatchbackTrunk_White");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+	}
+}
+
+class OffroadHatchback_Blue extends OffroadHatchback
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+	
+		GetInventory().CreateInInventory("HatchbackDoors_Driver_Blue");
+		GetInventory().CreateInInventory("HatchbackDoors_CoDriver_Blue");
+		GetInventory().CreateInInventory("HatchbackHood_Blue");
+		GetInventory().CreateInInventory("HatchbackTrunk_Blue");
+	
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("HatchbackWheel");
+		GetInventory().CreateInInventory("HatchbackWheel");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Offroad_02.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Offroad_02.c
new file mode 100644
index 0000000000000000000000000000000000000000..d0f5b05d879c4d7f2ab7164eeab7971f9c694425
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Offroad_02.c
@@ -0,0 +1,412 @@
+class Offroad_02 extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void Offroad_02()
+	{
+		//m_dmgContactCoef		= 0.0365;
+
+		m_EngineStartOK			= "Offroad_02_engine_start_SoundSet";
+		m_EngineStartBattery	= "Offroad_02_engine_failed_start_battery_SoundSet";
+		m_EngineStartPlug		= "Offroad_02_engine_failed_start_sparkplugs_SoundSet";
+		m_EngineStartFuel		= "Offroad_02_engine_failed_start_fuel_SoundSet";
+		m_EngineStopFuel		= "offroad_engine_stop_fuel_SoundSet";
+
+		m_CarDoorOpenSound		= "offroad_02_door_open_SoundSet";
+		m_CarDoorCloseSound		= "offroad_02_door_close_SoundSet";
+		
+		m_CarHornShortSoundName = "Offroad_02_Horn_Short_SoundSet";
+		m_CarHornLongSoundName	= "Offroad_02_Horn_SoundSet";
+		
+		SetEnginePos("0 0.7 1.7");
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.HMMWV;
+	}
+	
+	override float GetTransportCameraDistance()
+	{
+		return 5.1;
+	}
+
+	override int GetSeatAnimationType(int posIdx)
+	{
+		switch (posIdx)
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		case 2:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 3:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_R;
+		}
+
+		return 0;
+	}
+
+	// Override for car-specific light type
+	override CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast(ScriptedLightBase.CreateLight(Offroad_02FrontLight));
+	}
+	
+	// Override for car-specific light type
+	override CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast(ScriptedLightBase.CreateLight(Offroad_02RearLight));
+	}
+	
+	override bool CanReleaseAttachment( EntityAI attachment )
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+
+		string attType = attachment.GetType();
+		switch (attType)
+		{
+		case "CarBattery": 
+			if (GetCarDoorsState("Offroad_02_Hood") == CarDoorState.DOORS_CLOSED || EngineIsOn())
+			{
+				return false;
+			}
+			break;
+
+		case "GlowPlug":
+			if (GetCarDoorsState("Offroad_02_Hood") == CarDoorState.DOORS_CLOSED || EngineIsOn())
+			{
+				return false;
+			}
+			break;
+		}
+
+		return true;
+	}
+
+	override protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		return GetCarDoorsState("Offroad_02_Trunk") != CarDoorState.DOORS_CLOSED;
+	}
+
+	override bool CanDisplayAttachmentCategory(string category_name)
+	{
+		if ( !super.CanDisplayAttachmentCategory(category_name))
+		{
+			return false;
+		}
+	
+		category_name.ToLower();
+		if (category_name.Contains("engine"))
+		{
+			if (GetCarDoorsState("Offroad_02_Hood") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+	
+	override bool CanDisplayCargo()
+	{
+		if ( !super.CanDisplayCargo() )
+			return false;
+		
+		if ( GetCarDoorsState("Offroad_02_Trunk") == CarDoorState.DOORS_CLOSED )
+			return false;
+		
+		return true;
+	}
+
+	override int GetCarDoorsState(string slotType)
+	{
+		CarDoor carDoor;
+
+		Class.CastTo( carDoor, FindAttachmentBySlotName( slotType ) );
+		if (!carDoor)
+		{
+			return CarDoorState.DOORS_MISSING;
+		}
+	
+		switch (slotType)
+		{
+		case "Offroad_02_Door_1_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsDriver");
+			
+		case "Offroad_02_Door_2_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCoDriver");
+		
+		case "Offroad_02_Door_1_2":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo1");
+		
+		case "Offroad_02_Door_2_2":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo2");
+		
+		case "Offroad_02_Hood":
+			return TranslateAnimationPhaseToCarDoorState("DoorsHood");
+
+		case "Offroad_02_Trunk":
+			return TranslateAnimationPhaseToCarDoorState("DoorsTrunk");
+		}
+
+		return CarDoorState.DOORS_MISSING;
+	}
+	
+
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		switch( posIdx )
+		{
+			case 0:
+				if ( GetCarDoorsState("Offroad_02_Door_1_1") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+			
+			case 1:
+				if ( GetCarDoorsState("Offroad_02_Door_2_1") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 2:
+				if ( GetCarDoorsState("Offroad_02_Door_1_2") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 3:
+				if ( GetCarDoorsState("Offroad_02_Door_2_2") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+		}
+
+		return false;
+	}
+
+	override string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "doors_driver";
+		break;
+		case 1:
+			return "doors_codriver";
+		break;
+		case 2:
+			return "doors_cargo1";
+		break;
+		case 3:
+			return "doors_cargo2";
+		break;
+		}
+		
+		return super.GetDoorSelectionNameFromSeatPos(posIdx);
+	}
+
+	override string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		switch (posIdx)
+		{
+			case 0:
+				return "Offroad_02_Door_1_1";
+			case 1:
+				return "Offroad_02_Door_2_1";
+			case 2:
+				return "Offroad_02_Door_1_2";
+			case 3:
+				return "Offroad_02_Door_2_2";
+		}
+		
+		return super.GetDoorInvSlotNameFromSeatPos(posIdx);
+	}
+	
+	override float OnSound(CarSoundCtrl ctrl, float oldValue)
+	{
+		switch ( ctrl )
+		{
+		case CarSoundCtrl.DOORS:
+			float newValue = 0;
+			if (GetCarDoorsState("Offroad_02_Door_1_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("Offroad_02_Door_2_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+		
+			if (GetCarDoorsState("Offroad_02_Door_1_2") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("Offroad_02_Door_2_2") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+			
+			return Math.Clamp(newValue, 0, 1);
+		break;
+		}
+
+		return super.OnSound(ctrl, oldValue);
+	}
+	
+	override string GetAnimSourceFromSelection(string selection)
+	{
+		switch (selection)
+		{
+			case "doors_driver":
+				return "DoorsDriver";
+			case "doors_codriver":
+				return "DoorsCoDriver";
+			case "doors_cargo1":
+				return "DoorsCargo1";
+			case "doors_cargo2":
+				return "DoorsCargo2";
+			case "doors_hood":
+				return "DoorsHood";
+			case "doors_trunk":
+				return "DoorsTrunk";
+		}
+
+		return "";
+	}
+
+	override bool CanReachSeatFromSeat(int currentSeat, int nextSeat)
+	{
+		switch (currentSeat)
+		{
+			case 0:
+				return nextSeat == 1;
+			case 1:
+				return nextSeat == 0;
+			case 2:
+				return nextSeat == 3;
+			case 3:
+				return nextSeat == 2;
+		}
+		
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat(string pDoorsSelection, int pCurrentSeat)
+	{
+		switch (pCurrentSeat)
+		{
+			case 0:
+				return pDoorsSelection == "DoorsDriver";
+			case 1:
+				return pDoorsSelection == "DoorsCoDriver";
+			case 2:
+				return pDoorsSelection == "DoorsCargo1";
+			case 3:
+				return pDoorsSelection == "DoorsCargo2";
+		}
+		
+		return false;		
+	}
+	
+	override bool IsVitalTruckBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalSparkPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalRadiator()
+	{
+		return false;
+	}
+
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Offroad_02_Wheel");
+		GetInventory().CreateInInventory("Offroad_02_Wheel");
+		GetInventory().CreateInInventory("Offroad_02_Wheel");
+		GetInventory().CreateInInventory("Offroad_02_Wheel");
+
+		GetInventory().CreateInInventory("Offroad_02_Door_1_1");
+		GetInventory().CreateInInventory("Offroad_02_Door_1_2");
+		GetInventory().CreateInInventory("Offroad_02_Door_2_1");
+		GetInventory().CreateInInventory("Offroad_02_Door_2_2");
+		GetInventory().CreateInInventory("Offroad_02_Hood");
+		GetInventory().CreateInInventory("Offroad_02_Trunk");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Offroad_02_Wheel");
+		GetInventory().CreateInInventory("Offroad_02_Wheel");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Sedan_02.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Sedan_02.c
new file mode 100644
index 0000000000000000000000000000000000000000..c3f5f7a2a78dc043a83d9f1e96a8f57572187558
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Sedan_02.c
@@ -0,0 +1,481 @@
+class Sedan_02 extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void Sedan_02()
+	{
+		m_dmgContactCoef		= 0.0790;
+
+		m_EngineStartOK			= "Sedan_02_engine_start_SoundSet";
+		m_EngineStartBattery	= "Sedan_02_engine_failed_start_battery_SoundSet";
+		m_EngineStartPlug		= "Sedan_02_engine_failed_start_sparkplugs_SoundSet";
+		m_EngineStartFuel		= "Sedan_02_engine_failed_start_fuel_SoundSet";
+		m_EngineStopFuel		= "offroad_engine_stop_fuel_SoundSet";
+
+		m_CarDoorOpenSound		= "offroad_door_open_SoundSet";
+		m_CarDoorCloseSound		= "offroad_door_close_SoundSet";
+		
+		m_CarHornShortSoundName = "Sedan_02_Horn_Short_SoundSet";
+		m_CarHornLongSoundName	= "Sedan_02_Horn_SoundSet";
+		
+		SetEnginePos("0 0.7 -1.7");
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.S120;
+	}
+
+	override int GetSeatAnimationType(int posIdx)
+	{
+		switch (posIdx)
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		case 2:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 3:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_R;
+		}
+
+		return 0;
+	}
+
+	// Override for car-specific light type
+	override CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast(ScriptedLightBase.CreateLight(Sedan_02FrontLight));
+	}
+	
+	// Override for car-specific light type
+	override CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast(ScriptedLightBase.CreateLight(Sedan_02RearLight));
+	}
+	
+	override bool CanReleaseAttachment( EntityAI attachment )
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+		
+		string attType = attachment.GetType();
+		switch (attType)
+		{
+		case "CarBattery": 
+			if (GetCarDoorsState("Sedan_02_Trunk") == CarDoorState.DOORS_CLOSED || EngineIsOn())
+			{
+				return false;
+			}
+			break;
+		
+		case "SparkPlug":
+			if (GetCarDoorsState("Sedan_02_Trunk") == CarDoorState.DOORS_CLOSED || EngineIsOn())
+			{
+				return false;
+			}
+			break;
+
+		case "CarRadiator":
+			if (GetCarDoorsState("Sedan_02_Hood") == CarDoorState.DOORS_CLOSED || EngineIsOn())
+			{
+				return false;
+			}
+			break;
+		}
+
+		return true;
+	}
+
+	override protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		return GetCarDoorsState("Sedan_02_Hood") != CarDoorState.DOORS_CLOSED;
+	}
+
+	override bool CanDisplayAttachmentCategory(string category_name)
+	{
+		if ( !super.CanDisplayAttachmentCategory(category_name))
+		{
+			return false;
+		}
+	
+		category_name.ToLower();
+		if (category_name.Contains("engine"))
+		{
+			if (GetCarDoorsState("Sedan_02_Trunk") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+		}
+		
+		if (category_name.Contains("trunk"))
+		{
+			if (GetCarDoorsState("Sedan_02_Hood") == CarDoorState.DOORS_CLOSED)
+			{
+				return false;
+			}
+		}
+
+		return true;
+	}
+	
+	override bool CanDisplayCargo()
+	{
+		if ( !super.CanDisplayCargo() )
+			return false;
+		
+		if ( GetCarDoorsState("Sedan_02_Hood") == CarDoorState.DOORS_CLOSED )
+			return false;
+		
+		return true;
+	}
+
+	override int GetCarDoorsState(string slotType)
+	{
+		CarDoor carDoor;
+
+		Class.CastTo( carDoor, FindAttachmentBySlotName( slotType ) );
+		if (!carDoor)
+		{
+			return CarDoorState.DOORS_MISSING;
+		}
+	
+		switch (slotType)
+		{
+		case "Sedan_02_Door_1_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsDriver");
+			
+		case "Sedan_02_Door_2_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCoDriver");
+		
+		case "Sedan_02_Door_1_2":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo1");
+		
+		case "Sedan_02_Door_2_2":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCargo2");
+		
+		case "Sedan_02_Hood":
+			return TranslateAnimationPhaseToCarDoorState("DoorsHood");
+
+		case "Sedan_02_Trunk":
+			return TranslateAnimationPhaseToCarDoorState("DoorsTrunk");
+		}
+
+		return CarDoorState.DOORS_MISSING;
+	}
+	
+
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		switch( posIdx )
+		{
+			case 0:
+				if ( GetCarDoorsState("Sedan_02_Door_1_1") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+			
+			case 1:
+				if ( GetCarDoorsState("Sedan_02_Door_2_1") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 2:
+				if ( GetCarDoorsState("Sedan_02_Door_1_2") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 3:
+				if ( GetCarDoorsState("Sedan_02_Door_2_2") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+		}
+
+		return false;
+	}
+
+	override string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "doors_driver";
+		break;
+		case 1:
+			return "doors_codriver";
+		break;
+		case 2:
+			return "doors_cargo1";
+		break;
+		case 3:
+			return "doors_cargo2";
+		break;
+		}
+		
+		return super.GetDoorSelectionNameFromSeatPos(posIdx);
+	}
+
+	override string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return "Sedan_02_Door_1_1";
+		break;
+		case 1:
+			return "Sedan_02_Door_2_1";
+		break;
+		case 2:
+			return "Sedan_02_Door_1_2";
+		break;
+		case 3:
+			return "Sedan_02_Door_2_2";
+		break;
+		}
+		
+		return super.GetDoorInvSlotNameFromSeatPos(posIdx);
+	}
+	
+	override float OnSound(CarSoundCtrl ctrl, float oldValue)
+	{
+		switch ( ctrl )
+		{
+		case CarSoundCtrl.DOORS:
+			float newValue = 0;
+			if (GetCarDoorsState("Sedan_02_Door_1_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("Sedan_02_Door_2_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+		
+			if (GetCarDoorsState("Sedan_02_Door_1_2") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+
+			if (GetCarDoorsState("Sedan_02_Door_2_2") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.25;
+			}
+			
+			return Math.Clamp(newValue, 0, 1);
+		break;
+		}
+
+		return super.OnSound(ctrl, oldValue);
+	}
+	
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch( selection )
+		{
+		case "doors_driver":
+			return "DoorsDriver";
+		case "doors_codriver":
+			return "DoorsCoDriver";
+		case "doors_cargo1":
+			return "DoorsCargo1";
+		case "doors_cargo2":
+			return "DoorsCargo2";
+		case "doors_hood":
+			return "DoorsHood";
+		case "doors_trunk":
+			return "DoorsTrunk";
+		}
+
+		return "";
+	}
+
+
+	override bool IsVitalTruckBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+	
+	override bool CanReachSeatFromSeat(int currentSeat, int nextSeat)
+	{
+		switch (currentSeat)
+		{
+			case 0:
+				return nextSeat == 1;
+	
+			case 1:
+				return nextSeat == 0;
+	
+			case 2:
+				return nextSeat == 3;
+	
+			case 3:
+				return nextSeat == 2;
+		}
+		
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat(string pDoorsSelection, int pCurrentSeat)
+	{
+		switch (pCurrentSeat)
+		{
+			case 0:
+				return pDoorsSelection == "DoorsDriver";
+	
+			case 1:
+				return pDoorsSelection == "DoorsCoDriver";
+	
+			case 2:
+				return pDoorsSelection == "DoorsCargo1";
+				
+			case 3:
+				return pDoorsSelection == "DoorsCargo2";
+		}
+		
+		return false;		
+	}
+
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+
+		GetInventory().CreateInInventory("Sedan_02_Door_1_1");
+		GetInventory().CreateInInventory("Sedan_02_Door_1_2");
+		GetInventory().CreateInInventory("Sedan_02_Door_2_1");
+		GetInventory().CreateInInventory("Sedan_02_Door_2_2");
+		GetInventory().CreateInInventory("Sedan_02_Hood");
+		GetInventory().CreateInInventory("Sedan_02_Trunk");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+	}
+}
+
+class Sedan_02_Red extends Sedan_02
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+
+		GetInventory().CreateInInventory("Sedan_02_Door_1_1_Red");
+		GetInventory().CreateInInventory("Sedan_02_Door_1_2_Red");
+		GetInventory().CreateInInventory("Sedan_02_Door_2_1_Red");
+		GetInventory().CreateInInventory("Sedan_02_Door_2_2_Red");
+		GetInventory().CreateInInventory("Sedan_02_Hood_Red");
+		GetInventory().CreateInInventory("Sedan_02_Trunk_Red");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+	}
+}
+
+class Sedan_02_Grey extends Sedan_02
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+
+		GetInventory().CreateInInventory("Sedan_02_Door_1_1_Grey");
+		GetInventory().CreateInInventory("Sedan_02_Door_1_2_Grey");
+		GetInventory().CreateInInventory("Sedan_02_Door_2_1_Grey");
+		GetInventory().CreateInInventory("Sedan_02_Door_2_2_Grey");
+		GetInventory().CreateInInventory("Sedan_02_Hood_Grey");
+		GetInventory().CreateInInventory("Sedan_02_Trunk_Grey");
+
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+		GetInventory().CreateInInventory("Sedan_02_Wheel");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Base.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Base.c
new file mode 100644
index 0000000000000000000000000000000000000000..8f37a4773e0ae5ce92c00867833831339dd5e94f
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Base.c
@@ -0,0 +1,397 @@
+class Truck_01_Base extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void Truck_01_Base()
+	{
+		//m_dmgContactCoef 		= 0.018;
+		m_enginePtcPos 			= "0 1.346 2.205";
+		
+		m_EngineStartOK 		= "Truck_01_engine_start_SoundSet";
+		m_EngineStartBattery	= "Truck_01_engine_failed_start_battery_SoundSet";
+		m_EngineStartPlug 		= "Truck_01_engine_failed_start_sparkplugs_SoundSet";
+		m_EngineStartFuel 		= "Truck_01_engine_failed_start_fuel_SoundSet";
+		m_EngineStopFuel 		= "Truck_01_engine_stop_fuel_SoundSet";
+
+		m_CarDoorOpenSound 		= "Truck_01_door_open_SoundSet";
+		m_CarDoorCloseSound 	= "Truck_01_door_close_SoundSet";
+		
+		m_CarHornShortSoundName = "Truck_01_Horn_Short_SoundSet";
+		m_CarHornLongSoundName	= "Truck_01_Horn_SoundSet";
+		
+		SetEnginePos("0 1.4 2.25");
+	}
+
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+
+	override float GetTransportCameraDistance()
+	{
+		return 6.5;
+	}
+	
+	override vector GetTransportCameraOffset()
+	{
+		return "0 3.2 0";
+	}
+	
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.V3S;
+	}
+
+	override int GetSeatAnimationType(int posIdx)
+	{
+		switch (posIdx)
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		}
+
+		return 0;
+	}
+
+	// Override for car-specific light type
+	override CarLightBase CreateFrontLight()
+	{
+		return CarLightBase.Cast(ScriptedLightBase.CreateLight(Truck_01FrontLight));
+	}
+	
+	// Override for car-specific light type
+	override CarRearLightBase CreateRearLight()
+	{
+		return CarRearLightBase.Cast(ScriptedLightBase.CreateLight(Truck_01RearLight));
+	}
+	
+	override bool CanReleaseAttachment(EntityAI attachment)
+	{
+		if (!super.CanReleaseAttachment(attachment))
+		{
+			return false;
+		}
+		
+		if (EngineIsOn() && attachment.GetType() == "TruckBattery")
+		{
+			return false;
+		}
+
+		return true;
+	}
+	
+	override protected bool CanManipulateSpareWheel(string slotSelectionName)
+	{
+		if (slotSelectionName == "wheel_spare_1")
+		{
+			return GetAnimationPhase("wheelSidePlate1") == 1.0);
+		}
+		
+		if (slotSelectionName == "wheel_spare_2")
+		{
+			return GetAnimationPhase("wheelSidePlate2") == 1.0);
+		}
+		
+		return super.CanManipulateSpareWheel(slotSelectionName);
+	}
+
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		CarDoor carDoor;
+		switch( posIdx )
+		{
+			case 0:
+				if ( GetCarDoorsState("Truck_01_Door_1_1") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			
+			case 1:
+				if ( GetCarDoorsState("Truck_01_Door_2_1") == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+		}
+
+		return false;
+	}
+
+	override string GetDoorSelectionNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+			case 0:
+				return "doors_driver";
+			break;
+			case 1:
+				return "doors_codriver";
+			break;
+		}
+
+		return super.GetDoorSelectionNameFromSeatPos(posIdx);
+	}
+
+	override string GetDoorInvSlotNameFromSeatPos(int posIdx)
+	{
+		switch( posIdx )
+		{
+			case 0:
+				return "Truck_01_Door_1_1";
+			break;
+			case 1:
+				return "Truck_01_Door_2_1";
+			break;
+		}
+
+		return super.GetDoorInvSlotNameFromSeatPos(posIdx);
+	}
+
+	override float OnSound(CarSoundCtrl ctrl, float oldValue)
+	{
+		switch (ctrl)
+		{
+		case CarSoundCtrl.DOORS:
+			float newValue = 0;
+
+			//-----
+			if (GetCarDoorsState("Truck_01_Door_1_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.4;
+			}
+
+			if (GetCarDoorsState("Truck_01_Door_2_1") == CarDoorState.DOORS_CLOSED)
+			{
+				newValue += 0.4;
+			}
+
+			return Math.Clamp(newValue, 0, 1);
+		break;
+		}
+
+		return super.OnSound(ctrl, oldValue);
+	}
+	
+	override void OnAnimationPhaseStarted(string animSource, float phase)
+	{
+		super.OnAnimationPhaseStarted(animSource, phase);
+
+		#ifndef SERVER
+		switch (animSource)
+		{
+		case "wheelsideplate1":
+		case "wheelsideplate2":
+			EffectSound sound;
+			if (phase == 0)
+			{
+				sound = SEffectManager.PlaySound("Truck_01_Gear_Open_Side_Plate_SoundSet", GetPosition(), 0.1, 0.1);
+			}
+			else
+			{
+				sound = SEffectManager.PlaySound("Truck_01_Gear_Close_Side_Plate_SoundSet", GetPosition(), 0.1, 0.1);
+			}
+			
+			if (sound)
+			{
+				sound.SetAutodestroy(true);
+			}
+		break;
+		}
+		#endif
+	}
+	
+	override int GetCarDoorsState( string slotType )
+	{
+		CarDoor carDoor;
+		Class.CastTo(carDoor, FindAttachmentBySlotName(slotType));
+		if (!carDoor)
+		{
+			return CarDoorState.DOORS_MISSING;
+		}
+		
+		switch (slotType)
+		{
+		case "Truck_01_Door_1_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsDriver");
+		case "Truck_01_Door_2_1":
+			return TranslateAnimationPhaseToCarDoorState("DoorsCoDriver");
+		case "Truck_01_Hood":
+			return TranslateAnimationPhaseToCarDoorState("DoorsHood");
+		}
+		
+		return CarDoorState.DOORS_MISSING;
+	}
+
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch( selection )
+		{
+		case "doors_driver":
+			return "DoorsDriver";
+		case "doors_codriver":
+			return "DoorsCoDriver";
+		case "doors_hood":
+			return "DoorsHood";
+		case "doors_trunk":
+			return "DoorsTrunk";			
+		case "wheelsideplate1":
+			return "WheelSidePlate1";
+		case "wheelsideplate2":
+			return "WheelSidePlate2";
+		}
+
+		return "";
+	}
+	
+	override bool CanReachSeatFromSeat(int currentSeat, int nextSeat)
+	{
+		switch (currentSeat)
+		{
+		case 0:
+			return nextSeat == 1;
+		case 1:
+			return nextSeat == 0;
+		}
+
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat(string pDoorsSelection, int pCurrentSeat)
+	{
+		switch (pCurrentSeat)
+		{
+			case 0:
+				return pDoorsSelection == "DoorsDriver";
+	
+			case 1:
+				return pDoorsSelection == "DoorsCoDriver";
+		}
+		
+		return false;		
+	}
+		
+	override int GetSeatIndexFromDoor( string pDoorSelection )
+	{
+		switch (pDoorSelection)
+		{
+			case "DoorsDriver":
+				return 0;
+
+			case "DoorsCoDriver":
+				return 1;
+		}
+
+		return -1;
+	}
+	
+
+	override bool IsVitalCarBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalSparkPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalEngineBelt()
+	{
+		return false;
+	}
+	
+	override bool IsVitalRadiator()
+	{
+		return false;
+	}
+
+	override void SetActions()
+	{
+		super.SetActions();
+
+		AddAction(ActionSidePlateInteract);
+		AddAction(ActionDetachFromTarget_SpecificSlot_WoodenLogs);
+		AddAction(ActionDetachFromTarget_SpecificSlot_WoodenPlanks);
+		AddAction(ActionDetachFromTarget_SpecificSlot_MetalSheets);
+		AddAction(ActionDetachFromTarget_SpecificSlotsCategory_Barrel);
+		AddAction(ActionDetachFromTarget_SpecificSlotsCategory_WoodenCrate);
+	}
+
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+
+		GetInventory().CreateInInventory("Truck_01_Door_1_1");
+		GetInventory().CreateInInventory("Truck_01_Door_2_1");
+		GetInventory().CreateInInventory("Truck_01_Hood");
+			
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+	}
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Cargo.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Cargo.c
new file mode 100644
index 0000000000000000000000000000000000000000..54ab7f055edfce7f25c204ffa3f859cb3c6720b3
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Cargo.c
@@ -0,0 +1,136 @@
+class Truck_01_Cargo extends Truck_01_Chassis {};
+/*
+{
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.V3S;
+	}
+
+	override int GetSeatAnimationType( int posIdx )
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		}
+
+		return 0;
+	}
+	
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		CarDoor carDoor;
+		switch( posIdx )
+		{
+			case 0:
+				Class.CastTo( carDoor, FindAttachmentBySlotName("V3SDriverDoors") );
+				if ( carDoor )
+				{
+					if ( carDoor.GetAnimationPhase("DoorsSource") > 0.5 ) return true;
+				}
+				else
+				{
+					return true;
+				}
+				return false;
+			break;
+			
+			case 1:
+				Class.CastTo( carDoor, FindAttachmentBySlotName("V3SCoDriverDoors") );
+				if ( carDoor )
+				{
+					if ( carDoor.GetAnimationPhase("DoorsSource") > 0.5 ) return true;
+				}
+				else
+				{
+					return true;
+				}
+				return false;
+			break;
+		}
+
+		return false;
+	}
+
+	override float OnSound( CarSoundCtrl ctrl, float oldValue )
+	{
+		switch ( ctrl )
+		{
+			case CarSoundCtrl.DOORS:
+				float newValue = 0;
+
+				//-----
+				CarDoor carDoor;
+			 	Class.CastTo( carDoor, FindAttachmentBySlotName("V3SDriverDoors") );
+				if ( carDoor )
+				{	
+					if ( carDoor.GetAnimationPhase("DoorsSource") > 0.5)
+					{
+						newValue = newValue + 0.8;
+					}
+				}
+				else
+				{
+					newValue = newValue + 0.8;
+				}
+
+				//-----
+			 	Class.CastTo( carDoor, FindAttachmentBySlotName("V3SCoDriverDoors") );
+				if ( carDoor )
+				{	
+					if ( carDoor.GetAnimationPhase("DoorsSource") > 0.5)
+					{
+						newValue = newValue + 0.8;
+					}
+				}
+				else
+				{
+					newValue = newValue + 0.8;
+				}
+			
+				if ( newValue > 1 )
+					newValue = 1;
+
+				return newValue;
+			break;
+		}
+
+		return oldValue;
+	}
+
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch( selection )
+		{
+		case "wheelsideplate1":
+			return "WheelSidePlate1";
+		case "wheelsideplate2":
+			return "WheelSidePlate2";
+		}
+
+		return "";
+	}
+
+	override bool IsVitalCarBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalSparkPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalEngineBelt()
+	{
+		return false;
+	}
+}
+*/
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Chassis.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Chassis.c
new file mode 100644
index 0000000000000000000000000000000000000000..ff0c3ac663dc8246562b8a8c2383cf26f66d8898
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Chassis.c
@@ -0,0 +1 @@
+class Truck_01_Chassis extends Truck_01_Base {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Covered.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Covered.c
new file mode 100644
index 0000000000000000000000000000000000000000..d5bb840f1d2fa69ee229effb30b55949c4a75752
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_01_Covered.c
@@ -0,0 +1,57 @@
+class Truck_01_Covered extends Truck_01_Base {};
+
+class Truck_01_Covered_Orange extends Truck_01_Covered
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+
+		GetInventory().CreateInInventory("Truck_01_Door_1_1_Orange");
+		GetInventory().CreateInInventory("Truck_01_Door_2_1_Orange");
+		GetInventory().CreateInInventory("Truck_01_Hood_Orange");
+			
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+	}
+}
+
+class Truck_01_Covered_Blue extends Truck_01_Covered
+{
+	override void OnDebugSpawn()
+	{
+		SpawnUniversalParts();
+		SpawnAdditionalItems();
+		FillUpCarFluids();
+
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+
+		GetInventory().CreateInInventory("Truck_01_Door_1_1_Blue");
+		GetInventory().CreateInInventory("Truck_01_Door_2_1_Blue");
+		GetInventory().CreateInInventory("Truck_01_Hood_Blue");
+			
+		//-----IN CAR CARGO
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_Wheel");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+		GetInventory().CreateInInventory("Truck_01_WheelDouble");
+	}
+}
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_02.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_02.c
new file mode 100644
index 0000000000000000000000000000000000000000..75c0eac71b7835d12cbbda8834977797e7ef0037
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Truck_02.c
@@ -0,0 +1,304 @@
+class Truck_02 extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void Truck_02()
+	{
+		//m_dmgContactCoef = 0.018;
+		m_enginePtcPos = "0 1.346 2.205";
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+	
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.MULTICAR;
+	}
+
+	override int GetSeatAnimationType( int posIdx )
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		}
+
+		return 0;
+	}
+
+	override int GetCarDoorsState( string slotType )
+	{
+		CarDoor carDoor;
+		
+		switch( slotType )
+		{
+			case "Truck_02_Door_1_1":
+				Class.CastTo( carDoor, FindAttachmentBySlotName( slotType ) );
+				if ( carDoor )
+				{
+					if ( GetAnimationPhase("DoorsDriver") > 0.5 )
+					{
+						return CarDoorState.DOORS_OPEN;
+					}
+					else
+					{
+						return CarDoorState.DOORS_CLOSED;
+					}
+				}
+
+				return CarDoorState.DOORS_MISSING;
+			break;
+			
+			case "Truck_02_Door_2_1":
+				Class.CastTo( carDoor, FindAttachmentBySlotName( slotType ) );
+				if ( carDoor )
+				{
+					if ( GetAnimationPhase("DoorsCoDriver") > 0.5 )
+					{
+						return CarDoorState.DOORS_OPEN;
+					}
+					else
+					{
+						return CarDoorState.DOORS_CLOSED;
+					}
+				}
+
+				return CarDoorState.DOORS_MISSING;
+			break;
+		}
+		
+		return CarDoorState.DOORS_MISSING;
+	}
+
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		CarDoor carDoor;
+		switch( posIdx )
+		{
+			case 0:
+				if ( GetCarDoorsState( "Truck_02_Door_1_1" ) == CarDoorState.DOORS_CLOSED )
+				{
+					return false;
+				}
+			
+				return true;
+			break;
+			
+			case 1:
+				if ( GetCarDoorsState( "Truck_02_Door_2_1" ) == CarDoorState.DOORS_CLOSED )
+				{
+					return false;
+				}
+			
+				return true;
+			break;
+		}
+
+		return false;
+	}
+	
+	override float OnSound( CarSoundCtrl ctrl, float oldValue )
+	{
+		switch ( ctrl )
+		{
+			case CarSoundCtrl.DOORS:
+				float newValue = 0;
+
+				//-----
+				if ( GetCarDoorsState( "Truck_02_Door_1_1" ) == CarDoorState.DOORS_CLOSED )
+				{
+					newValue += 0.4;
+				}
+
+				if ( GetCarDoorsState( "Truck_02_Door_2_1" ) == CarDoorState.DOORS_CLOSED )
+				{
+					newValue += 0.4;
+				}
+
+				if ( newValue > 1 )
+					newValue = 1;
+
+			return newValue;
+			break;
+		}
+
+		return oldValue;
+	}
+	
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch( selection )
+		{
+		case "doors_driver":
+			return "DoorsDriver";
+		case "doors_codriver":
+			return "DoorsCoDriver";
+		case "doors_hood":
+			return "DoorsHood";
+		case "doors_trunk":
+			return "DoorsTrunk";			
+		case "wheelsideplate1":
+			return "WheelSidePlate1";
+		case "wheelsideplate2":
+			return "WheelSidePlate2";
+		}
+
+		return "";
+	}
+
+	override bool IsVitalCarBattery()
+	{
+		return false;
+	}
+
+	override bool IsVitalSparkPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+
+	override bool IsVitalEngineBelt()
+	{
+		return false;
+	}
+	
+	override bool IsVitalRadiator()
+	{
+		return false;
+	}
+
+	override bool CanReachSeatFromSeat( int currentSeat, int nextSeat )
+	{
+		switch( currentSeat )
+		{
+		case 0:
+			if ( nextSeat == 1 )
+				return true;
+		break;
+		
+		case 1:
+			if ( nextSeat == 0 )
+				return true;
+		break;
+		}
+
+		return false;
+	}
+
+	override bool CanReachDoorsFromSeat( string pDoorsSelection, int pCurrentSeat )
+	{
+		switch( pCurrentSeat )
+		{
+		case 0:
+			if (pDoorsSelection == "DoorsDriver")
+			{
+				return true;
+			}
+		break;
+
+		case 1:
+			if (pDoorsSelection == "DoorsCoDriver")
+			{
+				return true;
+			}
+		break;
+		}
+		
+		return false;		
+	}
+	
+	override int GetSeatIndexFromDoor( string pDoorSelection )
+	{
+		switch (pDoorSelection)
+		{
+			case "DoorsDriver":
+				return 0;
+				break;
+			case "DoorsCoDriver":
+				return 1;
+				break;
+		}
+		return -1;
+	}
+	
+	override void OnDebugSpawn()
+	{
+		EntityAI entity;
+		
+		if ( Class.CastTo(entity, this) )
+		{
+			entity.GetInventory().CreateInInventory( "Truck_02_Wheel" );
+			entity.GetInventory().CreateInInventory( "Truck_02_Wheel" );
+			entity.GetInventory().CreateInInventory( "Truck_02_Wheel" );
+			entity.GetInventory().CreateInInventory( "Truck_02_Wheel" );
+
+			entity.GetInventory().CreateInInventory( "TruckBattery" );
+			entity.GetInventory().CreateInInventory( "SparkPlug" );
+
+			entity.GetInventory().CreateInInventory( "Truck_02_Door_1_1" );
+			entity.GetInventory().CreateInInventory( "Truck_02_Door_2_1" );
+
+			entity.GetInventory().CreateInInventory( "HeadlightH7" );
+			entity.GetInventory().CreateInInventory( "HeadlightH7" );
+		}
+
+		Fill( CarFluid.FUEL, 50 );
+		Fill( CarFluid.OIL, 4.0 );
+	};
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Van_01.c b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Van_01.c
new file mode 100644
index 0000000000000000000000000000000000000000..8d0ed3558234aa31ab1e8d2a3edbc73add27819d
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/InheritedCars/Van_01.c
@@ -0,0 +1,335 @@
+class Van_01 extends CarScript
+{
+	protected ref UniversalTemperatureSource m_UTSource;
+	protected ref UniversalTemperatureSourceSettings m_UTSSettings;
+	protected ref UniversalTemperatureSourceLambdaEngine m_UTSLEngine;
+
+	void Van_01()
+	{
+		//m_dmgContactCoef = 0.070; //TODO::Set proper value
+	}
+	
+	override void EEInit()
+	{		
+		super.EEInit();
+		
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+ 			m_UTSSettings 					= new UniversalTemperatureSourceSettings();
+			m_UTSSettings.m_ManualUpdate 	= true;
+			m_UTSSettings.m_TemperatureMin	= 0;
+			m_UTSSettings.m_TemperatureMax	= 30;
+			m_UTSSettings.m_RangeFull		= 0.5;
+			m_UTSSettings.m_RangeMax		= 2;
+			m_UTSSettings.m_TemperatureCap	= 25;
+			
+			m_UTSLEngine					= new UniversalTemperatureSourceLambdaEngine();
+			m_UTSource						= new UniversalTemperatureSource(this, m_UTSSettings, m_UTSLEngine);
+		}		
+	}
+	
+	override void OnEngineStart()
+	{
+		super.OnEngineStart();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(true, 20.0);
+		}
+	}
+	
+	override void OnEngineStop()
+	{
+		super.OnEngineStop();
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			m_UTSource.SetDefferedActive(false, 10.0);
+		}
+	}
+	
+	override void EOnPostSimulate(IEntity other, float timeSlice)
+	{
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if (m_UTSource.IsActive())
+			{
+				m_UTSource.Update(m_UTSSettings, m_UTSLEngine);
+			}
+		}
+	}
+	
+	//-----------------------------------------------------------
+	override int GetAnimInstance()
+	{
+		return VehicleAnimInstances.CIVVAN;
+	}
+
+	//-----------------------------------------------------------
+	override int GetSeatAnimationType( int posIdx )
+	{
+		switch( posIdx )
+		{
+		case 0:
+			return DayZPlayerConstants.VEHICLESEAT_DRIVER;
+		case 1:
+			return DayZPlayerConstants.VEHICLESEAT_CODRIVER;
+		case 2:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 3:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		case 4:
+			return DayZPlayerConstants.VEHICLESEAT_PASSENGER_L;
+		}
+
+		return 0;
+	}
+
+	//-----------------------------------------------------------	
+	override int GetCarDoorsState( string slotType )
+	{
+		CarDoor carDoor;
+
+		Class.CastTo( carDoor, FindAttachmentBySlotName( slotType ) );
+		if ( !carDoor )
+			return CarDoorState.DOORS_MISSING;
+	
+		switch( slotType )
+		{
+			case "Van_01_Door_1_1":
+				if ( GetAnimationPhase("DoorsDriver") > 0.5 )
+					return CarDoorState.DOORS_OPEN;
+				else
+					return CarDoorState.DOORS_CLOSED;
+
+			break;
+			
+			case "Van_01_Door_2_1":
+				if ( GetAnimationPhase("DoorsCoDriver") > 0.5 )
+					return CarDoorState.DOORS_OPEN;
+				else
+					return CarDoorState.DOORS_CLOSED;
+
+			break;
+			
+			case "Van_01_Door_2_2":
+				if ( GetAnimationPhase("DoorsCargo1") > 0.5 )
+					return CarDoorState.DOORS_OPEN;
+				else
+					return CarDoorState.DOORS_CLOSED;
+
+			break;
+			
+			case "Van_01_Trunk_1":
+				if ( GetAnimationPhase("DoorsCargo3") > 0.5 )
+					return CarDoorState.DOORS_OPEN;
+				else
+					return CarDoorState.DOORS_CLOSED;
+			break;
+			
+			case "Van_01_Trunk_2":
+				if ( GetAnimationPhase("DoorsCargo2") > 0.5 )
+					return CarDoorState.DOORS_OPEN;
+				else
+					return CarDoorState.DOORS_CLOSED;
+
+			break;
+		}
+
+		return CarDoorState.DOORS_MISSING;
+	}
+
+	//-----------------------------------------------------------
+	override bool CrewCanGetThrough( int posIdx )
+	{
+		switch( posIdx )
+		{
+			case 0:
+				if ( GetCarDoorsState( "Van_01_Door_1_1" ) == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+			
+			case 1:
+				if ( GetCarDoorsState( "Van_01_Door_2_1" ) == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 2:
+				if ( GetCarDoorsState( "Van_01_Door_2_2" ) == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+
+			case 3:
+				if ( GetCarDoorsState( "Van_01_Door_2_2" ) == CarDoorState.DOORS_CLOSED )
+					return false;
+			
+			case 4:
+				if ( GetCarDoorsState( "Van_01_Door_2_2" ) == CarDoorState.DOORS_CLOSED )
+					return false;
+
+				return true;
+			break;
+		}
+
+		return false;
+	}
+
+	//-----------------------------------------------------------
+	override float OnSound( CarSoundCtrl ctrl, float oldValue )
+	{
+		switch ( ctrl )
+		{
+			case CarSoundCtrl.DOORS:
+				float newValue = 0;
+				
+				//-----
+				if ( GetCarDoorsState( "Van_01_Door_1_1" ) == CarDoorState.DOORS_CLOSED )
+					newValue += 0.25;
+
+				//-----
+				if ( GetCarDoorsState( "Van_01_Door_2_1" ) == CarDoorState.DOORS_CLOSED )
+					newValue += 0.25;
+			
+				//-----
+				if ( GetCarDoorsState( "Van_01_Door_2_2" ) == CarDoorState.DOORS_CLOSED )
+					newValue += 0.25;
+
+				//-----
+				if ( GetCarDoorsState( "Van_01_Trunk_1" ) == CarDoorState.DOORS_CLOSED )
+					newValue += 0.125;
+
+				//-----
+				if ( GetCarDoorsState( "Van_01_Trunk_2" ) == CarDoorState.DOORS_CLOSED )
+					newValue += 0.125;
+
+				if ( newValue > 1 )
+					newValue = 1;
+			
+				return newValue;
+			break;
+		}
+
+		return oldValue;
+	}
+
+	//-----------------------------------------------------------
+	override string GetAnimSourceFromSelection( string selection )
+	{
+		switch( selection )
+		{
+		case "doors_driver":
+			return "DoorsDriver";
+		case "doors_codriver":
+			return "DoorsCoDriver";
+		case "doors_cargo1":
+			return "DoorsCargo1";
+		case "doors_cargo2":
+			return "DoorsCargo2";
+		case "doors_cargo3":
+			return "DoorsCargo3";
+		case "doors_hood":
+			return "DoorsHood";
+		}
+
+		return "";
+	}
+
+	//-----------------------------------------------------------
+	override string GetDoorConditionPointFromSelection( string selection )
+	{
+			switch( selection )
+		{
+			case "seat_driver":
+				return "seat_con_1_1";
+			break;
+			case "seat_codriver":
+				return "seat_con_2_1";
+			break;
+			case "seat_cargo1":
+			case "seat_cargo2":
+			case "seat_cargo3":
+				return "seat_con_1_2";
+			break;
+		}
+
+		return "";
+	};
+
+	//-----------------------------------------------------------
+	override bool IsVitalTruckBattery()
+	{
+		return false;
+	}
+
+	//-----------------------------------------------------------
+	override bool IsVitalGlowPlug()
+	{
+		return false;
+	}
+
+	//-----------------------------------------------------------
+	override bool CanReachSeatFromSeat( int currentSeat, int nextSeat )
+	{
+		switch( currentSeat )
+		{
+		case 0:
+			if ( nextSeat == 1 )
+				return true;
+			break;
+		case 1:
+			if ( nextSeat == 0 )
+				return true;
+			break;
+		case 2:
+			if ( nextSeat == 3 )
+				return true;
+			break;
+		case 3:
+			if ( nextSeat == 2 )
+				return true;
+			break;
+		}
+		
+		return false;
+	}
+
+	//-----------------------------------------------------------
+	override bool CanReachDoorsFromSeat( string pDoorsSelection, int pCurrentSeat )
+	{
+		switch( pCurrentSeat )
+		{
+		case 0:
+			if (pDoorsSelection == "DoorsDriver")
+			{
+				return true;
+			}
+		break;
+		case 1:
+			if (pDoorsSelection == "DoorsCoDriver")
+			{
+				return true;
+			}
+		break;
+		case 2:
+			if (pDoorsSelection == "DoorsCargo1")
+			{
+				return true;
+			}
+		break;
+		case 3:
+			if (pDoorsSelection == "DoorsCargo2")
+			{
+				return true;
+			}
+		break;
+		}
+
+		return false;		
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/Vehicles/VehicleAnimInstances.c b/scripts/4_World/DayZ/Entities/Vehicles/VehicleAnimInstances.c
new file mode 100644
index 0000000000000000000000000000000000000000..e01fa141f7eff3b645ff559cbc03458c07b0f7f7
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/Vehicles/VehicleAnimInstances.c
@@ -0,0 +1,12 @@
+enum VehicleAnimInstances
+{
+	CIVVAN = 0,
+	V3S = 1,
+	SEDAN = 2,
+	HATCHBACK = 3,
+	BUS = 4,
+	S120 = 5,
+	MULTICAR = 6,
+	GOLF = 7,
+	HMMWV = 8
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/WeaponParticles.c b/scripts/4_World/DayZ/Entities/WeaponParticles.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe88d8ca7085094d8cbd5649dbe542661e9e3264
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/WeaponParticles.c
@@ -0,0 +1,449 @@
+/*
+	Author: Boris Vacula
+	For documentation go to: DayZ Confluence -> How-to articles -> Weapon muzzle flash particle system configuration
+	This system plays effect(s) on any weapon that is fired/jammed/ruined/...
+*/
+
+class WeaponParticlesBase // This class represents every particle effect you see in config within OnFire or OnOverheating events
+{
+	bool			m_IlluminateWorld;
+	bool			m_IgnoreIfSuppressed;
+	bool			m_OnlyIfBoltIsOpen;
+	int 			m_MuzzleIndex;
+	int 			m_OverrideParticle;
+	int 			m_OnlyWithinHealthLabelMin;
+	int 			m_OnlyWithinHealthLabelMax;
+	float 			m_OnlyWithinOverheatLimitsMin;
+	float			m_OnlyWithinOverheatLimitsMax;
+	float 			m_OnlyWithinRainLimitsMin;
+	float			m_OnlyWithinRainLimitsMax;
+	string 			m_OverrideDirectionPoint;
+	string 			m_OnlyIfBulletIs;
+	string 			m_OnlyIfWeaponIs;
+	string 			m_OverridePoint;
+	vector 			m_OverrideDirectionVector;
+	vector 			m_PositionOffset;
+	
+	string 			m_Name;
+	
+	//======================================
+	//  		PRELOAD EVERYTHING
+	//======================================
+	
+	void WeaponParticlesBase(ItemBase muzzle_owner, string config_OnFire_entry)
+	{		
+		m_Name = config_OnFire_entry;
+		
+		// ignoreIfSuppressed
+		m_IgnoreIfSuppressed = GetGame().ConfigGetFloat(string.Format("%1 ignoreIfSuppressed", m_Name));
+		
+		// onlyIfBoltIsOpen
+		m_OnlyIfBoltIsOpen = GetGame().ConfigGetFloat(string.Format("%1 onlyIfBoltIsOpen", m_Name));
+		
+		// illuminateWorld
+		m_IlluminateWorld = GetGame().ConfigGetFloat(string.Format("%1 illuminateWorld", m_Name));
+		
+		m_MuzzleIndex = -1;
+		if (GetGame().ConfigIsExisting(string.Format("%1 muzzleIndex", m_Name)))
+		{
+			m_MuzzleIndex = GetGame().ConfigGetInt(string.Format("%1 muzzleIndex", m_Name));
+		}
+		
+		// onlyIfWeaponIs
+		m_OnlyIfWeaponIs = "";
+		GetGame().ConfigGetText(string.Format("%1 onlyIfWeaponIs", m_Name), m_OnlyIfWeaponIs);
+		
+		// onlyIfBulletIs
+		m_OnlyIfBulletIs = "";
+		GetGame().ConfigGetText(string.Format("%1 onlyIfBulletIs", m_Name), m_OnlyIfBulletIs);
+		
+		// onlyWithinHealthLabel[]
+		array<float> health_limit = new array<float>;
+		GetGame().ConfigGetFloatArray(string.Format("%1 onlyWithinHealthLabel", m_Name), health_limit);
+		
+		if (health_limit.Count() == 2)
+		{
+			m_OnlyWithinHealthLabelMin = health_limit.Get(0);
+			m_OnlyWithinHealthLabelMax = health_limit.Get(1);
+		}
+		else
+		{
+			// Disable this filter
+			m_OnlyWithinHealthLabelMin = -1;
+			m_OnlyWithinHealthLabelMax = 99;
+		}
+		
+		// onlyWithinOverheatLimits[]
+		array<float> overheat_limit = new array<float>;
+		GetGame().ConfigGetFloatArray(string.Format("%1 onlyWithinOverheatLimits", m_Name), overheat_limit);
+		
+		if (overheat_limit.Count() == 2)
+		{
+			m_OnlyWithinOverheatLimitsMin = overheat_limit.Get(0);
+			m_OnlyWithinOverheatLimitsMax = overheat_limit.Get(1);
+		}
+		else
+		{
+			// Disable this filter
+			m_OnlyWithinOverheatLimitsMin = -1;
+			m_OnlyWithinOverheatLimitsMax = 2;
+		}
+		
+		// onlyWithinRainLimits[]
+		array<float> rain_limit = new array<float>;
+		GetGame().ConfigGetFloatArray(string.Format("%1 onlyWithinRainLimits", m_Name), rain_limit);
+		
+		if (rain_limit.Count() == 2)
+		{
+			m_OnlyWithinRainLimitsMin = rain_limit.Get(0);
+			m_OnlyWithinRainLimitsMax = rain_limit.Get(1);
+		}
+		else
+		{
+			// Disable this filter
+			m_OnlyWithinRainLimitsMin = -1;
+			m_OnlyWithinRainLimitsMax = 2;
+		}
+		
+		// overridePoint
+		m_OverridePoint = "";
+		GetGame().ConfigGetText(string.Format("%1 overridePoint", m_Name), m_OverridePoint);
+		
+		if (m_OverridePoint == "")
+			m_OverridePoint = "Usti hlavne"; // default memory point name
+		
+		// overrideParticle
+		string particle_name = "";
+		GetGame().ConfigGetText( string.Format("%1 overrideParticle", m_Name), particle_name);
+		
+		if (particle_name != "")
+		{
+			m_OverrideParticle = ParticleList.GetParticleIDByName(particle_name);
+		}
+		else
+		{
+			m_OverrideParticle = -1;
+			ErrorEx(string.Format("'%1' does not contain a definition for 'overrideparticle'",
+				config_OnFire_entry), ErrorExSeverity.INFO);
+		}
+		
+		// overrideDirectionPoint
+		m_OverrideDirectionPoint = "";
+		GetGame().ConfigGetText(string.Format("%1 overrideDirectionPoint", m_Name), m_OverrideDirectionPoint);
+		
+		if (m_OverrideDirectionPoint == "")
+		{
+			// overrideDirectionVector
+			vector test_ori = GetGame().ConfigGetVector(string.Format("%1 overrideDirectionVector", m_Name));
+			
+			if (test_ori != vector.Zero)
+			{
+				m_OverrideDirectionVector = test_ori;
+			}
+		}
+		
+		// positionOffset[]
+		array<float> v = new array<float>;
+		GetGame().ConfigGetFloatArray(string.Format("%1 positionOffset", m_Name), v);
+		
+		if (v.Count() == 3)
+		{
+			float v1 = v.Get(0);
+			float v2 = v.Get(1);
+			float v3 = v.Get(2);
+			m_PositionOffset = Vector(v1, v2, v3);
+		}
+	}
+	
+	
+	
+	//======================================
+	//			  PLAY PARTICLES
+	//======================================
+	// It is important to know that this block of script is called for weapons and muzzle attachments alike.
+	// Thus weapon == muzzle_owner when this is called for a weapon, and weapon != muzzle_owner when this is called for a suppressor.
+	void OnActivate(ItemBase weapon, int muzzle_index, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() )
+		{
+			// Handle effect's parameters
+			if ( PrtTest.m_GunParticlesState ) // Check if particles are enabled by debug
+			{
+				if ( m_MuzzleIndex == -1 || m_MuzzleIndex == muzzle_index )
+				{
+					if ( CheckBoltStateCondition(weapon) ) // onlyIfBoltIsOpen
+					{
+						if ( !suppressor || suppressor.IsRuined() || !(m_IgnoreIfSuppressed) ) // ignoreIfSuppressed
+						{
+							if ( CheckHealthCondition( muzzle_owner.GetHealthLevel() ) ) // onlyWithinHealthLabel
+							{
+								if ( CheckOverheatingCondition( muzzle_owner.GetOverheatingCoef() ) ) // onlyWithinOverheatLimits
+								{
+									if ( CheckRainCondition( GetGame().GetWeather().GetRain().GetActual() ) ) // onlyWithinRainLimits
+									{
+										if ( m_OnlyIfBulletIs == ""  ||  m_OnlyIfBulletIs == ammoType ) // onlyIfBulletIs
+										{
+											if ( m_OnlyIfWeaponIs == ""  ||  m_OnlyIfWeaponIs == weapon.GetType() ) // onlyIfWeaponIs
+											{
+												// Get particle ID
+												int particle_id = CheckParticleOverride(ammoType);
+
+												if (ParticleList.IsValidId(particle_id))
+												{
+													// Get position of the particle
+													vector local_pos = muzzle_owner.GetSelectionPositionLS(m_OverridePoint);
+													local_pos += m_PositionOffset;
+												
+													// Set orientation of the particle
+													vector particle_ori = CheckOrientationOverride(local_pos, muzzle_owner);
+												
+													// Create particle
+													Particle p = ParticleManager.GetInstance().PlayOnObject( particle_id, muzzle_owner, local_pos, particle_ori );											
+													OnParticleCreated(weapon, ammoType, muzzle_owner, suppressor, config_to_search, p);
+												}
+												else
+												{
+													ErrorEx(string.Format("No valid particle found for: '%1'", m_Name));
+												}
+												
+												// Create light
+												if (m_IlluminateWorld)
+												{
+													vector global_pos = muzzle_owner.ModelToWorld(local_pos + Vector(-0.2, 0, 0));
+													int randX = Math.RandomInt( 0,10 );
+													if ( randX > 8 )
+														ScriptedLightBase.CreateLight( MuzzleFlashLight_2, global_pos );
+													else if ( randX > 4 )
+														ScriptedLightBase.CreateLight( MuzzleFlashLight_1, global_pos );
+													else 
+													ScriptedLightBase.CreateLight(MuzzleFlashLight, global_pos);
+												}
+											}
+										}
+									}
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	void OnParticleCreated(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search, Particle p)
+	{
+		
+	}
+	
+	void OnDeactivate(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		
+	}
+	
+	void OnUpdate(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		
+	}
+	
+	
+	//==============================================
+	//  		 HANDLE CONFIG PARAMETERS          
+	//==============================================
+	
+	
+	// OnlyWithinHealthLabelMin & OnlyWithinHealthLabelMax
+	bool CheckBoltStateCondition(ItemBase weapon)
+	{
+		if ( m_OnlyIfBoltIsOpen )
+		{
+			Weapon_Base wb = Weapon_Base.Cast( weapon );
+			WeaponStateBase current_state =  wb.GetCurrentState();
+			return current_state.IsBoltOpen();
+		}
+		
+		return true;
+	}
+	
+	// OnlyWithinHealthLabelMin & OnlyWithinHealthLabelMax
+	bool CheckHealthCondition(int health_label)
+	{
+		return ( (health_label >= m_OnlyWithinHealthLabelMin)  &&  (health_label <= m_OnlyWithinHealthLabelMax) );
+	}
+	
+	// OnlyWithinOverheatLimitsMin & OnlyWithinOverheatLimitsMax
+	bool CheckOverheatingCondition(float overheating_coef)
+	{
+		return ( (overheating_coef >= m_OnlyWithinOverheatLimitsMin)  &&  (overheating_coef <= m_OnlyWithinOverheatLimitsMax) );
+	}
+	
+	// OnlyWithinRainLimitsMin & OnlyWithinRainLimitsMax
+	bool CheckRainCondition(float rain_coef)
+	{
+		return ( (rain_coef >= m_OnlyWithinRainLimitsMin)  &&  (rain_coef <= m_OnlyWithinRainLimitsMax) );
+	}
+	
+	// muzzleFlashParticle
+	int CheckParticleOverride(string ammoType)
+	{
+		int particle_id = -1;
+		
+		string particle_file = "";
+		string cfg_path = "CfgAmmo " + ammoType + " muzzleFlashParticle";
+		if (GetGame().ConfigGetText( cfg_path, particle_file))
+			particle_id = ParticleList.GetParticleIDByName(particle_file);
+		
+		// Config is accessed only once because the data is saved into a map for repeated access.
+		
+		if ( particle_id > 0 || m_OverrideParticle == -1)
+		{
+			if (particle_file == "")
+			{
+				ErrorEx(string.Format("Cannot spawn particle effect because item %1 is missing config parameter muzzleFlashParticle!", ammoType), ErrorExSeverity.INFO);
+			}
+			else
+			{
+				particle_id = ParticleList.GetParticleIDByName(particle_file);
+				
+				if (particle_id == 0)
+				{
+					string devStr;
+					#ifdef DEVELOPER
+					devStr = " Make sure it's registered there and then rebuild Scripts and Graphics PBOs.";
+					#endif
+					ErrorEx(string.Format("Cannot play particle effect with name %1 because no such file is registered in ParticleList.c!%2", particle_file, devStr));
+					m_OverrideParticle = particle_id; // Prevents another appearence of the above error.
+				}
+			}
+		}
+		else
+		{
+			particle_id = m_OverrideParticle;
+		}
+		
+		return particle_id;
+	}
+	
+	// OverrideDirectionPoint & OverrideDirectionVector
+	vector CheckOrientationOverride(vector local_pos, ItemBase muzzle_owner)
+	{
+		vector particle_ori = "0 0 0";
+		if (m_OverrideDirectionPoint != "")
+		{
+			vector target_pos = muzzle_owner.GetSelectionPositionLS(m_OverrideDirectionPoint);
+			target_pos = vector.Direction(local_pos, target_pos);
+			particle_ori = target_pos.VectorToAngles();
+		}
+		else
+		{
+			if (m_OverrideDirectionVector != Vector(0, 0, 0))
+			{
+				particle_ori = m_OverrideDirectionVector;
+			}
+			
+			if (muzzle_owner.IsInherited(ItemSuppressor))
+			{
+				particle_ori = particle_ori + Vector(0,0,270); // This rotation is necesarry due to suppressors being rotated into ground in their p3d files
+			}
+		}
+		
+		return particle_ori;
+	}
+}
+
+// FIRE particles
+class WeaponParticlesOnFire : WeaponParticlesBase {}
+
+// BULLET EJECT particles
+class WeaponParticlesOnBulletCasingEject : WeaponParticlesBase {}
+
+// OVERHEATING particles
+class WeaponParticlesOnOverheating: WeaponParticlesBase
+{
+	override void OnParticleCreated(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search, Particle p)
+	{
+		muzzle_owner.RegisterOverheatingParticle(p, m_OnlyWithinOverheatLimitsMin, m_OnlyWithinOverheatLimitsMax, p.GetParticleID(), muzzle_owner, p.m_DefaultPos, p.m_DefaultOri );
+	}
+	
+	override void OnDeactivate(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		if ( !GetGame().IsServer() || !GetGame().IsMultiplayer() )
+		{
+			weapon.KillAllOverheatingParticles();
+		}
+	}
+	
+	override void OnUpdate(ItemBase weapon, string ammoType, ItemBase muzzle_owner, ItemBase suppressor, string config_to_search)
+	{
+		OnActivate(weapon, 0, ammoType, muzzle_owner, suppressor, config_to_search);
+	}
+}
+
+class OverheatingParticle
+{
+	Particle 	m_Particle;
+	int 		m_ParticleID;
+	Object 		m_Parent;
+	vector		m_LocalPos;
+	vector		m_LocalOri;
+	
+	float m_OverheatingLimitMin;
+	float m_OverheatingLimitMax;
+	
+	void RegisterParticle( Particle p)
+	{
+		m_Particle = p;
+	}
+	
+	Particle GetParticle()
+	{
+		return m_Particle;
+	}
+	
+	void SetOverheatingLimitMin(float min)
+	{
+		m_OverheatingLimitMin = min;
+	}
+	
+	void SetOverheatingLimitMax(float max)
+	{
+		m_OverheatingLimitMax = max;
+	}
+	
+	float GetOverheatingLimitMin()
+	{
+		return m_OverheatingLimitMin;
+	}
+	
+	float GetOverheatingLimitMax()
+	{
+		return m_OverheatingLimitMax;
+	}
+	
+	void SetParticleParams(int particle_id, Object parent, vector local_pos, vector local_ori)
+	{
+		m_ParticleID = particle_id;
+		m_Parent = parent;
+		m_LocalPos = local_pos;
+		m_LocalOri = local_ori;
+	}
+	
+	int GetParticleID()
+	{
+		return m_ParticleID;
+	}
+	
+	Object GetParticleParent()
+	{
+		return m_Parent;
+	}
+	
+	vector GetParticlePos()
+	{
+		return m_LocalPos;
+	}
+	
+	vector GetParticleOri()
+	{
+		return m_LocalOri;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/WoodBase.c b/scripts/4_World/DayZ/Entities/WoodBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..2fece5d14b5a1e274ccc5cd691535bb01ec8f0ee
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/WoodBase.c
@@ -0,0 +1,251 @@
+enum EHarvestType
+{
+	NORMAL,
+	BARK
+}
+
+class WoodBase extends Plant
+{
+	
+	static bool 	m_IsCuttable;
+	static int 		m_PrimaryDropsAmount = -1;
+	static int 		m_SecondaryDropsAmount = -1;
+	static float 	m_ToolDamage = -1.0;
+	static float 	m_CycleTimeOverride = -1.0;
+	static string 	m_PrimaryOutput = ""; //some nonsensical item for debugging purposes
+	static string 	m_SecondaryOutput = ""; //some nonsensical item for debugging purposes
+	static string 	m_BarkType = "";
+	
+	/*
+	 bool 	m_IsCuttable;
+	 int 	m_PrimaryDropsAmount = -1;
+	 int 	m_SecondaryDropsAmount = -1;
+	 float 	m_ToolDamage = -1.0;
+	 float 	m_CycleTimeOverride = -1.0;
+	 string 	m_PrimaryOutput = ""; //some nonsensical item for debugging purposes
+	 string 	m_SecondaryOutput = ""; //some nonsensical item for debugging purposes
+	 string 	m_BarkType = "";
+	*/
+	
+	void WoodBase()
+	{
+		//InitMiningValues();
+	}
+	
+	
+	void InitMiningValues()
+	{
+		//m_IsCuttable = false;
+	};
+	
+	override bool IsWoodBase()
+	{
+		return true;
+	}
+
+	override bool IsCuttable()
+	{
+		return ConfigGetBool("isCuttable");
+	}
+	
+	int GetPrimaryDropsAmount()
+	{
+		return ConfigGetInt("primaryDropsAmount");
+	}
+	
+	int GetSecondaryDropsAmount()
+	{
+		return ConfigGetInt("secondaryDropsAmount");
+	}
+	
+	float GetToolDamage()
+	{
+		return ConfigGetFloat("toolDamage");
+	}
+	
+	float GetCycleTimeOverride()
+	{
+		return ConfigGetFloat("cycleTimeOverride");
+	}
+	
+	string GetPrimaryOutput()
+	{
+		return ConfigGetString("primaryOutput");
+	}
+	
+	string GetSecondaryOutput()
+	{
+		return ConfigGetString("secondaryOutput");
+	}
+	
+	string GetBarkType()
+	{
+		return ConfigGetString("barkType");
+	}
+	
+	
+	
+	int GetAmountOfDrops(ItemBase item)
+	{
+		if ( GetPrimaryDropsAmount() > 0 )
+		{
+			if ( IsTree() && item && ( item.KindOf("Knife") || item.IsInherited(Screwdriver) ) )
+			{
+				return -1;
+			}
+			else
+			{
+				return GetPrimaryDropsAmount(); 
+			}
+		}
+		else
+		{
+			if ( item && ( item.KindOf("Knife") || item.IsInherited(Screwdriver) ) )
+			{
+				return -1;
+			}
+			else if ( item && item.KindOf("Axe") )
+			{
+				return 3;
+			}
+			else
+			{
+				return 100;
+			}
+		}
+	}
+	
+	int GetAmountOfDropsEx(ItemBase item, EHarvestType type)
+	{
+		if ( GetPrimaryDropsAmount() > 0 )
+		{
+			if ( IsTree() && item && type == EHarvestType.BARK )
+			{
+				return -1;
+			}
+			else
+			{
+				return GetPrimaryDropsAmount(); 
+			}
+		}
+		else
+		{
+			if ( item && type == EHarvestType.BARK )
+			{
+				return -1;
+			}
+			else if ( item &&  type == EHarvestType.NORMAL )
+			{
+				return 3;
+			}
+			else
+			{
+				return 100;
+			}
+		}
+	}
+	
+	void GetMaterialAndQuantityMap(ItemBase item, out map<string,int> output_map)
+	{
+		if ( IsTree() && item && ( item.KindOf("Knife") || item.IsInherited(Screwdriver) ) && GetBarkType() != "" )
+		{
+			output_map.Insert(GetBarkType(),1);
+		}
+		else
+		{
+			output_map.Insert(GetPrimaryOutput(),1);
+		}
+	}
+	
+	void GetMaterialAndQuantityMapEx(ItemBase item, out map<string,int> output_map, EHarvestType type)
+	{
+		if ( IsTree() && item && type == EHarvestType.BARK && GetBarkType() != "" )
+		{
+			output_map.Insert(GetBarkType(),1);
+		}
+		else
+		{
+			output_map.Insert(GetPrimaryOutput(),1);
+		}
+	}
+	
+	float GetDamageToMiningItemEachDrop(ItemBase item)
+	{
+		if (GetToolDamage() > -1)
+			return GetToolDamage();
+		
+		if ( IsTree() )
+		{
+			if ( item && item.KindOf("Knife") )
+			{
+				return 20;
+			}
+			else if ( item && item.KindOf("Axe") )
+			{
+				return 20;
+			}
+			else
+			{
+				return 0; 
+			}
+		}
+		else
+		{
+			if ( item && item.KindOf("Knife") )
+			{
+				return 30;
+			}
+			else if ( item && item.KindOf("Axe") )
+			{
+				return 30;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+	}
+	
+	float GetDamageToMiningItemEachDropEx(ItemBase item, EHarvestType type)
+	{
+		if (GetToolDamage() > -1)
+			return GetToolDamage();
+		
+		if ( IsTree() )
+		{
+			if ( item && type == EHarvestType.BARK )
+			{
+				return 20;
+			}
+			else if ( item && type == EHarvestType.NORMAL )
+			{
+				return 20;
+			}
+			else
+			{
+				return 0; 
+			}
+		}
+		else
+		{
+			if ( item && type == EHarvestType.BARK )
+			{
+				return 30;
+			}
+			else if ( item && type == EHarvestType.NORMAL )
+			{
+				return 30;
+			}
+			else
+			{
+				return 0;
+			}
+		}
+	}
+	
+	override bool CanBeActionTarget()
+	{
+		return super.CanBeActionTarget() && !IsDamageDestroyed();
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/WoodBase/Bushes.c b/scripts/4_World/DayZ/Entities/WoodBase/Bushes.c
new file mode 100644
index 0000000000000000000000000000000000000000..23dca3ebca6c3a86ab64313f18d2f988f3181fcb
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/WoodBase/Bushes.c
@@ -0,0 +1,98 @@
+// colored berries are now spawned near bushes, not harvested
+//-----------------------------------------------
+//BushSoft
+class BushSoft_b_betulaHumilis_1s: BushSoft
+{
+
+};
+class BushSoft_b_corylusAvellana_1f: BushSoft
+{
+
+};
+class BushSoft_b_crataegusLaevigata_1s: BushSoft
+{
+
+};
+class BushSoft_b_PiceaAbies_1f: BushSoft
+{
+
+};
+class BushSoft_b_quercusRobur_1f: BushSoft
+{
+	
+};
+class BushSoft_b_rosaCanina_1s: BushSoft
+{
+	
+};
+class BushSoft_b_rosaCanina_2s: BushSoft
+{
+	
+};
+class BushSoft_b_sambucusNigra_1s: BushSoft
+{
+	
+};
+class BushSoft_t_PinusSylvestris_1s: BushSoft
+{
+	
+};
+
+//-----------------------------------------------
+//BushHard
+class BushHard_b_BetulaPendula_1f: BushHard
+{
+	
+};
+class BushHard_b_corylusAvellana_2s: BushHard
+{
+	
+};
+class BushHard_b_crataegusLaevigata_2s: BushHard
+{
+	
+};
+class BushHard_b_FagusSylvatica_1f: BushHard
+{
+	
+};
+class BushHard_b_naked_2s: BushHard
+{
+	
+};
+class BushHard_b_PiceaAbies_1fb: BushHard
+{
+	
+};
+class BushHard_b_prunusSpinosa_1s: BushHard
+{
+	
+};
+class BushHard_b_prunusSpinosa_2s: BushHard
+{
+	
+};
+class BushHard_b_sambucusNigra_2s: BushHard
+{
+	
+};
+class BushHard_t_FagusSylvatica_1fb: BushHard
+{
+	
+};
+class BushHard_t_PiceaAbies_1s: BushHard
+{
+	
+};
+class BushHard_t_PiceaAbies_1sb: BushHard
+{
+	
+};
+class BushHard_t_PinusSylvestris_1f: BushHard
+{
+	
+};
+class BushHard_t_quercusRobur_1fb: BushHard
+{
+	
+};
diff --git a/scripts/4_World/DayZ/Entities/WoodBase/ChristmasTree.c b/scripts/4_World/DayZ/Entities/WoodBase/ChristmasTree.c
new file mode 100644
index 0000000000000000000000000000000000000000..85e464b993b88156ecf1830587969214c956a9c2
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/WoodBase/ChristmasTree.c
@@ -0,0 +1,35 @@
+class ChristmasTree extends House
+{
+	XmasTreeLight 		m_TreeLight;
+	EffectSound 		m_AmbientSoundLoop;
+	const string		LOOP_SOUND = "ChristmasMusic_SoundSet";
+	
+	void ChristmasTree()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			m_TreeLight = XmasTreeLight.Cast( ScriptedLightBase.CreateLight( XmasTreeLight, "0 0 0" ) );
+			m_TreeLight.AttachOnMemoryPoint( this, "action" );
+		}
+	}
+	
+	override void EEInit()
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			PlaySoundSetLoop( m_AmbientSoundLoop, LOOP_SOUND, 0, 0 );
+		}
+	}
+	
+	override void EEDelete(EntityAI parent)
+	{
+		if ( !GetGame().IsDedicatedServer() )
+		{
+			if ( m_TreeLight )
+				m_TreeLight.Destroy();
+			if ( m_AmbientSoundLoop )
+				SEffectManager.DestroyEffect(m_AmbientSoundLoop);
+		}
+	}
+};
+class ChristmasTree_Green extends ChristmasTree {};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Entities/WoodBase/Trees.c b/scripts/4_World/DayZ/Entities/WoodBase/Trees.c
new file mode 100644
index 0000000000000000000000000000000000000000..ae3c96bdc41ce3a7a603a9774f21715d94c01453
--- /dev/null
+++ b/scripts/4_World/DayZ/Entities/WoodBase/Trees.c
@@ -0,0 +1,412 @@
+//-------------------------------------
+//Birch tree baseclasses (white bark)
+class TreeHard_BetulaPendula: TreeHard
+{
+	
+};
+
+class TreeSoft_BetulaPendula_Base: TreeSoft
+{
+	
+};
+
+//-----------------------------------------------
+//TreeSoft
+class TreeSoft_t_BetulaPendula_1f: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_BetulaPendula_1fb: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_BetulaPendula_1s: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_BetulaPendula_2f: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_BetulaPendula_2fb: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_BetulaPendula_2fc: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_BetulaPendula_2w: TreeSoft_BetulaPendula_Base
+{
+	
+};
+class TreeSoft_t_FagusSylvatica_1f: TreeSoft
+{
+	
+};
+class TreeSoft_t_FagusSylvatica_1fc: TreeSoft
+{
+	
+};
+class TreeSoft_t_FagusSylvatica_1fd: TreeSoft
+{
+	
+};
+class TreeSoft_t_FagusSylvatica_1s: TreeSoft
+{
+	
+};
+class TreeSoft_t_FagusSylvatica_2sb: TreeSoft
+{
+	
+};
+class TreeSoft_t_FagusSylvatica_2sb_Trail_B: TreeSoft_t_FagusSylvatica_2sb{};
+class TreeSoft_t_FagusSylvatica_2sb_Trail_G: TreeSoft_t_FagusSylvatica_2sb{};
+class TreeSoft_t_FagusSylvatica_2sb_Trail_R: TreeSoft_t_FagusSylvatica_2sb{};
+class TreeSoft_t_FagusSylvatica_2sb_Trail_Y: TreeSoft_t_FagusSylvatica_2sb{};
+
+class TreeSoft_t_FraxinusExcelsior_2w: TreeSoft
+{
+	
+};
+class TreeSoft_t_malusDomestica_1s: TreeSoft
+{
+	
+};
+class TreeSoft_t_malusDomestica_2s: TreeSoft_t_malusDomestica_1s{};
+class TreeSoft_t_malusDomestica_3s: TreeSoft_t_malusDomestica_1s{};
+class TreeSoft_t_PiceaAbies_1f: TreeSoft
+{
+
+};
+class TreeSoft_t_PiceaAbies_2sb: TreeSoft
+{
+	
+};
+class TreeSoft_t_populusAlba_1f: TreeSoft
+{
+	
+};
+class TreeSoft_t_pyrusCommunis_2s: TreeSoft
+{
+	
+};
+class TreeSoft_t_quercusRobur_1f: TreeSoft
+{
+	
+};
+class TreeSoft_t_quercusRobur_1fc: TreeSoft
+{
+	
+};
+class TreeSoft_t_quercusRobur_1fd: TreeSoft
+{
+	
+};
+class TreeSoft_t_quercusRobur_1s: TreeSoft
+{
+	
+};
+class TreeSoft_t_quercusRobur_2fb: TreeSoft
+{
+	
+};
+class TreeSoft_t_quercusRobur_2fc: TreeSoft
+{
+	
+};
+class TreeSoft_t_robiniaPseudoacacia_1f: TreeSoft
+{
+	
+};
+class TreeSoft_t_town_1s: TreeSoft
+{
+	
+};
+class TreeSoft_t_town_1sb: TreeSoft
+{
+	
+};
+class TreeSoft_t_LarixDecidua_1f: TreeSoft
+{
+	
+};
+class TreeSoft_t_LarixDecidua_1s: TreeSoft
+{
+	
+};
+//-----------------------------------------------
+//TreeHard
+class TreeHard_t_BetulaPendula_2s: TreeHard_BetulaPendula
+{
+	
+};
+class TreeHard_t_BetulaPendula_3f: TreeHard_BetulaPendula
+{
+	
+};
+class TreeHard_t_BetulaPendula_3fb: TreeHard_BetulaPendula
+{
+	
+};
+class TreeHard_t_BetulaPendula_3fc: TreeHard_BetulaPendula
+{
+	
+};
+class TreeHard_t_BetulaPendula_3s: TreeHard_BetulaPendula
+{
+	
+};
+class TreeHard_t_carpinus_2s: TreeHard
+{
+	
+}
+class TreeHard_t_FagusSylvatica_1fe: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_2d: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_2f: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_2fb: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_2fc: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_2s: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_3d: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_3f: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_3fb: TreeHard
+{
+	
+};
+class TreeHard_t_FagusSylvatica_3s: TreeHard
+{
+	
+};
+class TreeHard_t_FraxinusExcelsior_2f: TreeHard
+{
+	
+};
+class TreeHard_t_FraxinusExcelsior_2s: TreeHard
+{
+	
+};
+class TreeHard_t_FraxinusExcelsior_3s: TreeHard
+{
+	
+};
+class TreeHard_t_juglansRegia_2s: TreeHard
+{
+	
+};
+class TreeHard_t_juglansRegia_3s: TreeHard
+{
+	
+};
+class TreeHard_t_LarixDecidua_2f: TreeHard
+{
+	
+};
+class TreeHard_t_LarixDecidua_2fb: TreeHard
+{
+	
+};
+class TreeHard_t_LarixDecidua_2s: TreeHard
+{
+	
+};
+class TreeHard_t_LarixDecidua_3f: TreeHard
+{
+	
+};
+class TreeHard_t_LarixDecidua_3fb: TreeHard
+{
+	
+};
+class TreeHard_t_naked_1s: TreeHard
+{
+	
+};
+class TreeHard_t_naked_2s: TreeHard
+{
+	
+};
+class TreeHard_t_piceaabies_2d: TreeHard
+{
+	
+};
+class TreeHard_t_PiceaAbies_2f: TreeHard
+{
+	
+};
+class TreeHard_t_PiceaAbies_2fb: TreeHard
+{
+	
+};
+class TreeHard_t_PiceaAbies_2s: TreeHard
+{
+	
+};
+//class TreeHard_t_PiceaAbies_2s_xmas: TreeHard{};
+class TreeHard_t_piceaabies_3d: TreeHard
+{
+	
+};
+class TreeHard_t_PiceaAbies_3f: TreeHard
+{
+	
+};
+class TreeHard_t_PiceaAbies_3f_Trail_B: TreeHard_t_PiceaAbies_3f{};
+class TreeHard_t_PiceaAbies_3f_Trail_G: TreeHard_t_PiceaAbies_3f{};
+class TreeHard_t_PiceaAbies_3f_Trail_R: TreeHard_t_PiceaAbies_3f{};
+class TreeHard_t_PiceaAbies_3f_Trail_Y: TreeHard_t_PiceaAbies_3f{};
+class TreeHard_t_PiceaAbies_3s: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_2f: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_2fb: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_2s: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_2sb: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_3d: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_3f: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_3fb: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_3fc: TreeHard
+{
+	
+};
+class TreeHard_t_PinusSylvestris_3s: TreeHard
+{
+	
+};
+class TreeHard_t_populusAlba_2s: TreeHard
+{
+	
+};
+class TreeHard_t_populusAlba_3s: TreeHard
+{
+	
+};
+class TreeHard_t_populusNigra_3s: TreeHard
+{
+	
+};
+class TreeHard_t_prunusDomestica_2s: TreeHard
+{
+	
+};
+class TreeHard_t_pyrusCommunis_3s: TreeHard
+{
+	
+};
+class TreeHard_t_pyrusCommunis_3sb: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_2d: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_2f: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_2s: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_2sb: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_2sc: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_3d: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_3f: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_3fb: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_3s: TreeHard
+{
+	
+};
+class TreeHard_t_quercusRobur_3sb: TreeHard
+{
+	
+};
+class TreeHard_t_robiniaPseudoacacia_2f: TreeHard
+{
+	
+};
+class TreeHard_t_robiniaPseudoacacia_2s: TreeHard
+{
+	
+};
+class TreeHard_t_robiniaPseudoacacia_3f: TreeHard
+{
+	
+};
+class TreeHard_t_salixAlba_2s: TreeHard
+{
+
+};
+class TreeHard_t_salixAlba_2sb: TreeHard
+{
+
+};
+class TreeHard_t_salixAlba_2sb_swamp: TreeHard
+{
+	
+};
+class TreeHard_t_sorbus_2s: TreeHard
+{
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase.c b/scripts/4_World/DayZ/Plugins/PluginBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..b0fe039ec15e3828dc135b83833f5b767f6541f3
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase.c
@@ -0,0 +1,35 @@
+class PluginBase
+{
+	void PluginBase();	
+	void ~PluginBase();
+	
+	void OnInit();	
+	void OnUpdate(float delta_time);	
+	void OnDestroy();
+	
+	void Log(string msg, string label)
+	{
+		Debug.Log(msg, GetModuleName(), "n/a", label, "n/a");
+	}
+	
+	string GetModuleName()
+	{
+		return ClassName();
+	}
+
+	typename GetModuleType()
+	{
+		return GetModuleName().ToType();
+	}
+}
+
+
+
+
+
+
+
+
+
+
+
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginAdminLog.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginAdminLog.c
new file mode 100644
index 0000000000000000000000000000000000000000..35ae9e21fb8aaeba7d57d7348683c035904ce666
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginAdminLog.c
@@ -0,0 +1,400 @@
+class PluginAdminLog extends PluginBase			// Class for admin log messages handled by script
+{
+	string 							m_PlayerName;
+	string							m_Pid;
+	vector 							m_Position; 
+	string							m_PlayerPrefix;
+	string 							m_PlayerPrefix2;
+	string							m_Message;
+	string							m_DisplayName;
+	string 							m_HitMessage;
+	float							m_Distance;
+	PlayerBase						m_Player;
+	PlayerBase						m_Source;
+	string							m_ItemInHands;
+	string 							m_PosArray[3];
+	int 							m_DotIndex;
+	PlayerStat<float>				m_StatWater;
+	PlayerStat<float>				m_StatEnergy;
+	BleedingSourcesManagerServer	m_BleedMgr;
+	// filters
+	protected int 					m_HitFilter;
+	protected int 					m_PlacementFilter;
+	protected int 					m_ActionsFilter;
+	protected int 					m_PlayerListFilter;
+	
+	ref Timer						m_Timer;
+	autoptr array<Man>				m_PlayerArray; 	
+	const int 						TIMER_PLAYERLIST = GetPlayerListTimer();
+	
+	static int GetPlayerListTimer()
+	{
+		return 300; // seconds
+	} 
+	
+	/* 
+		EXE side ADM log messages (not removable):
+		Connect / Disconnect
+		Chat
+		Player->Admin report (ingame chat: #toadmin <text>)	
+	*/
+	
+	void PluginAdminLog()
+	{
+		m_HitFilter = GetGame().ServerConfigGetInt("adminLogPlayerHitsOnly");  //  1 - log player hits only / 0 - log all hits ( animals/infected )
+		m_PlacementFilter = GetGame().ServerConfigGetInt("adminLogPlacement"); //  1 - log placement ( traps, tents )
+		m_ActionsFilter = GetGame().ServerConfigGetInt("adminLogBuildActions"); //  1 - log basebuilding actions ( build, dismantle, destroy )
+		m_PlayerListFilter = GetGame().ServerConfigGetInt("adminLogPlayerList"); // 1 - log periodic player list with position every 5 minutes
+		
+		m_PlayerArray = new array<Man>;
+		
+		if ( m_PlayerListFilter == 1 )
+		{
+			m_Timer = new Timer();
+			m_Timer.Run( TIMER_PLAYERLIST , this, "PlayerList", NULL, true );
+		}
+	}
+	
+	void ~PluginAdminLog()
+	{
+	}
+			
+	void LogPrint( string message )
+	{
+		GetGame().AdminLog( message );
+	}
+			
+	string GetPlayerPrefix( PlayerBase player, PlayerIdentity identity )  // player name + id + position prefix for log prints
+	{	
+		
+		m_Position = player.GetPosition();
+		m_PosArray[3] = { m_Position[0].ToString(), m_Position[2].ToString(), m_Position[1].ToString() };
+		
+		for ( int i = 0; i < 3; i++ )	// trim position precision
+		{
+			m_DotIndex = m_PosArray[i].IndexOf(".");
+			if ( m_DotIndex != -1 )
+			{
+			m_PosArray[i] = m_PosArray[i].Substring( 0, m_DotIndex + 2 );
+			}
+		}
+		
+		if ( identity ) 	// return partial message even if it fails to fetch identity 
+		{
+			//return "Player \"" + "Unknown/Dead Entity" + "\" (id=" + "Unknown" + " pos=<" +  m_PosArray[0] + ", " + m_PosArray[1] + ", " + m_PosArray[2] + ">)";
+			m_PlayerName = "\"" + identity.GetName() + "\"";
+			m_Pid = identity.GetId();
+		}
+		else
+		{
+			m_PlayerName = player.GetCachedName();
+			m_Pid = player.GetCachedID();
+		}
+		
+		
+		if ( !player.IsAlive() )
+		{
+		 	m_PlayerName = m_PlayerName + " (DEAD)"; 
+		}
+		
+		return "Player " + m_PlayerName + " (id=" + m_Pid + " pos=<" +  m_PosArray[0] + ", " + m_PosArray[1] + ", " + m_PosArray[2] + ">)";
+	}
+	
+	string GetHitMessage( TotalDamageResult damageResult, int component, string zone, string ammo) 
+	{	
+		if ( damageResult )	
+		{
+			float dmg = damageResult.GetHighestDamage("Health");
+			return " into " + zone + "(" + component.ToString() + ") for " + dmg.ToString() + " damage (" + ammo + ")";
+		}
+		else 				// block
+		{
+			return " into Block" + "(" + component.ToString() + ") for 0 damage ";
+		}
+	}
+		
+	void PlayerKilled( PlayerBase player, Object source )  // PlayerBase.c   
+	{
+		
+		if (!player || !source) 
+		{
+	        LogPrint("DEBUG: PlayerKilled() player/source does not exist");
+	        return;
+    	}
+		
+		PlayerBase playerSource = PlayerBase.Cast( EntityAI.Cast( source ).GetHierarchyParent() );	
+		if (!playerSource)
+		{
+			playerSource = PlayerBase.Cast( source );	
+		}
+		
+		string playerPrefix, playerPrefix2;
+		if (playerSource)
+		{
+			playerPrefix2 = GetPlayerPrefix( playerSource ,  playerSource.GetIdentity() );
+		}
+		
+		playerPrefix = GetPlayerPrefix( player , player.GetIdentity() );
+		if (player == source)	// deaths not caused by another object (starvation, dehydration)
+		{
+			m_StatWater = player.GetStatWater();
+			m_StatEnergy = player.GetStatEnergy();
+			m_BleedMgr = player.GetBleedingManagerServer();
+			
+			if ( m_StatWater && m_StatEnergy && m_BleedMgr )
+			{
+				LogPrint( playerPrefix + " died. Stats> Water: " + m_StatWater.Get().ToString() + " Energy: " + m_StatEnergy.Get().ToString() + " Bleed sources: " + m_BleedMgr.GetBleedingSourcesCount().ToString() );
+			}
+			else if ( m_StatWater && m_StatEnergy && !m_BleedMgr )
+			{
+				LogPrint( playerPrefix + " died. Stats> Water: " + m_StatWater.Get().ToString() + " Energy: " + m_StatEnergy.Get().ToString() );
+			}
+			else
+			{
+				LogPrint( playerPrefix + " died. Stats> could not fetch");
+			}
+		}
+		else if (source.IsWeapon() || source.IsMeleeWeapon())  // player
+		{			
+			
+			if (source.IsMeleeWeapon())
+			{	
+				LogPrint( playerPrefix + " killed by " + playerPrefix2 + " with " + source.GetDisplayName() );	
+			}
+			else
+			{
+				m_Distance = vector.Distance( player.GetPosition(), playerSource.GetPosition() );
+				LogPrint( playerPrefix + " killed by " + playerPrefix2 + " with " + source.GetDisplayName() + " from " + m_Distance + " meters " );
+			}
+		}
+		else
+		{
+			if (playerSource)
+			{
+				//fists
+				LogPrint( playerPrefix + " killed by " + playerPrefix2 + " with (MeleeFist)" );	
+			}
+			else
+			{
+				//rest, Animals, Zombies
+				LogPrint( playerPrefix + " killed by " + source.GetType());
+			}
+			
+		}
+	}
+		
+	void PlayerHitBy( TotalDamageResult damageResult, int damageType, PlayerBase player, EntityAI source, int component, string dmgZone, string ammo ) // PlayerBase.c 
+	{
+		if ( player && source )		
+		{
+			string playerPrefix = GetPlayerPrefix( player ,  player.GetIdentity() ) + "[HP: " + player.GetHealth().ToString() + "]";
+			string playerPrefix2;
+			m_HitMessage = GetHitMessage( damageResult, component, dmgZone, ammo );
+			PlayerBase playerSource;
+			
+			if ( source.IsPlayer() )// Fists
+				playerSource = PlayerBase.Cast( source );
+			else
+				playerSource = PlayerBase.Cast( source.GetHierarchyParent() );
+			
+			if (playerSource)
+				playerPrefix2 = GetPlayerPrefix( playerSource ,  playerSource.GetIdentity() );
+			
+			switch ( damageType )
+			{
+				case DamageType.CLOSE_COMBAT:	// Player melee, animals, infected 
+				
+					if ( m_HitFilter != 1 && ( source.IsZombie() || source.IsAnimal() ) )  // Infected & Animals
+					{
+						m_DisplayName = source.GetDisplayName();
+												
+						LogPrint( playerPrefix + " hit by " + m_DisplayName + m_HitMessage );	
+					}			
+					else if (source.IsPlayer())// Fists
+					{
+						LogPrint( playerPrefix + " hit by " + playerPrefix2 + m_HitMessage );
+					}
+					else if ( playerSource && (source.IsMeleeWeapon() || source.IsWeapon()))			// Melee weapons
+					{				
+						m_ItemInHands = source.GetDisplayName();
+							
+						LogPrint( playerPrefix + " hit by " + playerPrefix2 + m_HitMessage + " with " + m_ItemInHands );				
+					}
+					else
+					{
+						m_DisplayName = source.GetType();
+					
+						LogPrint( playerPrefix + " hit by " + m_DisplayName + m_HitMessage );					
+					} 
+					break;
+				
+				case DamageType.FIRE_ARM:	// Player ranged
+				
+					if ( source.IsWeapon() && playerSource )
+					{
+						m_ItemInHands = source.GetDisplayName();				
+						m_Distance = vector.Distance( player.GetPosition(), playerSource.GetPosition() );
+					
+						LogPrint( playerPrefix + " hit by " + playerPrefix2 + m_HitMessage + " with " + m_ItemInHands + " from " + m_Distance + " meters ");
+					}
+					else 
+					{
+						m_DisplayName = source.GetType();
+					
+						LogPrint( playerPrefix + " hit by " + m_DisplayName + m_HitMessage );			
+					}
+					break;
+				
+				case DamageType.EXPLOSION:	// Explosion
+				
+					LogPrint( playerPrefix + " hit by explosion (" + ammo + ")" );
+					break;
+						
+				case DamageType.STUN: 		// unused atm
+				
+					LogPrint( playerPrefix + " stunned by " + ammo );
+					break;
+						
+				case DamageType.CUSTOM:		// Others (Vehicle hit, fall, fireplace, barbed wire ...)
+					float globalHealthDamage = damageResult.GetDamage("", "Health");
+					if (ammo == DayZPlayerImplementFallDamage.FALL_DAMAGE_AMMO_HEALTH || ammo == DayZPlayerImplementFallDamage.FALL_DAMAGE_AMMO_SHOCK || ammo == DayZPlayerImplementFallDamage.FALL_DAMAGE_AMMO_HEALTH_OTHER_ATTACHMENTS)
+					{
+						if (globalHealthDamage > 0.0)
+							LogPrint(playerPrefix + " hit by " + ammo);	
+					}
+					else if ( source.GetType() == "AreaDamageManager" )  
+					{
+						EntityAI parent = EntityAI.Cast( source );
+						if ( parent )
+						{
+							LogPrint( playerPrefix + " hit by " + parent.GetType() + " with " + ammo );	
+						}
+					}
+					else
+					{
+						m_DisplayName = source.GetType();
+										
+						LogPrint( playerPrefix + " hit by " + m_DisplayName + " with " + ammo );
+					}
+					break;
+											
+				default:
+				
+					LogPrint("DEBUG: PlayerHitBy() unknown damageType: " + ammo );
+					break;
+			}
+		}
+		else
+		{
+			LogPrint("DEBUG: player/source does not exist");
+		}
+	}
+	
+	void UnconStart( PlayerBase player )	//  PlayerBase.c  
+	{
+		m_PlayerPrefix = GetPlayerPrefix( player ,  player.GetIdentity() );
+		
+		LogPrint( m_PlayerPrefix + " is unconscious" );
+	}
+	
+	void UnconStop( PlayerBase player ) //  PlayerBase.c 
+	{	
+		if ( player.IsAlive() ) 	// Do not log uncon stop for dead players
+		{
+			m_PlayerPrefix = GetPlayerPrefix( player ,  player.GetIdentity() );
+			
+			LogPrint( m_PlayerPrefix + " regained consciousness" );		
+		}
+	}
+		
+	void OnPlacementComplete( Man player, ItemBase item ) // ItemBase.c
+	{
+		if ( m_PlacementFilter == 1 )
+		{		
+			m_Source = PlayerBase.Cast( player ); 
+			m_PlayerPrefix = GetPlayerPrefix( m_Source , m_Source.GetIdentity() );		
+			m_DisplayName = item.GetDisplayName();
+			
+			if ( m_DisplayName == "" )
+			{
+				LogPrint( m_PlayerPrefix + " placed unknown object" );
+			} 
+			else
+			{
+				LogPrint( m_PlayerPrefix + " placed " + m_DisplayName );
+			}
+		}
+	}
+	
+	void OnContinouousAction( ActionData action_data )	// ActionContinouousBase.c
+	{
+		if ( m_ActionsFilter == 1 )
+		{						
+			m_Message = action_data.m_Action.GetAdminLogMessage(action_data);
+			
+			if(m_Message == "")
+				return;
+			
+			m_PlayerPrefix = GetPlayerPrefix( action_data.m_Player , action_data.m_Player.GetIdentity() );
+			
+			LogPrint( m_PlayerPrefix + m_Message );
+		}	
+	}
+	
+	void Suicide( PlayerBase player )  // EmoteManager.c 
+	{
+		m_PlayerPrefix = GetPlayerPrefix( player ,  player.GetIdentity() );
+		
+		LogPrint( m_PlayerPrefix + " committed suicide" );
+	}
+	
+	void BleedingOut( PlayerBase player )  // Bleeding.c
+	{
+		m_PlayerPrefix = GetPlayerPrefix( player ,  player.GetIdentity() );
+		
+		LogPrint( m_PlayerPrefix + " bled out" );
+	}
+	
+	//"top" == 'true' for flag all the way at the top, 'false' for all the way at the bottom
+	void TotemFlagChange(bool top, notnull PlayerBase player, notnull EntityAI totem)
+	{
+		if (m_ActionsFilter !=1)
+			return;
+
+		string prefix = GetPlayerPrefix(player, player.GetIdentity());
+		string flagType = totem.FindAttachmentBySlotName("Material_FPole_Flag").ClassName();
+		string action;
+		
+		if (top)
+			action = "raised ";
+		else
+			action = "lowered ";
+		
+		LogPrint( prefix + " has " + action + flagType + " on " + totem.ClassName() + " at " + totem.GetPosition());
+	}
+	
+	void PlayerList()
+	{
+		GetGame().GetPlayers( m_PlayerArray );
+		
+		if ( m_PlayerArray.Count() != 0 )
+		{	
+			LogPrint( "##### PlayerList log: " + m_PlayerArray.Count().ToString() + " players" );
+						
+			foreach ( Man player: m_PlayerArray )
+			{
+				m_Player = PlayerBase.Cast(player);
+				m_PlayerPrefix = GetPlayerPrefix( m_Player ,  m_Player.GetIdentity() );
+				
+				LogPrint( m_PlayerPrefix );							
+			}
+			
+			LogPrint( "#####" );
+		}
+	}
+	
+	void DirectAdminLogPrint(string str)
+	{
+		LogPrint(str);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginCameraTools.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginCameraTools.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ad479519cc5130821c60cbff9a4643fbfaed00b
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginCameraTools.c
@@ -0,0 +1,73 @@
+class PluginCameraTools extends PluginBase
+{
+	protected static PluginCameraTools m_Instance;
+ 	protected static bool m_IsOpen;
+	
+	override void OnInit()
+	{
+		m_Instance = this;
+	}
+	
+	static PluginCameraTools GetInstance()
+	{
+		return m_Instance;
+	}
+	
+	//===========================================
+	// ToggleCameraTools
+	//===========================================
+	void ToggleCameraTools()
+	{
+		if( !m_IsOpen )
+		{
+			GetGame().GetUIManager().EnterScriptedMenu( MENU_CAMERA_TOOLS, null );
+		}
+		else
+		{
+			GetGame().GetUIManager().Back();
+		}
+		m_IsOpen = !m_IsOpen;
+	}
+	
+	//===========================================
+	// CursorHide
+	//===========================================
+	void CursorHide()
+	{
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnHide();
+	}
+	
+	//===========================================
+	// CursorShow
+	//===========================================
+	void CursorShow()
+	{
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnShow();
+	}
+	
+	void Save()
+	{
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnKeyPress( null, 0, 0, KeyCode.KC_S );
+	}
+	
+	void PlayPause()
+	{
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnKeyPress( null, 0, 0, KeyCode.KC_P );
+	}
+	
+	void AddKeyframe()
+	{
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnKeyPress( null, 0, 0, KeyCode.KC_Q );
+	}
+	
+	void DeleteKeyframe()
+	{
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnKeyPress( null, 0, 0, KeyCode.KC_E );
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginConfigViewer.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginConfigViewer.c
new file mode 100644
index 0000000000000000000000000000000000000000..59c503e886f9d92b7fe63cc84b09c67766ab5241
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginConfigViewer.c
@@ -0,0 +1,577 @@
+class PluginConfigViewer extends PluginBase
+{
+	void PluginConfigViewer()
+	{
+	}
+	
+	string MakeTabs( int count, bool inheritance = false )
+	{
+		if ( count == 0 )
+		{
+			return "";
+		}
+
+		string tabs = "|--";
+		if ( inheritance )
+		{
+			tabs = "|<<";
+		}
+		
+		for ( int i = 0; i < count - 1; i++ )
+		{
+			tabs = "|  " + tabs;
+		}
+
+		return tabs;
+	}
+
+	string GetOnlyChildPath( string config_class_path, string class_path )
+	{
+		int config_class_path_len = config_class_path.Length();
+		int class_path_len = class_path.Length();
+		
+		if ( class_path_len > config_class_path_len )
+		{
+			int start = config_class_path_len;
+			int count = class_path_len - start;
+			
+			return class_path.Substring(start, count).Trim();
+		}
+		else
+		{
+			return "";
+		}
+	}
+
+	string GetBaseClassPath( string config_class_path, string class_path, string config_class )
+	{
+		if ( class_path == "" )
+		{
+			return "";
+		}
+		
+		int start = config_class_path.Length();
+		int count = class_path.Length() - start;
+		string class_path_without_config_class = GetOnlyChildPath( config_class_path, class_path );
+		
+		ref TStringArray full_path = new TStringArray;
+		GetGame().ConfigGetFullPath( config_class_path, full_path );
+		
+		if ( full_path.Count() > 1 && class_path_without_config_class != "" )
+		{
+			return GetBaseClassPathRecursive( config_class + " " + full_path.Get(1), class_path_without_config_class, config_class );
+		}
+		else
+		{
+			return "";
+		}
+	}
+
+	string GetBaseClassPathCombined( string child_path, string base_class )
+	{
+		int current = -1;
+		int last = 0;
+		
+		while ( true )
+		{
+			current = child_path.IndexOfFrom(last, " " );
+			if ( current > -1 )
+			{
+				last = current+1;
+			}
+			else
+			{
+				break;
+			}
+		}
+		
+		string result = child_path.Substring(0, last ) + base_class;
+		return result;
+	}
+
+	string GetBaseClassPathRecursive( string config_class_path, string class_path, string config_class )
+	{
+		if ( ContainsFirstClass(config_class_path, class_path) )
+		{
+			return config_class_path + " " + class_path;
+		}
+		else 
+		{
+			ref TStringArray full_path = new TStringArray;
+			GetGame().ConfigGetFullPath( config_class_path, full_path );
+		
+			if ( full_path.Count() > 1 )
+			{
+				return GetBaseClassPathRecursive( config_class + " " + full_path.Get(1), class_path, config_class );	
+			}
+			else
+			{
+				return "";
+			}
+		}
+	}
+
+	bool ContainsFirstClass( string config_class_path, string class_path )
+	{
+		int start = class_path.IndexOf(" ");
+		string name = class_path;
+		if ( start > -1 )
+		{
+			name = class_path.Substring(0, start );
+		}
+		
+		int cfg_class_count = GetGame().ConfigGetChildrenCount( config_class_path );
+		
+		for ( int i = 0; i < cfg_class_count; i++ )
+		{
+			string cfg_class_name = "";
+			GetGame().ConfigGetChildName( config_class_path, i, cfg_class_name );
+			
+			if ( cfg_class_name == name )
+			{
+				string full_name = config_class_path + " " + name;
+				int type = GetGame().ConfigGetType( full_name );
+				
+				if ( type == CT_CLASS )
+				{
+					return true;
+				}
+			}
+		}
+		
+		if ( start == -1 )
+		{
+			return false;
+		}
+		else
+		{
+			string new_name =  class_path.Substring(start + 1, class_path.Length() - (start + 1) );
+			return ContainsFirstClass( config_class_path + " " + name, new_name );
+		}
+	}
+
+	TStringArray GetConfigRecursive( string path, string name, string config_class_path, string config_class, local array<string> overridden, int depth = 0, local bool check_base_class_of_class = false )
+	{
+		string tabs = MakeTabs( depth + 1 );
+		string child_path = path;
+		int count = GetGame().ConfigGetChildrenCount( child_path );
+		int i = 0;
+	  
+		bool name_printed = false;
+	  
+		TStringArray result = new TStringArray;
+
+		for ( i = 0; i < count; i++ )
+		{
+			string child_name = "";
+			GetGame().ConfigGetChildName( child_path, i, child_name );
+			string c_child_path = child_path + " " + child_name;
+
+			string child_name_lower = child_name;
+			child_name_lower.ToLower();
+
+			if ( overridden.Find(child_name_lower) == -1 )
+			{
+				if ( !name_printed )
+				{
+					result.Insert( ":" + MakeTabs(depth, check_base_class_of_class) + "!" + name );
+					name_printed = true;
+				}
+				overridden.Insert( child_name_lower );
+					
+				int type = GetGame().ConfigGetType( c_child_path );
+				
+				if ( type != CT_CLASS )
+				{
+					if ( type != CT_ARRAY )
+					{
+						result.Insert( "-" + tabs + "!" + child_name + " = " + GetGame().ConfigGetTextOut(c_child_path) );
+					}
+					else
+					{
+						result.Insert( "-" + tabs + "!" + child_name + "[] = {" );
+						
+						TStringArray strs = new TStringArray;
+						GetGame().ConfigGetTextArray( c_child_path, strs );
+						string tabs_array = MakeTabs( depth + 2 );
+						int j;
+						for ( j = 0; j < strs.Count(); j++ )
+						{
+							result.Insert( "-" + tabs + "!" + child_name + "[]" + j.ToStringLen(6) + "~" + strs.Get(j) + "," );
+						}
+						
+						result.Insert( "-" + tabs + "!" + child_name + "[]" + j.ToStringLen(6) + "~}" );
+					}
+				}
+				else
+				{
+					array<string> overridden_sub = new array<string>;
+					
+					if ( GetGame().ConfigGetChildrenCount(c_child_path) > 0 )
+					{
+						TStringArray config1 = GetConfigRecursive( c_child_path, child_name, config_class_path, config_class, overridden_sub, depth + 1 );
+						result.InsertAll( config1 );
+					}
+					else 
+					{
+						result.Insert( ":" + tabs + "!" + child_name );
+					}
+					
+					string cc_child_path = c_child_path;
+					string c_config_class_path = config_class_path;
+					string c_child_name = child_name;
+					
+					int cc = 0;
+					
+					while ( true ) 
+					{
+						string base_class = "";
+					
+						GetGame().ConfigGetBaseName( cc_child_path, base_class );
+					
+						int start = c_config_class_path.Length() + 1;
+						int len = cc_child_path.Length();
+						len -= c_config_class_path.Length() + c_child_name.Length();
+						len -= 2;
+						
+						if ( base_class != "" )
+						{
+							string only_child_path = "";
+							if ( len < 0 )
+							{
+								only_child_path = base_class;
+							}
+							else
+							{
+								only_child_path = cc_child_path.Substring( start, len ) + " " + base_class;
+							}
+							
+							string c_base_child_path = GetBaseClassPathCombined( cc_child_path, base_class );
+							string base_class_path = GetBaseClassPath( c_config_class_path, c_base_child_path, config_class );
+							
+							if ( base_class_path != "" )
+							{
+								TStringArray config2 = GetConfigRecursive( base_class_path, base_class, base_class_path, config_class, overridden_sub, depth + 1, true );
+								result.InsertAll( config2 );
+							}
+							else
+							{
+								TStringArray config3 = GetConfigRecursive( base_class, base_class, base_class, config_class, overridden_sub, depth + 1, true );
+								result.InsertAll( config3 );
+								
+								break;
+							}
+							
+							cc_child_path = base_class_path;
+							c_child_name = base_class;
+							c_config_class_path = cc_child_path.Substring( 0, cc_child_path.Length() - only_child_path.Length() - 1);
+						}
+						else
+						{
+							break;
+						}
+					}
+				}
+			}
+		}
+
+		if ( name_printed )
+		{
+			result.Insert( ":" + MakeTabs(depth, check_base_class_of_class) + "#" + name );
+		}
+
+		if ( !check_base_class_of_class )
+		{
+			TStringArray full_path = new TStringArray;
+			GetGame().ConfigGetFullPath( child_path, full_path );
+
+			if ( full_path.Count() > 1 )
+			{
+				TStringArray config4 = GetConfigRecursive( config_class + " " + full_path.Get(1), full_path.Get(1), config_class + " " + full_path.Get(1), config_class, overridden, depth );
+				result.InsertAll( config4 );
+			}
+		}
+		else
+		{
+			string class_base_class = "";
+			GetGame().ConfigGetBaseName( child_path, class_base_class );
+			
+			if ( class_base_class != "" )
+			{
+				string base_child_path = GetBaseClassPathCombined( child_path, class_base_class );
+				string cc_base_child_path = GetBaseClassPath( config_class_path, base_child_path, config_class );
+
+				if ( cc_base_child_path != "" )
+				{
+					TStringArray config5 = GetConfigRecursive( cc_base_child_path, class_base_class, cc_base_child_path, config_class, overridden, depth, true );
+					result.InsertAll( config5 );
+				}
+				else
+				{
+					TStringArray config6 = GetConfigRecursive( class_base_class, class_base_class, class_base_class, config_class, overridden, depth, true );
+					result.InsertAll( config6 );
+				}
+			}
+		}
+
+		return result;
+	}
+
+	TStringArray GetConfig( string class_path, string filter_char )
+	{
+		int i;
+		TStringArray filtered = new TStringArray;
+		
+		if ( class_path != "" )
+		{
+			PluginDeveloper module_dev = PluginDeveloper.Cast( GetPlugin( PluginDeveloper ) );
+			
+			TStringArray path_nodes = new TStringArray;
+			class_path.Split( " ", path_nodes );
+			
+			if ( path_nodes.Count() >= 3 )
+			{
+				string c_class_path = path_nodes.Get(0) + " " + path_nodes.Get(1) + " " + path_nodes.Get(2);
+				
+				array<string> overridden = new array<string>;
+				string config_class = path_nodes.Get( 1 );
+				string class_name = path_nodes.Get( 2 );
+				
+				TStringArray result = GetConfigRecursive( c_class_path, class_name, c_class_path, config_class, overridden );
+				
+				TStringArray nested_start = new TStringArray;
+				TStringArray nested_end = new TStringArray;
+				TStringArray nested_inherited_start = new TStringArray;
+				TStringArray nested_inherited_end = new TStringArray;
+				string tabs = MakeTabs( 1 );
+				string tabs_inherited = MakeTabs( 1, true );
+				string check_tabs = MakeTabs( path_nodes.Count() - 1, true );
+				
+				nested_start.Insert( ":!" );
+				nested_end.Insert( ":#" );
+				nested_inherited_start.Insert( ":!" );
+				nested_inherited_end.Insert( ":#" );
+				
+				string last_node = filter_char + MakeTabs( nested_start.Count() ) + "!";
+				
+				if ( path_nodes.Count() == 3 )
+				{
+					last_node = filter_char + MakeTabs( 1 ) + "!";
+				}
+				else 
+				{
+					for ( i = 1; i < path_nodes.Count() - 2; i++ )
+					{
+						tabs = MakeTabs( i );
+						tabs_inherited = MakeTabs( i, true );
+						
+						string path_node = path_nodes.Get(i+2);
+						path_node.ToLower(  );
+						
+						nested_start.Insert( ":" + tabs + "!" + path_node );
+						nested_end.Insert( ":" + tabs + "#" + path_node );
+						nested_inherited_start.Insert( ":" + tabs_inherited + "!" + path_node );
+						nested_inherited_end.Insert( ":" + tabs_inherited + "#" + path_node );
+					}
+					
+					last_node = filter_char + MakeTabs( i ) + "!";
+				}
+				
+				int current_nest = 0;
+				
+				for ( i = 0; i < result.Count(); i++ )
+				{
+					string current = result.Get( i );
+					string current_lower = current;
+					current_lower.ToLower( );
+					
+					int len_current = current.Length();
+		
+					if ( current_nest < nested_start.Count() )
+					{
+						int len_start = nested_start.Get(current_nest).Length();
+							
+						if ( len_current >= len_start )
+						{
+							string prefix_start = current_lower;
+							
+							if ( current_nest == 0 )
+							{
+								prefix_start = current_lower.Substring( 0, len_start );
+							}
+								
+							if ( prefix_start == nested_start.Get(current_nest) || prefix_start == nested_inherited_start.Get(current_nest) )
+							{
+								current_nest++;
+								continue;
+							}
+						}
+					}
+							
+					if ( current_nest >= 1 )
+					{
+						int len_end = nested_end.Get(current_nest - 1).Length();
+							
+						if ( len_current >= len_end )
+						{
+							string prefix_end = current_lower;
+									
+							if ( current_nest == 0 )
+							{
+								prefix_start = current_lower.Substring( 0, len_start );
+							}		
+									
+							if ( prefix_end == nested_end.Get(current_nest - 1) || prefix_end == nested_inherited_end.Get(current_nest - 1) )
+							{
+								current_nest--;
+							}
+						}
+					}
+
+					if ( current_nest == nested_start.Count() )
+					{
+						string first_char = current.Substring( 0, 1 );
+							
+						if ( first_char == filter_char )
+						{
+							int bang_pos = current.IndexOf( "!" );
+								
+							if ( bang_pos > -1 )
+							{
+								int len_last_node = last_node.Length();
+								
+								if ( len_current >= len_last_node )
+								{
+									string prefix_current = current_lower.Substring( 0, len_last_node );
+
+									if ( last_node == prefix_current )
+									{
+										filtered.Insert( current.Substring(bang_pos + 1, current.Length() - (bang_pos + 1)) );
+									}
+								}
+							}
+						}
+					}		
+				}
+				
+				TStringArray without_duplications = new TStringArray;
+				
+				map<string, string> lowered = new map<string, string>;
+				
+				for ( i = 0; i < filtered.Count(); i++ )
+				{
+					string c = filtered.Get( i );
+					string lower_c = c;
+					lower_c.ToLower();
+					
+					if ( without_duplications.Find(lower_c) < 0 )
+					{
+						without_duplications.Insert( lower_c );
+						
+						if ( lower_c != c )
+						{
+							lowered.Set( lower_c, c );
+						}
+					}
+				}
+				
+				module_dev.SortStringArray( without_duplications );
+					
+				for ( i = 0; i < without_duplications.Count(); i++ )
+				{
+					string cc = without_duplications.Get( i );
+					
+					if ( lowered.Contains(cc) )
+					{
+						cc = lowered.Get( cc );
+					}
+					
+					int tilda_index = cc.IndexOf( "~" );
+					if ( tilda_index > -1 )
+					{
+						string spaces = "    ";
+						if ( cc.IndexOf( "~}" ) > -1 )
+						{
+							spaces = "";
+						}
+						cc = spaces + cc.Substring(tilda_index + 1, cc.Length() - (tilda_index + 1) );
+					}
+					
+					without_duplications.Set( i, cc );
+				}
+					
+				return without_duplications;
+			}
+			else if ( filter_char == ":" )
+			{
+				int cnt_config = GetGame().ConfigGetChildrenCount( class_path );
+				
+				for ( i = 0; i < cnt_config; i++ )
+				{
+					string config_name = "";
+					GetGame().ConfigGetChildName( class_path, i, config_name );
+					filtered.Insert( config_name );
+				}
+				
+				module_dev.SortStringArray( filtered );	
+			}
+		}
+		else if ( filter_char == ":" )
+		{
+			filtered.Insert( "configfile" );
+			filtered.Insert( "missionconfigfile" );
+		}
+			
+		return filtered;
+	}
+
+	TStringArray GetConfigVariables( string class_path )
+	{
+		return GetConfig( class_path, "-" );
+	}
+
+	TStringArray GetConfigHierarchy( string class_path )
+	{
+		return GetConfig( class_path, ":" );
+	}
+
+	string GetBaseClasses(string path, string item)
+	{
+		string adjustedPath = path;
+		bool run = true;
+		TStringArray resultArr = new TStringArray();
+		resultArr.Insert(item);
+		while (run)
+		{
+			//Print("checking for path:'" + adjustedPath +"'");
+			string baseClass = "";
+			run = GetGame().ConfigGetBaseName( adjustedPath, baseClass );
+			if (baseClass)
+			{
+				TStringArray strs = new TStringArray;
+				adjustedPath.Split(" ",strs);
+				strs.Remove(strs.Count() - 1);
+				strs.Insert(baseClass);
+			
+				adjustedPath = string.Join(" ", strs);
+				resultArr.Insert(baseClass);
+				if (adjustedPath == path)
+					break;
+			}
+			
+		}
+		string result;
+		resultArr.Invert();
+		foreach (int i, string str: resultArr)
+		{
+			if (i != 0)
+				result += " >> " + str;
+			else
+				result += str;
+		}
+			
+		return result;
+	}
+
+
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayZCreatureAIDebug.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayZCreatureAIDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..0ee4c7df060de3e20d80353e42e3a520ffb0b8d9
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayZCreatureAIDebug.c
@@ -0,0 +1,944 @@
+typedef Param4<float, string, int, string> 	DayZCreatureAnimScriptDebugAnimEventData;
+typedef Param1<string> 						DayZCreatureAnimScriptDebugAnimPredictionData;
+typedef Param1<string> 						DayZCreatureAnimScriptDebugAnimTagData;
+
+class DayZCreatureAnimScriptDebug
+{		
+	proto native void 	SetCreature(DayZCreature creature);
+
+	proto native int 	GetVariableCount();
+	proto native owned string GetVariableName(int index);
+	proto native int 	GetVariableType(int index);
+	proto native int 	GetVariableInt(int index);
+	proto native float 	GetVariableFloat(int index);
+	proto native bool 	GetVariableBool(int index);
+	
+	proto native int 	SetVariableInt(int index, int value);
+	proto native float 	SetVariableFloat(int index, float value);
+	proto native bool 	SetVariableBool(int index, bool value);
+		
+	proto native int 	GetCommandCount();
+	proto native owned string GetCommandName(int index);
+	proto native int 	GetCommandID(int index);
+
+	proto native void 	ActivateCommand(int index, int userInt, float userFloat);
+	
+	const int 														m_iMaxAnimEventsCount = 50;
+	ref array<string> 												m_EventsFilter = new array<string>;
+	
+	ref array<ref DayZCreatureAnimScriptDebugAnimEventData>			m_AnimEvents = new array<ref DayZCreatureAnimScriptDebugAnimEventData>;
+	ref array<ref DayZCreatureAnimScriptDebugAnimPredictionData>	m_AnimPredictions = new array<ref DayZCreatureAnimScriptDebugAnimPredictionData>;
+	ref array<ref DayZCreatureAnimScriptDebugAnimTagData>			m_AnimTags = new array<ref DayZCreatureAnimScriptDebugAnimTagData>;
+	
+	void OnAnimationEventsStart()
+	{
+		m_AnimPredictions.Clear();
+		m_AnimTags.Clear();
+	}
+
+	void OnAnimationEvent(string evType, int userInt, string userString)
+	{
+		if (m_EventsFilter.Find(evType) != -1)
+		{
+			return;
+		}
+		
+		m_AnimEvents.InsertAt(new DayZCreatureAnimScriptDebugAnimEventData(GetWorldTime(), evType, userInt, userString), 0);
+		
+		if (m_AnimEvents.Count() > m_iMaxAnimEventsCount)
+		{
+			m_AnimEvents.Remove(m_AnimEvents.Count() - 1);
+		}
+	}
+	
+	void OnAnimationPrediction(string predName)
+	{
+		m_AnimPredictions.Insert(new DayZCreatureAnimScriptDebugAnimPredictionData(predName));
+	}
+	
+	void OnAnimationTag(string tagName)
+	{
+		m_AnimTags.Insert(new DayZCreatureAnimScriptDebugAnimTagData(tagName));
+	}
+}
+
+enum PluginDayZCreatureAIDebugSyncMessageType
+{
+	INIT_DEBUG_OBJECT,
+	RELEASE_DEBUG_OBJECT,
+	SET_VALUE_INT,
+	SET_VALUE_FLOAT,
+	SET_VALUE_BOOL,
+	ACTIVATE_COMMAND,
+	ENABLE_AI,
+	DISABLE_AI,
+	COUNT
+}
+
+class PluginDayZCreatureAIDebug extends PluginBase
+{
+	int 							m_iDebugMenu = -1;
+	
+	DayZCreatureAI					m_DebugEntity = NULL;
+	string							m_sDebugEntityName = "";
+	ref DayZCreatureAnimScriptDebug m_EntityAnimDbg = NULL;
+	
+	ref Timer						m_TickTimer;
+	bool 							m_IsActive	= false;
+	bool 							m_ShowDbgUI = false;
+	
+	bool							m_bIsCaptureMode = false;
+	bool							m_bEditMode = false;
+	bool							m_bAIEnabled = true;
+	bool							m_bShowAnimEvents = false;
+	
+	bool							m_bBulkSet = false;
+	ref	array<bool>					m_SetVariableCheckStates = new array<bool>;
+	ref	array<bool>					m_SetCommandCheckStates = new array<bool>;
+	
+	ref array<ref Param> 			m_SyncMessages = new array<ref Param>;
+
+	void PluginDayZCreatureAIDebug()
+	{
+	}
+	
+	void ~PluginDayZCreatureAIDebug()
+	{
+	}
+
+	override void OnInit()
+	{
+	}
+	
+	override void OnDestroy()
+	{
+	}
+	
+	void CheckShowMode()
+	{
+		int	actMenuValue = DiagMenu.GetEngineValue(DayZCreatureAIConstants.DEBUG_SHOWDEBUGPLUGIN);
+		if (actMenuValue != m_iDebugMenu)
+		{
+			SetDebugShowMode(actMenuValue);
+			m_iDebugMenu = actMenuValue;
+		}
+	}	
+	
+	override void OnUpdate(float delta_time)
+	{
+		if (!GetGame().IsDedicatedServer())
+		{
+			CheckShowMode();
+		}
+	}
+	
+	string GetStrValue(int index)
+	{
+		string strVal;
+		switch (m_EntityAnimDbg.GetVariableType(index))
+		{
+			case DayZCreatureAnimScriptDebugVarType.INT:
+				int valInt = m_EntityAnimDbg.GetVariableInt(index);
+				strVal = valInt.ToString();
+				break;
+			case DayZCreatureAnimScriptDebugVarType.FLOAT:
+				float valFloat = m_EntityAnimDbg.GetVariableFloat(index);
+				strVal = valFloat.ToString();
+				break;
+			case DayZCreatureAnimScriptDebugVarType.BOOL:
+				bool valBool = m_EntityAnimDbg.GetVariableBool(index);
+				if (valBool)
+				{
+					strVal = "true";
+				}
+				else
+				{
+					strVal = "false";
+				}
+				break;
+			default:
+				strVal = "unk";
+		}
+		return strVal;
+	}
+
+	string GetStrValueType(int index)
+	{
+		string strValType;
+		switch (m_EntityAnimDbg.GetVariableType(index))
+		{
+			case DayZCreatureAnimScriptDebugVarType.INT:
+				strValType = "int";
+				break;
+			case DayZCreatureAnimScriptDebugVarType.FLOAT:
+				strValType = "float";
+				break;
+			case DayZCreatureAnimScriptDebugVarType.BOOL:
+				strValType = "bool";
+				break;
+			default:
+				strValType = "unk";
+		}
+		
+		return strValType;
+	}
+	
+	void InitDebugObject(Object obj)
+	{
+		m_EntityAnimDbg = new DayZCreatureAnimScriptDebug();
+		m_EntityAnimDbg.SetCreature( DayZCreature.Cast( obj ) );
+		
+		m_DebugEntity = DayZCreatureAI.Cast( obj );
+		m_sDebugEntityName = obj.GetType();
+		
+
+		int varCount = m_EntityAnimDbg.GetVariableCount();
+		int cmdCount = m_EntityAnimDbg.GetCommandCount();
+		int toAddCount = 0;
+		
+		if (m_SetVariableCheckStates.Count() < varCount)
+		{
+			toAddCount = varCount - m_SetVariableCheckStates.Count();
+			for (int idxVar = 0; idxVar < toAddCount; idxVar++)
+			{
+				m_SetVariableCheckStates.Insert(false);
+			}
+		}
+			
+		if (m_SetCommandCheckStates.Count() < cmdCount)
+		{
+			toAddCount = cmdCount - m_SetCommandCheckStates.Count();
+			for (int idxCmd = 0; idxCmd < toAddCount; idxCmd++)
+			{
+				m_SetCommandCheckStates.Insert(false);
+			}
+		}
+	}
+	
+	void ReleaseDebugObject()
+	{
+		m_DebugEntity = NULL;
+		m_EntityAnimDbg = NULL;
+		m_sDebugEntityName = "";
+		
+		m_SetVariableCheckStates.Clear();
+		m_SetCommandCheckStates.Clear();
+	}
+	
+	void SetValueInt(int index, int value)
+	{
+		m_EntityAnimDbg.SetVariableInt(index, value);
+	}
+	
+	void SetValueFloat(int index, float value)
+	{
+		m_EntityAnimDbg.SetVariableFloat(index, value);
+	}
+	
+	void SetValueBool(int index, bool value)
+	{
+		m_EntityAnimDbg.SetVariableBool(index, value);
+	}
+	
+	void ActivateCommand(int commandIdx, int userInt, float userFloat)
+	{
+		int commandId = m_EntityAnimDbg.GetCommandID(commandIdx);
+		m_EntityAnimDbg.ActivateCommand(commandId, userInt, userFloat);
+	}
+	
+	void EnableAI(bool enable)
+	{
+		if (m_DebugEntity.IsInherited(DayZCreatureAI))
+		{
+			DayZCreatureAI creatureAI = m_DebugEntity;
+			if (enable)
+			{
+				#ifdef DIAG_DEVELOPER
+				creatureAI.DebugRestoreAIControl();
+				#endif
+			}
+			else
+			{
+				#ifdef DIAG_DEVELOPER
+				creatureAI.DebugDisableAIControl();		
+				#endif
+			}			
+		}
+	}
+	
+	DayZCreatureAnimScriptDebugVarType GetVariableType(int index)
+	{
+		return m_EntityAnimDbg.GetVariableType(index);
+	}
+	
+	void OnGUI_Variables()
+	{
+		int varCount = m_EntityAnimDbg.GetVariableCount();
+		for (int i=0; i < varCount; i++)
+		{
+			DbgUI.BeginCleanupScope();
+			DbgUI.Text(m_EntityAnimDbg.GetVariableName(i) + ": " + GetStrValue(i));
+			DbgUI.EndCleanupScope();
+		}
+	}
+	
+	void OnGUI_VariablesEdit()
+	{
+		const int INPUT_BOX_SIZE = 35;
+		
+		DbgUI.PushID_Str("VariablesEdit");
+		
+		int varCount = m_EntityAnimDbg.GetVariableCount();
+		for (int i=0; i < varCount; i++)
+		{
+			DbgUI.BeginCleanupScope();
+			
+			DbgUI.PushID_Int(i);
+			
+			bool result;
+			DbgUI.Check("", result);
+			m_SetVariableCheckStates[i] = result;
+
+			DbgUI.SameLine();			
+			bool setButtonPressed = DbgUI.Button("Set");
+			
+			DbgUI.SameLine();
+			
+			string strUserVal;
+			DbgUI.InputText(GetStrValueType(i), strUserVal, INPUT_BOX_SIZE);
+			
+			DbgUI.SameLine();
+			DbgUI.Text(m_EntityAnimDbg.GetVariableName(i));
+			
+			if (setButtonPressed || (m_bBulkSet && m_SetVariableCheckStates[i]))
+			{
+				GUIAction_SetValue(i, strUserVal);
+			}
+			
+			DbgUI.PopID();
+			
+			DbgUI.EndCleanupScope();
+		}
+		
+		DbgUI.PopID();
+	}
+	
+	void OnGUI_CommandsEdit()
+	{
+		const int INPUT_BOX_SIZE = 35;
+
+		DbgUI.PushID_Str("CommandsEdit");
+		int cmdCount = m_EntityAnimDbg.GetCommandCount();
+		for (int i=0; i < cmdCount; i++)
+		{
+			DbgUI.BeginCleanupScope();
+
+			DbgUI.PushID_Int(i);
+			
+			bool result;
+			DbgUI.Check("", result);
+			m_SetCommandCheckStates[i] = result;		
+
+			DbgUI.SameLine();
+			bool setButtonPressed = DbgUI.Button("Set");
+			
+			DbgUI.SameLine();			
+			string strUserInt;
+			DbgUI.InputText("int", strUserInt, INPUT_BOX_SIZE);
+			
+			DbgUI.SameLine();
+			string strUserFloat;
+			DbgUI.InputText("float", strUserFloat, INPUT_BOX_SIZE);			
+
+			DbgUI.SameLine();
+			DbgUI.Text(m_EntityAnimDbg.GetCommandName(i) + "[" + m_EntityAnimDbg.GetCommandID(i) + "]");
+			
+			if (setButtonPressed || (m_bBulkSet && m_SetCommandCheckStates[i]))
+			{
+				GUIAction_ActivateCommand(i, strUserInt.ToInt(), strUserFloat.ToFloat());
+			}
+			
+			DbgUI.PopID();
+			
+			DbgUI.EndCleanupScope();
+		}
+		
+		DbgUI.PopID();
+	}
+	
+	void OnGUI_AIControlEdit()
+	{
+		bool buttonPressed = false;
+		if (m_bAIEnabled)
+		{
+			buttonPressed = DbgUI.Button("Disable AI");
+		}
+		else
+		{
+			buttonPressed = DbgUI.Button("Enable AI");
+		}
+		
+		if (buttonPressed)
+		{
+			m_bAIEnabled = !m_bAIEnabled;
+			
+			GUIAction_EnableAI(m_bAIEnabled);
+		}
+	}
+	
+	void OnGUI_BulkSet()
+	{
+		m_bBulkSet = false;
+		
+		if (DbgUI.Button("Bulk set"))
+		{
+			m_bBulkSet = true;			
+		}
+	}
+	
+	void OnGUI_AnimEvents()
+	{
+		DbgUI.PushID_Str("AnimEvents");
+		
+		const int panelMinSizeX = 350;
+
+		DbgUI.Panel("MinimumSize", panelMinSizeX, 1);
+		
+		string strTags;
+		for (int tagIdx = 0; tagIdx < m_EntityAnimDbg.m_AnimTags.Count(); ++tagIdx)
+		{
+			if (tagIdx != 0)
+				strTags += ", ";
+			
+			strTags += m_EntityAnimDbg.m_AnimTags[tagIdx].param1;
+		}
+		
+		string strPredictions;
+		for (int predIdx = 0; predIdx < m_EntityAnimDbg.m_AnimPredictions.Count(); ++predIdx)
+		{
+			if (predIdx != 0)
+				strPredictions += ", ";
+			
+			strPredictions += m_EntityAnimDbg.m_AnimPredictions[predIdx].param1;
+		}
+		
+		DbgUI.PushID_Str("AnimTagsDisplay");
+		DbgUI.Text(strTags);
+		DbgUI.PopID();
+		
+		DbgUI.PushID_Str("AnimPredictionsDisplay");
+		DbgUI.Text(strPredictions);
+		DbgUI.PopID();
+		
+		string strFilter;
+		DbgUI.InputText("Filter", strFilter, panelMinSizeX);
+
+		m_EntityAnimDbg.m_EventsFilter.Clear();
+		strFilter.Split(" ", m_EntityAnimDbg.m_EventsFilter);
+				
+		DbgUI.Button("TakeMyFocus");
+		
+		const int evDisplayCount = 15;
+		int evToDisplayCount = (int)Math.Min(m_EntityAnimDbg.m_AnimEvents.Count(), evDisplayCount);
+		
+		for (int evIdx = 0; evIdx < evToDisplayCount; ++evIdx)
+		{			
+			DbgUI.PushID_Int(evIdx);
+			if (m_EntityAnimDbg.m_AnimEvents[evIdx].param2.Length() > 0)
+			{
+				DbgUI.Text((m_EntityAnimDbg.m_AnimEvents[evIdx].param1 / 1000.0).ToString() + " - " + m_EntityAnimDbg.m_AnimEvents[evIdx].param2);
+			}
+			DbgUI.PopID();
+		}	
+		
+		DbgUI.PopID();
+	}
+	
+	void OnGUI(bool show)
+	{
+		const int windowPosX = 0;
+		const int windowPosY = 300;
+		const int mainPanelSizeX = 200;
+		const int mainPanelSizeY = 1;
+		const int margin = 10;
+		
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin("CretureAI debug", windowPosX, windowPosY);
+		if (show)
+		{
+			if (m_EntityAnimDbg == NULL)
+			{
+				if (m_bIsCaptureMode == true)
+				{
+					DbgUI.Text("Capturing...");	
+				}
+				else
+				{
+					if (DbgUI.Button("Capture"))
+					{
+						m_bIsCaptureMode = true;
+					}
+				}
+				
+				// Clear additional windows
+				DbgUI.Begin("CreatureAI EditMenu");
+				DbgUI.End();
+				
+				DbgUI.Begin("CreatureAI AnimEvents");
+				DbgUI.End();
+			}
+			else
+			{
+				DbgUI.Panel("MinimumSize", mainPanelSizeX, mainPanelSizeY);
+				
+				DbgUI.Text(m_sDebugEntityName);
+				DbgUI.SameLine();
+				bool btnReleasePressed = DbgUI.Button("Release");
+				
+				DbgUI.Check("Edit", m_bEditMode);
+				DbgUI.Check("ShowAnimEvents", m_bShowAnimEvents);
+				
+				#ifdef _DAYZ_CREATURE_DEBUG_SHADOW
+				if (!GetGame().IsMultiplayer())
+				{
+					DbgUI.SameLine();
+					if (DbgUI.Button("CreateShadow"))
+					{
+						GUIAction_CreateShadow();
+					}
+				}
+				#endif
+				
+				if (!GetGame().IsMultiplayer())
+				{
+					const int simLODInputSize = 20;
+					int simLOD;
+					DbgUI.InputInt("SimLOD", simLOD, simLODInputSize);
+					DbgUI.SameLine();
+					if (DbgUI.Button("UpdateSimulationPrecision"))
+					{
+						GUIAction_UpdateSimulationPrecision(simLOD);
+					}
+				}
+				
+				if (btnReleasePressed)
+				{
+					GUIAction_ReleaseDebugObject();
+				}
+				else
+				{
+					OnGUI_Variables();
+					DbgUI.Begin("CreatureAI EditMenu", windowPosX + mainPanelSizeX + margin, windowPosY);
+					if (m_bEditMode)
+					{						
+						OnGUI_AIControlEdit();
+						OnGUI_BulkSet();
+						OnGUI_VariablesEdit();
+						DbgUI.Spacer(20);
+						OnGUI_CommandsEdit();	
+					}	
+					DbgUI.End();
+					
+					DbgUI.Begin("CreatureAI AnimEvents", windowPosX + mainPanelSizeX + margin, windowPosY);
+					if (m_bShowAnimEvents)
+					{
+						OnGUI_AnimEvents();
+					}
+					DbgUI.End();
+				}
+			}
+		}
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+	
+	void OnGUITimer()
+	{
+		OnGUI(m_IsActive);
+		
+		if (GetGame().IsMultiplayer() && GetGame().IsClient())
+		{
+			SendSyncMessages();
+		}	
+	}
+	
+	void SetDebugShowMode(int mode)
+	{
+		switch (mode)
+		{
+			case 0:
+			{
+				Hide();
+			} break;
+			case 1:
+			{
+				Show();
+			} break;
+		}
+	}
+		
+	void Show()
+	{
+		m_IsActive = true;
+			
+		m_TickTimer = new Timer();
+		m_TickTimer.Run(0.1, this, "OnGUITimer", NULL, true);
+	}
+	
+	void Hide()
+	{
+		m_IsActive = false;
+		m_TickTimer = NULL;
+		OnGUI(false);
+	}
+	
+	void Event_OnClick()
+	{
+		if (m_IsActive == false)
+			return;
+		
+		const float MAX_RAYCAST_RANGE = 1000;
+		if (m_bIsCaptureMode)
+		{	
+			vector dir = GetGame().GetPointerDirection();
+			vector pos = GetGame().GetCurrentCameraPosition();		
+			
+			// Raycast
+			vector from = pos;
+			vector to = pos + (dir * MAX_RAYCAST_RANGE);
+			vector contact_pos;
+			vector contact_dir;
+			int contact_component;
+			set<Object> objects = new set<Object>;
+			
+			if (DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component, objects, NULL, GetGame().GetPlayer()))
+			{
+				for ( int i = 0; i < objects.Count(); i++ )
+				{
+					Object obj = objects.Get(i);
+					if (obj && obj.IsInherited(DayZCreature))
+					{
+						m_bIsCaptureMode = false;
+						GUIAction_InitDebugObject(obj);
+						return;
+					}
+				}
+			}
+		}
+	}
+	
+	///	
+	//! GUI actions
+	///
+	
+	void GUIAction_InitDebugObject(Object obj)
+	{
+		InitDebugObject(obj);
+		if (GetGame().IsMultiplayer())
+		{
+			SyncInitDebugObject(obj);
+		}
+	}
+
+	#ifdef _DAYZ_CREATURE_DEBUG_SHADOW
+	void GUIAction_CreateShadow()
+	{
+		auto shadowEntity = GetGame().CreateObject(m_sDebugEntityName, m_DebugEntity.GetPosition(), false, true);
+		m_DebugEntity.DebugSetShadow(shadowEntity);
+	}
+	#endif
+	
+	void GUIAction_UpdateSimulationPrecision(int simLOD)
+	{
+		m_DebugEntity.UpdateSimulationPrecision(simLOD);
+	}
+	
+	void GUIAction_ReleaseDebugObject()
+	{
+		ReleaseDebugObject();		
+		if (GetGame().IsMultiplayer())
+		{
+			SyncReleaseDebugObject();
+		}
+	}
+	
+	void GUIAction_SetValue(int index, string strVal)
+	{
+		switch (GetVariableType(index))
+		{
+			case DayZCreatureAnimScriptDebugVarType.INT:
+				int intValue = strVal.ToInt();
+				if (GetGame().IsMultiplayer())
+				{
+					SyncSetValueInt(index, intValue);
+				}
+				else
+				{
+					SetValueInt(index, intValue);
+				}
+				break;
+			case DayZCreatureAnimScriptDebugVarType.FLOAT:
+				float floatValue = strVal.ToFloat();
+				if (GetGame().IsMultiplayer())
+				{
+					SyncSetValueFloat(index, floatValue);
+				}
+				else
+				{
+					SetValueFloat(index, floatValue);
+				}
+				break;
+			case DayZCreatureAnimScriptDebugVarType.BOOL:
+				bool boolValue;
+				strVal.ToLower();
+				if (strVal.Contains("true"))
+				{
+					boolValue = true;
+				}
+				else if (strVal.Contains("false"))
+				{
+					boolValue = false;
+				}
+				else
+				{
+					boolValue = (bool)strVal.ToInt();
+				}
+			
+				if (GetGame().IsMultiplayer())
+				{
+					SyncSetValueBool(index, boolValue);
+				}
+				else
+				{
+					SetValueBool(index, boolValue);
+				}
+				break;
+		}
+	}
+	
+	void GUIAction_ActivateCommand(int commandIdx, int userInt, float userFloat)
+	{
+		if (GetGame().IsMultiplayer())
+		{
+			SyncActivateCommand(commandIdx, userInt, userFloat);
+		}
+		else
+		{
+			ActivateCommand(commandIdx, userInt, userFloat);	
+		}
+		
+	}
+	
+	void GUIAction_EnableAI(bool enable)
+	{
+		if (GetGame().IsMultiplayer())
+		{
+			SyncEnableAI(enable);
+		}
+		else
+		{
+			EnableAI(enable);
+		}		
+	}
+	
+	///
+	//! sync
+	///
+
+	void SendSyncMessages()
+	{
+		int count = m_SyncMessages.Count();
+		if (count > 0)
+		{
+			Param1<int> paramCount = new Param1<int>(count);
+			m_SyncMessages.InsertAt(paramCount, 0);
+			
+			GetGame().GetPlayer().RPC(ERPCs.DEV_RPC_PLUGIN_DZCREATURE_DEBUG, m_SyncMessages, true);
+			
+			m_SyncMessages.Clear();
+		}
+	}
+		
+	void OnRpc(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+		if (rpc_type == ERPCs.DEV_RPC_PLUGIN_DZCREATURE_DEBUG)
+		{
+			SyncReceiveMessage(ctx);
+		}
+	}	
+	
+	void SyncReceiveMessage(ParamsReadContext ctx)
+	{
+		Param1<int> count = new Param1<int>(0);
+		
+		if (ctx.Read(count))
+		{
+			Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.COUNT);
+			for (int i=0; i < count.param1; ++i)
+			{
+				if (ctx.Read(type))
+				{
+					switch (type.param1)
+					{
+						case PluginDayZCreatureAIDebugSyncMessageType.INIT_DEBUG_OBJECT:
+							SyncReceiveInitDebugObject(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.RELEASE_DEBUG_OBJECT:
+							SyncReceiveReleaseDebugObject(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.SET_VALUE_INT:
+							SyncReceiveValueInt(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.SET_VALUE_FLOAT:
+							SyncReceiveValueFloat(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.SET_VALUE_BOOL:
+							SyncReceiveValueBool(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.ACTIVATE_COMMAND:
+							SyncReceiveActivateCommand(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.ENABLE_AI:
+							SyncReceiveEnableAI(ctx);
+							break;
+						case PluginDayZCreatureAIDebugSyncMessageType.DISABLE_AI:
+							SyncReceiveDisableAI(ctx);
+							break;
+					}
+				}
+				type.param1 = PluginDayZCreatureAIDebugSyncMessageType.COUNT;
+			}
+		}
+	}
+	
+	void SyncInitDebugObject(Object obj)
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.INIT_DEBUG_OBJECT);		
+		Param1<Object> object = new Param1<Object>(obj);
+		
+		m_SyncMessages.Insert(type);
+		m_SyncMessages.Insert(object);
+	}
+	
+	void SyncReceiveInitDebugObject(ParamsReadContext ctx)
+	{
+		Param1<Object> object = new Param1<Object>(NULL);
+		if (ctx.Read(object))
+		{
+			InitDebugObject(object.param1);
+		}
+	}
+	
+	void SyncReleaseDebugObject()
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.RELEASE_DEBUG_OBJECT);
+		
+		m_SyncMessages.Insert(type);
+	}
+	
+	void SyncReceiveReleaseDebugObject(ParamsReadContext ctx)
+	{
+		ReleaseDebugObject();
+	}
+	
+	void SyncSetValueInt(int index, int value)
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.SET_VALUE_INT);		
+		Param2<int, int> paramValue = new Param2<int, int>(index, value);
+		
+		m_SyncMessages.Insert(type);
+		m_SyncMessages.Insert(paramValue);
+	}
+	
+	void SyncReceiveValueInt(ParamsReadContext ctx)
+	{
+		Param2<int, int> paramValue = new Param2<int, int>(-1, 0);
+		
+		if (ctx.Read(paramValue))
+		{
+			SetValueInt(paramValue.param1, paramValue.param2);
+		}
+	}
+	
+	void SyncSetValueFloat(int index, float value)
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.SET_VALUE_FLOAT);		
+		Param2<int, float> paramValue = new Param2<int, float>(index, value);
+		
+		m_SyncMessages.Insert(type);
+		m_SyncMessages.Insert(paramValue);
+	}
+	
+	void SyncReceiveValueFloat(ParamsReadContext ctx)
+	{
+		Param2<int, float> paramValue = new Param2<int, float>(-1, 0.0);
+		
+		if (ctx.Read(paramValue))
+		{
+			SetValueFloat(paramValue.param1, paramValue.param2);
+		}
+	}
+	
+	void SyncSetValueBool(int index, bool value)
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.SET_VALUE_BOOL);		
+		Param2<int, bool> paramValue = new Param2<int, bool>(index, value);
+		
+		m_SyncMessages.Insert(type);
+		m_SyncMessages.Insert(paramValue);
+	}
+	
+	void SyncReceiveValueBool(ParamsReadContext ctx)
+	{
+		Param2<int, bool> paramValue = new Param2<int, bool>(-1, false);
+		
+		if (ctx.Read(paramValue))
+		{
+			SetValueBool(paramValue.param1, paramValue.param2);
+		}
+	}
+	
+	void SyncActivateCommand(int commandIdx, int userInt, float userFloat)
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.ACTIVATE_COMMAND);
+		Param3<int, int, float> command = new Param3<int, int, float>(commandIdx, userInt, userFloat);
+		
+		m_SyncMessages.Insert(type);
+		m_SyncMessages.Insert(command);
+	}
+	
+	void SyncReceiveActivateCommand(ParamsReadContext ctx)
+	{
+		Param3<int, int, float> command = new Param3<int, int, float>(-1, 0, 0.0);
+		
+		if (ctx.Read(command))
+		{
+			ActivateCommand(command.param1, command.param2, command.param3);
+		}
+	}
+	
+	void SyncEnableAI(bool enable)
+	{
+		Param1<int> type = new Param1<int>(PluginDayZCreatureAIDebugSyncMessageType.COUNT);
+		if (enable)
+		{
+			type.param1 = PluginDayZCreatureAIDebugSyncMessageType.ENABLE_AI;
+		}
+		else
+		{
+			type.param1 = PluginDayZCreatureAIDebugSyncMessageType.DISABLE_AI;
+		}
+		
+		m_SyncMessages.Insert(type);
+	}
+		
+	void SyncReceiveEnableAI(ParamsReadContext ctx)
+	{
+		EnableAI(true);
+	}
+		
+	void SyncReceiveDisableAI(ParamsReadContext ctx)
+	{
+		EnableAI(false);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayZInfectedDebug.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayZInfectedDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..322b6fb5e5f30fb284c97a1a89dada515dbb876a
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayZInfectedDebug.c
@@ -0,0 +1,487 @@
+// *************************************************************************************
+// ! PluginDayZInfectedDebugUIHandler 
+// *************************************************************************************
+class PluginDayZInfectedDebugUIHandler extends ScriptedWidgetEventHandler
+{
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		return m_pPluginInfectedDebug.OnClick(w, x, y, button);
+	}
+
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		return m_pPluginInfectedDebug.OnChange(w, x, y, finished);
+	}
+
+	PluginDayZInfectedDebug		m_pPluginInfectedDebug;
+}
+
+// *************************************************************************************
+// ! PluginDayZInfectedDebugAttackDesc
+// *************************************************************************************
+class PluginDayZInfectedDebugAttackDesc
+{
+	void PluginDayZInfectedDebugAttackDesc(string pName, int pValue)
+	{
+		name = pName;
+		animValue = pValue;
+	}
+	
+	string name;
+	int animValue;
+}
+
+// *************************************************************************************
+// ! PluginDayZInfectedDebug  
+// *************************************************************************************
+class PluginDayZInfectedDebug extends PluginBase
+{
+	int m_CurrentMode = 0;
+	bool m_HasFocus = false;
+	bool m_IsActive = false;
+
+	//! main controls	
+	Widget 								m_MainWnd;
+	ButtonWidget						m_SpawnEntityButton;
+	ButtonWidget						m_CardMovementButton;
+	ButtonWidget						m_CardFightButton;
+	Widget								m_CardMovementFrame;
+	Widget								m_CardFightFrame;
+	TextWidget							m_StatusText;
+	
+	//! movement card
+	XComboBoxWidget 					m_StanceCB;
+	XComboBoxWidget 					m_MindStateCB;
+	EditBoxWidget						m_MovementSpeedEB;
+	
+	ButtonWidget						m_StartTurnButton;
+	XComboBoxWidget 					m_TurnTypeCB;
+	EditBoxWidget 						m_TurnDirectionEB;
+	
+	XComboBoxWidget 					m_VaultingCB;
+	ButtonWidget						m_StartVaultButton;
+	ButtonWidget						m_KnucleOutButton;
+	
+	XComboBoxWidget 					m_CrawlingTypeCB;
+	ButtonWidget						m_StartCrawlingButton;
+	
+	//! fight card
+	EditBoxWidget 						m_HitDirEB;
+	XComboBoxWidget 					m_HitTypeCB;
+	XComboBoxWidget 					m_HitBodyPartCB;
+	ButtonWidget						m_StartHitButton;
+
+	XComboBoxWidget 					m_DeathTypeCB;
+	ButtonWidget						m_StartDeathButton;
+
+	XComboBoxWidget 					m_AttackTypeCB;
+	XComboBoxWidget 					m_AttackDirCB;
+	ButtonWidget						m_StartAttackButton;
+	
+	//! controlled instance	
+	DayZInfected						m_ControlledInfected;
+	
+	//! command handler values
+	bool								m_CH_DoTurn = false;
+	bool								m_CH_DoVault = false;
+	bool								m_CH_DoKnucleOut = false;
+	bool								m_CH_GoToCrawl = false;
+	bool								m_CH_DoHit = false;
+	bool								m_CH_StartDeath = false;
+	bool								m_CH_DoAttack = false;
+	
+	ref PluginDayZInfectedDebugUIHandler m_pUIHandler;
+	ref array<ref PluginDayZInfectedDebugAttackDesc> m_AttackDescriptors = new array<ref PluginDayZInfectedDebugAttackDesc>;
+	
+	private ref array<Shape> m_DebugShapes = new array<Shape>();
+	
+	//! status refresh timer
+	ref Timer							m_TickTimer;
+
+	void PluginDayZInfectedDebug()
+	{
+		#ifndef NO_GUI
+		CreateModuleWidgets();
+		#endif
+	}
+	
+	void ~PluginDayZInfectedDebug()
+	{
+		#ifndef NO_GUI
+		DestroyModuleWidgets();
+		#endif		
+	}
+	
+	//!
+	void ToggleDebugWindowEvent()
+	{
+		m_CurrentMode++;
+		if (m_CurrentMode > 2)
+		{
+			m_CurrentMode = 0;
+		}
+
+		ToggleDebugWindowSetMode(m_CurrentMode);
+	}
+
+	//!
+	void ToggleDebugWindowSetMode(int pMode)
+	{
+		switch (pMode)
+		{
+		case 0:		Hide(); ReleaseFocus(); CleanupDebugShapes(m_DebugShapes);	break;
+		case 1:		Show(); ReleaseFocus();	break;
+		case 2:		Show(); CaptureFocus();	break;
+		}
+	}
+
+	//!
+	void 	CaptureFocus()
+	{
+		if (!m_HasFocus)
+		{
+			GetGame().GetInput().ChangeGameFocus(1);
+			GetGame().GetUIManager().ShowUICursor(true);
+			m_HasFocus = true;
+		}
+	}
+
+	//!
+	void	ReleaseFocus()
+	{
+		if (m_HasFocus)
+		{
+			GetGame().GetInput().ChangeGameFocus(-1);
+			GetGame().GetUIManager().ShowUICursor(false);
+			m_HasFocus = false;
+		}	
+	}
+
+	//!
+	void Show()
+	{
+		ShowWidgets(true);
+		m_IsActive = true;
+
+		GetUApi().ActivateExclude("menu");
+		GetUApi().UpdateControls();
+		
+		if (!m_TickTimer)
+		{
+			m_TickTimer = new Timer();
+			m_TickTimer.Run(0.1, this, "Tick", NULL, true);			
+		}
+	}
+
+	//!
+	void Hide()
+	{
+		ShowWidgets(false);
+		m_IsActive = false;
+		
+		GetUApi().UpdateControls();
+		
+		m_TickTimer = NULL;
+	}
+
+	//!
+	void ShowWidgets(bool show)
+	{
+		if(m_MainWnd) 
+		{
+			m_MainWnd.Show(show);
+		}
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		super.OnUpdate(delta_time);
+		
+		CleanupDebugShapes(m_DebugShapes);
+
+		if (m_IsActive)
+		{
+			if (!m_ControlledInfected)
+				return;
+		
+			m_DebugShapes.Insert(Debug.DrawSphere(m_ControlledInfected.GetPosition() + "0 2 0", 0.25, FadeColors.RED));	
+		}
+	}
+
+	//!
+	void CreateModuleWidgets()
+	{
+		if (!m_pUIHandler)
+		{
+			m_pUIHandler = new PluginDayZInfectedDebugUIHandler();
+			m_pUIHandler.m_pPluginInfectedDebug = this;
+		}
+
+		if (!m_MainWnd)
+		{
+			m_MainWnd = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_infecteddebug.layout");
+			m_MainWnd.SetHandler(m_pUIHandler);
+			m_MainWnd.Show(false);
+		}
+
+		//! main controls		
+		m_SpawnEntityButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("SpawnEntityButton") );
+		m_CardMovementButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("CardMovementButton") );
+		m_CardFightButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("CardFightButton") );
+		m_CardMovementFrame = m_MainWnd.FindAnyWidget("CardMovementFrame");
+		m_CardFightFrame = m_MainWnd.FindAnyWidget("CardFightFrame");
+		m_StatusText = TextWidget.Cast( m_MainWnd.FindAnyWidget("StatusText") );
+
+		//! movement card
+		m_StanceCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("StanceCB") );
+		m_MindStateCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("MindStateCB") );
+		m_MovementSpeedEB = EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("MovementSpeedEB") );
+		
+		m_StartTurnButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("StartTurnButton") );
+		m_TurnTypeCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("TurnTypeCB") );
+		m_TurnDirectionEB = EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("TurnDirectionEB") );
+		
+		m_VaultingCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("TurnTypeCB") );
+		m_StartVaultButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("StartVaultButton") );
+		m_KnucleOutButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("KnucleOutButton") );
+	
+		m_CrawlingTypeCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("TurnTypeCB") );
+		m_StartCrawlingButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("StartCrawlingButton") );
+		
+		//! fight card
+		m_HitDirEB = EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("HitDirEB") );
+		m_HitTypeCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("HitTypeCB") );
+		m_HitBodyPartCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("HitBodyPartCB") );
+		m_StartHitButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("StartHitButton") );
+		
+		m_DeathTypeCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("DeathTypeCB") );
+		m_StartDeathButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("StartDeathButton") );
+
+		m_AttackTypeCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("AttackTypeCB") );
+		m_AttackDirCB = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("AttackDirCB") );
+		m_StartAttackButton = ButtonWidget.Cast( m_MainWnd.FindAnyWidget("StartAttackButton") );
+		
+		//! fill some controls
+		InitAttacks();
+		
+		ShowCard(0);
+	}
+	
+	//!
+	void DestroyModuleWidgets()
+	{
+		delete m_MainWnd;
+	}
+	
+	//!
+	void ShowCard(int pCard)
+	{
+		m_CardMovementFrame.Show(pCard == 0);
+		m_CardFightFrame.Show(pCard == 1);
+	}
+
+	//! buttons clicks
+	bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_SpawnEntityButton)
+		{
+			ResetValues();
+			SpawnNewInfectedEntity();
+			return true;
+		}
+
+		if (w == m_CardMovementButton)
+		{
+			ShowCard(0);
+			return true;
+		}
+		else if (w == m_CardFightButton)
+		{
+			ShowCard(1);
+			return true;
+		}
+		else if (w == m_StartTurnButton)
+		{
+			m_CH_DoTurn = true;
+			return true;
+		}
+		else if (w == m_StartVaultButton)
+		{
+			m_CH_DoVault = true;
+			return true;
+		}
+		else if (w == m_KnucleOutButton)
+		{
+			m_CH_DoKnucleOut = true;
+			return true;
+		}
+		else if (w == m_StartCrawlingButton)
+		{
+			m_CH_GoToCrawl = true;
+			return true;
+		}
+		else if (w == m_StartHitButton)
+		{
+			m_CH_DoHit = true;
+			return true;
+		}
+		else if (w == m_StartDeathButton)
+		{
+			m_CH_StartDeath = true;
+			return true;
+		}
+		else if (w == m_StartAttackButton)
+		{
+			m_CH_DoAttack = true;
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//!
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		return false;
+	}
+
+	//!
+	void ResetValues()
+	{
+		m_CH_DoTurn 		= false;
+		m_CH_DoVault 		= false;
+		m_CH_DoKnucleOut 	= false;
+		m_CH_GoToCrawl 		= false;
+		m_CH_DoHit 			= false;
+		m_CH_StartDeath 	= false;
+		m_CH_DoAttack 		= false;
+		m_MovementSpeedEB.SetText("0");
+		m_MainWnd.Update();
+	}
+	
+	//!
+	void SpawnNewInfectedEntity()
+	{
+		m_ControlledInfected = DayZInfected.Cast(GetGame().CreateObjectEx("ZmbF_JournalistNormal_Blue", GetGame().GetPlayer().GetPosition(), ECE_PLACE_ON_SURFACE|ECE_INITAI|ECE_EQUIP_ATTACHMENTS));
+		m_ControlledInfected.GetAIAgent().SetKeepInIdle(true);
+	}
+	
+	protected void PossesInfected()
+	{
+		ResetValues();
+		FreeDebugCamera.GetInstance().SetActive(true);
+		m_ControlledInfected = DayZInfected.Cast(FreeDebugCamera.GetInstance().GetCrosshairObject());
+		FreeDebugCamera.GetInstance().SetActive(false);
+	}
+	
+	//!
+	void CommandHandler(DayZInfected infected)
+	{
+		if( infected != m_ControlledInfected )
+			return;
+		
+		infected.GetInputController().OverrideMovementSpeed(true, m_MovementSpeedEB.GetText().ToFloat());
+		
+		DayZInfectedCommandMove moveCommand = infected.GetCommand_Move();
+		if( moveCommand )
+		{
+			moveCommand.SetStanceVariation(m_StanceCB.GetCurrentItem());
+			moveCommand.SetIdleState(m_MindStateCB.GetCurrentItem());
+		}		
+
+		if( m_CH_DoTurn )
+		{
+			moveCommand.StartTurn(m_TurnDirectionEB.GetText().ToFloat(), m_TurnTypeCB.GetCurrentItem());
+			m_CH_DoTurn = false;
+		}
+		if( m_CH_DoVault )
+		{
+			infected.StartCommand_Vault(m_VaultingCB.GetCurrentItem());
+			m_CH_DoVault = false;
+		}
+		if( m_CH_DoKnucleOut )
+		{
+			infected.StartCommand_Vault(-1);
+			m_CH_DoKnucleOut = false;
+		}
+		if( m_CH_GoToCrawl )
+		{
+			infected.StartCommand_Crawl(m_CrawlingTypeCB.GetCurrentItem());
+			m_CH_GoToCrawl = false;
+		}
+		if( m_CH_DoHit )
+		{
+			float hitDir = m_HitDirEB.GetText().ToFloat();
+			int bodyPart = m_HitBodyPartCB.GetCurrentItem();
+			bool heavyHit = m_HitTypeCB.GetCurrentItem() == 1;
+			
+			infected.StartCommand_Hit(heavyHit, bodyPart, hitDir);
+			
+			m_CH_DoHit = false;
+		}
+		if( m_CH_StartDeath )
+		{
+			int deathType = m_DeathTypeCB.GetCurrentItem();
+			float deathDir = m_HitDirEB.GetText().ToFloat();
+			
+			infected.StartCommand_Death(deathType, deathDir);
+			
+			m_CH_StartDeath = false;
+		}
+		if( m_CH_DoAttack )
+		{
+			float attackDir = m_AttackDirCB.GetCurrentItem();
+			int attackType = m_AttackDescriptors.Get(m_AttackTypeCB.GetCurrentItem()).animValue;
+			
+			infected.StartCommand_Attack(null, attackType, attackDir);
+			
+			m_CH_DoAttack = false;
+		}		
+	}
+	
+	//!
+	void Tick()
+	{
+		if( !m_ControlledInfected )
+			return;
+				
+	}
+
+	//!
+	void InitAttacks()
+	{
+		m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Attack Left Light", 0));
+		m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Attack Right Light", 1));
+		m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Attack Left Heavy", 2));
+		m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Attack Right Heavy", 3));
+		
+		m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Crawl Attack", 7));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Crawl Attack Combo", 8));
+		
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door Push Attack", 9));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door Head Attack", 10));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door Shoulder Attack", 11));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door LR Attack", 12));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door Kick Attack", 13));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door Charge R", 14));
+		//m_AttackDescriptors.Insert(new PluginDayZInfectedDebugAttackDesc("Door Charge L", 15));
+
+		for( int i = 0; i < m_AttackDescriptors.Count(); ++i )
+		{
+			m_AttackTypeCB.AddItem(m_AttackDescriptors.Get(i).name);
+		}
+	}
+	
+	private void CleanupDebugShapes(array<Shape> shapesArr)
+	{
+		for ( int it = 0; it < shapesArr.Count(); ++it )
+		{
+			Debug.RemoveShape( shapesArr[it] );
+		}
+		
+		shapesArr.Clear();
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..aa246327dc1b0848f8d375f20046bd714817dedf
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug.c
@@ -0,0 +1,1359 @@
+// *************************************************************************************
+// ! PluginDayzPlayerDebugUserData
+// *************************************************************************************
+class PluginDayzPlayerDebugUserData
+{
+	void PluginDayzPlayerDebugUserData(string name, int category, int pUserData, bool pFullBody, int pStanceMask = -1)
+	{
+		m_iUserData 	= pUserData;//animation CMD id
+		m_bIsFullBody	= pFullBody;
+		m_iStanceMask	= pStanceMask;
+		m_Category		= category;//pType
+		m_Name			= name;
+	}
+
+	int	GetInt()
+	{
+		return m_iUserData;
+	}
+
+	bool IsFullBody()
+	{
+		return m_bIsFullBody;
+	}
+	
+	int GetStanceMask()
+	{
+		return m_iStanceMask;
+	}
+	
+	int GetCategory()
+	{
+		return m_Category;
+	}
+
+	string 	GetName()
+	{
+		return m_Name;
+	}
+	string 	GetNameUnique()
+	{
+		return m_Name + "|" + GetCategory();
+	}
+	
+	protected int 	m_iUserData;
+	protected bool	m_bIsFullBody;
+	protected int 	m_iStanceMask;
+	protected int 		m_Category;
+	protected string 	m_Name;
+}
+
+// *************************************************************************************
+// ! PluginDayzPlayerDebugUI 
+// *************************************************************************************
+class PluginDayzPlayerDebugUIHandler extends ScriptedWidgetEventHandler
+{
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		return m_pPluginPlayerDebug.OnClick(w, x, y, button);
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		return m_pPluginPlayerDebug.OnChange(w, x, y, finished);
+	}
+
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		super.OnMouseEnter(w,x,y);
+		GetGame().GetMission().AddActiveInputExcludes({"menu"});
+		return true;
+
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		super.OnMouseLeave(w,enterW, x,y);
+		GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+		return true;
+	}
+
+	PluginDayzPlayerDebug		m_pPluginPlayerDebug;
+}
+
+
+// *************************************************************************************
+// ! PluginDayzPlayerDebugUI 
+// *************************************************************************************
+class PluginDayzPlayerActionCallback extends HumanCommandActionCallback
+{
+	protected static ref set<string> m_AnimEventMapping;
+	void 	PluginDayzPlayerActionCallback()
+	{
+		
+		//Print("Action callback created");
+		EnableCancelCondition(true);
+		//RegisterAnimationEvent("ActionExec", 1);	// really weird id 		
+		
+		if (!m_AnimEventMapping)//making sure to only do once
+		{
+			m_AnimEventMapping = new set<string>();
+			m_AnimEventMapping.Insert("ActionExec");
+			m_AnimEventMapping.Insert("SoundWeapon");
+			m_AnimEventMapping.Insert("SoundVoice");
+			m_AnimEventMapping.Insert("SoundAttachment");
+			m_AnimEventMapping.Insert("Sound");
+		}
+		
+		
+		foreach (int index, string eventName: m_AnimEventMapping)
+			RegisterAnimationEvent(eventName, index);
+
+		EnableStateChangeCallback();               	// enable this to get OnStateChange callbacks 
+
+		m_fTimeStart = GetWorldTime();
+	}
+	
+	void 	~PluginDayzPlayerActionCallback()
+	{
+		//Print("Action callback deleted");
+	}
+
+	override void 	OnFinish(bool pCanceled)
+	{
+		if (pCanceled)
+		{
+			m_pStateWidget.SetText("Result: canceled");
+		}
+		else
+		{
+			m_pStateWidget.SetText("Result: ended");
+		}
+	}
+
+
+	bool				CancelCondition()	
+	{ 
+		// Print("Action cancel condition");
+		return DefaultCancelCondition(); 
+	}
+
+	override void 				OnAnimationEvent(int pEventID)
+	{
+		
+		//Print(pEventID);
+		//Print("--------------------------------");
+		// only one event id is registered - 1 so nothing else can be delivered
+		string eventName= m_AnimEventMapping.Get(pEventID);
+		string eventText = eventName + " event at: ";
+		float  tFromSt = GetWorldTime() - m_fTimeStart;
+		
+		eventText += tFromSt.ToString();
+		m_EventsHistory.AddItem(eventText,null,0);
+		m_pAnimEventWidget.SetText(eventText);
+	}
+
+	override void 				OnStateChange(int pOldState, int pCurrentState)
+	{
+		string oldState = GetStateString(pOldState);
+		string newState = GetStateString(pCurrentState);
+		
+		m_pStateWidget.SetText(oldState + "->" + newState);
+	};
+
+
+
+	//! 
+	float 								m_fTimeStart;
+	TextWidget							m_pStateWidget;
+	TextWidget 							m_pAnimEventWidget;
+	TextListboxWidget					m_EventsHistory;
+}
+
+
+// *************************************************************************************
+// ! PluginDayzPlayerDebug  
+// *************************************************************************************
+class PluginDayzPlayerDebug extends PluginBase
+{
+	private const int TYPE_MOD_LOOPING	= 0;
+	private const int TYPE_MOD_ONETIME	= 1;
+	private const int TYPE_FB_LOOPING	= 2;
+	private const int TYPE_FB_ONETIME	= 3;
+
+	private const int TYPE_MOD_GESTURE_LOOPING	= 4;
+	private const int TYPE_MOD_GESTURE_ONETIME	= 5;
+	private const int TYPE_FB_GESTURE_LOOPING	= 6;
+	private const int TYPE_FB_GESTURE_ONETIME	= 7;
+	private const int TYPE_FB_SUICIDE_LOOPING	= TYPE_FB_GESTURE_LOOPING;
+	
+	private const int TYPE_ALL	= -1;
+
+	
+
+	ref Timer							m_TickTimer;
+	
+	protected ref array<ref PluginDayzPlayerDebugUserData> 			m_AnimationList 			= new array<ref PluginDayzPlayerDebugUserData>();
+	protected ref map<string, ref PluginDayzPlayerDebugUserData> 	m_AnimationListMappings 	= new map<string, ref PluginDayzPlayerDebugUserData>();
+	protected ref map<int, string> 									m_TypeNameMappings 			= new map<int, string>();
+	
+	bool 								m_IsActive			= false;
+	bool								m_HasFocus			= false;
+	bool								m_HasServerWalk = false;
+	
+	Widget 								m_MainWnd;
+	Widget								m_Card0;
+	Widget								m_Card1;
+	Widget								m_Card2;
+	Widget								m_Card3;
+	Widget								m_Card4;
+	ButtonWidget						m_Card0Button;		
+	ButtonWidget						m_Card1Button;		
+	ButtonWidget						m_Card2Button;		
+	ButtonWidget						m_Card3Button;		
+	ButtonWidget						m_Card4Button;		
+
+
+	EditBoxWidget 						m_PlayerStatusV;
+	TextListboxWidget					m_ActionsSelector;
+	ButtonWidget						m_ActionsStart;
+	ButtonWidget						m_ActionsEnd;
+	ButtonWidget						m_ActionsFinish;
+	ButtonWidget						m_ActionsCancel;
+	ButtonWidget						m_ActionsOTA;
+	ButtonWidget						m_ActionsOTL;
+	TextWidget							m_ActionStateV;
+	TextWidget 							m_ActionEventV;
+	TextWidget 							m_ActionsGlobalStatus;
+	
+	EditBoxWidget 						m_ActionsFilter;
+
+	ButtonWidget 						m_PlayerSyncCreateShadow;
+	ButtonWidget 						m_PlayerSyncDelete;
+	ButtonWidget 						m_PlayerServerWalk;
+
+	TextWidget 							m_ItemAccClass;
+	TextWidget 							m_ItemAccSClass;
+	TextWidget 							m_ItemAccInst;
+
+	ButtonWidget						m_ActionTypeAll;
+	ButtonWidget						m_ActionTypeLA;
+	ButtonWidget						m_ActionTypeOA;
+	ButtonWidget						m_ActionTypeFLA;
+	ButtonWidget						m_ActionTypeFOA;
+	ButtonWidget						m_ActionTypeLG;
+	ButtonWidget						m_ActionTypeOG;
+	ButtonWidget						m_ActionTypeFLG;
+	ButtonWidget						m_ActionTypeFOG;
+	
+	
+	ButtonWidget						m_ClearEventsButton;
+	
+	TextListboxWidget					m_EventsHistory;
+
+	ref PluginDayzPlayerDebugUIHandler m_pUIHandler;
+
+	Entity 								m_pPlayerShadow;
+	
+	protected int 						m_CurrentType;
+
+	// command handler properties
+	bool								m_CH_ActionStart 	= false;
+	int 								m_CH_ActionCommand 	= -1000;
+	bool								m_CH_ActionCancel	= false;
+		
+	
+	ref PluginDayzPlayerDebug_Weapons		m_Weapons;
+	ref PluginDayzPlayerDebug_Ctrl			m_Controls;
+	ref PluginDayzPlayerDebug_OtherCmds		m_OtherCmds;
+
+	//---------------------------------------------------
+    // gui stuff
+
+	void PluginDayzPlayerDebug()
+	{
+		RegisterAnimations();
+		CreateTypeNameMapping();
+		
+		
+		#ifndef NO_GUI
+		CreateModuleWidgets();
+		m_Weapons 	= new PluginDayzPlayerDebug_Weapons(m_Card1);
+		m_Controls	= new PluginDayzPlayerDebug_Ctrl(m_Card2);
+		m_OtherCmds	= new PluginDayzPlayerDebug_OtherCmds(m_Card3);
+		#endif
+		
+		
+		//m_TypeNameMappings.Insert(TYPE_FB_SUICIDE_LOOPING, "TYPE_FB_SUICIDE_LOOPING");
+		
+	}
+	
+	void CreateTypeNameMapping()
+	{
+		m_TypeNameMappings.Insert(TYPE_MOD_LOOPING, "MOD_LOOPING");
+		m_TypeNameMappings.Insert(TYPE_MOD_ONETIME, "MOD_ONETIME");
+		m_TypeNameMappings.Insert(TYPE_FB_LOOPING, "FB_LOOPING");
+		m_TypeNameMappings.Insert(TYPE_FB_ONETIME, "FB_ONETIME");
+		m_TypeNameMappings.Insert(TYPE_MOD_GESTURE_LOOPING, "MOD_GESTURE_LOOPING");
+		m_TypeNameMappings.Insert(TYPE_MOD_GESTURE_ONETIME, "MOD_GESTURE_ONETIME");
+		m_TypeNameMappings.Insert(TYPE_FB_GESTURE_LOOPING, "FB_GESTURE_LOOPING");
+		m_TypeNameMappings.Insert(TYPE_FB_GESTURE_ONETIME, "FB_GESTURE_ONETIME");
+	}
+	
+	
+	void ~PluginDayzPlayerDebug()
+	{
+		ReleaseFocus();	
+
+		PlayerSyncDelete();
+
+		#ifndef NO_GUI
+		m_Weapons = NULL;
+		m_Controls = NULL;
+		m_OtherCmds = NULL;
+		DestroyModuleWidgets();
+		#endif		
+	}
+	
+	
+
+	void RegisterDebugItem(ItemBase item, PlayerBase player)
+	{
+	}
+	
+	
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+
+	void ShowWidgets(bool show)
+	{
+		if(m_MainWnd) 
+		{
+			m_MainWnd.Show(show);
+		}
+	}
+
+	//!
+	void Show()
+	{
+		ShowWidgets(true);
+		m_IsActive = true;
+
+		if (!m_TickTimer)
+		{
+			m_TickTimer = new Timer();
+			m_TickTimer.Run(0.1, this, "Tick", NULL, true);			
+		}
+	}
+
+	//!
+	void Hide()
+	{
+		ShowWidgets(false);
+		m_IsActive = false;
+			
+		m_TickTimer = NULL;
+	}
+
+	//!
+	void CaptureFocus()
+	{
+		if (!m_HasFocus)
+		{
+			GetGame().GetInput().ChangeGameFocus(1);
+			GetGame().GetUIManager().ShowUICursor(true);
+			m_HasFocus = true;
+		}
+	}
+
+	//!
+	void ReleaseFocus()
+	{
+		if (m_HasFocus)
+		{
+			GetGame().GetInput().ChangeGameFocus(-1);
+			GetGame().GetUIManager().ShowUICursor(false);
+			m_HasFocus = false;
+		}	
+	}
+
+	int 	m_CurrentMode = 0;
+
+	//!
+	void ToggleDebugWindowEvent()
+	{
+		m_CurrentMode++;
+		if (m_CurrentMode > 2)
+		{
+			m_CurrentMode = 0;
+		}
+
+		ToggleDebugWindowSetMode(m_CurrentMode);
+	}
+
+
+	//!
+	void ToggleDebugWindowEventOld()
+	{
+		//! act:0 foc:0 -> act:1 foc:0
+		//! act:1 foc:0 -> act:0 foc:0
+		//! act:1 foc:1 -> act:1 foc:0
+
+		if(m_IsActive && !m_HasFocus)
+		{	
+			Hide();
+		}
+		else
+		{
+			Show();
+			ReleaseFocus();
+		}
+	}
+
+
+
+	void ToggleDebugWindowEventP()
+	{
+		//! act:0 foc:0 -> act:1 foc:1
+		//! act:1 foc:0 -> act:1 foc:1
+		//! act:1 foc:1 -> act:0 foc:0
+
+		if (m_IsActive && m_HasFocus)
+		{
+			Hide();
+			ReleaseFocus();
+		}
+		else
+		{
+			Show();
+			CaptureFocus();
+		}
+	}
+
+
+	void ToggleDebugWindowSetMode(int pMode)
+	{
+		switch (pMode)
+		{
+		case 0:		Hide(); ReleaseFocus();	break;
+		case 1:		Show(); ReleaseFocus();	break;
+		case 2:		Show(); CaptureFocus();	break;
+		}
+	}
+
+	void CreateModuleWidgets()
+	{
+		if (!m_pUIHandler)
+		{
+			m_pUIHandler = new PluginDayzPlayerDebugUIHandler();
+			m_pUIHandler.m_pPluginPlayerDebug = this;
+		}
+
+		if (!m_MainWnd)
+		{
+			m_MainWnd = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_playerdebug.layout");
+			m_MainWnd.SetHandler(m_pUIHandler);
+			m_MainWnd.Show(false);
+		}
+		
+		m_Card0	= m_MainWnd.FindAnyWidget("Card0");
+		m_Card1	= m_MainWnd.FindAnyWidget("Card1");
+		m_Card2	= m_MainWnd.FindAnyWidget("Card2");
+		m_Card3	= m_MainWnd.FindAnyWidget("Card3");
+		m_Card4	= m_MainWnd.FindAnyWidget("Card4");
+		m_Card0Button	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("Card0Button") );
+		m_Card1Button	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("Card1Button") );
+		m_Card2Button	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("Card2Button") );
+		m_Card3Button	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("Card3Button") );
+		m_Card4Button	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("Card4Button") );
+
+
+		m_PlayerStatusV 	= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("PlayerStatusV") );
+		m_ActionsSelector	= TextListboxWidget.Cast( m_MainWnd.FindAnyWidget("ActionsSelector") );
+		m_ActionsStart		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsStart") );
+		m_ActionsEnd		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsEnd") );
+		m_ActionsFinish		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsFinish") );
+		m_ActionsCancel		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsCancel") );
+		m_ActionsOTA			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsOTA") );
+		m_ActionsOTL			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsOTL") );
+		m_ActionStateV		= TextWidget.Cast( m_MainWnd.FindAnyWidget("ActionStateV") );
+		m_ActionEventV		= TextWidget.Cast( m_MainWnd.FindAnyWidget("ActionEventV") );
+		m_ActionsGlobalStatus	= TextWidget.Cast( m_MainWnd.FindAnyWidget("ActionGlobalStatus") );
+		
+		
+		m_ActionsFilter	= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("FilterField") );
+
+		m_PlayerSyncCreateShadow 	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("PlayerSyncCreate") );
+		m_PlayerSyncDelete 			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("PlayerSyncDelete") );
+		m_PlayerServerWalk			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("PlayerServerWalk") );
+
+		m_ItemAccClass			= TextWidget.Cast( m_MainWnd.FindAnyWidget("ItemAccessClass") );
+		m_ItemAccSClass			= TextWidget.Cast( m_MainWnd.FindAnyWidget("ItemAccessSClass") );
+		m_ItemAccInst				= TextWidget.Cast( m_MainWnd.FindAnyWidget("ItemAccessInst") );
+
+		m_ActionTypeAll		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupALL") );
+		m_ActionTypeLA			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupLA") );
+		m_ActionTypeOA			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupOA") );
+		m_ActionTypeFLA			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupFLA") );
+		m_ActionTypeFOA			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupFOA") );
+		m_ActionTypeLG			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupLG") );
+		m_ActionTypeOG			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupOG") );
+		m_ActionTypeFLG			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupFLG") );
+		m_ActionTypeFOG			= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ActionsGroupFOG") );
+		
+		
+		m_EventsHistory			= TextListboxWidget.Cast( m_MainWnd.FindAnyWidget("EventHistory") );
+		m_ClearEventsButton		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("ClearButton") );
+
+		DisplayActions(-1);
+
+		ShowCard(0);
+		
+		// m_DebugAgentListWidget = m_DebugRootWidget.FindAnyWidget("w_Agents");
+		// m_DebugFloatsListWidget = m_DebugRootWidget.FindAnyWidget("w_Floats");
+		// m_DebugStringsListWidget = m_DebugRootWidget.FindAnyWidget("w_Strings");
+		// m_DebugFloatsProperListWidget = m_DebugRootWidget.FindAnyWidget("w_FloatsProper");
+		// m_ItemPreviewWidget = m_DebugRootWidget.FindAnyWidget("w_ItemPreview");
+		// m_ClassNameWidget = m_DebugRootWidget.FindAnyWidget("w_ClassName");
+	}
+	
+	void DestroyModuleWidgets()
+	{
+		delete m_MainWnd;
+	}
+
+
+	void ShowCard(int pCard)
+	{
+		m_Card0.Show(pCard == 0);
+		m_Card1.Show(pCard == 1);
+		m_Card2.Show(pCard == 2);
+		m_Card3.Show(pCard == 3);
+		m_Card4.Show(pCard == 4);
+	}
+
+	
+
+	//---------------------------------------------------
+    // main update
+
+	
+	void Tick()
+	{
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (!player)
+		{
+			return;
+		}
+				
+		// Print("PluginDayzPlayerDebug tick");	
+		UpdatePlayerStatus(player);
+		
+		// DbgShowBoneName(player);			
+		UpdateCommandModifiers(player);
+
+		//!
+		UpdateItemAccessor(player);
+		
+		m_Weapons.Tick();
+	}
+	
+	
+	//---------------------------------------------------
+    // Player main
+
+	
+	void UpdatePlayerStatus(DayZPlayer pPlayer)
+	{
+		
+		ref HumanMovementState		state 	= new HumanMovementState();
+		
+		
+		pPlayer.GetMovementState(state);
+				
+		string a = "Cmd:"; 
+		
+		if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MOVE)
+		{
+			a += "MOVE:";
+			a += " st:" + state.m_iStanceIdx.ToString() + ", mv:" + state.m_iMovement.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_ACTION)
+		{
+			a += "FB ACTION:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MELEE)
+		{
+			a += "MELEE:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_MELEE2)
+		{
+			a += "MELEE2:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_FALL)
+		{
+			a += "FALL:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_DEATH)
+		{
+			a += "now DEAD:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_LADDER)
+		{
+			a += "LADDER:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_UNCONSCIOUS)
+		{
+			a += "Unconscious:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_SWIM)
+		{
+			a += "Swimming:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else if (state.m_CommandTypeId == DayZPlayerConstants.COMMANDID_CLIMB)
+		{
+			a += "Climbing:";
+			a += " st:" + state.m_iStanceIdx.ToString();
+		}
+		else
+		{
+			a += "UNKNOWN";
+		}
+		
+		m_PlayerStatusV.SetText(a);
+	}
+
+
+	void DbgShowBoneName(DayZPlayer pPlayer)
+	{
+		int 	boneIndex = pPlayer.GetBoneIndexByName("Head");
+
+		// vector 	pos			= pPlayer.GetBonePositionMS(boneIndex);
+		vector 	tm[4];
+		
+		pPlayer.GetBoneTransformMS(boneIndex, tm);
+
+	
+
+		string a = "Bone index:";
+		a += boneIndex.ToString();
+		a += ","; 
+		a += tm.ToString();
+		Print(a);
+	}
+
+
+	void UpdateCommandModifiers(DayZPlayer pPlayer)
+	{
+		Actions_UpdateGlobals(pPlayer);
+	
+		// int nMods = pPlayer.GetCommandModifierCount();
+		// Print("Number of modifiers");
+		// Print(nMods);
+
+		/*
+		for (int i = 0; i < nMods; i ++)
+		{
+			// int a = pPlayer.GetCommandModifierId(i);
+
+			if (pPlayer.GetCommandModifierId(i) == DayZPlayerConstants.COMMANDID_MOD_ACTION)
+			{
+			}
+			
+			// Print(a);
+			
+		}
+		*/
+
+		HumanCommandActionCallback clbk = pPlayer.GetCommandModifier_Action();
+		if (clbk)
+		{
+			Print(clbk);
+		};
+	}
+
+
+	//---------------------------------------------------
+    // Actions
+	
+	void DisplayActions(int pType)
+	{
+		m_CurrentType = pType;
+		TStringArray sortedNames = new TStringArray();
+		m_ActionsSelector.ClearItems();
+		string filterTextLower = m_ActionsFilter.GetText();
+		filterTextLower.ToLower();
+		
+		TStringArray filterTokens = new TStringArray;
+		filterTextLower.Split(" ", filterTokens);
+		
+		foreach (PluginDayzPlayerDebugUserData dta: m_AnimationList)
+		{
+			string nameLower = dta.GetName();
+			nameLower.ToLower();
+			bool add = false;
+			if (pType == -1 || pType == dta.GetCategory())
+			{
+				if (filterTextLower)
+				{
+					foreach (string token:filterTokens)
+					{
+						if (nameLower.Contains(token))
+							add = true;
+					}
+				}
+				else
+					add = true;
+			}
+			if (add)
+				sortedNames.Insert(dta.GetNameUnique());
+		}
+		sortedNames.Sort();
+		foreach (int i, string sortedNameUnique:sortedNames)
+		{
+			PluginDayzPlayerDebugUserData data = m_AnimationListMappings.Get(sortedNameUnique);
+			string sortedName = data.GetName();
+			string typeName;
+			
+			if (m_TypeNameMappings.Contains(data.GetCategory()))
+			{
+				typeName = m_TypeNameMappings.Get(data.GetCategory());
+			}
+
+			m_ActionsSelector.AddItem(sortedName, data, 0,i);
+			if (typeName)
+				m_ActionsSelector.SetItem(i, typeName, null, 1);
+		}
+	}
+
+
+	//!
+	void	Actions_Start()
+	{
+		int		row = m_ActionsSelector.GetSelectedRow();
+		if (row == -1)
+		{
+			return;
+		}
+
+		//!
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (!player)
+		{
+			return;
+		}
+
+		PluginDayzPlayerDebugUserData	userData;
+		m_ActionsSelector.GetItemData(row, 0, userData);
+
+		//! start action 
+		PluginDayzPlayerActionCallback a;
+	
+		if (userData.IsFullBody())
+		{
+			a = PluginDayzPlayerActionCallback.Cast( player.StartCommand_Action(userData.GetInt(), PluginDayzPlayerActionCallback, userData.GetStanceMask()) );
+		}
+		else
+		{
+			a = PluginDayzPlayerActionCallback.Cast( player.AddCommandModifier_Action(userData.GetInt(), PluginDayzPlayerActionCallback) );
+		}
+		m_ActionEventV.SetText("");
+		a.m_pStateWidget 		= m_ActionStateV;
+		a.m_pAnimEventWidget	= m_ActionEventV;
+		a.m_EventsHistory		= m_EventsHistory;
+
+		Print(m_ActionStateV);
+		m_ActionStateV.SetText("Crash Test");
+	}
+
+	//!
+	void	Actions_DoInternalCommand(int pCommandId)
+	{
+		//!
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (!player)
+		{
+			return;
+		}
+
+		HumanCommandActionCallback clbk = player.GetCommand_Action();
+		if (!clbk)
+		{
+			clbk = player.GetCommandModifier_Action();
+			if (!clbk)
+			{
+				return;
+			}
+		}
+		
+		clbk.InternalCommand(pCommandId);		
+	}
+
+	//!
+	void	Actions_DoCancel()
+	{
+		//!
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (!player)
+		{
+			return;
+		}
+
+		HumanCommandActionCallback clbk = player.GetCommand_Action();
+		if (!clbk)
+		{
+			clbk = player.GetCommandModifier_Action();
+			if (!clbk)
+			{
+				return;
+			}
+		}
+		clbk.Cancel();			
+	}
+
+
+	//! 
+	void 	Actions_UpdateGlobals(DayZPlayer pPlayer)
+	{
+		HumanCommandActionCallback clbk = pPlayer.GetCommandModifier_Action();
+		if (!clbk)
+		{
+			m_ActionsGlobalStatus.SetText("No Action");
+		}
+
+		m_ActionsGlobalStatus.SetText(clbk.ToString());
+	}
+
+        
+    //! ---------------------------------------------------------
+
+
+	void 	PlayerSyncCreate()
+	{
+		PlayerSyncDelete();
+
+		vector item_position = 	GetGame().GetPlayer().GetPosition() + ( GetGame().GetPlayer().GetDirection() * 2.0);
+
+		m_pPlayerShadow = Entity.Cast( GetGame().CreateObject("SurvivorM_Mirek", item_position, false, false) );
+
+		DayZPlayer 	pl = DayZPlayer.Cast( GetGame().GetPlayer() );		
+		pl.DebugSyncShadowSetup( DayZPlayer.Cast( m_pPlayerShadow ) );
+	}
+
+	void 	PlayerSyncDelete()
+	{
+		if (m_pPlayerShadow)
+		{
+			GetGame().ObjectDelete(m_pPlayerShadow);
+			m_pPlayerShadow = NULL;
+		}
+
+		DayZPlayer 	pl = DayZPlayer.Cast( GetGame().GetPlayer() );		
+		if (pl)
+		{
+			pl.DebugSyncShadowSetup(NULL);
+		}
+
+	}
+
+
+	//---------------------------------------------------
+	// item accessor
+
+	void UpdateItemAccessor(DayZPlayer pPlayer)
+	{
+		m_ItemAccClass.SetText(pPlayer.DebugGetItemClass());
+		m_ItemAccSClass.SetText(pPlayer.DebugGetItemSuperClass());
+		m_ItemAccInst.SetText(pPlayer.DebugGetItemAnimInstance());
+	}
+
+
+	//---------------------------------------------------
+    // window ui clicks
+
+	//! buttons clicks
+	bool	OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_Card0Button)
+		{
+			ShowCard(0);
+		}
+		else if (w == m_Card1Button)
+		{
+			ShowCard(1);
+		}
+		else if (w == m_Card2Button)
+		{
+			ShowCard(2);
+		}
+		else if (w == m_Card3Button)
+		{
+			ShowCard(3);
+		}	
+		else if (w == m_Card4Button)
+		{
+			ShowCard(4);
+		}
+		
+		else if (w == m_ClearEventsButton)
+		{
+			m_EventsHistory.ClearItems();
+		}
+		else if (w == m_ActionsStart)
+		{
+			Print("PluginPlayerDebug: Action Start");
+			m_CH_ActionStart = true;
+			return true;
+		}
+		else if (w == m_ActionsEnd)
+		{
+			Print("PluginPlayerDebug: Action End");
+			m_CH_ActionCommand = DayZPlayerConstants.CMD_ACTIONINT_END;
+			return true;
+		}
+		else if (w == m_ActionsFinish)
+		{
+			Print("PluginPlayerDebug: Action Finish");
+			m_CH_ActionCommand = DayZPlayerConstants.CMD_ACTIONINT_FINISH;
+			return true;
+		}
+		else if (w == m_ActionsOTA)
+		{
+			Print("PluginPlayerDebug: Action One Time Action");
+			m_CH_ActionCommand = DayZPlayerConstants.CMD_ACTIONINT_ACTION;
+			return true;
+		}
+		else if (w == m_ActionsOTL)
+		{
+			Print("PluginPlayerDebug: Action Loop");
+			m_CH_ActionCommand = DayZPlayerConstants.CMD_ACTIONINT_ACTIONLOOP;
+			return true;
+		}
+		else if (w == m_ActionsCancel)
+		{
+			Print("PluginPlayerDebug: Action Cancel");
+			m_CH_ActionCancel = true;
+			return true;
+		}
+		else if (w == m_PlayerSyncCreateShadow)
+		{
+			PlayerSyncCreate();
+			return true;
+		}
+		else if (w == m_PlayerSyncDelete)
+		{
+			PlayerSyncDelete();
+			return true;
+		}
+		else if (w == m_PlayerServerWalk)
+		{
+			//! send rcp 
+			m_HasServerWalk = !m_HasServerWalk;
+#ifdef DEVELOPER
+			Param1<bool> rp = new Param1<bool>(m_HasServerWalk);
+			GetGame().RPCSingleParam(GetGame().GetPlayer(), ERPCs.RPC_DAYZPLAYER_DEBUGSERVERWALK, rp, true);
+#endif
+		}
+		else if (w == m_ActionTypeLA)
+		{
+			DisplayActions(TYPE_MOD_LOOPING);
+		}
+		else if (w == m_ActionTypeOA)
+		{
+			DisplayActions(TYPE_MOD_ONETIME);
+		}
+		else if (w == m_ActionTypeFLA)
+		{
+			DisplayActions(TYPE_FB_LOOPING);
+		}
+		else if (w == m_ActionTypeFOA)
+		{
+			DisplayActions(TYPE_FB_ONETIME);
+		}
+		else if (w == m_ActionTypeLG)
+		{
+			DisplayActions(TYPE_MOD_GESTURE_LOOPING);
+		}
+		else if (w == m_ActionTypeOG)
+		{
+			DisplayActions(TYPE_MOD_GESTURE_ONETIME);
+		}
+		else if (w == m_ActionTypeFLG)
+		{
+			DisplayActions(TYPE_FB_GESTURE_LOOPING);
+		}
+		else if (w == m_ActionTypeFOG)
+		{
+			DisplayActions(TYPE_FB_GESTURE_ONETIME);
+		}
+		else if (w == m_ActionTypeAll)
+		{
+			DisplayActions(TYPE_ALL);
+		}
+
+		if (m_Weapons.OnClick(w,x,y,button))
+		{
+			return true;
+		}
+		else if (m_OtherCmds.OnClick(w,x,y,button))
+		{
+			return true;
+		}
+		else 
+		{
+			return m_Controls.OnClick(w,x,y,button);
+		}
+	}
+	
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if (w == m_ActionsFilter)
+		{
+			DisplayActions(m_CurrentType);
+		}
+		
+		if ( m_Controls.OnChange(w, x, y, finished) )
+			return true;
+		
+		
+		return false;
+	}
+
+	//---------------------------------------------------
+    // Global handler to handle commands from player
+
+	bool		IsWeaponChange(out string pNewWeapon, out int pHideSlot, out int pShowSlot)
+	{
+		if (m_Weapons)
+		{
+			m_Weapons.IsWeaponChange(pNewWeapon, pHideSlot, pShowSlot);
+		}
+		
+		return false;
+	}
+
+
+	//---------------------------------------------------
+    // Global handler to handle commands from player
+
+	void 	CommandHandler()
+	{
+		if (m_CH_ActionStart)
+		{
+			Actions_Start();
+			m_CH_ActionStart	= false;
+		}
+
+		if (m_CH_ActionCommand != -1000)
+		{
+			Actions_DoInternalCommand(m_CH_ActionCommand);
+			m_CH_ActionCommand = -1000;
+		}
+
+		if (m_CH_ActionCancel)
+		{
+			Actions_DoCancel();			
+			m_CH_ActionCancel = false;		
+		}
+
+		if (m_Weapons)
+		{
+			m_Weapons.CommandHandler();
+		}
+
+		if (m_Controls)
+		{
+			m_Controls.CommandHandler();	
+		}
+		
+		if (m_OtherCmds)
+		{
+			m_OtherCmds.CommandHandler();	
+		}
+	}
+
+	void RegisterAnimation(string name, int category, int pUserData, bool pFullBody, int pStanceMask = -1)
+	{
+		PluginDayzPlayerDebugUserData data = new PluginDayzPlayerDebugUserData(name, category, pUserData, pFullBody, pStanceMask);
+		m_AnimationList.Insert(data);
+		m_AnimationListMappings.Insert(data.GetNameUnique(), data);
+	}
+	
+	void RegisterAnimations()
+	{
+		RegisterAnimation("CLEAN HANDS BOTTLE", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_CLEANHANDSBOTTLE, false);
+		RegisterAnimation("DRINK", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_DRINK, false);
+		RegisterAnimation("EAT", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_EAT, false);
+		RegisterAnimation("EMPTY VESSEL", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_EMPTY_VESSEL, false);
+		RegisterAnimation("CATCH RAIN", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_CATCHRAIN, false);
+		RegisterAnimation("VIEW COMPASS", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_VIEWCOMPASS, false);
+		RegisterAnimation("ITEM TUNE", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_ITEM_TUNE, false);
+		RegisterAnimation("GIVE L ITEM", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_GIVEL, false);
+		RegisterAnimation("GIVE R ITEM", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_GIVER, false);
+		RegisterAnimation("SHAVE", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_SHAVE, false);
+		RegisterAnimation("FILL MAG", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_FILLMAG, false);
+		RegisterAnimation("EMPTY MAG", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_EMPTYMAG, false);
+		RegisterAnimation("OPEN ITEM", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_OPENITEM, false);
+		RegisterAnimation("TAKE TEMP SELF", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_TAKETEMPSELF, false);
+		RegisterAnimation("VIEW MAP", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_VIEWMAP, false);
+		RegisterAnimation("RAISE ITEM", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_RAISEITEM, false);
+		RegisterAnimation("SEARCH INVENTORY", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_SEARCHINVENTORY, false);
+		RegisterAnimation("CRAFTING UPPDERBODY", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_CRAFTING, false);
+		RegisterAnimation("RESTRAINED STRUGGLE", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_RESTRAINEDSTRUGGLE, false);
+		RegisterAnimation("COVER HEAD SELF", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_COVERHEAD_SELF, false);
+		RegisterAnimation("COVER HEAD TARGET", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_COVERHEAD_TARGET, false);
+		RegisterAnimation("SET ALARM CLOCK", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_SET_ALARM, false);
+		RegisterAnimation("ENGINE START", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_STARTENGINE, false);
+		RegisterAnimation("TOOT HORN", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_TOOTHORN, false);
+		RegisterAnimation("ENGINE STOP", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_STOPENGINE, false);
+		RegisterAnimation("SHIFT GEAR", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_SHIFTGEAR, false);
+		RegisterAnimation("TURN ON/OFF LIGHTS", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_HEADLIGHT, false);
+		RegisterAnimation("DRIVER OPEN DOOR", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_DRIVER_DOOR_OPEN, false);
+		RegisterAnimation("DRIVER CLOSE DOOR", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_DRIVER_DOOR_CLOSE, false);
+		RegisterAnimation("CODRIVER OPEN DOOR", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_CODRIVER_DOOROPEN, false);
+		RegisterAnimation("CODRIVER CLOSE DOOR", TYPE_MOD_LOOPING, DayZPlayerConstants.CMD_ACTIONMOD_CODRIVER_DOORCLOSE, false);
+		//! one time
+		RegisterAnimation("PICK UP HANDS", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_HANDS, false);
+		RegisterAnimation("PICK UP INVENTORY", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_PICKUP_INVENTORY, false);
+		RegisterAnimation("LICK BATTERY", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_LICKBATTERY, false);
+		RegisterAnimation("LIGHT FLARE", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_LIGHTFLARE, false);
+		RegisterAnimation("LITCHEM LIGHT", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_LITCHEMLIGHT, false);
+		RegisterAnimation("UNPIN GRENAGE", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_UNPINGRENAGE, false);
+		RegisterAnimation("OPEN DOOR FW", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_OPENDOORFW, false);
+		RegisterAnimation("OPEN LID", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_OPENLID, false);
+		RegisterAnimation("CLOSE LID", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_CLOSELID, false);
+		RegisterAnimation("RADIO ON", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_ITEM_ON, false);
+		RegisterAnimation("RADIO OFF", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_ITEM_OFF, false);
+		RegisterAnimation("BATON EXTEND", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_BATONEXTEND, false);
+		RegisterAnimation("BATON RETRACT", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_BATONRETRACT, false);
+		RegisterAnimation("UNLOCK HANDCUFF TARGET", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_UNLOCKHANDCUFFTARGET, false);
+		RegisterAnimation("FISHINGROD EXTEND", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_FISHINGRODEXTEND, false);
+		RegisterAnimation("FISHINGROD RETRACT", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_FISHINGRODRETRACT, false);
+		RegisterAnimation("OPEN ITEM ONCE", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_OPENITEM_ONCE, false);
+		RegisterAnimation("CLOSE ITEM ONCE", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_CLOSEITEM_ONCE, false);
+		RegisterAnimation("ATTACH SCOPE", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_ATTACHSCOPE, false);
+		RegisterAnimation("ATTACH BARREL", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_ATTACHBARREL, false);
+		RegisterAnimation("EMPTY SEEDS PACK", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_EMPTYSEEDSPACK, false);
+		RegisterAnimation("INTERACT", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_INTERACTONCE, false);
+		RegisterAnimation("ATTACH ITEM", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_ATTACHITEM, false);
+		RegisterAnimation("STOP ALARM CLOCK", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_STOP_ALARM, false);
+		RegisterAnimation("PRESS TRIGGER", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_PRESS_TRIGGER, false);
+		RegisterAnimation("DROP ITEM HANDS", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_DROPITEM_HANDS, false);
+		RegisterAnimation("DROP ITEM INVENTORY", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_DROPITEM_INVENTORY, false);
+		RegisterAnimation("EAT PILL", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_EAT_PILL, false);
+		RegisterAnimation("EAT TABLET", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_EAT_TABLET, false);
+		RegisterAnimation("HEATPACK", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_HEATPACK, false);
+		RegisterAnimation("BLOODTEST", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_BLOODTEST, false);
+		RegisterAnimation("BLOODTESTOTHER", TYPE_MOD_ONETIME, DayZPlayerConstants.CMD_ACTIONMOD_BLOODTESTOTHER, false);
+		//! fullbody looping
+		RegisterAnimation("DRINK", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DRINK, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("EAT", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_EAT, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("CATCH RAIN", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CATCHRAIN, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("WALKIETALKIE TUNE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_ITEM_TUNE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("GIVE L ITEM", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_GIVEL, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("GIVE R ITEM", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_GIVER, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("FILL MAG", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FILLMAG, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("EMPTY MAG", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_EMPTYMAG, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("DRINK POND", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DRINKPOND, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("DRINK WELL", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DRINKWELL, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("FILL BOTTLE WELL", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FILLBOTTLEWELL, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("FIRE ESTINGUISHER", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FIREESTINGUISHER, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("FLAME REPAIR", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FLAME_REPAIR, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("WRING CLOTH", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_WRING, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("FISHING", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FISHING, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("CPR", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CPR, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("BANDAGE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_BANDAGE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("CRAFTING", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CRAFTING, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("INTERACT", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_INTERACT, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("FORCE FEED TARGET", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FORCEFEED, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("BANDAGE TARGET", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_BANDAGETARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SPRAY PLANT", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SPRAYPLANT, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("START FIRE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_STARTFIRE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("ANIMAL SKINNING", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_ANIMALSKINNING, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("WASH HANDS WELL", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_WASHHANDSWELL, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("WASH HANDS POND", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_WASHHANDSPOND, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("SALINE BLOODBAG TARGET", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SALINEBLOODBAGTARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SALINE BLOOD BAG", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SALINEBLOODBAG, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("STITCH UP SELF", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_STITCHUPSELF, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("VOMIT", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_VOMIT, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("UNRESTRAINT TARGET", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_UNRESTRAINTARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("RESTRAIN TARGET", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_RESTRAINTARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("CHECK PULSE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CHECKPULSE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("CLEAN WOUNDS TARGET", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CLEANWOUNDSTARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("COLLECT BLOOD SELF", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_COLLECTBLOODSELF, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("EMPTY VESSEL", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_EMPTY_VESSEL, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("OPEN ITEM", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_OPENITEM, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("HACK BUSH", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_HACKBUSH, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("HACK TREE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_HACKTREE, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TAKE TEMP SELF", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_TAKETEMPSELF, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("DIG HOLE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DIG, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("DIG UP CACHE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DIGUPCACHE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("DIG MANIPULATE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DIGMANIPULATE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("DEPLOY HEAVY", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_HEAVY, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("DEPLOY 1HD", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_1HD, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("DEPLOY 2HD", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DEPLOY_2HD, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("BLOW FIREPLACE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_BLOWFIREPLACE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("VIEW MAP", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_VIEWMAP, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("VIEW COMPASS", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_VIEWCOMPASS, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("FILL BOTTLE POND", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_FILLBOTTLEPOND, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("PLACING HEAVY", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PLACING_HEAVY, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("PLACING 1HD", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PLACING_1HD, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("PLACING 2HD", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PLACING_2HD, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("CUT BARK", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CUTBARK, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("VIEW NOTE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_VIEWNOTE, true, DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SEARCH INVENTORY", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SEARCHINVENTORY, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("LOOK OPTICS", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_LOOKOPTICS, true, DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("MINE ROCK", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_MINEROCK, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("RAISE ITEM", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_RAISEITEM, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("RESTRAINED STRUGGLE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_RESTRAINEDSTRUGGLE, true, DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("RESTRAIN SELF", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_RESTRAINSELF, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("ASSEMBLE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_ASSEMBLE, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("DISASSEMBLE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_DISASSEMBLE, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("RAISE FLAG", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_RAISE_FLAG, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("LOWER FLAG", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_LOWER_FLAG, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SET ALARM CLOCK", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SET_ALARM, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("SHOVEL DIG", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SHOVEL_DIG, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("VEHICLE_PUSH", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_VEHICLE_PUSH, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("PATCHING_TIRE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PATCHING_TIRE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("PATCHING_DUCTTAPE", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PATCHING_DUCTTAPE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("PATCHING_SEWING", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PATCHING_SEWING, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("PATCHING_LEATHER_SEWING_KIT", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_PATCHING_LEATHER_SEWING_KIT, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("SPLITTING FIREWOOD", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_SPLITTING_FIREWOOD, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("BREAKING STICK", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_BREAKING_STICK, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("CLEANING_WEAPON", TYPE_FB_LOOPING, DayZPlayerConstants.CMD_ACTIONFB_CLEANING_WEAPON, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+
+		//! one time
+		RegisterAnimation("PICK UP HANDS", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HANDS, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("PICK UP INVENTORY", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_PICKUP_INVENTORY, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("LICK BATTERY", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_LICKBATTERY, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("LIGHT FLARE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_LIGHTFLARE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("LITCHEM LIGHT", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_LITCHEMLIGHT, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("UNPIN GRENAGE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_UNPINGRENAGE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("RADIO ON", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_ITEM_ON, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("RADIO OFF", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_ITEM_OFF, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("HANDCUFF TARGET", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_HANDCUFFTARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("MORPHINE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_MORPHINE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("INJECTION", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_INJECTION, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("INJECTION TARGET", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_INJECTIONTARGET, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("DRINK SIP", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_DRINKSIP, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("CLEAN HANDS BOTTLE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_CLEANHANDSBOTTLE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("OPEN ITEM ONCE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_OPENITEM_ONCE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("POKE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_POKE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("ATTACH SCOPE", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_ATTACHSCOPE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("ATTACH BARREL", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_ATTACHBARREL, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("RESTRAIN", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_RESTRAIN, true, DayZPlayerConstants.STANCEMASK_PRONE | DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("PICK UP HEAVY", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_PICKUP_HEAVY, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("STOP ALARM CLOCK", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_STOP_ALARM, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("PRESS TRIGGER", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_PRESS_TRIGGER, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("EAT PILL", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_EAT_PILL, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("EAT TABLET", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_EAT_TABLET, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("HEATPACK", TYPE_FB_ONETIME, DayZPlayerConstants.CMD_ACTIONFB_HEATPACK, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		//! ---------------------------------------------------------
+		//! ---------------------- GESTURES -------------------------
+		//! ---------------------------------------------------------
+		//! looping
+		RegisterAnimation("GREETING", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_GREETING, false);
+		RegisterAnimation("POINT", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_POINT, false);
+		RegisterAnimation("THUMB UP", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_THUMB, false);
+		RegisterAnimation("THUMB DOWN", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_THUMB, false);
+		RegisterAnimation("SILENCE", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_SILENCE, false);
+		RegisterAnimation("TAUNT", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_TAUNT, false);
+		RegisterAnimation("TIME OUT", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_TIMEOUT, false);
+		RegisterAnimation("HEART", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_HEART, false);
+		RegisterAnimation("FACEPALM", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_FACEPALM, false);
+		RegisterAnimation("WATCHING", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_WATCHING, false);
+		RegisterAnimation("HOLD", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_HOLD, false);
+		RegisterAnimation("LISTENING", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_LISTENING, false);
+		RegisterAnimation("POINT AT SELF", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_POINTSELF, false);
+		RegisterAnimation("LOOK AT ME", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_LOOKATME, false);
+		RegisterAnimation("OKAY", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_OKAY, false);
+		RegisterAnimation("RPS", TYPE_MOD_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREMOD_RPS, false);
+		//! one time
+		RegisterAnimation("THROAT", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_THROAT, false);
+		RegisterAnimation("CLAP", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_CLAP, false);
+		RegisterAnimation("DABBING", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_DABBING, false);
+		RegisterAnimation("MOVE", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_MOVE, false);
+		RegisterAnimation("DOWN", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_DOWN, false);
+		RegisterAnimation("COME", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_COME, false);
+		RegisterAnimation("TAUNT KISS", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_TAUNTKISS, false);
+		RegisterAnimation("TAUNT ELBOW", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_TAUNTELBOW, false);
+		RegisterAnimation("TAUNT THINK", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_TAUNTTHINK, false);
+		RegisterAnimation("NOD HEAD", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_NODHEAD, false);
+		RegisterAnimation("SHAKE HEAD", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_SHAKEHEAD, false);
+		RegisterAnimation("SHRUG", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_SHRUG, false);
+		RegisterAnimation("SURRENDER", TYPE_MOD_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREMOD_SURRENDER, false);
+		//! fullbody looping
+		RegisterAnimation("GREETING", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_GREETING, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("POINT", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_POINT, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("THUMBUP", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_THUMB, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("THUMBDOWN", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_THUMB, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("SILENCE", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_SILENCE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("TAUNT", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_TAUNT, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("TIMEOUT", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_TIMEOUT, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("HEART", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_HEART, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("WATCHING", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_WATCHING, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("HOLD", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_HOLD, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("LISTENING", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_LISTENING, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("POINTSELF", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_POINTSELF, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("LOOKATME", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_LOOKATME, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("OKAY", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_OKAY, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("SALUTE", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_SALUTE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("CAMPFIRE", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_CAMPFIRE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("LYINGDOWN", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_LYINGDOWN, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("SOS", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_SOS, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SITA", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_SITA, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("SITB", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_SITB, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("DABBING", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_DABBING, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SURRENDER", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_SURRENDER, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("KNEEL", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_GESTUREFB_KNEEL, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("TRAILER WAKE UP", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_TRAILER_WAKE_UP, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TRAILER DEAD BODY", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_TRAILER_DEAD_BODY, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TRAILER WALKIE TALKIE", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_TRAILER_WALKIE_TALKIE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TRAILER WOUNDED", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_TRAILER_WOUNDED, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TRAILER WALK AWAY", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_TRAILER_WALK_AWAY, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TRAILER DEAD DEAD", TYPE_FB_GESTURE_LOOPING, DayZPlayerConstants.CMD_TRAILER_DEAD, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		//! fullbody one time
+		RegisterAnimation("THROAT", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_THROAT, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("MOVE", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_MOVE, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("DOWN", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_DOWN, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("COME", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_COME, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("TAUNT KISS", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_TAUNTKISS, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("TAUNT THINK", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_TAUNTTHINK, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("DANCE", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_DANCE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("NOD HEAD", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_NODHEAD, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("SHAKE HEAD", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_SHAKEHEAD, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("SHRUG", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_SHRUG, true, DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("SURRENDER", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_GESTUREFB_SURRENDER, true, DayZPlayerConstants.STANCEMASK_CROUCH | DayZPlayerConstants.STANCEMASK_PRONE);
+		RegisterAnimation("TRAILER MASK", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_TRAILER_MASK, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("TRAILER MASK_02", TYPE_FB_GESTURE_ONETIME, DayZPlayerConstants.CMD_TRAILER_MASK_02, true, DayZPlayerConstants.STANCEMASK_ERECT);
+
+		//! ---------------------------------------------------------
+		//! ---------------------- SUICIDE --------------------------
+		//! ---------------------------------------------------------
+		//! fullbody looping
+		RegisterAnimation("1HD", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_1HD, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("FIREAXE", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_FIREAXE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("PITCHFORK", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_PITCHFORK, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("PISTOL", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_PISTOL, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("RIFLE", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_RIFLE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("SWORD", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_SWORD, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("UNARMED", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_UNARMED, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("WOODAXE", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_WOODAXE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SPEAR", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_SPEAR, true, DayZPlayerConstants.STANCEMASK_ERECT);
+		RegisterAnimation("SICKLE", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_SICKLE, true, DayZPlayerConstants.STANCEMASK_CROUCH);
+		RegisterAnimation("HOE", TYPE_FB_SUICIDE_LOOPING, DayZPlayerConstants.CMD_SUICIDEFB_HOE, true, DayZPlayerConstants.STANCEMASK_ERECT);
+	}
+			
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_Ctrl.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_Ctrl.c
new file mode 100644
index 0000000000000000000000000000000000000000..be9b93024668c68cecbec7daf88717614a803035
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_Ctrl.c
@@ -0,0 +1,138 @@
+
+
+// *************************************************************************************
+// ! PluginDayzPlayerDebug_Ctrl
+// *************************************************************************************
+class PluginDayzPlayerDebug_Ctrl
+{	
+	Widget 									m_MainWnd;
+
+	XComboBoxWidget 						m_ForceStance;
+	EditBoxWidget							m_MovSpeedEB;
+	EditBoxWidget							m_MovDirEB;
+	CheckBoxWidget							m_MovOverrideCheckbox;
+	// 
+
+	int 									m_ApplyStanceChange;
+	bool									m_OverrideMovementChange = false;
+
+
+	//---------------------------------------------------
+  // gui stuff
+
+	void PluginDayzPlayerDebug_Ctrl(Widget pMainWnd)
+	{
+		m_MainWnd 			= pMainWnd;
+		m_ApplyStanceChange = -2;
+
+		CreateModuleWidgets();
+	}
+	
+	
+	void ~PluginDayzPlayerDebug_Ctrl()
+	{
+		DestroyModuleWidgets();
+	}
+	
+	
+	void CreateModuleWidgets()
+	{
+		m_ForceStance = XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("StanceV") );
+		m_MovSpeedEB = EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("MovSpeedEB") );
+		m_MovDirEB = EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("MovDirEB") );
+		m_MovOverrideCheckbox = CheckBoxWidget.Cast( m_MainWnd.FindAnyWidget("OverrideMovCheckBox") );
+	}
+	
+	void DestroyModuleWidgets()
+	{
+	}
+
+	
+
+	//---------------------------------------------------
+    // main update
+
+	
+	/* void Tick()
+	{
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (!player)
+		{
+			return;
+		}
+		
+		if (player)
+		{
+		}
+	} */
+	
+
+	//---------------------------------------------------
+    // window ui clicks
+
+	//! buttons clicks
+	bool	OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_ForceStance)
+		{
+			Print("Stance changed");
+			m_ApplyStanceChange = m_ForceStance.GetCurrentItem() - 1;
+			return true;
+		}
+		else if (w == m_MovOverrideCheckbox)
+		{
+			Print("Movement override");
+			m_OverrideMovementChange = true;
+		}
+		
+	
+		return false;
+	}
+
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if( w == m_MovSpeedEB || w == m_MovDirEB )
+		{
+			Print("Movement override");
+			m_OverrideMovementChange = true;
+			return true;
+		}
+		
+		return false;
+	}
+
+	//---------------------------------------------------
+    // Global handler to handle commands from player
+
+	void 	CommandHandler()
+	{
+		if (m_ApplyStanceChange != -2)
+		{
+			DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+			if (!player)
+			{	
+				return;
+			}
+			
+			HumanCommandMove cm = player.GetCommand_Move();
+			if (cm)
+			{
+				cm.ForceStance(m_ApplyStanceChange);
+				m_ApplyStanceChange = -2;
+			}
+		}
+		if (m_OverrideMovementChange)
+		{
+			m_OverrideMovementChange = false;
+			
+			player = DayZPlayer.Cast( GetGame().GetPlayer() );
+			if (!player)
+				return;
+						
+			float speed = m_MovSpeedEB.GetText().ToFloat();
+			float dir = m_MovDirEB.GetText().ToFloat();
+			player.GetInputController().OverrideMovementSpeed(m_MovOverrideCheckbox.IsChecked(), speed);
+			player.GetInputController().OverrideMovementAngle(m_MovOverrideCheckbox.IsChecked(), dir);
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_OtherCmds.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_OtherCmds.c
new file mode 100644
index 0000000000000000000000000000000000000000..7c20f65335b0647dbc4f7a4a756e29af2f98b8f6
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_OtherCmds.c
@@ -0,0 +1,184 @@
+// *************************************************************************************
+// ! PluginDayzPlayerDebug_OtherCmds
+// *************************************************************************************
+
+class PluginDayzPlayerDebug_OtherCmds
+{	
+	// widgets
+	Widget								m_MainWnd;
+
+	XComboBoxWidget 					m_DeathTypeCB;
+	EditBoxWidget 						m_DeathDirectionEdit;
+	ButtonWidget						m_DeathStartButton;
+	
+	XComboBoxWidget 					m_HitTypeCB;
+	ButtonWidget						m_HitStartButton;
+
+	XComboBoxWidget 					m_UnconTypeCB;
+	ButtonWidget						m_UnconStartButton;
+	ButtonWidget						m_UnconEndButton;
+	
+	// command handler properties
+	bool								m_CH_DeathStart = false;
+	bool								m_CH_HitStart = false;
+	bool								m_CH_UnconStart = false;
+	bool								m_CH_UnconEnd	= false;
+
+	
+	//---------------------------------------------------
+	// gui stuff
+
+	void PluginDayzPlayerDebug_OtherCmds(Widget pMainWnd)
+	{
+		m_MainWnd = pMainWnd;
+		CreateModuleWidgets();
+	}
+	
+	
+	void ~PluginDayzPlayerDebug_OtherCmds()
+	{
+		DestroyModuleWidgets();
+	}
+	
+	
+	void CreateModuleWidgets()
+	{
+		m_DeathTypeCB			= XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("DeathTypeCB") );
+		m_DeathDirectionEdit	= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("DeathDirectionEdit") );
+		m_DeathStartButton		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("DeathStartButton") );
+		
+		m_HitTypeCB				= XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("HitTypeCB") );
+		m_HitStartButton		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("HitStartButton") );
+
+		m_UnconTypeCB			= XComboBoxWidget.Cast( m_MainWnd.FindAnyWidget("UnconTypeCB") );
+		m_UnconStartButton		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("UnconStartButton") );
+		m_UnconEndButton		= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("UnconEndButton") );
+	}
+	
+	void DestroyModuleWidgets()
+	{
+	}
+
+	//---------------------------------------------------
+    // window ui clicks
+
+	//! buttons clicks
+	bool OnClick(Widget w, int x, int y, int button)
+	{
+		if( w == m_DeathStartButton )
+		{
+			Print("PluginPlayerDebug: Death Start");
+			m_CH_DeathStart = true;
+			return true;
+		}
+		else if( w == m_HitStartButton )
+		{
+			Print("PluginPlayerDebug: Uncon Start");
+			m_CH_HitStart = true;
+			return true;
+		}
+		else if( w == m_UnconStartButton )
+		{
+			Print("PluginPlayerDebug: Uncon Start");
+			m_CH_UnconStart = true;
+			return true;
+		}
+		else if( w == m_UnconEndButton )
+		{
+			Print("PluginPlayerDebug: Uncon End");
+			m_CH_UnconEnd = true;
+			return true;
+		}
+		
+		return false;
+	}
+
+
+	//---------------------------------------------------
+    // Global handler to handle commands from player
+
+	void CommandHandler()
+	{
+		if( m_CH_DeathStart )
+		{
+			Death_Start();
+			m_CH_DeathStart = false;
+		}
+		if( m_CH_HitStart )
+		{
+			Hit_Start();
+			m_CH_HitStart = false;
+		}
+		if( m_CH_UnconStart )
+		{
+			Uncon_Start();
+			m_CH_UnconStart = false;
+		}
+		if( m_CH_UnconEnd )
+		{
+			Uncon_End();
+			m_CH_UnconEnd = false;
+		}
+	}
+
+	//---------------------------------------------------
+    // Commands start functions
+
+	void Death_Start()
+	{
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if( !player )
+			return;
+
+		int deathType = m_DeathTypeCB.GetCurrentItem();
+		if( deathType > 0 )
+			deathType += 9;
+		
+		float deathDirection = m_DeathDirectionEdit.GetText().ToInt();
+		
+		
+		player.StartCommand_Death(deathType, deathDirection, HumanCommandDeathCallback);
+	}
+
+	void Hit_Start()
+	{
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if( !player )
+			return;
+
+		float hitDirection = m_DeathDirectionEdit.GetText().ToInt();
+		int hitType = m_HitTypeCB.GetCurrentItem();
+		if( hitType == 0 )
+		{
+			player.AddCommandModifier_Damage(0, hitDirection);
+		}
+		else
+		{
+			player.StartCommand_Damage(0, hitDirection);
+		}
+	}
+
+	void Uncon_Start()
+	{
+		DayZPlayerImplement player = DayZPlayerImplement.Cast( GetGame().GetPlayer() );
+		if( !player )
+			return;
+		
+		int type = m_UnconTypeCB.GetCurrentItem();
+		
+		player.m_UnconsciousDebug = true;
+		player.StartCommand_Unconscious(type);
+	}
+	
+	void Uncon_End()
+	{
+		DayZPlayerImplement player = DayZPlayerImplement.Cast( GetGame().GetPlayer() );
+		if( !player )
+			return;
+		
+		player.m_UnconsciousDebug = false;
+		HumanCommandUnconscious hcu = player.GetCommand_Unconscious();
+		if( hcu )
+			hcu.WakeUp();
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_Weapons.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_Weapons.c
new file mode 100644
index 0000000000000000000000000000000000000000..f330619b08c1c500204d8595e8baeb13808ec94f
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDayzPlayerDebug_Weapons.c
@@ -0,0 +1,466 @@
+
+// *************************************************************************************
+// ! PluginDayzPlayerWeaponsDebugUserData
+// *************************************************************************************
+class PluginDayzPlayerWeaponsDebugUserData
+{
+	void PluginDayzPlayerWeaponsDebugUserData(int pAction, int pActionType)
+	{
+		m_iAction = pAction;
+		m_iActionT = pActionType;
+	}
+		
+
+	int		GetAction()
+	{
+		return m_iAction;
+	}
+
+	int		GetActionType()
+	{
+		return m_iActionT;
+	}
+
+
+	protected int 	m_iAction;
+	protected int 	m_iActionT;
+}
+
+
+// *************************************************************************************
+// ! PluginDayzPlayerDebug_AbilityConfig
+// *************************************************************************************
+class PluginDayzPlayerDebug_AbilityConfig
+{
+	void PluginDayzPlayerDebug_AbilityConfig(string pName, int pAction, int pActionT) 
+	{ 
+		m_Name = pName; 
+		m_iAction = pAction; 
+		m_iActionT = pActionT; 
+	}
+
+	string		m_Name;
+	int				m_iAction;
+	int				m_iActionT;
+};
+
+
+
+// *************************************************************************************
+// ! PluginDayzPlayerDebug  
+// *************************************************************************************
+class PluginDayzPlayerDebug_Weapons 
+{	
+	Widget 									m_MainWnd;
+
+	TextListboxWidget				m_Selector;
+	ButtonWidget						m_ButtonStart;
+	TextWidget							m_WidgetActionRunning;	
+	TextWidget							m_WidgetActionEvents;
+	Weapon_Base							m_CurrentWeapon;
+	EditBoxWidget 						m_SetInitStateI;
+	ButtonWidget						m_SetInitStateB;
+	ButtonWidget						m_WeaponChange;
+	ButtonWidget						m_WeaponHide;
+	EditBoxWidget 						m_WeaponSlotH;
+	EditBoxWidget 						m_WeaponSlotS;
+	EditBoxWidget 						m_WeaponActionProgressStart;
+	EditBoxWidget 						m_WeaponActionProgressEnd;
+
+	// command handler properties
+	int 								m_CH_WeapAction			= -1;
+	int 								m_CH_WeapActionType		= -1;
+	int 								m_CH_LastWeapAction		= -1;
+	int 								m_CH_LastWeapActionType	= -1;
+	float								m_CH_WeapActionProgressStart = 0;
+	float								m_CH_WeapActionProgressEnd = 1;
+
+	string 								m_CH_WeaponChangeI;
+	int 								m_CH_WeaponChangeSlotH = -1;
+	int 								m_CH_WeaponChangeSlotS = -1;
+
+	//---------------------------------------------------
+	// 
+
+	//!
+	ref array<ref PluginDayzPlayerDebug_AbilityConfig> m_AbilityConfig =
+	{ 
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload Mag Bullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_BULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload NoMag Buller", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_BULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload Mag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload NoMag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload Mag NoBullet lock", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_NOBULLET_OPEN),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload NoMag NoBullet lock", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_NOMAGAZINE_NOBULLET_OPEN),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload Clip NoBullet", WeaponActions.RELOAD_CLIP, WeaponActionReloadClipTypes.RELOADRIFLE_CLIP_NOBULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle - Reload Clip Bullet", WeaponActions.RELOAD_CLIP, WeaponActionReloadClipTypes.RELOADRIFLE_CLIP_BULLET),
+
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Closed - Reload Mag Bullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_BULLET_CLOSED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Closed - Reload NoMag Bullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_BULLET_CLOSED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Closed Charged - Reload Mag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_COCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Closed Charged - Reload NoMag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_COCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Closed Discharged - Reload Mag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_CLOSED_UNCOCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Closed Discharged - Reload NoMag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_CLOSED_UNCOCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Opened - Reload NoMag ", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_NOMAGAZINE_NOBULLET_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Opened - Reload Mag ", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADPISTOL_MAGAZINE_NOBULLET_OPENED),
+		
+		PluginDayzPlayerDebug_AbilityConfig("Pistol Detach Magazine", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOAD_MAGAZINE_DETACH),
+		PluginDayzPlayerDebug_AbilityConfig("Rifle Detach Magazine", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADRIFLE_MAGAZINE_DETACH),
+		
+		PluginDayzPlayerDebug_AbilityConfig("Sp Rifle - Reload Mag Bullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_BULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Sp Rifle - Reload NoMag Buller", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_BULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Sp Rifle - Reload Mag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_MAGAZINE_NOBULLET),
+		PluginDayzPlayerDebug_AbilityConfig("Sp Rifle - Reload NoMag NoBullet", WeaponActions.RELOAD, WeaponActionReloadTypes.RELOADSRIFLE_NOMAGAZINE_NOBULLET),
+
+		PluginDayzPlayerDebug_AbilityConfig("Mechanism Opened", WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Mechanism Closed", WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED),
+		PluginDayzPlayerDebug_AbilityConfig("Mechanism Spec", WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_SPECIAL),
+		PluginDayzPlayerDebug_AbilityConfig("Mechanism Closed Uncocked", WeaponActions.MECHANISM, WeaponActionMechanismTypes.MECHANISM_CLOSED_UNCOCKED),
+
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 1 Bullet Opened", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 1 Bullet Closed", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_CLOSED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 1 Bullet Unique Opened", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 1 Bullet Unique Closed", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ONEBULLET_UNIQUE_CLOSED),
+
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 2 Bullets Start", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_TWOBULLETS_START),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 2 Bullets End", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_TWOBULLETS_END),
+
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loopable Start Closed", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loopable Start Closed keep bullet", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_CLOSED_KEEP),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loopable Start Opened", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loopable End", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_ENDLOOPABLE),
+		
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loopable Shotgun Start Uncocked", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_UNCOCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loopable Shotgun Start Cocked", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_STARTLOOPABLE_SHOTGUN_COCKED),
+
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 1", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_1),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 2", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_2),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 3", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_3),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb 4", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_DOUBLE_4),		
+
+		PluginDayzPlayerDebug_AbilityConfig("Crossbow Opened", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Crossbow Close", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_CLOSED),
+		PluginDayzPlayerDebug_AbilityConfig("Crossbow Full", WeaponActions.CHAMBERING, WeaponActionChamberingTypes.CHAMBERING_CROSSBOW_FULL),
+		
+		PluginDayzPlayerDebug_AbilityConfig("INTERRUPT", WeaponActions.INTERRUPT, -1),
+
+
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loader 1 Bullet Opened", WeaponActions.CHAMBERING_LOADER, WeaponActionChamberingLoaderTypes.CHAMBERINGLOADER_OPENED),
+		PluginDayzPlayerDebug_AbilityConfig("Chamb Loader 1 Bullet Closed", WeaponActions.CHAMBERING_LOADER, WeaponActionChamberingLoaderTypes.CHAMBERINGLOADER_CLOSED),
+
+		PluginDayzPlayerDebug_AbilityConfig("Unjamming Start", WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_START),
+		PluginDayzPlayerDebug_AbilityConfig("Unjamming End", WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_END), 
+		PluginDayzPlayerDebug_AbilityConfig("Unjamming Interrupt", WeaponActions.UNJAMMING, WeaponActionUnjammingTypes.UNJAMMING_INTERRUPT),
+
+		PluginDayzPlayerDebug_AbilityConfig("Fire Normal", WeaponActions.FIRE, WeaponActionFireTypes.FIRE_NORMAL),
+		PluginDayzPlayerDebug_AbilityConfig("Fire Last", WeaponActions.FIRE, WeaponActionFireTypes.FIRE_LAST),
+		PluginDayzPlayerDebug_AbilityConfig("Fire Empty Cocked", WeaponActions.FIRE, WeaponActionFireTypes.FIRE_COCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Fire Empty Uncocked", WeaponActions.FIRE, WeaponActionFireTypes.FIRE_UNCOCKED),
+		PluginDayzPlayerDebug_AbilityConfig("Fire and Jam", WeaponActions.FIRE, WeaponActionFireTypes.FIRE_JAM),
+		PluginDayzPlayerDebug_AbilityConfig("Fire Dry", WeaponActions.FIRE, WeaponActionFireTypes.FIRE_DRY),
+
+	};
+
+
+	int		FindAbilityConfig(int pAction, int pActionT)
+	{
+		int		l = m_AbilityConfig.Count();
+		for (int i = 0; i < l; i++)
+		{
+			if (m_AbilityConfig[i].m_iAction == pAction && m_AbilityConfig[i].m_iActionT == pActionT)
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+
+
+	//---------------------------------------------------
+  // gui stuff
+
+	void PluginDayzPlayerDebug_Weapons(Widget pMainWnd)
+	{
+		m_MainWnd = pMainWnd;
+
+		CreateModuleWidgets();
+
+		//! 
+		DayZPlayer			player 	= DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (player)
+		{
+			HumanCommandWeapons hcw 	= player.GetCommandModifier_Weapons();
+			hcw.DebugResetEvents();
+		}
+	}
+	
+	
+	void ~PluginDayzPlayerDebug_Weapons()
+	{
+		DestroyModuleWidgets();
+	}
+	
+	
+	void CreateModuleWidgets()
+	{
+		m_Selector		= TextListboxWidget.Cast( m_MainWnd.FindAnyWidget("WeapActionSelector") );
+		m_ButtonStart	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("WeapActionStart") );
+
+		m_WidgetActionRunning = TextWidget.Cast( m_MainWnd.FindAnyWidget("WeapActionRunning") );
+		m_WidgetActionEvents  = TextWidget.Cast( m_MainWnd.FindAnyWidget("WeapActionEvents") );
+
+		m_SetInitStateI	= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("WeapInitStateI") );
+		m_SetInitStateB	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("WeapInitStateB") );
+
+		m_WeaponChange 	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("WeapChange") );
+		m_WeaponHide 	= ButtonWidget.Cast( m_MainWnd.FindAnyWidget("WeapHide") );
+		m_WeaponSlotH 	= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("WeaponChangeSlotH") );
+		m_WeaponSlotS 	= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("WeaponChangeSlotS") );
+		m_WeaponActionProgressStart		= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("WeapActionProgressStart") );
+		m_WeaponActionProgressEnd		= EditBoxWidget.Cast( m_MainWnd.FindAnyWidget("WeapActionProgressEnd") );
+
+
+		m_WidgetActionEvents.SetText("Events:"); 
+
+	}
+	
+	void DestroyModuleWidgets()
+	{
+	}
+
+	
+
+	//---------------------------------------------------
+    // main update
+
+	
+	void Tick()
+	{
+		DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+		if (!player)
+		{
+			return;
+		}
+		
+		if (player)
+		{
+			EntityAI entityInHands = player.GetHumanInventory().GetEntityInHands();
+			Weapon_Base w;
+			if (Class.CastTo(w, entityInHands))
+			{
+				if (m_CurrentWeapon != w)
+					WeaponsInit(w);
+			}
+			else
+			{
+				m_Selector.ClearItems();
+			}
+		}
+
+		//! update running action 
+		HumanCommandWeapons hcw = player.GetCommandModifier_Weapons();
+		
+		string text = "Action: " + hcw.GetRunningAction().ToString() + " " + hcw.GetRunningActionType().ToString();
+		m_WidgetActionRunning.SetText(text); 
+
+
+		int 	aEvent = hcw.DebugIsEvent();
+		if (aEvent != -1)
+		{		
+			string eventStr = "Event: ";	
+			eventStr = eventStr + aEvent.ToString() + " ";
+			while(true)
+			{
+				aEvent = hcw.DebugIsEvent();
+				if (aEvent == -1)
+				{
+					break;
+				}
+
+				Print("Event: " + aEvent.ToString());
+				
+				eventStr += aEvent.ToString();
+				eventStr += " ";
+			}
+
+			m_WidgetActionEvents.SetText(eventStr); 
+		}			
+	}
+	
+	
+
+	//---------------------------------------------------
+    // Actions
+
+	void WeaponsInit(Weapon_Base w)
+	{
+			
+		m_Selector.ClearItems();
+
+		//! select weapon abilities
+		int abilityCount = w.GetAbilityCount();
+
+		for (int i = 0; i < abilityCount; ++i)
+		{
+			AbilityRecord rec = w.GetAbility(i);
+			int		abConfigIndex = FindAbilityConfig(rec.m_action, rec.m_actionType);
+			if (abConfigIndex != -1)
+			{
+				m_Selector.AddItem(m_AbilityConfig[abConfigIndex].m_Name, new PluginDayzPlayerWeaponsDebugUserData(rec.m_action, rec.m_actionType), 0);
+			}
+		}
+
+		m_Selector.AddItem("=========== All - not safe =========", NULL, 0);
+
+
+		// if (abilityCount == 0)
+		{
+			int		l = m_AbilityConfig.Count();
+			for (int a = 0; a < l; a++)
+			{
+				m_Selector.AddItem(m_AbilityConfig[a].m_Name, new PluginDayzPlayerWeaponsDebugUserData(m_AbilityConfig[a].m_iAction, m_AbilityConfig[a].m_iActionT), 0);
+			}
+		}
+
+		m_CurrentWeapon = w;
+	}
+
+
+	//!
+	void	WeaponsStartAction()
+	{
+		int		row = m_Selector.GetSelectedRow();
+		if (row == -1)
+		{
+			return;
+		}
+
+		PluginDayzPlayerWeaponsDebugUserData	userData;
+		m_Selector.GetItemData(row, 0, userData);
+		if (userData)
+		{
+			m_CH_WeapAction		= userData.GetAction();
+			m_CH_WeapActionType	= userData.GetActionType();
+			m_CH_WeapActionProgressStart = m_WeaponActionProgressStart.GetText().ToFloat();
+			m_CH_WeapActionProgressEnd = m_WeaponActionProgressEnd.GetText().ToFloat();
+
+			Print("DayzPlayerImplement_Weapons::WeaponsStartAction");
+		}
+	}
+
+
+	//---------------------------------------------------
+    // window ui clicks
+
+	//! buttons clicks
+	bool	OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_ButtonStart)
+		{
+			WeaponsStartAction();
+			return true;
+		}
+	    else if (w == m_SetInitStateB)
+		{
+			int frameI = m_SetInitStateI.GetText().ToInt();
+			
+			DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+
+			HumanCommandWeapons 	hcw = player.GetCommandModifier_Weapons();
+			hcw.SetInitState(frameI);			
+		}
+		else if (w == m_WeaponChange)
+		{
+		    Print("Weapon Change pressed");
+
+			Dispatcher d = GetDispatcher();
+			if (d == null)
+			{
+				Print("No dispatcher - cannot get selected weapon");
+				return false;
+			}
+
+			Param		p = d.CallMethod(CALL_ID_SCR_CNSL_GETSELECTEDITEM, null);
+			if (p == null)
+			{
+				Print("No selected object");
+				return false;
+			}
+
+			Param1<string> p1 = Param1<string>.Cast(p);
+			Print(p1.param1);
+
+			m_CH_WeaponChangeI 		= p1.param1;
+			m_CH_WeaponChangeSlotH 	= m_WeaponSlotH.GetText().ToInt();
+			m_CH_WeaponChangeSlotS 	= m_WeaponSlotS.GetText().ToInt();			
+		}
+		else if (w == m_WeaponHide)
+		{
+			m_CH_WeaponChangeI 		= "";
+			m_CH_WeaponChangeSlotH 	= m_WeaponSlotH.GetText().ToInt();
+			m_CH_WeaponChangeSlotS 	= m_WeaponSlotS.GetText().ToInt();			
+		}
+		
+	
+		return false;
+	}
+
+	//---------------------------------------------------
+    // Global handler to handle commands from player
+
+	bool		IsWeaponChange(out string pNewWeapon, out int pHideSlot, out int pShowSlot)
+	{
+		if (m_CH_WeaponChangeSlotH == -1)
+		{
+			return false;
+		}
+
+		pNewWeapon 	= m_CH_WeaponChangeI;
+		pHideSlot	= m_CH_WeaponChangeSlotH;
+		pShowSlot	= m_CH_WeaponChangeSlotS;
+
+		m_CH_WeaponChangeSlotH = -1;
+		m_CH_WeaponChangeSlotS = -1;
+
+		return true;
+	}
+
+
+	//---------------------------------------------------
+    // Global handler to handle commands from player
+
+	void 	CommandHandler()
+	{
+
+		// last action again 
+		if (KeyState(KeyCode.KC_MULTIPLY) == 1)
+		{
+			ClearKey(KeyCode.KC_MULTIPLY);
+			m_CH_WeapAction 		= m_CH_LastWeapAction;
+			m_CH_WeapActionType 	= m_CH_LastWeapActionType;
+
+			Print("DayzPlayerImplement_Weapons OnKC_MULTIPLY");
+		}
+
+
+		if (m_CH_WeapAction >= 0)
+		{
+			m_CH_LastWeapAction 	= m_CH_WeapAction;
+			m_CH_LastWeapActionType = m_CH_WeapActionType;
+				
+			//!
+			DayZPlayer player = DayZPlayer.Cast( GetGame().GetPlayer() );
+			if (player != NULL)
+			{
+				HumanCommandWeapons 	hcw = player.GetCommandModifier_Weapons();
+				hcw.SetActionProgressParams(m_CH_WeapActionProgressStart, m_CH_WeapActionProgressEnd);
+				hcw.StartAction(m_CH_WeapAction, m_CH_WeapActionType);
+
+				Print("DayzPlayerImplement_Weapons::WeaponsStartAction2");
+
+			}
+
+			m_CH_WeapAction = -1;
+		}
+
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper.c
new file mode 100644
index 0000000000000000000000000000000000000000..53081457abcbdae42c40a8af77e48e24f0965840
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper.c
@@ -0,0 +1,964 @@
+typedef Param7<EntityAI, string, float, float, bool, string, FindInventoryLocationType> DevSpawnItemParams;//(target, item_name, health, quantity, special, presetName, locationType );
+class PluginDeveloper extends PluginBase
+{
+	protected bool									m_IsWinHolding;	
+	protected int									m_FeaturesMask;
+	UIScriptedMenu									m_ScriptConsole;
+	
+	static PluginDeveloper GetInstance()
+	{
+		return PluginDeveloper.Cast( GetPlugin( PluginDeveloper ) );
+	}
+	
+	//! Set Player position at his cursor position in the world
+	void TeleportAtCursor()
+	{
+		DeveloperTeleport.TeleportAtCursorEx();
+	}
+	
+	//! Teleport player at position
+	void Teleport(PlayerBase player, vector position)
+	{
+		DeveloperTeleport.SetPlayerPosition(player, position);
+	}
+	
+	//! Enable / Disable Free camera (Fly mod)
+	void ToggleFreeCameraBackPos()
+	{
+		DeveloperFreeCamera.FreeCameraToggle( PlayerBase.Cast( GetGame().GetPlayer() ), false );
+	}
+	
+	//! Enable / Disable Free camera (Fly mod) - disable of camera will teleport player at current free camera position.
+	void ToggleFreeCamera()
+	{
+		DeveloperFreeCamera.FreeCameraToggle( PlayerBase.Cast( GetGame().GetPlayer() ), true );
+	}
+		
+	bool IsEnabledFreeCamera()
+	{
+		return DeveloperFreeCamera.IsFreeCameraEnabled();
+	}	
+	
+	// System Public Events
+	void PluginDeveloper()
+	{
+		
+	}
+
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		DeveloperFreeCamera.OnInit();
+	}
+	
+	void OnRPC(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+	#ifdef DIAG_DEVELOPER
+		switch (rpc_type)
+		{
+			case ERPCs.DEV_RPC_SPAWN_ITEM_ON_GROUND:
+			{
+				OnRPCSpawnEntityOnGround(player, ctx); break;
+			}
+			case ERPCs.DEV_RPC_SPAWN_ITEM_ON_GROUND_PATTERN_GRID:
+			{
+				OnRPCSpawnEntityOnGroundPatternGrid(player, ctx); break;
+			}
+			case ERPCs.DEV_RPC_SPAWN_ITEM_ON_CURSOR:
+			{
+				OnRPCSpawnEntityOnCursorDir(player, ctx); break;
+			}
+			case ERPCs.DEV_RPC_SPAWN_ITEM_IN_INVENTORY:
+			{
+				OnRPCSpawnEntity(player, ctx); break;
+			}
+			case ERPCs.DEV_RPC_CLEAR_INV:
+			{
+				OnRPCClearInventory(player); break;
+			}
+			case ERPCs.DEV_RPC_SEND_SERVER_LOG:
+			{
+				OnRPCServerLogRecieved( ctx ); break;
+			}
+			case ERPCs.RPC_SYNC_SCENE_OBJECT:
+			{
+				OnRPCSyncSceneObject( ctx ); break;
+			}
+			case ERPCs.DEV_RPC_PLUGIN_DZCREATURE_DEBUG:
+			{
+				OnRPCPluginDayzCreatureDebug(player, rpc_type, ctx); break;
+			}
+			case ERPCs.DEV_RPC_SPAWN_PRESET:
+			{
+				string presetName;
+				EntityAI target;
+				
+				ctx.Read(presetName);
+				ctx.Read(target);
+				
+				HandlePresetSpawn(player,presetName, target); break;
+			}			
+			case ERPCs.DEV_RPC_SET_TIME:
+			{
+				HandleSetTime(player,ctx); break;
+			}
+		}
+		
+		DeveloperTeleport.OnRPC(player, rpc_type, ctx);		
+	#endif
+	}
+	
+	// Public API
+	// Send Print to scripted console
+	void PrintLogClient(string msg_log)
+	{	
+		if ( g_Game.GetUIManager().IsMenuOpen(MENU_SCRIPTCONSOLE) )
+		{
+			Param1<string> msg_p = new Param1<string>(msg_log);
+			CallMethod(CALL_ID_SCR_CNSL_ADD_PRINT, msg_p);
+		}
+	}	
+	
+	// Server Log Synch: Server Side
+	void SendServerLogToClient(string msg)
+	{
+		if ( GetGame() )
+		{
+			array<Man> players = new array<Man>;
+			GetGame().GetPlayers( players );
+			
+			for ( int i = 0; i < players.Count(); ++i )
+			{
+				Param1<string> param = new Param1<string>( msg );
+				Man player = players.Get(i);
+				
+				if ( player  &&  player.HasNetworkID() )
+				{
+					player.RPCSingleParam(ERPCs.DEV_RPC_SEND_SERVER_LOG, param, true, player.GetIdentity());
+				}
+			}
+		}
+	}
+	
+	void OnRPCSyncSceneObject( ParamsReadContext ctx )
+	{
+		Param3<string, EntityAI, Param> par = new Param3<string, EntityAI, Param>( "", NULL, new Param );
+
+		if ( ctx.Read( par ) )
+		{		
+			PluginSceneManager module_scene_editor = PluginSceneManager.Cast( GetPlugin( PluginSceneManager ) );
+			SceneData	scene_data = module_scene_editor.GetLoadedScene();
+			SceneObject scene_object = scene_data.GetSceneObjectByEntityAI( par.param2 );
+			
+			GetGame().GetCallQueue( CALL_CATEGORY_SYSTEM ).CallByName( scene_object, par.param1, par.param3 );
+		}
+	}
+	
+	void OnRPCPluginDayzCreatureDebug(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+		PluginDayZCreatureAIDebug pluginDZCreatureDebug = PluginDayZCreatureAIDebug.Cast( GetPlugin( PluginDayZCreatureAIDebug ) );
+		if (pluginDZCreatureDebug)
+		{
+			pluginDZCreatureDebug.OnRpc(player, rpc_type, ctx);
+		}
+	}
+
+	void HandleSetTime(PlayerBase player, ParamsReadContext ctx)
+	{
+		#ifdef DEVELOPER
+		
+		Param5<int,int,int,int,int> p5 = new Param5<int,int,int,int,int>(0,0,0,0,0);
+
+		if ( ctx.Read( p5 ) )
+		{	
+			//float time01 = p5.param4 / 100;
+			//int time_minutes = Math.Lerp(0, 24*60, time01 );
+			
+			int year = p5.param1;
+			int month = p5.param2;
+			int day = p5.param3;
+			int hour = p5.param4;
+			int minute = p5.param5;
+			
+			
+	
+			GetGame().GetWorld().SetDate(year,month, day, hour, minute);
+			/*
+			Debug.Log("year:" + year);
+			Debug.Log("month:" + month);
+			Debug.Log("day:" + day);
+			Debug.Log("hour:" + hour);
+			Debug.Log("minute:" + minute);
+			*/
+		}
+		
+		#endif
+	}
+		
+	void HandlePresetSpawn(PlayerBase player, string presetName, EntityAI target)
+	{
+		#ifdef DEVELOPER
+		
+		PlayerBase targetPlayer = player;
+		
+		if (target)
+		{	
+			targetPlayer = PlayerBase.Cast(target);
+		}
+		if (!targetPlayer)
+			return;
+		
+		targetPlayer.m_PresetSpawned = true;
+		string class_name = presetName + "_Preset";
+		typename type = class_name.ToType();
+		
+		if (type)
+		{
+			PresetSpawnBase presetObj = PresetSpawnBase.Cast(type.Spawn());
+			
+			if (presetObj)
+			{
+				presetObj.Init(targetPlayer);
+			}
+		}
+
+		#endif
+	}
+	
+	// RPC Events
+	// Server Log Synch: Client Side
+	void OnRPCServerLogRecieved(ParamsReadContext ctx)
+	{
+		Param1<string> param = new Param1<string>( "" );
+		
+		if ( ctx.Read(param) && param.param1 != "" )
+		{
+			Debug.ReceivedLogMessageFromServer(param.param1);
+		}
+	}
+	
+	void OnRPCClearInventory(PlayerBase player)
+	{
+		ClearInventory(player);
+	}
+	
+	// Client -> Server Spawning: Server Side
+	void OnRPCSpawnEntityOnCursorDir(PlayerBase player, ParamsReadContext ctx)
+	{
+		Param7<string, float, float, float, bool, string, bool> p = new Param7<string, float, float, float, bool, string, bool>("", 0, 0, 0, false, "", false);
+		if ( ctx.Read(p) )
+		{
+			SpawnEntityOnCursorDir(player, p.param1, p.param2, p.param3, p.param4, p.param5, p.param6, p.param7);
+		}
+	}
+	
+	void OnRPCSpawnEntityOnGround(PlayerBase player, ParamsReadContext ctx)
+	{
+		Param6<string, float, float, vector, bool, bool> p = new Param6<string, float, float, vector, bool, bool>("", 0, 0, "0 0 0", false, false);
+		if ( ctx.Read(p) )
+		{
+			SpawnEntityOnGroundPos(player, p.param1, p.param2,  p.param3,  p.param4, p.param5, p.param6);
+		}
+	}
+	
+	void OnRPCSpawnEntityOnGroundPatternGrid(PlayerBase player, ParamsReadContext ctx)
+	{
+		auto p = new Param10<string,int, float, float, int, int, float, float, bool, bool>("",0,0,0,0,0,0,0, false, false);
+		if ( ctx.Read(p) )
+		{
+			SpawnEntityOnGroundPatternGrid(player, p.param1, p.param2, p.param3, p.param4, p.param5, p.param6, p.param7, p.param8, p.param9, p.param10);
+		}
+	}
+	void OnRPCSpawnEntity(PlayerBase player, ParamsReadContext ctx)
+	{
+		#ifdef DEVELOPER
+		DevSpawnItemParams p = new DevSpawnItemParams(null,"", 0, 0, false, "", FindInventoryLocationType.ANY);
+		if ( ctx.Read(p) )
+		{
+			EntityAI target = EntityAI.Cast(p.param1);
+			PlayerBase playerTarget = PlayerBase.Cast(target);
+
+			EntityAI ent = SpawnEntityInInventory( target, p.param2,  p.param3, p.param4, p.param5, "", p.param7);
+			if (playerTarget && p.param5)
+			{
+				if (playerTarget.m_PresetSpawned)
+				{
+					playerTarget.m_PresetSpawned = false;
+					playerTarget.m_PresetItems.Clear();
+				}
+				if (ent)
+				{
+					playerTarget.m_PresetItems.Insert(ent);
+				}
+			}
+		}
+		#endif
+	}
+	
+	void OnSetFreeCameraEvent( PlayerBase player, FreeDebugCamera camera )
+	{
+		DeveloperFreeCamera.OnSetFreeCameraEvent( player, camera );
+	}
+	
+	void OnSpawnErrorReport (string name)
+	{
+		PrintString("PluginDeveloper.SpawnEntity() Warning- Cant spawn object: " + name);
+		//DumpStack();
+		PrintString("PluginDeveloper.SpawnEntity() Warning END");
+	}
+
+	void SetupSpawnedEntity(PlayerBase player, EntityAI entity, float health, float quantity = -1, bool special = false, string presetName = "")
+	{
+		#ifdef DEVELOPER
+		if (presetName && player.m_PresetSpawned)//this is how we ascertain this is the first item being spawned from a new preset after a previous preset was already spawned in
+		{
+			player.m_PresetItems.Clear();
+			player.m_PresetSpawned = false;//is set to 'true' elsewhere after all the items have been spawned in
+		}
+		if ( entity.IsInherited( PlayerBase ) ) 
+		{
+			PlayerBase plr = PlayerBase.Cast( entity );
+			plr.OnSpawnedFromConsole();
+		}
+		else if ( entity.IsInherited(ItemBase) )
+		{
+			ItemBase item = ItemBase.Cast( entity );
+			SetupSpawnedItem(item, health, quantity);
+		}
+		else if (entity.IsInherited(House))
+		{
+			entity.PlaceOnSurface();
+			vector pos = entity.GetPosition();
+			vector ori = GetGame().GetSurfaceOrientation(pos[0], pos[2]);
+			entity.SetOrientation(ori);
+		}
+		if (presetName)
+		{
+			player.m_PresetItems.Insert(entity);
+		}
+
+		if ( special )
+		{
+			auto debugParams = DebugSpawnParams.WithPlayer(player);
+			entity.OnDebugSpawnEx(debugParams);
+		}
+		#endif
+	}
+	
+	
+	void SpawnEntityOnGroundPatternGrid( PlayerBase player, string item_name, int count, float health, float quantity, int rows, int columns, float gapRow = 1, float gapColumn = 1, bool special= false, bool withPhysics = false)
+	{
+		if (!item_name)
+		{
+			return;
+		}
+		if ( GetGame().IsServer() )
+		{	
+			float rowDist = 0;	
+			float columnDist = 0;
+			
+			vector playerPos = player.GetPosition();
+			vector camDirForward = player.GetDirection();
+			vector camDirRight = camDirForward.Perpend() * -1;
+			int countLoop = 0;
+			for (int i = 0; i < rows; i++)
+			{
+				vector posRow = playerPos + camDirForward * rowDist;
+				vector offsetSide;
+				columnDist = 0;
+				for (int j = 0; j < columns; j++)
+				{
+					offsetSide = camDirRight * columnDist;
+					vector placement = posRow + offsetSide;
+					float hlth = health * MiscGameplayFunctions.GetTypeMaxGlobalHealth( item_name );
+					EntityAI ent = SpawnEntityOnGroundPos(player, item_name, hlth, quantity, placement, special );
+					ent.PlaceOnSurface();
+			
+					InventoryItem item;
+					if (Class.CastTo(item, ent) && withPhysics)
+						item.ThrowPhysically(null, "0 0 0");
+					
+					countLoop++;
+					if (countLoop == count)
+					{
+						return;
+					}
+					columnDist += gapColumn;
+				}
+				rowDist += gapRow;
+			}
+		}
+		else
+		{
+			auto params = new Param10<string, int, float, float, int, int, float, float, bool, bool>(item_name, count, health, quantity, rows, columns, gapRow, gapColumn, special, withPhysics);
+			player.RPCSingleParam(ERPCs.DEV_RPC_SPAWN_ITEM_ON_GROUND_PATTERN_GRID, params, true);
+		}
+	}
+	
+	void SpawnItemOnCrosshair(notnull PlayerBase player, string itemName, float health, float quantity, float maxDist = 100, bool allowFreeflight = false, bool special = false, bool withPhysics = false)
+	{
+		vector from, to;
+		if (allowFreeflight && FreeDebugCamera.GetInstance().IsActive())
+		{
+			from = FreeDebugCamera.GetInstance().GetPosition();
+			to = from + FreeDebugCamera.GetInstance().GetDirection() * maxDist;
+		}
+		else
+		{
+			from = GetGame().GetCurrentCameraPosition();
+			to = from + GetGame().GetCurrentCameraDirection() * maxDist;	
+		}
+		
+		float hitFraction;
+		vector start, end;
+		vector direction;
+
+		vector hitPos, hitNormal;
+		Object obj;
+		
+		PhxInteractionLayers hitMask =  PhxInteractionLayers.BUILDING | PhxInteractionLayers.DOOR | PhxInteractionLayers.VEHICLE | PhxInteractionLayers.ROADWAY | PhxInteractionLayers.TERRAIN | PhxInteractionLayers.CHARACTER | PhxInteractionLayers.AI | PhxInteractionLayers.RAGDOLL | PhxInteractionLayers.RAGDOLL_NO_CHARACTER;
+		DayZPhysics.RayCastBullet(from, to, hitMask, player, obj, hitPos, hitNormal, hitFraction);
+		
+		// something is hit
+		if (hitPos != vector.Zero)
+		{
+			SpawnEntityOnGroundPos(player, itemName, health, quantity, hitPos, special, withPhysics);
+		}
+	}
+	
+	/**
+	 * @fn		SpawnEntityOnGroundPos
+	 * @brief	spawns entity on exact position
+	 * @param[in]	health	\p	health of the item
+	 * @param[in]	quantity	\p	quantity to set if item.HasQuantity() (-1 == set to max)
+	 * @param[in]	pos	\p	position where to spawn
+	 * @return	entity if ok, null otherwise
+	 **/
+	EntityAI SpawnEntityOnGroundPos( PlayerBase player, string item_name, float health, float quantity, vector pos, bool special = false, bool withPhysics = false)
+	{
+		if ( GetGame().IsServer() )
+		{		
+			EntityAI entity = player.SpawnEntityOnGroundPos(item_name, pos);
+			if (entity)
+				SetupSpawnedEntity(player, entity, health, quantity, special);
+			else
+				OnSpawnErrorReport(item_name);
+			
+			InventoryItem item;
+			if (Class.CastTo(item, entity) && withPhysics)
+				item.ThrowPhysically(null, "0 0 0");
+			
+			return entity;
+		}
+		else
+		{		
+			Param6<string, float, float, vector, bool, bool> params = new Param6<string, float, float, vector, bool, bool>(item_name, health, quantity, pos, special, withPhysics);
+			player.RPCSingleParam(ERPCs.DEV_RPC_SPAWN_ITEM_ON_GROUND, params, true);
+		}
+		return NULL;
+	}
+	/**
+	 * @fn		SpawnEntityOnCursorDir
+	 * @brief	spawns entity in direction of cursor at specified distance
+	 * @param[in]	health	\p	health of the item
+	 * @param[in]	quantity	\p	quantity to set if item.HasQuantity() (-1 == set to max)
+	 * @param[in]	distance	\p	distance of the item from player
+	 * @return	entity if ok, null otherwise
+	 **/
+	EntityAI SpawnEntityOnCursorDir( PlayerBase player, string item_name, float quantity, float distance, float health = -1, bool special = false, string presetName = "", bool withPhysics = false)
+	{
+
+		if ( GetGame().IsServer() )
+		{		
+			// Client -> Server Spawning: Server Side
+			EntityAI entity = player.SpawnEntityOnGroundOnCursorDir(item_name, distance);
+			
+			if ( entity )
+			{
+				if ( !entity.IsBuilding() && health < 0 && entity.GetMaxHealth() > 0)//check for default (-1)
+				{
+					health = entity.GetMaxHealth();
+				}
+				SetupSpawnedEntity( player,entity, health, quantity, special, presetName );
+			}
+			else
+				OnSpawnErrorReport( item_name );
+			
+			InventoryItem item;
+			if (Class.CastTo(item, entity) && withPhysics)
+				item.ThrowPhysically(null, "0 0 0");
+			
+			return entity;
+		}
+		else
+		{		
+			// Client -> Server Spawning: Client Side
+			Param7<string, float, float, float, bool, string, bool> params = new Param7<string, float, float, float, bool, string, bool>(item_name, quantity, distance, health, special, presetName, withPhysics);
+			player.RPCSingleParam(ERPCs.DEV_RPC_SPAWN_ITEM_ON_CURSOR, params, true);
+		}
+		return NULL;
+	}
+	/**
+	 * @fn		SpawnEntityInInventory
+	 * @brief	tries to spawn item somewhere in inventory
+	 *
+	 * SpawnEntityInInventory queries future parent about free inventory location of the future item
+	 *
+	 * @param[in]	health	\p	health of the item
+	 * @param[in]	quantity	\p	quantity to set if item.HasQuantity() (-1 == set to max)
+	 * @return	entity if ok, null otherwise
+	 **/
+	EntityAI SpawnEntityInInventory( notnull EntityAI target, string className, float health, float quantity, bool special = false, string presetName = "", FindInventoryLocationType locationType = FindInventoryLocationType.ANY)
+	{
+		if (target.IsPlayer())
+		{
+			return SpawnEntityInPlayerInventory(PlayerBase.Cast(target), className, health, quantity, special, presetName, locationType);
+		}
+		if ( GetGame().IsServer() )
+		{
+			InventoryLocation il = new InventoryLocation;
+			if (target.GetInventory() && target.GetInventory().FindFirstFreeLocationForNewEntity(className, FindInventoryLocationType.ANY, il))
+			{
+				EntityAI eai = SpawnEntity(className, il, ECE_IN_INVENTORY, RF_DEFAULT);
+				if ( eai && eai.IsInherited(ItemBase) )
+				{
+					if ( health < 0 )//check for default (-1)
+					{
+						health = eai.GetMaxHealth();
+					}
+					ItemBase i = ItemBase.Cast( eai );
+					SetupSpawnedItem(i, health, quantity);
+					if ( special )
+					{
+						auto debugParams = DebugSpawnParams.WithPlayer(null);
+						eai.OnDebugSpawnEx(debugParams);
+					}
+				}
+				return eai;
+			}
+		}
+		else
+		{
+			DevSpawnItemParams params = new DevSpawnItemParams(target, className, health, quantity, special, presetName, 0 );
+				GetGame().GetPlayer().RPCSingleParam(ERPCs.DEV_RPC_SPAWN_ITEM_IN_INVENTORY, params, true, GetGame().GetPlayer().GetIdentity());
+		}
+		return null;
+	}
+	
+	EntityAI SpawnEntityInPlayerInventory(PlayerBase player, string item_name, float health, float quantity, bool special = false, string presetName = "", FindInventoryLocationType locationType = FindInventoryLocationType.ANY)
+	{
+		if ( player )
+		{
+			if ( GetGame().IsServer() )
+			{
+				if (locationType == FindInventoryLocationType.HANDS && player.GetItemInHands())
+				{
+					if (!GetGame().IsMultiplayer())
+						player.DropItem(player.GetItemInHands());
+					else
+						player.ServerDropEntity(player.GetItemInHands());
+					GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(SpawnEntityInPlayerInventory,100, false, player, item_name, health, quantity, special, presetName, locationType);
+					return null;
+				}
+			
+				
+				#ifdef DEVELOPER
+				if (GetGame().IsKindOf(item_name, "Transport"))
+				{
+					EntityAI car = SpawnEntityOnGroundPos(player, item_name, 1, quantity, player.GetPosition());
+
+					auto debugParams = DebugSpawnParams.WithPlayer(player);
+					car.OnDebugSpawnEx(debugParams);
+					
+					if (GetGame().IsMultiplayer())
+					{
+						DayZPlayerSyncJunctures.SendGetInCar(player, car);
+					}
+					else
+					{
+						player.SetGetInVehicleDebug(car);
+					}
+
+					return car;
+				}
+				#endif
+
+				InventoryLocation il = new InventoryLocation;
+				if (player.GetInventory() && player.GetInventory().FindFirstFreeLocationForNewEntity(item_name, locationType, il))
+				{
+					Weapon_Base wpn = Weapon_Base.Cast(il.GetParent());
+					bool is_mag = il.GetSlot() == InventorySlots.MAGAZINE || il.GetSlot() == InventorySlots.MAGAZINE2 || il.GetSlot() == InventorySlots.MAGAZINE3;
+					if (wpn && is_mag)
+					{
+						vector pos = player.GetPosition();
+						EntityAI eai_gnd = SpawnEntityOnGroundPos(player, item_name, health, quantity, pos);
+						Magazine mag_gnd = Magazine.Cast(eai_gnd);
+						if (mag_gnd && player.GetWeaponManager().CanAttachMagazine(wpn, mag_gnd))
+						{
+							player.GetWeaponManager().AttachMagazine(mag_gnd);
+						}
+						return eai_gnd;
+					}
+					else
+					{
+						EntityAI eai = SpawnEntity(item_name, il, ECE_IN_INVENTORY, RF_DEFAULT);
+						if ( eai && eai.IsInherited(ItemBase) )
+						{
+							if ( health < 0 )//check for default (-1)
+							{
+								health = eai.GetMaxHealth();
+							}
+							ItemBase i = ItemBase.Cast( eai );
+							SetupSpawnedItem(i, health, quantity);
+							if ( special )
+							{
+								auto debugParams2 = DebugSpawnParams.WithPlayer(player);
+								eai.OnDebugSpawnEx(debugParams2);
+							}
+						}
+						return eai;
+					}
+				}
+				else
+					OnSpawnErrorReport(item_name);
+				return NULL;
+			}
+			else
+			{		
+				// Client -> Server Spawning: Client Side
+				DevSpawnItemParams params = new DevSpawnItemParams(player, item_name, health, quantity, special, presetName, locationType );
+				player.RPCSingleParam(ERPCs.DEV_RPC_SPAWN_ITEM_IN_INVENTORY, params, true);
+			}
+		}
+		return NULL;
+	}
+	/**
+	 * @fn		SpawnEntityAsAttachment
+	 * @brief	tries to spawn item as attachment
+	 * @param[in]	health	\p	health of the item
+	 * @param[in]	quantity	\p	quantity to set if item.HasQuantity() (-1 == set to max)
+	 * @return	entity if ok, null otherwise
+	 **/
+	EntityAI SpawnEntityAsAttachment (PlayerBase player, EntityAI parent, string att_name, float health, float quantity)
+	{
+		if ( GetGame().IsServer() )
+		{
+			Weapon_Base wpn = Weapon_Base.Cast(parent);
+			if (wpn)
+			{
+				GameInventory inventory = parent.GetInventory();
+				return inventory.CreateInInventory(att_name);
+				/*
+				vector pos = player.GetPosition();
+				EntityAI eai_gnd = SpawnEntityOnGroundPos(player, att_name, health, quantity, pos);
+				Magazine mag_gnd = Magazine.Cast(eai_gnd);
+				if (mag_gnd && player.GetWeaponManager().CanAttachMagazine(wpn, mag_gnd))
+				{
+					player.GetWeaponManager().AttachMagazine(mag_gnd);
+				}
+				return eai_gnd;
+				*/
+			}
+			else
+			{
+				EntityAI eai = parent.GetInventory().CreateAttachment(att_name);
+				if (eai)
+				{
+					if ( eai.IsInherited(ItemBase) )
+					{
+						ItemBase i = ItemBase.Cast( eai );
+						SetupSpawnedItem(ItemBase.Cast( eai ), health, quantity);
+					}
+					return eai;
+				}
+				else
+					OnSpawnErrorReport(att_name);
+			}
+			return NULL;
+		}
+		else
+		{		
+			// Client -> Server Spawning: Client Side
+			Param3<string, float, float> params = new Param3<string, float, float>(att_name, health, quantity);
+			player.RPCSingleParam(ERPCs.DEV_RPC_SPAWN_ITEM_AS_ATTACHMENT, params, true);
+		}
+		return NULL;
+	}
+	
+	EntityAI SpawnFromClipboard()
+	{
+		UIScriptedMenu menu_curr = GetGame().GetUIManager().GetMenu();
+
+		if ( menu_curr == NULL )
+		{			
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if ( player )
+			{
+				if ( !GetGame().GetWorld().Is3rdPersonDisabled() )
+				{
+					player.SetIsInThirdPerson(!player.IsInThirdPerson());//this counters the effect of switching camera through pressing the 'V' key
+				}
+
+					vector pos_player = player.GetPosition();
+					
+					// Get item from clipboard
+					string		clipboard;
+					GetGame().CopyFromClipboard(clipboard);
+								
+					if (!clipboard.Contains(","))
+					{
+						//single item
+						if (DeveloperFreeCamera.IsFreeCameraEnabled())
+							SpawnItemOnCrosshair(player, clipboard.Trim(), -1, 1, 40, true );
+						else
+							SpawnEntityOnCursorDir(player, clipboard.Trim(), 1, 1);
+					}
+					else
+					{
+						TStringArray items = new TStringArray;
+						clipboard.Split( ",", items );
+						
+						foreach (string item:items)
+						{
+							if (DeveloperFreeCamera.IsFreeCameraEnabled())
+								SpawnItemOnCrosshair(player, item.Trim(), -1, 1, 40, true );
+							else
+								SpawnEntityOnCursorDir(player, item.Trim(), 1, 1);
+						}
+					}
+				
+			}
+		}
+		
+		return NULL;
+	}
+	
+	// Clear Entity Inventory
+	void ClearInventory(EntityAI entity)
+	{
+		if ( GetGame().IsServer() )
+		{
+			entity.ClearInventory();
+		}
+		else
+		{
+			Param1<int> params = new Param1<int>(0);
+			entity.RPCSingleParam(ERPCs.DEV_RPC_CLEAR_INV, params, true);
+		}
+	}	
+	
+	void ToggleHelpScreen()
+	{
+		if ( g_Game.GetUIManager().GetMenu() == NULL )
+		{
+			g_Game.GetUIManager().EnterScriptedMenu(MENU_HELP_SCREEN, NULL);
+		}
+		else if ( g_Game.GetUIManager().IsMenuOpen(MENU_HELP_SCREEN) )
+		{
+			g_Game.GetUIManager().Back();
+		}
+	}
+
+	void ToggleScriptConsole()
+	{
+		if (GetGame() != null && !g_Game.IsLoading() && GetGame().GetMission())
+		{
+			if ( g_Game.GetUIManager().GetMenu() == NULL )
+			{
+				m_ScriptConsole = g_Game.GetUIManager().EnterScriptedMenu(MENU_SCRIPTCONSOLE, NULL);
+				GetGame().GetMission().AddActiveInputExcludes({"menu"});
+				
+			}
+			else if ( g_Game.GetUIManager().IsMenuOpen(MENU_SCRIPTCONSOLE) )
+			{
+				g_Game.GetUIManager().Back();
+				GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+			}
+		}
+	}
+	
+	// Mission Editor
+	void ToggleMissionLoader()
+	{
+		if ( g_Game.GetUIManager().IsMenuOpen(MENU_MISSION_LOADER) )
+		{
+			g_Game.GetUIManager().Back();
+			GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+			return;
+		}
+
+		if ( g_Game.GetUIManager().GetMenu() )
+			g_Game.GetUIManager().GetMenu().Close();
+		
+		g_Game.GetUIManager().EnterScriptedMenu(MENU_MISSION_LOADER, NULL);
+		GetGame().GetMission().AddActiveInputExcludes({"menu"});
+		
+		
+	}
+	
+	// Script Editor History
+	private void ScriptHistoryNext()
+	{
+		// Console key press
+		if ( g_Game.GetUIManager().IsMenuOpen(MENU_SCRIPTCONSOLE) )
+		{
+			CallMethod(CALL_ID_SCR_CNSL_HISTORY_NEXT, NULL);
+		}
+	}
+
+	private	void ScriptHistoryBack()
+	{
+		// Console key press
+		if ( g_Game.GetUIManager().IsMenuOpen(MENU_SCRIPTCONSOLE) )
+		{
+			CallMethod(CALL_ID_SCR_CNSL_HISTORY_BACK, NULL);
+		}
+	}
+	
+	private bool IsIngame()
+	{
+		UIScriptedMenu menu_curr = GetGame().GetUIManager().GetMenu();
+
+		if ( menu_curr == NULL )
+		{			
+			return true;
+		}
+		
+		return false;
+	}
+
+	private bool IsInConsole()
+	{
+		UIScriptedMenu menu_curr = GetGame().GetUIManager().GetMenu();
+
+		if ( menu_curr != NULL && menu_curr.GetID() == MENU_SCRIPTCONSOLE )
+		{			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	// Tools
+	int QuickSortPartition( TStringArray arr, int left, int right )
+	{
+		string pivot = arr.Get( left );
+		int i = left;
+		int j = right + 1;
+		string temp;
+
+		while ( true )
+		{
+			while ( true )
+			{ 
+				i++; 
+				if ( i > right || arr.Get(i) > pivot )
+				{
+					break;
+				}
+			}
+			
+			while ( true )
+			{
+				j--; 
+				if ( arr.Get(j) <= pivot )
+				{
+					break;
+				}
+			}
+			
+			if ( i >= j ) 
+			{
+				break;
+			}
+			
+			temp = arr.Get( i ); 
+			arr.Set( i, arr.Get(j) ); 
+			arr.Set( j, temp );
+		}
+		
+		temp = arr.Get( left ); 
+		arr.Set( left, arr.Get(j) );
+		arr.Set( j, temp );
+	   
+		return j;
+	}
+
+	void QuickSort( TStringArray arr, int left, int right )
+	{
+		int j;
+
+		if ( left < right ) 
+		{
+			j = QuickSortPartition( arr, left, right );
+			QuickSort( arr, left, j - 1 );
+			QuickSort( arr, j + 1, right );
+		}
+	}
+
+	void SortStringArray( TStringArray arr )
+	{
+		QuickSort( arr, 0, arr.Count() - 1 );
+	}
+	
+	void ResetGUI()
+	{
+		if ( GetGame() && GetGame().GetMission() )
+		{
+			GetGame().GetMission().ResetGUI();
+		}
+	}
+	
+	static void SetDeveloperItemClientEx(notnull Object entity, bool getFocus = false)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if (getFocus)
+		{
+			GetGame().GetInput().ChangeGameFocus(1);
+			GetGame().GetUIManager().ShowUICursor(true);
+		}
+
+		if (GetGame().IsMultiplayer())
+		{
+			GetGame().RPCSingleParam(GetGame().GetPlayer(), ERPCs.DEV_SET_DEV_ITEM, new Param1<Object>(entity), true, GetGame().GetPlayer().GetIdentity());
+		}
+		else
+		{
+			PluginItemDiagnostic mid2 = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+			mid2.RegisterDebugItem(entity, player);
+		}
+		#ifdef DEVELOPER
+		SetDebugDeveloper_item(entity);
+		#endif
+	}
+	
+	void SetDeveloperItemClient()
+	{
+		#ifdef DEVELOPER
+		Object entity;
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+
+		FreeDebugCamera debugCam = FreeDebugCamera.GetInstance();
+		if (debugCam && debugCam.GetCurrentCamera())
+		{
+			entity = debugCam.GetCrosshairObject();
+		}
+		else
+		{
+			
+			if (player && player.GetActionManager())
+			{
+				ActionTarget at = player.GetActionManager().FindActionTarget();
+				entity = at.GetObject();
+			}
+		}
+
+		if (entity)
+		{
+			SetDeveloperItemClientEx(entity, true);
+		}
+		#endif
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/DeveloperFreeCamera.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/DeveloperFreeCamera.c
new file mode 100644
index 0000000000000000000000000000000000000000..f97b38cd54a84be27367ac190f27e55d6399e991
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/DeveloperFreeCamera.c
@@ -0,0 +1,84 @@
+class DeveloperFreeCamera
+{
+	static void OnInit();
+	
+	//! Enable / Disable Free camera (Fly mod) - disable of camera will teleport player at current free camera position.
+	static void FreeCameraToggle(PlayerBase player, bool teleport_player = false)
+	{
+		if (!IsFreeCameraEnabled())
+		{
+			EnableFreeCamera(player);
+		}
+		else 
+		{
+			DisableFreeCamera(player, teleport_player);
+		}
+	}
+	
+	static void EnableFreeCameraSceneEditor(PlayerBase player)
+	{
+		EnableFreeCamera(player);	
+	}
+	
+	static bool IsFreeCameraEnabled()
+	{
+		return FreeDebugCamera.GetInstance().IsActive();
+	}
+	
+	protected static void EnableFreeCamera(PlayerBase player)
+	{
+		if (player)
+		{
+			FreeDebugCamera.GetInstance().SetActive(true);
+
+			#ifdef DEVELOPER
+			GetGame().GetMission().RefreshCrosshairVisibility();
+			#endif
+		}
+		else
+		{
+			Debug.LogError("EnableFreeCamera( PlayerBase player ) -> player is NULL", "DeveloperFreeCamera");
+		}
+	}
+
+	static void DisableFreeCamera(PlayerBase player, bool teleport_player = false)
+	{
+		if (player)
+		{
+			if (FreeDebugCamera.GetInstance().IsActive())
+			{
+				if (teleport_player)
+					DeveloperTeleport.TeleportAtCursorEx();
+
+				FreeDebugCamera.GetInstance().SetActive(false);
+
+				#ifdef DEVELOPER
+				if (GetGame().GetMission())
+					GetGame().GetMission().RefreshCrosshairVisibility();
+				#endif
+			}
+		}
+		else
+		{
+			Debug.LogError("DisableFreeCamera( PlayerBase player, bool teleport_player ) -> player is NULL", "DeveloperFreeCamera");
+		}
+	}
+	
+	static void OnSetFreeCameraEvent(PlayerBase player, FreeDebugCamera camera)
+	{
+		if (player)
+		{
+			#ifdef DEVELOPER
+			if (!GetGame().IsMultiplayer())
+			{
+				PluginSceneManager sceneManager = PluginSceneManager.Cast(GetPlugin(PluginSceneManager));
+				
+				if (sceneManager.IsOpened())
+					sceneManager.EditorToggle();
+			}
+			
+			GetGame().GetMission().RefreshCrosshairVisibility();
+			#endif
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/DeveloperTeleport.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/DeveloperTeleport.c
new file mode 100644
index 0000000000000000000000000000000000000000..9001bf22ceb7c03793e1833d1c3af2e838a22d75
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/DeveloperTeleport.c
@@ -0,0 +1,185 @@
+class DeveloperTeleport
+{
+	protected static const float TELEPORT_DISTANCE_MAX = 1000;
+	
+	static void TeleportAtCursor()
+	{
+		if ( !DeveloperFreeCamera.IsFreeCameraEnabled() )
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			vector pos_player = player.GetPosition();
+			
+			Object ignore;
+			if (!Class.CastTo(ignore, player.GetParent()))
+			{
+				ignore = player;
+			}
+
+			vector rayStart = GetGame().GetCurrentCameraPosition();
+			vector rayEnd = rayStart + GetGame().GetCurrentCameraDirection() * 1000;		
+			vector hitPos;
+			vector hitNormal;
+			int hitComponentIndex;		
+			DayZPhysics.RaycastRV(rayStart, rayEnd, hitPos, hitNormal, hitComponentIndex, NULL, NULL, ignore);
+				
+			float distance = vector.Distance( pos_player, hitPos );
+			
+			if ( distance < TELEPORT_DISTANCE_MAX )
+			{
+				bool breakSync = false;
+				
+				#ifdef DIAG_DEVELOPER
+				breakSync = DiagMenu.GetBool(DiagMenuIDs.MISC_TELEPORT_BREAKS_SYNC);
+				#endif
+				
+				SetPlayerPosition(player, hitPos, breakSync);
+			}
+			else
+			{
+				Debug.LogWarning("Distance for teleportation is too far!");
+			}				
+		}
+	}
+	
+	protected static const float TELEPORT_DISTANCE_MAX_EX = 500;
+	static void TeleportAtCursorEx()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		vector rayStart = GetGame().GetCurrentCameraPosition();
+		vector rayEnd = rayStart + GetGame().GetCurrentCameraDirection() * TELEPORT_DISTANCE_MAX_EX;		
+		vector hitPos;
+		vector hitNormal;
+		float hitFraction;
+		Object hitObj;
+			
+		Object ignore;
+		if (!Class.CastTo(ignore, player.GetParent()))
+		{
+			ignore = player;
+		}
+
+		int layers = 0;
+		layers |= PhxInteractionLayers.TERRAIN;
+		layers |= PhxInteractionLayers.ROADWAY;
+		layers |= PhxInteractionLayers.ITEM_LARGE;
+		layers |= PhxInteractionLayers.BUILDING;
+		layers |= PhxInteractionLayers.VEHICLE;
+		layers |= PhxInteractionLayers.RAGDOLL;
+		if (DayZPhysics.SphereCastBullet(rayStart, rayEnd, 0.01, layers, ignore, hitObj, hitPos, hitNormal, hitFraction))
+		{
+			bool breakSync = false;
+				
+			#ifdef DIAG_DEVELOPER
+			breakSync = DiagMenu.GetBool(DiagMenuIDs.MISC_TELEPORT_BREAKS_SYNC);
+			#endif
+				
+			SetPlayerPosition(player, hitPos, breakSync);
+			
+			if (DeveloperFreeCamera.IsFreeCameraEnabled())
+			{
+				DeveloperTeleport.SetPlayerDirection( player, FreeDebugCamera.GetInstance().GetDirection() );
+			}
+		}
+	}
+	
+	// Set Player Position (MP support)
+	static void SetPlayerPosition(PlayerBase player, vector position, bool breakSync = false)
+	{
+		Object object = player;
+		
+		HumanCommandVehicle vehCmd = player.GetCommand_Vehicle();
+		if (vehCmd)
+		{
+			object = vehCmd.GetTransport();
+		}
+		
+#ifdef DIAG_DEVELOPER
+		if (GetGame().IsMultiplayer() && breakSync)
+		{
+			vector v;
+			v[0] = Math.RandomFloat(-Math.PI, Math.PI);
+			v[1] = Math.RandomFloat(-Math.PI, Math.PI);
+			v[2] = Math.RandomFloat(-Math.PI, Math.PI);
+			dBodySetAngularVelocity(object, v);
+			SetVelocity(object, vector.Zero);
+			
+			v[0] = Math.RandomFloat(-Math.PI, Math.PI);
+			v[1] = Math.RandomFloat(-Math.PI, Math.PI);
+			v[2] = Math.RandomFloat(-Math.PI, Math.PI);
+			object.SetOrientation(v  * Math.RAD2DEG);
+		}
+#endif
+		
+		if (GetGame().IsServer())
+		{
+			object.SetPosition(position);
+		}
+		else
+		{
+			Param4<float, float, float, bool> params = new Param4<float, float, float, bool>(position[0], position[1], position[2], breakSync);
+			player.RPCSingleParam(ERPCs.DEV_RPC_TELEPORT, params, true);
+		}
+	}
+	
+	// Set Player Direction (MP support)
+	static void SetPlayerDirection(PlayerBase player, vector direction)
+	{
+		if (GetGame().IsServer())
+		{
+			HumanCommandVehicle vehCmd = player.GetCommand_Vehicle();
+			if (vehCmd)
+			{
+				Transport transport = vehCmd.GetTransport();
+				if (transport)
+					transport.SetDirection(direction);
+			}
+			else
+				player.SetDirection(direction);
+		}
+		else
+		{
+			Param3<float, float, float> params = new Param3<float, float, float>(direction[0], direction[1], direction[2]);
+			player.RPCSingleParam(ERPCs.DEV_RPC_SET_PLAYER_DIRECTION, params, true);
+		}
+	}
+	
+	static void OnRPC(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+		#ifdef DIAG_DEVELOPER
+		if ( rpc_type == ERPCs.DEV_RPC_TELEPORT )
+		{
+			OnRPCSetPlayerPosition(player, ctx);
+		}
+		else if ( rpc_type == ERPCs.DEV_RPC_SET_PLAYER_DIRECTION )
+		{
+			OnRPCSetPlayerDirection(player, ctx);
+		}
+		#endif
+	}
+	
+	static protected void OnRPCSetPlayerPosition(PlayerBase player, ParamsReadContext ctx)
+	{
+		Param4<float, float, float, bool> p = new Param4<float, float, float, bool>(0, 0, 0, false);
+		if (ctx.Read(p))
+		{
+			vector v = "0 0 0";
+			v[0] = p.param1;
+			v[1] = p.param2;
+			v[2] = p.param3;
+			SetPlayerPosition(player, v, p.param4);
+		}
+	}
+	
+	static protected void OnRPCSetPlayerDirection(PlayerBase player, ParamsReadContext ctx)
+	{
+		Param3<float, float, float> p = new Param3<float, float, float>(0, 0, 0);
+		if (ctx.Read(p))
+		{
+			vector v = "0 0 0";
+			v[0] = p.param1;
+			v[1] = p.param2;
+			v[2] = p.param3;
+			SetPlayerDirection(player, v);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/EDeveloperMask.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/EDeveloperMask.c
new file mode 100644
index 0000000000000000000000000000000000000000..8fde3fd0ffd85e2d3057edefcdbb83593253d7fa
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/EDeveloperMask.c
@@ -0,0 +1,8 @@
+enum EDeveloperMask
+{
+	None				= 0,
+	ItemSpawn			= 1,
+	PlayerTeleport		= 2,
+	PlayerGodMode		= 4,
+	PlayerFreeCamera	= 8
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginCharPlacement.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginCharPlacement.c
new file mode 100644
index 0000000000000000000000000000000000000000..33fdfe66e5b3b3c2c7a0498a999226c8e8ac21b2
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginCharPlacement.c
@@ -0,0 +1,80 @@
+class PluginCharPlacement extends PluginBase
+{
+	PluginDeveloper 	m_ModuleDeveloper;
+	PlayerBase		 	m_Character;
+	ref 				Timer m_Timer;
+	bool 				m_Initialized;
+	vector 				m_cam_pos;
+	vector 				m_character_pos;
+	vector 				m_camera_dir;
+	vector 				m_cameraTrans[4];
+	vector 				m_demoPos;
+	vector 				m_demoRot;
+	vector 				m_camera_orientation;
+	
+	const float 		FOV = 0.5236;
+	
+	void CheckInit()
+	{
+		if ( m_Initialized )
+		{
+			Print("logging...");
+			Log(FOV.ToString(),"FOV");
+			Log(m_camera_dir.ToString(),"camera dir");
+			Log(m_cam_pos.ToString(),"camera pos");
+			Log(m_demoPos.ToString(),"character pos");
+			
+			return;
+		}
+		
+		if( FreeDebugCamera.GetInstance().IsActive() ) 
+			Init();
+	}
+	
+	void Init()
+	{
+		if(m_Character)
+			m_Character.Delete();
+		
+		m_Initialized = true;
+		m_Character = PlayerBase.Cast( GetGame().CreateObject("SurvivorF_Judy", FreeDebugCamera.GetInstance().GetPosition(), false, false/*ai*/) );
+		
+		FreeDebugCamera.GetInstance().SetFOV(FOV); //default scene FOV
+		m_demoRot = "0 0 0";
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		if(!m_Initialized) return;
+		if(!FreeDebugCamera.GetInstance().IsActive()) return;
+		if(!m_Character) return;
+		m_camera_orientation = FreeDebugCamera.GetInstance().GetOrientation();
+		m_camera_orientation[1] = 1;
+		FreeDebugCamera.GetInstance().SetOrientation(m_camera_orientation); //remove to unlock vertical axis
+		m_cam_pos = FreeDebugCamera.GetInstance().GetPosition();
+		m_character_pos = m_Character.GetPosition();
+		m_camera_dir = FreeDebugCamera.GetInstance().GetDirection();
+		
+		m_camera_dir.Normalize();
+		m_Character.SetPosition(CalculatePos());//(FreeDebugCamera.GetInstance().GetPosition() + ( m_camera_dir * 2) );
+		m_demoRot[0] = Math.Atan2(-m_camera_dir[0], -m_camera_dir[2]) * Math.RAD2DEG;
+		m_Character.SetOrientation(m_demoRot);//(FreeDebugCamera.GetInstance().GetPosition() - m_demoPos);
+	}
+	
+	override void OnDestroy()
+	{
+		FreeDebugCamera.GetInstance().SetFOV(g_Game.GetUserFOV());
+	}
+	
+	vector CalculatePos()
+	{
+		vector cam_pos = FreeDebugCamera.GetInstance().GetPosition();
+		Math3D.MatrixIdentity4(m_cameraTrans);
+		Math3D.DirectionAndUpMatrix(m_camera_dir/* - SnapToGround(cam_pos)*/, "0 1 0", m_cameraTrans);
+		m_cameraTrans[3] = cam_pos;
+		m_demoPos = Vector(/*0.685547, -0.988281,*/0,0, 3.68823).Multiply4(m_cameraTrans);
+		m_demoPos[1] = GetGame().SurfaceY(m_demoPos[0], m_demoPos[2]);
+		
+		return m_demoPos;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginDoorRuler.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginDoorRuler.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb9485e8b9e4b60962b3c6bea7491cfffcbaa641
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginDoorRuler.c
@@ -0,0 +1,35 @@
+class PluginDoorRuler extends PluginBase
+{
+	PluginDeveloper m_ModuleDeveloper;
+	ItemBase m_Ruler;
+	ref Timer m_Timer;
+	bool m_Initialized;
+	
+	void CheckInit()
+	{
+		if( FreeDebugCamera.GetInstance().IsActive() ) 
+			Init();
+	}
+	
+	void Init()
+	{
+		if(m_Ruler)
+			m_Ruler.Delete();
+		
+		m_Initialized = true;
+		m_Ruler = ItemBase.Cast( GetGame().CreateObject("DoorTestCamera", FreeDebugCamera.GetInstance().GetPosition(), false, false/*ai*/) );
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		if(!m_Initialized) return;
+		if(!FreeDebugCamera.GetInstance().IsActive()) return;
+		if(!m_Ruler) return;
+		vector cam_pos = FreeDebugCamera.GetInstance().GetPosition();
+		vector ruler_pos = m_Ruler.GetPosition();
+		vector camera_dir = FreeDebugCamera.GetInstance().GetDirection(); 
+		camera_dir.Normalize();
+		m_Ruler.SetPosition(FreeDebugCamera.GetInstance().GetPosition() + ( camera_dir * 2) );
+		m_Ruler.SetAngles(FreeDebugCamera.GetInstance().GetAngles());
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginDrawCheckerboard.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginDrawCheckerboard.c
new file mode 100644
index 0000000000000000000000000000000000000000..55eb45f91ab5580005dfd6008978f36c7950f24b
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginDrawCheckerboard.c
@@ -0,0 +1,92 @@
+// quick and dirty way for displaying of checker overlay on screen
+// - userd for camera settings primarily
+class PluginDrawCheckerboard extends PluginBase
+{
+	private	ref Widget	m_MainWindow;
+	private bool		m_IsActive;
+	
+	
+	void PluginDrawCheckerboard()
+	{
+		CreateWidgetOverlay();
+	}
+
+	void ~PluginDrawCheckerboard() {}
+
+	void CreateWidgetOverlay()
+	{
+#ifndef NO_GUI
+		if (!m_MainWindow)
+		{
+			m_MainWindow = GetGame().GetWorkspace().CreateWidgets("gui/layouts/camera_checkerboard.layout");
+			m_MainWindow.Show(false);
+			int childId = 0;
+			int row = 0;
+			bool evenOrOdd;
+			int tilesPerLine = 8;
+
+			Widget child = m_MainWindow.GetChildren();
+			while(child)
+			{
+				evenOrOdd = IsEven(childId);
+
+				//! row counter
+				if(childId > (tilesPerLine * row) - 1)
+				{
+					row++;
+				}
+
+				if(IsEven(row))
+				{
+					evenOrOdd = !evenOrOdd;
+				}
+
+				//! sets alpha level for even/odd child
+				if(evenOrOdd)
+					child.SetAlpha(0.15);
+				else
+					child.SetAlpha(0.05);
+
+				child = child.GetSibling();
+				childId++;
+			}
+		}
+#endif
+	}
+	
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+
+	//! even or odd
+	bool IsEven(int num)
+	{
+		if((num % 2) == 0)
+			return true;
+		else
+			return false;
+	}
+
+	void ShowWidgets(bool show)
+	{
+		if(m_MainWindow) 
+		{
+			m_MainWindow.Show(show);
+		}
+	}
+
+	//!
+	void Show()
+	{
+		ShowWidgets(true);
+		m_IsActive = true;
+	}
+
+	//!
+	void Hide()
+	{
+		ShowWidgets(false);
+		m_IsActive = false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginNutritionDumper.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginNutritionDumper.c
new file mode 100644
index 0000000000000000000000000000000000000000..7625e3fb2e689127e1bd1b1787058a09f9bff609
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginNutritionDumper.c
@@ -0,0 +1,111 @@
+
+class PluginNutritionDumper extends PluginBase
+{
+	/*
+	ref TStringArray m_AllPaths = new TStringArray;
+	ref TStringArray m_AllLines = new TStringArray;
+	ref map<string, int> m_ParamPool = new map<string, int>;
+	
+	string config_path;
+	string child_name;
+	int scope;
+	string path;
+	PlayerBase m_Player;
+	override void OnInit()
+	{
+		m_AllPaths.Insert("CfgVehicles");
+		m_AllPaths.Insert("cfgLiquidDefinitions");
+		m_Player = PlayerBase.Cast(GetGame().GetPlayer());
+	}
+	
+	void CheckInit()
+	{
+		m_AllLines.Clear();
+		string line = "Classname(stage),energy,water,toxicity,fullnessIndex,nutritionalIndex";
+		m_AllLines.Insert(line);
+		
+		for(int i = 0; i < m_AllPaths.Count(); i++)
+		{
+			config_path = m_AllPaths.Get(i);
+			int children_count = GetGame().ConfigGetChildrenCount(config_path);
+			
+			for(int x = 0; x < children_count; x++)
+			{
+				GetGame().ConfigGetChildName(config_path, x, child_name);
+				path = config_path + " " + child_name;
+				scope = GetGame().ConfigGetInt( config_path + " " + child_name + " scope" );
+				bool should_check = 1;
+				if( config_path == "CfgVehicles" && scope == 0)
+				{
+					should_check = 0;
+				}
+				
+				if ( should_check )
+				{
+					bool has_nutrition = GetGame().ConfigIsExisting(path + " Nutrition");
+					bool has_stages = GetGame().ConfigIsExisting(path + " Food");
+					if(has_nutrition || has_stages)
+					{
+						EntityAI item = PlayerBase.Cast(GetGame().GetPlayer()).SpawnEntityOnGroundOnCursorDir(child_name,1);
+						Edible_Base edible = Edible_Base.Cast(item);
+						if(edible)
+						{
+							//Print("spawning " + child_name);
+							line = "";
+							NutritionalProfile profile;
+							if(!has_stages)
+							{
+								profile =  edible.GetNutritionalProfile();
+								line = BuildLine(child_name, profile);
+								m_AllLines.Insert(line);
+								//Print(line);
+							}
+							else
+							{
+								for(int z = FoodStageType.RAW; z < FoodStageType.COUNT; z++)
+								{
+									if( z != FoodStageType.RAW ) 
+										edible.ChangeFoodStage(z);
+									profile =  edible.GetNutritionalProfile();
+									string itemname = child_name + "(stage " + z.ToString()+")";
+									line = BuildLine(itemname, profile);
+									m_AllLines.Insert(line);
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+	
+		SaveToFile("nutritional_values.csv");
+	}
+	
+	
+	protected void SaveToFile(string filename)
+	{
+		FileHandle file = OpenFile(filename, FileMode.WRITE);
+		if( file!=0 )
+		{
+			for(int i = 0; i < m_AllLines.Count(); i++)
+			{
+				FPrintln(file,m_AllLines.Get(i));
+				Print(m_AllLines.Get(i));
+			}
+			
+		}
+
+	}	
+	
+	string BuildLine(string item_name, NutritionalProfile profile)
+	{
+		string line = item_name+",";
+		line = line + profile.GetEnergy()+",";
+		line = line + profile.GetWaterContent()+",";
+		line = line + profile.GetToxicity()+",";
+		line = line + profile.GetFullnessIndex()+",";
+		line = line + profile.GetNutritionalIndex();
+		return line;
+	}
+	*/
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginRemotePlayerDebugClient.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginRemotePlayerDebugClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..ba5889a08518bf1ecda56560dff0b4fb33cf043f
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginRemotePlayerDebugClient.c
@@ -0,0 +1,249 @@
+enum eRemoteDebugType
+{
+	NONE,
+	DAMAGE_ONLY,
+	ALL,
+}
+
+class PluginRemotePlayerDebugClient extends PluginBase
+{
+	const int MAX_SIMULTANIOUS_PLAYERS = 10;
+	ref array<ref RemotePlayerStatDebug> m_PlayerDebugStats = new array<ref RemotePlayerStatDebug>;
+	ref map<PlayerBase, ref RemotePlayerDamageDebug> m_PlayerDebugDamage = new map<PlayerBase,ref RemotePlayerDamageDebug>;
+	
+	ref Widget 	m_RootWidget[MAX_SIMULTANIOUS_PLAYERS];
+	ref Widget 	m_RootWidgetDamage[MAX_SIMULTANIOUS_PLAYERS];
+	ref TextListboxWidget m_StatListWidgets[MAX_SIMULTANIOUS_PLAYERS];
+	ref TextListboxWidget m_DamageListWidgets[MAX_SIMULTANIOUS_PLAYERS];
+	ref TextWidget m_DistanceWidget[MAX_SIMULTANIOUS_PLAYERS];
+	eRemoteDebugType m_DebugType;
+	
+	override void OnInit()
+	{
+		#ifndef NO_GUI
+		InitWidgets();
+		#endif
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		#ifndef NO_GUI
+		if ( m_DebugType !=0 ) UpdateWidgetsStats();
+		#endif
+	}
+	
+	void InitWidgets()
+	{
+		for (int i = 0; i < MAX_SIMULTANIOUS_PLAYERS; ++i)
+		{
+			m_RootWidget[i] = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_debug_remoteinfo.layout");
+			m_RootWidgetDamage[i] = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_debug_remoteinfo_damage.layout");
+			m_DamageListWidgets[i] = TextListboxWidget.Cast(m_RootWidgetDamage[i].FindAnyWidget("TextListboxWidget1"));
+			m_StatListWidgets[i] = TextListboxWidget.Cast(m_RootWidget[i].FindAnyWidget("TextListboxWidget0"));
+			m_DistanceWidget[i] = TextWidget.Cast(m_RootWidget[i].FindAnyWidget("TextWidget0"));
+		}
+	}		
+	
+	void EnableWidgets(bool enable)
+	{
+		for (int i = 0; i < MAX_SIMULTANIOUS_PLAYERS; ++i)
+		{
+			m_RootWidget[i].Show(enable);
+			m_RootWidgetDamage[i].Show(enable);
+		}
+	}
+	
+	void UpdateWidgetsStats()
+	{
+		int i = 0;
+		for (; i < m_PlayerDebugStats.Count(); ++i)
+		{
+			RemotePlayerStatDebug rpd = m_PlayerDebugStats.Get(i);
+			PlayerBase player = rpd.GetPlayer();
+			
+			if (player)
+			{
+				vector pos = player.GetPosition();
+				vector screen_pos_stats = GetGame().GetScreenPos(pos + "0 0 0");
+				vector screen_pos_damage = GetGame().GetScreenPos(pos + "0 2 0");
+				m_RootWidget[i].SetPos(screen_pos_stats[0], screen_pos_stats[1]);
+				m_RootWidgetDamage[i].SetPos(screen_pos_damage[0], screen_pos_damage[1]);
+				
+				if (screen_pos_stats[2] > 0 && screen_pos_stats[0] > 0 && screen_pos_stats[1] > 0)
+				{
+					m_RootWidget[i].Show(true);
+					m_RootWidgetDamage[i].Show(true);
+					UpdateStatsWidget(i, rpd);
+					UpdateDistanceWidget(i, player);
+					UpdateDamageWidget(i, player);
+				}
+				else
+				{
+					m_RootWidget[i].Show(false);
+					m_RootWidgetDamage[i].Show(false);
+				}
+				
+			}
+		}
+		for (; i < MAX_SIMULTANIOUS_PLAYERS; ++i)
+		{
+			m_RootWidget[i].Show(false);
+			m_RootWidgetDamage[i].Show(false);
+		}
+	}
+	
+	
+	void UpdateDamageWidget(int index, PlayerBase player)
+	{
+		array<ref DamageData> damage_list = new array<ref DamageData>;
+		if (m_PlayerDebugDamage.Contains(player))
+		{
+			RemotePlayerDamageDebug value = m_PlayerDebugDamage.Get(player);
+			value.GetReversed(damage_list);
+			
+			m_DamageListWidgets[index].ClearItems();
+			if (damage_list.Count() > 0)
+			{
+				m_DamageListWidgets[index].Show(true);
+				for (int i = 0; i < damage_list.Count(); ++i)
+				{
+					DamageData data = damage_list[i];
+					float value_global = data.GetValueGlobal();
+					float value_blood = data.GetValueBlood();
+					float value_shock = data.GetValueShock();
+					
+					m_DamageListWidgets[index].AddItem( value_global.ToString(), null, 0, i );
+					m_DamageListWidgets[index].SetItem( i, value_blood.ToString(), null, 1 );
+					m_DamageListWidgets[index].SetItem( i, value_shock.ToString(), null, 2 );
+				}
+			}
+			else
+			{
+				m_DamageListWidgets[index].Show(false);
+			}
+		}
+	}
+	
+	void UpdateDistanceWidget(int index, PlayerBase other_player)
+	{
+		float distance = vector.Distance(GetGame().GetCurrentCameraPosition(), other_player.GetPosition());
+		m_DistanceWidget[index].SetText(distance.ToString() + "m");
+	}
+	
+	void UpdateStatsWidget(int index, RemotePlayerStatDebug rpd)
+	{
+		array<string> names = new array<string>;
+		array<string> values = new array<string>;
+		rpd.SerializeNames(names, m_DebugType);
+		rpd.SerializeValues(values,m_DebugType);
+		m_StatListWidgets[index].ClearItems();
+		
+		for (int i = 0; i < names.Count(); ++i)
+		{
+			m_StatListWidgets[index].AddItem( names.Get(i), null, 0, i );
+			m_StatListWidgets[index].SetItem( i, values.Get(i), null, 1 );
+		}
+	}
+
+	void RequestPlayerInfo(PlayerBase player, int type)
+	{
+#ifdef DIAG_DEVELOPER
+		if (type == 0)
+		{
+			EnableWidgets(false);
+		}
+		/*
+		else
+		{
+			EnableWidgets(true);
+		}
+		*/
+		ScriptRPC rpc = new ScriptRPC();
+		m_DebugType = type;
+		rpc.Write(type);
+		rpc.Send( player, ERPCs.DEV_PLAYER_DEBUG_REQUEST, true, player.GetIdentity() );
+#endif
+	}
+	
+	void MergeDamage( array<ref RemotePlayerDamageDebug> delta )
+	{
+		foreach (RemotePlayerDamageDebug valueDelta : delta)
+		{	
+			PlayerBase playerDelta = valueDelta.GetPlayer();
+			
+			if ( m_PlayerDebugDamage.Contains(null) )
+			{
+				//cleans up garbage
+				m_PlayerDebugDamage.Remove(null);
+			}
+			
+			if ( m_PlayerDebugDamage.Contains(playerDelta) )
+			{
+				RemotePlayerDamageDebug valueLocal = m_PlayerDebugDamage.Get(playerDelta);
+				array<ref DamageData> damageList = new array<ref DamageData>;
+				valueDelta.GetReversed(damageList);
+				
+				foreach (DamageData data : damageList)
+				{
+					valueLocal.InsertDamageObject( data );
+				}
+			}
+			else
+			{
+				m_PlayerDebugDamage.Insert(playerDelta, valueDelta);
+			}
+		}
+	}
+	
+	void DebugDamage(PlayerBase player)
+	{
+		for (int i = 0; i < m_PlayerDebugStats.Count(); i++)
+		{
+			player = m_PlayerDebugStats.Get(i).GetPlayer();
+			
+			PrintString("player:" + player.ToString() );
+			m_PlayerDebugStats.Get(i).Debug();
+			PrintString("-------------------------------------");
+		}
+		
+		for (i = 0; i < m_PlayerDebugDamage.Count(); i++)
+		{
+			PrintString("-------------------------------------");
+			if( m_PlayerDebugDamage.GetElement(i) ) m_PlayerDebugDamage.GetElement(i).Debug();
+			PrintString("-------------------------------------");
+		}
+		
+		for (i = 0; i < m_PlayerDebugDamage.Count();i++)
+		{
+			PrintString("------------Debug Damage Start--------------");
+			PlayerBase player2 = m_PlayerDebugDamage.GetKey(i);
+			RemotePlayerDamageDebug obj = m_PlayerDebugDamage.Get(player2);
+			obj.Debug();
+			PrintString("-------------Debug Damage End-------------");
+		}
+	}
+	
+	void OnRPC(ParamsReadContext ctx)
+	{
+		ctx.Read(m_PlayerDebugStats);
+		
+		array<ref RemotePlayerDamageDebug> player_damage = new array<ref RemotePlayerDamageDebug>;
+		
+		ctx.Read(player_damage);
+		PlayerBase player;
+		for (int x = 0; x < player_damage.Count(); x++)
+		{
+			RemotePlayerDamageDebug value = player_damage.Get(x);
+			if (value)
+			{
+				player = value.GetPlayer();
+				PrintString("debug damage: "+x.ToString() + "," + player.ToString());
+				value.Debug();
+
+				int xs = 1 + 1;
+			}
+		}
+		
+		if (player_damage.Count() > 0 ) MergeDamage(player_damage);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginRemotePlayerDebugServer.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginRemotePlayerDebugServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..b87041ced35900dd08e86a7418ff0e95178c88c6
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginRemotePlayerDebugServer.c
@@ -0,0 +1,140 @@
+class PluginRemotePlayerDebugServer extends PluginBase
+{	
+	ref set<PlayerBase> m_ClientList = new set<PlayerBase>;
+	
+	ref array<ref RemotePlayerStatDebug> m_PlayerDebugStats = new array<ref RemotePlayerStatDebug>;
+	ref map<PlayerBase, ref RemotePlayerDamageDebug> m_PlayerDebugDamage = new map<PlayerBase, ref RemotePlayerDamageDebug>;
+	float m_AccuTime;
+	const int INTERVAL = 1;
+	
+	eRemoteDebugType m_DebugType;
+	bool m_Watching;
+	
+	override void OnUpdate(float delta_time)
+	{
+		#ifdef SERVER
+		if ( m_ClientList.Count() != 0 )
+		{
+			m_AccuTime += delta_time;
+			
+			if ( m_AccuTime > INTERVAL )
+			{
+				m_AccuTime = 0;
+				SendDebug();
+			}
+		}
+		#endif
+	}
+	
+	void SetWatching(bool enable)
+	{
+		m_Watching = enable;
+	}
+	
+	bool GetWatching()
+	{
+		return m_Watching;
+	}
+	
+	void GatherPlayerInfo()
+	{
+		array<Man> players = new array<Man>;
+		GetGame().GetPlayers(players);
+		m_PlayerDebugStats.Clear();
+		
+		foreach (Man playerMan : players)
+		{
+			PlayerBase player = PlayerBase.Cast(playerMan);
+			RemotePlayerStatDebug rpd = new RemotePlayerStatDebug(player);
+			m_PlayerDebugStats.Insert(rpd);
+		}		
+	}
+	
+	void SendDebug()
+	{
+#ifdef DIAG_DEVELOPER
+		GatherPlayerInfo();
+		array<ref RemotePlayerDamageDebug> player_damage = new array<ref RemotePlayerDamageDebug>;
+		
+		for(int i = 0; i < m_ClientList.Count(); ++i)
+		{
+			PlayerBase player = m_ClientList[i];
+			if (player)
+			{
+				ScriptRPC rpc = new ScriptRPC();
+				rpc.Write(m_PlayerDebugStats);
+				
+				foreach (PlayerBase player2, RemotePlayerDamageDebug value : m_PlayerDebugDamage)
+				{
+					if (player2)
+					{
+						player_damage.Insert(value);
+						
+					}
+					//int xs = 1 + 1;
+				}
+				
+				rpc.Write(player_damage);
+				
+				rpc.Send(player, ERPCs.DEV_PLAYER_DEBUG_DATA, true, player.GetIdentity());
+				m_PlayerDebugDamage.Clear();
+			}
+			else
+			{
+				m_ClientList.Remove(i);
+				--i;
+			}		
+		}
+#endif
+	}
+	
+
+	void OnDamageEvent(PlayerBase player, TotalDamageResult damageResult)
+	{
+		if ( !GetWatching() || !damageResult )
+			return;
+		
+		float damage_global = damageResult.GetDamage("","");
+		float damage_blood = damageResult.GetDamage("","Blood");
+		float damage_shock = damageResult.GetDamage("","Shock");
+		
+		if ( m_PlayerDebugDamage.Contains(player) )
+		{
+			m_PlayerDebugDamage.Get(player).AddDamage( damage_global, damage_blood, damage_shock );
+		}
+		else
+		{
+			RemotePlayerDamageDebug rpdd = new RemotePlayerDamageDebug(player);
+			rpdd.AddDamage(damage_global, damage_blood, damage_shock);
+			m_PlayerDebugDamage.Insert(player, rpdd);
+		}
+	}
+	
+
+	void OnRequestReceived(PlayerBase player, bool enable)
+	{
+		int index = m_ClientList.Find(player);
+		
+		if (enable)
+		{
+			m_ClientList.Insert(player);
+			SetWatching(true);
+		}
+		else if (index != -1 && m_ClientList.Count() != 0)
+		{
+			m_ClientList.Remove(index);
+		}
+		
+		if ( m_ClientList.Count() == 0 )
+		{
+			SetWatching(false);
+		}
+	}
+	
+	void OnRPC(ParamsReadContext ctx, PlayerBase player)
+	{
+		bool enable;
+		ctx.Read(enable);
+		OnRequestReceived(player, enable);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginUniversalTemperatureSourceClient.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginUniversalTemperatureSourceClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..dcef25f65bc166fab6f72a11441eb53db84ba547
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginUniversalTemperatureSourceClient.c
@@ -0,0 +1,237 @@
+class PluginUniversalTemperatureSourceClient extends PluginBase
+{
+	const int MAX_SIMULTANEOUS_UTS = 10;
+
+	protected float m_UTSAverageTemperature;
+
+	protected ref array<ref UTemperatureSourceDebug> m_UTemperatureSourceDebugs;
+	
+	protected ref Widget m_RootWidget[MAX_SIMULTANEOUS_UTS];
+	protected TextListboxWidget m_StatListWidgets[MAX_SIMULTANEOUS_UTS];
+	protected TextWidget m_HeaderWidget[MAX_SIMULTANEOUS_UTS];
+	
+	protected PlayerBase m_Player;
+	
+	void PluginUniversalTemperatureSourceClient()
+	{
+		m_UTemperatureSourceDebugs = new array<ref UTemperatureSourceDebug>();
+	}
+	
+	override void OnInit()
+	{
+		#ifndef NO_GUI
+		InitWidgets();
+		#endif
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		#ifndef NO_GUI
+		if (!m_Player)
+		{
+			return;
+		}
+
+		UpdateStatWidgets();
+		DrawDebugs();
+		#endif
+	}
+	
+	void InitWidgets()
+	{
+		for (int i = 0; i < MAX_SIMULTANEOUS_UTS; i++)
+		{
+			m_RootWidget[i] = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_debug_remoteinfo.layout");
+			m_StatListWidgets[i] = TextListboxWidget.Cast(m_RootWidget[i].FindAnyWidget("TextListboxWidget0"));
+			m_HeaderWidget[i] = TextWidget.Cast(m_RootWidget[i].FindAnyWidget("TextWidget0"));
+		}
+	}
+	
+	void DrawDebugs()
+	{
+		foreach (UTemperatureSourceDebug utsd : m_UTemperatureSourceDebugs)
+		{
+			float fullRange = utsd.GetValue(1).ToFloat();
+			float maxRange 	= utsd.GetValue(2).ToFloat();
+			float temp		= utsd.GetValue(3).ToFloat();
+			vector sphPos 	= utsd.GetValue(0).ToVector();
+
+			int fullRangeColor = COLOR_RED_A;			
+			int maxRangeColor = COLOR_YELLOW_A;
+			if (temp < 0)
+			{
+				fullRangeColor = COLOR_GREEN_A;
+				maxRangeColor = COLOR_BLUE_A;
+			}
+
+			Debug.DrawCylinder(sphPos, fullRange, fullRange, fullRangeColor, ShapeFlags.ONCE|ShapeFlags.TRANSP);
+			Debug.DrawCylinder(sphPos, maxRange, maxRange, maxRangeColor, ShapeFlags.ONCE|ShapeFlags.TRANSP);
+			Debug.DrawArrow(m_Player.GetPosition(), sphPos, 1.0, 0xffffffff, ShapeFlags.ONCE|ShapeFlags.TRANSP);
+		}
+		
+		ProcessUniversalTemperatureSources();
+		
+		if (m_UTemperatureSourceDebugs.Count() > 0)
+		{
+			DbgUI.Begin("Universal Temp Sources", 10, 300);
+			DbgUI.Text(string.Format("Lookup radius: %1m (server-side)", PluginUniversalTemperatureSourceServer.LOOKUP_RADIUS));
+			DbgUI.Text(string.Format("Count: %1", m_UTemperatureSourceDebugs.Count()));
+			DbgUI.Text(string.Format("Avg. temp: %1 °C", m_UTSAverageTemperature));
+			DbgUI.End();
+		}
+	}
+	
+	protected void ProcessUniversalTemperatureSources()
+	{
+		if (m_UTemperatureSourceDebugs.Count() == 0)
+		{
+			m_UTSAverageTemperature = 0;
+
+			return;
+		}
+
+		array<float> utsTemperatures = new array<float>();
+		
+		// get temperature from the source (based on distance), save it for min/max filtering
+		foreach (UniversalTemperatureSourceDebug utsd : m_UTemperatureSourceDebugs)
+		{
+			//! next temp source is too far (not cleaned on server, like in Environment, client need to know about all sources in MAXRANGE)
+			if (vector.DistanceSq(m_Player.GetPosition(), utsd.GetValue(0).ToVector()) > Math.SqrFloat(utsd.GetValue(2).ToFloat()))
+			{
+				continue;
+			}
+
+			utsTemperatures.Insert(CalcTemperatureFromTemperatureSource(utsd));
+		}
+
+		float min = MiscGameplayFunctions.GetMinValue(utsTemperatures);
+		float max = MiscGameplayFunctions.GetMaxValue(utsTemperatures);
+		
+		if (max > 0 && min < 0)
+		{
+			m_UTSAverageTemperature = (max + min) * 0.5;
+		}
+		else
+		{
+			m_UTSAverageTemperature = max;
+		}
+		
+	}
+	
+	protected float CalcTemperatureFromTemperatureSource(notnull UTemperatureSourceDebug utsd)
+	{
+		float distance 		= vector.Distance(m_Player.GetPosition(), utsd.GetValue(0).ToVector());
+		distance 			= Math.Max(distance, 0.1);	//min distance cannot be 0 (division by zero)
+		float temperature	= 0;
+
+		//! heat transfer through air to player (env temperature)
+		if (distance > utsd.GetValue(1).ToFloat())
+		{
+			float distFactor = 1 - (distance / utsd.GetValue(2).ToFloat());
+			distFactor = Math.Max(distFactor, 0.0); //! dist factor minimum should be at 0
+			temperature = utsd.GetValue(3).ToFloat() * distFactor;
+		}
+		else
+		{
+			temperature = utsd.GetValue(3).ToFloat();
+		}
+		
+		//Print(temperature);
+
+		return temperature;
+	}
+	
+	void EnableWidgets(bool enable)
+	{
+		for (int i = 0; i < MAX_SIMULTANEOUS_UTS; i++)
+		{
+			m_RootWidget[i].Show(enable);
+		}
+	}
+	
+	void UpdateStatWidgets()
+	{
+		int i = 0;
+		int utsDebugCount = m_UTemperatureSourceDebugs.Count();
+		for (; i < utsDebugCount && i < MAX_SIMULTANEOUS_UTS; ++i)
+		{
+			UTemperatureSourceDebug utsd = m_UTemperatureSourceDebugs[i];
+			vector pos = utsd.GetValue(0).ToVector();
+			vector screen_pos_stats = GetGame().GetScreenPos(pos + "0 0 0");
+			vector screen_pos_damage = GetGame().GetScreenPos(pos + "0 2 0");
+			m_RootWidget[i].SetPos(screen_pos_stats[0], screen_pos_stats[1]);
+			
+			if (screen_pos_stats[2] > 0 && screen_pos_stats[0] > 0 && screen_pos_stats[1] > 0)
+			{
+				m_RootWidget[i].Show(true);
+				UpdateStatWidget(i, utsd);
+			}
+			else
+			{
+				m_RootWidget[i].Show(false);
+			}
+		}
+
+		for (; i < MAX_SIMULTANEOUS_UTS; ++i)
+		{
+			if (m_RootWidget[i])
+			{
+				m_RootWidget[i].Show(false);
+			}
+		}
+	}
+	
+	void UpdateStatWidget(int rowIndex, UTemperatureSourceDebug utsd)
+	{
+		m_StatListWidgets[rowIndex].ClearItems();
+		
+		m_HeaderWidget[rowIndex].SetText(utsd.GetHeader());
+		
+		int numPairs = utsd.PairsCount();
+		for (int i = 0; i < numPairs; ++i)
+		{
+			m_StatListWidgets[rowIndex].AddItem(utsd.GetName(i), null, 0, i);
+			m_StatListWidgets[rowIndex].SetItem(i, utsd.GetValue(i), null, 1);
+		}
+		
+		// manually add value for distance (client only)
+		m_StatListWidgets[rowIndex].AddItem("distance", null, 0, numPairs);
+		m_StatListWidgets[rowIndex].SetItem(numPairs, vector.Distance(m_Player.GetPosition(), utsd.GetValue(0).ToVector()).ToString(), null, 1);
+	}
+
+	void RequestUniversalTemperatureSources(PlayerBase player, int enable)
+	{
+		//Debug.Log("RequestUniversalTemperatureSources called", "PluginUniversalTemperatureSourceClient");
+
+		if (!enable)
+		{
+			m_UTemperatureSourceDebugs.Clear();
+			m_Player = null;
+			EnableWidgets(false);
+			return;
+		}
+
+		ScriptRPC rpc = new ScriptRPC();
+		rpc.Write(enable);
+		rpc.Send(player, ERPCs.DEV_REQUEST_UTS_DEBUG, true, player.GetIdentity());	
+		
+			m_Player = player;
+		}
+	
+	void PrintedDebug()
+	{
+		foreach (UTemperatureSourceDebug utsd : m_UTemperatureSourceDebugs)
+		{
+			PrintString("-------------------------------------");
+			utsd.Debug();
+			PrintString("-------------------------------------");
+		}
+	}
+	
+	void OnRPC(ParamsReadContext ctx)
+	{
+		//Debug.Log("OnRPC called", "PluginUniversalTemperatureSourceClient");
+		//PrintedDebug();
+		ctx.Read(m_UTemperatureSourceDebugs);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginUniversalTemperatureSourceServer.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginUniversalTemperatureSourceServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..413b9d6ba0be4b7505bf996384b2cbf41d058856
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloper/PluginUniversalTemperatureSourceServer.c
@@ -0,0 +1,119 @@
+class PluginUniversalTemperatureSourceServer extends PluginBase
+{
+	const int INTERVAL			= 1;		//! [s]
+	const float LOOKUP_RADIUS	= 20;		//! [m]
+		
+	protected float m_AccuTime;
+	protected ref set<PlayerBase> m_ClientList;
+
+	protected ref array<ref UTemperatureSourceDebug> m_UTemperatureSourceDebugs;
+
+	void PluginUniversalTemperatureSourceServer()
+	{
+		m_ClientList 				= new set<PlayerBase>();
+		m_UTemperatureSourceDebugs	= new array<ref UTemperatureSourceDebug>();
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		if (m_ClientList.Count() > 0)
+		{
+			m_AccuTime += delta_time;
+			
+			if (m_AccuTime > INTERVAL)
+			{
+				m_AccuTime = 0;
+				SendDebug();
+			}
+		}
+	}
+	
+	void GatherTemperatureSources(PlayerBase player)
+	{
+		m_UTemperatureSourceDebugs.Clear();
+		
+		if (!player)
+			return;
+
+		vector playerPos				= player.GetPosition();
+		array<Object> nearestObjects	= new array<Object>();
+
+		GetGame().GetObjectsAtPosition(playerPos, LOOKUP_RADIUS, nearestObjects, null);
+
+		UTemperatureSource uts;
+		UTemperatureSourceDebug utsd;
+
+		foreach (Object nearestObject : nearestObjects)
+		{
+			EntityAI ent = EntityAI.Cast(nearestObject);
+			if (ent && ent.IsUniversalTemperatureSource() && ent != player)
+			{
+				uts = ent.GetUniversalTemperatureSource();
+				utsd = new UTemperatureSourceDebug();
+				utsd.AddHeader(ent.GetType());
+				utsd.Add("position", uts.GetPosition().ToString(false));
+				utsd.Add("fullrange", uts.GetFullRange().ToString());
+				utsd.Add("maxrange", uts.GetMaxRange().ToString());
+				utsd.Add("temperature", uts.GetTemperature().ToString());
+				utsd.Add("temperatureraw", uts.GetTemperatureRaw().ToString());
+				utsd.Commit();
+
+				m_UTemperatureSourceDebugs.Insert(utsd);
+			}
+		}
+
+		if (player.GetItemInHands() && player.GetItemInHands().IsUniversalTemperatureSource())
+		{
+			uts = player.GetItemInHands().GetUniversalTemperatureSource();
+			utsd = new UTemperatureSourceDebug();
+			utsd.AddHeader(player.GetItemInHands().GetType());
+			utsd.Add("position", uts.GetPosition().ToString(false));
+			utsd.Add("fullrange", uts.GetFullRange().ToString());
+			utsd.Add("maxrange", uts.GetMaxRange().ToString());
+			utsd.Add("temperature", uts.GetTemperature().ToString());
+			utsd.Add("temperatureraw", uts.GetTemperatureRaw().ToString());
+			utsd.Commit();
+	
+			m_UTemperatureSourceDebugs.Insert(utsd);
+		}
+	}
+
+	void SendDebug()
+	{
+		int clientCount = m_ClientList.Count();
+		foreach (PlayerBase player : m_ClientList)
+		{
+			if (player)
+			{		
+				GatherTemperatureSources(player);
+				ScriptRPC rpc = new ScriptRPC();
+				rpc.Write(m_UTemperatureSourceDebugs);
+				rpc.Send(player, ERPCs.DEV_UTS_DEBUG_DATA, true, player.GetIdentity());
+			}
+			else
+				m_ClientList.RemoveItem(player);
+		}
+	}
+
+	void OnRequestReceived(PlayerBase player, bool enable)
+	{
+		int index = m_ClientList.Find(player);
+		
+		if (enable)
+		{
+			m_ClientList.Insert(player);
+		}
+		else if (index != -1 && m_ClientList.Count() > 0)
+		{
+			m_ClientList.Remove(index);
+		}
+	}
+	
+	void OnRPC(ParamsReadContext ctx, PlayerBase player)
+	{
+		bool enable;
+		ctx.Read(enable);
+
+		OnRequestReceived(player, enable);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloperSync.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloperSync.c
new file mode 100644
index 0000000000000000000000000000000000000000..9b300a64918b1fc0b16c553a67aa8e26b7de75db
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDeveloperSync.c
@@ -0,0 +1,878 @@
+enum PDS_SYSTEMS
+{
+	STATS 				= 1,
+	LEVELS 				= 2,
+	MODS 				= 4,
+	AGENTS 				= 8,
+	STOMACH 			= 16,
+	MODS_DETAILED 		= 32,
+	TEMPERATURE 		= 64,
+}
+
+
+class RegisterPlayerData
+{
+	int m_Bitmask;
+	int m_DetailedModifierIndex;
+	
+	void RegisterPlayerData()
+	{
+		m_Bitmask = 0;
+		m_DetailedModifierIndex = 0;
+	}
+}
+
+class PluginDeveloperSync extends PluginBase
+{
+	int m_DetailedInfoRequested = 0;
+	ref Timer m_UpdateTimer;
+	ref map<PlayerBase, ref RegisterPlayerData> m_RegisteredPlayers;
+	
+	ref array<ref SyncedValue> m_PlayerStatsSynced;
+	ref array<ref Param> m_PlayerStomachSynced;
+	ref array<ref SyncedValueLevel> m_PlayerLevelsSynced;
+	ref array<ref SyncedValueModifier> m_PlayerModsSynced;
+	string 	m_PlayerModsDetailedSynced;
+	string 	m_EnvironmentDebugMessage;
+	ref array<ref SyncedValueAgent> m_PlayerAgentsSynced;
+	
+	bool m_StatsUpdateStatus;
+	bool m_LevelsUpdateStatus;
+	bool m_ModsUpdateStatus;
+	bool m_AgentsUpdateStatus;
+	bool m_StomachUpdateStatus;
+	
+	void PluginDeveloperSync()
+	{
+		m_RegisteredPlayers 	= new map<PlayerBase, ref RegisterPlayerData>;
+		m_PlayerStatsSynced 	= new array<ref SyncedValue>;
+		m_PlayerLevelsSynced 	= new array<ref SyncedValueLevel>;
+		m_PlayerModsSynced 		= new array<ref SyncedValueModifier>;
+		m_PlayerAgentsSynced 	= new array<ref SyncedValueAgent>;
+		m_PlayerStomachSynced 	= new array<ref Param>;
+		
+		m_StatsUpdateStatus 	= false;
+		m_LevelsUpdateStatus 	= false;
+		m_ModsUpdateStatus 		= false;
+		m_AgentsUpdateStatus 	= false;
+		m_StomachUpdateStatus 	= false;
+	}
+	
+	//================================================================
+	// Init / Update
+	//================================================================
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		if ( GetGame().IsServer() )
+		{
+			//create timer
+			m_UpdateTimer = new Timer( CALL_CATEGORY_GAMEPLAY );
+		}
+	}
+
+	
+	void EnableUpdate( bool enable, int type, PlayerBase player )
+	{
+		//set update by type
+		if ( !IsPlayerRegistered(player))
+			RegisterPlayer( player );
+
+		
+		switch ( type )
+		{
+			case ERPCs.DEV_STATS_UPDATE: 
+			{
+				SetSystemInBitmask(player, PDS_SYSTEMS.STATS, enable);
+				break;	
+			}
+			
+			case ERPCs.DEV_LEVELS_UPDATE: 
+			{
+				SetSystemInBitmask(player, PDS_SYSTEMS.LEVELS, enable);
+				break;	
+			}
+			
+			case ERPCs.DEV_MODS_UPDATE: 
+			{
+				SetSystemInBitmask(player, PDS_SYSTEMS.MODS, enable);
+				break;	
+			}
+			
+			case ERPCs.DEV_AGENTS_UPDATE: 
+			{
+				SetSystemInBitmask(player, PDS_SYSTEMS.AGENTS, enable);
+				break;	
+			}	
+			
+			case ERPCs.DEV_STOMACH_UPDATE: 
+			{
+				SetSystemInBitmask(player, PDS_SYSTEMS.STOMACH, enable);
+				break;	
+			}
+			case ERPCs.DEV_TEMP_UPDATE: 
+			{
+				SetSystemInBitmask(player, PDS_SYSTEMS.TEMPERATURE, enable);
+				break;	
+			}
+		}	
+		
+		//remove players with empty mask
+		for (int i = 0; i < m_RegisteredPlayers.Count(); i++)
+		{
+			if (m_RegisteredPlayers.GetElement(i).m_Bitmask == 0)
+			{
+				m_RegisteredPlayers.RemoveElement(i);
+				i = 0;
+			}
+		}
+		
+		//start/stop the tick based on existence/absence of players registered
+		if ( m_UpdateTimer )
+		{
+			if ( m_RegisteredPlayers.Count() == 0)
+			{
+				m_UpdateTimer.Stop();
+			}
+			else if (!m_UpdateTimer.IsRunning())
+			{
+				m_UpdateTimer.Run( 1, this, "Update", NULL, true );
+			}
+		}
+	}
+	
+
+	void Update()
+	{
+		if ( !GetDayZGame().IsMultiplayer() || GetDayZGame().IsServer() )
+		{
+			for ( int i = 0; i < m_RegisteredPlayers.Count(); i++ )
+			{
+				PlayerBase player = m_RegisteredPlayers.GetKey( i );
+				if ( !player || !player.IsAlive() )
+				{
+					m_RegisteredPlayers.RemoveElement(i);
+					i--;
+				}
+				else
+				{
+					int bit_mask = m_RegisteredPlayers.Get( player ).m_Bitmask;
+					
+					if ((PDS_SYSTEMS.MODS & bit_mask) != 0 )
+					{
+						SendRPCMods( player);
+						if ( PDS_SYSTEMS.MODS_DETAILED & bit_mask )
+							SendRPCModsDetail(	player); //!!!!! Highly suspect
+					}
+					if ((PDS_SYSTEMS.LEVELS & bit_mask) != 0 )
+					{
+						SendRPCLevels( player );		
+					}
+					
+					if ((PDS_SYSTEMS.STATS & bit_mask) != 0 )
+					{
+						SendRPCStats( player );
+					}	
+					if ((PDS_SYSTEMS.STOMACH & bit_mask) != 0 )
+					{
+						SendRPCStomach( player );
+					}				
+					if ((PDS_SYSTEMS.AGENTS & bit_mask) != 0 )
+					{
+						SendRPCAgents( player );
+					}		
+					if ((PDS_SYSTEMS.TEMPERATURE & bit_mask) )
+					{
+						SendRPCTemp( player );
+					}
+				}
+			}
+		}	
+	}
+	
+	//turns on/off a bit for a given system marking it active/inactive
+	void SetSystemInBitmask( PlayerBase player, int system_bit, bool state)
+	{
+		if ( IsPlayerRegistered(player) )
+		{
+			int current_mask = m_RegisteredPlayers.Get(player).m_Bitmask;
+			if (state)
+				m_RegisteredPlayers.Get(player).m_Bitmask = current_mask | system_bit;
+			else
+				m_RegisteredPlayers.Get(player).m_Bitmask = current_mask & ~system_bit;
+		}
+			
+	}
+	
+	//turns on/off a bit for a given system marking it active/inactive
+	bool IsSetSystemInBitmask( PlayerBase player, int system_bit)
+	{
+		if ( IsPlayerRegistered(player) )
+		{
+			return (m_RegisteredPlayers.Get(player).m_Bitmask & system_bit);
+		}
+		return false;
+	}
+	
+	
+	
+	
+	//--- Register / Unregister player
+	void RegisterPlayer( PlayerBase player )
+	{
+		if ( !IsPlayerRegistered( player ) ) 
+		{
+			m_RegisteredPlayers.Insert( player, new RegisterPlayerData );
+		}
+	}
+
+	/*
+	void UnregisterPlayer( PlayerBase player )
+	{
+		if ( IsPlayerRegistered( player ) ) 
+		{
+			m_RegisteredPlayers.Remove( player );
+		}
+	}
+*/
+	bool IsPlayerRegistered( PlayerBase player )
+	{
+		if ( m_RegisteredPlayers.Contains( player ))
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//================================================================
+	// RPC
+	//================================================================ 
+	void OnRPC( PlayerBase player, int rpc_type, ParamsReadContext ctx )
+	{
+		if ( !GetGame().IsDebug() )
+		{
+			return;
+		}
+		
+		switch ( rpc_type )
+		{
+			case ERPCs.DEV_STATS_UPDATE:
+			{
+				EnableUpdate( GetRPCUpdateState( ctx ), ERPCs.DEV_STATS_UPDATE, player ); break;
+			}
+			
+			case ERPCs.DEV_LEVELS_UPDATE:
+			{
+				EnableUpdate( GetRPCUpdateState( ctx ), ERPCs.DEV_LEVELS_UPDATE, player ); break;
+			}
+			
+			case ERPCs.DEV_MODS_UPDATE:
+			{
+				EnableUpdate( GetRPCUpdateState( ctx ), ERPCs.DEV_MODS_UPDATE, player ); break;
+			}
+			
+			case ERPCs.DEV_AGENTS_UPDATE:
+			{
+				EnableUpdate( GetRPCUpdateState( ctx ), ERPCs.DEV_AGENTS_UPDATE, player ); break;
+			}
+			
+			case ERPCs.DEV_STOMACH_UPDATE:
+			{
+				EnableUpdate( GetRPCUpdateState( ctx ), ERPCs.DEV_STOMACH_UPDATE, player ); break;
+			}
+			
+			case ERPCs.DEV_RPC_STATS_DATA:
+			{
+				OnRPCStats( ctx ); break;
+			}
+			
+			case ERPCs.DEV_RPC_LEVELS_DATA:
+			{
+				OnRPCLevels( ctx ); break;
+			}
+
+			case ERPCs.DEV_RPC_MODS_DATA:
+			{
+				OnRPCMods( ctx ); break;
+			}
+			
+			case ERPCs.DEV_RPC_MODS_DATA_DETAILED:
+			{
+				OnRPCModsDetailed( ctx ); break;
+			}
+			
+			case ERPCs.DEV_RPC_AGENTS_DATA:
+			{
+				OnRPCAgents( ctx ); break;
+			}		
+			case ERPCs.DEV_RPC_STOMACH_DATA:
+			{
+				OnRPCStomach( ctx ); break;
+			}
+			
+			case ERPCs.DEV_RPC_MODS_ACTIVATE:
+			{
+				ActivateModifier( GetRPCModifierID( ctx ), player ); break;
+			}
+			case ERPCs.DEV_RPC_MODS_DETAILED:
+			{
+				RequestDetailedInfo( GetRPCModifierID( ctx ), player ); break;
+			}
+			
+			case ERPCs.DEV_RPC_MODS_DEACTIVATE:
+			{
+				DeactivateModifier( GetRPCModifierID( ctx ), player ); break;
+			}
+			
+			case ERPCs.DEV_RPC_MODS_LOCK:
+			{
+				int id;
+				bool lock;
+				GetRPCModifierLock( ctx, id, lock );
+				LockModifier( id, lock, player ); break;
+			}
+			
+			case ERPCs.DEV_RPC_MODS_RESET:
+			{
+				player.GetModifiersManager().DeactivateAllModifiers();
+				break;
+			}	
+			
+			case ERPCs.DEV_RPC_STATS_RESET:
+			{
+				player.GetPlayerStats().ResetAllStats();
+				break;
+			}
+			
+			case ERPCs.DEV_RPC_STAT_SET:
+			{
+				OnRPCStatSet(ctx, player);
+				break;
+			}
+			case ERPCs.DEV_TEMP_UPDATE:
+			{
+				OnRPCTemp(ctx, player);
+				break;
+			}
+		}
+	}
+	
+	//get update status from ctx data
+	bool GetRPCUpdateState( ParamsReadContext ctx )
+	{
+		Param1<bool> p = new Param1<bool>( 0 );
+		if ( ctx.Read( p ) )
+		{
+			return p.param1;
+		}
+		
+		return false;
+	}
+	
+	//get modifier id from ctx data
+	int GetRPCModifierID( ParamsReadContext ctx )
+	{
+		Param1<int> p = new Param1<int>( 0 );
+		if ( ctx.Read( p ) )
+		{
+			return p.param1;
+		}
+		
+		return 0;
+	}
+	
+	//get modifier lock state from lock ctx data
+	void GetRPCModifierLock( ParamsReadContext ctx, out int id, out bool lock )
+	{
+		Param2<int, bool> p = new Param2<int, bool>( 0, false );
+		if ( ctx.Read( p ) )
+		{
+			id = p.param1;
+			lock = p.param2;
+		}
+	}
+
+	//============================================
+	// STATS
+	//============================================	
+	//send player stats through RPC
+	void SendRPCStats( PlayerBase player )
+	{
+		//write and send values
+		if ( player )
+		{
+			array<ref Param> rpc_params = new array<ref Param>;
+			
+			//param count
+			for ( int i = 0; i < player.m_PlayerStats.GetPCO().Get().Count(); i++ ) 
+			{
+				string label = player.m_PlayerStats.GetPCO().Get().Get( i ).GetLabel();
+				float value = (float) player.m_PlayerStats.GetPCO().Get().Get( i ).Get();
+				float value_norm = (float) player.m_PlayerStats.GetPCO().Get().Get( i ).GetNormalized();
+				rpc_params.Insert( new Param3<string, float, float>( label, value, value_norm ) );
+			}
+			rpc_params.Insert(new Param3<string, float, float>( "(NaS)Immunity", player.GetImmunity(),0 ));
+			rpc_params.Insert(new Param3<string, float, float>( "(NaS)BrokenLegs", player.m_BrokenLegState,0 ));
+		
+			rpc_params.InsertAt( new Param1<int>(rpc_params.Count() ), 0);// param count
+			//send params
+			GetDayZGame().RPC( player, ERPCs.DEV_RPC_STATS_DATA, rpc_params, true, player.GetIdentity() );
+		}
+	}
+
+	//Display player stats
+	void OnRPCStats( ParamsReadContext ctx )
+	{
+		//clear values
+		m_PlayerStatsSynced.Clear();
+		
+		
+		Param1<int> p_count = new Param1<int>(0);
+		
+		Param3<string, float, float> p = new Param3<string, float, float>( "", 0, 0 );
+		
+		//get param count
+		int param_count = 0;
+		if ( ctx.Read(p_count) )
+		{
+			param_count = p_count.param1;
+		}
+		
+		//read values and set 
+		for ( int i = 0; i < param_count; i++ )
+		{
+			ctx.Read(p);
+			m_PlayerStatsSynced.Insert( new SyncedValue( p.param1, p.param2, false, p.param3 ) );
+		}
+	}
+
+	//Update data on local
+	void UpdateStatsLocal()
+	{
+		PlayerBase player = PlayerBase.Cast( GetDayZGame().GetPlayer() );
+		
+		//clear values
+		m_PlayerStatsSynced.Clear();
+		
+		//set values
+		for ( int i = 0; i < player.m_PlayerStats.GetPCO().Get().Count(); i++ ) 
+		{
+			string label = player.m_PlayerStats.GetPCO().Get().Get( i ).GetLabel();
+			float value = player.m_PlayerStats.GetPCO().Get().Get( i ).Get();
+			float value_norm = player.m_PlayerStats.GetPCO().Get().Get( i ).GetNormalized();
+			m_PlayerStatsSynced.Insert( new SyncedValue( label, value, false, value_norm ) );
+		}
+		
+		m_PlayerStatsSynced.Insert(new SyncedValue(  "(NaS)Immunity", player.GetImmunity() , false, 0));
+		m_PlayerStatsSynced.Insert(new SyncedValue(  "(NaS) BrokenLegs", player.m_BrokenLegState, false, 0));
+	}
+	
+	void OnRPCStatSet( ParamsReadContext ctx , PlayerBase player)
+	{
+		Param2<string, float> p = new Param2<string, float>( "", 0 );
+		if ( ctx.Read(p) )
+		{
+			for ( int i = 0; i < player.m_PlayerStats.GetPCO().Get().Count(); i++ ) 
+			{
+				string label = player.m_PlayerStats.GetPCO().Get().Get( i ).GetLabel();
+				if ( label == p.param1 )
+				{
+					player.m_PlayerStats.GetPCO().Get().Get( i).SetByFloatEx(p.param2);
+				}
+				
+			}	
+		}
+	
+	}
+
+	//============================================
+	// LEVELS
+	//============================================	
+	//send player stats through RPC
+	void SendRPCLevels( PlayerBase player )
+	{
+		//write and send values
+		if ( player )
+		{
+			array<ref Param> rpc_params = new array<ref Param>;
+
+			rpc_params.Insert(new Param3<string, float, float>( "Immunity: "+ typename.EnumToString(EStatLevels, player.GetImmunityLevel() ),player.GetImmunityLevel(), player.GetBordersImmunity()));
+			rpc_params.Insert(new Param3<string, float, float>( "Blood: "+ typename.EnumToString(EStatLevels, player.GetStatLevelBlood()),player.GetStatLevelBlood(), player.GetStatBordersBlood()));
+			rpc_params.Insert(new Param3<string, float, float>( "Health: "+ typename.EnumToString(EStatLevels, player.GetStatLevelHealth() ),player.GetStatLevelHealth(), player.GetStatBordersHealth()));
+			rpc_params.Insert(new Param3<string, float, float>( "Energy: "+ typename.EnumToString(EStatLevels, player.GetStatLevelEnergy() ),player.GetStatLevelEnergy(), player.GetStatBordersEnergy()));
+			rpc_params.Insert(new Param3<string, float, float>( "Water: "+ typename.EnumToString(EStatLevels, player.GetStatLevelWater() ),player.GetStatLevelWater(), player.GetStatBordersWater()));
+			
+			int param_count = rpc_params.Count();
+			rpc_params.InsertAt( new Param3<string, float, float>( "PARAM_COUNT", param_count,0 ), 0);
+			//send params
+			GetDayZGame().RPC( player, ERPCs.DEV_RPC_LEVELS_DATA, rpc_params, true, player.GetIdentity() );
+		}
+	}
+
+	//Display player stats
+	void OnRPCLevels( ParamsReadContext ctx )
+	{
+		//clear values
+		m_PlayerLevelsSynced.Clear();
+		
+		Param3<string, float, float> p3 = new Param3<string, float, float>( "", 0,0 );
+		
+		//get param count
+		int param_count = 0;
+		if ( ctx.Read(p3) )
+		{
+			param_count = p3.param2;
+		}
+		
+		//read values and set 
+		for ( int i = 0; i < param_count; i++ )
+		{
+			if ( ctx.Read(p3) )
+				m_PlayerLevelsSynced.Insert( new SyncedValueLevel( p3.param1, p3.param2, p3.param3 ) );
+		}
+	}
+	
+	
+	void SendRPCMods( PlayerBase player )
+	{
+		//write and send values
+		if ( player )
+		{
+			array<ref Param> rpc_params = new array<ref Param>;
+			
+			//get modifiers
+			ModifiersManager mods_manager = player.GetModifiersManager();
+			
+			//param count
+			array<ref ModifierDebugObj> modifiers = new array<ref ModifierDebugObj>;
+			mods_manager.DbgGetModifiers( modifiers );
+			
+			float param_count = ( float ) modifiers.Count();
+			rpc_params.Insert( new Param1<int>( param_count ));
+			
+			//set modifiers
+			for ( int i = 0; i < modifiers.Count(); ++i ) 
+			{
+				int id = modifiers.Get(i).GetID();
+				string name = modifiers.Get(i).GetName();
+				bool active =  modifiers.Get(i).IsActive();
+				bool locked =  modifiers.Get(i).IsLocked();
+				
+				rpc_params.Insert( new Param4<int, string, bool, bool>( id, name, active, locked ) );
+			}
+			
+			//send params
+			GetDayZGame().RPC( player, ERPCs.DEV_RPC_MODS_DATA, rpc_params, true, player.GetIdentity() );
+		}
+	}
+	
+	//============================================
+	// MODS
+	//============================================	
+	//send player mods through RPC
+	void SendRPCModsDetail( PlayerBase player )
+	{
+		//write and send values
+		if ( player )
+		{
+			Param1<string> p1 = new Param1<string>("");
+			ModifiersManager mods_manager = player.GetModifiersManager();
+			int mod_id = m_RegisteredPlayers.Get(player).m_DetailedModifierIndex;
+			p1.param1 = mods_manager.GetModifier(mod_id).GetDebugText();
+			//send params
+			if (p1.param1 != "")
+				GetDayZGame().RPCSingleParam( player, ERPCs.DEV_RPC_MODS_DATA_DETAILED, p1, true, player.GetIdentity() );
+		}
+	}
+
+	//Display player modifiers
+	void OnRPCMods( ParamsReadContext ctx )
+	{
+		//clear values
+		m_PlayerModsSynced.Clear();
+		
+		//ref Param3<string, float, bool> p = new Param3<string, float, bool>( "", 0, false );
+		Param1<int> p1 = new Param1<int>(0);
+		Param4<int, string, bool, bool> p4 = new Param4<int, string, bool, bool>( 0,"", false, false );
+		//get param count
+		int param_count = 0;
+		if ( ctx.Read(p1) )
+		{
+			param_count = (int) p1.param1;
+		}
+		
+		//read values and set 
+		for ( int i = 0; i < param_count; i++ )
+		{
+			if (ctx.Read(p4))
+			{
+				m_PlayerModsSynced.Insert( new SyncedValueModifier( p4.param1, p4.param2, p4.param3, p4.param4 ) );
+			}
+		}
+	}
+	
+	void OnRPCModsDetailed( ParamsReadContext ctx )
+	{
+		Param1<string> p1 = new Param1<string>("");
+		
+		//get param count
+		if ( ctx.Read(p1) )
+		{
+			m_PlayerModsDetailedSynced = p1.param1;
+		}
+	}
+
+	
+	/*
+	//Activates modifier with given ID
+	void RequestDetailedInfo( int id, PlayerBase player = NULL )
+	{
+		int modifier_id = Math.AbsInt( id );
+		if(id == m_DetailedInfoRequested)
+		{
+			m_DetailedInfoRequested = 0;//repeated request --> disable
+		}
+		else
+		{
+			m_DetailedInfoRequested = modifier_id;
+		}
+	}	
+	*/
+	//Activates modifier with given ID
+	void RequestDetailedInfo( int id, notnull PlayerBase player)
+	{
+		int modifier_id = Math.AbsInt( id );
+		m_RegisteredPlayers.Get(player).m_DetailedModifierIndex = modifier_id;
+		
+		if (IsSetSystemInBitmask(player, PDS_SYSTEMS.MODS_DETAILED ))
+		{
+			SetSystemInBitmask(player, PDS_SYSTEMS.MODS_DETAILED, false);
+		}
+		else
+		{
+			SetSystemInBitmask(player, PDS_SYSTEMS.MODS_DETAILED, true);
+		}
+	}
+	
+	
+	//Activates modifier with given ID
+	void ActivateModifier( int id, PlayerBase player = NULL )
+	{
+		if ( !player )
+		{
+			player = PlayerBase.Cast( GetDayZGame().GetPlayer() );
+		}
+		ModifiersManager mods_manager = player.GetModifiersManager();
+		mods_manager.ActivateModifier( Math.AbsInt( id ) );
+	}
+
+	//Activates modifier with given ID
+	void DeactivateModifier( int id, PlayerBase player = NULL )
+	{
+		if ( !player )
+		{
+			player = PlayerBase.Cast( GetDayZGame().GetPlayer() );
+		}
+		ModifiersManager mods_manager = player.GetModifiersManager();
+		mods_manager.DeactivateModifier( Math.AbsInt( id ) );
+	}
+
+	//Activates modifier with given ID
+	void LockModifier( int id, bool lock, PlayerBase player = NULL )
+	{
+		if ( !player )
+		{
+			player = PlayerBase.Cast( GetDayZGame().GetPlayer() );
+		}
+		ModifiersManager mods_manager = player.GetModifiersManager();
+		mods_manager.SetModifierLock( Math.AbsInt( id ), lock );
+	}
+	
+	bool IsModifierLocked( int id, PlayerBase player = NULL )
+	{
+		if ( !player )
+		{
+			player = PlayerBase.Cast( GetDayZGame().GetPlayer() );
+		}
+		ModifiersManager mods_manager = player.GetModifiersManager();	
+		
+		return mods_manager.GetModifierLock( Math.AbsInt( id ) );
+	}
+	
+	//============================================
+	// TEMPERATURE
+	//============================================	
+
+	void SendRPCTemp( PlayerBase player )
+	{
+		if ( player )
+		{
+			CachedObjectsParams.PARAM1_STRING.param1 = player.m_Environment.GetDebugMessage();
+			GetDayZGame().RPCSingleParam( player, ERPCs.DEV_TEMP_UPDATE, CachedObjectsParams.PARAM1_STRING, true, player.GetIdentity() );
+		}
+	}
+
+	void OnRPCTemp( ParamsReadContext ctx , PlayerBase player)
+	{
+		if (GetGame().IsServer() && GetGame().IsMultiplayer())
+		{
+			EnableUpdate( GetRPCUpdateState( ctx ), ERPCs.DEV_TEMP_UPDATE, player );
+		}
+		else if (!GetGame().IsMultiplayer() || GetGame().IsClient())
+		{
+			if ( ctx.Read(CachedObjectsParams.PARAM1_STRING) )
+			{
+				m_EnvironmentDebugMessage = CachedObjectsParams.PARAM1_STRING.param1;
+			}
+		}
+
+	}
+	
+	//============================================
+	// AGENTS
+	//============================================	
+	//send player mods through RPC
+	void SendRPCAgents( PlayerBase player )
+	{
+		//write and send values
+		if ( ( player && player.GetIdentity() && player.m_AgentPool != null ) || ( player && !GetGame().IsMultiplayer() && player.m_AgentPool != null ) )
+		{
+			
+			//get agent pool data
+			array<ref Param> agent_pool = new array<ref Param>;
+			player.m_AgentPool.GetDebugObject( agent_pool );
+		
+			GetDayZGame().RPC( player, ERPCs.DEV_RPC_AGENTS_DATA, agent_pool, true, player.GetIdentity() );
+		}
+	}
+
+	//Display player modifiers
+	void OnRPCAgents( ParamsReadContext ctx )
+	{
+		//clear values
+		m_PlayerAgentsSynced.Clear();
+		
+		Param3<string, string, int> p3 = new Param3<string, string, int>( "", "" ,0 );
+		Param1<int> p1 = new Param1<int>(0);
+		
+		//get param count
+		int param_count = 0;
+		if ( ctx.Read(p1) )
+		{
+			param_count = p1.param1;
+		}
+		
+		//read values and set 
+		for ( int i = 0; i < param_count; i++ )
+		{
+			ctx.Read(p3);
+			m_PlayerAgentsSynced.Insert( new SyncedValueAgent( p3.param1, p3.param2, p3.param3 ) );
+		}
+	}
+	
+	//============================================
+	// STOMACH
+	//============================================	
+
+	void SendRPCStomach( PlayerBase player )
+	{
+		//write and send values
+		if ( player )
+		{			
+			array<ref Param> stomach = new array<ref Param>;
+			int count = player.m_PlayerStomach.GetDebugObject( stomach );
+			stomach.InsertAt(new Param1<int>(count), 0);
+		
+			GetDayZGame().RPC( player, ERPCs.DEV_RPC_STOMACH_DATA, stomach, true, player.GetIdentity() );
+		}
+	}
+
+
+	void OnRPCStomach( ParamsReadContext ctx )
+	{
+		//clear values
+		m_PlayerStomachSynced.Clear();
+		
+		Param1<int> p1 = new Param1<int>(0);
+		int param_count = 0;
+		if ( ctx.Read(p1) )
+		{
+			param_count = p1.param1;
+		}
+		
+		if (param_count)
+		{
+			//invidividual stomach items
+			for ( int i = 0; i < param_count; i++ )
+			{
+				Param4<int,int,int,float> p4 = new Param4<int,int,int,float>(0,0,0,0);
+				ctx.Read(p4);
+				m_PlayerStomachSynced.Insert(p4);
+			}
+			//volume
+			Param1<float> p1b = new Param1<float>(0);
+			ctx.Read(p1b);
+			m_PlayerStomachSynced.Insert(p1b);
+		}
+	}
+
+	//Update data on local
+	/*
+	void UpdateAgentsLocal()
+	{
+		PlayerBase player = PlayerBase.Cast( GetDayZGame().GetPlayer() );
+		
+		if ( player )
+		{
+			//clear values
+			m_PlayerAgentsSynced.Clear();
+			
+			//get agent pool data
+			array<ref Param> agent_pool = new array<ref Param>;
+			player.m_AgentPool.GetDebugObject( agent_pool );
+			
+			//get agents count 
+			Param1<int> p1 = Param1<int>.Cast( agent_pool.Get( 0 ) );
+			int agents_count = p1.param1;
+			
+			//set synced data
+			for ( int i = 0; i < agents_count; i++ ) 
+			{
+				string name = Param2<string,string>.Cast(agent_pool.Get(i+1)).param1;
+				string count = Param2<string,string>.Cast(agent_pool.Get(i+1)).param2;
+				m_PlayerAgentsSynced.Insert( new SyncedValueAgent( name, count, false ) );
+			}
+		}
+	}
+	*/
+	//================================================================
+	// FOCUS
+	//================================================================ 
+	void CaptureFocus()
+	{
+		GetGame().GetInput().ChangeGameFocus( 1 );
+		GetGame().GetUIManager().ShowUICursor( true );
+	}
+	
+	void ReleaseFocus()
+	{
+		GetGame().GetInput().ChangeGameFocus( -1 );
+		GetGame().GetUIManager().ShowUICursor( false );
+	}
+	
+	void ToggleFocus()
+	{
+		if ( GetGame().GetInput().HasGameFocus() )
+		{
+			GetGame().GetInput().ChangeGameFocus( 1 );
+			GetGame().GetUIManager().ShowUICursor( true );
+		}
+		else
+		{
+			GetGame().GetInput().ResetGameFocus();
+			GetGame().GetUIManager().ShowUICursor( false );
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenu.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..cd15c3a9156871c4fd4d220b2bda2470c9f6e40c
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenu.c
@@ -0,0 +1,1239 @@
+// For modding, see PluginDiagMenuModding.c
+// !!! MODDING DISCLAIMER: These are debug functionality files, if you are thinking about modding the vanilla ones, do so at your own risk
+//                         These files will not be maintained with the thought of "what if a modder modded this" (Excluding the modding functionality of course)
+//                         Which is why the modding functionality was developed with the thought of the modded ones having their own isolated safe space
+
+enum DebugActionType
+{
+	GENERIC_ACTIONS = 1,
+	PLAYER_AGENTS = 2,
+	UNLIMITED_AMMO = 4,
+};
+
+#ifdef DIAG_DEVELOPER
+enum ESubscriberSystems
+{
+	TRIGGERS = 0x00000001,
+	//SYSTEM2 = 0x00000002,
+	//SYSTEM3 = 0x00000004,
+	//SYSTEM4 = 0x00000008,
+}
+
+typedef Param1<int> SendDiagRPCSelfBasicParam;
+typedef Param2<int,Param> SendDiagRPCSelfParamParam;
+
+typedef Param2<int,bool> SendDiagRPCBasicParam;
+typedef Param3<int,bool,Param> SendDiagRPCParamParam;
+#endif
+
+class PluginDiagMenu : PluginBase
+{
+#ifdef DIAG_DEVELOPER
+	
+	int m_ModdedDiagID = DiagMenuIDs.MODDED_MENU;
+	
+	// LEVEL 3 - Script > Misc > Hair Hiding
+	ref map<int,bool> m_HairHidingStateMap;
+	ref TStringArray m_HairSelectionArray;
+	int m_TotalHairLevelsAdjusted;
+	
+	override void OnInit()
+	{				
+		//----------------------
+		m_HairHidingStateMap = new map<int,bool>;
+		m_HairSelectionArray = new TStringArray;
+		
+		g_Game.ConfigGetTextArray("cfgVehicles Head_Default simpleHiddenSelections", m_HairSelectionArray);
+		m_TotalHairLevelsAdjusted = m_HairSelectionArray.Count() - 1;
+		for (int i = 0; i < m_HairSelectionArray.Count(); ++i)
+		{
+			m_HairHidingStateMap.Insert(i, 1); //all considered "shown" on init
+		}
+		
+		//----------------------
+		
+		DiagMenu.InitScriptDiags();
+		
+		RegisterDiags();
+	}
+	
+	override void OnDestroy()
+	{
+		DiagMenu.ClearScriptDiags();
+	}
+	
+	protected void RegisterDiags()
+	{
+		RegisterDeveloperDiags();
+		RegisterModdedDiagsIDs();
+		RegisterModdedDiags();
+		
+		if (m_ModdedDiagID == DiagMenuIDs.MODDED_MENU)
+		{
+			DiagMenu.Unregister(DiagMenuIDs.MODDED_MENU);
+		}
+	}
+	
+	private void RegisterDeveloperDiags()
+	{
+		//---------------------------------------------------------------
+		// LEVEL 0
+		//---------------------------------------------------------------
+ 		DiagMenu.RegisterMenu(DiagMenuIDs.SCRIPTS_MENU, "Script", -1);
+		{
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.VEHICLES, "Vehicles", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Vehicles
+				//---------------------------------------------------------------
+				DiagMenu.RegisterItem(DiagMenuIDs.VEHICLE_DEBUG_OUTPUT, "", "Crash Log", DiagMenuIDs.VEHICLES, "None, Basic, Extended, Contact, Basic+Contact");
+				DiagMenu.RegisterBool(DiagMenuIDs.VEHICLE_DUMP_CRASH_DATA, "lalt+7", "Dump Crash Data", DiagMenuIDs.VEHICLES);
+			}
+
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.INVENTORY_MENU, "Inventory", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Inventory
+				//---------------------------------------------------------------		
+				DiagMenu.RegisterBool(DiagMenuIDs.INVENTORY_ENTITY_PLACEMENT_CALLBACK_DEBUG, "", "Placement Debug", DiagMenuIDs.INVENTORY_MENU);
+			}
+
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.TRANSFER_VALUES_MENU, "TransferValues", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > TransferValues
+				//---------------------------------------------------------------		
+				DiagMenu.RegisterBool(DiagMenuIDs.TRANSFER_VALUES_SHOW, "", "ShowValues", DiagMenuIDs.TRANSFER_VALUES_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.CRAFTING_MENU, "Crafting", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Crafting
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.CRAFTING_GENERATE, "", "Generate Cache", DiagMenuIDs.CRAFTING_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CRAFTING_INSTANT, "", "Debug Insta Crafting", DiagMenuIDs.CRAFTING_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CRAFTING_DUMP, "", "Dump recipes to file", DiagMenuIDs.CRAFTING_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.CHEATS_MENU, "Cheats", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Cheats
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_MODIFIERS, "lalt+2", "Tick Modifiers", DiagMenuIDs.CHEATS_MENU);
+					DiagMenu.SetValue(DiagMenuIDs.CHEATS_MODIFIERS, true);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_KILL_PLAYER, "", "Kill Player", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterItem(DiagMenuIDs.CHEATS_INVINCIBILITY, "lalt+1", "Invincibility (IDDQD)", DiagMenuIDs.CHEATS_MENU, "Disabled,Partial,Full");
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_DISABLE_STAMINA, "", "Disable stamina", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_RESET_PLAYER, "", "Reset Player", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_RESET_PLAYER_MAX, "lalt+3", "Reset Player Max", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_INVENTORY_ACCESS, "", "Inventory Access", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_FIX_ITEMS, "", "Fix Inventory Items", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_CREATE_HIT, "lalt+5", "Create Hit Heavy", DiagMenuIDs.CHEATS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CHEATS_CREATE_HIT_LIGHT, "lalt+6", "Create Hit Light", DiagMenuIDs.CHEATS_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.PLAYER_AGENTS_MENU, "Player Agents", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Player Agents
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.PLAYER_AGENTS_INJECTS_SHOW, "", "Allow Inject Actions", DiagMenuIDs.PLAYER_AGENTS_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.SOFT_SKILLS_MENU, "Soft Skills", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Soft Skills
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.SOFT_SKILLS_SHOW_DEBUG, "", "Show Debug", DiagMenuIDs.SOFT_SKILLS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.SOFT_SKILLS_TOGGLE_STATE, "", "Enable SoftSkills", DiagMenuIDs.SOFT_SKILLS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.SOFT_SKILLS_TOGGLE_MODEL, "", "Enable linear model", DiagMenuIDs.SOFT_SKILLS_MENU);
+				DiagMenu.RegisterRange(DiagMenuIDs.SOFT_SKILLS_SPECIALTY_VALUE, "", "Set specialty value", DiagMenuIDs.SOFT_SKILLS_MENU, "-1, 1, 0, 0.01");
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.LIFESPAN_MENU, "Lifespan", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Lifespan
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.LIFESPAN_BLOODY_HANDS, "", "Bloody hands", DiagMenuIDs.LIFESPAN_MENU);
+				DiagMenu.RegisterRange(DiagMenuIDs.LIFESPAN_PLAYTIME_UPDATE, "", "Playtime in minutes", DiagMenuIDs.LIFESPAN_MENU, "0, 600, 0, 10");
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.MISC_MENU, "Misc", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Misc
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_ACTION_ON_CURSOR, "", "Perform Diag On Cursor", DiagMenuIDs.MISC_MENU);
+#ifdef DIAG_MISC_ACTION_ON_CURSOR
+					DiagMenu.SetValue(DiagMenuIDs.MISC_ACTION_ON_CURSOR, true);
+#endif
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_DISABLE_PERSONAL_LIGHT, "", "Disable Personal Light", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_ITEM_DEBUG_ACTIONS, "", "Item Debug Actions", DiagMenuIDs.MISC_MENU); // Is enabled by default now
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_LOG_PLAYER_STATS, "", "Log Player Stats", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterMenu(DiagMenuIDs.MISC_ACTION_TARGETS_MENU, "Action Targets", DiagMenuIDs.MISC_MENU);
+				{
+					//---------------------------------------------------------------
+					// LEVEL 3 - Script > Misc > Action Targets
+					//---------------------------------------------------------------
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_ACTION_TARGETS_NEW, "", "New AT Selection", DiagMenuIDs.MISC_ACTION_TARGETS_MENU, true);
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_ACTION_TARGETS_DEBUG, "", "Show Debug", DiagMenuIDs.MISC_ACTION_TARGETS_MENU);
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_ACTION_TARGETS_SELPOS_DEBUG, "", "Show selection pos debug", DiagMenuIDs.MISC_ACTION_TARGETS_MENU);
+				}
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Misc
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_PERMANENT_CROSSHAIR, "", "Enable permanent crosshair", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_TELEPORT_BREAKS_SYNC, "", "Teleport Breaks Sync", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_VEHICLE_GETOUT_BOX, "", "Debug transport freespace", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_VEHICLE_GETOUT_RAYCAST, "", "Debug transport get out raycast", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_TOGGLE_HUD, "", "Toggle HUD on/off", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterMenu(DiagMenuIDs.MISC_ENVIRONMENT_MENU, "Environment", DiagMenuIDs.MISC_MENU);
+				{
+					//---------------------------------------------------------------
+					// LEVEL 3 - Script > Misc > Environment
+					//---------------------------------------------------------------
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_ENVIRONMENT_DEBUG, "", "Show Environment stats", DiagMenuIDs.MISC_ENVIRONMENT_MENU);
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_ENVIRONMENT_LOGGING_DRYWET, "", "Log Player Dry/Wetness", DiagMenuIDs.MISC_ENVIRONMENT_MENU, false);
+
+				}
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_FALLDAMAGE_DEBUG, "", "Show FallDamage stats", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterRange(DiagMenuIDs.MISC_DISPLAY_PLAYER_INFO, "", "Display Player Info", DiagMenuIDs.MISC_MENU, "0,2,0,1");
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_UNIVERSAL_TEMPERATURE_SOURCES, "lalt+u", "Universal Temp Sources", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_DRAW_CHECKERBOARD, "", "Draw Checkerboard on screen", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_BULLET_IMPACT, "", "BulletImpact", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_PRESENCE_NOTIFIER_DBG, "", "Show Presence to AI dbg", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_GO_UNCONSCIOUS, "lctrl+m", "Go Unconscious", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_GO_UNCONSCIOUS_DELAYED, "", "Uncons. in 10sec", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_QUICK_RESTRAIN, "", "Quick Restrain", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterMenu(DiagMenuIDs.MISC_HAIR_MENU, "Hair Hiding", DiagMenuIDs.MISC_MENU);
+				{
+					//---------------------------------------------------------------
+					// LEVEL 3 - Script > Misc > Hair Hiding
+					//---------------------------------------------------------------
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_HAIR_DISPLAY_DEBUG, "", "Display Debug", DiagMenuIDs.MISC_HAIR_MENU);
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HAIR_LEVEL, "", "Hair Level#", DiagMenuIDs.MISC_HAIR_MENU, string.Format("0,%1,0,1", m_TotalHairLevelsAdjusted));
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_HAIR_LEVEL_HIDE, "", "Toggle Hair Level", DiagMenuIDs.MISC_HAIR_MENU);
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_HAIR_HIDE_ALL, "", "Hide/Show All", DiagMenuIDs.MISC_HAIR_MENU);
+				}
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Misc
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_CAM_SHAKE, "", "Simulate Cam Shake", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_QUICK_FISHING, "", "Quick Fishing", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_HOLOGRAM, "lctrl+h", "Hologram placing debug", DiagMenuIDs.MISC_MENU);				
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_SHOCK_IMPACT, "lalt+8", "ShockHitEffect", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_SHOW_PLUG_ARROWS, "", "Show Energy Manager Plug Arrows", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_BREATH_VAPOR_LVL, "", "Breath Vapor", DiagMenuIDs.MISC_MENU);
+					DiagMenu.SetValue(DiagMenuIDs.MISC_BREATH_VAPOR_LVL, true);				
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_TARGETABLE_BY_AI, "lalt+t", "Toggle Targetable By AI", DiagMenuIDs.MISC_MENU);
+					DiagMenu.SetValue(DiagMenuIDs.MISC_TARGETABLE_BY_AI, true);
+				DiagMenu.RegisterMenu(DiagMenuIDs.MISC_HIT_INDICATION_MENU, "Hit Indication", DiagMenuIDs.MISC_MENU);
+				{
+					//---------------------------------------------------------------
+					// LEVEL 3 - Script > Misc > Hit Indication
+					//---------------------------------------------------------------
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_HIT_INDICATION_DEBUG, "", "Enable Debug", DiagMenuIDs.MISC_HIT_INDICATION_MENU);
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_HIT_INDICATION_SPAWN_HIT, "", "Spawn Hit", DiagMenuIDs.MISC_HIT_INDICATION_MENU);
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HIT_INDICATION_SPAWN_HIT_DIRECTION, "", "Spawn Hit Direction", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "0, 359, 0, 1");
+					DiagMenu.RegisterItem(DiagMenuIDs.MISC_HIT_INDICATION_MODE, "", "Mode", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "Disabled,Static,Dynamic");
+						DiagMenu.SetValue(DiagMenuIDs.MISC_HIT_INDICATION_MODE, 1);
+					DiagMenu.RegisterItem(DiagMenuIDs.MISC_HIT_INDICATION_TYPE, "", "Type", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "Splash,Spike,Arrow");
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HIT_INDICATION_DURATION, "", "Hit Duration Max", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "0.1, 5.0, 1.0, 0.1");
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HIT_INDICATION_BREAKPOINT, "", "Hit Breakpoint", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "0.0, 1.0, 0.8, 0.05");
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HIT_INDICATION_DISTANCE, "", "Distance Adjust", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "0.0, 1.0, 0.0, 0.01");
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HIT_INDICATION_ROTATION, "", "Rotation Override", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "0, 360, 0, 15");
+					DiagMenu.RegisterRange(DiagMenuIDs.MISC_HIT_INDICATION_SCATTER, "", "Direction Scatter", DiagMenuIDs.MISC_HIT_INDICATION_MENU, "0, 90, 0, 1");
+					DiagMenu.RegisterBool(DiagMenuIDs.MISC_HIT_INDICATION_DISABLE_PPE, "", "Disable Hit PPE", DiagMenuIDs.MISC_HIT_INDICATION_MENU);
+				}
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Misc
+				//---------------------------------------------------------------	
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_FREEZE_ENTITY, "lalt+x", "Freeze entity", DiagMenuIDs.MISC_MENU);		
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_CONNECTION_STATS, "lalt+4", "Show Connection Stats", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_PLAYER_SYMPTOMS_SHOW, "", "Show States", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_INPUT_DEVICE_DISCONNECT_DBG, "", "InputDevice states", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MISC_DEBUG_MONITOR, "", "Debug Monitor", DiagMenuIDs.MISC_MENU);
+				DiagMenu.RegisterRange(DiagMenuIDs.MISC_FORCE_HINT_INDEX, "", "Force Hint Index", DiagMenuIDs.MISC_MENU, "-1, 512, -1, 1");
+				if (UiHintPanel.m_ForcedIndex != -1)
+					DiagMenu.SetRangeValue(DiagMenuIDs.MISC_FORCE_HINT_INDEX,UiHintPanel.m_ForcedIndex);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.SIMULATE_MENU, "Simulate script", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Simulate script
+				//---------------------------------------------------------------
+				DiagMenu.RegisterRange(DiagMenuIDs.SIMULATE_MODE, "", "Server/Client/Both", DiagMenuIDs.SIMULATE_MENU,"0,2,0,1");
+				DiagMenu.RegisterBool(DiagMenuIDs.SIMULATE_INFINITE_LOOP, "", "Simulate infinite loop", DiagMenuIDs.SIMULATE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.SIMULATE_NULL_POINTER, "", "Simulate null pointer", DiagMenuIDs.SIMULATE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.SIMULATE_DIVISION_BY_ZERO, "", "Simulate division by 0", DiagMenuIDs.SIMULATE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.SIMULATE_ERROR_FUNCTION, "", "Simulate Error() function", DiagMenuIDs.SIMULATE_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.MELEE_MENU, "Melee", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Melee
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_DEBUG, "", "Enable Melee Debug", DiagMenuIDs.MELEE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_CONTINUOUS, "", "Continuous update", DiagMenuIDs.MELEE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_SHOW_TARGETS, "", "Show targets", DiagMenuIDs.MELEE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_DRAW_TARGETS, "", "Draw targets", DiagMenuIDs.MELEE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_DRAW_RANGE, "", "Draw range", DiagMenuIDs.MELEE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_DRAW_BLOCK_RANGE_AI, "", "Draw block range PVE", DiagMenuIDs.MELEE_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.MELEE_DRAW_BLOCK_RANGE_PVP, "", "Draw block range PVP", DiagMenuIDs.MELEE_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.WEAPON_MENU, "Weapon", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Weapon
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.WEAPON_PARTICLES, "", "Enable gun particles", DiagMenuIDs.WEAPON_MENU);
+					DiagMenu.SetValue(DiagMenuIDs.WEAPON_PARTICLES, true);
+				DiagMenu.RegisterBool(DiagMenuIDs.WEAPON_DEBUG, "", "Show Debug", DiagMenuIDs.WEAPON_MENU); // Doesn't do anything anymore currently
+				DiagMenu.RegisterBool(DiagMenuIDs.WEAPON_AIM_NOISE, "", "Weapon Sway", DiagMenuIDs.WEAPON_MENU);
+					DiagMenu.SetValue(DiagMenuIDs.WEAPON_AIM_NOISE, true);
+				DiagMenu.RegisterBool(DiagMenuIDs.WEAPON_RECOIL, "", "Procedural Recoil", DiagMenuIDs.WEAPON_MENU);
+					DiagMenu.SetValue(DiagMenuIDs.WEAPON_RECOIL, true);
+				DiagMenu.RegisterBool(DiagMenuIDs.WEAPON_UNLIMITED_AMMO, "lalt+9", "Unlimited Ammo", DiagMenuIDs.WEAPON_MENU);
+				DiagMenu.RegisterItem(DiagMenuIDs.WEAPON_BURST_VERSION, "lctrl+0", "Burst Version", DiagMenuIDs.WEAPON_MENU, "Hold, Press");
+				DiagMenu.RegisterBool(DiagMenuIDs.WEAPON_CLAYMORE_DEBUG, "", "Claymore debugs", DiagMenuIDs.WEAPON_MENU);
+				DiagMenu.RegisterItem(DiagMenuIDs.WEAPON_LIFT_DEBUG, "", "Weapon Lift Debug", DiagMenuIDs.WEAPON_MENU, "false,true,extended");
+			}
+		
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.BLEEDING_MENU, "Bleeding", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Bleeding
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.BLEEDING_SOURCES, "", "Show Bleeding Sources", DiagMenuIDs.BLEEDING_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.BLEEDING_DISABLE_BLOOD_LOSS, "", "Disable Blood Loss", DiagMenuIDs.BLEEDING_MENU);
+				DiagMenu.RegisterRange(DiagMenuIDs.BLEEDING_ACTIVATE_SOURCE, "", "Activate Source #", DiagMenuIDs.BLEEDING_MENU, "1, 32, 0, 1");
+				DiagMenu.RegisterBool(DiagMenuIDs.BLEEDING_ACTIVATE_ALL_SOURCES, "", "Activate All Sources", DiagMenuIDs.BLEEDING_MENU);
+				DiagMenu.RegisterItem(DiagMenuIDs.BLEEDING_ACTIVATE_SOURCE_LEVEL, "", "Activate Blsource Level", DiagMenuIDs.BLEEDING_MENU, "None, Low, Medium, High");
+				DiagMenu.RegisterBool(DiagMenuIDs.BLEEDING_RELOAD, "", "Client Reload", DiagMenuIDs.BLEEDING_MENU);
+				DiagMenu.RegisterMenu(DiagMenuIDs.BLEEDINGINDICATORS_MENU, "Bleeding Indication", DiagMenuIDs.BLEEDING_MENU);
+				{
+					//---------------------------------------------------------------
+					// LEVEL 3 - Script > Bleeding > Bleeding Indication
+					//---------------------------------------------------------------
+					DiagMenu.RegisterBool(DiagMenuIDs.BLEEDINGINDICATORS, "", "Enable BleedingIndicators", DiagMenuIDs.BLEEDINGINDICATORS_MENU);
+						DiagMenu.SetValue(DiagMenuIDs.BLEEDINGINDICATORS, true);
+					DiagMenu.RegisterBool(DiagMenuIDs.BLEEDINGINDICATORS_USEVALUEOVERRIDES, "", "Enable Debug Overrides", DiagMenuIDs.BLEEDINGINDICATORS_MENU);
+						DiagMenu.SetValue(DiagMenuIDs.BLEEDINGINDICATORS_USEVALUEOVERRIDES, false);
+					DiagMenu.RegisterBool(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RANDOMROTATION, "", "Enable Random Rotation", DiagMenuIDs.BLEEDINGINDICATORS_MENU);
+						DiagMenu.SetValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RANDOMROTATION, true);
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_SEQUENCE_DURATION, "", "Sequence Duration", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.2, 5.0, " + BleedingIndicationConstants.SEQUENCE_DURATION_DEFAULT.ToString() + ", 0.01");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_BASEDURATION, "", "Drop Anim Duration", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.1, 5.0, " + BleedingIndicationConstants.DROP_DURATION_LOW.ToString() + ", 0.05");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_MINDELAY, "", "Drop Min Delay", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.0, 5.0, " + BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MIN_LOW.ToString() + ", 0.05");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_MAXDELAY, "", "Drop Max Delay", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.0, 5.0, " + BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MAX_LOW.ToString() + ", 0.05");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_PROGRESSTHRESHOLD, "", "Drop Progress Threshold", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.1, 1.0, " + BleedingIndicationConstants.DROP_PROGRESS_THRESHOLD.ToString() + ", 0.05");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_STARTSIZE, "", "Drop Start Size", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.1, 1.0, " + BleedingIndicationConstants.DROP_SIZE_START_LOW.ToString() + ", 0.01");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_ENDSIZE, "", "Drop End Size", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.1, 1.0, " + BleedingIndicationConstants.DROP_SIZE_END_LOW.ToString() + ", 0.01");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RNDSCALEMIN, "", "Drop Size Random Min", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.0, 2.0, " + BleedingIndicationConstants.DROP_SIZE_VARIATION_MIN_LOW.ToString() + ", 0.01");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RNDSCALEMAX, "", "Drop Size Random Max", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.0, 2.0, " + BleedingIndicationConstants.DROP_SIZE_VARIATION_MAX_LOW.ToString() + ", 0.01");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_SCATTER, "", "Drop Scatter px", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.0, 500.0, " + BleedingIndicationConstants.DROP_SCATTER_LOW.ToString() + ", 1.0");
+					DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_SLIDEDISTANCE, "", "Drop Slide Distance", DiagMenuIDs.BLEEDINGINDICATORS_MENU, "0.0, 500.0, 0, 0.1");
+					DiagMenu.RegisterMenu(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "Color Debug", DiagMenuIDs.BLEEDINGINDICATORS_MENU);
+					{
+						//---------------------------------------------------------------
+						// LEVEL 4 - Script > Bleeding > Bleeding Indication > Color Debug
+						//---------------------------------------------------------------
+						DiagMenu.RegisterBool(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_ENABLEDESATURATION, "", "Desaturate", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU);
+							DiagMenu.SetValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_ENABLEDESATURATION, true);				
+						DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_DESATURATIONEND, "", "Saturation End Value", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "0.0, 1.0, " + BleedingIndicationConstants.DROP_COLOR_DESATURATIONEND.ToString() + ", 0.05");
+						DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_R, "", "Red", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "0.0, 255.0, " + BleedingIndicationConstants.DROP_COLOR_RED.ToString() + ", 1.0");
+						DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_G, "", "Green", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "0.0, 255.0, " + BleedingIndicationConstants.DROP_COLOR_GREEN.ToString() + ", 1.0");
+						DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_B, "", "Blue", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "0.0, 255.0, " + BleedingIndicationConstants.DROP_COLOR_BLUE.ToString() + ", 1.0");
+						DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_A_START, "", "Alpha - Start", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "0.0, 255.0, " + BleedingIndicationConstants.DROP_COLOR_ALPHA_START.ToString() + ", 1.0");
+						DiagMenu.RegisterRange(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_A_END, "", "Alpha - End", DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_MENU, "0.0, 255.0, " + BleedingIndicationConstants.DROP_COLOR_ALPHA_END.ToString() + ", 1.0");
+					}
+				}
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.LOGS_MENU, "Logs", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Logs
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_ACTIONS, "", "Log Actions", DiagMenuIDs.LOGS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_WEAPONS, "", "Log Weapons", DiagMenuIDs.LOGS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_SYNC, "", "Log Sync", DiagMenuIDs.LOGS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_BASEBUILDING, "", "Log Base building", DiagMenuIDs.LOGS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_QUICKBAR, "", "Log Quickbar", DiagMenuIDs.LOGS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_SYMPTOMS, "", "Log Symptoms", DiagMenuIDs.LOGS_MENU);
+				DiagMenu.RegisterMenu(DiagMenuIDs.LOGS_INVENTORY_MENU, "Inventory Logs", DiagMenuIDs.LOGS_MENU);
+				{
+					//---------------------------------------------------------------
+					// LEVEL 3 - Script > Logs > InventoryLogs
+					//---------------------------------------------------------------
+					DiagMenu.RegisterBool(DiagMenuIDs.LOGS_INVENTORY_MOVE, "", "Log Items move", DiagMenuIDs.LOGS_INVENTORY_MENU);
+					DiagMenu.RegisterBool(DiagMenuIDs.LOGS_INVENTORY_RESERVATION, "", "Log Reservations", DiagMenuIDs.LOGS_INVENTORY_MENU);
+					DiagMenu.RegisterBool(DiagMenuIDs.LOGS_INVENTORY_HFSM, "", "Log HandFSM", DiagMenuIDs.LOGS_INVENTORY_MENU);
+				}
+				DiagMenu.RegisterBool(DiagMenuIDs.LOGS_BLEEDING_CHANCES, "", "Bleeding Chances Logs", DiagMenuIDs.LOGS_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.TRIGGER_MENU, "Triggers", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Triggers
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.TRIGGER_DEBUG, "", "Show Triggers", DiagMenuIDs.TRIGGER_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.TRIGGER_PLAYER_DEBUG, "", "Show Player Touch", DiagMenuIDs.TRIGGER_MENU);
+				#ifdef TRIGGER_DEBUG_BASIC
+					DiagMenu.SetValue(DiagMenuIDs.TRIGGER_DEBUG, true);
+					DiagMenu.SetValue(DiagMenuIDs.TRIGGER_PLAYER_DEBUG, true);
+				#endif
+			}
+
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.BASEBUILDING_MENU, "Base Building", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Base Building
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.BASEBUILDING_WOOD, "", "Spawn uses wood/metal", DiagMenuIDs.BASEBUILDING_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.BASEBUILDING_GATE, "", "Spawn Fence makes gate", DiagMenuIDs.BASEBUILDING_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.UNDERGROUND_MENU, "Underground Areas", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Underground Areas
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.UNDERGROUND_SHOW_BREADCRUMB, "", "Show Breadcrumbs", DiagMenuIDs.UNDERGROUND_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.UNDERGROUND_DISABLE_DARKENING, "lctrl+f", "Disable Darkening", DiagMenuIDs.UNDERGROUND_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.FINISHERS_MENU, "Finishers", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Finishers
+				//---------------------------------------------------------------
+				DiagMenu.RegisterItem(DiagMenuIDs.FINISHERS_FINISHER_FORCED, "", "Forced Finisher: ", DiagMenuIDs.FINISHERS_MENU, "None,Liver,Neck");
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.SOUNDS_MENU, "Script Sounds", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Script Sounds
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.SOUNDS_ITEM_IMPACT_SOUNDS, "", "Item impact sounds", DiagMenuIDs.SOUNDS_MENU);
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.CAMERATOOLS_MENU, "Cinematic Camera Tools", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Cinematic Camera Tools
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.CAMERATOOLS_ENABLE_REMOTE_CAMERA, "", "Show remote camera", DiagMenuIDs.CAMERATOOLS_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.CAMERATOOLS_ENABLE_REMOTE_CAMERA_BROADCAST, "", "Broadcast camera", DiagMenuIDs.CAMERATOOLS_MENU);
+			}
+			//---------------------------------------------------------------
+			// LEVEL 1 - Script
+			//---------------------------------------------------------------
+			DiagMenu.RegisterMenu(DiagMenuIDs.FEATURE_TIME_ACCEL_MENU, "Time Accel", DiagMenuIDs.SCRIPTS_MENU);
+			{
+				//---------------------------------------------------------------
+				// LEVEL 2 - Script > Time Accel
+				//---------------------------------------------------------------
+				DiagMenu.RegisterBool(DiagMenuIDs.FEATURE_TIME_ACCEL, "lalt+0", "Apply Time Accel", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU);
+				DiagMenu.RegisterRange(DiagMenuIDs.FEATURE_TIME_ACCEL_VALUE1, "", "Accel Factor Big", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU,"0,100,1,1");
+				DiagMenu.RegisterRange(DiagMenuIDs.FEATURE_TIME_ACCEL_VALUE2, "", "Accel Factor Small", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU,"0,0.95 ,0,0.05");
+				DiagMenu.RegisterBool(DiagMenuIDs.FEATURE_TIME_ACCEL_UG_ENTRANCES, "", "Underground Entrances", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.FEATURE_TIME_ACCEL_UG_RESERVOIR, "", "Underground Reservoir", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.FEATURE_TIME_ACCEL_ENERGY_CONSUME, "", "Energy Consumption", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU);
+				DiagMenu.RegisterBool(DiagMenuIDs.FEATURE_TIME_ACCEL_FOOD_DECAY, "", "Decay", DiagMenuIDs.FEATURE_TIME_ACCEL_MENU);
+			}
+		}
+	}
+	
+	//---------------------------------------------
+	protected int GetModdedDiagID()
+	{
+		return ++m_ModdedDiagID;
+	}
+	
+	//---------------------------------------------
+	protected int GetModdedRootMenu()
+	{
+		return DiagMenuIDs.MODDED_MENU;
+	}
+	
+	//---------------------------------------------
+	protected void RegisterModdedDiagsIDs();
+	
+	//---------------------------------------------
+	protected void RegisterModdedDiags()
+	{
+ 		DiagMenu.RegisterMenu(DiagMenuIDs.MODDED_MENU, "Script - Modded", -1);
+	}
+	
+	//---------------------------------------------
+	void OnRPC(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+		EntityAI parent;
+		Class.CastTo(parent, player.GetParent());
+
+		switch (rpc_type)
+		{
+			//---------------------------------------------------------------
+			// Misc, multipurpose
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_ITEM_DEBUG_ACTIONS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					ItemBase.SetDebugActionsMask(CachedObjectsParams.PARAM1_INT.param1);
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Player States
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG_ON:
+			case ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG_OFF:
+			case ERPCs.DIAG_PLAYER_SYMPTOMS_DEBUG:
+			{
+				if (player.GetSymptomManager())
+				{
+					player.GetSymptomManager().OnRPCDebug(rpc_type, ctx);
+				}
+				break;
+			}
+
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Crafting
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CRAFTING_INSTANT:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+				{
+					PluginRecipesManager pluginRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+					pluginRecipesManager.SetEnableDebugCrafting(CachedObjectsParams.PARAM1_INT.param1);
+				}
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Cheats
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_MODIFIERS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					player.SetModifiers(CachedObjectsParams.PARAM1_INT.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_KILL_PLAYER:
+			{
+				player.SetHealth("","", -1);
+				break;	
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_INVINCIBILITY:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+				{
+					switch (CachedObjectsParams.PARAM1_INT.param1)
+					{
+						case 0:
+						{
+							if (parent)
+							{
+								parent.SetAllowDamage(true);
+								parent.SetCanBeDestroyed(true);
+							}
+
+							player.SetAllowDamage(true);
+							player.SetCanBeDestroyed(true);
+							break;
+						}
+						case 1:
+						{
+							if (parent)
+							{
+								parent.SetAllowDamage(true);
+								parent.SetCanBeDestroyed(false);
+							}
+
+							player.SetAllowDamage(true);
+							player.SetCanBeDestroyed(false);
+							break;
+						}
+						case 2:
+						{
+							if (parent)
+							{
+								parent.SetAllowDamage(false);
+							}
+
+							player.SetAllowDamage(false);
+							break;
+						}
+					}
+					break;
+				}
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_DISABLE_STAMINA:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.SetStaminaDisabled(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_RESET_PLAYER:
+			{
+				player.ResetPlayer(false);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_RESET_PLAYER_MAX:
+			{
+				player.ResetPlayer(true);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_INVENTORY_ACCESS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					player.DEBUG_INVENTORY_ACCESS = CachedObjectsParams.PARAM1_INT.param1;
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CHEATS_ITEMS_FIX:
+			{
+				player.FixAllInventoryItems();
+				break;
+			}
+			//---------------------------------------------------------------
+			//---------------------------DAMAGE DEBUG------------------------
+			// hardcoded for Heavy and Light, but Light can be converted to some sort of setup if we need to have even more times with more settings, ie. we could first set-up the hit params and then perform it
+			case ERPCs.DIAG_CHEATS_CREATE_HIT:
+			{
+				player.ProcessDirectDamage(DamageType.CUSTOM, player, "", "Dummy_Heavy", "0 0 0");
+				break;
+			}
+			
+			case ERPCs.DIAG_CHEATS_CREATE_HIT_LIGHT:
+			{
+				player.ProcessDirectDamage(DamageType.CUSTOM, player, "", "MeleeFist", "0 0 0");
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Soft Skills
+			//---------------------------------------------------------------			
+			case ERPCs.DIAG_SOFT_SKILLS_SHOW_DEBUG:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+				{
+					if (CachedObjectsParams.PARAM1_BOOL.param1)
+					{
+						player.GetSoftSkillsManager().StartSynchTimer();
+					}
+					else
+					{
+						player.GetSoftSkillsManager().StopSynchTimer();
+						player.GetSoftSkillsManager().ResetDebugWindow();
+					}
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_SOFT_SKILLS_TOGGLE_STATE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.GetSoftSkillsManager().SetSoftSkillsState(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_SOFT_SKILLS_TOGGLE_MODEL:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.GetSoftSkillsManager().SetLinearState(CachedObjectsParams.PARAM1_BOOL.param1) ;
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_SOFT_SKILLS_SPECIALTY_VALUE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_FLOAT))
+				{
+					SoftSkillsManager softSkillsMngr = player.GetSoftSkillsManager();
+					softSkillsMngr.SetSpecialtyLevel(CachedObjectsParams.PARAM1_FLOAT.param1);
+					softSkillsMngr.SynchSpecialtyLevel();
+					player.GetStatSpecialty().Set(CachedObjectsParams.PARAM1_FLOAT.param1);
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Lifespan
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LIFESPAN_BLOODY_HANDS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+				{
+					PluginLifespan pluginLifespan = PluginLifespan.Cast(GetPlugin(PluginLifespan));
+					pluginLifespan.UpdateBloodyHandsVisibility(player, CachedObjectsParams.PARAM1_BOOL.param1);
+				}
+				break;
+			}
+
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LIFESPAN_PLAYTIME_UPDATE:
+			{
+				if (ctx.Read( CachedObjectsParams.PARAM1_FLOAT))
+				{
+					//reset playtime
+					player.StatUpdate(AnalyticsManagerServer.STAT_PLAYTIME, player.StatGet(AnalyticsManagerServer.STAT_PLAYTIME) * -1);
+					//set new playtime
+					player.StatUpdate(AnalyticsManagerServer.STAT_PLAYTIME, CachedObjectsParams.PARAM1_FLOAT.param1 );
+					player.SetLastShavedSeconds(0);
+					//update lifespan
+					PluginLifespan pluginLifespann = PluginLifespan.Cast(GetPlugin(PluginLifespan));
+					pluginLifespann.ChangeFakePlaytime( player, CachedObjectsParams.PARAM1_FLOAT.param1 );
+					pluginLifespann.UpdateLifespan(player, true);
+				}
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Misc
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_LOG_PLAYER_STATS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.GetPlayerStats().SetAllowLogs(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Misc -> Environment
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_ENVIRONMENT_DEBUG:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+				{
+					if (player.m_Environment)
+						player.m_Environment.m_Debug = CachedObjectsParams.PARAM1_BOOL.param1;
+				}
+				break;
+			}
+			
+			case ERPCs.DIAG_MISC_ENVIRONMENT_LOGGING_DRYWET:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+				{
+					if (player.m_Environment)
+						player.m_Environment.m_DebugLogDryWet = CachedObjectsParams.PARAM1_BOOL.param1;
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Misc
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_FALLDAMAGE_DEBUG:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+				{
+					if (player.GetFallDamage())
+						player.GetFallDamage().m_Debug = CachedObjectsParams.PARAM1_BOOL.param1;
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_GO_UNCONSCIOUS:
+			{
+				GoUnconscious(player);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_GO_UNCONSCIOUS_DELAYED:
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(GoUnconscious, 10000, false, player);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_QUICK_RESTRAIN:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.SetQuickRestrain(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 3 - Script > Misc > Hair Hiding
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_HAIR_LEVEL_HIDE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM2_INT_INT))
+				{
+					player.SetHairLevelToHide(CachedObjectsParams.PARAM2_INT_INT.param1, CachedObjectsParams.PARAM2_INT_INT.param2, true);
+					player.UpdateHairSelectionVisibility(true);
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Misc
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_QUICK_FISHING:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.SetQuickFishing(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_TARGETABLE_BY_AI:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.m_CanBeTargetedDebug = CachedObjectsParams.PARAM1_BOOL.param1;
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_MISC_DEBUG_MONITOR:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					GetGame().SetDebugMonitorEnabled(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Simulate script
+			//---------------------------------------------------------------			
+			case ERPCs.DIAG_SIMULATE_INFINITE_LOOP:
+			{
+				while ( true )
+				{
+					Print("simulating infinite loop");
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_SIMULATE_NULL_POINTER:
+			{
+				PlayerBase NULL_player = null;
+				NULL_player.SetHealth("","", -1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_SIMULATE_DIVISION_BY_ZERO:
+			{
+				int zero = 0;
+				int division_by_zero = 1/zero;
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_SIMULATE_ERROR_FUNCTION:
+			{
+				ErrorEx("Simulated error");
+				break;
+			}
+		
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Weapon
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_WEAPON_PARTICLES:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					PrtTest.m_GunParticlesState = CachedObjectsParams.PARAM1_BOOL.param1;
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_WEAPON_RECOIL:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.GetAimingModel().SetProceduralRecoilEnabled(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_WEAPON_BURST_VERSION:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					player.GetWeaponManager().SetBurstOption(CachedObjectsParams.PARAM1_INT.param1);
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Bleeding
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_BLEEDING_DISABLE_BLOOD_LOSS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					player.GetBleedingManagerServer().SetBloodLoss(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_BLEEDING_ACTIVATE_SOURCE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					player.GetBleedingManagerServer().DebugActivateBleedingSource(CachedObjectsParams.PARAM1_INT.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------		
+			case ERPCs.DIAG_BLEEDING_ACTIVATE_ALL_SOURCES:
+			{
+				player.GetBleedingManagerServer().ActivateAllBS();
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Logs
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_ACTIONS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.ActionLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_WEAPONS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.WeaponLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+	
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_SYNC:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.SyncLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}	
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_BASEBUILDING:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.BaseBuildingLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+				
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_SYMPTOMS:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.SymptomLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_INVENTORY_MOVE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.InventoryMoveLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_INVENTORY_RESERVATION:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.InventoryReservationLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_INVENTORY_HFSM:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.InventoryHFSMLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_QUICKBAR:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.QuickbarLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}			
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_LOGS_BLEEDING_CHANCES:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					LogManager.BleedingChancesLogEnable(CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Base Building
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_BASEBUILDING_WOOD:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL) && DiagMenu.GetBool(DiagMenuIDs.BASEBUILDING_WOOD) != CachedObjectsParams.PARAM1_BOOL.param1)
+					DiagMenu.SetValue(DiagMenuIDs.BASEBUILDING_WOOD, CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_BASEBUILDING_GATE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL) && DiagMenu.GetBool(DiagMenuIDs.BASEBUILDING_GATE) != CachedObjectsParams.PARAM1_BOOL.param1)
+					DiagMenu.SetValue(DiagMenuIDs.BASEBUILDING_GATE, CachedObjectsParams.PARAM1_BOOL.param1);
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Finishers
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_FINISHERS_FORCE_FINISHER:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					player.GetMeleeCombat().DebugSetForcedFinisherType(CachedObjectsParams.PARAM1_INT.param1);
+				break;
+			}
+			
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Cinematic Camera Tools
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_CAMERATOOLS_CAM_DATA:
+			{
+				if (!player.m_CameraToolsMenuClient)
+				{
+					player.m_CameraToolsMenuClient = new CameraToolsMenuClient();
+				}
+				
+				player.m_CameraToolsMenuClient.OnRPC(ctx);
+				break;
+			}
+
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Time Accel
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_TIMEACCEL:
+			{
+				TimeAccelParam tap = new TimeAccelParam(false, 0, 0);
+				
+				if (ctx.Read(tap))
+				{
+					FeatureTimeAccel.m_CurrentTimeAccel = tap;
+					//Print("received from " + player);
+					array<Man> players = new array<Man>();
+					GetGame().GetPlayers(players);
+					foreach (Man p : players)
+					{
+						if (p != player)// send to everyone except the one we receieved from
+						{
+							//Print("sending to " + p);
+							GetGame().RPCSingleParam( p, ERPCs.DIAG_TIMEACCEL_CLIENT_SYNC, tap, true, p.GetIdentity());
+						}					
+					}
+					
+					/*
+					Print(" -------- TimeAccelParam -------");
+					Print(tap.param1);
+					Print(tap.param2);
+					Print(tap.param3);
+					Print(" -------------------------------");
+					Print(FeatureTimeAccel.GetFeatureTimeAccelEnabled(ETimeAccelCategories.UNDERGROUND_ENTRANCE));
+					Print(FeatureTimeAccel.GetFeatureTimeAccelValue());
+					Print(" ===============================");
+					*/
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_TIMEACCEL_CLIENT_SYNC:
+			{
+				TimeAccelParam tap2 = new TimeAccelParam(false, 0, 0);
+				
+				if (ctx.Read(tap2))
+				{
+					int bigFactor = tap2.param2;
+					float smallFactor = tap2.param2 - bigFactor;
+					SetTimeAccelMenuState(tap2.param1, bigFactor, smallFactor, tap2.param3);
+					FeatureTimeAccel.m_CurrentTimeAccel = tap2;
+				}
+				break;
+			}
+			
+			//---------------------------------------------------------------
+			// LEVEL 2 - Script > Vehicles
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_VEHICLE_DEBUG_OUTPUT:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+					CarScript.DEBUG_OUTPUT_TYPE = CachedObjectsParams.PARAM1_INT.param1;
+				break;
+			}
+			//---------------------------------------------------------------
+			case ERPCs.DIAG_VEHICLES_DUMP_CRASH_DATA_REQUEST:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+					CrashDebugData.SendData(player);
+				break;
+			}
+		}
+	}
+	
+	//---------------------------------------------
+	void GoUnconscious(PlayerBase player)
+	{
+		if (player.IsUnconscious())
+		{
+			player.SetHealth("", "Shock", 100);
+		}
+		else
+		{
+			player.m_UnconsciousEndTime = -60;
+			player.SetHealth("", "Shock", 0);
+		}
+	}
+	
+	//---------------------------------------------	
+	void InitTimeAccel()
+	{
+		FeatureTimeAccel.m_CurrentTimeAccel = GetTimeAccelMenuState();
+		
+		string value;
+		
+		if ( GetGame().CommandlineGetParam("timeAccel", value))
+		{
+			TStringArray params = new TStringArray();
+			
+			value.Replace(" ","");
+			value.Split(",", params);
+			
+			bool 	enable 		= params[0].ToInt();
+			int 	timeAccelBig 	= params[1].ToInt();
+			float 	timeAccelSmall 	= params[2].ToFloat();
+			int 	bitMask 		= params[3].ToInt();
+			
+			SetTimeAccelMenuState(enable, timeAccelBig, timeAccelSmall, bitMask);
+		}
+	}
+	
+	TimeAccelParam GetTimeAccelMenuState()
+	{
+		bool 	enable 			= DiagMenu.GetBool(DiagMenuIDs.FEATURE_TIME_ACCEL);
+		float 	timeAccelBig 	= DiagMenu.GetRangeValue(DiagMenuIDs.FEATURE_TIME_ACCEL_VALUE1);
+		float 	timeAccelSmall 	= DiagMenu.GetRangeValue(DiagMenuIDs.FEATURE_TIME_ACCEL_VALUE2);
+		float 	timeAccel 		= timeAccelBig + timeAccelSmall;
+		int 	bitMask			= FeatureTimeAccel.GetTimeAccelBitmask();
+	
+		TimeAccelParam param 	= new TimeAccelParam(enable, timeAccel, bitMask);
+		return param;
+	}
+	
+	void SetTimeAccelMenuState(bool enable, int bigFactor, float smallFactor, int bitmask)
+	{
+		DiagMenu.SetValue(DiagMenuIDs.FEATURE_TIME_ACCEL, enable);
+		DiagMenu.SetRangeValue(DiagMenuIDs.FEATURE_TIME_ACCEL_VALUE1, bigFactor);
+		DiagMenu.SetRangeValue(DiagMenuIDs.FEATURE_TIME_ACCEL_VALUE2, smallFactor);
+	
+		for (int i = 0; i < EnumTools.GetEnumSize(ETimeAccelCategories); ++i)
+		{
+			int bit = 1 << i;
+			bool on = (bit & bitmask);
+			DiagMenu.SetValue(FeatureTimeAccel.GetDiagIDByCategory(bit), on);
+		}
+	}
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuClient.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuClient.c
new file mode 100644
index 0000000000000000000000000000000000000000..6d8188761d5051a83324bf3222a361e08b8cb0cd
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuClient.c
@@ -0,0 +1,1369 @@
+// For modding, see PluginDiagMenuModding.c
+// !!! MODDING DISCLAIMER: These are debug functionality files, if you are thinking about modding the vanilla ones, do so at your own risk
+//                         These files will not be maintained with the thought of "what if a modder modded this" (Excluding the modding functionality of course)
+//                         Which is why the modding functionality was developed with the thought of the modded ones having their own isolated safe space
+
+class PluginDiagMenuClient : PluginDiagMenu
+{
+#ifdef DIAG_DEVELOPER
+	static int m_SystemsMask;
+	
+	// Cheats
+	bool m_ModifiersEnabled = true;
+	int m_IsInvincible;	
+	bool m_StaminaDisabled;	
+	
+	// Misc
+	float m_Playtime;
+	bool m_LogPlayerStats;	
+	Shape m_VehicleFreeAreaBox;	
+	ref EnvDebugData m_EnvDebugData;
+	ref FallDamageDebugData m_FallDamageDebugData;
+	
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		BindCallbacks();
+	}
+	
+	protected void BindCallbacks()
+	{	
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Crafting
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.CRAFTING_GENERATE, CBCraftingGenerate);
+		DiagMenu.BindCallback(DiagMenuIDs.CRAFTING_INSTANT, CBCraftingInstant);
+		DiagMenu.BindCallback(DiagMenuIDs.CRAFTING_DUMP, CBCraftingDump);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Vehicles
+		//---------------------------------------------------------------	
+		DiagMenu.BindCallback(DiagMenuIDs.VEHICLE_DEBUG_OUTPUT, CBVehicleDebugOutput);
+		DiagMenu.BindCallback(DiagMenuIDs.VEHICLE_DUMP_CRASH_DATA, CBDumpCrashData);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Cheats
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_MODIFIERS, CBCheatsModifiers);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_KILL_PLAYER, CBCheatsKillPlayer);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_INVINCIBILITY, CBCheatsInvincibility);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_DISABLE_STAMINA, CBCheatsStaminaDisable);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_RESET_PLAYER, CBCheatsResetPlayer);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_RESET_PLAYER_MAX, CBCheatsResetPlayerMax);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_INVENTORY_ACCESS, CBCheatsInventoryAccess);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_FIX_ITEMS, CBCheatsFixItems);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_CREATE_HIT, CBCreateHit);
+		DiagMenu.BindCallback(DiagMenuIDs.CHEATS_CREATE_HIT_LIGHT, CBCreateHitLight);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Player Agents
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.PLAYER_AGENTS_INJECTS_SHOW, CBPlayerAgentsInjectActions);
+
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Soft Skills
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.SOFT_SKILLS_SHOW_DEBUG, CBSoftSkillsShowDebug);
+		DiagMenu.BindCallback(DiagMenuIDs.SOFT_SKILLS_TOGGLE_STATE, CBSoftSkillsToggleState);
+		DiagMenu.BindCallback(DiagMenuIDs.SOFT_SKILLS_TOGGLE_MODEL, CBSoftSkillsToggleModel);
+		DiagMenu.BindCallback(DiagMenuIDs.SOFT_SKILLS_SPECIALTY_VALUE, CBSoftSkillsSpecialtyValue);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Lifespan
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.LIFESPAN_BLOODY_HANDS, CBLifespanBloodyHands);
+		DiagMenu.BindCallback(DiagMenuIDs.LIFESPAN_PLAYTIME_UPDATE, CBLifespanPlaytimeUpdate);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Misc
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_DISABLE_PERSONAL_LIGHT, CBMiscPersonalLight);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_ITEM_DEBUG_ACTIONS, CBMiscItemDebugActions); // Is enabled by default now
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_LOG_PLAYER_STATS, CBMiscLogPlayerStats);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_FORCE_HINT_INDEX, CBMiscForceHintIndex);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Misc -> Environment
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_ENVIRONMENT_DEBUG, CBMiscEnvironmentDebug);	
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_ENVIRONMENT_LOGGING_DRYWET, CBMiscEnvironmentLoggingDryWet);	
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Misc
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_PERMANENT_CROSSHAIR, CBMiscPermanentCrossHair);		
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_TOGGLE_HUD, CBMiscToggleHud);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_FALLDAMAGE_DEBUG, CBMiscFallDamageDebug);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_DISPLAY_PLAYER_INFO, CBMiscDisplayPlayerInfo);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_UNIVERSAL_TEMPERATURE_SOURCES, CBMiscUniversalTemperatureSources);			
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_BULLET_IMPACT, CBMiscBulletImpact);			
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_GO_UNCONSCIOUS, CBMiscGoUnconscious);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_GO_UNCONSCIOUS_DELAYED, CBMiscGoUnconsciousDelayed);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_QUICK_RESTRAIN, CBMiscQuickRestrain);
+
+		//---------------------------------------------------------------
+		// LEVEL 3 - Script > Misc > Hair Hiding
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HAIR_LEVEL_HIDE, CBMiscHairHide);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HAIR_HIDE_ALL, CBMiscHairHideAll);
+				
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Misc
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_CAM_SHAKE, CBMiscCamShake);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_QUICK_FISHING, CBMiscQuickFishing);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_SHOCK_IMPACT, CBMiscShockImpact);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_SHOW_PLUG_ARROWS, CBMiscPlugArrows);			
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_TARGETABLE_BY_AI, CBMiscTargetableByAI);
+
+		//---------------------------------------------------------------
+		// LEVEL 3 - Script > Misc > Hit Indication
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_DEBUG, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_SPAWN_HIT, CBMiscHitIndicationSpawnHit);					
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_MODE, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_TYPE, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_DURATION, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_BREAKPOINT, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_DISTANCE, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_ROTATION, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_SCATTER, CBMiscHitIndication);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_HIT_INDICATION_DISABLE_PPE, CBMiscHitIndication);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Misc
+		//---------------------------------------------------------------	
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_FREEZE_ENTITY, CBMiscFreezeEntity);
+		DiagMenu.BindCallback(DiagMenuIDs.MISC_DEBUG_MONITOR, CBDebugMonitor);
+
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Simulate script
+		//---------------------------------------------------------------		
+		DiagMenu.BindCallback(DiagMenuIDs.SIMULATE_INFINITE_LOOP, CBSimulateInfiniteLoop);
+		DiagMenu.BindCallback(DiagMenuIDs.SIMULATE_NULL_POINTER, CBSimulateNullPointer);
+		DiagMenu.BindCallback(DiagMenuIDs.SIMULATE_DIVISION_BY_ZERO, CBSimulateDivisionByZero);
+		DiagMenu.BindCallback(DiagMenuIDs.SIMULATE_ERROR_FUNCTION, CBSimulateErrorFunction);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Weapon
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.WEAPON_PARTICLES, CBWeaponParticles);		
+		DiagMenu.BindCallback(DiagMenuIDs.WEAPON_AIM_NOISE, CBWeaponAimNoise);
+		DiagMenu.BindCallback(DiagMenuIDs.WEAPON_RECOIL, CBWeaponRecoil);
+		DiagMenu.BindCallback(DiagMenuIDs.WEAPON_UNLIMITED_AMMO, CBWeaponUnlimitedAmmo);
+		DiagMenu.BindCallback(DiagMenuIDs.WEAPON_BURST_VERSION, CBWeaponBurstVersion);
+
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Bleeding
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDING_SOURCES, CBBleedingSources);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDING_DISABLE_BLOOD_LOSS, CBBleedingDisableBloodLoss);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDING_ACTIVATE_SOURCE, CBBleedingActivateSource);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDING_ACTIVATE_ALL_SOURCES, CBBleedingActivateAllSources);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDING_ACTIVATE_SOURCE_LEVEL, CBBleedingActivateSourceLevel);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDING_RELOAD, CBBleedingReload);
+		
+		//---------------------------------------------------------------
+		// LEVEL 3 - Script > Bleeding > Bleeding Indication
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_USEVALUEOVERRIDES, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RANDOMROTATION, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_SEQUENCE_DURATION, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_BASEDURATION, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_MINDELAY, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_MAXDELAY, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_PROGRESSTHRESHOLD, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_STARTSIZE, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_ENDSIZE, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RNDSCALEMIN, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RNDSCALEMAX, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_SCATTER, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_SLIDEDISTANCE, CBBBleedingIndicators);
+
+		//---------------------------------------------------------------
+		// LEVEL 4 - Script > Bleeding > Bleeding Indication > Color Debug
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_ENABLEDESATURATION, CBBBleedingIndicators);		
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_DESATURATIONEND, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_R, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_G, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_B, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_A_START, CBBBleedingIndicators);
+		DiagMenu.BindCallback(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_A_END, CBBBleedingIndicators);
+		
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Logs
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_ACTIONS, CBLogsActions);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_WEAPONS, CBLogsWeapons);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_SYNC, CBLogsSync);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_BASEBUILDING, CBLogsBaseBuilding);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_SYMPTOMS, CBLogsSymptoms);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_BLEEDING_CHANCES, CBLogsBleedingChances);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_QUICKBAR, CBLogsQuickbar);
+
+		//---------------------------------------------------------------
+		// LEVEL 3 - Script > Logs > InventoryLogs
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_INVENTORY_MOVE, CBLogsInventoryMove);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_INVENTORY_RESERVATION, CBLogsInventoryReservation);
+		DiagMenu.BindCallback(DiagMenuIDs.LOGS_INVENTORY_HFSM, CBLogsInventoryHFSM);
+
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Triggers
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.TRIGGER_DEBUG, CBTriggerDebug);
+
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Base Building
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.BASEBUILDING_WOOD, CBBaseBuildingWood);
+		DiagMenu.BindCallback(DiagMenuIDs.BASEBUILDING_GATE, CBBaseBuildingGate);
+			
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Finishers
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.FINISHERS_FINISHER_FORCED, CBFinishersFinisherForced);
+			
+		//---------------------------------------------------------------
+		// LEVEL 2 - Script > Cinematic Camera Tools
+		//---------------------------------------------------------------
+		DiagMenu.BindCallback(DiagMenuIDs.CAMERATOOLS_ENABLE_REMOTE_CAMERA, CBCameraToolsEnableRemoteCamera);
+	}
+	
+	//---------------------------------------------
+	override void OnRPC(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(player, rpc_type, ctx);
+		
+		switch (rpc_type)
+		{
+			case ERPCs.DIAG_MISC_ENVIRONMENT_DEBUG_DATA:
+			{
+				if (!m_EnvDebugData)
+					m_EnvDebugData = new EnvDebugData();
+				
+				ctx.Read(m_EnvDebugData);
+				break;
+			}
+			
+			case ERPCs.DIAG_MISC_FALLDAMAGE_DEBUG_DATA:
+			{
+				if (!m_FallDamageDebugData)
+					m_FallDamageDebugData = new FallDamageDebugData();
+				
+				ctx.Read(m_FallDamageDebugData);
+				break;
+			}
+			
+			case ERPCs.DIAG_VEHICLES_DUMP_CRASH_DATA_CONTENTS:
+			{
+				Param1<array<ref CrashDebugData>> par = new Param1<array<ref CrashDebugData>>(null);
+				
+				if (ctx.Read(par))
+					CrashDebugData.DumpDataArray(par.param1);
+				break;
+			}	
+		}
+	}
+	
+	//---------------------------------------------
+	override void OnUpdate(float delta_time)
+	{		
+		super.OnUpdate(delta_time);
+		
+		//---------------------------------------------
+		// every system can handle their own actions locally(within the system itself),
+		// this section is for systems which don't have client side representation,
+		// or don't have their own tick, or for whatever other reason you prefer to put the logic here
+		// PUT ONLY METHOD CALLS HERE, NO CODE !!
+		// PUT ONLY METHOD CALLS HERE, NO CODE !!
+		//---------------------------------------------
+		
+		UpdateMiscVehicleGetOutBox();
+		UpdateEnvironmentDebug();
+		CheckTimeAccel();		
+	}
+	
+	//---------------------------------------------
+	void CheckTimeAccel()
+	{
+		if (!FeatureTimeAccel.m_CurrentTimeAccel)
+		{
+			InitTimeAccel();
+		}
+		
+		if (GetGame() && GetGame().GetPlayer()) 
+		{
+			TimeAccelParam param = GetTimeAccelMenuState();
+
+			if (!FeatureTimeAccel.AreTimeAccelParamsSame(param, FeatureTimeAccel.m_CurrentTimeAccel))
+			{
+				int timeAccelBig = param.param2;
+				float timeAccelSmall = param.param2 - timeAccelBig;
+				FeatureTimeAccel.CopyTimeAccelClipboard(param.param1, timeAccelBig, timeAccelSmall, param.param3 );
+				FeatureTimeAccel.SendTimeAccel(GetGame().GetPlayer(), param);
+				FeatureTimeAccel.m_CurrentTimeAccel = param;
+			}		
+		}
+	
+	}
+	
+	//---------------------------------------------
+	static void CBCraftingGenerate(bool enabled, int id)
+	{
+		PluginRecipesManager pluginRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+		DiagButtonAction(enabled, id, ScriptCaller.Create(pluginRecipesManager.CallbackGenerateCache));
+	}
+	
+	//---------------------------------------------
+	static void CBCraftingInstant(bool enabled)
+	{
+		PluginRecipesManager pluginRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+		DiagToggleRPC(enabled, pluginRecipesManager.IsEnableDebugCrafting(), ERPCs.DIAG_CRAFTING_INSTANT);
+	}
+	
+	//---------------------------------------------
+	static void CBCraftingDump(bool enabled, int id)
+	{	
+		PluginRecipesManager pluginRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+		DiagButtonAction(enabled, id, ScriptCaller.Create(pluginRecipesManager.GenerateHumanReadableRecipeList));
+	}
+	
+	//---------------------------------------------
+	static void CBCheatsModifiers(bool enabled)
+	{
+		PluginDiagMenuClient pluginDiag = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+		DiagToggleRPCServer(enabled, pluginDiag.m_ModifiersEnabled, ERPCs.DIAG_CHEATS_MODIFIERS);
+	}
+	
+	//---------------------------------------------
+	static void CBCheatsKillPlayer(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_CHEATS_KILL_PLAYER, true);
+	}
+	
+	//---------------------------------------------
+	static void CBCheatsInvincibility(int value)
+	{
+		PluginDiagMenuClient pluginDiag = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+		DiagToggleRPCServer(value, pluginDiag.m_IsInvincible, ERPCs.DIAG_CHEATS_INVINCIBILITY);	
+	}
+
+	//---------------------------------------------
+	static void CBCheatsStaminaDisable(bool enabled)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player)
+			player.SetStaminaDisabled(enabled);
+
+		PluginDiagMenuClient pluginDiag = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+		DiagToggleRPCServer(enabled, pluginDiag.m_StaminaDisabled, ERPCs.DIAG_CHEATS_DISABLE_STAMINA);
+	}
+
+	//---------------------------------------------
+	static void CBCheatsResetPlayer(bool enabled, int id)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player)
+			player.ResetPlayer(false);
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_CHEATS_RESET_PLAYER, true);
+	}
+
+	//---------------------------------------------
+	static void CBCheatsResetPlayerMax(bool enabled, int id)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player)
+			player.ResetPlayer(true);
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_CHEATS_RESET_PLAYER_MAX, true);
+	}
+	
+	//---------------------------------------------
+	static void CBCheatsInventoryAccess(bool enabled)
+	{
+		DiagToggleRPCServer(enabled, PlayerBase.DEBUG_INVENTORY_ACCESS, ERPCs.DIAG_CHEATS_INVENTORY_ACCESS);
+	}	
+		
+	//---------------------------------------------
+	static void CBCheatsFixItems(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_CHEATS_ITEMS_FIX, true);
+	}
+	
+	static void CBCreateHit(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_CHEATS_CREATE_HIT, true);
+	}
+	
+	static void CBCreateHitLight(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_CHEATS_CREATE_HIT_LIGHT, true);
+	}
+	
+	//---------------------------------------------
+	static void CBPlayerAgentsInjectActions(bool enabled)
+	{
+		DiagDebugAction(DebugActionType.PLAYER_AGENTS, enabled);
+	}
+	
+	//---------------------------------------------
+	static void CBSoftSkillsShowDebug(bool enabled)
+	{
+		SoftSkillsManager ssMngr = GetPlayer().GetSoftSkillsManager();		
+		DiagToggleRPCAction(enabled, ScriptCaller.Create(ssMngr.CreateDebugWindow), ssMngr.IsDebug(), ERPCs.DIAG_SOFT_SKILLS_SHOW_DEBUG);
+	}
+	
+	//---------------------------------------------
+	static void CBSoftSkillsToggleState(bool enabled)
+	{	
+		SoftSkillsManager ssMngr = GetPlayer().GetSoftSkillsManager();		
+		DiagToggleRPC(enabled, ssMngr.GetSoftSkillsState(), ERPCs.DIAG_SOFT_SKILLS_TOGGLE_STATE);
+	}
+	
+	//---------------------------------------------
+	static void CBSoftSkillsToggleModel(bool enabled)
+	{
+		SoftSkillsManager ssMngr = GetPlayer().GetSoftSkillsManager();
+		DiagToggleRPC(enabled, ssMngr.IsLinear(), ERPCs.DIAG_SOFT_SKILLS_TOGGLE_MODEL);
+	}
+
+	//---------------------------------------------
+	static void CBSoftSkillsSpecialtyValue(float value)
+	{
+		SoftSkillsManager ssMngr = GetPlayer().GetSoftSkillsManager();
+		DiagToggleRPC(value, ssMngr.GetSpecialtyLevel(), ERPCs.DIAG_SOFT_SKILLS_SPECIALTY_VALUE);	
+	}
+
+	//---------------------------------------------
+	static void CBLifespanBloodyHands(bool enabled)
+	{		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player)
+			DiagToggleRPCServer(enabled, player.HasBloodyHands(), ERPCs.DIAG_LIFESPAN_BLOODY_HANDS);
+	}
+
+	//---------------------------------------------
+	static void CBLifespanPlaytimeUpdate(float value)
+	{
+		PluginDiagMenuClient pluginDiag = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+		DiagToggleRPCServer(value * 60, pluginDiag.m_Playtime, ERPCs.DIAG_LIFESPAN_PLAYTIME_UPDATE);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscPersonalLight(bool enabled)
+	{
+		PlayerBaseClient.m_PersonalLightDisabledByDebug = enabled;
+		PlayerBaseClient.UpdatePersonalLight();
+	}
+	
+	//---------------------------------------------
+	static void CBMiscItemDebugActions(bool enabled)
+	{
+		DiagDebugAction(DebugActionType.GENERIC_ACTIONS, enabled);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscLogPlayerStats(bool enabled)
+	{
+		PluginDiagMenuClient pluginDiag = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+		DiagToggleRPC(enabled, pluginDiag.m_LogPlayerStats, ERPCs.DIAG_MISC_LOG_PLAYER_STATS);
+ 	}
+	
+	//---------------------------------------------
+	static void CBMiscForceHintIndex(int index)
+	{
+		UiHintPanel.m_ForcedIndex = index;
+ 	}
+	
+	//---------------------------------------------	
+	static void CBMiscPermanentCrossHair(bool enabled)
+	{
+		PluginPermanentCrossHair crosshair = PluginPermanentCrossHair.Cast(GetPlugin(PluginPermanentCrossHair));
+		crosshair.SwitchPermanentCrossHair(enabled);
+	}
+	
+	//---------------------------------------------		
+	void UpdateMiscVehicleGetOutBox()
+	{
+		if ( DiagMenu.GetBool(DiagMenuIDs.MISC_VEHICLE_GETOUT_BOX) )
+		{
+			if (m_VehicleFreeAreaBox)
+			{
+				m_VehicleFreeAreaBox.Destroy();
+				m_VehicleFreeAreaBox = null;
+			}
+			
+			HumanCommandVehicle hcv = GetGame().GetPlayer().GetCommand_Vehicle();
+			if (!hcv)
+				return;
+			
+			m_VehicleFreeAreaBox = hcv.GetTransport().DebugFreeAreaAtDoor( hcv.GetVehicleSeat() );
+		}
+		else if (m_VehicleFreeAreaBox)
+		{
+			m_VehicleFreeAreaBox.Destroy();
+			m_VehicleFreeAreaBox = null;
+		}
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscToggleHud(bool enabled)
+	{
+		Mission mission = GetGame().GetMission();
+		mission.GetHud().Show(!enabled);
+		if (enabled)
+		{
+			mission.HideCrosshairVisibility();
+		}
+		else
+		{
+			mission.RefreshCrosshairVisibility();
+		}
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscEnvironmentDebug(bool enabled)
+	{
+		SendDiagRPC(enabled, ERPCs.DIAG_MISC_ENVIRONMENT_DEBUG);
+	}
+	
+	void UpdateEnvironmentDebug()
+	{
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_ENVIRONMENT_DEBUG) && m_EnvDebugData)
+			Environment.DisplayEnvDebugPlayerInfo(true, m_EnvDebugData);
+		else if (m_EnvDebugData)
+			m_EnvDebugData = null;
+	}
+
+	static void CBMiscEnvironmentLoggingDryWet(bool enabled)
+	{
+		SendDiagRPC(enabled, ERPCs.DIAG_MISC_ENVIRONMENT_LOGGING_DRYWET);
+	}
+	
+	static void CBMiscFallDamageDebug(bool enabled)
+	{
+		SendDiagRPC(enabled, ERPCs.DIAG_MISC_FALLDAMAGE_DEBUG);
+	}
+	
+	void UpdateFallDamageDebug()
+	{
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_FALLDAMAGE_DEBUG) && m_FallDamageDebugData)
+			DayZPlayerImplementFallDamage.DisplayFallDamageDebugInfo(true, m_FallDamageDebugData);
+		else if (m_FallDamageDebugData)
+			m_FallDamageDebugData = null;
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscDisplayPlayerInfo(int value)
+	{
+		PluginRemotePlayerDebugClient prpdc = PluginRemotePlayerDebugClient.Cast(GetPlugin(PluginRemotePlayerDebugClient));
+		prpdc.RequestPlayerInfo(PlayerBase.Cast(GetGame().GetPlayer()), value);
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscUniversalTemperatureSources(bool enabled)
+	{
+		PluginUniversalTemperatureSourceClient client = PluginUniversalTemperatureSourceClient.Cast(GetPlugin(PluginUniversalTemperatureSourceClient));
+		client.RequestUniversalTemperatureSources(PlayerBase.Cast(GetGame().GetPlayer()), enabled);
+	}
+
+	//---------------------------------------------	
+	static void CBMiscBulletImpact(bool enabled, int id)
+	{
+		PlayerBase player = GetPlayer();	
+		CachedObjectsParams.PARAM2_FLOAT_FLOAT.param1 = 32;
+		CachedObjectsParams.PARAM2_FLOAT_FLOAT.param2 = 0.3;
+		DiagButtonActionParams(enabled, id, ScriptCaller.Create(player.SpawnDamageDealtEffect2), CachedObjectsParams.PARAM2_FLOAT_FLOAT);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscGoUnconscious(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_MISC_GO_UNCONSCIOUS, true);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscGoUnconsciousDelayed(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_MISC_GO_UNCONSCIOUS_DELAYED, true);
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscQuickRestrain(bool enabled)
+	{	
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		DiagToggleRPC(enabled, player.IsQuickRestrain(), ERPCs.DIAG_MISC_QUICK_RESTRAIN);
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscHairHide(bool enabled, int id)
+	{
+		int value = DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HAIR_LEVEL);
+		DiagButtonRPCIntInt(enabled, id, value, enabled, ERPCs.DIAG_MISC_HAIR_LEVEL_HIDE, true);
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscHairHideAll(bool enabled)
+	{
+		CachedObjectsParams.PARAM2_INT_INT.param1 = -1;
+		CachedObjectsParams.PARAM2_INT_INT.param2 = enabled;
+		
+		SendDiagRPC(CachedObjectsParams.PARAM2_INT_INT, ERPCs.DIAG_MISC_HAIR_LEVEL_HIDE, true);
+	}
+	
+	//---------------------------------------------		
+	static void CBMiscCamShake(bool enabled, int id)
+	{
+		DayZPlayerCamera cam = GetGame().GetPlayer().GetCurrentCamera();
+		DiagButtonAction(enabled, id, ScriptCaller.Create(cam.SpawnDiagCameraShake));
+	}
+	
+	//---------------------------------------------	
+	static void CBMiscQuickFishing(bool enabled)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		DiagToggleRPC(enabled, player.IsQuickFishing(), ERPCs.DIAG_MISC_QUICK_FISHING);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscShockImpact(bool enabled, int id)
+	{
+		DiagButtonAction(enabled, id, ScriptCaller.Create(ShockImpact));
+	}
+	
+	static void ShockImpact()
+	{
+		static float intensity;
+		intensity += 0.25;
+		intensity = Math.WrapFloat(intensity, 0.25, 1);
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		player.SpawnShockEffect(intensity);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscPlugArrows(bool enabled)
+	{
+		GetGame().EnableEMPlugs(enabled);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscTargetableByAI(bool enabled, int id)
+	{
+		PlayerBase player = GetPlayer();
+		if (player)
+			DiagToggleRPC(enabled, player.m_CanBeTargetedDebug, ERPCs.DIAG_MISC_TARGETABLE_BY_AI);
+	}
+	
+	//---------------------------------------------
+	static void CBMiscHitIndication()
+	{
+		PlayerBase player = GetPlayer();
+		
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_HIT_INDICATION_DEBUG))
+		{
+			HitDirectionEffectBase.m_Mode = DiagMenu.GetValue(DiagMenuIDs.MISC_HIT_INDICATION_MODE);
+			HitDirectionEffectBase.m_ID = DiagMenu.GetValue(DiagMenuIDs.MISC_HIT_INDICATION_TYPE);
+			HitDirectionEffectBase.m_DurationMax = DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HIT_INDICATION_DURATION);
+			HitDirectionEffectBase.m_BreakPointBase = DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HIT_INDICATION_BREAKPOINT);
+			HitDirectionEffectBase.m_DistanceAdjust = DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HIT_INDICATION_DISTANCE);
+			HitDirectionEffectBase.m_RotationOverride = DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HIT_INDICATION_ROTATION);
+			HitDirectionEffectBase.m_Scatter = DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HIT_INDICATION_SCATTER);		
+			
+			if (player)
+			{
+				player.SetHitPPEEnabled(!DiagMenu.GetBool(DiagMenuIDs.MISC_HIT_INDICATION_DISABLE_PPE));
+			}
+		}
+		else
+		{
+			HitDirectionEffectBase.CheckValues();
+			if (player)
+			{
+				player.SetHitPPEEnabled(CfgGameplayHandler.GetHitIndicationPPEEnabled());
+			}
+		}
+	}
+	
+	//---------------------------------------------
+	static void CBMiscHitIndicationSpawnHit(bool enabled, int id)
+	{		
+		DiagButtonAction(enabled, id, ScriptCaller.Create(SpawnHitDirEffect));
+	}
+	
+	static void SpawnHitDirEffect()
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		GetGame().GetMission().GetHud().SpawnHitDirEffect(player, DiagMenu.GetRangeValue(DiagMenuIDs.MISC_HIT_INDICATION_SPAWN_HIT_DIRECTION), 1.0);
+	}
+	
+	//---------------------------------------------
+	static void CBDebugMonitor(bool enabled, int id)
+	{
+		SendDiagRPC(enabled, ERPCs.DIAG_MISC_DEBUG_MONITOR, true);
+		
+		if (enabled)
+			GetGame().GetMission().CreateDebugMonitor();
+		else
+			GetGame().GetMission().HideDebugMonitor();
+	}
+	
+	//---------------------------------------------
+	static void CBMiscFreezeEntity(bool enabled, int id)
+	{
+		DiagButtonAction(enabled, id, ScriptCaller.Create(FreezeEntity));
+	}
+	
+	static void FreezeEntity()
+	{
+		EntityAI entity;
+		if (PluginSceneManager.GetInstance() && PluginSceneManager.GetInstance().IsOpened())
+		{
+			// Scene Editor
+			SceneObject scene_obj = PluginSceneManager.GetInstance().GetSelectedSceneObject();
+
+			if (scene_obj)
+			{
+				entity = scene_obj.GetObject();
+			}
+		}
+		else
+		{
+			// FreeDebugCamera
+			FreeDebugCamera camera = FreeDebugCamera.GetInstance();
+			entity = EntityAI.Cast(camera.GetCrosshairObject());
+		}
+		
+		if (entity)
+			entity.DisableSimulation(!entity.GetIsSimulationDisabled());
+	}
+	
+	//---------------------------------------------
+	static void CBVehicleDebugOutput(int value)
+	{
+		
+		int bitValue = 0;
+		if (value == 1)//"Basic"
+		{
+			bitValue = EVehicleDebugOutputType.DAMAGE_APPLIED;
+		}
+		if (value == 2)//"Extended"
+		{
+			bitValue = EVehicleDebugOutputType.DAMAGE_APPLIED | EVehicleDebugOutputType.DAMAGE_CONSIDERED;
+		}
+		else if (value == 3)//"Contact"
+		{
+			bitValue = EVehicleDebugOutputType.CONTACT;
+		}
+		else if (value == 4)//"Basic" + "Contact"
+		{
+			bitValue = EVehicleDebugOutputType.DAMAGE_APPLIED | EVehicleDebugOutputType.CONTACT;
+		}
+		SendDiagRPC(bitValue, ERPCs.DIAG_VEHICLE_DEBUG_OUTPUT, true);
+	}
+	
+	//---------------------------------------------
+	static void CBDumpCrashData(bool value)
+	{
+		if (value)
+		{
+			SendDiagRPC(true, ERPCs.DIAG_VEHICLES_DUMP_CRASH_DATA_REQUEST, true);
+			DiagMenu.SetValue(DiagMenuIDs.VEHICLE_DUMP_CRASH_DATA, 0);
+		}
+		//DiagButtonRPC(value, DiagMenuIDs.VEHICLE_DUMP_CRASH_DATA, ERPCs.DIAG_VEHICLES_DUMP_CRASH_DATA_REQUEST, true);	
+		
+	}
+	
+	//---------------------------------------------
+	static void SimulateMode(bool enabled, int id, int rpc)
+	{
+		int value = DiagMenu.GetRangeValue(DiagMenuIDs.SIMULATE_MODE);
+		
+		switch (value)
+		{
+			case 0:
+			{
+				DiagButtonRPC(enabled, id, rpc, true);
+				break;
+			}
+			case 1:
+			{
+				DiagButtonRPCSelf(enabled, id, rpc);
+				break;
+			}
+			case 2:
+			{
+				DiagButtonRPC(enabled, id, rpc, true);
+				DiagButtonRPCSelf(enabled, id, rpc);
+				break;
+			}
+		}
+	}
+	
+	//---------------------------------------------
+	static void CBSimulateInfiniteLoop(bool enabled, int id)
+	{
+		SimulateMode(enabled, id, ERPCs.DIAG_SIMULATE_INFINITE_LOOP);
+	}
+	
+	//---------------------------------------------
+	static void CBSimulateNullPointer(bool enabled, int id)
+	{
+		SimulateMode(enabled, id, ERPCs.DIAG_SIMULATE_NULL_POINTER);
+	}
+	
+	//---------------------------------------------
+	static void CBSimulateDivisionByZero(bool enabled, int id)
+	{
+		SimulateMode(enabled, id, ERPCs.DIAG_SIMULATE_DIVISION_BY_ZERO);
+	}
+	
+	//---------------------------------------------
+	static void CBSimulateErrorFunction(bool enabled, int id)
+	{
+		SimulateMode(enabled, id, ERPCs.DIAG_SIMULATE_ERROR_FUNCTION);
+	}
+	
+	//---------------------------------------------
+	static void CBWeaponParticles(bool enabled)
+	{
+		DiagToggleRPCServer(enabled, PrtTest.m_GunParticlesState, ERPCs.DIAG_WEAPON_PARTICLES);
+	}
+
+	//---------------------------------------------	
+	static void CBWeaponDebug(bool enabled)
+	{
+		PlayerBase player = GetPlayer();
+		DiagToggleAction(enabled, ScriptCaller.Create(player.ShowWeaponDebug), player.IsWeaponDebugEnabled());
+	}
+	
+	//---------------------------------------------	
+	static void CBWeaponAimNoise(bool enabled)
+	{
+		PlayerBase player = GetPlayer();
+		if (player)
+		{
+			DayZPlayerImplementAiming aimModel = player.GetAimingModel();
+			DiagToggleAction(enabled, ScriptCaller.Create(aimModel.SetAimNoiseAllowed), aimModel.IsAimNoiseAllowed());
+		}
+	}
+	
+	//---------------------------------------------	
+	static void CBWeaponRecoil(bool enabled)
+	{
+		PlayerBase player = GetPlayer();
+		if (player)
+		{
+			DayZPlayerImplementAiming aimModel = player.GetAimingModel();
+			DiagToggleRPC(enabled, aimModel.IsProceduralRecoilEnabled(), ERPCs.DIAG_WEAPON_RECOIL);
+		}
+	}
+	
+	//---------------------------------------------
+	static void CBWeaponUnlimitedAmmo(bool enabled)
+	{
+		DiagDebugAction(DebugActionType.UNLIMITED_AMMO, enabled);
+	}
+	
+	//---------------------------------------------
+	static void CBWeaponBurstVersion(int value)
+	{
+		PlayerBase player = GetPlayer();
+		WeaponManager wpnMngr = player.GetWeaponManager();
+		DiagToggleRPC(value, wpnMngr.GetBurstOption(), ERPCs.DIAG_WEAPON_BURST_VERSION);
+	}
+	
+	//---------------------------------------------
+	static void CBBleedingSources(bool enabled)
+	{
+		PlayerBase player = GetPlayer();
+		player.GetBleedingManagerRemote().SetDiag(enabled);
+	}
+	
+	//---------------------------------------------
+	static void CBBleedingDisableBloodLoss(bool enabled)
+	{		
+		SendDiagRPC(enabled, ERPCs.DIAG_BLEEDING_DISABLE_BLOOD_LOSS, true);
+	}
+	
+	//---------------------------------------------
+	static void CBBleedingActivateSource(int value)
+	{
+		SendDiagRPC(value, ERPCs.DIAG_BLEEDING_ACTIVATE_SOURCE, true);	
+	}
+	
+	//---------------------------------------------
+	static void CBBleedingActivateAllSources(bool enabled, int id)
+	{
+		DiagButtonRPC(enabled, id, ERPCs.DIAG_BLEEDING_ACTIVATE_ALL_SOURCES, true);
+	}
+	
+	//---------------------------------------------
+	static void CBBleedingActivateSourceLevel(int value)
+	{
+		PlayerBase player = GetPlayer();
+		BleedingSourcesManagerBase mgr = player.GetBleedingManagerRemote();
+			
+		int idx = 100; //invalid index, just deletes all
+		if (value != 0)
+		{
+			string bone = ""; //lower-case!
+			switch (value)
+			{
+				case 1: //PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW
+					bone = "lefttoebase";
+					break;
+					
+				case 2: //PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM
+					bone = "leftarm";
+					break;
+					
+				case 3: //PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH
+					bone = "neck";
+					break;
+			}
+			
+			int count = mgr.m_BleedingSourceZone.Count();
+				
+			for (int i = 0; i < count; ++i)
+			{
+				if (mgr.m_BleedingSourceZone.GetKey(i) == bone)
+				{
+					idx = i;
+					break;
+				}
+			}
+		}
+		
+		CBBleedingActivateSource(idx);
+	}
+	
+	//---------------------------------------------
+	static void CBBleedingReload(bool enabled, int id)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		BleedingSourcesManagerRemote bsMngrRem = player.GetBleedingManagerRemote();
+		DiagButtonAction(enabled, id, ScriptCaller.Create(bsMngrRem.Reload));
+	}
+	
+	//---------------------------------------------
+	static void CBBBleedingIndicators()
+	{
+		bool diagEnable = DiagMenu.GetBool(DiagMenuIDs.BLEEDINGINDICATORS);
+		if (diagEnable != DbgBleedingIndicationStaticInfo.m_DbgEnableBleedingIndication)
+		{
+			DbgBleedingIndicationStaticInfo.m_DbgEnableBleedingIndication = diagEnable;
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			if (player && player.GetBleedingManagerRemote())
+			{
+				player.GetBleedingManagerRemote().Reload();
+			}
+		}
+		
+		DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues = DiagMenu.GetBool(DiagMenuIDs.BLEEDINGINDICATORS_USEVALUEOVERRIDES);
+		
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+		{
+			DbgBleedingIndicationStaticInfo.m_DbgSequenceDuration = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_SEQUENCE_DURATION);
+			DbgBleedingIndicationStaticInfo.m_DbgDropRotationRandom = DiagMenu.GetBool(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RANDOMROTATION);
+			DbgBleedingIndicationStaticInfo.m_DbgDropDurationBase = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_BASEDURATION);
+			DbgBleedingIndicationStaticInfo.m_DbgDropMinDelay = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_MINDELAY);
+			DbgBleedingIndicationStaticInfo.m_DbgDropMaxDelay = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_MAXDELAY);
+			DbgBleedingIndicationStaticInfo.m_DbgDropProgressTreshold = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_PROGRESSTHRESHOLD);
+			DbgBleedingIndicationStaticInfo.m_DbgDropStartSize = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_STARTSIZE);
+			DbgBleedingIndicationStaticInfo.m_DbgDropEndSize = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_ENDSIZE);
+			DbgBleedingIndicationStaticInfo.m_DbgDropSizeVariationMin = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RNDSCALEMIN);
+			DbgBleedingIndicationStaticInfo.m_DbgDropSizeVariationMax = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_RNDSCALEMAX);
+			DbgBleedingIndicationStaticInfo.m_DbgDropScatter = (int)DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_SCATTER);
+			DbgBleedingIndicationStaticInfo.m_DbgDropSlideDistance = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_SLIDEDISTANCE);
+			
+			DbgBleedingIndicationStaticInfo.m_DbgDropDesaturate = DiagMenu.GetBool(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_ENABLEDESATURATION);
+			DbgBleedingIndicationStaticInfo.m_DbgDesaturationEnd = DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_DESATURATIONEND);
+			DbgBleedingIndicationStaticInfo.m_DbgDropColorRed = (int)DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_R);
+			DbgBleedingIndicationStaticInfo.m_DbgDropColorGreen = (int)DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_G);
+			DbgBleedingIndicationStaticInfo.m_DbgDropColorBlue = (int)DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_B);
+			DbgBleedingIndicationStaticInfo.m_DbgDropColorAlphaStart = (int)DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_A_START);
+			DbgBleedingIndicationStaticInfo.m_DbgDropColorAlphaEnd = (int)DiagMenu.GetRangeValue(DiagMenuIDs.BLEEDINGINDICATORS_DROP_COLOR_A_END);
+		}
+	}
+	
+	//---------------------------------------------
+	static void CBLogsActions(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsActionLogEnable(), ERPCs.DIAG_LOGS_ACTIONS);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsWeapons(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsWeaponLogEnable(), ERPCs.DIAG_LOGS_WEAPONS);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsSync(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsSyncLogEnable(), ERPCs.DIAG_LOGS_SYNC);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsBaseBuilding(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsBaseBuildingLogEnable(), ERPCs.DIAG_LOGS_BASEBUILDING);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsSymptoms(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsSymptomLogEnable(), ERPCs.DIAG_LOGS_SYMPTOMS);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsInventoryMove(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsInventoryMoveLogEnable(), ERPCs.DIAG_LOGS_INVENTORY_MOVE);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsInventoryReservation(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsInventoryReservationLogEnable(), ERPCs.DIAG_LOGS_INVENTORY_RESERVATION);
+	}
+	
+	//---------------------------------------------
+	static void CBLogsInventoryHFSM(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsInventoryHFSMLogEnable(), ERPCs.DIAG_LOGS_INVENTORY_HFSM);
+	}
+
+	//---------------------------------------------
+	static void CBLogsQuickbar(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsQuickbarLogEnable(), ERPCs.DIAG_LOGS_QUICKBAR);
+	}	
+	
+	//---------------------------------------------
+	static void CBLogsBleedingChances(bool enabled)
+	{
+		DiagToggleRPC(enabled, LogManager.IsBleedingChancesLogEnable(), ERPCs.DIAG_LOGS_BLEEDING_CHANCES);
+	}
+	
+	//---------------------------------------------
+	static void CBTriggerDebug(bool enabled)
+	{
+		EnableDebugSystemClient(ESubscriberSystems.TRIGGERS, enabled);
+	}
+	
+	//---------------------------------------------
+	static void CBBaseBuildingWood(bool enabled)
+	{
+		SendDiagRPC(enabled, ERPCs.DIAG_BASEBUILDING_WOOD, true);
+	}
+	
+	//---------------------------------------------
+	static void CBBaseBuildingGate(bool enabled)
+	{
+		SendDiagRPC(enabled, ERPCs.DIAG_BASEBUILDING_GATE, true);
+	}
+	
+	//---------------------------------------------
+	static void CBFinishersFinisherForced(int value)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		DiagToggleRPC(value - 1, player.GetMeleeCombat().DebugGetForcedFinisherType(), ERPCs.DIAG_FINISHERS_FORCE_FINISHER);
+	}
+	
+	//---------------------------------------------		
+	static void CBCameraToolsEnableRemoteCamera(bool enabled)
+	{
+		PlayerBase player = GetPlayer();
+		
+		if (!player)
+			return;
+		
+		if (!enabled && player.m_CameraToolsMenuClient)
+		{
+			player.m_CameraToolsMenuClient.DelayedDestroy();
+		}
+		
+		auto param = new Param2<bool, EntityAI>(enabled, GetGame().GetPlayer());
+		GetGame().RPCSingleParam( null, ERPCs.DIAG_CAMERATOOLS_CAM_SUBSCRIBE, param, true );
+	}
+	
+	//---------------------------------------------
+	// Misc		
+	//---------------------------------------------
+	static PlayerBase GetPlayer()
+	{
+		if (!GetGame())
+			return null;
+
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+
+		if (DiagMenu.GetBool(DiagMenuIDs.MISC_ACTION_ON_CURSOR))
+		{
+			float hitFraction;
+			vector start = GetGame().GetCurrentCameraPosition();
+			vector end = start + (GetGame().GetCurrentCameraDirection() * 5.0);	
+
+			vector hitPos, hitNormal;
+			Object hitObj;
+			
+			PhxInteractionLayers hitMask = 0xFFFFFFFFFF;
+
+			DayZPhysics.RayCastBullet(start, end, hitMask, null, hitObj, hitPos, hitNormal, hitFraction);
+			Class.CastTo(player, hitObj);
+		}
+		
+		return player;
+	}
+	
+	//---------------------------------------------
+	// DebugAction		
+	//---------------------------------------------
+	static void DiagDebugAction(DebugActionType type, bool enable)
+	{
+		int mask;
+		if (enable)
+		{
+			mask = (ItemBase.GetDebugActionsMask() | type);
+		}
+		else
+		{
+			mask = (ItemBase.GetDebugActionsMask() & (~type));
+		}
+		
+		DiagToggleRPCAction(mask, ScriptCaller.Create(ItemBase.SetDebugActionsMask), ItemBase.HasDebugActionsMask(type), ERPCs.DIAG_ITEM_DEBUG_ACTIONS);
+	}
+	
+	//---------------------------------------------
+	// SubscriberClient
+	//---------------------------------------------
+	static void EnableDebugSystemClient(ESubscriberSystems system, bool enable)
+	{
+		int mask;
+		if (enable)
+		{
+			mask = (m_SystemsMask | system);//turn on bit
+		}
+		else
+		{
+			mask = (m_SystemsMask & (~system));//turn off bit
+		}
+		
+		if (mask != m_SystemsMask)
+		{
+			CachedObjectsParams.PARAM1_INT.param1 = mask;
+			GetGame().RPCSingleParam( GetGame().GetPlayer(), ERPCs.DEV_DIAGMENU_SUBSCRIBE, CachedObjectsParams.PARAM1_INT, true, GetGame().GetPlayer().GetIdentity() );
+			m_SystemsMask = mask;
+		}
+	}
+	
+	
+	//---------------------------------------------
+	// Helper diag functions			
+	//---------------------------------------------
+	static void DiagButtonActionParams(bool enabled, int id, ScriptCaller action, Param params)
+	{
+		if ( enabled )
+		{
+			action.Invoke(params);				
+			DiagMenu.SetValue(id, false);
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagButtonAction(bool enabled, int id, ScriptCaller action)
+	{
+		DiagButtonActionParams(enabled, id, action, null);
+	}
+	
+	//---------------------------------------------
+	static void DiagButtonRPC(bool enabled, int id, int rpc, bool serverOnly = false)
+	{
+		ScriptCaller action = ScriptCaller.Create(SendDiagRPCBasic);
+		SendDiagRPCBasicParam params = new SendDiagRPCBasicParam(rpc, serverOnly);
+		
+		DiagButtonActionParams(enabled, id, action, params);
+	}
+	
+	//---------------------------------------------
+	static void DiagButtonRPCSelf(bool enabled, int id, int rpc)
+	{
+		ScriptCaller action = ScriptCaller.Create(SendDiagRPCSelfBasic);
+		SendDiagRPCSelfBasicParam params = new SendDiagRPCSelfBasicParam(rpc);
+		
+		DiagButtonActionParams(enabled, id, action, params);
+	}
+	
+	//---------------------------------------------
+	static void DiagButtonRPCIntInt(bool enabled, int id, int value, int value2, int rpc, bool serverOnly = false)
+	{
+		ScriptCaller action = ScriptCaller.Create(SendDiagRPCParam);
+		
+		CachedObjectsParams.PARAM2_INT_INT.param1 = value;
+		CachedObjectsParams.PARAM2_INT_INT.param2 = value2;
+		SendDiagRPCParamParam params = new SendDiagRPCParamParam(rpc, serverOnly, CachedObjectsParams.PARAM2_INT_INT);
+		
+		DiagButtonActionParams(enabled, id, action, params);
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPC(bool value, int current, int rpc)
+	{
+		if (value != current)
+		{
+			SendDiagRPC(value, rpc, false);
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPC(int value, int current, int rpc)
+	{
+		if (value != current)
+		{
+			SendDiagRPC(value, rpc, false);
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPC(float value, int current, int rpc)
+	{
+		if (value != current)
+		{
+			SendDiagRPC(value, rpc, false);
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPCServer(bool value, out bool current, int rpc)
+	{
+		if (value != current)
+		{
+			current = value;
+			SendDiagRPC(value, rpc, true);		
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPCServer(int value, out int current, int rpc)
+	{
+		if (value != current)
+		{
+			current = value;
+			SendDiagRPC(value, rpc, true);		
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPCServer(float value, out float current, int rpc)
+	{
+		if (value != current)
+		{
+			current = value;
+			SendDiagRPC(value, rpc, true);		
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleRPCAction(int value, ScriptCaller action, int current, int rpc)
+	{
+		if (value != current)
+		{
+			SendDiagRPC(value, rpc);
+			action.Invoke(value);
+		}
+	}
+	
+	//---------------------------------------------
+	static void DiagToggleAction(int value, ScriptCaller action, int current)
+	{
+		if (value != current)
+		{
+			action.Invoke(value);
+		}
+	}
+		
+	//---------------------------------------------
+	static void SendDiagRPCSelf(Param value, int rpc)
+	{
+		PlayerBase player = GetPlayer();
+		if (player) 
+		{
+			GetGame().RPCSelfSingleParam(player, rpc, value);
+		}
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPCSelfBasic(SendDiagRPCSelfBasicParam param)
+	{
+		SendDiagRPCSelf(null, param.param1);
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPCSelfParam(SendDiagRPCSelfParamParam param)
+	{
+		SendDiagRPCSelf(param.param2, param.param1);
+ 	}
+		
+	//---------------------------------------------
+	static void SendDiagRPC(Param value, int rpc, bool serverOnly = false)
+	{
+		PlayerBase player = GetPlayer();
+		if (player) 
+		{
+			PlayerIdentity playerIdentity = player.GetIdentity();
+			if (GetGame().IsMultiplayer() && playerIdentity)
+			{
+				GetGame().RPCSingleParam(player, rpc, value, true, playerIdentity);
+			}
+			
+			if (!GetGame().IsMultiplayer() || !serverOnly)
+			{
+				GetGame().RPCSelfSingleParam(player, rpc, value);
+			}
+		}
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPCBasic(SendDiagRPCBasicParam param)
+	{
+		SendDiagRPC(null, param.param1, param.param2);
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPCParam(SendDiagRPCParamParam param)
+	{
+		SendDiagRPC(param.param3, param.param1, param.param2);
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPC(int rpc, bool serverOnly = false)
+	{
+		SendDiagRPC(null, rpc, serverOnly);
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPC(bool value, int rpc, bool serverOnly = false)
+	{
+		CachedObjectsParams.PARAM1_BOOL.param1 = value;
+		SendDiagRPC(CachedObjectsParams.PARAM1_BOOL, rpc, serverOnly);
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPC(int value, int rpc, bool serverOnly = false)
+	{
+		CachedObjectsParams.PARAM1_INT.param1 = value;
+		SendDiagRPC(CachedObjectsParams.PARAM1_INT, rpc, serverOnly);
+ 	}
+	
+	//---------------------------------------------
+	static void SendDiagRPC(float value, int rpc, bool serverOnly = false)
+	{
+		CachedObjectsParams.PARAM1_FLOAT.param1 = value;
+		SendDiagRPC(CachedObjectsParams.PARAM1_FLOAT, rpc, serverOnly);
+ 	}
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuModding.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuModding.c
new file mode 100644
index 0000000000000000000000000000000000000000..57378e4beb36d0ed6420959059eefbe7c18cf080
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuModding.c
@@ -0,0 +1,170 @@
+/**
+ * \defgroup Modding Modding DiagMenu
+ *	\warning Only available on developer and diag builds
+ *	\note This file is extensive documentation about modding DiagMenu, please read EVERYTHING before starting
+ * @{
+ */
+
+#ifdef DOXYGEN
+#ifdef MODDING_TEST
+#ifdef DIAG_DEVELOPER
+
+/**
+\brief Example of adding DiagMenu entries by modders
+	\note PluginDiagMenu is the base of ..Client and ...Server, which is why we are registering the IDs on this level, so they exist on both Client and Server
+	\note Keep in mind that in SinglePlayer missions, both Client and Server PluginDiagMenu are created
+	\note Keep in mind that PluginDiagMenu... is destroyed and recreated every time the world changes
+*/
+#ifdef DOXYGEN
+class PluginDiagMenuModded // Just to not have it show up for the regular entry... Doxygen doesn't know about modding
+#else
+modded class PluginDiagMenu
+#endif
+{	
+	/**
+	\brief The name of the root menu where all debugs of this mod will be placed in
+		\note Try to think of a name which will make it easy to identify as originating from your mod
+		\note The 'maximum' length of the name of an entry is 24 characters (excess will be cut off when rendering)
+		\note The hardcap length of the name of an entry is 64 characters
+	*/
+	protected string m_ModdedDiagsExampleRootMenu = "BI - DiagsModdingExample";
+	
+	/**
+	\brief The name of an example sub menu
+	*/
+	protected string m_ModdedDiagsExampleSubMenu = "Example Sub Menu";
+	
+	/** \name Modded Diag IDs
+	*	To prevent mod conflicts, a system has been set up to create unique IDs for the modded Diags
+	*	These are then best saved to a variable so that they can be used by the other DiagMenu functions
+	*	!!! Remember to give them as unique as possible name, as something with a generic name could cause conflicts	
+	*/
+	//@{
+	protected int m_ModdedDiagsExampleRootMenuID;
+		protected int m_ModdedDiagsExampleBoolID;
+		protected int m_ModdedDiagsExampleSubMenuID;
+			protected int m_ModdedDiagsExampleRangeID;
+	//@}
+	
+	//---------------------------------------------
+	/**
+	\brief Obtain unique IDs and store them in variables
+		\warning Please only call GetModdedDiagID when necessary, as every time it is called it will increment and Script has a limit of 512 Diag IDs
+		\note Don't forget to call super!
+	*/
+	override protected void RegisterModdedDiagsIDs()
+	{
+		super.RegisterModdedDiagsIDs();
+		
+		m_ModdedDiagsExampleRootMenuID = GetModdedDiagID();
+			m_ModdedDiagsExampleBoolID = GetModdedDiagID();
+			m_ModdedDiagsExampleSubMenuID = GetModdedDiagID();
+				m_ModdedDiagsExampleRangeID = GetModdedDiagID();
+	}
+	
+	//---------------------------------------------
+	/**
+	\brief Register entries to the DiagMenu
+		\note Please create a root menu for your mod which is then the single parent of all your diags, which is then a child of ModdedRootMenu
+		\warning Read the in-file comments as well
+		\warning Don't forget to call super! Mandatory at the beginning of the function so it can register the modded root menu!
+	*/
+	override protected void RegisterModdedDiags()
+	{
+		super.RegisterModdedDiags();
+		
+		// Register the root menu of your mod under the ModdedRootMenu
+		// Then register all following menus and items under this menu
+		// This can not be enforced, but it will help keep things clean
+		// Including being able to easily identify where a debug is coming from
+		// So that reports of a broken debug can be sent to the correct developer
+		//
+		// If you have multiple mods, you might even want to consider to create a root menu with your developer name
+		// And then put the mod menus as a submenu
+		// To prevent someone running a lot of mods from having an overflooded menu		
+		// DiagMenu.MenuExists(...) could serve to help to identify if the root menu already exists when using this format
+		// So that the multiple mods can know if they still have to register your root menu or not
+		DiagMenu.RegisterMenu(m_ModdedDiagsExampleRootMenuID, m_ModdedDiagsExampleRootMenu, GetModdedRootMenu());
+		{
+			DiagMenu.RegisterBool(m_ModdedDiagsExampleBoolID, "", "Modded Example Bool", m_ModdedDiagsExampleRootMenuID);
+			
+			// A sub menu inside the root of the mod menu
+			// The curly braces are simply for readability
+			DiagMenu.RegisterMenu(m_ModdedDiagsExampleSubMenuID, m_ModdedDiagsExampleSubMenu, m_ModdedDiagsExampleRootMenuID);
+			{
+				DiagMenu.RegisterRange(m_ModdedDiagsExampleRangeID, "", "Modded Example Range", m_ModdedDiagsExampleSubMenuID, "3 9 6 3");
+			}
+		}
+	}
+}
+
+#ifdef DOXYGEN
+class DummyDoxygenClass
+{
+	int m_IgnoreThisVariable;
+}
+#endif
+
+/**
+\brief Example of adding DiagMenu functionality by modders
+	\note DiagMenu is mostly designed to run on Client, which is why the decision was made to keep most of the functionality for only the Client
+	\note This way the callbacks are only registered on Client and not on Server, to prevent mishaps
+*/
+#ifdef DOXYGEN
+class PluginDiagMenuClientModded // Just to not have it show up for the regular entry... Doxygen doesn't know about modding
+#else
+modded class PluginDiagMenuClient
+#endif
+{
+	/**
+	\brief Bind callbacks to the entries to immediately perform an action when the value is changed
+		\note Don't forget to call super!
+	*/
+	override protected void BindCallbacks()
+	{
+		super.BindCallbacks();
+
+		DiagMenu.BindCallback(m_ModdedDiagsExampleBoolID, CBModdedDiadIDsExampleBool);
+		DiagMenu.BindCallback(m_ModdedDiagsExampleRangeID, CBModdedDiadIDsExampleRange);
+	}
+	
+	/**
+	\brief Example callback for RegisterBool
+		\note Give it a unique name to prevent conflicts
+		\note These MUST be static and return void
+	@code
+		// Valid RegisterBool callback signatures (Technically 'bool' can be 'int' as well, so be mindful of that)
+		//	o static void Callback();
+		//	o static void Callback(bool value);
+		//	o static void Callback(bool value, int id);
+	@endcode
+	*/
+	static void CBModdedDiadIDsExampleBool(bool enabled)
+	{
+		Print("CBModdedDiadIDsExampleBool: " + enabled);
+	}
+	
+	/**
+	\brief Example callback for RegisterRange
+		\note Give it a unique name to prevent conflicts
+		\note These MUST be static and return void
+	@code
+		// Valid RegisterRange callback signatures (Technically 'int' can be 'bool' as well, so be mindful of that)
+		//	o static void Callback();
+		//	o static void Callback(float value);
+		//	o static void Callback(float value, int id);
+		//	o static void Callback(int value);
+		//	o static void Callback(int value, int id);
+	@endcode
+	*/
+	static void CBModdedDiadIDsExampleRange(float value)
+	{
+		Print("CBModdedDiadIDsExampleRange: " + value);
+	}
+}
+
+#endif
+#endif
+#endif
+
+//@}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuServer.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..bb6695fe2a3d396e64fd0034541ff5c252d74629
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginDiagMenu/PluginDiagMenuServer.c
@@ -0,0 +1,73 @@
+// For modding, see PluginDiagMenuModding.c
+// !!! MODDING DISCLAIMER: These are debug functionality files, if you are thinking about modding the vanilla ones, do so at your own risk
+//                         These files will not be maintained with the thought of "what if a modder modded this" (Excluding the modding functionality of course)
+//                         Which is why the modding functionality was developed with the thought of the modded ones having their own isolated safe space
+
+class PluginDiagMenuServer : PluginDiagMenu
+{
+#ifdef DIAG_DEVELOPER
+	static ref map<Man, int> m_Subscribers = new map<Man, int>;
+	
+	// A bit of a hack, because SP creates both Client and Server Plugins
+	override private void RegisterDiags()
+	{
+		if (GetGame().IsMultiplayer())
+		{
+			super.RegisterDiags();
+		}
+	}
+	
+	//---------------------------------------------
+	override void OnRPC(PlayerBase player, int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPC(player, rpc_type, ctx);
+		
+		switch (rpc_type)
+		{			
+			case ERPCs.DEV_DIAGMENU_SUBSCRIBE:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_INT))
+				{
+					int newMask = CachedObjectsParams.PARAM1_INT.param1;
+					int currentMask = m_Subscribers.Get(player);
+				
+					if (newMask != currentMask)
+					{
+						if (newMask == 0)
+						{
+							m_Subscribers.Remove(player);
+						}
+						else
+						{
+							m_Subscribers.Set(player, newMask);
+						}
+					}
+				}
+				break;
+			}
+		}
+	}
+	
+	//---------------------------------------------
+	static void SendDataToSubscribersServer(Object target, ESubscriberSystems system, int rpc_type, Param data, bool guaranteed = true)
+	{
+		for (int i = 0; i < m_Subscribers.Count(); ++i)
+		{
+			Man man = m_Subscribers.GetKey(i);
+			if (man)
+			{
+				int subscribedSystems = m_Subscribers.Get(man);
+				if (system & subscribedSystems)
+				{
+					GetGame().RPCSingleParam( target, rpc_type, data, guaranteed, man.GetIdentity() );
+				}
+			}
+			else
+			{
+				m_Subscribers.RemoveElement(i);
+				i--;
+			}
+		}
+	}
+#endif
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..b74219821900694769d56c0d49141afc031a39c6
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler.c
@@ -0,0 +1,154 @@
+class PluginFileHandler extends PluginBase
+{
+	static bool FileDuplicate(string source_name, string dest_name)
+	{
+		return CopyFile(source_name, dest_name);
+	}
+
+	static bool FileDelete(string file)
+	{
+		return DeleteFile(file);
+	}
+
+	static void FileRename(string source_name, string dest_name)
+	{
+		FileDuplicate(source_name, dest_name);
+		FileDelete(source_name);
+	}	
+	
+	bool	m_ReadOnly;
+	int		m_LineLimit;
+	
+	ref TStringArray	m_FileContent;
+	
+	void PluginFileHandler()
+	{
+		m_FileContent = new TStringArray;
+		m_LineLimit = -1;
+		
+		LoadFile();
+	}
+
+	void ~PluginFileHandler()
+	{
+		ClearFileNoSave();
+	}
+	
+	override void OnInit()
+	{
+		super.OnInit();
+	}
+	
+	string GetFileName()
+	{
+		return string.Empty;
+	}
+	
+	string GetSubFolderName()
+	{
+		return string.Empty;
+	}
+	
+	void ClearFileNoSave()
+	{
+		m_FileContent.Clear();	
+	}
+
+	bool LoadFile()
+	{
+		ClearFileNoSave();
+
+		FileHandle file_index = OpenFile(GetFileName(), FileMode.READ);
+		
+		if ( file_index == 0 )
+		{
+			return false;
+		}
+		
+		string line_content = "";
+		int char_count = FGets( file_index,  line_content );
+		while ( char_count != -1 )
+		{
+			m_FileContent.Insert(line_content);
+			
+			char_count = FGets( file_index,  line_content );
+		}
+		
+		CloseFile(file_index);
+		
+		return true;
+	}
+
+	bool SaveFile()
+	{
+		if ( m_ReadOnly )
+		{
+			return false;
+		}
+		
+		if (GetSubFolderName() && !FileExist(GetSubFolderName()))
+		{
+			MakeDirectory(GetSubFolderName());
+		}
+		
+		//Log("SaveFile -> Opening File: "+GetFileName());
+		
+		FileHandle file_index = OpenFile(GetFileName(), FileMode.WRITE);
+		
+		if ( file_index == 0 )
+		{
+			return false;
+		}
+		
+		for ( int i = 0; i < m_FileContent.Count(); ++i)
+		{
+			//Log("SaveFile -> Writing: "+m_FileContent.Get(i));
+			FPrintln(file_index, m_FileContent.Get(i));
+		}
+		
+		CloseFile(file_index);
+		
+		return true;
+	}
+
+	bool IsReadOnly()
+	{
+		return m_ReadOnly;
+	}
+
+	void AddText(string text)
+	{
+		AddNewLineNoSave(text);
+		SaveFile();
+	}
+
+	void AddNewLineNoSave(string text)
+	{
+		if ( m_LineLimit > -1 )
+		{
+			if ( m_LineLimit == 0 )
+			{
+				return;
+			}
+			
+			int lines_count = m_FileContent.Count();
+			
+			if ( lines_count > 0 && lines_count >= m_LineLimit )
+			{
+				int remove_indexes = lines_count - m_LineLimit;
+				
+				for ( int i = 0; i <= remove_indexes; ++i )
+				{
+					m_FileContent.RemoveOrdered(0);
+				}
+			}
+		}
+		
+		m_FileContent.Insert(text);
+	}
+
+	TStringArray GetFileContent()
+	{
+		return m_FileContent;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..870e46e4a8994ace6921b3c9f41d8872cb3e8db8
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler.c
@@ -0,0 +1,534 @@
+class PluginConfigHandler extends PluginFileHandler
+{	
+	ref array<ref CfgParam> m_CfgParams;
+	
+	void PluginConfigHandler()
+	{
+		m_CfgParams = new array<ref CfgParam>;
+		
+		LoadConfigFile();
+	}
+
+	override void OnInit()
+	{
+		super.OnInit();
+	}
+	
+	override string GetFileName()
+	{
+		return CFG_FILE_USER_PROFILE;
+	}
+	
+	void LoadConfigFile()
+	{
+		LoadFile();
+		
+		m_CfgParams.Clear();
+		
+		for ( int j = 0; j < m_FileContent.Count(); j++ )
+		{
+			m_CfgParams.Insert( ParseText(m_FileContent.Get(j)) );
+		}	
+	}
+	
+	void SaveConfigToFile()
+	{
+		ClearFileNoSave();
+		
+		for ( int i = 0; i < m_CfgParams.Count(); ++i )
+		{
+			string s = ParseParam(m_CfgParams.Get(i));
+
+			m_FileContent.Insert(s);
+		}
+		
+		SaveFile();
+	}
+	
+	CfgParam GetParamByName(string name, int cfg_type)
+	{
+		CfgParam param;
+		
+		for ( int i = 0; i < m_CfgParams.Count(); ++i )
+		{
+			param = m_CfgParams.Get(i);
+			
+			if ( param.GetName() == name )
+			{
+				return param;
+			}
+		}
+		
+		// cfg_type == -1 returns NULL
+		param = CfgParam.CreateParam(name, cfg_type);
+		m_CfgParams.Insert(param);
+		return param;
+	}
+	
+	array<ref CfgParam> GetAllParams()
+	{
+		return m_CfgParams;
+	}
+	
+	void ClearParams()
+	{
+		m_CfgParams.Clear();
+	}
+	
+	void RemoveParamByName( string name )
+	{
+		for ( int i = 0; i < m_CfgParams.Count(); ++i )
+		{
+			CfgParam param = m_CfgParams.Get(i);
+			
+			if ( param.GetName() == name )
+			{
+				m_CfgParams.Remove( i );
+				return;
+			}
+		}
+	}
+
+	void RenameParam( string name, string new_name )
+	{
+		for ( int i = 0; i < m_CfgParams.Count(); ++i )
+		{
+			CfgParam param = m_CfgParams.Get(i);
+			
+			if ( param.GetName() == name )
+			{
+				param.SetName( new_name );
+				return;
+			}
+		}
+	}
+	
+	bool ParamExist(string name)
+	{
+		CfgParam param;
+		
+		for ( int i = 0; i < m_CfgParams.Count(); ++i )
+		{
+			param = m_CfgParams.Get(i);
+			
+			if ( param.GetName() == name )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	string ParseParam(CfgParam param)
+	{
+		string text = STRING_EMPTY;
+		
+		if ( param.GetName() != STRING_EMPTY )
+		{
+			text += param.GetName()+"=";
+		}
+		
+		switch ( param.GetType() )
+		{
+			case CFG_TYPE_ARRAY:
+			{
+				CfgParamArray param_array = CfgParamArray.Cast( param );
+				array<ref CfgParam> params = param_array.GetValues();
+				
+				text += "{";
+				
+				for ( int i = 0; i < params.Count(); ++i )
+				{
+					if ( i > 0 )
+					{
+						text += ",";
+					}
+					
+					text += ParseParam(params.Get(i));
+				}
+				
+				text += "}";
+				
+				break;
+			}
+			case CFG_TYPE_STRING:
+			{
+				CfgParamString param_string = CfgParamString.Cast( param );
+				text += "\""+param_string.GetValue()+"\"";
+				
+				break;
+			}
+			case CFG_TYPE_INT:
+			{
+				CfgParamInt param_int = CfgParamInt.Cast( param );
+				text += param_int.GetValue().ToString();
+				
+				break;
+			}
+			case CFG_TYPE_FLOAT:
+			{
+				CfgParamFloat param_float = CfgParamFloat.Cast( param );
+				string s = param_float.GetValue().ToString();
+				
+				if ( s.IndexOf(".") == -1 )
+				{
+					s += ".0";
+				}
+				
+				text += s;
+				
+				break;
+			}
+			case CFG_TYPE_BOOL:
+			{
+				CfgParamBool param_bool = CfgParamBool.Cast( param );
+				
+				if ( param_bool.GetValue() )
+				{
+					text += "true";
+				}
+				else
+				{
+					text += "false";
+				}
+				
+				break;
+			}
+		}
+		
+		return text;
+	}
+
+	CfgParam ParseText(string text)
+	{
+		string param_name = STRING_EMPTY;
+		string param_value = text.Trim();;
+		int text_type = GetTextType(param_value);
+		
+		//Log("ParseText -> text_type: "+itoa(text_type));
+		
+		if ( text_type == CFG_TYPE_PARAM )
+		{
+			int pos = param_value.IndexOf("=");
+			
+			if ( pos > 0 )
+			{
+				param_name = param_value.Substring(0, pos).Trim();
+				int pos_end = param_value.Length() - pos;
+				param_value = param_value.Substring(pos + 1, pos_end - 1).Trim();
+				
+				//Log("ParseText -> param -> "+param_name+" = "+param_value);
+				
+				CfgParam param = ParseText(param_value);
+				param.SetName(param_name);
+				
+				return param;
+			}
+		}
+		else if ( text_type == CFG_TYPE_ARRAY )
+		{				
+			//Log("ParseText -> array -> "+param_name+" = "+param_value);
+
+			CfgParamArray param_array = new CfgParamArray(param_name);
+			array<ref CfgParam> array_params = ParseToValueArray(param_value);
+			param_array.SetParams(array_params);
+			
+			return param_array;
+		}
+		else if ( text_type == CFG_TYPE_STRING )
+		{					
+			//Log("ParseText -> string -> "+param_value);
+			
+			CfgParamString param_string = new CfgParamString(param_name);
+			param_string.SetValue( ParseToValueString(param_value) );
+			
+			return param_string;
+		}
+		else if ( text_type == CFG_TYPE_INT )
+		{					
+			//Log("ParseText -> int -> "+param_name+" = "+param_value);
+			
+			CfgParamInt param_int = new CfgParamInt(param_name);
+			param_int.SetValue( ParseToValueInt(param_value) );
+			
+			return param_int;
+		}
+		else if ( text_type == CFG_TYPE_FLOAT )
+		{
+			//Log("ParseText -> float -> "+param_name+" = "+param_value);
+			
+			CfgParamFloat param_float = new CfgParamFloat(param_name);
+			param_float.SetValue( ParseToValueFloat(param_value) );
+			
+			return param_float;
+		}
+		else if ( text_type == CFG_TYPE_BOOL )
+		{
+			//Log("ParseText -> bool -> "+param_name+" = "+param_value);
+			
+			CfgParamBool param_bool = new CfgParamBool(param_name);
+			param_bool.SetValue( ParseToValueBool(param_value) );
+			
+			return param_bool;
+		}
+		
+		//Log("ParseText -> none -> "+param_name+" = "+param_value);
+		
+		return NULL;
+	}
+
+	protected int GetTextType(string text)
+	{	
+		int lenght = text.Length();
+			
+		// Check Array
+		int pos1 = text.IndexOf("{");
+		if ( pos1 == 0 && text.Substring(lenght - 1, 1) == "}" )
+		{
+			return CFG_TYPE_ARRAY;
+		}	
+			
+		// Check String
+		pos1 = text.IndexOf("\"");
+		
+		if ( pos1 == 0 && text.Substring(lenght - 1, 1) == "\"" )
+		{
+			string string_text = text.Substring(1, lenght - 2);
+			if ( string_text.IndexOf("\"") == -1 )
+			{
+				return CFG_TYPE_STRING;
+			}
+		}
+		
+		// Check Param
+		pos1 = text.IndexOf("=");
+		if ( pos1 > -1 )
+		{
+			return CFG_TYPE_PARAM;
+		}
+		
+		// Check Param True
+		pos1 = text.IndexOf("true");
+		if ( lenght == 4 && pos1 > -1 )
+		{
+			return CFG_TYPE_BOOL;
+		}
+		
+		// Check Param False
+		pos1 = text.IndexOf("false");
+		if ( lenght == 5 && pos1 > -1 )
+		{
+			return CFG_TYPE_BOOL;
+		}
+		
+		// Check Param Float
+		pos1 = text.IndexOf(".");
+		if ( pos1 > -1 )
+		{
+			return CFG_TYPE_FLOAT;
+		}
+		
+		// Is Int
+		return CFG_TYPE_INT;
+	}
+	
+	protected bool IsString(string text)
+	{
+		if ( GetTextType(text) == CFG_TYPE_STRING )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected bool IsParam(string text)
+	{
+		if ( GetTextType(text) == CFG_TYPE_PARAM )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected bool IsArray(string text)
+	{
+		if ( GetTextType(text) == CFG_TYPE_ARRAY )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected bool IsFloat(string text)
+	{
+		if ( GetTextType(text) == CFG_TYPE_FLOAT )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected bool IsInt(string text)
+	{
+		if ( GetTextType(text) == CFG_TYPE_INT )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected bool IsBool(string text)
+	{
+		if ( GetTextType(text) == CFG_TYPE_BOOL )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	protected string ParseToValueString(string param_value)
+	{	
+		return param_value.Substring(1, param_value.Length() - 2);
+	}
+
+	protected float ParseToValueFloat(string param_value)
+	{
+		return param_value.ToFloat();
+	}
+
+	protected int ParseToValueInt(string param_value)
+	{
+		return param_value.ToInt();
+	}
+
+	protected bool ParseToValueBool(string param_value)
+	{
+		if ( param_value.Contains("true") )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected array<ref CfgParam> ParseToValueArray(string param_value)
+	{
+		array<ref CfgParam> param_parent = new array<ref CfgParam>;
+		
+		TStringArray strings = new TStringArray;
+		
+		array<int> a = new array<int>;
+		array<int> b = new array<int>;
+
+		int pos_a = 0;
+		int pos_b = 0;
+		int element = 0;
+		int value_start = 0;
+		int value_end = 0;
+		
+		while ( pos_a > -1 ||  pos_b > -1 )
+		{
+			pos_a = param_value.IndexOfFrom(pos_a, "{" );
+			if ( pos_a > -1 )
+			{
+				a.Insert(pos_a);
+				pos_a++;
+			}
+			
+			pos_b = param_value.IndexOfFrom(pos_b, "}" );
+			if ( pos_b > -1 )
+			{
+				b.Insert(pos_b);
+				pos_b++;
+			}
+		}	
+		
+		pos_a = 0;
+		pos_b = 0;
+		
+		for ( pos_a = 0; pos_a < a.Count(); ++pos_a )
+		{
+			if ( a.Get(pos_a) > b.Get(pos_b) )
+			{
+				element--;
+				
+				if ( element <= 1 )
+				{
+					value_end = b.Get(pos_b) - value_start + 1;
+					
+					//Log("1 -> "+substr(param_value, value_start, value_end))
+					
+					strings.Insert( param_value.Substring(value_start, value_end) );
+					
+					value_start = b.Get(pos_b) + 1;
+				}
+				
+				pos_a--;
+				pos_b++;
+			}
+			else if ( a.Get(pos_a) < b.Get(pos_b) )
+			{
+				if ( pos_a == a.Count() - 1 && pos_b < b.Count() - 1 )
+				{
+					element--;
+				
+					if ( element == 0 )
+					{
+						value_end = b.Get(pos_b) - value_start;
+						
+						//Log("2 -> "+substr(param_value, value_start + 1, value_end))
+						
+						strings.Insert( param_value.Substring(value_start + 1, value_end) );
+						
+						value_start = b.Get(pos_b) + 1;
+					}
+					
+					pos_a--;
+					pos_b++;
+				}
+				else
+				{
+					element++;
+				
+					if ( element == 2 )
+					{
+						value_start = a.Get(pos_a);
+					}
+				}			
+			}
+		}
+		
+		//Log(param_value+" => "+itoa(a.Count())+" / "+itoa(b.Count())+"    count: "+itoa(strings.Count()));
+		
+		if ( strings.Count() == 0 )
+		{
+			//Log(param_value+" -> ZERO {}");
+			
+			string param_value_content = param_value.Substring(1, param_value.Length() - 2);
+			
+			//Log(param_value+" -> Trimmed -> "+param_value_content);
+			
+			param_value_content.Split(",", strings);
+		}
+		
+		for ( int i = 0; i < strings.Count(); ++i )
+		{
+			string str = strings.Get(i);
+			
+			//Log("To Parse => "+str);
+			
+			CfgParam param = ParseText(str);
+			
+			param_parent.Insert(param);		
+		}
+		
+		return param_parent;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigDebugProfile.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigDebugProfile.c
new file mode 100644
index 0000000000000000000000000000000000000000..f6d2dd1b572b61c523d266b1cca092bb10552317
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigDebugProfile.c
@@ -0,0 +1,1150 @@
+typedef Param3<string, bool, vector> LocationParams;//  param1 - name, param2 - isCustom?, param3 - position
+class PluginConfigDebugProfile extends PluginConfigHandler
+{	
+	protected const string SCENE_DRAW_SELECTION				= "scene_editor_draw_selection";
+	protected const string SCENE_LOAD_PLAYER_POS			= "scene_editor_load_player_pos";
+	protected const string SCENE_ROTATION_ANGLE				= "scene_editor_rotation_angle";
+	protected const string ITEM_TAB_SELECTED				= "console_TabSelected";
+	protected const string PRESET_LIST						= "console_presets";
+	protected const string PRESET_DEFAULT					= "console_preset_default";
+	protected const string ITEM_SEARCH						= "console_ItemSearch";
+	protected const string SPAWN_DISTANCE					= "console_SpawnDistance";
+	protected const string CHAR_STATS_VIS					= "console_character_stats_visible";
+	protected const string CHAR_LEVELS_VIS					= "console_character_levels_visible";
+	protected const string CHAR_MODIFIERS_VIS				= "console_character_modifiers_visible";
+	protected const string CHAR_AGENTS_VIS					= "console_character_agents_visible";
+	protected const string CHAR_DEBUG_VIS					= "console_character_debug_visible";
+	protected const string CHAR_STOMACH_VIS					= "console_character_stomach_visible";
+	protected const string FREE_CAMERA_CROSSHAIR			= "console_free_camera_crosshair_visible";
+	protected const string VERSION_VIS						= "console_version_visible";
+	protected const string MERGE_TYPE						= "category_merge_type";
+	protected const string TEMP_VIS							= "console_temperature_visible";
+	protected const string SUB_PARAM_ITEM					= "item";
+	protected const string SUB_PARAM_ITEM_NAME				= "name";
+	protected const string SUB_PARAM_ITEM_HEALTH			= "health";
+	protected const string SUB_PARAM_ITEM_QUANTITY			= "quantity";
+	protected const string SUB_PARAM_ITEM_WITH_PHYSICS		= "with_physics";
+	protected const string LOGS_ENABLED						= "logs_enabled";
+	protected const string CONFIG_CLASSES_FLAG				= "toggled_config_classes_flag";
+	protected const string ITEM_CATEGORY_FLAG				= "toggled_item_categories_flag";
+	protected const string ITEM_PREVIEW						= "show_item_preview";
+	protected const string BATCH_RECT						= "batch_spawn_rect";
+	protected const string BATCH_QUANT						= "batch_spawn_quantity";
+	protected const string SOUNDFILTER						= "soundset_editbox";
+	protected const string ITEMDEBUG						= "item_debug";
+	protected const string SPAWN_LOC_INDEX					= "spawn_loc_index";
+	protected const string FILTER_REVERSED					= "filter_order_reversed";
+
+	protected ref map<string, ref CfgParam>				m_DefaultValues;
+	protected ref TStringArray 							m_PresetList;	
+	protected const string POSITION_NAME_ROOT			= "console_positions_";
+	
+	//========================================
+	// GetInstance
+	//========================================
+	static PluginConfigDebugProfile GetInstance()
+	{
+		return PluginConfigDebugProfile.Cast( GetPlugin(PluginConfigDebugProfile) );
+	}	
+	
+	//========================================
+	// GetCfgParamArray
+	//========================================
+	protected CfgParamArray GetNewCfgParamArray( array<ref CfgParam> params )
+	{
+		CfgParamArray param = new CfgParamArray( "" );
+		param.SetParams( params );
+		return param;
+	}
+	
+	//========================================
+	// GetCfgParamBool
+	//========================================
+	protected CfgParamBool GetNewCfgParamBool( bool value )
+	{
+		CfgParamBool param = new CfgParamBool( "" );
+		param.SetValue( value );
+		return param;
+	}
+	
+	//========================================
+	// GetCfgParamFloat
+	//========================================
+	protected CfgParamFloat GetNewCfgParamFloat( float value )
+	{
+		CfgParamFloat param = new CfgParamFloat( "" );
+		param.SetValue( value );
+		return param;
+	}
+	
+	//========================================
+	// GetCfgParamInt
+	//========================================
+	protected CfgParamInt GetNewCfgParamInt( int value )
+	{
+		CfgParamInt param = new CfgParamInt( "" );
+		param.SetValue( value );
+		return param;
+	}
+	
+	//========================================
+	// GetCfgParamString
+	//========================================
+	protected CfgParamString GetNewCfgParamString( string value )
+	{
+		CfgParamString param = new CfgParamString( "" );
+		param.SetValue( value );
+		return param;
+	}
+	
+	//========================================
+	// Array
+	//========================================
+	protected CfgParamArray SetArray( string key, array<ref CfgParam> params )
+	{
+		CfgParamArray param = CfgParamArray.Cast( GetParamByName( key, CFG_TYPE_ARRAY ) );
+		param.SetParams( params );
+		SaveConfigToFile();
+		return param;
+	}
+
+	protected array<ref CfgParam> GetArray( string key )
+	{
+		if ( ParamExist(key) )
+		{
+			CfgParamArray param = CfgParamArray.Cast( GetParamByName( key, CFG_TYPE_ARRAY ) );
+			return param.GetValues();
+		}
+		else
+		{
+			if ( m_DefaultValues.Contains(key) )
+			{
+				CfgParamArray default_param = CfgParamArray.Cast( m_DefaultValues.Get( key ) );
+				return SetArray( key, default_param.GetValues() ).GetValues();
+			}
+			else
+			{
+				return SetArray( key, new array<ref CfgParam> ).GetValues();
+			}
+		}
+	}
+	
+	//========================================
+	// Bool
+	//========================================
+	protected CfgParamBool SetBool( string key, bool value )
+	{
+		CfgParamBool param = CfgParamBool.Cast( GetParamByName( key, CFG_TYPE_BOOL ) );
+		param.SetValue( value );
+		SaveConfigToFile();
+		return param;
+	}
+
+	protected bool GetBool( string key )
+	{
+		if ( ParamExist(key) )
+		{
+			CfgParamBool param = CfgParamBool.Cast( GetParamByName( key, CFG_TYPE_BOOL ) );
+			return param.GetValue();
+		}
+		else
+		{
+			if ( m_DefaultValues.Contains(key) )
+			{
+				CfgParamBool default_param = CfgParamBool.Cast( m_DefaultValues.Get( key ) );
+				return SetBool( key, default_param.GetValue() ).GetValue();
+			}
+			else
+			{
+				return SetBool( key, false ).GetValue();
+			}
+		}
+	}
+	
+	//========================================
+	// Float
+	//========================================
+	protected CfgParamFloat SetFloat( string key, float value )
+	{
+		CfgParamFloat param = CfgParamFloat.Cast( GetParamByName( key, CFG_TYPE_FLOAT ) );
+		param.SetValue( value );
+		SaveConfigToFile();
+		return param;
+	}
+
+	protected float GetFloat( string key )
+	{
+		if ( ParamExist(key) )
+		{
+			CfgParamFloat param = CfgParamFloat.Cast( GetParamByName( key, CFG_TYPE_FLOAT ) );
+			return param.GetValue();
+		}
+		else
+		{
+			if ( m_DefaultValues.Contains(key) )
+			{
+				CfgParamFloat default_param = CfgParamFloat.Cast( m_DefaultValues.Get( key ) );
+				return SetFloat( key, default_param.GetValue() ).GetValue();
+			}
+			else
+			{
+				return SetFloat( key, 0.0 ).GetValue();
+			}
+		}
+	}
+	
+	//========================================
+	// Int
+	//========================================
+	protected CfgParamInt SetInt( string key, int value )
+	{
+		CfgParamInt param = CfgParamInt.Cast( GetParamByName( key, CFG_TYPE_INT ) );
+		param.SetValue( value );
+		SaveConfigToFile();
+		return param;
+	}
+
+	protected int GetInt( string key )
+	{
+		if ( ParamExist(key) )
+		{
+			CfgParamInt param = CfgParamInt.Cast( GetParamByName( key, CFG_TYPE_INT ) );
+			return param.GetValue();
+		}
+		else
+		{
+			if ( m_DefaultValues.Contains(key) )
+			{
+				CfgParamInt default_param = CfgParamInt.Cast( m_DefaultValues.Get( key ) );
+				return SetInt( key, default_param.GetValue() ).GetValue();
+			}
+			else
+			{
+				return SetInt( key, 0 ).GetValue();
+			}
+		}
+	}
+	
+	//========================================
+	// String
+	//========================================
+	protected CfgParamString SetString( string key, string value )
+	{
+		CfgParamString param = CfgParamString.Cast( GetParamByName( key, CFG_TYPE_STRING ) );
+		if(param)
+		{
+			param.SetValue( value );
+			SaveConfigToFile();
+		}
+		return param;
+	}
+
+	protected string GetString( string key )
+	{
+		CfgParamString param = CfgParamString.Cast( GetParamByName( key, CFG_TYPE_STRING ) );
+		
+		if ( param && param.GetValue() != STRING_EMPTY )
+		{
+			return param.GetValue();
+		}
+		else
+		{
+			if ( m_DefaultValues.Contains(key) )
+			{
+				CfgParamString default_param = CfgParamString.Cast( m_DefaultValues.Get( key ) );
+				CfgParamString param_string = SetString( key, default_param.GetValue() );
+				if(param_string)
+					return param_string.GetValue();
+			}
+			else
+			{
+				return SetString( key, "" ).GetValue();
+			}
+		}
+		return "";
+	}
+	
+	protected void GetSubParametersInStringArray( string setting_name, string sub_param_name, out TStringArray arr )
+	{
+		array<ref CfgParam> items = GetArray( setting_name );
+		for ( int i = 0; i < items.Count(); i++ )
+		{
+			CfgParamArray items_array = CfgParamArray.Cast( items.Get(i) );
+			array<ref CfgParam> item_params = items_array.GetValues();
+			 
+			for ( int j = 0; j < item_params.Count(); j++ )
+			{
+				if ( item_params.Get(j).GetName() == sub_param_name )
+				{
+					CfgParamString param_string = CfgParamString.Cast( item_params.Get( j ) );
+					arr.Insert( param_string.GetValue() );
+				}
+			}
+		}
+	}
+	
+	//========================================
+	// PluginConfigDebugProfile
+	//========================================
+	void PluginConfigDebugProfile()
+	{
+		m_DefaultValues = new map<string, ref CfgParam>;
+		m_DefaultValues.Insert(SCENE_DRAW_SELECTION, 	GetNewCfgParamBool(true) );
+		m_DefaultValues.Insert(SCENE_LOAD_PLAYER_POS, 	GetNewCfgParamBool(true) );
+		m_DefaultValues.Insert(SCENE_ROTATION_ANGLE, 	GetNewCfgParamInt(15) );
+		m_DefaultValues.Insert(ITEM_TAB_SELECTED, 		GetNewCfgParamInt(0) );
+		m_DefaultValues.Insert(PRESET_DEFAULT, 			GetNewCfgParamString("") );
+		m_DefaultValues.Insert(ITEM_SEARCH, 			GetNewCfgParamString("") );
+		m_DefaultValues.Insert(SPAWN_DISTANCE, 			GetNewCfgParamFloat(0.0) );
+		m_DefaultValues.Insert(LOGS_ENABLED, 			GetNewCfgParamBool(true) );
+		m_DefaultValues.Insert(CHAR_STATS_VIS, 			GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(CHAR_LEVELS_VIS, 		GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(CHAR_MODIFIERS_VIS, 		GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(CHAR_AGENTS_VIS, 		GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(CHAR_DEBUG_VIS, 			GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(FREE_CAMERA_CROSSHAIR, 	GetNewCfgParamBool(true) );
+		m_DefaultValues.Insert(VERSION_VIS,				GetNewCfgParamBool(true) );
+		m_DefaultValues.Insert(CONFIG_CLASSES_FLAG,		GetNewCfgParamInt(15) );
+		m_DefaultValues.Insert(TEMP_VIS,				GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(MERGE_TYPE,				GetNewCfgParamBool(false) );
+		m_DefaultValues.Insert(ITEM_PREVIEW,			GetNewCfgParamBool(true) );
+		m_DefaultValues.Insert(BATCH_RECT,				GetNewCfgParamArray(GetDefaultBatchRectParams()) );
+		m_DefaultValues.Insert(BATCH_QUANT,				GetNewCfgParamInt(10) );
+		m_DefaultValues.Insert(SOUNDFILTER,				GetNewCfgParamString("") );
+		m_DefaultValues.Insert(ITEMDEBUG,				GetNewCfgParamString("0 0 0") );
+		m_DefaultValues.Insert(SPAWN_LOC_INDEX,			GetNewCfgParamInt(0));
+		m_DefaultValues.Insert(FILTER_REVERSED,			GetNewCfgParamBool(false));
+	}
+	
+	array<ref CfgParam> GetDefaultBatchRectParams()
+	{
+		array<ref CfgParam> params = new array<ref CfgParam>;
+		CfgParamInt param1 = new CfgParamInt("");
+		param1.SetValue(5);
+		CfgParamInt param2 = new CfgParamInt("");
+		param2.SetValue(5);
+		CfgParamFloat param3 = new CfgParamFloat("");
+		param3.SetValue(1.0);
+		CfgParamFloat param4 = new CfgParamFloat("");
+		param4.SetValue(1.0);
+		
+		params.Insert(param1);
+		params.Insert(param2);
+		params.Insert(param3);
+		params.Insert(param4);
+		
+		return params;
+	}
+	
+	//========================================
+	// OnInit
+	//========================================
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		array<ref CfgParam> params = GetArray( PRESET_LIST );
+		
+		m_PresetList = new TStringArray;
+		for ( int i = 0; i < params.Count(); i++ )
+		{
+			CfgParamString param = CfgParamString.Cast( params.Get( i ) );
+			m_PresetList.Insert( param.GetValue() );
+		}
+	}
+	
+	//========================================
+	// GetFileName
+	//========================================
+	override string GetFileName()
+	{
+		if (!FileExist(GetSubFolderName()))//---ALL LINES CONTAINING THIS COMMENT CAN BE REMOVED IN 1.23
+			return "$profile:debugProfile.cfg";//---ALL LINES CONTAINING THIS COMMENT CAN BE REMOVED IN 1.23
+		
+		return GetSubFolderName() + CFG_FILE_DEBUG_PROFILE;
+	}
+	
+	override string GetSubFolderName()
+	{
+		return CFG_FILE_DEBUG_DIR;
+	}
+
+	//========================================
+	// SceneEditorDrawSelection
+	//========================================
+	bool GetSceneEditorDrawSelection()
+	{
+		return GetBool( SCENE_DRAW_SELECTION );
+	}
+
+	void SetSceneEditorDrawSelection( bool value )
+	{
+		SetBool( SCENE_DRAW_SELECTION, value );
+	}
+	
+	//========================================
+	// SceneEditorSavePlayerPos
+	//========================================
+	bool GetSceneEditorLoadPlayerPos()
+	{
+		return GetBool( SCENE_LOAD_PLAYER_POS );
+	}
+
+	void SetSceneEditorLoadPlayerPos( bool value )
+	{
+		SetBool( SCENE_LOAD_PLAYER_POS, value );
+	}
+	
+	//========================================
+	// SceneEditorRotationAngle
+	//========================================
+	int GetSceneEditorRotationAngle()
+	{
+		return GetInt( SCENE_ROTATION_ANGLE );
+	}
+
+	void SetSceneEditorRotationAngle( int value )
+	{
+		SetInt( SCENE_ROTATION_ANGLE, value );
+	}
+	
+	//========================================
+	// TabSelected
+	//========================================
+	int GetTabSelected()
+	{
+		return GetInt( ITEM_TAB_SELECTED );
+	}
+	
+	void SetTabSelected( int value )
+	{
+		SetInt( ITEM_TAB_SELECTED, value );
+	}
+	
+	//========================================
+	// SpawnLocIndex
+	//========================================
+	int GetSpawnLocIndex()
+	{
+		return GetInt( SPAWN_LOC_INDEX );
+	}
+	
+	void SetSpawnLocIndex( int value )
+	{
+		SetInt( SPAWN_LOC_INDEX, value );
+	}
+	
+	//========================================
+	// FilterOrder
+	//========================================
+	int GetFilterOrderReversed()
+	{
+		return GetBool( FILTER_REVERSED );
+	}
+	
+	void SetFilterOrderReversed( bool reversed )
+	{
+		SetBool( FILTER_REVERSED, reversed );
+	}
+	
+	//========================================
+	// DefaultPreset
+	//========================================
+	string GetDefaultPreset()
+	{
+		return GetString( PRESET_DEFAULT );
+	}
+	
+	void SetDefaultPreset( string value )
+	{
+		SetString( PRESET_DEFAULT, value );
+	}
+	
+	//========================================
+	// Batch Spawn Params
+	//========================================
+	array<ref CfgParam> GetBatchSpawnRectangle()
+	{
+		return GetArray( BATCH_RECT );
+	}
+	
+	void SetBatchSpawnRectangle( int row, int column, float rowStep, float columnStep)
+	{
+		array<ref CfgParam> params = GetArray( BATCH_RECT );
+		params.Clear();
+		CfgParamString param;
+		
+		CfgParamInt param1 = new CfgParamInt("");
+		param1.SetValue(row);
+		CfgParamInt param2 = new CfgParamInt("");
+		param2.SetValue(column);
+		CfgParamFloat param3 = new CfgParamFloat("");
+		param3.SetValue(rowStep);
+		CfgParamFloat param4 = new CfgParamFloat("");
+		param4.SetValue(columnStep);
+		
+		params.Insert(param1);
+		params.Insert(param2);
+		params.Insert(param3);
+		params.Insert(param4);
+		SaveConfigToFile();
+	}
+	
+	//========================================
+	// Batch Spawn Quantity
+	//========================================
+	int GetBatchSpawnQuantity()
+	{
+		return GetInt( BATCH_QUANT );
+	}
+	
+	void SetBatchSpawnQuantity(int value)
+	{
+		SetInt( BATCH_QUANT, value );
+	}
+	//========================================
+	// ItemSearch
+	//========================================
+	string GetItemSearch()
+	{
+		return GetString( ITEM_SEARCH );
+	}
+	
+	void SetItemSearch( string value )
+	{
+		SetString( ITEM_SEARCH, value );
+	}
+
+	//========================================
+	// SpawnDistance
+	//========================================
+	float GetSpawnDistance()
+	{
+		return GetFloat( SPAWN_DISTANCE );
+	}
+
+	void SetSpawnDistance( float value )
+	{
+		SetFloat( SPAWN_DISTANCE, value );
+	}
+
+	//========================================
+	// LogsEnabled
+	//========================================
+	bool GetLogsEnabled()
+	{
+		return GetBool( LOGS_ENABLED );
+	}
+
+	void SetLogsEnabled( bool value )
+	{
+		SetBool( LOGS_ENABLED, value );
+	}
+	
+	//========================================
+	// CharacterLevelsVisible
+	//========================================	
+	bool GetCharacterLevelsVisible()
+	{
+		return GetBool( CHAR_LEVELS_VIS );
+	}
+	
+
+	void SetCharacterLevelsVisible( bool is_visible )
+	{
+		SetBool( CHAR_LEVELS_VIS, is_visible );
+	}
+	
+	
+	//========================================
+	// ItemDebugPos
+	//========================================	
+	void SetItemDebugPos(vector pos)
+	{
+		 SetString( ITEMDEBUG ,pos.ToString(false));
+	}
+	
+
+	vector GetItemDebugPos()
+	{
+		return GetString( ITEMDEBUG ).ToVector();
+	}
+	
+	//========================================
+	// CharacterStatsVisible
+	//========================================	
+	bool GetCharacterStatsVisible()
+	{
+		return GetBool( CHAR_STATS_VIS );
+	}
+	
+
+	void SetCharacterStatsVisible( bool is_visible )
+	{
+		SetBool( CHAR_STATS_VIS, is_visible );
+	}
+	
+	//========================================
+	// CharacterModifiersVisible
+	//========================================	
+	bool GetCharacterModifiersVisible()
+	{
+		return GetBool( CHAR_MODIFIERS_VIS );
+	}
+
+	void SetCharacterModifiersVisible( bool is_visible )
+	{
+		SetBool( CHAR_MODIFIERS_VIS, is_visible );
+	}	
+	
+	//========================================
+	// CharacterAgentsVisible
+	//========================================	
+	bool GetCharacterAgentsVisible()
+	{
+		return GetBool( CHAR_AGENTS_VIS );
+	}
+
+	void SetCharacterAgentsVisible( bool is_visible )
+	{
+		SetBool( CHAR_AGENTS_VIS, is_visible );
+	}
+	
+	//========================================
+	// CharacterDebugVisible
+	//========================================	
+	bool GetCharacterDebugVisible()
+	{
+		return GetBool( CHAR_DEBUG_VIS );
+	}
+
+	void SetCharacterDebugVisible( bool is_visible )
+	{
+		SetBool( CHAR_DEBUG_VIS, is_visible );
+	}	
+		
+	//========================================
+	// CharacterStomachVisible
+	//========================================	
+	bool GetCharacterStomachVisible()
+	{
+		return GetBool( CHAR_STOMACH_VIS );
+	}
+
+	void SetCharacterStomachVisible( bool is_visible )
+	{
+		SetBool( CHAR_STOMACH_VIS, is_visible );
+	}	
+	
+	//========================================
+	// FreeCameraCrosshairVisible
+	//========================================	
+	bool GetFreeCameraCrosshairVisible()
+	{
+		return GetBool( FREE_CAMERA_CROSSHAIR );
+	}
+
+	void SetFreeCameraCrosshairVisible( bool is_visible )
+	{
+		SetBool( FREE_CAMERA_CROSSHAIR, is_visible );
+	}
+	
+	//========================================
+	// VersionVisible
+	//========================================	
+	bool GetVersionVisible()
+	{
+		return GetBool( VERSION_VIS );
+	}
+
+	void SetVersionVisible( bool is_visible )
+	{
+		SetBool( VERSION_VIS, is_visible );
+	}
+	
+	//========================================
+	// Merge Type
+	//========================================	
+	bool GetMergeType()
+	{
+		return GetBool( MERGE_TYPE );
+	}
+
+	void SetMergeType( bool is_visible )
+	{
+		SetBool( MERGE_TYPE, is_visible );
+	}	
+	
+	//========================================
+	// Soundset Filter
+	//========================================	
+	string GetSoundsetFilter()
+	{
+		return GetString( SOUNDFILTER );
+	}
+
+	void SetSoundsetFilter( string content )
+	{
+		SetString( SOUNDFILTER, content );
+	}
+	
+	//========================================
+	// TemperatureVisible
+	//========================================	
+	bool GetTempVisible()
+	{
+		return GetBool( TEMP_VIS );
+	}
+
+	void SetTempVisible( bool is_visible )
+	{
+		SetBool( TEMP_VIS, is_visible );
+	}
+	
+	//========================================
+	// Show Item Preview
+	//========================================	
+	bool GetShowItemPreview()
+	{
+		return GetBool( ITEM_PREVIEW );
+	}
+
+	void SetShowItemPreview( bool show )
+	{
+		SetBool( ITEM_PREVIEW, show );
+	}
+	
+	
+	//========================================
+	// ConfigClassesFlag
+	//========================================	
+	int GetConfigClassesFlag()
+	{
+		return GetInt( CONFIG_CLASSES_FLAG );
+	}
+
+	void SetConfigClassesFlag( int flag )
+	{
+		SetInt( CONFIG_CLASSES_FLAG, flag );
+	}
+	
+	
+	//========================================
+	// Item Category Flag
+	//========================================	
+	int GetItemCategoryFlag()
+	{
+		return GetInt( ITEM_CATEGORY_FLAG );
+	}
+
+	void SetItemCategoryFlag( int flag )
+	{
+		SetInt( ITEM_CATEGORY_FLAG, flag );
+	}
+	
+	//========================================
+	// User Location
+	//========================================
+	bool CustomLocationsAdd( string name, vector position )
+	{
+		string world = g_Game.GetWorldName();
+		world.ToLower();
+		
+		CfgParamString locationName = new CfgParamString(PluginConfigDebugProfileFixed.SUB_PARAM_POS_NAME);
+		locationName.SetValue(name);
+		CfgParamString locationPos = new CfgParamString(PluginConfigDebugProfileFixed.SUB_PARAM_POS_VEC);
+		locationPos.SetValue(position.ToString(false));
+		
+		CfgParamArray locationEntry = new CfgParamArray( locationName.GetValue() );
+		locationEntry.InsertValue( locationName );
+		locationEntry.InsertValue( locationPos );
+		
+		string paramName = POSITION_NAME_ROOT + world;
+		array<ref CfgParam> params = GetArray(paramName);
+		params.Insert(locationEntry);
+		SetArray(paramName, params);
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	void CustomLocationsRemove( string name )
+	{
+		if (!name)
+			return;
+		string world = g_Game.GetWorldName();
+		world.ToLower();
+		string paramName = POSITION_NAME_ROOT + world;
+		array<ref CfgParam> params = GetArray(paramName);
+		
+		for (int i = 0; i < params.Count(); i++)
+		{
+			CfgParamArray param = CfgParamArray.Cast(params.Get(i));
+			array<ref CfgParam> prms = param.GetValues();
+			CfgParamString par = CfgParamString.Cast(prms.Get(0));
+			if (par.GetValue() == name)
+			{
+				params.RemoveOrdered(i);
+				break;
+			}
+		}
+		
+		//SetArray(paramName, params);
+		SaveConfigToFile();
+	}
+
+	//========================================
+	// Presets
+	//========================================
+	TStringArray GetPresets()
+	{
+		return m_PresetList;
+	}
+	
+	protected void SetPreset( string preset_name, int index = -1 )
+	{
+		array<ref CfgParam> params = GetArray( PRESET_LIST );
+		CfgParamString param;
+		
+		if ( index == -1 )
+		{
+			param = new CfgParamString( "" );
+			param.SetValue( preset_name );
+			params.Insert( param );
+			m_PresetList.Insert( preset_name );
+		}
+		else
+		{
+			param = CfgParamString.Cast( params.Get( index ) );
+			param.SetValue( preset_name );
+			params.Set( index, param );
+			m_PresetList.Set( index, preset_name );
+		}
+		
+		SaveConfigToFile();
+	}
+	
+	protected void RemovePreset( string preset_name )
+	{
+		array<ref CfgParam> params = GetArray( PRESET_LIST );
+		for ( int i = 0; i < params.Count(); i++ )
+		{
+			CfgParamString param = CfgParamString.Cast( params.Get(i) );
+			if ( param.GetValue() == preset_name )
+			{
+				params.RemoveItem( param );
+				m_PresetList.RemoveItem( preset_name );
+			}
+		}
+	}
+	
+	bool GetPresetItems( string preset_name, out TStringArray arr, string param_name = "" )
+	{
+		if ( m_PresetList.Find(preset_name) == -1 )
+		{
+			return false;
+		}
+		if(param_name == "")
+			param_name = SUB_PARAM_ITEM_NAME;
+		GetSubParametersInStringArray( preset_name, param_name, arr );
+		
+		return true;
+	}
+	
+	bool PresetAdd( string preset_name )
+	{
+		if ( m_PresetList.Find(preset_name) > -1 )
+		{
+			return false;
+		}
+		
+		SetPreset( preset_name );
+		SetArray( preset_name, new array<ref CfgParam> );
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	bool PresetRemove( string preset_name )
+	{
+		if ( m_PresetList.Find(preset_name) == -1 )
+		{
+			return false;
+		}
+		
+		RemovePreset( preset_name );
+		RemoveParamByName( preset_name );
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	bool PresetRename( string old_preset_name, string new_preset_name )
+	{
+		int index = m_PresetList.Find( old_preset_name );
+		
+		if ( index == -1 )
+		{
+			return false;
+		}
+		
+		SetPreset( new_preset_name, index );
+		RenameParam( old_preset_name, new_preset_name );
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	bool ItemAddToPreset( string preset_name, string item_name )
+	{		
+		if ( m_PresetList.Find( preset_name ) == -1 )
+		{
+			return false;
+		}
+		
+		CfgParamString param = new CfgParamString( SUB_PARAM_ITEM_NAME );
+		param.SetValue( item_name );
+		
+		CfgParamArray item_params = new CfgParamArray( SUB_PARAM_ITEM );
+		item_params.InsertValue( param );
+		
+		array<ref CfgParam> params = GetArray( preset_name );
+		params.Insert( item_params );
+		
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	bool ItemRemoveFromPreset( string preset_name, int item_index )
+	{
+		if ( m_PresetList.Find( preset_name ) == -1 )
+		{
+			return false;
+		}
+		
+		array<ref CfgParam> params = GetArray( preset_name );
+		
+		if ( item_index >= params.Count() )
+		{
+			return false;
+		}
+		
+		params.Remove( item_index );
+
+		SaveConfigToFile();
+		
+		return true;
+	}
+
+	bool SwapItem( string preset_name, int item1_index, int item2_index )
+	{
+		array<ref CfgParam> params = GetArray( preset_name );
+		
+		if ( item1_index >= params.Count() || item2_index >= params.Count() )
+		{
+			return false;
+		}
+		
+		params.SwapItems( item1_index, item2_index );
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	protected array<ref CfgParam> GetItemParams( string preset_name, int item_index )
+	{
+		if ( m_PresetList.Find( preset_name ) == -1 )
+		{
+			return NULL;
+		}
+		
+		array<ref CfgParam> params = GetArray( preset_name );
+		
+		if ( !params || item_index >= params.Count() )
+		{
+			return NULL;
+		}
+		if (params.IsValidIndex(item_index))
+			CfgParamArray params_array = CfgParamArray.Cast( params.Get( item_index ) );
+		if (params_array)
+			return params_array.GetValues();
+		
+		return null;
+	}
+	
+	protected CfgParam GetItemParam( string preset_name, int item_index, string param_name )
+	{
+		array<ref CfgParam> item_params = GetItemParams( preset_name, item_index );
+		
+		if ( item_params == NULL )
+		{
+			return NULL;
+		}
+		
+		CfgParam param = NULL;
+		for ( int i = 0; i < item_params.Count(); i++ )
+		{
+			if ( item_params.Get(i).GetName() == param_name )
+			{
+				param = item_params.Get(i);
+			}
+		}
+		
+		return param;
+	}
+	
+	float GetItemHealth( string preset_name, int item_index )
+	{
+		CfgParam param = GetItemParam( preset_name, item_index, SUB_PARAM_ITEM_HEALTH );
+		
+		if ( param == NULL )
+		{
+			return -1;
+		}
+		else
+		{
+			CfgParamFloat param_float = CfgParamFloat.Cast( param );
+			return param_float.GetValue();
+		}
+	}	
+	
+	bool SetItemHealth( string preset_name, int item_index, float health )
+	{
+		CfgParam param = GetItemParam( preset_name, item_index, SUB_PARAM_ITEM_HEALTH );
+		
+		if ( param != NULL )
+		{
+			CfgParamFloat param_float = CfgParamFloat.Cast( param );
+			param_float.SetValue( health );
+		}
+		else
+		{
+			array<ref CfgParam> item_params = GetItemParams( preset_name, item_index );
+			
+			if ( item_params != NULL )
+			{
+				CfgParamFloat new_param = new CfgParamFloat( SUB_PARAM_ITEM_HEALTH );
+				new_param.SetValue( health );
+				item_params.Insert( new_param );
+			}
+		}
+
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	int GetItemQuantity( string preset_name, int item_index )
+	{
+		CfgParam param = GetItemParam( preset_name, item_index, SUB_PARAM_ITEM_QUANTITY );
+		
+		if ( param == NULL )
+		{
+			return 1;
+		}
+		else
+		{
+			CfgParamInt param_int = CfgParamInt.Cast( param );
+			return param_int.GetValue();
+		}
+	}
+	
+	bool SetItemQuantity( string preset_name, int item_index, int quantity )
+	{
+		CfgParam param = GetItemParam( preset_name, item_index, SUB_PARAM_ITEM_QUANTITY );
+		
+		if ( param != NULL )
+		{
+			CfgParamInt param_int = CfgParamInt.Cast( param );
+			param_int.SetValue( quantity );
+		}
+		else
+		{
+			array<ref CfgParam> item_params = GetItemParams( preset_name, item_index );
+			
+			if ( item_params != NULL )
+			{
+				CfgParamInt new_param = new CfgParamInt( SUB_PARAM_ITEM_QUANTITY );
+				new_param.SetValue( quantity );
+				item_params.Insert( new_param );
+			}
+		}
+
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	bool GetItemWithPhysics( string preset_name, int item_index )
+	{
+		CfgParam param = GetItemParam( preset_name, item_index, SUB_PARAM_ITEM_WITH_PHYSICS );
+		
+		if ( param == NULL )
+		{
+			return false;
+		}
+		else
+		{
+			CfgParamBool param_bool = CfgParamBool.Cast( param );
+			return param_bool.GetValue();
+		}
+	}
+	
+	bool SetItemWithPhysics( string preset_name, int item_index, bool with_physics )
+	{
+		CfgParam param = GetItemParam( preset_name, item_index, SUB_PARAM_ITEM_WITH_PHYSICS );
+		
+		if ( param != NULL )
+		{
+			CfgParamBool param_bool = CfgParamBool.Cast( param );
+			param_bool.SetValue( with_physics );
+		}
+		else
+		{
+			array<ref CfgParam> item_params = GetItemParams( preset_name, item_index );
+			
+			if ( item_params != NULL )
+			{
+				CfgParamBool new_param = new CfgParamBool( SUB_PARAM_ITEM_WITH_PHYSICS );
+				new_param.SetValue( with_physics );
+				item_params.Insert( new_param );
+			}
+		}
+
+		SaveConfigToFile();
+		
+		return true;
+	}
+	
+	//========================================
+	// Locations
+	//========================================
+
+	void GetLocationsData( out array<ref LocationParams> arr , bool isCustom)
+	{
+		string world = g_Game.GetWorldName();
+		world.ToLower();
+		string paramName = POSITION_NAME_ROOT + world;
+		
+		TStringArray names = new TStringArray();
+		GetSubParametersInStringArray( paramName, PluginConfigDebugProfileFixed.SUB_PARAM_POS_NAME, names );
+		TStringArray positions = new TStringArray();
+		GetSubParametersInStringArray( paramName, PluginConfigDebugProfileFixed.SUB_PARAM_POS_VEC, positions );
+		int i;
+		if (isCustom)
+		{
+			for ( i = names.Count() - 1; i >= 0 ; i--)
+			{
+				arr.Insert(new LocationParams(names.Get(i), isCustom, positions.Get(i).ToVector()));
+			}
+		}
+		else
+		{
+			for (i = 0; i < names.Count(); i++)
+			{
+				arr.Insert(new LocationParams(names.Get(i), isCustom, positions.Get(i).ToVector()));
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigDebugProfileFixed.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigDebugProfileFixed.c
new file mode 100644
index 0000000000000000000000000000000000000000..946c6781b9e188074713dda49fbe410eb425b15c
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigDebugProfileFixed.c
@@ -0,0 +1,23 @@
+class PluginConfigDebugProfileFixed extends PluginConfigDebugProfile
+{
+	const string POSITIONS_LIST			= "console_positions";
+	const string POSITIONS_LIST_ENOCH	= "console_positions_enoch";
+	const string SUB_PARAM_POS_NAME		= "name";
+	const string SUB_PARAM_POS_VEC		= "pos";
+	
+	//========================================
+	// PluginConfigDebugProfileFixed
+	//========================================
+	void PluginConfigDebugProfileFixed()
+	{
+		m_ReadOnly = true;
+	}
+	
+	//========================================
+	// GetFileName
+	//========================================
+	override string GetFileName()
+	{
+		return CFG_FILE_FIXED_PROFILE;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigEmotesProfile.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigEmotesProfile.c
new file mode 100644
index 0000000000000000000000000000000000000000..c30bf1b6b7e0b89d04906b35412f9b192c04ee85
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigEmotesProfile.c
@@ -0,0 +1,244 @@
+class PluginConfigEmotesProfile extends PluginConfigHandler
+{	
+	/*protected const string EMOTE_1				= "emote_slot_1";
+	protected const string EMOTE_2				= "emote_slot_2";
+	protected const string EMOTE_3				= "emote_slot_3";
+	protected const string EMOTE_4				= "emote_slot_4";
+	protected const string EMOTE_5				= "emote_slot_5";
+	protected const string EMOTE_6				= "emote_slot_6";
+	protected const string EMOTE_7				= "emote_slot_7";
+	protected const string EMOTE_8				= "emote_slot_8";
+	protected const string EMOTE_9				= "emote_slot_9";
+	protected const string EMOTE_10				= "emote_slot_10";
+	protected const string EMOTE_11				= "emote_slot_11";
+	protected const string EMOTE_12				= "emote_slot_12";*/
+
+	protected ref map<string, ref CfgParam>		m_DefaultValues;
+	protected ref TStringArray 					m_PresetList;	
+	
+	//========================================
+	// GetInstance
+	//========================================
+	static PluginConfigEmotesProfile GetInstance()
+	{
+		return PluginConfigEmotesProfile.Cast( GetPlugin(PluginConfigEmotesProfile) );
+	}	
+	
+
+	//========================================
+	// GetCfgParamInt
+	//========================================
+	protected CfgParamInt GetNewCfgParamInt( int value )
+	{
+		CfgParamInt param = new CfgParamInt( "" );
+		param.SetValue( value );
+		return param;
+	}
+	
+	//========================================
+	// Int
+	//========================================
+	protected CfgParamInt SetInt( string key, int value )
+	{
+		CfgParamInt param = CfgParamInt.Cast( GetParamByName( key, CFG_TYPE_INT ) );
+		param.SetValue( value );
+		//SaveConfigToFile();
+		return param;
+	}
+
+	protected int GetInt( string key )
+	{
+		if ( ParamExist(key) )
+		{
+			CfgParamInt param = CfgParamInt.Cast( GetParamByName( key, CFG_TYPE_INT ) );
+			return param.GetValue();
+		}
+		else
+		{
+			if ( m_DefaultValues.Contains(key) )
+			{
+				CfgParamInt default_param = CfgParamInt.Cast( m_DefaultValues.Get( key ) );
+				return SetInt( key, default_param.GetValue() ).GetValue();
+			}
+			else
+			{
+				return SetInt( key, 0 ).GetValue();
+			}
+		}
+	}
+	
+	//========================================
+	// PluginConfigEmotesProfile
+	//========================================
+	void PluginConfigEmotesProfile()
+	{
+		m_DefaultValues = new map<string, ref CfgParam>;
+		//Here you can configure default EMOTES
+
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_1.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_GREETING) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_2.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_SOS) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_3.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_HEART) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_4.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_TAUNT) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_5.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_SURRENDER) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_6.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_TAUNTKISS) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_7.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_POINT) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_8.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_TAUNTELBOW) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_9.ToString(),  GetNewCfgParamInt(EmoteConstants.ID_EMOTE_THUMB) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_10.ToString(), GetNewCfgParamInt(EmoteConstants.ID_EMOTE_THROAT) );
+		m_DefaultValues.Insert( EmoteSlots.EMOTE_11.ToString(), GetNewCfgParamInt(EmoteConstants.ID_EMOTE_SUICIDE) );
+		//m_DefaultValues.Insert( EMOTE_12, GetNewCfgParamInt(EmoteConstants.ID_EMOTE_DANCE) );
+		//m_DefaultValues.Insert( EMOTE_12, GetNewCfgParamInt(EmoteConstants.ID_EMOTE_SOS) );
+	}
+	
+	//========================================
+	// GetFileName
+	//========================================
+	override string GetFileName()
+	{
+		return CFG_FILE_EMOTES_PROFILE;
+	}
+
+	//========================================
+	// EmoteStoring
+	//========================================		
+	int GetEmoteSlot1()
+	{
+		return GetInt( EmoteSlots.EMOTE_1.ToString() );
+	}
+
+	void SetEmoteSlot1( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_1.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot2()
+	{
+		return GetInt( EmoteSlots.EMOTE_2.ToString() );
+	}
+
+	void SetEmoteSlot2( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_2.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot3()
+	{
+		return GetInt( EmoteSlots.EMOTE_3.ToString() );
+	}
+
+	void SetEmoteSlot3( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_3.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot4()
+	{
+		return GetInt( EmoteSlots.EMOTE_4.ToString() );
+	}
+
+	void SetEmoteSlot4( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_4.ToString(), emoted_id );
+	}
+
+	int GetEmoteSlot5()
+	{
+		return GetInt( EmoteSlots.EMOTE_5.ToString() );
+	}
+
+	void SetEmoteSlot5( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_5.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot6()
+	{
+		return GetInt( EmoteSlots.EMOTE_6.ToString() );
+	}
+
+	void SetEmoteSlot6( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_6.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot7()
+	{
+		return GetInt( EmoteSlots.EMOTE_7.ToString() );
+	}
+
+	void SetEmoteSlot7( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_7.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot8()
+	{
+		return GetInt( EmoteSlots.EMOTE_8.ToString() );
+	}
+
+	void SetEmoteSlot8( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_8.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot9()
+	{
+		return GetInt( EmoteSlots.EMOTE_9.ToString() );
+	}
+
+	void SetEmoteSlot9( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_9.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot10()
+	{
+		return GetInt( EmoteSlots.EMOTE_10.ToString() );
+	}
+
+	void SetEmoteSlot10( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_10.ToString(), emoted_id );
+	}
+	
+	int GetEmoteSlot11()
+	{
+		return GetInt( EmoteSlots.EMOTE_11.ToString() );
+	}
+
+	void SetEmoteSlot11( int emoted_id )
+	{
+		SetInt( EmoteSlots.EMOTE_11.ToString(), emoted_id );
+	}
+	
+	/*int GetEmoteSlot12()
+	{
+		return GetInt( EMOTE_12 );
+	}
+
+	void SetEmoteSlot12( int emoted_id )
+	{
+		SetInt( EMOTE_12, emoted_id );
+	}*/
+	
+	int GetEmoteFromSlot(string slot)
+	{
+		return GetInt( slot );
+	}
+}
+
+enum EmoteSlots
+{
+	EMOTE_1 = 1,
+	EMOTE_2,
+	EMOTE_3,
+	EMOTE_4,
+	EMOTE_5,
+	EMOTE_6,
+	EMOTE_7,
+	EMOTE_8,
+	EMOTE_9,
+	EMOTE_10,
+	EMOTE_11,
+	EMOTE_12
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigScene.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigScene.c
new file mode 100644
index 0000000000000000000000000000000000000000..596fb39cb5248c753e2f12a3f02155927af173c7
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginConfigScene.c
@@ -0,0 +1,611 @@
+class PluginConfigScene extends PluginConfigHandler
+{
+	protected string FILE_ROOT					= "$saves:";
+	protected const string FILE_ROOT_SCENES		= "scenes";
+	
+	protected const string PARAM_MISSION		= "Mission";
+	protected const string PARAM_TIME			= "InitTime";
+	protected const string PARAM_YEAR			= "InitYear";
+	protected const string PARAM_MONTH			= "InitMonth";
+	protected const string PARAM_DAY			= "InitDay";
+	protected const string PARAM_HOUR			= "InitHour";
+	protected const string PARAM_MINUTE			= "InitMinute";
+	protected const string PARAM_OVERCAST		= "WeatherInitOvercast";
+	protected const string PARAM_RAIN			= "WeatherInitRain";
+	protected const string PARAM_FOG			= "WeatherInitFog";
+	protected const string PARAM_WIND_F			= "WeatherInitWindForce";
+	protected const string PARAM_PLAYER			= "Player";
+	protected const string PARAM_OBJ_COUNT		= "SceneObjectsCount";
+	protected const string PARAM_OBJ_NAME		= "SceneObject";
+	protected const string PARAM_OBJ_ATT		= "Att";
+	protected const string PARAM_OBJ_LNK		= "Lnk";
+	protected const string PARAM_OBJ_TYPE		= "type";
+	protected const string PARAM_OBJ_POS		= "position";
+	protected const string PARAM_OBJ_ROT		= "rotation";
+	protected const string PARAM_OBJ_DMG		= "damage";
+	protected const string PARAM_OBJ_HLT		= "health";
+	protected const string PARAM_OBJ_ISCR		= "init_script";
+	
+	TStringArray m_CfgTemplate;
+	
+	protected string m_FileSceneName;
+
+	//========================================
+	// OnInit
+	//========================================
+	override void OnInit()
+	{
+		//super.OnInit();
+			
+		FILE_ROOT = g_Game.GetMissionFolderPath();
+	}
+	
+	//========================================
+	// GetPathScenes
+	//========================================
+	string GetPathScenes()
+	{	
+		return FILE_ROOT+"\\"+FILE_ROOT_SCENES;
+	}
+
+	//========================================
+	// GetFileName
+	//========================================
+	override string GetFileName()
+	{
+		return GetPathScenes()+"\\"+m_FileSceneName;
+	}
+
+	//========================================
+	// SceneRename
+	//========================================
+	void SceneRename(string scene_name, string scene_name_new)
+	{
+		string file_path = GetPathScenes()+"\\"+scene_name+"."+PluginSceneManager.SCENE_SUFIX;
+		string file_path_new = GetPathScenes()+"\\"+scene_name_new+"."+PluginSceneManager.SCENE_SUFIX;
+		PluginFileHandler.FileRename(file_path, file_path_new);
+	}
+
+	//========================================
+	// SceneDelete
+	//========================================
+	void SceneDelete(string scene_name)
+	{
+		string file_path = GetPathScenes()+"\\"+scene_name+"."+PluginSceneManager.SCENE_SUFIX;
+		PluginFileHandler.FileDelete(file_path);
+	}
+
+	//========================================
+	// SceneDuplicate
+	//========================================
+	void SceneDuplicate(string scene_name)
+	{
+		string file_path = GetPathScenes()+"\\"+scene_name+"."+PluginSceneManager.SCENE_SUFIX;
+		string file_path_new = file_path;
+		
+		int i = 0;
+		while ( FileExist(file_path_new) )
+		{
+			file_path_new = GetPathScenes()+"\\"+scene_name+"_copy"+i.ToString()+"."+PluginSceneManager.SCENE_SUFIX;
+			i++;
+		}
+		
+		PluginFileHandler.FileDuplicate(file_path, file_path_new);
+	}
+
+	//========================================
+	// GetSceneList
+	//========================================	
+	TStringArray GetSceneList()
+	{
+		if ( !FileExist( GetPathScenes() ) )
+		{
+			MakeDirectory( GetPathScenes() );
+		}
+		
+		string	file_name;
+		int 	file_attr;
+		int		flags;
+		TStringArray list = new TStringArray;
+		
+		string path_find_pattern = GetPathScenes()+"/*."+PluginSceneManager.SCENE_SUFIX; //*/
+		FindFileHandle file_handler = FindFile(path_find_pattern, file_name, file_attr, flags);
+		
+		bool found = true;
+		while ( found )
+		{
+			int pos = file_name.IndexOf(".");
+			
+			if ( pos > -1 )
+			{
+				list.Insert( file_name.Substring(0, pos) );
+			}
+			
+			found = FindNextFile(file_handler, file_name, file_attr);
+		}
+		
+		return list;
+	}
+
+	//========================================
+	// EncodeInitScript
+	//========================================	
+	string EncodeInitScript( string script )
+	{
+		script.Replace( "\"", "^" );
+		script.Replace( "\n", "$" );
+		return script;
+	}
+
+	//========================================
+	// DecodeInitScript
+	//========================================	
+	string DecodeInitScript( string script )
+	{
+		script.Replace( "^", "\"" );
+		script.Replace( "$", "\n" );
+		return script;
+	}
+
+//=====================================================================================
+//=====================================================================================
+// SAVE SCENE
+//=====================================================================================
+//=====================================================================================	
+	
+	//========================================
+	// SceneSave
+	//========================================	
+	void SceneDataSave(SceneData scene)
+	{
+		PluginSceneManager module_scene_editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+		
+		EntityAI player = PluginSceneManager.PLAYER;
+		
+		// Log("Saving started....")
+		m_FileSceneName = scene.GetNameScene()+"."+PluginSceneManager.SCENE_SUFIX;
+		
+		// Save Settings
+		SaveSceneSettings(scene);
+		
+		// Save Weater
+		SaveSceneWeather(scene);
+		
+		// Save Players
+		SaveScenePlayer(scene);
+		
+		// Save Objects
+		SaveSceneObjects(scene);		
+		
+		// Save To File
+		SaveConfigToFile();
+	}
+	
+	
+	//=============================================
+	// SAVE: SaveSceneSettings (Mission Name, Time, Year, Month, Day, Hour, Minute)
+	//=============================================
+	void SaveSceneSettings(SceneData scene)
+	{
+		// Save Mission Name
+		CfgParamString cfg_mission = CfgParamString.Cast( GetParamByName(PARAM_MISSION, CFG_TYPE_STRING) );
+		cfg_mission.SetValue(scene.GetNameMission());
+				
+		// Save Time
+		CfgParamFloat cfg_time = CfgParamFloat.Cast( GetParamByName(PARAM_TIME, CFG_TYPE_FLOAT) );
+		cfg_time.SetValue(scene.GetInitTime());
+		
+		// Save Year
+		CfgParamInt cfg_year = CfgParamInt.Cast( GetParamByName(PARAM_YEAR, CFG_TYPE_INT) );
+		cfg_year.SetValue(scene.GetInitYear());
+		
+		// Save Month
+		CfgParamInt cfg_month = CfgParamInt.Cast( GetParamByName(PARAM_MONTH, CFG_TYPE_INT) );
+		cfg_month.SetValue(scene.GetInitMonth());
+		
+		// Save Day
+		CfgParamInt cfg_day = CfgParamInt.Cast( GetParamByName(PARAM_DAY, CFG_TYPE_INT) );
+		cfg_day.SetValue(scene.GetInitDay());
+		
+		// Save Hour
+		CfgParamInt cfg_hour = CfgParamInt.Cast( GetParamByName(PARAM_HOUR, CFG_TYPE_INT) );
+		cfg_hour.SetValue(scene.GetInitHour());
+		
+		// Save Minute
+		CfgParamInt cfg_minute = CfgParamInt.Cast( GetParamByName(PARAM_MINUTE, CFG_TYPE_INT) );
+		cfg_minute.SetValue(scene.GetInitMinute());
+	}
+	
+	//=============================================
+	// SAVE: SaveSceneWeather (Overcast, Rain, Fog, Wind Force)
+	//=============================================
+	void SaveSceneWeather(SceneData scene)
+	{
+		// Save Weather Overcast
+		CfgParamFloat cfg_overcast = CfgParamFloat.Cast( GetParamByName(PARAM_OVERCAST, CFG_TYPE_FLOAT) );
+		cfg_overcast.SetValue(scene.GetInitOvercast());
+		
+		// Save Weather Rain
+		CfgParamFloat cfg_rain = CfgParamFloat.Cast( GetParamByName(PARAM_RAIN, CFG_TYPE_FLOAT) );
+		cfg_rain.SetValue(scene.GetInitRain());
+				
+		// Save Weather Fog
+		CfgParamFloat cfg_fog = CfgParamFloat.Cast( GetParamByName(PARAM_FOG, CFG_TYPE_FLOAT) );
+		cfg_fog.SetValue(scene.GetInitFog());
+		
+		// Save Weather Wind Force
+		CfgParamFloat cfg_wind_force = CfgParamFloat.Cast( GetParamByName(PARAM_WIND_F, CFG_TYPE_FLOAT) );
+		cfg_wind_force.SetValue(scene.GetInitWindForce());
+	}
+	
+	//=============================================
+	// SAVE: SaveScenePlayer (position, rotation, health, script)
+	//=============================================
+	void SaveScenePlayer(SceneData scene)
+	{
+		array<ref ScenePlayer> players = scene.GetScenePlayers();
+		
+		if ( players.Count() > 0 )
+		{
+			ScenePlayer plyr = players.Get(0);
+						
+			// Save Player
+			CfgParamArray cfg_param_player = CfgParamArray.Cast( GetParamByName(PARAM_PLAYER, CFG_TYPE_ARRAY) );
+			
+			// Obj Position
+			CfgParamString cfg_param_player_pos = CfgParamString.Cast( cfg_param_player.GetValueByName(PARAM_OBJ_POS, CFG_TYPE_STRING) );
+			cfg_param_player_pos.SetValue(plyr.GetPositionAsString());
+			
+			// Obj Rotation
+			CfgParamFloat cfg_param_player_rot = CfgParamFloat.Cast( cfg_param_player.GetValueByName(PARAM_OBJ_ROT, CFG_TYPE_FLOAT) );
+			cfg_param_player_rot.SetValue(plyr.GetRotation());
+		
+			// Obj Health
+			CfgParamFloat cfg_param_player_hlt = CfgParamFloat.Cast( cfg_param_player.GetValueByName(PARAM_OBJ_HLT, CFG_TYPE_FLOAT) );
+			cfg_param_player_hlt.SetValue(plyr.GetHealth());
+			
+			// Obj Init Script
+			CfgParamString cfg_param_player_iscr = CfgParamString.Cast( cfg_param_player.GetValueByName(PARAM_OBJ_ISCR, CFG_TYPE_STRING) );
+			cfg_param_player_iscr.SetValue( EncodeInitScript(plyr.GetInitScript()) );
+		}
+	}
+	
+	//=============================================
+	// SAVE: SaveSceneObjects (position, rotation, health, script, scripted links)
+	//=============================================
+	void SaveSceneObjects(SceneData scene)
+	{
+		array<ref SceneObject> objects = scene.GetSceneObjects();
+		
+		// Save Objects
+		for ( int i = 0; i < objects.Count(); ++i )
+		{
+			SceneObject obj = objects.Get(i);
+			
+			string param_name;
+			
+			param_name = PARAM_OBJ_NAME+"_"+i.ToString();
+							
+			// Save Scene Object
+			CfgParamArray cfg_param_obj = CfgParamArray.Cast( GetParamByName(param_name, CFG_TYPE_ARRAY) );
+			
+			// Obj Type Name
+			CfgParamString cfg_param_obj_type = CfgParamString.Cast( cfg_param_obj.GetValueByName(PARAM_OBJ_TYPE, CFG_TYPE_STRING)  );
+			cfg_param_obj_type.SetValue(obj.GetTypeName());
+			
+			// Obj Position
+			CfgParamString cfg_param_obj_pos = CfgParamString.Cast( cfg_param_obj.GetValueByName(PARAM_OBJ_POS, CFG_TYPE_STRING)  );
+			cfg_param_obj_pos.SetValue(obj.GetPositionAsString());
+			
+			// Obj Rotation
+			CfgParamFloat cfg_param_obj_rot = CfgParamFloat.Cast( cfg_param_obj.GetValueByName(PARAM_OBJ_ROT, CFG_TYPE_FLOAT)  );
+			cfg_param_obj_rot.SetValue(obj.GetRotation());
+			
+			// Obj Health
+			CfgParamFloat cfg_param_obj_hlt = CfgParamFloat.Cast( cfg_param_obj.GetValueByName(PARAM_OBJ_HLT, CFG_TYPE_FLOAT)  );
+			cfg_param_obj_hlt.SetValue(obj.GetHealth());
+			
+			// Obj Init Script
+			CfgParamString cfg_param_obj_iscr = CfgParamString.Cast( cfg_param_obj.GetValueByName(PARAM_OBJ_ISCR, CFG_TYPE_STRING) );
+			cfg_param_obj_iscr.SetValue( EncodeInitScript(obj.GetInitScript()) );
+			
+			EntityAI e_obj = obj.GetObject();
+
+			int attcount = e_obj.GetInventory().AttachmentCount();
+				
+			if ( attcount > 0 )
+			{
+				string param_name_att = param_name+"_"+PARAM_OBJ_ATT;
+				CfgParamArray cfg_param_att = CfgParamArray.Cast( GetParamByName(param_name_att, CFG_TYPE_ARRAY) );
+				cfg_param_att.Clear();
+				
+				for (int att = 0; att < attcount; att++)
+				{	
+					EntityAI attachment = e_obj.GetInventory().GetAttachmentFromIndex(att);
+					
+					CfgParamString cfg_param_att_str = new CfgParamString("");
+					cfg_param_att_str.SetValue( attachment.GetType() );
+					cfg_param_att.InsertValue( cfg_param_att_str );
+				}
+			}
+			
+			array<SceneObject> linked_scene_objects = obj.GetLinkedSceneObjects();
+			if ( linked_scene_objects.Count() > 0 )
+			{
+				string param_name_lnk = param_name + "_" + PARAM_OBJ_LNK;
+				CfgParamArray cfg_param_lnk = CfgParamArray.Cast( GetParamByName( param_name_lnk, CFG_TYPE_ARRAY ) );
+				cfg_param_lnk.Clear();
+				
+				for ( int lnk = 0; lnk < linked_scene_objects.Count(); lnk++ )
+				{	
+					CfgParamInt cfg_param_lnk_int = new CfgParamInt("");
+					
+					int index = objects.Find( linked_scene_objects.Get(lnk) );
+					
+					if ( index >= 0 )
+					{
+						cfg_param_lnk_int.SetValue( index );
+						cfg_param_lnk.InsertValue( cfg_param_lnk_int );
+					}
+				}
+			}
+		}
+		
+		// Save Count Of objects
+		CfgParamInt cfg_obj_count = CfgParamInt.Cast( GetParamByName(PARAM_OBJ_COUNT, CFG_TYPE_INT) );
+		cfg_obj_count.SetValue(objects.Count());
+	}
+	
+//=====================================================================================
+//=====================================================================================
+// LOAD SCENE
+//=====================================================================================
+//=====================================================================================
+
+	//=============================================
+	// LOAD: SceneDataLoad (Settings, Weather, Player, Objects)
+	//=============================================
+	SceneData SceneDataLoad(string scene_name)
+	{
+		m_FileSceneName = scene_name+"."+PluginSceneManager.SCENE_SUFIX;
+		
+//PrintString("Loading scene: "+ scene_name);	
+		
+		LoadConfigFile();
+		
+		// Load Scene name
+		SceneData scene = new SceneData;
+		scene.SetNameScene(scene_name);
+		
+		// Load Scene settings
+		LoadSceneSettings(scene);
+		
+		// Load Scene Weather
+		LoadSceneWeather(scene);
+		
+		// Load Scene Player
+		LoadScenePlayer(scene);
+		
+		// Load Scene Objects
+		LoadSceneObjects(scene);
+		
+		if ( !FileExist(GetFileName()) )
+		{
+			SceneDataSave(scene);
+		}
+		
+		return scene;
+	}
+	
+	//=============================================
+	// LOAD: LoadSceneSettings (Mission Name, Time, Year, Month, Day, Hour, Minute)
+	//=============================================
+	void LoadSceneSettings(SceneData scene)
+	{
+		// Load Mission Name
+		CfgParamString cfg_mission = CfgParamString.Cast( GetParamByName(PARAM_MISSION, CFG_TYPE_STRING) );
+		scene.SetNameMission(cfg_mission.GetValue());
+				
+		// Load Time
+		CfgParamFloat cfg_time = CfgParamFloat.Cast( GetParamByName(PARAM_TIME, CFG_TYPE_FLOAT) );
+		scene.SetInitTime(cfg_time.GetValue());
+		
+		int year, month, day, hour, minute;
+		GetGame().GetWorld().GetDate( year, month, day, hour, minute );
+		
+		// Load Year
+		if ( ParamExist(PARAM_YEAR) )
+		{
+			CfgParamInt cfg_year = CfgParamInt.Cast( GetParamByName( PARAM_YEAR, CFG_TYPE_INT ) );
+			scene.SetInitYear( cfg_year.GetValue() );
+		}
+		else
+		{
+			scene.SetInitYear( year );
+		}
+		
+		// Load Month
+		if ( ParamExist(PARAM_MONTH) )
+		{
+			CfgParamInt cfg_month = CfgParamInt.Cast( GetParamByName( PARAM_MONTH, CFG_TYPE_INT ) );
+			scene.SetInitMonth( cfg_month.GetValue() );
+		}
+		else
+		{
+			scene.SetInitMonth( month );
+		}
+		
+		// Load Day
+		if ( ParamExist(PARAM_DAY) )
+		{
+			CfgParamInt cfg_day = CfgParamInt.Cast(  GetParamByName( PARAM_DAY, CFG_TYPE_INT ) );
+			scene.SetInitDay( cfg_day.GetValue() );
+		}
+		else
+		{
+			scene.SetInitDay( day );
+		}
+		
+		// Load Hour
+		if ( ParamExist(PARAM_HOUR) )
+		{
+			CfgParamInt cfg_hour = CfgParamInt.Cast( GetParamByName( PARAM_HOUR, CFG_TYPE_INT ) );
+			scene.SetInitHour( cfg_hour.GetValue() );
+		}
+		else
+		{
+			scene.SetInitHour( hour );
+		}
+		
+		// Load Minute
+		if ( ParamExist(PARAM_MINUTE) )
+		{
+			CfgParamInt cfg_minute = CfgParamInt.Cast( GetParamByName( PARAM_MINUTE, CFG_TYPE_INT ) );
+			scene.SetInitMinute( cfg_minute.GetValue() );
+		}
+		else
+		{
+			scene.SetInitMinute( minute );
+		}
+	}
+	
+	//=============================================
+	// LOAD: LoadSceneWeather (Overcast, Rain, Fog, Wind Force)
+	//=============================================
+	void LoadSceneWeather(SceneData scene)
+	{
+		//Load Weather Overcast
+		if ( ParamExist(PARAM_OVERCAST) )
+		{   
+			CfgParamFloat cfg_overcast = CfgParamFloat.Cast( GetParamByName(PARAM_OVERCAST, CFG_TYPE_FLOAT) );
+			scene.SetInitOvercast(cfg_overcast.GetValue());
+		}
+
+		//Load Weather Rain
+		if ( ParamExist(PARAM_RAIN) )
+		{
+			CfgParamFloat cfg_rain = CfgParamFloat.Cast( GetParamByName(PARAM_RAIN, CFG_TYPE_FLOAT) );
+			scene.SetInitRain(cfg_rain.GetValue());
+		}
+
+		//Load Weather Fog
+		if ( ParamExist(PARAM_FOG) )
+		{
+			CfgParamFloat cfg_fog = CfgParamFloat.Cast( GetParamByName(PARAM_FOG, CFG_TYPE_FLOAT) );
+			scene.SetInitFog(cfg_fog.GetValue());
+		}
+
+		//Load Weather Wind Force
+		if ( ParamExist(PARAM_WIND_F) )
+		{
+			CfgParamFloat cfg_wind_force = CfgParamFloat.Cast( GetParamByName(PARAM_WIND_F, CFG_TYPE_FLOAT) );
+			scene.SetInitWindForce(cfg_wind_force.GetValue());
+		}
+	}
+	
+	//=============================================
+	// LOAD: LoadScenePlayer (position, rotation, health, script)
+	//=============================================
+	void LoadScenePlayer(SceneData scene)
+	{
+		// Only in local game (without server, (GetGame.GetPlayer is null on server! -> by design)
+		if ( GetGame().GetPlayer() != NULL )
+		{
+			CfgParamArray 	cfg_player 		= CfgParamArray.Cast( GetParamByName(PARAM_PLAYER, CFG_TYPE_ARRAY) );			
+			CfgParamString	cfg_ply_pos		= CfgParamString.Cast( cfg_player.GetValueByName(PARAM_OBJ_POS, CFG_TYPE_STRING) );
+			CfgParamFloat	cfg_ply_rot		= CfgParamFloat.Cast( cfg_player.GetValueByName(PARAM_OBJ_ROT, CFG_TYPE_FLOAT) );			
+			CfgParamFloat	cfg_ply_hlt		= CfgParamFloat.Cast( cfg_player.GetValueByName(PARAM_OBJ_HLT, CFG_TYPE_FLOAT) );
+			CfgParamString	cfg_ply_iscr	= CfgParamString.Cast( cfg_player.GetValueByName(PARAM_OBJ_ISCR, CFG_TYPE_STRING) );
+			
+			ScenePlayer scn_player = scene.CreateScenePlayer();
+			scn_player.LinkEntityAI(GetGame().GetPlayer());
+			
+			if ( PluginSceneManager.GetInstance().GetLoadPlayerPos() )
+			{
+				// start scene position
+				vector start_pos = cfg_ply_pos.GetValue().ToVector();
+				
+				if ( start_pos != vector.Zero )
+				{
+					// Set Position
+					scn_player.SetPosition(cfg_ply_pos.GetValue().ToVector());
+					
+					// Set Rotation
+					scn_player.SetRotation(cfg_ply_rot.GetValue());
+				}
+			}
+			
+			// Set Health
+			// Health check. Do not spawn player character as dead. He can still be spawned as injured.
+			float health2 = cfg_ply_hlt.GetValue();
+			if (health2 <= 0)
+				health2 = scn_player.GetMaxHealth();
+			
+			scn_player.SetHealth(health2);
+			
+			// Exe Script
+			scn_player.SetInitScript( DecodeInitScript(cfg_ply_iscr.GetValue()) );
+		}
+//PrintString("LoadScenePlayer.. Finished");
+	}
+	
+	//=============================================
+	// LOAD: LoadSceneObjects (position, rotation, health, script, scripted links)
+	//=============================================
+	void LoadSceneObjects(SceneData scene)
+	{
+		CfgParamInt cfg_obj_count = CfgParamInt.Cast( GetParamByName(PARAM_OBJ_COUNT, CFG_TYPE_INT) );
+		int obj_count = cfg_obj_count.GetValue();
+		
+		for ( int i = 0; i < obj_count; ++i )
+		{
+			string param_name = PARAM_OBJ_NAME+"_"+i.ToString();
+			
+			// Load scene object name
+			CfgParamArray cfg_obj = CfgParamArray.Cast( GetParamByName(param_name, CFG_TYPE_ARRAY) );
+			
+			CfgParamString	cfg_obj_type	= CfgParamString.Cast( cfg_obj.GetValueByName(PARAM_OBJ_TYPE, CFG_TYPE_STRING) );
+			CfgParamString	cfg_obj_pos		= CfgParamString.Cast( cfg_obj.GetValueByName(PARAM_OBJ_POS, CFG_TYPE_STRING) );
+			CfgParamFloat	cfg_obj_rot		= CfgParamFloat.Cast( cfg_obj.GetValueByName(PARAM_OBJ_ROT, CFG_TYPE_FLOAT) );
+			CfgParamFloat	cfg_obj_hlt		= CfgParamFloat.Cast( cfg_obj.GetValueByName(PARAM_OBJ_HLT, CFG_TYPE_FLOAT) );
+			CfgParamString	cfg_obj_iscr	= CfgParamString.Cast( cfg_obj.GetValueByName(PARAM_OBJ_ISCR, CFG_TYPE_STRING) );
+			
+//PrintString(itoa(i)+ " Loading param_name: "+ param_name+ " => object type: "+ cfg_obj_type.GetValue());
+			
+			// Create Scene Object + position
+			SceneObject scn_obj = scene.CreateSceneObject(cfg_obj_type.GetValue(), cfg_obj_pos.GetValue().ToVector());
+			
+			// Setup rotation
+			scn_obj.SetRotation(cfg_obj_rot.GetValue());
+			// Setup health
+			scn_obj.SetHealth(cfg_obj_hlt.GetValue());
+			// Setup init script
+			scn_obj.SetInitScript( DecodeInitScript(cfg_obj_iscr.GetValue()) );
+			
+			// Setup indices for linked objects
+			CfgParamArray cfg_obj_param_links = CfgParamArray.Cast( GetParamByName(param_name + "_" + PARAM_OBJ_LNK, CFG_TYPE_ARRAY) );
+			array<ref CfgParam> cfg_obj_links = cfg_obj_param_links.GetValues();
+			
+			for ( int lnko = 0; lnko < cfg_obj_links.Count(); lnko++ )
+			{
+				CfgParamInt cfg_obj_param_lnk_int = CfgParamInt.Cast( cfg_obj_links.Get(lnko) );
+				scn_obj.m_LinkedSceneObjectsIndices.Insert( cfg_obj_param_lnk_int.GetValue() );
+			}
+			
+			string param_name_att = param_name +"_"+ PARAM_OBJ_ATT;
+			
+			if ( ParamExist(param_name_att) )
+			{				
+				CfgParamArray cfg_param_att = CfgParamArray.Cast( GetParamByName(param_name_att, CFG_TYPE_ARRAY) );
+				
+				array<ref CfgParam> cfg_param_attachments = cfg_param_att.GetValues();
+				
+				for ( int j = 0; j < cfg_param_attachments.Count(); ++j )
+				{
+					CfgParamString cfg_param_att_str = CfgParamString.Cast( cfg_param_attachments.Get(j) );
+					scn_obj.GetObject().GetInventory().CreateAttachment( cfg_param_att_str.GetValue() );
+				}
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginMissionConfig.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginMissionConfig.c
new file mode 100644
index 0000000000000000000000000000000000000000..468777d24f79f1b7d0e1f585065ffc71f08b9c97
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginConfigHandler/PluginMissionConfig.c
@@ -0,0 +1,63 @@
+class PluginMissionConfig extends PluginConfigHandler
+{	
+	protected const string FILE_NAME				= "scene_editor.cfg";
+	protected const string SCENE_EDITOR_SCENE		= "scene_load";
+	
+	//========================================
+	// GetInstance
+	//========================================
+	static PluginMissionConfig GetInstance()
+	{
+		return PluginMissionConfig.Cast( GetPlugin(PluginMissionConfig) );
+	}
+	
+	//========================================
+	// OnInit
+	//========================================
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		CfgParamString cfg_scene_name = CfgParamString.Cast( GetParamByName( SCENE_EDITOR_SCENE, CFG_TYPE_STRING ) );
+		
+		if ( cfg_scene_name.GetValue() == STRING_EMPTY )
+		{
+			cfg_scene_name.SetValue( PluginSceneManager.SCENE_DEFAULT_NAME );
+			SaveConfigToFile();
+		}
+	}
+	
+	//========================================
+	// GetFileName
+	//========================================
+	override string GetFileName()
+	{
+		return g_Game.GetMissionFolderPath() +"\\"+ FILE_NAME;
+	}
+
+	//========================================
+	// GetSceneEditorName
+	//========================================
+	string GetSceneEditorName()
+	{
+		CfgParamString cfg_scene_name = CfgParamString.Cast( GetParamByName( SCENE_EDITOR_SCENE, CFG_TYPE_STRING ) );
+		
+		if ( cfg_scene_name.GetValue() == STRING_EMPTY )
+		{
+			cfg_scene_name.SetValue( PluginSceneManager.SCENE_DEFAULT_NAME );
+			SaveConfigToFile();
+		}
+		
+		return cfg_scene_name.GetValue();
+	}
+
+	//========================================
+	// SetSceneEditorName
+	//========================================
+	void SetSceneEditorName( string value )
+	{
+		CfgParamString cfg_scene_name = CfgParamString.Cast( GetParamByName( SCENE_EDITOR_SCENE, CFG_TYPE_STRING ) );
+		cfg_scene_name.SetValue( value );
+		SaveConfigToFile();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalEnscriptHistory.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalEnscriptHistory.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f4b0c871fc288c34aa9de8883995ad845be218d
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalEnscriptHistory.c
@@ -0,0 +1,34 @@
+class PluginLocalEnscriptHistory extends PluginLocalHistoryBase
+{	
+	override string GetSubFolderName()
+	{
+		return CFG_FILE_DEBUG_DIR;
+	}
+	
+	override string GetFileName()
+	{
+		if (!FileExist(GetSubFolderName()))//---ALL LINES CONTAINING THIS COMMENT CAN BE REMOVED IN 1.23
+			return "$profile:script_enscript.history";//---ALL LINES CONTAINING THIS COMMENT CAN BE REMOVED IN 1.23
+		
+		return GetSubFolderName() + CFG_FILE_ENS_HISTORY;
+	}
+}
+
+class PluginLocalEnscriptHistoryServer extends PluginLocalHistoryBase
+{	
+
+	override string GetSubFolderName()
+	{
+		return CFG_FILE_DEBUG_DIR;
+	}
+	
+	override string GetFileName()
+	{
+		if (!FileExist(GetSubFolderName()))//---ALL LINES CONTAINING THIS COMMENT CAN BE REMOVED IN 1.23
+			return "$profile:script_enscriptServer.history";//---ALL LINES CONTAINING THIS COMMENT CAN BE REMOVED IN 1.23
+		
+		return GetSubFolderName() + CFG_FILE_ENS_HISTORY_SERVER;
+	}
+
+}
+
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalHistoryBase.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalHistoryBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..3914a6cb07a0cb21137a032f465c2da31c46f97f
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalHistoryBase.c
@@ -0,0 +1,56 @@
+class PluginLocalHistoryBase extends PluginFileHandler
+{	
+	void PluginLocalHistoryBase()
+	{
+		m_ReadOnly = false;
+	}
+		
+	void ~PluginLocalHistoryBase()
+	{
+	}
+	
+	override void OnInit()
+	{
+		super.OnInit();
+	}
+	
+	override string GetFileName()
+	{
+		Error( "Cannot call GetFileName on Base class PluginLocalHistoryBase" );
+		return STRING_EMPTY;
+	}
+	
+	void AddNewLine(string text)
+	{
+		// replace newline to \\n
+		text.Replace("\n", "\\n" );
+		m_FileContent.Insert(text);
+		SaveFile();
+	}
+
+	TStringArray GetAllLines()
+	{
+		// replace \\n to new line
+		TStringArray console_history = new TStringArray;
+		for ( int i = 0; i < m_FileContent.Count(); i++)
+		{
+			string history_record = m_FileContent.Get(i);
+			history_record.Replace("\\n", "\n");
+			console_history.Insert( history_record );
+		}
+		return console_history;
+	}
+
+	TStringArray GetLastLine()
+	{
+		int count = m_FileContent.Count();
+		string ret = "";
+		
+		if ( count > 0 )
+		{
+			ret = m_FileContent.Get(count - 1);
+		}
+		
+		return NULL;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile.c
new file mode 100644
index 0000000000000000000000000000000000000000..653bf606352cd7ff78ee911af66587a1426083b6
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile.c
@@ -0,0 +1,605 @@
+class PluginLocalProfile extends PluginFileHandler
+{
+	ref map<string, string>						m_ConfigParams;
+	ref map<string, ref TStringArray>				m_ConfigParamsArray;
+	ref map<string, ref map<string, string>>		m_ConfigParamsInArray;
+	ref map<string, ref array<ref map<string, string>>>	m_ConfigParamsArrayInArray;
+	
+	void PluginLocalProfile()
+	{
+		m_ConfigParams				= new map<string, string>;
+		m_ConfigParamsArray			= new map<string, ref TStringArray>;
+		m_ConfigParamsInArray		= new map<string, ref map<string, string>>;
+		m_ConfigParamsArrayInArray	= new map<string, ref array<ref map<string, string>>>;
+	}
+
+	override string GetFileName()
+	{
+		return CFG_FILE_USER_PROFILE;
+	}
+
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		LoadConfigFile();
+	}
+	
+	bool LoadConfigFile()
+	{
+		TStringArray file_content = GetFileContent();
+		
+		string line_content = "";
+		string param_name = "";
+		string param_value = "";
+		TStringArray param_content;
+		int pos_sep = -1;
+		
+		for ( int i = 0; i < file_content.Count(); ++i )
+		{
+			line_content = file_content.Get(i);
+			
+			param_content = ParseTextToParameter(line_content);
+		
+			if ( param_content.Count() == 0 )
+			{
+				PrintString(GetFileName()+"("+i.ToString()+"): Error in config -> Maybe missing '=' !");
+				return false;			
+			}
+			
+			param_name	= param_content.Get(0);
+			param_value	= param_content.Get(1);
+			
+			//{{name = apple, damage = 0.5, quantity = 2},{name = banana, damage = 0.5, quantity = 2}}
+			
+			TStringArray array_items = new TStringArray;
+			ParseTextToArray(param_value, array_items);
+			//{name = apple, damage = 0.5, quantity = 2}
+			//{name = banana, damage = 0.5, quantity = 2}
+			
+			TStringArray array_content_raw = new TStringArray;
+			
+			if ( array_items.Count() > 0 )
+			{
+				m_ConfigParamsArray.Set(param_name, array_items);
+				
+				for ( int j = 0; j < array_items.Count(); ++j )
+				{
+					string array_content = array_items.Get(j);
+					//{name = apple, damage = 0.5, quantity = 2}
+					
+					array_content_raw.Clear();
+					
+					ParseTextToArray(array_content, array_content_raw);
+					//name = apple
+					//damage = 0.5
+					//quantity = 2
+					
+					if ( array_content_raw.Count() > 0 )
+					{
+						if ( !m_ConfigParamsArrayInArray.Contains(param_name) )
+						{
+							m_ConfigParamsArrayInArray.Set(param_name, new array<ref map<string, string>>);
+						}
+						
+						array<ref map<string, string>> params_in_array = m_ConfigParamsArrayInArray.Get(param_name);					
+						map<string, string> parameters = new map<string, string>;
+						
+						for ( int k = 0; k < array_content_raw.Count(); ++k )
+						{
+							string params = array_content_raw.Get(k);
+							TStringArray p = ParseTextToParameter(params);
+							
+							if ( p.Count() == 2 )
+							{
+								parameters.Set(p.Get(0), p.Get(1));
+							}
+						}
+						
+						params_in_array.Insert(parameters);					
+					}
+				}
+			}
+			else
+			{
+				m_ConfigParams.Set(param_name, param_value);
+			}
+		}
+		
+		return true;
+	}
+
+	void SaveConfigToFile()
+	{
+		ClearFileNoSave();
+		
+		int i;
+		int j;
+		int k;
+		
+		string variable_name;
+		string variable_value;
+		string text;
+		TStringArray variable_array;
+		
+		for ( i = 0; i < m_ConfigParams.Count(); ++i)
+		{
+			variable_name = m_ConfigParams.GetKey(i);
+			variable_value = m_ConfigParams.GetElement(i);
+			
+			text = variable_name + " = " + variable_value;
+			
+			AddNewLineNoSave(text);
+		}
+		
+		for ( i = 0; i < m_ConfigParamsArray.Count(); ++i)
+		{
+			variable_name = m_ConfigParamsArray.GetKey(i);
+			variable_array = m_ConfigParamsArray.GetElement(i);
+			
+			if ( m_ConfigParamsArrayInArray.Contains(variable_name) )
+			{
+				continue;
+			}
+			
+			text = variable_name + " = {";
+			
+			for ( j = 0; j < variable_array.Count(); ++j )
+			{
+				if ( j > 0 )
+				{
+					text += ",";
+				}
+				
+				text += variable_array.Get(j);			
+			}
+			
+			text += "}";
+			
+			AddNewLineNoSave(text);
+		}
+		
+		for ( i = 0; i < m_ConfigParamsArrayInArray.Count(); ++i)
+		{
+			variable_name								= m_ConfigParamsArrayInArray.GetKey(i);
+			array<ref map<string, string>>	variable_param	= m_ConfigParamsArrayInArray.GetElement(i);
+			
+			text = variable_name + " = {";
+			
+			if ( variable_param != NULL )
+			{
+				for ( j = 0; j < variable_param.Count(); ++j )
+				{
+					if ( j > 0 )
+					{
+						text += ",";
+					}			
+					text += "{";
+					
+					map<string, string> params = variable_param.Get(j);
+					for ( k = 0; k < params.Count(); ++k )
+					{
+						if ( k > 0 )
+						{
+							text += ",";
+						}
+						
+						string param_name = params.GetKey(k);
+						string param_value = params.GetElement(k);
+						
+						text += param_name+"="+param_value;
+					}
+					
+					text += "}";
+				}
+			}
+			
+			text += "}";
+			
+			AddNewLineNoSave(text);
+		}
+		
+		SaveFile();
+	}
+	
+	bool IsTextArray(string text)
+	{
+		if ( text.Length() > 0 && text.Substring(0, 1) == "{" )
+		{
+			if ( text.Substring(text.Length() - 1, 1) == "}" )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	TStringArray ParseTextToParameter(string text)
+	{
+		TStringArray ret = new TStringArray;
+		
+		int pos = text.IndexOf("=");
+			
+		if ( pos > 0 )
+		{
+			string param_name = text.Substring(0, pos).Trim();
+			int pos_end = text.Length() - pos;
+			string param_value = text.Substring(pos + 1, pos_end - 1).Trim();
+			
+			int lenght = param_value.Length();
+			if (lenght > 1 && param_value.Substring(0, 1) == "\"" && param_value.Substring(lenght - 1, 1) == "\"" )
+			{
+				param_value = param_value.Substring(1, lenght - 2);
+			}
+			
+			ret.Insert(param_name);
+			ret.Insert(param_value);
+		}
+		
+		return ret;
+	}
+
+	TStringArray ParseTextToArray(string text, out TStringArray ret)
+	{
+		if ( !IsTextArray(text) )
+		{
+			return NULL;
+		}
+		
+		text = text.Substring(1, text.Length() - 2);
+		
+		int pos_array_start = text.IndexOf("{");
+		int pos_array_end = text.IndexOf("}");
+		
+		if ( pos_array_start > -1 && pos_array_end > -1 )
+		{		
+			while ( true )
+			{
+				string array_value = text.Substring(pos_array_start , pos_array_end - pos_array_start + 1  );
+				ret.Insert(array_value);
+				
+				pos_array_start = text.IndexOfFrom(pos_array_end, "{");
+				pos_array_end = text.IndexOfFrom(pos_array_start, "}");
+				
+				if ( pos_array_start == -1 )
+				{
+					break;
+				}
+			}
+		}
+		else
+		{
+			text.Split(",", ret);
+		}
+		
+		return ret;
+	}
+
+	array<ref map<string, string>> ParseTextArrayToParameters(string text)
+	{
+		TStringArray array_items = new TStringArray;
+		ParseTextToArray(text, array_items);
+		
+		array<ref map<string, string>> ret = new array<ref map<string, string>>;
+		
+		map<string, string> ret_param = new map<string, string>;
+		
+		for ( int i = 0; i < array_items.Count(); ++i )
+		{
+			string param = array_items.Get(i);
+			TStringArray t_param = ParseTextToParameter(param);
+			
+			string param_name = t_param.Get(0);
+			string param_value = t_param.Get(1);
+			
+			ret_param.Set(param_name, param_value);
+		}
+		
+		ret.Insert(ret_param);	
+		
+		return ret;
+	}
+	
+	string LoadParameter(string param_name)
+	{
+		string ret_value = STRING_EMPTY;
+		
+		if ( m_ConfigParams.Contains(param_name) )
+		{
+			ret_value = m_ConfigParams.Get(param_name);
+		}
+
+		return ret_value;
+	}
+
+	TStringArray LoadParameterArray(string param_name)
+	{
+		if ( m_ConfigParamsArray.Contains(param_name) )
+		{
+			return m_ConfigParamsArray.Get(param_name);
+		}
+
+		return NULL;
+	}
+
+	string LoadSubParameter(string param_name, int sub_array_index, string sub_param_name)
+	{
+		string 						ret_value = STRING_EMPTY;
+		map<string, string>			param;
+		array<ref map<string, string>>	sub_arrays;
+		
+		if ( m_ConfigParamsArrayInArray.Contains(param_name) )
+		{
+			sub_arrays = m_ConfigParamsArrayInArray.Get(param_name);
+			
+			if ( sub_arrays != NULL )
+			{
+				if ( sub_array_index < sub_arrays.Count() )
+				{
+					param = sub_arrays.Get(sub_array_index);
+					
+					if ( param.Contains(sub_param_name) )
+					{
+						ret_value = param.Get(sub_param_name);
+					}
+				}		
+			}
+		}
+		
+		return ret_value;
+	}
+	
+	void SaveParameter(string param_name, string value, bool save_in_file = true)
+	{
+		if ( param_name == "" || param_name == "scene_editor_scene" )
+		{
+			Log("SaveParameter: "+param_name+" = "+value, "");
+		}
+		
+		m_ConfigParams.Set(param_name, value);
+		
+		if ( save_in_file )
+		{
+			SaveConfigToFile();	
+		}
+	}
+
+	void SaveParameterArray(string param_name, TStringArray value, bool save_in_file = true)
+	{
+		m_ConfigParamsArray.Set(param_name, value);
+		
+		if ( save_in_file )
+		{
+			SaveConfigToFile();	
+		}
+	}
+
+	void SaveSubParameterInArray(string param_name, int sub_array_index, string sub_param_name, string sub_param_value, bool save_in_file = true)
+	{
+		array<ref map<string, string>> sub_arrays = m_ConfigParamsArrayInArray.Get(param_name);
+		map<string, string> sub_parameter = sub_arrays.Get(sub_array_index);
+		sub_parameter.Set(sub_param_name, sub_param_value);	
+		
+		if ( save_in_file )
+		{
+			SaveConfigToFile();	
+		}
+	}
+	
+	void RenameParameter(string old_name, string new_name, bool save_in_file = true)
+	{
+		if ( m_ConfigParams.Contains(old_name) )
+		{
+			m_ConfigParams.ReplaceKey(old_name, new_name);
+			
+			if ( save_in_file )
+			{
+				SaveConfigToFile();	
+			}
+		}
+	}
+
+	void RenameParameterArray(string old_name, string new_name, bool save_in_file = true)
+	{
+		if ( m_ConfigParamsArray.Contains(old_name) )
+		{
+			m_ConfigParamsArray.ReplaceKey(old_name, new_name);
+			
+			if ( save_in_file )
+			{
+				SaveConfigToFile();	
+			}
+		}
+	}
+
+	void RemoveParameter(string name, bool save_in_file = true)
+	{
+		m_ConfigParams.Remove(name);
+		
+		if ( save_in_file )
+		{
+			SaveConfigToFile();	
+		}
+	}
+
+	void RemoveParameterArray(string name, bool save_in_file = true)
+	{
+		m_ConfigParamsArray.Remove(name);
+		
+		if ( save_in_file )
+		{
+			SaveConfigToFile();	
+		}
+	}
+	
+	void SetParameterString(string name, string value, bool save_in_file = true)
+	{
+		string s = "\""+value+"\"";
+		SaveParameter(name, s, save_in_file);
+	}
+
+	void SetParameterInt(string name, int value, bool save_in_file = true)
+	{
+		SaveParameter(name, value.ToString(), save_in_file);
+	}
+
+	void SetParameterFloat(string name, float value, bool save_in_file = true)
+	{
+		SaveParameter(name, value.ToString(), save_in_file);
+	}
+
+	void SetParameterBool(string name, bool value, bool save_in_file = true)
+	{
+		SaveParameter(name, value.ToString(), save_in_file);
+	}
+
+	void SetParameterArray(string name, TStringArray value, bool save_in_file = true)
+	{
+		SaveParameterArray(name, value, save_in_file);
+	}
+
+	void SetSubParameterInArray(string param_name, int sub_array_index, string sub_param_name, string sub_param_value, bool save_in_file = true)
+	{
+		SaveSubParameterInArray(param_name, sub_array_index, sub_param_name, sub_param_value, save_in_file);
+	}
+	
+	string GetParameterString(string name)
+	{
+		string loaded_param = LoadParameter(name);
+		string ret_value = STRING_EMPTY;
+		
+		if ( loaded_param != "" )
+		{
+			TStringArray arr = new TStringArray;
+			loaded_param.Split("\"", arr);
+			if ( arr.Count() > 0 )
+			{
+				ret_value = arr.Get(0);	
+			}
+		}
+		else
+		{
+			SetParameterString(name, ret_value);
+		}
+		
+		return ret_value;
+	}
+
+	int GetParameterInt(string name)
+	{
+		string loaded_param = LoadParameter(name);
+		int ret_value = 0;
+		
+		if ( loaded_param != "" )
+		{
+			ret_value = loaded_param.ToInt();
+		}
+		else
+		{
+			SetParameterInt(name, ret_value);
+		}
+		
+		return ret_value;	
+	}
+
+	float GetParameterFloat(string name)
+	{
+		string loaded_param = LoadParameter(name);
+		float ret_value = 0;
+		
+		if ( loaded_param != "" )
+		{
+			ret_value = loaded_param.ToFloat();
+		}
+		else
+		{
+			SetParameterFloat(name, ret_value);
+		}
+		
+		return ret_value;
+	}
+
+	bool GetParameterBool(string name)
+	{
+		string loaded_param = LoadParameter(name);
+		bool ret_value = false;
+		
+		if ( loaded_param != "" )
+		{
+			int v = loaded_param.ToInt();
+			if ( v == 1 )
+			{
+				ret_value = true;
+			}
+		}
+		else
+		{
+			SetParameterBool(name, ret_value);
+		}
+		
+		return ret_value;
+	}
+
+	TStringArray GetParameterArray(string name)
+	{
+		TStringArray ret_value;
+		
+		if ( m_ConfigParamsArray.Contains(name) )
+		{
+			ret_value = m_ConfigParamsArray.Get(name);
+		}
+		else
+		{
+			ret_value = new TStringArray;
+			SetParameterArray(name, ret_value);
+		}
+		
+		return ret_value;
+	}
+
+	string GetSubParameterInArrayString(string param_name, int sub_array_index, string sub_param_name)
+	{
+		string loaded_param = LoadSubParameter(param_name, sub_array_index, sub_param_name);
+		string ret_value = STRING_EMPTY;
+		
+		TStringArray arr = new TStringArray;
+		
+		if ( loaded_param != "" )
+		{
+			arr.Clear();
+			loaded_param.Split("\"", arr);
+			ret_value = arr.Get(1);			
+		}
+		
+		return ret_value;
+	}
+
+	TStringArray GetAllSubParametersInArrayString(string param_name, string sub_param_name)
+	{
+		TStringArray ret_value = NULL;
+		
+		if ( m_ConfigParamsArrayInArray.Contains(param_name) )
+		{
+			ret_value = new TStringArray;
+			
+			array<ref map<string, string>> arrays_in_parameter = m_ConfigParamsArrayInArray.Get(param_name);
+			
+			for ( int i = 0; i < arrays_in_parameter.Count(); ++i )
+			{			
+				map<string, string> sub_parameter = arrays_in_parameter.Get(i);
+				
+				string sub_param = STRING_EMPTY;
+				
+				if ( sub_parameter.Contains(sub_param_name) )
+				{
+					sub_param = sub_parameter.Get(sub_param_name);
+				}
+				
+				ret_value.Insert(sub_param);
+			}
+		}
+		
+		return ret_value;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile/PluginAdditionalInfo.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile/PluginAdditionalInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..5dfd6cfc90953e9f6c18b1a6d9f6e4da7500e038
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile/PluginAdditionalInfo.c
@@ -0,0 +1,7 @@
+class PluginAdditionalInfo extends PluginLocalProfile 
+{
+	override string GetFileName()
+	{
+		return CFG_FILE_ADDITIONAL_INFO;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile/PluginLocalProfileScene.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile/PluginLocalProfileScene.c
new file mode 100644
index 0000000000000000000000000000000000000000..bcab297fcecc17afb5f34ff7ef31659d4e55902c
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginFileHandler/PluginLocalProfile/PluginLocalProfileScene.c
@@ -0,0 +1,118 @@
+/*
+//Mission = "ChernarusPlus"
+typedef CfgParamString DefCfgParamString
+
+//InitTime = 220
+typedef CfgParamInt DefCfgParamInt
+
+//InitWeatherRain = 0.5
+typedef CfgParamFloat DefCfgParamFloat
+
+//InitWeatherFog = 0.3
+typedef CfgParamFloat DefCfgParamFloat
+
+//SceneObjectsCount = 1
+typedef CfgParamInt DefCfgParamInt
+*/
+
+class PluginLocalProfileScene extends PluginLocalProfile
+{
+	private const string FILE_ROOT			= "$saves:";
+	private const string FILE_ROOT_SCENES	= "Scenes";
+	private const string PARAM_MISSION		= "Mission";
+	private const string PARAM_TIME			= "InitTime";
+	private const string PARAM_RAIN			= "InitWeatherRain";
+	private const string PARAM_FOG			= "InitWeatherFog";
+	private const string PARAM_OBJ_COUNT	= "SceneObjectsCount";
+	private const string PARAM_OBJ_NAME		= "SceneObject";
+	
+	private string m_FileSceneName;
+	
+	//========================================
+	// GetPathScenes
+	//========================================
+	string GetPathScenes()
+	{
+		return FILE_ROOT+"\\"+FILE_ROOT_SCENES;
+	}
+	
+	//========================================
+	// GetFileName
+	//========================================
+	override string GetFileName()
+	{
+		string file_name = GetPathScenes()+"\\"+m_FileSceneName;
+		return file_name;
+	}
+	
+	//========================================
+	// OnInit
+	//========================================
+	override void OnInit()
+	{
+		super.OnInit();
+	}
+	
+	//========================================
+	// GetSceneList
+	//========================================	
+	TStringArray GetSceneList()
+	{
+		if ( !FileExist( GetPathScenes() ) )
+		{
+			MakeDirectory( GetPathScenes() );
+		}
+		
+		string	file_name;
+		int 	file_attr;
+		int		flags;
+		TStringArray list = new TStringArray;
+		
+		string path_find_pattern = GetPathScenes()+"/*.scene"; 
+		FindFileHandle file_handler = FindFile(path_find_pattern, file_name, file_attr, flags);
+		
+		bool found = true;
+		while ( found )
+		{				
+			list.Insert(file_name);
+			
+			found = FindNextFile(file_handler, file_name, file_attr);
+		}
+		
+		return list;
+	}
+
+	//========================================
+	// SceneSave
+	//========================================	
+	void SceneSave(SceneData scene)
+	{
+		m_FileSceneName = scene.GetNameScene()+".scene";
+		
+		array<ref SceneObject> objects = scene.GetSceneObjects();
+		
+		// Save Mission Name
+		SetParameterString(PARAM_MISSION, scene.GetNameMission(), false);
+		//Save Init Time
+		SetParameterFloat(PARAM_TIME, scene.GetInitTime(), false);
+		//Save Init Weather Rain
+		SetParameterFloat(PARAM_RAIN, scene.GetInitRain(), false);
+		//Save Init Weather Rain
+		SetParameterFloat(PARAM_FOG, scene.GetInitFog(), false);
+		// Save Count Of missions
+		SetParameterInt(PARAM_OBJ_COUNT, objects.Count(), false);
+		
+		
+		for ( int i = 0; i < objects.Count(); ++i )
+		{
+			SceneObject obj = objects.Get(i);
+			
+			string param_name = PARAM_OBJ_NAME+"_"+i.ToString();
+			Print(param_name);
+			SetSubParameterInArray (param_name, 0, "ClassName", obj.GetTypeName(), false);
+		}
+		
+		
+		SaveConfigToFile();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginHorticulture.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginHorticulture.c
new file mode 100644
index 0000000000000000000000000000000000000000..030ac5489e1b21eb478fff526e65db722d831c61
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginHorticulture.c
@@ -0,0 +1,116 @@
+class PluginHorticulture extends PluginBase
+{
+	ref map<string, ref PlantMaterialHealth> m_PlantMaterials;
+	
+	void PluginHorticulture()
+	{
+		m_PlantMaterials = new map<string, ref PlantMaterialHealth>;
+		
+		LoadFromCfg();
+	}
+
+	void LoadFromCfg()
+	{
+		string cfg_access = "CfgHorticulture"; // it is stored in dz\gear\cultivation\cfgHorticulture.hpp
+		int cfg_horticulture_count = GetGame().ConfigGetChildrenCount( cfg_access );
+
+		for ( int i = 0; i < cfg_horticulture_count; i++ )
+		{
+			string cfg_class_name = "";
+			GetGame().ConfigGetChildName( cfg_access, i, cfg_class_name );
+			string cfg_class_access = cfg_access + " " + cfg_class_name;
+
+			int cfg_class_count = GetGame().ConfigGetChildrenCount( cfg_class_access );
+		
+			for ( int j = 0; j < cfg_class_count; j++ )
+			{
+				string cfg_subclass_name = "";
+				GetGame().ConfigGetChildName( cfg_class_access, j, cfg_subclass_name );
+				string cfg_subclass_access = cfg_class_access + " " + cfg_subclass_name;
+		
+				int cfg_subclass_count = GetGame().ConfigGetChildrenCount( cfg_subclass_access );
+				
+				PlantMaterialHealth plantMaterialHealth = NULL;
+				
+				if ( cfg_class_name == "Plants" )
+				{
+					plantMaterialHealth = new PlantMaterialHealth;
+					m_PlantMaterials.Set( cfg_subclass_name, plantMaterialHealth );
+				}
+				
+				for ( int k = 0; k < cfg_subclass_count; k++ )
+				{
+					string cfg_variable_name = "";
+					GetGame().ConfigGetChildName( cfg_subclass_access, k, cfg_variable_name );
+					string cfg_variable_access = cfg_subclass_access + " " + cfg_variable_name;
+					
+					if ( cfg_class_name == "Plants" )
+					{
+						string string_param = "";
+						GetGame().ConfigGetText( cfg_variable_access, string_param );
+						
+						if ( cfg_variable_name == "infestedTex" )
+						{
+							plantMaterialHealth.m_InfestedTex = string_param;
+						}
+						else if ( cfg_variable_name == "infestedMat" )
+						{
+							plantMaterialHealth.m_InfestedMat = string_param;
+						}
+						else if ( cfg_variable_name == "healthyTex" )
+						{
+							plantMaterialHealth.m_HealthyTex = string_param;
+						}
+						else if ( cfg_variable_name == "healthyMat" )
+						{
+							plantMaterialHealth.m_HealthyMat = string_param;
+						}
+					}
+				}
+			}
+		}
+	}
+	
+	string GetPlantType( Object obj )
+	{
+		string seed_type = obj.GetType();
+		
+		string plant_type = "";
+		GetGame().ConfigGetText( "cfgVehicles " + seed_type + " Horticulture PlantType", plant_type );
+		
+		return plant_type;
+	}
+
+	float GetSurfaceFertility( string surface_type )
+	{
+		float fertility = 0.8;
+		if ( surface_type == "hlina" || surface_type == "CRGrass1" || surface_type == "CRGrass2" || surface_type == "CRForest1" || surface_type == "CRForest2" || surface_type == "CRGrit1" )
+		{
+			fertility = 0.8;
+		}
+		
+		return fertility;
+	}
+
+	bool GiveWormsToPlayer( PlayerBase player, float chance )
+	{
+		if ( Math.RandomFloat01() <= chance )
+		{
+			ItemBase item = ItemBase.Cast( player.GetHumanInventory().CreateInInventory("Food_Worm") );
+			item.SetQuantity( 1 );
+			return true;
+		}
+		
+		return false;
+	}
+
+	PlantMaterialHealth GetPlantMaterial( string plant_type )
+	{
+		if ( m_PlantMaterials.Contains(plant_type) )
+		{
+			return m_PlantMaterials.Get(plant_type);
+		}
+		
+		return NULL;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginItemDiagnostic.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginItemDiagnostic.c
new file mode 100644
index 0000000000000000000000000000000000000000..f71ff939d8b6332ea9f9d7f72df5025a5a37ce0f
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginItemDiagnostic.c
@@ -0,0 +1,652 @@
+class PluginItemDiagnosticEventHandler extends ScriptedWidgetEventHandler
+{
+	PluginItemDiagnostic m_Owner;
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if( ButtonWidget.Cast(w))
+		{
+			GetGame().GetMission().AddActiveInputExcludes({"menu"});
+		}
+		return true;
+
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if( ButtonWidget.Cast(w))
+		{
+			GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+		}
+		
+		return true;
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		return m_Owner.OnClick( w, x, y, button );
+	}
+	
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		return m_Owner.OnMouseButtonDown( w, x, y, button );
+	}
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		return m_Owner.OnMouseButtonUp( w, x, y, button );
+	}
+}
+
+
+
+class PluginItemDiagnostic extends PluginDeveloper
+{
+	Object m_Entity;
+
+	
+	ref Timer 						myTimer1;
+	ref map<PlayerBase,Object> 	m_ObserversMap = new map<PlayerBase,Object>;
+	ref array<string> 				m_Agents = new array<string>;
+	ref map<string,float> 			m_Floats = new map<string,float>;
+	ref map<string,float> 			m_VarsNumbersFinalServer = new map<string,float>;
+	ref map<string,float> 			m_VarsFinalClient = new map<string,float>;
+	ref array<ref Param>		m_Properties = new array<ref Param>;
+	bool 									m_IsActive	= false;
+	bool									m_ScriptMenuOpened;
+	string									m_NoteClient;
+	ref PluginItemDiagnosticEventHandler 	m_EventHandler;
+	bool									m_IsDragging;
+	PluginConfigDebugProfile m_ConfigDebugProfile;
+	
+	Widget 				m_DebugRootWidget;
+	Widget 				m_FrameWidget;
+	
+	TextListboxWidget 	m_DebugAgentListWidget;
+	TextWidget 			m_DebugOutputServer;
+	TextWidget 			m_DebugOutputClient;
+	TextListboxWidget 	m_DebugFloatsProperListWidget;
+	TextListboxWidget 	m_DebugClientVarsWidget;
+	TextWidget 			m_ClassNameWidget;
+	TextWidget 			m_DistanceWidget;
+	ItemPreviewWidget 	m_ItemPreviewWidget;
+	
+	ButtonWidget		m_DebugButtonWidget1;
+	ButtonWidget		m_DebugButtonWidget2;
+	ButtonWidget		m_DebugButtonWidget3;
+	ButtonWidget		m_DebugButtonWidget4;
+	
+	ButtonWidget		m_CloseButton;
+
+	Shape 				m_ItemLine;
+	vector 				m_DraggingOffset;
+	
+	
+	void PluginItemDiagnostic()
+	{
+		
+		#ifndef NO_GUI
+		InitializeWidgets();
+		ShowWidgets(false);
+		#endif
+	}
+
+	void ~PluginItemDiagnostic()
+	{
+		ClearProperties();
+		if (m_ItemLine)
+		{
+			m_ItemLine.Destroy();
+			m_ItemLine = null;
+		}
+	}
+	
+	override void OnInit()
+	{
+		m_ConfigDebugProfile = PluginConfigDebugProfile.Cast( GetPlugin(PluginConfigDebugProfile) );
+		if ( m_ConfigDebugProfile )
+		{
+			vector pos = m_ConfigDebugProfile.GetItemDebugPos();
+			if (m_DebugRootWidget && pos != vector.Zero)
+			{
+				float wx = pos[0];
+				float wy = pos[1];
+				m_DebugRootWidget.SetPos(wx, wy);
+			}
+		}
+	}
+
+	bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		if (button == 0)
+			SetDragging(true);
+		if (button == 1)
+		{
+			if (m_Entity)
+			{
+				float xx, yy;
+				m_DebugRootWidget.GetPos(xx,yy);
+				ContextMenu.DisplayContextMenu(x - xx, y - yy, EntityAI.Cast(m_Entity), m_DebugRootWidget, this);
+			}
+		}
+		return true;
+	}
+	
+	bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if (button == 0)
+			SetDragging(false);
+		return true;
+	}
+	
+	void SetDragging(bool enable)
+	{
+		if(enable && !m_IsDragging)
+			OnDraggingStart();
+		else if (!enable && m_IsDragging)
+			OnDraggingEnd();
+		m_IsDragging = enable;
+	}
+	
+	void OnDraggingStart()
+	{
+		int mx, my;
+		float wx, wy;
+		GetMousePos(mx,my);
+		m_DebugRootWidget.GetScreenPos(wx,wy);
+		m_DraggingOffset[0] = wx - mx;
+		m_DraggingOffset[1] = wy - my;
+	}
+	
+	void OnDraggingEnd()
+	{
+		if ( m_ConfigDebugProfile )
+		{
+			float wx, wy;
+			m_DebugRootWidget.GetScreenPos(wx,wy);
+			m_ConfigDebugProfile.SetItemDebugPos(Vector(wx,wy,0));
+		}
+	}
+	
+
+	
+	bool OnClick( Widget w, int x, int y, int button )
+	{
+		SetDragging(false);
+		
+		if (w == m_CloseButton)
+		{
+			ToggleDebugWindowEvent();
+			return true;
+		}
+		return true;
+	}
+	
+	void RegisterDebugItem(Object item, PlayerBase player)
+	{
+		if(!myTimer1)
+		{
+			myTimer1 = new Timer();
+			myTimer1.Run(1, this, "Tick", NULL, true);
+		}
+		
+		if(m_ObserversMap.Contains(player))
+		{
+			m_ObserversMap.Set(player,item);
+		}
+		else
+		{
+			m_ObserversMap.Insert(player,item);
+		}
+		#ifdef DEVELOPER
+		SetDebugDeveloper_item(item);
+		#endif
+	}
+	
+	Object GetWatchedItem(PlayerBase player)
+	{
+		return m_ObserversMap.Get(player);
+	}
+	
+	
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+
+	void OnScriptMenuOpened(bool opened/*1 - opened , 0 - closed*/)
+	{
+		m_ScriptMenuOpened = opened;
+	}
+	
+	
+	void ShowWidgets(bool show)
+	{
+		
+		m_IsActive = show;
+			
+		if(m_DebugRootWidget) 
+			m_DebugRootWidget.Show(show);
+	}
+
+	void OnSelectAction(EntityAI ent, int actionId)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetActionManager().OnInstantAction(ActionDebug,new Param2<EntityAI,int>(ent,actionId));
+	}
+
+	void ReleaseFocus()
+	{
+		GetGame().GetInput().ResetGameFocus();
+		GetGame().GetUIManager().ShowUICursor(false);
+		if (GetGame().GetUIManager()) 	
+		{
+			if (GetGame().GetUIManager().IsDialogVisible())
+			{
+				GetGame().GetUIManager().CloseDialog();
+				
+			}
+		}
+	}
+	
+	void ToggleDebugWindowEvent()
+	{
+		if (m_IsActive)
+		{		
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			GetGame().RPCSingleParam(player, ERPCs.RPC_ITEM_DIAG_CLOSE,null, true);
+			ShowWidgets(false);
+			ClearWidgets();
+			
+			GetGame().GetCallQueue( CALL_CATEGORY_GUI ).CallLater( ReleaseFocus, 100);
+			//m_IsActive = false;
+			SetDragging(false);
+		}
+		else
+		{
+			ShowWidgets(true);
+			//m_IsActive = true;
+		}
+
+	}
+
+	void ClearWidgets()
+	{
+		m_DebugAgentListWidget.ClearItems();
+		m_DebugOutputServer.SetText("");
+		m_DebugOutputClient.SetText("");
+		m_DebugFloatsProperListWidget.ClearItems();
+		m_ItemPreviewWidget.SetItem(NULL);
+		m_ClassNameWidget.SetText("");		
+	}
+	
+	void Tick()
+	{
+		for(int i = 0; i < m_ObserversMap.Count();i++)
+		{
+			Object item = m_ObserversMap.GetElement(i);
+			PlayerBase player = m_ObserversMap.GetKey(i);
+
+			if (item && player) 
+			{
+				GeneratePropertiesObject(EntityAI.Cast(item));
+				SendRPC(item, player);
+			}
+			else
+			{
+				Debug.LogError("PluginItemDiagnostic: dead debug record, removing record");
+				m_ObserversMap.RemoveElement(i);
+			}
+		}
+		
+	}
+	
+	void ClearProperties()
+	{
+		m_Properties.Clear();
+	}
+
+
+	void GeneratePropertiesObject(EntityAI item)
+	{
+		ClearProperties();
+		GetLocalProperties(item, m_Properties);
+
+	}
+	
+	void SendRPC(Object item, PlayerBase player)
+	{
+		Param1<Object> p1 = new Param1<Object>(item);
+		m_Properties.InsertAt(p1,0);
+		GetGame().RPC(player,ERPCs.RPC_ITEM_DIAG,m_Properties,true,player.GetIdentity());
+		
+		if (!GetGame().IsMultiplayer())
+		{
+			m_Entity = item;
+		}
+
+	}
+	
+	void StopWatchRequest(PlayerBase player)//called from player after an RPC call
+	{
+		if( m_ObserversMap.Contains(player) )
+		{
+			m_ObserversMap.Remove(player);
+		}
+	}
+
+	void OnRPC(Object entity, ParamsReadContext ctx)
+	{
+		
+		if (!GetGame().IsMultiplayer())
+		{
+			entity = m_Entity;
+		}
+		else
+		{
+			m_Entity = entity;
+		}
+		
+		ItemBase item = ItemBase.Cast(entity);
+		
+		
+		
+		#ifdef DEVELOPER
+		SetDebugDeveloper_item(entity);
+		#endif
+		if( !IsActive() )
+		{
+			ShowWidgets(true);
+		}
+
+		ctx.Read(CachedObjectsParams.PARAM1_STRING);
+		string debug_output_server = CachedObjectsParams.PARAM1_STRING.param1;
+		array<ref Param> vars_client;
+		array<ref Param> vars_server;
+		if (item)
+		{
+			ctx.Read(CachedObjectsParams.PARAM1_INT);//hardcoded to index 1
+			int agents_count 	= CachedObjectsParams.PARAM1_INT.param1;
+
+			ctx.Read(CachedObjectsParams.PARAM1_INT);//hardcoded to index 2
+			int individual_items_count 	= CachedObjectsParams.PARAM1_INT.param1;
+			
+			FillAgentArray(ctx, agents_count);
+			
+			vars_server = new array<ref Param>;
+			FillServerFinalVars(individual_items_count, ctx, vars_server);
+
+			vars_client = new array<ref Param>;
+			GetLocalProperties(item, vars_client, true);
+		}
+		if (EntityAI.Cast(entity))
+		{
+			DisplayAll(EntityAI.Cast(entity), vars_server, vars_client, debug_output_server );
+		}
+		if (GetDayZGame().IsInventoryOpen() || GetGame().GetUIManager().FindMenu(MENU_SCRIPTCONSOLE))
+			m_DebugRootWidget.SetSort(-1);
+		else
+			m_DebugRootWidget.SetSort(10);
+		m_DebugRootWidget.Show(true);
+
+			
+	}
+	
+	void FillServerFinalVars(int count, ParamsReadContext ctx, array<ref Param> params )
+	{
+		for(int i = 0; i < count; i++)
+		{
+			Param2<string,float> p2 = new Param2<string,float>("",0);
+			
+			ctx.Read(p2);
+			/*
+			string name = CachedObjectsParams.PARAM2_STRING_FLOAT.param1;
+			float value = CachedObjectsParams.PARAM2_STRING_FLOAT.param2;
+			PrintString(name+","+value.ToString());
+			*/
+			params.Insert(p2);
+		}
+		//PrintString("----------------------------------------------------");
+	}
+	
+	void InitializeWidgets()
+	{
+		m_EventHandler = new PluginItemDiagnosticEventHandler;
+		m_EventHandler.m_Owner = this;
+		
+		if(!m_DebugRootWidget) 
+			m_DebugRootWidget = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/debug_item.layout");
+
+		m_DebugRootWidget.SetHandler(m_EventHandler);
+
+		m_FrameWidget = m_DebugRootWidget.FindAnyWidget("FrameWidget0");
+		m_DebugAgentListWidget = TextListboxWidget.Cast(m_DebugRootWidget.FindAnyWidget("w_Agents"));
+		m_DebugOutputServer = TextWidget.Cast(m_DebugRootWidget.FindAnyWidget("DebugOutputServer"));
+		m_DebugOutputClient = TextWidget.Cast(m_DebugRootWidget.FindAnyWidget("DebugOutputClient"));
+		m_DebugFloatsProperListWidget = TextListboxWidget.Cast(m_DebugRootWidget.FindAnyWidget("w_FloatsProper"));
+		m_ItemPreviewWidget = ItemPreviewWidget.Cast(m_DebugRootWidget.FindAnyWidget("w_ItemPreview"));
+		m_ClassNameWidget = TextWidget.Cast(m_DebugRootWidget.FindAnyWidget("w_ClassName"));
+		m_DistanceWidget = TextWidget.Cast(m_DebugRootWidget.FindAnyWidget("w_Distance"));
+		
+		m_DebugButtonWidget1 = ButtonWidget.Cast(m_DebugRootWidget.FindAnyWidget("DebugButton1"));
+		m_DebugButtonWidget2 = ButtonWidget.Cast(m_DebugRootWidget.FindAnyWidget("DebugButton2"));
+		m_DebugButtonWidget3 = ButtonWidget.Cast(m_DebugRootWidget.FindAnyWidget("DebugButton3"));
+		m_DebugButtonWidget4 = ButtonWidget.Cast(m_DebugRootWidget.FindAnyWidget("DebugButton4"));
+		
+		m_CloseButton = ButtonWidget.Cast(m_DebugRootWidget.FindAnyWidget("CloseButton"));
+	}
+
+	override void OnUpdate(float delta_time)
+	{
+		super.OnUpdate(delta_time);
+		
+		if (!m_Entity || !m_IsActive)
+		{
+			
+			if (m_ItemLine)
+			{
+				m_ItemLine.Destroy();
+				m_ItemLine = null;
+			}
+			return;
+		}
+		
+		m_ItemPreviewWidget.Show(!m_ScriptMenuOpened);
+		
+		
+		if (m_IsDragging)
+		{
+			int x,y;
+			GetMousePos(x,y);
+			m_DebugRootWidget.SetPos(x + m_DraggingOffset[0], y + m_DraggingOffset[1]);
+		}
+		vector pts[2];
+		pts[0] = GetGame().GetPlayer().GetPosition();
+		pts[1] = m_Entity.GetPosition();
+		if (m_ItemLine)
+		{
+			m_ItemLine.Destroy();
+			m_ItemLine = null;
+			
+		}
+		m_ItemLine = Shape.CreateLines(COLOR_BLUE, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER, pts, 2);
+		m_DistanceWidget.SetText(vector.Distance(pts[0], pts[1]).ToString()+"m.");
+	}
+	
+	void DisplayAll(EntityAI item, array<ref Param> vars_server, array<ref Param> vars_client, string debug_text_server)
+	{
+		m_ClassNameWidget.SetText( item.GetType() );
+		m_ItemPreviewWidget.SetItem(item);
+		UpdateAgentWidget();
+		//UpdateFloatWidget();
+		if (vars_server && vars_client)
+			UpdateNumericalVarsWidget(vars_server, vars_client);
+		m_DebugOutputServer.SetText(debug_text_server);
+		m_DebugOutputClient.SetText(item.GetDebugText());
+		
+		/*
+		string button1, button2, button3, button4;
+		item.GetDebugButtonNames(button1, button2, button3, button4);
+		m_DebugButtonWidget1.SetText(button1);
+		m_DebugButtonWidget2.SetText(button2);
+		m_DebugButtonWidget3.SetText(button3);
+		m_DebugButtonWidget4.SetText(button4);
+		*/
+		
+	
+	}	
+
+	void FillAgentArray(ParamsReadContext ctx, int agents_count)
+	{
+		m_Agents.Clear();
+		for(int i = 0; i < agents_count; i++)
+		{
+			if(ctx.Read(CachedObjectsParams.PARAM1_STRING))
+			{
+				string agent = CachedObjectsParams.PARAM1_STRING.param1;
+				m_Agents.Insert(agent);
+			}
+		}
+	}
+
+
+	void UpdateAgentWidget()
+	{
+		m_DebugAgentListWidget.ClearItems();
+		for(int i = 0; i < m_Agents.Count(); i++)
+		{
+			string agent = m_Agents.Get(i);
+			m_DebugAgentListWidget.AddItem(agent,NULL,0);
+		}
+	}	
+
+	
+	void UpdateNumericalVarsWidget(array<ref Param> vars_server, array<ref Param> vars_client)
+	{
+		m_DebugFloatsProperListWidget.ClearItems();
+		for(int i = 0; i < vars_server.Count(); i++)
+		{
+			Param param_server = vars_server.Get(i);
+			Param2<string,float> p2_server = Param2<string,float>.Cast(param_server);
+			
+			Param param_client = vars_client.Get(i);
+			Param2<string,float> p2_client = Param2<string,float>.Cast(param_client);
+			
+			string name = p2_server.param1;
+			m_DebugFloatsProperListWidget.AddItem(name,NULL,0);
+			m_DebugFloatsProperListWidget.SetItem(i,p2_server.param2.ToString(),NULL,1);
+			m_DebugFloatsProperListWidget.SetItem(i,p2_client.param2.ToString(),NULL,2);
+		}
+	}	
+	
+	
+	void PrintOut()
+	{
+		Debug.LogArrayString(m_Agents,"ItemDebug");
+		Debug.Log("----------------------","ItemDebug");
+	}
+	
+	//-------------------------
+	// QUERY FOR DEBUG PROPERTIES
+	//-------------------------
+	void GetLocalProperties(EntityAI entity, array<ref Param> properties, bool client = false)
+	{
+		if(!entity)
+			return;
+		ItemBase item = ItemBase.Cast(entity);
+
+		if(!client)
+		{
+			// -------- DEBUG OUTPUT ------
+			Param1<string> debug_output = new Param1<string>(entity.GetDebugText());
+			properties.Insert(debug_output);
+			if(!item)
+				return;
+			// -------- AGENTS ------------
+			int num_of_agents = FillWithAgents(item, properties);
+			Param1<int> agents_count = new Param1<int>(num_of_agents);
+			properties.InsertAt(agents_count,1);// hard coded index 1 !!
+		}
+		if(!item)
+			return;
+		// ------ INDIVIDUAL VARS------
+		int number_of_items = 0;
+		Param2<string, float> quantity = new Param2<string, float>("quantity", item.GetQuantity() );
+		properties.Insert(quantity);
+		number_of_items++;
+		//-----------------------------
+		Param2<string, float> liquid_type = new Param2<string, float>("liquid_type", item.GetLiquidType() );
+		properties.Insert(liquid_type);
+		number_of_items++;
+		//-----------------------------
+		Param2<string, float> wetness = new Param2<string, float>("wetness", item.GetWet() );
+		properties.Insert(wetness);
+		number_of_items++;
+		//-----------------------------
+		Param2<string, float> temperature = new Param2<string, float>("temperature", item.GetTemperature() );
+		properties.Insert(temperature);
+		number_of_items++;
+		//-----------------------------
+		Param2<string, float> energy = new Param2<string, float>("energy", item.GetEnergy() );
+		properties.Insert(energy);
+		number_of_items++;
+		//-----------------------------
+		Param2<string, float> health;
+		if(!client)
+		{
+			health = new Param2<string, float>("health", item.GetHealth("", "") );
+		}
+		else
+		{
+			health = new Param2<string, float>("NO SYNC",0 );
+		}
+		properties.Insert(health);
+		number_of_items++;
+		//-----------------------------
+		int r,g,b,a;
+		item.GetColor(r,g,b,a);
+		Param2<string, float> p2r = new Param2<string, float>("R",r);
+		properties.Insert(p2r);
+		number_of_items++;
+		Param2<string, float> p2g = new Param2<string, float>("G",g);
+		properties.Insert(p2g);
+		number_of_items++;
+		Param2<string, float> p2b = new Param2<string, float>("B",b);
+		properties.Insert(p2b);
+		number_of_items++;
+		Param2<string, float> p2a = new Param2<string, float>("A",a);
+		properties.Insert(p2a);
+		number_of_items++;
+		//-----------------------------
+		if(!client)
+		{
+			Param1<int> item_count = new Param1<int>(number_of_items);
+			properties.InsertAt(item_count,2);
+		}
+	}
+
+	int FillWithAgents(ItemBase item, array<ref Param> properties)
+	{
+		if (!item)
+		{
+			return 0;
+		}
+		int agents = item.GetAgents();
+		if(agents == 0) return 0;
+		int num_of_agents = 0;
+		ref array<int> agents_aray = new array<int>;
+		PluginTransmissionAgents.BuildAgentArray(agents, agents_aray);
+		int agents_count = agents_aray.Count();
+	
+		for(int i = 0; i < agents_count; i++)
+		{
+			//PluginTransmissionAgents mta = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+			string agent_name = PluginTransmissionAgents.GetNameByID(agents_aray.Get(i));
+			Param1<string> param1 = new Param1<string>(agent_name);
+			properties.Insert(param1);
+			num_of_agents++;
+		}
+
+		return num_of_agents;
+	}
+}
+	
+
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginKeyBinding.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginKeyBinding.c
new file mode 100644
index 0000000000000000000000000000000000000000..7a29239bea71de15e98b1217bde03d868363f076
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginKeyBinding.c
@@ -0,0 +1,378 @@
+/**
+ * \defgroup MouseEvents Mouse Events
+ * \desc constants for mouse events in PluginKeyBinding
+ * @{
+ */
+
+const int MB_EVENT_PRESS			= 0;
+const int MB_EVENT_CLICK			= 1;
+const int MB_EVENT_RELEASE			= 2;
+const int MB_EVENT_DOUBLECLICK		= 3;
+const int MB_EVENT_DRAG				= 4;
+/** @}*/
+
+class PluginKeyBinding extends PluginBase
+{
+	static PluginKeyBinding instance;
+	
+	// System Public Events
+	void PluginKeyBinding()
+	{
+		if ( instance == null )
+		{
+			instance = this;
+		}
+	}
+
+	//============================================
+	// OnInit
+	//============================================
+	override void OnInit()
+	{
+		super.OnInit();
+		
+		m_KeyBindings	= new array<ref KeyBinding>;
+		m_MouseBindings	= new array<ref MouseBinding>;
+		m_MouseButtons	= new array<ref MouseButtonInfo>;
+		m_MouseButtons.Insert ( new MouseButtonInfo( MouseState.LEFT ) );
+		m_MouseButtons.Insert ( new MouseButtonInfo( MouseState.RIGHT ) );
+		m_MouseButtons.Insert ( new MouseButtonInfo( MouseState.MIDDLE ) );
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Insert(this.OnFrame);
+		
+		////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//Keyboard Binds	|UI_ID							|Key1					|Key2				|Callback Plugin		|Callback Function				|Info Shrtcut					|Info Description
+		//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+		//					|constants.h					|constants.h			|constants.h		|only plugin name		|only function					|								|
+		//					|MENU_***						|KeyCode.KC_***			|KeyCode.KC_***		|						|in plugin						|								|
+		//------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+		#ifdef DEVELOPER
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_F1		,"PluginDeveloper"		,"ToggleHelpScreen" 			,"[LCTRL]+[F1]"					,"Show/Hide help screen");
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_F2		,"PluginDeveloper"		,"ResetGUI" 					,"[LCTRL]+[F2]"					,"Resets shown UI for testing purposes");
+		RegisterKeyBind(	 MENU_NONE|MENU_SCRIPTCONSOLE	,KeyCode.KC_LCONTROL	,KeyCode.KC_GRAVE	,"PluginDeveloper"		,"ToggleScriptConsole" 			,"[LCTRL]+[~]"					,"Show/Hide this script console");
+		RegisterKeyBind(	 MENU_NONE|MENU_SCRIPTCONSOLE	,KeyCode.KC_RCONTROL	,KeyCode.KC_GRAVE	,"PluginDeveloper"		,"ToggleScriptConsole" 			,"[RCTRL]+[~]"					,"Show/Hide this script console");
+		RegisterKeyBind(	 MENU_NONE|MENU_SCENE_EDITOR	,KeyCode.KC_LCONTROL	,KeyCode.KC_TAB		,"PluginSceneManager"	,"EditorToggle"					,"[LCTRL]+[TAB]"				,"Show/Hide Scripted Scene Editor");
+		RegisterKeyBind(	 MENU_NONE|MENU_SCENE_EDITOR	,KeyCode.KC_RCONTROL	,KeyCode.KC_TAB		,"PluginSceneManager"	,"EditorToggle"					,"[RCTRL]+[TAB]"				,"Show/Hide Scripted Scene Editor");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_LCONTROL	,KeyCode.KC_V		,"PluginDeveloper"		,"SpawnFromClipboard"			,"[Right Shift]"				,"Spawn item from clipboard");
+		#endif
+		
+		#ifdef DIAG_DEVELOPER
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_INSERT		,-1					,"PluginDeveloper"		,"TeleportAtCursor"				,"[Insert]"		 				,"Teleport player to cursor position");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_HOME		,-1					,"PluginDeveloper"		,"ToggleFreeCamera"				,"[Home]"						,"Toggle free camera and teleport player to its position");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_DIVIDE		,-1					,"PluginDeveloper"		,"ToggleFreeCameraBackPos"		,"[Divide numeric]"				,"Toggle free camera, no player teleport");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_LCONTROL	,KeyCode.KC_NUMPAD9	,"PluginDeveloperSync"	,"ToggleFocus"					,"[LCtrl]+[NUMPAD9]"			,"Toggle game focus");
+		#endif
+		
+		#ifdef DEVELOPER
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_LCONTROL	,KeyCode.KC_Z		,"PluginDeveloper"		,"SetDeveloperItemClient"		,"Starts watching the item"		,"Sets the target as Watched item for debug purposes");
+		RegisterKeyBind(	 MENU_SCRIPTCONSOLE				,KeyCode.KC_PRIOR		,-1					,"PluginDeveloper"		,"ScriptHistoryBack"			,"[Page Up]"					,"Debug Console => Script history back");
+		RegisterKeyBind(	 MENU_SCRIPTCONSOLE				,KeyCode.KC_NEXT		,-1					,"PluginDeveloper"		,"ScriptHistoryNext"			,"[Page Down]"					,"Debug Console => Script history next");	
+		RegisterKeyBind(	 MENU_SCENE_EDITOR				,KeyCode.KC_DELETE		,-1					,"PluginSceneManager"	,"DeleteSelectedObject"			,"[Delete]"						,"Scene Editor => Delete current selected object");	
+		RegisterKeyBind(	 MENU_SCENE_EDITOR				,KeyCode.KC_LCONTROL	,KeyCode.KC_S		,"PluginSceneManager"	,"SceneSave"					,"[LCtrl]+[S]"					,"Scene Editor => Save Current Scene");
+		RegisterKeyBind(	 MENU_SCENE_EDITOR				,KeyCode.KC_LCONTROL	,KeyCode.KC_D		,"PluginSceneManager"	,"SelectedObjectDuplicate"		,"[LCtrl]+[D]"					,"Scene Editor => Duplicate current selected object");
+		RegisterKeyBind(	 MENU_SCENE_EDITOR				,KeyCode.KC_LCONTROL	,KeyCode.KC_F		,"PluginSceneManager"	,"SelectedObjectFocus"			,"[LCtrl]+[F]"					,"Scene Editor => Focus camera on selected object");
+		RegisterKeyBind(	 MENU_SCENE_EDITOR				,KeyCode.KC_LCONTROL	,KeyCode.KC_E		,"PluginSceneManager"	,"RulerToggle"					,"[LCtrl]+[E]"					,"Scene Editor => Enable/Disable addition of ruler points");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_LCONTROL	,KeyCode.KC_PRIOR	,"PluginRecipesManager"	,"CallbackGenerateCache"		,"[LCtrl]+[BACKSPACE]"			,"PluginRecipesManager => Generate recipe cache and save it to file");
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_DECIMAL	,"PluginItemDiagnostic"	,"ToggleDebugWindowEvent"		,"[LCtrl]+[DECIMAL]"			,"Close the Item Debug window");
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_NUMPAD0	,"PluginDayzPlayerDebug","ToggleDebugWindowEvent"		,"[LCtrl]+[NUMPAD0]"			,"Open/Close Player debug window");
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_DECIMAL	,"PluginDayzPlayerDebug","ToggleDebugWindowEventP"		,"[LCtrl]+[DECIMAL]"			,"Open/Close Player debug window");
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_I		,"PluginDayZInfectedDebug","ToggleDebugWindowEvent"							,"[LCtrl]+[NUMPAD1]"			,"Open/Close Infected debug window");
+		RegisterKeyBind(	 MENU_ANY						,KeyCode.KC_LCONTROL	,KeyCode.KC_O		,"PluginDayZInfectedDebug","PossesInfected"							,"[LCtrl]+[NUMPAD1]"			,"Open/Close Infected debug window");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_LCONTROL	,KeyCode.KC_SCROLL	,"PluginNutritionDumper"		,"CheckInit"					,"[LCtrl]+[SCROLL LOCK]"		,"Enable Door Ruler");
+		RegisterKeyBind(	 MENU_NONE						,KeyCode.KC_LCONTROL	,KeyCode.KC_RBRACKET,"PluginCharPlacement"	,"CheckInit"					,"[LCtrl]+[)]"					,"Enable CharPlacer");
+		
+		RegisterKeyBind(	 MENU_NONE|MENU_CAMERA_TOOLS	,KeyCode.KC_LCONTROL	,KeyCode.KC_K		,"PluginCameraTools"	,"ToggleCameraTools"			,"[LCtrl]+[K]"					,"Toggle Camera Recording Tools");
+		RegisterKeyBind(	 MENU_CAMERA_TOOLS				,KeyCode.KC_LCONTROL	,KeyCode.KC_S		,"PluginCameraTools"	,"Save"							,"[X]"							,"Recording Tools => Start Recording Camera Path");
+		RegisterKeyBind(	 MENU_CAMERA_TOOLS				,KeyCode.KC_P			,-1					,"PluginCameraTools"	,"PlayPause"					,"[C]"							,"Recording Tools => Stop Recording Camera Path");
+		RegisterKeyBind(	 MENU_CAMERA_TOOLS				,KeyCode.KC_LCONTROL	,KeyCode.KC_Q		,"PluginCameraTools"	,"AddKeyframe"					,"[C]"							,"Recording Tools => Add Camera Point");
+		RegisterKeyBind(	 MENU_CAMERA_TOOLS				,KeyCode.KC_LCONTROL	,KeyCode.KC_E		,"PluginCameraTools"	,"DeleteKeyframe"				,"[V]"							,"Recording Tools => Play Camera Line");
+
+		//--------------------------------------------------------------------------------------------------------------------------------------------------------------
+		//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+		// Mouses Binds		|UI_ID				|Mouse Button	|Mouse Event			|Callback Plugin		|Callback Function			|Info Shrtcut			|Info Description
+		//----------------------------------------------------------------------------------------------------------------------------------------------------------------
+		//					|constants.h		|MouseState.LEFT		|MB_EVENT_CLICK			|only plugin name		|only function				|						|
+		//					|MENU_***			|MouseState.RIGHT		|MB_EVENT_DOUBLECLICK   |						|in plugin					|						|
+		//										|MouseState.MIDDLE		|MB_EVENT_DRAG			|						|							|						|
+		//										|						|MB_EVENT_RELEASE		|						|							|						|
+		//--------------------------------------------------------------------------------------------------------------------------------------------------------------
+		RegisterMouseBind( 	MENU_SCENE_EDITOR	,MouseState.LEFT		,MB_EVENT_CLICK			,"PluginSceneManager"	,"Event_OnClick"			,"[LMB] Click"			,"Mission Editor => Select object in scene");
+		RegisterMouseBind( 	MENU_SCENE_EDITOR	,MouseState.LEFT		,MB_EVENT_DOUBLECLICK	,"PluginSceneManager"	,"Event_OnDoubleClick" 		,"[LMB] Double Click"	,"Mission Editor => Craete new object in scene");
+		RegisterMouseBind( 	MENU_SCENE_EDITOR	,MouseState.LEFT		,MB_EVENT_DRAG			,"PluginSceneManager"	,"Event_OnDrag" 			,"[LMB] Hold"			,"Mission Editor => Moving with selected object");
+		RegisterMouseBind( 	MENU_SCENE_EDITOR	,MouseState.MIDDLE		,MB_EVENT_CLICK			,"PluginSceneManager"	,"Event_OnClickMiddle"		,"[MMB] Click"			,"Mission Editor => Link clicked object with selected object");
+		RegisterMouseBind( 	MENU_SCENE_EDITOR	,MouseState.RIGHT		,MB_EVENT_PRESS			,"PluginSceneManager"	,"FreeCameraControlEnable"	,"[RMB] Hold"			,"Mission Editor => Enable camera movement");
+		RegisterMouseBind( 	MENU_SCENE_EDITOR	,MouseState.RIGHT		,MB_EVENT_RELEASE		,"PluginSceneManager"	,"FreeCameraControlDisable"	,"[RMB] Release"		,"Mission Editor => Disable camera movement");
+		RegisterMouseBind( 	MENU_NONE			,MouseState.LEFT		,MB_EVENT_CLICK			,"PluginDayZCreatureAIDebug","Event_OnClick"		,"[LMB] Click"			,"DayZCreature graph debug => Capture entity during capture mode");
+		RegisterMouseBind( 	MENU_CAMERA_TOOLS	,MouseState.RIGHT		,MB_EVENT_RELEASE		,"PluginCameraTools"	,"CursorShow"				,"[LMB] Click"			,"DayZCreature graph debug => Capture entity during capture mode");
+		// TO DO: (Boris V.) Remove the following commented-out mouse binds when weapon particles can be implemented properly. Also remove the events they call.
+		//RegisterMouseBind( 	MENU_NONE			,MouseState.LEFT		,MB_EVENT_PRESS			,"PluginDeveloper"		,"MuzzleParticleTestStart"	,"[LMB] Hold"			,"Debug particle");
+		//RegisterMouseBind( 	MENU_NONE			,MouseState.LEFT		,MB_EVENT_RELEASE		,"PluginDeveloper"		,"MuzzleParticleTestEnd"	,"[LMB] Release"		,"Debug particle2");
+		#endif
+		//--------------------------------------------------------------------------------------------------------------------------------------------------------------
+		//////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
+	}
+	
+	//==========================================
+	// OnInit (System Event)
+	//==========================================
+	override void OnDestroy()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Remove(this.OnFrame);
+	}
+	
+	//============================================
+	// OnKeyPress
+	//============================================
+	void OnKeyPress(int key)
+	{
+		//Print("OnKeyPress "+ key );
+
+		for ( int i = 0; i < m_KeyBindings.Count(); ++i )
+		{
+			KeyBinding key_binding = m_KeyBindings.Get(i);
+			
+			if ( !IsCurrentUIPageValid( key_binding.GetUIMenuID() ) )
+			{
+				continue;
+			}
+			
+			bool key1_match = false;
+			bool key2_match = false;
+			
+			if ( key_binding.GetKey1() > -1 )
+			{
+				if ( IsKeyPressed(key_binding.GetKey1()) )
+				{
+					// Key1 is down
+					key1_match = true;
+				}
+			}
+			else
+			{
+				// Key1 is not set
+				key1_match = true;
+			}
+			
+			if ( key_binding.GetKey2() > -1 )
+			{
+				if ( IsKeyPressed(key_binding.GetKey2()) )
+				{
+					// Key2 is down
+					key2_match = true;
+				}
+			}
+			else
+			{
+				// Key2 is not set
+				key2_match = true;
+			}
+			
+			if ( key1_match && key2_match )
+			{
+				//Log( "Call Method -> key press: " + itoa(key) + " " + key_binding.GetInfoDescription() );
+				
+				PluginBase m = GetPlugin(key_binding.GetCallbackTarget().ToType());
+				GetGame().GameScript.CallFunction(m, key_binding.GetCallbackFunction(), NULL, 0);
+				
+				break;
+			}
+		}
+	}
+	
+	//============================================
+	// OnKeyRelease
+	//============================================
+	void OnKeyRelease(int key)
+	{
+	}
+	
+	//============================================
+	// OnMouseButtonPress
+	//============================================
+	void OnMouseButtonPress(int button)
+	{
+		MouseButtonInfo button_info = GetMouseButtonInfo( button );
+		if (button_info == NULL) return;
+		button_info.Press();
+		
+	//Log("****************************");
+	//Log(" MB_EVENT_PRESS");
+		
+		OnMouse( MB_EVENT_PRESS, button );
+	}
+	
+	//============================================
+	// OnMouseButtonRelease
+	//============================================
+	void OnMouseButtonRelease(int button)
+	{
+		MouseButtonInfo button_info = GetMouseButtonInfo( button );
+		if (button_info == NULL) return;
+		int time_curr			= GetGame().GetTime();
+		int time_last_press		= button_info.GetTimeLastPress();
+		int time_last_release	= button_info.GetTimeLastRelease();	
+		int time_delta_press	= time_curr - time_last_press;
+		int time_delta_relase	= time_curr - time_last_release;
+		
+		if ( time_delta_relase < DOUBLE_CLICK_TIME )
+		{
+	//Log(" DOUBLE_CLICK_TIME ");
+			
+			OnMouse( MB_EVENT_DOUBLECLICK, button );
+		}
+		else if ( time_delta_press < CLICK_TIME )
+		{
+	//Log(" MB_EVENT_CLICK ");
+			
+			OnMouse( MB_EVENT_CLICK, button );
+		}
+		
+	//Log(" MB_EVENT_RELEASE");
+		
+		OnMouse( MB_EVENT_RELEASE, button );
+		
+		button_info.Release();
+	}
+	
+	//============================================
+	// OnFrame
+	//============================================
+	void OnFrame()
+	{
+		for ( int i = 0; i < m_MouseButtons.Count(); ++i )
+		{
+			MouseButtonInfo info = m_MouseButtons.Get(i);
+			
+			if ( info.IsButtonDown() )
+			{		
+				int time_curr = GetGame().GetTime();
+				int time_hold = info.GetTimeLastPress() + HOLD_CLICK_TIME_MIN;
+				
+				if ( time_hold < time_curr )
+				{
+	//Log("MB_EVENT_DRAG");
+					
+					OnMouse( MB_EVENT_DRAG, info.GetButtonID() );
+				}
+			}
+		}
+	}
+	
+	//--------------------------------------------
+	// GetKeyBindings
+	//--------------------------------------------
+	array<ref KeyBinding> GetKeyBindings()
+	{
+		return m_KeyBindings;
+	}
+
+	//--------------------------------------------
+	// GetMouseBindings
+	//--------------------------------------------
+	array<ref MouseBinding> GetMouseBindings()
+	{
+		return m_MouseBindings;
+	}
+	
+	protected const int CLICK_TIME			= 200; //ms
+	protected const int DOUBLE_CLICK_TIME	= 300; //ms
+	protected const int HOLD_CLICK_TIME_MIN	= 300; //ms
+	
+	protected ref array<ref KeyBinding>			m_KeyBindings;
+	protected ref array<ref MouseButtonInfo>	m_MouseButtons;
+	protected ref array<ref MouseBinding>		m_MouseBindings;
+	
+	//--------------------------------------------
+	// RegisterKeyBind
+	//--------------------------------------------
+	protected void RegisterKeyBind( int ui_id, int key_code1, int key_code2, string plugin_name, string fnc_name, string info_shortcut, string info_description )
+	{
+		m_KeyBindings.Insert( new KeyBinding(ui_id, key_code1, key_code2, plugin_name, fnc_name, info_shortcut, info_description) );
+	}
+
+	//--------------------------------------------
+	// RegisterMouseBind
+	//--------------------------------------------
+	protected void RegisterMouseBind( int ui_id, int mouse_button, int mouse_event, string plugin_name, string fnc_name, string info_shortcut, string info_description )
+	{
+		m_MouseBindings.Insert( new MouseBinding(ui_id, mouse_button, mouse_event, plugin_name, fnc_name, info_shortcut, info_description) );
+	}
+
+	//--------------------------------------------
+	// IsCurrentUIPageValid
+	//--------------------------------------------
+	protected bool IsCurrentUIPageValid( int ui_page_request )
+	{
+		int ui_page_current = MENU_NONE;
+		
+		if ( GetGame().GetUIManager().GetMenu() )
+		{
+			ui_page_current = GetGame().GetUIManager().GetMenu().GetID();
+		}
+		
+		if ( ui_page_current < MENU_ANY || !CheckMask( ui_page_request, ui_page_current ) )
+		{			
+			if ( CheckMask( ui_page_request, MENU_NONE ) || !CheckMask( ui_page_request, MENU_ANY ) )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+
+	bool CheckMask( int source_mask, int target_mask )
+	{
+		if ( ( source_mask & target_mask ) == target_mask )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+
+	//--------------------------------------------
+	// OnMouse
+	//--------------------------------------------
+	protected void OnMouse( int event_id, int button )
+	{	
+		for ( int i = 0; i < m_MouseBindings.Count(); ++i )
+		{
+			MouseBinding mouse_binding = m_MouseBindings.Get(i);
+			
+			if ( mouse_binding.GetButtonID() == button && mouse_binding.GetMouseEvent() == event_id )
+			{
+				if ( IsCurrentUIPageValid( mouse_binding.GetUIMenuID() ) )
+				{
+					PluginBase m = GetPlugin(mouse_binding.GetCallbackTarget().ToType());
+					GetGame().GameScript.CallFunction(m, mouse_binding.GetCallbackFunction(), NULL, 0);
+				}
+			}			
+		}
+	}
+
+	//--------------------------------------------
+	// OnMouse
+	//--------------------------------------------
+	protected MouseButtonInfo GetMouseButtonInfo( int button )
+	{	
+		for ( int i = 0; i < m_MouseButtons.Count(); ++i )
+		{
+			MouseButtonInfo info = m_MouseButtons.Get(i);
+			
+			if ( info.GetButtonID() == button )
+			{
+				return info;
+			}
+		}
+		return NULL;
+	}
+
+	//--------------------------------------------
+	// IsKeyPressed
+	//--------------------------------------------
+	protected bool IsKeyPressed(int key)
+	{	
+		return ( KeyState(key) == 1 );
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginLifespan.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginLifespan.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f4db685fee44706b1bd8ff30a14067080d4969a
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginLifespan.c
@@ -0,0 +1,542 @@
+//-----------------------------
+// LIFESPAN plugin
+//-----------------------------
+/*
+Lifespan plugin handles player facial hair, bloody hands, blood type in HUD
+*/
+
+enum eBloodyHandsTypes
+{
+	CLEAN = 0,//clean needs to be 0
+	SALMONELA,
+	JUST_BLOOD,
+	//--- ONLY LAST_INDEX BELLOW !!!
+	LAST_INDEX,
+}
+
+enum LifeSpanState
+{
+	BEARD_NONE		= 0,
+	BEARD_MEDIUM	= 1,
+	BEARD_LARGE		= 2,	
+	BEARD_EXTRA		= 3,	
+	COUNT			= 4,
+}
+
+class PluginLifespan extends PluginBase
+{
+	protected static const int LIFESPAN_MIN = 0;
+	protected static const int LIFESPAN_MAX = 240; // value in minutes when player achieved maximum age in order to have full beard
+	protected int m_FakePlaytime;
+	
+	protected ref map<PlayerBase, ref LifespanLevel> m_PlayerCurrentLevel;
+	protected ref map<string, ref array< ref LifespanLevel>> m_LifespanLevels;
+	protected ref map<string, ref BloodyHands> m_BloodyHands;
+	protected ref map<PlayerBase, int> m_BloodType;
+
+	//========================================
+	// GetInstance
+	//========================================
+	static PluginLifespan GetInstance()
+	{
+		return PluginLifespan.Cast( GetPlugin(PluginLifespan) );
+	}
+	
+	void PluginLifespan()
+	{
+		LoadFromCfg();
+		m_PlayerCurrentLevel = new map<PlayerBase, ref LifespanLevel>;
+		m_BloodType = new map<PlayerBase, int>;
+		m_FakePlaytime = 0;
+	}
+
+//-----------------------------
+// Player load from config
+//-----------------------------
+	void LoadFromCfg()
+	{
+		m_LifespanLevels = new map<string, ref array< ref LifespanLevel>>;
+		m_BloodyHands = new map<string, ref BloodyHands>;
+		
+		const int LIFESPAN_LENGTH = LIFESPAN_MAX - LIFESPAN_MIN;
+
+		//cfg_name = 'CfgVehicles'
+		//	config_name = 'CfgVehicles'
+		//cfg_class_count = 2348
+		//	config_count = 2348
+		//cfg_class_name = 'SurvivorMale_Base'
+		//	survivor_name = 'SurvivorMale_Base'
+		//cfg_class_fullname = 'CfgVehicles SurvivorMale_Base'
+		//	survivor_path = 'CfgVehicles SurvivorMale_Base'
+		//cfg_class_member_count = 10
+		//	survivor_lifespan_count = 10
+		//cfg_class_member_name = 'Lifespan'
+		//	survivor_lifespan_name = 'Lifespan'
+		//cfg_class_member_fullname = 'CfgVehicles SurvivorMale_Base Lifespan';
+		//	survivor_lifespan_path = 'CfgVehicles SurvivorMale_Base Lifespan';
+		//cfg_class_member_member_count = 1
+		//	survivor_lifespan_beard_count = 1
+		//cfg_class_member_member_name = 'Beard'
+		//	survivor_lifespan_beard_name = 'Beard'
+		//cfg_class_member_member_fullname = 'CfgVehicles SurvivorMale_Base Lifespan Beard'
+		//	survivor_lifespan_beard_path = 'CfgVehicles SurvivorMale_Base Lifespan Beard'
+		//cfg_class_member_member_variable_name = 'mat'
+		//	survivor_lifespan_beard_material_name = 'mat'
+		//cfg_class_member_member_variable_fullname = 'CfgVehicles SurvivorMale_Base Lifespan Beard mat'
+		//	survivor_lifespan_beard_material_path = 'CfgVehicles SurvivorMale_Base Lifespan Beard mat'
+
+		string config_name = "CfgVehicles";
+		int config_count = GetGame().ConfigGetChildrenCount( config_name );
+			
+		int i, j, k, l, m;
+		
+		//Print( "config_count: " + config_count );
+		for ( i = 0; i < config_count; i++ )
+		{
+			string survivor_name = "";
+			GetGame().ConfigGetChildName( config_name, i, survivor_name );
+			
+			if ( survivor_name != "" && survivor_name != "access" )
+			{
+				if ( GetGame().IsKindOf(survivor_name, "SurvivorMale_Base")  ||  GetGame().IsKindOf(survivor_name, "SurvivorFemale_Base") )
+				{
+					string survivor_path = config_name + " " + survivor_name;
+					int survivor_lifespan_count = GetGame().ConfigGetChildrenCount( survivor_path );
+
+					//Print( "survivor_path: " + survivor_path );
+					for ( j = 0; j < survivor_lifespan_count; j++ )
+					{
+						string survivor_lifespan_name = "";
+						GetGame().ConfigGetChildName( survivor_path, j, survivor_lifespan_name );
+						
+						string survivor_lifespan_path = survivor_path + " " + survivor_lifespan_name;
+
+						if ( survivor_lifespan_name == "Lifespan" )
+						{
+							int survivor_lifespan_beard_count = GetGame().ConfigGetChildrenCount( survivor_lifespan_path );
+							
+							for ( k = 0; k < survivor_lifespan_beard_count; k++ )
+							{
+								string survivor_lifespan_beard_name = "";
+								GetGame().ConfigGetChildName( survivor_lifespan_path, k, survivor_lifespan_beard_name );
+								
+								string survivor_lifespan_beard_path = survivor_lifespan_path + " " + survivor_lifespan_beard_name;
+																
+								if ( survivor_lifespan_beard_name == "Beard" )
+								{									
+									TStringArray materials = new TStringArray;
+									int cfg_class_member_member_variable_count = GetGame().ConfigGetChildrenCount( survivor_lifespan_beard_path );
+									
+									for ( l = 0; l < cfg_class_member_member_variable_count; l++ )
+									{
+										string survivor_lifespan_beard_material_name = "";
+										GetGame().ConfigGetChildName( survivor_lifespan_beard_path, l, survivor_lifespan_beard_material_name );
+										string survivor_lifespan_beard_material_path = survivor_lifespan_beard_path + " " + survivor_lifespan_beard_material_name;
+										
+										if ( survivor_lifespan_beard_material_name == "mat" )
+										{
+											GetGame().ConfigGetTextArray( survivor_lifespan_beard_material_path, materials );
+											
+											array<ref LifespanLevel> lifespan_levels = new array< ref LifespanLevel>;
+
+											int level_count = materials.Count() / 2;
+											for ( m = 0; m < level_count; m++ )
+											{
+												int tex = m*2;
+												int mat = ((m*2)+1);
+												if ( mat < materials.Count() )
+												{
+													float threshold = (((float)m / (float)(level_count - 1)) * (float)LIFESPAN_LENGTH) + (float)LIFESPAN_MIN;
+													lifespan_levels.Insert( new LifespanLevel(m, threshold, materials.Get(tex), materials.Get(mat)) );
+													//Print("material a textura a threshold: " + materials.Get(tex) + " " + materials.Get(mat) + " " + threshold );
+												}
+											}
+											
+											if ( lifespan_levels.Count() > 0 )
+											{
+												m_LifespanLevels.Set( survivor_name, lifespan_levels );
+											}
+										}
+									}
+								}	
+							}
+						}
+						else if ( survivor_lifespan_name == "BloodyHands" )
+						{
+							string bloody_material, normal_material;
+							string path_normal = survivor_lifespan_path + " mat_normal";
+							string path_bloody = survivor_lifespan_path + " mat_blood";
+							GetGame().ConfigGetText(path_normal, normal_material);
+							GetGame().ConfigGetText(path_bloody, bloody_material);
+							m_BloodyHands.Set( survivor_name, new BloodyHands(normal_material, bloody_material) );
+						}
+					}
+				}
+			}
+		}
+		
+		/*for ( int cl = 0; cl < m_LifespanLevels.Count(); cl++ )
+		{
+			string class_name = m_LifespanLevels.GetKey( cl );
+			array<ref LifespanLevel> levels = m_LifespanLevels.GetElement( cl );
+
+			Print( class_name );
+
+			for ( int ll = 0; ll < levels.Count(); ll++)
+			{
+				Print( "lvl: " + levels.Get( ll ).GetLevel() );
+				Print( "treshold: " + levels.Get( ll ).GetThreshold() );
+				Print( "texture: " + levels.Get( ll ).GetTextureName() );
+				Print( "material: " + levels.Get( ll ).GetMaterialName() );
+			}
+		}*/
+	}
+
+//-----------------------------
+// Support functions
+//-----------------------------
+	
+	void SynchLifespanVisual( PlayerBase player, int beard_state_visible, bool bloody_hands_visible, bool blood_type_visible, int blood_type )
+	{
+		SynchBeardVisual( player, beard_state_visible );
+		SynchBloodyHandsVisual( player, bloody_hands_visible );
+		SynchShowBloodTypeVisual( player, blood_type_visible );
+		SynchShowBloodType( player, blood_type );
+	}
+	
+	void ChangeFakePlaytime( PlayerBase player, int change )
+	{
+		if ( !GetGame().IsMultiplayer() )
+		{
+			m_FakePlaytime = change;
+			UpdateLifespan( player, true );
+		}
+	}
+	
+//-----------------------------
+// Facial hair
+//-----------------------------
+	
+	void UpdateLifespan(PlayerBase player, bool force_update = false)
+	{
+		if (player != null)
+		{
+			float playerPlaytime = m_FakePlaytime;
+
+			if (GetGame().IsMultiplayer() && GetGame().IsServer())
+				playerPlaytime = player.StatGet(AnalyticsManagerServer.STAT_PLAYTIME);
+						
+			float playerBeard = playerPlaytime - player.GetLastShavedSeconds();
+			playerBeard = playerBeard / 60.0;
+			
+			UpdateLifespanLevel(player, playerBeard, force_update);
+		}
+	} 
+
+	protected void UpdateLifespanLevel( PlayerBase player, float player_beard, bool force_update = false )
+	{
+		if ( !player.IsAlive() )
+			return;
+		
+		if ( m_PlayerCurrentLevel.Contains(player) )
+		{
+			LifespanLevel current_level = m_PlayerCurrentLevel.Get( player );
+
+			if ( player_beard > current_level.GetThreshold() || force_update )
+			{
+				LifespanLevel next_level = GetLifespanLevel( player.GetPlayerClass(), player_beard );
+			
+				if ( next_level != NULL )
+				{
+					SetPlayerLifespanLevel( player, next_level );
+					m_PlayerCurrentLevel.Set( player, next_level );
+				}
+			}
+		}
+		else
+		{
+			if ( m_LifespanLevels.Contains( player.GetPlayerClass() ) )
+			{
+				LifespanLevel level = GetLifespanLevel( player.GetPlayerClass(), player_beard );
+
+				if ( level != NULL )
+				{
+					SetPlayerLifespanLevel( player, level );
+					m_PlayerCurrentLevel.Set( player, level );
+				}
+			}
+		}
+	}
+
+	protected LifespanLevel GetLifespanLevel( string player_class, float age = 0 )
+	{
+		array<ref LifespanLevel> lifespan_levels = m_LifespanLevels.Get( player_class );
+		
+		if ( lifespan_levels != NULL )
+		{
+			for ( int i = lifespan_levels.Count() - 1; i >= 0; i-- )
+			{
+				LifespanLevel level = lifespan_levels.Get( i );
+				
+				if ( age >= level.GetThreshold() )
+				{
+					return level;
+				}
+			}
+		}
+		
+		return NULL;
+	}
+
+	protected void SetPlayerLifespanLevel( PlayerBase player, LifespanLevel level )
+	{
+		if (player.m_CorpseState != 0)
+			return;
+		int slot_id = InventorySlots.GetSlotIdFromString("Head");	
+		EntityAI players_head = player.GetInventory().FindPlaceholderForSlot( slot_id );
+		
+		if ( players_head )
+		{
+			switch (level.GetLevel())
+			{
+				case LifeSpanState.BEARD_NONE:
+				{
+					players_head.SetObjectTexture( 0, "");
+					players_head.SetObjectMaterial( 0, "");		
+					
+					player.SetFaceTexture( level.GetTextureName() );
+					player.SetFaceMaterial( level.GetMaterialName() );
+
+					player.SetLifeSpanStateVisible(LifeSpanState.BEARD_NONE);
+					//Print("LifeSpanState.BEARD_NONE");
+					break;
+				}
+				case LifeSpanState.BEARD_MEDIUM:
+				{
+					players_head.SetObjectTexture( 0, "");
+					players_head.SetObjectMaterial( 0, "");	
+					
+					player.SetFaceTexture( level.GetTextureName() );
+					player.SetFaceMaterial( level.GetMaterialName() );
+										
+					player.SetLifeSpanStateVisible(LifeSpanState.BEARD_MEDIUM);
+					//Print("LifeSpanState.BEARD_MEDIUM");
+					break;
+				}
+				
+				case LifeSpanState.BEARD_LARGE:
+				{	
+					players_head.SetObjectTexture( 0, "");
+					players_head.SetObjectMaterial( 0, "");	
+							
+					player.SetFaceTexture( level.GetTextureName() );
+					player.SetFaceMaterial( level.GetMaterialName() );
+			
+					player.SetLifeSpanStateVisible(LifeSpanState.BEARD_LARGE);
+					//Print("LifeSpanState.BEARD_LARGE");
+					break;
+				}
+				
+				case LifeSpanState.BEARD_EXTRA:
+				{
+					players_head.SetObjectTexture( 0, level.GetTextureName() );
+					players_head.SetObjectMaterial( 0, level.GetMaterialName() );
+					
+					array< ref LifespanLevel> lifespan_levels = m_LifespanLevels.Get( player.GetPlayerClass() );
+					LifespanLevel prev_level = lifespan_levels.Get(LifeSpanState.BEARD_LARGE);
+
+					player.SetFaceTexture( prev_level.GetTextureName() );
+					player.SetFaceMaterial( prev_level.GetMaterialName() );
+					
+					player.SetLifeSpanStateVisible(LifeSpanState.BEARD_EXTRA);
+					//Print("LifeSpanState.BEARD_EXTRA");
+					break;
+				}
+									
+				default:
+				{
+					Print("Lifespan state missing");
+					break;
+				}
+			}	
+		}
+	}
+	
+	void SynchBeardVisual( PlayerBase player, int state )
+	{
+		float player_beard; 
+		
+		switch (state)
+		{
+			case LifeSpanState.BEARD_NONE:
+			{
+				// first out of 4 states
+				player_beard = LIFESPAN_MIN;
+				break;
+			}
+			case LifeSpanState.BEARD_MEDIUM:
+			{
+				// second out of 4 states
+				player_beard = LIFESPAN_MAX/3;
+				break;
+			}
+			
+			case LifeSpanState.BEARD_LARGE:
+			{
+				// third out of 4 states
+				player_beard = LIFESPAN_MAX/1.5;
+				break;
+			}
+			
+			case LifeSpanState.BEARD_EXTRA:
+			{
+				// fourth out of 4 states
+				player_beard = LIFESPAN_MAX;
+				break;
+			}
+								
+			default:
+			{
+				Print("Lifespan state missing");
+				break;
+			}
+		}
+		
+		UpdateLifespanLevel( player, player_beard, true );
+	}
+	
+//-----------------------------
+// Bloody hands
+//-----------------------------
+	
+	void UpdateBloodyHandsVisibilityEx( PlayerBase player, eBloodyHandsTypes type )
+	{
+		if ( CanMakeHandsBloody( player ) )
+		{
+			SetBloodyHandsEx( player, type );			
+		}
+	}
+	
+	void UpdateBloodyHandsVisibility( PlayerBase player, bool show )
+	{
+		if ( CanMakeHandsBloody( player ) )
+		{
+			SetBloodyHands( player, show );			
+		}
+	}
+	
+	void SynchBloodyHandsVisual( PlayerBase player, bool has_bloody_hands )
+	{
+		UpdateBloodyHandsVisibility( player, has_bloody_hands );
+	}
+	
+
+	void SetBloodyHandsEx( PlayerBase player, eBloodyHandsTypes type )
+	{
+		player.SetBloodyHandsEx( type );
+		
+		if ( type )
+		{
+			SetHandsMaterial( player, BloodyHands.MATERIAL_TYPE_BLOODY );
+		}
+		else
+		{
+			SetHandsMaterial( player, BloodyHands.MATERIAL_TYPE_NORMAL );
+		}
+		
+	}
+	
+	void SetBloodyHands( PlayerBase player, bool show )
+	{
+		player.SetBloodyHands( show );
+		
+		if ( show )
+		{
+			SetHandsMaterial( player, BloodyHands.MATERIAL_TYPE_BLOODY );
+		}
+		else
+		{
+			SetHandsMaterial( player, BloodyHands.MATERIAL_TYPE_NORMAL );
+		}
+	}
+
+	protected void SetHandsMaterial( PlayerBase player, int material_type )
+	{
+		string player_class = player.GetPlayerClass();
+		int slot_id;
+		EntityAI eai;
+
+		if ( m_BloodyHands.Contains(player_class))
+		{	
+			slot_id = InventorySlots.GetSlotIdFromString("Gloves");
+			eai = player.GetInventory().FindPlaceholderForSlot( slot_id );
+			
+			if (eai)
+			{
+				eai.SetObjectMaterial( 0, m_BloodyHands.Get(player_class).GetMaterial(material_type) );
+			}
+		}
+		else
+		{
+			//Print("Error! Player class <" + player_class + "> does not contain valid configuration for bloody hands!");
+		}
+	}
+
+	bool CanMakeHandsBloody( PlayerBase player )
+	{
+		return !player.FindAttachmentBySlotName( "Gloves" ) );
+	}
+	
+//-----------------------------
+// Blood type in HUD
+//-----------------------------
+	
+	void UpdateBloodTypeVisibility( PlayerBase player, bool show )
+	{
+		player.SetBloodTypeVisible( show );
+		
+		if ( player.m_Hud )
+		{
+			player.m_Hud.UpdateBloodName();
+		}
+	}
+	
+	void UpdateBloodType( PlayerBase player, int blood_type )
+	{
+		player.SetBloodType( blood_type );
+	}
+	
+	void SynchShowBloodTypeVisual( PlayerBase player, bool show )
+	{
+		UpdateBloodTypeVisibility( player, show );
+	}
+
+	void SynchShowBloodType( PlayerBase player, int blood_type )
+	{
+		UpdateBloodType( player, blood_type );
+	}
+	
+//-----------------------------
+// Getters for other systems
+//-----------------------------
+	
+	string GetCurrentHeadTexture(PlayerBase player)
+	{
+		if ( m_PlayerCurrentLevel.Contains(player) )
+		{
+			LifespanLevel current_level = m_PlayerCurrentLevel.Get( player );
+			return current_level.GetTextureName();
+		}
+		return "";
+	}
+	
+	string GetCurrentHeadMaterial(PlayerBase player)
+	{
+		if ( m_PlayerCurrentLevel.Contains(player) )
+		{
+			LifespanLevel current_level = m_PlayerCurrentLevel.Get( player );
+			return current_level.GetMaterialName();
+		}
+		return "";
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginMessageManager.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginMessageManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1d513b1d0661f0ead8bbdcad7a3303860065f13
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginMessageManager.c
@@ -0,0 +1,144 @@
+/*! Class PluginMessageManager provides some basic Message Distribution mechanics, if you get instance of this plugin class on your object, 
+you can use its methods to broadcast messages.
+*/
+class PluginMessageManager extends PluginBase
+{
+	int channelsUsed = 0;
+	ref array<ref MessageReceiverBase>	channelList[NUM_OF_CHANNELS];
+	
+	void PluginMessageManager()
+	{
+		for (int i = 0; i < NUM_OF_CHANNELS; i++)
+		{
+			channelList[i] = new array<ref MessageReceiverBase>;
+		}
+	}
+
+	//! Broadcasts an empty message on a channel provided in the 'index' parameter
+	void Broadcast(int index)
+	{
+		//Debug.Log("Broadcasting message on a channel: "+ ToString(index), "Messaging System");
+		array<ref MessageReceiverBase> x = channelList[index];
+		//int test = channelList[index].Count();
+		for(int i = 0; i < x.Count(); i++)
+		{
+			MessageReceiverBase mrb = x.Get(i);
+			
+			if(	mrb != NULL )
+			{
+				//string s = "Broadcasting message to: "+ToString(mrb);
+				//Log(s, LogTemplates.TEMPLATE_BROADCAST);
+				mrb.OnReceive(index);
+			}
+		}
+	}
+
+	//! Broadcasts a message on a channel provided in the 'index' parameter, passes the Int variable
+	void BroadcastInt(int index, int value)
+	{
+		//Debug.Log("Broadcasting message on a channel: "+ ToString(index), "Messaging System");
+		array<ref MessageReceiverBase> x = channelList[index];
+		//int test = channelList[index].Count();
+		for(int i = 0; i < x.Count(); i++)
+		{
+			MessageReceiverBase mrb = x.Get(i);
+			
+			if(	mrb )
+			{
+				//string s = "Broadcasting message to: "+ToString(mrb);
+				//Log(s, LogTemplates.TEMPLATE_BROADCAST);
+				mrb.OnReceiveInt(index, value);
+			}
+			
+		}
+	}
+
+	void BroadcastFloat(int index, float value)
+	{
+		//Debug.Log("Broadcasting message on a channel: "+ ToString(index), "Messaging System");
+		array<ref MessageReceiverBase> x = channelList[index];
+		//int test = channelList[index].Count();
+		for(int i = 0; i < x.Count(); i++)
+		{
+			MessageReceiverBase mrb = x.Get(i);
+			
+			if(	mrb )
+			{
+				//string s = "Broadcasting message to: "+ToString(mrb);
+				//Log(s, LogTemplates.TEMPLATE_BROADCAST);
+				mrb.OnReceiveFloat(index, value);
+			}
+			
+		}
+	}
+
+	void BroadcastString(int index, string value)
+	{
+		//Debug.Log("Broadcasting message on a channel: "+ ToString(index), "Messaging System");
+		array<ref MessageReceiverBase> x = channelList[index];
+		//int test = channelList[index].Count();
+		for(int i = 0; i < x.Count(); i++)
+		{
+			if(	x.Get(i) )
+			{
+				Print("broadcasting message to: ");
+				Print(x.Get(i));
+				x.Get(i).OnReceiveString(index, value);
+			}
+		}
+	}
+
+	//! Broadcasts a message on a channel provided in the 'index' parameter, passes the Param type object to the reciever
+	void BroadcastParam(int index, Param params)
+	{
+		//Debug.Log("Broadcasting message on a channel: "+ ToString(index), "Messaging System");
+		array<ref MessageReceiverBase> x = channelList[index];
+		//int test = channelList[index].Count();
+		for(int i = 0; i < x.Count(); i++)
+		{
+		
+			if(	x.Get(i) )
+			{
+				x.Get(i).OnReceiveParam(index, params);
+			}
+			
+		}
+	}
+	
+	//! Subscribes an object to listen to messages on a channel provided in the 'index' parameter
+	void Subscribe(MessageReceiverBase receiver, int index)
+	{
+		if(index > channelsUsed) //this is used to speed up the unsubscribeAll method, instead of all channels, we sweep just those in usage
+		{
+			channelsUsed = index;
+		}
+		array<ref MessageReceiverBase> chan = channelList[index];
+		if( chan.Find(receiver) >= 0 ) return;
+		chan.Insert(receiver);
+	}
+
+	void Unsubscribe(MessageReceiverBase receiver, int index)
+	{
+		array<ref MessageReceiverBase> chan = channelList[index];
+		int i = chan.Find(receiver);
+		if( i >= 0 )
+		{
+			chan.Remove(i);
+		}
+	}
+	
+	void UnsubscribeAll(MessageReceiverBase receiver)//REWORK.V: this is slow, should be made quicker(by registering all subscribers in a separate array upon their subscription and then going through this array instead)
+	{
+		//GetGame().ProfilerStart("UnsubscribeAll");
+		for (int i = 0; i <= channelsUsed; i++)
+		{
+			array<ref MessageReceiverBase> chan = channelList[i];
+			int c = chan.Find(receiver);
+			if( c >= 0 )
+			{
+				chan.Remove(c);
+			}
+		}
+		//GetGame().ProfilerStop("UnsubscribeAll");
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginObjectsInteractionManager.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginObjectsInteractionManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe4f29fd23c536f98e70f03b6b47162e1c6c6329
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginObjectsInteractionManager.c
@@ -0,0 +1,77 @@
+class PluginObjectsInteractionManager extends PluginBase
+{
+	private ref 		array<Object> m_LockedObjects;
+	private ref 		array<float> m_LockedObjectsDecay;
+	private const float		TIME_TO_FORCED_UNLOCK = 60;
+	private const float 	TICK_RATE = 10;
+	private ref Timer	m_DecayTimer;
+		
+	void PluginObjectsInteractionManager()
+	{
+		m_LockedObjects = new array<Object>;
+		m_LockedObjectsDecay = new array<float>;
+		//TIMERDEPRECATED - timer for decaying objects 
+		m_DecayTimer = new Timer();
+		m_DecayTimer.Run(TICK_RATE, this, "Decay", NULL,true);
+	}
+
+	bool IsFree(Object target)
+	{
+		if ( target && m_LockedObjects.Count() > 0 )
+		{
+			for ( int i = 0; i < m_LockedObjects.Count(); i++ )
+			{	
+				if ( m_LockedObjects.Get(i) == target )
+				{
+					return false;
+				}
+			}
+		}
+		return true;
+	}
+
+	void Lock(Object target)
+	{
+		if ( target && !IsFree(target) )
+		{
+			m_LockedObjects.Insert(target);
+			m_LockedObjectsDecay.Insert(0);
+		}
+	}
+
+	void Release(Object target)
+	{
+		if ( target && m_LockedObjects.Count() > 0 )
+		{
+			for ( int i = 0; i < m_LockedObjects.Count(); i++ )
+			{	
+				if ( m_LockedObjects.Get(i) == target )
+				{
+					m_LockedObjects.Remove(i);
+					m_LockedObjectsDecay.Remove(i);
+					break;
+				}
+			}
+		}
+	}
+	
+	//FAILSAFE - checks periodically locked objects and releases them automaticaly if given time has passed
+	void Decay()
+	{
+		if ( m_LockedObjectsDecay.Count() > 0 )
+		{
+			for ( int i = 0; i < m_LockedObjectsDecay.Count(); i++ )
+			{	
+				if ( m_LockedObjectsDecay.Get(i) >= TIME_TO_FORCED_UNLOCK )
+				{
+					m_LockedObjects.Remove(i);
+					m_LockedObjectsDecay.Remove(i);
+				}
+				else
+				{
+					m_LockedObjectsDecay.Get(i) += TICK_RATE;
+				}
+			}
+		}
+	}
+};
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginPermanentCrossHair.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginPermanentCrossHair.c
new file mode 100644
index 0000000000000000000000000000000000000000..609da4fa9314e6930f2141427ae0d21b5960ed90
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginPermanentCrossHair.c
@@ -0,0 +1,11 @@
+class PluginPermanentCrossHair extends PluginBase
+{
+	private Hud m_Hud;
+
+	void SwitchPermanentCrossHair(bool state)
+	{
+		if (!m_Hud)
+			m_Hud = GetGame().GetMission().GetHud();
+		m_Hud.SetPermanentCrossHair(state);
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginPlayerStatus.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginPlayerStatus.c
new file mode 100644
index 0000000000000000000000000000000000000000..b0ee456a249da1423aa0714e117b450b7b834e75
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginPlayerStatus.c
@@ -0,0 +1,106 @@
+class PluginPlayerStatus extends PluginBase
+{
+	ref multiMap<int, string> 	m_NotifiersLabel;
+	ref multiMap<int, int>		m_NotifiersIndexColor;
+
+	private ref multiMap<int, string>	m_NotifiersIcons;
+
+	void PluginPlayerStatus()
+	{
+		m_NotifiersLabel = new multiMap<int, string>; // [key] label
+		m_NotifiersIndexColor = new multiMap<int, int>; // [key] index, color
+
+		m_NotifiersIcons = new multiMap<int, string>; // [key] iconName
+		m_NotifiersIcons.Insert( NTFKEY_HUNGRY, "iconHunger" );
+		m_NotifiersIcons.Insert( NTFKEY_THIRSTY, "iconThirsty" );
+		m_NotifiersIcons.Insert( NTFKEY_SICK, "iconHealth" );
+		m_NotifiersIcons.Insert( NTFKEY_BACTERIA, "iconBacteria" );
+		m_NotifiersIcons.Insert( NTFKEY_BLEEDISH, "iconBlood" );
+		m_NotifiersIcons.Insert( NTFKEY_FEVERISH, "iconTemperature" );
+		m_NotifiersIcons.Insert( NTFKEY_FRACTURE, "iconFracture" );
+	}
+	
+	void SetNotifier( int key, int index = 9, string label = "", int color =  0xFFFFFFFF )
+	{
+		if ( key )
+		{
+			if ( m_NotifiersLabel.HasKey( key ) )
+			{
+				m_NotifiersLabel.Remove( key );
+				m_NotifiersIndexColor.Remove( key );
+			}
+
+			if ( label != "" ) 
+			{
+				m_NotifiersLabel.Insert( key, label );
+				m_NotifiersIndexColor.Insert( key, index );
+				m_NotifiersIndexColor.Insert( key, color );
+			}
+		}
+	}
+
+	void DisplayTendency( int key, int tendency, int status = 1 )
+	{
+		if ( key )
+		{
+			// display icon
+			int icon_index = 0;  // maybe we'll have several icons for different tendencies
+			if ( m_NotifiersIcons.HasKey( key ) )
+			{
+				string icon_name = m_NotifiersIcons.Get( key ).Get( icon_index );
+				Mission mission = GetGame().GetMission();
+				if ( mission )
+				{
+					Hud hud = mission.GetHud();
+					if ( hud )
+					{
+						hud.DisplayNotifier( key, tendency, status );
+					}
+				}
+			}
+		}
+	}
+
+	void SetBadge( int key, int value )
+	{
+		if ( key )
+		{
+			Mission mission = GetGame().GetMission();
+			if ( mission )
+			{
+				Hud hud = mission.GetHud();
+				if ( hud )
+				{
+					hud.DisplayBadge( key, value );
+				}
+			}
+		}
+	}
+
+	void SetStamina( int value , int range )
+	{
+		// Log( String( "SetStamina" + itoa( value) ), LogTemplates.TEMPLATE_JANOSIK );
+		Mission mission = GetGame().GetMission();
+		if ( mission )
+		{
+			Hud hud = mission.GetHud();
+			if ( hud )
+			{
+				hud.SetStamina( Math.Clamp( value, 0, range ), range );
+			}
+		}
+	}
+	
+	void SetStance( int value  )
+	{
+		Mission mission = GetGame().GetMission();
+		if ( mission )
+		{
+			Hud hud = mission.GetHud();
+			if ( hud )
+			{
+				hud.DisplayStance( value );
+			}
+		}
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginPresenceNotifier.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginPresenceNotifier.c
new file mode 100644
index 0000000000000000000000000000000000000000..b73000039e72454dd1af36e9c2d1ae26de772851
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginPresenceNotifier.c
@@ -0,0 +1,294 @@
+enum EPresenceNotifierNoiseEventType
+{
+	LAND_LIGHT,
+	LAND_HEAVY,
+}
+
+class PresenceNotifierNoiseEvent
+{
+	protected float m_TimerLength;
+	protected int m_Value;
+	
+	void PresenceNotifierNoiseEvent(float pValue, float pLength)
+	{
+		m_Value = pValue;
+		m_TimerLength = pLength;
+	}
+
+	float GetTimerLength()
+	{
+		return m_TimerLength;
+	}
+	
+	int GetValue()
+	{
+		return m_Value;
+	}
+}
+
+class PresenceNotifierNoiseEvents
+{
+	protected int m_Value;
+
+	protected static ref map<EPresenceNotifierNoiseEventType, ref PresenceNotifierNoiseEvent> 	m_PresenceNotifierNotifierEvents;
+	protected ref Timer	m_CooldownTimer;
+	
+	void PresenceNotifierNoiseEvents()
+	{
+		m_Value = 0;
+		m_CooldownTimer = new Timer(CALL_CATEGORY_SYSTEM);
+		m_PresenceNotifierNotifierEvents = new ref map<EPresenceNotifierNoiseEventType, ref PresenceNotifierNoiseEvent>;
+	}
+
+	void RegisterEvent(EPresenceNotifierNoiseEventType pEventType, int pValue, float pLength)
+	{
+		PresenceNotifierNoiseEvent pnne = new PresenceNotifierNoiseEvent(pValue, pLength);
+		m_PresenceNotifierNotifierEvents.Insert(pEventType, pnne);
+	}
+	
+	void ProcessEvent(EPresenceNotifierNoiseEventType pEventType)
+	{
+		PresenceNotifierNoiseEvent pnne;
+		
+		pnne = m_PresenceNotifierNotifierEvents.Get(pEventType);
+		
+		if (m_CooldownTimer.IsRunning())
+		{
+			m_CooldownTimer.Stop();
+		}
+
+		m_Value = pnne.GetValue();		
+		m_CooldownTimer.Run(pnne.GetTimerLength(), this, "ResetEvent", null);
+	}
+	
+	int GetValue()
+	{
+		return m_Value;
+	}
+
+	protected void ResetEvent()
+	{
+		m_Value = 0;
+	}
+}
+
+
+class PluginPresenceNotifier extends PluginBase
+{
+	//! dbgUI settings
+	const int windowPosX = 0;
+	const int windowPosY = 10;
+	const int mainPanelSizeX = 200;
+	const int mainPanelSizeY = 1;
+	const int margin = 10;
+	
+	
+	//! noise limits
+	const int NOISE_LEVEL_MIN			= 0;
+	const int NOISE_LEVEL_MAX			= 5;
+	
+	//! noise component from surfaces
+	const int SURFACE_NOISE_LVL0		= 0;
+	const int SURFACE_NOISE_LVL1		= 1;
+	const int SURFACE_NOISE_LVL2		= 2;
+	
+	const float SURFACE_LVL2_THRESHOLD 	= 1.0;
+	const float SURFACE_LVL1_THRESHOLD 	= 0.5;
+	
+	//! land noise
+	const int LAND_NOISE_LVL1			= 2;
+	const int LAND_NOISE_LVL2			= 3;
+	
+	//! --------------------------------------
+	
+	protected PlayerBase 		m_pPlayer;
+	
+	protected ref PresenceNotifierNoiseEvents m_PresenceNotifierNoiseEvents;
+
+	void PluginPresenceNotifier()
+	{
+		m_PresenceNotifierNoiseEvents = new PresenceNotifierNoiseEvents();
+		m_PresenceNotifierNoiseEvents.RegisterEvent(EPresenceNotifierNoiseEventType.LAND_LIGHT, LAND_NOISE_LVL1, 0.25);
+		m_PresenceNotifierNoiseEvents.RegisterEvent(EPresenceNotifierNoiseEventType.LAND_HEAVY, LAND_NOISE_LVL2, 0.25);
+	}
+	
+	void ~PluginPresenceNotifier() {}
+	
+	void Init(PlayerBase player)
+	{
+		m_pPlayer = player;
+	}
+
+	void EnableDebug(bool pEnabled)
+	{		
+		ShowCoefsDbg(pEnabled);
+	}
+	
+	protected void ShowCoefsDbg(bool pEnabled)
+	{
+		DbgUI.BeginCleanupScope();
+
+		if (pEnabled && m_pPlayer)
+		{
+			HumanMovementState hms = new HumanMovementState();
+			m_pPlayer.GetMovementState(hms);
+			
+			string visualAlertLevel;
+			string noiseAlertLevel;
+
+			DbgUI.Begin("Presence Notifier", windowPosX + 10, windowPosY);
+			DbgUI.Panel("MinimumSize", mainPanelSizeX, mainPanelSizeY);
+
+			DbgUI.Text("Visual: ");
+			DbgUI.Text("Visibility: " + m_pPlayer.GetVisibilityCoef());
+			DbgUI.Text("Speed: " + GetMovementSpeedVisualCoef());
+			DbgUI.Text("Stance: " + GetMovementStanceVisualCoef());
+			DbgUI.Spacer(10);
+		
+			DbgUI.Panel("-- Noises", mainPanelSizeX, 2);
+			DbgUI.Text("Noises: ");
+			DbgUI.Text("Speed:  " + NoiseAIEvaluate.GetNoiseMultiplierByPlayerSpeed(m_pPlayer));
+			DbgUI.Text("Boots: " + NoiseAIEvaluate.GetNoiseMultiplierByShoes(m_pPlayer));
+			DbgUI.Text("Surface: " + NoiseAIEvaluate.GetNoiseMultiplierBySurface(m_pPlayer) + " [ cfg: " + m_pPlayer.GetSurfaceNoise() + "]");
+			DbgUI.Spacer(10);
+
+			DbgUI.Panel("-- Result", mainPanelSizeX, 2);
+			DbgUI.Text("Result: ");
+			visualAlertLevel = "";
+			for (int iv = 0; iv < GetVisualPresence(); iv++)
+			{
+				visualAlertLevel += "!";
+			}
+			DbgUI.Text("Visual level: " + GetVisualPresence() + " [" + visualAlertLevel + "]");
+
+						
+			noiseAlertLevel = "";
+			for (int ia = 0; ia < GetNoisePresence(); ia++)
+			{
+				noiseAlertLevel += "!";
+			}
+
+			DbgUI.Text("Noise level: " + GetNoisePresence() + " [" + noiseAlertLevel + "]");
+		
+			DbgUI.End();
+			
+			//! HumanMovementState content
+			DbgUI.Begin("HumanMovementState", windowPosX + 250, windowPosY);
+			DbgUI.Panel("MinimumSize", mainPanelSizeX, mainPanelSizeY);
+			DbgUI.Text("Command ID: " + hms.m_CommandTypeId);
+			DbgUI.Text("Stance: " + hms.m_iStanceIdx);
+			DbgUI.Text("Movement: " + hms.m_iMovement);
+			DbgUI.End();
+		}
+
+		DbgUI.EndCleanupScope();
+	}
+	
+	//! returns actual noise presence of player
+	int GetNoisePresence()
+	{		
+		return ProcessNoiseComponents();
+	}
+	
+	//! returns actual visibility presence of player
+	int GetVisualPresence()
+	{
+		return ProcessVisualComponents();
+	}
+
+	//! processing of external one-time events (land, fire, etc.)
+	void ProcessEvent(EPresenceNotifierNoiseEventType pEventType)
+	{
+		m_PresenceNotifierNoiseEvents.ProcessEvent(pEventType);
+	}
+	
+	protected int ProcessVisualComponents()
+	{
+		float visualMean = 0;
+		if (m_pPlayer)
+		{
+			visualMean = (m_pPlayer.GetVisibilityCoef() + GetMovementSpeedVisualCoef() + GetMovementStanceVisualCoef()) / 3;
+		}
+		
+		return visualMean;	
+	}
+
+	protected int ProcessNoiseComponents()
+	{
+		float noise = 0;
+		if (m_pPlayer)
+		{
+			noise = NoiseAIEvaluate.GetNoiseMultiplier(m_pPlayer);
+			noise = Math.Round(noise * NOISE_LEVEL_MAX);
+		}
+		
+		return Math.Clamp(noise, NOISE_LEVEL_MIN, NOISE_LEVEL_MAX);
+	}
+	
+	
+	//! Visibility
+	protected float GetMovementSpeedVisualCoef()
+	{
+		HumanMovementState hms	= new HumanMovementState();
+		float speedCoef 		= 1.0;
+
+		m_pPlayer.GetMovementState(hms);
+		switch (AITargetCallbacksPlayer.StanceToMovementIdxTranslation(hms))
+		{
+			case DayZPlayerConstants.MOVEMENTIDX_RUN:
+				speedCoef = 0.66;
+			break;
+			case DayZPlayerConstants.MOVEMENTIDX_WALK:
+				speedCoef = 0.33;
+			break;
+			case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+				speedCoef = 0;
+			break;
+		}
+		
+		return speedCoef;
+	}
+	
+	protected float GetMovementStanceVisualCoef()
+	{
+		HumanMovementState hms	= new HumanMovementState();
+		float stanceCoef 		= 1.0;
+
+		m_pPlayer.GetMovementState(hms);
+		switch (hms.m_iStanceIdx)
+		{
+			case DayZPlayerConstants.STANCEIDX_CROUCH:
+			case DayZPlayerConstants.STANCEIDX_RAISEDCROUCH:
+				stanceCoef = 0.33;
+			break;
+				
+			case DayZPlayerConstants.STANCEIDX_PRONE:
+			case DayZPlayerConstants.STANCEIDX_RAISEDPRONE:
+				stanceCoef = 0.11;
+			break;
+		}
+		
+		return stanceCoef;
+	}
+	
+	//! --------------------------------------------------------
+
+
+	//!
+	//! Noise related
+	// Not used since 1.12
+	
+	//! noise component of presence based on player's speed
+	//! DEPRECATED
+	protected int GetMovementSpeedNoiseComponent();
+
+	//! noise component of presence based on player's shoes
+	//! DEPRECATED
+	protected int GetBootsNoiseComponent();
+	
+	//! DEPRECATED
+	protected int GetSurfaceNoiseComponent();
+
+	//! DEPRECATED
+	protected int GetExternalNoiseEventsComponent();
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginRecipesManager.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginRecipesManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f8a6c752a96417d698e0d14891ee147464d1a8a
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginRecipesManager.c
@@ -0,0 +1,643 @@
+enum ERecipeSanityCheck
+{
+	IS_IN_PLAYER_INVENTORY = 1,
+	NOT_OWNED_BY_ANOTHER_LIVE_PLAYER = 2,
+	CLOSE_ENOUGH = 4,
+}
+
+const float ACCEPTABLE_DISTANCE = 5;
+
+const int SANITY_CHECK_ACCEPTABLE_RESULT = ERecipeSanityCheck.NOT_OWNED_BY_ANOTHER_LIVE_PLAYER | ERecipeSanityCheck.CLOSE_ENOUGH;
+
+class PluginRecipesManager extends PluginRecipesManagerBase
+{
+	static ref map<string,ref CacheObject > m_RecipeCache = new map<string,ref CacheObject >;
+	static ref map<typename, bool> m_RecipesInitializedItem = new ref map<typename, bool>;
+	
+	
+	ref Timer m_TestTimer;
+	const int MAX_NUMBER_OF_RECIPES = GetMaxNumberOfRecipes();
+	const int MAX_CONCURENT_RECIPES = 128;
+	const int MAX_INGREDIENTS = 5;
+	
+	int m_RegRecipeIndex;
+	int m_ResolvedRecipes[MAX_CONCURENT_RECIPES];
+	
+	bool m_EnableDebugCrafting = false;
+	ItemBase m_Ingredients[MAX_INGREDIENTS];
+	int m_IngredientBitMask[MAX_INGREDIENTS];
+	int m_IngredientBitMaskSize[MAX_INGREDIENTS];
+	
+	int m_BitsResults[MAX_INGREDIENTS];
+	
+	ItemBase m_ingredient1[MAX_CONCURENT_RECIPES];
+	ItemBase m_ingredient2[MAX_CONCURENT_RECIPES];
+	ItemBase m_ingredient3[MAX_CONCURENT_RECIPES];
+	
+	ItemBase m_sortedIngredients[MAX_NUMBER_OF_INGREDIENTS];
+	
+	ref array<int> m_RecipesMatched = new array<int>;
+	ref array<string> m_CachedItems = new array<string>;
+
+	ref array<ref RecipeBase> m_RecipeList = new array<ref RecipeBase>;//all recipes
+	static ref map<string, int> m_RecipeNamesList = new map<string, int>;//all recipes
+	
+	ref Timer myTimer1;
+	
+	static int GetMaxNumberOfRecipes()
+	{
+		return 2048;
+	}
+	
+	void PluginRecipesManager()
+	{
+
+		CreateAllRecipes();
+		GenerateRecipeCache();
+		
+		myTimer1 = new Timer();
+	}
+	
+	void ~PluginRecipesManager()
+	{
+	}
+	
+
+	bool IsEnableDebugCrafting()
+	{
+		return m_EnableDebugCrafting;
+	}
+
+	void SetEnableDebugCrafting(bool enable)
+	{
+		m_EnableDebugCrafting = enable;
+	}
+
+	string GetRecipeName(int recipe_id)
+	{
+		if (m_RecipeList[recipe_id])
+			return m_RecipeList[recipe_id].GetName();
+
+		return "";
+	}
+
+
+	//will fill the map 'ids' with valid recipes for the 'item1' and 'item2' items, where the key is the recipe ID, and the value is the recipe name
+	int GetValidRecipes(ItemBase item1, ItemBase item2, array<int> ids, PlayerBase player)
+	{
+		if ( item1 == NULL || item2 == NULL )
+		{
+			if (ids) ids.Clear();
+			return 0;
+		}
+		
+		if ( ( item1.GetInventory().IsAttachment() && item1.GetHierarchyParent().DisassembleOnLastDetach() ) || ( item2.GetInventory().IsAttachment() && item2.GetHierarchyParent().DisassembleOnLastDetach() ) )
+		{
+			if (ids) ids.Clear();
+			return 0;
+		}
+		m_Ingredients[0] = item1;
+		m_Ingredients[1] = item2;
+		
+		return GetValidRecipesProper(2,m_Ingredients, ids, player);
+	}
+	
+	int GetValidRecipesProper(int num_of_items, ItemBase items[], array<int> ids, PlayerBase player)
+	{
+		if (ids) ids.Clear();
+		GetRecipeIntersection(num_of_items,items);
+		int numOfRecipes = SortIngredients(num_of_items,items,m_ResolvedRecipes);
+		//will return number of cached recipes for the 2 items being considered, 
+		//and save their indexes in m_ResolvedRecipes, please note the m_ResolvedRecipes is a static array, 
+		//and does not clear up with each query, so the number of recipes returned is critical to make sure we don't accidentally
+		//mix in some other indexes from previous queries(and obviously loop only as far as we have to)
+		//this also saves the ingredients in the correct assignment as ingredient 1/2 into m_ingredient1/m_ingredient2 arrays, these 3 arrays
+		//therefore provide you with information per each index with: recipeid,ingredient1,ingredient2
+		if ( numOfRecipes == 0 ) return 0;
+		int found = 0;
+		RecipeBase p_recipe = NULL;
+		for (int i = 0; i < numOfRecipes; i++)
+		{
+			p_recipe = m_RecipeList[m_ResolvedRecipes[i]];
+
+			if ( p_recipe.CheckRecipe(m_ingredient1[i],m_ingredient2[i], player) == true )
+			{
+				if (ids) ids.Insert( p_recipe.GetID() );
+				found++;
+			}
+		}
+		return found;
+	}
+
+
+	float GetRecipeLengthInSecs(int recipe_id)
+	{
+		if ( m_RecipeList[recipe_id] ) return m_RecipeList[recipe_id].GetLengthInSecs();
+		return 0;
+	}
+
+	float GetRecipeSpecialty(int recipe_id)
+	{
+		if ( m_RecipeList[recipe_id] ) return m_RecipeList[recipe_id].GetSpecialty();
+		return 0;
+	}
+
+	bool GetIsInstaRecipe(int recipe_id)
+	{
+		if ( m_RecipeList[recipe_id] ) return m_RecipeList[recipe_id].IsInstaRecipe();
+		else return false;
+	}
+
+	override void OnInit()
+	{
+		super.OnInit();
+		//ReadCacheFromFile(PATH_CACHE_FILE);//read the cache from a file
+		//GenerateHumanReadableRecipeList();
+	}
+
+
+	void CallbackGenerateCache()
+	{
+		Debug.Log("CallbackGenerateCache","recipes");
+		GenerateRecipeCache();
+		//SaveCacheToFile(PATH_CACHE_FILE);//generate the cache and save it to a file
+		//ReadCacheFromFile(PATH_CACHE_FILE);
+	}
+
+	protected void GenerateRecipeCache()
+	{
+		GetGame().ProfilerStart("m_RecipeCache");
+		
+		//m_CacheBasesMap.Clear();
+		m_CachedItems.Clear();
+		PluginRecipesManager.m_RecipeCache.Clear();
+		
+		TStringArray all_config_paths = new TStringArray;
+		
+		all_config_paths.Insert(CFG_VEHICLESPATH);
+		all_config_paths.Insert(CFG_WEAPONSPATH);
+		all_config_paths.Insert(CFG_MAGAZINESPATH);
+		//Debug.Log("Got here 0","caching");
+		string config_path;
+		string child_name;
+		int scope;
+		TStringArray full_path = new TStringArray;
+		WalkRecipes();
+		for (int i = 0; i < all_config_paths.Count(); i++)
+		{
+			config_path = all_config_paths.Get(i);
+			int children_count = GetGame().ConfigGetChildrenCount(config_path);
+			
+			for (int x = 0; x < children_count; x++)
+			{
+				GetGame().ConfigGetChildName(config_path, x, child_name);
+				scope = GetGame().ConfigGetInt( config_path + " " + child_name + " scope" );
+
+				if ( scope == 2 )
+				{
+					GetGame().ConfigGetFullPath(config_path +" "+ child_name,/*out*/ full_path);
+					MatchItems(full_path);
+				}
+			}
+		}
+		GetGame().ProfilerStop("m_RecipeCache");
+	}
+
+	void WalkRecipes()
+	{
+		//Print("------------- WalkRecipes --------------");
+		for (int c = 0; c < m_RecipeList.Count(); c++)
+		{
+			RecipeBase recipe = m_RecipeList.Get(c);
+			if (recipe)
+			{
+				//Print(recipe.ClassName());
+				int recipe_id = recipe.GetID();
+				for (int i = 0; i < MAX_NUMBER_OF_INGREDIENTS; i++)
+				{
+					array<string> list = recipe.m_Ingredients[i];
+					
+					for (int x = 0; x < list.Count(); x++)
+					{
+						string ingredient = list.Get(x);
+						int mask = Math.Pow(2,i);
+						CacheObject co = m_RecipeCache.Get(ingredient);
+	
+						if (!co)
+						{
+							co = new CacheObject;
+							m_RecipeCache.Insert(ingredient,co);
+						}
+						co.AddRecipe(recipe_id, mask);
+					}
+				}
+			}
+		}
+	}
+
+	
+	// moved outside method to speed things up
+	ref array<int> m_RcpsArray;
+	string m_BaseName;
+	int m_RecipeID;
+	int item_mask;
+	int m_BaseMask;
+	string m_ItemName;
+	ref CacheObject m_CoItem;
+	ref CacheObject m_CoBase;
+	
+	//this will take the item class name and resolve it against all processed recipes
+	protected void MatchItems(TStringArray full_path)
+	{
+		m_ItemName = full_path.Get(0);
+		m_CoItem = m_RecipeCache.Get(m_ItemName);
+		//Print(m_ItemName);
+		if ( !m_CoItem )
+		{
+			m_CoItem = new CacheObject;
+			m_RecipeCache.Insert(m_ItemName,m_CoItem);
+		}
+		for (int i = 1; i < full_path.Count(); i++)
+		{
+			m_BaseName = full_path.Get(i);
+			m_CoBase = m_RecipeCache.Get(m_BaseName);
+			if ( m_CoBase )//resolve new base classes
+			{
+				m_RcpsArray = m_RecipeCache.Get(m_BaseName).GetRecipes();
+				
+				for ( int x = 0; x < m_RcpsArray.Count(); x++ )//base recipes
+				{
+					m_RecipeID = m_RcpsArray.Get(x);
+					
+					//item_mask = m_CoItem.GetMaskByRecipeID(m_RecipeID);
+					m_BaseMask = m_CoBase.GetMaskByRecipeID(m_RecipeID);
+						
+					m_CoItem.AddRecipe(m_RecipeID,m_BaseMask);
+				}
+			}
+		}
+
+		
+	}
+
+	void PerformRecipeServer(int id, ItemBase item_a,ItemBase item_b ,PlayerBase player)
+	{
+		m_Ingredients[0] = item_a;
+		m_Ingredients[1] = item_b;
+		
+		if ( !item_a || !item_b ) 
+		{
+			Error("PerformRecipeServer - one of the items null !!");
+			return;
+		}
+		
+		SortIngredientsInRecipe(id, 2,m_Ingredients, m_sortedIngredients);
+
+		bool is_recipe_valid = CheckRecipe(id,m_sortedIngredients[0],m_sortedIngredients[1],player);
+		bool passed_sanity_check = RecipeSanityCheck(2,m_sortedIngredients,player);
+		
+		if ( !is_recipe_valid )
+		{
+			Error("PerformRecipeServer - recipe not valid !!");
+			return;
+		}
+		if ( !passed_sanity_check )
+		{
+			Error("PerformRecipeServer - recipe failed to pass sanity check !!");
+			return;
+		}
+		RecipeBase ptrRecipe = m_RecipeList[id];
+		ptrRecipe.PerformRecipe(m_sortedIngredients[0],m_sortedIngredients[1],player);
+		//player.RequestCraftingDisable();
+		
+	}
+	
+	void GenerateHumanReadableRecipeList()
+	{
+		FileHandle file = OpenFile("$profile:RecipeDump.txt", FileMode.WRITE);
+		if ( file == 0 )
+		{
+			//error message
+			PrintString("failed to open file RecipeDump");
+			return;
+		}
+		array<int> recipes = new array<int>;
+		for (int i = 0; i < PluginRecipesManager.m_RecipeCache.Count(); i++)
+		{
+			string key = PluginRecipesManager.m_RecipeCache.GetKey(i);
+			CacheObject value = PluginRecipesManager.m_RecipeCache.GetElement(i);
+			
+			string line = key;
+			recipes.Clear();
+			recipes.InsertAll( value.GetRecipes() );
+			
+			//PrintString("Item: " + key);
+			
+			for (int x = 0; x < recipes.Count(); x++)
+			{
+				int recipe_id = recipes.Get(x);
+				string recipe_name = GetRecipeName(recipe_id);
+				line += "," +recipe_name;
+			}
+			FPrintln(file, line);
+		}
+		CloseFile(file);
+	}
+	
+	array<RecipeBase> GetRecipesForItem(string itemName)
+	{
+		CacheObject co = PluginRecipesManager.m_RecipeCache.Get(itemName);
+		array<int> ids = co.GetRecipes();
+
+		array<RecipeBase> recipes = new array<RecipeBase>();
+		foreach (int recipeID : ids)
+		{
+			recipes.Insert(m_RecipeList[recipeID]);
+		}
+
+		return recipes;
+	}
+	
+	protected bool RecipeSanityCheck(int num_of_ingredients, InventoryItemBase items[], PlayerBase player)
+	{
+		int check_results[MAX_INGREDIENTS];
+
+		for (int i = 0; i < num_of_ingredients;i++)
+		{
+			ItemBase item = items[i];
+			Man item_owner_player = item.GetHierarchyRootPlayer();
+			vector item_pos = item.GetPosition();
+			vector player_pos = player.GetPosition();
+			
+			if (item_owner_player == player)
+			{
+				check_results[i] =  check_results[i] | ERecipeSanityCheck.IS_IN_PLAYER_INVENTORY;
+			}
+			
+			if ( item_owner_player == NULL || item_owner_player == player || !item_owner_player.IsAlive() )
+			{
+				check_results[i] = check_results[i] | ERecipeSanityCheck.NOT_OWNED_BY_ANOTHER_LIVE_PLAYER;			
+			}
+			
+			if ( vector.Distance(item_pos, player_pos ) < ACCEPTABLE_DISTANCE )
+			{
+				check_results[i] = check_results[i] | ERecipeSanityCheck.CLOSE_ENOUGH;			
+			}
+		}
+		for (i = 0; i < num_of_ingredients;i++)
+		{
+			if ( !((check_results[i] & SANITY_CHECK_ACCEPTABLE_RESULT) == SANITY_CHECK_ACCEPTABLE_RESULT))
+			{
+				return false;
+			}
+		}
+		return true;
+	}
+
+	override protected void RegisterRecipe(RecipeBase recipe)
+	{
+		
+		if ( m_RegRecipeIndex >= MAX_NUMBER_OF_RECIPES )
+		{
+			Error("Exceeded max. number of recipes, max set to: "+MAX_NUMBER_OF_RECIPES.ToString());
+		}
+		
+		m_RegRecipeIndex = m_RecipeList.Insert(recipe);
+		recipe.SetID(m_RegRecipeIndex);
+		m_RecipeNamesList.Insert(recipe.ClassName(), m_RegRecipeIndex);
+		//Print("RegisterRecipe: " +recipe.ClassName() + ", "+ m_RegRecipeIndex.ToString());
+	}
+
+	override protected void UnregisterRecipe(string clasname)
+	{
+		int recipe_id = RecipeIDFromClassname(clasname);
+		//Print("UnregisterRecipe: " + recipe_id.ToString());
+		if (recipe_id != -1)
+		{
+			m_RecipeNamesList.Remove(clasname);
+			//Print(m_RecipeList[recipe_id]);
+			m_RecipeList[recipe_id] = null;
+			//Print(m_RecipeList[recipe_id]);
+		}
+	}
+	
+	static int RecipeIDFromClassname(string classname)
+	{
+		if (m_RecipeNamesList.Contains(classname))
+			return m_RecipeNamesList.Get(classname);
+		return -1;
+	}
+	
+	protected bool CheckRecipe(int id, ItemBase item1, ItemBase item2, PlayerBase player)//requires ordered items
+	{
+		RecipeBase p_recipe = m_RecipeList[id];
+		return p_recipe.CheckRecipe(item1,item2, player);
+	}
+	
+	protected void PrintCache()
+	{
+		for (int i = 0; i < PluginRecipesManager.m_RecipeCache.Count(); i++)
+		{
+			string key = PluginRecipesManager.m_RecipeCache.GetKey(i);
+			CacheObject co = PluginRecipesManager.m_RecipeCache.GetElement(i);
+
+			PrintString("Item: " + key);
+			co.DebugPrint();
+			PrintString("----------------");
+		}
+	}
+	//!sorts ingredients correctly as either first or second ingredient based on their masks
+	protected bool SortIngredientsInRecipe(int id, int num_of_ingredients, ItemBase ingredients_unsorted[], ItemBase ingredients_sorted[] )
+	{
+		ClearResults();
+		
+		for (int i = 0; i < num_of_ingredients; i++)
+		{
+			CacheObject co_item = PluginRecipesManager.m_RecipeCache.Get( ingredients_unsorted[i].GetType() );
+			m_IngredientBitMask[i] = co_item.GetMaskByRecipeID(id);
+			m_IngredientBitMaskSize[i] = co_item.GetBitCountByRecipeID(id);
+		}
+		
+		bool result = ResolveIngredients(num_of_ingredients);
+		
+		if (result)
+		{
+			for (i = 0; i < num_of_ingredients; i++)
+			{
+				int index = Math.Log2( m_BitsResults[i]);
+				ingredients_sorted[index] = ingredients_unsorted[ i ];
+			}
+		}
+		//PrintResultMasks(num_of_ingredients);
+		return result;
+	}
+	
+	protected void ClearResults()
+	{
+		for (int i = 0; i < MAX_INGREDIENTS; i++)
+		{
+			m_BitsResults[i] = 0;			
+		}	
+			
+	}
+	
+	protected bool ResolveIngredients(int num_of_ingredients, int passes = 0)
+	{
+		int rightmost_bit;
+		int smallest = 99999;
+		int smallest_index = 0;
+
+		for (int i = 0; i < num_of_ingredients; i++)
+		{
+			int count = m_IngredientBitMaskSize[i];
+			if ( count != 0 && count < smallest)
+			{
+				smallest = m_IngredientBitMaskSize[i];
+				smallest_index = i;
+			}
+		}
+		
+		rightmost_bit = m_IngredientBitMask[smallest_index] & (-m_IngredientBitMask[smallest_index]);
+		m_BitsResults[smallest_index] = m_BitsResults[smallest_index] | rightmost_bit;
+		
+		for (int x = 0; x < num_of_ingredients; x++)
+		{
+			m_IngredientBitMask[x] = ~rightmost_bit & m_IngredientBitMask[x];
+			m_IngredientBitMask[smallest_index] = 0;
+			m_IngredientBitMaskSize[smallest_index] = 0;
+		}
+		
+		// check validity
+		int check_sum_vertical = 0;
+		
+		for (int z = 0; z < num_of_ingredients; z++)
+		{
+			check_sum_vertical = check_sum_vertical | m_IngredientBitMask[z];//vertical sum
+			check_sum_vertical = check_sum_vertical | m_BitsResults[z];//vertical sum
+			if ((m_IngredientBitMask[z] | m_BitsResults[z]) == 0) 
+			{
+				return false;//horizontal check
+			}
+		}
+		
+		if ( check_sum_vertical != (Math.Pow(2, num_of_ingredients) - 1)) return false;//vertical check
+		
+		passes++;
+		
+		if (passes < num_of_ingredients) 
+		{
+			if ( !ResolveIngredients(num_of_ingredients, passes) ) return false;
+		}
+		return true;
+	}
+	
+	
+	protected void PrintResultMasks(int num)
+	{
+		for (int i = 0; i < num; i++)
+		{
+			Debug.Log("results mask("+i.ToString()+") = " +m_BitsResults[i].ToString() );
+		}
+	}
+	
+	//!fills an array with recipe IDs which 'item_a' and 'item_b' share
+	protected int GetRecipeIntersection(int num_of_ingredients, ItemBase items[])
+	{
+		int count = 0;
+		int smallest = 9999;
+		int smallest_index = 0;
+		m_RecipesMatched.Clear();
+		
+		/*
+		m_Ingredients[0] = item_a;
+		m_Ingredients[1] = item_b;
+		*/
+		//find the item with smallest number of recipes
+		CacheObject co_least_recipes;
+		
+		for (int i = 0; i < num_of_ingredients; i++)
+		{
+			CacheObject cobject = PluginRecipesManager.m_RecipeCache.Get( items[i].GetType() );
+			if (!cobject) 
+			{
+				return 0;
+			}
+			if (cobject.GetNumberOfRecipes() < smallest)
+			{
+				smallest = cobject.GetNumberOfRecipes();
+				smallest_index = i;
+				co_least_recipes = cobject;
+			}
+		}
+		
+		//look for matches
+		array<int> recipes = co_least_recipes.GetRecipes();
+		for (int x = 0; x < recipes.Count(); x++)
+		{
+			int id = recipes.Get(x);
+			for (int z = 0; z < num_of_ingredients; z++)
+			{
+				if ( z!= smallest_index)
+				{
+					CacheObject cobject2 = PluginRecipesManager.m_RecipeCache.Get( items[z].GetType() );
+					if ( cobject2.IsContainRecipe(id) )
+					{
+						m_RecipesMatched.Insert(id);
+						count++;
+					}
+				}
+			}
+		}
+		return count;
+	}
+
+	protected int SortIngredients(int num_of_ingredients, ItemBase items_unsorted[], int resolved_recipes[])
+	{
+		int count = 0;
+		for (int i = 0; i < m_RecipesMatched.Count() && i < MAX_CONCURENT_RECIPES; i++)
+		{
+			int recipe_id = m_RecipesMatched.Get(i);
+			
+				if (SortIngredientsInRecipe(recipe_id, num_of_ingredients, items_unsorted, m_sortedIngredients))//...and now we need to determine which item will be which ingredient number
+				{
+					resolved_recipes[count] = recipe_id;
+					m_ingredient1[count] = m_sortedIngredients[0];
+					m_ingredient2[count] = m_sortedIngredients[1];
+					//m_ingredient3[count] = m_sortedIngredients[2];
+					count++;
+				}
+		}
+		return count;
+	}
+	
+	
+	protected void CreateAllRecipes()
+	{
+		RegisterRecipies();
+	}
+	
+	
+	string GetSoundCategory(int recipeID, ItemBase item1, ItemBase item2)
+	{
+		ItemBase unsorted[2];
+		ItemBase sorted[2];
+		
+		unsorted[0] = item1;
+		unsorted[1] = item2;
+		
+		SortIngredientsInRecipe(recipeID, 2,unsorted, sorted);
+
+		RecipeBase recipe = m_RecipeList[recipeID];
+		string soundCat = recipe.GetSoundCategory(0,sorted[0]);
+		
+		if (!soundCat)
+		{
+			soundCat = recipe.GetSoundCategory(1,sorted[1]);
+		}
+		
+		return soundCat;
+	}
+	
+	
+	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginRepairing.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginRepairing.c
new file mode 100644
index 0000000000000000000000000000000000000000..9c7cc3c991f4fda4ebcfc101bf55b8b2c792a1fe
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginRepairing.c
@@ -0,0 +1,155 @@
+class PluginRepairing extends PluginBase
+{
+	bool Repair(PlayerBase player, ItemBase repair_kit, Object item, float specialty_weight, string damage_zone = "", bool use_kit_qty = true)
+	{
+		switch (item.GetHealthLevel(damage_zone))
+		{
+			case GameConstants.STATE_PRISTINE:
+				break;
+			case GameConstants.STATE_RUINED:
+				#ifdef DEVELOPER
+				Debug.Log("repairing from GameConstants.STATE_RUINED");
+				#endif
+				CalculateHealth( player, repair_kit, item, specialty_weight, damage_zone, use_kit_qty );
+				break;
+			case GameConstants.STATE_WORN:
+				if (CanRepairToPristine(player) || CanBeRepairedToPristine(item))
+				{
+					CalculateHealth( player, repair_kit, item, specialty_weight,/* GameConstants.DAMAGE_PRISTINE_VALUE,*/ damage_zone, use_kit_qty );
+				}
+				break;
+			default:
+				CalculateHealth( player, repair_kit, item, specialty_weight, damage_zone, use_kit_qty );
+				break;
+		}
+
+		return true;
+	}
+
+	void CalculateHealth( PlayerBase player, ItemBase kit, Object item, float specialty_weight, string damage_zone = "", bool use_kit_qty = true )
+	{
+		EntityAI entity;
+		Class.CastTo(entity,item);
+		
+		if (entity != null)
+		{
+			entity.SetAllowDamage(true);
+		}
+		
+		bool kit_has_quantity = kit.HasQuantity();
+		int health_levels_count = item.GetNumberOfHealthLevels(damage_zone);
+		float cur_kit_quantity = kit.GetQuantity();
+		float kit_repair_cost_per_level = GetKitRepairCost( kit, item );
+		float kit_repair_cost_adjusted; //used with specialty_weight, disconnected
+		float new_quantity;
+		
+		int target_level = Math.Clamp(item.GetHealthLevel(damage_zone) - 1, 0, health_levels_count - 1);
+		float health_coef;
+		if ( !CanRepairToPristine( player ) && !CanBeRepairedToPristine( item ) )
+		{
+			target_level = Math.Clamp(target_level, GameConstants.STATE_WORN, health_levels_count - 1);
+		}
+		health_coef = item.GetHealthLevelValue(target_level,damage_zone);
+		
+		//handles kit depletion; TODO: move to separate method.
+		if ( cur_kit_quantity > kit_repair_cost_per_level )
+		{
+			kit_repair_cost_adjusted = kit_repair_cost_per_level; //TODO: removed speciality weight for now, it should affect speed only (?).
+			//kit_repair_cost_adjusted = player.GetSoftSkillsManager().SubtractSpecialtyBonus( kit_repair_cost_per_level, specialty_weight );
+			kit_repair_cost_adjusted = Math.Clamp( kit_repair_cost_adjusted, 0, 100 );
+			if(use_kit_qty)
+			{
+				new_quantity = kit.GetQuantity() - kit_repair_cost_adjusted;
+				kit.SetQuantity( new_quantity );
+			}
+		}
+		else if (!kit_has_quantity) //"kit" without quantity (hammers and such) for your every day repairing needs
+		{
+		}
+		else
+		{
+			if(use_kit_qty)
+			{
+				kit.SetQuantity( 0 );
+			}
+		}
+		
+		if (item.GetHealth01(damage_zone,"Health") < health_coef)
+		{
+			item.SetHealth01(damage_zone,"Health",health_coef);
+		}
+		
+		if (entity != null)
+		{
+			entity.ProcessInvulnerabilityCheck(entity.GetInvulnerabilityTypeString());
+		}
+	}
+
+	bool CanRepair( ItemBase repair_kit, Object item, string damage_zone = "" )
+	{
+		int state = item.GetHealthLevel(damage_zone);
+		
+		if ( state != GameConstants.STATE_RUINED && (item.CanBeRepairedToPristine() && state >= GameConstants.STATE_WORN) || (!item.CanBeRepairedToPristine() && state >= GameConstants.STATE_DAMAGED ) )
+		{
+			int repair_kit_type = repair_kit.ConfigGetInt( "repairKitType" );
+			
+			array<int> repairable_with_types = new array<int>;
+			item.ConfigGetIntArray( "repairableWithKits", repairable_with_types );	
+			
+			for ( int i = 0; i < repairable_with_types.Count(); i++ )
+			{
+				int repairable_with_type = repairable_with_types.Get(i);
+				
+				if ( IsRepairValid( repair_kit_type, repairable_with_type ) )
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+		
+	}
+	
+	private bool IsRepairValid(int repair_kit_type, int repairable_with_type)
+	{
+		if (repair_kit_type > 0 && repairable_with_type > 0)
+		{
+			return repair_kit_type == repairable_with_type;
+		}
+		
+		return false;
+	}
+
+	//! Player can repair items to 100%; currently unused
+	private bool CanRepairToPristine(PlayerBase player)
+	{
+		return false; 
+	}
+	
+	//! Item can be repaired to 100%
+	private bool CanBeRepairedToPristine(Object item)
+	{
+		return item.CanBeRepairedToPristine();
+	}
+	
+	private float GetKitRepairCost(ItemBase repair_kit, Object item)
+	{
+		array<int> allowedRepairKitTypes 	= new array<int>();	
+		array<float> repairKitCosts 		= new array<float>();
+		
+		item.ConfigGetIntArray("repairableWithKits", allowedRepairKitTypes);
+		item.ConfigGetFloatArray("repairCosts", repairKitCosts);
+		
+		int repairKitType = repair_kit.ConfigGetInt("repairKitType");
+		
+		foreach (int i, int allowedKitType : allowedRepairKitTypes)
+		{
+			if (allowedKitType == repairKitType)
+			{
+				return repairKitCosts.Get(i);
+			}
+		} 
+					
+		return 0;
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginSceneManager.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginSceneManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..a0d28786a4156fdb64598590073d9d31c7455537
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginSceneManager.c
@@ -0,0 +1,1279 @@
+class PluginSceneManager extends PluginBase
+{
+	static string		SCENE_DEFAULT_NAME		= "default";
+	static string		SCENE_SUFIX				= "scene";
+	static PlayerBase	PLAYER;
+	static PluginSceneManager instance;
+	
+	bool			m_RulerActivated;
+	ref array<vector>	m_RulerPoints;
+	ref array<Shape>	m_RulerLines;
+	ref array<Shape>	m_RulerSpheres;
+	
+	static const int SCENE_EDITOR_CMD_REFRESH	= 0;
+	static const int SCENE_EDITOR_CMD_POPUP		= 1;
+	static const int SCENE_EDITOR_CMD_SAVE		= 2;
+	
+	//---------------------------------------------------------------------------------
+	// >> Public scope
+
+	// System Events
+	void PluginSceneManager()
+	{
+		if ( instance == NULL )
+		{
+			instance = this;
+		}
+	}
+	
+	// System Events
+	void ~PluginSceneManager()
+	{
+		if ( instance == NULL )
+		{
+			instance = this;
+		}
+	}
+	
+	static PluginSceneManager GetInstance()
+	{
+		return PluginSceneManager.Cast( GetPlugin( PluginSceneManager ) );
+	}
+
+	//==========================================
+	// OnInit (System Event)
+	//==========================================
+	override void OnInit()
+	{
+		m_ModuleDeveloper			= PluginDeveloper.Cast( GetPlugin(PluginDeveloper) );
+		m_ModuleConfigScene			= PluginConfigScene.Cast( GetPlugin(PluginConfigScene) );
+		m_ModuleConfigDebugProfile	= PluginConfigDebugProfile.Cast( GetPlugin(PluginConfigDebugProfile) );
+		
+		//Ruler
+		m_RulerActivated = false;
+		m_RulerPoints	= new array<vector>;
+		m_RulerLines	= new array<Shape>;
+		m_RulerSpheres	= new array<Shape>;
+	}
+
+	//==========================================
+	// OnDestroy (destructor)
+	//==========================================
+	override void OnDestroy()
+	{
+		SceneUnload();
+	}
+	
+	//==========================================
+	// OnMouseWheel
+	//==========================================
+	void OnMouseWheel(int wheel)
+	{
+		if ( !IsMouseInScene() )
+		{
+			return;
+		}
+		
+		if ( GetSelectedSceneObject() )
+		{
+			GetSelectedSceneObject().AddRotation(GetRotationAngle() * wheel);
+		}
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// OnUIEditorOpened
+	//==========================================
+	void OnUIEditorOpened()
+	{	
+		m_IsOpen = true;
+
+		DeveloperFreeCamera.EnableFreeCameraSceneEditor( PlayerBase.Cast( GetGame().GetPlayer() ) );
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(this.FreeCameraControlDisable);
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// OnUIEditorClosed
+	//==========================================
+	void OnUIEditorClosed()
+	{
+		m_IsOpen = false;
+		
+		FreeCameraControlEnable();
+		
+		m_ModuleDeveloper.ToggleFreeCameraBackPos();
+		
+		EditorUpdate();
+	}
+	
+	//::::::::::::::::::::::::::::::::::::::::::
+	// Event_OnClick
+	//::::::::::::::::::::::::::::::::::::::::::
+	void Event_OnClick()
+	{
+		if ( !IsMouseInScene() || !m_IsOpen )
+		{
+			return;
+		}
+			
+		// Direction Vector from current active Camera
+		vector dir = GetGame().GetPointerDirection();
+		
+		// Raycast from
+		vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+		// Raycast to
+		vector to = from + ( dir * 10000 );
+		// Raycast out parameter
+		vector contact_pos;
+		vector contact_dir;
+		int contact_component;
+		set<Object> objects = new set<Object>;
+		bool selected = false;
+		
+		if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component, objects) )   
+		{
+			for ( int i = 0; i < objects.Count(); ++i )
+			{
+				Object obj = objects.Get(i);
+				
+				if ( obj.IsInherited( EntityAI ) )
+				{
+					SceneObject sc_object = SceneObject.Cast( m_SceneData.GetSceneObjectByEntityAI(EntityAI.Cast( obj ) ) );
+					
+					if ( sc_object == NULL )
+					{
+						//sc_object = m_SceneData.AddObject(obj);
+						return;
+					}
+					
+					SelectObject( sc_object );
+					selected = true;
+					
+					break;
+				}
+			}
+		}
+		
+		if ( !selected )
+		{
+			DeselectObject();
+			
+			//	Ruler
+			if ( IsRulerActivated() && GetSelectedSceneObject() == NULL )
+			{
+				RulerAddPoint();
+			}
+		}
+		
+		EditorUpdate();
+	}
+
+	//::::::::::::::::::::::::::::::::::::::::::
+	// Event_OnClickMiddle
+	//::::::::::::::::::::::::::::::::::::::::::
+	void Event_OnClickMiddle()
+	{
+		if ( !IsMouseInScene() || !m_IsOpen )
+		{
+			return;
+		}
+		
+		if ( GetSelectedSceneObject() != NULL )
+		{
+			// Direction Vector from current active Camera
+			vector dir = GetGame().GetPointerDirection();
+			
+			// Raycast from
+			vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+			// Raycast to
+			vector to = from + ( dir * 10000 );   
+			// Raycast out parameter
+			vector contact_pos;
+			vector contact_dir;
+			int contact_component;
+			set<Object> objects = new set<Object>;
+			bool selected = false;
+			
+			if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component, objects) )   
+			{
+				for ( int i = 0; i < objects.Count(); ++i )
+				{
+					Object obj = objects.Get(i);
+					
+					if ( obj.IsInherited( EntityAI ) )
+					{
+						EntityAI eai = EntityAI.Cast( obj );
+						SceneObject scene_object = m_SceneData.GetSceneObjectByEntityAI(eai);
+						
+						if ( !scene_object.IsPlayer() )
+						{
+							if ( scene_object != NULL && scene_object != GetSelectedSceneObject() )
+							{
+								if ( !AreSceneObjectsLinked(GetSelectedSceneObject(), scene_object) ) 
+								{
+									LinkSceneObjects( GetSelectedSceneObject(), scene_object );
+								}
+								else
+								{
+									UnlinkSceneObjects( GetSelectedSceneObject(), scene_object );
+								}
+							}
+						}
+						else
+						{
+							SceneEditorMenuCmdPopup("I am sorry. You cant create link on player!");
+						}
+					}
+				}
+			}
+		}
+		
+		EditorUpdate();
+	}
+
+	//::::::::::::::::::::::::::::::::::::::::::
+	// Event_OnDrag
+	//::::::::::::::::::::::::::::::::::::::::::
+	void Event_OnDrag()
+	{
+		if ( !IsMouseInScene() || !m_IsOpen )
+		{
+			return;
+		}
+		
+		if ( GetSelectedSceneObject() != NULL )
+		{
+			// Direction Vector from current active Camera
+			vector dir = GetGame().GetPointerDirection();
+			
+			// Raycast from
+			vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+			// Raycast to
+			vector to = from + ( dir * 10000 );   
+			// Raycast out parameter
+			vector contact_pos;
+			vector contact_dir;
+			int contact_component;
+			
+			//Raycast(vector begPos, vector endPos, out vector contactPos, out vector contactDir, out int contactComponent, out set<Object> results = NULL, Object with = NULL, Object ignore = NULL,  bool sorted = false,  bool ground_only = false,  int iType = ObjIntersectView, float radius = 0.0);
+			
+			if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component, NULL, NULL, NULL, false, true) )   
+			{
+				GetSelectedSceneObject().SetPosition(contact_pos);
+			}
+			
+			EditorUpdate();
+		}
+	}
+
+	//::::::::::::::::::::::::::::::::::::::::::
+	// Event_OnDoubleClick
+	//::::::::::::::::::::::::::::::::::::::::::
+	SceneObject Event_OnDoubleClick()
+	{
+		if ( !IsMouseInScene() || !m_IsOpen || m_ClassBrowserSelected == "" )
+		{
+			return null;
+		}
+		
+		// Direction Vector from current active Camera
+		vector dir = GetGame().GetPointerDirection();
+		
+		// Raycast from
+		vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+		// Raycast to
+		vector to = from + ( dir * 10000 );   
+		// Raycast out parameter
+		vector contact_pos;
+		vector contact_dir;
+		int contact_component;
+		
+		if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component) )   
+		{
+			SceneObject obj = m_SceneData.CreateSceneObject(m_ClassBrowserSelected, contact_pos);
+			
+			if ( obj != NULL )
+			{
+				SelectObject(obj);
+				return obj;
+			}			
+		}
+		
+		return NULL;
+	}
+	
+	//==========================================
+	// Load
+	//==========================================
+	void InitLoad()
+	{		
+		PLAYER = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		SceneLoad( PluginMissionConfig.GetInstance().GetSceneEditorName() );
+		
+		RestoreSceneObjectsLinks();
+		
+		ExecuteInitScripts();
+	}
+
+	//==========================================
+	// RestoreSceneObjectsLinks
+	//==========================================
+	void RestoreSceneObjectsLinks()
+	{
+		array<ref SceneObject> scene_objects = GetSceneObjects();
+			
+		for ( int i = 0; i < scene_objects.Count(); i++ )
+		{
+			SceneObject scene_object = scene_objects.Get(i);
+			
+			array<int> linked_scene_objects_indices = scene_object.m_LinkedSceneObjectsIndices;
+			if (linked_scene_objects_indices)
+			{
+				for ( int j = 0; j < linked_scene_objects_indices.Count(); j++ )
+				{
+					int index = linked_scene_objects_indices.Get(j);
+					if ( index >= 0 && index < scene_objects.Count() )
+					{
+						scene_object.LinkSceneObject( scene_objects.Get(index), false );
+						
+//PrintString("Load link: "+ ToString(scene_object.GetObject()) +" <-> "+ ToString(scene_objects.Get(index).GetObject()) );
+					}
+				}
+			}
+			scene_object.m_LinkedSceneObjectsIndices = NULL;
+		}
+	}
+
+	//==========================================
+	// ExecuteInitScripts
+	//==========================================
+	void ExecuteInitScripts()
+	{
+		array<ref SceneObject> scene_objects = GetSceneObjects();	
+		for ( int i = 0; i < scene_objects.Count(); i++ )
+		{
+			SceneObject scene_object = scene_objects.Get(i);
+			ExecuteEnforceScript( i, scene_object, scene_object.GetInitScript() );
+		}
+	}
+	
+	//==========================================
+	// EditorToggle
+	//==========================================
+	void EditorToggle()
+	{	
+		//Log("EditorToggle");
+
+		if ( GetGame().IsMultiplayer() )
+		{
+			return;
+		}
+
+		if ( IsOpened() )
+		{
+			// Close UI Scene Editor Menu
+			GetGame().GetUIManager().Back();
+		}
+		else
+		{
+			// Open UI Scene Editor Menu
+			GetGame().GetUIManager().EnterScriptedMenu(MENU_SCENE_EDITOR, NULL);
+			EditorUpdate();
+		}
+	}
+	
+	//==========================================
+	// IsOpened
+	//==========================================
+	bool IsOpened()
+	{
+		return m_IsOpen;
+	}
+
+	//==========================================
+	// SelectClassName
+	//==========================================
+	void SelectClassName(string class_name)
+	{
+		m_ClassBrowserSelected = class_name;
+	}
+
+	//==========================================
+	// FreeCameraControlEnable
+	//==========================================
+	void FreeCameraControlEnable()
+	{
+		// Enable Camera control
+		GetGame().GetInput().ChangeGameFocus(-1);
+		
+		// Disable Cursor
+		GetGame().GetUIManager().ShowUICursor(false);
+		
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnHide();
+	}
+
+	//==========================================
+	// FreeCameraControlDisable
+	//==========================================
+	void FreeCameraControlDisable()
+	{
+		// Disable Camera control
+		GetGame().GetInput().ChangeGameFocus(1);
+		
+		// Enable Cursor
+		GetGame().GetUIManager().ShowUICursor(true);
+		
+		if( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().OnShow();
+	}
+	
+	//==========================================
+	// DeleteSelectedObject
+	//==========================================
+	void DeleteSelectedObject()
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		
+		if ( selected_obj != NULL )
+		{
+			if ( !selected_obj.IsPlayer() )
+			{
+				array<ref SceneObject> scene_objects = GetSceneObjects();
+				for ( int i = 0; i < scene_objects.Count(); i++ )
+				{
+					if ( AreSceneObjectsLinked(scene_objects.Get(i), selected_obj) )
+					{
+						UnlinkSceneObjects(scene_objects.Get(i), selected_obj);
+					}
+				}
+				
+				m_SceneData.DeleteSceneObject(selected_obj);
+				
+				scene_objects.RemoveItem(selected_obj);
+				
+				DeselectObject();
+			}
+			else
+			{
+				SceneEditorMenuCmdPopup("You cant delete player!");
+			}
+		}
+		
+		EditorUpdate();
+	}
+	
+	//==========================================
+	// SelectObject
+	//==========================================
+	void SelectObject(SceneObject obj)
+	{
+		if ( GetSelectedSceneObject() != NULL && GetSelectedSceneObject() == obj )
+		{
+			return;
+		}
+		
+		DeselectObject();
+
+		m_SelectedObject = obj;
+		
+		EditorUpdate();
+	}
+	
+	//==========================================
+	// GetSelectedSceneObject
+	//==========================================
+	SceneObject GetSelectedSceneObject()
+	{
+		return m_SelectedObject;
+	}
+
+	//==========================================
+	// SelectedObjectDuplicate
+	//==========================================
+	void SelectedObjectDuplicate()
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		
+		if ( selected_obj )
+		{
+			if ( selected_obj.GetObject() == PLAYER )
+			{
+				return;
+			}
+			
+			vector size = GetSelectedSceneObject().GetSize();
+			
+			vector new_pos = selected_obj.GetPosition() + Vector(1, 0, 1) + size;
+			
+			SceneObject obj = m_SceneData.CreateSceneObject(selected_obj.GetTypeName(), new_pos );
+			obj.SetRotation(selected_obj.GetRotation());
+			
+			array<EntityAI> attachments = selected_obj.GetAttachments();
+			for ( int i = 0; i < attachments.Count(); i++ )
+			{
+				obj.AddAttachment( attachments.Get(i).GetType() );
+			}
+			
+			SelectObject(obj);
+		}
+	}
+
+	//==========================================
+	// SelectedObjectSetRot
+	//==========================================
+	void SelectedObjectSetRot(float dir)
+	{
+		if ( GetSelectedSceneObject() )
+		{
+			GetSelectedSceneObject().SetRotation(dir);
+			
+			EditorUpdate();
+		}
+	}
+
+	//==========================================
+	// SelectedObjectSetPosX
+	//==========================================
+	void SelectedObjectSetPosX(float value)
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		
+		if ( selected_obj )
+		{
+			vector v = selected_obj.GetPosition();
+			v[0] = value;
+			selected_obj.SetPosition(v);
+			
+			EditorUpdate();
+		}
+	}
+
+	//==========================================
+	// SelectedObjectSetPosY
+	//==========================================
+	void SelectedObjectSetPosY(float value)
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		
+		if ( selected_obj )
+		{
+			vector v = selected_obj.GetPosition();
+			v[1] = value;
+			selected_obj.SetPosition(v);
+			
+			EditorUpdate();
+		}
+	}
+
+	//==========================================
+	// SelectedObjectSetPosZ
+	//==========================================
+	void SelectedObjectSetPosZ(float value)
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		
+		if ( GetSelectedSceneObject() )
+		{
+			vector v = selected_obj.GetPosition();
+			v[2] = value;
+			selected_obj.SetPosition(v);
+			
+			EditorUpdate();
+		}
+	}
+
+	//==========================================
+	// SelectedObjectSetDamage
+	//==========================================
+	void SelectedObjectSetDamage(float value)
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		EntityAI selected_obj_EAI = selected_obj.GetObject();
+		
+		if ( selected_obj )
+		{
+			selected_obj.SetHealth(Math.Clamp ( value, 0, selected_obj_EAI.GetMaxHealth("", "") ));
+			
+			EditorUpdate();
+		}
+	}
+
+	//==========================================
+	// SelectedObjectFocus
+	//==========================================
+	void SelectedObjectFocus()
+	{
+		SceneObject selected_obj = GetSelectedSceneObject();
+		
+		if ( selected_obj )
+		{
+			vector		cam_pos = FreeDebugCamera.GetInstance().GetPosition();
+			vector		obj_pos = selected_obj.GetPosition();
+			vector		view_target = obj_pos;
+			
+			vector obj_size = selected_obj.GetSize();
+			
+			cam_pos = obj_pos;
+			
+			cam_pos[0] = cam_pos[0] + ( obj_size[0] * 2 );
+			cam_pos[1] = cam_pos[1] + obj_size[1] + 0.5;
+			cam_pos[2] = cam_pos[2] + ( obj_size[2] * 2 );		
+			
+			view_target[1] = view_target[1] + (obj_size[1] * 0.5);
+			
+			vector cam_dir = view_target - cam_pos;
+			cam_dir.Normalize();
+			
+			FreeDebugCamera.GetInstance().SetPosition(cam_pos);
+			FreeDebugCamera.GetInstance().SetDirection(cam_dir);
+			
+			//vector debug_pos = cam_pos + (cam_dir * 50);
+			//Debug.DrawLine(cam_pos, debug_pos);
+			//Debug.DrawSphere(cam_pos);
+		}
+	}
+
+	//==========================================
+	// SelectedObjectAddAttachment
+	//==========================================
+	void SelectedObjectAddAttachment(string att_name)
+	{
+		if ( GetSelectedSceneObject() )
+		{
+			GetSelectedSceneObject().AddAttachment(att_name);
+		}
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// SelectedObjectRemoveAttachment
+	//==========================================
+	void SelectedObjectRemoveAttachment(EntityAI e)
+	{
+		if ( GetSelectedSceneObject() )
+		{
+			GetSelectedSceneObject().RemoveAttachment(e);
+		}
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// LinkSceneObjects
+	//==========================================
+	void LinkSceneObjects(SceneObject scene_object1, SceneObject scene_object2)
+	{
+		scene_object1.LinkSceneObject(scene_object2);
+		scene_object2.LinkSceneObject(scene_object1);
+	}
+
+	//==========================================
+	// UnlinkSceneObjects
+	//==========================================
+	void UnlinkSceneObjects(SceneObject scene_object1, SceneObject scene_object2)
+	{
+		scene_object1.UnlinkSceneObject(scene_object2);
+		scene_object2.UnlinkSceneObject(scene_object1);
+	}
+
+	//==========================================
+	// AreSceneObjectsLinked
+	//==========================================
+	bool AreSceneObjectsLinked(SceneObject scene_object1, SceneObject scene_object2)
+	{
+		if ( scene_object1.IsLinkedWithSceneObject(scene_object2) && scene_object2.IsLinkedWithSceneObject(scene_object1) )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	//==========================================
+	// SetDrawSelection
+	//==========================================
+	void SetDrawSelection(bool draw)
+	{
+		m_ModuleConfigDebugProfile.SetSceneEditorDrawSelection(draw);
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// GetDrawSelection
+	//==========================================
+	bool GetDrawSelection()
+	{
+		return m_ModuleConfigDebugProfile.GetSceneEditorDrawSelection();
+	}
+
+	//==========================================
+	// SetLoadPlayerPos
+	//==========================================
+	void SetLoadPlayerPos(bool save)
+	{
+		m_ModuleConfigDebugProfile.SetSceneEditorLoadPlayerPos(save);
+	}
+
+	//==========================================
+	// SetLoadPlayerPos
+	//==========================================
+	bool GetLoadPlayerPos()
+	{
+		return m_ModuleConfigDebugProfile.GetSceneEditorLoadPlayerPos();
+	}
+	
+	//==========================================
+	// SetRotationAngle
+	//==========================================
+	void SetRotationAngle(int angle)
+	{
+		m_ModuleConfigDebugProfile.SetSceneEditorRotationAngle(angle);
+	}
+
+	//==========================================
+	// GetRotationAngle
+	//==========================================
+	int	GetRotationAngle()
+	{
+		return m_ModuleConfigDebugProfile.GetSceneEditorRotationAngle();
+	}
+
+	//==========================================
+	// SceneLoad
+	//==========================================
+	void SceneLoad(string scene_name)
+	{
+		SceneUnload();
+		
+		PluginMissionConfig.GetInstance().SetSceneEditorName(scene_name);
+		m_SceneData = m_ModuleConfigScene.SceneDataLoad(scene_name);
+		
+		if ( !(GetGame().IsMultiplayer() && GetGame().IsServer()) )
+		{
+			EditorUpdate();
+		}
+	}
+
+	//==========================================
+	// SceneUnload
+	//==========================================
+	void SceneUnload()
+	{
+		m_SceneData = NULL;
+		DeselectObject();
+	}
+
+	//==========================================
+	// SceneSave
+	//==========================================
+	void SceneSave()
+	{
+		m_ModuleConfigScene.ClearParams();
+		m_ModuleConfigScene.SceneDataSave(m_SceneData);
+		SceneEditorMenuCmdSave();
+		EditorUpdate();
+	}
+
+	//==========================================
+	// SceneDelete
+	//==========================================
+	bool SceneCanDelete(string scene_name)
+	{
+		if ( scene_name == m_SceneData.GetNameScene() )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+
+	//==========================================
+	// SceneDelete
+	//==========================================
+	bool SceneDelete(string scene_name)
+	{
+		if ( scene_name == m_SceneData.GetNameScene() )
+		{
+			return false;
+		}
+		
+		m_ModuleConfigScene.SceneDelete(scene_name);
+		
+		EditorUpdate();
+		
+		return true;
+	}	
+
+	//==========================================
+	// SceneDelete
+	//==========================================
+	void SceneDuplicate(string scene_name)
+	{
+		m_ModuleConfigScene.SceneDuplicate(scene_name);
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// SceneRename
+	//==========================================
+	void SceneRename(string scene_name, string new_name)
+	{
+		m_ModuleConfigScene.SceneRename(scene_name, new_name);
+		
+		if ( scene_name == m_SceneData.GetNameScene() )
+		{
+			m_SceneData.SetNameScene(new_name);
+		}
+		
+		EditorUpdate();
+	}
+
+	//==========================================
+	// SceneGetName
+	//==========================================
+	string SceneGetName()
+	{
+		if ( m_SceneData )
+		{
+			return m_SceneData.GetNameScene();
+		}
+		
+		return STRING_EMPTY;
+	}
+	
+	//==========================================
+	// SetWeather
+	//==========================================
+	void SetWeather(float overcast, float rain, float fog, float wind_force)
+	{
+		m_SceneData.SetInitOvercast(overcast);
+		m_SceneData.SetInitRain(rain);
+		m_SceneData.SetInitFog(fog);
+		m_SceneData.SetInitWindForce(wind_force);
+	}
+
+	//==========================================
+	// SetDate
+	//==========================================
+	void SetDate( int year, int month, int day, int hour, int minute )
+	{
+		m_SceneData.SetInitYear(year);
+		m_SceneData.SetInitMonth(month);
+		m_SceneData.SetInitDay(day);
+		m_SceneData.SetInitHour(hour);
+		m_SceneData.SetInitMinute(minute);
+	}
+
+	//==========================================
+	// SelectAndFocusPlayerObject
+	//==========================================
+	void SelectAndFocusPlayerObject()
+	{
+		array<ref SceneObject> scene_objects = GetSceneObjects();
+		for ( int i = 0; i < scene_objects.Count(); i++ )
+		{
+			if ( scene_objects.Get(i).GetObject() == GetGame().GetPlayer() )
+			{
+				SelectObject( scene_objects.Get(i) );
+				SelectedObjectFocus();
+				break;
+			}
+		}
+	}
+		
+	//------------------------------------------
+	// ExecuteEnforceScript
+	//------------------------------------------
+	void ExecuteEnforceScript( int index, SceneObject scene_object, string script )
+	{
+		if ( script != "" )
+		{
+			string cls = scene_object.GetObject().ClassName();
+			string wrapped_script = "void scMngMain() \n{\n PluginSceneManager se = GetPlugin(Type(\"PluginSceneManager\")); \n SceneObject this_obj = se.GetSceneObjectByIndex(" + index.ToString() + "); \n " + cls + " this_eai = this_obj.GetObject(); \n " + script + "\n}\n";
+			
+			GetGame().ExecuteEnforceScript(wrapped_script, "scMngMain");
+		}
+	}
+	
+	//==========================================
+	// RulerToggle
+	//==========================================
+	void RulerToggle()
+	{
+		if ( IsRulerActivated() )
+		{
+			m_RulerActivated = false;
+		}
+		else
+		{
+			m_RulerActivated = true;
+		}
+		
+		SceneEditorMenuCmdRefresh();
+	}
+
+	//==========================================
+	// ActivateRuler
+	//==========================================
+	bool IsRulerActivated()
+	{
+		return m_RulerActivated;
+	}
+
+	//==========================================
+	// RulerAddPoint
+	//==========================================
+	void RulerAddPoint()
+	{
+		vector point_pos = GetMousePositionInScene();
+		
+		m_RulerPoints.Insert( point_pos );
+		
+		EditorUpdateRuler();
+	}
+
+	//------------------------------------------
+	// RulerClearVisuals
+	//------------------------------------------
+	void RulerClearVisuals()
+	{
+		for ( int i = 0; i < m_RulerLines.Count(); ++i )
+		{
+			m_RulerLines.Get(i).Destroy();
+		}
+		m_RulerLines.Clear();
+		
+		for ( int j = 0; j < m_RulerSpheres.Count(); ++j )
+		{
+			m_RulerSpheres.Get(j).Destroy();
+		}
+		m_RulerSpheres.Clear();
+	}
+
+	//------------------------------------------
+	// RulerDelete
+	//------------------------------------------
+	void RulerDelete()
+	{
+		m_RulerPoints.Clear();
+		
+		EditorUpdateRuler();
+	}
+
+	//==========================================
+	// GetLoadedScene
+	//==========================================
+	SceneData GetLoadedScene()
+	{
+		return m_SceneData;
+	}
+
+	//==========================================
+	// GetSelectedSceneObjectIndex
+	//==========================================
+	int GetSelectedSceneObjectIndex()
+	{
+		array<ref SceneObject> scene_objects = GetSceneObjects();
+		for ( int i = 0; i < scene_objects.Count(); i++ )
+		{
+			if ( GetSelectedSceneObject() == scene_objects.Get(i) )
+			{
+				return i;
+			}
+		}
+		
+		return -1;
+	}
+
+	//==========================================
+	// GetSceneObjects
+	//==========================================
+	array<ref SceneObject> GetSceneObjects()
+	{
+		if ( m_SceneData )
+		{
+			return m_SceneData.GetSceneObjects();
+		}
+		
+		return NULL;
+	}
+	
+	//==========================================
+	// GetScenePlayers
+	//==========================================
+	array<ref ScenePlayer> GetScenePlayers()
+	{
+		if ( m_SceneData )
+		{
+			return m_SceneData.GetScenePlayers();
+		}
+		
+		return NULL;
+	}
+	
+	//==========================================
+	// GetSceneObjectsAll
+	//==========================================
+	array<ref SceneObject> GetSceneObjectsAll()
+	{
+		if ( m_SceneData )
+		{
+			return m_SceneData.GetSceneObjectsAll();
+		}
+		
+		return NULL;
+	}
+
+	//==========================================
+	// GetSceneObjectByIndex
+	//==========================================
+	SceneObject GetSceneObjectByIndex( int index )
+	{
+		array<ref SceneObject> scene_objects = GetSceneObjects();
+		
+		if ( scene_objects != NULL )
+		{
+			if ( index > -1 && index < scene_objects.Count() )
+			{
+				return scene_objects.Get( index );
+			}
+		}
+		
+		return NULL;
+	}
+
+	//==========================================
+	// GetSceneObjectByEntity
+	//==========================================
+	SceneObject GetSceneObjectByEntity( EntityAI entity )
+	{
+		array<ref SceneObject> scene_objects = GetSceneObjects();
+		
+		if ( scene_objects != NULL )
+		{
+			for ( int i = 0; i <= scene_objects.Count(); ++i )
+			{
+				SceneObject obj = scene_objects.Get(i);
+				EntityAI e = obj.GetObject();		
+				
+				if ( e == entity )
+				{
+					return obj;
+				}
+			}
+		}
+		
+		return NULL;
+	}
+	
+	//==========================================
+	// GetSceneList
+	//==========================================
+	TStringArray GetSceneList()
+	{
+		return m_ModuleConfigScene.GetSceneList();
+	}
+
+	//==========================================
+	// DeleteSceneObject
+	//==========================================
+	void DeleteSceneObject(SceneObject obj)
+	{		
+		if ( obj != NULL )
+		{
+			if ( obj.GetObject() != GetGame().GetPlayer() )
+			{
+				obj.UnlinkAll();
+				
+				if ( GetSelectedSceneObject() != NULL && GetSelectedSceneObject() == obj )
+				{
+					DeselectObject();
+				}
+				
+				m_SceneData.DeleteSceneObject(obj);
+			}
+			else
+			{
+				SceneEditorMenuCmdPopup("You cant delete player!");
+			}
+		}
+			
+		EditorUpdate();
+	}
+	
+	//---------------------------------------------------------------------------------
+	// >> Protected	scope
+	protected PluginDeveloper			m_ModuleDeveloper;
+	protected PluginConfigScene			m_ModuleConfigScene;
+	protected PluginConfigDebugProfile	m_ModuleConfigDebugProfile;
+
+	//---------------------------------------------------------------------------------
+	// >> protected Scope
+	protected float					m_TimeLastClickRelease;
+	protected float					m_TimeLastClickPress;
+	protected int					m_PressedMouseID;
+	protected bool					m_IsDragging;
+	protected ref array<Shape>	m_ShapesSceneObjects;
+	protected ref map<int, KeyBinding>	m_KeyBindings;
+	protected ref SceneData		m_SceneData;
+	protected SceneObject			m_SelectedObject;
+	protected string				m_ClassBrowserSelected;
+	protected bool					m_IsOpen;
+	
+	//------------------------------------------
+	// DeselectObject
+	//------------------------------------------
+	private void DeselectObject()
+	{
+		m_SelectedObject = NULL;
+	}
+	
+	//------------------------------------------
+	// EditorUpdate	
+	//------------------------------------------
+	protected void EditorUpdate()
+	{
+		if ( GetGame().IsMultiplayer() )
+		{
+			return;
+		}
+		
+		array<ref SceneObject> objects = GetSceneObjects();
+		if( !objects )
+			return;
+		for ( int i = 0; i < objects.Count(); ++i )
+		{
+			SceneObject obj = objects.Get(i);
+			
+			array<SceneObject> linked_scene_objects = obj.GetLinkedSceneObjects();
+			int j;
+			
+			if ( IsOpened() )
+			{
+				obj.EditorShapeAdd();
+				
+				if ( GetSelectedSceneObject() && GetSelectedSceneObject() == obj )
+				{
+					if ( GetDrawSelection() )
+					{
+						obj.EditorShapeSelect();
+					}
+				}
+				else
+				{
+					obj.EditorShapeDeselect();
+				}
+				
+				for ( j = 0; j < linked_scene_objects.Count(); j++ )
+				{					
+					obj.EditorLineAdd( linked_scene_objects.Get(j) );
+				}
+			}
+			else
+			{
+				obj.EditorShapeRemove();
+				
+				if (linked_scene_objects)
+				{
+					for ( j = 0; j < linked_scene_objects.Count(); j++ )
+					{
+						obj.EditorLineRemove( linked_scene_objects.Get(j) );
+					}
+				}
+			}
+		}
+
+		SceneEditorMenuCmdRefresh();
+	}
+	
+	//------------------------------------------
+	// SceneEditorMenuRefresh
+	//------------------------------------------
+	private void SceneEditorMenuCmdRefresh()
+	{
+		CallMethod(CALL_ID_SCENE_EDITOR_COMMAND, new Param2<int, Param>(SCENE_EDITOR_CMD_REFRESH, NULL));
+	}
+
+	//------------------------------------------
+	// SceneEditorMenuCmdPopup
+	//------------------------------------------
+	private void SceneEditorMenuCmdPopup(string message)
+	{
+		CallMethod(CALL_ID_SCENE_EDITOR_COMMAND, new Param2<int, Param1<string>>(SCENE_EDITOR_CMD_POPUP, new Param1<string>(message)));
+	}
+
+	//------------------------------------------
+	// SceneEditorMenuCmdSave
+	//------------------------------------------
+	private void SceneEditorMenuCmdSave()
+	{
+		CallMethod(CALL_ID_SCENE_EDITOR_COMMAND, new Param2<int, Param>(SCENE_EDITOR_CMD_SAVE, NULL));
+	}
+	
+	//------------------------------------------
+	// IsMouseInScene
+	//------------------------------------------
+	private bool IsMouseInScene()
+	{
+		Widget widget_under_mouse = GetWidgetUnderCursor();
+		
+		if ( widget_under_mouse != NULL && widget_under_mouse.GetName() == "pnl_SceneControl" )
+		{
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//------------------------------------------
+	// EditorUpdateRuler
+	//------------------------------------------
+	private void EditorUpdateRuler()
+	{
+		RulerClearVisuals();
+		
+		for ( int i = 0; i < m_RulerPoints.Count(); ++i )
+		{
+			vector pos1 = m_RulerPoints.Get(i);
+			
+			m_RulerSpheres.Insert(Debug.DrawSphere(pos1, 0.1));
+			
+			if ( i < m_RulerPoints.Count() - 1 )
+			{
+				vector pos2 = m_RulerPoints.Get(i + 1);
+				m_RulerLines.Insert(Debug.DrawLine(pos1, pos2));
+			}
+		}
+	}
+	
+	//------------------------------------------
+	// GetMousePositionInScene
+	//------------------------------------------
+	private vector GetMousePositionInScene()
+	{
+		vector dir = GetGame().GetPointerDirection();
+		vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+		vector to = from + ( dir * 10000 );   
+		vector contact_pos;
+		vector contact_dir;
+		int contact_component;
+		
+		if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component) )   
+		{
+			return contact_pos;
+		}
+		
+		return "0 0 0";
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginSoundDebug.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginSoundDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..c862166b0b9f564f134d54e3d462b869c06fc629
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginSoundDebug.c
@@ -0,0 +1,181 @@
+class PluginSoundDebug extends PluginBase
+{
+	override void OnInit()
+	{
+		m_TickTimer = new Timer();
+		m_TickTimer.Run(0.1, this, "OnGUITimer", NULL, true);
+	}
+	
+	override void OnUpdate(float delta_time)
+	{
+		;
+	}
+	
+	override void OnDestroy()
+	{
+		m_TickTimer = NULL;
+	}
+	
+	void Show()
+	{
+		m_TickTimer = new Timer();
+		m_TickTimer.Run(0.1, this, "OnGUITimer", NULL, true);
+	}
+	
+	void Hide()
+	{
+		m_TickTimer = NULL;
+	}
+	
+	void OnGUITimer()
+	{
+		DbgUI.BeginCleanupScope();
+		DbgUI.Begin("Sound debug", 10, 10);
+		
+		DbgUI.PushID_Str("SoundParams");
+		DbgUI.Text("SoundParams: ");
+		DbgUI.SameLine();
+		string soundsetName = "BearGrowl_SoundSet";
+		DbgUI.InputText("", soundsetName, 200);
+		DbgUI.PopID();
+		
+		DbgUI.PushID_Str("Offset");
+		DbgUI.Text("Offset pos: ");
+		vector posOffset = "0 0 0";
+		float posVal;
+		
+		DbgUI.SameLine();
+		DbgUI.PushID_Int(1);
+			DbgUI.InputFloat("", posVal, 80);
+		DbgUI.PopID();
+		posOffset[0] = posVal;
+		
+		DbgUI.SameLine();
+		DbgUI.PushID_Int(2);
+			DbgUI.InputFloat("", posVal, 80);
+		DbgUI.PopID();
+		posOffset[1] = posVal;
+		
+		DbgUI.SameLine();
+		DbgUI.PushID_Int(3);
+			DbgUI.InputFloat("", posVal, 80);
+		DbgUI.PopID();
+		posOffset[2] = posVal;
+		DbgUI.PopID();
+		
+		if(DbgUI.Button("Create"))
+		{
+			m_soundParams = new SoundParams(soundsetName);
+			m_soundBuilder = new SoundObjectBuilder(m_soundParams);
+			m_soundObject = m_soundBuilder.BuildSoundObject();
+			m_soundObject.SetPosition(GetGame().GetPlayer().GetPosition() + posOffset);
+		}
+		
+		DbgUI.Text("SoundObjectBuilder: ");
+		
+		DbgUI.Text("SoundObject: ");
+		
+		DbgUI.Text("AbstractWave: ");
+		
+		vector posOffset2 = "0 10 0";
+		
+		if(m_soundParams != NULL)
+		{
+			DbgUI.Text("FadeInFactor: ");
+			DbgUI.SameLine();
+			DbgUI.PushID_Str("fadeIn");
+			DbgUI.InputFloat("", fadeInVolume, 80);
+			DbgUI.PopID();
+			
+			DbgUI.Text("FadeOutFactor: ");
+			DbgUI.SameLine();
+			DbgUI.PushID_Str("fadeOut");
+			DbgUI.InputFloat("", fadeOutVolume, 80);
+			DbgUI.PopID();
+			
+			DbgUI.PushID_Str("Offset2");
+			DbgUI.Text("Offset2 pos: ");
+			float posVal2;
+
+			DbgUI.SameLine();
+			DbgUI.PushID_Int(100);
+				posVal2 = posOffset2[0];
+				DbgUI.InputFloat("", posVal2, 80);
+			DbgUI.PopID();
+			posOffset2[0] = posVal2;
+
+			DbgUI.SameLine();
+			DbgUI.PushID_Int(101);
+				posVal2 = posOffset2[1];
+				DbgUI.InputFloat("", posVal2, 80);
+			DbgUI.PopID();
+			posOffset2[1] = posVal2;
+
+			DbgUI.SameLine();
+			DbgUI.PushID_Int(102);
+				posVal2 = posOffset2[2];
+				DbgUI.InputFloat("", posVal2, 80);
+			DbgUI.PopID();
+			posOffset2[2] = posVal2;
+			DbgUI.PopID();
+			
+			DbgUI.Text("skip: ");
+			DbgUI.SameLine();
+			float skip = 0.0;
+			DbgUI.PushID_Int(200);
+			DbgUI.InputFloat("", skip, 80);
+			DbgUI.PopID();
+					
+			if(DbgUI.Button("Create and play"))
+			{
+				m_wave = GetGame().GetSoundScene().Play3D(m_soundObject, m_soundBuilder);
+				m_wave.SetFadeInFactor(fadeInVolume);
+				m_wave.Skip(skip);
+				m_wave.SetPosition(GetGame().GetPlayer().GetPosition() + posOffset2);
+			}
+		}
+		
+		if(m_wave != NULL)
+		{
+			DbgUI.Text("Wave length: " + m_wave.GetLength() + "s");
+			
+			//DbgUI.Text("Wave position: " + Math.Round(m_wave.GetCurrPosition() * 100) + "%");
+			DbgUI.Text("Volume: ");
+			DbgUI.SameLine();
+			float volume = 1.0;
+			DbgUI.InputFloat(" ", volume, 80);
+			DbgUI.SameLine();
+			if(DbgUI.Button("SetVolume"))
+				m_wave.SetVolume(volume);
+			DbgUI.SameLine();
+			if(DbgUI.Button("SetVolumeRelative"))
+				m_wave.SetVolumeRelative(volume);
+			
+			if(DbgUI.Button("Play"))
+				m_wave.Play();
+			if(DbgUI.Button("Stop"))
+				m_wave.Stop();
+			if(DbgUI.Button("Restart"))
+				m_wave.Restart();
+			if(DbgUI.Button("Repeat"))
+				m_wave.Loop(true);
+			if(DbgUI.Button("StopRepeat"))
+				m_wave.Loop(false);
+			if(DbgUI.Button("Set position"))
+				m_wave.SetPosition(GetGame().GetPlayer().GetPosition() + posOffset2);
+		}
+		
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+	
+	
+	ref Timer m_TickTimer;
+	
+	ref SoundParams m_soundParams;
+	ref SoundObjectBuilder m_soundBuilder;
+	ref SoundObject m_soundObject;
+	float fadeInVolume = 1.1;
+	float fadeOutVolume = 0.9;
+	AbstractWave m_wave;
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginTransmissionAgents.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginTransmissionAgents.c
new file mode 100644
index 0000000000000000000000000000000000000000..87cfcf6c1ff8f672afa9bbe75078c647bce212bc
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginTransmissionAgents.c
@@ -0,0 +1,413 @@
+enum InjectTypes
+{
+    PLAYER_TO_ITEM, 
+	ITEM_TO_PLAYER,
+	PLAYER_AIR_PLAYER,
+};
+
+class PluginTransmissionAgents extends PluginBase
+{
+	static ref map<int, ref AgentBase> m_AgentList =  new map<int, ref AgentBase>;
+	ref map<int, string> m_SimpleAgentList = new map<int, string>;
+	bool m_IsConstructed = false;
+	
+	void PluginTransmissionAgents()
+	{
+		//add new agents here
+		RegisterAgent(new InfluenzaAgent);
+		RegisterAgent(new CholeraAgent);
+		RegisterAgent(new SalmonellaAgent);
+		RegisterAgent(new BrainAgent);
+		RegisterAgent(new FoodPoisonAgent);
+		RegisterAgent(new ChemicalAgent);
+		RegisterAgent(new WoundAgent);
+		RegisterAgent(new NerveAgent);
+	}
+	
+	void RegisterAgent(AgentBase agent)
+	{
+		m_AgentList.Insert(agent.GetAgentType(), agent);
+	}
+
+	void ConstructSimpleAgentList()
+	{
+		string agent_name;
+		int agent_type;
+		
+		for(int i = 0; i < m_AgentList.Count();i++)
+		{
+			AgentBase agent = m_AgentList.GetElement(i);
+			agent_name = agent.GetName();
+			agent_type = agent.GetAgentType();
+			m_SimpleAgentList.Insert(agent_type, agent_name);
+		}
+	}
+
+	map<int, ref AgentBase> GetAgentList()
+	{
+		return	m_AgentList;
+	}
+	// this is a list which is easy to work with for displaying all agents and interacting with them, it doesn't serve any gameplay purpose
+	map<int, string> GetSimpleAgentList()
+	{
+		if( !m_IsConstructed )
+		{
+			ConstructSimpleAgentList();
+			m_IsConstructed	= true;
+		}
+		return m_SimpleAgentList;
+	}
+	
+	static string GetNameByID(int agent_id)
+	{
+		return m_AgentList.Get(agent_id).GetName();
+	}
+	
+	void RemoveAllAgents(EntityAI target)
+	{
+		target.RemoveAllAgents();
+	}
+	
+	static void RemoveAgent(EntityAI target, int agent_id )
+	{
+		target.RemoveAgent( agent_id );
+	}
+	
+	
+	
+	protected float GetAgentTransferabilityIn( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) return 0;
+		return m_AgentList.Get(agent_id).GetTransferabilityIn();
+	}
+	
+	
+	bool GrowDuringAntibioticsAttack(int agent_id, PlayerBase player)
+	{
+		if( !m_AgentList.Get(agent_id) ) return true;
+		return m_AgentList.Get(agent_id).GrowDuringAntibioticsAttack(player);
+	}
+
+	
+	float GetAgentDieOffSpeedEx(int agent_id, PlayerBase player)
+	{
+		if( !m_AgentList.Get(agent_id) ) return true;
+		return m_AgentList.Get(agent_id).GetDieOffSpeedEx(player);
+	}
+	
+	EStatLevels GetAgentPotencyEx(int agent_id, PlayerBase player)
+	{
+		if( !m_AgentList.Get(agent_id) ) return true;
+		return m_AgentList.Get(agent_id).GetPotencyEx(player);
+	}
+	
+	float GetAgentInvasibilityEx(int agent_id, PlayerBase player)
+	{
+		if( !m_AgentList.Get(agent_id) ) return true;
+		return m_AgentList.Get(agent_id).GetInvasibilityEx(player);
+	}
+	
+	
+	
+	
+	float GetAgentAntiboticsResistance( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) return 0;
+		return m_AgentList.Get(agent_id).GetAntiboticsResistance();
+	}
+	
+	
+	float GetAgentAntiboticsResistanceEx( int agent_id , PlayerBase player)
+	{
+		if( !m_AgentList.Get(agent_id) ) return 0;
+		return m_AgentList.Get(agent_id).GetAntibioticsResistanceEx(player);
+	}
+	
+	protected float GetAgentTransferabilityOut( int agent_id )
+	{
+		if(!m_AgentList.Get(agent_id)) return 0;
+		return m_AgentList.Get(agent_id).GetTransferabilityOut();
+	}	
+	
+	protected float GetAgentTransferabilityAirOut( int agent_id )
+	{
+		if(!m_AgentList.Get(agent_id)) return 0;
+		return m_AgentList.Get(agent_id).GetTransferabilityAirOut();
+	}
+	/*
+	float GetAgentChance( int agent_id )
+	{
+		return m_AgentList.Get(agent_id).GetChanceOfInfection();
+	}			
+	*/
+	float GetAgentInvasibility( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) 
+			return 0;
+		return m_AgentList.Get(agent_id).GetInvasibility();
+	}
+	
+	
+	float GetAgentDigestibility( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) 
+			return 0;
+		return m_AgentList.Get(agent_id).GetDigestibility();
+	}
+	
+	float GetDieOffSpeed( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) 
+			return 0;
+		return m_AgentList.Get(agent_id).GetDieOffSpeed();
+	}
+	
+	EStatLevels GetPotency( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) 
+			return 0;
+		return m_AgentList.Get(agent_id).GetPotency();
+	}
+
+	static int GetAgentMaxCount( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) return 0;
+		return m_AgentList.Get(agent_id).GetMaxCount();
+	}
+	
+	/*
+	private float GetAgentInitialCount( int agent_id )
+	{
+		return m_AgentList.Get(agent_id).GetInitialCount();
+	}
+	*/
+	
+	/*
+	float GetImmunityResistance( int agent_id )
+	{
+		if( !m_AgentList.Get(agent_id) ) return 0;
+		return m_AgentList.Get(agent_id).GetImmunityResistance();
+	}
+	*/
+	float TransmitAgentsEx(EntityAI source, EntityAI target, int pathway, int dose_size = 1000, int agents = 0)
+	{
+		//Debug.Log("Transmitting agents for source: " +source.ToString()+", target: " +target.ToString(),"Agents");
+		int sourceAgents = agents;
+		int targetAgents;
+		if(!sourceAgents && source) sourceAgents = source.GetAgents();//do not set sourceAgents again if already set
+		if(target) targetAgents = target.GetAgents();
+		float count = 0;
+		
+		switch (pathway)
+		{
+			case AGT_INV_OUT: //item leaving inventory
+				break;
+				 
+			case AGT_INV_IN: //item entering inventory
+				break;
+				
+			case AGT_UACTION_TOUCH: //player touched the item
+				//InjectAgents( source, targetAgents ,GetProtectionLevel(DEF_BIOLOGICAL,InventorySlots.GLOVES, player) );
+				break;
+
+			case AGT_WATER_POND:
+				//target.InsertAgent(eAgents.CHOLERA, dose_size);
+				InjectAgentsWithPlayer( target, eAgents.CHOLERA , 0, 1, InjectTypes.ITEM_TO_PLAYER );
+				break;
+				
+			case AGT_UACTION_CONSUME:
+				//InjectAgentsWithPlayer( target, sourceAgents , 0, dose_size, InjectTypes.ITEM_TO_PLAYER );
+				InjectAgentsWithPlayer( source, targetAgents , 0, 1, InjectTypes.PLAYER_TO_ITEM );
+				break;
+			
+			case AGT_UACTION_TO_PLAYER: //user action of a consumption, only from item to player
+				InjectAgentsWithPlayerCount( target, sourceAgents , 0, dose_size, InjectTypes.ITEM_TO_PLAYER );
+				break;
+
+			case AGT_UACTION_TO_ITEM: //to transfer from the player to the consumed item
+				InjectAgentsWithPlayer( target, sourceAgents , 0, 1, InjectTypes.PLAYER_TO_ITEM );
+				break;
+				
+			case AGT_TRANSFER_COPY: //transferring liquid
+				InjectAgentsWithoutPlayer( target, sourceAgents );
+				break;	
+			
+			case AGT_ITEM_TO_FLESH: //transferring liquid
+				InjectAgentsWithPlayer( target, sourceAgents , 0, 1, InjectTypes.ITEM_TO_PLAYER);
+				break;
+
+			case AGT_AIRBOURNE_BIOLOGICAL:
+				float prot_level_mask_target = GetProtectionLevel(DEF_BIOLOGICAL,InventorySlots.MASK, Man.Cast( target ));
+				float prot_level_mask_source = GetProtectionLevel(DEF_BIOLOGICAL,InventorySlots.MASK, Man.Cast( source ));
+				float prot_level_headgear_target = GetProtectionLevel(DEF_BIOLOGICAL,InventorySlots.HEADGEAR, Man.Cast( target ));
+				float prot_level_headgear_source = GetProtectionLevel(DEF_BIOLOGICAL,InventorySlots.HEADGEAR, Man.Cast( source ));
+				float prot_level_target = Math.Max(prot_level_mask_target, prot_level_headgear_target);//find the bigger of the 2, TODO: should be improved
+				float prot_level_source = Math.Max(prot_level_mask_source, prot_level_headgear_source);//find the bigger of the 2, TODO: should be improved
+				float prot_level_combined = 1 - (1 - prot_level_target) * (1 - prot_level_source);
+				InjectAgentsWithPlayer( target, sourceAgents , prot_level_combined, 1, InjectTypes.PLAYER_AIR_PLAYER );
+				break;
+			case AGT_AIRBOURNE_CHEMICAL:
+				float prot_level_mask_target2 = GetProtectionLevel(DEF_CHEMICAL,InventorySlots.MASK, Man.Cast( target ));
+
+				count = InjectAgentWithPlayerDose( target, agents , prot_level_mask_target2, dose_size, InjectTypes.PLAYER_AIR_PLAYER );
+				break;
+		}
+		return count;
+	}
+	
+	
+	void TransmitAgents(EntityAI source, EntityAI target, int pathway, int dose_size = 1000)
+	{
+		 TransmitAgentsEx(source, target, pathway, dose_size);
+	}
+	
+	protected void InjectAgentsWithoutPlayer(EntityAI target, int agents)
+	{
+		if( target.IsItemBase() )
+		{
+			ItemBase ib_target = ItemBase.Cast( target );
+			ib_target.TransferAgents(agents);
+		}
+	}
+	
+	//! will add agents to a given target, using chance of transmission and full dose size if chance succeeds
+	protected void InjectAgentsWithPlayer(EntityAI target, int agents,float protection, int dose_size, int inject_type)//target,array_of_agents,protection_lvl
+	{
+		if(target && (agents != 0) && target.IsEntityAI() )
+		{
+			int bit_count = Math.GetNumberOfSetBits(agents);
+			
+			for (int i = 0; i < bit_count; i++)
+			{
+				int agent_bit = Math.Pow(2,Math.GetNthBitSet(agents,i));
+				if( DetermineChanceToTransmit(agent_bit, protection, inject_type))
+				{
+					target.InsertAgent(agent_bit,dose_size);
+				}
+			}
+		}
+	}	
+	
+	//! will add agents to a given target, with no probability, but the dose size is modified by m_TransferabilityOut of the agent
+	protected void InjectAgentsWithPlayerCount(EntityAI target, int agents,float protection, int dose_size, int inject_type)//target,array_of_agents,protection_lvl
+	{
+		if(target && (agents != 0) && target.IsEntityAI() )
+		{
+			int bit_count = Math.GetNumberOfSetBits(agents);
+			
+			for (int i = 0; i < bit_count; i++)
+			{
+				int agent_bit = Math.Pow(2,Math.GetNthBitSet(agents,i));
+				float count = CalculateAgentsToTransmit(agent_bit, protection, dose_size, inject_type);
+				target.InsertAgent(agent_bit,count);
+			}
+		}
+	}
+	
+	//! will add agent to a given target
+	protected float InjectAgentWithPlayerDose(EntityAI target, int agent, float protection, float dose_size, int inject_type)//target,array_of_agents,protection_lvl
+	{
+		float count = CalculateAgentsToTransmit(agent, protection, dose_size, inject_type);
+		{
+			if(count > 0)
+			{
+				target.InsertAgent(agent, count);
+				return count;
+			}
+		}
+		return 0;
+	}
+	
+	// !performance hog, avoid
+	static void BuildAgentArray(int agents, array<int> agents_out)
+	{
+		int mask = 1;
+		for(int i = 0; i < BIT_INT_SIZE; i++)
+		{
+			if( mask & agents ) 
+				agents_out.Insert(mask);
+			mask = mask * 2;
+		}
+	}
+
+	
+	static float GetProtectionLevelEx(int type, int slot, Man player, bool consider_filter = true, int system = 0)
+	{
+		ItemBase attachment = ItemBase.Cast(player.GetInventory().FindAttachment(slot));
+		
+		if(!attachment) 
+			return 0;
+		
+		return attachment.GetProtectionLevel(type, consider_filter, system);
+		
+	}
+	
+	protected float GetProtectionLevel(int type, int slot, Man player)
+	{
+		return GetProtectionLevelEx(type, slot, player);
+	}
+
+	//------------------------------------------------------------------------------------------------------
+	
+	protected float CalculateAgentsToTransmit(int agent_id, float protection, int dose_size, int inject_type)
+	{
+
+		//Debug.Log("protection: "+protection.ToString());
+		float prot = 1 - protection; //reverse the value (in config, the higher the value, the higher the protection: 0 - 1) so that we can easily interpolate between 0 and 1 by multiplication
+		//Debug.Log("prot: "+prot.ToString(), "Agents");
+		float transf;
+		
+		if( inject_type == InjectTypes.PLAYER_TO_ITEM )
+		{
+			transf = GetAgentTransferabilityOut(agent_id);
+		}
+		else if( inject_type == InjectTypes.ITEM_TO_PLAYER )
+		{
+			transf = GetAgentTransferabilityIn(agent_id);
+		}
+		else if( inject_type == InjectTypes.PLAYER_AIR_PLAYER )
+		{
+			transf = GetAgentTransferabilityAirOut(agent_id);
+		}
+
+		//Debug.Log("transf: "+transf.ToString(), "Agents");
+		//float result =  GetAgentInitialCount(agent_id) * prot * transf * dose_size;//final formula
+		float result =  1 * prot * transf * dose_size;//final formula
+		//result = Math.Ceil(result);
+		//Debug.Log("result: "+result.ToString(), "Agents");
+		return result;
+	}
+	
+	//------------------------------------------------------------------------------------------------------
+	protected bool DetermineChanceToTransmit(int agent_id, float protection, int inject_type)
+	{
+
+		//Debug.Log("protection: "+protection.ToString());
+		float prot = 1 - protection; //reverse the value (in config, the higher the value, the higher the protection: 0 - 1) so that we can easily interpolate between 0 and 1 by multiplication
+		//Debug.Log("prot: "+prot.ToString(), "Agents");
+		float transf;
+		
+		if( inject_type == InjectTypes.PLAYER_TO_ITEM )
+		{
+			transf = GetAgentTransferabilityOut(agent_id);
+		}
+		else if( inject_type == InjectTypes.ITEM_TO_PLAYER )
+		{
+			transf = GetAgentTransferabilityIn(agent_id);
+		}
+		else if( inject_type == InjectTypes.PLAYER_AIR_PLAYER )
+		{
+			transf = GetAgentTransferabilityAirOut(agent_id);
+		}
+		#ifdef DEVELOPER
+		//Debug.Log("transf: "+transf.ToString(), "Agents");
+		#endif
+		//float result =  GetAgentInitialCount(agent_id) * prot * transf * dose_size;//final formula
+		bool dice = Math.RandomFloat01() < (prot * transf);
+		//result = Math.Ceil(result);
+
+		return dice;
+	}
+	//------------------------------------------------------------------------------------------------------
+
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Plugins/PluginBase/PluginVariables.c b/scripts/4_World/DayZ/Plugins/PluginBase/PluginVariables.c
new file mode 100644
index 0000000000000000000000000000000000000000..9db163573e0eb446870c6e5b1bb721082a93dc0c
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginBase/PluginVariables.c
@@ -0,0 +1,36 @@
+class PluginVariables extends PluginBase
+{
+	void PluginVariables()
+	{
+		m_Id = 0;
+		m_Variables = new map<int, string>;
+		//				("variable name")
+		RegisterVariable("varNote");
+		RegisterVariable("varColor");
+		
+	}
+
+	void ~PluginVariables()
+	{
+	}
+	
+	void RegisterVariable(string name)
+	{
+		m_Id++;
+		m_Variables.Set(m_Id,name);//REWORK.V maybe have 2 maps, one with key
+		
+	}
+
+	int m_Id;
+	ref map<int, string> m_Variables;
+
+	string GetName(int id)
+	{
+		return m_Variables.Get(id);
+	}
+
+	int GetID(string name)
+	{
+		return m_Variables.GetKeyByValue(name);
+	}
+}
diff --git a/scripts/4_World/DayZ/Plugins/PluginManager.c b/scripts/4_World/DayZ/Plugins/PluginManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..a25ede760a4a6d0e50721d500f0d83b92a13eb23
--- /dev/null
+++ b/scripts/4_World/DayZ/Plugins/PluginManager.c
@@ -0,0 +1,347 @@
+class PluginManager
+{	
+	private ref array<typename>					m_PluginRegister;	// list of modules for creation
+	private ref map<typename, ref PluginBase>	m_PluginsPtrs;		// plugin, plugin pointer
+	
+	//=================================
+	// Constructor
+	//=================================
+	void PluginManager()
+	{
+		m_PluginRegister	= new array<typename>;
+		m_PluginsPtrs		= new map<typename, ref PluginBase>;
+	}
+	
+	//=================================
+	// Destructor
+	//=================================
+	void ~PluginManager()
+	{
+		int i;
+		PluginBase plugin;
+		
+		for ( i = 0; i < m_PluginsPtrs.Count(); ++i)
+		{
+			plugin = m_PluginsPtrs.GetElement(i);
+			if ( plugin != NULL )
+			{
+				plugin.OnDestroy();
+				delete plugin;
+			}
+		}
+		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GAMEPLAY).Remove(this.MainOnUpdate);
+	}
+	
+	//=================================
+	// Init
+	//=================================
+	void Init()
+	{	
+		//----------------------------------------------------------------------
+		// Register modules
+		//----------------------------------------------------------------------
+		//				Module Class Name 								Client	Server
+		//----------------------------------------------------------------------
+		RegisterPlugin( "PluginHorticulture",							true, 	true );
+		RegisterPlugin( "PluginRepairing",								true, 	true );
+		RegisterPlugin( "PluginPlayerStatus",							true, 	true );
+		RegisterPlugin( "PluginMessageManager",							true, 	true );
+		RegisterPlugin( "PluginLifespan",								true, 	true );
+		RegisterPlugin( "PluginVariables",								true, 	true );
+		RegisterPlugin( "PluginObjectsInteractionManager",				false, 	true );
+		RegisterPlugin( "PluginRecipesManager",							true, 	true );
+		RegisterPlugin( "PluginTransmissionAgents",						true, 	true );
+		RegisterPlugin( "PluginAdditionalInfo",							true,	true ); //TODO clean up after Gamescom
+		RegisterPlugin( "PluginConfigEmotesProfile",					true, 	true );
+		RegisterPlugin( "PluginPresenceNotifier",						true,	false );
+		RegisterPlugin( "PluginAdminLog",								false, 	true );
+		
+		// Developer + Diag
+		RegisterPluginDiag( "PluginKeyBinding",							true, 	false );
+		RegisterPluginDiag( "PluginDeveloper",							true, 	true );
+		RegisterPluginDiag( "PluginDeveloperSync",						true, 	true );
+		RegisterPluginDiag( "PluginDiagMenuClient",						true, 	false );
+		RegisterPluginDiag( "PluginDiagMenuServer",						false, 	true );
+		RegisterPluginDiag( "PluginPermanentCrossHair",					true,	false );
+		RegisterPluginDiag( "PluginRemotePlayerDebugClient",			true,	false );
+		RegisterPluginDiag( "PluginRemotePlayerDebugServer",			false,	true );
+		RegisterPluginDiag( "PluginUniversalTemperatureSourceClient",	true, 	false );
+		RegisterPluginDiag( "PluginUniversalTemperatureSourceServer",	false, 	true );
+		RegisterPluginDiag( "PluginDrawCheckerboard",					true,	false );
+		RegisterPluginDiag( "PluginItemDiagnostic",						true, 	true );
+		RegisterPluginDiag( "PluginDayZCreatureAIDebug",				true, 	true );
+		
+		// Only In Debug / Internal
+		RegisterPluginDebug( "PluginConfigViewer",						true, 	true );
+		RegisterPluginDebug( "PluginLocalEnscriptHistory",				true, 	true );
+		RegisterPluginDebug( "PluginLocalEnscriptHistoryServer",		true, 	true );
+		
+		RegisterPluginDebug( "PluginSceneManager",						true, 	true );
+		RegisterPluginDebug( "PluginConfigScene",						true, 	true );
+		RegisterPluginDebug( "PluginMissionConfig",						true, 	true );
+		RegisterPluginDebug( "PluginConfigEmotesProfile",				true, 	true );
+		RegisterPluginDebug( "PluginConfigDebugProfile",				true, 	true );
+		RegisterPluginDebug( "PluginConfigDebugProfileFixed",			true, 	true );
+		
+		RegisterPluginDebug( "PluginDayzPlayerDebug",					true, 	true );
+		RegisterPluginDebug( "PluginDayZInfectedDebug",					true, 	true );
+		RegisterPluginDebug( "PluginDoorRuler",							true, 	false );
+		RegisterPluginDebug( "PluginCharPlacement",						true, 	false );
+		//RegisterPluginDebug( "PluginSoundDebug",						false,	false );
+		RegisterPluginDebug( "PluginCameraTools",						true, 	true );
+		RegisterPluginDebug( "PluginNutritionDumper",					true, 	false );
+		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GAMEPLAY).Insert(MainOnUpdate);
+	}
+	
+	//=================================
+	// PluginsInit
+	//=================================
+	void PluginsInit()
+	{
+		int i = 0;
+		int regCount = m_PluginRegister.Count();
+		
+		array<PluginBase> pluginPtrs = {};
+		pluginPtrs.Reserve(regCount);
+		
+		foreach (typename pluginType : m_PluginRegister)
+		{
+			PluginBase moduleExist = GetPluginByType( pluginType );
+			if ( moduleExist )
+			{
+				m_PluginsPtrs.Remove( pluginType );
+			}
+			
+			PluginBase moduleNew = PluginBase.Cast(pluginType.Spawn());
+			m_PluginsPtrs.Set(pluginType, moduleNew);
+			pluginPtrs.Insert(moduleNew);
+		}
+		
+		foreach (PluginBase plugin : pluginPtrs)
+		{
+			if ( plugin )
+			{
+				plugin.OnInit();
+			}
+		}
+	}
+	
+	//=================================
+	// MainOnUpdate
+	//=================================
+	void MainOnUpdate(float delta_time)
+	{
+		for ( int i = 0; i < m_PluginsPtrs.Count(); ++i)
+		{
+			PluginBase plugin = m_PluginsPtrs.GetElement(i);
+			if ( plugin != NULL )
+			{
+				plugin.OnUpdate(delta_time);
+			}
+		}
+	}
+	
+	/**
+	\brief Returns registred plugin by class type, better is to use global funtion GetPlugin(typename plugin_type)
+		\param module_tpye \p typename class type of plugin
+		\return \p PluginBase
+		@code
+			PluginRepairing plugin = GetPluginManager().GetPluginByType(PluginRepairing);
+		@endcode
+	*/
+	//=================================
+	// GetPluginByType
+	//=================================
+	PluginBase GetPluginByType( typename plugin_type )
+	{
+		if ( m_PluginsPtrs.Contains( plugin_type ) )
+		{
+			return m_PluginsPtrs.Get( plugin_type );
+		}
+		
+		return null;
+	}
+	
+	/**
+	\brief Register new PluginBase to PluginManager for storing and handling plugin.
+		\param module_tpye \p typename class type of plugin
+		\return \p void
+		@code
+			class PluginRepairing extends PluginBase
+			{
+			...
+			}
+			
+			RegisterPlugin(PluginRepairing);
+		@endcode
+	*/
+	//=================================
+	// RegisterPlugin
+	//=================================
+	protected void RegisterPlugin( string plugin_class_name, bool reg_on_client, bool reg_on_server, bool reg_on_release = true )
+	{
+		if ( !reg_on_client )
+		{
+			if ( GetGame().IsMultiplayer() && GetGame().IsClient() )
+			{
+				return;
+			}
+		}
+		
+		if ( !reg_on_server )
+		{
+			if ( GetGame().IsMultiplayer() )
+			{
+				if ( GetGame().IsServer() )
+				{
+					return;
+				}
+			}
+		}
+		
+		if ( !reg_on_release )
+		{
+			if ( !GetGame().IsDebug() )
+			{
+				return;
+			}
+		}
+		
+		m_PluginRegister.Insert( plugin_class_name.ToType() );
+	}
+	
+	/**
+	\brief Register new PluginBase to PluginManager for storing and handling plugin.
+		\param module_tpye \p typename class type of plugin
+		\return \p void
+		@code
+			class PluginRepairing extends PluginBase
+			{
+			...
+			}
+			
+			RegisterPlugin(PluginRepairing);
+		@endcode
+	*/
+	//=================================
+	// RegisterPlugin
+	//=================================
+	protected void RegisterPluginDebug( string plugin_class_name, bool reg_on_client, bool reg_on_server )
+	{
+		RegisterPlugin(plugin_class_name, reg_on_client, reg_on_server, false);
+	}
+	//=================================
+	// RegisterPlugin
+	//=================================
+	protected void RegisterPluginDiag( string plugin_class_name, bool reg_on_client, bool reg_on_server )
+	{
+		#ifdef DIAG_DEVELOPER
+		RegisterPlugin(plugin_class_name, reg_on_client, reg_on_server, true);
+		#else
+		return;
+		#endif		
+	}
+	
+	//---------------------------------
+	// UnregisterPlugin
+	//---------------------------------
+	protected bool UnregisterPlugin( string plugin_class_name )
+	{
+		typename plugin_type = plugin_class_name.ToType();
+		
+		if ( m_PluginRegister.Find( plugin_type ) != -1 )
+		{
+			m_PluginRegister.RemoveItem( plugin_type );
+			return true;
+		}
+		
+		return false;
+	}
+}
+
+ref PluginManager g_Plugins;
+
+/**
+\brief Returns registred plugin by class type, better is to use global funtion GetPlugin(typename plugin_type)
+	\param module_tpye \p typename class type of plugin
+	\return \p PluginBase
+	@code
+		PluginRepairing plugin = GetPluginManager().GetPluginByType(PluginRepairing);
+	@endcode
+*/
+PluginManager GetPluginManager()
+{	
+	/*
+	if ( g_Plugins == NULL )
+	{
+		PluginManagerInit();
+	}
+	*/
+	
+	return g_Plugins;
+}
+
+
+void PluginManagerInit()
+{	
+	if (g_Plugins == NULL)
+	{
+		g_Plugins = new PluginManager;
+		g_Plugins.Init();
+		g_Plugins.PluginsInit();
+	}
+}
+
+void PluginManagerDelete()
+{	
+	if ( g_Plugins )
+	{
+		delete g_Plugins;
+		g_Plugins = NULL;
+	}
+}
+
+bool IsPluginManagerExists()
+{
+	if ( g_Plugins != null )
+	{
+		return true;
+	}	
+	
+	return false;
+}
+
+PluginBase GetPlugin(typename plugin_type)
+{
+	PluginBase plugin = null;
+	
+	if ( IsPluginManagerExists() )
+	{
+		plugin = GetPluginManager().GetPluginByType(plugin_type);
+	
+		if ( plugin == null )
+		{
+			#ifdef DIAG_DEVELOPER
+			if ( IsPluginManagerExists() )
+			{
+				PrintString("Module " + plugin_type.ToString() + " is not Registred in PluginManager.c!");
+				DumpStack();
+			}
+			#endif
+		}
+	}
+	
+	return plugin;
+}
+
+bool IsModuleExist(typename plugin_type)
+{
+	if ( IsPluginManagerExists() )
+	{
+		return ( GetPlugin(plugin_type) != NULL );
+	}
+	
+	return false;
+}
diff --git a/scripts/4_World/DayZ/Static/BetaSound.c b/scripts/4_World/DayZ/Static/BetaSound.c
new file mode 100644
index 0000000000000000000000000000000000000000..31903ffff1be2673ba7cafdfc5c0f8471a25b64b
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/BetaSound.c
@@ -0,0 +1,32 @@
+class BetaSound
+{
+	static SoundOnVehicle SaySound(Object source, string  sound_name, float distance, bool looped)  
+	{
+		bool is_female = source.ConfigGetBool("woman");
+		
+		
+		string path_class = "CfgActionSounds " + sound_name;
+		string path_sound = path_class + " sounds";
+		//is the action sound class defined ? if not, try to play it as a regular sound
+		if( GetDayZGame().ConfigIsExisting(path_sound) )
+		{
+			string path_sound_female = path_class + "_female" + " sounds";
+			
+			if(is_female && GetDayZGame().ConfigIsExisting(path_sound_female))
+			{
+				path_sound = path_sound_female;
+			}
+			
+			GetGame().ConfigGetTextArray(path_sound,CachedObjectsArrays.ARRAY_STRING);
+			int rnd_index = Math.RandomInt(0,CachedObjectsArrays.ARRAY_STRING.Count());
+			string sound_class = CachedObjectsArrays.ARRAY_STRING.Get(rnd_index);
+			SoundOnVehicle sound_object = GetGame().CreateSoundOnObject(source, sound_class, distance, looped);
+			return sound_object;
+		}
+		else
+		{
+			return GetGame().CreateSoundOnObject(source, sound_name, distance, looped);
+		}
+	}
+
+};
diff --git a/scripts/4_World/DayZ/Static/BloodType.c b/scripts/4_World/DayZ/Static/BloodType.c
new file mode 100644
index 0000000000000000000000000000000000000000..81d1c1c37be7ffb4905a9f426911827b2b3bab07
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/BloodType.c
@@ -0,0 +1,150 @@
+class BloodTypes
+{
+	static const int NUM_OF_BLOOD_TYPES = 8;
+	
+	
+	
+	static int GenerateBloodType()
+	{
+		int types[NUM_OF_BLOOD_TYPES] 		= {LIQUID_BLOOD_0_P, LIQUID_BLOOD_0_N, LIQUID_BLOOD_A_P, LIQUID_BLOOD_A_N, LIQUID_BLOOD_B_P, LIQUID_BLOOD_B_N, LIQUID_BLOOD_AB_P, LIQUID_BLOOD_AB_N};
+		int probability[NUM_OF_BLOOD_TYPES] 	= {42,10,25,5,9,3,2,2};
+		
+		int probability_sum = 0;
+		
+		for(int i = 0; i < NUM_OF_BLOOD_TYPES; i++)
+		{
+			probability_sum += probability[i];
+		}
+		
+		//TIMERDEPRECATED - randomized blodtype for new character
+		int probability_randomized = Math.RandomInt(0,probability_sum);
+		
+		int tmp = 0;
+		int index;
+		
+		for(i = 0; i < NUM_OF_BLOOD_TYPES; i++)
+		{
+			tmp += probability[i];
+			
+			if( tmp > probability_randomized )
+			{
+				index = i;
+				break;
+			}
+		}
+		
+		return types[index];
+	}
+
+	static bool MatchBloodCompatibility(int bloodtypetarget, int bloodtype)
+	{
+		bool result = false;
+		switch ( bloodtype )
+		{
+			case LIQUID_BLOOD_0_P: 
+				if ( bloodtypetarget == LIQUID_BLOOD_0_P || bloodtypetarget == LIQUID_BLOOD_0_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_0_N:
+				if ( bloodtypetarget == LIQUID_BLOOD_0_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_A_P:
+				if ( bloodtypetarget == LIQUID_BLOOD_A_P || bloodtypetarget == LIQUID_BLOOD_A_N || bloodtypetarget == LIQUID_BLOOD_0_P || bloodtypetarget == LIQUID_BLOOD_0_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_A_N: 
+				if ( bloodtypetarget == LIQUID_BLOOD_A_N || bloodtypetarget == LIQUID_BLOOD_0_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_B_P: 
+				if ( bloodtypetarget == LIQUID_BLOOD_B_P || bloodtypetarget == LIQUID_BLOOD_B_N || bloodtypetarget == LIQUID_BLOOD_0_P || bloodtypetarget == LIQUID_BLOOD_0_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_B_N:
+				if ( bloodtypetarget == LIQUID_BLOOD_B_N || bloodtypetarget == LIQUID_BLOOD_0_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_AB_P:
+				if ( bloodtypetarget == LIQUID_BLOOD_AB_P || bloodtypetarget == LIQUID_BLOOD_0_N || bloodtypetarget == LIQUID_BLOOD_0_P || bloodtypetarget == LIQUID_BLOOD_A_N || bloodtypetarget == LIQUID_BLOOD_A_P || bloodtypetarget == LIQUID_BLOOD_B_N || bloodtypetarget == LIQUID_BLOOD_B_P || bloodtypetarget == LIQUID_BLOOD_AB_N ) result = true;
+			break;
+			
+			case LIQUID_BLOOD_AB_N: 
+				if ( bloodtypetarget == LIQUID_BLOOD_AB_N || bloodtypetarget == LIQUID_BLOOD_0_N || bloodtypetarget == LIQUID_BLOOD_A_N || bloodtypetarget == LIQUID_BLOOD_B_N ) result = true;
+			break;
+			
+			default: 
+				Debug.Log("Incorrect blood type");
+			break;
+		}
+		if ( result )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	static string GetBloodTypeName(int bloodtype, out string type, out bool positive )
+	{
+		string bloodTypeName;
+		switch ( bloodtype )
+		{
+			case LIQUID_BLOOD_0_P: 
+				bloodTypeName = "0+";
+				type = "0";
+				positive = true;
+			break;
+			
+			case LIQUID_BLOOD_0_N:
+				bloodTypeName = "0-";
+				type = "0";
+				positive = false;
+			break;
+			
+			case LIQUID_BLOOD_A_P:
+				bloodTypeName = "A+";
+				type = "A";
+				positive = true;
+			break;
+			
+			case LIQUID_BLOOD_A_N: 
+				bloodTypeName = "A-";
+				type = "A";
+				positive = false;
+			break;
+			
+			case LIQUID_BLOOD_B_P: 
+				bloodTypeName = "B+";
+				type = "B";
+				positive = true;
+			break;
+			
+			case LIQUID_BLOOD_B_N:
+				bloodTypeName = "B-";
+				type = "B";
+				positive = false;
+			break;
+			
+			case LIQUID_BLOOD_AB_P:
+				bloodTypeName = "AB+";
+				type = "AB";
+				positive = true;
+			break;
+			
+			case LIQUID_BLOOD_AB_N:
+				bloodTypeName = "AB-";
+				type = "AB";
+				positive = false;
+			break;
+			
+			default: 
+				bloodTypeName = "";
+			break;
+		}
+		
+		return bloodTypeName;
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Static/Liquid.c b/scripts/4_World/DayZ/Static/Liquid.c
new file mode 100644
index 0000000000000000000000000000000000000000..7edd1fa074a5ffe1840acee1d4f60e244e4748ba
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/Liquid.c
@@ -0,0 +1,287 @@
+class Liquid
+{
+	static ref map<int, ref NutritionalProfile> m_AllLiquidsByType = new map<int, ref NutritionalProfile>;
+	static ref map<string, ref NutritionalProfile> m_AllLiquidsByName = new map<string, ref NutritionalProfile>;
+	
+	static bool m_Init = InitAllLiquids();
+	
+	static string GetLiquidClassname(int liquid_type)
+	{
+		NutritionalProfile liquid = m_AllLiquidsByType.Get(liquid_type);
+		if (liquid)
+		{
+			return liquid.GetLiquidClassname();
+		}
+		
+		return "";
+	}
+	
+	static bool InitAllLiquids()
+	{
+		string cfg_classname = "cfgLiquidDefinitions";
+		string property_value = "NULL_PROPERTY";
+		int cfg_item_count = g_Game.ConfigGetChildrenCount(cfg_classname);
+
+		for (int i = 0; i < cfg_item_count; i++)
+		{
+			string liquid_class_name;
+			GetGame().ConfigGetChildName(cfg_classname, i, liquid_class_name);
+			string liquid_full_path = string.Format("%1 %2",cfg_classname, liquid_class_name);
+			int config_liquid_type = GetGame().ConfigGetInt(string.Format("%1 type", liquid_full_path));
+			m_AllLiquidsByType.Insert(config_liquid_type, SetUpNutritionalProfile(config_liquid_type, liquid_class_name));
+			m_AllLiquidsByName.Insert(liquid_class_name, SetUpNutritionalProfile(config_liquid_type, liquid_class_name));
+			
+		}
+		return true;
+	}
+	
+	//---------------------------------------------------------------------------------------------------------
+	static void Transfer(ItemBase source_ent, ItemBase target_ent, float quantity = -1)
+	{
+		if (!Liquid.CanTransfer(source_ent, target_ent))
+			return;
+		
+		ItemBase source = source_ent;
+		ItemBase target = target_ent;
+		
+//		Debug.Log("Transfer, source:"+source.ToString()+" target: "+target.ToString(), "LiquidTransfer");
+		
+		float source_quantity 	= source.GetQuantity();
+		float target_quantity 	= target.GetQuantity();
+		int source_liquid_type 	= source.GetLiquidType();
+		int target_liquid_type 	= target.GetLiquidType();
+		int target_mask 		= target_ent.ConfigGetFloat("liquidContainerType");
+		int source_mask 		= source_ent.ConfigGetFloat("liquidContainerType");
+		
+		float available_capacity = target.GetQuantityMax() - target_quantity;
+		
+//		Debug.Log("target_mask ="+target_mask.ToString(), "LiquidTransfer");
+//		Debug.Log("source_mask ="+source_mask.ToString(), "LiquidTransfer");
+//		Debug.Log("source_liquid_type ="+source_liquid_type.ToString(), "LiquidTransfer");
+//		Debug.Log("target_liquid_type ="+target_liquid_type.ToString(), "LiquidTransfer");
+		
+		//target.GetBloodType(source_liquid_type);//override target liquidType
+		float quantity_to_transfer;
+		//transfers all
+		if (quantity == -1)
+		{
+			quantity_to_transfer = Math.Clamp(source_quantity,0,available_capacity);
+		}
+		//transfers exact ammount
+		else
+		{
+			quantity_to_transfer = Math.Clamp(Math.Min(source_quantity,quantity),0,available_capacity);
+		}
+		
+		//target.AddQuantity(quantity_to_transfer);
+		PluginTransmissionAgents m_mta = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+		m_mta.TransmitAgents(source_ent, target_ent, AGT_TRANSFER_COPY);
+		
+		source.AddQuantity(-quantity_to_transfer);
+		
+		Liquid.FillContainer(target_ent,source_liquid_type,quantity_to_transfer);
+	}
+	
+	static bool CanTransfer(ItemBase source_ent, ItemBase target_ent)
+	{
+		if (!source_ent || !target_ent)
+			return false;
+		
+		if (!source_ent.IsItemBase() || !target_ent.IsItemBase())
+		{
+			//Debug.Log("One of the Items is not of ItemBase type", "LiquidTransfer");
+			return false;
+		}
+
+		Barrel_ColorBase barrelTarget = Barrel_ColorBase.Cast(target_ent);
+		Barrel_ColorBase barrelSource = Barrel_ColorBase.Cast(source_ent);
+		if ((barrelTarget && !barrelTarget.IsOpen()) || (barrelSource && !barrelSource.IsOpen()))
+		{
+			return false;
+		}
+		
+		
+		
+		float source_quantity = source_ent.GetQuantity();
+		if (source_quantity <= 0)
+		{
+			//Debug.Log("source has no quantity", "LiquidTransfer");
+			return false;//if there is nothing to transfer
+		}
+		
+		int source_liquid_type 	= source_ent.GetLiquidType();	
+		if (source_liquid_type < 1) 
+		{
+			//Debug.Log("source has some quantity, but does not have a valid liquidType set, liquidType = "+ToString(source_liquid_type), "LiquidTransfer");
+			return false;//if source is not a container
+		}
+		
+		if (!CanFillContainer(target_ent,source_liquid_type))
+		{
+			return false;
+		}
+		
+		
+		return true;
+	}
+	static void FillContainer(ItemBase container, int liquid_type, float amount)
+	{
+		if (!CanFillContainer(container,liquid_type))
+		{
+			return;
+		}
+		//filling
+		container.SetLiquidType(liquid_type);
+		container.AddQuantity(amount); 
+		
+	}
+
+	static void FillContainerEnviro(ItemBase container, int liquid_type, float amount, bool inject_agents = false)
+	{
+		FillContainer(container,liquid_type,amount);
+		if (inject_agents)
+		{
+			PluginTransmissionAgents plugin = PluginTransmissionAgents.Cast(GetPlugin(PluginTransmissionAgents));
+			plugin.TransmitAgents(NULL, container, AGT_WATER_POND, amount);
+		}
+	}
+	
+	static bool CanFillContainer(ItemBase container, int liquid_type, bool ignore_fullness_check = false)
+	{
+		if (!container) 
+			return false;
+		
+		bool is_container_full = container.IsFullQuantity();
+		
+		if (is_container_full && !ignore_fullness_check)
+		{
+			//Debug.Log("container is full", "LiquidTransfer");
+			return false;
+			
+		}
+		int container_mask = container.ConfigGetFloat("liquidContainerType");
+		
+		if (container_mask == 0)
+		{
+			//Debug.Log("target is not a container", "LiquidTransfer");
+			return false;//if the target liquidContainerType is set to 0
+		}
+		
+		if ((liquid_type & container_mask) == 0)
+		{
+			//Debug.Log("target liquidContainerType does not support this liquid type", "LiquidTransfer");
+			return false;
+		}
+		
+		float container_quantity 	= container.GetQuantity();
+		
+		int container_liquid_type 	= container.GetLiquidType();
+		
+		if (container_quantity > 0 && container_liquid_type != liquid_type) 
+		{
+			//Debug.Log("target is not empty AND is of different liquid type than liquid_type added in", "LiquidTransfer");
+			return false;
+		}
+		return true;
+	}
+	
+	private static string GetLiquidConfigProperty(int liquid_type, string property_name, bool is_nutrition_property = false)
+	{
+		string cfg_classname = "cfgLiquidDefinitions";
+		string property_value = "NULL_PROPERTY";
+		int cfg_item_count = g_Game.ConfigGetChildrenCount(cfg_classname);
+
+		for (int i = 0; i < cfg_item_count; i++)
+		{
+			string liquid_class_name;
+			GetGame().ConfigGetChildName(cfg_classname, i, liquid_class_name);
+			string liquid_full_path = string.Format("%1 %2", cfg_classname, liquid_class_name);
+			int config_liquid_type = GetGame().ConfigGetInt(string.Format("%1 type", liquid_full_path));
+			
+			if (config_liquid_type == liquid_type)// found the specific class, now lets extract the values
+			{
+				if (!is_nutrition_property) 
+				{
+					GetGame().ConfigGetText(string.Format("%1 %2", liquid_full_path, property_name), property_value);
+					return property_value;
+				}
+				else
+				{
+					GetGame().ConfigGetText(string.Format("%1 Nutrition %2", liquid_full_path, property_name), property_value);
+					return property_value;
+				}
+			}
+		}
+		return property_value;
+	}
+	
+	static NutritionalProfile GetNutritionalProfileByType(int liquid_type)
+	{
+		return m_AllLiquidsByType.Get(liquid_type);
+	}
+	
+	static NutritionalProfile GetNutritionalProfileByName(string class_name)
+	{
+		return m_AllLiquidsByName.Get(class_name);
+	}
+	
+	static NutritionalProfile SetUpNutritionalProfile(int liquid_type, string liquid_class_name)
+	{
+		float energy = GetEnergy(liquid_type);
+		float nutritional_index = GetNutritionalIndex(liquid_type);
+		float volume = GetFullness(liquid_type);
+		float water_content = GetWaterContent(liquid_type);
+		float toxicity = GetToxicity(liquid_type);
+		int agents = GetAgents(liquid_type);
+		float digest = GetDigestibility(liquid_type);
+		NutritionalProfile profile = new NutritionalProfile(energy, water_content, nutritional_index, volume, toxicity, agents, digest);
+		profile.MarkAsLiquid(liquid_type, liquid_class_name);
+		return profile;
+	}
+	
+	static int GetAgents(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "agents", true).ToInt();
+	}
+	
+	static float GetToxicity(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "toxicity", true).ToFloat();
+	}
+	
+	static float GetWaterContent(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "water", true).ToFloat();
+	}
+	
+	static float GetEnergy(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "energy", true).ToFloat();
+	}
+	
+	static float GetNutritionalIndex(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "nutritionalIndex", true).ToFloat();
+	}
+	
+	static string GetName(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "name");
+	}
+	
+	static float GetFlammability(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "flammability").ToFloat();
+	}
+	
+	static float GetFullness(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "fullnessIndex", true).ToFloat();
+	}
+	
+	static float GetDigestibility(int liquid_type)
+	{
+		return Liquid.GetLiquidConfigProperty(liquid_type, "digestibility", true).ToFloat();
+	}
+	
+};
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Static/MiscGameplayFunctions.c b/scripts/4_World/DayZ/Static/MiscGameplayFunctions.c
new file mode 100644
index 0000000000000000000000000000000000000000..c0f7a8ccf4cad1ecdf1719bb2b60728e386b6969
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/MiscGameplayFunctions.c
@@ -0,0 +1,1735 @@
+class TurnItemIntoItemLambda extends ReplaceItemWithNewLambda
+{
+	bool m_TransferAgents;
+	bool m_TransferVariables;
+	bool m_TransferHealth;
+	bool m_ExcludeQuantity;
+	float m_quantity_override;
+	
+	void TurnItemIntoItemLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+		SetTransferParams();
+	}
+	
+	void SetTransferParams (bool transfer_agents = true, bool transfer_variables = true, bool transfer_health = true, bool exclude_quantity = false, float quantity_override = -1)
+	{
+		m_TransferAgents = transfer_agents;
+		m_TransferVariables = transfer_variables; 
+		m_TransferHealth = transfer_health;
+		m_ExcludeQuantity = exclude_quantity;
+		m_quantity_override = quantity_override;
+	}
+
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+
+		if (new_item) 
+		{
+			MiscGameplayFunctions.TransferItemProperties(old_item, new_item, m_TransferAgents, m_TransferVariables, m_TransferHealth, m_ExcludeQuantity);
+			MiscGameplayFunctions.TransferInventory(old_item, new_item, m_Player);
+			
+			//quantity override
+			if (ItemBase.Cast(new_item) && m_quantity_override != -1)
+			{
+				m_quantity_override = Math.Max(m_quantity_override,0);
+				ItemBase.Cast(new_item).SetQuantity(m_quantity_override);
+			}
+		}
+		else
+		{
+			Debug.LogError("TurnItemIntoItemLambda: failed to create new item","static");
+		}
+	}
+	
+	//! if attaching from att.slot to att.slot, skips the change to "ground" version. Allows for correct property transfers.
+	override void VerifyItemTypeBySlotType ()
+	{
+		if (m_NewLocation.GetType() == InventoryLocationType.ATTACHMENT && m_OldItem.ConfigIsExisting("ChangeIntoOnAttach"))
+		{
+			string str;
+			int idx = -1;
+			TStringArray inventory_slots = new TStringArray;
+			TIntArray inventory_slots_idx = new TIntArray;
+			TStringArray attach_types = new TStringArray;
+			
+			m_OldItem.ConfigGetTextArray("ChangeInventorySlot",inventory_slots);
+			if (inventory_slots.Count() < 1) //is string
+			{
+				inventory_slots_idx.Insert(InventorySlots.GetSlotIdFromString(m_OldItem.ConfigGetString("ChangeInventorySlot")));
+				attach_types.Insert(m_OldItem.ConfigGetString("ChangeIntoOnAttach"));
+			}
+			else //is array
+			{
+				inventory_slots_idx.Clear();
+				for (int i = 0; i < inventory_slots.Count(); i++)
+				{
+					inventory_slots_idx.Insert(InventorySlots.GetSlotIdFromString(inventory_slots.Get(i)));
+				}
+				m_OldItem.ConfigGetTextArray("ChangeIntoOnAttach",attach_types);
+			}
+		
+			idx = m_NewLocation.GetSlot();
+			str = attach_types.Get(inventory_slots_idx.Find(idx));
+			if (str != "")
+			{
+				m_NewItemType = str;
+			}
+		}
+	}
+	
+	override void OnSuccess (EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		if( m_Player )
+		{
+			m_Player.GetItemAccessor().OnItemInHandsChanged();
+		}
+	}
+};
+
+class TurnItemIntoItemLambdaAnimSysNotifyLambda extends TurnItemIntoItemLambda
+{
+	override void OnSuccess (EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		if( m_Player )
+		{
+			m_Player.GetItemAccessor().OnItemInHandsChanged();
+		}
+	}
+}
+
+class TurnItemIntoItemLambdaRestrainLambda extends TurnItemIntoItemLambdaAnimSysNotifyLambda
+{
+	override void OnSuccess (EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		m_Player.SetRestrained(true);
+	}
+}
+
+/**@class		DropEquipAndDestroyRootLambda
+ * @brief		this one is a bit special: it drops all items and destroys the ex-root of the hierarchy
+ **/
+class DropEquipAndDestroyRootLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+
+	void DropEquipAndDestroyRootLambda (EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+		m_Player = player;
+	}
+	
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+		
+		InventoryLocation understash_src = m_NewLocation; // m_NewLocation is a backup of original old_item's src before the operation started
+		
+		array<EntityAI> children = new array<EntityAI>;
+		old_item.GetInventory().EnumerateInventory(InventoryTraversalType.LEVELORDER, children);
+		int count = children.Count();
+		for (int i = 0; i < count; i++)
+		{
+			EntityAI child = children.Get(i);
+			if (child)
+			{
+				InventoryLocation child_src = new InventoryLocation;
+				child.GetInventory().GetCurrentInventoryLocation(child_src);
+				
+				InventoryLocation child_dst = new InventoryLocation;
+				//@TODO: modify _dst with place on gnd?
+				
+				vector m4[4];
+				Math3D.MatrixIdentity4(m4);
+				
+				//! We don't care if a valid transform couldn't be found, we just want to preferably use it instead of placing on the old item
+				GameInventory.PrepareDropEntityPos(old_item, child, m4, false, -1);
+				
+				child_dst.SetGround(child,m4);
+				
+				m_Player.LocalTakeToDst(child_src, child_dst);
+												
+				GetGame().RemoteObjectTreeCreate(child); // this forces server to send CreateVehicle Message to client. This is needed for preserving the appearance of network operations on client (so that DeleteObject(old) arrives before CreateVehicle(new)). @NOTE: this does not delete the object on server, only it's network representation.
+			}
+		}
+	}
+}
+
+/**@class		MoveEquipToExistingItemAndDestroyOldRootLambda
+ * @brief		this one is a also bit special: it moves all items to already existing item and destroys the ex-root of the hierarchy
+ **/
+class MoveEquipToExistingItemAndDestroyOldRootLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+	EntityAI m_NewItem;
+
+	void MoveEquipToExistingItemAndDestroyOldRootLambda (EntityAI old_item, string new_item_type, PlayerBase player, EntityAI new_item)
+	{
+		m_Player = player;
+		m_NewItem = new_item;
+		if (new_item_type != string.Empty)
+			Error("MoveEquipAndDestroyRootLambda expects new_item_type to be empty");
+	}
+	
+	override protected void RemoveNetworkObjectInfo ()
+	{
+		super.RemoveNetworkObjectInfo();
+		GetGame().RemoteObjectTreeDelete(m_NewItem);
+	}
+	override protected void UndoRemoveNetworkObjectInfo ()
+	{
+		super.UndoRemoveNetworkObjectInfo();
+		GetGame().RemoteObjectTreeCreate(m_NewItem);
+	}
+	
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		// @NOTE: new_item is NULL, this lambda does not create new entity
+		super.CopyOldPropertiesToNew(old_item, new_item);
+		
+		MiscGameplayFunctions.TransferInventory(old_item, m_NewItem, m_Player);		
+	}
+	
+	override protected void CreateNetworkObjectInfo (EntityAI new_item)
+	{
+		super.CreateNetworkObjectInfo(new_item);
+		GetGame().RemoteObjectTreeCreate(m_NewItem);
+	}
+};
+
+enum TransferInventoryResult
+{
+	Ok, DroppedSome
+};
+
+enum ThrowEntityFlags
+{
+	NONE = 0,
+	SPLIT = 1, //< Splits the item when it has quantity, recommended to use when called on an attachment
+}
+
+class MiscGameplayFunctions
+{
+	//! truncate float to specified precision
+	static float Truncate(float value, int decimals = 2)
+	{
+		int multiplier = Math.Pow(10,decimals);
+		return Math.Clamp(Math.Floor(value * multiplier),float.LOWEST, float.MAX) / multiplier;
+	}
+	//! truncate float to specified precision, output as string
+	static string TruncateToS(float value, int decimals = 2)
+	{
+		return Truncate(value, decimals).ToString();
+	}
+	//! truncate float to specified precision
+	static vector TruncateVec(vector value, int decimals = 2)
+	{
+		int multiplier = Math.Pow(10,decimals);
+		float v1 = Math.Clamp(Math.Floor(value[0] * multiplier),float.LOWEST, float.MAX) / multiplier;
+		float v2 = Math.Clamp(Math.Floor(value[1] * multiplier),float.LOWEST, float.MAX) / multiplier;
+		float v3 = Math.Clamp(Math.Floor(value[2] * multiplier),float.LOWEST, float.MAX) / multiplier;
+		return Vector(v1,v2,v3);
+	}
+	
+	static string TruncateVecToS(vector value,int decimals = 2, string delimiter = " ")
+	{
+		return MiscGameplayFunctions.TruncateToS(value[0],decimals) + delimiter + MiscGameplayFunctions.TruncateToS(value[1],decimals) +delimiter + MiscGameplayFunctions.TruncateToS(value[2],decimals));
+	}
+	
+	static string GetColorString(float r, float g, float b, float a)
+	{
+		return string.Format("#(argb,8,8,3)color(%1,CO)", string.Format("%1,%2,%3,%4", r, g, b, a));
+	}
+	
+	//! Produces ACII "progress bar" based on an 0..1 'value' input
+	static string ValueToBar(float value, string bar = "[----------]", string mark = "x")
+	{
+		int length = bar.Length() - 2;
+		float index = Math.Lerp(0,length, value);
+		index = Math.Round(index);
+		index = Math.Clamp(index,0,length);
+		
+		return InsertAtPos(bar,mark,index);
+	}
+	
+	//! Insert 'insert' behind index 'pos' of the 'base' string
+	static string InsertAtPos(string base, string insert, int pos)
+	{
+		int length_first = pos+1;
+		int length_base = base.Length();
+		int length_second = length_base - length_first;
+		string first = base.Substring(0,length_first);
+		string second = base.Substring(pos+1,length_second);
+		return first + insert + second;
+	}
+	
+	//! will transform item' variables, agents and other local scripted properties as well as any relevant non-scripted properties like health
+	static void TransferItemProperties(EntityAI source, notnull EntityAI target, bool transfer_agents = true, bool transfer_variables = true, bool transfer_health = true, bool exclude_quantity = false)
+	{
+		ItemBase target_ib = ItemBase.Cast(target);
+		ItemBase source_ib = ItemBase.Cast(source);
+		
+		if( transfer_agents ) target_ib.TransferAgents( source.GetAgents() );
+		
+		if( transfer_variables )
+		{
+			MiscGameplayFunctions.TransferItemVariables(source_ib, target_ib, exclude_quantity);
+		}
+
+		if (GetGame().IsServer() || !GetGame().IsMultiplayer())
+		{
+			if( transfer_health )
+				target_ib.SetHealth01("", "", source.GetHealth01("",""));
+		}
+	}
+
+	static void TransferItemVariables(ItemBase source, ItemBase target, bool exclude_quantity = false)
+	{
+		target.TransferVariablesFloat( source.GetVariablesFloat() );
+		//target.TransferVariablesString( source.GetVariablesString() );
+		if ( exclude_quantity )
+		{
+			target.RemoveItemVariable(VARIABLE_QUANTITY);
+		}
+		else if ( source.IsMagazine() && target.IsMagazine() )
+		{
+			Magazine source_mag = Magazine.Cast(source);
+			Magazine target_mag = Magazine.Cast(target);
+			
+			target_mag.ServerSetAmmoCount( source_mag.GetAmmoCount() );
+		}
+		
+		if ( source.IsWeapon() && target.IsWeapon() )
+		{
+			Weapon_Base source_wpn = Weapon_Base.Cast(source);
+			Weapon_Base target_wpn = Weapon_Base.Cast(target);
+			
+			target_wpn.CopyWeaponStateFrom(source_wpn);
+		}
+		else if ( source.HasEnergyManager() && target.HasEnergyManager() )
+		{
+			ComponentEnergyManager ems = source.GetCompEM();
+			ComponentEnergyManager emt = target.GetCompEM();
+			
+			emt.SetEnergy(ems.GetEnergy());
+
+			if (ems.IsSwitchedOn())
+				emt.SwitchOn();
+		}
+		else if ( source.CanDecay() && target.CanDecay() )
+		{
+			Edible_Base source_edb = Edible_Base.Cast(source);
+			Edible_Base target_edb = Edible_Base.Cast(target);
+			
+			target_edb.TransferFoodStage(source_edb);
+		}
+	}
+
+	static TransferInventoryResult TransferInventory( EntityAI sourceItem, EntityAI targetItem, PlayerBase player)
+	{
+		TransferInventoryResult result = TransferInventoryResult.Ok;
+
+		array<EntityAI> children = new array<EntityAI>;
+		sourceItem.GetInventory().EnumerateInventory(InventoryTraversalType.LEVELORDER, children);
+		int count = children.Count();
+		for (int i = 0; i < count; i++)
+		{
+			EntityAI child = children.Get(i);
+			if (child)
+			{
+				InventoryLocation child_src = new InventoryLocation;
+				child.GetInventory().GetCurrentInventoryLocation( child_src );
+				
+				InventoryLocation child_dst = new InventoryLocation;
+				child_dst.Copy( child_src );
+				child_dst.SetParent( targetItem );
+
+				bool drop = false;
+
+				if (GameInventory.LocationCanAddEntity(child_dst))
+				{
+					// try to move it to the same exact place in dst
+					targetItem.GetInventory().TakeToDst(InventoryMode.LOCAL, child_src, child_dst);
+				}
+				else
+				{
+					drop = true; // or drop otherwise
+				}
+
+				if (drop)
+				{
+					player.LocalDropEntity(child);
+					GetGame().RemoteObjectTreeCreate(child);
+					result = TransferInventoryResult.DroppedSome;
+				}
+			}
+		}
+		return result;
+	}
+	
+	static void UnlimitedAmmoDebugCheck(Weapon_Base weapon)
+	{
+		if ( ItemBase.GetDebugActionsMask() & DebugActionType.UNLIMITED_AMMO )
+		{
+			Magazine magazine;
+			if ( GetGame().IsServer() )
+			{
+				magazine = weapon.GetMagazine(weapon.GetCurrentMuzzle());
+			
+				if (magazine)
+				{
+					if (magazine.GetAmmoCount() <= 5)
+					{
+						magazine.ServerSetAmmoMax();
+					}
+				}
+			}
+			else
+			{
+				magazine = weapon.GetMagazine(weapon.GetCurrentMuzzle());
+			
+				if (magazine)
+				{
+					if (magazine.GetAmmoCount() <= 5)
+					{
+						magazine.LocalSetAmmoMax();
+					}
+				}
+			
+			}
+		}
+	}
+	
+
+		
+	static void TurnItemIntoItem (notnull ItemBase old_item, string new_item_type, notnull PlayerBase player)
+	{
+		TurnItemIntoItemEx(player, new TurnItemIntoItemLambda(old_item, new_item_type, player));
+	}
+		
+	static void TurnItemIntoItemEx (notnull PlayerBase player, ReplaceItemWithNewLambdaBase lambda)
+	{
+		player.ServerReplaceItemWithNew(lambda);
+	}
+
+	static void TurnItemInHandsIntoItem (notnull ItemBase old_item, string new_item_type, notnull PlayerBase player)
+	{
+		TurnItemInHandsIntoItemEx(player, new TurnItemIntoItemLambda(old_item, new_item_type, player));
+	}
+	
+	static void TurnItemInHandsIntoItemEx (notnull PlayerBase player, ReplaceItemWithNewLambdaBase lambda)
+	{
+		player.ServerReplaceItemInHandsWithNew(lambda);
+	}
+
+	//!Spawns multiple piles of stackable ItemBase objects on ground (intended for generic use)
+	static array<ItemBase> CreateItemBasePiles(string item_name, vector ground_position, float quantity, float health, bool floaty_spawn = false)
+	{
+		array<ItemBase>	item_piles;
+		float max_stack_size;
+		ItemBase pile;
+		
+		item_piles = new array<ItemBase>;
+		max_stack_size = g_Game.ConfigGetInt("cfgVehicles " + item_name + " varStackMax");
+		if( max_stack_size < 1)
+			max_stack_size = g_Game.ConfigGetInt("cfgVehicles " + item_name + " varQuantityMax");
+		if( max_stack_size < 1)
+			max_stack_size = 1;
+		
+		int full_piles_count = Math.Floor(quantity/max_stack_size);
+		int rest = quantity - (full_piles_count*max_stack_size);
+		
+		for ( int i = 0; i < full_piles_count; i++ )
+		{
+			if (floaty_spawn)
+				pile = ItemBase.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_CREATEPHYSICS|ECE_UPDATEPATHGRAPH));
+			else
+				pile = ItemBase.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_PLACE_ON_SURFACE));
+			pile.SetQuantity(max_stack_size);
+			pile.SetHealth(health);
+			item_piles.Insert(pile);
+		}
+		if ( rest > 0 )
+		{
+			if (floaty_spawn)
+				pile = ItemBase.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_CREATEPHYSICS|ECE_UPDATEPATHGRAPH));
+			else
+				pile = ItemBase.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_PLACE_ON_SURFACE));
+			pile.SetQuantity(rest);
+			pile.SetHealth(health);
+			item_piles.Insert(pile);
+		}
+		return item_piles;
+	}
+	
+	static array<Magazine> CreateMagazinePiles(string item_name, vector ground_position, float quantity,  float health )
+	{
+		array<Magazine>	items;
+		float stack_size;
+		Magazine pile;
+		
+		items = new array<Magazine>;
+		stack_size = g_Game.ConfigGetInt("cfgMagazines " + item_name + " count");
+		
+		int piles_count = Math.Floor(quantity/stack_size);
+		int rest = quantity - (piles_count*stack_size);
+		
+		for ( int i = 0; i < piles_count; i++ )
+		{
+			pile = Magazine.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_PLACE_ON_SURFACE));
+			pile.ServerSetAmmoCount(stack_size);
+			items.Insert(pile);
+		}
+		if ( rest > 0)
+		{
+			pile = Magazine.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_PLACE_ON_SURFACE));
+			pile.ServerSetAmmoCount(rest);
+			items.Insert(pile);
+		}
+		return items;
+	}
+	
+	static array<Magazine> CreateMagazinePilesFromBullet(string bullet_type, vector ground_position, float quantity,  float health )
+	{
+		array<Magazine>	items;
+		items = new array<Magazine>;
+		float stack_size;
+		Magazine pile;
+		string item_name;
+		if( !g_Game.ConfigGetText("cfgAmmo " + bullet_type + " spawnPileType", item_name) )
+			return items;
+		
+		stack_size = g_Game.ConfigGetInt("cfgMagazines " + item_name + " count");
+		
+		if(stack_size > 0)
+		{
+			int piles_count = Math.Floor(quantity/stack_size);
+			int rest = quantity - (piles_count*stack_size);
+		
+			for ( int i = 0; i < piles_count; i++ )
+			{
+				pile = Magazine.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_PLACE_ON_SURFACE));
+				pile.ServerSetAmmoCount(stack_size);
+				items.Insert(pile);
+			}
+			if ( rest > 0)
+			{
+				pile = Magazine.Cast(GetGame().CreateObjectEx(item_name, ground_position, ECE_PLACE_ON_SURFACE));
+				pile.ServerSetAmmoCount(rest);
+				items.Insert(pile);
+			}
+		}
+		return items;
+	}
+	
+	static int GetHealthLevelForAmmo(string class_name, float health)
+	{
+		float health_normalized = health / 100;
+		string config_path = CFG_WEAPONSPATH + " " + class_name + " DamageSystem" + " GlobalHealth" + " healthLabels";
+		CachedObjectsArrays.ARRAY_FLOAT.Clear();
+		GetGame().ConfigGetFloatArray(config_path, CachedObjectsArrays.ARRAY_FLOAT);
+		for(int i = 0; i < CachedObjectsArrays.ARRAY_FLOAT.Count(); i++)
+		{
+			if( health_normalized >= CachedObjectsArrays.ARRAY_FLOAT.Get(i) )
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	static float GetTypeMaxGlobalHealth(string class_name, string health_type = "Health")
+	{
+		float max_health;
+		string cfg_path;
+		
+		if ( GetGame().ConfigIsExisting(CFG_VEHICLESPATH+" "+class_name) )
+		{
+			cfg_path = CFG_VEHICLESPATH;
+		}
+		else if ( GetGame().ConfigIsExisting(CFG_WEAPONSPATH+" "+class_name) )
+		{
+			cfg_path = CFG_WEAPONSPATH;
+		}
+		else if ( GetGame().ConfigIsExisting(CFG_MAGAZINESPATH+" "+class_name) )
+		{
+			cfg_path = CFG_MAGAZINESPATH;
+		}
+		cfg_path = cfg_path + " "+class_name+" DamageSystem GlobalHealth " + health_type + " hitpoints";
+		max_health = GetGame().ConfigGetFloat(cfg_path);
+		
+		return max_health;
+	}
+	
+	static bool GetProjectedCursorPos3d (out vector position, Weapon_Base weapon)
+	{
+		vector usti_hlavne_position = weapon.GetSelectionPositionMS( "usti hlavne" );
+		vector konec_hlavne_position = weapon.GetSelectionPositionMS( "konec hlavne" );
+		vector end_point = weapon.ModelToWorld(usti_hlavne_position);
+		vector begin_point = weapon.ModelToWorld(konec_hlavne_position);
+		vector contact_dir;
+		int contact_component;
+		
+		vector aim_point = end_point - begin_point;
+		aim_point = aim_point.Normalized() * PROJECTED_CURSOR_DISTANCE;
+		aim_point = aim_point + end_point;
+		
+		if (DayZPhysics.RaycastRV(begin_point, aim_point, position, contact_dir, contact_component, null, null, null, false, false, ObjIntersectFire))
+			return true;
+		return false;
+	}
+	
+	static void GetHeadBonePos(notnull PlayerBase player, out vector pos)
+	{
+		// Get position of head for starting trace pos, otherwise use sane default
+		int headBoneIdx = player.GetBoneIndexByName("Head");
+		if ( headBoneIdx == -1 )
+			{ pos = player.GetPosition()[1] + 1.6; }
+		else
+			{ pos = player.GetBonePositionWS(headBoneIdx); }	
+	}
+
+	static vector GetHeadingVector(notnull PlayerBase player)
+	{
+		vector dir = vector.Zero;
+		float headingAngle = GetHeadingAngle(player);
+		dir[0] = Math.Cos(headingAngle + Math.PI_HALF);
+		dir[2] = Math.Sin(headingAngle + Math.PI_HALF);
+		
+		return dir.Normalized();
+	}
+
+	static float GetHeadingAngle(notnull DayZPlayerImplement player)
+	{
+		HumanInputController hic = player.GetInputController();
+		float headingAngle = hic.GetHeadingAngle();
+		
+		return headingAngle;
+	}
+	
+	static float GetEnergyMetabolicSpeed(int movement_speed)
+	{
+		float speed;
+		switch (movement_speed)
+		{
+		case DayZPlayerConstants.MOVEMENTIDX_WALK:
+			speed = PlayerConstants.METABOLIC_SPEED_ENERGY_WALK;
+		break;
+		case DayZPlayerConstants.MOVEMENTIDX_RUN:
+			speed = PlayerConstants.METABOLIC_SPEED_ENERGY_JOG;
+		break;
+		case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+			speed = PlayerConstants.METABOLIC_SPEED_ENERGY_SPRINT;
+		break;
+		default:
+			speed = 0;
+		break;
+		}
+
+		speed += PlayerConstants.METABOLIC_SPEED_ENERGY_BASAL;
+		return speed;
+	}
+	
+	static float GetWaterMetabolicSpeed(int movement_speed)
+	{
+		float speed;
+		switch (movement_speed)
+		{
+		case DayZPlayerConstants.MOVEMENTIDX_WALK:
+			speed = PlayerConstants.METABOLIC_SPEED_WATER_WALK;
+		break;
+		case DayZPlayerConstants.MOVEMENTIDX_RUN:
+			speed = PlayerConstants.METABOLIC_SPEED_WATER_JOG;
+		break;
+		case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+			speed = PlayerConstants.METABOLIC_SPEED_WATER_SPRINT;
+		break;
+		default:
+			speed = 0;
+		break;
+		}
+
+		speed += PlayerConstants.METABOLIC_SPEED_WATER_BASAL;
+		return speed;
+	}
+	
+	static string ObtainRestrainItemTargetClassname(notnull EntityAI entity)
+	{
+		return entity.ConfigGetString( "OnRestrainChange");
+	}
+	
+	static void TransformRestrainItem(EntityAI current_item, EntityAI tool, PlayerBase player_source, PlayerBase player_target, bool destroy = false)
+	{
+		bool type;
+		
+		if ( tool )
+		{
+			//is unrestrain and not struggle
+			type = tool.ConfigGetBool("RestrainUnlockType");
+		}
+		string new_item_name = current_item.ConfigGetString( "OnRestrainChange");
+		
+		if ( new_item_name != "" )
+		{
+			if ( player_target )
+			{
+				if (player_target.IsAlive())
+					MiscGameplayFunctions.TurnItemIntoItemEx(player_target, new ReplaceAndDestroyLambdaEx(current_item, new_item_name, player_target, type));
+				else
+					MiscGameplayFunctions.TurnItemIntoItemEx(player_source, new DestroyItemInCorpsesHandsAndCreateNewOnGndLambda(current_item, new_item_name, player_target, type));
+			}
+			else
+			{
+				MiscGameplayFunctions.TurnItemIntoItemEx(player_target, new ReplaceAndDestroyLambdaEx(current_item, new_item_name, player_target, type));
+			}
+		}
+		else
+		{
+			Error("current_item:" +current_item+ ", tool:" +tool +". No value for 'OnRestrainChange' config parameter");
+		}
+	}
+	
+	static bool IsValueInRange(float value, float from, float to)
+	{
+		return (value >= from) && (value <= to);
+	}
+
+	//! Check if player direction(based on cone of defined angle) is oriented to target position
+	static bool IsPlayerOrientedTowardPos(notnull DayZPlayerImplement player, vector target_pos, float cone_angle)
+	{
+		if (player)
+		{
+			vector player_dir = player.GetDirection();
+			vector to_target_dir = target_pos - player.GetPosition();
+	
+			player_dir[1] = 0;
+			to_target_dir[1] = 0;
+		
+			player_dir.Normalize();
+			to_target_dir.Normalize();
+		
+			float cos_fi = vector.Dot(player_dir, to_target_dir);
+			vector cross = player_dir * to_target_dir;
+		
+			int dir = Math.Acos(cos_fi) * Math.RAD2DEG;
+				
+			if( cross[1] < 0 )
+				dir = -dir;
+
+			//! dir in cone or in a tip of cone 
+			if( (dir <= cone_angle && dir >= -cone_angle) || Math.AbsFloat(dir) == 90 )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	//TODO
+	static string SanitizeString(string input)
+	{
+		int max_length = 512;
+		string output = input;
+		
+		output = output.Substring(0,Math.Clamp(max_length,0,output.Length()));
+		return output;
+	}
+	
+	// deprecated - dont use
+	static bool ComplexBuildCollideCheckClient( PlayerBase player, ActionTarget target, ItemBase item, string partName = "" )
+	{
+		return true;
+	}
+	
+	static bool ComplexBuildCollideCheckClient( PlayerBase player, ActionTarget target, ItemBase item, int constraction_index )
+	{
+		BaseBuildingBase base_building = BaseBuildingBase.Cast( target.GetObject() );
+		if (base_building)
+		{
+			Construction construction = base_building.GetConstruction();
+			if (construction && BuildCondition( player, target, item, false, constraction_index ))
+			{
+				ConstructionActionData construction_action_data = player.GetConstructionActionData();
+				string partName;
+				if ( item )
+				{
+					partName = construction_action_data.GetBuildPartAtIndex(constraction_index).GetPartName();
+				}
+				else
+				{
+					partName = construction_action_data.GetBuildPartNoToolAtIndex(constraction_index).GetPartName();
+				}
+				bool boo;
+				if (base_building.PerformRoofCheckForBase(partName,player,boo) && boo)
+					return false;
+				if ( player.IsPlacingLocal() || player.IsPlacingServer() )
+					return false;
+				
+				/*float distance_root = vector.DistanceSq(target.GetCursorHitPos(), player.GetPosition());
+
+				if (!CfgGameplayHandler.GetDisableDistanceCheck() && distance_root < UAMaxDistances.BASEBUILDING_SHORT)
+				{
+					return false;
+				} */
+				return !construction.IsColliding( partName );
+			}
+		}
+		return false;
+	}
+	
+	// deprecated - dont use
+	static bool BuildCondition( PlayerBase player, ActionTarget target, ItemBase item, bool camera_check )
+	{
+		return true;
+	}
+	
+	static bool BuildCondition( PlayerBase player, ActionTarget target, ItemBase item, bool camera_check, int constraction_index )
+	{	
+		Object targetObject = target.GetObject();
+		if ( targetObject && targetObject.CanUseConstruction() )
+		{
+			BaseBuildingBase base_building = BaseBuildingBase.Cast( targetObject );
+			ConstructionActionData construction_action_data = player.GetConstructionActionData();
+			construction_action_data.SetTarget( targetObject );
+			
+			ConstructionPart constrution_part;
+			if ( item )
+			{
+				constrution_part = construction_action_data.GetBuildPartAtIndex(constraction_index);
+			}
+			else
+			{
+				constrution_part = construction_action_data.GetBuildPartNoToolAtIndex(constraction_index);
+			}
+
+			//Debug
+			/*
+			if ( constrution_part )
+			{
+				Construction construction = base_building.GetConstruction();	
+				construction.IsColliding( constrution_part.GetPartName() );
+			}
+			*/
+			
+			if ( constrution_part )
+			{
+				//camera and position checks
+				bool position_check = ( base_building.MustBeBuiltFromOutside() && !base_building.IsPlayerInside(player, constrution_part.GetMainPartName()) ) || ( !base_building.MustBeBuiltFromOutside() && base_building.IsPlayerInside(player, constrution_part.GetMainPartName()) );
+				if ( position_check && !player.GetInputController().CameraIsFreeLook() )
+				{
+					//Camera check (client-only)
+					if ( camera_check )
+					{
+						if ( GetGame() && ( !GetGame().IsDedicatedServer() ) )
+						{
+							return !base_building.IsFacingCamera( constrution_part.GetMainPartName() );
+						}
+					}
+					
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	static void IsUnderRoofFromToCalculation(EntityAI entity, out vector from, out vector to, float height = GameConstants.ROOF_CHECK_RAYCAST_DIST)
+	{
+		vector minMax[2];
+		entity.GetCollisionBox(minMax);
+
+		vector size = Vector(0,0,0);
+		//size[1] = minMax[1][1] - minMax[0][1];
+		float from_override = entity.HeightStartCheckOverride();
+		if (from_override > 0.0)
+		{
+			size[1] = from_override;
+		}
+		else
+		{
+			size[1] = minMax[1][1] - minMax[0][1];
+		}
+		
+		from = entity.GetPosition() + size;  
+		if ( entity.HeightCheckOverride() > 0 )
+		{
+			to = entity.GetPosition() + Vector(0, entity.HeightCheckOverride(), 0);
+		}
+		else
+		{
+			vector ceiling = "0 0 0";
+			ceiling[1] = height;
+			to = from + ceiling; //+size ??? offset to cast same distance
+		}
+	}
+	
+	static bool IsUnderRoof(EntityAI entity, float height = GameConstants.ROOF_CHECK_RAYCAST_DIST) 
+	{
+		return IsUnderRoofEx(entity, height, ObjIntersectView);
+	}
+	
+	static bool IsUnderRoofEx(EntityAI entity, float height = GameConstants.ROOF_CHECK_RAYCAST_DIST, int geometry = ObjIntersectView) 
+	{
+		vector from;
+		vector to;
+		
+		IsUnderRoofFromToCalculation(entity, from, to, height);
+
+		vector contact_pos;
+		vector contact_dir;
+
+		int contact_component;
+		//set<Object> hit_object = new set<Object>;
+		bool boo = DayZPhysics.RaycastRV( from, to, contact_pos, contact_dir, contact_component, /*hit_object*/NULL, NULL, entity, false, false, geometry,0.25 );
+		
+		/*if (boo)
+		{
+			Debug.DrawSphere(from , 0.8,Colors.YELLOW, ShapeFlags.ONCE);
+			Debug.DrawSphere(to , 0.8,Colors.RED, ShapeFlags.ONCE);
+		}
+		else
+		{
+			Debug.DrawSphere(from , 0.8,Colors.GREEN, ShapeFlags.ONCE);
+			Debug.DrawSphere(to , 0.8,Colors.RED, ShapeFlags.ONCE);
+		}*/
+		
+		return boo;
+	}
+
+	// cooking equipment effects (get position for steam particle)
+	static vector GetSteamPosition( EntityAI parent )
+	{
+		vector particle_pos;
+		float steam_offset = 0;
+		
+		if ( parent )
+		{
+			particle_pos = parent.GetPosition();
+			
+			if ( parent.IsInherited( PortableGasStove ) )
+			{
+				steam_offset = 0.2;
+			}
+			else if ( parent.IsInherited( FireplaceBase ) )
+			{
+				FireplaceBase fireplace = FireplaceBase.Cast( parent );
+				
+				if ( fireplace.IsBaseFireplace() )
+				{
+					steam_offset = 0.8;
+				}
+				else if ( fireplace.IsBarrelWithHoles() )
+				{
+					steam_offset = 1.1;
+				}
+				else if ( fireplace.IsFireplaceIndoor() )
+				{
+					steam_offset = 0.45;
+				}
+				else if ( fireplace.IsIndoorOven() )
+				{
+					steam_offset = 0.9;
+				}
+			}
+		}
+		
+		particle_pos[1] = particle_pos[1] + steam_offset;
+		
+		return particle_pos;
+	}
+	
+	static void DropAllItemsInInventoryInBounds(ItemBase ib, vector halfExtents)
+	{
+		if (!GetGame().IsServer())
+			return;
+		array<EntityAI> items = new array<EntityAI>;
+		ib.GetInventory().EnumerateInventory(InventoryTraversalType.LEVELORDER, items);
+		
+		vector direction = ib.GetDirection();
+		float dot = vector.Dot(direction, vector.Forward);
+		
+		float angle = Math.Acos(dot);	
+		if (direction[0] < 0)
+			angle = -angle;	
+
+		float cos = Math.Cos(angle);
+		float sin = Math.Sin(angle);
+		
+		EntityAI item;
+		int count = items.Count();
+		for ( int i = 0; i < count; ++i )
+		{
+			item = items.Get(i);
+			if ( item )
+				ib.GetInventory().DropEntityInBounds(InventoryMode.SERVER, ib, item, halfExtents, angle, cos, sin);					
+		}
+	}
+	
+	static void ThrowAllItemsInInventory(notnull EntityAI parent, int flags)
+	{
+		vector position = parent.GetPosition();
+		vector orientation = parent.GetOrientation();
+		vector rotation_matrix[3];
+		float direction[4];
+		
+		vector minmax[2];
+		parent.GetCollisionBox(minmax);
+
+		Math3D.YawPitchRollMatrix( orientation, rotation_matrix );
+		Math3D.MatrixToQuat( rotation_matrix, direction );
+
+		vector randomPos;
+		for ( int i = 0; i < parent.GetInventory().AttachmentCount(); ++i )
+		{
+			randomPos = Vector(position[0] + Math.RandomFloat(minmax[0][0], minmax[1][0]),
+								position[1] + Math.RandomFloat(minmax[0][1], minmax[1][1]),
+								position[2] + Math.RandomFloat(minmax[0][2], minmax[1][2]));
+			
+			ThrowEntityFromInventory(parent.GetInventory().GetAttachmentFromIndex( i ), randomPos, direction, -GetVelocity(parent), ThrowEntityFlags.NONE);
+		}
+
+		for ( int j = 0; j < parent.GetInventory().GetCargo().GetItemCount(); ++j )
+		{
+			randomPos = Vector(position[0] + Math.RandomFloat(minmax[0][0], minmax[1][0]),
+								position[1] + Math.RandomFloat(minmax[0][1], minmax[1][1]),
+								position[2] + Math.RandomFloat(minmax[0][2], minmax[1][2]));
+			
+			ThrowEntityFromInventory(parent.GetInventory().GetCargo().GetItem( j ), randomPos, direction, -GetVelocity(parent), ThrowEntityFlags.NONE);
+		}
+	}
+	
+	static void ThrowEntityFromInventory(notnull EntityAI entity, vector position, float direction[4], vector force, int flags)
+	{	
+		InventoryMode invMode = InventoryMode.SERVER;
+		if ( !GetGame().IsMultiplayer() )
+			invMode = InventoryMode.LOCAL;
+		
+		ItemBase entityIB;
+		if (CastTo(entityIB, entity))
+		{
+			InventoryLocation dst = new InventoryLocation;	
+			dst.SetGroundEx(entity, position, direction);
+			
+			if ( (flags & ThrowEntityFlags.SPLIT) && entityIB.CanBeSplit() )
+			{
+				for (int l = 0; l < entityIB.GetQuantity(); ++l)
+				{
+					ItemBase new_item = ItemBase.Cast( GameInventory.LocationCreateEntity( dst, entityIB.GetType(), ECE_NONE, RF_DEFAULT ) );
+		
+					if ( new_item )
+					{
+						MiscGameplayFunctions.TransferItemProperties(entityIB, new_item);
+						entityIB.AddQuantity( -1 );
+						new_item.SetQuantity( 1 );
+						new_item.ThrowPhysically(null, force, false);
+					}
+				}
+			}
+			else
+			{
+				float stackable = entityIB.GetTargetQuantityMax();
+				if ( !(stackable == 0 || stackable >= entityIB.GetQuantity()) )
+				{					
+					while (entityIB.GetQuantity() > stackable)
+					{
+						InventoryLocation spltDst = new InventoryLocation;
+						position[1] = position[1] + 0.1;
+						spltDst.SetGroundEx(entity, position, direction);
+						
+						ItemBase splitItem = entityIB.SplitIntoStackMaxToInventoryLocationEx( spltDst );
+						splitItem.ThrowPhysically(null, force, false);
+					}
+				}
+				
+				InventoryLocation src = new InventoryLocation;
+				entity.GetInventory().GetCurrentInventoryLocation(src);
+				
+				entity.GetInventory().TakeToDst(invMode, src, dst);
+				entityIB.ThrowPhysically(null, force, false);
+			}
+		}
+		else
+		{
+			entity.GetInventory().DropEntity(invMode, entity.GetHierarchyRoot(), entity);
+			dBodyApplyImpulse(entity, force);
+		}
+	}
+
+	static float GetCurrentItemHeatIsolation( ItemBase pItem )
+	{
+		float wetFactor;
+		float healthFactor;
+
+		float heatIsolation = pItem.GetHeatIsolation(); 	//! item heat isolation (from cfg)
+		float itemHealthLabel = pItem.GetHealthLevel();		//! item health (state)
+		float itemWetness = pItem.GetWet();					//! item wetness
+		
+		//! wet factor selection
+		if ( itemWetness >= GameConstants.STATE_DRY && itemWetness < GameConstants.STATE_DAMP )
+		{
+			wetFactor = GameConstants.ENVIRO_ISOLATION_WETFACTOR_DRY;
+		}
+		else if ( itemWetness >= GameConstants.STATE_DAMP && itemWetness < GameConstants.STATE_WET )
+		{
+			wetFactor = GameConstants.ENVIRO_ISOLATION_WETFACTOR_DAMP;
+		}
+		else if ( itemWetness >= GameConstants.STATE_WET && itemWetness < GameConstants.STATE_SOAKING_WET )
+		{
+			wetFactor = GameConstants.ENVIRO_ISOLATION_WETFACTOR_WET;
+		}
+		else if ( itemWetness >= GameConstants.STATE_SOAKING_WET && itemWetness < GameConstants.STATE_DRENCHED )
+		{
+			wetFactor = GameConstants.ENVIRO_ISOLATION_WETFACTOR_SOAKED;
+		}
+		else if ( itemWetness >= GameConstants.STATE_DRENCHED )
+		{
+			wetFactor = GameConstants.ENVIRO_ISOLATION_WETFACTOR_DRENCHED;
+		}
+		
+		//! health factor selection
+		switch (itemHealthLabel)
+		{
+			case GameConstants.STATE_PRISTINE:
+				healthFactor = GameConstants.ENVIRO_ISOLATION_HEALTHFACTOR_PRISTINE;
+			break;
+			
+			case GameConstants.STATE_WORN:
+				healthFactor = GameConstants.ENVIRO_ISOLATION_HEALTHFACTOR_WORN;
+			break;
+			
+			case GameConstants.STATE_DAMAGED:
+				healthFactor = GameConstants.ENVIRO_ISOLATION_HEALTHFACTOR_DAMAGED;
+			break;
+			
+			case GameConstants.STATE_BADLY_DAMAGED:
+				healthFactor = GameConstants.ENVIRO_ISOLATION_HEALTHFACTOR_B_DAMAGED;
+			break;
+			
+			case GameConstants.STATE_RUINED:
+				healthFactor = GameConstants.ENVIRO_ISOLATION_HEALTHFACTOR_RUINED;
+			break;
+		}
+		
+		//! apply factors
+		heatIsolation *= healthFactor;
+		heatIsolation *= wetFactor;
+
+		return heatIsolation;
+	}
+	
+	static void FilterObstructingObjects(array<Object> potentiallyObstructingObjects, out array<Object> obstructingObjects)
+	{
+		if (!obstructingObjects)
+			obstructingObjects = new array<Object>;
+		
+		for ( int i = 0; i < potentiallyObstructingObjects.Count(); ++i )
+		{
+			Object obj = potentiallyObstructingObjects[i];
+			if ( obj && ( obj.CanObstruct() || obj.CanProxyObstruct() ) )
+				obstructingObjects.Insert(obj);
+		}
+	}
+	
+	static bool CanIgnoreDistanceCheck(Object obj)
+	{
+	    return obj.IsTransport() || obj.CanUseConstruction();
+	}
+	
+	//! group objects that are close to each other together	
+	static void FilterObstructedObjectsByGrouping(vector origin, float range, float distanceDelta, array<Object> objects, array<Object> obstructingObjects, out array<Object> filteredObjects, bool doDistanceCheck = false, bool checkIfDistanceCanBeIgnored = false, float maxDist = 0)
+	{
+		array<Object> vicinityObjects= new array<Object>;
+		vicinityObjects.Copy(objects);
+		
+		int i = 0;
+		int j = 0;
+		int k = 0;			
+		int mCount = vicinityObjects.Count();
+		
+		if (!filteredObjects)
+			filteredObjects = new array<Object>;
+		
+		// Remove objects that are too far from the player anyways
+		if ( doDistanceCheck )
+		{
+			for ( i = vicinityObjects.Count() - 1; i >= 0; --i )
+			{
+				Object obj = vicinityObjects[i];
+				if ( obj && !CanIgnoreDistanceCheck( obj ) && vector.DistanceSq(origin, obj.GetPosition()) > maxDist * maxDist )
+					vicinityObjects.Remove(i);
+			}
+		}
+
+		// Sort obstructingObjects to have the furthest one first
+		array<Object> sortedObstructingObjects = new array<Object>;
+		array<float> distanceHelper = new array<float>;
+		array<float> distanceHelperUnsorted = new array<float>;
+		float distance, dist1, dist2;
+
+		for ( i = 0; i < obstructingObjects.Count(); ++i )
+		{
+			distance = vector.DistanceSq(obstructingObjects[i].GetWorldPosition(), origin);
+			distanceHelper.Insert(distance);
+		}
+
+		distanceHelperUnsorted.Copy(distanceHelper);
+		distanceHelper.Sort();
+
+		for ( i = distanceHelper.Count() - 1; i >= 0; --i )
+			sortedObstructingObjects.Insert(obstructingObjects[distanceHelperUnsorted.Find(distanceHelper[i])]);
+
+		array<ref array<Object>> tempGroups = new array<ref array<Object>>;
+		array<ref array<Object>> objectGroups = new array<ref array<Object>>;
+		array<Object> group;
+		
+		float cos = Math.Cos(90);
+		float sin = Math.Sin(90);
+
+		// Iterate through sorted obstructingObjects
+		for ( i = 0; i < sortedObstructingObjects.Count(); ++i )
+		{
+			Object obstrObj = sortedObstructingObjects[i];
+			vector worldPos = obstrObj.GetWorldPosition();
+			vector min, max;
+			vector minMax[2];
+			if ( obstrObj.GetCollisionBox(minMax) )
+			{
+				min = minMax[0];
+				max = minMax[1];
+				max = max * (obstrObj.GetOrientation() * range);
+
+				vector center, dx, dy, dz, half;
+				center = (min + max) * 0.5;
+				dz = obstrObj.GetOrientation();
+				dx = vector.RotateAroundZero(dz, vector.Up, cos, sin);
+				dy = vector.RotateAroundZero(dz, vector.Aside, cos, sin);
+				half = (max - min) * 0.5;
+				half = Vector(Math.AbsFloat(half[0]), Math.AbsFloat(half[1]), Math.AbsFloat(half[2]));
+
+				group = new array<Object>;
+
+				// Group objects within the above box
+				for ( j = vicinityObjects.Count() - 1; j >= 0; --j )
+				{
+					Object vicObj = vicinityObjects[j];
+					if ( vicObj )
+					{
+						vector d = vicObj.GetWorldPosition() - worldPos + center;
+						if ( Math.AbsFloat(vector.Dot(d, dx)) <= half[0] && Math.AbsFloat(vector.Dot(d, dy)) <= half[1] && Math.AbsFloat(vector.Dot(d, dz)) <= half[2] )
+						{
+							group.Insert(vicObj);
+							vicinityObjects.Remove(j);
+						}
+					}
+				}
+
+				if ( group.Count() > 0 )
+					tempGroups.Insert(group);
+			}
+		}
+
+		// Go through the objects grouped by obstruction to split them by distance too
+		for ( i = 0; i < tempGroups.Count(); ++i )
+			SplitArrayIntoGroupsByDistance(tempGroups[i], objectGroups, distanceDelta);
+
+		// Split initial groups by distance
+		SplitArrayIntoGroupsByDistance(vicinityObjects, objectGroups, distanceDelta);
+
+		// Raycast accordingly to groups		
+		IsObjectObstructedCache cache = new IsObjectObstructedCache(origin, mCount);
+		for ( i = 0; i < objectGroups.Count(); ++i )
+		{
+			array<Object> objectGroup = objectGroups[i];
+			Object sampleObject = objectGroup[0];
+
+			if ( !IsObjectObstructedEx(sampleObject, cache) )
+				filteredObjects.InsertAll(objectGroup);
+
+			cache.ClearCache();
+		}
+	}
+
+	static void SplitArrayIntoGroupsByDistance(array<Object> objects, array<ref array<Object>> objectGroups, float squaredDistanceDelta)
+	{
+		array<Object> group;
+		for ( int i = 0; i < objects.Count(); )
+		{
+			Object obj1 = objects[i];
+			if ( obj1 )
+			{
+				group = new array<Object>;
+				group.Insert(obj1);
+				for ( int j = objects.Count() - 1; j > i; --j )
+				{
+					Object obj2 = objects[j];
+					if ( obj1 && obj2 )
+					{
+						vector start = obj1.GetWorldPosition();
+						vector end = obj2.GetWorldPosition();
+
+						float distance = vector.DistanceSq(start, end);
+						if ( distance < squaredDistanceDelta )
+						{								
+							group.Insert(obj2);
+							objects.Remove(j);
+						}
+					}
+				}
+				objectGroups.Insert(group);
+				objects.Remove(i);
+				continue;
+			}
+			++i;
+		}
+	}
+	
+	static bool IsObjectObstructed(Object object, bool doDistanceCheck = false, vector distanceCheckPos = "0 0 0", float maxDist = 0)
+	{
+		vector rayStart;
+		MiscGameplayFunctions.GetHeadBonePos(PlayerBase.Cast(GetGame().GetPlayer()), rayStart);
+		IsObjectObstructedCache cache = new IsObjectObstructedCache(rayStart, 1);
+
+		return IsObjectObstructedEx(object, cache, doDistanceCheck, distanceCheckPos, maxDist);
+	}
+
+	static bool IsObjectObstructedEx(Object object, IsObjectObstructedCache cache, bool doDistanceCheck = false, vector distanceCheckPos = "0 0 0", float maxDist = 0)
+	{
+		if (!object)
+			return true;
+		
+		PlayerBase player = PlayerBase.Cast(g_Game.GetPlayer());
+		if (doDistanceCheck && vector.DistanceSq(player.GetPosition(), distanceCheckPos) > maxDist * maxDist)
+			return true;
+
+		cache.ObjectCenterPos = object.GetCenter();
+		
+		return IsObjectObstructedFilterEx(object, cache, player);
+	}
+ 	
+	static bool IsObjectObstructedProxy(Object object, IsObjectObstructedCache cache, PlayerBase player)
+	{
+		if (object.CanProxyObstruct())
+		{
+			RaycastRVParams rayInput = new RaycastRVParams(cache.RaycastStart, cache.ObjectCenterPos, player);
+			DayZPhysics.RaycastRVProxy(rayInput, cache.HitProxyObjects);				
+			if (cache.HitProxyObjects)
+			{
+				if (cache.HitProxyObjects.Count() > 0)
+				{
+					if (cache.HitProxyObjects[0].hierLevel > 0)
+					{
+						// ignores attachments on player
+						if (!cache.HitProxyObjects[0].parent.IsMan())
+						{
+							if (cache.HitProxyObjects[0].parent)
+							{
+								EntityAI proxyParent = EntityAI.Cast(cache.HitProxyObjects[0].parent);
+								if (proxyParent.GetInventory() && proxyParent.GetInventory().GetCargo())
+									return true;
+							}
+						}	
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	static bool IsObjectObstructedFilter(Object object, IsObjectObstructedCache cache, PlayerBase player)
+	{
+		for ( int m = 0; m < cache.HitObjects.Count(); m++ )
+		{
+			Object hit_object = cache.HitObjects.Get(m);
+			
+			if ( hit_object.CanObstruct() )
+				return true;
+
+			//4.3. ignore item if items are big and heavy >= OBJECT_OBSTRUCTION_WEIGHT 
+			//EntityAI eai;
+			//if ( Class.CastTo( eai, hit_object ) )
+			//{					
+			//	if ( eai.GetWeight() >= OBJECT_OBSTRUCTION_WEIGHT )
+			//	{
+			//		if ( eai != filtered_object && eai.GetHierarchyRoot() != filtered_object )
+			//		{
+			//			//Print("!!!!!obstacle vaha: " + hit_object);
+			//			is_obstructed = true;
+			//		}
+			//	}
+			//}
+		}
+		
+		return false;
+	}
+	
+	//! groups 'RaycastRVProxy' and 'RaycastRV' approaches into one method, allowes for comprehensive geometry override, if desired
+	static bool IsObjectObstructedFilterEx(Object object, IsObjectObstructedCache cache, PlayerBase player, int geometryTypeOverride = -1)
+	{
+		//first proxy geometries
+		RaycastRVParams rayInput = new RaycastRVParams(cache.RaycastStart, cache.ObjectCenterPos, player);
+		rayInput.flags = CollisionFlags.ALLOBJECTS;
+		if (geometryTypeOverride != -1)
+			rayInput.type = geometryTypeOverride; //default 'ObjIntersectView'
+		DayZPhysics.RaycastRVProxy(rayInput, cache.HitProxyObjects);
+		int count;
+		int i;
+		
+		if (cache.HitProxyObjects)
+		{
+			count = cache.HitProxyObjects.Count();
+			Object parent;
+			for (i = 0; i < count; i++)
+			{
+				if (cache.HitProxyObjects[i].hierLevel > 0) //parent has to exist, skipping nullcheck
+				{
+					parent = cache.HitProxyObjects[i].parent;
+					if (parent && !parent.IsMan() && parent.CanProxyObstruct())
+					{
+						if (parent != object || (parent == object && object.CanProxyObstructSelf()))
+							return true;
+					}	
+				}
+			}
+		}
+		
+		//second, regular raycast
+		int geometry = ObjIntersectFire; //default for the RV raycast
+		if (geometryTypeOverride != -1)
+			geometry = geometryTypeOverride;
+		DayZPhysics.RaycastRV(cache.RaycastStart, cache.ObjectCenterPos, cache.ObjectContactPos, cache.ObjectContactDir, cache.ContactComponent, cache.HitObjects, object, GetGame().GetPlayer(), false, false, geometry, 0.0, CollisionFlags.ALLOBJECTS);
+		count = cache.HitObjects.Count();
+		for (i = 0; i < count; i++ )
+		{
+			if (cache.HitObjects[i].CanObstruct())
+				return true;
+		}
+		
+		return false;
+	}
+
+	//Inflict absolute damage to item (used on tools when completing actions)
+	static void DealAbsoluteDmg(ItemBase item, float dmg)
+	{
+		item.DecreaseHealth(dmg, false);
+	}
+	
+	//Function used to normailze values, enter the used value and the max value (max will become 1)
+	static float Normalize(int val, int maxVal)
+	{
+		if (maxVal == 0)
+		{
+			Debug.LogError("Division by 0 is not allowed");
+			return 0;
+		}
+		
+		return val / maxVal;
+	}
+	
+	static float Bobbing(float period, float amplitude, float elapsedTime)
+	{
+		//Prevent division by 0
+		if ( period == 0 )
+			period = 1;
+		
+		elapsedTime /= period;
+		
+		float cycle;
+		cycle += elapsedTime;
+		cycle = FModulus(cycle, 360);
+		cycle = Math.Sin(cycle) * amplitude;
+		
+		return cycle;
+	}
+	
+	// DEPRECATED, use Math.ModFloat directly instead
+	static float FModulus(float x, float y)
+	{
+		return Math.ModFloat(x, y);
+	}
+	
+	static void RemoveSplint( PlayerBase player )
+	{
+		EntityAI entity = player.GetInventory().CreateInInventory("Splint");
+		if (!entity)
+			entity = player.SpawnEntityOnGroundOnCursorDir("Splint", 0.5);
+		
+		EntityAI attachment;
+		ItemBase new_item = ItemBase.Cast(entity);
+		Class.CastTo(attachment, player.GetItemOnSlot("Splint_Right"));
+		if ( attachment && attachment.GetType() == "Splint_Applied" )
+		{
+			if (new_item)
+			{	
+				MiscGameplayFunctions.TransferItemProperties(attachment,new_item);
+				
+				if (GetGame().IsServer())
+				{
+					//Lower health level of splint after use
+					if (new_item.GetHealthLevel() < 4)
+					{
+						int newDmgLevel = new_item.GetHealthLevel() + 1;
+						
+						float max = new_item.GetMaxHealth("","");
+						
+						switch ( newDmgLevel )
+						{
+							case GameConstants.STATE_BADLY_DAMAGED:
+								new_item.SetHealth( "", "", max * GameConstants.DAMAGE_BADLY_DAMAGED_VALUE );
+								break;
+		
+							case GameConstants.STATE_DAMAGED:
+								new_item.SetHealth( "", "", max * GameConstants.DAMAGE_DAMAGED_VALUE );
+								break;
+		
+							case GameConstants.STATE_WORN:
+								new_item.SetHealth( "", "", max * GameConstants.DAMAGE_WORN_VALUE );
+								break;
+							
+							case GameConstants.STATE_RUINED:
+								new_item.SetHealth( "", "", max * GameConstants.DAMAGE_RUINED_VALUE );
+								break;
+							
+							default:
+								break;
+						}
+					}
+				}
+			}
+			
+			attachment.Delete();
+		}
+	}
+	
+	//! checks if we should teleport the player to a safe location and if so, performs the teleportation
+	static void TeleportCheck(notnull PlayerBase player, notnull array<ref array<float>> safe_positions)
+	{
+		if( player.GetSimulationTimeStamp() < 20 && !player.IsPersistentFlag(PersistentFlag.AREA_PRESENCE) )
+		{
+			//simulation time is bellow a threshold, which means the player has recently connected,
+			//the player does not have the AREA_PRESENCE flag set, which means they were not inside the area when they disconnected,
+			//that means they just spawned into a contaminated area, lets move them somewhere safe
+			vector player_pos = player.GetPosition();
+			vector closest_safe_pos = MiscGameplayFunctions.GetClosestSafePos(player_pos, safe_positions);
+			
+			if (player_pos!=closest_safe_pos)
+			{
+				closest_safe_pos[1] = GetGame().SurfaceY(closest_safe_pos[0], closest_safe_pos[2]);
+				
+				player.SetPosition( closest_safe_pos );//...so lets teleport them somewhere safe
+				//DeveloperTeleport.SetPlayerPosition(player, closest_safe_pos);
+				GetGame().RPCSingleParam(player, ERPCs.RPC_WARNING_TELEPORT, null, true, player.GetIdentity());
+			}
+			
+			player.SetPersistentFlag(PersistentFlag.AREA_PRESENCE, false);
+		}
+	}
+	
+	
+	static vector GetClosestSafePos(vector to_pos, notnull array<ref array<float>> positions)
+	{
+		vector closest_pos = to_pos;
+		float smallest_dist = float.MAX;
+		foreach( array<float> pos:positions)
+		{
+			vector vpos = "0 0 0";
+			vpos[0] = pos[0];
+			vpos[2] = pos[1];
+
+			to_pos[1] = 0;
+			float dist = vector.DistanceSq(to_pos, vpos);//2d dist sq
+			if ( dist < smallest_dist)
+			{
+				smallest_dist = dist;
+				closest_pos = vpos;
+			}
+		}
+		return closest_pos;
+	}
+	
+	static void GenerateAINoiseAtPosition(vector position, float lifeTime, NoiseParams noiseParams)
+	{
+		if (GetGame().IsServer())
+		{
+			NoiseSystem noise = GetGame().GetNoiseSystem();
+			if (noise)
+			{
+				noise.AddNoiseTarget(position, lifeTime, noiseParams);
+			}
+		}
+	}
+
+	static float GetMinValue(array<float> pArray)
+	{
+		float minValue = 0.0;
+		for (int i = 0; i < pArray.Count(); i++)
+		{
+			if (minValue == 0 || pArray.Get(i) < minValue)
+			{
+				minValue = pArray.Get(i);
+			}
+		}
+		
+		return minValue;
+	}
+	
+	static float GetMaxValue(array<float> pArray)
+	{
+		float maxValue = 0.0;
+		for (int i = 0; i < pArray.Count(); i++)
+		{
+			if (maxValue == 0 || pArray.Get(i) > maxValue)
+			{
+				maxValue = pArray.Get(i);
+			}
+		}
+		
+		return maxValue;
+	}
+		
+	static string GetItemDisplayName(string type)
+	{
+		return GetGame().ConfigGetTextOut("CfgVehicles " + type + " displayName");
+	}
+
+	static bool IsComponentInSelection(array<Selection> pSelection, string pCompName)
+	{
+		if (pSelection.Count() == 0 || pCompName.Length() == 0)
+		{
+			return false;
+		}
+
+		for (int i = 0; i < pSelection.Count(); ++i)
+		{
+			pCompName.ToLower();
+			if (pSelection[i] && pSelection[i].GetName() == pCompName)
+			{
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	static int GetComponentIndex(array<Selection> pSelection, string pCompName)
+	{
+		if (!MiscGameplayFunctions.IsComponentInSelection(pSelection, pCompName))
+		{
+			return INDEX_NOT_FOUND;
+		}
+
+		for (int i = 0; i < pSelection.Count(); ++i)
+		{
+			pCompName.ToLower();
+			if (pSelection[i] && pSelection[i].GetName() == pCompName)
+			{
+				return i;
+			}
+		}
+
+		return INDEX_NOT_FOUND;
+	}
+	
+	static void RemoveAllAttachedChildrenByTypename(notnull EntityAI parent, array<typename> listOfTypenames)
+	{
+		if (listOfTypenames.Count() > 0)
+		{
+			Object child = Object.Cast(parent.GetChildren());
+			while (child)
+			{
+				Object childToRemove = child;
+				child = Object.Cast(child.GetSibling());
+	
+				if (childToRemove.IsAnyInherited(listOfTypenames))
+				{
+					vector pos = childToRemove.GetPosition();			
+					parent.RemoveChild(childToRemove, false);
+	
+					vector m4[4];
+					Math3D.MatrixIdentity4(m4);
+					m4[3] = pos;
+					childToRemove.SetTransform(m4);
+					childToRemove.PlaceOnSurface();
+				}
+			}
+		}
+	}
+	//! Fills the provided array with all children entities in hierarchy of this entity
+	static void GetAttachedChildren(IEntity parent, array<IEntity> outputObjects)
+	{
+		IEntity child = parent.GetChildren();
+		while (child)
+		{
+			outputObjects.Insert(child);
+			child = child.GetSibling();
+		}
+	}
+	
+	static void SoakItemInsideParentContainingLiquidAboveThreshold(notnull ItemBase item, notnull ItemBase parent, float liquidQuantityThresholdPercentage = 0.05)
+	{
+		if (g_Game.IsServer())
+		{
+			if (parent.GetLiquidType() != 0 && parent.GetQuantityNormalized() > liquidQuantityThresholdPercentage)
+				item.SetWetMax();
+		}
+	}	
+}
+
+class DestroyItemInCorpsesHandsAndCreateNewOnGndLambda : ReplaceAndDestroyLambda
+{
+	// @NOTE m_Player == target player - i.e. restrained one
+	void DestroyItemInCorpsesHandsAndCreateNewOnGndLambda(EntityAI old_item, string new_item_type, PlayerBase player, bool destroy = false)
+	{
+		InventoryLocation gnd = new InventoryLocation;
+		vector mtx[4];
+		if (old_item)
+			old_item.GetTransform(mtx);
+		else
+			player.GetTransform(mtx);
+		gnd.SetGround(NULL, mtx);
+		OverrideNewLocation(gnd);
+	}
+	
+	protected override void RemoveOldItemFromLocation()
+	{
+		super.RemoveOldItemFromLocation();
+		m_Player.GetHumanInventory().OnEntityInHandsDestroyed(m_OldLocation);
+	}
+}
+
+// This was created since IsObjectObstructed is often called multiple times in one frame
+// And apparently it seems that keeping this data in one struct seems to be more efficient than creating the variables dozens of times per frame
+class IsObjectObstructedCache // Pretending this is a struct
+{
+	// Outside data
+	vector RaycastStart = "0 0 0";
+	int TotalObjects = 0;
+	
+	// Inside data
+	vector ObjectCenterPos = "0 0 0";
+	vector ObjectContactPos = "0 0 0";
+	vector ObjectContactDir = "0 0 0";
+	int ContactComponent = -1;
+	ref array<ref RaycastRVResult> HitProxyObjects = new array<ref RaycastRVResult>;	
+	ref set<Object> HitObjects = new set<Object>;
+	
+	void IsObjectObstructedCache(vector rayCastStart, int totalObjects)
+	{
+		RaycastStart = rayCastStart;
+		TotalObjects = totalObjects;
+	}
+	
+	// Only inside data
+	void ClearCache()
+	{		
+		ObjectCenterPos = "0 0 0";
+		ObjectContactPos = "0 0 0";
+		ObjectContactDir = "0 0 0";
+		ContactComponent = -1;
+		HitProxyObjects.Clear();
+		HitObjects.Clear();
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Static/OpenItem.c b/scripts/4_World/DayZ/Static/OpenItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..3e60dd78e818ad348869b7b20e6fd722ec0cc256
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/OpenItem.c
@@ -0,0 +1,67 @@
+class OpenItem
+{
+	//! WIll open the 'item_target' by spawning a new entity and transferring item variables to the new one
+	static void OpenAndSwitch(ItemBase item_tool, ItemBase item_target, PlayerBase player, float specialty_weight = 0)
+	{
+		array<int> spill_range = new array<int>;
+		
+		if( item_tool.ConfigIsExisting("OpenItemSpillRange") )
+		{
+			item_tool.ConfigGetIntArray("OpenItemSpillRange", spill_range );
+		}
+		else
+		{
+			Debug.LogError("OpenItemSpillRange config parameter missing, default values used ! ");
+			Error("OpenItemSpillRange config parameter missing, default values used !");
+			spill_range.Insert(0);
+			spill_range.Insert(100);
+		}
+		float spill_modificator = Math.RandomIntInclusive( spill_range.Get(0),spill_range.Get(1) ) / 100;
+		
+		OpenItem.SwitchItems(item_target, player, spill_modificator, specialty_weight);
+	}
+
+	//! Will switch the 'item' for a new game entity, the new entity's classname will be formed by adding the 'suffix' to the classname of the old 'item'
+	static void SwitchItems (EntityAI old_item, PlayerBase player, float spill_modificator, float specialty_weight)
+	{
+		string old_name = old_item.GetType();
+		string new_name = old_name + "_Opened";
+		OpenAndSwitchLambda l = new OpenAndSwitchLambda(old_item, new_name, player, spill_modificator, specialty_weight);
+		l.SetTransferParams(true, true, true, true);
+		MiscGameplayFunctions.TurnItemIntoItemEx(player, l);
+	}
+};
+
+
+class OpenAndSwitchLambda : TurnItemIntoItemLambda
+{
+	float m_SpillModifier;
+	float m_SpecialtyWeight;
+	void OpenAndSwitchLambda (EntityAI old_item, string new_item_type, PlayerBase player, float spill_modificator, float specialty_weight) { m_SpillModifier = spill_modificator; m_SpecialtyWeight = specialty_weight; }
+
+	override void CopyOldPropertiesToNew (notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+	}
+	
+	override void OnSuccess (EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+
+		ItemBase ib = ItemBase.Cast(new_item);
+		if ( new_item ) 
+		{	
+			float quantity_old = ib.GetQuantity();
+			float spill_amount = quantity_old * m_SpillModifier;
+			spill_amount = m_Player.GetSoftSkillsManager().SubtractSpecialtyBonus(spill_amount, m_SpecialtyWeight);
+			float quantity_new = quantity_old - spill_amount;
+	
+			Debug.Log("quantity before spill: "+quantity_old.ToString());
+			Debug.Log("spill_amount: "+spill_amount.ToString());
+			Debug.Log("quantity_new: "+quantity_new.ToString());
+			
+			ib.SetQuantity(quantity_new);
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Static/PaintItem.c b/scripts/4_World/DayZ/Static/PaintItem.c
new file mode 100644
index 0000000000000000000000000000000000000000..af4cc8ff230c6a6aa7ee39dd2f20085608e0da87
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/PaintItem.c
@@ -0,0 +1,39 @@
+class PaintItem
+{
+	//! WIll open the 'item_target' by spawning a new entity and transferring item variables to the new one
+	static void Paint(ItemBase item_tool, ItemBase item_target, string base_name, PlayerBase player, float specialty_weight = 0)
+	{
+		string spray_color = item_tool.ConfigGetString("color");
+		string item_color = item_target.ConfigGetString("color");
+
+		string new_class_name = base_name + "_" + spray_color;
+		PaintItem.SwitchItems(item_target, new_class_name, player);
+	}
+
+	static bool CanPaintItem(ItemBase item_tool, ItemBase item_target)
+	{
+		string spray_color = item_tool.ConfigGetString("color");
+		string item_color = item_target.ConfigGetString("color");
+		
+		if( spray_color != item_color )
+		{
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	//! Will switch the 'item' for a new game entity, the new entity's classname will be formed by adding the 'suffix' to the classname of the old 'item'
+	static void SwitchItems (EntityAI old_item, string new_item, PlayerBase player)
+	{
+		MiscGameplayFunctions.TurnItemIntoItemEx(player, new PaintItemLambda(old_item, new_item, player));
+	}
+};
+
+
+class PaintItemLambda : TurnItemIntoItemLambda
+{
+	void PaintItemLambda (EntityAI old_item, string new_item_type, PlayerBase player) { }
+};
diff --git a/scripts/4_World/DayZ/Static/QuantityConversions.c b/scripts/4_World/DayZ/Static/QuantityConversions.c
new file mode 100644
index 0000000000000000000000000000000000000000..7d745309dfde911ce4faffd58657764e0a437c97
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/QuantityConversions.c
@@ -0,0 +1,176 @@
+class QuantityConversions
+{
+	static string GetItemQuantityText( EntityAI item, bool showMax = false )
+	{
+		string quantity_text = "";
+		if ( item.IsInherited( InventoryItem) )
+		{
+			ItemBase item_base;
+			Class.CastTo(item_base, item);
+			float quantity = item_base.GetQuantity();
+			int ammo;
+			if ( item.IsMagazine() )
+			{
+				Magazine magazine_item;
+				Class.CastTo(magazine_item, item);
+				ammo = magazine_item.GetAmmoCount();
+
+				return ammo.ToString();
+			}
+			else if ( item.IsInherited( ItemBook) )
+			{
+				return "";
+			}
+			int stack_max = item.GetQuantityMax();
+			
+			//int max = item.ConfigGetInt("varQuantityMax");
+			//string unit = item.ConfigGetString("stackedUnit");
+
+			if (stack_max > 0)
+			{
+				if (stack_max == 1)
+				{
+					if (quantity > 1)
+					{
+						if (showMax)
+							quantity_text = string.Format("%1/%2", quantity.ToString(), stack_max.ToString() );
+						//quantity_text = string.Format("%i/%i", quantity, stack_max );
+						else
+							quantity_text = quantity.ToString();
+					}
+					else
+					{
+						quantity_text = "";
+					}
+				}
+				else
+				{
+					if (showMax)
+						quantity_text = string.Format("%1/%2", quantity.ToString(), stack_max.ToString() );
+						//quantity_text = string.Format("%i/%i", quantity, stack_max );
+					else
+						quantity_text = quantity.ToString();
+					// if (unit == "ml")
+					// {
+					// 	float liters = round(quantity / 1000.0);
+					// 	if ( quantity < 2000 )
+					// 	{
+					// 		liters =  ( round( (quantity / 100.0) ) ) / 10;
+					// 	}
+					// 	quantity_text = ftoa(liters) + "l";
+					// }
+					// else
+					// {
+					// 	quantity_text = itoa(quantity) + unit;
+					// }
+				}
+			}
+		}
+		return quantity_text;
+	}	
+
+	static float GetItemQuantity(InventoryItem item)
+	{
+		float quantity = 0;
+		if ( item.IsInherited(InventoryItem))
+		{
+			ItemBase item_base;
+			Class.CastTo(item_base, item);
+			if (item_base)
+			{
+				if (item.IsMagazine())
+				{
+					Magazine magazine_item;
+					Class.CastTo(magazine_item, item);
+					quantity = magazine_item.GetAmmoCount();
+				}
+				else
+				{
+					quantity = item_base.GetQuantity();
+				}
+			}
+		}
+		return quantity;
+	}	
+	
+	static float GetItemQuantityMax(InventoryItem item)
+	{
+		float quantity = 0;
+		if (item.IsInherited(InventoryItem))
+		{
+			ItemBase item_base;
+			Class.CastTo(item_base, item);
+			if (item_base)
+			{
+				if (item.IsMagazine())
+				{
+					Magazine magazine_item;
+					Class.CastTo(magazine_item, item);
+					quantity = magazine_item.GetAmmoMax();
+				}
+				else
+				{
+					quantity = item_base.GetQuantityMax();
+				}
+			}
+		}
+		return quantity;
+	}
+	
+	static void GetItemQuantity( InventoryItem item, out float q_cur, out float q_min, out float q_max )
+	{
+		if ( item.IsInherited( InventoryItem ) )
+		{
+			ItemBase item_base;
+			Class.CastTo(item_base, item);
+			if ( item.IsMagazine() )
+			{
+				Magazine magazine_item;
+				Class.CastTo(magazine_item, item);
+				q_cur = magazine_item.GetAmmoCount();
+				q_min = 0;
+				q_max = magazine_item.GetAmmoMax();
+			}
+			else
+			{
+				q_cur = item_base.GetQuantity();
+				q_min = item_base.GetQuantityMin();
+				q_max = item_base.GetQuantityMax();
+			}
+		}
+	}
+
+	static int HasItemQuantity( notnull EntityAI item )
+	{
+		ItemBase ib;
+		if ( Class.CastTo(ib, item) )
+		{
+			if ( item.IsMagazine() )
+				return QUANTITY_COUNT;
+			
+			if ( !ib.m_CanShowQuantity )
+				return QUANTITY_HIDDEN;
+			
+			int max = item.GetQuantityMax();
+			if ( max > 0 )
+			{
+				if ( ib.m_HasQuantityBar )
+				{
+					return QUANTITY_PROGRESS;
+				}
+				else
+				{
+					if (max == 1)
+					{
+						return QUANTITY_HIDDEN;
+					}
+					else
+					{
+						return QUANTITY_COUNT;
+					}
+				}
+			}
+		}
+		return QUANTITY_HIDDEN;
+	}	
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Static/SensesAIEvaluate.c b/scripts/4_World/DayZ/Static/SensesAIEvaluate.c
new file mode 100644
index 0000000000000000000000000000000000000000..acf1a01ffad03d0476ccf82ae4fe55e348143f4f
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/SensesAIEvaluate.c
@@ -0,0 +1,78 @@
+class NoiseAIEvaluate 
+{
+	static float SURFACE_NOISE_WEIGHT = 0.25;
+	
+	static float GetNoiseMultiplier(DayZPlayerImplement playerImplement)
+	{
+		float speedNoise	= GetNoiseMultiplierByPlayerSpeed(playerImplement);
+		float shoesNoise	= GetNoiseMultiplierByShoes(playerImplement);
+		float surfaceNoise	= GetNoiseMultiplierBySurface(playerImplement);
+		
+		surfaceNoise 		*= SURFACE_NOISE_WEIGHT;
+		float avgNoise 		= (shoesNoise + surfaceNoise)/(1 + SURFACE_NOISE_WEIGHT);
+		avgNoise 			*= speedNoise;
+		
+		return avgNoise;
+	}
+	
+	//Noise multiplier based on player speed
+	static float GetNoiseMultiplierByPlayerSpeed(DayZPlayerImplement playerImplement)
+	{
+		HumanMovementState hms = new HumanMovementState();
+		
+		playerImplement.GetMovementState(hms);
+		
+		if ( playerImplement.GetCommand_Move() && playerImplement.GetCommand_Move().IsInRoll() )
+		{
+			// When rolling we are prone, so we load that Noise value, hence we multiply
+			return PlayerConstants.AI_NOISE_ROLL;
+		}
+		
+		switch ( AITargetCallbacksPlayer.StanceToMovementIdxTranslation(hms) )
+		{			
+			case DayZPlayerConstants.MOVEMENTIDX_IDLE:
+				return PlayerConstants.AI_NOISE_IDLE;
+			
+			case DayZPlayerConstants.MOVEMENTIDX_WALK:
+				return PlayerConstants.AI_NOISE_WALK;
+			
+			case DayZPlayerConstants.MOVEMENTIDX_CROUCH_RUN:
+				return PlayerConstants.AI_NOISE_CROUCH_RUN;
+			
+			case DayZPlayerConstants.MOVEMENTIDX_RUN:
+				return PlayerConstants.AI_NOISE_RUN;
+			
+			case DayZPlayerConstants.MOVEMENTIDX_SPRINT:
+				return PlayerConstants.AI_NOISE_SPRINT;
+		}
+		
+		//Default return
+		return PlayerConstants.AI_NOISE_SPRINT;
+	}
+	
+	
+	//Noise multiplier based on type of boots
+	static float GetNoiseMultiplierByShoes(DayZPlayerImplement playerImplement)
+	{
+		switch ( playerImplement.GetBootsType() )
+		{
+			case AnimBootsType.None:
+				return PlayerConstants.AI_NOISE_SHOES_NONE;
+			
+			case AnimBootsType.Sneakers:
+				return PlayerConstants.AI_NOISE_SHOES_SNEAKERS;
+			
+			case AnimBootsType.Boots:
+				return PlayerConstants.AI_NOISE_SHOES_BOOTS;	
+		}
+		
+		//Default return
+		return PlayerConstants.AI_NOISE_SHOES_BOOTS;
+	}
+	
+	//Gets noise multiplayer base on surface player walks on
+	static float GetNoiseMultiplierBySurface(DayZPlayerImplement playerImplement)
+	{
+		return playerImplement.GetSurfaceNoise(); 
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Static/SoundSetMap.c b/scripts/4_World/DayZ/Static/SoundSetMap.c
new file mode 100644
index 0000000000000000000000000000000000000000..bc4f3dd026dbc58cd9701203c67dc10682e79aed
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/SoundSetMap.c
@@ -0,0 +1,32 @@
+class SoundSetMap
+{
+	ref static map<int, string> m_SoundSetMapIDByID = new map<int, string>;
+	ref static map<string, int> m_SoundSetMapIDByName = new map<string, int>;
+	
+	static void Init()
+	{
+		string path = "CfgSoundSets";
+		
+		int soundCount = GetGame().ConfigGetChildrenCount(path);
+		
+		for (int i = 1; i < soundCount; i++)
+		{
+			string soundClassName;
+			GetGame().ConfigGetChildName(path, i, soundClassName);
+			m_SoundSetMapIDByID.Insert(i,soundClassName);
+			m_SoundSetMapIDByName.Insert(soundClassName,i);
+			//PrintString(soundClassName);
+		}
+	}
+	
+	static string GetSoundSetName(int id)
+	{
+		return m_SoundSetMapIDByID.Get(id);
+	}
+	
+	static int GetSoundSetID(string name)
+	{
+		return m_SoundSetMapIDByName.Get(name);
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Static/Surface.c b/scripts/4_World/DayZ/Static/Surface.c
new file mode 100644
index 0000000000000000000000000000000000000000..39afcf0bfa772ad8f59e5bdf18c17070cac3deef
--- /dev/null
+++ b/scripts/4_World/DayZ/Static/Surface.c
@@ -0,0 +1,29 @@
+class Surface
+{
+	static float GetParamFloat(string surface_name, string param_name)
+	{
+		return GetGame().ConfigGetFloat("CfgSurfaces " + surface_name + " " + param_name);
+	}
+	
+	static bool AllowedWaterSurface(float pHeight, string pSurface, array<string> pAllowedSurfaceList)
+	{
+		if (pSurface)
+		{
+			pSurface.Replace("_ext", "");
+			pSurface.Replace("_int", "");
+		}
+
+		bool isSeaCheck = false;
+		
+		foreach (string allowedSurface : pAllowedSurfaceList)
+		{
+			if (pSurface == "" && allowedSurface == UAWaterType.SEA)
+				isSeaCheck = pHeight <= g_Game.SurfaceGetSeaLevel() + 0.001;
+
+			if (isSeaCheck || allowedSurface == pSurface)
+				return true;
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot.c b/scripts/4_World/DayZ/Systems/Bot/Bot.c
new file mode 100644
index 0000000000000000000000000000000000000000..5ebe28c37119a3a66a17160e8f3959e8df6fbdf6
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot.c
@@ -0,0 +1,199 @@
+/**@class		BotTrigger
+ **/
+class BotTrigger
+{
+	bool CheckTrigger () { return false; }
+};
+
+class MyBotTrigger : BotTrigger
+{
+	PlayerBase m_Owner;
+	void MyBotTrigger (PlayerBase p) { m_Owner = p; }
+	override bool CheckTrigger () { return null != m_Owner.GetInventory().FindAttachment(InventorySlots.GetSlotIdFromString("Headgear")); }
+};
+
+
+/**@class		Bot
+ **/
+class Bot
+{
+	PlayerBase m_Owner = null;
+	protected ref Timer m_Timer = new Timer;
+	protected const float c_TriggerTimeoutMS = 1000.0;
+	//protected const float c_UpdateMS = 2000.0;
+	protected const float c_UpdateMS = 16.0;
+	protected ref BotFSM m_FSM = null;
+	protected bool m_UseTrigger = false;
+	protected bool m_Triggered = false;
+	protected DayZPlayerInstanceType m_InstanceType = DayZPlayerInstanceType.INSTANCETYPE_CLIENT;
+	protected ref BotTrigger m_BotTrigger = null;
+	protected ref BotStateBase m_BotTest = null;
+
+	void Bot (PlayerBase ow)
+	{
+		m_Owner = ow;
+	}
+	
+	void SetInstanceType (DayZPlayerInstanceType t) { m_InstanceType = t; }
+
+	void Start (bool use_trigger, BotTrigger trigger = null)
+	{
+		m_UseTrigger = use_trigger;
+
+		InitFSM();
+
+		if (m_UseTrigger)
+		{
+			if (m_UseTrigger && trigger == null)
+				Error("use trigger, but trigger null");
+
+			m_Triggered = false;
+			m_BotTrigger = trigger;
+			botDebugPrint("[bot] + " + m_Owner + " Bot waiting for trigger...");
+			m_Timer.Run(c_TriggerTimeoutMS / 1000.0, this, "OnTrigger", null, true);
+		}
+		else
+		{
+			botDebugPrint("[bot] + " + m_Owner + " Bot Started.");
+			m_Timer.Run(c_UpdateMS / 1000.0, this, "OnTimer", null, true);
+		}
+	}
+
+	void DelayedStart (float ms)
+	{
+		m_Timer.Run(ms / 1000.0, this, "OnDelayedStart", null, false);
+	}
+
+	protected void OnDelayedStart ()
+	{
+		Start(false, null);
+
+		ProcessEvent(new BotEventStart(m_Owner));
+		m_UseTrigger = false;
+	}
+
+	void Stop ()
+	{
+		m_Triggered = false;
+		m_Timer.Stop();
+		m_FSM.Terminate();
+	}
+
+	protected void OnTrigger ()
+	{
+		bool triggered = m_BotTrigger.CheckTrigger();
+
+		if (!m_Triggered)
+		{
+			if (triggered)
+			{
+				m_Timer.Stop(); // stop trigger timer
+				m_Triggered = true;
+				ProcessEvent(new BotEventStart(m_Owner));
+				m_Timer.Run(c_UpdateMS / 1000.0, this, "OnUpdate", null, true);
+
+				botDebugPrint("[bot] + " + m_Owner + " Started test!");
+			}
+		}
+		else
+		{
+			if (!triggered)
+			{
+				m_Timer.Stop(); // stop update timer
+				m_Triggered = false;
+				ProcessEvent(new BotEventStop(m_Owner));
+				m_Timer.Run(c_TriggerTimeoutMS / 1000.0, this, "OnTrigger", null, true);
+
+				botDebugPrint("[bot] + " + m_Owner + " Stopped test!");
+			}
+		}
+	}
+
+	void OnUpdate (float dt)
+	{
+		m_FSM.GetCurrentState().OnUpdate(dt);
+
+		OnTrigger(); // to detect trigger stop
+	}
+
+	void OnTimer ()
+	{
+		//m_FSM.GetCurrentState().OnUpdate(c_UpdateMS / 1000.0);
+
+		//OnTrigger(); // to detect trigger stop
+	}
+
+	void InitFSM ()
+	{
+		m_FSM = new BotFSM();
+
+		// basic states
+		BotStateBase BotIdle = new BotStateIdle(this, NULL);
+		// unstable (intermediate) states
+		m_BotTest = new BotTestSpamUserActions(this, NULL);
+		//m_BotTest = new BotTestAttachAndDropCycle(this, NULL);
+		//m_BotTest = new BotTestItemMoveBackAndForth(this, NULL);
+		//m_BotTest = new Bot_TestSpawnOpen(this, NULL);
+		//m_BotTest = new Bot_TestSpawnOpenDestroy(this, NULL);
+		//m_BotTest = new Bot_TestSpawnOpenEat(this, NULL);
+		//m_BotTest = new BotTestSwapG2H(this, NULL);
+		//m_BotTest = new BotTestSwapC2H(this, NULL);
+		//m_BotTest = new BotTestSwapInternal(this, NULL);
+
+		// events
+		BotEventBase ___Bgn__ = new BotEventStart;
+		BotEventBase __Stop__ = new BotEventStop;
+		BotEventBase ___OK___ = new BotEventEndOK;
+		BotEventBase __Fail__ = new BotEventEndFail;
+		BotEventBase __Tout__ = new BotEventEndTimeout;
+		BotEventBase __IChg__ = new BotEventOnItemInHandsChanged;
+
+		///@{ transition table
+		m_FSM.AddTransition(new BotTransition(  BotIdle     , ___Bgn__,   m_BotTest));
+		m_FSM.AddTransition(new BotTransition(  BotIdle     , __Stop__,        NULL));
+
+		// causes restart of FSM
+		//m_FSM.AddTransition(new BotTransition(m_BotTest     , __IChg__,   m_BotTest));
+
+		//m_FSM.AddTransition(new BotTransition(m_BotTest     , ___OK___,     BotIdle));
+		m_FSM.AddTransition(new BotTransition(m_BotTest     , __Fail__,     BotIdle));
+		m_FSM.AddTransition(new BotTransition(m_BotTest     , __Tout__,     BotIdle));
+		///@} transition table
+
+		m_FSM.SetInitialState(BotIdle);
+		m_FSM.Start();
+	}
+	
+	bool ProcessEvent (BotEventBase e)
+	{
+		if (m_FSM.ProcessEvent(e) == ProcessEventResult.FSM_OK)
+		{
+			botDebugSpam("[botfsm] Processed event e=" + e.ToString());
+			return true;
+		}
+		else
+		{
+			botDebugSpam("[botfsm] FSM refused to process event (no transition): src=" + m_FSM.GetCurrentState().ToString() + " event=" + e.ToString());
+			return false;
+		}
+	}
+};
+
+void botDebugPrint (string s)
+{
+#ifdef BOT_DEBUG
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
+void botDebugSpam (string s)
+{
+#ifdef BOT_DEBUG_SPAM
+	PrintToRPT("" + s); // comment/uncomment to hide/see debug logs
+#else
+	//Print("" + s); // comment/uncomment to hide/see debug logs
+#endif
+}
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/BotActions.c b/scripts/4_World/DayZ/Systems/Bot/BotActions.c
new file mode 100644
index 0000000000000000000000000000000000000000..ee83cc90c1adcac705e0175412817dc59e358259
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/BotActions.c
@@ -0,0 +1,11 @@
+/**@class	BotActionBase
+ * @brief	represents action executed on transition just between OnExit from old state and OnEntry to new state
+ **/
+class BotActionBase
+{
+	/**@fn		Action
+	 * @brief	executed when transition occurs
+	 **/
+	void Action (BotEventBase e) { }
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/BotEvents.c b/scripts/4_World/DayZ/Systems/Bot/BotEvents.c
new file mode 100644
index 0000000000000000000000000000000000000000..cb08c0afde06abe6b4b50cdd760d52184950e10c
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/BotEvents.c
@@ -0,0 +1,23 @@
+/**@class	BotEventBase
+ * @brief	represents event that triggers transition from state to state
+ **/
+class BotEventBase
+{
+	PlayerBase m_Player;
+	EntityAI m_Entity;
+
+	void BotEventBase (PlayerBase p = NULL, EntityAI e = NULL) { m_Entity = e; }
+	string DumpToString () {}
+};
+
+//class BotEventXXX : BotEventBase { void BotEventXXX (PlayerBase p = NULL) { } };
+
+
+class BotEventStart : BotEventBase { };
+class BotEventStop : BotEventBase { };
+
+class BotEventEndOK : BotEventBase { };
+class BotEventEndFail : BotEventBase { };
+class BotEventEndTimeout : BotEventBase { };
+class BotEventOnItemInHandsChanged : BotEventBase { };
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/BotFSM.c b/scripts/4_World/DayZ/Systems/Bot/BotFSM.c
new file mode 100644
index 0000000000000000000000000000000000000000..f4f15976804a75eaebe5eb299789930f7a644dae
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/BotFSM.c
@@ -0,0 +1,9 @@
+/**@class		BotFSM
+ * @brief		Bot Finite State Machine (Hierarchical)
+ **/
+class BotFSM extends HFSMBase<BotStateBase, BotEventBase, BotActionBase, BotGuardBase>
+{ };
+
+typedef FSMTransition<BotStateBase, BotEventBase, BotActionBase, BotGuardBase> BotTransition; /// shorthand
+
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/BotGuards.c b/scripts/4_World/DayZ/Systems/Bot/BotGuards.c
new file mode 100644
index 0000000000000000000000000000000000000000..e05d6d524c77b99fc5cceb4fb4a6890ac7e47ec9
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/BotGuards.c
@@ -0,0 +1,75 @@
+/**@class	BotGuardBase
+ * @brief	represents guard on a transition from state to state
+ **/
+class BotGuardBase
+{
+	/**@fn		GuardCondition
+	 * @brief enable or disable transition based on condition
+	 * the guard is a boolean operation executed first and which can prevent the transition from firing by returning false
+	 * @return	true if transition is allowed
+	 **/
+	bool GuardCondition (BotEventBase e) { return true; }
+};
+
+class BotGuardAnd extends BotGuardBase
+{
+	ref BotGuardBase m_arg0;
+	ref BotGuardBase m_arg1;
+
+	void BotGuardAnd (BotGuardBase arg0 = NULL, BotGuardBase arg1 = NULL) { m_arg0 = arg0; m_arg1 = arg1; }
+
+	override bool GuardCondition (BotEventBase e)
+	{
+		bool result = m_arg0.GuardCondition(e) && m_arg1.GuardCondition(e);
+		botDebugPrint("[botfsm] guard - " + m_arg0.Type() + " && " + m_arg1.Type() + " = " + result);
+		return result;
+	}
+};
+
+class BotGuardNot extends BotGuardBase
+{
+	ref BotGuardBase m_arg0;
+
+	void BotGuardNot (BotGuardBase arg0 = NULL) { m_arg0 = arg0; }
+
+	override bool GuardCondition (BotEventBase e)
+	{
+		bool result = !m_arg0.GuardCondition(e);
+		botDebugPrint("[botfsm] guard - ! " + m_arg0.Type() + " = " + result);
+		return result;
+	}
+};
+
+class BotGuardOr extends BotGuardBase
+{
+	ref BotGuardBase m_arg0;
+	ref BotGuardBase m_arg1;
+
+	void BotGuardOr (BotGuardBase arg0 = NULL, BotGuardBase arg1 = NULL) { m_arg0 = arg0; m_arg1 = arg1; }
+
+	override bool GuardCondition (BotEventBase e)
+	{
+		bool result = m_arg0.GuardCondition(e) || m_arg1.GuardCondition(e);
+		botDebugPrint("[botfsm] guard - " + m_arg0.Type() + " || " + m_arg1.Type() + " = " + result);
+		return result;
+	}
+};
+
+class BotGuardHasItemInHands extends HandGuardBase
+{
+	protected Man m_Player;
+	void BotGuardHasItemInHands (Man p = NULL) { m_Player = p; }
+
+	override bool GuardCondition (HandEventBase e)
+	{
+		if (m_Player.GetHumanInventory().GetEntityInHands())
+		{
+			if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[botfsm] guard - has valid entity in hands");
+			return true;
+		}
+
+		if (LogManager.IsInventoryHFSMLogEnable()) hndDebugPrint("[botfsm] guard - no entity in hands");
+		return false;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/BotStates.c b/scripts/4_World/DayZ/Systems/Bot/BotStates.c
new file mode 100644
index 0000000000000000000000000000000000000000..8143fb6cf59447700999a000d9a9945f40e5409e
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/BotStates.c
@@ -0,0 +1,134 @@
+/**@class	BotStateBase
+ * @brief	represent weapon state base
+ *
+ * Class comes with entry/update/exit hooks that can be overriden in custom states
+ *
+ * Class is ready for hierarchic composition, i.e. this state having a sub-machine running
+ * under hood. If no m_FSM member is configured, class acts as ordinary plain
+ * finite machine state.
+ **/
+class BotStateBase
+{
+	PlayerBase m_Owner; /// man that this state belongs to
+	Bot m_Bot; /// bot that this state belongs to
+	BotStateBase m_ParentState; /// hierarchical parent state of this state (or null)
+	ref BotFSM m_FSM; /// nested state machine (or null)
+
+	void BotStateBase (Bot bot = NULL, BotStateBase parent = NULL) { m_Bot = bot; m_Owner = bot.m_Owner; m_ParentState = parent; }
+	
+	PlayerBase GetPlayerOwner() { return m_Owner; }
+
+	/**@fn		SetParentState
+	 * @brief	allows construction of hierarchical state machine
+	 **/
+	void SetParentState (BotStateBase parent) { m_ParentState = parent; }
+	/**@fn		GetParentState
+	 * @return	state that owns this sub-state (or null if plain state)
+	 **/
+	BotStateBase GetParentState () { return m_ParentState; }
+
+	bool HasFSM () { return m_FSM != NULL; }
+	BotFSM GetFSM () { return m_FSM; }
+
+	bool ProcessEvent (BotEventBase e)
+	{
+		if (HasFSM())
+			return m_FSM.ProcessEvent(e);
+		return false;
+	}
+
+	/**@fn		AddTransition
+	 * @brief	adds transition into m_FSM transition table
+	 **/
+	void AddTransition (FSMTransition<BotStateBase, BotEventBase, BotActionBase, BotGuardBase> t)
+	{
+		if (HasFSM())
+			m_FSM.AddTransition(t);
+		else
+			Error("[botfsm] adding transition to state without FSM. Configure FSM first.");
+	}
+
+
+	/**@fn		OnEntry
+	 * @brief	called upon entry to state
+	 * @NOTE	if state has (non-running) sub-machine, it's started on entry
+	 * @param[in] e	the event that triggered transition to this state
+	 **/
+	void OnEntry (BotEventBase e)
+	{
+		if (HasFSM() && !m_FSM.IsRunning())
+		{
+			botDebugPrint("[botfsm] { " + this.Type().ToString() + "  Has Sub-FSM! Starting submachine...");
+			m_FSM.Start(e);
+		}
+		else
+			botDebugPrint("[botfsm] { " + this.Type().ToString());
+	}
+
+	/**@fn		OnUpdate
+	 * @brief ongoing behavior, performed while being in the state
+	 *
+	 * @NOTE: this is supposed to be the Do() operation in UML speak
+	 **/
+	void OnUpdate (float dt)
+	{
+		if (HasFSM() && m_FSM.IsRunning())
+			m_FSM.GetCurrentState().OnUpdate(dt);
+	}
+
+	/**@fn		OnAbort
+	 * @brief called when abort signal arrives
+	 * @param[in] e	the event that triggered abort from this state
+	 **/
+	void OnAbort (BotEventBase e)
+	{
+		if (HasFSM() && m_FSM.IsRunning())
+		{
+			botDebugPrint("[botfsm] OnAbort " + this.Type().ToString() + "  Has Sub-FSM! Aborting submachine...");
+			m_FSM.Abort(e);
+		}
+		botDebugPrint("[botfsm] } ABORTED " + this.Type().ToString());
+	}
+
+	/**@fn		OnExit
+	 * @brief called on exit from state
+	 * @param[in] e	the event that triggered transition from this state
+	 **/
+	void OnExit (BotEventBase e)
+	{
+		botDebugPrint("[botfsm] } " + this.Type().ToString());
+	}
+
+	/**@fn		IsWaitingForActionFinish
+	 * @brief	waiting for active animation action/actionType finish
+	 * @return true if this state or active substate is waiting for finish signal
+	 **/
+	bool IsWaitingForActionFinish () { return HasFSM() && m_FSM.IsRunning() && m_FSM.GetCurrentState().IsWaitingForActionFinish(); }
+
+	/**@fn		IsIdle
+	 * @brief	idle state does not expect any animation events
+	 * @return	true if this state is idle
+	 **/
+	bool IsIdle () { return false; }
+
+	/**@fn		OnSubMachineChanged
+	 * @brief	called when sub-machine has changed its state
+	 * @param[in]	src		from state (previous)
+	 * @param[in]	dst		to state (current)
+	 **/
+	void OnSubMachineChanged (BotStateBase src, BotStateBase dst) { }
+	
+	/**@fn		OnStateChanged
+	 * @brief	called on current state when state machine has changed its state
+	 * @param[in]	src		from state (previous)
+	 * @param[in]	dst		to state (current)
+	 **/
+	void OnStateChanged (BotStateBase src, BotStateBase dst) { }
+};
+
+class BotStateIdle : BotStateBase
+{
+	void BotStateIdle (Bot bot = NULL, BotStateBase parent = NULL) { m_Bot = bot; m_Owner = m_Bot.m_Owner; m_ParentState = parent; }
+
+	override bool IsIdle () { return true; }
+};
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_Hunt.c b/scripts/4_World/DayZ/Systems/Bot/Bot_Hunt.c
new file mode 100644
index 0000000000000000000000000000000000000000..19e8e6c06d7fcc88aa90139ec48a29e7f8ef9445
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_Hunt.c
@@ -0,0 +1,250 @@
+
+class BotEventHuntedTargetInSight : BotEventBase
+{
+	//EntityAI m_Entity;
+	//void BotEventEntityAttached (PlayerBase p = NULL, EntityAI att = NULL) { m_Entity = att; }
+};
+
+class BotEventHuntedTargetLost : BotEventBase
+{
+	//EntityAI m_Entity;
+	//void BotEventEntityDetached (PlayerBase p = NULL, EntityAI att = NULL) { m_Entity = att; }
+};
+
+
+class BotHunt extends BotStateBase
+{
+	Man m_Target;
+	float m_dtAccumulator = 0.0;
+
+	ref BotHunt_Tracking m_Tracking;
+	ref BotHunt_Hunting m_Hunting;
+
+	void BotHunt (Bot bot = NULL, BotStateBase parent = NULL)
+	{
+		// setup nested state machine
+		m_FSM = new BotFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_Tracking = new BotHunt_Tracking(m_Bot, this);
+		m_Hunting = new BotHunt_Hunting(m_Bot, this);
+		
+		// events
+		BotEventBase __InSight__ = new BotEventHuntedTargetInSight;
+		BotEventBase __Lost__ = new BotEventHuntedTargetLost;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(   m_Tracking, __InSight__, m_Hunting));
+		m_FSM.AddTransition(new BotTransition(   m_Hunting,  __Lost__   , m_Tracking));
+
+		m_FSM.SetInitialState(m_Tracking);
+	}
+
+	void SelectTarget ()
+	{
+		m_Target = BotSelectNearestTarget(GetPlayerOwner());
+		m_Tracking.m_Target = m_Target;
+		m_Hunting.m_Target = m_Target;
+		botDebugPrint("[bot] + " + m_Owner + " hunt SelectTarget target=" + m_Target);
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+		SelectTarget();
+
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+		m_Target = null;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		m_dtAccumulator += dt;
+		
+		/*float rescanTime = 3.0;
+		if (m_dtAccumulator >= rescanTime)
+			if (m_weapon.CanProcessWeaponEvents())
+				m_Bot.ProcessEvent(new WeaponEventReloadTimeout(p));*/
+
+		if (m_Target == null)
+		{
+			int acc = m_dtAccumulator;
+			if (acc % 5 == 0)
+			{
+				Print("Searching...");
+				SelectTarget();
+			}
+		}
+	}
+};
+
+class BotHunt_Tracking extends BotStateBase
+{
+	EntityAI m_Target;
+	bool m_TargetInSight = false;
+	bool m_TargetLost = false;
+	bool m_Tracking = true;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+
+		m_TargetLost = false;
+		m_TargetInSight = false;
+		m_Tracking = false;
+	}
+
+	override void OnAbort (BotEventBase e)
+	{
+		m_TargetLost = false;
+		m_TargetInSight = false;
+		m_Tracking = false;
+
+		super.OnAbort(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_TargetLost = false;
+		m_TargetInSight = false;
+		m_Tracking = false;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		if (m_Target)
+		{
+			m_Tracking = true;
+			vector targetPos = m_Target.GetPosition();
+			botDebugPrint("[bot] + " + m_Owner + " hunt Tracking target=" + m_Target + " pos=" + targetPos);
+
+			// tmp dist check
+			float d = vector.Distance(m_Target.GetPosition(), GetPlayerOwner().GetPosition());
+			if (d < 2.0)
+			{
+				m_TargetInSight = true;
+			}
+			else
+			{
+				m_TargetInSight = false;
+			}
+
+			if (!m_TargetInSight)
+			{
+				GetPlayerOwner().GetInputController().OverrideMovementSpeed(true, 1);
+				GetPlayerOwner().GetInputController().OverrideMovementAngle(true, 1);
+			}
+			else
+			{
+				GetPlayerOwner().GetInputController().OverrideMovementSpeed(false, 0);
+				GetPlayerOwner().GetInputController().OverrideMovementAngle(false, 0);
+			}
+
+			/*if ((.GetInputController().LimitsIsSprintDisabled()))
+				.GetInputController().OverrideMovementSpeed( true, 2 );
+			else
+				.GetInputController().OverrideMovementSpeed( true, 3 );*/
+
+		}
+		else
+		{
+			if (m_Tracking)
+			{
+				m_TargetLost = true;
+				m_TargetInSight = false;
+				m_Tracking = false;
+
+				GetPlayerOwner().GetInputController().OverrideMovementSpeed(false, 0);
+				GetPlayerOwner().GetInputController().OverrideMovementAngle(false, 0);
+			}
+		}
+	}
+};
+
+class BotHunt_Hunting extends BotStateBase
+{
+	EntityAI m_Target;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+
+	override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+	}
+};
+
+Man BotSelectNearestTarget (EntityAI bot)
+{
+	/*ref array<Man> players = new array<Man>;
+	g_Game.GetWorld().GetPlayerList( players );
+		
+	bool minimal_distance_ok = true;
+
+	float min_dist = 1234567.0;
+	int min_index = -1;
+	for ( int i = 0; i < players.Count(); i++ )
+	{
+		float d = vector.Distance(players.Get(i).GetPosition(), bot.GetPosition());
+		if ( d < min_dist )
+		{
+			min_dist = d;
+			min_index = i;
+		}
+	}
+
+	if (min_index != -1)
+		return players.Get(min_index);
+
+	return null;*/
+		vector pos = bot.GetPosition();
+		//vector dir = player.GetDirection();
+
+	array<Object> objects = new array<Object>;
+	array<CargoBase> proxyCargos = new array<CargoBase>;
+	GetGame().GetObjectsAtPosition(pos, 100.0, objects, proxyCargos);
+
+	float min_dist = 1234567.0;
+	int min_index = -1;
+	int c = objects.Count();
+	for (int i = 0; i < c; i++)
+	{
+		Object o = objects[i];
+		if (o == bot)
+			continue;
+
+		float d = vector.Distance(o.GetPosition(), bot.GetPosition());
+		if ( d < min_dist )
+		{
+			min_dist = d;
+			min_index = i;
+		}
+	}
+
+	if (min_index != -1)
+	{
+		botDebugPrint("[bot] + " + bot + " BotSelectNearestTarget idx=" + min_index + " dist=" + min_dist + " obj=" + o);
+		return Man.Cast( objects.Get(min_index) );
+	}
+	return null;
+}
+
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_TestAttachAndDropCycle.c b/scripts/4_World/DayZ/Systems/Bot/Bot_TestAttachAndDropCycle.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5b930677c77b569701798509b0f7bdf7e8076cb
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_TestAttachAndDropCycle.c
@@ -0,0 +1,126 @@
+class BotEventEntityAttached : BotEventBase { };
+
+class BotEventEntityDetached : BotEventBase { };
+
+class BotTestAttachAndDropCycle extends BotStateBase
+{
+	EntityAI m_Entity;
+	ref BotTestAttachAndDropCycle_Detaching m_Detaching;
+	ref BotTestAttachAndDropCycle_Attaching m_Attaching;
+
+	void BotTestAttachAndDropCycle (Bot bot = NULL, BotStateBase parent = NULL)
+	{
+		// setup nested state machine
+		m_FSM = new BotFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_Detaching = new BotTestAttachAndDropCycle_Detaching(m_Bot, this);
+		m_Attaching = new BotTestAttachAndDropCycle_Attaching(m_Bot, this);
+		
+		// events
+		BotEventBase __EntAtt__ = new BotEventEntityAttached;
+		BotEventBase __EntDet__ = new BotEventEntityDetached;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(   m_Detaching, __EntDet__, m_Attaching));
+		m_FSM.AddTransition(new BotTransition(   m_Attaching, __EntAtt__, m_Detaching));
+
+		m_FSM.SetInitialState(m_Detaching);
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		m_Entity = m_Owner.GetInventory().CreateAttachment("TaloonBag_Orange");
+		m_Detaching.m_Entity = m_Entity;
+		m_Attaching.m_Entity = m_Entity;
+
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_Entity = null;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+	}
+};
+
+class BotTestAttachAndDropCycle_Detaching extends BotStateBase
+{
+	EntityAI m_Entity;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+
+	override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		if (m_Entity)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " drop item=" + m_Entity + " bot=" + m_Owner);
+			
+			m_Owner.PredictiveDropEntity(m_Entity);
+
+			InventoryLocation loc = new InventoryLocation;
+			if (m_Entity.GetInventory().GetCurrentInventoryLocation(loc))
+			{
+				if (loc.GetType() == InventoryLocationType.GROUND)
+				{
+					m_Bot.ProcessEvent(new BotEventEntityDetached(m_Owner, m_Entity));
+				}
+			}
+		}
+	}
+};
+
+class BotTestAttachAndDropCycle_Attaching extends BotStateBase
+{
+	EntityAI m_Entity;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+
+	override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		if (m_Entity)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " att item=" + m_Entity + " bot=" + m_Owner);
+			
+			if (m_Owner.GetInventory().CanAddAttachment(m_Entity))
+			{
+				m_Owner.PredictiveTakeEntityAsAttachment(m_Entity);
+	
+				InventoryLocation loc = new InventoryLocation;
+				if (m_Entity.GetInventory().GetCurrentInventoryLocation(loc))
+				{
+					if (loc.GetType() == InventoryLocationType.ATTACHMENT)
+					{
+						m_Bot.ProcessEvent(new BotEventEntityAttached(m_Owner, m_Entity));
+					}
+				}
+			}
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_TestItemMoveBackAndForth.c b/scripts/4_World/DayZ/Systems/Bot/Bot_TestItemMoveBackAndForth.c
new file mode 100644
index 0000000000000000000000000000000000000000..a995c09ee756df2f6f67eb9bee81062f4e8e1032
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_TestItemMoveBackAndForth.c
@@ -0,0 +1,115 @@
+class BotTestItemMoveBackAndForth extends BotStateBase
+{
+	EntityAI m_Entity;
+	ref BotTestItemMoveBackAndForth_MoveFromSlotToSlot m_Move;
+
+	void BotTestItemMoveBackAndForth (Bot bot = NULL, BotStateBase parent = NULL)
+	{
+		// setup nested state machine
+		m_FSM = new BotFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_Move = new BotTestItemMoveBackAndForth_MoveFromSlotToSlot(m_Bot, this);
+		
+		// events
+		BotEventBase __EntAtt__ = new BotEventEntityAttached;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(   m_Move, __EntAtt__, m_Move));
+
+		m_FSM.SetInitialState(m_Move);
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		//m_Entity = m_Owner.GetInventory().CreateAttachment("TaloonBag_Orange");
+		//m_Entity = m_Owner.GetInventory().FindAttachment();
+		EntityAI hgear = m_Owner.GetInventory().FindAttachment( InventorySlots.GetSlotIdFromString("Headgear") );
+		EntityAI mask = m_Owner.GetInventory().FindAttachment( InventorySlots.GetSlotIdFromString("Mask") );
+
+		if (hgear)
+			m_Entity = hgear;
+		if (mask)
+			m_Entity = mask;
+
+
+		InventoryLocation loc = new InventoryLocation;
+		if (m_Entity.GetInventory().GetCurrentInventoryLocation(loc))
+		{
+			m_Move.m_WaitingForSlot = loc.GetSlot();
+		}
+		else
+			Error("EE");
+		m_Move.m_Entity = m_Entity;
+
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_Entity = null;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+	}
+};
+
+class BotTestItemMoveBackAndForth_MoveFromSlotToSlot extends BotStateBase
+{
+	EntityAI m_Entity;
+	int m_WaitingForSlot = InventorySlots.INVALID;
+	int m_hgSlot = InventorySlots.GetSlotIdFromString("Headgear");
+	int m_mskSlot = InventorySlots.GetSlotIdFromString("Mask");
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+
+	override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	int GetNextSlot (int curr)
+	{
+		if (curr == m_hgSlot)
+			return m_mskSlot;
+		if (curr == m_mskSlot)
+			return m_hgSlot;
+		Error("EE2");
+		return InventorySlots.INVALID;
+	}
+
+	override void OnUpdate (float dt)
+	{
+		if (m_Entity)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " move item=" + m_Entity);
+			
+			InventoryLocation loc = new InventoryLocation;
+			if (m_Entity.GetInventory().GetCurrentInventoryLocation(loc))
+			{
+				if (loc.GetType() == InventoryLocationType.ATTACHMENT)
+				{
+					if (loc.GetSlot() == m_WaitingForSlot)
+					{
+						int nextSlot = GetNextSlot(m_WaitingForSlot);
+						botDebugPrint("[bot] + " + m_Owner + " will switch slot=" + nextSlot + " for item=" + m_Entity);
+
+						m_WaitingForSlot = nextSlot;
+
+						m_Owner.PredictiveTakeEntityAsAttachmentEx(m_Entity, nextSlot);
+						//m_Bot.ProcessEvent(new BotEventEntityDet(m_Owner, m_Entity));
+					}
+				}
+			}
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpamUserActions.c b/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpamUserActions.c
new file mode 100644
index 0000000000000000000000000000000000000000..70a731b1860f3e97e2e486c935090042a69efa62
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpamUserActions.c
@@ -0,0 +1,196 @@
+
+class BotTestSpamUserActions_Start : BotTimedWait
+{
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		botDebugPrint("[bot] + " + m_Owner + "BotTestSpamUserActions_Start::OnExit");
+
+		/*if (GetGame().IsServer() && GetGame().IsMultiplayer())
+		{
+			botDebugPrint("[bot] + " + m_Owner + "BotTestSpamUserActions_Start spamming!");
+			for (int i = 0; i < 10000; ++i)
+				Print("Lovely SPAAAAAM!");
+		}*/
+
+		super.OnExit(e);
+	}
+
+}
+
+class BotTestSpamUserActions_GetEntityFromSlot : BotTimedWait
+{
+	EntityAI m_Entity = null;
+	bool m_Run = false;
+	int m_RunStage = 0;
+	ref InventoryLocation m_Src = new InventoryLocation;
+
+	override void OnEntry (BotEventBase e)
+	{
+		m_Entity = m_Owner.GetInventory().FindAttachment(InventorySlots.GetSlotIdFromString("Legs"));
+		botDebugPrint("[bot] + " + m_Owner + "BotTestSpamUserActions_GetEntityFromSlot item=" + m_Entity);
+
+		GameInventory.SetGroundPosByOwner(m_Owner, m_Entity, m_Src);
+		/*if (!m_Entity.GetInventory().GetCurrentInventoryLocation(m_Src))
+		{
+			Error("NI!");
+		}*/
+
+		if (!GetGame().IsDedicatedServer())
+		{
+			m_Entity = m_Owner.GetInventory().FindAttachment(InventorySlots.GetSlotIdFromString("Legs"));
+			m_Owner.PredictiveDropEntity(m_Entity);
+		}
+
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_Entity = null;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		if (!GetGame().IsDedicatedServer())
+		{
+			if (m_Run && m_Entity)
+			{
+
+				switch (m_RunStage)
+				{
+					case 0:
+						botDebugPrint("[bot] + " + m_Owner + " STS = " + m_Owner.GetSimulationTimeStamp() + " Stage=" + m_RunStage + " item=" + m_Entity);
+						ScriptInputUserData ctx = new ScriptInputUserData;
+						HandEventTake e = new HandEventTake(m_Owner, m_Src);
+						InventoryInputUserData.SerializeHandEvent(ctx, e);
+						ctx.Send();
+						break;
+
+					case 1:
+						botDebugPrint("[bot] + " + m_Owner + " STS = " + m_Owner.GetSimulationTimeStamp() + " Stage=" + m_RunStage + " item=" + m_Entity);
+						ScriptInputUserData ctx1 = new ScriptInputUserData;
+						HandEventTake e1 = new HandEventTake(m_Owner, m_Src);
+						InventoryInputUserData.SerializeHandEvent(ctx1, e1);
+						ctx1.Send();
+						break;
+
+					case 5:
+						botDebugPrint("[bot] + " + m_Owner + " STS = " + m_Owner.GetSimulationTimeStamp() + " Stage=" + m_RunStage + " item=" + m_Entity);
+						ScriptInputUserData ctx2 = new ScriptInputUserData;
+						InventoryLocation dst = new InventoryLocation;
+						dst.SetAttachment(m_Owner, m_Entity, InventorySlots.GetSlotIdFromString("Legs"));
+						InventoryInputUserData.SerializeMove(ctx2, InventoryCommandType.SYNC_MOVE, m_Src, dst);
+						ctx2.Send();
+						break;
+
+					case 10:
+						botDebugPrint("[bot] + " + m_Owner + " STS = " + m_Owner.GetSimulationTimeStamp() + " Stage=" + m_RunStage + " item=" + m_Entity);
+						ScriptInputUserData ctx3 = new ScriptInputUserData;
+						InventoryLocation dst2 = new InventoryLocation;
+						dst2.SetAttachment(m_Owner, m_Entity, InventorySlots.GetSlotIdFromString("Legs"));
+						InventoryInputUserData.SerializeMove(ctx3, InventoryCommandType.SYNC_MOVE, m_Src, dst2);
+						ctx3.Send();
+						break;
+
+					/*
+					case 0:
+						botDebugPrint("[bot] + " + m_Owner + "Stage0 item=" + m_Entity);
+						m_Owner.PredictiveTakeEntityToHands(m_Entity);
+						break;
+
+					case 1:
+						botDebugPrint("[bot] + " + m_Owner + "Stage1 item=" + m_Entity);
+						m_Owner.PredictiveTakeEntityToHands(m_Entity);
+						break;
+
+					case 2:
+						botDebugPrint("[bot] + " + m_Owner + "Stage2 item=" + m_Entity);
+						m_Owner.PredictiveTakeEntityAsAttachmentEx(m_Entity, InventorySlots.GetSlotIdFromString("Legs"));
+						break;
+
+					case 3:
+						botDebugPrint("[bot] + " + m_Owner + "Stage3 item=" + m_Entity);
+						m_Owner.PredictiveTakeEntityAsAttachmentEx(m_Entity, InventorySlots.GetSlotIdFromString("Legs"));
+						break;*/
+				}
+
+				++m_RunStage;
+			}
+		}
+	}
+
+	override void OnTimeout ()
+	{
+		super.OnTimeout();
+
+		botDebugPrint("[bot] + " + m_Owner + "BotTestSpamUserActions_GetEntityFromSlot item=" + m_Entity);
+
+		if (m_Entity && m_Run == false)
+		{
+			m_Run = true;
+			m_RunStage = 0;
+		}
+	}
+}
+
+
+class BotTestSpamUserActions : BotStateBase
+{
+	EntityAI m_Entity;
+	ref BotTestSpamUserActions_Start m_Start;
+	ref BotTestSpamUserActions_GetEntityFromSlot m_GetRef;
+	//ref BotTimedWait m_Wait;
+
+	void BotTestSpamUserActions (Bot bot = NULL, BotStateBase parent = NULL)
+	{
+		// setup nested state machine
+		m_FSM = new BotFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_Start = new BotTestSpamUserActions_Start(m_Bot, this, 1.0);
+		m_GetRef = new BotTestSpamUserActions_GetEntityFromSlot(m_Bot, this, 2.0);
+		
+		// events
+		BotEventBase __EntWait__ = new BotEventWaitTimeout;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(   m_Start, __EntWait__, m_GetRef));
+
+		m_FSM.SetInitialState(m_Start);
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		m_Entity = null;
+
+		if (GetGame().IsServer())
+		{
+			m_Owner.GetInventory().CreateAttachment("PolicePantsOrel"); // no assign to m_Entity
+			botDebugPrint("[bot] + " + m_Owner + " created attachment item=" + m_Entity);
+		}
+
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_Entity = null;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+	}
+}
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpawnAndOpenCan.c b/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpawnAndOpenCan.c
new file mode 100644
index 0000000000000000000000000000000000000000..9814dd489f77044ae451206f17b767e6da0de238
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpawnAndOpenCan.c
@@ -0,0 +1,316 @@
+class BotEventEntityInHands : BotEventBase { };
+
+class BotSpawnEntityInHands extends BotStateBase
+{
+	string m_Type;
+
+	void BotSpawnEntityInHands (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "")
+	{
+		if (new_type == string.Empty)
+			m_Type = "TunaCan";
+		else
+			m_Type = new_type;
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+
+		if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			m_Owner.GetHumanInventory().CreateInHands(m_Type);
+		}
+	}
+
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		EntityAI inHands = m_Owner.GetHumanInventory().GetEntityInHands();
+		if (inHands)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " hand item=" + inHands + " bot=" + m_Owner);
+			m_Bot.ProcessEvent(new BotEventEntityInHands(m_Owner, inHands));
+		}
+	}
+};
+
+class BotEventEntityInHandsOpened : BotEventBase { };
+
+class BotOpenEntityInHands extends BotStateBase
+{
+	EntityAI m_Entity;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		
+		if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			BotEventEntityInHands ev_ih = BotEventEntityInHands.Cast(e);
+			if (ev_ih)
+			{		
+				m_Entity = ev_ih.m_Entity;
+				Edible_Base b = Edible_Base.Cast(m_Entity);
+				if (b)
+				{	
+					botDebugPrint("[bot] + " + m_Owner + " will open edible item=" + b + " bot=" + m_Owner);
+					b.Open();
+				}
+			}
+		}
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+
+	override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		EntityAI inHands = m_Owner.GetHumanInventory().GetEntityInHands();
+		botDebugSpam("[bot] + " + m_Owner + " wait for opened item inHands=" + inHands + " bot=" + m_Owner);
+		if (inHands)
+		{
+			string t_str = inHands.GetType();
+			//string t_str = t.ToString();
+			if (t_str.IndexOf("_Opened") != -1)
+			{
+				botDebugPrint("[bot] + " + m_Owner + " opened item=" + inHands + " bot=" + m_Owner);
+				m_Bot.ProcessEvent(new BotEventEntityInHandsOpened(m_Owner, inHands));
+			}
+		}
+	}
+};
+
+
+class Bot_TestSpawnOpen extends BotStateBase
+{
+	string m_Type;
+	ref BotSpawnEntityInHands m_Spawning;
+	ref BotOpenEntityInHands m_Opening;
+
+	void Bot_TestSpawnOpen (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "")
+	{
+		m_Type = new_type;
+
+		// setup nested state machine
+		m_FSM = new BotFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_Spawning = new BotSpawnEntityInHands(m_Bot, this);
+		m_Opening = new BotOpenEntityInHands(m_Bot, this);
+		
+		// events
+		BotEventBase __EntInH__ = new BotEventEntityInHands;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(   m_Spawning,  __EntInH__, m_Opening));
+		//m_FSM.AddTransition(new BotTransition(   m_Opening,   __EntAtt__, m_Eating));
+		//m_FSM.AddTransition(new BotTransition(   m_Eating,   __EntAtt__, m_Eating));
+
+		m_FSM.SetInitialState(m_Spawning);
+	}
+
+	override void OnEntry (BotEventBase e) { super.OnEntry(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+
+class BotEventHandsEmpty : BotEventBase { };
+
+class BotWaitForEmptyHands extends BotStateBase
+{
+	override void OnEntry (BotEventBase e) { super.OnEntry(e); }
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		EntityAI inHands = m_Owner.GetHumanInventory().GetEntityInHands();
+		botDebugSpam("[bot] + " + m_Owner + " waiting for empty hands, inHands=" + inHands + " bot=" + m_Owner);
+		if (!inHands)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " hand slot empty. bot=" + m_Owner);
+			m_Bot.ProcessEvent(new BotEventHandsEmpty(m_Owner, inHands));
+		}
+	}
+};
+
+class BotWaitForChangeInHands extends BotStateBase
+{
+	/*override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+		m_Bot.ProcessEvent(new BotEventEndOK(m_Owner));
+	}*/
+};
+
+
+class BotDropEntityInHands extends BotWaitForChangeInHands
+{
+	EntityAI m_Entity;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		
+
+		EntityAI inHands = m_Owner.GetHumanInventory().GetEntityInHands();
+		if (inHands)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " dropping item=" + inHands + " bot=" + m_Owner);
+			if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+				m_Owner.PredictiveDropEntity(inHands);
+			//m_Owner.LocalDropEntity(inHands);
+		}
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+class BotEatEntityInHands extends BotWaitForChangeInHands
+{
+	EntityAI m_Entity;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		
+		EntityAI inHands = m_Owner.GetHumanInventory().GetEntityInHands();
+		if (inHands)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " eating item=" + inHands + " bot=" + m_Owner);
+			if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+			{
+#ifdef BOT
+				ActionManagerBase mgr = m_Owner.GetActionManager();
+				ActionManagerClient cli_mgr = ActionManagerClient.Cast(mgr);
+				if (cli_mgr)
+				{
+					ActionTarget target;
+					target = new ActionTarget(inHands, null, -1, vector.Zero, -1);
+					cli_mgr.PerformAction(AT_EAT, target, inHands);
+				}
+#endif
+			}
+		}
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+
+
+class BotDestroyEntityInHands extends BotWaitForChangeInHands
+{
+	EntityAI m_Entity;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		
+		EntityAI inHands = m_Owner.GetHumanInventory().GetEntityInHands();
+		if (inHands)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " deleting item=" + inHands + " bot=" + m_Owner);
+			if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+				inHands.Delete();
+		}
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+
+class Bot_TestSpawnOpenDrop extends Bot_TestSpawnOpen
+{
+	ref BotDropEntityInHands m_Dropping;
+
+	void Bot_TestSpawnOpenDrop (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "")
+	{
+		m_Dropping = new BotDropEntityInHands(m_Bot, this);
+		
+		// events
+		BotEventBase __EntOpn__ = new BotEventEntityInHandsOpened;
+		BotEventBase __HndChg__ = new BotEventOnItemInHandsChanged;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(    m_Opening,  __EntOpn__, m_Dropping));
+		m_FSM.AddTransition(new BotTransition(   m_Dropping,  __HndChg__, NULL));
+	}
+
+	override void OnEntry (BotEventBase e) { super.OnEntry(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+class Bot_TestSpawnOpenDestroy extends Bot_TestSpawnOpen
+{
+	ref BotDestroyEntityInHands m_Destroying;
+
+	void Bot_TestSpawnOpenDestroy (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "")
+	{
+		m_Destroying = new BotDestroyEntityInHands(m_Bot, this);
+		
+		// events
+		BotEventBase __EntOpn__ = new BotEventEntityInHandsOpened;
+		BotEventBase __HndChg__ = new BotEventOnItemInHandsChanged;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(    m_Opening,  __EntOpn__, m_Destroying));
+		m_FSM.AddTransition(new BotTransition( m_Destroying,  __HndChg__, NULL));
+	}
+
+	override void OnEntry (BotEventBase e) { super.OnEntry(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+class Bot_TestSpawnOpenEat extends Bot_TestSpawnOpen
+{
+	ref BotEatEntityInHands m_Eating;
+
+	void Bot_TestSpawnOpenEat (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "")
+	{
+		m_Eating = new BotEatEntityInHands(m_Bot, this);
+		
+		// events
+		BotEventBase __EntOpn__ = new BotEventEntityInHandsOpened;
+		BotEventBase __HndChg__ = new BotEventOnItemInHandsChanged;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(    m_Opening,  __EntOpn__, m_Eating));
+		m_FSM.AddTransition(new BotTransition(     m_Eating,  __HndChg__, NULL));
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpawnDeadBury.c b/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpawnDeadBury.c
new file mode 100644
index 0000000000000000000000000000000000000000..39972d143b9d22287a23d3bf7c3c264d2d058891
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_TestSpawnDeadBury.c
@@ -0,0 +1,194 @@
+#ifdef BOT
+class BotEventEntitySpawned : BotEventBase { };
+
+class BotSpawnDead extends BotStateBase
+{
+	string m_Type;
+
+	void BotSpawnDead (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "")
+	{
+		if (new_type == string.Empty)
+			m_Type = "ZmbM_HermitSkinny_Beige";
+		else
+			m_Type = new_type;
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+
+		if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			EntityAI Z = EntityAI.Cast(GetGame().CreateObject(m_Type, m_Owner.GetPosition()));
+			Z.SetHealth( "", "", 0 );
+			Error("TODO");
+			//m_Bot.PostEvent(new BotEventEntitySpawned(m_Owner, Z));
+		}
+	}
+};
+
+class Bot_TestSpawnDeadSelectBury extends BotStateBase
+{
+	string m_Type;
+	ref BotSpawnDead m_SpawnDead;
+	ref BotSpawnEntityInHands m_SpawnShovel;
+	ref BotSelectZombieTarget m_Selecting;
+	ref BotPerformAction m_Burying;
+
+	void Bot_TestSpawnDeadSelectBury (Bot bot = NULL, BotStateBase parent = NULL, string new_type = "ZmbM_HermitSkinny_Beige")
+	{
+		m_Type = new_type;
+
+		// setup nested state machine
+		m_FSM = new BotFSM(this); // @NOTE: set owner of the submachine fsm
+
+		m_SpawnDead = new BotSpawnDead(m_Bot, this, m_Type);
+		m_SpawnShovel = new BotSpawnEntityInHands(m_Bot, this, "Shovel");
+		m_Selecting = new BotSelectZombieTarget(m_Bot, this);
+		m_Burying = new BotPerformAction(m_Bot, this, AT_BURY_BODY);
+		
+		// events
+		BotEventBase __SpwnZ__ = new BotEventEntitySpawned;
+		BotEventBase __EntInH__ = new BotEventEntityInHands;
+		BotEventBase __Select__ = new BotEventSelectedTarget;
+
+		// transitions
+		m_FSM.AddTransition(new BotTransition(   m_SpawnDead,       NULL, m_SpawnShovel));
+		m_FSM.AddTransition(new BotTransition(   m_SpawnShovel,  __EntInH__, m_Selecting));
+		m_FSM.AddTransition(new BotTransition(   m_Selecting,   __Select__, m_Burying));
+		m_FSM.AddTransition(new BotTransition(   m_Burying,   NULL, NULL));
+
+		m_FSM.SetInitialState(m_SpawnDead);
+	}
+
+	override void OnEntry (BotEventBase e) { super.OnEntry(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+
+class BotEventSelectedTarget : BotEventBase { };
+
+class BotSelectZombieTarget extends BotStateBase
+{
+	ZombieMaleBase m_Target;
+	float m_dtAccumulator = 0.0;
+
+	void SelectTarget ()
+	{
+		//m_Target = NearestTargetSelector<ZombieMaleBase>.Find(GetPlayerOwner(), NULL);
+		botDebugPrint("[bot] + " + m_Owner + " hunt SelectTarget target=" + m_Target);
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		m_dtAccumulator = 0.0;
+		SelectTarget();
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+		m_Target = null;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		m_dtAccumulator += dt;
+		
+		if (m_Target == null)
+		{
+			if (m_dtAccumulator > 2.0)
+			{
+				botDebugPrint("[bot] + " + m_Owner + " searching...");
+				SelectTarget();
+				if (m_Target)
+				{
+					Error("TODO");
+					//m_Bot.PostEvent(new BotEventSelectedTarget(m_Owner, m_Target));
+				}
+
+				m_dtAccumulator = 0.0;
+			}
+		}
+		else
+		{
+					Error("TODO");
+			//m_Bot.PostEvent(new BotEventSelectedTarget(m_Owner, m_Target));
+		}
+	}
+};
+
+class BotPerformAction extends BotStateBase
+{
+	EntityAI m_Entity;
+	int m_ActionID;
+
+	void BotPerformAction (Bot bot = NULL, BotStateBase parent = NULL, int action = AT_EAT)
+	{
+		m_ActionID = action;
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+
+		if (e.m_Entity)
+		{
+			botDebugPrint("[bot] + " + m_Owner + " performing action on item=" + e.m_Entity);
+
+			if (m_Owner.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+			{
+#ifdef BOT
+				ActionManagerClient cli_mgr = ActionManagerClient.Cast(m_Owner.GetActionManager());
+				if (cli_mgr)
+					cli_mgr.PerformAction(m_ActionID, new ActionTarget(e.m_Entity, null, -1, vector.Zero, -1), e.m_Entity);
+#endif
+			}
+		}
+	}
+
+	override void OnAbort (BotEventBase e) { super.OnAbort(e); }
+	override void OnExit (BotEventBase e) { super.OnExit(e); }
+	override void OnUpdate (float dt) { super.OnUpdate(dt); }
+};
+
+
+
+/*class BotHunt extends BotStateBase
+{
+	float m_dtAccumulator = 0.0;
+
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		m_dtAccumulator = 0.0;
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		m_dtAccumulator += dt;
+		
+		float rescanTime = 3.0;
+		if (m_dtAccumulator >= rescanTime)
+			if (m_weapon.CanProcessWeaponEvents())
+				m_Bot.ProcessEvent(new WeaponEventReloadTimeout(p));
+	}
+};
+*/
+
+
+#endif
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_Tests.c b/scripts/4_World/DayZ/Systems/Bot/Bot_Tests.c
new file mode 100644
index 0000000000000000000000000000000000000000..1c5d1c29aaef71a28413d7f2bcc8fa731f42cfa1
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_Tests.c
@@ -0,0 +1,119 @@
+class BotTestSwapWithCorpse : BotStateBase
+{
+};
+
+class BotTestSwapInternal : BotStateBase
+{
+	EntityAI m_Entity1;
+	EntityAI m_Entity2;
+
+	void BotTestSwapInternal (Bot bot = NULL, BotStateBase parent = NULL)
+	{ }
+	
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		EntityAI j = m_Owner.GetInventory().CreateAttachment("Jeans_Blue");
+		m_Entity1 = j.GetInventory().CreateEntityInCargo("Rag");
+		EntityAI s = m_Owner.GetInventory().CreateInInventory("TacticalShirt_Grey");
+		m_Entity2 = s.GetInventory().CreateEntityInCargo("Roadflare");
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+		
+		if (m_Entity1 && m_Entity2)
+		{
+			if (m_Owner.GetInventory().CanSwapEntitiesEx(m_Entity1, m_Entity2))
+			{
+				botDebugPrint("[bot] + " + m_Owner + " -> swap item=" + m_Entity1 + " bot=" + m_Owner);
+				m_Owner.PredictiveSwapEntities(m_Entity1, m_Entity2);
+			}
+			else if (m_Owner.GetInventory().CanSwapEntitiesEx(m_Entity2, m_Entity1))
+			{
+				botDebugPrint("[bot] + " + m_Owner + " <- swap item=" + m_Entity2 + " bot=" + m_Owner);
+				m_Owner.PredictiveSwapEntities(m_Entity2, m_Entity1);
+			}
+		}
+	}
+};
+
+
+class BotTestSwapInternalC2H : BotStateBase
+{
+	EntityAI m_Entity1;
+	EntityAI m_Entity2;
+
+	void BotTestSwapInternalC2H (Bot bot = NULL, BotStateBase parent = NULL)
+	{ }
+	
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		EntityAI j = m_Owner.GetInventory().CreateAttachment("Jeans_Blue");
+		m_Entity1 = j.GetInventory().CreateEntityInCargo("Rag");
+		EntityAI s = m_Owner.GetInventory().CreateInInventory("TacticalShirt_Grey");
+		m_Entity2 = s.GetInventory().CreateEntityInCargo("Roadflare");
+		m_Owner.PredictiveTakeEntityToHands(m_Entity2);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+		
+		if (m_Entity1 && m_Entity2)
+		{
+			if (m_Owner.GetInventory().CanSwapEntitiesEx(m_Entity1, m_Entity2))
+			{
+				botDebugPrint("[bot] + " + m_Owner + " -> swap item=" + m_Entity1 + " bot=" + m_Owner);
+				m_Owner.PredictiveSwapEntities(m_Entity1, m_Entity2);
+			}
+			else if (m_Owner.GetInventory().CanSwapEntitiesEx(m_Entity2, m_Entity1))
+			{
+				botDebugPrint("[bot] + " + m_Owner + " <- swap item=" + m_Entity2 + " bot=" + m_Owner);
+				m_Owner.PredictiveSwapEntities(m_Entity2, m_Entity1);
+			}
+		}
+	}
+};
+
+
+class BotTestSwapG2H : BotStateBase
+{
+	EntityAI m_Entity1;
+	EntityAI m_Entity2;
+
+	void BotTestSwapG2H (Bot bot = NULL, BotStateBase parent = NULL)
+	{ }
+	
+	override void OnEntry (BotEventBase e)
+	{
+		super.OnEntry(e);
+		EntityAI j = m_Owner.GetInventory().CreateAttachment("Jeans_Blue");
+		m_Entity1 = j.GetInventory().CreateEntityInCargo("Rag");
+		EntityAI s = m_Owner.GetInventory().CreateInInventory("TacticalShirt_Grey");
+		m_Entity2 = s.GetInventory().CreateEntityInCargo("Roadflare");
+		m_Owner.PredictiveDropEntity(m_Entity2);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+		
+		/*if (m_Entity1 && m_Entity2)
+		{
+			if (m_Owner.GetInventory().CanSwapEntities(m_Entity1, m_Entity2))
+			{
+				botDebugPrint("[bot] + " + m_Owner + " -> swap item=" + m_Entity1 + " bot=" + m_Owner);
+				m_Owner.PredictiveSwapEntities(m_Entity1, m_Entity2);
+			}
+			else if (m_Owner.GetInventory().CanSwapEntities(m_Entity2, m_Entity1))
+			{
+				botDebugPrint("[bot] + " + m_Owner + " <- swap item=" + m_Entity2 + " bot=" + m_Owner);
+				m_Owner.PredictiveSwapEntities(m_Entity2, m_Entity1);
+			}
+		}*/
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Bot/Bot_TimedWait.c b/scripts/4_World/DayZ/Systems/Bot/Bot_TimedWait.c
new file mode 100644
index 0000000000000000000000000000000000000000..20e2bb493c9317e3bc8aa879ad68e596500d217f
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Bot/Bot_TimedWait.c
@@ -0,0 +1,53 @@
+
+class BotEventWaitTimeout : BotEventBase { };
+
+class BotTimedWait extends BotStateBase
+{
+	protected float m_dtAccumulator = 0.0;
+	protected float m_Timeout = 3.0;
+	protected bool m_Periodic = true;
+
+	void BotTimedWait (Bot bot = NULL, BotStateBase parent = NULL, float timeout = 3.0)
+	{
+		m_Timeout = timeout;
+	}
+
+	override void OnEntry (BotEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+
+		super.OnEntry(e);
+	}
+
+	override void OnExit (BotEventBase e)
+	{
+		m_dtAccumulator = 0.0;
+
+		super.OnExit(e);
+	}
+
+	override void OnUpdate (float dt)
+	{
+		super.OnUpdate(dt);
+
+		m_dtAccumulator += dt;
+		
+		float rescanTime = m_Timeout;
+		if (m_dtAccumulator >= rescanTime)
+		{
+			OnTimeout();
+
+			if (m_Periodic)
+				m_dtAccumulator = 0.0;
+			else
+				m_dtAccumulator = -1.0;
+		}
+	}
+
+	void OnTimeout ()
+	{
+		botDebugSpam("[bot] + " + m_Owner + " BotTimedWait::OnTimeout");
+		m_Bot.ProcessEvent(new BotEventWaitTimeout(m_Owner));
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Inventory/AttachmentsOutOfReach.c b/scripts/4_World/DayZ/Systems/Inventory/AttachmentsOutOfReach.c
new file mode 100644
index 0000000000000000000000000000000000000000..02fb83619f409d6eb970a2c52e7421f587bafaac
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Inventory/AttachmentsOutOfReach.c
@@ -0,0 +1,148 @@
+class AttachmentsOutOfReach
+{
+	protected static ref map<string, ref map<int, vector>> m_AttData;
+	
+	static bool IsAttachmentReachable(EntityAI e, string att_slot_name = "", int slot_id = -1, float range = 1.5)
+	{
+		if( !e.IgnoreOutOfReachCondition() )
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if( player.IsInVehicle() )
+			{
+				return false;
+			}
+			else
+			{
+				
+				vector pos_att;
+				if ( slot_id != -1 )
+				{
+					att_slot_name = InventorySlots.GetSlotName(slot_id);
+				}
+				if( att_slot_name != "" )
+				{
+					if( e.MemoryPointExists(att_slot_name) )
+					{
+						vector mem_point = e.GetMemoryPointPos(att_slot_name);
+						pos_att = e.ModelToWorld(mem_point);
+					}
+					else
+					{
+						pos_att = e.ModelToWorld(GetAttachmentPosition(e, InventorySlots.GetSlotIdFromString( att_slot_name ) ));
+					}
+					
+				}
+				
+				vector pos_player = player.GetPosition();
+				
+				float height_diff = Math.AbsFloat( pos_player[1] - pos_att[1] );
+				if( height_diff < range )
+				{
+					pos_player[1] = 0;
+					pos_att[1] = 0;
+					if ( vector.Distance(pos_player, pos_att) <= range )
+					{
+						return true;
+					}
+					return false;
+				}
+				else
+				{
+					return false;
+				}
+			}
+		}
+		else
+		{
+			return true;
+		}
+	}
+	
+	static vector GetAttachmentPosition(EntityAI e, int slot_id)
+	{
+		if ( m_AttData == NULL )
+		{
+			m_AttData = new map<string, ref map<int, vector>>();
+		}
+		
+		string type_name = e.GetType();
+		
+		if ( !m_AttData.Contains( type_name ) )
+		{
+			map<int, vector> att = CreateAttachmentPosition( e );
+			
+			m_AttData.Insert( type_name, att );
+		}
+		
+		return m_AttData.Get( type_name ).Get( slot_id );
+	}
+	
+	static protected map<int, vector> CreateAttachmentPosition( EntityAI entity )
+	{
+		map<int, vector> ret_val = new map<int, vector>();
+		
+		string			type_name = entity.GetType();
+		TStringArray	cfg_attachments = new TStringArray;
+		
+		string cfg_path;
+		
+		if ( GetGame().ConfigIsExisting(CFG_VEHICLESPATH+" "+type_name) )
+		{
+			cfg_path = CFG_VEHICLESPATH+" "+type_name+" attachments";
+		}
+		else if ( GetGame().ConfigIsExisting(CFG_WEAPONSPATH+" "+type_name) )
+		{
+			cfg_path = CFG_WEAPONSPATH+" "+type_name+" attachments";
+		}
+		else if ( GetGame().ConfigIsExisting(CFG_MAGAZINESPATH+" "+type_name) )
+		{
+			cfg_path = CFG_MAGAZINESPATH+" "+type_name+" attachments";
+		}
+		
+		GetGame().ConfigGetTextArray(cfg_path, cfg_attachments);
+		
+		int child_count = GetGame().ConfigGetChildrenCount("CfgNonAIVehicles");
+		
+		for ( int x = 0; x < child_count; ++x )
+		{
+			string child_name;
+			GetGame().ConfigGetChildName("CfgNonAIVehicles",x ,	child_name);
+			
+			string inventory_slot_name;
+			GetGame().ConfigGetText("CfgNonAIVehicles "+ child_name +" inventorySlot", inventory_slot_name);
+			
+			if ( cfg_attachments.Find( inventory_slot_name ) > 0 )
+			{
+				string model_path;
+				GetGame().ConfigGetText("CfgNonAIVehicles "+ child_name +" model", model_path);
+				
+				if ( model_path.Length() > 5 )
+				{										
+					LOD lod = entity.GetLODByName(LOD.NAME_VIEW);
+					
+					if ( lod )
+					{
+						model_path = model_path.Substring(0, model_path.Length() - 4);
+						model_path.ToLower();
+						
+						array<Selection> selections = new array<Selection>();
+						lod.GetSelections(selections);
+						
+						for ( int i = 0; i < selections.Count(); ++i )
+						{							
+							string selection = selections[i].GetName();
+							selection.ToLower();
+							
+							if ( selection.Contains(model_path) )
+							{
+								ret_val.Set(InventorySlots.GetSlotIdFromString( inventory_slot_name ), selections[i].GetVertexPosition(lod, 0));
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		return ret_val;
+	}
+}
\ No newline at end of file
diff --git a/scripts/4_World/DayZ/Systems/Inventory/DayZPlayerInventory.c b/scripts/4_World/DayZ/Systems/Inventory/DayZPlayerInventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..b9bdb6163ac96f7479926ab80c3b368c131f85cf
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Inventory/DayZPlayerInventory.c
@@ -0,0 +1,2534 @@
+//Post event containers
+class DeferredEvent
+{
+	InventoryMode m_mode;
+	bool ReserveInventory(HumanInventory inventory){return true;}
+	void ClearInventoryReservation(HumanInventory inventory){}
+}
+
+
+class DeferredTakeToDst : DeferredEvent
+{
+	ref InventoryLocation m_src;
+	ref InventoryLocation m_dst;
+	
+	void DeferredTakeToDst(InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		m_mode = mode;
+		m_src = src;
+		m_dst = dst;
+	}
+	
+	override bool ReserveInventory(HumanInventory inventory)
+	{
+		if( !inventory.AddInventoryReservationEx(m_dst.GetItem(), m_dst, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			return false;
+		}
+		return true;
+	}
+	
+	override void ClearInventoryReservation(HumanInventory inventory)
+	{
+		inventory.ClearInventoryReservationEx(m_dst.GetItem(), m_dst);
+	}
+}
+
+class DeferredSwapEntities : DeferredEvent
+{
+	EntityAI m_item1;
+	EntityAI m_item2;
+	ref InventoryLocation m_dst1;
+	ref InventoryLocation m_dst2;
+	
+	void DeferredSwapEntities(InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation dst1, notnull InventoryLocation dst2)
+	{
+		m_mode = mode;
+		m_item1 = item1;
+		m_item2 = item2;
+		m_dst1 = dst1;
+		m_dst2 = dst2;
+	}
+	
+	override bool ReserveInventory(HumanInventory inventory)
+	{
+		if( !inventory.AddInventoryReservationEx(m_item1, m_dst1, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			return false;
+		}
+		if( !inventory.AddInventoryReservationEx(m_item2, m_dst2, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			inventory.ClearInventoryReservationEx(m_item1, m_dst1);
+			return false;
+		}
+		return true;
+	}
+	
+	override void ClearInventoryReservation(HumanInventory inventory)
+	{
+		inventory.ClearInventoryReservationEx(m_item1, m_dst1);
+		inventory.ClearInventoryReservationEx(m_item2, m_dst2);
+	}
+}
+
+class DeferredForceSwapEntities : DeferredEvent
+{
+	EntityAI m_item1;
+	EntityAI m_item2;
+	ref InventoryLocation m_dst1;
+	ref InventoryLocation m_dst2;
+	
+	void DeferredForceSwapEntities(InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation dst1, notnull InventoryLocation dst2)
+	{
+		m_mode = mode;
+		m_item1 = item1;
+		m_item2 = item2;
+		m_dst1 = dst1;
+		m_dst2 = dst2;
+	}
+	
+	override bool ReserveInventory(HumanInventory inventory)
+	{
+		if( !inventory.AddInventoryReservationEx(m_item1, m_dst1, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			return false;
+		}
+		if( !inventory.AddInventoryReservationEx(m_item2, m_dst2, GameInventory.c_InventoryReservationTimeoutShortMS) )
+		{
+			inventory.ClearInventoryReservationEx(m_item1, m_dst1);
+			return false;
+		}
+		return true;
+	}
+	
+	override void ClearInventoryReservation(HumanInventory inventory)
+	{
+		inventory.ClearInventoryReservationEx(m_item1, m_dst1);
+		inventory.ClearInventoryReservationEx(m_item2, m_dst2);
+	}
+}
+
+class DeferredHandEvent: DeferredEvent
+{
+	ref HandEventBase m_event;
+	void DeferredHandEvent(InventoryMode mode, HandEventBase e)
+	{
+		m_mode = mode;
+		m_event = e;		
+	}
+	
+	override bool ReserveInventory(HumanInventory inventory)
+	{
+		return m_event.ReserveInventory();
+	}
+	
+	override void ClearInventoryReservation(HumanInventory inventory)
+	{
+		m_event.ClearInventoryReservation();
+	}
+}
+
+
+/**
+ * @class		DayZPlayerInventory
+ **/
+class DayZPlayerInventory : HumanInventoryWithFSM
+{
+	ref DeferredEvent m_DeferredEvent = NULL;
+	ref Timer m_DeferredWeaponTimer = new Timer;
+	//protected ref HandEventBase m_PostedHandEvent = NULL; /// deferred hand event
+	
+	
+	protected ref HandEventBase m_DeferredPostedHandEvent = NULL; /// deferred hand event
+	ref WeaponEventBase m_DeferredWeaponEvent = NULL; /// deferred weapon event
+	// states with animations
+	protected ref HandAnimatedTakingFromAtt m_Taking;
+	protected ref HandAnimatedMovingToAtt m_MovingTo;
+	protected ref HandAnimatedSwapping m_Swapping;
+	protected ref HandAnimatedForceSwapping m_FSwapping;
+	protected ref HandAnimatedForceSwapping_Inst m_FSwappingInst;
+
+	void DayZPlayerInventory () 
+	{
+	}
+
+	DayZPlayer GetDayZPlayerOwner () { return DayZPlayer.Cast(GetInventoryOwner()); }
+
+	bool IsAuthoritative()
+	{
+		DayZPlayer player;
+		if (!Class.CastTo(player, GetInventoryOwner()))
+		{
+			return false;
+		}
+
+		return (player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_CLIENT && player.GetInstanceType() != DayZPlayerInstanceType.INSTANCETYPE_REMOTE);
+	}
+
+	bool IsOwner()
+	{
+		DayZPlayer player;
+		if (!Class.CastTo(player, GetInventoryOwner()))
+		{
+			return false;
+		}
+
+		return (player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT || player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_SERVER || player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_SINGLEPLAYER);
+	}
+
+	bool IsProxy()
+	{
+		DayZPlayer player;
+		if (!Class.CastTo(player, GetInventoryOwner()))
+		{
+			return false;
+		}
+
+		return (player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_REMOTE || player.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_AI_REMOTE);
+	}
+
+	override void Init ()
+	{
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			hndDebugPrint("[hndfsm] Creating DayZPlayer Inventory FSM");
+		}
+
+		CreateStableStates(); // stable states needs to be created first
+
+		m_Taking = new HandAnimatedTakingFromAtt(GetManOwner(), null);
+		m_MovingTo = new HandAnimatedMovingToAtt(GetManOwner(), null);
+		m_Swapping = new HandAnimatedSwapping(GetManOwner(), null);
+		m_FSwapping = new HandAnimatedForceSwapping(GetManOwner(), null);
+		m_FSwappingInst = new HandAnimatedForceSwapping_Inst(GetManOwner(), null);
+
+		// events
+		HandEventBase _fin_ = new HandEventHumanCommandActionFinished;
+		HandEventBase _abt_ = new HandEventHumanCommandActionAborted;
+		HandEventBase __T__ = new HandEventTake;
+		HandEventBase __M__ = new HandEventMoveTo;
+		HandEventBase __W__ = new HandEventSwap;
+		//HandEventBase __D__ = new HandEventDropping;
+		HandEventBase __Xd_ = new HandEventDestroyed;
+		HandEventBase __F__ = new HandEventForceSwap;
+
+		// setup transitions
+		m_FSM.AddTransition(new HandTransition( m_Empty   , __T__,  m_Taking, NULL, new HandSelectAnimationOfTakeToHandsEvent(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_Taking  , _fin_,  m_Empty, null, new HandGuardNot(new HandGuardHasItemInHands(GetManOwner()))));
+		m_FSM.AddTransition(new HandTransition( m_Taking  , _fin_,  m_Equipped, null, null));
+		m_FSM.AddTransition(new HandTransition( m_Taking  , __Xd_,  m_Empty, new HandActionDestroyed, new HandGuardHasDestroyedItemInHands(GetManOwner())));
+			m_Taking.AddTransition(new HandTransition(  m_Taking.m_Hide, _abt_,   m_Empty));
+			m_Taking.AddTransition(new HandTransition(  m_Taking.m_Show, _abt_,   m_Equipped));
+
+		m_FSM.AddTransition(new HandTransition( m_Equipped, __M__,  m_MovingTo, NULL, new HandSelectAnimationOfMoveFromHandsEvent(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_MovingTo, __Xd_,  m_Empty, new HandActionDestroyed, new HandGuardHasDestroyedItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_MovingTo, _fin_,  m_Equipped, null, new HandGuardHasItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_MovingTo, _fin_,  m_Empty   , null, null));
+			m_MovingTo.AddTransition(new HandTransition(  m_MovingTo.m_Hide, _abt_,   m_Equipped));
+			m_MovingTo.AddTransition(new HandTransition(  m_MovingTo.m_Show, _abt_,   m_Empty));
+
+		m_FSM.AddTransition(new HandTransition( m_Equipped, __W__,  m_Swapping, NULL, new HandSelectAnimationOfSwapInHandsEvent(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_Swapping, __Xd_,  m_Empty, new HandActionDestroyed, new HandGuardHasDestroyedItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_Swapping, _fin_,  m_Empty, null, new HandGuardNot(new HandGuardHasItemInHands(GetManOwner()))));
+		m_FSM.AddTransition(new HandTransition( m_Swapping, _fin_,  m_Equipped, null, null));
+		m_FSM.AddTransition(new HandTransition( m_Swapping, _abt_,  m_Equipped, null, null));
+		
+		m_FSM.AddTransition(new HandTransition( m_Equipped, __F__, m_FSwappingInst, NULL, new HandGuardAnd( new HandSelectAnimationOfForceSwapInHandsEvent(GetManOwner()), new HandGuardInstantForceSwap(GetManOwner()) ) ));
+		m_FSM.AddTransition(new HandTransition(m_FSwappingInst, _fin_,  m_Equipped, null, new HandGuardHasItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition(m_FSwappingInst, _fin_,  m_Empty, null, null));
+		m_FSM.AddTransition(new HandTransition(m_FSwappingInst, __Xd_,  m_Empty, new HandActionDestroyed, new HandGuardHasDestroyedItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition( m_FSwappingInst, _abt_,  m_Equipped, null, null));
+
+		m_FSM.AddTransition(new HandTransition( m_Equipped, __F__, m_FSwapping, NULL, new HandSelectAnimationOfForceSwapInHandsEvent(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition(m_FSwapping, _fin_,  m_Equipped, null, new HandGuardHasItemInHands(GetManOwner())));
+		m_FSM.AddTransition(new HandTransition(m_FSwapping, _fin_,  m_Empty, null, null));
+		m_FSM.AddTransition(new HandTransition(m_FSwapping, __Xd_,  m_Empty, new HandActionDestroyed, new HandGuardHasDestroyedItemInHands(GetManOwner())));
+			m_FSwapping.AddTransition(new HandTransition(  m_FSwapping.m_Start, _abt_,   m_Equipped));
+			m_FSwapping.AddTransition(new HandTransition(  m_FSwapping.m_Hide, _abt_,   m_Empty));
+			m_FSwapping.AddTransition(new HandTransition(  m_FSwapping.m_Show, _abt_,   m_Equipped));
+		
+		super.Init(); // initialize ordinary human fsm (no anims)
+	}
+	
+	/**@fn	CancelHandEvent
+	 * @brief	cancels any handevents that will be executed this frame
+	 * @NOTE: this is used in situations where the player performs an action that renders the event invalid exactly on the frame it will be executed
+	 **/
+	void CancelHandEvent ()
+	{
+		m_DeferredPostedHandEvent = null;
+		//m_postedHandEvent = null;
+	}
+	
+	void CancelWeaponEvent ()
+	{
+		m_DeferredWeaponEvent = null;
+		m_DeferredWeaponTimer.Stop();
+	}
+
+	void AbortWeaponEvent ()
+	{
+		HumanCommandWeapons hcw = GetDayZPlayerOwner().GetCommandModifier_Weapons();
+			
+		Weapon_Base weapon;
+		Class.CastTo(weapon, GetEntityInHands());
+			
+		if (hcw && weapon && weapon.CanProcessWeaponEvents() && !weapon.IsIdle())
+		{
+			if (LogManager.IsWeaponLogEnable())
+			{
+				wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " Weapon event: ABORT! notifying running state=" + weapon.GetCurrentState());
+			}
+
+			weapon.ProcessWeaponAbortEvent(new WeaponEventHumanCommandActionAborted(GetDayZPlayerOwner()));
+		}
+	}
+	
+	/**@fn	PostWeaponEvent
+	 * @brief	deferred weapon's fsm handling of events
+	 * @NOTE: "post" stores the event for later use when ::CommandHandler is being run
+	 **/
+	void PostWeaponEvent (WeaponEventBase e)
+	{
+		if (m_DeferredWeaponEvent == NULL)
+		{
+			m_DeferredWeaponEvent = e;
+
+			if (LogManager.IsWeaponLogEnable())
+			{
+				wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(GetInventoryOwner()) + " Posted event m_DeferredWeaponEvent=" + m_DeferredWeaponEvent.DumpToString());
+			}
+		}
+		else
+		{
+			Error("[wpnfsm] " + Object.GetDebugName(GetInventoryOwner()) + " warning - pending event already posted, curr_event=" + m_DeferredWeaponEvent.DumpToString() + " new_event=" + e.DumpToString());
+		}
+	}
+	
+	void DeferredWeaponFailed()
+	{
+		Weapon_Base weapon;
+		Class.CastTo(weapon, GetEntityInHands());
+		
+		string secondPart = " - ENTITY IN HANDS IS NOT A WEAPON: " + Object.GetDebugName(GetEntityInHands());
+		
+		string firstPart = "[wpnfsm] " + Object.GetDebugName(GetInventoryOwner()) + " failed to perform weaponevent " + m_DeferredWeaponEvent.DumpToString();
+		if (weapon)
+		{
+			secondPart = " on " + Object.GetDebugName(GetEntityInHands()) + " which is in state " + weapon.GetCurrentState();
+			secondPart += " with physical state: J: " + weapon.IsJammed() + " | ";
+			for (int i = 0; i < weapon.GetMuzzleCount(); ++i)
+			{
+				secondPart += "Chamber_" + i + ": B(" + weapon.IsChamberFull(i) + ") F(" + weapon.IsChamberFiredOut(i) + ") E(" + weapon.IsChamberEmpty(i) + ") | ";
+				secondPart += "Magazine_" + i + ": " + weapon.GetMagazine(i);
+				if (i < weapon.GetMuzzleCount() - 1)
+					secondPart += " | ";
+			}
+		}
+		
+		Error(firstPart + secondPart);
+		CancelWeaponEvent();
+	}
+
+	void HandleWeaponEvents (float dt, out bool exitIronSights)
+	{
+		HumanCommandWeapons hcw = GetDayZPlayerOwner().GetCommandModifier_Weapons();
+
+		Weapon_Base weapon;
+		Class.CastTo(weapon, GetEntityInHands());
+		
+		if (hcw && weapon && weapon.CanProcessWeaponEvents())
+		{
+			weapon.GetCurrentState().OnUpdate(dt);
+
+			if (LogManager.IsWeaponLogEnable())
+			{
+				wpnDebugSpamALot("[wpnfsm] " + Object.GetDebugName(weapon) + " HCW: playing A=" + typename.EnumToString(WeaponActions, hcw.GetRunningAction()) + " AT=" + WeaponActionTypeToString(hcw.GetRunningAction(), hcw.GetRunningActionType()) + " fini=" + hcw.IsActionFinished());
+			}
+
+			if (!weapon.IsIdle())
+			{
+				while (true)
+				{
+					int weaponEventId = hcw.IsEvent();
+					if (weaponEventId == -1)
+					{
+						break;
+					}
+
+					if (weaponEventId == WeaponEvents.CHANGE_HIDE)
+					{
+						break;
+					}
+
+					WeaponEventBase anim_event = WeaponAnimEventFactory(weaponEventId, GetDayZPlayerOwner(), NULL);
+					
+					if (LogManager.IsWeaponLogEnable())
+					{
+						wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " HandleWeapons: event arrived " + typename.EnumToString(WeaponEvents, weaponEventId) + "(" + weaponEventId + ")  fsm_ev=" + anim_event.ToString());
+					}
+
+					if (anim_event != NULL)
+					{
+						weapon.ProcessWeaponEvent(anim_event);
+					}
+				}
+
+				if (hcw.IsActionFinished())
+				{
+					if (weapon.IsWaitingForActionFinish())
+					{
+						if (LogManager.IsWeaponLogEnable())
+						{
+							wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " Weapon event: finished! notifying waiting state=" + weapon.GetCurrentState());
+						}
+						
+						weapon.ProcessWeaponEvent(new WeaponEventHumanCommandActionFinished(GetDayZPlayerOwner()));
+					}
+					else
+					{
+						if (LogManager.IsWeaponLogEnable())
+						{
+							wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " Weapon event: ABORT! notifying running state=" + weapon.GetCurrentState());
+						}
+
+						weapon.ProcessWeaponAbortEvent(new WeaponEventHumanCommandActionAborted(GetDayZPlayerOwner()));
+					}
+				}
+			}
+
+			if (m_DeferredWeaponEvent)
+			{
+				if (LogManager.IsWeaponLogEnable())
+				{
+					wpnDebugPrint("[wpnfsm] " + Object.GetDebugName(weapon) + " Weapon event: deferred " + m_DeferredWeaponEvent.DumpToString());
+				}
+
+				if (weapon.ProcessWeaponEvent(m_DeferredWeaponEvent))
+				{
+					exitIronSights = true;
+
+					if (LogManager.IsWeaponLogEnable())
+					{
+						fsmDebugSpam("[wpnfsm] " + Object.GetDebugName(weapon) + " Weapon event: resetting deferred event" + m_DeferredWeaponEvent.DumpToString());
+					}
+
+					m_DeferredWeaponEvent = NULL;
+					m_DeferredWeaponTimer.Stop();
+				}
+				else if (!m_DeferredWeaponTimer.IsRunning())
+				{
+					m_DeferredWeaponTimer.Run(3, this, "DeferredWeaponFailed");
+				}
+			}
+		}
+	}
+	
+	void HandleInventory(float dt)
+	{
+		HumanCommandWeapons hcw = GetDayZPlayerOwner().GetCommandModifier_Weapons();
+
+		EntityAI ih = GetEntityInHands();
+		Weapon_Base weapon;
+		Class.CastTo(weapon, ih);
+		
+		if (hcw)
+		{
+			m_FSM.GetCurrentState().OnUpdate(dt);
+
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				hndDebugSpamALot("[hndfsm] HCW: playing A=" + typename.EnumToString(WeaponActions, hcw.GetRunningAction()) + " AT=" + WeaponActionTypeToString(hcw.GetRunningAction(), hcw.GetRunningActionType()) + " fini=" + hcw.IsActionFinished());
+			}
+			#endif
+			
+			if ( !m_FSM.GetCurrentState().IsIdle() || !m_FSM.IsRunning())
+			{
+				while (true)
+				{
+					int weaponEventId = hcw.IsEvent();
+					if (weaponEventId == -1)
+					{
+						break;
+					}
+
+					HandEventBase anim_event = HandAnimEventFactory(weaponEventId, GetManOwner(), NULL);
+
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{
+						hndDebugPrint("[hndfsm] HandleInventory: event arrived " + typename.EnumToString(WeaponEvents, weaponEventId) + "(" + weaponEventId + ")  fsm_ev=" + anim_event.ToString());
+					}
+					#endif
+
+					if (anim_event != NULL)
+					{
+						SyncHandEventToRemote(anim_event);
+						ProcessHandEvent(anim_event);
+					}
+				}
+
+				if (hcw.IsActionFinished())
+				{
+					if (m_FSM.GetCurrentState().IsWaitingForActionFinish())
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryHFSMLogEnable())
+						{
+							hndDebugPrint("[hndfsm] Hand-Weapon event: finished! notifying waiting state=" + m_FSM.GetCurrentState());
+						}
+						#endif
+
+						HandEventBase fin_event = new HandEventHumanCommandActionFinished(GetManOwner());
+						SyncHandEventToRemote(fin_event);
+						ProcessHandEvent(fin_event);
+					}
+					else
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryHFSMLogEnable())
+						{
+							hndDebugPrint("[hndfsm] Hand-Weapon event: ABORT! notifying running state=" + m_FSM.GetCurrentState());
+						}
+						#endif
+
+						HandEventBase abt_event = new HandEventHumanCommandActionAborted(GetManOwner());
+						SyncHandEventToRemote(abt_event);						
+						ProcessHandAbortEvent(abt_event);
+						//m_FSM.ProcessHandAbortEvent(new WeaponEventHumanCommandActionAborted(GetManOwner()));
+					}
+				}
+			}
+		}
+	}
+
+
+	///@{ juncture
+	/**@fn			OnInventoryJunctureFromServer
+	 * @brief		reaction to engine callback
+	 *	originates in:
+	 *				engine - DayZPlayer::OnSyncJuncture
+	 *				script - PlayerBase.OnSyncJuncture
+	 **/
+	override bool OnInventoryJunctureFromServer (ParamsReadContext ctx)
+	{
+		int tmp = -1;
+		ctx.Read(tmp);
+
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " store Juncture packet STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp());
+		}
+		
+		StoreJunctureData(ctx);
+
+		return true;
+	}
+	
+	///@{ juncture
+	/**@fn			OnInventoryJunctureFromServer
+	 * @brief		reaction to engine callback
+	 *	originates in:
+	 *				engine - DayZPlayer::OnSyncJuncture
+	 *				script - PlayerBase.OnSyncJuncture
+	 **/
+	override bool OnInventoryJunctureRepairFromServer (ParamsReadContext ctx)
+	{
+/*		InventoryLocation il = new InventoryLocation;
+		if (!il.ReadFromContext(ctx) )
+			return false;
+		
+		InventoryLocation il_current = new InventoryLocation;
+		
+		EntityAI item = il.GetItem();
+		item.GetInventory().GetCurrentInventoryLocation(il_current);
+		
+		if( !il_current.CompareLocationOnly(il))
+		{
+			LocationMoveEntity(il_current,il);
+		}*/
+		return true;
+	}
+	
+	///@{ juncture
+	/**@fn			OnInventoryJunctureFailureFromServer
+	 * @brief		reaction to engine callback
+	 *	originates in:
+	 *				engine - DayZPlayer::OnSyncJuncture
+	 *				script - PlayerBase.OnSyncJuncture
+	 **/
+	override void OnInventoryJunctureFailureFromServer(ParamsReadContext ctx)
+	{
+		/**
+		 * Function and setup is still messy due to the switch statement and relation with reading.
+		 * 
+		 * It could be cleaner if we used classes to handle each inventory command type, but that comes at a performance cost and will also probably require making a fair amount of changes elsewhere.
+		 * 
+		 * The downsides with this system right now:
+		 * 1. It makes it hard to track what is written/read from the serializer
+		 * 2. It makes this file very very large
+		 * 
+		 * The new changes at least remove the massive switch block and allow for all inventory commands to respond back to the client if something goes wrong
+		 * 
+		 */
+
+		if (GetGame().IsDedicatedServer())
+		{
+			return;
+		}
+
+		int udtIdentifier = -1;
+		if (!ctx.Read(udtIdentifier) || udtIdentifier != INPUT_UDT_INVENTORY)
+		{
+			return;
+		}
+
+		InventoryLocation src = new InventoryLocation;
+		InventoryLocation dst = new InventoryLocation;
+		InventoryLocation temp = new InventoryLocation;
+
+		InventoryCommandType type = -1;
+		if (!ctx.Read(type))
+		{
+			return;
+		}
+
+		switch (type)
+		{
+			case InventoryCommandType.SYNC_MOVE:
+			{
+				src.ReadFromContext(ctx);
+				dst.ReadFromContext(ctx);
+				break;
+			}
+			case InventoryCommandType.HAND_EVENT:
+			{
+				HandEventBase e = HandEventBase.CreateHandEventFromContext(ctx);
+				src = e.GetSrc();
+				dst = e.GetDst();
+				break;
+			}
+			case InventoryCommandType.SWAP:
+			{
+				src.ReadFromContext(ctx);
+				temp.ReadFromContext(ctx);
+				dst.ReadFromContext(ctx);
+				temp.ReadFromContext(ctx);
+				break;
+			}
+			case InventoryCommandType.FORCESWAP:
+			{
+				break;
+			}
+			case InventoryCommandType.DESTROY:
+			{
+				src.ReadFromContext(ctx);
+				break;
+			}
+		}
+
+		InventoryValidationReason reason;
+		if (!ctx.Read(reason))
+		{
+			reason = InventoryValidationReason.UNKNOWN;
+		}
+
+		OnInventoryFailure(type, reason, src, dst);
+	}
+
+	override void OnInventoryFailure(InventoryCommandType type, InventoryValidationReason reason, InventoryLocation src, InventoryLocation dst)
+	{
+		if (reason == InventoryValidationReason.DROP_PREVENTED)
+		{
+			//! TODO(kumarjac): Notify player here
+			return;
+		}
+
+	}
+	
+	/**@fn			OnHandleStoredJunctureData
+	 * @brief		reaction to engine callback
+	 *	originates in engine - DayZPlayerInventory::HandleStoredJunctureData
+	 **/
+	protected void OnHandleStoredJunctureData(ParamsReadContext ctx)
+	{
+		int tmp = -1;
+		ctx.Read(tmp);
+
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " handle JunctureData packet STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp());
+		}
+		
+		//! Juncture is only ever Server Req->Client Ack and Perform->Server Perform, never remote
+		ProcessInputData(ctx, true, false);
+	}
+
+	/**@fn			StoreJunctureData
+	 * @brief		stores received input user data for later handling
+	/aaa
+	 **/
+	proto native void StoreJunctureData(ParamsReadContext ctx);
+	///@} juncture
+
+
+	///@{ input user data
+	/**@fn			OnInputUserDataProcess
+	 * @brief		reaction to engine callback
+	 *	originates in:
+	 *				engine - DayZPlayer::OnInputUserDataReceived
+	 *				script - DayZPlayerImplement.OnInputUserDataReceived
+	 **/
+	override bool OnInputUserDataProcess(ParamsReadContext ctx)
+	{
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " store InputUserData packet STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp());
+		}
+	
+		StoreInputUserData(ctx);
+		return true;
+	}
+
+	/**@fn			OnHandleStoredInputUserData
+	 * @brief		reaction to engine callback
+	 *	originates in engine - DayZPlayerInventory::HandleStoredInputUserData
+	 **/
+	protected void OnHandleStoredInputUserData(ParamsReadContext ctx)
+	{
+		int tmp = -1;
+		ctx.Read(tmp);
+
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " handle InputUserData packet STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp());
+		}
+		
+		ProcessInputData(ctx, false, false);
+	}
+
+	/**@fn			StoreInputUserData
+	 * @brief		stores received input user data for later handling
+	 **/
+	proto native void StoreInputUserData(ParamsReadContext ctx);
+	///@} input user data
+	
+	void OnInputUserDataForRemote(ParamsReadContext ctx)
+	{
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " remote handling InputUserData packet from server");
+		}
+	
+		ProcessInputData(ctx, false, true);
+	}
+
+	override void OnServerInventoryCommand(ParamsReadContext ctx)
+	{
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " DZPInventory command from server");
+		}
+		
+		ProcessInputData(ctx, true, true);
+	}
+
+	bool ValidateSyncMove(inout Serializer ctx, InventoryValidation validation)
+	{
+		InventoryCommandType type = InventoryCommandType.SYNC_MOVE;
+
+		InventoryLocation src = new InventoryLocation;
+		InventoryLocation dst = new InventoryLocation;
+
+		src.ReadFromContext(ctx);
+		dst.ReadFromContext(ctx);
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + "src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst), "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+		}
+		#endif
+		
+		if (validation.m_IsRemote && (!src.GetItem() || !dst.GetItem()))
+		{
+			//! kumarjac: This indicates a failure in replication relationships as player full inventory should be synchronized always if player exists on the remote
+			
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - item not in bubble", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[syncinv] HandleInputData remote input (cmd=SYNC_MOVE) dropped, item not in bubble! src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			}
+			
+			return true;
+		}
+
+		EnableMovableOverride(src.GetItem());
+
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckRequestSrc(src, GameInventory.c_MaxItemDistanceRadius))
+		{
+			//! kumarjac: This indicates a failure in replication relationships as player full inventory should be synchronized always if player exists on the remote
+			
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckRequestSrc", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " failed src check with cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src));		
+			}
+			
+			RemoveMovableOverride(src.GetItem());
+			return true;
+		}
+		
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckRequestDst(src, dst, GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckMoveToDstRequest", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " is cheating with cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			}
+			
+			RemoveMovableOverride(src.GetItem());
+			return true;
+		}
+		
+		RemoveMovableOverride(src.GetItem());
+		
+		if (LogManager.IsSyncLogEnable())
+		{
+			syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " HandleInputData t=" + GetGame().GetTime() + "ms received cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+		}
+	
+		//! Check if this this is being executed on the server and not by a juncture or AI so we can lock the item and ensure replication relationships are setup
+		if (!validation.m_IsJuncture && GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			JunctureRequestResult result_mv = TryAcquireInventoryJunctureFromServer(GetDayZPlayerOwner(), src, dst);
+			if (result_mv == JunctureRequestResult.JUNCTURE_NOT_REQUIRED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture not required", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				//! TODO(kumarjac): We should continue with the execution and not have this special block but making a change here now will require testing
+
+				LocationSyncMoveEntity(src, dst);
+
+				validation.m_Result = InventoryValidationResult.SUCCESS;
+				return true;
+			}
+			else if (result_mv == JunctureRequestResult.JUNCTURE_ACQUIRED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture sended", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				if (!GameInventory.LocationCanMoveEntity(src, dst))
+				{
+					#ifdef DEVELOPER
+					DumpInventoryDebug();
+
+					if (LogManager.IsInventoryMoveLogEnable())
+					{
+						Debug.InventoryMoveLog("Failed - LocationCanMoveEntity - Juncture denied", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+					}
+					#endif
+
+					return true;
+				}
+				
+				validation.m_Result = InventoryValidationResult.JUNCTURE;
+				EnableMovableOverride(src.GetItem());
+				return true;
+			}
+			else if (result_mv == JunctureRequestResult.JUNCTURE_DENIED)
+			{
+				#ifdef DEVELOPER
+				if ( LogManager.IsInventoryMoveLogEnable() )
+				{
+					Debug.InventoryMoveLog("Juncture denied", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				validation.m_Reason = InventoryValidationReason.JUNCTURE_DENIED;
+				return true;
+			}
+			else
+			{
+				Error("[syncinv] HandleInputData: unexpected return code from AcquireInventoryJunctureFromServer");
+
+				return true;
+			}
+		}
+
+		if (GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			ClearInventoryReservationEx(dst.GetItem(), dst);
+		}
+		
+		//! Is called twice unfortunately...
+		if (GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			CheckForRope(src, dst);
+		}
+
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !GameInventory.LocationCanMoveEntitySyncCheck(src, dst))
+		{
+			#ifdef DEVELOPER
+			DumpInventoryDebug();
+
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - LocationCanMoveEntity", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			Error("[desync] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " CANNOT move cmd=" + typename.EnumToString(InventoryCommandType, type) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+			return true;
+		}
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("Success - LocationSyncMoveEntity", "SYNC_MOVE" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+		}
+		#endif
+
+		LocationSyncMoveEntity(src, dst);
+
+		validation.m_Result = InventoryValidationResult.SUCCESS;
+		return true;
+	}
+
+	bool ValidateHandEvent(inout Serializer ctx, InventoryValidation validation)
+	{
+		InventoryCommandType type = InventoryCommandType.HAND_EVENT;
+
+		HandEventBase e = HandEventBase.CreateHandEventFromContext(ctx);
+		e.ClearInventoryReservation();
+		
+		//! Pass partial information to guards so guards can do minimal checks if needed
+		//! The guards can't prevent event so it would be incorrect to pass full InventoryValidation struct.
+		//! We have to make sure guards don't inadvertantly produce different results in the FSM as that will create desync (two players attempting to put a rag into the same fireplace slot at the same time)
+		e.m_IsRemote = validation.m_IsRemote;
+		e.m_IsJuncture = validation.m_IsJuncture;
+
+		EntityAI itemSrc = e.GetSrcEntity();
+		EntityAI itemDst = e.GetSecondSrcEntity();
+
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + e.m_Player.GetSimulationTimeStamp() + " event= " + e.DumpToString(), "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+		}
+		#endif
+
+		if (validation.m_IsRemote && !e.GetSrcEntity())
+		{
+			//! kumarjac: This indicates a failure in replication relationships as player full inventory should be synchronized always if player exists on the remote
+			
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckRequestSrc", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+			}
+			#endif
+			
+			Error("[syncinv] HandleInputData remote input (cmd=HAND_EVENT, event=" + e.DumpToString() + ") dropped, item not in bubble");
+					
+			return true;
+		}
+		
+		//! TODO(kumarjac):	Is this one correct to be 'RemoveMovableOverride' or are the other Validate methdos wrong with 'EnableMovableOverride'?
+		if (itemSrc)
+			RemoveMovableOverride(itemSrc);
+		if (itemDst)
+			RemoveMovableOverride(itemDst);
+
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !e.CheckRequestSrc())
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckRequestSrc", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+			}
+			#endif
+			
+			if (!validation.m_IsRemote)
+			{
+				ctx = new ScriptInputUserData;
+				InventoryInputUserData.SerializeHandEvent(ctx, e);
+			}
+
+			RemoveMovableOverride(itemSrc);
+			RemoveMovableOverride(itemDst);
+
+			return true;
+		}
+
+		if (!e.CheckRequestEx(validation))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckRequest", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+			}
+			#endif
+
+			//! 'HandEventBase.CheckRequestEx' updates failure reason
+
+			ctx = new ScriptInputUserData;
+			InventoryInputUserData.SerializeHandEvent(ctx, e);
+			
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " is cheating with cmd=" + typename.EnumToString(InventoryCommandType, type) + " event=" + e.DumpToString());
+			}
+			
+			RemoveMovableOverride(itemSrc);
+			RemoveMovableOverride(itemDst);
+			return true;
+		}
+		
+		//! if it already happened on server, remote just needs to comply
+		//! TODO(kumarjac): Move m_IsRemote check to inside of HandEventBase.CanPerformEventEx
+		if (!validation.m_IsRemote && !e.CanPerformEventEx(validation))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CanPerformEvent", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+			}
+			#endif
+
+			//! 'HandEventBase.CanPerformEventEx' updates failure reason
+
+			ctx = new ScriptInputUserData;
+			InventoryInputUserData.SerializeHandEvent(ctx, e);
+			
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[desync] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " CANNOT do cmd=HAND_EVENT e=" + e.DumpToString());
+			}
+		
+			RemoveMovableOverride(itemSrc);
+			RemoveMovableOverride(itemDst);
+			return true;
+		}
+		
+		RemoveMovableOverride(itemSrc);
+		RemoveMovableOverride(itemDst);
+
+		//! Check if this this is being executed on the server and not by a juncture or AI
+		if (!validation.m_IsJuncture && GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			JunctureRequestResult result_ev = e.AcquireInventoryJunctureFromServer(GetDayZPlayerOwner());
+			if (result_ev == JunctureRequestResult.JUNCTURE_NOT_REQUIRED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture not required", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+				}
+				#endif
+
+				//! Continuing on with execution of rest of the function
+			}
+			else if (result_ev == JunctureRequestResult.JUNCTURE_ACQUIRED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture sended", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+				}
+				#endif
+				
+				ctx = new ScriptInputUserData;
+				InventoryInputUserData.SerializeHandEvent(ctx, e);
+			
+				validation.m_Result = InventoryValidationResult.JUNCTURE;
+				
+				if (itemSrc)
+					EnableMovableOverride(itemSrc);
+				if (itemDst)
+					EnableMovableOverride(itemDst);
+				return true;
+			}
+			else if (result_ev == JunctureRequestResult.JUNCTURE_DENIED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture denied", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+				}
+				#endif
+
+				validation.m_Reason = InventoryValidationReason.JUNCTURE_DENIED;
+				return true;
+			}
+			else
+			{
+				Error("[syncinv] HandleInputData: unexpected return code from AcquireInventoryJunctureFromServer");
+				
+				return true;
+			}
+		}
+		
+		//! Is called twice unfortunately... but it works so won't change
+		if (GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			CheckForRope(e.GetSrc(), e.GetDst());
+		}
+
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("Success - ProcessHandEvent", "HAND_EVENT" , "n/a", "ProcessInputData", e.m_Player.ToString() );
+		}
+		#endif
+		
+		validation.m_Result = InventoryValidationResult.SUCCESS;
+		if (!e.m_Player.GetHumanInventory().ProcessHandEvent(e))
+		{
+			//! TODO(kumarjac): We should probably set the result to failure like so
+			//result = InventoryValidationResult.FAILURE;
+		}
+
+		return true;
+	}
+
+	bool ValidateSwap(inout Serializer ctx, InventoryValidation validation)
+	{
+		InventoryCommandType type = InventoryCommandType.SWAP;
+
+		InventoryLocation src1 = new InventoryLocation;
+		InventoryLocation src2 = new InventoryLocation;
+
+		InventoryLocation dst1 = new InventoryLocation;
+		InventoryLocation dst2 = new InventoryLocation;
+
+		bool skippedSwap = false;
+		
+		src1.ReadFromContext(ctx);
+		src2.ReadFromContext(ctx);
+		dst1.ReadFromContext(ctx);
+		dst2.ReadFromContext(ctx);
+		ctx.Read(skippedSwap);
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2), "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );	
+		}
+		#endif
+
+		if (validation.m_IsRemote && (!src1.GetItem() || !src2.GetItem()))
+		{
+			if (skippedSwap)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Remote - skipped", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+/*
+				if (LogManager.IsSyncLogEnable())
+				{
+					syncDebugPrint("[syncinv] HandleInputData remote input (cmd=SWAP) dropped, swap is skipped");
+				}
+*/
+			}
+			else
+			{
+				//! kumarjac: This indicates a failure in replication relationships as player full inventory should be synchronized always if player exists on the remote
+			
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Failed - item1 or item2 not exist", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				Error("[syncinv] HandleInputData remote input (cmd=SWAP) dropped, item not in bubble");
+			}
+
+			return true;
+		}
+				
+		EnableMovableOverride(src1.GetItem());
+		EnableMovableOverride(src2.GetItem());
+		
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckRequestSrc(src1, GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckRequestSrc1", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " failed src1 check with cmd=" + typename.EnumToString(InventoryCommandType, type) + " src1=" + InventoryLocation.DumpToStringNullSafe(src1));
+			}
+			
+			RemoveMovableOverride(src1.GetItem());
+			RemoveMovableOverride(src2.GetItem());
+			return true;
+		}
+
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckRequestSrc(src2, GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckRequestSrc2", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " failed src2 check with cmd=" + typename.EnumToString(InventoryCommandType, type) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2));
+			}
+			
+			RemoveMovableOverride(src1.GetItem());
+			RemoveMovableOverride(src2.GetItem());
+			return true;
+		}
+
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckSwapItemsRequest(src1, src2, dst1, dst2, GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CheckSwapItemsRequest", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			if (LogManager.IsSyncLogEnable())
+			{
+				syncDebugPrint("[cheat] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " is cheating with cmd=" + typename.EnumToString(InventoryCommandType, type) + " src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+			}
+			
+			RemoveMovableOverride(src1.GetItem());
+			RemoveMovableOverride(src2.GetItem());
+			return true;
+		}
+				
+		RemoveMovableOverride(src1.GetItem());
+		RemoveMovableOverride(src2.GetItem());
+		
+		if (GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			ClearInventoryReservationEx(dst1.GetItem(), dst1);
+			ClearInventoryReservationEx(dst2.GetItem(), dst2);
+		}				
+		
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !GameInventory.CanForceSwapEntitiesEx(src1.GetItem(), dst1, src2.GetItem(), dst2))
+		{
+			#ifdef DEVELOPER
+			DumpInventoryDebug();
+				
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed - CanForceSwapEntitiesEx", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			Error("[desync] HandleInputData man=" + Object.GetDebugName(GetManOwner()) + " CANNOT swap cmd=" + typename.EnumToString(InventoryCommandType, type) + " src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) +" | src2=" + InventoryLocation.DumpToStringNullSafe(src2) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));
+			return true;
+		}
+	
+		if (GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT)
+		{
+			AddInventoryReservationEx(dst1.GetItem(), dst1, GameInventory.c_InventoryReservationTimeoutShortMS);
+			AddInventoryReservationEx(dst2.GetItem(), dst2, GameInventory.c_InventoryReservationTimeoutShortMS);
+		}
+
+		if (!(src1.IsValid() && src2.IsValid() && dst1.IsValid() && dst2.IsValid()))
+		{
+			Error("HandleInputData: cmd=" + typename.EnumToString(InventoryCommandType, type) + " invalid input(s): src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(dst2));	
+			return true;
+		}
+
+		//! Check if this this is being executed on the server and not by a juncture or AI
+		if (!validation.m_IsJuncture && GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			JunctureRequestResult result_sw = TryAcquireTwoInventoryJuncturesFromServer(GetDayZPlayerOwner(), src1, src2, dst1, dst2);
+			if (result_sw == JunctureRequestResult.JUNCTURE_NOT_REQUIRED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture not required", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				//! Continuing on with execution of rest of the function
+			}
+			else if (result_sw == JunctureRequestResult.JUNCTURE_ACQUIRED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture sended", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				validation.m_Result = InventoryValidationResult.JUNCTURE;
+				EnableMovableOverride(src1.GetItem());
+				EnableMovableOverride(src2.GetItem());
+				return true;
+			}
+			else if (result_sw == JunctureRequestResult.JUNCTURE_DENIED)
+			{
+				#ifdef DEVELOPER
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					Debug.InventoryMoveLog("Juncture denied", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+				}
+				#endif
+
+				validation.m_Reason = InventoryValidationReason.JUNCTURE_DENIED;
+				return true;
+			}
+			else
+			{
+				Error("[syncinv] HandleInputData: unexpected return code from TryAcquireTwoInventoryJuncturesFromServer"); return true;
+				
+				return true;
+			}
+		}
+			
+		if (GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_CLIENT )
+		{
+			ClearInventoryReservationEx(dst1.GetItem(),dst1);
+			ClearInventoryReservationEx(dst2.GetItem(),dst2);
+		}
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("Success - item swap", "SWAP" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );
+		}
+		#endif
+
+		bool isNotSkipped = LocationSwap(src1, src2, dst1, dst2);
+		
+		ctx = new ScriptInputUserData();
+		InventoryInputUserData.SerializeSwap(ctx, src1, src2, dst1, dst2, !isNotSkipped);
+
+		validation.m_Result = InventoryValidationResult.SUCCESS;
+		return true;
+	}
+
+	bool ValidateDestroy(inout Serializer ctx, InventoryValidation validation)
+	{
+		InventoryCommandType type = InventoryCommandType.DESTROY;
+
+		if (validation.m_IsJuncture)
+		{
+			/** TODO(kumarjac):
+			 *	Probably should be called through inventory juncture, 
+			 *	we shouldn't allow the client to delete until the 
+			 *	server says it is okay as there can be more reasons 
+			 *	than "cheater" for it to be rejected such as desync
+			 */
+			
+			return true;
+		}
+
+		InventoryLocation src = new InventoryLocation;
+		src.ReadFromContext(ctx);
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " src=" + InventoryLocation.DumpToStringNullSafe(src), "DESTROY" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );	
+		}
+		#endif
+
+		if (validation.m_IsRemote && !src.GetItem())
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed item not exist", "DESTROY" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );	
+			}
+			#endif
+
+			Error("[syncinv] HandleInputData remote input (cmd=DESTROY) dropped, item not in bubble");
+			return true;
+		}
+		
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckRequestSrc(src, GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed CheckRequestSrc", "DESTROY" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );	
+			}
+			#endif
+
+			return true;
+		}
+
+		//! Do not check for action validity on remotes or when performing through juncture. 
+		//! Juncture locks guarentee the item is safe to interact with and the server has validated the command at this point. 
+		//! Checking at this point is both wasteful and can result in a failure which leads to desync
+		if (!validation.m_IsRemote && !validation.m_IsJuncture && !PlayerCheckDropRequest(src, GameInventory.c_MaxItemDistanceRadius))
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("Failed CheckDropRequest", "DESTROY" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );	
+			}
+			#endif
+
+			return true;
+		}
+
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("Success ObjectDelete", "DESTROY" , "n/a", "ProcessInputData", GetDayZPlayerOwner().ToString() );	
+		}
+		#endif
+
+		GetGame().ObjectDelete(src.GetItem());
+
+		validation.m_Result = InventoryValidationResult.SUCCESS;
+		return true;
+	}
+
+	/**
+	 * 
+	 * @return false on malformed data, true on anything else, including cheats
+	 */
+	bool ProcessInputData(ParamsReadContext ctx, bool isJuncture, bool isRemote)
+	{
+		if (isJuncture && isRemote)
+		{
+			//! It should be impossible for juncture to be ran on remote
+			return false;
+		}
+
+		int type = -1;
+		if (!ctx.Read(type))
+		{
+			return false;
+		}
+
+		InventoryValidation validation();
+		validation.m_IsJuncture = isJuncture;
+		validation.m_IsRemote = isRemote;
+
+		//! Serializer can be updated and re-written to when we may want to only correct the client instead of denying the inventory command
+		Serializer serializer = ctx;
+		
+		switch (type)
+		{
+		case InventoryCommandType.USER_RESERVATION_CANCEL:
+			if (!ValidateUserReservationCancel(serializer, validation))
+			{
+				return false;
+			}
+			break;
+		case InventoryCommandType.SYNC_MOVE:
+			if (!ValidateSyncMove(serializer, validation))
+			{
+				return false;
+			}
+			break;
+		case InventoryCommandType.HAND_EVENT:
+			if (!ValidateHandEvent(serializer, validation))
+			{
+				return false;
+			}
+			break;
+		case InventoryCommandType.SWAP:
+			if (!ValidateSwap(serializer, validation))
+			{
+				return false;
+			}
+			break;
+		case InventoryCommandType.DESTROY:
+			if (!ValidateDestroy(serializer, validation))
+			{
+				return false;
+			}
+			break;
+		default:
+			break;
+		}
+
+		bool canSendJuncture = !isJuncture && GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER;
+		
+		switch (validation.m_Result)
+		{
+		case InventoryValidationResult.FAILED:
+			if (canSendJuncture) //! Only inform client about failure
+			{
+				//! General purpose serializer change from read to write here if the validation doesn't update it
+				if (!serializer.CanWrite())
+				{
+					ScriptInputUserData writeableSerializer();
+					writeableSerializer.CopyFrom(serializer);
+					serializer = writeableSerializer;
+				}
+
+				serializer.Write(validation.m_Reason);
+
+				GetDayZPlayerOwner().SendSyncJuncture(DayZPlayerSyncJunctures.SJ_INVENTORY_FAILURE, serializer);
+			}
+			break;
+		case InventoryValidationResult.JUNCTURE:
+			if (canSendJuncture) //! Only send juncture back to client
+			{
+				GetDayZPlayerOwner().SendSyncJuncture(DayZPlayerSyncJunctures.SJ_INVENTORY, serializer);
+				//StoreInputForRemotes(isJuncture, isRemote, serializer);
+			}
+			else
+			{
+				Error("InventoryValidationResult.JUNCTURE returned when not possible to send!");
+			}
+			break;
+		case InventoryValidationResult.SUCCESS:
+			StoreInputForRemotes(isJuncture, isRemote, serializer);
+			break;
+		}
+
+		return true;
+	}
+	
+	void RemoveMovableOverride(EntityAI item)
+	{
+		ItemBase itemIB = ItemBase.Cast(item);
+		if (itemIB)
+			itemIB.SetCanBeMovedOverride(false);
+	}
+	
+	void EnableMovableOverride(EntityAI item)
+	{
+		ItemBase itemIB = ItemBase.Cast(item);
+		if (itemIB)
+			itemIB.SetCanBeMovedOverride(true);
+	}
+	
+	// Hacky solution for dealing with fencekit rope related issues, could be fixed by introducing some indicator that this item behaves differently or sth..
+	void CheckForRope(InventoryLocation src, InventoryLocation dst)
+	{
+		Rope rope = Rope.Cast(src.GetItem());
+		if (rope)
+			rope.SetTargetLocation(dst);
+	}
+	
+	bool IsServerOrLocalPlayer()
+	{
+		return GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER || GetDayZPlayerOwner() == GetGame().GetPlayer());
+	}
+	
+	bool StoreInputForRemotes (bool handling_juncture, bool remote, ParamsReadContext ctx)
+	{
+		if (!remote && GetDayZPlayerOwner().GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp(), "n/a" , "n/a", "StoreInputForRemotes", GetDayZPlayerOwner().ToString() );	
+			}
+			#endif
+
+			GetDayZPlayerOwner().StoreInputForRemotes(ctx); // @NOTE: needs to be called _after_ the operation
+			return true;
+		}
+
+		return false;
+	}
+	
+	override bool TakeToDst (InventoryMode mode, notnull InventoryLocation src, notnull InventoryLocation dst)
+	{
+		if (GetManOwner().IsAlive() == false)
+			return super.TakeToDst(mode, src, dst);
+		
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "TakeToDst", GetDayZPlayerOwner().ToString() );	
+		}
+		#endif
+		
+		switch (mode)
+		{
+			case InventoryMode.SERVER:
+				if (RedirectToHandEvent(mode, src, dst))
+				{
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryMoveLogEnable())
+					{
+						Debug.InventoryMoveLog("RedirectToHandEvent", "n/a" , "n/a", "TakeToDst", GetDayZPlayerOwner().ToString() );	
+					}
+					#endif
+
+					return true;
+				}
+					
+
+				if (GetDayZPlayerOwner().NeedInventoryJunctureFromServer(src.GetItem(), src.GetParent(), dst.GetParent()))
+				{
+					if (GetGame().AddInventoryJunctureEx(GetDayZPlayerOwner(), src.GetItem(), dst, true, GameInventory.c_InventoryReservationTimeoutMS))
+					{
+						if (LogManager.IsSyncLogEnable())
+						{
+							syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " DZPI::Take2Dst(" + typename.EnumToString(InventoryMode, mode) + ") got juncture");
+						}
+					}
+					else
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryMoveLogEnable())
+						{
+							Debug.InventoryMoveLog("Juncture failed", "n/a" , "n/a", "TakeToDst", GetDayZPlayerOwner().ToString() );	
+						}
+						#endif
+
+						if (LogManager.IsSyncLogEnable())
+						{
+							syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " DZPI::Take2Dst(" + typename.EnumToString(InventoryMode, mode) + ") got juncture");
+						}
+
+						return false;
+					}
+						
+				}
+
+				ScriptInputUserData ctx = new ScriptInputUserData;
+				InventoryInputUserData.SerializeMove(ctx, InventoryCommandType.SYNC_MOVE, src, dst);
+	
+				GetDayZPlayerOwner().SendSyncJuncture(DayZPlayerSyncJunctures.SJ_INVENTORY, ctx);
+			
+				if (LogManager.IsSyncLogEnable())
+				{
+					syncDebugPrint("[syncinv] " + Object.GetDebugName(GetDayZPlayerOwner()) + " STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " store input for remote - DZPI::Take2Dst(" + typename.EnumToString(InventoryMode, mode) + " server sync move src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+				}
+				
+				//! Remote inputs are processed in sync juncture once performed on the server - this code below was executing the inventory command before the player simulation timeestamp for remotes which is illegal
+				//GetDayZPlayerOwner().StoreInputForRemotes(ctx); // @TODO: is this right place? maybe in HandleInputData(server=true, ...)
+				#ifdef DEVELOPER
+				if ( LogManager.IsInventoryMoveLogEnable() )
+				{
+					Debug.InventoryMoveLog("Success - store input for remote mode - " + typename.EnumToString(InventoryMode, mode) + " src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst), "n/a" , "n/a", "TakeToDst", GetDayZPlayerOwner().ToString() );	
+				}
+				#endif
+				return true;
+			
+			case InventoryMode.LOCAL:
+				LocationSyncMoveEntity(src, dst);
+				return true;
+		}
+		if(!super.TakeToDst(mode,src,dst))
+		{
+			if (!m_DeferredEvent)
+			{
+				m_DeferredEvent = new DeferredTakeToDst(mode,src,dst);
+				if( m_DeferredEvent.ReserveInventory(this) )
+					return true;
+			}
+			
+			m_DeferredEvent = null;
+			return false;
+		}
+		return true;
+	}
+	
+	void HandleTakeToDst( DeferredEvent deferred_event )
+	{
+		DeferredTakeToDst deferred_take_to_dst = DeferredTakeToDst.Cast(deferred_event);
+		if( deferred_take_to_dst )
+		{
+			#ifdef DEVELOPER
+			if ( LogManager.IsInventoryHFSMLogEnable() )
+			{	
+				Debug.InventoryHFSMLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp(), "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString() );
+			}
+			#endif
+			
+			deferred_take_to_dst.ClearInventoryReservation(this);
+
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				inventoryDebugPrint("[inv] I::Take2Dst(" + typename.EnumToString(InventoryMode, deferred_take_to_dst.m_mode) + ") src=" + InventoryLocation.DumpToStringNullSafe(deferred_take_to_dst.m_src) + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_take_to_dst.m_dst));
+			}
+
+			switch (deferred_take_to_dst.m_mode)
+			{
+				case InventoryMode.PREDICTIVE:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("PREDICTIVE ", "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString() );
+					}
+					#endif
+				
+					if (LocationCanMoveEntity(deferred_take_to_dst.m_src,deferred_take_to_dst.m_dst))
+					{
+						InventoryInputUserData.SendInputUserDataMove(InventoryCommandType.SYNC_MOVE, deferred_take_to_dst.m_src, deferred_take_to_dst.m_dst);
+						LocationSyncMoveEntity(deferred_take_to_dst.m_src, deferred_take_to_dst.m_dst);
+					}
+					else
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryMoveLogEnable())
+						{
+							Debug.InventoryMoveLog("Can not move entity (PREDICTIVE) STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item = " + deferred_take_to_dst.m_dst.GetItem() + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_take_to_dst.m_dst), "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString() );	
+						}
+						#endif
+					}
+					break;
+				case InventoryMode.JUNCTURE:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("JUNCTURE ", "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+				
+					if (LocationCanMoveEntity(deferred_take_to_dst.m_src,deferred_take_to_dst.m_dst))
+					{
+						DayZPlayer player = GetGame().GetPlayer();
+						player.GetHumanInventory().AddInventoryReservationEx(deferred_take_to_dst.m_dst.GetItem(), deferred_take_to_dst.m_dst, GameInventory.c_InventoryReservationTimeoutShortMS);
+						EnableMovableOverride(deferred_take_to_dst.m_dst.GetItem());	
+						InventoryInputUserData.SendInputUserDataMove(InventoryCommandType.SYNC_MOVE, deferred_take_to_dst.m_src, deferred_take_to_dst.m_dst);
+					}
+					else
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryMoveLogEnable())
+						{
+							Debug.InventoryMoveLog("Can not move entity (JUNCTURE) STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item = " + deferred_take_to_dst.m_dst.GetItem() + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_take_to_dst.m_dst), "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString());	
+						}
+						#endif
+					}
+					break;
+				case InventoryMode.LOCAL:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("LOCAL ", "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+					break;
+				case InventoryMode.SERVER:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("SERVER ", "n/a" , "n/a", "HandleTakeToDst", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+					break;
+				default:
+					Error("HandEvent - Invalid mode");
+					break;
+			}
+		}
+	}
+	
+	override bool SwapEntities (InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2)
+	{
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item1 = " + item1 + " item2 = " + item2, "n/a" , "n/a", "SwapEntities", GetDayZPlayerOwner().ToString() );	
+		}
+		#endif
+		
+		InventoryLocation src1, src2, dst1, dst2;
+		if( mode == InventoryMode.LOCAL )
+		{
+			if (GameInventory.MakeSrcAndDstForSwap(item1, item2, src1, src2, dst1, dst2))
+			{
+				LocationSwap(src1, src2, dst1, dst2);
+				return true;
+			}
+		}
+		
+		if(!super.SwapEntities(mode,item1,item2))
+		{
+			if(!m_DeferredEvent)
+			{
+				if( GameInventory.MakeSrcAndDstForSwap(item1, item2, src1, src2, dst1, dst2) );
+				{
+					m_DeferredEvent = new DeferredSwapEntities(mode, item1, item2, dst1, dst2);
+					if( m_DeferredEvent.ReserveInventory(this) )
+						return true;
+				}
+			}
+			m_DeferredEvent = null;
+			return false;
+		}
+		return true;
+	}
+	
+	void HandleSwapEntities( DeferredEvent deferred_event )
+	{
+		DeferredSwapEntities deferred_swap_entities = DeferredSwapEntities.Cast(deferred_event);
+		if( deferred_swap_entities )
+		{
+			deferred_swap_entities.ClearInventoryReservation(this);
+			InventoryLocation src1, src2, dst1, dst2;
+			if (GameInventory.MakeSrcAndDstForSwap(deferred_swap_entities.m_item1, deferred_swap_entities.m_item2, src1, src2, dst1, dst2))
+			{
+				if (LogManager.IsInventoryMoveLogEnable())
+				{
+					inventoryDebugPrint("[inv] I::Swap(" + typename.EnumToString(InventoryMode, deferred_swap_entities.m_mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(deferred_swap_entities.m_dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(deferred_swap_entities.m_dst2));
+				}
+
+				switch (deferred_swap_entities.m_mode)
+				{
+					case InventoryMode.PREDICTIVE:
+						if (CanSwapEntitiesEx(deferred_swap_entities.m_dst1.GetItem(),deferred_swap_entities.m_dst2.GetItem()) )
+						{
+							InventoryInputUserData.SendInputUserDataSwap(src1, src2, deferred_swap_entities.m_dst1, deferred_swap_entities.m_dst2);
+							LocationSwap(src1, src2, deferred_swap_entities.m_dst1, deferred_swap_entities.m_dst2);
+						}
+						else
+						{
+							#ifdef DEVELOPER
+							if (LogManager.IsInventoryMoveLogEnable())
+							{
+								Debug.InventoryMoveLog("Can not swap (PREDICTIVE) STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item1 = " + deferred_swap_entities.m_dst1.GetItem() + " item2 = " + deferred_swap_entities.m_dst2.GetItem() + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_swap_entities.m_dst2), "n/a" , "n/a", "ForceSwapEntities", GetDayZPlayerOwner().ToString() );	
+							}
+							#endif
+						}
+						break;
+			
+					case InventoryMode.JUNCTURE:
+						if (CanSwapEntitiesEx(deferred_swap_entities.m_dst1.GetItem(),deferred_swap_entities.m_dst2.GetItem()) )
+						{
+							DayZPlayer player = GetGame().GetPlayer();
+							player.GetHumanInventory().AddInventoryReservationEx(deferred_swap_entities.m_dst1.GetItem(), deferred_swap_entities.m_dst1, GameInventory.c_InventoryReservationTimeoutShortMS);
+							player.GetHumanInventory().AddInventoryReservationEx(deferred_swap_entities.m_dst2.GetItem(), deferred_swap_entities.m_dst2, GameInventory.c_InventoryReservationTimeoutShortMS);
+							EnableMovableOverride(deferred_swap_entities.m_dst1.GetItem());
+							EnableMovableOverride(deferred_swap_entities.m_dst2.GetItem());
+							InventoryInputUserData.SendInputUserDataSwap(src1, src2, deferred_swap_entities.m_dst1, deferred_swap_entities.m_dst2);
+						}
+						else
+						{
+							#ifdef DEVELOPER
+							if (LogManager.IsInventoryMoveLogEnable())
+							{
+								Debug.InventoryMoveLog("Can not swap (JUNCTURE) STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item1 = " + deferred_swap_entities.m_dst1.GetItem() + " item2 = " + deferred_swap_entities.m_dst2.GetItem() + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_swap_entities.m_dst2), "n/a" , "n/a", "ForceSwapEntities", GetDayZPlayerOwner().ToString() );	
+							}
+							#endif
+						}
+						break;
+
+					case InventoryMode.LOCAL:
+						break;
+
+					default:
+						Error("SwapEntities - HandEvent - Invalid mode");
+				}
+			}
+			else
+				Error("SwapEntities - MakeSrcAndDstForSwap - no inv loc");
+		}
+	}
+	
+	override bool ForceSwapEntities (InventoryMode mode, notnull EntityAI item1, notnull EntityAI item2, notnull InventoryLocation item2_dst)
+	{
+		#ifdef DEVELOPER
+		if (LogManager.IsInventoryMoveLogEnable())
+		{
+			Debug.InventoryMoveLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item1 = " + item1 + " item2 = " + item2 + " dst=" + InventoryLocation.DumpToStringNullSafe(item2_dst), "n/a" , "n/a", "ForceSwapEntities", GetDayZPlayerOwner().ToString() );	
+		}
+		#endif
+		
+		if( mode == InventoryMode.LOCAL )
+		{
+			InventoryLocation src1, src2, dst1;
+			if (GameInventory.MakeSrcAndDstForForceSwap(item1, item2, src1, src2, dst1, item2_dst))
+			{
+				LocationSwap(src1, src2, dst1, item2_dst);
+				return true;
+			}
+			
+		}
+		
+		if(!super.ForceSwapEntities(mode,item1,item2,item2_dst))
+		{
+			if(!m_DeferredEvent)
+			{
+				if (GameInventory.MakeSrcAndDstForForceSwap(item1, item2, src1, src2, dst1, item2_dst))
+				{
+					m_DeferredEvent = new DeferredForceSwapEntities(mode,item1,item2, dst1, item2_dst);
+					if( m_DeferredEvent.ReserveInventory(this))
+						return true;
+
+				}
+			}
+			m_DeferredEvent = null;
+			return false;
+		}
+		
+		return true;
+	}
+
+	void HandleForceSwapEntities( DeferredEvent deferred_event )
+	{
+		DeferredForceSwapEntities deferred_force_swap_entities = DeferredForceSwapEntities.Cast(deferred_event);
+		if (deferred_force_swap_entities)
+		{
+			deferred_force_swap_entities.ClearInventoryReservation(this);
+			InventoryLocation src1 = new InventoryLocation;
+			InventoryLocation src2 = new InventoryLocation;
+			deferred_force_swap_entities.m_item1.GetInventory().GetCurrentInventoryLocation(src1);
+			deferred_force_swap_entities.m_item2.GetInventory().GetCurrentInventoryLocation(src2);
+
+			DayZPlayer player = GetGame().GetPlayer();
+
+			if (LogManager.IsInventoryMoveLogEnable())
+			{
+				inventoryDebugPrint("[inv] I::FSwap(" + typename.EnumToString(InventoryMode, deferred_force_swap_entities.m_mode) + ") src1=" + InventoryLocation.DumpToStringNullSafe(src1) + " src2=" + InventoryLocation.DumpToStringNullSafe(src2) +  " dst1=" + InventoryLocation.DumpToStringNullSafe(deferred_force_swap_entities.m_dst1) + " dst2=" + InventoryLocation.DumpToStringNullSafe(deferred_force_swap_entities.m_dst2));
+			}
+
+			switch (deferred_force_swap_entities.m_mode)
+			{
+				case InventoryMode.PREDICTIVE:
+					if (CanForceSwapEntitiesEx(deferred_force_swap_entities.m_dst1.GetItem(),deferred_force_swap_entities.m_dst1,deferred_force_swap_entities.m_dst2.GetItem(), deferred_force_swap_entities.m_dst2))
+					{
+						InventoryInputUserData.SendInputUserDataSwap(src1, src2, deferred_force_swap_entities.m_dst1, deferred_force_swap_entities.m_dst2);
+						LocationSwap(src1, src2, deferred_force_swap_entities.m_dst1, deferred_force_swap_entities.m_dst2);
+					}
+					else
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryMoveLogEnable())
+						{
+							Debug.InventoryMoveLog("Can not force swap (PREDICTIVE) STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item1 = " + deferred_force_swap_entities.m_dst1.GetItem() + " item2 = " + deferred_force_swap_entities.m_dst2.GetItem() + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_force_swap_entities.m_dst2), "n/a" , "n/a", "ForceSwapEntities", GetDayZPlayerOwner().ToString());	
+						}
+						#endif						
+					}
+					break;
+
+				case InventoryMode.JUNCTURE:
+					if (CanForceSwapEntitiesEx(deferred_force_swap_entities.m_dst1.GetItem(),deferred_force_swap_entities.m_dst1,deferred_force_swap_entities.m_dst2.GetItem(), deferred_force_swap_entities.m_dst2))
+					{	
+						player.GetHumanInventory().AddInventoryReservationEx(deferred_force_swap_entities.m_item1, deferred_force_swap_entities.m_dst1, GameInventory.c_InventoryReservationTimeoutShortMS);
+						player.GetHumanInventory().AddInventoryReservationEx(deferred_force_swap_entities.m_item2, deferred_force_swap_entities.m_dst2, GameInventory.c_InventoryReservationTimeoutShortMS);
+				
+						InventoryInputUserData.SendInputUserDataSwap(src1, src2, deferred_force_swap_entities.m_dst1, deferred_force_swap_entities.m_dst2);
+					}
+					else
+					{
+						#ifdef DEVELOPER
+						if (LogManager.IsInventoryMoveLogEnable())
+						{
+							Debug.InventoryMoveLog("Can not force swap (JUNCTURE) STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp() + " item1 = " + deferred_force_swap_entities.m_dst1.GetItem() + " item2 = " + deferred_force_swap_entities.m_dst2.GetItem() + " dst=" + InventoryLocation.DumpToStringNullSafe(deferred_force_swap_entities.m_dst2), "n/a" , "n/a", "ForceSwapEntities", GetDayZPlayerOwner().ToString());	
+						}
+						#endif
+					}
+					break;
+
+				case InventoryMode.LOCAL:
+					break;
+
+				default:
+					Error("ForceSwapEntities - HandEvent - Invalid mode");
+			}
+		}
+	}
+	
+	static void SendServerHandEventViaJuncture (notnull DayZPlayer player, HandEventBase e)
+	{
+		if (GetGame().IsServer())
+		{
+			if (e.IsServerSideOnly())
+			{
+				Error("[syncinv] " + Object.GetDebugName(player) + " SendServerHandEventViaJuncture - called on server side event only, e=" + e.DumpToString());
+			}
+			
+			if (player.IsAlive())
+			{
+				InventoryLocation dst = e.GetDst();
+				InventoryLocation src = e.GetSrc();
+				if (src.IsValid() && dst.IsValid())
+				{
+					if (player.NeedInventoryJunctureFromServer(src.GetItem(), src.GetParent(), dst.GetParent()))
+					{
+						if (LogManager.IsSyncLogEnable())
+						{
+							syncDebugPrint("[syncinv] " + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " SendServerHandEventViaJuncture(" + typename.EnumToString(InventoryMode, InventoryMode.SERVER) + ") need juncture src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+						}
+
+						if (GetGame().AddInventoryJunctureEx(player, src.GetItem(), dst, true, GameInventory.c_InventoryReservationTimeoutMS))
+						{
+							if (LogManager.IsSyncLogEnable())
+							{
+								syncDebugPrint("[syncinv] " + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " SendServerHandEventViaJuncture(" + typename.EnumToString(InventoryMode, InventoryMode.SERVER) + ") got juncture");
+							}
+						}
+						else
+						{
+							if (LogManager.IsSyncLogEnable())
+							{
+								syncDebugPrint("[syncinv] " + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " SendServerHandEventViaJuncture(" + typename.EnumToString(InventoryMode, InventoryMode.SERVER) + ") !got juncture");
+							}
+						}
+					}
+	
+					if (LogManager.IsSyncLogEnable())
+					{
+						syncDebugPrint("[syncinv] " + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " SendServerHandEventViaJuncture(" + typename.EnumToString(InventoryMode, InventoryMode.SERVER) + " server hand event src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+					}
+
+					ScriptInputUserData ctx = new ScriptInputUserData;
+					InventoryInputUserData.SerializeHandEvent(ctx, e);
+					player.SendSyncJuncture(DayZPlayerSyncJunctures.SJ_INVENTORY, ctx);
+
+					if (LogManager.IsSyncLogEnable())
+					{
+						syncDebugPrint("[syncinv] " + Object.GetDebugName(player) + " STS = " + player.GetSimulationTimeStamp() + " store input for remote - SendServerHandEventViaJuncture(" + typename.EnumToString(InventoryMode, InventoryMode.SERVER) + " server hand event src=" + InventoryLocation.DumpToStringNullSafe(src) + " dst=" + InventoryLocation.DumpToStringNullSafe(dst));
+					}
+
+					//! Remote inputs are processed in sync juncture once performed on the server - this code below was executing the inventory command before the player simulation timeestamp for remotes which is illegal
+					//player.StoreInputForRemotes(ctx); // @TODO: is this right place? maybe in HandleInputData(server=true, ...)
+				}
+			}
+			else
+			{
+				Error("[syncinv] SendServerHandEventViaJuncture - called on dead player, juncture is for living only");
+			}
+		}
+	}
+
+	/**@fn			NetSyncCurrentStateID
+	 * @brief		Engine callback - network synchronization of FSM's state. not intended to direct use.
+	 **/
+	override void NetSyncCurrentStateID (int id)
+	{
+		super.NetSyncCurrentStateID(id);
+
+		GetDayZPlayerOwner().GetItemAccessor().OnItemInHandsChanged();
+	}
+
+	/**@fn			OnAfterStoreLoad
+	 * @brief		engine reaction to load from database
+	 *	originates in:
+	 *				engine - Person::BinLoad
+	 *				script - PlayerBase.OnAfterStoreLoad
+	 **/
+	override void OnAfterStoreLoad ()
+	{
+		GetDayZPlayerOwner().GetItemAccessor().OnItemInHandsChanged(true);
+	}
+
+	/**@fn			OnEventForRemoteWeapon
+	 * @brief		reaction of remote weapon to (common user/anim/...) event sent from server
+	 **/
+	bool OnEventForRemoteWeapon (ParamsReadContext ctx)
+	{
+		if (GetEntityInHands())
+		{
+			Weapon_Base wpn = Weapon_Base.Cast(GetEntityInHands());
+			if (wpn)
+			{
+				PlayerBase pb = PlayerBase.Cast(GetDayZPlayerOwner());
+
+				WeaponEventBase e = CreateWeaponEventFromContext(ctx);
+				if (pb && e)
+				{
+					pb.GetWeaponManager().SetRunning(true);
+		
+					if (LogManager.IsWeaponLogEnable())
+					{
+						fsmDebugSpam("[wpnfsm] " + Object.GetDebugName(wpn) + " recv event from remote: created event=" + e);
+					}
+					
+					if (e.GetEventID() == WeaponEventID.HUMANCOMMAND_ACTION_ABORTED)
+					{
+						wpn.ProcessWeaponAbortEvent(e);
+					}
+					else
+					{
+						wpn.ProcessWeaponEvent(e);
+					}
+					pb.GetWeaponManager().SetRunning(false);
+				}
+			}
+			else
+				Error("OnEventForRemoteWeapon - entity in hands, but not weapon. item=" + GetEntityInHands());
+		}
+		else
+			Error("OnEventForRemoteWeapon - no entity in hands");
+		return true;
+	}
+
+
+	/**@fn			OnHandEventForRemote
+	 * @brief		reaction of remote weapon to (common user/anim/...) event sent from server
+	 **/
+	bool OnHandEventForRemote (ParamsReadContext ctx)
+	{
+		HandEventBase e = HandEventBase.CreateHandEventFromContext(ctx);
+		if (e)
+		{
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				hndDebugSpam("[hndfsm] recv event from remote: created event=" + e);
+			}
+
+			//m_FSM.ProcessEvent(e);
+
+			if (e.GetEventID() == HandEventID.HUMANCOMMAND_ACTION_ABORTED)
+			{
+				ProcessEventResult aa;
+				m_FSM.ProcessAbortEvent(e, aa);
+			}
+			else
+			{
+				m_FSM.ProcessEvent(e);
+			}
+
+			return true;
+		}
+		return false;
+	}
+
+	void SyncHandEventToRemote (HandEventBase e)
+	{
+		DayZPlayer p = GetDayZPlayerOwner();
+		if (p && p.GetInstanceType() == DayZPlayerInstanceType.INSTANCETYPE_SERVER)
+		{
+			ScriptRemoteInputUserData ctx = new ScriptRemoteInputUserData;
+
+			ctx.Write(INPUT_UDT_HAND_REMOTE_EVENT);
+			e.WriteToContext(ctx);
+
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				hndDebugPrint("[hndfsm] send 2 remote: sending e=" + e + " id=" + e.GetEventID() + " p=" + p + "  e=" + e.DumpToString());
+			}
+
+			p.StoreInputForRemotes(ctx);
+		}
+	}
+	
+	override void OnHandsExitedStableState (HandStateBase src, HandStateBase dst)
+	{
+		super.OnHandsExitedStableState(src, dst);
+
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			hndDebugPrint("[hndfsm] hand fsm exit stable src=" + src.Type().ToString());
+		}
+	}
+	
+	override void OnHandsEnteredStableState (HandStateBase src, HandStateBase dst)
+	{
+		super.OnHandsEnteredStableState(src, dst);
+
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			hndDebugPrint("[hndfsm] hand fsm entered stable dst=" + dst.Type().ToString());
+		}
+	}
+	
+	override void OnHandsStateChanged (HandStateBase src, HandStateBase dst)
+	{
+		super.OnHandsStateChanged(src, dst);
+
+		if (LogManager.IsInventoryHFSMLogEnable())
+		{
+			hndDebugPrint("[hndfsm] hand fsm changed state src=" + src.Type().ToString() + " ---> dst=" + dst.Type().ToString());
+		}
+
+		if (src.IsIdle())
+			OnHandsExitedStableState(src, dst);
+		
+		if (dst.IsIdle())
+			OnHandsEnteredStableState(src, dst);
+
+#ifdef BOT
+		PlayerBase p = PlayerBase.Cast(GetDayZPlayerOwner());
+		if (p && p.m_Bot)
+		{
+			p.m_Bot.ProcessEvent(new BotEventOnItemInHandsChanged(p));
+		}
+#endif
+	}
+	
+	override bool HandEvent(InventoryMode mode, HandEventBase e)
+	{
+		if (!IsProcessing())
+		{
+			EntityAI itemInHands = GetEntityInHands();
+			
+			InventoryLocation handInventoryLocation();
+			handInventoryLocation.SetHands(GetInventoryOwner(), itemInHands);
+			
+			InventoryValidation validation();
+			if (e.CanPerformEventEx(validation))
+			{
+				m_DeferredEvent = new DeferredHandEvent(mode, e);
+				if (m_DeferredEvent.ReserveInventory(this))
+				{
+					return true;
+				}
+			}
+			
+			m_DeferredEvent = null;
+
+			//! Let the client know a failure happened
+			if (!GetGame().IsMultiplayer() || GetGame().IsClient())
+			{
+				//! If singleplayer or the client is executing this
+				OnInventoryFailure(InventoryCommandType.HAND_EVENT, validation.m_Reason, e.GetSrc(), e.GetDst());
+			}
+			else
+			{
+				ScriptInputUserData serializer();
+
+				InventoryInputUserData.SerializeHandEvent(serializer, e);
+				serializer.Write(validation.m_Reason);
+
+				GetDayZPlayerOwner().SendSyncJuncture(DayZPlayerSyncJunctures.SJ_INVENTORY_FAILURE, serializer);
+			}
+		}
+		
+		return false;
+	}
+	
+	
+	void HandleHandEvent(DeferredEvent deferred_event)
+	{
+		//! Default structure suffices
+		InventoryValidation validation();
+		
+		DeferredHandEvent deferred_hand_event = DeferredHandEvent.Cast(deferred_event);
+		if (deferred_hand_event)
+		{
+			#ifdef DEVELOPER
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{	
+				Debug.InventoryHFSMLog("STS = " + GetDayZPlayerOwner().GetSimulationTimeStamp(), "n/a" , "n/a", "HandleHandEvent", GetDayZPlayerOwner().ToString());
+			}
+			#endif
+			
+			if (LogManager.IsInventoryHFSMLogEnable())
+			{
+				hndDebugPrint("[inv] HumanInventory::HandEvent(" + typename.EnumToString(InventoryMode, deferred_hand_event.m_mode) + ") ev=" + deferred_hand_event.m_event.DumpToString());
+			}
+
+			switch (deferred_hand_event.m_mode)
+			{
+				case InventoryMode.PREDICTIVE:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("PREDICTIVE", "n/a" , "n/a", "HandleHandEvent", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+
+					deferred_hand_event.ClearInventoryReservation(this);
+					if (deferred_hand_event.m_event.CanPerformEventEx(validation))
+					{
+						InventoryInputUserData.SendInputUserDataHandEvent(deferred_hand_event.m_event);
+						ProcessHandEvent(deferred_hand_event.m_event);
+					}
+					break;
+
+				case InventoryMode.JUNCTURE:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("JUNCTURE", "n/a" , "n/a", "HandleHandEvent", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+
+					deferred_hand_event.ClearInventoryReservation(this);
+					if (deferred_hand_event.m_event.CanPerformEventEx(validation))
+					{
+						deferred_hand_event.ReserveInventory(this);
+						InventoryInputUserData.SendInputUserDataHandEvent(deferred_hand_event.m_event);
+					
+						//Functionality to prevent desync when two players perform interfering action at the same time
+						EntityAI itemSrc = deferred_hand_event.m_event.GetSrcEntity();
+						EntityAI itemDst = null;
+						if (deferred_hand_event.m_event.GetDst())
+							itemDst = deferred_hand_event.m_event.GetDst().GetItem();
+						if (itemSrc)
+							EnableMovableOverride(itemSrc);
+						if (itemDst)
+							EnableMovableOverride(itemDst);
+					}
+					break;
+
+				case InventoryMode.LOCAL:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("LOCAL", "n/a" , "n/a", "HandleHandEvent", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+
+					deferred_hand_event.ClearInventoryReservation(this);
+					ProcessHandEvent(deferred_hand_event.m_event);
+					//PostHandEvent(deferred_hand_event.m_event);
+					break;
+			
+				case InventoryMode.SERVER:
+					#ifdef DEVELOPER
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{	
+						Debug.InventoryHFSMLog("SERVER", "n/a" , "n/a", "HandleHandEvent", GetDayZPlayerOwner().ToString());
+					}
+					#endif
+
+					if (LogManager.IsInventoryHFSMLogEnable())
+					{
+						hndDebugPrint("[inv] DZPI::HandEvent(" + typename.EnumToString(InventoryMode, deferred_hand_event.m_mode) + ")");
+					}
+					
+					if (!deferred_hand_event.m_event.IsServerSideOnly())
+					{
+						if (GetDayZPlayerOwner().IsAlive())
+						{
+							SendServerHandEventViaJuncture(GetDayZPlayerOwner(), deferred_hand_event.m_event);
+						}
+						else
+						{
+							InventoryInputUserData.SendServerHandEventViaInventoryCommand(GetDayZPlayerOwner(), deferred_hand_event.m_event);
+						}
+					}
+					else
+					{
+						ProcessHandEvent(deferred_hand_event.m_event);
+					}
+					break;
+
+				default:
+					Error("HumanInventory::HandEvent - Invalid mode");
+			}
+		}
+	}
+	
+	override void HandleInventoryManipulation()
+	{
+		super.HandleInventoryManipulation();
+		if(m_DeferredEvent && ScriptInputUserData.CanStoreInputUserData() )
+		{
+			HandleHandEvent(m_DeferredEvent);
+			HandleTakeToDst(m_DeferredEvent);
+			HandleSwapEntities(m_DeferredEvent);
+			HandleForceSwapEntities(m_DeferredEvent);
+		
+			m_DeferredEvent = null;
+		}
+	}
+	
+	
+	
+	bool IsProcessing()
+	{
+		return !m_FSM.GetCurrentState().IsIdle() || m_DeferredEvent || m_DeferredPostedHandEvent;
+	}
+	
+	bool PlayerCheckRequestSrc ( notnull InventoryLocation src, float radius )
+	{
+		bool result = true;
+		
+		EntityAI ent = src.GetParent();
+		if ( ent )
+		{
+			PlayerBase player = PlayerBase.Cast(ent.GetHierarchyRootPlayer());
+			if (player)
+			{
+				if ( GetDayZPlayerOwner() != player )
+				{
+					if (player.IsAlive())
+					{
+						if (!player.IsRestrained() && !player.IsUnconscious())
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+		
+		if ( result )
+		{
+			result = CheckRequestSrc( GetManOwner(), src, radius);
+		}
+		
+		return result;
+	}
+
+	bool PlayerCheckRequestDst ( notnull InventoryLocation src, notnull InventoryLocation dst, float radius )
+	{
+		bool result = true;
+		
+		EntityAI ent = dst.GetParent();
+		if ( ent )
+		{
+			PlayerBase player = PlayerBase.Cast(ent.GetHierarchyRootPlayer());
+			if (player)
+			{
+				if ( GetDayZPlayerOwner() != player )
+				{
+					if (player.IsAlive())
+					{
+						if (!player.IsRestrained() && !player.IsUnconscious())
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+		
+		if ( result )
+		{
+			result = CheckMoveToDstRequest( GetManOwner(), src, dst, radius);
+		}
+		
+		return result;
+	}	
+	
+	bool PlayerCheckSwapItemsRequest( notnull InventoryLocation src1,  notnull InventoryLocation src2, notnull InventoryLocation dst1, notnull InventoryLocation dst2, float radius)
+	{
+		bool result = true;
+		
+		EntityAI ent = dst1.GetParent();
+		PlayerBase player;
+		if ( ent )
+		{
+			player = PlayerBase.Cast(ent.GetHierarchyRootPlayer());
+			if (player)
+			{
+				if ( GetDayZPlayerOwner() != player )
+				{
+					if (player.IsAlive())
+					{
+						if (!player.IsRestrained() && !player.IsUnconscious())
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+		
+		ent = dst2.GetParent();
+		if ( ent )
+		{
+			player = PlayerBase.Cast(ent.GetHierarchyRootPlayer());
+			if (player)
+			{
+				if ( GetDayZPlayerOwner() != player )
+				{
+					if (player.IsAlive())
+					{
+						if (!player.IsRestrained() && !player.IsUnconscious())
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+		
+		
+		if ( result )
+		{
+			result = CheckSwapItemsRequest( GetManOwner(), src1, src2, dst1, dst2, GameInventory.c_MaxItemDistanceRadius);
+		}
+		
+		return result;
+		
+	}
+	
+	bool PlayerCheckDropRequest ( notnull InventoryLocation src, float radius )
+	{
+		bool result = true;
+		
+		EntityAI ent = src.GetParent();
+		if ( ent )
+		{
+			PlayerBase player = PlayerBase.Cast(ent.GetHierarchyRootPlayer());
+			if (player)
+			{
+				if ( GetDayZPlayerOwner() != player )
+				{
+					if (player.IsAlive())
+					{
+						if (!player.IsRestrained() && !player.IsUnconscious())
+						{
+							return false;
+						}
+					}
+				}
+			}
+		}
+		
+		if ( result )
+		{
+			result = CheckDropRequest( GetManOwner(), src, radius);
+		}
+		
+		return result;
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/Inventory/EntityPlacementCallback.c b/scripts/4_World/DayZ/Systems/Inventory/EntityPlacementCallback.c
new file mode 100644
index 0000000000000000000000000000000000000000..0b6869141686fe08fb3e6488dab987a90a7e5966
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Inventory/EntityPlacementCallback.c
@@ -0,0 +1,161 @@
+class EntityPlacementCallback : ObjectSnapCallback
+{
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+	ref array<Shape> m_Shapes = new array<Shape>();
+#endif
+#endif
+
+	void EntityPlacementCallback()
+	{
+	}
+
+	void ~EntityPlacementCallback()
+	{
+		ClearDebugShapes();
+	}
+
+	void ClearDebugShapes()
+	{
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+		foreach (auto shape : m_Shapes)
+		{
+			shape.Destroy();
+			shape = null;
+		}
+		m_Shapes.Clear();
+#endif
+#endif
+	}
+
+	override void OnSetup()
+	{
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+		m_DebugEnabled = DiagMenu.GetBool(DiagMenuIDs.INVENTORY_ENTITY_PLACEMENT_CALLBACK_DEBUG);
+#endif
+#endif
+
+		ClearDebugShapes();
+
+		m_DirectionFunc[0] = 1.2;
+		m_DirectionFunc[1] = 0.3;
+
+		Human human;
+		if (Class.CastTo(human, m_Owner))
+		{
+			m_OwnerPosition = human.GetBonePositionWS(human.GetBoneIndexByName("Head"));
+			
+			HumanInputController hic = human.GetInputController();
+			if (hic)
+			{
+				float headingAngle = hic.GetHeadingAngle() + Math.PI_HALF;
+				m_OwnerDirection[0] = Math.Cos(headingAngle);
+				m_OwnerDirection[1] = 0.0;
+				m_OwnerDirection[2] = Math.Sin(headingAngle);
+				
+				m_OwnerDirection.Normalized();
+			}
+			else
+			{
+				m_OwnerDirection = human.GetDirection();
+			}
+		}
+		else if (m_Owner)
+		{
+			m_OwnerPosition = m_Owner.GetPosition();
+			m_OwnerDirection = m_Owner.GetDirection();
+		}
+	}
+
+	override void OnDebug(vector p0, vector p1, bool hasHit, bool found)
+	{
+#ifdef DIAG_DEVELOPER
+#ifndef SERVER
+		Shape shape;
+		
+		int alpha = 0x33000000;
+		int colour = 0x00FF0000;
+		if (!hasHit && found)
+		{
+			colour = 0x000000FF;
+		}
+		else if (!hasHit)
+		{
+			colour = 0x0000FF00;
+			alpha = 0x11000000;
+		}
+		
+		shape = Shape.Create(ShapeType.BBOX, colour | alpha, ShapeFlags.NOZBUFFER | ShapeFlags.TRANSP, -m_Extents, m_Extents);
+		shape.SetMatrix(m_Transform);
+		m_Shapes.Insert(shape);
+
+		vector p[2];
+		p[0] = p0;
+		p[1] = p1;
+		shape = Shape.CreateLines(colour | 0xFF000000, ShapeFlags.NOZBUFFER | ShapeFlags.TRANSP, p, 2);
+		m_Shapes.Insert(shape);
+#endif
+#endif
+	}
+
+	override bool OnFirstContact(Object other)
+	{
+		if (!other.IsTransport())
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	override bool OnQuery(Object other)
+	{
+		if (other.IsScenery())
+		{
+			return false;
+		}
+		
+		if (other.IsMan())
+		{
+			return false;
+		}
+
+		EntityAI entity;
+		if (Class.CastTo(entity, other))
+		{
+			if (entity.IsAnimal() || entity.IsZombie())
+			{
+				return false;
+			}
+		}
+		
+		if (other.GetCollisionRadius() < 0.05)
+		{
+			return false;
+		}
+
+		return true;
+	}
+
+	override bool OnCollide(Object other)
+	{		
+		if (other.IsScenery())
+		{
+			return false;
+		}
+		
+		if (other.IsMan())
+		{
+			return false;
+		}
+		
+		if (!other.CanObstruct() && !other.IsTransport())
+		{
+			return false;
+		}
+		
+		return true;
+	}
+};
diff --git a/scripts/4_World/DayZ/Systems/Inventory/ReplaceItemWithNewLambda.c b/scripts/4_World/DayZ/Systems/Inventory/ReplaceItemWithNewLambda.c
new file mode 100644
index 0000000000000000000000000000000000000000..400fa6d4a542674a78c0f7ed937b3faf2a0bc102
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/Inventory/ReplaceItemWithNewLambda.c
@@ -0,0 +1,43 @@
+/**@class		ReplaceItemWithNewLambda
+ * @brief		adds automatic QuickBar handling
+ **/
+class ReplaceItemWithNewLambda : ReplaceItemWithNewLambdaBase
+{
+	PlayerBase m_Player;
+	int m_IndexQB;
+
+	void ReplaceItemWithNewLambda(EntityAI old_item, string new_item_type, PlayerBase player)
+	{
+		m_Player = player;
+		m_IndexQB = -1;
+
+		if (m_Player)
+			m_IndexQB = m_Player.FindQuickBarEntityIndex(old_item);
+	}
+
+	/**@fn		CopyOldPropertiesToNew
+	 * @brief	copy properties from old object to the created one
+	 *
+	 * @NOTE:	This is supposed to be overriden in derived classes, like for example right now.
+	 **/
+	override void CopyOldPropertiesToNew(notnull EntityAI old_item, EntityAI new_item)
+	{
+		super.CopyOldPropertiesToNew(old_item, new_item);
+
+		if (m_Player && m_IndexQB != -1)
+		{
+			m_Player.SetQuickBarEntityShortcut(new_item, m_IndexQB, true);
+		}
+	}
+	
+	override void OnSuccess(EntityAI new_item)
+	{
+		super.OnSuccess(new_item);
+		
+		if (m_Player && m_IndexQB != -1)
+		{
+			m_Player.SetQuickBarEntityShortcut(new_item, m_IndexQB, true);
+		}
+	}
+};
+
diff --git a/scripts/4_World/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaBaseImpl.c b/scripts/4_World/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaBaseImpl.c
new file mode 100644
index 0000000000000000000000000000000000000000..1cb432e3dd3bf877125d6f7d235c40076a41c0e2
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaBaseImpl.c
@@ -0,0 +1,68 @@
+class UniversalTemperatureSourceLambdaBaseImpl : UniversalTemperatureSourceLambdaBase
+{
+	override void DryItemsInVicinity(UniversalTemperatureSourceSettings pSettings)
+	{
+		float distance;
+		array<Object> nearestObjects = new array<Object>();
+
+		vector pos = pSettings.m_Position;
+		if (pSettings.m_Parent != null)
+			pos = pSettings.m_Parent.GetPosition();
+
+		GetGame().GetObjectsAtPosition(pos, pSettings.m_RangeMax, nearestObjects, null);
+		foreach (Object nearestObject : nearestObjects)
+		{
+			ItemBase nearestItem = ItemBase.Cast(nearestObject);
+			//! heat transfer to items (no in player possession)
+			if (nearestItem && nearestItem.HasWetness() && nearestItem != pSettings.m_Parent && !nearestItem.IsInherited(Man))
+			{
+				distance = vector.Distance(nearestItem.GetPosition(), pSettings.m_Position);
+				distance = Math.Max(distance, 0.1);	//min distance cannot be 0 (division by zero)
+				
+				float dryModifier = 0;				
+				
+				if (nearestItem.GetWet() >= GameConstants.STATE_DAMP)
+				{
+					dryModifier = (-1 * pSettings.m_UpdateInterval * nearestItem.GetDryingIncrement("groundHeatSource")) / distance;
+					Math.Clamp(dryModifier, nearestItem.GetWetMin(), nearestItem.GetWetMax());
+					nearestItem.AddWet(dryModifier);
+				}
+				
+				array<EntityAI> cargoEntities = new array<EntityAI>();
+				nearestItem.GetInventory().EnumerateInventory(InventoryTraversalType.INORDER, cargoEntities);
+				foreach (EntityAI cargoEntity : cargoEntities)
+				{
+					ItemBase cargoItem = ItemBase.Cast(cargoEntity);
+					if (cargoItem)
+					{
+						dryModifier = 0;
+						if (cargoItem.GetWet() >= GameConstants.STATE_DAMP)
+						{
+							dryModifier = (-1 * pSettings.m_UpdateInterval * cargoItem.GetDryingIncrement("groundHeatSource")) / distance;
+							Math.Clamp(dryModifier, cargoItem.GetWetMin(), cargoItem.GetWetMax());
+							cargoItem.AddWet(dryModifier);
+						}
+					}
+				}
+			}
+		}
+	}
+}
+
+class UniversalTemperatureSourceLambdaConstant : UniversalTemperatureSourceLambdaBaseImpl
+{
+	override void Execute(UniversalTemperatureSourceSettings pSettings, UniversalTemperatureSourceResult resultValues)
+	{
+		resultValues.m_Temperature = pSettings.m_TemperatureMax;
+		
+		DryItemsInVicinity(pSettings);
+	}
+}
+
+class UniversalTemperatureSourceLambdaEngine : UniversalTemperatureSourceLambdaBase
+{
+	override void Execute(UniversalTemperatureSourceSettings pSettings, UniversalTemperatureSourceResult resultValues)
+	{
+		resultValues.m_Temperature = pSettings.m_TemperatureMax;
+	}
+}
diff --git a/scripts/4_World/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaFireplace.c b/scripts/4_World/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaFireplace.c
new file mode 100644
index 0000000000000000000000000000000000000000..d6a20b85fb687a838ec2455b014b9baa39cac70b
--- /dev/null
+++ b/scripts/4_World/DayZ/Systems/UniversalTemperatureSource/UniversalTemperatureSourceLambdaFireplace.c
@@ -0,0 +1,59 @@
+class UniversalTemperatureSourceLambdaFireplace : UniversalTemperatureSourceLambdaBaseImpl
+{
+	int m_FuelCount;
+	int m_SmallFireplaceTemperatureMax;
+	int m_NormalFireplaceTemperatureMax;
+	float m_Temperature;
+
+	void UniversalTemperatureSourceLambdaFireplace()
+	{
+		m_FuelCount							= 0;
+		m_SmallFireplaceTemperatureMax		= 0;
+		m_NormalFireplaceTemperatureMax		= 0;
+		m_Temperature						= 0;
+	}
+	
+	void SetSmallFireplaceTemperatureMax(int value)
+	{
+		m_SmallFireplaceTemperatureMax = value;
+	}
+	
+	void SetNormalFireplaceTemperatureMax(int value)
+	{
+		m_NormalFireplaceTemperatureMax = value;
+	}
+	
+	void SetFuelCount(int value)
+	{
+		m_FuelCount = value;
+	}
+	
+	void SetCurrentTemperature(float temperature)
+	{
+		//no fuel present, temperature should be low but there can be high temperature from previous fuel burning
+		if (m_FuelCount == 0 || temperature <= m_SmallFireplaceTemperatureMax)
+		{
+			temperature = Math.Clamp(temperature, 0, m_SmallFireplaceTemperatureMax); //small fire
+		}
+		else
+		{
+			temperature = Math.Clamp(temperature, 0, m_NormalFireplaceTemperatureMax); //normal fire
+		}
+		
+		m_Temperature = temperature;
+	}
+
+	override void Execute(UniversalTemperatureSourceSettings pSettings, UniversalTemperatureSourceResult resultValues)
+	{
+		resultValues.m_Temperature = m_Temperature;
+		//Debug.Log(string.Format("Execute: temperature: %1", resultValues.m_Temperature), "UTS Fireplace");
+		
+		if (pSettings.m_AffectStat)
+		{
+			//! set temperature to the item stat
+			pSettings.m_Parent.SetTemperature(m_Temperature);
+		}
+		
+		DryItemsInVicinity(pSettings);
+	}
+}
diff --git a/scripts/4_World/DayZ/entities.c b/scripts/4_World/DayZ/entities.c
new file mode 100644
index 0000000000000000000000000000000000000000..211e15aea656223ce97606eca518e844a83e2bb1
--- /dev/null
+++ b/scripts/4_World/DayZ/entities.c
@@ -0,0 +1,30 @@
+// Include c ---------------
+// #include "Scripts/Entities/scriptedEntities.c"
+
+// Include h (temporal) ---------------
+// #include "Scripts/Entities/Game/Super/InventoryItem.c"
+// #include "Scripts/Entities/Core/Inherited/InventoryItem.c"
+
+// #include "Scripts/Entities/Game/Super/Man.c"
+// #include "Scripts/Entities/Core/Inherited/Man.c"
+
+// #include "Scripts/Entities/Game/Super/LightAI.c"
+// #include "Scripts/Entities/Core/Inherited/LightAI.c"
+
+// #include "Scripts/Entities/Core/Inherited/Building.c"
+
+// #include "Scripts/Entities/Game/Super/Plant.c"
+// #include "Scripts/Entities/Core/Inherited/Plant.c"
+
+// #include "Scripts/Entities/Game/Super/Building.c"
+
+// #include "Scripts/Static/_Includes.c"
+
+// Include c 2 ---------------
+
+
+// #include "Scripts/Classes/_Includes.c"
+// #include "Scripts/Modules/PluginManager.c"
+
+// #include "Scripts/Entities/_Includes.c"
+
diff --git a/scripts/5_Mission/DayZ/DayZIntroScene.c b/scripts/5_Mission/DayZ/DayZIntroScene.c
new file mode 100644
index 0000000000000000000000000000000000000000..780969afa6dd3e3e60a56dd9231cb6547575e4e9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/DayZIntroScene.c
@@ -0,0 +1,178 @@
+class DayZIntroScene : Managed
+{
+	protected ref IntroSceneCharacter	m_Character;
+	protected Camera 					m_Camera;
+	protected vector 					m_CameraTrans[4];
+	protected vector 					m_CharacterPos;
+	protected vector 					m_CharacterRot;
+	protected Weather					m_Weather;	
+	protected vector 					m_Target;
+
+	protected ref OptionsMenu	m_OptionsMenu;
+
+	void DayZIntroScene()
+	{
+		string root_path = "cfgCharacterScenes " + g_Game.GetWorldName();
+		
+		int count = g_Game.ConfigGetChildrenCount(root_path);
+		int index = Math.RandomInt(0, count - 1);
+		string childName;
+		g_Game.ConfigGetChildName(root_path, index, childName);
+	
+		string scene_path = root_path + " " + childName;
+		m_Target = SwapYZ(g_Game.ConfigGetVector(scene_path + " target"));
+		vector position = SwapYZ(g_Game.ConfigGetVector(scene_path + " position"));
+		TIntArray date = new TIntArray;
+		TFloatArray storm = new TFloatArray;
+		g_Game.ConfigGetIntArray(scene_path + " date", date);
+		float fov = g_Game.ConfigGetFloat(scene_path + " fov");
+		float overcast = g_Game.ConfigGetFloat(scene_path + " overcast");
+		float rain = g_Game.ConfigGetFloat(scene_path + " rain");
+		float fog = g_Game.ConfigGetFloat(scene_path + " fog");
+		float windspeed = -1;
+		if ( g_Game.ConfigIsExisting(scene_path + " windspeed") ) 	windspeed = g_Game.ConfigGetFloat(scene_path + " windspeed");
+		g_Game.ConfigGetFloatArray(scene_path + " storm", storm);
+		
+		World world = g_Game.GetWorld();
+	
+		if (world && date.Count() >= 5)
+		{
+			world.SetDate(date.Get(0), date.Get(1), date.Get(2), date.Get(3), date.Get(4));
+		}
+	
+		GetGame().ObjectDelete( m_Camera );
+		Class.CastTo(m_Camera, g_Game.CreateObject("staticcamera", SnapToGround(position), true)); //Vector(position[0] , position[1] + 1, position[2])
+		
+		Math3D.MatrixIdentity4(m_CameraTrans);
+		
+		if (m_Camera)
+		{
+			//m_Camera.SetPosition(Vector(m_Camera.GetPosition()[0],m_Camera.GetPosition()[1]+0,m_Camera.GetPosition()[2]));
+			m_Camera.LookAt(m_Target);
+			m_Camera.SetFOV(fov);
+			m_Camera.SetFocus(5.0, 0.0); //5.0, 1.0
+			
+			m_Camera.SetActive(true);
+			
+			Math3D.DirectionAndUpMatrix(m_Target - SnapToGround(position), "0 1 0", m_CameraTrans);
+			m_CameraTrans[3] = m_Camera.GetPosition();
+			m_CharacterPos = Vector(0.685547, -0.988281, 3.68823).Multiply4(m_CameraTrans);
+
+			float pos_x = m_CharacterPos[0];
+			float pos_z = m_CharacterPos[2];
+			float pos_y = GetGame().SurfaceY(pos_x, pos_z);
+			vector ground_demo_pos = Vector(pos_x, pos_y, pos_z);
+			m_CharacterPos = ground_demo_pos;
+
+			vector to_cam_dir = m_Camera.GetPosition() - m_CharacterPos;
+			m_CharacterRot[0] = Math.Atan2(to_cam_dir[0], to_cam_dir[2]) * Math.RAD2DEG;
+		}
+		
+		m_Weather = g_Game.GetWeather();
+		m_Weather.GetOvercast().SetLimits( overcast, overcast );
+		m_Weather.GetRain().SetLimits( rain, rain );
+		m_Weather.GetFog().SetLimits( fog, fog );
+		
+		m_Weather.GetOvercast().Set( overcast, 0, 0);
+		m_Weather.GetRain().Set( rain, 0, 0);
+		m_Weather.GetFog().Set( fog, 0, 0);
+		
+		if ( storm.Count() == 3 )
+		{
+			m_Weather.SetStorm(storm.Get(0),storm.Get(1),storm.Get(2));
+		}
+		
+		if ( windspeed != -1 )
+		{
+			m_Weather.SetWindSpeed(windspeed);
+			m_Weather.SetWindMaximumSpeed(windspeed);
+			m_Weather.SetWindFunctionParams(1,1,1);
+		}
+		
+		m_Character = new IntroSceneCharacter();
+		m_Character.LoadCharacterData(m_CharacterPos, m_CharacterRot);
+		
+		PPEffects.Init(); //Deprecated, left in for legacy purposes only
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(SetInitPostprocesses);
+	}
+	
+	void ~DayZIntroScene()
+	{
+		if (PPEManagerStatic.GetPPEManager())
+			PPEManagerStatic.GetPPEManager().StopAllEffects(PPERequesterCategory.ALL);
+	}
+	
+	//==============================================
+	// GetIntroSceneCharacter
+	//==============================================
+	IntroSceneCharacter GetIntroCharacter()
+	{
+		return m_Character;
+	}
+	
+	//==============================================
+	// GetIntroCamera
+	//==============================================
+	Camera GetIntroCamera()
+	{
+		return m_Camera;
+	}
+	
+	//==============================================
+	// ResetIntroCamera
+	//==============================================
+	void ResetIntroCamera()
+	{
+		if ( GetIntroCharacter().GetCharacterObj() )
+		{
+			GetIntroCamera().LookAt( GetIntroCharacter().GetPosition() + Vector( 0, 1, 0 ) );
+			//GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater( SceneCharacterSetPos, 250 );			
+		}
+	}
+	
+	//! Since this can get created at the same time as DayZGame, non-static postprocesses need to be deffered 
+	protected void SetInitPostprocesses()
+	{
+		PPERequesterBank.GetRequester(PPERequester_BurlapSackEffects).Stop();
+	}
+	
+	protected void GetSelectedUserName()
+	{
+		string name;
+		BiosUserManager user_manager = GetGame().GetUserManager();
+		if( user_manager )
+		{
+			BiosUser user = user_manager.GetSelectedUser();
+			if( user )
+			{
+				g_Game.SetPlayerGameName( user.GetName() );
+				return;
+			}
+		}
+		g_Game.SetPlayerGameName(GameConstants.DEFAULT_CHARACTER_NAME);
+	}
+	
+	// ------------------------------------------------------------
+	protected vector SwapYZ(vector vec)
+	{
+		vector tmp;
+		tmp[0] = vec[0];
+		tmp[1] = vec[2];
+		tmp[2] = vec[1];
+	
+		return tmp;
+	}
+	
+	// ------------------------------------------------------------
+	protected vector SnapToGround(vector pos)
+	{
+		float pos_x = pos[0];
+		float pos_z = pos[2];
+		float pos_y = GetGame().SurfaceY(pos_x, pos_z);
+		vector tmp_pos = Vector(pos_x, pos_y, pos_z);
+		tmp_pos[1] = tmp_pos[1] + pos[1];
+	
+		return tmp_pos;
+	}
+};
diff --git a/scripts/5_Mission/DayZ/DayZIntroScenePC.c b/scripts/5_Mission/DayZ/DayZIntroScenePC.c
new file mode 100644
index 0000000000000000000000000000000000000000..3780eb01780d16338a581f03a7e45f5a2e3c75ca
--- /dev/null
+++ b/scripts/5_Mission/DayZ/DayZIntroScenePC.c
@@ -0,0 +1,113 @@
+class DayZIntroScenePC : DayZIntroScene
+{
+	protected bool		m_EnableClick;
+	protected bool 		m_RotatingCharacter;
+	protected int 		m_RotatingCharacterMouseX;
+	protected int 		m_RotatingCharacterMouseY;
+	protected float 	m_RotatingCharacterRot;
+	protected float 	m_Radius;
+	protected float 	m_Radius_original;
+	protected float 	m_DiffX;
+	protected float 	m_DeltaX;
+	protected float 	m_DeltaZ;
+	protected float 	m_Angle;
+	protected float 	m_Angle_offset = 0;
+	protected float 	m_NewX = 0;
+	protected float 	m_NewZ = 0;
+	protected float 	m_BlurValue;
+
+	protected ref OptionsMenu m_optmenu;
+
+	// ------------------------------------------------------------
+	void DayZIntroScenePC()
+	{
+		SetClickEnable( true );
+
+		m_DeltaX = Math.AbsFloat(m_CharacterPos[0] - m_Camera.GetPosition()[0]);
+		m_DeltaZ = Math.AbsFloat(m_CharacterPos[2] - m_Camera.GetPosition()[2]);
+		
+		if (!m_Radius || m_Radius == 0)
+		{
+			m_Radius = Math.Sqrt (Math.Pow(m_DeltaX, 2) + Math.Pow(m_DeltaZ, 2));
+			m_Radius_original = m_Radius;
+		}
+	}
+	
+	protected override void SetInitPostprocesses()
+	{
+		super.SetInitPostprocesses();
+		
+		PPERequester_MenuEffects requester;
+		Class.CastTo(requester,PPERequesterBank.GetRequester(PPERequester_MenuEffects));
+		
+		requester.SetVignetteIntensity(0.5);
+	}
+
+	// ------------------------------------------------------------
+	void SetClickEnable( bool enable )
+	{
+		m_EnableClick = enable;
+	}
+	
+	// ------------------------------------------------------------
+	bool IsClickEnabled()
+	{
+		return m_EnableClick;
+	}
+	
+	// ------------------------------------------------------------
+	void CharacterRotationStart()
+	{
+		m_RotatingCharacter = true;
+		GetMousePos(m_RotatingCharacterMouseX, m_RotatingCharacterMouseY);
+		
+		if (m_Character) 
+		{
+			m_RotatingCharacterRot = m_CharacterRot[0];
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void CharacterRotationStop()
+	{
+		if (m_RotatingCharacter)
+		{
+			m_RotatingCharacter = false;
+		}
+	}
+	
+	// ------------------------------------------------------------
+	bool IsRotatingCharacter()
+	{
+		return m_RotatingCharacter;
+	}
+	
+	// ------------------------------------------------------------
+	void CharacterRotate()
+	{
+		if (m_Character && m_Character.GetCharacterObj())
+		{
+			int actual_mouse_x;
+			int actual_mouse_y;
+			float coef;
+			GetMousePos(actual_mouse_x, actual_mouse_y);
+		
+			m_DiffX = m_RotatingCharacterMouseX - actual_mouse_x;
+			
+			coef = ( m_RotatingCharacterRot + (m_DiffX * 0.5) ) / 360;
+			coef = coef - Math.Floor(coef);
+			m_CharacterRot[0] = coef * 360;
+			
+			m_Character.GetCharacterObj().SetOrientation(m_CharacterRot);
+		}
+	}
+	
+	// ------------------------------------------------------------
+	void Update()
+	{
+		if (m_Character && m_RotatingCharacter)
+		{
+			CharacterRotate();
+		}
+	}		
+};
diff --git a/scripts/5_Mission/DayZ/DayZIntroSceneXbox.c b/scripts/5_Mission/DayZ/DayZIntroSceneXbox.c
new file mode 100644
index 0000000000000000000000000000000000000000..21ad7c4cffe5c300f45c4845133524c37254c6ee
--- /dev/null
+++ b/scripts/5_Mission/DayZ/DayZIntroSceneXbox.c
@@ -0,0 +1,367 @@
+class DayZIntroSceneXbox: Managed
+{
+	protected bool m_IsCharFemale;
+	protected int m_LastPlayedCharacterID;
+	
+	protected ref TStringArray 	m_genderList;
+	protected ref TStringArray 	m_CharPersonalityMaleList;
+	protected ref TStringArray 	m_CharPersonalityFemaleList;
+	protected ref TStringArray 	m_CharShirtList;
+	protected ref TStringArray 	m_CharPantsList;
+	protected ref TStringArray 	m_CharShoesList;
+	protected ref TStringArray	m_AllCharacters;
+	
+	protected ref IntroSceneCharacter	m_Character;
+	protected Camera					m_SceneCamera;
+	protected Weather					m_Weather;
+	protected Object					m_Clutter;
+	protected vector					m_CharacterPos;
+	protected vector					m_CharacterDir;
+	protected ref TIntArray				m_Date = new TIntArray;
+
+	protected MenuData					m_MenuData;
+	
+	protected ref MenuCarEngineSmoke	m_FXParticleCarSmoke;
+	protected ref MenuEvaporation		m_FXParticleStreamLeft;
+	protected ref MenuEvaporation		m_FXParticleStreamRight;
+	
+	ref Timer m_TimerUpdate = new Timer( CALL_CATEGORY_GAMEPLAY );
+	ref Timer m_TimerParticle = new Timer( CALL_CATEGORY_GAMEPLAY );
+	ref Timer m_TimerDate = new Timer( CALL_CATEGORY_GAMEPLAY );
+	ref Timer m_TimerClientUpdate = new Timer( CALL_CATEGORY_GAMEPLAY );
+
+	//==================================
+	// DayZIntroSceneXbox
+	//==================================
+	void DayZIntroSceneXbox()
+	{
+		m_MenuData = g_Game.GetMenuData();
+		
+		m_LastPlayedCharacterID = m_MenuData.GetLastPlayedCharacter();
+		m_CharacterPos = "0 0 0";
+		m_CharacterDir = "0 0 0";
+		
+		//g_Game.m_PlayerName = "Survivor"; //default
+		if ( m_MenuData.GetCharactersCount() == 0 )
+		{
+			m_LastPlayedCharacterID = -1;
+		}
+		
+		if ( m_LastPlayedCharacterID > -1 )
+		{
+			m_MenuData.GetCharacterName(m_LastPlayedCharacterID, g_Game.GetPlayerGameName());
+		}
+	
+		// Camera Setup
+		vector camera_position;
+		camera_position[0] 			= 1323.0;	// X
+		camera_position[1] 			= 1.0;		// Y
+		camera_position[2] 			= 1590.37;	// Z
+		float camera_rotation_h		= 100;
+		float camera_rotation_v		= -3;
+		float camera_fov			= 0.85;
+		float camera_focus_distance	= 0.0;
+		float camera_focus_streght	= 0.0;
+		
+		// Character
+		float character_distance = 2.25;
+		
+		// Camera Setup
+		m_SceneCamera = CameraCreate(camera_position, camera_rotation_h, camera_rotation_v, camera_fov, camera_focus_distance, camera_focus_streght);
+		m_SceneCamera.SetActive(true);
+		
+		PPEffects.Init(); //Deprecated, left in for legacy purposes only
+		
+		// Character Setup
+		vector cam_dir = m_SceneCamera.GetDirection();
+		m_CharacterPos = camera_position + ( cam_dir * character_distance );
+		m_CharacterPos[1] = GetGame().SurfaceY(m_CharacterPos[0], m_CharacterPos[2]);
+		m_CharacterDir = (camera_position - m_CharacterPos);
+		
+		float overcast = 0.42;
+		float rain = 0.0;
+		float fog = 0.0;
+
+		m_Weather = g_Game.GetWeather();
+		m_Weather.GetOvercast().SetLimits(overcast, overcast);
+		m_Weather.GetRain().SetLimits(rain, rain);
+		m_Weather.GetFog().SetLimits(fog, fog);
+		
+		m_Weather.GetOvercast().Set(overcast, 0, 0);
+		m_Weather.GetRain().Set(rain, 0, 0);
+		m_Weather.GetFog().Set(fog, 0, 0);
+		
+		m_Character = new IntroSceneCharacter();
+		m_Character.LoadCharacterData(m_CharacterPos, m_CharacterDir);
+		
+		m_TimerParticle.Run(0.1, this, "SetupParticles", null, false);
+		//m_TimerDate.Run(2.0, this, "SetupDate", null, false);
+		m_TimerUpdate.Run(0.5, this, "SetupCharacter", null, true);
+		
+		vector clut_pos = SnapToGround( m_CharacterPos + "-1 0 0" );
+		m_Clutter = GetGame().CreateObject( "ClutterCutter2x2", clut_pos, true );
+		
+		// Xbox check update
+		CheckXboxClientUpdateLoopStart();
+		
+		g_Game.SetHudBrightness(g_Game.GetHUDBrightnessSetting());
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(SetInitPostprocesses);
+	}
+	
+	void ~DayZIntroSceneXbox()
+	{
+		if ( m_TimerUpdate )
+		{
+			m_TimerUpdate.Stop();
+			delete m_TimerUpdate;
+			m_TimerUpdate = null;
+		}
+		
+		if ( m_TimerParticle )
+		{
+			m_TimerParticle.Stop();
+			delete m_TimerParticle;
+			m_TimerParticle = null;
+		}
+		
+		
+		if ( m_TimerDate )
+		{
+			m_TimerDate.Stop();
+			delete m_TimerDate;
+			m_TimerDate = null;
+		}
+		
+		CheckXboxClientUpdateLoopStop();
+		
+		GetGame().ObjectDelete( m_SceneCamera );
+		
+		if ( m_MenuData )
+		{
+			m_MenuData.ClearCharacters();
+		}
+		
+		SEffectManager.DestroyEffect(m_FXParticleCarSmoke);
+		SEffectManager.DestroyEffect(m_FXParticleStreamLeft);
+		SEffectManager.DestroyEffect(m_FXParticleStreamRight);
+		
+		PPEManagerStatic.GetPPEManager().StopAllEffects(PPERequesterCategory.ALL);
+	}
+	
+	protected void SetInitPostprocesses()
+	{
+		PPERequester_MenuEffects requester;
+		Class.CastTo(requester,PPERequesterBank.GetRequester(PPERequester_MenuEffects));
+		
+		requester.SetVignetteIntensity(0.3);
+		PPERequesterBank.GetRequester(PPERequester_IntroChromAbb).Start();
+	}
+	
+	//==============================================
+	// GetIntroSceneCharacter
+	//==============================================
+	IntroSceneCharacter GetIntroCharacter()
+	{
+		return m_Character;
+	}
+	
+	//==================================
+	// SetupCharacter
+	//==================================
+	void SetupCharacter()
+	{
+		if ( m_Character.GetCharacterObj() )
+		{
+			vector v = m_Character.GetCharacterObj().GetOrientation();
+			v[0] = -75;
+			m_Character.GetCharacterObj().SetOrientation(v);
+		}
+	}
+	
+	//==================================
+	// SetupParticles
+	//==================================
+	void SetupParticles()
+	{
+		m_FXParticleCarSmoke = new MenuCarEngineSmoke();
+		//SEffectManager.PlayInWorld(m_FXParticleCarSmoke, "1330.36 2.11628 1594.31");
+		//SEffectManager.PlayInWorld(m_FXParticleCarSmoke, "1333.88 1.51392 1594.88");
+		SEffectManager.PlayInWorld(m_FXParticleCarSmoke, "1331.52 2.34052 1593.55");
+		
+		vector pos = m_SceneCamera.GetPosition() + m_SceneCamera.GetDirection() * 1.5;
+		vector dir = m_SceneCamera.GetDirection();
+		float temp = dir[0];
+		dir[0] = dir[2];
+		dir[2] = -temp;
+			
+		vector pos_right = pos + (dir * 1.5);
+		vector pos_left = pos + (-dir * 1.5);
+		
+		m_FXParticleStreamLeft = new MenuEvaporation();
+		SEffectManager.PlayInWorld(m_FXParticleStreamLeft, pos_right);
+		
+		m_FXParticleStreamRight = new MenuEvaporation();
+		SEffectManager.PlayInWorld(m_FXParticleStreamRight, pos_left);
+	}
+	
+	//==================================
+	// SetupDate
+	//==================================
+	void SetupDate()
+	{
+		//g_Game.GetWorld().SetDate(m_Date.Get(0), m_Date.Get(1), m_Date.Get(2), m_Date.Get(3), m_Date.Get(4));
+		//g_Game.GetWorld().SetDate(2020, 10, 15, 18, 20);
+	}
+	
+	//==================================
+	// CheckXboxClientUpdateLoopStart
+	//==================================
+	void CheckXboxClientUpdateLoopStart()
+	{
+		if ( CheckXboxClientUpdate() )
+		{
+			m_TimerClientUpdate.Run(30, this, "CheckXboxClientUpdate", null, true);
+		}
+	}
+	
+	//==================================
+	// CheckXboxClientUpdateLoopStop
+	//==================================
+	void CheckXboxClientUpdateLoopStop()
+	{
+		if ( m_TimerClientUpdate )
+		{
+			m_TimerClientUpdate.Stop();
+			delete m_TimerClientUpdate;
+			m_TimerClientUpdate = null;
+		}
+	}
+	
+	//==================================
+	// CheckXboxClientUpdate
+	//==================================
+	bool CheckXboxClientUpdate()
+	{
+		return OnlineServices.CheckUpdate();
+	}
+	
+	//==================================
+	// CameraCreate
+	//==================================
+	protected Camera CameraCreate(vector cam_pos, float cam_rot_h, float cam_rot_v, float cam_fov, float cam_focus_dist, float cam_focus_strg)
+	{
+		Camera cam = Camera.Cast( g_Game.CreateObject("staticcamera", SnapToGround(cam_pos), true));
+		cam.SetOrientation( Vector( cam_rot_h, cam_rot_v, 0) );
+		cam.SetFOV( cam_fov );
+		cam.SetFocus(cam_focus_dist, cam_focus_strg);
+		
+		return cam;
+	}
+	
+	//==================================
+	// GetCamera
+	//==================================
+	Camera GetCamera()
+	{
+		return m_SceneCamera;
+	}
+	
+	//==================================
+	// ResetIntroCamera
+	//==================================
+	void ResetIntroCamera()
+	{
+		
+	}
+	
+	//==================================
+	// SetCharacterFemale
+	//==================================
+	void SetCharacterFemale(bool fem)
+	{
+		m_IsCharFemale = fem;
+	}
+	
+	//==================================
+	// IsCharacterFemale
+	//==================================
+	bool IsCharacterFemale()
+	{
+		return m_IsCharFemale;
+	}
+	
+	//==================================
+	// CreateRandomCharacter
+	//==================================
+	void CreateRandomCharacter()
+	{
+		string character_name;
+		string params[2];
+		
+		m_IsCharFemale = Math.RandomInt(0, 2);
+		
+		if (m_IsCharFemale)
+		{
+			character_name = m_CharPersonalityFemaleList.GetRandomElement();
+		}
+		else
+		{
+			character_name = m_CharPersonalityMaleList.GetRandomElement();
+		}
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(UpdateCharacterPos, 250);
+	}
+	
+	void UpdateSelectedUserName()
+	{
+		string name;
+		BiosUserManager user_manager = GetGame().GetUserManager();
+		if( user_manager )
+		{
+			BiosUser user = user_manager.GetSelectedUser();
+			if( user )
+			{
+				g_Game.SetPlayerGameName( user.GetName() );
+				return;
+			}
+		}
+		g_Game.SetPlayerGameName(GameConstants.DEFAULT_CHARACTER_NAME);
+	}
+	
+	void UpdateCharacterPos()
+	{
+		if (m_Character.GetCharacterObj())
+		{
+			m_Character.GetCharacterObj().SetPosition(m_CharacterPos);
+			m_Character.GetCharacterObj().SetDirection(m_CharacterDir.Normalized() );
+		}
+	}
+	
+	void SaveCharName( string name )
+	{
+		GetDayZGame().InitCharacterMenuDataInfo(m_MenuData.GetCharactersCount());
+		
+		//if (!GetDayZGame().IsNewCharacter() && m_LastPlayedCharacterID > -1)
+		//{
+			m_MenuData.SetCharacterName(m_LastPlayedCharacterID, name);			
+		//}
+		if (m_Character.IsDefaultCharacter())
+		{
+			GetGame().GetMenuDefaultCharacterData().SetCharacterName(name);
+		}
+		m_MenuData.SaveCharactersLocal();
+	}
+	
+	// ------------------------------------------------------------
+	vector SnapToGround(vector pos)
+	{
+		float pos_x = pos[0];
+		float pos_z = pos[2];
+		float pos_y = GetGame().SurfaceY(pos_x, pos_z);
+		vector tmp_pos = Vector(pos_x, pos_y, pos_z);
+		tmp_pos[1] = tmp_pos[1] + pos[1];
+	
+		return tmp_pos;
+	}
+};
diff --git a/scripts/5_Mission/DayZ/GUI/ActionMenu.c b/scripts/5_Mission/DayZ/GUI/ActionMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..963f7530ec52a97edf901746eba71cdf66ce7642
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ActionMenu.c
@@ -0,0 +1,179 @@
+class ActionMenu
+{
+	private const float FADE_IN_TIME = 0.3;
+	private const float FADE_OUT_TIME = 0.3;
+	private const float HIDE_MENU_TIME = 5;
+
+	private ref WidgetFadeTimer m_FadeTimer;
+	private ref array<TextWidget> m_actionItems;
+	private TextWidget m_defaultActionWidget;
+	private Widget m_actionsPanelWidget;
+	private ref Timer m_hide_timer;
+	
+	private bool m_visible;
+
+	void ActionMenu()
+	{
+		m_actionItems = new array<TextWidget>;
+		m_FadeTimer = new WidgetFadeTimer;
+		m_hide_timer = new Timer(CALL_CATEGORY_GUI);
+		m_visible = false;
+	}
+
+	void Init(Widget actions_panel_widget, TextWidget default_action_widget)
+	{
+		m_defaultActionWidget = default_action_widget;
+		m_actionsPanelWidget = actions_panel_widget;
+		m_actionItems.Clear();
+		int i = 0;
+		TextWidget w = TextWidget.Cast( m_actionsPanelWidget.FindAnyWidget("ActionListItem" + i.ToString()) );
+
+		while (w)
+		{
+			m_actionItems.Insert(w);
+			w.Show(false);
+			i++;
+			w = TextWidget.Cast( m_actionsPanelWidget.FindAnyWidget("ActionListItem" + i.ToString()) );
+		}
+
+		m_defaultActionWidget.Show(false);
+		m_actionsPanelWidget.Show(true);
+		m_actionsPanelWidget.SetAlpha(0);
+	}
+	
+	void UpdateWidgets()
+	{
+#ifdef DIAG_DEVELOPER
+		// tmp
+		bool newATSelection = DiagMenu.GetBool( DiagMenuIDs.MISC_ACTION_TARGETS_NEW, true );
+
+		// read the action manager
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		TSelectableActionInfoArray actions = player.GetActionManager().GetSelectableActions();
+		int selectedActionIndex = player.GetActionManager().GetSelectedActionIndex();
+
+		// clear state
+		m_defaultActionWidget.Show(false);
+		if ( actions.Count() <= 1 )
+			m_FadeTimer.FadeOut(m_actionsPanelWidget, FADE_OUT_TIME, true);		
+		else
+			m_FadeTimer.FadeIn(m_actionsPanelWidget, FADE_IN_TIME, true);
+		
+		// update state
+		for (int i = 0; i < m_actionItems.Count(); i++)
+		{
+			TextWidget w = m_actionItems.Get(i);
+
+			if (i < actions.Count())
+			{
+				TSelectableActionInfo actionInfo = actions.Get(i);
+				w.SetText(actionInfo.param3);
+
+				if (i == selectedActionIndex)
+				{
+					w.SetColor(0xFFFFEC44);
+					
+					m_defaultActionWidget.SetText(actionInfo.param3);
+					if ( !newATSelection )
+					{
+						m_defaultActionWidget.Show(true);
+					}
+				}
+				else
+				{
+					w.SetColor(0xFFFFFFFF);
+				}
+
+				w.Show(true);
+			}
+			else
+			{
+				w.Show(false);
+			}
+		}
+
+		float sx;
+		float sy;
+		m_actionsPanelWidget.GetSize(sx, sy);
+		m_actionsPanelWidget.SetSize(sx, 8 + (actions.Count() * 32));
+#endif
+	}
+
+	void NextAction()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetActionManager().SelectNextAction();
+		
+		UpdateWidgets();
+		
+		m_hide_timer.Run(HIDE_MENU_TIME, this, "HideWithFadeout");
+	}
+
+	void PrevAction()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetActionManager().SelectPrevAction();
+		
+		UpdateWidgets();
+		
+		m_hide_timer.Run(HIDE_MENU_TIME, this, "HideWithFadeout");
+	}
+	
+	void NextActionCategory()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetActionManager().SelectNextActionCategory();
+		
+		UpdateWidgets();
+		
+		m_hide_timer.Run(HIDE_MENU_TIME, this, "HideWithFadeout");
+	}
+
+	void PrevActionCategory()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetActionManager().SelectPrevActionCategory();
+		
+		UpdateWidgets();
+		
+		m_hide_timer.Run(HIDE_MENU_TIME, this, "HideWithFadeout");
+	}
+
+	void Show()
+	{
+		if( m_visible )
+			return;
+				
+		m_visible = true;
+		m_hide_timer.Run(HIDE_MENU_TIME, this, "HideWithFadeout");
+	}
+	
+	void Refresh()
+	{
+		if( !m_visible )
+			Show();
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( player.GetActionManager().IsSelectableActionsChanged() )
+			UpdateWidgets();
+	}
+	
+	void Hide()
+	{
+		if( !m_visible )
+			return;
+		
+		m_visible = false;
+		m_hide_timer.Stop();
+		m_FadeTimer.Stop();
+		//m_defaultActionWidget.Show(false);
+		m_actionsPanelWidget.Show(false);
+	}
+	
+	void HideWithFadeout()
+	{
+		//m_defaultActionWidget.Show(false);
+		if (m_actionsPanelWidget.IsVisible())
+			m_FadeTimer.FadeOut(m_actionsPanelWidget, FADE_OUT_TIME, true);
+	}	
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ActionTargetsCursor.c b/scripts/5_Mission/DayZ/GUI/ActionTargetsCursor.c
new file mode 100644
index 0000000000000000000000000000000000000000..ee27065d3810afd4174a6e27cb252dca5d23b435
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ActionTargetsCursor.c
@@ -0,0 +1,1289 @@
+class ATCCachedObject
+{
+	protected Object 	m_CachedObject;
+	protected vector 	m_CursorWPos;
+	protected vector	m_ScreenPos;
+	protected int		m_CompIdx;
+	
+	void ATCCachedTarget()
+	{
+		m_CachedObject = null;
+		m_ScreenPos = vector.Zero;
+		m_CompIdx = -1;
+	}
+
+	//! cache object and its world pos
+	void Store(Object obj, vector pos, int compIdx)
+	{
+		if (!m_CachedObject)
+		{
+			m_CachedObject = obj;
+			m_CursorWPos = pos;
+			m_CompIdx = compIdx;
+		}
+	}
+
+	//! invalidate cached objec
+	void Invalidate()
+	{
+		if (m_CachedObject)
+		{
+			m_CachedObject = null;
+			m_CursorWPos = vector.Zero;
+			m_CompIdx = -1;
+		}
+	}
+
+	Object Get()
+	{
+		return m_CachedObject; 	
+	}
+	
+	vector GetCursorWorldPos()
+	{
+		return m_CursorWPos;
+	}
+	
+	int GetCursorCompIdx()
+	{
+		return m_CompIdx;
+	}
+};
+
+class ActionTargetsCursor : ScriptedWidgetEventHandler
+{
+	private const ref array<typename> VISION_OBSTRUCTION_PPEFFECTS_TYPES = {
+		PPERequester_BurlapSackEffects,
+		PPERequester_FlashbangEffects
+	};
+
+	protected PlayerBase 					m_Player;
+	protected ActionTarget 					m_Target;
+	protected ref ATCCachedObject			m_CachedObject;
+	protected Object						m_DisplayInteractTarget;
+
+	protected ActionBase					m_Interact;
+	protected ActionBase					m_ContinuousInteract;
+	protected ActionBase					m_Single;
+	protected ActionBase					m_Continuous;
+	protected ActionManagerClient 			m_AM;
+	protected IngameHud						m_Hud;
+	
+	protected UAIDWrapper 					m_UseActionWrapper;
+
+	protected int							m_InteractActionsNum;
+	protected int							m_ContinuousInteractActionsNum;
+	protected int							m_ItemActionsNum;
+	protected int							m_ContinuousItemActionsNum;
+	protected typename						m_SelectedActionCategory;
+	protected bool 							m_HealthEnabled;
+	protected bool							m_QuantityEnabled;	
+	protected bool							m_FixedOnPosition;
+	protected bool 							m_Hidden;
+
+	protected Widget						m_Root;
+	protected Widget						m_Container;
+	protected Widget 						m_ItemLeft;
+
+	//! widget width
+	protected float m_MaxWidthChild;
+	protected float m_RootWidth;
+	protected float m_RootHeight;
+
+	void ActionTargetsCursor()
+	{
+		m_Interact 				= null;
+		m_ContinuousInteract	= null;
+		m_Single				= null;
+		m_Continuous			= null;
+		m_AM					= null;
+		
+		m_HealthEnabled			= true;
+		m_QuantityEnabled		= true;
+		
+		m_CachedObject 			= new ATCCachedObject;
+		m_Hidden 				= false;
+		m_DisplayInteractTarget	= null;
+		
+		m_Hud					= GetHud();
+		
+		m_UseActionWrapper 		= GetUApi().GetInputByID(UAAction).GetPersistentWrapper();
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+	}
+	
+	void ~ActionTargetsCursor() {}
+	
+	// Controls appearance of the builded cursor
+	void SetHealthVisibility(bool state)
+	{
+		m_HealthEnabled = state;
+	}
+
+	void SetQuantityVisibility(bool state)
+	{
+		m_QuantityEnabled = state;
+	}
+
+	//! DEPRECATED
+	void SetInteractXboxIcon(string imageset_name, string image_name);
+	void SetContinuousInteractXboxIcon(string imageset_name, string image_name);
+	void SetSingleXboxIcon(string imageset_name, string image_name);
+	void SetContinuousXboxIcon(string imageset_name, string image_name);
+	protected void SetXboxIcon(string name, string imageset_name, string image_name);
+	//! ---------
+	
+	protected void SetControllerIcon(string pWidgetName, string pInputName)
+	{
+		RichTextWidget w = RichTextWidget.Cast(m_Root.FindAnyWidget(pWidgetName + "_btn_icon_xbox"));	
+		w.SetText(InputUtils.GetRichtextButtonIconFromInputAction(pInputName, "", EUAINPUT_DEVICE_CONTROLLER));
+	}
+	
+	protected void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.Show(false);
+		m_Root.SetHandler(this);
+		
+		//! UA -> widget icon
+		UpdateControllerInputIcons();
+		UpdatePCIconsVisibility();
+
+		m_Container = w.FindAnyWidget("container");
+		m_ItemLeft = w.FindAnyWidget("item_left");
+
+		m_Root.Update();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControllerInputIcons();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdatePCIconsVisibility();
+	}
+	
+	//! Loads icons from the latest keybinds
+	private void UpdateControllerInputIcons()
+	{
+		SetControllerIcon("interact", "UAAction");
+		SetControllerIcon("continuous_interact", "UAAction");
+		SetControllerIcon("single", "UADefaultAction");
+		SetControllerIcon("continuous", "UADefaultAction");
+	}
+	
+	//! Contains logic for icon set switching (Gamepad/M&K)
+	private void UpdatePCIconsVisibility()
+	{
+		bool showConsoleIcons = false;
+		#ifdef PLATFORM_CONSOLE
+		showConsoleIcons = GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER || !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer();
+		#endif
+		
+		ShowXboxHidePCIcons("interact", showConsoleIcons);
+		ShowXboxHidePCIcons("continuous_interact", showConsoleIcons);
+		ShowXboxHidePCIcons("continuous", showConsoleIcons);
+		ShowXboxHidePCIcons("single", showConsoleIcons);
+	}
+
+	protected void PrepareCursorContent()
+	{
+		int health = -1;
+		int cargoCount = 0;
+		int q_type = 0;
+		int q_min, q_max = -1;
+		float q_cur = -1.0;
+		
+		//! item health
+		health = GetItemHealth();
+		SetItemHealth(health, "item", "item_health_mark", m_HealthEnabled);	
+		//! quantity
+		GetItemQuantity(q_type, q_cur, q_min, q_max);
+		//! cargo in item
+		GetItemCargoCount(cargoCount);
+		//! fill the widget with data
+		SetItemQuantity(q_type, q_cur, q_min, q_max, "item", "item_quantity_pb", "item_quantity_text", m_QuantityEnabled);
+		SetInteractActionIcon("interact", "interact_icon_frame", "interact_btn_inner_icon", "interact_btn_text");
+		SetItemDesc(GetItemDesc(m_Interact), cargoCount, "item", "item_desc");
+		SetActionWidget(m_Interact, GetActionDesc(m_Interact), "interact", "interact_action_name");
+
+		SetInteractActionIcon("continuous_interact", "continuous_interact_icon_frame", "continuous_interact_btn_inner_icon", "continuous_interact_btn_text");
+		SetActionWidget(m_ContinuousInteract, GetActionDesc(m_ContinuousInteract), "continuous_interact", "continuous_interact_action_name");
+
+		SetActionWidget(m_Single, GetActionDesc(m_Single), "single", "single_action_name");
+		SetActionWidget(m_Continuous, GetActionDesc(m_Continuous), "continuous", "continuous_action_name");
+		SetMultipleItemAction("single_mlt_wrapper", "single_mlt_wrapper_not_select");
+		SetMultipleContinuousItemAction("continuous_mlt_wrapper", "continuous_mlt_wrapper_not_select");
+		SetMultipleInteractAction("interact_mlt_wrapper", "interact_mlt_wrapper_not_select");
+		SetMultipleContinuousInteractAction("continuous_interact_mlt_wrapper", "continuous_interact_mlt_wrapper_not_select");
+	}
+	
+	protected void BuildFixedCursor()
+	{
+		int w, h, x, y;
+
+		PrepareCursorContent();
+		GetScreenSize(w, h);
+		x = w/2 + 32;
+		y = h/2 + 32;
+
+		m_Root.SetPos(x, y);
+	}
+	
+	protected void BuildFloatingCursor(bool forceRebuild)
+	{
+		float pos_x, pos_y = 0.0;
+		
+		PrepareCursorContent();
+		
+		//! Get OnScreenPos when forced or targeted component differs
+		if (forceRebuild || m_Target.GetComponentIndex() != m_CachedObject.GetCursorCompIdx())
+		{
+			GetOnScreenPosition(pos_x, pos_y);
+		}
+		//! in case of cached item, all above is reused except the position
+		else
+		{
+			vector screen_pos = TransformToScreenPos(m_CachedObject.GetCursorWorldPos());
+	
+			pos_x = screen_pos[0];
+			pos_y = screen_pos[1];
+		}
+		
+		pos_x = Math.Ceil(pos_x);
+		pos_y = Math.Ceil(pos_y);
+
+		Widget parentWdg = m_Root.GetParent();
+		
+		float screen_w = 0;
+		float screen_h = 0;
+		
+		float wdg_w = 0;
+		float wdg_h = 0; 
+		
+		parentWdg.GetScreenSize(screen_w, screen_h);
+		m_Root.GetSize(wdg_w, wdg_h);
+
+		if (pos_x + wdg_w > screen_w)
+			pos_x = screen_w - wdg_w;
+
+		if (pos_y + wdg_h > screen_h)
+			pos_y = screen_h - wdg_h;
+		
+		m_Root.SetPos(pos_x, pos_y);
+	}
+	
+	override bool OnUpdate(Widget w)
+	{
+		if (m_Root == w)
+		{
+			Update();
+			return true;
+		}
+		
+		return false;
+	}
+
+	protected void HideWidget()
+	{
+		if (m_Root.IsVisible())
+		{
+			m_Root.Show(false);
+			m_CachedObject.Invalidate();
+		}
+	}
+	
+	void Update()
+	{
+		if (m_Player && !m_Player.IsAlive()) // handle respawn
+		{
+			m_Player = null;
+			m_AM = null;
+		}
+
+		if (!m_Player)
+			GetPlayer();
+
+		if (!m_AM)
+			GetActionManager();
+		
+		if (m_Player.IsInVehicle() || m_AM.GetRunningAction())
+			m_Hidden = true;
+		
+		
+		/*
+		#ifdef DIAG_DEVELOPER
+		if (DeveloperFreeCamera.IsFreeCameraEnabled())
+			HideWidget();
+			return;
+		#endif
+		*/
+
+		bool isVisionObstructionActive = PPEManagerStatic.GetPPEManager().IsAnyRequesterRunning(VISION_OBSTRUCTION_PPEFFECTS_TYPES);
+				
+		//! don't show floating widget if it's disabled in profile or the player is unconscious
+		if (GetGame().GetUIManager().GetMenu() || !g_Game.GetProfileOption(EDayZProfilesOptions.HUD) || m_Hud.IsHideHudPlayer() || m_Player.IsUnconscious() || isVisionObstructionActive)
+		{
+			HideWidget();
+			return;
+		}
+
+		GetTarget();
+		GetActions();
+
+		//! check if action has target, otherwise don't show the widget		
+		bool showTarget = (m_Target && !m_Hidden) || m_Interact || m_ContinuousInteract;
+		if (!showTarget)
+		{
+			if (m_Single)
+				showTarget = m_Single.HasTarget();
+
+			if (m_Continuous)
+				showTarget = showTarget || m_Continuous.HasTarget();
+		}
+
+		if (showTarget)
+		{
+			//! cursor with fixed position (environment interaction mainly)
+			if (m_Target.GetObject() == null && (m_Interact || m_ContinuousInteract || m_Single || m_Continuous))
+			{
+				//Print(">> fixed widget");
+				m_CachedObject.Invalidate();
+				BuildFixedCursor();
+				m_Root.Show(true);
+				m_FixedOnPosition = false;
+				m_Hidden = false;
+				return;
+			}
+			else if (m_Target.GetObject() != null && !m_Target.GetObject().IsHologram() && (!m_Target.GetParent() || m_Target.GetParent() && !m_Target.GetParent().IsHologram()))
+			{
+				CheckRefresherFlagVisibility(m_Target.GetObject());
+				//! build cursor for new target
+				if (m_Target.GetObject() != m_CachedObject.Get())
+				{
+					if (!m_FixedOnPosition)
+					{
+						//Print(">> non-cached widget");
+						m_CachedObject.Invalidate();
+						BuildFloatingCursor(true);
+						m_Root.Show(true);
+						m_Hidden = false;
+						return;
+					}
+					else
+					{
+						//Print(">> non-cached widget (fixed)");
+						m_CachedObject.Invalidate();
+						BuildFixedCursor();
+						m_Root.Show(true);
+						m_FixedOnPosition = false;
+						m_Hidden = false;
+						return;
+					}
+				}
+				//! use cached version for known target - recalculate onscreen pos only
+				else if (m_Target.GetObject() == m_CachedObject.Get())
+				{
+					if (!m_FixedOnPosition)
+					{
+						//Print(">> cached widget");
+						BuildFloatingCursor(false);
+						m_Root.Show(true);
+						m_Hidden = false;
+						return;
+					}
+					else
+					{
+						//Print(">> cached widget (fixed)");
+						m_CachedObject.Invalidate();
+						BuildFixedCursor();
+						m_Root.Show(true);
+						m_FixedOnPosition = false;
+						m_Hidden = false;
+						return;
+					}
+				}
+			}
+			else
+			{
+				if (m_Root.IsVisible())
+				{
+					m_CachedObject.Invalidate();
+					m_Root.Show(false);
+					m_Hidden = false;
+
+					// remove previous backlit
+					GetDayZGame().GetBacklit().HintClear();
+				}
+			}
+		}
+		else
+		{
+			if (m_Root.IsVisible())
+			{
+				m_CachedObject.Invalidate();
+				m_Root.Show(false);
+				m_FixedOnPosition = false;
+
+				// remove previous backlit
+				GetDayZGame().GetBacklit().HintClear();
+			}
+			
+			m_Hidden = false;
+		}
+		
+		m_MaxWidthChild = 350;
+	}
+	
+	protected void ShowXboxHidePCIcons(string widget, bool show_xbox_icon)
+	{
+		m_Root.FindAnyWidget(widget + "_btn_icon_xbox").Show(show_xbox_icon);
+		m_Root.FindAnyWidget(widget + "_btn_icon").Show(!show_xbox_icon);
+	}
+
+
+	//! transform world pos to screen pos (related to parent widget size)
+	protected vector TransformToScreenPos(vector pWorldPos)
+	{
+		float parent_width, parent_height;
+		vector transformed_pos, screen_pos;
+		
+		//! get relative pos for screen from world pos vector
+		screen_pos = GetGame().GetScreenPosRelative(pWorldPos);
+		//! get size of parent widget
+		m_Root.GetParent().GetScreenSize(parent_width, parent_height);
+		
+		//! calculate corrent position from relative pos and parent widget size
+		transformed_pos[0] = screen_pos[0] * parent_width;
+		transformed_pos[1] = screen_pos[1] * parent_height;
+		
+		return transformed_pos;
+	}
+
+	protected void GetOnScreenPosition(out float x, out float y)
+	{
+		const float 	DEFAULT_HANDLE_OFFSET 	= 0.2;
+		const string 	CE_CENTER_COMP_NAME 	= "ce_center";
+		const string 	MEM_LOD_NAME 			= LOD.NAME_MEMORY; //! kept for backward compatibility
+		
+		int compIdx;
+		float pivotOffset = 0.0;
+		float memOffset   = 0.0;
+		string compName;
+
+		bool isTargetForced = false;
+		
+		vector worldPos;
+		vector modelPos;
+
+		LOD lod;
+
+		array<Selection> memSelections	= new array<Selection>();
+		array<string> components = new array<string>; // for components with multiple selection
+		
+		Object object;
+
+		if (m_Target)
+		{
+			object = m_Target.GetObject();
+			compIdx  = m_Target.GetComponentIndex();
+
+			if (m_Target.GetCursorHitPos() == vector.Zero)
+				isTargetForced = true;
+		}
+		else
+		{
+			return;
+		}
+
+		if (object)
+		{
+			if (!isTargetForced)
+			{
+				compName = object.GetActionComponentName(compIdx);
+				object.GetActionComponentNameList(compIdx, components);
+
+				if (!object.IsInventoryItem() && (object.HasFixedActionTargetCursorPosition() || object.GetActionComponentNameList(compIdx, components) == 0))
+				{
+					m_FixedOnPosition = true;
+					return;
+				}
+				
+				pivotOffset	= object.ConfigGetFloat("actionTargetPivotOffsetY");
+				memOffset	= object.ConfigGetFloat("actionTargetMemOffsetY");
+	
+				//! Get memory LOD from p3d
+				lod = object.GetLODByName(MEM_LOD_NAME);
+				if (lod != null)
+				{
+					//! save selection from memory lod
+					lod.GetSelections(memSelections);
+					
+					// items with CE_Center mem point
+					if (MiscGameplayFunctions.IsComponentInSelection(memSelections, CE_CENTER_COMP_NAME))
+					{
+						for (int i2 = 0; i2 < memSelections.Count(); ++i2)
+						{
+							if (memSelections[i2].GetName() == CE_CENTER_COMP_NAME && memSelections[i2].GetVertexCount() == 1)
+							{
+								m_FixedOnPosition = false;
+								modelPos = object.GetSelectionPositionMS(CE_CENTER_COMP_NAME);
+								worldPos = object.ModelToWorld(modelPos);
+								if (memOffset != 0.0)
+								{
+									worldPos[1] = worldPos[1] + memOffset;
+								}
+								else
+								{
+									worldPos[1] = worldPos[1] + DEFAULT_HANDLE_OFFSET;
+								}
+							}
+						}
+
+						//! cache current object and the widget world pos
+						m_CachedObject.Store(object, worldPos, compIdx);
+					} 
+					//! doors/handles
+					else if (!compName.Contains("ladder") && IsComponentInSelection(memSelections, compName))
+					{
+						for (int i1 = 0; i1 < memSelections.Count(); ++i1)
+						{
+							//! single vertex in selection
+							if (memSelections[i1].GetName() == compName && memSelections[i1].GetVertexCount() == 1)
+							{
+								modelPos = object.GetSelectionPositionMS(compName);
+								worldPos = object.ModelToWorld(modelPos);
+
+								m_FixedOnPosition = false;
+								if (object.GetType() == "Fence" || object.GetType() == "Watchttower" || object.GetType() == "GardenPlot")
+									m_FixedOnPosition = true;
+								
+								if (memOffset != 0.0)
+								{
+									worldPos[1] = worldPos[1] + memOffset;
+								}
+								else
+								{
+									worldPos[1] = worldPos[1] + DEFAULT_HANDLE_OFFSET;
+								}
+							}
+
+							//! multiple vertices in selection
+							if (memSelections[i1].GetName() == compName && memSelections[i1].GetVertexCount() > 1)
+							{
+								for (int j = 0; j < components.Count(); ++j)
+								{
+									if (IsComponentInSelection(memSelections, components[j]))
+									{
+										modelPos = object.GetSelectionPositionMS(components[j]);
+										worldPos = object.ModelToWorld(modelPos);
+
+										m_FixedOnPosition = false;
+										if (memOffset != 0.0)
+										{
+											worldPos[1] = worldPos[1] + memOffset;
+										}
+										else
+										{
+											worldPos[1] = worldPos[1] + DEFAULT_HANDLE_OFFSET;
+										}
+									}
+								}
+							}
+						}
+						
+						//! cache current object and the widget world pos
+						m_CachedObject.Store(object, worldPos, -1); //! do not store component index for doors/handles
+					}
+					//! ladders handling
+					else if (compName.Contains("ladder") && IsComponentInSelection(memSelections, compName))
+					{
+						vector ladderHandlePointLS, ladderHandlePointWS;
+						vector closestHandlePos;
+						float lastDistance = 0;
+	
+						for (int i3 = 0; i3 < memSelections.Count(); ++i3)
+						{
+							if (memSelections[i3].GetName() == compName && memSelections[i3].GetVertexCount() > 1)
+							{
+								ladderHandlePointLS = memSelections[i3].GetVertexPosition(lod, 0);
+								ladderHandlePointWS = object.ModelToWorld(ladderHandlePointLS);
+								closestHandlePos = ladderHandlePointWS;
+								lastDistance = Math.AbsFloat(vector.DistanceSq(ladderHandlePointWS, m_Player.GetPosition()));
+	
+								for (int k = 1; k < memSelections[i3].GetVertexCount(); ++k)
+								{
+									ladderHandlePointLS = memSelections[i3].GetVertexPosition(lod, k);
+									ladderHandlePointWS = object.ModelToWorld(ladderHandlePointLS);
+									
+									if (lastDistance > Math.AbsFloat(vector.DistanceSq(ladderHandlePointWS, m_Player.GetPosition())))
+									{
+										lastDistance = Math.AbsFloat(vector.DistanceSq(ladderHandlePointWS, m_Player.GetPosition()));
+										closestHandlePos = ladderHandlePointWS;
+									}
+								}
+
+								m_FixedOnPosition = false;
+								worldPos = closestHandlePos;						
+								if (memOffset != 0.0)
+								{
+									worldPos[1] = worldPos[1] + memOffset;
+								}
+								else
+								{
+									worldPos[1] = worldPos[1] + DEFAULT_HANDLE_OFFSET;
+								}
+							}
+						}
+
+						//! cache current object and the widget world pos
+						m_CachedObject.Store(object, worldPos, -1); //! do not store component index for ladders
+					}
+					else
+					{
+						m_FixedOnPosition = true;
+					}
+				}
+				else
+				{
+					m_FixedOnPosition = true;
+				}
+			}
+			else
+			{
+				m_FixedOnPosition = true;
+			}
+
+			vector pos = TransformToScreenPos(worldPos);
+
+			x = pos[0];
+			y = pos[1];
+		}
+
+		worldPos = vector.Zero;
+		isTargetForced = false;
+	}
+
+	// kept for backward compatibility
+	protected bool IsComponentInSelection(array<Selection> selection, string compName)
+	{
+		return MiscGameplayFunctions.IsComponentInSelection(selection, compName);
+	}
+
+	// getters
+
+ 	protected void GetPlayer()
+	{
+		Class.CastTo(m_Player, GetGame().GetPlayer());
+	}
+
+	protected void GetActionManager()
+	{
+		if (m_Player && m_Player.IsPlayerSelected())
+		{
+			Class.CastTo(m_AM, m_Player.GetActionManager());
+		}
+		else
+		{
+			m_AM = null;
+		}
+	}
+
+	//! get actions from Action Manager
+  	protected void GetActions()
+	{
+		m_Interact = null;
+		m_ContinuousInteract = null;
+		m_Single = null;
+		m_Continuous = null;
+
+		if (!m_AM) return;
+		if (!m_Target) return;
+		if (m_Player.IsSprinting()) return;
+		if (m_Player.IsInVehicle()) return; // TODO: TMP: Car AM rework needed
+
+		m_Interact = m_AM.GetPossibleAction(InteractActionInput);
+		m_ContinuousInteract = m_AM.GetPossibleAction(ContinuousInteractActionInput);
+		m_Single = m_AM.GetPossibleAction(DefaultActionInput);
+		m_Continuous = m_AM.GetPossibleAction(ContinuousDefaultActionInput);
+		
+		m_InteractActionsNum = m_AM.GetPossibleActionCount(InteractActionInput);
+		m_ContinuousInteractActionsNum = m_AM.GetPossibleActionCount(ContinuousInteractActionInput);
+		m_ItemActionsNum = m_AM.GetPossibleActionCount(DefaultActionInput);
+		m_ContinuousItemActionsNum = m_AM.GetPossibleActionCount(ContinuousDefaultActionInput);
+		
+		m_SelectedActionCategory = m_AM.GetSelectedActionCategory();
+		
+		if (m_Interact)
+		{
+			m_DisplayInteractTarget = m_Interact.GetDisplayInteractObject(m_Player, m_Target);
+		}
+		else if (m_Single)
+		{
+			m_DisplayInteractTarget = m_Single.GetDisplayInteractObject(m_Player, m_Target);
+		}
+		else if (m_ContinuousInteract)
+		{
+			m_DisplayInteractTarget = m_ContinuousInteract.GetDisplayInteractObject(m_Player, m_Target);
+		}
+		else
+		{
+			m_DisplayInteractTarget = null;
+		}
+	}
+
+	protected void GetTarget()
+	{
+		if (!m_AM)
+			return;
+
+		m_Target = m_AM.FindActionTarget();
+		if (m_Target && m_Target.GetObject() && m_Target.GetObject().IsItemBase())
+		{
+			ItemBase item = ItemBase.Cast(m_Target.GetObject());
+			InventoryLocation invLocation = new InventoryLocation();
+			item.GetInventory().GetCurrentInventoryLocation(invLocation);
+
+			if (!item.IsTakeable() || (m_Player && m_Player.IsInVehicle()) || invLocation.GetType() != InventoryLocationType.GROUND)
+				m_Hidden = true;
+		}
+	}
+	
+	protected string GetActionDesc(ActionBase action)
+	{
+		string desc = "";
+		if (action && action.GetText())
+			desc = action.GetText();
+
+		return desc;
+	}
+	
+	//Getting NAME of the entity
+	protected string GetItemDesc(ActionBase action)
+	{
+		string desc = "";
+		Object tgObject = m_DisplayInteractTarget;
+		if (!tgObject && m_Target)
+		{
+			tgObject = m_Target.GetObject();
+		}
+		
+		if (tgObject)
+		{
+			//BreakOut if item is ruined
+			Object tgParent = m_Target.GetParent();
+			if (!tgObject.IsAlive())
+			{
+				//Fetch parent item name if one is present
+				if (!tgParent || tgObject.DisplayNameRuinAttach())
+					desc = tgObject.GetDisplayName();
+				else
+					desc = tgParent.GetDisplayName();
+				return desc;
+			}
+			
+			EntityAI targetEntity;
+			
+			if (tgParent && (tgParent.IsItemBase() || tgParent.IsTransport()))
+			{
+				targetEntity = EntityAI.Cast(tgParent);
+			}
+			
+			if (tgObject.IsItemBase() || tgObject.IsTransport())
+			{
+				targetEntity = EntityAI.Cast(tgObject);
+			}
+			
+			if (targetEntity && targetEntity.ShowZonesHealth())
+			{
+				string zone = "";
+				
+				array<string> selections = new array<string>();
+				
+				//NOTE: relevant fire geometry and view geometry selection names MUST match in order to get a valid damage zone
+				if (targetEntity.IsInherited(TentBase) && TentBase.Cast(targetEntity).GetState() != TentBase.PACKED)
+				{
+					//This is really specific to tents, as they use proxies. Hence object must be used
+					if (DamageSystem.GetDamageZoneFromComponentName(targetEntity, tgObject.GetActionComponentName(m_Target.GetComponentIndex(), LOD.NAME_FIRE), zone))
+					{
+						desc = DamageSystem.GetDamageDisplayName(targetEntity, zone);
+					}
+				}
+				else
+				{
+					targetEntity.GetActionComponentNameList(m_Target.GetComponentIndex(), selections, LOD.NAME_VIEW);
+					
+					//Important to get display name from component tied to multiple selections
+					for (int s = 0; s < selections.Count(); s++)
+					{
+						if (DamageSystem.GetDamageZoneFromComponentName(targetEntity, selections[s], zone))
+						{
+							desc = DamageSystem.GetDamageDisplayName(targetEntity, zone);
+						}
+					}
+				}
+			}
+			
+			//Safety check to output something to widget
+			if (targetEntity && desc == "")
+				desc = targetEntity.GetDisplayName();
+		}
+
+		return desc;
+	}
+	
+	protected int GetItemHealth()
+	{
+		int health = -1;
+
+		if (m_Interact && !m_Interact.HasTarget())
+		{
+			return health;
+		}
+		
+		Object tgObject = m_DisplayInteractTarget;
+		if (!tgObject && m_Target)
+		{
+			tgObject = m_Target.GetObject();
+		}
+		
+		if (tgObject)
+		{
+			Object tgParent = m_Target.GetParent();
+			EntityAI targetEntity;
+			
+			//Return specific part health, even if display name is from parent
+			if (!tgObject.IsAlive())
+			{
+				health = tgObject.GetHealthLevel();
+				return health;
+			}
+			
+			if (tgParent && (tgParent.IsItemBase() || tgParent.IsTransport()))
+			{
+				targetEntity = EntityAI.Cast(tgParent);
+			}
+			
+			if (tgObject.IsItemBase() || tgObject.IsTransport())
+			{
+				targetEntity = EntityAI.Cast(tgObject);
+			}
+			
+			if (targetEntity)
+			{
+				if (!targetEntity.IsDamageDestroyed())
+				{
+					string zone = "";
+					array<string> selections = new array<string>();
+					
+					if (targetEntity.IsInherited(TentBase) && TentBase.Cast(targetEntity).GetState() != TentBase.PACKED)
+					{
+						//This is really specific to tents, as they use proxies. Hence object must be used
+						if (DamageSystem.GetDamageZoneFromComponentName(targetEntity, tgObject.GetActionComponentName(m_Target.GetComponentIndex(), LOD.NAME_FIRE), zone))
+						{
+							health = targetEntity.GetHealthLevel(zone);
+						}
+					}
+					else
+					{
+						//NOTE: relevant view geometry and view geometry selection names MUST match in order to get a valid damage zone
+						targetEntity.GetActionComponentNameList(m_Target.GetComponentIndex(), selections, LOD.NAME_VIEW);
+						
+						for (int s = 0; s < selections.Count(); s++)
+						{
+							if (DamageSystem.GetDamageZoneFromComponentName(targetEntity , selections[s], zone))
+							{
+								health = targetEntity.GetHealthLevel(zone);
+								break;
+							}
+						}
+					}
+	
+					if (zone == "")
+						health = targetEntity.GetHealthLevel();
+				}
+			}
+			else
+			{
+				health = tgObject.GetHealthLevel();
+			}
+		}
+		
+		return health;
+	}
+
+	protected void GetItemQuantity(out int q_type, out float q_cur, out int q_min, out int q_max)
+	{
+		InventoryItem item = null;
+
+		if (m_Interact && !m_Interact.HasTarget())
+		{
+			return;
+		}
+		
+		Object tgObject = m_DisplayInteractTarget;
+		if (!tgObject && m_Target)
+		{
+			tgObject = m_Target.GetObject();
+		}
+		
+		if (Class.CastTo(item, tgObject))
+		{
+			q_type = QuantityConversions.HasItemQuantity(item);
+			if (q_type > 0)
+				QuantityConversions.GetItemQuantity(item, q_cur, q_min, q_max);
+		}
+	}
+
+	//! returns number of items in cargo for targeted entity
+	protected void GetItemCargoCount(out int cargoCount)
+	{
+		EntityAI entity = null;
+		
+		Object tgObject = m_DisplayInteractTarget;
+		if (!tgObject && m_Target)
+		{
+			tgObject = m_Target.GetObject();
+		}
+
+		if (Class.CastTo(entity, tgObject))
+		{
+
+			GameInventory inventory = entity.GetInventory();
+			if (inventory)
+			{
+				cargoCount = AttachmentsWithInventoryOrCargoCount(inventory);
+				return;
+			}
+
+			//! default cargo count
+			cargoCount = 0;
+		}
+	}
+
+	// setters
+	protected void SetItemDesc(string descText, int cargoCount, string itemWidget, string descWidget)
+	{
+		Widget widget;
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		//! Last message from finished User Action on target (Thermometer, Blood Test Kit, etc.)
+		PlayerBase playerT = PlayerBase.Cast(m_Target.GetObject());
+		if (playerT)
+			string msg = playerT.GetLastUAMessage();
+				
+		if (descText.Length() == 0 && msg.Length() == 0)
+		{
+			widget.Show(false);
+			return;
+		}
+		
+		descText.ToUpper();
+		TextWidget itemName;
+		Class.CastTo(itemName, widget.FindAnyWidget(descWidget));
+	
+		//! when cargo in container
+		if (cargoCount > 0)
+			descText = string.Format("[+] %1  %2", descText, msg);
+		else
+			descText = string.Format("%1  %2", descText, msg);
+
+		itemName.SetText(descText);
+		widget.Show(true);
+	}
+	
+	protected void SetItemHealth(int health, string itemWidget, string healthWidget, bool enabled)
+	{
+		Widget widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (enabled)
+		{
+			ImageWidget healthMark;
+			Class.CastTo(healthMark, widget.FindAnyWidget(healthWidget));
+			int color = 0x00FFFFFF;
+
+			if (health == -1)
+			{
+				healthMark.GetParent().Show(false);
+				widget.Show(enabled);
+				return;
+			}
+			
+			healthMark.SetColor(ItemManager.GetItemHealthColor(health));
+			healthMark.SetAlpha(0.5);
+			healthMark.GetParent().Show(true);
+		}
+		
+		widget.Show(enabled);
+	}
+	
+	protected void SetItemQuantity(int type, float current, int min, int max, string itemWidget, string quantityPBWidget, string quantityTextWidget, bool enabled)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (enabled)
+		{
+			ProgressBarWidget progressBar;
+			TextWidget textWidget;
+			Class.CastTo(progressBar, widget.FindAnyWidget(quantityPBWidget));
+			Class.CastTo(textWidget, widget.FindAnyWidget(quantityTextWidget));
+
+			//check for volume vs. count and display progressbar or "bubble" with exact count/max text
+			switch (type)
+			{
+				case QUANTITY_HIDDEN :
+					progressBar.Show(false);
+					textWidget.Show(false);
+					textWidget.GetParent().Show(false);
+					break;
+				case QUANTITY_COUNT :
+					if (max > 1 || current > 1)
+					{
+						string qty_text = string.Format("%1/%2", Math.Round(current).ToString(), max.ToString());
+						progressBar.Show(false);
+						textWidget.SetText(qty_text);
+						textWidget.Show(true);
+						textWidget.GetParent().Show(true);
+					}
+					else
+					{
+						progressBar.Show(false);
+						textWidget.Show(false);
+						textWidget.GetParent().Show(false);
+					}
+					break;
+				case QUANTITY_PROGRESS :
+					float qty_num = Math.Round((current / max) * 100);
+	
+					textWidget.Show(false);
+					progressBar.SetCurrent(qty_num);
+					progressBar.Show(true);
+					textWidget.GetParent().Show(true);
+					break;
+			}
+			widget.Show(true);
+		}
+		else
+			widget.Show(false);	
+	}
+
+	protected void SetActionWidget(ActionBase action, string descText, string actionWidget, string descWidget)
+	{
+		Widget widget = m_Root.FindAnyWidget(actionWidget);
+		
+		if (action)
+		{
+			if (action.HasTarget() && m_AM.GetActionState() < 1) // targeted & action not performing
+			{
+				TextWidget actionName;
+				Class.CastTo(actionName, widget.FindAnyWidget(descWidget));
+
+				if (action.GetInput().GetInputType() == ActionInputType.AIT_CONTINUOUS)
+				{
+					descText = descText + " " + "#action_target_cursor_hold";
+					actionName.SetText(descText);
+				}
+				else
+				{
+					actionName.SetText(descText);
+				}
+
+				widget.Show(true);
+				
+				int x, y;
+				actionName.GetTextSize(x, y);
+				if (x > m_MaxWidthChild);
+					m_MaxWidthChild = x;
+			}
+			else
+			{
+				widget.Show(false);
+			}
+		}
+		else
+		{
+			widget.Show(false);
+		}
+	}
+
+	//! shows arrows near the interact action if there are more than one available
+	protected void SetMultipleInteractAction(string multiActionsWidget, string multiActionsWidget_NotSelect)
+	{
+		Widget widget, widget_not_select;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget_not_select = m_Root.FindAnyWidget(multiActionsWidget_NotSelect);
+
+		if (m_InteractActionsNum > 1)
+		{
+			if (m_SelectedActionCategory == InteractActionInput)
+			{
+				widget.Show(true);
+				widget_not_select.Show(false);
+			}
+			else
+			{
+				widget.Show(false);
+				widget_not_select.Show(true);
+			}	
+		}
+		else
+		{
+			widget.Show(false);
+			widget_not_select.Show(false);
+		}
+	}
+	
+	protected void SetMultipleContinuousInteractAction(string multiActionsWidget, string multiActionsWidget_NotSelect)
+	{
+		Widget widget, widget_not_select;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget_not_select = m_Root.FindAnyWidget(multiActionsWidget_NotSelect);
+
+		if (m_ContinuousInteractActionsNum > 1)
+		{
+			if (m_SelectedActionCategory == ContinuousInteractActionInput)
+			{
+				widget.Show(true);
+				widget_not_select.Show(false);
+			}
+			else
+			{
+				widget.Show(false);
+				widget_not_select.Show(true);
+			}
+		}
+		else
+		{
+			widget.Show(false);
+			widget_not_select.Show(false);
+		}
+				
+	}
+	
+	protected void SetMultipleItemAction(string multiActionsWidget, string multiActionsWidget_NotSelect)
+	{
+		Widget widget, widget_not_select;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget_not_select = m_Root.FindAnyWidget(multiActionsWidget_NotSelect);
+
+		if (m_ItemActionsNum > 1)
+		{ 
+			if (m_SelectedActionCategory == DefaultActionInput)
+			{
+				widget.Show(true);
+				widget_not_select.Show(false);
+			}
+			else
+			{
+				widget.Show(false);
+				widget_not_select.Show(true);
+			}
+		}
+		else
+		{
+			widget.Show(false);
+			widget_not_select.Show(false);
+		}	
+	}
+	
+	protected void SetMultipleContinuousItemAction(string multiActionsWidget, string multiActionsWidget_NotSelect)
+	{
+		Widget widget, widget_not_select;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget_not_select = m_Root.FindAnyWidget(multiActionsWidget_NotSelect);
+
+		if (m_ContinuousItemActionsNum > 1)
+		{
+			if (m_SelectedActionCategory == ContinuousDefaultActionInput)
+			{
+				widget.Show(true);
+				widget_not_select.Show(false);
+			}
+			else
+			{
+				widget.Show(false);
+				widget_not_select.Show(true);
+			}
+		}
+		else
+		{
+			widget.Show(false);
+			widget_not_select.Show(false);
+		}		
+	}
+	
+	protected void SetInteractActionIcon(string actionWidget, string actionIconFrameWidget, string actionIconWidget, string actionIconTextWidget)
+	{
+		Widget widget;
+		ImageWidget iconWidget;
+		TextWidget textWidget;
+		
+		widget = m_Root.FindAnyWidget(actionWidget);
+		Class.CastTo(iconWidget, widget.FindAnyWidget(actionIconWidget));
+		Class.CastTo(textWidget, widget.FindAnyWidget(actionIconTextWidget));
+		
+		GetDayZGame().GetBacklit().HintShow(m_UseActionWrapper.InputP());
+		
+		// uses text in floating widget
+		iconWidget.Show(false);
+		textWidget.SetText(InputUtils.GetButtonNameFromInput("UAAction", EInputDeviceType.MOUSE_AND_KEYBOARD));
+		textWidget.Show(true);
+	}
+	
+	protected void CheckRefresherFlagVisibility(Object object)
+	{
+		EntityAI entity;
+		Widget w = m_Root.FindAnyWidget("item_flag_icon");
+		if (Class.CastTo(entity,object) && w)
+		{
+			w.Show(entity.IsRefresherSignalingViable() && m_Player.IsTargetInActiveRefresherRange(entity));
+		}
+	}
+	
+	protected int AttachmentsWithInventoryOrCargoCount(notnull GameInventory inventory)
+	{
+		int attachmentsWithInventory = 0;
+		
+		CargoBase cargo = inventory.GetCargo();
+		if (cargo && cargo.GetItemCount() > 0)
+		{
+			return 1;
+		}
+		
+		for (int i = 0; i < inventory.AttachmentCount(); i++)	
+		{
+			EntityAI attachment = inventory.GetAttachmentFromIndex(i);
+			int attachmentSlotId = attachment.GetInventory().GetSlotId(0);
+			
+			if (attachment.GetInventory())
+			{
+				attachmentsWithInventory += 1;
+			}
+		}
+		
+		return attachmentsWithInventory;
+	}
+	
+	protected IngameHud GetHud()
+	{
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			return hud;
+		}
+
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/BookMenu.c b/scripts/5_Mission/DayZ/GUI/BookMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..c013fcf289ad7227d1674c31f20097f7b5d85e52
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/BookMenu.c
@@ -0,0 +1,88 @@
+class BookMenu extends UIScriptedMenu
+{
+	protected TextWidget m_author;
+	protected TextWidget m_title;
+	protected TextWidget m_page;
+	protected HtmlWidget m_content;
+	protected float m_page_height;
+	protected float m_content_total_height;
+	protected float m_content_pos;
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_book.layout");
+		Class.CastTo(m_content, layoutRoot.FindAnyWidget("HtmlWidget"));
+		Class.CastTo(m_author, layoutRoot.FindAnyWidget("Author")); 
+		Class.CastTo(m_title, layoutRoot.FindAnyWidget("Title"));
+		Class.CastTo(m_page, layoutRoot.FindAnyWidget("Page"));
+		
+		float width;
+		m_content.GetScreenSize(width, m_page_height);
+		return layoutRoot;
+	}
+	
+	void ReadBook(InventoryItem book)
+	{
+		m_content.LoadFile( book.ConfigGetString("file") );
+		m_author.SetText( book.ConfigGetString("author") );
+		m_title.SetText( book.ConfigGetString("title") );
+		m_content_total_height = m_content.GetContentHeight();
+		m_content_pos = 0;
+		NextPrevPage(false);
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+
+		switch (w.GetUserID())
+		{
+			case IDC_BOOK_VIEWER_PREV:
+				NextPrevPage(false);
+				return true;
+			case IDC_BOOK_VIEWER_NEXT:
+				NextPrevPage(true);
+				return true;
+			case IDC_CANCEL:
+				Close();
+				return true;
+		}
+
+		return false;
+	}
+	
+	void NextPrevPage(bool next)
+	{
+		if (next)
+		{
+			m_content_pos	= m_content_pos + m_page_height;
+		}
+		else
+		{
+			m_content_pos	= m_content_pos - m_page_height;
+		}
+		
+		float maxOffset = 0;
+		if (m_content_total_height > m_page_height)
+		{
+			maxOffset = m_content_total_height - m_page_height;
+		}		
+		
+		if (m_content_pos < 0)
+		{
+			m_content_pos = 0;
+		}
+
+		if (m_content_pos > maxOffset)
+		{
+			m_content_pos = maxOffset;
+		}
+		
+		m_content.SetContentOffset(m_content_pos, true);
+		
+		float pagesTotal = Math.Ceil(m_content_total_height / m_page_height);
+		float currPage = Math.Round(m_content_pos / m_page_height) + 1;
+
+		m_page.SetText( currPage.ToString() + " / " + pagesTotal.ToString() );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/CameraTools/CTActor.c b/scripts/5_Mission/DayZ/GUI/CameraTools/CTActor.c
new file mode 100644
index 0000000000000000000000000000000000000000..c6b228dc2b77564f8b29cfded005577c692f3e9c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CameraTools/CTActor.c
@@ -0,0 +1,95 @@
+class CTActor extends CTObjectFollower
+{
+	protected int				m_Index;
+
+	protected Widget			m_Root;
+	protected TextWidget		m_IndexWidget;
+	
+	protected string			m_HandsItem;
+	protected ref array<string>	m_Items;
+	
+	protected EntityAI			m_HandsItemObj;
+	
+	void CTActor( int index, vector pos, vector orient, string type, array<string> items, string hands_item, CameraToolsMenu parent )
+	{
+		m_FollowerRoot		= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/camera_tools/event_tracker.layout", null );
+		m_FollowerButton	= m_FollowerRoot.FindAnyWidget( "IconPanel" );
+		m_IndexWidget		= TextWidget.Cast( m_FollowerRoot.FindAnyWidget( "Text" ) );
+		m_Index				= index;
+		m_Position			= pos;
+		m_Orientation		= orient;
+		m_Menu				= parent;
+		
+		m_IndexWidget.SetText( m_Index.ToString() );
+		m_FollowerRoot.SetHandler( this );
+		CreateFollowedObject( type );
+		SetHandsItem( hands_item );
+		SetItems( items );
+	}
+	
+	void ~CTActor()
+	{
+		delete m_FollowerRoot;
+	}
+	
+	string GetActorType()
+	{
+		if( m_FollowedObject )
+			return m_FollowedObject.GetType();
+		return "";
+	}
+	
+	void AddItem( string item )
+	{
+		PlayerBase p = PlayerBase.Cast( m_FollowedObject );
+		if( p.GetInventory().CreateAttachment( item ) )
+			m_Items.Insert( item );
+	}
+	
+	void SetItems( array<string> items )
+	{
+		m_Items = items;
+		PlayerBase p = PlayerBase.Cast( m_FollowedObject );
+		if( p )
+		{
+			foreach( string item : items )
+			{
+				p.GetInventory().CreateAttachment( item );
+			}
+		}
+	}
+	
+	array<string> GetItems()
+	{
+		return m_Items;
+	}
+	
+	void SetHandsItem( string item )
+	{
+		m_HandsItem = item;
+		if ( m_HandsItemObj && m_FollowedObject)
+		{
+			HumanInventory.Cast( m_FollowedObject.GetInventory() ).LocalDestroyEntity( m_HandsItemObj );
+			GetGame().ObjectDelete( m_HandsItemObj );
+		}
+		if (item)
+		{
+			HumanInventory.Cast( m_FollowedObject.GetInventory() ).CreateInHands( item );
+		}
+	}
+	
+	string GetHandsItem()
+	{
+		return m_HandsItem;
+	}
+	
+	void Reset()
+	{
+		string type = m_FollowedObject.GetType();
+		DestroyFollowedObject();
+		CreateFollowedObject( type );
+		
+		SetHandsItem( m_HandsItem );
+		SetItems( GetItems() );
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/CameraTools/CTEvent.c b/scripts/5_Mission/DayZ/GUI/CameraTools/CTEvent.c
new file mode 100644
index 0000000000000000000000000000000000000000..332fef1ee7e546b40f2c171b20ca24c45bb596da
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CameraTools/CTEvent.c
@@ -0,0 +1,138 @@
+class CTEvent extends ScriptedWidgetEventHandler
+{
+	protected int				m_Index;
+	protected int				m_ActorIndex;
+	protected int				m_EventType;
+	protected float				m_EventTime;
+	
+	protected CameraToolsMenu	m_Menu;
+	
+	protected Widget			m_Root;
+	protected TextWidget		m_IndexWidget;
+	protected EditBoxWidget		m_EventActorWidget;
+	protected EditBoxWidget		m_EventTimeWidget;
+	protected EditBoxWidget		m_EventTypeWidget;
+	protected CheckBoxWidget	m_EventWalkWidget;
+	
+	protected HumanCommandActionCallback	m_Callback;
+	
+	void CTEvent( int index, int actor, Widget root, bool walk, CameraToolsMenu parent )
+	{
+		m_Menu				= parent;
+		m_Index				= index;
+		m_ActorIndex		= actor;
+		
+		m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/camera_tools/event_entry.layout", root );
+		m_IndexWidget		= TextWidget.Cast( m_Root.FindAnyWidget( "event_id" ) );
+		m_EventActorWidget	= EditBoxWidget.Cast( m_Root.FindAnyWidget( "event_actor_edit" ) );
+		m_EventTimeWidget	= EditBoxWidget.Cast( m_Root.FindAnyWidget( "event_time_edit" ) );
+		m_EventTypeWidget	= EditBoxWidget.Cast( m_Root.FindAnyWidget( "event_type_edit" ) );
+		m_EventWalkWidget	= CheckBoxWidget.Cast( m_Root.FindAnyWidget( "auto_walk" ) );
+		
+		m_EventWalkWidget.SetChecked( walk );
+		m_IndexWidget.SetText( m_Index.ToString() );
+		m_EventActorWidget.SetText( m_ActorIndex.ToString() );
+		m_Root.SetHandler( this );
+	}
+	
+	void ~CTEvent()
+	{
+		delete m_Root;
+	}
+	
+	void Play()
+	{
+		PlayerBase player = m_Menu.GetActor( GetEventActor() );
+		if( player )
+		{
+			if( m_EventWalkWidget.IsChecked() )
+			{
+				player.GetInputController().OverrideMovementAngle( true, 1 );
+				player.GetInputController().OverrideMovementSpeed( true, 1 );
+			}
+			else
+			{
+				if( player.GetCommand_Action() )
+				{
+					//player.GetCommand_Action().Cancel();
+				}
+				m_Callback = player.StartCommand_Action( GetEventType(), EmoteCB, DayZPlayerConstants.STANCEMASK_ALL );
+				m_Callback.EnableCancelCondition(true);
+			}
+		}
+	}
+	
+	void Stop()
+	{
+		if( m_Callback )
+		{
+			m_Callback.Cancel();
+			m_Callback = null;
+		}
+		PlayerBase player = m_Menu.GetActor( GetEventActor() );
+		if( player )
+		{
+			player.GetInputController().OverrideMovementSpeed( true, 0 );
+		}
+	}
+	
+	bool IsTime( float start_time, float end_time )
+	{
+		if( m_EventTime >= start_time )
+		{
+			if( m_EventTime <= end_time )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	void SetEventTime( float time )
+	{
+		m_EventTime = time;
+		m_EventTimeWidget.SetText( time.ToString() );
+	}
+	
+	void SetEventType( int type )
+	{
+		m_EventTypeWidget.SetText( type.ToString() );
+	}
+	
+	float GetEventTime()
+	{
+		m_EventTime = m_EventTimeWidget.GetText().ToFloat();
+		return m_EventTime;
+	}
+	
+	int GetEventType()
+	{
+		return m_EventTypeWidget.GetText().ToInt();
+	}
+	
+	int GetEventActor()
+	{
+		return m_EventActorWidget.GetText().ToInt();
+	}
+	
+	bool GetEventWalk()
+	{
+		return m_EventWalkWidget.IsChecked();
+	}
+	
+	void Select()
+	{
+		m_Root.FindAnyWidget( "spacer" ).SetAlpha( 1 );
+		m_IndexWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		m_EventTypeWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		m_EventTypeWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+	}
+	
+	void Unselect()
+	{
+		m_Root.FindAnyWidget( "spacer" ).SetAlpha( 0.625 );
+		m_IndexWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		m_EventTypeWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		m_EventTypeWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/CameraTools/CTKeyframe.c b/scripts/5_Mission/DayZ/GUI/CameraTools/CTKeyframe.c
new file mode 100644
index 0000000000000000000000000000000000000000..ec2a488664c7a806d80a14b98131a8f59d2333dc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CameraTools/CTKeyframe.c
@@ -0,0 +1,164 @@
+class CTKeyframe extends ScriptedWidgetEventHandler
+{
+	protected int				m_Index;
+	protected float				m_InterpTime;
+	protected float				m_TotalTimeBefore;
+	
+	protected vector			m_Position;
+	protected vector			m_Orientation;
+	protected CameraToolsMenu	m_Menu;
+	
+	protected Widget			m_Root;
+	protected TextWidget		m_IndexWidget;
+	protected EditBoxWidget		m_InterpTimeWidget;
+	protected EditBoxWidget		m_FOVWidget;
+	protected EditBoxWidget		m_DOFWidget;
+	protected EditBoxWidget		m_PinWidget;
+	protected TextWidget		m_TotalTimeWidget;
+	
+	void CTKeyframe( int index, vector pos, vector orient, float int_value, float fov, float dof, int pin, float time_before, Widget root, CameraToolsMenu parent )
+	{
+		m_Menu				= parent;
+		
+		m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/camera_tools/keyframe_entry.layout", root );
+		
+		m_IndexWidget		= TextWidget.Cast( m_Root.FindAnyWidget( "keyframe_id" ) );
+		m_InterpTimeWidget	= EditBoxWidget.Cast( m_Root.FindAnyWidget( "keyframe_time_edit" ) );
+		m_FOVWidget			= EditBoxWidget.Cast( m_Root.FindAnyWidget( "keyframe_fov_edit" ) );
+		m_DOFWidget			= EditBoxWidget.Cast( m_Root.FindAnyWidget( "keyframe_dof_edit" ) );
+		m_PinWidget			= EditBoxWidget.Cast( m_Root.FindAnyWidget( "keyframe_pin_edit" ) );
+		m_TotalTimeWidget	= TextWidget.Cast( m_Root.FindAnyWidget( "keyframe_time" ) );
+		
+		m_Index				= index;
+		m_TotalTimeBefore	= time_before;
+		m_Position			= pos;
+		m_Orientation		= orient;
+		
+		SetInterpTime( int_value );
+		SetFOV( fov );
+		SetDOF( dof );
+		SetPin( pin );
+		m_IndexWidget.SetText( m_Index.ToString() );
+		m_Root.SetHandler( this );
+	}
+	
+	void ~CTKeyframe()
+	{
+		delete m_Root;
+	}
+	
+	float GetInterpTime()
+	{
+		string time_text = m_InterpTimeWidget.GetText();
+		m_InterpTime = time_text.ToFloat();
+		return m_InterpTime;
+	}
+	
+	void SetPin( int pin )
+	{
+		m_PinWidget.SetText( pin.ToString() );
+	}
+	
+	int GetPin()
+	{
+		return m_PinWidget.GetText().ToInt();
+	}
+	
+	void SetFOV( float fov )
+	{
+		m_FOVWidget.SetText( fov.ToString() );
+	}
+	
+	float GetFOV()
+	{
+		return m_FOVWidget.GetText().ToFloat();
+	}
+	
+	void SetDOF( float dof )
+	{
+		m_DOFWidget.SetText( dof.ToString() );
+	}
+	
+	float GetDOF()
+	{
+		return m_DOFWidget.GetText().ToFloat();
+	}
+	
+	void SetPosition( vector pos )
+	{
+		m_Position = pos;
+	}
+	
+	void SetOrientation( vector orient )
+	{
+		m_Orientation = orient;
+	}
+	
+	vector GetPosition()
+	{
+		return m_Position;
+	}
+	
+	vector GetOrientation()
+	{
+		return m_Orientation;
+	}
+	
+	void SetTimeBefore( float time )
+	{
+		m_TotalTimeBefore = time;
+		m_TotalTimeWidget.SetText( ( m_TotalTimeBefore + m_InterpTime ).ToString() );
+	}
+	
+	void SetInterpTime( float time )
+	{
+		m_InterpTime = time;
+		m_InterpTimeWidget.SetText( m_InterpTime.ToString() );
+		m_TotalTimeWidget.SetText( ( m_TotalTimeBefore + m_InterpTime ).ToString() );
+	}
+	
+	void Select()
+	{
+		m_Root.FindAnyWidget( "spacer" ).SetAlpha( 1 );
+		m_IndexWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		m_InterpTimeWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		m_TotalTimeWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+	}
+	
+	void Unselect()
+	{
+		m_Root.FindAnyWidget( "spacer" ).SetAlpha( 0.625 );
+		m_IndexWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		m_InterpTimeWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		m_TotalTimeWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if( w == m_Root )
+		{
+			m_Menu.SelectKeyframe( this );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if( IsFocusable( w ) )
+		{
+			m_Menu.SelectKeyframe( this );
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable( Widget w )
+	{
+		if( w )
+		{
+			return ( w == m_InterpTimeWidget || w == m_TotalTimeWidget || w == m_FOVWidget || w == m_DOFWidget );
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/CameraTools/CTObjectFollower.c b/scripts/5_Mission/DayZ/GUI/CameraTools/CTObjectFollower.c
new file mode 100644
index 0000000000000000000000000000000000000000..91745992ae6912f0c4a446c03071777e3fc794ed
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CameraTools/CTObjectFollower.c
@@ -0,0 +1,174 @@
+class CTObjectFollower extends ScriptedWidgetEventHandler
+{
+	protected Widget			m_FollowerRoot;
+	protected Widget			m_FollowerButton;
+	
+	protected vector			m_Position;
+	protected vector			m_Orientation;
+	protected EntityAI			m_FollowedObject;
+	
+	protected float				m_MaxFade;
+	protected float				m_MinFade;
+	
+	protected CameraToolsMenu	m_Menu;
+	
+	void ~CTObjectFollower()
+	{
+		DestroyFollowedObject();
+		delete m_FollowerRoot;
+	}
+	
+	void CreateFollowedObject( string type )
+	{
+		m_FollowedObject = EntityAI.Cast( GetGame().CreateObject( type, m_Position, true ) );
+		SetPosition( m_Position );
+		SetRotation( m_Orientation );
+	}
+	
+	void DestroyFollowedObject()
+	{
+		if( m_FollowedObject )
+		{
+			GetGame().ObjectDelete( m_FollowedObject );
+		}
+	}
+	
+	void Update( float timeslice )
+	{
+		UpdatePos();
+	}
+	
+	EntityAI GetObj()
+	{
+		return m_FollowedObject;
+	}
+	
+	void SetPosition( vector position )
+	{
+		m_Position = position;
+		if( m_FollowedObject )
+		{
+			m_FollowedObject.SetPosition( position );
+			m_Position = m_FollowedObject.GetPosition();
+		}
+		UpdatePos();
+	}
+	
+	void SetRotation( vector dir )
+	{
+		m_Orientation = dir;
+		PlayerBase player = PlayerBase.Cast( m_FollowedObject );
+		if( player )
+		{
+			player.SetOrientation( m_Orientation );
+		}
+		UpdatePos();
+	}
+	
+	vector GetPosition()
+	{
+		if( m_FollowedObject && m_FollowedObject.GetPosition() != m_Position )
+		{
+			SetPosition( m_FollowedObject.GetPosition() );
+		}
+		return m_Position;
+	}
+	
+	vector GetRotation()
+	{
+		if( m_FollowedObject )
+		{
+			return m_FollowedObject.GetOrientation();
+		}
+		return "0 0 0";
+	}
+	
+/*! \brief Function updating the position of the tracker widget.
+ *	
+ *	Currently tracks using GetScreenPos() on the position of the player.
+ */
+	void UpdatePos()
+	{
+		vector relativePos;
+			
+		relativePos		=	GetGame().GetScreenPosRelative( GetPosition() );
+		
+		if( relativePos[0] >= 1 || relativePos[0] == 0 || relativePos[1] >= 1 || relativePos[1] == 0 )
+		{
+			m_FollowerRoot.Show( false );
+			return;
+		}
+		else if( relativePos[2] < 0 )
+		{
+			m_FollowerRoot.Show( false );
+			return;
+		}
+		else
+		{
+			m_FollowerRoot.Show( true );
+		}
+		
+		float x, y;
+		m_FollowerRoot.GetSize( x, y );
+		
+		m_FollowerRoot.SetPos( relativePos[0], relativePos[1] );
+	}
+	
+	void Show()
+	{
+		m_FollowerRoot.Show( true );
+	}
+	
+	void Hide()
+	{
+		m_FollowerRoot.Show( false );
+	}
+	
+	void Fade( bool fade )
+	{
+		if( fade )
+		{
+			m_FollowerRoot.SetAlpha( m_MinFade );
+		}
+		else
+		{
+			m_FollowerRoot.SetAlpha( m_MaxFade );
+		}
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		return false;
+	}
+	
+	override bool OnDoubleClick( Widget w, int x, int y, int button )
+	{
+		return false;
+	}
+	
+	override bool OnMouseButtonDown( Widget w, int x, int y, int button )
+	{
+		if( w == m_FollowerButton && button == MouseState.LEFT )
+		{
+			if( m_Menu )
+			{
+				m_Menu.SelectActor( CTActor.Cast( this ) );
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if( w == m_FollowerButton && button == MouseState.LEFT )
+		{
+			if( m_Menu )
+			{
+				m_Menu.SelectActor( null );
+			}
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/CameraTools/CTSaveStructure.c b/scripts/5_Mission/DayZ/GUI/CameraTools/CTSaveStructure.c
new file mode 100644
index 0000000000000000000000000000000000000000..1362bf5d02f655ff8ed8ad577bf22273006ff3a6
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CameraTools/CTSaveStructure.c
@@ -0,0 +1,17 @@
+class CTSaveStructure
+{
+	int		m_InterpType;
+	int		m_InterpSpeed;
+	float	m_BlurValue;
+	
+	ref array<ref Param6<vector, vector, float, float, float, int>>				m_Cameras;
+	ref array<ref Param4<int, int, float, bool>>								m_Events;
+	ref array<ref Param5<vector, vector, string, ref array<string>, string>>	m_Actors;
+	
+	void CTSaveStructure()
+	{
+		m_Cameras	= new array<ref Param6<vector, vector, float, float, float, int>>;
+		m_Events	= new array<ref Param4<int, int, float, bool>>;
+		m_Actors	= new array<ref Param5<vector, vector, string, ref array<string>, string>>;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/CameraTools/CameraToolsMenu.c b/scripts/5_Mission/DayZ/GUI/CameraTools/CameraToolsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..4dec8664dddcaaabda71ce0fb78758ca1d77b58b
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CameraTools/CameraToolsMenu.c
@@ -0,0 +1,961 @@
+class CameraToolsMenu extends UIScriptedMenu
+{
+	protected static CameraToolsMenu											m_Instance;
+	vector 																		m_FreeflightCamTransform[4];
+	protected vector															m_NextCamPosition;
+	
+	protected float																m_Time;
+	
+	protected Camera															m_Camera1;
+	protected Camera															m_Camera2;
+	
+	protected ref array<ref Param6<vector, vector, float, float, float, int>>	m_CameraLines;
+	protected bool																m_IsPlaying;
+	protected int																m_NextCameraIndex = 1;
+	
+	protected float																m_FollowingTimeFinished;
+	protected ref Param2<int, int>												m_FollowingBone;
+	
+	protected CTKeyframe														m_SelectedKeyframe;
+	protected CTEvent															m_SelectedEvent;
+	protected CTActor															m_SelectedActor;
+	
+	protected ref array<ref CTActor>											m_Actors;
+	protected ref array<ref CTKeyframe>											m_Cameras;
+	protected ref array<ref CTEvent>											m_Events;
+	
+	protected Widget															m_KeyframeContent;
+	protected Widget															m_EventContent;
+	
+	protected XComboBoxWidget													m_InterpTypeSpeedCombo;
+	protected XComboBoxWidget													m_InterpTypeCombo;
+	protected EditBoxWidget														m_BlurEditWidget;
+	protected EditBoxWidget														m_ActorTypeWidget;
+	
+	protected EditBoxWidget														m_ActorIdWidget;
+	protected EditBoxWidget														m_ActorItemTypeWidget;
+	
+	protected ButtonWidget														m_AddItem;
+	protected ButtonWidget														m_AddHandsItem;
+	protected ButtonWidget														m_AddActor;
+	protected ButtonWidget														m_Play;
+	protected ButtonWidget														m_Stop;
+	protected ButtonWidget														m_Save;
+	protected ButtonWidget														m_Load;
+	
+	protected ButtonWidget														m_AddKeyframe;
+	protected ButtonWidget														m_SaveKeyframe;
+	protected ButtonWidget														m_DeleteKeyframe;
+	protected ButtonWidget														m_ViewKeyframe;
+	
+	protected ButtonWidget														m_AddEvent;
+	protected ButtonWidget														m_SaveEvent;
+	protected ButtonWidget														m_DeleteEvent;
+	protected ButtonWidget														m_ViewEvent;	
+	
+	protected ButtonWidget 														m_CopyButton;
+	protected ButtonWidget 														m_ApplyButton;
+	protected EditBoxWidget 													m_CameraEditbox;
+	protected TextWidget 														m_CameraValues;
+	
+	void CameraToolsMenu()
+	{
+		m_Cameras	= new array<ref CTKeyframe>;
+		m_Events	= new array<ref CTEvent>;
+		m_Actors	= new array<ref CTActor>;
+		
+		m_Camera1	= Camera.Cast( GetGame().CreateObject( "staticcamera", GetGame().GetPlayer().GetPosition(), true ) );
+		m_Camera2	= Camera.Cast( GetGame().CreateObject( "staticcamera", GetGame().GetPlayer().GetPosition(), true ) );
+		
+		m_Instance	= this;
+	}
+	
+	void ~CameraToolsMenu()
+	{
+		m_Camera1.SetActive( false );
+		m_Camera2.SetActive( false );
+		
+		//GetGame().ObjectDelete( m_Camera1 );
+		//GetGame().ObjectDelete( m_Camera2 );
+		
+		DeveloperFreeCamera.DisableFreeCamera( PlayerBase.Cast( GetGame().GetPlayer() ), false );
+		
+		MissionGameplay ms	= MissionGameplay.Cast( GetGame().GetMission() );
+		if (ms)
+			ms.GetHud().Show( true );
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		if ( !m_IsPlaying )
+		{
+			GetGame().GetMission().AddActiveInputExcludes({"menu"});
+		}
+	}
+	
+	override void OnHide()
+	{
+		super.OnHide();
+		if ( !m_IsPlaying && GetGame() && GetGame().GetMission() && GetGame().GetUIManager())
+		{
+			GetGame().GetUIManager().ShowUICursor(false);
+			GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+		}
+	}
+	
+	void SelectKeyframe( CTKeyframe kf )
+	{
+		if ( m_SelectedKeyframe )
+			m_SelectedKeyframe.Unselect();
+		
+		m_SelectedKeyframe = kf;
+		m_SelectedKeyframe.Select();
+	}
+	
+	void SelectEvent( CTEvent ev )
+	{
+		m_SelectedEvent = ev;
+	}
+	
+	void SelectActor( CTActor ac )
+	{
+		m_SelectedActor = ac;
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/camera_tools/camera_tools.layout" );
+		
+		m_KeyframeContent		= layoutRoot.FindAnyWidget( "keyframe_list_content" );
+		m_EventContent			= layoutRoot.FindAnyWidget( "events_list_content" );
+		m_InterpTypeCombo		= XComboBoxWidget.Cast( layoutRoot.FindAnyWidget( "interp_type" ) );
+		m_InterpTypeSpeedCombo	= XComboBoxWidget.Cast( layoutRoot.FindAnyWidget( "interp_speed_type" ) );
+		m_BlurEditWidget		= EditBoxWidget.Cast( layoutRoot.FindAnyWidget( "blur_value" ) );
+		m_ActorTypeWidget		= EditBoxWidget.Cast( layoutRoot.FindAnyWidget( "add_actor_type" ) );
+		m_ActorIdWidget			= EditBoxWidget.Cast( layoutRoot.FindAnyWidget( "add_actor_id" ) );
+		m_ActorItemTypeWidget	= EditBoxWidget.Cast( layoutRoot.FindAnyWidget( "add_item_type" ) );
+		
+		m_AddKeyframe			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "add_keyframe" ) );
+		m_AddEvent				= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "add_event" ) );
+		
+		m_AddItem				= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "add_actor_item" ) );
+		m_AddHandsItem			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "add_actor_item_hands" ) );
+		m_AddActor				= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "add_actor" ) );
+		m_Play					= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "play" ) );
+		m_Stop					= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "stop" ) );
+		m_Save					= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "save" ) );
+		m_Load					= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "load" ) );
+		
+		m_SaveKeyframe			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "save_keyframe" ) );
+		m_DeleteKeyframe		= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "delete_keyframe" ) );
+		m_ViewKeyframe			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "snap_to_keyframe" ) );
+		m_SaveEvent				= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "save_event" ) );
+		m_DeleteEvent			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "delete_event" ) );
+		m_ViewEvent				= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "snap_to_event" ) );		
+		
+		m_CopyButton			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "CopyButton" ) );
+		m_ApplyButton			= ButtonWidget.Cast( layoutRoot.FindAnyWidget( "ApplyButton" ) );
+		m_CameraEditbox			= EditBoxWidget.Cast( layoutRoot.FindAnyWidget( "CameraEditbox" ) );
+		m_CameraValues			= TextWidget.Cast( layoutRoot.FindAnyWidget( "CameraValues" ) );
+		
+		MissionGameplay ms		= MissionGameplay.Cast( GetGame().GetMission() );
+		ms.GetHud().Show( false );
+		DeveloperFreeCamera.EnableFreeCameraSceneEditor( PlayerBase.Cast( GetGame().GetPlayer() ) );
+		
+		m_BlurEditWidget.SetText( "0.0" );
+		return layoutRoot;
+	}
+	
+	PlayerBase GetActor( int index )
+	{
+		if ( index > -1 && index < m_Actors.Count() )
+			return PlayerBase.Cast( m_Actors.Get( index ).GetObj() );
+		else
+			return null;
+	}
+	
+	static void PlayAnimOnActor( int actor, int anim )
+	{
+		if ( m_Instance )
+		{
+			PlayerBase p = m_Instance.GetActor( actor );
+			if ( p )
+			{
+				EmoteCB cb = EmoteCB.Cast( p.StartCommand_Action( anim, EmoteCB, DayZPlayerConstants.STANCEMASK_ALL ) );
+				cb.EnableCancelCondition(true);
+			}
+		}
+	}
+	
+	void LoadData()
+	{
+		if ( !FileExist( g_Game.GetMissionFolderPath() + "/CameraTools" ) )
+			MakeDirectory( g_Game.GetMissionFolderPath() + "/CameraTools" );
+		
+		m_Cameras.Clear();
+		m_Events.Clear();
+		m_Actors.Clear();
+
+		string errorMessage;
+		CTSaveStructure save_data = new CTSaveStructure();
+		if (!JsonFileLoader<ref CTSaveStructure>.LoadFile(g_Game.GetMissionFolderPath() + "/CameraTools/keyframe_data.json", save_data, errorMessage))
+			ErrorEx(errorMessage);
+		
+		m_InterpTypeCombo.SetCurrentItem( save_data.m_InterpType );
+		m_InterpTypeSpeedCombo.SetCurrentItem( save_data.m_InterpSpeed );
+		SetBlurValue( save_data.m_BlurValue );
+		
+		foreach ( Param6<vector, vector, float, float, float, int> transform : save_data.m_Cameras )
+		{
+			CTKeyframe kf = new CTKeyframe( m_Cameras.Count(), transform.param1, transform.param2, transform.param3, transform.param4, transform.param5, transform.param6, GetTotalTime( m_Cameras.Count() ), m_KeyframeContent, this );
+			kf.SetInterpTime( transform.param3 );
+			m_Cameras.Insert( kf );
+		}
+		
+		foreach ( Param4<int, int, float, bool> event_t : save_data.m_Events )
+		{
+			CTEvent ev = new CTEvent( m_Events.Count(), event_t.param1, m_EventContent, event_t.param4, this );
+			ev.SetEventType( event_t.param2 );
+			ev.SetEventTime( event_t.param3 );
+			m_Events.Insert( ev );
+		}
+		
+		foreach ( Param5<vector, vector, string, ref array<string>, string> actor_t : save_data.m_Actors )
+		{
+			CTActor ac = new CTActor( m_Actors.Count(), actor_t.param1, actor_t.param2, actor_t.param3, actor_t.param4, actor_t.param5, this );
+			m_Actors.Insert( ac );
+		}
+	}
+	
+	void SaveData()
+	{
+		if ( !FileExist( g_Game.GetMissionFolderPath() + "/CameraTools" ) )
+			MakeDirectory( g_Game.GetMissionFolderPath() + "/CameraTools" );
+		
+		CTSaveStructure save_data		= new CTSaveStructure();
+		save_data.m_InterpType			= m_InterpTypeCombo.GetCurrentItem();
+		save_data.m_InterpSpeed			= m_InterpTypeSpeedCombo.GetCurrentItem();
+		save_data.m_BlurValue			= GetBlurValue();
+		
+		foreach ( CTKeyframe keyframe : m_Cameras )
+		{
+			Param6<vector, vector, float, float, float, int> transform = new Param6<vector, vector, float, float, float, int>( keyframe.GetPosition(), keyframe.GetOrientation(), keyframe.GetInterpTime(), keyframe.GetFOV(), keyframe.GetDOF(), keyframe.GetPin() );
+			save_data.m_Cameras.Insert( transform );
+		}
+		
+		foreach ( CTEvent event_t : m_Events )
+		{
+			Param4<int, int, float, bool> ev = new Param4<int, int, float, bool>( event_t.GetEventActor(), event_t.GetEventType(), event_t.GetEventTime(), event_t.GetEventWalk() );
+			save_data.m_Events.Insert( ev );
+		}
+		
+		foreach ( CTActor actor_t : m_Actors )
+		{
+			Param5<vector, vector, string, ref array<string>, string> ac = new Param5<vector, vector, string, ref array<string>, string>( actor_t.GetPosition(), actor_t.GetRotation(), actor_t.GetActorType(), actor_t.GetItems(), actor_t.GetHandsItem() );
+			save_data.m_Actors.Insert( ac );
+		}
+
+		string errorMessage;
+		if (!JsonFileLoader<ref CTSaveStructure>.SaveFile(g_Game.GetMissionFolderPath() + "/CameraTools/keyframe_data.json", save_data, errorMessage))
+			ErrorEx(errorMessage);
+	}
+	
+	float GetTotalTime( int index )
+	{
+		float time;
+		index = Math.Clamp( index, 0, m_Cameras.Count() );
+		for ( int i = 0; i < index; i++ )
+		{
+			time += m_Cameras.Get( i ).GetInterpTime();
+		}
+		return time;
+	}
+	
+	void AddKeyframe()
+	{
+		if ( Camera.GetCurrentCamera() )
+		{
+			vector pos = Camera.GetCurrentCamera().GetWorldPosition();
+			vector orient = Camera.GetCurrentCamera().GetOrientation();
+			CTKeyframe kf = new CTKeyframe( m_Cameras.Count(), pos, orient, 1, 70, 50, -1, GetTotalTime( m_Cameras.Count() ), m_KeyframeContent, this );
+			m_Cameras.Insert( kf );
+			SelectKeyframe( kf );
+		}
+	}
+	
+	void SaveKeyframe()
+	{
+		if ( m_SelectedKeyframe && Camera.GetCurrentCamera() )
+		{
+			m_SelectedKeyframe.SetPosition( Camera.GetCurrentCamera().GetWorldPosition() );
+			m_SelectedKeyframe.SetOrientation( Camera.GetCurrentCamera().GetOrientation() );
+		}
+	}
+	
+	void DeleteKeyframe()
+	{
+		if ( m_SelectedKeyframe )
+		{
+			int index = m_Cameras.Find( m_SelectedKeyframe );
+			m_Cameras.Remove( index );
+			index = Math.Clamp( index, 0, m_Cameras.Count() - 1 );
+			if ( m_Cameras.Count() > 0 )
+			{
+				SelectKeyframe( m_Cameras.Get( index ) );
+			}
+		}
+	}
+	
+	void ViewKeyframe()
+	{
+		if ( m_SelectedKeyframe && Camera.GetCurrentCamera() )
+		{
+			Camera.GetCurrentCamera().SetPosition( m_SelectedKeyframe.GetPosition() );
+			Camera.GetCurrentCamera().SetOrientation( m_SelectedKeyframe.GetOrientation() );
+		}
+	}
+	
+	void AddActor( string actor_type )
+	{
+		vector pos = GetCameraLookDir();
+		CTActor ac = new CTActor( m_Actors.Count(), pos, "0 0 0", actor_type, new array<string>, "", this );
+		if ( ac.GetObj() )
+			m_Actors.Insert( ac );
+	}
+	
+	void AddEvent( int actor_index )
+	{
+		if ( actor_index > -1 )
+		{
+			CTEvent ev = new CTEvent( m_Events.Count(), actor_index, m_EventContent, false, this );
+			m_Events.Insert( ev );
+		}
+	}
+	
+	
+	void AddItem( string id, string type )
+	{
+		int id_int = id.ToInt();
+		if ( m_Actors.Count() > id_int && id_int > -1 )
+		{
+			CTActor ac = m_Actors.Get( id_int );
+			if ( ac )
+				ac.AddItem( type );
+		}
+	}
+	
+	void AddHandsItem( string id, string type )
+	{
+		int id_int = id.ToInt();
+		if ( m_Actors.Count() > id_int && id_int > -1 )
+		{
+			CTActor ac = m_Actors.Get( id_int );
+			if ( ac )
+				ac.SetHandsItem( type );
+		}
+	}
+	
+	void SaveEvent()
+	{
+		
+	}
+	
+	void DeleteEvent()
+	{
+		
+	}
+	
+	void ViewEvent()
+	{
+		
+	}
+	
+	Param6<vector, vector, float, float, float, int> GetCameraLine( int index )
+	{
+		if ( index > -1 && index < m_CameraLines.Count() )
+		{
+			return m_CameraLines[index];
+		}
+		return null;
+	}
+	
+	void Play()
+	{
+		if (Camera.GetCurrentCamera())
+			Camera.GetCurrentCamera().GetTransform(m_FreeflightCamTransform);
+		if ( m_Cameras.Count() > 0 )
+		{
+			layoutRoot.Show( false );
+			GetGame().GetUIManager().ShowUICursor( false );
+			m_CameraLines = new array<ref Param6<vector, vector, float, float, float, int>>;
+			
+			foreach ( CTKeyframe keyframe : m_Cameras )
+			{
+				Param6<vector, vector, float, float, float, int> transform = new Param6<vector, vector, float, float, float, int>( keyframe.GetPosition(), keyframe.GetOrientation(), keyframe.GetInterpTime(), keyframe.GetFOV(), keyframe.GetDOF(), keyframe.GetPin() );
+				m_CameraLines.Insert( transform );
+				
+			}
+			
+			foreach ( CTActor ac : m_Actors )
+			{
+				ac.Hide();
+			}
+			
+			foreach ( CTEvent ev : m_Events )
+			{
+				ev.GetEventTime();
+			}
+			
+			DeveloperFreeCamera.DisableFreeCamera( PlayerBase.Cast( GetGame().GetPlayer() ), false );
+			
+			int time					= SetCameraData( GetCameraLine( 0 ), GetCameraLine( 1 ) );
+			
+			if ( GetCameraLine( 0 ).param6 > -1 )
+			{
+				m_FollowingTimeFinished	= time;
+				m_NextCamPosition = "0 0 0";
+				m_Camera1.SetActive( true );
+			}
+			else
+			{
+				m_NextCamPosition		= m_Camera2.GetPosition();
+				m_FollowingTimeFinished	= -1;
+				m_Camera1.SetActive( true );
+				m_Camera1.InterpolateTo( m_Camera2, time, m_InterpTypeCombo.GetCurrentItem() );
+			}
+			
+			m_NextCameraIndex		= 1;
+			m_IsPlaying				= true;
+			m_Time					= 0;
+		}
+	}
+	
+	void Stop()
+	{
+		layoutRoot.Show( true );
+		GetGame().GetUIManager().ShowUICursor( true );
+		
+		m_Camera1.SetActive( false );
+		m_Camera2.SetActive( false );
+		FreeDebugCamera.GetInstance().SetActive(true);
+		
+		m_NextCameraIndex = 1;
+		m_IsPlaying = false;
+		
+		foreach ( CTEvent ev : m_Events )
+		{
+			ev.Stop();
+		}
+		
+		foreach ( CTActor ac : m_Actors )
+		{
+			ac.Reset();
+			ac.Show();
+		}
+		
+		Camera.GetCurrentCamera().SetTransform(m_FreeflightCamTransform);
+	}
+	
+	vector GetCameraLookDir()
+	{
+		vector dir = FreeDebugCamera.GetInstance().GetDirection();
+		vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+		vector to = from + ( dir * 10000 );   
+		vector contact_pos;
+		vector contact_dir;
+		int contact_component;
+		Object ev_obj;
+		if ( m_SelectedEvent )
+			ev_obj = GetActor( m_SelectedEvent.GetEventActor() );
+		if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component, null, null, ev_obj) )   
+		{
+			return contact_pos;
+		}
+		
+		return "0 0 0";
+	}
+	
+	vector GetMouseLookDir()
+	{
+		vector dir = GetGame().GetPointerDirection();
+		vector from = FreeDebugCamera.GetInstance().GetPosition(); 
+		vector to = from + ( dir * 10000 );   
+		vector contact_pos;
+		vector contact_dir;
+		int contact_component;
+		Object ev_obj;
+		if ( m_SelectedEvent )
+			ev_obj = GetActor( m_SelectedEvent.GetEventActor() );
+		if ( DayZPhysics.RaycastRV(from, to, contact_pos, contact_dir, contact_component, null, null, ev_obj) )   
+		{
+			return contact_pos;
+		}
+		
+		return "0 0 0";
+	}
+	
+	override void Update( float timeslice )
+	{
+		
+		string camPos = MiscGameplayFunctions.TruncateVecToS(FreeDebugCamera.GetInstance().GetPosition(),0);
+		string camOri = MiscGameplayFunctions.TruncateVecToS(FreeDebugCamera.GetInstance().GetOrientation(),0);
+		m_CameraValues.SetText("Pos:" +camPos + " | Rot:" + camOri);
+		
+		#ifdef DIAG_DEVELOPER
+		if (DiagMenu.GetBool(DiagMenuIDs.CAMERATOOLS_ENABLE_REMOTE_CAMERA_BROADCAST))
+		{
+			Camera cam = Camera.GetCurrentCamera();
+			
+			if (!cam && m_Camera1)
+				cam = m_Camera1; 
+			if (cam)
+			{
+				Param4<vector, vector,float,float> p4 = new Param4<vector, vector,float,float>(GetGame().GetCurrentCameraPosition(),GetGame().GetCurrentCameraDirection(), cam.GetNearPlane(), cam.GetCurrentFOV());
+				GetGame().RPCSingleParam(null, ERPCs.DIAG_CAMERATOOLS_CAM_DATA, p4, false);
+			}
+		
+		}
+		#endif
+		
+		if ( m_CameraLines && m_IsPlaying )
+		{
+			foreach ( CTEvent ev : m_Events )
+			{
+				if ( ev.IsTime( m_Time, m_Time + timeslice ) )
+				{
+					ev.Play();
+				}
+			}
+			
+			m_Time += timeslice;
+			
+			if ( !Camera.GetCurrentCamera() || !m_Camera1 || !m_Camera2 )
+			{
+				return;
+			}
+			
+			if ( m_FollowingBone )
+			{
+				PlayerBase p = GetActor( m_FollowingBone.param1 );
+				if ( p )
+				{
+					vector pos = p.GetBonePositionWS( m_FollowingBone.param2 );
+								
+					int bone_index = p.GetBoneIndexByName("LeftHand_Dummy");
+					float bone_rot[4];
+					p.GetBoneRotationWS( bone_index, bone_rot );
+					
+					vector new_orient = Math3D.QuatToAngles(bone_rot);
+					
+					//Print("Rot: "+ new_orient[0] +", "+ new_orient[1] +", "+ new_orient[2]);
+					
+					float temp = new_orient[1];
+					new_orient[0] = new_orient[0] + 325; // vertical 
+					new_orient[1] = new_orient[2] + 245;// horizontal
+					new_orient[2] = temp + 290;			// tilt
+					
+					//Print("PostRot: "+ new_orient[0] +", "+ new_orient[1] +", "+ new_orient[2]);
+					
+					m_Camera1.SetPosition(pos);
+					m_Camera1.SetOrientation(new_orient);
+				}
+			}
+			
+			if ( m_NextCameraIndex + 1 == m_CameraLines.Count() )
+			{
+				Stop();
+				DeveloperFreeCamera.EnableFreeCameraSceneEditor( PlayerBase.Cast( GetGame().GetPlayer() ) );
+				foreach ( CTEvent ev2 : m_Events )
+				{
+					ev2.Stop();
+				}
+				return;
+			}
+			
+			if ( Camera.GetCurrentCamera().GetPosition() == m_NextCamPosition || ( m_FollowingTimeFinished != -1 && m_Time >= m_FollowingTimeFinished ) )
+			{
+				int time;
+				if ( GetCameraLine( m_NextCameraIndex - 1 ).param6 > -1 )
+				{
+					m_NextCameraIndex--;
+					GetCameraLine( m_NextCameraIndex ).param6 = -1;
+					
+					time			= SetCameraData( GetCameraLine( m_NextCameraIndex ), GetCameraLine( m_NextCameraIndex + 1 ) );
+				}
+				else
+				{
+					time			= SetCameraData( GetCameraLine( m_NextCameraIndex ), GetCameraLine( m_NextCameraIndex + 1 ) );
+				}
+				
+				m_NextCameraIndex++;
+				if ( GetCameraLine( m_NextCameraIndex - 1 ).param6 > -1 )
+				{
+					m_FollowingTimeFinished = time + m_Time;
+					m_NextCamPosition = "0 0 0";
+					m_Camera1.SetActive( true );
+				}
+				else if ( GetCameraLine( m_NextCameraIndex ) )
+				{
+					m_NextCamPosition	= GetCameraLine( m_NextCameraIndex ).param1;
+					m_FollowingTimeFinished = -1;
+					m_Camera1.SetActive( true );
+					m_Camera1.InterpolateTo( m_Camera2, time, m_InterpTypeCombo.GetCurrentItem() );
+				}
+				else
+				{
+					Stop();
+					DeveloperFreeCamera.EnableFreeCameraSceneEditor( PlayerBase.Cast( GetGame().GetPlayer() ) );
+					FreeDebugCamera.GetInstance().SetOrientation( "0 0 0" );
+					foreach( CTEvent ev3 : m_Events )
+					{
+						ev3.Stop();
+					}
+				}
+			}
+		}
+		else
+		{
+			if ( m_Camera1.GetPosition() == m_NextCamPosition )
+			{
+				DeveloperFreeCamera.EnableFreeCameraSceneEditor( PlayerBase.Cast( GetGame().GetPlayer() ) );
+			}
+			
+			for ( int i = 0; i < ( m_Cameras.Count() - 1 ); i++ )
+			{
+				vector pos0 = m_Cameras.Get( i ).GetPosition();
+				vector pos1 = m_Cameras.Get( i + 1 ).GetPosition();
+				Debug.DrawArrow( pos0, pos1, 2, COLOR_RED, ShapeFlags.ONCE );
+			}
+			
+			if ( m_SelectedActor )
+			{
+				if ( !g_Game.IsLeftCtrlDown() )
+					m_SelectedActor.SetPosition( GetMouseLookDir() );
+				else
+				{
+					vector from	= m_SelectedActor.GetPosition();
+					vector to	= GetMouseLookDir();
+					Debug.DrawArrow( from, to, 0.5, COLOR_RED, ShapeFlags.ONCE );
+					m_SelectedActor.SetRotation( vector.Direction( from,to ).Normalized().VectorToAngles() );
+				}
+					
+			}
+			
+			foreach ( CTActor ac : m_Actors )
+			{
+				ac.Update( timeslice );
+			}
+		}
+	}
+	
+	float SetCameraData( Param6<vector, vector, float, float, float,int> transform1, Param6<vector, vector, float, float, float, int> transform2 )
+	{
+		float int_value			= transform1.param3;
+		if ( m_InterpTypeSpeedCombo.GetCurrentItem() == 1 )
+		{
+			int_value = vector.Distance( transform1.param1, transform2.param1 ) / int_value;
+		}
+		PlayerBase p;
+		float pQuat[4];
+		int b_index;
+		if ( transform1.param6 > -1 )
+		{
+			p = GetActor( transform1.param6 );
+			if ( p )
+			{
+				b_index = p.GetBoneIndexByName( "LeftHand_Dummy" );
+				m_FollowingBone = new Param2<int, int>(transform1.param6, b_index);
+			}
+		}
+		else
+		{
+			m_Camera1.SetPosition( transform1.param1 );
+			m_Camera1.SetOrientation( transform1.param2 );
+			m_FollowingBone = null;
+		}
+		m_Camera1.SetFOV( transform1.param4 * Math.DEG2RAD );
+		m_Camera1.SetFocus( transform1.param5, GetBlurValue() );
+		
+		if ( transform2 )
+		{
+			if ( transform2.param6 > -1 )
+			{
+				pQuat[4];
+				p = GetActor( transform2.param6 );
+				if ( p )
+				{
+					b_index = p.GetBoneIndexByName( "LeftHand_Dummy" );
+					if ( b_index != -1 )
+					{
+						m_Camera2.SetPosition( p.GetBonePositionWS( b_index ) );
+				
+						p.GetBoneRotationWS( b_index, pQuat);
+						vector v = Math3D.QuatToAngles( pQuat );
+						v[0] = fixAngle_180_180( v[0] - 180 );
+						v[1] = fixAngle_180_180( v[1] - 270 );
+						v[2] = fixAngle_180_180( v[2] + 90 );
+						DbgUI.Text( v.ToString() );
+						m_Camera2.SetYawPitchRoll( v );
+					}
+				}
+			}
+			else
+			{
+				m_Camera2.SetPosition( transform2.param1 );
+				m_Camera2.SetOrientation( transform2.param2 );
+			}
+			
+			m_Camera2.SetFOV( transform2.param4 * Math.DEG2RAD );
+			m_Camera2.SetFocus( transform2.param5, GetBlurValue() );
+		}
+		
+		return int_value;
+	}
+	
+	void SetBlurValue( float blur )
+	{
+		m_BlurEditWidget.SetText( blur.ToString() );
+	}
+	
+	float GetBlurValue()
+	{
+		return m_BlurEditWidget.GetText().ToFloat();
+	}
+	
+	override bool OnMouseButtonDown( Widget w, int x, int y, int button )
+	{
+		if ( w == layoutRoot && button == MouseState.RIGHT && !m_IsPlaying )
+		{
+			GetGame().GetInput().ResetGameFocus();
+			GetGame().GetInput().ChangeGameFocus(-1);
+			GetGame().GetUIManager().ShowUICursor(false);
+			GetGame().GetMission().RemoveActiveInputExcludes({"menu"});
+			SetFocus( layoutRoot );
+			return true;
+		}
+		else if ( !IsFocusable( w ) )
+		{
+			SetFocus( layoutRoot );
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if ( w == layoutRoot && button == MouseState.LEFT )
+		{
+			SelectActor( null );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if ( button == MouseState.LEFT )
+		{
+			if ( w == m_SaveKeyframe )
+			{
+				SaveKeyframe();
+				return true;
+			}
+			else if ( w == m_DeleteKeyframe )
+			{
+				DeleteKeyframe();
+				return true;
+			}
+			else if ( w == m_ViewKeyframe )
+			{
+				ViewKeyframe();
+				return true;
+			}
+			else if ( w == m_SaveEvent )
+			{
+				SaveEvent();
+				return true;
+			}
+			else if ( w == m_DeleteEvent )
+			{
+				DeleteEvent();
+				return true;
+			}
+			else if ( w == m_ViewEvent )
+			{
+				ViewEvent();
+				return true;
+			}
+			else if ( w == m_AddKeyframe )
+			{
+				AddKeyframe();
+				return true;
+			}
+			else if ( w == m_AddEvent )
+			{
+				AddEvent( 0 );
+				return true;
+			}
+			else if ( w == m_Play )
+			{
+				Play();
+				return true;
+			}
+			else if ( w == m_Stop )
+			{
+				Stop();
+				return true;
+			}
+			else if ( w == m_Save )
+			{
+				SaveData();
+				return true;
+			}
+			else if ( w == m_Load )
+			{
+				LoadData();
+				return true;
+			}
+			else if ( w == m_AddActor )
+			{
+				AddActor( m_ActorTypeWidget.GetText() );
+			}
+			else if ( w == m_AddItem )
+			{
+				AddItem( m_ActorIdWidget.GetText(), m_ActorItemTypeWidget.GetText() );
+			}
+			else if ( w == m_AddHandsItem )
+			{
+				AddHandsItem( m_ActorIdWidget.GetText(), m_ActorItemTypeWidget.GetText() );
+			}
+			else if ( w == m_CopyButton )
+			{
+				string clipboardIn = FreeDebugCamera.GetInstance().GetPosition().ToString(false)+"|"+ FreeDebugCamera.GetInstance().GetOrientation().ToString(false);
+				GetGame().CopyToClipboard( clipboardIn );
+				
+				//Print(clipboardIn);
+			}
+			else if ( w == m_ApplyButton )
+			{
+				string camText = m_CameraEditbox.GetText();
+				if (camText && camText.IndexOf("|") !=-1)
+				{
+					int seperatorIndex = camText.IndexOf("|");
+					int length = camText.Length();
+					
+					string posStr = camText.Substring(0,seperatorIndex);
+					string oriStr = camText.Substring(seperatorIndex+1, length - seperatorIndex - 1);
+					FreeDebugCamera.GetInstance().SetPosition(posStr.ToVector());
+					FreeDebugCamera.GetInstance().SetOrientation(oriStr.ToVector());
+				}
+			}
+		}
+		return false;
+	}
+	
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if ( w == m_CameraEditbox)
+			m_CameraEditbox.SetText("");
+		return true;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		return true;
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if ( IsFocusable( w ) )
+		{
+			ColorRed( w );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		if ( IsFocusable( w ) )
+		{
+			ColorWhite( w, null );
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable( Widget w )
+	{
+		if ( w )
+		{
+			return ( w == m_SaveKeyframe  || w == m_DeleteKeyframe || w == m_ViewKeyframe || w == m_SaveEvent || w == m_DeleteEvent || w == m_ViewEvent || w == m_AddKeyframe || w == m_AddEvent || w == m_Play || w == m_Stop || w == m_Save || w == m_Load || w == m_InterpTypeCombo );
+		}
+		return false;
+	}
+	
+	override bool OnKeyPress(Widget w, int x, int y, int key)
+	{
+		if (!w && key == KeyCode.KC_P )
+		{
+			if ( !m_IsPlaying )
+			{
+				Play();
+				return true;
+			}
+			else
+			{
+				Stop();
+				return true;
+			}
+			return false;
+		}
+		else if ( g_Game.IsLeftCtrlDown() && key == KeyCode.KC_S )
+		{
+			SaveKeyframe();
+			return true;
+		}
+		else if ( g_Game.IsLeftCtrlDown() && key == KeyCode.KC_Q )
+		{
+			AddKeyframe();
+			return true;
+		}
+		else if ( g_Game.IsLeftCtrlDown() && key == KeyCode.KC_E )
+		{
+			DeleteKeyframe();
+			return true;
+		}
+		
+		else if ( !w && g_Game.IsLeftCtrlDown() )
+		{
+			SelectActor( null );
+			return true;
+		}
+		return false;
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorRed( Widget w )
+	{
+		//SetFocus( w );
+		if ( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 255, 0, 0 ) );
+			button.SetAlpha( 0.9 );
+		}
+	}
+	
+	void ColorWhite( Widget w, Widget enterW )
+	{
+		if ( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			if (button)
+			{
+				button.SetTextColor( ARGB( 255, 255, 255, 255 ) );
+				button.SetAlpha( 0.75 );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/Chat/Chat.c b/scripts/5_Mission/DayZ/GUI/Chat/Chat.c
new file mode 100644
index 0000000000000000000000000000000000000000..254702da4ac99e054c3d2e5533f8b7cd7b4dc2c5
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/Chat/Chat.c
@@ -0,0 +1,145 @@
+// #include "Scripts\Classes\Gui\ChatLine.c"
+
+/*!
+	channel type, possible values
+	CCSystem(1)
+	CCAdmin(2)
+	CCDirect(4)
+	CCMegaphone(8)
+	CCTransmitter(16)
+	CCPublicAddressSystem(32)
+	CCBattlEye(64)
+*/
+
+class Chat
+{
+	const int LINE_COUNT = 12;
+
+	protected Widget					m_RootWidget;
+	protected int						m_LineHeight;
+	protected int						m_LastLine;
+	protected ref array<ref ChatLine>	m_Lines;
+
+	void Chat()
+	{
+		m_Lines = new array<ref ChatLine>;
+	}
+
+	void ~Chat()
+	{
+		Destroy();
+	}
+	
+	void Init(Widget root_widget)
+	{
+		Destroy();
+
+		m_RootWidget = root_widget;
+
+		if (m_RootWidget)
+		{
+			float w;
+			float h;
+			m_RootWidget.GetSize(w,h);
+			m_LineHeight = h / LINE_COUNT;
+			m_LastLine = 0;
+
+			for (int i = 0; i < LINE_COUNT; i++)
+			{
+				ChatLine line = new ChatLine(m_RootWidget);
+				m_Lines.Insert(line);
+			}
+		}
+	}
+
+	void Destroy()
+	{
+		m_Lines.Clear();
+	}
+	
+	void Clear()
+	{
+		for (int i = 0; i < LINE_COUNT; i++)
+		{
+			m_Lines.Get(i).Clear();
+		}
+	}
+	
+	void Add(ChatMessageEventParams params)
+	{
+		int max_lenght = ChatMaxUserLength;
+		int name_lenght = params.param2.Length();
+		int text_lenght = params.param3.Length();
+		int total_lenght = text_lenght + name_lenght;
+		int channel =  params.param1;
+
+		if( channel & CCSystem || channel & CCBattlEye) //TODO separate battleye bellow
+ 		{
+			if( g_Game.GetProfileOption( EDayZProfilesOptions.GAME_MESSAGES ) )
+				return;
+			
+			max_lenght = ChatMaxSystemLength; // system messages can be longer
+ 		}
+		//TODO add battleye filter to options
+		/*else if( channel & CCBattlEye ) 
+		{
+			if( g_Game.GetProfileOption( EDayZProfilesOptions.BATTLEYE_MESSAGES ) )
+				return;
+		}*/
+		else if( channel & CCAdmin )
+		{
+			if( g_Game.GetProfileOption( EDayZProfilesOptions.ADMIN_MESSAGES ) )
+				return;
+		}
+		else if( channel & CCDirect || channel & CCMegaphone || channel & CCTransmitter || channel & CCPublicAddressSystem ) 
+		{
+			if( g_Game.GetProfileOption( EDayZProfilesOptions.PLAYER_MESSAGES ) )
+				return;
+		}
+		else if( channel != 0 ) // 0 should be local messages to self
+		{
+			Print("Chat: Unknown channel " + channel);
+			return;
+		}
+		
+		if (total_lenght > max_lenght)
+		{
+			int pos = 0;
+			int lenght = Math.Clamp(max_lenght - name_lenght, 0, text_lenght);
+			ref ChatMessageEventParams tmp = new ChatMessageEventParams(params.param1, params.param2, "", params.param4);
+			
+			while (pos < text_lenght)
+			{
+				tmp.param3 = params.param3.Substring(pos, lenght);
+				AddInternal(tmp);
+				
+				tmp.param2 = "";
+				pos += lenght;
+				lenght = Math.Clamp(text_lenght - pos, 0, max_lenght);			
+			}
+		}
+		else
+		{
+			AddInternal(params);
+		}
+	}
+	
+	void AddInternal(ChatMessageEventParams params)
+	{
+		m_LastLine = (m_LastLine + 1) % m_Lines.Count();
+
+		ChatLine line = m_Lines.Get(m_LastLine);
+		line.Set(params);
+
+		for (int i = 0; i < m_Lines.Count(); i++)
+		{
+			line = m_Lines.Get((m_LastLine + 1 + i) % LINE_COUNT);
+			line.m_RootWidget.SetPos(0, i * m_LineHeight);
+			
+			float x = 0;
+			float y = 0;
+			
+			line.m_RootWidget.GetPos(x, y);
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/Chat/ChatInputMenu.c b/scripts/5_Mission/DayZ/GUI/Chat/ChatInputMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..074114bf987f1473a4195e7b97405b88fead487e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/Chat/ChatInputMenu.c
@@ -0,0 +1,107 @@
+class ChatInputMenu extends UIScriptedMenu
+{
+	private EditBoxWidget m_edit_box;
+	private TextWidget m_channel_text;
+	private UAIDWrapper m_BackInputWrapper;
+	private ref Timer m_close_timer;
+
+	void ChatInputMenu()
+	{
+		m_close_timer = new Timer();
+	}
+
+	override Widget Init()
+	{
+		m_BackInputWrapper = GetUApi().GetInputByID(UAUIBack).GetPersistentWrapper();
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_chat_input.layout");
+		m_edit_box = EditBoxWidget.Cast(layoutRoot.FindAnyWidget("InputEditBoxWidget"));
+		m_channel_text = TextWidget.Cast(layoutRoot.FindAnyWidget("ChannelText"));
+		
+		UpdateChannel();
+		return layoutRoot;
+	}
+	
+	override bool UseKeyboard() 
+	{ 
+		return true; 
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		
+		if (!finished) return false;
+		
+		string text = m_edit_box.GetText();
+
+		if (text != "")
+		{
+			GetGame().ChatPlayer(text);
+			if (!GetGame().IsMultiplayer())
+			{
+				string name;
+				GetGame().GetPlayerName(name);
+				ChatMessageEventParams chat_params = new ChatMessageEventParams(CCDirect, name, text, "");
+				MissionGameplay.Cast(GetGame().GetMission()).m_Chat.Add(chat_params);
+			}
+		}
+
+		m_close_timer.Run(0.1, this, "Close");
+		
+		GetUApi().GetInputByID(UAPersonView).Supress();	
+		
+		return true;
+	}
+	
+	override void OnShow()
+	{
+		SetFocus(m_edit_box);
+	}
+	
+	override void OnHide()
+	{
+		super.OnHide();
+		GetGame().GetMission().HideChat();
+		
+		if (!GetGame().GetMission().IsVoNActive())
+			GetGame().GetMission().HideVoiceLevelWidgets();
+	}
+	
+	override void Refresh()
+	{	
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (m_BackInputWrapper.InputP().LocalPress())
+		{
+			Close();
+		}
+	}
+	
+	void UpdateChannel()
+	{
+		m_channel_text.SetText(GetChannelName(/*GetGame().ChatGetChannel()*/0));	
+	}
+	
+	static string GetChannelName(ChatChannel channel)
+	{
+		switch (channel)
+		{
+			case CCSystem:
+				return "System";
+			case CCAdmin:
+				return "Admin";
+			case CCDirect:
+				return "Direct";
+			case CCMegaphone:
+				return "Megaphone";   
+			case CCTransmitter:
+				return "Radio"; 
+			case CCPublicAddressSystem:
+				return "PAS";
+		}	
+		
+		return "";
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/Chat/ChatLine.c b/scripts/5_Mission/DayZ/GUI/Chat/ChatLine.c
new file mode 100644
index 0000000000000000000000000000000000000000..df51ce81df51f43a5531b4efe5db39d236960f80
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/Chat/ChatLine.c
@@ -0,0 +1,158 @@
+class ChatLine
+{
+	// Consts
+	const float FADE_TIMEOUT = 30;
+	const float FADE_OUT_DURATION = 3;
+	const float FADE_IN_DURATION = 0.5;
+	
+	private const string RADIO_PREFIX = "(" + "#str_radio" + ") ";
+	private const string GAME_PREFIX = "(" + "#layout_chat_game" + ") ";
+	private const string ADMIN_PREFIX = "(" + "#STR_MP_MASTER" + ") ";
+	private const int 	 DEFAULT_COLOUR = ARGB(255, 255, 255, 255);
+	private const int 	 GAME_TEXT_COLOUR = ARGB(255, 255, 0, 0);
+	private const int 	 ADMIN_TEXT_COLOUR = ARGB(255, 255, 255, 0);
+	
+	// Widgets
+	Widget							m_RootWidget;
+	TextWidget						m_NameWidget;
+	TextWidget						m_TextWidget;
+	
+	private ref WidgetFadeTimer 	m_FadeTimer;
+	private ref Timer 				m_TimeoutTimer;
+
+	void ChatLine(Widget root_widget)
+	{
+		m_RootWidget	= GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_chat_item.layout", root_widget);
+	
+		m_NameWidget	= TextWidget.Cast( m_RootWidget.FindAnyWidget( "ChatItemSenderWidget" ) );
+		m_TextWidget	= TextWidget.Cast( m_RootWidget.FindAnyWidget( "ChatItemTextWidget" ) );
+		
+		m_FadeTimer		= new WidgetFadeTimer;
+		m_TimeoutTimer	= new Timer(CALL_CATEGORY_GUI);
+	}
+
+	void ~ChatLine()
+	{
+		delete m_TextWidget;
+	}
+
+	void Set(ChatMessageEventParams params)	// Param 1 --> Channel, Param 2 --> sender name, Param 3 --> message, Param 4 ?? 
+	{
+		int channel; 
+		
+		m_NameWidget.SetText("");
+		m_TextWidget.SetText("");
+		
+		SetColour(DEFAULT_COLOUR);
+		m_RootWidget.Show(true);
+		
+		channel = params.param1; // 0 = Survior   1 = Game/System   2 = Admin 
+
+		/*
+		if (params.param2 != "")
+		{
+			m_NameWidget.SetText( params.param2 + " : "); 
+		}
+		
+		if( channel & CCSystem )
+ 		{
+			if(params.param2 != "")
+			{
+				m_NameWidget.SetText(GAME_PREFIX + ": " );
+			} 
+			SetColour(GAME_TEXT_COLOUR);
+ 		}
+		else if( channel & CCAdmin )
+		{
+			m_NameWidget.SetText(ADMIN_PREFIX + ": ");
+			SetColour(ADMIN_TEXT_COLOUR);			
+		}
+		else if( channel & CCTransmitter )
+		{
+			m_NameWidget.SetText(RADIO_PREFIX + params.param2 + " : ");
+		}		
+		*/
+		
+		if ( channel & CCSystem )
+		{
+			// Game
+			if (params.param2 != "")
+			{
+				m_NameWidget.SetText(GAME_PREFIX + ": " );
+			}
+			
+			SetColorByParam(params.param4, GAME_TEXT_COLOUR);
+		}
+		else if ( channel & CCAdmin )
+		{
+			// Admin
+			m_NameWidget.SetText(ADMIN_PREFIX + ": ");
+			SetColorByParam(params.param4, ADMIN_TEXT_COLOUR);
+		}
+		else if ( channel & CCTransmitter )
+		{
+			// Radio - Trasnmitter
+			m_NameWidget.SetText(RADIO_PREFIX + params.param2 + " : ");
+		}
+		else if ( channel == 0 || channel & CCDirect )
+		{
+			// Player
+			if (params.param2 != "")
+			{
+				m_NameWidget.SetText(params.param2 + " : ");
+			}
+		}
+		
+		
+		m_TextWidget.SetText(params.param3);		
+		
+		m_FadeTimer.FadeIn(m_RootWidget, FADE_IN_DURATION);
+		m_TimeoutTimer.Run(FADE_TIMEOUT, m_FadeTimer, "FadeOut", new Param2<Widget, float>(m_RootWidget, FADE_OUT_DURATION));
+	}
+	
+	private void SetColour(int colour)
+	{
+		m_NameWidget.SetColor(colour);
+		m_TextWidget.SetColor(colour);
+	}
+	
+	protected void SetColorByParam(string pParamValue, int pFallback)
+	{
+		if (pParamValue != "")
+		{
+			SetColour(ColorNameToColor(pParamValue));
+			return;
+		}
+		
+		SetColour(pFallback);
+	}
+
+	void Clear()
+	{
+		m_RootWidget.Show( false );
+		m_TimeoutTimer.Stop();
+		m_FadeTimer.Stop();
+	}
+	
+	protected int ColorNameToColor(string pColorName)
+	{
+		int color = 0xFFFFFFFF;
+		switch (pColorName)
+		{
+		case "colorStatusChannel":
+			color = COLOR_BLUE;
+		break;
+		case "colorAction":
+			color = COLOR_YELLOW;
+		break;
+		case "colorFriendly":
+			color = COLOR_GREEN;
+		break;
+		case "colorImportant":
+			color = COLOR_RED;
+		break;
+		}
+		
+		return color;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ContinuousActionProgress.c b/scripts/5_Mission/DayZ/GUI/ContinuousActionProgress.c
new file mode 100644
index 0000000000000000000000000000000000000000..8eb255dd85ee0647d209de4ade61886b359fd383
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ContinuousActionProgress.c
@@ -0,0 +1,145 @@
+class ContinuousActionProgress extends ScriptedWidgetEventHandler
+{
+	reference string				RadialBarWidgetName;
+
+	protected PlayerBase 			m_Player;
+	protected ActionBase			m_Action;
+	protected int 					m_ActionState;
+	protected ActionManagerBase		m_AM;
+	
+	protected ref WidgetFadeTimer	m_FadeTimer;
+	protected bool					m_Faded;
+	
+	protected float 				m_InitProgress;
+	protected float					m_Speed;
+
+	protected Widget				m_Root;
+	protected Widget				m_RadialWidget;
+	protected ImageWidget 			m_LoaderImage;
+	ref RadialProgressBar			m_Radial;
+
+	void ContinuousActionProgress()
+	{
+		m_Action = null;
+		m_ActionState = -1;
+		m_AM = null;
+		m_RadialWidget = null;
+		m_LoaderImage = null;
+		m_Radial = null;
+		m_Speed = 0;
+		m_InitProgress = 100;
+		
+		m_FadeTimer = new WidgetFadeTimer;
+		m_Faded = true;
+
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(Update);
+	}
+	
+	void ~ContinuousActionProgress()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Remove(Update);
+	}
+
+	protected void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+		m_Root.Show(false);
+
+		m_RadialWidget = m_Root.FindAnyWidget("PBRadial1");
+		m_LoaderImage = ImageWidget.Cast( m_Root.FindAnyWidget("cap_init_loader") );
+		if(m_RadialWidget)
+			m_RadialWidget.GetScript(m_Radial);
+		m_Root.Update();
+	}
+
+	protected void Update()
+	{
+		//! don't show continuous action progressif it's disabled in profile OR soft-disabled by the '~' keyhold
+		Mission mission = GetGame().GetMission();
+		IngameHud hud;
+		if (mission && Class.CastTo(hud,mission.GetHud()) && (hud.IsHideHudPlayer() || !hud.GetHudState()))
+		{
+			m_Root.Show(false);
+			return;
+		}
+
+		if(m_Player && !m_Player.IsAlive()) // handle respawn
+		{
+			m_Player = null;
+			m_AM = null;
+		}
+		if(!m_Player) GetPlayer();
+		if(!m_AM) GetActionManager();
+
+		GetActions();
+
+		if(m_Action && m_Action.HasProgress() && m_ActionState != UA_NONE && GetGame().GetUIManager().GetMenu() == null)
+		{
+			if(m_ActionState == UA_INITIALIZE || m_ActionState == UA_AM_PENDING)
+			{
+				m_Speed += 0.02;
+				m_LoaderImage.SetRotation(0, 0, m_Speed * Math.RAD2DEG);
+				m_LoaderImage.Show(true);
+			}
+			else
+			{
+				m_Speed = 0.0;
+				m_LoaderImage.SetRotation(0, 0, 0);
+				m_LoaderImage.Show(false);
+			}
+
+			if(m_ActionState == UA_PROCESSING)
+			{
+				m_InitProgress = 100;
+				m_LoaderImage.SetRotation(0, 0, 0);
+				SetProgress(Math.AbsFloat(m_AM.GetActionComponentProgress() * 100));
+			}
+			m_Root.Show(true);
+		}
+		else
+		{
+			m_Speed = 0.0;
+			m_Root.Show(false);
+			m_LoaderImage.Show(false);
+			SetProgress(0.0);
+			m_LoaderImage.SetRotation(0, 0, 0);
+		}
+	}
+
+	// getters
+  	private void GetPlayer()
+	{
+		Class.CastTo(m_Player, GetGame().GetPlayer());
+	}
+
+	private void GetActionManager()
+	{
+		if( m_Player && m_Player.IsPlayerSelected() )
+		{
+			Class.CastTo(m_AM, m_Player.GetActionManager());
+		}
+		else
+			m_AM = null;
+	}
+
+  	private void GetActions()
+	{
+		if(!m_AM) return;
+
+		m_Action = null;
+		m_ActionState = -1;
+		m_Action = m_AM.GetRunningAction();
+
+		if(m_Action && m_Action.GetInput().GetInputType() == ActionInputType.AIT_CONTINUOUS)
+			m_ActionState = m_AM.GetActionState(m_Action);
+		else
+			m_Action = null;
+	}
+
+	private void SetProgress(float progress)
+	{
+		if(m_Radial)
+			m_Radial.SetProgress(progress);
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ControlsXbox.c b/scripts/5_Mission/DayZ/GUI/ControlsXbox.c
new file mode 100644
index 0000000000000000000000000000000000000000..c57ca71723af9dd56c95cc525fe4025a2295042e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ControlsXbox.c
@@ -0,0 +1,447 @@
+/*
+DEPRECATED CONTENT
+*/
+
+class JsonControlMappingInfo
+{
+	int m_TabID;
+	int m_TextWidgetID;
+	string m_ButtonName;
+	string m_InfoText;
+}
+
+class ControlsXbox extends UIScriptedMenu
+{
+	protected string 					m_BackButtonTextID;
+	
+	protected ButtonWidget 				m_Back;
+	protected ImageWidget 				m_ControlsLayoutImage;
+	protected const int 				TABS_COUNT = 4;
+	protected ImageWidget 				m_tab_images[TABS_COUNT];
+	protected TabberUI					m_TabScript;
+	
+	//============================================
+	// ControlsXbox
+	//============================================
+	void ControlsXbox()
+	{
+		
+	}
+	
+	void ~ControlsXbox()
+	{
+		PPERequesterBank.GetRequester(PPERequester_ControlsBlur).Stop();
+	}
+	
+	void Back()
+	{
+		GetGame().GetUIManager().Back();
+	}
+	
+	void DrawConnectingLines(int index)
+	{
+		ref array<ref JsonControlMappingInfo> control_mapping_info = new array<ref JsonControlMappingInfo>;
+		ref array<ref array <ref JsonControlMappingInfo>> tab_array = new array<ref array <ref JsonControlMappingInfo>>;
+		
+		map<string, ref array<int>> button_marker_groups_unflitred = new map<string, ref array<int>>;
+		map<string, ref array<int>> button_marker_groups = new map<string, ref array<int>>;
+		
+		float text_widget_pos_x, text_widget_pos_y;
+		float text_widget_width, text_widget_height;
+		float dot_pos_x, dot_pos_y;
+		float dot_width, dot_height;
+		float draw_pos_x, draw_pos_y;
+		
+		CanvasWidget canvas_widget = CanvasWidget.Cast(layoutRoot.FindAnyWidget("CanvasWidget_" + index));
+		canvas_widget.Clear();
+		control_mapping_info = GetControlMappingInfo();
+		
+		for (int i = 0; i < m_TabScript.GetTabCount(); i++)
+		{
+			tab_array.Insert(new array<ref JsonControlMappingInfo>);
+			for (int j = 0; j < 20; j++)
+			{
+				tab_array[i].Insert(null);
+			}
+		}
+		
+		// insert json info to array by index, so it is sorted
+		for (i = 0; i < control_mapping_info.Count(); i++)
+		{
+			JsonControlMappingInfo info = control_mapping_info.Get(i);
+			tab_array[info.m_TabID][info.m_TextWidgetID] = info;
+		}
+		
+		// create group of buttons which are connected together with line
+		for (int l = 0; l < control_mapping_info.Count(); l++)
+		{
+			JsonControlMappingInfo info1 = control_mapping_info[l];
+			string button_name = info1.m_ButtonName;
+			int text_widget_id = info1.m_TextWidgetID;
+			if (info1.m_TabID != index)
+			{
+				continue;
+			}
+			if (!button_marker_groups_unflitred.Contains(button_name))
+			{
+				button_marker_groups_unflitred.Insert(button_name, new ref array<int>);
+				button_marker_groups_unflitred.Get(button_name).Insert(text_widget_id);
+			}
+			else
+			{
+				button_marker_groups_unflitred.Get(button_name).Insert(text_widget_id);
+			}
+		}
+		
+		// we want groups which are bigger than 1
+		for (l = 0; l < button_marker_groups_unflitred.Count(); l++)
+		{
+			if (button_marker_groups_unflitred.GetElement(l).Count() > 1)
+			{
+				string key = button_marker_groups_unflitred.GetKey(l);
+				button_marker_groups.Insert(button_marker_groups_unflitred.GetKey(l), button_marker_groups_unflitred.Get(key));
+			}
+		}
+		
+		Widget controls_image;
+		// hide all button markers
+		#ifdef PLATFORM_XBOX
+		controls_image = layoutRoot.FindAnyWidget("XboxControlsImage");
+		#else
+		#ifdef PLATFORM_PS4
+		controls_image = layoutRoot.FindAnyWidget("PSControlsImage");
+		#endif
+		#endif
+		
+		Widget child = controls_image.GetChildren();
+		child.Show(false);
+		while (child.GetSibling())
+		{
+			child = child.GetSibling();
+			child.Show(false);
+		}
+
+		Widget panel_widget;
+		Widget button_marker_widget;
+		
+		for (l = 0; l < tab_array[index].Count(); l++)
+		{
+			panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + l);
+			if (tab_array[index][l] != null)
+			{
+				TextWidget text_widget = TextWidget.Cast(panel_widget.FindAnyWidget("TextWidget" + l));
+
+				string key_prefix;
+				#ifdef PLATFORM_XBOX
+				key_prefix = "xb_button_marker_";
+				#else
+				#ifdef PLATFORM_PS4
+				key_prefix = "ps_button_marker_";
+				#endif
+				#endif
+
+				button_marker_widget = layoutRoot.FindAnyWidget(key_prefix + tab_array[index][l].m_ButtonName);
+				text_widget.SetText(tab_array[index][l].m_InfoText);
+				panel_widget.Show(true);
+				button_marker_widget.Show(true);
+				panel_widget.Update();
+				if (!button_marker_groups.Contains(tab_array[index][l].m_ButtonName))
+				{
+					panel_widget.GetScreenPos(text_widget_pos_x, text_widget_pos_y);
+					panel_widget.GetScreenSize(text_widget_width,text_widget_height);
+					
+					button_marker_widget.GetScreenPos(dot_pos_x, dot_pos_y);
+					button_marker_widget.GetScreenSize(dot_width, dot_height);
+					
+					draw_pos_y = text_widget_pos_y + text_widget_height / 2;
+					if (l < 10)
+					{
+						draw_pos_x = text_widget_pos_x + text_widget_width - 1;
+					}
+					else
+					{
+						draw_pos_x = text_widget_pos_x;
+					}
+					canvas_widget.DrawLine(draw_pos_x, draw_pos_y, dot_pos_x+dot_width/2, draw_pos_y, 2, ARGBF(0.6, 1, 1, 1));
+					canvas_widget.DrawLine(dot_pos_x+dot_width/2, draw_pos_y, dot_pos_x+dot_width/2, dot_pos_y+dot_height/2, 2, ARGBF(0.6, 1, 1, 1));	
+				}
+			}
+			else
+			{
+				panel_widget.Show(false);
+			}
+			panel_widget.Update();
+		}
+		
+		// draw connecting lines 
+		for (l = 0; l <  button_marker_groups.Count(); l++)
+		{
+			text_widget_pos_x = 0;
+			text_widget_pos_y = 0;
+			text_widget_width = 0;
+			text_widget_height = 0;
+			float group_point_x = 0, group_point_y = 0;
+			float first_x = 0, first_y = 0;
+			
+			ref array<int> element = button_marker_groups.GetElement(l);
+			string key_name = button_marker_groups.GetKey(l);
+			#ifdef PLATFORM_XBOX
+			key_prefix = "xb_button_marker_";
+			#else
+			#ifdef PLATFORM_PS4
+			key_prefix = "ps_button_marker_";
+			#endif
+			#endif
+			button_marker_widget = layoutRoot.FindAnyWidget(key_prefix + key_name);
+			
+			for (int g = 0; g < element.Count(); g++)
+			{
+				panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + element[g]);
+				
+				panel_widget.GetScreenPos(text_widget_pos_x, text_widget_pos_y);
+				panel_widget.GetScreenSize(text_widget_width, text_widget_height);
+				
+				if (g == 0)
+				{
+					if (element[0] < 10)
+					{
+						first_x = text_widget_pos_x + text_widget_width +50;
+					}
+					else
+					{
+						first_x = text_widget_pos_x - 50;
+					}
+
+					first_y = text_widget_pos_y + text_widget_height/2;
+				}
+
+				group_point_x += text_widget_pos_x;
+				group_point_y += text_widget_pos_y;
+				if (element[0] < 10)
+				{
+					canvas_widget.DrawLine(text_widget_pos_x + text_widget_width - 1, text_widget_pos_y + text_widget_height/2, text_widget_pos_x + text_widget_width +50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+				}
+				else
+				{
+					canvas_widget.DrawLine(text_widget_pos_x, text_widget_pos_y + text_widget_height/2, text_widget_pos_x - 50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+				}
+			}
+			if (element[0] < 10)
+			{
+				group_point_x = group_point_x/element.Count() + text_widget_width + 50;
+			}
+			else
+			{
+				group_point_x = group_point_x/element.Count() - 50;
+			}
+
+			if (element.Count() % 2 == 0)
+			{
+				group_point_y = ((text_widget_pos_y + text_widget_height/2) - first_y) / 2 + first_y;
+			}
+			else
+			{
+				float text_widget_pos_x_center, text_widget_pos_y_center;
+				float text_widget_width_center, text_widget_height_center;
+				
+				panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + element[1]);
+				
+				panel_widget.GetScreenPos(text_widget_pos_x_center, text_widget_pos_y_center);
+				panel_widget.GetScreenSize(text_widget_width_center, text_widget_height_center);
+				
+				group_point_y = text_widget_pos_y_center + text_widget_height_center / 2;
+			}
+			
+			button_marker_widget.GetScreenPos(dot_pos_x, dot_pos_y);
+			button_marker_widget.GetScreenSize(dot_width, dot_height);
+			
+			canvas_widget.DrawLine(group_point_x, group_point_y, dot_pos_x+dot_width/2, group_point_y, 2, ARGBF(0.6, 1, 1, 1));
+			canvas_widget.DrawLine(dot_pos_x+dot_width/2, group_point_y, dot_pos_x+dot_width/2, dot_pos_y, 2, ARGBF(0.6, 1, 1, 1));
+			
+			if (element[0] < 10)
+			{
+				canvas_widget.DrawLine(first_x, first_y, text_widget_pos_x + text_widget_width +50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+			}
+			else
+			{
+				canvas_widget.DrawLine(first_x, first_y, text_widget_pos_x - 50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+			}
+		}
+	}
+	
+	protected array<ref JsonControlMappingInfo> GetControlMappingInfo()
+	{
+		array<ref JsonControlMappingInfo> control_mapping_info = new array<ref JsonControlMappingInfo>;
+		
+		string file_path =	"xbox/pagedatacontroller.json";
+		#ifdef PLATFORM_PS4
+		file_path =	"ps4/pagedatacontroller.json";
+		#endif
+		FileHandle file_handle = OpenFile(file_path, FileMode.READ);
+		JsonSerializer js = new JsonSerializer();
+		
+		string js_error = "";
+		string line_content = "";
+		string content = "";
+		if (file_handle)
+		{
+			while (FGets(file_handle, line_content) >= 0)
+			{
+				content += line_content;
+			}
+			CloseFile(file_handle);
+			
+			if (js.ReadFromString(control_mapping_info, content, js_error))
+			{
+				return control_mapping_info;
+			}
+			else
+			{
+				ErrorEx("JSON ERROR => [ControlMappingInfo.json]: "+ js_error,ErrorExSeverity.INFO);
+			}
+		}
+		
+		return control_mapping_info;
+	}
+	
+	//============================================
+	// Init
+	//============================================
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/xbox/control_mapping_info_screen.layout");
+		
+		layoutRoot.FindAnyWidget("Tabber").GetScript(m_TabScript);
+		
+		m_TabScript.m_OnTabSwitch.Insert(DrawConnectingLines);
+		
+		m_Back = ButtonWidget.Cast(layoutRoot.FindAnyWidget("back"));
+
+		#ifdef PLATFORM_CONSOLE		
+		RichTextWidget toolbar_switch	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("ChangePresetIcon"));
+		RichTextWidget toolbar_back		= RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		toolbar_switch.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UASwitchPreset", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_back.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		#endif
+		
+		#ifdef PLATFORM_XBOX
+			layoutRoot.FindAnyWidget("XboxControlsImage").Show(true);
+		#else
+		#ifdef PLATFORM_PS4
+			layoutRoot.FindAnyWidget("PSControlsImage").Show(true);
+		#endif
+		#endif
+
+		m_tab_images[0] = ImageWidget.Cast(layoutRoot.FindAnyWidget("MovementTabBackdropImageWidget"));
+		m_tab_images[1] = ImageWidget.Cast(layoutRoot.FindAnyWidget("WeaponsAndActionsBackdropImageWidget"));
+		m_tab_images[2] = ImageWidget.Cast(layoutRoot.FindAnyWidget("InventoryTabBackdropImageWidget"));
+		m_tab_images[3] = ImageWidget.Cast(layoutRoot.FindAnyWidget("MenusTabBackdropImageWidget"));
+		
+		PPERequester_MenuEffects requester;
+		Class.CastTo(requester,PPERequesterBank.GetRequester(PPERequesterBank.REQ_MENUEFFECTS));
+		requester.SetVignetteIntensity(0.6);
+		
+		DrawConnectingLines(0);
+
+		return layoutRoot;
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		#ifdef PLATFORM_CONSOLE
+		//layoutRoot.FindAnyWidget("toolbar_bg").Show(!GetGame().GetInput().IsEnabledMouseAndKeyboard());
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(true);//TODO: temporarily always on for preset switching
+		
+		string preset_text;
+		UAInputAPI inputAPI = GetUApi();
+		TextWidget nameWidget;
+		if (Class.CastTo(nameWidget,layoutRoot.FindAnyWidget("PresetText")));
+		{
+			preset_text = inputAPI.PresetName(inputAPI.PresetCurrent());
+			nameWidget.SetText(preset_text);
+		}
+		#endif
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Back)
+			{
+				Back();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUITabLeft).LocalPress())
+		{
+			m_TabScript.PreviousTab();
+		}
+		
+		if (GetUApi().GetInputByID(UAUITabRight).LocalPress())
+		{
+			m_TabScript.NextTab();
+		}
+		
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Back();
+		}
+		
+		if (GetUApi().GetInputByID(UASwitchPreset).LocalPress())
+		{
+			SwitchPreset();
+		}
+	}
+	
+	/// Initial texts load for the footer buttons
+	protected void LoadFooterButtonTexts()
+	{
+		TextWidget uiBackText = TextWidget.Cast(layoutRoot.FindAnyWidget("BackText"));		
+		if (uiBackText)
+		{
+			uiBackText.SetText(m_BackButtonTextID);
+		}
+	}
+
+	/// Set correct bottom button texts based on platform (ps4 vs xbox texts)
+	protected void LoadTextStrings()
+	{
+		#ifdef PLATFORM_PS4
+		m_BackButtonTextID = "ps4_ingame_menu_back";
+		#else 
+		m_BackButtonTextID = "STR_rootFrame_toolbar_bg_ConsoleToolbar_Back_BackText0";	
+		#endif
+	}
+	
+	protected void SwitchPreset()
+	{
+		int index;
+		string preset_text;
+		UAInputAPI inputAPI = GetUApi();
+		TextWidget nameWidget;
+		
+		index = inputAPI.PresetCurrent() + 1;
+		if (index >= inputAPI.PresetCount())
+		{
+			index = 0;
+		}
+		
+		inputAPI.PresetSelect(index);
+		if (Class.CastTo(nameWidget,layoutRoot.FindAnyWidget("PresetText")));
+		{
+			preset_text = inputAPI.PresetName(inputAPI.PresetCurrent());
+			nameWidget.SetText(preset_text);
+		}
+		
+		GetGame().GetInput().SetProfile(index);		
+		GetUApi().Export();
+		GetGame().GetMission().GetOnInputPresetChanged().Invoke();
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ControlsXboxNew.c b/scripts/5_Mission/DayZ/GUI/ControlsXboxNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8f772b1ecd47d7c19579c67f84ede20c13799cb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ControlsXboxNew.c
@@ -0,0 +1,767 @@
+
+//used as UserID in the layout. Values assigned for convenience here
+enum EConsoleButtonsControls
+{
+	INVALID = 0, //assumed unassigned value, ignored (dividers, formatting elements etc.)
+	BUTTON_MENU = 1,
+	BUTTON_VIEW = 2,
+	BUTTON_A = 4,
+	BUTTON_B = 8,
+	BUTTON_X = 16,
+	BUTTON_Y = 32,
+	BUTTON_PAD_UP = 64,
+	BUTTON_PAD_DOWN = 128,
+	BUTTON_PAD_LEFT = 256,
+	BUTTON_PAD_RIGHT = 512,
+	BUTTON_SHOULDER_LEFT = 1024,
+	BUTTON_SHOULDER_RIGHT = 2048,
+	BUTTON_THUMB_LEFT = 4096,
+	BUTTON_THUMB_RIGHT = 8192,
+	BUTTON_TRIGGER_LEFT = 16384,
+	BUTTON_TRIGGER_RIGHT = 32768,
+	BUTTON_GROUP_RIGHT_SIDE_COMMON = 65536,
+	BUTTON_GROUP_PAD_COMMON = 131072
+}
+
+typedef map<int,ref array<Widget>> TButtonPairingInfo; //<button_mask,<associated widgets on the respective side>>
+
+class ControlsXboxNew extends UIScriptedMenu
+{
+	protected string 					m_BackButtonTextID;
+	protected string 					m_NextPresetText;
+	protected int 						m_CurrentTabIdx = -1;
+	protected int 						m_CurrentPresetVariant = -1;
+	
+	protected ButtonWidget 				m_Back;
+	protected ImageWidget 				m_ControlsLayoutImage;
+	
+	//-------------
+	protected CanvasWidget				m_CanvasWidget;
+	protected TabberUI					m_TabScript;
+	protected Widget					m_TabberWidget;
+	protected Widget 					m_ControlsImage;
+	protected Widget 					m_PlatformHolder; //controls container for selected platform
+	protected Widget 					m_VariantWidget;
+	
+	protected ref map<int,Widget> 					m_ImageMarkerStructure;
+	protected ref map<int,Widget> 					m_CategoryStructure;
+	protected ref map<int,ref TButtonPairingInfo> 	m_AreasLR; //left/right area holders
+	
+	protected const int 				AREA_LEFT = 1;
+	protected const int 				AREA_RIGHT = 2;
+	protected const int 				PLATFORM_ADJUST_X1 = 1000;
+	protected const int 				PLATFORM_ADJUST_PS = 2000;
+	
+	//============================================
+	// ControlsXboxNew
+	//============================================
+	void ~ControlsXboxNew()
+	{
+		PPERequesterBank.GetRequester(PPERequesterBank.REQ_MENUEFFECTS).Stop();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElementVisibility();
+	}
+	
+	void Back()
+	{
+		GetGame().GetUIManager().Back();
+	}
+	
+	void UpdateTabContent(int tab_index)
+	{
+		Widget w;
+		//hide old
+		if (m_CurrentTabIdx != -1)
+		{
+			m_VariantWidget.Show(false);
+			while (m_VariantWidget.GetParent())
+			{
+				m_VariantWidget = m_VariantWidget.GetParent();
+				m_VariantWidget.Show(false);
+			}
+		}
+		//show new
+		w = FindChildByID(m_CategoryStructure[tab_index],InputUtils.GetConsolePresetID());
+		w.Show(true);
+		m_VariantWidget = w;
+		
+		while (w.GetParent())
+		{
+			w = w.GetParent();
+			w.Show(true);
+		}
+		
+		DrawConnectingLines(tab_index);
+		m_CurrentTabIdx = tab_index;
+	}
+	
+	protected void DrawConnectingLines(int index)
+	{
+		//disconnected for now, to be finished
+		return;
+		
+		m_CanvasWidget.Clear();
+		
+		//TODO drawing over nyah
+		m_VariantWidget;
+		m_AreasLR = new map<int,ref TButtonPairingInfo>;
+		
+		Widget wid_side; //left or right area
+		Widget wid_spacer; //item in the L/R areas
+		wid_side = m_VariantWidget.GetChildren();
+		typename t = EConsoleButtonsControls;
+		int side_idx;
+		int enum_value;
+		array<Widget> items_raw;
+		array<Widget> items_filtered;
+		
+		while (wid_side)
+		{
+			TButtonPairingInfo button_mapping = new TButtonPairingInfo;
+			
+			side_idx = wid_side.GetUserID();
+			wid_spacer = wid_side.GetChildren(); //dig into the side first..
+			
+			for (int i = 1; i < EnumTools.GetEnumSize(EConsoleButtonsControls); i++)
+			{
+				items_raw = new array<Widget>;
+				items_filtered = new array<Widget>;
+				t.GetVariableValue(null, i, enum_value); //TODO
+				
+				FindAllChildrenByID(wid_spacer,enum_value,items_raw);
+				if (FilterByVisible(items_raw,items_filtered) > 0) //if there are any button-relevant items..
+				{
+					button_mapping.Insert(enum_value,items_filtered);
+					
+					//dump it!
+/*
+					for (int dump = 0; dump < items_filtered.Count(); dump++)
+					{
+						Print("key: " + i + " | name: " + items_filtered[dump].GetName());
+					}
+					Print("-");
+*/
+				}
+			}
+			m_AreasLR.Insert(side_idx,button_mapping);
+			
+			wid_side = wid_side.GetSibling();
+		}
+		
+		//dump it 2: the dumpening!
+/*
+		int count_2 = m_AreasLR.Count();
+		for (int z = 0; z < m_AreasLR.Count(); z++)
+		{
+			Print("---------");
+			Print("Area: " + z);
+			TButtonPairingInfo tmp_info = m_AreasLR.GetElement(z);
+			int count_1 = tmp_info.Count();
+			for (int zz = 0; zz < tmp_info.Count(); zz++)
+			{
+				for (int zzz = 0; zzz < tmp_info.GetElement(zz).Count(); zzz++)
+				{
+					Print("key: " + tmp_info.GetKey(zz) + " | name: " + tmp_info.GetElement(zz).Get(zzz).GetName());
+				}
+			}
+		}
+		
+		Print("------------------------");
+*/
+		/*
+		map<string, ref array<int>> button_marker_groups_unflitred = new map<string, ref array<int>>;
+		map<string, ref array<int>> button_marker_groups = new map<string, ref array<int>>;
+		
+		float text_widget_pos_x, text_widget_pos_y;
+		float text_widget_width, text_widget_height;
+		float dot_pos_x, dot_pos_y;
+		float dot_width, dot_height;
+		float draw_pos_x, draw_pos_y;
+		
+		m_CanvasWidget.Clear();
+		
+		for (int i = 0; i < m_TabScript.GetTabCount(); i++)
+		{
+			tab_array.Insert(new array<ref JsonControlMappingInfo>);
+			for (int j = 0; j < 20; j++)
+			{
+				tab_array[i].Insert(null);
+			}
+		}
+		
+		// insert json info to array by index, so it is sorted
+		for (i = 0; i < control_mapping_info.Count(); i++)
+		{
+			JsonControlMappingInfo info = control_mapping_info.Get(i);
+			tab_array[info.m_TabID][info.m_TextWidgetID] = info;
+		}
+		
+		// create group of buttons which are connected together with line
+		for (int l = 0; l < control_mapping_info.Count(); l++)
+		{
+			JsonControlMappingInfo info1 = control_mapping_info[l];
+			string button_name = info1.m_ButtonName;
+			int text_widget_id = info1.m_TextWidgetID;
+			if (info1.m_TabID != index)
+			{
+				continue;
+			}
+			if (!button_marker_groups_unflitred.Contains(button_name))
+			{
+				button_marker_groups_unflitred.Insert(button_name, new ref array<int>);
+				button_marker_groups_unflitred.Get(button_name).Insert(text_widget_id);
+			}
+			else
+			{
+				button_marker_groups_unflitred.Get(button_name).Insert(text_widget_id);
+			}
+		}
+		
+		// we want groups which are bigger than 1
+		for (l = 0; l < button_marker_groups_unflitred.Count(); l++)
+		{
+			if (button_marker_groups_unflitred.GetElement(l).Count() > 1)
+			{
+				string key = button_marker_groups_unflitred.GetKey(l);
+				button_marker_groups.Insert(button_marker_groups_unflitred.GetKey(l), button_marker_groups_unflitred.Get(key));
+			}
+		}
+
+		Widget panel_widget;
+		Widget button_marker_widget;
+		
+		for (l = 0; l < tab_array[index].Count(); l++)
+		{
+			panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + l);
+			if (tab_array[index][l] != null)
+			{
+				TextWidget text_widget = TextWidget.Cast(panel_widget.FindAnyWidget("TextWidget" + l));
+
+				string key_prefix;
+				#ifdef PLATFORM_XBOX
+				key_prefix = "xb_button_marker_";
+				#else
+				#ifdef PLATFORM_PS4
+				key_prefix = "ps_button_marker_";
+				#endif
+				#endif
+
+				button_marker_widget = layoutRoot.FindAnyWidget(key_prefix + tab_array[index][l].m_ButtonName);
+				text_widget.SetText(tab_array[index][l].m_InfoText);
+				panel_widget.Show(true);
+				button_marker_widget.Show(true);
+				panel_widget.Update();
+				if (!button_marker_groups.Contains(tab_array[index][l].m_ButtonName))
+				{
+					panel_widget.GetScreenPos(text_widget_pos_x, text_widget_pos_y);
+					panel_widget.GetScreenSize(text_widget_width,text_widget_height);
+					
+					button_marker_widget.GetScreenPos(dot_pos_x, dot_pos_y);
+					button_marker_widget.GetScreenSize(dot_width, dot_height);
+					
+					draw_pos_y = text_widget_pos_y + text_widget_height / 2;
+					if (l < 10)
+					{
+						draw_pos_x = text_widget_pos_x + text_widget_width - 1;
+					}
+					else
+					{
+						draw_pos_x = text_widget_pos_x;
+					}
+					m_CanvasWidget.DrawLine(draw_pos_x, draw_pos_y, dot_pos_x+dot_width/2, draw_pos_y, 2, ARGBF(0.6, 1, 1, 1));
+					m_CanvasWidget.DrawLine(dot_pos_x+dot_width/2, draw_pos_y, dot_pos_x+dot_width/2, dot_pos_y+dot_height/2, 2, ARGBF(0.6, 1, 1, 1));	
+				}
+			}
+			else
+			{
+				panel_widget.Show(false);
+			}
+			panel_widget.Update();
+		}
+		
+		// draw connecting lines 
+		for (l = 0; l <  button_marker_groups.Count(); l++)
+		{
+			text_widget_pos_x = 0;
+			text_widget_pos_y = 0;
+			text_widget_width = 0;
+			text_widget_height = 0;
+			float group_point_x = 0, group_point_y = 0;
+			float first_x = 0, first_y = 0;
+			
+			ref array<int> element = button_marker_groups.GetElement(l);
+			string key_name = button_marker_groups.GetKey(l);
+			#ifdef PLATFORM_XBOX
+			key_prefix = "xb_button_marker_";
+			#else
+			#ifdef PLATFORM_PS4
+			key_prefix = "ps_button_marker_";
+			#endif
+			#endif
+			button_marker_widget = layoutRoot.FindAnyWidget(key_prefix + key_name);
+			
+			for (int g = 0; g < element.Count(); g++)
+			{
+				panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + element[g]);
+				
+				panel_widget.GetScreenPos(text_widget_pos_x, text_widget_pos_y);
+				panel_widget.GetScreenSize(text_widget_width, text_widget_height);
+				
+				if (g == 0)
+				{
+					if (element[0] < 10)
+					{
+						first_x = text_widget_pos_x + text_widget_width +50;
+					}
+					else
+					{
+						first_x = text_widget_pos_x - 50;
+					}
+
+					first_y = text_widget_pos_y + text_widget_height/2;
+				}
+
+				group_point_x += text_widget_pos_x;
+				group_point_y += text_widget_pos_y;
+				if (element[0] < 10)
+				{
+					m_CanvasWidget.DrawLine(text_widget_pos_x + text_widget_width - 1, text_widget_pos_y + text_widget_height/2, text_widget_pos_x + text_widget_width +50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+				}
+				else
+				{
+					m_CanvasWidget.DrawLine(text_widget_pos_x, text_widget_pos_y + text_widget_height/2, text_widget_pos_x - 50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+				}
+			}
+			if (element[0] < 10)
+			{
+				group_point_x = group_point_x/element.Count() + text_widget_width + 50;
+			}
+			else
+			{
+				group_point_x = group_point_x/element.Count() - 50;
+			}
+
+			if (element.Count() % 2 == 0)
+			{
+				group_point_y = ((text_widget_pos_y + text_widget_height/2) - first_y) / 2 + first_y;
+			}
+			else
+			{
+				float text_widget_pos_x_center, text_widget_pos_y_center;
+				float text_widget_width_center, text_widget_height_center;
+				
+				panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + element[1]);
+				
+				panel_widget.GetScreenPos(text_widget_pos_x_center, text_widget_pos_y_center);
+				panel_widget.GetScreenSize(text_widget_width_center, text_widget_height_center);
+				
+				group_point_y = text_widget_pos_y_center + text_widget_height_center / 2;
+			}
+			
+			button_marker_widget.GetScreenPos(dot_pos_x, dot_pos_y);
+			button_marker_widget.GetScreenSize(dot_width, dot_height);
+			
+			m_CanvasWidget.DrawLine(group_point_x, group_point_y, dot_pos_x+dot_width/2, group_point_y, 2, ARGBF(0.6, 1, 1, 1));
+			m_CanvasWidget.DrawLine(dot_pos_x+dot_width/2, group_point_y, dot_pos_x+dot_width/2, dot_pos_y, 2, ARGBF(0.6, 1, 1, 1));
+			
+			if (element[0] < 10)
+			{
+				m_CanvasWidget.DrawLine(first_x, first_y, text_widget_pos_x + text_widget_width +50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+			}
+			else
+			{
+				m_CanvasWidget.DrawLine(first_x, first_y, text_widget_pos_x - 50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+			}
+		}
+		*/
+	}
+	
+	//============================================
+	// Init
+	//============================================
+	override Widget Init()
+	{
+		m_CategoryStructure = new map<int,Widget>;
+		m_ImageMarkerStructure = new map<int,Widget>;
+		
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/xbox/Controls_Screen.layout");
+		#ifdef PLATFORM_XBOX
+			m_ControlsImage = layoutRoot.FindAnyWidget("XboxControlsImage");
+		#else
+		#ifdef PLATFORM_PS4
+			m_ControlsImage = layoutRoot.FindAnyWidget("PSControlsImage");
+		#endif
+		#endif
+		m_ControlsImage.Show(true);
+		m_TabberWidget = layoutRoot.FindAnyWidget("Tabber");
+		m_TabberWidget.GetScript(m_TabScript);
+		m_TabScript.m_OnTabSwitch.Insert(UpdateTabContent);
+		m_CanvasWidget = CanvasWidget.Cast(layoutRoot.FindAnyWidget("CanvasUniversal"));
+		m_Back = ButtonWidget.Cast(layoutRoot.FindAnyWidget("back"));
+		
+		UpdateToolbarText();
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		
+		PPERequester_MenuEffects requester;
+		Class.CastTo(requester,PPERequesterBank.GetRequester(PPERequesterBank.REQ_MENUEFFECTS));
+		requester.SetVignetteIntensity(0.6);
+		
+		ComposeData();
+		UpdateTabContent(0);
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+
+		
+		return layoutRoot;
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		
+		SetFocus(null);
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Back)
+			{
+				Back();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		return (w && w == m_Back);
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUITabLeft).LocalPress())
+		{
+			m_TabScript.PreviousTab();
+		}
+		
+		if (GetUApi().GetInputByID(UAUITabRight).LocalPress())
+		{
+			m_TabScript.NextTab();
+		}
+		
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Back();
+		}
+		
+		if (GetUApi().GetInputByID(UASwitchPreset).LocalPress())
+		{
+			PerformSwitchPreset();
+			UpdateTabContent(m_CurrentTabIdx);
+			m_TabScript.RefreshTab();
+		}
+	}
+	
+	//! Inits data structure
+	protected void ComposeData()
+	{
+		if (m_CategoryStructure)
+		{
+			m_CategoryStructure = null;
+			m_CategoryStructure = new map<int,Widget>;
+		}
+		
+		if (m_ImageMarkerStructure)
+		{
+			m_ImageMarkerStructure = null;
+			m_ImageMarkerStructure = new map<int,Widget>;
+		}
+		
+		Widget w = m_ControlsImage.GetChildren();
+		m_ImageMarkerStructure.Set(w.GetUserID(),w);
+		
+		while (w.GetSibling())
+		{
+			w = w.GetSibling();
+			m_ImageMarkerStructure.Set(w.GetUserID(),w); //inits button markers with their IDs
+		}
+		
+		InputUtils.UpdateConsolePresetID();
+		
+		#ifdef PLATFORM_XBOX
+			m_PlatformHolder = FindChildByID(layoutRoot,PLATFORM_ADJUST_X1);
+		#else
+			m_PlatformHolder = FindChildByID(layoutRoot,PLATFORM_ADJUST_PS);
+		#endif
+		
+		//categories
+		Widget category_widget = m_PlatformHolder.GetChildren();
+		m_CategoryStructure.Set(category_widget.GetUserID(),category_widget);
+		
+		while (category_widget.GetSibling())
+		{
+			category_widget = category_widget.GetSibling();
+			m_CategoryStructure.Set(category_widget.GetUserID(),category_widget);
+		}
+	}
+	
+	protected void PerformSwitchPreset()
+	{
+		int index;
+		string preset_text;
+		UAInputAPI inputAPI = GetUApi();
+		
+		index = inputAPI.PresetCurrent() + 1;
+		if (index >= inputAPI.PresetCount())
+		{
+			index = 0;
+		}
+		
+		inputAPI.SupressNextFrame(true);
+		inputAPI.PresetSelect(index);
+		UpdateToolbarText();
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Invoke();
+		
+		#ifdef PLATFORM_WINDOWS
+			GetUApi().Export(); //works on emulated consoles (-xbox,-ps4)
+		#else
+			GetUApi().SaveInputPresetMiscData(); //default console functionality
+		#endif
+		
+		InputUtils.UpdateConsolePresetID();
+		UpdateControlsElements();
+	}
+	
+	protected void UpdateToolbarText()
+	{
+		UAInputAPI inputAPI = GetUApi();
+		int target_idx = inputAPI.PresetCurrent() + 1;
+		int count = inputAPI.PresetCount();
+		if (target_idx >= inputAPI.PresetCount())
+		{
+			target_idx = 0;
+		}
+		
+		m_NextPresetText = inputAPI.PresetName(target_idx);
+		if (m_NextPresetText == InputUtils.PRESET_OLD)
+		{
+			m_NextPresetText = "#STR_UAPRESET_ChangeTo_0";
+		}
+		else if (m_NextPresetText == InputUtils.PRESET_NEW)
+		{
+			m_NextPresetText = "#STR_UAPRESET_ChangeTo_1";
+		}
+		else
+		{
+			m_NextPresetText = "Invalid console preset name: " + m_NextPresetText;
+		}
+	}
+	
+	//!Finds immediate child widget with a corresponding userID
+	protected Widget FindChildByID(Widget wid, int user_id)
+	{
+		Widget ret = wid.GetChildren();
+		while (ret)
+		{
+			if (ret.GetUserID() == user_id)
+			{
+				return ret;
+			}
+			ret = ret.GetSibling();
+		}
+		return ret;
+	}
+	
+	//!Finds all immediate children widgets with corresponding userIDs
+	protected bool FindAllChildrenByID(Widget wid, int user_id, out array<Widget> results)
+	{
+		Widget child = wid.GetChildren();
+		while (child)
+		{
+			if (child.GetUserID() == user_id)
+			{
+				results.Insert(child);
+			}
+			child = child.GetSibling();
+		}
+		return (results && results.Count() > 0);
+	}
+	
+	//! returns count
+	protected int FilterByVisible(array<Widget> input, array<Widget> filtered)
+	{
+		for (int i = 0; i < input.Count(); i++)
+		{
+			if (input[i].IsVisible())
+			{
+				filtered.Insert(input[i]);
+			}
+		}
+		
+		return filtered.Count();
+	}
+	
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+				
+		int color_pnl = ARGB(255, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 0, 0);
+		
+		#ifdef PLATFORM_CONSOLE
+			color_pnl = ARGB(255, 200, 0, 0);
+			color_lbl = ARGB(255, 255, 255, 255);
+		#endif
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		
+		if (label)
+		{
+			label.SetText(text);
+		}
+		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ButtonSetTextColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+				
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbar_switch	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("ChangePresetText"));
+		toolbar_switch.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UASwitchPreset", m_NextPresetText, EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		
+		RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string text = string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#STR_settings_menu_root_toolbar_bg_ConsoleToolbar_Back_BackText0", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_text.SetText(text);
+		
+		RichTextWidget toolbar_b2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon0"));
+		toolbar_b2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(toolbarShow);
+		layoutRoot.FindAnyWidget("play_panel_root").Show(!toolbarShow);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/CrossHairSelector.c b/scripts/5_Mission/DayZ/GUI/CrossHairSelector.c
new file mode 100644
index 0000000000000000000000000000000000000000..9191fab83073c49c4e7aa791fb81bc55aa2ce914
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/CrossHairSelector.c
@@ -0,0 +1,340 @@
+class CrossHair
+{
+	protected string					m_Name;
+	protected bool 						m_Shown;
+	protected bool 						m_Current;
+
+	protected Widget 					m_Widget;
+	
+	void CrossHair(Widget w)
+	{
+		m_Widget = w;
+		m_Name = w.GetName();
+		m_Shown = true;
+		m_Current = false;
+	}
+
+	void ~CrossHair() {}
+
+	string GetName()
+	{
+		return m_Name;
+	}
+
+	bool IsCurrent()
+	{
+		return m_Current;
+	}
+
+	bool IsShown()
+	{
+		return m_Shown;
+	}
+
+	void Show()
+	{
+		m_Shown = false;
+		m_Current = true;
+		m_Widget.Show(true);
+	}
+	
+	void Hide()
+	{
+		m_Shown = true;
+		m_Current = false;
+		m_Widget.Show(false);
+	}
+	
+	Widget GetWidget()
+	{
+		return m_Widget;
+	}
+}
+
+class CrossHairSelector extends ScriptedWidgetEventHandler
+{
+	protected PlayerBase 					m_Player;
+	protected ActionManagerBase 			m_AM;
+	
+	protected Widget					m_Root;
+
+	protected ref set<ref CrossHair>	m_CrossHairs;
+
+	//! Floating crosshair
+	protected vector m_PreviousDirection;
+	protected bool m_PreviousDirectionSet;
+	
+	void CrossHairSelector()
+	{
+		m_Player 		= null;
+		m_AM 			= null;
+		m_CrossHairs 	= new set<ref CrossHair>;
+
+		GetGame().GetPostUpdateQueue(CALL_CATEGORY_GUI).Insert(Update);
+	}
+		
+	void ~CrossHairSelector()
+	{
+		GetGame().GetPostUpdateQueue(CALL_CATEGORY_GUI).Remove(Update);
+	}
+	
+	protected void Init()
+	{
+		m_CrossHairs.Clear();
+				
+		Widget child = m_Root.GetChildren();
+		while(child)
+		{
+			m_CrossHairs.Insert(CrossHair(child));
+			child = child.GetSibling();
+		}
+	}
+	
+	protected void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+		Init();
+		m_Root.Update();
+	}
+	
+	protected void Update()
+	{
+		//! don't show crosshair if it's disabled in profile or from server
+		if(!g_Game.GetProfileOption(EDayZProfilesOptions.CROSSHAIR) || g_Game.GetWorld().IsCrosshairDisabled())
+		{
+			if(GetCurrentCrossHair())
+				ShowCrossHair(null);
+			
+			return;
+		};
+
+		if(m_Player && !m_Player.IsAlive()) // handle respawn
+		{
+			m_Player = null;
+			m_AM = null;
+		}
+		if(!m_Player) GetPlayer();
+		if(!m_AM) GetActionManager();
+		
+		if(m_Player && m_Player.IsPlayerSelected())
+		{
+			SelectCrossHair();
+		}
+	}
+	
+	// getters
+ 	protected void GetPlayer()
+	{
+		Class.CastTo(m_Player, GetGame().GetPlayer());
+	}
+
+	protected void GetActionManager()
+	{
+		if( m_Player && m_Player.IsPlayerSelected() )
+		{
+			Class.CastTo(m_AM, m_Player.GetActionManager());
+		}
+		else
+			m_AM = null;
+	}
+	
+	protected CrossHair GetCrossHairByName(string widgetName)
+	{
+		for(int i = 0; i < m_CrossHairs.Count(); i++)
+		{
+			if(m_CrossHairs.Get(i).GetName() == widgetName)
+				return m_CrossHairs.Get(i);
+		}
+
+		return null;
+	}
+
+	protected CrossHair GetCurrentCrossHair()
+	{
+		for(int i = 0; i < m_CrossHairs.Count(); i++)
+		{
+			if(m_CrossHairs.Get(i).IsCurrent())
+				return m_CrossHairs.Get(i);
+		}
+
+		return null;
+	}
+	
+	protected void SelectCrossHair()
+	{
+		if(!m_AM) return;
+
+		HumanInputController hic = m_Player.GetInputController();
+		ActionBase action = m_AM.GetRunningAction();
+		
+		bool firearmInHands = m_Player.GetItemInHands() && m_Player.GetItemInHands().IsWeapon();
+
+		//! firearms
+		if ( firearmInHands && m_Player.IsRaised() && !m_Player.IsInIronsights() && !m_Player.IsInOptics() && !hic.CameraIsFreeLook() && !m_Player.GetCommand_Melee2() )
+		{
+			ShowCrossHair(GetCrossHairByName("crossT_128x128"));
+		}
+		//! On Continuous Actions
+		else if (action && action.GetActionCategory() == AC_CONTINUOUS)
+		{
+			int actionState = m_AM.GetActionState(action);
+
+			if ( actionState != UA_NONE )
+				ShowCrossHair(null);
+		}
+		//! raised hands(bare + non-firearm) + melee cmd
+		else if ( m_Player.IsRaised() || m_Player.GetCommand_Melee2() || GetGame().GetUIManager().GetMenu() != null )
+		{
+			ShowCrossHair(null);
+		}
+		//! handle unconscious state
+		else if ( m_Player.GetCommand_Unconscious() )
+		{
+			ShowCrossHair(null);
+		}
+		//! default
+		else
+		{
+			ShowCrossHair(GetCrossHairByName("dot"));
+		}
+	}
+	
+	protected void ShowCrossHair(CrossHair crossHair)
+	{
+		//! no crosshair + clean + hide the previous
+		if (!crossHair)
+		{
+			if (GetCurrentCrossHair())
+				GetCurrentCrossHair().Hide();
+			
+			return;
+		}
+		else //! hide prev crosshair
+		{
+			if (GetCurrentCrossHair() && GetCurrentCrossHair() != crossHair)
+				GetCurrentCrossHair().Hide();
+		}
+		
+		//! show the new one
+		if (!crossHair.IsCurrent() && crossHair.IsShown())
+			crossHair.Show();
+
+#ifdef WIP_TRACKIR
+		FloatingCrossHair(crossHair.GetWidget());
+#endif
+	}
+	
+	//! Highly WIP, do not use
+	void FloatingCrossHair(Widget widget)
+	{
+		HumanInputController hic = m_Player.GetInputController();
+		
+		//! Only intended to be used with track IR
+		if (!hic.CameraIsTracking())
+		{
+			widget.SetPos(0, 0);
+			widget.Update();
+			return;
+		}
+		
+		ActionBase action = m_AM.GetRunningAction();
+		
+		float dt = GetDayZGame().GetDeltaT();
+		
+		HumanCommandWeapons hcw = m_Player.GetCommandModifier_Weapons();
+		
+		vector transform[4];
+		m_Player.GetTransformWS(transform);
+		
+		vector aimAngles = Vector(hcw.GetBaseAimingAngleLR(), hcw.GetBaseAimingAngleUD(), 0.0);
+		vector plrAngles = Math3D.MatrixToAngles(transform);
+		
+		aimAngles = Vector(0.0, hcw.GetBaseAimingAngleUD(), 0.0);
+		plrAngles = Vector(hic.GetHeadingAngle() * -Math.RAD2DEG, 0, 0);
+		
+		vector resAngle = aimAngles + plrAngles;
+		
+		vector start;
+		MiscGameplayFunctions.GetHeadBonePos(m_Player, start);
+		
+		vector direction = resAngle.AnglesToVector();
+		
+		int layer = ObjIntersectView;
+		float range = 1.0;
+		
+		Weapon_Base weapon;
+		if (Class.CastTo(weapon, m_Player.GetItemInHands()) && m_Player.IsRaised())
+		{
+			layer = ObjIntersectFire;
+			range = 10.0;
+			
+			vector usti_hlavne_position = weapon.GetSelectionPositionMS( "usti hlavne" );
+			vector konec_hlavne_position = weapon.GetSelectionPositionMS( "konec hlavne" );
+			usti_hlavne_position = m_Player.ModelToWorld(usti_hlavne_position);
+			konec_hlavne_position = m_Player.ModelToWorld(konec_hlavne_position);
+			
+			vector contact_dir;
+			int contact_component;
+			
+			direction = konec_hlavne_position - usti_hlavne_position;
+			direction.Normalize();
+			
+			start = konec_hlavne_position;
+			
+			m_PreviousDirectionSet = false;
+		}
+		else
+		{
+			if (!m_PreviousDirectionSet)
+			{
+				m_PreviousDirectionSet = true;
+				m_PreviousDirection = direction;
+			}
+			
+			float r0[4];
+			float r1[4];
+			
+			vector t[4];
+			
+			Math3D.DirectionAndUpMatrix(m_PreviousDirection, vector.Up, t);
+			Math3D.MatrixToQuat(t, r0);
+			
+			Math3D.DirectionAndUpMatrix(direction, vector.Up, t);
+			Math3D.MatrixToQuat(t, r1);
+			
+			Math3D.QuatLerp(r0, r0, r1, 0.1);
+			
+			Math3D.QuatToMatrix(r0, t);
+			
+			direction = t[2];
+		
+			m_PreviousDirection = direction;
+		}
+		
+		vector end = start + (direction * range);
+		vector position = end;
+		
+		DayZPhysics.RaycastRV(start, end, position, contact_dir, contact_component, null, m_Player, m_Player, false, false, layer);
+		
+		/*
+		vector lines[2];
+		lines[0] = start;
+		lines[1] = end;
+		
+		Shape.CreateSphere(0xFFFFFF00, ShapeFlags.ONCE, usti_hlavne_position, 0.1);
+		Shape.CreateSphere(0xFFFFFF00, ShapeFlags.ONCE, konec_hlavne_position, 0.1);
+		Shape.CreateLines(0xFF00FF00, ShapeFlags.ONCE, lines, 2);
+		*/
+		
+		vector screenSpace = GetGame().GetScreenPos(position);
+
+		float sx, sy;
+		widget.GetScreenSize(sx, sy);
+		screenSpace[0] = screenSpace[0] - (sx * 0.5);
+		screenSpace[1] = screenSpace[1] - (sy * 0.5);
+			
+		widget.SetScreenPos(screenSpace[0], screenSpace[1]);
+		widget.Update();
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/DayzPlayerDebug/DayzPlayerDebug.c b/scripts/5_Mission/DayZ/GUI/DayzPlayerDebug/DayzPlayerDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b137891791fe96927ad78e64b0aad7bded08bdc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/DayzPlayerDebug/DayzPlayerDebug.c
@@ -0,0 +1 @@
+
diff --git a/scripts/5_Mission/DayZ/GUI/DebugMonitor.c b/scripts/5_Mission/DayZ/GUI/DebugMonitor.c
new file mode 100644
index 0000000000000000000000000000000000000000..27d98dbdf5d622f0a36bef3608b0bf15bc2b38ea
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/DebugMonitor.c
@@ -0,0 +1,80 @@
+class DebugMonitor
+{
+	private Widget m_WidgetRoot;
+	private TextWidget m_pWindowLabelText;
+	private TextListboxWidget m_pNamesListboxWidget;
+	private TextListboxWidget m_pValuesListboxWidget;
+	private MultilineTextWidget m_pModifiersMultiTextWidget;
+		
+	void DebugMonitor()
+	{		
+		m_WidgetRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_debug_monitor.layout");
+		m_WidgetRoot.Show(false);
+		
+		m_pWindowLabelText = TextWidget.Cast( m_WidgetRoot.FindAnyWidget("WindowLabel") );
+		m_pNamesListboxWidget = TextListboxWidget.Cast( m_WidgetRoot.FindAnyWidget("NamesListboxWidget") );
+		m_pValuesListboxWidget = TextListboxWidget.Cast( m_WidgetRoot.FindAnyWidget("ValuesListboxWidget") );
+		m_pModifiersMultiTextWidget = MultilineTextWidget.Cast( m_WidgetRoot.FindAnyWidget("ModifiersMultilineTextWidget") );
+	}
+	
+	void Init()
+	{
+		m_pNamesListboxWidget.AddItem("HEALTH:", NULL, 0);
+		m_pValuesListboxWidget.AddItem("", NULL, 0);
+
+		m_pNamesListboxWidget.AddItem("BLOOD:", NULL, 0);
+		m_pValuesListboxWidget.AddItem("", NULL, 0);
+
+		/*m_pNamesListboxWidget.AddItem("BODY TEMP:", NULL, 0);
+		m_pValuesListboxWidget.AddItem("", NULL, 0);*/
+		
+		m_pNamesListboxWidget.AddItem("LAST DAMAGE:", NULL, 0);
+		m_pValuesListboxWidget.AddItem("", NULL, 0);
+		
+		m_pNamesListboxWidget.AddItem("POSITION:", NULL, 0);
+		m_pValuesListboxWidget.AddItem("", NULL, 0);
+
+		/*m_pNamesListboxWidget.AddItem("MODIFIERS:", NULL, 0);
+		m_pValuesListboxWidget.AddItem("", NULL, 0);*/
+		
+		//m_DebugFloatsListWidget.AddItem(key,NULL,0);
+		//m_DebugFloatsListWidget.SetItem(i,value.ToString(),NULL,1);		
+	
+		m_WidgetRoot.Show(true);
+	}
+
+	void SetHealth(float value)
+	{
+		string health = string.Format(" %1", value.ToString());
+		m_pValuesListboxWidget.SetItem(0, health, NULL, 0);
+	}
+
+	void SetBlood(float value)
+	{
+		string blood = string.Format(" %1", value.ToString());
+		m_pValuesListboxWidget.SetItem(1, blood, NULL, 0);
+	}
+	
+	void SetLastDamage(string value)
+	{
+		string lastDamage = string.Format(" %1", value);
+		m_pValuesListboxWidget.SetItem(2, lastDamage, NULL, 0);
+	}
+	
+	void SetPosition(vector value)
+	{
+		string position = string.Format(" %1 %2 %3", value[0].ToString(), value[1].ToString(), value[2].ToString());
+		m_pValuesListboxWidget.SetItem(3, position, NULL, 0);
+	}
+	
+	void Show()
+	{
+		m_WidgetRoot.Show(true);
+	}
+	
+	void Hide()
+	{
+		m_WidgetRoot.Show(false);
+	}
+};
+	
diff --git a/scripts/5_Mission/DayZ/GUI/EarlyAccessMenu.c b/scripts/5_Mission/DayZ/GUI/EarlyAccessMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..8546119b86b90699a8a012c995989bc37403450d
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/EarlyAccessMenu.c
@@ -0,0 +1,30 @@
+class EarlyAccessMenu extends UIScriptedMenu
+{
+	void EarlyAccessMenu()
+	{
+	}
+
+	void ~EarlyAccessMenu()
+	{
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_early_access.layout");
+		
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w.GetUserID() == IDC_OK)
+		{
+			Close();
+			return true;
+		}
+
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/GesturesMenu.c b/scripts/5_Mission/DayZ/GUI/GesturesMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..28c682c9d5ee1f06ed0b9269622f2f1ab33ad563
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/GesturesMenu.c
@@ -0,0 +1,697 @@
+enum GestureCategories
+{
+	CATEGORIES,				//special category selection
+	CATEGORY_1,
+	CATEGORY_2,
+	CATEGORY_3,
+	CATEGORY_4,
+	CATEGORY_5,
+	CONSOLE_GESTURES
+}
+
+class GestureMenuItem
+{
+	protected int 					m_ID;
+	protected string 				m_Name;
+	protected GestureCategories 	m_Category;
+	protected EmoteBase 			m_EmoteClass;
+	protected bool 					m_CanPerformEmote;
+	//radial menu
+	protected Widget 				m_RadialMenuSelector;
+	protected Widget				m_RadialMenuItemCard;
+	
+	void GestureMenuItem(int id, string name, GestureCategories category)
+	{
+		m_ID				= id;
+		m_Name 				= name;
+		m_Category 			= category;
+		m_CanPerformEmote 	= true;
+		
+		PlayerBase player;
+		if (Class.CastTo(player,GetGame().GetPlayer()) && category != GestureCategories.CATEGORIES)
+		{
+			m_EmoteClass = player.GetEmoteManager().GetNameEmoteMap().Get(id);
+		}
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	string GetBoundButtonText()
+	{
+		string ret = "";
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() && m_EmoteClass && m_EmoteClass.GetInputActionName() != "")
+		{
+			map<int,ref TStringArray> button_map = InputUtils.GetComboButtonNamesFromInput(m_EmoteClass.GetInputActionName(), EInputDeviceType.MOUSE_AND_KEYBOARD);
+			
+			if (button_map && button_map.Count() > 0)
+			{
+				TStringArray buttons;
+				for (int j = 0; j < button_map.Count(); j++)
+				{
+					if (j > 0)
+					{
+						ret += "; ";
+					}
+					
+					buttons = button_map.GetElement(j);
+					for (int i = 0; i < buttons.Count(); i++)
+					{
+						if (i > 0)
+						{
+							ret += " + ";
+						}
+						ret += buttons[i];
+					}
+				}
+				
+			}
+		}
+		return ret;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+	
+	GestureCategories GetCategory()
+	{
+		return m_Category;
+	}
+	
+	Widget GetRadialItemCard()
+	{
+		return m_RadialMenuItemCard;
+	}
+	
+	void SetRadialItemCard( Widget widget )
+	{
+		m_RadialMenuItemCard = widget;
+	}
+	
+	void SetCanPerformEmote(bool state)
+	{
+		m_CanPerformEmote = state;
+	}
+	
+	bool GetCanPerformEmote()
+	{
+		return m_CanPerformEmote;
+	}
+}
+
+class GesturesMenu extends UIScriptedMenu
+{
+	protected Widget 							m_GestureItemCardPanel;
+	protected ref array<ref GestureMenuItem> 	m_GestureItems;
+	protected Widget 							m_ToolbarPanel;
+	
+	protected TextWidget						m_CategoryNameText;
+	
+	//
+	const string 								RADIAL_TEXT		= "RadialText";
+	const string 								GESTURE_TEXT	= "GestureNameText";
+	const string 								INPUT_TEXT		= "InputActionText";
+	const string 								CATEGORY_NAME	= "CategoryName";
+	//selections
+	protected Widget 							m_SelectedItem;
+	protected bool 								m_IsCategorySelected;
+	protected bool 								m_IsMenuClosing;
+	protected int 								m_CurrentCategory;
+	
+	//instance
+	static GesturesMenu							instance;
+	
+	//============================================
+	// GesturesMenu
+	//============================================
+	void GesturesMenu()
+	{
+		m_GestureItems = new ref array<ref GestureMenuItem>;
+		
+		if ( !instance )
+		{
+			instance = this;
+		}
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+	}
+	
+	void ~GesturesMenu()
+	{
+		if (GetGame() && GetGame().GetMission())
+		{
+			GetGame().GetMission().RemoveActiveInputExcludes({"radialmenu"},false);
+		}
+	}
+
+	//============================================
+	// Menu Controls
+	//============================================	
+	static void OpenMenu()
+	{
+		GetGame().GetUIManager().EnterScriptedMenu( MENU_GESTURES, NULL );
+	}
+	
+	static void CloseMenu()
+	{
+		//execute on menu release
+		instance.OnMenuRelease();
+		
+		GetGame().GetUIManager().Back();
+		
+		//GetGame().GetMission().RemoveActiveInputExcludes({"radialmenu"},false);
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+		
+	//============================================
+	// Init & Widget Events
+	//============================================
+	override Widget Init()
+	{
+		m_CurrentCategory = -1;
+		
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/radial_menu/radial_gestures/day_z_gestures.layout" );
+		m_GestureItemCardPanel = layoutRoot.FindAnyWidget( RadialMenu.RADIAL_ITEM_CARD_CONTAINER );
+		
+		//register gestures menu
+		RadialMenu.GetInstance().RegisterClass( this );
+		
+		//delay updates until fully initialized
+		RadialMenu.GetInstance().SetWidgetInitialized(false);
+		
+		//set radial menu properties
+		RadialMenu.GetInstance().SetWidgetProperties( "gui/layouts/radial_menu/radial_gestures/day_z_gesture_delimiter.layout" );
+		
+		//create content (widgets) for items
+		RefreshGestures();
+		
+		m_ToolbarPanel = layoutRoot.FindAnyWidget( "toolbar_bg" );
+		m_ToolbarPanel.Show( true );
+		
+		//clear category name text
+		UpdateCategoryName( "" );
+		
+		return layoutRoot;
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowQuickbarUI(false);
+			}
+		}
+		
+		SetFocus(layoutRoot);
+		m_IsMenuClosing = false;
+	}
+	
+	override void OnHide()
+	{
+		super.OnHide();
+		
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowQuickbarUI(true);
+			}
+		}
+		
+		m_IsMenuClosing = true;
+	}
+	
+	override bool OnController( Widget w, int control, int value )
+	{
+		super.OnController( w, control, value );
+		
+		RadialMenu.GetInstance().SetControlType( RadialMenuControlType.CONTROLLER );
+
+		return false;
+	}	
+		
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		super.OnMouseEnter( w, x, y );
+		
+		RadialMenu.GetInstance().SetControlType( RadialMenuControlType.MOUSE );
+
+		return false;
+	}
+	
+	override bool UseMouse()
+	{
+		return true;
+	}
+	
+	override bool UseGamepad()
+	{
+		return true;
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		//RefreshGestures(m_CurrentCategory);
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if (m_CurrentCategory != GestureCategories.CATEGORIES && m_CurrentCategory != -1 && player)
+		{
+			for (int i = 0; i < m_GestureItems.Count(); i++)
+			{
+				UpdateQuickbarItemCard(m_GestureItems[i]);
+			}
+		}
+	}
+	
+	void ProcessEmoteConditionRequest(GestureMenuItem gesture_item)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if (player && m_CurrentCategory != -1)
+		{
+			bool can = player.GetEmoteManager().CanPlayEmote(gesture_item.GetID()) && !player.GetEmoteManager().IsEmotePlaying();
+			gesture_item.SetCanPerformEmote(can);
+		}
+	}
+	
+	//============================================
+	// Gestures
+	//============================================
+	protected void RefreshGestures( GestureCategories category_id = -1 )
+	{
+		//create gestures content (widgets) based on categories
+		if ( category_id > -1 )
+		{
+			GetGestureItems( m_GestureItems, category_id);
+			m_CurrentCategory = category_id;
+		}
+		else
+		{
+			GetGestureItems( m_GestureItems, GestureCategories.CATEGORIES );
+			m_CurrentCategory = -1;
+			instance.m_IsCategorySelected = false;
+		}
+		
+		CreateGestureContent();
+		UpdateControlsElements();
+	}
+	
+	protected void GetGestureItems( out ref array<ref GestureMenuItem> gesture_items, GestureCategories category )
+	{
+		gesture_items.Clear();
+		
+		//PC PLATFORM
+		//All categories
+		if ( category == GestureCategories.CATEGORIES )
+		{
+			gesture_items.Insert( new GestureMenuItem( GestureCategories.CATEGORY_1, 		"#STR_USRACT_EMOTE_CATEGORY_COMMS", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( GestureCategories.CATEGORY_2, 		"#STR_USRACT_EMOTE_CATEGORY_INTERACTIONS", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( GestureCategories.CATEGORY_3, 		"#STR_USRACT_EMOTE_CATEGORY_POSES", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( GestureCategories.CATEGORY_4, 		"#STR_USRACT_EMOTE_CATEGORY_MISC", 	category ) );
+		}
+		//Category 1 - commands
+		else if ( category == GestureCategories.CATEGORY_1 )
+		{
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_POINT, 		"#STR_USRACT_ID_EMOTE_POINT", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_MOVE, 		"#STR_USRACT_ID_EMOTE_MOVE", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_HOLD, 		"#STR_USRACT_ID_EMOTE_HOLD", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_LISTENING, 	"#STR_USRACT_ID_EMOTE_LISTENING", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_DOWN, 		"#STR_USRACT_ID_EMOTE_DOWN", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SILENT, 		"#STR_USRACT_ID_EMOTE_SILENT", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_WATCHING, 	"#STR_USRACT_ID_EMOTE_WATCHING", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_POINTSELF, 	"#STR_USRACT_ID_EMOTE_POINTSELF",	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_COME, 		"#STR_USRACT_ID_EMOTE_COME", 		category ) );
+		}
+		//Category 2 - interaction
+		else if ( category == GestureCategories.CATEGORY_2 )
+		{
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_GREETING, 	"#STR_USRACT_ID_EMOTE_GREETING", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_TAUNT, 		"#STR_USRACT_ID_EMOTE_TAUNT", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SHAKE, 		"#STR_USRACT_ID_EMOTE_SHAKE", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_NOD, 		"#STR_USRACT_ID_EMOTE_NOD", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_LOOKATME, 	"#STR_USRACT_ID_EMOTE_LOOKATME", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_TAUNTELBOW, 	"#STR_USRACT_ID_EMOTE_TAUNTELBOW", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_THUMB, 		"#STR_USRACT_ID_EMOTE_THUMB", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_THUMBDOWN, 	"#STR_USRACT_ID_EMOTE_THUMBDOWN", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_CLAP, 		"#STR_USRACT_ID_EMOTE_CLAP", 		category ) );
+		}
+		//Category 3 - poses
+		else if ( category == GestureCategories.CATEGORY_3 )
+		{
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SUICIDE, 	"#STR_USRACT_ID_EMOTE_SUICIDE", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SURRENDER, 	"#STR_USRACT_ID_EMOTE_SURRENDER", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SALUTE, 		"#STR_USRACT_ID_EMOTE_SALUTE", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SITB, 		"#STR_USRACT_ID_EMOTE_SITB", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_LYINGDOWN, 	"#STR_USRACT_ID_EMOTE_LYINGDOWN", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SITA, 		"#STR_USRACT_ID_EMOTE_SITA", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_CAMPFIRE, 	"#STR_USRACT_ID_EMOTE_CAMPFIRE", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SHRUG, 		"#STR_USRACT_ID_EMOTE_SHRUG", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_SOS, 		"#STR_USRACT_ID_EMOTE_SOS", 		category ) );
+		}
+		//Category 4 - special
+		else if ( category == GestureCategories.CATEGORY_4 )
+		{
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_DANCE, 		"#STR_USRACT_ID_EMOTE_DANCE", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_HEART, 		"#STR_USRACT_ID_EMOTE_HEART", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_FACEPALM, 	"#STR_USRACT_ID_EMOTE_FACEPALM", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_TIMEOUT,		"#STR_USRACT_ID_EMOTE_TIMEOUT", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_THROAT, 		"#STR_USRACT_ID_EMOTE_THROAT", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_VOMIT, 		"#STR_USRACT_ID_EMOTE_VOMIT", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_RPS, 		"#STR_USRACT_ID_EMOTE_RPS", 		category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_TAUNTTHINK, 	"#STR_USRACT_ID_EMOTE_TAUNTTHINK", 	category ) );
+			gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_TAUNTKISS, 	"#STR_USRACT_ID_EMOTE_TAUNTKISS", 	category ) );
+			//gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_RPS_R, 	"#STR_USRACT_ID_EMOTE_RPS_R", 		category ) );
+			//gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_RPS_P, 	"#STR_USRACT_ID_EMOTE_RPS_P", 		category ) );
+			//gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_RPS_S, 	"#STR_USRACT_ID_EMOTE_RPS_S", 		category ) );
+			//gesture_items.Insert( new GestureMenuItem( EmoteConstants.ID_EMOTE_DEBUG, 	"ID_EMOTE_DEBUG", 					category ) );
+		}
+	}
+	
+	protected void CreateGestureContent()
+	{
+		//delete existing gesture widgets
+		DeleteGestureItems();
+		
+		for ( int i = 0; i < m_GestureItems.Count(); ++i )
+		{
+			GestureMenuItem gesture_item = m_GestureItems.Get( i );
+			
+			//create item card
+			Widget gesture_item_card_widget = Widget.Cast( GetGame().GetWorkspace().CreateWidgets( "gui/layouts/radial_menu/radial_gestures/day_z_gesture_item_card.layout", m_GestureItemCardPanel ) );
+			gesture_item.SetRadialItemCard( gesture_item_card_widget );
+			
+			//update item card widget
+			UpdateQuickbarItemCard( gesture_item );
+			
+			//set data
+			gesture_item_card_widget.SetUserData( gesture_item );
+		}
+		
+		//set radial parameters for content
+		if ( m_GestureItems.Count() > 0 ) 
+		{
+			RadialMenu radial_menu = RadialMenu.GetInstance();
+			radial_menu.SetRadiusOffset( 0 );
+			radial_menu.SetExecuteDistOffset( 0.5 );
+			radial_menu.SetOffsetFromTop( 0 );
+			radial_menu.SetItemCardRadiusOffset( 0.25 );
+			radial_menu.ActivateControllerTimeout( false );
+		}
+		
+		//refresh radial menu
+		RadialMenu.GetInstance().Refresh();
+	}
+	
+	protected void UpdateQuickbarItemCard( GestureMenuItem gesture_item )
+	{
+		Widget gesture_item_card_widget = gesture_item.GetRadialItemCard();
+		//texts
+		RichTextWidget gesture_text = RichTextWidget.Cast( gesture_item_card_widget.FindAnyWidget( GESTURE_TEXT ) );
+		RichTextWidget input_text = RichTextWidget.Cast( gesture_item_card_widget.FindAnyWidget( INPUT_TEXT ) );
+		gesture_text.SetText( gesture_item.GetName() );
+		bool input_name_available = gesture_item.GetBoundButtonText() != "";
+		input_text.Show(input_name_available);
+		if (input_name_available)
+		{
+			input_text.SetText(gesture_item.GetBoundButtonText());
+		}
+		//coloring
+		ProcessEmoteConditionRequest(gesture_item);
+		if (gesture_item.GetCanPerformEmote())
+		{
+			gesture_item_card_widget.SetFlags(WidgetFlags.DISABLED); //flag just seems to be...'there', useful for showing radial selector. Still...
+			gesture_text.SetColor(ARGB(255,255,255,255));
+			input_text.SetColor(ARGB(255,255,255,255));
+		}
+		else
+		{
+			gesture_item_card_widget.ClearFlags(WidgetFlags.DISABLED);
+			gesture_text.SetColor(ARGB(255,150,150,150));
+			input_text.SetColor(ARGB(255,150,150,150));
+		}
+	} 
+	
+	protected void DeleteGestureItems()
+	{
+		Widget child;
+		Widget child_to_destroy;
+		
+		child = m_GestureItemCardPanel.GetChildren();
+		while ( child )
+		{
+			child_to_destroy = child;
+			child = child.GetSibling();
+			
+			delete child_to_destroy;
+		}		
+	}
+	
+	//! DEPRECATED
+	protected void UpdateToolbar() {}
+	
+	protected void UpdateCategoryName( string name )
+	{
+		if ( !m_CategoryNameText )
+		{
+			m_CategoryNameText = TextWidget.Cast( layoutRoot.FindAnyWidget( CATEGORY_NAME ) );
+		}
+		
+		m_CategoryNameText.SetText( name );
+	}
+	
+	//============================================
+	// Radial Menu Events
+	//============================================
+	//Common
+	void OnControlsChanged( RadialMenuControlType type )
+	{
+	}
+	
+	//Mouse
+	void OnMouseSelect( Widget w )
+	{
+		MarkSelected( w );
+	}
+
+	void OnMouseDeselect( Widget w )
+	{
+		UnmarkSelected( w );
+	}
+
+	void OnMouseExecute( Widget w )
+	{
+	}
+	
+	//! LMB
+	void OnMousePressLeft( Widget w )
+	{
+		if (instance.m_IsCategorySelected)
+		{
+			ExecuteSelectedItem();
+		}
+		else
+		{
+			ExecuteSelectedCategory( w );
+		}
+	}
+	
+	//! RMB
+	void OnMousePressRight( Widget w )
+	{
+		BackOneLevel();
+	}
+			
+	//Controller
+	void OnControllerSelect( Widget w )
+	{
+		MarkSelected( w );
+	}
+
+	void OnControllerDeselect( Widget w )
+	{
+		UnmarkSelected( w );
+	}
+
+	void OnControllerExecute( Widget w )
+	{
+	}
+	
+	void OnControllerPressSelect( Widget w )
+	{
+		if (instance.m_IsCategorySelected)
+		{
+			ExecuteSelectedItem();
+		}
+		else
+		{
+			ExecuteSelectedCategory( w );
+		}
+	}
+	
+	void OnControllerPressBack( Widget w )
+	{
+		BackOneLevel();
+	}
+	
+	//Actions
+	protected void MarkSelected( Widget w )
+	{
+		instance.m_SelectedItem = w;
+		
+		if ( w )
+		{
+			GestureMenuItem gesture_item;
+			w.GetUserData( gesture_item );
+
+			//is not category
+			/*
+			if ( gesture_item && gesture_item.GetCategory() != GestureCategories.CATEGORIES )
+			{	
+				//alter item visual
+				//TextWidget text_widget = TextWidget.Cast( gesture_item.GetRadialItemCard().FindAnyWidget( RADIAL_TEXT ) );
+				//text_widget.SetColor( ARGB( 255, 66, 175, 95 ) );
+			}
+			*/	
+		}
+	}
+	
+	protected void UnmarkSelected( Widget w )
+	{
+		instance.m_SelectedItem = NULL;
+		
+		if ( w )
+		{
+			GestureMenuItem gesture_item;
+			w.GetUserData( gesture_item );
+
+			//is not category
+			/*
+			if ( gesture_item && gesture_item.GetCategory() != GestureCategories.CATEGORIES )
+			{			
+				//alter item visual
+				//TextWidget text_widget = TextWidget.Cast( gesture_item.GetRadialItemCard().FindAnyWidget( RADIAL_TEXT ) );
+				//text_widget.SetColor( ARGB( 255, 255, 255, 255 ) );
+			}
+			*/
+		}
+	}
+	
+	protected void ExecuteSelectedCategory( Widget w )
+	{
+		//only when category is not picked yet
+		if ( w )
+		{
+			GestureMenuItem gesture_item;
+			w.GetUserData( gesture_item );
+			
+			//is category
+			if ( !instance.m_IsCategorySelected && gesture_item.GetCategory() == GestureCategories.CATEGORIES )
+			{
+				//set category selected
+				instance.m_IsCategorySelected = true;
+				
+				//show selected category gestures
+				GetGestureItems( m_GestureItems, gesture_item.GetID() );
+				CreateGestureContent();
+				RefreshGestures( gesture_item.GetID() );
+				
+				//update category name text
+				UpdateCategoryName( gesture_item.GetName() );
+			}
+			/*else
+			{
+				ExecuteSelectedItem();
+			}*/
+		}
+	}
+	
+	protected void ExecuteSelectedItem()
+	{
+		if ( instance.m_IsCategorySelected && instance.m_SelectedItem )
+		{
+			if ( !GetGame().IsDedicatedServer() )
+			{
+				PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+				
+				GestureMenuItem gesture_item;
+				instance.m_SelectedItem.GetUserData( gesture_item );
+			
+				if ( gesture_item ) 
+				{
+					if( player.GetEmoteManager() ) 
+					{
+						player.GetEmoteManager().CreateEmoteCBFromMenu( gesture_item.GetID() );
+					}
+				}
+			}
+		}
+	}
+	
+	//only moves to the GestureCategories.CATEGORIES for now
+	protected void BackOneLevel()
+	{
+		RefreshGestures();
+		UpdateCategoryName( "" );
+	}
+	
+	bool IsMenuClosing()
+	{
+		return m_IsMenuClosing;
+	}
+	
+	void SetMenuClosing(bool state)
+	{
+		m_IsMenuClosing = state;
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		Widget toolbarBackSpacer = layoutRoot.FindAnyWidget("BackSpacer");
+		
+		RichTextWidget toolbarSelectIcon = RichTextWidget.Cast(layoutRoot.FindAnyWidget("SelectIcon"));
+		RichTextWidget toolbarBackIcon = RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		
+		string selectAction;
+		string backAction;
+		int controllerID;
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() && GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.MOUSE_AND_KEYBOARD)
+		{
+			selectAction = "UAMenuSelect";
+			backAction = "UAMenuBack";
+			controllerID = EUAINPUT_DEVICE_KEYBOARDMOUSE;
+		}
+		else
+		{
+			selectAction = "UAUISelect";
+			backAction = "UAUIBack";
+			controllerID = EUAINPUT_DEVICE_CONTROLLER;
+		}
+		
+		toolbarSelectIcon.SetText(InputUtils.GetRichtextButtonIconFromInputAction(selectAction, "", controllerID, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbarBackIcon.SetText(InputUtils.GetRichtextButtonIconFromInputAction(backAction, "", controllerID, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbarBackSpacer.Show(instance.m_IsCategorySelected);
+	}
+	
+	//-----------------------------------------------------------------
+	//!DEPRECATED
+	protected void OnMenuRelease();
+}	
diff --git a/scripts/5_Mission/DayZ/GUI/HelpScreen.c b/scripts/5_Mission/DayZ/GUI/HelpScreen.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2544ea30e55f659cda3d3b79b35ceadb4a6aebe
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/HelpScreen.c
@@ -0,0 +1,56 @@
+class HelpScreen extends UIScriptedMenu
+{
+	TextListboxWidget m_KeyBindingsTextListboxWidget;
+	TextListboxWidget m_MouseBindingsTextListboxWidget;
+
+	ButtonWidget m_CloseConsoleButton;
+
+	void HelpScreen()
+	{
+		
+	}
+
+	void ~HelpScreen()
+	{	
+	}
+
+	override Widget Init()
+	{
+		PluginKeyBinding module_keybinding = PluginKeyBinding.Cast( GetPlugin(PluginKeyBinding) );
+		
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/help_screen.layout");
+		m_KeyBindingsTextListboxWidget = TextListboxWidget.Cast( layoutRoot.FindAnyWidget("KeyBindingsTextListboxWidget") );
+		m_MouseBindingsTextListboxWidget = TextListboxWidget.Cast( layoutRoot.FindAnyWidget("MouseBindingsTextListboxWidget") );
+		
+		array<ref KeyBinding> keybindings = module_keybinding.GetKeyBindings();
+		for ( int i = 0; i < keybindings.Count(); i++ )
+		{
+			m_KeyBindingsTextListboxWidget.AddItem( keybindings.Get(i).GetInfoBind(), NULL, 0 );
+			m_KeyBindingsTextListboxWidget.SetItem( i, keybindings.Get(i).GetInfoDescription(), NULL, 1 );
+		}
+		
+		array<ref MouseBinding> mousebindings = module_keybinding.GetMouseBindings();
+		for ( i = 0; i < mousebindings.Count(); i++ )
+		{
+			m_MouseBindingsTextListboxWidget.AddItem( mousebindings.Get(i).GetInfoBind(), NULL, 0 );
+			m_MouseBindingsTextListboxWidget.SetItem( i, mousebindings.Get(i).GetInfoDescription(), NULL, 1 );
+		}
+		
+		m_CloseConsoleButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("CloseButtonWidget") );
+		
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_CloseConsoleButton )
+		{
+			Close();
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/HudDebug.c b/scripts/5_Mission/DayZ/GUI/HudDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f46ceae64c76f111b04bc42f0cfed83a3c9b764
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/HudDebug.c
@@ -0,0 +1,347 @@
+// *************************************************************************************
+// ! PluginDayzPlayerDebugUI 
+// *************************************************************************************
+class HudDebugEventHandler extends ScriptedWidgetEventHandler
+{
+	HudDebug m_HudDebug;
+	
+	void HudDebugEventHandler( HudDebug hud_debug )
+	{
+		m_HudDebug = hud_debug;
+	}
+	
+	HudDebug GetHudDebug()
+	{
+		return m_HudDebug;
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		super.OnClick( w, x, y, button );
+		return GetHudDebug().OnClick( w, x, y, button );
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		//Print("OnFocus");
+		return true;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		//Print("OnFocusLost");
+		return true;
+	}
+	/*
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		Print("OnMouseEnter");
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		Print("OnMouseLeaves");
+		return true;
+	}*/
+	
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		//Print("OnMouseButtonDown");
+		return true;
+	}
+	
+	
+	override bool OnSelect(Widget w, int x, int y)
+	{
+		//Print("OnSelect");
+		return true;
+	}
+	override bool OnItemSelected(Widget w, int x, int y, int row, int column, int oldRow, int oldColumn)
+	{
+		//Print("OnItemSelected");
+		return true;
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		//Print("OnModalResult");
+		return true;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		//Print("OnChange " + finished);
+		super.OnChange( w, x, y, finished );
+		return GetHudDebug().OnChange( w, x, y, finished );
+	}
+}
+
+class HudDebug extends Hud
+{
+	static const int HUD_WIN_UNDEFINED			= 0;
+	static const int HUD_WIN_CHAR_STATS			= 1;
+	static const int HUD_WIN_CHAR_MODIFIERS		= 2;
+	static const int HUD_WIN_CHAR_AGENTS		= 3;
+	static const int HUD_WIN_CHAR_DEBUG			= 4;
+	static const int HUD_WIN_CHAR_LEVELS		= 5;
+	static const int HUD_WIN_CHAR_STOMACH		= 6;
+	static const int HUD_WIN_VERSION			= 7;
+	static const int HUD_WIN_TEMPERATURE		= 8;
+	
+	Widget							m_WgtRoot;
+	Widget							m_Crosshair;
+	ref array<ref HudDebugWinBase>	m_Panels;
+	ref Timer						m_TimerUpdate;
+	ref HudDebugEventHandler 		m_HudDebugHandler;
+	ref HudDebugWinCharModifiers 	m_WinCharModifiers;
+	ref HudDebugWinCharStats		m_WinCharStats;
+	ref HudDebugWinCharAgents 		m_WinCharAgents;
+	
+	//============================================
+	// HudDebug
+	//============================================
+	void HudDebug()
+	{
+	}
+
+	//============================================
+	// ~HudDebug
+	//============================================
+	void ~HudDebug()
+	{
+		delete m_WgtRoot;
+		m_TimerUpdate.Stop();
+	}
+	
+	//============================================
+	// Init
+	//============================================
+	override void Init( Widget hud_panel_widget )
+	{
+		m_WgtRoot = hud_panel_widget;
+		m_WgtRoot.Show( true );
+		
+		// Crosshair widget root
+		m_Crosshair = m_WgtRoot.FindAnyWidget( "wdw_Crosshair" );
+		
+		m_Panels = new array<ref HudDebugWinBase>;
+		
+		// Register Window Character Stats
+		m_WinCharStats = new HudDebugWinCharStats( m_WgtRoot.FindAnyWidget( "wdw_CharacterStats" ) );
+		m_Panels.Insert( m_WinCharStats );
+		
+		// Register Window Character Stats
+		HudDebugWinCharLevels win_char_levels = new HudDebugWinCharLevels( m_WgtRoot.FindAnyWidget( "wdw_CharacterLevels" ) );
+		m_Panels.Insert( win_char_levels );
+		
+		// Register Window Chracter Modifiers
+		m_WinCharModifiers = new HudDebugWinCharModifiers( m_WgtRoot.FindAnyWidget( "wdw_CharacterModifiers" ) );
+		m_Panels.Insert( m_WinCharModifiers );
+		
+		// Register Window Chracter Agents
+		m_WinCharAgents = new HudDebugWinCharAgents( m_WgtRoot.FindAnyWidget( "wdw_CharacterAgents" ) );
+		m_Panels.Insert( m_WinCharAgents );
+		
+		// Register Window Chracter Debug
+		HudDebugWinCharDebug win_char_debug = new HudDebugWinCharDebug( m_WgtRoot.FindAnyWidget( "wdw_CharacterDebug" ) );
+		m_Panels.Insert( win_char_debug );
+				
+		// Register Window Chracter Debug
+		HudDebugWinCharStomach win_char_stomach = new HudDebugWinCharStomach( m_WgtRoot.FindAnyWidget( "wdw_CharacterStomach" ) );
+		m_Panels.Insert( win_char_stomach );
+		
+		// Register Window Version
+		HudDebugWinVersion win_version = new HudDebugWinVersion( m_WgtRoot.FindAnyWidget( "wdw_Version" ) );
+		m_Panels.Insert( win_version );
+		
+		// Register Window Temperature
+		HudDebugWinTemperature win_temp = new HudDebugWinTemperature( m_WgtRoot.FindAnyWidget( "wdw_Temp" ) );
+		m_Panels.Insert( win_temp );
+		
+		
+		RefreshByLocalProfile();
+		RefreshCrosshairVisibility();
+		
+		m_TimerUpdate = new Timer();
+		m_TimerUpdate.Run( 1.0, this, "Update", NULL, true );
+		
+		//set ui event handler
+		m_HudDebugHandler = new HudDebugEventHandler( this );
+		m_WgtRoot.SetHandler( m_HudDebugHandler );
+	}
+	
+	//============================================
+	// Update
+	//============================================
+	override void Update( float timeslice )
+	{
+		for ( int i = 0; i < m_Panels.Count(); ++i )
+		{
+			if ( m_Panels.Get( i ).IsVisible() )
+			{
+				m_Panels.Get( i ).Update();
+			}
+		}
+	}
+
+	//============================================
+	// SetPanetVisible
+	//============================================
+	void SetPanelVisible(int panel_type, bool visible)
+	{
+		if ( visible )
+		{
+			PanelShow( panel_type );
+		}
+		else
+		{
+			PanelHide( panel_type );
+		}
+	}
+	
+	//============================================
+	// PanelShow
+	//============================================
+	void PanelShow(int panel_type)
+	{
+		for ( int i = 0; i < m_Panels.Count(); ++i )
+		{
+			HudDebugWinBase panel = m_Panels.Get( i );
+			
+			if ( panel.GetType() == panel_type )
+			{
+				panel.Show();
+			}
+		}
+	}
+
+	//============================================
+	// PanelHide
+	//============================================
+	void PanelHide(int panel_type)
+	{
+		for ( int i = 0; i < m_Panels.Count(); ++i )
+		{
+			HudDebugWinBase panel = m_Panels.Get( i );
+			
+			if ( panel.GetType() == panel_type )
+			{
+				panel.Hide();
+			}
+		}
+	}
+
+	//============================================
+	// RefreshCrosshairVisibility
+	//============================================
+	void RefreshCrosshairVisibility()
+	{
+		PluginConfigDebugProfile module_cfg_profile = PluginConfigDebugProfile.Cast( GetPlugin( PluginConfigDebugProfile ) );
+		
+		if ( module_cfg_profile )
+		{
+			PluginDeveloper modul_dev = PluginDeveloper.Cast( GetPlugin( PluginDeveloper ) );
+
+			if ( modul_dev.IsEnabledFreeCamera() )
+			{
+				m_Crosshair.Show( module_cfg_profile.GetFreeCameraCrosshairVisible() );
+			}
+			else
+			{
+				m_Crosshair.Show( false );
+			}
+		}
+	}
+
+	
+	//============================================
+	// HideCrosshairVisibility
+	//============================================
+	void HideCrosshairVisibility()
+	{
+		PluginConfigDebugProfile module_cfg_profile = PluginConfigDebugProfile.Cast( GetPlugin( PluginConfigDebugProfile ) );
+		
+		if ( module_cfg_profile )
+		{
+			PluginDeveloper modul_dev = PluginDeveloper.Cast( GetPlugin( PluginDeveloper ) );
+
+			if ( modul_dev.IsEnabledFreeCamera() )
+			{
+				m_Crosshair.Show( false );
+			}
+		}
+	}
+
+	//============================================
+	// RefreshByLocalProfile
+	//============================================
+	void RefreshByLocalProfile()
+	{
+		PluginConfigDebugProfile module_cfg_profile = PluginConfigDebugProfile.Cast( GetPlugin( PluginConfigDebugProfile ) );
+		
+		if ( module_cfg_profile )
+		{
+			SetPanelVisible( HudDebug.HUD_WIN_CHAR_STATS, 		module_cfg_profile.GetCharacterStatsVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_CHAR_LEVELS, 		module_cfg_profile.GetCharacterLevelsVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_CHAR_MODIFIERS, 	module_cfg_profile.GetCharacterModifiersVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_CHAR_AGENTS,	 	module_cfg_profile.GetCharacterAgentsVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_CHAR_DEBUG, 		module_cfg_profile.GetCharacterDebugVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_CHAR_STOMACH, 	module_cfg_profile.GetCharacterStomachVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_VERSION, 			module_cfg_profile.GetVersionVisible() );
+			SetPanelVisible( HudDebug.HUD_WIN_TEMPERATURE, 		module_cfg_profile.GetTempVisible() );
+		}
+	}
+	
+	//============================================
+	// IsInitialized
+	//============================================
+	bool IsInitialized()
+	{
+		if ( m_WgtRoot == NULL )
+		{
+			return false;
+		}
+		
+		return false;
+	}	
+	
+	//============================================
+	// OnClick
+	//============================================
+	bool OnClick( Widget w, int x, int y, int button )
+	{	
+		//send OnClick to HudDebugWinCharModifiers
+		if ( m_WinCharModifiers )
+		{
+			if (m_WinCharModifiers.OnClick( w, x, y, button ))
+				return true;
+		}
+		
+		if ( m_WinCharAgents )
+		{
+			if (m_WinCharAgents.OnClick( w, x, y, button ))
+				return true;
+		}
+		
+		if ( m_WinCharStats )
+		{
+			if (m_WinCharStats.OnClick( w, x, y, button ))
+				return true;
+		}
+		
+		return false;
+	}
+	
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+
+		if ( m_WinCharStats )
+		{
+			if (m_WinCharStats.OnChange( w, x, y, finished ))
+				return true;
+		}
+		return false;
+	}
+	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InGameMenu.c b/scripts/5_Mission/DayZ/GUI/InGameMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..6e92f8eb0ee117fd0e4a0377bac70ce1af98a711
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InGameMenu.c
@@ -0,0 +1,411 @@
+class InGameMenu extends UIScriptedMenu
+{
+	string 						m_ServerInfoText;
+	
+	protected Widget			m_ContinueButton;
+	protected Widget			m_SeparatorPanel;
+	protected Widget			m_ExitButton;
+	protected Widget			m_RestartButton;
+	protected Widget 			m_RespawnButton;
+	protected Widget			m_RestartDeadRandomButton;
+	protected Widget			m_RestartDeadCustomButton;
+	protected Widget			m_OptionsButton;
+	protected Widget 			m_ServerInfoPanel;
+	protected Widget 			m_FavoriteButton;
+	protected Widget 			m_FavoriteImage;
+	protected Widget 			m_UnfavoriteImage;
+	protected Widget 			m_CopyInfoButton;
+	
+	protected ref TextWidget	m_ModdedWarning;
+	protected ref TextWidget 	m_ServerIP;
+	protected ref TextWidget 	m_ServerPort;
+	protected ref TextWidget 	m_ServerName;
+	
+	protected ref UiHintPanel m_HintPanel;
+	
+	void ~InGameMenu()
+	{
+		HudShow(true);
+		
+		Mission mission = g_Game.GetMission();
+		if (mission)
+			mission.Continue();
+	}
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_ingamemenu.layout");
+				
+		m_ContinueButton			= layoutRoot.FindAnyWidget("continuebtn");
+		m_SeparatorPanel			= layoutRoot.FindAnyWidget("separator_red");
+		m_ExitButton				= layoutRoot.FindAnyWidget("exitbtn");
+		m_RestartButton				= layoutRoot.FindAnyWidget("restartbtn");
+		m_RespawnButton 			= layoutRoot.FindAnyWidget("respawn_button");
+		m_RestartDeadRandomButton	= layoutRoot.FindAnyWidget("respawn_button_random");
+		m_RestartDeadCustomButton	= layoutRoot.FindAnyWidget("respawn_button_custom");
+		m_OptionsButton				= layoutRoot.FindAnyWidget("optionsbtn");
+		m_ModdedWarning				= TextWidget.Cast(layoutRoot.FindAnyWidget("ModdedWarning"));
+		m_HintPanel					= new UiHintPanel(layoutRoot.FindAnyWidget("hint_frame"));
+		m_ServerInfoPanel 			= layoutRoot.FindAnyWidget("server_info");
+		m_ServerIP 					= TextWidget.Cast(layoutRoot.FindAnyWidget("server_ip"));
+		m_ServerPort 				= TextWidget.Cast(layoutRoot.FindAnyWidget("server_port"));
+		m_ServerName 				= TextWidget.Cast(layoutRoot.FindAnyWidget("server_name"));
+		m_FavoriteImage 			= layoutRoot.FindAnyWidget("favorite_image");
+		m_UnfavoriteImage 			= layoutRoot.FindAnyWidget("unfavorite_image");
+		m_CopyInfoButton 			= layoutRoot.FindAnyWidget("copy_button");
+		
+		if (GetGame().IsMultiplayer())
+		{
+			ButtonSetText(m_RestartButton, "#main_menu_respawn");
+		}
+		else
+		{
+			ButtonSetText(m_RestartButton, "#main_menu_restart");
+		}
+		
+		HudShow(false);
+		SetGameVersion();
+		SetServerInfoVisibility(SetServerInfo() && g_Game.GetProfileOption(EDayZProfilesOptions.SERVERINFO_DISPLAY));
+		m_ModdedWarning.Show(g_Game.ReportModded());
+		
+		Mission mission = g_Game.GetMission();
+		if (mission)
+			mission.Pause();
+		
+		return layoutRoot;
+	}
+	
+	protected void SetGameVersion()
+	{
+		TextWidget version_widget = TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		string version;
+		GetGame().GetVersion(version);
+		version_widget.SetText("#main_menu_version" + " " + version);
+
+		#ifdef PREVIEW_BUILD
+		version_widget.SetText("THIS IS PREVIEW");
+		#endif
+	}
+	
+	protected bool SetServerInfo()
+	{
+		if (GetGame().IsMultiplayer())
+		{
+			MenuData menu_data = g_Game.GetMenuData();
+			GetServersResultRow info = OnlineServices.GetCurrentServerInfo();
+			
+			if (info)
+			{
+				m_ServerPort.SetText(info.m_HostPort.ToString());
+				m_ServerIP.SetText(info.m_HostIp);
+				m_ServerName.SetText(info.m_Name);
+				m_UnfavoriteImage.Show(info.m_Favorite);
+				m_FavoriteImage.Show(!info.m_Favorite);
+				m_ServerInfoText = "" +  info.GetIpPort();
+				
+				return true;
+			}
+			//temporary, incomplete solution, OnlineServices.GetCurrentServerInfo() should be working!
+			else if (menu_data && menu_data.GetLastPlayedCharacter() != GameConstants.DEFAULT_CHARACTER_MENU_ID)
+			{
+				int char_id = menu_data.GetLastPlayedCharacter();
+				int port;
+				string address,name;
+				
+				menu_data.GetLastServerAddress(char_id,address);
+				port = menu_data.GetLastServerPort(char_id);
+				menu_data.GetLastServerName(char_id,name);
+				m_ServerPort.SetText(port.ToString());
+				m_ServerIP.SetText(address);
+				m_ServerName.SetText(name);
+				m_ServerInfoText = "" + address + ":" + port;
+				
+				return true;
+			}
+			else
+			{
+				g_Game.RefreshCurrentServerInfo();
+			}
+		}
+		return false;
+	}
+	
+	protected void HudShow(bool show)
+	{
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowHudUI(g_Game.GetProfileOption(EDayZProfilesOptions.HUD) && show);
+				hud.ShowQuickbarUI(g_Game.GetProfileOption(EDayZProfilesOptions.QUICKBAR) && show);
+			}
+		}
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		ColorHighlight(w);
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		ColorNormal(w);
+		return true;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w == m_ContinueButton)
+		{
+			OnClick_Continue();
+			return true;
+		}
+		else if (w == m_RestartButton)
+		{
+			#ifdef DEVELOPER
+			if (GetGame().IsMultiplayer() || (GetGame().GetPlayer() && GetGame().GetPlayer().IsUnconscious()))
+				OnClick_Restart();
+			else
+			{
+				PluginDeveloper plugin = PluginDeveloper.GetInstance();
+				if (plugin)
+					plugin.ToggleMissionLoader();
+			}
+			#else
+			OnClick_Restart();
+			#endif
+			return true;
+		}
+		else if (w == m_RespawnButton)
+		{
+			OnClick_Respawn();
+			return true;
+		}
+		else if (w == m_OptionsButton)
+		{
+			OnClick_Options();
+			return true;
+		}
+		else if (w == m_ExitButton)
+		{
+			OnClick_Exit();
+			return true;
+		}
+		else if (w == m_CopyInfoButton)
+		{
+			GetGame().CopyToClipboard(m_ServerInfoText);
+		}
+
+		return false;
+	}
+	
+	protected void OnClick_Continue()
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetMission().Continue);
+	}
+	
+	protected void OnClick_Restart()
+	{
+		if (!GetGame().IsMultiplayer())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().RestartMission);
+		}
+		else
+		{
+			OnClick_Respawn();
+		}
+	}
+	
+	protected void OnClick_Respawn()
+	{
+		Man player = GetGame().GetPlayer();
+		
+		if (player && player.IsUnconscious() && !player.IsDamageDestroyed())
+		{
+			GetGame().GetUIManager().ShowDialog("#main_menu_respawn", "#main_menu_respawn_question", IDC_INT_RETRY, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+		}
+		else
+		{
+			if (GetGame().GetMission().GetRespawnModeClient() == GameConstants.RESPAWN_MODE_CUSTOM)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetUIManager().EnterScriptedMenu,MENU_RESPAWN_DIALOGUE,this);
+			}
+			else
+			{
+				GameRespawn(true);
+			}
+		}
+	}
+	
+	protected void OnClick_Options()
+	{
+		EnterScriptedMenu(MENU_OPTIONS);
+	}
+	
+	protected void OnClick_Exit()
+	{
+		GetGame().LogoutRequestTime();
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetMission().CreateLogoutMenu, this);
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		super.OnModalResult(w, x, y, code, result);
+		if (code == IDC_INT_EXIT && result == DBB_YES)
+		{
+			if (GetGame().IsMultiplayer())
+			{
+				GetGame().LogoutRequestTime();
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetMission().CreateLogoutMenu, this);
+			}
+			else
+			{
+				// skip logout screen in singleplayer
+				GetGame().GetMission().AbortMission();
+			}	
+			g_Game.CancelLoginTimeCountdown();
+			return true;
+		}
+		else if (code == IDC_INT_EXIT && result == DBB_NO)
+		{
+			g_Game.CancelLoginTimeCountdown();
+		}
+		else if (code == IDC_INT_RETRY && result == DBB_YES && GetGame().IsMultiplayer())
+		{
+			if (GetGame().GetMission().GetRespawnModeClient() == GameConstants.RESPAWN_MODE_CUSTOM)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetUIManager().EnterScriptedMenu,MENU_RESPAWN_DIALOGUE,this);
+			} 
+			else
+			{
+				GameRespawn(true);
+			}
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		UpdateGUI();
+	}
+	
+	protected void UpdateGUI()
+	{
+		#ifdef BULDOZER
+		m_RestartButton.Show(false);
+		m_RespawnButton.Show(false);
+		#else
+		Man player = GetGame().GetPlayer();
+		bool playerAlive = player && player.GetPlayerState() == EPlayerStates.ALIVE;
+
+		if (GetGame().IsMultiplayer())
+		{
+			m_RestartButton.Show(playerAlive && player.IsUnconscious() && !CfgGameplayHandler.GetDisableRespawnInUnconsciousness());
+			m_RespawnButton.Show(!playerAlive);
+		}
+		else
+		{
+			m_RestartButton.Show(true);
+			m_RespawnButton.Show(false);
+			m_SeparatorPanel.Show(playerAlive);
+		}
+
+		m_ContinueButton.Show(playerAlive);
+		#endif
+	}
+	
+	void MenuRequestRespawn(UIScriptedMenu menu, bool random)
+	{
+		if (RespawnDialogue.Cast(menu))
+			GameRespawn(random);
+	}
+	
+	protected void GameRespawn(bool random)
+	{
+		GetGame().GetMenuDefaultCharacterData(false).SetRandomCharacterForced(random);
+		GetGame().RespawnPlayer();
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player)
+		{
+			player.SimulateDeath(true);
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(player.ShowDeadScreen, true, 0);
+		}
+		
+		MissionGameplay missionGP = MissionGameplay.Cast(GetGame().GetMission());
+		missionGP.DestroyAllMenus();
+		missionGP.SetPlayerRespawning(true);
+		missionGP.Continue();
+
+		Close();
+	}
+	
+	protected void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		ButtonSetColor(w, ARGB(255, 0, 0, 0));
+		ButtonSetTextColor(w, ARGB(255, 255, 0, 0));
+	}
+	
+	protected void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		ButtonSetColor(w, ARGB(0, 0, 0, 0));
+		ButtonSetTextColor(w, ARGB(255, 255, 255, 255));
+	}
+	
+	protected void ColorDisable(Widget w)
+	{
+		if (!w)
+			return;
+		
+		ButtonSetColor(w, ARGB(0, 0, 0, 0));
+		ButtonSetTextColor(w, ColorManager.COLOR_DISABLED_TEXT);
+	}
+	
+	protected void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		if (label)
+			label.SetText(text);
+		
+	}
+	
+	protected void ButtonSetColor(Widget w, int color)
+	{
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		if (panel)
+			panel.SetColor(color);
+	}
+	
+	protected void ButtonSetTextColor(Widget w, int color)
+	{
+		TextWidget label = TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		if (label)
+			label.SetColor(color);
+	}
+	
+	void SetServerInfoVisibility(bool show)
+	{
+		m_ServerInfoPanel.Show(show);
+	}
+	
+	//! DEPRECATED
+	void ToggleFavoriteServer();
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InGameMenuXbox.c b/scripts/5_Mission/DayZ/GUI/InGameMenuXbox.c
new file mode 100644
index 0000000000000000000000000000000000000000..369083dac26a050a6badc2fe2041a16e19fd20e1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InGameMenuXbox.c
@@ -0,0 +1,816 @@
+class InGameMenuXbox extends UIScriptedMenu
+{
+	// Widgets texts id
+	protected  string 						m_MuteButtonTextID;
+	protected  string 						m_UnmuteButtonTextID;
+	protected  string 						m_BackButtonTextID;
+	protected  string 						m_SelectButtonTextID;
+	protected  string 						m_OpenGameCardButtonTextID;
+	protected  string 						m_CurrentMuteButtonText;
+	
+	protected bool 							m_SelectAvailable;
+	protected bool 							m_MuteAvailable;
+	protected bool 							m_BackAvailable;
+	protected bool 							m_GamercardAvailable;
+	
+	protected bool 							m_PlayerAlive;
+	
+	protected ref PlayerListScriptedWidget	m_ServerInfoPanel;
+	
+	protected Widget						m_OnlineMenu;
+	
+	protected ButtonWidget					m_ContinueButton;
+	protected ButtonWidget					m_ExitButton;
+	protected ButtonWidget					m_RestartDeadButton;
+	protected ButtonWidget					m_RestartButton;
+	protected ButtonWidget					m_OptionsButton;
+	protected ButtonWidget					m_ControlsButton;
+	protected ButtonWidget					m_OnlineButton;
+	protected ButtonWidget					m_TutorialsButton;
+	
+	protected TextWidget					m_Version;
+	
+	const int 								BUTTON_XBOX_CONTROLS = 201;
+	
+	void InGameMenuXbox()
+	{
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+	}
+
+	void ~InGameMenuXbox()
+	{
+		ClientData.SyncEvent_OnPlayerListUpdate.Remove(SyncEvent_OnRecievedPlayerList);
+		OnlineServices.m_PermissionsAsyncInvoker.Remove(OnPermissionsUpdate);
+		
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowHudUI(true);
+				hud.ShowQuickbarUI(true);
+			}
+			
+			mission.Continue();
+		}
+		
+		PPERequesterBank.GetRequester(PPERequester_MenuEffects).Stop();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElements();
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/xbox/day_z_ingamemenu_xbox.layout");
+		
+		m_OnlineMenu	= GetGame().GetWorkspace().CreateWidgets("gui/layouts/xbox/ingamemenu_xbox/online_info_menu.layout", layoutRoot);
+		m_OnlineMenu.Show(false);
+		
+		m_ContinueButton	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("continuebtn"));
+		m_RestartDeadButton	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("restartbtn_dead"));
+		m_ExitButton		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("exitbtn"));
+		m_RestartButton		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("restartbtn"));
+		m_OptionsButton		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("optionsbtn"));
+		m_ControlsButton	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("controlsbtn"));
+		m_OnlineButton		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("onlinebtn"));
+		m_TutorialsButton	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("tutorialsbtn"));
+		m_Version			= TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		
+		m_SelectAvailable = true;
+		m_MuteAvailable = false;
+		m_GamercardAvailable = false;
+		m_BackAvailable = true;
+		
+		Man player = GetGame().GetPlayer();
+		if (player)
+		{
+			int life_state = player.GetPlayerState();
+
+			if (life_state == EPlayerStates.ALIVE)
+			{
+				m_PlayerAlive = true;
+			}
+		}
+		
+		UpdateMenuFocus();
+		
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+			version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+			version = "#main_menu_version" + " " + version;
+		#endif
+		m_Version.SetText(version);
+		
+		if (GetGame().IsMultiplayer())
+		{
+			m_OnlineButton.Show(true);
+			
+			TextWidget w_text = TextWidget.Cast(m_OnlineMenu.FindAnyWidget("OnlineTextWidget"));
+			w_text.SetText(g_Game.GetHostName());
+			
+			m_ServerInfoPanel = new PlayerListScriptedWidget(m_OnlineMenu.FindAnyWidget("ServerInfoPanel"));
+			
+			OnlineServices.m_PermissionsAsyncInvoker.Insert(OnPermissionsUpdate);
+			ClientData.SyncEvent_OnPlayerListUpdate.Insert(SyncEvent_OnRecievedPlayerList);
+			
+			m_ServerInfoPanel.Reload(ClientData.m_PlayerList);
+			m_ServerInfoPanel.ReloadLocal(OnlineServices.GetMuteList());
+			
+			string uid = m_ServerInfoPanel.FindPlayerByWidget(GetFocus());
+			if (uid != "")
+			{
+				if (IsLocalPlayer(uid) || m_ServerInfoPanel.IsEmpty())
+				{
+					m_MuteAvailable = false;
+					m_GamercardAvailable = false;
+				}
+				else
+				{
+					m_MuteAvailable = !GetGame().GetWorld().IsDisabledReceivingVoN();
+					#ifndef PLATFORM_PS4
+					m_GamercardAvailable = true;
+					#endif
+					SetMuteButtonText(OnlineServices.IsPlayerMuted(uid));
+				}
+				
+				if (m_ServerInfoPanel.IsGloballyMuted(uid))
+				{
+					m_MuteAvailable = false;
+				}
+			}
+		}
+		else
+		{
+			layoutRoot.FindAnyWidget("onlinebtn").Show(false);
+			layoutRoot.FindAnyWidget("invitebtn").Show(false);
+		}
+		
+		//RESPAWN & RESTART
+		ButtonWidget restart_btn = ButtonWidget.Cast(layoutRoot.FindAnyWidgetById(IDC_INT_RETRY));
+		if (GetGame().IsMultiplayer())
+		{
+			restart_btn.SetText("#main_menu_respawn");
+		}
+		else
+		{
+			restart_btn.SetText("#main_menu_restart");
+		}
+		
+		if (GetGame().IsMultiplayer() && !(GetGame().CanRespawnPlayer() || (player && player.IsUnconscious())))
+		{
+			restart_btn.Enable(false);
+			restart_btn.Show(false);
+		}
+		//
+		
+		#ifdef BULDOZER
+		delete restart_btn;
+		#endif
+		
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowHudUI(false);
+				hud.ShowQuickbarUI(false);
+			}
+			
+			mission.Pause();
+		}
+		
+		PPERequester_MenuEffects requester;
+		Class.CastTo(requester,PPERequesterBank.GetRequester(PPERequester_MenuEffects));
+		requester.SetVignetteIntensity(0.6);
+		
+		UpdateControlsElements();
+		LoadTextStrings();
+		LoadFooterButtonTexts();
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+		
+		return layoutRoot;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		switch (w.GetUserID())
+		{
+			case IDC_MAIN_CONTINUE:
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetMission().Continue);
+				return true;
+			}
+			case IDC_MAIN_OPTIONS:
+			{
+				EnterScriptedMenu(MENU_OPTIONS);
+				return true;
+			}
+			case BUTTON_XBOX_CONTROLS:
+			{
+				EnterScriptedMenu(MENU_XBOX_CONTROLS);
+				return true;
+			}
+			case IDC_MAIN_QUIT:
+			{
+				GetGame().GetUIManager().ShowDialog("#main_menu_exit", "#main_menu_exit_desc", IDC_INT_EXIT, DBT_YESNO, DBB_YES, DMT_QUESTION, NULL);
+				return true;
+			}
+			case IDC_INT_RETRY:
+			{
+				if (!GetGame().IsMultiplayer())
+				{
+					GetGame().GetUIManager().ShowDialog("#main_menu_restart", "Are you sure you want to restart?", IDC_INT_RETRY, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+				}
+				else
+				{
+					GetGame().GetUIManager().ShowDialog("#main_menu_respawn", "#main_menu_respawn_question", IDC_INT_RETRY, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+				}
+				return true;
+			}
+			case IDC_MAIN_ONLINE:
+			{
+				m_OnlineMenu.Show(true);
+				m_SelectAvailable = false;
+				
+				UpdateControlsElements();
+				m_ServerInfoPanel.FocusFirst();
+				return true;
+			}
+			case 117:
+			{
+				EnterScriptedMenu(MENU_TUTORIAL);
+				return true;
+			}
+			case IDC_MULTI_INVITE:
+			{
+				OnlineServices.ShowInviteScreen();
+				return true;
+			}
+		}
+		
+		if (w == layoutRoot.FindAnyWidget("backbtn"))
+		{
+			CloseOnline();
+		}
+		else if (w == m_RestartDeadButton)
+		{
+			if (GetGame().GetMission().GetRespawnModeClient() == GameConstants.RESPAWN_MODE_CUSTOM)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetUIManager().EnterScriptedMenu,MENU_RESPAWN_DIALOGUE,this);
+			}
+			else
+			{
+				GameRetry(true);
+			}
+			return true;
+		}
+
+		return false;
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		super.OnModalResult(w, x, y, code, result);
+		
+		if (code == IDC_INT_EXIT && result == DBB_YES)
+		{
+			if (GetGame().IsMultiplayer())
+			{
+				GetGame().LogoutRequestTime();
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetMission().CreateLogoutMenu, this);
+			}
+			else
+			{
+				// skip logout screen in singleplayer
+				GetGame().GetMission().AbortMission();
+			}
+			g_Game.CancelLoginTimeCountdown();
+			
+			return true;	
+		
+		}
+		else if (code == IDC_INT_EXIT && result == DBB_NO)
+		{
+			g_Game.CancelLoginTimeCountdown();
+		}
+		else if (code == IDC_INT_RETRY)
+		{
+			if (result == DBB_YES)
+			{
+				if (GetGame().GetMission().GetRespawnModeClient() == GameConstants.RESPAWN_MODE_CUSTOM)
+				{
+					GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetUIManager().EnterScriptedMenu,MENU_RESPAWN_DIALOGUE,this);
+				}
+				else
+				{
+					GameRetry(true);
+					return true;
+				}
+			}
+			else
+			{
+				UpdateMenuFocus();
+			}
+		}
+		
+		return false;
+	}
+	
+	void GameRetry(bool random)
+	{
+		if (GetGame().IsMultiplayer())
+		{
+			//GetGame().GetUIManager().CloseAll();
+			GetGame().GetMenuDefaultCharacterData(false).SetRandomCharacterForced(random);
+			GetGame().RespawnPlayer();
+
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			if (player)
+			{
+				player.SimulateDeath(true);
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(player.ShowDeadScreen, true, 0);
+			}
+			
+			MissionGameplay missionGP = MissionGameplay.Cast(GetGame().GetMission());
+			missionGP.DestroyAllMenus();
+			missionGP.SetPlayerRespawning(true);
+			missionGP.Continue();
+
+			Close();
+		}
+		else
+			GetGame().RestartMission();
+	}
+	
+	void MenuRequestRespawn(UIScriptedMenu menu, bool random)
+	{
+		if (RespawnDialogue.Cast(menu))
+			GameRetry(random);
+	}
+	
+	bool IsLocalPlayer(string uid)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		string local_uid;
+		if (GetGame().GetUserManager())
+			local_uid = GetGame().GetUserManager().GetSelectedUser().GetUid();
+		return (uid == local_uid);
+	}
+	
+	SyncPlayerList CreateFakePlayerList(int player_count)
+	{
+		SyncPlayerList player_list = new SyncPlayerList;
+		player_list.m_PlayerList = new array<ref SyncPlayer>;
+		for (int i = 0; i < player_count; i++)
+		{
+			SyncPlayer sync_player = new SyncPlayer;
+			sync_player.m_UID = "uid" + i;
+			sync_player.m_PlayerName = "Player " + i;
+			player_list.m_PlayerList.Insert(sync_player);
+		}
+		return player_list;
+	}
+	
+	override void Update(float timeslice)
+	{
+		UpdateGUI();
+		
+		if (GetGame().IsMultiplayer() && layoutRoot.FindAnyWidget("OnlineInfo").IsVisible())
+		{
+			PlayerListEntryScriptedWidget selected;
+			if (m_ServerInfoPanel)
+				selected = m_ServerInfoPanel.GetSelectedPlayer();
+			if (GetUApi().GetInputByID(UAUICtrlX).LocalPress())
+			{
+				if (selected)
+					m_ServerInfoPanel.ToggleMute(selected.GetUID());
+				Refresh();
+			}
+			
+			#ifndef PLATFORM_PS4
+			if (GetUApi().GetInputByID(UAUICtrlY).LocalPress())
+			{
+				if (selected)
+					OnlineServices.ShowUserProfile(selected.GetUID());
+			}
+			#endif
+		}
+	}
+	
+	bool ShouldRestartBeVisible(Man player)
+	{
+		return player && player.IsUnconscious() && !CfgGameplayHandler.GetDisableRespawnInUnconsciousness();
+	}
+	
+	
+	void UpdateGUI()
+	{
+		Man player = GetGame().GetPlayer();
+		if (player)
+		{
+			int life_state = player.GetPlayerState();
+			m_PlayerAlive = life_state == EPlayerStates.ALIVE;
+		}
+		
+		if (m_PlayerAlive)
+		{
+			m_RestartButton.Show(ShouldRestartBeVisible(player));
+		}
+		else
+		{
+			m_RestartButton.Show(false);
+		}
+		
+		m_ContinueButton.Show(m_PlayerAlive);
+		m_RestartDeadButton.Show(!m_PlayerAlive);		
+	}
+	
+	bool IsOnlineOpen()
+	{
+		return m_OnlineMenu.IsVisible();
+	}
+
+	void CloseOnline()
+	{
+		m_OnlineMenu.Show(false);
+		m_SelectAvailable = true;
+		m_MuteAvailable = false;
+		m_GamercardAvailable = false;
+		UpdateControlsElements();
+		
+		SetFocus(m_OnlineButton);
+	}
+	
+	void SelectServer()
+	{
+		if (m_ServerInfoPanel)
+		{
+			m_ServerInfoPanel.FocusFirst();
+			
+			Refresh();
+		}
+	}
+	
+	override bool OnItemSelected(Widget w, int x, int y, int row, int column, int oldRow, int oldColumn)
+	{
+		return false;
+	}
+	
+	void SyncEvent_OnRecievedPlayerList(SyncPlayerList player_list)
+	{
+		m_ServerInfoPanel.Reload(player_list);
+		
+		Refresh();
+	}
+	
+	void OnPermissionsUpdate(BiosPrivacyUidResultArray result_list)
+	{
+		m_ServerInfoPanel.Reload(result_list);
+		
+		Refresh();
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		Man player = GetGame().GetPlayer();
+		if (player)
+		{
+			int life_state = player.GetPlayerState();
+
+			if (life_state == EPlayerStates.ALIVE)
+			{
+				m_PlayerAlive = true;
+			}
+		}
+		
+		if (m_PlayerAlive)
+		{
+			if (player)
+				m_RestartButton.Show(player.IsUnconscious());
+		}
+		else
+		{
+			m_RestartButton.Show(false);
+		}
+		m_ContinueButton.Show(m_PlayerAlive);
+		m_RestartDeadButton.Show(!m_PlayerAlive);
+		
+		UpdateMenuFocus();
+		
+		#ifdef PLATFORM_CONSOLE
+			bool mk = GetGame().GetInput().IsEnabledMouseAndKeyboard();
+			bool mk_server = GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer();
+			TextWidget warning = TextWidget.Cast(layoutRoot.FindAnyWidget("MouseAndKeyboardWarning"));
+			if (mk)
+			{
+				if (mk_server)
+				{
+					warning.SetText("#str_mouse_and_keyboard_server_warning");
+				}
+				else
+				{
+					warning.SetText("#str_controller_server_warning");
+				}
+			}
+		
+			warning.Show(mk);
+		#endif
+		UpdateControlsElements();
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			if (w == m_ContinueButton || w == m_ExitButton || w == m_RestartButton || w == m_OptionsButton || w == m_ControlsButton || w == m_OnlineButton || w == m_TutorialsButton);
+				return true;
+		}
+		return false;
+	}
+	
+	override void Refresh()
+	{
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+			version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+			version = "#main_menu_version" + " " + version;
+		#endif
+		m_Version.SetText(version);
+		
+		m_MuteAvailable = false;
+		m_GamercardAvailable = false;
+		
+		if (GetGame().IsMultiplayer() && layoutRoot.FindAnyWidget("OnlineInfo").IsVisible() && m_ServerInfoPanel)
+		{
+			PlayerListEntryScriptedWidget selected = m_ServerInfoPanel.GetSelectedPlayer();
+			if (selected && !selected.IsLocalPlayer())
+			{
+				m_MuteAvailable = !GetGame().GetWorld().IsDisabledReceivingVoN() && !selected.IsGloballyMuted();
+				#ifndef PLATFORM_PS4
+				m_GamercardAvailable = true;
+				#endif							
+				SetMuteButtonText(selected.IsMuted());
+			}
+		}
+		
+		UpdateControlsElements();
+	}
+	
+	void ColorDisable(Widget w)
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus(null);
+		#endif
+		
+		ButtonWidget button = ButtonWidget.Cast(w);
+		if (button && button != m_ContinueButton)
+		{
+			button.SetTextColor(ARGB(255, 255, 255, 255));
+		}
+		ButtonSetColor(w, ARGB(0, 0, 0, 0));
+		ButtonSetTextColor(w,  ARGB(60, 0, 0, 0));
+	}
+	
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+				
+		int color_pnl = ARGB(255, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 0, 0);
+		
+		#ifdef PLATFORM_CONSOLE
+			color_pnl = ARGB(255, 200, 0, 0);
+			color_lbl = ARGB(255, 255, 255, 255);
+		#endif
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		
+		if (label)
+		{
+			label.SetText(text);
+		}
+		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ButtonSetTextColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+				
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+	
+	/// Set mute text button text (mute / unmute)
+	protected void SetMuteButtonText(bool isMuted)
+	{
+		if (isMuted)
+		{
+			m_CurrentMuteButtonText = m_UnmuteButtonTextID;
+		}
+		else
+		{
+			m_CurrentMuteButtonText = m_MuteButtonTextID;
+		}
+	}
+	
+	/// Set correct bottom button texts based on platform (ps4 vs xbox texts)
+	protected void LoadTextStrings()
+	{
+		#ifdef PLATFORM_PS4
+		m_MuteButtonTextID			= "#ps4_ingame_menu_mute";
+		m_UnmuteButtonTextID		= "#ps4_ingame_menu_unmute";
+		m_BackButtonTextID			= "#ps4_ingame_menu_back";
+		m_SelectButtonTextID		= "#ps4_ingame_menu_select";
+		m_OpenGameCardButtonTextID	= "#ps4_ingame_menu_opencard";
+		#else
+		m_MuteButtonTextID			= "#xbox_ingame_menu_mute";
+		m_UnmuteButtonTextID		= "#xbox_ingame_menu_unmute";
+		m_BackButtonTextID			= "#STR_rootFrame_toolbar_bg_ConsoleToolbar_Back_BackText0";
+		m_SelectButtonTextID		= "#layout_xbox_ingame_menu_select";
+		m_OpenGameCardButtonTextID	= "#layout_xbox_ingame_menu_gamecard";
+		#endif	
+	}
+	
+	/// Initial texts load for the footer buttons
+	protected void LoadFooterButtonTexts()
+	{
+		TextWidget uiGamecardText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("GamercardText"));
+		TextWidget uiBackText 		= TextWidget.Cast(layoutRoot.FindAnyWidget("BackText"));
+		TextWidget uiSelectText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("SelectText"));
+		
+		if (uiGamecardText)
+		{
+			uiGamecardText.SetText(m_OpenGameCardButtonTextID);
+		}
+		if (uiBackText)
+		{
+			uiBackText.SetText(m_BackButtonTextID);
+		}
+		if (uiSelectText)
+		{
+			uiSelectText.SetText(m_SelectButtonTextID);
+		}
+	}
+	
+	void UpdateMenuFocus()
+	{
+		Man player = GetGame().GetPlayer();
+		if (m_PlayerAlive)
+		{
+			if (ShouldRestartBeVisible(player))
+				SetFocus(m_RestartButton);
+			else
+				SetFocus(m_ContinueButton);
+		}
+		else
+		{
+			SetFocus(m_RestartDeadButton);
+		}
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		if (toolbarShow)
+		{
+			RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+			string text = "";
+			if (m_SelectAvailable)
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", m_SelectButtonTextID, EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			if (m_MuteAvailable)
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", m_CurrentMuteButtonText, EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			if (m_BackAvailable)
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", m_BackButtonTextID, EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			if (m_GamercardAvailable)
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", m_OpenGameCardButtonTextID, EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			
+			toolbar_text.SetText(text);
+		}
+		
+		RichTextWidget toolbar_b2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon0"));
+		toolbar_b2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER));
+		
+		bool onlineOpen = IsOnlineOpen();
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(toolbarShow);
+		layoutRoot.FindAnyWidget("play_panel_root").Show(!onlineOpen);
+		layoutRoot.FindAnyWidget("play_panel_root2").Show(onlineOpen && !toolbarShow);
+		layoutRoot.FindAnyWidget("dayz_logo").Show(!onlineOpen);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/IngameHud.c b/scripts/5_Mission/DayZ/GUI/IngameHud.c
new file mode 100644
index 0000000000000000000000000000000000000000..6a83b7850f3132d4a50b8f1dca9f9025841c5120
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/IngameHud.c
@@ -0,0 +1,1551 @@
+class IngameHud extends Hud
+{
+	protected const float						FADE_IN_TIME = 0.3;
+	protected const float						FADE_OUT_TIME = 0.3;
+	protected const float						HIDE_MENU_TIME = 5;
+
+	protected ref map<int,string>				m_StatesWidgetNames;
+	protected ref map<int,ImageWidget>			m_StatesWidgets;  // [key] ImageWidget
+
+	protected ref map<ImageWidget, int>			m_TendencyStatusCritical;	//array of icons that are blinking due to critical tendency status
+	protected const float						TENDENCY_BLINK_TIME = 0.25;
+	protected float								m_BlinkTime;
+	
+	protected ref map<int,string>				m_BadgesWidgetNames;
+	protected ref map<int,int>					m_BadgesSupportedLevels;
+	protected ref map<int,int>					m_BadgesWidgetDisplay;
+	protected ref map<int,ImageWidget>			m_BadgesWidgets;  // [key] ImageWidget
+	protected bool								m_AnyBadgeVisible;
+	protected bool								m_IsTemperatureVisible;
+	protected float								m_TemperatureTimer;
+	protected float								m_TemperatureShowTime = 30;
+	protected ImageWidget						m_HeatBufferPlus;
+
+	protected bool								m_IsStaminaVisible;
+	protected float								m_StaminaTimer;
+	protected float								m_StaminaShowTime = 0.15;
+	
+	protected ref map<int,string>				m_VehicleGearTable;
+	protected ref map<int,string>				m_VehicleGearTableAuto;
+
+	protected Widget							m_HudPanelWidget;
+	protected Widget							m_LeftHudPanelWidget;
+	protected Widget							m_QuickbarWidget;
+	protected ref InventoryQuickbar				m_Quickbar;
+	
+	protected Widget							m_VehiclePanel;
+	
+	protected ImageWidget						m_VehicleRPMPointer;
+	protected ImageWidget						m_VehicleRPMDial;
+	protected ImageWidget						m_VehicleRPMRedline;
+	protected ImageWidget						m_VehicleSpeedPointer;
+	protected Widget							m_VehicleTemperatureIndicator;
+	protected ImageWidget						m_VehicleTemperaturePointer;
+	protected ImageWidget						m_VehicleTemperatureLight;
+	protected ImageWidget						m_VehicleFuelPointer;
+	protected ImageWidget						m_VehicleFuelLight;
+	
+	protected TextWidget						m_VehicleSpeedValue;
+	
+	protected TextWidget						m_VehicleCurrentGearValue;
+	protected TextWidget						m_VehicleNextGearValue;
+	protected TextWidget						m_VehiclePrevGearValue;
+	
+	protected ImageWidget						m_VehicleBatteryLight;
+	protected ImageWidget						m_VehicleEngineLight;
+	protected ImageWidget						m_VehicleOilLight;
+	protected ImageWidget						m_VehicleHandBrakeLight;
+	protected ImageWidget						m_VehicleWheelLight;
+	
+	protected bool 								m_VehicleDamageZoneHitEngineState;
+	protected float								m_VehicleDamageZonesHitTimer;
+	
+	protected bool								m_InVehicleAsDriver;
+	protected CarScript							m_CurrentVehicle;
+	
+	
+	protected Widget 							m_GameStatusIconsPanel;					
+	protected ImageWidget 						m_HighPingA;					
+	protected ImageWidget 						m_HighPingB;					
+	protected ImageWidget 						m_LowServerPerfA;			
+	protected ImageWidget 						m_LowServerPerfB;			
+	protected ImageWidget 						m_ConnectionLost;			
+	
+	protected Widget							m_Notifiers;
+	protected TextWidget						m_BloodType;
+	protected TextWidget						m_BloodPosType;
+	protected Widget							m_BadgeNotifierDivider;
+	protected Widget							m_Badges;
+	protected ref Timer							m_HideTimer;
+	protected ref WidgetFadeTimer				m_FadeTimerCrosshair;
+	protected ref WidgetFadeTimer				m_FadeTimerActionCursor;
+//	protected ref WidgetFadeTimer				m_FadeTimerWeaponMode;
+//	protected ref WidgetFadeTimer				m_FadeTimerZeroing;
+	protected ref WidgetFadeTimer				m_FadeTimerZeroingOld;
+	protected ref WidgetFadeTimer				m_FadeTimerMagazineName;
+	protected ref WidgetFadeTimer				m_FadeTimerWeaponName;
+	protected ref WidgetFadeTimer				m_FadeTimerWeaponStats;
+	protected ref WidgetFadeTimer				m_FadeTimerQuickbar;
+	protected ref WidgetFadeTimer				m_FadeTimerWalkieTalkie;
+	protected ref WidgetFadeTimer				m_FadeTimerWalkieTalkieText;
+	
+	protected ProgressBarWidget					m_Stamina;
+	protected Widget							m_StaminaBackground;
+	protected Widget							m_Presence;
+	protected Widget							m_StanceProne;
+	protected Widget							m_StanceStand;
+	protected Widget							m_StanceStandWalk;
+	protected Widget							m_StanceCrouch;
+	protected Widget							m_StanceCar;
+	protected Widget							m_StancePanel;
+	protected Widget							m_PresenceLevel0;
+	protected Widget							m_PresenceLevel1;
+	protected Widget							m_PresenceLevel2;
+	protected Widget							m_PresenceLevel3;
+	protected Widget							m_PresenceLevel4;
+	protected ref Timer							myTimer; //TEMP
+	protected ref array<ref WidgetFadeTimer>	m_FadeTimers = new array<ref WidgetFadeTimer>;
+	protected Widget							m_MouseSingleAction;
+	protected Widget							m_MouseContinuousAction;
+	protected Widget							m_RadialProgressBar1;
+	protected Widget							m_RadialProgressBarCrossHair;
+	protected Widget							m_RadialProgressBar;
+	protected Widget							m_CursorWidget;
+	protected ImageWidget						m_CursorIcon;
+	protected Widget							m_WalkieTalkie;
+	
+	protected Widget							m_ActionWidget;
+	protected TextWidget						m_ActionDesc;
+	protected TextWidget						m_ActionItemDesc;
+	protected Widget							m_ActionItemQuantityWrapper
+	protected ImageWidget						m_ActionHealthMark;
+	protected ProgressBarWidget					m_ActionQuantityBar;
+	protected Widget							m_ActionQuantityBox;
+	protected TextWidget						m_ActionQuantityBoxText;
+	protected ImageWidget						m_ActionIcon;
+	protected TextWidget						m_ActionButtonText;
+
+	protected Widget							m_ActionIconFrame;
+	protected Widget							m_ActionMultipleItemsFrame;
+	
+	protected Widget							m_ActionTarget;
+	protected ActionTargetsCursor				m_ActionTargetsCursor;
+	
+	// CrossHairs
+	protected ImageWidget						m_PermanentCrossHair;
+	
+	protected bool								m_HudHideUI;
+	protected bool								m_HudHidePlayer;
+	protected bool								m_HudInventory;
+	protected bool								m_HudState; //options-driven global setting
+	protected bool								m_QuickbarHideUI;
+	protected bool								m_QuickbarHidePlayer;
+	protected bool								m_QuickbarState; //options-driven global setting
+	protected bool								m_IsQuickbarVisible;
+	protected bool								m_IsHudVisible;
+	protected bool								m_Faded;
+	protected bool								m_ZeroingKeyPressed;
+	
+	protected Widget 							m_HitIndicatorUp;
+	protected Widget 							m_HitIndicatorDown;
+	protected Widget 							m_HitIndicatorLeft;
+	protected Widget 							m_HitIndicatorRight;
+	protected Widget 							m_HitIndicatorSingle;
+	protected Widget							m_SpecializatonPanel;
+	protected Widget							m_SpecializationIcon;
+	
+	ref array<ref HitDirectionEffectBase> 		m_HitDirEffectArray;
+		
+	void IngameHud()
+	{
+		m_FadeTimerCrosshair			= new WidgetFadeTimer;
+		m_FadeTimerActionCursor			= new WidgetFadeTimer;
+	 	m_FadeTimerQuickbar			= new WidgetFadeTimer;
+	 	m_FadeTimerWalkieTalkie		= new WidgetFadeTimer;
+		m_FadeTimerWalkieTalkieText	= new WidgetFadeTimer;
+		
+		m_StatesWidgets					= new map<int, ImageWidget>; // [key] widgetName
+		m_StatesWidgetNames				= new map<int, string>;
+		
+		m_TendencyStatusCritical		= new map<ImageWidget, int>;
+		
+		m_BadgesWidgets					= new map<int, ImageWidget>; // [key] widgetName
+		m_BadgesWidgetNames				= new map<int, string>;
+		m_BadgesSupportedLevels			= new map<int, int>;
+		m_BadgesWidgetDisplay			= new map<int, int>;
+		
+		m_VehicleDamageZonesHitTimer	= 0;
+
+		m_VehicleGearTable				= new map<int, string>;
+		m_VehicleGearTable.Set(-1, "");
+		m_VehicleGearTable.Set(CarGear.REVERSE, "R");
+		m_VehicleGearTable.Set(CarGear.NEUTRAL, "N");
+		m_VehicleGearTable.Set(CarGear.FIRST, "1");
+		m_VehicleGearTable.Set(CarGear.SECOND, "2");
+		m_VehicleGearTable.Set(CarGear.THIRD, "3");
+		m_VehicleGearTable.Set(CarGear.FOURTH, "4");
+		m_VehicleGearTable.Set(CarGear.FIFTH, "5");
+		m_VehicleGearTable.Set(CarGear.SIXTH, "6");
+		m_VehicleGearTable.Set(CarGear.SEVENTH, "7");
+		m_VehicleGearTable.Set(CarGear.EIGTH, "8");
+		
+		m_VehicleGearTableAuto			= new map<int, string>;
+		m_VehicleGearTableAuto.Set(-1, "");
+		m_VehicleGearTableAuto.Set(CarAutomaticGearboxMode.R, "R");
+		m_VehicleGearTableAuto.Set(CarAutomaticGearboxMode.N, "N");
+		m_VehicleGearTableAuto.Set(CarAutomaticGearboxMode.D, "D");
+
+	}
+
+	override void Init( Widget hud_panel_widget )
+	{
+		m_HudPanelWidget = hud_panel_widget;
+		m_HudPanelWidget.Show( true );
+
+		//Quickbar
+		m_QuickbarWidget		= m_HudPanelWidget.FindAnyWidget("QuickbarGrid");
+		m_QuickbarWidget.Show( false );
+		
+		//Left HUD Panel
+		m_LeftHudPanelWidget	= m_HudPanelWidget.FindAnyWidget("LeftHUDPanel");
+		
+		//TEMPORARY HACK!!! player is not present when Hud is being initialized 
+		myTimer = new Timer( CALL_CATEGORY_GAMEPLAY );
+		myTimer.Run( 1, this, "InitQuickbar" );
+		
+		m_CursorWidget = m_HudPanelWidget.FindAnyWidget("CursorIcons");
+		m_CursorWidget.Show(true);
+		Class.CastTo(m_CursorIcon, m_HudPanelWidget.FindAnyWidget("Cursor"));
+
+		//Permanent Crosshair
+		Class.CastTo(m_PermanentCrossHair, m_HudPanelWidget.FindAnyWidget("PermanentCrossHair"));
+		
+		m_WalkieTalkie = m_HudPanelWidget.FindAnyWidget("WalkieTalkie");
+		
+		//Panels
+		Class.CastTo(m_Stamina, m_HudPanelWidget.FindAnyWidget("StaminaBar"));
+		m_Presence						= m_HudPanelWidget.FindAnyWidget("PresencePanel");
+		m_Badges						= hud_panel_widget.FindAnyWidget("BadgesPanel");
+		m_Notifiers						= m_HudPanelWidget.FindAnyWidget("NotifiersPanel");
+		m_SpecializatonPanel			= m_HudPanelWidget.FindAnyWidget("SpecializationPanel");
+		m_SpecializationIcon 			= m_HudPanelWidget.FindAnyWidget("SpecializationIcon");
+		m_BadgeNotifierDivider			= m_HudPanelWidget.FindAnyWidget("BadgeNotifierDivider");
+		m_BloodType						= TextWidget.Cast( m_HudPanelWidget.FindAnyWidget("BloodType") );
+		m_BloodPosType					= TextWidget.Cast( m_HudPanelWidget.FindAnyWidget("BloodPosType") );
+		
+		m_VehiclePanel					= m_HudPanelWidget.FindAnyWidget("VehiclePanel");
+		m_VehiclePanel.Show(false);
+		
+		m_VehicleRPMPointer				= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("RPMPointer") );
+		m_VehicleRPMDial				= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("RPMDial") );
+		m_VehicleRPMRedline				= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("RPMDialRedline") );
+		m_VehicleSpeedPointer			= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("SpeedPointer") );
+		m_VehicleSpeedValue				= TextWidget.Cast( m_VehiclePanel.FindAnyWidget("SpeedValue") );
+		
+		m_VehicleCurrentGearValue		= TextWidget.Cast( m_VehiclePanel.FindAnyWidget("Current") );
+		m_VehicleNextGearValue			= TextWidget.Cast( m_VehiclePanel.FindAnyWidget("Next") );
+		m_VehiclePrevGearValue			= TextWidget.Cast( m_VehiclePanel.FindAnyWidget("Prev") );
+		
+		m_VehicleBatteryLight			= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("BatteryLight"));
+		m_VehicleEngineLight			= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("EngineLight"));
+		m_VehicleOilLight				= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("OilLight"));
+		m_VehicleHandBrakeLight			= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("HandBrakeLight"));
+		m_VehicleWheelLight				= ImageWidget.Cast( m_VehiclePanel.FindAnyWidget("WheelLight"));
+		
+		m_VehicleTemperatureIndicator	= m_VehiclePanel.FindAnyWidget("TemperatureIndicator");
+		m_VehicleTemperaturePointer		= ImageWidget.Cast(m_VehiclePanel.FindAnyWidget("TemperaturePointer"));
+		m_VehicleTemperatureLight		= ImageWidget.Cast(m_VehiclePanel.FindAnyWidget("TemperatureLight"));
+		m_VehicleFuelPointer			= ImageWidget.Cast(m_VehiclePanel.FindAnyWidget("FuelPointer"));
+		m_VehicleFuelLight				= ImageWidget.Cast(m_VehiclePanel.FindAnyWidget("FuelLight"));
+		
+		m_StaminaBackground				= m_HudPanelWidget.FindAnyWidget("StaminaBackground");
+		m_StaminaBackground.Show(true);
+		m_StanceProne					= m_HudPanelWidget.FindAnyWidget("StanceProne");
+		m_StanceCrouch					= m_HudPanelWidget.FindAnyWidget("StanceCrouch");
+		m_StanceStand					= m_HudPanelWidget.FindAnyWidget("StanceStand");
+		m_StanceStandWalk				= m_HudPanelWidget.FindAnyWidget("StanceStandWalk");
+		m_StanceCar						= m_HudPanelWidget.FindAnyWidget("StanceCar");
+		m_StancePanel					= m_HudPanelWidget.FindAnyWidget("StancePanel");
+
+		m_ActionTarget					= m_HudPanelWidget.FindAnyWidget("ActionTargetsCursorWidget");
+		//! gets scripted handler from widget
+		m_ActionTarget.GetScript(m_ActionTargetsCursor);
+
+		// heat buffer plus sign
+		m_HeatBufferPlus = ImageWidget.Cast( m_HudPanelWidget.FindAnyWidget( "HeatBuffer" ) );
+		
+		//Game State Icons
+		m_GameStatusIconsPanel			= m_HudPanelWidget.FindAnyWidget("GameStatusIcons");
+		m_HighPingA						= ImageWidget.Cast(m_HudPanelWidget.FindAnyWidget("HighPingA"));
+		m_HighPingB						= ImageWidget.Cast(m_HudPanelWidget.FindAnyWidget("HighPingB"));
+		m_LowServerPerfA				= ImageWidget.Cast(m_HudPanelWidget.FindAnyWidget("LowServerPerfA"));
+		m_LowServerPerfB				= ImageWidget.Cast(m_HudPanelWidget.FindAnyWidget("LowServerPerfB"));
+		m_ConnectionLost				= ImageWidget.Cast(m_HudPanelWidget.FindAnyWidget("ConnectionLost"));
+		
+		if ( m_HeatBufferPlus )
+			m_HeatBufferPlus.Show( false );
+
+		#ifndef NO_GUI
+		m_Timer = new Timer( CALL_CATEGORY_GAMEPLAY );
+		m_Timer.Run(0.333, this, "RefreshQuickbar", NULL, true );
+		#endif
+		InitBadgesAndNotifiers();
+		
+		m_PresenceLevel0 = hud_panel_widget.FindAnyWidget("Presence0");
+		m_PresenceLevel1 = hud_panel_widget.FindAnyWidget("Presence1");
+		m_PresenceLevel2 = hud_panel_widget.FindAnyWidget("Presence2");
+		m_PresenceLevel3 = hud_panel_widget.FindAnyWidget("Presence3");
+		m_PresenceLevel4 = hud_panel_widget.FindAnyWidget("Presence4");
+		m_PresenceLevel0.Show( false );
+		m_PresenceLevel1.Show( false );
+		m_PresenceLevel2.Show( false );
+		m_PresenceLevel3.Show( false );
+		m_PresenceLevel4.Show( false );
+		
+		SetLeftStatsVisibility( true );
+		m_HudState = g_Game.GetProfileOption( EDayZProfilesOptions.HUD );
+		MissionGameplay.Cast(GetGame().GetMission()).GetConnectivityInvoker().Insert(OnConnectionIconsSettingsChanged);
+		m_GameStatusIconsPanel.Show(g_Game.GetProfileOption(EDayZProfilesOptions.CONNECTIVITY_INFO));
+		//ShowQuickBar(GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() && g_Game.GetProfileOption(EDayZProfilesOptions.QUICKBAR)); //unreliable
+	}
+	
+	void InitBadgesAndNotifiers()
+	{
+		// state notifiers
+		m_StatesWidgetNames.Clear();
+		m_StatesWidgets.Clear();
+		m_StatesWidgetNames.Set( NTFKEY_THIRSTY, "Thirsty" );
+		m_StatesWidgetNames.Set( NTFKEY_HUNGRY, "Hungry" );
+		m_StatesWidgetNames.Set( NTFKEY_SICK, "Health" );
+		m_StatesWidgetNames.Set( NTFKEY_BLEEDISH, "Blood" );
+		m_StatesWidgetNames.Set( NTFKEY_FEVERISH, "Temperature" );
+	
+		m_Notifiers.Show( true );
+		m_Badges.Show( true );
+
+		int i = 0;
+		int key = 0;
+		for ( i = 0; i < m_StatesWidgetNames.Count(); i++ )
+		{
+			string widget_name = m_StatesWidgetNames.GetElement(i);
+			key = m_StatesWidgetNames.GetKey(i);
+			ImageWidget w;
+			Class.CastTo(w,  m_Notifiers.FindAnyWidget( String( "Icon" + widget_name ) ) );
+			m_StatesWidgets.Set( key, w );
+			w.Show( true );
+			for ( int y = 0; y < 5; y++ )
+			{
+				w.LoadImageFile( y, "set:dayz_gui image:icon" + widget_name + y );
+			}
+		
+			w.SetImage( 0 );
+			float alpha = w.GetAlpha();
+			w.SetColor( ARGB( alpha * 255, 220, 220, 220 ) );	//white
+			m_TendencyStatusCritical.Remove( w );
+			// clear all arrows
+			for ( int x = 1; x < 4; x++ )
+			{
+				Class.CastTo(w,  m_Notifiers.FindAnyWidget( String( widget_name + "ArrowUp" + x.ToString() ) ) );
+				w.Show( false );
+				Class.CastTo(w,  m_Notifiers.FindAnyWidget( String( widget_name + "ArrowDown" + x.ToString() ) ) );
+				w.Show( false );
+			}
+		
+			
+		}
+
+		// badges
+		m_BadgesWidgetNames.Clear();
+		m_BadgesWidgets.Clear();
+		m_BadgesWidgetDisplay.Clear();
+		m_BadgesSupportedLevels.Clear();
+		
+		m_BadgesWidgetNames.Set( NTFKEY_FRACTURE, "Fracture" );
+		m_BadgesWidgetNames.Set( NTFKEY_STUFFED, "Stomach" );
+		m_BadgesWidgetNames.Set( NTFKEY_SICK, "Sick" );
+		m_BadgesWidgetNames.Set( NTFKEY_WETNESS, "Wetness" );
+		m_BadgesWidgetNames.Set( NTFKEY_POISONED, "Poisoned" );
+		m_BadgesWidgetNames.Set( NTFKEY_BLEEDISH, "Bleeding" );
+		m_BadgesWidgetNames.Set( NTFKEY_LIVES, "Shock" );
+		m_BadgesWidgetNames.Set( NTFKEY_PILLS, "Pills" );
+		m_BadgesWidgetNames.Set( NTFKEY_LEGS, "InjuredLegs" );
+		
+		// any badges not included bellow are just ON/OFF
+		m_BadgesSupportedLevels.Insert(NTFKEY_LEGS,3);
+	
+		for ( i = 0; i < m_BadgesWidgetNames.Count(); i++ )
+		{
+			string badge_name = m_BadgesWidgetNames.GetElement(  i);
+			key = m_BadgesWidgetNames.GetKey( i );
+			ImageWidget badge_widget;
+
+
+			Class.CastTo(badge_widget,  m_Badges.FindAnyWidget( badge_name ) );
+			
+			if (m_BadgesSupportedLevels.Contains(key))
+			{
+				int badgeCountMax = m_BadgesSupportedLevels.Get(key);
+				
+				for ( int q = 0; q < badgeCountMax; q++ )
+				{
+					badge_widget.LoadImageFile( q, "set:dayz_gui image:icon" + badge_name + q );
+				}
+			}
+
+			m_BadgesWidgets.Set( key, badge_widget );
+			badge_widget.Show( false );
+			m_BadgesWidgetDisplay.Set( key, false );
+		}
+		m_AnyBadgeVisible = false;
+		m_BadgeNotifierDivider.Show(false);
+	
+	}
+	
+	void OnConnectionIconsSettingsChanged(bool enabled)
+	{
+		m_GameStatusIconsPanel.Show(enabled);
+	}
+	
+	override void OnResizeScreen()
+	{
+		float x, y;
+		m_HudPanelWidget.GetScreenSize( x, y );
+		m_HudPanelWidget.Update();
+		m_Badges.Update();
+		m_Notifiers.SetPos( 0, 0 );
+	}
+
+	override void Show( bool show )
+	{
+		m_HudPanelWidget.Show( show );
+	}
+
+	override void ShowWalkieTalkie( bool show )
+	{
+		m_FadeTimerWalkieTalkie.Stop();
+		m_FadeTimerWalkieTalkieText.Stop();
+		m_WalkieTalkie.Show( show );
+	}
+	
+	override void ShowWalkieTalkie( int fadeOutSeconds )
+	{
+		m_WalkieTalkie.Show(true);
+		m_FadeTimerWalkieTalkie.Stop();
+		m_FadeTimerWalkieTalkieText.Stop();
+		m_FadeTimerWalkieTalkie.FadeOut( m_WalkieTalkie.FindAnyWidget("Icon") , fadeOutSeconds );
+		m_FadeTimerWalkieTalkieText.FadeOut( m_WalkieTalkie.FindAnyWidget("Text") , fadeOutSeconds );
+	}
+	
+	override void SetWalkieTalkieText( string text )
+	{
+		TextWidget txt;
+		Class.CastTo(txt, m_WalkieTalkie.FindAnyWidget("Text"));
+		txt.SetText(text);
+	}
+	
+	override void SetCursorIcon( string icon )
+	{
+		if ( icon.Length() == 0 || icon == CursorIcons.None )
+			m_CursorIcon.Show(false);
+		else
+		{
+			m_CursorIcon.LoadImageFile( 0, icon );
+			m_CursorIcon.Show(true);
+		}
+	}
+
+	override void ShowCursor()
+	{
+		m_CursorWidget.Show( true );
+	}
+	
+	override void HideCursor()
+	{
+		m_CursorWidget.Show( false );
+	}
+	
+	override void SetCursorIconScale( string type, float percentage )
+	{
+		float x, y;
+		m_CursorIcon.FindAnyWidget( type ).GetParent().GetSize( x, y );
+		m_CursorIcon.FindAnyWidget( type ).GetParent().SetSize( x * percentage, y * percentage );
+	}
+	
+	override void SetCursorIconOffset( string type, float x, float y )
+	{
+		m_CursorIcon.FindAnyWidget( type ).GetParent().SetPos( x, y );
+	}
+	
+	override void SetCursorIconSize( string type, float x, float y )
+	{
+		m_CursorIcon.FindAnyWidget( type ).GetParent().SetSize( x, y );
+	}
+
+#ifdef DIAG_DEVELOPER
+	// Debug Crosshair
+	override void SetPermanentCrossHair( bool show )
+	{
+		m_PermanentCrossHair.Show(show);
+	}
+#endif
+	
+	override void DisplayNotifier( int key, int tendency, int status )
+	{
+		ImageWidget w;
+		if ( key == NTFKEY_FEVERISH )
+		{
+			DisplayTendencyTemp( key, tendency, status );
+		}
+		else
+		{
+			DisplayTendencyNormal( key, tendency, status );
+		}
+		
+		// tendency arrows
+		string arrow_name = "ArrowUp";
+		if ( tendency < 0 )
+		{
+			arrow_name = "ArrowDown";
+		}
+		tendency = Math.AbsInt( tendency );
+
+		for ( int x = 1; x < 4; x++ )
+		{ 
+			Class.CastTo(w,  m_Notifiers.FindAnyWidget( String(  m_StatesWidgetNames.Get( key ) + "ArrowUp" + x.ToString() ) ) );
+			if( w )
+				w.Show( false );
+			Class.CastTo(w,  m_Notifiers.FindAnyWidget( String(  m_StatesWidgetNames.Get( key ) + "ArrowDown" + x.ToString() ) ) );
+			if( w )
+				w.Show( false );
+		}
+		
+		if( tendency > 0 )
+		{
+			string widget_name = m_StatesWidgetNames.Get( key ) + arrow_name + Math.Clamp( tendency, 1, 3 );
+			Class.CastTo(w, m_Notifiers.FindAnyWidget( widget_name ) );
+			if( w )
+				w.Show( true );
+		}
+	}
+	
+	void DisplayTendencyNormal( int key, int tendency, int status )
+	{
+		ImageWidget w;
+		Class.CastTo(w,  m_Notifiers.FindAnyWidget( String( "Icon" + m_StatesWidgetNames.Get( key ) ) ) );
+		
+		if( w )
+		{
+			w.SetImage( Math.Clamp( status - 1, 0, 4 ) );
+			float alpha = w.GetAlpha();
+			
+			switch( status )
+			{
+				case 3:
+					w.SetColor( ARGB( alpha * 255, 220, 220, 0 ) );		//yellow
+					m_TendencyStatusCritical.Remove( w );				//remove from blinking group
+					break;
+				case 4:
+					w.SetColor( ARGB( alpha * 255, 220, 0, 0 ) );		//red
+					m_TendencyStatusCritical.Remove( w );				//remove from blinking group
+					break;
+				case 5:
+					if ( !m_TendencyStatusCritical.Contains( w ) )
+					{
+						m_TendencyStatusCritical.Insert( w, ARGB( alpha * 255, 220, 0, 0 ) );	//add to blinking group
+					}
+					break;
+				default:
+					w.SetColor( ARGB( alpha * 255, 220, 220, 220 ) );	//white
+					m_TendencyStatusCritical.Remove( w );				//remove from blinking group
+					break;
+			}
+		}	
+	}
+	
+	void DisplayTendencyTemp( int key, int tendency, int status )
+	{
+		ImageWidget w = ImageWidget.Cast( m_Notifiers.FindAnyWidget( String( "Icon" + m_StatesWidgetNames.Get( key ) ) ) );
+		TextWidget temp_top = TextWidget.Cast( m_Notifiers.FindAnyWidget( "TemperatureValueTop" ) );
+		TextWidget temp_bot = TextWidget.Cast( m_Notifiers.FindAnyWidget( "TemperatureValueBottom" ) );
+		//string temp = player..ToString() + "°C";
+		float alpha = w.GetAlpha();
+		
+		if ( tendency < 0 )
+		{
+			temp_top.Show( true );
+			temp_bot.Show( false );
+		}
+		else
+		{
+			temp_top.Show( false );
+			temp_bot.Show( true );
+		}
+		
+		switch( status )
+		{
+			case 2:
+				w.SetColor( ARGB( alpha * 255, 220, 220, 0 ) );		//WARNING_PLUS
+				m_TendencyStatusCritical.Remove( w );
+				w.SetImage( 1 );
+				
+				break;
+			case 3:
+				w.SetColor( ARGB( alpha * 255, 220, 0, 0 ) );		//CRITICAL_PLUS
+				m_TendencyStatusCritical.Remove( w );
+				w.SetImage( 0 );
+				break;
+			case 4:
+				if ( !m_TendencyStatusCritical.Contains( w ) )		//BLINKING_PLUS
+				{
+					m_TendencyStatusCritical.Insert( w, ARGB( alpha * 255, 220, 0, 0 ) );
+				}
+				w.SetImage( 0 );
+				break;
+			case 5:
+				w.SetColor( ARGB( alpha * 255, 0, 206, 209 ) );		//WARNING_MINUS
+				m_TendencyStatusCritical.Remove( w );
+				w.SetImage( 3 );
+				break;
+			case 6:
+				w.SetColor( ARGB( alpha * 255, 30, 144, 220 ) );	//CRITICAL_MINUS
+				m_TendencyStatusCritical.Remove( w );
+				w.SetImage( 4 );
+				break;
+			case 7:													//BLINKING_MINUS
+				if ( !m_TendencyStatusCritical.Contains( w ) )
+				{
+					m_TendencyStatusCritical.Insert( w, ARGB( alpha * 255, 30, 144, 220 ) );
+				}
+				w.SetImage( 4 );
+				break;				
+			default:
+				w.SetColor( ARGB( alpha * 255, 220, 220, 220 ) );	//DEFAULT
+				m_TendencyStatusCritical.Remove( w );
+				w.SetImage( 2 );
+				break;
+		}
+	}
+	
+	override void DisplayBadge( int key, int value )
+	{
+		TextWidget bleed_count = TextWidget.Cast( m_Badges.FindAnyWidget( "BleedingCount" ) );
+		
+		m_BadgesWidgetDisplay.Set( key, value );
+		m_AnyBadgeVisible = false;
+		for ( int i = 0; i < m_BadgesWidgetDisplay.Count(); i++ )
+		{
+			int badge_key = m_BadgesWidgetDisplay.GetKey( i );
+			int badge_value = m_BadgesWidgetDisplay.Get( badge_key );
+			string badge_name = m_BadgesWidgetNames.Get( badge_key );
+			
+			ImageWidget badge_widget
+			Class.CastTo(badge_widget,  m_Badges.FindAnyWidget( badge_name ) );
+			if ( badge_widget )
+			{
+				if ( badge_value > 0 )
+				{
+					if (m_BadgesSupportedLevels.Contains(badge_key))
+					{
+						int levelIndex = badge_value - 1;
+						int maxSupportedIndex = m_BadgesSupportedLevels.Get(badge_key) - 1;
+						if (maxSupportedIndex >= levelIndex)
+							badge_widget.SetImage(levelIndex);
+					}
+
+					badge_widget.Show( true );
+					m_AnyBadgeVisible = true;
+					if( badge_key == NTFKEY_BLEEDISH )
+					{
+						bleed_count.Show( true );
+						bleed_count.SetText( m_BadgesWidgetDisplay.Get( badge_key ).ToString() );
+					}
+				}
+				else
+				{
+					if( badge_key == NTFKEY_BLEEDISH )
+					{
+						bleed_count.Show( false );
+					}
+					badge_widget.Show( false );
+				}
+			}
+		}
+		
+		RefreshHudVisibility();
+	}
+	
+	override void SetTemperature( string temp )
+	{
+		m_IsTemperatureVisible = true;
+		TextWidget temp_top = TextWidget.Cast( m_Notifiers.FindAnyWidget( "TemperatureValueTop" ) );
+		TextWidget temp_bot = TextWidget.Cast( m_Notifiers.FindAnyWidget( "TemperatureValueBottom" ) );
+		temp_top.SetText( temp );
+		temp_bot.SetText( temp );
+		m_TemperatureTimer = 0;
+	}
+	
+	void HideTemperature()
+	{
+		m_IsTemperatureVisible = false;
+		TextWidget temp_top = TextWidget.Cast( m_Notifiers.FindAnyWidget( "TemperatureValueTop" ) );
+		TextWidget temp_bot = TextWidget.Cast( m_Notifiers.FindAnyWidget( "TemperatureValueBottom" ) );
+		temp_top.SetText( "" );
+		temp_bot.SetText( "" );
+		m_TemperatureTimer = 0;
+	}
+	
+	override void SetStaminaBarVisibility( bool show )
+	{
+		//m_StaminaBackground.Show( show );
+		//m_Stamina.Show( show );
+		if ( show )
+		{
+			m_Stamina.SetAlpha(1);
+			//m_Stamina.SetTextColor( ColorManager.COLOR_NORMAL_TEXT );
+		}
+		else
+		{
+			m_Stamina.SetAlpha(0.3);
+			//m_Stamina.SetTextColor( ColorManager.RED_COLOR );
+		}
+
+		m_IsStaminaVisible = show;
+		m_StaminaTimer = 0;
+	}
+	
+	// state 0 = empty
+	// state 1 = digesting
+	// state 2 = full
+	void SetStomachState( int state )
+	{
+		ImageWidget stomach = ImageWidget.Cast( m_Badges.FindAnyWidget( "Stomach" ) );
+		stomach.LoadImageFile( 0, "set:dayz_gui image:iconStomach" + state );
+	}
+
+	override void SetStamina( int value , int range )
+	{
+		float sx, sy;
+		float max = CfgGameplayHandler.GetStaminaMax();
+		float percentage = 1;
+		if (max != 0)
+		{
+			percentage =  range / max;
+		}
+		
+		if (range != 0)
+		{
+			m_Stamina.SetCurrent(( value / range ) * 100);
+		}
+		else
+		{
+			m_Stamina.SetCurrent(0);
+		}
+		
+		m_Stamina.GetSize(sx, sy);
+		m_Stamina.SetSize(percentage, sy);
+ 		m_StaminaBackground.SetSize(1 - percentage, sy);
+
+		// set health & blood values
+		if (!GetGame().IsMultiplayer())
+		{
+			if (GetGame().GetPlayer())
+			{
+				PlayerBase player;
+				Class.CastTo(player, GetGame().GetPlayer());
+
+				if (player)
+				{
+					float h1 = player.GetHealth("","");
+					float b1 = player.GetHealth("","Blood");
+
+					GetDayZGame().GetBacklit().SetHealth(h1);
+					GetDayZGame().GetBacklit().SetBlood(b1);
+				}
+			}
+		}
+		
+		// update backlit
+		GetDayZGame().GetBacklit().UpdatePlayer(false);		
+	}
+
+	bool KeyPress(int key)
+	{
+		return false;
+	}
+	
+	void ZeroingKeyPress()
+	{
+		m_ZeroingKeyPressed = true;
+	}
+	
+	override void DisplayStance( int stance )
+	{
+		PlayerBase player;
+		Class.CastTo(player,  GetGame().GetPlayer() );
+		Car car;
+		if ( !Class.CastTo(car, player.GetDrivingVehicle()) )
+		{
+			if( stance == 1 )
+			{
+				bool is_walking;
+				m_StanceStand.Show(!is_walking);
+				m_StanceStandWalk.Show(is_walking);
+				m_StanceCrouch.Show(false);
+				m_StanceProne.Show(false);
+				m_StanceCar.Show( false );
+			}
+			if( stance == 2 )
+			{
+				m_StanceStand.Show(false);
+				m_StanceStandWalk.Show(false);
+				m_StanceCrouch.Show(true);
+				m_StanceProne.Show(false);
+				m_StanceCar.Show( false );
+			}
+			if( stance == 3 )
+			{
+				m_StanceStand.Show(false);
+				m_StanceStandWalk.Show(false);
+				m_StanceCrouch.Show(false);
+				m_StanceProne.Show(true);
+				m_StanceCar.Show( false );
+			}
+		}
+		else
+		{
+			m_StanceStand.Show(false);
+			m_StanceCrouch.Show(false);
+			m_StanceProne.Show(false);
+			m_StanceCar.Show( true );
+		}
+	}
+	
+	override void DisplayPresence()
+	{
+		PlayerBase player;
+
+		if ( Class.CastTo(player, GetGame().GetPlayer()) )
+		{
+			int presence_level = player.GetNoisePresenceInAI();
+			m_PresenceLevel0.Show( false );
+			m_PresenceLevel1.Show( false );
+			m_PresenceLevel2.Show( false );
+			m_PresenceLevel3.Show( false );
+			m_PresenceLevel4.Show( false );
+
+			if ( presence_level > 0 )
+			{
+				m_PresenceLevel0.Show( true );
+			}
+			if ( presence_level > 1 )
+			{
+				m_PresenceLevel1.Show( true );
+			}
+			if ( presence_level > 2 )
+			{
+				m_PresenceLevel2.Show( true );
+			}
+			if ( presence_level > 3 )
+			{
+				m_PresenceLevel3.Show( true );
+			}
+			if ( presence_level > 4 )
+			{
+				m_PresenceLevel4.Show( true );
+			}
+		}
+	}
+	
+	int		m_VehicleGearCount = -1;
+	float	m_TimeSinceLastEngineLightChange;
+	bool	m_VehicleHasOil;
+	bool	m_VehicleHasCoolant;
+	
+	override void ShowVehicleInfo()
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player)
+		{
+			HumanCommandVehicle hcv = player.GetCommand_Vehicle();
+			if (hcv)
+			{
+				m_CurrentVehicle = CarScript.Cast(hcv.GetTransport());
+				if (m_CurrentVehicle)
+				{
+					m_InVehicleAsDriver	= true;					
+					m_VehicleGearCount 	= m_CurrentVehicle.GetGearsCount();
+					m_VehicleOilLight.Show(m_VehicleHasOil);
+
+					float rpm_value_red = m_CurrentVehicle.EngineGetRPMRedline() / m_CurrentVehicle.EngineGetRPMMax();
+					m_VehicleRPMDial.SetMaskProgress(rpm_value_red);
+					m_VehicleRPMRedline.SetMaskProgress(1 - rpm_value_red);
+
+					m_HudPanelWidget.FindAnyWidget("PlayerPanel").Show(false);
+					m_Presence.Show(false);
+					m_StancePanel.Show(false);
+
+					m_VehiclePanel.Show(true);
+				}
+			}
+		}
+	}
+	
+	override void HideVehicleInfo()
+	{
+		m_HudPanelWidget.FindAnyWidget("PlayerPanel").Show(true);
+		m_Presence.Show(true);
+		m_StancePanel.Show(true);
+		m_VehiclePanel.Show(false);
+		
+		m_InVehicleAsDriver	= false;
+		m_CurrentVehicle	= null;
+		m_VehicleGearCount	= -1;
+	}
+	
+	void RefreshVehicleHud(float timeslice)
+	{
+		if (m_CurrentVehicle && !GetGame().GetUIManager().GetMenu())
+		{
+			m_VehiclePanel.Show(true);
+			float rpm_value		= m_CurrentVehicle.EngineGetRPM() / m_CurrentVehicle.EngineGetRPMMax();
+			float rpm_value_red	= m_CurrentVehicle.EngineGetRPMRedline() / m_CurrentVehicle.EngineGetRPMMax();
+			float speed_value	= m_CurrentVehicle.GetSpeedometerAbsolute() / 200;
+			
+			m_VehicleRPMPointer.SetRotation(0, 0, rpm_value * 270 - 130, true);
+			m_VehicleSpeedPointer.SetRotation(0, 0, speed_value * 260 - 130, true);
+			m_VehicleSpeedValue.SetText(Math.AbsInt(m_CurrentVehicle.GetSpeedometer()).ToString());
+
+			int engineHealthLevel	= m_CurrentVehicle.GetHealthLevel("Engine");
+			int fuelTankHealthLevel	= m_CurrentVehicle.GetHealthLevel("FuelTank");
+			bool newHealth			= false;
+			
+			//! engine
+			if (m_CurrentVehicle.HasEngineZoneReceivedHit())
+			{
+				if (m_TimeSinceLastEngineLightChange > 0.35)
+				{
+					m_VehicleEngineLight.Show(!m_VehicleEngineLight.IsVisible());
+					if (engineHealthLevel <= GameConstants.STATE_WORN)
+					{
+						m_VehicleEngineLight.SetColor(Colors.WHITE);
+					}
+					else
+					{
+						m_VehicleEngineLight.SetColor(ItemManager.GetItemHealthColor(engineHealthLevel));
+					}
+					
+					m_VehicleEngineLight.SetAlpha(1);
+					m_TimeSinceLastEngineLightChange = 0;
+				}
+				
+				m_TimeSinceLastEngineLightChange += timeslice;
+				newHealth = true;
+			}
+			else if (engineHealthLevel > GameConstants.STATE_WORN)
+			{
+				m_VehicleEngineLight.SetColor(ItemManager.GetItemHealthColor(engineHealthLevel));
+				m_VehicleEngineLight.SetAlpha(1);
+				m_VehicleEngineLight.Show(true);
+			}
+			else
+			{
+				m_VehicleEngineLight.Show(false);
+			}
+			
+			//! fuel tank
+			if (fuelTankHealthLevel <= GameConstants.STATE_WORN)
+			{
+				m_VehicleFuelLight.SetColor(Colors.WHITE);
+				m_VehicleFuelLight.SetAlpha(1);
+				m_VehicleFuelLight.Show(true);	
+			}
+			else if (fuelTankHealthLevel > GameConstants.STATE_WORN)
+			{
+				m_VehicleFuelLight.SetColor(ItemManager.GetItemHealthColor(fuelTankHealthLevel));
+				m_VehicleFuelLight.SetAlpha(1);
+				m_VehicleFuelLight.Show(true);
+			}
+			
+			//! temperature
+			if (m_CurrentVehicle.IsVitalRadiator())
+			{
+				m_VehicleTemperatureIndicator.Show(true);
+				if (m_CurrentVehicle.HasRadiator())
+				{
+					int radiatorHealthLevel = m_CurrentVehicle.GetRadiator().GetHealthLevel("");
+					if (radiatorHealthLevel <= GameConstants.STATE_WORN)
+					{
+						m_VehicleTemperatureLight.SetColor(Colors.WHITE);
+						m_VehicleTemperatureLight.SetAlpha(1);
+						m_VehicleTemperatureLight.Show(true);	
+					}
+					else if (radiatorHealthLevel > GameConstants.STATE_WORN)
+					{
+						m_VehicleTemperatureLight.SetColor(ItemManager.GetItemHealthColor(radiatorHealthLevel));
+						m_VehicleTemperatureLight.SetAlpha(1);
+						m_VehicleTemperatureLight.Show(true);
+					}
+				}
+				else
+				{
+					m_VehicleTemperatureLight.SetColor(Colors.COLOR_RUINED);
+					m_VehicleTemperatureLight.SetAlpha(1);
+					m_VehicleTemperatureLight.Show(true);
+				}
+			}
+			else
+			{
+				m_VehicleTemperatureIndicator.Show(false);
+			}
+			
+			m_VehicleHandBrakeLight.Show(m_CurrentVehicle.IsHandbrakeActive());
+			m_VehicleWheelLight.Show(m_CurrentVehicle.WheelIsAnyLocked());
+
+			
+			int engagedGear	= -1;
+			int prevGear	= -1;
+			int nextGear	= -1;
+			
+			if (m_CurrentVehicle.GearboxGetType() == CarGearboxType.MANUAL)
+			{
+				engagedGear = m_CurrentVehicle.GetGear();
+				prevGear = engagedGear - 1;
+				nextGear = engagedGear + 1;
+
+				if (engagedGear == CarGear.NEUTRAL)
+				{
+					prevGear = CarGear.REVERSE;
+				}
+				else if (engagedGear == CarGear.REVERSE)
+				{
+					prevGear = -1;
+					nextGear = CarGear.NEUTRAL;
+				}
+
+				m_VehicleCurrentGearValue.SetText(m_VehicleGearTable.Get(engagedGear));
+				m_VehicleNextGearValue.Show(nextGear < m_VehicleGearCount);
+			
+				m_VehicleNextGearValue.SetText(m_VehicleGearTable.Get(nextGear));
+				m_VehiclePrevGearValue.SetText(m_VehicleGearTable.Get(prevGear));
+			}
+			else
+			{
+				engagedGear = m_CurrentVehicle.GearboxGetMode();
+				prevGear = engagedGear - 1;
+				nextGear = engagedGear + 1;
+				
+				m_VehicleCurrentGearValue.SetText(m_VehicleGearTableAuto.Get(engagedGear));
+				m_VehicleNextGearValue.Show(nextGear < EnumTools.GetEnumSize(CarAutomaticGearboxMode));
+			
+				m_VehicleNextGearValue.SetText(m_VehicleGearTableAuto.Get(nextGear));
+				m_VehiclePrevGearValue.SetText(m_VehicleGearTableAuto.Get(prevGear));
+			}
+			
+			// refresh backlit
+			GetDayZGame().GetBacklit().RefreshVehicleLayout(engagedGear, newHealth);
+			
+			m_VehicleFuelPointer.SetRotation( 0, 0, m_CurrentVehicle.GetFluidFraction( CarFluid.FUEL ) * 260 - 130, true );
+			m_VehicleTemperaturePointer.SetRotation( 0, 0, -1 * m_CurrentVehicle.GetFluidFraction( CarFluid.COOLANT ) * 260 + 130, true );
+
+			//! general hit timer reset			
+			if (m_VehicleDamageZonesHitTimer > 1)
+			{
+				m_VehicleDamageZoneHitEngineState = false;
+				m_VehicleDamageZonesHitTimer = 0;
+			}
+			
+			m_VehicleDamageZonesHitTimer += timeslice;
+		}
+		else
+		{
+			m_VehiclePanel.Show(false);
+		}
+	}
+	
+	void InitQuickbar()
+	{
+		if (m_Quickbar == NULL)
+		{
+			m_Quickbar = new InventoryQuickbar( m_QuickbarWidget );
+		}
+	}
+	
+	InventoryQuickbar GetQuickbar()
+	{
+		return m_Quickbar;
+	}
+	
+	bool IsQuickbarVisible()
+	{
+		return m_IsQuickbarVisible;
+	}
+	
+	bool IsHudVisible()
+	{
+		return m_IsHudVisible;
+	}
+	
+	override void UpdateQuickbarGlobalVisibility()
+	{
+		#ifdef PLATFORM_CONSOLE
+			ShowQuickBar(GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer());
+		#else
+			ShowQuickBar(g_Game.GetProfileOption(EDayZProfilesOptions.QUICKBAR));
+		#endif
+	}
+	
+	void RefreshQuickbarVisibility()
+	{
+		m_IsQuickbarVisible = !m_QuickbarHideUI && !m_QuickbarHidePlayer && m_QuickbarState;
+		m_QuickbarWidget.Show( m_IsQuickbarVisible );
+	}
+	
+	void RefreshHudVisibility()
+	{
+		m_IsHudVisible = ( !m_HudHidePlayer && !m_HudHideUI && m_HudState ) || m_HudInventory;
+		
+		SetLeftStatsVisibility( m_IsHudVisible );
+		m_Badges.Show( m_IsHudVisible );
+		m_Notifiers.Show( m_IsHudVisible );
+		m_BadgeNotifierDivider.Show( m_IsHudVisible && m_AnyBadgeVisible );
+		#ifdef PLATFORM_CONSOLE
+		m_SpecializatonPanel.Show(m_HudInventory);
+		#else
+		m_SpecializatonPanel.Show(false);
+		#endif
+	}
+	
+	void UpdateSpecialtyMeter(float x, float y)
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_SpecializationIcon.SetPos(x, y, true);
+		#endif
+	}
+	
+	bool IsHideQuickbarPlayer()
+	{
+		return m_QuickbarHidePlayer;
+	}
+	
+	bool IsHideHudPlayer()
+	{
+		return m_HudHidePlayer;
+	}
+	
+	override void ShowQuickbarUI( bool show )
+	{
+		m_QuickbarHideUI = !show;
+		RefreshQuickbarVisibility();
+	}
+	
+	override void ShowQuickbarPlayer( bool show )
+	{
+		m_QuickbarHidePlayer = !show;
+		RefreshQuickbarVisibility();
+	}
+	
+	override void ShowHudPlayer( bool show )
+	{
+		m_HudHidePlayer = !show;
+		if (m_HudState)
+		{
+			RefreshHudVisibility();
+		}
+	}
+	
+	override void ShowHudUI( bool show )
+	{
+		m_HudHideUI = !show;
+		if (m_HudState)
+		{
+			RefreshHudVisibility();
+		}
+	}
+	
+	override void ShowHudInventory( bool show )
+	{
+		m_HudInventory = show;
+		RefreshHudVisibility();
+	}
+
+	override void ToggleHeatBufferPlusSign( bool show )
+	{
+		m_HeatBufferPlus.Show( show );
+	}
+
+	//! global setting; is quickbar visibility allowed?
+	override void ShowQuickBar( bool show )
+	{
+		m_QuickbarState = show;
+		//shown by default
+		m_QuickbarHidePlayer = false;
+		RefreshQuickbarVisibility();
+	}
+	
+	override void ShowHud( bool show )
+	{
+		m_HudState = show;
+		m_HudHidePlayer = false;
+		RefreshHudVisibility();
+	}
+	
+	bool GetQuickBarState()
+	{
+		return m_QuickbarState;
+	}
+	
+	bool GetHudState()
+	{
+		return m_HudState;
+	}
+	
+	
+	
+	override void SetConnectivityStatIcon(EConnectivityStatType type, EConnectivityStatLevel level)
+	{
+		if (type == EConnectivityStatType.PING)
+		{
+			switch (level)
+			{
+				case EConnectivityStatLevel.OFF:
+					m_HighPingA.Show(false);
+					m_HighPingB.Show(false);
+					break;
+				case EConnectivityStatLevel.LEVEL1:
+					m_HighPingA.Show(true);
+					m_HighPingB.Show(false);
+					break;
+				case EConnectivityStatLevel.LEVEL2:
+					m_HighPingA.Show(false);
+					m_HighPingB.Show(true);
+					break;
+			}
+		}
+		else if (type == EConnectivityStatType.SERVER_PERF)
+		{
+			switch (level)
+			{
+				case EConnectivityStatLevel.OFF:
+					m_LowServerPerfA.Show(false);
+					m_LowServerPerfB.Show(false);
+					break;
+				case EConnectivityStatLevel.LEVEL1:
+					m_LowServerPerfA.Show(true);
+					m_LowServerPerfB.Show(false);
+					break;
+				case EConnectivityStatLevel.LEVEL2:
+					m_LowServerPerfA.Show(false);
+					m_LowServerPerfB.Show(true);
+					break;
+			}
+		}
+		else if (type == EConnectivityStatType.CONN_LOST)
+		{
+			switch (level)
+			{
+				case EConnectivityStatLevel.OFF:
+					m_ConnectionLost.Show(false);
+					break;
+				case EConnectivityStatLevel.LEVEL1:
+					m_ConnectionLost.Show(true);
+					break
+			}
+		}
+	}
+	
+	//! eg. stamina bar...
+	void SetLeftStatsVisibility(bool visible)
+	{
+		Widget child = m_LeftHudPanelWidget.GetChildren();
+		while (child)
+		{
+			if (child.GetName() == "ChatFrameWidget")
+			{
+				child = child.GetSibling();
+				continue
+			}
+			
+			child.Show(visible);
+			child = child.GetSibling();
+		}
+	}
+	
+	override void RefreshQuickbar( bool itemChanged = false )
+	{
+		if ((!m_QuickbarState || m_QuickbarHidePlayer || m_QuickbarHideUI) && !itemChanged) // Don't update when it is hidden or disabled
+			return;
+		
+		if ( itemChanged )
+		{
+			UIManager manager = GetGame().GetUIManager();
+		
+			InventoryMenu inventory = InventoryMenu.Cast(manager.FindMenu( MENU_INVENTORY ));
+			MissionGameplay mission = MissionGameplay.Cast(GetGame().GetMission());
+			
+			if ( mission )
+			{
+				inventory = mission.GetInventory();
+			}
+			
+			if ( inventory )
+			{
+				inventory.RefreshQuickbar();
+			}
+		}
+		
+		if ( m_Quickbar ) 
+		{
+			m_Quickbar.UpdateItems( m_QuickbarWidget );
+		}
+	}
+	
+	Widget GetHudPanelWidget()
+	{
+		return m_HudPanelWidget;
+	}
+	
+	override void UpdateBloodName()
+	{
+		PlayerBase player;
+		Class.CastTo(player, GetGame().GetPlayer() );
+		
+		if( player )
+		{
+			string blood_name;
+			bool positive;
+			BloodTypes.GetBloodTypeName( player.GetBloodType(), blood_name, positive );
+			bool blood_type_visible = player.HasBloodTypeVisible();
+			
+			if( blood_type_visible )
+			{
+				m_BloodType.SetText( blood_name );
+				if( positive )
+					m_BloodPosType.SetText( "+" );
+				else
+					m_BloodPosType.SetText( "-" );
+			}
+			else
+			{
+				m_BloodType.SetText( "" );
+				m_BloodPosType.SetText( "" );
+			}
+		}
+	}
+	
+	void RefreshPlayerTags()
+	{
+		if( GetGame().GetPlayer() )
+		{
+			bool found = false;
+			vector head_pos = GetGame().GetCurrentCameraPosition();
+			float distance;
+			foreach( Man player : ClientData.m_PlayerBaseList )
+			{
+				vector target_player = player.GetPosition();
+				distance = vector.Distance( head_pos, target_player );
+				
+				target_player[1] = target_player[1] + 1.2;
+				
+				if( distance <= 15 && player != GetGame().GetPlayer() )
+				{
+					vector screen_pos = GetGame().GetScreenPosRelative( target_player );
+					vector end_pos = head_pos + GetGame().GetCurrentCameraDirection() * 25;
+					RaycastRVParams params = new RaycastRVParams( head_pos, end_pos, GetGame().GetPlayer(), 0 );
+					params.sorted = true;
+					
+					array<ref RaycastRVResult> results = new array<ref RaycastRVResult>;
+					DayZPhysics.RaycastRVProxy( params, results );
+					if( results.Count() > 0 )
+					{
+						if( results.Get( 0 ).obj == player )
+						{
+							m_CurrentTaggedPlayer = PlayerBase.Cast( player );
+							found = true;
+						}
+					}
+				}
+			}
+			if( !found )
+			{
+				m_CurrentTaggedPlayer = null;
+			}
+		}
+	}
+	
+	int			m_PlayerSpineIndex;
+	PlayerBase	m_CurrentTaggedPlayer;
+	Widget		m_PlayerTag;
+	TextWidget	m_PlayerTagText;
+	
+	void ShowPlayerTag( float timeslice )
+	{
+		if ( m_CurrentTaggedPlayer && m_CurrentTaggedPlayer.GetIdentity() )
+		{
+			if ( !m_PlayerTag )
+			{
+				m_PlayerTag = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/hud/hud_player_tag.layout");
+				m_PlayerTagText = TextWidget.Cast( m_PlayerTag.FindAnyWidget( "TagText" ) );
+			}
+			m_PlayerSpineIndex = m_CurrentTaggedPlayer.GetBoneIndex( "Spine2" );
+			vector player_pos = m_CurrentTaggedPlayer.GetBonePositionWS( m_PlayerSpineIndex );
+			vector screen_pos = GetGame().GetScreenPosRelative( player_pos );
+			
+			if ( screen_pos[2] > 0 )
+			{
+				if ( screen_pos[0] > 0 && screen_pos[0] < 1 )
+				{
+					if ( screen_pos[1] > 0 && screen_pos[1] < 1 )
+					{
+						m_PlayerTagText.SetAlpha( Math.Clamp( m_PlayerTagText.GetAlpha() + timeslice * 10, 0, 1 ) );
+						m_PlayerTag.SetPos( 0.55, 0.55 );
+						m_PlayerTagText.SetText( m_CurrentTaggedPlayer.GetIdentity().GetPlainName() );
+						
+						//m_PlayerTagText.SetSize( 1, 1 - screen_pos[2] / 25  );
+						return;
+					}
+				}
+			}
+		}
+		
+		if ( m_PlayerTag )
+		{
+			float new_alpha = Math.Clamp( m_PlayerTagText.GetAlpha() - timeslice * 10, 0, 1 );
+			m_PlayerTagText.SetAlpha( Math.Clamp( m_PlayerTagText.GetAlpha() - timeslice * 10, 0, 1 ) );
+			if ( new_alpha == 0 )
+			{
+				m_PlayerTagText.SetText( "" );
+				m_CurrentTaggedPlayer = null;
+			}
+		}
+	}
+	
+	override void Update( float timeslice )
+	{
+		super.Update( timeslice );
+
+		m_ActionTargetsCursor.Update();
+		DisplayPresence();
+		//
+		//modifiers - tendency status (critical)
+		if ( m_BlinkTime > TENDENCY_BLINK_TIME )
+		{
+			//get color & alpha
+			if ( m_TendencyStatusCritical.Count() > 0 )
+			{
+				for ( int i = 0; i < m_TendencyStatusCritical.Count(); ++i )
+				{
+					
+					ImageWidget widget = m_TendencyStatusCritical.GetKey( i );
+					int alpha = widget.GetAlpha() * 255;
+					int color;
+					int colorA = ARGB( alpha, 255, 255, 255 );
+					int colorB = m_TendencyStatusCritical.Get( widget );
+					
+					//set new color to different color
+					if ( widget.GetColor() == colorA )
+					{
+						color = colorB;
+					}
+					else
+					{
+						color = colorA;
+					}
+
+					widget.SetColor( color );
+				}
+			}
+			
+			m_BlinkTime = 0;	//reset
+		}
+		else
+		{
+			m_BlinkTime += timeslice;
+		}
+		
+		if( m_IsTemperatureVisible )
+		{
+			m_TemperatureTimer += timeslice;
+			if( m_TemperatureTimer > m_TemperatureShowTime )
+			{
+				HideTemperature();
+			}
+		}
+		
+		if ( !m_IsStaminaVisible )
+		{
+			m_StaminaTimer += timeslice;
+			if ( m_StaminaTimer > m_StaminaShowTime )
+			{
+				SetStaminaBarVisibility( true );
+			}
+			
+		}
+		
+		if ( m_HitDirEffectArray && m_HitDirEffectArray.Count() > 0 )
+		{
+			UpdateHitDirEffects(timeslice);
+			CleanupHitDirEffects();
+		}
+		
+		RefreshVehicleHud(timeslice);
+		
+		#ifdef PLATFORM_PS4
+		RefreshPlayerTags();
+		ShowPlayerTag(timeslice);
+		#endif
+	}
+	
+	override void SpawnHitDirEffect(DayZPlayer player, float hit_direction,float intensity_max)
+	{
+		if (HitDirectionEffectBase.m_Mode == HitDirectionModes.DISABLED)
+		{
+			return;
+		}
+		
+		if (m_HitDirEffectArray == null)
+		{
+			m_HitDirEffectArray = new array<ref HitDirectionEffectBase>;
+		}
+		HitDirectionEffectBase hiteff = HitDirectionEffectBase.Cast(HitDirectionEffectBase.GetCurrentType().Spawn());
+		hiteff.Init(player,hit_direction,intensity_max);
+		m_HitDirEffectArray.Insert(hiteff);
+	}
+	
+	void UpdateHitDirEffects( float timeslice )
+	{
+		for (int i = 0; i < m_HitDirEffectArray.Count(); i++)
+		{
+			m_HitDirEffectArray[i].Update(timeslice);
+		}
+	}
+	
+	void CleanupHitDirEffects()
+	{
+		for (int i = m_HitDirEffectArray.Count() - 1; i > -1; i--)
+		{
+			if ( m_HitDirEffectArray[i].DurationCheck() )
+			{
+				m_HitDirEffectArray.Remove(i);
+			}
+		}
+	}
+	
+	void Debug()
+	{
+		foreach (int val:m_BadgesWidgetDisplay)
+		{
+			int key = m_BadgesWidgetDisplay.GetKeyByValue(val);
+			Print(EnumTools.EnumToString(eDisplayElements, key));
+			Print(val);
+			Print("---------------------");
+		}
+	}
+	
+//------------------------------------------
+//ye olde unused methods
+	
+	//DEPRECATED
+	void HideQuickbarTimer()
+	{
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/IngameMenu_Xbox/PlayerListEntryScriptedWidget.c b/scripts/5_Mission/DayZ/GUI/IngameMenu_Xbox/PlayerListEntryScriptedWidget.c
new file mode 100644
index 0000000000000000000000000000000000000000..8a6177f3a5f835b3a7c1e5502c62381c7d57d846
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/IngameMenu_Xbox/PlayerListEntryScriptedWidget.c
@@ -0,0 +1,222 @@
+class PlayerListEntryScriptedWidget extends ScriptedWidgetEventHandler
+{
+	protected string					m_Name;
+	protected string					m_UID;
+	protected bool						m_Mute;
+	protected bool						m_GlobalMute;
+	
+	protected Widget					m_Root;
+	protected TextWidget				m_PlayerName;
+	protected ImageWidget				m_PlayerAvatar;
+	protected ImageWidget				m_MicrophoneIcon;
+	protected ImageWidget				m_MuteIcon;
+	protected ButtonWidget				m_PlayerButton;
+	
+	protected PlayerListScriptedWidget	m_Tab;
+	protected bool						m_Selected;
+	
+	void PlayerListEntryScriptedWidget( Widget parent, string name, string uid, bool show_permissions, PlayerListScriptedWidget tab )
+	{
+		m_Name				= name;
+		m_UID				= uid;
+		m_Tab				= tab;
+		
+		m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/xbox/ingamemenu_xbox/player_info_entry.layout", parent );
+		m_PlayerName		= TextWidget.Cast( m_Root.FindAnyWidget( "Name" ) );
+		m_PlayerAvatar		= ImageWidget.Cast( m_Root.FindAnyWidget( "Avatar" ) );
+		m_MicrophoneIcon	= ImageWidget.Cast( m_Root.FindAnyWidget( "Microphone" ) );
+		m_MuteIcon			= ImageWidget.Cast( m_Root.FindAnyWidget( "Muted" ) );
+		m_PlayerButton		= ButtonWidget.Cast( m_Root.FindAnyWidget( "Button" ) );
+		
+		m_MicrophoneIcon.Show( show_permissions && !IsLocalPlayer() );
+		
+		m_PlayerName.SetText( name );
+		m_Root.SetHandler( this );
+	}
+	
+	void ~PlayerListEntryScriptedWidget()
+	{
+		delete m_Root;
+	}
+	
+	Widget GetButtonWidget()
+	{
+		return m_PlayerButton;
+	}
+	
+	void LoadPermissions( BiosPrivacyPermissionResultArray results )
+	{
+		foreach ( BiosPrivacyPermissionResult result : results )
+		{
+			if ( result.m_Permission == EBiosPrivacyPermission.COMMUNICATE_VOICE )
+			{
+				m_GlobalMute = !result.m_IsAllowed;
+				if ( result.m_IsAllowed && !m_Mute )
+				{
+					m_MuteIcon.Show( false );
+				}
+				else if ( !result.m_IsAllowed || m_Mute )
+				{
+					m_MuteIcon.Show( true );
+				}
+			}
+		}
+	}
+	
+	string GetUID()
+	{
+		return m_UID;
+	}
+	
+	bool IsMuted()
+	{
+		return m_Mute;
+	}
+	
+	bool IsGloballyMuted()
+	{
+		return m_GlobalMute;
+	}
+	
+	void SetMute( bool mute )
+	{
+		m_Mute = mute;
+		m_MuteIcon.Show( mute );
+	}
+	
+	void ToggleMute()
+	{
+		if( !IsLocalPlayer() && !GetGame().GetWorld().IsDisabledReceivingVoN() )
+		{
+			m_Mute = !m_Mute;
+			if ( ScriptInputUserData.CanStoreInputUserData() && !m_GlobalMute )
+			{
+				OnlineServices.MutePlayer( m_UID, m_Mute );
+				m_MuteIcon.Show( m_Mute );
+			}
+			else
+			{
+				m_MuteIcon.Show( true );
+			}
+		}
+		else
+		{
+			m_MicrophoneIcon.Show( false );
+			m_MuteIcon.Show( false );
+		}
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if( !m_Selected )
+		{
+			#ifdef PLATFORM_CONSOLE
+			if( w == m_PlayerButton )
+			{
+				Select();
+				SetFocus( m_PlayerButton );
+			}
+			#endif
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		#ifdef PLATFORM_CONSOLE
+		if( w == m_PlayerButton )
+		{
+			Deselect();
+			return true;
+		}
+		#endif
+		return false;
+	}
+	
+	void Focus()
+	{
+		OnFocus( m_Root, 0, 0 );
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if( !m_Selected )
+		{
+			#ifdef PLATFORM_CONSOLE
+			if( w == m_PlayerButton )
+			{
+				Select();
+			}
+			#endif
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		#ifdef PLATFORM_CONSOLE
+		if( w == m_PlayerButton )
+		{
+			Deselect();
+		}
+		#endif
+		return false;
+	}
+	
+	override bool OnDoubleClick( Widget w, int x, int y, int button )
+	{
+		if( button == MouseState.LEFT && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() )
+		{
+			if( !IsLocalPlayer() )
+			{
+				OnlineServices.ShowUserProfile( m_UID );
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if( button == MouseState.LEFT && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() )
+		{
+			if( w == m_MicrophoneIcon && !m_GlobalMute )
+			{
+				ToggleMute();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	bool IsLocalPlayer()
+	{
+		string local_uid;
+		if( GetGame().GetUserManager() )
+		{
+			return GetGame().GetUserManager().GetSelectedUser().GetUid() == m_UID;
+		}
+		return false;
+	}
+	
+	void Select( bool notify = true )
+	{
+		if( !m_Selected )
+		{
+			if( notify )
+			{
+				m_Tab.SelectPlayer( this );
+			}
+			m_Selected = true;
+		}
+	}
+	
+	void Deselect()
+	{
+		if( m_Selected )
+		{
+			m_Selected = false;
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/IngameMenu_Xbox/PlayerListScriptedWidget.c b/scripts/5_Mission/DayZ/GUI/IngameMenu_Xbox/PlayerListScriptedWidget.c
new file mode 100644
index 0000000000000000000000000000000000000000..d1dd6c232cdb1e0ff498a1fadefc03b6e24b14bc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/IngameMenu_Xbox/PlayerListScriptedWidget.c
@@ -0,0 +1,305 @@
+class PlayerListScriptedWidget extends ScriptedWidgetEventHandler
+{
+	protected Widget												m_Root;
+	protected ScrollWidget											m_ScrollContainer;
+	protected Widget												m_Content;
+	protected ref map<string, ref PlayerListEntryScriptedWidget>	m_Entries;
+	
+	protected int													m_TotalEntries;
+	protected PlayerListEntryScriptedWidget							m_SelectedEntry;
+	
+	void PlayerListScriptedWidget( Widget parent, string header_text = "" )
+	{
+		m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/xbox/ingamemenu_xbox/players_info_panel.layout", parent );
+		m_ScrollContainer	= ScrollWidget.Cast( m_Root.FindAnyWidget( "ScrollFrame" ) );
+		m_Content			= m_Root.FindAnyWidget( "Content" );
+		
+		m_Entries			= new map<string, ref PlayerListEntryScriptedWidget>;
+
+		m_ScrollContainer.VScrollToPos01( 0 );
+	}
+	
+	void ~PlayerListScriptedWidget()
+	{
+		delete m_Root;
+	}
+	
+	void FocusFirst()
+	{
+		if ( m_Content && m_Content.GetChildren() )
+			SetFocus( m_Content.GetChildren().FindAnyWidget( "Button" ) );
+		m_ScrollContainer.VScrollToPos01( 0 );
+	}
+	
+	void Reload( SyncPlayerList player_list )
+	{
+		if ( player_list && player_list.m_PlayerList && m_Entries )
+		{
+			foreach ( string UID, PlayerListEntryScriptedWidget widget : m_Entries )
+			{
+				SyncPlayer player_found;
+				foreach ( SyncPlayer player : player_list.m_PlayerList )
+				{
+					if ( player && player.m_UID == UID )
+					{
+						player_found = player;
+						break;
+					}
+				}
+				if ( !player_found )
+				{
+					RemovePlayer( UID );
+				}
+			}
+			
+			for ( int i = 0; i < player_list.m_PlayerList.Count(); i++ )
+			{
+				SyncPlayer player2 = player_list.m_PlayerList.Get( i );
+				PlayerListEntryScriptedWidget player_widget;
+				m_Entries.Find( player2.m_UID, player_widget );
+				if ( !player_widget )
+				{
+					AddPlayer( player2.m_PlayerName, player2.m_UID, true );
+				}
+			}
+		}
+	}
+	
+	bool IsEmpty()
+	{
+		return ( m_Entries.Count() == 0 );
+	}
+	
+	void OnLoadServersAsync( ref GetServersResult result_list, EBiosError error, string response )
+	{
+
+	}
+	
+	void Reload( BiosFriendInfoArray player_list )
+	{
+		if ( player_list && m_Entries )
+		{
+			foreach ( string UID, PlayerListEntryScriptedWidget widget : m_Entries )
+			{
+				BiosFriendInfo player_found;
+				int j = 0;
+				while ( !player_found && j < player_list.Count() )
+				{
+					if ( player_list[j].m_Uid == UID )
+						player_found = player_list[j];
+					j++;
+				}
+				
+				if ( !player_found )
+				{
+					RemovePlayer( UID );
+				}
+			}
+			
+			for ( int i = 0; i < player_list.Count(); i++ )
+			{
+				BiosFriendInfo player2 = player_list.Get( i );
+				PlayerListEntryScriptedWidget player_widget;
+				m_Entries.Find( player2.m_Uid, player_widget );
+				if ( !player_widget )
+				{
+					AddPlayer( player2.m_DisplayName, player2.m_Uid, false );
+				}
+			}
+		}
+	}
+	
+	void Reload( BiosPrivacyUidResultArray player_list )
+	{
+		foreach ( BiosPrivacyUidResult result : player_list )
+		{
+			PlayerListEntryScriptedWidget player_widget;
+			m_Entries.Find( result.m_Uid, player_widget );
+			if ( player_widget )
+			{
+				player_widget.LoadPermissions( result.m_Results );
+			}
+		}
+	}
+	
+	void ReloadLocal( map<string, bool> player_list )
+	{
+		if ( player_list )
+		{
+			for ( int i = 0; i < player_list.Count(); i++ )
+			{
+				string uid = player_list.GetKey( i );
+				bool muted = OnlineServices.IsPlayerMuted( uid );
+				PlayerListEntryScriptedWidget player_widget;
+				m_Entries.Find( uid, player_widget );
+				if ( player_widget )
+				{
+					player_widget.SetMute( muted );
+				}
+			}
+		}
+	}
+	
+	PlayerListEntryScriptedWidget FindEntryByWidget( Widget button )
+	{
+		if ( button && m_Entries )
+		{
+			foreach ( string UID, PlayerListEntryScriptedWidget widget : m_Entries )
+			{
+				if ( widget && widget.GetButtonWidget() == button )
+				{
+					return widget;
+				}
+			}
+		}
+		
+		return null;
+	}
+	
+	string FindPlayerByWidget( Widget button )
+	{
+		if ( button && m_Entries )
+		{
+			foreach ( string UID, PlayerListEntryScriptedWidget widget : m_Entries )
+			{
+				if ( widget && widget.GetButtonWidget() == button )
+				{
+					return UID;
+				}
+			}
+		}
+		
+		return "";
+	}
+	
+	void AddPlayer( string name, string UID, bool show_permissions )
+	{
+		if ( m_Entries )
+		{
+			m_Entries.Insert( UID, new PlayerListEntryScriptedWidget( m_Content, name, UID, show_permissions, this ) );
+			m_TotalEntries++;
+		}
+	}
+	
+	void RemovePlayer( string UID )
+	{
+		if ( m_Entries )
+		{
+			PlayerListEntryScriptedWidget next_entry;
+			
+			if ( m_Entries.Get( UID ) == m_SelectedEntry )
+			{
+				for ( int i = 0; i < m_Entries.Count() - 1; i++ )
+				{
+					if ( m_Entries.GetElement( i ) == m_Entries.Get( UID ) )
+					{
+						next_entry = m_Entries.GetElement( i + 1 );
+					}
+				}
+			}
+			
+			m_Entries.Remove( UID );
+			m_TotalEntries--;
+			SelectPlayer( next_entry );
+			m_Content.Update();
+		}
+	}
+	
+	bool IsMuted( string UID )
+	{
+		if ( m_Entries && m_Entries.Get( UID ) )
+		{
+			return m_Entries.Get( UID ).IsMuted();
+		}
+		return false;
+	}
+	
+	bool IsGloballyMuted( string UID )
+	{
+		if ( m_Entries && m_Entries.Get( UID ) )
+		{
+			return m_Entries.Get( UID ).IsGloballyMuted();
+		}
+		return false;
+	}
+	
+	void SetMute( string UID, bool mute )
+	{
+		if ( m_Entries && m_Entries.Get( UID ) )
+		{
+			m_Entries.Get( UID ).SetMute( mute );
+		}
+	}
+	
+	void ToggleMute( string UID )
+	{
+		if ( m_Entries && m_Entries.Get( UID ) )
+		{
+			m_Entries.Get( UID ).ToggleMute();
+		}
+	}
+	
+	PlayerListEntryScriptedWidget GetSelectedPlayer()
+	{
+		return m_SelectedEntry;
+	}
+	
+	void SelectPlayer( PlayerListEntryScriptedWidget entry )
+	{
+		if ( m_SelectedEntry )
+			m_SelectedEntry.Deselect();
+		m_SelectedEntry = entry;
+		if ( GetGame().GetUIManager().GetMenu() )
+			GetGame().GetUIManager().GetMenu().Refresh();
+		ScrollToEntry( entry );
+	}
+	
+	void ScrollToEntry( PlayerListEntryScriptedWidget entry )
+	{
+		if ( entry )
+		{
+			float x, y;
+			float x_s, y_s;
+			float x_l, y_l;
+			
+			Widget root			= entry.GetButtonWidget().GetParent();
+			Widget first_child	= root.GetParent().GetChildren();
+			Widget last_child	= first_child;
+			while ( last_child )
+			{
+				if ( last_child.GetSibling() )
+					last_child = last_child.GetSibling();
+				else
+					break;
+			}
+			
+			root.GetParent().Update();
+			root.Update();
+			
+			m_ScrollContainer.GetScreenPos( x, y );
+			m_ScrollContainer.GetScreenSize( x_s, y_s );
+			
+			float bottom_pos = y + y_s;
+			
+			root.GetScreenPos( x_l, y_l );
+			root.GetScreenSize( x_s, y_s );
+			
+			if ( root == first_child )
+			{
+				m_ScrollContainer.VScrollToPos01( 0 );
+			}
+			else if ( root == last_child )
+			{
+				m_ScrollContainer.VScrollToPos01( 1 );
+			}
+			else if ( y_l + y_s >= bottom_pos )
+			{
+				m_ScrollContainer.VScrollToPos( m_ScrollContainer.GetVScrollPos() + y_s );
+			}
+			else if ( y_l <= y )
+			{
+				m_ScrollContainer.VScrollToPos( m_ScrollContainer.GetVScrollPos() - y_s );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InputDeviceDisconnectWarningMenu.c b/scripts/5_Mission/DayZ/GUI/InputDeviceDisconnectWarningMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..362a9775ecf91b4d7605503519273e5cf3393b56
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InputDeviceDisconnectWarningMenu.c
@@ -0,0 +1,161 @@
+class InputDeviceDisconnectWarningMenu extends UIScriptedMenu
+{
+	private ref array<int> m_DisconnectedDevices;
+	private ref array<int> m_DeviceOrder = {EUAINPUT_DEVICE_CONTROLLER,EUAINPUT_DEVICE_MOUSE,EUAINPUT_DEVICE_KEYBOARD};
+	private ref map<int,string> m_DeviceMessages;
+	private bool m_CanClose;
+	private bool m_Initialized;
+	private string m_DevicesText;
+	private string m_CaptionText;
+	private string m_ConfirmationText;
+	
+	private WrapSpacerWidget 	m_WrapperWidget;
+	private TextWidget 			m_CaptionWidget;
+	private RichTextWidget 		m_DeviceListWidget;
+	private RichTextWidget 		m_ActionTextWidget;
+	
+	void InputDeviceDisconnectWarningMenu()
+	{
+		g_Game.GetMission().AddActiveInputExcludes({"gamepaddisconnect"});
+		
+		m_DisconnectedDevices = new array<int>;
+		m_CanClose = false;
+		
+		BuildMessages();
+	}
+	
+	void ~InputDeviceDisconnectWarningMenu()
+	{
+		if (g_Game)
+		{
+			PPERequesterBank.GetRequester(PPERequester_ControllerDisconnectBlur).Stop();
+			g_Game.DeleteTitleScreen(); // Removes any outstanding gamepad identification propmt; the gamepad is already recognized by now
+			if (g_Game.GetMission())
+				g_Game.GetMission().RemoveActiveInputExcludes({"gamepaddisconnect"},true);
+		}
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot = g_Game.GetWorkspace().CreateWidgets("gui/layouts/new_ui/notifications/day_z_input_device_warning.layout");
+		m_WrapperWidget = WrapSpacerWidget.Cast(layoutRoot.FindAnyWidget("Wrapper"));
+		m_CaptionWidget = TextWidget.Cast(layoutRoot.FindAnyWidget("Caption"));
+		m_DeviceListWidget = RichTextWidget.Cast(layoutRoot.FindAnyWidget("DeviceList"));
+		m_ActionTextWidget = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ActionText"));
+		
+		g_Game.GetMission().GetOnInputDeviceConnected().Insert(UpdateDisconnectedDevices);
+		g_Game.GetMission().GetOnInputDeviceDisconnected().Insert(UpdateDisconnectedDevices);
+		
+		UpdateDisconnectedDevices();
+		if (g_Game.GetUIManager() && g_Game.GetUIManager().IsDialogVisible())
+		{
+			g_Game.GetUIManager().CloseDialog();
+		}
+		
+		PPERequesterBank.GetRequester(PPERequester_ControllerDisconnectBlur).Start();
+		
+		return layoutRoot;
+	}
+	
+	private void BuildMessages()
+	{
+		m_DeviceMessages = new map<int,string>;
+		m_DeviceMessages.Insert(EUAINPUT_DEVICE_CONTROLLER,string.Format("<image set=\"dayz_gui\" name=\"icon_Gamepad\" />"));
+		m_DeviceMessages.Insert(EUAINPUT_DEVICE_MOUSE,string.Format("<image set=\"dayz_gui\" name=\"icon_Mouse\" />"));
+		m_DeviceMessages.Insert(EUAINPUT_DEVICE_KEYBOARD,string.Format("<image set=\"dayz_gui\" name=\"icon_Keyboard\" />"));
+	}
+	
+	//! Composes message depending on context
+	private void UpdateDisconnectTexts()
+	{
+		int deviceCount = m_DisconnectedDevices.Count();
+		int count = m_DeviceOrder.Count();
+		int idx;
+		int device;
+		bool gamepadInactive = false;
+		
+		m_DevicesText = string.Empty;
+		for (int i = 0; i < count; i++)
+		{
+			device = m_DeviceOrder[i];
+			idx = m_DisconnectedDevices.Find(device);
+			if (idx != -1) //is disconnected and relevant
+			{
+				m_DevicesText += m_DeviceMessages.Get(device) + " ";
+				if (device == EUAINPUT_DEVICE_CONTROLLER)
+				{
+					gamepadInactive = true;
+					if (deviceCount > 1)
+					{
+						m_DevicesText += "| ";
+					}
+				}
+			}
+		}
+		
+		if (deviceCount > 1)
+		{
+			m_CaptionText = "#str_inputdevice_notification_header_multiple";
+			m_ConfirmationText = "#str_inputdevice_notification_prompt_multiple";
+		}
+		else
+		{
+			m_CaptionText = "#str_inputdevice_notification_header_single";
+			m_ConfirmationText = "#str_inputdevice_notification_prompt_single";
+		}
+	}
+	
+	private void SetDisconnectTexts()
+	{
+		m_CaptionWidget.SetText(m_CaptionText);
+		m_DeviceListWidget.SetText(m_DevicesText);
+		m_ActionTextWidget.SetText(m_ConfirmationText);
+		
+		m_WrapperWidget.Update();
+	}
+	
+	private void UpdateDisconnectedDevices(int device = -1)
+	{
+		m_DisconnectedDevices.Clear();
+		m_CanClose = g_Game.GetInput().AreAllAllowedInputDevicesActive(m_DisconnectedDevices);
+		UpdateWarningMenu(device);
+		m_Initialized = true;
+	}
+	
+	private void UpdateWarningMenu(int device)
+	{
+		if (m_CanClose)
+		{
+			Close();
+		}
+		else if (layoutRoot)
+		{
+			UpdateDisconnectTexts();
+			SetDisconnectTexts();
+		}
+	}
+	
+	//back-up close handling
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		bool ret = super.OnMouseButtonUp(w,x,y,button);
+		
+		if (m_CanClose)
+		{
+			Close();
+		}
+		return ret | m_CanClose;
+	}
+	
+	//back-up close handling
+	override bool OnKeyUp(Widget w, int x, int y, int key)
+	{
+		bool ret = super.OnKeyUp(w,x,y,key);
+		
+		if (m_CanClose)
+		{
+			Close();
+		}
+		return ret | m_CanClose;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InspectMenuNew.c b/scripts/5_Mission/DayZ/GUI/InspectMenuNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..5053727f5986e80794b429845a682f96ca6e8fcb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InspectMenuNew.c
@@ -0,0 +1,616 @@
+//--------------------------------------------------------------------------
+class InspectMenuNew extends UIScriptedMenu
+{
+	private ItemPreviewWidget m_item_widget;
+	private ItemPreviewWidget m_slot_widget;
+	private int m_characterRotationX;
+	private int m_characterRotationY;
+	private int m_characterScaleDelta;
+	private vector m_characterOrientation;
+
+	
+	void InspectMenuNew()
+	{
+		
+	}
+	
+	//--------------------------------------------------------------------------
+	void ~InspectMenuNew()
+	{
+		GetGame().GetDragQueue().RemoveCalls(this);
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetHud().ShowHudUI( true );
+			GetGame().GetMission().GetHud().ShowQuickbarUI( true );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory_new/day_z_inventory_new_inspect.layout");
+		
+		
+		return layoutRoot;
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		switch (w.GetUserID())
+		{
+			case IDC_CANCEL:
+				Close();
+				return true;
+		}
+	
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	void SetItem(EntityAI item)
+	{
+		if (item)
+		{
+			InspectMenuNew.UpdateItemInfo(layoutRoot, item);
+	
+			if (!m_item_widget)
+			{
+				Widget preview_frame = layoutRoot.FindAnyWidget("ItemFrameWidget");
+				if (preview_frame)
+				{
+					m_item_widget = ItemPreviewWidget.Cast( preview_frame );
+				}
+			}
+			
+			m_item_widget.SetItem(item);
+			m_item_widget.SetView( item.GetViewIndex() );
+			m_item_widget.SetModelPosition(Vector(0,0,1));
+			PPERequesterBank.GetRequester(PPERequester_InventoryBlur).Start();
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		super.OnMouseButtonDown(w, x, y, button);
+		
+		if (w == m_item_widget)
+		{
+			GetGame().GetDragQueue().Call(this, "UpdateRotation");
+			GetMousePos(m_characterRotationX, m_characterRotationY);
+			return true;
+		}
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	void UpdateRotation(int mouse_x, int mouse_y, bool is_dragging)
+	{
+		vector o = m_characterOrientation;
+		o[0] = o[0] + (m_characterRotationY - mouse_y);
+		o[1] = o[1] - (m_characterRotationX - mouse_x);
+		
+		m_item_widget.SetModelOrientation( o );
+		
+		if (!is_dragging)
+		{
+			m_characterOrientation = o;
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	override bool OnMouseWheel(Widget  w, int  x, int  y, int wheel)
+	{
+		super.OnMouseWheel(w, x, y, wheel);
+		
+		if ( w == m_item_widget )
+		{
+			m_characterScaleDelta = wheel;
+			UpdateScale();
+		}
+		return false;
+	}
+	
+	//--------------------------------------------------------------------------
+	void UpdateScale()
+	{
+		float w, h, x, y;		
+		m_item_widget.GetPos(x, y);
+		m_item_widget.GetSize(w,h);
+		w = w + ( m_characterScaleDelta / 4);
+		h = h + ( m_characterScaleDelta / 4 );
+		if ( w > 0.5 && w < 3 )
+		{
+			m_item_widget.SetSize( w, h );
+	
+			// align to center 
+			int screen_w, screen_h;
+			GetScreenSize(screen_w, screen_h);
+			float new_x = x - ( m_characterScaleDelta / 8 );
+			float new_y = y - ( m_characterScaleDelta / 8 );
+			m_item_widget.SetPos( new_x, new_y );
+		}
+	}
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfo(Widget root_widget, EntityAI item)
+	{
+		if (!root_widget || !item) return;
+	
+		Widget panelInfo = root_widget.FindAnyWidget("InventoryInfoPanelWidget");
+		if ( panelInfo )
+		{
+			if ( item.IsInherited( ZombieBase ) || item.IsInherited( Car ) )
+			{
+				panelInfo.Show( false );
+			}
+			else
+			{
+				panelInfo.Show( true );
+			}
+		}
+	
+		if ( !item.IsInherited( ZombieBase ) && !item.IsInherited( Car ) )
+		{
+			InventoryItem iItem = InventoryItem.Cast( item );
+			WidgetTrySetText(root_widget, "ItemDescWidget", iItem.GetTooltip());
+		}
+	
+		WidgetTrySetText(root_widget, "ItemNameWidget", item.GetDisplayName());
+		InspectMenuNew.UpdateItemInfoDamage(root_widget, item);
+		InspectMenuNew.UpdateItemInfoLiquidType(root_widget, item);
+		InspectMenuNew.UpdateItemInfoTemperature(root_widget, item);
+		InspectMenuNew.UpdateItemInfoWetness(root_widget, item);
+		InspectMenuNew.UpdateItemInfoQuantity(root_widget, item);
+		InspectMenuNew.UpdateItemInfoWeight(root_widget, item);
+		InspectMenuNew.UpdateItemInfoFoodStage(root_widget, item);
+		InspectMenuNew.UpdateItemInfoCleanness(root_widget, item);
+		
+		Widget content = root_widget.FindAnyWidget("InventoryInfoPanelWidget");
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateSlotInfo(Widget root_widget, string name, string desc = "")
+	{
+		if (!root_widget ) return;
+	
+		WidgetTrySetText(root_widget, "ItemNameWidget", name);
+	}
+
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoDamage(Widget root_widget, EntityAI item)
+	{
+		if ( item.IsInherited( ZombieBase ) || item.IsInherited( Car ) ) return;
+		
+		int damageLevel = item.GetHealthLevel();
+		
+		switch(damageLevel)
+		{
+			case GameConstants.STATE_RUINED:
+			{
+				WidgetTrySetText(root_widget, "ItemDamageWidget", "#inv_inspect_ruined", Colors.COLOR_RUINED);
+				break;
+			}
+			case GameConstants.STATE_BADLY_DAMAGED:
+			{
+				WidgetTrySetText(root_widget, "ItemDamageWidget", "#inv_inspect_badly", Colors.COLOR_BADLY_DAMAGED);
+				break;
+			}
+			
+			case GameConstants.STATE_DAMAGED:
+			{
+				WidgetTrySetText(root_widget, "ItemDamageWidget", "#inv_inspect_damaged", Colors.COLOR_DAMAGED);
+				break;
+			}
+			
+			case GameConstants.STATE_WORN:
+			{
+				WidgetTrySetText(root_widget, "ItemDamageWidget", "#inv_inspect_worn", Colors.COLOR_WORN);
+				break;
+			}
+			
+			case GameConstants.STATE_PRISTINE:
+			{
+				WidgetTrySetText(root_widget, "ItemDamageWidget", "#inv_inspect_pristine", Colors.COLOR_PRISTINE);
+				break;
+			}
+					
+			default:
+			{
+				WidgetTrySetText(root_widget, "ItemDamageWidget", "ERROR", Colors.COLOR_PRISTINE);
+				break;
+			}
+		}
+	
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoLiquidType(Widget root_widget, EntityAI item)
+	{
+		if ( item.IsInherited( ZombieBase ) || item.IsInherited( Car ) ) return;
+		
+		ItemBase item_base = ItemBase.Cast( item );
+		
+		if( item_base && item_base.GetQuantity() > 0 && item_base.IsBloodContainer() )
+		{
+			BloodContainerBase blood_container = BloodContainerBase.Cast( item_base );
+			
+			if( blood_container.GetBloodTypeVisible() )
+			{
+				string type;
+				bool positive;
+				string blood_type_name = BloodTypes.GetBloodTypeName(blood_container.GetLiquidType(), type, positive);
+				WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_blood: " + blood_type_name, Colors.COLOR_LIQUID);
+			}
+			else
+			{
+				WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_blood", Colors.COLOR_LIQUID);
+			}
+		}
+		else if( item_base && item_base.GetQuantity() > 0 && item_base.IsLiquidContainer() )
+		{
+			int liquid_type = item_base.GetLiquidType();
+			
+			switch(liquid_type)
+			{
+				case LIQUID_WATER:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_water", Colors.COLOR_LIQUID);
+					break;
+				}
+					
+				case LIQUID_RIVERWATER:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_river_water", Colors.COLOR_LIQUID);
+					break;
+				}
+					
+				case LIQUID_VODKA:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_vodka", Colors.COLOR_LIQUID);
+					break;
+				}
+				
+				case LIQUID_BEER:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_beer", Colors.COLOR_LIQUID);
+					break;
+				}
+				
+				case LIQUID_GASOLINE:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_gasoline", Colors.COLOR_LIQUID);
+					break;
+				}
+				
+				case LIQUID_DIESEL:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_diesel", Colors.COLOR_LIQUID);
+					break;
+				}
+				
+				case LIQUID_DISINFECTANT:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_disinfectant", Colors.COLOR_LIQUID);
+					break;
+				}
+	
+				case LIQUID_SALINE:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "#inv_inspect_saline", Colors.COLOR_LIQUID);
+					break;
+				}
+				
+				default:
+				{
+					WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "ERROR", Colors.COLOR_LIQUID);
+					break;
+				}
+			}
+		}
+		else
+		{
+			WidgetTrySetText(root_widget, "ItemLiquidTypeWidget", "");
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoTemperature(Widget root_widget, EntityAI item)
+	{
+		if ( item.IsInherited( ZombieBase ) || item.IsInherited( Car ) ) return;
+		float temperature;
+		ItemBase item_base = ItemBase.Cast( item );
+		if( item_base )
+		{
+			temperature = item_base.GetTemperature();
+		}
+		
+		if( temperature > 30 )
+		{
+			if ( temperature > 100 )
+			{
+				temperature = 100 * Math.Floor( temperature / 100.0 );
+			}
+			else
+			{
+				temperature = 10 * Math.Floor( temperature / 10.0 );
+			}
+			WidgetTrySetText(root_widget, "ItemTemperatureWidget",  "#inv_inspect_about " + temperature.ToString() +  " " + "#inv_inspect_celsius", GetTemperatureColor( temperature ) );
+		}	
+		else
+		{
+			WidgetTrySetText(root_widget, "ItemTemperatureWidget", "");
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoWetness(Widget root_widget, EntityAI item)
+	{
+		if ( item.IsInherited( ZombieBase ) || item.IsInherited( Car ) ) return;
+		float wetness = 0;
+		
+		if ( item.IsInherited(ItemBase) )
+		{
+			ItemBase item_IB = ItemBase.Cast( item );
+			wetness = item_IB.GetWet();
+		}
+
+		if( wetness < GameConstants.STATE_DAMP )
+		{
+			WidgetTrySetText(root_widget, "ItemWetnessWidget", "");
+		}
+		else if( wetness >= GameConstants.STATE_DAMP && wetness < GameConstants.STATE_WET )
+		{
+			WidgetTrySetText(root_widget, "ItemWetnessWidget", "#inv_inspcet_damp", Colors.COLOR_DAMP);
+		}
+		else if( wetness >= GameConstants.STATE_WET && wetness < GameConstants.STATE_SOAKING_WET )
+		{
+			WidgetTrySetText( root_widget, "ItemWetnessWidget", "#inv_inspect_wet", Colors.COLOR_WET );
+		}
+		else if( wetness >= GameConstants.STATE_SOAKING_WET && wetness < GameConstants.STATE_DRENCHED )
+		{
+			WidgetTrySetText( root_widget, "ItemWetnessWidget", "#inv_inspect_soaking_wet", Colors.COLOR_SOAKING_WET );
+		}
+		else
+		{
+			WidgetTrySetText( root_widget, "ItemWetnessWidget", "#inv_inspect_drenched", Colors.COLOR_DRENCHED );
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoQuantity(Widget root_widget, EntityAI item)
+	{
+		if ( item.IsInherited( ZombieBase ) || item.IsInherited( Car ) ) return;
+		
+		ItemBase item_base = ItemBase.Cast( item );
+		if( item_base )
+		{
+			float item_quantity = item_base.GetQuantity();
+			int max_quantity = item.GetQuantityMax();
+			
+			float quantity_ratio;
+			
+			if( max_quantity > 0 && !item.IsInherited( ClothingBase )) // Some items, like books, have max_quantity set to 0 => division by ZERO error in quantity_ratio
+			{
+				string quantity_str;
+				if( item.ConfigGetString("stackedUnit") == "pc." )
+				{
+					if( item_quantity == 1 )
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", item_quantity.ToString() + " " + "#inv_inspect_piece", Colors.COLOR_DEFAULT );
+					}
+					else
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", item_quantity.ToString() + " " + "#inv_inspect_pieces", Colors.COLOR_DEFAULT );
+					}		
+				}
+				else if( item.ConfigGetString("stackedUnit") == "percentage" )
+				{
+					quantity_ratio = Math.Round( ( item_quantity / max_quantity ) * 100 );
+					
+					quantity_str = "#inv_inspect_remaining " + quantity_ratio.ToString() + "#inv_inspect_percent";
+					WidgetTrySetText( root_widget, "ItemQuantityWidget", quantity_str, Colors.COLOR_DEFAULT );			
+				}
+				else if( item.ConfigGetString("stackedUnit") == "g" )
+				{
+					quantity_ratio = Math.Round( ( item_quantity / max_quantity ) * 100 );
+					
+					quantity_str = "#inv_inspect_remaining " + quantity_ratio.ToString() + "#inv_inspect_percent";
+					WidgetTrySetText( root_widget, "ItemQuantityWidget", quantity_str, Colors.COLOR_DEFAULT );			
+				}
+				else if( item.ConfigGetString("stackedUnit") == "ml" )
+				{
+					quantity_ratio = Math.Round( ( item_quantity / max_quantity ) * 100 );
+					
+					quantity_str = "#inv_inspect_remaining " + quantity_ratio.ToString() + "#inv_inspect_percent";
+					WidgetTrySetText( root_widget, "ItemQuantityWidget", quantity_str, Colors.COLOR_DEFAULT );
+				}
+				else if( item.IsInherited( Magazine ) )
+				{
+					Magazine magazine_item;
+					Class.CastTo(magazine_item, item);
+					
+					if( magazine_item.GetAmmoCount() == 1 )
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget",  magazine_item.GetAmmoCount().ToString() + " " + "#inv_inspect_piece", Colors.COLOR_DEFAULT );
+					}
+					else
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget",  magazine_item.GetAmmoCount().ToString() + " " + "#inv_inspect_pieces", Colors.COLOR_DEFAULT );
+					}
+				}
+				else
+				{
+					WidgetTrySetText( root_widget, "ItemQuantityWidget", "" );
+				}
+			}
+			else
+			{
+				if ( item.IsInherited( ClothingBase ) )
+				{
+					float heatIsolation = MiscGameplayFunctions.GetCurrentItemHeatIsolation( item_base );
+					if ( heatIsolation <= GameConstants.HEATISO_THRESHOLD_BAD )
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", "#inv_inspect_iso_bad", GetTemperatureColor( 10 ) );
+					}
+					else if ( ( heatIsolation > GameConstants.HEATISO_THRESHOLD_BAD ) && ( heatIsolation <= GameConstants.HEATISO_THRESHOLD_LOW ) )
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", "#inv_inspect_iso_low", GetTemperatureColor( 20 ) );
+					}
+					else if ( ( heatIsolation > GameConstants.HEATISO_THRESHOLD_LOW ) && ( heatIsolation <= GameConstants.HEATISO_THRESHOLD_MEDIUM ) )
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", "#inv_inspect_iso_medium", GetTemperatureColor( 30 ) );
+					}
+					else if ( ( heatIsolation > GameConstants.HEATISO_THRESHOLD_MEDIUM ) && ( heatIsolation <= GameConstants.HEATISO_THRESHOLD_HIGH ) )
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", "#inv_inspect_iso_high", GetTemperatureColor( 50 ) );
+					}
+					else
+					{
+						WidgetTrySetText( root_widget, "ItemQuantityWidget", "#inv_inspect_iso_excel", GetTemperatureColor( 70 ) );
+					}
+				}
+				else
+				{
+					WidgetTrySetText( root_widget, "ItemQuantityWidget", "" );
+				}
+			}
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoWeight(Widget root_widget, EntityAI item)
+	{
+		if (!item.CanDisplayWeight())
+		{
+			WidgetTrySetText(root_widget, "ItemWeightWidget", "", Colors.COLOR_DEFAULT);
+			return;
+		}
+		
+		ItemBase item_IB = ItemBase.Cast( item );
+		if( item_IB )
+		{
+			int weight = item_IB.GetWeightEx();
+			
+			if (root_widget.GetName() != "BackPanelWidget")
+			{
+				weight = item_IB.GetSingleInventoryItemWeightEx();
+			}
+			
+			if (weight >= 1000)
+			{
+				int kilos = Math.Round(weight / 1000.0);
+				WidgetTrySetText(root_widget, "ItemWeightWidget", "#inv_inspect_about" + " " + kilos.ToString() + " " + "#inv_inspect_kg", Colors.COLOR_DEFAULT);
+			}
+			else if (weight >= 500)
+			{
+				WidgetTrySetText(root_widget, "ItemWeightWidget", "#inv_inspect_under_1", Colors.COLOR_DEFAULT);
+			} 
+			else if (weight >= 250)
+			{
+				WidgetTrySetText(root_widget, "ItemWeightWidget", "#inv_inspect_under_05", Colors.COLOR_DEFAULT);
+			}
+			else 
+			{
+				WidgetTrySetText(root_widget, "ItemWeightWidget", "#inv_inspect_under_025", Colors.COLOR_DEFAULT);
+			}
+		}
+	}
+	
+	//--------------------------------------------------------------------------
+	static void UpdateItemInfoFoodStage(Widget root_widget, EntityAI item)
+	{
+		Edible_Base food_item = Edible_Base.Cast( item );
+		if ( food_item && food_item.HasFoodStage() )
+		{
+			ref FoodStage food_stage = food_item.GetFoodStage();
+			FoodStageType food_stage_type = food_stage.GetFoodStageType();
+					
+			switch( food_stage_type )
+			{				
+				case FoodStageType.RAW:
+				{
+					WidgetTrySetText( root_widget, "ItemFoodStageWidget", "#inv_inspect_raw", Colors.COLOR_RAW );
+					break;
+				}
+				case FoodStageType.BAKED:
+				{
+					WidgetTrySetText( root_widget, "ItemFoodStageWidget", "#inv_inspect_baked", Colors.COLOR_BAKED );
+					break;
+				}
+				case FoodStageType.BOILED:
+				{
+					WidgetTrySetText( root_widget, "ItemFoodStageWidget", "#inv_inspect_boiled", Colors.COLOR_BOILED );
+					break;
+				}
+				case FoodStageType.DRIED:
+				{
+					WidgetTrySetText( root_widget, "ItemFoodStageWidget", "#inv_inspect_dried", Colors.COLOR_DRIED );
+					break;
+				}
+				case FoodStageType.BURNED:
+				{
+					WidgetTrySetText( root_widget, "ItemFoodStageWidget", "#inv_inspect_burned", Colors.COLOR_BURNED );
+					break;
+				}
+				case FoodStageType.ROTTEN:
+				{
+					WidgetTrySetText( root_widget, "ItemFoodStageWidget", "#inv_inspect_rotten", Colors.COLOR_ROTTEN );
+					break;
+				}
+			}
+		}
+		else
+		{
+			WidgetTrySetText( root_widget, "ItemFoodStageWidget", "" );
+		}
+	}
+	
+	
+		//--------------------------------------------------------------------------
+	static void UpdateItemInfoCleanness(Widget root_widget, EntityAI item)
+	{
+		ItemBase ib = ItemBase.Cast(item);
+		if(ib && ib.m_Cleanness==1)
+		{
+			WidgetTrySetText( root_widget, "ItemCleannessWidget", "#inv_inspect_cleaned", Colors.WHITEGRAY );
+		}
+		else
+		{
+			WidgetTrySetText( root_widget, "ItemCleannessWidget", "" );
+		}
+	}
+	
+	
+	
+	//--------------------------------------------------------------------------
+	static void WidgetTrySetText(Widget root_widget, string widget_name, string text, int color = 0)
+	{
+		TextWidget widget = TextWidget.Cast( root_widget.FindAnyWidget(widget_name) );
+		RichTextWidget rt_widget = RichTextWidget.Cast( root_widget.FindAnyWidget(widget_name) );
+		if (widget)
+		{
+			widget.SetText(text);
+			Widget widget_background = root_widget.FindAnyWidget(widget_name+"Background");
+			if (widget_background)
+			{
+				if (color != 0)
+				{
+					widget_background.Show( true );
+					widget_background.SetColor(color | 0x7F000000);
+				}
+				else
+				{
+					widget_background.Show( false );
+				}
+			}
+		}
+		if( rt_widget )
+		{
+			rt_widget.Update();
+		}
+	}
+
+};
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/Inventory/InventoryCombinationFlags.c b/scripts/5_Mission/DayZ/GUI/Inventory/InventoryCombinationFlags.c
new file mode 100644
index 0000000000000000000000000000000000000000..019594d3d77a28c280f8b8281eaffec4f627f3db
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/Inventory/InventoryCombinationFlags.c
@@ -0,0 +1,50 @@
+class InventoryCombinationFlags
+{
+	static const int NONE 					= 0;
+	static const int ADD_AS_ATTACHMENT 		= 1;
+	static const int ADD_AS_CARGO 			= 2;
+	static const int SWAP 					= 4;
+	static const int FSWAP					= 8;
+	static const int CRAFT					= 16;
+	static const int ACTIONS				= 32;
+	static const int SWAP_MAGAZINE			= 64;
+	static const int TAKE_TO_HANDS			= 128;
+	static const int RECIPE_HANDS			= 256;
+	static const int COMBINE_QUANTITY2		= 512;
+	static const int RECIPE_ANYWHERE		= 1024;
+	static const int PERFORM_ACTION			= 2048;
+	static const int LOAD_CHAMBER			= 4096;
+	static const int DETACH_MAGAZINE		= 8192;
+	static const int ATTACH_MAGAZINE		= 16384;
+	static const int SET_ACTION				= 32768;
+	//static const int SWAP_MAGAZINE			= 65536;	
+}
+
+class InventoryManipulationFlags
+{
+	static const int NONE 					= 0;
+	static const int ADD_AS_ATTACHMENT 		= 1;
+	static const int ADD_AS_CARGO 			= 2;
+	static const int SWAP					= 4;
+	static const int FSWAP					= 8;
+	static const int TAKE_TO_HANDS			= 16;
+	static const int DROP					= 32;
+	static const int PERFORM_ACTION			= 64;
+	static const int SET_ACTION				= 128;
+	static const int COMBINE_QUANTITY		= 512;
+	
+	
+	//static const int LOAD_CHAMBER			= 4096;
+	//static const int DETACH_MAGAZINE		= 8192;
+	//static const int ATTACH_MAGAZINE		= 16384;
+	
+	/*static const int RECIPE_HANDS			= 256;
+	static const int COMBINE_QUANTITY2		= 512;
+	static const int RECIPE_ANYWHERE		= 1024;
+	static const int PERFORM_ACTION			= 2048;
+	static const int LOAD_CHAMBER			= 4096;
+	static const int DETACH_MAGAZINE		= 8192;
+	static const int ATTACH_MAGAZINE		= 16384;
+	static const int SET_ACTION				= 32768;*/
+	//static const int SWAP_MAGAZINE			= 65536;	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/Inventory/InventoryQuickbar.c b/scripts/5_Mission/DayZ/GUI/Inventory/InventoryQuickbar.c
new file mode 100644
index 0000000000000000000000000000000000000000..ab7b31e3f9826260553753ab531eada022a46da0
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/Inventory/InventoryQuickbar.c
@@ -0,0 +1,289 @@
+class InventoryQuickbar extends InventoryGridController
+{
+	
+	protected ref TItemsMap	m_Items;
+	protected InventoryGrid	m_Grid;
+	protected int			m_DraggingIndex;
+	
+	void InventoryQuickbar(Widget quickbarGridWidget)
+	{
+		m_DraggingIndex = INDEX_NOT_FOUND;
+		m_Items = new TItemsMap;
+		UpdateItems( quickbarGridWidget );
+	}
+
+	void ~InventoryQuickbar()
+	{
+	}
+	
+	void UpdateItems( Widget quickbarGridWidget )
+	{
+		if( !quickbarGridWidget )
+		{
+			return;
+		}
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( !player )
+			return;
+		
+		int i;
+
+		// create grid and align it to center
+		if( !m_Grid )
+		{
+			quickbarGridWidget.GetScript( m_Grid );
+			m_Grid.SetController( this );
+			m_Grid.GenerateQuickBarBackgroundTiles( 10 );
+		}
+		
+		m_Items.Clear();
+		InventoryItem item;
+		
+		if( m_Grid )
+		{
+			if( m_Grid.GetGridSize() != player.GetQuickBarSize() )
+			{
+				m_Grid.SetGridSize( player.GetQuickBarSize() );
+			}
+		}
+		
+		for( i = 0; i < m_Grid.GetGridSize(); i++)
+		{
+			item = InventoryItem.Cast( player.GetQuickBarEntity(i) );
+			if( item )
+			{
+				m_Items.Set( item, Vector(i, 1, 1) );
+			}
+		}
+		
+		if( m_Grid )
+		{
+			m_Grid.UpdateQuickbarItems( m_Items );
+		}
+	}
+
+	void Remove(InventoryItem itemToRemove)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+
+		for ( int i = 0; i < m_Grid.GetGridSize(); i++ )
+		{
+			InventoryItem item = InventoryItem.Cast( player.GetQuickBarEntity(i) );
+			if(item == itemToRemove) 
+			{
+				player.RemoveQuickBarEntityShortcut( item );
+			}
+		}
+	}
+	
+	// InventoryGridController override
+	override void OnItemEnter(InventoryGrid grid, Widget w, int row, int col)
+	{
+		Widget quickbar = grid.GetRoot();
+		if( quickbar )
+		{
+			// quickbar.SetColor( 0xFFFFFFFF );
+		}
+	}
+
+	override void OnItemLeave(InventoryGrid grid, Widget w)
+	{
+		Widget quickbar = grid.GetRoot();
+		if( quickbar )
+		{
+			// quickbar.SetColor( 0x7FFFFFFF );
+		}
+	}
+
+	override void OnItemDraggingOver(InventoryGrid grid, Widget w, int row, int col)
+	{
+		ItemPreviewWidget iw;
+		InventoryItem dragged_item;
+		iw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !iw )
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			iw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		} 
+		
+		if( !iw || !iw.GetItem() )
+		{
+			return;
+		}
+		
+		if(!dragged_item && iw)
+			dragged_item = InventoryItem.Cast( iw.GetItem() );
+
+		if ( dragged_item == NULL)
+			return;
+		
+		if (dragged_item && dragged_item.GetInventory().CanRemoveEntity() == false)
+		{
+			int color;
+
+			color = ARGB( 150, 255, 1, 1 );
+
+			if( w.FindAnyWidget("Cursor") )
+			{
+				w.FindAnyWidget("Cursor").SetColor( color );
+			}
+			else
+			{
+				name = w.GetName();
+				name.Replace( "PanelWidget", "Cursor" );
+				if( w.FindAnyWidget( name ) )
+				{
+					w.FindAnyWidget( name ).SetColor( color );
+				}
+			}			
+		}
+		else
+		{
+			color = ARGB( 150, 1, 255, 1 );
+
+			if( w.FindAnyWidget("Cursor") )
+			{
+				w.FindAnyWidget("Cursor").SetColor( color );
+			}
+			else
+			{
+				name = w.GetName();
+				name.Replace( "PanelWidget", "Cursor" );
+				if( w.FindAnyWidget( name ) )
+				{
+					w.FindAnyWidget( name ).SetColor( color );
+				}
+			}
+		}
+	}
+
+	override void OnItemDropReceived(InventoryGrid grid, Widget w, int row, int col)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		ItemBase dragged_item = ItemBase.Cast( ItemManager.GetInstance().GetDraggedItem() );
+		
+		ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !iw )
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			iw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		
+		if(!dragged_item && iw)
+			dragged_item = ItemBase.Cast( iw.GetItem() );
+		
+		if(dragged_item && dragged_item.GetHierarchyRootPlayer()!= GetGame().GetPlayer())
+			return;
+		
+		ItemBase quickbar_item = ItemBase.Cast( player.GetQuickBarEntity(col) );
+		
+		if (m_DraggingIndex != INDEX_NOT_FOUND)
+		{
+			dragged_item = ItemBase.Cast( player.GetQuickBarEntity(m_DraggingIndex) );
+		}
+			
+		if (dragged_item && dragged_item.GetInventory().CanRemoveEntity())
+		{
+			player.SetQuickBarEntityShortcut(dragged_item, col);
+			
+			if (quickbar_item && quickbar_item != dragged_item && m_DraggingIndex != INDEX_NOT_FOUND)
+			{
+				player.SetQuickBarEntityShortcut(quickbar_item, m_DraggingIndex);
+			}
+		}
+		m_DraggingIndex = INDEX_NOT_FOUND;
+		InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu(MENU_INVENTORY) );
+		if ( menu )
+		{
+			menu.RefreshQuickbar();
+		}
+	}
+	
+	override void OnItemDrop(InventoryGrid grid, Widget w, int row, int col)
+	{
+		if (m_DraggingIndex != INDEX_NOT_FOUND)
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			InventoryItem dragged_item = InventoryItem.Cast( player.GetQuickBarEntity(m_DraggingIndex) );
+			Remove(dragged_item);
+			m_DraggingIndex = INDEX_NOT_FOUND;
+		}
+		
+		InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu(MENU_INVENTORY) );
+		if ( menu )
+		{
+			menu.RefreshQuickbar();
+		}
+		ItemManager.GetInstance().HideDropzones();
+	}
+
+	override void OnItemDrag(InventoryGrid grid, Widget w, int row, int col)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );		
+		InventoryItem item = InventoryItem.Cast( player.GetQuickBarEntity(col) );
+		if (item)
+		{	
+			m_DraggingIndex = col;
+			m_Grid.SetItemColor(item, InventoryGrid.ITEM_COLOR_DRAG);
+		}
+	}
+	
+	override int GetQuickbarItemColor( InventoryGrid grid, InventoryItem item )
+	{
+		int color = 0x0AFFFFFF;
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI itemInHand = player.GetHumanInventory().GetEntityInHands();
+		if ( player && itemInHand == item )
+		{
+			if ( player.GetHumanInventory().FindUserReservedLocationIndex(item) != -1 || grid.CanAddItemInHandToInventory() )
+				color = InventoryGrid.ITEM_COLOR_QUICKBAR_H_GOOD;
+			else
+				color = InventoryGrid.ITEM_COLOR_QUICKBAR_H_BAD;
+		}
+		else if ( itemInHand )
+		{
+			if ( !grid.CanAddItemInHandToInventory() && !GameInventory.CanSwapEntitiesEx(item, itemInHand) )	
+				color = InventoryGrid.ITEM_COLOR_QUICKBAR_I_BAD;
+		}
+		return color;
+	}
+
+	
+	override int HasItemQuantity( InventoryItem item )
+	{
+		return QuantityConversions.HasItemQuantity( item );
+	}
+
+	override string GetItemQuantityText( InventoryItem item )
+	{
+		return QuantityConversions.GetItemQuantityText( item );
+	}
+
+	override float GetItemQuantity( InventoryItem item )
+	{
+		return QuantityConversions.GetItemQuantity( item );
+	}
+	
+	override int GetItemQuantityMax( InventoryItem item )
+	{
+		ItemBase ib = ItemBase.Cast(item);
+		return ib.m_VarQuantityMax;
+	}
+	
+	override int GetItemCount( InventoryItem item )
+	{
+		ItemBase ib = ItemBase.Cast(item);
+		return ib.m_Count;
+	}
+	
+	override bool CanAddItemInHandToInventory()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI itemInHand = player.GetHumanInventory().GetEntityInHands();
+		return itemInHand && player.GetInventory().CanAddEntityToInventory(itemInHand);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryMenu.c b/scripts/5_Mission/DayZ/GUI/InventoryMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..6ff4d15f5cc126a8a08a7dc68a5f5d015cec27a2
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryMenu.c
@@ -0,0 +1,169 @@
+enum ScreenWidthType
+{
+	NARROW,
+	MEDIUM,
+	WIDE
+}
+
+class InventoryMenu extends UIScriptedMenu
+{
+	ref Inventory						m_Inventory;
+	private ref ContextMenu				m_context_menu;
+	protected bool						m_IsOpened;
+	protected bool						m_OnlyFirstTime;
+	protected int  						m_LastDisplayLanguage;
+	
+	protected static ScreenWidthType	m_WidthType;
+	protected static int				m_Width;
+	protected static int				m_Height;
+	
+	void InventoryMenu()
+	{
+		CheckWidth();
+		m_Inventory = new Inventory(null);
+		m_Inventory.Reset();
+		m_Inventory.UpdateInterval();
+		m_context_menu = new ContextMenu();
+		m_LastDisplayLanguage = g_Game.GetCurrentDisplayLanguageIdx();
+	}
+	
+	override Widget Init()
+	{
+		m_Inventory.Init();
+		m_context_menu.Init(layoutRoot);
+		layoutRoot = m_Inventory.GetMainWidget();
+		return layoutRoot;
+	}
+	
+	void CheckWidth()
+	{
+		GetScreenSize( m_Width, m_Height );
+		
+		if( m_Height > 0 )
+		{
+			float ratio = m_Width / m_Height;
+			if( ratio > 1.75 )
+				m_WidthType = ScreenWidthType.WIDE;
+			else if( ratio > 1.5 )
+				m_WidthType = ScreenWidthType.MEDIUM;
+			else
+				m_WidthType = ScreenWidthType.NARROW;
+		}
+	}
+	
+	static ScreenWidthType GetWidthType()
+	{
+		return m_WidthType;
+	}
+	
+	static int GetWidth()
+	{
+		return m_Width;
+	}
+	
+	static int GetHeight()
+	{
+		return m_Height;
+	}
+	
+	static float GetHeightMultiplied( float value )
+	{
+		float height = m_Height;
+		return height / 1080 * value;
+	}
+	
+	void RefreshQuickbar()
+	{
+		m_Inventory.RefreshQuickbar();
+	}
+	
+	override ContextMenu GetContextMenu()
+	{
+		return m_context_menu;
+	}
+
+	void InitContainers(EntityAI target)
+	{
+		
+	}
+	
+	override void Update( float timeslice )
+	{
+		if( m_Inventory )
+		{
+			m_Inventory.Update(timeslice);
+		}
+	}
+	
+	override void Refresh()
+	{
+		super.Refresh();
+		
+		m_Inventory.UpdateConsoleToolbar();
+	}
+
+	override void OnShow()
+	{
+		super.OnShow();
+		m_IsOpened = true;
+		PPERequesterBank.GetRequester(PPERequesterBank.REQ_INVENTORYBLUR).Start();
+		VicinityItemManager.GetInstance().RefreshVicinityItems();
+		
+		if(m_Inventory)
+			m_Inventory.OnShow();
+		
+		SetFocus( layoutRoot );
+		
+		MissionGameplay mission = MissionGameplay.Cast( GetGame().GetMission() );
+		if( mission )
+		{
+			mission.MoveHudForInventory( true );
+		}
+		
+		ItemManager.GetInstance().SetItemMicromanagmentMode( false );
+		ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+
+		m_Inventory.Refresh();
+	}
+	
+	override bool OnController( Widget w, int control, int value )
+	{
+		if( m_IsOpened )
+			return m_Inventory.Controller( w, control, value );
+		return false;
+	}
+	
+	bool IsOpened()
+	{
+		return m_IsOpened;
+	}
+
+	override void OnHide()
+	{
+		super.OnHide();
+		m_context_menu.Hide();
+		m_IsOpened = false;
+		PPERequesterBank.GetRequester(PPERequesterBank.REQ_INVENTORYBLUR).Stop();
+		if(m_Inventory)
+			m_Inventory.OnHide();
+		MissionGameplay mission = MissionGameplay.Cast( GetGame().GetMission() );
+		if( mission )
+		{
+			mission.MoveHudForInventory( false );
+		}
+		
+		ItemManager.GetInstance().SetItemMicromanagmentMode( false );
+		ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+		ItemManager.GetInstance().HideTooltip();
+	}
+	
+	int GetLastDisplayLanguage()
+	{
+		return m_LastDisplayLanguage;
+	}
+	
+	bool LanguageChanged()
+	{
+		return g_Game.GetCurrentDisplayLanguageIdx() != m_LastDisplayLanguage;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/HandsArea.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/HandsArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..16462f1dd1b2b6fe8c8dd5523e19b3b7e89ccfb1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/HandsArea.c
@@ -0,0 +1,196 @@
+class HandsArea: Container
+{
+	protected ScrollWidget			m_Scroller;
+	protected ref HandsContainer	m_HandsContainer;
+	protected ref SizeToChild		m_HandsResizer;
+	
+	protected bool					m_ShouldChangeSize = true;
+
+	void HandsArea( LayoutHolder parent )
+	{
+		m_HandsContainer = new HandsContainer( this );
+		m_Body.Insert(m_HandsContainer);
+		
+		if ( m_ImmedUpdate )
+			m_MainWidget.Update();
+		
+		m_ParentWidget.GetScript( m_HandsResizer );
+		m_Scroller = ScrollWidget.Cast( m_ParentWidget );
+		RecomputeOpenedContainers();
+	}
+
+	bool IsSwapActive()
+	{
+		Widget swap_cursor = m_MainWidget.FindAnyWidget("SwapCursor");
+		
+		if ( swap_cursor )
+			return swap_cursor.IsVisible();
+		else
+			return false;
+	}
+
+	bool IsCombineActive()
+	{
+		Widget combine_cursor = m_MainWidget.FindAnyWidget("CombineCursor");
+
+		if ( combine_cursor )
+			return combine_cursor.IsVisible();
+		else
+			return false;
+	}
+	
+	override ScrollWidget GetScrollWidget()
+	{
+		return m_Scroller;
+	}
+	
+	override void UpdateSelectionIcons()
+	{
+		#ifdef PLATFORM_CONSOLE
+		ScrollToActiveContainer();
+		#endif
+	}
+
+	override void UpdateInterval()
+	{
+		if (!m_Scroller.IsScrollbarVisible())
+		{
+			m_Scroller.VScrollToPos01(0.0);
+		}
+		else if (m_Scroller.GetVScrollPos01() > 1.0)
+		{
+			m_Scroller.VScrollToPos01(1.0);
+		}
+		m_HandsContainer.UpdateInterval();
+		
+		float x, y;
+		float x2, y2;
+		m_Scroller.GetScreenSize( x, y );
+		m_MainWidget.GetScreenSize( x2, y2 );
+		if ( y2 != y )
+			m_ShouldChangeSize = true;
+		
+		bool changed_size;
+		if ( m_ShouldChangeSize && m_HandsResizer.ResizeParentToChild( changed_size, InventoryMenu.GetHeight() * 0.5 ) )
+			m_Scroller.SetAlpha( 0.3921 );
+		else
+			m_Scroller.SetAlpha( 0 );
+		
+		if ( changed_size )
+			m_ShouldChangeSize = false;
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.HandsArea;
+	}
+
+	override void SetParentWidget()
+	{
+		m_ParentWidget = m_Parent.GetMainWidget().FindAnyWidget( "HandsPanel" );
+	}
+
+	override void OnShow()
+	{
+		super.OnShow();
+		m_HandsContainer.OnShow();
+	}
+
+	override void Refresh()
+	{
+		UpdateSelectionIcons();
+		m_ShouldChangeSize = true;
+	}
+	
+	override void SetSameLevelNextActive()
+	{
+		super.SetSameLevelNextActive();
+		
+		Refresh();
+	}
+	override void SetSameLevelPreviousActive()
+	{
+		super.SetSameLevelPreviousActive();
+		
+		Refresh();
+	}
+	
+	void DraggingOverHandsPanel( Widget w, int x, int y, Widget receiver )
+	{
+		if ( w == NULL )
+		{
+			return;
+		}
+		
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		
+		if( !ipw )
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		
+		if( !ipw )
+		{
+			ipw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if( !ipw || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;
+		}
+		
+		if( ipw.GetItem() && GetGame().GetPlayer().GetHumanInventory().CanAddEntityIntoHands( ipw.GetItem() ) )
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+		}
+		else
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+		}
+	}
+	
+	void OnHandsPanelDropReceived( Widget w, int x, int y, Widget receiver )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		
+		if( !ipw )
+		{
+			ipw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if( !ipw || !ipw.GetItem() || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;
+		}
+		
+		if( !ipw.GetItem().GetInventory().CanRemoveEntity() )
+			return;
+		
+		if( GetGame().GetPlayer().GetHumanInventory().CanAddEntityIntoHands( ipw.GetItem() ) )
+		{
+			ItemBase item_base = ItemBase.Cast( ipw.GetItem() );
+			float stackable = item_base.GetTargetQuantityMax(-1);
+			
+			if( stackable == 0 || item_base.GetQuantity() <= stackable )
+			{
+				GetGame().GetPlayer().PredictiveTakeEntityToHands( item_base );		
+			}
+			else if( stackable != 0 && stackable <= item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxHandsClient( PlayerBase.Cast( GetGame().GetPlayer() ) );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/LeftArea.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/LeftArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..c13947ff2c043ee4170d1cefbef07137eb5ab97d
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/LeftArea.c
@@ -0,0 +1,252 @@
+class LeftArea: Container
+{
+	protected Widget					m_UpIcon;
+	protected Widget					m_DownIcon;
+	protected Widget					m_ContentParent;
+	protected ref VicinityContainer		m_VicinityContainer;
+	protected ScrollWidget				m_ScrollWidget;
+	protected ref SizeToChild			m_ContentResize;
+	protected bool						m_ShouldChangeSize = true;
+	protected bool						m_IsProcessing = false; // Prevents refreshing every time a child is added while it is still processing
+	
+	void LeftArea(LayoutHolder parent )
+	{
+		m_MainWidget.Show(true, false);
+		
+		m_ContentParent	= m_MainWidget.FindAnyWidget("ContentParent");
+		m_ContentParent.GetScript(m_ContentResize);
+		
+		m_ScrollWidget	= ScrollWidget.Cast(m_MainWidget.FindAnyWidget("Scroller"));
+		m_MainWidget	= m_MainWidget.FindAnyWidget("Content");
+		
+		m_UpIcon		= m_RootWidget.FindAnyWidget("Up");
+		m_DownIcon		= m_RootWidget.FindAnyWidget("Down");
+		
+		m_VicinityContainer = new VicinityContainer(this, false);
+		m_Body.Insert(m_VicinityContainer);
+		m_ActiveIndex = 0;
+		
+		WidgetEventHandler.GetInstance().RegisterOnChildAdd(m_MainWidget, this, "OnChildAdd");
+		WidgetEventHandler.GetInstance().RegisterOnChildRemove(m_MainWidget, this, "OnChildRemove");
+		RecomputeOpenedContainers();
+	}
+	
+	override void UnfocusGrid()
+	{
+		Container active_container;
+		for ( int i = 0; i < m_OpenedContainers.Count(); i++ )
+		{
+			active_container = Container.Cast( m_OpenedContainers.Get( i ) );
+			active_container.UnfocusGrid();
+		}
+	}
+	
+	override bool IsActive()
+	{
+		if( m_OpenedContainers.Count() <= m_ActiveIndex )
+		{
+			m_ActiveIndex = 0;
+		}
+		Container active_container = Container.Cast( m_OpenedContainers.Get( m_ActiveIndex ) );
+		return active_container.IsActive( );
+	}
+	
+	override void SetActive( bool active )
+	{
+		super.SetActive( active );
+		
+		UpdateSelectionIcons();
+	}
+	
+	override ScrollWidget GetScrollWidget()
+	{
+		return m_ScrollWidget;
+	}
+	
+	override void UpdateSelectionIcons()
+	{
+		#ifdef PLATFORM_CONSOLE
+			ScrollToActiveContainer();
+		#endif
+		m_UpIcon.Show( m_IsActive );
+		m_DownIcon.Show( m_IsActive );
+		if( m_IsActive )
+		{
+			float x, y;
+			m_UpIcon.GetScreenSize( x, y );
+			
+			float top_y		= GetCurrentContainerTopY();
+			m_UpIcon.SetPos( 0, Math.Clamp( top_y, 0, 99999 ) );
+			
+			#ifndef PLATFORM_CONSOLE
+			float x2, y2;
+			m_DownIcon.GetScreenSize( x2, y2 );
+			float bottom_y	= GetCurrentContainerBottomY() - y2;
+			
+			float diff		= bottom_y - ( top_y + y );
+			if( diff < 0 )
+			{
+				top_y += diff / 2;
+				bottom_y -= diff / 2;
+			}
+			m_DownIcon.SetPos( 0, bottom_y );
+			#endif
+		}
+	}
+	
+	float GetCurrentContainerTopY()
+	{
+		float x, y, cont_screen_pos;
+		m_MainWidget.GetScreenPos( x, y );
+		if ( m_OpenedContainers.IsValidIndex( m_ActiveIndex ) )
+			cont_screen_pos = Container.Cast( m_OpenedContainers.Get( m_ActiveIndex ) ).GetFocusedContainerYScreenPos();
+
+		return cont_screen_pos - y;
+	}
+	
+	float GetCurrentContainerBottomY()
+	{
+		float x, y, cont_screen_pos, cont_screen_height;
+		m_MainWidget.GetScreenPos( x, y );
+		
+		if ( m_OpenedContainers.IsValidIndex( m_ActiveIndex ) )
+		{
+			cont_screen_pos = Container.Cast( m_OpenedContainers.Get( m_ActiveIndex ) ).GetFocusedContainerYScreenPos();
+			cont_screen_height = Container.Cast( m_OpenedContainers.Get( m_ActiveIndex ) ).GetFocusedContainerHeight();
+		}
+			
+		return cont_screen_pos - y + cont_screen_height;
+	}
+	
+	override void SetSameLevelNextActive()
+	{
+		m_VicinityContainer.SetSameLevelNextActive();
+		Refresh();
+	}
+	override void SetSameLevelPreviousActive()
+	{
+		m_VicinityContainer.SetSameLevelPreviousActive();
+		Refresh();
+	}
+	
+	override void ExpandCollapseContainer()
+	{
+		Container c = GetFocusedContainer();		
+		if (c)
+		{
+			c.ExpandCollapseContainer();
+		}
+		
+		Refresh();
+	}
+	
+	void OnLeftPanelDropReceived( Widget w, int x, int y, Widget receiver )
+	{
+		m_VicinityContainer.OnLeftPanelDropReceived( w, x, y, receiver );
+	}
+	
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		m_VicinityContainer.DraggingOverHeader( w, x, y, receiver );
+	}
+	
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.LeftAreaXbox;
+		#else
+			switch ( InventoryMenu.GetWidthType() )
+			{
+				case ScreenWidthType.NARROW:
+				{
+					m_LayoutName = WidgetLayoutName.LeftAreaNarrow;
+					break;
+				}
+				case ScreenWidthType.MEDIUM:
+				{
+					m_LayoutName = WidgetLayoutName.LeftAreaMedium;
+					break;
+				}
+				case ScreenWidthType.WIDE:
+				{
+					m_LayoutName = WidgetLayoutName.LeftAreaWide;
+					break;
+				}
+			}
+		#endif
+			
+	}
+	
+	override EntityAI GetFocusedItem()
+	{
+		EntityAI item = GetFocusedContainer().GetFocusedItem();
+		return item;
+	}
+	
+	VicinityContainer GetVicinityContainer()
+	{
+		return m_VicinityContainer;
+	}
+	
+	override void SetParentWidget()
+	{
+		m_ParentWidget = m_Parent.GetMainWidget().FindAnyWidget( "LeftPanel" );
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		Refresh();
+	}
+	
+	override void Refresh()
+	{
+		super.Refresh();
+		
+		m_MainWidget.Update();
+		m_RootWidget.Update();
+		m_ScrollWidget.Update();
+		
+		UpdateSelectionIcons();
+		m_ShouldChangeSize = true;
+	}
+	
+	override void UpdateInterval()
+	{
+		m_IsProcessing = true;
+		super.UpdateInterval();
+		m_IsProcessing = false;
+		
+		float x, y;
+		float x2, y2;
+		m_ContentParent.GetScreenSize( x, y );
+		m_MainWidget.GetScreenSize( x2, y2 );
+		if ( y2 != y )
+			m_ShouldChangeSize = true;
+		bool changed_size;
+		//if ( m_ShouldChangeSize )
+			m_ContentResize.ResizeParentToChild( changed_size );
+		if ( changed_size || m_ShouldChangeSize )
+		{
+			m_MainWidget.Update();
+			m_RootWidget.Update();
+			m_ScrollWidget.Update();
+			m_ShouldChangeSize = false;
+		}
+		CheckScrollbarVisibility();
+	}
+
+	override bool OnChildRemove( Widget w, Widget child )
+	{
+		if (!m_IsProcessing)
+			Refresh();
+		return true;
+	}
+	
+	override bool OnChildAdd( Widget w, Widget child )
+	{
+		if (!m_IsProcessing)
+			Refresh();
+		return true;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/RightArea.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/RightArea.c
new file mode 100644
index 0000000000000000000000000000000000000000..efe5f7353e8e0aedfdf82ab781dd9d0df759b24c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Areas/RightArea.c
@@ -0,0 +1,249 @@
+class RightArea: Container
+{
+	ref PlayerContainer	m_PlayerContainer;
+	protected Widget	m_ContentParent;
+	
+	protected ScrollWidget						m_ScrollWidget;
+	protected Widget							m_UpIcon;
+	protected Widget							m_DownIcon;
+	
+	protected ref SizeToChild					m_ContentResize;
+	protected bool								m_ShouldChangeSize = true;
+	protected bool								m_ProcessGridMovement;
+	
+	void RightArea(LayoutHolder parent)
+	{
+		m_MainWidget.Show(true);
+		m_ScrollWidget	= ScrollWidget.Cast( m_MainWidget.FindAnyWidget( "Scroller" ) );
+		m_MainWidget		= m_MainWidget.FindAnyWidget("Content");
+		//m_ContentParent		= m_RootWidget.FindAnyWidget("ContentParent");
+		m_PlayerContainer	= new PlayerContainer(this, false);
+		m_PlayerContainer.SetPlayer(PlayerBase.Cast(GetGame().GetPlayer()));
+		m_Body.Insert(m_PlayerContainer);
+		m_ActiveIndex = 0;
+		m_ProcessGridMovement = false;
+		
+		m_UpIcon		= m_RootWidget.FindAnyWidget( "Up" );
+		m_DownIcon		= m_RootWidget.FindAnyWidget( "Down" );
+		
+		//m_ContentParent.GetScript( m_ContentResize );
+		
+		RecomputeOpenedContainers();
+	}
+	
+	PlayerContainer GetPlayerContainer()
+	{
+		return m_PlayerContainer;
+	}
+	
+	override void DraggingOverHeader(Widget w, int x, int y, Widget receiver)
+	{
+		m_PlayerContainer.DraggingOverHeader(w, x, y, receiver);
+	}
+	
+	override bool Select()
+	{
+		return m_PlayerContainer.Select();
+	}
+	
+	override bool SelectItem()
+	{
+		return m_PlayerContainer.SelectItem();
+	}
+	
+	override bool Combine()
+	{
+		return m_PlayerContainer.Combine();
+	}
+	
+	override bool SplitItem()
+	{
+		return m_PlayerContainer.SplitItem();
+	}
+	
+	override bool EquipItem()
+	{
+		return m_PlayerContainer.EquipItem();
+	}
+	
+	override bool TransferItem()
+	{
+		return m_PlayerContainer.TransferItem();
+	}
+	
+	override bool InspectItem()
+	{
+		return m_PlayerContainer.InspectItem();
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		return m_PlayerContainer.TransferItemToVicinity();
+	}
+	
+	override void UnfocusGrid()
+	{
+		m_PlayerContainer.UnfocusGrid();
+	}
+	
+	override bool CanTakeToInventory()
+	{
+		return false;
+	}
+	
+	override bool CanTakeToInventoryEx(EntityAI focusedEntity)
+	{
+		return false;
+	}
+	
+	bool HasEntityContainerVisible(EntityAI entity)
+	{
+		return m_PlayerContainer.HasEntityContainerVisible(entity);
+	}
+	
+	void SwapItemsInOrder(int slot1, int slot2)
+	{
+		m_PlayerContainer.SwapItemsInOrder(slot1, slot2);
+	}
+	
+	bool IsPlayerEquipmentActive()
+	{
+		return m_PlayerContainer.IsPlayerEquipmentActive();
+	}
+	
+	override void SetSameLevelNextActive()
+	{
+		m_PlayerContainer.SetSameLevelNextActive();
+		Refresh();
+	}
+	override void SetSameLevelPreviousActive()
+	{
+		m_PlayerContainer.SetSameLevelPreviousActive();
+		Refresh();
+	}
+	
+	override void ExpandCollapseContainer()
+	{
+		m_PlayerContainer.ExpandCollapseContainer();
+	}
+	
+	override void Refresh()
+	{
+		m_ScrollWidget.Update();
+		m_PlayerContainer.Refresh();
+		m_ShouldChangeSize = true;
+	}
+
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.RightAreaXbox;
+		#else
+			switch (InventoryMenu.GetWidthType())
+			{
+			case ScreenWidthType.NARROW:
+				m_LayoutName = WidgetLayoutName.RightAreaNarrow;
+			break;
+			case ScreenWidthType.MEDIUM:
+				m_LayoutName = WidgetLayoutName.RightAreaMedium;
+			break;
+			case ScreenWidthType.WIDE:
+				m_LayoutName = WidgetLayoutName.RightAreaWide;
+			break;
+			}
+		#endif
+			
+	}
+
+	override void SetParentWidget()
+	{
+		m_ParentWidget = m_Parent.GetMainWidget().FindAnyWidget("RightPanel");
+	}
+
+	override void OnShow()
+	{
+		super.OnShow();
+		Refresh();
+	}
+	
+	override void UpdateInterval()
+	{
+		super.UpdateInterval();
+		m_PlayerContainer.UpdateInterval();
+		
+		CheckScrollbarVisibility();
+	}
+	
+	void MoveUpDownIcons()
+	{
+		if (m_UpIcon && m_DownIcon)
+		{
+			m_UpIcon.Show( m_IsActive );
+			m_DownIcon.Show( m_IsActive );
+			if( m_IsActive )
+			{
+				float x, y;
+				m_UpIcon.GetScreenSize( x, y );
+				
+				float top_y		= GetCurrentContainerTopY();
+				m_UpIcon.SetPos( 0, Math.Clamp( top_y, 0, 99999 ) );
+				
+				#ifndef PLATFORM_CONSOLE
+				float x2, y2;
+				m_DownIcon.GetScreenSize( x2, y2 );
+				float bottom_y	= GetCurrentContainerBottomY() - y2;
+				
+				float diff		= bottom_y - ( top_y + y );
+				if( diff < 0 )
+				{
+					top_y += diff / 2;
+					bottom_y -= diff / 2;
+				}
+				m_DownIcon.SetPos( 0, bottom_y );
+				#endif
+			}
+		}
+		/*else
+		{
+			ErrorEx("up/down icons not present!");
+		}
+		#else
+		m_ScrollWidget.Update();
+		#endif*/
+		
+	}
+	
+	override ScrollWidget GetScrollWidget()
+	{
+		return m_ScrollWidget;
+	}
+	
+	override void UpdateSelectionIcons()
+	{
+		#ifdef PLATFORM_CONSOLE
+			ScrollToActiveContainer();
+		#endif
+		MoveUpDownIcons();
+	}
+	
+	float GetCurrentContainerTopY()
+	{
+		float x, y;
+		GetMainWidget().Update();
+		GetMainWidget().GetScreenPos( x, y );
+		float cont_screen_pos = GetFocusedContainerYScreenPos();
+		
+		return cont_screen_pos - y;
+	}
+	
+	float GetCurrentContainerBottomY()
+	{
+		float x, y;
+		GetMainWidget().Update();
+		GetMainWidget().GetScreenPos( x, y );
+		
+		float cont_screen_pos		= GetFocusedContainerYScreenPos();
+		float cont_screen_height	= GetFocusedContainerHeight();
+		return cont_screen_pos - y + cont_screen_height;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Attachments.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Attachments.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c784d54f074d039f7d1a13277cb222f2812d257
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Attachments.c
@@ -0,0 +1,609 @@
+const int ITEMS_IN_ROW = 8;
+
+class Attachments
+{
+	protected Container							m_Parent;
+	protected EntityAI							m_Entity;
+	protected ref AttachmentsWrapper			m_AttachmentsContainer;
+	protected ref array<string>					m_AttachmentSlotNames;
+	protected ref array<string>					m_AttachmentSlotDisplayable;
+	protected ref map<int, SlotsIcon>			m_AttachmentSlots;
+	protected ref array<int>					m_AttachmentIDOrdered;
+	
+	protected int m_RowIndex;
+
+	void Attachments( Container parent, EntityAI entity )
+	{
+		m_Parent					= parent;
+		m_Entity					= entity;
+		m_AttachmentSlots			= new map<int, SlotsIcon>;
+		m_AttachmentIDOrdered		= new array<int>;
+		m_AttachmentSlotNames		= GetItemSlots( entity );
+		m_AttachmentSlotDisplayable	= new array<string>;
+		m_Entity.GetOnItemAttached().Insert( AttachmentAdded );
+		m_Entity.GetOnItemDetached().Insert( AttachmentRemoved );
+		m_Entity.GetOnAttachmentSetLock().Insert( OnAttachmentReservationSet );
+		m_Entity.GetOnAttachmentReleaseLock().Insert( OnAttachmentReservationRelease );
+		
+	}
+	
+	void ~Attachments()
+	{
+		if( m_Entity )
+		{
+			m_Entity.GetOnItemAttached().Remove( AttachmentAdded );
+			m_Entity.GetOnItemDetached().Remove( AttachmentRemoved );
+			m_Entity.GetOnAttachmentSetLock().Remove( OnAttachmentReservationSet );
+			m_Entity.GetOnAttachmentReleaseLock().Remove( OnAttachmentReservationRelease );
+		}
+		
+		delete m_AttachmentsContainer;
+	}
+	
+	AttachmentsWrapper GetWrapper()
+	{
+		return m_AttachmentsContainer;
+	}
+	
+	bool IsEmpty()
+	{
+		return m_AttachmentsContainer.IsEmpty();
+	}
+	
+	bool IsItemActive()
+	{
+		ItemBase item = ItemBase.Cast( GetFocusedItem() );
+		if( !item )
+		{
+			return false;
+		}
+		return !IsEmpty() && ( !QuantityConversions.HasItemQuantity( item )  || ( QuantityConversions.HasItemQuantity( item ) && !item.CanBeSplit() ) );
+	}
+	
+	bool IsItemWithQuantityActive()
+	{
+		ItemBase item = ItemBase.Cast( GetFocusedItem() );
+		if( !item )
+		{
+			return false;
+		}
+		return !IsEmpty() && QuantityConversions.HasItemQuantity( item ) && item.CanBeSplit();
+	}
+
+	void UnfocusAll()
+	{
+		m_AttachmentsContainer.UnfocusAll();
+	}
+
+	void SetDefaultFocus( bool while_micromanagment_mode = false )
+	{
+		m_AttachmentsContainer.SetDefaultFocus(while_micromanagment_mode);
+	}
+	
+	void SetLastActive()
+	{
+		m_AttachmentsContainer.SetLastActive();
+	}
+	
+	void SetActive( bool active )
+	{
+		m_AttachmentsContainer.SetActive(active);
+	}
+	
+	void SelFirstActive()
+	{
+		m_AttachmentsContainer.SetFirstActive();
+	}
+	
+	SlotsIcon GetFocusedSlotsIcon()
+	{
+		return m_AttachmentsContainer.GetFocusedSlotsIcon();
+	}
+	
+	EntityAI GetFocusedItem()
+	{
+		return m_AttachmentsContainer.GetFocusedItem();
+	}
+	
+	int GetFocusedSlot()
+	{
+		SlotsIcon icon = m_AttachmentsContainer.GetFocusedSlotsIcon();
+		if (icon)
+			return icon.GetSlotID();
+		return -1;
+	}
+	
+	bool SelectItem()
+	{
+		ItemBase item = ItemBase.Cast( GetFocusedItem() );
+		SlotsIcon icon = GetFocusedSlotsIcon();
+		
+		if (icon && !icon.IsOutOfReach())
+		{
+			if (item && item.CanPutIntoHands(null))
+			{
+				ItemManager.GetInstance().SetSelectedItemEx(item, null, icon);
+			}
+			else
+			{
+				ItemManager.GetInstance().SetSelectedItemEx(null, null, icon);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	bool Select()
+	{
+		SlotsIcon selected_slot = ItemManager.GetInstance().GetSelectedIcon();
+		EntityAI selected_item = ItemManager.GetInstance().GetSelectedItem();
+		SlotsIcon focused_slot = GetFocusedSlotsIcon();
+		EntityAI focused_item = GetFocusedItem();
+		Man player = GetGame().GetPlayer();
+		
+		if( focused_slot.IsReserved() || focused_item != selected_item && !(selected_slot && selected_slot.IsOutOfReach() ) )
+		{
+			if( selected_item )
+			{
+				if( selected_item.GetInventory().CanRemoveEntity() )
+				{
+					if( m_Entity.GetInventory().CanAddAttachmentEx( selected_item, focused_slot.GetSlotID() ) )
+					{
+						player.PredictiveTakeEntityToTargetAttachmentEx( m_Entity, selected_item, focused_slot.GetSlotID() );
+						ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+						return true;
+					
+					}
+					else if( m_Entity.GetInventory().CanAddAttachment( selected_item ) )
+					{
+						player.PredictiveTakeEntityToTargetAttachment(m_Entity, selected_item);
+						ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+						return true;
+					}
+				}
+			}
+			else
+			{
+				if ( focused_item && !focused_slot.IsOutOfReach() )
+				{
+					EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+					InventoryLocation il = new InventoryLocation;
+					focused_item.GetInventory().GetCurrentInventoryLocation( il );
+					bool reachable = AttachmentsOutOfReach.IsAttachmentReachable( m_Entity, "", il.GetSlot() );
+					if( reachable && focused_item.GetInventory().CanRemoveEntity() )
+					{
+						if( item_in_hands && item_in_hands.GetInventory().CanRemoveEntity() )
+						{
+							if( GameInventory.CanSwapEntitiesEx( item_in_hands, focused_item ) )
+							{
+								player.PredictiveSwapEntities( item_in_hands, focused_item );
+								return true;
+							}
+						}
+						else
+						{
+							if( player.GetHumanInventory().CanAddEntityInHands( focused_item ) )
+							{
+								player.PredictiveTakeEntityToHands( focused_item );
+								return true;
+							}
+						}
+					}
+				}
+			}	
+		}
+		return false;
+	}
+	
+	int GetRecipeCount( bool recipe_anywhere, EntityAI entity1, EntityAI entity2 )
+	{
+		PluginRecipesManager plugin_recipes_manager = PluginRecipesManager.Cast( GetPlugin( PluginRecipesManager ) );
+		return plugin_recipes_manager.GetValidRecipes( ItemBase.Cast( entity1 ), ItemBase.Cast( entity2 ), null, PlayerBase.Cast( GetGame().GetPlayer() ) );
+	}
+	
+	bool CanCombine()
+	{
+		ItemBase ent = ItemBase.Cast( GetFocusedItem() );
+		ItemBase item_in_hands = ItemBase.Cast(	GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+		
+		return ( ItemManager.GetCombinationFlags( item_in_hands, ent ) != 0 );
+	}
+	
+	bool CanCombineAmmo()
+	{
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		ItemBase ent = ItemBase.Cast(  GetFocusedItem() );
+		ItemBase item_in_hands = ItemBase.Cast(	GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+		ActionManagerClient amc;
+		Class.CastTo(amc, m_player.GetActionManager());
+
+		return ( amc.CanPerformActionFromInventory( item_in_hands, ent ) );
+	}
+	
+	bool CanEquip()
+	{
+		EntityAI entity = ItemBase.Cast( GetFocusedItem() );
+		InventoryLocation il = new InventoryLocation;
+		if( !entity || entity.IsInherited( Magazine ) )
+		{
+			return false;
+		}
+		return GetGame().GetPlayer().GetInventory().FindFreeLocationFor( entity, FindInventoryLocationType.ATTACHMENT, il );
+	}
+	
+	bool Combine()
+	{
+		ItemBase ent = ItemBase.Cast( GetFocusedItem() );
+		ItemBase item_in_hands = ItemBase.Cast(	GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+		Icon hands_icon = ItemManager.GetInstance().GetHandsPreview().GetIcon();
+		
+		if ( item_in_hands && ent && hands_icon )
+		{
+			return hands_icon.CombineItems( item_in_hands, ent );
+		}
+		
+		return false;
+	}
+	
+	bool SplitItem()
+	{
+		ItemBase entity = ItemBase.Cast( GetFocusedItem() );
+		if( entity && !entity.IsInherited( Magazine ) && !GetFocusedSlotsIcon().IsOutOfReach() )
+		{
+			if( entity.HasQuantity() )
+			{
+				entity.OnRightClick();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	bool EquipItem()
+	{
+		ItemBase entity = ItemBase.Cast( GetFocusedItem() );
+		if( entity && !entity.IsInherited( Magazine ) && !GetFocusedSlotsIcon().IsOutOfReach() )
+		{
+			GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.ATTACHMENT, entity );
+			return true;
+		}
+		return false;
+	}
+	
+	bool TransferItem()
+	{
+		EntityAI entity = GetFocusedItem();
+		if( entity && !GetFocusedSlotsIcon().IsOutOfReach() )
+		{
+			GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, entity );
+			return true;
+		}
+		return false;
+	}
+	
+	bool InspectItem()
+	{
+		EntityAI entity = GetFocusedItem();
+		if( entity )
+		{
+			m_Parent.InspectItem( entity );
+			return true;
+		}
+		return false;
+	}
+	
+	bool TransferItemToVicinity()
+	{
+		ItemBase item = ItemBase.Cast(GetFocusedItem());
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer());
+		if (item && !GetFocusedSlotsIcon().IsOutOfReach() )
+		{
+			if (item.GetTargetQuantityMax() < item.GetQuantity())
+				item.SplitIntoStackMaxClient( null, -1 );
+			else
+				player.PhysicalPredictiveDropItem(item);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsActive()
+	{
+		return m_Parent.GetMainWidget().FindAnyWidget("AttachmentsWrapper").GetAlpha() > 0;
+	}
+	
+	int GetAttachmentHeight()
+	{
+		return m_AttachmentsContainer.Count();
+	}
+	
+	void UpdateInterval()
+	{
+		SlotsIcon icon;
+		int slot_id;
+		m_AttachmentSlotDisplayable.Clear();
+		int i = 0;
+		for (i = m_AttachmentSlotNames.Count() - 1; i >=0; --i)
+		{
+			slot_id = InventorySlots.GetSlotIdFromString( m_AttachmentSlotNames[i] );
+			if (m_Entity.CanDisplayAttachmentSlot(slot_id))
+			{
+				m_AttachmentSlotDisplayable.Insert(m_AttachmentSlotNames[i]);
+			}
+			else
+			{
+				icon = m_AttachmentSlots.Get( slot_id );
+				if (icon)
+				{
+					icon.GetMainWidget().Show( false );
+					if( GetFocusedSlotsIcon() == icon )
+					{
+						SetDefaultFocus();
+					}
+					// radial icon (collabsable icon handling)
+					icon.UpdateInterval();
+				}
+			}
+			
+		}
+		
+		if ( m_AttachmentSlotDisplayable.Count() == 0 )
+		{
+			if (m_Parent)
+			{
+				m_Parent.UpdateRadialIcon();
+				//m_Parent.Close();
+			}
+		}
+		
+		for (i = 0; i < m_AttachmentSlotDisplayable.Count(); ++i)
+		{
+			slot_id = InventorySlots.GetSlotIdFromString( m_AttachmentSlotDisplayable[i] );
+			icon = m_AttachmentSlots.Get( slot_id );
+			EntityAI item = icon.GetEntity();
+			icon.GetMainWidget().Show( true );
+			icon.UpdateInterval();
+			if ( item )
+			{
+				bool draggable = true;
+				if(icon.IsReserved())
+				{
+					draggable = false;
+				}
+				
+				if( m_Entity.GetInventory().GetSlotLock( slot_id ) && ItemManager.GetInstance().GetDraggedItem() != item )
+				{
+					icon.GetMountedWidget().Show( true );
+					draggable = false;
+				}
+				else
+				{
+					icon.GetMountedWidget().Show( false );
+				}
+				
+				PlayerBase p = PlayerBase.Cast( GetGame().GetPlayer() );
+				bool in_hands_condition		= m_Entity.GetHierarchyRoot() && item.GetInventory().CanRemoveEntity();
+				bool in_vicinity_condition	= !m_Entity.GetHierarchyRoot() && AttachmentsOutOfReach.IsAttachmentReachable( m_Entity, m_AttachmentSlotDisplayable[i] );
+				if( in_hands_condition || in_vicinity_condition )
+				{
+					icon.GetOutOfReachWidget().Show( false );
+				}
+				else
+				{
+					icon.GetOutOfReachWidget().Show( true );
+					draggable = false;
+				}
+				
+				if( draggable )
+				{
+					icon.GetPanelWidget().SetFlags( WidgetFlags.DRAGGABLE );
+				}
+				else
+				{
+					icon.GetPanelWidget().ClearFlags( WidgetFlags.DRAGGABLE );
+				}
+			}
+		}
+		m_AttachmentsContainer.GetRootWidget().Update();
+	}
+	
+	array<int> GetSlotsSorted()
+	{
+		return m_AttachmentIDOrdered;
+	}
+	
+	void AttachmentAdded(EntityAI item, string slot, EntityAI parent)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString(slot);
+		SlotsIcon icon = m_AttachmentSlots.Get(slot_id);
+		if (icon)
+		{
+			icon.SetSlotID(slot_id);
+			icon.SetSlotDisplayName(InventorySlots.GetSlotDisplayName(slot_id));
+			if (item)
+			{
+				icon.Init(item);
+			}
+		}
+	}
+	
+	void AttachmentRemoved(EntityAI item, string slot, EntityAI parent)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString(slot);
+		SlotsIcon icon = m_AttachmentSlots.Get(slot_id);
+		if (icon)
+		{
+			icon.Clear();
+		}
+	}
+	
+	void OnAttachmentReservationSet( EntityAI item, int slot_id )
+	{
+		SlotsIcon icon = m_AttachmentSlots.Get( slot_id );
+		
+		if (item)
+		{
+			icon.Init( item, true );
+		}
+	}
+	
+	void OnAttachmentReservationRelease( EntityAI item, int slot_id )
+	{
+		SlotsIcon icon = m_AttachmentSlots.Get( slot_id );
+		icon.Clear();
+	}
+	
+
+	void InitAttachmentGrid( int att_row_index )
+	{
+		SlotsIcon icon;
+		int i;
+		m_RowIndex = att_row_index;
+
+		int number_of_rows = Math.Ceil( m_AttachmentSlotNames.Count() / ITEMS_IN_ROW );
+		string name = m_Entity.GetDisplayName();
+		name.ToUpper();
+		
+		m_AttachmentsContainer = new AttachmentsWrapper( m_Parent );
+		m_AttachmentsContainer.SetParent( this );
+		m_AttachmentsContainer.SetFalseAttachmentsHeaderText(name);
+		m_AttachmentsContainer.GetRootWidget().SetSort( att_row_index );
+		m_Parent.Insert( m_AttachmentsContainer, att_row_index );
+		
+		for ( i = 0; i < number_of_rows; i++ )
+		{
+			SlotsContainer ic = new SlotsContainer( m_AttachmentsContainer, m_Entity );
+			m_AttachmentsContainer.Insert( ic );
+
+			if( i == ( number_of_rows - 1 ) && m_AttachmentSlotNames.Count() % ITEMS_IN_ROW != 0 )
+			{
+				ic.SetColumnCount( m_AttachmentSlotNames.Count() % ITEMS_IN_ROW );
+			}
+			else
+			{
+				ic.SetColumnCount( ITEMS_IN_ROW );
+			}
+
+			for( int j = 0; j < ITEMS_IN_ROW; j++ )
+			{
+				icon = ic.GetSlotIcon( j );
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetMainWidget(), m_Parent, "OnDropReceivedFromHeader2" );
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetGhostSlot(), m_Parent, "OnDropReceivedFromHeader2" );
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetPanelWidget(), m_Parent, "OnDropReceivedFromHeader2" );
+
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetMainWidget(), m_Parent, "DraggingOverHeader" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetGhostSlot(), m_Parent, "DraggingOverHeader" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetPanelWidget(), m_Parent, "DraggingOverHeader" );
+				
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( icon.GetMainWidget(), m_Parent, "MouseClick2" );
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( icon.GetGhostSlot(), m_Parent, "MouseClick2" );
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( icon.GetPanelWidget(), m_Parent, "MouseClick2" );
+			}
+		}
+
+		for ( i = 0; i < m_AttachmentSlotNames.Count(); i++ )
+		{
+			icon = SlotsContainer.Cast( m_AttachmentsContainer.Get( ( i / ITEMS_IN_ROW ) ) ).GetSlotIcon( i % ITEMS_IN_ROW );
+			WidgetEventHandler.GetInstance().RegisterOnDoubleClick( icon.GetPanelWidget(), m_Parent, "DoubleClick" );
+			
+			string path = "CfgSlots" + " Slot_" + m_AttachmentSlotNames[i];
+
+			//Show different magazine icon for firearms and pistols
+			if ( m_AttachmentSlotNames[i] == "magazine" )
+			{
+				if ( !m_Entity.IsInherited( Pistol_Base ) )
+					path = "CfgSlots" + " Slot_" + "magazine2";
+			}
+			
+			string icon_name = ""; //icon_name must be in format "set:<setname> image:<imagename>"
+			if( GetGame().ConfigGetText( path + " ghostIcon", icon_name ) && icon_name != "" )
+				icon.GetGhostSlot().LoadImageFile( 0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY,icon_name) );
+			int slot_id = InventorySlots.GetSlotIdFromString( m_AttachmentSlotNames[i] );
+			m_AttachmentSlots.Insert( slot_id, icon );
+			m_AttachmentIDOrdered.Insert(slot_id);
+			
+			icon.SetSlotID(slot_id);
+			icon.SetSlotDisplayName(InventorySlots.GetSlotDisplayName(slot_id));
+			
+			EntityAI item = m_Entity.GetInventory().FindAttachment( slot_id );
+			if( item )
+				AttachmentAdded( item, m_AttachmentSlotNames[i], m_Entity );
+			else
+				icon.Clear();
+			
+			if (m_Entity.CanDisplayAttachmentSlot(slot_id))
+			{
+				icon.GetMainWidget().Show( true );
+			}
+			else
+			{
+				icon.GetMainWidget().Show( false );
+			}
+		}
+		
+		if( m_AttachmentSlotNames.Count() > 0 )
+		{
+			int row_index = number_of_rows - 1;
+			SlotsContainer row_last = SlotsContainer.Cast( m_AttachmentsContainer.Get( row_index ) );
+			if( row_last )
+			{
+				for( int k = ((m_AttachmentSlotNames.Count() - 1) % ITEMS_IN_ROW) + 1; k < ITEMS_IN_ROW; k++ )
+				{
+					row_last.GetSlotIcon( k ).GetMainWidget().Show( false );
+				}
+				row_last.GetRootWidget().Update();
+				row_last.GetRootWidget().GetParent().Update();
+			}
+		}
+		
+		m_AttachmentsContainer.RecomputeOpenedContainers();
+	}
+
+	array<string> GetItemSlots( EntityAI e )
+	{
+		TStringArray searching_in = new TStringArray;
+		searching_in.Insert( CFG_VEHICLESPATH );
+		searching_in.Insert( CFG_WEAPONSPATH );
+		searching_in.Insert( CFG_MAGAZINESPATH );
+
+		array<string> attachments_slots	= new array<string>;
+		int i = 0;
+		for ( int s = 0; s < searching_in.Count(); ++s )
+		{
+			string cfg_name = searching_in.Get( s );
+			string path = cfg_name + " " + e.GetType();
+
+			if ( GetGame().ConfigIsExisting( path ) )
+			{
+				GetGame().ConfigGetTextArray( path + " attachments", attachments_slots );
+				if ( e.IsWeapon() && (!e.ConfigIsExisting("DisplayMagazine") || e.ConfigGetBool("DisplayMagazine")) )
+				{
+					attachments_slots.Insert( "magazine" );
+				}
+
+				return attachments_slots;
+			}
+		}
+		if ( e.IsWeapon() && (!e.ConfigIsExisting("DisplayMagazine") || e.ConfigGetBool("DisplayMagazine")) )
+		{
+			attachments_slots.Insert( "magazine" );
+		}
+
+		return attachments_slots;
+	}
+	
+	void ShowFalseAttachmentsHeader(bool show)
+	{
+		m_AttachmentsContainer.ShowFalseAttachmentsHeader(show);
+	}
+	
+	void SetFalseAttachmentsHeaderText(string text)
+	{
+		m_AttachmentsContainer.SetFalseAttachmentsHeaderText(text);
+	}
+	
+	TextWidget GetFalseHeaderTextWidget()
+	{
+		return m_AttachmentsContainer.GetFalseHeaderTextWidget();
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ColorManager.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ColorManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..1475af402e0018292005e91608ed2bb85b97154e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ColorManager.c
@@ -0,0 +1,75 @@
+class ColorManager
+{
+	private ref static ColorManager m_Instance;
+	
+	static int COLOR_NORMAL_TEXT		= ARGB( 255, 255, 255, 255 );
+	static int COLOR_NORMAL_PANEL		= ARGB( 140, 0, 0, 0 );
+	static int COLOR_HIGHLIGHT_TEXT		= ARGB( 255, 200, 0, 0 );
+	static int COLOR_HIGHLIGHT_PANEL	= ARGB( 255, 0, 0, 0 );
+	static int COLOR_SELECTED_TEXT		= ARGB( 255, 255, 255, 255 );
+	static int COLOR_SELECTED_PANEL		= ARGB( 255, 200, 0, 0 );
+    static int COLOR_DISABLED_TEXT		= ARGB( 100, 255, 255, 255 );
+	static int COLOR_DISABLED_PANEL		= ARGB( 140, 0, 0, 0 );
+	
+	static int ITEM_BACKGROUND_COLOR = ARGB( 50, 255, 255, 255 );
+	static int BASE_COLOR = ARGB( 10, 255, 255, 255 );
+	static int RED_COLOR = ARGB( 150, 255, 1, 1 );
+	static int GREEN_COLOR = ARGB( 150, 1, 255, 1 );
+	static int SWAP_COLOR = ARGB( 150, 135, 206, 250 );
+	static int FSWAP_COLOR = ARGB( 150, 35, 106, 150 );
+	static int COMBINE_COLOR = ARGB( 150, 255, 165, 0 );
+	
+	void ColorManager()
+	{
+		m_Instance = this;
+	}
+	
+	static ColorManager GetInstance()
+	{
+		return m_Instance;
+	}
+	
+	void SetColor( Widget w, int color )
+	{
+		if ( w.FindAnyWidget( "Cursor" ) )
+		{
+			w.FindAnyWidget( "Cursor" ).SetColor( color );
+		}
+		else
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Cursor" );
+			Widget w2 = w.GetParent().FindAnyWidget( name );
+			if( w2 )
+			{
+				w2.SetColor( color );
+			}
+		}
+	}
+	
+	int GetItemColor( ItemBase item )
+	{
+		int color = -1;
+		ItemBase dragged_item = ItemBase.Cast( ItemManager.GetInstance().GetDraggedItem() );
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		if ( dragged_item )
+			return 0;
+		
+		// if item icon is main icon (view, viewgrid )
+		if ( item.GetHierarchyParent() && item.GetHierarchyParent() != player )
+		{
+			color = -1;
+		}
+
+		if ( item ) 
+		{
+			float temperature = item.GetTemperature();
+			if ( temperature )
+			{
+				color = GetTemperatureColor( temperature );
+			}
+		}
+		return color;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/CargoContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/CargoContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..82dd02776da3cb3338770996853195cce8e53bf4
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/CargoContainer.c
@@ -0,0 +1,967 @@
+//cargo grid wrapper
+class CargoContainer extends Container
+{
+	protected const int ROWS_NUMBER_XBOX = 5;
+	
+	protected CargoBase												m_Cargo;
+	protected int													m_CargoIndex = -1;
+	
+	protected int													m_FocusedItemPosition = -1;
+	protected ref array<ref CargoContainerRow>						m_Rows;
+	protected ref array<ref Icon>									m_Icons;
+	protected ref map<EntityAI, ref Param3<ref Icon, int, int>>		m_ShowedItemPositions;
+	protected ref map<EntityAI, ref Param3<ref Icon, int, int>>		m_ShowedLockPositions;
+	
+	protected float													m_IconSize;
+	protected float													m_SpaceSize;
+	
+	protected bool													m_IsAttachment;
+	protected TextWidget											m_FalseHeaderTextWidget;
+	protected TextWidget											m_AlternateFalseHeaderTextWidget; //to be set and updated along with the main one
+	protected Widget												m_CargoHeader;
+	protected Widget												m_CargoContainer;
+	protected Widget												m_ItemsContainer;
+#ifndef PLATFORM_CONSOLE
+	protected ref SizeToChild										m_Resizer1;
+#endif
+	protected ref SizeToChild										m_Resizer2;
+	protected ref Timer												m_ResizeTimer;
+	
+	void CargoContainer( LayoutHolder parent, bool is_attachment = false )
+	{
+		m_IsAttachment			= is_attachment;
+		m_Rows					= new array<ref CargoContainerRow>;
+		m_Icons					= new array<ref Icon>;
+		m_ShowedItemPositions	= new map<EntityAI, ref Param3<ref Icon, int, int>>;
+		m_ShowedLockPositions	= new map<EntityAI, ref Param3<ref Icon, int, int>>;
+		
+		m_CargoContainer		= m_RootWidget.FindAnyWidget( "grid_background" );
+		m_ItemsContainer		= m_RootWidget.FindAnyWidget( "grid_overlay" );
+		m_CargoHeader			= m_RootWidget.FindAnyWidget( "grid_container_header_spacer" );
+#ifndef PLATFORM_CONSOLE
+		m_RootWidget.GetScript( m_Resizer1 );
+#endif		
+		m_RootWidget.FindAnyWidget( "grid_container" ).GetScript( m_Resizer2 );
+		m_CargoHeader.Show( is_attachment );
+		m_FalseHeaderTextWidget = TextWidget.Cast(m_CargoHeader.FindAnyWidget( "TextWidget0" ));
+		
+		m_MainWidget			= m_CargoContainer;
+		m_FocusedItemPosition	= -1;
+	}
+	
+	void ~CargoContainer()
+	{
+		if ( m_Entity )
+		{
+			m_Entity.GetOnItemAddedIntoCargo().Remove( AddedToCargo );
+			m_Entity.GetOnItemRemovedFromCargo().Remove( RemovedFromCargo );
+			m_Entity.GetOnItemMovedInCargo().Remove( MovedInCargo );
+			m_Entity.GetOnSetLock().Remove( SetLock );
+			m_Entity.GetOnReleaseLock().Remove( ReleaseLock );
+		}
+	}
+	
+	int GetCargoIndex() { return m_CargoIndex; }
+	
+	void AddedToCargoEx( EntityAI item, bool refresh = true )
+	{
+		InventoryLocation il = new InventoryLocation;
+		item.GetInventory().GetCurrentInventoryLocation( il );
+		int x = il.GetCol();
+		int y = il.GetRow();
+		
+		if ( m_ShowedItemPositions.Contains( item ) )
+		{
+			Param3<ref Icon, int, int> item_pos = m_ShowedItemPositions.Get( item );
+			InitIconEx( item_pos.param1, item, x, y, refresh );
+			item_pos.param2 = x;
+			item_pos.param3 = y;
+		}
+		else
+		{
+			ref Icon icon = new Icon( this, false );
+			m_Icons.Insert( icon );
+			InitIconEx( icon, item, x, y, refresh );
+			m_ShowedItemPositions.Insert( item, new Param3<ref Icon, int, int>( icon, x, y ) );
+		}
+		
+		if (refresh)
+			UpdateHeaderText();
+		
+		#ifdef PLATFORM_CONSOLE
+		for ( int i = 0; i < m_Cargo.GetItemCount(); i++ )
+		{
+			EntityAI item2 = m_Cargo.GetItem( i );
+			Param3<ref Icon, int, int> data = m_ShowedItemPositions.Get( item2 );
+			if ( data )
+			{
+				data.param1.SetCargoPos( i );
+				data.param1.SetPos();
+			}
+		}
+		
+		m_FocusedItemPosition = Math.Min( m_ShowedItemPositions.Count() - 1, m_FocusedItemPosition );
+		
+		if (refresh)
+			Refresh();
+		#endif
+	}
+	
+	void AddedToCargo( EntityAI item )
+	{
+		AddedToCargoEx( item );
+	}
+	
+	void RemovedFromCargo( EntityAI item )
+	{
+		Param3<ref Icon, int, int> data = m_ShowedItemPositions.Get( item );
+		if( data )
+		{
+			m_Icons.RemoveItem( data.param1 );
+			m_ShowedItemPositions.Remove( item );
+		}
+		
+		UpdateHeaderText();
+		
+		#ifdef PLATFORM_CONSOLE
+		for( int i = 0; i < m_Cargo.GetItemCount(); i++ )
+		{
+			EntityAI item2 = m_Cargo.GetItem( i );
+			data = m_ShowedItemPositions.Get( item2 );
+			if( data && data.param1 )
+			{
+				data.param1.SetCargoPos( i );
+				data.param1.SetPos();
+			}
+		}
+		
+		m_FocusedItemPosition = Math.Min( m_ShowedItemPositions.Count() - 1, m_FocusedItemPosition );
+		
+		Refresh();
+		#endif
+	}
+	
+	void MovedInCargo( EntityAI item )
+	{
+		InventoryLocation il = new InventoryLocation;
+		item.GetInventory().GetCurrentInventoryLocation( il );
+		
+		int x = il.GetCol();
+		#ifdef PLATFORM_CONSOLE
+		int y = il.GetRow() - 1;
+		#else
+		int y = il.GetRow();
+		#endif
+		if( m_ShowedItemPositions.Contains( item ) )
+		{
+			ref Param3<ref Icon, int, int> data = m_ShowedItemPositions.Get( item );
+			if( data.param1 )
+			{
+				if( data.param2 != x || data.param3 != y )
+				{
+					data.param2 = x;
+					data.param3 = y;
+					#ifdef PLATFORM_CONSOLE
+						data.param1.SetCargoPos( data.param3 );
+					#endif
+					#ifdef PLATFORM_WINDOWS
+					data.param1.SetPosX( data.param2 );
+					data.param1.SetPosY( data.param3 );
+					#endif
+				}
+				data.param1.UpdateInterval();
+			}
+		}
+		UpdateSelection();
+	}
+	
+	void SetLock( EntityAI item )
+	{
+		#ifndef PLATFORM_CONSOLE
+		if( GetGame().GetPlayer() )
+		{
+			InventoryLocation il = new InventoryLocation;
+			int index = GetGame().GetPlayer().GetHumanInventory().FindUserReservedLocationIndex( item );
+			if( index >= 0 )
+			{
+				GetGame().GetPlayer().GetHumanInventory().GetUserReservedLocation( index, il );
+				
+				ref Icon icon = new Icon( this, false );
+				m_Icons.Insert( icon );
+				icon.InitLock( m_Entity, item, il.GetCol(), il.GetRow(), il.GetFlip() );
+				m_ShowedLockPositions.Insert( item, new Param3<ref Icon, int, int>( icon, 1, 1 ) );
+				item.GetOnReleaseLock().Insert( ReleaseLock );
+			}
+		}
+		#endif
+	}
+	
+	void ReleaseLock( EntityAI item )
+	{
+		#ifndef PLATFORM_CONSOLE
+		if( m_ShowedLockPositions.Contains( item ) )
+		{
+			Icon ic	= m_ShowedLockPositions.Get( item ).param1;
+			m_Icons.RemoveItem( ic );
+			m_ShowedLockPositions.Remove( item );
+			item.GetOnReleaseLock().Remove( ReleaseLock );
+		}
+		#endif
+	}
+	
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.CargoContainerXbox;
+		#else
+			switch( InventoryMenu.GetWidthType() )
+			{
+				case ScreenWidthType.NARROW:
+				{
+					m_LayoutName = WidgetLayoutName.CargoContainerNarrow;
+					break;
+				}
+				case ScreenWidthType.MEDIUM:
+				{
+					m_LayoutName = WidgetLayoutName.CargoContainerMedium;
+					break;
+				}
+				case ScreenWidthType.WIDE:
+				{
+					m_LayoutName = WidgetLayoutName.CargoContainerWide;
+					break;
+				}
+			}
+		#endif
+			
+	}
+	
+	void SetEntity( EntityAI item, int cargo_index = 0, bool immedUpdate = true )
+	{
+		if ( item )
+		{
+			m_Entity		= item;
+			m_Cargo			= item.GetInventory().GetCargoFromIndex(cargo_index);
+			m_CargoIndex	= cargo_index;
+			
+			m_Entity.GetOnItemAddedIntoCargo().Insert( AddedToCargo );
+			m_Entity.GetOnItemRemovedFromCargo().Insert( RemovedFromCargo );
+			m_Entity.GetOnItemMovedInCargo().Insert( MovedInCargo );
+			m_Entity.GetOnSetLock().Insert( SetLock );
+			m_Entity.GetOnReleaseLock().Insert( ReleaseLock );
+			
+			if (immedUpdate)
+				UpdateHeaderText();
+
+			InitGridHeight();
+			m_MainWidget	= m_ItemsContainer;
+			
+			if ( m_Cargo )
+			{
+				int i;
+				int prev_count = m_ShowedItemPositions.Count();
+				
+				//START - Add new item Icons
+				for ( i = 0; i < m_Cargo.GetItemCount(); i++ )
+				{
+					EntityAI cargo_item = m_Cargo.GetItem( i );
+					if ( cargo_item )
+					{
+						AddedToCargoEx( cargo_item, immedUpdate );
+					}
+				}
+				
+				#ifdef PLATFORM_CONSOLE
+				if (immedUpdate)
+					Refresh();
+				#endif
+			}
+		}
+	}
+	
+	EntityAI GetEntity()
+	{
+		return m_Entity;
+	}
+	
+	void UpdateHeaderText()
+	{
+		Widget header;
+		string name = m_Entity.GetDisplayName();
+		name.ToUpper();
+		
+		if ( m_Entity.CanDisplayCargo() && m_Entity.GetInventory().GetCargoFromIndex(m_CargoIndex) )
+		{
+			name = name + " (" + GetCargoCapacity().ToString() + "/" + GetMaxCargoCapacity() + ")";
+			if ( m_IsAttachment && m_CargoHeader )
+			{
+				m_FalseHeaderTextWidget.SetText(name);
+				float x, y;
+				m_FalseHeaderTextWidget.Update();
+				m_FalseHeaderTextWidget.GetScreenSize( x, y );
+				m_CargoHeader.FindAnyWidget( "grid_container_header" ).SetSize( 1, y + InventoryMenu.GetHeightMultiplied( 10 ) );
+				m_CargoHeader.Update();
+				
+				if (m_AlternateFalseHeaderTextWidget)
+				{
+					m_AlternateFalseHeaderTextWidget.SetText(name);
+				}
+				return;
+			}
+		}
+		
+		if ( Container.Cast( GetParent() ) && Container.Cast( GetParent() ).GetHeader() )
+			Container.Cast( GetParent() ).GetHeader().SetName(name);
+	}
+	
+	void InitGridHeight()
+	{
+		m_Rows.Clear();
+		m_ShowedItemPositions.Clear();
+		
+		ref CargoContainerRow row;
+		
+		#ifdef PLATFORM_CONSOLE
+		int cargo_height = 	1;
+		#else
+		int cargo_height = 	m_Entity.GetInventory().GetCargoFromIndex(m_CargoIndex).GetHeight();
+		#endif
+		
+		for ( int j = 0; j < cargo_height; j++ )
+		{
+			row = new CargoContainerRow( this );
+			
+			row.SetNumber( j );
+			row.SetEntity( m_Entity );
+			
+			#ifdef PLATFORM_WINDOWS
+			#ifndef PLATFORM_CONSOLE
+			row.SetWidth( m_Entity.GetInventory().GetCargoFromIndex(m_CargoIndex).GetWidth(), false );
+			#endif
+			#endif
+			
+			row.GetRootWidget().SetSort( j, false );
+			m_Rows.Insert( row );
+		}
+		
+		float y;
+		row.GetRootWidget().FindAnyWidget( "Icon0" ).GetScreenSize( y, m_IconSize );
+		#ifdef PLATFORM_WINDOWS
+		#ifndef PLATFORM_CONSOLE
+			row.GetRootWidget().FindAnyWidget( "Spacer0" ).GetScreenSize( m_SpaceSize, y );
+		#endif
+		#endif
+		
+		m_Resizer2.ResizeParentToChild();
+#ifndef PLATFORM_CONSOLE
+		m_Resizer1.ResizeParentToChild();
+#endif
+	}
+	
+	void UpdateSize()
+	{
+#ifndef PLATFORM_CONSOLE
+		m_Resizer1.ResizeParentToChild();
+#else
+		m_Resizer2.ResizeParentToChild();
+#endif
+	}
+	
+	float GetIconSize()
+	{
+		return m_IconSize;
+	}
+	
+	float GetSpaceSize()
+	{
+		return m_SpaceSize;
+	}
+	
+	int GetCargoCapacity()
+	{
+		#ifdef PLATFORM_CONSOLE
+		#ifndef PLATFORM_WINDOWS
+			return CargoList.Cast( m_Cargo ).GetTotalWeight( null );
+		#endif
+		#endif
+		int total_size = 0;
+		for ( int i = 0; i < m_Cargo.GetItemCount(); ++i )
+		{
+			int x, y;
+			m_Cargo.GetItemSize( i, x, y );
+			total_size += x * y;
+		}
+		return total_size;
+	}
+	
+	int GetMaxCargoCapacity()
+	{
+		#ifdef PLATFORM_CONSOLE
+		#ifndef PLATFORM_WINDOWS
+			return CargoList.Cast( m_Cargo ).GetMaxWeight();
+		#endif
+		#endif
+		return m_Cargo.GetWidth() * m_Cargo.GetHeight();
+	}
+	
+	Icon GetIcon( EntityAI item )
+	{
+		if ( item && m_ShowedItemPositions.Contains( item ) )
+		{
+			Param3<ref Icon, int, int> data = m_ShowedItemPositions.Get( item );
+			return data.param1;
+		}
+		return null;
+	}
+	
+	Icon GetIcon( int index )
+	{
+		if ( m_Cargo == null )
+		{
+			return null;
+		}
+
+		if ( index >= 0 && m_Cargo.GetItemCount() > index )
+			return GetIcon( m_Cargo.GetItem( index ) );
+		return null;
+	}
+	
+	Icon GetFocusedIcon()
+	{
+		return GetIcon( m_FocusedItemPosition );
+	}
+	
+	override float GetFocusedContainerHeight( bool contents = false )
+	{
+		float x, y;
+		if( contents && GetFocusedIcon() )
+			GetFocusedIcon().GetRootWidget().GetScreenSize( x, y );
+		else
+			GetRootWidget().GetScreenSize( x, y );
+		return y;
+	}
+	
+	override float GetFocusedContainerYPos( bool contents = false )
+	{
+		float x, y;
+		if( contents && GetFocusedIcon() )
+			GetFocusedIcon().GetRootWidget().GetPos( x, y );
+		else
+			GetRootWidget().GetPos( x, y );
+		return y;
+	}
+	
+	override float GetFocusedContainerYScreenPos( bool contents = false )
+	{
+		float x, y;
+		if( contents && GetFocusedIcon() )
+			GetFocusedIcon().GetRootWidget().GetScreenPos( x, y );
+		else
+			GetRootWidget().GetScreenPos( x, y );
+		return y;
+	}
+	
+	void UpdateSelection()
+	{
+		if( m_IsActive )
+		{
+			if( m_FocusedItemPosition >= m_Icons.Count() )
+				m_FocusedItemPosition = m_Icons.Count() - 1;
+			Icon icon = GetIcon( m_FocusedItemPosition );
+			if( icon && !icon.IsActive() )
+			{
+				icon.SetActive( true );
+				Inventory.GetInstance().UpdateConsoleToolbar();
+			}
+		}
+	}
+	
+	void UpdateRowVisibility( int count )
+	{
+		int i;
+		int rows = Math.Max( 1, Math.Ceil( (count + 1) / ROWS_NUMBER_XBOX ) );
+		int diff = rows - m_Rows.Count();
+		
+		if( diff < 0 )
+		{
+			for( i = m_Rows.Count() - 1; i >= rows; i-- )
+			{
+				m_Rows.Remove( i );
+			}
+		}
+		else if( diff > 0 )
+		{
+			m_MainWidget	= m_CargoContainer;
+			for( i = m_Rows.Count(); i < rows; i++ )
+			{
+				ref CargoContainerRow row = new CargoContainerRow( this );
+				
+				row.SetNumber( i );
+				row.SetEntity( m_Entity );
+				row.GetRootWidget().SetSort( i );
+				m_Rows.Insert( row );
+			}
+			m_MainWidget	= m_ItemsContainer;
+		}
+		
+		m_Resizer2.ResizeParentToChild();
+#ifndef PLATFORM_CONSOLE
+		m_Resizer1.ResizeParentToChild();
+#endif
+	}
+	
+	override void Refresh()
+	{
+		#ifdef PLATFORM_CONSOLE
+		if ( !m_ResizeTimer )
+			m_ResizeTimer = new Timer();
+		if ( m_ResizeTimer.IsRunning() )
+			m_ResizeTimer.Stop();
+		m_ResizeTimer.Run( 0.05, this, "RefreshImpl" );
+		#endif
+	}
+	
+	void RefreshImpl()
+	{
+		UpdateRowVisibility( m_ShowedItemPositions.Count() );
+		UpdateSelection();
+	}
+	
+	override void UpdateInterval()
+	{
+		foreach( Param3<ref Icon, int, int> data : m_ShowedItemPositions )
+		{
+			if( data.param1 )
+			{
+				data.param1.UpdateInterval();
+			}
+		}
+	}
+
+	Icon InitIconEx( Icon icon, EntityAI item, int pos_x, int pos_y, bool refresh = true )
+	{
+		#ifdef PLATFORM_CONSOLE
+			icon.SetSize( 1, 1 );
+			#ifdef PLATFORM_WINDOWS
+				pos_y = pos_y * 5 + pos_x;
+			#endif
+			icon.SetCargoPos( pos_y );
+			icon.SetPosY( pos_y );
+			icon.SetPosEx( refresh );
+		#else
+			int size_x, size_y;
+			GetGame().GetInventoryItemSize( InventoryItem.Cast( item ), size_x, size_y );
+		
+			if ( item.GetInventory().GetFlipCargo() )
+				icon.SetSize( size_y, size_x );
+			else
+				icon.SetSize( size_x, size_y );
+		
+			icon.SetPosX( pos_x );
+			icon.SetPosY( pos_y );
+			icon.SetPosEx( refresh );
+		#endif
+		icon.InitEx( item, refresh );
+		return icon;
+	}
+	
+	Icon InitIcon( Icon icon, EntityAI item, int pos_x, int pos_y )
+	{
+		return InitIconEx( icon, item, pos_x, pos_y );
+	}
+	
+	bool HasItem( EntityAI item )
+	{
+		return m_ShowedItemPositions.Contains( item );
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		if (CanDrop())
+		{
+			Man player = GetGame().GetPlayer();
+			if( GetFocusedIcon() )
+			{
+				ItemBase item = ItemBase.Cast( GetFocusedIcon().GetObject() );
+				if( item && player.CanDropEntity( item ) )
+				{
+					if( item.GetTargetQuantityMax() < item.GetQuantity() )
+						item.SplitIntoStackMaxClient( null, -1 );
+					else
+						player.PhysicalPredictiveDropItem( item );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override void SetDefaultFocus( bool while_micromanagment_mode = false )
+	{
+		super.SetDefaultFocus(while_micromanagment_mode);
+		
+		Unfocus();
+		m_FocusedItemPosition = 0;
+		UpdateSelection();
+	}
+	
+	override void SetLastFocus()
+	{
+		SetDefaultFocus();
+	}
+	
+	override void Unfocus()
+	{
+		Icon icon = GetFocusedIcon();
+		if ( icon )
+		{
+			icon.SetActive( false );
+		}
+	}
+	
+	override void UnfocusAll()
+	{
+		if( m_Icons )
+		{
+			foreach( Icon icon : m_Icons )
+			{
+				icon.SetActive( false );
+			}
+		}
+		m_FocusedItemPosition = 0;
+	}
+	
+	override void SetNextActive()
+	{
+		Unfocus();
+		int focused_row = m_FocusedItemPosition / ROWS_NUMBER_XBOX;
+		int max_row = ( m_Icons.Count() - 1) / ROWS_NUMBER_XBOX;
+		
+		if ( max_row > focused_row )
+		{
+			m_FocusedItemPosition += ROWS_NUMBER_XBOX;
+			if ( m_FocusedItemPosition >= m_Icons.Count() )
+			{
+				m_FocusedItemPosition = m_Icons.Count() - 1;
+			}
+			UpdateSelection();
+		}
+		else
+		{
+			SetActive(false);
+		}
+	}
+	
+	override void SetPreviousActive( bool force = false )
+	{
+		Unfocus();
+		int focused_row = m_FocusedItemPosition / ROWS_NUMBER_XBOX;
+		
+		if ( focused_row > 0 )
+		{
+			m_FocusedItemPosition = m_FocusedItemPosition - ROWS_NUMBER_XBOX;
+			UpdateSelection();
+		}
+		else
+		{
+			SetActive(false);
+		}
+	}
+
+	
+	override void SetNextRightActive()
+	{
+		if ( m_Icons.Count() > 0)
+		{
+			Unfocus();
+			int focused_row = m_FocusedItemPosition / ROWS_NUMBER_XBOX;
+			int row_min = focused_row * ROWS_NUMBER_XBOX;
+			int row_max = row_min + ROWS_NUMBER_XBOX - 1;
+			
+			if ( row_max >= m_Icons.Count() )
+			{
+				row_max = m_Icons.Count() - 1;
+			}
+		
+			m_FocusedItemPosition++;
+			if( m_FocusedItemPosition > row_max )
+			{
+				m_FocusedItemPosition = row_min;
+			}
+		
+			UpdateSelection();
+		}
+	}
+	
+	override void SetNextLeftActive()
+	{
+		if ( m_Icons.Count() > 0)
+		{
+			Unfocus();
+			int focused_row = m_FocusedItemPosition / ROWS_NUMBER_XBOX;
+			int row_min = focused_row * ROWS_NUMBER_XBOX;
+			int row_max = row_min + ROWS_NUMBER_XBOX - 1;
+			
+			if ( row_max >= m_Icons.Count() )
+			{
+				row_max = m_Icons.Count() - 1;
+			}
+		
+			m_FocusedItemPosition--;
+			if( m_FocusedItemPosition < row_min )
+			{
+				m_FocusedItemPosition = row_max;
+			}
+		
+			UpdateSelection();
+		}
+	}
+	
+	override EntityAI GetFocusedItem()
+	{
+		Icon icon = GetFocusedIcon();
+		if( icon )
+		{
+			return EntityAI.Cast( icon.GetObject() );
+		}
+			
+		return null;
+	}
+	
+	override void SetLastActive()
+	{
+		super.SetLastActive();
+		if( GetFocusedIcon() )
+		{
+			GetFocusedIcon().SetActive( false );
+		}
+		m_FocusedItemPosition = ( ( m_Rows.Count() - 1 ) * ROWS_NUMBER_XBOX );
+		UpdateSelection();
+	}
+	
+	override void SetActive( bool active )
+	{
+		super.SetActive( active );
+		UpdateSelection();
+	}
+	
+	override bool IsItemActive()
+	{
+		if( GetFocusedIcon() )
+		{
+			ItemBase item = ItemBase.Cast( GetFocusedIcon().GetObject() );
+			return ( item != null );
+		}
+		return false;
+	}
+	
+	override bool IsItemWithQuantityActive()
+	{
+		if( GetFocusedIcon()  )
+		{
+			ItemBase item = ItemBase.Cast( GetFocusedIcon().GetObject() );
+			return ( !IsEmpty() && QuantityConversions.HasItemQuantity( item ) && item.CanBeSplit() );
+		}
+		return false;
+	}
+	
+	override bool IsEmpty()
+	{
+		return m_Icons.Count() == 0;
+	}
+	
+	int GetRecipeCount( bool recipe_anywhere, ItemBase entity1, ItemBase entity2, PlayerBase player )
+	{
+		PluginRecipesManager recipes_manager = PluginRecipesManager.Cast( GetPlugin( PluginRecipesManager ) );
+		return recipes_manager.GetValidRecipes( entity1, entity2, null, player );
+	}
+	
+	override bool CanCombineAmmo()
+	{
+		if( GetFocusedIcon() )
+		{
+			ActionManagerClient amc	= ActionManagerClient.Cast( PlayerBase.Cast( GetGame().GetPlayer() ).GetActionManager() );
+			
+			ItemBase entity			= ItemBase.Cast( GetFocusedIcon().GetObject() );
+			ItemBase item_in_hands	= ItemBase.Cast( GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+			
+			return ( amc.CanPerformActionFromInventory( item_in_hands, entity ) || amc.CanSetActionFromInventory( item_in_hands, entity ) );
+		}
+		return false;
+	}
+	
+	override bool TransferItem()
+	{
+		if (CanTakeToInventory())
+		{
+			if (GetFocusedIcon())
+			{
+				EntityAI entity = EntityAI.Cast( GetFocusedIcon().GetObject() );
+				if (entity)
+				{
+					GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, entity );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool SplitItem()
+	{
+		if (CanSplit())
+		{
+			if ( GetFocusedIcon() )
+			{
+				ItemBase entity = ItemBase.Cast( GetFocusedIcon().GetObject() );
+				if ( entity )
+				{
+					if ( entity.HasQuantity() && entity.CanBeSplit() )
+					{
+						entity.OnRightClick();
+						Icon icon = m_ShowedItemPositions.Get( entity ).param1;
+						
+						if ( icon )
+						{
+							icon.SetQuantity();
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool EquipItem()
+	{
+		if (CanEquip())
+		{	
+			if (GetFocusedIcon())
+			{
+				ItemBase entity = ItemBase.Cast( GetFocusedIcon().GetObject() );
+				if( entity )
+				{
+					GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.ATTACHMENT, entity );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool SelectItem()
+	{
+		Icon focused_item = GetFocusedIcon();
+		if (focused_item)
+		{
+			ItemBase item = ItemBase.Cast(focused_item.GetObject());
+			if (item && item.IsTakeable() && item.CanPutIntoHands(null))
+			{
+				ItemManager.GetInstance().SetSelectedItemEx(item, this, focused_item);
+				return true;
+			}
+		}
+		return false;
+	}
+
+	override bool Select()
+	{
+		EntityAI focused_item = GetFocusedItem();
+		EntityAI selected_item = ItemManager.GetInstance().GetSelectedItem();
+		DayZPlayer player = GetGame().GetPlayer();
+		
+		
+		if( focused_item != selected_item )
+		{
+			if( selected_item )
+			{
+				if( selected_item.GetInventory().CanRemoveEntity() && m_Entity )
+				{
+					bool can_add = m_Entity.GetInventory().CanAddEntityInCargo( selected_item, selected_item.GetInventory().GetFlipCargo());
+					bool in_cargo = !player.GetInventory().HasEntityInInventory( selected_item ) || !m_Entity.GetInventory().HasEntityInCargo( selected_item );
+					if( can_add && in_cargo )
+					{
+						player.PredictiveTakeEntityToTargetCargo( m_Entity, selected_item );
+						Container selected_cont2 = ItemManager.GetInstance().GetSelectedContainer();
+						if( selected_cont2 )
+						{
+							selected_cont2.SetActive( false );
+						}
+						
+						SetActive( true );
+						m_FocusedItemPosition = 0;
+						return true;
+					}
+					else
+					{
+						Container selected_cont = ItemManager.GetInstance().GetSelectedContainer();
+						if( selected_cont )
+						{
+							selected_cont.SetActive( false );
+						}
+						
+						SetActive( true );
+						SetDefaultFocus( true );
+					}
+				}
+			}
+			else if ( focused_item && focused_item.GetInventory().CanRemoveEntity() )
+			{
+				EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+				if( item_in_hands )
+				{
+					if( GameInventory.CanSwapEntitiesEx( item_in_hands, focused_item ) )
+					{
+						player.PredictiveSwapEntities( item_in_hands, focused_item );
+						return true;
+					}
+				}
+				else
+				{
+					if( player.GetHumanInventory().CanAddEntityInHands( focused_item ) )
+					{
+						player.PredictiveTakeEntityToHands( focused_item );
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool Combine()
+	{
+		if (CanCombine())
+		{
+			if (GetFocusedIcon())
+			{
+				Icon icon = GetFocusedIcon();
+				if( icon )
+				{
+					EntityAI item_in_hands	= GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+					EntityAI prev_item		= EntityAI.Cast( icon.GetObject() );
+					if( item_in_hands && prev_item )
+					{
+						return icon.CombineItems( item_in_hands, prev_item );
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	void ShowFalseCargoHeader(bool show)
+	{
+		m_CargoHeader.Show(show);
+	}
+	
+	void SetAlternateFalseTextHeaderWidget(TextWidget w)
+	{
+		bool update = !m_AlternateFalseHeaderTextWidget;
+		m_AlternateFalseHeaderTextWidget = w;
+		if (update)
+		{
+			UpdateHeaderText();
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/CargoContainerRow.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/CargoContainerRow.c
new file mode 100644
index 0000000000000000000000000000000000000000..b7bdbb9bab0f4031435e366582a5b7a26b8fc450
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/CargoContainerRow.c
@@ -0,0 +1,656 @@
+class CargoContainerRow: LayoutHolder
+{
+	protected int 				m_NumberRow;
+	protected int				m_NumberColumnFocused;
+	protected int				m_Width;
+	protected int				m_MaxColumns;
+	
+	protected EntityAI			m_Entity;	
+	
+	protected CargoContainer	m_ParentContainer;
+	protected ref SizeToChild	m_Resizer1;
+	protected ref SizeToParent	m_Resizer2;
+	
+	void CargoContainerRow( LayoutHolder parent )
+	{
+		m_ParentContainer = CargoContainer.Cast( parent );
+		#ifdef PLATFORM_CONSOLE
+		m_MaxColumns = 5;
+		#else
+		m_MaxColumns = 10;
+		#endif
+		
+		for ( int i = 0; i < m_MaxColumns; i++ )
+		{
+			Widget iconWidget = GetMainWidget().FindAnyWidget( "Icon" + i );
+			
+			iconWidget.SetUserID(i);
+			
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived( iconWidget,  this, "DropReceived" );
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver( iconWidget,  this, "DraggingOver" );
+		}
+		
+		m_RootWidget.GetScript( m_Resizer1 );
+		m_RootWidget.FindAnyWidget( "SpacerTop" ).GetScript( m_Resizer2 );
+	}
+	
+	void UnfocusAll()
+	{
+		for ( int i = 0; i < m_MaxColumns; i++ )
+		{
+			//GetMainWidget().FindAnyWidget( "Cursor" + i ).Show( false );
+			#ifdef PLATFORM_WINDOWS
+			#ifndef PLATFORM_CONSOLE
+			#ifndef SERVER_FOR_CONSOLE
+			CargoGrid grid = CargoGrid.Cast(m_Entity.GetInventory().GetCargo());
+			if(grid)
+			{
+				
+				EntityAI entity = grid.FindEntityInCargoOn( m_NumberRow, i );
+				if( entity )
+				{
+					Icon icon = m_ParentContainer.GetIcon( entity );
+					
+					if( icon )
+					{
+						icon.SetActive( false );
+					}
+				}
+				else
+				{
+					GetMainWidget().FindAnyWidget( "Cursor" + i ).Show( false );
+				}
+			}
+			#endif
+			#endif
+			#endif
+		}
+		
+		m_NumberColumnFocused = 0;
+	}
+	
+	void SetFocus( int column )
+	{	
+		m_NumberColumnFocused = column;
+		
+		//GetMainWidget().FindAnyWidget( "Cursor" + column ).Show( true );
+		
+		// Show selector
+		#ifdef PLATFORM_WINDOWS
+		#ifndef PLATFORM_CONSOLE
+		#ifndef SERVER_FOR_CONSOLE
+		CargoGrid grid = CargoGrid.Cast(m_Entity.GetInventory().GetCargo());
+		if(grid)
+		{
+			EntityAI focused_item_new = grid.FindEntityInCargoOn( m_NumberRow, m_NumberColumnFocused );
+			if( focused_item_new )
+			{
+				Icon icon = m_ParentContainer.GetIcon( focused_item_new );
+				
+				if( icon )
+				{
+					icon.SetActive( true );
+				}			
+			}
+			else
+			{
+				GetMainWidget().FindAnyWidget( "Cursor" + column ).Show( true );
+			}
+		}
+		#endif
+		#endif
+		#endif
+	}
+	
+	bool GetIconSize(int row, int column, out int width, out int height)
+	{
+		#ifdef PLATFORM_WINDOWS
+		#ifndef PLATFORM_CONSOLE
+		#ifndef SERVER_FOR_CONSOLE
+		CargoGrid grid = CargoGrid.Cast(m_Entity.GetInventory().GetCargo());
+		if(grid)
+		{
+			EntityAI focused_item_new = grid.FindEntityInCargoOn( row, column );
+			if( focused_item_new )
+			{
+				Icon icon = m_ParentContainer.GetIcon( focused_item_new );
+				
+				if( icon )
+				{
+					width = icon.GetSizeX();
+					height = icon.GetSizeY();
+					
+					return true;
+				}
+			}
+		}
+		#endif
+		#endif
+		#endif
+		
+		return false;
+	}
+	
+	int GetFocusedColumn()
+	{
+		return m_NumberColumnFocused;
+	}
+
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.CargoContainerRowXbox;
+		#else
+			switch( InventoryMenu.GetWidthType() )
+			{
+				case ScreenWidthType.NARROW:
+				{
+					m_LayoutName = WidgetLayoutName.CargoContainerRowNarrow;
+					break;
+				}
+				case ScreenWidthType.MEDIUM:
+				{
+					m_LayoutName = WidgetLayoutName.CargoContainerRowMedium;
+					break;
+				}
+				case ScreenWidthType.WIDE:
+				{
+					m_LayoutName = WidgetLayoutName.CargoContainerRowWide;
+					
+					break;
+				}
+			}
+		#endif
+		
+	}
+	
+	void SetEntity( EntityAI entity )
+	{
+		m_Entity = entity;
+	}
+	
+	void DropReceived( Widget w, int x, int y, Widget receiver )
+	{
+		if ( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, receiver.GetUserID() );
+		}
+		else if ( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, receiver.GetUserID(), m_ParentContainer );
+		}
+		else if ( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, receiver.GetUserID(), m_ParentContainer );
+		}
+		else if ( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, receiver.GetUserID(), m_ParentContainer );
+		}
+	}
+	
+	void DraggingOver( Widget w, int x, int y, Widget receiver )
+	{
+		if ( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, receiver.GetUserID(), null );
+		}
+		else if ( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, receiver.GetUserID(), null, m_ParentContainer );
+		}
+		else if ( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, receiver.GetUserID(), null, m_ParentContainer );
+		}
+		else if ( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, receiver.GetUserID(), null, m_ParentContainer );
+		}
+	}
+	
+	//NOT used - obsolete (all ColumnOnDraggingOver and Column methods)
+	//!!----
+	void ColumnOnDraggingOver0( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 0, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 0, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 0, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 0, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver1( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 1, null );
+		}		
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 1, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 1, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 1, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver2( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 2, null );
+		}		
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 2, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 2, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 2, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver3( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 3, null );
+		}		
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 3, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 3, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 3, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver4( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 4, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 4, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 4, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 4, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver5( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 5, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 5, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 5, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 5, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver6( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 6, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 6, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 6, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 6, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver7( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 7, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 7, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 7, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 7, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver8( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 8, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 8, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 8, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 8, null, m_ParentContainer );
+		}
+	}
+	
+	void ColumnOnDraggingOver9( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			ContainerWithCargo.Cast( m_Parent.m_Parent ).DraggingOverGrid( w, m_NumberRow, 9, null );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 9, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 9, null, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DraggingOverGrid( w, m_NumberRow, 9, null, m_ParentContainer );
+		}
+	}
+	
+	void Column0( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 0 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 0, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 0, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 0, m_ParentContainer );
+		}
+	}
+	
+	void Column1( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 1 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 1, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 1, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 1, m_ParentContainer );
+		}
+	}
+	
+	void Column2( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 2 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 2, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 2, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 2, m_ParentContainer );
+		}
+	}
+	
+	void Column3( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 3 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 3, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 3, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 3, m_ParentContainer );
+		}
+	}
+	
+	void Column4( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 4 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 4, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 4, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 4, m_ParentContainer );
+		}
+	}
+	
+	void Column5( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 5 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 5, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 5, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 5, m_ParentContainer );
+		}
+	}
+	
+	void Column6( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 6 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 6, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 6, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 6, m_ParentContainer );
+		}
+	}
+	
+	void Column7( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 7 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 7, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 7, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 7, m_ParentContainer );
+		}
+	}
+	
+	void Column8( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 8 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 8, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 8, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 8, m_ParentContainer );
+		}
+	}
+	
+	void Column9( Widget w )
+	{
+		if( m_Parent.m_Parent.IsInherited( ContainerWithCargo ) )
+		{
+			( ContainerWithCargo.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 9 );
+		}
+		else if( m_Parent.m_Parent.IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			( ContainerWithCargoAndAttachments.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 9, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( HandsContainer ) )
+		{
+			( HandsContainer.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 9, m_ParentContainer );
+		}
+		else if( m_Parent.m_Parent.IsInherited( AttachmentCategoriesRow ) )
+		{
+			( AttachmentCategoriesRow.Cast( m_Parent.m_Parent ) ).DropReceived( w, m_NumberRow, 9, m_ParentContainer );
+		}
+	}
+	//!!----
+	
+	override void OnShow()
+	{
+		GetRootWidget().Show( true );
+	}
+	
+	override void OnHide()
+	{
+		GetRootWidget().Show( false );
+	}
+	
+	void SetNumber( int number )
+	{
+		m_NumberRow = number;
+	}
+	
+	int GetWidth()
+	{
+		return m_Width;
+	}
+
+	void SetWidth( int width, bool immedUpdate = true )
+	{
+		m_Width = width;
+		int i;
+		
+		for ( i = width; i < m_MaxColumns; i++ )
+		{
+			GetMainWidget().FindAnyWidget( "Icon" + i ).Show( false, false );
+			GetMainWidget().FindAnyWidget( "Spacer" + i ).Show( false, false );
+		}
+		
+		GetMainWidget().FindAnyWidget( "Spacer10" ).Show( m_Width != 0, false );
+		
+		if (immedUpdate)
+		{			
+			m_Resizer2.Refresh();
+			GetMainWidget().Update();	
+		}
+		
+		m_Resizer1.ResizeParentToChild();	
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/HandsPreview.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/HandsPreview.c
new file mode 100644
index 0000000000000000000000000000000000000000..74599b2c7d7327e29fa6f7c3f7d9a083e3f9198e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/HandsPreview.c
@@ -0,0 +1,190 @@
+class HandsPreview: Container
+{
+	protected ref Icon	m_Icon;
+	protected EntityAI	m_AttachmentsInitialized;
+	
+	protected float		m_IconSize;
+
+	protected ItemBase	m_Item
+
+	void HandsPreview( LayoutHolder parent )
+	{
+		GetGame().GetPlayer().GetOnItemAddedToHands().Insert( CreateNewIcon );
+		GetGame().GetPlayer().GetOnItemRemovedFromHands().Insert( DeleteIcon );
+	}
+	
+	void ~HandsPreview()
+	{
+		GetGame().GetPlayer().GetOnItemAddedToHands().Remove( CreateNewIcon );
+		GetGame().GetPlayer().GetOnItemRemovedFromHands().Remove( DeleteIcon );
+	}
+
+	void RefreshQuantity( EntityAI m_Item_to_refresh )
+	{
+		if ( m_Icon )
+		{
+			m_Icon.SetQuantity();
+		}
+	}
+	
+	override EntityAI GetFocusedItem()
+	{
+		return m_Item;
+	}
+
+	Icon GetIcon()
+	{
+		return m_Icon;
+	}
+	
+	override void SetDefaultFocus(bool while_micromanagment_mode = false)
+	{
+		super.SetDefaultFocus(while_micromanagment_mode);
+		if ( m_Icon )
+			m_Icon.SetActive(true);
+	}
+	
+	override void SetLastFocus()
+	{
+		super.SetLastFocus();
+		if ( m_Icon )
+			m_Icon.SetActive(true);
+	}
+	
+	override void Unfocus()
+	{
+		super.Unfocus();
+		if ( m_Icon )
+			m_Icon.SetActive(false);
+	}
+	
+	float GetIconSize()
+	{
+		return m_IconSize;
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.HandsPreview;
+	}
+
+	void RemoveItem()
+	{
+		delete m_Icon;
+		m_Item = null;
+	}
+
+	override void UpdateInterval()
+	{
+		bool show_combine_swap = ItemManager.GetInstance().IsDragging();
+
+		#ifdef PLATFORM_CONSOLE
+		if ( m_Icon && !m_Icon.IsDragged() && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() )
+		#else
+		if ( m_Icon && !m_Icon.IsDragged() )
+		#endif
+		{
+			m_Icon.GetMainWidget().FindAnyWidget( "Combine" ).Show(  show_combine_swap );
+			m_Icon.GetMainWidget().FindAnyWidget( "Swap" ).Show( show_combine_swap );
+		}
+		
+		if ( m_Icon )
+		{
+			m_Icon.UpdateInterval();
+		}
+	}
+
+	void CreateNewIcon( ItemBase item )
+	{
+		float y;
+		GetRootWidget().GetParent().GetParent().GetParent().GetParent().GetScreenSize( m_IconSize, y );
+		m_IconSize = m_IconSize / 10;
+		
+		m_Icon = new Icon( this, true );
+		m_Icon.Refresh();
+		if ( m_Icon )
+		{
+			m_Item = item;
+			m_Icon.Init( m_Item );
+			m_Icon.FullScreen();
+			( HandsContainer.Cast( m_Parent ) ).ShowAtt( m_Item );
+			m_Icon.Refresh();
+		}
+		
+		m_RootWidget.SetColor( ARGB( 180, 0, 0, 0 ) );
+		m_Parent.GetParent().Refresh();
+		Inventory.GetInstance().UpdateConsoleToolbar();
+		
+		HandsContainer parent = HandsContainer.Cast( m_Parent );
+		HandsHeader header = HandsHeader.Cast( parent.GetHeader() );
+
+		if( m_Item && !m_Item.GetInventory().GetCargo() )
+		{
+			string display_name = m_Item.GetDisplayName();
+			display_name.ToUpper();
+			header.SetName( display_name );
+		}
+	}
+	
+	void DeleteIcon()
+	{
+		RemoveItem();
+		( HandsContainer.Cast( m_Parent ) ).DestroyAtt();
+		( HandsContainer.Cast( m_Parent ) ).DestroyCargo();
+		( HandsContainer.Cast( m_Parent ) ).RemoveItem();
+		m_AttachmentsInitialized = null;
+		m_RootWidget.SetColor( ARGB( 166, 80, 80, 80 ) );
+		m_Parent.GetParent().Refresh();
+		Inventory.GetInstance().UpdateConsoleToolbar();
+	}
+	
+	override bool SelectItem()
+	{
+		if( m_Item )
+		{
+			ItemManager.GetInstance().SetSelectedItemEx(m_Item, null, null);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool Select()
+	{
+		Man player = GetGame().GetPlayer();
+		EntityAI item_in_hands = m_Item;
+		if( ItemManager.GetInstance().IsMicromanagmentMode() )
+		{
+			EntityAI selected_item = ItemManager.GetInstance().GetSelectedItem();
+			if( selected_item && selected_item.GetInventory().CanRemoveEntity() )
+			{
+				if(item_in_hands && item_in_hands.GetInventory().CanRemoveEntity())
+				{
+					if( GameInventory.CanSwapEntitiesEx( item_in_hands, selected_item ) )
+					{
+						player.PredictiveSwapEntities( item_in_hands, selected_item );
+						return true;
+					}
+				}
+				else
+				{
+					if ( player.GetHumanInventory().CanAddEntityInHands( selected_item ) && selected_item.GetInventory().CanRemoveEntity())
+					{
+			 			ItemBase item_base = ItemBase.Cast( selected_item );
+						float stackable = item_base.GetTargetQuantityMax();
+						if (stackable == 0 || item_base.GetQuantity() <= stackable)
+						{
+							GetGame().GetPlayer().PredictiveTakeEntityToHands( item_base );		
+							return true;
+						}
+						else if( stackable != 0 && stackable <= item_base.GetQuantity() )
+						{
+							item_base.SplitIntoStackMaxHandsClient(PlayerBase.Cast( GetGame().GetPlayer() ));
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/ClosableHeader.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/ClosableHeader.c
new file mode 100644
index 0000000000000000000000000000000000000000..e847a02d5ad663c02d7de4041f17606c8302eb99
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/ClosableHeader.c
@@ -0,0 +1,190 @@
+class ClosableHeader: Header
+{
+	protected float			m_SquareSize;
+	protected int			m_DefaultSort;
+	
+	protected Widget		m_MovePanel;
+	protected Widget		m_PanelWidget;
+	protected Widget		m_DragRender;
+	protected ButtonWidget	m_MoveUp;
+	protected ButtonWidget	m_MoveDown;
+	
+	protected bool			m_IsInLocalEquipment;
+	
+	void ClosableHeader( LayoutHolder parent, string function_name )
+	{
+		m_MovePanel	= GetMainWidget().FindAnyWidget( "MovePanel" );
+		m_PanelWidget	= GetMainWidget().FindAnyWidget( "PanelWidget" );
+		m_DragRender	= GetMainWidget().FindAnyWidget( "Drag_Render" );
+		m_MoveUp	= ButtonWidget.Cast( GetMainWidget().FindAnyWidget( "MoveUp" ) );
+		m_MoveDown	= ButtonWidget.Cast( GetMainWidget().FindAnyWidget( "MoveDown" ) );
+		
+		WidgetEventHandler.GetInstance().RegisterOnClick( m_MoveUp,  m_Parent, "MoveContainerUp" );
+		WidgetEventHandler.GetInstance().RegisterOnClick( m_MoveDown,  m_Parent, "MoveContainerDown" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_MoveUp,  this, "MouseLeave" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_MoveDown,  this, "MouseLeave" );
+		
+		WidgetEventHandler.GetInstance().RegisterOnDrag( GetMainWidget() ,  this, "OnDragHeader" );
+		WidgetEventHandler.GetInstance().RegisterOnDrop( GetMainWidget() ,  this, "OnDropHeader" );
+		
+		WidgetEventHandler.GetInstance().RegisterOnMouseEnter( GetMainWidget(),  this, "MouseEnter" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( GetMainWidget(),  this, "MouseLeave" );
+		
+		float temp;
+		GetMainWidget().GetScreenSize( temp, m_SquareSize );
+		
+		m_DefaultColor			= m_PanelWidget.GetColor();
+		m_DefaultFontSize		= 20;
+		
+		if( GetParent() && GetParent().GetParent() && GetParent().GetParent().GetParent() )
+			m_IsInLocalEquipment	= GetParent().GetParent().GetParent().IsInherited( RightArea );
+	}
+	
+	void ~ClosableHeader()
+	{
+		if( InventoryItem.Cast( m_Entity ) )
+			InventoryItem.Cast( m_Entity ).GetOnItemFlipped().Remove( UpdateFlip );
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.ClosableHeader;
+	}
+	
+	override void SetName( string name )
+	{
+		name.ToUpper();
+		
+		m_HeaderText.SetText( name );
+		m_HeaderText.Update();
+		
+		float x, y;
+		m_HeaderText.GetScreenSize( x, y );
+		m_PanelWidget.SetSize( 1, y + InventoryMenu.GetHeightMultiplied( 10 ) );
+	}
+	
+	void OnDragHeader( Widget w, int x, int y )
+	{
+		ClosableContainer parent = ClosableContainer.Cast( m_Parent );
+		if( parent && GetMainWidget() && m_Entity )
+		{
+			ItemPreviewWidget item_preview_drag = ItemPreviewWidget.Cast( m_DragRender );
+			item_preview_drag.SetFlags(WidgetFlags.EXACTPOS );
+			m_DefaultSort = GetRootWidget().GetSort();
+			item_preview_drag.GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().GetParent().AddChild( GetRootWidget() );
+			if( item_preview_drag && m_Entity )
+			{
+				item_preview_drag.SetItem( m_Entity );
+				item_preview_drag.SetView( m_Entity.GetViewIndex() );
+			}
+			
+			ItemManager.GetInstance().SetIsDragging( true );
+			
+			parent.HideContent( true );
+			
+			m_PanelWidget.Show( false );
+			if( item_preview_drag )
+				item_preview_drag.Show( true );
+			
+			int ww, hh;
+			GetGame().GetInventoryItemSize( InventoryItem.Cast( m_Entity ), ww, hh );
+			if( item_preview_drag )
+			{
+				m_Entity.GetOnItemFlipped().Insert( UpdateFlip );
+				if( m_Entity.GetInventory().GetFlipCargo() )
+				{
+					item_preview_drag.SetSize( hh * m_SquareSize, ww * m_SquareSize );
+				}
+				else
+				{
+					item_preview_drag.SetSize( ww * m_SquareSize, hh * m_SquareSize );
+				}
+			}
+		}
+	}
+	
+	void UpdateFlip( bool flipped )
+	{
+		ItemPreviewWidget item_preview_drag = ItemPreviewWidget.Cast( m_DragRender );
+		if( InventoryItem.Cast( m_Entity ) && item_preview_drag )
+		{
+			int ww, hh;
+			GetGame().GetInventoryItemSize( InventoryItem.Cast( m_Entity ), ww, hh );
+			if( flipped )
+			{
+				item_preview_drag.SetSize( hh * m_SquareSize, ww * m_SquareSize );
+			}
+			else
+			{
+				item_preview_drag.SetSize( ww * m_SquareSize, hh * m_SquareSize );
+			}
+		}
+	}
+	
+	void OnDropHeader( Widget w )
+	{
+		ClosableContainer parent = ClosableContainer.Cast( m_Parent );
+		parent.GetMainWidget().AddChild( GetRootWidget() );
+		GetRootWidget().SetSort( 0 );
+		if( parent )
+		{
+			//
+			ItemPreviewWidget item_preview_drag = ItemPreviewWidget.Cast( m_DragRender );
+			if( item_preview_drag )
+			{
+				item_preview_drag.SetItem( null );//TODO: is this safe?
+			}
+			//
+			
+			m_PanelWidget.Show( true );
+			m_DragRender.Show( false );
+			
+			parent.ShowContent( true );
+			
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().SetIsDragging( false );
+		}
+		if( InventoryItem.Cast( m_Entity ) )
+			InventoryItem.Cast( m_Entity ).GetOnItemFlipped().Remove( UpdateFlip );
+	}
+	
+	bool MouseEnter(Widget w, int x, int y)
+	{
+		if( m_IsInLocalEquipment && !GetDragWidget() )
+		{
+			#ifdef PLATFORM_CONSOLE
+			m_MovePanel.Show( GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() );
+			#else
+			m_MovePanel.Show( true );
+			#endif
+		}
+		PrepareOwnedTooltip( m_Entity, x, y );
+		return true;
+	}
+
+	bool MouseLeave( Widget w, Widget enter_w, int x, int y	)
+	{
+		if( enter_w != m_MoveUp && enter_w != m_MoveDown && enter_w != m_CollapseButton )
+		{
+			if( m_IsInLocalEquipment )
+			{
+				m_MovePanel.Show( false );
+			}
+		}
+		HideOwnedTooltip();
+		return true;
+	}
+	
+	override void SetActive( bool active )
+	{
+		super.SetActive( active );
+		if( active )
+		{
+			m_PanelWidget.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		}
+		else
+		{
+			m_PanelWidget.SetColor( m_DefaultColor );
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/CollapsibleHeader.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/CollapsibleHeader.c
new file mode 100644
index 0000000000000000000000000000000000000000..ffd7fe9749f72450be1814ecf1770701ac4bfec4
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/CollapsibleHeader.c
@@ -0,0 +1,28 @@
+class CollapsibleHeader: Header
+{
+	void CollapsibleHeader( LayoutHolder parent, string function_name )
+	{
+		m_DefaultFontSize = 24;
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.CollapsibleHeader;
+	}
+	
+	void SetArrowButtonOpened(bool state)
+	{
+		m_UpArrowButton.Show(state);
+		m_DownArrowButton.Show(!state);
+	}
+	
+	bool IsHeaderVisible()
+	{
+		return m_MainWidget.IsVisible(); //m_MainWidget.IsVisibleHierarchy()
+	}
+	
+	void SetHeaderVisible(bool show)
+	{
+		m_MainWidget.Show(show);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/HandsHeader.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/HandsHeader.c
new file mode 100644
index 0000000000000000000000000000000000000000..288414710115a850893a261db68f26b23d308f27
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/HandsHeader.c
@@ -0,0 +1,54 @@
+class HandsHeader: Header
+{
+	protected bool		m_ForceHideCollapseButtons;
+	protected Widget	m_ItemHeader;
+	
+	void HandsHeader( LayoutHolder parent, string function_name )
+	{
+		m_DefaultFontSize	= 24;
+		m_ItemHeader		= m_MainWidget.FindAnyWidget( "hands_item_header" );
+		
+		m_MainWidget		= GetMainWidget().FindAnyWidget( "height_wrapper" );
+		m_DefaultColor		= GetMainWidget().GetColor();
+		#ifdef PLATFORM_CONSOLE
+		ShowCollapseButtons( false, true );
+		#endif
+	}
+	
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.HandsHeader;
+	}
+	
+	override void UpdateInterval()
+	{
+		PlayerBase p = PlayerBase.Cast( GetGame().GetPlayer() );
+		if (!p)
+			return;
+		
+		EntityAI item = p.GetHumanInventory().GetEntityInHands();
+		/*if ( !m_ForceHideCollapseButtons )
+		{
+			if ( item && !item.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) && item.HasCargo() )
+			{
+				ShowCollapseButtons( true );
+			}
+			else
+			{
+				ShowCollapseButtons( false );
+			}
+		}*/
+		
+		m_ItemHeader.Show( item != null );
+	}
+	
+	void ShowCollapseButtons( bool show, bool force = false )
+	{
+		m_ForceHideCollapseButtons = force;
+		#ifdef PLATFORM_CONSOLE
+		m_CollapseButton.Show( false );
+		#else
+		m_CollapseButton.Show( show );
+		#endif
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/Header.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/Header.c
new file mode 100644
index 0000000000000000000000000000000000000000..7b7b1b5f4dfd29de73e56411583e556a6f2eee97
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Headers/Header.c
@@ -0,0 +1,78 @@
+class Header: LayoutHolder
+{
+	protected int			m_DefaultColor;
+	protected int			m_DefaultFontSize;
+	
+	protected EntityAI		m_Entity;
+	
+	protected Widget		m_CollapseButton;
+	protected Widget		m_UpArrowButton;
+	protected Widget		m_DownArrowButton;
+	protected TextWidget	m_HeaderText;
+	
+	void Header( LayoutHolder parent, string function_name )
+	{
+		m_CollapseButton	= GetMainWidget().FindAnyWidget( "collapse_button" );
+		m_UpArrowButton		= GetMainWidget().FindAnyWidget( "opened" );
+		m_DownArrowButton	= GetMainWidget().FindAnyWidget( "closed" );
+		
+		#ifdef PLATFORM_CONSOLE
+			m_CollapseButton.Show( false );
+		#else
+		WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( m_CollapseButton,  m_Parent, function_name );
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( m_CollapseButton,  m_Parent, "OnDropReceivedFromHeader" );
+		#endif
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( GetMainWidget(),  m_Parent, "OnDropReceivedFromHeader" );
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( GetMainWidget(),  this, "DraggingOverHeader" );
+		
+		m_HeaderText		= TextWidget.Cast( GetMainWidget().FindAnyWidget( "TextWidget0" ) );
+		
+		m_DefaultColor		= GetRootWidget().GetColor();
+	}
+	
+	void SetName( string name )
+	{
+		name.ToUpper();
+		m_HeaderText.SetText( name );
+	}
+	
+	void SetItemPreview( EntityAI entity_ai )
+	{
+		#ifndef PLATFORM_CONSOLE
+		m_Entity = entity_ai;
+		ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( GetMainWidget().FindAnyWidget( "Render" ) );
+		item_preview.SetItem(entity_ai);
+		item_preview.SetView( entity_ai.GetViewIndex() );
+		#endif
+	}
+	
+	void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if ( w == null )
+			return;
+
+		Container parent_container = Container.Cast( m_Parent );
+		parent_container.DraggingOverHeader( w, x, y, receiver );
+	}
+
+	void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		Container parent_container = Container.Cast( m_Parent );
+		parent_container.OnDropReceivedFromHeader( w, x, y, receiver );
+	}
+	
+	override void SetActive( bool active )
+	{
+		super.SetActive( active );
+		
+		if ( active )
+			GetMainWidget().SetColor( ARGBF( 1, 1, 0, 0 ) );
+		else
+			GetMainWidget().SetColor( m_DefaultColor );
+	}
+	
+	void ShowCollapseButton(bool state)
+	{
+		m_CollapseButton.Show(state);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Icon.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Icon.c
new file mode 100644
index 0000000000000000000000000000000000000000..e2fd7b98b98dbc095de88d70573ca0665e2f4102
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/Icon.c
@@ -0,0 +1,1834 @@
+class Icon: LayoutHolder
+{
+	protected int					m_SizeX;
+	protected int					m_SizeY;
+	protected int					m_PosX;
+	protected int					m_PosY;
+	
+	protected EntityAI				m_Lock;
+	protected bool					m_IsWeapon			= false;
+	protected bool					m_IsMagazine		= false;
+	protected bool					m_HasTemperature	= false;
+	protected bool					m_HasQuantity		= false;
+	protected float					m_CurrQuantity		= -1;
+	
+	protected EntityAI				m_Obj;
+	protected ItemBase				m_Item;
+	protected bool					m_HandsIcon;
+	protected int					m_CargoPos;
+	protected bool					m_IsDragged;
+	protected bool					m_PreviousFlipOrientation;
+	
+	const int NUMBER_OF_TIMERS = 2;
+	
+	protected ItemPreviewWidget		m_ItemPreview;
+	
+	protected Widget				m_ColorWidget;
+	protected Widget				m_SelectedPanel;
+	protected Widget				m_MicromanagedPanel;
+	protected Widget				m_CursorWidget;
+	
+	protected Widget				m_QuantityPanel;
+	protected TextWidget			m_QuantityItem;
+	protected ProgressBarWidget		m_QuantityProgress;
+	protected Widget				m_QuantityStack;
+	
+	protected Widget				m_ItemSizePanel;
+	protected TextWidget			m_ItemSizeWidget;
+	
+	protected ref array<ImageWidget>m_AmmoIcons;
+	protected ImageWidget			m_AmmoTypeIcon;
+
+	void Icon( LayoutHolder parent, bool hands_icon = false )
+	{
+		m_HandsIcon = hands_icon;
+		ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+		
+		m_ItemPreview		= ItemPreviewWidget.Cast( GetMainWidget().FindAnyWidget( "Render" ));
+		
+		m_ColorWidget		= GetMainWidget().FindAnyWidget( "Color" );
+		m_SelectedPanel		= GetMainWidget().FindAnyWidget( "Selected" );
+		m_MicromanagedPanel	= GetMainWidget().FindAnyWidget( "Micromanaged" );
+		m_CursorWidget		= GetMainWidget().FindAnyWidget( "Cursor" );
+		
+		m_QuantityPanel		= GetMainWidget().FindAnyWidget( "QuantityPanel" );
+		m_QuantityItem		= TextWidget.Cast( GetMainWidget().FindAnyWidget( "Quantity" ) );
+		m_QuantityProgress	= ProgressBarWidget.Cast( GetMainWidget().FindAnyWidget( "QuantityBar" ) );
+		m_QuantityStack		= GetMainWidget().FindAnyWidget( "QuantityStackPanel" );
+		
+		m_ItemSizePanel		= GetMainWidget().FindAnyWidget( "ItemSizePanel" );
+		m_ItemSizeWidget	= TextWidget.Cast( GetMainWidget().FindAnyWidget( "ItemSize" ) );
+		
+		m_AmmoTypeIcon		= ImageWidget.Cast( GetMainWidget().FindAnyWidget( "AmmoTypeIcon" ) );
+		SetActive( false );
+	}
+	
+	void ~Icon()
+	{
+		if (m_Obj)
+		{
+			m_Obj.GetOnItemFlipped().Remove(UpdateFlip);
+			m_Obj.GetOnViewIndexChanged().Remove(SetItemPreview);
+		}
+		
+		if (m_IsDragged)
+		{
+			RevertToOriginalFlip();
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().SetIsDragging(false);
+			m_IsDragged = false;
+		}
+	}
+	
+	Widget GetSelectedWidget()
+	{
+		return m_SelectedPanel;
+	}
+	
+	Widget GetCursorWidget()
+	{
+		return m_CursorWidget;
+	}
+	
+	Widget GetMicromanagedPanel()
+	{
+		return m_MicromanagedPanel;
+	}
+
+	bool IsDragged()
+	{
+		return m_IsDragged;
+	}
+
+	override void SetActive( bool active )
+	{
+		super.SetActive(active);
+		if (active && GetObject())
+		{
+			float x, y;
+			GetMainWidget().GetScreenPos(x, y);
+			PrepareOwnedTooltip(EntityAI.Cast( GetObject() ), -1, y);
+		}
+		
+		m_SelectedPanel.Show(active);
+	}
+	
+	override void SetParentWidget()
+	{
+		#ifndef PLATFORM_CONSOLE
+		if (m_Parent.IsInherited(HandsPreview))
+		{ 
+			super.SetParentWidget();
+		}
+		else
+		{
+			if (m_Parent != null)
+			{
+				CargoContainer gridContainer = CargoContainer.Cast(m_Parent);
+				if (gridContainer)
+				{
+					m_ParentWidget = gridContainer.GetMainWidget();
+				}
+			}
+		}
+		#else
+		super.SetParentWidget();
+		#endif
+	}
+	
+	int GetRelevantInventoryAction(int relevantActions)
+	{
+		return 0;
+	
+	}
+
+	void RefreshQuickbar()
+	{
+		InventoryMenu menu = InventoryMenu.Cast(GetGame().GetUIManager().FindMenu(MENU_INVENTORY));
+		HideOwnedTooltip();
+		if (menu)
+		{
+			menu.RefreshQuickbar();
+		}
+	}
+
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+			if (controlledPlayer.GetInventory().HasInventoryReservation(m_Obj, null) || controlledPlayer.GetInventory().IsInventoryLocked() || controlledPlayer.IsItemsToDelete())
+				return;
+			
+			ItemPreviewWidget targetIpw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+			if (!targetIpw)
+			{
+				string name = w.GetName();
+				name.Replace("PanelWidget", "Render");
+				targetIpw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+			}
+			
+			if (!targetIpw)
+				targetIpw = ItemPreviewWidget.Cast(w);
+	
+			EntityAI targetEntity = targetIpw.GetItem();
+			if (targetIpw)
+			{
+				if (!targetEntity.GetInventory().CanRemoveEntity())
+					return;
+				
+				if (m_HandsIcon)
+				{
+					if (controlledPlayer.GetHumanInventory().CanRemoveEntityInHands())
+						controlledPlayer.PredictiveMoveItemFromHandsToInventory();
+	
+					RefreshQuickbar();
+	
+					return;
+				}
+		
+				EntityAI entityInHands = controlledPlayer.GetHumanInventory().GetEntityInHands();
+				EntityAI entityRootParent = targetEntity.GetHierarchyRoot();
+				
+				if (controlledPlayer.GetInventory().HasEntityInInventory(targetEntity) && controlledPlayer.GetHumanInventory().CanAddEntityInHands(targetEntity))
+				{
+					controlledPlayer.PredictiveTakeEntityToHands(targetEntity);
+				}
+				else if (entityInHands && entityRootParent == controlledPlayer)
+				{
+					InventoryLocation inventoryLocation = new InventoryLocation();
+					int index = controlledPlayer.GetHumanInventory().FindUserReservedLocationIndex(entityInHands);
+					if (index >= 0)
+						controlledPlayer.GetHumanInventory().GetUserReservedLocation(index, inventoryLocation);
+					
+					if (controlledPlayer.GetInventory().CanForceSwapEntitiesEx(targetEntity, null, entityInHands, inventoryLocation))
+					{
+						controlledPlayer.PredictiveForceSwapEntities(targetEntity, entityInHands, inventoryLocation);
+					}
+					else if (controlledPlayer.GetInventory().CanSwapEntitiesEx(targetEntity, entityInHands ))
+					{
+						controlledPlayer.PredictiveSwapEntities(targetEntity, entityInHands);
+					}
+					else
+					{
+						controlledPlayer.GetInventory().FindFreeLocationFor(targetEntity, FindInventoryLocationType.ANY, inventoryLocation);
+						if (inventoryLocation.IsValid() && controlledPlayer.GetInventory().LocationCanAddEntity(inventoryLocation))
+							SplitItemUtils.TakeOrSplitToInventoryLocation(controlledPlayer, inventoryLocation);
+					}
+				}
+				else
+				{
+					bool found = false;
+					if (targetEntity.GetInventory().CanRemoveEntity())
+					{
+						InventoryLocation i2 = new InventoryLocation();
+						found = controlledPlayer.GetInventory().FindFreeLocationFor(targetEntity, FindInventoryLocationType.ANY, i2);
+						if (found)
+						{
+							if (i2.GetType() == FindInventoryLocationType.ATTACHMENT)
+							{
+								if (i2.GetParent() != controlledPlayer)
+									found = false;
+							}
+						}
+					}
+	
+					if (found)
+					{
+						if (controlledPlayer.GetHumanInventory().CanAddEntityToInventory(targetEntity))
+							controlledPlayer.PredictiveTakeEntityToInventory(FindInventoryLocationType.ANY, targetEntity);
+					}
+					else
+					{
+						if (controlledPlayer.GetHumanInventory().CanAddEntityInHands(targetEntity))
+							controlledPlayer.PredictiveTakeEntityToHands(targetEntity);
+					}
+				}
+				
+				RefreshQuickbar();
+			}
+		}
+	}
+
+	void DraggingOverSwap( Widget w, int x, int y, Widget receiver )
+	{
+		if (w == null)
+		{
+			return;
+		}
+		
+		string name = w.GetName();
+		name.Replace("PanelWidget", "Render");
+
+		ItemPreviewWidget targetIpw = ItemPreviewWidget.Cast(receiver.FindAnyWidget( "Render" ));
+		if (m_HandsIcon)
+		{
+			targetIpw = ItemPreviewWidget.Cast(receiver.GetParent().FindAnyWidget( "Render" ));
+		}
+
+		ItemPreviewWidget selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+		if (selectedIpw == null)
+		{
+			selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+		}
+		
+		if (selectedIpw == null)
+		{
+			return;
+		}
+
+		InventoryItem targetEntity = InventoryItem.Cast(targetIpw.GetItem());
+		InventoryItem selectedEntity = InventoryItem.Cast(selectedIpw.GetItem());
+		if (!selectedEntity || !targetEntity)
+		{
+			return;
+		}
+		
+		InventoryLocation il = new InventoryLocation();
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		int index = player.GetHumanInventory().FindUserReservedLocationIndex(m_Item);
+		
+		if (index >= 0)
+		{	
+			player.GetHumanInventory().GetUserReservedLocation(index, il);
+			
+			if (GameInventory.CanForceSwapEntitiesEx(selectedEntity, null, targetEntity, il))
+			{
+				ColorManager.GetInstance().SetColor(w, ColorManager.FSWAP_COLOR);
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().ShowSourceDropzone(il.GetParent());
+				return;
+			}
+		}
+		static int testedFlags = InventoryCombinationFlags.SWAP | InventoryCombinationFlags.FSWAP;
+		
+		int chosenInventoryAction = ItemManager.GetChosenCombinationFlag(selectedEntity, targetEntity, testedFlags, il);
+		UpdateFrameColor(selectedEntity, targetEntity, chosenInventoryAction, w, il);
+	}
+
+	void DraggingOverCombine(Widget w, int x, int y, Widget receiver)
+	{
+		if (w == null)
+		{
+			return;
+		}
+		
+		ItemPreviewWidget selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+		if (!selectedIpw)
+		{
+			string name = w.GetName();
+			name.Replace("PanelWidget", "Render");
+			selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+		}
+		
+		if (!selectedIpw)
+		{
+			selectedIpw = ItemPreviewWidget.Cast(w);
+		}
+		
+		if (!selectedIpw.GetItem())
+		{
+			return;
+		}
+		EntityAI selectedEntity = selectedIpw.GetItem();
+		EntityAI targetEntity = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+
+		static int testedFlags = InventoryCombinationFlags.SET_ACTION | InventoryCombinationFlags.PERFORM_ACTION | InventoryCombinationFlags.COMBINE_QUANTITY2 | InventoryCombinationFlags.ADD_AS_CARGO | InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+		
+		int chosenInventoryAction = ItemManager.GetChosenCombinationFlag(selectedEntity, targetEntity, testedFlags);
+		UpdateFrameColor(selectedEntity, targetEntity, chosenInventoryAction, w);
+	}
+
+	bool MouseEnter(Widget w, int x, int y)
+	{
+		if (!m_IsDragged)
+		{
+			PrepareOwnedTooltip(m_Obj, x, y);
+			m_CursorWidget.Show(true);
+		}
+		
+		return true;
+	}
+
+	bool MouseLeave( Widget w, Widget s, int x, int y)
+	{
+		HideOwnedTooltip();
+		if (!m_IsDragged)
+		{
+			m_CursorWidget.Show(false);
+		}
+		return true;
+	}
+
+	void DraggingOver( Widget w, int x, int y, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		
+		if (w == null)
+		{
+			return;
+		}
+		string name = w.GetName();
+		name.Replace("PanelWidget", "Render");
+
+		ItemPreviewWidget targetIpw = ItemPreviewWidget.Cast(receiver.FindAnyWidget( "Render" ));
+		if (m_HandsIcon)
+		{
+			targetIpw = ItemPreviewWidget.Cast(receiver.GetParent().FindAnyWidget( "Render" ));
+		}
+
+		ItemPreviewWidget selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( name ));
+		if (selectedIpw == null)
+		{
+			selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( "Render" ));
+		}
+		if (selectedIpw == null)
+		{
+			return;
+		}
+
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		InventoryItem targetEntity = InventoryItem.Cast(targetIpw.GetItem());
+		InventoryItem selectedEntity = InventoryItem.Cast(selectedIpw.GetItem());
+		InventoryLocation ilDst;
+		if (!targetEntity || !selectedEntity)
+		{
+			return;
+		}
+		
+		if (m_Lock)
+		{
+			if (targetEntity == selectedEntity)
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else
+			{
+				CargoContainer parentContainer = CargoContainer.Cast(m_Parent);
+			
+				float parentX;
+				float parentY;
+			
+				parentContainer.GetRootWidget().GetScreenPos(parentX, parentY);
+			
+				float iconSize = parentContainer.GetIconSize();
+				float spaceSize = parentContainer.GetSpaceSize();
+			
+				int PosX = (x - parentX) / (iconSize + spaceSize);
+				int PosY = (y - parentY) / (iconSize + spaceSize);
+			
+				EntityAI parent = m_Lock;
+				CargoBase targetCargo 	= parent.GetInventory().GetCargo();
+			
+				ilDst = new InventoryLocation();			
+				ilDst.SetCargoAuto(targetCargo, selectedEntity, PosY, PosX, selectedEntity.GetInventory().GetFlipCargo());
+		
+				if (parent.GetInventory().LocationCanAddEntity(ilDst))
+				{
+					ColorManager.GetInstance().SetColor(w, ColorManager.GREEN_COLOR);
+					ItemManager.GetInstance().GetRightDropzone().SetAlpha(1);
+				}
+				else
+				{
+					ColorManager.GetInstance().SetColor(w, ColorManager.RED_COLOR);
+					ItemManager.GetInstance().ShowSourceDropzone(selectedEntity);
+				}
+			}
+		}
+		else 
+		{
+			static int testedFlags = InventoryCombinationFlags.COMBINE_QUANTITY2 | InventoryCombinationFlags.ADD_AS_CARGO | InventoryCombinationFlags.ADD_AS_ATTACHMENT | InventoryCombinationFlags.SWAP | InventoryCombinationFlags.FSWAP | InventoryCombinationFlags.SWAP_MAGAZINE;
+		
+			int chosenInventoryAction = ItemManager.GetChosenCombinationFlag(selectedEntity, targetEntity, testedFlags, ilDst);
+			UpdateFrameColor(selectedEntity, targetEntity, chosenInventoryAction, w, ilDst);
+		}
+	}
+
+	void OnPerformCombination( int combinationFlags )
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if (m_am_entity1 == null || m_am_entity2 == null) return;
+
+		if (combinationFlags == InventoryCombinationFlags.NONE) return;
+
+		Weapon_Base wpn;
+		Magazine mag;
+
+		if (combinationFlags & InventoryCombinationFlags.PERFORM_ACTION)
+		{
+			ActionManagerClient amc;
+			Class.CastTo(amc, player.GetActionManager());
+
+			if (m_am_entity1 == player.GetHumanInventory().GetEntityInHands())
+			{
+				amc.PerformActionFromInventory(ItemBase.Cast( m_am_entity1 ),ItemBase.Cast( m_am_entity2 ));
+			}
+			else
+			{
+				amc.PerformActionFromInventory(ItemBase.Cast( m_am_entity2 ),ItemBase.Cast( m_am_entity1 ));
+			}
+		}
+		else if (combinationFlags & InventoryCombinationFlags.SET_ACTION)
+		{
+			ActionManagerClient amc2;
+			Class.CastTo(amc2, player.GetActionManager());
+
+			if (m_am_entity1 == player.GetHumanInventory().GetEntityInHands())
+			{
+				amc2.SetActionFromInventory(ItemBase.Cast( m_am_entity1 ), ItemBase.Cast( m_am_entity2 ));
+			}
+			else
+			{
+				amc2.SetActionFromInventory(ItemBase.Cast( m_am_entity2 ), ItemBase.Cast( m_am_entity1 ));
+			}
+		}
+		else if (combinationFlags & InventoryCombinationFlags.COMBINE_QUANTITY2)
+		{
+			ItemBase entity = ItemBase.Cast(m_am_entity1);
+			entity.CombineItemsClient(ItemBase.Cast( m_am_entity2 ));
+		}
+		else if (combinationFlags & InventoryCombinationFlags.ADD_AS_ATTACHMENT)
+		{
+			float stackable = m_am_entity2.GetTargetQuantityMax(-1);
+		
+			if (stackable == 0 || stackable >= m_am_entity2.GetQuantity())
+			{
+				player.PredictiveTakeEntityToTargetAttachment(m_am_entity1, m_am_entity2);
+			}
+			else
+			{
+				InventoryLocation il = new InventoryLocation();
+				m_am_entity1.GetInventory().FindFreeLocationFor(m_am_entity2, FindInventoryLocationType.ATTACHMENT, il);
+				ItemBase.Cast(m_am_entity2).SplitIntoStackMaxToInventoryLocationClient(il);
+			}
+		}
+		else if (combinationFlags & InventoryCombinationFlags.ADD_AS_CARGO)
+		{
+			SplitItemUtils.TakeOrSplitToInventory(player, m_am_entity1, m_am_entity2);
+		}
+	}
+	
+	bool PerformCombination(EntityAI selectedEntity, EntityAI targetEntity, int combinationFlag, InventoryLocation ilSwapDst = null)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionManagerClient amc;
+		
+		switch (combinationFlag)
+		{
+			case InventoryCombinationFlags.ADD_AS_ATTACHMENT:
+				float stackable = targetEntity.GetTargetQuantityMax(-1);
+		
+				if (stackable == 0 || stackable >= targetEntity.GetQuantity())
+				{
+					return player.PredictiveTakeEntityToTargetAttachment(targetEntity, selectedEntity);
+				}
+				else
+				{
+					InventoryLocation il = new InventoryLocation();
+					targetEntity.GetInventory().FindFreeLocationFor(selectedEntity, FindInventoryLocationType.ATTACHMENT, il);
+					ItemBase.Cast(selectedEntity).SplitIntoStackMaxToInventoryLocationClient(il);
+					return true;
+				}
+				break;
+			case InventoryCombinationFlags.ADD_AS_CARGO:
+				SplitItemUtils.TakeOrSplitToInventory(player, targetEntity, selectedEntity);
+				return true;
+			case InventoryCombinationFlags.COMBINE_QUANTITY2:
+				targetEntity.CombineItemsClient(selectedEntity);
+				return true;
+			case InventoryCombinationFlags.SET_ACTION:
+				Class.CastTo(amc, player.GetActionManager());
+				if (targetEntity == player.GetHumanInventory().GetEntityInHands())
+				{
+					amc.SetActionFromInventory(ItemBase.Cast(targetEntity), ItemBase.Cast(selectedEntity));
+				}
+				else
+				{
+					amc.SetActionFromInventory(ItemBase.Cast(selectedEntity), ItemBase.Cast(targetEntity));
+				}
+				return true;
+			case InventoryCombinationFlags.PERFORM_ACTION:
+				Class.CastTo(amc, player.GetActionManager());
+				if (targetEntity == player.GetHumanInventory().GetEntityInHands())
+				{
+					amc.PerformActionFromInventory(ItemBase.Cast(targetEntity), ItemBase.Cast(selectedEntity));
+				}
+				else
+				{
+					amc.PerformActionFromInventory(ItemBase.Cast(selectedEntity), ItemBase.Cast(targetEntity));
+				}
+				return true;
+			case InventoryCombinationFlags.SWAP_MAGAZINE:
+				return player.GetWeaponManager().SwapMagazine(Magazine.Cast(selectedEntity));
+			case InventoryCombinationFlags.SWAP:
+				return player.PredictiveSwapEntities(targetEntity, selectedEntity);
+			case InventoryCombinationFlags.FSWAP:
+				return player.PredictiveForceSwapEntities(selectedEntity, targetEntity, ilSwapDst);
+			default:
+				return false;
+		}
+
+		return false;
+	}
+
+	void UpdateFrameColor(EntityAI selectedEntity, EntityAI targetEntity, int combinationFlag, Widget w, InventoryLocation il = null)
+	{
+		int color;
+		Widget targetDropzone;
+		
+		ItemManager.GetInstance().HideDropzones();
+		switch (combinationFlag)
+		{
+			case InventoryCombinationFlags.ADD_AS_ATTACHMENT:
+			case InventoryCombinationFlags.ADD_AS_CARGO:
+				color = ColorManager.GREEN_COLOR;
+				ItemManager.GetInstance().ShowSourceDropzone(targetEntity);
+				break;
+			case InventoryCombinationFlags.COMBINE_QUANTITY2:
+			case InventoryCombinationFlags.SET_ACTION:
+			case InventoryCombinationFlags.PERFORM_ACTION:
+				color = ColorManager.COMBINE_COLOR;
+				ItemManager.GetInstance().ShowSourceDropzone(targetEntity);
+				break;
+			case InventoryCombinationFlags.SWAP_MAGAZINE:
+				color = ColorManager.SWAP_COLOR;
+				ItemManager.GetInstance().ShowSourceDropzone(selectedEntity);
+				break;
+			case InventoryCombinationFlags.SWAP:
+				color = ColorManager.SWAP_COLOR;
+				ItemManager.GetInstance().ShowSourceDropzone(selectedEntity);
+				break;
+			case InventoryCombinationFlags.FSWAP:
+				color = ColorManager.FSWAP_COLOR;
+				if (il)
+				{
+					ItemManager.GetInstance().ShowSourceDropzone(il.GetParent());
+				}
+				else
+				{
+					ItemManager.GetInstance().ShowSourceDropzone(selectedEntity);
+				}
+				break;
+			default:
+				color = ColorManager.RED_COLOR;
+				ItemManager.GetInstance().ShowSourceDropzone(selectedEntity);
+		}
+
+		ColorManager.GetInstance().SetColor( w, color );
+	}
+
+	
+
+	void ShowActionMenuCombine( EntityAI entity1, EntityAI entity2, int combinationFlags, Widget w , bool color_test )
+	{
+		int lastFlag = 0;
+		ContextMenu cmenu = ContextMenu.Cast(GetGame().GetUIManager().GetMenu().GetContextMenu());
+		m_am_entity1 = entity1;
+		m_am_entity2 = entity2;
+		cmenu.Hide();
+		cmenu.Clear();
+		int id = -1;
+
+		if ( entity1 == null || entity2 == null ) return;
+
+		if ( combinationFlags == InventoryCombinationFlags.NONE )
+		{
+			if ( color_test )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+				ItemManager.GetInstance().ShowSourceDropzone( entity2 );
+			}
+			return;
+		}
+
+		if (combinationFlags & InventoryCombinationFlags.ADD_AS_CARGO)
+		{
+			lastFlag = InventoryCombinationFlags.ADD_AS_CARGO;
+			cmenu.Add( "#inv_context_add_as_cargo", this, "OnPerformCombination", new Param1<int>( lastFlag ) );
+		}
+		if (combinationFlags & InventoryCombinationFlags.ADD_AS_ATTACHMENT)
+		{
+			lastFlag = InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+			cmenu.Add( "#inv_context_add_as_attachment", this, "OnPerformCombination", new Param1<int>( lastFlag ));
+		}
+		
+		if (combinationFlags & InventoryCombinationFlags.COMBINE_QUANTITY2)
+		{
+			lastFlag = InventoryCombinationFlags.COMBINE_QUANTITY2;
+			cmenu.Add("#inv_context_combine_quantity", this, "OnPerformCombination", new Param1<int>( lastFlag ));
+		}
+
+		if (combinationFlags & InventoryCombinationFlags.SET_ACTION)
+		{
+			lastFlag = InventoryCombinationFlags.SET_ACTION;
+			cmenu.Add("#inv_context_attach_magazine", this, "OnPerformCombination", new Param1<int>( lastFlag ));
+		}
+		
+		if (combinationFlags & InventoryCombinationFlags.PERFORM_ACTION)
+		{
+			lastFlag = InventoryCombinationFlags.PERFORM_ACTION;
+			cmenu.Add("Perform action", this, "OnPerformCombination", new Param1<int>( lastFlag ));
+		}
+
+		if (color_test)
+		{
+			if (lastFlag == 0)
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			}
+			else if (lastFlag == InventoryCombinationFlags.ADD_AS_ATTACHMENT || lastFlag == InventoryCombinationFlags.ADD_AS_CARGO )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.COMBINE_COLOR );
+			}
+		}
+		else if (cmenu.Count() >= 1)
+		{
+			OnPerformCombination(combinationFlags);
+			return;
+		}	
+	}
+
+	void OnPerformRecipe(int id)
+	{
+		if ( m_am_entity1 == null || m_am_entity2 == null ) return;
+
+		Debug.Log("OnPerformRecipe called for id:"+id.ToString(),"recipes");
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetCraftingManager().SetInventoryCraft( id, ItemBase.Cast(m_am_entity1), ItemBase.Cast(m_am_entity2));
+	}
+
+	void Combine( Widget w, int x, int y, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging(false);
+		ItemPreviewWidget selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+		if (!selectedIpw)
+		{
+			string name = w.GetName();
+			name.Replace("PanelWidget", "Render");
+			selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( name ));
+		}
+		if (!selectedIpw)
+		{
+			selectedIpw = ItemPreviewWidget.Cast(w);
+		}
+		if (!selectedIpw.GetItem())
+		{
+			return;
+		}
+		EntityAI selectedEntity = selectedIpw.GetItem();
+		EntityAI targetEntity = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+		static int testedFlags = InventoryCombinationFlags.SET_ACTION | InventoryCombinationFlags.PERFORM_ACTION | InventoryCombinationFlags.COMBINE_QUANTITY2 | InventoryCombinationFlags.ADD_AS_CARGO | InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+		
+		int chosenInventoryAction = ItemManager.GetChosenCombinationFlag(selectedEntity, targetEntity, testedFlags);
+		PerformCombination(selectedEntity, targetEntity, chosenInventoryAction);
+	}
+	
+	bool CombineItems( EntityAI entity1, EntityAI entity2 )
+	{
+		int flags = ItemManager.GetCombinationFlags( entity1, entity2 );
+		return FlagAction( entity1, entity2, flags );
+	}
+	
+	bool FlagAction( EntityAI entity1, EntityAI entity2, int combinationFlags )
+	{
+		int current_flag;
+		ContextMenu cmenu = ContextMenu.Cast(GetGame().GetUIManager().GetMenu().GetContextMenu());
+		m_am_entity1 = entity1;
+		m_am_entity2 = entity2;
+		cmenu.Hide();
+		cmenu.Clear();
+		int id = -1;
+
+		if (combinationFlags & InventoryCombinationFlags.COMBINE_QUANTITY2 )
+		{
+			ItemBase entity = ItemBase.Cast( entity1 );
+			entity.CombineItemsClient( ItemBase.Cast( entity2 ) );
+			return false;
+		}
+
+		if (entity1 == null || entity2 == null || combinationFlags == InventoryCombinationFlags.NONE )
+			return true;
+
+		if (combinationFlags & InventoryCombinationFlags.ADD_AS_ATTACHMENT )
+		{
+			current_flag = InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+			cmenu.Add( "#inv_context_add_as_attachment", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+		/*if (combinationFlags & InventoryCombinationFlags.LOAD_CHAMBER )
+		{
+			current_flag = InventoryCombinationFlags.LOAD_CHAMBER;
+			cmenu.Add( "#inv_context_load_chamber", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}*/
+		if(combinationFlags & InventoryCombinationFlags.ATTACH_MAGAZINE)
+		{
+			current_flag = InventoryCombinationFlags.ATTACH_MAGAZINE;
+			cmenu.Add("#inv_context_attach_magazine", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+
+		if (combinationFlags & InventoryCombinationFlags.ADD_AS_CARGO )
+		{
+			current_flag = InventoryCombinationFlags.ADD_AS_CARGO;
+			cmenu.Add( "#inv_context_add_as_cargo", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+
+		if (combinationFlags & InventoryCombinationFlags.SWAP )
+		{
+			current_flag = InventoryCombinationFlags.SWAP;
+			cmenu.Add( "#inv_context_swap", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+
+		if (combinationFlags & InventoryCombinationFlags.COMBINE_QUANTITY2 )
+		{
+			current_flag = InventoryCombinationFlags.COMBINE_QUANTITY2;
+			cmenu.Add( "#inv_context_combine", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+
+		if(combinationFlags & InventoryCombinationFlags.SET_ACTION)
+		{
+			current_flag = InventoryCombinationFlags.SET_ACTION;
+			cmenu.Add("#inv_context_attach_magazine", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+		
+		if(combinationFlags & InventoryCombinationFlags.PERFORM_ACTION)
+		{
+			current_flag = InventoryCombinationFlags.PERFORM_ACTION;
+			cmenu.Add("Perform Action2", this, "OnPerformCombination", new Param1<int>( current_flag ) );
+		}
+
+		int m_am_Pos_x,  m_am_Pos_y;
+		GetMousePos( m_am_Pos_x, m_am_Pos_y );
+		m_am_Pos_x -= 5;
+		m_am_Pos_y -= 5;
+
+		MissionGameplay mission = MissionGameplay.Cast( GetGame().GetMission() );
+		/*if (combinationFlags & InventoryCombinationFlags.RECIPE_HANDS ||  combinationFlags & InventoryCombinationFlags.RECIPE_ANYWHERE )
+		{
+			OnPerformRecipe( id );
+			return true;
+		}
+		else /*if (cmenu.Count() == 1 )*/
+		//{
+			OnPerformCombination( current_flag );
+			return true;
+		//}
+		/*else
+		{
+			cmenu.Show( m_am_Pos_x, m_am_Pos_y );
+			return true;
+		}*/
+	}
+
+	void MouseClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.RIGHT)
+		{
+			if (m_Lock)
+			{
+				GetGame().GetPlayer().GetHumanInventory().ClearUserReservedLocationSynced(m_Item);
+			}
+			else
+			{
+				if (m_Item && m_Item.IsItemBase())
+				{
+					m_Item.OnRightClick();
+					
+					if (m_HasQuantity)
+						SetQuantity();
+					#ifdef DIAG_DEVELOPER
+					if (GetDayZGame().IsLeftCtrlDown())
+						ShowActionMenu(m_Item);
+					#endif
+				}
+			}
+				
+		}
+		else if (!m_Lock)
+		{
+			switch (button)
+			{
+				case MouseState.MIDDLE:
+					InspectItem(m_Item);
+					break;
+				
+				case MouseState.LEFT:
+					PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+					if (g_Game.IsLeftCtrlDown())
+					{
+						if (controlledPlayer.CanDropEntity(m_Item))
+						{
+							if (m_Item.GetTargetQuantityMax() < m_Item.GetQuantity())
+								m_Item.SplitIntoStackMaxClient(null, -1);
+							else
+								controlledPlayer.PhysicalPredictiveDropItem(m_Item);
+	
+							ItemManager.GetInstance().SetWidgetDraggable(w, false);
+						}
+					}
+					else
+					{
+						InventoryLocation il = new InventoryLocation();
+						m_Obj.GetInventory().GetCurrentInventoryLocation(il);
+		
+						bool draggable = !controlledPlayer.GetInventory().HasInventoryReservation(m_Obj, null) && !controlledPlayer.GetInventory().IsInventoryLocked() && !controlledPlayer.IsItemsToDelete();
+						draggable = draggable && (m_Obj.GetHierarchyRoot() && m_Obj.GetInventory().CanRemoveEntity() || !m_Obj.GetHierarchyRoot() && AttachmentsOutOfReach.IsAttachmentReachable(m_Obj, "", il.GetSlot()));
+				
+						ItemManager.GetInstance().SetWidgetDraggable(w, draggable);				
+					}
+					break;
+			}
+		}
+	}
+
+	void DropReceivedFromMain( Widget w, int x, int y, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging(false);
+		string name = w.GetName();
+		name.Replace("PanelWidget", "Render");
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		ItemPreviewWidget targetIpw = ItemPreviewWidget.Cast(receiver.FindAnyWidget( "Render" ));
+		if (m_HandsIcon)
+		{
+			targetIpw = ItemPreviewWidget.Cast(receiver.GetParent().FindAnyWidget( "Render" ));
+		}
+
+		ItemPreviewWidget selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( name ));
+		if (selectedIpw == null)
+		{
+			selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( "Render" ));
+		}
+		if (selectedIpw == null)
+		{
+			return;
+		}
+
+		InventoryItem targetEntity = InventoryItem.Cast(targetIpw.GetItem());
+		InventoryItem selectedEntity = InventoryItem.Cast(selectedIpw.GetItem());
+		if (!selectedEntity)
+		{
+			return;
+		}
+		int index;
+		InventoryLocation ilSrc;
+		InventoryLocation ilDst;
+		if (m_Lock && targetEntity == selectedEntity)
+		{
+			index = player.GetHumanInventory().FindUserReservedLocationIndex(m_Item);
+			ilSrc = new InventoryLocation();
+			ilDst = new InventoryLocation();
+			
+			m_Item.GetInventory().GetCurrentInventoryLocation(ilSrc);
+			player.GetHumanInventory().GetUserReservedLocation(index, ilDst);
+			
+			if (ilDst.GetParent().GetInventory().LocationCanAddEntity(ilDst))
+			{
+			
+				player.GetHumanInventory().ClearUserReservedLocation(m_Item);
+				player.PredictiveTakeToDst(ilSrc, ilDst);
+				m_Item.GetOnReleaseLock().Invoke(m_Item);
+			}
+		}
+		else if (m_Lock)
+		{
+			CargoContainer parentCargo = CargoContainer.Cast(m_Parent);
+			
+			float parentX;
+			float parentY;
+			
+			parentCargo.GetRootWidget().GetScreenPos(parentX, parentY);
+			
+			float iconSize = parentCargo.GetIconSize();
+			float spaceSize = parentCargo.GetSpaceSize();
+			
+			int PosX = (x-parentX) / (iconSize + spaceSize);
+			int PosY = (y-parentY) / (iconSize + spaceSize);
+			
+			EntityAI parent = m_Lock;
+			CargoBase targetCargo = parent.GetInventory().GetCargo();
+			
+			ilDst = new InventoryLocation();			
+			ilDst.SetCargoAuto(targetCargo, selectedEntity, PosY, PosX, selectedEntity.GetInventory().GetFlipCargo());
+			
+			if (parent.GetInventory().LocationCanAddEntity(ilDst))
+			{
+				player.GetHumanInventory().ClearUserReservedLocation(m_Item);
+				m_Item.GetOnReleaseLock().Invoke(m_Item);
+				
+				SplitItemUtils.TakeOrSplitToInventoryLocation(player, ilDst);
+			}
+		}
+		else
+		{
+			ilDst = new InventoryLocation();
+			static int testedFlags = InventoryCombinationFlags.COMBINE_QUANTITY2 | InventoryCombinationFlags.ADD_AS_CARGO | InventoryCombinationFlags.ADD_AS_ATTACHMENT | InventoryCombinationFlags.SWAP | InventoryCombinationFlags.FSWAP | InventoryCombinationFlags.SWAP_MAGAZINE;
+		
+			int chosenInventoryAction = ItemManager.GetChosenCombinationFlag(selectedEntity, targetEntity, testedFlags, ilDst);
+			PerformCombination(selectedEntity, targetEntity, chosenInventoryAction, ilDst);
+		}		
+	}
+
+	void Swap( Widget w, int x, int y, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging(false);
+		string name = w.GetName();
+		name.Replace("PanelWidget", "Render");
+
+		ItemPreviewWidget targetIpw = ItemPreviewWidget.Cast(receiver.FindAnyWidget( "Render" ));
+		if (m_HandsIcon)
+		{
+			targetIpw = ItemPreviewWidget.Cast(receiver.GetParent().FindAnyWidget( "Render" ));
+		}
+
+		ItemPreviewWidget selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( name ));
+		if (selectedIpw == null)
+		{
+			selectedIpw = ItemPreviewWidget.Cast(w.FindAnyWidget( "Render" ));
+		}
+		if (selectedIpw == null)
+		{
+			return;
+		}
+
+		InventoryItem targetEntity = InventoryItem.Cast(targetIpw.GetItem());
+		InventoryItem selectedEntity = InventoryItem.Cast(selectedIpw.GetItem());
+		if (!selectedEntity || !targetEntity)
+		{
+			return;
+		}
+
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI itemInHands = player.GetHumanInventory().GetEntityInHands();
+
+		InventoryLocation ilDst = new InventoryLocation();
+		InventoryLocation ilSrc = new InventoryLocation();
+		targetEntity.GetInventory().GetCurrentInventoryLocation(ilSrc);
+		Icon icon = ItemManager.GetInstance().GetDraggedIcon();
+		
+		int index = player.GetHumanInventory().FindUserReservedLocationIndex(targetEntity);
+		if (index>=0)
+		{
+			player.GetHumanInventory().GetUserReservedLocation(index, ilDst);
+		
+			if (GameInventory.CanForceSwapEntitiesEx( selectedEntity, ilSrc, targetEntity, ilDst ))
+			{
+				if (m_HandsIcon && !player.GetInventory().HasInventoryReservation(itemInHands, null) && !player.IsItemsToDelete())
+				{
+					GetGame().GetPlayer().PredictiveForceSwapEntities(selectedEntity, targetEntity, ilDst);
+					return;
+				}
+			}
+		}
+		static int testedFlags = InventoryCombinationFlags.SWAP | InventoryCombinationFlags.FSWAP;
+		
+		int chosenInventoryAction = ItemManager.GetChosenCombinationFlag(selectedEntity, targetEntity, testedFlags, ilDst);
+		PerformCombination(selectedEntity, targetEntity, chosenInventoryAction, ilDst);
+	}
+
+	void ToRefresh( Icon icon, Icon icon2 )
+	{
+		( IconsContainer.Cast( m_Parent ) ).RemoveItem( icon );
+		( IconsContainer.Cast( m_Parent ) ).RemoveItem( icon2 );
+	}
+
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.IconXbox;
+		#else
+			switch (InventoryMenu.GetWidthType())
+			{
+				case ScreenWidthType.NARROW:
+				{
+					m_LayoutName = WidgetLayoutName.IconNarrow;
+					break;
+				}
+				case ScreenWidthType.MEDIUM:
+				{
+					m_LayoutName = WidgetLayoutName.IconMedium;
+					break;
+				}
+				case ScreenWidthType.WIDE:
+				{
+					m_LayoutName = WidgetLayoutName.IconWide;
+					break;
+				}
+			}
+		#endif
+			
+	}
+
+	void SetSize( int x, int y )
+	{
+		m_SizeX = x;
+		m_SizeY = y;
+	}
+	
+	void SetPos( int x, int y )
+	{
+		m_PosX = x;
+		m_PosY = y;
+	}
+
+	int GetCargoPos()
+	{
+		return m_CargoPos;
+	}
+
+	void SetCargoPos(int x)
+	{
+		GetMainWidget().SetSort( x );
+		m_CargoPos = x;
+	}
+
+	void DestroyWhiteBackground()
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+		m_IsDragged = false;
+		
+		RevertToOriginalFlip();
+		
+		if (m_HandsIcon)
+		{
+			m_ItemPreview.SetForceFlipEnable(true);
+			m_ItemPreview.SetForceFlip(false);
+			Refresh();
+			FullScreen();
+		}
+		
+		m_CursorWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		m_CursorWidget.Show( false );
+
+		InventoryMenu menu = InventoryMenu.Cast(GetGame().GetUIManager().FindMenu( MENU_INVENTORY ));
+		
+		if (menu)
+			menu.RefreshQuickbar();
+	}
+
+	void CreateWhiteBackground()
+	{
+		m_PreviousFlipOrientation = m_Item.GetInventory().GetFlipCargo();
+		ItemManager.GetInstance().SetDraggedIcon(this);
+		ItemManager.GetInstance().SetDraggedItem(m_Item);
+		m_IsDragged = true;
+		ItemManager.GetInstance().SetIsDragging(true);
+		int ww, hh;
+		GetGame().GetInventoryItemSize(m_Item, ww, hh);
+		if (m_Item.GetInventory().GetFlipCargo())
+			SetSize(hh, ww);
+		else
+			SetSize(ww, hh);
+		
+		SetSize();
+
+		if (!m_HandsIcon)
+		{
+			Refresh();
+		}
+		else
+		{
+			m_ItemPreview.SetForceFlipEnable(false);
+			m_ColorWidget.SetColor(ColorManager.BASE_COLOR);
+			m_ColorWidget.SetAlpha(0.1);
+		}
+		
+		m_CursorWidget.Show(true);
+	}
+
+	void OnDraggingOverBackground( Widget w, int x, int y, Widget reciever  )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		EntityAI entity = EntityAI.Cast( m_Obj );
+		EntityAI parent = entity.GetHierarchyParent();
+		if (parent && parent.GetHierarchyRootPlayer() == GetGame().GetPlayer())
+		{
+			ItemManager.GetInstance().GetRightDropzone().SetAlpha(1);
+		}
+		else if (!m_HandsIcon)
+		{
+			ItemManager.GetInstance().GetLeftDropzone().SetAlpha(1);
+		}
+
+		if (w == null || reciever == null)
+		{
+			return;
+		}
+		Pos pa;
+		reciever.GetUserData(pa);
+		if (m_Parent)
+		{
+			ContainerWithCargo item = ContainerWithCargo.Cast(m_Parent.m_Parent);
+			if (item)
+			{
+				item.DraggingOverGrid(w, m_PosY + pa.y, m_PosX + pa.x, reciever);
+			}
+			HandsContainer hands_item = HandsContainer.Cast(m_Parent.m_Parent);
+			if (hands_item)
+			{
+				hands_item.DraggingOverGrid(w, m_PosY + pa.y, m_PosX + pa.x, reciever, null);
+			}
+		}
+	}
+
+	void DropReceivedFromBackground( Widget w, int x, int y, Widget reciever  )
+	{
+		Pos pa;
+		if (reciever)
+		{
+			reciever.GetUserData(pa);
+			if (m_Parent)
+			{
+				ContainerWithCargo item = ContainerWithCargo.Cast(m_Parent.m_Parent);
+				if (item)
+				{
+					item.DropReceived(w, m_PosY + pa.y, m_PosX + pa.x);
+				}
+			}
+		}
+	}
+	
+	void RevertToOriginalFlip()
+	{
+		if (m_Item)
+		{
+			m_Item.GetInventory().SetFlipCargo(m_PreviousFlipOrientation);
+			int ww, hh;
+			GetGame().GetInventoryItemSize(m_Item, ww, hh);
+			
+			if (m_PreviousFlipOrientation)
+				SetSize(hh, ww);
+			else
+				SetSize(ww, hh);
+
+			SetSize();
+		}
+	}
+
+	override void Refresh()
+	{
+		super.Refresh();
+
+		if (!m_HandsIcon)
+			SetPos();
+		
+		if (m_HasTemperature)
+			SetTemperature();
+		
+		if (m_IsWeapon)
+			RefreshMuzzleIcon();
+		
+		if (m_HasQuantity)
+			SetQuantity();
+	}
+
+	void SetTemperature()
+	{
+		ItemManager.GetInstance().SetIconTemperature(EntityAI.Cast( m_Obj ), m_RootWidget);
+	}
+
+	void RefreshIconPos()
+	{
+		Refresh();
+		GetMainWidget().Update();
+	}
+
+	void FullScreen()
+	{
+		if (m_IsDragged)
+		{
+			return;
+		}
+		GetRootWidget().ClearFlags(WidgetFlags.HEXACTSIZE + WidgetFlags.VEXACTSIZE);
+		GetRootWidget().SetSize(1, 1);
+		m_ColorWidget.SetColor(ARGB( 0, 0, 0, 0 ));
+	}
+
+	void RefreshPos( int row, int column )
+	{
+		if (row != m_PosY || column != m_PosX)
+		{
+			m_PosX = column;
+			m_PosY = row;
+			SetPos();
+			RefreshIconPos();
+		}
+	}
+
+	Object GetObject()
+	{
+		return m_Obj;
+	}
+	
+	void RefreshMuzzleIcon()
+	{
+		Weapon_Base wpn = Weapon_Base.Cast(GetObject());
+		if (wpn)
+		{
+			int i;
+			ImageWidget ammoIcon;
+			if (!wpn.IsShowingChamberedBullet())
+			{
+				for (i = 0; i < m_AmmoIcons.Count(); i++)
+				{
+					ammoIcon = m_AmmoIcons.Get(i);
+					ammoIcon.Show(false);
+				}
+			/*	int bullet_count = 0;
+				int fireout_count = 0;
+				
+				for ( i = 0; i < wpn.GetMuzzleCount(); i++ )
+				{
+					if (wpn.IsChamberFull(i))
+					{
+						if (wpn.IsChamberFiredOut(i))
+						{
+							fireout_count++;
+						}
+						else
+						{
+							bullet_count++;
+						}
+					}
+				}
+				
+				int j;
+				i = 0;
+				for ( j= 0; j < bullet_count; j++ )
+				{
+					if ( i > m_AmmoIcons.Count() )
+					{
+						//add plus ammo
+						break;
+					}
+					
+					ammoIcon = m_AmmoIcons.Get(i);
+					ammoIcon.Show( true );
+					ammoIcon.SetImage( 0 );
+					i++;
+				}
+				
+				for ( j= 0; j < fireout_count; j++ )
+				{
+					if ( i > m_AmmoIcons.Count() )
+					{
+						//add plus ammo
+						break;
+					}
+					
+					ammoIcon = m_AmmoIcons.Get(i);
+					ammoIcon.Show( true );
+					ammoIcon.SetImage( 1 );
+					i++;
+				}
+				
+				for (j = i; j < m_AmmoIcons.Count(); j++)
+				{
+					ammoIcon = m_AmmoIcons.Get(j);
+					ammoIcon.Show(false);
+				}*/
+			}
+			else
+			{
+				//TODO MW - add more conplex logic
+				for (i = 0; i < wpn.GetMuzzleCount(); i++)
+				{
+					if ( i > m_AmmoIcons.Count() )
+					{
+						//add plus ammo
+						break;
+					}
+					
+					ammoIcon = m_AmmoIcons.Get(i);
+					
+					if (wpn.IsChamberFull(i))
+					{
+						if (wpn.IsJammed())
+						{
+							ammoIcon.Show(true);
+							ammoIcon.SetImage(2);
+						}
+						else if (wpn.IsChamberFiredOut(i))
+						{
+							ammoIcon.Show(true);
+							ammoIcon.SetImage(1);
+						}
+						else
+						{
+							ammoIcon.Show( true );
+							ammoIcon.SetImage( 0 );
+						}
+					}
+					else
+					{
+						ammoIcon.Show(false);
+					}
+				}
+			}
+		}
+	}
+	
+	void SetQuantity()
+	{
+		if (m_Item)
+		{
+			int quantityType = QuantityConversions.HasItemQuantity(m_Item);
+			if (quantityType != QUANTITY_HIDDEN && m_CurrQuantity != QuantityConversions.GetItemQuantity(m_Item))
+			{
+				m_CurrQuantity = QuantityConversions.GetItemQuantity(m_Item);
+			
+				if (quantityType == QUANTITY_COUNT)
+				{
+					string quantityText = QuantityConversions.GetItemQuantityText(m_Item);
+
+					if (QuantityConversions.GetItemQuantityMax(m_Item) == 1 || quantityText == "")
+					{
+						m_QuantityStack.Show(false);
+					}
+					else
+					{
+						m_QuantityItem.SetText(quantityText);
+						m_QuantityStack.Show(true);
+					}
+
+					m_QuantityProgress.Show(false);
+				}
+				else if (quantityType == QUANTITY_PROGRESS)
+				{	
+					int max 			= m_Item.GetQuantityMax();
+					int count 			= m_Item.ConfigGetInt("count");
+					float quantity		= m_CurrQuantity;
+	
+					if (count > 0)
+					{
+						max = count;
+					}
+					
+					if (max > 0)
+					{
+						float value = Math.Round((quantity / max) * 100);
+						m_QuantityProgress.SetCurrent(value);
+					}
+
+					m_QuantityStack.Show(false);
+					m_QuantityProgress.Show(true);
+				}
+			}
+		}
+	}
+	
+	void SetSort(int index)
+	{
+		GetMainWidget().SetSort(index);
+		GetMainWidget().Update();
+	}
+	
+	int GetSort()
+	{
+		return GetMainWidget().GetSort();
+	}
+	
+	void SetItemPreviewEx(bool refresh = true)
+	{
+		m_ItemPreview.Show(true, refresh);
+		m_ItemPreview.SetItem(EntityAI.Cast(m_Obj));
+		m_ItemPreview.SetModelOrientation("0 0 0");
+		m_ItemPreview.SetView(m_Obj.GetViewIndex());
+	}
+	
+	void SetItemPreview()
+	{
+		SetItemPreviewEx();
+	}
+	
+	void SetItemSizeEx(bool refresh = true)
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_ItemSizePanel.Show(true, refresh);
+		m_ItemSizeWidget.Show(true, refresh);
+		
+		int sizeX, sizeY;
+		GetGame().GetInventoryItemSize(m_Item, sizeX, sizeY);
+		int capacity = sizeX * sizeY;
+		m_ItemSizeWidget.SetText(capacity.ToString());
+		#endif
+	}
+	
+	void SetItemSize()
+	{
+		SetItemSizeEx();
+	}
+	
+	void UpdateFlip(bool flipped)
+	{
+		int sizeX, sizeY;
+		GetGame().GetInventoryItemSize(m_Item, sizeX, sizeY);
+		
+		if (flipped)
+			SetSize(sizeY, sizeX);
+		else
+			SetSize(sizeX, sizeY);
+
+		SetSize();
+	}
+	
+	void InitLock( EntityAI parent, EntityAI obj, int x_pos, int y_pos, bool flip)
+	{
+		m_Lock	= parent;
+		m_Obj	= obj;
+		m_Item	= ItemBase.Cast(m_Obj);
+		
+		SetPos(x_pos, y_pos);
+		UpdateFlip( flip );
+		
+		ItemManager.GetInstance().SetWidgetDraggable( GetMainWidget(), false );
+		WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( GetMainWidget(), this, "MouseClick" );
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( GetMainWidget(),  this, "DropReceivedFromMain" );
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( GetMainWidget(),  this, "DraggingOver" );
+		
+		m_RootWidget.FindAnyWidget( "Reserved" ).Show( true );
+		m_ItemPreview.SetForceFlipEnable(true);
+		m_ItemPreview.SetForceFlip(flip);
+		SetItemPreview();
+		Refresh();
+	}
+
+	void InitEx( EntityAI obj, bool refresh = true )
+	{
+		if (obj != m_Obj)
+		{
+			if (m_Obj)
+			{
+				m_Obj.GetOnItemFlipped().Remove(UpdateFlip );
+				m_Obj.GetOnViewIndexChanged().Remove(SetItemPreview);
+			}
+			if (obj)
+			{
+				obj.GetOnItemFlipped().Insert(UpdateFlip);
+				obj.GetOnViewIndexChanged().Insert(SetItemPreview);
+			}
+		}
+		
+		if (m_HandsIcon)
+		{
+			m_ItemPreview.SetForceFlipEnable(true);
+			m_ItemPreview.SetForceFlip(false);
+		}
+		
+		m_Obj	= obj;
+		m_Item	= ItemBase.Cast(m_Obj);
+		m_Lock = null;
+		
+		SetItemPreviewEx(refresh);
+		
+		WidgetEventHandler.GetInstance().RegisterOnDrag( GetMainWidget(),  this, "CreateWhiteBackground" );
+		WidgetEventHandler.GetInstance().RegisterOnDrop( GetMainWidget(),  this, "DestroyWhiteBackground" );
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( GetMainWidget(),  this, "DropReceivedFromMain" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( GetMainWidget(),  this, "MouseClick" );
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( GetMainWidget().FindAnyWidget( "Swap" ),  this, "Swap" );
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( GetMainWidget().FindAnyWidget( "Swap" ),  this, "DraggingOverSwap" );
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( GetMainWidget().FindAnyWidget( "Combine" ),  this, "Combine" );
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( GetMainWidget().FindAnyWidget( "Combine" ),  this, "DraggingOverCombine" );
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( GetMainWidget(),  this, "DraggingOver" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseEnter( GetMainWidget(),  this, "MouseEnter" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( GetMainWidget(),  this, "MouseLeave" );
+		WidgetEventHandler.GetInstance().RegisterOnDoubleClick( GetMainWidget(),  this, "DoubleClick" );
+		
+		SetItemSizeEx(refresh);
+		CheckIsWeapon();
+		CheckIsMagazineEx(refresh);
+		CheckHasTemperature();
+		CheckHasQuantityEx(refresh);
+		m_RootWidget.FindAnyWidget("Reserved").Show(false, refresh);
+		
+		if (refresh)
+			Refresh();
+	}
+	
+	void Init(EntityAI obj)
+	{
+		InitEx(obj);
+	}
+	
+	void CheckIsWeapon()
+	{
+		Weapon_Base wpn = Weapon_Base.Cast(m_Obj);
+		if (wpn)
+		{
+			m_AmmoIcons = new array<ImageWidget>;
+			m_IsWeapon = true;
+			float posX = 0.0;
+			float widht = 0.0, height = 0.0; 
+			for (int i = 0; i < wpn.GetMuzzleCount(); i++)
+			{
+				if (i == 1)
+				{
+					m_AmmoIcons[0].GetSize(widht,height);
+				}
+				posX += widht;
+				
+				Widget ammoIcon = Widget.Cast(GetGame().GetWorkspace().CreateWidgets( "gui/layouts/inventory_new/ammo_icon.layout", GetMainWidget() ));
+				ammoIcon.SetPos(posX, 0.0, false);
+				
+				ImageWidget ammoIconImg = ImageWidget.Cast(ammoIcon.GetChildren());				
+				
+				AmmoData data = Magazine.GetAmmoData(wpn.GetChamberAmmoTypeName(i));
+				if (data)
+				{
+					CartridgeType c_type = data.m_CartridgeType;
+					switch (c_type)
+					{
+						case CartridgeType.Pistol:
+						{
+							ammoIconImg.LoadImageFile(0, "set:dayz_gui image:cartridge_pistol");
+							ammoIconImg.LoadImageFile(1, "set:dayz_gui image:shell_pistol");
+							ammoIconImg.LoadImageFile(2, "set:dayz_gui image:jam_pistol");
+							break;
+						}
+						case CartridgeType.Intermediate:
+						{
+							ammoIconImg.LoadImageFile(0, "set:dayz_gui image:cartridge_int");
+							ammoIconImg.LoadImageFile(1, "set:dayz_gui image:shell_int");
+							ammoIconImg.LoadImageFile(2, "set:dayz_gui image:jam_int");
+							break;
+						}
+						case CartridgeType.FullPower:
+						{
+							ammoIconImg.LoadImageFile(0, "set:dayz_gui image:cartridge_fp");
+							ammoIconImg.LoadImageFile(1, "set:dayz_gui image:shell_fp");
+							ammoIconImg.LoadImageFile(2, "set:dayz_gui image:jam_fp");
+							break;
+						}
+						case CartridgeType.Shell:
+						{
+							ammoIconImg.LoadImageFile(0, "set:dayz_gui image:cartridge_shell");
+							ammoIconImg.LoadImageFile(1, "set:dayz_gui image:shell_shell");
+							ammoIconImg.LoadImageFile(2, "set:dayz_gui image:jam_shell");
+							break;
+						}
+					}
+				}
+				m_AmmoIcons.Insert(ammoIconImg);
+			}
+		}
+		else
+		{
+			m_IsWeapon = false;
+		}			
+	}
+	
+	void CheckIsMagazineEx( bool refresh = true )
+	{
+		Magazine mag = Magazine.Cast(m_Obj);
+		if (mag)
+		{
+			m_IsMagazine = true;
+			AmmoData data = Magazine.GetAmmoData(mag.ClassName());
+			if (data)
+			{
+				ProjectileType p_type = data.m_ProjectileType;
+				switch (p_type)
+				{
+					case ProjectileType.None:
+					{
+						m_AmmoTypeIcon.Show(false, refresh);
+						break;
+					}
+					case ProjectileType.Tracer:
+					{
+						m_AmmoTypeIcon.LoadImageFile(0, "set:dayz_gui image:tracer");
+						m_AmmoTypeIcon.Show(true, refresh);
+						break;
+					}
+					case ProjectileType.AP:
+					{
+						m_AmmoTypeIcon.LoadImageFile(0, "set:dayz_gui image:armor_piercing");
+						m_AmmoTypeIcon.Show(true, refresh);
+						break;
+					}
+				}
+			}
+		}
+		else
+		{
+			m_IsMagazine = false;
+		}
+	}
+	
+	void CheckIsMagazine()
+	{
+		CheckIsMagazineEx();
+	}
+	
+	void CheckHasTemperature()
+	{
+		if (m_Item)
+		{
+			m_HasTemperature = (m_Item.GetTemperatureMax() != 0 && m_Item.GetTemperatureMin() != 0);
+		}
+	}
+	
+	void CheckHasQuantityEx(bool refresh = true)
+	{
+		if (m_Item)
+		{
+			m_HasQuantity = (QuantityConversions.HasItemQuantity( m_Item ) != QUANTITY_HIDDEN);
+			
+			if (m_HasQuantity)
+				m_QuantityPanel.Show(true, refresh);
+		}
+	}
+	
+	void CheckHasQuantity()
+	{
+		CheckHasQuantityEx();
+	}
+	
+	void SetPosX(int x)
+	{
+		m_PosX = x;
+	}
+	
+	void SetPosY(int y)
+	{
+		m_PosY = y;
+	}
+	
+	void SetSizeX(int x)
+	{
+		m_SizeX = x;
+	}
+	
+	void SetSizeY(int y)
+	{
+		m_SizeY = y;
+	}
+	
+	int GetPosX()
+	{
+		return m_PosX;
+	}
+	
+	int GetPosY()
+	{
+		return m_PosY;
+	}
+	
+	int GetSizeX()
+	{
+		return m_SizeX;
+	}
+	
+	int GetSizeY()
+	{
+		return m_SizeY;
+	}
+
+	void SetPosEx(bool refresh = true)
+	{
+		CargoContainer parentContainer = CargoContainer.Cast(m_Parent);
+		HandsPreview parentHPrevContainer = HandsPreview.Cast(m_Parent);
+		Widget rootWidget = GetRootWidget();
+		float iconSize, spaceSize;
+		if (parentContainer)
+		{
+			iconSize = parentContainer.GetIconSize();
+			spaceSize = parentContainer.GetSpaceSize();
+		}
+		else if (parentHPrevContainer)
+		{
+			iconSize = parentHPrevContainer.GetIconSize();
+			if (rootWidget)
+			{
+				rootWidget.SetFlags(WidgetFlags.EXACTSIZE, refresh);
+			}
+		}
+		
+		if (rootWidget)
+		{
+			#ifndef PLATFORM_CONSOLE
+				rootWidget.SetPos(iconSize * GetPosX() + ( GetPosX() + 1 ) * spaceSize, iconSize * GetPosY() + ( GetPosY() + 1 ) * spaceSize, refresh);
+				rootWidget.SetSize(iconSize * m_SizeX + ( m_SizeX ) * spaceSize, iconSize * m_SizeY + ( m_SizeY ) * spaceSize, refresh);
+			#else
+				int row = m_CargoPos / 5;
+				int column = m_CargoPos % 5;
+				rootWidget.SetPos(iconSize * column, iconSize * row, refresh);
+				rootWidget.SetSize(iconSize, iconSize, refresh);
+			#endif
+		}
+	}
+	
+	void SetPos()
+	{
+		SetPosEx();
+	}
+	
+	void SetSize()
+	{
+		CargoContainer parentContainer = CargoContainer.Cast(m_Parent);
+		HandsPreview parentHPrevContainer = HandsPreview.Cast(m_Parent);
+		float iconSize, spaceSize;
+		Widget rootWidget = GetRootWidget();
+		if (parentContainer)
+		{
+			iconSize = parentContainer.GetIconSize();
+			spaceSize = parentContainer.GetSpaceSize();
+		}
+		else if (parentHPrevContainer)
+		{
+			iconSize = parentHPrevContainer.GetIconSize();
+			if (rootWidget)
+			{
+				GetRootWidget().SetFlags(WidgetFlags.EXACTSIZE);
+			}
+		}
+	
+		if (rootWidget)
+		{
+		#ifndef PLATFORM_CONSOLE
+			GetRootWidget().SetSize(iconSize * m_SizeX + ( m_SizeX ) * spaceSize, iconSize * m_SizeY + ( m_SizeY ) * spaceSize);
+		#else
+			GetRootWidget().SetSize(iconSize, iconSize);
+		#endif
+		}
+	}
+	
+	override void UpdateInterval()
+	{
+		if (m_Item)
+		{
+			if (m_HasTemperature)
+				SetTemperature();
+			
+			if (m_IsWeapon)
+				RefreshMuzzleIcon();
+			
+			if (m_HasQuantity)
+				SetQuantity();
+		}
+	}
+}
+
+class Pos
+{
+	int x, y;
+
+	void Pos(int _x, int _y)
+	{
+		x = _x;
+		y = _y;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/SlotsContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/SlotsContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..e18ba19680f6d6c97dbf451a607ceb6213c90b1f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/SlotsContainer.c
@@ -0,0 +1,285 @@
+class SlotsContainer: Container
+{
+	protected ref array<ref SlotsIcon>	m_Icons;
+	int m_VisibleColumnCount;
+	
+	void SlotsContainer( LayoutHolder parent, EntityAI slot_parent ) 
+	{
+		m_Icons = new array<ref SlotsIcon>;
+		for ( int i = 0; i < ITEMS_IN_ROW; i++ )
+		{
+			if ( GetRootWidget().FindAnyWidget( "Icon" + i ) )
+				m_Icons.Insert( new SlotsIcon( this, GetRootWidget().FindAnyWidget( "Icon" + i ), i , slot_parent) );
+			else
+			{
+				Widget child = GetRootWidget().GetChildren();
+				while ( child )
+				{
+					child = child.GetSibling();
+				}
+			}
+		}
+	}
+	
+	override void SetDefaultFocus( bool while_micromanagment_mode = false )
+	{			
+		m_FocusedColumn = 0;
+		for (int i = 0; i < GetColumnCount(); i++)
+		{
+			SlotsIcon icon = m_Icons[i];
+			if (icon.IsVisible())
+			{
+				m_FocusedColumn = i;
+				break;
+			}
+		}
+					
+		SetFocus( m_FocusedColumn );
+	}
+	
+	override void SetLastFocus()
+	{
+		SetDefaultFocus();
+	}
+	
+	void SetFocus( int index )
+	{
+		if ( index >= 0 && index < m_Icons.Count() )
+		{
+			m_Icons.Get( index ).GetSelectedPanel().Show( true );
+		}
+		UpdateIcon();
+	}
+	
+	void SetVisibleFocus( int index )
+	{
+		Unfocus();
+		int visible_icons_count = 0;
+		
+		m_FocusedColumn = 0;
+		for (int i = 0; i < GetColumnCount(); i++)
+		{
+			SlotsIcon icon = m_Icons[i];
+			if (icon.IsVisible())
+			{
+				m_FocusedColumn = i;
+				if (visible_icons_count == index)
+					break;
+				visible_icons_count++;
+			}
+		}
+					
+		SetFocus( m_FocusedColumn );
+	}
+	
+	int GetVisibleFocus()
+	{
+		int visible_icons_count = 0;
+		for (int i = 0; i < GetColumnCount(); i++)
+		{
+			if (m_FocusedColumn == i)
+			{
+				return visible_icons_count;
+			}
+			SlotsIcon icon = m_Icons[i];
+			if (icon.IsVisible())
+			{
+				visible_icons_count++;
+			}
+		}
+		return visible_icons_count - 1;
+	}
+	
+	override void SetNextRightActive()
+	{
+		Unfocus();
+		
+		int index = m_FocusedColumn + 1;
+		for (int i = 0; i < GetColumnCount(); i++ )
+		{
+			if (index >= GetColumnCount())
+			{
+				index = 0;
+			}
+			SlotsIcon icon = m_Icons[index];
+			if (icon.IsVisible())
+			{
+				m_FocusedColumn = index;
+				break;
+			}
+			index++;
+		}
+		
+		UpdateIcon();
+	}
+	
+	override void SetNextLeftActive()
+	{
+		Unfocus();
+		
+		int index = m_FocusedColumn - 1;
+		for (int i = 0; i < GetColumnCount(); i++ )
+		{
+			if (index < 0)
+			{
+				index = GetColumnCount() - 1;
+			}
+			SlotsIcon icon = m_Icons[index];
+			if (icon.IsVisible())
+			{
+				m_FocusedColumn = index;
+				break;
+			}
+			index--;
+		}
+		
+		UpdateIcon();
+	}
+	
+	void UpdateIcon()
+	{	
+		float x, y;
+		SlotsIcon icon = GetSlotIcon( m_FocusedColumn );
+			
+		icon.GetSelectedPanel().Show( true );
+		icon.GetSelectedPanel().GetScreenPos( x, y );
+	
+		EntityAI focused_item = GetFocusedItem();
+		if ( focused_item )
+		{
+			PrepareOwnedTooltip( focused_item, -1, y ); //custom positioning for the controller
+		}
+		else
+		{
+			PrepareOwnedSlotsTooltip( icon.GetSelectedPanel(), icon.GetSlotDisplayName(), icon.GetSlotDesc(), x, y );
+		}
+	}
+	
+	override void UnfocusAll()
+	{
+		for (int i = 0; i < m_Icons.Count(); i++)
+		{
+			m_Icons.Get( i ).GetSelectedPanel().Show( false );
+		}
+	}
+	
+	override void Unfocus()
+	{
+		Widget w = m_Icons.Get( m_FocusedColumn ).GetSelectedPanel();
+		if ( w )
+		{
+			w.Show( false );
+		}
+	}
+	
+	override bool SelectItem()
+	{
+		ItemBase item = ItemBase.Cast( GetFocusedItem() );
+		SlotsIcon icon = GetFocusedSlotsIcon();
+		
+		if( item && !item.IsLockedInSlot() && !icon.IsOutOfReach() && !icon.IsReserved() && item.IsTakeable() && item.CanPutIntoHands(null))
+		{
+			ItemManager.GetInstance().SetSelectedItemEx(item, null, icon);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool IsEmpty()
+	{
+		return false;
+	}
+	
+	override bool IsDisplayable()
+	{
+		if (m_ForcedShow)
+			return true;
+		for (int i = 0; i < m_ColumnCount; i++)
+		{
+			if ( GetSlotIcon(i).IsVisible() )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	SlotsIcon GetSlotIcon( int index )
+	{
+		if ( m_Icons.IsValidIndex( index ) )
+		{
+			return m_Icons.Get( index );
+		}
+		
+		return null;
+	}
+	
+	override SlotsIcon GetFocusedSlotsIcon()
+	{
+		if (m_Icons.Count())
+		{
+			return m_Icons.Get(m_FocusedColumn);
+		}
+		return null;
+	}
+	
+	override EntityAI GetFocusedItem()
+	{
+		SlotsIcon focus_icon = GetFocusedSlotsIcon();
+
+		if(focus_icon && !focus_icon.IsReserved())
+		{
+			return EntityAI.Cast(focus_icon.GetObject());
+		}
+
+		return null;
+	}
+
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.InventorySlotsContainerXbox;
+		#else
+			switch ( InventoryMenu.GetWidthType() )
+			{
+				case ScreenWidthType.NARROW:
+				{
+					m_LayoutName = WidgetLayoutName.InventorySlotsContainerNarrow;
+					break;
+				}
+				case ScreenWidthType.MEDIUM:
+				{
+					m_LayoutName = WidgetLayoutName.InventorySlotsContainerMedium;
+					break;
+				}
+				case ScreenWidthType.WIDE:
+				{
+					m_LayoutName = WidgetLayoutName.InventorySlotsContainerWide;
+					break;
+				}
+			}
+		#endif
+			
+	}
+	
+	//! Returns 'true' if radial icon is VISIBLE and also OPEN (individual icon or any icon, use parameter..)
+	bool VerifySlotsIconVisibility(int idx = -1)
+	{
+		if (idx != -1)
+		{
+			return m_Icons[idx].IsVisible() && m_Icons[idx].GetRadialIconPanel().IsVisible() && m_Icons[idx].GetRadialIcon().IsVisible();
+		}
+		else
+		{
+			int count = m_Icons.Count();
+			for (int i = 0; i < count; i++)
+			{
+				if (m_Icons[i].IsVisible() && m_Icons[i].GetRadialIconPanel().IsVisible() && m_Icons[i].GetRadialIcon().IsVisible())
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/SlotsIcon.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/SlotsIcon.c
new file mode 100644
index 0000000000000000000000000000000000000000..a270764b2f0f9fcd58ead2e1246f416b25f73e1c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ContainedItems/SlotsIcon.c
@@ -0,0 +1,800 @@
+class SlotsIcon: LayoutHolder
+{
+	protected static int 			m_NormalWidth;
+	protected static int 			m_NormalHeight;
+	
+	protected bool					m_IsWeapon			= false;
+	protected bool					m_IsMagazine		= false;
+	protected bool					m_HasTemperature	= false;
+	protected bool					m_HasQuantity		= false;
+	protected bool					m_HasItemSize		= false;
+	protected float					m_CurrQuantity		= -1;
+	
+	protected EntityAI				m_Obj;
+	protected ItemBase				m_Item;
+	protected EntityAI				m_SlotParent;
+	protected Container				m_Container;
+	protected int					m_SlotID;
+	protected bool					m_IsDragged			= false;
+	
+	protected Widget				m_PanelWidget;
+	
+	protected Widget				m_CursorWidget;
+	protected Widget				m_ColWidget;
+	protected Widget				m_MountedWidget;
+	protected Widget				m_OutOfReachWidget;
+	protected Widget				m_ReservedWidget;
+	
+	protected ItemPreviewWidget		m_ItemPreview;
+	protected ImageWidget			m_GhostSlot;
+	
+	protected Widget				m_ColorWidget;
+	protected Widget				m_SelectedPanel;
+	protected Widget				m_EmptySelectedPanel;
+	protected Widget				m_MicromanagedPanel;
+	
+	protected Widget				m_QuantityPanel;
+	protected TextWidget			m_QuantityItem;
+	protected ProgressBarWidget		m_QuantityProgress;
+	protected Widget				m_QuantityStack;
+	
+	protected string				m_SlotDisplayName;
+	protected string				m_SlotDesc;
+	
+	protected Widget				m_ItemSizePanel;
+	protected TextWidget			m_ItemSizeWidget;
+	
+	protected Widget				m_AmmoIcon;
+	
+	protected Widget				m_RadialIconPanel;
+	protected Widget				m_RadialIconClosed;
+	protected Widget				m_RadialIcon;
+	
+	protected bool					m_Reserved;
+
+	void SlotsIcon( LayoutHolder parent, Widget root, int index, EntityAI slot_parent )
+	{
+		m_MainWidget			= root;
+		
+		m_PanelWidget			= m_MainWidget.FindAnyWidget( "PanelWidget" + index );
+		
+		m_CursorWidget			= m_MainWidget.FindAnyWidget( "Cursor" + index );
+		m_ColWidget				= m_MainWidget.FindAnyWidget( "Col" + index );
+		m_MountedWidget			= m_MainWidget.FindAnyWidget( "Mounted" + index );
+		m_OutOfReachWidget		= m_MainWidget.FindAnyWidget( "OutOfReach" + index );
+
+		m_ItemPreview			= ItemPreviewWidget.Cast( m_MainWidget.FindAnyWidget( "Render" + index ) );
+		m_ItemPreview.SetForceFlipEnable(true);
+		m_ItemPreview.SetForceFlip(false);
+		
+		m_GhostSlot				= ImageWidget.Cast( m_MainWidget.FindAnyWidget( "GhostSlot" + index ) );
+		
+		m_ColorWidget			= m_MainWidget.FindAnyWidget( "Color" + index );
+		m_SelectedPanel			= m_MainWidget.FindAnyWidget( "Selected" + index );
+		m_EmptySelectedPanel    = m_MainWidget.FindAnyWidget( "EmptySelected" + index );
+		m_MicromanagedPanel    = m_MainWidget.FindAnyWidget( "Micromanaged" + index );
+		
+		m_QuantityPanel			= m_MainWidget.FindAnyWidget( "QuantityPanel" + index );
+		m_QuantityItem			= TextWidget.Cast( m_MainWidget.FindAnyWidget( "Quantity" + index ) );
+		m_QuantityProgress		= ProgressBarWidget.Cast( m_MainWidget.FindAnyWidget( "QuantityBar" + index ) );
+		m_QuantityStack			= m_MainWidget.FindAnyWidget( "QuantityStackPanel" + index );
+		
+		m_ItemSizePanel			= m_MainWidget.FindAnyWidget( "ItemSizePanel" + index );
+		m_ItemSizeWidget		= TextWidget.Cast( m_MainWidget.FindAnyWidget( "ItemSize" + index ) );
+		
+		m_AmmoIcon				= m_MainWidget.FindAnyWidget( "AmmoIcon" + index );
+		
+		m_RadialIconPanel		= m_MainWidget.FindAnyWidget( "RadialIconPanel" + index );
+		m_RadialIconClosed		= m_MainWidget.FindAnyWidget( "RadialIconClosed" + index );
+		m_RadialIcon			= m_MainWidget.FindAnyWidget( "RadialIcon" + index );
+		
+		m_ReservedWidget = Widget.Cast( GetGame().GetWorkspace().CreateWidgets( "gui/layouts/inventory_new/reserved_icon.layout", m_MainWidget ) );
+		m_ReservedWidget.Show(false);
+		
+		WidgetEventHandler.GetInstance().RegisterOnMouseEnter( m_PanelWidget,  this, "MouseEnter" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_PanelWidget,  this, "MouseLeave" );
+		
+		WidgetEventHandler.GetInstance().RegisterOnMouseEnter( m_GhostSlot,  this, "MouseEnterGhostSlot" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_GhostSlot,  this, "MouseLeaveGhostSlot" );
+		
+		WidgetEventHandler.GetInstance().RegisterOnMouseEnter( m_RadialIconPanel,  this, "MouseEnterCategory" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_RadialIconPanel,  this, "MouseLeaveCategory" );
+		
+		WidgetEventHandler.GetInstance().RegisterOnDrag( m_PanelWidget, this, "OnIconDrag" );
+		WidgetEventHandler.GetInstance().RegisterOnDrop( m_PanelWidget, this, "OnIconDrop" );
+		
+		//WidgetEventHandler.GetInstance().RegisterOnMouseEnter( m_ReservedWidget,  this, "MouseEnter" );
+		//WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_ReservedWidget,  this, "MouseLeave" );
+		
+		m_Reserved 				= false;
+		m_SlotID 				= -1;
+		m_Item					= null;
+		m_Obj					= null;
+		m_Container				= null;
+		
+		m_SlotParent			= slot_parent;
+		
+		m_PanelWidget.SetUserData(this);
+		m_ItemPreview.SetUserData(this);
+		m_GhostSlot.SetUserData(this);
+		m_MainWidget.SetUserData(this);
+		
+		float w,h;
+		root.GetSize(w,h);
+		
+		m_NormalWidth = w;
+		m_NormalHeight = h;
+		
+		SetActive( false );
+	}
+	
+	override bool IsVisible()
+	{
+		return m_MainWidget.IsVisible();
+	}
+	
+	void SetSlotParent( EntityAI parent)
+	{
+		m_SlotParent = parent;
+	}
+	
+	void SetContainer( Container container )
+	{
+		m_Container = container;
+	}
+	
+	void SetSlotDisplayName( string text )
+	{
+		m_SlotDisplayName = text;
+	}
+	
+	Container GetContainer()
+	{
+		return m_Container;
+	}
+	
+	string GetSlotDisplayName( )
+	{
+		return m_SlotDisplayName;
+	}
+	
+	void SetSlotDesc( string text )
+	{
+		m_SlotDesc = text;
+	}
+	
+	string GetSlotDesc()
+	{
+		return m_SlotDesc;
+	}
+	
+	void ~SlotsIcon()
+	{
+		if (m_IsDragged)
+		{
+			m_IsDragged = false;
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().SetIsDragging( false );
+		}
+		
+		if (m_Obj)
+		{
+			m_Obj.GetOnItemFlipped().Remove( UpdateFlip );
+			m_Obj.GetOnViewIndexChanged().Remove( SetItemPreview );
+		}
+	}
+	
+	EntityAI GetSlotParent()
+	{
+		return m_SlotParent;
+	}
+	
+	int GetSlotID()
+	{
+		return m_SlotID;
+	}
+	
+	void SetSlotID(int slot_ID)
+	{
+		m_SlotID = slot_ID;
+	}
+	
+	bool IsReserved()
+	{
+		return m_Reserved;
+	}
+	
+	Widget GetPanelWidget()
+	{
+		return m_PanelWidget;
+	}
+	
+	Widget GetCursorWidget()
+	{
+		return m_CursorWidget;
+	}
+	
+	Widget GetColWidget()
+	{
+		return m_ColWidget;
+	}
+	
+	Widget GetReservedWidget()
+	{
+		return m_ReservedWidget;
+	}
+	
+	Widget GetMountedWidget()
+	{
+		return m_MountedWidget;
+	}
+	
+	ItemPreviewWidget GetRender()
+	{
+		return m_ItemPreview;
+	}
+
+	ImageWidget GetGhostSlot()
+	{
+		return m_GhostSlot;
+	}
+
+	Widget GetColorWidget()
+	{
+		return m_ColorWidget;
+	}
+
+	Widget GetSelectedPanel()
+	{
+		return m_SelectedPanel;
+	}
+	
+	Widget GetEmptySelectedPanel()
+	{
+		return m_EmptySelectedPanel;
+	}
+	
+	Widget GetMicromanagedPanel()
+	{
+		return m_MicromanagedPanel;
+	}
+
+	Widget GetQuantityPanel()
+	{
+		return m_QuantityPanel;
+	}
+	
+	Widget GetOutOfReachWidget()
+	{
+		return m_OutOfReachWidget;
+	}
+
+	TextWidget GetQuantityItem()
+	{
+		return m_QuantityItem;
+	}
+	
+	ProgressBarWidget GetQuantityProgress()
+	{
+		return m_QuantityProgress;
+	}
+	
+	Widget GetQuantityStack()
+	{
+		return m_QuantityStack;
+	}
+
+	Widget GetItemSizePanel()
+	{
+		return m_ItemSizePanel;
+	}
+	
+	TextWidget GetItemSizeWidget()
+	{
+		return m_ItemSizeWidget;
+	}
+
+	Widget GetAmmoIcon()
+	{
+		return m_AmmoIcon;
+	}
+
+	Widget GetRadialIconPanel()
+	{
+		return m_RadialIconPanel;
+	}
+
+	Widget GetRadialIconClosed()
+	{
+		return m_RadialIconClosed;
+	}
+
+	Widget GetRadialIcon()
+	{
+		return m_RadialIcon;
+	}
+	
+	bool IsFocused()
+	{
+		return GetCursorWidget().IsVisible();
+	}
+
+	override void SetActive( bool active )
+	{
+#ifdef PLATFORM_CONSOLE	
+		super.SetActive( active );
+		float x, y;
+		if( active && GetObject() )
+		{
+			GetMainWidget().GetScreenPos( x, y );
+			PrepareOwnedTooltip( EntityAI.Cast( GetObject() ), x, y );
+		}
+		else if (active)
+		{
+			GetMainWidget().GetScreenPos( x, y );
+			PrepareOwnedSlotsTooltip( GetMainWidget(), m_SlotDisplayName, m_SlotDesc, x, y );
+		}
+		
+		m_SelectedPanel.Show( active );
+#endif
+	}
+	
+	override void SetLayoutName()
+	{
+		m_LayoutName = "";
+	}
+
+	override void Refresh()
+	{
+		if( m_HasTemperature )
+			SetTemperature();
+		if( m_IsWeapon )
+			RefreshMuzzleIcon();
+		if( m_HasQuantity )
+			SetQuantity();
+	}
+
+	void SetTemperature()
+	{
+		ItemManager.GetInstance().SetIconTemperature( EntityAI.Cast( m_Obj ), m_MainWidget );
+	}
+
+	Object GetObject()
+	{
+		return m_Obj;
+	}
+	
+	EntityAI GetEntity()
+	{
+		return EntityAI.Cast( m_Obj );
+	}
+	
+	ItemBase GetItem()
+	{
+		return m_Item;
+	}
+	
+	void RefreshMuzzleIcon()
+	{
+		Weapon_Base wpn = Weapon_Base.Cast( GetObject() );
+		if( wpn )
+		{
+			if( wpn.IsShowingChamberedBullet() )
+			{
+				int mi = wpn.GetCurrentMuzzle();
+				m_AmmoIcon.Show( wpn.IsChamberFull( mi ) );
+				
+			}
+			else
+			{
+				m_AmmoIcon.Show( false );
+			}
+		}
+	}
+	
+	void SetQuantity()
+	{
+		if (m_Item)
+		{
+			int quantityType = QuantityConversions.HasItemQuantity(m_Item);
+			if (quantityType != QUANTITY_HIDDEN && m_CurrQuantity != QuantityConversions.GetItemQuantity(m_Item))
+			{
+				m_CurrQuantity = QuantityConversions.GetItemQuantity(m_Item);
+	
+				if (quantityType == QUANTITY_COUNT)
+				{
+					string q_text = QuantityConversions.GetItemQuantityText(m_Item, true);
+
+					if (QuantityConversions.GetItemQuantityMax(m_Item) == 1 || q_text == "")
+					{
+						m_QuantityStack.Show(false);
+					}
+					else
+					{
+						m_QuantityItem.SetText(q_text);
+						m_QuantityStack.Show(true);
+					}
+					
+					m_QuantityProgress.Show(false);
+				}
+				else if (quantityType == QUANTITY_PROGRESS)
+				{
+					float progress_max	= m_QuantityProgress.GetMax();
+					int max 			= m_Item.GetQuantityMax();
+					int count 			= m_Item.ConfigGetInt("count");
+					float quantity 		= m_CurrQuantity;
+	
+					if (count > 0)
+					{
+						max = count;
+					}
+
+					if (max > 0)
+					{
+						float value = Math.Round((quantity / max) * 100);
+						m_QuantityProgress.SetCurrent(value);
+					}
+					m_QuantityStack.Show(false);
+					m_QuantityProgress.Show(true);
+				}
+			}
+		}
+	}
+	
+	void SetItemPreview()
+	{
+		m_ItemPreview.Show( true );
+		m_ItemPreview.SetItem( EntityAI.Cast( m_Obj ) );
+		m_ItemPreview.SetModelOrientation( "0 0 0" );
+		m_ItemPreview.SetView( m_Obj.GetViewIndex() );
+	}
+	
+	void SetItemSize()
+	{
+		if( m_HasItemSize )
+		{
+			int size_x, size_y;
+			GetGame().GetInventoryItemSize( InventoryItem.Cast( m_Obj ), size_x, size_y );
+			
+			m_ItemSizePanel.Show( true );
+			m_ItemSizeWidget.SetText( ( size_x * size_y ).ToString() );
+		}
+	}
+	
+	void UpdateFlip( bool flipped )
+	{
+		if( !m_Reserved )
+		{
+			float x_content, y_content;
+			GetPanelWidget().GetScreenSize( x_content, y_content );
+			GetPanelWidget().SetSize( y_content, x_content );
+		}
+	}
+
+	void Init( EntityAI obj, bool reservation = false )
+	{
+		if( m_Obj != obj )
+		{
+			ClearRemainSelected();
+			m_Obj	= obj;
+			m_Item	= ItemBase.Cast( m_Obj );
+			m_Obj.GetOnItemFlipped().Insert( UpdateFlip );
+			m_Obj.GetOnViewIndexChanged().Insert( SetItemPreview );
+			m_Reserved = reservation;
+			m_Container	= null;
+			
+			if(reservation)
+			{
+				ItemManager.GetInstance().SetWidgetDraggable( m_PanelWidget, false );
+				
+				m_IsWeapon = false;
+				m_IsMagazine = false;
+				m_HasTemperature = false;
+				m_HasQuantity = false;
+				m_HasItemSize = false;
+			}
+			else
+			{
+				CheckIsWeapon();
+				CheckIsMagazine();
+				CheckHasTemperature();
+				CheckHasQuantity();
+				CheckHasItemSize();
+			}
+
+			m_ReservedWidget.Show(reservation);
+
+			SetItemPreview();
+			
+			m_GhostSlot.Show( false );
+			m_PanelWidget.Show( true );
+			
+			Refresh();
+#ifdef PLATFORM_CONSOLE			
+			if ( IsFocused() )
+			{
+				Inventory.GetInstance().UpdateConsoleToolbar();
+			}
+#endif
+		}
+	}
+	
+	void ClearRemainSelected()
+	{
+		if (m_IsDragged)
+		{
+			OnIconDrop(m_PanelWidget);
+			Widget a = CancelWidgetDragging();
+			ItemManager.GetInstance().SetWidgetDraggable( a, false );
+		}
+		if (m_Obj)
+		{
+			m_Obj.GetOnItemFlipped().Remove( UpdateFlip );
+			m_Obj.GetOnViewIndexChanged().Remove( SetItemPreview );
+			HideOwnedTooltip();
+		}
+			
+		m_Obj = null;
+		m_Item = null;
+		m_Container	= null;
+		
+		m_ItemPreview.Show( false );
+		m_ItemPreview.SetItem( null );
+		
+		m_CurrQuantity = -1;
+		m_IsWeapon = false;
+		m_IsMagazine = false;
+		m_HasTemperature = false;
+		m_HasQuantity = false;
+		m_HasItemSize = false;
+		
+		m_GhostSlot.Show( true );
+		m_AmmoIcon.Show( false );
+		m_PanelWidget.Show( false );
+		m_RadialIconPanel.Show( false );
+		
+		m_QuantityPanel.Show( false );
+		if(GetSlotID() != -1)
+		{
+			int stack_max = InventorySlots.GetStackMaxForSlotId( GetSlotID() );
+			if(stack_max > 1)
+			{
+				m_QuantityPanel.Show( true );
+				m_QuantityItem.SetText( string.Format("0/%1", stack_max.ToString()) );
+				m_QuantityStack.Show( true );
+				m_QuantityProgress.Show( false );
+				m_PanelWidget.Show( true );
+				m_ItemPreview.Show( true );
+			}
+		}
+		
+		m_ColWidget.Show( false );
+		m_MountedWidget.Show( false );
+		m_OutOfReachWidget.Show( false );
+		m_ReservedWidget.Show( false );
+		
+		if( m_ItemSizePanel )
+			m_ItemSizePanel.Show( false );
+		
+		if( m_ColorWidget )
+			m_ColorWidget.Show( false );
+		
+		Refresh();
+	}
+	
+	void Clear()
+	{
+		#ifdef PLATFORM_CONSOLE	
+		m_SelectedPanel.Show(false);
+		#endif
+		m_CursorWidget.Show(false);
+		m_EmptySelectedPanel.Show(false);
+		
+		ClearRemainSelected();
+	}
+	
+	void CheckIsWeapon()
+	{
+		m_IsWeapon = ( Weapon_Base.Cast( m_Obj ) != null );
+	}
+	
+	void CheckIsMagazine()
+	{
+		m_IsMagazine = ( Magazine.Cast( m_Obj ) != null );
+	}
+	
+	void CheckHasTemperature()
+	{
+		if( m_Item )
+		{
+			m_HasTemperature = ( m_Item.GetTemperatureMax() != 0 && m_Item.GetTemperatureMin() != 0 );
+		}
+	}
+	
+	void CheckHasQuantity()
+	{
+		if( m_Item )
+		{
+			m_HasQuantity = ( QuantityConversions.HasItemQuantity( m_Item ) != QUANTITY_HIDDEN );
+			if( m_HasQuantity )
+			{
+				m_QuantityPanel.Show( true );
+			}
+		}
+	}
+	
+	void CheckHasItemSize()
+	{
+		#ifdef PLATFORM_CONSOLE
+		string config = "CfgVehicles " + m_Obj.GetType() + " GUIInventoryAttachmentsProps";
+		m_HasItemSize = ( InventoryItem.Cast( m_Obj ) && !GetGame().ConfigIsExisting( config ) );
+		#else
+		m_HasItemSize = false;
+		#endif
+	}
+	
+	bool IsOutOfReach()
+	{
+		bool oot = ( m_OutOfReachWidget.IsVisible() || m_MountedWidget.IsVisible() );
+		return oot;
+	}
+	
+	bool MouseEnter(Widget w, int x, int y)
+	{
+		if( m_Reserved )
+			return MouseEnterGhostSlot(w, x, y);
+		
+		PrepareOwnedTooltip( m_Item, x, y );
+		if( GetDragWidget() != m_PanelWidget && !IsOutOfReach() )
+		{
+			m_CursorWidget.Show( true );
+		}
+		return true;
+	}
+	
+	bool MouseEnterGhostSlot(Widget w, int x, int y)
+	{
+		float pos_x, pos_y;
+		m_MainWidget.GetScreenPos(pos_x, pos_y);
+
+		x = pos_x;
+		y = pos_y;
+		
+		PrepareOwnedSlotsTooltip( m_MainWidget, m_SlotDisplayName, m_SlotDesc, x, y );
+		if( GetDragWidget() != m_PanelWidget )
+		{
+			m_EmptySelectedPanel.Show( true );
+		}
+		
+		
+		return true;
+	}
+
+	bool MouseLeave( Widget w, Widget s, int x, int y	)
+	{
+		if( m_Reserved )
+			return MouseLeaveGhostSlot(w, s, x, y);
+		
+		HideOwnedTooltip();
+		if( GetDragWidget() != m_PanelWidget )
+		{
+			m_CursorWidget.Show( false );
+		}
+		return true;
+	}
+	
+	bool MouseLeaveGhostSlot( Widget w, Widget s, int x, int y	)
+	{
+		HideOwnedSlotsTooltip();
+		
+		if( GetDragWidget() != m_PanelWidget )
+		{
+			m_EmptySelectedPanel.Show( false );
+		}
+		
+		return true;
+	}
+	
+	override void UpdateInterval()
+	{
+		if( m_Item )
+		{
+			if( m_HasTemperature )
+				SetTemperature();
+			if( m_IsWeapon )
+				RefreshMuzzleIcon();
+			if( m_HasQuantity )
+				SetQuantity();
+			if( m_HasItemSize )
+				SetItemSize();
+		}
+	}
+	
+	void OnIconDrag( Widget w )
+	{
+		if(!m_Obj || !w)
+		{
+			return;
+		}
+		ItemManager.GetInstance().HideDropzones();
+		if( m_Obj.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+		{
+			ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+		}
+		else
+		{
+			ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+		}
+
+		ItemManager.GetInstance().SetIsDragging( true );
+		int icon_x, icon_y;
+		float icon_size, y;
+		int m_sizeX, m_sizeY;
+
+		if( m_Item )
+		{
+			GetGame().GetInventoryItemSize( m_Item, icon_x, icon_y );
+			
+			CargoContainer c_parent = CargoContainer.Cast( m_Parent );
+			HandsPreview h_parent = HandsPreview.Cast( m_Parent );
+
+			if( GetRoot().m_MainWidget.FindAnyWidget( "HandsPanel" ) )
+			{
+				GetRoot().m_MainWidget.FindAnyWidget( "HandsPanel" ).GetScreenSize( icon_size, y );
+			}
+			
+			icon_size = icon_size / 10;
+			
+			w.SetFlags( WidgetFlags.EXACTSIZE );
+			m_ItemPreview.SetForceFlipEnable(false);
+			
+			if( !m_Item.GetInventory().GetFlipCargo() )
+			{
+				w.SetSize( icon_x * icon_size , icon_y * icon_size );
+			}
+			else
+			{
+				w.SetSize( icon_y * icon_size , icon_x * icon_size );
+			}
+		
+			m_ColWidget.Show( true );
+			m_CursorWidget.Show( true );
+			
+			ItemManager.GetInstance().SetDraggedItem( m_Item );
+		}
+		m_IsDragged = true;
+	}
+	
+	void OnIconDrop( Widget w )
+	{
+		m_IsDragged = false;
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+		w.ClearFlags( WidgetFlags.EXACTSIZE );
+		w.SetSize( 1, 1 );
+		m_ColWidget.Show( false );
+		m_CursorWidget.Show( false );
+		m_EmptySelectedPanel.Show( false );
+		m_CursorWidget.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		m_ItemPreview.SetForceFlipEnable(true);
+	}
+	
+	static int GetNormalWidth()
+	{
+		return m_NormalWidth;
+	}
+	
+	static int GetNormalHeight()
+	{
+		return m_NormalHeight;
+	}
+	
+	/*override void HideOwnedSlotsTooltip()
+	{
+		if (m_TooltipOwner)
+		{
+			ItemManager.GetInstance().HideTooltipSlot();
+			m_TooltipOwner = false;
+		}
+	}*/
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/AttachmentsGroupContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/AttachmentsGroupContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..c4ee7001309cf70257beb707889277dabf0c3aec
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/AttachmentsGroupContainer.c
@@ -0,0 +1,161 @@
+class AttachmentsGroupContainer: Container
+{
+	ref Header m_Header;
+	
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.AttachmentsGroupContainer;
+	}
+	
+	override void SetHeader(Header header)
+	{
+		m_Header = header;
+		m_Header.GetMainWidget().SetFlags( WidgetFlags.IGNOREPOINTER );
+	}
+	
+	override Header GetHeader()
+	{
+		return m_Header;
+	}
+	
+	void AttachmentsGroupContainer(LayoutHolder parent) 
+	{
+		m_FocusedColumn = 0;
+	}
+	
+	override void SetActive(bool active)
+	{
+		super.SetActive(active);
+		if (!active)
+		{
+			m_FocusedColumn = 0;
+		}
+	}
+	
+	override void SetDefaultFocus(bool while_micromanagment_mode = false)
+	{
+		super.SetDefaultFocus();
+		m_FocusedColumn = 0;
+	}
+	
+	SlotsIcon GetSlotsIcon(int row, int column, bool include_invisible = true )
+	{
+		SlotsContainer c;
+		if (include_invisible)
+		{
+			c = SlotsContainer.Cast(m_Body[row]);	
+		}
+		else
+		{
+			c = SlotsContainer.Cast(m_OpenedContainers[row]);
+		}
+		return c.GetSlotIcon(column);
+	}
+	
+	int GetRowCount(bool include_invisible = true)
+	{
+		if (include_invisible)
+		{
+			return m_Body.Count();
+		}
+		else
+		{
+			return m_OpenedContainers.Count();
+		}
+	}
+	
+	int GetColumnCountForRow(int row, bool include_invisible = true)
+	{
+		Container c;
+		if (include_invisible)
+		{
+			c = Container.Cast(m_Body[row]);
+		}
+		else
+		{
+			c = Container.Cast(m_OpenedContainers[row]);
+		}
+		 return c.GetColumnCount();
+	}
+	
+	override void SetNextActive()
+	{
+		HideOwnedTooltip();
+		int visible_focus = 0;
+
+		SlotsContainer active;
+		if (m_OpenedContainers.Count())
+		{
+			active = SlotsContainer.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}		
+		
+		if (active && active.IsActive())
+		{
+			visible_focus = active.GetVisibleFocus();
+			active.SetNextActive();
+		}
+		if (!active || !active.IsActive())
+		{
+			SlotsContainer next;
+			if (!IsLastContainerFocused())
+			{
+				m_ActiveIndex++;
+				
+				//int visible_focus = active.GetVisibleFocus();
+				
+				next = SlotsContainer.Cast(m_OpenedContainers[m_ActiveIndex]);
+				next.SetActive(true);
+				next.SetVisibleFocus(visible_focus);
+			} 
+			else if (Container.Cast( GetParent() ))
+			{
+				SetActive(false);
+			}
+			else
+			{
+				SetActive(false);
+				SetFirstActive();
+			}
+		}
+	}
+	
+	override void SetPreviousActive(bool force = false)
+	{
+		HideOwnedTooltip();
+		int visible_focus = 0;
+		
+		SlotsContainer active;
+		if (m_OpenedContainers.Count())
+		{
+			active = SlotsContainer.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}
+		
+		if (active && active.IsActive())
+		{
+			visible_focus = active.GetVisibleFocus();
+			active.SetPreviousActive();
+		}
+		
+		if (!active || !active.IsActive())
+		{
+			SlotsContainer prev;
+			if (!IsFirstContainerFocused())
+			{
+				m_ActiveIndex--;
+				
+				prev = SlotsContainer.Cast(m_OpenedContainers[m_ActiveIndex]);
+				prev.SetActive(true);
+				prev.SetVisibleFocus(visible_focus);
+			} 
+			else if (Container.Cast( GetParent() ))
+			{
+				SetActive(false);
+			}
+			else
+			{
+				SetActive(false);
+				SetLastActive();
+			}			
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/AttachmentsWrapper.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/AttachmentsWrapper.c
new file mode 100644
index 0000000000000000000000000000000000000000..655ed3d4313353bddd870389e9dc329e4d09df98
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/AttachmentsWrapper.c
@@ -0,0 +1,122 @@
+class AttachmentsWrapper: AttachmentsGroupContainer
+{
+	Attachments m_Attachments;
+	protected Widget m_AttachmentsFalseHeader;
+	protected RichTextWidget m_AttachmentsFalseHeaderText;
+	
+	void AttachmentsWrapper(LayoutHolder parent) 
+	{
+		m_AttachmentsFalseHeader 		= m_RootWidget.FindAnyWidget( "attachmets_wrapper_header_spacer" );
+		m_AttachmentsFalseHeaderText 	= RichTextWidget.Cast(m_AttachmentsFalseHeader.FindAnyWidget("TextWidget0"));
+		m_AttachmentsFalseHeader.Show( false );
+	}
+	
+	void SetParent( Attachments atts )
+	{
+		m_Attachments = atts;
+	}
+	
+	override bool Select()
+	{
+		return m_Attachments.Select();
+	}
+	
+	override bool SelectItem()
+	{
+		return m_Attachments.SelectItem();
+	}
+	
+	override bool Combine()
+	{
+		return m_Attachments.Combine();
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		if (CanDrop())
+		{
+			return m_Attachments.TransferItemToVicinity();
+		}
+		return false;
+	}
+	
+	override bool TransferItem()
+	{
+		if (CanTakeToInventory())
+		{
+			return m_Attachments.TransferItem();
+		}
+		return false;
+	}
+	
+	override bool InspectItem()
+	{
+		return m_Attachments.InspectItem();
+	}
+	
+	override bool SplitItem()
+	{
+		return m_Attachments.SplitItem();
+	}
+	
+	override bool EquipItem()
+	{
+		return m_Attachments.EquipItem();
+	}
+	
+	override bool CanEquip()
+	{
+		return m_Attachments.CanEquip();
+	}
+	
+	override bool CanCombine()
+	{
+		return m_Attachments.CanCombine();
+	}
+	
+	override bool CanCombineAmmo()
+	{
+		return m_Attachments.CanCombineAmmo();
+	}
+	
+	override bool IsDisplayable()
+	{
+		return !IsEmpty();
+	}
+	
+	override bool IsItemActive()
+	{
+		return m_Attachments.IsItemActive();
+	}
+
+	override bool IsItemWithQuantityActive()
+	{
+		return m_Attachments.IsItemWithQuantityActive();
+	}
+	
+	override void UpdateInterval()
+	{
+		super.UpdateInterval();
+		m_Attachments.UpdateInterval();
+	}
+	
+	int GetFocusedSlot()
+	{
+		return m_Attachments.GetFocusedSlot();
+	}
+	
+	void ShowFalseAttachmentsHeader(bool show)
+	{
+		m_AttachmentsFalseHeader.Show(show);
+	}
+	
+	void SetFalseAttachmentsHeaderText(string text)
+	{
+		m_AttachmentsFalseHeaderText.SetText(text);
+	}
+	
+	TextWidget GetFalseHeaderTextWidget()
+	{
+		return m_AttachmentsFalseHeaderText;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/ClosableContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/ClosableContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..f8c31dc4b5fda2ed9af335a8ed23bcbde4628172
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/ClosableContainer.c
@@ -0,0 +1,215 @@
+class ClosableContainer extends Container
+{
+	protected ref ClosableHeader	m_ClosableHeader;
+	protected bool					m_LockCargo;
+
+	void ClosableContainer( LayoutHolder parent, int sort = -1 )
+	{
+		m_Body				= new array<ref LayoutHolder>;
+		m_ClosableHeader	= new ClosableHeader( this, "CloseButtonOnMouseButtonDown" );
+		
+		if( sort > -1 )
+			m_RootWidget.SetSort( sort + 2 );
+		
+		m_MainWidget = m_MainWidget.FindWidget( "body" );
+	}
+	
+	override bool IsDisplayable()
+	{
+		for(int i = 0; i < m_Body.Count(); i++)
+		{
+			LayoutHolder c = m_Body[i];
+			if( c && c.IsDisplayable())
+				return true;
+		}
+		return false;
+	}
+	
+	override void UpdateRadialIcon()
+	{
+		if ( m_SlotIcon )
+		{
+			bool show_radial_icon;
+			show_radial_icon = IsOpened();
+			show_radial_icon = show_radial_icon && ( ( m_Entity.GetInventory().GetCargo() && m_Entity.CanDisplayCargo()) || m_Entity.GetSlotsCountCorrect() > 0 );
+			show_radial_icon = show_radial_icon && !m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT );
+			if ( IsDisplayable() )
+			{
+				m_SlotIcon.GetRadialIconPanel().Show( true );
+				SetOpenForSlotIcon(show_radial_icon);
+			}
+			else
+			{
+				m_SlotIcon.GetRadialIconPanel().Show( false );
+			}
+		}
+	}
+	
+	void SetOpenState( bool state )
+	{
+		ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), state );
+		m_Closed = !state;
+		if( !m_Closed )
+		{
+			OnShow();
+		}
+		else
+		{
+			OnHide();
+		}
+	}
+	
+	override Header GetHeader()
+	{
+		return m_ClosableHeader;
+	}
+	
+	override void Open()
+	{
+		if( IsDisplayable() )
+		{
+			super.Open();
+			ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), true );
+			SetOpenForSlotIcon(true);
+			OnShow();
+			m_Parent.m_Parent.Refresh();
+		}
+	}
+
+	override void Close()
+	{
+		ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), false );
+		super.Close();
+		SetOpenForSlotIcon(false);
+		OnHide();
+		m_Parent.m_Parent.Refresh(); //TODO: ???
+	}
+	
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.ClosableContainer;
+	}
+
+	override void OnShow()
+	{
+		if( IsOpened() )
+		{
+			super.OnShow();
+		}
+	}
+
+	override LayoutHolder Get( int x )
+	{
+		if( m_Body && x < m_Body.Count() && x >= 0 )
+			return m_Body.Get( x );
+		return null;
+	}
+
+	override void Refresh()
+	{
+		if( !m_Closed )
+		{
+			super.Refresh();
+		}
+	}
+
+	void CloseButtonOnMouseButtonDown()
+	{
+		Close();
+	}
+	
+	override float GetFocusedContainerHeight( bool contents = false )
+	{
+		float x, y;
+		if( contents && GetFocusedContainer() )
+			y = GetFocusedContainer().GetFocusedContainerHeight( contents );
+		else if( GetRootWidget() )
+			GetRootWidget().GetScreenSize( x, y );
+		return y;
+	}
+	
+	override float GetFocusedContainerYPos( bool contents = false )
+	{
+		float x, y;
+		if( contents && GetFocusedContainer() )
+			y = GetFocusedContainer().GetFocusedContainerYPos( contents );
+		else if( GetRootWidget() )
+			GetRootWidget().GetPos( x, y );
+		return y;
+	}
+	
+	override float GetFocusedContainerYScreenPos( bool contents = false )
+	{
+		float x, y;
+		if( contents && GetFocusedContainer() )
+			y = GetFocusedContainer().GetFocusedContainerYScreenPos( contents );
+		else if( GetRootWidget() )
+			GetRootWidget().GetScreenPos( x, y );
+		return y;
+	}
+	
+	void MoveContainerUp( Widget cont )
+	{
+		if( m_Entity )
+		{
+			InventoryLocation loc = new InventoryLocation;
+			m_Entity.GetInventory().GetCurrentInventoryLocation( loc );
+			if( loc.IsValid() )
+			{
+				int slot = loc.GetSlot();
+				Inventory.MoveAttachmentUp( slot );
+				UpdateSelectionIcons();
+			}
+		}
+	}
+	
+	void MoveContainerDown( Widget cont )
+	{
+		if( m_Entity )
+		{
+			InventoryLocation loc = new InventoryLocation;
+			m_Entity.GetInventory().GetCurrentInventoryLocation( loc );
+			if( loc.IsValid() )
+			{
+				int slot = loc.GetSlot();
+				Inventory.MoveAttachmentDown( slot );
+				UpdateSelectionIcons();
+			}
+		}
+	}
+	
+	override void CheckHeaderDragability()
+	{
+		super.CheckHeaderDragability();
+		
+		if (m_ClosableHeader && m_Entity) //TODO: do the entity check here?
+		{
+			int flag = m_ClosableHeader.GetMainWidget().GetFlags();
+			bool old = flag & WidgetFlags.DRAGGABLE;
+			bool current = ItemBase.Cast(m_Entity) && m_Entity.IsTakeable();
+			//bool changed = false;
+			if (old && !current)
+			{
+				m_ClosableHeader.GetMainWidget().ClearFlags( WidgetFlags.DRAGGABLE );
+				Widget drag = GetDragWidget();
+				if (drag && drag == m_ClosableHeader.GetMainWidget())
+				{
+					CancelWidgetDragging();
+					m_ClosableHeader.OnDropHeader(null);
+				}
+				
+				//changed = true;
+			}
+			else if (!old && current)
+			{
+				m_ClosableHeader.GetMainWidget().SetFlags( WidgetFlags.DRAGGABLE );
+				//changed = true;
+			}
+			/*if (old != current)
+			{
+				flag &= ~WidgetFlags.DRAGGABLE;
+				m_ClosableHeader.GetMainWidget().SetFlags( flag );
+			}*/
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/CollapsibleContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/CollapsibleContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..aab773e3462564b7e30b35e9e6bd4487b9fa219d
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/CollapsibleContainer.c
@@ -0,0 +1,193 @@
+class CollapsibleContainer: Container
+{
+	protected ref CollapsibleHeader		m_CollapsibleHeader;
+	protected bool						m_Hidden;
+	
+	void CollapsibleContainer( LayoutHolder parent, int sort = -1 )
+	{
+		m_MainWidget.Show( true );
+
+		if ( sort > -1 )
+			m_MainWidget.SetSort( sort + 2 );
+		
+		m_MainWidget = m_MainWidget.FindAnyWidget( "header" );
+		
+		m_Body = new array<ref LayoutHolder>;
+		m_CollapsibleHeader = new CollapsibleHeader( this, "CollapseButtonOnMouseButtonDown" );
+	}
+	
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.CollapsibleContainer;
+	}
+
+	EntityAI GetEntity()
+	{
+		return m_Entity;
+	}
+
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver ) { }
+
+	override void Refresh()
+	{
+		super.Refresh();
+	}
+
+	override void OnShow()
+	{
+		super.OnShow();
+		m_Hidden = false;
+		for (int i = 0; i < m_Body.Count(); i++)
+		{
+			m_Body.Get( i ).OnShow();
+			Container c = Container.Cast(m_Body.Get(i));
+			if (c)
+			{
+				c.Open();
+			}
+		}
+		SetCollapsibleHeaderArrowState(m_Hidden);
+	}
+	
+	override void OnHide()
+	{
+		m_Hidden = true;
+		if (m_CollapsibleHeader)
+		{
+			SetCollapsibleHeaderArrowState(m_Hidden);
+		}
+		else
+		{
+			super.OnHide();
+		}
+		
+	}
+	
+	override void Insert( LayoutHolder container, int pos = -1, bool immedUpdate = true )
+	{
+		super.Insert( container, pos, immedUpdate );
+		
+		//if ( immedUpdate )
+		//{
+			RecomputeOpenedContainers();
+			UpdateCollapseButtons();
+		//}
+		
+		SetCollapsibleHeaderArrowState(m_Hidden);
+	}
+	
+	override void Remove( LayoutHolder container )
+	{
+		super.Remove( container );
+		RecomputeOpenedContainers();
+		UpdateCollapseButtons();
+	}
+	
+	bool CanDisplayAnyCategory()
+	{
+		return false;
+	}
+	
+	void UpdateCollapseButtons()
+	{
+		#ifndef PLATFORM_CONSOLE
+		if (m_Body.Count() < 2)
+		{
+			if (m_CollapsibleHeader)
+			{
+				m_CollapsibleHeader.ShowCollapseButton(false);
+			}
+		}
+		else
+		{
+			if (m_CollapsibleHeader)
+			{
+				m_CollapsibleHeader.ShowCollapseButton(true);
+			}
+		}
+		#endif
+	}
+	
+	void LoadDefaultState()
+	{
+		m_Hidden = !ItemManager.GetInstance().GetDefaultHeaderOpenState( "VICINITY" );
+		//m_Closed = m_Hidden;
+		
+		if ( m_Hidden )
+		{
+			OnHide();
+		}
+		else
+		{
+			OnShow();
+		}
+	}
+	
+	bool IsHidden()
+	{
+		return m_Hidden;
+	}
+	
+	void CollapseButtonOnMouseButtonDown( Widget w )
+	{
+		Toggle();
+	}
+	
+	override void Toggle()
+	{
+		if (!m_Hidden)
+		{
+			for (int i = 1; i < m_Body.Count(); i++)
+			{
+				m_Body.Get( i ).OnHide();
+				Container c = Container.Cast(m_Body.Get(i));
+				if (c)
+				{
+					c.Close();
+				}
+			}
+			OnHide();
+		}
+		else
+		{
+			OnShow();
+		}
+		m_Closed = m_Hidden;
+		
+		SetCollapsibleHeaderArrowState(m_Hidden);
+
+		UpdateCollapseButtons();
+	}
+	
+	override bool OnChildRemove( Widget w, Widget child )
+	{
+		if( w == GetMainWidget() )
+			GetMainWidget().Update();
+		return true;
+	}
+	
+	override bool OnChildAdd( Widget w, Widget child )
+	{
+		if( w == GetMainWidget() )
+			GetMainWidget().Update();
+		return true;
+	}
+	
+	override Header GetHeader()
+	{
+		return m_CollapsibleHeader;
+	}
+	
+	override void SetHeader(Header header)
+	{
+		m_CollapsibleHeader = CollapsibleHeader.Cast(header);
+	}
+	
+	void SetCollapsibleHeaderArrowState(bool open)
+	{
+		if (m_CollapsibleHeader)
+		{
+			m_CollapsibleHeader.SetArrowButtonOpened(open);
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/Container.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/Container.c
new file mode 100644
index 0000000000000000000000000000000000000000..7e8e5dc06f44c3e640e0117b630ada092a5dbbc5
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/Container.c
@@ -0,0 +1,1185 @@
+class Container extends LayoutHolder
+{
+	protected ref array<ref LayoutHolder>	m_Body;
+	protected ref array<LayoutHolder>		m_OpenedContainers;
+	protected int							m_ActiveIndex = 0;
+	protected bool							m_LastIndex; //deprecated 
+	protected bool							m_Closed;
+	protected Container 					m_FocusedContainer;
+	protected float							m_PrevAlpha;
+	const int ITEMS_IN_ROW = 8;
+	
+	//protected int							m_RowCount;
+	protected int							m_ColumnCount;
+	
+	protected int							m_FocusedColumn = 0;
+	protected bool							m_ForcedHide;
+	protected bool							m_ForcedShow; //used to override displayability condition, but 'm_ForcedHide' takes preference
+	
+	protected SlotsIcon						m_SlotIcon;
+	protected EntityAI						m_Entity;
+	
+	const int SORT_ATTACHMENTS_OWN = 1; //direct attachments of the parent item
+	const int SORT_CARGO_OWN = 2; //cargo of the parent item
+	const int SORT_ATTACHMENTS_NEXT_OFFSET = 2;
+	const int SORT_CARGO_NEXT_OFFSET = 3;
+
+	void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver );
+	void DraggingOver( Widget w, int x, int y, Widget receiver );
+	void DraggingOverHeader( Widget w, int x, int y, Widget receiver );
+	void UpdateSpacer();
+	Header GetHeader();
+	void SetHeader(Header header);
+	void CheckHeaderDragability();
+	
+	void Container( LayoutHolder parent )
+	{
+		m_Body = new array<ref LayoutHolder>;
+		m_OpenedContainers = new array<LayoutHolder>;
+		m_PrevAlpha = m_RootWidget.GetAlpha();
+		m_SlotIcon = null;
+		m_ForcedHide = false;
+		m_ForcedShow = false;
+		
+		m_ActiveIndex = 0;
+		m_IsActive = false;
+	}
+	
+	Container GetFocusedContainer()
+	{
+		if (m_ActiveIndex < m_OpenedContainers.Count())
+		{
+			return Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}
+		return null;
+	}
+	
+	Container GetContainer(int index)
+	{
+		if (index < m_Body.Count())
+		{
+			return Container.Cast( m_Body[index] );
+		}
+		return null;
+	}
+	
+	
+	void SetFocusedContainer( Container cont )
+	{
+		m_FocusedContainer = cont;
+	}
+	
+	SlotsIcon GetFocusedSlotsIcon()
+	{
+		Container c = GetFocusedContainer();
+		if (c)
+		{
+			return c.GetFocusedSlotsIcon();
+		}
+		return null;
+	}
+	
+	int GetActiveIndex()
+	{
+		return m_ActiveIndex;
+	}
+	
+	void SetActiveIndex( int index )
+	{
+		m_ActiveIndex = index;
+	}
+	
+	ScrollWidget GetScrollWidget()
+	{
+		return null;
+	}
+	
+	void UpdateRadialIcon()
+	{
+		if ( m_SlotIcon )
+		{
+			m_SlotIcon.GetRadialIconPanel().Show( false );
+		}
+	}
+	
+	void SetSlotIcon( SlotsIcon icon )
+	{
+		m_SlotIcon = icon;
+	}
+	
+	void SetDefaultFocus(bool while_micromanagment_mode = false)
+	{
+		m_ActiveIndex = 0;
+	}
+	
+	void SetLastFocus()
+	{
+		m_ActiveIndex = 0;
+		m_FocusedColumn = 0;
+		if ( m_OpenedContainers.Count() > 0 )
+		{
+			m_ActiveIndex = m_OpenedContainers.Count() - 1;
+		}
+	}
+	
+	void Unfocus()
+	{
+	}
+	
+	void MoveGridCursor(int direction)
+	{
+		if ( direction == Direction.UP )
+		{
+			SetPreviousActive();
+		}
+		else if ( direction == Direction.DOWN )
+		{
+			SetNextActive();
+		}
+		else if ( direction == Direction.RIGHT )
+		{
+			SetNextRightActive();
+		}
+		else if ( direction == Direction.LEFT )
+		{
+			SetNextLeftActive();
+		}
+		
+		UpdateSelectionIcons();
+		
+		Inventory.GetInstance().UpdateConsoleToolbar();
+	}
+
+	void ScrollToActiveContainer()
+	{
+		ScrollWidget sw = GetScrollWidget();
+		if (sw)
+		{
+			float x, y, y_s;
+			
+			sw.GetScreenPos( x, y );
+			sw.GetScreenSize( x, y_s );
+			float f_y,f_h;
+			float amount;
+			f_y = GetFocusedContainerYScreenPos( true );
+			f_h = GetFocusedContainerHeight( true );
+			
+			float next_pos	= f_y + f_h;
+				
+			if (next_pos > ( y + y_s ))
+			{
+				amount	=  sw.GetVScrollPos() + next_pos - ( y + y_s ) + 2;
+				sw.VScrollToPos( amount );
+			}
+			else if (f_y < y)
+			{
+				amount = sw.GetVScrollPos() + f_y - y - 2;
+				sw.VScrollToPos(amount);
+			}
+			
+			//CheckScrollbarVisibility();
+		}
+	}
+	
+	void CheckScrollbarVisibility()
+	{
+		ScrollWidget sw = GetScrollWidget();
+		if (sw)
+		{
+			if (!sw.IsScrollbarVisible())
+			{
+				sw.VScrollToPos01(0.0);
+			}
+			else if (sw.GetVScrollPos01() > 1.0)
+			{
+				sw.VScrollToPos01(1.0);
+			}
+		}
+	}
+	
+	void Open()
+	{
+		m_Closed = false;
+		UpdateSelectionIcons();
+	}
+	
+	void Close()
+	{
+		m_Closed = true;
+		UpdateSelectionIcons();
+	}
+	
+	bool IsOpened()
+	{
+		return !m_Closed;
+	}
+	
+	void SetOpenForSlotIcon(bool open, SlotsIcon icon = null/*m_SlotIcon*/)
+	{
+		if (!icon)
+		{
+			icon = m_SlotIcon;
+		}
+		
+		if (icon)
+		{
+			icon.GetRadialIcon().Show(open);
+			icon.GetRadialIconClosed().Show(!open);
+		}
+		/*else
+		{
+			ErrorEx("Dbg No Icon");
+		}*/
+	}
+	
+	void Toggle()
+	{
+		if (IsOpened())
+		{
+			Close();
+		}
+		else
+		{
+			Open();
+		}
+		SetOpenForSlotIcon(IsOpened());
+	}
+	
+	float GetFocusedContainerHeight( bool contents = false )
+	{
+		float x, y, result;
+		if( GetFocusedContainer() )
+			y = GetFocusedContainer().GetFocusedContainerHeight( contents );
+		else if( GetRootWidget() )
+			GetRootWidget().GetScreenSize( x, y );
+		
+		result = y;
+		
+		if ( m_ActiveIndex == 0 )
+		{
+			if ( GetHeader() )
+			{
+				GetHeader().GetRootWidget().GetScreenSize( x, y );
+				result += y;
+			}
+		}
+		return result;
+	}
+	
+	float GetFocusedContainerYPos( bool contents = false )
+	{
+		float x, y;
+		if( GetFocusedContainer() )
+			y = GetFocusedContainer().GetFocusedContainerYPos( contents );
+		else if( GetRootWidget() )
+			GetRootWidget().GetPos( x, y );
+		
+		return y;
+	}
+	
+	float GetFocusedContainerYScreenPos( bool contents = false )
+	{
+		float x, y, result;
+		if( GetFocusedContainer() )
+			y = GetFocusedContainer().GetFocusedContainerYScreenPos( contents );
+		else if( GetRootWidget() )
+			GetRootWidget().GetScreenPos( x, y );
+		
+		
+		result = y;
+		
+		if ( m_ActiveIndex == 0 )
+		{
+			if ( GetHeader() )
+			{
+				GetHeader().GetRootWidget().GetScreenPos( x, y );
+				result = y;
+			}
+		}
+		return result;
+	}
+
+	int Count()
+	{
+		return m_Body.Count();
+	}
+	
+	bool SelectItem()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().SelectItem();
+		return false;
+	}
+	
+	bool Select()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().Select();
+		return false;
+	}
+	
+	bool OnSelectButton()
+	{
+		if(GetFocusedContainer())
+		{
+			return GetFocusedContainer().OnSelectButton();
+		}
+		return false;
+	}
+	
+	bool Combine()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().Combine();
+		return true;
+	}
+	
+	bool TransferItemToVicinity()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().TransferItemToVicinity();
+		return false;
+	}
+	
+	bool TransferItem()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().TransferItem();
+		return false;
+	}
+	
+	bool InspectItem()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().InspectItem();
+		return false;
+	}
+	
+	bool SplitItem()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().SplitItem();
+		return false;
+	}
+	
+	bool EquipItem()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().EquipItem();
+		return false;
+	}
+	
+	bool CanOpenCloseContainer()
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanOpenCloseContainerEx(focusedEntity);
+		
+			return CanOpenCloseContainerEx(focusedEntity);
+		}
+
+		return false;		
+	}
+	
+	bool CanOpenCloseContainerEx(EntityAI focusedEntity)
+	{
+		return false;
+	}
+	
+	bool CanSplit()
+	{
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanSplitEx(focusedEntity);
+		
+			return CanSplitEx(focusedEntity);
+		}
+
+		return false;		
+	}
+	
+	bool CanSplitEx(EntityAI focusedEntity)
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		if (focusedEntity)
+		{
+			return focusedEntity.CanBeSplit();
+		}
+		return false;
+	}
+	
+	bool CanDrop()
+	{
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanDropEx(focusedEntity);
+		
+			return CanDropEx(focusedEntity);
+		
+		}
+
+		return false;
+	}
+	
+	bool CanDropEx(EntityAI focusedEntity)
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		if (focusedEntity)
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+			if (player)
+			{
+				return player.CanDropEntity(focusedEntity);
+			}
+		}
+		return false;
+	}
+	
+	bool CanSwapOrTakeToHands()
+	{
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanSwapOrTakeToHandsEx(focusedEntity);
+		
+			return CanSwapOrTakeToHandsEx(focusedEntity);
+		}
+
+		return false;	
+	}
+	
+	bool CanSwapOrTakeToHandsEx(EntityAI focusedEntity)
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		if (focusedEntity)
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			EntityAI entityInHands = player.GetItemInHands();
+			if (entityInHands)
+			{
+				InventoryLocation il = new InventoryLocation();
+	
+				if (!GameInventory.CanSwapEntitiesEx(focusedEntity, entityInHands))
+				{
+					return GameInventory.CanForceSwapEntitiesEx( focusedEntity, null, entityInHands, il );
+				}
+				else
+				{
+					return true;
+				}
+			}
+			else
+			{		
+				return player.GetInventory().CanAddEntityIntoHands(focusedEntity);
+			}
+		}
+		return false;	
+	}
+	
+	bool CanEquip()
+	{	
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanEquipEx(focusedEntity);
+		
+			return CanEquipEx(focusedEntity);
+		}
+
+		return false;	
+	}
+	
+	bool CanEquipEx(EntityAI focusedEntity)
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		bool found = false;
+		if (focusedEntity)
+		{
+			InventoryLocation il = new InventoryLocation;
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			found = player.GetInventory().FindFreeLocationFor(focusedEntity,FindInventoryLocationType.ATTACHMENT,il);
+			
+			if (!found)
+			{
+				for (int i = 0; i < focusedEntity.GetInventory().GetSlotIdCount(); i++)
+				{				
+					int slot_id = focusedEntity.GetInventory().GetSlotId(i);
+					EntityAI slot_item = player.GetInventory().FindAttachment( slot_id );
+					if (slot_item && player.GetInventory().CanSwapEntitiesEx( focusedEntity, slot_item ))
+					{
+						found = true; 
+						break;
+					}
+					
+				}
+			}
+		}
+		return found;
+	}
+	
+	bool CanTakeToInventory()
+	{
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanTakeToInventoryEx(focusedEntity);
+		
+			return CanTakeToInventoryEx(focusedEntity);
+		}
+
+		return false;
+	}
+	
+	bool CanTakeToInventoryEx(EntityAI focusedEntity)
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		if (focusedEntity)
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			return player.GetInventory().CanAddEntityToInventory(focusedEntity,FindInventoryLocationType.CARGO);
+		}
+		return false;
+	}
+	
+	bool CanCombine()
+	{
+		EntityAI focusedEntity = GetFocusedItem();
+		if (focusedEntity)
+		{
+			if (GetFocusedContainer())
+				return GetFocusedContainer().CanCombineEx(focusedEntity);
+		
+			return CanCombineEx(focusedEntity);
+		}
+
+		return false;
+	}
+	
+	bool CanCombineEx(EntityAI focusedEntity)
+	{
+		if (ItemManager.GetInstance().IsMicromanagmentMode())
+			return false;
+		
+		if (focusedEntity)
+		{
+			EntityAI entityInHands = PlayerBase.Cast(GetGame().GetPlayer()).GetItemInHands();
+			if (focusedEntity != entityInHands)
+			{
+				return (ItemManager.GetCombinationFlags(entityInHands, focusedEntity) != 0);
+			}
+		}
+		return false;
+	}
+	
+	bool CanCombineAmmo()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().CanCombineAmmo();
+		return false;
+	}
+	
+	bool CanAddToQuickbarEx(EntityAI focusedEntity)
+	{
+		if ( ItemManager.GetInstance().IsMicromanagmentMode() )
+			return false;
+		
+		if (focusedEntity)
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			if (focusedEntity.GetHierarchyRootPlayer() == player)
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	bool AddItemToQuickbarRadial(EntityAI itemToAssign)
+	{
+		if ( CanAddToQuickbarEx(itemToAssign) )
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			DayZPlayerInventory dpi;
+			dpi = player.GetDayZPlayerInventory();
+			
+			if (itemToAssign && dpi && !dpi.IsProcessing())
+			{
+				RadialQuickbarMenu.SetItemToAssign(itemToAssign);
+				
+				//open radial quickbar menu
+				if (!GetGame().GetUIManager().IsMenuOpen(MENU_RADIAL_QUICKBAR))
+				{
+					RadialQuickbarMenu.OpenMenu(GetGame().GetUIManager().FindMenu(MENU_INVENTORY));
+				}				
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsEmpty()
+	{
+		return m_OpenedContainers.Count() == 0;
+	}
+	
+	bool IsItemActive()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().IsItemActive();
+		return false;
+	}
+
+	bool IsItemWithQuantityActive()
+	{
+		if( GetFocusedContainer() )
+			return GetFocusedContainer().IsItemWithQuantityActive();
+		return false;
+	}
+	
+	EntityAI GetFocusedItem()
+	{
+		EntityAI item;
+		if( GetFocusedContainer() )
+			item = GetFocusedContainer().GetFocusedItem();
+
+		return item;
+	}
+	
+	EntityAI GetFocusedContainerEntity()
+	{
+		EntityAI item;
+		if( GetFocusedContainer() )
+			item = GetFocusedContainer().GetFocusedContainerEntity();
+		return item;
+	}
+	
+	int GetColumnCount()
+	{
+		return m_ColumnCount;
+	}
+	
+	void SetColumnCount( int count )
+	{
+		m_ColumnCount = count;
+	}
+	
+	int GetFocusedColumn()
+	{
+		return m_FocusedColumn;
+	}
+	
+	void SetFocusedColumn( int column )
+	{
+		m_FocusedColumn = column;
+	}
+	
+	override void UpdateInterval()
+	{
+		for ( int i = 0; i < m_Body.Count(); i++ )
+		{
+			if ( m_Body.Get( i ) )
+				m_Body.Get( i ).UpdateInterval();
+		}
+		
+		CheckHeaderDragability();
+	}
+
+	override void SetLastActive()
+	{
+		if (m_IsActive)
+		{
+			m_IsActive = true;
+			if (m_OpenedContainers.Count())
+			{
+				SetLastFocus();
+				if (!m_OpenedContainers[m_ActiveIndex].IsActive())
+				{
+					for (int i = 0; i < m_OpenedContainers.Count() - 1; i++)
+					{
+						if (m_OpenedContainers[i].IsActive())
+						{
+							m_OpenedContainers[i].SetActive(false);
+						}
+					}
+					m_OpenedContainers[m_ActiveIndex].SetLastActive();
+				}
+				else
+				{
+					m_OpenedContainers[m_ActiveIndex].SetLastActive();
+				}
+			}
+		}
+		else
+		{
+			m_IsActive = true;
+			if (GetHeader())
+			{
+				GetHeader().SetActive(m_IsActive);
+			}
+			SetLastFocus();
+			if (m_OpenedContainers.Count())
+			{
+				Container c = Container.Cast(m_OpenedContainers.Get( m_ActiveIndex ));
+				if (c)
+				{
+					c.SetLastActive( );
+				}
+			}
+		}
+	}
+	
+	override void SetFirstActive()
+	{
+		if (!m_IsActive)
+		{
+			SetActive(true);
+		}
+		else
+		{
+			if (m_OpenedContainers.Count())
+			{
+				SetDefaultFocus();
+				if (!m_OpenedContainers[m_ActiveIndex].IsActive())
+				{
+					for (int i = 1; i < m_OpenedContainers.Count(); i++)
+					{
+						if (m_OpenedContainers[i].IsActive())
+						{
+							m_OpenedContainers[i].SetActive(false);
+						}
+					}
+					m_OpenedContainers[m_ActiveIndex].SetActive(true);
+				}
+				else
+				{
+					m_OpenedContainers[m_ActiveIndex].SetFirstActive();
+				}
+			}
+		}
+	}
+	
+	override void SetActive(bool active)
+	{
+		if (!active)
+		{
+			HideOwnedTooltip();
+		}
+		
+		if (!active && !m_IsActive)
+			return;
+		
+		super.SetActive( active );
+		if ( GetHeader() )
+		{
+			GetHeader().SetActive(active);
+		}
+
+		if (m_MainWidget.FindAnyWidget("SelectedContainer"))
+		{
+			m_MainWidget.FindAnyWidget("SelectedContainer").Show(active);
+		}
+		
+		Container c;
+		if( active )
+		{
+
+			SetDefaultFocus();
+			if( m_OpenedContainers.Count() )
+			{				
+				c = Container.Cast(m_OpenedContainers.Get( m_ActiveIndex ));
+				if (c)
+				{
+					c.SetActive(active);
+				}
+			}
+		}
+		else
+		{
+			c = GetFocusedContainer();
+			if (c)
+			{
+				GetFocusedContainer().SetActive(false);
+			}
+			Unfocus();
+			m_ActiveIndex = 0;
+			m_FocusedColumn = 0;
+		}
+	}
+
+	void UnfocusAll()
+	{
+		for ( int i = 0; i < Count(); i++ )
+		{
+			for ( int j = 0; j < ITEMS_IN_ROW; j++ )
+			{
+				SlotsIcon icon;
+				if (Get(i) && Get(i).GetMainWidget())
+					Get( i ).GetMainWidget().GetUserData(icon);
+				
+				if (icon)
+					icon.GetCursorWidget().Show( false );
+			}
+		}
+	}
+
+	void UnfocusGrid()
+	{
+		if( GetFocusedContainer() )
+		{
+			m_FocusedColumn = 0;
+			GetFocusedContainer().UnfocusAll();
+		}
+	}
+
+	bool IsLastIndex()
+	{
+		return m_ActiveIndex == ( m_OpenedContainers.Count() - 1 );
+	}
+	
+	bool IsFirstIndex()
+	{
+		return m_ActiveIndex == 0; 
+	}
+	
+	bool IsFirstContainerFocused()
+	{
+		return m_ActiveIndex == 0;
+	}
+	
+	bool IsLastContainerFocused()
+	{
+		return m_ActiveIndex >= ( m_OpenedContainers.Count() - 1 );
+	}
+	
+	void ResetFocusedContainer()
+	{
+		if ( GetFocusedContainer() )
+		{
+			GetFocusedContainer().ResetFocusedContainer();
+		}
+		
+		m_ActiveIndex == 0;
+	}
+
+	void SetNextActive()
+	{
+		HideOwnedTooltip();
+
+		Container active;
+		if (m_OpenedContainers.Count())
+		{
+			active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}		
+		
+		if (active && active.IsActive())
+		{
+			active.SetNextActive();
+		}
+		if (!active || !active.IsActive())
+		{
+			Container next;
+			if (!IsLastContainerFocused())
+			{
+				m_ActiveIndex++;
+				
+				next = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+				next.SetActive(true);
+			} 
+			else if (Container.Cast( GetParent() ))
+			{
+				SetActive(false);
+			}
+			else
+			{
+				SetActive(false);
+				SetFirstActive();
+			}
+		}
+	}
+
+	void SetPreviousActive(bool force = false)
+	{
+		HideOwnedTooltip();
+		Container active;
+		if (m_OpenedContainers.Count())
+		{
+			active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}
+		
+		if (active && active.IsActive())
+		{
+			active.SetPreviousActive();
+		}
+		
+		if (!active || !active.IsActive())
+		{
+			Container prev;
+			if (!IsFirstContainerFocused())
+			{
+				m_ActiveIndex--;
+				
+				prev = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+				prev.SetLastActive();
+			} 
+			else if (Container.Cast( GetParent() ))
+			{
+				SetActive(false);
+			}
+			else
+			{
+				SetActive(false);
+				SetLastActive();
+			}			
+		}
+	}
+	
+	void SetNextRightActive()
+	{
+		Container active;
+		if (m_OpenedContainers.Count())
+		{
+			active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}
+		
+		if (active)
+		{
+			active.SetNextRightActive();
+		}
+	}
+	
+	void SetNextLeftActive()
+	{
+		Container active;
+		if (m_OpenedContainers.Count())
+		{
+			active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		}
+		
+		if (active)
+		{
+			active.SetNextLeftActive();
+		}
+	}
+	
+	void SetSameLevelNextActive()
+	{
+		Container active;
+		active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		active.SetActive(false);
+		
+		m_ActiveIndex++;
+		if (m_ActiveIndex > m_OpenedContainers.Count() - 1)
+		{
+			m_ActiveIndex = 0;
+		}
+		
+		active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		active.SetActive(true);
+	}
+	
+	void SetSameLevelPreviousActive()
+	{
+		Container active;
+		active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		active.SetActive(false);
+		
+		m_ActiveIndex--;
+		if (m_ActiveIndex < 0)
+		{
+			m_ActiveIndex = m_OpenedContainers.Count() - 1;
+		}
+		
+		active = Container.Cast(m_OpenedContainers[m_ActiveIndex]);
+		active.SetActive(true);
+	}
+	
+	void RecomputeOpenedContainers()
+	{
+		m_OpenedContainers.Clear();
+		int i;
+		bool need_reset_focus = false;
+		Container c;
+		for (i = 0; i < m_Body.Count(); i++)
+		{
+			c = Container.Cast(m_Body.Get( i ));
+			if ( c ) 
+			{
+				c.RecomputeOpenedContainers();
+				if (c.IsDisplayable() && c.IsVisible())
+				{
+					m_OpenedContainers.Insert(c);
+				}
+				else if (c.IsActive())
+				{
+					c.SetActive(false);
+					need_reset_focus = true;
+				}
+				
+			}	
+		}
+		
+		//In case of removing focused container or change order of containers
+		if (IsActive())
+		{
+			if (!need_reset_focus && ( m_ActiveIndex >= m_OpenedContainers.Count() || !m_OpenedContainers[m_ActiveIndex].IsActive() ))
+			{
+				need_reset_focus = true;
+				for (i = 0; i < m_OpenedContainers.Count(); i++)
+				{
+					if (m_OpenedContainers[i].IsActive())
+					{
+						need_reset_focus = false;
+						m_ActiveIndex = i;
+					}
+				}
+			}
+			
+			if (need_reset_focus)
+			{
+				SetFirstActive();
+			}
+		}
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.Container;
+	}
+
+	void Insert( LayoutHolder container, int pos = -1, bool immedUpdate = true )
+	{
+		if ( pos > -1 && pos < m_Body.Count() )
+		{
+			if ( pos <= m_ActiveIndex )
+				m_ActiveIndex++;
+			m_Body.InsertAt( container, pos );
+		}
+		else
+			m_Body.Insert( container );
+		
+		if ( immedUpdate )
+			Refresh();
+	}
+
+	void Remove( LayoutHolder container )
+	{
+		if( m_Body )
+		{
+			int index = m_Body.Find( container );
+			if( index > -1 )
+			{
+				index = m_OpenedContainers.Find( container );
+				if (index > -1)
+				{
+					if (index <= m_ActiveIndex)
+					{
+						if (GetFocusedContainer() == container)
+						{
+							SetPreviousActive( true );
+						}
+						else
+						{
+							m_ActiveIndex--;
+						}
+					}
+					m_OpenedContainers.RemoveItem( container );
+				}
+				m_Body.RemoveItem( container );
+			}
+		}
+		
+		Refresh();
+	}
+	
+	LayoutHolder Get( int x )
+	{
+		return m_Body.Get( x );
+	}
+
+	override void Refresh()
+	{
+		for ( int i = 0; i < m_Body.Count(); i++ )
+		{
+			if( m_Body.Get( i ) )
+				m_Body.Get( i ).Refresh();
+		}
+	}
+
+	void UpdateBodySpacers()
+	{
+		for ( int i = 0; i < m_Body.Count(); i++ )
+		{
+			Container c = Container.Cast( m_Body.Get( i ) );
+			if( c && c.IsInherited( Container ) )
+			{
+				c.UpdateSpacer();
+			}
+		}
+		
+		UpdateSpacer();
+	}
+
+	void HideContent( bool force_hide = false )
+	{
+		if( !m_ForcedHide )
+		{
+			m_ForcedHide = force_hide;
+		}
+		for(int i = 0; i < m_Body.Count(); i++)
+		{
+			if( m_Body.Get( i ) )
+				m_Body.Get( i ).OnHide();
+		}
+	}
+	
+	void ShowContent( bool force_show = false )
+	{
+		if( force_show )
+			m_ForcedHide = false;
+		
+		if( !m_ForcedHide )
+		{
+			for(int i = 0; i < m_Body.Count(); i++)
+			{
+				if( m_Body.Get( i ) )
+				m_Body.Get( i ).OnShow();
+			}
+		}
+	}
+	
+	void SetForceShow(bool value)
+	{
+		m_ForcedShow = value;
+	}
+	
+	override void UpdateSelectionIcons()
+	{
+		m_Parent.UpdateSelectionIcons();
+	}
+	
+	void ExpandCollapseContainer(){}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/HandsContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/HandsContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..74c5daf771587edc91075f1c842a9f091a03cc9c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/HandsContainer.c
@@ -0,0 +1,1588 @@
+class HandsContainer: Container
+{
+	protected bool											m_Hidden;
+	protected ref HandsHeader								m_CollapsibleHeader;
+	protected ref HandsPreview								m_HandsPreview;
+	
+	protected ref Attachments								m_Atts;
+	protected ref CargoContainer							m_CargoGrid;
+	
+	protected ref map<EntityAI, ref CargoContainer>			m_AttachmentCargos;
+	protected ref map<EntityAI, AttachmentsWrapper>			m_AttachmentAttachmentsContainers;
+	protected ref map<EntityAI, ref Attachments>			m_AttachmentAttachments;
+	protected ref array<int>								m_AttachmentSlotsSorted;
+	
+	protected int											m_StaticAttCount = 0;
+	protected int											m_StaticCargoCount = 0;
+	
+	protected ScrollWidget									m_ScrollWidget;
+
+	void HandsContainer( LayoutHolder parent )
+	{
+		m_AttachmentCargos					= new map<EntityAI, ref CargoContainer>;
+		m_AttachmentAttachmentsContainers	= new map<EntityAI, AttachmentsWrapper>;
+		m_AttachmentAttachments				= new map<EntityAI, ref Attachments>;
+		
+		m_CollapsibleHeader = new HandsHeader( this, "CollapseButtonOnMouseButtonDown" );
+		GetMainWidget().SetFlags( WidgetFlags.IGNOREPOINTER );
+		m_MainWidget = m_MainWidget.FindWidget( "body" );
+		GetMainWidget().SetFlags( WidgetFlags.IGNOREPOINTER );
+		m_Body = new array<ref LayoutHolder>;
+		m_HandsPreview = new HandsPreview( this );
+		ItemManager.GetInstance().SetHandsPreview( m_HandsPreview );
+		m_Body.Insert( m_HandsPreview );
+		
+		ItemBase hands_item = ItemBase.Cast( GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+		if ( hands_item )
+			m_HandsPreview.CreateNewIcon( hands_item );
+		
+		m_ScrollWidget						= ScrollWidget.Cast( m_RootWidget.GetParent().GetParent() );
+		RecomputeOpenedContainers();
+	}
+	
+	void ~HandsContainer()
+	{
+		if ( m_Entity )
+		{
+			m_Entity.GetOnItemAttached().Remove( AttachmentAdded );
+			m_Entity.GetOnItemDetached().Remove( AttachmentRemoved );
+		}
+		
+		m_AttachmentCargos.Clear();
+		m_AttachmentAttachmentsContainers.Clear();
+		m_AttachmentAttachments.Clear();
+	}
+	
+	void ResetContainer()
+	{
+		m_Body.Clear();
+		m_Body.Insert( m_HandsPreview );
+	}
+	
+	override Header GetHeader()
+	{
+		return m_CollapsibleHeader;
+	}
+	
+	override bool IsLastIndex()
+	{
+		return m_ActiveIndex == m_OpenedContainers.Count() - 1;
+	}
+	
+	void SetFocusToIndex()
+	{
+		int index = m_ActiveIndex - 1;
+		int attachment_start_index = -1;
+		int cargo_start_index = -1;
+		int attachment_end_index = -1;
+		int cargo_end_index = -1;
+		
+		if ( m_Atts || m_AttachmentAttachments.Count() > 0 )
+		{
+			attachment_start_index = 0;
+			if ( m_Atts )
+				attachment_end_index++;
+			attachment_end_index += m_AttachmentAttachments.Count();
+		}
+		
+		if ( m_CargoGrid || m_AttachmentCargos.Count() > 0 )
+		{
+			cargo_start_index = attachment_end_index + 1;
+			if ( m_CargoGrid )
+				cargo_end_index++;
+			cargo_end_index += cargo_start_index + m_AttachmentCargos.Count();
+		}
+		
+		if ( m_ActiveIndex > m_OpenedContainers.Count() )
+		{
+			m_ActiveIndex = m_OpenedContainers.Count();
+		}
+		
+		if ( index == -1 )
+		{
+			#ifdef PLATFORM_CONSOLE
+			if ( m_MainWidget.FindAnyWidget("Cursor") )
+				m_MainWidget.FindAnyWidget("Cursor").Show( true );
+			#endif
+			m_ScrollWidget.VScrollToPos01( 0 );
+		}
+		else
+		{
+			if( index.InRange( 0, attachment_end_index ) )
+			{
+				if( m_Atts )
+				{
+					if( index == 0 )
+					{
+						m_Atts.SetDefaultFocus();
+						SetFocusedContainer( m_Atts.GetWrapper() );
+					}
+					else
+					{
+						m_AttachmentAttachments.GetElement( index - 1 ).SetDefaultFocus();
+						SetFocusedContainer( m_AttachmentAttachments.GetElement( index - 1 ).GetWrapper() );
+					}
+				}
+				else
+				{
+					m_AttachmentAttachments.GetElement( index ).SetDefaultFocus();
+					SetFocusedContainer( m_AttachmentAttachments.GetElement( index ).GetWrapper() );
+				}
+			}
+			else if( index.InRange( cargo_start_index, cargo_end_index ) )
+			{
+				if( m_CargoGrid )
+				{
+					if( index == cargo_start_index )
+					{
+						m_CargoGrid.SetDefaultFocus();
+						SetFocusedContainer( m_CargoGrid );
+					}
+					else
+					{
+						m_AttachmentCargos.GetElement( index - 1 - cargo_start_index ).SetDefaultFocus();
+						SetFocusedContainer( m_AttachmentCargos.GetElement( index - 1 - cargo_start_index ) );
+					}
+				}
+				else
+				{
+					m_AttachmentCargos.GetElement( index - cargo_start_index ).SetDefaultFocus();
+					SetFocusedContainer( m_AttachmentCargos.GetElement( index - cargo_start_index ) );
+				}
+			}
+			
+			if( m_MainWidget.FindAnyWidget("Cursor") )
+				m_MainWidget.FindAnyWidget("Cursor").Show( false );
+			ScrollToActiveContainer( GetFocusedContainer() );
+		}
+	}
+	
+	void ScrollToActiveContainer( Container active_container )
+	{
+		if( !active_container )
+			return;
+		float x, y, y_s;
+		m_ScrollWidget.GetScreenPos( x, y );
+		m_ScrollWidget.GetScreenSize( x, y_s );
+		float amount;
+		float next_pos	= active_container.GetFocusedContainerYScreenPos( true ) + active_container.GetFocusedContainerHeight( true );
+			
+		if( next_pos > ( y + y_s ) )
+		{
+			amount	= y + active_container.GetFocusedContainerYScreenPos( true );
+			m_ScrollWidget.VScrollToPos( m_ScrollWidget.GetVScrollPos() + active_container.GetFocusedContainerHeight( true ) + 2 );
+		}
+		else if( active_container.GetFocusedContainerYScreenPos( true ) < y )
+		{
+			amount = active_container.GetFocusedContainerYScreenPos( true ) - y;
+			m_ScrollWidget.VScrollToPos( m_ScrollWidget.GetVScrollPos() + amount - 2 );
+		}
+	}
+	
+	override void Insert( LayoutHolder container, int pos = -1, bool immedUpdate = true )
+	{
+		super.Insert( container, pos, immedUpdate );
+	}
+
+	override bool TransferItem()
+	{
+		if (m_ActiveIndex == 0)
+		{
+			if (CanTakeToInventory())
+			{
+				EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+				if (item_in_hands && GetGame().GetPlayer().GetHumanInventory().CanRemoveEntityInHands() && !GetGame().GetPlayer().GetInventory().HasInventoryReservation(item_in_hands, null))
+				{
+					if (GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, item_in_hands ))
+					{
+						m_MainWidget.FindAnyWidget("Cursor").Show( false );
+						m_MainWidget.FindAnyWidget("hands_preview_root").SetAlpha( 0.7 );
+						return true;
+					}
+				}
+			}
+		}
+		else if (GetFocusedContainer())
+		{
+			return GetFocusedContainer().TransferItem();
+		}
+		return false;
+	}
+	
+	override bool SplitItem()
+	{
+		if (CanSplit())
+		{
+			if (m_ActiveIndex == 0)
+			{
+				ItemBase item_in_hands = ItemBase.Cast( GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+				if ( item_in_hands )
+				{
+					if ( item_in_hands.CanBeSplit() )
+					{
+						item_in_hands.OnRightClick();
+					}
+				}
+			}
+			else if( GetFocusedContainer() )
+			{
+				return GetFocusedContainer().SplitItem();
+			}
+		}
+		return false;
+	}
+	
+	override bool EquipItem()
+	{
+		if (CanEquip())
+		{	
+			if (m_ActiveIndex == 0)
+			{
+				ItemBase item_in_hands = ItemBase.Cast( GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+				if ( item_in_hands )
+				{
+					if ( GetGame().GetPlayer().GetHumanInventory().CanRemoveEntityInHands() && !GetGame().GetPlayer().GetInventory().HasInventoryReservation(item_in_hands, null)  )
+					{
+						if ( GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.ATTACHMENT, item_in_hands ) )
+						{
+							m_MainWidget.FindAnyWidget("Cursor").Show( false );
+							m_MainWidget.FindAnyWidget("hands_preview_root").SetAlpha( 0.7 );
+							return true;
+						}
+					}
+				}
+			}
+			else if (GetFocusedContainer())
+			{
+				return GetFocusedContainer().EquipItem();
+			}
+		}
+		return false;
+	}
+	
+	override void SetActive( bool active )
+	{
+		super.SetActive(active);
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI item_in_hands = player.GetHumanInventory().GetEntityInHands();
+
+		if( item_in_hands )
+		{
+			if( m_MainWidget.FindAnyWidget( "Cursor" ) )
+			{
+				m_MainWidget.FindAnyWidget( "Cursor" ).Show( active );
+			}
+			
+			if( active )
+			{
+				float x, y;
+				GetMainWidget().GetScreenPos( x, y );
+				PrepareOwnedTooltip( item_in_hands, -1, y );
+			}
+		}
+		else
+		{
+			if (active)
+				m_MainWidget.FindAnyWidget( "hands_preview_root" ).SetAlpha( 0.85 );
+			else
+				m_MainWidget.FindAnyWidget( "hands_preview_root" ).SetAlpha( 0.7 );
+		}
+	}
+	
+	override void SetLastActive()
+	{
+		super.SetLastActive();
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI item_in_hands = player.GetHumanInventory().GetEntityInHands();
+
+		if( item_in_hands )
+		{
+			if ( m_ActiveIndex == 0)
+			{
+				if( m_MainWidget.FindAnyWidget( "Cursor" ) )
+				{
+					m_MainWidget.FindAnyWidget( "Cursor" ).Show( true );
+				}
+			
+				float x, y;
+				GetMainWidget().GetScreenPos( x, y );
+				PrepareOwnedTooltip( item_in_hands, x, y );
+			}
+		}
+		else
+		{
+			m_MainWidget.FindAnyWidget( "hands_preview_root" ).SetAlpha( 0.85 );
+		}
+	}
+	
+	override void Refresh()
+	{
+		super.Refresh();
+		SetActive( m_IsActive );
+	}
+	
+	override bool IsItemActive()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		ItemBase item = ItemBase.Cast( player.GetHumanInventory().GetEntityInHands() );
+		if( item == null )
+		{
+			return false;
+		}
+		return !IsEmpty() && ( !QuantityConversions.HasItemQuantity( item )  || ( QuantityConversions.HasItemQuantity( item ) && !item.CanBeSplit() ) );
+	}
+	
+	override bool IsItemWithQuantityActive()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		ItemBase item = ItemBase.Cast( player.GetHumanInventory().GetEntityInHands() );
+		if( item == null )
+		{
+			return false;
+		}
+		return !IsEmpty() && QuantityConversions.HasItemQuantity( item ) && item.CanBeSplit();
+	}
+	
+	override bool IsEmpty()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		return player.GetHumanInventory().GetEntityInHands() == null;
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		if (CanDrop())
+		{
+			if (m_ActiveIndex == 0)
+			{
+				PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+				ItemBase item_in_hands = ItemBase.Cast(player.GetHumanInventory().GetEntityInHands());
+				if ( item_in_hands && player.CanDropEntity( item_in_hands ) && GetGame().GetPlayer().GetHumanInventory().CanRemoveEntityInHands() && !player.GetInventory().HasInventoryReservation(item_in_hands, null) )
+				{
+					if ( item_in_hands.GetTargetQuantityMax() < item_in_hands.GetQuantity() )
+						item_in_hands.SplitIntoStackMaxClient( null, -1 );
+					else
+						player.PhysicalPredictiveDropItem( item_in_hands );
+					m_MainWidget.FindAnyWidget("Cursor").Show( false );
+					m_MainWidget.FindAnyWidget("hands_preview_root").SetAlpha( 0.7 );
+					return true;
+				}
+			}
+			else if ( GetFocusedContainer() )
+			{
+					return GetFocusedContainer().TransferItemToVicinity();
+			}
+		}
+		return false;
+	}
+	
+	override bool InspectItem()
+	{
+		if(m_ActiveIndex == 0)
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			EntityAI item_in_hands = player.GetHumanInventory().GetEntityInHands();
+			if( item_in_hands )
+			{
+				InspectItem( item_in_hands );
+				return true;
+			}
+		}
+		else if( GetFocusedContainer() )
+		{
+			return GetFocusedContainer().InspectItem();
+		}
+		return false;
+	}
+	
+	override bool OnSelectButton()
+	{
+		if(m_ActiveIndex == 0)
+		{
+			if (ItemManager.GetInstance().IsMicromanagmentMode())
+			{
+				EntityAI selectedItem = ItemManager.GetInstance().GetSelectedItem();
+				if( selectedItem == GetFocusedItem() )
+				{
+					Inventory.GetInstance().DisableMicromanagement();
+					return true;
+				}
+				else
+				{
+					return Select();
+				}
+			}
+			else
+			{
+				Inventory.GetInstance().EnableMicromanagement();
+				return true;
+			}
+		}
+		else
+		{
+			if( GetFocusedContainer() )
+			{
+				return GetFocusedContainer().OnSelectButton();
+			}
+		}
+		return false;
+	}
+	
+	EntityAI GetItemPreviewItem( Widget w )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		
+		if( !ipw )
+		{
+			ipw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if( !ipw )
+		{
+			return null;
+		}
+		
+		return ipw.GetItem();
+	}
+
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if( w == null )
+		{
+			return;
+		}
+		EntityAI receiver_item;
+		EntityAI slot_owner;
+		int slot_id = -1;
+		
+		string name = w.GetName();
+		name.Replace( "PanelWidget", "Render" );
+
+		ItemPreviewWidget w_ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		if( w_ipw == null )
+		{
+			w_ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		}
+		if( w_ipw == null )
+		{
+			return;
+		}
+		
+		SlotsIcon slots_icon;
+		receiver.GetUserData(slots_icon);
+		
+		if(slots_icon)
+		{
+			receiver_item	= slots_icon.GetEntity();
+			slot_id			= slots_icon.GetSlotID();
+			slot_owner		= slots_icon.GetSlotParent();
+		}
+		
+
+		PlayerBase p = PlayerBase.Cast( GetGame().GetPlayer() );
+		InventoryItem receiver_entity = InventoryItem.Cast( p.GetHumanInventory().GetEntityInHands() );
+		InventoryItem w_entity = InventoryItem.Cast( w_ipw.GetItem() );
+		if( !w_entity )
+		{
+			return;
+		}
+
+		if( receiver_entity )
+		{
+			if( receiver_item )
+			{
+				ItemBase receiver_itemIB	= ItemBase.Cast( receiver_item );
+				ItemBase itemIB				= ItemBase.Cast( receiver_item );
+				if( receiver_itemIB && itemIB && receiver_itemIB.CanBeCombined( itemIB ) )
+				{
+					ItemManager.GetInstance().HideDropzones();
+					if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+					{
+						ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+					}
+					else
+					{
+						ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+					}
+					ColorManager.GetInstance().SetColor( w, ColorManager.COMBINE_COLOR );
+				}
+				else 
+				{
+					PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+					Magazine mag = Magazine.Cast(receiver_item);
+					Weapon_Base wpn = Weapon_Base.Cast(receiver_item.GetHierarchyParent());
+				
+					if( wpn && mag )
+					{
+						if( player.GetWeaponManager().CanSwapMagazine( wpn,  Magazine.Cast(w_entity) ) )
+						{
+							ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+							if( w_entity.GetHierarchyRootPlayer() == player )
+							{
+								ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+							}
+							else
+							{
+								ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+							}
+						}
+						else
+						{
+							ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+							ItemManager.GetInstance().ShowSourceDropzone( w_entity );
+						}
+					}
+					else
+					{
+						if( GameInventory.CanSwapEntitiesEx( receiver_item, w_entity ) )
+						{
+							ItemManager.GetInstance().HideDropzones();
+							if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+							{
+								ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+							}
+							else
+							{
+								ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+							}
+							ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+						}
+						else if( receiver_itemIB.GetInventory().CanAddAttachment( w_entity ) )
+						{
+							ItemManager.GetInstance().HideDropzones();
+							if( receiver_itemIB.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+							{
+								ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+							}
+							else
+							{
+								ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+							}
+							ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+						}
+					}
+				}
+			}
+			else if( slot_owner && slot_owner.GetInventory().CanAddAttachment( w_entity ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else if( receiver_entity.GetInventory().CanAddAttachment( w_entity ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				if( receiver_entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+				{
+					ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				}
+				else
+				{
+					ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				}
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+				ItemManager.GetInstance().ShowSourceDropzone( w_entity );
+			}
+		}
+		else
+		{
+			/*if( m_HandsIcon )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+			}
+			
+			else
+			{*/
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+				ItemManager.GetInstance().ShowSourceDropzone( w_entity );
+			//}
+		}
+	}
+
+	void OnDropReceivedFromHeader2( Widget w, int x, int y, Widget receiver )
+	{
+		TakeAsAttachment( w, receiver );
+	}
+	
+	void OnPerformCombination(int combinationFlags)
+	{
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( m_am_entity1 == null || m_am_entity2 == null ) return;
+
+		if ( combinationFlags == InventoryCombinationFlags.NONE ) return;
+
+		if ( combinationFlags & InventoryCombinationFlags.LOAD_CHAMBER )
+		{
+			Magazine mag;
+			if ( Class.CastTo(mag,  m_am_entity2 ) )
+			{
+				m_player.GetWeaponManager().LoadBullet( mag );
+				return;
+			}
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.ADD_AS_ATTACHMENT )
+		{
+			if( m_Atts )
+			{
+				m_Body.RemoveItem( m_Atts.GetWrapper() );
+				delete m_Atts;
+			}
+			if( m_am_entity2.GetSlotsCountCorrect() > 0 )
+			{
+				m_Atts = new Attachments( this, m_am_entity2 );
+				m_Atts.InitAttachmentGrid( 1 );
+
+			}
+
+			Refresh();
+			m_Parent.Refresh();
+
+			Weapon_Base wpn1;
+			Magazine mag1;
+			if ( Class.CastTo(wpn1,  m_am_entity1 ) && Class.CastTo(mag1,  m_am_entity2 ) )
+			{
+				if( m_player.GetWeaponManager().CanAttachMagazine(wpn1, mag1) )
+				{
+					m_player.GetWeaponManager().AttachMagazine(mag1);
+					return;
+				}
+			}
+			
+			SplitItemUtils.TakeOrSplitToInventory(m_player, m_am_entity1, m_am_entity2);
+			//m_player.PredictiveTakeEntityToTargetAttachment( m_am_entity1, m_am_entity2 );
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.ADD_AS_CARGO )
+		{
+			m_player.PredictiveTakeEntityToTargetCargo( m_am_entity1, m_am_entity2 );
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.SWAP )
+		{
+			Magazine swapmag1;
+			Magazine swapmag2;
+			if (Class.CastTo(swapmag1,  m_am_entity1) && Class.CastTo(swapmag2,  m_am_entity2 ) )
+			{
+				if( m_player.GetWeaponManager().CanSwapMagazine( Weapon_Base.Cast( swapmag1.GetParent() ), Magazine.Cast( swapmag2 ) ) )
+				{
+					m_player.GetWeaponManager().SwapMagazine(swapmag2);
+					return;
+				}
+
+				if( m_player.GetWeaponManager().CanSwapMagazine(Weapon_Base.Cast( swapmag2.GetParent() ), Magazine.Cast( swapmag1 )) )
+				{
+					m_player.GetWeaponManager().SwapMagazine(swapmag1);
+					return;
+				}
+			}
+			if ( !m_player.PredictiveSwapEntities( m_am_entity1, m_am_entity2 ) && m_player.GetHumanInventory().CanAddEntityInHands( m_am_entity1 ) )
+			{
+				m_player.PredictiveTakeEntityToHands( m_am_entity1 );
+			}
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.TAKE_TO_HANDS )
+		{
+			if ( m_Atts )
+			{
+				m_Body.RemoveItem( m_Atts.GetWrapper() );
+				delete m_Atts;
+			}
+
+			if ( m_am_entity2.GetSlotsCountCorrect() > 0 )
+			{
+				m_Atts = new Attachments( this, m_am_entity2 );
+				m_Atts.InitAttachmentGrid( 1 );
+
+			}
+			Refresh();
+			m_Parent.Refresh();
+			
+			if ( m_player.GetHumanInventory().CanAddEntityInHands( m_am_entity2 ) )
+			{
+				m_player.PredictiveTakeEntityToHands( m_am_entity2 );
+			}
+		}
+	}
+
+	void ShowActionMenuCombine( EntityAI entity1, EntityAI entity2, int combinationFlags )
+	{
+		if ( entity1 && entity2 ) PrintString( "Showing action menu for " + entity1.GetDisplayName() + " and " + entity2.GetDisplayName() );
+
+		ContextMenu cmenu = ContextMenu.Cast(GetGame().GetUIManager().GetMenu().GetContextMenu());
+		m_am_entity1 = entity1;
+		m_am_entity2 = entity2;
+		cmenu.Hide();
+		cmenu.Clear();
+
+		if( combinationFlags & InventoryCombinationFlags.COMBINE_QUANTITY2 )
+		{
+			ItemBase entity = ItemBase.Cast( entity1 );
+			entity.CombineItemsClient( ItemBase.Cast( entity2 ) );
+			return;
+		}
+
+		if ( entity1 == null || entity2 == null ) return;
+
+		if ( combinationFlags == InventoryCombinationFlags.NONE ) return;
+
+		if ( combinationFlags & InventoryCombinationFlags.ADD_AS_ATTACHMENT )
+		{
+			cmenu.Add( "#inv_context_add_as_attachment", this, "OnPerformCombination", new Param1<int>( InventoryCombinationFlags.ADD_AS_ATTACHMENT ) );
+		}
+		if ( combinationFlags & InventoryCombinationFlags.LOAD_CHAMBER )
+		{
+			cmenu.Add( "#inv_context_load_chamber", this, "OnPerformCombination", new Param1<int>( InventoryCombinationFlags.LOAD_CHAMBER ) );
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.ADD_AS_CARGO )
+		{
+			cmenu.Add( "#inv_context_add_as_cargo", this, "OnPerformCombination", new Param1<int>( InventoryCombinationFlags.ADD_AS_CARGO ) );
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.SWAP )
+		{
+			cmenu.Add( "#inv_context_swap", this, "OnPerformCombination", new Param1<int>( InventoryCombinationFlags.SWAP ) );
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.TAKE_TO_HANDS )
+		{
+			cmenu.Add( "#inv_context_take_to_hands", this, "OnPerformCombination", new Param1<int>( InventoryCombinationFlags.TAKE_TO_HANDS ) );
+		}
+
+		if ( combinationFlags & InventoryCombinationFlags.COMBINE_QUANTITY2 )
+		{
+			cmenu.Add( "#inv_context_combine", this, "OnPerformCombination", new Param1<int>( InventoryCombinationFlags.COMBINE_QUANTITY2 ) );
+		}
+
+		int m_am_pos_x,  m_am_pos_y;
+		GetMousePos( m_am_pos_x, m_am_pos_y );
+		m_am_pos_x -= 5;
+		m_am_pos_y -= 5;
+
+		cmenu.Show( m_am_pos_x, m_am_pos_y );
+	}
+
+
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		TakeAsAttachment( w, receiver );
+	}
+
+	int GetCombinationFlags( EntityAI entity1, EntityAI entity2 )
+	{
+		int flags = 0;
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI entity_in_hands = m_player.GetHumanInventory().GetEntityInHands();
+
+		if (!entity1 || !entity2) return flags;
+
+		Magazine swapmag1;
+		Magazine swapmag2;
+		bool skipSwap = false;
+
+		if (Class.CastTo(swapmag1, entity1) && Class.CastTo(swapmag2, entity2))
+		{
+			Weapon_Base parentWpn;
+
+			if (Class.CastTo(parentWpn, swapmag1.GetHierarchyParent()))
+			{
+				skipSwap = true;
+				if (m_player.GetWeaponManager().CanSwapMagazine(parentWpn,swapmag2))
+					flags = flags | InventoryCombinationFlags.SWAP;
+			}
+
+			if (Class.CastTo(parentWpn, swapmag2.GetHierarchyParent()))
+			{
+				skipSwap = true;
+				if (m_player.GetWeaponManager().CanSwapMagazine(parentWpn,swapmag1))
+					flags = flags | InventoryCombinationFlags.SWAP;
+
+			}
+		}
+
+		if ( !skipSwap )
+		{
+			if (entity1 == m_player.GetHumanInventory().GetEntityInHands() ) flags = flags | InventoryCombinationFlags.TAKE_TO_HANDS;
+			else if (GameInventory.CanSwapEntitiesEx( entity1, entity2 ))
+			{
+				if (!entity1.IsInherited( ZombieBase ) && !entity1.IsInherited( Car ))
+				{
+					flags = flags | InventoryCombinationFlags.SWAP;
+				}
+			}
+		}
+
+		if (entity1.IsInherited( ItemBase) && entity2.IsInherited( ItemBase ))
+		{
+			ItemBase ent1 = ItemBase.Cast( entity1 );
+			if (ent1.CanBeCombined( ItemBase.Cast( entity2 ) )) flags = flags | InventoryCombinationFlags.COMBINE_QUANTITY2;
+		}
+
+		else if (entity1.GetInventory().CanAddAttachment( entity2 ))
+		{
+			if (!entity1.IsInherited( ZombieBase ) && !entity1.IsInherited( Car ) && !entity2.IsInherited( ZombieBase ) && !entity2.IsInherited( Car ))
+			{
+				flags = flags | InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+			}
+		}
+		if (!entity1.GetInventory().HasEntityInInventory(entity2) && entity1.GetInventory().CanAddEntityInCargo( entity2, entity2.GetInventory().GetFlipCargo() )) flags = flags | InventoryCombinationFlags.ADD_AS_CARGO;
+
+		if (entity1 == m_player.GetHumanInventory().GetEntityInHands() || entity2 == m_player.GetHumanInventory().GetEntityInHands())
+		{
+			ActionManagerClient amc;
+			Class.CastTo(amc, m_player.GetActionManager());
+			if (entity1 == m_player.GetHumanInventory().GetEntityInHands())
+			{
+				if (amc.CanSetActionFromInventory( ItemBase.Cast( entity1 ), ItemBase.Cast( entity2 ) ))
+				{
+					flags = flags | InventoryCombinationFlags.SET_ACTION;
+				}
+			}
+			else
+			{
+				if (amc.CanSetActionFromInventory( ItemBase.Cast( entity2 ), ItemBase.Cast( entity1 ) ))
+				{
+					flags = flags | InventoryCombinationFlags.SET_ACTION;
+				}
+			}
+		}
+
+		if (GetRecipeCount( true, entity1, entity2 ) > 0)
+		{
+			flags = flags | InventoryCombinationFlags.RECIPE_ANYWHERE;
+		}
+		return flags;
+	}
+
+	int GetRecipeCount( bool recipe_anywhere, EntityAI entity1, EntityAI entity2 )
+	{
+		PluginRecipesManager plugin_recipes_manager = PluginRecipesManager.Cast( GetPlugin( PluginRecipesManager ) );
+		return plugin_recipes_manager.GetValidRecipes( ItemBase.Cast( entity1 ), ItemBase.Cast( entity2 ), null, PlayerBase.Cast( GetGame().GetPlayer() ) );
+	}
+	
+	void RemoveItem()
+	{
+		m_Entity = null;
+		m_CollapsibleHeader.ShowCollapseButtons( false, true );
+	}
+	
+	void DestroyAtt()
+	{
+		if( m_Atts )
+		{
+			m_Body.RemoveItem( m_Atts.GetWrapper() );
+			delete m_Atts;
+			
+			if( m_Entity )
+			{
+				m_Entity.GetOnItemAttached().Remove( AttachmentAdded );
+				m_Entity.GetOnItemDetached().Remove( AttachmentRemoved );
+			}
+		}
+		
+		if( m_AttachmentAttachmentsContainers )
+		{
+			foreach( EntityAI ent, AttachmentsWrapper att : m_AttachmentAttachmentsContainers )
+			{
+				m_Body.RemoveItem( att );
+				m_AttachmentAttachments.Remove( ent );
+				delete att;
+			}
+		}
+		
+		m_AttachmentAttachmentsContainers.Clear();
+		Refresh();
+		m_Parent.Refresh();
+		RecomputeOpenedContainers();
+	}
+	
+	override void UnfocusGrid()
+	{
+		if( m_Atts )
+		{
+			m_Atts.UnfocusAll();
+		}
+			
+		if( m_CargoGrid )
+		{
+			m_CargoGrid.UnfocusAll();
+		}
+		
+		if( m_AttachmentCargos )
+		{
+			foreach( EntityAI e1, CargoContainer cargo : m_AttachmentCargos )
+			{
+				cargo.UnfocusAll();
+					
+			}
+		}
+		
+		if( m_AttachmentCargos )
+		{
+			foreach( EntityAI e2, Attachments att : m_AttachmentAttachments )
+			{
+				att.UnfocusAll();
+			}
+		}
+	}
+	
+	override void UnfocusAll()
+	{
+		UnfocusGrid();
+	}
+	
+	void DestroyCargo()
+	{
+		if( m_CargoGrid )
+		{
+			m_Body.RemoveItem( m_CargoGrid );
+			delete m_CargoGrid;
+		}
+		
+		if( m_AttachmentCargos )
+		{
+			foreach( CargoContainer cargo : m_AttachmentCargos )
+			{
+				m_Body.RemoveItem( cargo );
+				delete cargo;
+			}
+		}
+
+		m_AttachmentCargos.Clear();
+		Refresh();
+		m_Parent.Refresh();
+		RecomputeOpenedContainers();
+	}
+	
+	void DropReceived( Widget w,  int x, int y, CargoContainer cargo )
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		EntityAI item_in_hands = player.GetHumanInventory().GetEntityInHands();
+		
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+
+		int idx = 0;
+		int c_x, c_y;
+		
+		EntityAI target_entity;
+		CargoBase target_cargo;
+		
+		if( cargo == m_CargoGrid )
+		{
+			target_entity	= m_Entity;
+			target_cargo 	= m_Entity.GetInventory().GetCargo();
+			#ifdef PLATFORM_CONSOLE
+			if( m_CargoGrid.HasItem( item ) )
+			{
+				return;
+			}
+			#endif
+		}
+		else
+		{
+			target_entity	= m_AttachmentCargos.GetKeyByValue( cargo );
+			if( target_entity )
+			{
+				target_cargo 	= target_entity.GetInventory().GetCargo();
+				#ifdef PLATFORM_CONSOLE
+				if( cargo.HasItem( item ) )
+				{
+					return;
+				}
+				#endif
+			}
+			else
+				return;
+		}
+		
+		if( target_cargo && target_entity )
+		{
+			c_x = target_cargo.GetHeight();
+			c_y = target_cargo.GetWidth();
+		}
+		else
+			return;
+
+		InventoryLocation dst = new InventoryLocation;
+		#ifdef PLATFORM_CONSOLE
+		x = 0;
+		y = target_cargo.GetItemCount();
+		target_entity.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.CARGO, dst );
+		#else
+		dst.SetCargoAuto(target_cargo, item, x, y, item.GetInventory().GetFlipCargo());
+		#endif
+		
+		InventoryLocation src = new InventoryLocation;
+		item.GetInventory().GetCurrentInventoryLocation(src);
+		if(src.CompareLocationOnly(dst) && src.GetFlip() == dst.GetFlip())
+			return;
+		
+		#ifdef PLATFORM_CONSOLE
+		if(dst.IsValid() && target_entity.GetInventory().LocationCanAddEntity(dst))
+		#else
+		if( c_x > x && c_y > y && target_entity.GetInventory().LocationCanAddEntity(dst))
+		#endif
+		{
+			SplitItemUtils.TakeOrSplitToInventoryLocation( player, dst );
+
+			Icon icon = cargo.GetIcon( item );
+			
+			if( icon )
+			{
+				if( w && w.FindAnyWidget("Cursor") )
+					w.FindAnyWidget("Cursor").SetColor( ColorManager.BASE_COLOR );
+				icon.Refresh();
+				Refresh();
+			}
+		}
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+	}
+	
+	bool DraggingOverGrid( Widget w,  int x, int y, Widget reciever, CargoContainer cargo )
+	{
+		EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+		if( w == null )
+		{
+			return false;
+		}
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item || !item_in_hands )
+		{
+			return false;
+		}
+
+		int color;
+		int idx = 0;
+		int c_x, c_y;
+		
+		if( item_in_hands.GetInventory().GetCargo() )
+		{
+			c_x = item_in_hands.GetInventory().GetCargo().GetHeight();
+			c_y = item_in_hands.GetInventory().GetCargo().GetWidth();
+		}
+		
+		if( c_x > x && c_y > y && item_in_hands.GetInventory().CanAddEntityInCargoEx( item, 0, x, y, item.GetInventory().GetFlipCargo() ) )
+		{
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetCenterDropzone().SetAlpha( 1 );
+			color = ColorManager.GREEN_COLOR;
+		}
+		else
+		{
+			color = ColorManager.RED_COLOR;
+			ItemManager.GetInstance().ShowSourceDropzone( item );
+		}
+
+		if( w.FindAnyWidget("Cursor") )
+		{
+			w.FindAnyWidget("Cursor").SetColor( color );
+		}
+		else
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Cursor" );
+			w.FindAnyWidget( name ).SetColor( color );
+		}
+
+		return true;
+	}
+	
+	void TakeAsAttachment( Widget w, Widget receiver )
+	{
+		EntityAI receiver_item;
+		EntityAI slot_owner;
+		int slot_id = -1;
+
+		SlotsIcon slots_icon; 
+		receiver.GetUserData(slots_icon);
+		if( slots_icon )
+		{
+			receiver_item	= slots_icon.GetEntity();
+			slot_id			= slots_icon.GetSlotID();
+			slot_owner		= slots_icon.GetSlotParent();
+		}
+		
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+		
+		ItemBase item_base	= ItemBase.Cast( item );
+		float stack_max = item_base.GetTargetQuantityMax(slot_id);
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( !item.GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+			return;
+		
+		EntityAI target_att_entity = m_Entity;
+		Weapon_Base wpn;
+		Magazine mag;
+		if( Class.CastTo(wpn,  m_Entity ) && Class.CastTo(mag,  item ) )
+		{
+			if( player.GetWeaponManager().CanAttachMagazine( wpn, mag ) )
+			{
+				player.GetWeaponManager().AttachMagazine( mag );
+			}
+			else if(player.GetWeaponManager().CanSwapMagazine( wpn, mag ))
+			{
+				player.GetWeaponManager().SwapMagazine( mag );
+			}
+		}
+		else if( receiver_item )
+		{
+			if( receiver_item != item )
+			{
+				if( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( item ) ) )
+				{
+					( ItemBase.Cast( receiver_item ) ).CombineItemsClient( ItemBase.Cast( item ) );
+				}
+				else if( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+				{
+					if( !receiver_item.GetInventory().CanRemoveEntity() )
+						return;
+					GetGame().GetPlayer().PredictiveSwapEntities( item, receiver_item );
+				}
+			}
+		}
+		else if( slot_owner && slot_owner.GetInventory().CanAddAttachmentEx( item, slot_id ) )
+		{
+			if( stack_max == 0 || stack_max >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachmentEx(slot_owner, item, slot_id);
+			}
+			else if( stack_max != 0 && stack_max < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( m_Entity, slot_id );
+			}
+		}
+		else if( slot_owner && slot_owner.GetInventory().CanAddAttachment( item ) )
+		{
+			if( stack_max == 0 || stack_max >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachment(slot_owner, item);
+			}
+			else if( stack_max != 0 && stack_max < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( m_Entity, -1 );
+			}
+		}
+		else if( m_Entity.GetInventory().CanAddAttachment( item ) )
+		{
+			if( stack_max == 0 || stack_max >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachment(m_Entity, item);
+			}
+			else if( stack_max != 0 && stack_max < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( m_Entity, -1 );
+			}
+		}
+		else if( ( m_Entity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && ( !player.GetInventory().HasEntityInInventory( item ) || !m_Entity.GetInventory().HasEntityInCargo( item )) ) || player.GetHumanInventory().HasEntityInHands( item ) )
+		{
+			SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_Entity, item );
+		}
+		/*else if( !player.GetInventory().HasEntityInInventory( item ) || !m_Entity.GetInventory().HasEntityInCargo( item ) )
+		{
+			SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_Entity, item );
+		}*/
+		
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+	}
+
+	void ShowAtt( EntityAI entity )
+	{
+		ResetContainer();
+		m_StaticCargoCount = 0;
+		m_Entity = entity;
+		m_ActiveIndex = 0;
+		if( entity.GetSlotsCountCorrect() > 0 )
+		{
+			m_Atts = new Attachments( this, entity );
+			m_Atts.InitAttachmentGrid( 1 );
+			m_AttachmentSlotsSorted = m_Atts.GetSlotsSorted();
+			m_StaticAttCount = m_Atts.GetAttachmentHeight();
+			m_Entity.GetOnItemAttached().Insert( AttachmentAdded );
+			m_Entity.GetOnItemDetached().Insert( AttachmentRemoved );
+		}
+		else
+		{
+			m_StaticAttCount = 0;
+		}
+		
+		if( entity.GetInventory().GetCargo() )
+		{
+			m_CargoGrid = new CargoContainer( this, false );
+			m_CargoGrid.SetEntity( entity );
+			m_CargoGrid.GetRootWidget().SetSort( 1 );
+			Insert( m_CargoGrid );
+			m_StaticCargoCount++;
+		}
+		
+		if (m_AttachmentSlotsSorted)
+		{
+			foreach( int slot_id : m_AttachmentSlotsSorted )
+			{
+				EntityAI item = m_Entity.GetInventory().FindAttachment( slot_id );
+				if( item )
+					AttachmentAdded( item, InventorySlots.GetSlotName( slot_id ), m_Entity );
+			}
+		}
+
+		if (m_CargoGrid)
+		{
+			bool hideCargo = m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || !m_Entity.CanDisplayCargo() || m_ForcedHide;
+			if (m_CargoGrid.IsVisible() && hideCargo)
+			{
+				HideCargo();
+			}
+			else if (!m_CargoGrid.IsVisible() && !hideCargo)
+			{
+				ShowCargo();
+			}
+		}
+		
+		m_CollapsibleHeader.ShowCollapseButtons(false);
+		//m_CollapsibleHeader.ShowCollapseButtons( m_Atts || m_CargoGrid, m_Atts || m_CargoGrid );
+		RecomputeOpenedContainers();
+		Refresh();
+		m_Parent.Refresh();
+	}
+	
+	void RefreshHands()
+	{
+		for (int i = 0; i < m_Body.Count(); i++)
+		{
+			m_Body.Get( i ).OnShow();
+		}
+		Refresh();
+		m_Parent.Refresh();
+	}
+	
+	void AttachmentAdded(EntityAI item, string slot, EntityAI parent)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString( slot );
+		int sort = -1;
+		Attachments att_cont = null;
+		CargoContainer cont = null;
+		
+		if( item.GetInventory().GetAttachmentSlotsCount() > 0  )
+		{
+			att_cont = new Attachments( this, item );
+			sort = (m_AttachmentSlotsSorted.Find( slot_id ) * 2) + SORT_ATTACHMENTS_NEXT_OFFSET;
+			att_cont.InitAttachmentGrid( sort );
+			
+			m_AttachmentAttachments.Insert( item, att_cont );
+			m_AttachmentAttachmentsContainers.Insert( item, att_cont.GetWrapper() );
+			
+			att_cont.UpdateInterval();
+			if( m_Parent )
+				m_Parent.Refresh();
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+		
+		if( item.GetInventory().GetCargo() )
+		{
+			cont = new CargoContainer( this, true );
+			sort = (m_AttachmentSlotsSorted.Find( slot_id ) * 2) + SORT_CARGO_NEXT_OFFSET; //m_AttachmentSlotsSorted.Find( slot_id ) + 50
+			cont.GetRootWidget().SetSort( sort );
+			cont.SetEntity( item );
+			
+			Insert(cont, -1);
+			
+			m_AttachmentCargos.Insert( item, cont );
+			if( m_Parent )
+				m_Parent.Refresh();
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+		
+		if (att_cont)
+		{
+			att_cont.ShowFalseAttachmentsHeader(true);
+			if (cont)
+			{
+				cont.ShowFalseCargoHeader(false);
+				cont.UpdateSize();
+				cont.SetAlternateFalseTextHeaderWidget(att_cont.GetFalseHeaderTextWidget());
+			}
+		}
+		else if (cont)
+		{
+			cont.SetAlternateFalseTextHeaderWidget(null); //just to be safe..
+		}
+		
+		RecomputeOpenedContainers();
+	}
+	
+	void AttachmentRemoved(EntityAI item, string slot, EntityAI parent)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString( slot );
+		
+		CargoContainer old_cont = m_AttachmentCargos.Get( item );
+		if( old_cont )
+		{
+			m_Body.RemoveItem( old_cont );
+			m_AttachmentCargos.Remove( item );
+			delete old_cont;
+			if( m_Parent )
+				m_Parent.Refresh();
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+		
+		AttachmentsWrapper old_att_cont = m_AttachmentAttachmentsContainers.Get( item );
+		if( old_att_cont )
+		{
+			m_AttachmentAttachmentsContainers.Remove( item );
+			m_AttachmentAttachments.Remove( item );
+			m_Body.RemoveItem( old_att_cont );
+			delete old_att_cont;
+			if( m_Parent )
+				m_Parent.Refresh();
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+		RecomputeOpenedContainers();
+	}
+
+	override void UpdateInterval()
+	{
+		super.UpdateInterval();
+		
+		if ( m_Entity )
+		{
+			if (m_CargoGrid)
+			{
+				bool hideCargo = m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || !m_Entity.CanDisplayCargo() || m_ForcedHide;
+				if (m_CargoGrid.IsVisible() && hideCargo)
+				{
+					HideCargo();
+				}
+				else if (!m_CargoGrid.IsVisible() && !hideCargo)
+				{
+					ShowCargo();
+				}
+				
+				m_CargoGrid.UpdateInterval();
+			}
+			
+			if ( m_Atts )
+			{
+				m_Atts.UpdateInterval();
+			}
+			
+			for ( int i = 0; i < m_AttachmentCargos.Count(); i++ )
+			{
+				m_AttachmentCargos.GetElement( i ).UpdateInterval();
+			}
+		}
+		
+		ElectricityIcon();
+		m_CollapsibleHeader.UpdateInterval();
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.ClosableContainer;
+	}
+
+	override void OnShow()
+	{
+		super.OnShow();
+
+		for ( int i = 0; i < m_Body.Count(); i++ )
+		{
+			m_Body.Get( i ).OnShow();
+		}
+	}
+
+	void MouseClick2(Widget w, int x, int y, int button)
+	{
+		string name = w.GetName();
+		name.Replace("PanelWidget", "Render");
+		ItemPreviewWidget itemPreview = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+		
+		if (itemPreview)
+		{
+			ItemBase selectedItem = ItemBase.Cast(itemPreview.GetItem());
+			
+			if (selectedItem)
+			{
+				switch (button)
+				{
+					case MouseState.RIGHT:
+						#ifdef DIAG_DEVELOPER
+						if (g_Game.IsLeftCtrlDown())
+							ShowActionMenu(selectedItem);
+						#endif
+
+						break;
+				
+					case MouseState.MIDDLE:
+						InspectItem(selectedItem);
+						break;
+					
+					case MouseState.LEFT:
+						PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+						if (g_Game.IsLeftCtrlDown())
+						{
+							if (controlledPlayer.CanDropEntity(selectedItem))
+							{
+								if (selectedItem.GetTargetQuantityMax() < selectedItem.GetQuantity())
+									selectedItem.SplitIntoStackMaxClient(null, -1);
+								else
+									controlledPlayer.PhysicalPredictiveDropItem(selectedItem);
+							}
+							else
+							{
+								bool draggable = !controlledPlayer.GetInventory().HasInventoryReservation(selectedItem, null ) && !controlledPlayer.GetInventory().IsInventoryLocked() && selectedItem.GetInventory().CanRemoveEntity() && !controlledPlayer.IsItemsToDelete();
+								ItemManager.GetInstance().SetWidgetDraggable(w, draggable);
+							}
+						}
+
+						break;
+				}
+			}
+		}
+	}
+		
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			ItemPreviewWidget iw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+			if (!iw)
+			{
+			  string name = w.GetName();
+			  name.Replace("PanelWidget", "Render");
+			  iw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+			}
+
+			if (!iw)
+			  iw = ItemPreviewWidget.Cast(w);
+	
+			ItemBase item = ItemBase.Cast(iw.GetItem());
+			if (item)
+			{
+				PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+				EntityAI itemInHands = controlledPlayer.GetHumanInventory().GetEntityInHands();
+		
+				if (!item.GetInventory().CanRemoveEntity())
+					return;
+				
+				if (controlledPlayer.GetInventory().HasEntityInInventory(item) && controlledPlayer.GetHumanInventory().CanAddEntityInHands(item))
+				{
+					controlledPlayer.PredictiveTakeEntityToHands(item);
+				}
+				else
+				{
+					if (controlledPlayer.GetInventory().CanAddEntityToInventory(item) && controlledPlayer.GetHumanInventory().CanRemoveEntityInHands())
+					{
+						controlledPlayer.PredictiveTakeEntityToInventory(FindInventoryLocationType.ANY, item);
+					}
+					else
+					{
+						if (controlledPlayer.GetHumanInventory().CanAddEntityInHands(item))
+							controlledPlayer.PredictiveTakeEntityToHands(item);
+					}
+				}
+		
+				HideOwnedTooltip();
+		
+				name = w.GetName();
+				name.Replace("PanelWidget", "Temperature");
+				w.FindAnyWidget(name).Show(false);
+			}
+		}
+	}
+
+	void DraggingOverHeader2(Widget w, int x, int y, Widget receiver )
+	{
+		DraggingOverHeader(w, x, y, receiver );
+	}
+	
+	void ElectricityIcon()
+	{
+		EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+		if( item_in_hands && item_in_hands.GetCompEM() )
+		{
+			if( GetRootWidget().FindAnyWidget( "electricity" ) )
+			{
+				bool show_electricity_icon = item_in_hands.GetCompEM().HasElectricityIcon();
+				GetRootWidget().FindAnyWidget( "electricity" ).Show( show_electricity_icon );
+			}
+			
+			if( GetRootWidget().FindAnyWidget( "electricity_can_work" ) )
+			{
+				bool show_electricity_can_work_icon = item_in_hands.GetCompEM().CanWork() && !item_in_hands.IsRuined();
+				GetRootWidget().FindAnyWidget( "electricity_can_work" ).Show( show_electricity_can_work_icon );
+			}
+		}
+		else
+		{
+			GetRootWidget().FindAnyWidget( "electricity" ).Show( false );
+		}
+	}
+
+	void CollapseButtonOnMouseButtonDown( Widget w )
+	{
+		int i;
+		if( !m_Hidden )
+		{
+			for (i = 0; i < m_Body.Count(); i++)
+			{
+				m_Body.Get( i ).OnHide();
+			}
+			m_Hidden = true;
+		}
+		else
+		{
+			for (i = 0; i < m_Body.Count(); i++)
+			{
+				m_Body.Get( i ).OnShow();
+			}
+			m_Hidden = false;
+		}
+
+		w.FindAnyWidget("opened").Show(m_Hidden);
+		w.FindAnyWidget("closed").Show(!m_Hidden);
+		
+		m_Parent.Refresh();
+	}
+	
+	void HideCargo()
+	{
+		if( m_CargoGrid )
+		{
+			m_CargoGrid.OnHide();
+			RecomputeOpenedContainers();
+		}	
+	}
+	
+	void ShowCargo()
+	{
+		if( m_CargoGrid )
+		{
+			m_CargoGrid.OnShow();
+			RecomputeOpenedContainers();
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/IconsContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/IconsContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bee9414eaa11c6236b59b400eae821271e0526e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Containers/IconsContainer.c
@@ -0,0 +1,100 @@
+class IconsContainer: Container
+{
+	protected ref map<int, ref Icon> m_EntitiesMap = new map<int, ref Icon>;
+
+	void IconsContainer( LayoutHolder parent )
+	{
+	}
+
+	override void UnfocusAll()
+	{
+		for ( int i = 0; i < Count(); i++ )
+		{
+			for ( int j = 0; j < ITEMS_IN_ROW; j++ )
+			{
+				Get( i ).GetMainWidget().FindAnyWidget( "Cursor" + j ).Show( false );
+			}
+		}
+		
+		
+		for ( i = 0; i < m_EntitiesMap.Count(); ++i )
+		{
+			m_EntitiesMap.GetElement(i).SetActive(false);
+		}
+	}
+	
+	int GetItemCount()
+	{
+		return m_EntitiesMap.Count();
+	}
+	
+	void AddItem( Icon icon )
+	{	
+		if( !m_EntitiesMap.Contains( icon.GetObject().GetID() ) )
+		{
+			m_EntitiesMap.Insert( icon.GetObject().GetID(), icon);
+		}
+	}
+	
+	Icon GetIcon( int entity_id )
+	{
+		return m_EntitiesMap.Get( entity_id  );
+	}
+	
+	Icon GetIconByIndex( int index )
+	{
+		if( index < m_EntitiesMap.Count() && index > -1 )
+			return m_EntitiesMap.GetElement( index  );
+		return null;
+	}
+
+	void RemoveItem( Icon icon )
+	{
+		if( icon )
+		{
+			Icon icon_copy = icon; // for some reason garbage collector collects icon too soon, so copy has to be made
+			if( icon.GetObject() )
+				m_EntitiesMap.Remove( icon.GetObject().GetID() );
+			else
+			{
+				int ix = m_EntitiesMap.GetKeyByValue( icon );
+				if( m_EntitiesMap.Contains( ix ) )
+					m_EntitiesMap.Remove( ix );
+				else
+					delete icon;
+			}
+		}
+	}
+
+	void RemoveItem( int entity )
+	{
+		m_EntitiesMap.Remove( entity );
+	}
+	
+	bool ContainsEntity( EntityAI entity )
+	{
+		return m_EntitiesMap.Contains( entity.GetID() );
+	}
+	
+	void UpdateItemsTemperature()
+	{
+		if( !ItemManager.GetInstance().IsDragging() )
+		{
+			for( int i = 0; i < m_EntitiesMap.Count(); i++ )
+			{
+				Icon icon = m_EntitiesMap.GetElement(i);
+				icon.SetTemperature();
+			}			
+		}
+	}
+
+	override void Refresh()
+	{
+		super.Refresh();
+
+		for( int i = 0; i < m_EntitiesMap.Count(); i++ )
+		{
+			m_EntitiesMap.GetElement(i).Refresh();
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..f5fe90163a7ec63588b82132a02274dfe3ac7f43
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesContainer.c
@@ -0,0 +1,544 @@
+class AttachmentCategoriesContainer: CollapsibleContainer
+{
+	protected ref map<string, int>							m_CategorySlotIndex;
+	protected int											m_SlotsCount;
+	protected SlotsIcon										m_CargoSlotsIcon;
+
+	void AttachmentCategoriesContainer( LayoutHolder parent, int sort = -1 )
+	{
+		m_CategorySlotIndex = new map<string, int>;
+	}
+	
+	void SetEntity( EntityAI entity )
+	{
+		m_Entity = entity;
+		InitIconsContainers();
+		
+		m_MainWidget = m_RootWidget.FindAnyWidget( "body" );
+		WidgetEventHandler.GetInstance().RegisterOnChildAdd( m_MainWidget, this, "OnChildAdd" );
+		WidgetEventHandler.GetInstance().RegisterOnChildRemove( m_MainWidget, this, "OnChildRemove" );
+		
+		InitGhostSlots();
+		
+		( Container.Cast( m_Parent ) ).m_Body.Insert( this );
+		m_Parent.Refresh();
+		SetHeaderName();
+		RecomputeOpenedContainers();
+	}
+
+	void SetHeaderName()
+	{
+		m_CollapsibleHeader.SetName( m_Entity.GetDisplayName() );
+	}
+	
+	override bool IsDisplayable()
+	{
+		return !IsEmpty() || CanDisplayAnyCategory();
+	}
+
+	override void UpdateInterval()
+	{
+		if( m_Entity )
+		{
+			if( m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || m_Hidden )
+			{
+				if( m_Body.Count() > 0 && !m_Hidden )
+					m_CollapsibleHeader.OnHide();
+				HideContent();
+				GetMainWidget().Show( false );
+			}
+			else
+			{
+				if( m_Body.Count() > 0 && !m_Hidden )
+				{
+					if( m_Body.Count() > 0 && !m_Hidden )
+						m_CollapsibleHeader.OnShow();
+					int i;
+					for (i = m_SlotsCount; i < m_Body.Count(); i++)
+					{
+						AttachmentCategoriesRow row = AttachmentCategoriesRow.Cast( m_Body[i] );
+						if (row)
+						{
+							if (m_Entity.CanDisplayAttachmentCategory( row.GetCategoryIdentifier() ))
+							{
+								if ( row.IsDisplayable() )
+								{
+									ShowInSlots( row.GetCategoryIdentifier(), true );
+									if (!row.IsVisible())
+									{
+										row.OnShow();
+									}
+								}
+								else
+								{
+									ShowInSlots( row.GetCategoryIdentifier(), false );
+									if (row.IsVisible())
+									{
+										row.OnHide();
+									}
+								}
+							}
+							else
+							{
+								ShowInSlots( row.GetCategoryIdentifier(), false );
+								if (row.IsVisible())
+								{
+									row.OnHide();
+								}
+							}
+							row.UpdateInterval();
+						}
+						else
+						{
+							ContainerWithCargo cargo = ContainerWithCargo.Cast(m_Body[i]);
+							if (cargo)
+							{
+								if (m_Entity.CanDisplayCargo())
+								{
+									m_CargoSlotsIcon.m_MainWidget.Show(true);
+									if (!cargo.IsVisible())
+									{
+										cargo.OnShow();
+									}
+								}
+								else
+								{
+									m_CargoSlotsIcon.m_MainWidget.Show(false);
+									if (cargo.IsVisible())
+									{
+										cargo.OnHide();
+									}
+								}
+								cargo.UpdateInterval();
+							}
+							RecomputeOpenedContainers();
+							
+						}
+						
+					}
+					for ( i = 0; i < m_SlotsCount; i++)
+					{
+						AttachmentCategoriesSlotsContainer slots = AttachmentCategoriesSlotsContainer.Cast( m_Body[i] );
+						{
+							if (slots.IsDisplayable())
+							{
+								slots.OnShow();
+							}
+							else
+							{
+								slots.OnHide();
+							}	
+						}
+					}
+				}
+				GetMainWidget().Show( true );
+			}
+		}
+	}
+	
+	void LoadAttachmentCategoriesIcon( SlotsContainer items_cont, string icon_name, int slot_number )
+	{
+		SlotsIcon icon				= items_cont.GetSlotIcon( slot_number );
+		ImageWidget image_widget	= icon.GetGhostSlot();
+		image_widget.Show( true );
+		image_widget.LoadImageFile( 0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY,icon_name) ); //icon_name must be in format "set:<setname> image:<imagename>"
+	}
+
+	int GetAttachmentCategoriesCount( string config_path )
+	{
+		return GetGame().ConfigGetChildrenCount( config_path );
+	}
+
+	SlotsContainer GetSlotsContainer( int icons_row )
+	{
+		AttachmentCategoriesSlotsContainer items_cont = AttachmentCategoriesSlotsContainer.Cast(m_Body.Get(icons_row));
+		return items_cont.GetSlotsContainer();
+	}
+	
+	SlotsIcon GetCargoSlotsIcon()
+	{
+		return m_CargoSlotsIcon;
+	}
+	
+	void ShowInSlots( string category, bool show )
+	{
+		int index						= m_CategorySlotIndex.Get( category );
+		int slot_number					= index % ITEMS_IN_ROW;
+		
+		SlotsContainer items_cont		= GetSlotsContainer( index / ITEMS_IN_ROW );
+		if( items_cont )
+		{
+			Widget icon_widget			= items_cont.GetSlotIcon( slot_number ).GetMainWidget();
+			if( icon_widget )
+				icon_widget.Show( show );
+			icon_widget.GetParent().Update();
+			icon_widget.GetParent().GetParent().Update();
+			icon_widget.GetParent().GetParent().GetParent().Update();
+		}
+	}
+	
+	//oof
+	override bool CanDisplayAnyCategory()
+	{
+		int count = m_Body.Count();
+		AttachmentCategoriesRow row;
+		for (int i = m_SlotsCount; i < count; i++)
+		{
+			if (Class.CastTo(row,m_Body[i]) && m_Entity.CanDisplayAttachmentCategory( row.GetCategoryIdentifier() ))
+			{
+				return true;
+			}
+		}
+		return super.CanDisplayAnyCategory();
+	}
+	
+	override void UpdateRadialIcon()
+	{
+		if ( m_SlotIcon )
+		{
+			if (m_Entity.CanDisplayCargo() || CanDisplayAnyCategory())
+			{
+				m_SlotIcon.GetRadialIconPanel().Show( true );
+				SetOpenForSlotIcon(!m_Hidden);
+			}
+			else
+			{
+				m_SlotIcon.GetRadialIconPanel().Show( false );
+			}
+		}
+	}
+	
+	string GetAttachmentCategory( string config_path_attachment_categories, int i )
+	{
+		string attachment_category;
+		GetGame().ConfigGetChildName(config_path_attachment_categories, i, attachment_category);
+		return attachment_category;
+	}
+
+	string GetIconName( string config_path_attachment_categories, string attachment_category )
+	{
+		string icon_path = config_path_attachment_categories+ " " + attachment_category + " icon";
+		string icon_name;
+		GetGame().ConfigGetText(icon_path, icon_name);
+		return icon_name;
+	}
+	
+	int GetViewIndex( string config_path_attachment_categories, string attachment_category )
+	{
+		string preview_path = config_path_attachment_categories+ " " + attachment_category + " view_index";
+		return GetGame().ConfigGetInt( preview_path );;
+	}
+
+	void MouseClick(Widget w)
+	{
+		SlotsIcon icon;
+		w.GetUserData(icon);
+		
+		ClosableContainer c = ClosableContainer.Cast(icon.GetContainer());
+		if (c)
+			c.Toggle();
+	}
+	
+	override void ExpandCollapseContainer()
+	{
+		if (m_OpenedContainers.Count() > m_ActiveIndex)
+		{
+			//c - container where selected icon is part of
+			Container c = Container.Cast(m_OpenedContainers.Get( m_ActiveIndex ));
+			//cc - container connected to selected icon (this container will be close/open)
+			ClosableContainer cc;
+			//icon - selected icon
+			SlotsIcon icon = c.GetFocusedSlotsIcon();
+			
+			if (icon)
+			{
+				cc = ClosableContainer.Cast(icon.GetContainer());
+			}
+			
+			if (cc)
+			{
+				
+				cc.Toggle();
+				RecomputeOpenedContainers();
+			}
+		}
+	}
+	
+	bool IsHeaderActive()
+	{
+		return m_CollapsibleHeader.IsActive();
+	}
+	
+	void InitIconsContainers()
+	{
+		m_SlotsCount = 0;
+		
+		string type = m_Entity.GetType();
+		string config_path_attachment_categories = "CfgVehicles " + type + " GUIInventoryAttachmentsProps";
+		int attachments_categories_count = GetAttachmentCategoriesCount( config_path_attachment_categories );
+		int categories_count = attachments_categories_count;
+		if (m_Entity.GetInventory().GetCargo())
+		{
+			categories_count++;
+		}
+		int row_count = categories_count / ITEMS_IN_ROW;
+		if (categories_count % ITEMS_IN_ROW != 0)
+		{
+			row_count++;
+		}
+		for ( int i = 0; i < row_count; i++ )
+		{
+			ref AttachmentCategoriesSlotsContainer items_cont = new AttachmentCategoriesSlotsContainer( this, i );
+			m_Body.Insert( items_cont );
+			m_OpenedContainers.Insert( items_cont );
+			
+			//TODO MW find better way
+			if (i == ( row_count - 1 ) && categories_count % ITEMS_IN_ROW != 0)
+				items_cont.GetSlotsContainer().SetColumnCount( categories_count % ITEMS_IN_ROW );
+			else
+				items_cont.GetSlotsContainer().SetColumnCount( ITEMS_IN_ROW );
+		}
+		m_SlotsCount = row_count;
+	}
+	
+	void InitGhostSlots()
+	{
+		string type = m_Entity.GetType();
+		string config_path_attachment_categories = "CfgVehicles " + type + " GUIInventoryAttachmentsProps";
+
+		int attachments_categories_count = GetAttachmentCategoriesCount( config_path_attachment_categories );
+
+		SlotsContainer items_cont;
+		SlotsIcon icon;
+		string attachment_category;
+		string icon_name;
+		
+		for (int i = 0; i < attachments_categories_count; i++)
+		{
+			items_cont = GetSlotsContainer( i / ITEMS_IN_ROW );
+			attachment_category = GetAttachmentCategory( config_path_attachment_categories, i );
+			icon_name = GetIconName( config_path_attachment_categories, attachment_category );
+
+			if ( items_cont )
+			{
+				int slot_number = i % ITEMS_IN_ROW;
+				m_CategorySlotIndex.Insert( attachment_category, i );
+				icon = items_cont.GetSlotIcon( slot_number );
+				icon.GetGhostSlot().SetFlags( WidgetFlags.IGNOREPOINTER );
+				
+				LoadAttachmentCategoriesIcon( items_cont, icon_name, slot_number );
+				
+				string config = config_path_attachment_categories + " " + attachment_category + " name";
+				string name;
+		
+				GetGame().ConfigGetText(config,name);
+				icon.SetSlotDisplayName(name);
+				
+				AttachmentCategoriesRow ar;
+
+				ar = new AttachmentCategoriesRow( this, -1 );
+				ar.Init(attachments_categories_count, i, attachment_category, config_path_attachment_categories, m_Entity, m_Body.Count() );
+
+				//Insert(ar);
+				ar.SetSlotIcon(icon);
+				//icon.SetContainer(ar);
+				
+				icon.GetRadialIconPanel().Show( true );
+				ar.Open();		
+				icon.SetContainer(ar);
+				Insert(ar);
+			}
+		}
+		
+		if ( m_Entity.GetInventory().GetCargo() )
+		{
+			items_cont = GetSlotsContainer( m_SlotsCount - 1 );
+			if ( items_cont )
+			{
+				icon = items_cont.GetSlotIcon( attachments_categories_count );
+				icon.GetGhostSlot().Show( true );
+				icon.GetGhostSlot().LoadImageFile( 0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY,m_Entity.ConfigGetString("GUIInventoryCargoIcon")) );
+				icon.SetSlotDisplayName(m_Entity.ConfigGetString("GUIInventoryCargoName"));
+				icon.GetGhostSlot().SetFlags( WidgetFlags.IGNOREPOINTER );
+				
+				icon.GetRadialIconPanel().Show( true );
+				icon.GetMainWidget().Show( true );
+				
+				ContainerWithCargo iwc = new ContainerWithCargo( this, -1 );
+				iwc.Get( 0 ).GetRootWidget().ClearFlags( WidgetFlags.DRAGGABLE );
+				iwc.SetEntity( m_Entity, 0, false );
+				iwc.SetSlotIcon( icon );
+				iwc.Open();
+				
+				icon.SetContainer(iwc);
+				m_CargoSlotsIcon = icon;
+			}
+		}
+
+		RecomputeOpenedContainers();
+	}
+	
+
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget("Render") );
+		if(!iw)
+		{
+			string name = w.GetName();
+			name.Replace("PanelWidget", "Render");
+			iw = ItemPreviewWidget.Cast( w.FindAnyWidget(name) );
+		}
+		if(!iw)
+		{
+			iw = ItemPreviewWidget.Cast( w );
+		}
+		if( !iw.GetItem() )
+			return;
+		if( m_Entity.GetInventory().CanAddAttachment( iw.GetItem() ) && iw.GetItem().GetInventory().CanRemoveEntity() )
+		{
+			GetGame().GetPlayer().PredictiveTakeEntityToTargetAttachment( m_Entity, iw.GetItem() );
+		}
+		else if( m_Entity.GetInventory().CanAddEntityToInventory( iw.GetItem() ) && iw.GetItem().GetInventory().CanRemoveEntity() )
+		{
+			GetGame().GetPlayer().PredictiveTakeEntityToTargetInventory( m_Entity, FindInventoryLocationType.ANY, iw.GetItem() );
+		}
+	}
+	
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if( w == null )
+		{
+			return;
+		}
+		ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget("Render") );
+		if(!iw)
+		{
+			string name = w.GetName();
+			name.Replace("PanelWidget", "Render");
+			iw = ItemPreviewWidget.Cast( w.FindAnyWidget(name) );
+		}
+		if(!iw)
+		{
+			iw = ItemPreviewWidget.Cast( w );
+		}
+		if( !iw || !iw.GetItem() )
+		{
+			return;
+		}
+		
+		ItemManager.GetInstance().ShowSourceDropzone( iw.GetItem() );
+		ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+	}
+	
+	/*override void CollapseButtonOnMouseButtonDown(Widget w)
+	{
+		super.CollapseButtonOnMouseButtonDown(w);
+		RecomputeOpenedContainers();
+	}*/
+	override void CollapseButtonOnMouseButtonDown( Widget w )
+	{
+		if( !m_Hidden )
+		{
+			for (int i = 1; i < m_Body.Count(); i++)
+			{
+				m_Body.Get( i ).OnHide();
+				Container c = Container.Cast(m_Body.Get(i));
+				if (c)
+				{
+					c.Close();
+				}
+			}
+
+			//m_Hidden = true;
+			OnHide();
+		}
+		else
+		{
+			//m_Hidden = false;
+			OnShow();
+		}
+		m_Closed = m_Hidden;
+		
+		SetCollapsibleHeaderArrowState(m_Hidden);
+		if (m_CollapsibleHeader)
+		{
+			m_CollapsibleHeader.SetHeaderVisible(true);
+		}
+
+		UpdateCollapseButtons();
+		RecomputeOpenedContainers();
+	}
+	
+	override void Open()
+	{
+		if( IsDisplayable() )
+		{
+			super.Open();
+			//ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), true );
+			SetOpenForSlotIcon(true);
+			OnShow();
+			//m_Parent.m_Parent.Refresh();
+		}
+	}
+
+	override void Close()
+	{
+		//ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), false );
+		super.Close();
+		
+		SlotsIcon icon = null;
+		if (m_CargoSlotsIcon && m_CargoSlotsIcon.GetObject())
+		{
+			icon = m_CargoSlotsIcon;
+		}
+		else if (m_SlotIcon && m_SlotIcon.GetObject())
+		{
+			icon = m_SlotIcon;
+		}
+		/*else
+		{
+			Print("Dbg | no object in icon here!");
+		}
+		*/
+		
+		SetOpenForSlotIcon(false,icon);
+		OnHide();
+	}
+	
+	override void OnHide()
+	{
+		if (m_CollapsibleHeader)
+		{
+			bool b1 = !m_SlotIcon && !m_CargoSlotsIcon;
+			bool b2 = (!m_SlotIcon || !m_SlotIcon.IsVisible()) && m_CargoSlotsIcon && m_CargoSlotsIcon.IsVisible();
+			m_CollapsibleHeader.SetHeaderVisible(b1 || b2);
+		}
+		super.OnHide();
+	}
+	
+	override bool CanOpenCloseContainerEx(EntityAI focusedEntity)
+	{
+		if (m_OpenedContainers.Count() > m_ActiveIndex)
+		{
+			ClosableContainer c;
+			SlotsIcon icon = GetFocusedSlotsIcon();
+			
+			if (icon)
+			{
+				c = ClosableContainer.Cast(icon.GetContainer());
+			}
+			
+			if (c && c.IsDisplayable())
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool CanSplitEx(EntityAI focusedEntity)
+	{
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesRow.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesRow.c
new file mode 100644
index 0000000000000000000000000000000000000000..9ad06307cfdbe61ac50c4b733d1a6a6688704d65
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesRow.c
@@ -0,0 +1,975 @@
+class AttachmentCategoriesRow: ClosableContainer
+{
+	protected string								m_CategoryIdentifier;
+	protected string								m_RowConfigPath;
+	protected bool									m_Refreshing;
+	
+	protected ref AttachmentsGroupContainer			m_AttachmentsContainer;
+	protected ref map<int, ref ContainerWithCargo>	m_AttachmentCargos;
+	
+	void AttachmentCategoriesRow( LayoutHolder parent, int sort = -1 )
+	{
+		m_Refreshing = false;
+		m_AttachmentCargos		= new map<int, ref ContainerWithCargo>;
+		m_AttachmentsContainer	= new AttachmentsGroupContainer(this);
+		
+		m_Body.Insert(m_AttachmentsContainer);
+		
+		m_ClosableHeader.GetMainWidget().ClearFlags( WidgetFlags.DRAGGABLE );
+		
+		RecomputeOpenedContainers();
+	}
+	
+	string GetCategoryIdentifier()
+	{
+		return m_CategoryIdentifier;
+	}
+	
+	int GetFocusedSlot()
+	{
+		SlotsIcon icon = GetFocusedSlotsIcon();
+		if (icon)
+		{
+			return icon.GetSlotID();
+		}
+		return -1;
+	}
+	
+	override bool Select()
+	{
+		Man player = GetGame().GetPlayer();
+		SlotsIcon focused_icon = GetFocusedSlotsIcon();
+		EntityAI focused_item = GetFocusedItem();
+		Container focused_cont = GetFocusedContainer();
+		ItemBase selected_item = ItemBase.Cast( ItemManager.GetInstance().GetSelectedItem() ); // == dragged item 
+		
+		if( selected_item && focused_item != selected_item)//dropping from micromanagement
+		{
+			if( selected_item.GetInventory().CanRemoveEntity() )
+			{
+				int stack_max;
+				
+				if (!focused_icon)
+				{
+					if (focused_cont)
+					{
+						focused_cont.Select();
+					}
+				}
+				else if( !focused_item && m_Entity && m_Entity.GetInventory().CanAddAttachmentEx( selected_item, focused_icon.GetSlotID() ) )
+				{
+					stack_max = InventorySlots.GetStackMaxForSlotId( focused_icon.GetSlotID() );
+					float quantity = selected_item.GetQuantity();
+					if( stack_max == 0 || stack_max >= quantity || !selected_item.CanBeSplit() )
+					{
+						player.PredictiveTakeEntityToTargetAttachmentEx( m_Entity, selected_item, focused_icon.GetSlotID() );
+						return true;
+					}
+					else
+					{
+						selected_item.SplitIntoStackMaxClient( m_Entity, focused_icon.GetSlotID() );
+						return true;
+					}
+				}
+				else if (focused_icon.GetSlotID() != -1)
+				{
+					if (focused_item && focused_item.GetHierarchyParent() && focused_item.GetHierarchyParent().GetInventory().CanAddAttachment(selected_item))
+					{
+						InventoryLocation inv_loc = new InventoryLocation;
+						focused_item.GetInventory().GetCurrentInventoryLocation( inv_loc );
+						stack_max = InventorySlots.GetStackMaxForSlotId( inv_loc.GetSlot() );
+						quantity = focused_item.GetQuantity();
+						if( focused_item.CanBeCombined( ItemBase.Cast( selected_item ) ) )
+						{
+							focused_item.CombineItemsClient( selected_item, true );
+							return true;
+						}
+						else if( stack_max == 0 && GameInventory.CanSwapEntitiesEx( focused_item, selected_item ) )
+						{
+							player.PredictiveSwapEntities( selected_item, focused_item );
+							return true;
+						}
+						else if( m_AttachmentCargos.Contains( inv_loc.GetSlot() ) )
+						{
+							if( focused_item.GetInventory().CanAddEntityInCargo( selected_item, selected_item.GetInventory().GetFlipCargo() ) )
+							{
+								SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( player ), focused_item, selected_item );
+								return true;
+							}
+						}
+					}
+				}
+			}
+		}
+		else //clicking
+		{
+			if( focused_item && focused_item.GetInventory().CanRemoveEntity() && (!focused_icon || !focused_icon.IsOutOfReach()) )
+			{
+				EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+				if( item_in_hands && item_in_hands.GetInventory().CanRemoveEntity() )
+				{
+					if( GameInventory.CanSwapEntitiesEx( item_in_hands, focused_item ) )
+					{
+						player.PredictiveSwapEntities( item_in_hands, focused_item );
+						return true;
+					}
+				}
+				else
+				{
+					if( player.GetHumanInventory().CanAddEntityInHands( focused_item ) )
+					{
+						player.PredictiveTakeEntityToHands( focused_item );
+						return true;
+					}
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool TransferItem()
+	{
+		if (CanTakeToInventory())
+		{
+			EntityAI entity = GetFocusedItem();
+			SlotsIcon focused_icon = GetFocusedSlotsIcon();
+			if( entity && !entity.IsLockedInSlot() && (!focused_icon || !focused_icon.IsOutOfReach()) )
+			{
+				PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+				GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, entity );
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		if (CanDrop())
+		{
+			ItemBase item = ItemBase.Cast(GetFocusedItem());
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			SlotsIcon focused_icon = GetFocusedSlotsIcon();
+			
+			if (item && !item.IsLockedInSlot() && (focused_icon && !focused_icon.IsOutOfReach()))
+			{
+				if (item.GetTargetQuantityMax() < item.GetQuantity())
+					item.SplitIntoStackMaxClient( null, -1 );
+				else
+					player.PhysicalPredictiveDropItem( item );
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool Combine()
+	{
+		if (CanCombine())
+		{
+			Man player = GetGame().GetPlayer();
+			ItemBase prev_item = ItemBase.Cast( GetFocusedItem() );
+			ItemBase selected_item = ItemBase.Cast( player.GetHumanInventory().GetEntityInHands() );
+			SlotsIcon focused_icon = GetFocusedSlotsIcon();
+			
+			if( selected_item )
+			{
+				int selected_slot = GetFocusedSlot();
+				int stack_max;
+				if( selected_item && selected_item.GetInventory().CanRemoveEntity() && (focused_icon && !focused_icon.IsOutOfReach()) )
+				{
+					if( !prev_item && m_Entity.GetInventory().CanAddAttachmentEx( selected_item, selected_slot ) )
+					{
+						stack_max = InventorySlots.GetStackMaxForSlotId( selected_slot );
+						float quantity = selected_item.GetQuantity();
+						if( stack_max == 0 || stack_max >= quantity || !selected_item.CanBeSplit() )
+						{
+							player.PredictiveTakeEntityToTargetAttachmentEx( m_Entity, selected_item, selected_slot );
+							return true;
+						}
+						else
+						{
+							selected_item.SplitIntoStackMaxClient( m_Entity, selected_slot );
+							return true;
+						}
+					}
+					else if( selected_slot != -1 )
+					{
+						if( prev_item )
+						{
+							InventoryLocation inv_loc = new InventoryLocation;
+							prev_item.GetInventory().GetCurrentInventoryLocation( inv_loc );
+							stack_max = InventorySlots.GetStackMaxForSlotId( inv_loc.GetSlot() );
+							quantity = prev_item.GetQuantity();
+							if( prev_item.CanBeCombined( ItemBase.Cast( selected_item ) ) )
+							{
+								prev_item.CombineItemsClient( selected_item, true );
+								return true;
+							}
+							else if( stack_max == 0 && GameInventory.CanSwapEntitiesEx( prev_item, selected_item ) )
+							{
+								player.PredictiveSwapEntities( selected_item, prev_item );
+								return true;
+							}
+							else if( m_AttachmentCargos.Contains( inv_loc.GetSlot() ) )
+							{
+								if( prev_item.GetInventory().CanAddEntityInCargo( selected_item, selected_item.GetInventory().GetFlipCargo() ) )
+								{
+									SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( player ), prev_item, selected_item );
+									return true;
+								}
+							}
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool CanSplitEx(EntityAI focusedItem)
+	{
+		return false;
+	}
+
+	override bool SplitItem()
+	{
+		return false;
+	}
+	
+	override bool EquipItem() //TODO: may be possible, but the hint doesn't reflect it anyway
+	{
+		return false;
+	}
+	
+	override bool CanCombine()
+	{
+		Man player = GetGame().GetPlayer();
+		ItemBase prev_item = ItemBase.Cast( GetFocusedItem() );
+		ItemBase selected_item = ItemBase.Cast( player.GetHumanInventory().GetEntityInHands() );
+		SlotsIcon focused_icon = GetFocusedSlotsIcon();
+		
+		if( selected_item )
+		{
+			int selected_slot = GetFocusedSlot();
+			int stack_max;
+			if( selected_item && selected_item.GetInventory().CanRemoveEntity() && (focused_icon && !focused_icon.IsOutOfReach()) )
+			{
+				if( m_Entity.GetInventory().CanAddAttachmentEx( selected_item, selected_slot ) )
+				{
+					stack_max = InventorySlots.GetStackMaxForSlotId( selected_slot );
+					float quantity = selected_item.GetQuantity();
+					if( stack_max == 0 || stack_max >= quantity || !selected_item.CanBeSplit() )
+					{
+						return true;
+					}
+					else
+					{
+						return true;
+					}
+				}
+				else if( selected_slot != -1 )
+				{
+					if( prev_item )
+					{
+						InventoryLocation inv_loc = new InventoryLocation;
+						prev_item.GetInventory().GetCurrentInventoryLocation( inv_loc );
+						stack_max = InventorySlots.GetStackMaxForSlotId( inv_loc.GetSlot() );
+						quantity = prev_item.GetQuantity();
+						if( prev_item.CanBeCombined( ItemBase.Cast( selected_item ) ) )
+						{
+							return true;
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool CanCombineAmmo()
+	{
+		return false;
+	}
+	
+	override bool IsItemActive()
+	{
+		SlotsIcon icon = GetFocusedSlotsIcon();
+		return GetFocusedItem() != null && (!icon || !icon.IsOutOfReach());
+	}
+
+	override bool IsItemWithQuantityActive()
+	{
+		ItemBase item = ItemBase.Cast(GetFocusedItem());
+		SlotsIcon icon = GetFocusedSlotsIcon();
+		return item && ( !icon || !icon.IsOutOfReach()) && item.CanBeSplit();
+	}
+	
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+		SlotsIcon slots_icon;
+		EntityAI receiver_item;
+		int slot_id = -1;
+		bool is_reserved = false;
+		EntityAI attached_entity;
+		receiver.GetUserData(slots_icon);
+		float stackable = 0.0;
+		InventoryLocation il = new InventoryLocation;
+		
+		if( slots_icon )
+		{
+			receiver_item	= slots_icon.GetEntity();
+			slot_id			= slots_icon.GetSlotID();
+			attached_entity = slots_icon.GetSlotParent();
+			is_reserved		= slots_icon.IsReserved();
+		}
+		
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+		ItemBase item_base	= ItemBase.Cast( item );
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( !item.GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+			return;
+		
+		EntityAI target_att_entity = m_Entity;
+		Weapon_Base wpn;
+		Magazine mag;
+		if( Class.CastTo(wpn,  m_Entity ) && Class.CastTo(mag,  item ) )
+		{
+			if( player.GetWeaponManager().CanAttachMagazine( wpn, mag ) )
+			{
+				player.GetWeaponManager().AttachMagazine( mag );
+			}
+		}
+		else if( receiver_item && !is_reserved )
+		{
+			if( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( item ) ) )
+			{
+				( ItemBase.Cast( receiver_item ) ).CombineItemsClient( ItemBase.Cast( item ) );
+			}
+			else if( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+			{
+				if( !receiver_item.GetInventory().CanRemoveEntity() )
+					return;
+				GetGame().GetPlayer().PredictiveSwapEntities( receiver_item, item );
+			}
+			else if( receiver_item.GetInventory().CanAddAttachment( item ) )
+			{
+				player.PredictiveTakeEntityToTargetAttachment(receiver_item, item);
+			}
+		}
+		else if( attached_entity && slot_id != -1 &&  attached_entity.GetInventory().CanAddAttachmentEx( item, slot_id ) )
+		{
+			item_base	= ItemBase.Cast( item );
+			stackable	= item_base.GetTargetQuantityMax( slot_id );
+			
+			if( stackable == 0 || stackable >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachmentEx(attached_entity, item, slot_id);
+			}
+			else if( stackable != 0 && stackable < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( m_Entity, slot_id );
+			}
+		}
+		else if(attached_entity && slot_id == -1 && attached_entity.GetInventory().FindFreeLocationFor(item,FindInventoryLocationType.ATTACHMENT,il))
+		{
+			item_base	= ItemBase.Cast( item );
+			stackable	= item_base.GetTargetQuantityMax( il.GetSlot() );
+			
+			if( stackable == 0 || stackable >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachmentEx(attached_entity, item, il.GetSlot());
+			}
+			else if( stackable != 0 && stackable < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( m_Entity, il.GetSlot() );
+			}
+		}
+		/*else if( ( m_Entity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && ( !player.GetInventory().HasEntityInInventory( item ) || !m_Entity.GetInventory().HasEntityInCargo( item )) ) )
+		{
+			SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_Entity, item );
+		}*/
+	}
+
+	override void UnfocusAll()
+	{
+		int i;
+		for ( i = 1; i < Count(); i++ )
+		{
+			for ( int j = 0; j < ITEMS_IN_ROW; j++ )
+			{
+				Widget w = Get( i ).GetMainWidget().FindAnyWidget( "Cursor" + j );
+				if( w )
+					w.Show( false );
+			}
+		}
+		for ( i = 0; i < m_AttachmentCargos.Count(); i++ )
+		{
+			m_AttachmentCargos.GetElement( i ).Unfocus();
+			m_AttachmentCargos.GetElement( i ).SetActive( false );
+		}
+	}
+
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if( w == null )
+		{
+			return;
+		}
+		ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget("Render") );
+		if(!iw)
+		{
+		  string name = w.GetName();
+		  name.Replace("PanelWidget", "Render");
+		  iw = ItemPreviewWidget.Cast( w.FindAnyWidget(name) );
+		}
+		if(!iw)
+		{
+		  iw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if( !iw || !iw.GetItem() || (iw.GetItem() == m_Entity) )
+		{
+			return;
+		}
+		
+		ItemBase item;
+		ItemBase receiver_item;
+		name = receiver.GetName();
+		name.Replace("PanelWidget", "Render");
+		ItemPreviewWidget receiver_iw = ItemPreviewWidget.Cast( receiver.FindAnyWidget(name) );
+		if(receiver_iw)
+			receiver_item = ItemBase.Cast( receiver_iw.GetItem() );
+		
+		SlotsIcon slots_icon;
+		receiver.GetUserData(slots_icon);
+		
+		if( receiver_item )
+		{
+			int stack_max = InventorySlots.GetStackMaxForSlotId( receiver_item.GetInventory().GetSlotId(0) );
+			//int quantity = receiver_item.GetQuantity();
+			//bool combinable = ( quantity < stack_max ) && ( ItemBase.Cast( receiver_item ).CanBeCombined( ItemBase.Cast( iw.GetItem() ) ) );
+			if( receiver_item.CanBeCombined( ItemBase.Cast( iw.GetItem() ) ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.COMBINE_COLOR );
+			}
+			else if( stack_max == 0 && GameInventory.CanSwapEntitiesEx( receiver_item, iw.GetItem() ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+			}
+			else
+			{
+				ItemManager.GetInstance().ShowSourceDropzone( iw.GetItem() );
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			}
+		}
+		else if( slots_icon && slots_icon.GetSlotID() != -1 )
+		{
+			item = ItemBase.Cast( iw.GetItem() );
+			
+			if( item && m_Entity.GetInventory().CanAddAttachmentEx( item, slots_icon.GetSlotID() ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else
+			{
+				ItemManager.GetInstance().ShowSourceDropzone( iw.GetItem() );
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			}
+		}
+		else
+		{
+			ItemManager.GetInstance().ShowSourceDropzone( iw.GetItem() );
+			ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+		}
+	}
+	
+	bool DraggingOverGrid( Widget w,  int x, int y, Widget reciever, CargoContainer cargo )
+	{
+		if( w == null )
+		{
+			return false;
+		}
+		
+		EntityAI item = GetItemPreviewItem( w );
+		
+		if( !item )
+		{
+			return false;
+		}
+
+		int color;
+		int idx = 0;
+		int c_x, c_y;
+		
+		EntityAI target_entity;
+		CargoBase target_cargo;
+		
+		target_entity		=  cargo.GetEntity() ;
+		if( target_entity )
+		{
+			target_cargo 	= target_entity.GetInventory().GetCargo();
+		}
+		else
+			return false;
+		
+		if( target_cargo && target_entity )
+		{
+			c_x = target_cargo.GetHeight();
+			c_y = target_cargo.GetWidth();
+		}
+		else
+			return false;
+		
+		if( c_x > x && c_y > y && target_entity.GetInventory().CanAddEntityInCargoEx( item, idx, x, y, item.GetInventory().GetFlipCargo() ) )
+		{
+			color = ColorManager.GREEN_COLOR;
+		}
+		else
+		{
+			color = ColorManager.RED_COLOR;
+		}
+
+		if( w.FindAnyWidget("Cursor") )
+		{
+			w.FindAnyWidget("Cursor").SetColor( color );
+		}
+		else
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Cursor" );
+			if( w.FindAnyWidget( name ) )
+			{
+				w.FindAnyWidget( name ).SetColor( color );
+			}
+		}
+
+		return true;
+	}
+
+	void DropReceived( Widget w, int x, int y, CargoContainer cargo )
+	{
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+
+		int idx = 0;
+		int c_x, c_y;
+		
+		EntityAI target_entity;
+		CargoBase target_cargo;
+		
+		target_entity	= cargo.GetEntity();
+		if( target_entity )
+		{
+			target_cargo 	= target_entity.GetInventory().GetCargo();
+		}
+		else
+			return;
+		
+		if( target_cargo && target_entity )
+		{
+			c_x = target_cargo.GetHeight();
+			c_y = target_cargo.GetWidth();
+		}
+		else
+			return;
+		
+		InventoryLocation dst = new InventoryLocation;		
+		dst.SetCargoAuto(target_cargo, item, x, y, item.GetInventory().GetFlipCargo());
+			
+		if( c_x > x && c_y > y && target_entity.GetInventory().LocationCanAddEntity(dst))
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+
+			SplitItemUtils.TakeOrSplitToInventoryLocation( player, dst);
+
+			Icon icon = cargo.GetIcon( item );
+			
+			if( icon )
+			{
+				icon.GetCursorWidget().SetColor( ColorManager.BASE_COLOR );
+				icon.RefreshPos( x, y );
+				icon.Refresh();
+				Refresh();
+			}
+		}
+	}
+	
+	EntityAI GetItemPreviewItem( Widget w )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+		if( !ipw || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return null;
+		}
+		return ipw.GetItem();
+	}
+	
+	override void Refresh()
+	{
+		if (!m_Refreshing)
+		{
+			if( !m_Closed )
+			{
+				super.Refresh();
+				RefreshAllSlots();
+			}
+		}
+	}
+	
+	void RefreshAllSlots()
+	{
+		m_Refreshing = true;
+		int row_count = m_AttachmentsContainer.GetRowCount();
+		int row;
+		for (row = 0; row < row_count; row++)
+		{
+			int col_count = m_AttachmentsContainer.GetColumnCountForRow(row);
+			int col;
+			for (col = 0; col < col_count; col++)
+			{
+				RefreshSlot(row, col, -1, "");
+			}
+		}
+		m_Refreshing = false;
+	}
+	
+	//slot_id and slot_name parametr is not used
+	void RefreshSlot( int row, int column, int slot_id, string slot_name )
+	{
+		SlotsIcon icon = m_AttachmentsContainer.GetSlotsIcon(row, column);
+		int slot_id_ = icon.GetSlotID();
+		EntityAI item = m_Entity.GetInventory().FindAttachment( slot_id_ );
+		ContainerWithCargo cont;
+		
+		if (!m_Entity.CanDisplayAttachmentSlot(slot_id_))
+		{
+			icon.Clear();
+			icon.GetMainWidget().Show( false );
+		}
+		else if (!item)
+		{
+			if (icon.GetEntity())
+			{
+				icon.ClearRemainSelected();
+				
+				cont = m_AttachmentCargos.Get(slot_id_);
+				if (cont)
+				{
+					m_AttachmentCargos.Remove(slot_id_);
+					this.Remove(cont);
+					( Container.Cast( cont.m_Parent ) ).Remove( cont );
+				}
+			}
+			icon.GetMainWidget().Show(true);
+		}
+		else
+		{
+			icon.GetMainWidget().Show( true );
+			if (icon.GetEntity() != item)
+			{
+				icon.Init( item );
+			}
+			else
+			{
+				icon.Refresh();
+			}
+			
+			cont = m_AttachmentCargos.Get(slot_id_);
+			if( cont && cont.GetEntity() != item)
+			{
+				m_AttachmentCargos.Remove(slot_id_);
+				( Container.Cast( cont.m_Parent ) ).Remove( cont );
+				this.Remove(cont);
+				cont = null;
+			}
+			
+			if( !cont )
+			{
+				if( item.GetInventory().GetCargo() && m_AttachmentCargos )
+				{
+					cont = new ContainerWithCargo( this, true );
+					cont.GetRootWidget().SetSort( m_AttachmentCargos.Count() + 10 );
+					cont.SetEntity( item );
+					cont.SetSlotIcon( icon );
+					
+					m_AttachmentCargos.Insert( slot_id_, cont );
+					icon.SetContainer(cont);
+					
+					SetOpenForSlotIcon(cont.IsOpened(),icon);
+				}
+			}
+			
+			if (cont)
+			{
+				icon.GetRadialIconPanel().Show( cont.IsDisplayable() );
+			}
+				
+			string slot_name_ 			= InventorySlots.GetSlotName(slot_id_);
+			bool draggable				= true;
+			bool can_be_removed			= item.GetInventory().CanRemoveEntity();
+			bool in_hands_condition		= m_Entity.GetHierarchyRoot() == GetGame().GetPlayer();
+			bool in_vicinity_condition	= AttachmentsOutOfReach.IsAttachmentReachable( m_Entity, slot_name_ );
+			if( m_Entity.GetInventory().GetSlotLock( slot_id_ ) && ItemManager.GetInstance().GetDraggedItem() != item )
+			{
+				icon.GetMountedWidget().Show( true );
+				draggable = false;
+			}
+			else
+			{
+				icon.GetMountedWidget().Show( false );
+			}
+			
+			if( !m_Entity.CanReleaseAttachment( item ) )
+			{
+				draggable = false;
+			}
+			
+			if ((in_hands_condition || in_vicinity_condition) && can_be_removed)
+			{
+				icon.GetOutOfReachWidget().Show( false );
+			}
+			else
+			{
+				icon.GetOutOfReachWidget().Show( true );
+				draggable = false;
+			}
+			
+			if( draggable )
+			{
+				icon.GetRender().GetParent().SetFlags( WidgetFlags.DRAGGABLE );
+			}
+			else
+			{
+				icon.GetRender().GetParent().ClearFlags( WidgetFlags.DRAGGABLE );
+			}
+		}
+	}
+	
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			ItemPreviewWidget iw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+			if (!iw)
+			{
+			  string name = w.GetName();
+			  name.Replace("PanelWidget", "Render");
+			  iw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+			}
+			
+			if (!iw)
+			  iw = ItemPreviewWidget.Cast(w);
+			
+			SlotsIcon icon;
+			w.GetUserData(icon);
+			
+			if (icon && m_Entity.GetInventory().GetSlotLock(iw.GetUserID()))
+				return;
+			
+			if (icon.IsOutOfReach())
+				return;
+			
+			ItemBase item = ItemBase.Cast(iw.GetItem());
+			if (item)
+			{
+				if (!item.GetInventory().CanRemoveEntity())
+					return;
+				
+				PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+				if (controlledPlayer.GetInventory().HasEntityInInventory(item) && controlledPlayer.GetHumanInventory().CanAddEntityInHands(item))
+				{
+					controlledPlayer.PredictiveTakeEntityToHands(item);
+				}
+				else
+				{
+					if (controlledPlayer.GetInventory().CanAddEntityToInventory(item) && item.GetInventory().CanRemoveEntity())
+					{
+						if (item.GetTargetQuantityMax() < item.GetQuantity())
+							item.SplitIntoStackMaxClient(controlledPlayer, -1);
+						else
+							controlledPlayer.PredictiveTakeEntityToInventory(FindInventoryLocationType.ANY, item);
+					}
+					else
+					{
+						if (controlledPlayer.GetHumanInventory().CanAddEntityInHands(item))
+						{
+							if (item.GetTargetQuantityMax() < item.GetQuantity())
+								item.SplitIntoStackMaxHandsClient(controlledPlayer);
+							else
+								controlledPlayer.PredictiveTakeEntityToHands(item);
+						}
+					}
+				}
+				
+				HideOwnedTooltip();
+				
+				name = w.GetName();
+				name.Replace("PanelWidget", "Temperature");
+				w.FindAnyWidget(name).Show(false);
+			}
+		}
+	}
+	
+	void MouseClick(Widget w, int x, int y, int button)
+	{
+		ItemBase selectedItem;
+		SlotsIcon icon; 
+		w.GetUserData(icon);
+		if (icon)
+			selectedItem = ItemBase.Cast(icon.GetEntity());
+
+		if (selectedItem)
+		{
+			switch (button)
+			{
+				case MouseState.RIGHT:
+					#ifdef DIAG_DEVELOPER
+					if (g_Game.IsLeftCtrlDown())
+						ShowActionMenu(selectedItem);
+					#endif
+
+					break;
+			
+				case MouseState.MIDDLE:
+					InspectItem(selectedItem);
+					break;
+				
+				case MouseState.LEFT:
+					PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+					if (g_Game.IsLeftCtrlDown())
+					{
+						if (icon.IsOutOfReach())
+							return;
+
+						if (controlledPlayer.CanDropEntity(selectedItem))
+						{
+							if (selectedItem.GetTargetQuantityMax() < selectedItem.GetQuantity())
+								selectedItem.SplitIntoStackMaxClient(null, -1);
+							else
+								controlledPlayer.PhysicalPredictiveDropItem(selectedItem);
+						}
+						else
+						{
+							bool draggable = !controlledPlayer.GetInventory().HasInventoryReservation(selectedItem, null ) && !controlledPlayer.GetInventory().IsInventoryLocked() && selectedItem.GetInventory().CanRemoveEntity() && !controlledPlayer.IsItemsToDelete();
+							ItemManager.GetInstance().SetWidgetDraggable(w, draggable);
+						}
+					}
+					else
+					{
+						ClosableContainer c = ClosableContainer.Cast(icon.GetContainer());
+						if (c)
+							c.Toggle();
+					}
+
+					break;
+			}
+		}
+	}
+	
+	void Init(int attachments_categories_count, int i, string attachment_category, string config_path_attachment_categories, EntityAI entity, int parent_m_Body_count )
+	{
+		m_Entity = entity;
+		Header header = GetHeader();
+		
+		m_CategoryIdentifier = attachment_category;
+		
+		array<string> player_ghosts_slots2 = new array<string>();
+		string categoryName;
+		
+		m_RowConfigPath = config_path_attachment_categories + " " + attachment_category + " attachmentSlots";
+		string config_path_category_name = config_path_attachment_categories + " " + attachment_category + " name";
+		GetGame().ConfigGetTextArray(m_RowConfigPath, player_ghosts_slots2);
+		GetGame().ConfigGetText(config_path_category_name, categoryName);
+		header.SetName(categoryName);
+		
+		m_AttachmentsContainer.SetHeader(header);
+		SetHeader(null);
+		
+		int count = player_ghosts_slots2.Count();
+		int lastRow = count / ITEMS_IN_ROW;
+		SlotsContainer slotsContainer;
+		
+		for ( int j = 0; j < count; j++ )
+		{
+			string slotName = player_ghosts_slots2.Get(j);
+			string iconName; //must be in format "set:<setname> image:<imagename>"
+			string path = "CfgSlots" + " Slot_" + slotName;
+			
+			int slotId	= InventorySlots.GetSlotIdFromString(slotName);
+				
+			GetGame().ConfigGetText(path + " ghostIcon", iconName);
+			GetGame().ConfigGetText(path + " name", slotName);
+				
+			int row = j / ITEMS_IN_ROW;
+			int column = j % ITEMS_IN_ROW;
+			if (column == 0)
+			{
+				slotsContainer = new SlotsContainer(m_AttachmentsContainer, m_Entity);
+				slotsContainer.GetRootWidget().SetAlpha(0.7);
+				if (row == lastRow)
+					slotsContainer.SetColumnCount(count % ITEMS_IN_ROW);
+				else
+					slotsContainer.SetColumnCount(ITEMS_IN_ROW);
+
+				m_AttachmentsContainer.Insert(slotsContainer);
+				slotsContainer.GetRootWidget().SetSort(row);
+			} 
+				
+			SlotsIcon icon = slotsContainer.GetSlotIcon(column);
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived(icon.GetMainWidget(), this, "OnDropReceivedFromHeader");
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived(icon.GetGhostSlot(), this, "OnDropReceivedFromHeader");
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived(icon.GetPanelWidget(), this, "OnDropReceivedFromHeader");
+					
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver(icon.GetMainWidget(), this, "DraggingOverHeader");
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver(icon.GetGhostSlot(), this, "DraggingOverHeader");
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver(icon.GetPanelWidget(), this, "DraggingOverHeader");
+					
+			WidgetEventHandler.GetInstance().RegisterOnDrop(icon.GetMainWidget(), this, "OnIconDrop");
+			WidgetEventHandler.GetInstance().RegisterOnDrop(icon.GetPanelWidget(), this, "OnIconDrop");
+
+			WidgetEventHandler.GetInstance().RegisterOnDoubleClick(icon.GetPanelWidget(), this, "DoubleClick");
+			WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp(icon.GetPanelWidget(), this, "MouseClick");
+			
+			icon.GetGhostSlot().LoadImageFile(0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY, iconName));
+			icon.SetSlotID(slotId);
+			icon.SetSlotDisplayName(InventorySlots.GetSlotDisplayName(slotId));
+			
+			icon.Clear();
+		}
+		RefreshAllSlots();
+	}
+	
+	override void UpdateInterval()
+	{
+		super.UpdateInterval();
+		RefreshAllSlots();
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesSlotsContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesSlotsContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..aa41ddd646e934335cf14e9c095aa1cf22b6c695
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/AttachmentCategoriesSlotsContainer.c
@@ -0,0 +1,160 @@
+class AttachmentCategoriesSlotsContainer: Container
+{
+	ref SlotsContainer m_ItemsCont;
+	
+	void AttachmentCategoriesSlotsContainer( LayoutHolder parent, int index )
+	{
+		m_ItemsCont = new SlotsContainer(this, null);
+		m_Body.Insert( m_ItemsCont );
+		m_ItemsCont.GetMainWidget().SetUserID( index );
+		
+		for ( int k = 0; k < ITEMS_IN_ROW; k++ )
+		{
+			//WidgetEventHandler.GetInstance().RegisterOnDropReceived( m_ItemsCont.GetSlotIcon( k ).GetMainWidget(),  m_Parent, "OnDropReceivedFromHeader" );
+			//WidgetEventHandler.GetInstance().RegisterOnDropReceived(  m_ItemsCont.GetSlotIcon( k ).GetPanelWidget(),  m_Parent, "OnDropReceivedFromHeader" );
+			      
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver( m_ItemsCont.GetSlotIcon( k ).GetMainWidget(),  m_Parent, "DraggingOverHeader" );
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver( m_ItemsCont.GetSlotIcon( k ).GetPanelWidget(),  m_Parent, "DraggingOverHeader" );
+			
+			WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( m_ItemsCont.GetSlotIcon( k ).GetMainWidget(),  m_Parent, "MouseClick" );
+			WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( m_ItemsCont.GetSlotIcon( k ).GetPanelWidget(),  m_Parent, "MouseClick" );
+			
+			WidgetEventHandler.GetInstance().RegisterOnMouseEnter( m_ItemsCont.GetSlotIcon( k ).GetMainWidget(), m_ItemsCont.GetSlotIcon( k ), "MouseEnterGhostSlot" );
+			WidgetEventHandler.GetInstance().RegisterOnMouseLeave( m_ItemsCont.GetSlotIcon( k ).GetMainWidget(), m_ItemsCont.GetSlotIcon( k ), "MouseLeaveGhostSlot" );
+			
+			m_ItemsCont.GetSlotIcon( k ).GetMainWidget().SetUserID( k );
+			m_ItemsCont.GetSlotIcon( k ).GetPanelWidget().SetUserID( k );
+		}
+	}
+	
+	override bool IsDisplayable()
+	{
+		for(int i = 0; i < m_Body.Count(); i++)
+		{
+			LayoutHolder c = m_Body[i];
+			if( c && c.IsDisplayable())
+				return true;
+		}
+		return false;
+	}
+  
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.Container;
+	}
+  
+	SlotsContainer GetSlotsContainer()
+	{
+		return m_ItemsCont;
+	}
+	
+	override EntityAI GetFocusedItem()
+	{
+		return m_ItemsCont.GetFocusedSlotsIcon().GetRender().GetItem();
+	}
+	
+	int GetParentID()
+	{
+		return m_ItemsCont.GetMainWidget().GetUserID();
+	}
+	
+	int GetFocusedID()
+	{
+		return m_ItemsCont.GetFocusedSlotsIcon().GetMainWidget().GetUserID();
+	}
+	
+	void ExpandCollapseContainer( bool expand )
+	{
+		m_ItemsCont.GetFocusedSlotsIcon().GetRadialIcon().Show( expand );
+		m_ItemsCont.GetFocusedSlotsIcon().GetRadialIconClosed().Show( !expand );
+	}
+	
+	override bool SelectItem()
+	{
+		return false;
+	}
+	
+	override bool Select()
+	{
+		return false;
+	}
+	
+	override bool Combine()
+	{
+		return false;
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		return false;
+	}
+	
+	override bool TransferItem()
+	{
+		return false;
+	}
+	
+	override bool SplitItem()
+	{
+		return false;
+	}
+	
+	override bool EquipItem()
+	{
+		return false;
+	}
+	
+	override bool CanCombine()
+	{
+		return false;
+	}
+	
+	override bool CanCombineAmmo()
+	{
+		return false;
+	}
+	
+	override bool IsEmpty()
+	{
+		return false;
+	}
+	
+	override bool IsItemActive()
+	{
+		return false;
+	}
+
+	override bool IsItemWithQuantityActive()
+	{
+		return false;
+	}
+	
+	string GetAttachmentCategory( string config_path_attachment_categories, int i )
+	{
+		string attachment_category;
+		GetGame().ConfigGetChildName(config_path_attachment_categories, i, attachment_category);
+		return attachment_category;
+	}
+
+	string GetIconName( string config_path_attachment_categories, string attachment_category )
+	{
+		string icon_path = config_path_attachment_categories+ " " + attachment_category + " icon";
+		string icon_name;
+		GetGame().ConfigGetText(icon_path, icon_name);
+		return icon_name;
+	}
+	
+	/*override void Refresh()
+	{
+		super.Refresh();
+		Print("DbgTest | Refresh");
+		
+		CollapsibleContainer cont = CollapsibleContainer.Cast(m_Parent);
+		if (cont)
+		{
+			bool b1 = m_ItemsCont.VerifySlotsIconVisibility();
+			Print("DbgTest | Refresh | b1: " + b1);
+			cont.SetCollapsibleHeaderArrowState(!b1);
+		}
+	}*/
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithCargo.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithCargo.c
new file mode 100644
index 0000000000000000000000000000000000000000..bde5e7a8ea5bf9b735d1fa344ded47c33efcd87f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithCargo.c
@@ -0,0 +1,490 @@
+class ContainerWithCargo extends ClosableContainer
+{
+	protected ref CargoContainer	m_CargoGrid;
+	protected int m_CargoIndex = -1;
+
+	void ContainerWithCargo( Container parent, int sort = -1 )
+	{
+		m_LockCargo = false;
+		m_Parent = parent;
+
+		m_CargoGrid = new CargoContainer( this );
+		Insert( m_CargoGrid );
+		
+		m_CargoGrid.GetRootWidget().SetSort( 1 );
+		
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( m_MainWidget,  this, "DraggingOverGrid" );
+		RecomputeOpenedContainers();
+	}
+
+	override bool IsDisplayable()
+	{
+		if (m_Entity)
+			return m_Entity.CanDisplayCargo();
+		return false;
+	}
+	
+	override bool IsEmpty()
+	{
+		return m_CargoGrid.IsEmpty();
+	}
+	
+	override bool IsItemActive()
+	{
+		return m_CargoGrid.IsItemActive();
+	}
+	
+	override bool CanCombine()
+	{
+		return m_CargoGrid.CanCombine();
+	}
+	
+	override bool CanCombineAmmo()
+	{
+		return m_CargoGrid.CanCombineAmmo();
+	}
+	
+	override bool IsItemWithQuantityActive()
+	{
+		return m_CargoGrid.IsItemWithQuantityActive();
+	}
+	
+	void LockCargo(bool value)
+	{
+		if( value != m_LockCargo )
+		{
+			if( value )
+			{
+				m_LockCargo = true;
+				OnHide();
+			}
+			else
+			{
+				m_LockCargo = false;
+				SetOpenState(!m_Closed);
+			}
+		}	
+	}
+	
+	override void Open()
+	{
+		if( !m_LockCargo )
+		{
+			ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), true );
+			m_Closed = false;
+			SetOpenForSlotIcon(true);
+			OnShow();
+			m_Parent.m_Parent.Refresh();
+		}
+		
+		if ( m_SlotIcon )
+		{
+			m_SlotIcon.GetRadialIconPanel().Show( !m_LockCargo );
+		}
+	}
+	
+	override void Close()
+	{
+		if( !m_LockCargo )
+		{
+			ItemManager.GetInstance().SetDefaultOpenState( m_Entity.GetType(), false );
+			m_Closed = true;
+			SetOpenForSlotIcon(false);
+			OnHide();
+			m_Parent.m_Parent.Refresh();
+		}
+		
+		if ( m_SlotIcon )
+		{
+			m_SlotIcon.GetRadialIconPanel().Show( !m_LockCargo );
+		}
+	}
+	
+	override bool IsOpened()
+	{
+		return !m_Closed && !m_LockCargo;
+	}
+	
+	override void UpdateInterval()
+	{
+		if ( m_Entity )
+		{
+			if ( m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || !m_Entity.CanDisplayCargo()  )
+			{
+				LockCargo(true);
+				if ( m_CargoGrid.IsVisible() )
+				{
+					RecomputeOpenedContainers();
+				}
+			}
+			else
+			{
+				LockCargo(false);
+				if ( !m_CargoGrid.IsVisible() )
+				{
+					RecomputeOpenedContainers();
+				}
+			}
+		
+			super.UpdateInterval();
+			m_CargoGrid.UpdateInterval();
+			
+			bool hide = m_LockCargo || ItemManager.GetInstance().GetDraggedItem() == m_Entity;
+			if (!hide)
+			{
+				SetOpenForSlotIcon(IsOpened());
+			}
+			
+			if ( m_SlotIcon )
+			{
+				m_SlotIcon.GetRadialIconPanel().Show( !hide );
+			}
+		}
+	}
+	
+	override bool IsFirstContainerFocused()
+	{
+		return m_CargoGrid.IsFirstContainerFocused();
+	}
+	
+	override bool IsLastContainerFocused()
+	{
+		return m_CargoGrid.IsLastContainerFocused();
+	}
+
+	override void SetDefaultFocus( bool while_micromanagment_mode = false )
+	{
+		m_CargoGrid.SetDefaultFocus( while_micromanagment_mode );
+	}
+	
+	override void UnfocusAll()
+	{
+		m_CargoGrid.Unfocus();
+	}
+	
+	override bool SplitItem()
+	{
+		return m_CargoGrid.SplitItem();
+	}
+	
+	override bool EquipItem()
+	{
+		return m_CargoGrid.EquipItem();
+	}
+	
+	override bool TransferItem()
+	{
+		return m_CargoGrid.TransferItem();
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		return m_CargoGrid.TransferItemToVicinity();
+	}
+	
+	override bool InspectItem()
+	{
+		return m_CargoGrid.InspectItem();
+	}
+
+	void SetEntity( EntityAI entity, int cargo_index = 0, bool immedUpdate = true )
+	{
+		m_Entity = entity;
+		m_CargoIndex = cargo_index;
+
+		SetOpenState( true );
+
+		m_CargoGrid.SetEntity( entity, immedUpdate );
+		m_CargoGrid.UpdateHeaderText();
+		m_ClosableHeader.SetItemPreview( entity );
+		CheckHeaderDragability();
+		( Container.Cast( m_Parent ) ).Insert( this, -1, false );
+		
+		if ( m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || !m_Entity.CanDisplayCargo() )
+			LockCargo(true);
+		else
+			LockCargo(false);
+
+		if ( immedUpdate )
+		{
+			Refresh();
+			GetMainWidget().Update();
+		}
+	}
+
+	EntityAI GetEntity()
+	{
+		return m_Entity;
+	}
+	
+	override EntityAI GetFocusedContainerEntity()
+	{
+		return m_Entity;
+	}
+
+	EntityAI GetItemPreviewItem( Widget w )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+		if( !ipw || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return null;
+		}
+		return ipw.GetItem();
+	}
+
+	bool DraggingOverGrid( Widget w, int x, int y, Widget reciever )
+	{
+		if( w == null )
+		{
+			return false;
+		}
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( !player.CanManipulateInventory() )
+		{
+			return false;
+		}
+		
+		EntityAI item = GetItemPreviewItem( w );
+		
+		if( !item )
+		{
+			return false;
+		}
+		
+		if( !item.GetInventory().CanRemoveEntity() )
+		{
+			return false;
+		} 
+
+		int color, c_x, c_y;
+		
+		#ifdef PLATFORM_CONSOLE
+		int idx = -1;
+		#else
+		int idx = 0;
+		#endif
+		
+		CargoBase cargo = m_Entity.GetInventory().GetCargoFromIndex(m_CargoIndex);
+		if( cargo )
+		{
+			c_x = cargo.GetHeight();
+			c_y = cargo.GetWidth();
+		}
+		
+		InventoryLocation dst = new InventoryLocation;
+		#ifdef PLATFORM_CONSOLE
+		x = 0;
+		y = cargo.GetItemCount();
+		m_Entity.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.CARGO, dst );
+		#else
+		dst.SetCargoAuto(cargo, item, x, y, item.GetInventory().GetFlipCargo());
+		#endif
+		
+		#ifdef PLATFORM_CONSOLE
+		if( dst.IsValid() && m_Entity.GetInventory().LocationCanAddEntityEx(dst))
+		#else
+		if( m_Entity && c_x > x && c_y > y && m_Entity.GetInventory().LocationCanAddEntityEx(dst))
+		#endif
+		{
+			ItemManager.GetInstance().HideDropzones();
+			if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+			{
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else
+			{
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+			}
+			color = ColorManager.GREEN_COLOR;
+		}
+		else
+		{
+			color = ColorManager.RED_COLOR;
+			ItemManager.GetInstance().ShowSourceDropzone( item );
+		}
+
+		if( w.FindAnyWidget("Cursor") )
+		{
+			w.FindAnyWidget("Cursor").SetColor( color );
+		}
+		else
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Cursor" );
+			if( w.FindAnyWidget( name ) )
+			{
+				w.FindAnyWidget( name ).SetColor( color );
+			}
+		}
+
+		return true;
+	}
+
+	void DropReceived( Widget w, int x, int y )
+	{
+		float xx, yy;
+		GetMainWidget().Update();
+		GetMainWidget().GetScreenSize( xx, yy );
+		if( GetMainWidget().FindAnyWidget("Background") )
+		{
+			GetMainWidget().FindAnyWidget("Background").Show( true );
+			GetMainWidget().FindAnyWidget("Background").SetSize( xx, yy );
+		}
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+		
+		#ifdef PLATFORM_CONSOLE
+		if( m_CargoGrid.HasItem( item ) )
+		{
+			return;
+		}
+		#endif
+		
+		#ifdef PLATFORM_CONSOLE
+		int idx = -1;
+		#else
+		int idx = 0;
+		#endif
+		int c_x, c_y;
+		
+		CargoBase cargo = m_Entity.GetInventory().GetCargoFromIndex(m_CargoIndex);
+		
+		if( cargo )
+		{
+			c_x = cargo.GetHeight();
+			c_y = cargo.GetWidth();
+		}
+		
+		InventoryLocation dst = new InventoryLocation;
+		#ifdef PLATFORM_CONSOLE
+		x = 0;
+		y = cargo.GetItemCount();
+		m_Entity.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.CARGO, dst );
+		#else
+		dst.SetCargoAuto(cargo, item, x, y, item.GetInventory().GetFlipCargo());
+		#endif
+		
+		InventoryLocation src = new InventoryLocation;
+		item.GetInventory().GetCurrentInventoryLocation(src);
+
+		if(src.CompareLocationOnly(dst) && src.GetFlip() == dst.GetFlip())
+			return;
+		
+		#ifdef PLATFORM_CONSOLE
+		if(dst.IsValid() && m_Entity.GetInventory().LocationCanAddEntityEx(dst))
+		#else
+		if( c_x > x && c_y > y && m_Entity.GetInventory().LocationCanAddEntityEx(dst))
+		#endif
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			
+			SplitItemUtils.TakeOrSplitToInventoryLocation( player, dst );
+			
+			Icon icon = m_CargoGrid.GetIcon( item );
+			
+			if( icon && w && w.FindAnyWidget("Cursor") )
+			{
+				w.FindAnyWidget("Cursor").SetColor( ColorManager.BASE_COLOR );
+				icon.Refresh();
+				Refresh();
+			}
+		}
+		
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+	}
+	
+	void TakeIntoHands( notnull PlayerBase player, notnull EntityAI item )
+	{
+		ItemBase item_base = ItemBase.Cast( item );
+		
+		if( !item.GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+			return;
+		
+		float stackable = item_base.GetTargetQuantityMax();
+		
+		if( stackable == 0 || stackable >= item_base.GetQuantity() )
+		{
+			player.PredictiveTakeEntityToHands( item );
+		}
+		else if( stackable != 0 && stackable < item_base.GetQuantity() )
+		{
+			item_base.SplitIntoStackMaxHandsClient( player );
+		}
+	}
+
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		DraggingOver( w, x, y, receiver );
+	}
+
+	override void DraggingOver( Widget w, int x, int y, Widget receiver )
+	{
+		if( !w )
+			return;
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+			return;
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( item.GetInventory().CanRemoveEntity() && player.CanManipulateInventory() && m_Entity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && !m_Entity.GetInventory().HasEntityInCargo( item ) )
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			ItemManager.GetInstance().HideDropzones();
+			if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+			{
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else
+			{
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+			}
+		}
+		else
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			ItemManager.GetInstance().ShowSourceDropzone( item );
+		}
+	}
+
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		InventoryLocation src = new InventoryLocation();
+		if( GetEntity() && item.GetInventory().GetCurrentInventoryLocation(src))
+		{
+			InventoryLocation dst = new InventoryLocation();
+			if (m_Entity.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.ATTACHMENT, dst))
+			{
+				player.PredictiveTakeToDst(src, dst);
+			}
+
+			bool can_add = m_Entity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() );
+			bool in_cargo = !player.GetInventory().HasEntityInInventory( item ) || !m_Entity.GetInventory().HasEntityInCargo( item );
+			if( can_add && in_cargo )
+			{
+				SplitItemUtils.TakeOrSplitToInventory( player, m_Entity, item );
+			}
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithCargoAndAttachments.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithCargoAndAttachments.c
new file mode 100644
index 0000000000000000000000000000000000000000..4138a758c454f68dbef9cea6aa7169a9baad075e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithCargoAndAttachments.c
@@ -0,0 +1,950 @@
+class ContainerWithCargoAndAttachments extends ClosableContainer
+{
+	protected ref Attachments								m_Atts;
+	protected ref CargoContainer							m_CargoGrid;
+	
+	protected ref map<EntityAI, ref CargoContainer>			m_AttachmentCargos;
+	protected ref map<EntityAI, ref AttachmentsWrapper>		m_AttachmentAttachmentsContainers;
+	protected ref map<EntityAI, ref Attachments>			m_AttachmentAttachments;
+	protected ref array<int>								m_AttachmentSlotsSorted;
+	
+	void ContainerWithCargoAndAttachments( LayoutHolder parent, int sort = -1 )
+	{
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( m_MainWidget,  this, "DraggingOverHeader2" );
+	}
+
+	void ~ContainerWithCargoAndAttachments()
+	{
+		if ( m_Entity )
+		{
+			m_Entity.GetOnItemAttached().Remove( AttachmentAdded );
+			m_Entity.GetOnItemDetached().Remove( AttachmentRemoved );
+		}
+		
+		if ( m_Atts )
+			delete m_Atts;
+		
+		foreach ( EntityAI e, Attachments att : m_AttachmentAttachments )
+		{
+			delete att;
+		}
+		
+		if ( m_AttachmentAttachments )
+			m_AttachmentAttachments.Clear();
+		
+		if ( m_AttachmentAttachmentsContainers )
+			m_AttachmentAttachmentsContainers.Clear();
+		
+		if ( m_AttachmentCargos )
+			m_AttachmentCargos.Clear();
+	}
+	
+	void RecomputeContainers()
+	{
+		m_Body.Clear();
+
+		if(m_Atts)
+		{
+			m_Body.Insert(m_Atts.GetWrapper());
+		}
+
+		if(m_CargoGrid)
+		{
+			m_Body.Insert(m_CargoGrid);
+		}
+		
+		GameInventory inv = m_Entity.GetInventory();
+		for (int i = 0; i < inv.AttachmentCount(); i++)
+		{
+			EntityAI ent = inv.GetAttachmentFromIndex(i);
+			if(ent)
+			{
+				AttachmentsWrapper att = m_AttachmentAttachmentsContainers.Get(ent);
+				if(att)
+				{
+					m_Body.Insert(att);
+				}
+				
+				CargoContainer cargo = m_AttachmentCargos.Get(ent);
+				if(cargo)
+				{
+					m_Body.Insert(cargo);
+				}
+			}
+		}
+	}
+	
+	void AttachmentAddedEx(EntityAI item, string slot, EntityAI parent, bool immedUpdate = true)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString( slot );
+		int sort = -1;
+		bool updateNeeded = false;
+		ref Attachments att_cont = null;
+		ref CargoContainer cont = null;
+		
+		if ( item.GetInventory().GetAttachmentSlotsCount() > 0 && item.CanDisplayAnyAttachmentSlot() )
+		{
+			updateNeeded = true;
+			
+			att_cont = new Attachments( this, item );
+			sort = (m_AttachmentSlotsSorted.Find( slot_id ) * 2) + SORT_ATTACHMENTS_NEXT_OFFSET;
+			att_cont.InitAttachmentGrid( sort );
+			
+			m_AttachmentAttachments.Insert( item, att_cont );
+			m_AttachmentAttachmentsContainers.Insert( item, att_cont.GetWrapper() );
+			
+			att_cont.UpdateInterval();
+		}
+		
+		if ( item.GetInventory().GetCargo() )
+		{
+			updateNeeded = true;
+			
+			cont = new CargoContainer( this, true );
+			sort = (m_AttachmentSlotsSorted.Find( slot_id ) * 2) + SORT_CARGO_NEXT_OFFSET;
+			cont.GetRootWidget().SetSort( sort );
+			cont.SetEntity( item, false );
+			Insert( cont, m_Atts.GetAttachmentHeight() + m_AttachmentCargos.Count() + 1 );
+			
+			m_AttachmentCargos.Insert( item, cont );
+		}
+		
+		if (updateNeeded)
+		{
+			if (att_cont)
+			{
+				att_cont.ShowFalseAttachmentsHeader(true);
+				if (cont)
+				{
+					cont.ShowFalseCargoHeader(false);
+					cont.UpdateSize();
+					cont.SetAlternateFalseTextHeaderWidget(att_cont.GetFalseHeaderTextWidget());
+				}
+			}
+			else if (cont)
+			{
+				cont.SetAlternateFalseTextHeaderWidget(null); //just to be safe..
+			}
+			
+			RecomputeContainers();
+			RecomputeOpenedContainers();
+			
+			Inventory.GetInstance().UpdateConsoleToolbar();
+			
+			if (m_Parent && immedUpdate)
+				m_Parent.Refresh();
+		}
+	}
+	
+	void AttachmentAdded(EntityAI item, string slot, EntityAI parent)
+	{
+		AttachmentAddedEx(item, slot, parent);
+	}
+	
+	void AttachmentRemoved(EntityAI item, string slot, EntityAI parent)
+	{
+		int slot_id = InventorySlots.GetSlotIdFromString( slot );
+		
+		CargoContainer old_cont = m_AttachmentCargos.Get( item );
+		if( old_cont )
+		{
+			m_AttachmentCargos.Remove( item );
+			delete old_cont;
+			
+			if( m_Parent )
+				m_Parent.Refresh();
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+				
+		
+		AttachmentsWrapper old_att_cont = m_AttachmentAttachmentsContainers.Get( item );
+		if( old_att_cont )
+		{
+			m_AttachmentAttachmentsContainers.Remove( item );
+			m_AttachmentAttachments.Remove( item );
+			delete old_att_cont;
+			
+			if( m_Parent )
+				m_Parent.Refresh();
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+		
+		RecomputeContainers();
+		RecomputeOpenedContainers();
+	}
+	
+	override void UpdateInterval()
+	{
+		if ( m_Entity )
+		{
+			if (m_CargoGrid)
+			{
+				bool hideCargo = m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || !m_Entity.CanDisplayCargo() || m_ForcedHide;
+				if (m_CargoGrid.IsVisible() && hideCargo)
+				{
+					HideCargo();
+				}
+				else if (!m_CargoGrid.IsVisible() && !hideCargo)
+				{
+					ShowCargo();
+				}
+				
+				m_CargoGrid.UpdateInterval();
+			}
+			
+			if ( m_SlotIcon )
+			{
+				bool hide = m_LockCargo || ItemManager.GetInstance().GetDraggedItem() == m_Entity;
+				if (!hide)
+				{
+					SetOpenForSlotIcon(IsOpened());
+				}
+				m_SlotIcon.GetRadialIconPanel().Show( !hide );
+				
+			}
+			
+			super.UpdateInterval();
+		}
+	}
+	
+	override EntityAI GetFocusedContainerEntity()
+	{
+		return m_Entity;
+	}
+	
+	override void UnfocusAll()
+	{
+		if( m_Atts )
+		{
+			m_Atts.UnfocusAll();
+		}
+			
+		if( m_CargoGrid )
+		{
+			m_CargoGrid.UnfocusAll();
+		}
+		
+		foreach( EntityAI e1, CargoContainer cargo : m_AttachmentCargos )
+		{
+			cargo.UnfocusAll();
+				
+		}
+		
+		foreach( EntityAI e2, Attachments att : m_AttachmentAttachments )
+		{
+			att.UnfocusAll();
+		}
+	}
+	
+	override bool IsLastIndex()
+	{
+		return m_ActiveIndex == ( m_OpenedContainers.Count() - 1 );
+	}
+	
+	override bool IsFirstContainerFocused()
+	{
+		return IsFirstIndex();
+	}
+	
+	override bool IsLastContainerFocused()
+	{
+		return IsLastIndex();
+	}
+
+	override void MoveGridCursor( int direction )
+	{
+		Container c = GetFocusedContainer();
+		if ( c )
+		{
+			c.MoveGridCursor( direction );
+			Inventory.GetInstance().UpdateConsoleToolbar();
+		}
+	}
+	
+	void SetEntity( EntityAI entity, bool immedUpdate = true )
+	{
+		m_Entity = entity;
+		
+		m_Atts = new Attachments( this, m_Entity );
+		m_Atts.InitAttachmentGrid( SORT_ATTACHMENTS_OWN );
+		m_AttachmentSlotsSorted = m_Atts.GetSlotsSorted();
+		
+		m_Entity.GetOnItemAttached().Insert( AttachmentAdded );
+		m_Entity.GetOnItemDetached().Insert( AttachmentRemoved );
+		
+		m_ClosableHeader.SetItemPreview( m_Entity );
+		CheckHeaderDragability();
+		
+		if ( m_Entity.GetInventory().GetCargo() )
+		{
+			m_CargoGrid = new CargoContainer( this, false );
+			m_CargoGrid.GetRootWidget().SetSort( SORT_CARGO_OWN );
+			m_CargoGrid.SetEntity( m_Entity, 0, immedUpdate );
+			m_CargoGrid.UpdateHeaderText(); // TODO: refresh?
+			Insert( m_CargoGrid );
+		}
+		else
+		{
+			string name = m_Entity.GetDisplayName();
+			name.ToUpper();
+			m_ClosableHeader.SetName( name );
+		}
+
+		m_AttachmentCargos					= new map<EntityAI, ref CargoContainer>;
+		m_AttachmentAttachmentsContainers	= new map<EntityAI, ref AttachmentsWrapper>;
+		m_AttachmentAttachments				= new map<EntityAI, ref Attachments>;
+		
+		(Container.Cast( m_Parent )).Insert( this );
+		
+		foreach ( int slot_id : m_AttachmentSlotsSorted )
+		{
+			EntityAI item = m_Entity.GetInventory().FindAttachment( slot_id );
+			if ( item )
+				AttachmentAddedEx( item, InventorySlots.GetSlotName( slot_id ), m_Entity, false );
+		}
+		
+		RecomputeContainers();
+		
+		if (m_CargoGrid)
+		{
+			bool hideCargo = m_Entity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) || !m_Entity.CanDisplayCargo() || m_ForcedHide;
+			if (m_CargoGrid.IsVisible() && hideCargo)
+			{
+				HideCargo();
+			}
+			else if (!m_CargoGrid.IsVisible() && !hideCargo)
+			{
+				ShowCargo();
+			}
+		}
+		
+		if( IsDisplayable() )
+			SetOpenState( true );
+		else
+			SetOpenState( false );
+		
+		if (immedUpdate)
+			m_Parent.m_Parent.Refresh();
+		
+		RecomputeOpenedContainers();
+	}
+	
+	void HideCargo()
+	{
+		if( m_CargoGrid )
+		{
+			if(m_CargoGrid.IsVisible())
+			{
+				m_CargoGrid.OnHide();
+				RecomputeOpenedContainers();
+			}
+		}
+	}
+	
+	void ShowCargo()
+	{
+		if( m_CargoGrid )
+		{
+			if(!m_CargoGrid.IsVisible())
+			{
+				m_CargoGrid.OnShow();
+				RecomputeOpenedContainers();
+			}
+		}
+	}
+
+	EntityAI GetEntity()
+	{
+		return m_Entity;
+	}
+
+	ItemPreviewWidget GetItemPreviewWidgetDragOrDrop( Widget w )
+	{
+		string name = w.GetName();
+		name.Replace( "PanelWidget", "Render" );
+		return ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+	}
+
+	EntityAI GetItemPreviewItem( Widget w )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+		if( !ipw || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return NULL;
+		}
+		return ipw.GetItem();
+	}
+
+	Widget GetItemPreviewWidget( Widget w )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+		return ipw;
+	}
+
+	void MouseClick2(Widget w, int x, int y, int button)
+	{
+		SlotsIcon icon;
+		w.GetUserData(icon);
+		
+		ItemBase selectedItem;
+		if (icon)
+			selectedItem = ItemBase.Cast(icon.GetEntity());
+		
+		if (selectedItem)
+		{
+			bool isReserved = icon.IsReserved();
+
+			switch (button)
+			{
+				case MouseState.RIGHT:
+					#ifdef DIAG_DEVELOPER
+					if (GetDayZGame().IsLeftCtrlDown())
+						ShowActionMenu(selectedItem);
+					#endif
+					
+					if (isReserved)
+					{
+						EntityAI attachmentParent = icon.GetSlotParent();
+						GetGame().GetPlayer().GetHumanInventory().ClearUserReservedLocationSynced(selectedItem);
+						attachmentParent.GetOnAttachmentReleaseLock().Invoke(selectedItem, icon.GetSlotID());
+					}
+
+					break;
+
+				case MouseState.MIDDLE:
+					if (!isReserved)
+						InspectItem(selectedItem);
+
+					break;
+
+				case MouseState.LEFT:
+					if (!isReserved)
+					{
+						PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+						if (g_Game.IsLeftCtrlDown())
+						{
+							if (controlledPlayer.CanDropEntity(selectedItem))
+							{
+								if (selectedItem.GetTargetQuantityMax() < selectedItem.GetQuantity())
+									selectedItem.SplitIntoStackMaxClient(null, -1);
+								else
+									controlledPlayer.PhysicalPredictiveDropItem(selectedItem);
+							}
+						}
+						else
+						{
+							bool draggable = !controlledPlayer.GetInventory().HasInventoryReservation(selectedItem, null ) && !controlledPlayer.GetInventory().IsInventoryLocked() && selectedItem.GetInventory().CanRemoveEntity() && !controlledPlayer.IsItemsToDelete();
+							ItemManager.GetInstance().SetWidgetDraggable(w, draggable);
+						}
+					}
+
+					break;
+			}
+		}
+	}
+	
+	//! NOTE Used for mouse only
+	void DropReceived(Widget w, int x, int y, CargoContainer cargo)
+	{
+		EntityAI item = GetItemPreviewItem(w);
+		if (!item)
+			return;
+
+		#ifndef PLATFORM_CONSOLE
+		int c_x, c_y;
+		#endif
+		
+		EntityAI targetEntity = m_Entity;
+		CargoBase targetCargo;
+		
+		if (cargo != m_CargoGrid)
+		{
+			targetEntity = m_AttachmentCargos.GetKeyByValue(cargo);
+		}
+		
+		if (targetEntity)
+		{
+			targetCargo = targetEntity.GetInventory().GetCargo();
+			#ifdef PLATFORM_CONSOLE
+			if (m_CargoGrid && m_CargoGrid.HasItem(item))
+				return;
+			#endif
+		}
+		
+		if (!targetCargo || !targetEntity)
+			return;
+		
+		InventoryLocation dst = new InventoryLocation();
+		#ifdef PLATFORM_CONSOLE
+		x = 0;
+		y = targetCargo.GetItemCount();
+		targetEntity.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.CARGO, dst);
+		#else
+		c_x = targetCargo.GetHeight();
+		c_y = targetCargo.GetWidth();
+		
+		dst.SetCargoAuto(targetCargo, item, x, y, item.GetInventory().GetFlipCargo());
+		#endif
+		
+		InventoryLocation src = new InventoryLocation();
+		item.GetInventory().GetCurrentInventoryLocation(src);
+		if (src.CompareLocationOnly(dst) && src.GetFlip() == dst.GetFlip())
+			return;
+		
+		#ifdef PLATFORM_CONSOLE
+		if (dst.IsValid() && targetEntity.GetInventory().LocationCanAddEntity(dst))
+		#else
+		if (c_x > x && c_y > y && targetEntity.GetInventory().LocationCanAddEntity(dst))
+		#endif
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+
+			SplitItemUtils.TakeOrSplitToInventoryLocation(player, dst);
+			
+			Icon icon = cargo.GetIcon(item);
+			if (icon)
+			{
+				if (w && w.FindAnyWidget("Cursor"))
+					w.FindAnyWidget("Cursor").SetColor(ColorManager.BASE_COLOR);
+
+				icon.Refresh();
+				Refresh();
+			}
+		}
+		
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging(false);
+	}
+	
+	void TakeAsAttachment( Widget w, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+		SlotsIcon slots_icon;
+		EntityAI receiver_item;
+		int slot_id = -1;
+		bool is_reserved = false;
+		EntityAI attached_entity;
+		receiver.GetUserData(slots_icon);
+		//string name = receiver.GetName();
+		//name.Replace("PanelWidget", "Render");
+		
+		//ItemPreviewWidget receiver_iw = ItemPreviewWidget.Cast( receiver.FindAnyWidget(name) );
+		if( slots_icon )
+		{
+			receiver_item	= slots_icon.GetEntity();
+			slot_id			= slots_icon.GetSlotID();
+			attached_entity = slots_icon.GetSlotParent();
+			is_reserved		= slots_icon.IsReserved();
+		}
+		
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+		ItemBase item_base	= ItemBase.Cast( item );
+		InventoryLocation il = new InventoryLocation;
+		float stackable;
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( !item.GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+			return;
+		
+		EntityAI target_att_entity = m_Entity;
+		Weapon_Base wpn;
+		Magazine mag;
+		if( Class.CastTo(wpn,  m_Entity ) && Class.CastTo(mag,  item ) )
+		{
+			if( player.GetWeaponManager().CanAttachMagazine( wpn, mag ) )
+			{
+				player.GetWeaponManager().AttachMagazine( mag );
+			}
+		}
+		else if( receiver_item && !is_reserved )
+		{
+			if( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( item ) ) )
+			{
+				( ItemBase.Cast( receiver_item ) ).CombineItemsClient( ItemBase.Cast( item ) );
+			}
+			else if( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+			{
+				if( !receiver_item.GetInventory().CanRemoveEntity() )
+					return;
+				GetGame().GetPlayer().PredictiveSwapEntities( receiver_item, item );
+			}
+			else if( receiver_item.GetInventory().CanAddAttachment( item ) )
+			{
+				player.PredictiveTakeEntityToTargetAttachment(receiver_item, item);
+			}
+		}
+		else if( attached_entity && attached_entity.GetInventory().CanAddAttachmentEx( item, slot_id ) )
+		{
+			stackable = item_base.GetTargetQuantityMax(slot_id);
+			if( stackable == 0 || stackable >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachmentEx(attached_entity, item, slot_id);
+			}
+			else if( stackable != 0 && stackable < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( attached_entity, slot_id );
+			}
+		}
+		else if(attached_entity && attached_entity.GetInventory().CanAddAttachment(item))
+		{
+			attached_entity.GetInventory().FindFreeLocationFor(item,FindInventoryLocationType.ATTACHMENT,il);
+			stackable = item_base.GetTargetQuantityMax(il.GetSlot());
+			if( stackable == 0 || stackable >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachmentEx(attached_entity, item, il.GetSlot());
+			}
+			else if( stackable != 0 && stackable < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( attached_entity, il.GetSlot() );
+			}
+		}
+		else if( m_Entity.GetInventory().CanAddAttachment(item) )
+		{
+			m_Entity.GetInventory().FindFreeLocationFor(item,FindInventoryLocationType.ATTACHMENT,il);
+			stackable = item_base.GetTargetQuantityMax(il.GetSlot());
+			if( stackable == 0 || stackable >= item_base.GetQuantity() )
+			{
+				player.PredictiveTakeEntityToTargetAttachmentEx(m_Entity, item, il.GetSlot());
+			}
+			else if( stackable != 0 && stackable < item_base.GetQuantity() )
+			{
+				item_base.SplitIntoStackMaxClient( m_Entity, il.GetSlot() );
+			}
+		}
+		else if( m_Entity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && !m_Entity.GetInventory().HasEntityInCargo( item ) )
+		{
+			SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_Entity, item );
+		}
+		/*else if( !player.GetInventory().HasEntityInInventory( item ) || !m_Entity.GetInventory().HasEntityInCargo( item ) )
+		{
+			SplitItemUtils.TakeOrSplitToInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_Entity, item );
+		}*/
+	}
+
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		TakeAsAttachment( w, receiver );
+	}
+
+	void OnDropReceivedFromHeader2( Widget w, int x, int y, Widget receiver )
+	{
+		TakeAsAttachment( w, receiver );
+	}
+
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if( button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if( w == NULL || player.GetInventory().IsInventoryLocked() )
+			{
+				return;
+			}
+			ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+			if( !iw )
+			{
+				string name = w.GetName();
+				name.Replace( "PanelWidget", "Render" );
+				iw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+			}
+			
+			if( !iw )
+			{
+				iw = ItemPreviewWidget.Cast( w );
+			}
+			
+			EntityAI item = iw.GetItem();
+			
+			if( !item )
+			{
+				return;
+			}
+			
+			SlotsIcon icon;
+			iw.GetUserData(icon);
+		
+			if(icon && icon.IsReserved())
+			{
+				return;
+			}
+			
+			if( !item.GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+				return;
+			
+			if( player.GetInventory().HasEntityInInventory( item ) && player.GetHumanInventory().CanAddEntityInHands( item ) )
+			{
+				player.PredictiveTakeEntityToHands( item );
+			}
+			else
+			{
+				if(player.GetInventory().CanAddEntityToInventory( item ) && item.GetInventory().CanRemoveEntity())
+				{
+					player.PredictiveTakeEntityToInventory( FindInventoryLocationType.ANY, InventoryItem.Cast( item ) );
+				}
+				else
+				{
+					if( player.GetHumanInventory().CanAddEntityInHands( item ) )
+					{
+						player.PredictiveTakeEntityToHands( item );
+					}
+				}
+			}
+	
+			HideOwnedTooltip();
+	
+			name = w.GetName();
+			name.Replace( "PanelWidget", "Temperature" );
+			w.FindAnyWidget( name ).Show( false );
+		}
+	}
+
+	bool DraggingOverGrid( Widget w,  int x, int y, Widget reciever, CargoContainer cargo )
+	{
+		if( w == NULL )
+		{
+			return false;
+		}
+		
+		EntityAI item = GetItemPreviewItem( w );
+		
+		if( !item )
+		{
+			return false;
+		}
+
+		int color;
+		int idx = 0;
+		int c_x, c_y;
+		
+		EntityAI target_entity;
+		CargoBase target_cargo;
+		
+		if( cargo == m_CargoGrid )
+		{
+			target_entity	= m_Entity;
+			target_cargo 	= m_Entity.GetInventory().GetCargo();
+		}
+		else
+		{
+			target_entity	= m_AttachmentCargos.GetKeyByValue( cargo );
+			if( target_entity )
+			{
+				target_cargo 	= target_entity.GetInventory().GetCargo();
+			}
+			else
+				return false;
+		}
+		
+		if( target_cargo && target_entity )
+		{
+			c_x = target_cargo.GetHeight();
+			c_y = target_cargo.GetWidth();
+		}
+		else
+			return false;
+		
+		if( c_x > x && c_y > y && target_entity.GetInventory().CanAddEntityInCargoEx( item, idx, x, y, item.GetInventory().GetFlipCargo() ) )
+		{
+			color = ColorManager.GREEN_COLOR;
+			if( target_entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+			{
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else
+			{
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+			}
+		}
+		else
+		{
+			color = ColorManager.RED_COLOR;
+		}
+
+		if( w.FindAnyWidget("Cursor") )
+		{
+			w.FindAnyWidget("Cursor").SetColor( color );
+		}
+		else
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Cursor" );
+			if( w.FindAnyWidget( name ) )
+			{
+				w.FindAnyWidget( name ).SetColor( color );
+			}
+		}
+
+		return true;
+	}
+
+	override void DraggingOver( Widget w, int x, int y, Widget receiver )
+	{
+		DraggingOverHeader( w, x, y, receiver );
+	}
+
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if( w == NULL )
+		{
+			return;
+		}
+		EntityAI item = GetItemPreviewItem( w );
+		if( !item )
+		{
+			return;
+		}
+		
+		SlotsIcon slots_icon;
+		receiver.GetUserData(slots_icon);
+	
+		EntityAI attached_entity;
+		EntityAI receiver_item;
+		bool is_reserved = false;
+		int slot_id = -1;
+			
+		if(slots_icon)
+		{
+			attached_entity	= slots_icon.GetSlotParent();
+			slot_id			= slots_icon.GetSlotID();
+			receiver_item 	= slots_icon.GetEntity();
+			is_reserved 	= slots_icon.IsReserved();
+		}
+
+
+		Weapon_Base wpn;
+		Magazine mag;
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if( m_Entity )
+		{
+			if( Class.CastTo(wpn,  m_Entity ) && Class.CastTo(mag,  item ) )
+			{
+				if( player.GetWeaponManager().CanAttachMagazine( wpn, mag ) )
+				{
+					ItemManager.GetInstance().HideDropzones();
+					if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+					{
+						ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+					}
+					else
+					{
+						ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+					}
+					ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+				}
+			}
+			else if( receiver_item && !is_reserved )
+			{
+				ItemBase receiver_itemIB	= ItemBase.Cast( receiver_item );
+				ItemBase itemIB				= ItemBase.Cast( item );
+				if( receiver_itemIB && itemIB && receiver_itemIB.CanBeCombined( itemIB ) )
+				{
+					ItemManager.GetInstance().HideDropzones();
+					if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+					{
+						ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+					}
+					else
+					{
+						ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+					}
+					ColorManager.GetInstance().SetColor( w, ColorManager.COMBINE_COLOR );
+				}
+				else if( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+				{
+					ItemManager.GetInstance().HideDropzones();
+					if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+					{
+						ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+					}
+					else
+					{
+						ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+					}
+					ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+				}
+				else if( receiver_itemIB.GetInventory().CanAddAttachment( item ) )
+				{
+					ItemManager.GetInstance().HideDropzones();
+					if( receiver_itemIB.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+					{
+						ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+					}
+					else
+					{
+						ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+					}
+					ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+				}
+			}
+			else if( attached_entity && attached_entity.GetInventory().CanAddAttachmentEx( item, slot_id ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				if( attached_entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+				{
+					ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				}
+				else
+				{
+					ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				}
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else if( m_Entity.GetInventory().CanAddAttachment( item ) )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+				{
+					ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				}
+				else
+				{
+					ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				}
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else if( ( m_Entity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && !m_Entity.GetInventory().HasEntityInCargo( item ) ) /*|| player.GetHumanInventory().HasEntityInHands( item )*/ )
+			{
+				ItemManager.GetInstance().HideDropzones();
+				if( m_Entity.GetHierarchyRootPlayer() == GetGame().GetPlayer() )
+				{
+					ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				}
+				else
+				{
+					ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				}
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			}
+			else
+			{
+				ItemManager.GetInstance().ShowSourceDropzone( item );
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			}
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithElectricManager.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithElectricManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..8c49b0eb76816a7a9b7c7682d78c205b5cff3ed4
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ContainerWithElectricManager.c
@@ -0,0 +1,32 @@
+class ContainerWithElectricManager : ContainerWithCargoAndAttachments
+{
+	override void UpdateInterval()
+	{
+		super.UpdateInterval();
+		
+		if (m_Entity)
+			ElectricityIcon();
+	}
+	
+	override void SetEntity(EntityAI entity, bool immedUpdate = true)
+	{
+		super.SetEntity(entity, immedUpdate);
+
+		ElectricityIcon();
+	}
+	
+	void ElectricityIcon()
+	{
+		if (GetRootWidget().FindAnyWidget("electricity"))
+		{
+			bool hasElectricityIcon = m_Entity.GetCompEM().HasElectricityIcon();
+			GetRootWidget().FindAnyWidget("electricity").Show(hasElectricityIcon);
+		}
+		
+		if (GetRootWidget().FindAnyWidget("electricity_can_work"))
+		{
+			bool electricityCanWorkIcon = m_Entity.GetCompEM().CanWork() && !m_Entity.IsRuined();
+			GetRootWidget().FindAnyWidget("electricity_can_work").Show(electricityCanWorkIcon);
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/PlayerContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/PlayerContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb015d1fab17bed0e88d1df25987683ec95650ab
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/PlayerContainer.c
@@ -0,0 +1,1135 @@
+class PlayerContainer: CollapsibleContainer
+{
+	protected ref AttachmentsGroupContainer		m_PlayerAttachmentsContainer;
+	protected ref map<int, SlotsIcon>			m_InventorySlots;
+	protected ref map<EntityAI, ref Container>	m_ShowedItems = new ref map<EntityAI, ref Container>;
+	protected ref map<int, ref Container>		m_ShowedItemsIDs = new ref map<int, ref Container>;
+	protected PlayerBase						m_Player;
+	
+	protected const	int							HEADER_INDEX_OFFSET = 2;
+	
+	override void UpdateRadialIcon()
+	{
+		if ( m_SlotIcon )
+		{
+			bool show_radial_icon;
+			show_radial_icon = IsHidden();
+			Widget rip = m_SlotIcon.GetRadialIconPanel();
+			rip.Show( !m_Player.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) && m_Player.CanDisplayCargo());
+			SetOpenForSlotIcon(show_radial_icon);
+		}
+	}
+	
+	bool HasEntityContainerVisible( EntityAI entity )
+	{
+		ClosableContainer cont = ClosableContainer.Cast( m_ShowedItems.Get( entity ) );
+		return ( cont && cont.IsOpened() );
+	}
+	
+	SlotsIcon GetSlotsIcon( int row, int column )
+	{
+		return m_PlayerAttachmentsContainer.GetSlotsIcon(row, column);
+	}
+
+	void PlayerContainer( LayoutHolder parent, int sort = -1 )
+	{
+		m_InventorySlots = new ref map<int, SlotsIcon>;
+		m_PlayerAttachmentsContainer = new AttachmentsGroupContainer(this);
+		
+		m_PlayerAttachmentsContainer.SetHeader(GetHeader());
+		m_CollapsibleHeader.SetName( "#container_inventory" );
+		SetHeader(null);
+		m_Body.Insert( m_PlayerAttachmentsContainer );
+		m_MainWidget = m_RootWidget.FindAnyWidget( "body" );
+		m_PlayerAttachmentsContainer.GetRootWidget().SetColor(166 << 24 | 80 << 16 | 80 << 8 | 80);
+		WidgetEventHandler.GetInstance().RegisterOnChildAdd( m_MainWidget, this, "OnChildAdd" );
+		WidgetEventHandler.GetInstance().RegisterOnChildRemove( m_MainWidget, this, "OnChildRemove" );
+
+		//START - InitGhostSlots
+		string config_path_ghosts_slots = "CfgVehicles SurvivorBase InventoryEquipment playerSlots";
+		ref array<string> player_ghosts_slots = new array<string>;
+		GetGame().ConfigGetTextArray( config_path_ghosts_slots, player_ghosts_slots );
+
+		for ( int i = 0; i < player_ghosts_slots.Count(); i++ )
+		{
+			string slot_name = player_ghosts_slots.Get ( i );
+			string path = "CfgSlots" + " " + slot_name;
+
+			if ( GetGame().ConfigIsExisting( path ) )
+			{
+				string icon_name; //icon_name must be in format "set:<setname> image:<imagename>"
+				GetGame().ConfigGetText( path + " ghostIcon", icon_name );
+				int slot_number = i;
+				int column = slot_number % ITEMS_IN_ROW;
+
+				//START - GetWidgetSlot
+				int row = slot_number / ITEMS_IN_ROW;
+				if( row >= m_PlayerAttachmentsContainer.Count() )
+				{
+					if( row < ( player_ghosts_slots.Count() / ITEMS_IN_ROW ) )
+						AddSlotsContainer( ITEMS_IN_ROW );
+					else
+						AddSlotsContainer( player_ghosts_slots.Count() % ITEMS_IN_ROW );
+				}
+		
+				SlotsIcon icon = GetSlotsIcon( row, column );
+				
+				icon.GetMainWidget().Show( true );
+				icon.Clear();
+				
+				WidgetEventHandler.GetInstance().RegisterOnDoubleClick( icon.GetPanelWidget(),  this, "DoubleClick" );
+				
+				//END - GetWidgetSlot
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetPanelWidget(),  this, "OnDropReceivedFromGhostArea" );
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetGhostSlot(),  this, "OnDropReceivedFromGhostArea" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetGhostSlot(),  this, "DraggingOver" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetPanelWidget(),  this, "DraggingOver" );
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( icon.GetPanelWidget(),  this, "MouseClick" );
+				
+				icon.GetGhostSlot().LoadImageFile( 0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY,icon_name) );
+				//END - LoadIconIntoWidgetSlot
+
+				GetGame().ConfigGetText( path + " name", slot_name );
+				int slot_id = InventorySlots.GetSlotIdFromString( slot_name );
+				icon.SetSlotID(slot_id);
+				icon.SetSlotDisplayName(InventorySlots.GetSlotDisplayName(slot_id));
+				m_InventorySlots.Set( slot_id, icon );
+			}
+		}
+		m_PlayerAttachmentsContainer.GetMainWidget().Update();
+		//END - InitGhostSlots
+		RecomputeOpenedContainers();
+	}
+	
+	void ~PlayerContainer()
+	{
+		if( m_Player )
+		{
+			m_Player.GetOnItemAttached().Remove(ItemAttached);
+			m_Player.GetOnItemDetached().Remove(ItemDetached);
+			m_Player.GetOnAttachmentSetLock().Remove(OnAttachmentReservationSet);
+			m_Player.GetOnAttachmentReleaseLock().Remove(OnAttachmentReservationRelease);
+		}
+	}
+	
+	void ItemAttached(EntityAI item, string slot_name)
+	{
+		int slot = InventorySlots.GetSlotIdFromString( slot_name );
+		SlotsIcon icon = m_InventorySlots.Get( slot );
+		
+		if( icon )
+		{
+			if( icon.IsReserved())
+				m_Player.GetOnAttachmentReleaseLock().Invoke(item, slot);
+			
+			icon.Init( item );
+
+			if( m_ShowedItems.Contains( item ) == false )
+			{
+				string name;
+				int sort_index = Inventory.GetPlayerAttachmentIndex( slot );
+				int current_sort = 9999;
+				if( GetFocusedContainer() )
+					current_sort = GetFocusedContainer().GetRootWidget().GetSort();
+				
+				if( item.GetSlotsCountCorrect() > 0 )
+				{
+					ContainerWithCargoAndAttachments iwca = new ContainerWithCargoAndAttachments( this, sort_index );
+					iwca.SetEntity( item );
+					iwca.SetSlotIcon( icon );
+					WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp( icon.GetPanelWidget(),  this, "ToggleWidget" );
+
+					if( iwca.IsDisplayable() )
+					{
+						icon.GetRadialIconPanel().Show( true );
+					}
+					m_ShowedItems.Insert( item, iwca );
+					RecomputeOpenedContainers();
+					Refresh();
+				}
+				else if( item.GetInventory().GetCargo() )
+				{
+					ContainerWithCargo iwc = new ContainerWithCargo( this, sort_index );
+					iwc.SetEntity( item );
+					iwc.SetSlotIcon( icon );
+					iwc.UpdateInterval();
+					WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp( icon.GetPanelWidget(),  this, "ToggleWidget" );
+					m_ShowedItems.Insert( item, iwc );
+					RecomputeOpenedContainers();
+					if( iwc.IsDisplayable() )
+						icon.GetRadialIconPanel().Show(true);
+					
+					Refresh();
+				}
+			}
+			
+			ClosableContainer conta = ClosableContainer.Cast( m_ShowedItems.Get( item ) );
+			string config = "CfgVehicles " + item.GetType() + " GUIInventoryAttachmentsProps";
+			if( conta && conta.IsInherited( ClosableContainer ) )
+			{
+				bool show_radial_icon = ( item.GetInventory().GetCargo() || item.GetSlotsCountCorrect() > 0 ) && !GetGame().ConfigIsExisting( config );
+				Widget rip = icon.GetRadialIconPanel();
+
+				rip.Show( show_radial_icon );
+				SetOpenForSlotIcon(conta.IsOpened(),icon);
+			}
+		}
+		UpdateSelectionIcons();
+	}
+	
+	void ItemDetached(EntityAI item, string slot_name)
+	{
+		int slot = InventorySlots.GetSlotIdFromString( slot_name );
+		SlotsIcon icon = m_InventorySlots.Get( slot );
+		
+		if( icon )
+		{
+			Container con = m_ShowedItems.Get( item );
+			if( con )
+			{
+				( Container.Cast( con.m_Parent ) ).Remove( con );
+				RecomputeOpenedContainers();
+				GetMainWidget().Update();
+				Refresh();
+				m_ShowedItems.Remove( item );
+			}
+			
+			icon.Clear();
+			Inventory in = Inventory.Cast( GetRoot() );
+			if( in )
+				in.UpdateConsoleToolbar();
+		}
+		UpdateSelectionIcons();
+	}
+	
+	void OnAttachmentReservationSet( EntityAI item, int slot_id )
+	{
+		SlotsIcon icon = m_InventorySlots.Get( slot_id );
+		
+		if( item )
+		{
+			icon.Init( item, true );
+		}
+	}
+	
+	void OnAttachmentReservationRelease( EntityAI item, int slot_id )
+	{
+		SlotsIcon icon = m_InventorySlots.Get( slot_id );
+		icon.Clear();
+	}
+	
+	void AddSlotsContainer( int row_count )
+	{
+		SlotsContainer container = new SlotsContainer(m_PlayerAttachmentsContainer, m_Player);
+		container.SetColumnCount(row_count);
+		m_PlayerAttachmentsContainer.Insert(container);
+	}
+	
+	void MouseClick( Widget w, int x, int y, int button )
+	{
+		SlotsIcon icon;
+		w.GetUserData(icon);
+		
+		ItemBase selectedItem;
+		bool isReserved;
+		
+		if (icon)
+		{
+			selectedItem = ItemBase.Cast(icon.GetEntity());
+			isReserved = icon.IsReserved();
+		
+		}
+
+		if (selectedItem)
+		{
+			switch (button)
+			{
+				case MouseState.RIGHT:
+					#ifdef DIAG_DEVELOPER
+					if (GetDayZGame().IsLeftCtrlDown())
+						ShowActionMenu(selectedItem);
+					#endif
+					
+					if (isReserved)
+					{
+						GetGame().GetPlayer().GetHumanInventory().ClearUserReservedLocationSynced(selectedItem);
+						m_Player.GetOnAttachmentReleaseLock().Invoke(selectedItem, icon.GetSlotID());
+					}
+					break;
+
+				case MouseState.MIDDLE:
+					if (!isReserved)
+						InspectItem(selectedItem);
+
+					break;
+
+				case MouseState.LEFT:
+					if (!isReserved)
+					{
+						PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+						if (g_Game.IsLeftCtrlDown())
+						{
+							if (controlledPlayer.CanDropEntity(selectedItem))
+							{
+								if (selectedItem.GetTargetQuantityMax() < selectedItem.GetQuantity())
+									selectedItem.SplitIntoStackMaxClient(null, -1);
+								else
+									controlledPlayer.PhysicalPredictiveDropItem(selectedItem);
+							}
+						}
+						else
+						{
+							bool draggable = !m_Player.GetInventory().HasInventoryReservation(selectedItem, null ) && !m_Player.GetInventory().IsInventoryLocked() && selectedItem.GetInventory().CanRemoveEntity() && !m_Player.IsItemsToDelete();
+							ItemManager.GetInstance().SetWidgetDraggable(w, draggable);
+						}
+					}
+					break;
+			}
+		}
+	}
+	
+	float GetMainContainerTopPos()
+	{
+		float x, y;
+		GetRootWidget().GetScreenPos( x, y );
+		return y;
+	}
+	
+	float GetMainContainerBottomPos()
+	{
+		float x, y;
+		float x2, y2;
+		GetRootWidget().GetScreenPos( x, y );
+		GetRootWidget().GetScreenSize( x2, y2 );
+		y += y2;
+		return y;
+	}
+	
+	override void Insert( LayoutHolder container, int pos = -1, bool immedUpdate = true )
+	{
+		ClosableContainer c_cont = ClosableContainer.Cast( container );
+		if (c_cont && m_Body.Count() > 1)
+		{
+			ClosableContainer prev	= ClosableContainer.Cast(m_Body.Get( 1 ));
+			int index				= 1;
+			int curr_sort			= c_cont.GetRootWidget().GetSort();
+			while ( prev )
+			{
+				int prev_sort = prev.GetRootWidget().GetSort();
+				if ( prev_sort > curr_sort )
+					break;
+				
+				if ( ++index < m_Body.Count() )
+					prev = ClosableContainer.Cast( m_Body.Get( index ) );
+				else
+					break;
+			}
+			
+			m_Body.InsertAt( container, index );
+		}
+		else
+		{
+			m_Body.Insert( container );
+		}
+		
+		if ( immedUpdate )
+			RecomputeOpenedContainers();
+	}
+	
+	bool IsItemWithContainerActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && ( ent.GetInventory().GetCargo() || ent.GetSlotsCountCorrect() > 0 );
+	}
+	
+	override bool IsItemWithQuantityActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && QuantityConversions.HasItemQuantity( ent ) && ent.CanBeSplit();
+	}
+	
+	override bool IsItemActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && !IsItemWithQuantityActive() && !IsItemWithContainerActive();
+	}
+	
+	bool IsEmptyItemActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent == null;
+	}
+	
+	void UnfocusPlayerAttachmentsContainer()
+	{
+		m_PlayerAttachmentsContainer.UnfocusAll();
+	}
+	
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if( button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			
+			if( w == null || m_Player.GetInventory().IsInventoryLocked() )
+			{
+				return;
+			}
+			ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+			if( !iw )
+			{
+			  string name = w.GetName();
+			  name.Replace( "PanelWidget", "Render" );
+			  iw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+			}
+			if( !iw )
+			{
+			  iw = ItemPreviewWidget.Cast( w );
+			}
+
+			ItemBase item = ItemBase.Cast( iw.GetItem() );
+			
+			if( !item )
+			{
+				return;
+			}
+				
+			SlotsIcon icon;
+			iw.GetUserData(icon);
+		
+			if(icon && icon.IsReserved())
+			{
+				return;
+			}
+			
+			if( !item.GetInventory().CanRemoveEntity() )
+				return;
+			
+			if ( player.GetInventory().HasEntityInInventory( item ) && player.GetHumanInventory().CanAddEntityInHands( item ) )
+			{
+				player.PredictiveTakeEntityToHands( item );
+			}
+			else
+			{
+				if (player.GetInventory().CanAddEntityToInventory( item ) && item.GetInventory().CanRemoveEntity())
+				{
+					if( item.GetTargetQuantityMax() < item.GetQuantity() )
+						item.SplitIntoStackMaxClient( player, -1 );
+					else
+						player.PredictiveTakeEntityToInventory( FindInventoryLocationType.ANY, item );
+				}
+				else
+				{
+					if( item.GetTargetQuantityMax() < item.GetQuantity() )
+						item.SplitIntoStackMaxHandsClient( player );
+					else
+						player.PredictiveTakeEntityToHands( item );
+				}
+			}
+			ToggleWidget( w );
+			HideOwnedTooltip();
+	
+			InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu( MENU_INVENTORY ) );
+			if ( menu )
+			{
+				menu.RefreshQuickbar();
+			}
+		}
+	}
+	
+	override void ExpandCollapseContainer()
+	{
+		if( m_PlayerAttachmentsContainer.IsActive() )
+		{
+			ToggleWidget(m_PlayerAttachmentsContainer.GetFocusedSlotsIcon().GetPanelWidget());
+		}
+	}
+	
+	bool IsContainerWithCargoActive()
+	{
+		return GetFocusedContainer().IsInherited( ContainerWithCargo );
+	}
+	
+	bool IsItemWithAttachmentsActive()
+	{
+		return GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments );
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		if (CanDrop())
+		{
+			if (GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ))
+			{
+				return GetFocusedContainer().TransferItemToVicinity();
+			}
+			else
+			{
+				Man player = GetGame().GetPlayer();
+				ItemBase item = ItemBase.Cast(GetFocusedItem());
+				if ( item && player.CanDropEntity( item ) )
+				{
+					if ( item.GetTargetQuantityMax() < item.GetQuantity() )
+						item.SplitIntoStackMaxClient( null, -1 );
+					else
+						player.PhysicalPredictiveDropItem( item );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool InspectItem()
+	{
+		if( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			return GetFocusedContainer().InspectItem();
+		}
+		else
+		{
+			Man player = GetGame().GetPlayer();
+			EntityAI item = GetFocusedItem();
+			if( item )
+			{
+				InspectItem( item );
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	int GetRecipeCount( bool recipe_anywhere, EntityAI entity1, EntityAI entity2 )
+	{
+		PluginRecipesManager plugin_recipes_manager = PluginRecipesManager.Cast( GetPlugin( PluginRecipesManager ) );
+		return plugin_recipes_manager.GetValidRecipes( ItemBase.Cast( entity1 ), ItemBase.Cast( entity2 ), null, PlayerBase.Cast( GetGame().GetPlayer() ) );
+	}
+	
+	override bool SplitItem()
+	{
+		if (CanSplit())
+		{
+			if ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+			{
+				return GetFocusedContainer().SplitItem();
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool EquipItem()
+	{
+		if (CanEquip())
+		{		
+			if ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+			{
+				return GetFocusedContainer().EquipItem();
+			}
+			else
+			{
+				EntityAI item = GetFocusedItem();
+				if( item )
+				{
+					GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.ATTACHMENT, item );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool TransferItem()
+	{
+		if (CanTakeToInventory())
+		{
+			LeftArea left_area = LeftArea.Cast( GetParent() );
+			EntityAI item;
+			if (left_area)
+			{
+				if (GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ))
+				{
+					return GetFocusedContainer().TransferItem();
+				}
+				else
+				{
+					item = GetFocusedItem();
+					if( item )
+					{
+						GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, item );
+						return true;
+					}
+				}
+			}
+			else
+			{
+				if (!GetFocusedContainer().IsInherited( ContainerWithCargo ) && !GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ))
+				{
+					item = GetFocusedItem();
+					if( item )
+					{
+						GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, item );
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override EntityAI GetFocusedItem()
+	{
+		return GetFocusedContainer().GetFocusedItem();
+	}	
+	
+	override bool Combine()
+	{
+		if (CanCombine())
+		{
+			if ( GetFocusedContainer() && ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) ) )
+			{
+				return GetFocusedContainer().Combine();
+			}
+			else
+			{
+				EntityAI item = GetFocusedItem();
+				ItemBase item_in_hands = ItemBase.Cast(	GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+				
+				Icon hands_icon = ItemManager.GetInstance().GetHandsPreview().GetIcon();
+							
+				if( item_in_hands && item )
+				{
+					return hands_icon.CombineItems( item_in_hands, item );
+				}
+			}
+		}
+		return true;
+	}
+	
+	override bool Select()
+	{
+		if( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			return GetFocusedContainer().Select();
+		}
+		else
+		{
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			EntityAI selected_item = ItemManager.GetInstance().GetSelectedItem();
+			SlotsIcon focused_slot = GetFocusedSlotsIcon();
+			EntityAI focused_item = focused_slot.GetEntity();
+			if( focused_slot.IsReserved() || focused_item != selected_item )
+			{
+				if( selected_item )
+				{
+					if(  selected_item.GetInventory().CanRemoveEntity() )
+					{
+						if (m_Player.GetInventory().CanAddAttachmentEx( selected_item, focused_slot.GetSlotID() ))
+						{
+							player.PredictiveTakeEntityToTargetAttachmentEx( m_Player, selected_item, focused_slot.GetSlotID());
+							//m_Player.PredictiveTakeEntityAsAttachmentEx( selected_item, focused_slot.GetSlotID() );
+							ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+							return true;
+						
+						}
+						else if (m_Player.GetInventory().CanAddAttachment( selected_item ))
+						{
+							player.PredictiveTakeEntityToTargetAttachment( m_Player, selected_item );
+							//m_Player.PredictiveTakeEntityToInventory( FindInventoryLocationType.ATTACHMENT, selected_item );
+							ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+							return true;
+						}
+					}
+				}
+				else
+				{
+					if( focused_item && focused_item.GetInventory().CanRemoveEntity() )
+					{
+						EntityAI item_in_hands = player.GetHumanInventory().GetEntityInHands();
+						if( item_in_hands && item_in_hands.GetInventory().CanRemoveEntity() )
+						{
+							if( GameInventory.CanSwapEntitiesEx( item_in_hands, focused_item ) )
+							{
+								player.PredictiveSwapEntities( item_in_hands, focused_item );
+								return true;
+							}
+							else
+							{
+								InventoryLocation il_hands_dst = new InventoryLocation;
+								if( player.GetHumanInventory().FindFreeLocationFor( item_in_hands, FindInventoryLocationType.ANY, il_hands_dst ) )
+								{
+									InventoryMode invMode = InventoryMode.PREDICTIVE;
+						
+									if ( player.NeedInventoryJunctureFromServer(item_in_hands, item_in_hands.GetHierarchyParent(), il_hands_dst.GetParent()) || GetGame().GetPlayer().NeedInventoryJunctureFromServer(focused_item, focused_item.GetHierarchyParent(), GetGame().GetPlayer()) )
+										invMode = InventoryMode.JUNCTURE;
+									
+									player.GetHumanInventory().ForceSwapEntities( invMode, focused_item, item_in_hands, il_hands_dst );
+									return true;
+								}
+							}
+						}
+						else
+						{
+							if( player.GetHumanInventory().CanAddEntityInHands( focused_item ) )
+							{
+								player.PredictiveTakeEntityToHands( focused_item );
+								return true;
+							}
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	void SetPlayer(PlayerBase player)
+	{
+		if (m_Player)
+		{
+			m_Player.GetOnItemAttached().Remove(ItemAttached);
+			m_Player.GetOnItemDetached().Remove(ItemDetached);
+			m_Player.GetOnAttachmentSetLock().Remove(OnAttachmentReservationSet);
+			m_Player.GetOnAttachmentReleaseLock().Remove(OnAttachmentReservationRelease);
+		}
+
+		m_Player = player;
+		if (m_Player)
+		{
+			m_Player.GetOnItemAttached().Insert(ItemAttached);
+			m_Player.GetOnItemDetached().Insert(ItemDetached);
+			m_Player.GetOnAttachmentSetLock().Insert(OnAttachmentReservationSet);
+			m_Player.GetOnAttachmentReleaseLock().Insert(OnAttachmentReservationRelease);
+		}
+		
+		//START - InitGhostSlots
+		string config_path_ghosts_slots = "CfgVehicles SurvivorBase InventoryEquipment playerSlots";
+		ref array<string> player_ghosts_slots = new array<string>;
+		GetGame().ConfigGetTextArray( config_path_ghosts_slots, player_ghosts_slots );
+
+		for ( int i = 0; i < player_ghosts_slots.Count(); i++ )
+		{
+			string slot_name = player_ghosts_slots.Get ( i );
+
+			int column = i % ITEMS_IN_ROW;
+			int row = i / ITEMS_IN_ROW;
+	
+			SlotsIcon icon = GetSlotsIcon( row, column );
+			
+			icon.SetSlotParent(m_Player);
+			icon.GetMainWidget().Show( true );
+			icon.Clear();
+			
+			GetGame().ConfigGetText( "CfgSlots" + " " + slot_name + " name", slot_name );
+			EntityAI item = m_Player.GetInventory().FindAttachment( InventorySlots.GetSlotIdFromString( slot_name ) );
+			if( item )
+			{
+				ItemAttached( item, slot_name );
+			}
+		}
+	}
+
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( GetItemPreviewWidget( w ) );
+
+		if( !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;
+		}
+
+		EntityAI item = ipw.GetItem();
+		if( !item )
+		{
+			return;
+		}
+
+		if( !item.GetInventory().CanRemoveEntity() )
+			return;
+		
+		if( m_Player.GetInventory().CanAddEntityToInventory( item, FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT ) && ( !m_Player.GetInventory().HasEntityInInventory( item ) ) )
+		{
+			m_Player.PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT, item );
+		}
+	}
+
+	ItemPreviewWidget GetItemPreviewWidget( Widget w )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget("Render") );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+
+		return ipw;
+	}
+
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if( w == null )
+		{
+			return;
+		}
+		ItemPreviewWidget ipw = GetItemPreviewWidget( w );
+
+		if( !ipw || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;
+		}
+
+		EntityAI item = ipw.GetItem();
+		if( !item )
+		{
+			return;
+		}
+
+		if( m_Player.GetInventory().CanAddEntityToInventory( item, FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT ) && !m_Player.GetInventory().HasEntityInInventory( item ) )
+		{
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+		}
+		else
+		{
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			//ItemManager.GetInstance().ShowSourceDropzone( item );
+		}
+	}
+
+	override void DraggingOver( Widget w, int x, int y, Widget receiver )
+	{
+		if( w == null )
+		{
+			return;
+		}
+		
+		EntityAI receiver_item;
+		bool is_reserved = false;
+		
+		SlotsIcon slots_icon;
+		receiver.GetUserData(slots_icon);
+		
+		if(slots_icon)
+		{
+			receiver_item = slots_icon.GetEntity();
+			is_reserved = slots_icon.IsReserved();
+		}
+
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( GetItemPreviewWidget( w ) );
+
+		if( !ipw || !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;
+		}
+
+		EntityAI item = ipw.GetItem();
+		if( !item )
+		{
+			return;
+		}
+		
+		if( receiver_item && !is_reserved )
+		{
+			if( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				return;
+			}
+			else if( receiver_item.GetInventory().CanAddAttachment(item) || receiver_item.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && !receiver_item.GetInventory().HasEntityInCargo( item ))
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				return;
+			}
+			else if( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( item ) ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.COMBINE_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+				return;
+			}
+
+		}
+		
+		if( item.GetInventory().CanRemoveEntity() )
+		{
+			if( m_Player.GetInventory().CanAddAttachment( item) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else if( m_Player.GetInventory().CanAddEntityToInventory( item, FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT ) && ( !m_Player.GetInventory().HasEntityInInventory( item ) ) || m_Player.GetHumanInventory().HasEntityInHands( item ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else if ( receiver_item && GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+			else
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			}
+		}
+		else
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetRightDropzone().SetAlpha( 1 );
+			//ItemManager.GetInstance().ShowSourceDropzone( item );
+		}
+	}
+
+	void OnDropReceivedFromGhostArea( Widget w, int x, int y, Widget receiver )
+	{
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+		
+		EntityAI receiver_item;
+		bool is_reserved = false;
+		InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu( MENU_INVENTORY ) );
+		float stack_max;
+
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( GetItemPreviewWidget( w ) );
+		SlotsIcon slots_icon;
+		receiver.GetUserData(slots_icon);
+		int slot_id = slots_icon.GetSlotID();
+		
+		receiver_item = slots_icon.GetEntity();
+		is_reserved = slots_icon.IsReserved();
+		InventoryLocation il;
+
+		if ( !ipw )
+		{
+			return;
+		}
+
+		ItemBase item = ItemBase.Cast(ipw.GetItem());
+		PlayerBase real_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( !item )
+		{
+			return;
+		}
+		if ( receiver_item && !is_reserved )
+		{
+			if ( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+			{
+				GetGame().GetPlayer().PredictiveSwapEntities( item, receiver_item );
+
+				if ( menu )
+				{
+					menu.RefreshQuickbar();
+				}
+				return;
+			}
+			else if ( receiver_item.GetInventory().CanAddAttachment( item ) )
+			{
+				GetGame().GetPlayer().PredictiveTakeEntityToTargetAttachment( receiver_item, item );
+
+				if ( menu )
+				{
+					menu.RefreshQuickbar();
+				}
+				return;
+			}
+			else if ( receiver_item.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ) && !receiver_item.GetInventory().HasEntityInCargo( item ) )
+			{
+				SplitItemUtils.TakeOrSplitToInventory(real_player, receiver_item,item);
+
+				if ( menu )
+				{
+					menu.RefreshQuickbar();
+				}
+				return;
+			}
+			else if ( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( item ) ) )
+			{
+				( ItemBase.Cast( receiver_item ) ).CombineItemsClient( ItemBase.Cast( item ) );
+				return;
+			}
+		}
+		
+		if ( m_Player.GetInventory().CanAddAttachmentEx( item, slot_id ) )
+		{			
+			if (item.GetQuantity() > item.GetTargetQuantityMax(slot_id))
+			{
+				item.SplitIntoStackMaxClient( real_player, slot_id );
+			}
+			else
+			{
+				real_player.PredictiveTakeEntityToTargetAttachmentEx( m_Player, item, slots_icon.GetSlotID() );
+			}
+		}
+		else if (  m_Player.GetInventory().CanAddAttachment( item ) )
+		{
+			il = new InventoryLocation;
+			m_Player.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.ATTACHMENT, il );
+			float stackable = item.GetTargetQuantityMax(-1);
+		
+			if( il.IsValid() )
+			{
+				if ( stackable == 0 || stackable >= item.GetQuantity() )
+				{
+					real_player.PredictiveTakeEntityToTargetAttachment( il.GetParent(), item );
+				}
+				else
+				{
+
+					ItemBase.Cast(item).SplitIntoStackMaxToInventoryLocationClient( il );
+				}
+			}
+		}
+		else if(  m_Player.GetInventory().CanAddEntityToInventory( item, FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT ) && ( !m_Player.GetInventory().HasEntityInInventory( item ) ) || m_Player.GetHumanInventory().HasEntityInHands( item ) )
+		{
+			SplitItemUtils.TakeOrSplitToInventory(m_Player, m_Player, item);
+		}
+
+		if ( menu )
+		{
+			menu.RefreshQuickbar();
+		}
+	}
+	
+	void SwapItemsInOrder( int slot1, int slot2 )
+	{
+		EntityAI item1	= m_Player.GetInventory().FindAttachment( slot1 );
+		EntityAI item2	= m_Player.GetInventory().FindAttachment( slot2 );
+		
+		if( item1 && item2 )
+		{
+			Container cont1	= m_ShowedItems.Get( item1 );
+			Container cont2	= m_ShowedItems.Get( item2 );
+			if( cont1 && cont2 )
+			{
+				int sort1		= cont1.GetRootWidget().GetSort();
+				int sort2		= cont2.GetRootWidget().GetSort();
+				
+				cont1.GetRootWidget().SetSort( sort2 );
+				cont2.GetRootWidget().SetSort( sort1 );
+				
+				m_Body.SwapItems( m_Body.Find( cont1 ), m_Body.Find( cont2 ) );
+			}
+		}
+		RecomputeOpenedContainers();
+	}
+
+	override void UpdateInterval()
+	{
+		int i;
+		for ( i = 0; i < m_InventorySlots.Count(); i++ )
+		{
+			SlotsIcon icon = m_InventorySlots.GetElement( i );
+			if ( icon )
+			{
+				icon.UpdateInterval();
+			}
+		}
+		for ( i = 0; i < m_ShowedItems.Count(); i++ )
+		{
+			Container cont = m_ShowedItems.GetElement( i );
+			if ( cont )
+			{
+				cont.UpdateInterval();
+			}
+		}
+	}
+
+	// Call from ToggleWidget
+	void ToggleContainer( Widget w, EntityAI item )
+	{
+		InventoryLocation il = new InventoryLocation;
+		item.GetInventory().GetCurrentInventoryLocation( il );
+		SlotsIcon icon = m_InventorySlots.Get( il.GetSlot() );
+		ClosableContainer c = ClosableContainer.Cast( m_ShowedItems.Get( item ) );
+		if (c)
+		{
+			c.Toggle();
+			Refresh();
+		}
+	}
+	
+	override bool CanOpenCloseContainerEx(EntityAI focusedEntity)
+	{
+		if (focusedEntity)
+		{
+			ClosableContainer c = ClosableContainer.Cast( m_ShowedItems.Get( focusedEntity ) );
+			if (c && c.IsDisplayable())
+			{	
+				return true;
+			}
+		}
+		return false;
+	}
+
+	// Mouse button UP or Call other fn
+	void ToggleWidget( Widget w )
+	{
+		if( ItemManager.GetInstance().IsDragging() )
+		{
+			return;
+		}
+		string name = w.GetName();
+		name.Replace( "PanelWidget", "Render" );
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		if( ipw.GetItem() )
+		{
+			ToggleContainer( w, ipw.GetItem() );
+			RecomputeOpenedContainers();
+		}
+		
+		Refresh();
+	}
+
+	override void CollapseButtonOnMouseButtonDown(Widget w)
+	{
+		super.CollapseButtonOnMouseButtonDown(w);
+	}
+	
+	bool IsPlayerEquipmentActive()
+	{
+		if( GetFocusedContainer() && ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) ) )
+		{
+			return false;
+		}
+		
+		return true;
+	}
+	
+	override void Refresh()
+	{
+		super.Refresh();
+		m_MainWidget.Update();
+		m_RootWidget.Update();
+		UpdateSelectionIcons();
+	}
+	
+	override bool OnChildRemove( Widget w, Widget child )
+	{
+		Refresh();
+		return true;
+	}
+	
+	override bool OnChildAdd( Widget w, Widget child )
+	{
+		Refresh();
+		return true;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/VicinityContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/VicinityContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..728f5c6583d94d72cdd1427f64e8173e29cd0768
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/VicinityContainer.c
@@ -0,0 +1,680 @@
+class VicinityContainer: CollapsibleContainer
+{
+	ref VicinitySlotsContainer			m_VicinityIconsContainer;
+	ref map<EntityAI, ref Container>	m_ShowedItems				= new ref map<EntityAI, ref Container>;
+	ref map<int, ref Container>			m_ShowedItemsIDs			= new ref map<int, ref Container>;
+	ref array<EntityAI>					m_ShowedItemIcons			= new array<EntityAI>;
+	ref map<CargoBase, ref Container>	m_ShowedCargos				= new ref map<CargoBase, ref Container>;
+	protected bool						m_IsProcessing = false; // Prevents refreshing every time a child is added while it is still processing
+	
+	const float DISTANCE_TO_ENTITIES 	= 1.0;
+	const float DISTANCE_TO_THE_REST 	= 0.5;
+	
+	void VicinityContainer( LayoutHolder parent, int sort = -1 )
+	{
+		m_VicinityIconsContainer = new VicinitySlotsContainer( this );
+		m_Body.Insert( m_VicinityIconsContainer );
+		m_VicinityIconsContainer.GetRootWidget().SetColor(166 << 24 | 120 << 16 | 120 << 8 | 120);
+		m_MainWidget = m_RootWidget.FindAnyWidget( "body" );
+		WidgetEventHandler.GetInstance().RegisterOnChildAdd( m_MainWidget, this, "OnChildAdd" );
+		WidgetEventHandler.GetInstance().RegisterOnChildRemove( m_MainWidget, this, "OnChildRemove" );
+		
+		RecomputeOpenedContainers();
+		m_CollapsibleHeader.SetName("#container_vicinity");
+		LoadDefaultState();
+	}
+	
+	bool IsVicinityContainerIconsActive()
+	{
+		return m_VicinityIconsContainer.IsActive();
+	}
+	
+	VicinitySlotsContainer GetVicinityIconsContainer()
+	{
+		return m_VicinityIconsContainer;
+	}
+	
+	bool IsContainerWithCargoActive()
+	{
+		return ( ContainerWithCargo.Cast( GetFocusedContainer() ) != null );
+	}
+	
+	bool IsItemWithAttachmentsActive()
+	{
+		return ( ContainerWithCargoAndAttachments.Cast( GetFocusedContainer() ) != null );
+	}
+	
+	bool IsItemWithCategoriesActive()
+	{
+		return ( AttachmentCategoriesContainer.Cast( GetFocusedContainer() ) != null );
+	}
+
+	void TraverseShowedItems()
+	{
+		map<string, bool> serialized_types = new map<string, bool>();
+		for ( int i = 0; i < m_ShowedItems.Count(); i++ )
+		{
+			EntityAI entity = m_ShowedItems.GetKey( i );
+			Container container = m_ShowedItems.GetElement( i );
+			string type = entity.GetType();
+			if ( container.IsInherited( ContainerWithCargo ) )
+			{
+				if ( !serialized_types.Contains( type ) )
+				{
+					ContainerWithCargo item_with_cargo = ContainerWithCargo.Cast( container );
+					serialized_types.Insert( type, item_with_cargo.IsOpened() );
+				}
+			}
+		}
+
+		if ( serialized_types.Count() > 0 )
+		{
+			FileSerializer file = new FileSerializer();
+			if ( file.Open( "inventory_state.save", FileMode.APPEND ) )
+			{
+				file.Write( serialized_types.Count() );
+
+				for ( i = 0; i < serialized_types.Count(); i++ )
+				{
+					file.Write( serialized_types.GetKey( i ) );
+					file.Write( serialized_types.GetElement( i ) );
+				}
+			}
+			file.Close();
+		}
+	}
+
+	override void DraggingOverHeader( Widget w, int x, int y, Widget receiver )
+	{
+		if ( w == null )
+		{
+			return;
+		}
+		
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if ( !ipw )
+		{
+			string name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		
+		if ( !ipw && ItemPreviewWidget.Cast( w ) )
+		{
+			ipw = ItemPreviewWidget.Cast( w );
+		}
+
+		if ( !ipw || !ipw.GetItem() )
+		{
+			return;
+		}
+
+		if ( ipw.GetItem() && GetGame().GetPlayer().CanDropEntity( ipw.GetItem() ) && ipw.GetItem().GetInventory().CanRemoveEntity() && m_ShowedItemIcons.Find( ipw.GetItem() ) == -1 )
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+			ItemManager.GetInstance().HideDropzones();
+			ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+		}
+		else
+		{
+			ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+			ItemManager.GetInstance().ShowSourceDropzone( ipw.GetItem() );
+		}
+	}
+
+	void DraggingOverIcon( Widget w, int x, int y, Widget receiver )
+	{
+		string name = receiver.GetName();
+		name.Replace("PanelWidget", "Render");
+		ItemPreviewWidget receiver_iw = ItemPreviewWidget.Cast( receiver.FindAnyWidget(name) );
+		EntityAI receiver_item = receiver_iw.GetItem();
+
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if ( !ipw )
+		{
+			name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+		
+		if ( !ipw && ItemPreviewWidget.Cast( w ) )
+		{
+			ipw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if (!ipw)
+		{
+			return;
+		}
+
+		if ( !ItemBase.Cast( receiver_item ) || !ipw.GetItem() )
+		{
+			return;
+		}
+
+		if ( ipw.GetItem().GetInventory().CanRemoveEntity() || m_ShowedItemIcons.Find( ipw.GetItem() ) > -1 )
+		{
+			if ( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( ipw.GetItem() ) ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.COMBINE_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				return;
+			}
+			else if ( GameInventory.CanSwapEntitiesEx( receiver_item, ipw.GetItem() ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.SWAP_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				return;
+			}
+			/*else if( GetGame().GetPlayer().CanDropEntity( ipw.GetItem() ) )
+			{
+				ColorManager.GetInstance().SetColor( w, ColorManager.GREEN_COLOR );
+				ItemManager.GetInstance().HideDropzones();
+				ItemManager.GetInstance().GetLeftDropzone().SetAlpha( 1 );
+				return;
+			}*/
+		}
+			
+		ColorManager.GetInstance().SetColor( w, ColorManager.RED_COLOR );
+		ItemManager.GetInstance().ShowSourceDropzone( ipw.GetItem() );
+	}
+
+	void OnDropReceivedFromIcon( Widget w, int x, int y, Widget receiver )
+	{
+		string name = receiver.GetName();
+		name.Replace("PanelWidget", "Render");
+		ItemPreviewWidget receiver_iw = ItemPreviewWidget.Cast( receiver.FindAnyWidget(name) );
+		EntityAI receiver_item = receiver_iw.GetItem();
+
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if ( !ipw )
+		{
+			name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		}
+
+		if ( !ItemBase.Cast( receiver_item ) || !ipw.GetItem() )
+		{
+			return;
+		}
+		
+		EntityAI item = ipw.GetItem();
+		bool equal_typed = item.GetType() == receiver_item.GetType();
+		if ( !receiver_item.IsInherited( ItemBase ) || item == null )
+		{
+			return;
+		}
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+
+		if ( !item.GetInventory().CanRemoveEntity() )
+			return;
+		
+		if ( ( ItemBase.Cast( receiver_item ) ).CanBeCombined( ItemBase.Cast( item ) ) )
+		{
+			( ItemBase.Cast( receiver_item ) ).CombineItemsClient( ItemBase.Cast( item ) );
+		}
+		else if( GameInventory.CanSwapEntitiesEx( receiver_item, item ) )
+		{
+			InventoryLocation il1 = new InventoryLocation;
+			InventoryLocation il2 = new InventoryLocation;
+			receiver_item.GetInventory().GetCurrentInventoryLocation( il1 );
+			item.GetInventory().GetCurrentInventoryLocation( il2 );
+			
+			if( !receiver_item.GetInventory().CanRemoveEntity() || ( il1.GetType() == InventoryLocationType.GROUND && il2.GetType() == InventoryLocationType.GROUND ) )
+				return;
+			player.PredictiveSwapEntities( item, receiver_item );
+		}
+		
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging( false );
+		PrepareOwnedTooltip(item);
+
+		InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu( MENU_INVENTORY ) );
+		if ( menu )
+		{
+			menu.RefreshQuickbar();
+		}
+	}
+	
+	void OnLeftPanelDropReceived( Widget w, int x, int y, Widget receiver )
+	{
+		OnDropReceivedFromHeader( w, x, y, receiver );
+	}
+	
+	void OnDropReceivedFromEmptySpace( Widget w, int x, int y, Widget receiver )
+	{
+		OnDropReceivedFromHeader( w, x, y, receiver );
+	}
+
+	override void OnDropReceivedFromHeader(Widget w, int x, int y, Widget receiver)
+	{
+		if (!w)
+			return;
+		
+		ItemManager.GetInstance().HideDropzones();
+		ItemManager.GetInstance().SetIsDragging(false);
+		
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+		
+		if (!ipw)
+		{
+			string name = w.GetName();
+			name.Replace("PanelWidget", "Render");
+			ipw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+		}
+		
+		if (!ipw)
+		{
+			ipw = ItemPreviewWidget.Cast(w);
+			if (!ipw)
+				return;
+		}
+		
+		EntityAI item = ipw.GetItem();
+		if (!ipw.IsInherited(ItemPreviewWidget) || !item)
+			return;
+		
+		if (!item.GetInventory().CanRemoveEntity() || m_ShowedItemIcons.Find(item) > -1)
+			return;
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());		
+		if (player.CanDropEntity(item))
+		{
+			ItemBase itemBase = ItemBase.Cast(item);
+			if (itemBase)
+			{
+				if (itemBase.GetTargetQuantityMax() < itemBase.GetQuantity())
+					itemBase.SplitIntoStackMaxClient(null, -1);
+				else
+					player.PhysicalPredictiveDropItem(itemBase);
+			}
+		}
+
+		InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu( MENU_INVENTORY ) );
+		if ( menu )
+		{
+			menu.RefreshQuickbar();
+		}
+	}
+
+	override void UpdateInterval()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		if (!player)
+			return;
+		
+		super.UpdateInterval();
+		
+		EntityAI eai;
+		vector pos = player.GetPosition();
+		ref array<EntityAI> objects;
+		
+		VicinityItemManager.GetInstance().Update( player.GetDeltaT() );
+		objects = VicinityItemManager.GetInstance().GetVicinityItems();
+		
+		//GetItemsShowableInInventory
+		array<EntityAI> showable_items = new array<EntityAI>;
+		int m_OldShowedItemIconsCount = m_ShowedItemIcons.Count();
+		m_ShowedItemIcons.Clear();
+		
+		GameInventory game_inventory = player.GetInventory();
+		for ( int i = 0; i < objects.Count(); i++ )
+		{
+			eai = objects.Get( i );			
+			if ( eai == null || game_inventory.IsPlaceholderEntity( eai ) )
+				continue; // noproxy: ignore body placeholder
+			
+			BaseBuildingBase base_building = BaseBuildingBase.Cast(eai);
+			if (base_building && !base_building.IsPlayerInside(player,""))
+				continue;
+
+			if ( eai.IsInventoryVisible() )
+			{
+				showable_items.Insert( eai );
+
+				if ( !eai.IsInherited( DayZInfected ) && !eai.IsInherited( PlayerBase ) && !eai.IsInherited( AnimalBase ) && !eai.DisableVicinityIcon() )
+				{
+					m_ShowedItemIcons.Insert( eai );
+				}
+			}
+		}
+		
+		
+		//MW HOTFIX - old containers must be removed before new one are added (part of initialize are refreshed whole structure - need proper fix to avoid it)
+		ref map<EntityAI, ref Container> new_showed_items = new ref map<EntityAI, ref Container>;
+		Container con;
+		
+		for ( i = 0; i < showable_items.Count(); i++ )
+		{
+			new_showed_items.Insert(showable_items[i],null);
+		}
+		
+		
+		bool need_update_focus = false;
+		for ( i = 0; i < m_ShowedItems.Count(); i++ )
+		{
+			EntityAI ent = m_ShowedItems.GetKey( i );
+			m_ShowedItems.GetElement( i ).UpdateInterval();
+			con = m_ShowedItems.GetElement( i );
+			if ( !new_showed_items.Contains( ent ) )
+			{
+				GetMainWidget().Update();
+				if ( con.IsActive() )
+					need_update_focus = true;
+				Container.Cast( GetParent() ).Remove( con );
+				Remove( con );
+			}
+			else
+			{
+				UpdateHeader(ent,con,player); //squeezed here, the map is iterated over enough already..
+			}
+		}
+		//////////
+		
+		bool accessInventory = PlayerBase.DEBUG_INVENTORY_ACCESS;
+		accessInventory |= FreeDebugCamera.GetInstance() && FreeDebugCamera.GetInstance().IsActive();
+
+
+		//ref map<EntityAI, ref Container> new_showed_items = new ref map<EntityAI, ref Container>;
+		new_showed_items.Clear();
+		ref map<int, ref Container> showed_items_IDs = new ref map<int, ref Container>;
+		for ( i = 0; i < showable_items.Count(); i++ )
+		{
+			EntityAI entity = showable_items.Get( i );
+			if ( entity )
+			{
+				if ( game_inventory && !m_ShowedItems.Contains( entity ) )
+				{
+					string config = "CfgVehicles " + entity.GetType() + " GUIInventoryAttachmentsProps";
+
+					if ( GetGame().ConfigIsExisting( config ) )
+					{
+						AttachmentCategoriesContainer ac = new AttachmentCategoriesContainer( m_Parent, -1 );
+						ac.SetEntity( entity );
+						new_showed_items.Insert( entity, ac );
+						showed_items_IDs.Insert( entity.GetID(), ac);
+					}
+					else if ( entity.GetSlotsCountCorrect() > 0 && entity.GetInventory().GetCargo() )
+					{
+						if ( entity.IsInherited( DayZInfected ) )
+						{
+							if ( entity.IsAlive() )
+							{
+								continue;
+							}
+							ZombieContainer zmb_cnt = new ZombieContainer( m_Parent, -1 );
+							zmb_cnt.SetEntity( entity );
+							new_showed_items.Insert( entity, zmb_cnt );
+							showed_items_IDs.Insert( entity.GetID(), zmb_cnt );
+							Container.Cast( GetParent() ).Insert( zmb_cnt );
+						}
+						else
+						{
+							ContainerWithCargoAndAttachments iwca = new ContainerWithCargoAndAttachments( this, -1 );
+							iwca.SetEntity( entity, false );
+							new_showed_items.Insert( entity, iwca );
+							showed_items_IDs.Insert( entity.GetID(), iwca );
+						}
+					}
+					else if ( entity.GetInventory().GetCargo() )
+					{
+						ContainerWithCargo iwc = new ContainerWithCargo( this, -1 );
+						iwc.SetEntity( entity, 0, false );
+						new_showed_items.Insert( entity, iwc );
+						showed_items_IDs.Insert( entity.GetID(), iwc );
+						iwc.UpdateInterval();
+					}
+					else if ( entity.GetSlotsCountCorrect() > 0 )
+					{
+						if ( entity.HasEnergyManager() )
+						{
+							ContainerWithElectricManager iwem = new ContainerWithElectricManager( this, -1 );
+							iwem.SetEntity( entity, false );
+							new_showed_items.Insert( entity, iwem );
+							showed_items_IDs.Insert( entity.GetID(), iwem );
+						}
+						else
+						{
+							if ( entity.IsInherited( PlayerBase ) )
+							{
+								//! Allow view access of inventory if in free camera. Write access is elsewhere 
+								if (accessInventory == false)
+								{
+									if ( entity.IsAlive() && ( !PlayerBase.Cast( entity ).IsUnconscious() && !PlayerBase.Cast( entity ).IsRestrained() ) )
+									{
+										continue;
+									}
+								}
+								
+								PlayerContainer plyr_cnt = new PlayerContainer( m_Parent, false );
+								plyr_cnt.SetPlayer( PlayerBase.Cast( entity ) );
+								Container.Cast( GetParent() ).Insert( plyr_cnt );
+								( Container.Cast( m_Parent ) ).Refresh();
+								new_showed_items.Insert( entity, plyr_cnt );
+								showed_items_IDs.Insert( entity.GetID(), plyr_cnt);
+							}
+							else
+							{
+								ContainerWithCargoAndAttachments iwcas = new ContainerWithCargoAndAttachments( this, -1 );
+								iwcas.SetEntity( entity, false );
+								new_showed_items.Insert( entity, iwcas );
+								showed_items_IDs.Insert( entity.GetID(), iwcas );
+								iwcas.UpdateInterval();
+							}
+						}
+					}
+				}
+				else
+				{
+					//TODO MW: remove old containers on one spot (hotfix)
+					con = m_ShowedItems.Get( entity );
+					if ( con )
+					{
+						if ( entity.IsInherited( PlayerBase ) )
+						{
+							//! Allow view access of inventory if in free camera. Write access is elsewhere
+							if ( !accessInventory && entity.IsAlive() && ( !PlayerBase.Cast( entity ).IsUnconscious() && !PlayerBase.Cast( entity ).IsRestrained() ) )
+							{
+								GetMainWidget().Update();
+								if ( con.IsActive() )
+									need_update_focus = true;
+								Container.Cast( GetParent() ).Remove( con );
+								Remove( con );
+								continue;
+							}
+						}
+						
+						if ( entity.IsInherited( BaseBuildingBase ) )
+						{	
+							if ( !BaseBuildingBase.Cast(entity).IsPlayerInside(player,""))
+							{
+								GetMainWidget().Update();
+								if ( con.IsActive() )
+									need_update_focus = true;
+								Container.Cast( GetParent() ).Remove( con );
+								Remove( con );
+								continue;
+							}
+						}
+						
+						new_showed_items.Insert( entity, m_ShowedItems.Get( entity ) );
+						showed_items_IDs.Insert( entity.GetID(), m_ShowedItemsIDs.Get( entity.GetID() ) );
+					}
+				}
+			}
+		}
+		
+		ref map<CargoBase, ref Container> new_showed_cargos = new ref map<CargoBase, ref Container>;
+		auto cargoes = VicinityItemManager.GetInstance().GetVicinityCargos();
+		for ( i = 0; i < cargoes.Count(); i++ )
+		{
+			CargoBase cgo = cargoes.Get( i );
+			if ( cgo )
+			{
+				if (game_inventory && !m_ShowedCargos.Contains( cgo ) )
+				{
+					ContainerWithCargo pxc = new ContainerWithCargo( this, -1 );
+					pxc.SetEntity( cgo.GetCargoOwner(), cgo.GetOwnerCargoIndex(), false );
+					new_showed_cargos.Insert( cgo, pxc );
+					pxc.UpdateInterval();
+				}
+				else
+				{
+					if ( m_ShowedCargos.Get( cgo ) )
+					{
+						new_showed_cargos.Insert( cgo, m_ShowedCargos.Get( cgo ) );
+					}
+				}
+			}
+		}
+		
+		for ( int ic = 0; ic < m_ShowedCargos.Count(); ic++ )
+		{
+			CargoBase cgo2 = m_ShowedCargos.GetKey( ic );
+			m_ShowedCargos.GetElement( ic ).UpdateInterval();
+			if ( !new_showed_cargos.Contains( cgo2 ) )
+			{
+				Container con2 = m_ShowedCargos.GetElement( ic );
+				if( con2.IsActive() )
+					need_update_focus = true;
+				GetMainWidget().Update();
+				Container.Cast( GetParent() ).Remove( con2 );
+				Remove( con2 );
+			}
+		}
+		
+		m_ShowedItems = new_showed_items;
+		m_ShowedItemsIDs = showed_items_IDs;
+		m_ShowedCargos = new_showed_cargos;
+		//Because WTF (zombie container)
+		Container.Cast( GetParent() ).RecomputeOpenedContainers();
+		if (need_update_focus)
+			SetFirstActive();
+		//RecomputeOpenedContainers();
+		UpdateCollapseButtons();
+		m_VicinityIconsContainer.ShowItemsInContainers( m_ShowedItemIcons );
+		
+		if ( m_ShowedItemIcons.Count() != m_OldShowedItemIconsCount )
+		{
+			Inventory in = Inventory.Cast( GetRoot() );
+			if ( in )
+				in.UpdateConsoleToolbar();	
+		}
+	}
+	
+	void ToggleContainer( Widget w, EntityAI item )
+	{
+		SlotsIcon slots_icon;
+		Container c;
+		w.GetUserData(slots_icon);
+				
+		if ( item )
+		{
+			c = Container.Cast( m_ShowedItems.Get( item ) );
+		}
+		
+		if (c)
+		{
+			ToggleContainer(c);
+		}
+	}
+	
+	override bool CanOpenCloseContainerEx(EntityAI focusedEntity)
+	{
+		if (focusedEntity)
+		{
+			ClosableContainer c = ClosableContainer.Cast( m_ShowedItems.Get( focusedEntity ) );
+			if (c && c.IsDisplayable())
+			{	
+				return true;
+			}
+		}
+		return false;
+	}
+
+	//Call from ExpandCollapseContainer - not call
+	void ToggleContainer( notnull Container conta )
+	{
+		conta.Toggle();
+	}
+	
+	override void ExpandCollapseContainer()
+	{
+		EntityAI item = GetFocusedItem();
+		Container conta;
+			
+		if (m_ShowedItems && item)
+		{
+			conta = m_ShowedItems.Get( item );
+			if (conta)
+			{		
+				ToggleContainer( conta );
+			}
+		}
+	}
+	
+	override bool OnChildRemove( Widget w, Widget child )
+	{
+		w.Update();
+		float x, y;
+		w.GetScreenSize( x, y );
+		if ( w == GetMainWidget() )
+		{
+			GetMainWidget().Update();
+			m_Parent.OnChildRemove( w, child );
+		}
+		return true;
+	}
+	
+	override bool OnChildAdd( Widget w, Widget child )
+	{
+		if ( w == GetMainWidget() )
+		{
+			GetMainWidget().Update();
+			m_Parent.OnChildAdd( w, child );
+		}
+		return true;
+	}
+
+	override void CollapseButtonOnMouseButtonDown(Widget w)
+	{
+		super.CollapseButtonOnMouseButtonDown(w);
+		ItemManager.GetInstance().SetDefaultHeaderOpenState( "VICINITY", !m_Hidden );
+	}
+	
+	//! Updates header dragability to be consistent with current 'icon' behaviour
+	void UpdateHeader(EntityAI entity, Container cont, PlayerBase player)
+	{
+		bool draggable = ItemManager.GetInstance().EvaluateContainerDragabilityDefault(entity);
+		
+		if (cont.GetHeader())
+		{
+			if (GetDragWidget() == cont.GetHeader())
+			{
+				CancelWidgetDragging();
+			}
+			ItemManager.GetInstance().SetWidgetDraggable(cont.GetHeader().GetMainWidget(),draggable);
+		}
+	}
+	
+	override bool SplitItem()
+	{
+		if ( CanSplit() )
+		{
+			ItemBase item = ItemBase.Cast(GetFocusedItem());
+			if (item)
+			{
+				if (item.HasQuantity() && item.CanBeSplit())
+				{
+					item.OnRightClick();
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/VicinitySlotsContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/VicinitySlotsContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..7d1e2eea525c01040bc524ac5fa273cfac323a37
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/VicinitySlotsContainer.c
@@ -0,0 +1,635 @@
+class VicinitySlotsContainer: Container
+{
+	protected ref AttachmentsGroupContainer		m_Container;
+	protected int								m_ItemsCount;
+	protected int								m_SlotsCount;
+	protected ref array<EntityAI>				m_ShowedItems;
+	
+	void VicinitySlotsContainer( LayoutHolder parent )
+	{
+		m_Container = new AttachmentsGroupContainer(this);
+		ref SlotsContainer con = new SlotsContainer( m_Container, null );
+		m_Container.Insert( con );
+		m_Body.Insert( m_Container );
+		for( int j = 0; j < ITEMS_IN_ROW; j++ )
+		{
+			SlotsIcon icon = con.GetSlotIcon( j );
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetPanelWidget(),  m_Parent, "OnDropReceivedFromIcon" );
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetGhostSlot(),  m_Parent, "OnDropReceivedFromHeader" );
+			WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetMainWidget(),  m_Parent, "OnDropReceivedFromHeader" );
+			
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetPanelWidget(),  m_Parent, "DraggingOverIcon" );
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetGhostSlot(),  m_Parent, "DraggingOverHeader" );
+			WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetMainWidget(),  m_Parent, "DraggingOverHeader" );
+			
+			WidgetEventHandler.GetInstance().RegisterOnDoubleClick( icon.GetPanelWidget(),  this, "DoubleClick" );
+			WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp( icon.GetPanelWidget(),  this, "MouseClick" );
+			WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( icon.GetPanelWidget(),  this, "MouseButtonDown" );
+		}
+		
+		con.SetColumnCount(0);
+		con.SetForceShow(true);
+		
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived( m_Container.GetMainWidget(),  m_Parent, "OnDropReceivedFromHeader" );
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver( m_Container.GetMainWidget(),  m_Parent, "DraggingOverHeader" );
+		
+		m_ShowedItems = new array<EntityAI>;
+	}
+	
+	bool IsItemWithContainerActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && ( ent.GetInventory().GetCargo() || (ent.GetSlotsCountCorrect() > 0 && ent.CanDisplayAnyAttachmentSlot()) );
+		//TODO: also check for cargo visibility maybe?
+	}
+	
+	override bool IsItemWithQuantityActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && QuantityConversions.HasItemQuantity( ent ) && ent.CanBeSplit();
+	}
+	
+	override bool IsItemActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && !IsItemWithQuantityActive() && !IsItemWithContainerActive();
+	}
+	
+	bool IsEmptyItemActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent == null;
+	}
+	
+	//TODO MW Adjust this
+	override bool IsDisplayable()
+	{
+		return true;
+	} 
+	
+	bool IsTakeable()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent.IsTakeable();
+	}
+	
+	override bool CanCombineAmmo()
+	{
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		ItemBase ent = ItemBase.Cast(  GetFocusedItem() );
+		ItemBase item_in_hands = ItemBase.Cast(	GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+		ActionManagerClient amc;
+		Class.CastTo(amc, m_player.GetActionManager());
+
+		return ( amc.CanPerformActionFromInventory( item_in_hands, ent ) || amc.CanSetActionFromInventory( item_in_hands, ent ) );
+	}
+	
+	override bool EquipItem()
+	{
+		if (CanEquip())
+		{	
+			EntityAI ent = GetFocusedItem();
+			bool res = false;
+			
+			if( ent && !ent.IsInherited( Magazine ))
+			{
+				res = GetGame().GetPlayer().PredictiveTakeOrSwapAttachment( ent );
+				if(!res)
+				{
+					res = GetGame().GetPlayer().GetInventory().TakeEntityToInventory(InventoryMode.JUNCTURE,FindInventoryLocationType.ATTACHMENT,ent);
+				}
+			}
+			return res;
+		}
+		return false;
+	}
+	
+	override bool InspectItem()
+	{
+		EntityAI ent = GetFocusedItem();
+		
+		if( ent )
+		{
+			InspectItem( ent );
+			return true;
+		}
+		return false;
+	}
+		
+	override bool TransferItem()
+	{
+		if (CanTakeToInventory())
+		{
+			ItemBase ent = ItemBase.Cast(GetFocusedItem());
+			if (ent)
+			{
+				if (ent.IsTakeable())
+				{
+					InventoryLocation il = new InventoryLocation;
+					GetGame().GetPlayer().GetInventory().FindFreeLocationFor( ent, FindInventoryLocationType.CARGO, il );
+					if (il.IsValid() && GetGame().GetPlayer().GetInventory().LocationCanAddEntity( il ))
+					{
+						SplitItemUtils.TakeOrSplitToInventoryLocation( PlayerBase.Cast( GetGame().GetPlayer() ), il );
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool Combine()
+	{
+		ItemBase ent = ItemBase.Cast( GetFocusedItem() );
+		
+		ItemBase item_in_hands = ItemBase.Cast(	GetGame().GetPlayer().GetHumanInventory().GetEntityInHands() );
+		
+		Icon hands_icon = ItemManager.GetInstance().GetHandsPreview().GetIcon();
+		
+		if( item_in_hands && ent && hands_icon )
+		{
+			return hands_icon.CombineItems( item_in_hands, ent );
+		}
+		return false;
+	}
+	
+	override bool Select()
+	{
+		SlotsIcon selected_slot = ItemManager.GetInstance().GetSelectedIcon();
+		EntityAI ent = GetFocusedItem();
+		ItemBase selected_item = ItemBase.Cast(ItemManager.GetInstance().GetSelectedItem());
+		
+		if( !(selected_slot && selected_slot.IsOutOfReach() ) )
+		{
+			if( selected_item )
+			{
+				if( ent != selected_item)
+				{
+					if( selected_item && GetGame().GetPlayer().CanDropEntity( selected_item ) )
+					{
+						bool draggable = false;
+		
+						PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+						draggable = !player.GetInventory().HasInventoryReservation( selected_item, null ) && !player.IsItemsToDelete();
+						draggable = draggable && selected_item.GetInventory().CanRemoveEntity();
+						
+						if( draggable && m_ShowedItems.Find( selected_item ) == -1 )
+						{
+							if( selected_item.GetTargetQuantityMax() < selected_item.GetQuantity() )
+								selected_item.SplitIntoStackMaxClient( null, -1 );
+							else
+								player.PhysicalPredictiveDropItem( selected_item );
+							ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+							return true;
+						}
+					}
+				}
+			}
+			else
+			{
+				if( ent && ent.GetInventory().CanRemoveEntity())
+				{
+					EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+					if( item_in_hands )
+					{
+						if( GameInventory.CanSwapEntitiesEx( item_in_hands, ent ) )
+						{
+							GetGame().GetPlayer().PredictiveSwapEntities( item_in_hands, ent );
+							return true;
+						}
+					}
+					else
+					{
+						if( GetGame().GetPlayer().GetHumanInventory().CanAddEntityInHands( ent ) )
+						{
+							GetGame().GetPlayer().PredictiveTakeEntityToHands( ent );
+							return true;
+						}
+					}
+				}
+			}
+		}
+
+		return false;
+	}
+	
+	void ~VicinitySlotsContainer()
+	{
+		for ( int i = 0; i < m_Container.Count(); i++ )
+		{
+			Container c = ClosableContainer.Cast( m_Container.Get( i / ITEMS_IN_ROW ) );
+			if( c && c.GetMainWidget() )
+			{
+				delete m_Container.Get( i / ITEMS_IN_ROW ).GetMainWidget();
+			}
+		}
+	}
+
+	override void SetLayoutName()
+	{
+		m_LayoutName = WidgetLayoutName.Container;
+	}
+
+	override void OnShow()
+	{
+		super.OnShow();
+	}
+	
+	int GetRowSlotCount()
+	{
+		return GetFocusedContainer().GetColumnCount();
+	}
+	
+	//! Decides on the icon visibility
+	bool ExcludeFromContainer (EntityAI item)
+	{
+		int mask = item.GetHideIconMask();
+		return mask & EInventoryIconVisibility.HIDE_VICINITY;
+	}
+	
+	void ShowItemsInContainers( array<EntityAI> items )
+	{
+		EntityAI item;
+		SlotsIcon icon;
+		int x;
+		int visible_items_count = 0;
+		int visible_rows = 0;
+		ref array<EntityAI> visible_items = new array<EntityAI>;
+		
+		for ( x = 0; x < items.Count(); ++x )
+		{
+			item = items.Get( x );
+			
+			if ( item == null || ExcludeFromContainer(item) )
+				continue;
+
+			visible_items.Insert( item );
+			visible_items_count++;
+		}
+		
+		RecomputeNumberOfContainers( visible_items );
+		
+		for ( x = 0; x < visible_items_count; ++x )
+		{
+			item			= visible_items.Get( x );
+			int row			= (int)Math.Floor( x / ITEMS_IN_ROW );
+			int column		= x % ITEMS_IN_ROW;
+			icon			= SlotsContainer.Cast( m_Container.Get( row ) ).GetSlotIcon( column );
+			
+			icon.GetMainWidget().Show( true );
+			icon.GetPanelWidget().SetUserID( item.GetID() );
+			
+			if ( m_ShowedItems.Find( item ) != x )
+				icon.Init( item );
+			icon.UpdateInterval();
+			
+			if ( !ItemManager.GetInstance().IsDragging() )
+			{
+				ItemManager.GetInstance().SetTemperature( item, icon.GetRender() );
+			}
+			
+			bool draggable = ItemManager.GetInstance().EvaluateContainerDragabilityDefault(item);
+			if ( !draggable && GetDragWidget() == icon.GetPanelWidget() )
+				CancelWidgetDragging();
+			ItemManager.GetInstance().SetWidgetDraggable( icon.GetPanelWidget(), draggable );
+
+			ref map<int, ref Container> showed_items = ( VicinityContainer.Cast( m_Parent ) ).m_ShowedItemsIDs;
+			
+			Container conta = Container.Cast( showed_items.Get( item.GetID() ) );
+			if ( conta )
+			{
+				conta.SetSlotIcon(icon);
+			}
+			
+			if ( conta && conta.IsDisplayable() )
+			{
+				conta.UpdateRadialIcon();
+			}
+			else
+			{
+				icon.GetRadialIconPanel().Show( false );
+				if ( conta )
+					conta.OnHide();
+			}
+		}
+		
+		SlotsContainer slots_last = SlotsContainer.Cast( m_Container.Get( visible_items.Count() / ITEMS_IN_ROW ) );
+		
+		for ( int c = visible_items_count % ITEMS_IN_ROW; c < ITEMS_IN_ROW; ++c )
+		{
+			icon = slots_last.GetSlotIcon( c );
+			icon.GetMainWidget().Show( false );
+			icon.Clear();
+		}
+		
+		//#ifndef PLATFORM_CONSOLE
+		if ( visible_items_count % ITEMS_IN_ROW == 0 )
+		{
+			slots_last = SlotsContainer.Cast( m_Container.Get( m_Container.Count() - 1 ) );
+			slots_last.GetSlotIcon( 0 ).GetMainWidget().Show( true );
+			slots_last.GetSlotIcon( 0 ).GetGhostSlot().Show( false );
+			slots_last.GetMainWidget().Update();
+		}
+		//#endif
+		
+		m_ShowedItems = visible_items;
+	}
+	
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if( button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			if( w == null )
+			{
+				return;
+			}
+			ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+			if( !iw )
+			{
+			  string name = w.GetName();
+			  name.Replace( "PanelWidget", "Render" );
+			  iw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+			} 
+			
+			if( !iw )
+			{
+			  iw = ItemPreviewWidget.Cast( w );
+			}
+			
+			ItemBase item = ItemBase.Cast( iw.GetItem() );
+			if( !item )
+			{
+				return;
+			}
+			
+			if( !item.IsTakeable() )
+			{
+				return;
+			}
+			
+			if( GetGame().GetPlayer().GetInventory().HasInventoryReservation( item, null ) )
+			{
+				return;
+			}
+			
+			if( !item.GetInventory().CanRemoveEntity() )
+				return;
+			
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+					
+			if ( player.GetInventory().HasEntityInInventory( item ) && GetGame().GetPlayer().GetHumanInventory().CanAddEntityInHands( item ) )
+			{
+				player.PredictiveTakeEntityToHands( item );
+			}
+			else
+			{
+				InventoryLocation dst = new InventoryLocation;
+				player.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.ANY, dst );
+				if( dst.IsValid() && player.GetInventory().LocationCanAddEntity( dst ) )
+				{
+					SplitItemUtils.TakeOrSplitToInventoryLocation( player, dst );
+				}
+			}
+			
+			HideOwnedTooltip();
+			InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu( MENU_INVENTORY ) );
+			if( menu )
+			{
+				menu.RefreshQuickbar();
+			}
+		}
+	}
+	
+	string GetItemQuantityText( EntityAI item )
+	{
+		string quantity_text = "";
+		if ( item.IsInherited( InventoryItem ) )
+		{
+			ItemBase item_base = ItemBase.Cast( item );
+			float quantity = item_base.GetQuantity();
+			int ammo;
+			if ( item.IsInherited( Magazine ) )
+			{
+				Magazine magazine_item = Magazine.Cast( item );
+				ammo = magazine_item.GetAmmoCount();
+				quantity_text = ammo.ToString();
+				return quantity_text;
+			}
+			else if ( item.IsInherited( ItemBook ) )
+			{
+				return "";
+			}
+			int max = item.GetQuantityMax();
+			//string unit = item.ConfigGetString( "stackedUnit" );
+
+			if ( max > 0 )
+			{
+				if ( max == 1 )
+				{
+					float tmp = Math.Round( ( quantity / max ) * 100 );
+					quantity_text = tmp.ToString() + "%";
+				}
+				else
+				{
+					quantity_text = quantity.ToString();
+				}
+			}
+		}
+		return quantity_text;
+	}
+	
+	int HasItemQuantity( EntityAI item )
+	{
+		if ( item.IsInherited( InventoryItem ) )
+		{
+			ItemBase item_base = ItemBase.Cast( item );
+			if ( item.IsInherited( Magazine ) )
+			{
+				return QUANTITY_COUNT;
+			}
+			else if ( item.IsInherited( ItemBook ) )
+			{
+				return QUANTITY_HIDDEN;
+			}
+			int max = item.GetQuantityMax();
+			bool bar = item.ConfigGetBool( "quantityBar" );
+			if ( max > 0 )
+			{
+				if ( max == 1 || bar )
+				{
+					return QUANTITY_PROGRESS;
+				}
+				else
+				{
+					return QUANTITY_COUNT;
+				}
+			}
+		}
+		return QUANTITY_HIDDEN;
+	}
+	
+	float GetItemQuantity( InventoryItem item )
+	{
+		float quantity = 0;
+		if ( item.IsInherited( InventoryItem ) )
+		{
+			ItemBase item_base = ItemBase.Cast( item );
+			if ( item.IsInherited( Magazine ) )
+			{
+				Magazine magazine_item = Magazine.Cast( item );
+				quantity = magazine_item.GetAmmoCount();
+			}
+			else
+			{
+				quantity = item_base.GetQuantity();
+			}
+		}
+		return quantity;
+	}
+	
+	// Mouse button DOWN
+	void MouseButtonDown( Widget w, int x, int y, int button)
+	{
+		string name = w.GetName();
+		name.Replace( "PanelWidget", "Render" );
+		ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		ItemBase item = ItemBase.Cast( item_preview.GetItem() );
+		bool draggable = ItemManager.GetInstance().EvaluateContainerDragabilityDefault(item);
+		ItemManager.GetInstance().SetWidgetDraggable( w, draggable );
+	}
+	
+	// Mouse button UP <---- exist button down MouseButtonDown ^
+	void MouseClick( Widget w, int x, int y, int button)
+	{
+		string name = w.GetName();
+		name.Replace( "PanelWidget", "Render" );
+		ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		EntityAI item = item_preview.GetItem();
+		InventoryItem itemAtPos = InventoryItem.Cast( item );
+		Container conta;
+		
+		#ifdef DIAG_DEVELOPER
+		if ( ItemBase.Cast(item) )
+		{
+			if ( GetDayZGame().IsLeftCtrlDown() && button == MouseState.RIGHT )
+				ShowActionMenu( ItemBase.Cast(item) );
+		}
+		#endif
+		
+		if( m_Parent )
+		{
+			ref map<int, ref Container> showed_items = ( VicinityContainer.Cast( m_Parent ) ).m_ShowedItemsIDs;
+			
+			if( item && showed_items )
+			{
+				conta = showed_items.Get( item.GetID() );
+				
+				( VicinityContainer.Cast( m_Parent ) ).ToggleContainer( w, item );
+				if ( button == MouseState.RIGHT )
+				{
+					if ( itemAtPos )
+					{
+						itemAtPos.OnRightClick();
+					}
+				}
+				else if ( button == MouseState.MIDDLE )
+				{
+					InspectItem( itemAtPos );
+					return;
+				}
+			}
+		}
+	}
+	
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget("Render") );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		} 
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if( !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;	
+		}
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		ItemBase item = ItemBase.Cast(ipw.GetItem());
+		
+		if( item )
+		{
+			if( !item.GetInventory().CanRemoveEntity() )
+				return;
+			
+			if( player.CanDropEntity( item ) )
+			{
+				if( item.GetTargetQuantityMax() < item.GetQuantity() )
+					item.SplitIntoStackMaxClient( null, -1 );
+				else
+					player.PhysicalPredictiveDropItem( item );
+			}
+		}
+	}
+	
+	void RecomputeNumberOfContainers( array<EntityAI> items )
+	{
+		int number_of_containers = m_Container.m_Body.Count();
+		int number_of_containers_needed = ( items.Count() / ITEMS_IN_ROW ) + 1;
+		int difference = number_of_containers_needed - number_of_containers;
+		int g;
+
+		for (g = number_of_containers; g < number_of_containers_needed; g++)
+		{
+			SlotsContainer con = new SlotsContainer( m_Container, null );
+			m_Container.Insert(con, -1, false);
+			for (int j = 0; j < ITEMS_IN_ROW; j++)
+			{
+				SlotsIcon icon = con.GetSlotIcon(j);
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived(icon.GetPanelWidget(),  m_Parent, "OnDropReceivedFromIcon");
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived(icon.GetGhostSlot(),  m_Parent, "OnDropReceivedFromHeader");
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived(icon.GetMainWidget(),  m_Parent, "OnDropReceivedFromHeader");
+						
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver(icon.GetPanelWidget(),  m_Parent, "DraggingOverIcon");
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver(icon.GetGhostSlot(),  m_Parent, "DraggingOverHeader");
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver(icon.GetMainWidget(),  m_Parent, "DraggingOverHeader");
+						
+				WidgetEventHandler.GetInstance().RegisterOnDoubleClick(icon.GetPanelWidget(),  this, "DoubleClick");
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp(icon.GetPanelWidget(),  this, "MouseClick");
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown(icon.GetPanelWidget(),  this, "MouseButtonDown");
+			}
+					
+			con.SetColumnCount(items.Count() % ITEMS_IN_ROW);
+		}	
+
+		for (g = number_of_containers - 1 ; g >= number_of_containers_needed ; g--)
+		{
+			Widget w = m_Container.m_Body.Get(g).GetMainWidget();
+			delete w;
+			m_Container.m_Body.Remove(g);
+		}
+		
+		if ( (items.Count() % ITEMS_IN_ROW) == 0 )
+		{
+			SlotsContainer.Cast( m_Container.Get( number_of_containers_needed - 1 ) ).SetColumnCount( ITEMS_IN_ROW );
+		}
+		else
+		{
+			SlotsContainer.Cast( m_Container.Get( number_of_containers_needed - 1 ) ).SetColumnCount( items.Count() % ITEMS_IN_ROW );
+		}
+		
+		for ( int i = 0; i < number_of_containers_needed - 1; i++ )
+		{
+			SlotsContainer.Cast( m_Container.Get( i ) ).SetColumnCount( ITEMS_IN_ROW );
+		}
+		
+		RecomputeOpenedContainers();
+		m_Container.RecomputeOpenedContainers();
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ZombieContainer.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ZombieContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..040a12f8736e57ba0ad7658ba12584b54ec15727
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inherited/ZombieContainer.c
@@ -0,0 +1,772 @@
+class ZombieContainer: CollapsibleContainer
+{
+	protected ref AttachmentsGroupContainer		m_Container;
+	protected ref ContainerWithCargo			m_CargoGrid;
+	protected ref map<int, SlotsIcon>			m_InventorySlots;
+	protected ref map<EntityAI, ref Container>	m_ShowedItems = new ref map<EntityAI, ref Container>;
+	protected EntityAI							m_ZombieEntity;
+	
+	void ZombieContainer( LayoutHolder parent, int sort = -1 )
+	{
+		m_InventorySlots = new ref map<int, SlotsIcon>;
+		m_Container = new AttachmentsGroupContainer(this);
+		
+		m_Container.SetHeader(GetHeader());
+		SetHeaderName();
+		SetHeader(null);
+		m_Body.Insert( m_Container );
+		
+		m_MainWidget = m_RootWidget.FindAnyWidget( "body" );
+		
+		WidgetEventHandler.GetInstance().RegisterOnChildAdd( m_MainWidget, this, "OnChildAdd" );
+		WidgetEventHandler.GetInstance().RegisterOnChildRemove( m_MainWidget, this, "OnChildRemove" );
+		
+		
+		RecomputeOpenedContainers();
+	}
+	
+	void ~ZombieContainer()
+	{
+		if( m_ZombieEntity )
+		{
+			m_ZombieEntity.GetOnItemAttached().Remove(ItemAttached);
+			m_ZombieEntity.GetOnItemDetached().Remove(ItemDetached);
+		}
+	}
+	
+	void SetEntity( EntityAI zombie_entity )
+	{
+		m_ZombieEntity = zombie_entity;
+		m_ZombieEntity.GetOnItemAttached().Insert(ItemAttached);
+		m_ZombieEntity.GetOnItemDetached().Insert(ItemDetached);
+		InitGhostSlots();
+		m_Parent.Refresh();
+	}
+	
+	override void UpdateRadialIcon()
+	{
+		if ( m_SlotIcon )
+		{
+			bool show_radial_icon;
+			show_radial_icon = IsHidden();
+			Widget rip = m_SlotIcon.GetRadialIconPanel();
+			Widget icon_open = m_SlotIcon.GetRadialIcon();
+			Widget icon_closed = m_SlotIcon.GetRadialIconClosed();
+			rip.Show( !m_ZombieEntity.GetInventory().IsInventoryLockedForLockType( HIDE_INV_FROM_SCRIPT ) && m_ZombieEntity.CanDisplayCargo());
+			icon_open.Show( show_radial_icon );
+			icon_closed.Show( !show_radial_icon );
+		}
+	}
+	
+	override bool IsItemWithQuantityActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && QuantityConversions.HasItemQuantity( ent ) && ent.CanBeSplit();
+	}
+	
+	bool IsContainerWithCargoActive()
+	{
+		return GetFocusedContainer().IsInherited( ContainerWithCargo );
+	}
+	
+	bool IsItemWithAttachmentsActive()
+	{
+		return GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments );
+	}
+	
+	bool IsZombieEquipmentActive()
+	{
+		return GetFocusedContainer() == m_Container;
+	}
+	
+	bool IsItemWithContainerActive()
+	{
+		EntityAI ent = GetFocusedItem();
+		return ent && ( ent.GetInventory().GetCargo() || ent.GetSlotsCountCorrect() > 0 );
+	}
+	
+	bool IsEmptyItemActive()
+	{
+		return !GetFocusedItem();
+	}
+	
+	override void ExpandCollapseContainer()
+	{
+		if( IsZombieEquipmentActive() )
+		{
+			ItemPreviewWidget item_preview = GetFocusedSlotsIcon().GetRender();
+			ToggleContainer( item_preview.GetParent() );
+		}
+	}
+	
+	override void OnDropReceivedFromHeader( Widget w, int x, int y, Widget receiver )
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+		if( !ipw )
+		{
+		  string name = w.GetName();
+		  name.Replace( "PanelWidget", "Render" );
+		  ipw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+		} 
+		if( !ipw )
+		{
+		  ipw = ItemPreviewWidget.Cast( w );
+		}
+		
+		if( !ipw.IsInherited( ItemPreviewWidget ) )
+		{
+			return;	
+		}
+		
+		EntityAI item = ipw.GetItem();
+		
+		if( !item.GetInventory().CanRemoveEntity() )
+			return;
+		
+		if (m_ZombieEntity.GetInventory().CanAddEntityInCargo( item, item.GetInventory().GetFlipCargo() ))
+			GetGame().GetPlayer().PredictiveTakeEntityToTargetCargo( m_ZombieEntity, item );
+		else if( m_ZombieEntity.GetInventory().CanAddEntityToInventory( item ) )
+		{
+			GetGame().GetPlayer().PredictiveTakeEntityToTargetInventory( m_ZombieEntity, FindInventoryLocationType.CARGO, item );
+		}
+	}
+	
+	override void DraggingOverHeader(Widget w, int x, int y, Widget receiver)
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast(w.FindAnyWidget( "Render" ));
+		string name = receiver.GetName();
+		name.Replace("PanelWidget", "Render");
+		ItemPreviewWidget receiver_iw = ItemPreviewWidget.Cast( receiver.FindAnyWidget( name ) );
+		EntityAI receiver_item;
+		if (receiver_iw)
+		{
+			receiver_item = receiver_iw.GetItem();
+		}
+		
+		if(!ipw)
+		{
+			name = w.GetName();
+			name.Replace("PanelWidget", "Render");
+			ipw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+		}
+		if(!ipw)
+		{
+		  ipw = ItemPreviewWidget.Cast(w);
+		}
+		
+		if( !ipw.IsInherited(ItemPreviewWidget))
+		{
+			return;	
+		}
+		
+		EntityAI item = ipw.GetItem();
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if(!item.GetInventory().CanRemoveEntity())
+			return;
+	}
+	
+	void OnDropReceivedFromGhostArea(Widget w, int x, int y, Widget receiver)
+	{
+		ItemPreviewWidget ipw = ItemPreviewWidget.Cast( w.FindAnyWidget("Render"));
+		string name = receiver.GetName();
+		name.Replace("PanelWidget", "Render");
+		ItemPreviewWidget receiver_iw = ItemPreviewWidget.Cast( receiver.FindAnyWidget(name));
+		EntityAI receiver_item;
+		if (receiver_iw)
+		{
+			receiver_item = receiver_iw.GetItem();
+		}
+		
+		if( !ipw )
+		{
+			name = w.GetName();
+			name.Replace( "PanelWidget", "Render" );
+			ipw = ItemPreviewWidget.Cast( w.FindAnyWidget(name));
+		}
+		if(!ipw)
+		{
+		  ipw = ItemPreviewWidget.Cast(w);
+		}
+		
+		if(!ipw.IsInherited(ItemPreviewWidget))
+		{
+			return;	
+		}
+		
+		EntityAI item = ipw.GetItem();
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if(!item.GetInventory().CanRemoveEntity())
+		{
+			return;
+		}
+		
+		if(receiver_item)
+		{
+			if(receiver_item.GetInventory().CanAddAttachment(item))
+			{
+				player.PredictiveTakeEntityToTargetAttachment(receiver_item, item);
+				return;
+			}
+			else if(receiver_item.GetInventory().CanAddEntityInCargo(item, item.GetInventory().GetFlipCargo()) && !receiver_item.GetInventory().HasEntityInCargo(item))
+			{
+				player.PredictiveTakeEntityToTargetInventory(receiver_item, FindInventoryLocationType.ANY, item);
+				return;
+			}
+		}
+		
+		if(item)
+		{
+			if(m_ZombieEntity.GetInventory().CanAddAttachment(item))
+			{
+				player.PredictiveTakeEntityToTargetAttachment(m_ZombieEntity, item);
+			}
+			else if(m_ZombieEntity.GetInventory().CanAddEntityToInventory(item))
+			{
+				player.PredictiveTakeEntityToTargetInventory(m_ZombieEntity, FindInventoryLocationType.ANY, item);
+			}
+		}
+		
+		if( item )
+		{
+			if( m_ZombieEntity.GetInventory().CanAddEntityInto(item, FindInventoryLocationType.CARGO ))
+			{
+				player.PredictiveTakeEntityToTargetInventory(m_ZombieEntity, FindInventoryLocationType.CARGO, item);
+			}
+		}
+	}
+
+	void SetHeaderName()
+	{
+		m_CollapsibleHeader.SetName( "#container_inventory" );
+	}
+	
+	void ItemAttached(EntityAI item, string slot_name)
+	{
+		int slot = InventorySlots.GetSlotIdFromString( slot_name );
+		SlotsIcon icon = m_InventorySlots.Get( slot );
+		if( icon )
+		{
+			icon.Init( item );
+
+			if( m_ShowedItems.Contains( item ) == false )
+			{
+				string name;
+				
+				if( item.GetSlotsCountCorrect() > 0 )
+				{
+					ContainerWithCargoAndAttachments iwca = new ContainerWithCargoAndAttachments( this, false );
+					iwca.SetEntity( item );
+					WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp( icon.GetPanelWidget(),  this, "ToggleContainer" );
+
+					icon.GetRadialIconPanel().Show( true );
+					m_ShowedItems.Insert( item, iwca );
+					
+					Refresh();
+				}
+				else if( item.GetInventory().GetCargo() )
+				{
+					ContainerWithCargo iwc = new ContainerWithCargo( this, false );
+					iwc.SetEntity( item );
+					iwc.UpdateInterval();
+					WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp( icon.GetPanelWidget(),  this, "ToggleContainer" );
+					m_ShowedItems.Insert( item, iwc );
+					icon.GetRadialIconPanel().Show(true);
+					
+					Refresh();
+				}
+			}
+			
+			ClosableContainer conta = ClosableContainer.Cast( m_ShowedItems.Get( item ) );
+			string config = "CfgVehicles " + item.GetType() + " GUIInventoryAttachmentsProps";
+			if( conta && conta.IsInherited( ClosableContainer ) )
+			{
+				bool show_radial_icon = ( item.GetInventory().GetCargo() || item.GetSlotsCountCorrect() > 0 ) && !GetGame().ConfigIsExisting( config );
+				Widget rip = icon.GetRadialIconPanel();
+				Widget icon_open = icon.GetRadialIcon();
+				Widget icon_closed = icon.GetRadialIconClosed();				
+				rip.Show( show_radial_icon );
+				icon_open.Show( conta.IsOpened() );
+				icon_closed.Show( !conta.IsOpened() );
+			}
+			RecomputeOpenedContainers();
+		}
+	}
+	
+	void ItemDetached(EntityAI item, string slot_name)
+	{
+		int slot = InventorySlots.GetSlotIdFromString( slot_name );
+		SlotsIcon icon = m_InventorySlots.Get( slot );
+		
+		if( icon )
+		{
+			Container con = m_ShowedItems.Get( item );
+			if( con )
+			{
+				( Container.Cast( con.m_Parent ) ).Remove( con );
+				RecomputeOpenedContainers();
+				GetMainWidget().Update();
+				Refresh();
+				m_ShowedItems.Remove( item );
+			}
+			
+			icon.Clear();
+			Inventory in = Inventory.Cast( GetRoot() );
+			if( in )
+				in.UpdateConsoleToolbar();
+		}
+	}
+	
+	override bool CanOpenCloseContainerEx(EntityAI focusedEntity)
+	{
+		ClosableContainer c;
+		if (focusedEntity)
+		{
+			c = ClosableContainer.Cast( m_ShowedItems.Get( focusedEntity ) );
+		}
+		else
+		{
+			SlotsIcon icon = GetFocusedSlotsIcon();
+			if (icon)
+			{
+				c = ClosableContainer.Cast(icon.GetContainer());
+			}
+		}
+		
+		if (c && c.IsDisplayable())	
+		{	
+			return true;
+		}
+
+		return false;
+	}
+
+	// mouse button UP or call from ExpandCollapseContainer
+	void ToggleContainer(Widget w)
+	{
+		EntityAI item;
+		SlotsIcon icon; 
+		ClosableContainer c;
+		w.GetUserData(icon);
+		if (icon)
+			item = icon.GetEntity();
+
+		if (item)
+			c = ClosableContainer.Cast(m_ShowedItems.Get(item));
+		else
+			c = ClosableContainer.Cast(icon.GetContainer());
+		
+		
+		if (c)
+			c.Toggle();
+
+		RecomputeOpenedContainers();
+	}
+	
+	void MouseClick(Widget w, int x, int y, int button)
+	{
+		ItemBase selectedItem;
+		SlotsIcon icon; 
+		w.GetUserData(icon);
+		if (icon)
+			selectedItem = ItemBase.Cast(icon.GetEntity());
+
+		if (selectedItem)
+		{
+			switch (button)
+			{
+				case MouseState.RIGHT:
+					#ifdef DIAG_DEVELOPER
+					if (GetDayZGame().IsLeftCtrlDown())
+						ShowActionMenu(selectedItem);
+					#endif
+					break;
+
+				case MouseState.MIDDLE:
+					InspectItem(selectedItem);
+					break;
+
+				case MouseState.LEFT:
+					if (g_Game.IsLeftCtrlDown())
+					{
+						PlayerBase controlledPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+						if (controlledPlayer.CanDropEntity(selectedItem))
+						{
+							if (selectedItem.GetTargetQuantityMax() < selectedItem.GetQuantity())
+								selectedItem.SplitIntoStackMaxClient(null, -1);
+							else
+								controlledPlayer.PhysicalPredictiveDropItem(selectedItem);
+	
+							ItemManager.GetInstance().SetWidgetDraggable(w, false);
+						}
+					}
+					break;
+			}
+		}
+	}
+	
+	SlotsIcon GetSlotsIcon( int row, int column )
+	{
+		return SlotsContainer.Cast( m_Container.Get( row ) ).GetSlotIcon( column );
+	}
+
+	void InitGhostSlots()
+	{
+		int row, column;
+		SlotsIcon icon;
+		bool has_cargo = m_ZombieEntity.GetInventory().GetCargo() != null;
+		
+		string config_path_ghosts_slots = "CfgVehicles ZombieBase InventoryEquipment playerSlots";
+		array<string> player_ghosts_slots = new array<string>();
+		GetGame().ConfigGetTextArray( config_path_ghosts_slots, player_ghosts_slots );
+		
+		for ( int i = 0; i < player_ghosts_slots.Count(); i++ )
+		{
+			string slot_name = player_ghosts_slots.Get ( i );
+			string path = "CfgSlots" + " " + slot_name;
+
+			if ( GetGame().ConfigIsExisting( path ) )
+			{
+				string icon_name; //icon_name must be in format "set:<setname> image:<imagename>"
+				GetGame().ConfigGetText( path + " ghostIcon", icon_name );
+				column = i % ITEMS_IN_ROW;
+
+				//START - GetWidgetSlot
+				row = i / ITEMS_IN_ROW;
+				if( row >= m_Container.Count() )
+				{
+					if ( has_cargo )
+					{
+						if( row < ( (player_ghosts_slots.Count() + 1 )/ ITEMS_IN_ROW ) )
+							AddSlotsContainer( ITEMS_IN_ROW );
+						else
+							AddSlotsContainer( ( player_ghosts_slots.Count() + 1 ) % ITEMS_IN_ROW );
+					
+					}
+					else
+					{
+						if ( row < ( player_ghosts_slots.Count() / ITEMS_IN_ROW ) )
+							AddSlotsContainer( ITEMS_IN_ROW );
+						else
+							AddSlotsContainer( player_ghosts_slots.Count() % ITEMS_IN_ROW );
+					}
+
+				}
+		
+				icon = GetSlotsIcon( row, column );
+				
+				icon.GetMainWidget().Show( true );
+				icon.Clear();
+				
+				WidgetEventHandler.GetInstance().RegisterOnDoubleClick( icon.GetPanelWidget(),  this, "DoubleClick" );
+				
+				//END - GetWidgetSlot
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetPanelWidget(),  this, "OnDropReceivedFromGhostArea" );
+				WidgetEventHandler.GetInstance().RegisterOnDropReceived( icon.GetGhostSlot(),  this, "OnDropReceivedFromGhostArea" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetPanelWidget(),  this, "DraggingOver" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetGhostSlot(),  this, "DraggingOver" );
+				WidgetEventHandler.GetInstance().RegisterOnDraggingOver( icon.GetPanelWidget(),  this, "DraggingOver" );
+				WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( icon.GetPanelWidget(),  this, "MouseClick" );
+				
+				icon.GetGhostSlot().LoadImageFile( 0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY,icon_name) );
+				//END - LoadIconIntoWidgetSlot
+
+				GetGame().ConfigGetText( path + " name", slot_name );
+				int slot_id = InventorySlots.GetSlotIdFromString( slot_name );
+				icon.SetSlotID( slot_id );
+				icon.SetSlotDisplayName(InventorySlots.GetSlotDisplayName(slot_id));
+				m_InventorySlots.Set( slot_id, icon );
+				
+				int slot = InventorySlots.GetSlotIdFromString( slot_name );
+				ItemBase item = ItemBase.Cast( m_ZombieEntity.GetInventory().FindAttachment( slot ) );
+				
+				if( item )
+					ItemAttached( item, slot_name );
+			}
+		}
+		
+		if( m_ZombieEntity.GetInventory().GetCargo() )
+		{
+			row = player_ghosts_slots.Count() / ITEMS_IN_ROW;
+			column = player_ghosts_slots.Count() % ITEMS_IN_ROW;
+			if( row >= m_Container.Count() )
+			{
+				if( row < ( player_ghosts_slots.Count() + 1 / ITEMS_IN_ROW ) )
+					AddSlotsContainer( ITEMS_IN_ROW );
+				else
+					AddSlotsContainer( ( player_ghosts_slots.Count() + 1 ) % ITEMS_IN_ROW );
+			}
+			
+			icon = GetSlotsIcon( row, column );
+			icon.GetMainWidget().Show( true );
+			icon.Clear();
+			icon.GetGhostSlot().LoadImageFile( 0, StaticGUIUtils.VerifyIconImageString(StaticGUIUtils.IMAGESETGROUP_INVENTORY,m_ZombieEntity.ConfigGetString("GUIInventoryCargoIcon")) );
+			icon.SetSlotDisplayName( m_ZombieEntity.ConfigGetString("GUIInventoryCargoName") );
+			icon.GetRadialIconPanel().Show( true );
+			icon.GetRadialIcon().Show( true );
+			
+			WidgetEventHandler.GetInstance().RegisterOnMouseButtonUp( icon.GetGhostSlot(), this, "ToggleContainer" );
+			m_CargoGrid = new ContainerWithCargo( this, false );
+			m_CargoGrid.SetEntity( m_ZombieEntity );
+			m_CargoGrid.GetHeader().GetMainWidget().ClearFlags( WidgetFlags.DRAGGABLE );
+			m_ShowedItems.Insert( m_ZombieEntity, m_CargoGrid );
+			icon.SetContainer(m_CargoGrid);
+		}
+		
+		RecomputeOpenedContainers();
+	}
+
+	void AddSlotsContainer( int row_count )
+	{
+		ref SlotsContainer s_cont = new SlotsContainer( m_Container, m_ZombieEntity );
+		s_cont.SetColumnCount( row_count );
+		m_Container.Insert( s_cont );
+	}
+
+	Widget GetWidgetSlot( int slot_number )
+	{
+		int row = slot_number / ITEMS_IN_ROW;
+		int column = slot_number % ITEMS_IN_ROW;
+
+		return m_Container.Get( row ).GetMainWidget().FindAnyWidget( "Render" + column );
+	}
+	
+	void DoubleClick(Widget w, int x, int y, int button)
+	{
+		if( button == MouseState.LEFT && !g_Game.IsLeftCtrlDown())
+		{
+			if( w == null )
+			{
+				return;
+			}
+			ItemPreviewWidget iw = ItemPreviewWidget.Cast( w.FindAnyWidget( "Render" ) );
+			if( !iw )
+			{
+				string name = w.GetName();
+				name.Replace( "PanelWidget", "Render" );
+				iw = ItemPreviewWidget.Cast( w.FindAnyWidget( name ) );
+			} 
+			
+			if( !iw )
+			{
+				iw = ItemPreviewWidget.Cast( w );
+			}
+			
+			ItemBase item = ItemBase.Cast( iw.GetItem() );
+			if( !item )
+			{
+				return;
+			}
+			
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			
+			if( player.GetInventory().HasInventoryReservation( item, null ) || player.IsItemsToDelete() )
+			{
+				return;
+			}
+			
+			if( !item.GetInventory().CanRemoveEntity() )
+				return;
+					
+			if ( player.GetInventory().HasEntityInInventory( item ) && GetGame().GetPlayer().GetHumanInventory().CanAddEntityInHands( item ) )
+			{
+				player.PredictiveTakeEntityToHands( item );
+			}
+			else
+			{
+				InventoryLocation il = new InventoryLocation;
+				if( player.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.ANY, il) )
+				{
+					if( item.GetTargetQuantityMax(il.GetSlot()) < item.GetQuantity() )
+						item.SplitIntoStackMaxToInventoryLocationClient( il );
+					else
+						player.PredictiveTakeEntityToInventory( FindInventoryLocationType.ANY, item );
+				}
+				else if( GetGame().GetPlayer().GetHumanInventory().CanAddEntityInHands( item ) )
+				{
+					if( item.GetTargetQuantityMax() < item.GetQuantity() )
+						item.SplitIntoStackMaxHandsClient( player );
+					else
+						player.PredictiveTakeEntityToHands( item );
+				}
+			}
+			
+			HideOwnedTooltip();
+			InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu( MENU_INVENTORY ) );
+			if( menu )
+			{
+				menu.RefreshQuickbar();
+			}
+		}
+	}
+
+	override void CollapseButtonOnMouseButtonDown(Widget w)
+	{
+		super.CollapseButtonOnMouseButtonDown(w);
+	}
+	
+	override bool SplitItem()
+	{
+		if ( CanSplit() )
+		{
+			if ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+			{
+				return GetFocusedContainer().SplitItem();
+			}
+		}
+		return false;
+	}
+	
+	override bool EquipItem()
+	{
+		if (CanEquip())
+		{	
+			if ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+			{
+				return GetFocusedContainer().EquipItem();
+			}
+			else
+			{
+				EntityAI item = GetFocusedItem();
+				if( item )
+				{
+					GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.ATTACHMENT, item );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool TransferItem()
+	{
+		LeftArea left_area = LeftArea.Cast( GetParent() );
+		EntityAI item;
+		if (CanTakeToInventory())
+		{
+			
+			if (left_area)
+			{
+				if (GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ))
+				{
+					return GetFocusedContainer().TransferItem();
+				}
+				else
+				{
+					item = GetFocusedItem();
+					if( item )
+					{
+						GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, item );
+						return true;
+					}
+				}
+			}
+			else
+			{
+				if (!GetFocusedContainer().IsInherited( ContainerWithCargo ) && !GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ))
+				{
+					item = GetFocusedItem();
+					if (item)
+					{
+						GetGame().GetPlayer().PredictiveTakeEntityToInventory( FindInventoryLocationType.CARGO, item );
+						return true;
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool Select()
+	{
+		if( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+		{
+			return GetFocusedContainer().Select();
+		}
+		else
+		{
+			SlotsIcon selected_slot = ItemManager.GetInstance().GetSelectedIcon();
+			EntityAI focused_item = GetFocusedItem();
+			EntityAI selected_item = ItemManager.GetInstance().GetSelectedItem();
+			if( !(selected_slot && selected_slot.IsOutOfReach() ) )
+			{
+				if( selected_item )
+				{
+					if( selected_item != focused_item)
+					{
+						if( selected_item.GetInventory().CanRemoveEntity() )
+						{
+							GetGame().GetPlayer().PredictiveTakeEntityToTargetInventory( m_ZombieEntity, FindInventoryLocationType.ANY, selected_item );
+							ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+							return true;
+						}
+					}
+				}
+				else
+				{
+					if( focused_item && focused_item.GetInventory().CanRemoveEntity() )
+					{
+						EntityAI item_in_hands = GetGame().GetPlayer().GetHumanInventory().GetEntityInHands();
+						if( item_in_hands && item_in_hands.GetInventory().CanRemoveEntity() )
+						{
+							if( GameInventory.CanSwapEntitiesEx( item_in_hands, focused_item ) )
+							{
+								GetGame().GetPlayer().PredictiveSwapEntities( item_in_hands, focused_item );
+								return true;
+							}
+							else
+							{
+								InventoryLocation il_hands_dst = new InventoryLocation;
+								if( GetGame().GetPlayer().GetHumanInventory().FindFreeLocationFor( item_in_hands, FindInventoryLocationType.ANY, il_hands_dst ) )
+								{
+									InventoryMode invMode = InventoryMode.PREDICTIVE;
+						
+									if ( GetGame().GetPlayer().NeedInventoryJunctureFromServer(item_in_hands, item_in_hands.GetHierarchyParent(), il_hands_dst.GetParent()) || GetGame().GetPlayer().NeedInventoryJunctureFromServer(focused_item, focused_item.GetHierarchyParent(), GetGame().GetPlayer()) )
+										invMode = InventoryMode.JUNCTURE;
+									
+									GetGame().GetPlayer().GetHumanInventory().ForceSwapEntities( InventoryMode.JUNCTURE, focused_item, item_in_hands, il_hands_dst );
+									return true;
+								}
+							}
+						}
+						else
+						{
+							if( GetGame().GetPlayer().GetHumanInventory().CanAddEntityInHands( focused_item ) )
+							{
+								GetGame().GetPlayer().PredictiveTakeEntityToHands( focused_item );
+								return true;
+							}
+						}
+					}
+				}
+			}
+		}
+		return false;
+	}
+	
+	override bool TransferItemToVicinity()
+	{
+		if (CanDrop())
+		{
+			if ( GetFocusedContainer().IsInherited( ContainerWithCargo ) || GetFocusedContainer().IsInherited( ContainerWithCargoAndAttachments ) )
+			{
+				return GetFocusedContainer().TransferItemToVicinity();
+			}
+			else
+			{
+				Man player = GetGame().GetPlayer();
+				ItemBase item = ItemBase.Cast( GetFocusedItem() );
+				if( item && player.CanDropEntity( item ) )
+				{
+					if( item.GetTargetQuantityMax() < item.GetQuantity() )
+						item.SplitIntoStackMaxClient( null, -1 );
+					else
+						player.PhysicalPredictiveDropItem( item );
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/Inventory.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inventory.c
new file mode 100644
index 0000000000000000000000000000000000000000..e571b572730904d7cb3150c1a91502e5b7b678f9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/Inventory.c
@@ -0,0 +1,1650 @@
+#ifdef PLATFORM_CONSOLE
+enum ConsoleActionToolbarMask
+{
+	EMPTY					= 0,
+	TO_HANDS_SWAP_VICINITY	= 1,
+	TO_HANDS_SWAP_INVENTORY	= 2,
+	DROP					= 4,
+	EQUIP					= 8,
+	SPLIT					= 16,
+	TO_INVENTORY			= 32,
+	OPEN_CLOSE_CONTAINER	= 64,
+	MICROMANAGMENT			= 128,
+	QUICKSLOT				= 256,
+	COMBINE					= 512,
+}
+#endif
+
+enum Direction
+{
+	RIGHT,
+	LEFT,
+	UP,
+	DOWN
+}
+
+class Inventory: LayoutHolder
+{
+	protected ref LeftArea					m_LeftArea;
+	protected ref RightArea					m_RightArea;
+	protected ref HandsArea					m_HandsArea;
+	protected ref PlayerPreview				m_PlayerPreview;
+	protected ref InventoryQuickbar			m_Quickbar;
+	
+	protected Widget						m_QuickbarWidget;
+	protected Widget						m_SpecializationPanel;
+	protected Widget						m_SpecializationIcon;
+	protected Widget						m_TopConsoleToolbarVicinity;
+	protected Widget						m_TopConsoleToolbarHands;
+	protected Widget						m_TopConsoleToolbarEquipment;
+	protected Widget						m_BottomConsoleToolbar;
+	protected RichTextWidget				m_BottomConsoleToolbarRichText;
+
+	protected ref ContextMenu				m_ContextMenu;
+	protected static ref map<string, int>	m_PlayerAttachmentsIndexes;
+	
+	protected bool							m_HadFastTransferred;
+	protected bool							m_HadInspected;
+	protected bool							m_NeedUpdateConsoleToolbar;
+	
+	protected static Inventory				m_Instance;
+	
+	protected int							m_ControllerAngle;
+	protected int							m_ControllerTilt;
+	protected bool							m_ControllerRightStickTimerEnd = true;
+	protected ref Timer						m_ControllerRightStickTimer;
+	
+	protected bool							m_HoldingQB;
+	protected InventoryItem					m_QBHoveredItems;
+	
+	////////////////////
+	const float BT_REPEAT_DELAY = 0.35;		//delay from first press to begin tick repeat state
+	const float BT_REPEAT_TIME = 0.09;		//tick repeat frequency time
+	const float BT_THRESHOLD_VALUE = 0.8;	//threshold values for analog inputs
+	const int INV_MOV_LEFT = 0;
+	const int INV_MOV_RIGHT = 1;
+	const int INV_MOV_UP = 2;
+	const int INV_MOV_DOWN = 3;
+	protected ref array<string> m_InvInputNames = {"UAUILeftInventory","UAUIRightInventory","UAUIUpInventory","UAUIDownInventory"};
+	protected ref array<UAIDWrapper> m_InvInputWrappers;
+	protected ref array<float> m_InvInputTimes;
+	protected int m_InvInputWrappersCount;
+	protected float m_SensitivityThreshold = 0.0;
+	UAInput m_InvUAInput;
+	int m_InvInputActive = 0;
+	
+	void Inventory(LayoutHolder parent)
+	{
+		m_Instance = this;
+		LoadPlayerAttachmentIndexes();
+		
+		m_ControllerRightStickTimer = new Timer();
+		new ItemManager(GetMainWidget());
+		new ColorManager();
+		
+		m_LeftArea			= new LeftArea(this);
+		m_RightArea 		= new RightArea(this);
+		m_HandsArea 		= new HandsArea(this);
+		m_PlayerPreview		= new PlayerPreview(this);
+
+		m_QuickbarWidget	= GetMainWidget().FindAnyWidget("QuickbarGrid");
+		m_Quickbar 			= new InventoryQuickbar(m_QuickbarWidget);
+		m_Quickbar.UpdateItems(m_QuickbarWidget);
+		
+		m_SpecializationPanel = GetMainWidget().FindAnyWidget("SpecializationPanelPanel");
+		m_SpecializationIcon = GetMainWidget().FindAnyWidget("SpecializationIcon");
+		
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived(GetMainWidget().FindAnyWidget("LeftBackground"), this, "OnLeftPanelDropReceived");
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver(GetMainWidget().FindAnyWidget("LeftBackground"), this, "DraggingOverLeftPanel");
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived(GetMainWidget().FindAnyWidget("LeftPanel").FindAnyWidget("Scroller"), this, "OnLeftPanelDropReceived");
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver(GetMainWidget().FindAnyWidget("LeftPanel").FindAnyWidget("Scroller"), this, "DraggingOverLeftPanel");
+		
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived(GetMainWidget().FindAnyWidget("RightBackground"), this, "OnRightPanelDropReceived");
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver(GetMainWidget().FindAnyWidget("RightBackground"), this, "DraggingOverRightPanel");
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived(GetMainWidget().FindAnyWidget("RightPanel").FindAnyWidget("Scroller"), this, "OnRightPanelDropReceived");
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver(GetMainWidget().FindAnyWidget("RightPanel").FindAnyWidget("Scroller"), this, "DraggingOverRightPanel");
+		
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived(GetMainWidget().FindAnyWidget("CharacterPanel"), this, "OnCenterPanelDropReceived");
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver(GetMainWidget().FindAnyWidget("CharacterPanel"), this, "DraggingOverCenterPanel");
+		
+		WidgetEventHandler.GetInstance().RegisterOnDropReceived(GetMainWidget().FindAnyWidget("HandsPanel"), this, "OnHandsPanelDropReceived");
+		WidgetEventHandler.GetInstance().RegisterOnDraggingOver(GetMainWidget().FindAnyWidget("HandsPanel"), this, "DraggingOverHandsPanel");
+		
+		#ifdef PLATFORM_CONSOLE
+		PluginDiagMenu plugin_diag_menu = PluginDiagMenu.Cast(GetPlugin(PluginDiagMenu));
+		GetGame().GetUIManager().ShowUICursor(false);
+		ResetFocusedContainers();
+		GetMainWidget().FindAnyWidget("CursorCharacter").Show(false);
+
+		//console inventory toolbar
+		m_TopConsoleToolbarVicinity		= GetRootWidget().FindAnyWidget("LBRB_Vicinity");
+		m_TopConsoleToolbarHands		= GetRootWidget().FindAnyWidget("LBRB_Hands");
+		m_TopConsoleToolbarEquipment	= GetRootWidget().FindAnyWidget("LBRB_Equipment");
+
+		RichTextWidget.Cast(m_TopConsoleToolbarVicinity.FindAnyWidget("LBRB_Vicinity_LBIcon")).SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIInventoryTabLeft", "", EUAINPUT_DEVICE_CONTROLLER));
+		RichTextWidget.Cast(m_TopConsoleToolbarVicinity.FindAnyWidget("LBRB_Vicinity_RBIcon")).SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIInventoryTabRight", "", EUAINPUT_DEVICE_CONTROLLER));
+		RichTextWidget.Cast(m_TopConsoleToolbarHands.FindAnyWidget("LBRB_Hands_LBIcon")).SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIInventoryTabLeft", "", EUAINPUT_DEVICE_CONTROLLER));
+		RichTextWidget.Cast(m_TopConsoleToolbarHands.FindAnyWidget("LBRB_Hands_RBIcon")).SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIInventoryTabRight", "", EUAINPUT_DEVICE_CONTROLLER));
+		RichTextWidget.Cast(m_TopConsoleToolbarEquipment.FindAnyWidget("LBRB_Equipment_LBIcon")).SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIInventoryTabLeft", "", EUAINPUT_DEVICE_CONTROLLER));
+		RichTextWidget.Cast(m_TopConsoleToolbarEquipment.FindAnyWidget("LBRB_Equipment_RBIcon")).SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIInventoryTabRight", "", EUAINPUT_DEVICE_CONTROLLER));
+		
+		m_BottomConsoleToolbar			= GetRootWidget().FindAnyWidget("BottomConsoleToolbar");
+		m_BottomConsoleToolbarRichText	= RichTextWidget.Cast(GetRootWidget().FindAnyWidget("ContextToolbarText"));
+		
+		m_NeedUpdateConsoleToolbar = false;
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		
+		m_SpecializationPanel.Show(false);
+		UpdateConsoleToolbar();
+		InitInputWrapperData();
+		#endif
+	}
+	
+	void InitInputWrapperData()
+	{
+		int namesCount = m_InvInputNames.Count();
+		m_InvInputWrappers = new array<UAIDWrapper>;
+		m_InvInputTimes = new array<float>;
+		
+		for (int i = 0; i < namesCount; i++)
+		{
+			m_InvInputWrappers.Insert(GetUApi().GetInputByName(m_InvInputNames[i]).GetPersistentWrapper());
+			m_InvInputTimes.Insert(0);
+		}
+		
+		m_InvInputWrappersCount = m_InvInputWrappers.Count();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateConsoleToolbar();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		switch (pInputDeviceType)
+		{
+			case EInputDeviceType.CONTROLLER:
+				m_BottomConsoleToolbar.Show(true);
+				UpdateConsoleToolbar();
+				break;
+	
+			default:
+				if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+				{
+					m_BottomConsoleToolbar.Show(false);
+					m_TopConsoleToolbarVicinity.Show(false);
+					m_TopConsoleToolbarHands.Show(false);
+					m_TopConsoleToolbarEquipment.Show(false);
+				}
+				break;
+		}
+	}
+	
+	static Inventory GetInstance()
+	{
+		return m_Instance;
+	}
+	
+	void Serialize()
+	{
+		ItemManager.GetInstance().SerializeDefaultOpenStates();
+		ItemManager.GetInstance().SerializeDefaultHeaderOpenStates();
+	}
+
+	void Deserialize()
+	{
+		ItemManager.GetInstance().DeserializeDefaultOpenStates();
+		ItemManager.GetInstance().DeserializeDefaultHeaderOpenStates();
+	}
+
+	static int GetPlayerAttachmentIndex(string slot_name)
+	{
+		return m_PlayerAttachmentsIndexes[slot_name];
+	}
+	
+	static int GetPlayerAttachmentIndex(int slot_id)
+	{
+		return GetPlayerAttachmentIndex(InventorySlots.GetSlotName(slot_id));
+	}
+	
+	protected void LoadPlayerAttachmentIndexes()
+	{
+		int i;		
+		string data, errorMessage;
+		
+		m_PlayerAttachmentsIndexes = new map<string, int>();
+
+		if (GetGame().GetProfileString("INV_AttIndexes", data))
+		{
+			if (!JsonFileLoader<map<string, int>>.LoadData(data, m_PlayerAttachmentsIndexes, errorMessage))
+				ErrorEx(errorMessage);
+		}
+		
+		string configPathGhostSlots = "CfgVehicles SurvivorBase InventoryEquipment playerSlots";
+		array<string> playerGhostSlots = new array<string>();
+		GetGame().ConfigGetTextArray(configPathGhostSlots, playerGhostSlots);
+		
+		foreach (string slotName : playerGhostSlots)
+		{
+			slotName.Replace("Slot_", "");
+			if (!m_PlayerAttachmentsIndexes.Contains(slotName) && InventorySlots.GetSlotIdFromString(slotName) != -1)
+			{
+				m_PlayerAttachmentsIndexes.Insert(slotName, m_PlayerAttachmentsIndexes.Count());
+			}
+		}
+		
+		if (!JsonFileLoader<map<string, int>>.MakeData(m_PlayerAttachmentsIndexes, data, errorMessage))
+			ErrorEx(errorMessage);
+
+		GetGame().SetProfileString("INV_AttIndexes", data);
+	}
+	
+	static void MoveAttachmentUp(int slot_id)
+	{
+		int curr			= GetPlayerAttachmentIndex(slot_id);
+		
+		int next_offset		= 0;
+		string next_item	= "init";
+		int next_id;
+		EntityAI next_ent;
+		
+		while(!next_ent && next_item != "")
+		{
+			next_item		= m_PlayerAttachmentsIndexes.GetKeyByValue(curr + --next_offset);
+		 	next_id			= InventorySlots.GetSlotIdFromString(next_item);
+			next_ent		= GetGame().GetPlayer().GetInventory().FindAttachment(next_id);
+			if (next_ent && !m_Instance.m_RightArea.HasEntityContainerVisible(next_ent))
+				next_ent	= null;
+		}
+		
+		if (next_item != "" && next_ent)
+		{
+			int next = GetPlayerAttachmentIndex(next_item);
+			m_PlayerAttachmentsIndexes.Set(InventorySlots.GetSlotName(slot_id), next);
+			m_PlayerAttachmentsIndexes.Set(next_item, curr);
+			if (m_Instance)
+				m_Instance.m_RightArea.SwapItemsInOrder(next_id, slot_id);
+		}
+	}
+	
+	static void MoveAttachmentDown(int slot_id)
+	{
+		int curr			= GetPlayerAttachmentIndex(slot_id);
+		
+		int next_offset		= 0;
+		string next_item	= "init";
+		int next_id;
+		EntityAI next_ent;
+		
+		while(!next_ent && next_item != "")
+		{
+			next_item		= m_PlayerAttachmentsIndexes.GetKeyByValue(curr + ++next_offset);
+		 	next_id			= InventorySlots.GetSlotIdFromString(next_item);
+			next_ent		= GetGame().GetPlayer().GetInventory().FindAttachment(next_id);
+			if (next_ent && !m_Instance.m_RightArea.HasEntityContainerVisible(next_ent))
+				next_ent	= null;
+		}
+		
+		if (next_item != "" && next_ent)
+		{
+			int next = GetPlayerAttachmentIndex(next_item);
+			m_PlayerAttachmentsIndexes.Set(InventorySlots.GetSlotName(slot_id), next);
+			m_PlayerAttachmentsIndexes.Set(next_item, curr);
+			if (m_Instance)
+				m_Instance.m_RightArea.SwapItemsInOrder(next_id, slot_id);
+		}
+	}
+
+	protected int GetProperControllerStickAngle(int angle)
+	{
+		int proper_angle = (360 - angle) % 360;
+		return proper_angle;
+	}
+
+	protected int AngleToDirection(int angle)
+	{
+		if (angle < 45 || angle > 315)
+		{
+			return Direction.RIGHT;
+		}
+		else if (angle < 135 && angle > 45)
+		{
+			return Direction.DOWN;
+		}
+		else if (angle < 225 && angle > 135)
+		{
+			return Direction.LEFT;
+		}
+		else if (angle < 315 && angle > 225)
+		{
+			return Direction.UP;
+		}
+		return -1;
+	}
+
+	void TimerEnd()
+	{
+		m_ControllerRightStickTimerEnd = true;
+		m_ControllerRightStickTimer.Stop();
+	}
+
+	bool Controller(Widget w, int control, int value)
+	{
+		#ifdef PLATFORM_CONSOLE
+		
+		//Right stick
+		if (control == ControlID.CID_RADIALMENU)
+		{
+			m_ControllerAngle 	= value >> 4; 	// <0,360>
+			m_ControllerTilt	= value & 0xF; 	// <0,10>
+
+			m_ControllerAngle = GetProperControllerStickAngle(m_ControllerAngle);
+
+			m_ControllerAngle = AngleToDirection(m_ControllerAngle);
+
+			if (m_ControllerTilt>5)
+			{
+				if (m_ControllerRightStickTimerEnd)
+				{
+					m_ControllerRightStickTimerEnd = false;
+					m_ControllerRightStickTimer.Run(0.1, this, "TimerEnd");
+				}
+			}
+			return true;
+		}
+		
+		UpdateConsoleToolbar();
+		#endif
+		return false;
+	}
+
+	void DraggingOverHandsPanel(Widget w, int x, int y, Widget receiver)
+	{
+		ItemManager.GetInstance().HideDropzones();
+		m_HandsArea.DraggingOverHandsPanel(w, x, y, receiver);
+	}
+	
+	void OnHandsPanelDropReceived(Widget w, int x, int y, Widget receiver)
+	{
+		m_HandsArea.OnHandsPanelDropReceived(w, x, y, receiver);
+	}
+
+	void OnLeftPanelDropReceived(Widget w, int x, int y, Widget receiver)
+	{
+		m_LeftArea.OnLeftPanelDropReceived(w, x, y, receiver);
+	}
+
+	void OnRightPanelDropReceived(Widget w, int x, int y, Widget receiver)
+	{
+		if (w)
+		{
+			ItemPreviewWidget ipw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+			if (!ipw)
+			{
+				string name = w.GetName();
+				name.Replace("PanelWidget", "Render");
+				ipw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+				if (!ipw)
+				{
+					ipw = ItemPreviewWidget.Cast(w);
+					if (!ipw)
+					{
+						return;
+					}
+				}
+			}
+	
+			EntityAI item = ipw.GetItem();
+			if (item)
+			{
+				PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+				InventoryLocation il = new InventoryLocation;
+				if (player && player.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.CARGO | FindInventoryLocationType.ATTACHMENT, il))
+				{
+					SplitItemUtils.TakeOrSplitToInventory(player, player, item);
+				}
+			}
+		}
+	}
+	
+	void OnCenterPanelDropReceived(Widget w, int x, int y, Widget receiver)
+	{
+		if (w)
+		{
+			ItemPreviewWidget ipw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+			if (!ipw)
+			{
+				string name = w.GetName();
+				name.Replace("PanelWidget", "Render");
+				ipw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+				if (!ipw)
+				{
+					ipw = ItemPreviewWidget.Cast(w);
+					if (!ipw)
+					{
+						return;
+					}
+				}
+			}
+	
+			EntityAI item = ipw.GetItem();
+			if (item)
+			{
+				if (!item.GetInventory().CanRemoveEntity())
+					return;
+				PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+				
+				bool found = false;
+				
+				InventoryLocation inv_loc = new InventoryLocation;
+				
+				if (player)
+				{
+					int index = player.GetHumanInventory().FindUserReservedLocationIndex(item);
+					if (index>=0)
+					{
+						player.GetHumanInventory().GetUserReservedLocation(index, inv_loc);
+						if (player.GetInventory().LocationCanAddEntity(inv_loc))
+						{
+							SplitItemUtils.TakeOrSplitToInventoryLocation(player, inv_loc);
+						}
+						return;
+					}
+					
+				}	
+						
+				if (player && (player.GetInventory().CanAddAttachment(item)))
+				{
+					float stackable = item.GetTargetQuantityMax(-1);
+		
+					if (stackable == 0 || stackable >= item.GetQuantity())
+					{
+						player.PredictiveTakeEntityAsAttachment(item);
+					}
+					else
+					{
+						InventoryLocation il = new InventoryLocation;
+						player.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.ATTACHMENT, il);
+						ItemBase.Cast(item).SplitIntoStackMaxToInventoryLocationClient(il);
+					}
+				}
+				else
+				{
+					int slot_id = item.GetInventory().GetSlotId(0);
+					EntityAI slot_item = player.GetInventory().FindAttachment(slot_id);
+					if (slot_item && player.GetInventory().CanSwapEntitiesEx(item, slot_item))
+					{
+						player.PredictiveSwapEntities(item, slot_item);
+					}
+					else if (player.CanReceiveItemIntoCargo(item))
+					{
+						InventoryLocation dst = new InventoryLocation;
+						player.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.ANY, dst);
+						if (dst.IsValid())
+						{						
+							if (dst.GetType() == InventoryLocationType.HANDS && item.IsHeavyBehaviour())
+							{											
+								ActionManagerClient mngr_client;
+								CastTo(mngr_client, player.GetActionManager());
+			
+								ActionTarget atrg = new ActionTarget(item, null, -1, vector.Zero, -1.0);
+								if (mngr_client.GetAction(ActionTakeItemToHands).Can(player, atrg, null))
+									mngr_client.PerformActionStart(mngr_client.GetAction(ActionTakeItemToHands), atrg, null);
+								
+								return;
+							}
+							
+							SplitItemUtils.TakeOrSplitToInventoryLocation(player, dst);
+						}
+					}
+				}
+			}
+		}
+	}
+
+	void DraggingOverLeftPanel(Widget w, int x, int y, Widget receiver)
+	{
+		m_LeftArea.DraggingOverHeader(w, x, y, receiver);
+	}
+
+	void DraggingOverRightPanel(Widget w, int x, int y, Widget receiver)
+	{
+		m_RightArea.DraggingOverHeader(w, x, y, receiver);
+	}
+	
+	void DraggingOverCenterPanel(Widget w, int x, int y, Widget receiver)
+	{
+		if (w)
+		{
+			ItemPreviewWidget ipw = ItemPreviewWidget.Cast(w.FindAnyWidget("Render"));
+			if (!ipw)
+			{
+				string name = w.GetName();
+				name.Replace("PanelWidget", "Render");
+				ipw = ItemPreviewWidget.Cast(w.FindAnyWidget(name));
+				if (!ipw)
+				{
+					ipw = ItemPreviewWidget.Cast(w);
+					if (!ipw)
+					{
+						return;
+					}
+				}
+			}
+			
+			EntityAI item = ipw.GetItem();
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			
+			if (player && item)
+			{
+				int slot_id = item.GetInventory().GetSlotId(0);
+				EntityAI slot_item = player.GetInventory().FindAttachment(slot_id);
+				bool found = false;
+				
+				InventoryLocation inv_loc = new InventoryLocation;
+				
+				int index = player.GetHumanInventory().FindUserReservedLocationIndex(item);
+				if (index>=0)
+				{
+					player.GetHumanInventory().GetUserReservedLocation(index, inv_loc);
+					if (player.GetInventory().LocationCanAddEntity(inv_loc))
+					found = true;
+				}
+				
+				if (!found)
+				{
+					player.GetInventory().FindFreeLocationFor(item, FindInventoryLocationType.ANY, inv_loc);
+				}
+				
+				
+				if (inv_loc.IsValid())
+				{
+					ItemManager.GetInstance().HideDropzones();
+					GetMainWidget().FindAnyWidget("RightPanel").FindAnyWidget("DropzoneX").SetAlpha(1);
+					if (inv_loc.GetType() == 4)
+					{
+						ItemManager.GetInstance().HideDropzones();
+						GetMainWidget().FindAnyWidget("HandsPanel").FindAnyWidget("DropzoneX").SetAlpha(1);
+					}
+		
+					ColorManager.GetInstance().SetColor(w, ColorManager.GREEN_COLOR);
+				}
+				else
+				{
+					ItemManager.GetInstance().ShowSourceDropzone(item);
+					ColorManager.GetInstance().SetColor(w, ColorManager.RED_COLOR);
+				}
+			}
+			else
+			{
+				ColorManager.GetInstance().SetColor(w, ColorManager.RED_COLOR);
+			}
+		}
+	}
+
+	void Update(float timeslice)
+	{
+		#ifdef PLATFORM_CONSOLE
+		//inventory grid movement
+		InventoryMovementButtonTickHandler(timeslice);
+		
+		if (m_InvInputActive & (1 << INV_MOV_RIGHT))
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			if (!GetUApi().GetInputByID(UAUIInventoryTabRight).LocalValue())
+			{
+				if (m_RightArea.IsActive())
+					m_RightArea.MoveGridCursor(Direction.RIGHT);
+				if (m_LeftArea.IsActive())
+					m_LeftArea.MoveGridCursor(Direction.RIGHT);
+				if (m_HandsArea.IsActive())
+					m_HandsArea.MoveGridCursor(Direction.RIGHT);
+			}
+		}
+		else if (m_InvInputActive & (1 << INV_MOV_LEFT))
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			if (!GetUApi().GetInputByID(UAUIInventoryTabLeft).LocalValue())
+			{
+				if (m_RightArea.IsActive())
+					m_RightArea.MoveGridCursor(Direction.LEFT);
+				if (m_LeftArea.IsActive())
+					m_LeftArea.MoveGridCursor(Direction.LEFT);
+				if (m_HandsArea.IsActive())
+					m_HandsArea.MoveGridCursor(Direction.LEFT);
+			}
+		}
+		else if (m_InvInputActive & (1 << INV_MOV_UP))
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			if (!GetUApi().GetInputByID(UAUIInventoryContainerUp).LocalValue())
+			{
+				if (m_RightArea.IsActive())
+					m_RightArea.MoveGridCursor(Direction.UP);
+				if (m_LeftArea.IsActive())
+					m_LeftArea.MoveGridCursor(Direction.UP);
+				if (m_HandsArea.IsActive())
+					m_HandsArea.MoveGridCursor(Direction.UP);
+			}
+		}
+		else if (m_InvInputActive & (1 << INV_MOV_DOWN))
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			if (!GetUApi().GetInputByID(UAUIInventoryContainerDown).LocalValue())
+			{
+				if (m_RightArea.IsActive())
+					m_RightArea.MoveGridCursor(Direction.DOWN);
+				if (m_LeftArea.IsActive())
+					m_LeftArea.MoveGridCursor(Direction.DOWN);
+				if (m_HandsArea.IsActive())
+					m_HandsArea.MoveGridCursor(Direction.DOWN);
+			}
+		}
+		
+		m_InvInputActive = 0;
+		#endif
+		
+		UpdateInterval();
+	}
+	
+	UAInput m_InpInp = null;
+	override void UpdateInterval()
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		InventoryItem item;
+		if (GetUApi().GetInputByID(UAUIRotateInventory).LocalPress())
+		{
+			item = InventoryItem.Cast(ItemManager.GetInstance().GetDraggedItem());
+			if (item)
+			{
+				int size_x, size_y;
+				GetGame().GetInventoryItemSize(item, size_x, size_y);
+				if (size_x != size_y)
+				{
+					item.GetInventory().FlipCargo();
+					item.GetOnItemFlipped().Invoke(item.GetInventory().GetFlipCargo());
+				}
+			}
+		}
+		
+		#ifdef PLATFORM_CONSOLE
+		DayZPlayerInventory dpi;
+		if (player)
+			dpi = player.GetDayZPlayerInventory();
+		
+		// There's a second one a bit below
+		if (dpi && !dpi.IsProcessing())
+		{
+			if (GetUApi().GetInputByID(UAUIExpandCollapseContainer).LocalPress())
+			{
+				if (m_RightArea.IsActive())
+				{
+					m_RightArea.ExpandCollapseContainer();
+				}
+				else if (m_LeftArea.IsActive())
+				{
+					m_LeftArea.ExpandCollapseContainer();
+				}
+			}
+			
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalHoldBegin())
+			{
+				EnableMicromanagement();
+			}
+			
+			if (GetUApi().GetInputByID(UAUISplit).LocalPress())
+			{
+				if (m_HandsArea.IsActive())
+				{
+					if (m_HandsArea.SplitItem())
+					{
+						m_HandsArea.SetActive(false);
+						m_HandsArea.UnfocusGrid();
+						m_RightArea.SetActive(true);
+					}
+				}
+				else if (m_RightArea.IsActive())
+				{
+					m_RightArea.SplitItem();
+				}
+				else if (m_LeftArea.IsActive())
+				{
+					m_LeftArea.SplitItem();
+				}
+				
+				HideOwnedTooltip();
+			}
+			
+			if (GetUApi().GetInputByID(UAUIFastEquip).LocalPress())
+			{
+				if (m_HandsArea.IsActive())
+				{
+					if (m_HandsArea.EquipItem())
+					{
+						m_HandsArea.SetActive(false);
+						m_HandsArea.UnfocusGrid();
+						m_RightArea.SetActive(true);
+					}
+				}
+				else if (m_RightArea.IsActive())
+				{
+					m_RightArea.EquipItem();
+				}
+				else if (m_LeftArea.IsActive())
+				{
+					m_LeftArea.EquipItem();
+				}
+				
+				UpdateConsoleToolbar();
+				HideOwnedTooltip();
+			}
+			
+			if (ItemManager.GetInstance().IsMicromanagmentMode() && GetUApi().GetInputByID(UAUIDragNDrop).LocalRelease())
+			{
+				if (m_RightArea.IsActive())
+				{
+					m_RightArea.Select();
+				}
+				else if (m_LeftArea.IsActive())
+				{
+					m_LeftArea.Select();
+				}
+				else if (m_HandsArea.IsActive())
+				{
+					m_HandsArea.Select();
+				}
+				
+				DisableMicromanagement();
+				UpdateConsoleToolbar();
+			}
+			if (GetUApi().GetInputByID(UAUIPutInHandsFromVicinity).LocalPress())
+			{
+				if (m_LeftArea.IsActive())
+				{
+					if (m_LeftArea.Select())
+					{
+						m_LeftArea.SetActive(false);
+						m_LeftArea.UnfocusGrid();
+						m_HandsArea.SetActive(true);
+						
+						UpdateConsoleToolbar();
+					}
+				}
+			}
+			if (GetUApi().GetInputByID(UAUIPutInHandsFromInventory).LocalPress())
+			{
+				if (m_RightArea.IsActive())
+				{
+					if (m_RightArea.Select())
+					{
+						m_RightArea.SetActive(false);
+						m_RightArea.UnfocusGrid();
+						m_HandsArea.SetActive(true);
+						
+						UpdateConsoleToolbar();
+					}
+				}
+			}
+			
+			if (GetUApi().GetInputByID(UAUIFastTransferToVicinity).LocalPress()) //item drop
+			{
+				if (m_HandsArea.IsActive())
+				{
+					item = InventoryItem.Cast(m_HandsArea.GetFocusedItem());
+					if (item && item.GetInventory().CanRemoveEntity())
+					{
+						if (m_HandsArea.TransferItemToVicinity())
+						{
+							m_HandsArea.SetActive(false);
+							m_HandsArea.UnfocusGrid();
+							m_LeftArea.SetActive(true);
+							m_HadFastTransferred = true;
+						}
+					}
+				}
+				else if (m_RightArea.IsActive())
+				{
+					item = InventoryItem.Cast(m_RightArea.GetFocusedItem());
+					if (item && item.GetInventory().CanRemoveEntity())
+					{
+						if (m_RightArea.TransferItemToVicinity())
+							m_HadFastTransferred = true;
+					}
+				}
+				
+				UpdateConsoleToolbar();
+				HideOwnedTooltip();
+			}
+		}
+		
+		if (GetUApi().GetInputByID(UAUIInspectItem).LocalPress())
+		{
+			if (m_HandsArea.IsActive())
+			{
+				if (m_HandsArea.InspectItem())
+				{
+					m_HadInspected = true;
+				}
+			}
+			else if (m_RightArea.IsActive())
+			{
+				if (m_RightArea.InspectItem())
+				{
+					m_HadInspected = true;
+				}
+			}
+			else if (m_LeftArea.IsActive())
+			{
+				if (m_LeftArea.InspectItem())
+				{
+					m_HadInspected = true;
+				}
+			}
+			
+			UpdateConsoleToolbar();
+		}
+		
+		if (GetUApi().GetInputByID(UAUIFastTransferItem).LocalPress())
+			m_HadFastTransferred = false;
+		
+		if (GetUApi().GetInputByID(UAUIInspectItem).LocalPress())
+			m_HadInspected = false;
+		
+		if (dpi && !dpi.IsProcessing())
+		{
+			if (!m_HadFastTransferred && GetUApi().GetInputByID(UAUIFastTransferItem).LocalPress()) //transfers item to inventory (not hands, or hands last?)
+			{
+				if (m_LeftArea.IsActive())
+				{
+					item = InventoryItem.Cast(m_LeftArea.GetFocusedItem());
+					if (item && item.GetInventory().CanRemoveEntity())
+					{
+						m_LeftArea.TransferItem();
+					}
+				}
+				else if (m_HandsArea.IsActive())
+				{
+					item = InventoryItem.Cast(m_HandsArea.GetFocusedItem());
+					if (item && item.GetInventory().CanRemoveEntity())
+					{
+						if (m_HandsArea.TransferItem())
+						{
+							m_HandsArea.SetActive(false);
+							m_HandsArea.UnfocusGrid();
+							m_RightArea.SetActive(true);
+						}
+					}
+				}
+				
+				UpdateConsoleToolbar();
+				HideOwnedTooltip();
+			}
+		}
+		
+		if (GetUApi().GetInputByID(UAUIInventoryContainerUp).LocalPress())
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			MoveFocusByContainer(Direction.UP);
+		}
+
+		if (GetUApi().GetInputByID(UAUIInventoryContainerDown).LocalPress())
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			MoveFocusByContainer(Direction.DOWN);
+		}
+
+		if (GetUApi().GetInputByID(UAUIInventoryTabLeft).LocalPress())
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			MoveFocusByArea(Direction.LEFT);
+		}
+
+		if (GetUApi().GetInputByID(UAUIInventoryTabRight).LocalPress())
+		{
+			if (GetUApi().GetInputByID(UAUIDragNDrop).LocalValue())
+			{
+				EnableMicromanagement();
+			}
+			
+			MoveFocusByArea(Direction.RIGHT);
+		}
+		
+		//Open Quickbar radial menu
+		if (GetUApi().GetInputByID(UAUIQuickbarRadialInventoryOpen).LocalPress())
+		{
+			//assign item
+			EntityAI item_to_assign;
+						
+			if (m_HandsArea.IsActive())
+			{
+				player = PlayerBase.Cast(GetGame().GetPlayer());
+				item_to_assign = player.GetItemInHands();
+				m_HandsArea.AddItemToQuickbarRadial(item_to_assign);
+			}
+			else if (m_RightArea.IsActive())
+			{
+				item_to_assign = m_RightArea.GetFocusedItem();
+				m_RightArea.AddItemToQuickbarRadial(item_to_assign);
+			}
+		}
+		#endif
+		
+		MissionGameplay mission = MissionGameplay.Cast(GetGame().GetMission());
+		if (!m_HadInspected && GetUApi().GetInputByID(UAUICombine).LocalPress())
+		{
+			if (GetMainWidget().IsVisible())
+			{
+			#ifdef PLATFORM_CONSOLE
+				//DisableMicromanagement();
+				if (m_RightArea.IsActive())
+				{
+					if (m_RightArea.CanCombine())
+					{
+						if (m_RightArea.Combine())
+						{
+							mission.HideInventory();
+						}
+					}
+				}
+				else if (m_LeftArea.IsActive())
+				{
+					if (m_LeftArea.CanCombine())
+					{
+						if (m_LeftArea.Combine())
+						{
+							mission.HideInventory();
+						}
+					}
+				}
+			#endif
+			}
+		}
+		
+		if (!m_HadInspected && GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			mission.HideInventory();
+		}
+		
+		for (int i = 0; i < 10; i++)
+		{
+			if (!m_HoldingQB && GetUApi().GetInputByName("UAItem" + i).LocalPress())
+			{
+				m_QBHoveredItems = InventoryItem.Cast(ItemManager.GetInstance().GetHoveredItem());
+				m_HoldingQB = true;
+			}
+			
+			if (m_HoldingQB && GetUApi().GetInputByName("UAItem" + i).LocalHold())
+			{
+				
+				AddQuickbarItem(m_QBHoveredItems, i);
+				m_QBHoveredItems = null;
+				m_HoldingQB = false;
+			}
+		}
+
+		m_LeftArea.UpdateInterval();
+		m_RightArea.UpdateInterval();
+		m_HandsArea.UpdateInterval();
+		m_PlayerPreview.UpdateInterval();
+		
+		#ifdef PLATFORM_CONSOLE
+			UpdateConsoleToolbarCheck();
+		#endif
+	}
+	
+	void AddQuickbarItem(InventoryItem item, int index)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			
+		if (item && item.GetInventory().CanRemoveEntity())
+		{
+			player.SetQuickBarEntityShortcut(item, index) ;
+		}
+		
+		InventoryMenu menu = InventoryMenu.Cast(GetGame().GetUIManager().FindMenu(MENU_INVENTORY));
+		if (menu)
+		{
+			menu.RefreshQuickbar();
+		}
+	}
+	
+	void EnableMicromanagement()
+	{
+		if (!ItemManager.GetInstance().IsMicromanagmentMode())
+		{
+			ItemManager.GetInstance().SetItemMicromanagmentMode(true);
+			if (m_RightArea.IsActive())
+			{
+				m_RightArea.SelectItem();
+			}
+			else if (m_LeftArea.IsActive())
+			{
+				m_LeftArea.SelectItem();
+			}
+			else if (m_HandsArea.IsActive())
+			{
+				m_HandsArea.SelectItem();
+			}
+			
+			UpdateConsoleToolbar();
+			HideOwnedTooltip();
+		}
+	}
+	
+	void DisableMicromanagement()
+	{
+		if (ItemManager.GetInstance().IsMicromanagmentMode())
+		{
+			ItemManager.GetInstance().SetItemMicromanagmentMode(false);
+			ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+			UpdateConsoleToolbar();
+			HideOwnedTooltip();
+		}
+	}
+
+	override void SetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_LayoutName = WidgetLayoutName.InventoryXbox;
+		#else
+			switch (InventoryMenu.GetWidthType())
+			{
+				case ScreenWidthType.NARROW:
+				{
+					m_LayoutName = WidgetLayoutName.InventoryNarrow;
+					break;
+				}
+				case ScreenWidthType.MEDIUM:
+				{
+					m_LayoutName = WidgetLayoutName.InventoryMedium;
+					break;
+				}
+				case ScreenWidthType.WIDE:
+				{
+					m_LayoutName = WidgetLayoutName.InventoryWide;
+					break;
+				}
+			}
+		#endif
+	}
+
+	void Init() {}
+
+	void Reset()
+	{
+		m_LeftArea.Refresh();
+		m_RightArea.Refresh();
+		m_HandsArea.Refresh();
+	}
+	
+	void ResetFocusedContainers()
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_RightArea.UnfocusGrid();
+		m_LeftArea.UnfocusGrid();
+		m_HandsArea.UnfocusGrid();
+		
+		m_LeftArea.SetActive(false);
+		m_HandsArea.SetActive(false);
+		m_RightArea.SetActive(false);
+		
+		m_RightArea.ResetFocusedContainer();
+		m_LeftArea.ResetFocusedContainer();
+		
+		m_RightArea.SetActive(true);
+		#endif
+	}
+
+	override void OnShow()
+	{
+		SetFocus(GetMainWidget());
+		Deserialize();
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player && player.IsPlacingLocal())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(player.TogglePlacingLocal);
+		}
+
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowQuickbarUI(false);
+				hud.ShowHudInventory(true);
+			}
+		}
+		
+		UpdateSpecialtyMeter();
+		
+		#ifdef PLATFORM_CONSOLE
+			ResetFocusedContainers();
+		#endif	
+		
+		RefreshQuickbar();
+		UpdateInterval();
+		UpdateConsoleToolbar();
+		
+		m_HadFastTransferred = false;
+		m_HadInspected = false;
+		
+		m_PlayerPreview.RefreshPlayerPreview();
+	}
+
+	override void OnHide()
+	{
+		Serialize();
+		HideOwnedTooltip();
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowQuickbarUI(true);
+				hud.ShowHudInventory(false);
+			}
+		}
+		ItemManager.GetInstance().SetSelectedItemEx(null, null, null);
+	}
+	
+	void UpdateSpecialtyMeter()
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player && player.GetSoftSkillsManager())
+		{
+			float x = player.GetSoftSkillsManager().GetSpecialtyLevel() / 2;
+			float y = -0.75;
+			#ifndef PLATFORM_CONSOLE
+			m_SpecializationIcon.SetPos(x, y, true);
+			#else
+			Mission mission = GetGame().GetMission();
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.UpdateSpecialtyMeter(x,y);
+			}
+			#endif
+		}
+	}
+	
+	override void Refresh()
+	{
+		m_LeftArea.Refresh();
+		m_HandsArea.Refresh();
+		m_RightArea.Refresh();
+		
+		RefreshQuickbar();
+		UpdateConsoleToolbar();
+	}
+	
+	void RefreshQuickbar()
+	{
+		#ifndef PLATFORM_CONSOLE
+		m_QuickbarWidget.Show(true);
+		#else
+		m_QuickbarWidget.Show(GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer());
+		#endif
+		
+		#ifndef PLATFORM_CONSOLE
+		if (m_Quickbar)
+		#else
+		if (m_Quickbar && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+		#endif
+		{
+			m_Quickbar.UpdateItems(m_QuickbarWidget);
+		}
+	}
+	
+
+	#ifdef PLATFORM_CONSOLE
+	protected string GetConsoleToolbarText(int mask)
+	{
+		string result = "";
+		
+		string toHandsSwapVicinity	= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIPutInHandsFromVicinity", GetStringVariant("UAUIPutInHandsFromVicinity",{"#STR_Controls_TakeInHandsSwap","#STR_USRACT_HoldToHandSwap",""}), EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string toHandsSwapInv		= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIPutInHandsFromInventory", GetStringVariant("UAUIPutInHandsFromInventory",{"#STR_Controls_TakeInHandsSwap","#STR_USRACT_HoldToHandSwap",""}), EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string drop					= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIFastTransferToVicinity", "#dayz_context_menu_drop", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string equip 				= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIFastEquip", "#dayz_context_menu_equip", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string split 				= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUISplit", GetStringVariant("UAUISplit",{"#dayz_context_menu_split","#STR_Controls_HoldSplit",""}), EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string toInventory 			= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIFastTransferItem", "#dayz_context_menu_to_inventory", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string openCloseContainer 	= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIExpandCollapseContainer", "#dayz_context_menu_open_close", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string micromanagment 		= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIDragNDrop", "#dayz_context_menu_micro", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string quickslot 			= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIQuickbarRadialInventoryOpen", "#ps4_dayz_context_menu_quickslot", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		string combine 				= string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUICombine", GetStringVariant("UAUICombine",{"#dayz_context_menu_combine","#dayz_context_menu_combine_hold",""}), EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		
+		if (mask & ConsoleActionToolbarMask.OPEN_CLOSE_CONTAINER)
+		{
+			result += openCloseContainer;
+		}		
+		if (mask & ConsoleActionToolbarMask.TO_HANDS_SWAP_VICINITY)
+		{
+			result += toHandsSwapVicinity;
+		}
+		if (mask & ConsoleActionToolbarMask.TO_HANDS_SWAP_INVENTORY)
+		{
+			result += toHandsSwapInv;
+		}
+		if (mask & ConsoleActionToolbarMask.TO_INVENTORY)
+		{
+			result += toInventory;
+		}
+		if (mask & ConsoleActionToolbarMask.DROP)
+		{
+			result += drop;
+		}
+		if (mask & ConsoleActionToolbarMask.SPLIT)
+		{
+			result += split;
+		}
+		if (mask & ConsoleActionToolbarMask.EQUIP)
+		{
+			result += equip;
+		}
+		if (mask & ConsoleActionToolbarMask.COMBINE)
+		{
+			result += combine;
+		}
+		if (mask & ConsoleActionToolbarMask.MICROMANAGMENT)
+		{
+			result += micromanagment;
+		}
+		if (mask & ConsoleActionToolbarMask.QUICKSLOT)
+		{
+			result += quickslot;
+		}
+
+		return result;
+	}
+	#endif
+
+	Container GetFocusedArea()
+	{
+		if (m_LeftArea && m_LeftArea.IsActive())
+		{
+			return m_LeftArea;
+		}
+		else if (m_RightArea && m_RightArea.IsActive())
+		{
+			return m_RightArea;
+		}
+		else if (m_HandsArea && m_HandsArea.IsActive())
+		{
+			return m_HandsArea;
+		}
+		return null;
+	}
+	
+	#ifdef PLATFORM_CONSOLE
+	void UpdateConsoleToolbarCheck()
+	{
+		if ( m_NeedUpdateConsoleToolbar )
+		{
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			if (player.GetInventory().GetAnyInventoryReservationCount() == 0)
+			{
+				m_NeedUpdateConsoleToolbar = false;
+				UpdateConsoleToolbar();
+			}
+		}
+	}
+	#endif
+	
+	//Console toolbar
+	void UpdateConsoleToolbar()
+	{
+		#ifdef PLATFORM_CONSOLE
+		int combinationFlag = 0;
+		string contextualText;
+		InventoryLocation il;
+		
+		Container focusedArea = GetFocusedArea();
+		if (focusedArea)
+		{
+			Container focusedContainer = GetFocusedArea().GetFocusedContainer();
+			EntityAI focusedItem = GetFocusedArea().GetFocusedItem();
+			
+			if (!(focusedItem && focusedItem.IsSetForDeletion()))
+			{
+				if (focusedContainer)
+				{
+					if (focusedItem)
+					{
+						il = new InventoryLocation;
+						focusedItem.GetInventory().GetCurrentInventoryLocation( il );
+					}
+	
+					bool canBeManipulated = false;
+					PlayerBase player;
+					PlayerBase itemPlayerOwner;
+					
+					player = PlayerBase.Cast(GetGame().GetPlayer());
+					
+					m_NeedUpdateConsoleToolbar = player.GetInventory().GetAnyInventoryReservationCount() > 0;
+					
+					if (focusedItem)
+					{
+						itemPlayerOwner = PlayerBase.Cast(focusedItem.GetHierarchyRootPlayer());
+						il = new InventoryLocation;
+						focusedItem.GetInventory().GetCurrentInventoryLocation( il );
+						
+						canBeManipulated = !player.GetInventory().HasInventoryReservation( focusedItem, null ) && !player.GetInventory().IsInventoryLocked() && !player.IsItemsToDelete();
+						m_NeedUpdateConsoleToolbar |= !canBeManipulated;
+						canBeManipulated = canBeManipulated && focusedItem.CanPutIntoHands(null);
+						canBeManipulated = canBeManipulated && focusedItem.GetInventory().CanRemoveEntity();
+						
+						EntityAI parent = il.GetParent();
+						if ( parent && il.GetType() == InventoryLocationType.ATTACHMENT )
+						{
+							canBeManipulated = canBeManipulated && AttachmentsOutOfReach.IsAttachmentReachable( parent, "", il.GetSlot() );
+							canBeManipulated = canBeManipulated && !parent.GetInventory().GetSlotLock(  il.GetSlot() );
+						}
+					
+						if (canBeManipulated)
+						{
+							if (!ItemManager.GetInstance().IsMicromanagmentMode())
+							{
+								combinationFlag |= ConsoleActionToolbarMask.MICROMANAGMENT;
+							}
+							
+							if (focusedContainer.CanEquipEx(focusedItem))
+							{
+								combinationFlag |= ConsoleActionToolbarMask.EQUIP;
+							}
+							
+							if (player!= null && player == itemPlayerOwner)
+							{
+								if (focusedContainer.CanSwapOrTakeToHandsEx(focusedItem))
+								{
+									combinationFlag |= ConsoleActionToolbarMask.TO_HANDS_SWAP_INVENTORY;
+								}
+								
+								if (focusedContainer.CanDropEx(focusedItem))
+								{
+									combinationFlag |= ConsoleActionToolbarMask.DROP;
+								}
+							}
+							else
+							{
+								if (focusedContainer.CanSwapOrTakeToHandsEx(focusedItem))
+								{
+									combinationFlag |= ConsoleActionToolbarMask.TO_HANDS_SWAP_VICINITY;
+								}
+							}
+							
+							if (focusedContainer.CanCombineEx(focusedItem))
+							{
+								combinationFlag |= ConsoleActionToolbarMask.COMBINE;
+							}
+							
+							if (focusedContainer.CanSplitEx(focusedItem))
+							{
+								combinationFlag |= ConsoleActionToolbarMask.SPLIT;
+							}
+							
+							if (focusedArea.CanTakeToInventoryEx(focusedItem))
+							{
+								combinationFlag |= ConsoleActionToolbarMask.TO_INVENTORY;
+							}
+						}
+					}
+					
+					if (focusedContainer.CanOpenCloseContainerEx(focusedItem))
+					{
+						combinationFlag |= ConsoleActionToolbarMask.OPEN_CLOSE_CONTAINER;
+					}
+					
+					if (player!= null && focusedContainer.CanAddToQuickbarEx(focusedItem))
+					{
+						combinationFlag |= ConsoleActionToolbarMask.QUICKSLOT;
+					}
+				}
+			}
+			contextualText = GetConsoleToolbarText(combinationFlag);
+		if (m_TopConsoleToolbarVicinity)
+			m_TopConsoleToolbarVicinity.Show(m_LeftArea.IsActive());
+		if (m_TopConsoleToolbarHands)
+			m_TopConsoleToolbarHands.Show(m_HandsArea.IsActive());
+		if (m_TopConsoleToolbarEquipment)
+			m_TopConsoleToolbarEquipment.Show(m_RightArea.IsActive());
+		if (m_BottomConsoleToolbarRichText)
+			m_BottomConsoleToolbarRichText.SetText(contextualText + " ");
+		}
+		#endif
+	}
+	
+	//! Picks from the strings by active input limiter variant in order: {click,hold,doubleclick}. Intended for inputs that check 'LocalPress' exclusively!!
+	string GetStringVariant(string pInputAction, notnull array<string> variants)
+	{
+		if (variants.Count() != 3)
+		{
+			ErrorEx("wrong array count!");
+			return "";
+		}
+		
+		UAInput inp = GetUApi().GetInputByName(pInputAction);
+		if (!inp.IsLimited() || inp.IsClickLimit()) //returns 'click' (no extension) variant as default
+		{
+			return variants[0];
+		}
+		if (inp.IsHoldLimit() || inp.IsHoldBeginLimit())
+		{
+			return variants[1];
+		}
+		if (inp.IsDoubleClickLimit())
+		{
+			return variants[2];
+		}
+		ErrorEx("Unhandled limiter exception!");
+		return "";
+	}
+	
+	//! Shifts between containers vertically
+	void MoveFocusByContainer(int direction)
+	{
+		HideOwnedTooltip();
+		
+		if (direction == Direction.UP)
+		{
+			if ( m_LeftArea.IsActive() )
+			{
+				m_LeftArea.SetSameLevelPreviousActive();
+			}
+			else if ( m_RightArea.IsActive() )
+			{
+				m_RightArea.SetSameLevelPreviousActive();
+			}
+			else if ( m_HandsArea.IsActive() )
+			{
+				m_HandsArea.SetSameLevelPreviousActive();
+			}
+			
+			UpdateConsoleToolbar();
+		}
+		else if (direction == Direction.DOWN)
+		{
+			if ( m_LeftArea.IsActive() )
+			{
+				m_LeftArea.SetSameLevelNextActive();
+			}
+			else if ( m_RightArea.IsActive() )
+			{
+				m_RightArea.SetSameLevelNextActive();
+			}
+			else if ( m_HandsArea.IsActive() )
+			{
+				m_HandsArea.SetSameLevelNextActive();
+			}
+			
+			UpdateConsoleToolbar();
+		}
+	}
+	
+	//! Shifts between vicinity-hands-player
+	void MoveFocusByArea(int direction)
+	{
+		HideOwnedTooltip();
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if (direction == Direction.LEFT)
+		{
+			if (m_LeftArea.IsActive())
+			{
+				if (!ItemManager.GetInstance().IsMicromanagmentMode())
+				{
+					m_LeftArea.UnfocusGrid();
+				}
+				m_LeftArea.SetActive(false);
+				m_RightArea.SetActive(true);
+				
+				UpdateConsoleToolbar();
+			}
+			else if (m_RightArea.IsActive())
+			{
+				if (!ItemManager.GetInstance().IsMicromanagmentMode())
+				{
+					m_RightArea.UnfocusGrid();
+				}
+				m_RightArea.SetActive(false);
+				player = PlayerBase.Cast(GetGame().GetPlayer());
+				EntityAI item_in_hands = player.GetItemInHands();
+				m_HandsArea.SetActive(true);
+
+				UpdateConsoleToolbar();
+			}
+			else if (m_HandsArea.IsActive())
+			{
+				m_HandsArea.UnfocusGrid();
+				m_HandsArea.SetActive(false);
+				m_LeftArea.SetActive(true);
+				
+				UpdateConsoleToolbar();
+			}
+		}
+		else if (direction == Direction.RIGHT)
+		{
+			if (m_LeftArea.IsActive())
+			{
+				if (!ItemManager.GetInstance().IsMicromanagmentMode())
+				{
+					m_LeftArea.UnfocusGrid();
+				}
+				m_LeftArea.SetActive(false);
+				player = PlayerBase.Cast(GetGame().GetPlayer());
+				item_in_hands = player.GetItemInHands();
+				m_HandsArea.SetActive(true);
+				
+				UpdateConsoleToolbar();
+			}
+			else if (m_RightArea.IsActive())
+			{
+				if (!ItemManager.GetInstance().IsMicromanagmentMode())
+				{
+					m_RightArea.UnfocusGrid();
+				}
+				m_RightArea.SetActive(false);
+				m_LeftArea.SetActive(true);
+				
+				UpdateConsoleToolbar();
+			}
+			else if (m_HandsArea.IsActive())
+			{
+				m_HandsArea.UnfocusGrid();
+				m_HandsArea.SetActive(false);
+				m_RightArea.SetActive(true);
+				
+				UpdateConsoleToolbar();
+			}
+		}
+	}
+	
+	void InventoryMovementButtonTickHandler(float timeslice)
+	{
+		float tickvalue = 0;
+		
+		if (m_SensitivityThreshold > 0.0)
+		{
+			if (m_SensitivityThreshold < BT_REPEAT_TIME) //sensitivity solution...
+			{
+				m_SensitivityThreshold += timeslice;
+				return;
+			}
+			else
+			{
+				m_SensitivityThreshold = 0.0;
+			}
+		}
+		
+		for (int i = 0; i < m_InvInputWrappersCount; i++)
+		{
+			m_InvUAInput = m_InvInputWrappers[i].InputP();
+			
+			if (m_InvUAInput.LocalValue() > BT_THRESHOLD_VALUE)
+			{
+				tickvalue = m_InvInputTimes[i];
+				tickvalue += timeslice;
+			}
+			else
+			{
+				tickvalue = 0.0;
+			}
+			
+			if (tickvalue < BT_REPEAT_DELAY && m_InvUAInput.LocalPress())
+			{
+				m_InvInputActive |= (1 << i);
+				m_SensitivityThreshold += timeslice;
+			}
+			else if (tickvalue > (BT_REPEAT_DELAY + BT_REPEAT_TIME))
+			{
+				while (tickvalue > (BT_REPEAT_DELAY + BT_REPEAT_TIME))
+				{
+					tickvalue -= BT_REPEAT_TIME;
+				}
+				
+				m_InvInputActive |= (1 << i);
+				m_SensitivityThreshold += timeslice;
+			}
+			else
+			{
+				m_InvInputActive &= ~(1 << i);
+			}
+			
+			m_InvInputTimes[i] = tickvalue;
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/ItemManager.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/ItemManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..b78f6c587f3b1ef49feadf5e9c067e424a98291b
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/ItemManager.c
@@ -0,0 +1,862 @@
+class ItemManager
+{
+	private ref static ItemManager		m_Instance;
+	protected bool						m_IsDragging;
+	protected EntityAI					m_HoveredItem;
+	protected bool						m_SlotInfoShown;
+	protected EntityAI					m_DraggedItem;
+	protected Icon						m_DraggedIcon;
+	protected ref Widget				m_TooltipWidget;
+	protected ref Widget				m_TooltipSlotWidget;
+	protected ref Widget				m_TooltipCategoryWidget;
+	protected ItemPreviewWidget			m_ItemPreviewWidget;
+	protected Widget					m_RootWidget;
+	protected ref map<string, bool>		m_DefautOpenStates;
+	protected ref map<string, bool>		m_DefautHeaderOpenStates;
+ 	protected int						m_HandsDefaultOpenState;
+	protected ref Timer					m_ToolTipTimer;
+	protected ref Timer					m_TooltipSlotTimer;
+
+	protected EntityAI					m_SelectedItem;
+	protected Container					m_SelectedContainer;
+	protected Widget					m_SelectedWidget;
+	protected SlotsIcon					m_SelectedIcon;
+	protected LayoutHolder				m_SelectedBaseIcon;
+	
+	protected HandsPreview				m_HandsPreview;
+	
+	protected bool						m_ItemMicromanagmentMode;
+	
+	protected Widget					m_LeftDropzone;
+	protected Widget					m_CenterDropzone;
+	protected Widget					m_RightDropzone;
+	
+	protected int 						m_TooltipPosX;
+	protected int	 					m_TooltipPosY;
+	protected Widget 					m_TooltipSourceWidget; //stored here for tooltip position updates
+	
+	#ifndef PLATFORM_CONSOLE
+	protected const float TOOLTIP_DELAY = 0.25; // in seconds
+	#else
+	protected const float TOOLTIP_DELAY = 1.5; // in seconds
+	#endif
+	
+	void ItemManager( Widget root )
+	{
+		m_Instance					= this;
+		m_RootWidget				= root;
+		m_DefautOpenStates			= new map<string, bool>;
+		m_DefautHeaderOpenStates	= new map<string, bool>;
+		m_SlotInfoShown				= false;
+		
+		#ifdef PLATFORM_CONSOLE
+			m_TooltipWidget			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory_new/day_z_inventory_new_tooltip_xbox.layout", root );
+			m_TooltipSlotWidget		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory_new/day_z_inventory_new_tooltip_slot_xbox.layout", root );
+		#else
+			m_TooltipWidget			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory_new/day_z_inventory_new_tooltip.layout", root );
+			m_TooltipSlotWidget		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/inventory_new/day_z_inventory_new_tooltip_slot.layout", root );
+		#endif
+		m_TooltipWidget.Show( false );
+		m_TooltipSlotWidget.Show( false );
+	}
+	
+	void SetItemMicromanagmentMode( bool item_micromanagment_mode )
+	{
+		m_ItemMicromanagmentMode = item_micromanagment_mode;
+		Inventory.GetInstance().UpdateConsoleToolbar();
+	}
+	
+	bool IsMicromanagmentMode()
+	{
+		return m_ItemMicromanagmentMode;
+	}
+	
+	HandsPreview GetHandsPreview()
+	{
+		return m_HandsPreview;
+	}
+	
+	void SetHandsPreview( HandsPreview hansd_preview )
+	{
+		m_HandsPreview = hansd_preview;
+	}
+
+	EntityAI GetSelectedItem()
+	{
+		return m_SelectedItem;
+	}
+
+	Container GetSelectedContainer()
+	{
+		return m_SelectedContainer;	
+	}
+	
+	Widget GetSelectedWidget()
+	{
+		return m_SelectedWidget;
+	}
+	
+	SlotsIcon GetSelectedIcon()
+	{
+		return m_SelectedIcon;
+	}
+
+	void SetSelectedItem( EntityAI selected_item, Container selected_container, Widget selected_widget, SlotsIcon selected_icon )
+	{
+		m_SelectedItem		= selected_item;
+		m_SelectedContainer	= selected_container;
+		m_SelectedWidget	= selected_widget;
+		m_SelectedIcon		= selected_icon;
+	}
+	
+	void SetSelectedItemEx( EntityAI selected_item, Container selected_container, LayoutHolder selected_icon )
+	{
+		SlotsIcon	sIcon;
+		Icon		icon;
+		
+		m_SelectedItem		= selected_item;
+		m_SelectedContainer	= selected_container;
+		
+		if (m_SelectedBaseIcon)
+		{
+			sIcon 	= SlotsIcon.Cast(m_SelectedBaseIcon);
+			icon	= Icon.Cast(m_SelectedBaseIcon);
+			if (sIcon)
+			{
+				sIcon.GetMicromanagedPanel().Show(false);
+			}
+			else if (icon)
+			{
+				icon.GetMicromanagedPanel().Show(false);
+			}
+		}
+		
+		if (selected_icon)
+		{
+			sIcon 	= SlotsIcon.Cast(selected_icon);
+			icon	= Icon.Cast(selected_icon);
+			
+			if (sIcon)
+			{
+				m_SelectedWidget = sIcon.GetCursorWidget();
+				sIcon.GetMicromanagedPanel().Show(true);
+			}
+			else if (icon)
+			{
+				m_SelectedWidget = icon.GetCursorWidget();
+				icon.GetMicromanagedPanel().Show(true);
+			}
+		}
+		else
+		{
+			m_SelectedWidget = null;
+		}
+		m_SelectedBaseIcon		= selected_icon;
+	}
+
+	void ClearDefaultOpenStates()
+	{
+		m_DefautOpenStates.Clear();
+	}
+
+	void ClearDefaultHeaderOpenStates()
+	{
+		m_DefautHeaderOpenStates.Clear();
+	}
+
+	void SetDefaultOpenState( string type, bool is_opened )
+	{
+		m_DefautOpenStates.Set( type, is_opened );
+	}
+
+	void SetDefaultHeaderOpenState( string type, bool is_opened )
+	{
+		m_DefautHeaderOpenStates.Set( type, is_opened );
+	}
+
+	void SetDefaultOpenStateHands( bool is_opened )
+	{
+		m_HandsDefaultOpenState = is_opened;
+		int hands_default_open_state = m_HandsDefaultOpenState; //from bool to int for easier parsing
+		GetGame().SetProfileString( "defaultOpenStateHands", hands_default_open_state.ToString() );
+		GetGame().SaveProfile();
+	}
+
+	bool GetDefaultOpenStateHands( )
+	{
+		string value;
+		GetGame().GetProfileString( "defaultOpenStateHands", value );
+		m_HandsDefaultOpenState = value.ToInt();
+		return m_HandsDefaultOpenState;
+	}
+
+	void SerializeDefaultHeaderOpenStates()
+	{
+		TStringArray serialized_types = new TStringArray;
+
+		for ( int i = 0; i < m_DefautHeaderOpenStates.Count(); i++ )
+		{
+			int is_opened = m_DefautHeaderOpenStates.GetElement( i ); //from bool to int for easier parsing
+			serialized_types.Insert( m_DefautHeaderOpenStates.GetKey( i ) + "," + is_opened );
+		}
+
+		if( serialized_types.Count() > 0 )
+		{
+			GetGame().SetProfileStringList( "defaultHeaderOpenStates", serialized_types );
+		}
+		GetGame().SaveProfile();
+	}
+
+	void DeserializeDefaultHeaderOpenStates()
+	{
+		ClearDefaultHeaderOpenStates();
+
+		TStringArray serialized_types = new TStringArray;
+		GetGame().GetProfileStringList( "defaultHeaderOpenStates", serialized_types );
+
+		for( int i = 0; i < serialized_types.Count(); i++ )
+		{
+			TStringArray strs = new TStringArray;
+			serialized_types.Get( i ).Split( ",", strs );
+			bool is_opened = strs.Get( 1 ).ToInt();
+			SetDefaultHeaderOpenState( strs.Get( 0 ), is_opened );
+		}
+	}
+
+	void SerializeDefaultOpenStates()
+	{
+		TStringArray serialized_types = new TStringArray;
+
+		for ( int i = 0; i < m_DefautOpenStates.Count(); i++ )
+		{
+			int is_opened = m_DefautOpenStates.GetElement( i ); //from bool to int for easier parsing
+			serialized_types.Insert( m_DefautOpenStates.GetKey( i ) + "," + is_opened );
+		}
+
+		if( serialized_types.Count() > 0 )
+		{
+			GetGame().SetProfileStringList( "defaultOpenStates", serialized_types );
+		}
+		GetGame().SaveProfile();
+	}
+
+	void DeserializeDefaultOpenStates()
+	{
+		ClearDefaultOpenStates();
+
+		TStringArray serialized_types = new TStringArray;
+		GetGame().GetProfileStringList( "defaultOpenStates", serialized_types );
+
+		for( int i = 0; i < serialized_types.Count(); i++ )
+		{
+			TStringArray strs = new TStringArray;
+			serialized_types.Get( i ).Split( ",", strs );
+			bool is_opened = strs.Get( 1 ).ToInt();
+			SetDefaultOpenState( strs.Get( 0 ), is_opened );
+		}
+	}
+
+	bool GetDefaultOpenState( string type )
+	{
+		if( m_DefautOpenStates.Contains( type ) )
+		{
+			return m_DefautOpenStates.Get( type );
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	bool GetDefaultHeaderOpenState( string type )
+	{
+		if( m_DefautHeaderOpenStates.Contains( type ) )
+		{
+			return m_DefautHeaderOpenStates.Get( type );
+		}
+		else
+		{
+			return true;
+		}
+	}
+
+	static ItemManager GetInstance()
+	{
+		return m_Instance;
+	}
+
+	void HideDropzones()
+	{
+		GetRightDropzone().SetAlpha( 0 );
+		GetLeftDropzone().SetAlpha( 0 );
+		GetCenterDropzone().SetAlpha( 0 );
+	}
+
+	void ShowSourceDropzone( EntityAI item )
+	{
+		EntityAI owner = item.GetHierarchyParent();
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if (item == player)
+		{
+			GetRightDropzone().SetAlpha(1);
+		}
+		else if (owner && owner != player)
+		{
+			ShowSourceDropzone(owner);
+		}
+		else
+		{
+			InventoryLocation inv_loc_src = new InventoryLocation;
+			item.GetInventory().GetCurrentInventoryLocation(inv_loc_src);
+			int loc_type = inv_loc_src.GetType();
+			HideDropzones();
+			if (loc_type == InventoryLocationType.GROUND)
+			{
+				GetLeftDropzone().SetAlpha(1);
+			}
+			else if (loc_type == InventoryLocationType.HANDS)
+			{
+				GetCenterDropzone().SetAlpha(1);
+			}
+			else
+			{
+				GetRightDropzone().SetAlpha(1);
+			}
+		}
+	}
+
+	Widget GetLeftDropzone()
+	{
+		if (!m_LeftDropzone)
+			m_LeftDropzone	= m_RootWidget.FindAnyWidget("LeftPanel").FindAnyWidget("DropzoneX");
+		
+		return m_LeftDropzone;
+	}
+	
+	Widget GetRightDropzone()
+	{
+		if( !m_RightDropzone )
+			m_RightDropzone	= m_RootWidget.FindAnyWidget("RightPanel").FindAnyWidget("DropzoneX");
+		return m_RightDropzone;
+	}
+	
+	Widget GetCenterDropzone()
+	{
+		if( !m_CenterDropzone )
+			m_CenterDropzone = m_RootWidget.FindAnyWidget("HandsPanel").FindAnyWidget("DropzoneX");
+		return m_CenterDropzone;
+	}
+	
+	EntityAI GetHoveredItem()
+	{
+		return m_HoveredItem;
+	}
+
+	void SetDraggedItem( EntityAI dragged_item )
+	{
+		m_DraggedItem = dragged_item;
+	}
+
+	EntityAI GetDraggedItem()
+	{
+		return m_DraggedItem;
+	}
+
+	void SetDraggedIcon( Icon dragged_icon )
+	{
+		m_DraggedIcon = dragged_icon;
+	}
+
+	Icon GetDraggedIcon()
+	{
+		return m_DraggedIcon;
+	}
+
+	void SetIsDragging( bool is_dragging )
+	{
+		m_IsDragging = is_dragging;
+		if( !is_dragging )
+		{
+			SetDraggedItem( null );
+			SetDraggedIcon( null );
+		}
+	}
+
+	bool IsDragging()
+	{
+		return m_IsDragging;
+	}
+
+	void HideTooltip()
+	{
+		m_TooltipWidget.Show( false );
+		m_HoveredItem = null;
+		delete m_ToolTipTimer;
+		
+		HideTooltipSlot();
+	}
+	
+	void HideTooltipSlot()
+	{
+		if ( m_SlotInfoShown )
+		{
+			m_TooltipSlotWidget.Show( false );
+			m_SlotInfoShown = false;
+			delete m_TooltipSlotTimer;
+		}
+	}
+
+	static int GetItemHealthColor(int pHealthLevel)
+	{
+		switch (pHealthLevel)
+		{
+		case -1:
+		break;
+		case GameConstants.STATE_PRISTINE:
+			return Colors.COLOR_PRISTINE;
+		case GameConstants.STATE_WORN:
+			return Colors.COLOR_WORN;
+		case GameConstants.STATE_DAMAGED:
+			return Colors.COLOR_DAMAGED;
+		case GameConstants.STATE_BADLY_DAMAGED:
+			return Colors.COLOR_BADLY_DAMAGED;
+		case GameConstants.STATE_RUINED:
+			return Colors.COLOR_RUINED;	
+		}
+			
+		return 0x00FFFFFF;
+	}
+	
+	static int GetItemHealthColor(EntityAI item, string zone = "")
+	{
+		if (item)
+		{
+			switch (item.GetHealthLevel(zone))
+			{
+			case -1:
+			break;
+			case GameConstants.STATE_PRISTINE:
+				return Colors.COLOR_PRISTINE;
+			case GameConstants.STATE_WORN:
+				return Colors.COLOR_WORN;
+			case GameConstants.STATE_DAMAGED:
+				return Colors.COLOR_DAMAGED;
+			case GameConstants.STATE_BADLY_DAMAGED:
+				return Colors.COLOR_BADLY_DAMAGED;
+			case GameConstants.STATE_RUINED:
+				return Colors.COLOR_RUINED;	
+			}
+		}
+			
+		return 0x00FFFFFF;
+	}
+	
+	static int ColorFromFloat( float fraction )
+	{
+		if( fraction > 1 || fraction < 0 )
+			return 0x00FFFFFF;
+		else if( fraction > 0.80 )
+			return Colors.COLOR_PRISTINE;
+		else if( fraction > 0.6 )
+			return Colors.COLOR_WORN;
+		else if( fraction > 0.4 )
+			return Colors.COLOR_DAMAGED;
+		else if( fraction > 0.2 )
+			return Colors.COLOR_BADLY_DAMAGED;
+		else
+			return Colors.COLOR_RUINED;	
+	}
+
+	void SetTemperature(EntityAI item, Widget item_w)
+	{
+		if ( item_w )
+		{
+			if ( true/*show_temperature */ )
+			{
+				if ( item && item.IsInherited( ItemBase ) )
+				{
+					int color = ColorManager.GetInstance().GetItemColor( ItemBase.Cast( item ) ); // !!!!!
+					if ( color )
+					{
+						string name = item_w.GetName();
+						name.Replace("Render", "Temperature");
+						Widget temperature_widget = item_w.GetParent().FindAnyWidget( name );
+						if ( color != -1 )
+						{
+							temperature_widget.Show( true );
+							temperature_widget.SetColor( color );
+						}
+						else
+						{
+							temperature_widget.Show( false );
+						}
+
+						temperature_widget.SetAlpha( 0.3 );
+					}
+				}
+			}
+		}
+	}
+
+	void SetIconTemperature(EntityAI item, Widget item_w)
+	{
+		if ( item_w )
+		{
+			if ( item && item.IsInherited( ItemBase ) )
+			{
+				int color = ColorManager.GetInstance().GetItemColor( ItemBase.Cast( item ) );
+
+				if ( color )
+				{
+					Widget color_widget = item_w.FindAnyWidget( "Color" );
+					if( color != -1 )
+					{
+						color_widget.SetColor( color );
+					}
+					else
+					{
+						color_widget.SetColor( ColorManager.BASE_COLOR );
+					}
+				}
+			}
+		}
+	}
+
+	void PrepareTooltip(EntityAI item, int x = 0, int y = 0)
+	{
+		if( IsDragging() || !item )
+		{
+			return;
+		}
+		
+		if ( item.IsInherited( InventoryItem ) )
+		{
+			HideTooltip();
+			
+			m_HoveredItem = item;
+			InspectMenuNew.UpdateItemInfo( m_TooltipWidget, item );
+			
+			int screen_w, screen_h;
+			float w, h;
+			GetScreenSize(screen_w, screen_h);
+			m_TooltipWidget.GetScreenSize(w,h);
+			
+			if (x == -1)//set by icon focusing
+			{
+				x = screen_w/2 - w/2;
+				float x1,y1;
+				m_RootWidget.FindAnyWidget("InventoryFrameWidget").GetScreenPos(x1,y1); //allign to the same height
+				y = y1;
+			}
+			else if (x == 0 && y == 0 && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+			{
+				GetMousePos(x,y);
+			}
+			
+			//minimal edge distance adjustments..
+			screen_w -= 10;
+			screen_h -= 10;
+			
+			int rightEdge = x + w;
+			if (rightEdge > screen_w)
+			{
+				x = screen_w - w;
+			}
+			
+			int bottomEdge = y + h;
+			if (bottomEdge > screen_h)
+			{
+				y = screen_h - h;
+			}
+			
+			m_TooltipWidget.SetPos(x, y);
+			
+			m_ToolTipTimer = new Timer();
+			m_ToolTipTimer.Run( TOOLTIP_DELAY, this, "ShowTooltip" );
+			
+			Widget preview_frame = m_TooltipWidget.FindAnyWidget("ItemFrameWidget");
+			if (preview_frame)
+			{
+				m_ItemPreviewWidget = ItemPreviewWidget.Cast( preview_frame );
+				m_ItemPreviewWidget.SetItem(item);
+				m_ItemPreviewWidget.SetView( item.GetViewIndex() );
+			}
+		}
+	}
+	
+	//! position is currentlycalculated from the owning 'm_TooltipSourceWidget' directly
+	void PrepareSlotsTooltip(string name, string desc, int x = 0, int y = 0)
+	{
+		InspectMenuNew.UpdateSlotInfo( m_TooltipSlotWidget, name, desc );
+		
+		HideTooltip();
+		
+		if (name != "") 
+		{
+			m_SlotInfoShown = true;
+			//CalculateTooltipSlotPosition(x,y);
+			m_TooltipSlotTimer = new Timer();
+			m_TooltipSlotTimer.Run( TOOLTIP_DELAY, this, "ShowTooltipSlot" );
+		}
+	}
+	
+	void CalculateTooltipSlotPosition(int x = 0, int y = 0)
+	{
+		int screen_w, screen_h;
+		float w, h;
+		GetScreenSize(screen_w, screen_h);
+		//m_TooltipSlotWidget.GetScreenSize(w,h);
+		m_TooltipSlotWidget.GetSize(w,h);
+		int slot_normal_w = SlotsIcon.GetNormalWidth();
+		int slot_normal_h = SlotsIcon.GetNormalHeight();
+		//minimal edge distance adjustments..
+		screen_w -= 10;
+		screen_h -= 10;
+		
+#ifndef PLATFORM_CONSOLE
+		x += 5;
+		y += slot_normal_h + 5;
+#else
+		x += 5;
+		y += 15;
+#endif
+		Widget scrollerWidget = m_TooltipSourceWidget.GetParent();
+		while (scrollerWidget)
+		{
+			if (ScrollWidget.Cast(scrollerWidget))
+			{
+				break;
+			}
+			else
+			{
+				scrollerWidget = scrollerWidget.GetParent();
+			}
+		}
+
+		int rightEdge = x + w;
+		if (rightEdge > screen_w)
+		{
+			x = screen_w - w;
+		}
+
+		int bottomEdge = y + h;
+		if (scrollerWidget)
+		{
+			float scrollerX, scrollerY, scrollerSizeX, scrollerSizeY;
+			scrollerWidget.GetScreenPos(scrollerX,scrollerY);
+			scrollerWidget.GetScreenSize(scrollerSizeX,scrollerSizeY);
+			
+			int scroller_bottom = scrollerY + scrollerSizeY;
+			if (bottomEdge > scroller_bottom)
+			{
+				y = scroller_bottom - slot_normal_h;
+				bottomEdge = y + h;
+			}
+		}
+		/*else
+		{
+			ErrorEx("No scroller widget! | m_TooltipSourceWidget: " + m_TooltipSourceWidget);
+		}*/
+		
+		if (bottomEdge > screen_h) //should mostly never proc now
+		{
+			y = screen_h - h;
+		}
+		
+		m_TooltipPosX = x;
+		m_TooltipPosY = y;
+	}
+	
+	void UpdateTooltipSlotPosition()
+	{
+		float x, y;
+		m_TooltipSourceWidget.GetScreenPos(x,y);
+		CalculateTooltipSlotPosition(x,y);
+	}
+	
+	void SetTooltipWidget(Widget w)
+	{
+		m_TooltipSourceWidget = w;
+	}
+	
+	bool EvaluateContainerDragabilityDefault(EntityAI entity)
+	{
+		if ( !ItemBase.Cast( entity ) )
+			return false;
+		
+		bool draggable;
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		draggable = !player.GetInventory().HasInventoryReservation( entity, null ) && !player.IsItemsToDelete();
+		draggable = draggable && entity.CanPutIntoHands( GetGame().GetPlayer() );
+		draggable = draggable && entity.GetInventory().CanRemoveEntity();
+		
+		return draggable;
+	}
+	
+	void SetWidgetDraggable( Widget w, bool draggable )
+	{
+		if (w)
+		{
+			if ( draggable )
+				w.SetFlags( WidgetFlags.DRAGGABLE );
+			else
+				w.ClearFlags( WidgetFlags.DRAGGABLE );
+		}
+	}
+	
+	void ShowTooltip()
+	{	
+		if( m_ItemPreviewWidget )
+		{
+			m_TooltipWidget.Show( true );
+		}
+	}
+	
+	void ShowTooltipSlot()
+	{	
+		UpdateTooltipSlotPosition();
+		m_TooltipSlotWidget.SetPos(m_TooltipPosX, m_TooltipPosY);
+		m_TooltipSlotWidget.Show( true );
+	}
+	
+	static int GetChosenCombinationFlag( EntityAI selectedEntity, EntityAI targetEntity, int relevantFlags, out InventoryLocation dst = null)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		if (!selectedEntity || !targetEntity)
+			return InventoryCombinationFlags.NONE;
+		
+		ItemBase selectedItem = ItemBase.Cast(selectedEntity);
+		ItemBase targetItem = ItemBase.Cast(targetEntity);
+		
+		//EntityAI itemInHands = m_player.GetHumanInventory().GetEntityInHands();
+		ActionManagerClient amc = ActionManagerClient.Cast(player.GetActionManager());
+		
+		if (relevantFlags & InventoryCombinationFlags.PERFORM_ACTION)
+		{
+			if (amc.CanPerformActionFromInventory(targetItem, selectedItem))
+				return InventoryCombinationFlags.PERFORM_ACTION;
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.SET_ACTION)
+		{
+			if (amc.CanSetActionFromInventory(targetItem, selectedItem))
+				return InventoryCombinationFlags.SET_ACTION;
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.COMBINE_QUANTITY2)
+		{
+			if (targetEntity.CanBeCombined(selectedEntity))
+			{ 
+				return InventoryCombinationFlags.COMBINE_QUANTITY2;
+			}
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.ADD_AS_ATTACHMENT)
+		{
+			if (targetEntity.GetInventory().CanAddAttachment(selectedEntity))
+			{
+				return InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+			}
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.ADD_AS_CARGO)
+		{
+			if (!targetEntity.GetInventory().HasEntityInInventory(selectedEntity) && targetEntity.GetInventory().CanAddEntityInCargo( selectedEntity, selectedEntity.GetInventory().GetFlipCargo() ))
+			{
+				return InventoryCombinationFlags.ADD_AS_CARGO;
+			}
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.SWAP_MAGAZINE)
+		{
+			Magazine mag = Magazine.Cast(targetEntity);
+			Weapon_Base wpn = Weapon_Base.Cast(targetEntity.GetHierarchyParent());
+			if (wpn && mag)
+			{
+				if (player.GetWeaponManager().CanSwapMagazine(wpn,  Magazine.Cast(selectedEntity)))
+				{
+					return InventoryCombinationFlags.SWAP_MAGAZINE;
+				}
+			}
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.SWAP)
+		{
+			if (GameInventory.CanSwapEntitiesEx(selectedEntity, targetEntity))
+			{
+				return InventoryCombinationFlags.SWAP;
+			}
+		}
+		
+		if (relevantFlags & InventoryCombinationFlags.FSWAP)
+		{
+			if (GameInventory.CanForceSwapEntitiesEx(selectedEntity, null, targetEntity, dst))
+			{
+				return InventoryCombinationFlags.FSWAP;
+			}
+		}
+		
+		return InventoryCombinationFlags.NONE;
+	}
+	
+	static int GetCombinationFlags( EntityAI entity1, EntityAI entity2 )
+	{
+		int flags = 0;
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+
+		if (!entity1 || !entity2)
+			return flags;
+		
+		if (entity1.IsInherited( ItemBase ) && entity2.IsInherited( ItemBase ))
+		{
+			ItemBase ent1 = ItemBase.Cast( entity1 );
+			if (ent1.CanBeCombined( ItemBase.Cast( entity2 ) )) flags = flags | InventoryCombinationFlags.COMBINE_QUANTITY2;
+		}
+
+		if (entity1.GetInventory().CanAddAttachment( entity2 ))
+		{
+			if (!entity1.IsInherited( ZombieBase ) && !entity1.IsInherited( Car ) && !entity2.IsInherited( ZombieBase ) && !entity2.IsInherited( Car ))
+			{
+				flags = flags | InventoryCombinationFlags.ADD_AS_ATTACHMENT;
+			}
+		}
+		if (!entity1.GetInventory().HasEntityInInventory(entity2) && entity1.GetInventory().CanAddEntityInCargo( entity2, entity2.GetInventory().GetFlipCargo() )) flags = flags | InventoryCombinationFlags.ADD_AS_CARGO;
+
+		if (entity1 == m_player.GetHumanInventory().GetEntityInHands() || entity2 == m_player.GetHumanInventory().GetEntityInHands())
+		{
+			ActionManagerClient amc;
+			Class.CastTo(amc, m_player.GetActionManager());
+			if (entity1 == m_player.GetHumanInventory().GetEntityInHands())
+			{
+				if (amc.CanPerformActionFromInventory( ItemBase.Cast(entity1), ItemBase.Cast(entity2) ))
+				{
+					flags = flags | InventoryCombinationFlags.PERFORM_ACTION;
+				}
+				else if (amc.CanSetActionFromInventory( ItemBase.Cast(entity1), ItemBase.Cast(entity2) ))
+				{
+					flags = flags | InventoryCombinationFlags.SET_ACTION;
+				}
+			}
+			else
+			{
+				if (amc.CanPerformActionFromInventory( ItemBase.Cast(entity2), ItemBase.Cast(entity1) ))
+				{
+					flags = flags | InventoryCombinationFlags.PERFORM_ACTION;
+				}
+				else if (amc.CanSetActionFromInventory( ItemBase.Cast(entity2), ItemBase.Cast(entity1) ))
+				{
+					flags = flags | InventoryCombinationFlags.SET_ACTION;
+				}
+			}
+		}
+		return flags;
+	}
+	
+	static int GetRecipeCount(bool recipe_anywhere, EntityAI entity1, EntityAI entity2)
+	{
+		PluginRecipesManager plugin_recipes_manager = PluginRecipesManager.Cast(GetPlugin( PluginRecipesManager ));
+		return plugin_recipes_manager.GetValidRecipes( ItemBase.Cast( entity1 ), ItemBase.Cast( entity2 ), NULL, PlayerBase.Cast( GetGame().GetPlayer() ) );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/LayoutHolder.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/LayoutHolder.c
new file mode 100644
index 0000000000000000000000000000000000000000..e72ff7aa882eebe905be46eb43fa77e49ae58915
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/LayoutHolder.c
@@ -0,0 +1,248 @@
+class LayoutHolder extends ScriptedWidgetEventHandler
+{
+	protected Widget				m_MainWidget;
+	protected Widget				m_RootWidget;
+	protected Widget				m_ParentWidget;
+	protected LayoutHolder			m_Parent;
+	protected string				m_LayoutName;
+	
+	protected bool					m_IsActive;
+	protected bool					m_ImmedUpdate;
+	protected bool					m_TooltipOwner;
+	
+	protected EntityAI				m_am_entity1, m_am_entity2;
+
+	void UpdateInterval();
+	void SetLayoutName();
+	
+	// Override this and set m_ImmedUpdate to true if you need the widget to update on construction
+	// Had to be done this way since adding it to the constructor parameters would break mods..
+	void SetImmedUpdate()
+	{
+		m_ImmedUpdate = false;
+	}
+	
+	void OnSelectAction(ItemBase item, int actionId)
+	{
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		m_player.GetActionManager().OnInstantAction(ActionDebug,new Param2<ItemBase,int>(item,actionId));
+	}
+	
+	void OnSelectActionEx(EntityAI item, int actionId)
+	{
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		m_player.GetActionManager().OnInstantAction(ActionDebug,new Param2<EntityAI,int>(item,actionId));
+	}
+	
+	void ShowActionMenu(InventoryItem item)
+	{
+		PlayerBase m_player = PlayerBase.Cast( GetGame().GetPlayer() );
+		HideOwnedTooltip();
+		m_am_entity1 = item;
+		m_am_entity2 = null;
+		ContextMenu cmenu = ContextMenu.Cast(GetGame().GetUIManager().GetMenu().GetContextMenu());
+
+		cmenu.Hide();
+		cmenu.Clear();
+
+		if (m_am_entity1 == null)
+			return;
+
+		TSelectableActionInfoArrayEx customActions = new TSelectableActionInfoArrayEx();
+		ItemBase itemBase = ItemBase.Cast(item);
+		itemBase.GetDebugActions(customActions);
+
+		if (ItemBase.GetDebugActionsMask() & DebugActionType.PLAYER_AGENTS)
+		{
+			m_player.GetDebugActions(customActions);
+		}
+
+		int actionsCount = customActions.Count();
+		for (int i = 0; i < customActions.Count(); i++)
+		{
+			TSelectableActionInfoWithColor actionInfo = TSelectableActionInfoWithColor.Cast(customActions.Get(i));
+			if (actionInfo)
+			{
+				int actionId 		= actionInfo.param2;
+				int textColor		= actionInfo.param4;
+				string actionText 	= actionInfo.param3;
+
+				if (actionId == EActions.SEPARATOR)
+					cmenu.AddEx(actionText, textColor, this, "", null);
+				else
+					cmenu.AddEx(actionText, textColor, this, "OnSelectActionEx", new Param3<EntityAI, int, int>(itemBase, actionId, textColor));
+			}
+		}
+
+		int actionMenuPosX, actionMenuPosY;
+		GetMousePos(actionMenuPosX, actionMenuPosY);
+		actionMenuPosX -= 5;
+		actionMenuPosY -= 5;
+		cmenu.Show(actionMenuPosX, actionMenuPosY);
+	}
+	
+	
+	void LayoutHolder( LayoutHolder parent )
+	{		
+		m_Parent = parent;
+		
+		SetLayoutName();
+		SetParentWidget();
+		SetImmedUpdate();
+		
+		m_TooltipOwner = false;
+		
+		if ( m_LayoutName != "" )
+		{
+			m_MainWidget = GetGame().GetWorkspace().CreateWidgets( m_LayoutName, null, false );
+			m_MainWidget.Show( true, false );
+		}
+		
+		m_RootWidget = m_MainWidget;
+		
+		if ( m_ParentWidget )
+		{
+			m_ParentWidget.Show( true, false );
+			if ( m_MainWidget )
+			{
+				m_ParentWidget.AddChild( m_MainWidget, false );
+			}
+		}
+		
+		if ( m_ImmedUpdate )
+		{
+			if ( m_MainWidget )
+				m_MainWidget.Update();
+		}
+	}
+	
+	void ~LayoutHolder()
+	{
+		HideOwnedTooltip();
+		delete m_RootWidget;
+	}	
+		
+	LayoutHolder GetRoot()
+	{
+		if ( m_Parent )
+		{
+			ref LayoutHolder container = m_Parent.GetRoot();
+			return container;
+		}
+		else
+		{
+			return this;
+		}
+	}
+	
+	void SetParentWidget()
+	{
+		if ( m_Parent )
+			m_ParentWidget = m_Parent.GetMainWidget();
+	}
+	
+	LayoutHolder GetParent()
+	{
+		return m_Parent;
+	}
+	
+	void SetActive(bool active)
+	{
+		m_IsActive = active;
+	}
+	
+	void SetLastActive();
+	void SetFirstActive();
+
+	bool IsActive()
+	{
+		return m_IsActive;
+	}
+
+	Widget GetMainWidget()
+	{
+		return m_MainWidget;
+	}
+	
+	Widget GetRootWidget()
+	{
+		return m_RootWidget;
+	}
+	
+	bool IsDisplayable()
+	{
+		return true;
+	}
+	
+	bool IsVisible()
+	{
+		if (m_RootWidget)
+		{
+			return m_RootWidget.IsVisible();
+		}
+		return false;
+	}
+
+	void OnShow()
+	{
+		m_RootWidget.Show( true );
+		if ( m_ParentWidget )
+			m_ParentWidget.Show( true );
+	}
+
+	void OnHide()
+	{
+		m_RootWidget.Show( false );
+	}
+
+	void Refresh()
+	{
+		m_RootWidget.Update();
+	}
+	
+	void InspectItem( EntityAI item )
+	{
+		InventoryMenu menu = InventoryMenu.Cast( GetGame().GetUIManager().FindMenu(MENU_INVENTORY) );
+		InspectMenuNew inspect_menu = InspectMenuNew.Cast( menu.EnterScriptedMenu(MENU_INSPECT) );
+		if ( inspect_menu )
+		{
+			GetGame().GetMission().GetHud().ShowHudUI( false );
+			GetGame().GetMission().GetHud().ShowQuickbarUI( false );
+			inspect_menu.SetItem( item );
+		}
+	}
+	
+	void UpdateSelectionIcons()
+	{}
+	
+	void PrepareOwnedTooltip(EntityAI item/*, Widget w*/, int x = 0, int y = 0)
+	{
+		ItemManager.GetInstance().PrepareTooltip(item,x,y);
+		m_TooltipOwner = true;
+	}
+	
+	void PrepareOwnedSlotsTooltip(Widget w, string name, string desc, int x = 0, int y = 0)
+	{
+		ItemManager.GetInstance().SetTooltipWidget(w);
+		ItemManager.GetInstance().PrepareSlotsTooltip(name,desc,x,y);
+		m_TooltipOwner = true;
+	}
+	
+	void HideOwnedTooltip()
+	{
+		if (m_TooltipOwner)
+		{
+			ItemManager.GetInstance().HideTooltip();
+			m_TooltipOwner = false;
+		}
+	}
+	
+	void HideOwnedSlotsTooltip()
+	{
+		if (m_TooltipOwner)
+		{
+			ItemManager.GetInstance().HideTooltipSlot();
+			m_TooltipOwner = false;
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/PlayerPreview.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/PlayerPreview.c
new file mode 100644
index 0000000000000000000000000000000000000000..5b5c4c6a265f85097aff0e4d91a295e2297143c2
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/PlayerPreview.c
@@ -0,0 +1,117 @@
+class PlayerPreview: LayoutHolder
+{
+	protected ref PlayerPreviewWidget m_CharacterPanelWidget;
+
+	protected int m_CharacterRotationX;
+	protected int m_CharacterRotationY;
+	protected int m_CharacterScaleDelta;
+	protected vector m_CharacterOrientation;
+	protected bool m_IsHolding;
+	
+	void PlayerPreview( LayoutHolder parent )
+	{
+		m_CharacterPanelWidget = PlayerPreviewWidget.Cast( m_Parent.GetMainWidget().FindAnyWidget( "CharacterPanelWidget" ) );
+
+		WidgetEventHandler.GetInstance().RegisterOnMouseButtonDown( m_Parent.GetMainWidget().FindAnyWidget( "CharacterPanel" ),  this, "MouseButtonDown" );
+		WidgetEventHandler.GetInstance().RegisterOnMouseWheel( m_Parent.GetMainWidget().FindAnyWidget( "CharacterPanel" ),  this, "MouseWheel" );
+		
+		m_CharacterScaleDelta = 1;
+		m_CharacterPanelWidget.SetPlayer( GetGame().GetPlayer() );
+		m_CharacterPanelWidget.SetModelPosition( "0 0 0.605" );
+		m_CharacterPanelWidget.SetSize( 1.34, 1.34 );  // default scale
+		UpdateScale();
+	}
+	
+	void RefreshPlayerPreview()
+	{
+		m_CharacterPanelWidget.Refresh();
+	}
+	
+	void UpdateRotation( int mouse_x, int mouse_y, bool is_dragging )
+	{
+		if ( m_CharacterPanelWidget )
+		{
+			vector orientation = m_CharacterOrientation;
+			orientation[1] = orientation[1] - ( m_CharacterRotationX - mouse_x );
+			
+			m_CharacterPanelWidget.SetModelOrientation( orientation );
+	
+			if ( !is_dragging )
+			{	
+				m_CharacterOrientation = orientation;
+			}
+		}
+	}
+
+	void UpdateScale()
+	{
+		if ( m_CharacterPanelWidget )
+		{
+			float w, h;
+			m_CharacterPanelWidget.GetSize( w, h );
+			w = w + ( m_CharacterScaleDelta / 25 );
+			h = h + ( m_CharacterScaleDelta / 25 );
+			if ( w > 0.62 && w < 3 )
+			{
+				m_CharacterPanelWidget.SetSize( w, h );
+			}
+			else if ( w < 0.62 )
+			{
+				m_CharacterPanelWidget.SetSize( 0.62, 0.62 );
+			}
+			else if ( w > 3 )
+			{
+				m_CharacterPanelWidget.SetSize( 3, 3 );
+			}
+		}
+	}
+	
+	bool MouseButtonDown(Widget w, int x, int y, int button)
+	{
+		GetMousePos( m_CharacterRotationX, m_CharacterRotationY );
+		m_IsHolding = true;
+		return true;
+	}
+	
+	bool MouseWheel(Widget w, int x, int y, int wheel)
+	{
+		m_CharacterScaleDelta = wheel;
+		UpdateScale();
+		return true;
+	}
+	
+	override void UpdateInterval()
+	{
+		// item in hands update
+		m_CharacterPanelWidget.UpdateItemInHands(GetGame().GetPlayer().GetHumanInventory().GetEntityInHands());
+		
+		PlayerBase realPlayer = PlayerBase.Cast(GetGame().GetPlayer());
+		DayZPlayer dummyPlayer = m_CharacterPanelWidget.GetDummyPlayer();
+		if ( realPlayer && dummyPlayer )
+		{
+			// injury animation update
+			HumanCommandAdditives hca = dummyPlayer.GetCommandModifier_Additives();
+			//dummyPlayer.UpdateDummyPlayerProxyVisibility(realPlayer.FindAttachmentBySlotName("Shoulder"), realPlayer.FindAttachmentBySlotName("Melee"));
+			if ( hca && realPlayer.m_InjuryHandler )
+				hca.SetInjured(realPlayer.m_InjuryHandler.GetInjuryAnimValue(), realPlayer.m_InjuryHandler.IsInjuryAnimEnabled());
+		}
+		
+		if ( m_IsHolding )
+		{
+			int mouse_x;
+			int mouse_y;
+				
+			GetMousePos(mouse_x, mouse_y);
+			
+			if ( GetMouseState(MouseState.LEFT) & 0x80000000 )
+			{
+				UpdateRotation( mouse_x, mouse_y, true );
+			}
+			else
+			{
+				UpdateRotation( mouse_x, mouse_y, false );
+				m_IsHolding = false;
+			}
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/SplitItemUtils.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/SplitItemUtils.c
new file mode 100644
index 0000000000000000000000000000000000000000..385217c0957fcba06c764d708a7fd0f9f8ed4cb0
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/SplitItemUtils.c
@@ -0,0 +1,59 @@
+class SplitItemUtils
+{
+	static void TakeOrSplitToInventory ( notnull PlayerBase player, notnull EntityAI target, notnull EntityAI item)
+	{
+		ItemBase item_base = ItemBase.Cast( item );
+		
+		if( !item.GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+			return;
+		
+		InventoryLocation il = new InventoryLocation;
+		if( target.GetInventory().FindFreeLocationFor( item, FindInventoryLocationType.ANY, il) )
+		{
+			if( item_base.GetTargetQuantityMax(il.GetSlot()) >= item_base.GetQuantity() )
+			{
+				if( il.GetType() == InventoryLocationType.ATTACHMENT )
+				{
+					player.PredictiveTakeEntityToTargetAttachmentEx(il.GetParent(), item, il.GetSlot());
+				}
+				else
+				{
+					InventoryLocation src = new InventoryLocation;
+					if (item.GetInventory().GetCurrentInventoryLocation(src))
+						player.PredictiveTakeToDst(src, il);
+				
+				}
+			}
+			else
+			{
+				item_base.SplitIntoStackMaxClient( il.GetParent(), il.GetSlot() );
+			}
+		}
+	}
+	
+	static void TakeOrSplitToInventoryLocation ( notnull PlayerBase player, notnull InventoryLocation dst)
+	{
+		ItemBase item_base = ItemBase.Cast( dst.GetItem() );	
+		int slot = dst.GetSlot();
+
+		if( !dst.GetItem().GetInventory().CanRemoveEntity() || !player.CanManipulateInventory() )
+			return;
+		
+		float stack_max = item_base.GetTargetQuantityMax(slot);
+		
+		if( stack_max >= item_base.GetQuantity() )
+		{
+			InventoryLocation src = new InventoryLocation;
+			if (dst.GetItem().GetInventory().GetCurrentInventoryLocation(src))
+			{
+				player.PredictiveTakeToDst(src, dst);
+			}
+			else
+				Error("TakeIntoCargoEx cannot get src for dst=" + dst.DumpToString());
+		}
+		else
+		{
+			item_base.SplitIntoStackMaxToInventoryLocationClient( dst );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/InventoryNew/VicinityItemManager.c b/scripts/5_Mission/DayZ/GUI/InventoryNew/VicinityItemManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..aaf496a35622cb412c2f966d7638fb2b2188f654
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InventoryNew/VicinityItemManager.c
@@ -0,0 +1,467 @@
+class VicinityItemManager
+{
+	private const float UPDATE_FREQUENCY 				= 0.25;
+	private const float VICINITY_DISTANCE				= 0.5;
+	private const float VICINITY_ACTOR_DISTANCE			= 2.0;
+	private const float VICINITY_LARGE_ACTOR_DISTANCE 	= 3.0;
+	private const float VICINITY_CONE_DISTANCE			= 2.0;
+	private const float VICINITY_CONE_REACH_DISTANCE	= 2.0;
+	private const float VICINITY_CONE_ANGLE 			= 30;
+	private const float VICINITY_CONE_RADIANS 			= 0.5;
+	private const string CE_CENTER 						= "ce_center";
+	private const float HEIGHT_OFFSET 					= 0.2;
+	private const int OBJECT_OBSTRUCTION_WEIGHT			= 10000; //in grams
+	private const float CONE_HEIGHT_MIN 				= -0.5;
+	private const float CONE_HEIGHT_MAX 				= 3.0;
+
+	private ref array<EntityAI> m_VicinityItems 		= new array<EntityAI>();
+	private ref array<CargoBase> m_VicinityCargos 		= new array<CargoBase>();
+	private float m_RefreshCounter;
+	private static ref VicinityItemManager s_Instance;
+	
+	static VicinityItemManager GetInstance ()
+	{
+		if (!s_Instance)
+			s_Instance = new VicinityItemManager();
+
+		return s_Instance;
+	}
+	
+	void Init()
+	{
+	}
+	
+	array<EntityAI> GetVicinityItems()
+	{
+		return m_VicinityItems;
+	}
+	
+	void AddVicinityItems(Object object)
+	{
+		EntityAI entity = EntityAI.Cast(object);
+		if (!entity)
+		{
+			return;
+		}
+		
+		if (m_VicinityItems.Find(entity) != INDEX_NOT_FOUND)
+		{
+			return;
+		}
+		
+		if (GameInventory.CheckManipulatedObjectsDistances(entity, GetGame().GetPlayer(), VICINITY_CONE_REACH_DISTANCE + 1.0) == false)
+		{
+			if (!FreeDebugCamera.GetInstance() || FreeDebugCamera.GetInstance().IsActive() == false)
+			{
+				return;
+			}
+		}
+		
+		m_VicinityItems.Insert(entity);
+	}
+
+	array<CargoBase> GetVicinityCargos()
+	{
+		return m_VicinityCargos;
+	}
+	
+	void AddVicinityCargos(CargoBase object)
+	{
+		if (m_VicinityCargos.Find(object) == INDEX_NOT_FOUND)
+		{
+			m_VicinityCargos.Insert(object);
+		}
+	}
+	
+	void ResetRefreshCounter()
+	{
+		m_RefreshCounter = 0;
+	}
+	
+	void Update(float delta_time)
+	{
+		m_RefreshCounter += delta_time;
+		
+		if (m_RefreshCounter >= UPDATE_FREQUENCY)
+		{
+			RefreshVicinityItems();
+			m_RefreshCounter = 0;
+		}
+	}
+	
+	bool ExcludeFromContainer_Phase1(Object actor_in_radius)
+	{
+		EntityAI entity;
+		if (!Class.CastTo(entity, actor_in_radius))
+			return true;
+
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (entity == player)
+			return true;
+		if (entity.IsParticle())
+			return true;
+		if (entity.IsScriptedLight())
+			return true;
+		if (entity.IsBeingPlaced())
+			return true;
+		if (entity.IsHologram())
+			return true;
+		if (entity.IsMan() || entity.IsZombie() || entity.IsZombieMilitary())
+		{
+			//visibility cone check
+			vector entityPosition = entity.GetPosition();
+			
+			if (entity && entity.IsMan())
+			{
+				PlayerBase vicinityPlayer = PlayerBase.Cast(entity);
+				if (vicinityPlayer)
+				{
+					entityPosition = vicinityPlayer.GetBonePositionWS(vicinityPlayer.GetBoneIndexByName("spine3"));
+				}
+			}
+			else if (entity && (entity.IsZombie() || entity.IsZombieMilitary()))
+			{
+				ZombieBase zombie = ZombieBase.Cast(entity);
+				if (zombie)
+				{
+					entityPosition = zombie.GetBonePositionWS(zombie.GetBoneIndexByName("spine3"));
+				}
+			}
+			
+			//! If in free camera, allow viewing of inventory
+			if (FreeDebugCamera.GetInstance() && FreeDebugCamera.GetInstance().IsActive())
+			{
+				return false;
+			}
+			
+			vector entityDirection = player.GetPosition() - entityPosition;
+			entityDirection.Normalize();
+			entityDirection[1] = 0; //ignore height
+			
+			vector playerDirection =  MiscGameplayFunctions.GetHeadingVector(player);
+			playerDirection.Normalize();
+			playerDirection[1] = 0; //ignore height
+			
+			float dotRadians = vector.Dot(playerDirection, entityDirection);
+			if (dotRadians > -0.5)
+				return true;
+		}
+
+		return false;
+	}
+	
+	bool ExcludeFromContainer_Phase2(Object object_in_radius)
+	{
+		EntityAI entity;
+
+		if (!Class.CastTo(entity, object_in_radius))
+			return true;
+		if (entity == PlayerBase.Cast(GetGame().GetPlayer()))
+			return true;
+		if (entity.IsParticle())
+			return true;
+		if (entity.IsScriptedLight())
+			return true;
+		if (entity.IsBeingPlaced())
+			return true;
+		if (entity.IsHologram())
+			return true;
+		
+		ItemBase item;
+		if (!Class.CastTo(item, object_in_radius))
+			return true;
+		if (!item.IsTakeable())
+			return true;
+		
+		return false;
+	}
+	
+	bool ExcludeFromContainer_Phase3(Object object_in_cone)
+	{
+		EntityAI entity;
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+
+		//Print("---object in cone: " + object_in_cone);
+		if (!Class.CastTo(entity, object_in_cone))
+			return true;
+		if (entity == player)
+			return true;
+		if (entity.IsParticle())
+			return true;
+		if (entity.IsScriptedLight())
+			return true;
+		if (entity.IsBeingPlaced())
+			return true;
+		if (entity.IsHologram())
+			return true;
+
+		ItemBase item;
+		if (!Class.CastTo(item, object_in_cone) && !object_in_cone.IsTransport() && !PASBroadcaster.Cast(object_in_cone))
+			return true;
+		if (item && !item.IsTakeable())
+			return true;
+
+		return false;
+	}
+	
+	bool CanIgnoreDistanceCheck(EntityAI entity_ai)
+	{
+		return MiscGameplayFunctions.CanIgnoreDistanceCheck(entity_ai);
+	}
+	
+	//per frame call
+	void RefreshVicinityItems()
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		array<Object> objectsInVicinity 	= new array<Object>();
+		array<CargoBase> proxyCargos 		= new array<CargoBase>();
+		array<Object> filteredObjects 		= new array<Object>();
+		array<Object> allFoundObjects 		= new array<Object>();
+		vector playerPosition 				= player.GetPosition();
+		vector playerHeadPositionFixed		= playerPosition;
+		playerHeadPositionFixed[1]			= playerPosition[1] + 1.6;
+		vector headingDirection 			= MiscGameplayFunctions.GetHeadingVector(player);		
+		
+		//! If in free camera, override the position that the inventory gets generated from
+		bool cameraActive = FreeDebugCamera.GetInstance() && FreeDebugCamera.GetInstance().IsActive();
+		if (cameraActive)
+		{
+			playerPosition = FreeDebugCamera.GetInstance().GetPosition();
+			playerHeadPositionFixed = playerPosition;
+			
+			float headingAngle = FreeDebugCamera.GetInstance().GetOrientation()[0] * Math.DEG2RAD;
+	
+			headingDirection[0] = Math.Cos(headingAngle);
+			headingDirection[1] = 0;
+			headingDirection[2] = Math.Sin(headingAngle);
+			headingDirection.Normalize();
+		}	
+		
+		if (m_VicinityItems)
+			m_VicinityItems.Clear();
+		
+		if (m_VicinityCargos)
+			m_VicinityCargos.Clear();
+		
+		//1. GetAll actors in VICINITY_ACTOR_DISTANCE
+		//DebugActorsSphereDraw(VICINITY_ACTOR_DISTANCE);
+		GetGame().GetObjectsAtPosition3D(playerPosition, VICINITY_ACTOR_DISTANCE, objectsInVicinity, proxyCargos);
+		
+		// no filtering for cargo (initial implementation)		
+		foreach (CargoBase cargoObject : proxyCargos)
+			AddVicinityCargos(cargoObject);
+		
+		//filter unnecessary and duplicate objects beforehand
+		foreach (Object actorInRadius : objectsInVicinity)
+		{
+			if (allFoundObjects.Find(actorInRadius) == INDEX_NOT_FOUND)
+				allFoundObjects.Insert(actorInRadius);
+			
+			if (ExcludeFromContainer_Phase1(actorInRadius))
+				continue;
+				
+			if (filteredObjects.Find(actorInRadius) == INDEX_NOT_FOUND)
+				filteredObjects.Insert(actorInRadius);
+		}
+		
+		if (objectsInVicinity) 
+			objectsInVicinity.Clear();
+		
+		//2. GetAll Objects in VICINITY_DISTANCE
+		GetGame().GetObjectsAtPosition3D(playerPosition, VICINITY_DISTANCE, objectsInVicinity, proxyCargos);
+		//DebugObjectsSphereDraw(VICINITY_DISTANCE);
+		
+		//filter unnecessary and duplicate objects beforehand
+		foreach (Object objectInRadius : objectsInVicinity)
+		{
+			if (allFoundObjects.Find(objectInRadius) == INDEX_NOT_FOUND)
+				allFoundObjects.Insert(objectInRadius);
+			
+			if (ExcludeFromContainer_Phase2(objectInRadius))
+				continue;
+			
+			if (filteredObjects.Find(objectInRadius) == INDEX_NOT_FOUND)
+				filteredObjects.Insert(objectInRadius);
+		}
+		
+		if (objectsInVicinity)
+			objectsInVicinity.Clear();
+		
+		//3. Add objects from GetEntitiesInCone
+		DayZPlayerUtils.GetEntitiesInCone(playerPosition, headingDirection, VICINITY_CONE_ANGLE, VICINITY_CONE_REACH_DISTANCE, CONE_HEIGHT_MIN, CONE_HEIGHT_MAX, objectsInVicinity);
+		//DebugConeDraw(playerPosition, VICINITY_CONE_ANGLE);
+
+		RaycastRVParams rayInput;
+		array<ref RaycastRVResult> raycastResults = new array<ref RaycastRVResult>();
+		//filter unnecessary and duplicate objects beforehand
+		foreach (Object objectInCone : objectsInVicinity)
+		{
+			if (allFoundObjects.Find(objectInCone) == INDEX_NOT_FOUND)
+				allFoundObjects.Insert(objectInCone);
+			
+			if (ExcludeFromContainer_Phase3(objectInCone))
+				continue;
+
+			if (filteredObjects.Find(objectInCone) == INDEX_NOT_FOUND)
+			{
+				//Test distance to closest component first
+				rayInput 		= new RaycastRVParams(playerHeadPositionFixed, objectInCone.GetPosition());
+				rayInput.flags	= CollisionFlags.NEARESTCONTACT;
+				rayInput.type 	= ObjIntersectView;
+				rayInput.radius = 0.1;
+				DayZPhysics.RaycastRVProxy(rayInput, raycastResults, {player});
+				
+				foreach (RaycastRVResult result : raycastResults)
+				{
+					if (vector.DistanceSq(result.pos, playerHeadPositionFixed) > VICINITY_CONE_REACH_DISTANCE * VICINITY_CONE_REACH_DISTANCE)
+						continue;
+					
+					if (result.hierLevel > 0 && result.parent == objectInCone)
+						filteredObjects.Insert(objectInCone);
+					else if (result.hierLevel == 0 && result.obj == objectInCone)
+						filteredObjects.Insert(objectInCone);
+				}
+			}
+		}
+		
+		//4. Add large objects - particularly buildings and BaseBuildingBase
+		BoxCollidingParams params = new BoxCollidingParams();
+		vector boxEdgeLength = {
+			VICINITY_LARGE_ACTOR_DISTANCE,
+			VICINITY_LARGE_ACTOR_DISTANCE,
+			VICINITY_LARGE_ACTOR_DISTANCE
+		};
+
+		params.SetParams(playerPosition, headingDirection.VectorToAngles(), boxEdgeLength * 2, ObjIntersect.View, ObjIntersect.Fire, true);
+		array<ref BoxCollidingResult> results = new array<ref BoxCollidingResult>();
+		if (GetGame().IsBoxCollidingGeometryProxy(params, {player}, results))
+		{
+			foreach (BoxCollidingResult bResult : results)
+			{
+				if (bResult.obj && (bResult.obj.CanObstruct() || bResult.obj.CanProxyObstruct()))
+				{
+					if (allFoundObjects.Find(bResult.obj) == INDEX_NOT_FOUND)
+					{
+						allFoundObjects.Insert(bResult.obj);
+					}
+				}
+				
+				if (bResult.parent && (bResult.parent.CanObstruct() || bResult.parent.CanProxyObstruct()))
+				{
+					if (allFoundObjects.Find(bResult.parent) == INDEX_NOT_FOUND)
+					{
+						allFoundObjects.Insert(bResult.parent);
+					}
+				}
+			}
+		}
+		
+		//5. Filter filtered objects with RayCast from the player ( head bone )
+		array<Object> obstructingObjects = new array<Object>();
+		MiscGameplayFunctions.FilterObstructingObjects(allFoundObjects, obstructingObjects);
+		
+		//! If in free camera, don't worry about obstructed objects if there are any
+		if (obstructingObjects.Count() > 0 && !cameraActive)
+		{
+			if (filteredObjects.Count() > 10)
+			{
+				vector rayStart;
+				MiscGameplayFunctions.GetHeadBonePos(player, rayStart);
+				
+				array<Object> filteredObjectsGrouped = new array<Object>();
+				MiscGameplayFunctions.FilterObstructedObjectsByGrouping(rayStart, VICINITY_CONE_DISTANCE, 0.3, filteredObjects, obstructingObjects, filteredObjectsGrouped, true, true, VICINITY_CONE_REACH_DISTANCE);
+				
+				foreach (Object object: filteredObjectsGrouped)
+					AddVicinityItems(object);
+			}
+			else
+			{
+				foreach (Object filteredObjectClose: filteredObjects)
+				{
+					EntityAI entity;
+					Class.CastTo(entity, filteredObjectClose);
+					
+					//distance check
+					if (vector.DistanceSq(playerPosition, entity.GetPosition()) > VICINITY_CONE_REACH_DISTANCE * VICINITY_CONE_REACH_DISTANCE)
+					{
+					    if (!CanIgnoreDistanceCheck(entity))
+					    {
+					        continue;
+					    }
+					}
+					
+					if (!IsObstructed(filteredObjectClose))
+					{
+						AddVicinityItems(filteredObjectClose);
+					}
+				}	
+			}
+		}
+		else
+		{
+			foreach (Object filteredObject: filteredObjects)
+				AddVicinityItems(filteredObject);
+		}
+	}
+	
+	bool IsObstructed(Object filtered_object)
+	{
+		return MiscGameplayFunctions.IsObjectObstructed(filtered_object);
+	}
+	
+#ifdef DIAG_DEVELOPER
+	//Debug functions
+	
+	ref array<Shape> rayShapes = new array<Shape>();
+	
+	private void DebugActorsSphereDraw(float radius)
+	{
+		CleanupDebugShapes(rayShapes);
+		
+		rayShapes.Insert(Debug.DrawSphere( GetGame().GetPlayer().GetPosition(), radius, COLOR_GREEN, ShapeFlags.TRANSP|ShapeFlags.WIREFRAME));
+	}
+	
+	private void DebugObjectsSphereDraw(float radius)
+	{		
+		rayShapes.Insert(Debug.DrawSphere(GetGame().GetPlayer().GetPosition(), radius, COLOR_GREEN, ShapeFlags.TRANSP|ShapeFlags.WIREFRAME));
+	}
+	
+	private void DebugRaycastDraw(vector start, vector end)
+	{
+		rayShapes.Insert(Debug.DrawArrow(start, end, 0.5, COLOR_YELLOW));
+	}
+	
+	private void DebugConeDraw(vector start, float cone_angle)
+	{
+		vector endL, endR;
+		float playerAngle;
+		float xL,xR,zL,zR;
+		
+		playerAngle = MiscGameplayFunctions.GetHeadingAngle(PlayerBase.Cast(GetGame().GetPlayer()));
+
+		endL = start;
+		endR = start;
+		xL = VICINITY_CONE_REACH_DISTANCE * Math.Cos( playerAngle + Math.PI_HALF + cone_angle * Math.DEG2RAD ); // x
+		zL = VICINITY_CONE_REACH_DISTANCE * Math.Sin( playerAngle + Math.PI_HALF + cone_angle * Math.DEG2RAD ); // z
+		xR = VICINITY_CONE_REACH_DISTANCE * Math.Cos( playerAngle + Math.PI_HALF - cone_angle * Math.DEG2RAD ); // x
+		zR = VICINITY_CONE_REACH_DISTANCE * Math.Sin( playerAngle + Math.PI_HALF - cone_angle * Math.DEG2RAD ); // z
+		endL[0] = endL[0] + xL;
+		endL[2] = endL[2] + zL;
+		endR[0] = endR[0] + xR;
+		endR[2] = endR[2] + zR;
+
+		rayShapes.Insert(Debug.DrawLine(start, endL, COLOR_GREEN));
+		rayShapes.Insert(Debug.DrawLine(start, endR, COLOR_GREEN)) ;
+		rayShapes.Insert(Debug.DrawLine(endL, endR, COLOR_GREEN));
+	}
+	
+	private void CleanupDebugShapes(array<Shape> shapesArr)
+	{
+		foreach (Shape shape : shapesArr)
+			Debug.RemoveShape(shape);
+		
+		shapesArr.Clear();
+	}
+#endif
+}
diff --git a/scripts/5_Mission/DayZ/GUI/InviteMenu.c b/scripts/5_Mission/DayZ/GUI/InviteMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..9df21e09eb715304c6aaf212b6719e95c05b7396
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/InviteMenu.c
@@ -0,0 +1,168 @@
+class InviteMenu extends UIScriptedMenu
+{	
+	private TextWidget m_LogoutTimeText;
+	private TextWidget m_DescriptionText;
+	private ButtonWidget m_bCancel;
+	private ButtonWidget m_bCancelConsole;
+	private int m_iTime;
+	
+	private ref FullTimeData m_FullTime;
+
+	void InviteMenu()
+	{
+		m_iTime = 15;
+
+		m_FullTime = new FullTimeData();
+
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().AddActiveInputExcludes({"menu"});
+
+			GetGame().GetMission().GetHud().ShowHudUI(false);
+			GetGame().GetMission().GetHud().ShowQuickbarUI(false);
+		}
+	}
+	
+	void ~InviteMenu()
+	{
+		if (GetGame() && GetGame().GetMission())
+		{
+			GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+			
+			GetGame().GetMission().GetHud().ShowHudUI(true);
+			GetGame().GetMission().GetHud().ShowQuickbarUI(true);
+	
+			GetGame().GetMission().GetOnInputPresetChanged().Remove(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Remove(OnInputDeviceChanged);
+		}
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_invite_dialog.layout");
+		
+		m_LogoutTimeText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("txtLogoutTime"));
+		m_DescriptionText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("txtDescription"));
+		m_bCancel 			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("bCancel"));
+		
+		// player should sit down if possible
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player && player.GetEmoteManager() && !player.IsRestrained() && !player.IsUnconscious()) 
+		{
+			player.GetEmoteManager().CreateEmoteCBFromMenu(EmoteConstants.ID_EMOTE_SITA);
+			player.GetEmoteManager().GetEmoteLauncher().SetForced(EmoteLauncher.FORCE_DIFFERENT);
+		}
+		
+		if (GetGame().GetMission())
+		{		
+			GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		}
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+		
+		SetTime(m_iTime);
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(UpdateTime, 1000, true);
+
+		return layoutRoot;
+	}
+
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+			Cancel();
+		
+		if (m_iTime <= 0)
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(this.UpdateTime);
+			string ip;
+			int port;
+			OnlineServices.GetInviteServerInfo(ip, port);
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(g_Game.ConnectFromJoin, ip, port);
+		}
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w.GetUserID() == IDC_CANCEL)
+		{
+			Cancel();
+			return true;
+		}
+
+		return false;
+	}
+	
+	void SetTime(int time)
+	{
+		m_iTime = time;
+		string text = "#layout_logout_dialog_until_logout_";
+
+		TimeConversions.ConvertSecondsToFullTime(time, m_FullTime);
+		
+		if (m_FullTime.m_Days > 0)
+			text += "dhms";
+		else if (m_FullTime.m_Hours > 0)
+			text += "hms";
+		else if (m_FullTime.m_Minutes > 0)
+			text += "ms";
+		else
+			text += "s";
+		
+		text = Widget.TranslateString(text);
+		text = string.Format(text, m_FullTime.m_Seconds, m_FullTime.m_Minutes, m_FullTime.m_Hours, m_FullTime.m_Days);
+		m_LogoutTimeText.SetText(text);
+	}
+		
+	void UpdateTime()
+	{
+		if (m_iTime > 0)
+		{
+			m_iTime -= 1;
+			SetTime(m_iTime);
+		}
+	}
+
+	void Cancel()
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(this.UpdateTime);
+		
+		g_Game.SetGameState(DayZGameState.IN_GAME);
+		g_Game.SetLoadState(DayZLoadState.CONNECT_CONTROLLER_SELECT);
+		Close();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbarText = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string context = string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#dialog_cancel", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		
+		toolbarText.SetText(context);
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboard() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		layoutRoot.FindAnyWidget("BottomConsoleToolbar").Show(toolbarShow);
+		m_bCancel.Show(!toolbarShow);
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ItemActionsWidget.c b/scripts/5_Mission/DayZ/GUI/ItemActionsWidget.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b1aab00483182c7625292e4b56c790813b3b76a
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ItemActionsWidget.c
@@ -0,0 +1,728 @@
+class ItemActionsWidget extends ScriptedWidgetEventHandler
+{
+	protected PlayerBase 				m_Player;
+	protected EntityAI 					m_EntityInHands;
+	protected ActionBase				m_Interact;
+	protected ActionBase				m_ContinuousInteract;
+	protected ActionBase				m_Single;
+	protected ActionBase				m_Continuous;
+	protected ActionManagerClient	 	m_AM;
+	protected IngameHud					m_Hud;
+	
+	protected UAIDWrapper 				m_UseActionWrapper;
+
+	protected int						m_InteractActionsNum;
+	protected int						m_ContinuousInteractActionsNum;
+	protected int						m_ItemActionsNum;
+	protected int						m_ContinuousItemActionsNum;
+	protected bool 						m_HealthEnabled;
+	protected bool						m_QuantityEnabled;
+	
+	protected ref WidgetFadeTimer		m_FadeTimer;
+	protected bool						m_Faded;
+	protected bool 						m_Hidden;
+
+	protected Widget					m_Root;
+	protected Widget 					m_ItemLeft;
+
+	//! widget width
+	protected float m_MaxWidthChild;
+	protected float m_RootWidth;
+	protected float m_RootHeight;
+	
+	void ItemActionsWidget()
+	{
+		m_Interact				= null;
+		m_ContinuousInteract 	= null;
+		m_Single 				= null;
+		m_Continuous 			= null;
+		m_AM 					= null;
+
+		m_FadeTimer 			= new WidgetFadeTimer;
+		m_Faded 				= true;
+		
+		m_HealthEnabled 		= true;
+		m_QuantityEnabled 		= true;
+		
+		m_Hud					= GetHud();
+		m_Hidden 				= true;
+		
+		m_UseActionWrapper 		= GetUApi().GetInputByID(UAAction).GetPersistentWrapper();
+		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(Update);
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+	}
+	
+	void ~ItemActionsWidget()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Remove(Update);
+	}
+	
+	//! DEPRECATED
+	void SetInteractXboxIcon(string imageset_name, string image_name) {};
+	void SetContinuousInteractXboxIcon(string imageset_name, string image_name) {};
+	void SetSingleXboxIcon(string imageset_name, string image_name) {};
+	void SetContinuousXboxIcon(string imageset_name, string image_name) {};
+	protected void SetXboxIcon(string name, string imageset_name, string image_name) {};
+	//! ----------
+	
+	protected void SetControllerIcon(string pWidgetName, string pInputName)
+	{
+		RichTextWidget w = RichTextWidget.Cast(m_Root.FindAnyWidget(pWidgetName + "_btn_icon_xbox"));
+		w.SetText(InputUtils.GetRichtextButtonIconFromInputAction(pInputName, "", EUAINPUT_DEVICE_CONTROLLER));
+	}
+
+	protected void ShowXboxHidePCIcons(string widget, bool show_xbox_icon)
+	{
+		m_Root.FindAnyWidget(widget + "_btn_icon_xbox").Show(show_xbox_icon);
+		m_Root.FindAnyWidget(widget + "_btn_icon").Show(!show_xbox_icon);
+	}
+
+	protected void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+		m_Root.Show(false);		
+
+		m_ItemLeft = w.FindAnyWidget("ia_item_left");
+		
+		//! UA -> widget icon
+		UpdateControllerInputIcons();
+		UpdatePCIconsVisibility();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControllerInputIcons();
+		#endif
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdatePCIconsVisibility();
+	}
+	
+	//! Loads icons from the latest keybinds
+	private void UpdateControllerInputIcons()
+	{
+		SetControllerIcon("ia_interact", "UAAction");
+		SetControllerIcon("ia_continuous_interact", "UAAction");
+		SetControllerIcon("ia_single", "UADefaultAction");
+		SetControllerIcon("ia_continuous", "UADefaultAction");
+	}
+	
+	//! Contains logic for icon set switching (Gamepad/M&K)
+	private void UpdatePCIconsVisibility()
+	{
+		bool showConsoleIcons = false;
+		#ifdef PLATFORM_CONSOLE
+		showConsoleIcons = GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER || !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer();
+		#endif
+		
+		ShowXboxHidePCIcons("ia_interact", showConsoleIcons);
+		ShowXboxHidePCIcons("ia_continuous_interact", showConsoleIcons);
+		ShowXboxHidePCIcons("ia_single", showConsoleIcons);
+		ShowXboxHidePCIcons("ia_continuous", showConsoleIcons);
+	}
+
+	protected void BuildCursor()
+	{
+		int health 				= -1;
+		int quantityType 		= 0;
+		int quantityMin			= -1;
+		int quantityMax 		= -1;
+		float quantityCurrent 	= -1.0;
+
+		// item health
+		health = GetItemHealth();
+		SetItemHealth(health, "ia_item", "ia_item_health_mark", m_HealthEnabled);
+		
+		// quantity
+		//! weapon specific
+		if (m_EntityInHands && m_EntityInHands.IsWeapon())
+		{
+			SetWeaponQuantity(0, 0, "ia_item", "ia_item_quantity_pb", "ia_item_quantity_text", m_QuantityEnabled);
+			SetWeaponModeAndZeroing("ia_item_subdesc", "ia_item_subdesc_up", "ia_item_subdesc_down", true);
+		}
+		//! transmitter/PAS specific
+		else if (m_EntityInHands && m_EntityInHands.IsTransmitter())
+		{
+			SetRadioFrequency(GetRadioFrequency(), "ia_item_subdesc", "ia_item_subdesc_up", "ia_item_subdesc_down", m_QuantityEnabled);
+			GetItemQuantity(quantityType, quantityCurrent, quantityMin, quantityMax);
+			SetItemQuantity(quantityType, quantityCurrent, quantityMin, quantityMax, "ia_item", "ia_item_quantity_pb", "ia_item_quantity_text", true);
+		}
+		else
+		{
+			GetItemQuantity(quantityType, quantityCurrent, quantityMin, quantityMax);
+			SetItemQuantity(quantityType, quantityCurrent, quantityMin, quantityMax, "ia_item", "ia_item_quantity_pb", "ia_item_quantity_text", m_QuantityEnabled);
+			SetWeaponModeAndZeroing("ia_item_subdesc", "", "", false);
+		}
+	
+		SetItemDesc(m_EntityInHands, GetItemDesc(m_EntityInHands), "ia_item", "ia_item_desc");
+		SetInteractActionIcon("ia_interact", "ia_interact_icon_frame", "ia_interact_btn_inner_icon", "ia_interact_btn_text");
+		SetActionWidget(m_Interact, GetActionDesc(m_Interact), "ia_interact", "ia_interact_action_name");
+
+		SetInteractActionIcon("ia_continuous_interact", "ia_continuous_interact_icon_frame", "ia_continuous_interact_btn_inner_icon", "ia_continuous_interact_btn_text");
+		SetActionWidget(m_ContinuousInteract, GetActionDesc(m_ContinuousInteract), "ia_continuous_interact", "ia_continuous_interact_action_name");
+
+		SetActionWidget(m_Single, GetActionDesc(m_Single), "ia_single", "ia_single_action_name");
+		SetActionWidget(m_Continuous, GetActionDesc(m_Continuous), "ia_continuous", "ia_continuous_action_name");
+		SetMultipleInteractAction("ia_interact_mlt_wrapper");
+		SetMultipleContinuousInteractAction("ia_continuous_interact_mlt_wrapper");
+		SetMultipleItemAction("ia_single_mlt_wrapper");
+		SetMultipleContinuousItemAction("ia_continuous_mlt_wrapper");
+	}
+	
+	protected void Update()
+	{
+		//! don't show when disabled in profile
+		if (!g_Game.GetProfileOption(EDayZProfilesOptions.HUD) || !m_Hud.IsHudVisible())
+		{
+			m_Root.Show(false);
+			return;
+		}
+
+		if (m_Player && !m_Player.IsAlive()) // handle respawn
+		{
+			m_Player = null;
+			m_AM = null;
+		}
+
+		if (!m_Player)
+			GetPlayer();
+
+		if (!m_AM)
+			GetActionManager();
+
+		GetActions();
+		GetEntityInHands();
+
+		if ((m_EntityInHands || !m_Hidden) && GetGame().GetUIManager().GetMenu() == null)
+		{
+			CheckForActionWidgetOverrides();
+			BuildCursor();
+			CheckRefresherFlagVisibility();
+			m_Root.Show(true);
+		}
+		else
+			m_Root.Show(false);
+
+		m_MaxWidthChild = 200;
+	}
+
+	// getters
+    protected void GetPlayer()
+	{
+		Class.CastTo(m_Player, GetGame().GetPlayer());
+	}
+
+	protected void GetActionManager()
+	{
+		if (m_Player && m_Player.IsPlayerSelected())
+			ActionManagerClient.CastTo(m_AM, m_Player.GetActionManager());
+		else
+			m_AM = null;
+	}
+
+    protected void GetActions()
+	{
+		m_Interact = null;
+		m_ContinuousInteract = null;
+		m_Single = null;
+		m_Continuous = null;
+
+		if (!m_AM)
+			return;
+
+		if (m_Player.IsSprinting())
+			return;
+		
+		m_Interact = m_AM.GetPossibleAction(InteractActionInput);
+		m_ContinuousInteract = m_AM.GetPossibleAction(ContinuousInteractActionInput);
+		m_Single = m_AM.GetPossibleAction(DefaultActionInput);
+		m_Continuous = m_AM.GetPossibleAction(ContinuousDefaultActionInput);
+		
+		if (!m_Interact && !m_ContinuousInteract && !m_Continuous && !m_Single)
+			m_Hidden = false;
+		
+		m_InteractActionsNum = m_AM.GetPossibleActionCount(InteractActionInput);
+		m_ContinuousInteractActionsNum = m_AM.GetPossibleActionCount(ContinuousInteractActionInput);
+		m_ItemActionsNum = m_AM.GetPossibleActionCount(DefaultActionInput);
+		m_ContinuousItemActionsNum = m_AM.GetPossibleActionCount(ContinuousDefaultActionInput);
+	}
+
+	protected void GetEntityInHands()
+	{
+		if (!m_Player) return;
+		
+		EntityAI eai = m_Player.GetHumanInventory().GetEntityInHands();
+		
+		if (eai && !eai.IsInherited(DummyItem))
+		{
+			m_EntityInHands = eai;
+		}
+		else
+		{
+			m_EntityInHands = null;
+		}
+	}
+	
+	protected string GetActionDesc(ActionBase action)
+	{
+		if (action && action.GetText())
+			return action.GetText();
+
+		return string.Empty;
+	}
+	
+	protected string GetItemDesc(EntityAI entity)
+	{
+		if (m_EntityInHands)
+			return m_EntityInHands.GetDisplayName();
+
+		return string.Empty;
+	}
+	
+	protected int GetItemHealth()
+	{
+		if (m_EntityInHands)
+			return m_EntityInHands.GetHealthLevel();
+		
+		return -1;
+	}
+
+	protected void GetItemQuantity(out int q_type, out float q_cur, out int q_min, out int q_max)
+	{
+		if (m_EntityInHands)
+		{
+			InventoryItem item = InventoryItem.Cast(m_EntityInHands);
+			q_type = QuantityConversions.HasItemQuantity(m_EntityInHands);
+			if (q_type > 0)
+			{
+				if (q_type == QUANTITY_PROGRESS)
+				{
+					QuantityConversions.GetItemQuantity(item, q_cur, q_min, q_max);
+
+					q_cur = (q_cur / q_max);
+					// to percents
+					q_min = 0;
+					q_cur = q_cur * 100;
+					q_max = 100;
+				}
+				else
+				{
+					QuantityConversions.GetItemQuantity(item, q_cur, q_min, q_max);
+				}
+			}
+		}
+	}
+	
+	protected string GetRadioFrequency()
+	{
+		TransmitterBase trans;
+		if (Class.CastTo(trans, m_EntityInHands))
+		{
+			return trans.GetTunedFrequency().ToString();
+		}
+
+		return string.Empty;
+	}
+	
+	// setters
+	protected void SetItemDesc(EntityAI entity, string descText, string itemWidget, string descWidget)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (entity && m_Player && !m_Player.GetItemAccessor().IsItemInHandsHidden())
+		{
+			descText.ToUpper();
+			TextWidget itemName;
+			Class.CastTo(itemName, widget.FindAnyWidget(descWidget));
+			itemName.SetText(descText);
+			widget.Show(true);
+		}
+		else
+			widget.Show(false);
+	}
+	
+	protected void SetItemHealth(int health, string itemWidget, string healthWidget, bool enabled)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (enabled)
+		{
+			ImageWidget healthMark;
+			Class.CastTo(healthMark, widget.FindAnyWidget(healthWidget));
+
+			switch (health)
+			{
+				case -1 :
+					healthMark.GetParent().Show(false);
+					break;
+				case GameConstants.STATE_PRISTINE :
+					healthMark.SetColor(Colors.COLOR_PRISTINE);
+					healthMark.SetAlpha(0.5);
+					healthMark.GetParent().Show(true);
+					break;
+				case GameConstants.STATE_WORN :
+					healthMark.SetColor(Colors.COLOR_WORN);
+					healthMark.SetAlpha(0.5);
+					healthMark.GetParent().Show(true);
+					break;
+				case GameConstants.STATE_DAMAGED :
+					healthMark.SetColor(Colors.COLOR_DAMAGED);
+					healthMark.SetAlpha(0.5);
+					healthMark.GetParent().Show(true);
+					break;
+				case GameConstants.STATE_BADLY_DAMAGED:
+					healthMark.SetColor(Colors.COLOR_BADLY_DAMAGED);
+					healthMark.SetAlpha(0.5);
+					healthMark.GetParent().Show(true);
+					break;
+				case GameConstants.STATE_RUINED :
+					healthMark.SetColor(Colors.COLOR_RUINED);
+					healthMark.SetAlpha(0.5);
+					healthMark.GetParent().Show(true);
+					break;
+				default :
+					healthMark.SetColor(0x00FFFFFF);
+					healthMark.SetAlpha(0.5);
+					healthMark.GetParent().Show(true);
+					break;			
+			}
+			
+			widget.Show(true);
+		}
+		else
+			widget.Show(false);
+	}
+	
+	protected void SetItemQuantity(int type, float current, int min, int max, string itemWidget, string quantityPBWidget, string quantityTextWidget, bool enabled)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (enabled)
+		{
+			ProgressBarWidget progressBar;
+			TextWidget textWidget;
+			Class.CastTo(progressBar, widget.FindAnyWidget(quantityPBWidget));
+			Class.CastTo(textWidget, widget.FindAnyWidget(quantityTextWidget));
+
+			//check for volume vs. count and display progressbar or "bubble" with exact count/max text
+			switch (type)
+			{
+				case QUANTITY_HIDDEN :
+					progressBar.Show(false);
+					textWidget.Show(false);
+					textWidget.GetParent().Show(false);
+					break;
+				case QUANTITY_COUNT :
+					if (max > 1 || current > 1)
+					{
+						string qty_text = string.Format("%1/%2", Math.Round(current).ToString(), max.ToString());
+						progressBar.Show(false);
+						textWidget.SetText(qty_text);
+						textWidget.Show(true);
+						textWidget.GetParent().Show(true);
+						break;
+					}
+					else
+					{
+						progressBar.Show(false);
+						textWidget.Show(false);
+						textWidget.GetParent().Show(false);
+						break;
+					}
+				case QUANTITY_PROGRESS :	
+					textWidget.Show(false);
+					progressBar.SetCurrent(current);
+					progressBar.Show(true);
+					textWidget.GetParent().Show(true);
+					break;
+			}
+			widget.Show(true);
+		}
+		else
+			widget.Show(false);	
+	}
+	
+	protected void SetWeaponQuantity(int chamber, int mag, string itemWidget, string quantityPBWidget, string quantityTextWidget, bool enabled)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (enabled)
+		{
+			string wpn_qty = "";
+
+			ProgressBarWidget progressBar;
+			TextWidget textWidget;
+			Class.CastTo(progressBar, widget.FindAnyWidget(quantityPBWidget));
+			Class.CastTo(textWidget, widget.FindAnyWidget(quantityTextWidget));
+			
+			Weapon_Base wpn;
+			Magazine maga;
+			int mag_quantity = -1;
+
+			if (Class.CastTo(wpn, m_EntityInHands))
+			{
+				if (Magnum_Base.Cast(wpn))
+				{
+					mag_quantity = 0;
+					for (int j = 0; j < wpn.GetMuzzleCount(); j++)
+					{
+						if (wpn.IsChamberFull(j)&& !wpn.IsChamberFiredOut(j))
+							mag_quantity++; 
+					}
+					wpn_qty = mag_quantity.ToString();
+				}
+				else
+				{
+					for (int i = 0; i < wpn.GetMuzzleCount(); i++)
+					{
+						if (i > 0 && (wpn.GetMuzzleCount() < 3 ||  i%2 == 0))
+						{
+							wpn_qty = wpn_qty + " ";
+						}
+						if (wpn.IsChamberEmpty(i))
+						{
+							wpn_qty = wpn_qty + "0";
+						}
+						else if (wpn.IsChamberFiredOut(i))
+						{
+							wpn_qty = wpn_qty + "F";
+						}
+						else
+						{
+							wpn_qty = wpn_qty + "1";
+						}
+						
+						maga = wpn.GetMagazine(i);
+						if (maga)
+						{
+							mag_quantity = maga.GetAmmoCount();
+						}
+						else if (wpn.GetInternalMagazineMaxCartridgeCount(i) > 0)
+						{
+							mag_quantity = wpn.GetInternalMagazineCartridgeCount(i);
+						}
+					
+					}
+				
+					if (wpn.IsJammed())
+					{
+						if (mag_quantity != -1)
+							wpn_qty = string.Format("X (+%1)", mag_quantity);
+						else
+							wpn_qty = "X";
+					}
+					else
+					{
+						if (mag_quantity != -1)
+						{
+							wpn_qty = wpn_qty + " (" + mag_quantity.ToString() + ")";
+						}
+					}
+				}
+			}
+	
+			progressBar.Show(false);
+			textWidget.SetText(wpn_qty);
+			textWidget.Show(true);
+			textWidget.GetParent().Show(true);
+		}
+		else
+			widget.Show(false);
+	}
+	
+	protected void SetWeaponModeAndZeroing(string itemWidget, string upWidget, string downWidget, bool enabled)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+
+		if (enabled && m_Player)
+		{
+			TextWidget txtModeWidget;
+			TextWidget txtZeroingWidget;
+
+			Class.CastTo(txtModeWidget, widget.FindAnyWidget(upWidget));
+			Class.CastTo(txtZeroingWidget, widget.FindAnyWidget(downWidget));
+			
+			Weapon w = Weapon.Cast(m_Player.GetHumanInventory().GetEntityInHands());
+			string zeroing	= string.Empty;
+			if (w)
+				zeroing	= string.Format("%1 m", w.GetCurrentZeroing(w.GetCurrentMuzzle()));
+
+			txtModeWidget.SetText(m_Player.GetWeaponManager().GetCurrentModeName());
+			txtZeroingWidget.SetText(zeroing);
+			widget.Show(true);
+		}
+		else
+			widget.Show(false);
+	}
+	
+	// not used instead of this is used confing parameter for fire mode
+	protected string WeaponModeTextTemp()
+	{
+		return "unused";
+	}
+	
+	protected void SetRadioFrequency(string freq, string itemWidget, string upWidget, string downWidget, bool enabled)
+	{
+		Widget widget;
+		
+		widget = m_Root.FindAnyWidget(itemWidget);
+		
+		if (enabled)
+		{
+			TextWidget txtUpWidget;
+			TextWidget txtDownWidget;
+			Class.CastTo(txtUpWidget, widget.FindAnyWidget(upWidget));
+			Class.CastTo(txtDownWidget, widget.FindAnyWidget(downWidget));
+
+			txtUpWidget.SetText(freq);
+			txtDownWidget.SetText("MHz");
+			widget.Show(true);
+		}
+		else
+			widget.Show(false);	
+	}
+	
+	protected void SetActionWidget(ActionBase action, string descText, string actionWidget, string descWidget)
+	{
+		Widget widget = m_Root.FindAnyWidget(actionWidget);
+
+		if (action && (!action.HasTarget() || (m_Player && m_Player.GetCommand_Vehicle())))
+		{
+			TextWidget actionName;
+			Class.CastTo(actionName, widget.FindAnyWidget(descWidget));
+			
+
+			if (action.GetInput().GetInputType() == ActionInputType.AIT_CONTINUOUS)
+			{
+				descText = descText + " " + "#action_target_cursor_hold";
+				actionName.SetText(descText);
+			}
+			else
+			{
+				actionName.SetText(descText);
+			}
+
+			widget.Show(true);
+		}
+		else
+		{
+			widget.Show(false);
+		}
+	}
+
+	//! shows arrows near the interact action if there are more than one available
+	protected void SetMultipleInteractAction(string multiActionsWidget)
+	{
+		Widget widget;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget.Show(m_InteractActionsNum > 1);
+	}
+	
+	//! shows arrows near the interact action if there are more than one available
+	protected void SetMultipleContinuousInteractAction(string multiActionsWidget)
+	{
+		Widget widget;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget.Show(m_ContinuousInteractActionsNum > 1);
+	}
+	
+	protected void SetMultipleItemAction(string multiActionsWidget)
+	{
+		Widget widget;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget.Show(m_ItemActionsNum > 1);
+	}
+	
+	//! shows arrows near the interact action if there are more than one available
+	protected void SetMultipleContinuousItemAction(string multiActionsWidget)
+	{
+		Widget widget;
+
+		widget = m_Root.FindAnyWidget(multiActionsWidget);
+		widget.Show(m_ContinuousItemActionsNum > 1);
+	}
+	
+	protected void SetInteractActionIcon(string actionWidget, string actionIconFrameWidget, string actionIconWidget, string actionIconTextWidget)
+	{
+		string keyName = string.Empty;
+		Widget widget, frameWidget;
+		ImageWidget iconWidget;
+		TextWidget textWidget;
+		
+		widget = m_Root.FindAnyWidget(actionWidget);
+		Class.CastTo(frameWidget, widget.FindAnyWidget(actionIconFrameWidget));
+		Class.CastTo(iconWidget, widget.FindAnyWidget(actionIconWidget));
+		Class.CastTo(textWidget, widget.FindAnyWidget(actionIconTextWidget));
+		
+		m_UseActionWrapper.InputP().SelectAlternative(0); //! select first alternative (which is the primary bind)
+		for (int c = 0; c < m_UseActionWrapper.InputP().BindKeyCount(); c++)
+		{
+		  	int _hc = m_UseActionWrapper.InputP().GetBindKey(0);
+		  	keyName = GetUApi().GetButtonName(_hc);
+		}
+
+		// uses text in floating widget
+		iconWidget.Show(false);
+		textWidget.SetText(keyName);
+		textWidget.Show(true);	
+	}
+	
+	protected void CheckRefresherFlagVisibility()
+	{
+		Widget w = m_Root.FindAnyWidget("ia_item_flag_icon");
+		if (m_Player && m_Player.GetHologramLocal())
+		{
+			EntityAI entity = m_Player.GetHologramLocal().GetProjectionEntity();
+			w.Show(entity.IsRefresherSignalingViable() && m_Player.IsTargetInActiveRefresherRange(entity));
+		}
+		else if (w.IsVisible())
+		{
+			w.Show(false);
+		}
+	}
+	
+	protected void CheckForActionWidgetOverrides()
+	{
+		ItemBase item;
+		typename actionName;
+		if (Class.CastTo(item, m_EntityInHands) && item.GetActionWidgetOverride(actionName))
+		{
+			ActionBase action = ActionManagerBase.GetAction(actionName);
+			if (action)
+			{
+				m_Single = action;
+			}
+		}
+	}
+	
+	protected IngameHud GetHud()
+	{
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			return hud;
+		}
+
+		return null;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ItemDropWarningMenu.c b/scripts/5_Mission/DayZ/GUI/ItemDropWarningMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b4e8bbf43512f34276bc81f8dd67ab47fca4390
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ItemDropWarningMenu.c
@@ -0,0 +1,127 @@
+class WarningMenuBase : UIScriptedMenu
+{
+	protected ButtonWidget m_OkButton;
+	protected MultilineTextWidget m_Description;
+
+	void WarningMenuBase()
+	{
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().AddActiveInputExcludes({"menu"});
+
+			GetGame().GetMission().GetHud().ShowHudUI(false);
+			GetGame().GetMission().GetHud().ShowQuickbarUI(false);
+		}
+	}
+
+	void ~WarningMenuBase()
+	{
+		if (GetGame() && GetGame().GetMission())
+		{
+			GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+			
+			GetGame().GetMission().GetHud().ShowHudUI(true);
+			GetGame().GetMission().GetHud().ShowQuickbarUI(true);
+	
+			GetGame().GetMission().GetOnInputPresetChanged().Remove(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Remove(OnInputDeviceChanged);
+		}
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot 		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_dropped_items.layout");
+		m_OkButton 		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("bOK"));
+		m_Description 	= MultilineTextWidget.Cast(layoutRoot.FindAnyWidget("txtDescription"));
+		m_Description.Show(true);	
+
+		string text = Widget.TranslateString(GetText());
+		m_Description.SetText(text);
+		
+		if (GetGame().GetMission())
+		{		
+			GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		}
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+
+		return layoutRoot;
+	}
+	
+	string GetText()
+	{
+		return "";
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w.GetUserID() == IDC_OK)
+		{
+			Close();
+			return true;
+		}
+
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+
+		#ifdef PLATFORM_CONSOLE
+		if (GetUApi().GetInputByID(UAUISelect).LocalPress())
+			Close();
+		#endif
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbarText = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string context = string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", "#early_access_alpha_understand", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		
+		toolbarText.SetText(context);
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboard() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		layoutRoot.FindAnyWidget("BottomConsoleToolbar").Show(toolbarShow);
+		m_OkButton.Show(!toolbarShow);
+	}
+}
+
+class ItemDropWarningMenu : WarningMenuBase
+{
+	override string GetText()
+	{
+		return "#str_item_drop_notification";
+	}
+}
+
+class PlayerRepositionWarningMenu : WarningMenuBase
+{
+	override string GetText()
+	{
+		return "#str_position_change_notification";
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/LoadingMenu.c b/scripts/5_Mission/DayZ/GUI/LoadingMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..63638620a2d3c99791362debe10175d1c808748c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/LoadingMenu.c
@@ -0,0 +1,40 @@
+class LoadingMenu extends UIScriptedMenu
+{
+	void LoadingMenu()
+	{
+	}
+
+	void ~LoadingMenu()
+	{
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/loading.layout");
+		
+		m_label = TextWidget.Cast( layoutRoot.FindAnyWidget("TextWidget") );
+		m_progressBar = ProgressBarWidget.Cast( layoutRoot.FindAnyWidget("ProgressBarWidget") );
+		m_image = ImageWidget.Cast( layoutRoot.FindAnyWidget("ImageBackground") );
+		
+		m_image.LoadImageFile( 0, GetRandomLoadingBackground() );
+		layoutRoot.FindAnyWidget("notification_root").Show(false);
+		
+		#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_XBOX
+		#ifdef BUILD_EXPERIMENTAL
+			Widget exp_notifiaction = layoutRoot.FindAnyWidget("notification_root");
+			if (exp_notifiaction)
+			{
+				exp_notifiaction.Show(true);
+			}
+		#endif
+		#endif
+		#endif
+		
+		return layoutRoot;
+	}
+
+	TextWidget m_label;
+	ProgressBarWidget m_progressBar;
+	ImageWidget m_image;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/LogoutMenu.c b/scripts/5_Mission/DayZ/GUI/LogoutMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..85b3c7c55ce382160d931a2e5020051ea0391e12
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/LogoutMenu.c
@@ -0,0 +1,180 @@
+
+class LogoutMenu extends UIScriptedMenu
+{	
+	private TextWidget m_LogoutTimeText;
+	private TextWidget m_DescriptionText;
+	private ButtonWidget m_bLogoutNow;
+	private ButtonWidget m_bCancel;
+	private ButtonWidget m_bCancelConsole;
+	private int m_iTime;
+	
+	private ref FullTimeData m_FullTime;
+
+	void LogoutMenu()
+	{
+		m_iTime = 0;
+		g_Game.SetKeyboardHandle(this);
+		
+		m_FullTime = new FullTimeData();
+	}
+
+	void ~LogoutMenu()
+	{
+		g_Game.SetKeyboardHandle(null);
+		if (GetGame().GetMission())
+			Cancel(); //cancels request on irregular close (player death, suicide, some mass-menu closure...)
+
+		m_FullTime = null;
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_logout_dialog.layout");
+		
+		m_LogoutTimeText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("txtLogoutTime"));
+		m_DescriptionText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("txtDescription"));
+		m_bLogoutNow 		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("bLogoutNow"));
+		m_bCancel 			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("bCancel"));
+		
+		#ifdef PLATFORM_CONSOLE
+		m_bCancel.Show(false);
+		m_bLogoutNow.Show(false);
+		
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(true);
+		RichTextWidget toolbar_b = RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		toolbar_b.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		#else
+		m_bCancel.Show(true);
+		m_bLogoutNow.Show(true);
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(false);
+		#endif
+		
+		UpdateInfo();
+		
+		// player should sit down if possible
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player.GetEmoteManager() && !player.IsRestrained() && !player.IsUnconscious()) 
+		{
+			player.GetEmoteManager().CreateEmoteCBFromMenu(EmoteConstants.ID_EMOTE_SITA);
+			player.GetEmoteManager().GetEmoteLauncher().SetForced(EmoteLauncher.FORCE_DIFFERENT);
+		}
+		
+		return layoutRoot;
+	}
+
+	void Show()
+	{
+		if (layoutRoot)
+			layoutRoot.Show(true);
+	}
+	
+	void Hide()
+	{
+		if (layoutRoot)
+			layoutRoot.Show(false);
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w == m_bLogoutNow)
+		{
+			GetGame().GetMission().AbortMission();
+			
+			return true;
+		}
+		else if (w == m_bCancel)
+		{
+			Hide();
+			Cancel();
+			return true;
+		}
+
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Hide();
+			Cancel();
+		}		
+	}
+		
+	void SetLogoutTime()
+	{
+		m_LogoutTimeText.SetText(" ");
+	}
+	
+	void SetTime(int time)
+	{
+		m_iTime = time;
+		string text = "#layout_logout_dialog_until_logout_";
+
+		TimeConversions.ConvertSecondsToFullTime(time, m_FullTime);
+		
+		if (m_FullTime.m_Days > 0)
+			text += "dhms";
+		else if (m_FullTime.m_Hours > 0)
+			text += "hms";
+		else if (m_FullTime.m_Minutes > 0)
+			text += "ms";
+		else
+			text += "s";
+		
+		text = Widget.TranslateString(text);
+		text = string.Format(text, m_FullTime.m_Seconds, m_FullTime.m_Minutes, m_FullTime.m_Hours, m_FullTime.m_Days);
+		m_LogoutTimeText.SetText(text);
+	}
+		
+	void UpdateTime()
+	{
+		
+		if (m_iTime > 0)
+		{
+			SetTime(--m_iTime);
+		}
+		else
+		{
+			Exit();
+		}
+	}
+	
+	void UpdateInfo()
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (player.IsRestrained() || player.IsUnconscious())
+		{
+			// display killInfo
+			m_DescriptionText.SetText("#layout_logout_dialog_note_killed");
+		}
+		else
+		{
+			// hide killInfo
+			m_DescriptionText.SetText("#layout_logout_dialog_note");
+		}
+	}
+
+	void Exit()
+	{		
+		// exit menu and logout screen
+		GetGame().GetMission().Continue();	
+
+		// stop updating of logout screen
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(this.UpdateTime);
+
+		// go back to main menu
+		GetGame().GetMission().AbortMission();
+	}
+
+	void Cancel()
+	{
+		GetGame().GetMission().Continue();	
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(this.UpdateTime);
+		
+		// request logout cancel from server
+		GetGame().LogoutRequestCancel();
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/MapHandler.c b/scripts/5_Mission/DayZ/GUI/MapHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..f59934373ab2b375830644be3143df18549a8722
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/MapHandler.c
@@ -0,0 +1,40 @@
+class MapHandler : ScriptedWidgetEventHandler
+{
+	protected Widget m_Root;
+	
+	void MapHandler(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+	}
+	
+	override bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		if (!super.OnKeyDown(w, x, y, key))
+			return false;
+		
+		vector screen_to_map = MapWidget.Cast(w).ScreenToMap(Vector(x,y,0));
+		Print(key);
+		Print(screen_to_map);
+		return true;
+	}
+	
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		super.OnDoubleClick(w, x, y, button);
+		
+		vector screen_to_map = MapWidget.Cast(w).ScreenToMap(Vector(x,y,0));
+		MapMenu m = MapMenu.Cast(g_Game.GetUIManager().FindMenu(MENU_MAP));
+		int rand = Math.RandomInt(0,eMapMarkerTypes.MARKERTYPE_MAX);
+		//m.AddMarker(screen_to_map,ARGB(255,255,0,0),rand);
+		
+		//m.AddUserMark(screen_to_map, "marker", ARGB(255,0,0,255), "\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+		
+		return true;
+	}
+	
+	/*void AddMarker(MapWidget w, vector pos, int color, int icon = -1)
+	{
+		 w.AddUserMark(pos, "", color, "\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+	}*/
+};
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/MapMarkersInfo.c b/scripts/5_Mission/DayZ/GUI/MapMarkersInfo.c
new file mode 100644
index 0000000000000000000000000000000000000000..168168ced8e177b8dd2ed2d30c3ef8c9978c06cf
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/MapMarkersInfo.c
@@ -0,0 +1,65 @@
+class MapMarkerTypes
+{
+	protected static ref map<int,string> m_MarkerTypes;
+	
+	static void Init()
+	{
+		m_MarkerTypes = new ref map<int,string>;
+		
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_BORDER_CROSS,"\\DZ\\gear\\navigation\\data\\map_border_cross_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_BROADLEAF,"\\DZ\\gear\\navigation\\data\\map_broadleaf_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_CAMP,"\\DZ\\gear\\navigation\\data\\map_camp_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_FACTORY,"\\DZ\\gear\\navigation\\data\\map_factory_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_FIR,"\\DZ\\gear\\navigation\\data\\map_fir_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_FIREDEP,"\\DZ\\gear\\navigation\\data\\map_firedep_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_GOVOFFICE,"\\DZ\\gear\\navigation\\data\\map_govoffice_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_HILL,"\\DZ\\gear\\navigation\\data\\map_hill_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_MONUMENT,"\\DZ\\gear\\navigation\\data\\map_monument_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_PALM,"\\DZ\\gear\\navigation\\data\\map_palm_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_POLICE,"\\DZ\\gear\\navigation\\data\\map_police_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_STATION,"\\DZ\\gear\\navigation\\data\\map_station_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_STORE,"\\DZ\\gear\\navigation\\data\\map_store_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_TOURISM,"\\DZ\\gear\\navigation\\data\\map_tourism_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_TRANSMITTER,"\\DZ\\gear\\navigation\\data\\map_transmitter_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_TSHELTER,"\\DZ\\gear\\navigation\\data\\map_tshelter_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_TSIGN,"\\DZ\\gear\\navigation\\data\\map_tsign_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_VIEWPOINT,"\\DZ\\gear\\navigation\\data\\map_viewpoint_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_VINEYARD,"\\DZ\\gear\\navigation\\data\\map_vineyard_ca.paa");
+		RegisterMarkerType(eMapMarkerTypes.MARKERTYPE_MAP_WATERPUMP,"\\DZ\\gear\\navigation\\data\\map_waterpump_ca.paa");
+	}
+	
+	static void RegisterMarkerType(int id, string path)
+	{
+		m_MarkerTypes.Set(id,path);
+	}
+	
+	static string GetMarkerTypeFromID(int id)
+	{
+		return m_MarkerTypes.Get(id);
+	}
+}
+
+enum eMapMarkerTypes
+{
+	MARKERTYPE_MAP_BORDER_CROSS = 0,
+	MARKERTYPE_MAP_BROADLEAF,
+	MARKERTYPE_MAP_CAMP,
+	MARKERTYPE_MAP_FACTORY,
+	MARKERTYPE_MAP_FIR,
+	MARKERTYPE_MAP_FIREDEP,
+	MARKERTYPE_MAP_GOVOFFICE,
+	MARKERTYPE_MAP_HILL,
+	MARKERTYPE_MAP_MONUMENT,
+	MARKERTYPE_MAP_PALM,
+	MARKERTYPE_MAP_POLICE,
+	MARKERTYPE_MAP_STATION,
+	MARKERTYPE_MAP_STORE,
+	MARKERTYPE_MAP_TOURISM,
+	MARKERTYPE_MAP_TRANSMITTER,
+	MARKERTYPE_MAP_TSHELTER,
+	MARKERTYPE_MAP_TSIGN,
+	MARKERTYPE_MAP_VIEWPOINT,
+	MARKERTYPE_MAP_VINEYARD,
+	MARKERTYPE_MAP_WATERPUMP,
+	MARKERTYPE_MAX
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/MapMenu.c b/scripts/5_Mission/DayZ/GUI/MapMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..eb0510ffd1fffbabeef3dc9bb823afe04f8feda6
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/MapMenu.c
@@ -0,0 +1,503 @@
+class MapMenu extends UIScriptedMenu
+{
+	protected const string COORD_FORMAT 			= "%1.%2%3";
+	protected const int SCALE_RULER_LINE_WIDTH 		= 8;
+	protected const int SCALE_RULER_NUM_SEGMENTS 	= 10;
+
+	protected bool 							m_WasChanged;
+	protected bool 							m_HasCompass
+	protected bool 							m_HasGPS
+	protected bool 							m_IsOpenning;
+	
+	protected float							m_ToolScaleCellSizeCanvasWidth;
+	protected float							m_ToolsContainerPos0[2];
+
+	protected ref IngameHud					m_Hud ;
+	protected ref MapHandler 				m_MapMenuHandler;
+	protected ref MapWidget 				m_MapWidgetInstance;
+	protected ref SizeToChild				m_LegendResizer;
+
+	protected Widget 						m_MapToolsContainer;
+	protected ImageWidget 					m_Images;
+	protected Widget						m_GPSMarker;
+	protected ImageWidget					m_GPSMarkerArrow;
+	protected Widget						m_UpperLegendContainer;
+	protected Widget						m_ToolsCompassBase;
+	protected ImageWidget					m_ToolsCompassArrow;
+	protected TextWidget					m_ToolsCompassAzimuth;
+	protected TextWidget					m_ToolsScaleContourText;
+	protected TextWidget					m_ToolsGPSElevationText;
+	protected TextWidget					m_ToolsGPSXText;
+	protected TextWidget					m_ToolsGPSYText;
+	protected TextWidget					m_ToolsScaleCellSizeText;
+	protected CanvasWidget					m_ToolsScaleCellSizeCanvas;
+	protected ItemMap 						m_Map;
+	protected Widget 						m_ToolbarPanel;
+	//int 									m_MarkerCount;
+	
+	protected ref MapNavigationBehaviour	m_MapNavigationBehaviour;
+	
+	void ~MapMenu()
+	{
+		if (GetGame() && GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnInputPresetChanged().Remove(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Remove(OnInputDeviceChanged);
+		}
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot 			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_map.layout");
+		m_Hud 				= IngameHud.Cast(GetGame().GetMission().GetHud());
+		m_IsOpenning		= true;
+		
+		/*MapWidget m = MapWidget.Cast(layoutRoot.FindAnyWidget("Map"));
+		if (m)
+		{
+			m.AddUserMark("2681 4.7 1751", "Lalal", ARGB(255,255,0,0), "\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+			m.AddUserMark("2683 4.7 1851", "Lala2", ARGB(255,0,255,0), "\\dz\\gear\\navigation\\data\\map_bunker_ca.paa");
+			m.AddUserMark("2670 4.7 1651", "Lala3", ARGB(255,0,0,255), "\\dz\\gear\\navigation\\data\\map_busstop_ca.paa");
+		}*/
+		
+		m_MapToolsContainer = layoutRoot.FindAnyWidget("Map_Tools_Container");
+		m_MapToolsContainer.GetScript(m_LegendResizer);
+
+		m_MapWidgetInstance			= MapWidget.Cast(layoutRoot.FindAnyWidget("Map"));
+		m_GPSMarker					= layoutRoot.FindAnyWidget("GPSMarkerCircle");
+		m_GPSMarkerArrow			= ImageWidget.Cast(layoutRoot.FindAnyWidget("GPSMarkerArrow"));
+		m_UpperLegendContainer		= layoutRoot.FindAnyWidget("Tools_Extra");
+		layoutRoot.Update();
+		m_ToolsCompassBase			= layoutRoot.FindAnyWidget("Tools_Compass_Base");
+		m_ToolsCompassArrow			= ImageWidget.Cast(layoutRoot.FindAnyWidget("Tools_Compass_Arrow"));
+		m_ToolsCompassAzimuth		= TextWidget.Cast(layoutRoot.FindAnyWidget("Tools_Compass_Azimuth"));
+		m_ToolsGPSXText				= TextWidget.Cast(layoutRoot.FindAnyWidget("Tools_GPS_X_Value"));
+		m_ToolsGPSYText				= TextWidget.Cast(layoutRoot.FindAnyWidget("Tools_GPS_Y_Value"));
+		m_ToolsGPSElevationText		= TextWidget.Cast(layoutRoot.FindAnyWidget("Tools_GPS_Elevation_Value"));
+		m_ToolsScaleContourText		= TextWidget.Cast(layoutRoot.FindAnyWidget("Tools_Scale_Contour_Value"));
+		m_ToolsScaleCellSizeText	= TextWidget.Cast(layoutRoot.FindAnyWidget("Tools_Scale_CellSize_Value"));
+		m_ToolsScaleCellSizeCanvas	= CanvasWidget.Cast(layoutRoot.FindAnyWidget("Tools_Scale_CellSize_Canvas"));
+		m_ToolbarPanel				= layoutRoot.FindAnyWidget("toolbar_bg");
+		
+		float canvasHeight = 0;
+		m_ToolsScaleCellSizeCanvas.GetSize(m_ToolScaleCellSizeCanvasWidth, canvasHeight);
+
+		if (m_MapWidgetInstance)
+		{
+			float scale;
+			vector mapPosition;
+			PlayerBase player = PlayerBase.Cast(g_Game.GetPlayer());
+			if (player && !player.GetLastMapInfo(scale, mapPosition))
+			{
+				vector tempPosition = GetGame().ConfigGetVector(string.Format("CfgWorlds %1 centerPosition", GetGame().GetWorldName()));
+				scale = 0.33;
+				mapPosition = Vector(tempPosition[0], tempPosition[1], tempPosition[2]);
+			}
+
+			m_MapWidgetInstance.SetScale(scale);
+			m_MapWidgetInstance.SetMapPos(mapPosition);
+			
+			m_HasCompass 	= false;
+			m_HasGPS 		= false;
+
+			SetGPSMarkerVisibility(false);
+			SetGPSDirectionVisibility(false);
+			SetCompassUIVisibility(false);
+			SetUpperLegendVisibility(true);
+			
+			if (player)
+			{
+				m_MapNavigationBehaviour = player.GetMapNavigationBehaviour();
+				if (m_MapNavigationBehaviour)
+				{
+					m_HasGPS = (m_MapNavigationBehaviour.GetNavigationType() & EMapNavigationType.GPS|EMapNavigationType.ALL == 0);				
+					m_HasCompass = (m_MapNavigationBehaviour.GetNavigationType() & EMapNavigationType.COMPASS|EMapNavigationType.ALL == 0);
+					
+					//! gameplay cfg json overrides handling
+					m_HasGPS 		= CfgGameplayHandler.GetMapIgnoreNavItemsOwnership() || m_HasGPS;
+					m_HasCompass 	= CfgGameplayHandler.GetMapIgnoreNavItemsOwnership() || m_HasCompass;
+
+					if (m_HasGPS)
+					{
+						SetUpperLegendVisibility(true);
+						if (m_HasGPS && CfgGameplayHandler.GetMapDisplayPlayerPosition())
+						{
+							SetGPSMarkerVisibility(true);
+							m_MapWidgetInstance.SetMapPos(m_MapNavigationBehaviour.GetPositionReal());
+						}
+					}
+					
+					if (m_HasCompass)
+					{
+						SetCompassUIVisibility(true);
+						SetUpperLegendVisibility(true);
+						if (m_HasGPS && CfgGameplayHandler.GetMapDisplayPlayerPosition())
+						{
+							SetGPSDirectionVisibility(true);
+						}
+					}
+					
+					//! override the CfgGameplayHandler.GetMapIgnoreNavItemsOwnership()
+					if ((!m_HasGPS && !m_HasCompass) || !CfgGameplayHandler.GetMapDisplayNavigationInfo())
+					{
+						SetUpperLegendVisibility(false);
+					}
+				}
+			}
+			
+			m_MapMenuHandler = new MapHandler(m_MapWidgetInstance);
+			
+			if (m_Hud)
+			{
+				m_Hud.ShowHudUI(false);
+				m_Hud.ShowQuickbarUI(false);
+			}
+		}
+		
+		float x,y;
+		m_MapToolsContainer.GetScreenPos(x,y);
+		m_ToolsContainerPos0[0] = x;
+		m_ToolsContainerPos0[1] = y;
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+				
+		return layoutRoot;
+	}
+	
+	override void InitMapItem(EntityAI item)
+	{
+		super.InitMapItem(item);
+		
+		m_Map = ItemMap.Cast(item);
+		//m_Map.SyncMapMarkers();
+		//m_MarkerCount = m_Map.GetMarkerArray().Count();
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		switch (w.GetUserID())
+		{
+			case IDC_CANCEL:
+				CloseMapMenu();
+				return true;
+		}
+		
+		return false;
+	}
+	
+	override bool OnKeyPress(Widget w, int x, int y, int key)
+	{
+		super.OnKeyPress(w, x, y, key);
+		
+		return false;
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+	}
+
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		m_ToolsScaleCellSizeCanvas.Clear();
+
+		PlayerBase player = PlayerBase.Cast(g_Game.GetPlayer());
+		
+		if (m_MapWidgetInstance)
+		{
+			if (m_Images)
+			{
+				m_MapWidgetInstance.RemoveChild(m_Images);
+			}
+
+			if (player)
+			{
+				m_ToolsScaleContourText.SetText(string.Format("%1 m", m_MapWidgetInstance.GetContourInterval()));
+				RenderScaleRuler();
+				float rulerMaxDistance;
+				string rulerUnits;
+				ProcessDistanceAndUnits(m_MapWidgetInstance.GetCellSize(m_ToolScaleCellSizeCanvasWidth), rulerMaxDistance, rulerUnits);
+				m_ToolsScaleCellSizeText.SetText(string.Format("%1%2", rulerMaxDistance, rulerUnits));
+
+				if (m_MapNavigationBehaviour)
+				{
+					vector mapPos = m_MapWidgetInstance.MapToScreen(m_MapNavigationBehaviour.GetPositionReal());
+					float scale = 1 - m_MapWidgetInstance.GetScale();
+
+					if (m_HasCompass)
+					{
+						vector rot = player.GetYawPitchRoll();
+						float angle = Math.Round(rot[0]);
+						if (angle < 0)
+						{
+							angle = 360 + angle;
+						}
+
+						m_GPSMarkerArrow.SetRotation(0, 0, angle);
+						m_ToolsCompassArrow.SetRotation(0, 0, angle);
+						m_ToolsCompassAzimuth.SetText(string.Format("%1°", angle));
+					}
+
+					array<int> coords = MapNavigationBehaviour.OrderedPositionNumbersFromGridCoords(player);
+					if (m_HasGPS || CfgGameplayHandler.GetMapIgnoreNavItemsOwnership())
+					{
+						m_GPSMarker.SetSize(scale * 100, scale * 100);
+						m_GPSMarkerArrow.SetSize(scale * 100, scale * 100);
+						float sizeX, sizeY;
+						m_GPSMarker.GetSize(sizeX, sizeY);
+						sizeX = Math.Round(sizeX);
+						sizeY = Math.Round(sizeY);
+						m_GPSMarker.SetPos(mapPos[0] - sizeX/2, mapPos[1] - sizeY/2);
+						m_GPSMarkerArrow.SetPos(mapPos[0] - sizeX/2, mapPos[1] - sizeY/2);
+						
+						if (coords.Count() == m_MapNavigationBehaviour.DISPLAY_GRID_POS_MAX_CHARS_COUNT * 2 && coords[0] >= 0)
+						{
+							m_ToolsGPSXText.SetText(string.Format(COORD_FORMAT, coords[0], coords[1], coords[2]));
+							m_ToolsGPSYText.SetText(string.Format(COORD_FORMAT, coords[3], coords[4], coords[5]));
+						}
+						else
+						{
+							m_ToolsGPSXText.SetText("-.--");
+							m_ToolsGPSYText.SetText("-.--");						
+						}
+
+						m_ToolsGPSElevationText.SetText(string.Format("%1m", Math.Round(player.GetPosition()[1])));
+					}
+					else
+					{
+						m_ToolsGPSXText.SetText("-.--");
+						m_ToolsGPSYText.SetText("-.--");
+						m_ToolsGPSElevationText.SetText("----m");
+					}
+				}
+			}
+		
+			bool isClosedWithShortcut = CfgGameplayHandler.GetMapIgnoreMapOwnership() && GetUApi().GetInputByID(UAMapToggle).LocalPress();
+			if (!m_IsOpenning && (GetUApi().GetInputByID(UAUIBack).LocalPress() || isClosedWithShortcut))
+			{
+				if (player)
+				{
+					player.SetLastMapInfo(m_MapWidgetInstance.GetScale(), m_MapWidgetInstance.GetMapPos());
+				}
+				
+				CloseMapMenu();
+			}
+			
+			m_IsOpenning = false;
+		}
+	}
+	
+	void AddMarker(vector pos, int color, int icon = 0)
+	{
+		m_Map.InsertMarker(pos,"",color,icon);
+		m_MapWidgetInstance.AddUserMark(pos, "", color, MapMarkerTypes.GetMarkerTypeFromID(icon));
+		m_WasChanged = true;
+	}
+	
+	void RemoveMarker()
+	{
+		m_WasChanged = true;
+	}
+	
+	override void LoadMapMarkers()
+	{
+		MapMarker marker;
+		for (int i = 0; i < m_Map.GetMarkerArray().Count(); i++)
+		{
+			marker = m_Map.GetMarkerArray().Get(i);
+			m_MapWidgetInstance.AddUserMark(marker.GetMarkerPos(),marker.GetMarkerText(),marker.GetMarkerColor(),MapMarkerTypes.GetMarkerTypeFromID(marker.GetMarkerIcon())/*"\\dz\\gear\\navigation\\data\\map_tree_ca.paa"*/);
+		}
+	}
+	
+	void CloseMapMenu()
+	{
+		if (m_WasChanged)
+		{
+			m_Map.SyncMapMarkers();
+			m_WasChanged = false;
+		}
+		
+		PlayerBase player = PlayerBase.Cast(g_Game.GetPlayer());
+		if (player)
+		{
+			player.SetMapClosingSyncSet(false); //map is closing, server needs to be notified - once
+		}
+
+		if (m_Hud)
+		{
+			m_Hud.ShowHudUI(true);
+			m_Hud.ShowQuickbarUI(true);
+		}
+
+		if (CfgGameplayHandler.GetMapIgnoreMapOwnership())
+		{
+			if (!CfgGameplayHandler.GetUse3DMap())
+			{
+				GetGame().GetMission().RemoveActiveInputExcludes({"map"});
+			}
+			else
+			{
+				GetGame().GetMission().RemoveActiveInputExcludes({"loopedactions"});
+			}
+
+			GetGame().GetMission().RemoveActiveInputRestriction(EInputRestrictors.MAP);
+		}
+
+		Close();
+	}
+
+	protected void SetCompassUIVisibility(bool pState)
+	{
+		if (m_ToolsCompassArrow)
+		{
+			m_ToolsCompassArrow.Show(pState);
+		}
+		
+		if (m_ToolsCompassAzimuth)
+		{
+			m_ToolsCompassAzimuth.Show(pState);
+		}
+	}
+	
+	protected void SetGPSMarkerVisibility(bool pState)
+	{
+		if (m_GPSMarker)
+		{
+			m_GPSMarker.Show(pState);
+		}
+	}
+	
+	protected void SetGPSDirectionVisibility(bool pState)
+	{
+		if (m_GPSMarkerArrow)
+		{
+			m_GPSMarkerArrow.Show(pState);
+		}
+	}
+	
+	protected void SetUpperLegendVisibility(bool pState)
+	{
+		if (m_UpperLegendContainer)
+		{
+			m_UpperLegendContainer.Show(pState);
+		}
+		
+		if (m_LegendResizer)
+		{
+			m_LegendResizer.ResizeParentToChild();
+		}
+	}
+	
+	protected void RenderScaleRuler()
+	{
+		float sizeYShift = 8;
+		float segmentLength = m_ToolScaleCellSizeCanvasWidth / SCALE_RULER_NUM_SEGMENTS;
+		int lineColor = FadeColors.BLACK;
+
+		for (int i = 1; i <= SCALE_RULER_NUM_SEGMENTS; i++)
+		{
+			lineColor = FadeColors.BLACK;
+			if (i % 2 == 0)
+			{
+				lineColor = FadeColors.LIGHT_GREY;
+			}
+
+			if (i == 1) //! 1st segment
+			{
+				m_ToolsScaleCellSizeCanvas.DrawLine(0, sizeYShift, segmentLength, sizeYShift, SCALE_RULER_LINE_WIDTH, lineColor);
+			}
+			else if (i == SCALE_RULER_NUM_SEGMENTS) //! last segment
+			{
+				m_ToolsScaleCellSizeCanvas.DrawLine(segmentLength * (SCALE_RULER_NUM_SEGMENTS - 1), sizeYShift, segmentLength * SCALE_RULER_NUM_SEGMENTS, sizeYShift, SCALE_RULER_LINE_WIDTH, lineColor);
+			}
+			else
+			{
+				m_ToolsScaleCellSizeCanvas.DrawLine(segmentLength * (i - 1), sizeYShift, segmentLength * i, sizeYShift, SCALE_RULER_LINE_WIDTH, lineColor);
+			}
+		}
+	}
+	
+	protected void ProcessDistanceAndUnits(float num, out float dist, out string units)
+	{
+		if (num >= 901)
+		{	
+			num *= 0.001;
+			num = Math.Round(num * 10) * 0.1;
+			dist = num;
+			units = "km";
+		}
+		else if (num >= 100 && num <= 900)
+		{
+			num = Math.Ceil(num * 0.1) * 10;
+			dist = num;
+			units = "m";
+		}
+		else if (num >= 1)
+		{
+			num = Math.Floor(num);
+			dist = num;
+			units = "m";
+		}
+		else
+		{
+			num = Math.Ceil(num * 10);
+			dist = num;
+			units = "cm";
+		}
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbarText = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string text = string.Empty;
+		
+		text += string.Format(" <image set=\"xbox_buttons\" name=\"LS\" scale=\"%1\" /> %2 ", InputUtils.ICON_SCALE_TOOLBAR, "#layout_map_navigate");
+		text += string.Format(" <image set=\"xbox_buttons\" name=\"RS\" scale=\"%1\" /> %2 ", InputUtils.ICON_SCALE_TOOLBAR, "#STR_Controls_Zoom");
+		text += string.Format(" %1", InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#close", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		
+		toolbarText.SetText(text);
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboard() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		m_ToolbarPanel.Show(toolbarShow);
+		ShiftMapToolsContainer();
+	}
+	
+	protected void ShiftMapToolsContainer()
+	{
+		if (m_ToolbarPanel.IsVisible())
+		{
+			float sizeX,sizeY;
+			m_ToolbarPanel.GetScreenSize(sizeX,sizeY);
+			m_MapToolsContainer.SetScreenPos(m_ToolsContainerPos0[0],m_ToolsContainerPos0[1] - sizeY);
+		}
+		else
+			m_MapToolsContainer.SetScreenPos(m_ToolsContainerPos0[0],m_ToolsContainerPos0[1]);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/CharacterCreation/CharacterCreationMenu.c b/scripts/5_Mission/DayZ/GUI/NewUI/CharacterCreation/CharacterCreationMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..af16126d8509c8c41327c6b301da254a87086737
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/CharacterCreation/CharacterCreationMenu.c
@@ -0,0 +1,758 @@
+class CharacterCreationMenu extends UIScriptedMenu
+{
+	#ifdef PLATFORM_CONSOLE
+	DayZIntroSceneXbox										m_Scene;
+	protected bool 											m_CharacterSaved;
+	#else
+	DayZIntroScenePC										m_Scene;
+	#endif
+	
+	const int 												TOOLTIP_ID_SAVE = 1;
+	const int 												TOOLTIP_ID_APPLY = 2;
+	
+	protected Widget										m_CharacterRotationFrame;
+	protected Widget										m_Apply;
+	protected Widget										m_Save;
+	protected Widget										m_RandomizeCharacter;
+	protected Widget										m_BackButton;
+	protected Widget										m_PlayedCharacterInfo;
+	protected TextWidget									m_Version;
+	protected Widget										m_DetailsRoot; //tooltips
+	protected TextWidget									m_DetailsLabel;
+	protected RichTextWidget								m_DetailsText;
+	protected TextWidget 									m_CharacterHeaderText;
+	
+	protected ref OptionSelectorEditbox						m_NameSelector;
+	protected ref OptionSelectorMultistateCharacterMenu		m_GenderSelector;
+	protected ref OptionSelectorMultistateCharacterMenu		m_SkinSelector;
+	protected ref OptionSelectorMultistateCharacterMenu		m_TopSelector;
+	protected ref OptionSelectorMultistateCharacterMenu		m_BottomSelector;
+	protected ref OptionSelectorMultistateCharacterMenu		m_ShoesSelector;
+	
+	int m_OriginalCharacterID;
+	
+	void CharacterCreationMenu()
+	{
+		MissionMainMenu mission = MissionMainMenu.Cast(GetGame().GetMission());
+		
+		#ifdef PLATFORM_CONSOLE
+		m_Scene = mission.GetIntroSceneXbox();
+		#else
+		m_Scene = mission.GetIntroScenePC();
+		#endif
+		
+		m_Scene.ResetIntroCamera();
+	}
+	
+	PlayerBase GetPlayerObj()
+	{
+		return m_Scene.GetIntroCharacter().GetCharacterObj();
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElementVisibility();
+		if (pInputDeviceType == EInputDeviceType.CONTROLLER)
+		{
+			CheckNewOptions(); //TODO - pick only the 'focus' bit
+		}
+		#endif
+	}
+	
+	override Widget Init()
+	{
+		#ifdef PLATFORM_CONSOLE
+			layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/character_creation/xbox/character_creation.layout");
+			m_CharacterSaved 				= false;
+		#else
+			layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/character_creation/pc/character_creation.layout");
+		#endif
+		
+		m_CharacterRotationFrame			= layoutRoot.FindAnyWidget("character_rotation_frame");
+		m_Apply								= layoutRoot.FindAnyWidget("apply");
+		m_Save 								= layoutRoot.FindAnyWidget("save");
+		m_RandomizeCharacter				= layoutRoot.FindAnyWidget("randomize_character");
+		m_BackButton						= layoutRoot.FindAnyWidget("back");
+		m_Version							= TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		m_DetailsRoot 						= layoutRoot.FindAnyWidget("menu_details_tooltip");
+		m_DetailsLabel						= TextWidget.Cast(m_DetailsRoot.FindAnyWidget("menu_details_label"));
+		m_DetailsText						= RichTextWidget.Cast(m_DetailsRoot.FindAnyWidget("menu_details_tooltip_content"));
+		m_CharacterHeaderText 				= TextWidget.Cast(layoutRoot.FindAnyWidget("char_header_text"));
+		m_PlayedCharacterInfo 				= layoutRoot.FindAnyWidget("played_char_info");
+		
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+			version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+			version = "#main_menu_version" + " " + version;
+		#endif
+		m_Version.SetText(version);
+		
+		if (m_Scene && m_Scene.GetIntroCharacter())
+		{
+			m_OriginalCharacterID = m_Scene.GetIntroCharacter().GetCharacterID();
+		}
+		
+		m_NameSelector		= new OptionSelectorEditbox(layoutRoot.FindAnyWidget("character_name_setting_option"), m_Scene.GetIntroCharacter().GetCharacterName(), null, false);
+		m_GenderSelector	= new OptionSelectorMultistateCharacterMenu(layoutRoot.FindAnyWidget("character_gender_setting_option"), 0, null, false, m_Scene.GetIntroCharacter().GetCharGenderList());
+		if (m_Scene.GetIntroCharacter().IsCharacterFemale())
+		{
+			m_GenderSelector.SetValue("Female");
+			m_SkinSelector	= new OptionSelectorMultistateCharacterMenu(layoutRoot.FindAnyWidget("character_head_setting_option"), 0, null, false, m_Scene.GetIntroCharacter().GetCharList(ECharGender.Female));
+		}
+		else
+		{
+			m_GenderSelector.SetValue("Male");
+			m_SkinSelector	= new OptionSelectorMultistateCharacterMenu(layoutRoot.FindAnyWidget("character_head_setting_option"), 0, null, false, m_Scene.GetIntroCharacter().GetCharList(ECharGender.Male));
+		}
+		
+		m_TopSelector		= new OptionSelectorMultistateCharacterMenu(layoutRoot.FindAnyWidget("character_top_setting_option"), 0, null, false, DefaultCharacterCreationMethods.GetConfigAttachmentTypes(InventorySlots.BODY));
+		m_BottomSelector	= new OptionSelectorMultistateCharacterMenu(layoutRoot.FindAnyWidget("character_bottom_setting_option"), 0, null, false, DefaultCharacterCreationMethods.GetConfigAttachmentTypes(InventorySlots.LEGS));
+		m_ShoesSelector		= new OptionSelectorMultistateCharacterMenu(layoutRoot.FindAnyWidget("character_shoes_setting_option"), 0, null, false, DefaultCharacterCreationMethods.GetConfigAttachmentTypes(InventorySlots.FEET));
+		
+		PlayerBase scene_char = GetPlayerObj();
+		if (scene_char)
+		{
+			Object obj = scene_char.GetInventory().FindAttachment(InventorySlots.BODY);
+			if (obj)
+				m_TopSelector.SetValue(obj.GetType(), false);
+			
+			obj = scene_char.GetInventory().FindAttachment(InventorySlots.LEGS);
+			if (obj)
+				m_BottomSelector.SetValue(obj.GetType(), false);
+			
+			obj = scene_char.GetInventory().FindAttachment(InventorySlots.FEET);
+			if (obj)
+				m_ShoesSelector.SetValue(obj.GetType(), false);
+			
+			m_SkinSelector.SetValue(scene_char.GetType());
+		}
+		
+		m_GenderSelector.m_OptionChanged.Insert(GenderChanged);
+		m_SkinSelector.m_OptionChanged.Insert(SkinChanged);
+		m_TopSelector.m_OptionChanged.Insert(TopChanged);
+		m_BottomSelector.m_OptionChanged.Insert(BottomChanged);
+		m_ShoesSelector.m_OptionChanged.Insert(ShoesChanged);
+		
+		Refresh();
+		SetCharacter();
+		CheckNewOptions();
+		
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+
+		return layoutRoot;
+	}
+	
+	void ~CharacterCreationMenu()
+	{
+		m_GenderSelector.m_OptionChanged.Remove(GenderChanged);
+		m_SkinSelector.m_OptionChanged.Remove(SkinChanged);
+		m_TopSelector.m_OptionChanged.Remove(TopChanged);
+		m_BottomSelector.m_OptionChanged.Remove(BottomChanged);
+		m_ShoesSelector.m_OptionChanged.Remove(ShoesChanged);
+	}
+	
+	//Button Events
+	//! renames character
+	void Apply()
+	{
+		if (!m_Scene.GetIntroCharacter().IsDefaultCharacter())
+		{
+			string name = m_NameSelector.GetValue();
+			if (name == "")
+				name = GameConstants.DEFAULT_CHARACTER_NAME;
+			
+			m_Scene.GetIntroCharacter().SaveCharName(name);
+		}
+		
+		MainMenu menu_main = MainMenu.Cast(GetGame().GetUIManager().FindMenu(MENU_MAIN));
+		if (menu_main)
+		{
+			menu_main.OnChangeCharacter(false);
+		}
+		GetGame().GetUIManager().Back();
+	}
+	
+	//! saves default character
+	void Save()
+	{
+		if (m_Scene.GetIntroCharacter().IsDefaultCharacter())
+		{
+			string name = m_NameSelector.GetValue();
+			if (name == "")
+				name = GameConstants.DEFAULT_CHARACTER_NAME;
+			
+			m_Scene.GetIntroCharacter().SaveCharName(name);
+			m_Scene.GetIntroCharacter().SaveDefaultCharacter();
+			m_Scene.GetIntroCharacter().SetToDefaultCharacter();
+			SetCharacterSaved(true);
+		}
+	}
+	
+	void Back()
+	{
+		//bring back DefaultCharacter, if it exists (it should), or a previously played one.
+		GetGame().GetMenuData().RequestGetDefaultCharacterData();
+		#ifdef PLATFORM_CONSOLE
+			if (m_OriginalCharacterID != GameConstants.DEFAULT_CHARACTER_MENU_ID && m_CharacterSaved)
+			{
+				m_OriginalCharacterID = GameConstants.DEFAULT_CHARACTER_MENU_ID;
+			}
+		#endif
+		m_Scene.GetIntroCharacter().SetCharacterID(m_OriginalCharacterID);
+		m_Scene.GetIntroCharacter().CreateNewCharacterById(m_Scene.GetIntroCharacter().GetCharacterID());
+		GetGame().GetUIManager().Back();
+	}
+	
+	void SetCharacter()
+	{
+		if (m_Scene.GetIntroCharacter().IsDefaultCharacter())
+		{
+			GetGame().GetMenuDefaultCharacterData().EquipDefaultCharacter(m_Scene.GetIntroCharacter().GetCharacterObj());
+		}
+	}
+	
+	void RandomizeCharacter()
+	{
+		m_Scene.GetIntroCharacter().SetToDefaultCharacter();
+		
+		// make random selection
+		m_Scene.GetIntroCharacter().SetCharacterGender(Math.RandomInt(0, 2));
+		
+		if (m_Scene.GetIntroCharacter().IsCharacterFemale())
+		{
+			m_GenderSelector.SetValue("Female");
+			m_SkinSelector.LoadNewValues(m_Scene.GetIntroCharacter().GetCharList(ECharGender.Female), 0);
+			m_SkinSelector.SetRandomValue();
+		}
+		else
+		{
+			m_GenderSelector.SetValue("Male");
+			m_SkinSelector.LoadNewValues(m_Scene.GetIntroCharacter().GetCharList(ECharGender.Male), 0);
+			m_SkinSelector.SetRandomValue();
+		}
+		
+		GetGame().GetMenuDefaultCharacterData().GenerateRandomEquip();
+		
+		m_TopSelector.SetValue(GetGame().GetMenuDefaultCharacterData().GetAttachmentMap().Get(InventorySlots.BODY),false);
+		m_BottomSelector.SetValue(GetGame().GetMenuDefaultCharacterData().GetAttachmentMap().Get(InventorySlots.LEGS),false);
+		m_ShoesSelector.SetValue(GetGame().GetMenuDefaultCharacterData().GetAttachmentMap().Get(InventorySlots.FEET),false);
+		
+		Refresh();
+		SetCharacter();
+		
+		CheckNewOptions();
+	}
+	
+	//Selector Events
+	void GenderChanged()
+	{
+		ECharGender gender = ECharGender.Male;
+		
+		if (m_GenderSelector.GetStringValue() == "Female")
+		{
+			gender = ECharGender.Female;
+		}
+		
+		m_Scene.GetIntroCharacter().SetCharacterGender(gender);
+		
+		m_SkinSelector.LoadNewValues(m_Scene.GetIntroCharacter().GetCharList(gender) , 0);
+		m_SkinSelector.SetRandomValue();
+		SetCharacterSaved(false);
+	}
+	
+	void SkinChanged()
+	{
+		m_Scene.GetIntroCharacter().CreateNewCharacterByName(m_SkinSelector.GetStringValue(), false);
+		SetCharacterSaved(false);
+	}
+	
+	void TopChanged()
+	{
+		GetGame().GetMenuDefaultCharacterData().SetDefaultAttachment(InventorySlots.BODY,m_TopSelector.GetStringValue());
+		GetGame().GetMenuDefaultCharacterData().EquipDefaultCharacter(m_Scene.GetIntroCharacter().GetCharacterObj());
+		SetCharacterSaved(false);
+	}
+	
+	void BottomChanged()
+	{
+		GetGame().GetMenuDefaultCharacterData().SetDefaultAttachment(InventorySlots.LEGS,m_BottomSelector.GetStringValue());
+		GetGame().GetMenuDefaultCharacterData().EquipDefaultCharacter(m_Scene.GetIntroCharacter().GetCharacterObj());
+		SetCharacterSaved(false);
+	}
+	
+	void ShoesChanged()
+	{
+		GetGame().GetMenuDefaultCharacterData().SetDefaultAttachment(InventorySlots.FEET,m_ShoesSelector.GetStringValue());
+		GetGame().GetMenuDefaultCharacterData().EquipDefaultCharacter(m_Scene.GetIntroCharacter().GetCharacterObj());
+		SetCharacterSaved(false);
+	}
+	
+	override bool OnKeyPress(Widget w, int x, int y, int key)
+	{
+		super.OnKeyPress(w, x, y, key);
+		return false;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_Apply)
+		{
+			Apply();
+			return true;
+		}
+		else if (w == m_Save)
+		{
+			Save();
+			GetGame().GetUIManager().Back();
+			return true;
+		}
+		else if (w == m_RandomizeCharacter)
+		{
+			RandomizeCharacter();
+			return true;
+		}
+		else if (w == m_BackButton)
+		{
+			Back();
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		#ifndef PLATFORM_CONSOLE
+		if (w == m_CharacterRotationFrame)
+		{
+			if (m_Scene)
+				DayZIntroScenePC.Cast(m_Scene).CharacterRotationStart();
+			return true;
+		}
+		#endif
+		return false;
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		#ifndef PLATFORM_CONSOLE
+		if (m_Scene)
+			DayZIntroScenePC.Cast(m_Scene).CharacterRotationStop();
+		#endif
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		string tooltip_header = "";
+		string tooltip_text = "";
+		ColorHighlight(w);
+		switch (w.GetUserID())
+		{
+			case TOOLTIP_ID_APPLY:
+				tooltip_header = "#layout_main_menu_rename";
+				tooltip_text = "#layout_character_creation_apply_tooltip";
+			break;
+			
+			case TOOLTIP_ID_SAVE:
+				tooltip_header = "#layout_character_creation_save_character_alt";
+				tooltip_text = "#layout_character_creation_save_tooltip";
+			break;
+		}
+		SetTooltipTexts(w, tooltip_header, tooltip_text);
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		ColorNormal(w);
+		SetFocus(null);
+		
+		return true;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		string tooltip_header = "";
+		string tooltip_text = "";
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			switch (w.GetUserID())
+			{
+				case TOOLTIP_ID_APPLY:
+					tooltip_header = "#layout_main_menu_rename";
+					tooltip_text = "#layout_character_creation_apply_tooltip";
+				break;
+				
+				case TOOLTIP_ID_SAVE:
+					tooltip_header = "#layout_character_creation_save_character_alt";
+					tooltip_text = "#layout_character_creation_save_tooltip";
+				break;
+			}
+			SetTooltipTexts(w, tooltip_header, tooltip_text);
+			return true;
+		}
+		SetTooltipTexts(w);
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Apply || w == m_Save || w == m_RandomizeCharacter || w == m_BackButton);
+		}
+		return false;
+	}
+	
+	void SetTooltipTexts(Widget w, string header = "", string desc = "")
+	{
+		#ifndef PLATFORM_CONSOLE
+			bool show = header != "" && desc != "";
+			m_DetailsRoot.Show(show);
+			m_DetailsLabel.SetText(header);
+			m_DetailsText.SetText(desc);
+			
+			//moves the widget to parent, setting is relative to widget alignment, case-specific implementation (getter missing!!!)
+			if (show)
+			{
+				float parent_pos_x, parent_pos_y;
+				float parent_size_x, parent_size_y;
+				float layout_size_x, layout_size_y;
+				
+				w.GetScreenPos(parent_pos_x,parent_pos_y);
+				w.GetScreenSize(parent_size_x,parent_size_y);
+				layoutRoot.GetScreenSize(layout_size_x,layout_size_y);
+				
+				float set_x = layout_size_x - parent_pos_x;
+				float set_y = layout_size_y - parent_pos_y - parent_size_y;
+				m_DetailsRoot.SetPos(set_x,set_y,true);
+			}
+			
+			m_DetailsText.Update();
+			m_DetailsLabel.Update();
+			m_DetailsRoot.Update();
+		#endif
+	}
+	
+	void CheckNewOptions()
+	{
+		bool show_widgets = m_Scene.GetIntroCharacter().IsDefaultCharacter();
+		bool was_visible = layoutRoot.FindAnyWidget("character_gender_button").IsVisible();
+		layoutRoot.FindAnyWidget("character_gender_button").Show(show_widgets);
+		layoutRoot.FindAnyWidget("character_head_button").Show(show_widgets);
+		layoutRoot.FindAnyWidget("character_top_button").Show(show_widgets);
+		layoutRoot.FindAnyWidget("character_bottom_button").Show(show_widgets);
+		layoutRoot.FindAnyWidget("character_shoes_button").Show(show_widgets);
+		
+		if (!was_visible && show_widgets)
+			m_GenderSelector.Focus();
+		if (!show_widgets)
+			SetFocus(m_RandomizeCharacter);
+	}
+	
+	override void OnShow()
+	{
+#ifdef PLATFORM_CONSOLE
+		m_GenderSelector.Focus();
+		UpdateControlsElementVisibility();
+#endif
+		CheckNewOptions();
+	}
+	
+	override void Refresh()
+	{
+		string name;
+		#ifdef PLATFORM_CONSOLE
+			if (GetGame().GetUserManager() && GetGame().GetUserManager().GetSelectedUser())
+			{
+				name = GetGame().GetUserManager().GetSelectedUser().GetName();
+				if (name.LengthUtf8() > 16)
+				{
+					name = name.SubstringUtf8(0, 16);
+					name += "...";
+				}
+			}
+		#else
+			name = m_Scene.GetIntroCharacter().GetCharacterName();
+			if (name == "")
+				name = GameConstants.DEFAULT_CHARACTER_NAME;
+		#endif
+		
+		m_NameSelector.SetValue(name);
+		
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+			version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+			
+			m_Apply.Show(m_CharacterSaved || !m_Scene.GetIntroCharacter().IsDefaultCharacter());
+			m_Save.Show(!m_CharacterSaved && m_Scene.GetIntroCharacter().IsDefaultCharacter());
+		#else
+			version = "#main_menu_version" + " " + version;
+			m_Apply.Show(!m_Scene.GetIntroCharacter().IsDefaultCharacter());
+			m_Save.Show(m_Scene.GetIntroCharacter().IsDefaultCharacter());
+		#endif
+		m_PlayedCharacterInfo.Show(!m_Scene.GetIntroCharacter().IsDefaultCharacter());
+		
+		if (m_Scene.GetIntroCharacter().IsDefaultCharacter())
+		{
+			m_CharacterHeaderText.SetText("#character_menu_header");
+		}
+		else
+		{
+			m_CharacterHeaderText.SetText("#server_browser_prev_play_filter");
+		}
+		
+		m_Version.SetText(version);
+		
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Back();
+		}
+		
+		if (GetUApi().GetInputByID(UAUICtrlX).LocalPress())
+		{
+			RandomizeCharacter();
+		}
+		
+		#ifdef PLATFORM_CONSOLE
+		if (GetUApi().GetInputByID(UAUICtrlY).LocalPress())
+		{
+			if (m_Scene.GetIntroCharacter().IsDefaultCharacter() && !m_CharacterSaved)
+			{
+				Save();
+			}
+		}
+		#endif
+	}
+	
+	override void OnHide()
+	{
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight(Widget w)
+	{
+		if (w.IsInherited(ButtonWidget))
+		{
+			ButtonWidget button = ButtonWidget.Cast(w);
+			button.SetTextColor(ARGB(255, 200, 0, 0));
+		}
+		
+		w.SetColor(ARGB(255, 0, 0, 0));
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+		ImageWidget image	= ImageWidget.Cast(w.FindAnyWidget(w.GetName() + "_image"));
+		Widget option		= Widget.Cast(w.FindAnyWidget(w.GetName() + "_option_wrapper"));
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (text1)
+		{
+			text1.SetColor(ARGB(255, 255, 0, 0));
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(ARGB(255, 255, 0, 0));
+		}
+		
+		if (text3)
+		{
+			text3.SetColor(ARGB(255, 255, 0, 0));
+			w.SetAlpha(1);
+		}
+		
+		if (image)
+		{
+			image.SetColor(ARGB(255, 200, 0, 0));
+		}
+		
+		if (option)
+		{
+			option.SetColor(ARGB(255, 255, 0, 0));
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+		if (option_label)
+		{
+			option_label.SetColor(ARGB(255, 255, 0, 0));
+		}
+		#endif
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (w.IsInherited(ButtonWidget))
+		{
+			ButtonWidget button = ButtonWidget.Cast(w);
+			button.SetTextColor(ColorManager.COLOR_NORMAL_TEXT);
+		}
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		ImageWidget image	= ImageWidget.Cast(w.FindAnyWidget(w.GetName() + "_image"));
+		Widget option		= w.FindAnyWidget(w.GetName() + "_option_wrapper");
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (text1)
+		{
+			text1.SetColor(ColorManager.COLOR_NORMAL_TEXT);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(ColorManager.COLOR_NORMAL_TEXT);
+		}
+		
+		if (text3)
+		{
+			text3.SetColor(ColorManager.COLOR_NORMAL_TEXT);
+			w.SetAlpha(0);
+		}
+		
+		if (image)
+		{
+			image.SetColor(ColorManager.COLOR_NORMAL_TEXT);
+		}
+		
+		if (option)
+		{
+			option.SetColor(ARGB(150, 255, 255, 255));
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+		if (option_label)
+		{
+			option_label.SetColor(ColorManager.COLOR_NORMAL_TEXT);
+		}
+		#endif
+	}
+	
+	void ColorDisable(Widget w)
+	{
+		#ifndef PLATFORM_CONSOLE
+		SetFocus(null);
+		#endif
+		
+		if (w)
+		{
+			ButtonWidget button = ButtonWidget.Cast(w);
+			if (button)
+			{
+				button.SetTextColor(ColorManager.COLOR_DISABLED_TEXT);
+			}
+		}
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+		ImageWidget image	= ImageWidget.Cast(w.FindAnyWidget(w.GetName() + "_image"));
+		Widget option		= Widget.Cast(w.FindAnyWidget(w.GetName() + "_option_wrapper"));
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (text1)
+		{
+			text1.SetColor(ColorManager.COLOR_DISABLED_TEXT);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(ColorManager.COLOR_DISABLED_TEXT);
+		}
+		
+		if (text3)
+		{
+			text3.SetColor(ColorManager.COLOR_DISABLED_TEXT);
+			w.SetAlpha(1);
+		}
+		
+		if (image)
+		{
+			image.SetColor(ColorManager.COLOR_DISABLED_TEXT);
+		}
+		
+		if (option)
+		{
+			option.SetColor(ColorManager.COLOR_DISABLED_TEXT);
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+		if (option_label)
+		{
+			option_label.SetColor(ColorManager.COLOR_DISABLED_TEXT);
+		}
+		#endif
+	}
+	
+	void SetCharacterSaved(bool state)
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_CharacterSaved = state;
+			Refresh();
+		#endif
+	}
+
+	protected void UpdateControlsElements()
+	{
+		#ifdef PLATFORM_CONSOLE
+		RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string text = "";
+		if (!m_CharacterSaved && m_Scene.GetIntroCharacter().IsDefaultCharacter()) //can be saved..
+		{
+			text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "#layout_character_creation_save_character_alt", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		}
+		text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", "#layout_character_creation_toolbar_randomize", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		if (m_Scene.GetIntroCharacter().IsDefaultCharacter()) //edit options available
+		{
+			text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", "#layout_character_creation_toolbar_select", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		}
+		text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#layout_character_creation_toolbar_back", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_text.SetText(text);
+		
+		RichTextWidget toolbar_b2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon0"));
+		RichTextWidget toolbar_x2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("RandomizeIcon0"));
+		RichTextWidget toolbar_y2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("SaveIcon0"));
+		RichTextWidget toolbar_y2_2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("ApplyIcon0"));
+		
+		string saveTextIcon = InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "", EUAINPUT_DEVICE_CONTROLLER);
+		toolbar_b2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER));
+		toolbar_x2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", "", EUAINPUT_DEVICE_CONTROLLER));
+		toolbar_y2.SetText(saveTextIcon);
+		toolbar_y2_2.SetText(saveTextIcon);
+		#endif
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		#ifdef PLATFORM_CONSOLE
+		bool toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboard() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(toolbarShow);
+		layoutRoot.FindAnyWidget("play_panel_root").Show(!toolbarShow);
+		#endif
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ConsoleToolbarHandler.c b/scripts/5_Mission/DayZ/GUI/NewUI/ConsoleToolbarHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..21c34f1ba6f0c85b486be27f2afafc2ebaa71b5e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ConsoleToolbarHandler.c
@@ -0,0 +1,60 @@
+
+class ConsoleToolbarWidgetHandlerBase : ScriptedWidgetEventHandler
+{
+	Widget m_ToolbarWidget; //'toolbar_bg'
+	RichTextWidget m_ToolbarText;
+	
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_ToolbarWidget = w;
+		m_ToolbarWidget.SetHandler(this);
+		
+		m_ToolbarText = RichTextWidget.Cast(m_ToolbarWidget.FindAnyWidget("ContextToolbarText"));
+		#ifdef PLATFORM_CONSOLE
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		}
+		#endif
+		UpdateControlsElements();
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements(pInputDeviceType);
+		#endif
+	}
+	
+	protected void UpdateControlsElements(EInputDeviceType pInputDeviceType = EInputDeviceType.UNKNOWN)
+	{
+		#ifndef PLATFORM_CONSOLE
+		m_ToolbarWidget.Show(false);
+		#endif
+	}
+}
+
+class PasswordMenuToolbarHandler : ConsoleToolbarWidgetHandlerBase
+{
+	override protected void UpdateControlsElements(EInputDeviceType pInputDeviceType = EInputDeviceType.UNKNOWN)
+	{
+		#ifdef PLATFORM_CONSOLE
+		string text = "";
+		text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "#server_browser_show / #server_browser_hide", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", "#server_browser_menu_connect", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#STR_settings_menu_root_toolbar_bg_ConsoleToolbar_Back_BackText0", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		m_ToolbarText.SetText(text);
+		
+		bool toolbarShow = false;
+		if (pInputDeviceType == EInputDeviceType.UNKNOWN)
+		{
+			toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		}
+		else
+		{
+			toolbarShow = pInputDeviceType == EInputDeviceType.CONTROLLER;
+		}
+		m_ToolbarWidget.Show(toolbarShow);
+		#endif
+	}
+};
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ControlMapping/ControlMappingKeybinds.c b/scripts/5_Mission/DayZ/GUI/NewUI/ControlMapping/ControlMappingKeybinds.c
new file mode 100644
index 0000000000000000000000000000000000000000..0f5f1fea38282a1a608ddf223af26996cadb9b65
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ControlMapping/ControlMappingKeybinds.c
@@ -0,0 +1,172 @@
+class TutorialKeybinds extends ScriptedWidgetEventHandler
+{
+	protected Widget						m_Root;
+	protected Widget						m_DetailsRoot;
+	
+	protected TutorialsMenu					m_Menu;
+	
+	void TutorialKeybinds(Widget parent, TutorialsMenu menu)
+	{
+		m_Root							= GetGame().GetWorkspace().CreateWidgets(GetLayoutName(), parent);
+		
+		m_Menu							= menu;
+		
+		int actionCount;
+		int actionMax = 80;
+		
+		int column_index = 0;
+		int item_index;
+		string output = "";
+		string option_text = "";
+		TIntArray actions = new TIntArray;
+		GetUApi().GetActiveInputs(actions);
+		
+		actionCount = actions.Count();
+		for (int i = 0; i < actionCount; i++)
+		{
+			UAInput input		= GetUApi().GetInputByID(actions.Get(i));
+			if (input)
+			{
+				if (item_index < actionMax)
+				{
+					output = "";
+					option_text = "";
+					GetGame().GetInput().GetActionDesc(actions.Get(i), option_text);
+					if (SetElementTitle(input, EUAINPUT_DEVICE_KEYBOARDMOUSE, output))
+					{
+						column_index		= Math.Floor(item_index / 21);
+						Widget w			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/tutorials/xbox/keybindings_panels/keybinding_panel.layout", m_Root.FindAnyWidget("container" + column_index));
+						Widget spacer		= w.FindWidget("Spacer");
+						TextWidget name		= TextWidget.Cast(w.FindWidget("KeybindName"));
+						TextWidget mod		= TextWidget.Cast(spacer.FindWidget("KeybindModifier"));
+						TextWidget value	= TextWidget.Cast(spacer.FindWidget("KeybindButton"));
+						
+						string modifier_text = "";
+						name.SetText(option_text);
+						value.SetText(output);
+						
+						if (SetElementModifier(input, modifier_text))
+						{
+							mod.SetText(modifier_text);
+						}
+						
+						name.Update();
+						mod.Update();
+						value.Update();
+						spacer.Update();
+						
+						item_index++;
+					}
+				}
+				else
+				{
+					option_text = "";
+					GetGame().GetInput().GetActionDesc(actions[i], option_text);
+					ErrorEx("input action " + option_text + " index out of bounds!",ErrorExSeverity.INFO);
+				}
+			}
+		}
+		
+		m_Root.SetHandler(this);
+	}
+	
+	//! assemble all active bindings at widget element
+	bool SetElementTitle(UAInput pInput, int iDeviceFlags, out string output)
+	{
+		int a, i, countbind = 0;
+	
+		for (a = 0; a < pInput.AlternativeCount(); a++)
+		{
+			pInput.SelectAlternative(a);
+			if (pInput.IsCombo())
+			{
+				if (pInput.BindingCount() > 0)
+				{
+					if (pInput.Binding(0) != 0 && pInput.CheckBindDevice(0,iDeviceFlags))
+					{
+						if (countbind > 0)
+							output += ", ";
+						
+						output += GetUApi().GetButtonName(pInput.Binding(0));
+						countbind++;
+						
+						for (i = 1; i < pInput.BindingCount(); i++)
+						{
+							if (pInput.Binding(i) != 0)
+							{
+								output += " + " + GetUApi().GetButtonName(pInput.Binding(i));
+								countbind++;
+							}
+						}
+						
+					}
+				}
+			}
+			else
+			{
+				if (pInput.BindingCount() > 0)
+				{
+					if (pInput.Binding(0) != 0 && pInput.CheckBindDevice(0,iDeviceFlags))
+					{
+						if (countbind > 0)
+							output += ", ";
+
+						output += GetUApi().GetButtonName(pInput.Binding(0));
+						countbind++;
+					}
+				}
+			}
+			
+		}
+		
+		return (countbind > 0);
+	}
+	
+	//! Determine the active limiter of the bindings (currently unreliable, multiple limiters can be active on key combos!)
+	bool SetElementModifier(UAInput pInput, out string output)
+	{
+		if (pInput.IsLimited())
+		{
+			if (pInput.IsPressLimit())
+			{
+				output = "#keybind_press";
+			}
+			if (pInput.IsReleaseLimit())
+			{
+				output = "#keybind_release";
+			}
+			if (pInput.IsHoldLimit())
+			{
+				output = "#keybind_hold";
+			}
+			if (pInput.IsHoldBeginLimit())
+			{
+				output = "#keybind_holdbegin";
+			}
+			if (pInput.IsClickLimit())
+			{
+				output = "#keybind_click";
+			}
+			if (pInput.IsDoubleClickLimit())
+			{
+				output = "#keybind_doubletap";
+			}
+			
+			return true;
+		}
+		else
+		{
+			return false;
+		}
+	}
+	
+	void ~TutorialKeybinds()
+	{
+		
+	}
+	
+	string GetLayoutName()
+	{
+		return "gui/layouts/new_ui/tutorials/xbox/keybinds_tab.layout";
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Credits/CreditsMenu.c b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/CreditsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..974e396efdb538139f30a96239812b79c43602ca
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/CreditsMenu.c
@@ -0,0 +1,128 @@
+class CreditsMenu extends UIScriptedMenu
+{
+	protected static float						MENU_FADEIN_TIME	= 2.0;		//fade starts as soon as menu opens
+	protected static float						LOGO_FADEIN_TIME	= 1.0;		//fade starts halfway through menu fade in
+	protected static float						CREDIT_SCROLL_SPEED	= 200.0;	//pixels per second (relative to 1080p res)
+	
+	protected float								m_MenuFadeInIncrement;
+	protected float								m_MenuFadeInLevel;
+	protected float								m_MenuFadeInLevel2 = 1;
+	protected float								m_LogoFadeInIncrement;
+	protected float								m_LogoFadeInLevel;
+	protected float								m_ScrollIncrement;
+	protected float								m_ScrollLevel;
+	protected float								m_ScrollMax;
+	protected float								m_ScrollSize;
+	
+	protected ref JsonDataCredits				m_CreditsData;
+	
+	protected float								m_CurrentTime = 0.0;
+	protected ref array<ref CreditsElement>		m_CreditsEntries = new array<ref CreditsElement>;
+	
+	protected ImageWidget						m_Logo;
+	protected ScrollWidget						m_Scroller;
+	protected WrapSpacerWidget					m_Content;
+	protected RichTextWidget 					m_InfoPanelText;
+	protected Widget 							m_InfoPanel;
+	
+	override Widget Init()
+	{
+		float x_f;
+		int x, y;
+		
+		layoutRoot	= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/credits/credits_menu.layout", null );
+		m_Logo		= ImageWidget.Cast( layoutRoot.FindAnyWidget( "Logo" ) );
+		m_Scroller	= ScrollWidget.Cast( layoutRoot.FindAnyWidget( "CreditsPanel" ) );
+		m_Content	= WrapSpacerWidget.Cast( layoutRoot.FindAnyWidget( "CreditsContent" ) );
+		m_InfoPanelText = RichTextWidget.Cast( layoutRoot.FindAnyWidget( "InfoPanelText" ) );
+		m_InfoPanel = layoutRoot.FindAnyWidget( "InfoPanel" );
+		
+		GetScreenSize( x, y );
+		
+		m_MenuFadeInIncrement	= 1 / MENU_FADEIN_TIME;
+		m_LogoFadeInIncrement	= 1 / LOGO_FADEIN_TIME;
+		m_ScrollIncrement		= CREDIT_SCROLL_SPEED * ( y / 1080 );
+		
+		m_Scroller.VScrollToPos01( 0 );
+		m_Scroller.GetScreenSize( x_f, m_ScrollSize );
+		
+		GetGame().GameScript.Call( this, "LoadDataAsync", null );
+		
+		UpdateInfoPanelText(GetGame().GetInput().GetCurrentInputDevice());
+		
+		return layoutRoot;
+	}
+	
+	void LoadDataAsync()
+	{
+		m_CreditsData = CreditsLoader.GetData();
+		for( int i = 1; i <= m_CreditsData.Departments.Count(); i++ )
+		{
+			ref CreditsDepartmentElement e = new CreditsDepartmentElement( i, m_Content, m_CreditsData.Departments.Get( i - 1 ) );
+			m_CreditsEntries.Insert( e );
+		}
+		m_Content.Update();
+	}
+	
+	override void Update( float timeslice )
+	{
+		float new_menu_val;
+		if( m_LogoFadeInLevel != 1 )
+		{
+			new_menu_val = m_MenuFadeInLevel + m_MenuFadeInIncrement * timeslice;
+			if( new_menu_val < 1 )
+				m_MenuFadeInLevel = new_menu_val;
+			else
+				m_MenuFadeInLevel = 1;
+			
+			if( m_MenuFadeInLevel > 0.5 )
+			{
+				float new_logo_val = m_LogoFadeInLevel + m_LogoFadeInIncrement * timeslice;
+				if( new_menu_val < 1 )
+					m_LogoFadeInLevel = new_logo_val;
+				else
+					m_LogoFadeInLevel = 1;
+			}
+			
+			layoutRoot.SetAlpha( m_MenuFadeInLevel );
+			m_Logo.SetAlpha( m_LogoFadeInLevel );
+			m_InfoPanelText.SetAlpha( m_MenuFadeInLevel );
+		}
+		else if( m_ScrollLevel + m_ScrollSize <= m_Scroller.GetContentHeight() )
+		{
+			float new_scroll_val = m_ScrollLevel + m_ScrollIncrement * timeslice;
+			m_ScrollLevel = new_scroll_val;
+			m_Scroller.VScrollToPos( m_ScrollLevel );
+		}
+		else
+		{
+			new_menu_val = m_MenuFadeInLevel2 - m_MenuFadeInIncrement * timeslice;
+			if( new_menu_val > 0 )
+				m_MenuFadeInLevel2 = new_menu_val;
+			else
+				Close();
+			
+			layoutRoot.SetAlpha( m_MenuFadeInLevel2 );
+			m_InfoPanelText.SetAlpha( m_MenuFadeInLevel2 );
+		}
+		
+		m_CurrentTime += timeslice;
+		
+		if( GetGame().GetInput().LocalRelease("UAUIBack") )
+		{
+			Close();
+		}
+	}
+	
+	void UpdateInfoPanelText(int input_device_type)
+	{
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard() && input_device_type == EInputDeviceType.MOUSE_AND_KEYBOARD)
+		{
+			m_InfoPanelText.SetText("ESC " + "#menu_back");
+		}
+		else
+		{
+			m_InfoPanelText.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#menu_back", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsDepartmentElement.c b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsDepartmentElement.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8556f0a7f581e71d2f10292641d9a18c9199ce1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsDepartmentElement.c
@@ -0,0 +1,78 @@
+class CreditsDepartmentElement extends CreditsElement
+{
+	protected TextWidget								m_DepartmentTitle;
+	protected GridSpacerWidget							m_DepartmentSections;
+	protected ref array<ref CreditsDepartmentSection>	m_DepartmentSectionEntries = new array<ref CreditsDepartmentSection>;
+	
+	void CreditsDepartmentElement( int index, Widget parent, JsonDataCreditsDepartment department_data )
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/credits/department_element/department_element.layout", parent );
+		m_DepartmentTitle		= TextWidget.Cast( m_Root.FindAnyWidget( "department_title" ) );
+		m_DepartmentSections	= GridSpacerWidget.Cast( m_Root.FindAnyWidget( "department_sections" ) );
+		
+		if( department_data.DepartmentName != "" )
+		{
+			m_DepartmentTitle.SetText( department_data.DepartmentName );
+		}
+		else
+		{
+			m_DepartmentTitle.Show( false );
+			m_Root.FindAnyWidget( "SeparatorPanel" ).Show( false );
+		}
+		
+		m_Root.SetSort( index );
+		LoadDataAsync( department_data.Sections );
+	}
+	
+	void LoadDataAsync( array<ref JsonDataCreditsSection> department_data )
+	{
+		for( int i = 1; i <= department_data.Count(); i++ )
+		{
+			ref CreditsDepartmentSection e = new CreditsDepartmentSection( i, m_DepartmentSections, department_data.Get( i - 1 ) );
+			m_DepartmentSectionEntries.Insert( e );
+		}
+		
+		m_DepartmentSections.Update();
+	}
+}
+
+class CreditsDepartmentSection extends CreditsElement
+{
+	protected TextWidget			m_SectionTitle;
+	protected WrapSpacerWidget		m_SectionSections;
+	protected ref array<Widget>		m_SectionEntries = new array<Widget>;
+	
+	void CreditsDepartmentSection( int index, Widget parent, JsonDataCreditsSection section_data )
+	{
+		m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/credits/department_element/department_section.layout", parent );
+		m_SectionTitle		= TextWidget.Cast( m_Root.FindAnyWidget( "section_title" ) );
+		m_SectionSections	= WrapSpacerWidget.Cast( m_Root.FindAnyWidget( "section_elements" ) );
+		
+		if( section_data.SectionName != "" )
+		{
+			m_SectionTitle.SetText( section_data.SectionName );
+		}
+		else
+		{
+			m_SectionTitle.Show( false );
+			m_Root.FindAnyWidget( "SeparatorPanel" ).Show( false );
+		}	
+		
+		LoadDataAsync( section_data.SectionLines );
+		m_Root.SetSort( index );
+	}
+	
+	void LoadDataAsync( array<string> section_data )
+	{
+		for( int i = 1; i <= section_data.Count(); i++ )
+		{
+			TextWidget w = TextWidget.Cast( GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/credits/department_element/department_section_element.layout", m_SectionSections ) );
+			w.SetText( section_data.Get( i - 1 ) + " \n" );
+			w.Update();
+			m_Root.SetSort( i );
+			m_SectionEntries.Insert( w );
+		}
+		
+		m_SectionSections.Update();
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsElement.c b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsElement.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2926241e226eadeb6e3be88ca7328932d4e9fd2
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsElement.c
@@ -0,0 +1,9 @@
+class CreditsElement extends ScriptedWidgetEventHandler
+{
+	protected Widget m_Root;
+	
+	void CreditsElement( int index, Widget parent )
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsGraphicalElement.c b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsGraphicalElement.c
new file mode 100644
index 0000000000000000000000000000000000000000..7ae2bf817bd4f83a7d858a0619cf74ba3545cbcc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Credits/Elements/CreditsGraphicalElement.c
@@ -0,0 +1,7 @@
+class CreditsGraphicalElement extends CreditsElement
+{
+	void CreditsGraphicalElement( int index, Widget parent/*, graphical_data*/ )
+	{
+		
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/DropdownPrefab/DropdownPrefab.c b/scripts/5_Mission/DayZ/GUI/NewUI/DropdownPrefab/DropdownPrefab.c
new file mode 100644
index 0000000000000000000000000000000000000000..ed8e2b1b53010d491ede040db377d8bb1bdbdccc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/DropdownPrefab/DropdownPrefab.c
@@ -0,0 +1,145 @@
+class DropdownPrefab extends ScriptedWidgetEventHandler
+{
+	protected Widget				m_Root;
+	protected Widget				m_Parent;
+	protected ScrollWidget			m_Scroller;
+	protected Widget				m_ContentContainer;
+	protected ref array<Widget>		m_Content = new array<Widget>;
+	
+	protected Widget				m_Button;
+	protected Widget				m_Holder;
+	protected TextWidget			m_Text;
+	protected ImageWidget			m_ImageExpand;
+	protected ImageWidget			m_ImageCollapse;
+	
+	protected bool					m_IsExpanded;
+	ref ScriptInvoker				m_OnSelectItem	= new ScriptInvoker();
+
+	void DropdownPrefab( Widget root, string text = "" )
+	{
+		m_Parent = root;
+		m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/dropdown_prefab/dropdown_prefab.layout", root );
+		
+		m_Scroller			= ScrollWidget.Cast( m_Root.FindAnyWidget( "dropdown_container" ) );
+		m_ContentContainer	= m_Root.FindAnyWidget( "dropdown_content" );
+		m_Text				= TextWidget.Cast( m_Root.FindAnyWidget( "dropdown_text" ) );
+		m_Holder			= m_Root.FindAnyWidget( "holder" );
+		SetText( text );
+		
+		m_Button			= m_Root.FindAnyWidget( "dropdown_selector_button" );
+		m_ImageExpand		= ImageWidget.Cast( m_Root.FindAnyWidget( "expand_image" ) );
+		m_ImageCollapse		= ImageWidget.Cast( m_Root.FindAnyWidget( "collapse_image" ) );
+		
+		m_Root.SetHandler( this );
+		
+		RefreshContent();
+	}
+	
+	void RefreshContent()
+	{
+		Widget child = m_ContentContainer.GetChildren();
+		while( child )
+		{
+			if( m_Content.Find( child ) > -1 )
+			{
+				m_Content.Insert( child );
+			}
+		}
+		
+		m_ContentContainer.Update();
+		m_Root.Update();
+		
+		float x, y;
+		m_ContentContainer.GetScreenSize( x, y );
+		if( y > m_Scroller.GetContentHeight() )
+		{
+			m_Scroller.SetAlpha( 1 );
+		}
+		else
+		{
+			m_Scroller.SetAlpha( 0 );
+		}
+	}
+	
+	int AddElement( string text, Widget content = null )
+	{
+		ButtonWidget element = ButtonWidget.Cast( GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/dropdown_prefab/dropdown_element.layout", m_ContentContainer ) );
+		RichTextWidget textWidget = RichTextWidget.Cast(element.FindAnyWidget("dropdown_element_text"));
+		textWidget.SetText( text );
+		
+		if( content )
+		{
+			element.AddChild( content, false );
+		}
+		m_ContentContainer.Update();
+		textWidget.Update();
+		m_Root.Update();
+		element.Update();
+		
+		m_Content.Insert( element );
+		return m_Content.Count() - 1;
+	}
+	
+	void RemoveElement( int index )
+	{
+		if( 0 < index && index < m_Content.Count() )
+		{
+			delete m_Content.Get( index );
+			m_ContentContainer.Update();
+			m_Root.Update();
+			m_Parent.Update();
+		}
+	}
+	
+	void Close()
+	{
+		if( m_IsExpanded )
+		{
+			m_IsExpanded = !m_IsExpanded;
+			m_Scroller.Show( m_IsExpanded );
+			m_ImageExpand.Show( !m_IsExpanded );
+			m_ImageCollapse.Show( m_IsExpanded );
+			
+			m_Root.Update();
+			m_Parent.Update();
+		}
+	}
+	
+	void SetText( string text )
+	{
+		m_Text.SetText( text );
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		int index = m_Content.Find( w );
+		if ( index > -1 )
+		{
+			m_OnSelectItem.Invoke( index );
+			m_IsExpanded = false;
+			m_Scroller.Show( m_IsExpanded );
+			m_ImageExpand.Show( !m_IsExpanded );
+			m_ImageCollapse.Show( m_IsExpanded );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonDown( Widget w, int x, int y, int button )
+	{
+		if ( (w == m_Button || w == m_Text || w == m_Holder) && button == MouseState.LEFT )
+		{
+			m_IsExpanded = !m_IsExpanded;
+			m_Scroller.Show( m_IsExpanded );
+			m_ImageExpand.Show( !m_IsExpanded );
+			m_ImageCollapse.Show( m_IsExpanded );
+			
+			m_Root.Update();
+			m_Parent.Update();
+			m_ContentContainer.Update();
+			
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingElement.c b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingElement.c
new file mode 100644
index 0000000000000000000000000000000000000000..e07dea2ec017582db097c81cea9b7c79f7e43034
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingElement.c
@@ -0,0 +1,313 @@
+//! Deprecated
+class KeybindingElement extends ScriptedWidgetEventHandler
+{
+	protected KeybindingsGroup				m_Group;
+	
+	protected Widget						m_Root;
+	protected TextWidget					m_ElementName;
+	protected TextWidget					m_ElementModifier;
+	protected ButtonWidget					m_PrimaryBindButton;
+	protected ButtonWidget					m_AlternativeBindButton;
+	protected Widget						m_PrimaryClear;
+	protected Widget						m_AlternativeClear;
+	
+	protected int							m_ElementIndex;
+	protected bool							m_IsEdited;
+	protected bool							m_IsAlternateEdited;
+	
+	protected ref array<int>				m_CustomBind;
+	protected ref array<int>				m_CustomAlternateBind;
+	
+	protected ref Timer						m_EntryTimer = new Timer( CALL_CATEGORY_GUI );
+	
+	void KeybindingElement( int key_index, Widget parent, KeybindingsGroup group )
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets( GetLayoutName(), parent );
+		m_ElementName			= TextWidget.Cast( m_Root.FindAnyWidget( "setting_label" ) );
+		m_ElementModifier		= TextWidget.Cast( m_Root.FindAnyWidget( "modifier_label" ) );
+		m_PrimaryBindButton		= ButtonWidget.Cast( m_Root.FindAnyWidget( "primary_bind" ) );
+		m_AlternativeBindButton	= ButtonWidget.Cast( m_Root.FindAnyWidget( "alternative_bind" ) );
+		m_PrimaryClear			= m_Root.FindAnyWidget( "primary_clear" );
+		m_AlternativeClear		= m_Root.FindAnyWidget( "alternative_clear" );
+		
+		m_Group					= group;
+		m_ElementIndex			= key_index;
+		
+		Reload();
+		m_Root.SetHandler( this );
+	}
+	
+	string GetLayoutName()
+	{
+		return "gui/layouts/new_ui/options/keybindings_selectors/keybinding_option.layout";
+	}
+	
+	bool IsChanged()
+	{
+		return m_IsEdited;
+	}
+	
+	bool IsAlternateChanged()
+	{
+		return m_IsAlternateEdited;
+	}
+	
+	array<int> GetChangedBinds()
+	{
+		return m_CustomBind;
+	}
+	
+	array<int> GetChangedAlternateBinds()
+	{
+		return m_CustomAlternateBind;
+	}
+	
+	// assembly all related binding at widget element
+	void SetElementTitle( ButtonWidget btnWidget, UAInput pInput, int iDeviceFlags )
+	{
+		string output;
+		int a, i, countbind = 0;
+	
+		for( a = 0; a < pInput.AlternativeCount(); a++ )
+		{
+			pInput.SelectAlternative(a);
+			if( pInput.IsCombo() )
+			{
+				if( pInput.BindingCount() > 0 )
+				{
+					if( pInput.Binding(0) != 0 && pInput.CheckBindDevice(0,iDeviceFlags) )
+					{
+						if( countbind > 0 )
+							output += ", ";
+						
+						output += GetUApi().GetButtonName( pInput.Binding(0) );
+						countbind++;
+						
+						for( i = 1; i < pInput.BindingCount(); i++ )
+						{
+							if( pInput.Binding(i) != 0 )
+							{
+								output += " + " + GetUApi().GetButtonName( pInput.Binding(i) );
+								countbind++;
+							}
+						}
+						
+					}
+				}
+			}
+			else
+			{
+				if( pInput.BindingCount() > 0 )
+				{
+					if( pInput.Binding(0) != 0 && pInput.CheckBindDevice(0,iDeviceFlags) )
+					{
+						if( countbind > 0 )
+							output += ", ";
+
+						output += GetUApi().GetButtonName( pInput.Binding(0) );
+						countbind++;
+					}
+				}
+			}
+			
+		}
+
+		// nothing may be available - we do not want "null" or "0" in string
+		if( countbind > 0 )
+			btnWidget.SetText(output);
+		else
+			btnWidget.SetText("");
+	}
+	
+	void Reload()
+	{
+		UAInput input			= GetUApi().GetInputByID( m_ElementIndex );
+		m_IsEdited				= false;
+		m_IsAlternateEdited		= false;
+		m_CustomBind			= null;
+		m_CustomAlternateBind	= null;
+
+		if( input.IsLimited() )
+		{
+			if( input.IsPressLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_press" );
+			}
+			if( input.IsReleaseLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_release" );
+			}
+			if( input.IsHoldLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_hold" );
+			}
+			if( input.IsHoldBeginLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_holdbegin" );
+			}
+			if( input.IsClickLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_click" );
+			}
+			if( input.IsDoubleClickLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_doubletap" );
+			}
+		}
+		else
+		{
+			m_ElementModifier.SetText( "" );
+		}
+		
+		string option_text;
+		string name;
+		
+		GetGame().GetInput().GetActionDesc( m_ElementIndex, option_text );
+		m_ElementName.SetText( option_text );
+		
+		// column #1 :: keyboard + mouse
+		SetElementTitle(m_PrimaryBindButton, input, EUAINPUT_DEVICE_KEYBOARDMOUSE);
+
+		// column #2 :: controller
+		SetElementTitle(m_AlternativeBindButton, input, EUAINPUT_DEVICE_CONTROLLER);
+	}
+	
+	void Reload( array<int> custom_binds, bool is_alternate )
+	{
+		string output;
+		if( custom_binds.Count() > 1 )
+		{
+			if( custom_binds.Get( 0 ) != 0 )
+				output = GetUApi().GetButtonName( custom_binds.Get( 0 ) );
+			for( int i = 1; i < custom_binds.Count(); i++ )
+			{
+				if( custom_binds.Get( i ) != 0 )
+					output += " + " + GetUApi().GetButtonName( custom_binds.Get( i ) );
+			}
+		}
+		else if( custom_binds.Count() > 0 )
+		{
+			if( custom_binds.Get( 0 ) != 0 )
+				output = GetUApi().GetButtonName( custom_binds.Get( 0 ) );
+		}
+		
+		if( is_alternate )
+		{
+			m_CustomAlternateBind = custom_binds;
+			m_IsAlternateEdited = true;
+			m_AlternativeBindButton.SetText( output );
+		}
+		else
+		{
+			m_CustomBind = custom_binds;
+			m_IsEdited = true;
+			m_PrimaryBindButton.SetText( output );
+		}
+	}
+	
+	void StartEnteringKeybind()
+	{
+		m_Group.StartEnteringKeybind( m_ElementIndex );
+		m_PrimaryBindButton.SetText( "#layout_keybinding_new_keybind" );
+	}
+	
+	void CancelEnteringKeybind()
+	{
+		Reload();
+	}
+	
+	void StartEnteringAlternateKeybind()
+	{
+		m_Group.StartEnteringAlternateKeybind( m_ElementIndex );
+		m_AlternativeBindButton.SetText( "#layout_keybinding_new_keybind" );
+	}
+	
+	void CancelEnteringAlternateKeybind()
+	{
+		Reload();
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if( !m_Group.IsEnteringKeyBind() )
+		{
+			if( w == m_PrimaryBindButton )
+			{
+				m_EntryTimer.Run( 0.01, this, "StartEnteringKeybind" );
+			}
+			if( w == m_AlternativeBindButton )
+			{
+				m_EntryTimer.Run( 0.01, this, "StartEnteringAlternateKeybind" );
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if( w == m_PrimaryClear )
+		{
+			m_IsEdited				= true;
+			m_CustomBind			= new array<int>;
+			m_PrimaryBindButton.SetText( "" );
+			m_Group.ClearKeybind( m_ElementIndex );
+		}
+		if( w == m_AlternativeClear )
+		{
+			m_IsAlternateEdited		= true;
+			m_CustomAlternateBind	= new array<int>;
+			m_AlternativeBindButton.SetText( "" );
+			m_Group.ClearAlternativeKeybind( m_ElementIndex );
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if( w == m_PrimaryBindButton || w == m_PrimaryClear )
+		{
+			m_PrimaryBindButton.SetColor( ARGBF( 1, 1, 0, 0 ) );
+			m_PrimaryClear.Show( true );
+			m_PrimaryClear.Update();
+			m_AlternativeClear.Show( false );
+			return true;
+		}
+		else if( w == m_AlternativeBindButton || w == m_AlternativeClear )
+		{
+			m_AlternativeBindButton.SetColor( ARGBF( 1, 1, 0, 0 ) );
+			m_PrimaryClear.Show( false );
+			m_AlternativeClear.Show( true );
+			m_AlternativeClear.Update();
+			return true;
+		}
+		else
+		{
+			m_PrimaryBindButton.SetColor( ARGBF( 0, 0, 0, 0 ) );
+			m_AlternativeBindButton.SetColor( ARGBF( 1, 0, 0, 0 ) );
+			m_PrimaryClear.Show( false );
+			m_AlternativeClear.Show( false );
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		if( w == m_PrimaryClear || w == m_PrimaryBindButton )
+		{
+			if( enterW != m_PrimaryClear && enterW != m_PrimaryBindButton )
+			{
+				m_PrimaryClear.Show( false );
+				m_PrimaryBindButton.SetColor( ARGBF( 1, 0, 0, 0 ) );
+			}
+		}
+		if( w == m_AlternativeClear || w == m_AlternativeBindButton )
+		{
+			if( enterW != m_AlternativeClear && enterW != m_AlternativeBindButton )
+			{
+				m_AlternativeClear.Show( false );
+				m_AlternativeBindButton.SetColor( ARGBF( 1, 0, 0, 0 ) );
+			}
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingElementNew.c b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingElementNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..87c8fab28adf1e396d078b97b037616d16c5b7f7
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingElementNew.c
@@ -0,0 +1,311 @@
+class KeybindingElementNew extends ScriptedWidgetEventHandler
+{
+	protected KeybindingsContainer			m_Container;
+	
+	protected Widget						m_Root;
+	protected TextWidget					m_ElementName;
+	protected TextWidget					m_ElementModifier;
+	protected ButtonWidget					m_PrimaryBindButton;
+	protected ButtonWidget					m_AlternativeBindButton;
+	protected Widget						m_PrimaryClear;
+	protected Widget						m_AlternativeClear;
+	
+	protected int							m_ElementIndex;
+	protected bool							m_IsEdited;
+	protected bool							m_IsAlternateEdited;
+	
+	protected ref array<int>				m_CustomBind;
+	protected ref array<int>				m_CustomAlternateBind;
+	
+	protected ref Timer						m_EntryTimer = new Timer( CALL_CATEGORY_GUI );
+	
+	void KeybindingElementNew( int key_index, Widget parent, KeybindingsContainer group )
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets( GetLayoutName(), parent );
+		m_ElementName			= TextWidget.Cast( m_Root.FindAnyWidget( "setting_label" ) );
+		m_ElementModifier		= TextWidget.Cast( m_Root.FindAnyWidget( "modifier_label" ) );
+		m_PrimaryBindButton		= ButtonWidget.Cast( m_Root.FindAnyWidget( "primary_bind" ) );
+		m_AlternativeBindButton	= ButtonWidget.Cast( m_Root.FindAnyWidget( "alternative_bind" ) );
+		m_PrimaryClear			= m_Root.FindAnyWidget( "primary_clear" );
+		m_AlternativeClear		= m_Root.FindAnyWidget( "alternative_clear" );
+		
+		m_Container					= group;
+		m_ElementIndex			= key_index;
+		
+		Reload();
+		m_Root.SetHandler( this );
+	}
+	
+	string GetLayoutName()
+	{
+		return "gui/layouts/new_ui/options/keybindings_selectors/keybinding_option.layout";
+	}
+	
+	bool IsChanged()
+	{
+		return m_IsEdited;
+	}
+	
+	bool IsAlternateChanged()
+	{
+		return m_IsAlternateEdited;
+	}
+	
+	array<int> GetChangedBinds()
+	{
+		return m_CustomBind;
+	}
+	
+	array<int> GetChangedAlternateBinds()
+	{
+		return m_CustomAlternateBind;
+	}
+	
+	// assembly all related binding at widget element
+	void SetElementTitle( ButtonWidget btnWidget, UAInput pInput, int iDeviceFlags )
+	{
+		string output;
+		int a, i, countbind = 0;
+	
+		for( a = 0; a < pInput.AlternativeCount(); a++ )
+		{
+			pInput.SelectAlternative(a);
+			if( pInput.IsCombo() )
+			{
+				if( pInput.BindingCount() > 0 )
+				{
+					if( pInput.Binding(0) != 0 && pInput.CheckBindDevice(0,iDeviceFlags) )
+					{
+						if( countbind > 0 )
+							output += ", ";
+						
+						output += GetUApi().GetButtonName( pInput.Binding(0) );
+						countbind++;
+						
+						for( i = 1; i < pInput.BindingCount(); i++ )
+						{
+							if( pInput.Binding(i) != 0 )
+							{
+								output += " + " + GetUApi().GetButtonName( pInput.Binding(i) );
+								countbind++;
+							}
+						}
+						
+					}
+				}
+			}
+			else
+			{
+				if( pInput.BindingCount() > 0 )
+				{
+					if( pInput.Binding(0) != 0 && pInput.CheckBindDevice(0,iDeviceFlags) )
+					{
+						if( countbind > 0 )
+							output += ", ";
+
+						output += GetUApi().GetButtonName( pInput.Binding(0) );
+						countbind++;
+					}
+				}
+			}
+		}
+
+		// nothing may be available - we do not want "null" or "0" in string
+		if( countbind > 0 )
+			btnWidget.SetText(output);
+		else
+			btnWidget.SetText("");
+	}
+	
+	void Reload()
+	{
+		UAInput input			= GetUApi().GetInputByID( m_ElementIndex );
+		m_IsEdited				= false;
+		m_IsAlternateEdited		= false;
+		m_CustomBind			= null;
+		m_CustomAlternateBind	= null;
+
+		if( input.IsLimited() )
+		{
+			if( input.IsPressLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_press" );
+			}
+			if( input.IsReleaseLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_release" );
+			}
+			if( input.IsHoldLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_hold" );
+			}
+			if( input.IsHoldBeginLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_holdbegin" );
+			}
+			if( input.IsClickLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_click" );
+			}
+			if( input.IsDoubleClickLimit() )
+			{
+				m_ElementModifier.SetText( "#keybind_doubletap" );
+			}
+		}
+		else
+		{
+			m_ElementModifier.SetText( "" );
+		}
+		
+		string option_text;
+		string name;
+		
+		GetGame().GetInput().GetActionDesc( m_ElementIndex, option_text );
+		m_ElementName.SetText( option_text );
+		
+		// column #1 :: keyboard + mouse
+		SetElementTitle(m_PrimaryBindButton, input, EUAINPUT_DEVICE_KEYBOARDMOUSE);
+
+		// column #2 :: controller
+		SetElementTitle(m_AlternativeBindButton, input, EUAINPUT_DEVICE_CONTROLLER);
+	}
+	
+	void Reload( array<int> custom_binds, bool is_alternate )
+	{
+		string output;
+		if( custom_binds.Count() > 1 )
+		{
+			if( custom_binds.Get( 0 ) != 0 )
+				output = GetUApi().GetButtonName( custom_binds.Get( 0 ) );
+			for( int i = 1; i < custom_binds.Count(); i++ )
+			{
+				if( custom_binds.Get( i ) != 0 )
+					output += " + " + GetUApi().GetButtonName( custom_binds.Get( i ) );
+			}
+		}
+		else if( custom_binds.Count() > 0 )
+		{
+			if( custom_binds.Get( 0 ) != 0 )
+				output = GetUApi().GetButtonName( custom_binds.Get( 0 ) );
+		}
+		
+		if( is_alternate )
+		{
+			m_CustomAlternateBind = custom_binds;
+			m_IsAlternateEdited = true;
+			m_AlternativeBindButton.SetText( output );
+		}
+		else
+		{
+			m_CustomBind = custom_binds;
+			m_IsEdited = true;
+			m_PrimaryBindButton.SetText( output );
+		}
+	}
+	
+	void StartEnteringKeybind()
+	{
+		m_Container.StartEnteringKeybind( m_ElementIndex );
+		m_PrimaryBindButton.SetText( "#layout_keybinding_new_keybind" );
+	}
+	
+	void CancelEnteringKeybind()
+	{
+		Reload();
+	}
+	
+	void StartEnteringAlternateKeybind()
+	{
+		m_Container.StartEnteringAlternateKeybind( m_ElementIndex );
+		m_AlternativeBindButton.SetText( "#layout_keybinding_new_keybind" );
+	}
+	
+	void CancelEnteringAlternateKeybind()
+	{
+		Reload();
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if( !m_Container.IsEnteringKeyBind() )
+		{
+			if( w == m_PrimaryBindButton )
+			{
+				m_EntryTimer.Run( 0.01, this, "StartEnteringKeybind" );
+			}
+			if( w == m_AlternativeBindButton )
+			{
+				m_EntryTimer.Run( 0.01, this, "StartEnteringAlternateKeybind" );
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if( w == m_PrimaryClear )
+		{
+			m_IsEdited				= true;
+			m_CustomBind			= new array<int>;
+			m_PrimaryBindButton.SetText( "" );
+			m_Container.ClearKeybind( m_ElementIndex );
+		}
+		if( w == m_AlternativeClear )
+		{
+			m_IsAlternateEdited		= true;
+			m_CustomAlternateBind	= new array<int>;
+			m_AlternativeBindButton.SetText( "" );
+			m_Container.ClearAlternativeKeybind( m_ElementIndex );
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if( w == m_PrimaryBindButton || w == m_PrimaryClear )
+		{
+			m_PrimaryBindButton.SetColor( ARGBF( 1, 1, 0, 0 ) );
+			m_PrimaryClear.Show( true );
+			m_PrimaryClear.Update();
+			m_AlternativeClear.Show( false );
+			return true;
+		}
+		else if( w == m_AlternativeBindButton || w == m_AlternativeClear )
+		{
+			m_AlternativeBindButton.SetColor( ARGBF( 1, 1, 0, 0 ) );
+			m_PrimaryClear.Show( false );
+			m_AlternativeClear.Show( true );
+			m_AlternativeClear.Update();
+			return true;
+		}
+		else
+		{
+			m_PrimaryBindButton.SetColor( ARGBF( 0, 0, 0, 0 ) );
+			m_AlternativeBindButton.SetColor( ARGBF( 1, 0, 0, 0 ) );
+			m_PrimaryClear.Show( false );
+			m_AlternativeClear.Show( false );
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		if( w == m_PrimaryClear || w == m_PrimaryBindButton )
+		{
+			if( enterW != m_PrimaryClear && enterW != m_PrimaryBindButton )
+			{
+				m_PrimaryClear.Show( false );
+				m_PrimaryBindButton.SetColor( ARGBF( 1, 0, 0, 0 ) );
+			}
+		}
+		if( w == m_AlternativeClear || w == m_AlternativeBindButton )
+		{
+			if( enterW != m_AlternativeClear && enterW != m_AlternativeBindButton )
+			{
+				m_AlternativeClear.Show( false );
+				m_AlternativeBindButton.SetColor( ARGBF( 1, 0, 0, 0 ) );
+			}
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsContainer.c b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..51ecead089df1367cb0d954dad74064e91d1554f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsContainer.c
@@ -0,0 +1,308 @@
+//container for various subgroups and their elements
+class KeybindingsContainer extends ScriptedWidgetEventHandler
+{
+	protected const int  								NO_SORTING = -1;
+	protected Widget									m_Root;
+	protected KeybindingsMenu							m_Menu;
+	protected ScrollWidget 								m_Scroll;
+	
+	protected ref map<int, ref ElementArray>			m_KeyWidgetElements; //<input_action_id,<KeybindingElementNew>>
+	protected int										m_CurrentSettingKeyIndex = -1;
+	protected int										m_CurrentSettingAlternateKeyIndex = -1;
+	
+	protected ref array<Widget> 						m_Subgroups;
+	
+	void KeybindingsContainer( int index, Input input, Widget parent, KeybindingsMenu menu )
+	{
+		m_KeyWidgetElements	= new map<int, ref ElementArray>;
+		m_Menu			= menu;
+		
+		m_Root	= GetGame().GetWorkspace().CreateWidgets( GetLayoutName(), parent );
+		m_Scroll = ScrollWidget.Cast(m_Root.FindAnyWidget("group_scroll"));
+		Widget container	= m_Root.FindAnyWidget( "group_scroll" );
+		
+		CreateSubgroups(container,input);
+		
+		container.Update();
+		
+		m_Root.SetHandler( this );
+	}
+	
+	string GetLayoutName()
+	{
+		return "gui/layouts/new_ui/options/keybindings_selectors/keybinding_container.layout";
+	}
+	
+	void OnSelectKBPreset( int index )
+	{
+		GetUApi().PresetSelect( index );
+		ReloadElements();
+		GetUApi().Export();
+		GetUApi().SaveInputPresetMiscData();
+	}
+	
+	void ReloadElements()
+	{
+		foreach ( ElementArray elements : m_KeyWidgetElements )
+		{
+			foreach (KeybindingElementNew element : elements)
+			{
+				element.Reload();
+			}
+		}
+	}
+	
+	void AddSubgroup( int sort_index, Widget parent, Input input )
+	{
+		Widget subgroup				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/options/keybindings_selectors/keybinding_subgroup.layout", parent );
+		Widget subgroup_content 	= subgroup.FindAnyWidget( "subgroup_content" );
+		
+		TIntArray input_actions;
+		if (sort_index != NO_SORTING)
+		{
+			input_actions = InputUtils.GetInputActionSortingMap().Get(sort_index);
+		}
+		else
+		{
+			input_actions = InputUtils.GetUnsortedInputActions();
+		}
+		
+		for (int i = 0; i < input_actions.Count(); i++)
+		{
+			AddElement( input_actions[i], subgroup_content, input );
+		}
+		
+		m_Subgroups.Insert(subgroup);
+		
+		subgroup_content.Update();
+	}
+	
+	void CreateSubgroups( Widget parent, Input input )
+	{
+		m_Subgroups = new array<Widget>;
+		
+		int sort_count = InputUtils.GetInputActionSortingMap().Count();
+		for (int i = 0; i < sort_count; i++)
+		{
+			if (InputUtils.GetInputActionSortingMap().GetElement(i) && InputUtils.GetInputActionSortingMap().GetElement(i).Count() > 0)
+			{
+				AddSubgroup(InputUtils.GetInputActionSortingMap().GetKey(i),parent,input);
+			}
+		}
+		
+		//any unssorted inputs go here
+		if (InputUtils.GetUnsortedInputActions() && InputUtils.GetUnsortedInputActions().Count() > 0)
+		{
+			AddSubgroup(NO_SORTING,parent,input);
+		}
+	}
+	
+	void AddElement( int index, Widget parent, Input input )
+	{
+		//create array if needed
+		if (!m_KeyWidgetElements.Get(index))
+		{
+			ElementArray elements = new ElementArray;
+			m_KeyWidgetElements.Insert( index, elements );
+		}
+		
+		KeybindingElementNew element = new KeybindingElementNew( index, parent, this );
+		m_KeyWidgetElements.Get(index).Insert(element);
+	}
+	
+	bool IsEnteringKeyBind()
+	{
+		return ( m_CurrentSettingKeyIndex != -1 || m_CurrentSettingAlternateKeyIndex != -1 );
+	}
+	
+	void ClearKeybind( int key_index )
+	{
+		m_Menu.ClearKeybind( key_index );
+	}
+	
+	void ClearAlternativeKeybind( int key_index )
+	{
+		m_Menu.ClearAlternativeKeybind( key_index );
+	}
+	
+	void StartEnteringKeybind( int key_index )
+	{
+		m_CurrentSettingAlternateKeyIndex	= -1;
+		m_CurrentSettingKeyIndex			= key_index;
+		m_Menu.StartEnteringKeybind( key_index );
+	}
+	
+	void CancelEnteringKeybind()
+	{
+		if ( m_CurrentSettingKeyIndex != -1 )
+		{
+			foreach (KeybindingElementNew element : m_KeyWidgetElements.Get( m_CurrentSettingKeyIndex ))
+			{
+				element.CancelEnteringKeybind();
+			}
+			m_CurrentSettingKeyIndex = -1;
+		}
+	}
+	
+	void StartEnteringAlternateKeybind( int key_index )
+	{
+		m_CurrentSettingKeyIndex			= -1;
+		m_CurrentSettingAlternateKeyIndex	= key_index;
+		m_Menu.StartEnteringAlternateKeybind( key_index );
+	}
+	
+	void CancelEnteringAlternateKeybind()
+	{
+		if ( m_CurrentSettingAlternateKeyIndex != -1 )
+		{
+			foreach (KeybindingElementNew element : m_KeyWidgetElements.Get( m_CurrentSettingAlternateKeyIndex ))
+			{
+				element.CancelEnteringKeybind();
+			}
+			m_CurrentSettingAlternateKeyIndex = -1;
+		}
+	}
+	
+	//! is anything changed?
+	bool IsChanged()
+	{
+		foreach (ElementArray elements : m_KeyWidgetElements)
+		{
+			foreach (KeybindingElementNew element : elements)
+			{
+				if (element.IsChanged() || element.IsAlternateChanged())
+				{
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	void Apply()
+	{
+		UAInputAPI ua_api	= GetUApi();
+		int input_index = 0;
+		
+		foreach (ElementArray elements : m_KeyWidgetElements)
+		{
+			foreach (int element_index, KeybindingElementNew element : elements)
+			{
+				if (element_index == 0)
+				{
+					UAInput input = ua_api.GetInputByID( m_KeyWidgetElements.GetKey(input_index) );
+					int i;
+					if ( element.IsChanged() )
+					{
+						array<int> new_keys		= element.GetChangedBinds();
+						input.ClearDeviceBind(EUAINPUT_DEVICE_KEYBOARDMOUSE);
+						if ( new_keys.Count() > 0 )
+						{
+							input.BindComboByHash( new_keys.Get( 0 ) );
+							for( i = 1; i < new_keys.Count(); i++ )
+							{
+								input.BindComboByHash( new_keys.Get( i ) );
+							}
+						}
+					}
+					
+					if ( element.IsAlternateChanged() )
+					{
+						array<int> new_alt_keys = element.GetChangedAlternateBinds();
+						
+						if ( input.AlternativeCount() == 0 )
+						{
+							input.AddAlternative();				
+						}
+						
+						input.ClearDeviceBind(EUAINPUT_DEVICE_CONTROLLER);
+						
+						if ( new_alt_keys.Count() > 0 )
+						{
+							input.BindComboByHash( new_alt_keys.Get( 0 ) );
+							for( i = 1; i < new_alt_keys.Count(); i++ )
+							{
+								input.BindComboByHash( new_alt_keys.Get( i ) );
+							}
+						}
+					}
+				}
+				element.Reload();
+			}
+			input_index++;
+		}
+	}
+	
+	void Reset(bool forced = false)
+	{
+		foreach ( ElementArray elements : m_KeyWidgetElements )
+		{
+			foreach (KeybindingElementNew element : elements)
+			{
+				if ( element.IsChanged() || element.IsAlternateChanged() || forced )
+				{
+					element.Reload();
+				}
+			}
+		}
+	}
+	
+	void Update( float timeslice )
+	{
+		if ( m_CurrentSettingKeyIndex != -1 || m_CurrentSettingAlternateKeyIndex != -1 )
+		{
+			UAInputAPI ua_api = GetUApi();
+			if ( ua_api.DeterminePressedButton() != 0 )
+			{
+				string name;
+				string text;
+				ref array<int> new_keybinds = new array<int>;
+				
+				// remove previous backlit
+				GetDayZGame().GetBacklit().KeybindingClear();
+
+				for( int i = 0; i < ua_api.DeterminedCount(); ++i )
+				{
+					int kb_id = ua_api.GetDetermined( i );
+					new_keybinds.Insert( kb_id );
+					
+					// light up specific key
+					GetDayZGame().GetBacklit().KeybindingShow(kb_id);
+				}
+				
+				if ( m_CurrentSettingKeyIndex != -1 )
+				{
+					m_Menu.ConfirmKeybindEntry( new_keybinds );
+					foreach (KeybindingElementNew element : m_KeyWidgetElements.Get( m_CurrentSettingKeyIndex ))
+					{
+						element.Reload( new_keybinds, false );
+					}
+					m_CurrentSettingKeyIndex = -1;
+				}
+				else if ( m_CurrentSettingAlternateKeyIndex != -1 )
+				{
+					m_Menu.ConfirmAlternateKeybindEntry( new_keybinds );
+					foreach (KeybindingElementNew elementAlternate : m_KeyWidgetElements.Get( m_CurrentSettingAlternateKeyIndex ))
+					{
+						elementAlternate.Reload( new_keybinds, true );
+					}
+					m_CurrentSettingAlternateKeyIndex = -1;
+				}
+			}
+		}
+	}
+	
+	void SwitchSubgroup(int index)
+	{
+		Widget w;
+		for (int i = 0; i < m_Subgroups.Count(); i++)
+		{
+			w = m_Subgroups[i];
+			w.Show(index == i);
+		}
+		
+		m_Scroll.VScrollToPos01(0);
+	}
+}
+
+typedef array<ref KeybindingElementNew> ElementArray;
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsEntryWindow.c b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsEntryWindow.c
new file mode 100644
index 0000000000000000000000000000000000000000..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsGroup.c b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsGroup.c
new file mode 100644
index 0000000000000000000000000000000000000000..8ca898576148d728ff24be946f911f6810b56bf8
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsGroup.c
@@ -0,0 +1,306 @@
+//! Deprecated
+class KeybindingsGroup extends ScriptedWidgetEventHandler
+{
+	protected Widget									m_Root;
+	protected KeybindingsMenu							m_Menu;
+	
+	protected ref map<int, ref KeybindingElement>		m_KeyWidgets;
+	protected int										m_CurrentSettingKeyIndex = -1;
+	protected int										m_CurrentSettingAlternateKeyIndex = -1;
+	
+	protected ref DropdownPrefab						m_KBDropdown;
+	
+	void KeybindingsGroup( int index, Input input, Widget parent, KeybindingsMenu menu )
+	{
+		m_KeyWidgets	= new map<int, ref KeybindingElement>;
+		m_Menu			= menu;
+		
+		string group_name;
+		input.GetActionGroupName( index, group_name );
+		
+		m_Root	= GetGame().GetWorkspace().CreateWidgets( GetLayoutName(), parent );
+		Widget subgroup	= m_Root.FindAnyWidget( "group_content" );
+		
+//		for( int i = 0; i < 1; i++ )
+//		{
+			AddSubgroup( /*index, */subgroup, input );
+//		}
+		
+		InitPresets( index, m_Root.FindAnyWidget( "group_header" ), input );
+		
+		subgroup.Update();
+		
+		m_Root.SetHandler( this );
+	}
+	
+	string GetLayoutName()
+	{
+		return "gui/layouts/new_ui/options/keybindings_selectors/keybinding_group.layout";
+	}
+	
+	void InitPresets( int index, Widget parent, Input input )
+	{
+		Widget kb_root = parent.FindAnyWidget( "keyboard_dropown" );
+		
+		string profile_text;
+		input.GetProfileName( input.GetCurrentProfile(), profile_text );
+		
+		m_KBDropdown		= new DropdownPrefab( kb_root, profile_text );
+		
+		m_KBDropdown.m_OnSelectItem.Insert( OnSelectKBPreset );
+		
+		for( int i = 0; i < input.GetProfilesCount(); i++ )
+		{
+			input.GetProfileName( i, profile_text );
+			m_KBDropdown.AddElement( profile_text );
+		}
+		
+		kb_root.Update();
+	}
+	
+	void OnSelectKBPreset( int index )
+	{
+		string profile_text;
+		GetGame().GetInput().GetProfileName( index, profile_text );
+		m_KBDropdown.SetText( profile_text );
+		GetGame().GetInput().SetProfile( index );
+		ReloadProfiles();
+		m_KBDropdown.Close();
+	}
+	
+	void OnSelectConsolePreset( int index )
+	{
+		string profile_text;
+		GetGame().GetInput().GetProfileName( index, profile_text );
+		GetGame().GetInput().SetProfile( index );
+		ReloadProfiles();
+	}
+	
+	void ReloadProfiles()
+	{
+		foreach( int index,  KeybindingElement element : m_KeyWidgets )
+		{
+			element.Reload();
+		}
+	}
+	
+	void AddSubgroup( /*int index, */Widget parent, Input input )
+	{
+		Widget subgroup				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/options/keybindings_selectors/keybinding_subgroup.layout", parent );
+		TextWidget subgroup_name	= TextWidget.Cast( subgroup.FindAnyWidget( "subgroup_text" ) );
+		
+		subgroup_name.SetText( "TestSubgroup" );
+		Widget subgroup_content = subgroup.FindAnyWidget( "subgroup_content" );
+		
+		TIntArray actions = new TIntArray;
+		GetUApi().GetActiveInputs(actions);
+		for( int i = 0; i < actions.Count(); i++ )
+		{
+			AddAction( actions.Get( i ), subgroup_content, input );
+		}
+		
+		subgroup_content.Update();
+	}
+	
+	void AddAction( int index, Widget parent, Input input )
+	{
+		m_KeyWidgets.Insert( index, new KeybindingElement( index, parent, this ) );
+	}
+	
+	void ReloadAction( int index )
+	{
+		if( m_KeyWidgets.Contains( index ) )
+		{
+			m_KeyWidgets.Get( index ).Reload();
+		}
+	}
+	
+	bool IsEnteringKeyBind()
+	{
+		return ( m_CurrentSettingKeyIndex != -1 || m_CurrentSettingAlternateKeyIndex != -1 );
+	}
+	
+	void ClearKeybind( int key_index )
+	{
+		m_Menu.ClearKeybind( key_index );
+	}
+	
+	void ClearAlternativeKeybind( int key_index )
+	{
+		m_Menu.ClearAlternativeKeybind( key_index );
+	}
+	
+	void StartEnteringKeybind( int key_index )
+	{
+		m_CurrentSettingAlternateKeyIndex	= -1;
+		m_CurrentSettingKeyIndex			= key_index;
+		m_Menu.StartEnteringKeybind( key_index );
+	}
+	
+	void CancelEnteringKeybind()
+	{
+		if( m_CurrentSettingKeyIndex != -1 )
+		{
+			m_KeyWidgets.Get( m_CurrentSettingKeyIndex ).CancelEnteringKeybind();
+			m_CurrentSettingKeyIndex = -1;
+		}
+	}
+	
+	void StartEnteringAlternateKeybind( int key_index )
+	{
+		m_CurrentSettingKeyIndex			= -1;
+		m_CurrentSettingAlternateKeyIndex	= key_index;
+		m_Menu.StartEnteringAlternateKeybind( key_index );
+	}
+	
+	void CancelEnteringAlternateKeybind()
+	{
+		if( m_CurrentSettingAlternateKeyIndex != -1 )
+		{
+			m_KeyWidgets.Get( m_CurrentSettingAlternateKeyIndex ).CancelEnteringAlternateKeybind();
+			m_CurrentSettingAlternateKeyIndex = -1;
+		}
+	}
+	
+	bool IsChanged()
+	{
+		foreach( int index, KeybindingElement element : m_KeyWidgets )
+		{
+			if( element.IsChanged() || element.IsAlternateChanged() )
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	void Apply()
+	{
+		UAInputAPI ua_api	= GetUApi();
+		foreach( int index, KeybindingElement element : m_KeyWidgets )
+		{
+			UAInput input = ua_api.GetInputByID( index );
+			int i;
+			if( element.IsChanged() )
+			{
+				array<int> new_keys		= element.GetChangedBinds();
+				
+/*				if( input.AlternativeCount() == 0 )
+				{
+					input.AddAlternative();
+				}
+				else*/
+				{
+					input.ClearDeviceBind(EUAINPUT_DEVICE_KEYBOARDMOUSE);
+//					input.SelectAlternative( 0 );
+//					input.ClearAlternative( 0 );
+				}
+				
+				if( new_keys.Count() > 0 )
+				{
+					input.BindComboByHash( new_keys.Get( 0 ) );
+					for( i = 1; i < new_keys.Count(); i++ )
+					{
+						input.BindComboByHash( new_keys.Get( i ) );
+					}
+				}
+			}
+			
+			if( element.IsAlternateChanged() )
+			{
+				array<int> new_alt_keys = element.GetChangedAlternateBinds();
+				
+				if( input.AlternativeCount() == 0 )
+				{
+					input.AddAlternative();				
+				}
+				
+/*				if( input.AlternativeCount() < 2 )
+				{
+					input.AddAlternative();
+				}
+				else*/
+				{
+					input.ClearDeviceBind(EUAINPUT_DEVICE_CONTROLLER);
+//					input.SelectAlternative( 1 );
+//					input.ClearAlternative( 1 );
+				}
+				
+				if( new_alt_keys.Count() > 0 )
+				{
+					input.BindComboByHash( new_alt_keys.Get( 0 ) );
+					for( i = 1; i < new_alt_keys.Count(); i++ )
+					{
+						input.BindComboByHash( new_alt_keys.Get( i ) );
+					}
+				}
+			}
+			element.Reload();
+		}
+	}
+	
+	//DEPRECATED
+	void Reset()
+	{
+		ResetEx();
+	}
+	
+	void ResetEx(bool forced = false)
+	{
+		foreach( int index, KeybindingElement element : m_KeyWidgets )
+		{
+			if( element.IsChanged() || element.IsAlternateChanged() || forced )
+			{
+				element.Reload();
+			}
+		}
+	}
+	
+	void Update( float timeslice )
+	{
+		if( m_CurrentSettingKeyIndex != -1 || m_CurrentSettingAlternateKeyIndex != -1 )
+		{
+			UAInputAPI ua_api = GetUApi();
+			if( ua_api.DeterminePressedButton() != 0 )
+			{
+				string name;
+				string text;
+				ref array<int> new_keybinds = new array<int>;
+				
+				// remove previous backlit
+				GetDayZGame().GetBacklit().KeybindingClear();
+
+				for( int i = 0; i < ua_api.DeterminedCount(); ++i )
+				{
+					int kb_id = ua_api.GetDetermined( i );
+					new_keybinds.Insert( kb_id );
+					
+					// light up specific key
+					GetDayZGame().GetBacklit().KeybindingShow(kb_id);
+				}
+				
+				if( m_CurrentSettingKeyIndex != -1 )
+				{
+					m_Menu.ConfirmKeybindEntry( new_keybinds );
+					m_KeyWidgets.Get( m_CurrentSettingKeyIndex ).Reload( new_keybinds, false );
+					m_CurrentSettingKeyIndex = -1;
+				}
+				else if( m_CurrentSettingAlternateKeyIndex != -1 )
+				{
+					m_Menu.ConfirmAlternateKeybindEntry( new_keybinds );
+					m_KeyWidgets.Get( m_CurrentSettingAlternateKeyIndex ).Reload( new_keybinds, true );
+					m_CurrentSettingAlternateKeyIndex = -1;
+				}
+			}
+		}
+	}
+	
+	override bool OnMouseButtonDown( Widget w, int x, int y, int button )
+	{
+		if( !ButtonWidget.Cast( w ) )
+		{
+			m_KBDropdown.Close();
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsMenu.c b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..1f8bb6492e1857720d72c30d6bdea6ed23587567
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Keybindings/KeybindingsMenu.c
@@ -0,0 +1,536 @@
+class KeybindingsMenu extends UIScriptedMenu
+{
+	protected TabberUI							m_Tabber;
+	protected ref DropdownPrefab				m_KBDropdown; //DEPRECATED
+	protected ref OptionSelectorMultistate		m_PresetSelector;
+	protected ref KeybindingsContainer 			m_GroupsContainer;
+	protected ref array<ref KeybindingsGroup>	m_Tabs; //DEPRECATED
+	
+	protected TextWidget						m_Version;
+	protected ButtonWidget						m_Apply;
+	protected ButtonWidget						m_Back;
+	protected ButtonWidget						m_Undo;
+	protected ButtonWidget						m_Defaults;
+	protected ButtonWidget						m_HardReset;
+	
+	protected int								m_CurrentSettingKeyIndex = -1;
+	protected int								m_CurrentSettingAlternateKeyIndex = -1;
+	protected int								m_OriginalPresetIndex;
+	protected int								m_TargetPresetIndex;
+	protected ref array<int>					m_SetKeybinds;
+	
+	const int MODAL_ID_BACK = 1337;
+	const int MODAL_ID_DEFAULT = 100;
+	const int MODAL_ID_DEFAULT_ALL = 101;
+	const int MODAL_ID_PRESET_CHANGE = 200;
+	const int MODAL_RESULT_DEFAULT_CURRENT = 0;
+	const int MODAL_RESULT_DEFAULT_ALL = 1;
+	
+	override Widget Init()
+	{
+		Input input = GetGame().GetInput();
+		layoutRoot			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/options/pc/keybinding_menu.layout", null);
+		
+		m_Version			= TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		m_Apply				= ButtonWidget.Cast(layoutRoot.FindAnyWidget("apply"));
+		m_Back				= ButtonWidget.Cast(layoutRoot.FindAnyWidget("back"));
+		m_Undo				= ButtonWidget.Cast(layoutRoot.FindAnyWidget("undo"));
+		m_Defaults			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("reset"));
+		m_HardReset			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("reset_all"));
+		
+		layoutRoot.FindAnyWidget("Tabber").GetScript(m_Tabber);
+		
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+		version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+		version = "#main_menu_version" + " " + version;
+		#endif
+		m_Version.SetText(version);
+
+		#ifdef PLATFORM_PS4
+		string back = "circle";
+		if (GetGame().GetInput().GetEnterButton() != GamepadButton.A)
+			back = "cross";
+
+		ImageWidget toolbar_b = ImageWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		toolbar_b.LoadImageFile(0, "set:playstation_buttons image:" + back);
+		#endif
+		
+		InitInputSortingMap();
+		CreateTabs();
+		CreateGroupContainer();
+		
+		InitPresets(-1, layoutRoot.FindAnyWidget("group_header"), input);
+		m_Tabber.m_OnTabSwitch.Insert(UpdateTabContent);
+		m_Tabber.SelectTabControl(0);
+		m_Tabber.SelectTabPanel(0);
+		g_Game.SetKeyboardHandle(this);
+		m_Tabber.RefreshTab(true);
+		
+		ColorDisabled(m_Apply);
+		m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+		ColorDisabled(m_Undo);
+		m_Undo.SetFlags(WidgetFlags.IGNOREPOINTER);
+		ColorWhite(m_Defaults, null);
+		m_Defaults.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		
+		return layoutRoot;
+	}
+	
+	void CreateTabs()
+	{
+		int sort_count = InputUtils.GetInputActionSortingMap().Count();
+		for (int i = 0; i < sort_count; i++)
+		{
+			if (InputUtils.GetInputActionSortingMap().GetElement(i) && InputUtils.GetInputActionSortingMap().GetElement(i).Count() > 0)
+			{
+				string group_name = GetUApi().SortingLocalization(InputUtils.GetInputActionSortingMap().GetKey(i));
+				group_name = Widget.TranslateString("#" + group_name); //oof
+				m_Tabber.AddTab(group_name);
+			}
+		}
+		
+		if (InputUtils.GetUnsortedInputActions() && InputUtils.GetUnsortedInputActions().Count() > 0)
+		{
+			m_Tabber.AddTab(Widget.TranslateString("#layout_pc_keybinding_unsorted"));
+		}
+		m_Tabber.DisableTabs(true);
+	}
+	
+	void CreateGroupContainer()
+	{
+		m_GroupsContainer = new KeybindingsContainer(-1,GetGame().GetInput(),layoutRoot.FindAnyWidget("TabContentsHolder"),this);
+	}
+	
+	void UpdateTabContent(int tab_index)
+	{
+		m_GroupsContainer.SwitchSubgroup(tab_index);
+	}
+	
+	void ClearKeybind(int key_index)
+	{
+		ColorWhite(m_Apply, null);
+		m_Apply.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		ColorWhite(m_Undo, null);
+		m_Undo.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	void ClearAlternativeKeybind(int key_index)
+	{
+		ColorWhite(m_Apply, null);
+		m_Apply.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		ColorWhite(m_Undo, null);
+		m_Undo.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	void StartEnteringKeybind(int key_index)
+	{
+		m_CurrentSettingAlternateKeyIndex	= -1;
+		m_CurrentSettingKeyIndex			= key_index;
+	}
+	
+	void CancelEnteringKeybind()
+	{
+		m_GroupsContainer.CancelEnteringKeybind();
+		m_CurrentSettingKeyIndex = -1;
+	}
+	
+	void StartEnteringAlternateKeybind(int key_index)
+	{
+		m_CurrentSettingKeyIndex			= -1;
+		m_CurrentSettingAlternateKeyIndex	= key_index;
+	}
+	
+	void CancelEnteringAlternateKeybind()
+	{
+		m_GroupsContainer.CancelEnteringAlternateKeybind();
+		m_CurrentSettingAlternateKeyIndex = -1;
+	}
+	
+	void ConfirmKeybindEntry(TIntArray new_keys)
+	{
+		m_CurrentSettingKeyIndex = -1;
+		ColorWhite(m_Apply, null);
+		m_Apply.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		ColorWhite(m_Undo, null);
+		m_Undo.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	void ConfirmAlternateKeybindEntry(TIntArray new_keys)
+	{
+		m_CurrentSettingAlternateKeyIndex = -1;
+		ColorWhite(m_Apply, null);
+		m_Apply.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		ColorWhite(m_Undo, null);
+		m_Undo.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Back();
+		}
+		
+		if (m_GroupsContainer)
+		{
+			m_GroupsContainer.Update(timeslice);
+		}
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Apply)
+			{
+				Apply();
+				return true;
+			}
+			else if (w == m_Back)
+			{
+				Back();
+				return true;
+			}
+			else if (w == m_Undo)
+			{
+				Reset();
+				return true;
+			}
+			else if (w == m_Defaults)
+			{
+				SetToDefaults();
+				return true;
+			}
+			else if (w == m_HardReset)
+			{
+				HardReset();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	void Apply()
+	{
+		ColorDisabled(m_Apply);
+		m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+		ColorDisabled(m_Undo);
+		m_Undo.SetFlags(WidgetFlags.IGNOREPOINTER);
+		ColorWhite(m_Defaults, null);
+		m_Defaults.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		
+		m_GroupsContainer.Apply();
+		
+		// save input configuration
+		GetUApi().Export();
+	}
+	
+	void Back()
+	{
+		if (m_CurrentSettingKeyIndex != -1)
+		{
+			CancelEnteringKeybind();
+			return;
+		}
+		
+		if (m_CurrentSettingAlternateKeyIndex != -1)
+		{
+			CancelEnteringAlternateKeybind();
+			return;
+		}
+		
+		bool changed = m_GroupsContainer.IsChanged();
+
+		if (changed)
+		{
+			g_Game.GetUIManager().ShowDialog("#main_menu_configure", "#main_menu_configure_desc", MODAL_ID_BACK, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+		}
+		else
+		{
+			GetGame().GetUIManager().Back();
+		}
+	}
+	
+	//! Undoes the unsaved changes and reverts to previous state. Does not reset to defaults!
+	void Reset()
+	{
+		ColorDisabled(m_Apply);
+		m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+		ColorDisabled(m_Undo);
+		m_Undo.SetFlags(WidgetFlags.IGNOREPOINTER);
+		
+		m_GroupsContainer.Reset();
+	}
+	
+	void SetToDefaults()
+	{
+		g_Game.GetUIManager().ShowDialog("#menu_default_cap", "#menu_default_desc", MODAL_ID_DEFAULT, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+	}
+	
+	void HardReset()
+	{
+		g_Game.GetUIManager().ShowDialog("#menu_default_cap", "#menu_default_all_desc", MODAL_ID_DEFAULT_ALL, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+	}
+	
+	void PerformSetToDefaultsExt(int mode)
+	{
+		switch (mode)
+		{
+			case MODAL_RESULT_DEFAULT_CURRENT:
+				GetUApi().PresetReset();
+			break;
+			
+			case MODAL_RESULT_DEFAULT_ALL:
+				GetUApi().Revert();
+			break;
+		}
+		
+		ColorDisabled(m_Apply);
+		m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+		ColorDisabled(m_Undo);
+		m_Undo.SetFlags(WidgetFlags.IGNOREPOINTER);
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().GetMission().RefreshExcludes);
+		m_GroupsContainer.Reset(true);
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		if (code == MODAL_ID_BACK)
+		{
+			if (result == DBB_YES)
+			{
+				Reset();
+				GetGame().GetUIManager().Back();
+			}
+			return true;
+		}
+		else if (code == MODAL_ID_DEFAULT)
+		{
+			if (result == DBB_YES)
+			{
+				PerformSetToDefaultsExt(MODAL_RESULT_DEFAULT_CURRENT);
+			}
+			return true;
+		}
+		else if (code == MODAL_ID_DEFAULT_ALL)
+		{
+			if (result == DBB_YES)
+			{
+				PerformSetToDefaultsExt(MODAL_RESULT_DEFAULT_ALL);
+			}
+		}
+		else if (code == MODAL_ID_PRESET_CHANGE)
+		{
+			if (result == DBB_YES)
+			{
+				Reset();
+				m_PresetSelector.PerformSetOption(m_TargetPresetIndex);
+			}
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override void Refresh()
+	{
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+			version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+			version = "#main_menu_version" + " " + version;
+		#endif
+		m_Version.SetText(version);
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			ColorRed(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			if ((w.GetFlags() & WidgetFlags.DISABLED) || (w.GetFlags() & WidgetFlags.IGNOREPOINTER))
+			{
+				ColorDisabled(w);
+			}
+			else
+			{
+				ColorWhite(w, enterW);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseWheel(Widget w, int x, int y, int wheel)
+	{
+		return super.OnMouseWheel(w, x, y, wheel);
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			ColorRed(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			if ((w.GetFlags() & WidgetFlags.DISABLED) || (w.GetFlags() & WidgetFlags.IGNOREPOINTER))
+			{
+				ColorDisabled(w);
+			}
+			else
+			{
+				ColorWhite(w, null);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Apply || w == m_Back || w == m_Undo || w == m_Defaults || w == m_HardReset);
+		}
+		return false;
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorRed(Widget w)
+	{
+		SetFocus(w);
+		
+		ButtonWidget button = ButtonWidget.Cast(w);
+		if (button && button != m_Apply)
+		{
+			button.SetTextColor(ARGB(255, 200, 0, 0));
+		}
+	}
+	
+	void ColorWhite(Widget w, Widget enterW)
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus(null);
+		#endif
+		
+		ButtonWidget button = ButtonWidget.Cast(w);
+		if (button)
+		{
+			if (button.GetFlags() & WidgetFlags.DISABLED)
+			{
+				button.SetTextColor(ColorManager.COLOR_DISABLED_TEXT);
+			}
+			else
+			{
+				button.SetTextColor(ColorManager.COLOR_NORMAL_TEXT);
+			}
+		}
+	}
+	
+	void ColorDisabled(Widget w)
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus(null);
+		#endif
+		
+		ButtonWidget button = ButtonWidget.Cast(w);
+		if (button)
+		{
+			button.SetTextColor(ColorManager.COLOR_DISABLED_TEXT);
+		}
+	}
+	
+	protected void InitInputSortingMap()
+	{
+		InputUtils.InitInputMetadata();
+	}
+	
+	void InitPresets(int index, Widget parent, Input input)
+	{
+		Widget kb_root = parent.FindAnyWidget("keyboard_dropown");
+		if (kb_root)
+		{
+			kb_root.Show(false);
+		}
+		
+		array<string> opt1			= new array<string>;
+		string profile_text;
+		
+		for (int i = 0; i < input.GetProfilesCount(); i++)
+		{
+			input.GetProfileName(i, profile_text);
+			opt1.Insert(profile_text);
+		}
+		
+		int current_idx = input.GetCurrentProfile();
+		m_OriginalPresetIndex = current_idx;
+		m_PresetSelector = new OptionSelectorMultistate(layoutRoot.FindAnyWidget("profile_setting_option"), current_idx, null, false, opt1);
+		m_PresetSelector.m_AttemptOptionChange.Insert(OnAttemptSelectPreset);
+		m_PresetSelector.m_OptionChanged.Insert(OnSelectKBPreset);
+	}
+	
+	void OnAttemptSelectPreset(int index)
+	{
+		bool changed = m_GroupsContainer.IsChanged() && m_OriginalPresetIndex != index;
+		m_TargetPresetIndex = index;
+		
+		if (changed)
+		{
+			g_Game.GetUIManager().ShowDialog("#main_menu_configure", "#main_menu_configure_desc", MODAL_ID_PRESET_CHANGE, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+		}
+		
+		m_PresetSelector.SetCanSwitch(!changed);
+	}
+	
+	void OnSelectKBPreset(int index)
+	{
+		m_OriginalPresetIndex = index;
+		m_GroupsContainer.OnSelectKBPreset(index);
+		string profile_text;
+		GetGame().GetInput().GetProfileName(index, profile_text);
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Invoke();
+	}
+	
+//////////////////////////////////////////////////
+// 				OBSOLETE METHODS 				//
+//////////////////////////////////////////////////
+	KeybindingsContainer GetCurrentTab()
+	{
+		return m_GroupsContainer;
+	}
+	
+	void AddGroup(int index, Input input)
+	{
+	}
+	
+	//! deprecated, resets all (as before ~1.20)
+	void PerformSetToDefaults()
+	{
+		PerformSetToDefaultsExt(MODAL_RESULT_DEFAULT_ALL);
+	}
+	//! deprecated
+	void DeferredDefaultsInit()
+	{
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/BannerHandlerBase.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/BannerHandlerBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..008df9064e8b560f40553a31380cb6d95869ea1e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/BannerHandlerBase.c
@@ -0,0 +1,51 @@
+class BannerHandlerBase extends ScriptedWidgetEventHandler
+{
+	protected Widget m_Root;
+	protected Widget m_Parent; //frame
+	protected Widget m_BannerBody;
+	protected Widget m_BannerWedge;
+	protected TextWidget m_BannerText;
+	
+	void BannerHandlerBase(Widget parent)
+	{
+		m_Parent = parent;
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/dlc_panels/BannerTemplate.layout", m_Parent);
+		m_Root.SetHandler(this);
+		
+		m_BannerBody = m_Root.FindAnyWidget("BadgeBody");
+		m_BannerWedge = m_Root.FindAnyWidget("BadgeWedge");
+		m_BannerText = TextWidget.Cast(m_Root.FindAnyWidget("BadgeText"));
+		
+		m_BannerBody.SetAlpha(1.0);
+		m_BannerWedge.SetAlpha(1.0);
+	}
+	
+	void SetBannerColor(int argb)
+	{
+		m_BannerBody.SetColor(argb);
+		m_BannerWedge.SetColor(argb);
+	}
+	
+	void SetBannerText(string text)
+	{
+		m_BannerText.SetText(text);
+	}
+	
+	override bool OnUpdate(Widget w)
+	{
+		if (w == m_BannerText)
+		{
+			float w0,h0,x0,y0;
+			m_BannerText.GetScreenSize(w0,h0);
+			float bannerBodyWidth = w0 + 20;
+			
+			m_BannerBody.SetScreenSize(bannerBodyWidth,h0);
+			m_BannerBody.GetScreenPos(x0,y0);
+			
+			m_BannerWedge.GetScreenSize(w0,h0);
+			m_BannerWedge.SetScreenPos(Math.Ceil(x0 - w0),y0);
+		}
+		
+		return super.OnUpdate(w);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenu.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..9e1043c3458d1c5b1a71275fe625b80222219add
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenu.c
@@ -0,0 +1,704 @@
+class MainMenu extends UIScriptedMenu
+{
+	protected ref MainMenuStats		m_Stats;
+	protected ref MainMenuVideo		m_Video;
+	
+	protected MissionMainMenu		m_Mission;
+	protected DayZIntroScenePC 		m_ScenePC;
+	
+	protected TextWidget			m_PlayerName;
+	protected TextWidget			m_Version;
+	
+	protected Widget				m_CharacterRotationFrame;
+	
+	protected Widget				m_Play;
+	protected Widget		 		m_ChooseServer;
+	protected Widget				m_CustomizeCharacter;
+	protected Widget				m_PlayVideo;
+	protected Widget				m_Tutorials;
+	protected Widget				m_TutorialButton;
+	protected Widget				m_MessageButton;
+	protected Widget				m_SettingsButton;
+	protected Widget				m_Exit;
+	protected Widget				m_NewsMain;
+	protected Widget				m_NewsSec1;
+	protected Widget				m_NewsSec2;
+	protected Widget				m_PrevCharacter;
+	protected Widget				m_NextCharacter;
+	
+	protected Widget				m_LastPlayedTooltip;
+	protected Widget				m_LastPlayedTooltipLabel;
+	protected TextWidget 			m_LastPlayedTooltipName;
+	protected TextWidget			m_LastPlayedTooltipIP;
+	protected TextWidget			m_LastPlayedTooltipPort;
+	
+	protected ref WidgetFadeTimer	m_LastPlayedTooltipTimer;
+	protected ref Widget			m_LastFocusedButton;
+	
+	protected ref TextWidget		m_ModdedWarning;
+	protected ref ModsMenuSimple	m_ModsSimple;
+	protected ref ModsMenuDetailed	m_ModsDetailed;
+	protected ref ModsMenuTooltip	m_ModsTooltip;
+	
+	protected Widget 								m_DlcFrame;
+	protected ref map<string,ref ModInfo> 			m_AllDlcsMap;
+	protected ref JsonDataDLCList 					m_DlcData;
+	protected ref array<ref MainMenuDlcHandlerBase> m_DlcHandlers;
+	protected ref MainMenuDlcHandlerBase 			m_DisplayedDlcHandler;
+	
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/main_menu.layout");
+		
+		m_Play						= layoutRoot.FindAnyWidget("play");
+		m_ChooseServer				= layoutRoot.FindAnyWidget("choose_server");
+		m_CustomizeCharacter		= layoutRoot.FindAnyWidget("customize_character");
+		m_PlayVideo					= layoutRoot.FindAnyWidget("play_video");
+		m_Tutorials					= layoutRoot.FindAnyWidget("tutorials");
+		m_TutorialButton			= layoutRoot.FindAnyWidget("tutorial_button");
+		m_MessageButton				= layoutRoot.FindAnyWidget("message_button");
+		m_SettingsButton			= layoutRoot.FindAnyWidget("settings_button");
+		m_Exit						= layoutRoot.FindAnyWidget("exit_button");
+		m_PrevCharacter				= layoutRoot.FindAnyWidget("prev_character");
+		m_NextCharacter				= layoutRoot.FindAnyWidget("next_character");
+
+		m_DlcFrame 					= layoutRoot.FindAnyWidget("dlc_Frame");
+		m_Version					= TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		m_ModdedWarning				= TextWidget.Cast(layoutRoot.FindAnyWidget("ModdedWarning"));
+		m_CharacterRotationFrame	= layoutRoot.FindAnyWidget("character_rotation_frame");
+		
+		m_LastPlayedTooltip			= layoutRoot.FindAnyWidget("last_server_info");
+		m_LastPlayedTooltip.Show(false);
+		m_LastPlayedTooltipLabel	= m_LastPlayedTooltip.FindAnyWidget("last_server_info_label");
+		m_LastPlayedTooltipName 	= TextWidget.Cast(m_LastPlayedTooltip.FindAnyWidget("last_server_info_name"));
+		m_LastPlayedTooltipIP		= TextWidget.Cast(m_LastPlayedTooltip.FindAnyWidget("last_server_info_ip"));
+		m_LastPlayedTooltipPort		= TextWidget.Cast(m_LastPlayedTooltip.FindAnyWidget("last_server_info_port"));
+		
+		m_LastPlayedTooltipTimer	= new WidgetFadeTimer();
+		
+		m_Stats						= new MainMenuStats(layoutRoot.FindAnyWidget("character_stats_root"));
+		
+		m_Mission					= MissionMainMenu.Cast(GetGame().GetMission());
+		
+		m_LastFocusedButton 		= m_Play;
+
+		m_ScenePC					= m_Mission.GetIntroScenePC();
+		
+		if (m_ScenePC)
+		{
+			m_ScenePC.ResetIntroCamera();
+		}
+		
+		m_PlayVideo.Show(false);
+		
+		m_PlayerName				= TextWidget.Cast(layoutRoot.FindAnyWidget("character_name_text"));
+		
+		// Set Version
+		string version;
+		GetGame().GetVersion(version);
+		m_Version.SetText("#main_menu_version" + " " + version);
+		
+		GetGame().GetUIManager().ScreenFadeOut(0);
+
+		SetFocus(null);
+		
+		Refresh();
+		
+		LoadMods();
+		PopulateDlcFrame();
+		
+		GetDayZGame().GetBacklit().MainMenu_OnShow();
+		GetGame().GetMission().GetOnModMenuVisibilityChanged().Insert(ShowDlcFrame);
+	
+		g_Game.SetLoadState(DayZLoadState.MAIN_MENU_CONTROLLER_SELECT);
+		
+		return layoutRoot;
+	}
+	
+	void ~MainMenu()
+	{
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnModMenuVisibilityChanged().Remove(ShowDlcFrame);
+		}
+	}
+	
+	void LoadMods()
+	{
+		array<ref ModInfo> modArray = new array<ref ModInfo>();
+		GetGame().GetModInfos(modArray);
+
+		if (modArray.Count() > 0)
+		{
+			modArray.Remove(modArray.Count() - 1);
+			modArray.Invert();
+		}
+		
+		FilterDlcs(modArray);
+		
+		if (m_ModsSimple)
+			delete m_ModsSimple;
+		if (m_ModsDetailed)
+			delete m_ModsDetailed;
+		
+		m_ModdedWarning.Show(GetGame().GetModToBeReported());
+		
+		if (modArray.Count() > 0)
+		{
+			layoutRoot.FindAnyWidget("ModsSimple").Show(true);
+			m_ModsTooltip = new ModsMenuTooltip(layoutRoot);
+
+			m_ModsDetailed = new ModsMenuDetailed(modArray, layoutRoot.FindAnyWidget("ModsDetailed"), m_ModsTooltip, this);
+			
+			m_ModsSimple = new ModsMenuSimple(modArray, layoutRoot.FindAnyWidget("ModsSimple"), m_ModsDetailed);
+		}
+	}
+	
+	void FilterDlcs(inout array<ref ModInfo> modArray)
+	{
+		if (!m_AllDlcsMap)
+			m_AllDlcsMap = new map<string,ref ModInfo>();
+		m_AllDlcsMap.Clear();
+		
+		int count = modArray.Count();
+		ModInfo info;
+		for (int i = count - 1; i > -1; i--)
+		{
+			info = modArray[i];
+			if (info.GetIsDLC())
+			{
+				m_AllDlcsMap.Set(info.GetName(),info);
+				modArray.Remove(i);
+			}
+		}
+	}
+	
+	void ShowDlcFrame(bool show)
+	{
+		m_DlcFrame.Show(show);
+		if (m_DisplayedDlcHandler)
+			m_DisplayedDlcHandler.ShowInfoPanel(show);
+	}
+	
+	void PopulateDlcFrame()
+	{
+		if (!m_DlcHandlers)
+			m_DlcHandlers = new array<ref MainMenuDlcHandlerBase>();
+		
+		m_DlcData = DlcDataLoader.GetData();
+		int count = m_DlcData.DLCs.Count();
+		JsonDataDLCInfo data;
+		ModInfo info;
+		
+		for (int i = 0; i < count; i++)
+		{
+			data = m_DlcData.DLCs[i];
+			info = m_AllDlcsMap.Get(data.Name);
+			MainMenuDlcHandlerBase handler = new MainMenuDlcHandlerBase(info, m_DlcFrame, data);
+			
+			handler.ShowInfoPanel(true);
+			m_DisplayedDlcHandler = handler;//TODO: carousel will take care of this later
+			
+			m_DlcHandlers.Insert(handler);
+		}
+	}
+	
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		if (w == m_CharacterRotationFrame)
+		{
+			if (m_ScenePC)
+				m_ScenePC.CharacterRotationStart();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if (m_ScenePC)
+			m_ScenePC.CharacterRotationStop();
+		return false;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Play)
+			{
+				m_LastFocusedButton = m_Play;
+				Play();
+				return true;
+			}
+			else if (w == m_ChooseServer)
+			{
+				m_LastFocusedButton = m_ChooseServer;
+				OpenMenuServerBrowser();
+				return true;
+			}
+			else if (w == m_CustomizeCharacter)
+			{
+				OpenMenuCustomizeCharacter();
+				return true;
+			}
+			else if (w == m_TutorialButton)
+			{
+				OpenTutorials();
+				return true;
+			}
+			else if (w == m_MessageButton)
+			{
+				OpenCredits();
+				return true;
+			}
+			else if (w == m_SettingsButton)
+			{
+				OpenSettings();
+				return true;
+			}
+			else if (w == m_Exit)
+			{
+				Exit();
+				return true;
+			}
+			else if (w == m_PrevCharacter)
+			{
+				PreviousCharacter();
+				return true;
+			}
+			else if (w == m_NextCharacter)
+			{
+				NextCharacter();
+				return true;
+			}
+			else if (w == m_PlayVideo)
+			{
+				m_LastFocusedButton = m_PlayVideo;
+				PlayVideo();
+				return true;
+			}
+			else if (w == m_Tutorials)
+			{
+				m_LastFocusedButton = m_Tutorials;
+				OpenTutorials();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (w == m_Play)
+		{
+			string ip = "";
+			string name = "";
+			int port = 0;
+			 
+			if (m_ScenePC && !m_ScenePC.GetIntroCharacter().IsDefaultCharacter())
+			{
+				int charID = m_ScenePC.GetIntroCharacter().GetCharacterID();
+				m_ScenePC.GetIntroCharacter().GetLastPlayedServer(charID, ip, name, port);
+				
+				m_LastPlayedTooltipName.SetText("#server_details_name " + name);
+				m_LastPlayedTooltipIP.SetText("#main_menu_IP " + ip);
+				m_LastPlayedTooltipPort.SetText("#main_menu_port " + port);
+				
+				m_LastPlayedTooltipTimer.FadeIn(m_LastPlayedTooltip, 0.3, true);
+			}
+		}
+		
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (w == m_Play)
+		{
+			m_LastPlayedTooltipTimer.FadeOut(m_LastPlayedTooltip, 0.3, true);
+		}
+		
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			if (w == m_Play || w == m_ChooseServer || w == m_CustomizeCharacter || w == m_TutorialButton || w == m_MessageButton || w == m_SettingsButton);
+			{
+				return true;
+			}
+			
+			if (w == m_Exit || w == m_PlayVideo);
+			{
+				return true;
+			}
+			
+			if (w == m_NewsMain || w == m_NewsSec1 || w == m_NewsSec2 || w == m_PrevCharacter || w == m_NextCharacter);
+			{
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override void Refresh()
+	{
+		string name;
+		if (m_ScenePC && g_Game.GetGameState() == DayZGameState.MAIN_MENU)
+			OnChangeCharacter();
+		
+		string version;
+		GetGame().GetVersion(version);
+		m_Version.SetText("#main_menu_version" + " " + version);
+	}	
+	
+	override void OnShow()
+	{
+		if (m_DisplayedDlcHandler)
+			m_DisplayedDlcHandler.ShowInfoPanel(true);
+
+		SetFocus(null);
+		OnChangeCharacter(false);
+		m_Stats.UpdateStats();
+		LoadMods();
+		return;
+	}
+	
+	override void OnHide()
+	{
+		if (m_DisplayedDlcHandler)
+			m_DisplayedDlcHandler.ShowInfoPanel(false);
+
+		GetDayZGame().GetBacklit().MainMenu_OnHide();
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		if (GetGame() && GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Exit();
+		}
+	}
+	
+	void Play()
+	{
+		if (!g_Game.IsNewCharacter())
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallByName(this, "ConnectLastSession");
+		}
+		else
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).CallByName(this, "ConnectBestServer");
+		}
+	}
+	
+	bool CanSaveDefaultCharacter()
+	{
+		if (m_ScenePC && m_ScenePC.GetIntroCharacter() && m_ScenePC.GetIntroCharacter().GetCharacterID() == -1)
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	void OpenMenuServerBrowser()
+	{
+		EnterScriptedMenu(MENU_SERVER_BROWSER);
+	}
+	
+	void OpenMenuCustomizeCharacter()
+	{
+		EnterScriptedMenu(MENU_CHARACTER);
+	}
+	
+	void NextCharacter()
+	{
+		if (m_ScenePC && m_ScenePC.GetIntroCharacter())
+		{
+			int charID = m_ScenePC.GetIntroCharacter().GetNextCharacterID();
+			if (charID != m_ScenePC.GetIntroCharacter().GetCharacterID())
+			{
+				m_ScenePC.GetIntroCharacter().SetCharacterID(charID);
+				OnChangeCharacter();
+			}
+		}
+	}
+	
+	void PreviousCharacter()
+	{
+		if (m_ScenePC && m_ScenePC.GetIntroCharacter())
+		{
+			int charID = m_ScenePC.GetIntroCharacter().GetPrevCharacterID();
+			if (charID != m_ScenePC.GetIntroCharacter().GetCharacterID())
+			{
+				m_ScenePC.GetIntroCharacter().SetCharacterID(charID);
+				OnChangeCharacter();
+			}
+		}
+	}
+	
+	void OnChangeCharacter(bool create_character = true)
+	{
+		if (m_ScenePC && m_ScenePC.GetIntroCharacter())
+		{
+			int charID = m_ScenePC.GetIntroCharacter().GetCharacterID();
+			if (create_character)
+			{
+				m_ScenePC.GetIntroCharacter().CreateNewCharacterById(charID);
+			}
+			m_PlayerName.SetText(m_ScenePC.GetIntroCharacter().GetCharacterNameById(charID));
+			
+			Widget w = m_CustomizeCharacter.FindAnyWidget(m_CustomizeCharacter.GetName() + "_label");
+			
+			if (w)
+			{
+				TextWidget text = TextWidget.Cast(w);
+				
+				if (m_ScenePC.GetIntroCharacter().IsDefaultCharacter())
+				{
+					text.SetText("#layout_main_menu_customize_char");
+				}
+				else
+				{
+					text.SetText("#layout_main_menu_rename");
+				}
+			}
+			if (m_ScenePC.GetIntroCharacter().GetCharacterObj())
+			{
+				if (m_ScenePC.GetIntroCharacter().GetCharacterObj().IsMale())
+					m_ScenePC.GetIntroCharacter().SetCharacterGender(ECharGender.Male);
+				else
+					m_ScenePC.GetIntroCharacter().SetCharacterGender(ECharGender.Female);
+			}
+			
+			//update character stats
+			m_Stats.UpdateStats();
+		}
+	}
+	
+	void OpenStats()
+	{
+		
+	}
+	
+	void OpenMessages()
+	{
+		
+	}
+	
+	void OpenSettings()
+	{
+		EnterScriptedMenu(MENU_OPTIONS);
+	}
+	
+	void PlayVideo()
+	{
+		EnterScriptedMenu(MENU_VIDEO);
+	}
+	
+	void OpenTutorials()
+	{
+		EnterScriptedMenu(MENU_TUTORIAL);
+	}
+	
+	void OpenCredits()
+	{
+		EnterScriptedMenu(MENU_CREDITS);
+		m_Mission.OnMenuEnter(MENU_CREDITS);
+	}
+	
+	void Exit()
+	{
+		GetGame().GetUIManager().ShowDialog("#main_menu_exit", "#main_menu_exit_desc", IDC_MAIN_QUIT, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+	}
+		
+	bool TryConnectLastSession(out string ip, out int port)
+	{
+		if (g_Game.GetLastVisitedServer(ip, port))
+		{
+			return true;
+		}
+		return false;
+	}
+	
+	void AutoConnect()
+	{
+		OnlineServices.AutoConnectToEmptyServer();
+	}
+	
+	void ConnectLastSession()
+	{
+		string ip = "";
+		string name = "";
+		int port = 0;
+			 
+		if (!m_ScenePC.GetIntroCharacter().IsDefaultCharacter())
+		{
+			int charID = m_ScenePC.GetIntroCharacter().GetCharacterID();
+			m_ScenePC.GetIntroCharacter().GetLastPlayedServer(charID,ip,name,port);
+		}
+		
+		if (ip.Length() > 0)
+		{
+			g_Game.ConnectFromServerBrowser(ip, port, "");
+		}
+		else
+		{
+			OpenMenuServerBrowser();
+		}
+	}
+	
+	void ConnectBestServer()
+	{
+		ConnectLastSession();
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		if (code == IDC_MAIN_QUIT)
+		{
+			if (result == 2)
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(g_Game.RequestExit, IDC_MAIN_QUIT);
+			if (result == 3)
+				ColorNormal(GetFocus());
+			return true;
+		}
+		else if (code == 555)
+		{
+			if (result == 2)
+				OpenTutorials();
+		}
+		return false;
+	}
+		
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(255, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 0, 0);
+		int color_img = ARGB(255, 200, 0, 0);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+		ImagenSetColor(w, color_img);
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		int color_img = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+		ImagenSetColor(w, color_img);
+	}
+	
+	void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		
+		if (label)
+		{
+			label.SetText(text);
+		}
+		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ImagenSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_image");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ButtonSetTextColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+				
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuConsoles.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuConsoles.c
new file mode 100644
index 0000000000000000000000000000000000000000..0462fb87d4f9f77f33d4fbd15653e1d6615f901b
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuConsoles.c
@@ -0,0 +1,530 @@
+class MainMenuConsole extends UIScriptedMenu
+{
+	protected ref MainMenuVideo		m_Video;
+	
+	protected MissionMainMenu		m_Mission;
+	protected DayZIntroScenePC 		m_ScenePC;
+	
+	protected TextWidget			m_PlayerName;
+	protected TextWidget			m_Version;
+	
+	protected Widget				m_ChangeAccount;
+	protected Widget				m_CustomizeCharacter;
+	protected Widget				m_PlayVideo;
+	protected Widget				m_Tutorials;
+	protected Widget				m_Options;
+	protected Widget				m_Controls;
+	protected Widget				m_Play;
+	protected Widget				m_MessageButton;
+	
+	protected ref Widget			m_LastFocusedButton;
+	
+	protected ref array<ref ModInfo> 				m_AllDLCs;
+	protected Widget 								m_DlcFrame;
+	protected ref map<string,ref ModInfo> 			m_AllDlcsMap;
+	protected ref JsonDataDLCList 					m_DlcData;
+	protected ref array<ref MainMenuDlcHandlerBase> m_DlcHandlers;
+	protected ref MainMenuDlcHandlerBase 			m_DisplayedDlcHandler;
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/main_menu_console.layout");
+		
+		m_PlayerName				= TextWidget.Cast(layoutRoot.FindAnyWidget("character_name_xbox"));
+		
+		m_ChangeAccount				= layoutRoot.FindAnyWidget("choose_account");
+		m_CustomizeCharacter		= layoutRoot.FindAnyWidget("customize_character");
+		m_PlayVideo					= layoutRoot.FindAnyWidget("play_video");
+		m_Tutorials					= layoutRoot.FindAnyWidget("tutorials");
+		m_Options					= layoutRoot.FindAnyWidget("options");
+		m_Controls					= layoutRoot.FindAnyWidget("controls");
+		m_Play						= layoutRoot.FindAnyWidget("play");
+		m_MessageButton				= layoutRoot.FindAnyWidget("message_button");
+		
+		m_DlcFrame 					= layoutRoot.FindAnyWidget("dlc_Frame");
+		m_Version					= TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		m_Mission					= MissionMainMenu.Cast(GetGame().GetMission());
+		m_LastFocusedButton			= m_Play;
+				
+		GetGame().GetUIManager().ScreenFadeOut(1);
+
+		string launch_done;
+		if (!GetGame().GetProfileString("FirstLaunchDone", launch_done) || launch_done != "true")
+		{
+			GetGame().SetProfileString("FirstLaunchDone", "true");
+			GetGame().GetUIManager().ShowDialog("#main_menu_tutorial", "#main_menu_tutorial_desc", 555, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+			GetGame().SaveProfile();
+		}
+		
+		UpdateControlsElementVisibility();
+		LoadMods();
+		Refresh();
+		
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		}
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+		
+		GetGame().GetContentDLCService().m_OnChange.Insert(OnDLCChange);
+		
+		return layoutRoot;
+	}
+	
+	void ~MainMenuConsole()
+	{
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnInputPresetChanged().Remove(OnInputPresetChanged);
+			GetGame().GetMission().GetOnInputDeviceChanged().Remove(OnInputDeviceChanged);
+		}
+		
+		if (GetGame().GetContentDLCService())
+			GetGame().GetContentDLCService().m_OnChange.Remove(OnDLCChange);
+	}
+	
+	void OnDLCChange(EDLCId dlcId)
+	{
+		m_AllDLCs = null;
+		LoadMods();
+	}
+	
+	void LoadMods()
+	{
+		if (m_AllDLCs != null)
+			return;
+		
+		m_AllDLCs = new array<ref ModInfo>;
+		
+		GetGame().GetModInfos(m_AllDLCs);
+		if (m_AllDLCs.Count() > 0)
+		{
+			m_AllDLCs.Remove(m_AllDLCs.Count() - 1);
+			m_AllDLCs.Invert();
+		}
+		
+		FilterDLCs(m_AllDLCs);
+		PopulateDlcFrame();
+		
+		UpdateControlsElements();
+	}
+	
+	//! leaves ONLY DLCs
+	void FilterDLCs(inout array<ref ModInfo> modArray)
+	{
+		if (!m_AllDlcsMap)
+			m_AllDlcsMap = new map<string,ref ModInfo>;
+		
+		m_AllDlcsMap.Clear();
+		ModInfo info;
+		int count = modArray.Count();
+		for (int i = count - 1; i >= 0; i--)
+		{
+			info = modArray[i];
+			if (!info.GetIsDLC())
+				modArray.Remove(i);
+			else
+				m_AllDlcsMap.Set(info.GetName(), info);
+		}
+	}
+	
+	void PopulateDlcFrame()
+	{
+		if (!m_DlcHandlers)
+			m_DlcHandlers = new array<ref MainMenuDlcHandlerBase>();
+		else
+		{
+			// TODO: Would be better to update the parts that need updating instead of full recreation
+			// Destroying and then reloading the same video is quite wasteful
+			m_DlcHandlers.Clear();
+		}
+		
+		m_DlcData = DlcDataLoader.GetData();
+		int count = m_DlcData.DLCs.Count();
+		JsonDataDLCInfo data;
+		ModInfo info;
+		
+		for (int i = 0; i < count; i++)
+		{
+			data = m_DlcData.DLCs[i];
+			info = m_AllDlcsMap.Get(data.Name);
+			MainMenuDlcHandlerBase handler = new MainMenuDlcHandlerBase(info, m_DlcFrame, data);
+			
+			handler.ShowInfoPanel(true);
+			m_DisplayedDlcHandler = handler;//TODO: carousel will take care of this later
+			
+			m_DlcHandlers.Insert(handler);
+		}
+	}
+
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_Play)
+		{
+			m_LastFocusedButton = m_Play;
+			OpenMenuServerBrowser();
+			return true;
+		}
+		else if (w == m_Options)
+		{
+			m_LastFocusedButton = m_Options;
+			OpenMenuOptions();					
+			return true;
+		}
+		else if (w == m_PlayVideo)
+		{
+			m_Mission.StopMusic();
+			m_LastFocusedButton = m_PlayVideo;
+			OpenMenuPlayVideo();
+			return true;
+		}
+		else if (w == m_Tutorials)
+		{
+			m_LastFocusedButton = m_Tutorials;
+			OpenMenuTutorials();
+			return true;
+		}
+		else if (w == m_Controls)
+		{
+			m_LastFocusedButton = m_Controls;
+			OpenMenuControls();
+			return true;
+		}
+		else if (w == m_CustomizeCharacter)
+		{
+			m_LastFocusedButton = m_CustomizeCharacter;
+			OpenMenuCustomizeCharacter();
+			return true;
+		}
+		else if (w == m_ChangeAccount)
+		{
+			m_LastFocusedButton = m_ChangeAccount;
+			ChangeAccount();
+			return true;
+		}
+		else if (w == m_MessageButton)
+		{
+			OpenCredits();
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		ColorHighlight(w);
+		return true;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		ColorNormal(w);
+		return true;
+	}
+	
+	override void Refresh()
+	{
+		string name;
+		
+		if (GetGame().GetUserManager() && GetGame().GetUserManager().GetSelectedUser())
+		{
+			name = GetGame().GetUserManager().GetSelectedUser().GetName();
+			if (name.LengthUtf8() > 18)
+			{
+				name = name.SubstringUtf8(0, 18);
+				name += "...";
+			}
+		}
+		m_PlayerName.SetText(name);		
+		
+		string version;
+		GetGame().GetVersion(version);
+		m_Version.SetText("#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")");
+		
+		if (GetGame().GetMission() != null)	// if missionMainMenu still exist
+		{
+			if (m_Mission && !m_Mission.GetMenuMusic())
+			{
+				m_Mission.PlayMusic();
+			}
+		}		
+	}	
+	
+	override void OnShow()
+	{
+		GetDayZGame().GetBacklit().MainMenu_OnShow();
+	
+		SetFocus(m_LastFocusedButton);
+
+		LoadMods();
+		Refresh();
+		
+		if (m_ScenePC && m_ScenePC.GetIntroCamera())
+		{
+			m_ScenePC.GetIntroCamera().LookAt(m_ScenePC.GetIntroCharacter().GetPosition() + Vector(0, 1, 0));
+		}
+		if (m_DisplayedDlcHandler)
+			m_DisplayedDlcHandler.ShowInfoPanel(true);
+		
+		super.OnShow();
+		#ifdef PLATFORM_CONSOLE
+			#ifndef PLATFORM_PS4
+			layoutRoot.FindAnyWidget("choose_account").Show(GetGame().GetInput().IsEnabledMouseAndKeyboard());
+			#endif
+		layoutRoot.FindAnyWidget("ButtonHolderCredits").Show(GetGame().GetInput().IsEnabledMouseAndKeyboard());
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	override void OnHide()
+	{
+		if (m_DisplayedDlcHandler)
+			m_DisplayedDlcHandler.ShowInfoPanel(false);
+		GetDayZGame().GetBacklit().MainMenu_OnHide();
+	}
+
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		if (g_Game.GetLoadState() != DayZGameState.CONNECTING && !GetGame().GetUIManager().IsDialogVisible())
+		{
+		#ifndef PLATFORM_CONSOLE
+			if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+			{
+				Exit();
+			}
+		#else
+			if (GetUApi().GetInputByID(UAUICredits).LocalPress())
+			{
+				OpenCredits();
+			}
+		#endif
+		}
+		
+		#ifdef PLATFORM_XBOX
+		if (GetUApi().GetInputByID(UAUICtrlY).LocalPress())
+		{
+			ChangeAccount();
+		}
+		#endif
+		if (GetUApi().GetInputByID(UAUICtrlX).LocalPress())
+		{
+			if (CanStoreBeOpened())
+			{
+				m_DisplayedDlcHandler.GetModInfo().GoToStore();
+			}
+		}
+	}
+	
+	bool CanStoreBeOpened()
+	{
+		return m_DisplayedDlcHandler != null;
+	}
+	
+	void OpenMenuServerBrowser()
+	{
+		EnterScriptedMenu(MENU_SERVER_BROWSER);
+	}
+
+	void OpenMenuControls()
+	{
+		EnterScriptedMenu(MENU_XBOX_CONTROLS);
+	}
+	
+	void OpenMenuOptions()
+	{
+		EnterScriptedMenu(MENU_OPTIONS);
+	}
+	
+	void OpenMenuPlayVideo()
+	{
+		EnterScriptedMenu(MENU_VIDEO);
+	}
+	
+	void OpenMenuTutorials()
+	{
+		EnterScriptedMenu(MENU_TUTORIAL);
+	}
+	
+	void OpenMenuCustomizeCharacter()
+	{
+		EnterScriptedMenu(MENU_CHARACTER);
+	}
+	
+	void OpenCredits()
+	{
+		EnterScriptedMenu(MENU_CREDITS);
+		m_Mission.OnMenuEnter(MENU_CREDITS);
+	}
+	
+	void ChangeAccount()
+	{
+		BiosUserManager user_manager = GetGame().GetUserManager();
+		if (user_manager)
+		{
+			g_Game.SetLoadState(DayZLoadState.MAIN_MENU_START);
+			#ifndef PLATFORM_WINDOWS
+			user_manager.SelectUserEx(null);
+			#endif
+			GetGame().GetUIManager().Back();
+		}
+	}
+	
+	void Exit()
+	{
+		GetGame().GetUIManager().ShowDialog("#main_menu_exit", "#main_menu_exit_desc", IDC_MAIN_QUIT, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+	}
+		
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(255, 200, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetAlphaAnim(w);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetAlphaAnim(null);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		if (code == IDC_MAIN_QUIT)
+		{
+			if (result == 2)
+			{
+				GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(g_Game.RequestExit, IDC_MAIN_QUIT);
+			}
+			
+			return true;
+		}
+		else if (code == 555)
+		{
+			if (result == 2)
+			{
+				OpenMenuTutorials();
+			}
+		}
+		return false;
+	}
+	
+	void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		
+		if (label)
+		{
+			label.SetText(text);
+		}
+		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ButtonSetAlphaAnim(Widget w)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			SetWidgetAnimAlpha(panel);
+		}
+	}
+	
+	void ButtonSetTextColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+				
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string context = InputUtils.GetRichtextButtonIconFromInputAction("UAUICredits", "#menu_credits", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR);
+		
+#ifndef PLATFORM_PS4
+		context += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "#layout_xbox_main_menu_toolbar_account", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+#endif
+		context += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", "#layout_xbox_main_menu_toolbar_select", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		
+		toolbar_text.SetText(context);
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboard() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(toolbarShow);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuNewsfeed.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuNewsfeed.c
new file mode 100644
index 0000000000000000000000000000000000000000..3718b437439512c35da1a7281dc9c391d2850b8f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuNewsfeed.c
@@ -0,0 +1,240 @@
+class MainMenuNewsfeed extends ScriptedWidgetEventHandler
+{
+	protected Widget		m_Root;
+	
+	protected Widget		m_DLDLC;
+	protected Widget		m_Discord;
+	protected Widget		m_Feedback;
+	protected Widget		m_DayZForum;
+	protected Widget		m_Twitter;
+	protected Widget		m_Youtube;
+	
+	protected TextWidget	m_MainText1;
+	protected TextWidget	m_MainText2;
+	protected TextWidget	m_MainText3;
+	protected TextWidget	m_SecText1;
+	protected TextWidget	m_SecText2;
+	protected TextWidget	m_SecText3;
+	
+	void MainMenuNewsfeed( Widget root )
+	{
+		m_Root			= root;
+		
+		m_DLDLC			= m_Root.FindAnyWidget( "downloaddlc" );
+		m_Discord		= m_Root.FindAnyWidget( "discord" );
+		m_Feedback		= m_Root.FindAnyWidget( "feedback_tracker" );
+		m_DayZForum		= m_Root.FindAnyWidget( "dayz_forums" );
+		m_Twitter		= m_Root.FindAnyWidget( "twitter" );
+		m_Youtube		= m_Root.FindAnyWidget( "youtube" );
+		
+		m_MainText1		= TextWidget.Cast( m_Root.FindAnyWidget( "SGInfoT1" ) );
+		m_MainText2		= TextWidget.Cast( m_Root.FindAnyWidget( "SGInfoT2" ) );
+		m_MainText3		= TextWidget.Cast( m_Root.FindAnyWidget( "SGInfoT3" ) );
+		m_SecText1		= TextWidget.Cast( m_Root.FindAnyWidget( "SGInfoC1" ) );
+		m_SecText2		= TextWidget.Cast( m_Root.FindAnyWidget( "SGInfoC2" ) );
+		m_SecText3		= TextWidget.Cast( m_Root.FindAnyWidget( "SGInfoC3" ) );
+		
+		ShowNewsfeed();
+		
+		m_Root.SetHandler( this );
+	}
+	
+	void ShowNewsfeed()
+	{
+		//m_Root.Show( true );
+		m_MainText1.SetText( "#layout_mainmenu_newsfeed_sgz_title_1" );
+		m_MainText1.Update();
+		m_MainText2.SetText( "#layout_mainmenu_newsfeed_sgz_title_2" );
+		m_MainText2.Update();
+		m_MainText3.SetText( "#layout_mainmenu_newsfeed_sgz_title_3" );
+		m_MainText3.Update();
+		m_SecText1.SetText( "#layout_mainmenu_newsfeed_sgz_text_1" );
+		m_SecText1.Update();
+		m_SecText2.SetText( "#layout_mainmenu_newsfeed_sgz_text_2" );
+		m_SecText2.Update();
+		m_SecText3.SetText( "#layout_mainmenu_newsfeed_sgz_text_3" );
+		m_SecText3.Update();
+	}
+	
+	void HideNewsfeed()
+	{
+		m_Root.Show( false );
+	}
+	
+	void OpenDLC()
+	{
+		GetGame().OpenURL( "https://store.steampowered.com/app/830660/Survivor_GameZ/" );
+	}
+	
+	void OpenDiscord()
+	{
+		GetGame().OpenURL( "https://discord.gg/bXkyMNm" );
+	}
+	
+	void OpenFeedback()
+	{
+		GetGame().OpenURL( "https://feedback.bistudio.com/tag/dayz" );
+	}
+	
+	void OpenForums()
+	{
+		GetGame().OpenURL( "https://forums.dayz.com" );
+	}
+	
+	void OpenTwitter()
+	{
+		GetGame().OpenURL( "https://twitter.com/DayZ" );
+	}
+	
+	void OpenYoutube()
+	{
+		GetGame().OpenURL( "https://www.youtube.com/user/DayZDevTeam" );
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if( button == MouseState.LEFT )
+		{
+			if ( w == m_DLDLC )
+			{
+				OpenDLC();
+				return true;
+			}
+			else if ( w == m_Discord )
+			{
+				OpenDiscord();
+				return true;
+			}
+			else if ( w == m_Feedback )
+			{
+				OpenFeedback();
+				return true;
+			}
+			else if ( w == m_DayZForum )
+			{
+				OpenForums();
+				return true;
+			}
+			else if ( w == m_Twitter )
+			{
+				OpenTwitter();
+				return true;
+			}
+			else if ( w == m_Youtube )
+			{
+				OpenYoutube();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if( IsFocusable( w ) )
+		{
+			ColorRed( w, x, y );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		if( IsFocusable( w ) )
+		{
+			ColorWhite( w, enterW, x, y );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if( IsFocusable( w ) )
+		{
+			ColorRed( w, x, y );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		if( IsFocusable( w ) )
+		{
+			ColorWhite( w, null, x, y );
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable( Widget w )
+	{
+		if( w )
+		{
+			return ( w == m_DLDLC || w == m_Discord || w == m_Feedback || w == m_DayZForum || w == m_Twitter || w == m_Youtube );
+		}
+		return false;
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorRed( Widget w, int x, int y )
+	{
+		SetFocus( w );
+		if( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 255, 0, 0 ) );
+			button.SetAlpha( 0.9 );
+		}
+		
+		TextWidget text		= TextWidget.Cast(w.FindWidget( w.GetName() + "_text" ) );
+		TextWidget text2	= TextWidget.Cast(w.FindWidget( w.GetName() + "_text_1" ) );
+		ImageWidget image	= ImageWidget.Cast( w.FindWidget( w.GetName() + "_image" ) );
+		
+		if( text )
+		{
+			text.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+		
+		if( text2 )
+		{
+			text2.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+		
+		if( image )
+		{
+			image.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+	}
+	
+	void ColorWhite( Widget w, Widget enterW, int x, int y )
+	{
+		if( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 255, 255, 255 ) );
+			button.SetAlpha( 0.75 );
+		}
+		
+		TextWidget text		= TextWidget.Cast(w.FindWidget( w.GetName() + "_text" ) );
+		TextWidget text2	= TextWidget.Cast(w.FindWidget( w.GetName() + "_text_1" ) );
+		ImageWidget image	= ImageWidget.Cast( w.FindWidget( w.GetName() + "_image" ) );
+		
+		if( text )
+		{
+			text.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if( text2 )
+		{
+			text2.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if( image )
+		{
+			image.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuPromo.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuPromo.c
new file mode 100644
index 0000000000000000000000000000000000000000..10ada2e7f2b8739c4783a433fe9599b5c3ecbed5
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuPromo.c
@@ -0,0 +1,211 @@
+//!base class for promo implementation
+class MainMenuDlcHandlerBase extends ScriptedWidgetEventHandler
+{
+	protected const string 	TEXT_OWNED = "#layout_dlc_owned";
+	protected const string 	TEXT_UNOWNED = "#layout_dlc_unowned";
+	
+	protected int 			m_ColorBackgroundOriginal;
+	
+	protected Widget 		m_Root;
+	protected Widget 		m_BannerFrame;
+	protected Widget 		m_Background;
+	protected Widget 		m_StoreButton;
+	protected Widget 		m_GamepadStoreImage;
+	protected ImageWidget 	m_DlcPromotionImage;
+	protected TextWidget 	m_TitleTextDlc;
+	protected MultilineTextWidget 	m_DescriptionTextDlc;
+	protected VideoWidget 	m_VideoWidget;
+	protected ref ModInfo 	m_ThisModInfo;
+	protected ref JsonDataDLCInfo 	m_DlcInfo;
+	
+	protected ref BannerHandlerBase m_BannerHandler;
+	
+	void MainMenuDlcHandlerBase(ModInfo info, Widget parent, JsonDataDLCInfo DlcInfo)
+	{
+		CreateRootWidget(parent);
+		m_Root.SetHandler(this);
+		m_DlcInfo = DlcInfo;
+		m_ThisModInfo = info;
+		Init();
+		
+		#ifdef PLATFORM_CONSOLE
+		GetGame().GetContentDLCService().m_OnChange.Insert(OnDLCChange);
+		if (GetGame().GetMission())
+		{
+			GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		}
+		#endif
+	}
+	
+	void ~MainMenuDlcHandlerBase()
+	{
+		#ifdef PLATFORM_CONSOLE
+		if (GetGame().GetContentDLCService())
+			GetGame().GetContentDLCService().m_OnChange.Remove(OnDLCChange);
+		#endif
+	}
+	
+	void Init()
+	{
+		m_Background = m_Root;
+		m_StoreButton = m_Root.FindAnyWidget("dlc_openStore");
+		SetPlatformSpecifics();
+		m_VideoWidget = VideoWidget.Cast(m_Root.FindAnyWidget("dlc_Video"));
+		m_VideoWidget.Show(false);
+		m_DlcPromotionImage = ImageWidget.Cast(m_Root.FindAnyWidget("dlc_ImageMain"));
+		m_DlcPromotionImage.Show(true);
+		m_BannerFrame = m_Root.FindAnyWidget("dlc_BannerFrame");//dlc_BannerFrame //dlc_BannerFrameVideo
+		m_BannerHandler = new BannerHandlerBase(m_BannerFrame);
+		m_TitleTextDlc = TextWidget.Cast(m_Root.FindAnyWidget("dlc_title"));
+		m_DescriptionTextDlc = MultilineTextWidget.Cast(m_Root.FindAnyWidget("dlc_Description"));
+		m_DescriptionTextDlc.SetLineBreakingOverride(LinebreakOverrideMode.LINEBREAK_WESTERN);
+		m_ColorBackgroundOriginal = m_Background.GetColor();
+		
+		UpdateAllPromotionInfo();
+		//StartVideo();
+	}
+	
+	void CreateRootWidget(Widget parent)
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/dlc_panels/DLC_Panel.layout", parent);
+	}
+	
+	void ShowInfoPanel(bool show)
+	{
+		m_Root.Show(show);
+		OnPanelVisibilityChanged();
+	}
+	
+	bool IsInfoPanelVisible()
+	{
+		return m_Root.IsVisible();
+	}
+	
+	void OnPanelVisibilityChanged()
+	{
+		UpdateAllPromotionInfo();
+		return;
+		
+		/*if (IsInfoPanelVisible())
+			StartVideo();
+		else
+			PauseVideo();*/
+	}
+	
+	//works on button only
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		m_ThisModInfo.GoToStore();
+		return super.OnClick(w,x,y,button);
+	}
+	
+	//! returns 'true' when video is loaded
+	bool LoadVideoFile()
+	{
+		if (m_VideoWidget.GetState() != VideoState.NONE)
+			return true;
+		
+		string path = "video\\" + m_DlcInfo.VideoFileName;
+		if (m_DlcInfo.VideoFileName != "")
+			return m_VideoWidget.Load(path, true);
+		
+		return false;
+	}
+	
+	void StartVideo()
+	{
+		if (LoadVideoFile())
+			m_VideoWidget.Play();
+	}
+	
+	void StopVideo()
+	{
+		m_VideoWidget.Stop();
+	}
+	
+	void PauseVideo()
+	{
+		m_VideoWidget.Pause();
+	}
+	
+	void UnloadVideo()
+	{
+		m_VideoWidget.Stop();
+		m_VideoWidget.Unload();
+	}
+	
+	protected void ColorFocussed(Widget w, int x, int y)
+	{
+		m_Background.SetColor(ARGB(255,54,16,16));
+	}
+	
+	protected void ColorUnfocussed(Widget w, Widget enterW, int x, int y)
+	{
+		m_Background.SetColor(m_ColorBackgroundOriginal);
+	}
+	
+	protected void UpdateOwnedStatus()
+	{
+		if (m_ThisModInfo)
+		{
+			if (m_ThisModInfo.GetIsOwned())
+			{
+				m_BannerHandler.SetBannerColor(Colors.COLOR_LIVONIA_EMERALD_GREEN);
+				m_BannerHandler.SetBannerText(TEXT_OWNED);
+			}
+			else
+			{
+				m_BannerHandler.SetBannerColor(Colors.COLOR_DAYZ_RED);
+				m_BannerHandler.SetBannerText(TEXT_UNOWNED);
+			}
+		}
+	}
+	
+	protected void OnDLCChange()
+	{
+		UpdateOwnedStatus();
+	}
+	
+	protected void SetPlatformSpecifics()
+	{
+		TextWidget desc = TextWidget.Cast(m_StoreButton.FindAnyWidget("dlc_openStore_label"));
+		#ifdef PLATFORM_PS4
+			m_GamepadStoreImage = m_Root.FindAnyWidget("image_button_ps");
+			desc.SetText("#dlc_open_store_PS");
+		#else
+			m_GamepadStoreImage = m_Root.FindAnyWidget("image_button_xbox");
+			desc.SetText("#dlc_open_store");
+		#endif
+	}
+	
+	//updates on language change etc.
+	protected void UpdateAllPromotionInfo()
+	{
+		UpdateDlcData();
+		UpdateOwnedStatus();
+		UpdateIconVisibility();
+	}
+	
+	protected void UpdateDlcData()
+	{
+		m_TitleTextDlc.SetText(m_DlcInfo.HeaderText);
+		m_DescriptionTextDlc.SetText(m_DlcInfo.DescriptionText);
+	}
+	
+	protected void UpdateIconVisibility()
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_GamepadStoreImage.Show(!GetGame().GetInput().IsEnabledMouseAndKeyboard() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER);
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateIconVisibility();
+	}
+	
+	ModInfo GetModInfo()
+	{
+		return m_ThisModInfo;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuStats.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuStats.c
new file mode 100644
index 0000000000000000000000000000000000000000..d11727e08a8a4d8fa6fa293e0ff277ff6a361f6f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuStats.c
@@ -0,0 +1,164 @@
+class MainMenuStats extends ScriptedWidgetEventHandler
+{
+	protected Widget m_Root;
+	
+	protected Widget m_TimeSurvived;
+	protected TextWidget m_TimeSurvivedValue;
+	
+	protected Widget m_PlayersKilled;
+	protected TextWidget m_PlayersKilledValue;
+	
+	protected Widget m_InfectedKilled;
+	protected TextWidget m_InfectedKilledValue;
+	
+	protected Widget m_DistanceTraveled;
+	protected TextWidget m_DistanceTraveledValue;
+	
+	protected Widget m_LongRangeShot;
+	protected TextWidget m_LongRangeShotValue;
+	
+	private ref FullTimeData m_TimeSurvivedFull;
+	
+	void MainMenuStats(Widget root)
+	{
+		m_Root = root;
+		
+		m_TimeSurvivedFull = new FullTimeData();
+		
+		m_TimeSurvived = m_Root.FindAnyWidget("TimeSurvived");
+		m_TimeSurvivedValue = TextWidget.Cast(m_Root.FindAnyWidget("TimeSurvivedValue"));
+		
+		m_PlayersKilled = m_Root.FindAnyWidget("PlayersKilled");
+		m_PlayersKilledValue = TextWidget.Cast(m_Root.FindAnyWidget("PlayersKilledValue"));
+		
+		m_InfectedKilled = m_Root.FindAnyWidget("InfectedKilled");
+		m_InfectedKilledValue = TextWidget.Cast(m_Root.FindAnyWidget("InfectedKilledValue"));
+		
+		m_DistanceTraveled = m_Root.FindAnyWidget("DistanceTraveled");
+		m_DistanceTraveledValue = TextWidget.Cast(m_Root.FindAnyWidget("DistanceTraveledValue"));
+		
+		m_LongRangeShot = m_Root.FindAnyWidget("LongRangeShot");
+		m_LongRangeShotValue = TextWidget.Cast(m_Root.FindAnyWidget("LongRangeShotValue"));
+	}
+		
+	void ShowStats()
+	{
+		m_Root.Show(true);
+		UpdateStats();
+	}
+	
+	void HideStats()
+	{
+		m_Root.Show(false);
+	}
+	
+	void UpdateStats()
+	{
+		PlayerBase player;
+		MissionMainMenu missionMainMenu = MissionMainMenu.Cast(GetGame().GetMission());
+
+		if (missionMainMenu && missionMainMenu.GetIntroScenePC())
+		{
+			#ifdef PLATFORM_WINDOWS
+			player = missionMainMenu.GetIntroScenePC().GetIntroCharacter().GetCharacterObj();
+			#endif
+			#ifdef PLATFORM_CONSOLE
+			player = missionMainMenu.GetIntroScenePC().GetIntroCharacter().GetCharacterObj();
+			#endif
+		
+			if (player)
+			{
+				TimeConversions.ConvertSecondsToFullTime(player.StatGet(AnalyticsManagerServer.STAT_PLAYTIME), m_TimeSurvivedFull);			
+				m_TimeSurvivedValue.SetText(m_TimeSurvivedFull.FormatedNonZero());
+	
+				m_PlayersKilledValue.SetText(GetValueString(player.StatGet(AnalyticsManagerServer.STAT_PLAYERS_KILLED)));
+				m_InfectedKilledValue.SetText(GetValueString(player.StatGet(AnalyticsManagerServer.STAT_INFECTED_KILLED)));
+				m_DistanceTraveledValue.SetText(GetDistanceString(player.StatGet(AnalyticsManagerServer.STAT_DISTANCE)));
+				m_LongRangeShotValue.SetText(GetDistanceString(player.StatGet(AnalyticsManagerServer.STAT_LONGEST_SURVIVOR_HIT), true));
+			}
+		}
+	}
+	
+	protected string GetDistanceString( float total_distance, bool meters_only = false )
+	{
+		if (total_distance > 0)
+		{
+			string distanceString;
+			
+			float kilometers = total_distance * 0.001;
+			kilometers = Math.Round(kilometers);
+			if ( kilometers >= 10 && !meters_only )
+			{
+				distanceString = GetValueString(kilometers, true) + " #STR_distance_unit_abbrev_kilometer_0";
+			}
+			else
+			{
+				distanceString = GetValueString(total_distance) + " #STR_distance_unit_abbrev_meter_0";
+			}
+			
+			return distanceString;
+		}	
+	
+		return "0" + " #STR_distance_unit_abbrev_meter_0";
+	}
+	
+	protected string GetValueString(float total_value, bool show_decimals = false)
+	{
+		if (total_value > 0)
+		{
+			string out_string;
+			
+			int total_value_int = total_value;
+			string number_str = total_value_int.ToString();
+			
+			//number
+			if ( total_value >= 1000 )
+			{
+				int count;		
+				int first_length = number_str.Length() % 3;		//calculate position of the first separator
+				if ( first_length > 0 )
+				{
+					count = 3 - first_length;
+				}
+				
+				for ( int i = 0; i < number_str.Length(); ++i )
+				{
+					out_string += number_str.Get( i );
+					count ++;
+					
+					if ( count >= 3 )
+					{
+						out_string += " ";						//separator
+						count = 0;
+					}
+				}
+			}
+			else
+			{
+				out_string = number_str;
+			}
+			
+			//decimals
+			if ( show_decimals )
+			{
+				string total_value_str = total_value.ToString();
+				int decimal_idx = total_value_str.IndexOf( "." );
+			
+				if ( decimal_idx > -1 )
+				{
+					out_string.TrimInPlace();
+					out_string += total_value_str.Substring( decimal_idx, total_value_str.Length() - decimal_idx );
+				}
+			}
+
+			return out_string;
+		}
+		
+		return "0";
+	}
+
+	//!	
+	//! DEPRECATED
+	//!
+	protected string GetTimeString(float total_time);
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuVideo.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuVideo.c
new file mode 100644
index 0000000000000000000000000000000000000000..c9b2845ede88215779ff90fb88e2467cbc3ed941
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/MainMenuVideo.c
@@ -0,0 +1,116 @@
+class MainMenuVideo extends UIScriptedMenu
+{
+	protected string 				m_BackButtonTextID;
+	
+	protected VideoWidget			m_Video;
+	
+	override Widget Init()
+	{
+		layoutRoot 				= GetGame().GetWorkspace().CreateWidgets("gui/layouts/xbox/video_menu.layout");
+		m_Video					= VideoWidget.Cast(layoutRoot.FindAnyWidget("video"));
+		
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		
+		m_Video.Load("video\\DayZ_onboarding_MASTER.mp4");
+			
+		m_Video.Play();
+		
+		m_Video.SetCallback(VideoCallback.ON_END, StopVideo);
+		
+		return layoutRoot;
+	}
+	
+	void ~MainMenuVideo()
+	{
+	}
+	
+	//after show
+	override void OnShow()
+	{
+		super.OnShow();
+		GetGame().GetUIManager().ShowUICursor(false);
+		GetGame().GetSoundScene().SetSoundVolume(0.0,0.0);
+		
+		UpdateControlsElements();
+	}
+
+	//after hide
+	override void OnHide()
+	{
+		super.OnHide();
+		GetGame().GetUIManager().ShowUICursor(true);
+		GetGame().GetSoundScene().SetSoundVolume(1.0,1.0);
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElements();
+	}
+	
+	void StopVideo()
+	{
+		if (m_Video)
+		{
+			m_Video.Unload();
+			GetGame().GetUIManager().Back();
+		}
+	}
+	
+	void PlayPauseVideo()
+	{
+		if (m_Video)
+		{
+			if (m_Video.IsPlaying())
+			{
+				m_Video.Pause();
+			}
+			else
+			{
+				m_Video.Play();
+			}
+		}
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			StopVideo();
+		}
+	}
+	
+	override void OnVisibilityChanged(bool isVisible)
+	{
+		if (!isVisible)
+		{
+			m_Video.Unload();
+		}
+	}
+	
+	//Deprecated
+	protected void LoadFooterButtonTexts()
+	{
+	}
+	
+	//Deprecated
+	protected void LoadTextStrings()
+	{
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string text;
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard() && GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.MOUSE_AND_KEYBOARD)
+		{
+			text = "ESC " + "#menu_back";
+		}
+		else
+		{
+			text = string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#menu_back", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		}
+		
+		toolbar_text.SetText(text);
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/TutorialsMenu.c b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/TutorialsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..777c527116b69504ff14da2a7925732e280d18cf
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/MainMenu/TutorialsMenu.c
@@ -0,0 +1,583 @@
+class TutorialsMenu extends UIScriptedMenu
+{
+	protected const string PATH_MOUSEKEY 	= "scripts/data/pagedatatutorials.json";
+	protected const string PATH_X1_OLD 		= "xbox/pagedatatutorials.json";
+	protected const string PATH_X1_NEW 		= "xbox/pagedatatutorialsalternate.json";
+	protected const string PATH_PS_OLD 		= "ps4/pagedatatutorials.json";
+	protected const string PATH_PS_NEW 		= "ps4/pagedatatutorialsalternate.json";
+	
+	protected string 					m_BackButtonTextID;
+	
+	protected Widget					m_InfoTextLeft;
+	protected Widget					m_InfoTextRight;
+	protected ButtonWidget				m_Back;
+	
+	protected ImageWidget 				m_ControlsLayoutImage;
+	protected const int 				TABS_COUNT = 4;
+	protected ImageWidget 				m_tab_images[TABS_COUNT];
+	protected TabberUI					m_TabScript;
+	protected ref TutorialKeybinds		m_KeybindsTab;
+	
+	//============================================
+	// Init
+	//============================================
+	override Widget Init()
+	{
+		#ifdef PLATFORM_CONSOLE
+		layoutRoot	= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/tutorials/xbox/tutorials.layout");
+		#else
+		layoutRoot	= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/tutorials/pc/tutorials.layout");
+		#endif
+		
+		m_InfoTextLeft	= layoutRoot.FindAnyWidget("InfoTextLeft");
+		m_InfoTextRight	= layoutRoot.FindAnyWidget("InfoTextRight");
+		
+		m_Back			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("back"));
+		
+		layoutRoot.FindAnyWidget("Tabber").GetScript(m_TabScript);
+		m_TabScript.m_OnTabSwitch.Insert(DrawConnectingLines);
+		
+		#ifdef PLATFORM_CONSOLE
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard())
+		{
+			m_KeybindsTab = new TutorialKeybinds(layoutRoot.FindAnyWidget("Tab_6"), this);
+			m_TabScript.EnableTabControl(6, true);
+		}
+		#endif
+		
+		m_tab_images[0] = ImageWidget.Cast(layoutRoot.FindAnyWidget("MovementTabBackdropImageWidget"));
+		m_tab_images[1] = ImageWidget.Cast(layoutRoot.FindAnyWidget("WeaponsAndActionsBackdropImageWidget"));
+		m_tab_images[2] = ImageWidget.Cast(layoutRoot.FindAnyWidget("InventoryTabBackdropImageWidget"));
+		m_tab_images[3] = ImageWidget.Cast(layoutRoot.FindAnyWidget("MenusTabBackdropImageWidget"));
+		
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		
+		PPERequesterBank.GetRequester(PPERequester_TutorialMenu).Start(new Param1<float>(0.6));
+		DrawConnectingLines(0);
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+		
+		return layoutRoot;
+	}
+	
+	void ~TutorialsMenu()
+	{
+		m_TabScript.m_OnTabSwitch.Remove(DrawConnectingLines);
+		PPERequesterBank.GetRequester(PPERequester_TutorialMenu).Stop();
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		UpdateControlsElementVisibility();
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		
+		SetFocus(null);
+	}
+	
+	void Back()
+	{
+		GetGame().GetUIManager().Back();
+	}
+	
+	void DrawConnectingLines(int index)
+	{
+		if (index == 6)
+		{
+			m_InfoTextLeft.Show(false);
+			m_InfoTextRight.Show(false);
+		}
+		else
+		{
+			m_InfoTextLeft.Show(true);
+			m_InfoTextRight.Show(true);
+			ref array<ref JsonControlMappingInfo> control_mapping_info = new array<ref JsonControlMappingInfo>;
+			ref array<ref array <ref JsonControlMappingInfo>> tab_array = new array<ref array <ref JsonControlMappingInfo>>;
+			
+			map<string, ref array<int>> button_marker_groups_unflitred = new map<string, ref array<int>>;
+			map<string, ref array<int>> button_marker_groups = new map<string, ref array<int>>;
+			
+			float text_widget_pos_x, text_widget_pos_y;
+			float text_widget_width, text_widget_height;
+			float dot_pos_x, dot_pos_y;
+			float dot_width, dot_height;
+			float draw_pos_x, draw_pos_y;
+			
+			CanvasWidget canvas_widget = CanvasWidget.Cast(layoutRoot.FindAnyWidget("CanvasWidget_" + index));
+			canvas_widget.Clear();
+			control_mapping_info  = GetControlMappingInfo();
+			
+			for (int i = 0; i < m_TabScript.GetTabCount(); i++)
+			{
+				tab_array.Insert(new array<ref JsonControlMappingInfo>);
+				for (int j = 0; j < 30; j++)
+				{
+					tab_array[i].Insert(NULL);
+				}
+			}
+			
+			// insert json info to array by index, so it is sorted
+			for (i = 0; i < control_mapping_info.Count(); i++)
+			{
+				JsonControlMappingInfo info = control_mapping_info.Get(i);
+				tab_array[info.m_TabID][info.m_TextWidgetID] = info;
+			}
+			
+			// create group of buttons which are connected together with line
+			for (int l = 0; l < control_mapping_info.Count(); l++)
+			{
+				JsonControlMappingInfo info1 = control_mapping_info[l];
+				string button_name = info1.m_ButtonName;
+				int text_widget_id = info1.m_TextWidgetID;
+				if (info1.m_TabID != index)
+				{
+					continue;
+				}
+				if (!button_marker_groups_unflitred.Contains(button_name))
+				{
+					button_marker_groups_unflitred.Insert(button_name, new ref array<int>);
+					button_marker_groups_unflitred.Get(button_name).Insert(text_widget_id);
+				}
+				else
+				{
+					button_marker_groups_unflitred.Get(button_name).Insert(text_widget_id);
+				}
+			}
+			
+			// we want groups which are bigger than 1
+			for (l = 0; l < button_marker_groups_unflitred.Count(); l++)
+			{
+				if (button_marker_groups_unflitred.GetElement(l).Count() > 1)
+				{
+					string key = button_marker_groups_unflitred.GetKey(l);
+					button_marker_groups.Insert(button_marker_groups_unflitred.GetKey(l), button_marker_groups_unflitred.Get(key));
+				}
+			}
+			
+			// hide all button markers
+			Widget xbox_controls_image = layoutRoot.FindAnyWidget("Markers_" + index);
+			
+			Widget panel_widget;
+			Widget button_marker_widget;
+			
+			for (l = 0; l < tab_array[index].Count(); l++)
+			{
+				panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + l);
+				if (tab_array[index][l] != NULL)
+				{
+					TextWidget text_widget = TextWidget.Cast(panel_widget.FindAnyWidget("TextWidget" + l));
+					button_marker_widget = layoutRoot.FindAnyWidget("button_marker_" + tab_array[index][l].m_ButtonName);
+					text_widget.SetText(tab_array[index][l].m_InfoText);
+					panel_widget.Show(true);
+					panel_widget.Update();
+					
+					if (!button_marker_groups.Contains(tab_array[index][l].m_ButtonName))
+					{
+						panel_widget.GetScreenPos(text_widget_pos_x, text_widget_pos_y);
+						panel_widget.GetScreenSize(text_widget_width,text_widget_height);
+						
+						button_marker_widget.GetScreenPos(dot_pos_x, dot_pos_y);
+						button_marker_widget.GetScreenSize(dot_width, dot_height);
+						
+						draw_pos_y = text_widget_pos_y + text_widget_height / 2;
+						
+						if (l < 15)
+						{
+							draw_pos_x = text_widget_pos_x + text_widget_width - 1;
+						}
+						else
+						{
+							draw_pos_x = text_widget_pos_x;
+						}
+						
+						canvas_widget.DrawLine(draw_pos_x, draw_pos_y, dot_pos_x+dot_width/2, draw_pos_y, 2, ARGBF(0.6, 1, 1, 1));
+						canvas_widget.DrawLine(dot_pos_x+dot_width/2, draw_pos_y, dot_pos_x+dot_width/2, dot_pos_y+dot_height/2, 2, ARGBF(0.6, 1, 1, 1));	
+					}
+				}
+				else
+				{
+					panel_widget.Show(false);
+				}
+				panel_widget.Update();
+			}
+			
+			// draw connecting lines 
+			for (l = 0; l <  button_marker_groups.Count(); l++)
+			{
+				text_widget_pos_x = 0;
+				text_widget_pos_y = 0;
+				text_widget_width = 0;
+				text_widget_height = 0;
+				float group_point_x = 0, group_point_y = 0;
+				float first_x = 0, first_y = 0;
+				
+				ref array<int> element = button_marker_groups.GetElement(l);
+				string key_name = button_marker_groups.GetKey(l);
+				button_marker_widget = layoutRoot.FindAnyWidget("button_marker_" + key_name);
+				
+				for (int g = 0; g < element.Count(); g++)
+				{
+					panel_widget = layoutRoot.FindAnyWidget("PanelWidget" + element[g]);
+					
+					panel_widget.GetScreenPos(text_widget_pos_x, text_widget_pos_y);
+					panel_widget.GetScreenSize(text_widget_width, text_widget_height);
+					
+					if (g == 0)
+					{
+						if (element[0] < 15)
+						{
+							first_x = text_widget_pos_x + text_widget_width +50;
+						}
+						else
+						{
+							first_x = text_widget_pos_x - 50;
+						}
+						first_y = text_widget_pos_y + text_widget_height/2;
+						
+					}
+					
+					group_point_x += text_widget_pos_x;
+					group_point_y += text_widget_pos_y;
+					
+					if (element[0] < 15)
+					{
+						canvas_widget.DrawLine(text_widget_pos_x + text_widget_width - 1, text_widget_pos_y + text_widget_height/2, text_widget_pos_x + text_widget_width +50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+					}
+					else
+					{
+						canvas_widget.DrawLine(text_widget_pos_x, text_widget_pos_y + text_widget_height/2, text_widget_pos_x - 50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+					}
+				}
+				
+				if (element[0] < 15)
+				{
+					group_point_x = group_point_x/element.Count() + text_widget_width + 50;
+				}
+				else
+				{
+					group_point_x = group_point_x/element.Count() - 50;
+				}
+				
+				group_point_y = group_point_y/element.Count() + text_widget_height/2;
+				
+				button_marker_widget.GetScreenPos(dot_pos_x, dot_pos_y);
+				button_marker_widget.GetScreenSize(dot_width, dot_height);
+				
+				canvas_widget.DrawLine(group_point_x, group_point_y, dot_pos_x+dot_width/2, group_point_y, 2, ARGBF(0.6, 1, 1, 1));
+				canvas_widget.DrawLine(dot_pos_x+dot_width/2, group_point_y, dot_pos_x+dot_width/2, dot_pos_y, 2, ARGBF(0.6, 1, 1, 1));
+				
+				if (element[0] < 15)
+				{
+					canvas_widget.DrawLine(first_x, first_y, text_widget_pos_x + text_widget_width +50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+				}
+				else
+				{
+					canvas_widget.DrawLine(first_x, first_y, text_widget_pos_x - 50, text_widget_pos_y + text_widget_height/2, 2, ARGBF(0.6, 1, 1, 1));
+				}
+			}
+		}
+	}
+	
+	protected array<ref JsonControlMappingInfo> GetControlMappingInfo()
+	{
+		array<ref JsonControlMappingInfo> control_mapping_info = new array<ref JsonControlMappingInfo>;
+		string file_path = PATH_MOUSEKEY; //remains set for PC vatiant
+		string profile_name = "";
+		GetGame().GetInput().GetProfileName(GetGame().GetInput().GetCurrentProfile(),profile_name);
+		
+#ifdef PLATFORM_CONSOLE
+		if (!GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+		{
+			if (profile_name == "#STR_UAPRESET_0")
+			{
+				#ifdef PLATFORM_XBOX
+					file_path =	PATH_X1_OLD;
+				#else 
+					file_path =	PATH_PS_OLD;
+				#endif
+			}
+			else if (profile_name == "#STR_UAPRESET_1")
+			{
+				#ifdef PLATFORM_XBOX
+					file_path =	PATH_X1_NEW;
+				#else 
+					file_path =	PATH_PS_NEW;
+				#endif
+			}
+			else
+			{
+				ErrorEx("Invalid file path!");
+				file_path =	"";
+			}
+		}
+#endif
+		FileHandle file_handle = OpenFile(file_path, FileMode.READ);
+		JsonSerializer js = new JsonSerializer();
+		
+		string js_error = "";
+		string line_content = "";
+		string content = "";
+		if (file_handle)
+		{
+			while (FGets(file_handle,  line_content) >= 0)
+			{
+				content += line_content;
+			}
+			CloseFile(file_handle);
+			
+			if (js.ReadFromString(control_mapping_info, content, js_error))
+			{
+				return control_mapping_info;
+			}
+			else
+			{
+				ErrorEx("JSON ERROR => [TutorialsMenu]: " + js_error);
+			}
+		}
+		else
+		{
+			ErrorEx("FILEHANDLE ERROR => [TutorialsMenu]: " + js_error);
+		}
+		
+		return control_mapping_info;
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (GetUApi().GetInputByID(UAUITabLeft).LocalPress())
+		{
+			m_TabScript.PreviousTab();
+		}
+		
+		//RIGHT BUMPER - TAB RIGHT
+		if (GetUApi().GetInputByID(UAUITabRight).LocalPress())
+		{
+			m_TabScript.NextTab();
+		}
+		
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Back();
+		}
+	}
+	
+		/// Initial texts load for the footer buttons
+	protected void LoadFooterButtonTexts()
+	{
+		TextWidget uiBackText 	= TextWidget.Cast(layoutRoot.FindAnyWidget("BackText"));		
+		
+		if (uiBackText)
+		{
+			uiBackText.SetText(m_BackButtonTextID);
+		}
+	}
+	/// Set correct bottom button texts based on platform (ps4 vs xbox texts)
+	protected void LoadTextStrings()
+	{
+		#ifdef PLATFORM_PS4
+			m_BackButtonTextID = "ps4_ingame_menu_back";
+		#else 
+			m_BackButtonTextID = "STR_rootFrame_toolbar_bg_ConsoleToolbar_Back_BackText0";	
+		#endif
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Back)
+			{
+				Back();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		return (w && w == m_Back);
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(255, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 0, 0);
+		int color_img = ARGB(255, 200, 0, 0);
+		
+		#ifdef PLATFORM_CONSOLE
+			color_pnl = ARGB(255, 200, 0, 0);
+			color_lbl = ARGB(255, 255, 255, 255);
+		#endif
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+		ImagenSetColor(w, color_img);
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		int color_img = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+		ImagenSetColor(w, color_img);
+	}
+	
+	void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		
+		if (label)
+		{
+			label.SetText(text);
+		}
+		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ImagenSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_image");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ButtonSetTextColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+				
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		#ifdef PLATFORM_CONSOLE
+		RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		if (toolbar_text)
+		{
+			string text = string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#STR_settings_menu_root_toolbar_bg_ConsoleToolbar_Back_BackText0", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			toolbar_text.SetText(text);
+		}
+		
+		RichTextWidget toolbar_b2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon0"));
+		toolbar_b2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		#endif
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		#ifdef PLATFORM_CONSOLE
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(toolbarShow);
+		#endif
+		layoutRoot.FindAnyWidget("play_panel_root").Show(!toolbarShow);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuDetailed.c b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuDetailed.c
new file mode 100644
index 0000000000000000000000000000000000000000..6b83ba3259f5d2f76777a01f536a75df92abf2e2
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuDetailed.c
@@ -0,0 +1,195 @@
+class ModsMenuDetailed extends ScriptedWidgetEventHandler
+{
+	protected Widget											m_Root;
+	protected Widget											m_Content;
+	protected Widget											m_CloseButton;
+	protected ScrollWidget										m_Scroll;
+	protected ref map<ref ModInfo, ref ModsMenuDetailedEntry>	m_Data;
+	
+	protected ModInfo											m_Highlighted;
+	
+	//protected MainMenu											m_Menu;
+	protected UIScriptedMenu											m_Menu;
+	protected ModsMenuTooltip									m_Tooltip;
+	protected ref Timer											m_TooltipTimer;
+	protected ModInfo											m_TooltipMod;
+
+	void ModsMenuDetailed(array<ref ModInfo> data, Widget parent, ModsMenuTooltip tooltip, UIScriptedMenu menu_parent)
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/mods_menu/mods_menu_detailed.layout", parent);
+		m_Content = m_Root.FindAnyWidget("ModsDetailedContent");
+		m_Scroll = ScrollWidget.Cast(m_Root.FindAnyWidget("ModsDetailedScroller"));
+		m_CloseButton = m_Root.FindAnyWidget("ModsDetailedHeaderButton");
+		
+		m_Menu = menu_parent;
+		m_Data = new map<ref ModInfo, ref ModsMenuDetailedEntry>;
+		m_Tooltip = tooltip;
+		
+		m_Root.SetHandler(this);
+
+		LoadEntries(data);
+	}
+	
+	void ~ModsMenuDetailed()
+	{
+		delete m_Root;
+	}
+	
+	void Open()
+	{
+		if ( !m_Root.IsVisible() )
+			m_Scroll.VScrollToPos( 0 );
+		m_Root.Show( true );
+		GetGame().GetMission().GetOnModMenuVisibilityChanged().Invoke(false);
+	}
+	
+	void Close()
+	{
+		Highlight( null );
+		m_Root.Show( false );
+		GetGame().GetMission().GetOnModMenuVisibilityChanged().Invoke(true);
+	}
+	
+	bool IsOpen()
+	{
+		return m_Root.IsVisible();
+	}
+	
+	ModInfo GetHighlighted()
+	{
+		return m_Highlighted;
+	}
+	
+	void HighlightFirst()
+	{
+		Highlight( m_Data.GetKey( 0 ) );
+	}
+	
+	void Highlight( ModInfo mod_ref )
+	{
+		if ( m_Highlighted )
+		{
+			m_Data.Get( m_Highlighted ).Deselect();
+			m_Content.Update();
+		}
+		
+		m_Highlighted = mod_ref;
+		if ( m_Highlighted )
+		{
+			m_Data.Get( m_Highlighted ).Select();
+			m_Content.Update();
+			ScrollToMod( m_Highlighted );
+		}
+	}
+	
+	void ScrollToMod( ModInfo mod_ref )
+	{
+		/*
+		if( mod_ref )
+		{
+			float scroll_pos_x, scroll_pos_y;
+			float scroll_size_x, scroll_size_y;
+			float mod_pos_x, mod_pos_y;
+			float mod_size_x, mod_size_y;
+			
+			Widget mod_widget = m_Data.Get( mod_ref ).GetWidget();
+			if( mod_widget )
+			{
+				m_Content.Update();
+				m_Scroll.Update();
+				m_Scroll.GetScreenPos( scroll_pos_x, scroll_pos_y );
+				m_Scroll.GetScreenSize( scroll_size_x, scroll_size_y );
+				mod_widget.GetScreenPos( mod_pos_x, mod_pos_y );
+				mod_widget.GetScreenSize( mod_size_x, mod_size_y );
+				if( mod_pos_y + mod_size_y >= scroll_pos_y + scroll_size_y )
+				{
+					m_Scroll.VScrollToPos( mod_pos_y + mod_size_y - scroll_pos_y );
+				}
+				else if( mod_pos_y <= scroll_pos_y )
+				{
+					m_Scroll.VScrollToPos( mod_pos_y - scroll_pos_y );
+				}
+				m_Scroll.VScrollToPos( mod_pos_y - scroll_pos_y );
+			}
+		}
+		*/
+	}
+	
+	void Select( ModInfo mod_ref, bool show )
+	{
+		if ( mod_ref )
+		{
+			if ( show )
+			{
+				m_Highlighted = mod_ref;
+				m_Data.Get( mod_ref ).Select();
+			}
+			else
+			{
+				m_Data.Get( mod_ref ).Deselect();
+				if ( m_Highlighted == mod_ref )
+				{
+					m_Highlighted = null;
+				}
+			}
+		}
+		
+		ScrollToMod( m_Highlighted );
+	}
+	
+	void PrepareTooltip( ModInfo mod_ref )
+	{
+		if ( m_Tooltip )
+		{
+			m_TooltipMod = mod_ref;
+			if ( !m_TooltipTimer )
+				m_TooltipTimer = new Timer(CALL_CATEGORY_GUI);
+			
+			m_TooltipTimer.Run( 1, this, "ShowTooltip" );
+		}
+	}
+	
+	void ShowTooltip()
+	{
+		if ( m_Tooltip )
+			m_Tooltip.ShowTooltip( m_TooltipMod );
+	}
+	
+	void HideTooltip()
+	{
+		if ( m_TooltipTimer )
+			m_TooltipTimer.Stop();
+		
+		m_TooltipMod = null;
+		if ( m_Tooltip )
+			m_Tooltip.HideTooltip();
+	}
+
+	void LoadEntries( array<ref ModInfo> data )
+	{
+		foreach (ModInfo var : data)
+		{
+			ModsMenuDetailedEntry entry = new ModsMenuDetailedEntry(var, m_Content, this);
+			m_Data.Insert(var, entry);
+		}
+		
+		m_Content.Update();
+		float y_c = m_Scroll.GetContentHeight();
+		float x, y;
+		m_Content.GetScreenSize( x, y );
+		if ( y > y_c )
+		{
+			m_Scroll.SetAlpha( 1 );
+		}
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if ( w == m_CloseButton )
+		{
+			Close();
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuDetailedEntry.c b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuDetailedEntry.c
new file mode 100644
index 0000000000000000000000000000000000000000..feac9325ce2e95d03649b64d583823fffe7129ed
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuDetailedEntry.c
@@ -0,0 +1,237 @@
+class ModsMenuDetailedEntry extends ScriptedWidgetEventHandler
+{
+	protected Widget			m_Root;
+	protected Widget			m_Detail;
+	
+	//Header
+	protected ImageWidget		m_IconSmall;
+	protected ImageWidget		m_IconCollapse;
+	protected TextWidget		m_Name;
+	
+	//Left Side Panel
+	protected ImageWidget		m_IconBig;
+	protected MultilineTextWidget		m_Author;
+	protected TextWidget		m_Version;
+	protected RichTextWidget	m_ActionWebsite;
+	protected RichTextWidget	m_ActionPurchase;
+	
+	//Description Panel
+	protected RichTextWidget	m_Description;
+
+	protected ModInfo			m_Data;
+	protected ModsMenuDetailed	m_ParentMenu;
+	protected bool				m_IsOpen;
+
+	void ModsMenuDetailedEntry(ModInfo data, Widget parent, ModsMenuDetailed parent_menu)
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/mods_menu/mods_menu_detailed_entry.layout", parent);
+		m_Detail = m_Root.FindAnyWidget("DetailContainer");
+		
+		m_IconSmall = ImageWidget.Cast(m_Root.FindAnyWidget("IconSmall"));
+		m_IconCollapse = ImageWidget.Cast(m_Root.FindAnyWidget("collapse_button"));
+		m_IconCollapse.LoadImageFile( 1, "set:dayz_gui image:icon_open" );
+		m_Name = TextWidget.Cast(m_Root.FindAnyWidget("Name"));
+		
+		m_IconBig = ImageWidget.Cast(m_Root.FindAnyWidget("IconBig"));
+		m_Author = MultilineTextWidget.Cast(m_Root.FindAnyWidget("Author"));
+		m_Author.SetLineBreakingOverride(LinebreakOverrideMode.LINEBREAK_WESTERN);
+		
+		m_Version = TextWidget.Cast(m_Root.FindAnyWidget("Version"));
+		m_ActionWebsite = RichTextWidget.Cast(m_Root.FindAnyWidget("Link"));
+		m_ActionPurchase = RichTextWidget.Cast(m_Root.FindAnyWidget("Purchase"));
+		
+		m_Description = RichTextWidget.Cast(m_Root.FindAnyWidget("Description"));
+		
+		m_Data = data;
+		m_ParentMenu = parent_menu;
+		
+		m_Root.SetHandler(this);
+
+		LoadData();
+	}
+	
+	void ~ModsMenuDetailedEntry()
+	{
+		delete m_Root;
+	}
+	
+	Widget GetWidget()
+	{
+		return m_Root;
+	}
+	
+	void Select()
+	{
+		m_Root.SetColor( ARGBF( m_Root.GetAlpha(), 0.3, 0, 0 ) );
+		
+		m_Detail.Show(true);
+		m_IconBig.Show( true );
+		m_IconSmall.Show( false );
+		m_IconCollapse.SetImage( 1 );
+		m_Detail.Update();
+		m_Root.Update();
+		m_IsOpen = true;
+	}
+	
+	void Deselect()
+	{
+		m_Root.SetColor( ARGBF( m_Root.GetAlpha(), 0.2, 0.2, 0.2 ) );
+		
+		m_Detail.Show(false);
+		m_IconBig.Show( false );
+		m_IconSmall.Show( true );
+		m_IconCollapse.SetImage( 0 );
+		m_Detail.Update();
+		m_Root.Update();
+		m_IsOpen = false;
+	}
+
+	void LoadData()
+	{
+		string picture = m_Data.GetPicture();
+		string logo = m_Data.GetLogoSmall();
+		string name = m_Data.GetName();
+		string description = m_Data.GetOverview();
+		string author = m_Data.GetAuthor();
+		string version = m_Data.GetVersion();
+		string action = m_Data.GetAction();
+
+		//Load Large Icon
+		if (picture != "")
+		{
+			m_IconBig.LoadImageFile(0, picture);
+		}
+		else if (logo != "")
+		{
+			m_IconBig.LoadImageFile(0, logo);
+		}
+		else
+		{
+			m_IconBig.LoadImageFile(0, ModInfo.DEFAULT_PICTURE);
+		}
+		
+		//Load Small Icon
+		if (logo != "")
+		{
+			m_IconSmall.LoadImageFile(0, logo);
+		}
+		else if (picture != "")
+		{
+			m_IconSmall.LoadImageFile(0, picture);
+		}
+		else
+		{
+			m_IconSmall.LoadImageFile(0, ModInfo.DEFAULT_LOGO_SMALL);
+		}
+
+		if (name != "")
+		{
+			m_Name.SetText(name);
+		}
+
+		if (description != "")
+		{
+			m_Description.SetText(description);
+		}
+		else
+		{
+			m_Description.SetText(ModInfo.DEFAULT_OVERVIEW);
+		}
+		m_Description.Update();
+		m_Detail.Update();
+		
+		if (author != "")
+		{
+			m_Author.Show( true );
+			m_Author.SetText(author);
+		}
+		
+		if (version != "")
+		{
+			m_Version.Show( true );
+			m_Version.SetText(version);
+		}
+		
+		#ifdef PLATFORM_WINDOWS
+		if (action != "")
+		{
+			m_ActionWebsite.Show( true );
+		}
+		#endif
+		
+		if ( m_Data.GetIsDLC() )
+		{
+			bool isOwned = m_Data.GetIsOwned();
+			m_Root.FindAnyWidget("ModOwnership").Show( true );
+			m_Root.FindAnyWidget("Owned").Show( isOwned );
+			m_Root.FindAnyWidget("Unowned").Show( !isOwned );
+			m_ActionPurchase.Show( true );
+			m_Version.Show( false );
+		}
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if( w == m_IconCollapse )
+		{
+			m_ParentMenu.Select( m_Data, !m_IsOpen );
+			return true;
+		}
+		else if( w == m_ActionWebsite )
+		{
+			GetGame().OpenURL( m_Data.GetAction() );
+		}
+		else if( w == m_ActionPurchase )
+		{
+			m_Data.GoToStore();
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if( w == m_ActionWebsite )
+		{
+			m_ActionWebsite.SetBold( true );
+			m_ActionWebsite.SetText( "#mod_detail_info_website" );
+		}
+		
+		if( w == m_ActionPurchase )
+		{
+			m_ActionPurchase.SetBold( true );
+			m_ActionPurchase.SetText( "#mod_detail_info_store" );
+		}
+		
+		if( w == m_Root )
+		{
+			if( m_Data.GetTooltip() != "" )
+				m_ParentMenu.PrepareTooltip( m_Data );
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if( w == m_ActionWebsite )
+		{
+			m_ActionWebsite.SetBold( false );
+			m_ActionWebsite.SetText( "#mod_detail_info_website" );
+		}
+		
+		if( w == m_ActionPurchase )
+		{
+			m_ActionPurchase.SetBold( false );
+			m_ActionPurchase.SetText( "#mod_detail_info_store" );
+		}
+		
+		if( enterW != m_Root )
+		{
+			m_ParentMenu.HideTooltip();
+			return true;
+		}
+		
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuSimple.c b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuSimple.c
new file mode 100644
index 0000000000000000000000000000000000000000..f995ed42163c218dec286b64b635026717024854
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuSimple.c
@@ -0,0 +1,98 @@
+class ModsMenuSimple extends ScriptedWidgetEventHandler
+{
+	protected const int 									MOD_DISPLAY_COUNT_MAX = 3;
+	
+	protected Widget										m_Root;
+	protected Widget										m_MoreButton;
+	protected Widget										m_MoreHighlight;
+	protected ref map<ModInfo, ref ModsMenuSimpleEntry>		m_Data;
+	protected ModsMenuDetailed								m_DetailMenu;
+	
+	void ModsMenuSimple(array<ref ModInfo> data, Widget parent, ModsMenuDetailed detail_menu)
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/mods_menu/mods_menu_simple.layout", parent);
+		m_MoreButton = m_Root.FindAnyWidget("ModMore");
+		m_MoreHighlight = m_Root.FindAnyWidget("ModMoreOverlay");
+		m_Data = new map<ModInfo, ref ModsMenuSimpleEntry>;
+		m_DetailMenu = detail_menu;
+		
+		m_Root.SetHandler(this);
+		LoadEntries(data);
+	}
+	
+	void ~ModsMenuSimple()
+	{
+		delete m_Root;
+	}
+
+	void LoadEntries(array<ref ModInfo> data)
+	{
+		m_MoreButton.Show(data.Count() > MOD_DISPLAY_COUNT_MAX);
+		int count = Math.Clamp(data.Count(),0,MOD_DISPLAY_COUNT_MAX);
+		
+		for (int i = 0; i < count; i++)
+		{
+			ref ModsMenuSimpleEntry entry = new ModsMenuSimpleEntry(data[i], i, m_Root, this);
+			m_Data.Insert(data[i], entry);
+		}
+	}
+	
+	void Select(ModInfo mod)
+	{
+		m_DetailMenu.Open();
+		m_DetailMenu.Highlight(mod);
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if (w == m_MoreButton)
+		{
+			if (m_DetailMenu.IsOpen())
+				m_DetailMenu.Close();
+			else
+				m_DetailMenu.Open();
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (w == m_MoreButton)
+		{
+			m_MoreHighlight.Show(true);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (enterW != m_MoreButton)
+		{
+			m_MoreHighlight.Show(false);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (w == m_MoreButton)
+		{
+			m_MoreHighlight.Show(true);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (w == m_MoreButton)
+		{
+			m_MoreHighlight.Show(false);
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuSimpleEntry.c b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuSimpleEntry.c
new file mode 100644
index 0000000000000000000000000000000000000000..47299f8ab45de0481e5c32328b764dc6b44f81b9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuSimpleEntry.c
@@ -0,0 +1,112 @@
+class ModsMenuSimpleEntry extends ScriptedWidgetEventHandler
+{
+	protected ButtonWidget		m_ModButton;
+	protected ImageWidget		m_Icon;
+	protected Widget			m_Hover;
+
+	protected bool				m_HasLogoOver;
+	protected ModInfo			m_Data;
+	protected ModsMenuSimple	m_ParentMenu;
+
+	void ModsMenuSimpleEntry(ModInfo data, int index, Widget parent, ModsMenuSimple parent_menu)
+	{
+		m_ModButton		= ButtonWidget.Cast(GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/mods_menu/mods_menu_simple_entry.layout", parent));
+		m_Icon			= ImageWidget.Cast(m_ModButton.FindAnyWidget("Icon"));
+		m_Hover			= m_ModButton.FindAnyWidget("Overlay");
+		m_Data			= data;
+		m_ParentMenu	= parent_menu;
+		
+		m_ModButton.SetSort(index);
+		m_ModButton.SetHandler(this);
+		
+		LoadData();
+	}
+	
+	void ~ModsMenuSimpleEntry()
+	{
+		delete m_ModButton;
+	}
+
+	void LoadData()
+	{
+		string logo = m_Data.GetLogo();
+		string logo_over = m_Data.GetLogoOver();
+		
+		if (logo != "")
+		{
+			m_Icon.LoadImageFile(0, logo);
+		}
+		else
+		{
+			m_Icon.LoadImageFile(0, ModInfo.DEFAULT_LOGO);
+		}
+		
+		if (logo_over != "")
+		{
+			m_Icon.LoadImageFile(1, logo_over);
+		}
+		else
+		{
+			m_Icon.LoadImageFile(1, ModInfo.DEFAULT_LOGO_OVER);
+		}
+		m_HasLogoOver = true;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if( w == m_ModButton )
+		{
+			m_ParentMenu.Select( m_Data );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if( w == m_ModButton )
+		{
+			if( m_HasLogoOver )
+				m_Icon.SetImage( 1 );
+			m_Hover.Show( true );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if( enterW != m_ModButton )
+		{
+			if( m_HasLogoOver )
+				m_Icon.SetImage( 0 );
+			m_Hover.Show( false );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if( w == m_ModButton )
+		{
+			if( m_HasLogoOver )
+				m_Icon.SetImage( 1 );
+			m_Hover.Show( true );
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		if( w == m_ModButton )
+		{
+			if( m_HasLogoOver )
+				m_Icon.SetImage( 0 );
+			m_Hover.Show( false );
+			return true;
+		}
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuTooltip.c b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuTooltip.c
new file mode 100644
index 0000000000000000000000000000000000000000..513521d74bfef735db1b7f8c66dc1b8d021fc9fc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ModsMenu/ModsMenuTooltip.c
@@ -0,0 +1,36 @@
+class ModsMenuTooltip extends ScriptedWidgetEventHandler
+{
+	protected Widget			m_Root;
+	protected RichTextWidget	m_Text;
+
+	void ModsMenuTooltip(Widget parent)
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/mods_menu/mods_tooltip.layout", parent);
+		m_Text = RichTextWidget.Cast(m_Root.FindAnyWidget("TooltipText"));
+	}
+	
+	void ~ModsMenuTooltip()
+	{
+		delete m_Root;
+	}
+	
+	void ShowTooltip(ModInfo mod_ref)
+	{
+		m_Root.Show(true);
+		m_Text.SetText(mod_ref.GetTooltip());
+		
+		int x, y;
+		GetMousePos(x,y);
+		m_Root.SetPos(x, y);
+		
+		m_Text.Update();
+		m_Root.Update();
+	}
+
+	void HideTooltip()
+	{
+		m_Root.Show(false);
+		m_Root.SetPos(0, 0);
+		m_Text.SetText("");
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelector.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelector.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c0cbabf4c9c19774e1766d0ad6b4c5c75110966
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelector.c
@@ -0,0 +1,260 @@
+class OptionSelector extends OptionSelectorBase
+{
+	protected Widget						m_PreviousOption;
+	protected Widget						m_NextOption;
+	protected TextWidget					m_SelectedOption;
+	protected int							m_SelectedOptionIndex;
+	protected ref array<string>				m_Options;
+	
+	void OptionSelector(Widget parent, int current_index, ScriptedWidgetEventHandler parent_c, bool disabled)
+	{
+		m_Options				= { "#server_browser_disabled", "#server_browser_show", "#server_browser_hide" };
+		m_ParentClass			= parent_c;
+		m_SelectorType			= 2;
+		if (current_index < 0 || current_index >= m_Options.Count())
+		{
+			m_SelectedOptionIndex = 0;
+		}
+		else
+		{
+			m_SelectedOptionIndex = current_index;
+		}
+		
+		m_Root						= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/option_selector.layout", parent);
+		#ifdef PLATFORM_CONSOLE
+			m_Parent				= parent.GetParent().GetParent();
+		#else
+		#ifdef PLATFORM_WINDOWS
+			m_Parent				= parent.GetParent();
+		#endif
+		#endif
+		
+		m_SelectedOption			= TextWidget.Cast(m_Root.FindAnyWidget("option_label"));
+		m_PreviousOption			= m_Root.FindAnyWidget("prev_option");
+		m_NextOption				= m_Root.FindAnyWidget("next_option");
+		
+		#ifdef PLATFORM_CONSOLE
+			m_NextOption.Show(false);
+			m_PreviousOption.Show(false);
+		#endif
+		
+		m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+		
+		m_Enabled = !disabled;
+		if (m_Enabled)
+		{
+			Enable();
+		}
+		else
+		{
+			Disable();
+		}
+		
+		m_Parent.SetHandler(this);
+	}
+	
+	void ~OptionSelector()
+	{
+		delete m_Root;
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_NextOption)
+			{
+				SetNextOption();
+				return true;
+			}
+			else if (w == m_PreviousOption)
+			{
+				SetPrevOption();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Parent)
+				SetNextOption();
+		}
+		return true;
+	}
+	
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		return super.OnMouseEnter(w, x, y);
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		return super.OnMouseLeave(w, enterW, x, y);
+	}
+	
+	void Reset()
+	{
+		m_SelectedOptionIndex = 0;
+		
+		m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+		
+		m_OptionChanged.Invoke(m_SelectedOptionIndex);
+	}
+	
+	void SetNextOption()
+	{
+		m_SelectedOptionIndex++;
+		if (m_SelectedOptionIndex >= m_Options.Count())
+		{
+			m_SelectedOptionIndex = 0;
+		}
+		
+		m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+		
+		m_OptionChanged.Invoke(m_SelectedOptionIndex);
+	}
+	
+	void SetPrevOption()
+	{
+		m_SelectedOptionIndex--;
+		if (m_SelectedOptionIndex < 0)
+		{
+			m_SelectedOptionIndex = m_Options.Count() - 1;
+		}
+		
+		m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+		
+		m_OptionChanged.Invoke(m_SelectedOptionIndex);
+	}
+	
+	array<string> GetOptions()
+	{
+		return m_Options;
+	}
+	
+	
+	bool IsSet()
+	{
+		return m_SelectedOptionIndex != 0;
+	}
+	
+	//! Returns 'true' if current index == 1 (default 'enabled' value). Take care, as different selectors may follow different logic!
+	bool IsEnabled()
+	{
+		return m_SelectedOptionIndex == 1;
+	}
+	
+	//! Returns false for the selector in 'disabled' states
+	bool IsSelectorEnabled()
+	{
+		return m_Enabled;
+	}
+	
+	string GetStringValue()
+	{
+		return m_Options.Get(m_SelectedOptionIndex);
+	}
+	
+	void SetStringOption(string option, bool fire_event = true)
+	{
+		int index = m_Options.Find(option);
+		if (index > -1)
+		{
+			m_SelectedOptionIndex = index;
+			m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+			
+			if (fire_event)
+				m_OptionChanged.Invoke(m_SelectedOptionIndex);
+		}
+	}
+	
+	void ColorOption()
+	{
+		switch (m_SelectedOptionIndex)
+		{
+			case 0:
+			{
+				m_SelectedOption.SetColor(ARGB(255, 255, 255, 255));
+				break;
+			}
+			case 1:
+			{
+				m_SelectedOption.SetColor(ARGB(255, 0, 255, 0));
+				break;
+			}
+			case 2:
+			{
+				m_SelectedOption.SetColor(ARGB(255, 255, 0, 0));
+				break;
+			}
+		}
+	}
+	
+	override bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Parent || w == m_NextOption || w == m_PreviousOption);
+		}
+		return false;
+	}
+	
+	override void Enable()
+	{
+		super.Enable();
+		#ifndef PLATFORM_CONSOLE
+			m_NextOption.ClearFlags(WidgetFlags.IGNOREPOINTER);
+			m_NextOption.Show(true);
+			m_PreviousOption.ClearFlags(WidgetFlags.IGNOREPOINTER);
+			m_PreviousOption.Show(true);
+		#else
+			m_Parent.ClearFlags(WidgetFlags.NOFOCUS);
+			m_Parent.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		#endif
+	}
+	
+	override void Disable()
+	{
+		super.Disable();
+		#ifndef PLATFORM_CONSOLE
+			m_NextOption.SetFlags(WidgetFlags.IGNOREPOINTER);
+			m_NextOption.Show(false);
+			m_PreviousOption.SetFlags(WidgetFlags.IGNOREPOINTER);
+			m_PreviousOption.Show(false);
+		#else
+			m_Parent.SetFlags(WidgetFlags.NOFOCUS);
+			m_Parent.SetFlags(WidgetFlags.IGNOREPOINTER);
+		#endif
+	}
+	
+	override void ColorNormalConsole(Widget w)
+	{
+		super.ColorNormalConsole(w);
+		
+		if (!w)
+			return;
+		
+		if (m_SelectedOption)
+		{
+			m_SelectedOption.SetColor(ARGB(255,255,255,255));
+		}
+	}
+	
+	override void ColorDisabledConsole(Widget w)
+	{
+		super.ColorDisabledConsole(w);
+		
+		if (!w)
+			return;
+		
+		if (m_SelectedOption)
+		{
+			m_SelectedOption.SetColor(ARGB(120,255,255,255));
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorBase.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..481bda9f1014e394c0ffc20cafcfd2918d55c546
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorBase.c
@@ -0,0 +1,311 @@
+class OptionSelectorBase extends ScriptedWidgetEventHandler
+{
+	protected int							m_SelectorType = 0;
+	protected Widget						m_Parent;
+	protected Widget						m_Root;
+	
+	protected bool							m_Enabled;
+	
+	protected ScriptedWidgetEventHandler	m_ParentClass;
+	
+	ref ScriptInvoker						m_OptionFocused = new ScriptInvoker;
+	ref ScriptInvoker						m_OptionUnfocused = new ScriptInvoker;
+	ref ScriptInvoker						m_AttemptOptionChange = new ScriptInvoker;
+	ref ScriptInvoker						m_OptionChanged = new ScriptInvoker;
+	
+	void ~OptionSelectorBase()
+	{
+		delete m_Root;
+	}
+	
+	Widget GetParent()
+	{
+		return m_Parent;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return w == m_Parent;
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (!IsFocusable(w))
+			return true;
+		
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+			#ifndef PLATFORM_CONSOLE
+			m_ParentClass.OnMouseEnter(m_Root.GetParent().GetParent(), x, y);
+			#endif
+		}
+		
+		UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+		
+		if (menu && menu.IsInherited(CharacterCreationMenu))
+		{
+			menu.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+			menu.OnMouseEnter(m_Root.GetParent().GetParent(), x, y);
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+		ColorHighlight(w);
+		#else
+		ColorHighlightConsole(w);
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+		}
+		#endif
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		#ifdef PLATFORM_CONSOLE
+		if (IsFocusable(enterW))
+			return true;
+		#endif
+		
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocus(null, x, y);
+			#ifndef PLATFORM_CONSOLE
+			m_ParentClass.OnMouseLeave(m_Root.GetParent().GetParent(), enterW, x, y);
+			#endif
+		}
+		
+		UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+		
+		if (menu && menu.IsInherited(CharacterCreationMenu))
+		{
+			menu.OnFocus(null, x, y);
+			menu.OnMouseLeave(m_Root.GetParent().GetParent(), enterW, x, y);
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+		ColorNormal(w);
+		#else
+		ColorNormalConsole(w);
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocusLost(w, x, y);
+		}
+		#endif
+	
+		return true;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlightConsole(w);
+			if (m_ParentClass)
+			{
+				m_ParentClass.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		ColorNormalConsole(w);
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocusLost(w, x, y);
+		}
+		return true;
+	}
+	
+	void Focus()
+	{
+		#ifndef PLATFORM_CONSOLE
+			SetFocus(m_Root);
+		#else
+			SetFocus(m_Parent);
+		#endif
+	}
+	
+	void Enable()
+	{
+		m_Enabled = true;
+		
+		m_Parent.ClearFlags(WidgetFlags.IGNOREPOINTER);
+		
+		#ifdef PLATFORM_CONSOLE
+			ColorNormalConsole(m_Parent);
+		#else
+			ColorNormal(m_Parent);
+		#endif
+	}
+	
+	void Disable()
+	{
+		m_Enabled = false;
+		
+		m_Parent.SetFlags(WidgetFlags.IGNOREPOINTER);
+		
+		#ifdef PLATFORM_CONSOLE
+			ColorDisabledConsole(m_Parent);
+		#else
+			ColorDisabled(m_Parent);
+		#endif
+	}
+	
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+				
+		ButtonSetColor(w, ARGB(255, 255, 0, 0));
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(255, 255, 255, 255);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		
+		Widget title_label = w.FindAnyWidget(w.GetName() + "_label");
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (title_label)
+		{
+			title_label.SetColor(color_lbl);
+		}
+		
+		if (option_label)
+		{
+			option_label.SetColor(color_lbl);
+		}
+	}
+	
+	void ColorDisabled(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(120, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		
+		Widget title_label = w.FindAnyWidget(w.GetName() + "_label");
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (title_label)
+		{
+			title_label.SetColor(color_lbl);
+		}
+		
+		if (option_label)
+		{
+			option_label.SetColor(color_lbl);
+		}		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		Widget option = w.FindAnyWidget(w.GetName() + "_image");
+		
+		if (option)
+		{
+			option.SetColor(color);
+		}
+	}
+	
+	void ColorHighlightConsole(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(255, 200, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColorConsole(w, color_pnl);
+		ButtonSetAlphaAnimConsole(null);
+		ButtonSetTextColorConsole(w, color_lbl);
+	}
+	
+	void ColorNormalConsole(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColorConsole(w, color_pnl);
+		ButtonSetAlphaAnimConsole(null);
+		ButtonSetTextColorConsole(w, color_lbl);
+	}
+	
+	void ColorDisabledConsole(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(120, 255, 255, 255);
+		
+		ButtonSetColorConsole(w, color_pnl);
+		ButtonSetAlphaAnimConsole(null);
+		ButtonSetTextColorConsole(w, color_lbl);
+	}
+	
+	void ButtonSetColorConsole(Widget w, int color)
+	{
+		w.SetColor(color);
+	}
+	
+	void ButtonSetAlphaAnimConsole(Widget w)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindAnyWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			//m_Root.SetWidgetAnimAlpha(panel);
+		}
+	}
+	
+	void ButtonSetTextColorConsole(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+		
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorEditbox.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorEditbox.c
new file mode 100644
index 0000000000000000000000000000000000000000..af41d8eb172c9192ea08997ccbc242c2f9ee7de8
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorEditbox.c
@@ -0,0 +1,171 @@
+class OptionSelectorEditbox extends OptionSelectorBase
+{
+	protected EditBoxWidget			m_EditBox;
+	
+	void OptionSelectorEditbox(Widget parent, string value, ScriptedWidgetEventHandler parent_menu, bool disabled)
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/option_editbox.layout", parent);
+		#ifdef PLATFORM_CONSOLE
+			m_Parent				= parent.GetParent().GetParent();
+		#else
+		#ifdef PLATFORM_WINDOWS
+			m_Parent				= parent.GetParent();
+		#endif
+		#endif
+		
+		m_SelectorType				= 1;
+		m_ParentClass				= parent_menu;
+		m_EditBox					= EditBoxWidget.Cast(m_Root.FindAnyWidget("option_value"));
+		
+		SetValue(value);
+		Enable();
+		
+		m_Parent.SetHandler(this);
+	}
+	
+	void ~OptionSelectorEditbox()
+	{
+		delete m_Root;
+	}
+	
+	override void Enable()
+	{
+		super.Enable();
+		
+		m_EditBox.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	override void Disable()
+	{
+		super.Disable();
+		
+		m_EditBox.SetFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (!IsFocusable(w))
+			return true;
+		
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+			m_ParentClass.OnMouseEnter(m_Root.GetParent().GetParent(), x, y);
+		}
+		
+		UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+		
+		if (menu && menu.IsInherited(CharacterCreationMenu))
+		{
+			menu.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+			menu.OnMouseEnter(m_Root.GetParent().GetParent(), x, y);
+		}
+		
+		ColorHighlight(w);
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (IsFocusable(enterW))
+			return true;
+		
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocus(null, x, y);
+			m_ParentClass.OnMouseLeave(m_Root.GetParent().GetParent(), enterW, x, y);
+		}
+		
+		UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+		
+		if (menu && menu.IsInherited(CharacterCreationMenu))
+		{
+			menu.OnFocus(null, x, y);
+			menu.OnMouseLeave(m_Root.GetParent().GetParent(), enterW, x, y);
+		}
+		
+		ColorNormal(w);
+		
+		return true;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if (w == m_EditBox)
+		{
+			m_OptionChanged.Invoke(GetValue());
+			return true;
+		}
+		return false;
+	}
+	
+	override bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Parent || w == m_EditBox);
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (GetFocus() != m_EditBox)
+		{
+			SetFocus(m_EditBox);
+			m_Parent.Enable(false);
+		}
+		
+		return super.OnFocus(m_Parent, x, y);
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (w == m_EditBox)
+		{
+			m_Parent.Enable(true);
+			return super.OnFocusLost(m_Parent, x, y);
+		}
+		return false;
+	}
+	
+	void SetValue(string value, bool update = true)
+	{
+		m_EditBox.SetText(value);
+		if (update)
+			m_OptionChanged.Invoke(GetValue());
+	}
+	
+	string GetValue()
+	{
+		return m_EditBox.GetText();
+	}
+	
+	override void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		if (m_EditBox)
+		{
+			SetFocus(m_EditBox);
+			m_EditBox.SetColor(ARGB(255, 200, 0, 0));
+		}
+		
+		super.ColorHighlight(w);
+	}
+	
+	override void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		if (m_EditBox)
+		{
+			m_EditBox.SetColor(ARGB(140, 255, 255, 255));
+		}
+		
+		super.ColorNormal(w);
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorLevelMarker.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorLevelMarker.c
new file mode 100644
index 0000000000000000000000000000000000000000..c658f932452cc3b010a976bf35c2530de123373c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorLevelMarker.c
@@ -0,0 +1,57 @@
+/**
+\brief This Option Selector handles a Slider Marker, which basically has 2 sliders
+	   One slider is for selecting the value, and the other slider is for displaying some other value/ information
+@param m_Slider2 other slider value, which can be used to convery some other info to the player
+*/
+class OptionSelectorLevelMarker extends OptionSelectorSliderSetup
+{
+	protected SliderWidget		m_Slider2;
+	
+	void OptionSelectorLevelMarker(Widget parent, float value, ScriptedWidgetEventHandler parentMenu, bool disabled, float min, float max)
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/option_level_marker.layout", parent);
+		#ifdef PLATFORM_CONSOLE
+			m_Parent				= parent.GetParent().GetParent();
+		#else
+		#ifdef PLATFORM_WINDOWS
+			m_Parent				= parent.GetParent();
+		#endif
+		#endif
+		
+		m_SelectorType			= 1;
+		m_ParentClass			= parentMenu;
+		m_Slider				= SliderWidget.Cast(m_Root.FindAnyWidget("marker_value"));
+		m_Slider2				= SliderWidget.Cast(m_Root.FindAnyWidget("other_slider_value"));
+		
+		m_MinValue					= min;
+		m_MaxValue					= max;
+		
+		SetValue(value, false);
+		SetSlider2Value(0);
+		Enable();
+
+		m_Parent.SetHandler(this);
+	}
+	
+	override void Enable()
+	{
+		super.Enable();
+		m_Slider2.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	override void Disable()
+	{
+		super.Disable();
+		m_Slider2.SetFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	void SetSlider2Value(float value)
+	{
+		m_Slider2.SetCurrent(NormalizeInput(value));
+	}
+	
+	override bool OnUpdate(Widget w)
+	{
+		return false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorMultistate.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorMultistate.c
new file mode 100644
index 0000000000000000000000000000000000000000..74a4b8d1efab8c0a88f76b9fa0225d1cdce89717
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorMultistate.c
@@ -0,0 +1,249 @@
+class OptionSelectorMultistate extends OptionSelector
+{
+	protected bool 	m_CanSwitch;
+	
+	void OptionSelectorMultistate(Widget parent, int current_index, ScriptedWidgetEventHandler parent_c, bool disabled, notnull array<string> options)
+	{
+		m_CanSwitch = true;
+		
+		m_SelectorType				= 2;
+		m_Options					= options;
+		if (options.Count() == 0)
+		{
+			Error("Invalid OptionSelectorMultistate options");
+		}
+		
+		if (current_index < 0 || current_index >= m_Options.Count())
+		{
+			m_SelectedOptionIndex = 0;
+		}
+		else
+		{
+			m_SelectedOptionIndex = current_index;
+		}
+		
+		m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	void LoadNewValues(notnull array<string> options, int current_index)
+	{
+		m_Options = options;
+		SetValue(current_index);
+	}
+	
+	override void SetNextOption()
+	{
+		int idx = m_SelectedOptionIndex;
+		idx++;
+		if (idx >= m_Options.Count())
+		{
+			idx = 0;
+		}
+		
+		m_AttemptOptionChange.Invoke(idx);
+		if (m_CanSwitch)
+		{
+			PerformSetOption(idx);
+		}
+	}
+	
+	override void SetPrevOption()
+	{
+		int idx = m_SelectedOptionIndex;
+		idx--;
+		if (idx < 0)
+		{
+			idx = m_Options.Count() - 1;
+		}
+		
+		m_AttemptOptionChange.Invoke(idx);
+		if (m_CanSwitch)
+		{
+			PerformSetOption(idx);
+		}
+	}
+	
+	void PerformSetOption(int index)
+	{
+		m_SelectedOptionIndex = index;
+		m_SelectedOption.SetText(m_Options.Get(index));
+		m_OptionChanged.Invoke(index);
+	}
+	
+	void SetCanSwitch(bool value)
+	{
+		m_CanSwitch = value;
+	}
+	
+	bool CanSwitch()
+	{
+		return m_CanSwitch;
+	}
+	
+	void SetValue(int value, bool fire_event = true)
+	{
+		if (value < m_Options.Count() && value >= 0)
+		{
+			m_SelectedOptionIndex = value;
+			m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+			if (fire_event)
+				m_OptionChanged.Invoke(m_SelectedOptionIndex);
+		}
+	}
+	
+	void SetValue(string value, bool fire_event = true)
+	{
+		int index = m_Options.Find(value);
+		if (index >= 0)
+		{
+			m_SelectedOptionIndex = index;
+			m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+			if (fire_event)
+				m_OptionChanged.Invoke(m_SelectedOptionIndex);
+		}
+	}
+	
+	void SetRandomValue()
+	{
+		m_SelectedOptionIndex = Math.RandomInt(0, m_Options.Count());
+		m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+		m_OptionChanged.Invoke(m_SelectedOptionIndex);
+	}
+	
+	int GetValue()
+	{
+		return m_SelectedOptionIndex;
+	}
+	
+	override void SetStringOption(string option, bool fire_event = true)
+	{
+		int index = m_Options.Find(option);
+		if (index > -1)
+		{
+			m_SelectedOptionIndex = index;
+			m_SelectedOption.SetText(m_Options.Get(m_SelectedOptionIndex));
+			
+			if (fire_event)
+				m_OptionChanged.Invoke(m_SelectedOptionIndex);
+		}
+	}
+}
+
+class OptionSelectorMultistateCharacterMenu extends OptionSelectorMultistate
+{
+	string class_name;
+	string path = "cfgVehicles " + class_name + " displayName";
+	string displayname;
+	
+	void OptionSelectorMultistateCharacterMenu(Widget parent, int current_index, ScriptedWidgetEventHandler parent_c, bool disabled, notnull array<string> options)
+	{
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	void SetDisplayNameText(string value, string appendix)
+	{
+		path = "cfgVehicles " + class_name + " displayName";
+		GetGame().ConfigGetText(path, displayname);
+		if (value == "Male")
+		{
+			m_SelectedOption.SetText("#str_cfgvehicles_survivorM0");
+		}
+		else if (value == "Female")
+		{
+			m_SelectedOption.SetText("#str_cfgvehicles_survivorF0");
+		}
+		else if (appendix != "")
+		{
+			if (value == "")
+				m_SelectedOption.SetText("NO ITEM - localization needed!");
+			else
+				m_SelectedOption.SetText("" + displayname + " " + appendix); //characters
+		}
+		else
+		{
+			m_SelectedOption.SetText(displayname);
+		}
+	}
+	
+	void SetTextSmart(string value)
+	{
+		if (value == "Male" || value == "Female")
+		{
+			SetDisplayNameText(value,"");
+			return;
+		}
+		
+		class_name = value;
+		int index = m_Options.Find(value);
+		if (InheritsFrom(class_name, "Clothing_Base"))
+		{
+			SetDisplayNameText(class_name,index.ToString());
+		}
+		else if (InheritsFrom(class_name,"SurvivorBase"))
+		{
+			if (InheritsFrom(class_name,"SurvivorMale_Base"))
+			{
+				SetDisplayNameText("#str_cfgvehicles_survivorM0",(m_SelectedOptionIndex + 1).ToString());
+			}
+			else if (InheritsFrom(class_name,"SurvivorFemale_Base"))
+			{
+				SetDisplayNameText("#str_cfgvehicles_survivorF0",(m_SelectedOptionIndex + 1).ToString());
+			}
+		}
+		else
+		{
+			SetDisplayNameText(class_name,index.ToString());
+		}
+	}
+	
+	bool InheritsFrom(string value, string baseclass)
+	{
+		string child = value;
+		string parent;
+		while (GetGame().ConfigGetBaseName("cfgVehicles " + child, parent))
+		{
+			if (parent == baseclass)
+			{
+				return true;
+			}
+			child = parent;
+		}
+		return false;
+	}
+	
+	override void SetNextOption()
+	{
+		super.SetNextOption();
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	override void SetPrevOption()
+	{
+		super.SetPrevOption();
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	override void SetValue(int value, bool fire_event = true)
+	{
+		super.SetValue(value,fire_event);
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	override void SetValue(string value, bool fire_event = true)
+	{
+		super.SetValue(value,fire_event);
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	override void SetRandomValue()
+	{
+		super.SetRandomValue();
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+	
+	override void SetStringOption(string option, bool fire_event = true)
+	{
+		super.SetStringOption(option, fire_event);
+		SetTextSmart(m_Options.Get(m_SelectedOptionIndex));
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorSlider.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorSlider.c
new file mode 100644
index 0000000000000000000000000000000000000000..f17fa205f4ae8459b98c34a9736d72172047b737
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorSlider.c
@@ -0,0 +1,27 @@
+class OptionSelectorSlider extends OptionSelectorSliderSetup
+{
+	void OptionSelectorSlider(Widget parent, float value, ScriptedWidgetEventHandler parent_menu, bool disabled, float min, float max)
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/option_slider.layout", parent);
+		#ifdef PLATFORM_CONSOLE
+			m_Parent				= parent.GetParent().GetParent();
+		#else
+		#ifdef PLATFORM_WINDOWS
+			m_Parent				= parent.GetParent();
+		#endif
+		#endif
+		
+		m_SelectorType				= 1;
+		m_ParentClass				= parent_menu;
+		m_Slider					= SliderWidget.Cast(m_Root.FindAnyWidget("option_value"));
+		m_Slider.SetCurrent(value);
+		
+		m_MinValue					= min;
+		m_MaxValue					= max;
+		
+		SetValue(value);
+		Enable();
+		
+		m_Parent.SetHandler(this);
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorSliderSetup.c b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorSliderSetup.c
new file mode 100644
index 0000000000000000000000000000000000000000..31ee5229696d0a3734efe3a25709b11ee3df3c81
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/OptionSelectorSliderSetup.c
@@ -0,0 +1,165 @@
+class OptionSelectorSliderSetup extends OptionSelectorBase
+{
+	protected SliderWidget			m_Slider;
+	protected float					m_MinValue;
+	protected float					m_MaxValue;
+	
+	void ~OptionSelectorSliderSetup()
+	{
+		delete m_Root;
+	}
+	
+	override void Enable()
+	{
+		super.Enable();
+		
+		m_Slider.ClearFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	override void Disable()
+	{
+		super.Disable();
+		
+		m_Slider.SetFlags(WidgetFlags.IGNOREPOINTER);
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (m_ParentClass)
+		{
+			OnFocus(w, x, y);
+			m_ParentClass.OnFocus(m_Root.GetParent(), -1, m_SelectorType);
+			#ifdef PLATFORM_WINDOWS
+			m_ParentClass.OnMouseEnter(m_Root.GetParent().GetParent(), x, y);
+			ColorHighlight(w);
+			#endif
+		}
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (m_ParentClass)
+		{
+			m_ParentClass.OnFocus(null, x, y);
+			#ifdef PLATFORM_WINDOWS
+			m_ParentClass.OnMouseLeave(m_Root.GetParent().GetParent(), enterW, x, y);
+			ColorNormal(w);
+			#endif
+			OnFocusLost(w, x, y);
+			SetFocus(null);
+		}
+			
+		return true;
+	}
+	
+	override bool OnMouseButtonUp(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT && w == m_Slider)
+		{
+		}
+		return false;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if (w == m_Slider)
+		{
+			m_OptionChanged.Invoke(GetValue());
+			return true;
+		}
+		return false;
+	}
+	
+	override bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Parent || w == m_Slider);
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		#ifdef PLATFORM_CONSOLE
+		if (GetFocus() != m_Slider)
+		{
+			SetFocus(m_Slider);
+			m_Parent.Enable(false);
+		}
+		
+		return super.OnFocus(m_Parent, x, y);
+		
+		#else
+		return false;
+		#endif
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (w == m_Slider)
+		{
+			m_Parent.Enable(true);
+			return super.OnFocusLost(m_Parent, x, y);
+		}
+		return false;
+	}
+	
+	float NormalizeInput(float value)
+	{
+		float ret = (value - m_MinValue) / (m_MaxValue - m_MinValue);
+		return ret;
+	}
+	
+	void SetStep(float step)
+	{
+		m_Slider.SetStep(step);
+	}
+	
+	void SetValue(float value, bool update = true)
+	{
+		m_Slider.SetCurrent(NormalizeInput(value));
+		if (update)
+			m_OptionChanged.Invoke(GetValue());
+	}
+	
+	float GetValue()
+	{
+		float ret = (m_Slider.GetCurrent() * (m_MaxValue - m_MinValue)) + m_MinValue;
+		return ret;
+	}
+	
+	void SetMax(float max)
+	{
+		m_MaxValue = max;
+	}
+	
+	override void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		if (m_Slider)
+		{
+			SetFocus(m_Slider);
+			m_Slider.SetColor(ARGB(255, 200, 0, 0));
+		}
+		
+		super.ColorHighlight(w);
+	}
+	
+	override void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		if (m_Slider)
+		{
+			m_Slider.SetColor(ARGB(140, 255, 255, 255));
+		}
+		
+		super.ColorNormal(w);
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Options/DependentOptions.c b/scripts/5_Mission/DayZ/GUI/NewUI/Options/DependentOptions.c
new file mode 100644
index 0000000000000000000000000000000000000000..9297e59ae55ae413b4ce0be886cd57e1300369e6
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Options/DependentOptions.c
@@ -0,0 +1,4 @@
+enum EDependentOptions
+{
+	MOUSEANDKEYBOARD_QUICKBAR,
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenu.c b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..c63f8efe426b2114905ca5060a8fa40f992b8f4e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenu.c
@@ -0,0 +1,845 @@
+class OptionsMenu extends UIScriptedMenu
+{
+	const int MODAL_ID_DEFAULT = 100;
+	const int DIALOG_TAB_OFFSET = 1400;
+
+	protected TabberUI					m_Tabber;
+	protected ref OptionsMenuGame		m_GameTab;
+	protected ref OptionsMenuSounds		m_SoundsTab;
+	protected ref OptionsMenuVideo		m_VideoTab;
+	protected ref OptionsMenuControls	m_ControlsTab;
+	
+	protected ref GameOptions			m_Options;
+	
+	protected ButtonWidget				m_Apply;
+	protected ButtonWidget				m_Back;
+	protected ButtonWidget				m_Reset; //undo
+	protected ButtonWidget				m_Defaults; //defaults
+	
+	protected Widget					m_Details;
+	protected TextWidget				m_Version;
+	
+	protected int 						m_ActiveTabIdx = 0;
+	protected bool 						m_ModalLock;
+	protected bool 						m_CanApplyOrReset;
+	protected bool 						m_CanToggle;
+	
+	void OptionsMenu()
+	{
+		
+	}
+	
+	override Widget Init()
+	{
+		m_Options		= new GameOptions();
+		
+		#ifdef PLATFORM_XBOX
+		layoutRoot		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/options/xbox/options_menu.layout", null);
+		#else
+		#ifdef PLATFORM_PS4
+		layoutRoot		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/options/ps/options_menu.layout", null);
+		#else
+		#ifdef PLATFORM_WINDOWS
+		layoutRoot		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/options/pc/options_menu.layout", null);
+		#endif
+		#endif
+		#endif
+		
+		layoutRoot.FindAnyWidget("Tabber").GetScript(m_Tabber);
+		
+		m_Details		= layoutRoot.FindAnyWidget("settings_details");
+		m_Version		= TextWidget.Cast(layoutRoot.FindAnyWidget("version"));
+		
+		m_GameTab		= new OptionsMenuGame(layoutRoot.FindAnyWidget("Tab_0"), m_Details, m_Options, this);
+		m_SoundsTab		= new OptionsMenuSounds(layoutRoot.FindAnyWidget("Tab_1"), m_Details, m_Options, this);
+		
+		#ifdef PLATFORM_XBOX
+		m_ControlsTab	= new OptionsMenuControls(layoutRoot.FindAnyWidget("Tab_2"), m_Details, m_Options, this);
+		#else
+		m_VideoTab		= new OptionsMenuVideo(layoutRoot.FindAnyWidget("Tab_2"), m_Details, m_Options, this);
+		m_ControlsTab	= new OptionsMenuControls(layoutRoot.FindAnyWidget("Tab_3"), m_Details, m_Options, this);
+		#endif
+		
+		m_Apply			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("apply"));
+		m_Back			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("back"));
+		m_Reset			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("reset"));
+		m_Defaults		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("defaults"));
+		
+		m_ModalLock = false;
+		m_CanApplyOrReset = false;
+		m_CanToggle = false;
+		
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+		version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+		version = "#main_menu_version" + " " + version;
+		#endif
+		m_Version.SetText(version);
+		
+		#ifdef PLATFORM_WINDOWS
+		SetFocus(layoutRoot);
+		#else
+		ToggleFocus();
+		#endif
+		
+		m_Tabber.m_OnTabSwitch.Insert(OnTabSwitch);
+		m_Tabber.m_OnAttemptTabSwitch.Insert(OnAttemptTabSwitch);
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		OnChanged();
+		
+		return layoutRoot;
+	}
+	
+	void ~OptionsMenu()
+	{
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			switch (w)
+			{
+				case m_Apply:
+				{
+					Apply();
+					return true;
+				}
+				case m_Back:
+				{
+					Back();
+					return true;
+				}
+				case m_Reset:
+				{
+					ResetCurrentTab();
+					return true;
+				}
+				case m_Defaults:
+				{
+					//SetToDefaults();
+					PerformSetToDefaults();
+					return true;
+				}
+			}
+		}
+		return false;
+	}
+	
+	void OnTabSwitch(int tab)
+	{
+		switch (tab)
+		{
+			case 0:
+			{
+				m_GameTab.Focus();
+				break;
+			}
+			case 1:
+			{
+				m_SoundsTab.Focus();
+				break;
+			}
+			case 2:
+			{
+				#ifdef PLATFORM_XBOX
+				m_ControlsTab.Focus();
+				#else
+				m_VideoTab.Focus();
+				#endif
+				break;
+			}
+			case 3:
+			{
+				#ifndef PLATFORM_XBOX
+				m_ControlsTab.Focus();
+				#endif
+				break;
+			}
+		}
+		
+		m_ActiveTabIdx = tab;
+	}
+	
+	void Apply()
+	{
+		m_ControlsTab.Apply();
+		
+		if (m_GameTab.IsChanged())
+		{
+			m_GameTab.Apply();
+		}
+		
+		if (m_Options.IsChanged() || m_GameTab.IsChanged())
+		{
+			m_Options.Test();
+			m_Options.Apply();
+		}
+		
+		// save input configuration
+		GetUApi().Export();
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard()) //useless on consoles
+		{
+			m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+			ColorDisable(m_Apply);
+			m_Reset.SetFlags(WidgetFlags.IGNOREPOINTER);
+			ColorDisable(m_Reset);
+		}
+		
+		m_CanApplyOrReset = false;
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		
+		IngameHud hud;
+		if (GetGame().GetMission() && Class.CastTo(hud,GetGame().GetMission().GetHud()))
+		{
+			hud.ShowQuickBar(GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer());
+		}
+		#endif
+		
+		if (m_Options.NeedRestart())
+			g_Game.GetUIManager().ShowDialog("#main_menu_configure", "#menu_restart_needed", 117, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+	}
+	
+	void Back()
+	{
+		if (!g_Game.GetUIManager().IsDialogVisible() && !g_Game.GetUIManager().IsModalVisible())
+		{
+			if (IsAnyTabChanged())
+			{
+				g_Game.GetUIManager().ShowDialog("#main_menu_configure", "#main_menu_configure_desc", 1337, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+				#ifdef PLATFORM_CONSOLE
+				UpdateControlsElements();
+				#endif
+			}
+			else
+			{
+				m_Options.Revert();
+				GetGame().EndOptionsVideo();
+				GetGame().GetUIManager().Back();
+			}
+		}
+	}
+	
+	void OnAttemptTabSwitch(int source, int target)
+	{
+		bool changed = IsAnyTabChanged();
+		if (changed)
+		{
+			if (!g_Game.GetUIManager().IsDialogVisible() && !g_Game.GetUIManager().IsModalVisible())
+			{
+				int id = target + DIALOG_TAB_OFFSET;
+				g_Game.GetUIManager().ShowDialog("#main_menu_configure", "#main_menu_configure_desc", id, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+				#ifdef PLATFORM_CONSOLE
+				UpdateControlsElements();
+				#endif
+			}
+		}
+		else
+		{
+			ResetCurrentTab();
+		}
+		
+		m_Tabber.SetCanSwitch(!changed);
+	}
+	
+	bool IsAnyTabChanged()
+	{
+		bool changed = (m_Options.IsChanged() || m_GameTab.IsChanged() || m_SoundsTab.IsChanged() || m_ControlsTab.IsChanged());
+		#ifndef PLATFORM_XBOX
+		changed |= m_VideoTab.IsChanged();
+		#endif
+		
+		return changed;
+	}
+	
+	void OnChanged()
+	{
+		bool changed = IsAnyTabChanged();
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard())
+		{
+			if (changed)
+			{
+				m_Reset.ClearFlags(WidgetFlags.IGNOREPOINTER);
+				ColorNormal(m_Reset);
+				m_Apply.ClearFlags(WidgetFlags.IGNOREPOINTER);
+				ColorNormal(m_Apply);
+			}
+			else
+			{
+				m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+				ColorDisable(m_Apply);
+				m_Reset.SetFlags(WidgetFlags.IGNOREPOINTER);
+				ColorDisable(m_Reset);
+			}
+		}
+		
+		m_CanApplyOrReset = changed;
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+		
+		m_Tabber.AlignTabbers();
+	}
+	
+	//resets it all
+	void Reset()
+	{
+		m_Options.Revert();
+		m_GameTab.Revert();
+		m_SoundsTab.Revert();
+		m_ControlsTab.Revert();
+		#ifndef PLATFORM_XBOX
+		m_VideoTab.Revert();
+		#endif
+		
+		if (m_Options.IsChanged())
+			m_Options.Revert();
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard())
+		{
+			m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+			ColorDisable(m_Apply);
+			m_Reset.SetFlags(WidgetFlags.IGNOREPOINTER);
+			ColorDisable(m_Reset);
+		}
+		
+		m_CanApplyOrReset = false;
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	void ResetCurrentTab()
+	{
+		if (m_Options.IsChanged())
+		{
+			m_Options.Revert();
+		}
+		
+		switch (m_ActiveTabIdx)
+		{
+			case 0:
+			{
+				m_GameTab.Revert();
+				break;
+			}
+			case 1:
+			{
+				m_SoundsTab.Revert();
+				break;
+			}
+			case 2:
+			{
+				#ifdef PLATFORM_XBOX
+					m_ControlsTab.Revert();
+				#else
+					m_VideoTab.Revert();
+				#endif
+				break;
+			}
+			case 3:
+			{
+				#ifndef PLATFORM_XBOX
+					m_ControlsTab.Revert();
+				#endif
+				break;
+			}
+		}
+		
+		if (m_Options.IsChanged())
+		{
+			m_Options.Revert();
+		}
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard())
+		{
+			m_Apply.SetFlags(WidgetFlags.IGNOREPOINTER);
+			ColorDisable(m_Apply);
+			m_Reset.SetFlags(WidgetFlags.IGNOREPOINTER);
+			ColorDisable(m_Reset);
+		}
+		
+		m_CanApplyOrReset = false;
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+		
+		m_Tabber.AlignTabbers();
+	}
+	
+	void SetToDefaults()
+	{
+		if (!g_Game.GetUIManager().IsDialogVisible() && !g_Game.GetUIManager().IsModalVisible())
+		{
+			g_Game.GetUIManager().ShowDialog("#menu_default_cap", "TODO - reset options to default", MODAL_ID_DEFAULT, DBT_YESNO, DBB_YES, DMT_QUESTION, this);
+		}
+	}
+	
+	void PerformSetToDefaults()
+	{
+		switch (m_ActiveTabIdx)
+		{
+			case 0:
+				m_GameTab.SetToDefaults();
+				break;
+
+			case 1:
+				m_SoundsTab.SetToDefaults();
+				break;
+
+			case 2:
+				#ifdef PLATFORM_XBOX
+				m_ControlsTab.SetToDefaults();
+				#else
+				m_VideoTab.SetToDefaults();
+				#endif
+				break;
+
+			case 3:
+				#ifndef PLATFORM_XBOX
+				m_ControlsTab.SetToDefaults();
+				#endif
+				break;
+		}
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard())
+		{
+			m_Reset.ClearFlags(WidgetFlags.IGNOREPOINTER);
+			ColorNormal(m_Reset);
+			m_Apply.ClearFlags(WidgetFlags.IGNOREPOINTER);
+			ColorNormal(m_Apply);
+		}
+		
+		m_CanApplyOrReset = true;
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	void SliderFocus()
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_CanToggle = false;
+		UpdateControlsElements();
+		#endif
+	}
+	
+	void ToggleFocus()
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_CanToggle = true;
+		UpdateControlsElements();
+		#endif
+	}
+	
+	//! Controls visibility and sometimes even state of specific, dependent options across sub-menus
+	void ToggleDependentOptions(int mode, bool state)
+	{
+		m_GameTab.ToggleDependentOptions(mode,state);
+		m_SoundsTab.ToggleDependentOptions(mode,state);
+		m_ControlsTab.ToggleDependentOptions(mode,state);
+		#ifndef PLATFORM_XBOX
+		m_VideoTab.ToggleDependentOptions(mode,state);
+		#endif
+	}
+	
+	void ReloadOptions()
+	{
+		m_Options = new GameOptions();
+		
+		if (m_GameTab)
+			m_GameTab.SetOptions(m_Options);
+		if (m_SoundsTab)
+			m_SoundsTab.SetOptions(m_Options);
+		if (m_ControlsTab)
+			m_ControlsTab.SetOptions(m_Options);
+
+		#ifndef PLATFORM_XBOX
+		if (m_VideoTab)
+			m_VideoTab.SetOptions(m_Options);
+		#endif
+	}
+	
+	void ReloadVideoOptions()
+	{
+		#ifndef PLATFORM_XBOX
+		if (m_VideoTab)
+			m_VideoTab.SetOptions(m_Options);
+		#endif
+	}
+	
+	override bool OnModalResult(Widget w, int x, int y, int code, int result)
+	{
+		bool ret = false;
+		
+		if (code == 1337)
+		{
+			if (result == 2)
+			{
+				m_Options.Revert();
+				GetGame().EndOptionsVideo();
+				GetGame().GetUIManager().Back();
+			}
+			ret = true;
+		}
+		else if (code == 117)
+		{
+			g_Game.RequestRestart(IDC_MAIN_QUIT);
+		}
+		else if (code == MODAL_ID_DEFAULT)
+		{
+			if (result == 2)
+			{
+				PerformSetToDefaults();
+			}
+		}
+		else if (code >= DIALOG_TAB_OFFSET)
+		{
+			if (result == 2)
+			{
+				int id = code - DIALOG_TAB_OFFSET;
+				//m_Options.Revert();
+				ResetCurrentTab();
+				m_Tabber.PerformSwitchTab(id);
+			}
+			ret = true;
+		}
+		
+		m_ModalLock = ret; //prevents dialog being shown on the next update
+		return ret;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		else if (y == 1)
+		{
+			SliderFocus();
+		}
+		else
+		{
+			ToggleFocus();
+		}
+		
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (w && IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Apply || w == m_Back || w == m_Reset || w == m_Defaults);
+		}
+		return false;
+	}
+	
+	override void Refresh()
+	{
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+		version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+		version = "#main_menu_version" + " " + version;
+		#endif
+		
+		m_Version.SetText(version);
+		
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		UpdateControlsElementVisibility();
+		#endif
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		m_GameTab.Focus();
+		Refresh();
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		if (m_ModalLock)
+		{
+			m_ModalLock = false;
+			#ifdef PLATFORM_CONSOLE
+			UpdateControlsElements();
+			#endif
+			return;
+		}
+		
+		if (g_Game.GetUIManager().IsDialogVisible())
+		{
+			return;
+		}
+		
+		if (GetUApi().GetInputByID(UAUITabLeft).LocalPress())
+		{
+			m_Tabber.PreviousTab();
+		}
+		else if (GetUApi().GetInputByID(UAUITabRight).LocalPress())
+		{
+			m_Tabber.NextTab();
+		}
+		else if (GetUApi().GetInputByID(UAUICtrlX).LocalPress())
+		{
+			if (m_CanApplyOrReset)
+			{
+				Apply();
+			}
+		}
+		else if (GetUApi().GetInputByID(UAUICredits).LocalPress())
+		{
+			if (m_CanApplyOrReset)
+			{
+				ResetCurrentTab();
+			}
+			
+		}
+		else if (GetUApi().GetInputByID(UAUICtrlY).LocalPress())
+		{
+			PerformSetToDefaults();
+		}
+		else if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Back();
+		}
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight(Widget w)
+	{
+		if ((w.GetFlags() & WidgetFlags.IGNOREPOINTER) == WidgetFlags.IGNOREPOINTER)
+		{
+			return;
+		}
+
+		if (w.IsInherited(ButtonWidget))
+		{
+			ButtonWidget button = ButtonWidget.Cast(w);
+			button.SetTextColor(ARGB(255, 200, 0, 0));
+		}
+		
+		w.SetColor(ARGB(255, 0, 0, 0));
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+		ImageWidget image	= ImageWidget.Cast(w.FindAnyWidget(w.GetName() + "_image"));
+		Widget option		= Widget.Cast(w.FindAnyWidget(w.GetName() + "_option_wrapper"));
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (text1)
+		{
+			text1.SetColor(ARGB(255, 255, 0, 0));
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(ARGB(255, 255, 0, 0));
+		}
+		
+		if (text3)
+		{
+			text3.SetColor(ARGB(255, 255, 0, 0));
+			w.SetAlpha(1);
+		}
+		
+		if (image)
+		{
+			image.SetColor(ARGB(255, 200, 0, 0));
+		}
+		
+		if (option)
+		{
+			option.SetColor(ARGB(255, 255, 0, 0));
+		}
+		
+		if (option_label)
+		{
+			option_label.SetColor(ARGB(255, 255, 0, 0));
+		}
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if ((w.GetFlags() & WidgetFlags.IGNOREPOINTER) == WidgetFlags.IGNOREPOINTER)
+		{
+			return;
+		}
+		
+		if (w.IsInherited(ButtonWidget))
+		{
+			ButtonWidget button = ButtonWidget.Cast(w);
+			button.SetTextColor(ARGB(255, 255, 255, 255));
+		}
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		ImageWidget image	= ImageWidget.Cast(w.FindAnyWidget(w.GetName() + "_image"));
+		Widget option		= w.FindAnyWidget(w.GetName() + "_option_wrapper");
+		Widget option_label = w.FindAnyWidget("option_label");
+		
+		if (text1)
+		{
+			text1.SetColor(ARGB(255, 255, 255, 255));
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(ARGB(255, 255, 255, 255));
+		}
+		
+		if (text3)
+		{
+			text3.SetColor(ARGB(255, 255, 255, 255));
+			w.SetAlpha(0);
+		}
+		
+		if (image)
+		{
+			image.SetColor(ARGB(255, 255, 255, 255));
+		}
+		
+		if (option)
+		{
+			option.SetColor(ARGB(150, 255, 255, 255));
+		}
+		
+		if (option_label)
+		{
+			option_label.SetColor(ARGB(255, 255, 255, 255));
+		}
+	}
+	
+	void ColorDisable(Widget w)
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus(null);
+		#endif
+		
+		if (w)
+		{
+			ButtonWidget button = ButtonWidget.Cast(w);
+			if (button)
+			{
+				button.SetTextColor(ColorManager.COLOR_DISABLED_TEXT);
+			}
+		}
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		#ifdef PLATFORM_CONSOLE
+		RichTextWidget toolbar_text = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ContextToolbarText"));
+		string text = "";
+		if (g_Game.GetUIManager().IsDialogVisible() || g_Game.GetUIManager().IsDialogQueued())
+		{
+			text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", "#dialog_confirm", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			
+		}
+		else
+		{
+			if (m_CanToggle)
+			{
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", "#dialog_change", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			}
+			if (m_CanApplyOrReset)
+			{
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", "#STR_settings_menu_root_toolbar_bg_ConsoleToolbar_Apply_ApplyText0", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			}
+			text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "#menu_default", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			if (m_CanApplyOrReset)
+			{
+				text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUICredits", "#menu_undo", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			}
+		}
+		text += string.Format(" %1",InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "#STR_settings_menu_root_toolbar_bg_ConsoleToolbar_Back_BackText0", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_text.SetText(text);
+		
+		RichTextWidget toolbar_b2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon0"));
+		RichTextWidget toolbar_x2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("ApplyIcon0"));
+		RichTextWidget toolbar_y2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("ResetIcon0"));
+		RichTextWidget toolbar_def2	= RichTextWidget.Cast(layoutRoot.FindAnyWidget("DefaultIcon0"));
+		toolbar_b2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER));
+		toolbar_x2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", "", EUAINPUT_DEVICE_CONTROLLER));
+		toolbar_y2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUICredits", "", EUAINPUT_DEVICE_CONTROLLER));
+		toolbar_def2.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "", EUAINPUT_DEVICE_CONTROLLER));
+		#endif
+	}
+	
+	protected void UpdateControlsElementVisibility()
+	{
+		bool toolbarShow = false;
+		#ifdef PLATFORM_CONSOLE
+		toolbarShow = !GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() || GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.CONTROLLER;
+		#endif
+		
+		layoutRoot.FindAnyWidget("toolbar_bg").Show(toolbarShow);
+		layoutRoot.FindAnyWidget("play_panel_root").Show(!toolbarShow);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuControls.c b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuControls.c
new file mode 100644
index 0000000000000000000000000000000000000000..6c9dd9bc357ab3a1d2b355a320caeae9326690bb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuControls.c
@@ -0,0 +1,679 @@
+class OptionsMenuControls extends ScriptedWidgetEventHandler
+{
+	protected Widget						m_Root;
+	
+	protected Widget						m_SettingsRoot;
+	protected Widget						m_DetailsRoot;
+	protected Widget						m_DetailsBodyDefault;
+	protected Widget						m_DetailsBodyConnectivity;
+#ifdef PLATFORM_CONSOLE
+	protected bool 							m_MaKOptionAvailable;
+	protected Widget						m_ConsoleControllerSensitivityWidget;
+	protected Widget						m_ConsoleMouseSensitivityWidget;
+#endif
+	protected TextWidget					m_DetailsLabel;
+	protected RichTextWidget				m_DetailsText;
+	protected GridSpacerWidget				m_Keybindings;
+	
+	protected GameOptions					m_Options;
+	protected OptionsMenu					m_Menu;
+	
+	// console options accessors
+	protected ref SwitchOptionsAccess		m_KeyboardOption;
+	protected ref SwitchOptionsAccess		m_AimHelperOption;
+	
+	// console options selectors
+	protected ref OptionSelectorMultistate	m_KeyboardSelector;
+	protected ref OptionSelectorMultistate	m_AimHelperSelector;
+
+	// mouse accessors
+	protected ref SwitchOptionsAccess		m_Mouse_InvertOption;
+	protected ref NumericOptionsAccess		m_Mouse_VSensitivityOption;
+	protected ref NumericOptionsAccess		m_Mouse_HSensitivityOption;
+	protected ref NumericOptionsAccess		m_Mouse_AimMod_VSensitivityOption;
+	protected ref NumericOptionsAccess		m_Mouse_AimMod_HSensitivityOption;
+	
+	// mouse selectors
+	protected ref OptionSelectorMultistate	m_Mouse_InvertSelector;
+	protected ref OptionSelectorSlider		m_Mouse_VSensitivitySelector;
+	protected ref OptionSelectorSlider		m_Mouse_HSensitivitySelector;
+	protected ref OptionSelectorSlider		m_Mouse_AimMod_VSensitivitySelector;
+	protected ref OptionSelectorSlider		m_Mouse_AimMod_HSensitivitySelector;
+
+	// gamepad/controller accessors
+	protected ref NumericOptionsAccess		m_ControllerLS_VSensitivityOption;
+	protected ref NumericOptionsAccess		m_ControllerLS_HSensitivityOption;
+	protected ref NumericOptionsAccess		m_ControllerLS_VehicleMod_HSensitivityOption;
+	protected ref SwitchOptionsAccess		m_ControllerRS_InvertOption;
+	protected ref NumericOptionsAccess		m_ControllerRS_VSensitivityOption;
+	protected ref NumericOptionsAccess		m_ControllerRS_HSensitivityOption;
+	protected ref NumericOptionsAccess		m_ControllerRS_CurvatureOption;
+	protected ref NumericOptionsAccess		m_ControllerRS_AimMod_VSensitivityOption;
+	protected ref NumericOptionsAccess		m_ControllerRS_AimMod_HSensitivityOption;
+	protected ref NumericOptionsAccess		m_ControllerRS_AimMod_CurvatureOption;
+	
+	// gamepad/controller selectors
+	protected ref OptionSelectorSlider		m_ControllerLS_VSensitivitySelector;
+	protected ref OptionSelectorSlider		m_ControllerLS_HSensitivitySelector;
+	protected ref OptionSelectorSlider		m_ControllerLS_VehicleMod_HSensitivitySelector;
+	protected ref OptionSelectorMultistate	m_ControllerRS_InvertSelector;
+	protected ref OptionSelectorSlider		m_ControllerRS_VSensitivitySelector;
+	protected ref OptionSelectorSlider		m_ControllerRS_HSensitivitySelector;
+	protected ref OptionSelectorSlider		m_ControllerRS_CurvatureSelector;
+	protected ref OptionSelectorSlider		m_ControllerRS_AimMod_VSensitivitySelector;
+	protected ref OptionSelectorSlider		m_ControllerRS_AimMod_HSensitivitySelector;
+	protected ref OptionSelectorSlider		m_ControllerRS_AimMod_CurvatureSelector;
+		
+	protected ref map<int, ref Param2<string, string>> m_TextMap;
+	
+	static const float SLIDER_STEP = 0.025;
+	
+	void OptionsMenuControls( Widget parent, Widget details_root, GameOptions options, OptionsMenu menu )
+	{
+		array<string> opt							= { "#options_controls_disabled", "#options_controls_enabled" };
+
+		m_Root										= GetGame().GetWorkspace().CreateWidgets( GetLayoutName(), parent );
+		m_Options 									= options;
+		m_Menu										= menu;
+		
+		m_DetailsRoot								= details_root;
+		m_DetailsBodyDefault 						= m_DetailsRoot.FindAnyWidget("settings_details_body");
+		m_DetailsBodyConnectivity 					= m_DetailsRoot.FindAnyWidget("settings_details_body_connectivity");
+		m_DetailsLabel								= TextWidget.Cast( m_DetailsRoot.FindAnyWidget( "details_label" ) );
+		m_DetailsText								= RichTextWidget.Cast( m_DetailsRoot.FindAnyWidget( "details_content" ) );
+		m_Keybindings								= GridSpacerWidget.Cast( m_Root.FindAnyWidget( "keyboard_settings_content" ) );
+		if( m_Keybindings )
+			m_Keybindings.SetUserID( 777 );
+		
+		SetOptions( options );
+		
+		// mouse (PC & consoles)
+		Widget mouse_InvertSettingOption = m_Root.FindAnyWidget( "mouse_invert_setting_option" );
+		Widget mouse_VSensitivitySettingOption = m_Root.FindAnyWidget( "mouse_vsensitivity_setting_option" );
+		Widget mouse_HSensitivitySettingOption = m_Root.FindAnyWidget( "mouse_hsensitivity_setting_option" );
+		Widget mouse_AimMod_VSensitivitySettingOption = m_Root.FindAnyWidget( "mouse_aimmod_vsensitivity_setting_option" );
+		Widget mouse_AimMod_HSensitivitySettingOption = m_Root.FindAnyWidget( "mouse_aimmod_hsensitivity_setting_option" );
+		
+		mouse_InvertSettingOption.SetUserID( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS_INVERTED );
+		mouse_VSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS );
+		mouse_HSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_MOUSE_XAXIS );
+		mouse_AimMod_VSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS_AIM_MOD );
+		mouse_AimMod_HSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_MOUSE_XAXIS_AIM_MOD );
+
+		m_Mouse_InvertSelector = new OptionSelectorMultistate( mouse_InvertSettingOption, m_Mouse_InvertOption.GetIndex(), this, false, opt );
+		m_Mouse_VSensitivitySelector = new OptionSelectorSlider( mouse_VSensitivitySettingOption, m_Mouse_VSensitivityOption.ReadValue(), this, false, m_Mouse_VSensitivityOption.GetMin(), m_Mouse_VSensitivityOption.GetMax() );
+		m_Mouse_VSensitivitySelector.SetStep(SLIDER_STEP);
+		m_Mouse_HSensitivitySelector = new OptionSelectorSlider( mouse_HSensitivitySettingOption, m_Mouse_HSensitivityOption.ReadValue(), this, false, m_Mouse_HSensitivityOption.GetMin(), m_Mouse_HSensitivityOption.GetMax() );
+		m_Mouse_HSensitivitySelector.SetStep(SLIDER_STEP);
+		m_Mouse_AimMod_VSensitivitySelector = new OptionSelectorSlider( mouse_AimMod_VSensitivitySettingOption, m_Mouse_AimMod_VSensitivityOption.ReadValue(), this, false, m_Mouse_AimMod_VSensitivityOption.GetMin(), m_Mouse_AimMod_VSensitivityOption.GetMax() );
+		m_Mouse_AimMod_VSensitivitySelector.SetStep(SLIDER_STEP);
+		m_Mouse_AimMod_HSensitivitySelector = new OptionSelectorSlider( mouse_AimMod_HSensitivitySettingOption, m_Mouse_AimMod_HSensitivityOption.ReadValue(), this, false, m_Mouse_AimMod_HSensitivityOption.GetMin(), m_Mouse_AimMod_HSensitivityOption.GetMax() );
+		m_Mouse_AimMod_HSensitivitySelector.SetStep(SLIDER_STEP);
+
+		m_Mouse_InvertSelector.m_OptionChanged.Insert( UpdateMouseInvertView );
+		m_Mouse_VSensitivitySelector.m_OptionChanged.Insert( UpdateMouseVSensitivity );
+		m_Mouse_HSensitivitySelector.m_OptionChanged.Insert( UpdateMouseHSensitivity );
+		m_Mouse_AimMod_VSensitivitySelector.m_OptionChanged.Insert( UpdateMouseAimModVSensitivity );
+		m_Mouse_AimMod_HSensitivitySelector.m_OptionChanged.Insert( UpdateMouseAimModHSensitivity );
+
+		// controller (consoles only)
+		#ifdef PLATFORM_CONSOLE
+			m_MaKOptionAvailable = g_Game.GetGameState() != DayZGameState.IN_GAME || GetGame().GetWorld().IsMouseAndKeyboardEnabledOnServer();
+			m_ConsoleControllerSensitivityWidget = m_Root.FindAnyWidget( "controller_settings_root" );
+			m_ConsoleMouseSensitivityWidget = m_Root.FindAnyWidget( "mouse_settings_root" );
+		
+			Widget keyboardSettingOption = m_Root.FindAnyWidget( "keyboard_setting_option" );
+			Widget aimHelperSettingOption = m_Root.FindAnyWidget( "aimhelper_setting_option" );
+		
+			Widget controllerLS_VSensitivitySettingOption =  m_Root.FindAnyWidget("controller_ls_vsensitivity_setting_option");
+			Widget controllerLS_HSensitivitySettingOption =  m_Root.FindAnyWidget("controller_ls_hsensitivity_setting_option");
+			Widget controllerLS_VehicleMod_HSensitivitySettingOption =  m_Root.FindAnyWidget("controller_ls_vehicle_sensitivity_setting_option");
+			Widget controllerRS_InvertSettingOption =  m_Root.FindAnyWidget("controller_rs_invert_setting_option");
+			Widget controllerRS_VSensitivitySettingOption =  m_Root.FindAnyWidget("controller_rs_vsensitivity_setting_option");
+			Widget controllerRS_HSensitivitySettingOption =  m_Root.FindAnyWidget("controller_rs_hsensitivity_setting_option");
+			Widget controllerRS_CurvatureSettingOption =  m_Root.FindAnyWidget("controller_rs_curvature_setting_option");
+			Widget controllerRS_AimMod_VSensitivitySettingOption =  m_Root.FindAnyWidget("controller_rs_aimmod_vsensitivity_setting_option");
+			Widget controllerRS_AimMod_HSensitivitySettingOption =  m_Root.FindAnyWidget("controller_rs_aimmod_hsensitivity_setting_option");
+			Widget controllerRS_AimMod_CurvatureSettingOption =  m_Root.FindAnyWidget("controller_rs_aimmod_curvature_setting_option");
+			
+			keyboardSettingOption.SetUserID( OptionAccessType.AT_OPTIONS_MOUSE_AND_KEYBOARD );
+			aimHelperSettingOption.SetUserID( OptionAccessType.AT_OPTIONS_AIM_HELPER );
+		
+			controllerLS_VSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_YAXIS );
+			controllerLS_HSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_XAXIS );
+			controllerLS_VehicleMod_HSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_XAXIS_VEHICLE_MOD );
+			controllerRS_InvertSettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS_INVERTED );
+			controllerRS_VSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS );
+			controllerRS_HSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_XAXIS );
+			controllerRS_CurvatureSettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_CURVATURE );
+			controllerRS_AimMod_VSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS_AIM_MOD );
+			controllerRS_AimMod_HSensitivitySettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_XAXIS_AIM_MOD );
+			controllerRS_AimMod_CurvatureSettingOption.SetUserID( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_CURVATURE_AIM_MOD );
+		
+			m_KeyboardSelector = new OptionSelectorMultistate( keyboardSettingOption, m_KeyboardOption.GetIndex(), this, !m_MaKOptionAvailable, opt );
+			m_AimHelperSelector = new OptionSelectorMultistate( aimHelperSettingOption, m_AimHelperOption.GetIndex(), this, false, opt );
+		
+			m_ControllerLS_VSensitivitySelector = new OptionSelectorSlider( controllerLS_VSensitivitySettingOption, m_ControllerLS_VSensitivityOption.ReadValue(), this, false, m_ControllerLS_VSensitivityOption.GetMin(), m_ControllerLS_VSensitivityOption.GetMax() );
+			m_ControllerLS_VSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerLS_HSensitivitySelector = new OptionSelectorSlider( controllerLS_HSensitivitySettingOption, m_ControllerLS_HSensitivityOption.ReadValue(), this, false, m_ControllerLS_HSensitivityOption.GetMin(), m_ControllerLS_HSensitivityOption.GetMax() );
+			m_ControllerLS_HSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerLS_VehicleMod_HSensitivitySelector = new OptionSelectorSlider( controllerLS_VehicleMod_HSensitivitySettingOption, m_ControllerLS_VehicleMod_HSensitivityOption.ReadValue(), this, false, m_ControllerLS_VehicleMod_HSensitivityOption.GetMin(), m_ControllerLS_VehicleMod_HSensitivityOption.GetMax() );
+			m_ControllerLS_VehicleMod_HSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerRS_InvertSelector = new OptionSelectorMultistate( controllerRS_InvertSettingOption, m_ControllerRS_InvertOption.GetIndex(), this, false, opt );
+			m_ControllerRS_VSensitivitySelector = new OptionSelectorSlider( controllerRS_VSensitivitySettingOption, m_ControllerRS_VSensitivityOption.ReadValue(), this, false, m_ControllerRS_VSensitivityOption.GetMin(), m_ControllerRS_VSensitivityOption.GetMax() );
+			m_ControllerRS_VSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerRS_HSensitivitySelector = new OptionSelectorSlider( controllerRS_HSensitivitySettingOption, m_ControllerRS_HSensitivityOption.ReadValue(), this, false, m_ControllerRS_HSensitivityOption.GetMin(), m_ControllerRS_HSensitivityOption.GetMax() );
+			m_ControllerRS_HSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerRS_CurvatureSelector = new OptionSelectorSlider( controllerRS_CurvatureSettingOption, m_ControllerRS_CurvatureOption.ReadValue(), this, false, m_ControllerRS_CurvatureOption.GetMin(), m_ControllerRS_CurvatureOption.GetMax() );
+			m_ControllerRS_CurvatureSelector.SetStep(SLIDER_STEP);
+			m_ControllerRS_AimMod_VSensitivitySelector = new OptionSelectorSlider( controllerRS_AimMod_VSensitivitySettingOption, m_ControllerRS_AimMod_VSensitivityOption.ReadValue(), this, false, m_ControllerRS_AimMod_VSensitivityOption.GetMin(), m_ControllerRS_AimMod_VSensitivityOption.GetMax() );
+			m_ControllerRS_AimMod_VSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerRS_AimMod_HSensitivitySelector = new OptionSelectorSlider( controllerRS_AimMod_HSensitivitySettingOption, m_ControllerRS_AimMod_HSensitivityOption.ReadValue(), this, false, m_ControllerRS_AimMod_HSensitivityOption.GetMin(), m_ControllerRS_AimMod_HSensitivityOption.GetMax() );
+			m_ControllerRS_AimMod_HSensitivitySelector.SetStep(SLIDER_STEP);
+			m_ControllerRS_AimMod_CurvatureSelector = new OptionSelectorSlider( controllerRS_AimMod_CurvatureSettingOption, m_ControllerRS_AimMod_CurvatureOption.ReadValue(), this, false, m_ControllerRS_AimMod_CurvatureOption.GetMin(), m_ControllerRS_AimMod_CurvatureOption.GetMax() );
+			m_ControllerRS_AimMod_CurvatureSelector.SetStep(SLIDER_STEP);
+		
+			m_KeyboardSelector.m_OptionChanged.Insert( UpdateKeyboard );
+			m_AimHelperSelector.m_OptionChanged.Insert( UpdateAimHelper );
+		
+			m_ControllerLS_VSensitivitySelector.m_OptionChanged.Insert( UpdateControllerLS_VSensitivity );
+			m_ControllerLS_HSensitivitySelector.m_OptionChanged.Insert( UpdateControllerLS_HSensitivity );
+			m_ControllerLS_VehicleMod_HSensitivitySelector.m_OptionChanged.Insert( UpdateControllerLS_VehicleMod_HSensitivity );
+			m_ControllerRS_InvertSelector.m_OptionChanged.Insert( UpdateControllerRS_InvertView );
+			m_ControllerRS_VSensitivitySelector.m_OptionChanged.Insert( UpdateControllerRS_VSensitivity );
+			m_ControllerRS_HSensitivitySelector.m_OptionChanged.Insert( UpdateControllerRS_HSensitivity );
+			m_ControllerRS_CurvatureSelector.m_OptionChanged.Insert( UpdateControllerRS_Curvature );
+			m_ControllerRS_AimMod_VSensitivitySelector.m_OptionChanged.Insert( UpdateControllerRS_AimMod_VSensitivity );
+			m_ControllerRS_AimMod_HSensitivitySelector.m_OptionChanged.Insert( UpdateControllerRS_AimMod_HSensitivity );
+			m_ControllerRS_AimMod_CurvatureSelector.m_OptionChanged.Insert( UpdateControllerRS_AimMod_Curvature );
+		
+			ShowConsoleSensitivityOptions(m_KeyboardOption.GetIndex());
+		
+			bool MaKState = m_KeyboardSelector.IsEnabled() && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer();
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(m_Menu.ToggleDependentOptions,EDependentOptions.MOUSEANDKEYBOARD_QUICKBAR,MaKState);
+		#endif
+				
+		FillTextMap();
+		
+		float x, y, y2;
+		m_Root.FindAnyWidget( "controls_settings_scroll" ).GetScreenSize( x, y );
+		m_Root.FindAnyWidget( "controls_settings_root" ).GetScreenSize( x, y2 );
+		int f = ( y2 > y );
+		m_Root.FindAnyWidget( "controls_settings_scroll" ).SetAlpha( f );
+		
+		m_Root.SetHandler( this );
+	}
+	
+	string GetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			return "gui/layouts/new_ui/options/xbox/controls_tab.layout";
+		#else
+			return "gui/layouts/new_ui/options/pc/controls_tab.layout";
+		#endif
+	}
+	
+	void EnterKeybindingMenu()
+	{
+		m_Menu.EnterScriptedMenu( MENU_KEYBINDINGS );
+	}
+	
+	//! Focuses the first viable item
+	void Focus()
+	{
+		#ifdef PLATFORM_CONSOLE
+		if (m_KeyboardSelector && m_KeyboardSelector.IsSelectorEnabled())
+		{
+			m_KeyboardSelector.Focus();
+		}
+		else if (m_AimHelperSelector)
+		{
+			m_AimHelperSelector.Focus();
+		}
+		#endif
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if ( w && w.IsInherited( ScrollWidget ) )
+		{
+			return false;
+		}
+		
+		m_Menu.ColorHighlight( w );
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		if ( w && w.IsInherited( ScrollWidget ) )
+		{
+			return false;
+		}
+		
+		m_Menu.ColorNormal( w );
+		return true;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if( button == MouseState.LEFT )
+		{
+			#ifndef PLATFORM_CONSOLE
+			if( w == m_Keybindings )
+			{
+				EnterKeybindingMenu();
+				return true;
+			}
+			#endif
+		}
+		return false;
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		OptionsMenu menu = OptionsMenu.Cast( GetGame().GetUIManager().GetMenu() );
+		if( menu )
+		{
+			menu.OnFocus( w, x, y );
+		}
+		
+		if( w )
+		{
+			if (TextMapUpdateWidget(w.GetUserID())) 
+			{
+				return true;
+			}
+			
+			if( w.IsInherited( SliderWidget ) )
+			{
+				ColorRed( w );
+				return true;
+			}
+			
+			if( IsFocusable( w ) )
+			{
+				ColorRed( w );
+				return true;
+			}
+		}
+		else
+		{
+			m_DetailsRoot.Show( false );
+		}
+		return ( w != null );
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		if( IsFocusable( w ) )
+		{
+			ColorWhite( w, null );
+			return true;
+		}
+		return false;
+	}
+
+	bool IsFocusable( Widget w )
+	{
+		return w && (w.GetFlags() & ~WidgetFlags.NOFOCUS);
+	}
+	
+	bool TextMapUpdateWidget(int key)
+	{
+		bool connectivityInfoShown = key == OptionIDsScript.OPTION_CONNECTIVITY_INFO;
+		Param2<string, string> p;
+		Param tmp = m_TextMap.Get(key);
+		
+		m_DetailsBodyDefault.Show(!connectivityInfoShown);
+		m_DetailsBodyConnectivity.Show(connectivityInfoShown);
+		
+		if (Class.CastTo(p,tmp))
+		{
+			m_DetailsRoot.Show(true);
+			m_DetailsText.Show(true);
+			m_DetailsLabel.SetText(p.param1);
+			m_DetailsText.SetText(p.param2);
+			
+			m_DetailsText.Update();
+			m_DetailsLabel.Update();
+			m_DetailsRoot.Update();
+			m_DetailsBodyConnectivity.Update(); //...
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+			return ( ( m_KeyboardSelector.IsEnabled() && m_KeyboardOption.GetIndex() == 0 ) || ( !m_KeyboardSelector.IsEnabled() && m_KeyboardOption.GetIndex() == 1 ) );
+		#else
+			return false;
+		#endif
+	}
+	
+	void Apply()
+	{
+		#ifdef PLATFORM_CONSOLE
+		bool changed = false;
+		if (m_MaKOptionAvailable)
+		{
+			//on change
+			if ((m_KeyboardSelector.IsEnabled() && m_KeyboardOption.GetIndex() == 0) || (!m_KeyboardSelector.IsEnabled() && m_KeyboardOption.GetIndex() == 1))
+			{
+				m_KeyboardOption.Switch();
+				changed = true;
+			}
+		}
+		
+		Focus();
+		GetGame().GetUIManager().ShowUICursor( m_MaKOptionAvailable && m_KeyboardOption.GetIndex() );
+		if (changed)
+			g_Game.UpdateInputDeviceDisconnectWarning();
+		
+		m_Menu.Refresh();
+		#endif
+	}
+	
+	void Revert()
+	{
+		if( m_Mouse_InvertSelector )
+			m_Mouse_InvertSelector.SetValue( m_Mouse_InvertOption.GetIndex(), true );
+		if( m_Mouse_VSensitivitySelector )
+			m_Mouse_VSensitivitySelector.SetValue( m_Mouse_VSensitivityOption.ReadValue(), true );
+		if( m_Mouse_HSensitivitySelector )
+			m_Mouse_HSensitivitySelector.SetValue( m_Mouse_HSensitivityOption.ReadValue(), true );
+		if( m_Mouse_AimMod_VSensitivitySelector )
+			m_Mouse_AimMod_VSensitivitySelector.SetValue( m_Mouse_AimMod_VSensitivityOption.ReadValue(), true );
+		if( m_Mouse_AimMod_HSensitivitySelector )
+			m_Mouse_AimMod_HSensitivitySelector.SetValue( m_Mouse_AimMod_HSensitivityOption.ReadValue(), true );
+		
+
+		#ifdef PLATFORM_CONSOLE
+			if( m_KeyboardSelector )
+				m_KeyboardSelector.SetValue( m_KeyboardOption.GetIndex(), true );
+			if( m_AimHelperSelector )
+				m_AimHelperSelector.SetValue( m_AimHelperOption.GetIndex(), true );
+
+			if( m_ControllerLS_VSensitivitySelector )
+				m_ControllerLS_VSensitivitySelector.SetValue( m_ControllerLS_VSensitivityOption.ReadValue(), true );
+			if( m_ControllerLS_HSensitivitySelector )
+				m_ControllerLS_HSensitivitySelector.SetValue( m_ControllerLS_HSensitivityOption.ReadValue(), true );
+			if( m_ControllerLS_VehicleMod_HSensitivitySelector )
+				m_ControllerLS_VehicleMod_HSensitivitySelector.SetValue( m_ControllerLS_VehicleMod_HSensitivityOption.ReadValue(), true );
+			if( m_ControllerRS_InvertSelector )
+				m_ControllerRS_InvertSelector.SetValue( m_ControllerRS_InvertOption.GetIndex(), true );
+			if( m_ControllerRS_VSensitivitySelector )
+				m_ControllerRS_VSensitivitySelector.SetValue( m_ControllerRS_VSensitivityOption.ReadValue(), true );
+			if( m_ControllerRS_HSensitivitySelector )
+				m_ControllerRS_HSensitivitySelector.SetValue( m_ControllerRS_HSensitivityOption.ReadValue(), true );
+			if( m_ControllerRS_CurvatureSelector )
+				m_ControllerRS_CurvatureSelector.SetValue( m_ControllerRS_CurvatureOption.ReadValue(), true );
+			if( m_ControllerRS_AimMod_VSensitivitySelector )
+				m_ControllerRS_AimMod_VSensitivitySelector.SetValue( m_ControllerRS_AimMod_VSensitivityOption.ReadValue(), true );
+			if( m_ControllerRS_AimMod_HSensitivitySelector )
+				m_ControllerRS_AimMod_HSensitivitySelector.SetValue( m_ControllerRS_AimMod_HSensitivityOption.ReadValue(), true );
+			if( m_ControllerRS_AimMod_CurvatureSelector )
+				m_ControllerRS_AimMod_CurvatureSelector.SetValue( m_ControllerRS_AimMod_CurvatureOption.ReadValue(), true );
+		#endif		
+	}
+	
+	void SetToDefaults()
+	{
+		if( m_Mouse_InvertSelector )
+			m_Mouse_InvertSelector.SetValue( m_Mouse_InvertOption.GetDefaultIndex(), true );
+		if( m_Mouse_VSensitivitySelector )
+			m_Mouse_VSensitivitySelector.SetValue( m_Mouse_VSensitivityOption.GetDefault(), true );
+		if( m_Mouse_HSensitivitySelector )
+			m_Mouse_HSensitivitySelector.SetValue( m_Mouse_HSensitivityOption.GetDefault(), true );
+		if( m_Mouse_AimMod_VSensitivitySelector )
+			m_Mouse_AimMod_VSensitivitySelector.SetValue( m_Mouse_AimMod_VSensitivityOption.GetDefault(), true );
+		if( m_Mouse_AimMod_HSensitivitySelector )
+			m_Mouse_AimMod_HSensitivitySelector.SetValue( m_Mouse_AimMod_HSensitivityOption.GetDefault(), true );
+
+		#ifdef PLATFORM_CONSOLE
+			if( m_KeyboardSelector )
+				m_KeyboardSelector.SetValue( m_KeyboardOption.GetDefaultIndex(), true );
+			if( m_AimHelperSelector )
+				m_AimHelperSelector.SetValue( m_AimHelperOption.GetDefaultIndex(), true );
+	
+			if( m_ControllerLS_VSensitivitySelector )
+				m_ControllerLS_VSensitivitySelector.SetValue( m_ControllerLS_VSensitivityOption.GetDefault(), true );
+			if( m_ControllerLS_HSensitivitySelector )
+				m_ControllerLS_HSensitivitySelector.SetValue( m_ControllerLS_HSensitivityOption.GetDefault(), true );
+			if( m_ControllerLS_VehicleMod_HSensitivitySelector )
+				m_ControllerLS_VehicleMod_HSensitivitySelector.SetValue( m_ControllerLS_VehicleMod_HSensitivityOption.GetDefault(), true );
+			if( m_ControllerRS_InvertSelector )
+				m_ControllerRS_InvertSelector.SetValue( m_ControllerRS_InvertOption.GetDefaultIndex(), true );
+			if( m_ControllerRS_VSensitivitySelector )
+				m_ControllerRS_VSensitivitySelector.SetValue( m_ControllerRS_VSensitivityOption.GetDefault(), true );
+			if( m_ControllerRS_HSensitivitySelector )
+				m_ControllerRS_HSensitivitySelector.SetValue( m_ControllerRS_HSensitivityOption.GetDefault(), true );
+			if( m_ControllerRS_CurvatureSelector )
+				m_ControllerRS_CurvatureSelector.SetValue( m_ControllerRS_CurvatureOption.GetDefault(), true );
+			if( m_ControllerRS_AimMod_VSensitivitySelector )
+				m_ControllerRS_AimMod_VSensitivitySelector.SetValue( m_ControllerRS_AimMod_VSensitivityOption.GetDefault(), true );
+			if( m_ControllerRS_AimMod_HSensitivitySelector )
+				m_ControllerRS_AimMod_HSensitivitySelector.SetValue( m_ControllerRS_AimMod_HSensitivityOption.GetDefault(), true );
+			if( m_ControllerRS_AimMod_CurvatureSelector )
+				m_ControllerRS_AimMod_CurvatureSelector.SetValue( m_ControllerRS_AimMod_CurvatureOption.GetDefault(), true );
+		
+			Focus();
+		#endif
+		
+	}
+	
+#ifdef PLATFORM_CONSOLE
+	void ShowConsoleSensitivityOptions(int index)
+	{
+		m_ConsoleMouseSensitivityWidget.Show(index == 1 && m_MaKOptionAvailable);
+	}
+	
+	void UpdateKeyboard( int index )
+	{
+		Focus();
+		ShowConsoleSensitivityOptions(index);
+		m_Menu.OnChanged();
+		//m_Menu.ToggleDependentOptions(EDependentOptions.MOUSEANDKEYBOARD_QUICKBAR,index == 1 && GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer());
+	}
+	
+	void UpdateAimHelper( int index )
+	{
+		if ( m_AimHelperOption.GetIndex() != index )
+		{
+			m_AimHelperOption.Switch();
+			m_Menu.OnChanged();
+		}
+	}
+	
+	void UpdateControllerLS_VSensitivity( float value )
+	{
+		m_ControllerLS_VSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateControllerLS_HSensitivity( float value )
+	{
+		m_ControllerLS_HSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateControllerLS_VehicleMod_HSensitivity( float value )
+	{
+		m_ControllerLS_VehicleMod_HSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+
+	void UpdateControllerRS_InvertView( int index )
+	{
+		if ( m_ControllerRS_InvertOption.GetIndex() != index )
+		{
+			m_ControllerRS_InvertOption.Switch();
+			m_Menu.OnChanged();
+		}
+	}
+	
+	void UpdateControllerRS_VSensitivity( float value )
+	{
+		m_ControllerRS_VSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateControllerRS_HSensitivity( float value )
+	{
+		m_ControllerRS_HSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateControllerRS_Curvature( float value )
+	{
+		m_ControllerRS_CurvatureOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+
+	void UpdateControllerRS_AimMod_VSensitivity( float value )
+	{
+		m_ControllerRS_AimMod_VSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateControllerRS_AimMod_HSensitivity( float value )
+	{
+		m_ControllerRS_AimMod_HSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateControllerRS_AimMod_Curvature( float value )
+	{
+		m_ControllerRS_AimMod_CurvatureOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+#endif
+	
+	void UpdateMouseInvertView( int index )
+	{
+		if ( m_Mouse_InvertOption.GetIndex() != index )
+		{
+			m_Mouse_InvertOption.Switch();
+			m_Menu.OnChanged();
+		}
+	}
+	
+	void UpdateMouseVSensitivity( float value )
+	{
+		m_Mouse_VSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateMouseHSensitivity( float value )
+	{
+		m_Mouse_HSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateMouseAimModVSensitivity( float value )
+	{
+		m_Mouse_AimMod_VSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateMouseAimModHSensitivity( float value )
+	{
+		m_Mouse_AimMod_HSensitivityOption.WriteValue( value );
+		m_Menu.OnChanged();
+	}
+	
+	void ReloadOptions()
+	{
+		m_Menu.ReloadOptions();
+	}
+	
+	void SetOptions( GameOptions options )
+	{
+		m_Options = options;
+
+		// mouse (PC & consoles)		
+		m_Mouse_InvertOption							= SwitchOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS_INVERTED ) );
+		m_Mouse_VSensitivityOption						= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS ) );
+		m_Mouse_HSensitivityOption						= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_MOUSE_XAXIS ) );
+		m_Mouse_AimMod_VSensitivityOption				= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS_AIM_MOD ) );
+		m_Mouse_AimMod_HSensitivityOption				= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_MOUSE_XAXIS_AIM_MOD ) );
+		
+		// controller (consoles only)
+		#ifdef PLATFORM_CONSOLE
+			m_KeyboardOption							= SwitchOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_MOUSE_AND_KEYBOARD ) );
+			m_AimHelperOption							= SwitchOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_AIM_HELPER ) );
+
+			m_ControllerLS_VSensitivityOption			= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_YAXIS ) );
+			m_ControllerLS_HSensitivityOption			= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_XAXIS ) );
+			m_ControllerLS_VehicleMod_HSensitivityOption = NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_XAXIS_VEHICLE_MOD ) );
+			m_ControllerRS_InvertOption					= SwitchOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS_INVERTED ) );
+			m_ControllerRS_VSensitivityOption			= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS ) );
+			m_ControllerRS_HSensitivityOption			= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_XAXIS ) );
+			m_ControllerRS_CurvatureOption				= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_CURVATURE ) );
+			m_ControllerRS_AimMod_VSensitivityOption	= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS_AIM_MOD ) );
+			m_ControllerRS_AimMod_HSensitivityOption	= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_XAXIS_AIM_MOD ) );
+			m_ControllerRS_AimMod_CurvatureOption		= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_CURVATURE_AIM_MOD ) );
+		#endif
+				
+		Revert();
+	}
+	
+	void ToggleDependentOptions(int mode, bool state)
+	{
+	}
+	
+	void InitDependentOptionsVisibility()
+	{
+	}
+	
+	void FillTextMap()
+	{
+		m_TextMap = new map<int, ref Param2<string, string>>;
+		m_TextMap.Insert( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS_INVERTED, new Param2<string, string>( "#STR_Invert_Vertical_tip_header", "#STR_Invert_Vertical_tip" ) );
+		m_TextMap.Insert( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS, new Param2<string, string>( "#STR_Camera_V_Sensitivity_tip_header", "#STR_Camera_V_Sensitivity_tip" ) );
+		m_TextMap.Insert( OptionAccessType.AT_OPTIONS_MOUSE_XAXIS, new Param2<string, string>( "#STR_Camera_H_Sensitivity_tip_header", "#STR_Camera_H_Sensitivity_tip" ) );
+		m_TextMap.Insert( OptionAccessType.AT_OPTIONS_MOUSE_YAXIS_AIM_MOD, new Param2<string, string>( "#STR_Aiming_V_Sensitivity_tip_header", "#STR_Aiming_V_Sensitivity_tip" ) );
+		m_TextMap.Insert( OptionAccessType.AT_OPTIONS_MOUSE_XAXIS_AIM_MOD, new Param2<string, string>( "#STR_Aiming_H_Sensitivity_tip_header", "#STR_Aiming_H_Sensitivity_tip" ) );
+
+		#ifdef PLATFORM_CONSOLE
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_MOUSE_AND_KEYBOARD, new Param2<string, string>( "#xbox_options_controls_mandk_contr", "#xbox_options_controls_mandk_contr_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_AIM_HELPER, new Param2<string, string>( "#ps4_options_controls_aim_helper_contr", "#ps4_options_controls_aim_helper_contr_desc" ) );
+			
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_YAXIS, new Param2<string, string>( "#STR_Movement_V_Sensitivity_tip_header", "#STR_Movement_V_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_XAXIS, new Param2<string, string>( "#STR_Movement_H_Sensitivity_tip_header", "#STR_Movement_H_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_LS_XAXIS_VEHICLE_MOD, new Param2<string, string>( "#STR_Movement_Vehicle_Sensitivity_tip_header", "#STR_Movement_Vehicle_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS_INVERTED, new Param2<string, string>( "#STR_Invert_Vertical_tip_header", "#STR_Invert_Vertical_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS, new Param2<string, string>( "#STR_Camera_V_Sensitivity_tip_header", "#STR_Camera_V_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_XAXIS, new Param2<string, string>( "#STR_Camera_H_Sensitivity_tip_header", "#STR_Camera_H_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_CURVATURE, new Param2<string, string>( "#STR_Camera_Curvature_tip_header", "#STR_Camera_Curvature_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_YAXIS_AIM_MOD, new Param2<string, string>( "#STR_Aiming_V_Sensitivity_tip_header", "#STR_Aiming_V_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_XAXIS_AIM_MOD, new Param2<string, string>( "#STR_Aiming_H_Sensitivity_tip_header", "#STR_Aiming_H_Sensitivity_tip" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_CONTROLLER_RS_CURVATURE_AIM_MOD, new Param2<string, string>( "#STR_Aiming_Curvature_tip_header", "#STR_Camera_Curvature_tip" ) );
+		#endif
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorRed( Widget w )
+	{
+		SetFocus( w );
+		ButtonWidget button;
+		if (Class.CastTo(button,w))
+		{
+			button.SetTextColor( ARGB( 255, 255, 0, 0 ) );
+			button.SetAlpha( 0.9 );
+		}
+	}
+	
+	void ColorWhite( Widget w, Widget enterW )
+	{
+		ButtonWidget button;
+		if (Class.CastTo(button,w))
+		{
+			button.SetTextColor( ARGB( 255, 255, 255, 255 ) );
+			button.SetAlpha( 0.0 );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuGame.c b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuGame.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf0e5da2419aae30174cee64e6808740288adf2d
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuGame.c
@@ -0,0 +1,607 @@
+class OptionsMenuGame extends ScriptedWidgetEventHandler
+{
+	private const float HUD_BRIGHTNESS_MIN = -1.0;
+	private const float HUD_BRIGHTNESS_MAX = 0.0;
+
+	protected Widget						m_Root;
+	
+	protected Widget						m_SettingsRoot;
+	protected Widget						m_DetailsRoot;
+	protected Widget						m_DetailsBodyDefault;
+	protected Widget						m_DetailsBodyConnectivity;
+	protected TextWidget					m_DetailsLabel;
+	protected RichTextWidget				m_DetailsText;
+	protected ButtonWidget					m_QuickbarButton;
+	
+	protected ref NumericOptionsAccess		m_FOVOption;
+	protected ref ListOptionsAccess			m_LanguageOption;
+	protected ref ListOptionsAccess			m_PauseOption;
+	#ifdef PLATFORM_CONSOLE
+	protected ref NumericOptionsAccess		m_BrightnessOption;
+	protected ref OptionSelectorSlider		m_BrightnessSelector;
+	#endif
+	
+	protected ref OptionSelectorMultistate	m_LanguageSelector;
+	protected ref OptionSelectorSlider		m_FOVSelector;
+	protected ref OptionSelectorMultistate	m_ShowHUDSelector;
+	protected ref OptionSelectorMultistate	m_ShowCrosshairSelector;
+	protected ref OptionSelectorMultistate	m_ShowQuickbarSelector;
+	protected ref OptionSelectorMultistate	m_ShowGameSelector;
+	protected ref OptionSelectorMultistate	m_ShowAdminSelector;
+	protected ref OptionSelectorMultistate	m_ShowPlayerSelector;
+	protected ref OptionSelectorMultistate 	m_ShowServerInfoSelector;
+	protected ref OptionSelectorMultistate 	m_BleedingIndication;
+	protected ref OptionSelectorMultistate 	m_ConnectivityInfo;
+	protected ref OptionSelectorSlider		m_HUDBrightnessSelector;
+	protected ref OptionSelectorMultistate	m_PauseSelector;
+	
+	protected GameOptions					m_Options;
+	protected OptionsMenu					m_Menu;
+	
+	protected ref map<int, ref Param2<string, string>> m_TextMap;
+	
+	void OptionsMenuGame(Widget parent, Widget details_root, GameOptions options, OptionsMenu menu)
+	{
+		m_Root						= GetGame().GetWorkspace().CreateWidgets(GetLayoutName(), parent);
+		
+		m_DetailsRoot				= details_root;
+		m_DetailsBodyDefault 		= m_DetailsRoot.FindAnyWidget("settings_details_body");
+		m_DetailsBodyConnectivity 	= m_DetailsRoot.FindAnyWidget("settings_details_body_connectivity");
+		m_DetailsLabel				= TextWidget.Cast(m_DetailsRoot.FindAnyWidget("details_label"));
+		m_DetailsText				= RichTextWidget.Cast(m_DetailsRoot.FindAnyWidget("details_content"));
+		
+		m_Options					= options;
+		m_Menu						= menu;
+		
+		m_FOVOption					= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_FIELD_OF_VIEW));
+		m_LanguageOption			= ListOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_LANGUAGE));
+		m_PauseOption				= ListOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_PAUSE));
+		
+		m_Root.FindAnyWidget("fov_setting_option").SetUserID(OptionAccessType.AT_OPTIONS_FIELD_OF_VIEW);
+		m_Root.FindAnyWidget("hud_setting_option").SetUserID(OptionIDsScript.OPTION_HUD);
+		m_Root.FindAnyWidget("hud_brightness_setting_option").SetUserID(OptionIDsScript.OPTION_HUD_BRIGHTNESS);
+		m_Root.FindAnyWidget("crosshair_setting_option").SetUserID(OptionIDsScript.OPTION_CROSSHAIR);
+		m_Root.FindAnyWidget("game_setting_option").SetUserID(OptionIDsScript.OPTION_GAME_MESSAGES);
+		m_Root.FindAnyWidget("admin_setting_option").SetUserID(OptionIDsScript.OPTION_ADMIN_MESSAGES);
+		m_Root.FindAnyWidget("player_setting_option").SetUserID(OptionIDsScript.OPTION_PLAYER_MESSAGES);
+		m_Root.FindAnyWidget("language_setting_option").SetUserID(OptionAccessType.AT_OPTIONS_LANGUAGE);
+		m_Root.FindAnyWidget("bleeding_indication_setting_option").SetUserID(OptionIDsScript.OPTION_BLEEDINGINDICATION);
+		m_Root.FindAnyWidget("connectivity_setting_option").SetUserID(OptionIDsScript.OPTION_CONNECTIVITY_INFO);
+		m_Root.FindAnyWidget("quickbar_setting_option").SetUserID(OptionIDsScript.OPTION_QUICKBAR);
+		
+		#ifdef PLATFORM_CONSOLE
+		m_QuickbarButton = ButtonWidget.Cast(m_Root.FindAnyWidget("quickbar_button"));
+		m_Root.FindAnyWidget("brightness_setting_option").SetUserID(OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER);
+		#else
+		m_Root.FindAnyWidget("serverinfo_setting_option").SetUserID(OptionIDsScript.OPTION_SERVER_INFO);
+		m_Root.FindAnyWidget("pause_setting_option").SetUserID(OptionAccessType.AT_OPTIONS_PAUSE);
+		#endif
+		
+		FillTextMap();
+		
+		array<string> opt		= { "#options_controls_disabled", "#options_controls_enabled" };
+		array<string> opt2		= { "#options_controls_enabled", "#options_controls_disabled" };
+		array<string> opt3		= new array<string>;
+		for (int i = 0; i < m_LanguageOption.GetItemsCount(); ++i)
+		{
+			string text;
+			m_LanguageOption.GetItemText(i, text);
+			opt3.Insert(text);
+		}
+		
+		array<string> opt4		= { "#options_pc_nopause_0", "#options_pc_nopause_1", "#options_pc_nopause_2" }; // Pause options menu strings
+		
+		m_LanguageSelector			= new OptionSelectorMultistate(m_Root.FindAnyWidget("language_setting_option"), m_LanguageOption.GetIndex(), this, false, opt3);
+		m_FOVSelector				= new OptionSelectorSlider(m_Root.FindAnyWidget("fov_setting_option"), m_FOVOption.ReadValue(), this, false, m_FOVOption.GetMin(), m_FOVOption.GetMax());
+		m_ShowHUDSelector			= new OptionSelectorMultistate(m_Root.FindAnyWidget("hud_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.HUD), this, false, opt);
+		m_HUDBrightnessSelector		= new OptionSelectorSlider(m_Root.FindAnyWidget("hud_brightness_setting_option"), g_Game.GetProfileOptionFloat(EDayZProfilesOptions.HUD_BRIGHTNESS), this, false, HUD_BRIGHTNESS_MIN, HUD_BRIGHTNESS_MAX);
+		m_ShowCrosshairSelector		= new OptionSelectorMultistate(m_Root.FindAnyWidget("crosshair_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.CROSSHAIR), this, false, opt);
+		m_ShowGameSelector			= new OptionSelectorMultistate(m_Root.FindAnyWidget("game_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.GAME_MESSAGES), this, false, opt2);
+		m_ShowAdminSelector			= new OptionSelectorMultistate(m_Root.FindAnyWidget("admin_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.ADMIN_MESSAGES), this, false, opt2);
+		m_ShowPlayerSelector		= new OptionSelectorMultistate(m_Root.FindAnyWidget("player_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.PLAYER_MESSAGES), this, false, opt2);
+		m_BleedingIndication		= new OptionSelectorMultistate(m_Root.FindAnyWidget("bleeding_indication_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.BLEEDINGINDICATION), this, false, opt);
+		m_ConnectivityInfo			= new OptionSelectorMultistate(m_Root.FindAnyWidget("connectivity_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.CONNECTIVITY_INFO), this, false, opt);
+		m_ShowQuickbarSelector		= new OptionSelectorMultistate(m_Root.FindAnyWidget("quickbar_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.QUICKBAR), this, false, opt);
+		
+		m_LanguageSelector.m_OptionChanged.Insert(UpdateLanguageOption);
+		m_FOVSelector.m_OptionChanged.Insert(UpdateFOVOption);
+		m_ShowHUDSelector.m_OptionChanged.Insert(UpdateHUDOption);
+		m_HUDBrightnessSelector.m_OptionChanged.Insert(UpdateHUDBrightnessOption);
+		m_ShowCrosshairSelector.m_OptionChanged.Insert(UpdateCrosshairOption);
+		m_ShowGameSelector.m_OptionChanged.Insert(UpdateGameOption);
+		m_ShowAdminSelector.m_OptionChanged.Insert(UpdateAdminOption);
+		m_ShowPlayerSelector.m_OptionChanged.Insert(UpdatePlayerOption);
+		m_BleedingIndication.m_OptionChanged.Insert(UpdateBleedingIndication);
+		m_ConnectivityInfo.m_OptionChanged.Insert(UpdateConnectivityInfo);
+		m_ShowQuickbarSelector.m_OptionChanged.Insert(UpdateQuickbarOption);
+		
+		#ifdef PLATFORM_CONSOLE
+		m_BrightnessOption		= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER));
+		m_BrightnessSelector	= new OptionSelectorSlider(m_Root.FindAnyWidget("brightness_setting_option"), m_BrightnessOption.ReadValue(), this, false, m_BrightnessOption.GetMin(), m_BrightnessOption.GetMax());
+		m_BrightnessSelector.m_OptionChanged.Insert(UpdateBrightnessOption);
+		#else
+		m_ShowServerInfoSelector	= new OptionSelectorMultistate(m_Root.FindAnyWidget("serverinfo_setting_option"), g_Game.GetProfileOptionBool(EDayZProfilesOptions.SERVERINFO_DISPLAY), this, false, opt);
+		m_PauseSelector				= new OptionSelectorMultistate(m_Root.FindAnyWidget("pause_setting_option"), m_PauseOption.GetIndex(), this, false, opt4);
+			
+		m_ShowServerInfoSelector.m_OptionChanged.Insert(UpdateServerInfoOption);
+		m_PauseSelector.m_OptionChanged.Insert(UpdatePauseOption);
+		#endif
+		
+		float x, y, y2;
+		m_Root.FindAnyWidget("game_settings_scroll").GetScreenSize(x, y);
+		m_Root.FindAnyWidget("game_settings_root").GetScreenSize(x, y2);
+		int f = (y2 > y);
+		m_Root.FindAnyWidget("game_settings_scroll").SetAlpha(f);
+		
+		m_Root.SetHandler(this);
+		m_DetailsRoot.Show(false);
+		
+		InitDependentOptionsVisibility();
+	}
+	
+	void ~OptionsMenuGame()
+	{
+		if (m_FOVOption)
+		{
+			m_FOVOption.Revert();
+			g_Game.SetUserFOV(m_FOVOption.ReadValue());
+		}
+		
+		RevertHUDBrightness();
+	}
+	
+	string GetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+		return "gui/layouts/new_ui/options/xbox/game_tab.layout";
+		#else
+		return "gui/layouts/new_ui/options/pc/game_tab.layout";
+		#endif
+	}
+	
+	void Focus()
+	{
+		#ifdef PLATFORM_CONSOLE
+		SetFocus(m_LanguageSelector.GetParent());
+		#endif
+	}
+	
+	bool IsChanged()
+	{
+		bool universal = (m_ShowHUDSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.HUD) || m_ShowCrosshairSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.CROSSHAIR));
+		universal = universal || m_HUDBrightnessSelector.GetValue() != g_Game.GetProfileOptionFloat(EDayZProfilesOptions.HUD_BRIGHTNESS);
+		universal = universal || (m_ShowGameSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.GAME_MESSAGES) || m_ShowAdminSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.ADMIN_MESSAGES));
+		universal = universal || m_ShowPlayerSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.PLAYER_MESSAGES);
+		universal = universal || m_BleedingIndication.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.BLEEDINGINDICATION);
+		universal = universal || m_ConnectivityInfo.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.CONNECTIVITY_INFO);
+		universal = universal || m_LanguageOption.IsChanged();
+		
+		#ifdef PLATFORM_CONSOLE
+		return universal;
+		#else
+		return (universal || m_ShowQuickbarSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.QUICKBAR) || m_ShowServerInfoSelector.GetValue() != g_Game.GetProfileOptionBool(EDayZProfilesOptions.SERVERINFO_DISPLAY));
+		#endif
+	}
+	
+	void Apply()
+	{
+		IngameHud hud = GetHud();
+		InGameMenu menu = InGameMenu.Cast(GetGame().GetUIManager().FindMenu(MENU_INGAME));
+		MissionGameplay mission = MissionGameplay.Cast(GetGame().GetMission());
+		
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.HUD, m_ShowHUDSelector.GetValue());
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.CROSSHAIR, m_ShowCrosshairSelector.GetValue());
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.GAME_MESSAGES, m_ShowGameSelector.GetValue());
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.ADMIN_MESSAGES, m_ShowAdminSelector.GetValue());
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.PLAYER_MESSAGES, m_ShowPlayerSelector.GetValue());
+		g_Game.SetProfileOptionFloat(EDayZProfilesOptions.HUD_BRIGHTNESS, m_HUDBrightnessSelector.GetValue());
+		
+		#ifndef PLATFORM_CONSOLE
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.QUICKBAR, m_ShowQuickbarSelector.GetValue());
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.SERVERINFO_DISPLAY, m_ShowServerInfoSelector.GetValue());
+		#endif
+		
+		if (hud)
+		{
+			#ifndef PLATFORM_CONSOLE
+			hud.ShowQuickBar(m_ShowQuickbarSelector.GetValue());
+			#else
+			hud.ShowQuickBar(GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer());
+			#endif
+			hud.ShowHud(m_ShowHUDSelector.GetValue());
+		}
+		
+		bool bleedingIndicationOld = g_Game.GetProfileOptionBool(EDayZProfilesOptions.BLEEDINGINDICATION);
+		bool bleedingIndicationNew = m_BleedingIndication.GetValue();
+		bool connectivityOld = g_Game.GetProfileOptionBool(EDayZProfilesOptions.CONNECTIVITY_INFO);
+		bool connectivityNew = m_ConnectivityInfo.GetValue();
+		
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.BLEEDINGINDICATION, bleedingIndicationNew);
+		g_Game.SetProfileOptionBool(EDayZProfilesOptions.CONNECTIVITY_INFO, connectivityNew);
+		
+		if (mission)
+		{
+			//BLEEDINGINDICATION changed
+			if (bleedingIndicationOld != bleedingIndicationNew)
+			{
+				OnBleedingIndicationChanged(bleedingIndicationNew);
+			}
+			
+			//CONNECTIVITY_INFO changed
+			if (connectivityOld != connectivityNew)
+			{
+				mission.GetConnectivityInvoker().Invoke(connectivityNew);
+			}
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+		if (menu)
+		{
+			menu.SetServerInfoVisibility(m_ShowServerInfoSelector.GetValue());
+		}
+		#endif
+		
+		if (m_LanguageOption.IsChanged()) //language changed
+		{
+			if (mission)
+			{
+				mission.ResetGUI();
+			}
+			else
+			{
+				ErrorEx("mission not found!", ErrorExSeverity.INFO);
+			}
+		}
+	}
+	
+	void Revert()
+	{
+		if (m_ShowHUDSelector)
+			m_ShowHUDSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.HUD), false);
+		
+		RevertHUDBrightness();
+
+		if (m_ShowCrosshairSelector)
+			m_ShowCrosshairSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.CROSSHAIR), false);
+		if (m_FOVOption)
+		{
+			m_FOVSelector.SetValue(m_FOVOption.ReadValue(), false);
+			g_Game.SetUserFOV(m_FOVOption.ReadValue());
+		}
+		if (m_LanguageOption)
+			m_LanguageSelector.SetValue(m_LanguageOption.GetIndex(), false);
+		if (m_ShowGameSelector)
+			m_ShowGameSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.GAME_MESSAGES), false);
+		if (m_ShowAdminSelector)
+			m_ShowAdminSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.ADMIN_MESSAGES), false);
+		if (m_ShowPlayerSelector)
+			m_ShowPlayerSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.PLAYER_MESSAGES), false);
+		if (m_BleedingIndication)
+			m_BleedingIndication.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.BLEEDINGINDICATION), false);
+		if (m_ConnectivityInfo)
+			m_ConnectivityInfo.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.CONNECTIVITY_INFO), false);
+		
+		#ifdef PLATFORM_CONSOLE
+			if (m_BrightnessSelector)
+				m_BrightnessSelector.SetValue(m_BrightnessOption.ReadValue(), false);
+		#else
+			if (m_ShowQuickbarSelector)
+				m_ShowQuickbarSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.QUICKBAR), false);
+			if (m_ShowServerInfoSelector)
+				m_ShowServerInfoSelector.SetValue(g_Game.GetProfileOptionBool(EDayZProfilesOptions.SERVERINFO_DISPLAY), false);
+			if (m_PauseOption)
+			{
+				m_PauseSelector.SetValue(m_PauseOption.GetIndex(), false);
+			}
+		#endif
+	}
+	
+	void SetToDefaults()
+	{
+		g_Game.ResetProfileOptions();
+		
+		if (m_ShowHUDSelector)
+			m_ShowHUDSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.HUD), false);
+
+		if (m_HUDBrightnessSelector)
+		{
+			m_HUDBrightnessSelector.SetValue(g_Game.GetProfileOptionDefaultFloat(EDayZProfilesOptions.HUD_BRIGHTNESS), false);
+			g_Game.SetHudBrightness(m_HUDBrightnessSelector.GetValue());
+		}
+
+		if (m_ShowCrosshairSelector)
+			m_ShowCrosshairSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.CROSSHAIR), false);
+
+		if (m_FOVOption)
+		{
+			m_FOVOption.WriteValue(m_FOVOption.GetDefault());
+			m_FOVSelector.SetValue(m_FOVOption.ReadValue(), false);
+			g_Game.SetUserFOV(m_FOVOption.GetDefault());
+		}
+		if (m_ShowGameSelector)
+			m_ShowGameSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.GAME_MESSAGES), false);
+		if (m_ShowAdminSelector)
+			m_ShowAdminSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.ADMIN_MESSAGES), false);
+		if (m_ShowPlayerSelector)
+			m_ShowPlayerSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.PLAYER_MESSAGES), false);
+		if (m_BleedingIndication)
+			m_BleedingIndication.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.BLEEDINGINDICATION), false);
+		if (m_ConnectivityInfo)
+			m_ConnectivityInfo.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.CONNECTIVITY_INFO), false);
+		
+		#ifdef PLATFORM_CONSOLE
+			if (m_BrightnessSelector)
+			{
+				m_BrightnessOption.WriteValue(m_BrightnessOption.GetDefault());
+				m_BrightnessSelector.SetValue(m_BrightnessOption.GetDefault(), false);
+			}
+		#else
+			if (m_ShowQuickbarSelector)
+				m_ShowQuickbarSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.QUICKBAR), false);
+			if (m_ShowServerInfoSelector)
+				m_ShowServerInfoSelector.SetValue(g_Game.GetProfileOptionDefaultBool(EDayZProfilesOptions.SERVERINFO_DISPLAY), false);
+			if (m_PauseOption)
+			{
+				m_PauseOption.SetIndex(m_PauseOption.GetDefaultIndex());
+				m_PauseSelector.SetValue(m_PauseOption.GetIndex(), false);
+			}
+		#endif
+	}
+	
+	void ReloadOptions()
+	{
+		m_Menu.ReloadOptions();
+	}
+	
+	void SetOptions(GameOptions options)
+	{
+		m_Options = options;
+		
+		m_FOVOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_FIELD_OF_VIEW));
+		m_LanguageOption	= ListOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_LANGUAGE));
+		
+		if (m_FOVSelector)
+			m_FOVSelector.SetValue(m_FOVOption.ReadValue(), false);
+		
+		if (m_LanguageOption)
+			m_LanguageSelector.SetValue(m_LanguageOption.GetIndex(), false);
+		
+		#ifdef PLATFORM_CONSOLE
+			m_BrightnessOption	= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER));
+			if (m_BrightnessOption)
+				m_BrightnessSelector.SetValue(m_BrightnessOption.ReadValue(), false);
+		#endif
+	}
+	
+	void ToggleDependentOptions(int mode, bool state)
+	{
+	}
+	
+	void InitDependentOptionsVisibility()
+	{
+		#ifdef PLATFORM_CONSOLE
+		m_QuickbarButton.Show(false);
+		#endif
+	}
+	
+	protected void UpdateLanguageOption(int new_index)
+	{
+		m_LanguageOption.SetIndex(new_index);
+		m_Menu.OnChanged();
+
+		TextMapUpdateWidget(OptionAccessType.AT_OPTIONS_LANGUAGE);
+	}
+	
+	protected void UpdatePauseOption(int new_index)
+	{
+		m_PauseOption.SetIndex(new_index);
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateFOVOption(float new_value)
+	{
+		m_FOVOption.WriteValue(new_value);
+		g_Game.SetUserFOV(new_value);
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateHUDBrightnessOption(float newValue)
+	{
+		g_Game.SetHudBrightness(newValue);
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateHUDOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateBleedingIndication(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateConnectivityInfo(int newIndex)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateCrosshairOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateQuickbarOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateGameOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateAdminOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdatePlayerOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	protected void UpdateServerInfoOption(int new_index)
+	{
+		m_Menu.OnChanged();
+	}
+	
+	IngameHud GetHud()
+	{
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			return hud;
+		}
+		return null;
+	}
+	
+#ifdef PLATFORM_CONSOLE
+	void UpdateBrightnessOption(float value)
+	{
+		m_BrightnessOption.WriteValue(value);
+		m_Menu.OnChanged();
+	}
+#endif
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (w && w.IsInherited(ScrollWidget))
+		{
+			return false;
+		}
+		
+		if (w && w.IsInherited(SliderWidget))
+		{
+			return false;
+		}
+		
+		m_Menu.ColorHighlight(w);
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (w && w.IsInherited(ScrollWidget))
+		{
+			return false;
+		}
+		
+		m_Menu.ColorNormal(w);
+		return true;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (m_Menu)
+		{
+			m_Menu.OnFocus(w, x, y);
+		}
+		
+		if (w)
+		{
+			if (TextMapUpdateWidget(w.GetUserID())) 
+			{
+				return true;
+			}
+			
+			if (w.IsInherited(SliderWidget))
+			{
+				return true;
+			}
+		}
+		m_DetailsRoot.Show(false);
+		return (w != null);
+	}
+	
+	protected void OnBleedingIndicationChanged(bool state)
+	{
+		MissionGameplay mission = MissionGameplay.Cast(GetGame().GetMission());
+		if (mission)
+		{
+			Param1<bool> par = new Param1<bool>(state);
+			mission.GetEffectWidgets().UpdateWidgets(EffectWidgetsTypes.BLEEDING_LAYER,0,par);
+		}
+	}
+	
+	bool TextMapUpdateWidget(int key)
+	{
+		bool connectivityInfoShown = key == OptionIDsScript.OPTION_CONNECTIVITY_INFO;
+		Param2<string, string> p;
+		Param tmp = m_TextMap.Get(key);
+		
+		m_DetailsBodyDefault.Show(!connectivityInfoShown);
+		m_DetailsBodyConnectivity.Show(connectivityInfoShown);
+		
+		if (Class.CastTo(p,tmp))
+		{
+			m_DetailsRoot.Show(true);
+			m_DetailsText.Show(true);
+			m_DetailsLabel.SetText(p.param1);
+			m_DetailsText.SetText(p.param2);
+			
+			m_DetailsText.Update();
+			m_DetailsLabel.Update();
+			m_DetailsRoot.Update();
+			m_DetailsBodyConnectivity.Update(); //...
+			return true;
+		}
+		return false;
+	}
+	
+	void FillTextMap()
+	{
+		m_TextMap = new map<int, ref Param2<string, string>>;
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_LANGUAGE, new Param2<string, string>("#options_game_select_language", "#options_game_select_language_desc"));
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_FIELD_OF_VIEW, new Param2<string, string>("#options_game_field_of_view", "#options_game_field_of_view_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_HUD, new Param2<string, string>("#options_game_show_HUD", "#options_game_show_HUD_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_HUD_BRIGHTNESS, new Param2<string, string>("#options_game_hud_brightness", "#options_game_hud_brightness_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_CROSSHAIR, new Param2<string, string>("#options_game_show_crosshair", "#options_game_show_crosshair_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_QUICKBAR, new Param2<string, string>("#options_game_show_quickbar",	"#options_game_show_quickbar_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_SERVER_INFO, new Param2<string, string>("#options_game_show_serverinfo", "#options_game_show_serverinfo_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_BLEEDINGINDICATION, new Param2<string, string>("#options_game_show_bleedingindication", "#options_game_show_bleedingindication_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_CONNECTIVITY_INFO, new Param2<string, string>("#options_game_connectivity", ""));
+	
+		#ifdef PLATFORM_WINDOWS
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_PAUSE, new Param2<string, string>("#layout_options_pc_nopause_title", "#layout_options_pc_nopause_tooltip"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_GAME_MESSAGES, new Param2<string, string>("#options_pc_game_messages",	"#options_game_show_game_msg"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_ADMIN_MESSAGES, new Param2<string, string>("#options_pc_admin_mes",		"#options_game_show_admin_msg"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_PLAYER_MESSAGES, new Param2<string, string>("#options_pc_player_messages",	"#options_game_show_player_msg"));
+		#else
+		#ifdef PLATFORM_XBOX
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER, new Param2<string, string>("#options_video_brightness", "#options_video_brightness_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_GAME_MESSAGES, new Param2<string, string>("#options_xbox_game_messages",	"#options_game_show_game_msg"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_ADMIN_MESSAGES, new Param2<string, string>("#options_xbox_admin_mes",		"#options_game_show_admin_msg"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_PLAYER_MESSAGES, new Param2<string, string>("#options_xbox_player_messages","#options_game_show_player_msg"));
+		#else 
+		#ifdef PLATFORM_PS4
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER, new Param2<string, string>("#ps4_options_video_brightness", "#ps4_options_video_brightness_desc"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_GAME_MESSAGES, new Param2<string, string>("#ps4_options_game_messages",	"#ps4_options_game_show_game_msg"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_ADMIN_MESSAGES, new Param2<string, string>("#ps4_options_admin_mes",		"#ps4_options_game_show_admin_msg"));
+		m_TextMap.Insert(OptionIDsScript.OPTION_PLAYER_MESSAGES, new Param2<string, string>("#ps4_options_player_messages","#ps4_options_game_show_player_msg"));		
+		#endif
+		#endif
+		#endif
+	}
+	
+	private void RevertHUDBrightness()
+	{
+		if (m_HUDBrightnessSelector)
+		{
+			m_HUDBrightnessSelector.SetValue(g_Game.GetProfileOptionFloat(EDayZProfilesOptions.HUD_BRIGHTNESS), false);
+			g_Game.SetHudBrightness(m_HUDBrightnessSelector.GetValue());
+		}	
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuSounds.c b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuSounds.c
new file mode 100644
index 0000000000000000000000000000000000000000..fe0d4fdf19a4b62c8ffb1c2e82c3fb2da8d9ebae
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuSounds.c
@@ -0,0 +1,402 @@
+class OptionsMenuSounds extends ScriptedWidgetEventHandler
+{
+	protected Widget						m_Root;
+	
+	protected Widget						m_SettingsRoot;
+	protected Widget						m_DetailsRoot;
+	protected Widget						m_DetailsBodyDefault;
+	protected Widget						m_DetailsBodyConnectivity;
+	protected TextWidget					m_DetailsLabel;
+	protected RichTextWidget				m_DetailsText;
+	
+	protected ref NumericOptionsAccess		m_MasterOption;
+	protected ref NumericOptionsAccess		m_EffectsOption;
+	protected ref NumericOptionsAccess		m_VOIPOption;
+	protected ref NumericOptionsAccess  	m_VOIPThresholdOption;
+	protected ref NumericOptionsAccess		m_MusicOption;
+	protected ref ListOptionsAccess			m_InputModeOption;
+	
+	protected ref OptionSelectorSlider		m_MasterSelector;
+	protected ref OptionSelectorSlider		m_EffectsSelector;
+	protected ref OptionSelectorSlider		m_VOIPSelector;
+	protected ref OptionSelectorLevelMarker	m_VOIPThresholdSelector;
+	protected ref OptionSelectorSlider		m_MusicSelector;
+	protected ref OptionSelectorMultistate	m_InputModeSelector;
+	
+	protected ref Timer 					m_AudioLevelTimer;
+	protected GameOptions					m_Options;
+	protected OptionsMenu					m_Menu;
+	protected MissionGameplay				m_MissionGameplay;
+	protected VONManagerBase				m_VonManager;
+	
+	protected ref map<int, ref Param2<string, string>> m_TextMap;
+	
+	private bool 							m_WasMicCapturing;
+	
+	void OptionsMenuSounds(Widget parent, Widget details_root, GameOptions options, OptionsMenu menu)
+	{
+		m_Root					= GetGame().GetWorkspace().CreateWidgets(GetLayoutName(), parent);
+		m_DetailsRoot			= details_root;
+		m_DetailsBodyDefault 		= m_DetailsRoot.FindAnyWidget("settings_details_body");
+		m_DetailsBodyConnectivity 	= m_DetailsRoot.FindAnyWidget("settings_details_body_connectivity");
+		m_DetailsLabel			= TextWidget.Cast( m_DetailsRoot.FindAnyWidget("details_label"));
+		m_DetailsText			= RichTextWidget.Cast( m_DetailsRoot.FindAnyWidget("details_content"));	
+		m_Options				= options;
+		m_Menu					= menu;
+		
+		m_MasterOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_MASTER_VOLUME));
+		m_EffectsOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_EFFECTS_SLIDER));
+		m_MusicOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_MUSIC_SLIDER));
+		m_VOIPOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_VON_SLIDER));
+		m_VOIPThresholdOption	= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_VON_THRESHOLD_SLIDER));
+		m_InputModeOption		= ListOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_VON_INPUT_MODE));
+		
+		m_MissionGameplay		= MissionGameplay.Cast(GetGame().GetMission());
+		m_VonManager 			= VONManager.GetInstance();
+		m_AudioLevelTimer = new Timer();
+		m_AudioLevelTimer.Run(0.1, this, "UpdateAudioLevel", NULL, true); 
+		
+		m_Root.FindAnyWidget( "master_setting_option" ).SetUserID(OptionAccessType.AT_OPTIONS_MASTER_VOLUME);
+		m_Root.FindAnyWidget( "effects_setting_option" ).SetUserID(OptionAccessType.AT_OPTIONS_EFFECTS_SLIDER);
+		m_Root.FindAnyWidget( "music_setting_option" ).SetUserID(OptionAccessType.AT_OPTIONS_MUSIC_SLIDER);
+		m_Root.FindAnyWidget( "voip_output_setting_option" ).SetUserID(OptionAccessType.AT_OPTIONS_VON_SLIDER);
+		m_Root.FindAnyWidget( "voip_threshold_setting_option" ).SetUserID(OptionAccessType.AT_OPTIONS_VON_THRESHOLD_SLIDER);
+		m_Root.FindAnyWidget( "voip_selection_setting_option" ).SetUserID(OptionAccessType.AT_OPTIONS_VON_INPUT_MODE);
+		
+		FillTextMap();
+		
+		array<string> inputModeValues = { "#STR_Controls_PushToTalk", "#STR_USRACT_UAVOICEOVERNETTOGGLE" };
+		
+		m_MasterSelector			= new OptionSelectorSlider(m_Root.FindAnyWidget("master_setting_option" ), m_MasterOption.ReadValue(), this, false, m_MasterOption.GetMin(), m_MasterOption.GetMax());
+		m_EffectsSelector			= new OptionSelectorSlider(m_Root.FindAnyWidget("effects_setting_option" ), m_EffectsOption.ReadValue(), this, false, m_EffectsOption.GetMin(), m_EffectsOption.GetMax());
+		m_VOIPSelector				= new OptionSelectorSlider(m_Root.FindAnyWidget("voip_output_setting_option" ), m_VOIPOption.ReadValue(), this, false, m_VOIPOption.GetMin(), m_VOIPOption.GetMax());
+		m_VOIPThresholdSelector  	= new OptionSelectorLevelMarker(m_Root.FindAnyWidget("voip_threshold_setting_option" ), m_VOIPThresholdOption.ReadValue(), this, false, m_VOIPThresholdOption.GetMin(), m_VOIPThresholdOption.GetMax());
+		m_MusicSelector				= new OptionSelectorSlider(m_Root.FindAnyWidget("music_setting_option" ), m_MusicOption.ReadValue(), this, false, m_MusicOption.GetMin(), m_MusicOption.GetMax());
+		m_InputModeSelector			= new OptionSelectorMultistate(m_Root.FindAnyWidget("voip_selection_setting_option" ), m_InputModeOption.GetIndex(), this, false, inputModeValues);
+		
+		m_MasterSelector.m_OptionChanged.Insert(UpdateMaster);
+		m_EffectsSelector.m_OptionChanged.Insert(UpdateEffects);
+		m_VOIPSelector.m_OptionChanged.Insert(UpdateVOIP);
+		m_VOIPThresholdSelector.m_OptionChanged.Insert(UpdateVOIPThreshold);
+		m_MusicSelector.m_OptionChanged.Insert(UpdateMusic);
+		m_InputModeSelector.m_OptionChanged.Insert(UpdateInputMode);
+		
+		if (m_MissionGameplay)
+		{
+			// event to monitor when options get reverted directly from C++
+			m_VOIPThresholdOption.GetEvents().Event_OnRevert.Insert(m_VonManager.OnVOIPThresholdChanged);
+			m_VonManager.m_OnVonStateEvent.Insert(OnVonStateEvent);
+			m_VonManager.m_OnPartyChatChangedEvent.Insert(OnPartyChatChangedEvent);
+			m_VOIPThresholdSelector.m_OptionChanged.Insert(m_VonManager.OnVOIPThresholdChanged);
+		}
+		
+		float x, y, y2;
+		m_Root.FindAnyWidget("sound_settings_scroll").GetScreenSize(x, y);
+		m_Root.FindAnyWidget("sound_settings_root").GetScreenSize(x, y2);
+		int f = (y2 > y);
+		m_Root.FindAnyWidget("sound_settings_scroll").SetAlpha(f);
+		
+		m_Root.SetHandler(this);
+		
+		CGame game = GetGame();
+		m_WasMicCapturing = game.IsMicCapturing();
+
+		// do not enable mic capture if user in party chat
+		if (!game.IsInPartyChat())
+		{
+			game.EnableMicCapture(true);
+		}
+	}
+	
+	void ~OptionsMenuSounds()
+	{
+		m_VonManager.m_OnVonStateEvent.Remove(OnVonStateEvent);	
+		m_VonManager.m_OnPartyChatChangedEvent.Remove(OnPartyChatChangedEvent);
+		
+		if (m_MissionGameplay)
+		{
+			// reset mic to previous capturing state
+			GetGame().EnableMicCapture(m_WasMicCapturing);		
+		}
+
+		m_AudioLevelTimer.Stop();
+	}
+	
+	string GetLayoutName()
+	{
+		#ifdef PLATFORM_CONSOLE
+			return "gui/layouts/new_ui/options/xbox/sound_tab.layout";
+		#else
+		#ifdef PLATFORM_WINDOWS
+			return "gui/layouts/new_ui/options/pc/sound_tab.layout";
+		#endif
+		#endif
+	}
+	
+	void Focus()
+	{
+		#ifdef PLATFORM_CONSOLE
+			SetFocus(m_MasterSelector.GetParent());
+		#endif
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if ( w && w.IsInherited(ScrollWidget))
+		{
+			return false;
+		}
+		
+		m_Menu.ColorHighlight(w);
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if ( w && w.IsInherited(ScrollWidget))
+		{
+			return false;
+		}
+		
+		m_Menu.ColorNormal(w);
+		return true;
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		OptionsMenu menu = OptionsMenu.Cast(GetGame().GetUIManager().GetMenu());
+		if (menu)
+		{
+			menu.OnFocus(w, x, y);
+		}
+		if (w)
+		{
+			if (TextMapUpdateWidget(w.GetUserID())) 
+			{
+				return true;
+			}
+			
+			if (w.IsInherited(SliderWidget))
+			{
+				return true;
+			}
+		}
+		m_DetailsRoot.Show(false);
+		return (w != null);
+	}
+	
+	bool TextMapUpdateWidget(int key)
+	{
+		bool connectivityInfoShown = key == OptionIDsScript.OPTION_CONNECTIVITY_INFO;
+		Param2<string, string> p;
+		Param tmp = m_TextMap.Get(key);
+		
+		m_DetailsBodyDefault.Show(!connectivityInfoShown);
+		m_DetailsBodyConnectivity.Show(connectivityInfoShown);
+		
+		if (Class.CastTo(p,tmp))
+		{
+			m_DetailsRoot.Show(true);
+			m_DetailsText.Show(true);
+			m_DetailsLabel.SetText(p.param1);
+			m_DetailsText.SetText(p.param2);
+			
+			m_DetailsText.Update();
+			m_DetailsLabel.Update();
+			m_DetailsRoot.Update();
+			m_DetailsBodyConnectivity.Update(); //...
+			return true;
+		}
+		return false;
+	}
+
+	void OnVonStateEvent()
+	{		
+		// changing VON mode may disable mic capture,
+		// but mic should capture the entire time this menu is open (unless user in party chat)
+		if (!GetGame().IsInPartyChat())
+		{
+			// force enable mic capture
+			GetGame().EnableMicCapture(true);
+		}
+		
+		UpdateWasMicCapturing();
+	}
+	
+	void OnPartyChatChangedEvent()
+	{
+		auto game = GetGame();
+		if (!game.IsInPartyChat())
+		{
+			game.EnableMicCapture(true);
+		}
+		
+		UpdateWasMicCapturing();
+	}
+	
+	// updates the mic capture state to reset to, when this menu closes
+	void UpdateWasMicCapturing()
+	{
+		// if user is in party chat, then mic should not capture
+		if (GetGame().IsInPartyChat())
+		{
+			m_WasMicCapturing = false;
+		}
+		
+		// otherwise, mic should capture ONLY if Voice Activation is enabled
+		else
+		{
+			m_WasMicCapturing = m_MissionGameplay.IsVoNActive();
+		}
+	}
+	
+	bool IsChanged()
+	{
+		return false;
+	}
+	
+	void Apply()
+	{
+		
+	}
+	
+	void Revert()
+	{
+		if (m_MasterOption)
+		{
+			m_MasterSelector.SetValue(m_MasterOption.ReadValue(), true);
+		}
+		if (m_EffectsOption)
+		{
+			m_EffectsSelector.SetValue(m_EffectsOption.ReadValue(),true);
+		}
+		if (m_VOIPOption)
+		{
+			m_VOIPSelector.SetValue(m_VOIPOption.ReadValue(), true);
+		}
+		if (m_VOIPThresholdOption)
+		{
+			m_VOIPThresholdSelector.SetValue(m_VOIPThresholdOption.ReadValue(), true);
+		}
+		if (m_MusicOption)
+		{
+			m_MusicSelector.SetValue(m_MusicOption.ReadValue(), true);
+		}
+		if (m_InputModeOption)
+		{
+			m_InputModeSelector.SetValue(m_InputModeOption.GetIndex(), false);
+		}
+	}
+	
+	void SetToDefaults()
+	{
+		if (m_MasterOption)
+		{
+			m_MasterSelector.SetValue(m_MasterOption.GetDefault(), true);
+		}
+		if (m_EffectsOption)
+		{
+			m_EffectsSelector.SetValue(m_EffectsOption.GetDefault(), true);
+		}
+		if (m_VOIPOption)
+		{
+			m_VOIPSelector.SetValue(m_VOIPOption.GetDefault(), true);
+		}
+		if (m_VOIPThresholdOption)
+		{
+			m_VOIPThresholdSelector.SetValue(m_VOIPThresholdOption.GetDefault(), true);
+		}
+		if (m_MusicOption)
+		{
+			m_MusicSelector.SetValue(m_MusicOption.GetDefault(), true);
+		}
+		if (m_InputModeOption)
+		{
+			m_InputModeOption.SetIndex(m_InputModeOption.GetDefaultIndex());
+			m_InputModeSelector.SetValue( m_InputModeOption.GetIndex(), false );
+		}
+	}
+	
+	void ReloadOptions()
+	{
+		m_Menu.ReloadOptions();
+	}
+	
+	void SetOptions(GameOptions options)
+	{
+		m_Options = options;
+		
+		m_MasterOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_MASTER_VOLUME));
+		m_EffectsOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_EFFECTS_SLIDER));
+		m_MusicOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_MUSIC_SLIDER));
+		m_VOIPOption			= NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_VON_SLIDER));
+		m_InputModeOption		= ListOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_VON_INPUT_MODE));
+		m_VOIPThresholdOption   = NumericOptionsAccess.Cast(m_Options.GetOptionByType(OptionAccessType.AT_OPTIONS_VON_THRESHOLD_SLIDER));
+		
+		Revert();
+	}
+	
+	void ToggleDependentOptions(int mode, bool state)
+	{
+	}
+	
+	void InitDependentOptionsVisibility()
+	{
+	}
+	
+	void UpdateMaster(float value)
+	{
+		m_MasterOption.WriteValue(value);
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateEffects(float value)
+	{
+		m_EffectsOption.WriteValue(value);
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateVOIP(float value)
+	{
+		m_VOIPOption.WriteValue(value);
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateVOIPThreshold(float value)
+	{
+		m_VOIPThresholdOption.WriteValue(value);
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateMusic(float value)
+	{
+		m_MusicOption.WriteValue(value);
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateInputMode(int newIndex)
+	{
+		m_InputModeOption.SetIndex(newIndex);
+		m_Menu.OnChanged();
+	}
+	
+	void UpdateAudioLevel()
+	{	
+		m_VOIPThresholdSelector.SetSlider2Value(GetGame().GetSoundScene().GetAudioLevel());
+	}
+	
+	
+	void FillTextMap()
+	{
+		m_TextMap = new map<int, ref Param2<string, string>>;
+	
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_MASTER_VOLUME, new Param2<string, string>("#STR_sound_tab_master_tip_header", "#STR_sound_tab_master_tip"));
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_EFFECTS_SLIDER, new Param2<string, string>("#STR_sound_tab_effects_tip_header", "#STR_sound_tab_effects_tip"));
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_MUSIC_SLIDER, new Param2<string, string>("#STR_sound_tab_music_tip_header", "#STR_sound_tab_music_tip"));
+
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_VON_SLIDER, new Param2<string, string>("#STR_sound_tab_voice_output_tip_header", "#STR_sound_tab_voice_output_tip"));
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_VON_THRESHOLD_SLIDER, new Param2<string, string>("#STR_sound_tab_voice_threshold_tip_header", "#STR_sound_tab_voice_threshold_tip"));
+		m_TextMap.Insert(OptionAccessType.AT_OPTIONS_VON_INPUT_MODE, new Param2<string, string>("#STR_sound_tab_voice_mode_tip_header", "#STR_sound_tab_voice_mode_tip")); 
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuVideo.c b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuVideo.c
new file mode 100644
index 0000000000000000000000000000000000000000..c01b994340c7228710ca7c8a5ff70da8a442a7ef
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/Options/OptionsMenuVideo.c
@@ -0,0 +1,636 @@
+class OptionsMenuVideo extends ScriptedWidgetEventHandler
+{
+	protected Widget						m_Root;
+	
+	protected Widget						m_SettingsRoot;
+	protected Widget						m_DetailsRoot;
+	protected Widget						m_DetailsBodyDefault;
+	protected Widget						m_DetailsBodyConnectivity;
+	protected TextWidget					m_DetailsLabel;
+	protected RichTextWidget				m_DetailsText;
+	
+	protected GameOptions					m_Options;
+	protected OptionsMenu					m_Menu;
+	
+	#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_PS4
+			protected ref OptionSelectorMultistate	m_FlipModeSelector;
+		#endif
+	#else
+		//Overall
+		protected ref OptionSelectorMultistate	m_OverallQualitySelector;
+		
+		//Screen
+		protected ref OptionSelectorMultistate	m_DisplayModeSelector;
+		protected ref OptionSelectorMultistate	m_ResolutionSelector;
+		protected ref OptionSelectorSlider		m_BrightnessSelector;
+		protected ref OptionSelectorMultistate	m_VSyncSelector;
+		//protected ref OptionSelectorMultistate	m_ColorDepthSelector;
+		
+		//Scene
+		protected ref OptionSelectorMultistate	m_ObjectDetailSelector;
+		protected ref OptionSelectorMultistate	m_TerrainDetailSelector;
+		protected ref OptionSelectorMultistate	m_TextureDetailSelector;
+		protected ref OptionSelectorMultistate	m_ShadowDetailSelector;
+		
+		//Rendering
+		protected ref OptionSelectorMultistate	m_TextureFilteringSelector;
+		protected ref OptionSelectorMultistate	m_TerrainSurfaceDetailSelector;
+		protected ref OptionSelectorMultistate	m_PPAASelector;
+		protected ref OptionSelectorMultistate	m_HWAASelector;
+		protected ref OptionSelectorMultistate	m_ATOCSelector;
+		protected ref OptionSelectorMultistate	m_AOSelector;
+		protected ref OptionSelectorMultistate	m_PPQualitySelector;
+		protected ref OptionSelectorMultistate	m_SSRQualitySelector;
+	#endif
+	
+	#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_PS4
+			protected ref ListOptionsAccess			m_FlipModeOption;
+		#endif
+	#else
+		//Overall
+		protected ref ListOptionsAccess			m_OverallQualityOption;
+		
+		//Screen
+		protected ref ListOptionsAccess			m_DisplayModeOption;
+		protected ref ListOptionsAccess			m_ResolutionOption;
+		protected ref NumericOptionsAccess		m_BrightnessOption;
+		protected ref ListOptionsAccess			m_VSyncOption;
+		//protected ref ListOptionsAccess			m_ColorDepthOption;
+		
+		//Scene
+		protected ref ListOptionsAccess			m_ObjectDetailOption;
+		protected ref ListOptionsAccess			m_TerrainDetailOption;
+		protected ref ListOptionsAccess			m_TextureDetailOption;
+		protected ref ListOptionsAccess			m_ShadowDetailOption;
+		
+		//Rendering
+		protected ref ListOptionsAccess			m_TextureFilteringOption;
+		protected ref ListOptionsAccess			m_TerrainSurfaceDetailOption;
+		protected ref ListOptionsAccess			m_PPAAOption;
+		protected ref ListOptionsAccess			m_HWAAOption;
+		protected ref ListOptionsAccess			m_ATOCOption;
+		protected ref ListOptionsAccess			m_AOOption;
+		protected ref ListOptionsAccess			m_PPQualityOption;	
+		protected ref ListOptionsAccess			m_SSRQualityOption;	
+	#endif
+	
+	protected ref map<int, ref Param2<string, string>> m_TextMap;
+	
+	void OptionsMenuVideo( Widget parent, Widget details_root, GameOptions options, OptionsMenu menu )
+	{
+		m_Root							= GetGame().GetWorkspace().CreateWidgets( GetLayoutName(), parent );
+		
+		m_DetailsRoot					= details_root;
+		m_DetailsBodyDefault 			= m_DetailsRoot.FindAnyWidget("settings_details_body");
+		m_DetailsBodyConnectivity 		= m_DetailsRoot.FindAnyWidget("settings_details_body_connectivity");
+		m_DetailsLabel					= TextWidget.Cast( m_DetailsRoot.FindAnyWidget( "details_label" ) );
+		m_DetailsText					= RichTextWidget.Cast( m_DetailsRoot.FindAnyWidget( "details_content" ) );
+		
+		SetOptions( options );
+		m_Menu							= menu;
+		
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				m_Root.FindAnyWidget( "vsync_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_FLIPMODE );
+			#endif
+		#else
+			m_Root.FindAnyWidget( "overall_quality_setting_option" ).SetUserID( OptionAccessType.AT_QUALITY_PREFERENCE );
+			m_Root.FindAnyWidget( "display_mode_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_DISPLAY_MODE );
+			m_Root.FindAnyWidget( "resolution_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_RESOLUTION );
+			m_Root.FindAnyWidget( "brightness_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER );
+			m_Root.FindAnyWidget( "vsync_setting_option" ).SetUserID( OptionAccessType.AT_VSYNC_VALUE );
+			//m_Root.FindAnyWidget( "color_depth_setting_option" ).SetUserID( OptionAccessType.AT_HDR_DETAIL );
+			
+			//Scene
+			m_Root.FindAnyWidget( "object_detail_setting_option" ).SetUserID( OptionAccessType.AT_OBJECTS_DETAIL );
+			m_Root.FindAnyWidget( "terrain_detail_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_TERRAIN );
+			m_Root.FindAnyWidget( "texture_detail_setting_option" ).SetUserID( OptionAccessType.AT_TEXTURE_DETAIL );
+			m_Root.FindAnyWidget( "shadow_detail_setting_option" ).SetUserID( OptionAccessType.AT_SHADOW_DETAIL );
+			
+			//Rendering
+			m_Root.FindAnyWidget( "texture_filtering_setting_option" ).SetUserID( OptionAccessType.AT_ANISO_DETAIL );
+			m_Root.FindAnyWidget( "terrain_surface_detail_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_TERRAIN_SHADER );
+			m_Root.FindAnyWidget( "ppaa_setting_option" ).SetUserID( OptionAccessType.AT_OPTIONS_FXAA_VALUE );
+			m_Root.FindAnyWidget( "hwaa_setting_option" ).SetUserID( OptionAccessType.AT_FSAA_DETAIL );
+			m_Root.FindAnyWidget( "atoc_setting_option" ).SetUserID( OptionAccessType.AT_ATOC_DETAIL );
+			m_Root.FindAnyWidget( "ao_setting_option" ).SetUserID( OptionAccessType.AT_AMBIENT_OCCLUSION );
+			m_Root.FindAnyWidget( "pp_setting_option" ).SetUserID( OptionAccessType.AT_POSTPROCESS_EFFECTS );
+			m_Root.FindAnyWidget( "ssr_setting_option" ).SetUserID( OptionAccessType.AT_WATER_DETAIL );
+		#endif
+		
+		FillTextMap();
+		InitSelectors();
+		RefreshCustom();
+		GetGame().BeginOptionsVideo();
+		
+		float x, y, y2;
+		m_Root.FindAnyWidget( "video_settings_scroll" ).GetScreenSize( x, y );
+		m_Root.FindAnyWidget( "video_settings_root" ).GetScreenSize( x, y2 );
+		int f = ( y2 > y );
+		m_Root.FindAnyWidget( "video_settings_scroll" ).SetAlpha( f );
+		
+		m_Root.SetHandler( this );
+	}
+	
+	void ~OptionsMenuVideo()
+	{
+		GetGame().EndOptionsVideo();
+	}
+	
+	void InitSelectors()
+	{
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				array<string> opt1				= { "#STR_ENABLED", "#STR_DISABLED", "#STR_SELECTIVE" };
+				m_FlipModeSelector				= new OptionSelectorMultistate( m_Root.FindAnyWidget( "vsync_setting_option" ), m_FlipModeOption.GetIndex(), this, false, opt1 );
+			#endif
+		#else
+			array<string> opt1			= { "#options_controls_disabled", "#options_controls_enabled" };
+			array<string> opt2			= { "#options_video_fullscreen", "#options_video_windowed" };
+			array<string> opt3			= { "#options_video_low", "#options_video_medium", "#options_video_high" };
+			array<string> opt4			= { "#options_video_poor", "#options_video_low", "#options_video_medium", "#options_video_high", "#options_video_extreme" };
+			array<string> opt41			= { "#options_video_low", "#options_video_medium", "#options_video_high", "#options_video_extreme" };
+			array<string> opt5			= { "#options_video_poor", "#options_video_low", "#options_video_medium", "#options_video_high", "#options_video_extreme", "#options_video_custom" };
+			array<string> opt6			= { "#options_controls_disabled", "#options_video_low", "#options_video_medium", "#options_video_high", "#options_video_extreme" };
+			array<string> opt7			= { "#options_controls_disabled", "#options_video_low", "#options_video_medium", "#options_video_high" };
+			array<string> opt8			= new array<string>;
+			array<string> opt9			= { "#options_controls_disabled", "#options_video_low", "#options_video_high" };
+			
+			for ( int i = 0; i < m_ResolutionOption.GetItemsCount(); i++ )
+			{
+				string opt_text;
+				m_ResolutionOption.GetItemText( i, opt_text );
+				opt8.Insert( opt_text );
+			}
+			
+			//Overall
+			m_OverallQualitySelector		= new OptionSelectorMultistate( m_Root.FindAnyWidget( "overall_quality_setting_option" ), m_OverallQualityOption.GetIndex(), this, false, opt5 );
+			
+			//Screen
+			m_DisplayModeSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "display_mode_setting_option" ), m_DisplayModeOption.GetIndex(), this, false, opt2 );
+			m_ResolutionSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "resolution_setting_option" ), m_ResolutionOption.GetIndex(), this, false, opt8 );
+			m_BrightnessSelector			= new OptionSelectorSlider( m_Root.FindAnyWidget( "brightness_setting_option" ), m_BrightnessOption.ReadValue(), this, false, m_BrightnessOption.GetMin(), m_BrightnessOption.GetMax() );
+			m_VSyncSelector					= new OptionSelectorMultistate( m_Root.FindAnyWidget( "vsync_setting_option" ), m_VSyncOption.GetIndex(), this, false, opt1 );
+			//m_ColorDepthSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "color_depth_setting_option" ), m_ColorDepthOption.GetIndex(), this, false, opt3 );
+			
+			//Scene
+			m_ObjectDetailSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "object_detail_setting_option" ), m_ObjectDetailOption.GetIndex(), this, false, opt4 );
+			m_TerrainDetailSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "terrain_detail_setting_option" ), m_TerrainDetailOption.GetIndex(), this, false, opt4 );
+			m_TextureDetailSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "texture_detail_setting_option" ), m_TextureDetailOption.GetIndex(), this, false, opt4 );
+			m_ShadowDetailSelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "shadow_detail_setting_option" ), m_ShadowDetailOption.GetIndex(), this, false, opt4 );
+			
+			//Rendering
+			m_TextureFilteringSelector		= new OptionSelectorMultistate( m_Root.FindAnyWidget( "texture_filtering_setting_option" ), m_TextureFilteringOption.GetIndex(), this, false, opt3 );
+			m_TerrainSurfaceDetailSelector	= new OptionSelectorMultistate( m_Root.FindAnyWidget( "terrain_surface_detail_setting_option" ), m_TerrainSurfaceDetailOption.GetIndex(), this, false, opt41 );
+			
+			m_PPAASelector					= new OptionSelectorMultistate( m_Root.FindAnyWidget( "ppaa_setting_option" ), m_PPAAOption.GetIndex(), this, false, opt6 );
+			m_HWAASelector					= new OptionSelectorMultistate( m_Root.FindAnyWidget( "hwaa_setting_option" ), m_HWAAOption.GetIndex(), this, false, opt7 );
+			m_ATOCSelector					= new OptionSelectorMultistate( m_Root.FindAnyWidget( "atoc_setting_option" ), m_ATOCOption.GetIndex(), this, false, opt1 );
+			m_AOSelector					= new OptionSelectorMultistate( m_Root.FindAnyWidget( "ao_setting_option" ), m_AOOption.GetIndex(), this, false, opt6 );
+			m_PPQualitySelector				= new OptionSelectorMultistate( m_Root.FindAnyWidget( "pp_setting_option" ), m_PPQualityOption.GetIndex(), this, false, opt3 );
+			m_SSRQualitySelector			= new OptionSelectorMultistate( m_Root.FindAnyWidget( "ssr_setting_option" ), m_SSRQualityOption.GetIndex(), this, false, opt9 );
+		#endif
+		
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				m_FlipModeSelector.m_OptionChanged.Insert( OnFlipModeChanged );
+			#endif
+		#else
+			//Overall
+			m_OverallQualitySelector.m_OptionChanged.Insert( OnOverallQualityChanged );
+			
+			//Screen
+			m_DisplayModeSelector.m_OptionChanged.Insert( OnDisplayModeChanged );
+			m_ResolutionSelector.m_OptionChanged.Insert( OnResolutionChanged );
+			m_BrightnessSelector.m_OptionChanged.Insert( OnBrightnessChanged );
+			m_VSyncSelector.m_OptionChanged.Insert( OnVSyncChanged );
+			//m_ColorDepthSelector.m_OptionChanged.Insert( OnColorDepthChanged );
+			
+			//Scene
+			m_ObjectDetailSelector.m_OptionChanged.Insert( OnObjectDetailChanged );
+			m_TerrainDetailSelector.m_OptionChanged.Insert( OnTerrainDetailChanged );
+			m_TextureDetailSelector.m_OptionChanged.Insert( OnTextureDetailChanged );
+			m_ShadowDetailSelector.m_OptionChanged.Insert( OnShadowDetailChanged );
+			
+			//Rendering
+			m_TextureFilteringSelector.m_OptionChanged.Insert( OnTextureFilteringChanged );
+			m_TerrainSurfaceDetailSelector.m_OptionChanged.Insert( OnTerrainSurfaceDetailChanged );
+			m_PPAASelector.m_OptionChanged.Insert( OnPPAAChanged );
+			m_HWAASelector.m_OptionChanged.Insert( OnHWAAChanged );
+			m_ATOCSelector.m_OptionChanged.Insert( OnATOCChanged );
+			m_AOSelector.m_OptionChanged.Insert( OnAOChanged );
+			m_PPQualitySelector.m_OptionChanged.Insert( OnPPQualityChanged );
+			m_SSRQualitySelector.m_OptionChanged.Insert( OnSSRQualityChanged );
+		#endif
+	}
+	
+	string GetLayoutName()
+	{
+		#ifdef PLATFORM_PS4
+			return "gui/layouts/new_ui/options/ps/video_tab.layout";
+		#else
+			#ifdef PLATFORM_WINDOWS
+				return "gui/layouts/new_ui/options/pc/video_tab.layout";
+			#endif
+		#endif		
+	}
+	
+	void Focus()
+	{
+		#ifdef PLATFORM_PS4
+			if (m_FlipModeSelector)
+			{
+				SetFocus( m_FlipModeSelector.GetParent() );
+			}
+		#endif
+	}
+	
+	void ReloadOptions()
+	{
+		m_Menu.ReloadOptions();
+	}
+	
+	bool IsChanged()
+	{
+		return false;
+	}
+	
+	void Apply()
+	{
+		
+	}
+	
+	void Revert()
+	{
+		#ifndef PLATFORM_CONSOLE
+			m_DisplayModeSelector.SetValue( m_DisplayModeOption.GetIndex(), false );
+			m_ResolutionSelector.SetValue( m_ResolutionOption.GetIndex(), false );
+			m_BrightnessSelector.SetValue( m_BrightnessOption.ReadValue(), false );
+			m_VSyncSelector.SetValue( m_VSyncOption.GetIndex(), false );
+			//m_ColorDepthSelector.SetValue( m_ColorDepthOption.GetIndex(), false );
+			m_OverallQualitySelector.SetValue( m_OverallQualityOption.GetIndex(), false );
+		#endif
+		
+		RefreshCustom();
+		#ifndef PLATFORM_CONSOLE
+			m_OverallQualitySelector.SetValue( m_OverallQualityOption.GetIndex(), false );
+		#endif
+	}
+	
+	void SetToDefaults()
+	{
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				m_FlipModeSelector.SetValue( m_FlipModeOption.GetDefaultIndex(), false );
+			#endif
+		#else
+			m_DisplayModeSelector.SetValue( m_DisplayModeOption.GetDefaultIndex(), false );
+			m_ResolutionSelector.SetValue( m_ResolutionOption.GetDefaultIndex(), false );
+			m_BrightnessSelector.SetValue( m_BrightnessOption.GetDefault(), false );
+			m_VSyncSelector.SetValue( m_VSyncOption.GetDefaultIndex(), false );
+			int idx = m_OverallQualityOption.GetDefaultIndex();
+			m_OverallQualitySelector.SetValue( m_OverallQualityOption.GetDefaultIndex(), true );
+		#endif
+				
+		RefreshCustom();
+		//DefaultValuesToCustom();
+	}
+	
+	void SetOptions( GameOptions options )
+	{
+		m_Options						= options;
+		
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				m_FlipModeOption				= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_FLIPMODE ) );
+			#endif
+		#else
+			//Overall
+			m_OverallQualityOption			= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_QUALITY_PREFERENCE ) );
+			
+			//Screen
+			m_DisplayModeOption				= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_DISPLAY_MODE ) );
+			m_ResolutionOption				= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_RESOLUTION ) );
+			m_BrightnessOption				= NumericOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER ) );
+			m_VSyncOption					= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_VSYNC_VALUE ) );
+			//m_ColorDepthOption				= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_HDR_DETAIL ) );
+			
+			//Scene
+			m_ObjectDetailOption			= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OBJECTS_DETAIL ) );
+			m_TerrainDetailOption			= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_TERRAIN ) );
+			m_TextureDetailOption			= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_TEXTURE_DETAIL ) );
+			m_ShadowDetailOption			= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_SHADOW_DETAIL ) );
+			
+			//Rendering
+			m_TextureFilteringOption		= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_ANISO_DETAIL ) );
+			m_TerrainSurfaceDetailOption	= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_TERRAIN_SHADER ) );
+	
+			m_PPAAOption					= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_OPTIONS_FXAA_VALUE ) );
+			m_HWAAOption					= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_FSAA_DETAIL ) );
+			m_ATOCOption					= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_ATOC_DETAIL ) );
+			m_AOOption						= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_AMBIENT_OCCLUSION ) );
+			m_PPQualityOption				= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_POSTPROCESS_EFFECTS ) );
+			m_SSRQualityOption				= ListOptionsAccess.Cast( m_Options.GetOptionByType( OptionAccessType.AT_WATER_DETAIL ) );
+		#endif
+	}
+	
+	void ToggleDependentOptions(int mode, bool state)
+	{
+	}
+	
+	void InitDependentOptionsVisibility()
+	{
+	}
+	
+	void RefreshCustom()
+	{
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				m_FlipModeSelector.SetValue( m_FlipModeOption.GetIndex(), false );
+			#endif
+		#else
+			//Scene
+			m_ObjectDetailSelector.SetValue( m_ObjectDetailOption.GetIndex(), false );
+			m_TerrainDetailSelector.SetValue( m_TerrainDetailOption.GetIndex(), false );
+			m_TextureDetailSelector.SetValue( m_TextureDetailOption.GetIndex(), false );
+			m_ShadowDetailSelector.SetValue( m_ShadowDetailOption.GetIndex(), false );
+			
+			//Rendering
+			m_TextureFilteringSelector.SetValue( m_TextureFilteringOption.GetIndex(), false );
+			m_TerrainSurfaceDetailSelector.SetValue( m_TerrainSurfaceDetailOption.GetIndex(), false );
+			m_PPAASelector.SetValue( m_PPAAOption.GetIndex(), false );
+			m_HWAASelector.SetValue( m_HWAAOption.GetIndex(), false );
+			if ( m_HWAAOption.GetIndex() == 0 )
+			{
+				m_ATOCSelector.Disable();
+			}
+			else
+			{
+				m_ATOCSelector.Enable();
+			}
+			m_ATOCSelector.SetValue( m_ATOCOption.GetIndex(), false );
+			m_AOSelector.SetValue( m_AOOption.GetIndex(), false );
+			m_PPQualitySelector.SetValue( m_PPQualityOption.GetIndex(), false );		
+			m_SSRQualitySelector.SetValue( m_SSRQualityOption.GetIndex(), false );		
+		#endif
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if ( w && w.IsInherited( ScrollWidget ) )
+		{
+			return false;
+		}
+		
+		m_Menu.ColorHighlight( w );
+		
+		return true;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		if ( w && w.IsInherited( ScrollWidget ) )
+		{
+			return false;
+		}
+		
+		m_Menu.ColorNormal( w );
+		return true;
+	}
+	
+	void OnOptionChanged()
+	{
+		#ifndef PLATFORM_CONSOLE
+			if ( m_OverallQualityOption.GetIndex() != 5 )
+			{
+				m_OverallQualitySelector.SetValue( 5 );
+			}
+		#endif
+	}
+	
+	#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_PS4
+			void OnFlipModeChanged( int value )
+			{
+				m_FlipModeOption.SetIndex( value );
+				OnOptionChanged();
+				m_Menu.OnChanged();
+			}
+		#endif
+	#else
+		void OnOverallQualityChanged( int value )
+		{
+			m_OverallQualityOption.SetIndex( value );
+			m_OverallQualityOption.Test(); //here's the bastard!
+			m_Options.Test();
+			//SetOptions(m_Options);
+			
+			ReloadOptions();
+			
+			//InitSelectors();
+			m_OverallQualityOption.SetIndex( value );
+			RefreshCustom();
+			m_Menu.OnChanged();
+		}
+		
+		void OnDisplayModeChanged( int value )
+		{
+			m_DisplayModeOption.SetIndex( value );
+			m_Menu.OnChanged();
+		}
+		
+		void OnResolutionChanged( int value )
+		{
+			m_ResolutionOption.SetIndex( value );
+			m_Menu.OnChanged();
+		}
+		
+		void OnBrightnessChanged( float value )
+		{
+			m_BrightnessOption.WriteValue( value );
+			m_Menu.OnChanged();
+		}
+		
+		void OnVSyncChanged( float value )
+		{
+			m_VSyncOption.SetIndex( value );
+			m_Menu.OnChanged();
+		}
+		
+		void OnColorDepthChanged( int value )
+		{
+			//m_ColorDepthOption.SetIndex( value );
+			m_Menu.OnChanged();
+		}
+		
+		void OnObjectDetailChanged( int value )
+		{
+			m_ObjectDetailOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnTerrainDetailChanged( int value )
+		{
+			m_TerrainDetailOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnTextureDetailChanged( int value )
+		{
+			m_TextureDetailOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnShadowDetailChanged( int value )
+		{
+			m_ShadowDetailOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnTextureFilteringChanged( int value )
+		{
+			m_TextureFilteringOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnTerrainSurfaceDetailChanged( int value )
+		{
+			m_TerrainSurfaceDetailOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnPPAAChanged( int value )
+		{
+			m_PPAAOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnHWAAChanged( int value )
+		{
+			m_HWAAOption.SetIndex( value );
+			if ( value == 0 )
+			{
+				m_ATOCSelector.Disable();
+			}
+			else
+			{
+				m_ATOCSelector.Enable();
+			}
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnATOCChanged( int value )
+		{
+			m_ATOCOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnAOChanged( int value )
+		{
+			m_AOOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}
+		
+		void OnPPQualityChanged( int value )
+		{
+			m_PPQualityOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}			
+	
+		void OnSSRQualityChanged( int value )
+		{
+			m_SSRQualityOption.SetIndex( value );
+			OnOptionChanged();
+			m_Menu.OnChanged();
+		}			
+	#endif
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		OptionsMenu menu = OptionsMenu.Cast( GetGame().GetUIManager().GetMenu() );
+		if ( menu )
+			menu.OnFocus( w, x, y );
+		if ( w )
+		{
+			if (TextMapUpdateWidget(w.GetUserID())) 
+			{
+				return true;
+			}
+			
+			if ( w.IsInherited( SliderWidget ) )
+			{
+				return true;
+			}
+		}
+		m_DetailsRoot.Show( false );
+		return ( w != null );
+	}
+	
+	bool TextMapUpdateWidget(int key)
+	{
+		bool connectivityInfoShown = key == OptionIDsScript.OPTION_CONNECTIVITY_INFO;
+		Param2<string, string> p;
+		Param tmp = m_TextMap.Get(key);
+		
+		m_DetailsBodyDefault.Show(!connectivityInfoShown);
+		m_DetailsBodyConnectivity.Show(connectivityInfoShown);
+		
+		if (Class.CastTo(p,tmp))
+		{
+			m_DetailsRoot.Show(true);
+			m_DetailsText.Show(true);
+			m_DetailsLabel.SetText(p.param1);
+			m_DetailsText.SetText(p.param2);
+			
+			m_DetailsText.Update();
+			m_DetailsLabel.Update();
+			m_DetailsRoot.Update();
+			m_DetailsBodyConnectivity.Update(); //...
+			return true;
+		}
+		return false;
+	}
+	
+	void FillTextMap()
+	{
+		m_TextMap = new map<int, ref Param2<string, string>>;
+		
+		#ifdef PLATFORM_CONSOLE
+			#ifdef PLATFORM_PS4
+				m_TextMap.Insert( OptionAccessType.AT_OPTIONS_FLIPMODE, new Param2<string, string>( "#options_video_V-sync", "#options_video_V-sync_desc" ) );
+			#endif
+		#else
+			m_TextMap.Insert( OptionAccessType.AT_QUALITY_PREFERENCE, new Param2<string, string>( "#options_video_quality", "#options_video_quality_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_DISPLAY_MODE, new Param2<string, string>( "#options_video_display_mode", "#options_video_display_mode_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_RESOLUTION, new Param2<string, string>( "#options_video_resolution", "#options_video_resolution_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_BRIGHT_SLIDER, new Param2<string, string>( "#options_video_brightness", "#options_video_brightness_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_VSYNC_VALUE, new Param2<string, string>( "#options_video_V-sync", "#options_video_V-sync_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_HDR_DETAIL, new Param2<string, string>( "#options_video_color_depth", "#options_video_color_depth_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OBJECTS_DETAIL, new Param2<string, string>( "#options_video_object_detail", "#options_video_object_detail_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_TERRAIN, new Param2<string, string>( "#options_video_terrain_detail", "#options_video_terrain_detail_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_TEXTURE_DETAIL, new Param2<string, string>( "#options_video_texture_detail", "#options_video_texture_detail_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_SHADOW_DETAIL, new Param2<string, string>( "#options_video_shadow_detail", "#options_video_shadow_detail_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_ANISO_DETAIL, new Param2<string, string>( "#options_video_texture_filtering", "#options_video_texture_filtering_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_TERRAIN_SHADER, new Param2<string, string>( "#options_video_terrain_surface_detail", "#options_video_terrain_surface_detail_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_OPTIONS_FXAA_VALUE, new Param2<string, string>( "#options_video_anti-aliasing", "#options_video_anti-aliasing_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_FSAA_DETAIL, new Param2<string, string>( "#options_video_anti-aliasing_hardware", "#options_video_anti-aliasing_hardware_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_ATOC_DETAIL, new Param2<string, string>( "#options_video_foliage_smoothing", "#options_video_foliage_smoothing_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_AMBIENT_OCCLUSION, new Param2<string, string>( "#options_video_ambient_occlusion", "#options_video_ambient_occlusion_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_POSTPROCESS_EFFECTS, new Param2<string, string>( "#options_video_post_process", "#options_video_post_process_desc" ) );
+			m_TextMap.Insert( OptionAccessType.AT_WATER_DETAIL, new Param2<string, string>( "#STR_option_video_ssr_quality_tip_header", "#STR_option_video_ssr_quality_tip" ) );
+		#endif
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserEntry.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserEntry.c
new file mode 100644
index 0000000000000000000000000000000000000000..2ccf1f8a0603fca26ce2b7fb47872847a0ffc971
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserEntry.c
@@ -0,0 +1,833 @@
+class ServerBrowserEntry extends ScriptedWidgetEventHandler
+{
+	protected Widget					m_Root;
+	protected Widget					m_Favorite;
+	protected Widget					m_Expand;
+	
+	//Basic info
+	protected TextWidget				m_ServerName;
+	protected TextWidget				m_ServerPopulation;
+	protected TextWidget				m_ServerSlots;
+	protected TextWidget				m_ServerPing;
+	protected ImageWidget				m_ServerTime;
+	protected ImageWidget				m_ServerLock;
+	protected ImageWidget				m_ServerModIcon;
+	protected ImageWidget				m_ServerMaKIcon;
+	
+	//Detailed info
+	protected TextWidget				m_ServerShard;
+	protected TextWidget				m_ServerCharacterAlive;
+	protected TextWidget				m_ServerFriends;
+	protected TextWidget				m_ServerMode;
+	protected TextWidget				m_ServerBattleye;
+	protected TextWidget				m_ServerIP;
+	protected TextWidget				m_ServerAcceleration;
+	protected TextWidget				m_ServerMap;
+	protected TextWidget				m_ServerMods;
+	protected ButtonWidget				m_ServerModsExpand;
+	protected ref array<string>			m_Mods;
+	
+	protected bool						m_IsExpanded;
+	protected bool						m_IsFavorited;
+	protected bool						m_IsOnline;
+	
+	protected ref GetServersResultRow	m_ServerData;
+	protected int						m_Index;
+	protected ServerBrowserTab			m_Tab;
+	protected bool						m_Selected;
+	protected bool						m_FirstExpand = true;
+	
+	void ServerBrowserEntry( Widget parent, int index, ServerBrowserTab tab )
+	{		
+		#ifdef PLATFORM_CONSOLE
+			m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/server_browser/xbox/server_browser_list_entry.layout", parent );
+		#else
+			m_Root				= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/server_browser/pc/server_browser_list_entry_pages.layout", parent );
+		#endif
+		
+		m_Root.Enable( true );
+		m_Favorite				= m_Root.FindAnyWidget( "favorite_button" );
+		m_Expand				= m_Root.FindAnyWidget( "expand_button" );
+		m_ServerName			= TextWidget.Cast( m_Root.FindAnyWidget( "server_name" ) );
+		m_ServerPopulation		= TextWidget.Cast( m_Root.FindAnyWidget( "server_population" ) );
+		m_ServerSlots			= TextWidget.Cast( m_Root.FindAnyWidget( "server_slots" ) );
+		m_ServerPing			= TextWidget.Cast( m_Root.FindAnyWidget( "server_ping" ) );
+		m_ServerTime			= ImageWidget.Cast( m_Root.FindAnyWidget( "server_time" ) );
+		m_ServerLock			= ImageWidget.Cast( m_Root.FindAnyWidget( "lock_icon" ) );
+		m_ServerModIcon			= ImageWidget.Cast( m_Root.FindAnyWidget( "modded_icon" ) );
+		m_ServerMaKIcon			= ImageWidget.Cast( m_Root.FindAnyWidget( "mandk_icon" ) );
+		
+		m_ServerShard			= TextWidget.Cast( m_Root.FindAnyWidget( "shard_text" ) );
+		m_ServerCharacterAlive	= TextWidget.Cast( m_Root.FindAnyWidget( "character_alive_text" ) );
+		m_ServerFriends			= TextWidget.Cast( m_Root.FindAnyWidget( "steam_friends_text" ) );
+		m_ServerMode			= TextWidget.Cast( m_Root.FindAnyWidget( "mode_text" ) );
+		m_ServerBattleye		= TextWidget.Cast( m_Root.FindAnyWidget( "battlleye_text" ) );
+		m_ServerIP				= TextWidget.Cast( m_Root.FindAnyWidget( "ip_text" ) );
+		m_ServerAcceleration	= TextWidget.Cast( m_Root.FindAnyWidget( "server_acceleration_text" ) );
+		m_ServerMap				= TextWidget.Cast( m_Root.FindAnyWidget( "map_text" ) );
+		m_ServerMods			= TextWidget.Cast( m_Root.FindAnyWidget( "mods_text" ) );
+		m_ServerModsExpand		= ButtonWidget.Cast( m_Root.FindAnyWidget( "mods_expand" ) );
+		
+		m_Root.FindAnyWidget( "basic_info" ).Show( true );
+		m_Root.FindAnyWidget( "favorite_image" ).Update();
+		m_Root.FindAnyWidget( "unfavorite_image" ).Update();
+		
+		m_Index					= index;
+		m_Tab					= tab;
+		m_IsOnline              = true;
+		
+		m_ServerTime.LoadImageFile( 0, "set:dayz_gui image:icon_sun" );
+		m_ServerTime.LoadImageFile( 1, "set:dayz_gui image:icon_sun_accel" );
+		m_ServerTime.LoadImageFile( 2, "set:dayz_gui image:icon_moon" );
+		m_ServerTime.LoadImageFile( 3, "set:dayz_gui image:icon_moon_accel" );
+		
+		m_Root.SetHandler( this );
+	}
+	
+	void ~ServerBrowserEntry()
+	{
+		delete m_Root;
+	}
+	
+	Widget GetRoot()
+	{
+		return m_Root;
+	}
+	
+	void Show(bool show)
+	{
+		m_Root.Show( show );
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if (!IsOnline())
+		{
+			return false;
+		}
+		
+		#ifdef PLATFORM_CONSOLE
+		if ( w == m_Root	)
+		{
+			m_Tab.Connect( this );
+			return true;
+		}
+		#endif
+
+		if ( w == m_ServerModsExpand )
+		{
+			string mods_text;
+			if ( m_Mods && m_Mods.Count() > 0 )
+			{
+				mods_text = m_Mods[0];
+				for ( int i = 1; i < m_Mods.Count(); i++ )
+				{
+					mods_text += "\n" + m_Mods[i];
+				}
+			}
+
+			GetGame().GetUIManager().ShowDialog( "#main_menu_mods", mods_text, 0, 0, 0, 0, GetGame().GetUIManager().GetMenu() );
+		}
+
+		return false;
+	}
+	
+	override bool OnDoubleClick( Widget w, int x, int y, int button )
+	{
+		if (!IsOnline())
+		{
+			return false;
+		}
+		
+		if ( button == MouseState.LEFT )
+		{
+			if ( w == m_Root )
+			{
+				m_Tab.Connect( this );
+				return true;
+			}
+		}
+
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if ( button == MouseState.LEFT )
+		{
+			if ( w == m_Favorite )
+			{
+				ToggleFavorite();
+				return true;
+			}
+			else if ( w == m_Expand )
+			{
+				ToggleExpand();
+				return true;
+			}
+			else if ( w == m_Root )
+			{
+				Darken(w, x, y);
+				Select();
+				SetFocus( m_Root );
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		if ( IsFocusable( w ) )
+		{
+			Preview( w, x, y );
+			return true;
+		}
+
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		if ( IsFocusable( w ) && !IsFocusable( enterW ) )
+		{
+			Lighten( w, enterW, x, y );
+			return true;
+		}
+
+		return false;
+	}
+	
+	void Focus()
+	{
+		SetFocus( m_Root );
+	}
+	
+	void ServerListFocus( bool focus )
+	{
+		m_Tab.ServerListFocus( focus, m_IsFavorited );
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if ( !m_Selected )
+		{
+			if ( IsFocusable( w ) )
+				Darken( w, x, y );
+
+			#ifdef PLATFORM_CONSOLE
+			if ( w == m_Root )
+			{
+				Select();
+				ServerListFocus( true );
+			}
+			#endif
+
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		#ifdef PLATFORM_CONSOLE
+
+		if ( w == m_Root )
+		{
+			Deselect();
+			ServerListFocus( false );
+		}
+		#endif
+		
+		if ( IsFocusable( w ) )
+		{
+			Lighten( w, null, x, y );
+		}
+		
+		return true;
+		return false;
+	}
+	
+	bool IsOnline()
+	{
+		return m_IsOnline;
+	}
+	
+	bool IsFocusable( Widget w )
+	{
+		if ( w )
+			return ( w == m_Root || w == m_Favorite || w == m_Expand || w == m_ServerModsExpand );
+
+		return false;
+	}
+	
+	void FillInfo( GetServersResultRow server_info )
+	{	
+		m_ServerData = server_info;
+		m_FirstExpand = true;
+		
+#ifndef PLATFORM_CONSOLE
+		m_Root.FindAnyWidget( "detailed_info" ).Show( server_info.m_IsExpanded );
+#endif
+		
+		SetName( server_info.m_Name );
+		SetPasswordLocked( server_info.m_IsPasswordProtected );
+		SetPopulationEx( server_info );
+		SetSlots( server_info.m_MaxPlayers );
+		SetPing( server_info.m_Ping );
+		SetTime( server_info.m_TimeOfDay, server_info.m_EnvironmentTimeMul );
+		SetFavorite( server_info.m_Favorite );
+		SetModded( server_info.m_Modded );
+		SetMapName( server_info.m_MapNameToRun );
+		
+		#ifdef PLATFORM_CONSOLE
+		SetMouseAndKeyboard( server_info.m_MouseAndKeyboardEnabled );
+		#endif
+		
+#ifdef PLATFORM_WINDOWS
+#ifndef PLATFORM_CONSOLE
+		SetExpand( server_info.m_IsExpanded );
+		
+		int pp = 0; // private
+		if ( server_info.m_ShardId.Length() == 3 && server_info.m_ShardId.ToInt() < 200 )
+		{
+			pp = 1;	// official
+		}
+		
+		SetShard( pp );
+		SetCharacterAlive( server_info.m_CharactersAlive );
+		SetFriends( server_info.m_SteamFriends );
+		SetMode( server_info.m_Disable3rdPerson );
+		SetBattleye( server_info.m_AntiCheat );
+		SetIP( server_info.m_Id );
+		SetAcceleration( server_info.m_EnvironmentTimeMul );
+		SetServerMapName();
+#endif
+#endif
+	}
+	
+	void UpdateEntry()
+	{
+		if (m_ServerData.m_IsSelected)
+		{
+			Darken(m_Root, 0, 0);
+			Select();
+			SetFocus( m_Root );
+		}
+		else
+		{
+			Lighten(m_Root, null, 0, 0);
+		}
+	}
+	
+	void SetName( string name )
+	{
+		m_ServerName.SetText( name );
+	}
+	
+	void SetPasswordLocked( bool locked )
+	{
+		m_ServerLock.Show( locked );
+	}
+	
+	// DEPRECATED
+	void SetPopulation( int population, int slots )
+	{
+		int color = ARGBF(1, 1, 1, 1);
+		string pop_text = population.ToString() + "/" + slots.ToString();
+		
+		if ( slots > 0 )
+		{
+			float pop_percentage = population / slots;
+
+			if (pop_percentage >= 1)
+				color	= ARGBF( 1, 1, 0, 0 );
+			else if ( pop_percentage >= 0.8 )
+				color	= ARGBF( 1, 1, 0.5, 0 );
+		}
+
+		m_ServerPopulation.SetText(pop_text);
+		m_ServerPopulation.SetColor(color);
+		m_ServerPopulation.SetBold(true);
+		m_ServerPopulation.SetOutline(1);
+		
+	}
+	
+	private void SetPopulationEx(GetServersResultRow serverInfo)
+	{		
+		string popText = "";
+		int population = serverInfo.m_CurrentNumberPlayers;
+		int maxPlayers = serverInfo.m_MaxPlayers;
+		int playersInQueue = serverInfo.m_PlayersInQueue;
+		
+		if (IsOnline())
+		{
+			// sometimes servers report a queue size even though server isn't full,
+			// in which case we ignore queue size
+			if (playersInQueue > 0 && population == maxPlayers)
+			{
+				popText = population.ToString() + "+" + playersInQueue.ToString() + "/" + maxPlayers.ToString();
+			}
+			else
+			{
+				popText = population.ToString() + "/" + maxPlayers.ToString();
+			}
+		}
+		
+		else
+		{
+			popText = "-";
+		}
+
+		m_ServerPopulation.SetText(popText);
+	}
+	
+	void SetSlots( int slots )
+	{
+		if (IsOnline())
+		{
+			m_ServerSlots.SetText( slots.ToString() );
+		}
+		else
+		{
+			m_ServerSlots.SetText("-");
+		}
+	}
+	
+	void SetPing( int ping )
+	{
+		int color;
+		string displayValue;
+		
+		if ( ping < 50 )
+			color	= ARGBF( 1, 0, 1, 0 );
+		else if( ping < 100 )
+			color	= ARGBF( 1, 0.8, 0.8, 0 );
+		else if( ping < 200 )
+			color	= ARGBF( 1, 1, 0.5, 0 );
+		else
+			color	= ARGBF( 1, 1, 0, 0 );
+		
+		if (IsOnline())
+		{
+			displayValue = ping.ToString();
+		}
+		
+		else
+		{
+			displayValue = "-";
+		}
+		
+		m_ServerPing.SetColor( color );
+		m_ServerPing.SetText( displayValue );
+	}
+	
+	void SetTime( string time, float multiplier )
+	{
+		if ( time != "" )
+		{
+			TStringArray arr	= new TStringArray;
+			
+			time.Split( ":", arr );
+			
+			if ( arr.Count() == 2 )
+			{
+				int hour		= arr.Get( 0 ).ToInt();
+				int minute		= arr.Get( 1 ).ToInt();
+				
+				if ( hour >= 19 || hour <= 5 )	//Night
+				{
+					if ( multiplier > 1 )
+						m_ServerTime.SetImage( 3 );
+					else
+						m_ServerTime.SetImage( 2 );
+				}
+				else							//Day
+				{
+					if ( multiplier > 1 )
+						m_ServerTime.SetImage( 1 );
+					else
+						m_ServerTime.SetImage( 0 );
+				}
+			}
+		}
+	}
+	
+	void SetShard( int shard )
+	{
+		string text;
+		switch ( shard )
+		{
+			case 0:
+			{
+				text = "#server_browser_entry_private";
+				break;
+			}
+			case 1:
+			{
+				text = "#server_browser_entry_official";
+				break;
+			}
+		}
+		m_ServerShard.SetText( text );
+	}
+	
+	void SetMapName( string mapName )
+	{
+		RefreshDLCIcon();
+	}
+	
+	void RefreshDLCIcon()
+	{
+		if ( m_ServerData.m_IsDLC )
+		{
+			bool own = GetGame().VerifyWorldOwnership( GetMapToRun() );
+			m_ServerModIcon.Show( true );
+			m_ServerModIcon.FindWidget( "Owned" ).Show( own );
+			m_ServerModIcon.FindWidget( "Unowned" ).Show( !own );
+		}
+		else
+		{
+			m_ServerModIcon.FindWidget( "Owned" ).Show( false );
+			m_ServerModIcon.FindWidget( "Unowned" ).Show( false );
+		}
+	}
+	
+	void SetCharacterAlive( string char_alive )
+	{
+		if ( char_alive == "")
+			m_ServerCharacterAlive.SetText( "#STR_server_browser_char_not_alive" );
+		else
+			m_ServerCharacterAlive.SetText( char_alive );
+	}
+	
+	void SetFriends( string friends_text )
+	{
+		m_ServerFriends.SetText( friends_text );
+	}
+	
+	void SetMode( int mode )
+	{
+		string text;
+		switch ( mode )
+		{
+			case 0:
+			{
+				text = "#server_browser_entry_person_both";
+				break;
+			}
+			case 1:
+			{
+				text = "#server_browser_entry_person_first";
+				break;
+			}
+		}
+		m_ServerMode.SetText( text );
+	}
+	
+	void SetBattleye( bool battleye )
+	{
+		if ( battleye )
+		{
+			m_ServerBattleye.SetText( "#server_browser_entry_enabled" );
+			m_ServerBattleye.SetColor( ARGBF( 1, 0, 1, 0 ) );
+		}
+		else
+		{
+			m_ServerBattleye.SetText( "#server_browser_entry_disabled" );
+			m_ServerBattleye.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		}
+	}
+	
+	void SetIP( string ip )
+	{
+		m_ServerIP.SetText( ip );
+	}
+	
+	string GetIP()
+	{
+		return m_ServerData.GetIP();
+	}
+	
+	int GetPort()
+	{
+		return m_ServerData.m_HostPort;
+	}
+	
+	string GetServerID()
+	{
+		return m_ServerData.m_Id;
+	}
+	
+	string GetMapToRun()
+	{
+		return m_ServerData.m_MapNameToRun;
+	}
+	
+	string GetMapName()
+	{
+		string map_name = m_ServerData.m_MapNameToRun;
+		map_name.ToLower();
+
+		if ( map_name == "enoch" )
+			return "Livonia";
+		if ( map_name == "chernarusplus" )
+			return "Chernarus";
+
+		return m_ServerData.m_MapNameToRun;
+	}
+	
+	void SetFavorite( bool favorite )
+	{
+		m_IsFavorited = favorite;
+		m_Root.FindAnyWidget( "favorite_image" ).Show( favorite );
+		m_Root.FindAnyWidget( "unfavorite_image" ).Show( !favorite );		
+	}
+	
+	void SetAcceleration( float mult )
+	{
+		if ( mult > 1 )
+		{
+			m_ServerAcceleration.Show( true );
+			m_ServerAcceleration.SetText( mult.ToString() + "x" );
+		}
+		else
+		{
+			m_ServerAcceleration.Show( false );
+		}
+	}
+	
+	void SetModded( bool is_modded )
+	{
+		m_ServerModIcon.Show( is_modded );
+	}
+
+	void SetServerMapName()
+	{
+		m_ServerMap.SetText( GetMapName()  );
+	}
+		
+	void SetMods( array<string> mods )
+	{
+		m_Mods = mods;
+
+		//string mods_text = "#STR_USRACT_MAP" + ": " + GetMapName() + " | ";
+		if ( mods && mods.Count() > 0 )
+		{
+			string mods_text = mods[0];
+			for ( int i = 1; i < mods.Count(); i++ )
+				mods_text += ", " + mods[i];
+	
+			m_ServerMods.SetText( mods_text );
+		}
+
+		#ifdef PLATFORM_WINDOWS
+			m_ServerModsExpand.Show( ( mods && mods.Count() > 0 ) );
+		#endif
+	}
+	
+	void SetMouseAndKeyboard( bool is_mkenabled )
+	{
+		m_ServerMaKIcon.Show( is_mkenabled );
+	}
+	
+	void SetIsOnline(bool isOnline)
+	{
+		m_IsOnline = isOnline;
+	}
+	
+	bool ToggleFavorite()
+	{
+		m_IsFavorited = !m_IsFavorited;
+		string ip = m_ServerData.GetIP();
+#ifdef PLATFORM_WINDOWS	
+		//Save Data PC
+		m_Tab.GetRootMenu().AddFavorite(ip, m_ServerData.m_SteamQueryPort, m_IsFavorited);
+	
+	#ifdef PLATFORM_CONSOLE
+		OnlineServices.SetServerFavorited(ip, 0, m_ServerData.m_SteamQueryPort, m_IsFavorited);
+	#else
+		OnlineServices.SetServerFavorited(ip, m_ServerData.m_HostPort, m_ServerData.m_SteamQueryPort, m_IsFavorited);
+	#endif
+#else
+		//Save Data Console		
+		m_IsFavorited = m_Tab.GetRootMenu().SetFavoriteConsoles(ip, m_ServerData.m_HostPort, m_IsFavorited);
+#endif
+		
+		m_Root.FindAnyWidget( "unfavorite_image" ).Show( !m_IsFavorited );
+		m_Root.FindAnyWidget( "favorite_image" ).Show( m_IsFavorited );
+		
+		return m_IsFavorited;
+	}
+	
+	bool ToggleExpand()
+	{
+		return SetExpand(!m_IsExpanded);
+	}
+	
+	bool SetExpand(bool expand)
+	{
+		m_IsExpanded = expand;
+		m_Root.FindAnyWidget( "collapse_image" ).Show( m_IsExpanded );
+		m_Root.FindAnyWidget( "expand_image" ).Show( !m_IsExpanded );
+		m_Root.FindAnyWidget( "detailed_info" ).Show( m_IsExpanded );
+		
+		if ( m_ServerData )
+		{
+			m_ServerData.m_IsExpanded = m_IsExpanded;
+		}
+		
+		if ( expand && m_FirstExpand )
+		{
+			if ( m_ServerData.m_Modded )
+				OnlineServices.GetServerModList( m_ServerData.m_Id );
+/*
+			else
+				m_ServerMods.SetText( "#STR_USRACT_MAP" + ": " + GetMapName() );
+*/
+
+			m_FirstExpand = false;
+		}
+		
+		return m_IsExpanded;
+	}
+	
+	void Select( bool notify = true )
+	{
+		if ( !m_Selected )
+		{
+			if ( notify )
+			{
+				m_Tab.SelectServer( this );
+			}
+			
+			m_ServerData.m_IsSelected = true;
+			
+			m_Selected = true;
+			#ifdef PLATFROM_XBOX
+				m_Root.SetColor( ARGB( 1, 50, 50, 50 ) );
+			#endif
+		}
+	}
+	
+	void Deselect()
+	{
+		if ( m_Selected )
+		{
+			m_ServerData.m_IsSelected = false;		
+			m_Selected = false;
+			
+			Lighten( m_Root, null, 0, 0 );
+		}
+	}
+	
+	void UpdateColors()
+	{
+		float alpha = 1;
+		int maxPlayers = m_ServerData.m_MaxPlayers;
+		int whiteColor = ARGBF(1, 1, 1, 1);
+		int populationColor = whiteColor;
+		int populationOutline = 1;
+		
+		if (IsOnline())
+		{	
+			if ( maxPlayers > 0 )
+			{
+				int population = m_ServerData.m_CurrentNumberPlayers;
+				float pop_percentage = population / maxPlayers;
+	
+				if (pop_percentage >= 1)
+				{
+					populationColor	= ARGBF( 1, 1, 0, 0 );
+				}
+				else if ( pop_percentage >= 0.8 )
+				{
+					populationColor	= ARGBF( 1, 1, 0.5, 0 );
+				}
+			}
+		}
+		
+		else
+		{
+			alpha = 0.5;
+			populationOutline = 0;
+						
+			m_ServerPing.SetColor(whiteColor);
+		}
+		
+		m_ServerTime.Show(IsOnline());
+		m_ServerName.SetColor(whiteColor);
+		m_ServerName.SetAlpha(alpha);
+		m_ServerPopulation.SetBold(IsOnline());
+		m_ServerPopulation.SetColor(populationColor);
+		m_ServerPopulation.SetOutline(populationOutline);
+		m_ServerPopulation.SetAlpha(alpha);
+		m_ServerSlots.SetAlpha(alpha);
+		m_ServerPing.SetAlpha(alpha);
+		m_Root.SetAlpha(alpha);
+		
+#ifndef PLATFORM_CONSOLE
+		m_Expand.Show(IsOnline());
+#endif
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void Preview( Widget w, int x, int y )
+	{		
+		if ( m_Selected )
+			return;
+		
+		if ( w == m_Root || w == m_Favorite || w == m_Expand )
+		{
+			m_Root.SetColor( ARGB( 255, 0, 0, 0) );
+			m_Root.SetAlpha( 1 );
+			UpdateColors();
+			
+			m_ServerName.SetColor( ARGB( 255, 255, 0, 0 ) );
+			if (!IsOnline())
+			{
+				m_ServerName.SetAlpha(0.5);
+			}
+		}
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void Darken( Widget w, int x, int y )
+	{
+		if ( m_Selected )
+			return;
+		
+		if ( w == m_Root || w == m_Favorite || w == m_Expand )
+		{
+			m_Root.SetColor( ARGB( 255, 200, 0, 0) );
+			SetPopulationEx(m_ServerData);
+			UpdateColors();
+		}
+	}
+	
+	void Lighten( Widget w, Widget enterW, int x, int y )
+	{
+		float alpha = 0.3;
+		
+		if ( GetFocus() == w || m_Selected )
+		{
+			return;
+		}
+		
+		if ( w == m_Root && ( ( m_Favorite && enterW == m_Favorite ) || ( m_Expand && enterW == m_Expand ) ) )
+		{
+			return;
+		}
+
+		m_Root.SetColor( ARGB( 255, 0, 0, 0) );			
+		SetPopulationEx(m_ServerData);
+		UpdateColors();
+		
+		if ( m_Index % 2 )
+		{
+			alpha = 0;
+		}
+		
+		m_Root.SetAlpha( alpha );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFavoritesTabConsolePages.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFavoritesTabConsolePages.c
new file mode 100644
index 0000000000000000000000000000000000000000..6f15db420ed9da53dd9b4289c23fc1b8b1ccc7b1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFavoritesTabConsolePages.c
@@ -0,0 +1,161 @@
+class ServerBrowserFavoritesTabConsolePages extends ServerBrowserTabConsolePages
+{	
+	protected override void Construct(Widget parent, ServerBrowserMenuNew menu, TabType type)
+	{
+		super.Construct(parent, menu, type);
+		
+		// disabling filter section
+		m_Root.FindAnyWidget("filters_content").Show(false);
+		m_Root.FindAnyWidget("reset_filter_button").Show(false);
+	}
+	
+	override void OnLoadServersAsyncFinished()
+	{
+		// m_TotalLoadedServers for FAVORITES tab is determined by total number of favorited servers
+		TStringArray favIds = m_Menu.GetFavoritedServerIds();
+		m_TotalLoadedServers = favIds.Count();
+		super.OnLoadServersAsyncFinished();
+	}
+	
+	protected override void LoadEntries( int cur_page_index , GetServersResultRowArray page_entries )
+	{
+		if (cur_page_index == 1)
+		{
+			m_OnlineFavServers.Clear();
+		}
+		
+		super.LoadEntries(cur_page_index, page_entries);
+	}
+	
+	protected override void LoadExtraEntries(int index)
+	{
+		if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+		{
+			return;
+		}
+		
+		// m_PagesCount for FAVORITES tab is determined by total number of favorited servers
+		TStringArray favIds = m_Menu.GetFavoritedServerIds();
+		m_PagesCount = Math.Ceil((float)favIds.Count() /  SERVER_BROWSER_PAGE_SIZE);
+		
+		// offlineFavIds will always have same order, even across pages,
+		// to ensure we display only fav servers that HAVEN'T been displayed yet
+		TStringArray offlineFavIds = new TStringArray();
+		offlineFavIds.Reserve(favIds.Count() - m_OnlineFavServers.Count());
+		foreach (string ipPort : favIds)
+		{
+			if (m_OnlineFavServers.Find(ipPort) == -1)
+			{
+				offlineFavIds.Insert(ipPort);
+			}
+		}
+		
+		// appending offline servers to server list
+		int totalServersAlreadyShown = (GetCurrentPage() - 1) * SERVER_BROWSER_PAGE_SIZE + index;
+		int startingIndex = totalServersAlreadyShown - m_OnlineFavServers.Count();
+		for (int i = startingIndex; i < offlineFavIds.Count(); ++i)
+		{
+			string favServerId = offlineFavIds[i];
+			
+			// only append server if there is a free entry left on the page
+			if (index >= SERVER_BROWSER_PAGE_SIZE)
+			{
+				break;
+			}
+			
+			if (m_OnlineFavServers.Find(favServerId) > -1)
+			{
+				continue;
+			}
+			
+			array<string> parts = new array<string>;
+			favServerId.Split(":", parts);
+			
+			// ensure server id has correct format
+			if (parts.Count() != 2)
+			{
+				continue;
+			}
+			
+			GetServersResultRow offlineRow = new GetServersResultRow();
+			offlineRow.m_Name = favServerId;
+			offlineRow.m_Id = favServerId;
+			offlineRow.m_HostIp = parts[0];
+			offlineRow.m_HostPort = parts[1].ToInt();
+			offlineRow.m_SteamQueryPort = offlineRow.m_HostPort;
+			offlineRow.m_Favorite = true;
+			
+			ServerBrowserEntry entry = GetServerEntryByIndex( index );
+			entry.SetIsOnline(false);
+			entry.FillInfo(offlineRow);
+			entry.UpdateEntry();
+			
+			m_EntryWidgets.Insert(favServerId, entry);
+			m_EntriesSorted[m_SortType].Insert(offlineRow);
+			
+			index++;
+		}
+	}
+	
+	override void RefreshList()
+	{
+		super.RefreshList();
+#ifdef PLATFORM_WINDOWS
+		m_CurrentFilterInput.SetFavorited( true );
+#endif
+		AddFavoritesToFilter(m_CurrentFilterInput);
+		OnlineServices.LoadServers(m_CurrentFilterInput);
+	}
+	
+	override bool PassFilter(GetServersResultRow result)
+	{
+		if (m_TabType == TabType.FAVORITE)
+ 		{
+	 	 	if (!m_Menu.IsFavorited(result.GetIpPort()))
+	 	 	{
+	 	 		return false;
+	 	 	}
+ 	 	}
+		
+		return super.PassFilter(result);
+	}
+	
+	override void PressY()
+	{
+		switch ( m_SelectedPanel )
+		{
+			// filters are disabled for console FAVORITES tab, so do nothing
+			case SelectedPanel.FILTERS:
+			{	
+				break;
+			}
+			default:
+			{
+				super.PressY();
+				break;
+			}
+		}
+	}
+	
+	override void PressX()
+	{
+		if ( (GetGame().GetTime() - m_TimeLastServerRefresh) > 1000 )
+		{
+			SetCurrentPage(1);
+			super.PressX();
+		}
+	}
+	
+	override void SetFocusFilters()
+	{
+		super.SetFocusFilters();
+			
+		m_Menu.ShowYButton(false);
+		m_Menu.ShowAButton(false);
+		
+		// focus on the back button instead of filter section
+		m_Menu.BackButtonFocus();
+		
+		UpdatePageButtons();
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFavoritesTabPc.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFavoritesTabPc.c
new file mode 100644
index 0000000000000000000000000000000000000000..453ea237c9a69794cedde22b432a65b9f071bd4c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFavoritesTabPc.c
@@ -0,0 +1,101 @@
+class ServerBrowserFavoritesTabPc extends ServerBrowserTabPc
+{
+	// value = ip, name, connection port, query port
+	private ref array<ref CachedServerInfo> m_CachedFavoriteServerInfo;
+	
+	protected override void Construct(Widget parent, ServerBrowserMenuNew menu, TabType type)
+	{
+		m_CachedFavoriteServerInfo = new array<ref CachedServerInfo>();
+		
+		super.Construct(parent, menu, type);
+		DisableFilters();
+	}
+
+	protected override void LoadExtraEntries(int index)
+	{
+		array<ref Param2<string, CachedServerInfo>> relevantCachedInfo = new array<ref Param2<string, CachedServerInfo>>();	
+		foreach (CachedServerInfo cachedInfo : m_CachedFavoriteServerInfo)
+		{
+			string serverId = GetConnEndPoint(cachedInfo);
+			
+			// ensure the cached server is still favorited
+			if (!m_Menu.IsFavorited(GetQueryEndPoint(cachedInfo)))
+			{
+				continue;
+			}
+			
+			if (m_OnlineFavServers.Find(serverId) > -1)
+			{
+				continue;
+			}
+			
+			relevantCachedInfo.Insert(new Param2<string, CachedServerInfo>(serverId, cachedInfo));
+		}
+		
+		// adding FAVORITED, OFFLINE servers to favorites tab
+		int totalServersAlreadyShown = m_PageIndex * SERVERS_VISIBLE_COUNT + index;
+		int startingIndex = totalServersAlreadyShown - m_TotalLoadedServers;
+		m_TotalLoadedServers += relevantCachedInfo.Count();
+		for (int i = startingIndex; i < relevantCachedInfo.Count(); ++i)
+		{
+			if (index >= SERVERS_VISIBLE_COUNT)
+			{
+				break;
+			}
+			
+			Param2<string, CachedServerInfo> relevantEntry = relevantCachedInfo[i];
+			
+			cachedInfo = relevantEntry.param2;			
+			string ip = cachedInfo.param1;
+			string cachedName = cachedInfo.param2;
+			int connPort = cachedInfo.param3;
+			int queryPort = cachedInfo.param4;
+
+			// do NOT insert offlineRow into m_EntriesSorted[m_SortType]!!
+			// we assume that rows already in m_EntriesSorted[m_SortType] are ONLINE,
+			// if we add offline info to m_EntriesSorted[m_SortType] then we cannot differente
+			// between online and offline servers			
+			GetServersResultRow offlineRow = new GetServersResultRow();
+			offlineRow.m_Id = relevantEntry.param1;
+			offlineRow.m_Name = cachedName;
+			offlineRow.m_HostIp = ip;
+			offlineRow.m_SteamQueryPort = queryPort;
+			offlineRow.m_HostPort = connPort;
+			offlineRow.m_Favorite = true;
+			
+			ServerBrowserEntry entry = GetServerEntryByIndex(index, offlineRow.m_Id);
+			entry.Show(true);
+			entry.SetIsOnline(false);
+			entry.FillInfo(offlineRow);
+			entry.UpdateEntry();
+			
+			index++;
+		}
+	}
+	
+	override void RefreshList()
+	{
+		OnlineServices.GetCachedFavServerInfo(m_CachedFavoriteServerInfo);
+		
+		m_OnlineFavServers.Clear();
+		super.RefreshList();
+		
+		m_CurrentFilterInput.SetFavorited( true );
+		AddFavoritesToFilter(m_CurrentFilterInput);
+		OnlineServices.LoadServers(m_CurrentFilterInput);
+	}
+
+	private string GetConnEndPoint(CachedServerInfo cachedInfo)
+	{
+		string ip = cachedInfo.param1;
+		int connPort = cachedInfo.param3;
+		return ip + ":" + connPort;
+	}
+	
+	private string GetQueryEndPoint(CachedServerInfo cachedInfo)
+	{
+		string ip = cachedInfo.param1;
+		int queryPort = cachedInfo.param4;
+		return ip + ":" + queryPort;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFilterContainer.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFilterContainer.c
new file mode 100644
index 0000000000000000000000000000000000000000..08b83425b50a0f05350f67b1d556dc9128576d86
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserFilterContainer.c
@@ -0,0 +1,584 @@
+class ServerBrowserFilterContainer extends ScriptedWidgetEventHandler
+{
+	ref map<string, string>		m_Options = new map<string, string>;
+	
+	protected EditBoxWidget					m_SearchByName;
+	protected EditBoxWidget					m_SearchByIP;
+			ref OptionSelectorMultistate	m_CharacterAliveFilter;
+			ref OptionSelectorMultistate	m_SortingFilter;
+			ref OptionSelectorMultistate	m_RegionFilter;
+			ref OptionSelectorMultistate	m_PingFilter;
+			ref OptionSelector				m_DLCFilter;
+			ref OptionSelector				m_FavoritedFilter;
+			ref OptionSelector				m_FriendsPlayingFilter;
+			ref OptionSelector				m_BattleyeFilter; // DEPRECATED
+			ref OptionSelector				m_PasswordFilter;
+			ref OptionSelector				m_WhitelistFilter;
+			ref OptionSelector				m_KeyboardFilter;
+			ref OptionSelector				m_PreviouslyPlayedFilter;
+			ref OptionSelector				m_VersionMatchFilter;
+			ref OptionSelector				m_FullServerFilter;
+			ref OptionSelector				m_ThirdPersonFilter;
+			ref OptionSelector				m_PublicFilter; // DEPRECATED
+			ref OptionSelector				m_AcceleratedTimeFilter; // DEPRECATED
+	protected ServerBrowserTab				m_Tab;
+	
+	void ServerBrowserFilterContainer( Widget root, ServerBrowserTab parent )
+	{
+		string player_name;
+		GetGame().GetPlayerName( player_name );
+		m_Tab = parent;
+		
+		array<string> character_name_options ={ "#server_browser_disabled", player_name };
+		array<string> region_options = { "#server_browser_all", "#server_browser_americas", "#server_browser_europe", "#server_browser_asia" };
+		array<string> sort_options = { "#server_browser_column_host A-Z", "#server_browser_column_host Z-A", "#players_title >", "#players_title <" };
+		array<string> ping_options = { "#server_browser_disabled", "<30", "<50", "<100", "<200", "<300", "<500" };
+		array<string> two_options = { "#server_browser_disabled", "#server_browser_show" };
+		
+		m_SearchByName				= EditBoxWidget.Cast( root.FindAnyWidget( "search_name_setting_option" ) );
+		
+		m_RegionFilter				= new OptionSelectorMultistate( root.FindAnyWidget( "region_setting_option" ), 0, this, false, region_options );
+		m_PingFilter				= new OptionSelectorMultistate( root.FindAnyWidget( "ping_setting_option" ), 0, this, false, ping_options );
+		#ifdef PLATFORM_CONSOLE
+		m_FavoritedFilter			= new OptionSelectorMultistate( root.FindAnyWidget( "favorites_setting_option" ), 0, this, false, two_options );
+		#else
+		m_FavoritedFilter			= new OptionSelector( root.FindAnyWidget( "favorites_setting_option" ), 0, this, false );
+		#endif
+		
+		m_DLCFilter					= new OptionSelector( root.FindAnyWidget( "dlc_setting_option" ), 0, this, false );
+		m_FriendsPlayingFilter		= new OptionSelector( root.FindAnyWidget( "friends_setting_option" ), 0, this, false );
+		m_PreviouslyPlayedFilter	= new OptionSelector( root.FindAnyWidget( "prev_played_setting_option" ), 0, this, false );
+		m_FullServerFilter			= new OptionSelector( root.FindAnyWidget( "full_server_setting_option" ), 0, this, false );
+		m_ThirdPersonFilter			= new OptionSelector( root.FindAnyWidget( "tps_setting_option" ), 0, this, false );
+		m_PasswordFilter			= new OptionSelector( root.FindAnyWidget( "password_setting_option" ), 0, this, false );
+		m_WhitelistFilter			= new OptionSelector( root.FindAnyWidget( "whitelist_setting_option" ), 0, this, false );
+		
+		m_DLCFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_RegionFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_PingFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_FavoritedFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_FriendsPlayingFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_PreviouslyPlayedFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_FullServerFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_ThirdPersonFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_PasswordFilter.m_OptionChanged.Insert( OnFilterChanged );
+		m_WhitelistFilter.m_OptionChanged.Insert( OnFilterChanged );
+		
+		#ifdef PLATFORM_CONSOLE
+			m_SortingFilter			= new OptionSelectorMultistate( root.FindAnyWidget( "sort_setting_option" ), 0, this, false, sort_options );
+			m_KeyboardFilter		= new OptionSelector( root.FindAnyWidget( "keyboard_setting_option" ), 0, this, false );
+		
+			m_SortingFilter.m_OptionChanged.Insert( OnSortChanged );
+			m_SortingFilter.m_OptionChanged.Insert( OnFilterChanged );
+			m_KeyboardFilter.m_OptionChanged.Insert( OnFilterChanged );
+		
+			m_PingFilter.Disable();
+			m_FriendsPlayingFilter.Disable();
+		#endif
+		
+		#ifdef PLATFORM_WINDOWS
+			#ifndef PLATFORM_CONSOLE	
+				m_SearchByIP				= EditBoxWidget.Cast( root.FindAnyWidget( "search_ip_setting_option" ) );
+		
+				m_SearchByName.SetHandler( this );
+				m_SearchByIP.SetHandler( this );
+		
+				m_CharacterAliveFilter		= new OptionSelectorMultistate( root.FindAnyWidget( "restrict_char_setting_option" ), 0, this, false, character_name_options );
+				m_VersionMatchFilter		= new OptionSelector( root.FindAnyWidget( "ver_match_setting_option" ), 0, this, false );
+		
+				m_CharacterAliveFilter.m_OptionChanged.Insert( OnFilterChanged );
+				m_VersionMatchFilter.m_OptionChanged.Insert( OnFilterChanged );
+			#endif
+		#endif
+		LoadFilters();
+	}
+	
+	void OnFilterChanged()
+	{
+		m_Tab.OnFilterChanged();
+	}
+	
+	void LoadFilters()
+	{
+		string data;
+		if (m_Tab.GetTabType() == TabType.LAN || m_Tab.GetTabType() == TabType.FAVORITE)
+			return;
+		
+		GetGame().GetProfileString("SB_Filter_" + m_Tab.GetTabType(), data);
+		
+		m_Options.Clear();
+		
+		if (data != "")
+		{
+			string errorMessage;
+			if (!JsonFileLoader<ref map<string, string>>.LoadData(data, m_Options, errorMessage))
+				ErrorEx(errorMessage);
+		}
+		
+		if (m_Options && m_Options.Count() >= 6)
+		{
+			m_SearchByName.SetText( m_Options.Get( "m_SearchByName" ) );
+			m_DLCFilter.SetStringOption( m_Options.Get( "m_DLCFilter" ) );
+			m_RegionFilter.SetStringOption( m_Options.Get( "m_RegionFilter" ), false );
+			m_PingFilter.SetStringOption( m_Options.Get( "m_PingFilter" ), false );
+			m_FriendsPlayingFilter.SetStringOption( m_Options.Get( "m_FriendsPlayingFilter" ), false );
+			m_PreviouslyPlayedFilter.SetStringOption( m_Options.Get( "m_PreviouslyPlayedFilter" ), false );
+			m_FullServerFilter.SetStringOption( m_Options.Get( "m_FullServerFilter" ), false );
+			m_ThirdPersonFilter.SetStringOption( m_Options.Get( "m_ThirdPersonFilter" ), false );
+			m_PasswordFilter.SetStringOption( m_Options.Get( "m_PasswordFilter" ), false );
+			m_WhitelistFilter.SetStringOption( m_Options.Get( "m_WhitelistFilter" ), false );
+			
+			#ifdef PLATFORM_CONSOLE
+				m_SortingFilter.SetStringOption( m_Options.Get( "m_SortingFilter" ), false );
+				m_KeyboardFilter.SetStringOption( m_Options.Get( "m_KeyboardFilter" ), false );
+			#else
+				m_FavoritedFilter.SetStringOption( m_Options.Get( "m_FavoritedFilter" ), false );
+			#endif
+			
+			if (m_Options.Count() >= 12)
+			{
+				#ifdef PLATFORM_WINDOWS
+					#ifndef PLATFORM_CONSOLE
+						m_SearchByIP.SetText( m_Options.Get( "m_SearchByIP" ) );
+						m_CharacterAliveFilter.SetStringOption( m_Options.Get( "m_CharacterAliveFilter" ), false );
+						m_VersionMatchFilter.SetStringOption( m_Options.Get( "m_VersionMatchFilter" ), false );
+					#endif
+				#endif
+			}
+		}
+	}
+	
+	void SaveFilters()
+	{
+		m_Options.Clear();
+		
+		m_Options.Insert( "m_SearchByName", m_SearchByName.GetText() );
+		m_Options.Insert( "m_DLCFilter", m_DLCFilter.GetStringValue() );
+		m_Options.Insert( "m_RegionFilter", m_RegionFilter.GetStringValue() );
+		m_Options.Insert( "m_PingFilter", m_PingFilter.GetStringValue() );
+		m_Options.Insert( "m_FriendsPlayingFilter", m_FriendsPlayingFilter.GetStringValue() );
+		m_Options.Insert( "m_PreviouslyPlayedFilter", m_PreviouslyPlayedFilter.GetStringValue() );
+		m_Options.Insert( "m_FullServerFilter", m_FullServerFilter.GetStringValue() );
+		m_Options.Insert( "m_ThirdPersonFilter", m_ThirdPersonFilter.GetStringValue() );
+		m_Options.Insert( "m_PasswordFilter", m_PasswordFilter.GetStringValue() );
+		m_Options.Insert( "m_WhitelistFilter", m_WhitelistFilter.GetStringValue() );
+		
+		#ifdef PLATFORM_CONSOLE
+			m_Options.Insert( "m_SortingFilter", m_SortingFilter.GetStringValue() );
+			m_Options.Insert( "m_KeyboardFilter", m_KeyboardFilter.GetStringValue() );
+		#else
+			m_Options.Insert( "m_FavoritedFilter", m_FavoritedFilter.GetStringValue() );
+		#endif
+		
+		#ifdef PLATFORM_WINDOWS
+			#ifndef PLATFORM_CONSOLE
+				m_Options.Insert( "m_SearchByIP", m_SearchByIP.GetText() );
+				m_Options.Insert( "m_CharacterAliveFilter", m_CharacterAliveFilter.GetStringValue() );
+				m_Options.Insert( "m_VersionMatchFilter", m_VersionMatchFilter.GetStringValue() );
+			#endif
+		#endif
+
+		string data, errorMessage;
+		if (!JsonFileLoader<ref map<string, string>>.MakeData(m_Options, data, errorMessage))
+			ErrorEx(errorMessage);
+
+		GetGame().SetProfileString("SB_Filter_" + m_Tab.GetTabType(), data);
+	}
+	
+	void ResetFilters()
+	{
+		m_SearchByName.SetText( "" );
+		m_RegionFilter.Reset();
+		m_DLCFilter.Reset();
+		m_PingFilter.Reset();
+		m_FavoritedFilter.Reset();
+		m_FriendsPlayingFilter.Reset();
+		m_PreviouslyPlayedFilter.Reset();
+		m_FullServerFilter.Reset();
+		m_ThirdPersonFilter.Reset();
+		m_PasswordFilter.Reset();
+		m_WhitelistFilter.Reset();
+		
+		#ifdef PLATFORM_CONSOLE
+			m_SortingFilter.Reset();
+			m_KeyboardFilter.Reset();
+		#endif
+		
+		#ifdef PLATFORM_WINDOWS
+			#ifndef PLATFORM_CONSOLE
+				m_SearchByIP.SetText( "" );
+				m_CharacterAliveFilter.Reset();
+				m_VersionMatchFilter.Reset();
+			#endif
+		#endif
+		SaveFilters();
+	}
+	
+	bool PingIsSet()
+	{
+		return ( m_Options["m_PingFilter"] != m_PingFilter.GetOptions()[0] );
+	}
+	
+	bool FavoriteIsSet()
+	{
+		return ( m_Options["m_FavoritedFilter"] != m_FavoritedFilter.GetOptions()[0] );
+	}
+	
+	bool PreviouslyIsSet()
+	{
+		return ( m_Options["m_PreviouslyPlayedFilter"] != m_PreviouslyPlayedFilter.GetOptions()[0] );
+	}
+	
+	//! Removes all characters from the given string whirh are NOT a number, '.' or ':'. Returns true if any change was done to the input text.
+	bool ProcessIntoIPAddress(out string potential_ip)
+	{
+		bool was_text_changed = false;
+		int length = potential_ip.Length();
+		
+		// Filter out incompatible characters
+		for ( int i = length - 1 ; i >= 0; --i )
+		{
+			string character = potential_ip.Get(i);
+			
+			if ( character.ToInt() == 0  &&  character != "0"  &&  character != "."  &&  character != ":" )
+			{
+				potential_ip = potential_ip.SubstringInverted(potential_ip, i, i + 1);
+				was_text_changed = true;
+			}
+		}
+		
+		bool text_was_shortened = LimitTextBoxCharacterCount( potential_ip, 21 );
+		
+		return (was_text_changed  ||  text_was_shortened);
+	}
+	
+	//! Limits the given text to 'max_length' character count. Returns true if any change was done to the input.
+	bool LimitTextBoxCharacterCount( out string text, int max_length )
+	{
+		int length = text.Length();
+		bool was_text_changed = false;
+		
+		if ( length > max_length )
+		{
+			text = text.Substring(0, max_length);
+			was_text_changed = true;
+		}
+		
+		return was_text_changed;
+	}
+	
+	//! Attempts to generate a valid IP address & port from the given string in format like this: "192.168.0.2:2503". If the process fails, then an empty string is returned.
+	string GenerateValidIP(string potential_ip)
+	{
+		string correct_ip_format;
+		
+		TStringArray array_ip_and_port = new TStringArray;
+		potential_ip.Split( ":", array_ip_and_port );
+		
+		string ip_entries;
+		int port;
+		
+		if( array_ip_and_port.Count() > 0 )
+		{
+			ip_entries = array_ip_and_port.Get( 0 );
+			TStringArray array_ip = new TStringArray;
+			ip_entries.Split( ".", array_ip );
+			
+			string ip_string;
+			int ip_entries_count = array_ip.Count();
+			
+			if (ip_entries_count <= 3  ||  ip_entries_count > 4)
+				return "";
+			
+			for ( int i = 0; i < 4; i++ )
+			{
+				int ip_entry = array_ip.Get(i).ToInt();
+				
+				// Check if the entry is a valid number
+				if ( ip_entry > 255  ||  ip_entry < 0 )
+					ip_entry = 0;
+				
+				ip_string = ip_string + ip_entry.ToString();
+				
+				if ( i < ip_entries_count - 1 )
+					ip_string = ip_string + ".";
+				;
+			}
+			
+			correct_ip_format = ip_string;
+		}
+		else
+		{
+			ip_entries = "";
+			correct_ip_format = ip_entries;
+		}
+
+		if ( correct_ip_format == "" )
+			return ""; // Input string was not recognized as a valid IP address. Thus return an empty string.
+		
+		// The input string was recognized as a valid IP address. Thus continue with port number.
+		
+		if( array_ip_and_port.Count() > 1 )
+		{
+			port = array_ip_and_port.Get( 1 ).ToInt();
+			
+			if ( port > 65535  |  port < 0 ) // max port value is 65535
+				port = 2302;
+			
+			
+			if ( port >= 0 )
+				correct_ip_format = correct_ip_format + ":" + port.ToString();
+			
+		}
+		else
+		{
+			port = 2302;
+			correct_ip_format = correct_ip_format + ":" + port.ToString();
+		}
+		
+		return correct_ip_format;
+	}
+	
+	//! Turns any given string into a more convenient filter (limits character count, forces lowercase, trims empty spaces).
+	bool GenerateValidFilter(out string potential_filter)
+	{
+		return LimitTextBoxCharacterCount( potential_filter, 16 );
+	}
+	
+	void OnSortChanged( int value )
+	{
+		switch( value )
+		{
+			case 0:
+			{
+				m_Tab.SetSort( ESortType.HOST, ESortOrder.ASCENDING );
+				break;
+			}
+			case 1:
+			{
+				m_Tab.SetSort( ESortType.HOST, ESortOrder.DESCENDING );
+				break;
+			}
+			case 2:
+			{
+				m_Tab.SetSort( ESortType.POPULATION, ESortOrder.DESCENDING );
+				break;
+			}
+			case 3:
+			{
+				m_Tab.SetSort( ESortType.POPULATION, ESortOrder.ASCENDING );
+				break;
+			}
+		}
+	}
+	
+	void Focus()
+	{
+		SetFocus( m_SearchByName );
+		/*
+		#ifdef PLATFORM_CONSOLE
+			m_SortingFilter.Focus();
+		#else
+		#ifdef PLATFORM_WINDOWS
+			SetFocus( m_SearchByName );
+		#endif
+		#endif
+		*/
+	}
+	
+	override bool OnChange( Widget w, int x, int y, bool finished )
+	{
+		if( w )
+		{
+			if( w == m_SearchByName )
+			{
+				string input_name = m_SearchByName.GetText();
+				
+				if ( GenerateValidFilter( input_name ) )
+					m_SearchByName.SetText( input_name ); // Warning! Using SetText() causes the cursor to move at the end of the text box!
+				
+				OnFilterChanged();
+				SetFocus( m_SearchByName );
+	
+				return true;
+			}
+			else if( w == m_SearchByIP )
+			{
+				string input_ip = m_SearchByIP.GetText();
+				
+				if ( ProcessIntoIPAddress( input_ip ) )
+					m_SearchByIP.SetText( input_ip ); // Warning! Using SetText() causes the cursor to move at the end of the text box!
+				
+				OnFilterChanged();
+				SetFocus( m_SearchByIP );
+				
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		m_Tab.OnFilterFocus( w );
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		return m_Tab.OnMouseEnter( w, x, y );
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		return m_Tab.OnMouseLeave( w, enterW, x, y );
+	}
+	
+	GetServersInput GetFilterOptionsPC()
+	{
+		GetServersInput input = new GetServersInput();
+		
+		input.m_RowsPerPage = SERVER_BROWSER_PAGE_SIZE;
+		input.m_Platform = 1;
+		
+		if (m_SearchByName)
+		{
+			string name_text = m_SearchByName.GetText();
+			if ( name_text != "" )
+			{
+				input.SetNameFilter( name_text);
+			}
+		}
+
+		if (m_DLCFilter.IsSet())
+		{
+			input.SetIsDLC( m_DLCFilter.IsEnabled());
+		}
+		
+		if (m_FullServerFilter.IsSet())
+		{
+			input.SetFullServer( m_FullServerFilter.IsEnabled());
+		}
+		
+		if (m_ThirdPersonFilter.IsSet())
+		{
+			input.SetThirdPerson( m_ThirdPersonFilter.IsEnabled());
+		}
+		
+		if (m_PasswordFilter.IsSet())
+		{
+			input.SetPassworded( m_PasswordFilter.IsEnabled());
+		}
+		
+		if (m_WhitelistFilter.IsSet())
+		{
+			input.SetWhitelistEnabled( m_WhitelistFilter.IsEnabled());
+		}
+		
+		#ifndef PLATFORM_CONSOLE
+			if (m_SearchByIP)
+			{
+				string ip_text = m_SearchByIP.GetText();
+				if (ip_text != "")
+				{				
+					input.SetHostIp( ip_text);
+				}
+			}
+			
+			if (m_PingFilter.IsSet())
+			{
+				string str_ping = m_PingFilter.GetStringValue();
+				int ping = str_ping.Substring(1, str_ping.Length() - 1).ToInt();
+				input.SetPingFilter( ping);
+			}
+		
+			if (m_FriendsPlayingFilter.IsSet())
+			{
+				input.SetFriendsPlaying( m_FriendsPlayingFilter.IsEnabled());
+			}
+		
+			if (m_PreviouslyPlayedFilter.IsSet())
+			{
+				input.SetPreviouslyPlayed( m_PreviouslyPlayedFilter.IsEnabled());
+			}
+			
+			if (m_VersionMatchFilter.IsSet())
+			{
+				input.SetProperVersionMatch( m_VersionMatchFilter.IsEnabled());
+			}
+		#endif
+		
+		return input;
+	}
+	
+	GetServersInput GetFilterOptionsConsoles()
+	{
+		GetServersInput input = new GetServersInput();
+		
+		input.m_RowsPerPage = SERVER_BROWSER_PAGE_SIZE;
+
+		#ifdef PLATFORM_XBOX
+			input.m_Platform = 2;
+		#endif
+		#ifdef PLATFORM_PS4
+			input.m_Platform = 3;
+		#endif
+		
+		if (m_SearchByName)
+		{
+			string name_text = m_SearchByName.GetText();
+			if( name_text != "" )
+			{
+				input.SetNameFilter(name_text);
+			}
+		}
+		
+		if (m_RegionFilter.IsSet())
+		{
+			input.SetRegionIdFilter(m_RegionFilter.GetValue());
+		}
+		
+		if (m_DLCFilter.IsSet())
+		{
+			input.SetIsDLC(m_DLCFilter.IsEnabled());
+		}
+
+		if (m_FullServerFilter.IsSet())
+		{
+			input.SetFullServer(m_FullServerFilter.IsEnabled());
+			if (m_FullServerFilter.IsEnabled())
+			{
+				input.SetFreeSlotsMax(1);
+			}
+			else
+			{
+				input.SetFreeSlotsMin(1);
+			}
+		}
+			
+		if (m_ThirdPersonFilter.IsSet())
+		{
+			// modeId is used to specify whether third person is allowed on CONSOLE servers
+			// ALLOW third person: modeId = 0
+			// BLOCK third person: modeId = 1
+			input.SetModeIdFilter(!m_ThirdPersonFilter.IsEnabled());	
+		}
+
+		if (m_PasswordFilter.IsSet())
+		{
+			input.SetIsPasswordProtectedFilter(m_PasswordFilter.IsEnabled());
+		}
+
+		if (m_WhitelistFilter.IsSet())
+		{
+			input.SetWhitelistEnabled(m_WhitelistFilter.IsEnabled());
+		}
+							
+		if (m_KeyboardFilter.IsSet())
+		{
+			input.SetMouseAndKeyboardEnabled( m_KeyboardFilter.IsEnabled());
+		}
+		
+		return input;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserMenuNew.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserMenuNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..440648339f92316bad2996894c96564d66cf76d1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserMenuNew.c
@@ -0,0 +1,757 @@
+const int MAX_FAVORITES = 25;
+
+#ifdef PLATFORM_CONSOLE
+const int SERVER_BROWSER_PAGE_SIZE = 22;
+#else
+const int SERVER_BROWSER_PAGE_SIZE = 5;
+#endif
+
+class ServerBrowserMenuNew extends UIScriptedMenu
+{
+	protected Widget				m_Play;
+	protected Widget				m_Back;
+	protected Widget				m_CustomizeCharacter;
+	protected TextWidget			m_PlayerName;
+	
+	protected TabberUI				m_Tabber;
+	protected ref ServerBrowserTab	m_OfficialTab;
+	protected ref ServerBrowserTab	m_CommunityTab;
+	protected ref ServerBrowserTab  m_FavoritesTab;
+	protected ref ServerBrowserTab	m_LANTab;
+	
+	protected TabType				m_IsRefreshing = TabType.NONE;
+	protected ref TStringArray		m_Favorites;
+	protected ServerBrowserEntry	m_SelectedServer;
+	
+	override Widget Init()
+	{
+		#ifdef PLATFORM_CONSOLE
+		layoutRoot 		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/server_browser/xbox/server_browser.layout");
+		m_FavoritesTab  = new ServerBrowserFavoritesTabConsolePages(layoutRoot.FindAnyWidget("Tab_0"), this, TabType.FAVORITE);
+		m_OfficialTab	= new ServerBrowserTabConsolePages(layoutRoot.FindAnyWidget("Tab_1"), this, TabType.OFFICIAL);
+		m_CommunityTab	= new ServerBrowserTabConsolePages(layoutRoot.FindAnyWidget("Tab_2"), this, TabType.COMMUNITY);
+		#else
+		layoutRoot 		= GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/server_browser/pc/server_browser.layout");
+		m_FavoritesTab  = new ServerBrowserFavoritesTabPc(layoutRoot.FindAnyWidget("Tab_0"), this, TabType.FAVORITE);
+		m_OfficialTab	= new ServerBrowserTabPc(layoutRoot.FindAnyWidget("Tab_1"), this, TabType.OFFICIAL);
+		m_CommunityTab	= new ServerBrowserTabPc(layoutRoot.FindAnyWidget("Tab_2"), this, TabType.COMMUNITY);
+		m_LANTab		= new ServerBrowserTabPc(layoutRoot.FindAnyWidget("Tab_3"), this, TabType.LAN);
+		#endif
+		
+		layoutRoot.FindAnyWidget("Tabber").GetScript(m_Tabber);
+		
+		m_Play					= layoutRoot.FindAnyWidget("play");
+		m_Back					= layoutRoot.FindAnyWidget("back_button");
+		m_CustomizeCharacter	= layoutRoot.FindAnyWidget("customize_character");
+		m_PlayerName			= TextWidget.Cast(layoutRoot.FindAnyWidget("character_name_text"));
+		m_Favorites 			= new TStringArray;
+		
+		#ifndef PLATFORM_CONSOLE
+		layoutRoot.FindAnyWidget("customize_character").Show(false);
+		layoutRoot.FindAnyWidget("character").Show(false);
+		#endif
+		
+		Refresh();
+		
+		string version;
+		GetGame().GetVersion(version);
+		
+		#ifdef PLATFORM_CONSOLE
+		version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboard())
+		{
+			layoutRoot.FindAnyWidget("play_panel_root").Show(true);
+			layoutRoot.FindAnyWidget("MouseAndKeyboardWarning").Show(true);
+			layoutRoot.FindAnyWidget("toolbar_bg").Show(false);
+		}
+		#else
+		version = "#main_menu_version" + " " + version;
+		#endif
+		
+		OnlineServices.m_ServersAsyncInvoker.Insert(OnLoadServersAsync);
+		OnlineServices.m_ServerModLoadAsyncInvoker.Insert(OnLoadServerModsAsync);
+		LoadFavoriteServers();
+		
+		m_Tabber.m_OnTabSwitch.Insert(OnTabSwitch);
+		
+		m_FavoritesTab.RefreshList();
+
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		//Sort init
+		TextWidget sort_text = TextWidget.Cast(layoutRoot.FindAnyWidget("SortText"));
+		sort_text.SetText("#str_serverbrowserroot_toolbar_bg_consoletoolbar_sort_sorttext0");
+		#endif
+		
+		PPERequesterBank.GetRequester(PPERequester_ServerBrowserBlur).Start(new Param1<float>(0.5));
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+
+		return layoutRoot;
+	}
+	
+	void ~ServerBrowserMenuNew()
+	{
+		#ifdef PLATFORM_CONSOLE
+		SaveFavoriteServersConsoles();
+		#endif
+
+		OnlineServices.m_ServersAsyncInvoker.Remove(OnLoadServersAsync);
+		OnlineServices.m_ServerModLoadAsyncInvoker.Remove(OnLoadServerModsAsync);
+		m_Tabber.m_OnTabSwitch.Remove(OnTabSwitch);
+		PPERequesterBank.GetRequester(PPERequester_ServerBrowserBlur).Stop();
+	}
+	
+	TStringArray GetFavoritedServerIds()
+	{
+		return m_Favorites;
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		switch (pInputDeviceType)
+		{
+		case EInputDeviceType.CONTROLLER:
+			#ifdef PLATFORM_CONSOLE
+			UpdateControlsElements();
+			layoutRoot.FindAnyWidget("toolbar_bg").Show(true);
+			layoutRoot.FindAnyWidget("ConsoleControls").Show(true);
+			#endif
+		break;
+
+		default:
+			#ifdef PLATFORM_CONSOLE
+			if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+			{
+				layoutRoot.FindAnyWidget("toolbar_bg").Show(false);
+				layoutRoot.FindAnyWidget("ConsoleControls").Show(false);
+			}
+			#endif
+		break;
+		}
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (button == MouseState.LEFT)
+		{
+			if (w == m_Play)
+			{
+				Play();
+				return true;
+			}
+			else if (w == m_Back)
+			{
+				Back();
+				return true;
+			}
+			else if (w == m_CustomizeCharacter)
+			{
+				CustomizeCharacter();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	void SetServersLoadingTab(TabType refreshing)
+	{
+		m_IsRefreshing = refreshing;
+		
+		OnlineServices.m_ServersAsyncInvoker.Remove(OnLoadServersAsync);
+		OnlineServices.m_ServersAsyncInvoker.Insert(OnLoadServersAsync, EScriptInvokerInsertFlags.NONE);
+	}
+
+	TabType GetServersLoadingTab()
+	{
+		return m_IsRefreshing;
+	}
+	
+	void AddFavoritesToFilter(GetServersInput input)
+	{
+		foreach (string id : m_Favorites)
+		{
+			array<string> output = new array<string>;
+			id.Split(":", output);
+			if (output.Count() == 2)
+			{
+				string ip = output[0];
+				int port = output[1].ToInt();
+				input.AddFavourite(ip, port);
+			}
+		}
+	}
+
+	bool IsFavorited(string server_id)
+	{
+		int index = -1;
+		if (m_Favorites)
+		{
+			index = m_Favorites.Find(server_id);		
+		}
+		return (index >= 0);
+	}
+	
+	// Returns whether server was favorited or not
+	bool SetFavoriteConsoles(string ipAddress, int port, bool favorite)
+	{
+		if (favorite && m_Favorites.Count() >= MAX_FAVORITES)
+		{
+			g_Game.GetUIManager().ShowDialog("#layout_notification_info_warning", "#STR_MaxFavouriteReached", 0, DBT_OK, DBB_YES, DMT_EXCLAMATION, this);
+			return false;
+		}
+
+		AddFavorite(ipAddress, port, favorite);
+		SaveFavoriteServersConsoles();
+		
+		return favorite;
+	}
+	
+	void AddFavorite(string ipAddress, int port, bool favorite)
+	{
+		string serverId = ipAddress + ":" + port;
+		bool isFavorited = IsFavorited(serverId);
+		
+		if (favorite && !isFavorited)
+		{
+			m_Favorites.Insert(serverId);
+		}
+		else if (isFavorited)
+		{
+			m_Favorites.RemoveItem(serverId);
+			m_OfficialTab.Unfavorite(serverId);
+			m_CommunityTab.Unfavorite(serverId);
+			m_FavoritesTab.Unfavorite(serverId);
+#ifndef PLATFORM_CONSOLE
+			m_LANTab.Unfavorite(serverId);
+#endif
+		}
+	}
+	
+	void Back()
+	{
+		GetGame().GetUIManager().Back();
+	}
+	
+	void ShowYButton(bool show)
+	{
+		RichTextWidget yIcon = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ResetIcon"));
+		TextWidget yText = TextWidget.Cast(layoutRoot.FindAnyWidget("ResetText"));
+		
+		if (yIcon)
+		{
+			yIcon.Show(show);
+		}
+		
+		if (yText)
+		{
+			yText.Show(show);
+		}
+	}
+	
+	void ShowAButton(bool show)
+	{
+		RichTextWidget aIcon = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ConnectIcon"));
+		TextWidget aText = TextWidget.Cast(layoutRoot.FindAnyWidget("ConnectText"));
+		
+		if (aIcon)
+		{
+			aIcon.Show(show);
+		}
+		
+		if (aText)
+		{
+			aText.Show(show);
+		}
+				
+	}
+	
+	void FilterFocus(bool focus)
+	{
+		#ifdef PLATFORM_CONSOLE
+		TextWidget con_text = TextWidget.Cast(layoutRoot.FindAnyWidget("ConnectText"));
+		TextWidget ref_text = TextWidget.Cast(layoutRoot.FindAnyWidget("RefreshText"));
+		TextWidget res_text = TextWidget.Cast(layoutRoot.FindAnyWidget("ResetText"));
+		
+		if (focus)
+		{
+			con_text.SetText("#dialog_change");
+			ref_text.SetText("#server_browser_menu_refresh");
+			res_text.SetText("#server_browser_menu_reset_filters");
+		
+			con_text.Update();
+			ref_text.Update();
+			res_text.Update();
+		}
+		#endif
+	}
+	
+	void BackButtonFocus()
+	{
+		SetFocus(m_Back);
+	}
+
+	void ServerListFocus(bool focus, bool favorite)
+	{
+		#ifdef PLATFORM_CONSOLE
+		TextWidget con_text = TextWidget.Cast(layoutRoot.FindAnyWidget("ConnectText"));
+		TextWidget ref_text = TextWidget.Cast(layoutRoot.FindAnyWidget("RefreshText"));
+		TextWidget res_text = TextWidget.Cast(layoutRoot.FindAnyWidget("ResetText"));
+		
+		if (focus)
+		{			
+			con_text.SetText("#server_browser_menu_connect");
+			
+			float x, y;
+			res_text.GetSize(x, y);
+			if (favorite)
+			{
+				res_text.SetText("#server_browser_menu_unfavorite");
+			}
+			else
+			{
+				res_text.SetText("#server_browser_menu_favorite");
+			}
+			con_text.Update();
+			res_text.Update();
+		}
+		#endif
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+		return false;
+	}
+	
+	override void Refresh()
+	{
+		string name;
+		
+		#ifdef PLATFORM_CONSOLE
+			if (GetGame().GetUserManager() && GetGame().GetUserManager().GetSelectedUser())
+			{
+				name = GetGame().GetUserManager().GetSelectedUser().GetName();
+				if (name.LengthUtf8() > 18)
+				{
+					name = name.SubstringUtf8(0, 18);
+					name += "...";
+				}
+			}
+		#else
+			g_Game.GetPlayerNameShort(14, name);
+		#endif
+		
+		if (m_PlayerName)
+			m_PlayerName.SetText(name);
+		
+		string version;
+		GetGame().GetVersion(version);
+		#ifdef PLATFORM_CONSOLE
+			version = "#main_menu_version" + " " + version + " (" + g_Game.GetDatabaseID() + ")";
+		#else
+			version = "#main_menu_version" + " " + version;
+		#endif
+	}
+	
+	override void Update(float timeslice)
+	{
+		if (!GetGame().GetUIManager().IsDialogVisible() && !GetDayZGame().IsConnecting())
+		{
+			if (GetUApi().GetInputByID(UAUITabLeft).LocalPress())
+			{
+				m_Tabber.PreviousTab();
+			}
+			
+			if (GetUApi().GetInputByID(UAUITabRight).LocalPress())
+			{
+				m_Tabber.NextTab();
+			}
+			
+			if (GetUApi().GetInputByID(UAUINextDown).LocalPress())
+			{
+				GetSelectedTab().PressSholderLeft();
+			}
+			
+			if (GetUApi().GetInputByID(UAUINextUp).LocalPress())
+			{
+				GetSelectedTab().PressSholderRight();
+			}
+			
+			if (GetUApi().GetInputByID(UAUISelect).LocalPress())
+			{
+				GetSelectedTab().PressA();
+			}
+			
+			if (GetUApi().GetInputByID(UAUICtrlX).LocalPress())
+			{
+				GetSelectedTab().PressX();
+			}
+			
+			if (GetUApi().GetInputByID(UAUICtrlY).LocalPress())
+			{
+				GetSelectedTab().PressY();
+			}
+			
+			if (GetUApi().GetInputByID(UAUILeft).LocalPress())
+			{
+				GetSelectedTab().Left();
+			}
+			
+			// LEFT HOLD
+			if (GetUApi().GetInputByID(UAUILeft).LocalHold())
+			{
+				GetSelectedTab().LeftHold();
+			}
+			
+			// LEFT RELEASE
+			if (GetUApi().GetInputByID(UAUILeft).LocalRelease())
+			{
+				GetSelectedTab().LeftRelease();
+			}
+			
+			if (GetUApi().GetInputByID(UAUIRight).LocalPress())
+			{
+				GetSelectedTab().Right();
+			}
+			
+			// RIGHT HOLD
+			if (GetUApi().GetInputByID(UAUIRight).LocalHold())
+			{
+				GetSelectedTab().RightHold();
+			}
+			
+			// RIGHT RELEASE
+			if (GetUApi().GetInputByID(UAUIRight).LocalRelease())
+			{
+				GetSelectedTab().RightRelease();
+			}
+			
+			if (GetUApi().GetInputByID(UAUIUp).LocalPress())
+			{
+				GetSelectedTab().Up();
+			}
+			
+			if (GetUApi().GetInputByID(UAUIDown).LocalPress())
+			{
+				GetSelectedTab().Down();
+			}
+	
+			if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+			{
+				Back();
+			}
+		}
+		
+		super.Update(timeslice);
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			return (w == m_Play || w == m_CustomizeCharacter || w == m_Back);
+		}
+		return false;
+	}
+	
+	void LoadFavoriteServers()
+	{		
+		m_Favorites = new TStringArray;
+		
+#ifdef PLATFORM_WINDOWS
+		OnlineServices.GetFavoriteServers(m_Favorites);
+#else
+		GetGame().GetProfileStringList("SB_Favorites", m_Favorites);
+		
+		// ignore any ids that do not follow correct IP:PORT format
+		for (int i = 0; i < m_Favorites.Count(); ++i)
+		{
+			string id = m_Favorites[i];
+			array<string> output = new array<string>;
+						
+			id.Split(":", output);
+			if (output.Count() != 2)
+			{
+				m_Favorites.Remove(i);
+				--i;
+			}
+		}
+		
+		// only handle MAX_FAVORITES on consoles
+		if (m_Favorites.Count() > MAX_FAVORITES)
+		{
+			// favorites are ordered by when they were favorited
+			// so keep most recent favorites and ignore oldest favorites
+			m_Favorites.Invert();
+			m_Favorites.Resize(MAX_FAVORITES);
+			m_Favorites.Invert();
+		}
+#endif
+	}
+	
+	void SaveFavoriteServersConsoles()
+	{
+		GetGame().SetProfileStringList("SB_Favorites", m_Favorites);
+		GetGame().SaveProfile();
+		
+	}
+	
+	void SelectServer(ServerBrowserEntry server)
+	{
+	
+		if (m_SelectedServer)
+		{
+			m_SelectedServer.Deselect();						
+		}
+				
+		m_SelectedServer = server;
+		
+#ifdef PLATFORM_CONSOLE
+		// disable CONNECT button if server is offline
+		RichTextWidget aButton = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ConnectIcon"));
+		TextWidget connectText = TextWidget.Cast(layoutRoot.FindAnyWidget("ConnectText"));
+		
+		aButton.Show(server.IsOnline());
+		connectText.Show(server.IsOnline());
+#endif
+	}
+	
+	void Connect(ServerBrowserEntry server)
+	{
+		SelectServer(server);
+#ifdef PLATFORM_CONSOLE
+		SaveFavoriteServersConsoles();
+#endif
+		Play();
+	}
+	
+	void Play()
+	{
+		if (m_SelectedServer)
+		{
+			string mapNM = m_SelectedServer.GetMapToRun();
+			if (!g_Game.VerifyWorldOwnership(mapNM))
+			{
+				GetGame().GetUIManager().ShowDialog("#server_browser_connect_label", "#mod_detail_info_warning", 232, DBT_OK, DBB_NONE, DMT_INFO, GetGame().GetUIManager().GetMenu());
+				g_Game.GoBuyWorldDLC(mapNM);
+				return;
+			}
+			
+			string ip = m_SelectedServer.GetIP();
+			int port = m_SelectedServer.GetPort();
+			g_Game.ConnectFromServerBrowser(ip, port, "");
+		}
+	}
+	
+	void CustomizeCharacter()
+	{
+		PPERequesterBank.GetRequester(PPERequester_ServerBrowserBlur).Stop();
+		EnterScriptedMenu(MENU_CHARACTER);
+	}
+	
+	void NextCharacter()
+	{
+		
+	}
+	
+	void PreviousCharacter()
+	{
+		
+	}
+	
+	ServerBrowserTab GetSelectedTab()
+	{
+		switch (m_Tabber.GetSelectedIndex())
+		{
+			case 0:
+			{
+				return m_FavoritesTab;
+			}
+			case 1:
+			{
+				return m_OfficialTab;
+			}
+			case 2:
+			{
+				return m_CommunityTab;
+			}
+			case 3:
+			{
+				return m_LANTab;
+			}
+		}
+		return null;
+	}
+	
+	void OnTabSwitch()
+	{
+		LoadFavoriteServers();
+		SetServersLoadingTab(TabType.NONE);
+		
+		if (GetSelectedTab().IsNotInitialized())
+		{
+			GetSelectedTab().RefreshList();
+		}
+		
+		GetSelectedTab().Focus();
+	}
+	
+	void OnLoadServerModsAsync(GetServerModListResult result_list)
+	{
+		if (GetSelectedTab())
+		{
+			GetSelectedTab().OnLoadServerModsAsync(result_list.m_Id, result_list.m_Mods);
+		}
+	}
+	
+	void OnLoadServersAsync(GetServersResult result_list, EBiosError error, string response)
+	{		
+		#ifdef PLATFORM_WINDOWS
+			#ifdef PLATFORM_CONSOLE
+				GetSelectedTab().OnLoadServersAsyncConsole(result_list, error, response);
+			#else
+				GetSelectedTab().OnLoadServersAsyncPC(result_list, error, response);
+			#endif
+		#else
+			GetSelectedTab().OnLoadServersAsyncConsole(result_list, error, response);
+		#endif
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(255, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 0, 0);
+		
+		#ifdef PLATFORM_CONSOLE
+			color_pnl = ARGB(255, 200, 0, 0);
+			color_lbl = ARGB(255, 255, 255, 255);
+		#endif
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		int color_pnl = ARGB(0, 0, 0, 0);
+		int color_lbl = ARGB(255, 255, 255, 255);
+		
+		ButtonSetColor(w, color_pnl);
+		ButtonSetTextColor(w, color_lbl);
+	}
+	
+	void ButtonSetText(Widget w, string text)
+	{
+		if (!w)
+			return;
+				
+		TextWidget label = TextWidget.Cast(w.FindWidget(w.GetName() + "_label"));
+		
+		if (label)
+		{
+			label.SetText(text);
+		}
+		
+	}
+	
+	void ButtonSetColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+		
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		
+		if (panel)
+		{
+			panel.SetColor(color);
+		}
+	}
+	
+	void ButtonSetTextColor(Widget w, int color)
+	{
+		if (!w)
+			return;
+
+		TextWidget label	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		TextWidget text		= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text"));
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_text_1"));
+				
+		if (label)
+		{
+			label.SetColor(color);
+		}
+		
+		if (text)
+		{
+			text.SetColor(color);
+		}
+		
+		if (text2)
+		{
+			text2.SetColor(color);
+		}
+	}
+
+	protected void UpdateControlsElements()
+	{
+		RichTextWidget toolbar_a = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ConnectIcon"));
+		RichTextWidget toolbar_b = RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		RichTextWidget toolbar_x = RichTextWidget.Cast(layoutRoot.FindAnyWidget("RefreshIcon"));
+		RichTextWidget toolbar_y = RichTextWidget.Cast(layoutRoot.FindAnyWidget("ResetIcon"));
+		toolbar_a.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUISelect", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_b.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUIBack", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_x.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlX", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbar_y.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUICtrlY", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTab.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..b53a16cd814f84dde8da1959a667046456e03b3b
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTab.c
@@ -0,0 +1,735 @@
+enum TabType
+{
+	OFFICIAL,
+	COMMUNITY,
+	LAN,
+	FAVORITE,
+	NONE
+}
+
+enum SelectedPanel
+{
+	BROWSER,
+	FILTERS,
+	MENU
+}
+
+class ServerBrowserTab extends ScriptedWidgetEventHandler
+{
+	protected Widget										m_Root;
+	protected ScrollWidget									m_ServerListScroller;
+	protected SpacerBaseWidget								m_ServerList;
+	
+	//protected ref array<ref GetServersResultRow>			m_Entries;
+	
+	protected ref map<string, ref ServerBrowserEntry>		m_EntryWidgets;
+	protected ref map<string, ref array<string>>			m_EntryMods;
+
+	protected ref ServerBrowserFilterContainer				m_Filters;
+	
+	protected ServerBrowserMenuNew							m_Menu;
+	protected ServerBrowserEntry							m_SelectedServer;
+	
+	protected TabType										m_TabType;
+	protected ESortType										m_SortType;
+	protected ESortOrder									m_SortOrder;
+	
+	protected SelectedPanel									m_SelectedPanel;
+	protected bool											m_Initialized;
+	protected bool											m_BegunLoading;
+	protected bool											m_Loading;
+	protected int											m_TotalServers; // UNUSED
+	protected int											m_TotalLoadedServers;
+	protected int											m_LastLoadedPage;
+	protected int											m_TotalPages;
+	protected bool											m_LoadingFinished;
+	protected int											m_CurrentPageNum;
+	
+	protected string										m_CurrentSelectedServer;
+	protected int											m_CurrentLoadedPage;
+	protected ref GetServersInput							m_CurrentFilterInput;
+	
+	protected Widget										m_ApplyFilter;
+	protected Widget										m_RefreshList;
+	protected Widget										m_ResetFilters;
+	protected Widget										m_FiltersChanged;
+	protected Widget										m_HostSort;
+	protected Widget										m_TimeSort;
+	protected Widget										m_PopulationSort;
+	protected Widget										m_SlotsSort;
+	protected Widget										m_PingSort;
+	protected Widget										m_FilterSearchText;
+	protected Widget										m_FilterSearchTextBox;
+	protected TextWidget									m_LoadingText;
+	protected ButtonWidget									m_BtnPagePrev;
+	protected ButtonWidget									m_BtnPageNext;
+	
+	protected ref map<ESortType, ref array<ref GetServersResultRow>> m_EntriesSorted;
+	protected ref map<ESortType, ESortOrder>				m_SortInverted;
+	protected ref set<string> 								m_OnlineFavServers;
+
+	void ServerBrowserTab( Widget parent, ServerBrowserMenuNew menu, TabType type )
+	{
+		Construct(parent, menu, type);
+		m_OnlineFavServers = new set<string>();
+		GetGame().GetContentDLCService().m_OnChange.Insert(OnDLCChange);
+	}
+	
+	protected void Construct( Widget parent, ServerBrowserMenuNew menu, TabType type )
+	{
+		m_SortInverted = new map<ESortType, ESortOrder>;
+		m_EntriesSorted = new map<ESortType, ref array<ref GetServersResultRow>>;
+		m_EntryMods = new map<string, ref array<string>>;
+		m_LoadingText			= TextWidget.Cast( m_Root.FindAnyWidget( "loading_servers_info" ) );
+	}
+	
+	void ~ServerBrowserTab()
+	{
+		if ( m_Filters )
+			m_Filters.SaveFilters();
+		
+		if (m_Root)
+			delete m_Root;
+		
+		if (GetGame().GetContentDLCService())
+			GetGame().GetContentDLCService().m_OnChange.Remove(OnDLCChange);
+	}
+
+	ServerBrowserMenuNew GetRootMenu()
+	{
+		return m_Menu;
+	}
+	
+	bool GetIsServerLoadingFinished()
+	{
+		return m_LoadingFinished;
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		
+	}
+	
+	void OnDLCChange(EDLCId dlcId)
+	{
+		switch (dlcId)
+		{
+			case EDLCId.DLC_BLISS:
+			{
+				array<ServerBrowserEntry> serverEntries = m_EntryWidgets.GetValueArray();
+				foreach (ServerBrowserEntry entry : serverEntries)
+				{
+					entry.RefreshDLCIcon();
+				}
+				break;
+			}
+			
+			default:
+				break;
+		}
+	}
+	
+	void ScrollToEntry( ServerBrowserEntry entry )
+	{
+		if ( entry )
+		{
+			float x, y;
+			float x_s, y_s;
+			float x_l, y_l;
+			
+			Widget root			= entry.GetRoot();
+			Widget first_child	= root.GetParent().GetChildren();
+			Widget last_child	= first_child;
+			while ( last_child )
+			{
+				if ( last_child.GetSibling() )
+					last_child = last_child.GetSibling();
+				else
+					break;
+			}
+			
+			root.GetParent().Update();
+			root.Update();
+			
+			m_ServerListScroller.GetScreenPos( x, y );
+			m_ServerListScroller.GetScreenSize( x_s, y_s );
+			
+			float bottom_pos = y + y_s;
+			
+			root.GetScreenPos( x_l, y_l );
+			root.GetScreenSize( x_s, y_s );
+			
+			if ( root == first_child )
+			{
+				m_ServerListScroller.VScrollToPos01( 0 );
+			}
+			else if ( root == last_child )
+			{
+				m_ServerListScroller.VScrollToPos01( 1 );
+			}
+			else if ( y_l + y_s >= bottom_pos )
+			{
+				m_ServerListScroller.VScrollToPos( m_ServerListScroller.GetVScrollPos() + y_s );
+			}
+			else if ( y_l <= y )
+			{
+				m_ServerListScroller.VScrollToPos( m_ServerListScroller.GetVScrollPos() - y_s );
+			}
+		}
+	}
+	
+	void Focus()
+	{
+		if ( m_EntryWidgets.Contains( m_CurrentSelectedServer ) )
+		{
+			m_EntryWidgets.Get( m_CurrentSelectedServer ).Focus();
+			ScrollToEntry( m_EntryWidgets.Get( m_CurrentSelectedServer ) );
+		}
+	}
+	
+	void OnFilterFocusLost( Widget w )
+	{
+		m_SelectedPanel = SelectedPanel.FILTERS;
+		m_Menu.FilterFocus( false );
+	}
+	
+	void OnFilterFocus( Widget w )
+	{
+		m_SelectedPanel = SelectedPanel.FILTERS;
+		m_Menu.FilterFocus( true );
+	}
+	
+	void OnFilterChanged()
+	{
+		
+	}
+	
+	void ServerListFocus( bool focus, bool favorite )
+	{
+		m_SelectedPanel = SelectedPanel.BROWSER;
+		
+		if (!m_Menu)
+			return;
+		
+		m_Menu.ServerListFocus( focus, favorite );
+	}
+	
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		if ( IsFocusable( w ) )
+		{
+			if ( w == m_FilterSearchTextBox )
+			{
+				ColorHighlight( m_FilterSearchText );
+				return false;
+			}
+			else
+			{
+				ColorHighlight( w );
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		if ( IsFocusable( w ) )
+		{
+			if ( w == m_FilterSearchTextBox )
+			{
+				ColorNormal( m_FilterSearchText );
+				return true;
+			}
+			else
+			{
+				ColorNormal( w );
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{		
+		if ( IsFocusable( w ) )
+		{
+			ColorHighlight( w );
+			if ( w == m_FilterSearchText )
+			{
+				SetFocus( m_FilterSearchTextBox );
+				return true;
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{		
+		if ( IsFocusable( w ) )
+		{
+			if ( enterW == m_FilterSearchText || enterW == m_FilterSearchTextBox )
+			{
+			}
+			else
+			{
+				ColorNormal( w );
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	bool IsFocusable( Widget w )
+	{
+		if ( w )
+		{
+			return ( w == m_ApplyFilter || w == m_RefreshList || w == m_ResetFilters || w == m_FilterSearchText || w == m_FilterSearchTextBox );
+		}
+		return false;
+	}
+	
+	void SetPanelFocus()
+	{
+		
+	}
+	
+	void PressA()
+	{
+		
+	}
+	
+	void PressX()
+	{
+		if ( m_Menu.GetServersLoadingTab() == TabType.NONE )
+			RefreshList();
+	}
+	
+	void PressY();
+	void PressSholderLeft();
+	void PressSholderRight();
+	void Left();
+	void LeftHold();
+	void LeftRelease();
+	void Right();
+	void RightHold();
+	void RightRelease();
+	void Up();
+	void Down();
+	
+	void OnLoadServerModsAsync(string server_id, array<string> mods)
+	{
+		m_EntryMods.Set( server_id, mods );
+	}
+	
+	void GetNextEntry()
+	{
+		Widget focused = GetFocus();
+		if ( !focused )
+			return;
+		Widget sibling = focused.GetSibling();
+		if ( !sibling )
+			return;
+		
+		if ( focused.GetName() == "server_browser_list_entry_root" )
+		{
+			if ( sibling )
+				SetFocus( focused.GetSibling() );
+			else
+				SetFocus( focused.GetParent().GetSibling().GetChildren() );
+		}
+	}
+	
+	void GetPrevEntry()
+	{
+		Widget focused = GetFocus();
+		if ( focused && focused.GetName() == "server_browser_list_entry_root" )
+		{
+			Widget sibling = focused.GetParent().GetChildren();
+			if ( focused == sibling )
+				return;
+			
+			while ( sibling )
+			{
+				if ( sibling && sibling.GetSibling() == focused )
+				{
+					SetFocus( sibling );
+				}
+				else
+				{
+					sibling = sibling.GetSibling();
+				}
+			}
+		}
+	}
+	
+	void GetNextFilter()
+	{
+	
+	}
+	
+	void GetPrevFilter()
+	{
+	
+	}
+	
+	void SetCurrentPage(int page_num)
+	{
+		m_CurrentPageNum = page_num;
+	}
+	
+	int GetCurrentPage()
+	{
+		return m_CurrentPageNum;
+	}
+	
+	bool IsNotInitialized()
+	{
+		return !m_Initialized || !m_LoadingFinished;
+	}
+	
+	void ResetFilters()
+	{
+		m_Filters.ResetFilters();
+	}
+	
+	void ApplyFilters()
+	{
+	
+	}
+	
+	void AddFavoritesToFilter( ref GetServersInput input )
+	{
+		m_Menu.AddFavoritesToFilter( input );
+	}
+	
+	void RefreshList()
+	{
+		m_Menu.SetServersLoadingTab( m_TabType );
+		
+		m_LoadingFinished = false;
+		m_Initialized = true;
+		m_BegunLoading = false;
+		m_LastLoadedPage = 0;
+		m_TotalPages = -1;
+		m_TotalServers = 0;
+		m_TotalLoadedServers = 0;
+		m_CurrentLoadedPage = 0;
+		
+		m_EntryWidgets.Clear();
+		
+		#ifndef PLATFORM_WINDOWS // XBOX OR PS
+			m_CurrentFilterInput = m_Filters.GetFilterOptionsConsoles();
+			m_CurrentFilterInput.m_Page = GetCurrentPage();
+			m_CurrentFilterInput.m_SortBy = GetSortOption();
+			m_CurrentFilterInput.m_SortOrder = m_SortOrder;
+		#else // PLATFORM_WINDOWS
+			m_CurrentFilterInput = m_Filters.GetFilterOptionsPC();
+			#ifdef PLATFORM_CONSOLE // PC client with -XBOX flag
+				m_CurrentFilterInput.m_Page = GetCurrentPage();
+			#else	
+				m_CurrentFilterInput.m_Page = 0;
+			#endif
+		#endif
+
+		m_Loading = true;
+		switch ( m_TabType )
+		{
+			case TabType.OFFICIAL:
+			{
+				m_CurrentFilterInput.SetOfficialFilter( true );
+				OnlineServices.LoadServers( m_CurrentFilterInput );
+				break;
+			}
+			case TabType.COMMUNITY:
+			{
+				m_CurrentFilterInput.SetOfficialFilter( false );
+				OnlineServices.LoadServers( m_CurrentFilterInput );
+				break;
+			}
+			case TabType.LAN:
+			{
+				m_CurrentFilterInput.SetLAN();
+				OnlineServices.LoadServers( m_CurrentFilterInput );
+				break;
+			}
+		}
+	}
+	
+	void GetNextPage()
+	{
+		if ( m_TotalPages > 0 && m_LastLoadedPage < m_TotalPages )
+		{
+			m_CurrentFilterInput.m_Page = m_LastLoadedPage + 1;
+			OnlineServices.LoadServers( m_CurrentFilterInput );
+		}
+	}
+	
+	void SelectServer( ServerBrowserEntry server )
+	{
+#ifdef PLATFORM_CONSOLE
+		ScrollToEntry( server );
+#endif
+		
+		m_SelectedServer = server;
+		
+		if (!m_Menu)
+			return;
+		
+		m_Menu.SelectServer( server );
+	}
+	
+	void OnLoadServersAsyncPC( ref GetServersResult result_list, EBiosError error, string response )
+	{
+		
+	}
+	
+	void OnLoadServersAsyncConsole( GetServersResult result_list, EBiosError error, string response )
+	{
+		
+	}
+	
+	void SetSort( ESortType type, ESortOrder order )
+	{
+		m_SortOrder = order;
+		m_SortType	= type;
+	}
+	
+	bool IsPingInRange( int ping, string max_ping )
+	{
+		int max = max_ping.Substring( 1, max_ping.Length() - 1 ).ToInt();
+		
+		if ( ping < max )
+			return true;
+		return false;
+	}
+	
+	bool PassFilter( GetServersResultRow result )
+	{			
+		if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+		{
+			return false;
+		}
+		
+		if ( m_Filters.m_PingFilter.IsSet() )
+		{
+			if ( !IsPingInRange( result.m_Ping, m_Filters.m_PingFilter.GetStringValue() ) )
+			{
+				return false;
+			}
+		}
+
+		if ( m_Filters.m_PreviouslyPlayedFilter.IsSet() )
+		{
+			bool is_visited = g_Game.IsVisited( result.m_HostIp, result.m_HostPort );
+			
+			if ( !is_visited && m_Filters.m_PreviouslyPlayedFilter.IsEnabled() )
+			{
+				return false;
+			}
+			
+			if ( is_visited && m_Filters.m_PreviouslyPlayedFilter.IsEnabled() )
+			{
+				return false;
+			}
+		}
+		
+		return true;
+	}
+	
+	// Adds extra servers to the END of the list
+	protected void LoadExtraEntries(int index)
+	{
+		
+	}
+	
+	void Connect( ServerBrowserEntry server )
+	{
+		if ( !m_Menu )
+			return;
+		
+		if ( m_Menu.GetServersLoadingTab() != TabType.NONE )
+			return;
+		
+		m_SelectedServer = server;
+		m_Menu.Connect( server );
+	}
+	
+	string GetSortOption()
+	{
+		switch ( m_SortType )
+		{
+			case ESortType.HOST:
+			{
+				return "name";
+			}
+			case ESortType.TIME:
+			{
+				return "name";
+			}
+			case ESortType.POPULATION:
+			{
+				return "currentNumberPlayers";
+			}
+			case ESortType.SLOTS:
+			{
+				return "freeSlots";
+			}
+			case ESortType.PING:
+			{
+				return "name";
+			}
+		}
+		return "";
+	}
+	
+	int AddSorted( GetServersResultRow entry )
+	{	
+		return -1;
+	}
+	
+	void Unfavorite( string uid )
+	{
+		ServerBrowserEntry entry;
+		if ( m_EntryWidgets.Find( uid, entry ) )
+		{
+			entry.SetFavorite( false );
+		}
+	}
+	
+	TabType GetTabType()
+	{
+		return m_TabType;
+	}
+	
+	void ButtonEnable( Widget w )
+	{
+		w.ClearFlags( WidgetFlags.IGNOREPOINTER );
+		ColorNormal(w);
+	}
+	
+	void ButtonDisable( Widget w )
+	{
+		w.SetFlags( WidgetFlags.IGNOREPOINTER );
+		ColorDisable(w);
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	void ColorHighlight( Widget w )
+	{
+		if ( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 200, 0, 0 ) );
+		}
+		
+		w.SetColor( ARGB( 255, 0, 0, 0) );
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text" ) );
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_label" ) );
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text_1" ) );
+		ImageWidget image	= ImageWidget.Cast( w.FindAnyWidget( w.GetName() + "_image" ) );
+		Widget option		= Widget.Cast( w.FindAnyWidget( w.GetName() + "_option_wrapper" ) );
+		Widget option_label = w.FindAnyWidget( "option_label" );
+		
+		if ( text1 )
+		{
+			text1.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+		
+		if ( text2 )
+		{
+			text2.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+		
+		if ( text3 )
+		{
+			text3.SetColor( ARGB( 255, 255, 0, 0 ) );
+			w.SetAlpha(1);
+		}
+		
+		if ( image )
+		{
+			image.SetColor( ARGB( 255, 200, 0, 0 ) );
+		}
+		
+		if ( option )
+		{
+			option.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+		
+		if ( option_label )
+		{
+			option_label.SetColor( ARGB( 255, 255, 0, 0 ) );
+		}
+	}
+	
+	void ColorNormal( Widget w )
+	{
+		if ( (w.GetFlags() & WidgetFlags.IGNOREPOINTER) == WidgetFlags.IGNOREPOINTER )
+		{
+			return;
+		}
+		
+		if ( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text" ) );
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text_1" ) );
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_label" ) );
+		ImageWidget image	= ImageWidget.Cast( w.FindAnyWidget( w.GetName() + "_image" ) );
+		Widget option		= w.FindAnyWidget( w.GetName() + "_option_wrapper" );
+		Widget option_label = w.FindAnyWidget( "option_label" );
+		
+		if ( text1 )
+		{
+			text1.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( text2 )
+		{
+			text2.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( text3 )
+		{
+			text3.SetColor( ARGB( 255, 255, 255, 255 ) );
+			w.SetAlpha(0);
+		}
+		
+		if ( image )
+		{
+			image.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( option )
+		{
+			option.SetColor( ARGB( 150, 255, 255, 255 ) );
+		}
+		
+		if ( option_label )
+		{
+			option_label.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+	}
+	
+	void ColorDisable( Widget w )
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus( null );
+		#endif
+		
+		if ( w )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			if ( button )
+			{
+				button.SetTextColor( ColorManager.COLOR_DISABLED_TEXT );
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabConsole.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabConsole.c
new file mode 100644
index 0000000000000000000000000000000000000000..49e5643fadaf606fa058f5c1aaf872581e67b6d9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabConsole.c
@@ -0,0 +1,441 @@
+class ServerBrowserTabConsole extends ServerBrowserTab
+{
+	private bool m_IsFilterChanged;
+	private bool m_IsFilterFocused;
+	
+	private Widget m_WidgetNavFilters;
+	private Widget m_WidgetNavServers;
+	
+	protected override void Construct( Widget parent, ServerBrowserMenuNew menu, TabType type )
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/server_browser/xbox/server_browser_tab.layout", parent );
+		
+		m_ServerListScroller	= ScrollWidget.Cast( m_Root.FindAnyWidget( "server_list_scroller" ) );
+		m_ServerList			= SpacerBaseWidget.Cast( m_ServerListScroller.FindAnyWidget( "server_list_content" ) );
+		m_ServerListScroller.VScrollToPos01( 0 );
+		
+		m_EntryWidgets			= new map<string, ref ServerBrowserEntry>;
+		m_EntriesSorted			= new map<ESortType, ref array<ref GetServersResultRow>>;
+		
+		m_EntriesSorted[ESortType.HOST] = new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.POPULATION] = new array<ref GetServersResultRow>;
+		
+		m_Menu					= menu;
+		m_TabType				= type;
+		
+		m_ApplyFilter			= m_Root.FindAnyWidget( "apply_filter_button" );
+		m_RefreshList			= m_Root.FindAnyWidget( "refresh_list_button" );
+		m_FiltersChanged		= m_Root.FindAnyWidget( "unapplied_filters_notify" );
+		m_HostSort				= m_Root.FindAnyWidget( "server_list_content_header_host" );
+		m_TimeSort				= m_Root.FindAnyWidget( "server_list_content_header_time" );
+		m_PopulationSort		= m_Root.FindAnyWidget( "server_list_content_header_population" );
+		m_SlotsSort				= m_Root.FindAnyWidget( "server_list_content_header_slots" );
+		m_PingSort				= m_Root.FindAnyWidget( "server_list_content_header_ping" );
+		m_LoadingText			= TextWidget.Cast( m_Root.FindAnyWidget( "loading_servers_info" ) );
+		m_WidgetNavFilters		= m_Root.FindAnyWidget( "filters_root_nav_wrapper" );
+		m_WidgetNavServers		= m_Root.FindAnyWidget( "server_list_root_nav_wrapper" );
+		
+		ShowHideConsoleWidgets();		
+		
+		m_Filters				= new ServerBrowserFilterContainer( m_Root.FindAnyWidget( "filters_content" ), this );
+		
+		SetSort( ESortType.HOST, ESortOrder.ASCENDING );
+		SetFocusFilters();
+		
+		m_Root.SetHandler( this );
+	}
+	
+	void ShowHideConsoleWidgets()
+	{		
+#ifdef PLATFORM_PS4
+		bool is_xbox = false;
+#else
+		bool is_xbox = true;
+#endif
+		
+		m_Root.FindAnyWidget( "filters_root_nav_img_lb_xbox" ).Show( is_xbox );
+		m_Root.FindAnyWidget( "filters_root_nav_img_rb_xbox" ).Show( is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_lb_xbox" ).Show( is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_rb_xbox" ).Show( is_xbox );
+		
+		m_Root.FindAnyWidget( "filters_root_nav_img_l1_ps4" ).Show( !is_xbox );
+		m_Root.FindAnyWidget( "filters_root_nav_img_r1_ps4" ).Show( !is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_l1_ps4" ).Show( !is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_r1_ps4" ).Show( !is_xbox );
+	}
+	
+	override void OnLoadServersAsyncConsole( GetServersResult result_list, EBiosError error, string response )
+	{
+		//Print("m_NumServers: "+ result_list.m_NumServers +" m_Pages: "+ result_list.m_Pages + " m_Page: "+ result_list.m_Page);
+		//string smg = "m_NumServers: "+ result_list.m_NumServers +" m_Pages: "+ result_list.m_Pages + " m_Page: "+ result_list.m_Page +" response: "+ response +" error: "+ error;
+		//m_LoadingText.SetText( smg );
+		
+		if ( error != EBiosError.OK || !result_list )
+		{
+			m_LoadingText.SetText( string.Format("Error: %1", ErrorModuleHandler.GetClientMessage(ErrorCategory.BIOSError, error)) );
+			return;
+		}
+		
+		if ( result_list.m_Page == 1 )
+		{
+			m_TotalPages = result_list.m_Pages;
+			m_TotalServers = result_list.m_NumServers;
+					
+			if ( m_Menu.GetServersLoadingTab() != m_TabType || !result_list || ( !result_list.m_Results || result_list.m_Results.Count() == 0 ) )
+			{
+				m_Menu.SetServersLoadingTab( TabType.NONE );				
+				m_LoadingText.SetText("#server_browser_tab_unable_to_get_server #server_browser_tab_no_servers_with_filter");
+				return;
+			}
+		}
+		
+		m_LastLoadedPage = result_list.m_Page;
+		
+		if ( m_TotalPages > 0 )
+		{
+			LoadEntries( result_list.m_Page, result_list.m_Results );
+		}
+		
+		if ( m_TotalPages > m_LastLoadedPage )
+		{
+			GetNextPage();
+			return;
+		}
+		
+		if ( result_list.m_Page == result_list.m_Pages )
+		{
+			OnLoadServersAsyncFinished();
+		}
+	}
+	
+	void OnLoadServersAsyncFinished()
+	{
+		string msg = "#servers_found: "+ m_TotalLoadedServers;
+		if ( m_TotalLoadedServers == 0 )
+		{
+			msg = "#server_browser_tab_unable_to_get_server";
+		}
+		m_LoadingText.SetText( msg );
+		m_LoadingFinished = true;
+	}
+	
+	void LoadEntries( int cur_page_index , GetServersResultRowArray page )
+	{
+		if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+		{
+			return;
+		}
+		
+		int index = cur_page_index * SERVER_BROWSER_PAGE_SIZE;
+		GetServersResultRowArray page_entries = page;
+		if ( page_entries )
+		{
+			foreach ( GetServersResultRow result : page_entries )
+			{
+				m_TotalLoadedServers++;
+				
+				if ( PassFilter( result ) )
+				{
+					ServerBrowserEntry entry = new ServerBrowserEntry( m_ServerList, index, this );
+					string ipPort = result.GetIpPort();
+					entry.FillInfo( result );
+					entry.SetFavorite( m_Menu.IsFavorited(ipPort));
+					entry.UpdateEntry();
+					
+					m_EntryWidgets.Insert(ipPort, entry);
+					index++;					
+					m_EntriesSorted[m_SortType].Insert( result );
+					
+					if ( m_EntryWidgets.Count() > 0 )
+					{
+						SetFocusServers();
+					}
+				}
+				
+				if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+					return;
+			}
+			
+			m_ServerList.Update();
+		}
+		/*
+		if ( cur_page_index == 1 && m_EntryWidgets.Count() > 0 )
+		{
+			SetFocusServers();
+		}
+		else
+		{
+			m_LoadingText.SetText( "#server_browser_unable_with_filter" );
+			SetFocusFilters();
+		}
+		*/
+		
+		if ( m_EntriesSorted[m_SortType].Count() > 0 )
+		{
+			/*
+			
+			*/
+		}
+		else
+		{
+			//m_LoadingText.SetText( "#server_browser_unable_with_filter" );
+			
+		}
+		
+		if ( !m_Menu )
+			return;
+		
+		if ( m_LastLoadedPage == m_TotalPages )
+		{
+			//m_LoadingText.SetText( "#server_browser_tab_loaded" + " " + m_EntryWidgets.Count() + "/" + m_EntryWidgets.Count() + " " + "#server_browser_servers_desc" );
+			m_Menu.SetServersLoadingTab( TabType.NONE );
+		}
+	}
+	
+	override void OnFilterFocus( Widget w )
+	{
+		super.OnFilterFocus( w );
+		
+		//ColorHighlight( w );
+	}
+	
+	override void OnFilterChanged()
+	{
+		m_IsFilterChanged = true;
+	}
+	
+	override void RefreshList()
+	{
+		for ( int i = 0; i < m_EntriesSorted.Count(); i++ )
+		{
+			m_EntriesSorted.GetElement(i).Clear();
+		}
+		
+		m_Filters.SaveFilters();
+		
+		super.RefreshList();
+		
+		m_ServerListScroller.VScrollToPos01( 0 );
+		
+		m_LoadingText.SetText( "#dayz_game_loading" );
+		
+		SetFocusFilters();
+		//UpdateStatusBar();
+	}
+	
+	override void ResetFilters()
+	{
+		super.ResetFilters();
+		
+		m_IsFilterChanged = false;
+	}
+	
+	override void ApplyFilters()
+	{
+		m_IsFilterChanged = false;
+		m_CurrentFilterInput = m_Filters.GetFilterOptionsConsoles();
+		RefreshList();
+	}
+	
+	override void OnFilterFocusLost( Widget w )
+	{
+		super.OnFilterFocusLost( w );
+	}
+	
+	override void PressA()
+	{
+		
+	}
+	
+	override void PressX()
+	{
+		RefreshList();
+	}
+	
+	override void PressY()
+	{
+		/*
+		if( m_Menu.GetServersLoadingTab() != TabType.NONE )
+		{
+			return;
+		}
+		*/
+
+		switch ( m_SelectedPanel )
+		{
+			case SelectedPanel.BROWSER:
+			{
+				if ( m_SelectedServer )
+				{
+					m_Menu.ServerListFocus( true, m_SelectedServer.ToggleFavorite() );
+				}
+				break;
+			}
+			case SelectedPanel.FILTERS:
+			{
+				if ( m_Filters )
+					m_Filters.ResetFilters();
+				break;
+			}
+		}
+	}
+	
+	override void PressSholderLeft()
+	{
+		if ( m_IsFilterFocused )
+		{
+			SetFocusServers();
+		}
+		else
+		{
+			SetFocusFilters();
+		}
+	}
+	
+	override void PressSholderRight()
+	{
+		if ( m_IsFilterFocused )
+		{
+			SetFocusServers();
+		}
+		else
+		{
+			SetFocusFilters();
+		}
+	}
+	
+	void SetFocusFilters()
+	{
+		SetEnableFilters( true );
+		SetEnableServers( false );
+		
+		// if loaded servers is 0, then hide Top navigation menu <Left / Right>
+		m_WidgetNavFilters.Show( (m_EntryWidgets.Count() > 0) );
+		m_WidgetNavServers.Show( false );
+		
+		m_Filters.Focus();
+		m_IsFilterFocused = true;
+	}
+	
+	override void Focus()
+	{
+		if ( m_EntryWidgets.Contains( m_CurrentSelectedServer ) )
+		{
+			m_EntryWidgets.Get( m_CurrentSelectedServer ).Focus();
+			ScrollToEntry( m_EntryWidgets.Get( m_CurrentSelectedServer ) );
+		}
+		SetFocusServers();
+	}
+	
+	void SetFocusServers()
+	{
+		SetEnableServers( true );
+		SetEnableFilters( false );
+		
+		m_WidgetNavFilters.Show( false );
+		m_WidgetNavServers.Show( true );
+		
+		array<ref GetServersResultRow> entries = m_EntriesSorted[m_SortType];
+		if ( entries.Count() > 0 )
+		{
+			m_EntryWidgets.Get(entries.Get(0).GetIpPort()).Focus();
+			m_IsFilterFocused = false;
+		}
+		else
+		{
+			SetFocusFilters();
+		}
+	}
+	
+	void SetEnableFilters(bool enable)
+	{
+		Widget w_filters = m_Root.FindAnyWidget("filters_content");
+		Widget w_content = m_Root.FindAnyWidget("server_list_scroller");
+		w_filters.Enable( enable );
+		w_content.Enable( !enable );
+	}
+	
+	void SetEnableServers(bool enable)
+	{
+		Widget w_filters = m_Root.FindAnyWidget("filters_content");
+		Widget w_content = m_Root.FindAnyWidget("server_list_scroller");
+		w_filters.Enable( !enable );
+		w_content.Enable( enable );
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	override void ColorHighlight( Widget w )
+	{
+		if ( !w )
+		{
+			return;
+		}
+		
+		w.SetColor( ARGB( 255, 200, 0, 0) );
+	}
+	
+	override void ColorNormal( Widget w )
+	{
+		if ( !w)
+		{
+			return
+		}
+		
+		if ( (w.GetFlags() & WidgetFlags.IGNOREPOINTER) == WidgetFlags.IGNOREPOINTER )
+		{
+			return;
+		}
+		
+		if ( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text" ) );
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text_1" ) );
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_label" ) );
+		ImageWidget image	= ImageWidget.Cast( w.FindAnyWidget( w.GetName() + "_image" ) );
+		
+		Widget option	= Widget.Cast( w.FindAnyWidget( w.GetName() + "_option_wrapper" ) );
+		
+		if ( text1 )
+		{
+			text1.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( text2 )
+		{
+			text2.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( text3 )
+		{
+			text3.SetColor( ARGB( 255, 255, 255, 255 ) );
+			w.SetAlpha(0);
+		}
+		
+		if ( image )
+		{
+			image.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( option )
+		{
+			option.SetColor( ARGB( 150, 255, 255, 255 ) );
+		}
+	}
+	
+	override void ColorDisable( Widget w )
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus( null );
+		#endif
+		
+		ButtonWidget button = ButtonWidget.Cast( w );
+		if ( button )
+		{
+			button.SetTextColor( ColorManager.COLOR_DISABLED_TEXT );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabConsolePages.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabConsolePages.c
new file mode 100644
index 0000000000000000000000000000000000000000..573a7a0bae662eb038d24c9b2c7014340d8ad750
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabConsolePages.c
@@ -0,0 +1,679 @@
+class ServerBrowserTabConsolePages extends ServerBrowserTab
+{
+	private bool m_IsFilterChanged;
+	private bool m_IsFilterFocused;
+	protected bool m_MouseKeyboardControlled
+	
+	private Widget m_WidgetNavFilters;
+	private Widget m_WidgetNavServers;
+	
+	protected Widget								m_ButtonPageLeftImg;
+	protected Widget								m_ButtonPageRightImg;
+	
+	protected int									m_PreviousPage;
+	protected int									m_TotalServersCount;
+	protected int									m_PageStartNum;
+	protected int									m_PageEndNum;
+	protected int									m_PagesCount;
+	protected int									m_ServersEstimateCount;
+	protected int									m_TimeLastServerRefresh;
+	protected int									m_TimeLastServerRefreshHoldButton;
+	
+	protected Widget								m_PnlPagesPanel;
+	protected TextWidget							m_PnlPagesLoadingText;
+	protected ref array<ref ServerBrowserEntry>		m_ServerListEntiers;
+	
+	protected override void Construct( Widget parent, ServerBrowserMenuNew menu, TabType type )
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/server_browser/xbox/server_browser_tab_console_pages.layout", parent );
+		
+		m_ServerListScroller	= ScrollWidget.Cast( m_Root.FindAnyWidget( "server_list_scroller" ) );
+		m_ServerList			= SpacerBaseWidget.Cast( m_ServerListScroller.FindAnyWidget( "server_list_content" ) );
+		m_ServerListScroller.VScrollToPos01( 0 );
+		
+		m_ServerListEntiers		= new array<ref ServerBrowserEntry>;
+		m_EntryWidgets			= new map<string, ref ServerBrowserEntry>;
+		m_EntriesSorted			= new map<ESortType, ref array<ref GetServersResultRow>>;
+		
+		m_EntriesSorted[ESortType.HOST] = new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.POPULATION] = new array<ref GetServersResultRow>;
+		
+		m_Menu					= menu;
+		m_TabType				= type;
+		
+		m_ApplyFilter			= m_Root.FindAnyWidget( "apply_filter_button" );
+		m_ResetFilters			= m_Root.FindAnyWidget( "reset_filter_button" );
+		m_RefreshList			= m_Root.FindAnyWidget( "refresh_list_button" );
+		m_FiltersChanged		= m_Root.FindAnyWidget( "unapplied_filters_notify" );
+		m_HostSort				= m_Root.FindAnyWidget( "server_list_content_header_host" );
+		m_TimeSort				= m_Root.FindAnyWidget( "server_list_content_header_time" );
+		m_PopulationSort		= m_Root.FindAnyWidget( "server_list_content_header_population" );
+		m_SlotsSort				= m_Root.FindAnyWidget( "server_list_content_header_slots" );
+		m_PingSort				= m_Root.FindAnyWidget( "server_list_content_header_ping" );
+		m_FilterSearchText		= m_Root.FindAnyWidget( "search_name_button" );
+		m_FilterSearchTextBox	= m_Root.FindAnyWidget( "search_name_setting_option" );
+		m_LoadingText			= TextWidget.Cast( m_Root.FindAnyWidget( "loading_servers_info" ) );
+		m_WidgetNavFilters		= m_Root.FindAnyWidget( "filters_root_nav_wrapper" );
+		m_WidgetNavServers		= m_Root.FindAnyWidget( "server_list_root_nav_wrapper" );
+		
+		m_BtnPagePrev			= ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_prev" ) ) ;
+		m_BtnPageNext			= ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_next" ) ) ;
+		
+		#ifdef PLATFORM_PS4
+			m_ButtonPageLeftImg = m_Root.FindAnyWidget( "servers_navigation_page_prev_icon_ps4" );
+			m_ButtonPageRightImg = m_Root.FindAnyWidget( "servers_navigation_page_next_icon_ps4" );
+			m_Root.FindAnyWidget( "servers_navigation_page_prev_icon_xbox" ).Show( false );
+			m_Root.FindAnyWidget( "servers_navigation_page_next_icon_xbox" ).Show( false );
+		#else
+			m_ButtonPageLeftImg = m_Root.FindAnyWidget( "servers_navigation_page_prev_icon_xbox" );
+			m_ButtonPageRightImg = m_Root.FindAnyWidget( "servers_navigation_page_next_icon_xbox" );
+			m_Root.FindAnyWidget( "servers_navigation_page_prev_icon_ps4" ).Show( false );
+			m_Root.FindAnyWidget( "servers_navigation_page_next_icon_ps4" ).Show( false );
+		#endif
+		
+		ShowHideConsoleWidgets();		
+		
+		m_Filters				= new ServerBrowserFilterContainer( m_Root.FindAnyWidget( "filters_content" ), this );
+		
+		m_PnlPagesPanel			= m_Root.FindAnyWidget( "servers_navigation_spacer" );
+		m_PreviousPage			= 1;
+		SetCurrentPage( 1 );
+		m_PnlPagesPanel.Show( true );
+		m_LoadingFinished		= true;
+		
+		m_Filters.OnSortChanged( m_Filters.m_SortingFilter.GetValue() );
+		SetFocusFilters();
+		UpdatePageButtons();
+		
+		m_Root.SetHandler( this );
+		m_FilterSearchTextBox.SetHandler( this );
+		
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+	}
+	
+	void ShowHideConsoleWidgets()
+	{
+		bool is_xbox = true;
+		
+#ifdef PLATFORM_PS4
+		is_xbox = false;
+#endif
+		
+		m_Root.FindAnyWidget( "filters_button_wrapper" ).Show( GetGame().GetInput().IsEnabledMouseAndKeyboard() );
+		
+		m_Root.FindAnyWidget( "filters_root_nav_img_lb_xbox" ).Show( is_xbox );
+		m_Root.FindAnyWidget( "filters_root_nav_img_rb_xbox" ).Show( is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_lb_xbox" ).Show( is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_rb_xbox" ).Show( is_xbox );
+		
+		m_Root.FindAnyWidget( "filters_root_nav_img_l1_ps4" ).Show( !is_xbox );
+		m_Root.FindAnyWidget( "filters_root_nav_img_r1_ps4" ).Show( !is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_l1_ps4" ).Show( !is_xbox );
+		m_Root.FindAnyWidget( "server_list_root_nav_img_r1_ps4" ).Show( !is_xbox );
+	}
+
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		switch (pInputDeviceType)
+		{
+		case EInputDeviceType.CONTROLLER:
+			ShowHideConsoleWidgets();
+			UpdatePageButtons();
+			m_WidgetNavFilters.Show(m_IsFilterFocused);
+			m_WidgetNavServers.Show(!m_IsFilterFocused);
+			m_MouseKeyboardControlled = false;
+		break;
+
+		default:
+			if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+			{
+				m_WidgetNavFilters.Show(false);
+				m_WidgetNavServers.Show(false);
+				m_ButtonPageLeftImg.Show(false);
+				m_ButtonPageRightImg.Show(false);
+				m_MouseKeyboardControlled = true;
+			}
+		break;
+		}
+	}
+	
+	override void OnLoadServersAsyncConsole( GetServersResult result_list, EBiosError error, string response )
+	{	
+		if ( error != EBiosError.OK )
+		{
+			m_LoadingText.SetText( string.Format("Error: %1", ErrorModuleHandler.GetClientMessage(ErrorCategory.BIOSError, error)) );
+			m_Menu.SetServersLoadingTab( TabType.NONE );
+			m_LoadingFinished = true;
+			SetFocusFilters();
+			return;
+		}
+				
+		m_PagesCount = result_list.m_Pages;
+		m_TotalServersCount = result_list.m_NumServers;
+		
+		LoadEntries( result_list.m_Page, result_list.m_Results );				
+		
+		if (m_TotalLoadedServers == 0)
+		{
+			SetFocusFilters();
+		}
+		
+		OnLoadServersAsyncFinished();
+		UpdatePageButtons();
+	}
+	
+	void OnLoadServersAsyncFinished()
+	{
+		string msg = "#servers_found: " + m_TotalLoadedServers;
+		if ( m_TotalLoadedServers == 0 )
+		{
+			msg = "#server_browser_tab_unable_to_get_server";
+		}
+		m_LoadingText.SetText( msg );
+		m_LoadingFinished = true;
+		
+		m_Menu.SetServersLoadingTab( TabType.NONE );
+	}
+	
+ 	protected void LoadEntries( int cur_page_index , GetServersResultRowArray page_entries )
+	{
+		int index = 0;
+		ServerBrowserEntry entry;
+		m_TotalLoadedServers = m_TotalServersCount;
+		
+		if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+		{
+			return;
+		}
+		
+		// only load servers if they correspond to current page
+		if (cur_page_index != m_CurrentPageNum)
+		{
+			return;
+		}
+		
+		if ( m_PagesCount && page_entries )
+		{
+			foreach ( GetServersResultRow result : page_entries )
+			{
+				if ( PassFilter( result ) )
+				{
+					string ipPort = result.GetIpPort();
+					bool isFavorited = m_Menu.IsFavorited(ipPort);
+					
+					entry = GetServerEntryByIndex( index );
+					entry.SetIsOnline(true);
+					entry.FillInfo( result );
+					entry.SetFavorite(isFavorited);
+					entry.UpdateEntry();
+					
+					if (isFavorited && m_OnlineFavServers.Find(ipPort) == -1)
+					{
+						m_OnlineFavServers.Insert(ipPort);
+					}
+										
+					m_EntryWidgets.Insert(ipPort, entry);
+					m_EntriesSorted[m_SortType].Insert( result );
+					
+					index++;
+				}
+				
+				if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+				{
+					return;
+				}
+			}
+		}
+		
+		LoadExtraEntries(index);
+		m_ServerList.Update();
+		SetFocusServers();
+	}
+	
+	protected ServerBrowserEntry GetServerEntryByIndex( int index )
+	{
+		ServerBrowserEntry entry;
+		
+		if ( index >= 0 )
+		{
+			if ( index < m_ServerListEntiers.Count() )
+			{
+				entry = m_ServerListEntiers[index];
+			}
+			else
+			{
+				entry = new ServerBrowserEntry( m_ServerList, index, this );				
+				m_ServerListEntiers.Insert(entry);
+			}
+		}
+		else
+		{
+			return null;
+		}
+		
+		entry.Show( true );
+		
+		return entry;
+	}
+	
+	override void OnFilterChanged()
+	{
+		m_IsFilterChanged = true;
+	}
+	
+	bool CanRefreshServerList()
+	{	
+		return m_LoadingFinished;
+	}
+	
+	override void RefreshList()
+	{
+		for ( int i = 0; i < m_ServerListEntiers.Count(); i++ )
+		{
+			m_ServerListEntiers[i].Show(false);
+		}
+		
+		for ( int j = 0; j < m_EntriesSorted.Count(); j++ )
+		{
+			array<ref GetServersResultRow> result_rows = m_EntriesSorted.GetElement(j);
+			
+			if ( result_rows )
+			{
+				result_rows.Clear();
+			}
+		}
+		
+		m_IsFilterChanged = false;
+		m_Filters.SaveFilters();
+		
+		super.RefreshList();
+		
+		m_ServerListScroller.VScrollToPos01( 0 );
+		
+		m_LoadingText.SetText( "#dayz_game_loading" );
+	}
+	
+	override void ResetFilters()
+	{
+		super.ResetFilters();
+		
+		m_IsFilterChanged = false;
+	}
+	
+	override void ApplyFilters()
+	{
+		if ( m_IsFilterChanged )
+		{
+			SetCurrentPage(1);
+		}
+		
+		m_IsFilterChanged = false;
+		m_CurrentFilterInput = m_Filters.GetFilterOptionsConsoles();
+		RefreshList();
+	}
+	
+	override void PressA()
+	{
+		
+	}
+	
+	override void PressX()
+	{
+		if ( (GetGame().GetTime() - m_TimeLastServerRefresh) > 1000 )
+		{
+			m_TimeLastServerRefresh = GetGame().GetTime();
+			
+			if ( m_IsFilterChanged)
+			{
+				SetCurrentPage(1);
+			}
+			m_OnlineFavServers.Clear();
+			RefreshList();
+		}
+		
+	}
+	
+	override void PressY()
+	{
+		switch ( m_SelectedPanel )
+		{
+			case SelectedPanel.BROWSER:
+			{
+				if ( m_SelectedServer )
+				{
+					m_Menu.ServerListFocus( true, m_SelectedServer.ToggleFavorite() );
+				}
+				break;
+			}
+			case SelectedPanel.FILTERS:
+			{
+				if ( m_Filters )
+				{
+					m_Filters.ResetFilters();
+				}
+				break;
+			}
+		}
+	}
+	
+	override void Left()
+	{
+		if ( !m_IsFilterFocused )
+		{
+			int curr_page = GetCurrentPage();
+			m_PreviousPage = curr_page;
+			if ( curr_page > 1 )
+			{
+				SetCurrentPage( curr_page - 1 );
+				UpdatePageButtons();
+			}
+		}
+	}
+	
+	override void LeftHold()
+	{
+		if ( !m_IsFilterFocused )
+		{
+			if ( (GetGame().GetTime() - m_TimeLastServerRefreshHoldButton) > 100 )
+			{
+				m_TimeLastServerRefreshHoldButton = GetGame().GetTime();
+				Left();
+			}
+		}		
+	}
+	
+	override void LeftRelease()
+	{
+		if ( !m_IsFilterFocused && GetCurrentPage() != m_PreviousPage )
+		{
+			RefreshList();
+		}
+	}
+	
+	override void Right()
+	{
+		if ( !m_IsFilterFocused )
+		{
+			int curr_page = GetCurrentPage();
+			m_PreviousPage = curr_page;
+			if ( curr_page < m_PagesCount )
+			{
+				SetCurrentPage( curr_page + 1 );
+				UpdatePageButtons();
+			}
+		}
+	}
+	
+	override void RightHold()
+	{
+		if ( !m_IsFilterFocused )
+		{
+			if ( (GetGame().GetTime() - m_TimeLastServerRefreshHoldButton) > 100 )
+			{				
+				m_TimeLastServerRefreshHoldButton = GetGame().GetTime();
+				Right();
+			}
+		}
+	}
+	
+	override void RightRelease()
+	{
+		if ( !m_IsFilterFocused && GetCurrentPage() != m_PreviousPage )
+		{
+			RefreshList();
+		}
+	}
+	
+	override void PressSholderLeft()
+	{
+		if ( m_IsFilterFocused )
+		{
+			SetFocusServers();
+		}
+		else
+		{
+			SetFocusFilters();
+		}
+	}
+	
+	override void PressSholderRight()
+	{
+		if ( m_IsFilterFocused )
+		{
+			SetFocusServers();
+		}
+		else
+		{
+			SetFocusFilters();
+		}
+	}
+	override void Focus()
+	{
+		if ( m_EntryWidgets.Contains( m_CurrentSelectedServer ) )
+		{
+			m_EntryWidgets.Get( m_CurrentSelectedServer ).Focus();
+			ScrollToEntry( m_EntryWidgets.Get( m_CurrentSelectedServer ) );
+		}
+		
+		array<ref GetServersResultRow> entries = m_EntriesSorted[m_SortType];
+		if ( entries && entries.Count() > 0 )
+			SetFocusServers();
+		else
+			SetFocusFilters();
+	}
+	
+	
+	void SetFocusFilters()
+	{
+		SetEnableFilters(true);
+		SetEnableServers(false);
+		
+		// if loaded servers is 0, then hide Top navigation menu <Left / Right>
+		if (!m_MouseKeyboardControlled)
+		{
+			m_WidgetNavFilters.Show(true);
+			m_WidgetNavServers.Show(false);
+		}
+		
+		m_Filters.Focus();
+		m_IsFilterFocused = true;
+		
+		UpdatePageButtons();
+	}
+	
+	void SetFocusServers()
+	{
+		SetEnableServers(true);
+		SetEnableFilters(false);
+		
+		if (!m_MouseKeyboardControlled)
+		{
+			m_WidgetNavFilters.Show(false);
+			m_WidgetNavServers.Show(true);
+		}
+
+		array<ref GetServersResultRow> entries = m_EntriesSorted[m_SortType];
+		if ( entries && entries.Count() > 0 )
+		{
+			m_EntryWidgets.Get(entries.Get(0).GetIpPort()).Focus();
+		}
+		else
+		{
+			SetFocus( null );
+		}
+		
+		m_IsFilterFocused = false;
+		m_Menu.ShowYButton(true);
+		m_Menu.ShowAButton(true);
+		
+		UpdatePageButtons();
+	}
+	
+	void SetEnableFilters(bool enable)
+	{		
+		Widget w_filters = m_Root.FindAnyWidget("filters_content");
+		Widget w_content = m_Root.FindAnyWidget("server_list_scroller");
+		w_content.Enable( !enable );
+		
+		if ( enable )
+		{
+			SetFocus( ButtonWidget.Cast(w_filters.FindWidget("sort_button")) );
+		}
+	}
+	
+	void SetEnableServers(bool enable)
+	{		
+		Widget w_filters = m_Root.FindAnyWidget("filters_content");
+		Widget w_content = m_Root.FindAnyWidget("server_list_scroller");
+		w_content.Enable( enable );
+	}
+	
+	void UpdatePageButtons()
+	{
+		TextWidget wgt_page_stat = TextWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_page_status" ) );		
+		
+		wgt_page_stat.SetText( GetCurrentPage().ToString() +" / "+ m_PagesCount.ToString() );
+				
+		if ( !m_IsFilterFocused && (m_PagesCount > 1) && !m_MouseKeyboardControlled )
+		{
+			bool can_left = (GetCurrentPage() > 1);
+			m_ButtonPageLeftImg.Show( can_left );
+			m_BtnPagePrev.Show( can_left );
+			
+			bool can_right = (GetCurrentPage() < m_PagesCount);
+			m_ButtonPageRightImg.Show( can_right );
+			m_BtnPageNext.Show( can_right );
+		}
+		else
+		{
+			m_ButtonPageLeftImg.Show( false );
+			m_BtnPagePrev.Show( false );
+			m_ButtonPageRightImg.Show( false );
+			m_BtnPageNext.Show( false );
+		}
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		super.OnClick( w, x, y, button );
+		
+		if ( button == MouseState.LEFT )
+		{
+			if ( w == m_ResetFilters )
+			{
+				ResetFilters();
+			}
+			else if ( w == m_ApplyFilter )
+			{
+				ApplyFilters();
+				return true;
+			}
+			else if ( w == m_RefreshList )
+			{
+				if ( m_Loading && !m_LoadingFinished )
+				{
+					PressX();
+				}
+				else
+				{
+					RefreshList();
+				}
+				
+				return true;
+			}
+			else if ( w == m_BtnPagePrev )
+			{
+				Left();
+				return true;
+			}
+			else if ( w == m_BtnPageNext )
+			{
+				Right();
+				return true;
+			}
+		}
+		return false;
+	}
+	
+	//Coloring functions (Until WidgetStyles are useful)
+	override void ColorHighlight( Widget w )
+	{
+		if ( !w )
+		{
+			return;
+		}
+		
+		w.SetColor( ARGB( 255, 200, 0, 0) );
+	}
+	
+	override void ColorNormal( Widget w )
+	{
+		if ( !w )
+		{
+			return
+		}
+		
+		if ( (w.GetFlags() & WidgetFlags.IGNOREPOINTER) == WidgetFlags.IGNOREPOINTER )
+		{
+			return;
+		}
+		
+		if ( w.IsInherited( ButtonWidget ) )
+		{
+			ButtonWidget button = ButtonWidget.Cast( w );
+			button.SetTextColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		else if ( !w.IsInherited( EditBoxWidget ) )
+		{
+			w.SetColor( ARGB( 0, 255, 255, 255 ) );
+		}
+		
+		TextWidget text1	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text" ) );
+		TextWidget text2	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_text_1" ) );
+		TextWidget text3	= TextWidget.Cast(w.FindAnyWidget( w.GetName() + "_label" ) );
+		ImageWidget image	= ImageWidget.Cast( w.FindAnyWidget( w.GetName() + "_image" ) );
+		
+		Widget option	= Widget.Cast( w.FindAnyWidget( w.GetName() + "_option_wrapper" ) );
+		
+		if ( text1 )
+		{
+			text1.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( text2 )
+		{
+			text2.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( text3 )
+		{
+			text3.SetColor( ARGB( 255, 255, 255, 255 ) );
+			w.SetAlpha(0);
+		}
+		
+		if ( image )
+		{
+			image.SetColor( ARGB( 255, 255, 255, 255 ) );
+		}
+		
+		if ( option )
+		{
+			option.SetColor( ARGB( 150, 255, 255, 255 ) );
+		}
+	}
+	
+	override void ColorDisable( Widget w )
+	{
+		#ifdef PLATFORM_WINDOWS
+		SetFocus( null );
+		#endif
+		
+		ButtonWidget button = ButtonWidget.Cast( w );
+		if ( button )
+		{
+			button.SetTextColor( ColorManager.COLOR_DISABLED_TEXT );
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabPc.c b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabPc.c
new file mode 100644
index 0000000000000000000000000000000000000000..407f3b8bc1ece15be9f965f2e63fc144d471ec11
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/ServerBrowserMenu/ServerBrowserTabPc.c
@@ -0,0 +1,1182 @@
+class ServerBrowserTabPc extends ServerBrowserTab
+{
+	protected const int SERVERS_VISIBLE_COUNT	= 24;
+	protected const int PAGES_BUTTONS_COUNT		= 10;
+	
+	protected int									m_TotalServersCount; //UNUSED
+	protected int									m_PageIndex;
+	protected int									m_PageStartNum;
+	protected int									m_PageEndNum;
+	protected int									m_PagesCount;
+	protected int									m_ServersEstimateCount;
+		
+	protected Widget								m_PnlPagesPanel;
+	protected TextWidget							m_PnlPagesLoadingText;
+	protected ButtonWidget							m_BtnPagesFirst;
+	protected ButtonWidget							m_BtnPagesLast;
+	
+	protected Widget								m_FilterSearchIP;
+	protected Widget								m_FilterSearchIPBox;
+	protected Widget								m_FilterPanelPing;
+	protected Widget								m_FilterPanelAccTime;
+	
+	protected ref array<ButtonWidget>				m_BtnPages;
+	protected ref array<ref ServerBrowserEntry>		m_ServerListEntries;
+	
+	protected ref TStringArray m_TempTime = new TStringArray;
+	
+	protected override void Construct( Widget parent, ServerBrowserMenuNew menu, TabType type )
+	{
+		#ifdef PLATFORM_CONSOLE
+			m_Root					= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/server_browser/xbox/server_browser_tab.layout", parent );
+		#else
+		#ifdef PLATFORM_WINDOWS
+			m_Root					= GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/server_browser/pc/server_browser_tab_pages.layout", parent );
+		#endif
+		#endif
+		
+		m_ServerListScroller	= ScrollWidget.Cast( m_Root.FindAnyWidget( "server_list_scroller" ) );
+		m_ServerList			= SpacerBaseWidget.Cast( m_ServerListScroller.FindAnyWidget( "server_list_content" ) );
+		m_ServerListScroller.VScrollToPos01( 0 );
+				
+		m_ServerListEntries		= new array<ref ServerBrowserEntry>;		
+		m_EntryWidgets			= new map<string, ref ServerBrowserEntry>;
+		m_SortInverted			= new map<ESortType, ESortOrder>;
+		m_EntriesSorted			= new map<ESortType, ref array<ref GetServersResultRow>>;
+		m_EntryMods				= new map<string, ref array<string>>;
+		
+		m_EntriesSorted[ESortType.HOST] 		= new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.TIME]			= new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.POPULATION]	= new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.SLOTS]		= new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.PING]			= new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.FAVORITE]		= new array<ref GetServersResultRow>;
+		m_EntriesSorted[ESortType.PASSWORDED]	= new array<ref GetServersResultRow>;
+		
+		m_Menu					= menu;
+		m_TabType				= type;
+		
+		m_ApplyFilter			= m_Root.FindAnyWidget( "apply_filter_button" );
+		m_RefreshList			= m_Root.FindAnyWidget( "refresh_list_button" );
+		m_FiltersChanged		= m_Root.FindAnyWidget( "unapplied_filters_notify" );
+		m_HostSort				= m_Root.FindAnyWidget( "server_list_content_header_host" );
+		m_TimeSort				= m_Root.FindAnyWidget( "server_list_content_header_time" );
+		m_PopulationSort		= m_Root.FindAnyWidget( "server_list_content_header_population" );
+		m_SlotsSort				= m_Root.FindAnyWidget( "server_list_content_header_slots" );
+		m_PingSort				= m_Root.FindAnyWidget( "server_list_content_header_ping" );
+		
+		m_FilterSearchText		= m_Root.FindAnyWidget( "search_name_setting" );
+		m_FilterSearchTextBox	= m_Root.FindAnyWidget( "search_name_setting_option" );
+		m_FilterSearchIP		= m_Root.FindAnyWidget( "search_ip_setting" );
+		m_FilterSearchIPBox		= m_Root.FindAnyWidget( "search_ip_setting_option" );
+		
+		m_FilterPanelAccTime	= m_Root.FindAnyWidget( "accelerated_time_setting" );
+		m_FilterPanelPing		= m_Root.FindAnyWidget( "ping_setting" );
+		//m_FilterPanelPing.SetHandler( this );
+		
+		m_LoadingText			= TextWidget.Cast( m_Root.FindAnyWidget( "loading_servers_info" ) );
+		
+		ButtonDisable( m_ApplyFilter );
+		
+		if ( type == TabType.LAN)
+		{
+			DisableFilters();
+		}
+		
+		m_Filters = new ServerBrowserFilterContainer( m_Root.FindAnyWidget( "filters_content" ), this );
+				
+		m_Root.SetHandler( this );		
+		
+		SetSort(ESortType.HOST, ESortOrder.ASCENDING);
+		
+		m_BtnPages = new array<ButtonWidget>();
+		
+		int page_button_num = 1;
+		ButtonWidget page_button = ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_page"+ page_button_num ) );
+		
+		if ( PAGES_BUTTONS_COUNT < 3 || PAGES_BUTTONS_COUNT > 10 )
+		{
+			Error("ServerBrowserTabPage->PAGES_BUTTONS_COUNT must be in range 3 - 10!");
+			return;
+		}
+		
+		while ( page_button )
+		{
+			page_button.Show(false);
+			
+			if ( page_button_num <= PAGES_BUTTONS_COUNT )
+			{
+				m_BtnPages.Insert( page_button );
+			}
+			
+			page_button_num++;
+			page_button = ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_page"+ page_button_num ) );
+		}		
+		
+		m_ResetFilters			= ButtonWidget.Cast( m_Root.FindAnyWidget( "reset_filter_button" ) ) ;
+		
+		m_PnlPagesPanel			= m_Root.FindAnyWidget( "servers_navigation_spacer" );
+		m_BtnPagePrev			= ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_prev" ) ) ;
+		m_BtnPageNext			= ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_next" ) ) ;
+		m_BtnPagesFirst			= ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_page_first" ) ) ;
+		m_BtnPagesLast			= ButtonWidget.Cast( m_Root.FindAnyWidget( "servers_navigation_page_last" ) ) ;
+		m_PageIndex				= 0;
+		m_PnlPagesPanel.Show( true );
+		
+		UpdatePageButtons();
+	}
+	
+	void ~ServerBrowserTabPc()
+	{
+		
+	}
+	
+	void DisableFilters()
+	{
+		m_Root.FindAnyWidget( "filters_content" ).Show( false );
+		m_Root.FindAnyWidget( "spacer" ).Show( false );
+		m_Root.FindAnyWidget( "spacer2" ).Show( false );
+		m_Root.FindAnyWidget( "reset_filter_button" ).Show( false );
+		m_ApplyFilter.Show( false );
+		m_FiltersChanged.Show( false );
+	}
+	
+	override void RefreshList()
+	{
+		for ( int i = 0; i < m_EntriesSorted.Count(); i++ )
+		{
+			m_EntriesSorted.GetElement(i).Clear();
+		}
+		
+		OnlineServices.m_ServersAsyncInvoker.Insert( m_Menu.OnLoadServersAsync, EScriptInvokerInsertFlags.NONE );
+		
+		m_LoadingFinished = false;
+		m_Loading = true;
+		m_TotalServersCount = 0;
+		m_TotalLoadedServers = 0;
+		m_ServersEstimateCount = 0;
+		m_PageIndex = 0;		
+		
+		super.RefreshList();
+		
+		m_ServerListScroller.VScrollToPos01( 0 );
+		ButtonRefreshToCancel();
+		UpdateServerList();
+		UpdatePageButtons();
+		UpdateStatusBar();
+	}
+	
+	override void ResetFilters()
+	{
+		m_Filters.ResetFilters();
+		
+		ButtonEnable( m_ApplyFilter );
+		
+		if ( !m_Loading )
+		{
+			ButtonDisable( m_RefreshList );
+		}
+	}
+	
+	override void ApplyFilters()
+	{
+		m_Filters.SaveFilters();
+		//m_CurrentFilterInput = m_Filters.GetFilterOptionsPC();		
+		RefreshList();
+		ButtonDisable( m_ApplyFilter );
+		ButtonEnable( m_RefreshList );
+	}
+	
+	void LoadingServersStop()
+	{
+		OnlineServices.m_ServersAsyncInvoker.Remove( m_Menu.OnLoadServersAsync );
+		
+		m_LoadingFinished = true;
+		m_Loading = false;
+		
+		ButtonCancelToRefresh();		
+		
+		UpdateServerList();
+		UpdateStatusBar();
+	}
+	
+	override void OnLoadServersAsyncPC( ref GetServersResult result_list, EBiosError error, string response )
+	{
+		if ( result_list )
+		{			
+			int count = result_list.m_Results.Count();
+			if ( count > 0 )
+			{				
+				for ( int i = 0; i < count; i++ )
+				{
+					GetServersResultRow result = result_list.m_Results[i];
+					m_TotalServersCount++;
+					
+					result.m_SortName = result.m_Name.ToInt();
+					result.m_SortTime = GetTimeOfDayEnum( result.m_TimeOfDay );					
+					
+					if ( PassFilter( result ) )
+					{
+						int sorted_index = AddSorted( result );
+						if ( sorted_index < (m_PageIndex * SERVERS_VISIBLE_COUNT + SERVERS_VISIBLE_COUNT) )
+						{
+							UpdateServerList();
+							UpdatePageButtons();
+						}
+					}
+					
+					if ( !m_Menu || m_Menu.GetServersLoadingTab() != m_TabType )
+					{
+						return;
+					}
+				}
+			}
+			else
+			{
+				m_Menu.SetServersLoadingTab( TabType.NONE );
+			}
+
+		}
+		else
+		{
+			m_Menu.SetServersLoadingTab( TabType.NONE );
+		}
+		
+		if ( response == "thelastone" )
+		{
+			OnLoadServersAsyncPCFinished();
+		}
+		else
+		{
+			m_ServersEstimateCount = result_list.m_NumServers;
+		}
+		
+		UpdateServerList();
+		UpdateStatusBar();	
+	}
+	
+	void OnLoadServersAsyncPCFinished()
+	{
+		LoadingServersStop();
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		super.OnClick( w, x, y, button );
+		
+		if ( button == MouseState.LEFT )
+		{
+			if ( w == m_ResetFilters )
+			{
+				ResetFilters();
+			}
+			else if ( w == m_ApplyFilter )
+			{
+				ApplyFilters();
+				return true;
+			}
+			else if ( w == m_RefreshList )
+			{
+				if ( m_Loading && !m_LoadingFinished )
+				{
+					LoadingServersStop();
+				}
+				else
+				{
+					RefreshList();
+				}
+				
+				return true;
+			}
+			else if ( w == m_BtnPagePrev )
+			{
+				OnClickPagePrev();
+				return true;
+			}
+			else if ( w == m_BtnPageNext )
+			{
+				OnClickPageNext();
+				return true;
+			}
+			else if ( w == m_BtnPagesLast )
+			{
+				OnClickPageEnd();
+				return true;
+			}
+			else if ( w == m_BtnPagesFirst )
+			{
+				OnClickPageFirst();
+				return true;
+			}
+			else
+			{
+				bool click = OnClickPage( w );
+				
+				if ( click )
+				{
+					return true;
+				}
+				
+				return false;
+			}
+		}
+		return false;
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{		
+		if ( IsFocusable( w ) )
+		{
+			ColorHighlight( w );
+			
+			if ( w == m_FilterSearchText )
+			{
+				SetFocus( m_FilterSearchTextBox );
+				return true;
+			}
+			else if ( w == m_FilterSearchIP )
+			{
+				SetFocus( m_FilterSearchIPBox );
+				return true;
+			}
+			
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{		
+		if ( IsFocusable( w ) )
+		{
+			ColorNormal( w );
+			
+			if ( w == m_FilterSearchText || w == m_FilterSearchIP )
+			{
+				SetFocus( null );
+			}
+			
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		//Print("SG OnMouseButtonUp: "+ w.GetName());
+		
+		if ( button == MouseState.LEFT )
+		{
+			if ( w == m_HostSort )
+			{
+				ToggleSort( ESortType.HOST );
+				UpdateServerList();
+				return true;
+			}
+			else if ( w == m_TimeSort )
+			{
+				ToggleSort( ESortType.TIME );
+				UpdateServerList();
+				return true;
+			}
+			else if ( w == m_PopulationSort )
+			{
+				ToggleSort( ESortType.POPULATION );
+				UpdateServerList();
+				return true;
+			}
+			else if ( w == m_SlotsSort )
+			{
+				ToggleSort( ESortType.SLOTS );
+				UpdateServerList();
+				return true;
+			}
+			else if ( w == m_PingSort )
+			{
+				ToggleSort( ESortType.PING );
+				UpdateServerList();
+				return true;
+			}			
+		}
+		return false;
+	}
+	
+	override void OnFilterChanged()
+	{
+		//m_FiltersChanged.Show( true );
+		
+		ButtonEnable( m_ApplyFilter );
+		
+		if ( !m_Loading )
+		{
+			ButtonDisable( m_RefreshList );
+		}
+	}
+	
+	void OnClickPagePrev()
+	{
+		if ( m_PageIndex > 0 )
+		{
+			SetPageIndex( m_PageIndex - 1);
+		}
+		else
+		{
+			SetPageIndex( m_PagesCount - 1 );
+		}
+	}
+	
+	void OnClickPageNext()
+	{
+		if ( m_PageIndex < (m_PagesCount - 1) )
+		{
+			SetPageIndex( m_PageIndex + 1 );
+		}
+		else
+		{
+			SetPageIndex( 0 );
+		}
+	}
+	
+	void OnClickPageEnd()
+	{
+		SetPageIndex( m_PagesCount - 1 );
+	}
+	
+	void OnClickPageFirst()
+	{
+		SetPageIndex( 0 );
+	}
+	
+	bool OnClickPage(Widget w)
+	{
+		for ( int i = 0; i < m_BtnPages.Count(); ++i )
+		{
+			if ( m_BtnPages[i] == w )
+			{
+				SetPageIndex( m_PageStartNum + i - 1 );
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	void SetPageIndex(int page_index)
+	{
+		m_PageIndex = page_index;
+		UpdateServerList();
+		UpdatePageButtons();
+	}
+	
+	void ToggleSort( ESortType type )
+	{
+		ESortOrder order = ESortOrder.ASCENDING;
+		
+		if ( m_SortType != type )
+		{
+			if ( m_SortInverted[type] == true )
+			{
+				m_EntriesSorted[type].Invert();
+			}
+			
+			m_SortInverted[type] = false;
+		}
+		else
+		{
+			if ( m_SortOrder == ESortOrder.ASCENDING )
+			{
+				m_EntriesSorted[type].Invert();				
+				m_SortInverted[type] = true;				
+				order = ESortOrder.DESCENDING;
+			}
+			else
+			{
+				m_EntriesSorted[type].Invert();				
+				m_SortInverted[type] = false;			
+			}
+		}
+		
+		SetSort( type, order );
+	}
+	
+	override void SetSort( ESortType type, ESortOrder order )
+	{
+		super.SetSort( type, order);
+		
+		#ifdef PLATFORM_WINDOWS
+		m_Root.FindAnyWidget( "host_sort" ).Show( false );
+		m_Root.FindAnyWidget( "population_sort" ).Show( false );
+		m_Root.FindAnyWidget( "slots_sort" ).Show( false );
+		
+		m_Root.FindAnyWidget( "time_sort" ).Show( false );
+		m_Root.FindAnyWidget( "ping_sort" ).Show( false );
+		
+		TextWidget root;
+		root = TextWidget.Cast( m_Root.FindAnyWidget( "server_list_content_header_host_label" ) );
+		root.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		root = TextWidget.Cast( m_Root.FindAnyWidget( "server_list_content_header_population_label" ) );
+		root.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		root = TextWidget.Cast( m_Root.FindAnyWidget( "server_list_content_header_slots_label" ) );
+		root.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		
+		root = TextWidget.Cast( m_Root.FindAnyWidget( "server_list_content_header_ping_label" ) );
+		root.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		root = TextWidget.Cast( m_Root.FindAnyWidget( "server_list_content_header_time_label" ) );
+		root.SetColor( ARGBF( 1, 1, 1, 1 ) );
+		
+		string r_name;
+		string w_name;
+		
+		switch ( type )
+		{
+			case ESortType.HOST:
+			{
+				r_name = "server_list_content_header_host_label";
+				w_name = "host_sort";
+				break;
+			}
+			case ESortType.TIME:
+			{
+				r_name = "server_list_content_header_time_label";
+				w_name = "time_sort";
+				break;
+			}
+			case ESortType.POPULATION:
+			{
+				r_name = "server_list_content_header_population_label";
+				w_name = "population_sort";
+				break;
+			}
+			case ESortType.SLOTS:
+			{
+				r_name = "server_list_content_header_slots_label";
+				w_name = "slots_sort";
+				break;
+			}
+			case ESortType.PING:
+			{
+				r_name = "server_list_content_header_ping_label";
+				w_name = "ping_sort";
+				break;
+			}
+		}
+		
+		root = TextWidget.Cast( m_Root.FindAnyWidget( r_name ) );
+		root.SetColor( ARGBF( 1, 1, 0, 0 ) );
+		
+		m_Root.FindAnyWidget( w_name ).Show( true );
+		m_Root.FindAnyWidget( w_name + "_asc" ).Show( !m_SortOrder );
+		m_Root.FindAnyWidget( w_name + "_dsc" ).Show( m_SortOrder );		
+		#endif
+	}
+	
+	int GetTimeOfDayEnum( string time_of_day )
+	{
+		m_TempTime.Clear();
+		
+		time_of_day.Split( ":", m_TempTime );
+		
+		int minutes = 0;
+		
+		if ( m_TempTime.Count() > 0 )
+		{
+			int h = m_TempTime[0].ToInt();
+			
+			if ( h >= 5 )
+			{
+				h -= 5;
+			}
+			else
+			{
+				h += 24;
+			}
+			
+			minutes = h * 60;
+		}
+		
+		if ( m_TempTime.Count() > 1 )
+		{
+			int m = m_TempTime[0].ToInt();
+			minutes += m;
+		}
+		
+		return minutes;
+	}
+	
+	// Return sorted index
+	override int AddSorted( GetServersResultRow entry )
+	{
+		int index_host = SortedInsert( entry, ESortType.HOST );
+		int index_time = SortedInsert( entry, ESortType.TIME );
+		int index_popu = SortedInsert( entry, ESortType.POPULATION );
+		int index_slot = SortedInsert( entry, ESortType.SLOTS );
+		int index_ping = SortedInsert( entry, ESortType.PING );
+		int index_favo = SortedInsert( entry, ESortType.FAVORITE );
+		int index_pass = SortedInsert( entry, ESortType.PASSWORDED );
+		
+		switch ( m_SortType )
+		{
+			case ESortType.HOST:
+				return index_host;
+			case ESortType.TIME:
+				return index_time;
+			case ESortType.POPULATION:
+				return index_popu;
+			case ESortType.SLOTS:
+				return index_slot;
+			case ESortType.PING:
+				return index_ping;
+			case ESortType.FAVORITE:
+				return index_favo;
+			case ESortType.PASSWORDED:
+				return index_pass;
+		}
+			
+		return 0;
+	}
+	
+	override void SelectServer( ServerBrowserEntry server )
+	{
+		super.SelectServer( server );
+		
+		#ifdef PLATFORM_CONSOLE
+		ScrollToEntry( server );
+		#endif
+		
+		m_SelectedServer = server;
+		
+		if (!m_Menu)
+			return;
+		
+		m_Menu.SelectServer( server );
+	}
+		
+	int SortedInsert(GetServersResultRow entry, ESortType sort_type)
+	{
+		return SortedInsertEx(entry, sort_type, m_SortInverted[sort_type]);
+	}
+
+	private int SortedInsertEx(GetServersResultRow entry, ESortType sortType, bool isDescending)
+	{		
+		array<ref GetServersResultRow> list = m_EntriesSorted[sortType];
+		int indexMax = list.Count() - 1;
+		int indexMin = 0;
+		int targetIndex = Math.Floor( indexMax / 2 );
+		int comparisonMultiplier = 1;
+		
+		// if order is descending, then invert comparison results
+		if (isDescending == true)
+		{
+			comparisonMultiplier = -1;
+		}
+		
+		if ( indexMax == -1 )
+		{
+			list.Insert( entry );
+			return 0;
+		}
+		
+		while ( true )
+		{
+			int comparisonResult = comparisonMultiplier * entry.CompareTo(list[targetIndex], sortType);	
+			
+			if ((indexMax - indexMin) <= 1)
+			{
+				for (int i = indexMin; i <= indexMax; i++ )
+				{
+					comparisonResult = comparisonMultiplier * entry.CompareTo(list[i], sortType);		
+					
+					if ( comparisonResult > 0 )
+					{
+						list.InsertAt( entry, i );
+						return i;
+					}
+				}
+				
+				// adding entry AFTER indexMax
+				targetIndex = Math.Min(indexMax + 1, list.Count());
+				list.InsertAt(entry, targetIndex);
+				return targetIndex;
+			}
+			
+			if (comparisonResult == 0)
+			{
+				list.InsertAt(entry, targetIndex);
+				return targetIndex;
+			}
+			
+			if (comparisonResult > 0)
+			{
+				indexMax = targetIndex;
+			}
+			
+			else if (comparisonResult < 0)
+			{
+				indexMin = targetIndex;
+			}
+			
+			targetIndex = indexMin + Math.Floor((indexMax - indexMin) / 2);	
+		}
+		
+		return 0;
+	}
+	
+	// DEPRECATED
+	int SortedInsertAsc( GetServersResultRow entry, ESortType sort_type )
+	{
+		array<ref GetServersResultRow> list = m_EntriesSorted[sort_type];
+		
+		int i;
+		int index_min = 0;
+		int index_max = list.Count() - 1;
+		int target_index = Math.Floor( index_max / 2 );
+		
+		if ( index_max == -1 )
+		{
+			list.Insert( entry );
+			return 0;
+		}
+		
+		if ( sort_type == ESortType.HOST )
+		{
+			string entry_value_str = entry.GetValueStr(ESortType.HOST);
+			
+			while ( true )
+			{
+				string target_value_str = list[target_index].GetValueStr(ESortType.HOST);
+				
+				if ( entry_value_str == target_value_str || ((index_max - index_min) <= 1) )
+				{
+					for ( i = index_min; i <= index_max; i++ )
+					{
+						if ( entry_value_str <= list[i].GetValueStr(ESortType.HOST) )
+						{
+							list.InsertAt( entry, i );
+							return i;
+						}
+					}
+					
+					index_max++;
+					list.InsertAt( entry, index_max );
+					return target_index;
+				}
+				else if ( entry_value_str < target_value_str )
+				{
+					index_max = target_index;
+					target_index = Math.Floor( target_index / 2 );
+				}
+				else if ( entry_value_str > target_value_str )
+				{
+					index_min = target_index;
+					target_index += Math.Floor( (index_max - index_min) / 2 );
+				}			
+			}
+		}
+		else
+		{
+			int entry_value_int = entry.GetValueInt( sort_type );
+			
+			while ( true )
+			{
+				int target_value_int = list[target_index].GetValueInt( sort_type );
+				
+				if ( entry_value_int == target_value_int || ((index_max - index_min) <= 1) )
+				{
+					for ( i = index_min; i <= index_max; i++ )
+					{
+						if ( entry_value_int <= list[i].GetValueInt( sort_type ) )
+						{
+							list.InsertAt( entry, i );
+							return i;
+						}
+					}
+					
+					index_max++;
+					list.InsertAt( entry, index_max );
+					return target_index;
+				}
+				else if ( entry_value_int < target_value_int )
+				{
+					index_max = target_index;
+					target_index = Math.Floor( target_index / 2 );
+				}
+				else if ( entry_value_int > target_value_int )
+				{
+					index_min = target_index;
+					target_index += Math.Floor( (index_max - index_min) / 2 );
+				}			
+			}
+		}
+		
+		return target_index;
+	}
+	
+	// DEPRECATED
+	int SortedInsertDesc( GetServersResultRow entry, ESortType sort_type )
+	{
+		array<ref GetServersResultRow> list = m_EntriesSorted[sort_type];
+		
+		int i;
+		int index_min = 0;
+		int index_max = list.Count() - 1;
+		int target_index = Math.Floor( index_max / 2 );
+		
+		if ( index_max == -1 )
+		{
+			list.Insert( entry );
+			return 0;
+		}
+		
+		if ( sort_type == ESortType.HOST )
+		{
+			string entry_value_str = entry.GetValueStr(ESortType.HOST);
+			
+			while ( true )
+			{
+				string target_value_str = list[target_index].GetValueStr(ESortType.HOST);
+				
+				if ( entry_value_str == target_value_str || ((index_max - index_min) <= 1) )
+				{
+					for ( i = index_min; i <= index_max; i++ )
+					{
+						if ( entry_value_str >= list[i].GetValueStr(ESortType.HOST) )
+						{
+							list.InsertAt( entry, i );
+							return i;
+						}
+					}
+					
+					index_max++;
+					list.InsertAt( entry, index_max );
+					return target_index;
+				}
+				else if ( entry_value_str > target_value_str )
+				{
+					index_max = target_index;
+					target_index = Math.Floor( target_index / 2 );
+				}
+				else if ( entry_value_str < target_value_str )
+				{
+					index_min = target_index;
+					target_index += Math.Floor( (index_max - index_min) / 2 );
+				}			
+			}
+		}
+		else
+		{
+			int entry_value_int = entry.GetValueInt( sort_type );
+			
+			while ( true )
+			{
+				int target_value_int = list[target_index].GetValueInt( sort_type );
+				
+				if ( entry_value_int == target_value_int || ((index_max - index_min) <= 1) )
+				{
+					for ( i = index_min; i <= index_max; i++ )
+					{
+						if ( entry_value_int >= list[i].GetValueInt( sort_type ) )
+						{
+							list.InsertAt( entry, i );
+							return i;
+						}
+					}
+					
+					index_max++;
+					list.InsertAt( entry, index_max );
+					return target_index;
+				}
+				else if ( entry_value_int > target_value_int )
+				{
+					index_max = target_index;
+					target_index = Math.Floor( target_index / 2 );
+				}
+				else if ( entry_value_int < target_value_int )
+				{
+					index_min = target_index;
+					target_index += Math.Floor( (index_max - index_min) / 2 );
+				}			
+			}
+		}
+		
+		return target_index;
+	}
+
+	void UpdatePageButtons()
+	{
+		m_PagesCount = Math.Ceil( m_TotalLoadedServers / SERVERS_VISIBLE_COUNT );		
+		if ( m_PagesCount > 1 )
+		{
+			m_PnlPagesPanel.Show( true );
+			
+			int i;
+			int btn_index_center = Math.Round( PAGES_BUTTONS_COUNT / 2) - 1; 
+			m_PageStartNum = 1;
+			m_PageEndNum = PAGES_BUTTONS_COUNT;
+			
+			if ( m_PagesCount <= PAGES_BUTTONS_COUNT )
+			{
+				m_PageEndNum = m_PagesCount;
+				
+				// Pages are less like buttons - changing selected button
+				for ( i = 1; i <= m_BtnPages.Count(); ++i )
+				{
+					bool is_page_button_enable = ( i <= m_PagesCount );
+										
+					int page_index = (i - 1);
+					m_BtnPages[page_index].Show( is_page_button_enable );
+					m_BtnPages[page_index].SetText( i.ToString() );
+					
+					if ( m_PageIndex == page_index )
+					{
+						m_BtnPages[page_index].SetState( true );
+					}
+					else
+					{
+						m_BtnPages[page_index].SetState( false );
+					}
+				}
+			}
+			else
+			{
+				// Pages are more like buttons				
+				if ( m_PageIndex <= btn_index_center )
+				{
+					//Left side (start of pages)
+					//m_PageStartNum = 1;
+					//m_PageEndNum = PAGES_BUTTONS_COUNT;
+				}
+				else
+				{
+					m_PageStartNum = m_PageIndex - btn_index_center + 1;
+					m_PageEndNum = m_PageIndex + (PAGES_BUTTONS_COUNT - btn_index_center);
+							
+					if ( m_PageEndNum > m_PagesCount )
+					{
+						// Right side (end of pages)
+						m_PageStartNum -= m_PageEndNum - m_PagesCount;
+						m_PageEndNum -= m_PageEndNum - m_PagesCount;
+					}
+				}
+				
+				
+				// Button Selection
+				int selected_btn_index = m_PageIndex;
+				if ( m_PageIndex > btn_index_center )
+				{
+					if ( m_PageEndNum == m_PagesCount )
+					{
+						//Right
+						 selected_btn_index = PAGES_BUTTONS_COUNT - (m_PagesCount - m_PageIndex);
+					}
+					else
+					{
+						//Center
+						selected_btn_index = btn_index_center;
+					}
+				}
+				
+				
+				for ( i = 0; i < m_BtnPages.Count(); ++i )
+				{
+					m_BtnPages[i].SetText( (m_PageStartNum + i).ToString() );
+					m_BtnPages[i].SetState( ( i == selected_btn_index ) );
+				}
+			}
+			
+			// Button GoTo Prev Page
+			if ( m_PageIndex > 0 )
+			{
+				m_BtnPagePrev.SetText( "<" );
+				m_BtnPagePrev.Enable( true );
+			}
+			else
+			{
+				m_BtnPagePrev.SetText( "" );
+				m_BtnPagePrev.Enable( false );					
+			}
+			
+			// Button GoTo Next Page
+			if ( m_PageIndex < (m_PagesCount - 1) )
+			{
+				m_BtnPageNext.SetText( ">" );
+				m_BtnPageNext.Enable( true );
+			}
+			else
+			{
+				m_BtnPageNext.SetText( "" );
+				m_BtnPageNext.Enable( false );
+			}
+			
+			// Button GoTo First Page
+			if ( m_PageStartNum == 1 )
+			{
+				m_BtnPagesFirst.SetText( "" );
+				m_BtnPagesFirst.Enable( false );
+			}
+			else
+			{
+				m_BtnPagesFirst.SetText( "<<" );
+				m_BtnPagesFirst.Enable( true );
+			}
+			
+			// Button GoTo Last Page
+			if ( m_PageEndNum == m_PagesCount )
+			{
+				m_BtnPagesLast.SetText( "" );
+				m_BtnPagesLast.Enable( false );
+			}
+			else
+			{
+				m_BtnPagesLast.SetText( ">>" );
+				m_BtnPagesLast.Enable( true );
+			}
+		}
+		else
+		{
+			m_PnlPagesPanel.Show(false);
+		}
+	}
+	
+	void UpdateServerList()
+	{
+		int lastFilledIndexOnPage = 0;
+		m_TotalLoadedServers = m_EntriesSorted[m_SortType].Count();
+		ServerBrowserEntry entry;
+		
+		m_EntryWidgets.Clear();
+		
+		for ( int i = 0; i < SERVERS_VISIBLE_COUNT; ++i )
+		{
+			int serverIndex = i + (SERVERS_VISIBLE_COUNT * m_PageIndex);
+			
+			if ( serverIndex < m_EntriesSorted[m_SortType].Count() )
+			{				
+				GetServersResultRow server_info = m_EntriesSorted[m_SortType][serverIndex];
+				
+				if ( server_info.m_Favorite )
+				{
+					m_OnlineFavServers.Insert(server_info.m_Id);
+				}
+				
+				entry = GetServerEntryByIndex(i, server_info.m_Id);
+				entry.Show( true );
+				entry.SetIsOnline( true );
+				entry.FillInfo( server_info );
+				entry.SetMods( m_EntryMods.Get( server_info.m_Id ) );
+				entry.UpdateEntry();
+				
+				if ( GetRootMenu() && GetRootMenu().GetServersLoadingTab() != TabType.NONE )
+				{
+					entry.SetName("#dayz_game_loading");
+				}
+				
+				lastFilledIndexOnPage++;
+			}
+			else
+			{
+				entry = GetServerEntryByIndex(i, "-1");
+				
+				if ( entry )
+				{
+					entry.Show( false );
+				}
+			}
+		}
+		LoadExtraEntries(lastFilledIndexOnPage);
+		
+		m_ServerList.Update();
+	}
+	
+	void UpdateStatusBar()
+	{
+		string serversFound = string.Format("#servers_found: %1", m_TotalLoadedServers);
+		if ( m_LoadingFinished )
+		{
+			m_LoadingText.SetText( serversFound );
+		}
+		else
+		{			
+			m_LoadingText.SetText( string.Format("#dayz_game_loading %1", serversFound) );
+		}
+	}
+	
+	override void OnLoadServerModsAsync( string server_id, array<string> mods )
+	{
+		super.OnLoadServerModsAsync( server_id, mods );
+		
+		if ( m_EntryWidgets.Contains( server_id ) )
+		{
+			m_EntryWidgets.Get( server_id ).SetMods( mods );
+		}
+	}
+	
+	protected ServerBrowserEntry GetServerEntryByIndex( int index, string server_id )
+	{
+		ref ServerBrowserEntry entry;
+		
+		if ( index >= 0 )
+		{
+			if ( index < m_ServerListEntries.Count() )
+			{
+				entry = m_ServerListEntries[index];
+			}
+			else
+			{
+				entry = new ServerBrowserEntry( null, index, this );
+				m_ServerList.AddChild( entry.GetRoot(), false );
+				
+				m_ServerListEntries.Insert(entry);
+			}
+		}
+		else
+		{
+			return null;
+		}
+		
+		// Refresh list
+		m_EntryWidgets.Insert( server_id, entry );
+		
+		return entry;
+	}
+	
+	override bool IsFocusable( Widget w )
+	{
+		if ( w )
+		{
+			if ( super.IsFocusable( w ) )
+			{
+				return true;
+			}
+			
+			if ( w == m_ServerListScroller )
+			{
+				return false;
+			}
+			
+			if ( w == m_HostSort || w == m_TimeSort || w == m_PopulationSort || w == m_SlotsSort || w == m_PingSort || w == m_FilterSearchIP )
+			{
+				return true;
+			}
+			
+			if ( w == m_FilterPanelAccTime || m_FilterPanelPing )
+			{				
+				return true;
+			}
+			
+			return false;
+		}
+		return false;
+	}
+	
+	void ButtonRefreshToCancel()
+	{
+		ButtonWidget btn = ButtonWidget.Cast( m_RefreshList );
+		btn.SetText( "#menu_cancel" );
+	}
+	
+	void ButtonCancelToRefresh()
+	{
+		ButtonWidget btn = ButtonWidget.Cast( m_RefreshList );
+		btn.SetText( "#STR_server_browser_tab_root_filters_root_filters_content_refresh_list_button0" );
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/TabberPrefab/TabberUI.c b/scripts/5_Mission/DayZ/GUI/NewUI/TabberPrefab/TabberUI.c
new file mode 100644
index 0000000000000000000000000000000000000000..f9b7325d4a948a55598d33229ef1abc6a9b699b1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/TabberPrefab/TabberUI.c
@@ -0,0 +1,495 @@
+class TabberUI extends ScriptedWidgetEventHandler
+{
+	protected bool					m_FirstInit = true;
+	protected Widget				m_Root;
+	protected Widget				m_TabControlsRoot;
+	
+	protected int 					m_TabsCount;
+	protected ref map<int, Widget>	m_TabControls;
+	protected ref map<int, Widget>	m_Tabs;
+	
+	protected int					m_SelectedIndex;
+	protected float					m_ResolutionMultiplier;
+	protected bool					m_CanSwitch;
+	
+	ref ScriptInvoker				m_OnTabSwitch = new ScriptInvoker();
+	ref ScriptInvoker				m_OnAttemptTabSwitch = new ScriptInvoker();
+	ref Timer						m_InitTimer;
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+	
+	protected void OnInputDeviceChanged(EInputDeviceType pInputDeviceType)
+	{
+		switch (pInputDeviceType)
+		{
+		case EInputDeviceType.CONTROLLER:
+			UpdateControlsElements();
+			m_TabControlsRoot.FindAnyWidget("ConsoleControls").Show(true);
+		break;
+
+		default:
+			if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer())
+			{
+				m_TabControlsRoot.FindAnyWidget("ConsoleControls").Show(false);
+			}
+		break;
+		}
+	}
+	
+	void Init()
+	{
+		int x, y;
+		GetScreenSize( x, y );
+		m_ResolutionMultiplier	= y / 1080;
+		m_CanSwitch = true;
+		m_TabsCount	= 0;
+		
+		Widget tab_controls	= m_Root.FindAnyWidget("Tab_Control_Container");
+		if ( tab_controls )
+		{
+			Widget tab_child	= tab_controls.GetChildren();
+			
+			while ( tab_child )
+			{
+				m_TabsCount++;
+				tab_child = tab_child.GetSibling();
+			}
+			
+			for ( int i = 0; i < m_TabsCount; i++ )
+			{
+				Widget tab_control	= tab_controls.FindAnyWidget("Tab_Control_" + i);
+				Widget tab_widget	= m_Root.FindAnyWidget("Tab_" + i);
+				if (tab_control && tab_widget)
+				{
+					tab_control.SetHandler(this);
+					m_TabControls.Insert(i, tab_control);
+					m_Tabs.Insert(i, tab_widget);
+				}
+				else
+				{
+					Error("Tabber could not find correctly named tab or control at index " + i);
+				}
+			}
+			
+			AlignTabbers();
+			#ifdef PLATFORM_CONSOLE
+			UpdateControlsElements();
+			#endif
+			
+			SelectTabControl(0);
+			
+			m_InitTimer.Run(0.01, this, "AlignTabbers");
+		}
+		
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+		GetGame().GetMission().GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+		
+		OnInputDeviceChanged(GetGame().GetInput().GetCurrentInputDevice());
+	}
+
+	void OnWidgetScriptInit( Widget w )
+	{
+		m_TabsCount				= 0;
+		m_TabControls			= new map<int, Widget>;
+		m_Tabs					= new map<int, Widget>;
+		
+		m_Root					= w;
+		m_InitTimer				= new Timer();
+		m_TabControlsRoot		= m_Root.FindAnyWidget("TabControls");
+		
+		Init();
+	}
+	
+	void AlignTabbers()
+	{
+		float total_size;
+		float x, y;
+		
+		Widget tab_controls_container = m_TabControlsRoot.FindAnyWidget( "Tab_Control_Container" );
+		Widget tab_controls_scroller = m_TabControlsRoot.FindAnyWidget( "Tab_Control_Scroller" );
+		
+		m_TabControlsRoot.Update();
+		tab_controls_container.Update();
+		
+		Widget tab_child = tab_controls_container.GetChildren();
+		while ( tab_child )
+		{
+			if ( tab_child.IsVisible() )
+			{
+				TextWidget tab_text = TextWidget.Cast( tab_child.FindAnyWidget( tab_child.GetName() + "_Title" ) );
+				int t_x, t_y;
+				tab_text.Update();
+				tab_text.GetTextSize( t_x, t_y );
+				tab_child.SetSize( t_x + 10 * m_ResolutionMultiplier, 1 );
+				tab_controls_container.Update();
+				
+				total_size += ( t_x + 10 * m_ResolutionMultiplier );
+			}
+			
+			tab_child = tab_child.GetSibling();
+		}
+		
+		tab_child = tab_controls_container.GetChildren();
+		
+		float x_f_c, y_f_c;
+		tab_controls_container.GetScreenPos( x_f_c, y_f_c );
+		
+		while ( tab_child )
+		{
+			Widget tab_bg = tab_child.FindAnyWidget( tab_child.GetName() + "_Background" );
+			tab_child.GetScreenPos( x, y );
+			tab_bg.SetPos( ( x_f_c - x ), 0 );
+			tab_bg.SetSize( total_size, 1 );
+			
+			tab_child = tab_child.GetSibling();
+		}
+		
+		m_TabControlsRoot.GetSize( x, y );
+		
+		m_TabControlsRoot.SetSize( total_size, y );
+		tab_controls_container.Update();
+		if (tab_controls_scroller)
+			tab_controls_scroller.Update();
+		m_TabControlsRoot.Update();
+	}
+	
+	int AddTab( string name )
+	{
+		int new_index = m_Tabs.Count();
+		Widget tab = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/tabber_prefab/tab.layout", m_Root );
+		Widget control = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/new_ui/tabber_prefab/tab_control.layout", m_Root.FindAnyWidget( "Tab_Control_Container" ) );
+		TextWidget control_text = TextWidget.Cast( control.FindAnyWidget( "Tab_Control_x_Title" ) );
+		
+		tab.SetName( "Tab_" + new_index );
+		control.SetName( "Tab_Control_" + new_index );
+		control_text.SetName( "Tab_Control_" + new_index + "_Title" );
+		control.FindAnyWidget( "Tab_Control_x_Background" ).SetName( "Tab_Control_" + new_index + "_Background" );
+		
+		control_text.SetText( name );
+		
+		control.SetHandler( this );
+		m_TabControls.Insert( new_index, control );
+		m_Tabs.Insert( new_index, tab );
+		
+		AlignTabbers();
+		
+		return new_index;
+	}
+	
+	void RemoveTab( int index )
+	{
+
+	}
+	
+	
+	Widget GetTab( int index )
+	{
+		return m_Tabs.Get( index );
+	}
+	
+	int GetTabCount()
+	{
+		return m_Tabs.Count();
+	}
+	
+	bool CanSwitchTab()
+	{
+		return m_CanSwitch;
+	}
+	
+	void SetCanSwitch(bool value)
+	{
+		m_CanSwitch = value;
+	}
+	
+	void PerformSwitchTab(int index)
+	{
+		DeselectTabControl( m_SelectedIndex );
+		DeselectTabPanel( m_SelectedIndex );
+		
+		SelectTabControl( index );
+		SelectTabPanel( index );
+		
+		m_SelectedIndex = index;
+		m_OnTabSwitch.Invoke( m_SelectedIndex );
+		
+		if ( m_FirstInit )
+		{
+			AlignTabbers();
+			m_FirstInit = false;
+		}
+	}
+	
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		int index = m_TabControls.GetKeyByValue( w );
+		if ( m_SelectedIndex == index )
+		{
+			return false;
+		}
+		
+		Widget tab_control = m_TabControls.Get( index );
+		if ( tab_control )
+		{			
+			Widget tab_title = TextWidget.Cast(tab_control.FindAnyWidget( tab_control.GetName() + "_Title" ));
+			tab_title.SetColor( ARGB(255, 255, 0, 0) );
+			tab_control.SetColor( ARGB(255, 0, 0 ,0) );
+		}
+		
+		return false;
+	}
+	
+	override bool OnMouseLeave( Widget w, Widget enterW, int x, int y )
+	{
+		int index = m_TabControls.GetKeyByValue( w );
+		if ( m_SelectedIndex == index )
+		{
+			return false;
+		}
+		
+		Widget tab_control = m_TabControls.Get( index );
+		if ( tab_control )
+		{			
+			Widget tab_title = TextWidget.Cast(tab_control.FindAnyWidget( tab_control.GetName() + "_Title" ));
+			tab_title.SetColor( ARGB(255, 255, 255, 255) );
+			tab_control.SetColor( ARGB(0, 0, 0 ,0) );
+		}
+		return false;
+	}
+	
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		if ( button == MouseState.LEFT )
+		{
+			int index = m_TabControls.GetKeyByValue( w );
+			if ( m_SelectedIndex != index )
+			{
+				m_OnAttemptTabSwitch.Invoke( m_SelectedIndex, index );
+				if ( CanSwitchTab() )
+				{
+					PerformSwitchTab(index);
+					
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool OnChildAdd( Widget w, Widget child )
+	{
+		if ( w == m_Root.FindAnyWidget( "Tab_Control_Container" ) )
+		{
+			AlignTabbers();
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnChildRemove( Widget w, Widget child )
+	{
+		if ( w == m_Root.FindAnyWidget( "Tab_Control_Container" ) )
+		{
+			AlignTabbers();
+			return true;
+		}
+		return false;
+	}
+	
+	void EnableTabControl( int index, bool enable )
+	{
+		Widget tab_control = m_Root.FindAnyWidget( "Tab_Control_" + index );
+		if ( tab_control )
+			tab_control.Show( enable );
+		AlignTabbers();
+	}
+	
+	void SelectTabControl( int index )
+	{
+		Widget tab_control = m_TabControls.Get( index );
+		if ( tab_control )
+		{
+			/*
+			Widget tab_bg = tab_control.FindAnyWidget( tab_control.GetName() + "_Background" );
+			if( tab_bg )
+			{
+				tab_bg.Show( true );
+			}
+			*/
+			
+			Widget tab_title = TextWidget.Cast(tab_control.FindAnyWidget( tab_control.GetName() + "_Title" ));
+			
+			int color_title = ARGB(255, 255, 0, 0);
+			int color_backg = ARGB(255, 0, 0 ,0);
+			
+			#ifdef PLATFORM_CONSOLE
+				color_title = ARGB(255, 255, 255, 255);
+				color_backg = ARGB(255, 200, 0 ,0);
+			#endif
+			
+			tab_title.SetColor( color_title );
+			tab_control.SetColor( color_backg );
+		}
+	}
+	
+	void SelectTabPanel( int index )
+	{
+		Widget tab = m_Tabs.Get( index );
+		if ( tab )
+		{
+			tab.Show( true );
+		}
+	}
+	
+	void DeselectTabControl( int index )
+	{
+		Widget tab_control = m_TabControls.Get( index );
+		if ( tab_control )
+		{
+			/*
+			Widget tab_bg = tab_control.FindAnyWidget( tab_control.GetName() + "_Background" );
+			if( tab_bg )
+			{
+				tab_bg.Show( false );
+			}
+			*/
+			Widget tab_title = TextWidget.Cast(tab_control.FindAnyWidget( tab_control.GetName() + "_Title" ));
+			tab_title.SetColor( ARGB(255, 255, 255,255) );
+			tab_control.SetColor( ARGB(0, 0, 0 ,0) );
+		}
+	}
+	
+	void DeselectTabPanel( int index )
+	{
+		Widget tab = m_Tabs.Get( index );
+		if ( tab )
+		{
+			tab.Show( false );
+		}
+	}
+	
+	void DeselectAll()
+	{
+		for (int i = 0; i < m_TabControls.Count(); i++)
+		{
+			DeselectTabControl(i);
+			DeselectTabPanel(i);
+		}
+	}
+	
+	void NextTab()
+	{
+		int next_index = m_SelectedIndex + 1;
+		
+		while ( next_index < m_Tabs.Count() && !m_TabControls[next_index].IsVisible() )
+		{
+			next_index++;
+		}
+		
+		if ( next_index >= m_Tabs.Count() )
+		{
+			next_index = 0;
+		}
+		
+		if ( m_SelectedIndex != next_index )
+		{
+			m_OnAttemptTabSwitch.Invoke( m_SelectedIndex, next_index );
+			if ( CanSwitchTab() )
+			{
+				PerformSwitchTab(next_index);
+			}
+		}
+		
+		if ( m_FirstInit )
+		{
+			AlignTabbers();
+			m_FirstInit = false;
+		}
+	}
+	
+	void PreviousTab()
+	{
+		int next_index = m_SelectedIndex - 1;
+		
+		if ( next_index < 0 )
+		{
+			next_index = m_TabControls.Count() - 1;
+		}
+		
+		while ( next_index > 0 && !m_TabControls[next_index].IsVisible() )
+		{
+			next_index--;
+		}
+		
+		if ( m_SelectedIndex != next_index )
+		{
+			m_OnAttemptTabSwitch.Invoke( m_SelectedIndex, next_index );
+			if ( CanSwitchTab() )
+			{
+				PerformSwitchTab(next_index);
+			}
+		}
+		
+		if ( m_FirstInit )
+		{
+			AlignTabbers();
+			m_FirstInit = false;
+		}
+	}
+	
+	int GetSelectedIndex()
+	{
+		return m_SelectedIndex;
+	}
+	
+	void RefreshTab(bool performInitAlignment = false)
+	{
+		m_FirstInit = performInitAlignment;
+		DeselectAll();
+		PerformSwitchTab(m_SelectedIndex);
+	}
+	
+	protected void UpdateControlsElements()
+	{
+		Widget xbControls = m_Root.FindAnyWidget("ConsoleControls");
+		if (xbControls)
+		{
+			xbControls.Show(m_TabsCount > 1);
+	
+			RichTextWidget toolbar_lb = RichTextWidget.Cast(xbControls.FindAnyWidget("TabLeftControl"));
+			RichTextWidget toolbar_rb = RichTextWidget.Cast(xbControls.FindAnyWidget("TabRightControl"));
+			if (toolbar_lb)
+			{
+				toolbar_lb.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUITabLeft", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			}
+
+			if (toolbar_rb)
+			{
+				toolbar_rb.SetText(InputUtils.GetRichtextButtonIconFromInputAction("UAUITabRight", "", EUAINPUT_DEVICE_CONTROLLER, InputUtils.ICON_SCALE_TOOLBAR));
+			}
+		}
+	}
+	
+	//! useful if we want to disable actual tabs for whatever reason
+	void DisableTabs(bool disable)
+	{
+		foreach (Widget w : m_Tabs)
+		{
+			if (disable)
+			{
+				w.SetFlags( WidgetFlags.IGNOREPOINTER );
+			}
+			else
+			{
+				w.ClearFlags( WidgetFlags.IGNOREPOINTER );
+			}
+			w.Enable(!disable);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/NewUI/VideoPlayer.c b/scripts/5_Mission/DayZ/GUI/NewUI/VideoPlayer.c
new file mode 100644
index 0000000000000000000000000000000000000000..0c46dd97b3b92771dc47dd5b52f3117de6460577
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NewUI/VideoPlayer.c
@@ -0,0 +1,287 @@
+class VideoPlayer extends ScriptedWidgetEventHandler
+{
+	protected Widget 		m_Root;
+	
+	protected ButtonWidget	m_PlayButton;
+	protected ButtonWidget	m_PauseButton;
+	
+	protected ButtonWidget	m_StopButton;
+	
+	protected ButtonWidget	m_OnceButton;
+	protected ButtonWidget	m_RepeatButton;
+	
+	protected ButtonWidget		m_LoadButton;
+	protected GridSpacerWidget	m_LoadVideo;
+	
+	protected SliderWidget 	m_Progress;
+	
+	protected TextWidget	m_CurrentTime;
+	protected TextWidget	m_TotalTime;
+	
+	protected ImageWidget 		m_Buffering;
+	/*protected*/ VideoWidget 	m_VideoWidget;
+	
+	void VideoPlayer(Widget parent)
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/video_player.layout", parent);
+		m_Root.SetHandler(this);
+		m_Root.SetSort(333);
+		Init();
+	}
+	
+	void ~VideoPlayer()
+	{
+	}
+	
+	void Show(bool show)
+	{
+		m_Root.Show(show);
+	}
+	
+	private void Init()
+	{
+		m_PlayButton 		= ButtonWidget.Cast(m_Root.FindAnyWidget("vp_PlayButton"));
+		m_PauseButton 		= ButtonWidget.Cast(m_Root.FindAnyWidget("vp_PauseButton"));
+		m_StopButton 		= ButtonWidget.Cast(m_Root.FindAnyWidget("vp_StopButton"));
+		
+		m_OnceButton 		= ButtonWidget.Cast(m_Root.FindAnyWidget("vp_OnceButton"));
+		m_RepeatButton 		= ButtonWidget.Cast(m_Root.FindAnyWidget("vp_RepeatButton"));
+		
+		m_LoadButton 		= ButtonWidget.Cast(m_Root.FindAnyWidget("vp_LoadButton"));
+		m_LoadVideo 		= GridSpacerWidget.Cast(m_Root.FindAnyWidget("vp_LoadVideo"));
+		m_LoadVideo.Show(false);
+		
+		m_Progress 			= SliderWidget.Cast(m_Root.FindAnyWidget("vp_Progress"));
+		m_Progress.SetCurrent(0);
+		
+		m_CurrentTime 		= TextWidget.Cast(m_Root.FindAnyWidget("vp_CurrentTime"));
+		m_TotalTime 		= TextWidget.Cast(m_Root.FindAnyWidget("vp_TotalTime"));
+		
+		m_Buffering			= ImageWidget.Cast(m_Root.FindAnyWidget("vp_Buffering"));
+		m_Buffering.Show(false);
+		m_VideoWidget 		= VideoWidget.Cast(m_Root.FindAnyWidget("vp_Video"));
+		
+		m_VideoWidget.SetCallback(VideoCallback.ON_PLAY, OnPlaybackStart);
+		m_VideoWidget.SetCallback(VideoCallback.ON_PAUSE, OnPlaybackStop);
+		m_VideoWidget.SetCallback(VideoCallback.ON_STOP, OnPlaybackStop);
+		m_VideoWidget.SetCallback(VideoCallback.ON_END, OnPlaybackStop);
+		m_VideoWidget.SetCallback(VideoCallback.ON_LOAD, OnPlaybackStop);
+		m_VideoWidget.SetCallback(VideoCallback.ON_SEEK, UpdateCurrentTime);
+		m_VideoWidget.SetCallback(VideoCallback.ON_BUFFERING_START, OnBufferingStart);
+		m_VideoWidget.SetCallback(VideoCallback.ON_BUFFERING_END, OnBufferingEnd);
+	}
+	
+	private void InitVideoLoading()
+	{	
+		string path = "video\\*";
+		
+		string fileName;
+		FileAttr fileAttr;
+		
+		FindFileHandle handle = FindFile(path, fileName, fileAttr, FindFileFlags.DIRECTORIES);
+		
+		if (fileName != "")
+		{
+			CreateVideoLoadingEntry(fileName);
+		}
+		
+		while (FindNextFile(handle, fileName, fileAttr))
+		{
+			CreateVideoLoadingEntry(fileName);		
+		}
+		
+		CloseFindFile(handle);
+	}
+	
+	private void CreateVideoLoadingEntry(string entryName)
+	{	
+		Widget entry = GetGame().GetWorkspace().CreateWidgets("gui/layouts/new_ui/video_player_entry.layout", m_LoadVideo);
+		ButtonWidget entryButton = ButtonWidget.Cast(entry.GetChildren());
+		entryButton.SetText(entryName);
+		entryButton.SetUserID(333);
+	}
+	
+	private void UpdateCurrentTime()
+	{
+		int time = m_VideoWidget.GetTime();
+		UpdateTime(m_CurrentTime, time);
+		
+		m_Progress.SetCurrent(time);
+	}
+	
+	// This can be an async op
+	private void UpdateTotalTime()
+	{
+		int time = m_VideoWidget.GetTotalTime();
+		
+		if (time != 0)
+		{
+			UpdateTime(m_TotalTime, time);
+			m_Progress.SetMinMax(0, time);
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(UpdateTotalTime);
+		}
+	}
+	
+	private void UpdateTime(TextWidget widget, int time)
+	{
+		FullTimeData timeData = new FullTimeData();
+		TimeConversions.ConvertSecondsToFullTime(time / 1000, timeData);
+		widget.SetText(timeData.FormatedAsTimestamp());
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if (w == m_Progress)
+		{
+			m_VideoWidget.SetTime(m_Progress.GetCurrent(), finished);
+		}
+		
+		return super.OnChange(w, x, y, finished);
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_PlayButton)
+		{
+			PlayVideo();
+		}
+		else if (w == m_PauseButton)
+		{
+			PauseVideo();
+		}
+		else if (w == m_StopButton)
+		{
+			StopVideo();
+		}
+		else if (w == m_OnceButton)
+		{
+			OnceVideo();
+		}
+		else if (w == m_RepeatButton)
+		{
+			RepeatVideo();
+		}
+		else if (w == m_LoadButton)
+		{
+			ToggleVideoSelection();
+		}
+		else if (w == m_Progress)
+		{
+			Print(x);
+			Print(y);
+			Print(button);
+		}
+		else if (w.GetUserID() == 333)
+		{
+			string name;
+			ButtonWidget.Cast(w).GetText(name);
+			LoadVideo(name);
+			ToggleVideoSelection();
+		}
+		
+		return super.OnClick(w, x, y, button);
+	}
+	
+	protected void OnPlaybackStart()
+	{
+		m_PlayButton.Show(false);
+		m_PauseButton.Show(true);
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(UpdateCurrentTime, 0, true);
+	}
+	
+	protected void OnPlaybackStop()
+	{
+		m_PlayButton.Show(true);
+		m_PauseButton.Show(false);
+		
+		UpdateCurrentTime();
+		
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Remove(UpdateCurrentTime);
+	}
+	
+	protected void OnBufferingStart()
+	{
+		m_Buffering.Show(true);
+	}
+	
+	protected void OnBufferingEnd()
+	{
+		m_Buffering.Show(false);
+	}
+	
+	void ToggleVideoSelection()
+	{
+		if (!m_LoadVideo.IsVisible())
+		{
+			InitVideoLoading();
+		}
+		else
+		{
+			Widget child = m_LoadVideo.GetChildren();
+		
+			while (child)
+			{
+				Widget c = child;
+				child = child.GetSibling();
+				c.Unlink();
+			}
+		}
+		
+		m_LoadVideo.Show(!m_LoadVideo.IsVisible());
+	}
+	
+	void LoadVideo(string videoPath)
+	{	
+		string path;
+		#ifdef PLATFORM_WINDOWS
+			path = ".\\video\\";
+		#endif
+		#ifdef PLATFORM_PS4
+			path = "/app0/video/";
+		#endif
+		#ifdef PLATFORM_XBOX
+			path = "G:\\video\\";
+		#endif
+		
+		m_VideoWidget.Load(path + videoPath, m_VideoWidget.IsLooping());
+			
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(UpdateTotalTime, 0, true);
+	}
+	
+	void PlayVideo()
+	{
+		m_VideoWidget.Play();
+	}
+	
+	void PauseVideo()
+	{
+		m_VideoWidget.Pause();
+	}
+	
+	void StopVideo()
+	{
+		m_VideoWidget.Stop();
+		m_PlayButton.Show(true);
+		m_PauseButton.Show(false);
+	}
+	
+	void OnceVideo()
+	{
+		m_VideoWidget.SetLooping(false);
+		m_OnceButton.Show(false);
+		m_RepeatButton.Show(true);
+	}
+	
+	void RepeatVideo()
+	{
+		m_VideoWidget.SetLooping(true);
+		m_RepeatButton.Show(false);
+		m_OnceButton.Show(true);
+	}
+	
+	void KillVideo()
+	{
+		m_VideoWidget.Unload();
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/NoteMenu.c b/scripts/5_Mission/DayZ/GUI/NoteMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..8b9059b62ae16ffd018b869031b92d0dfe315a2a
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/NoteMenu.c
@@ -0,0 +1,139 @@
+class NoteMenu extends UIScriptedMenu
+{
+	protected MultilineEditBoxWidget m_edit;
+	protected HtmlWidget m_html;
+	protected ButtonWidget m_confirm_button;
+	protected ItemBase m_Paper;
+	protected EntityAI m_Pen;
+	protected bool m_IsWriting;
+	//protected int m_Handwriting;
+	protected int m_SymbolCount;
+	protected string m_PenColor; //color in hex-code format, transferred as string. Could be transferred as int or array<int, bool>?
+
+	void NoteMenu()
+	{
+		MissionGameplay mission = MissionGameplay.Cast(GetGame().GetMission());
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowHudUI(false);
+			}
+		}
+	}
+
+	void ~NoteMenu()
+	{
+		MissionGameplay mission = MissionGameplay.Cast(GetGame().GetMission());
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowHudUI(true);
+			}
+		}
+	}
+
+	override void InitNoteRead(string text = "")
+	{
+		m_IsWriting = false;
+		
+		if (m_edit)
+		{
+			m_edit.Show(false);
+		}
+		
+		if (m_html)
+		{
+			//TODO add text formating here. Just text string for now
+			if (text)
+			{
+				m_html.Show(true);
+				m_html.SetText(text);
+				m_SymbolCount = text.Length(); //string.LengthUtf8() ?
+				//m_html.SetText("<html><body><p>" + text + "</p></body></html>");
+			}
+		}
+		m_confirm_button.Show(false);
+	}
+
+	override void InitNoteWrite(EntityAI paper, EntityAI pen, string text = "")
+	{
+		m_IsWriting = true;
+		
+		if (m_edit)
+		{
+			m_Paper = ItemBase.Cast(paper);
+			m_Pen = pen;
+			m_PenColor = m_Pen.ConfigGetString("writingColor");
+			if (m_PenColor == "")
+			{
+				m_PenColor = "#000000";
+			}
+			//m_Handwriting = handwriting;
+			
+			m_edit.Show(true);
+			m_edit.SetText(text);
+		}
+		
+		if (m_html)
+		{
+			m_html.Show(false);
+		}
+		m_confirm_button.Show(true);
+	}
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_inventory_note.layout");
+		m_edit = MultilineEditBoxWidget.Cast(layoutRoot.FindAnyWidget("EditWidget"));
+		m_html = HtmlWidget.Cast(layoutRoot.FindAnyWidget("HtmlWidget"));
+		m_confirm_button = ButtonWidget.Cast(layoutRoot.FindAnyWidgetById(IDC_OK));
+		
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+	/*	string txt;
+		m_edit.GetText(txt);
+		Print(m_edit.GetLinesCount());
+		Print(txt);
+		Print(txt.Length());*/
+		
+		switch (w.GetUserID())
+		{
+			case IDC_CANCEL:
+				Close();
+				return true;
+			case IDC_OK:
+				if (m_Paper && m_Pen && m_IsWriting)
+				{
+					string edit_text;
+					m_edit.GetText(edit_text);
+					edit_text = MiscGameplayFunctions.SanitizeString(edit_text);
+				//	Print("edit_text: " + edit_text);
+					Param1<string> text = new Param1<string>(edit_text);
+					m_Paper.RPCSingleParam(ERPCs.RPC_WRITE_NOTE_CLIENT, text, true);
+				}
+				Close();
+			return true;
+		}
+
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		if (GetGame() && GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			Close();
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ObjectFollower.c b/scripts/5_Mission/DayZ/GUI/ObjectFollower.c
new file mode 100644
index 0000000000000000000000000000000000000000..f2130f7c14ad7635b62eb19c8f12293ec1ca58db
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ObjectFollower.c
@@ -0,0 +1,119 @@
+class ObjectFollower extends ScriptedWidgetEventHandler
+{
+	reference int						m_PivotYOffset;
+
+	protected Widget					m_Root;
+	protected Object					m_TargetObject;
+	protected bool 						m_Visible;
+
+	void ObjectFollower()
+	{
+		m_Visible = false;
+		//GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(Update);
+	}
+	
+	void ~ObjectFollower()
+	{
+		//GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Remove(Update);
+	}
+
+	protected void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+	}
+
+	void SetTarget(Object obj)
+	{
+		m_TargetObject = obj;
+	}
+
+	override bool OnUpdate(Widget w)
+	{
+		if ( m_Root == w )
+		{
+			Update();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void Update()
+	{
+		float x, y;
+		
+		if(m_Visible)
+		{
+			if(m_TargetObject)
+			{
+				GetOnScreenPosition(x, y);
+			}
+			
+			m_Root.Show(true);
+		}
+		else
+		{
+			m_Root.Show(false);		
+		}
+	}
+	
+	protected void GetOnScreenPosition(out float x, out float y)
+	{
+		const float 							DEFAULT_HANDLE_OFFSET 	= 0.2;
+
+		float pivotYOffset = 0.0;
+		
+		bool ignorePivot	= false;
+		bool traceMatched	= false;
+		bool isDefaultPos   = false;
+		
+		vector objectPos;
+
+		if(m_TargetObject)
+		{
+			pivotYOffset	= m_PivotYOffset;
+
+			traceMatched = true;
+			objectPos = m_TargetObject.GetPosition();
+			if ( pivotYOffset != 0.0 )
+				{ objectPos[1] = objectPos[1] + pivotYOffset; }
+			else
+				{ objectPos[1] = objectPos[1] + DEFAULT_HANDLE_OFFSET; }
+		}
+		else
+		{
+			// default position for the action cursor
+			traceMatched = false;
+			isDefaultPos = true;
+		}
+
+		if ( ignorePivot && !traceMatched )
+		{
+			// hides the widget if we are in situation that the widget will be displayed on pivot point 
+			// and we do not want to display it
+			x = 0.0;
+			y = 0.0;
+		}
+		else
+		{	
+			// calculate screen position from traced results
+			if( isDefaultPos )
+			{
+				int w,h;
+				GetScreenSize(w, h);
+				x = w/2;
+				y = h/2;
+			}
+			else
+			{
+				vector screen_pos = GetGame().GetScreenPos( objectPos );
+				x = screen_pos[0];
+				y = screen_pos[1];
+			}
+		}
+		
+		objectPos = "0 0 0";
+		isDefaultPos = false;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/PresetsMenu.c b/scripts/5_Mission/DayZ/GUI/PresetsMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..fb3ebb9e1bf6dc745ae4946794e21a83d89f21ed
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/PresetsMenu.c
@@ -0,0 +1,61 @@
+class PresetsMenu extends UIScriptedMenu
+{
+	void PresetsMenu()
+	{
+	}
+
+	void ~PresetsMenu()
+	{
+	}
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_options_controls_preset.layout");
+		
+		m_schemes_list = TextListboxWidget.Cast( layoutRoot.FindAnyWidget("PresetListboxWidget") );
+		
+		int c = GetGame().GetInput().GetProfilesCount();
+		for (int i = 0; i < c; i++)
+		{
+			string tmp;
+			GetGame().GetInput().GetProfileName(i, tmp);
+			m_schemes_list.AddItem(tmp, NULL, 0);
+		}
+
+		i = GetGame().GetInput().GetCurrentProfile();
+		if (i >= 0 && i < c)
+		{
+			m_schemes_list.SelectRow(i);
+		}
+
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		switch (w.GetUserID())
+		{
+		case IDC_CANCEL:
+			Close();
+
+			return true;
+
+		case IDC_OK:
+			int index = m_schemes_list.GetSelectedRow();
+			if (index != -1)
+			{
+				GetGame().GetInput().SetProfile(index);
+				GetGame().GetMission().GetOnInputPresetChanged().Invoke();
+				Close();
+			}
+			
+			return true;
+		}
+
+		return false;
+	}
+
+	private TextListboxWidget m_schemes_list;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ProfileOptionsUI.c b/scripts/5_Mission/DayZ/GUI/ProfileOptionsUI.c
new file mode 100644
index 0000000000000000000000000000000000000000..a49381d4ef739d14f157497d202e8c6035d08860
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ProfileOptionsUI.c
@@ -0,0 +1,102 @@
+class ProfileOptionsUI extends ScriptedWidgetEventHandler
+{
+	void ~ProfileOptionsUI()
+	{
+		Deattach();
+	}
+
+	void Attach(int profileOption, array<Widget> widget_array)
+	{
+		m_profileOption = profileOption;
+		m_widget_array = new array<Widget>;
+		m_widget_array = widget_array;
+			
+		for (int i = 0; i < m_widget_array.Count(); i++)
+		{
+			m_widget = m_widget_array.Get(i);
+			if (m_widget)
+			{
+				m_widget.SetHandler(this);
+				
+				Init();
+			}
+		}
+	}
+	
+	void Deattach()
+	{
+		//m_profileOption = NULL;
+		if (m_widget_array && m_widget_array.Count() > 0)
+		{
+			for (int i = 0; i < m_widget_array.Count(); i++)
+			{
+				m_widget = m_widget_array.Get(i);
+				if (m_widget)
+				{
+					m_widget.SetHandler(NULL);
+					m_widget = NULL;
+				}
+			}
+		}
+	}
+	
+	void Init()
+	{
+		int state;
+		ButtonWidget button;
+		
+		if ( Class.CastTo(button, m_widget) )
+		{
+			state = m_widget_array.Find(m_widget);
+			button.SetState( g_Game.GetProfileOption(m_profileOption) == state ); //works for bool values only!!!
+		}
+	}
+
+	void SetValue()
+	{
+		int state;
+		ButtonWidget button;
+		
+		if ( Class.CastTo(button, m_widget) )
+		{
+			state = m_widget_array.Find(m_widget);
+			SetButtonStates( state );
+		}
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		m_widget = w;
+		SetValue();
+		return false;
+	}
+	
+	//TODO check for unnescessary duplicate methods
+	void SetButtonStates(int index)
+	{
+		ButtonWidget button;
+		for (int i = 0; i < m_widget_array.Count(); i++)
+		{
+			button = ButtonWidget.Cast( m_widget_array.Get(i) );
+			if (button)
+			{
+				button.SetState( i == index );
+			}
+		}
+	}
+	
+	array<Widget> GetWidgetArray()
+	{
+		return m_widget_array;
+	}
+	
+	int GetProfileOption()
+	{
+		return m_profileOption;
+	}
+
+	int m_profileOption;
+	Widget m_widget;
+	ref array<Widget> m_widget_array;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ProjectedCrosshair.c b/scripts/5_Mission/DayZ/GUI/ProjectedCrosshair.c
new file mode 100644
index 0000000000000000000000000000000000000000..d30dc13dc1bce13a0d0e0a85ddf229fdac7c5876
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ProjectedCrosshair.c
@@ -0,0 +1,82 @@
+class ProjectedCrosshair extends ScriptedWidgetEventHandler
+{
+	protected Widget		m_Root;
+	protected vector		m_Position;
+	protected bool 			m_Visible;
+	protected bool			m_Debug;
+	
+	protected PlayerBase	m_Player;
+	protected Weapon_Base	m_Weapon;		
+
+	void ProjectedCrosshair()
+	{
+		m_Player = NULL;
+		m_Weapon = NULL;
+		m_Visible = false;
+		m_Debug = false;
+
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Insert(this.Update);
+	}
+
+	void ~ProjectedCrosshair()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_GUI).Remove(this.Update);
+	}
+	
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+		m_Root.Update();
+	}
+	
+	//! Update
+	protected void Update()
+	{
+#ifdef DIAG_DEVELOPER
+		m_Debug = DiagMenu.GetBool( DiagMenuIDs.WEAPON_DEBUG );
+#endif
+		if (!m_Debug) return;
+		if (!m_Player) GetPlayer();
+
+		if ( m_Player && m_Player.IsPlayerSelected() && m_Player.IsRaised() && !m_Player.IsInIronsights() && !GetGame().IsInventoryOpen() )
+		{
+			float sx, sy;
+
+			GetCrosshairPosition();
+			vector screenSpace = GetGame().GetScreenPos(m_Position);
+
+			m_Root.GetSize(sx, sy);
+			screenSpace[0] = screenSpace[0] - sx/2;
+			screenSpace[1] = screenSpace[1] - sy/2;
+			
+			m_Root.SetPos(screenSpace[0], screenSpace[1]);
+			m_Root.Show(m_Visible);
+		}
+		else
+		{
+			m_Root.Show(false);
+			m_Position = vector.Zero;
+		}
+	}
+
+	// getters
+  	protected void GetPlayer()
+	{
+		Class.CastTo(m_Player, GetGame().GetPlayer());
+	}
+
+	protected void GetCrosshairPosition()
+	{
+		m_Visible = false;
+		ItemBase itemInHands;
+		itemInHands = m_Player.GetItemInHands();
+		if ( itemInHands && itemInHands.IsWeapon() )
+		{
+			if(  Class.CastTo(m_Weapon, itemInHands) )
+			{
+				//m_Visible = MiscGameplayFunctions.GetProjectedCursorPos3d(m_Position, m_Weapon);
+			}
+		}
+	}
+};
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/RadialQuickbarMenu.c b/scripts/5_Mission/DayZ/GUI/RadialQuickbarMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..93982cb47e35892b9bc9c83aca4e9814a65a7337
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/RadialQuickbarMenu.c
@@ -0,0 +1,833 @@
+enum RadialQuickbarCategory
+{
+	DEFAULT,
+	SPECIALIZED_LIGHTS
+}
+
+class RadialQuickbarItem
+{
+	protected bool 					m_IsLightSourceExtra;
+	protected bool 					m_IsNVG;
+	protected int 					m_Id;
+	protected int 					m_Category;
+	protected int 					m_CategorySwitchID;
+	protected EntityAI 				m_Item;
+	protected string 				m_ItemName;
+	
+	//radial menu
+	protected Widget 			m_RadialMenuSelector;
+	protected Widget			m_RadialMenuItemCard;
+	
+	void RadialQuickbarItem( int id, EntityAI item, string item_name, int category = RadialQuickbarCategory.DEFAULT, int category_switch = -1 )
+	{
+		m_Id				= id;
+		m_Item 				= item;
+		m_ItemName			= item_name;
+		m_Category 			= category;
+		m_CategorySwitchID 	= category_switch;
+		
+		//
+		if (ItemBase.Cast(m_Item))
+		{
+			m_IsNVG = ItemBase.Cast(m_Item).IsNVG();
+			m_IsLightSourceExtra = ItemBase.Cast(m_Item).IsLightSource();
+		}
+	}
+	
+	EntityAI GetItem()
+	{
+		return m_Item;
+	}
+	
+	void SetItem( EntityAI item )
+	{
+		m_Item = item;
+	}
+	
+	bool IsLightSourceExtra()
+	{
+		return m_IsLightSourceExtra;
+	}
+	
+	bool IsNVGExtra()
+	{
+		return m_IsNVG;
+	}
+	
+	int GetId()
+	{
+		return m_Id;
+	}
+	
+	int GetItemCategory()
+	{
+		return m_Category;
+	}
+	
+	int GetCategorySwitchID()
+	{
+		return m_CategorySwitchID;
+	}
+		
+	Widget GetRadialItemCard()
+	{
+		return m_RadialMenuItemCard;
+	}
+	
+	void SetRadialItemCard( Widget widget )
+	{
+		m_RadialMenuItemCard = widget;
+	}
+	
+	string GetItemName()
+	{
+		return m_ItemName;
+	}
+}
+
+class RadialQuickbarMenu extends UIScriptedMenu
+{
+	protected Widget 								m_ItemCardPanel;
+	protected ref array<ref RadialQuickbarItem> 	m_Items;
+	protected Widget 								m_ToolbarPanel;
+	
+	protected bool 									m_IsMenuClosing;
+	protected int 									m_CurrentCategory;
+	//
+	const string 									TEXT_ITEM_NAME	= "ItemName";
+	const string 									TEXT_ITEM_TITLE	= "ItemTitle";
+	//selections
+	protected Widget 								m_SelectedItem;
+	static EntityAI									m_ItemToAssign;
+	
+	//instance
+	static RadialQuickbarMenu						instance;
+	
+	//============================================
+	// RadialQuickbarMenu
+	//============================================
+	void RadialQuickbarMenu()
+	{
+		m_Items = new ref array<ref RadialQuickbarItem>;
+		m_CurrentCategory = RadialQuickbarCategory.DEFAULT;
+		
+		if ( !instance )
+		{
+			instance = this;
+		}
+
+		GetGame().GetMission().GetOnInputPresetChanged().Insert(OnInputPresetChanged);
+	}
+	
+	void ~RadialQuickbarMenu()
+	{
+		if (GetGame() && GetGame().GetMission())
+		{
+			GetGame().GetMission().RemoveActiveInputExcludes({"radialmenu"},false);
+		}
+	}
+	
+	static void SetItemToAssign( EntityAI item )
+	{
+		m_ItemToAssign = item;
+	}
+	
+	static EntityAI GetItemToAssign()
+	{
+		return m_ItemToAssign;
+	}
+	
+	static RadialQuickbarMenu GetMenuInstance()
+	{
+		return instance;
+	}
+	
+	protected void OnInputPresetChanged()
+	{
+		#ifdef PLATFORM_CONSOLE
+		UpdateControlsElements();
+		#endif
+	}
+
+	//============================================
+	// Menu Controls
+	//============================================	
+	static void OpenMenu( UIScriptedMenu parent = NULL )
+	{
+		GetGame().GetUIManager().EnterScriptedMenu( MENU_RADIAL_QUICKBAR, parent );
+	}
+	
+	static void CloseMenu()
+	{
+		GetGame().GetUIManager().Back();
+		//GetGame().GetMission().RemoveActiveInputExcludes({"radialmenu"},false);
+	}
+		
+	//============================================
+	// Init & Widget Events
+	//============================================
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/radial_menu/radial_quickbar/radial_quickbar_menu.layout");
+		m_ItemCardPanel = layoutRoot.FindAnyWidget(RadialMenu.RADIAL_ITEM_CARD_CONTAINER);
+		
+		//register gestures menu
+		RadialMenu.GetInstance().RegisterClass(this);
+		
+		//delay updates until fully initialized
+		RadialMenu.GetInstance().SetWidgetInitialized(false);
+		
+		//set radial menu properties
+		RadialMenu.GetInstance().SetWidgetProperties("gui/layouts/radial_menu/radial_quickbar/radial_quickbar_delimiter.layout");
+
+		//create content (widgets) for items
+		RefreshQuickbar();
+		
+		//set controller toolbar icons
+		UpdateControlsElements();
+		
+		m_ToolbarPanel = layoutRoot.FindAnyWidget( "toolbar_bg" );
+		m_ToolbarPanel.Show( true );
+				
+		return layoutRoot;
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowQuickbarUI(false);
+			}
+		}
+		
+		SetFocus(layoutRoot);
+		m_IsMenuClosing = false;
+	}
+	
+	override void OnHide()
+	{
+		super.OnHide();
+		
+		Mission mission = GetGame().GetMission();
+		if (mission)
+		{
+			IngameHud hud = IngameHud.Cast(mission.GetHud());
+			if (hud)
+			{
+				hud.ShowQuickbarUI(true);
+			}
+		}
+		
+		//reset item to assign
+		RadialQuickbarMenu.SetItemToAssign(NULL);
+		m_IsMenuClosing = true;
+	}
+	
+	override bool OnController( Widget w, int control, int value )
+	{
+		super.OnController( w, control, value );
+		
+		RadialMenu.GetInstance().SetControlType( RadialMenuControlType.CONTROLLER );
+
+		return false;
+	}	
+		
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		super.OnMouseEnter( w, x, y );
+		
+		RadialMenu.GetInstance().SetControlType( RadialMenuControlType.MOUSE );
+
+		return false;
+	}	
+
+	override bool UseMouse()
+	{
+		return true;
+	}
+	
+	override bool UseGamepad()
+	{
+		return true;
+	}	
+	
+	//============================================
+	// Content
+	//============================================
+	//reset_selection - if false, selected quick bar item will be remembered after content refresh
+	protected void RefreshQuickbar( bool reset_selection = true )
+	{
+		int selected_item_id = -1;
+		if ( !reset_selection )
+		{
+			RadialQuickbarItem quickbar_item;
+			if ( instance.m_SelectedItem )
+			{
+				instance.m_SelectedItem.GetUserData( quickbar_item );
+				selected_item_id = quickbar_item.GetId();
+			}
+		}
+		
+		GetItems( m_Items );
+		//CheckForLightsAndNVG( m_Items );
+		CreateContent( selected_item_id );
+	}	
+	
+	//
+	//	ITEMS
+	//
+	protected void GetItems( out ref array<ref RadialQuickbarItem> items )
+	{
+		items.Clear();
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		int size = player.GetQuickBarSize();
+		EntityAI entity;
+		
+		for ( int i = 0; i < size; ++i )
+		{
+			entity = player.GetQuickBarEntity( i );
+			
+			items.Insert( new RadialQuickbarItem( i, entity, "" ) );
+		}
+		
+		CheckForLightsAndNVG(m_Items,i);
+	}
+	
+	protected void CheckForLightsAndNVG( out ref array<ref RadialQuickbarItem> items, int last_idx )
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		int count = 0;
+		EntityAI entity;
+		ItemBase headgear = ItemBase.Cast(player.FindAttachmentBySlotName("Headgear"));
+		ItemBase eyewear = ItemBase.Cast(player.FindAttachmentBySlotName("Eyewear"));
+		
+		//nvg - headgear check
+		if ( headgear )
+		{
+			entity = headgear.FindAttachmentBySlotName("NVG");
+			if (entity)
+			{
+				items.Insert( new RadialQuickbarItem( count, entity, "", RadialQuickbarCategory.SPECIALIZED_LIGHTS ) );
+				count++;
+			}
+		}
+		//nvg/light - eyewear check
+		if ( eyewear )
+		{
+			entity = eyewear.FindAttachmentBySlotName("NVG");
+			if (entity)
+			{
+				items.Insert( new RadialQuickbarItem( count, entity, "", RadialQuickbarCategory.SPECIALIZED_LIGHTS ) );
+				count++;
+			}
+			else if ( eyewear.IsLightSource() && eyewear.HasEnergyManager() && eyewear.GetCompEM().CanWork() )
+			{
+				entity = eyewear;
+				items.Insert( new RadialQuickbarItem( count, entity, "", RadialQuickbarCategory.SPECIALIZED_LIGHTS ) );
+				count++;
+			}
+		}
+		//light
+		if ( headgear )
+		{
+			if ( headgear.GetInventory().AttachmentCount() > 0 )
+			{
+				ItemBase attachment;
+				for (int i = 0; i < headgear.GetInventory().AttachmentCount(); i++)
+				{
+					attachment = ItemBase.Cast(headgear.GetInventory().GetAttachmentFromIndex(i));
+					if ( attachment && attachment.IsLightSource() && attachment.HasEnergyManager() && attachment.GetCompEM().CanWork() )
+					{
+						entity = attachment;
+						items.Insert( new RadialQuickbarItem( count, entity, "", RadialQuickbarCategory.SPECIALIZED_LIGHTS ) );
+						count++;
+					}
+				}
+			}
+		}
+		
+		//Add a category switchers
+		if (m_CurrentCategory == RadialQuickbarCategory.DEFAULT && count > 0)
+		{
+			items.InsertAt( new RadialQuickbarItem(32,null,"#toggle_lights",RadialQuickbarCategory.DEFAULT,RadialQuickbarCategory.SPECIALIZED_LIGHTS),0 );
+		}
+		else if (m_CurrentCategory == RadialQuickbarCategory.SPECIALIZED_LIGHTS)
+		{
+			items.InsertAt( new RadialQuickbarItem(32,null,"#menu_back",RadialQuickbarCategory.SPECIALIZED_LIGHTS,RadialQuickbarCategory.DEFAULT),0 );
+		}
+	}
+	
+	protected void CreateContent( int selected_item_id = -1 )
+	{
+		//delete existing content
+		DeleteItems();
+		
+		int category_item_count;
+		
+		for ( int i = 0; i < m_Items.Count(); ++i )
+		{
+			RadialQuickbarItem quickbar_item = m_Items.Get( i );
+			
+			if (quickbar_item.GetItemCategory() == m_CurrentCategory)
+			{
+				//create item card
+				Widget item_card_widget = Widget.Cast( GetGame().GetWorkspace().CreateWidgets( "gui/layouts/radial_menu/radial_quickbar/radial_quickbar_item_card.layout", m_ItemCardPanel ) );
+				quickbar_item.SetRadialItemCard( item_card_widget );
+				
+				//update item card widget
+				UpdateQuickbarItemCard( quickbar_item );
+				
+				//set data
+				item_card_widget.SetUserData( quickbar_item );
+				
+				//set selection
+				if ( quickbar_item.GetId() == selected_item_id )
+				{
+					MarkSelected( quickbar_item.GetRadialItemCard() );
+				}
+				category_item_count++;
+			}
+		}	
+
+		//adjust radial parameters for content
+		if ( /*m_Items.Count()*/category_item_count > 0 ) 
+		{
+			RadialMenu radial_menu = RadialMenu.GetInstance();
+			radial_menu.SetRadiusOffset( 0 );
+			radial_menu.SetExecuteDistOffset( 0.5 );
+			radial_menu.SetOffsetFromTop( 0 );
+			radial_menu.SetItemCardRadiusOffset( 0.25 );
+			radial_menu.ActivateControllerTimeout( false );
+		}
+		
+		//refresh radial menu
+		RadialMenu.GetInstance().Refresh( false );
+	}
+	
+	protected void UpdateQuickbarItemCard( RadialQuickbarItem quickbar_item )
+	{
+		Widget item_card_widget = quickbar_item.GetRadialItemCard();
+
+		//get content panels
+		Widget item_details = item_card_widget.FindAnyWidget( "ItemDetails" );
+		TextWidget item_title = TextWidget.Cast( item_card_widget.FindAnyWidget( "ItemTitle" ) );
+		
+		//set text
+		TextWidget text_widget = TextWidget.Cast( item_card_widget.FindAnyWidget( TEXT_ITEM_NAME ) );
+		EntityAI item = quickbar_item.GetItem();
+		
+		Widget quantity_panel = item_card_widget.FindAnyWidget( "QuantityPanel" );
+		if ( item ) 
+		{
+			//item text
+			text_widget.SetText( quickbar_item.GetItem().GetDisplayName() );
+			
+			//item preview
+			ItemPreviewWidget item_preview = ItemPreviewWidget.Cast( item_card_widget.FindAnyWidget( "ItemPreview" ) );
+			item_preview.SetItem( item );
+			item_preview.SetView( item.GetViewIndex() );
+			item_preview.SetModelOrientation( Vector( 0,0,0 ) );
+			
+			//item quantity
+			Widget quantity_stack = quantity_panel.FindAnyWidget( "QuantityStackPanel" );
+			ProgressBarWidget quantity_bar = ProgressBarWidget.Cast( quantity_panel.FindAnyWidget( "QuantityBar" ) );
+			int has_quantity = QuantityConversions.HasItemQuantity( item );
+			//calculate and set quantity
+			if ( has_quantity == QUANTITY_HIDDEN )
+			{
+				quantity_panel.Show( false );
+			}
+			else if ( has_quantity == QUANTITY_COUNT )
+			{
+				//hide bar
+				quantity_bar.Show( false );
+				
+				//show stack
+				TextWidget quantity_text = TextWidget.Cast( quantity_stack.FindAnyWidget( "Quantity" ) );
+				quantity_text.SetText( QuantityConversions.GetItemQuantityText( item ) );
+				quantity_stack.Show( true );
+			}
+			else if ( has_quantity == QUANTITY_PROGRESS )
+			{
+				//hide stack
+				quantity_stack.Show( false );
+				
+				//show bar
+				float progress_max = quantity_bar.GetMax();
+				int max = item.ConfigGetInt( "varQuantityMax" );
+				int count = item.ConfigGetInt( "count" );
+				float quantity = QuantityConversions.GetItemQuantity( ItemBase.Cast( item ) );
+				
+				if ( count > 0 )
+				{
+					max = count;
+				}
+				if ( max > 0 )
+				{
+
+					float value = Math.Round( ( quantity / max ) * 100 );
+					quantity_bar.SetCurrent( value );
+				}
+				
+				quantity_bar.Show( true );
+			}
+			
+			//display content panels
+			item_details.Show( true );
+			item_title.Show( false );
+		}
+		else if ( quickbar_item.GetCategorySwitchID() != -1 )
+		{
+			item_title.SetText( quickbar_item.GetItemName() );
+			
+			item_details.Show( false );
+			item_title.Show( true );	
+		}
+		else
+		{
+			item_title.SetText( "#container_empty" );
+			
+			//display content panels
+			item_details.Show( false );
+			item_title.Show( true );			
+		}			
+	}
+	
+	//Common
+	protected void DeleteItems()
+	{
+		Widget child;
+		Widget child_to_destroy;
+		
+		child = m_ItemCardPanel.GetChildren();
+		while ( child )
+		{
+			child_to_destroy = child;
+			child = child.GetSibling();
+			
+			delete child_to_destroy;
+		}		
+	}
+	
+	protected void ChangeCurrentCategory(int category)
+	{
+		m_CurrentCategory = category;
+		RefreshQuickbar(false);
+		UpdateControlsElements();
+	}
+	
+	//============================================
+	// Radial Menu Events
+	//============================================
+	//Common
+	void OnControlsChanged( RadialMenuControlType type )
+	{
+	}
+	
+	//Mouse
+	void OnMouseSelect( Widget w )
+	{
+		MarkSelected( w );
+	}
+
+	void OnMouseDeselect( Widget w )
+	{
+		UnmarkSelected( w );
+	}
+
+	void OnMouseExecute( Widget w )
+	{
+	}
+	
+	//! LMB
+	void OnMousePressLeft( Widget w )
+	{
+		PrimaryAction( w );
+	}
+	
+	//! RMB
+	void OnMousePressRight( Widget w )
+	{
+		BackOneLevel();
+	}
+	
+	//Controller
+	void OnControllerSelect( Widget w )
+	{
+		MarkSelected( w );
+	}
+
+	void OnControllerDeselect( Widget w )
+	{
+		UnmarkSelected( w );
+	}
+
+	void OnControllerPressSelect( Widget w )
+	{
+		PrimaryAction( w );
+	}
+	
+	void OnControllerPressBack( Widget w )
+	{
+		//SecondaryAction( w );
+		BackOneLevel();
+	}
+	
+	//Actions
+	protected void MarkSelected( Widget w )
+	{
+		m_SelectedItem = w;
+		
+		if (w)
+		{
+			RadialQuickbarItem quickbar_item;
+			w.GetUserData( quickbar_item );
+			ItemBase item;
+			
+			if (quickbar_item && Class.CastTo(item,quickbar_item.GetItem()))
+			{
+				w.SetFlags(WidgetFlags.DISABLED);
+			}
+			else
+			{
+				w.ClearFlags(WidgetFlags.DISABLED);
+			}
+/*
+			//is not category
+			if ( quickbar_item )
+			{
+				if ( quickbar_item.GetItem() )
+				{
+					//alter item visual
+					TextWidget text_widget = TextWidget.Cast( quickbar_item.GetRadialItemCard().FindAnyWidget( TEXT_ITEM_NAME ) );
+					text_widget.SetColor( ARGB( 255, 66, 175, 95 ) );
+				}
+				else
+				{
+					//alter item visual
+					TextWidget title_widget = TextWidget.Cast( quickbar_item.GetRadialItemCard().FindAnyWidget( TEXT_ITEM_TITLE ) );
+					title_widget.SetColor( ARGB( 255, 66, 175, 95 ) );
+				}
+			}
+*/
+		}
+	}
+	
+	protected void UnmarkSelected( Widget w )
+	{
+		m_SelectedItem = NULL;
+		
+		/*
+		if ( w )
+		{
+			RadialQuickbarItem quickbar_item;
+			w.GetUserData( quickbar_item );
+
+			//is not category
+			if ( quickbar_item )
+			{			
+				if ( quickbar_item.GetItem() )
+				{
+					//alter item visual
+					TextWidget text_widget = TextWidget.Cast( quickbar_item.GetRadialItemCard().FindAnyWidget( TEXT_ITEM_NAME ) );
+					text_widget.SetColor( ARGB( 255, 255, 255, 255 ) );
+				}
+				else
+				{
+					//alter item visual
+					TextWidget title_widget = TextWidget.Cast( quickbar_item.GetRadialItemCard().FindAnyWidget( TEXT_ITEM_TITLE ) );
+					title_widget.SetColor( ARGB( 255, 255, 255, 255 ) );					
+				}
+			}
+		}
+		*/
+	}
+	
+	protected void PrimaryAction( Widget w )
+	{
+		if ( instance.m_SelectedItem )
+		{
+			if ( !GetGame().IsDedicatedServer() )
+			{
+				RadialQuickbarItem quickbar_item;
+				instance.m_SelectedItem.GetUserData( quickbar_item );
+			
+				if ( quickbar_item ) 
+				{
+					PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+					
+					//ASSIGN ACTION
+					if ( GetItemToAssign() )
+					{
+						//assign item to slot
+						if ( quickbar_item.GetItem() == GetItemToAssign() )
+						{
+							player.RemoveQuickBarEntityShortcut( GetItemToAssign() );
+						}
+						else
+						{
+							player.SetQuickBarEntityShortcut( GetItemToAssign(), quickbar_item.GetId() );
+						}
+					}
+					//LIGHTS
+					else if (m_CurrentCategory == RadialQuickbarCategory.SPECIALIZED_LIGHTS && quickbar_item.IsLightSourceExtra())
+					{
+						HandleLights(quickbar_item);
+					}
+					//NVG
+					else if (m_CurrentCategory == RadialQuickbarCategory.SPECIALIZED_LIGHTS && quickbar_item.IsNVGExtra())
+					{
+						HandleNVG(quickbar_item);
+					}
+					//change quickbar category
+					else if (quickbar_item.GetCategorySwitchID() != -1)
+					{
+						ChangeCurrentCategory(quickbar_item.GetCategorySwitchID());
+						return;
+					}
+					//SWAP
+					else
+					{
+						EntityAI item = quickbar_item.GetItem();
+						
+						if ( item )
+						{
+							//swap
+							player.RadialQuickBarSingleUse( quickbar_item.GetId() + 1 );				//id must begin with 1 (simulating key press 1-9)
+						}
+					}
+					
+					RefreshQuickbar( false );
+				}
+			}
+		}
+	}
+	
+	protected void SecondaryAction( Widget w )
+	{
+		if ( instance.m_SelectedItem && m_CurrentCategory == RadialQuickbarCategory.DEFAULT )
+		{
+			if ( !GetGame().IsDedicatedServer() )
+			{
+				RadialQuickbarItem quickbar_item;
+				instance.m_SelectedItem.GetUserData( quickbar_item );
+			
+				if ( quickbar_item ) 
+				{
+					PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+					EntityAI item = quickbar_item.GetItem();
+					
+					if ( item )
+					{
+						player.RadialQuickBarCombine( quickbar_item.GetId() + 1 );	//id must begin with 1 (simulating key press 1-9)
+						RefreshQuickbar( false );
+					}	
+				}
+			}
+		}
+	}
+	
+	// returns to default, missing hierarchy to properly traverse ATM
+	protected void BackOneLevel()
+	{
+		if (m_CurrentCategory != RadialQuickbarCategory.DEFAULT)
+		{
+			ChangeCurrentCategory(RadialQuickbarCategory.DEFAULT);
+		}
+	}
+	
+	//-------------------------------------------
+	//NVG/Light handling extension
+	//-------------------------------------------
+	void HandleLights(RadialQuickbarItem quickbar_item)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ItemBase item = ItemBase.Cast(quickbar_item.GetItem());
+		ActionManagerClient mngr_client = ActionManagerClient.Cast(player.GetActionManager());
+		ActionTarget atrg;
+		
+		if ( Headtorch_ColorBase.Cast(item) )		
+		{
+			atrg = new ActionTarget(item,null,-1,vector.Zero,-1.0);
+			if ( mngr_client.GetAction(ActionTurnOnHeadtorch).Can(player,atrg,null) )
+			{
+				mngr_client.PerformActionStart(player.GetActionManager().GetAction(ActionTurnOnHeadtorch),atrg,null);
+			}
+			else if ( mngr_client.GetAction(ActionTurnOffHeadtorch).Can(player,atrg,null) )
+			{
+				mngr_client.PerformActionStart(player.GetActionManager().GetAction(ActionTurnOffHeadtorch),atrg,null);
+			}
+		}
+		else if ( Mich2001Helmet.Cast(item.GetHierarchyParent()) )
+		{
+			atrg = new ActionTarget(item.GetHierarchyParent(),null,-1,vector.Zero,-1.0);
+			if ( mngr_client.GetAction(ActionTurnOnHelmetFlashlight).Can(player,atrg,null) )
+			{
+				mngr_client.PerformActionStart(player.GetActionManager().GetAction(ActionTurnOnHelmetFlashlight),atrg,null);
+			}
+			else if ( mngr_client.GetAction(ActionTurnOffHelmetFlashlight).Can(player,atrg,null) )
+			{
+				mngr_client.PerformActionStart(player.GetActionManager().GetAction(ActionTurnOffHelmetFlashlight),atrg,null);
+			}
+		}
+	}
+	
+	void HandleNVG(RadialQuickbarItem quickbar_item)
+	{
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		ActionManagerClient mngr_client = ActionManagerClient.Cast(player.GetActionManager());
+		ActionTarget atrg;
+		
+		atrg = new ActionTarget(quickbar_item.GetItem().GetHierarchyParent(),null,-1,vector.Zero,-1.0);
+		if ( mngr_client.GetAction(ActionToggleNVG).Can(player,atrg,null) )
+		{
+			mngr_client.PerformActionStart(player.GetActionManager().GetAction(ActionToggleNVG),atrg,null);
+		}
+	}
+	
+	bool IsMenuClosing()
+	{
+		return m_IsMenuClosing;
+	}
+	
+	void SetMenuClosing(bool state)
+	{
+		m_IsMenuClosing = state;
+	}
+
+	protected void UpdateControlsElements()
+	{
+		Widget toolbarBackSpacer = layoutRoot.FindAnyWidget("BackSpacer");
+
+		RichTextWidget toolbarSelectIcon = RichTextWidget.Cast(layoutRoot.FindAnyWidget("SelectIcon"));
+		RichTextWidget toolbarBackIcon = RichTextWidget.Cast(layoutRoot.FindAnyWidget("BackIcon"));
+		
+		string selectAction;
+		string backAction;
+		int controllerID;
+		
+		if (GetGame().GetInput().IsEnabledMouseAndKeyboardEvenOnServer() && GetGame().GetInput().GetCurrentInputDevice() == EInputDeviceType.MOUSE_AND_KEYBOARD)
+		{
+			selectAction = "UAMenuSelect";
+			backAction = "UAMenuBack";
+			controllerID = EUAINPUT_DEVICE_KEYBOARDMOUSE;
+		}
+		else
+		{
+			selectAction = "UAUISelect";
+			backAction = "UAUIBack";
+			controllerID = EUAINPUT_DEVICE_CONTROLLER;
+		}
+		
+		toolbarSelectIcon.SetText(InputUtils.GetRichtextButtonIconFromInputAction(selectAction, "", controllerID, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbarBackIcon.SetText(InputUtils.GetRichtextButtonIconFromInputAction(backAction, "", controllerID, InputUtils.ICON_SCALE_TOOLBAR));
+		toolbarBackSpacer.Show(m_CurrentCategory != RadialQuickbarCategory.DEFAULT);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/RespawnDialogue.c b/scripts/5_Mission/DayZ/GUI/RespawnDialogue.c
new file mode 100644
index 0000000000000000000000000000000000000000..657d3fc0ebfc76f7893d5ab9f893c9dbf8f1d5ef
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/RespawnDialogue.c
@@ -0,0 +1,216 @@
+class RespawnDialogue extends UIScriptedMenu
+{
+	const int 					ID_RESPAWN_CUSTOM = 101;
+	const int 					ID_RESPAWN_RANDOM = 102;
+	
+	//tooltips
+	protected Widget			m_DetailsRoot;
+	protected TextWidget		m_DetailsLabel;
+	protected RichTextWidget	m_DetailsText;
+	
+	protected Widget 			m_CustomRespawn;
+	
+	//helper
+	protected Widget 			m_CurrentlyHighlighted;
+	
+	void RespawnDialogue();
+	void ~RespawnDialogue();
+	
+	override Widget Init()
+	{
+		layoutRoot 					= GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_respawn_dialogue.layout");
+		m_DetailsRoot 				= layoutRoot.FindAnyWidget("menu_details_tooltip");
+		m_DetailsLabel				= TextWidget.Cast(m_DetailsRoot.FindAnyWidget("menu_details_label"));
+		m_DetailsText				= RichTextWidget.Cast(m_DetailsRoot.FindAnyWidget("menu_details_tooltip_content"));
+		
+		m_CustomRespawn 			= layoutRoot.FindAnyWidget("respawn_button_custom");
+		SetFocus(m_CustomRespawn);
+
+		return layoutRoot;
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		if (GetUApi().GetInputByID(UAUIBack).LocalPress() || GetUApi().GetInputByID(UAUIMenu).LocalPress())
+			Close();
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		switch (w.GetUserID())
+		{
+			case IDC_CANCEL:
+				Close();
+				return true;
+
+			case ID_RESPAWN_CUSTOM:
+				return RequestRespawn(false);
+
+			case ID_RESPAWN_RANDOM:
+				return RequestRespawn(true);
+		}
+
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		string tooltip_header = "";
+		string tooltip_text = "";
+		ColorHighlight(w);
+		switch (w.GetUserID())
+		{
+			case ID_RESPAWN_RANDOM:
+				tooltip_header = "#main_menu_respawn_random";
+				tooltip_text = "#main_menu_respawn_random_tooltip";
+				break;
+			
+			case ID_RESPAWN_CUSTOM:
+				tooltip_header = "#main_menu_respawn_custom";
+				tooltip_text = "#main_menu_respawn_custom_tooltip";
+				break;
+		}
+
+		SetTooltipTexts(w, tooltip_header, tooltip_text);
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		ColorNormal(w);
+		return true;
+	}
+	
+	override void OnShow()
+	{
+		super.OnShow();
+		
+		SetFocus(m_CustomRespawn);
+	}
+	
+	override bool OnFocus(Widget w, int x, int y)
+	{
+		string tooltip_header = "";
+		string tooltip_text = "";
+		if (IsFocusable(w))
+		{
+			ColorHighlight(w);
+			switch (w.GetUserID())
+			{
+				case ID_RESPAWN_RANDOM:
+					tooltip_header = "#main_menu_respawn_random";
+					tooltip_text = "#main_menu_respawn_random_tooltip";
+					break;
+				
+				case ID_RESPAWN_CUSTOM:
+					tooltip_header = "#main_menu_respawn_custom";
+					tooltip_text = "#main_menu_respawn_custom_tooltip";
+					break;
+			}
+
+			SetTooltipTexts(w, tooltip_header, tooltip_text);
+			return true;
+		}
+
+		SetTooltipTexts(w, tooltip_header, tooltip_text);
+		return false;
+	}
+	
+	override bool OnFocusLost(Widget w, int x, int y)
+	{
+		if (IsFocusable(w))
+		{
+			ColorNormal(w);
+			return true;
+		}
+
+		return false;
+	}
+	
+	bool IsFocusable(Widget w)
+	{
+		if (w)
+		{
+			if (w.GetUserID() == IDC_CANCEL || w.GetUserID() == ID_RESPAWN_CUSTOM || w.GetUserID() == ID_RESPAWN_RANDOM);
+				return true;
+		}
+
+		return false;
+	}
+	
+	protected void ColorHighlight(Widget w)
+	{
+		if (!w)
+			return;
+
+		if (m_CurrentlyHighlighted != w)
+		{
+			if (m_CurrentlyHighlighted)
+				ColorNormal(m_CurrentlyHighlighted);
+
+			m_CurrentlyHighlighted = w;
+		}
+
+		ButtonSetColor(w, ARGB(255, 0, 0, 0));
+		ButtonSetTextColor(w, ARGB(255, 255, 0, 0));
+	}
+	
+	protected void ColorNormal(Widget w)
+	{
+		if (!w)
+			return;
+		
+		ButtonSetColor(w, ARGB(0, 0, 0, 0));
+		ButtonSetTextColor(w, ARGB(255, 255, 255, 255));
+	}
+	
+	protected void ButtonSetColor(Widget w, int color)
+	{
+		Widget panel = w.FindWidget(w.GetName() + "_panel");
+		if (panel)
+			panel.SetColor(color);
+	}
+	
+	protected void ButtonSetTextColor(Widget w, int color)
+	{
+		TextWidget label = TextWidget.Cast(w.FindAnyWidget(w.GetName() + "_label"));
+		if (label)
+			label.SetColor(color);
+	}
+	
+	void SetTooltipTexts(Widget w, string header = "", string desc = "")
+	{
+		bool show = header != "" && desc != "";
+		m_DetailsRoot.Show(show);
+		m_DetailsLabel.SetText(header);
+		m_DetailsText.SetText(desc);
+		
+		m_DetailsText.Update();
+		m_DetailsLabel.Update();
+		m_DetailsRoot.Update();
+	}
+	
+	bool RequestRespawn(bool random)
+	{
+		IngameHud.Cast(GetGame().GetMission().GetHud()).InitBadgesAndNotifiers();
+		Man player = GetGame().GetPlayer();
+		if (player && (player.GetPlayerState() == EPlayerStates.ALIVE && !player.IsUnconscious()))
+			return false;
+		
+		#ifdef PLATFORM_CONSOLE
+		InGameMenuXbox menu_ingame = InGameMenuXbox.Cast(GetGame().GetUIManager().FindMenu(MENU_INGAME));
+		#else
+		InGameMenu menu_ingame = InGameMenu.Cast(GetGame().GetUIManager().FindMenu(MENU_INGAME));
+		#endif
+		
+		if (!menu_ingame)
+			return false;
+		
+		menu_ingame.MenuRequestRespawn(this, random);
+		return true;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..4f10940f48c7b18d64f1c273df40b3aaaa479fcc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu.c
@@ -0,0 +1,1405 @@
+class SceneEditorMenu extends UIScriptedMenu
+{	
+//---------------------------------------------------------------------------------
+// >> Public Scope
+	static const int POPUP_ID_SCENE_MANAGER		= 0;
+	static const int POPUP_ID_SCENE_SETTINGS	= 1;
+	static const int POPUP_ID_SCENE_NEW			= 2;
+	static const int POPUP_ID_SCENE_RENAME		= 3;
+	static const int POPUP_ID_SCENE_DELETE		= 4;
+	static const int POPUP_ID_NOTIFY			= 5;
+	static const int POPUP_ID_EDITOR_SETTINGS	= 6;
+	static const int POPUP_ID_INIT_SCRIPT		= 7;
+	static const int POPUP_ID_POSITION_MANAGER		= 8;
+	static const int POPUP_ID_PRESET_NEW = 9;
+	static const int POPUP_ID_PRESET_RENAME = 10;
+	static const int POPUP_ID_CONFIGS = 11;
+	const string CONST_DEFAULT_PRESET_PREFIX = "[Default]";	
+	
+	// Render specific Preset Items
+	void RenderPresets()
+	{
+		m_PresetsTextListbox.ClearItems();
+
+		int i;
+		TBoolArray preset_params;
+
+		// load fixed presets list
+		TStringArray presets_array = m_ConfigDebugProfileFixed.GetPresets();
+		for ( i = 0; i < presets_array.Count(); i++ )
+		{
+			m_PresetsTextListbox.AddItem( "["+presets_array.Get(i)+"]", new PresetParams ( presets_array.Get(i), true, false), 0);
+		}
+
+		// load custom presets list
+		TStringArray custom_presets_array = m_ConfigDebugProfile.GetPresets();
+		for ( i = 0; i < custom_presets_array.Count(); i++ )
+		{
+			m_PresetsTextListbox.AddItem( custom_presets_array.Get(i), new PresetParams ( custom_presets_array.Get(i),false, false), 0);
+		}
+
+		string default_preset = m_ConfigDebugProfile.GetDefaultPreset();
+		if ( default_preset != "" )
+		{
+			// if is fixed
+			int index = GetPresetIndexByName( default_preset );
+			if ( IsPresetFixed( default_preset) )
+			{
+				default_preset = "[" + default_preset + "]";
+			}
+			PresetParams preset_params_array;
+			if( index > -1 && index < m_PresetsTextListbox.GetNumItems() )
+			{
+				m_PresetsTextListbox.GetItemData( index, 0, preset_params_array );
+				m_PresetsTextListbox.SetItem( index, default_preset + CONST_DEFAULT_PRESET_PREFIX, preset_params_array, 0 );
+			}
+		}
+	}
+	
+	bool IsPresetFixed( string preset_name )
+	{
+		int preset_index = GetPresetIndexByName( preset_name);
+		PresetParams item_params_array;
+		if ( preset_index > -1 && preset_index < m_PresetsTextListbox.GetNumItems() )
+		{
+			m_PresetsTextListbox.GetItemData( preset_index, 0, item_params_array );
+			return item_params_array.param2;
+		}
+		return false;
+	}
+	
+	int GetPresetIndexByName( string preset_name )
+	{
+		int i;
+		for ( i = 0; i < m_PresetsTextListbox.GetNumItems(); i++ )
+		{
+			PresetParams item_params_array;
+			m_PresetsTextListbox.GetItemData( i, 0, item_params_array );
+
+			if ( item_params_array.param1 == preset_name )
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	void NewPreset( string preset_name )
+	{
+		m_ConfigDebugProfile.PresetAdd( preset_name );
+		RefreshLists();
+	}
+
+	void DeletePreset()
+	{
+		if ( GetCurrentPresetIndex() != -1 )
+		{
+			bool result = m_ConfigDebugProfile.PresetRemove( GetCurrentPresetName() );
+			RefreshLists();
+		}
+	}
+	
+	void SetDefaultPreset( int preset_index )
+	{
+		// remove previous default parameter
+		string default_preset = m_ConfigDebugProfile.GetDefaultPreset();
+		if ( default_preset != "" )
+		{
+			int index = GetPresetIndexByName( default_preset );
+			// if is fixed
+			if ( IsPresetFixed( default_preset) )
+			{
+				default_preset = "[" + default_preset + "]";
+			}
+			PresetParams prev_preset_params_array;
+			if( index > -1 && index < m_PresetsTextListbox.GetNumItems() )
+			{
+				m_PresetsTextListbox.GetItemData( index, 0, prev_preset_params_array );
+				prev_preset_params_array.param3 = false; // remove DEFAULT
+				m_PresetsTextListbox.SetItem( index, default_preset, prev_preset_params_array, 0 );
+			}
+		}
+
+		// set preset on preset_index to default
+		// if is fixed
+		string preset_name = GetCurrentPresetName();
+		if ( IsPresetFixed( preset_name) )
+		{
+			preset_name = "[" + preset_name + "]";
+		}
+		// set new default preset
+		PresetParams preset_params_array;
+		index = GetCurrentPresetIndex();
+		if ( index > -1 && index < m_PresetsTextListbox.GetNumItems() )
+		{
+			m_PresetsTextListbox.GetItemData( index, 0, preset_params_array );
+			preset_params_array.param3 = true; // DEFAULT
+			m_PresetsTextListbox.SetItem( index, preset_name + CONST_DEFAULT_PRESET_PREFIX, preset_params_array, 0 );
+		}
+		// store preset
+		m_ConfigDebugProfile.SetDefaultPreset( GetCurrentPresetName() );
+	}
+	
+	void RefreshLists()
+	{
+		RenderPresets();
+		RenderPresetItems();
+	}
+	
+	void RenamePreset( string new_preset_name )
+	{
+		if ( GetCurrentPresetIndex() != -1 )
+		{
+			bool result = m_ConfigDebugProfile.PresetRename( GetCurrentPresetName(), new_preset_name );
+			RefreshLists();
+		}
+	}
+	
+	// Render specific Preset Items
+	void RenderPresetItems()
+	{
+		// load preset items list
+		int i;
+		m_PresetItemsTextListbox.ClearItems();
+		if ( GetCurrentPresetIndex() != -1 )
+		{
+			bool isFixed = IsCurrentPresetFixed();
+			TStringArray preset_array = new TStringArray;
+
+			if ( isFixed )
+			{
+				 m_ConfigDebugProfileFixed.GetPresetItems( GetCurrentPresetName(), preset_array );
+			}
+			else
+			{
+				m_ConfigDebugProfile.GetPresetItems( GetCurrentPresetName(), preset_array );
+			}
+
+			if ( preset_array )
+			{
+				for ( i = 0; i < preset_array.Count(); i++)
+				{
+					m_PresetItemsTextListbox.AddItem( preset_array.Get(i), NULL, 0);
+				}
+			}
+		}
+	}
+	
+	string GetCurrentPresetName()
+	{
+		int index = GetCurrentPresetIndex();
+		// load preset items list
+		if ( index > -1 && index < m_PresetsTextListbox.GetNumItems() )
+		{
+			PresetParams item_params_array;
+			m_PresetsTextListbox.GetItemData( index, 0, item_params_array );
+			return item_params_array.param1;
+		}
+		return "";
+	}
+	
+	string GetCurrentItemName()
+	{
+		if ( GetCurrentItemIndex() != -1 )
+		{
+			string item_name;
+			m_PresetItemsTextListbox.GetItemText( GetCurrentItemIndex(), 0, item_name );
+			return item_name;
+		}
+		return "";
+	}
+	
+	string GetCurrentObjectName()
+	{
+		int selected_row_index = m_ClWgtLbxClassesList.GetSelectedRow();
+		if ( selected_row_index != -1 )
+		{
+			string item_name;
+			m_ClWgtLbxClassesList.GetItemText( selected_row_index, 0, item_name );
+			return item_name;
+		}
+		return "";
+	}
+		
+	int GetCurrentPresetIndex()
+	{
+		return m_PresetsTextListbox.GetSelectedRow();
+	}
+
+	int GetCurrentItemIndex()
+	{
+		return m_PresetItemsTextListbox.GetSelectedRow();
+	}
+	
+	bool IsCurrentPresetFixed()
+	{
+		int index = GetCurrentPresetIndex(); 
+		if ( index > -1 && index < m_PresetsTextListbox.GetNumItems() )
+		{
+			PresetParams item_params_array;
+			m_PresetsTextListbox.GetItemData( index, 0, item_params_array );
+			return item_params_array.param2;
+		}
+		return -1;
+	}
+	
+	void AddItemToPreset()
+	{
+		int selected_row_index = m_ClWgtLbxClassesList.GetSelectedRow();
+		if ( selected_row_index != -1 && GetCurrentPresetIndex() != -1 )
+		{
+			string item_name;
+			m_ClWgtLbxClassesList.GetItemText( selected_row_index, 0, item_name );
+			m_ConfigDebugProfile.ItemAddToPreset( GetCurrentPresetName(), item_name);
+			RenderPresetItems();
+		}
+	}
+	
+	void RemoveItemFromPreset()
+	{
+		if ( GetCurrentItemIndex() != -1 && GetCurrentPresetIndex() != -1 )
+		{
+			m_ConfigDebugProfile.ItemRemoveFromPreset( GetCurrentPresetName(), GetCurrentItemIndex() );
+			RenderPresetItems();
+		}
+	}
+	
+	/// spawn preset items into inventory
+	void SetPreset( bool clear_inventory, string preset_name)
+	{
+		int i;
+		if ( GetCurrentPresetIndex() != -1 )
+		{
+			bool is_preset_fixed = IsCurrentPresetFixed();
+			TStringArray preset_array = new TStringArray;
+
+			if ( is_preset_fixed )
+			{
+				m_ConfigDebugProfileFixed.GetPresetItems( preset_name, preset_array );
+			}
+			else
+			{
+				m_ConfigDebugProfile.GetPresetItems( preset_name, preset_array );
+			}
+
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if ( clear_inventory )
+			{
+				m_Developer.ClearInventory(player);
+			}
+
+			for ( i = 0; i < preset_array.Count(); i++)
+			{
+				float health = -1;
+				int quantity = -1;
+				if ( is_preset_fixed )
+				{
+					health = m_ConfigDebugProfileFixed.GetItemHealth( preset_name, i );
+					quantity = m_ConfigDebugProfileFixed.GetItemQuantity( preset_name, i );
+				}
+				else
+				{
+					health = m_ConfigDebugProfile.GetItemHealth( preset_name, i );
+					quantity = m_ConfigDebugProfile.GetItemQuantity( preset_name, i );
+				}
+				
+				m_Developer.SpawnEntityInPlayerInventory(player, preset_array.Get(i), health, quantity);
+			}
+		}
+	}
+	
+	void ItemMoveUp()
+	{
+		int new_index = GetCurrentItemIndex() - 1;
+		if ( GetCurrentItemIndex() != -1 && GetCurrentPresetIndex() != -1 && new_index > -1)
+		{
+			m_ConfigDebugProfile.SwapItem( GetCurrentPresetName(), GetCurrentItemIndex(), new_index );
+			RenderPresetItems();
+			m_PresetItemsTextListbox.SelectRow (new_index);
+		}
+	}
+
+	void ItemMoveDown()
+	{
+		int new_index = GetCurrentItemIndex() + 1;
+		if ( GetCurrentItemIndex() != -1 && GetCurrentPresetIndex() != -1 && new_index < m_PresetItemsTextListbox.GetNumItems() )
+		{
+			m_ConfigDebugProfile.SwapItem( GetCurrentPresetName(), GetCurrentItemIndex(), new_index );
+			RenderPresetItems();
+			m_PresetItemsTextListbox.SelectRow (new_index);
+		}
+	}
+	
+	void SaveProfileSpawnDistance()
+	{
+		if ( m_ConfigDebugProfile && m_SpawnDistanceEditBox )
+		{
+			m_ConfigDebugProfile.SetSpawnDistance(  m_SpawnDistanceEditBox.GetText().ToFloat() );
+		}
+	}
+		
+	// Overrided Parent Functions
+	//============================================
+	// UseMouse (override)
+	//============================================
+	override bool UseMouse()
+	{
+		return true;
+	}
+
+	//============================================
+	// UseKeyboard (override)
+	//============================================
+	override bool UseKeyboard()
+	{
+		return true;
+	}
+	
+	// System Events
+	//============================================
+	// SceneEditorMenu
+	//============================================
+	void SceneEditorMenu()
+	{
+		m_ModuleSceneManager = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+		m_ModuleSceneManager.OnUIEditorOpened();
+		
+		m_Popups		= new map<int, ref UIPopupScript>;
+		m_SlObjectsList	= new map<int, SceneObject>;
+		m_OpenedPopups	= new TIntArray;
+		m_ClClassesList	= new TStringArray;
+	}
+
+	//============================================
+	// ~SceneEditorMenu
+	//============================================
+	void ~SceneEditorMenu()
+	{
+		PopupCloseAll();
+		
+		if ( IsModuleExist(PluginSceneManager) )
+		{
+			m_ModuleSceneManager.OnUIEditorClosed();
+			m_ModuleSceneManager = NULL;
+		}
+		
+		m_NotifyFadeTimer.Stop();
+	}
+	
+	//============================================
+	// Init
+	//============================================
+	override Widget Init()
+	{
+		// Create Main layout menu
+		layoutRoot				= GetGame().GetWorkspace().CreateWidgets("gui/layouts/scene_editor/day_z_scene_editor.layout");
+		m_WgtPnlWrapper			= layoutRoot.FindAnyWidget("pnl_presets_wrapper_outer");
+		m_SlWgtLoadedScene		= TextWidget.Cast( layoutRoot.FindAnyWidget("txt_left_label_loaded_scene") );
+		// Find ListTextBoxWidget for objects list
+		m_SlWgtLbxObjectsList	= TextListboxWidget.Cast(layoutRoot.FindAnyWidget("txtlist_left_items") );
+		// Find Edit Box for shearching in object list
+		m_SlWgtEbxFilter		= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("edit_left_search_item") );
+		// Find Select Button for selecting in object list
+		m_SlWgtSelect			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_left_select") );
+		m_SlWgtFocus			= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_left_focus") );
+		// Find Popup main panel
+		m_WgtPopupsMain			= layoutRoot.FindAnyWidget("pnl_popups");
+		// Find Poups backgroudn
+		m_WgtPopupsBg			= layoutRoot.FindAnyWidget("pnl_popup_bg");
+		// Find Edit Box for shearching in class list
+		m_ClWgtEbxFilter		= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("edit_left_search_class") );
+		// Find ListTextBoxWidget for class list
+		m_ClWgtLbxClassesList	= TextListboxWidget.Cast(layoutRoot.FindAnyWidget("txtlist_left_classes") );
+		// Find Buttons
+		m_WgtBtnSceneManager	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_top_scene_manager") );
+		m_WgtBtnPositionManager	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_top_position_manager") );
+		m_WgtBtnSceneSettings	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_top_settings") );
+		m_ClWgtButtonAddAtt		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_left_cl_add_attachment") );
+		m_WgtBtnSceneSave		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_top_save_scene") );
+		m_WgtBtnEditorSettings	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_top_editor_settings") );
+		m_WgtBtnEditInitScript	= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_right_prop_pos_iscr_value") );
+		m_WgtBtnDeleteRuler		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_delete_ruler") );
+		m_WgtBtnLeftPresets		= ButtonWidget.Cast(layoutRoot.FindAnyWidget("btn_left_presets") );	
+			
+		// Find Widgets for properties
+		m_PrWgtClassName		= TextWidget.Cast(layoutRoot.FindAnyWidget("txt_right_prop_class_value") );
+		m_PrWgtPoxX				= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("ebx_right_prop_pos_x_value") );
+		m_PrWgtPoxY				= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("ebx_right_prop_pos_y_value") );
+		m_PrWgtPoxZ				= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("ebx_right_prop_pos_z_value") );
+		m_PrWgtDir				= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("ebx_right_prop_pos_dir_value") );
+		m_PrWgtDmg				= EditBoxWidget.Cast(layoutRoot.FindAnyWidget("ebx_right_prop_pos_hlt_value") );
+		m_PrWgtAttRoot			= layoutRoot.FindAnyWidget("pnl_right_inspector_attachments");
+		m_PrWgtAttTitle			= layoutRoot.FindAnyWidget("pnl_att_title");
+		m_PrWidgetsAttachments	= new array<ref UIPropertyAttachment>;
+		
+		// Notify
+		m_NotifyWgtPanel		= layoutRoot.FindAnyWidget("pnl_notify");
+		m_NotifyWgtPanel.SetAlpha(0.0);
+		m_NotifyFadeTimer		= new WidgetFadeTimer;
+		
+		// Register Poups
+		m_Popups.Insert(POPUP_ID_SCENE_MANAGER,		new UIPopupScriptSceneManager(layoutRoot.FindAnyWidget("pnl_popup_scene_manager")));
+		m_Popups.Insert(POPUP_ID_POSITION_MANAGER,	new UIPopupScriptPositionManager(layoutRoot.FindAnyWidget("pnl_popup_position_manager")));
+		m_Popups.Insert(POPUP_ID_SCENE_SETTINGS,	new UIPopupScriptSceneSettings(layoutRoot.FindAnyWidget("pnl_popup_settings")) );
+		m_Popups.Insert(POPUP_ID_SCENE_NEW, 		new UIPopupScriptSceneNew(layoutRoot.FindAnyWidget("pnl_popup_scene_new")) );
+		m_Popups.Insert(POPUP_ID_SCENE_RENAME, 		new UIPopupScriptSceneRename(layoutRoot.FindAnyWidget("pnl_popup_scene_rename")) );
+		m_Popups.Insert(POPUP_ID_SCENE_DELETE, 		new UIPopupScriptSceneDelete(layoutRoot.FindAnyWidget("pnl_popup_scene_delete")) );
+		m_Popups.Insert(POPUP_ID_NOTIFY,	 		new UIPopupScriptNotify(layoutRoot.FindAnyWidget("pnl_popup_notify")) );
+		m_Popups.Insert(POPUP_ID_EDITOR_SETTINGS,	new UIPopupScriptEditorSettings(layoutRoot.FindAnyWidget("pnl_popup_editor_settings")));
+		m_Popups.Insert(POPUP_ID_INIT_SCRIPT,		new UIPopupScriptInitScript(layoutRoot.FindAnyWidget("pnl_popup_init_script")));
+		m_Popups.Insert(POPUP_ID_PRESET_NEW,		new UIPopupScriptPresetNew(layoutRoot.FindAnyWidget("pnl_popup_preset_new")));
+		m_Popups.Insert(POPUP_ID_PRESET_RENAME,		new UIPopupScriptPresetRename(layoutRoot.FindAnyWidget("pnl_popup_preset_rename")));
+		m_Popups.Insert(POPUP_ID_CONFIGS,			new UIPopupScriptConfigs(layoutRoot.FindAnyWidget("pnl_popup_configs")));
+		
+		m_PresetsTextListbox = TextListboxWidget.Cast( layoutRoot.FindAnyWidget("pnl_presets") );
+		m_PresetItemsTextListbox = TextListboxWidget.Cast( layoutRoot.FindAnyWidget("pnl_preset_items") );
+		m_ConfigDebugProfileFixed	= PluginConfigDebugProfileFixed.Cast( GetPlugin(PluginConfigDebugProfileFixed) );
+		m_ConfigDebugProfile		= PluginConfigDebugProfile.Cast( GetPlugin(PluginConfigDebugProfile) );
+		m_PresetAddItemtButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_add_to_preset") );
+		m_PresetRemoveItemButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_remove_from_preset") );
+		m_SpawnOnGroundButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_spawn_on_ground") );
+		m_SpawnInInventoryButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_spawn_in_inventory") );
+		m_SpawnAsAttachmentButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_spawn_as_attachment") );
+		m_UpButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_up") );
+		m_DownButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_down") );
+		m_Developer					= PluginDeveloper.Cast( GetPlugin(PluginDeveloper) );
+		m_QuantityEditBox = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("txt_quantity_value") );
+		m_DamageEditBox = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("txt_damage_value") );
+		m_SpawnDistanceEditBox = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("txt_distance_value") );
+		m_PresetNewButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_new") );
+		m_PresetDeleteButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_delete") );
+		m_PresetRenameButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_rename") );
+		m_PresetSetDefaultButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_default") );
+		m_CopyToClipboardButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("btn_copy_to_clipboard") );
+		m_ConfigsButton = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("btn_top_configs") );
+		m_SpawnDistanceEditBox.SetText( m_ConfigDebugProfile.GetSpawnDistance().ToString() );
+		
+		RenderPresets();
+		
+		UpdateListObjects();
+		UpdateListClasses();
+		
+		PopupHideAll();
+		
+		return layoutRoot;
+	}
+	
+	override bool OnDoubleClick( Widget w, int x, int y, int button )
+	{
+		if( w == m_PresetItemsTextListbox || w == m_PresetsTextListbox || w == m_ClWgtLbxClassesList )
+		{
+			SaveProfileSpawnDistance();
+			
+			//float distance = m_SpawnDistanceEditBox.GetText().ToFloat();
+			if ( m_SelectedObjectIsPreset )
+			{
+				SetPreset( true, m_SelectedObject);
+				return true;
+			}
+			else
+			{
+				float health = -1;
+				int quantity = -1;
+				if(GetCurrentItemIndex() != -1)
+				{
+					health = m_ConfigDebugProfile.GetItemHealth( GetCurrentPresetName(), GetCurrentItemIndex() );
+					quantity = m_ConfigDebugProfile.GetItemQuantity( GetCurrentPresetName(), GetCurrentItemIndex() );
+				}
+				m_Developer.SpawnEntityInPlayerInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_SelectedObject, health, quantity);
+				return true;
+			}
+		}
+		return false;
+	}
+	//============================================
+	// OnClick
+	//============================================
+	override bool OnClick(Widget w, int x, int y, int button)
+	{	
+		super.OnClick(w, x, y, button);
+		
+		int row_index;
+		
+		if ( w == m_WgtBtnSceneManager )
+		{
+			PopupOpen(POPUP_ID_SCENE_MANAGER, Param.Cast( NULL ) );
+			
+			return true;
+		}
+		else if( w  == m_ConfigsButton )
+		{
+			PopupOpen( POPUP_ID_CONFIGS, NULL );
+			return true;
+		}
+		else if( w == m_PresetsTextListbox )
+		{
+			RenderPresetItems();
+			m_SelectedObjectIsPreset = true;
+			m_SelectedObject = GetCurrentPresetName();
+			return true;
+		}
+		else if ( w == m_PresetSetDefaultButton )
+		{
+			if ( GetCurrentPresetName() != "" )
+			{
+				SetDefaultPreset( GetCurrentPresetIndex() );
+			}
+			return true;
+		}
+		else if ( w == m_PresetNewButton )
+		{
+			PopupOpen( POPUP_ID_PRESET_NEW, NULL );
+			RefreshLists();
+			return true;
+		}
+		else if ( w == m_PresetRenameButton )
+		{
+			PopupOpen( POPUP_ID_PRESET_RENAME, NULL );
+			return true;
+		}
+		else if( w == m_CopyToClipboardButton )
+		{
+			GetGame().CopyToClipboard( m_SelectedObject );
+			return true;
+		}
+		else if ( w == m_PresetDeleteButton )
+		{
+			if ( GetCurrentPresetName() != "" )
+			{
+				DeletePreset();
+			}
+			return true;
+		}
+		else if( w == m_SpawnOnGroundButton || w == m_SpawnAsAttachmentButton || w == m_SpawnInInventoryButton )
+		{
+			SaveProfileSpawnDistance();
+
+			float distance = m_SpawnDistanceEditBox.GetText().ToFloat();
+			float health = -1;
+			int quantity = -1;
+			if( GetCurrentItemIndex() != -1 )
+			{
+				health = m_ConfigDebugProfile.GetItemHealth( GetCurrentPresetName(), GetCurrentItemIndex() );
+				quantity = m_ConfigDebugProfile.GetItemQuantity( GetCurrentPresetName(), GetCurrentItemIndex() );
+			}
+
+			switch ( w )
+			{
+				case m_SpawnOnGroundButton:
+				{
+					if ( m_SelectedObjectIsPreset )
+					{
+						// SpawnPresetOnGround
+						;//SetPreset( true, m_SelectedObject, spawn_type, distance );
+					}
+					else
+						m_Developer.SpawnEntityOnCursorDir( PlayerBase.Cast( GetGame().GetPlayer() ), m_SelectedObject, quantity, distance, health );
+					break;
+				}
+
+				case m_SpawnAsAttachmentButton:
+				{
+					Man player = GetGame().GetPlayer();
+					
+					vector rayStart = GetGame().GetCurrentCameraPosition();
+					vector rayEnd = rayStart + GetGame().GetCurrentCameraDirection() * 1.5;		
+					vector hitPos;
+					vector hitNormal;
+					int hitComponentIndex;		
+					ref set<Object> hitObjects = new set<Object>;
+					DayZPhysics.RaycastRV(rayStart, rayEnd, hitPos, hitNormal, hitComponentIndex, hitObjects, NULL, player);
+							
+					Object target = NULL;
+					if( hitObjects.Count() )
+						target = hitObjects.Get(0);
+
+					if ( target != NULL && target.IsInherited(EntityAI) )
+					{
+						EntityAI att_parent = EntityAI.Cast( target );
+						m_Developer.SpawnEntityAsAttachment( PlayerBase.Cast( player ), att_parent, m_SelectedObject, health, quantity);
+					}
+					else
+					{
+						m_Developer.SpawnEntityAsAttachment( PlayerBase.Cast( player ), player, m_SelectedObject, health, quantity);
+					}
+					break;
+				}
+
+				case m_SpawnInInventoryButton:
+				{
+					m_Developer.SpawnEntityInPlayerInventory( PlayerBase.Cast( GetGame().GetPlayer() ), m_SelectedObject, health, quantity);
+					break;
+				}
+			}
+			return true;
+		}
+		else if( w == m_PresetItemsTextListbox )
+		{
+			m_SelectedObjectIsPreset = false;
+			m_SelectedObject = GetCurrentItemName();
+			
+			if( GetCurrentItemIndex() != -1 )
+			{
+				float item_health = m_ConfigDebugProfile.GetItemHealth( GetCurrentPresetName(), GetCurrentItemIndex() );
+				int item_quantity = m_ConfigDebugProfile.GetItemQuantity( GetCurrentPresetName(), GetCurrentItemIndex() );
+				
+				m_DamageEditBox.SetText( item_health.ToString() );
+				m_QuantityEditBox.SetText( item_quantity.ToString() );
+			}
+			
+			return true;
+		}
+		else if( w == m_UpButton )
+		{
+			ItemMoveUp();
+			return true;
+		}
+		else if( w == m_DownButton )
+		{
+			ItemMoveDown();
+			return true;
+		}
+		else if( w == m_WgtBtnLeftPresets )
+		{
+			if( m_WgtPnlWrapper.IsVisible() )
+			{
+				m_WgtPnlWrapper.Show(false);
+				m_WgtBtnLeftPresets.SetText("Presets >>");
+			}
+			else
+			{
+				m_WgtPnlWrapper.Show(true);
+				m_WgtBtnLeftPresets.SetText("Presets <<");
+			}
+			
+			return true;
+		}
+		else if ( w == m_PresetAddItemtButton )
+		{
+			AddItemToPreset();
+			return true;
+		}
+		else if ( w == m_PresetRemoveItemButton )
+		{
+			RemoveItemFromPreset();
+			return true;
+		}
+		else if ( w == m_WgtBtnPositionManager )
+		{
+			m_PopupScriptPositionManager = UIPopupScriptPositionManager.Cast( PopupOpen( POPUP_ID_POSITION_MANAGER, Param.Cast( NULL ) ) );
+			return true;
+		}
+		else if ( w == m_WgtBtnSceneSettings )
+		{
+			PopupOpen(POPUP_ID_SCENE_SETTINGS, NULL);
+			return true;
+		}
+		else if ( w == m_SlWgtSelect )
+		{
+			row_index = m_SlWgtLbxObjectsList.GetSelectedRow();
+			
+			if ( m_SlObjectsList.Count() > 0 && m_SlObjectsList.Count() > row_index )
+			{
+				m_ModuleSceneManager.SelectObject(m_SlObjectsList.GetElement(row_index));
+			}
+			
+			return true;
+		}
+		else if ( w == m_SlWgtFocus )
+		{
+			m_ModuleSceneManager.SelectedObjectFocus();
+			
+			return true;
+		}
+		else if ( w == m_WgtBtnSceneSave )
+		{		
+			m_ModuleSceneManager.SceneSave();
+			
+			return true;
+		}
+		else if ( w == m_WgtBtnEditorSettings )
+		{
+			PopupOpen(POPUP_ID_EDITOR_SETTINGS, NULL);
+			
+			return true;
+		}
+		else if ( w == m_WgtBtnEditInitScript )
+		{
+			Param2<int, SceneObject> param = new Param2<int, SceneObject>( m_ModuleSceneManager.GetSelectedSceneObjectIndex(), m_ModuleSceneManager.GetSelectedSceneObject() );
+			PopupOpen(POPUP_ID_INIT_SCRIPT, param);
+			
+			return true;
+		}
+		else if ( w == m_WgtBtnDeleteRuler )
+		{
+			m_ModuleSceneManager.RulerDelete();
+			
+			return true;
+		}
+		
+		bool ret = ComponentsOnClick(w, x, y, button);
+		
+		return ret;
+	}
+	
+	//============================================
+	// OnChange
+	//============================================
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{	
+		super.OnChange(w, x, y, finished);
+
+		if (w == m_ClWgtEbxFilter)
+		{
+			UpdateListClasses();
+			return true;
+		}
+		else if (w == m_SlWgtEbxFilter)
+		{
+			UpdateListObjects();
+			return true;
+		}
+		else if ( w == m_PrWgtPoxX && finished )
+		{
+			m_ModuleSceneManager.SelectedObjectSetPosX(m_PrWgtPoxX.GetText().ToFloat());
+		}
+		else if ( w == m_PrWgtPoxY && finished )
+		{
+			m_ModuleSceneManager.SelectedObjectSetPosY(m_PrWgtPoxY.GetText().ToFloat());
+		}
+		else if ( w == m_PrWgtPoxZ && finished )
+		{
+			m_ModuleSceneManager.SelectedObjectSetPosZ(m_PrWgtPoxZ.GetText().ToFloat());
+		}
+		else if ( w == m_PrWgtDir && finished )
+		{
+			m_ModuleSceneManager.SelectedObjectSetRot(m_PrWgtDir.GetText().ToFloat());
+			return true;
+		}
+		else if ( w == m_PrWgtDmg && finished )
+		{		
+			m_ModuleSceneManager.SelectedObjectSetDamage(m_PrWgtDmg.GetText().ToFloat());
+			return true;
+		}
+		else if ( w == m_QuantityEditBox )
+		{
+			m_ConfigDebugProfile.SetItemQuantity( GetCurrentPresetName(), GetCurrentItemIndex(), m_QuantityEditBox.GetText().ToInt() );
+			return true;
+		}
+		else if ( w == m_DamageEditBox )
+		{
+			m_ConfigDebugProfile.SetItemHealth( GetCurrentPresetName(), GetCurrentItemIndex(), m_DamageEditBox.GetText().ToFloat() );
+			return true;
+		}
+		
+		bool ret = ComponentsOnChange(w, x, y, finished);
+		
+		return false;
+	}
+	
+	override void OnShow()
+	{
+		GetGame().GetMission().AddActiveInputExcludes({"menu"});
+	}
+	
+	override void OnHide()
+	{
+		GetGame().GetMission().RemoveActiveInputExcludes({"menu"},true);
+	}
+
+	//============================================
+	// OnMouseWheel
+	//============================================
+	override bool OnMouseWheel(Widget w, int x, int y, int wheel)
+	{
+		super.OnMouseWheel(w, x, y, wheel);
+		
+		m_ModuleSceneManager.OnMouseWheel(wheel);
+		return true;
+	}
+	
+	//============================================
+	// OnItemSelected
+	//============================================
+	override bool OnItemSelected(Widget w, int x, int y, int row, int column, int oldRow, int oldColumn)
+	{	
+		
+		super.OnItemSelected(w, x, y, row, column, oldRow, oldColumn);
+
+		if ( w == m_ClWgtLbxClassesList )
+		{
+			string selected_class_name;
+			m_ClWgtLbxClassesList.GetItemText( m_ClWgtLbxClassesList.GetSelectedRow(), 0, selected_class_name );
+			m_ModuleSceneManager.SelectClassName(selected_class_name);
+			
+			SceneObject obj_selected = m_ModuleSceneManager.GetSelectedSceneObject();
+			m_SelectedObject = GetCurrentObjectName();
+			m_SelectedObjectIsPreset = false;
+		}
+		else if ( w == m_SlWgtLbxObjectsList )
+		{
+			int row_index = m_SlWgtLbxObjectsList.GetSelectedRow();
+			
+			if ( m_SlObjectsList && row_index > -1 && m_SlObjectsList.Count() > 0 && m_SlObjectsList.Count() > row_index )
+			{
+				m_ModuleSceneManager.SelectObject(m_SlObjectsList.GetElement(row_index));
+			}
+		}
+		
+		if( m_PopupScriptPositionManager != NULL )
+		{
+			m_PopupScriptPositionManager.OnItemSelected(w, x, y, row, column, oldRow, oldColumn);
+		}
+		
+		return true;
+	}
+	
+	// Scripted Events
+	//============================================
+	// PopupOpen
+	//============================================
+	UIPopupScript PopupOpen(int popup_id, Param param)
+	{	
+		// Open background image (black transparent) under popups
+		if ( m_OpenedPopups.Count() == 0 )
+		{
+			m_WgtPopupsMain.Show(true);
+			m_WgtPopupsBg.Show(true);
+		}
+		else
+		{
+			int popup_curr_id = m_OpenedPopups.Get(m_OpenedPopups.Count() - 1);
+			m_Popups.Get(popup_curr_id).Show(false);
+		}
+		
+		m_OpenedPopups.Insert(popup_id);
+		
+		UIPopupScript popup = m_Popups.Get(popup_id);
+		
+		popup.Show(true);
+		popup.OnOpen(param);
+		
+		return popup;
+	}
+
+	//============================================
+	// PopupBack
+	//============================================
+	UIPopupScript PopupBack()
+	{
+		if ( m_OpenedPopups.Count() > 0 )
+		{
+			int popup_curr_id = m_OpenedPopups.Get(m_OpenedPopups.Count() - 1);
+		
+			m_Popups.Get(popup_curr_id).Show(false);
+			m_Popups.Get(popup_curr_id).OnClose();
+		
+			m_OpenedPopups.Remove(m_OpenedPopups.Count() - 1);	
+			
+			if ( m_OpenedPopups.Count() > 0 )
+			{
+				int ppp_id = m_OpenedPopups.Get(m_OpenedPopups.Count() - 1);
+				m_Popups.Get(ppp_id).Show(true);
+				m_Popups.Get(ppp_id).OnOpen(NULL);
+				
+				return m_Popups.Get(ppp_id);
+			}
+		}	
+		
+		m_WgtPopupsMain.Show(false);
+		m_WgtPopupsBg.Show(false);
+		
+		return NULL;
+	}
+	
+	//============================================
+	// PopupCloseAll
+	//============================================
+	void PopupCloseAll()
+	{
+		if ( m_OpenedPopups.Count() > 0 )
+		{
+			int popup_curr_id = m_OpenedPopups.Get(m_OpenedPopups.Count() - 1);
+		
+			m_Popups.Get(popup_curr_id).Show(false);
+			m_Popups.Get(popup_curr_id).OnClose();
+			
+			m_OpenedPopups.Clear();
+		}
+	}
+
+
+
+	//============================================
+	// ToggleVisibility (Show/Hide of editor)
+	//============================================
+	void ToggleVisibility()
+	{
+		m_WgtRoot.Show( m_ModuleSceneManager.IsOpened() );
+	}
+	
+	//============================================
+	// Refresh
+	//============================================
+	override void Refresh()
+	{
+		UpdateListObjects();
+		
+		string class_name = "n/a";
+		string pos_x = "n/a";
+		string pos_y = "n/a";
+		string pos_z = "n/a";
+		string rot = "n/a";
+		string hlt = "n/a";
+		
+		// Clear attachments
+		for ( int i = 0; i < m_PrWidgetsAttachments.Count(); ++i )
+		{
+			m_PrWidgetsAttachments.Get(i).Hide();
+		}	
+		
+		if ( m_ModuleSceneManager.GetSelectedSceneObject() )
+		{
+			SceneObject obj = m_ModuleSceneManager.GetSelectedSceneObject();
+			vector v = obj.GetPosition();
+			
+			class_name	= obj.GetTypeName();		
+			pos_x		= v[0].ToString();
+			pos_y		= v[1].ToString();
+			pos_z		= v[2].ToString();
+			rot			= obj.GetRotation().ToString();
+			hlt			= obj.GetHealth().ToString();
+			
+			ref TStringArray attachments_slots = obj.GetConfigAttachments();
+			
+			float prop_h = 0.03;
+			float prop_count = attachments_slots.Count();
+			float prop_root_h = prop_h * (prop_count + 1);
+			float line_h = 1.0 / (prop_count + 1);
+			
+			m_PrWgtAttRoot.SetSize(1, prop_root_h);
+			m_PrWgtAttTitle.SetSize(1, line_h);
+			
+			
+			EntityAI e = m_ModuleSceneManager.GetSelectedSceneObject().GetObject();
+			
+			map<string, ref TStringArray> attachments_in_slots = GetItemNamesForSlots(attachments_slots);
+			
+			
+			for ( int j = 0; j < attachments_in_slots.Count(); ++j )
+			{				
+				TStringArray attachments_in_slot = attachments_in_slots.GetElement(j);
+			
+				UIPropertyAttachment ui_prop = GetFreeUIPropertyAttchament();
+				
+				ui_prop.Show(m_ModuleSceneManager.GetSelectedSceneObject().GetObject(), attachments_in_slots.GetKey(j), attachments_in_slot);
+				ui_prop.SetPos( 0, (1 + j) * line_h );
+				ui_prop.SetSize( 1, line_h );
+			}
+			
+			m_WgtBtnEditInitScript.Enable( true );
+		}
+		else
+		{
+			m_WgtBtnEditInitScript.Enable( false );
+		}
+		
+		m_PrWgtClassName.SetText(class_name);
+		m_PrWgtPoxX.SetText(pos_x);
+		m_PrWgtPoxY.SetText(pos_y);
+		m_PrWgtPoxZ.SetText(pos_z);
+		m_PrWgtDir.SetText(rot);
+		m_PrWgtDmg.SetText(hlt);
+		
+		m_SlWgtLoadedScene.SetText("Loaded Scene: "+m_ModuleSceneManager.SceneGetName());
+		
+		//Ruler
+		if ( m_ModuleSceneManager.IsRulerActivated() )
+		{
+			m_WgtBtnDeleteRuler.SetColor( 0xFF5DE028 );
+		}
+		else
+		{
+			m_WgtBtnDeleteRuler.SetColor( 0xFFFFFFFF );
+		}
+		
+	}
+
+	void SceneEditorCommand( Param params )
+	{
+		Param2<int, Param> p = Param2<int, Param>.Cast( params );
+		int cmd_id = p.param1;
+		
+		switch ( cmd_id )
+		{
+			case PluginSceneManager.SCENE_EDITOR_CMD_REFRESH:
+				Refresh();	
+				break;
+				
+			case PluginSceneManager.SCENE_EDITOR_CMD_SAVE:
+				m_NotifyWgtPanel.SetAlpha(1.0);
+				m_NotifyFadeTimer.FadeOut(m_NotifyWgtPanel, 2, true);
+				break;	
+		}
+	}
+
+
+//---------------------------------------------------------------------------------
+// >> Protected Scope
+	protected Widget				m_WgtRoot;
+	protected PluginSceneManager	m_ModuleSceneManager;
+
+//---------------------------------------------------------------------------------
+// >> protected Scope	
+
+	// Top Panel
+	protected ButtonWidget			m_WgtBtnSceneManager;
+	protected ButtonWidget			m_WgtBtnSceneSettings;
+	protected ButtonWidget			m_WgtBtnSceneSave;
+	protected ButtonWidget			m_WgtBtnEditorSettings;
+	protected ButtonWidget			m_WgtBtnDeleteRuler;
+	
+	// Popups
+	protected Widget					m_WgtPopupsMain;
+	protected Widget					m_WgtPopupsBg;
+	protected ref TIntArray					m_OpenedPopups;
+	protected ref map<int, ref UIPopupScript>	m_Popups;
+	
+	// Scene Object List
+	protected TextWidget			m_SlWgtLoadedScene;
+	protected string				m_SlSelectedClass;
+	protected ref map<int, SceneObject>	m_SlObjectsList;
+	protected TextListboxWidget		m_SlWgtLbxObjectsList;
+	protected EditBoxWidget			m_SlWgtEbxFilter;
+	protected ButtonWidget			m_SlWgtSelect;
+	protected ButtonWidget			m_SlWgtFocus;
+	
+	// Config Class List
+	protected string				m_ClSelectedClass;
+	protected ref TStringArray	m_ClClassesList;
+	protected EditBoxWidget			m_ClWgtEbxFilter;	
+	protected TextListboxWidget		m_ClWgtLbxClassesList;
+	protected ButtonWidget			m_ClWgtButtonAddAtt;
+	
+	// Properties
+	protected TextWidget			m_PrWgtClassName;
+	protected EditBoxWidget			m_PrWgtPoxX;
+	protected EditBoxWidget			m_PrWgtPoxY;
+	protected EditBoxWidget			m_PrWgtPoxZ;
+	protected EditBoxWidget			m_PrWgtDir;
+	protected EditBoxWidget			m_PrWgtDmg;
+	protected ButtonWidget			m_WgtBtnEditInitScript;
+	protected Widget				m_PrWgtAttRoot;
+	protected Widget				m_PrWgtAttTitle;
+	
+	protected ref array<ref UIPropertyAttachment> m_PrWidgetsAttachments;
+	
+	// Notify
+	protected ref WidgetFadeTimer m_NotifyFadeTimer;
+	protected Widget				m_NotifyWgtPanel;
+	
+	//Other
+	protected TextListboxWidget m_PresetsTextListbox;
+	protected TextListboxWidget m_PresetItemsTextListbox;
+	protected ButtonWidget m_PresetAddItemtButton;
+	protected ButtonWidget m_PresetRemoveItemButton;
+	protected ButtonWidget m_SpawnOnGroundButton;
+	protected ButtonWidget m_SpawnInInventoryButton;
+	protected ButtonWidget m_SpawnAsAttachmentButton;
+	protected ButtonWidget m_UpButton;
+	protected ButtonWidget m_DownButton;
+	protected ButtonWidget m_PresetNewButton;
+	protected ButtonWidget m_PresetDeleteButton;
+	protected ButtonWidget m_PresetRenameButton;
+	protected ButtonWidget m_PresetSetDefaultButton;
+	protected ButtonWidget m_CopyToClipboardButton;
+	protected EditBoxWidget m_DamageEditBox;
+	protected EditBoxWidget m_QuantityEditBox;
+	protected EditBoxWidget m_SpawnDistanceEditBox;
+	protected EditBoxWidget m_ConfigsButton;
+	protected Widget m_WgtPnlWrapper;
+	protected ButtonWidget m_WgtBtnLeftPresets;
+	protected ButtonWidget m_WgtBtnPositionManager;
+	
+	protected string m_SelectedObject;
+	protected bool m_SelectedObjectIsPreset;
+	protected PluginDeveloper m_Developer;
+	protected UIPopupScriptPositionManager m_PopupScriptPositionManager;
+	protected PluginConfigDebugProfileFixed m_ConfigDebugProfileFixed;
+	protected PluginConfigDebugProfile m_ConfigDebugProfile;
+		
+	//---- Functions
+	protected void 					RefreshByLocalProfile();
+	
+	//--------------------------------------------
+	// UpdateListObjects
+	//--------------------------------------------
+	private void UpdateListObjects()
+	{
+		m_SlObjectsList = GetFiltredSceneObjects(m_SlWgtEbxFilter.GetText(), m_SlObjectsList);
+		
+		m_SlWgtLbxObjectsList.ClearItems();
+		
+		int row = -1;
+		SceneObject selected_object = m_ModuleSceneManager.GetSelectedSceneObject();
+		
+		for ( int i = 0; i < m_SlObjectsList.Count(); ++i )
+		{
+			SceneObject scene_obj = m_SlObjectsList.GetElement(i);
+			
+			if ( selected_object != NULL && selected_object == scene_obj )
+			{
+				row = i;
+			}
+			
+			m_SlWgtLbxObjectsList.AddItem(scene_obj.GetTypeName(), NULL, 0);
+		}	
+		
+		m_SlWgtLbxObjectsList.SelectRow(row);
+	}
+	
+	//--------------------------------------------
+	// UpdateListClasses
+	//--------------------------------------------
+	protected void UpdateListClasses()
+	{
+		m_ClClassesList = GetFiltredConfigClasses(m_ClWgtEbxFilter.GetText(), m_ClClassesList);
+		
+		m_ClWgtLbxClassesList.ClearItems();
+		
+		for ( int i = 0; i < m_ClClassesList.Count(); ++i )
+		{		
+			m_ClWgtLbxClassesList.AddItem(m_ClClassesList.Get(i), NULL, 0);
+		}
+	}
+	
+	//--------------------------------------------
+	// GetFiltredSceneObjects
+	//--------------------------------------------
+	protected map<int, SceneObject> GetFiltredSceneObjects( string search_string, map<int, SceneObject> array_ret )
+	{	
+		array<ref SceneObject> scene_objects =  m_ModuleSceneManager.GetSceneObjectsAll();
+				
+		search_string.ToLower();
+		
+		array_ret.Clear();
+		
+		if( scene_objects != NULL )
+		{
+			for ( int i=0; i < scene_objects.Count(); ++i )
+			{
+				SceneObject sc_obj = scene_objects.Get(i);
+				
+				string obj_name = sc_obj.GetTypeName();
+				
+				obj_name.ToLower();
+				
+				if ( obj_name.Contains(search_string))
+				{
+					array_ret.Insert(i, sc_obj);
+				}
+			}
+		}
+		
+		return array_ret;
+	}
+	
+	//--------------------------------------------
+	// GetFiltredConfigClasses
+	//--------------------------------------------
+	TStringArray GetFiltredConfigClasses( string search_string, TStringArray array_ret )
+	{	
+		TStringArray searching_in = new TStringArray;
+		searching_in.Insert(CFG_VEHICLESPATH);
+		searching_in.Insert(CFG_WEAPONSPATH);
+		searching_in.Insert(CFG_MAGAZINESPATH);
+		
+		array_ret.Clear();
+		
+		search_string.ToLower();
+		
+		for ( int s = 0; s < searching_in.Count(); ++s )
+		{
+			string config_path = searching_in.Get(s);
+			
+			int objects_count = g_Game.ConfigGetChildrenCount(config_path);
+			for (int i = 0; i < objects_count; i++)
+			{
+				string childName;
+				g_Game.ConfigGetChildName(config_path, i, childName);
+
+				int scope = g_Game.ConfigGetInt(config_path + " " + childName + " scope");
+				if ( scope == 0 )
+				{
+					continue;
+				}
+				
+				string nchName = childName;
+				nchName.ToLower();
+
+				if ( nchName.Contains(search_string))
+				{
+					array_ret.Insert(childName);
+				}
+			}
+		}
+		
+		return array_ret;
+	}
+	
+	//--------------------------------------------
+	// PopupClose
+	//--------------------------------------------
+	private void PopupClose(int popup_id)
+	{
+	}
+
+	//--------------------------------------------
+	// PopupCloseAll
+	//--------------------------------------------
+	private void PopupHideAll()
+	{
+		for ( int i = 0; i < m_Popups.Count(); ++i )
+		{
+			m_Popups.Get(i).Show(false);
+		}
+		
+		m_WgtPopupsMain.Show(false);
+		m_WgtPopupsBg.Show(false);
+	}
+	
+	//--------------------------------------------
+	// ComponentsOnClick
+	//--------------------------------------------
+	private bool ComponentsOnClick(Widget w, int x, int y, int button)
+	{
+		for ( int i = 0; i < m_Popups.Count(); ++i )
+		{
+			if ( m_Popups.Get(i).OnClick(w, x, y, button) )
+			{
+				return true;
+			}
+		}
+		
+		for ( int j = 0; j < m_PrWidgetsAttachments.Count(); ++j )
+		{
+			if ( m_PrWidgetsAttachments.Get(j).OnClick(w, x, y, button) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	//--------------------------------------------
+	// ComponentsOnChange
+	//--------------------------------------------
+	private bool ComponentsOnChange(Widget w, int x, int y, bool finished)
+	{
+		for ( int i = 0; i < m_Popups.Count(); ++i )
+		{
+			if ( m_Popups.Get(i).OnChange(w, x, y, finished) )
+			{
+				return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	//--------------------------------------------
+	// GetFreeUIPropertyAttchament
+	//--------------------------------------------
+	UIPropertyAttachment GetFreeUIPropertyAttchament()
+	{
+		for ( int i = 0; i < m_PrWidgetsAttachments.Count(); ++i )
+		{
+			UIPropertyAttachment ui_comp = m_PrWidgetsAttachments.Get(i);
+			
+			if ( !ui_comp.IsVisible() )
+			{
+				return ui_comp;
+			}
+		}
+		
+		UIPropertyAttachment ui_prop = new UIPropertyAttachment(m_PrWgtAttRoot);
+		m_PrWidgetsAttachments.Insert(ui_prop);
+		
+		return ui_prop;
+	}
+	
+	//--------------------------------------------
+	// GetItemNamesForSlots
+	//--------------------------------------------
+	private map<string, ref TStringArray> GetItemNamesForSlots(TStringArray slots)
+	{
+		TStringArray searching_in = new TStringArray;
+		searching_in.Insert(CFG_VEHICLESPATH);
+		searching_in.Insert(CFG_WEAPONSPATH);
+		searching_in.Insert(CFG_MAGAZINESPATH);
+		
+		map<string, ref TStringArray> array_ret = new map<string, ref TStringArray>;
+		
+		for ( int m = 0; m < slots.Count(); ++m )
+		{
+			array_ret.Insert(slots.Get(m), new TStringArray);
+		}
+		
+		TStringArray inv_slots = new TStringArray;
+		string inv_slot;
+		string childName;
+		
+		for ( int s = 0; s < searching_in.Count(); ++s )
+		{
+			string config_path = searching_in.Get(s);
+			
+			int objects_count = g_Game.ConfigGetChildrenCount(config_path);
+			for (int i = 0; i < objects_count; i++)
+			{
+				g_Game.ConfigGetChildName(config_path, i, childName);
+				
+				g_Game.ConfigGetTextArray(config_path + " " + childName + " inventorySlot", inv_slots);
+				
+				if ( inv_slots.Count() > 0 )
+				{
+					for ( int j = 0; j < inv_slots.Count(); ++j )
+					{
+						inv_slot = "";
+						inv_slot = inv_slots.Get(j);
+						
+						for ( int k = 0; k < slots.Count(); ++k )
+						{
+							string finding_slot_type = slots.Get(k);
+							
+							if ( inv_slot == finding_slot_type )
+							{
+								array_ret.Get(finding_slot_type).Insert(childName);
+							}
+						}
+					}
+				}
+				else
+				{				
+					inv_slot = "";
+					g_Game.ConfigGetText(config_path + " " + childName + " inventorySlot", inv_slot);
+					
+					if ( inv_slot != "" )
+					{
+						for ( int l = 0; l < slots.Count(); ++l )
+						{
+							string finding_slot_type_2 = slots.Get(l);
+							
+							if ( inv_slot == finding_slot_type_2 )
+							{
+								array_ret.Get(finding_slot_type_2).Insert(childName);
+							}
+						}
+					}
+				}
+			}
+		}
+		
+		return array_ret;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript.c
new file mode 100644
index 0000000000000000000000000000000000000000..ce144de0853f9c0d1eb8f453564a94c4927fc588
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript.c
@@ -0,0 +1,62 @@
+class UIPopupScript
+{
+	//================================================
+	// UIPopupScript
+	//================================================
+	void UIPopupScript(Widget wgt)
+	{
+		m_WgtRoot = wgt;
+	}
+
+	void OnOpen(Param param)
+	{
+	}
+	
+	void OnClose()
+	{
+	}
+	
+	void Show(bool show)
+	{
+		m_WgtRoot.Show(show);
+	}
+	
+	bool OnClick(Widget w, int x, int y, int button)
+	{
+		return false;
+	}
+	
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		return false;
+	}
+	
+	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// PopupBack
+	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	protected UIPopupScript PopupBack()
+	{
+		SceneEditorMenu menu = SceneEditorMenu.Cast( GetGame().GetUIManager().GetMenu() );
+		return menu.PopupBack();
+	}
+
+	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// PopupOpen
+	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	
+	protected UIPopupScript PopupOpen(int popup_id, Param param)
+	{
+		SceneEditorMenu menu = SceneEditorMenu.Cast( GetGame().GetUIManager().GetMenu() );
+		return menu.PopupOpen(popup_id, param);
+	}
+
+	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+	// GetSceneEditor
+	//~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~	
+	protected PluginSceneManager GetSceneEditor()
+	{
+		PluginSceneManager m = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+		return m;
+	}
+	
+	protected Widget m_WgtRoot;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptConfigs.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptConfigs.c
new file mode 100644
index 0000000000000000000000000000000000000000..da79b1fb5209e7feb843fdca1bb517656303a7bc
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptConfigs.c
@@ -0,0 +1,281 @@
+class UIPopupScriptConfigs extends UIPopupScript
+{
+	private ButtonWidget m_BtnOk;
+	private ButtonWidget m_BtnCancel;
+	private ButtonWidget m_BtnCopyToClipboard;
+	
+	private TextListboxWidget m_ConfigHierarchyTextListbox;
+	private TextListboxWidget m_ConfigVariablesTextListbox;
+	
+	private PluginConfigViewer m_ModuleConfigViewer;
+	
+	private EditBoxWidget m_ObjectConfigFilter;
+	
+	void UIPopupScriptConfigs( Widget wgt )
+	{
+		m_BtnOk		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pc_ok") );
+		m_ConfigHierarchyTextListbox = TextListboxWidget.Cast( wgt.FindAnyWidget("ConfigHierarchy") );
+		m_ConfigVariablesTextListbox = TextListboxWidget.Cast( wgt.FindAnyWidget("ConfigVariables") );
+		m_BtnCopyToClipboard = ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pc_copy") );
+		m_ObjectConfigFilter = EditBoxWidget.Cast( wgt.FindAnyWidget("ObjectConfigFilter") );
+	}
+	
+	void ChangeConfigFilter()
+	{
+		if ( m_ObjectConfigFilter.GetText() == "" )
+		{
+			ClearHierarchy();
+		}
+		else
+		{
+			FindInHierarchy( m_ObjectConfigFilter.GetText() );
+		}
+	}
+	
+	override void OnOpen(Param param)
+	{
+		m_ModuleConfigViewer	= PluginConfigViewer.Cast( GetPlugin( PluginConfigViewer ) );
+		ClearHierarchy();
+	}
+	
+	void AddItemToClipboard( TextListboxWidget text_listbox_widget )
+	{
+		int selected_row_index = text_listbox_widget.GetSelectedRow();
+		if ( selected_row_index != -1 )
+		{
+			string item_name;
+			text_listbox_widget.GetItemText( selected_row_index, 0, item_name );
+			GetGame().CopyToClipboard( item_name );
+		}
+	}
+	
+	void RenderVariables( int row )
+	{
+		ConfigParams config_params;
+		if( row > -1 && row < m_ConfigHierarchyTextListbox.GetNumItems() )
+		{
+			m_ConfigHierarchyTextListbox.GetItemData( row, 0, config_params );
+			m_ConfigVariablesTextListbox.ClearItems();
+			ref TStringArray variables;
+			string path = config_params.param4;
+			variables = m_ModuleConfigViewer.GetConfigVariables( path );
+			for ( int i = 0; i < variables.Count(); i++ )
+			{
+				m_ConfigVariablesTextListbox.AddItem( variables.Get(i), NULL, 0);
+			}
+		}
+	}
+	
+	void ExpandHierarchy( int row )
+	{
+		if( row <= -1 && row >= m_ConfigHierarchyTextListbox.GetNumItems() )
+		{
+			return;
+		}
+		
+		ref TStringArray variables;
+
+		// get current row data
+		ConfigParams config_params;
+		m_ConfigHierarchyTextListbox.GetItemData( row, 0, config_params );
+
+		string config_path = config_params.param4;
+		int deep = config_params.param5;
+
+		string offset = "";
+		for ( int i = 0; i < deep; i++)
+		{
+			offset = offset + "  ";
+		}
+
+		// change selected node
+		variables = m_ModuleConfigViewer.GetConfigHierarchy( config_path );
+		int childrens_count = variables.Count();
+		m_ConfigHierarchyTextListbox.SetItem( row, offset + "- " + config_params.param2, new ConfigParams( true, config_params.param2, childrens_count, config_path, deep ), 0 );
+
+		offset = offset + "  ";
+
+		// render childrens
+		deep = deep + 1;
+		childrens_count = 0;
+		for ( i = variables.Count() - 1; i >= 0; i-- )
+		{
+			string new_config_path = ( config_path + " " + variables.Get(i) ).Trim();
+			m_ConfigHierarchyTextListbox.AddItem( offset + "+ " + variables.Get(i), new ConfigParams( false, variables.Get(i), childrens_count, new_config_path, deep  ), 0, (row + 1) );
+		}
+	}
+
+	// niekde je bug, ked su len 2 polozky a expand/collapse na prvu tak zmaze aj druhu. ak collapse a expand na druhu tak crash lebo sa snazi zmazat riadok co neexistuje
+	void CollapseHierarchy( int row )
+	{
+		if( row <= -1 && row >= m_ConfigHierarchyTextListbox.GetNumItems() )
+		{
+			return;
+		}
+		
+		ConfigParams config_params;
+		ConfigParams config_params_next;
+		m_ConfigHierarchyTextListbox.GetItemData( row, 0, config_params );
+		m_ConfigHierarchyTextListbox.GetItemData( row + 1, 0, config_params_next );
+
+		int deep = config_params.param5;
+		int deep_next = config_params_next.param5;
+		int max_count = m_ConfigHierarchyTextListbox.GetNumItems();
+		int remove_lines_count = 0;
+		// Print(max_count);
+		for ( int i = row + 1; i < max_count; i++)
+		{
+			if ( deep < deep_next && i <= max_count )
+			{
+				remove_lines_count = remove_lines_count + 1;
+				m_ConfigHierarchyTextListbox.GetItemData( i, 0, config_params_next );
+				deep_next = config_params_next.param5;
+			}
+		}
+
+		// remove remove_lines_count lines from row
+		// remove_lines_count = remove_lines_count - 1;
+		for ( i = 1; i < remove_lines_count; i++ )
+		{
+			int x = row + 1;
+			if ( x < max_count )
+			{
+				m_ConfigHierarchyTextListbox.RemoveRow( x );
+			}
+		}
+
+		string offset = "";
+		for ( i = 0; i < deep; i++)
+		{
+			offset = offset + "  ";
+		}
+		m_ConfigHierarchyTextListbox.SetItem( row, offset + "+ " + config_params.param2, new ConfigParams( false, config_params.param2, 0, config_params.param4, deep ), 0 );
+	}
+	
+	void ClearHierarchy()
+	{
+		// config hierarchy
+		// string config_path = "configfile CfgVehicles APC";
+		// string config_path = "";
+
+		m_ConfigHierarchyTextListbox.ClearItems();
+		m_ConfigVariablesTextListbox.ClearItems();
+
+		ref TStringArray base_classes = new TStringArray;
+		Debug.GetBaseConfigClasses( base_classes );
+
+		string config_path = "configfile";
+		ref TStringArray variables = m_ModuleConfigViewer.GetConfigHierarchy( config_path );
+		for ( int i = 0; i < variables.Count(); i++ )
+		{
+			string variable = variables.Get(i);
+
+			for ( int j = 0; j < base_classes.Count(); j++ )
+			{
+				if ( variable == base_classes.Get(j) )
+				{
+					string new_config_path = ( config_path + " " + variable ).Trim();
+					m_ConfigHierarchyTextListbox.AddItem( "+ " + variable, new ConfigParams( false, variable, 0, new_config_path, 0 ), 0);
+				}
+			}
+		}
+	}
+	
+	void FindInHierarchy( string class_name )
+	{
+		m_ConfigHierarchyTextListbox.ClearItems();
+		m_ConfigVariablesTextListbox.ClearItems();
+
+		class_name.ToLower(  );
+		string config_base_path = "configfile";
+
+		ref TStringArray base_classes = new TStringArray;
+		Debug.GetBaseConfigClasses( base_classes );
+
+		string filter_lower = class_name;
+		filter_lower.ToLower(  );
+
+		ref TStringArray filters = new TStringArray;
+		filter_lower.Split( " ", filters );
+
+		for ( int i = 0; i < base_classes.Count(); i++ )
+		{
+			string config_path = config_base_path + " " + base_classes.Get(i);
+			ref TStringArray variables = m_ModuleConfigViewer.GetConfigHierarchy( config_path );
+
+			for ( int j = 0; j < variables.Count(); j++ )
+			{
+				string variable = variables.Get(j);
+				string variable_lower = variable;
+				variable_lower.ToLower(  );
+
+				for ( int k = 0; k < filters.Count(); k++ )
+				{
+					if ( variable_lower.Contains(filters.Get(k)))
+					{
+						string new_config_path = ( config_path + " " + variable ).Trim();
+						m_ConfigHierarchyTextListbox.AddItem( "+ " + variable, new ConfigParams( false, variable, 0, new_config_path, 0 ), 0);
+						break;
+					}
+				}
+			}
+		}
+	}
+	
+	override bool OnChange( Widget w, int x, int y, bool finished )
+	{
+		super.OnChange( w, x, y, finished );
+
+		if ( w == m_ObjectConfigFilter )
+		{
+			ChangeConfigFilter();
+		}
+
+		return false;
+	}
+	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		super.OnClick( w, x, y, button );
+		
+		if ( w == m_BtnOk )
+		{		
+			PopupBack();
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			return true;
+		}
+		else if ( w == m_BtnCopyToClipboard )
+		{
+			AddItemToClipboard( m_ConfigVariablesTextListbox );
+			return true;
+		}
+		else if ( w == m_ConfigHierarchyTextListbox )
+		{
+			int objects_row_index = m_ConfigHierarchyTextListbox.GetSelectedRow();
+			
+			if ( objects_row_index > -1 && objects_row_index < m_ConfigHierarchyTextListbox.GetNumItems() )
+			{
+				ConfigParams config_params;
+				m_ConfigHierarchyTextListbox.GetItemData( objects_row_index, 0, config_params );
+				
+				if ( config_params.param1 == false )
+				{
+					ExpandHierarchy( objects_row_index );
+				}
+				else
+				{
+					CollapseHierarchy( objects_row_index );
+				}
+				RenderVariables( objects_row_index );
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptEditorSettings.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptEditorSettings.c
new file mode 100644
index 0000000000000000000000000000000000000000..b4387135bb4ad2b5d9fed998413aa38eec2723e9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptEditorSettings.c
@@ -0,0 +1,79 @@
+class UIPopupScriptEditorSettings extends UIPopupScript
+{
+	private CheckBoxWidget		m_WgtTglSeleHighlight;
+	private CheckBoxWidget		m_WgtTglSavePlayerPos;
+	private EditBoxWidget		m_EdxRotationDelta;
+	
+	private ButtonWidget		m_BtnCancel;
+	
+	private PluginSceneManager	m_ModuleSceneManager;
+	
+	//================================================
+	// UIPopupScriptEditorSettings
+	//================================================	
+	void UIPopupScriptEditorSettings(Widget wgt)
+	{
+		m_ModuleSceneManager = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+		
+		m_WgtTglSeleHighlight	= CheckBoxWidget.Cast( wgt.FindAnyWidget("cbx_ppp_est_flag_selection") );
+		m_WgtTglSavePlayerPos	= CheckBoxWidget.Cast( wgt.FindAnyWidget("cbx_ppp_est_flag_load_player_pos") );
+		m_EdxRotationDelta		= EditBoxWidget.Cast( wgt.FindAnyWidget("ebx_ppp_est_rotation_delta_value") );
+		
+		m_BtnCancel				= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_est_cancel") );
+	}
+
+	//================================================
+	// OnOpen
+	//================================================	
+	override void OnOpen(Param param)
+	{
+		m_WgtTglSeleHighlight.SetChecked( m_ModuleSceneManager.GetDrawSelection() );
+		m_WgtTglSavePlayerPos.SetChecked( m_ModuleSceneManager.GetLoadPlayerPos() );
+		m_EdxRotationDelta.SetText( m_ModuleSceneManager.GetRotationAngle().ToString() );
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_WgtTglSeleHighlight )
+		{
+			m_ModuleSceneManager.SetDrawSelection(m_WgtTglSeleHighlight.IsChecked());
+		}
+		else if ( w == m_WgtTglSavePlayerPos )
+		{
+			m_ModuleSceneManager.SetLoadPlayerPos(m_WgtTglSavePlayerPos.IsChecked());
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	//============================================
+	// OnChange
+	//============================================
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{	
+		if ( w == m_EdxRotationDelta )
+		{
+			int angle = m_EdxRotationDelta.GetText().ToInt();
+			
+			if ( angle > 0 )
+			{
+				m_ModuleSceneManager.SetRotationAngle( angle );
+			}
+			
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptInitScript.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptInitScript.c
new file mode 100644
index 0000000000000000000000000000000000000000..d8a31a8585224899bc70db69ab822f4d26bc486b
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptInitScript.c
@@ -0,0 +1,88 @@
+class UIPopupScriptInitScript extends UIPopupScript
+{
+	private MultilineEditBoxWidget	m_MedxInitScript;
+	
+	private ButtonWidget			m_BtnRun;
+	private ButtonWidget			m_BtnSave;
+	private ButtonWidget			m_BtnCancel;
+	
+	private int						m_SceneObjectIndex;
+	private SceneObject				m_SceneObject;
+	
+	private PluginSceneManager		m_ModuleSceneManager;
+	
+	//================================================
+	// UIPopupScriptInitScript
+	//================================================	
+	void UIPopupScriptInitScript(Widget wgt)
+	{
+		m_ModuleSceneManager = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+		
+		m_MedxInitScript	= MultilineEditBoxWidget.Cast( wgt.FindAnyWidget("pnl_ppp_is_init_script_value") );
+		
+		m_BtnRun			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_is_run") );
+		m_BtnSave			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_is_save") );
+		m_BtnCancel			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_is_cancel") );
+	}
+
+	//================================================
+	// OnOpen
+	//================================================	
+	override void OnOpen(Param param)
+	{
+		m_MedxInitScript.SetText( "" );
+		
+		if ( param != NULL )
+		{
+			Param2<int, SceneObject> param_scene_object = Param2<int, SceneObject>.Cast( param );
+			int index = param_scene_object.param1;
+			SceneObject scene_object = param_scene_object.param2;
+			
+			if ( index > -1 && scene_object != NULL )
+			{
+				m_SceneObjectIndex = index;
+				m_SceneObject = scene_object;
+				m_MedxInitScript.SetText( m_SceneObject.GetInitScript() );
+			}
+		}
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_BtnRun )
+		{
+			if ( m_SceneObject != NULL )
+			{
+				string text_run;
+				m_MedxInitScript.GetText( text_run );
+				m_ModuleSceneManager.ExecuteEnforceScript( m_SceneObjectIndex, m_SceneObject, text_run );
+			}
+		}
+		else if ( w == m_BtnSave )
+		{
+			if ( m_SceneObject != NULL )
+			{
+				string text_script;
+				m_MedxInitScript.GetText( text_script );
+				m_SceneObject.SetInitScript( text_script );
+			}
+			
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptNotify.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptNotify.c
new file mode 100644
index 0000000000000000000000000000000000000000..02aeb7db0d027e3444856a2c23bde2fae73ef93c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptNotify.c
@@ -0,0 +1,39 @@
+class UIPopupScriptNotify extends UIPopupScript
+{
+	private ButtonWidget	m_BtnOk;
+	private TextWidget		m_TxtLabel;
+	
+	//================================================
+	// UIPopupScriptNotify
+	//================================================	
+	void UIPopupScriptNotify(Widget wgt)
+	{
+		m_BtnOk		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_notify_ok") );
+		m_TxtLabel	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_notify_label") );
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_BtnOk )
+		{
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	void SetLabelText(string text)
+	{
+		m_TxtLabel.SetText(text);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPositionManager.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPositionManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..610d6e9fe4cfda98dbee6fd27af559ae414441b7
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPositionManager.c
@@ -0,0 +1,94 @@
+class UIPopupScriptPositionManager extends UIPopupScript
+{
+	private TextListboxWidget	m_LstPositionList;
+	private EditBoxWidget m_TxtSelectedX;
+	private EditBoxWidget m_TxtSelectedY;
+	private EditBoxWidget m_TxtCurrentX;
+	private EditBoxWidget m_TxtCurrentY;
+	private PluginConfigDebugProfileFixed m_ConfigDebugProfileFixed;
+	private ButtonWidget m_TeleportButton;
+	private ButtonWidget m_CancelButton;
+			
+	//================================================
+	// UIPopupScriptPositionManager
+	//================================================	
+	void UIPopupScriptPositionManager( Widget wgt )
+	{
+		m_ConfigDebugProfileFixed	= PluginConfigDebugProfileFixed.Cast( GetPlugin( PluginConfigDebugProfileFixed ) );
+		m_LstPositionList	= TextListboxWidget.Cast( wgt.FindAnyWidget("tls_ppp_pm_positions_list") );
+		m_TxtSelectedX = EditBoxWidget.Cast( wgt.FindAnyWidget("pnl_ppp_pm_selected_x_value") );
+		m_TxtSelectedY = EditBoxWidget.Cast( wgt.FindAnyWidget("pnl_ppp_pm_selected_y_value") );
+		m_TxtCurrentX = EditBoxWidget.Cast( wgt.FindAnyWidget("pnl_ppp_pm_current_x_value") );
+		m_TxtCurrentY = EditBoxWidget.Cast( wgt.FindAnyWidget("pnl_ppp_pm_current_y_value") );
+		m_TeleportButton = ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pm_teleport") );
+		m_CancelButton = ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pm_cancel") );
+		/*
+		TStringArray positions_array = new TStringArray;
+		m_ConfigDebugProfileFixed.GetAllPositionsNames( positions_array );
+		
+		for ( int i = 0; i < positions_array.Count(); i++ )
+		{
+			m_LstPositionList.AddItem( positions_array.Get(i), new LocationParams ( positions_array.Get(i), false, vector.Zero), 0);
+		}*/
+	}
+	
+	//================================================
+	// OnOpen
+	//================================================	
+	override void OnOpen( Param param )
+	{		
+		if( PluginSceneManager.GetInstance() )
+		{
+			if( PluginSceneManager.GetInstance().GetSelectedSceneObject() )
+			{
+				vector player_pos = PluginSceneManager.GetInstance().GetSelectedSceneObject().GetPosition();
+			
+				m_TxtCurrentX.SetText( player_pos[0].ToString() );
+				m_TxtCurrentY.SetText( player_pos[2].ToString() );
+			}
+		}
+	}
+	
+	//================================================
+	// OnClick
+	//================================================
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		if ( w == m_TeleportButton )
+		{
+			float pos_x = m_TxtSelectedX.GetText().ToFloat();
+			float pos_z = m_TxtSelectedY.GetText().ToFloat();
+			
+			PluginSceneManager.GetInstance().SelectedObjectSetPosX( pos_x );
+			PluginSceneManager.GetInstance().SelectedObjectSetPosZ( pos_z );
+			PopupBack();
+			return true;
+		}
+		else if ( w == m_CancelButton )
+		{
+			PopupBack();
+			return true;
+		}
+		return false;
+	}
+	
+	void OnItemSelected( Widget w, int x, int y, int row, int column, int oldRow, int oldColumn )
+	{	
+		/*
+		vector position = m_ConfigDebugProfileFixed.GetPositionByNameEx( GetCurrentLocationName() );
+		m_TxtSelectedX.SetText( position[0].ToString() );
+		m_TxtSelectedY.SetText( position[2].ToString() );
+		*/
+	}
+	
+	string GetCurrentLocationName()
+	{
+		if ( m_LstPositionList.GetSelectedRow() != -1 )
+		{
+			string position_name;
+			m_LstPositionList.GetItemText( m_LstPositionList.GetSelectedRow(), 0, position_name );
+			return position_name;
+		}
+		return "";
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPresetNew.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPresetNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..c2319929af295d97812f123e8f4b8a0158ac53c9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPresetNew.c
@@ -0,0 +1,43 @@
+class UIPopupScriptPresetNew extends UIPopupScript
+{
+	private ButtonWidget m_BtnOk;
+	private ButtonWidget m_BtnCancel;
+	
+	//================================================
+	// UIPopupScriptSceneNew
+	//================================================	
+	void UIPopupScriptPresetNew( Widget wgt )
+	{
+		m_BtnOk		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pn_ok") );
+		m_BtnCancel	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pn_cancel") );
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		super.OnClick( w, x, y, button );
+		
+		if ( w == m_BtnOk )
+		{
+			EditBoxWidget wgt_text = EditBoxWidget.Cast( m_WgtRoot.FindAnyWidget("fld_ppp_pn_new_name") );
+			PluginConfigDebugProfile m_ConfigDebugProfile = PluginConfigDebugProfile.Cast( GetPlugin(PluginConfigDebugProfile) );
+			m_ConfigDebugProfile.PresetAdd( wgt_text.GetText() );
+			
+			SceneEditorMenu menu = SceneEditorMenu.Cast( GetGame().GetUIManager().GetMenu() );
+			menu.RefreshLists();
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPresetRename.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPresetRename.c
new file mode 100644
index 0000000000000000000000000000000000000000..d36ecd007f121fedd030df29776ebf40b0bb4c54
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptPresetRename.c
@@ -0,0 +1,49 @@
+class UIPopupScriptPresetRename extends UIPopupScript
+{
+	private ButtonWidget m_BtnOk;
+	private ButtonWidget m_BtnCancel;
+	private EditBoxWidget m_Editbox;
+	
+	//================================================
+	// UIPopupScriptSceneNew
+	//================================================	
+	void UIPopupScriptPresetRename( Widget wgt )
+	{
+		m_BtnOk		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pr_ok") );
+		m_BtnCancel	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_pr_cancel") );
+		m_Editbox = EditBoxWidget.Cast( wgt.FindAnyWidget("fld_ppp_pr_new_name") );
+	}
+	
+	override void OnOpen( Param param )
+	{
+		SceneEditorMenu menu = SceneEditorMenu.Cast( GetGame().GetUIManager().GetMenu() );
+		m_Editbox.SetText( menu.GetCurrentPresetName() );	
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick( Widget w, int x, int y, int button )
+	{
+		super.OnClick( w, x, y, button );
+		
+		if ( w == m_BtnOk )
+		{
+			EditBoxWidget wgt_text = EditBoxWidget.Cast( m_WgtRoot.FindAnyWidget("fld_ppp_pr_new_name") );		
+			SceneEditorMenu menu = SceneEditorMenu.Cast( GetGame().GetUIManager().GetMenu() );
+			menu.RenamePreset( wgt_text.GetText() );
+			menu.RefreshLists();
+			
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneDelete.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneDelete.c
new file mode 100644
index 0000000000000000000000000000000000000000..6b1fc3f284e20402cd98fb94e74cbb781d70c49d
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneDelete.c
@@ -0,0 +1,47 @@
+class UIPopupScriptSceneDelete extends UIPopupScript
+{
+	private ButtonWidget 	m_BtnYes;
+	private ButtonWidget 	m_BtnNo;
+	private string			m_DeleteScene;
+	
+	//================================================
+	// UIPopupScriptSceneDelete
+	//================================================	
+	void UIPopupScriptSceneDelete(Widget wgt)
+	{
+		m_BtnYes	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sn_dlt_yes") );
+		m_BtnNo		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sn_dlt_no") );
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_BtnYes )
+		{
+			PluginSceneManager editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+			
+			editor.SceneDelete(m_DeleteScene);
+			
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnNo )
+		{
+			m_DeleteScene = STRING_EMPTY;
+			PopupBack();
+			return true;
+		}
+		
+		return false;
+	}
+
+	void SetDeleteName(string scene_name)
+	{
+		m_DeleteScene = scene_name;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneManager.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneManager.c
new file mode 100644
index 0000000000000000000000000000000000000000..ca7127d345cbb7c7086f2fb530dc9532e0236ed8
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneManager.c
@@ -0,0 +1,436 @@
+class UIPopupScriptSceneManager extends UIPopupScript
+{
+	private ButtonWidget 		m_BtnCancel;
+	private ButtonWidget 		m_BtnSceneNew;
+	private ButtonWidget 		m_BtnSceneLoad;
+	private ButtonWidget 		m_BtnSceneRename;
+	private ButtonWidget 		m_BtnSceneDuplicate;
+	private ButtonWidget 		m_BtnSceneDelete;
+	private TextListboxWidget	m_LstListScenes;
+	
+	private static const int m_DaysInMonth[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+	
+	private ButtonWidget	m_BtnSave;
+	
+	private TextWidget		m_TxtWeatherTime;
+	
+	private SliderWidget 	m_SldStartTime;
+	private TextWidget		m_TxtStartTimeValue;
+	private SliderWidget 	m_SldStartDay;
+	private TextWidget		m_TxtStartDayValue;
+	private SliderWidget	m_SldOvercast;
+	private TextWidget		m_TxtOvercastValue;
+	private SliderWidget	m_SldRain;
+	private TextWidget		m_TxtRainValue;
+	private SliderWidget	m_SldFog;
+	private TextWidget		m_TxtFogValue;
+	private SliderWidget	m_SldWindForce;
+	private TextWidget		m_TxtWindForceValue;
+	
+	private int				m_OrigYear;
+	private int				m_OrigMonth;
+	private int				m_OrigDay;
+	private int				m_OrigHour;
+	private int				m_OrigMinute;
+	private float			m_OrigOvercast;
+	private float			m_OrigRain;
+	private float			m_OrigFog;
+	private float			m_OrigWindForce;
+	
+	private int				m_CurrYear;
+	private int				m_CurrMonth;
+	private int				m_CurrDay;
+	private int				m_CurrHour;
+	private int				m_CurrMinute;
+	private float			m_CurrOvercast;
+	private float			m_CurrRain;
+	private float			m_CurrFog;
+	private float			m_CurrWindForce;
+	
+	//================================================
+	// UIPopupScriptSceneManager
+	//================================================	
+	void UIPopupScriptSceneManager(Widget wgt)
+	{
+		m_BtnCancel			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sm_cancel") );
+		m_BtnSceneNew		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sm_mission_new") );
+		m_BtnSceneLoad		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sm_mission_load") );
+		m_BtnSceneRename	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sm_mission_rename") );
+		m_BtnSceneDelete	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sm_mission_delete") );
+		m_BtnSceneDuplicate	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sm_mission_duplicate") );
+		
+		m_LstListScenes	= TextListboxWidget.Cast( wgt.FindAnyWidget("tls_ppp_sm_scene_list") );
+		
+		m_BtnSave			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_st_save") );
+		
+		m_TxtWeatherTime	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_w_time_value") );
+		
+		m_SldStartTime		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_start_time") );
+		m_TxtStartTimeValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_start_time_value") );
+		
+		m_SldStartDay		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_start_day") );
+		m_TxtStartDayValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_start_day_value") );
+		
+		m_SldOvercast		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_overcast") );
+		m_TxtOvercastValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_overcast_value") );
+		
+		m_SldRain			= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_rain") );
+		m_TxtRainValue		= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_rain_value") );
+		
+		m_SldFog			= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_fog") );
+		m_TxtFogValue		= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_fog_value") );
+		
+		m_SldWindForce		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_wind_force") );
+		m_TxtWindForceValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_wind_force_value") );
+	}
+
+	void ~UIPopupScriptSceneManager()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Remove(this.OnUpdate);
+	}
+	
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		string scene_name;
+		PluginSceneManager editor;
+		
+		if ( w == m_BtnCancel )
+		{
+			GetGame().GetWorld().SetDate( m_OrigYear, m_OrigMonth, m_OrigDay, m_OrigHour, m_OrigMinute );
+
+			Weather weather = GetGame().GetWeather();
+			weather.GetOvercast().Set( m_OrigOvercast, 0, 1000 );
+			weather.GetRain().Set( m_OrigRain, 0, 1000 );
+			weather.GetFog().Set( m_OrigFog, 0, 1000 );
+			weather.SetWindSpeed( m_OrigWindForce );
+
+			PopupBack();
+			return true;
+		}
+		else if ( w == m_BtnSceneNew )
+		{
+			PopupOpen(SceneEditorMenu.POPUP_ID_SCENE_NEW, NULL);
+			
+			return true;
+		}
+		else if ( w == m_BtnSceneLoad )
+		{
+			if ( m_LstListScenes.GetSelectedRow() != -1 )
+			{
+				m_LstListScenes.GetItemText( m_LstListScenes.GetSelectedRow(), 0, scene_name );
+				editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+				
+				editor.SceneLoad(scene_name);
+				PopupBack();
+				
+				return true;
+			}
+		}
+		else if ( w == m_BtnSceneRename )
+		{
+			m_LstListScenes.GetItemText( m_LstListScenes.GetSelectedRow(), 0, scene_name );
+			
+			UIPopupScriptSceneRename popup_rename = UIPopupScriptSceneRename.Cast( PopupOpen(SceneEditorMenu.POPUP_ID_SCENE_RENAME, NULL) );
+			popup_rename.SetRenameName(scene_name);
+			
+			return true;
+		}
+		else if ( w == m_BtnSceneDuplicate )
+		{
+			if ( m_LstListScenes.GetSelectedRow() != -1 )
+			{
+				m_LstListScenes.GetItemText( m_LstListScenes.GetSelectedRow(), 0, scene_name );
+				editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+				
+				editor.SceneDuplicate(scene_name);
+				UpdateSceneList();
+				
+				return true;
+			}
+		}
+		else if ( w == m_BtnSceneDelete )
+		{
+			if ( m_LstListScenes.GetSelectedRow() != -1 )
+			{
+				m_LstListScenes.GetItemText( m_LstListScenes.GetSelectedRow(), 0, scene_name );
+				editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+				
+				editor.SceneDelete(scene_name);
+				
+				if ( editor.SceneCanDelete(scene_name) )
+				{
+					UIPopupScriptSceneDelete popup_delete = UIPopupScriptSceneDelete.Cast( PopupOpen(SceneEditorMenu.POPUP_ID_SCENE_DELETE, NULL) );
+					popup_delete.SetDeleteName(scene_name);
+				}
+				else
+				{
+					UIPopupScriptNotify popup_notify = UIPopupScriptNotify.Cast( PopupOpen(SceneEditorMenu.POPUP_ID_NOTIFY, NULL) );
+					popup_notify.SetLabelText("You cant delete current loaded scene!");
+				}			
+				
+				UpdateSceneList();
+				return true;
+			}		
+		}
+		else if ( w == m_BtnSave )
+		{		
+			m_OrigYear = m_CurrYear;
+			m_OrigMonth = m_CurrMonth;
+			m_OrigDay = m_CurrDay;
+			m_OrigHour = m_CurrHour;
+			m_OrigMinute = m_CurrMinute;
+			m_OrigOvercast = m_CurrOvercast;
+			m_OrigRain = m_CurrRain;
+			m_OrigFog = m_CurrFog;
+			m_OrigWindForce = m_CurrWindForce;
+			
+			editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+			editor.SetWeather(m_CurrOvercast, m_CurrRain, m_CurrFog, m_CurrWindForce);
+			editor.SetDate(m_CurrYear, m_CurrMonth, m_CurrDay, m_CurrHour, m_CurrMinute);
+			editor.SceneSave();
+			
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if ( w == m_SldStartTime )
+		{		
+			float slider_value_start_time = m_SldStartTime.GetCurrent() * 0.01;		
+			float start_time_f = slider_value_start_time * 1439;
+			int start_time = start_time_f;
+			m_CurrHour = start_time / 60;
+			m_CurrMinute = start_time % 60;
+			
+			UpdateSliderStartTime( m_CurrHour, m_CurrMinute );
+			
+			GetGame().GetWorld().SetDate( m_CurrYear, m_CurrMonth, m_CurrDay, m_CurrHour, m_CurrMinute );
+			
+			return true;
+		}
+		else if ( w == m_SldStartDay )
+		{		
+			float slider_value_start_day = m_SldStartDay.GetCurrent();
+			float start_day_f = slider_value_start_day * 3.64 + 1;
+			int start_day = start_day_f;
+			
+			for ( int i = 0; i < 12; i++ )
+			{
+				int days = m_DaysInMonth[i];
+				if ( start_day <= days )
+				{
+					m_CurrMonth = i+1;
+					m_CurrDay = start_day;
+					break;
+				}
+				else
+				{
+					start_day -= days;
+				}
+			}
+			
+			UpdateSliderStartDay( m_CurrMonth, m_CurrDay );
+			
+			GetGame().GetWorld().SetDate( m_CurrYear, m_CurrMonth, m_CurrDay, m_CurrHour, m_CurrMinute );
+			
+			return true;
+		}
+		else if ( w == m_SldOvercast )
+		{		
+			m_CurrOvercast = m_SldOvercast.GetCurrent() * 0.01;		
+			GetGame().GetWeather().GetOvercast().Set( m_CurrOvercast, 0, 1000 );
+
+			UpdateSliderOvercast();
+			
+			return true;
+		}
+		else if ( w == m_SldRain )
+		{		
+			m_CurrRain = m_SldRain.GetCurrent() * 0.01;		
+			GetGame().GetWeather().GetRain().Set( m_CurrRain, 0, 1000 );
+			
+			UpdateSliderRain();
+			
+			return true;
+		}
+		else if ( w == m_SldFog )
+		{		
+			m_CurrFog = m_SldFog.GetCurrent() * 0.01;		
+			GetGame().GetWeather().GetFog().Set( m_CurrFog, 0, 1000 );
+
+			UpdateSliderFog();
+			
+			return true;
+		}
+		else if ( w == m_SldWindForce )
+		{		
+			float wind_slider = m_SldWindForce.GetCurrent() * 0.01;
+			m_CurrWindForce = GetGame().GetWeather().GetWindMaximumSpeed() * wind_slider;
+			GetGame().GetWeather().SetWindSpeed( m_CurrWindForce );
+
+			UpdateSliderWindForce();
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	//================================================
+	// UpdateSceneList
+	//================================================	
+	void UpdateSceneList()
+	{
+		m_LstListScenes.ClearItems();
+		
+		PluginSceneManager editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+		
+		TStringArray scene_list = editor.GetSceneList();
+		string loaded_scene_name = editor.SceneGetName();
+		
+		for ( int i = 0; i < scene_list.Count(); ++i )
+		{
+			string scene_name = scene_list.Get(i);
+			
+			m_LstListScenes.AddItem(scene_name, NULL, 0);
+			
+			if ( scene_name == loaded_scene_name )
+			{
+				m_LstListScenes.SelectRow(i);
+			}
+		}
+	}
+
+	//================================================
+	// UpdateSceneList
+	//================================================	
+	override void OnOpen(Param param)
+	{
+		//Log("Poup Scene Manager OnOpen");
+		
+		UpdateSceneList();
+		GetGame().GetWorld().GetDate( m_OrigYear, m_OrigMonth, m_OrigDay, m_OrigHour, m_OrigMinute );
+
+		Weather weather = GetGame().GetWeather();
+		m_OrigOvercast = weather.GetOvercast().GetActual();
+		m_OrigRain = weather.GetRain().GetActual();
+		m_OrigFog = weather.GetFog().GetActual();
+		m_OrigWindForce = weather.GetWindSpeed();
+
+		m_CurrYear = m_OrigYear;
+		m_CurrMonth = m_OrigMonth;
+		m_CurrDay = m_OrigDay;
+		m_CurrHour = m_OrigHour;
+		m_CurrMinute = m_OrigMinute;
+		m_CurrOvercast = m_OrigOvercast;
+		m_CurrRain = m_OrigRain;
+		m_CurrFog = m_OrigFog;
+		m_CurrWindForce = m_OrigWindForce;
+		
+		Print( "Year" );
+		Print( m_CurrYear );
+		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Insert(this.OnUpdate);
+				
+		ResetSliders();
+	}
+	
+	//================================================
+	// OnClose
+	//================================================	
+	override void OnClose()
+	{		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Remove(this.OnUpdate);
+	}
+	
+	//================================================
+	// OnUpdate
+	//================================================	
+	void OnUpdate()
+	{
+		m_TxtWeatherTime.SetText(GetGame().GetWeather().GetTime().ToString());
+	}
+	
+	//================================================
+	// ResetSliders
+	//================================================	
+	void ResetSliders()
+	{
+		int year, month, day, hour, minute;
+		GetGame().GetWorld().GetDate( year, month, day, hour, minute );
+		m_SldStartTime.SetCurrent( ((hour * 60) + minute) / 14.39 );
+		UpdateSliderStartTime( hour, minute );
+		
+		float start_day = day;
+		int month_tmp = month;
+		while ( month_tmp > 1 )
+		{
+			month_tmp--;
+			start_day += m_DaysInMonth[month];
+		}
+		m_SldStartDay.SetCurrent( start_day / 3.64 );
+		UpdateSliderStartDay( month, day );
+
+		Weather weather = GetGame().GetWeather();
+
+		m_SldOvercast.SetCurrent(weather.GetOvercast().GetActual() * 100);
+		UpdateSliderOvercast();
+
+		m_SldRain.SetCurrent(weather.GetRain().GetActual() * 100);
+		UpdateSliderRain();
+
+		m_SldFog.SetCurrent(weather.GetFog().GetActual() * 100);
+		UpdateSliderFog();
+
+		float wind_slider = m_SldWindForce.GetCurrent() * 0.01;
+		m_CurrWindForce = weather.GetWindMaximumSpeed() * wind_slider;
+		weather.SetWindSpeed( m_CurrWindForce );
+		UpdateSliderWindForce();
+	}
+	
+	void UpdateSliderStartTime( int hour, int minute )
+	{
+		string label_text = hour.ToStringLen(2) + ":" + minute.ToStringLen(2);
+		m_TxtStartTimeValue.SetText( label_text );
+	}
+
+	void UpdateSliderStartDay( int month, int day )
+	{
+		string label_text = day.ToString() + "." + month.ToString() + ". " + m_CurrYear.ToString();
+		m_TxtStartDayValue.SetText( label_text );
+	}
+
+	void UpdateSliderOvercast()
+	{
+		string label_text = m_SldOvercast.GetCurrent().ToString()+"%";
+		m_TxtOvercastValue.SetText( label_text );
+	}
+
+	void UpdateSliderRain()
+	{
+		string label_text = m_SldRain.GetCurrent().ToString()+"%";
+		m_TxtRainValue.SetText( label_text );
+	}
+
+	void UpdateSliderFog()
+	{
+		string label_text = m_SldFog.GetCurrent().ToString()+"%";
+		m_TxtFogValue.SetText( label_text );
+	}
+
+	void UpdateSliderWindForce()
+	{
+		string label_text = m_CurrWindForce.ToString()+"ms";
+		m_TxtWindForceValue.SetText( label_text );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneNew.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneNew.c
new file mode 100644
index 0000000000000000000000000000000000000000..225528329f85856c533b236cf2dd6c5667f6539f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneNew.c
@@ -0,0 +1,46 @@
+class UIPopupScriptSceneNew extends UIPopupScript
+{
+	private ButtonWidget m_BtnOk;
+	private ButtonWidget m_BtnCancel;
+	
+	//================================================
+	// UIPopupScriptSceneNew
+	//================================================	
+	void UIPopupScriptSceneNew(Widget wgt)
+	{
+		m_BtnOk		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sn_ok") );
+		m_BtnCancel	= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sn_cancel") );
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_BtnOk )
+		{
+			EditBoxWidget wgt_text = EditBoxWidget.Cast( m_WgtRoot.FindAnyWidget("fld_ppp_sn_new_name") );
+			
+			PluginSceneManager editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+
+			Log("OnClick -> SceneLoad");
+			
+			editor.SceneLoad(wgt_text.GetText());
+			editor.SceneSave();
+			
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneRename.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneRename.c
new file mode 100644
index 0000000000000000000000000000000000000000..05ab220c4d3f7157e7c2b10e8039daa01463d844
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneRename.c
@@ -0,0 +1,53 @@
+class UIPopupScriptSceneRename extends UIPopupScript
+{
+	private ButtonWidget	m_BtnOk;
+	private ButtonWidget	m_BtnCancel;
+	private string			m_RenameName;
+	
+	//================================================
+	// UIPopupScriptSceneRename
+	//================================================	
+	void UIPopupScriptSceneRename(Widget wgt)
+	{
+		m_BtnOk			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sn_rnm_ok") );
+		m_BtnCancel		= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_sn_rnm_cancel") );
+	}
+
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_BtnOk )
+		{		
+			EditBoxWidget wgt_text = EditBoxWidget.Cast( m_WgtRoot.FindAnyWidget("fld_ppp_sn_rnm_new_name") );
+			
+			PluginSceneManager editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+			
+			editor.SceneRename(m_RenameName, wgt_text.GetText());
+			m_RenameName = STRING_EMPTY;
+			
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	//================================================
+	// SetRenameName
+	//================================================	
+	void SetRenameName(string rename_name)
+	{
+		m_RenameName = rename_name;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneSettings.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneSettings.c
new file mode 100644
index 0000000000000000000000000000000000000000..88bb467d8b698647a987de5932a2a253c821de6b
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPopupScript/UIPopupScriptSceneSettings.c
@@ -0,0 +1,323 @@
+class UIPopupScriptSceneSettings extends UIPopupScript
+{
+	private static const int m_DaysInMonth[12] = { 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };
+	
+	private ButtonWidget	m_BtnSave;
+	private ButtonWidget	m_BtnCancel;
+	
+	private TextWidget		m_TxtWeatherTime;
+	
+	private SliderWidget 	m_SldStartTime;
+	private TextWidget		m_TxtStartTimeValue;
+	private SliderWidget 	m_SldStartDay;
+	private TextWidget		m_TxtStartDayValue;
+	private SliderWidget	m_SldOvercast;
+	private TextWidget		m_TxtOvercastValue;
+	private SliderWidget	m_SldRain;
+	private TextWidget		m_TxtRainValue;
+	private SliderWidget	m_SldFog;
+	private TextWidget		m_TxtFogValue;
+	private SliderWidget	m_SldWindForce;
+	private TextWidget		m_TxtWindForceValue;
+	
+	private int				m_OrigYear;
+	private int				m_OrigMonth;
+	private int				m_OrigDay;
+	private int				m_OrigHour;
+	private int				m_OrigMinute;
+	private float			m_OrigOvercast;
+	private float			m_OrigRain;
+	private float			m_OrigFog;
+	private float			m_OrigWindForce;
+	
+	private int				m_CurrYear;
+	private int				m_CurrMonth;
+	private int				m_CurrDay;
+	private int				m_CurrHour;
+	private int				m_CurrMinute;
+	private float			m_CurrOvercast;
+	private float			m_CurrRain;
+	private float			m_CurrFog;
+	private float			m_CurrWindForce;
+	
+	//================================================
+	// UIPopupScriptSceneSettings
+	//================================================	
+	void UIPopupScriptSceneSettings(Widget wgt)
+	{
+		m_BtnSave			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_st_save") );
+		m_BtnCancel			= ButtonWidget.Cast( wgt.FindAnyWidget("btn_ppp_st_cancel") );
+		
+		m_TxtWeatherTime	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_w_time_value") );
+		
+		m_SldStartTime		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_start_time") );
+		m_TxtStartTimeValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_start_time_value") );
+		
+		m_SldStartDay		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_start_day") );
+		m_TxtStartDayValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_start_day_value") );
+		
+		m_SldOvercast		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_overcast") );
+		m_TxtOvercastValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_overcast_value") );
+		
+		m_SldRain			= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_rain") );
+		m_TxtRainValue		= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_rain_value") );
+		
+		m_SldFog			= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_fog") );
+		m_TxtFogValue		= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_fog_value") );
+		
+		m_SldWindForce		= SliderWidget.Cast( wgt.FindAnyWidget("sld_ppp_st_wind_force") );
+		m_TxtWindForceValue	= TextWidget.Cast( wgt.FindAnyWidget("txt_ppp_st_wind_force_value") );
+	}
+	
+	void ~UIPopupScriptSceneSettings()
+	{
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Remove(this.OnUpdate);
+	}
+	//================================================
+	// OnClick
+	//================================================	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_BtnSave )
+		{		
+			m_OrigYear = m_CurrYear;
+			m_OrigMonth = m_CurrMonth;
+			m_OrigDay = m_CurrDay;
+			m_OrigHour = m_CurrHour;
+			m_OrigMinute = m_CurrMinute;
+			m_OrigOvercast = m_CurrOvercast;
+			m_OrigRain = m_CurrRain;
+			m_OrigFog = m_CurrFog;
+			m_OrigWindForce = m_CurrWindForce;
+			
+			PluginSceneManager editor = PluginSceneManager.Cast( GetPlugin(PluginSceneManager) );
+			editor.SetWeather(m_CurrOvercast, m_CurrRain, m_CurrFog, m_CurrWindForce);
+			editor.SetDate(m_CurrYear, m_CurrMonth, m_CurrDay, m_CurrHour, m_CurrMinute);
+
+			PopupBack();
+			
+			return true;
+		}
+		else if ( w == m_BtnCancel )
+		{
+			
+			PopupBack();
+			
+			return true;
+		}
+		
+		return false;
+	}
+
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if ( w == m_SldStartTime )
+		{		
+			float slider_value_start_time = m_SldStartTime.GetCurrent() * 0.01;		
+			float start_time_f = slider_value_start_time * 1439;
+			int start_time = start_time_f;
+			m_CurrHour = start_time / 60;
+			m_CurrMinute = start_time % 60;
+			
+			UpdateSliderStartTime( m_CurrHour, m_CurrMinute );
+			
+			GetGame().GetWorld().SetDate( m_CurrYear, m_CurrMonth, m_CurrDay, m_CurrHour, m_CurrMinute );
+			
+			return true;
+		}
+		else if ( w == m_SldStartDay )
+		{		
+			float slider_value_start_day = m_SldStartDay.GetCurrent();
+			float start_day_f = slider_value_start_day * 3.64 + 1;
+			int start_day = start_day_f;
+			
+			for ( int i = 0; i < 12; i++ )
+			{
+				int days = m_DaysInMonth[i];
+				if ( start_day <= days )
+				{
+					m_CurrMonth = i+1;
+					m_CurrDay = start_day;
+					break;
+				}
+				else
+				{
+					start_day -= days;
+				}
+			}
+			
+			UpdateSliderStartDay( m_CurrMonth, m_CurrDay );
+			
+			GetGame().GetWorld().SetDate( m_CurrYear, m_CurrMonth, m_CurrDay, m_CurrHour, m_CurrMinute );
+			
+			return true;
+		}
+		else if ( w == m_SldOvercast )
+		{		
+			UpdateSliderOvercast();
+			
+			m_CurrOvercast = m_SldOvercast.GetCurrent() * 0.01;
+			GetGame().GetWeather().GetOvercast().Set( m_CurrOvercast, 0, 1000 );
+
+			return true;
+		}
+		else if ( w == m_SldRain )
+		{		
+			UpdateSliderRain();
+			
+			m_CurrRain = m_SldRain.GetCurrent() * 0.01;
+			GetGame().GetWeather().GetRain().Set( m_CurrRain, 0, 1000 );
+
+			return true;
+		}
+		else if ( w == m_SldFog )
+		{		
+			UpdateSliderFog();
+			
+			m_CurrFog = m_SldFog.GetCurrent() * 0.01;
+			GetGame().GetWeather().GetFog().Set( m_CurrFog, 0, 1000 );
+
+			return true;
+		}
+		else if ( w == m_SldWindForce )
+		{		
+			UpdateSliderWindForce();
+			
+			m_CurrWindForce = m_SldWindForce.GetCurrent() * 0.01;
+			//GetGame().GetWeather().SetWindSpeed( m_CurrWindForce );
+
+			return true;
+		}
+		
+		return false;
+	}
+	
+	//================================================
+	// OnOpen
+	//================================================	
+	override void OnOpen(Param param)
+	{
+		GetGame().GetWorld().GetDate( m_OrigYear, m_OrigMonth, m_OrigDay, m_OrigHour, m_OrigMinute );
+
+		Weather weather = GetGame().GetWeather();
+
+		m_OrigOvercast = weather.GetOvercast().GetActual();
+		m_OrigRain = weather.GetRain().GetActual();
+		m_OrigFog = weather.GetFog().GetActual();
+		m_OrigWindForce = weather.GetWindSpeed();
+
+		m_CurrYear = m_OrigYear;
+		m_CurrMonth = m_OrigMonth;
+		m_CurrDay = m_OrigDay;
+		m_CurrHour = m_OrigHour;
+		m_CurrMinute = m_OrigMinute;
+		m_CurrOvercast = m_OrigOvercast;
+		m_CurrRain = m_OrigRain;
+		m_CurrFog = m_OrigFog;
+		m_CurrWindForce = m_OrigWindForce;
+		
+		Print( "Year" );
+		Print( m_CurrYear );
+		
+		GetGame().GetUpdateQueue(CALL_CATEGORY_SYSTEM).Insert(this.OnUpdate);
+		
+		ResetSliders();
+	}
+	
+	//================================================
+	// OnClose
+	//================================================	
+	override void OnClose()
+	{
+		Weather weather = GetGame().GetWeather();
+
+		GetGame().GetWorld().SetDate( m_OrigYear, m_OrigMonth, m_OrigDay, m_OrigHour, m_OrigMinute );
+		weather.GetOvercast().Set( m_OrigOvercast, 0, 1000 );
+		weather.GetRain().Set( m_OrigRain, 0, 1000 );
+		weather.GetFog().Set( m_OrigFog, 0, 1000 );
+		//weather.SetWindSpeed( m_OrigWindForce );
+	}
+
+	//================================================
+	// OnUpdate
+	//================================================	
+	void OnUpdate()
+	{
+		m_TxtWeatherTime.SetText(GetGame().GetWeather().GetTime().ToString());
+	}
+
+	//================================================
+	// ResetSliders
+	//================================================	
+	void ResetSliders()
+	{
+		int year, month, day, hour, minute;
+		GetGame().GetWorld().GetDate( year, month, day, hour, minute );
+		m_SldStartTime.SetCurrent( ((hour * 60) + minute) / 14.39 );
+		UpdateSliderStartTime( hour, minute );
+		
+		float start_day = day;
+		int month_tmp = month;
+		while ( month_tmp > 1 )
+		{
+			month_tmp--;
+			start_day += m_DaysInMonth[month];
+		}
+		m_SldStartDay.SetCurrent( start_day / 3.64 );
+		UpdateSliderStartDay( month, day );
+
+		Weather weather = GetGame().GetWeather();
+
+		m_SldOvercast.SetCurrent(weather.GetOvercast().GetActual() * 100);
+		UpdateSliderOvercast();
+
+		m_SldRain.SetCurrent(weather.GetRain().GetActual() * 100);
+		UpdateSliderRain();
+
+		m_SldFog.SetCurrent(weather.GetFog().GetActual() * 100);
+		UpdateSliderFog();
+
+		float slider_wind_value = ( weather.GetWindSpeed() / weather.GetWindMaximumSpeed() ) * 100;
+		m_SldWindForce.SetCurrent( slider_wind_value );
+		UpdateSliderWindForce();
+	}
+	
+	void UpdateSliderStartTime( int hour, int minute )
+	{
+		string label_text = hour.ToStringLen(2) + ":" + minute.ToStringLen(2);
+		m_TxtStartTimeValue.SetText( label_text );
+	}
+
+	void UpdateSliderStartDay( int month, int day )
+	{
+		string label_text = day.ToString() + "." + month.ToString() + ". " + m_CurrYear.ToString();
+		m_TxtStartDayValue.SetText( label_text );
+	}
+
+	void UpdateSliderOvercast()
+	{
+		string label_text = m_SldOvercast.GetCurrent().ToString()+"%";
+		m_TxtOvercastValue.SetText( label_text );
+	}
+
+	void UpdateSliderRain()
+	{
+		string label_text = m_SldRain.GetCurrent().ToString()+"%";
+		m_TxtRainValue.SetText( label_text );
+	}
+
+	void UpdateSliderFog()
+	{
+		string label_text = m_SldFog.GetCurrent().ToString()+"%";
+		m_TxtFogValue.SetText( label_text );
+	}
+
+	void UpdateSliderWindForce()
+	{
+		string label_text = m_SldWindForce.GetCurrent().ToString()+"%";
+		m_TxtWindForceValue.SetText( label_text );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPropertyAttachment.c b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPropertyAttachment.c
new file mode 100644
index 0000000000000000000000000000000000000000..3b174ad517dab8cf7c67de5b91f01b82d0458bfe
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/SceneEditorMenu/UIPropertyAttachment.c
@@ -0,0 +1,114 @@
+class UIPropertyAttachment
+{
+	private Widget			m_WgtRoot;
+	private Widget			m_WgtThis;
+	private XComboBoxWidget	m_WgtComboBox;
+	private TextWidget		m_WgtSlotName;
+	private ref TStringArray m_ComboItems;
+	private int				m_PrevIndex;
+	private EntityAI		m_Obj;
+	private int				m_SlotID;
+	
+	
+	void UIPropertyAttachment(Widget root)
+	{
+		m_WgtRoot		= root;
+		
+		m_ComboItems = new TStringArray;
+		
+		m_WgtThis = GetGame().GetWorkspace().CreateWidgets("gui/layouts/scene_editor/day_z_scene_editor_attachment.layout", m_WgtRoot);
+		m_WgtComboBox	= XComboBoxWidget.Cast( m_WgtThis.FindAnyWidget("combo_box") );
+		m_WgtSlotName	= TextWidget.Cast( m_WgtThis.FindAnyWidget("txt_slot_name") );
+	}
+	
+	void ~UIPropertyAttachment()
+	{
+		m_WgtRoot		= NULL;
+		m_WgtComboBox	= NULL;
+		
+		delete m_WgtThis;
+	}
+	
+	bool OnClick(Widget w, int x, int y, int button)
+	{
+		if ( w == m_WgtComboBox )
+		{
+			if ( m_PrevIndex != 0 )
+			{
+				EntityAI attachment = m_Obj.GetInventory().FindAttachment(m_SlotID);
+				GetGame().ObjectDelete(attachment);
+			}
+			
+			int curr_index = m_WgtComboBox.GetCurrentItem();
+			
+			if ( curr_index != 0 )
+			{				
+				PluginDeveloper 	module_dev = PluginDeveloper.Cast( GetPlugin(PluginDeveloper) );
+					
+				EntityAI e = module_dev.SpawnEntityAsAttachment(PluginSceneManager.PLAYER, m_Obj, m_ComboItems.Get(curr_index), 1, -1);
+			}
+				
+			m_PrevIndex = curr_index;
+			
+			return true;
+		}
+		
+		return false;
+	}
+	
+	void SetPos(float x, float y)
+	{
+		m_WgtThis.SetPos(x, y);
+	}
+	
+	void SetSize(float width, float height)
+	{
+		m_WgtThis.SetSize(width, height);
+	}
+	
+	void Show(EntityAI e, string slot_name, TStringArray att_items)
+	{
+		m_WgtThis.Show(true);
+		
+		m_Obj = e;
+		m_ComboItems.Clear();
+		m_ComboItems.Insert("none");
+		m_ComboItems.InsertAll(att_items);
+		
+		m_WgtSlotName.SetText(slot_name);
+		
+		m_WgtComboBox.ClearAll();
+		
+		m_SlotID = InventorySlots.GetSlotIdFromString(slot_name);
+		EntityAI attachment = e.GetInventory().FindAttachment(m_SlotID);
+		int selected_index = 0;
+		
+		for ( int i = 0; i < m_ComboItems.Count(); ++i )
+		{
+			string item_name = m_ComboItems.Get(i);
+			
+			m_WgtComboBox.AddItem(item_name);
+			
+			if ( attachment != NULL && attachment.GetType() == item_name )
+			{
+				selected_index = i;
+			}
+		}
+		
+		m_WgtComboBox.SetCurrentItem(selected_index);
+		m_PrevIndex = selected_index;
+	}
+	
+	void Hide()
+	{
+		m_WgtThis.Show(false);
+		
+		m_Obj = NULL;
+		m_SlotID = -1;
+	}
+	
+	bool IsVisible()
+	{
+		return m_WgtThis.IsVisible();
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsole.c b/scripts/5_Mission/DayZ/GUI/ScriptConsole.c
new file mode 100644
index 0000000000000000000000000000000000000000..9749240a577962165945fd1d0fd9c7098058e237
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsole.c
@@ -0,0 +1,587 @@
+class ScriptConsole extends UIScriptedMenu
+{
+	protected bool				m_HintEditMode;
+	protected float 			m_HoverTime;
+	protected bool				m_HoverSuccessTriggered;
+	protected Widget 			m_CurrentHoverWidget;
+	protected Widget 			m_HintWidgetRoot;
+	protected ImageWidget 		m_HintWidgetBackground;
+	protected Widget 			m_EditTooltipRoot;
+	protected RichTextWidget 	m_HintWidget;
+	protected ButtonWidget 		m_HintOkButton;
+	protected ButtonWidget 		m_HintCancelButton;
+	protected ButtonWidget 		m_HintClearButton;
+	protected EditBoxWidget 	m_HintInputText;
+	protected float 			m_PrevMouseX;
+	protected float 			m_PrevMouseY;
+	Widget 						m_ButtonsWindowWidget;
+	ScriptConsoleTabBase 		m_SelectedHandler;
+	protected int 				m_Id;
+	
+	static ref array<ref MapMarker> 	m_MarkedEntities = new array<ref MapMarker>();
+	int 								m_SelectedTab;
+	protected ref map<Widget, ref ScriptConsoleTabBase> m_TabHandlers = new map<Widget, ref ScriptConsoleTabBase>;
+	protected ref map<int, ref ScriptConsoleTabBase> m_TabHandlersByID = new map<int, ref ScriptConsoleTabBase>;
+
+	ButtonWidget 					m_CloseConsoleButton;
+
+	
+	protected static const string HINTS_PATH_DEFAULT		= "scripts/data/internal/script_console_hints.json";
+	protected static const string HINTS_PATH_OPTIONAL 		= "$mission:script_console_hints.json";
+	
+	static ref JsonHintsData m_JsonData;
+	
+	const string NO_HINT_TEXT = "No hint";
+	
+	
+	void ScriptConsole()
+	{
+		#ifndef SERVER
+		if (GetGame() && GetGame().GetMission() && GetGame().GetMission().GetHud())
+		{
+			GetGame().GetMission().GetHud().ShowHudPlayer(false);
+			GetGame().GetMission().GetHud().ShowQuickbarPlayer(false);
+		}
+		#endif
+		PluginItemDiagnostic plugin = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+		if (plugin)
+			plugin.OnScriptMenuOpened(true);
+	}
+
+	void ~ScriptConsole()
+	{
+		#ifndef SERVER
+		if (GetGame() && GetGame().GetMission() && GetGame().GetMission().GetHud())
+		{
+			GetGame().GetMission().GetHud().ShowHudPlayer(true);
+			GetGame().GetMission().GetHud().ShowQuickbarPlayer(true);
+		}
+		if (m_HintWidgetRoot)
+			m_HintWidgetRoot.Unlink();
+		#endif
+		PluginItemDiagnostic plugin = PluginItemDiagnostic.Cast(GetPlugin(PluginItemDiagnostic));
+		if (plugin)
+			plugin.OnScriptMenuOpened(false);
+		
+		if (GetGame() && GetGame().GetMission())
+		{
+			GetGame().GetMission().EnableAllInputs(true);
+		}
+	}
+	
+	ScriptConsoleTabBase GetSelectedHandler()
+	{
+		return m_SelectedHandler;
+	}
+		
+	static void SaveData()
+	{
+		string errorMessage;
+		if (!JsonFileLoader<JsonHintsData>.SaveFile(HINTS_PATH_OPTIONAL, m_JsonData, errorMessage))
+			ErrorEx(errorMessage);
+	}
+	
+	protected static JsonHintsData GetData()
+	{
+		string path = HINTS_PATH_OPTIONAL;
+		if (!FileExist(path))
+		{
+			path = HINTS_PATH_DEFAULT;
+			//ErrorEx(string.Format("Using default hints file: %1", path), ErrorExSeverity.INFO);
+		}
+		
+		string errorMessage;
+		JsonHintsData data;
+		if (!JsonFileLoader<JsonHintsData>.LoadFile(path, data, errorMessage))
+			ErrorEx(errorMessage);
+		
+		return data;
+	}
+	
+	void SetHintText(string text, Widget w)
+	{
+		if (m_JsonData && m_JsonData.WidgetHintBindings && w)
+		{
+			int hash = GetWidgetCombinedHash(w);
+			m_JsonData.WidgetHintBindings.Set(hash, text);
+			Print("setting: " + text);
+		}
+		HoverInterrupt();
+	}
+	
+	void RegisterTab(ScriptConsoleTabBase handler)
+	{
+		m_TabHandlers.Insert(handler.GetButton(), handler);
+		m_TabHandlersByID.Insert(m_Id, handler);
+		handler.Init(m_Id);
+		m_Id++;
+	}
+	
+	override Widget Init()
+	{
+		m_ConfigDebugProfile = PluginConfigDebugProfile.Cast(GetPlugin(PluginConfigDebugProfile));
+
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console.layout");
+		m_EditTooltipRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_tooltip_edit.layout", layoutRoot);
+		m_EditTooltipRoot.Show(false);
+		m_HintOkButton = ButtonWidget.Cast(m_EditTooltipRoot.FindAnyWidget("ButtonOk"));
+		m_HintCancelButton = ButtonWidget.Cast(m_EditTooltipRoot.FindAnyWidget("ButtonCancel"));
+		m_HintClearButton = ButtonWidget.Cast(m_EditTooltipRoot.FindAnyWidget("ButtonClear"));
+		m_HintInputText = EditBoxWidget.Cast(m_EditTooltipRoot.FindAnyWidget("InputText"));
+
+		m_ButtonsWindowWidget = layoutRoot.FindAnyWidget("TabButtons");
+		m_ButtonsWindowWidget.Show(true);
+		//(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+		RegisterTab(new ScriptConsoleItemsTab(layoutRoot.FindAnyWidget("ItemsPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("ItemsButtonWidget"))));
+		RegisterTab(new ScriptConsoleConfigTab(layoutRoot.FindAnyWidget("ConfigsPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("ConfigsButtonWidget"))));
+		RegisterTab(new ScriptConsoleEnfScriptTab(layoutRoot.FindAnyWidget("EnScriptPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("EnScriptButtonWidget"))));
+		RegisterTab(new ScriptConsoleEnfScriptServerTab(layoutRoot.FindAnyWidget("EnScriptPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("EnScriptButtonWidgetServer"))));
+		RegisterTab(new ScriptConsoleGeneralTab(layoutRoot.FindAnyWidget("GeneralPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("GeneralButtonWidget"))));
+		RegisterTab(new ScriptConsoleOutputTab(layoutRoot.FindAnyWidget("OutputPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("OutputButtonWidget"))));
+		RegisterTab(new ScriptConsoleVicinityTab(layoutRoot.FindAnyWidget("VicinityPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("VicinityWidget"))));
+		RegisterTab(new ScriptConsoleSoundsTab(layoutRoot.FindAnyWidget("SoundsPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("SoundsWidget"))));
+		RegisterTab(new ScriptConsoleWeatherTab(layoutRoot.FindAnyWidget("WeatherPanel"),this,ButtonWidget.Cast(layoutRoot.FindAnyWidget("WeatherButtonWidget"))));
+
+		m_CloseConsoleButton = ButtonWidget.Cast(layoutRoot.FindAnyWidget("CloseConsoleButtonWidget"));
+
+		// load data from profile
+		m_SelectedTab = m_ConfigDebugProfile.GetTabSelected();
+		SelectTabByID(m_SelectedTab);
+		
+		m_JsonData = GetData();
+
+		return layoutRoot;
+	}
+	
+	protected void HideHint()
+	{
+		if (m_HintWidgetRoot)
+			m_HintWidgetRoot.Unlink();
+	}
+	
+	int GetWidgetCombinedHash(Widget w)
+	{
+		string nameThis = w.GetName();
+		string nameParent = "";
+		
+		if (w.GetParent())
+		{
+			nameParent = w.GetParent().GetName();
+		}
+		
+		string namesCombined = nameThis + nameParent;
+		return namesCombined.Hash();
+	}
+	
+	protected string GetMessage()
+	{
+		int hash = GetWidgetCombinedHash(m_CurrentHoverWidget);
+		
+		if (m_JsonData && m_JsonData.WidgetHintBindings)
+		{
+			if (m_JsonData.WidgetHintBindings.Contains(hash))
+			{
+				return m_JsonData.WidgetHintBindings.Get(hash);
+			}
+		}
+		//return "";
+		//return "No hint" + hash.ToString();
+		return NO_HINT_TEXT;
+	}
+	
+	protected void HoverSuccess()
+	{
+		m_HoverSuccessTriggered = true;
+		DisplayHint(GetMessage());
+	}
+	
+	protected void HoverInterrupt()
+	{
+		m_HoverSuccessTriggered = false;
+
+		m_HoverTime = 0;
+		m_HintEditMode = false;
+		HideHint();
+	}
+
+	override bool OnKeyPress(Widget w, int x, int y, int key)
+	{
+		super.OnKeyPress(w, x, y, key);
+
+		if (m_SelectedHandler.OnKeyPress(w,x,y,key))
+			return true;
+		return false;
+
+	}
+	
+	override bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		super.OnKeyDown(w, x, y, key);
+		
+		if (m_SelectedHandler.OnKeyDown(w,x,y,key))
+			return true;
+		return false;
+
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+
+		int mouseX, mouseY;
+		GetMousePos(mouseX,mouseY);
+		float dist = Math.Sqrt(Math.AbsFloat(mouseX - m_PrevMouseX) + Math.AbsFloat(mouseY - m_PrevMouseY));
+		m_PrevMouseX = mouseX;
+		m_PrevMouseY = mouseY;
+		
+		if (dist < 1 && m_CurrentHoverWidget && !m_HoverSuccessTriggered)
+		{
+			m_HoverTime += timeslice;
+			if (m_HoverTime > 1)
+			{
+				HoverSuccess();
+			}
+		}
+		
+		if(dist > 1 && m_HoverSuccessTriggered)
+			HoverInterrupt();
+		
+		if (GetGame() && GetUApi().GetInputByID(UAUIBack).LocalPress())
+		{
+			GetGame().GetUIManager().Back();
+		}
+		
+		
+	
+		if (!GetGame().IsMultiplayer() && KeyState(KeyCode.KC_RCONTROL) && KeyState(KeyCode.KC_NUMPAD0) && m_HintWidgetRoot && m_HintWidgetRoot.IsVisible())
+		{
+			ClearKey(KeyCode.KC_NUMPAD0);
+			m_EditTooltipRoot.Show(true);
+			string text = GetMessage();
+			if (text == NO_HINT_TEXT)
+				text = "";
+			m_HintInputText.SetText(text);
+			
+		}
+		
+		
+		foreach (ScriptConsoleTabBase handler: m_TabHandlers)
+		{
+			handler.Update(timeslice);
+		}
+	}
+
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		super.OnMouseButtonDown(w,x,y,button);
+		
+		if (m_SelectedHandler.OnMouseButtonDown(w,x,y,button))
+			return true;
+
+		return false;
+	}
+	
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+
+		if (w == m_CloseConsoleButton)
+		{		
+			Close();
+			GetGame().GetMission().EnableAllInputs(true);
+			return true;
+		}
+		else if (w == m_HintOkButton)
+		{
+			SetHintText(m_HintInputText.GetText(), m_CurrentHoverWidget);
+			HoverInterrupt();
+			m_EditTooltipRoot.Show(false);
+			SaveData();
+		}		
+		else if (w == m_HintCancelButton)
+		{
+			HoverInterrupt();
+			m_EditTooltipRoot.Show(false);
+			
+		}
+		else if (w == m_HintClearButton)
+		{
+			m_HintInputText.SetText("");
+			
+		}
+
+		SelectTabByButton(w);
+
+		if (m_SelectedHandler.OnClick(w,x,y,button))
+			return true;
+		return false;
+	}
+	
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		super.OnDoubleClick(w, x, y, button);
+
+		if (m_SelectedHandler.OnDoubleClick(w,x,y,button))
+				return true; 
+		
+		return false;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		super.OnMouseLeave(w, enterW, x, y);
+		
+		if (!m_EditTooltipRoot.IsVisible())
+			HoverInterrupt();
+		return false;
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		super.OnMouseEnter(w, x, y);
+		if (!m_EditTooltipRoot.IsVisible())
+			m_CurrentHoverWidget = w;
+		
+		
+		
+		#ifdef PLATFORM_CONSOLE
+		return false;
+		#endif
+		return true;
+	}
+
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		
+		if (m_SelectedHandler.OnChange(w,x,y,finished))
+				return true; 
+		
+		return false;
+	}
+		
+	override bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn)
+	{
+		super.OnItemSelected(w, x, y, row, column, oldRow, oldColumn);
+		
+
+		
+		if (m_SelectedHandler.OnItemSelected(w, x, y, row, column,oldRow, oldColumn))
+			return true;
+		
+		return false;
+	}
+	
+	ScriptConsoleTabBase GetTabHandler(typename tabType)
+	{
+		foreach (ScriptConsoleTabBase handler: m_TabHandlers)
+		{
+			if (tabType == handler.Type())
+			{
+				return handler;
+			}
+		}
+		return null;
+	}
+
+	
+	void SelectTabByID(int id)
+	{
+		ScriptConsoleTabBase tab = m_TabHandlersByID.Get(id);
+		if (tab)
+			SelectTab(tab);
+	}
+	
+	void SelectTabByButton(Widget button)
+	{
+		ScriptConsoleTabBase tab = m_TabHandlers.Get(button);
+		if (tab)
+			SelectTab(tab);
+	}
+
+	void SelectTab(ScriptConsoleTabBase selectedHandler)
+	{
+		foreach (ScriptConsoleTabBase handler:m_TabHandlers)
+		{
+			handler.Select(handler == selectedHandler, selectedHandler);
+		}
+		m_SelectedHandler = selectedHandler;
+		m_ConfigDebugProfile.SetTabSelected(selectedHandler.GetID());
+	}
+	
+	protected void DisplayHint(string message)
+	{
+		if (message)
+		{
+			m_HintWidgetRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_hint.layout");
+			m_HintWidgetBackground = ImageWidget.Cast(m_HintWidgetRoot.FindAnyWidget("Background"));
+			m_HintWidget = RichTextWidget.Cast(m_HintWidgetRoot.FindAnyWidget("HintText"));
+		
+			m_HintWidgetRoot.Show(true);
+			m_HintWidget.SetText(message);
+			
+			int offsetX = 0;
+			int offsetY = 10;
+			
+			int screenW, screenH;
+			GetScreenSize(screenW, screenH);
+	
+			int mouseX, mouseY;
+			GetMousePos(mouseX,mouseY);
+			
+			float relativeX = mouseX / screenW;
+			float relativeY = mouseY / screenH;
+
+			int width, height;
+			m_HintWidget.GetTextSize(width, height);
+			if (relativeX > 0.8)
+				offsetX = -width - offsetX;
+			if (relativeY > 0.8)
+				offsetY = -height - offsetY;
+			
+			m_HintWidgetRoot.SetPos(mouseX + offsetX ,mouseY + offsetY);
+			m_HintWidgetBackground.SetScreenSize(width + 5, height + 5);
+			
+		}
+	}
+
+	override void OnRPCEx(int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPCEx(rpc_type, ctx);
+		#ifdef DIAG_DEVELOPER
+		
+		foreach (ScriptConsoleTabBase handler:m_TabHandlers)
+		{
+			handler.OnRPCEx(rpc_type,ctx);
+		}
+		#endif
+
+	}
+
+	PluginConfigDebugProfile m_ConfigDebugProfile;
+}
+
+
+class ScriptConsoleToolTipEventHandler : ScriptedWidgetEventHandler
+{
+	reference string HintMessage;
+	protected Widget m_Root;
+	
+	
+	protected float 			m_HoverTime;
+	protected bool				m_HoverSuccessTriggered;
+	protected Widget 			m_CurrentHoverWidget;
+	protected Widget 			m_HintWidgetRoot;
+	protected ImageWidget 		m_HintWidgetBackground;
+	protected RichTextWidget 	m_HintWidget;
+	
+	protected ref Timer m_Timer;
+	
+	void OnWidgetScriptInit(Widget w)
+	{
+		m_Root = w;
+		m_Root.SetHandler(this);
+		m_Root.SetFlags(WidgetFlags.VEXACTPOS);
+	}
+	
+	override bool OnMouseEnter(Widget w, int x, int y)
+	{
+		m_Timer = new Timer();
+		m_Timer.Run(0.1, this, "Tick", NULL, true);
+		
+		m_CurrentHoverWidget = w;
+		return true;
+	}
+	
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{	
+		HoverInterrupt();
+		return true;
+	}
+	
+	protected bool Tick()
+	{
+		if (!m_Root.IsVisibleHierarchy())
+			HoverInterrupt();
+		if (m_CurrentHoverWidget && !m_HoverSuccessTriggered)
+		{
+			m_HoverTime += 0.1;
+			if (m_HoverTime > 1)
+			{
+				HoverSuccess();
+			}
+		}
+		return true;
+	}
+
+	protected void DisplayHint(string message)
+	{
+		if (message)
+		{
+			m_HintWidgetRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_hint.layout");
+			m_HintWidgetBackground = ImageWidget.Cast(m_HintWidgetRoot.FindAnyWidget("Background"));
+			m_HintWidget = RichTextWidget.Cast(m_HintWidgetRoot.FindAnyWidget("HintText"));
+			
+			m_HintWidgetRoot.Show(true);
+			m_HintWidget.SetText(message);
+			
+			int offsetX = 0;
+			int offsetY = 10;
+			
+			int screenW, screenH;
+			GetScreenSize(screenW, screenH);
+	
+			int mouseX, mouseY;
+			GetMousePos(mouseX,mouseY);
+			
+			float relativeX = mouseX / screenW;
+			float relativeY = mouseY / screenH;
+
+			int width, height;
+			m_HintWidget.GetTextSize(width, height);
+			if (relativeX > 0.8)
+				offsetX = -width - offsetX;
+			if (relativeY > 0.8)
+				offsetY = -height - offsetY;
+			
+			m_HintWidgetRoot.SetPos(mouseX + offsetX ,mouseY + offsetY);
+			m_HintWidgetBackground.SetScreenSize(width + 5, height + 5);
+			
+		}
+	}
+	
+	protected void HideHint()
+	{
+		if (m_HintWidgetRoot)
+			m_HintWidgetRoot.Show(false);
+	}
+	
+	
+	protected string GetMessage()
+	{
+		return HintMessage;
+	}
+	
+	protected void HoverSuccess()
+	{
+		m_HoverSuccessTriggered = true;
+		DisplayHint(GetMessage());
+	}
+	
+	protected void HoverInterrupt()
+	{
+		m_Timer = null;
+		m_HoverSuccessTriggered = false;
+		m_CurrentHoverWidget = null;
+		m_HoverTime = 0;
+		HideHint();
+	}
+}
+
+
+class JsonHintsData
+{
+	ref map<int, string> WidgetHintBindings;
+}
+
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleAddPosition.c b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleAddPosition.c
new file mode 100644
index 0000000000000000000000000000000000000000..21440a4538fc9d7f2035ac8c3ceaff9ae930c343
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleAddPosition.c
@@ -0,0 +1,68 @@
+class ScriptConsoleAddLocation extends UIScriptedMenu
+{
+	void ScriptConsoleAddLocation()
+	{
+
+	}
+
+	void ~ScriptConsoleAddLocation()
+	{
+	}
+	
+	void SetPosition(vector pos)
+	{
+		m_EditboxPos.SetText(pos.ToString());
+	}
+
+	override Widget Init()
+	{
+		m_ConfigDebugProfile = PluginConfigDebugProfile.Cast( GetPlugin(PluginConfigDebugProfile) );
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_add_location_dialogue.layout");
+		m_EditboxName = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("LocationName") );
+		m_EditboxPos = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("Position") );
+		m_Label = TextWidget.Cast( layoutRoot.FindAnyWidget("WindowLabel") );
+		m_ClearButton = ButtonWidget.Cast( layoutRoot.FindAnyWidget("ButtonClear") );
+		m_Label.SetText("ADD NEW LOCATION");
+
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+
+		if (w.GetUserID() == IDC_OK)
+		{
+			string name = m_EditboxName.GetText();
+			ScriptConsole console = ScriptConsole.Cast(GetGame().GetUIManager().FindMenu(MENU_SCRIPTCONSOLE));
+			ScriptConsoleGeneralTab tab = ScriptConsoleGeneralTab.Cast(console.GetTabHandler(ScriptConsoleGeneralTab));
+			if (tab)
+			{
+				if (!tab.IsLocationNameAvailable(name) || name == "" || m_EditboxPos.GetText() == "")
+					return false;
+				m_ConfigDebugProfile.CustomLocationsAdd(name, m_EditboxPos.GetText().BeautifiedToVector());
+				Close();
+				tab.RefreshLocations();
+				return true;
+			}
+		}
+		else if (w.GetUserID() == IDC_CANCEL)
+		{
+			Close();
+			return true;
+		}
+		else if (w == m_ClearButton)
+		{
+			m_EditboxPos.SetText("");
+			return true;
+		}
+
+		return false;
+	}
+	PluginConfigDebugProfile m_ConfigDebugProfile;
+	EditBoxWidget m_EditboxName;
+	EditBoxWidget m_EditboxPos;
+	TextWidget m_Label;
+	TextWidget m_Message;
+	ButtonWidget m_ClearButton;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleNewPresetDialog.c b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleNewPresetDialog.c
new file mode 100644
index 0000000000000000000000000000000000000000..ded633f407194c599c6c39b73749bf7c1b0df1fb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleNewPresetDialog.c
@@ -0,0 +1,54 @@
+class ScriptConsoleNewPresetDialog extends UIScriptedMenu
+{
+	void ScriptConsoleNewPresetDialog()
+	{
+
+	}
+
+	void ~ScriptConsoleNewPresetDialog()
+	{
+	}
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_dialog_preset.layout");
+		m_Editbox = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("PrimaryEditBox") );
+		m_Label = TextWidget.Cast( layoutRoot.FindAnyWidget("WindowLabel") );
+		m_Label.SetText("NEW PRESET");
+
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+
+		if (w.GetUserID() == IDC_OK)
+		{
+			UIScriptedMenu ui_menu = GetGame().GetUIManager().FindMenu(MENU_SCRIPTCONSOLE);
+			if ( ui_menu != NULL && m_Editbox.GetText() )
+			{
+				ScriptConsole scripted_console = ScriptConsole.Cast( ui_menu );
+				//scripted_console.NewPreset( m_Editbox.GetText());
+				
+				ScriptConsoleItemsTab tab = ScriptConsoleItemsTab.Cast(scripted_console.GetTabHandler(ScriptConsoleItemsTab));
+				if (tab)
+					tab.NewPreset( m_Editbox.GetText());
+			}
+
+			Close();
+			return true;
+		}
+		else if (w.GetUserID() == IDC_CANCEL)
+		{
+			Close();
+			return true;
+		}
+
+		return false;
+	}
+	
+	EditBoxWidget m_Editbox;
+	TextWidget m_Label;
+	TextWidget m_Message;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleRenamePresetDialog.c b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleRenamePresetDialog.c
new file mode 100644
index 0000000000000000000000000000000000000000..2e8fb7db8b0346dea09f99a31231120cb653bbf1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleRenamePresetDialog.c
@@ -0,0 +1,68 @@
+class ScriptConsoleRenamePresetDialog extends UIScriptedMenu
+{
+	void ScriptConsoleRenamePresetDialog()
+	{
+
+	}
+
+	void ~ScriptConsoleRenamePresetDialog()
+	{
+	}
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_dialog_preset.layout");
+		m_Editbox = EditBoxWidget.Cast( layoutRoot.FindAnyWidget("PrimaryEditBox") );
+		m_Label = TextWidget.Cast( layoutRoot.FindAnyWidget("WindowLabel") );
+		m_Message = TextWidget.Cast( layoutRoot.FindAnyWidget("MessageText") );
+
+		MissionBase mission = MissionBase.Cast( GetGame().GetMission() );
+
+		UIScriptedMenu ui_menu = GetGame().GetUIManager().FindMenu(MENU_SCRIPTCONSOLE);
+		if ( ui_menu != NULL )
+		{
+			ScriptConsole scripted_console = ScriptConsole.Cast( ui_menu );
+			ScriptConsoleItemsTab tab = ScriptConsoleItemsTab.Cast(scripted_console.GetTabHandler(ScriptConsoleItemsTab));
+			if (tab)
+			{
+				m_Editbox.SetText( tab.GetCurrentPresetName() );
+				m_Label.SetText("RENAME PRESET");
+				m_Message.SetText( tab.GetCurrentPresetName() );
+			}
+		}
+
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+
+		if (w.GetUserID() == IDC_OK)
+		{
+			UIScriptedMenu ui_menu = GetGame().GetUIManager().FindMenu(MENU_SCRIPTCONSOLE);
+			if ( ui_menu != NULL )
+			{
+				ScriptConsole scripted_console = ScriptConsole.Cast( ui_menu );
+				ScriptConsoleItemsTab tab = ScriptConsoleItemsTab.Cast(scripted_console.GetTabHandler(ScriptConsoleItemsTab));
+				if (tab)
+				{
+					tab.RenamePreset( m_Editbox.GetText() );
+					Close();
+					return true;
+				}
+			}
+		}
+		else if (w.GetUserID() == IDC_CANCEL)
+		{
+			Close();
+			return true;
+		}
+
+		return false;
+	}
+	
+	EditBoxWidget m_Editbox;
+	TextWidget m_Label;
+	TextWidget m_Message;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleUniversalInfoDialog.c b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleUniversalInfoDialog.c
new file mode 100644
index 0000000000000000000000000000000000000000..2275c550752980d1bbf5afd020cba8d75721c1c2
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsole/ScriptConsoleUniversalInfoDialog.c
@@ -0,0 +1,67 @@
+class ScriptConsoleUniversalInfoDialog extends UIScriptedMenu
+{
+	private const int EDITBOX_TEXT_SIZE = 16;
+	
+	private TextWidget m_Label;
+	private ScrollWidget m_ContentScroll;
+	private MultilineEditBoxWidget m_Content;
+	private ButtonWidget m_OKButton;
+	
+	void ScriptConsoleUniversalInfoDialog();
+	void ~ScriptConsoleUniversalInfoDialog();
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/script_console_universal_info_dialog.layout");
+		m_Label = TextWidget.Cast(layoutRoot.FindAnyWidget("Label"));
+		m_ContentScroll = ScrollWidget.Cast(layoutRoot.FindAnyWidget("ContentScroll"));
+		m_ContentScroll.VScrollToPos(0);
+		m_Content = MultilineEditBoxWidget.Cast(layoutRoot.FindAnyWidget("Content"));
+		m_OKButton = ButtonWidget.Cast(layoutRoot.FindAnyWidget("MessageText"));
+
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w.GetUserID() == IDC_OK)
+		{
+			UIScriptedMenu consoleMenu = GetGame().GetUIManager().FindMenu(MENU_SCRIPTCONSOLE);
+			if (consoleMenu != null)
+			{
+				ScriptConsole scriptedConsole = ScriptConsole.Cast(consoleMenu);
+				ScriptConsoleItemsTab tab = ScriptConsoleItemsTab.Cast(scriptedConsole.GetTabHandler(ScriptConsoleItemsTab));
+				if (tab)
+				{
+					Close();
+					return true;
+				}
+			}
+		}
+
+		return false;
+	}
+	
+	void SetLabel(string label)
+	{
+		m_Label.SetText(label);
+	}
+	
+	void SetContent(string content)
+	{
+		m_Content.SetText(content);
+		m_Content.Update();
+		float contentSizeX, contentSizeY = 0;
+		m_Content.GetSize(contentSizeX, contentSizeY);
+		m_Content.SetSize(contentSizeX, EDITBOX_TEXT_SIZE * m_Content.GetLinesCount());
+		float y_c = m_ContentScroll.GetContentHeight();
+		float x, y;
+		m_Content.GetScreenSize(x, y);
+		if (y > y_c)
+		{
+			m_ContentScroll.SetAlpha(1);
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleConfigTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleConfigTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..15f8cb38aac5f5785321295d75e2df7710e5a8bb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleConfigTab.c
@@ -0,0 +1,513 @@
+typedef Param5<bool, string, int, string, int> ConfigParams; // param1 - isCollapsed, param2 - string name, param3 - num of childs, param4 - path, param5 - deep
+typedef Param6<bool, string, int, string, int, string> ConfigParamsEx; // param1 - isCollapsed, param2 - string name, param3 - num of childs, param4 - path, param5 - deep
+
+class ScriptConsoleConfigTab : ScriptConsoleTabBase
+{
+	
+	protected static string 						m_ConfigTextField;
+	protected static string 						m_VariableTextField;
+	protected static ref ConfigParamsEx 			m_ConfigData;
+	protected ref TStringArray 						m_BaseConfigClasses = new TStringArray;
+	protected ref TStringArray 						m_BaseConfigClassesToggled = new TStringArray;
+	protected ref map<CheckBoxWidget, int>			m_ClassCheckboxes = new map<CheckBoxWidget, int>;
+
+	protected EditBoxWidget 		m_ObjectConfigFilter;
+	protected EditBoxWidget 		m_VariableConfigFilter;
+	protected TextListboxWidget 	m_ConfigHierarchyTextListbox;
+	protected TextListboxWidget 	m_ConfigVariablesTextListbox;
+	protected ButtonWidget 			m_SelectedRowCopy;
+	protected ButtonWidget 			m_DumpParamButton;
+	protected TextWidget 			m_ClassPath;
+	
+	
+	protected Widget 				m_WgtClassesConfig;
+	protected PluginConfigViewer 	m_ModuleConfigViewer;
+	protected int					m_Row;
+	
+	void ScriptConsoleConfigTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_WgtClassesConfig 				= root.FindAnyWidget("ClassesPanel");
+		m_DumpParamButton				= ButtonWidget.Cast(root.FindAnyWidget("DumpParamButton"));
+		m_ObjectConfigFilter 			= EditBoxWidget.Cast(root.FindAnyWidget("ObjectConfigFilter"));
+		m_VariableConfigFilter 			= EditBoxWidget.Cast(root.FindAnyWidget("VariableConfigFilter"));
+		m_ConfigHierarchyTextListbox 	= TextListboxWidget.Cast(root.FindAnyWidget("ConfigHierarchy"));
+		m_ConfigVariablesTextListbox 	= TextListboxWidget.Cast(root.FindAnyWidget("ConfigVariables"));
+		m_SelectedRowCopy 				= ButtonWidget.Cast(root.FindAnyWidget("SelectedRowCopy"));
+		m_ClassPath 					= TextWidget.Cast(root.FindAnyWidget("ClassPath"));
+		
+		if (m_ConfigTextField)
+			m_ObjectConfigFilter.SetText(m_ConfigTextField);
+		if (m_VariableTextField)
+			m_VariableConfigFilter.SetText(m_VariableTextField);
+		Init();
+	}
+	
+	void ~ScriptConsoleConfigTab()
+	{
+		m_VariableTextField = m_VariableConfigFilter.GetText();
+		
+		foreach (int i:m_ClassCheckboxes)
+		{
+			Widget w = m_ClassCheckboxes.GetKeyByValue(i);
+			w.GetParent().Unlink();
+		}
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		if (w == m_ObjectConfigFilter)
+		{
+			ChangeConfigFilter();
+			return true;
+		}
+		else if (w == m_VariableConfigFilter)
+		{
+			RenderVariables(m_Row);
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn)
+	{
+		super.OnItemSelected(w, x, y, row, column, oldRow, oldColumn);
+		
+		if (w == m_ConfigHierarchyTextListbox)
+		{
+			TextListboxWidget wgt = TextListboxWidget.Cast(w);
+			wgt.GetItemData(row, 0,m_ConfigData);
+			RenderClassPath();
+			
+			return true;
+		}
+		return false;
+	}
+	
+	void RenderClassPath()
+	{
+		m_ClassPath.SetText(m_ModuleConfigViewer.GetBaseClasses(m_ConfigData.param4, m_ConfigData.param2));
+	}
+	
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w,x,y,button);
+		
+		CheckBoxWidget cbw = CheckBoxWidget.Cast(w);
+		
+		if (w == m_DumpParamButton)
+		{
+			int selectedRowIndex = m_ConfigVariablesTextListbox.GetSelectedRow();
+			string paramFinal;
+			if (selectedRowIndex > -1)
+			{
+				string param;
+				m_ConfigVariablesTextListbox.GetItemText(selectedRowIndex,0,param);
+				int index = param.IndexOf("=");
+				if (index > 0)
+					paramFinal = param.Substring(0, index).Trim();
+			}
+			
+			int objects_row_index;
+			objects_row_index = m_ConfigHierarchyTextListbox.GetSelectedRow();
+			if (objects_row_index > -1 && objects_row_index < m_ConfigHierarchyTextListbox.GetNumItems())
+			{
+				ConfigParamsEx params;
+				m_ConfigHierarchyTextListbox.GetItemData(objects_row_index, 0, params);
+				string path = params.param4;
+				TStringArray pathArr = new TStringArray();
+				path.Split(" ", pathArr);
+				string relativePath;
+				
+				foreach (int indx, string s:pathArr)
+				{
+					if (indx > 2)
+					{
+						relativePath+= s+" ";
+					}
+				}
+				
+				if (relativePath)
+					relativePath = relativePath.Trim();
+				
+				Print(relativePath);
+				Print(path);
+			}
+			
+			if (paramFinal)
+				DumpParam(paramFinal,relativePath);
+			
+			return true;
+		}
+		else if (w == m_ConfigHierarchyTextListbox)
+		{
+			objects_row_index = m_ConfigHierarchyTextListbox.GetSelectedRow();
+			//Print(objects_row_index);
+
+			if (objects_row_index > -1 && objects_row_index < m_ConfigHierarchyTextListbox.GetNumItems())
+			{
+				ConfigParamsEx config_params;
+				m_ConfigHierarchyTextListbox.GetItemData(objects_row_index, 0, config_params);
+
+				if (config_params.param1 == false)
+				{
+					ExpandHierarchy(objects_row_index);
+				}
+				else
+				{
+					CollapseHierarchy(objects_row_index);
+				}
+				
+				RenderVariables(objects_row_index);
+				m_Row = objects_row_index; 
+			}
+			return true;
+		}
+		else if (cbw && m_ClassCheckboxes.Contains(cbw))
+		{
+			int checkbox_index = m_ClassCheckboxes.Get(cbw);
+			string base_class_name = m_BaseConfigClasses.Get(checkbox_index);
+			
+			int index_toggled = m_BaseConfigClassesToggled.Find(base_class_name);
+			
+			int flag, new_flag;
+			
+			if (m_ConfigDebugProfile)
+			{
+				flag = m_ConfigDebugProfile.GetConfigClassesFlag();
+			}
+			
+			if (cbw.IsChecked())
+			{
+				if (index_toggled == -1)//not found
+				{
+					m_BaseConfigClassesToggled.Insert(base_class_name);
+					
+					if (m_ConfigDebugProfile)
+					{
+						new_flag = (flag | (int)Math.Pow(2, checkbox_index));
+					}
+				}
+			}
+			else if (index_toggled != -1)
+			{
+				m_BaseConfigClassesToggled.Remove(index_toggled);
+				
+				if (m_ConfigDebugProfile)
+				{
+					new_flag = (flag ^ (int)Math.Pow(2, checkbox_index));
+				}
+			}
+			m_ConfigDebugProfile.SetConfigClassesFlag(new_flag);
+			/*
+			Print("-----------------------------------------");
+			Print("flag = " + new_flag);
+			foreach (string text:m_BaseConfigClassesToggled)
+			{
+				Print(text);
+			}
+			Print("-----------------------------------------");
+			*/
+			ClearHierarchy();
+		}
+		else if (w == m_SelectedRowCopy)
+		{
+			AddItemToClipboard(m_ConfigVariablesTextListbox);
+			return true;
+		}
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+	}
+	
+	protected void Init()
+	{
+		Debug.GetBaseConfigClasses(m_BaseConfigClasses);
+		m_ModuleConfigViewer		= PluginConfigViewer.Cast(GetPlugin(PluginConfigViewer));
+		int flag1;
+		
+		if (m_ConfigDebugProfile)
+		{
+			flag1 = m_ConfigDebugProfile.GetConfigClassesFlag();
+		}
+		//Print("------------------------------------------------");
+		foreach (string s:m_BaseConfigClasses) 
+		{
+			Widget w = GetGame().GetWorkspace().CreateWidgets("gui/layouts/script_console/config_class_item.layout", m_WgtClassesConfig);
+			CheckBoxWidget cbw = CheckBoxWidget.Cast(w.FindAnyWidget("Item"));
+			//cbw.SetColor(Colors.RED);
+			cbw.SetText(s);
+			int indx = m_ClassCheckboxes.Count();
+			m_ClassCheckboxes.Insert(cbw,indx);
+			//Print("adding "+cbw +" at index:" + indx);
+				
+			if (flag1 & (int)Math.Pow(2, indx))
+			{
+				string base_class_name = m_BaseConfigClasses.Get(indx);
+				m_BaseConfigClassesToggled.Insert(base_class_name);
+				cbw.SetChecked(true);
+			}
+		}
+		
+		ClearHierarchy();
+		ChangeConfigFilter();
+	}
+	
+	protected void DumpParam(string param, string relativePath)
+	{
+		if (relativePath)
+		{
+			relativePath = " " + relativePath;
+		}
+		for ( int i = 0; i < m_BaseConfigClassesToggled.Count(); i++ )
+		{
+			string config_path = m_BaseConfigClassesToggled.Get(i);
+		
+			int objects_count = GetGame().ConfigGetChildrenCount( config_path );
+			
+			for ( int j = 0; j < objects_count; j++ )
+			{
+				string child_name;
+				GetGame().ConfigGetChildName( config_path, j, child_name );
+		
+				
+				//string dispName; 
+						//GetGame().ConfigGetText( config_path + " " + child_name + " displayName",dispName );
+				string value; 
+				string path = config_path + " " + child_name + relativePath + " " + param;
+				if (GetGame().ConfigIsExisting(path))
+				{
+					GetGame().ConfigGetText( path , value);
+					if (value)
+						Print(child_name + "," + param + "," + value);
+				}
+				
+				
+				/*
+				int scope = GetGame().ConfigGetInt( config_path + " " + child_name + " scope" );
+				{
+					if ( scope == 2)
+					{
+						
+					}
+				}*/
+			}
+		}
+	}
+	
+	protected void ChangeConfigFilter()
+	{
+		m_ConfigTextField = m_ObjectConfigFilter.GetText();
+		
+		if (m_ConfigTextField == "")
+		{
+			ClearHierarchy();
+		}
+		else
+		{
+			FindInHierarchy(m_ConfigTextField);
+		}
+	}
+	
+	protected void ClearHierarchy()
+	{
+		m_ConfigHierarchyTextListbox.ClearItems();
+		m_ConfigVariablesTextListbox.ClearItems();
+
+		string config_path = "configfile";
+		TStringArray variables = m_ModuleConfigViewer.GetConfigHierarchy(config_path);
+		for (int i = 0; i < variables.Count(); i++)
+		{
+			string variable = variables.Get(i);
+
+			for (int j = 0; j < m_BaseConfigClassesToggled.Count(); j++)
+			{
+				if (variable == m_BaseConfigClassesToggled.Get(j))
+				{
+					string new_config_path = (config_path + " " + variable).Trim();
+					m_ConfigHierarchyTextListbox.AddItem("+ " + variable, new ConfigParamsEx(false, variable, 0, new_config_path, 0,variable), 0);
+				}
+			}
+		}
+	}
+
+	protected void FindInHierarchy(string class_name)
+	{
+		m_ConfigHierarchyTextListbox.ClearItems();
+		m_ConfigVariablesTextListbox.ClearItems();
+
+		class_name.ToLower();
+		string config_base_path = "configfile";
+
+		string filter_lower = class_name;
+		filter_lower.ToLower();
+
+		TStringArray filters = new TStringArray;
+		filter_lower.Split(" ", filters);
+
+		for (int i = 0; i < m_BaseConfigClassesToggled.Count(); i++)
+		{
+			string config_root = m_BaseConfigClassesToggled.Get(i);
+			string config_path = config_base_path + " " + config_root;
+			TStringArray variables = m_ModuleConfigViewer.GetConfigHierarchy(config_path);
+
+			for (int j = 0; j < variables.Count(); j++)
+			{
+				string variable = variables.Get(j);
+				string variable_lower = variable;
+				variable_lower.ToLower();
+
+				for (int k = 0; k < filters.Count(); k++)
+				{
+					if (variable_lower.Contains(filters.Get(k)))
+					{
+						string new_config_path = (config_path + " " + variable).Trim();
+						m_ConfigHierarchyTextListbox.AddItem("+ " + variable, new ConfigParamsEx(false, variable, 0, new_config_path, 0, config_root), 0);
+						break;
+					}
+				}
+			}
+		}
+	}
+	
+	protected void ExpandHierarchy(int row)
+	{
+		if (row <= -1 && row >= m_ConfigHierarchyTextListbox.GetNumItems())
+		{
+			return;
+		}
+		
+		TStringArray variables;
+
+		// get current row data
+		ConfigParamsEx config_params;
+		m_ConfigHierarchyTextListbox.GetItemData(row, 0, config_params);
+
+		string config_path = config_params.param4;
+		int deep = config_params.param5;
+		
+
+		string offset = "";
+		for (int i = 0; i < deep; i++)
+		{
+			offset = offset + "  ";
+		}
+
+		// change selected node
+		variables = m_ModuleConfigViewer.GetConfigHierarchy(config_path);
+		int childrens_count = variables.Count();
+		m_ConfigHierarchyTextListbox.SetItem(row, offset + "- " + config_params.param2, new ConfigParamsEx(true, config_params.param2, childrens_count, config_path, deep,config_params.param6), 0);
+
+		offset = offset + "  ";
+
+		// render children
+		deep = deep + 1;
+		childrens_count = 0;
+		for (i = variables.Count() - 1; i >= 0; i--)
+		{
+			string new_config_path = (config_path + " " + variables.Get(i)).Trim();
+			m_ConfigHierarchyTextListbox.AddItem(offset + "+ " + variables.Get(i), new ConfigParamsEx(false, variables.Get(i), childrens_count, new_config_path, deep,config_params.param2), 0, (row + 1));
+		}
+	}
+
+	// niekde je bug, ked su len 2 polozky a expand/collapse na prvu tak zmaze aj druhu. ak collapse a expand na druhu tak crash lebo sa snazi zmazat riadok co neexistuje
+	protected void CollapseHierarchy(int row)
+	{
+		if (row <= -1 && row >= m_ConfigHierarchyTextListbox.GetNumItems())
+		{
+			return;
+		}
+		
+		ConfigParamsEx config_params;
+		ConfigParamsEx config_params_next;
+		m_ConfigHierarchyTextListbox.GetItemData(row, 0, config_params);
+		m_ConfigHierarchyTextListbox.GetItemData(row + 1, 0, config_params_next);
+
+		if (!config_params || !config_params_next)
+			return;
+		int deep = config_params.param5;
+		int deep_next = config_params_next.param5;
+		int max_count = m_ConfigHierarchyTextListbox.GetNumItems();
+		int remove_lines_count = 0;
+		// Print(max_count);
+		for (int i = row + 1; i < max_count; i++)
+		{
+			if (deep < deep_next && i <= max_count)
+			{
+				remove_lines_count = remove_lines_count + 1;
+				m_ConfigHierarchyTextListbox.GetItemData(i, 0, config_params_next);
+				deep_next = config_params_next.param5;
+			}
+		}
+
+		// remove remove_lines_count lines from row
+		// remove_lines_count = remove_lines_count - 1;
+		for (i = 1; i < remove_lines_count; i++)
+		{
+			int x = row + 1;
+			if (x < max_count)
+			{
+				m_ConfigHierarchyTextListbox.RemoveRow(x);
+			}
+		}
+
+		string offset = "";
+		for (i = 0; i < deep; i++)
+		{
+			offset = offset + "  ";
+		}
+		m_ConfigHierarchyTextListbox.SetItem(row, offset + "+ " + config_params.param2, new ConfigParamsEx(false, config_params.param2, 0, config_params.param4, deep,""), 0);
+		/* //not sure why this is here, but it's causing issues when collapsing items in config viewer, disabling for now
+		if (deep == 0)
+		{
+			ClearHierarchy();
+		}
+		*/
+	}
+	
+	protected void RenderVariables(int row)
+	{
+		if (row > -1 && row < m_ConfigHierarchyTextListbox.GetNumItems())
+		{
+			string filter_lower = m_VariableConfigFilter.GetText();
+			filter_lower.ToLower();
+			
+			TStringArray filters = new TStringArray();
+			filter_lower.Split(" ", filters);
+			
+			ConfigParamsEx config_params;
+			
+			m_ConfigHierarchyTextListbox.GetItemData(row, 0, config_params);
+			m_ConfigVariablesTextListbox.ClearItems();
+			TStringArray variables;
+			string path = config_params.param4;
+			variables = m_ModuleConfigViewer.GetConfigVariables(path);
+
+			for (int i = 0; i < variables.Count(); i++)
+			{
+				string var = variables.Get(i);
+				
+				if (filters.Count() == 0)
+				{
+					m_ConfigVariablesTextListbox.AddItem(var, NULL, 0);
+				}
+				else
+				{
+					foreach (string f: filters)
+					{
+						var.ToLower();
+						if (var.Contains(f))
+							m_ConfigVariablesTextListbox.AddItem(var, NULL, 0);
+					}
+				}
+			}
+		}
+	}
+	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleEnfScriptTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleEnfScriptTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..eae9a9f635a30e6f6bb8a3dc810bda4ba2318765
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleEnfScriptTab.c
@@ -0,0 +1,324 @@
+class ScriptConsoleEnfScriptTab : ScriptConsoleTabBase
+{
+	protected static ScriptConsoleEnfScriptTab 	m_Instance;
+	protected int 								m_EnscriptHistoryRow;
+	protected int 								m_EnscriptHistoryRowServer;
+	protected ref TStringArray					m_EnscriptConsoleHistory;
+	protected ref TStringArray					m_EnscriptConsoleHistoryServer;
+	protected PluginLocalEnscriptHistory		m_ModuleLocalEnscriptHistory;
+	protected PluginLocalEnscriptHistoryServer	m_ModuleLocalEnscriptHistoryServer;
+	protected MultilineEditBoxWidget 			m_EnfScriptEdit;
+	protected ButtonWidget 						m_EnfScriptRun;
+	protected ButtonWidget 						m_EnfScriptClear;
+	protected TextListboxWidget 				m_ScriptOutputListbox;
+	protected bool 								m_AllowScriptOutput;
+	protected int 								m_RunColor;
+	
+	static ref TStringArray 					m_ScriptOutputHistory = new TStringArray();
+	
+	void ScriptConsoleEnfScriptTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_Instance 							= this;
+		m_ModuleLocalEnscriptHistory 		= PluginLocalEnscriptHistory.Cast(GetPlugin(PluginLocalEnscriptHistory));
+		m_ModuleLocalEnscriptHistoryServer 	= PluginLocalEnscriptHistoryServer.Cast(GetPlugin(PluginLocalEnscriptHistoryServer));
+		m_EnscriptConsoleHistory 			= m_ModuleLocalEnscriptHistory.GetAllLines();
+		m_EnscriptConsoleHistoryServer 		= m_ModuleLocalEnscriptHistoryServer.GetAllLines();
+		m_EnfScriptEdit						= MultilineEditBoxWidget.Cast(root.FindAnyWidget("MultilineEditBoxWidget0"));
+		m_EnfScriptRun						= ButtonWidget.Cast(root.FindAnyWidget("RunButton"));
+		m_EnfScriptClear					= ButtonWidget.Cast(root.FindAnyWidget("ClearButton"));
+		m_ScriptOutputListbox 				= TextListboxWidget.Cast(root.FindAnyWidget("ScriptOutputListbox"));
+		m_RunColor 							= m_EnfScriptRun.GetColor();
+	}
+
+	void ~ScriptConsoleEnfScriptTab()
+	{
+		m_Instance = null;
+	}
+	
+	override void OnSelected()
+	{
+		int index = m_EnscriptConsoleHistory.Count() - m_EnscriptHistoryRow - 1;
+		if (m_EnscriptConsoleHistory.IsValidIndex(index))
+		{
+			string text = m_EnscriptConsoleHistory.Get(index);
+			m_EnfScriptEdit.SetText(text);
+		}
+		ReloadScriptOutput();
+	}
+
+	static void PrintS(string message)
+	{
+		Print(message);
+		if (m_Instance)
+			m_Instance.Add(message);
+	}
+	
+	static void PrintS(bool message)
+	{
+		PrintS(message.ToString());
+	}
+	
+	static void PrintS(int message)
+	{
+		PrintS(message.ToString());
+	}
+	
+	static void PrintS(float message)
+	{
+		PrintS(message.ToString());
+	}
+	
+	static void PrintS(vector message)
+	{
+		PrintS(message.ToString());
+	}
+	
+	static void PrintS(Object message)
+	{
+		PrintS(message.ToString());
+	}
+
+	
+	void Add(string message, bool isReload = false)
+	{
+		if (message != string.Empty)
+		{
+			if (m_AllowScriptOutput && m_ScriptOutputListbox)
+			{
+				if (!isReload)
+					m_ScriptOutputHistory.Insert(message);
+				m_ScriptOutputListbox.AddItem(String(message), NULL, 0);
+				m_ScriptOutputListbox.EnsureVisible(m_ScriptOutputListbox.GetNumItems());
+			}
+		}
+	}
+	
+	protected void Clear(bool clearFile = false)
+	{
+		if(clearFile)
+			Debug.ClearLogs();
+		m_ScriptOutputListbox.ClearItems();
+	}
+	
+	
+	
+	protected void ReloadScriptOutput()
+	{
+		m_ScriptOutputListbox.ClearItems();
+		m_AllowScriptOutput = true;
+		foreach ( string s: m_ScriptOutputHistory)
+		{
+			Add(s, true);
+		}
+		m_AllowScriptOutput = false;
+	}
+	
+	void HistoryBack()
+	{
+
+		EnscriptHistoryBack();
+	}
+
+	void HistoryForward()
+	{
+		EnscriptHistoryForward();
+	}
+	
+	protected void RunEnscript()
+	{
+		#ifdef DEVELOPER
+		string code;
+		m_EnfScriptEdit.GetText(code);
+		string codeNoReplace = code;
+		_player = PlayerBase.Cast(GetGame().GetPlayer());
+		m_AllowScriptOutput = true;
+		code.Replace("Print(","ScriptConsoleEnfScriptTab.PrintS(");
+		code.Replace("Print (","ScriptConsoleEnfScriptTab.PrintS(");
+		bool success = GetGame().ExecuteEnforceScript("void scConsMain() \n{\n" + code + "\n}\n", "scConsMain");
+		m_AllowScriptOutput = false;
+		ColorRunButton(success);
+		
+		m_EnscriptConsoleHistory.Insert(codeNoReplace);
+		m_ModuleLocalEnscriptHistory.AddNewLine(codeNoReplace);
+		#endif
+	}
+	
+	protected void ColorRunButton(bool success)
+	{
+		if (success)
+		{
+			m_EnfScriptRun.SetColor(ARGB(255,0,255,0));
+		}
+		else
+		{
+			m_EnfScriptRun.SetColor(ARGB(255,255,0,0));
+		}
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(ResetRunButtonColor,600);
+	}
+	
+	protected void ResetRunButtonColor()
+	{
+		m_EnfScriptRun.SetColor(m_RunColor);
+	}
+	
+	protected void RunEnscriptServer()
+	{
+		string code;
+		m_EnfScriptEdit.GetText(code);
+		m_EnscriptConsoleHistoryServer.Insert(code);
+		m_ModuleLocalEnscriptHistoryServer.AddNewLine(code);
+		CachedObjectsParams.PARAM1_STRING.param1 = code;
+		GetGame().RPCSingleParam(GetGame().GetPlayer(), ERPCs.DEV_RPC_SERVER_SCRIPT, CachedObjectsParams.PARAM1_STRING, true, GetGame().GetPlayer().GetIdentity());
+	}
+	
+	protected void EnscriptHistoryBack()
+	{
+		int history_index;
+		if (m_EnfScriptEdit)
+		{
+			m_EnscriptHistoryRow++;
+			history_index = m_EnscriptConsoleHistory.Count() - m_EnscriptHistoryRow - 1;
+			if (history_index > -1)
+			{
+				m_EnfScriptEdit.SetText(m_EnscriptConsoleHistory.Get(history_index));
+			}
+			else m_EnscriptHistoryRow--;
+		}
+	}
+
+	
+	protected void EnscriptHistoryForward()
+	{
+		if (m_EnfScriptEdit)
+		{
+			int history_index;
+			m_EnscriptHistoryRow--;
+			history_index = m_EnscriptConsoleHistory.Count() - m_EnscriptHistoryRow - 1;
+			if (history_index < m_EnscriptConsoleHistory.Count())
+			{
+				m_EnfScriptEdit.SetText(m_EnscriptConsoleHistory.Get(history_index));
+			}
+			else m_EnscriptHistoryRow++;
+		}
+	}
+	
+	override void OnRPCEx(int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPCEx(rpc_type, ctx);
+		#ifdef DIAG_DEVELOPER
+		switch (rpc_type)
+		{
+			case ERPCs.DEV_RPC_SERVER_SCRIPT_RESULT:
+			{
+				if (ctx.Read(CachedObjectsParams.PARAM1_BOOL))
+				{
+					ColorRunButton(CachedObjectsParams.PARAM1_BOOL.param1);
+				}
+				break;
+			}
+		}
+		#endif
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w,x,y,button);
+		if (w == m_EnfScriptRun)
+		{
+			RunEnscript();
+			return true;
+		}
+		else if (w == m_EnfScriptClear)
+		{
+			m_ScriptOutputListbox.ClearItems();
+			m_ScriptOutputHistory.Clear();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		return false;
+	}
+
+	
+	override void Show(bool show, ScriptConsoleTabBase selectedHandler)
+	{
+		if (!show && (selectedHandler.Type() == ScriptConsoleEnfScriptTab || selectedHandler.Type() == ScriptConsoleEnfScriptServerTab))
+		{
+			//do nothing
+		}
+		else
+		{
+			m_Root.Show(show);
+			m_Root.Enable(show);
+		}
+	}
+		
+}
+
+class ScriptConsoleEnfScriptServerTab : ScriptConsoleEnfScriptTab
+{
+	override void OnSelected()
+	{
+		int index = m_EnscriptConsoleHistoryServer.Count() - m_EnscriptHistoryRowServer - 1;
+		if (m_EnscriptConsoleHistoryServer.IsValidIndex(index))
+		{
+			string text = m_EnscriptConsoleHistoryServer.Get(index);
+			m_EnfScriptEdit.SetText(text);
+		}
+		ReloadScriptOutput();
+	}
+
+	override protected void EnscriptHistoryBack()
+	{
+		int history_index;
+		if (m_EnfScriptEdit)
+		{
+			m_EnscriptHistoryRowServer++;
+			history_index = m_EnscriptConsoleHistoryServer.Count() - m_EnscriptHistoryRowServer - 1;
+			if (history_index > -1)
+			{
+				m_EnfScriptEdit.SetText(m_EnscriptConsoleHistoryServer.Get(history_index));
+			}
+			else m_EnscriptHistoryRowServer--;
+		}
+	}
+
+	override protected void EnscriptHistoryForward()
+	{
+		if (m_EnfScriptEdit)
+		{
+			int history_index;
+
+			m_EnscriptHistoryRowServer--;
+			history_index = m_EnscriptConsoleHistoryServer.Count() - m_EnscriptHistoryRowServer - 1;
+			if (history_index < m_EnscriptConsoleHistoryServer.Count())
+			{
+				m_EnfScriptEdit.SetText(m_EnscriptConsoleHistoryServer.Get(history_index));
+			}
+			else m_EnscriptHistoryRowServer++;
+		}
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_EnfScriptRun)
+		{
+			RunEnscriptServer();
+			return true;
+		}
+		else if (w == m_EnfScriptClear)
+		{
+			m_ScriptOutputListbox.ClearItems();
+			m_ScriptOutputHistory.Clear();
+			return true;
+		}
+		
+		return false;
+	}
+	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleGeneralTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleGeneralTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..e7b8b9f7930ad4d10aad4f774d49409b4c01f1a8
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleGeneralTab.c
@@ -0,0 +1,747 @@
+class ScriptConsoleGeneralTab : ScriptConsoleTabBase
+{
+	static int 		m_ObjectsScope = 2;
+	
+	protected static float 	DEBUG_MAP_ZOOM = 1;
+	protected static bool 	SHOW_OTHERS = 0;
+	
+	protected const string  	DEFAULT_POS_XYZ = "<1,2,3>";
+	protected vector 			m_MapPos;
+	protected bool 				m_PlayerPosRefreshBlocked;
+
+	protected ref array<ref RemotePlayerStatDebug> m_PlayerDebugStats = new array<ref RemotePlayerStatDebug>;
+
+	protected MissionGameplay		m_MissionGameplay;
+	protected PluginDeveloper 		m_Developer;
+
+	protected SliderWidget 			m_TimeSlider;
+	protected ref Timer 			m_LateInit = new Timer();
+	
+	protected bool 					m_UpdatePlayerPositions;
+	
+	//-------------------------------- WIDGETS ---------------------------------------
+	protected EditBoxWidget 		m_TeleportX;
+	protected EditBoxWidget 		m_TeleportY;
+	protected EditBoxWidget 		m_TeleportXYZ;
+	protected EditBoxWidget 		m_DateYear;
+	protected EditBoxWidget 		m_DateMonth;
+	protected EditBoxWidget 		m_DateDay;
+	protected EditBoxWidget 		m_DateHour;
+	protected EditBoxWidget 		m_DateMinute;
+
+	protected ButtonWidget 		m_LocationAddButton;
+	protected ButtonWidget 		m_LocationRemoveButton;
+	protected ButtonWidget 		m_TeleportButton;
+	protected ButtonWidget 		m_ButtonCopyPos;
+	protected ButtonWidget 		m_DiagDrawButton;
+	protected ButtonWidget 		m_DiagToggleButton;
+
+	protected CheckBoxWidget		m_LogsEnabled;
+	protected CheckBoxWidget		m_HudDCharStats;
+	protected CheckBoxWidget		m_HudDCharLevels;
+	protected CheckBoxWidget		m_HudDCharStomach;
+	protected CheckBoxWidget		m_HudDCharModifiers;
+	protected CheckBoxWidget		m_HudDCharAgents;
+	protected CheckBoxWidget		m_HudDCharDebug;
+	protected CheckBoxWidget		m_HudDFreeCamCross;
+	protected CheckBoxWidget		m_HudDVersion;
+	
+	protected CheckBoxWidget		m_ShowOthers;
+	
+	protected CheckBoxWidget		m_HudDTemperature;
+	protected MapWidget 			m_DebugMapWidget;
+	
+	protected TextWidget	 		m_PlayerCurPos;
+	protected TextWidget	 		m_MouseCurPos;
+	protected TextWidget	 		m_PlayerMouseDiff;
+
+	protected TextListboxWidget 	m_DiagToggleTextListbox;
+	protected TextListboxWidget	m_PositionsListbox;
+	protected TextListboxWidget 	m_DiagDrawmodeTextListbox;
+	protected TextListboxWidget 	m_HelpTextListboxWidget;
+	//-----------------------------------------------------------------------------------
+	
+	void ScriptConsoleGeneralTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_MissionGameplay			= MissionGameplay.Cast(GetGame().GetMission());
+		
+		m_DiagToggleTextListbox = TextListboxWidget.Cast(root.FindAnyWidget("DiagToggle"));
+		m_DiagToggleButton = ButtonWidget.Cast(root.FindAnyWidget("DiagToggleButton"));
+
+		m_DiagDrawmodeTextListbox = TextListboxWidget.Cast(root.FindAnyWidget("DiagDrawmode"));
+		m_DiagDrawButton = ButtonWidget.Cast(root.FindAnyWidget("DiagDrawButton"));
+
+		m_DebugMapWidget = MapWidget.Cast(root.FindAnyWidget("MapWidget"));
+		
+		m_PositionsListbox	= TextListboxWidget.Cast(root.FindAnyWidget("PositionsList"));
+		m_TeleportButton	= ButtonWidget.Cast(root.FindAnyWidget("ButtonTeleport"));
+		m_ButtonCopyPos		= ButtonWidget.Cast(root.FindAnyWidget("Button_CopyPos"));
+
+		m_TeleportX			= EditBoxWidget.Cast(root.FindAnyWidget("TeleportX"));
+		m_TeleportY			= EditBoxWidget.Cast(root.FindAnyWidget("TeleportY"));
+		m_TeleportXYZ		= EditBoxWidget.Cast(root.FindAnyWidget("TeleportXYZ"));
+		m_PlayerCurPos		= TextWidget.Cast(root.FindAnyWidget("PlayerPosLabel"));
+		m_PlayerMouseDiff	= TextWidget.Cast(root.FindAnyWidget("PlayerMouseDiff"));
+		m_MouseCurPos		= TextWidget.Cast(root.FindAnyWidget("MousePosLabel"));
+		m_LogsEnabled		= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_LogsEnabled"));
+		m_HudDCharStats		= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_CharacterStats"));
+		m_HudDCharLevels	= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_CharacterLevels"));
+		m_HudDCharStomach	= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_CharacterStomach"));
+		m_HudDCharModifiers	= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_CharacterModifiers"));
+		m_HudDCharAgents	= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_CharacterAgents"));
+		m_HudDCharDebug		= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_CharacterDebug"));
+		m_HudDFreeCamCross	= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_FreeCamCross"));
+		m_HudDTemperature	= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_Temp"));
+		m_HudDVersion		= CheckBoxWidget.Cast(root.FindAnyWidget("cbx_Version"));
+		
+		m_LocationAddButton	= ButtonWidget.Cast(root.FindAnyWidget("AddButton"));
+		//m_LocationAddButton.SetHandler(ToolTipEventHandler.GetInstance());
+		m_LocationRemoveButton	= ButtonWidget.Cast(root.FindAnyWidget("RemoveButton"));
+
+		m_TimeSlider		= SliderWidget.Cast(root.FindAnyWidget("TimeSlider"));
+		m_DateYear			= EditBoxWidget.Cast(root.FindAnyWidget("DateYear"));
+		m_DateMonth			= EditBoxWidget.Cast(root.FindAnyWidget("DateMonth"));
+		m_DateDay			= EditBoxWidget.Cast(root.FindAnyWidget("DateDay"));
+		m_DateHour			= EditBoxWidget.Cast(root.FindAnyWidget("DateHour"));
+		m_DateMinute		= EditBoxWidget.Cast(root.FindAnyWidget("DateMinute"));
+		
+		
+		m_ShowOthers		= CheckBoxWidget.Cast(root.FindAnyWidget("ShowOthersCheckbox"));
+
+		m_HelpTextListboxWidget = TextListboxWidget.Cast(root.FindAnyWidget("HelpTextListboxWidget"));
+		m_Developer					= PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+		
+		Init();
+		LateInit();
+		
+	}
+	
+	void ~ScriptConsoleGeneralTab()
+	{
+		DEBUG_MAP_ZOOM = m_DebugMapWidget.GetScale();
+
+		PluginRemotePlayerDebugClient plugin_remote_client = PluginRemotePlayerDebugClient.Cast(GetPlugin(PluginRemotePlayerDebugClient));
+		if (SHOW_OTHERS && plugin_remote_client && GetGame().GetPlayer())
+			plugin_remote_client.RequestPlayerInfo(PlayerBase.Cast(GetGame().GetPlayer()), 0);
+	}
+
+	protected void Init()
+	{
+		
+		
+		
+		// Update checkbox Character Values
+		m_HudDCharStats.SetChecked(m_ConfigDebugProfile.GetCharacterStatsVisible());
+		m_HudDCharLevels.SetChecked(m_ConfigDebugProfile.GetCharacterLevelsVisible());
+		m_HudDCharStomach.SetChecked(m_ConfigDebugProfile.GetCharacterStomachVisible());
+		m_HudDCharModifiers.SetChecked(m_ConfigDebugProfile.GetCharacterModifiersVisible());
+		m_HudDCharAgents.SetChecked(m_ConfigDebugProfile.GetCharacterAgentsVisible());
+		m_HudDCharDebug.SetChecked(m_ConfigDebugProfile.GetCharacterDebugVisible());
+		m_HudDFreeCamCross.SetChecked(m_ConfigDebugProfile.GetFreeCameraCrosshairVisible());
+		m_HudDVersion.SetChecked(m_ConfigDebugProfile.GetVersionVisible());
+		m_HudDTemperature.SetChecked(m_ConfigDebugProfile.GetTempVisible());
+		
+
+		m_LogsEnabled.SetChecked(m_ConfigDebugProfile.GetLogsEnabled());
+		
+		TStringArray diag_names = new TStringArray;
+		GetGame().GetDiagModeNames(diag_names);
+		int i;
+		for (i = 0; i < diag_names.Count(); i++)
+		{
+			m_DiagToggleTextListbox.AddItem(diag_names.Get(i), NULL, 0);
+		}
+
+		GetGame().GetDiagDrawModeNames(diag_names);
+		for (i = 0; i < diag_names.Count(); i++)
+		{
+			m_DiagDrawmodeTextListbox.AddItem(diag_names.Get(i), NULL, 0);
+		}
+		RefreshLocations();
+		
+		UpdateHudDebugSetting();
+
+		if (GetGame().GetPlayer())
+		{
+			m_DebugMapWidget.SetScale(DEBUG_MAP_ZOOM);
+			m_DebugMapWidget.SetMapPos(GetGame().GetPlayer().GetWorldPosition());
+		}
+		m_TeleportXYZ.SetText(DEFAULT_POS_XYZ);
+		
+		m_LateInit.Run(0.05, this, "LateInit", null, false);
+		
+		int year,month,day,hour,minute;
+		GetGame().GetWorld().GetDate(year,month, day, hour, minute);
+		RefreshDateWidgets(year,month, day, hour, minute);
+	}
+	
+	
+	void RefreshDateWidgets(int year, int month, int day, int hour, int minute)
+	{
+		float time01 = Math.InverseLerp(0,60*24 - 1, (hour * 60) + minute);
+		m_DateYear.SetText(year.ToString());
+		m_DateMonth.SetText(month.ToString());
+		m_DateDay.SetText(day.ToString());
+		m_DateHour.SetText(hour.ToString());
+		m_DateMinute.SetText(minute.ToString());
+		m_TimeSlider.SetCurrent(time01 * 100);
+	}
+	
+	bool IsLocationNameAvailable(string name)
+	{
+		int count = m_PositionsListbox.GetNumItems();
+		for (int i = 0; i < count; i++)
+		{
+			LocationParams data;
+			m_PositionsListbox.GetItemData(i,0,data);
+			if (data.param1 == name)
+				return false;
+		}
+		return true;
+	}
+
+	
+	
+	
+	void LateInit()
+	{
+		m_ShowOthers.SetChecked(SHOW_OTHERS);
+		
+		if (m_ConfigDebugProfile)
+		{
+			int prevRow = m_ConfigDebugProfile.GetSpawnLocIndex();
+			if (prevRow < m_PositionsListbox.GetNumItems())
+				m_PositionsListbox.SelectRow(prevRow);
+			
+		}
+		PluginRemotePlayerDebugClient plugin_remote_client = PluginRemotePlayerDebugClient.Cast(GetPlugin(PluginRemotePlayerDebugClient));
+		if (SHOW_OTHERS && plugin_remote_client && GetGame().GetPlayer())
+		{
+			plugin_remote_client.RequestPlayerInfo(PlayerBase.Cast(GetGame().GetPlayer()), 1);
+			m_UpdatePlayerPositions = 1;
+		}
+		
+	}
+	
+	void Teleport(PlayerBase player, vector position)
+	{
+		if (position[1] == 0)
+			position[1] = GetGame().SurfaceY(position[0], position[2]);
+		m_Developer.Teleport(player, position);
+	}
+	
+	void RefreshLocations()
+	{
+		m_PositionsListbox.ClearItems();
+		
+		array<ref LocationParams> locData = new array<ref LocationParams>;
+		m_ConfigDebugProfile.GetLocationsData(locData,true);
+		m_ConfigDebugProfileFixed.GetLocationsData(locData,false);
+		foreach (LocationParams dta: locData)
+		{
+			string name = dta.param1;
+			if (!dta.param2)
+			{
+				name = "[" + name + "]";
+			}
+			m_PositionsListbox.AddItem(name,dta,0);
+		}
+	}
+
+	
+	string GetCurrentLocationName()
+	{
+		string name;
+		LocationParams prms;
+		GetCurrentPositionData(prms);
+		if (prms)
+			name =prms.param1;
+		return name;
+	}
+	vector GetCurrentLocationPos()
+	{
+		LocationParams prms;
+		GetCurrentPositionData(prms);
+		if (prms)
+			return prms.param3;
+		else 
+			return vector.Zero;
+	}
+	
+	void GetCurrentPositionData(out LocationParams data)
+	{
+		if (m_PositionsListbox.GetSelectedRow() != -1)
+		{
+			m_PositionsListbox.GetItemData(m_PositionsListbox.GetSelectedRow(), 0, data);
+		}
+	}
+	
+	bool IsCurrentPositionCustom()
+	{
+		LocationParams prms;
+		GetCurrentPositionData(prms);
+		if (prms)
+			return prms.param2;
+		else 
+			return false;
+	}
+	
+	int GetCurrentPositionIndex()
+	{
+		return m_PositionsListbox.GetSelectedRow();
+	}
+	
+	bool IsCurrentPositionValid()
+	{
+		return (m_PositionsListbox.GetSelectedRow() != -1);
+	}
+	
+	void UpdateHudDebugSetting();
+	
+	void RefreshPlayerPosEditBoxes()
+	{
+		if (!GetGame().GetPlayer())
+		{
+			return;
+		}
+
+		vector playerPos = GetGame().GetPlayer().GetPosition();
+		SetMapPos(playerPos);
+	}
+
+	void UpdateTime(bool slider_used)
+	{
+		Param5<int,int,int,int,int> p5 = new Param5<int,int,int,int,int>(0,0,0,0,0);
+		int year, month, day, hour, minute;
+		
+		year = m_DateYear.GetText().ToInt();
+		month = m_DateMonth.GetText().ToInt();
+		day = m_DateDay.GetText().ToInt();
+		
+		if (slider_used)
+		{
+			int time_minutes = Math.Lerp(0, (24*60) - 1, m_TimeSlider.GetCurrent()/100);
+			hour = time_minutes / 60;
+			minute = time_minutes % 60;
+		}
+		else
+		{
+			hour = m_DateHour.GetText().ToInt();
+			minute = m_DateMinute.GetText().ToInt();
+		}
+
+		p5.param1 = year;
+		p5.param2 = month;
+		p5.param3 = day;
+		p5.param4 = hour;
+		p5.param5 = minute;
+		
+		RefreshDateWidgets(year, month, day, hour, minute);
+		GetGame().GetWorld().SetDate(year, month, day, hour, minute);
+
+		if (GetGame().GetPlayer())
+		{
+			GetGame().GetPlayer().RPCSingleParam(ERPCs.DEV_RPC_SET_TIME, p5, true);
+		}
+	}
+	
+	
+	void UpdateMousePos()
+	{
+		int x,y;
+		GetMousePos(x,y);
+		vector mousePos, worldPos;
+		mousePos[0] = x;
+		mousePos[1] = y;
+		worldPos = m_DebugMapWidget.ScreenToMap(mousePos);
+		worldPos[1] = GetGame().SurfaceY(worldPos[0], worldPos[2]);
+		
+		if (m_MouseCurPos)
+		{
+			m_MouseCurPos.SetText("Mouse: "+ MiscGameplayFunctions.TruncateToS(worldPos[0]) +", "+ MiscGameplayFunctions.TruncateToS(worldPos[1]) +", "+ MiscGameplayFunctions.TruncateToS(worldPos[2]));
+		}
+		if (m_PlayerMouseDiff && GetGame().GetPlayer())
+		{
+			vector playerPos = GetGame().GetPlayer().GetWorldPosition();
+			//playerPos[1] = 0;
+			float dst = (worldPos - playerPos).Length();
+
+			m_PlayerMouseDiff.SetText("Distance: " + MiscGameplayFunctions.TruncateToS(dst));
+		}
+	}
+
+
+	void SetMapPos(vector pos)
+	{
+		m_MapPos = pos;
+		m_PlayerCurPos.SetText("Pos: "+  MiscGameplayFunctions.TruncateToS(pos[0]) +", "+ MiscGameplayFunctions.TruncateToS(pos[1]) +", "+ MiscGameplayFunctions.TruncateToS(pos[2]));
+	}
+	
+	vector GetMapPos()
+	{
+		return m_MapPos;
+	}
+	
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		super.OnMouseButtonDown(w,x,y,button);
+		
+		if (w ==  m_DebugMapWidget)
+		{
+			if (button == 0)
+			{
+				m_PlayerPosRefreshBlocked = true;
+				int mouseX, mouseY;
+				GetMousePos(mouseX,mouseY);
+				vector mousePos, worldPos;
+				mousePos[0] = mouseX;
+				mousePos[1] = mouseY;
+				worldPos = m_DebugMapWidget.ScreenToMap(mousePos);
+				worldPos[1] = GetGame().SurfaceY(worldPos[0], worldPos[2]);
+				
+				SetMapPos(worldPos);
+			}
+			else if (button == 1 && GetGame().GetPlayer())
+			{
+				SetMapPos(GetGame().GetPlayer().GetWorldPosition());
+			}
+		}
+		return true;
+	}
+	
+
+	override bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		super.OnKeyDown(w, x, y, key);
+		return false;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		
+		if (w == m_ShowOthers && GetGame().GetPlayer())
+		{
+			PluginRemotePlayerDebugClient plugin_remote_client = PluginRemotePlayerDebugClient.Cast(GetPlugin(PluginRemotePlayerDebugClient));
+			if (m_ShowOthers.IsChecked())
+			{
+				plugin_remote_client.RequestPlayerInfo(PlayerBase.Cast(GetGame().GetPlayer()), 1);
+				m_UpdatePlayerPositions = 1;
+				SHOW_OTHERS = true;
+			}
+			else
+			{
+				plugin_remote_client.RequestPlayerInfo(PlayerBase.Cast(GetGame().GetPlayer()), 0);
+				m_UpdatePlayerPositions = 0;
+				SHOW_OTHERS = false;
+			}
+			return true;
+		}
+		else if (w == m_TimeSlider || w == m_DateDay || w == m_DateYear || w == m_DateMonth || w == m_DateHour || w == m_DateMinute)
+		{
+			UpdateTime(w == m_TimeSlider);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn)
+	{
+		super.OnItemSelected(w, x, y, row, column, oldRow, oldColumn);
+		if (w == m_PositionsListbox)
+		{
+			vector position = GetCurrentLocationPos();
+			m_TeleportX.SetText(position[0].ToString());
+			m_TeleportY.SetText(position[2].ToString());
+			m_TeleportXYZ.SetText(position.ToString());
+			if (IsCurrentPositionValid())
+			{
+				m_ConfigDebugProfile.SetSpawnLocIndex(GetCurrentPositionIndex());
+			}
+			
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		super.OnDoubleClick(w, x, y, button);
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if (w ==  m_DebugMapWidget)
+		{
+			vector screen_to_map = m_DebugMapWidget.ScreenToMap(Vector(x,y, 0));
+			float pos_y_a = GetGame().SurfaceY(screen_to_map[0], screen_to_map[2]);
+			float pos_y_b = GetGame().SurfaceRoadY(screen_to_map[0], screen_to_map[2]);
+			float pos_y = Math.Max(pos_y_a, pos_y_b);
+			screen_to_map[1] = pos_y;
+			m_Developer.Teleport(player, screen_to_map);
+			return true;
+		}
+		
+		if (w == m_PositionsListbox)
+		{
+			vector position = GetCurrentLocationPos();
+			Teleport(player, position);
+			return true;
+		}
+		
+		if (w == m_TeleportXYZ)
+		{
+			EditBoxWidget.Cast(w).SetText("");
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		int i;
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+
+		PluginDeveloper module_dev = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+
+		if (w == m_PositionsListbox)
+		{
+			
+			vector position = GetCurrentLocationPos();
+			
+			m_TeleportX.SetText(position[0].ToString());
+			m_TeleportY.SetText(position[2].ToString());
+			
+			if (IsCurrentPositionValid())
+			{
+				m_ConfigDebugProfile.SetSpawnLocIndex(GetCurrentPositionIndex());
+			}
+			
+			return true;
+		}
+		else if (w == m_TeleportButton)
+		{
+			float pos_x = m_TeleportX.GetText().ToFloat();
+			float pos_z = m_TeleportY.GetText().ToFloat();
+			float pos_y = GetGame().SurfaceY(pos_x, pos_z);
+			vector v = Vector(pos_x, pos_y, pos_z);
+			if (m_TeleportXYZ.GetText() != "" && m_TeleportXYZ.GetText() != DEFAULT_POS_XYZ)
+			{
+				string pos = m_TeleportXYZ.GetText();
+				v = pos.BeautifiedToVector();
+			}
+			Teleport(player, v);
+			return true;
+		}
+		else if (w == m_ButtonCopyPos)
+		{
+			GetGame().CopyToClipboard(GetMapPos().ToString());
+			return true;
+		}
+		else if (w == m_LogsEnabled)
+		{
+			//Log("m_LogsEnabled: "+ToString(m_LogsEnabled.IsChecked()));
+
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetLogsEnabled(m_LogsEnabled.IsChecked());
+				LogManager.SetLogsEnabled(m_LogsEnabled.IsChecked());
+			}
+
+			return true;
+		}
+		else if (w == m_HudDCharStats)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetCharacterStatsVisible(m_HudDCharStats.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDCharLevels)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetCharacterLevelsVisible(m_HudDCharLevels.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDCharStomach)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetCharacterStomachVisible(m_HudDCharStomach.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDVersion)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetVersionVisible(m_HudDVersion.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDTemperature)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetTempVisible(m_HudDTemperature.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDCharModifiers)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetCharacterModifiersVisible(m_HudDCharModifiers.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDCharAgents)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetCharacterAgentsVisible(m_HudDCharAgents.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDCharDebug)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetCharacterDebugVisible(m_HudDCharDebug.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			return true;
+		}
+		else if (w == m_HudDFreeCamCross)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetFreeCameraCrosshairVisible(m_HudDFreeCamCross.IsChecked());
+			}
+
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+
+			GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).Call(GetGame().GetMission().RefreshCrosshairVisibility);
+
+			return true;
+		}
+		
+		else if (w == m_DiagToggleButton)
+		{
+			int toggle_row_index = m_DiagToggleTextListbox.GetSelectedRow();
+			bool toggle_state = GetGame().GetDiagModeEnable(toggle_row_index);
+			GetGame().SetDiagModeEnable(toggle_row_index, !toggle_state);
+			return true;
+		}
+		else if (w == m_DiagDrawButton)
+		{
+			int draw_row_index = m_DiagDrawmodeTextListbox.GetSelectedRow();
+			GetGame().SetDiagDrawMode(draw_row_index);
+			return true;
+		}
+		// TOUCHED THIS
+		else if (w == m_LocationAddButton)
+		{
+			ScriptConsoleAddLocation menu = ScriptConsoleAddLocation.Cast(g_Game.GetUIManager().EnterScriptedMenu(MENU_LOC_ADD, m_ScriptConsole));
+			menu.SetPosition(GetMapPos());
+			return true;
+		}
+		else if (w == m_LocationRemoveButton)
+		{
+			m_ConfigDebugProfile.CustomLocationsRemove(GetCurrentLocationName());
+			RefreshLocations();
+			return true;
+		}
+		return false;
+	}
+	
+	override void OnRPCEx(int rpc_type, ParamsReadContext ctx)
+	{
+		super.OnRPCEx(rpc_type, ctx);
+		#ifdef DIAG_DEVELOPER
+		switch (rpc_type)
+		{
+			case ERPCs.DEV_PLAYER_DEBUG_DATA:
+			{
+				ctx.Read(m_PlayerDebugStats);
+				break;
+			}
+		}
+		#endif
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		m_DebugMapWidget.ClearUserMarks();
+
+		if (m_UpdatePlayerPositions)
+		{
+			foreach (RemotePlayerStatDebug rpd: m_PlayerDebugStats)
+			{
+				if (rpd.m_Player != player)
+				{
+					vector dir = rpd.m_Pos - player.GetWorldPosition();
+					dir[1] = 0;
+					string dist = ((int)dir.Length()).ToString();
+					string text = rpd.m_Name + " " +dist +"m.";
+					m_DebugMapWidget.AddUserMark(rpd.m_Pos, text , COLOR_BLUE,"\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+				}
+			}
+		}
+		if (player)
+		{
+			vector playerPos = player.GetWorldPosition();
+			m_DebugMapWidget.AddUserMark(playerPos,"You", COLOR_RED,"\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+			if (playerPos != GetMapPos())
+				m_DebugMapWidget.AddUserMark(GetMapPos(),"Pos", COLOR_BLUE,"\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+		}
+		UpdateMousePos();
+		if (!m_PlayerPosRefreshBlocked)
+			RefreshPlayerPosEditBoxes();
+		
+		
+		foreach (MapMarker marker: ScriptConsole.m_MarkedEntities)
+		{
+			m_DebugMapWidget.AddUserMark(marker.GetMarkerPos(),marker.GetMarkerText(), marker.GetMarkerColor(), MapMarkerTypes.GetMarkerTypeFromID(marker.GetMarkerIcon()));
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleItemsTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleItemsTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..0531236bf0294ae8d3aa37f61aacf0f85a89ad0f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleItemsTab.c
@@ -0,0 +1,1651 @@
+typedef Param3<string, bool, bool> PresetParams;//  param1 - ??, param2 - ??, param3 - ??
+
+class ScriptConsoleItemsTab : ScriptConsoleTabBase
+{
+	protected const string 						CONST_DEFAULT_PRESET_PREFIX = "[Default]";
+	protected static int 						ITEMS_SELECTED_ROW = -1;
+	protected static int 						PRESETS_SELECTED_ROW = 0;
+	protected static int 						ITEMS_IN_PRESET_SELECTED_ROW;
+	protected static float 						DRAW_DISTANCE = 1000;
+	protected static bool 						CLEAR_IVN;
+	protected static int 						m_ObjectsScope = 2;
+	protected static string 					m_LastSelectedObject;
+	protected static int						m_SelectedObjectIsPreset = -1;
+	protected static ref array<Shape>			m_DebugShapes = new array<Shape>;
+	protected static EntityAI 					m_PreviewEntity;
+	protected static float	 					m_ItemQuantity = 1;
+	protected static bool	 					m_WithPhysics = false;
+	
+	
+	protected ref array<Widget> 				m_CategoryButtonsWidgets = new array<Widget>;
+	protected ref array<string> 				m_CategoryButtonsNames = {"FIREARMS","MELEE","ATTACHMENTS","MAGAZINES","AMMO","FOOD","MEDICAL","CARS","BACKPACKS","B-BUILDING"};
+	protected ref map<Widget, string>			m_SpawnButtonsOriginalText = new map<Widget, string>();
+	protected int 								m_CategoryMask;
+	protected MissionGameplay					m_MissionGameplay;
+	protected ref Timer 						m_RefreshFilterTimer = new Timer();
+	protected PluginDeveloper 					m_Developer;
+	protected bool 								m_FilterOrderReversed;
+	protected string 							m_SelectedObject;
+	protected bool								m_IsShiftDown;
+	protected string							m_FilterTextPrev;
+	//Widgets
+	protected CheckBoxWidget			m_CategoryMergeType;
+	protected CheckBoxWidget			m_ItemPreviewCheckbox;
+	protected CheckBoxWidget			m_ShowProtected;
+	protected CheckBoxWidget			m_ClearInventory;
+	protected TextListboxWidget 		m_ObjectsTextListbox;
+	protected TextListboxWidget 		m_PresetsTextListbox;
+	protected TextListboxWidget 		m_PresetItemsTextListbox;
+	protected ButtonWidget 				m_DrawInWorld;
+	protected ButtonWidget 				m_DrawInWorldClear;	
+	protected ButtonWidget 				m_PresetNewButton;
+	protected ButtonWidget 				m_PresetDeleteButton;
+	protected ButtonWidget 				m_PresetRenameButton;
+	protected ButtonWidget 				m_PresetSetDefaultButton;
+	protected ButtonWidget 				m_PresetAddItemtButton;
+	protected ButtonWidget 				m_ItemNameCopy;
+	protected ButtonWidget 				m_PresetRemoveItemButton;
+	protected ButtonWidget 				m_ItemMoveUpButton;
+	protected ButtonWidget 				m_ItemMoveDownButton;
+	protected ButtonWidget 				m_FilterOrderButton;
+	protected ButtonWidget 				m_SpawnInInvButton;
+	protected ButtonWidget 				m_SpawnGroundButton;
+	protected ButtonWidget 				m_SpawnGroundPatternGrid;
+	protected ButtonWidget 				m_SpawnOnTarget;
+	protected ButtonWidget 				m_SpawnOnCursor;
+	protected ButtonWidget 				m_SpawnInHands;
+	protected ButtonWidget 				m_SpawnBatchButton;
+	protected ButtonWidget				m_ListActions;
+	protected MultilineEditBoxWidget 	m_ObjectFilter;
+	protected EditBoxWidget 			m_SpawnDistanceEditBox;
+	protected EditBoxWidget 			m_RectSpawnRow;
+	protected EditBoxWidget 			m_RectSpawnColumn;
+	protected EditBoxWidget 			m_RectSpawnRowStep;
+	protected EditBoxWidget 			m_RectSpawnColumnStep;
+	protected EditBoxWidget 			m_DrawDistanceWidget;
+	protected EditBoxWidget 			m_QuantityEditBox;
+	protected EditBoxWidget 			m_DamageEditBox;
+	protected EditBoxWidget 			m_BatchSpawnQuantity;
+	protected CheckBoxWidget			m_WithPhysicsCheckbox;
+	protected TextWidget 				m_ItemDamageLabel;
+	protected TextWidget 				m_ItemQuantityLabel;
+	protected TextWidget 				m_SelectedObjectText;
+	protected ItemPreviewWidget 		m_ItemPreviewWidget;
+	protected ImageWidget				m_FilterOrderImage;
+	
+	
+	void ScriptConsoleItemsTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_Developer					= PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+		
+		m_DrawInWorld = ButtonWidget.Cast(root.FindAnyWidget("ButtonDrawItem"));
+		m_DrawInWorldClear = ButtonWidget.Cast(root.FindAnyWidget("ButtonDrawItemClear"));
+		
+		m_CategoryMergeType = CheckBoxWidget.Cast(root.FindAnyWidget("CategoryMergeType"));
+		m_ItemPreviewCheckbox	= CheckBoxWidget.Cast(root.FindAnyWidget("ItemPreviewCheckbox"));
+		m_ShowProtected		= CheckBoxWidget.Cast(root.FindAnyWidget("ShowProtectedCheckbox"));
+		m_FilterOrderImage	= ImageWidget.Cast(root.FindAnyWidget("ObjectFilterSortPic"));
+		m_ClearInventory		= CheckBoxWidget.Cast(root.FindAnyWidget("ForceClearCheckbox"));
+		m_DrawDistanceWidget	= EditBoxWidget.Cast(root.FindAnyWidget("DrawItemDistance"));
+		m_ObjectFilter = MultilineEditBoxWidget.Cast(root.FindAnyWidget("ObjectFilter"));
+		m_SpawnDistanceEditBox = EditBoxWidget.Cast(root.FindAnyWidget("SpawnDistance"));
+		m_SelectedObjectText = TextWidget.Cast(root.FindAnyWidget("SelectedObject"));
+		m_ObjectsTextListbox = TextListboxWidget.Cast(root.FindAnyWidget("ObjectsList"));
+		m_PresetsTextListbox = TextListboxWidget.Cast(root.FindAnyWidget("PresetList"));
+		m_PresetItemsTextListbox = TextListboxWidget.Cast(root.FindAnyWidget("PresetItemsList"));
+		m_PresetNewButton = ButtonWidget.Cast(root.FindAnyWidget("NewPresetButton"));
+		m_PresetDeleteButton = ButtonWidget.Cast(root.FindAnyWidget("DeletePresetButton"));
+		m_PresetRenameButton = ButtonWidget.Cast(root.FindAnyWidget("RenamePresetButton"));
+		m_PresetSetDefaultButton = ButtonWidget.Cast(root.FindAnyWidget("SetDefaultPresetButton"));
+		m_PresetAddItemtButton = ButtonWidget.Cast(root.FindAnyWidget("AddToPresetButton"));
+		m_ItemNameCopy = ButtonWidget.Cast(root.FindAnyWidget("ItemNameCopy"));
+		m_PresetRemoveItemButton = ButtonWidget.Cast(root.FindAnyWidget("RemoveFromPresetButton"));
+		m_ItemMoveUpButton = ButtonWidget.Cast(root.FindAnyWidget("ItemMoveUpButton"));
+		m_ItemMoveDownButton = ButtonWidget.Cast(root.FindAnyWidget("ItemMoveDownButton"));
+		m_ItemPreviewWidget = ItemPreviewWidget.Cast(root.FindAnyWidget("ItemPreviewWidget"));
+
+		m_QuantityEditBox = EditBoxWidget.Cast(root.FindAnyWidget("QuantityValue"));
+		m_DamageEditBox = EditBoxWidget.Cast(root.FindAnyWidget("DamageValue"));
+		m_ItemDamageLabel = TextWidget.Cast(root.FindAnyWidget("DamageLabel"));
+		m_ItemQuantityLabel = TextWidget.Cast(root.FindAnyWidget("QuantityLabel"));
+		m_WithPhysicsCheckbox = CheckBoxWidget.Cast(root.FindAnyWidget("WithPhysicsCheckbox"));
+
+		m_SpawnInInvButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonSpawnInInv"));
+		m_SpawnGroundButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonSpawnInGround"));
+		m_SpawnOnTarget = ButtonWidget.Cast(root.FindAnyWidget("ButtonSpawnInTarget"));
+		m_SpawnOnCursor = ButtonWidget.Cast(root.FindAnyWidget("ButtonSpawnCursor"));
+		m_SpawnInHands = ButtonWidget.Cast(root.FindAnyWidget("ButtonSpawnHands"));
+		m_SpawnBatchButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonSpawnBatch"));
+		
+		string text;
+		m_SpawnInInvButton.GetText(text);
+		m_SpawnButtonsOriginalText.Insert(m_SpawnInInvButton, text);
+		m_SpawnGroundButton.GetText(text);
+		m_SpawnButtonsOriginalText.Insert(m_SpawnGroundButton, text);
+		m_SpawnOnTarget.GetText(text);
+		m_SpawnButtonsOriginalText.Insert(m_SpawnOnTarget, text);
+		m_SpawnOnCursor.GetText(text);
+		m_SpawnButtonsOriginalText.Insert(m_SpawnOnCursor, text);
+		m_SpawnInHands.GetText(text);
+		m_SpawnButtonsOriginalText.Insert(m_SpawnInHands, text);
+		m_SpawnBatchButton.GetText(text);
+		m_SpawnButtonsOriginalText.Insert(m_SpawnBatchButton, text);
+
+		m_ListActions = ButtonWidget.Cast(root.FindAnyWidget("ListActions"));
+
+		
+		m_RectSpawnColumn = EditBoxWidget.Cast(root.FindAnyWidget("RectangleColumnValue"));
+		m_RectSpawnRow = EditBoxWidget.Cast(root.FindAnyWidget("RectangleRowValue"));
+		m_BatchSpawnQuantity = EditBoxWidget.Cast(root.FindAnyWidget("BatchCount"));
+		
+		m_RectSpawnColumnStep = EditBoxWidget.Cast(root.FindAnyWidget("RectangleStepXValue"));
+		m_RectSpawnRowStep = EditBoxWidget.Cast(root.FindAnyWidget("RectangleStepYValue"));
+		
+		m_FilterOrderButton	= ButtonWidget.Cast(root.FindAnyWidget("ObjectFilterSortButton"));
+		Init();
+	}
+	
+	void ~ScriptConsoleItemsTab()
+	{
+		ITEMS_SELECTED_ROW = m_ObjectsTextListbox.GetSelectedRow();
+		PRESETS_SELECTED_ROW = m_PresetsTextListbox.GetSelectedRow();
+		ITEMS_IN_PRESET_SELECTED_ROW = m_PresetItemsTextListbox.GetSelectedRow();
+				
+		m_PresetsTextListbox.ClearItems();
+		
+		if (m_PreviewEntity)
+		{
+			m_PreviewEntity.Delete();
+		}
+		
+		m_RefreshFilterTimer.Stop();
+		
+		if (m_ConfigDebugProfile)
+		{
+			m_ConfigDebugProfile.SetItemCategoryFlag(m_CategoryMask);
+		}
+		
+		m_ItemQuantity = m_QuantityEditBox.GetText().ToFloat();
+		m_WithPhysics = m_WithPhysicsCheckbox.IsChecked();
+	}
+
+	
+	
+	protected void Init()
+	{
+		m_RefreshFilterTimer.Run(0.85, this, "ChangeFilterItems", null, true);
+		m_PresetDeleteButton.Show(false);
+		m_PresetRenameButton.Show(false);
+		m_DrawDistanceWidget.SetText(DRAW_DISTANCE.ToString());
+		
+		m_QuantityEditBox.SetText(m_ItemQuantity.ToString());
+		m_WithPhysicsCheckbox.SetChecked(m_WithPhysics);
+		
+		if (m_ConfigDebugProfile)
+		{
+			string txt = (m_ConfigDebugProfile.GetItemSearch());
+			m_ObjectFilter.SetText(m_ConfigDebugProfile.GetItemSearch());
+			m_SpawnDistanceEditBox.SetText(m_ConfigDebugProfile.GetSpawnDistance().ToString());
+			
+			
+			SetFilterOrder(m_ConfigDebugProfile.GetFilterOrderReversed());
+			//m_ConfigDebugProfile.SetItemCategoryFlag(m_CategoryMask);
+			
+			m_BatchSpawnQuantity.SetText(m_ConfigDebugProfile.GetBatchSpawnQuantity().ToString());
+
+			m_CategoryMask = m_ConfigDebugProfile.GetItemCategoryFlag();
+			if (m_ItemPreviewCheckbox)
+			{
+				m_ItemPreviewCheckbox.SetChecked(m_ConfigDebugProfile.GetShowItemPreview());
+			}
+			
+			array<ref CfgParam> params = m_ConfigDebugProfile.GetBatchSpawnRectangle();
+			
+			m_RectSpawnRow.SetText(CfgParamInt.Cast(params.Get(0)).GetValue().ToString());
+			m_RectSpawnColumn.SetText(CfgParamInt.Cast(params.Get(1)).GetValue().ToString());
+			m_RectSpawnRowStep.SetText(CfgParamFloat.Cast(params.Get(2)).GetValue().ToString());
+			m_RectSpawnColumnStep.SetText(CfgParamFloat.Cast(params.Get(3)).GetValue().ToString());
+		}
+		
+		
+		if (m_ObjectsScope == 1)
+			m_ShowProtected.SetChecked(true);
+		else
+			m_ShowProtected.SetChecked(false);
+		
+		int counter = 0;
+		foreach (string name: m_CategoryButtonsNames)
+		{
+			string widget_name = "ItemCategory" + counter;
+			
+			CheckBoxWidget btw = CheckBoxWidget.Cast(m_ParentRoot.FindAnyWidget(widget_name));
+			if (btw)
+			{
+				btw.SetText(name);
+				m_CategoryButtonsWidgets.Insert(btw);
+				int bit = 1 << counter;
+				if (bit & m_CategoryMask)
+				{
+					btw.SetChecked(true);
+					btw.SetTextColor(ARGB(255, 255, 0, 0));
+				}
+			}
+			counter++;
+		}
+		
+		if (ITEMS_IN_PRESET_SELECTED_ROW <= m_PresetItemsTextListbox.GetNumItems() && m_PresetItemsTextListbox.GetNumItems() > 0 && ITEMS_IN_PRESET_SELECTED_ROW > -1)
+		{
+			m_PresetItemsTextListbox.SelectRow(ITEMS_IN_PRESET_SELECTED_ROW);
+			m_PresetItemsTextListbox.EnsureVisible(ITEMS_IN_PRESET_SELECTED_ROW);
+			
+			m_SelectedObjectText.SetText("Object : " + GetCurrentItemName());
+			SetObject(GetCurrentItemName());
+			m_SelectedObjectIsPreset = 0;
+		}
+		
+		ChangeFilterItems(true);
+		
+		RenderPresets();
+		//RenderPresetItems();
+		
+		m_MissionGameplay			= MissionGameplay.Cast(GetGame().GetMission());
+		
+		if (!m_SelectedObjectIsPreset == 1 && ITEMS_SELECTED_ROW <  m_ObjectsTextListbox.GetNumItems() && m_ObjectsTextListbox.GetNumItems() > 0 && ITEMS_SELECTED_ROW > -1)
+		{
+			m_ObjectsTextListbox.SelectRow(ITEMS_SELECTED_ROW);
+			m_ObjectsTextListbox.EnsureVisible(ITEMS_SELECTED_ROW);
+			
+			
+			m_SelectedObjectText.SetText(GetCurrentObjectName());
+
+			
+			SetObject(GetCurrentObjectName());
+			m_LastSelectedObject = m_SelectedObject;
+			m_PresetItemsTextListbox.SelectRow(-1);
+			m_SelectedObjectIsPreset = 0;
+		}
+		
+		if (m_PresetsTextListbox.GetNumItems() >= 0)
+		{
+			m_PresetsTextListbox.SelectRow(PRESETS_SELECTED_ROW);
+			m_PresetsTextListbox.EnsureVisible(PRESETS_SELECTED_ROW);
+			if (m_SelectedObjectIsPreset == 1)
+				SelectPreset();
+			else
+				RenderPresetItems();
+		}
+		
+		if (m_ObjectsScope == 1)
+			m_ShowProtected.SetChecked(true);
+		else
+			m_ShowProtected.SetChecked(false);
+
+		
+		m_CategoryMergeType.SetChecked(m_ConfigDebugProfile.GetMergeType());
+				
+		HideItemButtons();
+		ShowItemTransferButtons();
+	}
+	
+	static void DrawItems(string type, float distance = 0)
+	{	
+		if (!distance)
+		{
+			distance = DRAW_DISTANCE;
+		}
+		array<Object> objects = new array<Object>;
+		array<CargoBase> proxies = new array<CargoBase>;
+		
+		GetGame().GetObjectsAtPosition(GetGame().GetPlayer().GetPosition(), distance, objects, proxies);
+		int i = 0;
+		foreach (Object o: objects)
+		{
+			if (o.IsKindOf(type))
+			{
+				i++;
+				ScriptConsole.m_MarkedEntities.Insert(new MapMarker(o.GetPosition(),"",COLOR_RED,eMapMarkerTypes.MARKERTYPE_MAP_BORDER_CROSS));
+				Shape shape = Shape.CreateSphere(COLOR_RED, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER, o.GetPosition() + "0 30 0", 1);
+				vector lines[2];
+				lines[0] = o.GetPosition();
+				lines[1] = o.GetPosition() + "0 30 0";
+				Shape line = Shape.CreateLines(COLOR_RED, ShapeFlags.TRANSP|ShapeFlags.NOOUTLINE|ShapeFlags.NOZBUFFER, lines, 2);
+				m_DebugShapes.Insert(shape);
+				m_DebugShapes.Insert(line);
+			}
+		}
+		
+		//! need better logic for cleaning
+		//GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLaterByName(this, "DrawItemsClear", 5000);
+		Debug.Log(string.Format("found %1 instances of type %1", i, type));
+	}
+	
+	
+	static void DrawItemsClear()
+	{
+		ScriptConsole.m_MarkedEntities.Clear();
+		foreach (Shape s: m_DebugShapes)
+		{
+			s.Destroy();
+		}
+		m_DebugShapes.Clear();
+	}
+	
+	//!
+	static string	GetLastSelectedObject()
+	{
+		return m_LastSelectedObject;
+	}
+	
+	override bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		if (key == KeyCode.KC_D && m_SelectedObject != "")
+		{
+			DrawItems(m_SelectedObject);
+			return true;
+		}
+		else
+			return super.OnKeyDown(w, x, y, key);
+	}
+	
+	void SelectObject(bool hide_presets = true)
+	{
+		if (hide_presets)
+			m_PresetItemsTextListbox.SelectRow(-1);
+		HideItemButtons();
+		ShowItemTransferButtons();
+		m_SelectedObjectText.SetText(GetCurrentObjectName());
+		SetObject(GetCurrentObjectName());
+
+		m_LastSelectedObject = m_SelectedObject;
+		m_SelectedObjectIsPreset = 0;
+	}
+	
+	
+	void SelectPreset()
+	{
+		m_ObjectsTextListbox.SelectRow(-1);
+		RenderPresetItems();
+		ShowPresetButtons();
+		ShowItemTransferButtons();
+		m_SelectedObject = GetCurrentPresetName();
+		m_SelectedObjectText.SetText("Preset : " + m_SelectedObject);
+		m_SelectedObjectIsPreset = 1;
+		
+		TStringArray command_array = new TStringArray;
+		
+		m_ConfigDebugProfileFixed.GetPresetItems(m_SelectedObject, command_array, "cmd");
+				
+		bool clear = !IsPresetFixed(m_SelectedObject);
+		if (command_array.IsValidIndex(0))
+		{
+			string first_line = command_array.Get(0);
+			first_line.ToLower();
+			clear = (first_line == "clear_inv");
+		}
+
+		m_ClearInventory.SetChecked(clear);
+	}
+	
+	int GetCurrentPresetIndex()
+	{
+		return m_PresetsTextListbox.GetSelectedRow();
+	}
+
+	int GetCurrentItemIndex()
+	{
+		return m_PresetItemsTextListbox.GetSelectedRow();
+	}
+	
+	bool IsCurrentPresetFixed()
+	{
+		int index = GetCurrentPresetIndex(); 
+		if (index > -1 && index < m_PresetsTextListbox.GetNumItems())
+		{
+			PresetParams item_params_array;
+			m_PresetsTextListbox.GetItemData(index, 0, item_params_array);
+			return item_params_array.param2;
+		}
+		return false;
+	}
+
+	bool IsPresetFixed(string preset_name)
+	{
+		int preset_index = GetPresetIndexByName(preset_name);
+		PresetParams item_params_array;
+		if (preset_index > -1 && preset_index < m_PresetsTextListbox.GetNumItems())
+		{
+			m_PresetsTextListbox.GetItemData(preset_index, 0, item_params_array);
+			return item_params_array.param2;
+		}
+		return false;
+	}
+	
+	int GetPresetIndexByName(string preset_name)
+	{
+		int i;
+		for (i = 0; i < m_PresetsTextListbox.GetNumItems(); i++)
+		{
+			PresetParams item_params_array;
+			m_PresetsTextListbox.GetItemData(i, 0, item_params_array);
+
+			if (item_params_array.param1 == preset_name)
+			{
+				return i;
+			}
+		}
+		return -1;
+	}
+	
+	void ShowItemButtons()
+	{
+		if (!IsCurrentPresetFixed())
+		{
+			ShowItemTransferButtons();
+
+			string preset_name = GetCurrentPresetName();
+			int item_index = GetCurrentItemIndex();
+
+			m_ItemMoveUpButton.Show(true);
+			m_ItemMoveDownButton.Show(true);
+
+			m_ItemDamageLabel.Show(true);
+			m_ItemQuantityLabel.Show(true);
+
+			if (preset_name != "" && item_index > -1)
+			{
+				m_DamageEditBox.Show(true);
+				m_QuantityEditBox.Show(true);
+				m_WithPhysicsCheckbox.Show(true);
+
+				float item_health= m_ConfigDebugProfile.GetItemHealth(GetCurrentPresetName(), GetCurrentItemIndex());
+				int item_quantity = m_ConfigDebugProfile.GetItemQuantity(GetCurrentPresetName(), GetCurrentItemIndex());
+				bool item_with_physics = m_ConfigDebugProfile.GetItemWithPhysics(GetCurrentPresetName(), GetCurrentItemIndex());
+
+				// damage
+				m_DamageEditBox.SetText(item_health.ToString());
+
+				// quantity
+				m_QuantityEditBox.SetText(item_quantity.ToString());
+
+				// with physics
+				m_WithPhysicsCheckbox.SetChecked(item_with_physics);
+			}
+			else
+			{
+				m_DamageEditBox.Show(false);
+				m_QuantityEditBox.Show(false);
+				m_WithPhysicsCheckbox.Show(false);
+				
+			}
+		}
+	}
+
+	void HideItemButtons()
+	{
+		m_ItemMoveUpButton.Show(false);
+		m_ItemMoveDownButton.Show(false);
+	}
+		
+	void ShowItemTransferButtons()
+	{
+		int object_row = m_ObjectsTextListbox.GetSelectedRow();
+		if (object_row >-1 && GetCurrentPresetIndex() >-1 && !IsCurrentPresetFixed())
+		{
+			m_PresetAddItemtButton.Show(true);
+		}
+		else
+		{
+			m_PresetAddItemtButton.Show(false);
+		}
+
+		if (GetCurrentItemIndex() >-1 && GetCurrentPresetIndex() >-1 && !IsCurrentPresetFixed())
+		{
+			m_PresetRemoveItemButton.Show(true);
+		}
+		else
+		{
+			m_PresetRemoveItemButton.Show(false);
+		}
+
+		if (object_row > -1)
+		{
+			m_ItemNameCopy.Show(true);
+		}
+		else
+		{
+			m_ItemNameCopy.Show(false);
+		}
+
+	}
+	
+	void ItemMoveUp()
+	{
+		int new_index = GetCurrentItemIndex() - 1;
+		if (GetCurrentItemIndex() != -1 && GetCurrentPresetIndex() != -1 && new_index > -1)
+		{
+			m_ConfigDebugProfile.SwapItem(GetCurrentPresetName(), GetCurrentItemIndex(), new_index);
+			RenderPresetItems();
+			m_PresetItemsTextListbox.SelectRow (new_index);
+		}
+	}
+
+	void ItemMoveDown()
+	{
+		int new_index = GetCurrentItemIndex() + 1;
+		if (GetCurrentItemIndex() != -1 && GetCurrentPresetIndex() != -1 && new_index < m_PresetItemsTextListbox.GetNumItems())
+		{
+			m_ConfigDebugProfile.SwapItem(GetCurrentPresetName(), GetCurrentItemIndex(), new_index);
+			RenderPresetItems();
+			m_PresetItemsTextListbox.SelectRow (new_index);
+		}
+	}
+	
+	
+	void SaveProfileSpawnDistance()
+	{
+		if (m_ConfigDebugProfile && m_SpawnDistanceEditBox)
+		{
+			m_ConfigDebugProfile.SetSpawnDistance(m_SpawnDistanceEditBox.GetText().ToFloat());
+		}
+	}
+	
+	void RenamePreset(string new_preset_name)
+	{
+		if (new_preset_name && GetCurrentPresetIndex() != -1)
+		{
+			bool result = m_ConfigDebugProfile.PresetRename(GetCurrentPresetName(), new_preset_name);
+			RefreshLists();
+		}
+	}
+	
+	
+	void SpawnPreset(EntityAI target, bool clear_inventory, string preset_name, InventoryLocationType location = InventoryLocationType.ATTACHMENT, float distance = 0)
+	{
+		// spawn preset items into inventory
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if (GetCurrentPresetIndex() != -1)
+		{
+			bool is_preset_fixed = IsCurrentPresetFixed();
+			TStringArray preset_array = new TStringArray;
+			
+			if (is_preset_fixed)
+			{
+				m_ConfigDebugProfileFixed.GetPresetItems(preset_name, preset_array);
+				
+			}
+			else
+			{
+				m_ConfigDebugProfile.GetPresetItems(preset_name, preset_array);
+			}
+			
+			if (clear_inventory)
+			{
+				m_Developer.ClearInventory(target);
+			}
+
+			for (int i = 0; i < preset_array.Count(); i++)
+			{
+				float health = -1;
+				int quantity = 1;
+				bool with_physics = false;
+				if (is_preset_fixed)
+				{
+					health = m_ConfigDebugProfileFixed.GetItemHealth(preset_name, i);
+					quantity = m_ConfigDebugProfileFixed.GetItemQuantity(preset_name, i);
+					with_physics = m_ConfigDebugProfileFixed.GetItemWithPhysics(preset_name, i);
+				}
+				else
+				{
+					health = m_ConfigDebugProfile.GetItemHealth(preset_name, i);
+					quantity = m_ConfigDebugProfile.GetItemQuantity(preset_name, i);
+					with_physics = m_ConfigDebugProfile.GetItemWithPhysics(preset_name, i);
+				}
+				if (location == InventoryLocationType.ATTACHMENT)
+					EntityAI ent = m_Developer.SpawnEntityInInventory(target, preset_array.Get(i), -1, quantity, false, preset_name);
+					//m_Developer.SpawnEntityAsAttachment(player, target, preset_array.Get(i), -1, quantity, false, preset_name);
+				else if (location == InventoryLocationType.GROUND)
+				{
+					m_Developer.SpawnEntityOnCursorDir(player, preset_array.Get(i), quantity, distance, health, false, preset_name, with_physics);
+				}
+			}
+			if (GetGame().IsMultiplayer())
+			{
+				ScriptRPC rpc = new ScriptRPC();
+				rpc.Write(preset_name);
+				rpc.Write(target);
+				rpc.Send(player, ERPCs.DEV_RPC_SPAWN_PRESET, true, player.GetIdentity());
+			}
+			else
+			{
+				PluginDeveloper plugin = PluginDeveloper.Cast(GetPlugin(PluginDeveloper));
+				plugin.HandlePresetSpawn(player,preset_name,target);
+			}
+		}
+	}
+	
+	void SetDefaultPreset(int preset_index)
+	{
+		// remove previous default parameter
+		string default_preset = m_ConfigDebugProfile.GetDefaultPreset();
+		if (default_preset != "")
+		{
+			int index = GetPresetIndexByName(default_preset);
+			// if is fixed
+			if (IsPresetFixed(default_preset))
+			{
+				default_preset = "[" + default_preset + "]";
+			}
+			PresetParams prev_preset_params_array;
+			if (index > -1 && index < m_PresetsTextListbox.GetNumItems())
+			{
+				m_PresetsTextListbox.GetItemData(index, 0, prev_preset_params_array);
+				prev_preset_params_array.param3 = false; // remove DEFAULT
+				m_PresetsTextListbox.SetItem(index, default_preset, prev_preset_params_array, 0);
+			}
+		}
+
+		// set preset on preset_index to default
+		// if is fixed
+		string preset_name = GetCurrentPresetName();
+		if (IsPresetFixed(preset_name))
+		{
+			preset_name = "[" + preset_name + "]";
+		}
+		// set new default preset
+		PresetParams preset_params_array;
+		index = GetCurrentPresetIndex();
+		if (index > -1 && index < m_PresetsTextListbox.GetNumItems())
+		{
+			m_PresetsTextListbox.GetItemData(index, 0, preset_params_array);
+			preset_params_array.param3 = true; // DEFAULT
+			m_PresetsTextListbox.SetItem(index, preset_name + CONST_DEFAULT_PRESET_PREFIX, preset_params_array, 0);
+		}
+		// store preset
+		m_ConfigDebugProfile.SetDefaultPreset(GetCurrentPresetName());
+	}
+	
+	void SetObject(string object)
+	{
+		m_SelectedObject = object;
+		
+		if (m_ConfigDebugProfile && m_ConfigDebugProfile.GetShowItemPreview())
+		{
+			SetPreviewObject(object);
+		}
+		
+	}
+	
+	void SetPreviewObject(string object)
+	{
+		#ifdef DEVELOPER
+		if (m_PreviewEntity)
+		{
+			m_PreviewEntity.Delete();
+		}
+		
+		if (!GetGame().IsKindOf(object, "DZ_LightAI") && !GetGame().IsKindOf(object, "Man"))
+		{
+			DayZGame.m_IsPreviewSpawn = true;
+			//! Don't use ECE_UPDATEPATHGRAPH !!!
+			m_PreviewEntity = EntityAI.Cast(GetGame().CreateObjectEx(object, "0 0 0", ECE_LOCAL | ECE_CREATEPHYSICS | ECE_TRACE));
+			DayZGame.m_IsPreviewSpawn = false;		
+			if (m_PreviewEntity)
+			{
+				dBodyDestroy(m_PreviewEntity);//prevents cars from acting up when spawned this way(we only want the preview pic, no physics required)
+				m_PreviewEntity.DisableSimulation(true);
+				m_ItemPreviewWidget.SetItem(m_PreviewEntity);
+				m_PreviewEntity.SetAllowDamage(false);
+			}
+		}
+		#endif
+	}
+	
+	void AddItemToPreset()
+	{
+		int selected_row_index = m_ObjectsTextListbox.GetSelectedRow();
+		if (selected_row_index != -1 && GetCurrentPresetIndex() != -1)
+		{
+			string item_name;
+			m_ObjectsTextListbox.GetItemText(selected_row_index, 0, item_name);
+			m_ConfigDebugProfile.ItemAddToPreset(GetCurrentPresetName(), item_name);
+			RenderPresetItems();
+		}
+	}
+	
+	void ShowPresetButtons()
+	{
+		bool show = true;
+		if (IsCurrentPresetFixed())
+		{
+			show = false;
+		}
+		m_PresetDeleteButton.Show(show);
+		m_PresetRenameButton.Show(show);
+
+		HideItemButtons();
+		
+	}
+/*
+	void AddItemToClipboard(TextListboxWidget text_listbox_widget)
+	{
+		int selected_row_index = text_listbox_widget.GetSelectedRow();
+		if (selected_row_index != -1)
+		{
+			string item_name;
+			text_listbox_widget.GetItemText(selected_row_index, 0, item_name);
+			GetGame().CopyToClipboard(item_name);
+		}
+	}*/
+
+	void RemoveItemFromPreset()
+	{
+		if (GetCurrentItemIndex() != -1 && GetCurrentPresetIndex() != -1)
+		{
+			m_ConfigDebugProfile.ItemRemoveFromPreset(GetCurrentPresetName(), GetCurrentItemIndex());
+			RenderPresetItems();
+		}
+	}
+	
+	string GetCurrentPresetName()
+	{
+		int index = GetCurrentPresetIndex();
+		// load preset items list
+		if (index > -1 && index < m_PresetsTextListbox.GetNumItems())
+		{
+			PresetParams item_params_array;
+			m_PresetsTextListbox.GetItemData(index, 0, item_params_array);
+			return item_params_array.param1;
+		}
+		return "";
+	}
+	
+	string GetCurrentItemName()
+	{
+		if (GetCurrentItemIndex() != -1)
+		{
+			string item_name;
+			m_PresetItemsTextListbox.GetItemText(GetCurrentItemIndex(), 0, item_name);
+			return item_name;
+		}
+		return "";
+	}
+	
+	string GetCurrentObjectName()
+	{
+		int selected_row_index = m_ObjectsTextListbox.GetSelectedRow();
+		if (selected_row_index != -1)
+		{
+			string item_name;
+			m_ObjectsTextListbox.GetItemText(selected_row_index, 0, item_name);
+			return item_name;
+		}
+		return "";
+	}
+	
+	void RefreshLists()
+	{
+		RenderPresets();
+		RenderPresetItems();
+	}
+	
+	// Render specific Preset Items
+	void RenderPresets()
+	{
+		m_PresetsTextListbox.ClearItems();
+
+		int i;
+		TBoolArray preset_params;
+		
+		// load custom presets list
+		TStringArray custom_presets_array = m_ConfigDebugProfile.GetPresets();
+		for (i = custom_presets_array.Count() - 1; i >= 0; i--)
+		{
+			m_PresetsTextListbox.AddItem(custom_presets_array.Get(i), new PresetParams (custom_presets_array.Get(i),false, false), 0);
+		}
+		
+		// load fixed presets list
+		TStringArray presets_array = m_ConfigDebugProfileFixed.GetPresets();
+		for (i = 0; i < presets_array.Count(); i++)
+		{
+			m_PresetsTextListbox.AddItem("["+presets_array.Get(i)+"]", new PresetParams (presets_array.Get(i), true, false), 0);
+		}
+		string default_preset = m_ConfigDebugProfile.GetDefaultPreset();
+		if (default_preset != "")
+		{
+			// if is fixed
+			int index = GetPresetIndexByName(default_preset);
+			if (IsPresetFixed(default_preset))
+			{
+				default_preset = "[" + default_preset + "]";
+			}
+			PresetParams preset_params_array;
+			if (index > -1 && index < m_PresetsTextListbox.GetNumItems())
+			{
+				m_PresetsTextListbox.GetItemData(index, 0, preset_params_array);
+				m_PresetsTextListbox.SetItem(index, default_preset + CONST_DEFAULT_PRESET_PREFIX, preset_params_array, 0);
+			}
+		}
+	}
+	
+	// Render specific Preset Items
+	void RenderPresetItems()
+	{
+		// load preset items list
+		int i;
+		m_PresetItemsTextListbox.ClearItems();
+		if (GetCurrentPresetIndex() != -1)
+		{
+			bool isFixed = IsCurrentPresetFixed();
+			TStringArray preset_array = new TStringArray;
+
+			if (isFixed)
+			{
+				 m_ConfigDebugProfileFixed.GetPresetItems(GetCurrentPresetName(), preset_array);
+			}
+			else
+			{
+				m_ConfigDebugProfile.GetPresetItems(GetCurrentPresetName(), preset_array);
+			}
+
+			if (preset_array)
+			{
+				for (i = 0; i < preset_array.Count(); i++)
+				{
+					m_PresetItemsTextListbox.AddItem(preset_array.Get(i), NULL, 0);
+				}
+			}
+		}
+	}
+	
+	void NewPreset(string preset_name)
+	{
+		m_ConfigDebugProfile.PresetAdd(preset_name);
+		RefreshLists();
+	}
+
+	void DeletePreset()
+	{
+		if (GetCurrentPresetIndex() != -1)
+		{
+			bool result = m_ConfigDebugProfile.PresetRemove(GetCurrentPresetName());
+			RefreshLists();
+		}
+	}
+
+	int GetFilterColor(string color)
+	{
+		switch (color)
+		{
+			case "r":
+				return ARGB(255,255,0,0);
+			case "g":
+				return ARGB(255,0,255,0);
+			case "b":
+				return ARGB(255,130,130,255);
+			case "y":
+				return ARGB(255,255,255,0);
+			case "o":
+				return ARGB(255,255,169,0);
+		}
+		return -1;//white
+	}
+	
+	void PrepareFilters(string filter, out TStringArray filters, out TIntArray colors)
+	{
+		filter.Trim();
+		filter.ToLower();
+
+		filters = new TStringArray;
+		TStringArray rawFilters = new TStringArray;
+		filter.Split(" ", rawFilters);
+		
+		colors = new TIntArray;
+
+		
+		foreach (int i, string f:rawFilters)
+		{
+			int color = -1;
+			if (f.IndexOf(":") == 1)//detect color prefix
+			{
+				string clr = f.Substring(0, 1);
+				f = f.Substring(2, f.Length() - 2);//crop off color prefix
+				color = GetFilterColor(clr);
+			}
+			else//autocolor
+			{
+				if (i%2 == 1)
+				{
+					color = ARGB(200,255,255,255);
+				}
+			}
+			filters.Insert(f);
+			colors.Insert(color);
+		}
+	}
+	
+	
+	void ChangeFilter(TStringArray classes, TextListboxWidget widget, MultilineEditBoxWidget filterWidget, int categoryMask = -1, bool ignoreScope = false)
+	{
+		widget.ClearItems();
+		
+		TStringArray filters;
+		TIntArray filterColors;
+		
+		string widgetText;
+		filterWidget.GetText(widgetText);
+		PrepareFilters(widgetText, filters, filterColors);
+		
+		map<string,int> itemsAndColors = new map<string,int>();
+		map<string,ref TStringArray> itemsByFilters = new map<string,ref TStringArray>();
+
+		TStringArray itemsArray = TStringArray();
+		
+		for (int i = 0; i < classes.Count(); i++)
+		{
+			string config_path = classes.Get(i);
+
+			int objects_count = GetGame().ConfigGetChildrenCount(config_path);
+			for (int j = 0; j < objects_count; j++)
+			{
+				string child_name;
+				
+				GetGame().ConfigGetChildName(config_path, j, child_name);
+
+				int scope = GetGame().ConfigGetInt(config_path + " " + child_name + " scope");
+				
+				if (scope >= m_ObjectsScope || ignoreScope)
+				{
+					int category_bit = GetGame().ConfigGetInt(config_path + " " + child_name + " debug_ItemCategory") - 1;
+					category_bit = (1 << category_bit);
+					
+					bool display = false;
+					int color = 0;
+					if (category_bit & categoryMask)
+					{
+						display = true;
+					}
+					else if ((!m_ConfigDebugProfile.GetMergeType() || categoryMask == 0) && filters.Count() > 0)
+					{
+						string child_name_lower = child_name;
+						child_name_lower.ToLower();
+						
+						foreach (int indx, string filter:filters)
+						{
+							if (child_name_lower.Contains(filter))
+							{
+								display = false;
+								color = filterColors.Get(indx);
+								TStringArray arr = itemsByFilters.Get(filter);
+								if (!arr)
+								{
+									arr = new TStringArray();
+									itemsByFilters.Set(filter, arr);
+								}
+								arr.Insert(child_name);
+								itemsAndColors.Insert(child_name,color);
+								break;
+							}
+						}
+					}
+					else if (categoryMask == 0)
+					{
+						display = true;
+					}
+
+					if (display)
+					{
+						itemsArray.Insert(child_name);
+						
+					}
+				}
+			}
+		}
+	
+		if (itemsArray)
+		{
+			itemsArray.Sort();
+			foreach (string it:itemsArray)
+			{
+				widget.AddItem(it, NULL, 0);
+			}
+		}
+		
+		if (filters)
+		{
+			if (m_FilterOrderReversed)
+				filters.Invert();
+			
+			foreach (string f:filters)
+			{
+				TStringArray arr2 = itemsByFilters.Get(f);
+				if (arr2)
+				{
+					arr2.Sort();
+					foreach (string itm: arr2)
+					{
+						int row = widget.AddItem(itm, NULL, 0);
+						int clr = itemsAndColors.Get(itm);
+						if (clr)
+						{
+							widget.SetItemColor(row, 0, clr);
+						}
+					}
+				}
+			}
+		}
+		
+		
+	}
+	
+	
+	void SetFilterOrder(bool reversed)
+	{
+		m_FilterOrderReversed = reversed;
+		if (reversed)
+			m_FilterOrderImage.SetRotation(0,0,180,true);
+		else
+			m_FilterOrderImage.SetRotation(0,0,0,true);
+		ChangeFilterItems(true);
+		if (m_ConfigDebugProfile)
+		{
+			m_ConfigDebugProfile.SetFilterOrderReversed(reversed);
+		}
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		if (w == m_ShowProtected)
+		{
+			if (m_ShowProtected.IsChecked())
+			{
+				m_ObjectsScope = 1;	
+			}
+			else
+			{
+				m_ObjectsScope = 2;
+			}
+			ChangeFilterItems(true);
+			return true;
+		}
+		else if (w == m_ClearInventory)
+		{
+			CLEAR_IVN = m_ClearInventory.IsChecked();
+			return true;
+		}
+		else if (m_CategoryButtonsWidgets.Find(w) >= 0)
+		{
+			
+			int pos = m_CategoryButtonsWidgets.Find(w);
+			int bit = Math.Pow(2,pos);
+			CheckBoxWidget cbw = CheckBoxWidget.Cast(w);
+			if (cbw.IsChecked())
+			{
+				m_CategoryMask = m_CategoryMask | bit;
+				cbw.SetTextColor(ARGB(255, 255, 0, 0));
+			}
+			else
+			{
+				m_CategoryMask = (m_CategoryMask & ~bit);
+				cbw.SetTextColor(ARGB(255, 255, 255,255));
+			}
+
+			ChangeFilterItems(true);
+			return true;
+		}
+		
+		/*
+		if (w == m_ObjectFilter)
+		{
+			m_RefreshFilterTimer.Run(0.85, this, "ChangeFilterItems", null, false);
+			return true;
+		}*/
+		if (w == m_QuantityEditBox && (GetCurrentItemIndex() >= 0 || GetCurrentPresetName() != ""))
+		{
+			m_ConfigDebugProfile.SetItemQuantity(GetCurrentPresetName(), GetCurrentItemIndex(), m_QuantityEditBox.GetText().ToFloat());
+			return true;
+		}
+		else if (w == m_DrawDistanceWidget)
+		{
+			DRAW_DISTANCE = m_DrawDistanceWidget.GetText().ToFloat();
+			return true;
+		}
+		else if (w == m_DamageEditBox && (GetCurrentItemIndex() >= 0 || GetCurrentPresetName() != ""))
+		{
+			m_ConfigDebugProfile.SetItemHealth(GetCurrentPresetName(), GetCurrentItemIndex(), m_DamageEditBox.GetText().ToFloat());
+			return true;
+		}
+		else if (w == m_WithPhysicsCheckbox && (GetCurrentItemIndex() >= 0 || GetCurrentPresetName() != ""))
+		{
+			m_ConfigDebugProfile.SetItemWithPhysics(GetCurrentPresetName(), GetCurrentItemIndex(), m_WithPhysicsCheckbox.IsChecked());
+			return true;
+		}
+		else if (w == m_BatchSpawnQuantity)
+		{
+			m_ConfigDebugProfile.SetBatchSpawnQuantity(m_BatchSpawnQuantity.GetText().ToInt());
+			return true;
+		}
+		else if ((w == m_RectSpawnRow || w == m_RectSpawnColumn ||  w == m_RectSpawnRowStep ||  w == m_RectSpawnColumnStep))
+		{
+			if (w == m_RectSpawnRow || w == m_RectSpawnColumn)
+			{
+				int rowQ = m_RectSpawnRow.GetText().ToInt();
+				int columnQ = m_RectSpawnColumn.GetText().ToInt();
+				int result = columnQ * rowQ;
+				m_BatchSpawnQuantity.SetText(result.ToString());
+				m_ConfigDebugProfile.SetBatchSpawnQuantity(m_BatchSpawnQuantity.GetText().ToInt());
+			}
+			
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetBatchSpawnRectangle(m_RectSpawnRow.GetText().ToInt(),m_RectSpawnColumn.GetText().ToInt(), m_RectSpawnRowStep.GetText().ToFloat(),m_RectSpawnColumnStep.GetText().ToFloat());
+			}
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn)
+	{
+		super.OnItemSelected(w, x, y, row, column, oldRow, oldColumn);
+		if (w == m_PresetsTextListbox && (m_SelectedObjectIsPreset == 1 || m_SelectedObjectIsPreset == -1))
+		{
+			if (m_PresetsTextListbox.GetSelectedRow() != -1)
+			{
+				SelectPreset();
+				return true;
+			}
+		}
+		else if (w == m_PresetItemsTextListbox)
+		{
+			if (m_PresetItemsTextListbox.GetSelectedRow() != -1)
+			{
+				ShowItemButtons();
+				ShowItemTransferButtons();
+				m_SelectedObjectText.SetText(GetCurrentItemName());
+				SetObject(GetCurrentItemName());
+				m_SelectedObjectIsPreset = 0;
+			}
+			return true;
+		}
+		else if (w == m_ObjectsTextListbox)
+		{
+			SelectObject(false);
+			return true;
+		}
+		return false;
+	}
+	
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w,x,y,button);
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		int objects_row_index;
+		if (w == m_CategoryMergeType)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetMergeType(m_CategoryMergeType.IsChecked());
+			}
+			ChangeFilterItems(true);
+			// Refresh UI by new settings
+			m_MissionGameplay.GetHudDebug().RefreshByLocalProfile();
+			return true;
+		}
+		else if (w == m_ObjectFilter)
+		{
+			ChangeFilterItems(true);
+			return true;
+		}
+		else if (w == m_ItemPreviewCheckbox)
+		{
+			if (m_ConfigDebugProfile)
+			{
+				m_ConfigDebugProfile.SetShowItemPreview(m_ItemPreviewCheckbox.IsChecked());
+				if (!m_ItemPreviewCheckbox.IsChecked())
+				{
+					m_ItemPreviewWidget.SetItem(null);
+				}
+			}
+		}
+		else if (w == m_SpawnInInvButton || w == m_SpawnGroundButton || w == m_SpawnOnTarget || w == m_SpawnOnCursor || w == m_SpawnInHands)
+		{
+			SaveProfileSpawnDistance();
+
+			objects_row_index = m_ObjectsTextListbox.GetSelectedRow();
+			
+			vector rayStart = GetGame().GetCurrentCameraPosition();
+			vector rayEnd = rayStart + GetGame().GetCurrentCameraDirection() * 50;		
+			vector hitPos;
+			vector hitNormal;
+			int hitComponentIndex;		
+			set<Object> hitObjects = new set<Object>;
+			//DayZPhysics.RaycastRV(rayStart, rayEnd, hitPos, hitNormal, hitComponentIndex, hitObjects, NULL, player,);
+			DayZPhysics.RaycastRV(rayStart, rayEnd, hitPos, hitNormal, hitComponentIndex, hitObjects, NULL, player, false, false, ObjIntersectView, 0.3);
+					
+			EntityAI target;
+			if (hitObjects.Count())
+				target = EntityAI.Cast(hitObjects.Get(0));
+			
+			if (m_SelectedObject != "")
+			{
+				// @NOTE: duplicate code in PluginDeveloper.c
+				float distance = m_SpawnDistanceEditBox.GetText().ToFloat();
+				
+				
+				if (m_SelectedObjectIsPreset == 1)
+				{
+					//------------ PRESETS -------------
+					switch (w)
+					{
+						case m_SpawnOnTarget:
+						{
+							if (target && target.IsInherited(EntityAI))
+							{
+								EntityAI att_parent = EntityAI.Cast(target) ;
+								SpawnPreset(att_parent, CLEAR_IVN, m_SelectedObject);
+							}
+							break;
+						}
+						case m_SpawnGroundButton:
+						{
+							SpawnPreset(player, false, m_SelectedObject, InventoryLocationType.GROUND, distance);
+							break;
+						}						
+						default:
+						{
+							SpawnPreset(player, CLEAR_IVN, m_SelectedObject);
+							break;
+						}
+					}
+				}
+				else
+				{
+					//------------SINGLE ITEMS ------------
+					
+					
+					float health = m_DamageEditBox.GetText().ToFloat() * MiscGameplayFunctions.GetTypeMaxGlobalHealth(m_SelectedObject);
+					float quantity = m_QuantityEditBox.GetText().ToFloat();
+					bool withPhysics = m_WithPhysicsCheckbox.IsChecked();
+
+					bool spawnOnCrossHair = DeveloperFreeCamera.IsFreeCameraEnabled() || w == m_SpawnOnCursor;
+
+
+					switch (w)
+					{
+						case m_SpawnGroundPatternGrid:
+						{
+							m_Developer.SpawnEntityOnCursorDir(player, m_SelectedObject, quantity, distance, health, m_IsShiftDown, "", withPhysics);
+							break;
+						}
+						
+						case m_SpawnOnTarget:
+						{
+							if (target && target.IsInherited(EntityAI))
+								m_Developer.SpawnEntityInInventory(target, m_SelectedObject, health, quantity, m_IsShiftDown);
+							break;
+						}
+
+						case m_SpawnInInvButton:
+						{
+							m_Developer.SpawnEntityInPlayerInventory(player, m_SelectedObject, -1, quantity, m_IsShiftDown);
+							break;
+						}
+						case m_SpawnInHands:
+						{
+							m_Developer.SpawnEntityInPlayerInventory(player, m_SelectedObject, -1, quantity, m_IsShiftDown,"", FindInventoryLocationType.HANDS);
+							break;
+						}
+						case m_SpawnOnCursor:
+						case m_SpawnGroundButton:
+						{
+							if (spawnOnCrossHair)
+							{
+								m_Developer.SpawnItemOnCrosshair(player, m_SelectedObject, health, quantity, 40, true, m_IsShiftDown, withPhysics );
+							}
+							else
+							{
+								m_Developer.SpawnEntityOnCursorDir(player, m_SelectedObject, quantity, distance, health, m_IsShiftDown, "", withPhysics);
+							}
+							break;
+						}
+					}
+				}
+			}
+			return true;
+		}
+		else if (w == m_FilterOrderButton)
+		{
+			SetFilterOrder(!m_FilterOrderReversed);
+			return true;
+		}
+		else if (w == m_PresetsTextListbox)
+		{
+			SelectPreset();
+			return true;
+		}
+		else if (w == m_PresetItemsTextListbox)
+		{
+			m_ObjectsTextListbox.SelectRow(-1);
+			ShowItemButtons();
+			ShowItemTransferButtons();
+			m_SelectedObjectText.SetText("Object : " + GetCurrentItemName());
+			SetObject(GetCurrentItemName());
+			m_SelectedObjectIsPreset = 0;
+
+			return true;
+		}
+		else if (w == m_PresetSetDefaultButton)
+		{
+			if (GetCurrentPresetName()!= "")
+			{
+				SetDefaultPreset(GetCurrentPresetIndex());
+			}
+			return true;
+		}
+		else if (w == m_PresetNewButton)
+		{
+			g_Game.GetUIManager().EnterScriptedMenu(MENU_SCRIPTCONSOLE_DIALOG_PRESET_NAME, m_ScriptConsole);
+			return true;
+		}
+		else if (w == m_PresetDeleteButton)
+		{
+			if (GetCurrentPresetName()!= "")
+			{
+				DeletePreset();
+			}
+			return true;
+		}
+		else if (w == m_PresetRenameButton)
+		{
+			if (GetCurrentPresetName()!= "")
+			{
+				g_Game.GetUIManager().EnterScriptedMenu(MENU_SCRIPTCONSOLE_DIALOG_PRESET_RENAME, m_ScriptConsole);
+			}
+			return true;
+		}
+		else if (w == m_PresetAddItemtButton)
+		{
+			AddItemToPreset();
+			return true;
+		}
+		else if (w == m_ItemNameCopy)
+		{
+			AddItemToClipboard(m_ObjectsTextListbox);
+			return true;
+		}
+		else if (w == m_PresetRemoveItemButton)
+		{
+			RemoveItemFromPreset();
+			return true;
+		}
+		else if (w == m_ItemMoveUpButton)
+		{
+			ItemMoveUp();
+			return true;
+		}
+		else if (w == m_ItemMoveDownButton)
+		{
+			ItemMoveDown();
+			return true;
+		}
+		else if (w == m_SpawnBatchButton)
+		{
+			int count = m_BatchSpawnQuantity.GetText().ToInt();
+			int rows = m_RectSpawnRow.GetText().ToInt();
+			int columns = m_RectSpawnColumn.GetText().ToInt();
+			float rowStep = m_RectSpawnRowStep.GetText().ToFloat();
+			float columnStep = m_RectSpawnColumnStep.GetText().ToFloat();
+			m_Developer.SpawnEntityOnGroundPatternGrid(player, m_SelectedObject,count, m_DamageEditBox.GetText().ToFloat(), 1, rows, columns, rowStep, columnStep, m_IsShiftDown, m_WithPhysicsCheckbox.IsChecked());
+			return true;
+		}
+		else if (w == m_ListActions)
+		{
+			if (!m_PreviewEntity)
+				return false;
+			
+			return ListItemRelatedActions();
+		}
+		else if (w == m_ObjectsTextListbox)
+		{
+			SelectObject();
+			return true;
+		}
+		else if (w == m_DrawInWorld)
+		{
+			DrawItems(m_SelectedObject);
+			return true;
+			
+		}
+		else if (w == m_DrawInWorldClear)
+		{
+			DrawItemsClear();
+			return true;
+		}
+
+		return false;
+	}
+	
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		super.OnDoubleClick(w, x, y, button);
+
+		int i;
+		int objects_row_index;
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if (w == m_ObjectsTextListbox)
+		{
+			//select item
+			m_PresetItemsTextListbox.SelectRow(-1);
+			HideItemButtons();
+			ShowItemTransferButtons();
+			m_SelectedObjectText.SetText("Object : " + GetCurrentObjectName());
+
+			m_SelectedObject = GetCurrentObjectName();
+			m_LastSelectedObject = m_SelectedObject;
+			m_SelectedObjectIsPreset = 0;
+			
+			//spawn item
+			SaveProfileSpawnDistance();
+
+			objects_row_index = m_ObjectsTextListbox.GetSelectedRow();
+			
+			vector rayStart = GetGame().GetCurrentCameraPosition();
+			vector rayEnd = rayStart + GetGame().GetCurrentCameraDirection() * 1.5;		
+			vector hitPos;
+			vector hitNormal;
+			int hitComponentIndex;		
+			set<Object> hitObjects = new set<Object>;
+			DayZPhysics.RaycastRV(rayStart, rayEnd, hitPos, hitNormal, hitComponentIndex, hitObjects, NULL, player);
+					
+			Object target = NULL;
+			if (hitObjects.Count())
+				target = hitObjects.Get(0);
+			
+			if (m_SelectedObject != "")
+			{
+				float distance = m_SpawnDistanceEditBox.GetText().ToFloat();
+				
+				if (button == 0)		//LMB
+				{
+					m_Developer.SpawnEntityOnCursorDir(player, m_SelectedObject, 1, distance);
+					return true;
+				}
+				else if (button == 1)		//RMB
+				{
+					if (GetGame().IsMultiplayer())
+					{
+						m_Developer.SpawnEntityInPlayerInventory(player, m_SelectedObject, -1, -1);
+					}
+					else
+					{
+						EntityAI spawned_entity = m_Developer.SpawnEntityOnCursorDir(player, m_SelectedObject, -1, distance);
+						player.LocalTakeEntityToHands(spawned_entity);
+					}
+					return true;
+				}
+				else if (button == 2) //MMB
+				{
+					m_Developer.SpawnEntityOnCursorDir(player, m_SelectedObject, 1, distance,-1, true);
+					return true;
+				}
+			}
+			
+		}
+		else if (w == m_QuantityEditBox)
+		{
+			m_QuantityEditBox.SetText("1.0");
+			return true;
+		}
+		return false;
+	}
+	
+	override void Update(float timeslice)
+	{
+		m_IsShiftDown = KeyState(KeyCode.KC_LSHIFT) || KeyState(KeyCode.KC_RSHIFT);
+		
+		UpdateButtonNames();
+		
+		super.Update(timeslice);
+	}
+	
+	void SetTextSpawnButton(ButtonWidget w, bool special, string suffix = " Special")
+	{
+		string text = m_SpawnButtonsOriginalText.Get(w);
+		if (special)
+			text += suffix;
+		w.SetText(text);
+	}
+	
+	void UpdateButtonNames()
+	{
+		SetTextSpawnButton(m_SpawnGroundButton, m_IsShiftDown);
+		SetTextSpawnButton(m_SpawnInInvButton, m_IsShiftDown);
+		SetTextSpawnButton(m_SpawnOnTarget, m_IsShiftDown);
+		SetTextSpawnButton(m_SpawnOnCursor, m_IsShiftDown);
+		SetTextSpawnButton(m_SpawnBatchButton, m_IsShiftDown);
+		SetTextSpawnButton(m_SpawnInHands, m_IsShiftDown);
+	}
+	
+	TStringArray GetItemsClasses()
+	{
+		return {CFG_VEHICLESPATH, CFG_WEAPONSPATH, CFG_MAGAZINESPATH, CFG_AMMO};
+	}
+	
+	protected string PreprocessFilterText(MultilineEditBoxWidget w)
+	{
+		string widgetText;
+		w.GetText(widgetText);
+		
+		if (widgetText.Contains(","))
+		{
+			widgetText.Replace(","," ");
+			w.SetLine(0,widgetText);
+		}
+		return widgetText;
+	}
+	
+	void ChangeFilterItems(bool forced = false)
+	{
+		string widgetText = PreprocessFilterText(m_ObjectFilter);
+		if (widgetText == m_FilterTextPrev && !forced)
+			return;
+		
+		m_FilterTextPrev = widgetText;
+		string txt = m_ConfigDebugProfile.GetItemSearch();
+
+		m_ConfigDebugProfile.SetItemSearch(widgetText);
+		ChangeFilter(GetItemsClasses(), m_ObjectsTextListbox,m_ObjectFilter, m_CategoryMask);
+	}
+	
+	private bool ListItemRelatedActions()
+	{
+		string message = "";
+		
+		array<ActionBase_Basic> interactActions = new array<ActionBase_Basic>();
+		m_PreviewEntity.GetActions(InteractActionInput, interactActions);
+		if (interactActions)
+		{
+			message += "\n== Interact (F)\n\n";
+			foreach (ActionBase_Basic iaction : interactActions)
+			{
+			  	if (iaction.Type() == ActionWorldCraft)
+			    	continue;
+			
+			  	ActionBase ia = ActionBase.Cast(iaction);
+			  	message += string.Format("%1 <%2>\n", Widget.TranslateString(ia.GetText()), ia.ClassName());
+			}
+		}
+		
+		array<ActionBase_Basic> continuousInteractActions = new array<ActionBase_Basic>();
+		m_PreviewEntity.GetActions(ContinuousInteractActionInput, continuousInteractActions);
+		if (continuousInteractActions)
+		{
+			message += "\n== Continuous Interact (F hold)\n\n";
+			foreach (ActionBase_Basic ciaction : continuousInteractActions)
+			{
+			  	if (ciaction.Type() == ActionWorldCraft)
+			    	continue;
+			
+			  	ActionBase cia = ActionBase.Cast(ciaction);
+			  	message += string.Format("%1 <%2>\n", Widget.TranslateString(cia.GetText()), cia.ClassName());
+			}
+		}
+
+		array<ActionBase_Basic> singleActions = new array<ActionBase_Basic>();
+		m_PreviewEntity.GetActions(DefaultActionInput, singleActions);
+		if (singleActions)
+		{
+			message += "\n== Single (LMB)\n\n";
+			foreach (ActionBase_Basic saction : singleActions)
+			{
+				if (saction.Type() == ActionWorldCraft)
+			    	continue;
+			
+			  	ActionBase sa = ActionBase.Cast(saction);
+			  	message += string.Format("%1 <%2>\n", Widget.TranslateString(sa.GetText()), sa.ClassName());
+			}
+		}
+
+		array<ActionBase_Basic> continuousActions = new array<ActionBase_Basic>();
+		m_PreviewEntity.GetActions(ContinuousDefaultActionInput, continuousActions);
+		if (continuousActions)
+		{
+			ActionBase_Basic craftingAction;
+			message += "\n== Continuous (LMB hold)\n\n";
+			foreach (ActionBase_Basic caction : continuousActions)
+			{
+				if (caction.Type() != ActionWorldCraft)
+				{
+			  		ActionBase ca = ActionBase.Cast(caction);
+			  		message += string.Format("%1 <%2>\n", Widget.TranslateString(ca.GetText()), ca.ClassName());
+				}
+				else
+				{
+					craftingAction = caction;
+				}
+			}
+			message += "\n== Crafting recipes \n\n";
+			if (craftingAction)
+			{	
+				PluginRecipesManager pluginRecipesManager = PluginRecipesManager.Cast(GetPlugin(PluginRecipesManager));
+				array<RecipeBase> recipes = pluginRecipesManager.GetRecipesForItem(m_PreviewEntity.GetType());
+				foreach (RecipeBase recipe : recipes)
+				{
+					if (recipe.IsItemInRecipe("Inventory_Base"))
+						continue;
+					
+					message += string.Format("%1 <%2>\n", Widget.TranslateString(recipe.GetName()), recipe.Type());
+				}
+			}
+		}
+		
+		ScriptConsoleUniversalInfoDialog infoDialog = ScriptConsoleUniversalInfoDialog.Cast(g_Game.GetUIManager().EnterScriptedMenu(MENU_SCRIPTCONSOLE_UNIVERSAL_INFO_DIALOG, m_ScriptConsole));
+		infoDialog.SetLabel(string.Format("%1 related actions", m_PreviewEntity.GetType()));
+		infoDialog.SetContent(message);
+
+		return true;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleOutputTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleOutputTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..2be672a24b0080539e434640a0df51fd12ca2a25
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleOutputTab.c
@@ -0,0 +1,75 @@
+class ScriptConsoleOutputTab : ScriptConsoleTabBase
+{
+	protected TextListboxWidget m_ClientLogListbox;
+	protected ButtonWidget 		m_ClientLogClearButton;
+	protected CheckBoxWidget 	m_ClientLogScrollCheckbox;
+	
+	void ScriptConsoleOutputTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_ClientLogListbox = TextListboxWidget.Cast(root.FindAnyWidget("TextListbox"));
+		m_ClientLogClearButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonClear"));
+		m_ClientLogScrollCheckbox = CheckBoxWidget.Cast(root.FindAnyWidget("CheckBoxAutoScroll"));
+		ReloadOutput();
+	}
+	
+	void ~ScriptConsoleOutputTab()
+	{
+	}
+		
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w,x,y,button);
+		
+		if (w == m_ClientLogClearButton)
+		{
+			Clear(true);
+			return true;
+		}
+		return false;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		return false;
+	}
+
+	
+	protected void Clear(bool clearFile = false)
+	{
+		if(clearFile)
+			Debug.ClearLogs();
+		m_ClientLogListbox.ClearItems();
+	}
+	
+	protected void Add(string message, bool isReload = false)
+	{
+		if (m_ClientLogListbox)
+		{
+			m_ClientLogListbox.AddItem(String(message), NULL, 0);
+
+			if (m_ClientLogScrollCheckbox.IsChecked())
+			{
+				m_ClientLogListbox.EnsureVisible(m_ClientLogListbox.GetNumItems());
+			}
+		}
+	}
+	
+	protected void ReloadOutput()
+	{
+		Clear();
+		FileHandle file_index = OpenFile(Debug.GetFileName(), FileMode.READ);
+		
+		if ( file_index )
+		{
+			string line_content;
+			while ( FGets( file_index,  line_content ) != -1 )
+			{
+				Add(line_content, true);
+			}
+			
+			CloseFile(file_index);
+		}
+	}
+	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleSoundsTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleSoundsTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..26af70205779e800c2985dd03ba93a7b86da3160
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleSoundsTab.c
@@ -0,0 +1,323 @@
+class ScriptConsoleSoundsTab : ScriptConsoleTabBase
+{
+	protected bool 				m_PlayerPosRefreshBlocked;
+	protected static float 		DEBUG_MAP_ZOOM = 1;
+	protected vector 			m_MapPos;
+	protected ButtonWidget 		m_CopySoundset;
+	protected ButtonWidget 		m_PlaySoundset;
+	protected ButtonWidget 		m_PlaySoundsetLooped;
+	protected ButtonWidget 		m_StopSoundset;
+
+	protected EditBoxWidget 		m_SoundFilter;
+	protected TextListboxWidget 	m_SoundsTextListbox;
+	
+	protected static EffectSound 	m_SoundSet;
+	protected ref Timer 			m_RefreshFilterTimer = new Timer();
+	
+	protected MapWidget 			m_DebugMapWidget;
+	protected TextWidget 			m_MapDistWidget;
+	protected TextWidget	 		m_MouseCurPos;
+	protected TextWidget	 		m_MapHeadingWidget;
+	
+	void ScriptConsoleSoundsTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_MouseCurPos		= TextWidget.Cast(root.FindAnyWidget("MapSoundsPos"));
+		m_MapDistWidget		= TextWidget.Cast(root.FindAnyWidget("MapSoundsDistance"));
+		m_MapHeadingWidget	= TextWidget.Cast(root.FindAnyWidget("MapHeadingSounds"));
+		
+		m_CopySoundset		= ButtonWidget.Cast(root.FindAnyWidget("SoundsetCopy"));
+		m_PlaySoundset		= ButtonWidget.Cast(root.FindAnyWidget("PlaySoundset"));
+		m_PlaySoundsetLooped = ButtonWidget.Cast(root.FindAnyWidget("PlaySoundsetLooped"));
+		m_StopSoundset 		= ButtonWidget.Cast(root.FindAnyWidget("StopSoundset"));
+		m_DebugMapWidget = MapWidget.Cast(root.FindAnyWidget("MapSounds"));
+		
+		m_SoundFilter = EditBoxWidget.Cast(root.FindAnyWidget("SoundsFilter"));
+		m_SoundsTextListbox = TextListboxWidget.Cast(root.FindAnyWidget("SoundsList"));
+		
+		m_SoundFilter.SetText(m_ConfigDebugProfile.GetSoundsetFilter());
+		
+		
+		ChangeFilterSound();
+		
+		if (GetGame().GetPlayer())
+		{
+			m_DebugMapWidget.SetScale(DEBUG_MAP_ZOOM);
+			m_DebugMapWidget.SetMapPos(GetGame().GetPlayer().GetWorldPosition());
+			SetMapPos(GetGame().GetPlayer().GetWorldPosition());
+		}
+	}
+	
+	void ~ScriptConsoleSoundsTab(Widget root)
+	{
+		DEBUG_MAP_ZOOM = m_DebugMapWidget.GetScale();
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		
+		if (w == m_SoundFilter)
+		{
+			m_RefreshFilterTimer.Run(0.85, this, "ChangeFilterSound", null, false);
+			return true;
+		}
+		return false;
+	}
+	
+	void UpdateMousePos()
+	{
+		if(!GetGame().GetPlayer())
+			return;
+		int x,y;
+		GetMousePos(x,y);
+		vector mousePos, worldPos;
+		mousePos[0] = x;
+		mousePos[1] = y;
+		worldPos = m_DebugMapWidget.ScreenToMap(mousePos);
+		vector playerPos = GetGame().GetPlayer().GetWorldPosition();
+		if (GetMapPos() != playerPos)
+			worldPos = GetMapPos();
+		worldPos[1] = GetGame().SurfaceY(worldPos[0], worldPos[2]);
+		
+		if (m_MouseCurPos)
+		{
+			m_MouseCurPos.SetText("Mouse: "+ MiscGameplayFunctions.TruncateToS(worldPos[0]) +", "+ MiscGameplayFunctions.TruncateToS(worldPos[1]) +", "+ MiscGameplayFunctions.TruncateToS(worldPos[2]));
+		}
+		if (m_MapDistWidget && GetGame().GetPlayer())
+		{
+			float dst = (worldPos - playerPos).Length();
+
+			m_MapDistWidget.SetText("Distance: " + MiscGameplayFunctions.TruncateToS(dst));
+		}
+		if (m_MapHeadingWidget)
+		{
+			vector playerCamDir = GetGame().GetCurrentCameraDirection();
+			float heading = Math3D.AngleFromPosition(playerPos, playerCamDir, worldPos) * Math.RAD2DEG;
+			m_MapHeadingWidget.SetText("Heading:" +heading.ToString());
+		}
+	}
+	
+	protected void PrepareFilters(string filter, out TStringArray filters)
+	{
+		filter.Trim();
+		filter.ToLower();
+
+		filters = new TStringArray;
+		TStringArray rawFilters = new TStringArray;
+		filter.Split(" ", rawFilters);
+		
+		foreach (int i, string f:rawFilters)
+		{
+			filters.Insert(f);
+
+		}
+	}
+	
+	// this is a 95% of the code of the function of the same name inside ScriptConsole.c
+	protected void ChangeFilter(TStringArray classes, TextListboxWidget widget, EditBoxWidget filterWidget, int categoryMask = -1, bool ignoreScope = false)
+	{
+		widget.ClearItems();
+		
+		TStringArray filters;
+		PrepareFilters(filterWidget.GetText(),filters);
+
+		map<string,ref TStringArray> itemsByFilters = new map<string,ref TStringArray>();
+
+		TStringArray itemsArray = TStringArray();
+		
+		for (int i = 0; i < classes.Count(); i++)
+		{
+			string config_path = classes.Get(i);
+
+			int objects_count = GetGame().ConfigGetChildrenCount(config_path);
+			for (int j = 0; j < objects_count; j++)
+			{
+				string child_name;
+				bool add = false;
+				GetGame().ConfigGetChildName(config_path, j, child_name);
+
+				if (!filters.Count())
+				{
+					add = true;
+				}
+				else
+				{
+					foreach (int indx, string filter:filters)
+					{
+						string child_name_lower = child_name;
+						child_name_lower.ToLower();
+						
+						if (child_name_lower.Contains(filter))
+						{
+							add = true;
+							break;			
+						}
+					}
+				}
+				if (add)
+					itemsArray.Insert(child_name);
+			}
+		}
+	
+		if (itemsArray)
+		{
+			itemsArray.Sort();
+			foreach (string it:itemsArray)
+			{
+				widget.AddItem(it, NULL, 0);
+			}
+		}
+		
+		if (filters)
+		{
+			/*
+			if (m_FilterOrderReversed)
+				filters.Invert();
+			*/
+			foreach (string f:filters)
+			{
+				TStringArray arr2 = itemsByFilters.Get(f);
+				if (arr2)
+				{
+					arr2.Sort();
+					foreach (string itm: arr2)
+					{
+						int row = widget.AddItem(itm, NULL, 0);
+					}
+				}
+			}
+		}
+		
+		
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		HandleKeys();
+		m_DebugMapWidget.ClearUserMarks();
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		
+		if (player)
+		{
+			vector playerPos = player.GetWorldPosition();
+			m_DebugMapWidget.AddUserMark(playerPos,"You", COLOR_RED,"\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+			
+			if (playerPos != GetMapPos())
+				m_DebugMapWidget.AddUserMark(GetMapPos(),"Source", COLOR_GREEN,"\\dz\\gear\\navigation\\data\\map_tree_ca.paa");
+		}
+		UpdateMousePos();
+	}
+	
+	protected void HandleKeys()
+	{
+		bool playRequested = KeyState(KeyCode.KC_P) != 0;
+		if (playRequested)
+		{
+			int selected_row_index = m_SoundsTextListbox.GetSelectedRow();
+			
+			if (m_SoundSet)
+				m_SoundSet.Stop();
+			if (selected_row_index != -1)
+			{
+				string soundSetName;
+				m_SoundsTextListbox.GetItemText(selected_row_index, 0, soundSetName);
+				
+				m_SoundSet = SEffectManager.PlaySoundEnviroment(soundSetName, GetMapPos());
+				m_SoundSet.SetAutodestroy(true);
+			}
+		}
+	}
+	
+	protected void SetMapPos(vector pos)
+	{
+		m_MapPos = pos;
+	}
+	
+	protected vector GetMapPos()
+	{
+		return m_MapPos;
+	}
+	
+	override bool OnMouseButtonDown(Widget w, int x, int y, int button)
+	{
+		super.OnMouseButtonDown(w,x,y,button);
+		
+		if (w ==  m_DebugMapWidget)
+		{
+			if (button == 0)
+			{
+				m_PlayerPosRefreshBlocked = true;
+				int mouseX, mouseY;
+				GetMousePos(mouseX,mouseY);
+				vector mousePos, worldPos;
+				mousePos[0] = mouseX;
+				mousePos[1] = mouseY;
+				worldPos = m_DebugMapWidget.ScreenToMap(mousePos);
+				worldPos[1] = GetGame().SurfaceY(worldPos[0], worldPos[2]);
+				
+				SetMapPos(worldPos);
+			}
+			else if (button == 1 && GetGame().GetPlayer())
+			{
+				SetMapPos(GetGame().GetPlayer().GetWorldPosition());
+			}
+		}
+		return true;
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w,x,y,button);
+		
+		if (w == m_CopySoundset)
+		{
+			AddItemToClipboard(m_SoundsTextListbox);
+			return true;
+		}
+		else if (w == m_PlaySoundset || w == m_PlaySoundsetLooped)
+		{
+			int selected_row_index = m_SoundsTextListbox.GetSelectedRow();
+			string soundSetName;
+			if (m_SoundSet)
+				m_SoundSet.Stop();
+			if (selected_row_index != -1)
+			{
+				m_SoundsTextListbox.GetItemText(selected_row_index, 0, soundSetName);
+				
+				bool looped = (w == m_PlaySoundsetLooped);
+				m_SoundSet = SEffectManager.PlaySoundEnviroment(soundSetName, GetMapPos(), 0, 0, looped);
+
+			}
+			return true;
+		}
+		else if (w == m_StopSoundset)
+		{
+			if (m_SoundSet)
+				m_SoundSet.Stop();
+			return true;
+		}
+		else if (w == m_SoundFilter)
+		{
+			ChangeFilterSound();
+			return true;
+		}
+		
+		return false;
+	}
+	
+
+	protected TStringArray GetSoundClasses()
+	{
+		return {CFG_SOUND_SETS};
+	}
+	
+	protected void ChangeFilterSound()
+	{
+		m_ConfigDebugProfile.SetSoundsetFilter(m_SoundFilter.GetText());
+		ChangeFilter(GetSoundClasses(), m_SoundsTextListbox, m_SoundFilter, 0,true);
+	}
+	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleTabBase.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleTabBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..f0efc40fce39afc9e28ec8c3b9437c53c5931c6c
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleTabBase.c
@@ -0,0 +1,94 @@
+class ScriptConsoleTabBase
+{
+	protected int m_Id;
+	protected bool m_IsSelected;
+	protected Widget m_ParentRoot;
+	protected Widget m_Root;
+	protected Widget m_Button;
+	protected ScriptConsole m_ScriptConsole;
+	protected ScriptConsoleTabBase m_Parent;//for subtabs
+	protected PluginConfigDebugProfile m_ConfigDebugProfile;
+	protected PluginConfigDebugProfileFixed m_ConfigDebugProfileFixed;
+	
+	void ScriptConsoleTabBase(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_Button = button;
+		m_ScriptConsole = console;
+		m_Root = root;
+		if (parent)
+			m_ParentRoot = parent.GetRoot();
+		else
+			m_ParentRoot = console.layoutRoot;
+		m_ConfigDebugProfile = PluginConfigDebugProfile.Cast(GetPlugin(PluginConfigDebugProfile));
+		m_ConfigDebugProfileFixed	= PluginConfigDebugProfileFixed.Cast(GetPlugin(PluginConfigDebugProfileFixed));
+	}
+	
+	void Init(int id)
+	{
+		m_Id = id;
+	}
+	
+	int GetID()
+	{
+		return m_Id;
+	}
+	
+	Widget GetRoot()
+	{
+		return m_Root;
+	}
+	
+	bool IsSelected()
+	{
+		return m_IsSelected;
+	}
+	
+	void Select(bool select, ScriptConsoleTabBase selectedHandler)
+	{
+		m_IsSelected = select;
+		if (m_Root)
+		{
+			Show(select, selectedHandler);
+			ButtonWidget btn = ButtonWidget.Cast(m_Button);
+			if (btn)
+				btn.SetState(select);
+		}
+		if (select)
+			OnSelected();
+	}
+	
+	void OnSelected();
+	
+	void Show(bool show, ScriptConsoleTabBase selectedHandler)
+	{
+		m_Root.Show(show);
+		m_Root.Enable(show);
+	}
+	
+	Widget GetButton()
+	{
+		return m_Button;
+	}
+	
+	void Update(float timeslice);
+
+	bool OnChange(Widget w, int x, int y, bool finished);
+	bool OnClick(Widget w, int x, int y, int button);
+	bool OnItemSelected(Widget w, int x, int y, int row, int  column,	int  oldRow, int  oldColumn);
+	bool OnKeyDown(Widget w, int x, int y, int key);
+	bool OnDoubleClick(Widget w, int x, int y, int button);
+	void OnRPCEx(int rpc_type, ParamsReadContext ctx);
+	bool OnMouseButtonDown(Widget w, int x, int y, int button);
+	bool OnKeyPress(Widget w, int x, int y, int key);
+	
+	protected void AddItemToClipboard(TextListboxWidget text_listbox_widget)
+	{
+		int selected_row_index = text_listbox_widget.GetSelectedRow();
+		if (selected_row_index != -1)
+		{
+			string item_name;
+			text_listbox_widget.GetItemText(selected_row_index, 0, item_name);
+			GetGame().CopyToClipboard(item_name);
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleVicinityTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleVicinityTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..b7190303bc58c1d458e8be61e4200acfad8b8aeb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleVicinityTab.c
@@ -0,0 +1,157 @@
+class ScriptConsoleVicinityTab : ScriptConsoleTabBase
+{
+	protected static float m_Distance = 30;
+	protected static Object m_Selected = null;
+	
+	protected TextListboxWidget 	m_VicinityListbox;
+	protected ButtonWidget 			m_WatchItem;	
+	protected EditBoxWidget			m_DistanceWidget;
+	protected ref array<Object> 	m_VicinityItems = new array<Object>;
+
+	protected ref ContextMenu		m_ContextMenu;
+	
+	void ScriptConsoleVicinityTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		m_VicinityListbox = TextListboxWidget.Cast(root.FindAnyWidget("VicinityListbox"));
+		m_WatchItem = ButtonWidget.Cast(root.FindAnyWidget("WatchItemButton"));
+		m_DistanceWidget = EditBoxWidget.Cast(root.FindAnyWidget("DistanceInput"));
+		
+		m_DistanceWidget.SetText(m_Distance.ToString());
+
+		m_ContextMenu = new ContextMenu();
+		m_ContextMenu.Init(root.FindAnyWidget("VicinityContextMenu"), true);
+
+		m_ContextMenu.SetSize(1, 1);
+		m_ContextMenu.Show(0, 0);
+		
+		RenderList();
+	}
+	
+	override void OnSelected()
+	{
+		UpdateSelected();
+	}
+	
+	void RenderList()
+	{
+		float radius = m_DistanceWidget.GetText().ToFloat();
+		if (!radius)
+			return;
+		array<Object> objects = new array<Object>();
+		array<CargoBase> cargo = new array<CargoBase>();
+		
+		vector playerPos = GetGame().GetCurrentCameraPosition();
+		GetGame().GetObjectsAtPosition3D(playerPos, radius, objects,cargo);
+		m_VicinityListbox.ClearItems();
+		m_VicinityItems.Clear();
+
+		if (m_Selected && objects.Find(m_Selected) == -1)
+		{
+			objects.Insert(m_Selected);
+		}
+		
+		map<int, Object> objectsMap = new map<int, Object>();
+		array<int> distances = new array<int>();
+		
+		foreach (int x, Object obj:objects)
+		{
+			int dist = vector.Distance(playerPos, obj.GetPosition()) * 1000;
+			
+			while (objectsMap.Contains(dist))//hacking for when multiple objects are at the same distance from the player, otherwise sorting using map will fail
+				dist++;
+			objectsMap.Insert(dist, obj);
+			distances.Insert(dist);
+		}
+		
+		distances.Sort();
+		
+		foreach (int dst:distances)
+		{
+			Object o = objectsMap.Get(dst);
+			if (!o)
+				continue;
+			int i = 0;
+			if (o.Type() != Object)
+			{
+				m_VicinityItems.Insert(o);//insert at the end
+				int indx = m_VicinityListbox.AddItem(o.GetType(),null,0,-1);
+				float distanceMeters = dst / 1000;
+				m_VicinityListbox.SetItem(indx, distanceMeters.ToString(),null,1);
+				i++;
+				
+				if (m_Selected == o)
+				{
+					m_VicinityListbox.SelectRow(indx);
+				}
+			}
+		}
+		
+		UpdateSelected();
+	}
+	
+	void UpdateSelected()
+	{
+		int row = m_VicinityListbox.GetSelectedRow();
+		
+		m_Selected = null;
+		if (m_VicinityItems.IsValidIndex(row))
+		{
+			m_Selected = m_VicinityItems.Get(row);
+		}
+		
+		EntityAI entity = EntityAI.Cast(m_Selected);
+		if (entity)
+		{
+			m_ContextMenu.BuildContextMenu(entity, m_VicinityListbox, this);
+	
+			m_ContextMenu.SetSize(1, 1);
+			m_ContextMenu.Show(0, 0);
+		}
+		else
+		{
+			m_ContextMenu.Hide();
+		}
+	}
+		
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w,x,y,button);
+		
+		UpdateSelected();
+		
+		int row = m_VicinityListbox.GetSelectedRow();
+		if (w == m_WatchItem)
+		{
+			if (m_VicinityItems.IsValidIndex(row))
+			{
+				if (m_Selected)
+				{
+					PluginDeveloper.SetDeveloperItemClientEx(m_Selected);
+					return true;
+				}
+			}
+		}
+		
+		return false;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		super.OnChange(w, x, y, finished);
+		
+		UpdateSelected();
+		
+		if (w == m_DistanceWidget)
+		{
+			RenderList();
+			m_Distance = m_DistanceWidget.GetText().ToFloat();
+		}
+		return false;
+	}
+	
+	void OnSelectAction(EntityAI ent, int actionId)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		player.GetActionManager().OnInstantAction(ActionDebug,new Param2<EntityAI,int>(ent,actionId));
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptConsoleWeatherTab.c b/scripts/5_Mission/DayZ/GUI/ScriptConsoleWeatherTab.c
new file mode 100644
index 0000000000000000000000000000000000000000..a6f936a957619de78d9b3d134d1f371fb886d076
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptConsoleWeatherTab.c
@@ -0,0 +1,565 @@
+class ScriptConsoleWeatherTab : ScriptConsoleTabBase
+{
+	protected ref Timer m_RPCTimer = new Timer();
+	protected const int INTERPOLATION_MAX = 920;
+	protected const int DURATION_MAX = 920;
+	
+	// FOG
+	protected SliderWidget m_FogValueSetSlider;
+	protected SliderWidget m_FogValueGetSlider;
+	
+	protected TextWidget m_FogValueSetText;
+
+	protected SliderWidget m_FogInterpolationTimeSlider;
+	protected SliderWidget m_FogDurationTimeSlider;
+	
+	
+	protected TextWidget m_FogInterpolationMaxText;
+	protected TextWidget m_FogDurationMaxText;
+	
+	protected EditBoxWidget m_FogValueEditbox;
+	protected EditBoxWidget m_FogInterpolationEditbox;
+	protected EditBoxWidget m_FogDurationEditbox;
+	
+	protected static float m_FogValue = -1;
+	protected static float m_FogInterpolationTimeValue;
+	protected static float m_FogDurationTimeValue = -1;
+	
+	
+	// OVERCAST
+	protected SliderWidget m_OvercastValueSetSlider;
+	protected SliderWidget m_OvercastValueGetSlider;
+	
+	protected TextWidget m_OvercastValueSetText;
+
+	protected SliderWidget m_OvercastInterpolationTimeSlider;
+	protected SliderWidget m_OvercastDurationTimeSlider;
+	
+	
+	protected TextWidget m_OvercastInterpolationMaxText;
+	protected TextWidget m_OvercastDurationMaxText;
+	
+	protected EditBoxWidget m_OvercastValueEditbox;
+	protected EditBoxWidget m_OvercastInterpolationEditbox;
+	protected EditBoxWidget m_OvercastDurationEditbox;
+	
+	protected static float m_OvercastValue = -1;
+	protected static float m_OvercastInterpolationTimeValue;
+	protected static float m_OvercastDurationTimeValue = -1;
+	
+	
+	// Rain
+	protected SliderWidget m_RainValueSetSlider;
+	protected SliderWidget m_RainValueGetSlider;
+	
+	protected TextWidget m_RainValueSetText;
+
+	protected SliderWidget m_RainInterpolationTimeSlider;
+	protected SliderWidget m_RainDurationTimeSlider;
+	
+	
+	protected TextWidget m_RainInterpolationMaxText;
+	protected TextWidget m_RainDurationMaxText;
+	
+	protected EditBoxWidget m_RainValueEditbox;
+	protected EditBoxWidget m_RainInterpolationEditbox;
+	protected EditBoxWidget m_RainDurationEditbox;
+	
+	protected static float m_RainValue = -1;
+	protected static float m_RainInterpolationTimeValue;
+	protected static float m_RainDurationTimeValue = -1;
+	
+	
+	// Other
+	protected ButtonWidget m_ResetButton;
+	protected ButtonWidget m_UpdateButton;
+	protected ButtonWidget m_ApplyButton;
+	
+	protected ButtonWidget m_CopyButton;
+	protected ButtonWidget m_PasteButton;
+	
+	
+	
+	void ~ScriptConsoleWeatherTab()
+	{
+		// FOG
+		m_FogValue = m_FogValueSetSlider.GetCurrent() / 100;
+		m_FogInterpolationTimeValue = m_FogInterpolationTimeSlider.GetCurrent() / 100 * INTERPOLATION_MAX;
+		m_FogDurationTimeValue = m_FogDurationTimeSlider.GetCurrent() / 100 * DURATION_MAX;
+		
+		// OVERCAST
+		m_OvercastValue = m_OvercastValueSetSlider.GetCurrent() / 100;
+		m_OvercastInterpolationTimeValue = m_OvercastInterpolationTimeSlider.GetCurrent() / 100 * INTERPOLATION_MAX;
+		m_OvercastDurationTimeValue = m_OvercastDurationTimeSlider.GetCurrent() / 100 * DURATION_MAX;
+		
+		// Rain
+		m_RainValue = m_RainValueSetSlider.GetCurrent() / 100;
+		m_RainInterpolationTimeValue = m_RainInterpolationTimeSlider.GetCurrent() / 100 * INTERPOLATION_MAX;
+		m_RainDurationTimeValue = m_RainDurationTimeSlider.GetCurrent() / 100 * DURATION_MAX;
+	}
+	
+	void ScriptConsoleWeatherTab(Widget root, ScriptConsole console, Widget button, ScriptConsoleTabBase parent = null)
+	{
+		// FOG
+		m_FogValueSetSlider = SliderWidget.Cast(root.FindAnyWidget("SliderFogValue"));
+		m_FogValueGetSlider = SliderWidget.Cast(root.FindAnyWidget("SliderFogActualValue"));	
+		m_FogValueSetText = TextWidget.Cast(root.FindAnyWidget("TextFogValueActual"));	
+		
+		m_FogInterpolationTimeSlider = SliderWidget.Cast(root.FindAnyWidget("SliderFogTarget"));	
+		m_FogDurationTimeSlider = SliderWidget.Cast(root.FindAnyWidget("SliderFogDuration"));
+		
+		m_FogInterpolationMaxText = TextWidget.Cast(root.FindAnyWidget("TextMaxFogTarget"));
+		m_FogDurationMaxText = TextWidget.Cast(root.FindAnyWidget("TextMaxFogDuration"));
+		
+		m_FogValueEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxFogValue"));
+		m_FogInterpolationEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxFogTarget"));
+		m_FogDurationEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxFogDuration"));
+		
+		// OVERCAST
+		m_OvercastValueSetSlider = SliderWidget.Cast(root.FindAnyWidget("SliderOvercastValue"));
+		m_OvercastValueGetSlider = SliderWidget.Cast(root.FindAnyWidget("SliderOvercastActualValue"));	
+		m_OvercastValueSetText = TextWidget.Cast(root.FindAnyWidget("TextOvercastValueActual"));	
+		
+		m_OvercastInterpolationTimeSlider = SliderWidget.Cast(root.FindAnyWidget("SliderOvercastTarget"));	
+		m_OvercastDurationTimeSlider = SliderWidget.Cast(root.FindAnyWidget("SliderOvercastDuration"));
+		
+		m_OvercastInterpolationMaxText = TextWidget.Cast(root.FindAnyWidget("TextMaxOvercastTarget"));
+		m_OvercastDurationMaxText = TextWidget.Cast(root.FindAnyWidget("TextMaxOvercastDuration"));
+		
+		m_OvercastValueEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxOvercastValue"));
+		m_OvercastInterpolationEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxOvercastTarget"));
+		m_OvercastDurationEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxOvercastDuration"));
+		
+		// Rain
+		m_RainValueSetSlider = SliderWidget.Cast(root.FindAnyWidget("SliderRainValue"));
+		m_RainValueGetSlider = SliderWidget.Cast(root.FindAnyWidget("SliderRainActualValue"));	
+		m_RainValueSetText = TextWidget.Cast(root.FindAnyWidget("TextRainValueActual"));	
+		
+		m_RainInterpolationTimeSlider = SliderWidget.Cast(root.FindAnyWidget("SliderRainTarget"));	
+		m_RainDurationTimeSlider = SliderWidget.Cast(root.FindAnyWidget("SliderRainDuration"));
+		
+		m_RainInterpolationMaxText = TextWidget.Cast(root.FindAnyWidget("TextMaxRainTarget"));
+		m_RainDurationMaxText = TextWidget.Cast(root.FindAnyWidget("TextMaxRainDuration"));
+		
+		m_RainValueEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxRainValue"));
+		m_RainInterpolationEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxRainTarget"));
+		m_RainDurationEditbox = EditBoxWidget.Cast(root.FindAnyWidget("EditBoxRainDuration"));
+		
+		//Other
+		m_ResetButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonReset"));
+		m_UpdateButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonUpdate"));
+		m_ApplyButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonApply"));
+		
+		m_CopyButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonCopy"));
+		m_PasteButton = ButtonWidget.Cast(root.FindAnyWidget("ButtonPaste"));
+		
+		
+		InitValues();
+	}
+	
+	protected void ResetValues()
+	{
+		// FOG
+		m_FogValueEditbox.SetText("0");
+		m_FogDurationEditbox.SetText(DURATION_MAX.ToString());
+		m_FogInterpolationEditbox.SetText("0");
+		
+		// OVERCAST
+		m_OvercastValueEditbox.SetText("0");
+		m_OvercastDurationEditbox.SetText(DURATION_MAX.ToString());
+		m_OvercastInterpolationEditbox.SetText("0");
+		
+		// Rain
+		m_RainValueEditbox.SetText("0");
+		m_RainDurationEditbox.SetText(DURATION_MAX.ToString());
+		m_RainInterpolationEditbox.SetText("0");
+		
+		UpdateSliderValues();
+		
+		//FOG
+		m_FogValue = 0;
+		m_FogInterpolationTimeValue = 0;
+		m_FogDurationTimeValue = DURATION_MAX;
+		
+		// OVERCAST
+		m_OvercastValue = 0;
+		m_OvercastInterpolationTimeValue = 0;
+		m_OvercastDurationTimeValue = DURATION_MAX;
+		
+		//RAIN
+		m_RainValue = 0;
+		m_RainInterpolationTimeValue = 0;
+		m_RainDurationTimeValue = DURATION_MAX;
+		
+		
+	}
+	
+	protected void InitValues(bool forceCurrent = false)
+	{
+		
+		// FOG
+		float fogVal = m_FogValue;
+		if (forceCurrent || m_FogValue == -1)
+		{
+			fogVal = GetGame().GetWeather().GetFog().GetActual();
+		}
+		m_FogValueEditbox.SetText(fogVal.ToString());
+
+		m_FogInterpolationEditbox.SetText(m_FogInterpolationTimeValue.ToString());
+		
+		if (m_FogDurationTimeValue == -1)
+			m_FogDurationTimeValue = DURATION_MAX;
+		m_FogDurationEditbox.SetText(m_FogDurationTimeValue.ToString());
+		
+		m_FogInterpolationMaxText.SetText(INTERPOLATION_MAX.ToString());
+		m_FogDurationMaxText.SetText(DURATION_MAX.ToString());
+		
+		
+		// OVERCAST
+		float overcastVal = m_OvercastValue;
+		if (forceCurrent || m_OvercastValue == -1)
+		{
+			overcastVal = GetGame().GetWeather().GetOvercast().GetActual();
+		}
+		m_OvercastValueEditbox.SetText(overcastVal.ToString());
+		
+		m_OvercastInterpolationEditbox.SetText(m_OvercastInterpolationTimeValue.ToString());
+		
+		
+		if (m_OvercastDurationTimeValue == -1)
+			m_OvercastDurationTimeValue = DURATION_MAX;
+		m_OvercastDurationEditbox.SetText(m_OvercastDurationTimeValue.ToString());
+		
+		m_OvercastInterpolationMaxText.SetText(INTERPOLATION_MAX.ToString());
+		m_OvercastDurationMaxText.SetText(DURATION_MAX.ToString());
+		
+		// RAIN
+		float rainVal = m_RainValue;
+		if (forceCurrent || m_RainValue == -1)
+		{
+			rainVal = GetGame().GetWeather().GetRain().GetActual();
+		}
+
+		m_RainValueEditbox.SetText(rainVal.ToString());
+		m_RainInterpolationEditbox.SetText(m_RainInterpolationTimeValue.ToString());
+		
+		if (m_RainDurationTimeValue == -1)
+			m_RainDurationTimeValue = DURATION_MAX;
+		m_RainDurationEditbox.SetText(m_RainDurationTimeValue.ToString());
+		
+		m_RainInterpolationMaxText.SetText(INTERPOLATION_MAX.ToString());
+		m_RainDurationMaxText.SetText(DURATION_MAX.ToString());
+		
+		UpdateSliderValues();
+	}	
+	
+	protected void PasteValues(string clipboard)
+	{
+		TStringArray values = new TStringArray();
+		clipboard.Split(" ", values);
+		if (values.Count() != 9)
+			return;
+		// FOG
+		m_FogValueEditbox.SetText(values.Get(0));
+		m_FogInterpolationEditbox.SetText(values.Get(1));
+		m_FogDurationEditbox.SetText(values.Get(2));
+		// OVERCAST
+		m_OvercastValueEditbox.SetText(values.Get(3));
+		m_OvercastInterpolationEditbox.SetText(values.Get(4));
+		m_OvercastDurationEditbox.SetText(values.Get(5));
+		// RAIN
+		m_RainValueEditbox.SetText(values.Get(6));
+		m_RainInterpolationEditbox.SetText(values.Get(7));
+		m_RainDurationEditbox.SetText(values.Get(8));
+	}	
+	
+	protected string CopyValues()
+	{
+		string output;
+		
+		// FOG
+		output += m_FogValueEditbox.GetText();
+		output += " ";
+		output += m_FogInterpolationEditbox.GetText();
+		output += " ";
+		output += m_FogDurationEditbox.GetText();
+		output += " ";
+		// OVERCAST
+		output += m_OvercastValueEditbox.GetText();
+		output += " ";
+		output += m_OvercastInterpolationEditbox.GetText();
+		output += " ";
+		output += m_OvercastDurationEditbox.GetText();
+		output += " ";
+		// RAIN
+		output += m_RainValueEditbox.GetText();
+		output += " ";
+		output += m_RainInterpolationEditbox.GetText();
+		output += " ";
+		output += m_RainDurationEditbox.GetText();
+		
+		return output;
+	}
+	
+	override bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		bool rmbDrag = (GetMouseState(MouseState.RIGHT) & MB_EVENT_CLICK);
+		
+		if (rmbDrag)
+		{
+			// first row
+			if (w == m_FogValueSetSlider)
+			{
+				m_OvercastValueSetSlider.SetCurrent(m_FogValueSetSlider.GetCurrent());
+				m_RainValueSetSlider.SetCurrent(m_FogValueSetSlider.GetCurrent());
+			}
+			else if (w == m_OvercastValueSetSlider)
+			{
+				m_FogValueSetSlider.SetCurrent(m_OvercastValueSetSlider.GetCurrent());
+				m_RainValueSetSlider.SetCurrent(m_OvercastValueSetSlider.GetCurrent());
+			}
+			
+			else if (w == m_RainValueSetSlider)
+			{
+				m_FogValueSetSlider.SetCurrent(m_RainValueSetSlider.GetCurrent());
+				m_OvercastValueSetSlider.SetCurrent(m_RainValueSetSlider.GetCurrent());
+			}
+			// second row
+			else if (w == m_FogInterpolationTimeSlider)
+			{
+				m_OvercastInterpolationTimeSlider.SetCurrent(m_FogInterpolationTimeSlider.GetCurrent());
+				m_RainInterpolationTimeSlider.SetCurrent(m_FogInterpolationTimeSlider.GetCurrent());
+			}
+			else if (w == m_OvercastInterpolationTimeSlider)
+			{
+				m_FogInterpolationTimeSlider.SetCurrent(m_OvercastInterpolationTimeSlider.GetCurrent());
+				m_RainInterpolationTimeSlider.SetCurrent(m_OvercastInterpolationTimeSlider.GetCurrent());
+			}
+			
+			else if (w == m_RainInterpolationTimeSlider)
+			{
+				m_OvercastInterpolationTimeSlider.SetCurrent(m_RainInterpolationTimeSlider.GetCurrent());
+				m_FogInterpolationTimeSlider.SetCurrent(m_RainInterpolationTimeSlider.GetCurrent());
+			}
+			// third row
+			else if (w == m_FogDurationTimeSlider)
+			{
+				m_RainDurationTimeSlider.SetCurrent(m_FogDurationTimeSlider.GetCurrent());
+				m_OvercastDurationTimeSlider.SetCurrent(m_FogDurationTimeSlider.GetCurrent());
+			}
+			else if (w == m_RainDurationTimeSlider)
+			{
+				m_FogDurationTimeSlider.SetCurrent(m_RainDurationTimeSlider.GetCurrent());
+				m_OvercastDurationTimeSlider.SetCurrent(m_RainDurationTimeSlider.GetCurrent());
+			}
+			
+			else if (w == m_OvercastDurationTimeSlider)
+			{
+				m_RainDurationTimeSlider.SetCurrent(m_OvercastDurationTimeSlider.GetCurrent());
+				m_FogDurationTimeSlider.SetCurrent(m_OvercastDurationTimeSlider.GetCurrent());
+			}
+			
+		}
+
+		
+		SliderWidget slider = SliderWidget.Cast(w);
+		if (slider)
+		{
+			if (rmbDrag && !m_RPCTimer.IsRunning())
+			{
+				if (w == m_OvercastValueSetSlider || w == m_RainValueSetSlider || w == m_FogValueSetSlider)
+					m_RPCTimer.Run(0.25, this, "InvokeSendRPC");
+			}
+			UpdateEditboxValues();
+			return true;	
+		}
+		EditBoxWidget box = EditBoxWidget.Cast(w);
+		if (box)
+		{
+			UpdateSliderValues();
+			return true;	
+		}
+		return false;
+	}
+	
+	void UpdateSliderValues()
+	{
+			//fog
+			float editboxFogValue = m_FogValueEditbox.GetText().ToFloat();
+			m_FogValueSetSlider.SetCurrent(editboxFogValue * 100);
+
+			float editboxFogInterpolation = m_FogInterpolationEditbox.GetText().ToFloat();
+			m_FogInterpolationTimeSlider.SetCurrent(Math.InverseLerp(0,INTERPOLATION_MAX,editboxFogInterpolation) * 100);
+
+			float editboxFogDuration = m_FogDurationEditbox.GetText().ToFloat();
+			m_FogDurationTimeSlider.SetCurrent(Math.InverseLerp(0,INTERPOLATION_MAX,editboxFogDuration) * 100);
+		
+			//overcast
+			float editboxOvercastValue = m_OvercastValueEditbox.GetText().ToFloat();
+			m_OvercastValueSetSlider.SetCurrent(editboxOvercastValue * 100);
+
+			float editboxOvercastInterpolation = m_OvercastInterpolationEditbox.GetText().ToFloat();
+			m_OvercastInterpolationTimeSlider.SetCurrent(Math.InverseLerp(0,INTERPOLATION_MAX,editboxOvercastInterpolation) * 100);
+
+			float editboxOvercastDuration = m_OvercastDurationEditbox.GetText().ToFloat();
+			m_OvercastDurationTimeSlider.SetCurrent(Math.InverseLerp(0,INTERPOLATION_MAX,editboxOvercastDuration) * 100);
+		
+			//rain
+			float editboxRainValue = m_RainValueEditbox.GetText().ToFloat();
+			m_RainValueSetSlider.SetCurrent(editboxRainValue * 100);
+
+			float editboxRainInterpolation = m_RainInterpolationEditbox.GetText().ToFloat();
+			m_RainInterpolationTimeSlider.SetCurrent(Math.InverseLerp(0,INTERPOLATION_MAX,editboxRainInterpolation) * 100);
+
+			float editboxRainDuration = m_RainDurationEditbox.GetText().ToFloat();
+			m_RainDurationTimeSlider.SetCurrent(Math.InverseLerp(0,INTERPOLATION_MAX,editboxRainDuration) * 100);
+	}
+	
+	void UpdateEditboxValues()
+	{
+			//fog
+			m_FogInterpolationTimeValue = m_FogInterpolationTimeSlider.GetCurrent() / 100 * INTERPOLATION_MAX;
+			m_FogInterpolationEditbox.SetText(m_FogInterpolationTimeValue.ToString());
+
+			m_FogDurationTimeValue = m_FogDurationTimeSlider.GetCurrent() / 100 * DURATION_MAX;
+			m_FogDurationEditbox.SetText(m_FogDurationTimeValue.ToString());
+
+			m_FogValue = m_FogValueSetSlider.GetCurrent() / 100;
+			m_FogValueEditbox.SetText(m_FogValue.ToString());
+
+			//overcast
+			m_OvercastInterpolationTimeValue = m_OvercastInterpolationTimeSlider.GetCurrent() / 100 * INTERPOLATION_MAX;
+			m_OvercastInterpolationEditbox.SetText(m_OvercastInterpolationTimeValue.ToString());
+
+			m_OvercastDurationTimeValue = m_OvercastDurationTimeSlider.GetCurrent() / 100 * DURATION_MAX;
+			m_OvercastDurationEditbox.SetText(m_OvercastDurationTimeValue.ToString());
+
+			m_OvercastValue = m_OvercastValueSetSlider.GetCurrent() / 100;
+			m_OvercastValueEditbox.SetText(m_OvercastValue.ToString());
+			
+			//rain
+			m_RainInterpolationTimeValue = m_RainInterpolationTimeSlider.GetCurrent() / 100 * INTERPOLATION_MAX;
+			m_RainInterpolationEditbox.SetText(m_RainInterpolationTimeValue.ToString());
+
+			m_RainDurationTimeValue = m_RainDurationTimeSlider.GetCurrent() / 100 * DURATION_MAX;
+			m_RainDurationEditbox.SetText(m_RainDurationTimeValue.ToString());
+
+			m_RainValue = m_RainValueSetSlider.GetCurrent() / 100;
+			m_RainValueEditbox.SetText(m_RainValue.ToString());
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		if (w == m_ApplyButton)
+		{
+			SendRPC(GetRPCDataNormal());
+			return true;
+		}
+		else if (w == m_UpdateButton)
+		{
+			InitValues(true);
+			return true;
+		}
+		else if (w == m_ResetButton)
+		{
+			ResetValues();
+			InitValues(true);
+			return true;
+		}
+		else if (w == m_CopyButton)
+		{
+			string output = CopyValues();
+			GetGame().CopyToClipboard(output);
+			return true;
+		}
+		
+		else if (w == m_PasteButton)
+		{
+			string input;
+			GetGame().CopyFromClipboard(input);
+			PasteValues(input);
+			UpdateSliderValues();
+			return true;
+		}
+		
+		return false;
+	}
+	
+	
+	
+	//RPC data where each value is strickly as shown in the UI on the sliders
+	protected DebugWeatherRPCData GetRPCDataNormal()
+	{
+		DebugWeatherRPCData data = new DebugWeatherRPCData();
+		// FOG
+		data.m_FogValue = m_FogValueSetSlider.GetCurrent() / 100;
+		data.m_FogInterpolation = m_FogInterpolationTimeValue;
+		data.m_FogDuration = m_FogDurationTimeSlider.GetCurrent() / 100 * 960;
+		
+		// Rain
+		data.m_RainValue = m_RainValueSetSlider.GetCurrent() / 100;
+		data.m_RainInterpolation = m_RainInterpolationTimeValue;
+		data.m_RainDuration = m_RainDurationTimeSlider.GetCurrent() / 100 * 960;
+		
+		// OVERCAST
+		data.m_OvercastValue = m_OvercastValueSetSlider.GetCurrent() / 100;
+		data.m_OvercastInterpolation = m_OvercastInterpolationTimeValue;
+		data.m_OvercastDuration = m_OvercastDurationTimeSlider.GetCurrent() / 100 * 960;
+		
+		return data;
+	}
+	
+	//RPC data where the duration and interpolation times are forced(their slider values are ignored) to allow for immediate change and lasting effect
+	protected DebugWeatherRPCData GetRPCDataImmediate()
+	{
+		DebugWeatherRPCData data = new DebugWeatherRPCData();
+		// FOG
+		data.m_FogValue = m_FogValueSetSlider.GetCurrent() / 100;
+		data.m_FogInterpolation = 0;
+		data.m_FogDuration = 960;
+		
+		// Rain
+		data.m_RainValue = m_RainValueSetSlider.GetCurrent() / 100;
+		data.m_RainInterpolation = 0;
+		data.m_RainDuration = 960;
+		
+		// OVERCAST
+		data.m_OvercastValue = m_OvercastValueSetSlider.GetCurrent() / 100;
+		data.m_OvercastInterpolation = 0;
+		data.m_OvercastDuration = 960;
+		
+		return data;
+	}
+	
+	protected void SendRPC(DebugWeatherRPCData data)
+	{
+		PlayerIdentity identity = null;
+		if (GetGame().GetPlayer())
+		{
+			identity = GetGame().GetPlayer().GetIdentity();
+		}
+		
+		GetGame().RPCSingleParam(null, ERPCs.DEV_SET_WEATHER, new Param1<DebugWeatherRPCData>(data), true, identity);
+	}
+	
+	protected void InvokeSendRPC()
+	{
+		SendRPC(GetRPCDataImmediate());
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		float overcast = GetGame().GetWeather().GetOvercast().GetActual();
+		m_OvercastValueGetSlider.SetCurrent(overcast * 100);
+		m_OvercastValueSetText.SetText(overcast.ToString());
+		
+		float fog = GetGame().GetWeather().GetFog().GetActual();
+		m_FogValueGetSlider.SetCurrent(fog * 100);
+		m_FogValueSetText.SetText(fog.ToString());
+		
+		float rain = GetGame().GetWeather().GetRain().GetActual();
+		m_RainValueGetSlider.SetCurrent(rain * 100);
+		m_RainValueSetText.SetText(rain.ToString());
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptedWindows/MissionLoader.c b/scripts/5_Mission/DayZ/GUI/ScriptedWindows/MissionLoader.c
new file mode 100644
index 0000000000000000000000000000000000000000..699cfc61013d27c775cc3e10e9cbe56da6ece09e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptedWindows/MissionLoader.c
@@ -0,0 +1,111 @@
+class JsonMissionLoaderData
+{
+	ref TStringArray MissionPaths;
+
+	static JsonMissionLoaderData GetData()
+	{
+		JsonMissionLoaderData data;
+		
+		string path;
+		string errorMessage;
+
+		if (GetCLIParam("missionLoaderPath", path) == false)
+		{
+			path = CFG_FILE_MISSION_LIST;
+		}
+		
+		if (!FileExist(path))
+		{
+			DayZGame dzg = GetDayZGame();
+			
+			data = new JsonMissionLoaderData();
+			data.MissionPaths = {dzg.GetMissionFolderPath()};
+			if (!JsonFileLoader<JsonMissionLoaderData>.SaveFile(path, data, errorMessage))
+				ErrorEx(errorMessage);
+		}
+		else
+		{
+			if (!JsonFileLoader<JsonMissionLoaderData>.LoadFile(path, data, errorMessage))
+				ErrorEx(errorMessage);
+		}
+
+		return data;
+	}
+}
+
+class MissionLoader : UIScriptedMenu
+{
+	
+	protected TextListboxWidget			m_WgtLstMsnList;
+	protected ButtonWidget				m_WgtBtnMsnPlay;
+	protected ButtonWidget				m_WgtBtnMsnClose;
+	protected ref TStringArray			m_ListMissionsNames;
+	protected ref JsonMissionLoaderData m_MissionData;
+	
+	override Widget Init()
+	{
+		m_MissionData = JsonMissionLoaderData.GetData();
+		
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_mission_loader.layout");	
+		
+		m_WgtLstMsnList = TextListboxWidget.Cast( layoutRoot.FindAnyWidget("wgt_lst_missions") );
+		m_WgtBtnMsnPlay = ButtonWidget.Cast( layoutRoot.FindAnyWidget("wgt_btn_mission_play") );
+		m_WgtBtnMsnClose = ButtonWidget.Cast( layoutRoot.FindAnyWidget("wgt_btn_mission_close") );
+
+		foreach (string path:m_MissionData.MissionPaths)
+		{
+			m_WgtLstMsnList.AddItem(path, NULL, 0);
+		}
+		
+		return layoutRoot;
+	}
+
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if ( w == m_WgtBtnMsnClose )
+		{
+			Close();
+			
+			return true;
+		}
+		else if ( w == m_WgtBtnMsnPlay )
+		{
+			int rowIndex = m_WgtLstMsnList.GetSelectedRow();
+			string missionPath = m_MissionData.MissionPaths.Get(rowIndex);
+			GetGame().PlayMission(missionPath);
+			return true;
+		}
+		return false;
+	}
+	
+	
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		super.OnClick(w, x, y, button);
+		
+		if (w == m_WgtLstMsnList)
+		{
+			int rowIndex = m_WgtLstMsnList.GetSelectedRow();
+			string missionPath = m_MissionData.MissionPaths.Get(rowIndex);
+			GetGame().PlayMission(missionPath);
+		}
+		return false;
+	}
+	
+	override bool OnKeyDown(Widget w, int x, int y, int key)
+	{
+		super.OnKeyDown(w,x,y,key);
+		switch (key)
+		{
+			case KeyCode.KC_ESCAPE:
+			{
+				Close();
+				return true;
+			}
+		}
+		return false;
+	}
+
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinBase.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..ddc2a347dc7f864c448fab27c70715977d75bb6e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinBase.c
@@ -0,0 +1,95 @@
+class HudDebugWinBase
+{
+	Widget m_WgtRoot;
+	protected bool m_Show;
+	protected bool m_RPCSent;
+	
+	//============================================
+	// Constructor
+	//============================================
+	void HudDebugWinBase( Widget widget_root )
+	{
+		m_WgtRoot = widget_root;
+	}
+
+	//============================================
+	// GetType
+	//============================================
+	int GetType()
+	{
+		return HudDebug.HUD_WIN_UNDEFINED;
+	}
+
+	void Init( Widget widget_root );
+	
+	void SetUpdate( bool state );
+	
+	void Update()
+	{
+		if(m_Show && !m_RPCSent)
+		{
+			SetUpdate(true);
+		}
+	}
+	
+	
+	//============================================
+	// SetUpdate
+	//============================================
+	void SetRPCSent()
+	{
+		m_RPCSent = true;
+	}
+	
+	
+	//============================================
+	// Show
+	//============================================
+	void Show()
+	{
+		m_WgtRoot.Show(true);
+		m_Show = true;
+	}
+	
+	//============================================
+	// Hide
+	//============================================
+	void Hide()
+	{
+		m_WgtRoot.Show(false);
+		m_Show = false;
+	}
+	
+	//============================================
+	// Is visible
+	//============================================
+	bool IsVisible()
+	{
+		return m_WgtRoot.IsVisible();
+	}
+
+	//============================================
+	// FitWindowByContent
+	//============================================
+	void FitWindowByContent( TextListboxWidget wgt )
+	{	
+		int size_of_value = 17;
+		SetValueListSize( 250, size_of_value * wgt.GetNumItems(), wgt );
+	}
+
+	//============================================
+	// SetSize
+	//============================================
+	void SetValueListSize( int x, int y, TextListboxWidget wgt )
+	{
+		int offset = 10;	
+		int size_of_title = 20;
+		
+		wgt.SetSize( x, y );
+		
+		int root_size_x = x + ( 2 * offset );
+		int root_size_y = y + ( 2 * offset ) + size_of_title;
+		
+		m_WgtRoot.SetSize( root_size_x, root_size_y );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharAgents.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharAgents.c
new file mode 100644
index 0000000000000000000000000000000000000000..d4e91524f9dfd1cd5eb7d8ea930267d64046bf8a
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharAgents.c
@@ -0,0 +1,232 @@
+class DebugAgentData
+{
+	string m_Name;
+	int m_ID;
+	
+	void DebugAgentData( string name, int id )
+	{
+		m_Name = name;
+		m_ID = id;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+}
+
+
+class HudDebugWinCharAgents extends HudDebugWinBase
+{	
+	protected Widget m_WgtAgents;
+	protected ref array<ref Widget>	 m_AgentWidgets = new array<ref Widget>;
+	protected ref map<Widget, ref DebugAgentData>		m_AgentWidgetData = new map<Widget, ref DebugAgentData>;
+	//============================================
+	// HudDebugWinCharAgents
+	//============================================
+	void HudDebugWinCharAgents( Widget widget_root )
+	{	
+		m_WgtRoot = widget_root;
+		//m_WgtAgents = TextListboxWidget.Cast( m_WgtRoot.FindAnyWidget( "txl_CharAgents_Values" ) );
+		m_WgtAgents = m_WgtRoot.FindAnyWidget( "AgentList" );
+		
+		//FitWindowByContent( m_WgtAgents );
+	}
+
+	void ~HudDebugWinCharAgents()
+	{	
+		SetUpdate( false );
+	}
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_CHAR_AGENTS;
+	}
+	
+	//============================================
+	// Update
+	//============================================
+	override void SetUpdate( bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<bool> params = new Param1<bool>( state );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_AGENTS_UPDATE, params, true );
+				SetRPCSent();
+			}
+		}
+		//else set directly
+		else
+		{
+			if ( developer_sync )
+			{
+				developer_sync.EnableUpdate( state, ERPCs.DEV_AGENTS_UPDATE, player );	
+			}
+		}
+	}
+
+	override void Update()
+	{
+		super.Update();
+		
+		//Print("Update()");
+		
+		//refresh notifiers
+		SetAgents();
+	}
+	
+	//============================================
+	// Show / Hide
+	//============================================
+	override void Show()
+	{
+		super.Show();
+		
+		//Print("Show()");
+		
+		SetUpdate( true );
+	}
+
+	override void Hide()
+	{
+		super.Hide();
+		
+		//Print("Hide()");
+		
+		SetUpdate( false );
+	}
+	
+	void SetAgents()
+	{
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//clear window
+		ClearAgents();
+			
+		//set agents	
+		if ( developer_sync.m_PlayerAgentsSynced.Count() > 0 )
+		{
+			for ( int i = 0; i < developer_sync.m_PlayerAgentsSynced.Count(); i++ )
+			{
+				AddAgent( developer_sync.m_PlayerAgentsSynced.Get( i ).GetName(), developer_sync.m_PlayerAgentsSynced.Get( i ).GetValue(), developer_sync.m_PlayerAgentsSynced.Get( i ).GetID() );
+			}
+		}
+		
+		//fit to screen
+		//FitWindow();
+	}
+	
+	/*
+	void AddAgent( string title, string value )
+	{
+		int index = m_WgtAgents.AddItem( title, NULL, 0 );
+		m_WgtAgents.SetItem( index, value, NULL, 1 );
+	}
+	*/
+	bool OnClick( Widget w, int x, int y, int button )
+	{	
+		//Button activate
+		DebugAgentData data;
+		if ( w.GetName() == "ButtonAgentActivate" )
+		{
+			data = m_AgentWidgetData.Get( w );
+			DebugGrowAgentsRequest(data.GetID(), true);
+			//Print("activate" + data.GetID().ToString());
+			return true;
+		}
+		//Button deactivate
+		else if ( w.GetName() == "ButtonAgentDeactivate" )
+		{
+			data = m_AgentWidgetData.Get( w );
+			DebugGrowAgentsRequest(data.GetID(), false);
+			//Print("deactivate" + data.GetID().ToString());
+			return true;
+		}
+		else if ( w.GetName() == "ResetAgents" )
+		{
+			DebugRemoveAgentsRequest();
+			return true;
+		}
+		
+		
+		return false;
+	}
+	
+	void DebugGrowAgentsRequest(int agent_id, bool should_grow)
+	{
+		if(!should_grow)//id is minus value to mark killing instead of growing
+		{
+			agent_id *= -1;
+		}
+		
+		ref Param1<int> p1 = new Param1<int>( agent_id );
+		Man man = GetGame().GetPlayer();
+		man.RPCSingleParam(ERPCs.DEV_AGENT_GROW, p1, true, man.GetIdentity());
+	}
+	
+	void DebugRemoveAgentsRequest()
+	{
+		ref Param1<bool> p1 = new Param1<bool>( false );
+		Man man = GetGame().GetPlayer();
+		man.RPCSingleParam(ERPCs.DEV_RPC_AGENT_RESET, p1, true, man.GetIdentity());
+	}
+				
+	void AddAgent( string title, string value, int id )
+	{
+		Widget widget = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/debug/day_z_hud_debug_agent.layout", m_WgtAgents );
+		ButtonWidget btn = ButtonWidget.Cast( widget.FindAnyWidget( "TextAgentName" ) );
+		
+	
+		DebugAgentData data = new DebugAgentData( "", id );
+		m_AgentWidgetData.Insert(btn, data);
+		
+		Widget activate_button = widget.FindAnyWidget( "ButtonAgentActivate" );
+		m_AgentWidgetData.Insert( activate_button, data );
+		
+		TextWidget count_widget = TextWidget.Cast(widget.FindAnyWidget( "TextWidgetAgentCount" ));
+		m_AgentWidgetData.Insert( count_widget, data );
+		count_widget.SetText(value);
+		
+		//Deactivate button
+		Widget deactivate_button = widget.FindAnyWidget( "ButtonAgentDeactivate" );
+		m_AgentWidgetData.Insert( deactivate_button, data );
+		
+		btn.SetText(title);
+		m_AgentWidgets.Insert(widget);
+		
+		AutoHeightSpacer WgtModifiersContent_panel_script;
+		m_WgtAgents.GetScript( WgtModifiersContent_panel_script );
+		WgtModifiersContent_panel_script.Update();
+	}
+
+	void ClearAgents()
+	{
+		m_AgentWidgetData.Clear();
+		for ( int i = 0; i < m_AgentWidgets.Count(); i++ )
+		{
+			delete m_AgentWidgets.Get( i );
+		}
+		
+		m_AgentWidgets.Clear();
+	}
+
+	void FitWindow()
+	{
+		FitWindowByContent( TextListboxWidget.Cast(m_WgtAgents) );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharDebug.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharDebug.c
new file mode 100644
index 0000000000000000000000000000000000000000..27e51d72011ca666afcb7dd9400a98b9544b5387
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharDebug.c
@@ -0,0 +1,53 @@
+class HudDebugWinCharDebug extends HudDebugWinBase
+{
+	private PluginDeveloper m_ModuleDeveloper;
+	
+	private TextWidget 		m_PlayerPosTextWidget;
+	private TextWidget 		m_ClipboardTextWidget;
+
+	//============================================
+	// HudDebugWinCharDebug
+	//============================================
+	void HudDebugWinCharDebug(Widget widget_root)
+	{	
+		m_PlayerPosTextWidget = TextWidget.Cast( widget_root.FindAnyWidget("txt_PlayerPos") );
+		m_ClipboardTextWidget = TextWidget.Cast( widget_root.FindAnyWidget("txt_Clipboard") );
+	}
+
+	//============================================
+	// ~HudDebugWinCharDebug
+	//============================================
+	void ~HudDebugWinCharDebug()
+	{
+	}
+	
+	//============================================
+	// Update
+	//============================================
+	override void Update()
+	{
+		super.Update();
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( player != NULL )
+		{
+			vector pos = player.GetPosition();
+			string pos_str = "Pos: " + pos[0].ToString() + " " + pos[2].ToString();
+			m_PlayerPosTextWidget.SetText(pos_str);
+		}
+		
+		string clipboard;
+		GetGame().CopyFromClipboard(clipboard);
+		clipboard = clipboard.Substring( 0, Math.Min( clipboard.Length(), 128 ) );	//max 128 chars
+		clipboard = "Clipboard: " + clipboard;
+		m_ClipboardTextWidget.SetText(clipboard);
+	}
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_CHAR_DEBUG;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharLevels.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharLevels.c
new file mode 100644
index 0000000000000000000000000000000000000000..f53c347e6c584230a796fea402493a22e0fca6f1
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharLevels.c
@@ -0,0 +1,134 @@
+class HudDebugWinCharLevels extends HudDebugWinBase
+{
+	TextListboxWidget				m_WgtValues;
+	
+	//============================================
+	// Constructor
+	//============================================
+	void HudDebugWinCharLevels(Widget widget_root)
+	{	
+		m_WgtValues = TextListboxWidget.Cast( widget_root.FindAnyWidget("txl_CharLevels_Values") );
+		
+		FitWindow();
+	}
+
+	//============================================
+	// Destructor
+	//============================================
+	void ~HudDebugWinCharLevels()
+	{	
+		SetUpdate( false );
+	}
+
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_CHAR_LEVELS;
+	}
+	
+	//============================================
+	// Show 
+	//============================================
+	override void Show()
+	{
+		super.Show();
+		
+		//Print("Show()");
+		
+		SetUpdate( true );
+	}
+
+	//============================================
+	// Hide 
+	//============================================
+	override void Hide()
+	{
+		super.Hide();
+		
+		//Print("Hide()");
+		
+		SetUpdate( false );
+	}
+
+	//============================================
+	// SetUpdate
+	//============================================
+	override void SetUpdate( bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<bool> params = new Param1<bool>( state );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_LEVELS_UPDATE, params, true );
+				SetRPCSent();
+			}
+		}
+		//else set directly
+		else
+		{
+			if ( developer_sync )
+			{
+				developer_sync.EnableUpdate( state, ERPCs.DEV_LEVELS_UPDATE, player );	
+			}
+		}
+	}
+
+
+	override void Update()
+	{
+		super.Update();
+		
+		//Print("Update()");
+		
+		//refresh notifiers
+		SetValues();
+	}
+	
+	void SetValues()
+	{
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//clear window
+		ClearValues();
+			
+		if ( developer_sync.m_PlayerLevelsSynced.Count() > 0 )
+		{
+			//set
+			for ( int i = 0; i < developer_sync.m_PlayerLevelsSynced.Count(); i++ )
+			{
+				string bar = MiscGameplayFunctions.ValueToBar(developer_sync.m_PlayerLevelsSynced.Get( i ).GetValue2());
+				AddValue( developer_sync.m_PlayerLevelsSynced.Get( i ).GetName(), developer_sync.m_PlayerLevelsSynced.Get( i ).GetValue().ToString() ,bar );
+			}
+		}
+		
+		//fit to screen
+		FitWindow();
+	}
+
+	void AddValue( string title, string value, string value2 )
+	{
+		int index = m_WgtValues.AddItem( title, NULL, 0 );
+		m_WgtValues.SetItem( index, value, NULL, 1 );
+		m_WgtValues.SetItem( index, value2, NULL, 2 );
+	}
+	
+	void ClearValues()
+	{
+		m_WgtValues.ClearItems();
+	}
+
+	void FitWindow()
+	{
+		//FitWindowByContent( m_WgtValues );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharModifiers.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharModifiers.c
new file mode 100644
index 0000000000000000000000000000000000000000..981f7b9589bc74a52d08044e56bcffe0f1655d0f
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharModifiers.c
@@ -0,0 +1,423 @@
+class DebugModifierData
+{
+	string m_Name;
+	int m_ID;
+	
+	void DebugModifierData( string name, int id )
+	{
+		m_Name = name;
+		m_ID = id;
+	}
+	
+	string GetName()
+	{
+		return m_Name;
+	}
+	
+	int GetID()
+	{
+		return m_ID;
+	}
+}
+
+class HudDebugWinCharModifiers extends HudDebugWinBase
+{	
+	protected Widget										m_WgtModifiersContent;
+	protected ref array<ref Widget>							m_ModifierWidgets;
+	protected ref map<Widget, ref DebugModifierData>		m_ModifierWidgetData;
+	protected PluginDeveloperSync m_PluginDeveloperSync;
+	protected Widget 										m_WgtDetailedInfo;
+	protected TextWidget 									m_WgtDetailedInfoText;
+	protected int 											m_DetailedInfoIndex;
+
+//m_RPCSent
+	
+	//============================================
+	// HudDebugWinCharModifiers
+	//============================================
+	void HudDebugWinCharModifiers( Widget widget_root )
+	{	
+		m_WgtRoot = widget_root;
+		m_WgtModifiersContent = Widget.Cast( m_WgtRoot.FindAnyWidget( "pnl_CharModifiers_Values" ) );
+		m_ModifierWidgets = new array<ref Widget>;
+		m_ModifierWidgetData = new map<Widget, ref DebugModifierData>;
+		m_PluginDeveloperSync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+	}
+
+	void ~HudDebugWinCharModifiers()
+	{	
+		SetUpdate( false );
+	}
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_CHAR_MODIFIERS;
+	}
+	
+	//============================================
+	// Update
+	//============================================
+	override void SetUpdate( bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<bool> params = new Param1<bool>( state );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_MODS_UPDATE, params, true );
+				SetRPCSent();
+			}
+		}
+		//else set directly
+		else
+		{
+			if ( m_PluginDeveloperSync )
+			{
+				m_PluginDeveloperSync.EnableUpdate( state, ERPCs.DEV_MODS_UPDATE, player );	
+			}
+		}
+	}
+
+	override void Update()
+	{
+		super.Update();
+		
+		Refresh();
+	}
+	
+	//============================================
+	// Show / Hide
+	//============================================
+	override void Show()
+	{
+		super.Show();
+		
+		//Print("Show()");
+		
+		SetUpdate( true );
+	}
+
+	override void Hide()
+	{
+		super.Hide();
+		
+		//Print("Hide()");
+		
+		SetUpdate( false );
+	}
+	
+	void Refresh()
+	{
+		SetModifiers();
+		if(m_WgtDetailedInfo && m_WgtDetailedInfo.IsVisible())
+		{
+			if(!m_WgtDetailedInfoText)
+				m_WgtDetailedInfoText = TextWidget.Cast(m_WgtDetailedInfo.FindAnyWidget( "TextWidget" ));
+			m_WgtDetailedInfoText.SetText(m_PluginDeveloperSync.m_PlayerModsDetailedSynced);
+		}
+	}
+	
+	//============================================
+	// FitWindow
+	//============================================
+	void FitWindow()
+	{
+		float title_size = 20;
+		float spacing = 20;
+		
+		//get wgt content size values
+		float wgt_content_size_x;
+		float wgt_content_size_y;
+		m_WgtModifiersContent.GetSize( wgt_content_size_x, wgt_content_size_y );
+		
+		//get wgt root size values
+		float wgt_root_size_x;
+		float wgt_root_size_y;
+		m_WgtRoot.GetSize( wgt_root_size_x, wgt_root_size_y );
+		
+		//calculate new Y size
+		float new_size_y = title_size + wgt_content_size_y + spacing;
+		
+		//set size
+		m_WgtRoot.SetSize( wgt_root_size_x, new_size_y );
+	}
+	
+	//============================================
+	// Display Modifiers
+	//============================================	
+	void SetModifiers()
+	{
+		//clear window
+		ClearModifiers();
+		
+		if ( m_PluginDeveloperSync.m_PlayerModsSynced.Count() > 0 )
+		{
+			//set active mods
+			for ( int i = 0; i < m_PluginDeveloperSync.m_PlayerModsSynced.Count(); ++i )
+			{
+				SyncedValueModifier synced_value = m_PluginDeveloperSync.m_PlayerModsSynced.Get( i );
+				AddModifier( synced_value.GetName(), synced_value.GetID(), synced_value.GetActive(),synced_value.GetLocked() );
+			}
+		}
+		
+		FitWindow();
+	}
+	
+	void AddModifier( string name, int id, bool active, bool locked )
+	{
+		//create widget
+		Widget widget = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/debug/day_z_hud_debug_modifier.layout", m_WgtModifiersContent );
+		
+		//add to widget array (for clearing purposes)
+		m_ModifierWidgets.Insert( widget );
+		
+		//set widget name
+		ButtonWidget mod_name_text = ButtonWidget.Cast( widget.FindAnyWidget( "TextModifierName" ) );
+		mod_name_text.SetText( name );
+		if ( active )
+		{
+			mod_name_text.SetTextColor( ARGB( 255, 0, 255, 0 ) );
+		}
+		else
+		{
+			mod_name_text.SetTextColor( ARGB( 255, 255, 0, 0 ) );
+		}
+		
+		//set set data for interactive parts (modifier ID should be enough)
+		DebugModifierData data = new DebugModifierData( name, id );
+		
+		Widget modifier_button = widget.FindAnyWidget( "TextModifierName" );
+		m_ModifierWidgetData.Insert( modifier_button, data );
+		//Activate button
+		Widget activate_button = widget.FindAnyWidget( "ButtonModifierActivate" );
+		m_ModifierWidgetData.Insert( activate_button, data );
+		
+		//Deactivate button
+		Widget deactivate_button = widget.FindAnyWidget( "ButtonModifierDeactivate" );
+		m_ModifierWidgetData.Insert( deactivate_button, data );
+
+		//Lock checkbox
+		Widget checkbox_widget = widget.FindAnyWidget( "CheckBoxLock" );
+		m_ModifierWidgetData.Insert( checkbox_widget, data );
+		//set lock based on checkbox value
+		CheckBoxWidget checkbox = CheckBoxWidget.Cast( checkbox_widget );
+		checkbox.SetChecked( locked );
+		
+		AutoHeightSpacer WgtModifiersContent_panel_script;
+		m_WgtModifiersContent.GetScript( WgtModifiersContent_panel_script );
+		WgtModifiersContent_panel_script.Update();
+	}
+
+	void ClearModifiers()
+	{
+		//clear widget data
+		m_ModifierWidgetData.Clear();
+		
+		//destroy all modifier widgets
+		for ( int i = 0; i < m_ModifierWidgets.Count(); ++i )
+		{
+			delete m_ModifierWidgets.Get( i );
+		}
+		m_ModifierWidgets.Clear();
+	}
+	
+	//============================================
+	// OnClick
+	//============================================
+	bool OnClick( Widget w, int x, int y, int button )
+	{	
+		if ( w )
+		{
+			if ( w.GetName() == "TextModifierName" )
+			{
+				//Print("clicked");
+				DebugModifierData bc_data = m_ModifierWidgetData.Get( w );
+				
+				//Print( bc_data.GetID() );
+				
+				if(bc_data.GetID() == m_DetailedInfoIndex)//repeated request --> hide
+				{
+					if(m_WgtDetailedInfo && m_WgtDetailedInfo.IsVisible())
+					{
+						m_WgtDetailedInfo.Show(false);
+					}
+					m_DetailedInfoIndex = 0;
+				}
+				else
+				{
+					if(!m_WgtDetailedInfo)
+						m_WgtDetailedInfo = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/debug/day_z_hud_debug_modifier_detailed.layout");
+					if(!m_WgtDetailedInfo.IsVisible())
+					{
+						m_WgtDetailedInfo.Show(true);
+					}
+					m_DetailedInfoIndex = bc_data.GetID();
+				}
+				if( m_WgtDetailedInfoText )
+					m_WgtDetailedInfoText.SetText("");
+				m_PluginDeveloperSync.m_PlayerModsDetailedSynced = "";
+				RequestDetailedInfo( bc_data.GetID());
+				return true;
+			}
+			//Button activate
+			if ( w.GetName() == "ButtonModifierActivate" )
+			{
+				DebugModifierData ba_data = m_ModifierWidgetData.Get( w );
+				
+				//activate
+				ActivateModifier( ba_data.GetID() );
+				
+				//force update
+				m_PluginDeveloperSync.Update();
+				
+				return true;
+			}
+			//Button deactivate
+			else if ( w.GetName() == "ButtonModifierDeactivate" )
+			{
+				DebugModifierData bd_data = m_ModifierWidgetData.Get( w );
+				
+				//deactivate
+				DeactivateModifier( bd_data.GetID() );
+
+				//force update
+				m_PluginDeveloperSync.Update();
+				
+				return true;
+			}
+			//Lock checkbox
+			else if ( w.GetName() == "CheckBoxLock" )
+			{
+				DebugModifierData lcb_data = m_ModifierWidgetData.Get( w );
+				CheckBoxWidget checkbox = CheckBoxWidget.Cast( w );
+				
+				//set lock
+				LockModifier( lcb_data.GetID(), checkbox.IsChecked() );
+				
+				//force update
+				m_PluginDeveloperSync.Update();
+				
+				return true;
+			}
+			else if ( w.GetName() == "ResetModifiers" )
+			{
+				
+				ResetModifiers();
+				return true;
+			}				
+		}
+		
+		return false;
+	}
+	
+	//============================================
+	// Actions
+	//============================================
+	
+	void ResetModifiers()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+
+		ref Param1<bool> params = new Param1<bool>( false );
+		if ( player )
+		{
+			player.RPCSingleParam( ERPCs.DEV_RPC_MODS_RESET, params, true );
+		}
+
+
+	}
+	
+	
+  	void RequestDetailedInfo( int id )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<int> params = new Param1<int>( id );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_RPC_MODS_DETAILED, params, true );
+			}
+		}
+		//else set directly
+		else
+		{
+			m_PluginDeveloperSync.RequestDetailedInfo( id , player);
+		}
+	}
+	
+	void ActivateModifier( int id )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<int> params = new Param1<int>( id );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_RPC_MODS_ACTIVATE, params, true );
+			}
+		}
+		//else set directly
+		else
+		{
+			m_PluginDeveloperSync.ActivateModifier( id );
+		}
+	}
+	
+	void DeactivateModifier( int id )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<int> params = new Param1<int>( id );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_RPC_MODS_DEACTIVATE, params, true );
+			}
+		}
+		//else set directly
+		else
+		{
+			m_PluginDeveloperSync.DeactivateModifier( id );
+		}
+	}
+	
+	void LockModifier( int id, bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param2<int, bool> params = new Param2<int, bool>( id, state );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_RPC_MODS_LOCK, params, true );
+			}
+		}
+		//else set directly
+		else
+		{
+			m_PluginDeveloperSync.LockModifier( id, state );
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharStats.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharStats.c
new file mode 100644
index 0000000000000000000000000000000000000000..5dd9077243f2115edb48d98f5de8980160c3b637
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharStats.c
@@ -0,0 +1,288 @@
+class HudDebugWinCharStats extends HudDebugWinBase
+{
+	TextListboxWidget						m_WgtValues;
+	Widget									m_WgtPanel;
+	ref array<ref Widget> 					m_StatWidgets = new array<ref Widget>;
+	ref map <ref SliderWidget, string> 		m_SliderWidgets = new map<ref SliderWidget, string>;
+	ref array<ref TextWidget> 				m_StatValues = new array<ref TextWidget>;
+	ref map<ref EditBoxWidget, string> 		m_StatValuesInput = new map<ref EditBoxWidget, string>;
+	bool									m_Populated;
+	bool									m_ChangingSlider;
+	
+	//============================================
+	// Constructor
+	//============================================
+	void HudDebugWinCharStats(Widget widget_root)
+	{
+		m_WgtRoot = widget_root;
+		m_WgtPanel = Widget.Cast(m_WgtRoot.FindAnyWidget("Stats") );
+		//FitWindow();
+	}
+
+	//============================================
+	// Destructor
+	//============================================
+	void ~HudDebugWinCharStats()
+	{	
+		SetUpdate( false );
+	}
+
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_CHAR_STATS;
+	}
+	
+	//============================================
+	// Show 
+	//============================================
+	override void Show()
+	{
+		super.Show();
+		
+		//Print("Show()");
+		
+		SetUpdate( true );
+	}
+
+	//============================================
+	// Hide 
+	//============================================
+	override void Hide()
+	{
+		super.Hide();
+		
+		//Print("Hide()");
+		
+		SetUpdate( false );
+	}
+
+	//============================================
+	// SetUpdate
+	//============================================
+	override void SetUpdate( bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<bool> params = new Param1<bool>( state );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_STATS_UPDATE, params, true );
+				SetRPCSent();
+			}
+		}
+		//else set directly
+		else
+		{
+			if ( developer_sync )
+			{
+				developer_sync.EnableUpdate( state, ERPCs.DEV_STATS_UPDATE, player );	
+			}
+		}
+	}
+
+
+	override void Update()
+	{
+		super.Update();
+		//Print("panel:" + m_WgtPanel);
+		//Print("Update()");
+		
+		//refresh notifiers
+		
+		
+		if(!m_Populated)
+			SetupValues();
+		
+		UpdateValues();
+	}
+	
+	void SetupValues()
+	{
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//clear window
+		//ClearValues();
+			
+		if ( developer_sync.m_PlayerStatsSynced.Count() > 0 )
+		{
+			//set
+			for ( int i = 0; i < developer_sync.m_PlayerStatsSynced.Count(); i++ )
+			{
+				AddValue( developer_sync.m_PlayerStatsSynced.Get( i ).GetName(), developer_sync.m_PlayerStatsSynced.Get( i ).GetValue().ToString() );
+			}
+					//fit to screen
+			FitWindow();
+			m_Populated = true;
+		}
+	}
+	
+	
+	void UpdateValues()
+	{
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		if ( developer_sync.m_PlayerStatsSynced.Count() > 0 )
+		{
+			for ( int i = 0; i < developer_sync.m_PlayerStatsSynced.Count(); i++ )
+			{
+				string stat_name = developer_sync.m_PlayerStatsSynced.Get( i ).GetName();
+				float val_norm = developer_sync.m_PlayerStatsSynced.Get( i ).GetValueNorm();
+				float value = developer_sync.m_PlayerStatsSynced.Get( i ).GetValue();
+				
+				if( stat_name == "BloodType" )
+				{
+					string type, name;
+					bool positive;
+					
+					name = value.ToString();
+					name += "("+BloodTypes.GetBloodTypeName( Math.Round(value), type, positive)+")";
+					m_StatValues.Get(i).SetText(name);
+				}
+				else
+				{
+					m_StatValues.Get(i).SetText(value.ToString());
+					
+				}
+				if(!m_ChangingSlider)
+					m_SliderWidgets.GetKeyByValue(stat_name).SetCurrent(val_norm * 100);
+				/*
+				EditBoxWidget w;
+				w.
+				AddValue( developer_sync.m_PlayerStatsSynced.Get( i ).GetName(), developer_sync.m_PlayerStatsSynced.Get( i ).GetValue().ToString() );
+				*/
+			}
+		}
+		
+	}
+	
+	/*
+	
+	void AddValue( string title, string value )
+	{
+		int index = m_WgtValues.AddItem( title, NULL, 0 );
+		m_WgtValues.SetItem( index, value, NULL, 1 );
+	}	
+	*/
+	
+	void AddValue( string title, string value )
+	{
+		Widget widget = GetGame().GetWorkspace().CreateWidgets( "gui/layouts/debug/day_z_hud_debug_stat.layout", m_WgtPanel );
+		
+		TextWidget tw = TextWidget.Cast(widget.FindAnyWidget("StatName"));
+		tw.SetText(title);
+		m_StatWidgets.Insert(widget);
+		
+		TextWidget tw_output = TextWidget.Cast(widget.FindAnyWidget("OutputValue"));
+		m_StatValues.Insert(tw_output);
+		
+		EditBoxWidget ebw_input = EditBoxWidget.Cast(widget.FindAnyWidget("InputValue"));
+		m_StatValuesInput.Insert(ebw_input, title );
+		
+		SliderWidget sw = SliderWidget.Cast(widget.FindAnyWidget("StatSlider"));
+		m_SliderWidgets.Insert(sw,title );
+		
+		
+		//int index = m_WgtValues.AddItem( title, NULL, 0 );
+		//m_WgtValues.SetItem( index, value, NULL, 1 );
+		
+		AutoHeightSpacer WgtModifiersContent_panel_script;
+		m_WgtPanel.GetScript( WgtModifiersContent_panel_script );
+		WgtModifiersContent_panel_script.Update();
+	}
+
+	void ClearValues()
+	{
+		m_StatWidgets.Clear();
+		//m_WgtValues.ClearItems();
+	}
+
+	void FitWindow()
+	{
+		TextListboxWidget wgt = TextListboxWidget.Cast(m_WgtPanel);
+		if(wgt)
+			FitWindowByContent( wgt );
+	}
+	
+	bool OnClick( Widget w, int x, int y, int button )
+	{	
+		if ( w.GetName() == "ResetStats" )
+		{
+			ResetStats();
+			return true;
+		}
+		return false;
+	}
+	
+	bool OnChange(Widget w, int x, int y, bool finished)
+	{
+		if ( m_StatValuesInput.Contains(EditBoxWidget.Cast(w)) && finished )
+		{
+			EditBoxWidget ebw = EditBoxWidget.Cast(w);
+			RPCChangeStat(m_StatValuesInput.Get(EditBoxWidget.Cast(w)), ebw.GetText().ToFloat());
+			return true;
+		}
+		if (m_SliderWidgets.Contains(SliderWidget.Cast(w)))
+		{
+			m_ChangingSlider = true;
+			string stat_name = m_SliderWidgets.Get(SliderWidget.Cast(w));
+			SliderWidget sw = SliderWidget.Cast(w);
+			PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+			for ( int i = 0; i < player.m_PlayerStats.GetPCO().Get().Count(); i++ ) 
+			{
+				string label = player.m_PlayerStats.GetPCO().Get().Get( i ).GetLabel();
+				if(label == stat_name)
+				{
+					float stat_min = player.m_PlayerStats.GetPCO().Get().Get( i ).GetMin();
+					float stat_max = player.m_PlayerStats.GetPCO().Get().Get( i ).GetMax();
+					float current_value_norm = sw.GetCurrent() / 100;
+					float current_value_abs = stat_min + (stat_max - stat_min) * current_value_norm;
+					
+					RPCChangeStat(label, current_value_abs);
+				}
+			}
+			//Print("OnChange " + finished);
+			if(finished)
+				m_ChangingSlider = false;
+		}
+		
+		return false;
+	}
+	
+	
+	void ResetStats()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+
+		ref Param1<bool> params = new Param1<bool>( false );
+		if ( player )
+		{
+			player.RPCSingleParam( ERPCs.DEV_RPC_STATS_RESET, params, true );
+		}
+	}
+	
+	void RPCChangeStat(string stat, float value)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+
+		ref Param2<string, float> params = new Param2<string, float>( stat, value );
+		if ( player )
+		{
+			player.RPCSingleParam( ERPCs.DEV_RPC_STAT_SET, params, true );
+		}
+	}
+	
+	
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharStomach.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharStomach.c
new file mode 100644
index 0000000000000000000000000000000000000000..bf52fae61dd3da0025cf7c980e699d2a5c36b1e6
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinCharStomach.c
@@ -0,0 +1,170 @@
+class HudDebugWinCharStomach extends HudDebugWinBase
+{
+	TextListboxWidget				m_WgtValues;
+	TextWidget						m_WgtOverall;
+	
+	//============================================
+	// Constructor
+	//============================================
+	void HudDebugWinCharStomach(Widget widget_root)
+	{	
+		m_WgtValues = TextListboxWidget.Cast( widget_root.FindAnyWidget("txl_StomachContents") );
+		m_WgtOverall = TextWidget.Cast( widget_root.FindAnyWidget("InfoOverall") );
+		//FitWindow();
+	}
+
+	//============================================
+	// Destructor
+	//============================================
+	void ~HudDebugWinCharStomach()
+	{	
+		SetUpdate( false );
+	}
+
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_CHAR_STOMACH;
+	}
+	
+	//============================================
+	// Show 
+	//============================================
+	override void Show()
+	{
+		super.Show();
+		
+		//Print("Show()");
+		
+		SetUpdate( true );
+	}
+
+	//============================================
+	// Hide 
+	//============================================
+	override void Hide()
+	{
+		super.Hide();
+		
+		//Print("Hide()");
+		
+		SetUpdate( false );
+	}
+
+	//============================================
+	// SetUpdate
+	//============================================
+	override void SetUpdate( bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			ref Param1<bool> params = new Param1<bool>( state );
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_STOMACH_UPDATE, params, true );
+				SetRPCSent();
+			}
+		}
+		//else set directly
+		else
+		{
+			if ( developer_sync )
+			{
+				developer_sync.EnableUpdate( state, ERPCs.DEV_STOMACH_UPDATE, player );	
+			}
+		}
+	}
+
+
+	override void Update()
+	{
+		super.Update();
+		
+		//Print("Update()");
+		
+		//refresh notifiers
+		SetContentValues();
+	}
+	
+	
+	void SetContentValues()
+	{
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+		//clear window
+		ClearValues();
+			
+		for ( int i = 0; i < developer_sync.m_PlayerStomachSynced.Count() - 1; i++ )
+		{
+			//new Param4<int,int,int,float>(id, food_stage, agents, amount);
+			Param4<int,int,int,float> p4 = Param4<int,int,int,float>.Cast(developer_sync.m_PlayerStomachSynced.Get(i));
+			AddValue( PlayerStomach.GetClassnameFromID(p4.param1), p4.param2, p4.param3, p4.param4);
+		}
+		
+		if( developer_sync.m_PlayerStomachSynced.Count() )
+		{
+			int last_index = developer_sync.m_PlayerStomachSynced.Count() - 1;
+			Param1<float> p1 = Param1<float>.Cast(developer_sync.m_PlayerStomachSynced.Get(last_index));
+			m_WgtOverall.SetText("Overall volume:" + p1.param1.ToString());
+		}
+		else
+		{
+			m_WgtOverall.SetText("");
+		}
+		
+		
+		
+		//fit to screen
+		//FitWindow();
+	}
+
+	void AddValue( string classname, int food_stage, int agents, float amount)
+	{
+		int index = m_WgtValues.AddItem( classname, NULL, 0 );
+		string stage = typename.EnumToString(FoodStageType, food_stage) + "(" + food_stage.ToString()+")";;
+		m_WgtValues.SetItem( index, amount.ToString(), NULL, 1 );
+		m_WgtValues.SetItem( index,stage , NULL, 2 );
+		array<string> agent_list = GetAgentsArray(agents);
+		string agent_line = "("+agents.ToString()+") ";
+		
+		for(int i = 0; i < agent_list.Count();i++)
+		{
+			agent_line +=  "," +agent_list.Get(i);
+		}
+		
+		m_WgtValues.SetItem( index, agent_line , NULL, 3);
+	}
+	
+	array<string> GetAgentsArray(int agents)
+	{
+		array<string> list = new array<string>;
+		for(int i = 0; i < 32; i++)
+		{
+			int agent = agents & (1 << i);
+			if(agent)
+			{
+				list.Insert(PluginTransmissionAgents.GetNameByID(agent));
+			}
+		}
+		return list;
+	}
+
+	void ClearValues()
+	{
+		m_WgtValues.ClearItems();
+	}
+
+	void FitWindow()
+	{
+		FitWindowByContent( m_WgtValues );
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinTemperature.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinTemperature.c
new file mode 100644
index 0000000000000000000000000000000000000000..51c7c0089a2e0ba55441fbedd06f27b5faca29ed
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinTemperature.c
@@ -0,0 +1,98 @@
+class HudDebugWinTemperature extends HudDebugWinBase
+{
+	private PluginDeveloper 		m_ModuleDeveloper;
+	
+	private TextWidget 				m_EnviroTextWidget;
+	protected PluginDeveloperSync 	m_PluginDeveloperSync;
+	//============================================
+	// HudDebugWinTemperature
+	//============================================
+	void HudDebugWinTemperature(Widget widget_root)
+	{	
+		m_EnviroTextWidget = TextWidget.Cast( widget_root.FindAnyWidget("txt_Temp") );
+		m_PluginDeveloperSync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );
+		
+	}
+
+	//============================================
+	// ~HudDebugWinTemperature
+	//============================================
+	void ~HudDebugWinTemperature()
+	{
+	}
+	
+	//============================================
+	// Set Update
+	//============================================
+	override void SetUpdate( bool state )
+	{
+		//Disable update on server (PluginDeveloperSync)
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//if client, send RPC
+		if ( GetGame().IsClient() )
+		{
+			CachedObjectsParams.PARAM1_BOOL.param1 = state;
+			if ( player )
+			{
+				player.RPCSingleParam( ERPCs.DEV_TEMP_UPDATE, CachedObjectsParams.PARAM1_BOOL, true );
+				SetRPCSent();
+			}
+		}
+		//else set directly
+		else
+		{
+			if ( m_PluginDeveloperSync )
+			{
+				m_PluginDeveloperSync.EnableUpdate( state, ERPCs.DEV_TEMP_UPDATE, player );	
+			}
+		}
+	}
+
+	//============================================
+	// Show / Hide
+	//============================================
+	override void Show()
+	{
+		super.Show();
+		
+		SetUpdate( true );
+	}
+
+	override void Hide()
+	{
+		super.Hide();
+		
+		SetUpdate( false );
+	}
+	
+	
+	//============================================
+	// Update
+	//============================================
+	override void Update()
+	{
+		super.Update();
+		PluginDeveloperSync developer_sync = PluginDeveloperSync.Cast( GetPlugin( PluginDeveloperSync ) );		
+		
+		m_EnviroTextWidget.SetText(developer_sync.m_EnvironmentDebugMessage);
+		int sX, sY;
+		m_EnviroTextWidget.GetTextSize(sX, sY);
+		m_EnviroTextWidget.SetSize(sX, sY);
+		
+		AutoHeightSpacer spacer;
+		m_WgtRoot.GetScript(spacer);
+		if (spacer)
+		{
+			spacer.Update();
+		}
+	}
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_TEMPERATURE;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinVersion.c b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinVersion.c
new file mode 100644
index 0000000000000000000000000000000000000000..72ee634d2aa53ec2e40912974ebb0873609870c9
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/ScriptsHudDebug/HudDebugWinVersion.c
@@ -0,0 +1,41 @@
+class HudDebugWinVersion extends HudDebugWinBase
+{
+	private PluginDeveloper m_ModuleDeveloper;
+	
+	private TextWidget 		m_VersionTextWidget;
+
+	//============================================
+	// HudDebugWinVersion
+	//============================================
+	void HudDebugWinVersion(Widget widget_root)
+	{	
+		m_VersionTextWidget = TextWidget.Cast( widget_root.FindAnyWidget("txt_Version") );
+		
+		string version;
+		g_Game.GetVersion(version);
+		m_VersionTextWidget.SetText(string.Format("exe: %1 | scripts: %2", version, GetPBOAPI().GetPBOVersion("dta\\scripts.pbo")));
+	}
+
+	//============================================
+	// ~HudDebugWinVersion
+	//============================================
+	void ~HudDebugWinVersion()
+	{
+	}
+	
+	//============================================
+	// Update
+	//============================================
+	override void Update()
+	{
+		super.Update();
+	}
+
+	//============================================
+	// GetWinType
+	//============================================
+	override int GetType()
+	{
+		return HudDebug.HUD_WIN_VERSION;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/GUI/StartupMenu.c b/scripts/5_Mission/DayZ/GUI/StartupMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..6aee6cc96c192b9645bd79e46f78fe281d3aaabb
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/StartupMenu.c
@@ -0,0 +1,21 @@
+class StartupMenu extends UIScriptedMenu
+{
+	void StartupMenu()
+	{
+	}
+
+	void ~StartupMenu()
+	{
+	}
+
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/startup.layout");
+		
+		m_label = TextWidget.Cast( layoutRoot.FindAnyWidget("TextWidget") );
+
+		return layoutRoot;
+	}
+
+	TextWidget m_label;
+}
diff --git a/scripts/5_Mission/DayZ/GUI/StaticGUIUtils.c b/scripts/5_Mission/DayZ/GUI/StaticGUIUtils.c
new file mode 100644
index 0000000000000000000000000000000000000000..0678c9f889292b9e3c56ec88591e25957332cca0
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/StaticGUIUtils.c
@@ -0,0 +1,25 @@
+class StaticGUIUtils
+{
+	static const int IMAGESETGROUP_INVENTORY = 0;
+	
+	
+	//! Checks for improperly formated, legacy image names and corrects them to default format.
+	static string VerifyIconImageString(int imageset_group = IMAGESETGROUP_INVENTORY, string icon_name = "")
+	{
+		if (icon_name == "")
+		{
+			return "set:dayz_inventory image:missing";
+		}
+		
+		if ( !icon_name.Contains("image:") )
+		{
+			switch (imageset_group)
+			{
+				case IMAGESETGROUP_INVENTORY:
+					return "set:dayz_inventory image:" + icon_name;
+			}
+			
+		}
+		return icon_name;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/TitleScreenMenu.c b/scripts/5_Mission/DayZ/GUI/TitleScreenMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..55ff76026b9da0e228614352f33898dc0403dd12
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/TitleScreenMenu.c
@@ -0,0 +1,91 @@
+/*! Xbox menu */
+class TitleScreenMenu extends UIScriptedMenu
+{
+	RichTextWidget m_TextPress;
+	
+	void TitleScreenMenu()
+	{
+		g_Game.SetGameState(DayZGameState.MAIN_MENU);
+		g_Game.SetLoadState(DayZLoadState.MAIN_MENU_START);
+	}
+	
+	void ~TitleScreenMenu()
+	{
+	}
+	
+	override Widget Init()
+	{
+		layoutRoot = GetGame().GetWorkspace().CreateWidgets("gui/layouts/xbox/day_z_title_screen.layout");
+		
+		MissionMainMenu mission = MissionMainMenu.Cast(g_Game.GetMission());
+		
+		m_TextPress = RichTextWidget.Cast(layoutRoot.FindAnyWidget("InputPromptText"));
+		if (m_TextPress)
+		{
+			string gamertag;
+			string text = Widget.TranslateString("#console_start_game");
+			GetGame().GetPlayerName(gamertag);
+			#ifdef PLATFORM_XBOX
+				BiosUserManager user_manager = GetGame().GetUserManager();
+				if (user_manager && user_manager.GetSelectedUser())
+					m_TextPress.SetText(string.Format(text, "<image set=\"xbox_buttons\" name=\"A\" />"));
+				else
+					m_TextPress.SetText(string.Format(text, "<image set=\"xbox_buttons\" name=\"A\" />"));
+			#endif
+					
+			#ifdef PLATFORM_PS4
+				string confirm = "cross";
+				if (GetGame().GetInput().GetEnterButton() == GamepadButton.A)
+				{
+					confirm = "cross";
+				}
+				else
+				{
+					confirm = "circle";
+				}
+				m_TextPress.SetText(string.Format(text, "<image set=\"playstation_buttons\" name=\"" + confirm + "\" />"));
+			#endif
+		}
+		return layoutRoot;
+	}
+	
+	override void OnShow()
+	{
+		if (g_Game.GetGameState() != DayZGameState.CONNECTING)
+		{
+			#ifdef PLATFORM_CONSOLE
+				g_Game.GamepadCheck();
+			#endif
+		}
+		layoutRoot.FindAnyWidget("notification_root").Show(false);
+		
+		#ifdef PLATFORM_CONSOLE
+		#ifdef PLATFORM_XBOX
+		#ifdef BUILD_EXPERIMENTAL
+			layoutRoot.FindAnyWidget("notification_root").Show(true);
+		#endif
+		#endif
+		#endif
+		SetWidgetAnimAlpha(m_TextPress);
+	}
+	
+	override void OnHide()
+	{
+		layoutRoot.FindAnyWidget("notification_root").Show(false);
+	}
+	
+	override void Update(float timeslice)
+	{
+		super.Update(timeslice);
+		
+		if (GetUApi().GetInputByID(UAUISelect).LocalPress())
+		{
+			#ifdef PLATFORM_WINDOWS
+				EnterScriptedMenu(MENU_MAIN);
+			#endif
+			#ifdef PLATFORM_XBOX
+				g_Game.GamepadCheck();
+			#endif
+		}
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/GUI/WidgetEventHandler.c b/scripts/5_Mission/DayZ/GUI/WidgetEventHandler.c
new file mode 100644
index 0000000000000000000000000000000000000000..407cbc73ab9c138f24046ae64f386ec0d9dacad0
--- /dev/null
+++ b/scripts/5_Mission/DayZ/GUI/WidgetEventHandler.c
@@ -0,0 +1,463 @@
+class WidgetEventHandler: ScriptedWidgetEventHandler
+{
+	private ref static WidgetEventHandler s_instance;
+
+	protected ref map<Widget, ref Param> m_OnMouseButtonDownRegister;
+	protected ref map<Widget, ref Param> m_OnMouseButtonUpRegister;
+	protected ref map<Widget, ref Param> m_OnMouseWheel;
+	protected ref map<Widget, ref Param> m_OnDropReceived;
+	protected ref map<Widget, ref Param> m_OnDrag;
+	protected ref map<Widget, ref Param> m_OnDrop;
+	protected ref map<Widget, ref Param> m_OnDraggingOver;
+	protected ref map<Widget, ref Param> m_OnMouseEnter;
+	protected ref map<Widget, ref Param> m_OnMouseButtonLeave;
+	protected ref map<Widget, ref Param> m_OnClick;
+	protected ref map<Widget, ref Param> m_OnDoubleClick;
+	protected ref map<Widget, ref Param> m_OnFocus;
+	protected ref map<Widget, ref Param> m_OnFocusLost;
+	protected ref map<Widget, ref Param> m_OnController;
+	protected ref map<Widget, ref Param> m_OnChildAdd;
+	protected ref map<Widget, ref Param> m_OnChildRemove;
+
+	static WidgetEventHandler GetInstance()
+	{
+		return s_instance;
+	}
+
+	void WidgetEventHandler()
+	{
+		s_instance = this;
+		m_OnMouseButtonDownRegister = new map<Widget, ref Param>;
+		m_OnMouseButtonUpRegister = new map<Widget, ref Param>;
+		m_OnMouseWheel = new map<Widget, ref Param>;
+		m_OnDropReceived = new map<Widget, ref Param>;
+		m_OnDrag = new map<Widget, ref Param>;
+		m_OnDrop = new map<Widget, ref Param>;
+		m_OnDraggingOver = new map<Widget, ref Param>;
+		m_OnMouseEnter = new map<Widget, ref Param>;
+		m_OnMouseButtonLeave = new map<Widget, ref Param>;
+		m_OnClick = new map<Widget, ref Param>;
+		m_OnDoubleClick = new map<Widget, ref Param>;
+		m_OnFocus = new map<Widget, ref Param>;
+		m_OnFocusLost = new map<Widget, ref Param>;
+		m_OnController = new map<Widget, ref Param>;
+		m_OnChildAdd = new map<Widget, ref Param>;
+		m_OnChildRemove = new map<Widget, ref Param>;
+	}
+	
+	void UnregisterWidget( Widget w )
+	{
+		m_OnMouseButtonDownRegister.Remove( w );
+		m_OnMouseButtonUpRegister.Remove( w );
+		m_OnMouseWheel.Remove( w );
+		m_OnDropReceived.Remove( w );
+		m_OnDrag.Remove( w );
+		m_OnDrop.Remove( w );
+		m_OnDraggingOver.Remove( w );
+		m_OnMouseEnter.Remove( w );
+		m_OnMouseButtonLeave.Remove( w );
+		m_OnClick.Remove( w );
+		m_OnDoubleClick.Remove( w );
+		m_OnDoubleClick.Remove( w );
+		m_OnFocus.Remove( w );
+		m_OnFocusLost.Remove( w );
+		m_OnController.Remove( w );
+		m_OnChildAdd.Remove( w );
+		m_OnChildRemove.Remove( w );
+		w.SetHandler( NULL );
+	}
+
+	void RegisterOnMouseButtonDown( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnMouseButtonDownRegister.Insert( w, param );
+	}
+
+	void RegisterOnMouseButtonUp( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnMouseButtonUpRegister.Insert( w, param );
+	}
+
+	void RegisterOnMouseWheel( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnMouseWheel.Insert( w, param );
+	}
+
+	void RegisterOnDropReceived( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnDropReceived.Insert( w, param );
+	}
+
+	void RegisterOnDrag( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnDrag.Insert( w, param );
+	}
+
+	void RegisterOnDrop( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnDrop.Insert( w, param );
+	}
+
+	void RegisterOnDraggingOver( Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnDraggingOver.Insert( w, param );
+	}
+
+	void RegisterOnMouseEnter(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnMouseEnter.Insert( w, param );
+	}
+
+	void RegisterOnMouseLeave(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnMouseButtonLeave.Insert( w, param );
+	}
+
+	void RegisterOnClick(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnClick.Insert( w, param );
+	}
+
+	void RegisterOnDoubleClick(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnDoubleClick.Insert( w, param );
+	}
+
+	void RegisterOnFocus(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnFocus.Insert( w, param );
+	}
+	void RegisterOnFocusLost(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnFocusLost.Insert( w, param );
+	}
+	
+	void RegisterOnChildAdd(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnChildAdd.Insert( w, param );
+	}
+	
+	void RegisterOnChildRemove(Widget w, Managed eventHandler, string functionName )
+	{
+		w.SetHandler( this );
+		Param param = new Param2<Managed, string>( eventHandler, functionName );
+		m_OnChildRemove.Insert( w, param );
+	}
+	
+	override bool OnClick(Widget w, int x, int y, int button)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnClick.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnClick.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, int>( w, x, y, button );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnDoubleClick(Widget w, int x, int y, int button)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnDoubleClick.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnDoubleClick.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, int>( w, x, y, button );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnMouseLeave(Widget w, Widget enterW, int x, int y)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnMouseButtonLeave.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnMouseButtonLeave.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, Widget, int, int>( w, enterW, x, y );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnMouseEnter( Widget w, int x, int y )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnMouseEnter.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+		
+		if( !param.param1 )
+		{
+			m_OnMouseEnter.Remove( w );
+		}
+
+		Param param2 = new Param3<Widget, int, int>( w, x, y );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnMouseButtonDown( Widget w, int x, int y, int button )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnMouseButtonDownRegister.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+		
+		if( !param.param1 )
+		{
+			m_OnMouseButtonDownRegister.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, int>( w, x, y, button );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnMouseButtonUp( Widget w, int x, int y, int button )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnMouseButtonUpRegister.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnMouseButtonUpRegister.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, int>( w, x, y, button );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnDrag(Widget w, int x, int y)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnDrag.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnDrag.Remove( w );
+		}
+
+		Param param2 = new Param3<Widget, int, int>( w, x, y );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnDrop(Widget w, int x, int y, Widget reciever)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnDrop.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnDrop.Remove( w );
+		}
+
+		Param param2 = new Param3<Widget, int, int>( w, x, y );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnDraggingOver(Widget w, int x, int y, Widget reciever)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnDraggingOver.Get( reciever ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnDraggingOver.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, Widget>( w, x, y, reciever );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnDropReceived( Widget w, int x, int y, Widget reciever )
+	{
+		if( w.GetName() == "GridItem" )
+		{
+			return false;
+		}
+		Param p = m_OnDropReceived.Get( reciever );
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( p );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnDropReceived.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, Widget>( w, x, y, reciever );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnFocus( Widget w, int x, int y )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnFocus.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnFocus.Remove( w );
+		}
+
+		Param param2 = new Param3<Widget, int, int>( w, x, y );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnFocusLost( Widget w, int x, int y )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnFocusLost.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnFocusLost.Remove( w );
+		}
+
+		Param param2 = new Param3<Widget, int, int>( w, x, y );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+
+	override bool OnMouseWheel(Widget  w, int  x, int  y, int wheel)
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnMouseWheel.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnMouseWheel.Remove( w );
+		}
+
+		Param param2 = new Param4<Widget, int, int, int>( w, x, y, wheel );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+	
+	override bool OnChildAdd( Widget w, Widget child )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnChildAdd.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnChildAdd.Remove( w );
+		}
+
+		Param param2 = new Param2<Widget, Widget>( w, child );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+	
+	override bool OnChildRemove( Widget w, Widget child )
+	{
+		Param2<Managed, string> param = Param2<Managed, string>.Cast( m_OnChildRemove.Get( w ) );
+		if( param == NULL )
+		{
+			return false;
+		}
+
+		if( !param.param1 )
+		{
+			m_OnChildRemove.Remove( w );
+		}
+
+		Param param2 = new Param2<Widget, Widget>( w, child );
+		GetGame().GameScript.CallFunctionParams( param.param1, param.param2, NULL, param2 );
+
+		return true;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/DispatcherCaller.c b/scripts/5_Mission/DayZ/mission/DispatcherCaller.c
new file mode 100644
index 0000000000000000000000000000000000000000..c1b43f124024c53c8c8a0c7882d5013452ca88a5
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/DispatcherCaller.c
@@ -0,0 +1,102 @@
+class DispatcherCaller extends Dispatcher
+{
+	private void SendLogAtClient(Param1<string> p)
+	{
+		PluginDeveloper m = PluginDeveloper.Cast( GetPlugin(PluginDeveloper) );
+		
+		if ( m != NULL )
+		{
+			m.SendServerLogToClient(p.param1);
+		}
+	}
+	
+	private void ScriptConsoleAddPrint(Param1<string> p)
+	{
+		UIScriptedMenu ui_menu = GetGame().GetUIManager().GetMenu();
+		if ( ui_menu && ui_menu.GetID() == MENU_SCRIPTCONSOLE )
+		{
+			ScriptConsole scripted_console = ScriptConsole.Cast( ui_menu );
+			ScriptConsoleEnfScriptTab tab = ScriptConsoleEnfScriptTab.Cast(scripted_console.GetTabHandler(ScriptConsoleEnfScriptTab));
+			if (tab)
+				tab.Add(p.param1);
+		}
+	}
+	
+	private void ScriptConsoleHistoryBack()
+	{
+		UIScriptedMenu ui_menu = GetGame().GetUIManager().GetMenu();
+		if ( ui_menu.GetID() == MENU_SCRIPTCONSOLE )
+		{
+			ScriptConsole scriptConsole = ScriptConsole.Cast( ui_menu );
+			ScriptConsoleEnfScriptTab handler = ScriptConsoleEnfScriptTab.Cast(scriptConsole.GetSelectedHandler());
+			if (handler)
+			{
+				handler.HistoryBack();
+			}
+		}
+	}
+	
+	private void ScriptConsoleHistoryForward()
+	{
+		UIScriptedMenu ui_menu = GetGame().GetUIManager().GetMenu();
+		if ( ui_menu.GetID() == MENU_SCRIPTCONSOLE )
+		{
+			ScriptConsole scriptConsole = ScriptConsole.Cast( ui_menu );
+			ScriptConsoleEnfScriptTab handler = ScriptConsoleEnfScriptTab.Cast(scriptConsole.GetSelectedHandler());
+			if (handler)
+			{
+				handler.HistoryForward();
+			}
+
+		}
+	}
+
+	private void SceneEditorCommand(Param params)
+	{
+		UIScriptedMenu ui_menu = GetGame().GetUIManager().GetMenu();
+		if ( ui_menu && ui_menu.GetID() == MENU_SCENE_EDITOR )
+		{
+			SceneEditorMenu editor_menu = SceneEditorMenu.Cast( ui_menu );
+			editor_menu.SceneEditorCommand( params );
+		}
+	}
+
+	private void MissionGameplayHideInventory()
+	{
+		MissionGameplay mission = MissionGameplay.Cast( GetGame().GetMission() );
+		if ( mission )
+		{
+			mission.HideInventory();
+		}
+	}
+	
+	override Param CallMethod(CallID call_id, Param params)
+	{				
+		switch(call_id)
+		{
+		case CALL_ID_SEND_LOG:
+			SendLogAtClient(Param1<string>.Cast( params ));
+			break;
+		case CALL_ID_SCR_CNSL_ADD_PRINT:
+			ScriptConsoleAddPrint(Param1<string>.Cast( params ));
+			break;
+		case CALL_ID_SCENE_EDITOR_COMMAND:
+			SceneEditorCommand( params );
+			break;
+		case CALL_ID_HIDE_INVENTORY:
+			MissionGameplayHideInventory();
+			break;
+		case CALL_ID_SCR_CNSL_GETSELECTEDITEM:
+			return new Param1<string>(ScriptConsoleItemsTab.GetLastSelectedObject());
+		case CALL_ID_SCR_CNSL_HISTORY_BACK:
+			ScriptConsoleHistoryBack();
+			break;
+		case CALL_ID_SCR_CNSL_HISTORY_NEXT:
+			ScriptConsoleHistoryForward();
+			break;
+		}
+		
+		
+		return null;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/BleedingIndicators/BleedingDrop.c b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/BleedingIndicators/BleedingDrop.c
new file mode 100644
index 0000000000000000000000000000000000000000..8198dc45072e10e69fbe50f2885467de48a63ea4
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/BleedingIndicators/BleedingDrop.c
@@ -0,0 +1,293 @@
+
+class BleedingIndicatorDropData
+{
+	protected ImageWidget 	m_Widget;
+	protected int 			m_Severity;
+	protected float 		m_TimeTotal;
+	protected float 		m_ProgressBreakpointTime;
+	protected float 		m_ProgressFadingDuration; //remaining duration AFTER breakpoint
+	protected float 		m_ProgressBreakpoint;
+	protected float 		m_Duration;
+	protected float 		m_SpeedCoef;
+	protected int 			m_ScatterPx;
+	protected float 		m_SlideDistance;
+	
+	protected float 		m_ColorAlphaStart;
+	protected float 		m_ColorAlphaEnd;
+	protected float 		m_ColorAlphaCurrent;
+	
+	protected float 		m_ImageBaseSizeX;
+	protected float 		m_ImageBaseSizeY;
+	protected float 		m_ImageStartingSizeX; //adjusted by percentage
+	protected float 		m_ImageStartingSizeY; //adjusted by percentage
+	protected float 		m_ImageEndSizeX; //adjusted by percentage
+	protected float 		m_ImageEndSizeY; //adjusted by percentage
+	protected float 		m_ImageMaxSizeX;
+	protected float 		m_ImageMaxSizeY;
+	protected float 		m_ImageBaseRotation;
+	protected bool 			m_IsRunning;
+	protected vector 		m_BasePosition;
+	protected int 			m_ScreenSizeX;
+	protected int 			m_ScreenSizeY;
+	protected float 		m_PosX, m_PosY;
+	protected float 		m_StartSizeCoef;
+	protected float 		m_EndSizeCoef;
+	protected float 		m_RandomSizeMin;
+	protected float 		m_RandomSizeMax;
+	
+	//Written with relative positioning in mind
+	void BleedingIndicatorDropData(ImageWidget image, int severity)
+	{
+		m_Widget = image;
+		m_Severity = severity;
+		m_TimeTotal = 0;
+		m_IsRunning = false;
+		
+#ifdef DIAG_DEVELOPER
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+		{
+			m_Duration = DbgBleedingIndicationStaticInfo.m_DbgDropDurationBase;
+			m_ProgressBreakpointTime = m_Duration * DbgBleedingIndicationStaticInfo.m_DbgDropProgressTreshold;
+			m_ProgressBreakpoint = DbgBleedingIndicationStaticInfo.m_DbgDropProgressTreshold;
+			m_StartSizeCoef = DbgBleedingIndicationStaticInfo.m_DbgDropStartSize;
+			m_EndSizeCoef = DbgBleedingIndicationStaticInfo.m_DbgDropEndSize;
+			m_RandomSizeMin = DbgBleedingIndicationStaticInfo.m_DbgDropSizeVariationMin;
+			m_RandomSizeMax = DbgBleedingIndicationStaticInfo.m_DbgDropSizeVariationMax;
+			m_ScatterPx = DbgBleedingIndicationStaticInfo.m_DbgDropScatter;
+			m_SlideDistance = DbgBleedingIndicationStaticInfo.m_DbgDropSlideDistance;
+		}
+		else
+#endif
+		{
+			switch (m_Severity)
+			{
+				case BleedingIndicationConstants.INDICATOR_SEVERITY_LOW:
+				{
+					m_Duration = BleedingIndicationConstants.DROP_DURATION_LOW;
+					m_StartSizeCoef = BleedingIndicationConstants.DROP_SIZE_START_LOW;
+					m_EndSizeCoef = BleedingIndicationConstants.DROP_SIZE_END_LOW;
+					m_RandomSizeMin = BleedingIndicationConstants.DROP_SIZE_VARIATION_MIN_LOW;
+					m_RandomSizeMax = BleedingIndicationConstants.DROP_SIZE_VARIATION_MAX_LOW;
+					m_ScatterPx = BleedingIndicationConstants.DROP_SCATTER_LOW;
+					m_SlideDistance = BleedingIndicationConstants.DROP_SLIDE_DISTANCE_LOW;
+					break;
+				}
+				case BleedingIndicationConstants.INDICATOR_SEVERITY_MEDIUM:
+				{
+					m_Duration = BleedingIndicationConstants.DROP_DURATION_MEDIUM;
+					m_StartSizeCoef = BleedingIndicationConstants.DROP_SIZE_START_MEDIUM;
+					m_EndSizeCoef = BleedingIndicationConstants.DROP_SIZE_END_MEDIUM;
+					m_RandomSizeMin = BleedingIndicationConstants.DROP_SIZE_VARIATION_MIN_MEDIUM;
+					m_RandomSizeMax = BleedingIndicationConstants.DROP_SIZE_VARIATION_MAX_MEDIUM;
+					m_ScatterPx = BleedingIndicationConstants.DROP_SCATTER_MEDIUM;
+					m_SlideDistance = BleedingIndicationConstants.DROP_SLIDE_DISTANCE_MEDIUM;
+					break;
+				}
+				case BleedingIndicationConstants.INDICATOR_SEVERITY_HIGH:
+				{
+					m_Duration = BleedingIndicationConstants.DROP_DURATION_HIGH;
+					m_StartSizeCoef = BleedingIndicationConstants.DROP_SIZE_START_HIGH;
+					m_EndSizeCoef = BleedingIndicationConstants.DROP_SIZE_END_HIGH;
+					m_RandomSizeMin = BleedingIndicationConstants.DROP_SIZE_VARIATION_MIN_HIGH;
+					m_RandomSizeMax = BleedingIndicationConstants.DROP_SIZE_VARIATION_MAX_HIGH;
+					m_ScatterPx = BleedingIndicationConstants.DROP_SCATTER_HIGH;
+					m_SlideDistance = BleedingIndicationConstants.DROP_SLIDE_DISTANCE_HIGH;
+					break;
+				}
+			}
+			
+			m_ProgressBreakpointTime = m_Duration * BleedingIndicationConstants.DROP_PROGRESS_THRESHOLD;
+			m_ProgressBreakpoint = BleedingIndicationConstants.DROP_PROGRESS_THRESHOLD;
+		}
+		m_ProgressFadingDuration = Math.Max(0.0001, m_Duration - m_ProgressBreakpointTime);
+		
+		m_SpeedCoef = 1.0; //TODO ??
+#ifdef DIAG_DEVELOPER
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+		{
+			m_ColorAlphaStart = DbgBleedingIndicationStaticInfo.m_DbgDropColorAlphaStart / 255;
+			m_ColorAlphaEnd = DbgBleedingIndicationStaticInfo.m_DbgDropColorAlphaEnd / 255;
+		}
+		else
+#endif
+		{
+			m_ColorAlphaStart = BleedingIndicationConstants.DROP_COLOR_ALPHA_START / 255;
+			m_ColorAlphaEnd = BleedingIndicationConstants.DROP_COLOR_ALPHA_END / 255;
+		}
+		InitImageScale();
+		GetScreenSize(m_ScreenSizeX,m_ScreenSizeY);
+		AdjustColorSaturation();
+	}
+	
+	void ~BleedingIndicatorDropData()
+	{
+	}
+	
+	protected void InitImageScale()
+	{
+		m_Widget.GetSize(m_ImageBaseSizeX,m_ImageBaseSizeY);
+		float randomScaleCoef =  Math.RandomFloatInclusive(m_RandomSizeMin,m_RandomSizeMax);
+		
+		m_ImageStartingSizeX = m_ImageBaseSizeX * m_StartSizeCoef * randomScaleCoef;
+		m_ImageEndSizeX = m_ImageBaseSizeX * m_EndSizeCoef * randomScaleCoef;
+		m_ImageStartingSizeY = m_ImageBaseSizeY * m_StartSizeCoef * randomScaleCoef;
+		m_ImageEndSizeY = m_ImageBaseSizeY * m_EndSizeCoef * randomScaleCoef;
+	}
+	
+	void ScatterPosition(vector pos)
+	{
+#ifdef DIAG_DEVELOPER
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+		{
+			m_ScatterPx = DbgBleedingIndicationStaticInfo.m_DbgDropScatter;
+		}
+#endif
+		float rndRadius = Math.RandomFloatInclusive(0.0,m_ScatterPx);
+		float rndPos = Math.RandomFloatInclusive(0.0,Math.PI2);
+		m_PosX = pos[0];
+		m_PosX = m_PosX + rndRadius * Math.Sin(rndPos);
+		
+		m_PosY = pos[1];
+		m_PosY = m_PosY + rndRadius * Math.Cos(rndPos);
+	}
+	
+	void StartDrop()
+	{
+		m_TimeTotal = 0;
+		
+		ScatterPosition(m_BasePosition);
+		m_Widget.SetPos(m_PosX,m_PosY);
+#ifdef DIAG_DEVELOPER
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues && !DbgBleedingIndicationStaticInfo.m_DbgDropRotationRandom)
+		{
+			m_Widget.SetRotation(0,0,0);
+		}
+		else
+#endif
+		{
+			m_Widget.SetRotation(0,0,Math.RandomFloatInclusive(0.0,360.0));
+		}
+		
+		m_Widget.Show(true);
+		m_IsRunning = true;
+	}
+	
+	void StopDrop()
+	{
+		m_IsRunning = false;
+		m_Widget.SetSize(m_ImageBaseSizeX,m_ImageBaseSizeY); //resets image size
+		m_Widget.Show(false);
+	}
+	
+	void SetBasePosition(vector pos)
+	{
+		m_BasePosition = pos;
+		m_BasePosition[0] = m_BasePosition[0] - m_ScreenSizeX/2;
+		m_BasePosition[1] = m_BasePosition[1] - m_ScreenSizeY/2;
+	}
+	
+	bool IsRunning()
+	{
+		return m_IsRunning;
+	}
+	
+	ImageWidget GetImage()
+	{
+		return m_Widget;
+	}
+	
+	void AdjustColorSaturation()
+	{
+		//color adjustment
+		float r = BleedingIndicationConstants.DROP_COLOR_RED;
+		float g = BleedingIndicationConstants.DROP_COLOR_GREEN;
+		float b = BleedingIndicationConstants.DROP_COLOR_BLUE;
+		float desaturationEnd = BleedingIndicationConstants.DROP_COLOR_DESATURATIONEND;
+#ifdef DIAG_DEVELOPER
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+		{
+			r = DbgBleedingIndicationStaticInfo.m_DbgDropColorRed;
+			g = DbgBleedingIndicationStaticInfo.m_DbgDropColorGreen;
+			b = DbgBleedingIndicationStaticInfo.m_DbgDropColorBlue;
+			desaturationEnd = DbgBleedingIndicationStaticInfo.m_DbgDesaturationEnd;
+		}
+#endif
+		
+		//saturation adjustment
+#ifdef DIAG_DEVELOPER
+		if (!DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues || (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues && DbgBleedingIndicationStaticInfo.m_DbgDropDesaturate) )
+		{
+#endif
+			Param par = PPEManagerStatic.GetPPEManager().GetPostProcessCurrentValues(PostProcessEffectType.Glow,PPEGlow.PARAM_SATURATION);
+			float saturationProgress = Param1<float>.Cast(par).param1;
+			saturationProgress = Easing.EaseOutSine(saturationProgress);
+			saturationProgress = Math.Lerp(desaturationEnd,1.0,saturationProgress);
+			float lowest_channel = Math.Min(Math.Min(r,g),b);
+			r = Math.Lerp(lowest_channel,r,saturationProgress);
+			g = Math.Lerp(lowest_channel,g,saturationProgress);
+			b = Math.Lerp(lowest_channel,b,saturationProgress);
+#ifdef DIAG_DEVELOPER
+		}
+#endif
+		
+		int color = ARGB(0x00,r,g,b);
+		m_Widget.SetColor(color);
+	}
+	
+	void UpdateAlpha(float progress,float progressFade)
+	{
+		if (progress <= m_ProgressBreakpoint)
+		{
+			m_ColorAlphaCurrent = m_ColorAlphaStart;
+		}
+		else
+		{
+			m_ColorAlphaCurrent = Math.Lerp(m_ColorAlphaStart,m_ColorAlphaEnd,progressFade);
+		}
+		
+		m_Widget.SetAlpha(m_ColorAlphaCurrent);
+	}
+	
+	//! scaling and transformation
+	void UpdateTransform(float progress, float progressFade)
+	{
+		float breakProgress = Math.Clamp(Math.InverseLerp(0.0,m_ProgressBreakpoint,progress),0,1);
+		float sizeX = Math.Lerp(m_ImageStartingSizeX,m_ImageEndSizeX,breakProgress);
+		float sizeY = Math.Lerp(m_ImageStartingSizeY,m_ImageEndSizeY,breakProgress);
+		m_Widget.SetSize(sizeX,sizeY);
+		
+		if (progress <= m_ProgressBreakpoint)
+		{
+			//do stuff before breakpoint
+		}
+		else
+		{
+			//do stuff after breakpoint
+			float posYTemp = Math.Lerp(m_PosY,m_PosY + m_SlideDistance, progressFade);
+			m_Widget.SetPos(m_PosX,posYTemp);
+		}
+	}
+	
+	void Update(float timeSlice)
+	{
+		if (m_IsRunning)
+		{
+			float progress, progressFade;
+			progress = m_TimeTotal / m_Duration;
+			progressFade = (m_TimeTotal - m_ProgressBreakpointTime) / m_ProgressFadingDuration;
+			
+			//alpha
+			UpdateAlpha(progress,progressFade);
+			//transform + scaling
+			UpdateTransform(progress,progressFade);
+			
+			m_TimeTotal += (timeSlice * m_SpeedCoef);
+			
+			if (m_TimeTotal >= m_Duration)
+			{
+				//deletes this;
+				StopDrop();
+			}
+		}
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/BleedingIndicators/BleedingIndicator.c b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/BleedingIndicators/BleedingIndicator.c
new file mode 100644
index 0000000000000000000000000000000000000000..6bd5ca8c9520546cd54805f8b542d4dcf6aefe2e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/BleedingIndicators/BleedingIndicator.c
@@ -0,0 +1,265 @@
+
+//! indicator wrapper for a specific bleeding source.
+class BleedingIndicator extends Managed
+{
+	protected bool m_Initialized;
+	protected bool m_Terminating = false; //doesn't spawn more drops and ends when the last one does
+	protected bool m_EndNow = false;
+	protected bool m_IsRunning = false;
+	protected int m_DropSpawnsQueued;
+	protected int m_ActiveDropsCount;
+	protected int m_Severity;
+	protected int m_SourceID; //pairs this with the 'BleedingSource' bit/ID
+	protected GameplayEffectsDataBleeding m_ParentMetaData;
+	protected array<float> m_DropProbabilityArray;
+	
+	protected float m_AverageFrequency; //average drops per interval. NOT changeable on the fly, just a helper value!
+	protected float m_SequenceTick;
+	protected float m_SequenceDuration;
+	protected float m_TimeElapsedTotal;
+	protected float m_TimeElapsedSequence;
+	protected float m_LastDropSpawnTime; //relative to the TOTAL time, not the sequence!
+	protected float m_DropSpawnMinDelay;
+	protected float m_DropSpawnMaxDelay;
+	protected int m_CurrentDropProbabilityStep;
+	protected int m_DropProbabilityRollsCount;
+	protected vector m_BasePosition;
+	
+	ref set<ref BleedingIndicatorDropData> m_ActiveDrops;
+	ref set<int> m_CleanupQueue;
+	
+	void BleedingIndicator(int source_ID, int severity, GameplayEffectsDataBleeding parent)
+	{
+		m_Initialized = false;
+		m_SourceID = source_ID;
+		m_Severity = severity;
+		m_ParentMetaData = parent;
+		m_CurrentDropProbabilityStep = 0;
+		m_ActiveDrops = new set<ref BleedingIndicatorDropData>;
+		m_CleanupQueue = new set<int>;
+		m_DropProbabilityArray = m_ParentMetaData.GetProbabilities(m_Severity);
+		m_DropProbabilityRollsCount = m_DropProbabilityArray.Count();
+		
+		switch (m_Severity)
+		{
+			case BleedingIndicationConstants.INDICATOR_SEVERITY_LOW:
+			{
+				m_SequenceDuration = BleedingIndicationConstants.SEQUENCE_DURATION_LOW;
+				m_AverageFrequency = BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_LOW;
+				m_DropSpawnMinDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MIN_LOW;
+				m_DropSpawnMaxDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MAX_LOW;
+				break;
+			}
+			case BleedingIndicationConstants.INDICATOR_SEVERITY_MEDIUM:
+			{
+				m_SequenceDuration = BleedingIndicationConstants.SEQUENCE_DURATION_MEDIUM;
+				m_AverageFrequency = BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_MEDIUM;
+				m_DropSpawnMinDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MIN_MEDIUM;
+				m_DropSpawnMaxDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MAX_MEDIUM;
+				break;
+			}
+			case BleedingIndicationConstants.INDICATOR_SEVERITY_HIGH:
+			{
+				m_SequenceDuration = BleedingIndicationConstants.SEQUENCE_DURATION_HIGH;
+				m_AverageFrequency = BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_HIGH;
+				m_DropSpawnMinDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MIN_HIGH;
+				m_DropSpawnMaxDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MAX_HIGH;
+				break;
+			}
+			
+			default:
+			{
+				m_AverageFrequency = BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_LOW;
+				m_DropSpawnMinDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MIN_LOW;
+				m_DropSpawnMaxDelay = BleedingIndicationConstants.SEQUENCE_DROP_DELAY_MAX_LOW;
+				Debug.Log("Unknown severity value!");
+			}
+#ifdef DIAG_DEVELOPER
+			if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+			{
+				m_SequenceDuration = DbgBleedingIndicationStaticInfo.m_DbgSequenceDuration;
+				m_DropSpawnMinDelay = DbgBleedingIndicationStaticInfo.m_DbgDropMinDelay;
+				m_DropSpawnMaxDelay = DbgBleedingIndicationStaticInfo.m_DbgDropMaxDelay;
+			}
+#endif
+		}
+		
+		m_TimeElapsedTotal = 0;
+		m_TimeElapsedSequence = 0;
+	}
+	
+	void InitIndicator(vector position)
+	{
+		m_BasePosition = position;
+		ResetIndicator();
+		m_Initialized = true;
+	}
+	
+	void StopIndicator(bool instant = false)
+	{
+		if (!m_Terminating)
+		{
+			m_IsRunning = false;
+			
+			if (instant)
+			{
+				m_EndNow = true;
+			}
+			m_Terminating = true;
+		}
+	}
+	
+	protected void StartRunningDrops()
+	{
+		m_ActiveDropsCount = 0;
+		m_IsRunning = true;
+		TrySpawnNextDrop();
+		m_DropSpawnsQueued = 0;
+		
+		m_CurrentDropProbabilityStep = (int)(m_DropProbabilityRollsCount - (m_DropProbabilityRollsCount / m_AverageFrequency));
+	}
+	
+	//! Are any drops currently being animated?
+	protected bool IsRunningDrops()
+	{
+		return m_ActiveDropsCount > 0;
+	}
+	
+	void TrySpawnNextDrop()
+	{
+		ImageWidget dropImage;
+		if (Class.CastTo(dropImage,m_ParentMetaData.GetNextDropImage()) && !dropImage.IsVisible()) //IsVisible false means the drop is free to be used
+		{
+			BleedingIndicatorDropData data = new BleedingIndicatorDropData(dropImage,m_Severity);
+			data.SetBasePosition(m_BasePosition);
+			data.StartDrop();
+			
+			m_ActiveDrops.Insert(data);
+			m_ActiveDropsCount++;
+		}
+		
+		m_LastDropSpawnTime = m_TimeElapsedTotal;
+		m_DropSpawnsQueued--;
+	}
+	
+	protected void ResetSequence()
+	{
+		m_CurrentDropProbabilityStep = 0;
+		m_TimeElapsedSequence = 0;
+		m_DropSpawnsQueued = 0;
+	}
+	
+	void ResetIndicator()
+	{
+		m_Terminating = false;
+		m_EndNow = false;
+		m_TimeElapsedTotal = 0;
+		m_CurrentDropProbabilityStep = 0;
+		m_TimeElapsedSequence = 0;
+		m_LastDropSpawnTime = 0;
+		m_DropSpawnsQueued = 0;
+	}
+	
+	void Update(float timeSlice)
+	{
+		if ( !m_Initialized )
+		{
+			return;
+		}
+		
+#ifdef DIAG_DEVELOPER
+		if (DbgBleedingIndicationStaticInfo.m_DbgUseOverrideValues)
+		{
+			m_SequenceDuration = DbgBleedingIndicationStaticInfo.m_DbgSequenceDuration;
+		}
+#endif
+		m_SequenceTick = m_SequenceDuration / m_DropProbabilityRollsCount;
+		
+		//run drops, if possible
+		if (!m_Terminating)
+		{
+			if (m_IsRunning)
+			{
+				if (m_TimeElapsedSequence > (m_SequenceTick * m_CurrentDropProbabilityStep))
+				{
+					if (m_CurrentDropProbabilityStep < m_DropProbabilityRollsCount)
+					{
+						float rnd = Math.RandomFloat01();
+						if (rnd < m_DropProbabilityArray[m_CurrentDropProbabilityStep])
+						{
+							m_DropSpawnsQueued++;
+						}
+						
+						m_CurrentDropProbabilityStep++;
+					}
+				}
+				
+				float sinceLastDrop = m_TimeElapsedTotal - m_LastDropSpawnTime;
+				if (m_TimeElapsedSequence > m_SequenceDuration)
+				{
+					ResetSequence();
+				}
+				else if (m_DropSpawnsQueued > 0) //spawn queued drop
+				{
+					if (sinceLastDrop >= m_DropSpawnMinDelay)
+					{
+						TrySpawnNextDrop();
+					}
+				}
+				else if (sinceLastDrop > m_DropSpawnMaxDelay)
+				{
+					TrySpawnNextDrop(); //guaranteed drop
+					m_CurrentDropProbabilityStep++; //substitutes a regular roll..
+				}
+			}
+			else //1st drop ignores delay
+			{
+				StartRunningDrops();
+			}
+		}
+		
+		for (int i = 0; i < m_ActiveDropsCount; i++)
+		{
+			if (!m_EndNow)
+			{
+				//Simulate drops
+				m_ActiveDrops[i].Update(timeSlice);
+			}
+			else
+			{
+				m_ActiveDrops[i].StopDrop();
+			}
+			
+			if (!m_ActiveDrops[i].IsRunning())
+			{
+				m_CleanupQueue.Insert(i);
+			}
+		}
+		
+		//Cleanup drops
+		for (i = m_CleanupQueue.Count() - 1; i >= 0; i--)
+		{
+			m_ActiveDrops.Remove(m_CleanupQueue[i]);
+			m_ActiveDropsCount--;
+		}
+		m_CleanupQueue.Clear();
+		
+		if (m_Terminating && !IsRunningDrops())
+		{
+			m_EndNow = true;
+		}
+		
+		m_TimeElapsedTotal += timeSlice;
+		m_TimeElapsedSequence += timeSlice;
+	}
+	
+	bool GetEndNow()
+	{
+		return m_EndNow;
+	}
+	
+	int GetSeverity()
+	{
+		return m_Severity;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GEWidgetsMetaData.c b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GEWidgetsMetaData.c
new file mode 100644
index 0000000000000000000000000000000000000000..a8efbd60287ed00ed99699afad9d74d086400ee4
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GEWidgetsMetaData.c
@@ -0,0 +1,105 @@
+/*
+TODO - doxygen formating
+*/
+
+//! generic metadata class
+class GameplayEffectsData extends Managed
+{
+	protected ref array<ref Widget> 	m_WidgetArray;
+	int 								m_Type;
+	int 								m_WidgetSetIdentifier;
+	Widget 								m_LayoutRoot;
+	
+	void GameplayEffectsData(array<ref Widget> input, int type, int user_override = -1)
+	{
+		m_WidgetArray = input;
+		m_Type = type;
+		m_WidgetSetIdentifier = type;
+		
+		if (user_override != -1)
+		{
+			m_WidgetSetIdentifier = user_override;
+		}
+	}
+	
+	void Init(array<ref Widget> input, int type, Widget layout_root, int user_override = -1)
+	{
+		m_WidgetArray = input;
+		m_Type = type;
+		m_WidgetSetIdentifier = type;
+		m_LayoutRoot = layout_root;
+		
+		if (user_override != -1)
+		{
+			m_WidgetSetIdentifier = user_override;
+		}
+	}
+	
+	array<ref Widget> GetWidgetSet()
+	{
+		return m_WidgetArray;
+	}
+	
+	int GetWidgetSetType()
+	{
+		return m_Type;
+	}
+	
+	int GetWidgetSetID()
+	{
+		return m_WidgetSetIdentifier;
+	}
+	
+	//! Returns 'true' if this class contains update info
+	bool HasDefinedHandle()
+	{
+		return false;
+	}
+	
+	bool DataInitialized()
+	{
+		return true;
+	}
+	
+	void UpdateVisibility(bool state){}
+	void RegisterData(Param p){}
+	void Update(float timeSlice = 0, Param p = null, int handle = -1){}
+	void ForceStop();
+}
+
+class GameplayEffectsDataImage extends GameplayEffectsData
+{
+	ref array<int> 	m_OriginalColors;
+	ref array<int> 	m_CurrentColors;
+	
+	protected float 			m_SaturationMultiplier;//TODO ?
+	
+	void GameplayEffectsDataImage(array<ref Widget> input, int type, int user_override = -1)
+	{
+		ImageWidget w;
+		m_OriginalColors = new array<int>;
+		m_CurrentColors = new array<int>;
+		
+		for (int i = 0; i < input.Count(); i++)
+		{
+			if ( Class.CastTo(w,input.Get(i)) )
+			{
+				m_OriginalColors.Insert(w.GetColor());
+			}
+		}
+		
+		m_CurrentColors.Copy(m_OriginalColors);
+	}
+	
+	void SetSaturationMultiplier(float value)
+	{
+		m_SaturationMultiplier = value;
+	}
+	
+	float GetSaturationMultiplier()
+	{
+		return m_SaturationMultiplier;
+	}
+}
+
+typedef map<int,ref GameplayEffectsData> GameplayEffectDataMap;
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GEWidgetsMetaDataBleeding.c b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GEWidgetsMetaDataBleeding.c
new file mode 100644
index 0000000000000000000000000000000000000000..21f30649b4a637c1427b8b62d89df8c61e0f6d91
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GEWidgetsMetaDataBleeding.c
@@ -0,0 +1,300 @@
+
+//! Manages all bleeding indicators and their updates
+class GameplayEffectsDataBleeding extends GameplayEffectsData
+{
+	protected bool m_Initialized; //tied to initialization of 'BleedingSourcesManagerBase' on player object, skips updates until ready, even when formally active
+	protected bool m_Visible; //overall visibility
+	protected ref map<int,ref BleedingIndicator> m_RegisteredInstances;
+	protected ref array<int> m_CleanupQueue;
+	protected ref array<int> m_RunningIndicators;
+	protected int m_LastDropIdx;
+	protected int m_ImageWidgetCount; //number of available blood drop image widgets
+	protected ref map<int,ref array<float>> m_ProbabilityMap;
+	protected ref array<Widget> m_PositioningFramesArray;
+	protected Widget m_BloodDropsFrame;
+	
+	protected int m_LastPositionFrameUsed;
+	
+	void GameplayEffectsDataBleeding(array<ref Widget> input, int type, int user_override = -1)
+	{
+		m_RegisteredInstances = new map<int,ref BleedingIndicator>;
+		m_CleanupQueue = new array<int>;
+		m_RunningIndicators = new array<int>;
+		m_Initialized = false;
+	}
+	
+	override void Init(array<ref Widget> input, int type, Widget layout_root, int user_override = -1)
+	{
+		super.Init(input, type, layout_root, user_override);
+		
+		m_WidgetArray.ShuffleArray(); //shuffles order of the widgets on every init
+		m_ImageWidgetCount = m_WidgetArray.Count();
+		m_BloodDropsFrame = m_LayoutRoot.FindAnyWidgetById(EffectWidgetsTypes.BLEEDING_LAYER);
+		m_Visible = g_Game.GetProfileOption(EDayZProfilesOptions.BLEEDINGINDICATION);
+		m_BloodDropsFrame.Show(m_Visible);
+		m_LastDropIdx = -1;
+		m_LastPositionFrameUsed = -1;
+		
+		BuildProbabilityData(BleedingIndicationConstants.INDICATOR_SEVERITY_LOW,BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_LOW);
+		BuildProbabilityData(BleedingIndicationConstants.INDICATOR_SEVERITY_MEDIUM,BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_MEDIUM);
+		BuildProbabilityData(BleedingIndicationConstants.INDICATOR_SEVERITY_HIGH,BleedingIndicationConstants.SEQUENCE_DROP_AVERAGE_HIGH);
+		BuildPositioningData();
+	}
+	
+	override bool HasDefinedHandle()
+	{
+		return true;
+	}
+	
+	override bool DataInitialized()
+	{
+		return m_Initialized;
+	}
+	
+	override void RegisterData(Param p)
+	{
+		if (m_Initialized)
+		{
+			#ifdef DEVELOPER
+				ErrorEx("" + this + " is already initialized, further registration not possible!");
+			#else
+				Debug.Log("ERROR: " + this + " is already initialized, further registration not possible!");
+			#endif
+			return;
+		}
+		
+		//<finish registration,bit,flow_modifier>
+		Param3<bool,int,float> par;
+		if (Class.CastTo(par,p))
+		{
+			if (par.param1 == true) //finish registration
+			{
+				m_Initialized = true;
+				return;
+			}
+			
+			RegisterBleedingIndicatorInstance(par.param2,par.param3);
+		}
+	}
+	
+	void RegisterBleedingIndicatorInstance(int bit, float flow_modifier)
+	{
+		int severity = CalculateSeverity(flow_modifier);
+		BleedingIndicator indicator = new BleedingIndicator(bit,severity,this); //source_ID == bit for the purpose of pairing
+		m_RegisteredInstances.Set(bit,indicator);
+	}
+	
+	void SpawnBleedingIndicator(int source_ID, vector position)
+	{
+		if (m_RunningIndicators.Find(source_ID) != -1)
+		{
+			return;
+		}
+		BleedingIndicator indicator = m_RegisteredInstances.Get(source_ID);
+		//indicator.InitIndicator(position); //would be nice if we could pair the indicator position to the hit position that caused the bleeding, wouldn't it
+		indicator.InitIndicator(GenerateSequenceRandomPosition());
+		m_RunningIndicators.Insert(source_ID);
+	}
+	
+	int CalculateSeverity(float flow_modifier)
+	{
+		switch (flow_modifier)
+		{
+			case PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_LOW:
+				return BleedingIndicationConstants.INDICATOR_SEVERITY_LOW;
+			
+			case PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_MEDIUM:
+				return BleedingIndicationConstants.INDICATOR_SEVERITY_MEDIUM;
+			
+			case PlayerConstants.BLEEDING_SOURCE_FLOW_MODIFIER_HIGH:
+				return BleedingIndicationConstants.INDICATOR_SEVERITY_HIGH;
+		}
+		return BleedingIndicationConstants.INDICATOR_SEVERITY_LOW;
+	}
+	
+	ImageWidget GetNextDropImage()
+	{
+		m_LastDropIdx++;
+		if (m_LastDropIdx > (m_ImageWidgetCount - 1))
+		{
+			m_LastDropIdx = 0;
+		}
+		
+		return ImageWidget.Cast(m_WidgetArray[m_LastDropIdx]);
+	}
+	
+	void StopBleedingIndicator(int source_ID, bool instant = false)
+	{
+		m_RegisteredInstances.Get(source_ID).StopIndicator(instant); //stop queued, evaluated on update!
+	}
+	
+	void UpdateBleedingIndicators(float timeSlice)
+	{
+		BleedingIndicator bib;
+		for (int i = 0; i < m_RunningIndicators.Count(); i++)
+		{
+			bib = m_RegisteredInstances.Get(m_RunningIndicators[i]);
+			bib.Update(timeSlice);
+			if ( bib.GetEndNow() )
+			{
+				m_CleanupQueue.Insert(m_RunningIndicators[i]);
+			}
+		}
+	}
+	
+	void CleanupBleedingIndicators()
+	{
+		for (int i = 0; i < m_CleanupQueue.Count(); i++)
+		{
+			m_RunningIndicators.RemoveItem(m_CleanupQueue[i]);
+		}
+		m_CleanupQueue.Clear();
+	}
+	
+	override void Update(float timeSlice = 0, Param p = null, int handle = -1)
+	{
+		//starts or ends a bleeding indicator
+		if (p)
+		{
+			//start/stop of the indicator
+			//<state,bit,position,immediate>
+			Param4<bool,int,vector,bool> par;
+			
+			//hide/show of bleeding effect visuals
+			//<state>
+			Param1<bool> parShow;
+			
+			if (Class.CastTo(par,p))
+			{
+				bool state = par.param1;
+				if (state) //queue add indicator
+				{
+					SpawnBleedingIndicator(par.param2,par.param3);
+				}
+				else //queue stop indicator
+				{
+					StopBleedingIndicator(par.param2,par.param4);
+				}
+			}
+			else if (Class.CastTo(parShow,p) && m_Visible != parShow.param1)
+			{
+				m_Visible = parShow.param1;
+				m_BloodDropsFrame.Show(m_Visible);
+			}
+		}
+		
+		//updates bleeding indicators
+		UpdateBleedingIndicators(timeSlice);
+		CleanupBleedingIndicators();
+	
+		if (m_RunningIndicators.Count() <= 0)
+		{
+			GetGame().GetMission().GetEffectWidgets().RemoveActiveEffects({EffectWidgetsTypes.BLEEDING_LAYER});
+			m_WidgetArray.ShuffleArray();
+		}
+	}
+	
+	override void UpdateVisibility(bool state)
+	{
+		m_Visible = g_Game.GetProfileOption(EDayZProfilesOptions.BLEEDINGINDICATION); //ugh
+		//manage layout visibility
+		Widget w = m_BloodDropsFrame;
+		while (w && w != m_LayoutRoot && m_Visible == state && w.IsVisibleHierarchy() != state)
+		{
+			w.Show(state);
+			w = w.GetParent();
+		}
+	}
+	
+	//! stops and re-sets indicators and images even out of sequence. Should still be tied to the 'player' update, though!
+	override void ForceStop()
+	{
+		super.ForceStop();
+		
+		foreach (int i: m_RunningIndicators)
+		{
+			m_RegisteredInstances.Get(i).StopIndicator(true);
+		}
+		Update();
+	}
+	
+	void BuildProbabilityData(int severity, float frequency)
+	{
+		if (!m_ProbabilityMap)
+		{
+			m_ProbabilityMap = new map<int,ref array<float>>;
+		}
+		
+		array<float> probabilities = new array<float>;
+		
+		for (int i = 0; i < BleedingIndicationConstants.SEQUENCE_STEPS; i++)
+		{
+			probabilities.Insert(Math.Poisson(frequency,i));
+		}
+		
+		m_ProbabilityMap.Insert(severity,probabilities);
+	}
+	
+	array<float> GetProbabilities(int severity)
+	{
+		array<float> ret = m_ProbabilityMap.Get(severity);
+		if (!ret)
+		{
+			ErrorEx("No defined data for the selected severity!");
+		}
+		return ret;
+	}
+	
+	void BuildPositioningData()
+	{
+		Widget frameParent = m_LayoutRoot.FindAnyWidget("PoisitioningFrames");
+		if (frameParent)
+		{
+			if (!m_PositioningFramesArray)
+			{
+				m_PositioningFramesArray = new array<Widget>;
+			}
+			
+			Widget frame = frameParent.GetChildren();
+			while (frame)
+			{
+				m_PositioningFramesArray.Insert(frame);
+				frame = frame.GetSibling();
+			}
+		}
+	}
+	
+	vector GenerateSequenceRandomPosition()
+	{
+		if (m_PositioningFramesArray)
+		{
+			int arrayCount = m_PositioningFramesArray.Count();
+			int index = Math.RandomInt(0,arrayCount);
+			if (index == m_LastPositionFrameUsed)
+			{
+				index++;
+				if (index >= arrayCount)
+				{
+					index = 0;
+				}
+			}
+			
+			Widget frame = m_PositioningFramesArray[index];
+			m_LastPositionFrameUsed = index;
+			
+			if (frame)
+			{
+				int screenX,screenY;
+				float x,y,x_size,y_size;
+				frame.GetScreenPos(x,y);
+				frame.GetScreenSize(x_size,y_size);
+				
+				x = Math.RandomFloatInclusive(x,x+x_size);
+				y = Math.RandomFloatInclusive(y,y+y_size);
+				
+				return Vector(x,y,0);
+			}
+		}
+		return vector.Zero;
+	}
+}
\ No newline at end of file
diff --git a/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GameplayEffectWidgets.c b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GameplayEffectWidgets.c
new file mode 100644
index 0000000000000000000000000000000000000000..27f118699a395b31f7cde5b7545186e4ac2ccdf0
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/GameplayEffectWidgets/GameplayEffectWidgets.c
@@ -0,0 +1,651 @@
+/*
+TODO - doxygen formating
+*/
+
+//! grouped gameplay effect widgets and their handling
+class GameplayEffectWidgets extends GameplayEffectWidgets_base
+{
+	protected ref Widget 								m_Root; //dummy parent node
+	protected ref map<int,ref Widget> 					m_Layouts;
+	protected ref set<ref Widget> 						m_UniqueLayouts;
+	protected ref GameplayEffectDataMap 				m_WidgetDataMap;
+	protected ref set<int> 								m_RunningEffects;
+	protected ref set<int> 								m_RunningEffectsPrevious;
+	protected ref array<int> 							m_UpdatingEffects;
+	protected ref array<ref Widget> 					m_UpdatedWidgetsCheck; //to make sure widgets are not updated over and over (case of multiple IDs sharing same widget set)
+	protected ref array<int> 							m_UpdatedWidgetSetsCheck; //to make sure sets are not updated over and over (case of multiple IDs sharing same widget set)
+	protected ref set<int> 								m_SuspendRequests;
+	protected ref map<int,typename> 					m_IDToTypeMap;
+	
+	protected float 									m_TimeProgBreath;
+	protected float 									m_BreathMultStamina;
+	protected float 									m_BreathResidue;
+	
+	//UserID's for widget containers that use something different from 'EffectWidgetsTypes' defaults
+	protected const int 								WIDGETSET_BREATH = 100;
+	
+	//effect values
+	protected int 										m_BreathColor;
+	protected float 									m_BreathAlphaVal;
+	protected float 									m_FlashbangCoverAlphaVal;
+	
+	void GameplayEffectWidgets()
+	{
+		m_Root = GetGame().GetWorkspace().CreateWidget(FrameWidgetTypeID,0,0,1.0,1.0,WidgetFlags.VISIBLE | WidgetFlags.HEXACTPOS | WidgetFlags.VEXACTPOS, 0xffffffff, 0);
+		m_Layouts = new map<int,ref Widget>;
+		m_UniqueLayouts = new set<ref Widget>;
+		m_WidgetDataMap = new GameplayEffectDataMap;
+		m_RunningEffects = new set<int>;
+		m_RunningEffectsPrevious = new set<int>;
+		m_UpdatingEffects = new array<int>;
+		m_UpdatedWidgetsCheck = new array<ref Widget>;
+		m_UpdatedWidgetSetsCheck = new array<int>;
+		m_SuspendRequests = new set<int>;
+		m_IDToTypeMap = new map<int,typename>;
+		
+		m_TimeProgBreath = 0.0;
+		m_BreathMultStamina = 1.0;
+		
+		PairIDToTypes();
+		
+		RegisterLayouts("gui/layouts/gameplay/CameraEffects.layout",CompileEffectListing());
+		RegisterLayouts("gui/layouts/gameplay/BleedingEffects.layout",{EffectWidgetsTypes.BLEEDING_LAYER});
+		
+		InitWidgetSet(EffectWidgetsTypes.MASK_BREATH,true,WIDGETSET_BREATH);
+		InitWidgetSet(EffectWidgetsTypes.HELMET_BREATH,true,WIDGETSET_BREATH);
+		InitWidgetSet(EffectWidgetsTypes.MOTO_BREATH,true,WIDGETSET_BREATH);
+		
+		InitWidgetSet(EffectWidgetsTypes.MASK_OCCLUDER,false,EffectWidgetsTypes.MASK_OCCLUDER);
+		InitWidgetSet(EffectWidgetsTypes.HELMET_OCCLUDER);
+		InitWidgetSet(EffectWidgetsTypes.HELMET2_OCCLUDER);
+		InitWidgetSet(EffectWidgetsTypes.MOTO_OCCLUDER);
+		InitWidgetSet(EffectWidgetsTypes.NVG_OCCLUDER,false,EffectWidgetsTypes.NVG_OCCLUDER);
+		InitWidgetSet(EffectWidgetsTypes.PUMPKIN_OCCLUDER,false,EffectWidgetsTypes.NVG_OCCLUDER);
+		InitWidgetSet(EffectWidgetsTypes.EYEPATCH_OCCLUDER);
+		
+		InitWidgetSet(EffectWidgetsTypes.COVER_FLASHBANG);
+		
+		InitWidgetSet(EffectWidgetsTypes.BLEEDING_LAYER,true);
+		
+		UpdateVisibility();
+	}
+	
+	void ~GameplayEffectWidgets()
+	{
+		for (int i = 0; i < m_Layouts.Count(); i++)
+		{
+			if (m_Layouts.GetElement(i))
+				m_Layouts.GetElement(i).Unlink();
+		}
+	}
+	
+	/**
+	\brief Registers new layout and ties effect IDs to it
+	\note Order of layout creation matters, they get layered on top of each other. Within a single layout, widget priorities govern the widget order.
+	*/
+	protected void RegisterLayouts(string path, array<int> types)
+	{
+		Widget w = GetGame().GetWorkspace().CreateWidgets(path,m_Root,false);
+		m_UniqueLayouts.Insert(w);
+		w.Show(false);
+		foreach (int i : types)
+		{
+			m_Layouts.Set(i,w);
+		}
+	}
+	
+	protected void PairIDToTypes()
+	{
+		m_IDToTypeMap.Insert(EffectWidgetsTypes.BLEEDING_LAYER,GameplayEffectsDataBleeding);
+	}
+	
+	protected typename TranslateIDToType(int typeID)
+	{
+		return m_IDToTypeMap.Get(typeID);
+	}
+	
+	override void RegisterGameplayEffectData(int id, Param p)
+	{
+		if (!m_WidgetDataMap.Get(id).DataInitialized())
+		{
+			m_WidgetDataMap.Get(id).RegisterData(p);
+		}
+	}
+	
+	/**
+	\brief InitWidgetSet
+		\param type \p int ID of effect widget type
+		\param updating \p bool Marks widgets for 'PlayerBase.EOnFrame' updating
+		\param user_id_override \p int UserID of a widget to be used instead (allows multiple types to use single widget)
+		@code
+			InitWidgetSet(EffectWidgetsTypes.MASK_BREATH,true,BREATH);
+		@endcode
+		\note All child widgets MUST be of the same type if special functionality is required (ImageWidget etc.)
+	*/
+	protected void InitWidgetSet(int type, bool updating = false, int user_id_override = -1)
+	{
+		Widget parent = null;
+		if (user_id_override != -1) 
+		{
+			parent = m_Layouts.Get(type).FindAnyWidgetById(user_id_override);
+		}
+		else
+		{
+			parent = m_Layouts.Get(type).FindAnyWidgetById(type);
+		}
+		
+		if (!parent)
+		{
+			Print("InitWidgetSet | type: " + type + " - parent not found!");
+			return;
+		}
+		
+		array<ref Widget> output;
+		Widget w = parent.GetChildren();
+		if (w)
+		{
+			output = new array<ref Widget>;
+			while (w)
+			{
+				w.Update();
+				w.Show(false,true);
+				output.Insert(w);
+				
+				w = w.GetSibling();
+			}
+			
+			if (parent.GetChildren())
+			{
+				typename handled_type = TranslateIDToType(type);
+				if ( handled_type )
+				{
+					CreateHandledClass(handled_type,output,type,user_id_override);
+				}
+				else
+				{
+					if (ImageWidget.Cast(parent.GetChildren()))
+					{
+						m_WidgetDataMap.Set(type, new GameplayEffectsDataImage(output,type,user_id_override) );
+					}
+					else
+					{
+						m_WidgetDataMap.Set(type, new GameplayEffectsData(output,type,user_id_override) );
+					}
+				}
+			}
+			
+			if (updating)
+				m_UpdatingEffects.Insert(type);
+		}
+	}
+	
+	bool CreateHandledClass(typename handled_type, array<ref Widget> input, int type, int user_override)
+	{
+		if (handled_type)
+		{
+			GameplayEffectsData data = GameplayEffectsData.Cast(handled_type.Spawn());
+			data.Init(input,type,m_Layouts.Get(type),user_override);
+			m_WidgetDataMap.Set(type, data);
+			return true;
+		}
+		return false;
+	}
+	
+	//! returns all vanilla effects, nested in a vanilla layout. If using different layouts for custom effects, please register and link separately
+	array<int> CompileEffectListing()
+	{
+		array<int> ret = new array<int>;
+		ret.Insert(EffectWidgetsTypes.MASK_OCCLUDER);
+		ret.Insert(EffectWidgetsTypes.MASK_BREATH);
+		ret.Insert(EffectWidgetsTypes.HELMET_OCCLUDER);
+		ret.Insert(EffectWidgetsTypes.HELMET_BREATH);
+		ret.Insert(EffectWidgetsTypes.MOTO_OCCLUDER);
+		ret.Insert(EffectWidgetsTypes.MOTO_BREATH);
+		ret.Insert(EffectWidgetsTypes.COVER_FLASHBANG);
+		ret.Insert(EffectWidgetsTypes.NVG_OCCLUDER);
+		ret.Insert(EffectWidgetsTypes.PUMPKIN_OCCLUDER);
+		ret.Insert(EffectWidgetsTypes.EYEPATCH_OCCLUDER);
+		ret.Insert(EffectWidgetsTypes.HELMET2_OCCLUDER);
+		
+		return ret;
+	}
+	
+	protected void UpdateVisibility()
+	{
+		Widget w;
+		//Hide diff
+		int value;
+		int runningEffectCount = m_RunningEffects.Count();
+		bool runningEffectsPresent = runningEffectCount > 0;
+		GameplayEffectsData dta;
+		for (int i = 0; i < m_RunningEffectsPrevious.Count(); i++)
+		{
+			value = m_RunningEffectsPrevious.Get(i);
+			dta = m_WidgetDataMap.Get(value);
+			if (runningEffectCount < 1 || m_RunningEffects.Find(value) == -1)
+			{
+				if (dta.HasDefinedHandle())
+				{
+					dta.UpdateVisibility(false);
+				}
+				else
+				{
+					for (int j = 0; j < m_WidgetDataMap.Get(value).GetWidgetSet().Count(); j++)
+					{
+						w = m_WidgetDataMap.Get(value).GetWidgetSet().Get(j);
+						w.Show(false);
+					}
+					w.GetParent().Show(false);
+				}
+			}
+		}
+		
+		//Show running effects
+		if (runningEffectsPresent)
+		{
+			value = 0;
+			for (i = 0; i < runningEffectCount; i++)
+			{
+				value = m_RunningEffects.Get(i);
+				dta = m_WidgetDataMap.Get(value);
+				if (dta.HasDefinedHandle())
+				{
+					dta.m_LayoutRoot.Show(true);
+					dta.UpdateVisibility(true);
+				}
+				else
+				{
+					for (j = 0; j < m_WidgetDataMap.Get(value).GetWidgetSet().Count(); j++)
+					{
+						w = m_WidgetDataMap.Get(value).GetWidgetSet().Get(j);
+						w.Update();
+						w.Show(true);
+					}
+					
+					while (w) //dumb but necessary because of uncertain "visible" setting of the layout
+					{
+						w = w.GetParent();
+						if (w)
+						{
+							w.Show(true);
+						}
+					}
+				}
+			}
+		}
+		
+		m_Root.Show(runningEffectsPresent && m_SuspendRequests.Count() < 1);
+		m_RunningEffectsPrevious.Clear();
+	}
+	
+	override void AddActiveEffects(array<int> effects)
+	{
+		if (effects && effects.Count() > 0)
+		{
+			m_RunningEffectsPrevious.Copy(m_RunningEffects);
+			
+			int value;
+			for (int i = 0; i < effects.Count(); i++)
+			{
+				value = effects.Get(i);
+				m_RunningEffects.Insert(value);
+			}
+			
+			if (m_RunningEffectsPrevious.Count() != m_RunningEffects.Count())
+			{
+				UpdateVisibility();
+			}
+		}
+	}
+	
+	override void RemoveActiveEffects(array<int> effects)
+	{
+		if (effects && effects.Count() > 0)
+		{
+			m_RunningEffectsPrevious.Copy(m_RunningEffects);
+			
+			int value;
+			int idx;
+			for (int i = 0; i < effects.Count(); i++)
+			{
+				value = effects.Get(i);
+				idx = m_RunningEffects.Find(value);
+				if (idx != -1)
+				{
+					m_RunningEffects.Remove(idx);
+				}
+			}
+			
+			if (m_RunningEffectsPrevious.Count() != m_RunningEffects.Count())
+			{
+				UpdateVisibility();
+			}
+		}
+	}
+	
+	override void StopAllEffects()
+	{
+		m_Root.Show(false); //to avoid visual 'peeling'
+		
+		if (IsAnyEffectRunning())
+		{
+			int count = m_RunningEffects.Count();
+			GameplayEffectsData data;
+			for (int i = 0; i < count; i++) //iterates over running metadata, in case anything requires its own stop handling
+			{
+				data = m_WidgetDataMap.Get(m_RunningEffects[i]);
+				data.ForceStop();
+			}
+		}
+		
+		m_RunningEffectsPrevious.Copy(m_RunningEffects);
+		m_RunningEffects.Clear();
+		UpdateVisibility();
+	}
+	
+	override bool IsAnyEffectRunning()
+	{
+		return m_RunningEffects && m_RunningEffects.Count() > 0;
+	}
+	
+	override void AddSuspendRequest(int request_id)
+	{
+		m_SuspendRequests.Insert(request_id);
+		UpdateVisibility();
+	}
+	
+	override void RemoveSuspendRequest(int request_id)
+	{
+		int idx = m_SuspendRequests.Find(request_id);
+		if (idx != -1)
+		{
+			m_SuspendRequests.Remove(idx);
+		}
+		UpdateVisibility();
+	}
+	
+	override void ClearSuspendRequests()
+	{
+		m_SuspendRequests.Clear();
+		UpdateVisibility();
+	}
+	
+	override int GetSuspendRequestCount()
+	{
+		return m_SuspendRequests.Count();
+	}
+	
+	//! Usually called in course of an OnFrame update, can be manually called from elsewhere with parameters
+	override void UpdateWidgets(int type = -1, float timeSlice = 0, Param p = null, int handle = -1)
+	{
+		GameplayEffectsData dta;
+		array<ref Widget> widget_set;
+		
+		if (type == EffectWidgetsTypes.ROOT)
+		{
+			HandleWidgetRoot(timeSlice,p,handle);
+		}
+		else if (type == -1) //update stuff from the m_UpdatingEffects
+		{
+			int type_widgetset = 0;
+			for (int i = 0; i < m_UpdatingEffects.Count(); i++)
+			{
+				if (m_RunningEffects.Find(m_UpdatingEffects.Get(i)) != -1)
+				{
+					type_widgetset = m_UpdatingEffects.Get(i);
+					
+					dta = m_WidgetDataMap.Get(type_widgetset);
+					
+					if (dta.HasDefinedHandle() && dta.DataInitialized())
+					{
+						dta.Update(timeSlice,p,handle); //calculate and apply
+					}
+					else
+					{
+						CalculateValues(type_widgetset,timeSlice,p,handle);
+						widget_set = dta.GetWidgetSet();
+						foreach (Widget w : widget_set)
+						{
+							if (w.IsVisibleHierarchy() && m_UpdatedWidgetsCheck.Find(w) == -1)
+							{
+								m_UpdatedWidgetsCheck.Insert(w);
+								ProcessWidgetUpdate(w,type_widgetset,timeSlice,p,handle);
+							}
+						}
+					}
+				}
+			}
+		}
+		else //update specific widget set
+		{
+			if (m_RunningEffects.Find(type) != -1) //only do if the effect is running (FPS stonks!)
+			{
+				dta = m_WidgetDataMap.Get(type);
+				
+				if (dta.HasDefinedHandle() && dta.DataInitialized())
+				{
+					dta.Update(timeSlice,p,handle); //calculate and apply
+				}
+				else
+				{
+					CalculateValues(type,timeSlice,p,handle);
+					widget_set = dta.GetWidgetSet();
+					foreach (Widget w2 : widget_set)
+					{
+						if (w2.IsVisibleHierarchy() && m_UpdatedWidgetsCheck.Find(w2) == -1)
+						{
+							m_UpdatedWidgetsCheck.Insert(w2);
+							ProcessWidgetUpdate(w2,type,timeSlice,p,handle);
+						}
+					}
+				}
+			}
+		}
+		
+		m_UpdatedWidgetsCheck.Clear();
+		m_UpdatedWidgetSetsCheck.Clear();
+	}
+	
+	//! Only one calculation per unique WidgetSet
+	protected void CalculateValues(int type = -1, float timeSlice = 0, Param p = null, int handle = -1)
+	{
+		if (m_UpdatedWidgetSetsCheck.Find(m_WidgetDataMap.Get(type).GetWidgetSetID()) != -1)
+		{
+			//Print("skipped updating set ID " + m_WidgetDataMap.Get(type).GetWidgetSetID() + " | effect: " + type);
+			return;
+		}
+		
+		switch (type)
+		{
+			case EffectWidgetsTypes.MOTO_BREATH:
+			case EffectWidgetsTypes.HELMET_BREATH:
+			case EffectWidgetsTypes.MASK_BREATH:
+			{
+				CalculateBreathEffect(timeSlice);
+			}
+			break;
+			
+			case EffectWidgetsTypes.MOTO_OCCLUDER:
+			case EffectWidgetsTypes.EYEPATCH_OCCLUDER:
+			case EffectWidgetsTypes.HELMET_OCCLUDER:
+			case EffectWidgetsTypes.HELMET2_OCCLUDER:
+			case EffectWidgetsTypes.MASK_OCCLUDER:
+			{
+				CalculateOccluderEffect(type,timeSlice,p,handle);
+			}
+			break;
+			
+			case EffectWidgetsTypes.COVER_FLASHBANG:
+			{
+				CalculateFlashbangEffect(type,timeSlice,p,handle);
+			}
+			break;
+			
+			default:
+				return; //no need to calculate anything
+			break;
+		}
+		
+		m_UpdatedWidgetSetsCheck.Insert(m_WidgetDataMap.Get(type).GetWidgetSetID());
+	}
+	
+	protected void ProcessWidgetUpdate(Widget w, int type, float timeSlice = 0, Param p = null, int handle = -1)
+	{
+		switch (type)
+		{
+			case EffectWidgetsTypes.MOTO_BREATH:
+			case EffectWidgetsTypes.HELMET_BREATH:
+			case EffectWidgetsTypes.MASK_BREATH:
+			{
+				UpdateBreathEffect(ImageWidget.Cast(w));
+			}
+			break;
+			
+			case EffectWidgetsTypes.MOTO_OCCLUDER:
+			case EffectWidgetsTypes.EYEPATCH_OCCLUDER:
+			case EffectWidgetsTypes.HELMET_OCCLUDER:
+			case EffectWidgetsTypes.HELMET2_OCCLUDER:
+			case EffectWidgetsTypes.MASK_OCCLUDER:
+			{
+				UpdateOccluderEffect(ImageWidget.Cast(w),type,timeSlice,p,handle);
+			}
+			break;
+			
+			case EffectWidgetsTypes.COVER_FLASHBANG:
+			{
+				UpdateFlashbangEffect(ImageWidget.Cast(w));
+			}
+			break;
+			
+			default:
+				//Print("---invalid widget type to update---");
+			break;
+		}
+	}
+	
+	//-----------------------------------------
+	//specific widget 'handlers'
+	
+	const float BREATH_HDR_MIN = 0.005; //dusk?
+	const float BREATH_HDR_MAX = 1.0; //dark?
+	const float BREATH_COLOR_MULT_MIN = 0.5;
+	const float BREATH_COLOR_MULT_MAX = 0.8;
+	
+	//-----------------------------------------
+	//Breath
+	//-----------------------------------------
+	protected void CalculateBreathEffect(float timeSlice = 0, int type = -1, Param p = null)
+	{
+		float modifier = Math.Lerp(0.25, 0.5, m_BreathResidue);
+		float speed = timeSlice * modifier;
+		m_BreathResidue -= speed;
+		m_BreathResidue = Math.Clamp(m_BreathResidue,0,1);
+		float residue_final = Math.Lerp(0, 0.7, m_BreathResidue);
+		
+		float hdr_mult;
+		hdr_mult = GetSceneHDRMul(0);
+		hdr_mult = Math.Clamp(hdr_mult,BREATH_HDR_MIN,BREATH_HDR_MAX);
+		hdr_mult = Math.InverseLerp(BREATH_HDR_MIN,BREATH_HDR_MAX,hdr_mult);
+		hdr_mult = Math.Lerp(BREATH_COLOR_MULT_MAX,BREATH_COLOR_MULT_MIN,hdr_mult);
+		m_BreathColor = ARGBF(0.0,1.0 * hdr_mult,1.0 * hdr_mult,1.0 * hdr_mult); //grayscaling of the image
+		
+		
+		m_BreathAlphaVal = Math.Lerp(m_BreathAlphaVal, residue_final, timeSlice);
+	}
+	
+	protected void UpdateBreathEffect(ImageWidget w)
+	{
+		w.SetColor(m_BreathColor);
+		w.SetAlpha(m_BreathAlphaVal);
+	}
+	
+	//-----------------------------------------
+	//Occluders
+	//-----------------------------------------
+	protected void CalculateOccluderEffect(int type, float timeSlice, Param p, int handle)
+	{
+	}
+	
+	protected void UpdateOccluderEffect(ImageWidget w, int type, float timeSlice, Param p, int handle)
+	{
+	}
+	
+	//-----------------------------------------
+	//Flashbang
+	//-----------------------------------------
+	protected void CalculateFlashbangEffect(int type, float timeSlice, Param p, int handle)
+	{
+		Param1<float> par = Param1<float>.Cast(p);
+		m_FlashbangCoverAlphaVal = par.param1;
+		
+		/*if (m_FlashbangCoverAlphaVal <= 0.0)
+		{
+			RemoveActiveEffects({EffectWidgetsTypes.COVER_FLASHBANG});
+			return;
+		}*/
+	}
+	
+	protected void UpdateFlashbangEffect(ImageWidget w)
+	{
+		w.SetAlpha(1 - m_FlashbangCoverAlphaVal);
+	}
+	
+	//-----------------------------------------
+	//root handling (generic 'Widget', so mainly alpha and hiding?)
+	//-----------------------------------------
+	protected void HandleWidgetRoot(float timeSlice = 0, Param p = null, int handle = -1)
+	{
+		switch (handle)
+		{
+			default:
+			{
+				Param1<float> par = Param1<float>.Cast(p);
+				if (par)
+				{
+					float alpha_mod = Math.Clamp(par.param1,0.0,1.0);
+					//Print(alpha_mod);
+					m_Root.SetAlpha(alpha_mod);
+				}
+			}
+			break;
+		}
+	}
+	
+	//-----------------------------------------
+	//! Generic update, called on frame from the player
+	override void Update(float timeSlice)
+	{
+		if (m_SuspendRequests.Count() > 0)
+		{
+			return;
+		}
+		
+		UpdateWidgets(-1,timeSlice);
+	}
+	
+	/*
+	override void SetBreathIntensityStamina(float stamina_cap, float stamina_current)
+	{
+		float stamina_normalized = Math.InverseLerp(0, stamina_cap, stamina_current);
+		stamina_normalized = Math.Clamp(stamina_normalized,0,1);
+		
+		if ( stamina_normalized < STAMINA_SOUND_TR2 )
+		{
+			m_BreathMultStamina = 2.0;
+		}
+		else if ( stamina_normalized < STAMINA_SOUND_TR1 )
+		{
+			m_BreathMultStamina = 1.5;
+		}
+		else
+		{
+			m_BreathMultStamina = 1.0;
+		}
+	}
+	*/
+	override void OnVoiceEvent(float breathing_resistance01)
+	{
+		m_BreathResidue += Math.Lerp(0,0.35,breathing_resistance01);
+		m_BreathResidue = Math.Clamp(m_BreathResidue,0,1);
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/missionBase.c b/scripts/5_Mission/DayZ/mission/missionBase.c
new file mode 100644
index 0000000000000000000000000000000000000000..1e8429446a6cccf3ae2b82818ee432beec0a623e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/missionBase.c
@@ -0,0 +1,433 @@
+class MissionBase extends MissionBaseWorld
+{
+	PluginDeveloper 		m_ModuleDeveloper;
+	PluginKeyBinding		m_ModuleKeyBinding
+	PluginAdditionalInfo	m_ModuleServerInfo;
+	
+	ref WidgetEventHandler 	m_WidgetEventHandler;
+	ref WorldData			m_WorldData;
+	ref WorldLighting		m_WorldLighting;
+	
+	ref array<PlayerBase> m_DummyPlayers = new array<PlayerBase>;
+
+	autoptr ObjectSnapCallback m_InventoryDropCallback;
+
+	void MissionBase()
+	{
+		SetDispatcher(new DispatcherCaller);
+		
+		PluginManagerInit();
+
+		m_WidgetEventHandler = new WidgetEventHandler;
+
+		m_InventoryDropCallback = new EntityPlacementCallback;
+		
+		//Debug.DestroyAllShapes();
+
+		//TODO clea up after Gamescom
+		m_ModuleServerInfo = PluginAdditionalInfo.Cast( GetPlugin(PluginAdditionalInfo) );
+		//
+		SoundSetMap.Init();
+
+		if (GetGame().IsServer())
+		{
+			InitialiseWorldData();
+		}
+		else
+		{
+			GetDayZGame().GetAnalyticsClient().RegisterEvents();
+			m_WorldLighting	= new WorldLighting;
+		}
+		
+		GetOnInputDeviceConnected().Insert(UpdateInputDevicesAvailability);
+		GetOnInputDeviceDisconnected().Insert(UpdateInputDevicesAvailability);
+		
+		// There is a possibility different maps/servers may be using different effects
+		SEffectManager.Cleanup();
+		GetUApi().UpdateControls();
+	}
+
+	void ~MissionBase()
+	{
+		PluginManagerDelete();
+		
+		if ( GetGame().IsClient() )
+		{
+			GetDayZGame().GetAnalyticsClient().UnregisterEvents();	
+		}
+		TriggerEffectManager.DestroyInstance();
+	}
+
+	override ObjectSnapCallback GetInventoryDropCallback()
+	{
+		return m_InventoryDropCallback;
+	}
+	
+	void InitialiseWorldData()
+	{
+		string worldName = "empty";
+		GetGame().GetWorldName(worldName);
+		worldName.ToLower();
+
+		switch (worldName)
+		{
+			case "chernarusplus":
+				m_WorldData = new ChernarusPlusData();
+				break;
+
+			case "enoch":
+				m_WorldData = new EnochData();
+				break;
+			
+			#ifdef PLATFORM_CONSOLE
+			case "mainmenuscenexbox":
+				m_WorldData = new MainMenuWorldData();
+				break
+			#endif
+
+			default:
+				m_WorldData = new ChernarusPlusData();
+				break;
+		}
+	}
+
+	override WorldLighting GetWorldLighting()
+	{
+		return m_WorldLighting;
+	}
+	
+	override WorldData GetWorldData()
+	{
+		return m_WorldData;
+	}
+	
+	override UIScriptedMenu CreateScriptedMenu(int id)
+	{
+		UIScriptedMenu menu = NULL;
+
+		switch (id)
+		{
+		case MENU_MAIN:
+#ifdef PLATFORM_CONSOLE			
+			menu = new MainMenuConsole;
+#else
+			menu = new MainMenu;
+#endif
+			break;
+		case MENU_INGAME:
+#ifdef PLATFORM_CONSOLE
+			menu = new InGameMenuXbox;
+#else
+			menu = new InGameMenu;
+#endif
+			break;
+		case MENU_CHARACTER:
+			menu = new CharacterCreationMenu;
+			break;
+		case MENU_OPTIONS:
+			menu = new OptionsMenu;
+			break;
+		case MENU_STARTUP:
+			menu = new StartupMenu;
+			break;
+		case MENU_LOADING:
+			menu = new LoadingMenu;
+			break;
+		case MENU_INVENTORY:
+			menu = new InventoryMenu;
+			break;
+		case MENU_INSPECT:
+			menu = new InspectMenuNew;
+			break;
+		case MENU_EARLYACCESS:
+			menu = new EarlyAccessMenu;
+			break;
+		case MENU_SCRIPTCONSOLE:
+			menu = new ScriptConsole;
+			break;
+		case MENU_SCRIPTCONSOLE_DIALOG_PRESET_NAME:
+			menu = new ScriptConsoleNewPresetDialog;
+			break;
+		case MENU_SCRIPTCONSOLE_DIALOG_PRESET_RENAME:
+			menu = new ScriptConsoleRenamePresetDialog;
+			break;
+		case MENU_SCRIPTCONSOLE_UNIVERSAL_INFO_DIALOG:
+			menu = new ScriptConsoleUniversalInfoDialog;
+			break;
+		case MENU_CHAT_INPUT:
+			menu = new ChatInputMenu;
+			break;
+		case MENU_CONTROLS_PRESET:
+			menu = new PresetsMenu;
+			break;
+		case MENU_NOTE:
+			menu = new NoteMenu;
+			break;
+		case MENU_MAP:
+			menu = new MapMenu;
+			break;
+		case MENU_BOOK:
+			menu = new BookMenu;
+			break;
+		case MENU_SCENE_EDITOR:
+			menu = new SceneEditorMenu;
+			break;
+		case MENU_HELP_SCREEN:
+			menu = new HelpScreen;
+			break;
+		case MENU_GESTURES:
+			menu = new GesturesMenu;
+			break;	
+		case MENU_LOGOUT:
+			menu = new LogoutMenu;
+			break;
+		case MENU_TITLE_SCREEN:
+			menu = new TitleScreenMenu;
+			break;
+		case MENU_XBOX_CONTROLS:
+			menu = new ControlsXboxNew;
+			break;
+		case MENU_RADIAL_QUICKBAR:
+			menu = new RadialQuickbarMenu;
+			break;			
+		case MENU_SERVER_BROWSER:
+			menu = new ServerBrowserMenuNew;
+			break;
+		case MENU_LOGIN_QUEUE:
+			menu = new LoginQueueBase;
+			break;
+		case MENU_LOGIN_TIME:
+			menu = new LoginTimeBase;
+			break;
+		case MENU_CAMERA_TOOLS:
+			menu = new CameraToolsMenu;
+			break;
+		case MENU_VIDEO:
+			menu = new MainMenuVideo;
+			break;
+		case MENU_KEYBINDINGS:
+			menu = new KeybindingsMenu;
+			break;
+		case MENU_TUTORIAL:
+			menu = new TutorialsMenu;
+			break;
+		case MENU_CREDITS:
+			menu = new CreditsMenu;
+			break;
+		case MENU_INVITE_TIMER:
+			menu = new InviteMenu;
+			break;
+		case MENU_WARNING_ITEMDROP:
+			menu = new ItemDropWarningMenu;
+			break;
+		case MENU_WARNING_INPUTDEVICE_DISCONNECT:
+			menu = new InputDeviceDisconnectWarningMenu;
+			break;
+		case MENU_WARNING_TELEPORT:
+			menu = new PlayerRepositionWarningMenu;
+			break;
+		case MENU_RESPAWN_DIALOGUE:
+			menu = new RespawnDialogue;
+			break;
+		case MENU_CONNECT_ERROR:
+			menu = new ConnectErrorScriptModuleUI;
+			break;
+		case MENU_LOC_ADD:
+			menu = new ScriptConsoleAddLocation;
+			break;	
+		case MENU_MISSION_LOADER:
+			menu = new MissionLoader;
+			break;
+		}
+
+		if (menu)
+		{
+			menu.SetID(id);
+		}
+
+		return menu;
+	}
+
+	void SpawnItems();
+	
+	void UpdateInputDevicesAvailability()
+	{
+		g_Game.RefreshMouseCursorVisibility();
+	}
+
+	override void OnKeyPress(int key)
+	{
+		super.OnKeyPress(key);
+		
+#ifdef DIAG_DEVELOPER
+		if ( PluginKeyBinding.instance )
+		{
+			PluginKeyBinding.instance.OnKeyPress(key);
+		}
+#endif
+	}
+	
+	int m_WidgetsTotal;
+	int m_WidgetsInvisible;
+	
+	void DumpCurrentUILayout()
+	{
+		UIScriptedMenu current_menu = GetGame().GetUIManager().GetMenu();
+		
+		if ( current_menu )
+		{
+			Widget widget_root = current_menu.GetLayoutRoot();
+			
+			if ( widget_root )
+			{
+				m_WidgetsTotal = 0;
+				m_WidgetsInvisible = 0;
+				
+				Print( widget_root.GetName() +" ("+ widget_root.GetTypeName() +")");
+				
+				DumpWidget(widget_root.GetChildren(), 1);
+				
+				Print( "Widgets TOTAL: "+ m_WidgetsTotal.ToString() +" INVISIBLE: "+ m_WidgetsInvisible.ToString() +" VISIBLE: "+ (m_WidgetsTotal - m_WidgetsInvisible).ToString() );
+			}
+		}
+	}
+	
+	void DumpWidget(Widget w, int tabs)
+	{
+		if ( !w )
+		{
+			return;
+		}
+	
+		m_WidgetsTotal++;
+		
+		string tmp;
+		for (int i = 0; i < tabs; i++)
+		{
+			tmp += "  ";
+		}
+		
+		string invisible = "";
+		
+		if ( !w.IsVisibleHierarchy() )
+		{
+			invisible = "[invisible]";
+			m_WidgetsInvisible++;
+		}
+		
+		Print( tmp +"- "+ w.GetName() +" ("+ w.GetTypeName() +") "+ invisible );
+		
+		bool collapse = false;
+		if ( w.GetChildren() )
+		{
+			collapse = true;
+			Print(tmp +"{");
+		}
+		
+		DumpWidget(w.GetChildren(), tabs + 1);
+			
+		if ( collapse )
+		{
+			Print(tmp +"}");
+		}
+			
+		DumpWidget(w.GetSibling(), tabs);
+	}	
+
+	override void OnKeyRelease(int key)
+	{
+		super.OnKeyRelease(key);
+		
+		if ( GetGame().IsDebug() )
+		{
+			if ( PluginKeyBinding.instance != NULL )
+			{
+				PluginKeyBinding.instance.OnKeyRelease(key);
+			}
+		}
+	}
+	
+	override void OnMouseButtonPress(int button)
+	{
+		super.OnMouseButtonPress(button);
+		
+		if ( GetGame().IsDebug() )
+		{
+			if ( PluginKeyBinding.instance != NULL )
+			{
+				PluginKeyBinding.instance.OnMouseButtonPress(button);
+			}
+		}
+	}
+	
+	override void OnMouseButtonRelease(int button)
+	{
+		super.OnMouseButtonRelease(button);
+		
+		if ( GetGame().IsDebug() )
+		{
+			if ( PluginKeyBinding.instance != NULL )
+			{
+				PluginKeyBinding.instance.OnMouseButtonRelease(button);
+			}
+		}
+	}
+
+	void OnLog(string msg_log)
+	{
+		if ( PluginDeveloper.GetInstance() )
+		{
+			if ( GetGame().IsServer() && !GetGame().IsMultiplayer() )
+			{
+				PluginDeveloper.GetInstance().PrintLogClient(msg_log);
+			}
+			else if ( GetGame().IsMultiplayer() && GetGame().IsClient() )
+			{
+				PluginDeveloper.GetInstance().PrintLogClient(msg_log);
+			}
+		}
+	}
+		
+	void UpdateDummyScheduler()
+	{
+		for(int i = 0; i < m_DummyPlayers.Count(); i++)
+		{
+			if (m_DummyPlayers.Get(i))
+			{
+				m_DummyPlayers.Get(i).OnTick();
+			}
+		}
+	}
+	
+	override void AddDummyPlayerToScheduler(Man player)
+	{
+		m_DummyPlayers.Insert(PlayerBase.Cast( player ));
+	}
+
+#ifdef DIAG_DEVELOPER
+	void UpdateInputDeviceDiag()
+	{
+		DisplayInputDebug(DiagMenu.GetBool(DiagMenuIDs.MISC_INPUT_DEVICE_DISCONNECT_DBG));
+	}
+	
+	void DisplayInputDebug(bool show)
+	{
+		DbgUI.BeginCleanupScope();     
+		DbgUI.Begin("InputDeviceDebug", 60, 60);
+		
+		if (show)
+		{
+			DbgUI.Text("Gamepad: " + g_Game.GetInput().IsActiveGamepadSelected());
+			DbgUI.Text("Mouse: " + g_Game.GetInput().IsMouseConnected());
+			DbgUI.Text("Keyboard: " + g_Game.GetInput().IsKeyboardConnected());
+		}
+		
+		DbgUI.End();
+		DbgUI.EndCleanupScope();
+	}
+#endif
+}
+
+class MissionDummy extends MissionBase
+{
+}
diff --git a/scripts/5_Mission/DayZ/mission/missionGameplay.c b/scripts/5_Mission/DayZ/mission/missionGameplay.c
new file mode 100644
index 0000000000000000000000000000000000000000..7f2d8ff4eb8f38aa1f257f713ae3014149f23227
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/missionGameplay.c
@@ -0,0 +1,1608 @@
+class MissionGameplay extends MissionBase
+{
+	int								m_LifeState;
+	bool							m_Initialized;
+	
+	protected UIManager				m_UIManager;
+	
+	Widget							m_HudRootWidget;
+	ImageWidget 					m_MicrophoneIcon;
+	
+	ref InventoryMenu				m_InventoryMenu;
+	ref Chat 						m_Chat;
+	ref ActionMenu					m_ActionMenu;
+	ref IngameHud					m_Hud;
+	ref HudDebug					m_HudDebug;
+	ref LogoutMenu					m_Logout;
+	ref DebugMonitor				m_DebugMonitor;
+	
+	protected ref ScriptInvoker 		m_OnConnectivityChanged;
+	
+	protected ref GameplayEffectWidgets		m_EffectWidgets;
+	
+	ref Timer						m_ChatChannelHideTimer;
+	ref WidgetFadeTimer				m_ChatChannelFadeTimer;
+	ref WidgetFadeTimer				m_MicFadeTimer;
+	
+	Widget							m_ChatChannelArea;
+	TextWidget						m_ChatChannelText;
+	NoteMenu 						m_Note;
+	
+	protected ref Timer				m_ToggleHudTimer;
+	protected const int 			HOLD_LIMIT_TIME	= 300; //ms
+	protected int					m_ActionDownTime;
+	protected int					m_ActionUpTime;
+	protected bool 					m_InitOnce;
+	protected bool 					m_ControlDisabled; //DEPRECATED; disabled mode stored below
+	protected int 					m_ControlDisabledMode;
+	protected ref array<string> 	m_ActiveInputExcludeGroups; //exclude groups defined in 'specific.xml' file
+	protected ref array<int> 		m_ActiveInputRestrictions; //additional scripted restrictions
+	protected bool					m_ProcessInputExcludes;
+	protected bool 					m_QuickbarHold;
+	protected bool 					m_PlayerRespawning;
+	protected int 					m_RespawnModeClient; //for client-side usage
+	protected bool 					m_PauseQueued;
+	
+	// von control info
+	protected bool					m_VoNActive;
+	protected Widget				m_VoiceLevels;
+	protected ref map<int,ImageWidget> m_VoiceLevelsWidgets;
+	protected ref map<int,ref WidgetFadeTimer> m_VoiceLevelTimers;
+
+	void MissionGameplay()
+	{
+		DestroyAllMenus();
+		m_Initialized				= false;
+		m_EffectWidgets 			= new GameplayEffectWidgets;
+		m_HudRootWidget				= null;
+		m_Chat						= new Chat;
+		m_ActionMenu				= new ActionMenu;
+		m_LifeState					= -1;
+		m_Hud						= new IngameHud;
+		m_VoNActive					= false;
+		m_PauseQueued				= false;
+		m_ChatChannelFadeTimer		= new WidgetFadeTimer;
+		m_MicFadeTimer				= new WidgetFadeTimer;
+		m_ChatChannelHideTimer		= new Timer(CALL_CATEGORY_GUI);
+		m_ToggleHudTimer			= new Timer(CALL_CATEGORY_GUI);
+		
+		m_ActiveRefresherLocations 	= new array<vector>;
+		SyncEvents.RegisterEvents();
+	}
+	
+	void ~MissionGameplay()
+	{
+		DestroyInventory();
+	#ifndef NO_GUI
+		if (g_Game.GetUIManager() && g_Game.GetUIManager().ScreenFadeVisible())
+		{
+			g_Game.GetUIManager().ScreenFadeOut(0);
+		}
+		Continue();
+	#endif
+	}
+	
+	InventoryMenu GetInventory()
+	{
+		return m_InventoryMenu;
+	}
+	
+	override void OnInit()
+	{
+		super.OnInit();
+
+		if ( m_Initialized )
+		{
+			return;
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		if (!GetGame().IsMultiplayer())//to make it work in single during development
+		{
+			CfgGameplayHandler.LoadData();
+			UndergroundAreaLoader.SpawnAllTriggerCarriers();
+		}
+		#endif
+		
+		PPEffects.Init(); //DEPRECATED, left in for legacy purposes only
+		MapMarkerTypes.Init();
+		
+		m_UIManager = GetGame().GetUIManager();
+		
+		m_Initialized				= true;
+
+		// init hud ui
+		if ( !m_HudRootWidget )
+		{
+			m_HudRootWidget			= GetGame().GetWorkspace().CreateWidgets("gui/layouts/day_z_hud.layout");
+			
+			m_HudRootWidget.Show(false);
+			
+			m_Chat.Init(m_HudRootWidget.FindAnyWidget("ChatFrameWidget"));
+			
+			m_ActionMenu.Init( m_HudRootWidget.FindAnyWidget("ActionsPanel"), TextWidget.Cast( m_HudRootWidget.FindAnyWidget("DefaultActionWidget") ) );
+			
+			m_Hud.Init( m_HudRootWidget.FindAnyWidget("HudPanel") );
+			
+			// von enabled icon
+			m_MicrophoneIcon = ImageWidget.Cast( m_HudRootWidget.FindAnyWidget("mic") );
+			m_MicrophoneIcon.Show(false);
+			
+			// von voice level
+			m_VoiceLevels = m_HudRootWidget.FindAnyWidget("VoiceLevelsPanel");
+			m_VoiceLevelsWidgets = new map<int, ImageWidget>; // [key] voice level
+			m_VoiceLevelTimers = new map<int,ref WidgetFadeTimer>; // [key] voice level
+		
+			if ( m_VoiceLevels )
+			{
+				m_VoiceLevelsWidgets.Set(VoiceLevelWhisper, ImageWidget.Cast( m_VoiceLevels.FindAnyWidget("Whisper") ));
+				m_VoiceLevelsWidgets.Set(VoiceLevelTalk, ImageWidget.Cast( m_VoiceLevels.FindAnyWidget("Talk") ));
+				m_VoiceLevelsWidgets.Set(VoiceLevelShout, ImageWidget.Cast( m_VoiceLevels.FindAnyWidget("Shout") ));
+				
+				m_VoiceLevelTimers.Set(VoiceLevelWhisper, new WidgetFadeTimer);
+				m_VoiceLevelTimers.Set(VoiceLevelTalk, new WidgetFadeTimer);
+				m_VoiceLevelTimers.Set(VoiceLevelShout, new WidgetFadeTimer);
+			}
+			
+			HideVoiceLevelWidgets();
+			
+			// chat channel
+			m_ChatChannelArea		= m_HudRootWidget.FindAnyWidget("ChatChannelPanel");
+			m_ChatChannelText		= TextWidget.Cast( m_HudRootWidget.FindAnyWidget("ChatChannelText") );
+		}
+		
+		// init hud ui
+		#ifdef DEVELOPER	
+		m_HudDebug				= new HudDebug;
+			
+		if ( !m_HudDebug.IsInitialized() )
+		{
+			m_HudDebug.Init( GetGame().GetWorkspace().CreateWidgets("gui/layouts/debug/day_z_hud_debug.layout") );				
+			PluginConfigDebugProfile.GetInstance().SetLogsEnabled(LogManager.IsLogsEnable());
+		}		
+		#endif
+	}
+	
+	UIManager GetUIManager()
+	{
+		return m_UIManager;
+	}
+
+	override void OnMissionStart()
+	{
+		g_Game.SetConnecting(false);
+
+#ifndef FEATURE_CURSOR
+		//! Only once the game is loaded should we take control of the cursor
+		GetUIManager().ShowUICursor(false);
+#endif
+
+		g_Game.SetMissionState( DayZGame.MISSION_STATE_GAME );
+		
+	}
+	
+	void InitInventory()
+	{
+		if ( !m_InventoryMenu )
+		{
+			m_InventoryMenu = InventoryMenu.Cast( GetUIManager().CreateScriptedMenu(MENU_INVENTORY, null) );
+		}
+	}
+	
+	void TickScheduler(float timeslice)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+				
+		if( player )
+			player.OnScheduledTick(timeslice);
+	}
+	
+	void SendMuteListToServer( map<string, bool> mute_list )
+	{
+		if( mute_list && mute_list.Count() > 0 )
+		{
+			ScriptRPC rpc = new ScriptRPC();
+			rpc.Write(mute_list);
+			rpc.Send(null, ERPCs.RPC_USER_SYNC_PERMISSIONS, true, null);
+		}
+	}
+	
+	override void UpdateInputDevicesAvailability()
+	{
+		super.UpdateInputDevicesAvailability();
+		
+		g_Game.GetInput().UpdateConnectedInputDeviceList();
+		g_Game.UpdateInputDeviceDisconnectWarning();
+	}
+	
+	override void OnMissionFinish()
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		//Print("OnMissionFinish");
+		GetUIManager().HideDialog();
+		DestroyAllMenus();
+		
+		m_Chat.Destroy();
+		delete m_HudRootWidget;
+
+		if (m_DebugMonitor)
+			m_DebugMonitor.Hide();
+#ifndef FEATURE_CURSOR
+		g_Game.GetUIManager().ShowUICursor(false);
+#endif
+		PPEManagerStatic.GetPPEManager().StopAllEffects(PPERequesterCategory.ALL);
+		EnableAllInputs();
+		g_Game.SetMissionState( DayZGame.MISSION_STATE_FINNISH );
+	}
+	
+	override void OnUpdate(float timeslice)
+	{		
+#ifdef DIAG_DEVELOPER
+		UpdateInputDeviceDiag();
+#endif
+
+#ifdef FEATURE_CURSOR
+		if (GetTimeStamp() == 0)
+		{
+			if (!g_Game.IsAppActive() || IsCLIParam("launchPaused"))
+			{
+				m_PauseQueued = true;
+			}
+			else
+			{
+				//! Only once the game is loaded should we take control of the cursor
+				GetUIManager().ShowUICursor(false);
+			}
+		}
+#endif
+
+		if (m_PauseQueued && !IsPaused())
+		{
+			Pause();
+		}
+		
+		Man player = GetGame().GetPlayer();
+		PlayerBase playerPB = PlayerBase.Cast(player);
+		TickScheduler(timeslice);
+		UpdateDummyScheduler();//for external entities
+		UIScriptedMenu menu = m_UIManager.GetMenu();
+		InventoryMenu inventory = InventoryMenu.Cast( m_UIManager.FindMenu(MENU_INVENTORY) );
+		NoteMenu note_menu = NoteMenu.Cast( m_UIManager.FindMenu(MENU_NOTE) );
+		GesturesMenu gestures_menu = GesturesMenu.Cast(m_UIManager.FindMenu(MENU_GESTURES));
+		RadialQuickbarMenu quickbar_menu = RadialQuickbarMenu.Cast(m_UIManager.FindMenu(MENU_RADIAL_QUICKBAR));
+		InspectMenuNew inspect = InspectMenuNew.Cast( m_UIManager.FindMenu(MENU_INSPECT) );
+		Input input = GetGame().GetInput();
+		ActionBase runningAction;
+		bool manualInputUnlockProcessed = false;
+		
+		if ( playerPB )
+		{
+			#ifdef DIAG_DEVELOPER
+			if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+			{
+				DbgUI.Begin("Hologram Debug", 5, 5);
+			}
+			#endif
+			
+			if ( playerPB.GetHologramLocal() )
+			{
+				playerPB.GetHologramLocal().UpdateHologram( timeslice );
+			}
+			#ifdef DIAG_DEVELOPER
+			else if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+			{	
+				DbgUI.Text("No active Hologram");
+			}
+			
+			if ( DiagMenu.GetBool(DiagMenuIDs.MISC_HOLOGRAM) )
+			{		
+				DbgUI.End();
+			}
+			#endif
+			
+			runningAction = playerPB.GetActionManager().GetRunningAction();
+		}
+		
+#ifdef PLATFORM_CONSOLE
+		//'Special behaviour' for colliding VON distance input actions [CONSOLE ONLY]
+		if (GetUApi().GetInputByID(UAVoiceModifierHelper).LocalValue() && !menu)
+		{
+			GetUApi().GetInputByID(UAUIQuickbarRadialOpen).Lock();
+			GetUApi().GetInputByID(UAZoomInToggle).Lock();
+			GetUApi().GetInputByID(UAPersonView).Lock();
+			GetUApi().GetInputByID(UALeanLeft).Lock();
+			GetUApi().GetInputByID(UALeanRight).Lock();
+		}
+		else if (GetUApi().GetInputByID(UAVoiceModifierHelper).LocalRelease()) //unlocks on release, if already excluded, all the other inputs should be locked/unlocked in the exclude (if defined properly!)
+		{
+			GetUApi().GetInputByID(UAUIQuickbarRadialOpen).Unlock();
+			GetUApi().GetInputByID(UAZoomInToggle).Unlock();
+			GetUApi().GetInputByID(UAPersonView).Unlock();
+			GetUApi().GetInputByID(UALeanLeft).Unlock();
+			GetUApi().GetInputByID(UALeanRight).Unlock();
+			
+			manualInputUnlockProcessed = true;
+		}
+		
+		//Radial quickbar
+		if (GetUApi().GetInputByID(UAUIQuickbarRadialOpen).LocalPress() && playerPB)
+		{
+			//open quickbar menu
+			if ( playerPB.IsAlive() && !playerPB.IsRaised() && !playerPB.IsUnconscious() && !playerPB.GetCommand_Vehicle() )	//player hands not raised, player is not in prone and player is not interacting with vehicle
+			{
+				if ( !GetUIManager().IsMenuOpen( MENU_RADIAL_QUICKBAR ) )
+				{
+					RadialQuickbarMenu.OpenMenu();
+					m_Hud.ShowHudUI( false );
+				}	
+			}
+		}
+		
+		bool b1 = RadialQuickbarMenu.GetItemToAssign() != null;
+		//close quickbar menu from world
+		if (GetUIManager().IsMenuOpen( MENU_RADIAL_QUICKBAR ) && (!RadialQuickbarMenu.GetMenuInstance().GetParentMenu() || RadialQuickbarMenu.GetMenuInstance().GetParentMenu() != inventory) && (GetUApi().GetInputByID(UAUIQuickbarRadialOpen).LocalRelease() || !GetUApi().GetInputByID(UAUIQuickbarRadialOpen).LocalValue()))
+		{
+			RadialQuickbarMenu.CloseMenu();
+			m_Hud.ShowHudUI( true );
+		}
+		
+		//Radial Quickbar from inventory
+		if ((RadialQuickbarMenu.instance && RadialQuickbarMenu.GetMenuInstance().GetParentMenu() && RadialQuickbarMenu.GetMenuInstance().GetParentMenu() == inventory) && GetUApi().GetInputByID(UAUIQuickbarRadialInventoryOpen).LocalRelease())
+		{
+			//close radial quickbar menu
+			if (GetGame().GetUIManager().IsMenuOpen(MENU_RADIAL_QUICKBAR))
+			{
+				RadialQuickbarMenu.CloseMenu();
+				RadialQuickbarMenu.SetItemToAssign( NULL );
+				AddActiveInputExcludes({"inventory"});
+				AddActiveInputRestriction(EInputRestrictors.INVENTORY);
+			}
+		}
+		
+		if (playerPB)
+		{
+			//Special behaviour for leaning [CONSOLE ONLY]
+			if (playerPB.IsRaised() || playerPB.IsInRasedProne())
+			{
+				GetUApi().GetInputByID(UALeanLeftGamepad).Unlock();
+				GetUApi().GetInputByID(UALeanRightGamepad).Unlock();
+				
+				manualInputUnlockProcessed = true;
+			}
+			else if (!GetUApi().GetInputByID(UALeanLeftGamepad).IsLocked() || !GetUApi().GetInputByID(UALeanRightGamepad).IsLocked())
+			{
+				GetUApi().GetInputByID(UALeanLeftGamepad).Lock();
+				GetUApi().GetInputByID(UALeanRightGamepad).Lock();
+			}
+			
+			//Special behaviour for freelook & zeroing [CONSOLE ONLY]
+			if (playerPB.IsRaised())
+			{
+				GetUApi().GetInputByID(UALookAround).Lock();		//disable freelook
+				GetUApi().GetInputByID(UALookAroundToggle).Lock();		//disable freelook
+				
+				GetUApi().GetInputByID(UAZeroingUp).Unlock();		//enable zeroing
+				GetUApi().GetInputByID(UAZeroingDown).Unlock();
+				
+				manualInputUnlockProcessed = true;
+			}
+			else if (GetUApi().GetInputByID(UALookAround).IsLocked() || GetUApi().GetInputByID(UALookAroundToggle).IsLocked())
+			{
+				GetUApi().GetInputByID(UALookAround).Unlock();	//enable freelook
+				GetUApi().GetInputByID(UALookAroundToggle).Unlock();	//enable freelook
+				
+				GetUApi().GetInputByID(UAZeroingUp).Lock();		//disable zeroing
+				GetUApi().GetInputByID(UAZeroingDown).Lock();
+				
+				manualInputUnlockProcessed = true;
+			}
+		}
+#endif
+		
+		if (manualInputUnlockProcessed)
+		{
+			RefreshExcludes();
+		}
+		
+		//Gestures
+		if ( GetUApi().GetInputByID(UAUIGesturesOpen).LocalPress() && playerPB)
+		{
+			//open gestures menu
+			if ( !playerPB.IsRaised() && (playerPB.GetActionManager().ActionPossibilityCheck(playerPB.m_MovementState.m_CommandTypeId) || playerPB.IsEmotePlaying()) && !playerPB.GetCommand_Vehicle() )
+			{
+				if ( !GetUIManager().IsMenuOpen( MENU_GESTURES ) )
+				{
+					GesturesMenu.OpenMenu();
+					m_Hud.ShowHudUI( false );
+				}
+			}
+		}
+		
+		if ( GetUApi().GetInputByID(UAUIGesturesOpen).LocalRelease() || GetUApi().GetInputByID(UAUIGesturesOpen).LocalValue() == 0 )
+		{
+			//close gestures menu
+			if ( GetUIManager().IsMenuOpen( MENU_GESTURES ) )
+			{
+				GesturesMenu.CloseMenu();
+				m_Hud.ShowHudUI( true );
+			}
+		}
+		
+		if (player && m_LifeState == EPlayerStates.ALIVE && !player.IsUnconscious() )
+		{
+			// enables HUD on spawn
+			if (m_HudRootWidget)
+			{
+				m_HudRootWidget.Show(true);
+			}
+			
+		#ifndef NO_GUI
+			// fade out black screen
+			
+			if ( GetUIManager().ScreenFadeVisible() )
+			{
+				 GetUIManager().ScreenFadeOut(0.5);
+			}
+			
+		#endif
+		
+			if (GetUApi().GetInputByID(UAGear).LocalPress())
+			{
+				if (!inventory && playerPB.CanManipulateInventory() && IsMapUnfoldActionRunning(runningAction))
+				{
+					ShowInventory();
+					menu = m_InventoryMenu;
+				}
+				else if (menu == inventory)
+				{
+					HideInventory();
+				}
+			}
+			
+			if (GetUApi().GetInputByID(UAUIMenu).LocalPress() && menu && inventory && menu == inventory)
+			{
+				HideInventory();
+			}
+			
+			#ifndef PLATFORM_CONSOLE
+			if (GetUApi().GetInputByID(UAChat).LocalPress() && input.IsEnabledMouseAndKeyboardEvenOnServer())
+			{
+				ChatInputMenu chat = ChatInputMenu.Cast( m_UIManager.FindMenu(MENU_CHAT) );		
+				if ( menu == NULL )
+				{
+					ShowChat();
+				}
+			}
+			#endif
+			
+			// voice level updated
+			VONManager.GetInstance().HandleInput(input);
+			
+			if (GetUApi().GetInputByID(UAUIQuickbarToggle).LocalHold())
+			{
+				if (!m_QuickbarHold)
+				{
+					m_QuickbarHold = true;
+					m_Hud.ShowHudPlayer(m_Hud.IsHideHudPlayer());
+				}
+			}
+			
+			if (GetUApi().GetInputByID(UAUIQuickbarToggle).LocalRelease())
+			{
+				if (!m_QuickbarHold)
+				{
+					m_Hud.ShowQuickbarPlayer(m_Hud.IsHideQuickbarPlayer());
+				}
+				m_QuickbarHold = false;
+			}
+			
+			if (GetUApi().GetInputByID(UAZeroingUp).LocalPress() || GetUApi().GetInputByID(UAZeroingDown).LocalPress() || GetUApi().GetInputByID(UAToggleWeapons).LocalPress())
+			{
+				m_Hud.ZeroingKeyPress();
+			}
+			
+			if (menu == NULL)
+			{
+				m_ActionMenu.Refresh();
+				
+				if (GetUApi().GetInputByID(UANextActionCategory).LocalPress())
+				{
+					m_ActionMenu.NextActionCategory();
+				}
+				else if (GetUApi().GetInputByID(UAPrevActionCategory).LocalPress())
+				{
+					m_ActionMenu.PrevActionCategory();
+				}				
+				else if (GetUApi().GetInputByID(UANextAction).LocalPress())
+				{
+					m_ActionMenu.NextAction();
+				}
+				else if (GetUApi().GetInputByID(UAPrevAction).LocalPress())
+				{
+					m_ActionMenu.PrevAction();
+				}
+			}
+			else
+			{
+				m_ActionMenu.Hide();
+			}
+			
+			//hologram rotation
+			if (menu == NULL && playerPB.IsPlacingLocal() && playerPB.GetHologramLocal().GetParentEntity().PlacementCanBeRotated())
+			{
+				if (GetUApi().GetInputByID(UANextAction).LocalRelease())
+				{
+					playerPB.GetHologramLocal().SubtractProjectionRotation(15);
+				}
+				
+				if (GetUApi().GetInputByID(UAPrevAction).LocalRelease())
+				{
+					playerPB.GetHologramLocal().AddProjectionRotation(15);
+				}
+			}
+			
+			if (CfgGameplayHandler.GetMapIgnoreMapOwnership() && !CfgGameplayHandler.GetUse3DMap())
+			{
+				if (GetUApi().GetInputByID(UAMapToggle).LocalPress() && !m_UIManager.GetMenu())
+				{
+					if (IsMapUnfoldActionRunning(runningAction))
+					{
+						HandleMapToggleByKeyboardShortcut(player);
+					}
+				}
+			}
+		}
+		
+		// life state check
+		if (player)
+		{
+			int life_state = player.GetPlayerState();
+			
+			// life state changed
+			if (m_LifeState != life_state)
+			{
+				m_LifeState = life_state;
+				
+				if (m_LifeState != EPlayerStates.ALIVE && !player.IsUnconscious())
+				{
+					CloseAllMenus();
+				}
+			}
+		}
+		
+		if (menu && !menu.UseKeyboard() && menu.UseMouse())
+		{
+			int i;
+			for (i = 0; i < 5; i++)
+			{
+				input.DisableKey(i | INPUT_DEVICE_MOUSE);
+				input.DisableKey(i | INPUT_ACTION_TYPE_DOWN_EVENT | INPUT_DEVICE_MOUSE);
+				input.DisableKey(i | INPUT_ACTION_TYPE_DOUBLETAP | INPUT_DEVICE_MOUSE);
+			}
+			
+			for (i = 0; i < 6; i++)
+			{
+				input.DisableKey(i | INPUT_DEVICE_MOUSE_AXIS);
+			}
+		}
+		
+		if (!m_UIManager.IsDialogVisible())
+		{
+			if (menu)
+			{
+				if (menu == inspect)
+				{
+					if (GetUApi().GetInputByID(UAGear).LocalPress())
+					{
+						if (ItemManager.GetInstance().GetSelectedItem() == NULL)
+						{
+							HideInventory();
+						}
+					}
+					else if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+					{
+						if (ItemManager.GetInstance().GetSelectedItem() == NULL)
+						{
+							HideInventory();
+						}
+					}
+				}
+				else if (menu == note_menu && (!IsInputExcludeActive("inventory") || !IsInputRestrictionActive(EInputRestrictors.INVENTORY)))
+				{
+					AddActiveInputExcludes({"inventory"});
+					AddActiveInputRestriction(EInputRestrictors.INVENTORY);
+				}
+				else if (menu == gestures_menu && !gestures_menu.IsMenuClosing() && !IsInputExcludeActive("radialmenu"))
+				{
+					AddActiveInputExcludes({"radialmenu"});
+					GetUApi().GetInputByID(UAUIGesturesOpen).Unlock();
+				}
+				else if (menu == quickbar_menu && !quickbar_menu.IsMenuClosing() && !IsInputExcludeActive("radialmenu"))
+				{
+					AddActiveInputExcludes({"radialmenu"});
+					GetUApi().GetInputByID(UAUIQuickbarRadialOpen).Unlock();
+				}
+				else if (IsPaused())
+				{
+					InGameMenuXbox menu_xb = InGameMenuXbox.Cast(GetGame().GetUIManager().GetMenu());
+					if (!g_Game.GetUIManager().ScreenFadeVisible() && (!menu_xb || !menu_xb.IsOnlineOpen()))
+					{
+						if (GetUApi().GetInputByID(UAUIMenu).LocalPress())
+						{
+							Continue();
+						}
+						else if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+						{
+							Continue();
+						}
+					}
+					else if (GetUApi().GetInputByID(UAUIBack).LocalPress())
+					{
+						if (menu_xb && menu_xb.IsOnlineOpen())
+						{
+							menu_xb.CloseOnline();
+						}
+					}
+				}
+			}
+			else if (GetUApi().GetInputByID(UAUIMenu).LocalPress())
+			{
+				if (IsMapUnfoldActionRunning(runningAction))
+				{
+					Pause();
+				}
+			}
+		}
+		
+		UpdateDebugMonitor();
+		
+		SEffectManager.Event_OnFrameUpdate(timeslice);
+		
+		if (!GetGame().IsMultiplayer())
+			m_WorldData.UpdateBaseEnvTemperature( timeslice );
+
+#ifdef DIAG_DEVELOPER
+		DisplayHairDebug();
+#endif
+		if (m_ProcessInputExcludes)
+		{
+			PerformRefreshExcludes();
+			m_ProcessInputExcludes = false;
+		}
+		
+		super.OnUpdate( timeslice );
+	}
+	
+	override void OnKeyPress(int key)
+	{
+		super.OnKeyPress(key);
+		m_Hud.KeyPress(key);
+	}
+	
+	override void OnKeyRelease(int key)
+	{
+		super.OnKeyRelease(key);
+	}
+	
+	override void OnEvent(EventType eventTypeId, Param params)
+	{
+		super.OnEvent(eventTypeId, params);
+		InventoryMenu menu;
+		Man player = GetGame().GetPlayer();
+		
+		switch (eventTypeId)
+		{
+			case ChatMessageEventTypeID:
+				ChatMessageEventParams chat_params = ChatMessageEventParams.Cast( params );			
+				if (m_LifeState == EPlayerStates.ALIVE)
+				{
+					m_Chat.Add(chat_params);
+				}
+				break;
+				
+			case ChatChannelEventTypeID:
+				ChatChannelEventParams cc_params = ChatChannelEventParams.Cast( params );
+				ChatInputMenu chatMenu = ChatInputMenu.Cast( GetUIManager().FindMenu(MENU_CHAT_INPUT) );
+				if (chatMenu)
+				{
+					chatMenu.UpdateChannel();
+				}
+				else
+				{
+					m_ChatChannelText.SetText(ChatInputMenu.GetChannelName(cc_params.param1));
+					m_ChatChannelFadeTimer.FadeIn(m_ChatChannelArea, 0.5, true);
+					m_ChatChannelHideTimer.Run(2, m_ChatChannelFadeTimer, "FadeOut", new Param3<Widget, float, bool>(m_ChatChannelArea, 0.5, true));
+				}
+				break;
+				
+			case WindowsResizeEventTypeID:
+				DestroyAllMenus();
+				m_Hud.OnResizeScreen();
+				
+				break;
+	
+			case SetFreeCameraEventTypeID:
+				SetFreeCameraEventParams set_free_camera_event_params = SetFreeCameraEventParams.Cast( params );
+				PluginDeveloper plugin_developer = PluginDeveloper.Cast( GetPlugin(PluginDeveloper) );
+				plugin_developer.OnSetFreeCameraEvent( PlayerBase.Cast( player ), set_free_camera_event_params.param1 );
+				break;
+		}
+	}
+	
+	override void OnItemUsed(InventoryItem item, Man owner)
+	{
+		if (item && GetUIManager().GetMenu() == NULL)
+		{
+			if (item.IsInherited(ItemBook))
+			{
+				BookMenu bookMenu = BookMenu.Cast( GetUIManager().EnterScriptedMenu(MENU_BOOK, NULL) );
+				if (bookMenu)
+				{
+					bookMenu.ReadBook(item);
+				}
+			}
+		}
+	}
+	
+#ifdef DEVELOPER
+	override void SetInputSuppression(bool state)
+	{
+		m_SuppressNextFrame = state;
+	}
+	
+	override bool GetInputSuppression()
+	{
+		return m_SuppressNextFrame;
+	}
+#endif
+	
+	//! Deprecated; removes last input exclude and associated controls restrictions
+	override void PlayerControlEnable( bool bForceSupress )
+	{
+		super.PlayerControlEnable(bForceSupress);
+		
+		if (m_ControlDisabledMode != -1)
+		{
+			switch (m_ControlDisabledMode)
+			{
+				case INPUT_EXCLUDE_ALL:
+				{
+					RemoveActiveInputExcludes({"menu"},bForceSupress);
+					break;
+				}
+				case INPUT_EXCLUDE_INVENTORY:
+				{
+					RemoveActiveInputExcludes({"inventory"},bForceSupress);
+					RemoveActiveInputRestriction(EInputRestrictors.INVENTORY);
+					break;
+				}
+				case INPUT_EXCLUDE_MAP:
+				{
+					RemoveActiveInputExcludes({"loopedactions"},bForceSupress);
+					RemoveActiveInputRestriction(EInputRestrictors.MAP);
+					break;
+				}
+				case INPUT_EXCLUDE_MOUSE_ALL:
+				{
+					RemoveActiveInputExcludes({"radialmenu"},bForceSupress);
+					break;
+				}
+				case INPUT_EXCLUDE_MOUSE_RADIAL:
+				{
+					RemoveActiveInputExcludes({"radialmenu"},bForceSupress);
+					break;
+				}
+			}
+			
+			m_ControlDisabledMode = -1;
+			
+			PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+			if (player)
+			{
+				HumanInputController hic = player.GetInputController();
+				hic.LimitsDisableSprint(false);
+			}
+		}
+	}
+
+	//! Deprecated; simple input restrictions
+	override void PlayerControlDisable(int mode)
+	{
+		super.PlayerControlDisable(mode);
+		
+		switch (mode)
+		{
+			case INPUT_EXCLUDE_ALL:
+			{
+				AddActiveInputExcludes({"menu"});
+				break;
+			}
+			case INPUT_EXCLUDE_INVENTORY:
+			{
+				AddActiveInputExcludes({"inventory"});
+				AddActiveInputRestriction(EInputRestrictors.INVENTORY);
+				break;
+			}
+			case INPUT_EXCLUDE_MAP:
+			{
+				AddActiveInputExcludes({"loopedactions"});
+				AddActiveInputRestriction(EInputRestrictors.MAP);
+				break;
+			}
+			case INPUT_EXCLUDE_MOUSE_ALL:
+			{
+				AddActiveInputExcludes({"radialmenu"});
+				break;
+			}
+			case INPUT_EXCLUDE_MOUSE_RADIAL:
+			{
+				AddActiveInputExcludes({"radialmenu"});
+				break;
+			}
+			default:
+			{
+				Debug.Log("Unknown controls disable mode");
+				return;
+			}
+		}
+		
+		m_ControlDisabledMode = mode;
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if ( player )
+		{
+			ItemBase item = player.GetItemInHands();
+			if (item && item.IsWeapon())
+				player.RequestResetADSSync();
+		}
+	}
+	
+	//! Removes one or more exclude groups and refreshes excludes
+	override void RemoveActiveInputExcludes(array<string> excludes, bool bForceSupress = false)
+	{
+		super.RemoveActiveInputExcludes(excludes,bForceSupress);
+		
+		if (excludes.Count() != 0)
+		{
+			bool changed = false;
+			
+			if (m_ActiveInputExcludeGroups)
+			{
+				for (int i = 0; i < excludes.Count(); i++)
+				{
+					if (m_ActiveInputExcludeGroups.Find(excludes[i]) != -1)
+					{
+						m_ActiveInputExcludeGroups.RemoveItem(excludes[i]);
+						changed = true;
+					}
+				}
+				
+				if (changed)
+				{
+					RefreshExcludes();
+				}
+			}
+			
+			// supress control for next frame
+			GetUApi().SupressNextFrame(bForceSupress);
+		}
+	}
+	
+	//! Removes one restriction (specific behaviour oudside regular excludes, defined below)
+	override void RemoveActiveInputRestriction(int restrictor)
+	{
+		//unique behaviour outside regular excludes
+		if (restrictor > -1)
+		{
+			switch (restrictor)
+			{
+				case EInputRestrictors.INVENTORY:
+				{
+					GetUApi().GetInputByID(UAWalkRunForced).ForceEnable(false); // force walk off!
+					break;
+				}
+				case EInputRestrictors.MAP:
+				{
+					GetUApi().GetInputByID(UAWalkRunForced).ForceEnable(false); // force walk off!
+					break;
+				}
+			}
+			
+			if (m_ActiveInputRestrictions && m_ActiveInputRestrictions.Find(restrictor) != -1)
+			{
+				m_ActiveInputRestrictions.RemoveItem(restrictor);
+			}
+		}
+	}
+	
+	//! Adds one or more exclude groups to disable and refreshes excludes
+	override void AddActiveInputExcludes(array<string> excludes)
+	{
+		super.AddActiveInputExcludes(excludes);
+		
+		if (excludes.Count() != 0)
+		{
+			bool changed = false;
+			if (!m_ActiveInputExcludeGroups)
+			{
+				m_ActiveInputExcludeGroups = new array<string>;
+			}
+			
+			for (int i = 0; i < excludes.Count(); i++)
+			{
+				if (m_ActiveInputExcludeGroups.Find(excludes[i]) == -1)
+				{
+					m_ActiveInputExcludeGroups.Insert(excludes[i]);
+					changed = true;
+				}
+			}
+			
+			if (changed)
+			{
+				RefreshExcludes();
+				#ifdef BULDOZER
+					GetUApi().SupressNextFrame(true);
+				#endif
+			}
+		}
+	}
+	
+	//! Adds one input restriction (specific behaviour oudside regular excludes, defined below)
+	override void AddActiveInputRestriction(int restrictor)
+	{
+		//unique behaviour outside regular excludes
+		if (restrictor > -1)
+		{
+			switch (restrictor)
+			{
+				case EInputRestrictors.INVENTORY:
+				{
+					GetUApi().GetInputByID(UAWalkRunForced).ForceEnable(true); // force walk on!
+					PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+					if ( player )
+					{
+						ItemBase item = player.GetItemInHands();
+						if (item && item.IsWeapon())
+							player.RequestResetADSSync();
+					}
+					break;
+				}
+				case EInputRestrictors.MAP:
+				{
+					GetUApi().GetInputByID(UAWalkRunForced).ForceEnable(true); // force walk on!
+					break;
+				}
+			}
+			
+			if (!m_ActiveInputRestrictions)
+			{
+				m_ActiveInputRestrictions = new array<int>;
+			}
+			if (m_ActiveInputRestrictions.Find(restrictor) == -1)
+			{
+				m_ActiveInputRestrictions.Insert(restrictor);
+			}
+		}
+	}
+	
+	//! queues refresh of input excludes
+	override void RefreshExcludes()
+	{
+		m_ProcessInputExcludes = true;
+	}
+	
+	//! applies queued excludes (0 == clear excludes)
+	protected void PerformRefreshExcludes()
+	{
+		if (m_ActiveInputExcludeGroups)
+		{
+			for (int i = 0; i < m_ActiveInputExcludeGroups.Count(); i++)
+			{
+				GetUApi().ActivateExclude(m_ActiveInputExcludeGroups[i]);
+			}
+		}
+		
+		GetUApi().UpdateControls();
+	}
+	
+	//! Removes all active input excludes and restrictions
+	override void EnableAllInputs(bool bForceSupress = false)
+	{
+		m_ControlDisabledMode = -1;
+		
+		if (m_ActiveInputRestrictions)
+		{
+			int count = m_ActiveInputRestrictions.Count();
+			for (int i = 0; i < count; i++)
+			{
+				RemoveActiveInputRestriction(m_ActiveInputRestrictions[0]);
+			}
+			m_ActiveInputRestrictions.Clear(); //redundant?
+		}
+		if (m_ActiveInputExcludeGroups)
+		{
+			m_ActiveInputExcludeGroups.Clear();
+		}
+		
+		GetUApi().UpdateControls(); //it is meant to happen instantly, does not wait for update to process
+		GetUApi().SupressNextFrame(bForceSupress); // supress control for next frame
+	}
+	
+	//! returns if ANY exclude groups, restriction (or deprecated disable, if applicable) is active
+	override bool IsControlDisabled()
+	{
+		bool active = false;
+		if (m_ActiveInputExcludeGroups)
+		{
+			active |= m_ActiveInputExcludeGroups.Count() > 0;
+		}
+		if (m_ActiveInputRestrictions)
+		{
+			active |= m_ActiveInputRestrictions.Count() > 0;
+		}
+		active |= m_ControlDisabledMode >= INPUT_EXCLUDE_ALL; //legacy stuff, Justin case
+		return active;
+	}
+	
+	//! Returns true if the particular input exclude group had been activated via script and is active
+	override bool IsInputExcludeActive(string exclude)
+	{
+		return m_ActiveInputExcludeGroups && m_ActiveInputExcludeGroups.Find(exclude) != -1;
+	}
+	
+	//! Returns true if the particular 'restriction' (those govern special behaviour outside regular input excludes, *EInputRestrictors*) is active
+	override bool IsInputRestrictionActive(int restriction)
+	{
+		return m_ActiveInputRestrictions && m_ActiveInputRestrictions.Find(restriction) != -1;
+	}
+	
+	//! (mostly)DEPRECATED; only set on the old 'PlayerControlDisable' method
+	override int GetControlDisabledMode()
+	{
+		return m_ControlDisabledMode;
+	}
+	
+	void CloseAllMenus()
+	{
+		GetUIManager().CloseAll();
+	}
+	
+	
+	void DestroyAllMenus()
+	{
+		if( GetUIManager() )
+		{
+			GetUIManager().HideDialog();
+			GetUIManager().CloseAll();
+		}
+		
+		DestroyInventory();
+		
+		if( m_Chat )
+			m_Chat.Clear();
+	}
+	
+	void MoveHudForInventory( bool inv_open )
+	{
+		#ifdef PLATFORM_CONSOLE
+		IngameHud hud = IngameHud.Cast( GetHud() );
+		if( hud )
+		{
+			if( inv_open )
+			{
+				hud.GetHudPanelWidget().SetPos( 0, -0.055 );
+			}
+			else
+			{
+				hud.GetHudPanelWidget().SetPos( 0, 0 );
+			}
+		}
+		#endif
+	}
+	
+	override void ShowInventory()
+	{
+		UIScriptedMenu menu = GetUIManager().GetMenu();
+		
+		if ( !menu && GetGame().GetPlayer().GetHumanInventory().CanOpenInventory() && !GetGame().GetPlayer().IsInventorySoftLocked() )
+		{
+			if( !m_InventoryMenu )
+			{
+				InitInventory();
+			}
+			
+			if( !GetUIManager().FindMenu( MENU_INVENTORY ) )
+			{
+				GetUIManager().ShowScriptedMenu(m_InventoryMenu, null);
+				PlayerBase.Cast(GetGame().GetPlayer()).OnInventoryMenuOpen();
+			}
+			AddActiveInputExcludes({"inventory"});
+			AddActiveInputRestriction(EInputRestrictors.INVENTORY);
+		}
+	}
+	
+	override void HideInventory()
+	{
+		if ( m_InventoryMenu )
+		{
+			GetUIManager().HideScriptedMenu(m_InventoryMenu);
+			RemoveActiveInputExcludes({"inventory"},false);
+			RemoveActiveInputRestriction(EInputRestrictors.INVENTORY);
+			PlayerBase.Cast(GetGame().GetPlayer()).OnInventoryMenuClose();
+			VicinityItemManager.GetInstance().ResetRefreshCounter();
+		}
+	}
+	
+	void DestroyInventory()
+	{
+		if ( m_InventoryMenu )
+		{
+			if (!m_InventoryMenu.GetParentMenu() && GetUIManager().GetMenu() != m_InventoryMenu)
+			{
+				m_InventoryMenu.SetParentMenu(GetUIManager().GetMenu()); //hack; guarantees the 'm_pCurrentMenu' will be set to whatever is on top currently
+			}
+			m_InventoryMenu.Close();
+			m_InventoryMenu = NULL;
+		}
+	}
+	
+	override void ResetGUI()
+	{
+		DestroyInventory();
+		InitInventory();
+	}
+	
+	override void ShowChat()
+	{
+		m_ChatChannelHideTimer.Stop();
+		m_ChatChannelFadeTimer.Stop();
+		m_ChatChannelArea.Show(false);
+		m_UIManager.EnterScriptedMenu(MENU_CHAT_INPUT, NULL);
+		
+		int level = GetGame().GetVoiceLevel();
+		UpdateVoiceLevelWidgets(level);
+		
+		AddActiveInputExcludes({"menu"});
+	}
+
+	override void HideChat()
+	{
+		RemoveActiveInputExcludes({"menu"},true);
+	}
+	
+	void ShowVehicleInfo()
+	{
+		if ( GetHud() )
+			GetHud().ShowVehicleInfo();
+	}
+	
+	void HideVehicleInfo()
+	{
+		if ( GetHud() )
+			GetHud().HideVehicleInfo();
+	}
+	
+	override Hud GetHud()
+	{
+		return m_Hud;
+	}
+	
+	HudDebug GetHudDebug()
+	{
+		return m_HudDebug;
+	}
+	
+	override void RefreshCrosshairVisibility()
+	{
+		if (GetHudDebug())
+			GetHudDebug().RefreshCrosshairVisibility();
+	}
+	
+	override void HideCrosshairVisibility()
+	{
+		if (GetHudDebug())
+			GetHudDebug().HideCrosshairVisibility();
+	}
+	
+	override bool IsPaused()
+	{
+		return GetGame().GetUIManager().IsMenuOpen(MENU_INGAME);
+	}
+	
+	override void Pause()
+	{
+		if (IsPaused() || (GetGame().GetUIManager().GetMenu() && GetGame().GetUIManager().GetMenu().GetID() == MENU_INGAME))
+		{
+			return;
+		}
+
+		m_PauseQueued = true;
+
+		if ( g_Game.IsClient() && g_Game.GetGameState() != DayZGameState.IN_GAME )
+		{
+			return;
+		}
+		
+		PlayerBase player = PlayerBase.Cast(GetGame().GetPlayer());
+		if ( player && !player.IsPlayerLoaded() || IsPlayerRespawning() )
+		{
+			return;
+		}
+		
+		CloseAllMenus();
+		
+		// open ingame menu
+		UIScriptedMenu menu = GetUIManager().EnterScriptedMenu( MENU_INGAME, GetGame().GetUIManager().GetMenu() );
+		if (!menu || !menu.IsVisible())
+		{
+			return;
+		}
+
+		AddActiveInputExcludes({"menu"});
+		AddActiveInputRestriction(EInputRestrictors.INVENTORY);
+
+		m_PauseQueued = false;
+	}
+	
+	override void Continue()
+	{
+		UIScriptedMenu menu = GetGame().GetUIManager().GetMenu();
+		if (!menu)
+			return;
+		
+		int menu_id = menu.GetID();
+		if ( !IsPaused() || ( menu_id != MENU_INGAME && menu_id != MENU_LOGOUT && menu_id != MENU_RESPAWN_DIALOGUE ) || ( m_Logout && m_Logout.layoutRoot.IsVisible() ) )
+		{
+			return;
+		}
+
+		RemoveActiveInputExcludes({"menu"},true);
+		RemoveActiveInputRestriction(EInputRestrictors.INVENTORY);
+		GetUIManager().CloseMenu(MENU_INGAME);
+	}
+	
+	override bool IsMissionGameplay()
+	{
+		return true;
+	}
+	
+	override void AbortMission()
+	{
+		#ifdef BULDOZER
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(g_Game.RequestExit, IDC_MAIN_QUIT);
+		#else
+		GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(GetGame().AbortMission);
+		#endif
+	}
+	
+	override void CreateLogoutMenu(UIMenuPanel parent)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		
+		// do not show logout screen if player's dead
+		if (!player || player.IsDamageDestroyed())
+		{
+			// exit the game immediately
+			AbortMission();
+			return;
+		}
+		
+		if (parent)
+		{
+			m_Logout = LogoutMenu.Cast(parent.EnterScriptedMenu(MENU_LOGOUT));
+			
+			if (m_Logout)
+			{
+				m_Logout.SetLogoutTime();
+			}
+		}		
+	}
+	
+	override void StartLogoutMenu(int time)
+	{
+		if (m_Logout)
+		{
+			if (time > 0)
+			{
+				// character will be deleted from server int "time" seconds
+				m_Logout.SetTime(time);
+				m_Logout.Show();
+				
+				GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(m_Logout.UpdateTime, 1000, true);
+			}
+			else
+			{
+				// no waiting time -> player is most likely dead
+				m_Logout.Exit();
+			}
+		}
+	}
+	
+	override void CreateDebugMonitor()
+	{
+		if (!m_DebugMonitor)
+		{
+			m_DebugMonitor = new DebugMonitor();
+			m_DebugMonitor.Init();
+		}
+		else
+			m_DebugMonitor.Show();
+
+	}
+	override void HideDebugMonitor()
+	{
+		if (m_DebugMonitor)
+		{
+			m_DebugMonitor.Hide();
+		}
+	}
+	
+	protected void HandleMapToggleByKeyboardShortcut(Man player)
+	{
+		UIManager um = GetGame().GetUIManager();
+		if (um && !um.IsMenuOpen(MENU_MAP))
+		{
+			um.CloseAll();
+			if (!CfgGameplayHandler.GetUse3DMap())
+			{
+				um.EnterScriptedMenu(MENU_MAP, null);
+				GetGame().GetMission().AddActiveInputExcludes({"map"});
+				GetGame().GetMission().AddActiveInputRestriction(EInputRestrictors.MAP);
+			}
+		}
+	}
+	
+	protected bool IsMapUnfoldActionRunning(ActionBase pAction)
+	{
+		return !pAction || pAction.Type() != ActionUnfoldMap;
+	}
+	
+	/*void ChangeBleedingIndicatorVisibility(bool visible)
+	{
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if (player)
+		{
+			BleedingSourcesManagerRemote manager = player.GetBleedingManagerRemote();
+			if (manager && manager.GetBleedingSourcesCount() > 0)
+			{
+				manager.ChangeBleedingIndicatorVisibility(visible);
+			}
+		}
+	}*/
+	
+	void UpdateDebugMonitor()
+	{
+		if (!m_DebugMonitor) return;
+		
+		PlayerBase player = PlayerBase.Cast( GetGame().GetPlayer() );
+		if (player)
+		{
+			DebugMonitorValues values = player.GetDebugMonitorValues();
+			if (values)
+			{
+				m_DebugMonitor.SetHealth(values.GetHealth());
+				m_DebugMonitor.SetBlood(values.GetBlood());
+				m_DebugMonitor.SetLastDamage(values.GetLastDamage());
+				m_DebugMonitor.SetPosition(MiscGameplayFunctions.TruncateVec(player.GetPosition(),1));
+			}
+		}
+	}
+	
+	void SetActionDownTime( int time_down )
+	{
+		m_ActionDownTime = time_down;
+	}
+	
+	void SetActionUpTime( int time_up )
+	{
+		m_ActionUpTime = time_up;
+	}
+	
+	int LocalPressTime()
+	{
+		return m_ActionDownTime;
+	}
+	
+	int LocalReleaseTime()
+	{
+		return m_ActionUpTime;
+	}
+	
+	float GetHoldActionTime()
+	{
+		float hold_action_time = LocalReleaseTime() - LocalPressTime();
+		return hold_action_time;
+	}
+	
+	void DisplayHairDebug()
+	{
+#ifndef SERVER
+		ShowHairDebugValues(DiagMenu.GetBool(DiagMenuIDs.MISC_HAIR_DISPLAY_DEBUG));
+#endif
+	}
+	
+	void ShowHairDebugValues(bool state)
+	{
+#ifdef DIAG_DEVELOPER
+		if ( state )
+		{
+			PluginDiagMenuClient diagmenu = PluginDiagMenuClient.Cast(GetPlugin(PluginDiagMenuClient));
+			
+			int i 					= DiagMenu.GetValue(DiagMenuIDs.MISC_HAIR_LEVEL);
+			bool bState 			= diagmenu.m_HairHidingStateMap.Get(i);
+			string selectionState;
+			if (!bState)
+				selectionState 		= "Hidden";
+			else
+				selectionState 		= "Shown";
+			string selectionName 	= diagmenu.m_HairSelectionArray.Get(i);
+			
+			DbgUI.BeginCleanupScope();
+	        DbgUI.Begin("Hair Debug", 50, 150);
+	        DbgUI.Text("Current Hair Selection:" + selectionName);
+			DbgUI.Text("State: " + selectionState);
+			
+	        DbgUI.End();
+	        DbgUI.EndCleanupScope();
+		}
+		else
+		{
+			DbgUI.BeginCleanupScope();
+			DbgUI.Begin("Hair Debug", 50, 50);
+			DbgUI.End();
+	        DbgUI.EndCleanupScope();
+		}
+#endif
+	}
+	
+	override void UpdateVoiceLevelWidgets(int level)
+	{
+		for ( int n = 0; n < m_VoiceLevelsWidgets.Count(); n++ )
+		{
+			int voiceKey = m_VoiceLevelsWidgets.GetKey(n);
+			ImageWidget voiceWidget = m_VoiceLevelsWidgets.Get(n);
+			
+			// stop fade timer since it will be refreshed
+			WidgetFadeTimer timer = m_VoiceLevelTimers.Get(n);		
+			timer.Stop();
+		
+			// show widgets according to the level
+			if ( voiceKey <= level )
+			{
+				voiceWidget.SetAlpha(1.0); // reset from possible previous fade out 
+				voiceWidget.Show(true);
+				
+				if ( !m_VoNActive && !GetUIManager().FindMenu(MENU_CHAT_INPUT) ) 	
+					timer.FadeOut(voiceWidget, 3.0);	
+			}
+			else
+				voiceWidget.Show(false);
+		}
+		
+		// fade out microphone icon when switching levels without von on
+		if ( !m_VoNActive )
+		{
+		  	if ( !GetUIManager().FindMenu(MENU_CHAT_INPUT) )
+			{
+				m_MicrophoneIcon.SetAlpha(1.0); 
+				m_MicrophoneIcon.Show(true);
+				
+				m_MicFadeTimer.FadeOut(m_MicrophoneIcon, 3.0);
+			}
+		}
+		else
+		{
+			// stop mic icon fade timer when von is activated
+			m_MicFadeTimer.Stop();
+		}
+	}
+	
+	override ImageWidget GetMicrophoneIcon() 
+	{
+		return m_MicrophoneIcon;
+	}
+	
+	override WidgetFadeTimer GetMicWidgetFadeTimer()
+	{
+		return m_MicFadeTimer;
+	}
+	
+	override map<int,ImageWidget> GetVoiceLevelWidgets()
+	{
+		return m_VoiceLevelsWidgets;
+	}
+	
+	override map<int,ref WidgetFadeTimer> GetVoiceLevelTimers()
+	{
+		return m_VoiceLevelTimers;
+	}
+	
+	override bool IsVoNActive()
+	{
+		return m_VoNActive;
+	}
+	
+	override void SetVoNActive(bool active)
+	{
+		m_VoNActive = active;
+	}
+	
+	override void HideVoiceLevelWidgets()
+	{
+		for ( int n = 0; n < m_VoiceLevelsWidgets.Count(); n++ )
+		{
+			ImageWidget voiceWidget = m_VoiceLevelsWidgets.Get( n );
+			voiceWidget.Show(false);
+		}
+	}
+	
+	override UIScriptedMenu GetNoteMenu()
+	{
+		return m_Note;
+	};
+	
+	override void SetNoteMenu(UIScriptedMenu menu)
+	{
+		m_Note = NoteMenu.Cast(menu);
+	};
+	
+	override void OnPlayerRespawned(Man player)
+	{
+		#ifdef DIAG_DEVELOPER
+			if (m_HudDebug)
+				m_HudDebug.RefreshByLocalProfile();
+		#endif
+		
+		PlayerBase playerBase = PlayerBase.Cast(player);
+		if (playerBase)
+		{
+			GetGame().GetCallQueue(CALL_CATEGORY_GUI).Call(playerBase.ShowDeadScreen, false, 0);
+		}
+		
+		GetGame().GetSoundScene().SetSoundVolume(g_Game.m_volume_sound,1);
+		GetGame().GetSoundScene().SetSpeechExVolume(g_Game.m_volume_speechEX,1);
+		GetGame().GetSoundScene().SetMusicVolume(g_Game.m_volume_music,1);
+		GetGame().GetSoundScene().SetVOIPVolume(g_Game.m_volume_VOIP,1);
+		GetGame().GetSoundScene().SetRadioVolume(g_Game.m_volume_radio,1);
+	}
+	
+	override void SetPlayerRespawning(bool state)
+	{
+		m_PlayerRespawning = state;
+	}
+	
+	override bool IsPlayerRespawning()
+	{
+		return m_PlayerRespawning;
+	}
+	
+	override array<vector> GetActiveRefresherLocations()
+	{
+		return m_ActiveRefresherLocations;
+	}
+	
+	override void SetRespawnModeClient(int mode)
+	{
+		m_RespawnModeClient = mode;
+	}
+	
+	override int GetRespawnModeClient()
+	{
+		return m_RespawnModeClient;
+	}
+	
+	override GameplayEffectWidgets GetEffectWidgets()
+	{
+		return m_EffectWidgets;
+	}
+	
+	ScriptInvoker GetConnectivityInvoker()
+	{
+		if (!m_OnConnectivityChanged)
+		{
+			m_OnConnectivityChanged = new ScriptInvoker();
+		}
+		return m_OnConnectivityChanged;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/missionMainMenu.c b/scripts/5_Mission/DayZ/mission/missionMainMenu.c
new file mode 100644
index 0000000000000000000000000000000000000000..1b917394fa3ecd633a0d512ace5bbfc5bab73b2e
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/missionMainMenu.c
@@ -0,0 +1,219 @@
+class MissionMainMenu extends MissionBase
+{
+	private UIScriptedMenu m_mainmenu;
+	private CreditsMenu m_CreditsMenu;
+	private ref DayZIntroScenePC m_IntroScenePC;
+	private ref DayZIntroSceneXbox m_IntroSceneXbox;
+	private AbstractWave m_MenuMusic;
+	bool m_NoCutscene;
+
+	override void OnInit()
+	{
+		if (!m_NoCutscene)
+		{
+			CreateIntroScene();
+		}
+		
+		if (!m_mainmenu)
+		{
+			#ifdef PLATFORM_CONSOLE
+			if ( g_Game.GetGameState() != DayZGameState.PARTY )
+			{
+				m_mainmenu = UIScriptedMenu.Cast( g_Game.GetUIManager().EnterScriptedMenu( MENU_TITLE_SCREEN, null ) );
+			}
+			#else
+				m_mainmenu = UIScriptedMenu.Cast( g_Game.GetUIManager().EnterScriptedMenu( MENU_MAIN, null ) );
+			#endif
+		}
+		
+		GetOnInputDeviceChanged().Insert(OnInputDeviceChanged);
+	}
+	
+	override void Reset()
+	{
+		#ifdef PLATFORM_CONSOLE
+			delete m_IntroSceneXbox;
+		#else
+			delete m_IntroScenePC;
+		#endif
+		
+		CreateIntroScene();
+	}
+	
+	DayZIntroScenePC GetIntroScenePC()
+	{
+		#ifdef PLATFORM_CONSOLE
+			Error("missionMainMenu->GetIntroScenePC on PLATFORM_CONSOLE is not implemented!");
+			return null;
+		#else
+			return m_IntroScenePC;
+		#endif
+	}
+	
+	DayZIntroSceneXbox GetIntroSceneXbox()
+	{
+		#ifdef PLATFORM_CONSOLE
+			return m_IntroSceneXbox;
+		#else
+			Error("missionMainMenu->GetIntroScenePC on PLATFORM_PC is not implemented!");
+			return null;
+		#endif
+	}
+
+	void CreateIntroScene()
+	{		
+#ifdef PLATFORM_CONSOLE
+		m_IntroSceneXbox = new DayZIntroSceneXbox;
+#else
+		m_IntroScenePC = new DayZIntroScenePC;
+#endif
+	}
+	
+	override void UpdateInputDevicesAvailability()
+	{
+		super.UpdateInputDevicesAvailability();
+		
+		g_Game.GetInput().UpdateConnectedInputDeviceList();
+		g_Game.UpdateInputDeviceDisconnectWarning();
+	}
+
+	override void OnMissionStart()
+	{
+		if (m_mainmenu)
+		{
+			//m_mainmenu.FadeIn(2.0);	//Fade in method is currently commented in MainMenu class
+		}
+		g_Game.GetUIManager().ShowUICursor(true);
+		g_Game.SetMissionState( DayZGame.MISSION_STATE_MAINMENU );
+		
+		//Print("*** MissionMainMenu.OnMissionStart()");
+		g_Game.LoadingHide(true);
+		ProgressAsync.DestroyAllPendingProgresses();
+		PlayMusic();
+	}
+	
+	override void OnMissionFinish()
+	{
+		if ( m_mainmenu )
+			m_mainmenu.Cleanup();
+		GetGame().GetUIManager().CloseAll();
+		m_mainmenu = NULL;
+		
+		m_IntroScenePC = null;
+		m_IntroSceneXbox = null;
+		m_CreditsMenu = null;
+#ifndef FEATURE_CURSOR
+		g_Game.GetUIManager().ShowUICursor(false);
+#endif
+	}
+
+	override void OnUpdate(float timeslice)
+	{
+		super.OnUpdate(timeslice);
+		
+#ifdef DIAG_DEVELOPER
+		UpdateInputDeviceDiag();
+#endif
+		
+		if ( g_Game.IsLoading() )
+		{
+			return;
+		}
+		
+		if (m_IntroScenePC)
+		{
+			m_IntroScenePC.Update();
+		}
+	}
+	
+	void OnMenuEnter(int menu_id)
+	{
+		switch (menu_id)
+		{
+			case MENU_CREDITS:
+			{
+				m_CreditsMenu = CreditsMenu.Cast(GetGame().GetUIManager().GetMenu());
+			}
+		}
+	}
+	
+	void OnInputDeviceChanged(int device)
+	{
+		if (m_CreditsMenu)
+		{
+			m_CreditsMenu.UpdateInfoPanelText(device);
+		}
+	}
+	
+	void PlayMusic()
+	{
+		if ( !m_MenuMusic )
+		{
+			SoundParams soundParams			= new SoundParams( "Music_Menu_SoundSet" );
+			SoundObjectBuilder soundBuilder	= new SoundObjectBuilder( soundParams );
+			SoundObject soundObject			= soundBuilder.BuildSoundObject();
+			soundObject.SetKind( WaveKind.WAVEMUSIC );
+			m_MenuMusic = GetGame().GetSoundScene().Play2D(soundObject, soundBuilder);
+			m_MenuMusic.Loop( true );
+			m_MenuMusic.Play();
+		}
+	}
+	
+	void StopMusic()
+	{
+		if ( m_MenuMusic )
+			m_MenuMusic.Stop();
+	}
+	
+	AbstractWave GetMenuMusic()
+	{
+		return m_MenuMusic;
+	}
+	
+	int SortedInsert( array<int> list, int number )
+	{
+		int find_number = number;
+		int index_min = 0;
+		int index_max = list.Count() - 1;
+		int target_index = Math.Floor( index_max / 2 );
+		
+		if ( index_max == -1 )
+		{
+			list.Insert( number );
+			return 0;
+		}
+		
+		while ( true )
+		{
+			int target_value = list[target_index];
+			
+			if ( find_number == target_value || ((index_max - index_min) <= 1) )
+			{
+				for ( int i = index_min; i <= index_max; i++ )
+				{
+					if ( find_number <= list[i] )
+					{
+						list.InsertAt( find_number, i );
+						return i;
+					}
+				}
+				
+				index_max++;
+				list.InsertAt( find_number, index_max );
+				return target_index;
+			}
+			else if ( find_number < target_value )
+			{
+				index_max = target_index;
+				target_index = Math.Floor( target_index / 2 );
+			}
+			else if ( find_number > target_value )
+			{
+				index_min = target_index;
+				target_index += Math.Floor( (index_max - index_min) / 2 );
+			}			
+		}
+		
+		return target_index;
+	}
+}
diff --git a/scripts/5_Mission/DayZ/mission/missionServer.c b/scripts/5_Mission/DayZ/mission/missionServer.c
new file mode 100644
index 0000000000000000000000000000000000000000..1717a5edd3f874faf421883013a356f0a7228416
--- /dev/null
+++ b/scripts/5_Mission/DayZ/mission/missionServer.c
@@ -0,0 +1,772 @@
+//! int  time of the logout end 
+//: string  uid of the player
+typedef Param2<int, string> LogoutInfo; 
+
+class MissionServer extends MissionBase
+{
+	ref array<Man> m_Players;
+	ref array<ref CorpseData> m_DeadPlayersArray;
+	ref map<PlayerBase, ref LogoutInfo> m_LogoutPlayers;
+	ref map<PlayerBase, ref LogoutInfo> m_NewLogoutPlayers;
+	ref RainProcurementHandler m_RainProcHandler;
+	const int SCHEDULER_PLAYERS_PER_TICK = 5;
+	int m_currentPlayer;
+	int m_RespawnMode;
+	
+	// -----------------------
+	// ARTILLERY SOUNDS SETUP
+	// -----------------------
+	private float 				m_ArtyBarrageTimer = 0;			// This is not to be edited in Init.c this is just to increment time
+	
+	// Variables to be modified in Init.c
+	protected bool 				m_PlayArty = false; 			// Toggle if Off map artillery sounds are played
+	protected float 			m_ArtyDelay = 0; 				// Set how much time there is between two barrages (in seconds)
+	protected int 				m_MinSimultaneousStrikes = 0;	// The MIN of simultaneous shots on the map (Will be clamped between 1 and max shots)
+	protected int 				m_MaxSimultaneousStrikes = 0;	// The MAX of simultaneous shots on the map (Will be clamped between 1 and max amount of coords)
+	protected ref array<vector> m_FiringPos; 					// Where we should fire from. On Init set the relevant data
+	
+	//All Chernarus firing coordinates 
+	protected const ref array<vector> CHERNARUS_STRIKE_POS = 
+	{
+		"-500.00 165.00 5231.69",
+		"-500.00 300.00 9934.41",
+		"10406.86 192.00 15860.00",
+		"4811.75 370.00 15860.00",
+		"-500.00 453.00 15860.00"
+	};
+	
+	//All livonia firing coordinates
+	protected const ref  array<vector> LIVONIA_STRIKE_POS = 
+	{ 
+		"7440.00 417.00 -500.00",
+		"-500.00 276.00 5473.00",
+		"-500.00 265.00 9852.00",
+		"4953.00 240.00 13300.00",
+		"9620.00 188.00 13300.00",
+		"13300.00 204.00 10322.00",
+		"13300.00 288.00 6204.00",
+		"13300.00 296.00 -500.00"
+	};
+	// -----------------------
+	// END OF ARTILLERY SETUP
+	// -----------------------
+	
+	PlayerBase m_player;
+	MissionBase m_mission;
+	PluginAdditionalInfo m_moduleDefaultCharacter;
+	
+	void MissionServer()
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(this.UpdatePlayersStats, 30000, true);
+
+		m_DeadPlayersArray = new array<ref CorpseData>;
+		UpdatePlayersStats();
+		m_Players = new array<Man>;
+				
+		m_LogoutPlayers = new map<PlayerBase, ref LogoutInfo>;
+		m_NewLogoutPlayers = new map<PlayerBase, ref LogoutInfo>;
+		m_RainProcHandler = new RainProcurementHandler(this);
+	}
+	
+	void ~MissionServer()
+	{
+		GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).Remove(this.UpdatePlayersStats);
+	}
+	
+	override void OnInit()
+	{
+		super.OnInit();
+		CfgGameplayHandler.LoadData();
+		PlayerSpawnHandler.LoadData();
+		UndergroundAreaLoader.SpawnAllTriggerCarriers();
+		//Either pass consts in Init.c or insert all desired coords (or do both ;))
+		m_FiringPos = new array<vector>();
+	}
+	
+	override void OnMissionStart()
+	{
+		super.OnMissionStart();
+		
+		// We will load the Effect areas on Default mission start
+		EffectAreaLoader.CreateZones();
+	}
+	
+	override void OnUpdate(float timeslice)
+	{
+		UpdateDummyScheduler();
+		TickScheduler(timeslice);
+		UpdateLogoutPlayers();		
+		m_WorldData.UpdateBaseEnvTemperature(timeslice);	// re-calculate base enviro temperature
+		m_RainProcHandler.Update(timeslice);
+		
+		RandomArtillery(timeslice);
+		
+		super.OnUpdate(timeslice);
+	}
+	
+	override void OnGameplayDataHandlerLoad()
+	{
+		m_RespawnMode = CfgGameplayHandler.GetDisableRespawnDialog();
+		GetGame().SetDebugMonitorEnabled(GetGame().ServerConfigGetInt("enableDebugMonitor"));
+		
+		InitialiseWorldData();
+	}
+		
+	
+	void RandomArtillery(float deltaTime)
+	{
+		// ARTY barrage 
+		if (m_PlayArty)
+		{
+			// We only perform timer checks and increments if we enabled the artillery barrage
+			if (m_ArtyBarrageTimer > m_ArtyDelay)
+			{
+				//We clamp to guarantee 1 and never have multiple shots on same pos, even in case of entry error
+				m_MaxSimultaneousStrikes = Math.Clamp(m_MaxSimultaneousStrikes, 1, m_FiringPos.Count());
+				m_MinSimultaneousStrikes = Math.Clamp(m_MinSimultaneousStrikes, 1, m_MaxSimultaneousStrikes);
+				
+				// Variables to be used in this scope
+				int randPos; // Select random position
+				Param1<vector> pos; // The value to be sent through RPC
+				array<ref Param> params; // The RPC params
+				
+				if (m_MaxSimultaneousStrikes == 1)
+				{
+					// We only have one set of coordinates to send
+					randPos = Math.RandomIntInclusive(0, m_FiringPos.Count() - 1);
+					pos = new Param1<vector>(m_FiringPos[randPos]);
+					params = new array<ref Param>;
+					params.Insert(pos);
+					GetGame().RPC(null, ERPCs.RPC_SOUND_ARTILLERY, params, true);
+				}
+				else
+				{
+					//We will do some extra steps to
+					/*
+					1. Send multiple coords (Send one RPC per coord set)
+					2. Ensure we don't have duplicates
+					*/
+					array<int> usedIndices = new array<int>; // Will store all previusly fired upon indices
+					
+					// We determine how many positions fire between MIN and MAX
+					int randFireNb = Math.RandomIntInclusive(m_MinSimultaneousStrikes, m_MaxSimultaneousStrikes);
+					for (int i = 0; i < randFireNb; i++)
+					{
+						randPos = Math.RandomIntInclusive(0, m_FiringPos.Count() - 1);
+						
+						if (usedIndices.Count() <= 0 || usedIndices.Find(randPos) < 0) //We do not find the index or array is empty
+						{
+							// We prepare to send the message
+							pos = new Param1<vector>(m_FiringPos[randPos]);
+							params = new array<ref Param>;
+							
+							// We send the message with this set of coords
+							params.Insert(pos);
+							GetGame().RPC(null, ERPCs.RPC_SOUND_ARTILLERY, params, true);
+							
+							// We store the last used value
+							usedIndices.Insert(randPos);
+						}
+					}
+				}
+				
+				// Reset timer for new loop
+				m_ArtyBarrageTimer = 0.0;
+			}
+			
+			m_ArtyBarrageTimer += deltaTime;
+		}
+	}
+
+	override bool IsServer()
+	{
+		return true;
+	}	
+	
+	override bool IsPlayerDisconnecting(Man player)
+	{
+		return (m_LogoutPlayers && m_LogoutPlayers.Contains(PlayerBase.Cast(player))) || (m_NewLogoutPlayers && m_NewLogoutPlayers.Contains(PlayerBase.Cast(player)));
+	}
+	
+	void UpdatePlayersStats()
+	{
+		PluginLifespan moduleLifespan;
+		Class.CastTo(moduleLifespan, GetPlugin(PluginLifespan));
+		array<Man> players = new array<Man>();
+		GetGame().GetPlayers(players);
+			
+		foreach (Man man : players)
+		{
+			PlayerBase player;
+			if (Class.CastTo(player, man))
+			{
+				player.StatUpdateByTime(AnalyticsManagerServer.STAT_PLAYTIME);
+				player.StatUpdateByPosition(AnalyticsManagerServer.STAT_DISTANCE);
+
+				moduleLifespan.UpdateLifespan(player);
+			}
+		}
+		
+		UpdateCorpseStatesServer();
+	}
+	
+	protected void AddNewPlayerLogout(PlayerBase player, notnull LogoutInfo info)
+	{
+		m_LogoutPlayers.Insert(player, info);
+		m_NewLogoutPlayers.Remove(player);
+	}
+	
+	// check if logout finished for some players
+	void UpdateLogoutPlayers()
+	{
+		for (int i = 0; i < m_LogoutPlayers.Count();)
+		{
+			LogoutInfo info = m_LogoutPlayers.GetElement(i);
+			
+			if (GetGame().GetTime() >= info.param1)
+			{
+				PlayerIdentity identity;
+				PlayerBase player = m_LogoutPlayers.GetKey(i);
+				if (player)
+				{
+					identity = player.GetIdentity();
+					m_LogoutPlayers.Remove(player);
+				}
+				else
+				{
+					m_LogoutPlayers.RemoveElement(i);
+				}
+				
+				// disable reconnecting to old char
+				// GetGame().RemoveFromReconnectCache(info.param2);
+	
+				PlayerDisconnected(player, identity, info.param2);						
+			}
+			else
+			{
+				++i;
+			}
+		}
+	}
+	
+	override void OnEvent(EventType eventTypeId, Param params) 
+	{
+		PlayerIdentity identity;
+		PlayerBase player;
+		int counter = 0;
+		
+		switch (eventTypeId)
+		{
+		case ClientPrepareEventTypeID:
+			ClientPrepareEventParams clientPrepareParams;
+			Class.CastTo(clientPrepareParams, params);
+			CfgGameplayHandler.SyncDataSendEx(clientPrepareParams.param1);
+			UndergroundAreaLoader.SyncDataSend(clientPrepareParams.param1);
+			OnClientPrepareEvent(clientPrepareParams.param1, clientPrepareParams.param2, clientPrepareParams.param3, clientPrepareParams.param4, clientPrepareParams.param5);
+			break;
+
+		case ClientNewEventTypeID:
+			ClientNewEventParams newParams;
+			Class.CastTo(newParams, params);
+			player = OnClientNewEvent(newParams.param1, newParams.param2, newParams.param3);
+			if (!player)
+			{
+				Debug.Log("ClientNewEvent: Player is empty");
+				return;
+			}
+			identity = newParams.param1;
+			InvokeOnConnect(player,identity);
+			SyncEvents.SendPlayerList();
+			
+			ControlPersonalLight(player);
+			SyncGlobalLighting(player);
+			
+			break;
+			
+		case ClientReadyEventTypeID:
+			ClientReadyEventParams readyParams;
+			Class.CastTo(readyParams, params);
+			identity = readyParams.param1;
+			Class.CastTo(player, readyParams.param2);
+			if (!player)
+			{
+				Debug.Log("ClientReadyEvent: Player is empty");
+				return;
+			}
+			
+			OnClientReadyEvent(identity, player);
+			InvokeOnConnect(player, identity);
+			// Send list of players at all clients
+			SyncEvents.SendPlayerList();
+			ControlPersonalLight(player);
+			SyncGlobalLighting(player);
+			break;
+					
+		case ClientRespawnEventTypeID:
+			ClientRespawnEventParams respawnParams;
+			Class.CastTo(respawnParams, params);
+			identity = respawnParams.param1;
+			Class.CastTo(player, respawnParams.param2);
+			if (!player)
+			{
+				Debug.Log("ClientRespawnEvent: Player is empty");
+				return;
+			}
+			
+			OnClientRespawnEvent(identity, player);
+			break;
+			
+		case ClientReconnectEventTypeID:
+			ClientReconnectEventParams reconnectParams;
+			Class.CastTo(reconnectParams, params);
+			
+			identity = reconnectParams.param1;
+			Class.CastTo(player, reconnectParams.param2);
+			if (!player)
+			{
+				Debug.Log("ClientReconnectEvent: Player is empty");
+				return;
+			}
+			
+			OnClientReconnectEvent(identity, player);
+			break;
+		
+		case ClientDisconnectedEventTypeID:
+			ClientDisconnectedEventParams discoParams;
+			Class.CastTo(discoParams, params);		
+			
+			identity = discoParams.param1;
+			Class.CastTo(player, discoParams.param2);			
+			int logoutTime = discoParams.param3;
+			bool authFailed = discoParams.param4;
+
+			if (!player)
+			{
+				Debug.Log("ClientDisconnectenEvent: Player is empty");
+				return;
+			}
+			
+			OnClientDisconnectedEvent(identity, player, logoutTime, authFailed);
+			break;
+			
+		case LogoutCancelEventTypeID:
+			LogoutCancelEventParams logoutCancelParams;
+			
+			Class.CastTo(logoutCancelParams, params);				
+			Class.CastTo(player, logoutCancelParams.param1);
+			identity = player.GetIdentity();
+			if (identity)
+			{
+				// disable reconnecting to old char
+				// GetGame().RemoveFromReconnectCache(identity.GetId());
+				Print("[Logout]: Player " + identity.GetId() + " cancelled"); 
+			}
+			else
+			{
+				Print("[Logout]: Player cancelled"); 
+			}
+			m_LogoutPlayers.Remove(player);
+			m_NewLogoutPlayers.Remove(player);
+			break;
+		}
+	}
+	
+	void InvokeOnConnect(PlayerBase player, PlayerIdentity identity)
+	{
+		Debug.Log("InvokeOnConnect:"+this.ToString(),"Connect");
+		if (player)
+			player.OnConnect();
+	}
+
+	void InvokeOnDisconnect(PlayerBase player)
+	{
+		Debug.Log("InvokeOnDisconnect:"+this.ToString(),"Connect");
+		if (player)
+			player.OnDisconnect();
+	}
+
+	void OnClientPrepareEvent(PlayerIdentity identity, out bool useDB, out vector pos, out float yaw, out int preloadTimeout)
+	{
+		if (GetHive())
+		{
+			// use character from database
+			useDB = true;
+		}
+		else
+		{
+			// use following data without database
+			useDB = false;
+			pos = "1189.3 0.0 5392.48";
+			yaw = 0;
+		}
+	}
+	
+	// Enables/Disables personal light on the given player.
+	void ControlPersonalLight(PlayerBase player)
+	{
+		if (player)
+		{
+			bool is_personal_light = ! GetGame().ServerConfigGetInt("disablePersonalLight");
+			Param1<bool> personal_light_toggle = new Param1<bool>(is_personal_light);
+			GetGame().RPCSingleParam(player, ERPCs.RPC_TOGGLE_PERSONAL_LIGHT, personal_light_toggle, true, player.GetIdentity());
+		}
+		else
+		{
+			Error("Error! Player was not initialized at the right time. Thus cannot send RPC command to enable or disable personal light!");
+		}
+	}
+	
+	// syncs global lighting setup from the server (lightingConfig server config parameter) 
+	void SyncGlobalLighting(PlayerBase player)
+	{
+		if (player)
+		{
+			int lightingID = GetGame().ServerConfigGetInt("lightingConfig");
+			Param1<int> lightID = new Param1<int>(lightingID);
+			GetGame().RPCSingleParam(player, ERPCs.RPC_SEND_LIGHTING_SETUP, lightID, true, player.GetIdentity());
+		}
+	}
+	
+	//! returns whether received data is valid, ctx can be filled on client in StoreLoginData()
+	bool ProcessLoginData(ParamsReadContext ctx)
+	{
+		//creates temporary server-side structure for handling default character spawn
+		return GetGame().GetMenuDefaultCharacterData(false).DeserializeCharacterData(ctx);
+	}
+	
+	//
+	PlayerBase CreateCharacter(PlayerIdentity identity, vector pos, ParamsReadContext ctx, string characterName)
+	{
+		Entity playerEnt;
+		playerEnt = GetGame().CreatePlayer(identity, characterName, pos, 0, "NONE");//Creates random player
+		Class.CastTo(m_player, playerEnt);
+		
+		GetGame().SelectPlayer(identity, m_player);
+	
+		return m_player;
+	}
+	
+	//! Spawns character equip from received data. Checks validity against config, randomizes if invalid value and config array not empty.
+	void EquipCharacter(MenuDefaultCharacterData char_data)
+	{
+		int slot_ID;
+		string attachment_type;
+		for (int i = 0; i < DefaultCharacterCreationMethods.GetAttachmentSlotsArray().Count(); i++)
+		{
+			slot_ID = DefaultCharacterCreationMethods.GetAttachmentSlotsArray().Get(i);
+			attachment_type = "";
+			if (m_RespawnMode != GameConstants.RESPAWN_MODE_CUSTOM || !char_data.GetAttachmentMap().Find(slot_ID,attachment_type) || !VerifyAttachmentType(slot_ID,attachment_type)) //todo insert verification fn here
+			{
+				//randomize
+				if (DefaultCharacterCreationMethods.GetConfigArrayCountFromSlotID(slot_ID) > 0)
+				{
+					attachment_type = DefaultCharacterCreationMethods.GetConfigAttachmentTypes(slot_ID).GetRandomElement();
+				}
+				else //undefined, moving on
+					continue;
+			}
+			
+			if (attachment_type != "")
+			{
+				m_player.GetInventory().CreateAttachmentEx(attachment_type,slot_ID);
+			}
+		}
+		
+		StartingEquipSetup(m_player, true);
+	}
+	
+	//! can be overriden to manually set up starting equip. 'clothesChosen' is legacy parameter, does nothing.
+	void StartingEquipSetup(PlayerBase player, bool clothesChosen)
+	{
+	}
+	
+	bool VerifyAttachmentType(int slot_ID, string attachment_type)
+	{
+		return DefaultCharacterCreationMethods.GetConfigAttachmentTypes(slot_ID).Find(attachment_type) > -1;
+	}
+	
+	PlayerBase OnClientNewEvent(PlayerIdentity identity, vector pos, ParamsReadContext ctx)
+	{
+		string characterType = GetGame().CreateRandomPlayer();
+		bool generateRandomEquip = false;
+		
+		// get login data for new character
+		if (ProcessLoginData(ctx) && (m_RespawnMode == GameConstants.RESPAWN_MODE_CUSTOM) && !GetGame().GetMenuDefaultCharacterData(false).IsRandomCharacterForced())
+		{
+			if (GetGame().ListAvailableCharacters().Find(GetGame().GetMenuDefaultCharacterData().GetCharacterType()) > -1)
+				characterType = GetGame().GetMenuDefaultCharacterData().GetCharacterType();
+		}
+		else
+		{
+			generateRandomEquip = true;
+		}
+		
+		if (PlayerSpawnHandler.IsInitialized())
+		{
+			PlayerSpawnPreset presetData = PlayerSpawnHandler.GetRandomCharacterPreset();
+			if (presetData && presetData.IsValid())
+			{
+				string presetCharType = presetData.GetRandomCharacterType();
+				if (presetCharType == string.Empty)
+					presetCharType = characterType;
+				if (CreateCharacter(identity, pos, ctx, presetCharType) != null)
+				{
+					PlayerSpawnHandler.ProcessEquipmentData(m_player,presetData);
+					return m_player;
+				}
+				else
+				{
+					ErrorEx("Failed to create character from type: " + presetCharType + ", using default spawning method");
+				}
+			}
+			else
+			{
+				ErrorEx("Failed to load PlayerSpawnPreset data properly, using default spawning method");
+			}
+		}
+		
+		if (CreateCharacter(identity, pos, ctx, characterType))
+		{
+			if (generateRandomEquip)
+				GetGame().GetMenuDefaultCharacterData().GenerateRandomEquip();
+			EquipCharacter(GetGame().GetMenuDefaultCharacterData());
+		}
+		
+		return m_player;
+	}
+	
+	void OnClientReadyEvent(PlayerIdentity identity, PlayerBase player)
+	{
+		GetGame().SelectPlayer(identity, player);
+		
+		#ifdef DIAG_DEVELOPER
+		if (FeatureTimeAccel.m_CurrentTimeAccel)
+		{
+			GetGame().RPCSingleParam(player, ERPCs.DIAG_TIMEACCEL_CLIENT_SYNC, FeatureTimeAccel.m_CurrentTimeAccel, true, identity);
+		}
+		#endif
+	}	
+	
+	void OnClientRespawnEvent(PlayerIdentity identity, PlayerBase player)
+	{
+		if (player)
+		{
+			if (player.IsUnconscious() || player.IsRestrained())
+			{
+				// kill character
+				player.SetHealth("", "", 0.0);
+			}
+		}
+		
+		#ifdef DIAG_DEVELOPER
+		if (FeatureTimeAccel.m_CurrentTimeAccel)
+		{
+			GetGame().RPCSingleParam(player, ERPCs.DIAG_TIMEACCEL_CLIENT_SYNC, FeatureTimeAccel.m_CurrentTimeAccel, true, identity);
+		}
+		#endif
+	}
+	
+	void OnClientReconnectEvent(PlayerIdentity identity, PlayerBase player)
+	{
+		if (player)
+		{
+			player.OnReconnect();
+		}
+	}	
+	
+	void OnClientDisconnectedEvent(PlayerIdentity identity, PlayerBase player, int logoutTime, bool authFailed)
+	{
+		bool disconnectNow = true;
+		
+		// TODO: get out of vehicle
+		// using database and no saving if authorization failed
+		if (GetHive() && !authFailed)
+		{			
+			if (player.IsAlive())
+			{	
+				if (!m_LogoutPlayers.Contains(player) && !m_NewLogoutPlayers.Contains(player))
+				{
+					Print("[Logout]: New player " + identity.GetId() + " with logout time " + logoutTime.ToString());
+					
+					// send statistics to client
+					player.StatSyncToClient();
+					
+					// inform client about logout time
+					GetGame().SendLogoutTime(player, logoutTime);
+			
+					// wait for some time before logout and save
+					LogoutInfo params = new LogoutInfo(GetGame().GetTime() + logoutTime * 1000, identity.GetId());
+					
+					m_NewLogoutPlayers.Insert(player, params);
+					GetGame().GetCallQueue(CALL_CATEGORY_GAMEPLAY).CallLater(AddNewPlayerLogout, 0, false, player, params);
+					
+					// allow reconnecting to old char only if not in cars, od ladders etc. as they cannot be properly synchronized for reconnect
+					//if (!player.GetCommand_Vehicle() && !player.GetCommand_Ladder())
+					//{
+					//	GetGame().AddToReconnectCache(identity);
+					//}
+					// wait until logout timer runs out
+					disconnectNow = false;
+				}
+				return;
+			}		
+		}
+		
+		if (disconnectNow)
+		{
+			Print("[Logout]: New player " + identity.GetId() + " with instant logout");
+			
+			// inform client about instant logout
+			GetGame().SendLogoutTime(player, 0);
+			
+			PlayerDisconnected(player, identity, identity.GetId());
+		}
+	}
+
+	void PlayerDisconnected(PlayerBase player, PlayerIdentity identity, string uid)
+	{
+		// Note: At this point, identity can be already deleted
+		if (!player)
+		{
+			Print("[Logout]: Skipping player " + uid + ", already removed");
+			return;
+		}
+		
+		// disable reconnecting to old char
+		//GetGame().RemoveFromReconnectCache(uid);
+
+		// now player can't cancel logout anymore, so call everything needed upon disconnect
+		InvokeOnDisconnect(player);
+
+		Print("[Logout]: Player " + uid + " finished");
+
+		if (GetHive())
+		{
+			// save player
+			player.Save();
+			
+			// unlock player in DB	
+			GetHive().CharacterExit(player);		
+		}
+		
+		// handle player's existing char in the world
+		player.ReleaseNetworkControls();		
+		HandleBody(player);
+		
+		// remove player from server
+		GetGame().DisconnectPlayer(identity, uid);
+		// Send list of players at all clients
+		GetGame().GetCallQueue(CALL_CATEGORY_SYSTEM).CallLater(SyncEvents.SendPlayerList, 1000);
+	}
+	
+	bool ShouldPlayerBeKilled(PlayerBase player)
+	{
+		if (player.IsUnconscious() || player.IsRestrained())
+		{
+			switch (player.GetKickOffReason())
+			{
+				case EClientKicked.SERVER_EXIT:
+					return false;
+				case EClientKicked.KICK_ALL_ADMIN:
+					return false;
+				case EClientKicked.KICK_ALL_SERVER:
+					return false;
+				case EClientKicked.SERVER_SHUTDOWN:
+					return false;
+				default:
+					return true;
+			}
+		}
+		
+		return false;
+	}
+	
+	void HandleBody(PlayerBase player)
+	{
+		if (player.IsAlive())
+		{
+			if (ShouldPlayerBeKilled(player))
+			{
+				player.SetHealth("", "", 0.0);//kill
+			}
+			else
+			{
+				player.Delete();// remove the body
+			}
+		}
+	}
+	
+	void TickScheduler(float timeslice)
+	{
+		GetGame().GetWorld().GetPlayerList(m_Players);
+		int players_count = m_Players.Count();
+		int tick_count_max = Math.Min(players_count, SCHEDULER_PLAYERS_PER_TICK);
+		
+		for (int i = 0; i < tick_count_max; i++)
+		{
+			if (m_currentPlayer >= players_count)
+			{
+				m_currentPlayer = 0;
+			}
+			
+			PlayerBase currentPlayer = PlayerBase.Cast(m_Players.Get(m_currentPlayer));
+			
+			if (currentPlayer)
+				currentPlayer.OnTick();
+			m_currentPlayer++;
+		}
+	}
+	
+	//--------------------------------------------------
+	override bool InsertCorpse(Man player)
+	{
+		CorpseData corpse_data = new CorpseData(PlayerBase.Cast(player),GetGame().GetTime());
+		return m_DeadPlayersArray.Insert(corpse_data) >= 0;
+	}
+	
+	void UpdateCorpseStatesServer()
+	{
+		if (m_DeadPlayersArray.Count() == 0)//nothing to process, abort
+			return;
+		int current_time = GetGame().GetTime();
+		array<int> invalid_corpses = new array<int>;
+		CorpseData corpse_data;
+		
+		for (int i = 0; i < m_DeadPlayersArray.Count(); i++)
+		{
+			corpse_data = m_DeadPlayersArray.Get(i);
+			if (!corpse_data || (corpse_data && (!corpse_data.m_Player || !corpse_data.m_bUpdate)))
+			{
+				invalid_corpses.Insert(i);
+			}
+			else if (corpse_data.m_bUpdate && current_time - corpse_data.m_iLastUpdateTime >= 30000)
+			{
+				corpse_data.UpdateCorpseState();
+				corpse_data.m_iLastUpdateTime = current_time;
+			}
+		}
+		
+		//cleanup
+		if (invalid_corpses.Count() > 0)
+		{
+			for (i = invalid_corpses.Count() - 1; i > -1; i--)
+			{
+				m_DeadPlayersArray.Remove(invalid_corpses.Get(i));
+			}
+		}
+	}
+	//--------------------------------------------------
+	
+	override void SyncRespawnModeInfo(PlayerIdentity identity)
+	{
+		ScriptRPC rpc = new ScriptRPC();
+		rpc.Write(m_RespawnMode);
+		rpc.Send(null, ERPCs.RPC_SERVER_RESPAWN_MODE, true, identity);
+	}
+	
+	override RainProcurementHandler GetRainProcurementHandler()
+	{
+		return m_RainProcHandler;
+	}
+}
+
diff --git a/scripts/5_Mission/DayZ/someMission.c b/scripts/5_Mission/DayZ/someMission.c
new file mode 100644
index 0000000000000000000000000000000000000000..fcc6828f51a0971abd046599fcb68d1ea9c66dbd
--- /dev/null
+++ b/scripts/5_Mission/DayZ/someMission.c
@@ -0,0 +1,41 @@
+Mission CreateMission(string path)
+{
+	Print("Creating Mission: "+ path);
+	
+	// g_Game.SetMissionPath(path); Done from C++ now
+
+	if (g_Game.IsMultiplayer() && g_Game.IsServer())
+	{
+		return new MissionServer;
+	}
+
+#ifdef NO_GUI
+	return new MissionDummy;
+#endif
+	MissionMainMenu m;
+	if (path.Contains("NoCutscene"))
+	{
+		m = new MissionMainMenu();
+		m.m_NoCutscene = true;
+		return m;
+	}
+	
+	if (path.Contains("intro"))
+	{
+		m = new MissionMainMenu();
+		m.m_NoCutscene = false;
+		return m;
+	}
+	else
+	{
+		if( path == "" )
+		{
+			return new MissionDummy;
+		}
+#ifndef NO_GUI_INGAME
+		return new MissionGameplay;
+#else
+		return new MissionDummy;
+#endif
+	}
+}
diff --git a/scripts/BuldozerTools/buldozerToolsFunctions.sqf b/scripts/BuldozerTools/buldozerToolsFunctions.sqf
new file mode 100644
index 0000000000000000000000000000000000000000..0a60f80a9d92a42d7806ec3269a0cf9953ed4921
--- /dev/null
+++ b/scripts/BuldozerTools/buldozerToolsFunctions.sqf
@@ -0,0 +1,73 @@
+// Buldozer Tools by Lappihuan
+
+LAP_fnc_buldozerHint = {
+
+	with uiNamespace do
+	{
+   		disableSerialization;
+		_buldozerHintTitle = _this select 0;
+		_buldozerHintText = _this select 1;
+
+		//(findDisplay -1) createDisplay "RscDisplayDebug";
+		_buldozerDisplay = (findDisplay -1);
+
+		buldozerHint = _buldozerDisplay createDisplay "RscDisplayHintCEx";
+
+		_ctrlBcgCommonTop =		buldozerHint displayctrl 103;
+		_ctrlBcgCommon =		buldozerHint displayctrl 101;
+		_ctrlButtonContinue =	buldozerHint displayctrl 104;
+		_ctrlText =				buldozerHint displayctrl 102;
+
+
+		//--- Calculate spacing
+		_ctrlButtonContinuePos = ctrlposition _ctrlButtonContinue;
+		_ctrlBcgCommonPos = ctrlposition _ctrlBcgCommon;
+		_bottomSpaceY = (_ctrlButtonContinuePos select 1) - ((_ctrlBcgCommonPos select 1) + (_ctrlBcgCommonPos select 3));
+
+		//--- Calculate text padding
+		_ctrlTextPos = ctrlposition _ctrlText;
+		_marginX = (_ctrlTextPos select 0) - (_ctrlBcgCommonPos select 0);
+		_marginY = (_ctrlTextPos select 1) - (_ctrlBcgCommonPos select 1);
+
+
+		if (typename _buldozerHintText == typename "") then {_buldozerHintText = parsetext _buldozerHintText;};
+
+		_ctrlBcgCommonTop ctrlsettext _buldozerHintTitle;
+
+
+		_ctrlText ctrlsetstructuredtext _buldozerHintText;
+		_ctrlTextPosH = ctrltextheight _ctrlText;
+
+		//--- Move text area
+		_ctrlBcgCommon ctrlsetposition [
+		(_ctrlBcgCommonPos select 0),
+		(_ctrlBcgCommonPos select 1),
+		(_ctrlBcgCommonPos select 2),
+		_ctrlTextPosH + (_marginY * 2)
+		];
+		_ctrlBcgCommon ctrlcommit 0;
+
+		_ctrlText ctrlsetposition [
+		(_ctrlBcgCommonPos select 0) + _marginX,
+		(_ctrlBcgCommonPos select 1) + _marginY,
+		(_ctrlBcgCommonPos select 2) - _marginX * 2,
+		_ctrlTextPosH
+		];
+
+		_ctrlText ctrlcommit 0;
+
+		//--- Move bottom bar
+		_bottomPosY = (_ctrlBcgCommonPos select 1) + _ctrlTextPosH + (_marginY * 2) + _bottomSpaceY;
+		{
+		_xPos = ctrlposition _x;
+		_xPos set [1,_bottomPosY];
+		_x ctrlsetposition _xPos;
+		_x ctrlcommit 0;
+		} foreach [
+		_ctrlButtonContinue
+		];
+
+		_ctrlButtonContinue ctrlcommit 0;
+		_ctrlButtonContinue ctrlseteventhandler ["buttonclick","closeDialog 1;"];
+	};
+};
diff --git a/scripts/BuldozerTools/config.sqf b/scripts/BuldozerTools/config.sqf
new file mode 100644
index 0000000000000000000000000000000000000000..553d4220971e990dced6f555a5568d0edf01f3ca
--- /dev/null
+++ b/scripts/BuldozerTools/config.sqf
@@ -0,0 +1,33 @@
+// Buldozer Tools by Lappihuan
+
+// [texts]
+
+roadReloadKey = roadReload select 1;
+weatherTimeSetKey = weatherTimeSet select 1;
+roadDiagKey = roadDiag select 1;
+helpKey = help select 1;
+NVG_IRKey = NVG_IR select 1;
+debugKey = debug select 1;
+
+visionModeIndex = 1;
+
+saveNotificationTitle = "Save Notification";
+
+saveNotificationText = "<t size='0.75'>Please save your project in TB before you continue to work<t/>";
+
+buldozerToolsHelpText = format["<t size='0.75'>Press %4 to show this help<t/><br/><br/>
+						<t size='0.75'>Controlls Help:<t/><br/>
+						<t size='0.75'>Press %1 to reload roads<t/><br/>
+						<t size='0.75'>Press %2 to reset weather and time<t/><br/>
+						<t size='0.75'>Press %3 to toggle road diagnostic mode<t/><br/>
+						<t size='0.75'>Press %6 to toggle IR and NVG mode<t/><br/>
+						<t size='0.75'>Press %5 to execute debug.sqf<t/><br/><br/>
+<t size='0.75' color='#ff0000'>Only move/rotate your camera while road diagnostic is enabled, other actions can crash buldozer!<t/>",
+roadReloadKey,
+weatherTimeSetKey,
+roadDiagKey,
+helpKey,
+debugKey,
+NVG_IRKey];
+
+buldozerToolsHelpTitle = "Buldozer Tools Help v0.2";
\ No newline at end of file
diff --git a/scripts/BuldozerTools/debug.sqf b/scripts/BuldozerTools/debug.sqf
new file mode 100644
index 0000000000000000000000000000000000000000..f1331a61c2ea3439f31e64cea82555cb8db4b14d
--- /dev/null
+++ b/scripts/BuldozerTools/debug.sqf
@@ -0,0 +1,5 @@
+// Buldozer Tools by Lappihuan
+// debug.sqf can be edited while buldozer is running
+// just reexecute it with the debug key
+
+diag_log "Buldozer Tools: debug.sqf executed";
\ No newline at end of file
diff --git a/scripts/BuldozerTools/main.sqf b/scripts/BuldozerTools/main.sqf
new file mode 100644
index 0000000000000000000000000000000000000000..ad30815e724a10e8e312bdf5e434f2ac7e5e6926
--- /dev/null
+++ b/scripts/BuldozerTools/main.sqf
@@ -0,0 +1,69 @@
+diag_log format["Buldozer Tools: initialized with roadpath: '%1'",roadpath];
+
+roadReloadDIK = roadReload select 0;
+weatherTimeSetDIK = weatherTimeSet select 0;
+roadDiagDIK = roadDiag select 0;
+helpDIK = help select 0;
+NVG_IRDIK =  NVG_IR select 0;
+debugDIK = debug select 0;
+
+_bulKeybinds = [] spawn {
+	keyBind = (findDisplay -1) displayAddEventHandler['KeyDown','
+		switch (_this select 1) do {
+			case roadReloadDIK: {
+				result = buldozer_LoadNewRoads roadpath;
+				diag_log "Buldozer Tools: roads reloaded";
+			};
+			case weatherTimeSetDIK: {
+				setDate dateArray;
+				0 setRain 0;
+				0 setOvercast 0;
+				diag_log "Buldozer Tools: weather and time reset";
+			};
+			case roadDiagDIK: {
+				if(buldozer_isEnabledRoadDiag)then{
+					buldozer_enableRoadDiag false;
+					diag_log "Buldozer Tools: road diag disabled";
+				} else {
+					buldozer_enableRoadDiag true;
+					diag_log "Buldozer Tools: road diag enabled";
+				};
+			};
+			case NVG_IRDIK: {
+
+				switch(visionModeIndex)do{
+					case 0: {
+						false setCamUseTi tiMode;
+						camUseNVG false;
+					};
+					case 1: {
+						false setCamUseTi tiMode;
+						camUseNVG true;
+					};
+					case 2: {
+						true setCamUseTi tiMode;
+						camUseNVG false;
+					};
+				};
+				if(visionModeIndex>=2) then {
+					visionModeIndex = 0;
+				} else {
+					visionModeIndex = visionModeIndex+1;
+				};
+			};
+			case helpDIK: {_handle = [buldozerToolsHelpTitle,buldozerToolsHelpText] call LAP_fnc_buldozerHint;};
+			case debugDIK: {_handle = execVM "BuldozerTools\debug.sqf";};
+			default {diag_log "hello"};
+		};
+	'];
+	if(showHelpOnStartup) then {
+		waitUntil {!isNull findDisplay -1};
+		_handle = [buldozerToolsHelpTitle,buldozerToolsHelpText] call LAP_fnc_buldozerHint;
+	};
+	if(saveNotificationIntervall!=0) then {
+		while{true} do {
+			sleep (saveNotificationIntervall * 60);
+			_handle = [saveNotificationTitle,saveNotificationText] call LAP_fnc_buldozerHint;
+		};
+	};
+};
\ No newline at end of file
diff --git a/scripts/config.cpp b/scripts/config.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..9dba1c2a26e2464c790761ec83b8b463e4069f3d
--- /dev/null
+++ b/scripts/config.cpp
@@ -0,0 +1,2587 @@
+////////////////////////////////////////////////////////////////////
+//DeRap: config.bin
+//Produced from mikero's Dos Tools Dll version 9.36
+//https://mikero.bytex.digital/Downloads
+//'now' is Tue Mar 26 12:13:05 2024 : 'file' last modified on Mon Mar 04 16:23:34 2024
+////////////////////////////////////////////////////////////////////
+
+#define _ARMA_
+
+class CfgPatches
+{
+	class DZ_Scripts
+	{
+		units[] = {};
+		weapons[] = {};
+		requiredVersion = 0.1;
+		requiredAddons[] = {};
+	};
+};
+class CfgSlots
+{
+	class Slot_Head
+	{
+		name = "Head";
+		displayName = "";
+		ghostIcon = "";
+		show = "false";
+	};
+	class Slot_Shoulder
+	{
+		name = "Shoulder";
+		displayName = "#STR_CfgShoulder0";
+		ghostIcon = "set:dayz_inventory image:shoulderleft";
+	};
+	class Slot_Melee
+	{
+		name = "Melee";
+		displayName = "#STR_CfgShoulder0";
+		ghostIcon = "set:dayz_inventory image:shoulderright";
+	};
+	class Slot_Bow
+	{
+		name = "Bow";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:bow";
+	};
+	class Slot_Headgear
+	{
+		name = "Headgear";
+		displayName = "#STR_CfgHeadgear0";
+		ghostIcon = "set:dayz_inventory image:headgear";
+		boneName = "Head";
+	};
+	class Slot_Mask
+	{
+		name = "Mask";
+		displayName = "#STR_CfgMask0";
+		ghostIcon = "set:dayz_inventory image:mask";
+	};
+	class Slot_Eyewear
+	{
+		name = "Eyewear";
+		displayName = "#STR_CfgEyewear0";
+		ghostIcon = "set:dayz_inventory image:eyewear";
+	};
+	class Slot_Hands
+	{
+		name = "Hands";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:hands";
+		boneName = "RightHand";
+	};
+	class Slot_LeftHand
+	{
+		name = "LeftHand";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:hands";
+		boneName = "LeftHand";
+		show = "false";
+	};
+	class Slot_Gloves
+	{
+		name = "Gloves";
+		displayName = "#STR_CfgGloves0";
+		ghostIcon = "set:dayz_inventory image:gloves";
+	};
+	class Slot_Armband
+	{
+		name = "Armband";
+		displayName = "#STR_CfgArmband0";
+		ghostIcon = "set:dayz_inventory image:armband";
+	};
+	class Slot_Vest
+	{
+		name = "Vest";
+		displayName = "#STR_CfgVest0";
+		ghostIcon = "set:dayz_inventory image:vest";
+	};
+	class Slot_Body
+	{
+		name = "Body";
+		displayName = "#STR_CfgBody0";
+		ghostIcon = "set:dayz_inventory image:body";
+	};
+	class Slot_Back
+	{
+		name = "Back";
+		displayName = "#STR_CfgBack0";
+		ghostIcon = "set:dayz_inventory image:back";
+	};
+	class Slot_Hips
+	{
+		name = "Hips";
+		displayName = "#STR_CfgHips0";
+		ghostIcon = "set:dayz_inventory image:hips";
+	};
+	class Slot_Legs
+	{
+		name = "Legs";
+		displayName = "#STR_CfgLegs0";
+		ghostIcon = "set:dayz_inventory image:legs";
+	};
+	class Slot_Feet
+	{
+		name = "Feet";
+		displayName = "#STR_CfgFeet0";
+		ghostIcon = "set:dayz_inventory image:feet";
+	};
+	class Slot_Pistol
+	{
+		name = "Pistol";
+		displayName = "#STR_CfgPistol0";
+		ghostIcon = "set:dayz_inventory image:pistol";
+	};
+	class Slot_Knife
+	{
+		name = "Knife";
+		displayName = "#STR_CfgKnife0";
+		ghostIcon = "set:dayz_inventory image:knife";
+	};
+	class Slot_magazine
+	{
+		name = "magazine";
+		displayName = "#STR_CfgMagazine0";
+		ghostIcon = "set:dayz_inventory image:magazine";
+		autoAttach = "false";
+	};
+	class Slot_magazine2
+	{
+		name = "magazine2";
+		displayName = "#STR_CfgMagazine0";
+		ghostIcon = "set:dayz_inventory image:magazine2";
+		autoAttach = "false";
+	};
+	class Slot_magazine3
+	{
+		name = "magazine3";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:magazine3";
+		autoAttach = "false";
+	};
+	class Slot_Driver
+	{
+		name = "Driver";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:doors";
+	};
+	class Slot_Cargo
+	{
+		name = "Cargo";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:missing";
+	};
+	class Slot_Muzzle1
+	{
+		name = "Muzzle1";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:muzzle";
+	};
+	class Slot_Muzzle2
+	{
+		name = "Muzzle2";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:muzzle";
+	};
+	class Slot_Muzzle3
+	{
+		name = "Muzzle3";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:muzzle";
+	};
+	class Slot_VestHolster
+	{
+		name = "VestHolster";
+		displayName = "#STR_CfgBelt_Right0";
+		ghostIcon = "set:dayz_inventory image:vestholster";
+	};
+	class Slot_VestPouch
+	{
+		name = "VestPouch";
+		displayName = "#STR_CfgVestPouch0";
+		ghostIcon = "set:dayz_inventory image:vestpouches";
+	};
+	class Slot_VestBackpack
+	{
+		name = "VestBackpack";
+		displayName = "#STR_CfgVestBackpack0";
+		ghostIcon = "set:dayz_inventory image:back";
+	};
+	class Slot_pistolFlashlight
+	{
+		name = "pistolFlashlight";
+		displayName = "#STR_CfgFlashlight0";
+		ghostIcon = "set:dayz_inventory image:weaponflashlight";
+	};
+	class Slot_pistolMuzzle
+	{
+		name = "pistolMuzzle";
+		displayName = "#STR_CfgSuppressor0";
+		ghostIcon = "set:dayz_inventory image:supressor";
+	};
+	class Slot_pistolOptics
+	{
+		name = "pistolOptics";
+		displayName = "#STR_CfgPistolOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponopticssmall";
+	};
+	class Slot_weaponBayonet
+	{
+		name = "weaponBayonet";
+		displayName = "#STR_CfgBayonet0";
+		ghostIcon = "set:dayz_inventory image:bayonet";
+	};
+	class Slot_weaponBayonetAK
+	{
+		name = "weaponBayonetAK";
+		displayName = "#STR_CfgBayonet0";
+		ghostIcon = "set:dayz_inventory image:bayonet";
+	};
+	class Slot_weaponBayonetMosin
+	{
+		name = "weaponBayonetMosin";
+		displayName = "#STR_CfgBayonet0";
+		ghostIcon = "set:dayz_inventory image:bayonet";
+	};
+	class Slot_weaponBayonetSKS
+	{
+		name = "weaponBayonetSKS";
+		displayName = "#STR_CfgBayonet0";
+		ghostIcon = "set:dayz_inventory image:bayonet";
+	};
+	class Slot_weaponButtstockAK
+	{
+		name = "weaponButtstockAK";
+		displayName = "#STR_CfgButtstock0";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponButtstockFal
+	{
+		name = "weaponButtstockFal";
+		displayName = "#STR_CfgButtstock0";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponButtstockM4
+	{
+		name = "weaponButtstockM4";
+		displayName = "#STR_CfgButtstock0";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponButtstockMP5
+	{
+		name = "weaponButtstockMP5";
+		displayName = "#STR_CfgButtstock0";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponButtstockRed9
+	{
+		name = "weaponButtstockRed9";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponButtstockSaiga
+	{
+		name = "weaponButtstockSaiga";
+		displayName = "#STR_CfgButtstock0";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponButtstockPP19
+	{
+		name = "weaponButtstockPP19";
+		displayName = "#STR_CfgButtstock0";
+		ghostIcon = "set:dayz_inventory image:buttstock";
+	};
+	class Slot_weaponHandguardAK
+	{
+		name = "weaponHandguardAK";
+		displayName = "#STR_CfgHandguard0";
+		ghostIcon = "set:dayz_inventory image:handguard";
+	};
+	class Slot_weaponHandguardM4
+	{
+		name = "weaponHandguardM4";
+		displayName = "#STR_CfgHandguard0";
+		ghostIcon = "set:dayz_inventory image:handguard";
+	};
+	class Slot_weaponHandguardMP5
+	{
+		name = "weaponHandguardMP5";
+		displayName = "#STR_CfgHandguard0";
+		ghostIcon = "set:dayz_inventory image:handguard";
+	};
+	class Slot_weaponHandguardM249
+	{
+		name = "weaponHandguardM249";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:handguard";
+	};
+	class Slot_weaponMuzzle
+	{
+		name = "weaponMuzzle";
+		displayName = "#STR_CfgMuzzle0";
+		ghostIcon = "set:dayz_inventory image:weaponmuzzle";
+	};
+	class Slot_weaponMuzzleAK
+	{
+		name = "weaponMuzzleAK";
+		displayName = "#STR_CfgSuppressor0";
+		ghostIcon = "set:dayz_inventory image:supressor";
+	};
+	class Slot_weaponMuzzleM4
+	{
+		name = "weaponMuzzleM4";
+		displayName = "#STR_CfgSuppressor0";
+		ghostIcon = "set:dayz_inventory image:supressor";
+	};
+	class Slot_weaponMuzzleMP5
+	{
+		name = "weaponMuzzleMP5";
+		displayName = "#STR_CfgMuzzle0";
+		ghostIcon = "set:dayz_inventory image:weaponmuzzle";
+	};
+	class Slot_weaponMuzzleMosin
+	{
+		name = "weaponMuzzleMosin";
+		displayName = "#STR_CfgMuzzle0";
+		ghostIcon = "set:dayz_inventory image:weaponmuzzle";
+	};
+	class Slot_weaponUnderSlugM4
+	{
+		name = "weaponUnderSlugM4";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:weaponunderslungm4";
+	};
+	class Slot_weaponUnderSlugAK
+	{
+		name = "weaponUnderSlugAK";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:weaponunderslungak";
+	};
+	class Slot_weaponBarrelAug
+	{
+		name = "weaponBarrelAug";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:weaponmuzzle";
+	};
+	class Slot_weaponOptics
+	{
+		name = "weaponOptics";
+		displayName = "#STR_CfgWeaponOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponoptics";
+	};
+	class Slot_weaponOpticsAcog
+	{
+		name = "weaponOpticsAcog";
+		displayName = "#STR_CfgWeaponOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponoptics";
+	};
+	class Slot_weaponOpticsAK
+	{
+		name = "weaponOpticsAK";
+		displayName = "#STR_CfgWeaponOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponoptics";
+	};
+	class Slot_weaponOpticsCrossbow
+	{
+		name = "weaponOpticsCrossbow";
+		displayName = "#STR_CfgPistolOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponopticssmall";
+	};
+	class Slot_weaponOpticsHunting
+	{
+		name = "weaponOpticsHunting";
+		displayName = "#STR_CfgWeaponOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponoptics";
+	};
+	class Slot_weaponOpticsLRS
+	{
+		name = "weaponOpticsLRS";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:weaponoptics";
+	};
+	class Slot_weaponOpticsMosin
+	{
+		name = "weaponOpticsMosin";
+		displayName = "#STR_CfgWeaponOptics0";
+		ghostIcon = "set:dayz_inventory image:weaponoptics";
+	};
+	class Slot_weaponOpticsAug
+	{
+		name = "weaponOpticsAug";
+		displayName = "";
+		ghostIcon = "";
+		show = "false";
+	};
+	class Slot_weaponBipod
+	{
+		name = "weaponBipod";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:bipod";
+	};
+	class Slot_weaponBipodM249
+	{
+		name = "Slot_weaponBipodM249";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:bipod";
+	};
+	class Slot_weaponFlashlight
+	{
+		name = "weaponFlashlight";
+		displayName = "#STR_CfgFlashlight0";
+		ghostIcon = "set:dayz_inventory image:weaponflashlight";
+	};
+	class Slot_suppressorImpro
+	{
+		name = "suppressorImpro";
+		displayName = "#STR_CfgSuppressor0";
+		ghostIcon = "set:dayz_inventory image:supressor";
+	};
+	class Slot_weaponWrap
+	{
+		name = "weaponWrap";
+		displayName = "#STR_CfgWeaponWrap0";
+		ghostIcon = "set:dayz_inventory image:weaponwrap";
+	};
+	class Slot_magazineFakeWeapon
+	{
+		name = "magazineFakeWeapon";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:magazinefakeweapon";
+		autoAttach = "false";
+	};
+	class Slot_tripWireAttachment
+	{
+		name = "tripWireAttachment";
+		displayName = "#STR_CfgVestGrenade0";
+		ghostIcon = "set:dayz_inventory image:grenade";
+	};
+	class Slot_BatteryD
+	{
+		name = "BatteryD";
+		displayName = "#STR_CfgBatteryD0";
+		ghostIcon = "set:dayz_inventory image:batteryd";
+	};
+	class Slot_MetalWire
+	{
+		name = "MetalWire";
+		displayName = "#STR_CfgMetalWire0";
+		ghostIcon = "set:dayz_inventory image:metalwire";
+	};
+	class Slot_TriggerAlarmClock
+	{
+		name = "TriggerAlarmClock";
+		displayName = "#STR_TriggerDevice";
+		ghostIcon = "set:dayz_gui image:walkie_talkie";
+	};
+	class Slot_TriggerKitchenTimer
+	{
+		name = "TriggerKitchenTimer";
+		displayName = "#STR_TriggerDevice";
+		ghostIcon = "set:dayz_gui image:walkie_talkie";
+	};
+	class Slot_TriggerRemoteDetonator
+	{
+		name = "TriggerRemoteDetonator_Receiver";
+		displayName = "#STR_TriggerDevice";
+		ghostIcon = "set:dayz_gui image:walkie_talkie";
+	};
+	class Slot_IEDExplosiveA
+	{
+		name = "IEDExplosiveA";
+		displayName = "#STR_Explosive";
+		ghostIcon = "set:dayz_inventory image:explosive";
+	};
+	class Slot_IEDExplosiveB
+	{
+		name = "IEDExplosiveB";
+		displayName = "#STR_Explosive";
+		ghostIcon = "set:dayz_inventory image:explosive";
+	};
+	class Slot_Book
+	{
+		name = "Book";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:book";
+		stackMax = 1;
+	};
+	class Slot_ButaneTorchCanister
+	{
+		name = "ButaneTorchCanister";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:gascanister";
+	};
+	class Slot_CableReel
+	{
+		name = "CableReel";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:cablereel";
+	};
+	class Slot_CamoNet
+	{
+		name = "CamoNet";
+		displayName = "#STR_CfgCamoNet0";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_CookingBase
+	{
+		name = "CookingBase";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:cookingbase";
+	};
+	class Slot_CookingEquipment
+	{
+		name = "CookingEquipment";
+		displayName = "#STR_CfgCookingEquipment0";
+		ghostIcon = "set:dayz_inventory image:cookingequipment";
+	};
+	class Slot_CookingTripod
+	{
+		name = "CookingTripod";
+		displayName = "#STR_CfgCookingTripod0";
+		ghostIcon = "set:dayz_inventory image:cookingtripod";
+	};
+	class Slot_DBHelmetMouth
+	{
+		name = "DBHelmetMouth";
+		displayName = "#STR_CfgDBHelmetMouth0";
+		ghostIcon = "set:dayz_inventory image:dbhelmetmouth";
+	};
+	class Slot_DBHelmetVisor
+	{
+		name = "DBHelmetVisor";
+		displayName = "#STR_CfgDBHelmetVisor0";
+		ghostIcon = "set:dayz_inventory image:dbhelmetvisor";
+	};
+	class Slot_Firewood
+	{
+		name = "Firewood";
+		displayName = "#STR_CfgFirewood0";
+		ghostIcon = "set:dayz_inventory image:firewood";
+		stackMax = 6;
+	};
+	class Slot_GasCanister
+	{
+		name = "GasCanister";
+		displayName = "#STR_CfgGasCanister0";
+		ghostIcon = "set:dayz_inventory image:gascanister";
+	};
+	class Slot_Glass
+	{
+		name = "Glass";
+		displayName = "#STR_CfgGlass0";
+		ghostIcon = "set:dayz_inventory image:gorkavisor";
+	};
+	class Slot_Hook
+	{
+		name = "Hook";
+		displayName = "#STR_CfgHook0";
+		ghostIcon = "set:dayz_inventory image:hook";
+	};
+	class Slot_Ingredient
+	{
+		name = "Ingredient";
+		displayName = "#STR_CfgFood0";
+		ghostIcon = "set:dayz_inventory image:food";
+	};
+	class Slot_Lights
+	{
+		name = "Lights";
+		displayName = "#STR_CfgXmasLights0";
+		ghostIcon = "set:dayz_inventory image:cat_christmaslights";
+	};
+	class Slot_MedicalBandage
+	{
+		name = "MedicalBandage";
+		displayName = "#STR_CfgMedicalBandage0";
+		ghostIcon = "set:dayz_inventory image:medicalbandage";
+	};
+	class Slot_Paper
+	{
+		name = "Paper";
+		displayName = "#STR_CfgPaper0";
+		ghostIcon = "set:dayz_inventory image:paper";
+	};
+	class Slot_Rags
+	{
+		name = "Rags";
+		displayName = "#STR_CfgRags0";
+		ghostIcon = "set:dayz_inventory image:rags";
+		stackMax = 6;
+	};
+	class Slot_Stones
+	{
+		name = "Stones";
+		displayName = "#STR_CfgStones0";
+		selection = "Stones";
+		ghostIcon = "set:dayz_inventory image:stones";
+		stackMax = 16;
+	};
+	class Slot_WoodenStick
+	{
+		name = "WoodenStick";
+		displayName = "#STR_CfgWoodenStick0";
+		ghostIcon = "set:dayz_inventory image:woodenstick";
+		stackMax = 10;
+	};
+	class Slot_bait
+	{
+		name = "Bait";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:hook";
+	};
+	class Slot_matchinside
+	{
+		name = "matchinside";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:matchinside";
+	};
+	class Slot_BerryB
+	{
+		name = "BerryB";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:berry";
+	};
+	class Slot_BerryR
+	{
+		name = "BerryR";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:berry";
+	};
+	class Slot_BirchBark
+	{
+		name = "BirchBark";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:bark";
+		stackMax = 8;
+	};
+	class Slot_OakBark
+	{
+		name = "OakBark";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:bark";
+		stackMax = 8;
+	};
+	class Slot_Plant
+	{
+		name = "Plant";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:plant";
+	};
+	class Slot_Disinfectant
+	{
+		name = "Disinfectant";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:disinfectant";
+	};
+	class Slot_Guts
+	{
+		name = "Guts";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:guts";
+	};
+	class Slot_Lime
+	{
+		name = "Lime";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:lime";
+	};
+	class Slot_Bark
+	{
+		name = "Bark";
+		displayName = "#STR_CfgBark0";
+		ghostIcon = "set:dayz_inventory image:bark";
+		stackMax = 8;
+	};
+	class Slot_DirectCookingA
+	{
+		name = "DirectCookingA";
+		displayName = "#STR_CfgDirectCooking0";
+		ghostIcon = "set:dayz_inventory image:directcooking";
+	};
+	class Slot_DirectCookingB
+	{
+		name = "DirectCookingB";
+		displayName = "#STR_CfgDirectCooking0";
+		ghostIcon = "set:dayz_inventory image:directcooking";
+	};
+	class Slot_DirectCookingC
+	{
+		name = "DirectCookingC";
+		displayName = "#STR_CfgDirectCooking0";
+		ghostIcon = "set:dayz_inventory image:directcooking";
+	};
+	class Slot_SmokingA
+	{
+		name = "SmokingA";
+		displayName = "#STR_CfgSmoking0";
+		ghostIcon = "set:dayz_inventory image:smoking";
+	};
+	class Slot_SmokingB
+	{
+		name = "SmokingB";
+		displayName = "#STR_CfgSmoking0";
+		ghostIcon = "set:dayz_inventory image:smoking";
+	};
+	class Slot_SmokingC
+	{
+		name = "SmokingC";
+		displayName = "#STR_CfgSmoking0";
+		ghostIcon = "set:dayz_inventory image:smoking";
+	};
+	class Slot_SmokingD
+	{
+		name = "SmokingD";
+		displayName = "#STR_CfgSmoking0";
+		ghostIcon = "set:dayz_inventory image:smoking";
+	};
+	class Slot_SeedBase_1
+	{
+		name = "SeedBase_1";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_1";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_2
+	{
+		name = "SeedBase_2";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_2";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_3
+	{
+		name = "SeedBase_3";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_3";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_4
+	{
+		name = "SeedBase_4";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_4";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_5
+	{
+		name = "SeedBase_5";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_5";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_6
+	{
+		name = "SeedBase_6";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_6";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_7
+	{
+		name = "SeedBase_7";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_7";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_8
+	{
+		name = "SeedBase_8";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_8";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_9
+	{
+		name = "SeedBase_9";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_9";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_10
+	{
+		name = "SeedBase_10";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_10";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_11
+	{
+		name = "SeedBase_11";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_11";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_12
+	{
+		name = "SeedBase_12";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_12";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_SeedBase_13
+	{
+		name = "SeedBase_13";
+		displayName = "#STR_CfgSeedBase0";
+		selection = "SeedBase_13";
+		ghostIcon = "set:dayz_inventory image:seedbase";
+		stackMax = 1;
+	};
+	class Slot_GlowPlug
+	{
+		name = "GlowPlug";
+		displayName = "#STR_GlowPlug0";
+		ghostIcon = "set:dayz_inventory image:glowplug";
+	};
+	class Slot_SparkPlug
+	{
+		name = "SparkPlug";
+		displayName = "#STR_CfgSparkPlug0";
+		ghostIcon = "set:dayz_inventory image:sparkplug";
+	};
+	class Slot_EngineBelt
+	{
+		name = "EngineBelt";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:enginebelt";
+	};
+	class Slot_CarBattery
+	{
+		name = "CarBattery";
+		displayName = "#STR_CfgVehicleBattery0";
+		selection = "battery";
+		ghostIcon = "set:dayz_inventory image:carbattery";
+	};
+	class Slot_TruckBattery
+	{
+		name = "TruckBattery";
+		displayName = "#STR_CfgVehicleBattery0";
+		selection = "battery";
+		ghostIcon = "set:dayz_inventory image:carbattery";
+	};
+	class Slot_LightBulb
+	{
+		name = "LightBulb";
+		displayName = "#STR_CfgLightBulb0";
+		ghostIcon = "set:dayz_inventory image:lightbulb";
+	};
+	class Slot_Reflector_1_1
+	{
+		name = "Reflector_1_1";
+		displayName = "#STR_CfgLightBulb0";
+		selection = "Reflector_1_1";
+		ghostIcon = "set:dayz_inventory image:lightbulb";
+	};
+	class Slot_Reflector_2_1
+	{
+		name = "Reflector_2_1";
+		displayName = "#STR_CfgLightBulb0";
+		selection = "Reflector_2_1";
+		ghostIcon = "set:dayz_inventory image:lightbulb";
+	};
+	class Slot_TruckRadiator
+	{
+		name = "TruckRadiator";
+		displayName = "#STR_CfgVehicleRadiator0";
+		ghostIcon = "set:dayz_inventory image:radiator";
+	};
+	class Slot_CarRadiator
+	{
+		name = "CarRadiator";
+		displayName = "#STR_CfgVehicleRadiator0";
+		ghostIcon = "set:dayz_inventory image:radiator";
+	};
+	class Slot_V3SWheel_1_1
+	{
+		name = "V3SWheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_1_2
+	{
+		name = "V3SWheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_1_3
+	{
+		name = "V3SWheel_1_3";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_3";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_2_1
+	{
+		name = "V3SWheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_2_2
+	{
+		name = "V3SWheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_2_3
+	{
+		name = "V3SWheel_2_3";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_3";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_Spare_1
+	{
+		name = "V3SWheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SWheel_Spare_2
+	{
+		name = "V3SWheel_Spare_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_V3SHood
+	{
+		name = "V3SHood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_V3SDriverDoors
+	{
+		name = "V3SDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_V3SCoDriverDoors
+	{
+		name = "V3SCoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_UtilityVehicleWheel_1_1
+	{
+		name = "UtilityVehicleWheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_UtilityVehicleWheel_1_2
+	{
+		name = "UtilityVehicleWheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_UtilityVehicleWheel_2_1
+	{
+		name = "UtilityVehicleWheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_UtilityVehicleWheel_2_2
+	{
+		name = "UtilityVehicleWheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_UtilityVehicleDriverDoors
+	{
+		name = "UtilityVehicleDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_UtilityVehicleCoDriverDoors
+	{
+		name = "UtilityVehicleCoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_NivaWheel_1_1
+	{
+		name = "NivaWheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_NivaWheel_1_2
+	{
+		name = "NivaWheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_NivaWheel_2_1
+	{
+		name = "NivaWheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_NivaWheel_2_2
+	{
+		name = "NivaWheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_NivaWheel_Spare_1
+	{
+		name = "NivaWheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_NivaHood
+	{
+		name = "NivaHood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_NivaTrunk
+	{
+		name = "NivaTrunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_NivaDriverDoors
+	{
+		name = "NivaDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_NivaCoDriverDoors
+	{
+		name = "NivaCoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivSedanWheel_1_1
+	{
+		name = "CivSedanWheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivSedanWheel_1_2
+	{
+		name = "CivSedanWheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivSedanWheel_2_1
+	{
+		name = "CivSedanWheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivSedanWheel_2_2
+	{
+		name = "CivSedanWheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivSedanWheel_Spare_1
+	{
+		name = "CivSedanWheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivSedanHood
+	{
+		name = "CivSedanHood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_CivSedanTrunk
+	{
+		name = "CivSedanTrunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_CivSedanDriverDoors
+	{
+		name = "CivSedanDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivSedanCoDriverDoors
+	{
+		name = "CivSedanCoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivSedanCargo1Doors
+	{
+		name = "CivSedanCargo1Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_CivSedanCargo2Doors
+	{
+		name = "CivSedanCargo2Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_CivVanWheel_1_1
+	{
+		name = "CivVanWheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivVanWheel_1_2
+	{
+		name = "CivVanWheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivVanWheel_2_1
+	{
+		name = "CivVanWheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivVanWheel_2_2
+	{
+		name = "CivVanWheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivVanDriverDoors
+	{
+		name = "CivVanDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivVanCoDriverDoors
+	{
+		name = "CivVanCoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivVanCargo1Doors
+	{
+		name = "CivVanCargo1Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_CivVanTrunkUp
+	{
+		name = "CivVanTrunkUp";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_CivVanCargoDown
+	{
+		name = "CivVanTrunkDown";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Van_01_Wheel_1_1
+	{
+		name = "Van_01_Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Van_01_Wheel_1_2
+	{
+		name = "Van_01_Wheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Van_01_Wheel_2_1
+	{
+		name = "Van_01_Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Van_01_Wheel_2_2
+	{
+		name = "Van_01_Wheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Van_01_Door_1_1
+	{
+		name = "Van_01_Door_1_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Van_01_Door_2_1
+	{
+		name = "Van_01_Door_2_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Van_01_Door_2_2
+	{
+		name = "Van_01_Door_2_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Van_01_Trunk_1
+	{
+		name = "Van_01_Trunk_1";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_Van_01_Trunk_2
+	{
+		name = "Van_01_Trunk_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_BusWheel_1_1
+	{
+		name = "BusWheel_1_1";
+		displayName = "";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_BusWheel_1_2
+	{
+		name = "BusWheel_1_2";
+		displayName = "";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_BusWheel_2_1
+	{
+		name = "BusWheel_2_1";
+		displayName = "";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_BusWheel_2_2
+	{
+		name = "BusWheel_2_2";
+		displayName = "";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_BusHood
+	{
+		name = "BusHood";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_BusLeftDoors_1
+	{
+		name = "BusLeftDoors_1";
+		displayName = "";
+		selection = "BusLeftDoors_1";
+		ghostIcon = "set:dayz_inventory image:busdoor";
+	};
+	class Slot_BusLeftDoors_2
+	{
+		name = "BusLeftDoors_2";
+		displayName = "";
+		selection = "BusLeftDoors_2";
+		ghostIcon = "set:dayz_inventory image:busdoor";
+	};
+	class Slot_BusLeftDoors_3
+	{
+		name = "BusLeftDoors_3";
+		displayName = "";
+		selection = "BusLeftDoors_3";
+		ghostIcon = "set:dayz_inventory image:busdoor";
+	};
+	class Slot_BusRightDoors_1
+	{
+		name = "BusRightDoors_1";
+		displayName = "";
+		selection = "BusRightDoors_1";
+		ghostIcon = "set:dayz_inventory image:busdoor";
+	};
+	class Slot_BusRightDoors_2
+	{
+		name = "BusRightDoors_2";
+		displayName = "";
+		selection = "BusRightDoors_2";
+		ghostIcon = "set:dayz_inventory image:busdoor";
+	};
+	class Slot_BusRightDoors_3
+	{
+		name = "BusRightDoors_3";
+		displayName = "";
+		selection = "BusRightDoors_3";
+		ghostIcon = "set:dayz_inventory image:busdoor";
+	};
+	class Slot_CivHatchbackWheel_1_1
+	{
+		name = "CivHatchbackWheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivHatchbackWheel_1_2
+	{
+		name = "CivHatchbackWheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivHatchbackWheel_2_1
+	{
+		name = "CivHatchbackWheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivHatchbackWheel_2_2
+	{
+		name = "CivHatchbackWheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_CivHatchbackHood
+	{
+		name = "CivHatchbackHood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_CivHatchbackTrunk
+	{
+		name = "CivHatchbackTrunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_CivHatchbackDriverDoors
+	{
+		name = "CivHatchbackDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivHatchbackCoDriverDoors
+	{
+		name = "CivHatchbackCoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_CivHatchbackCargo1Doors
+	{
+		name = "CivHatchbackCargo1Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_CivHatchbackCargo2Doors
+	{
+		name = "CivHatchbackCargo2Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_S120Wheel_1_1
+	{
+		name = "S120Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_S120Wheel_1_2
+	{
+		name = "S120Wheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_S120Wheel_2_1
+	{
+		name = "S120Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_S120Wheel_2_2
+	{
+		name = "S120Wheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_S120Hood
+	{
+		name = "S120Hood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_S120Trunk
+	{
+		name = "S120Trunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_S120DriverDoors
+	{
+		name = "S120DriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_S120CoDriverDoors
+	{
+		name = "S120CoDriverDoors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_S120Cargo1Doors
+	{
+		name = "S120Cargo1Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_S120Cargo2Doors
+	{
+		name = "S120Cargo2Doors";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Truck_01_Wheel_1_1
+	{
+		name = "Truck_01_Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_01_Wheel_1_2
+	{
+		name = "Truck_01_Wheel_1_2";
+		displayName = "#STR_CfgDoubleWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:doublewheel";
+	};
+	class Slot_Truck_01_Wheel_1_3
+	{
+		name = "Truck_01_Wheel_1_3";
+		displayName = "#STR_CfgDoubleWheel0";
+		selection = "wheel_1_3";
+		ghostIcon = "set:dayz_inventory image:doublewheel";
+	};
+	class Slot_Truck_01_Wheel_2_1
+	{
+		name = "Truck_01_Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_01_Wheel_2_2
+	{
+		name = "Truck_01_Wheel_2_2";
+		displayName = "#STR_CfgDoubleWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:doublewheel";
+	};
+	class Slot_Truck_01_Wheel_2_3
+	{
+		name = "Truck_01_Wheel_2_3";
+		displayName = "#STR_CfgDoubleWheel0";
+		selection = "wheel_2_3";
+		ghostIcon = "set:dayz_inventory image:doublewheel";
+	};
+	class Slot_Truck_01_Wheel_Spare_1
+	{
+		name = "Truck_01_Wheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_01_Wheel_Spare_2
+	{
+		name = "Truck_01_Wheel_Spare_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_01_Hood
+	{
+		name = "Truck_01_Hood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_Truck_01_Door_1_1
+	{
+		name = "Truck_01_Door_1_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Truck_01_Doors_2_1
+	{
+		name = "Truck_01_Door_2_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Truck_01_WoodenLogs
+	{
+		name = "Truck_01_WoodenLogs";
+		displayName = "#STR_CfgWoodenLogs0";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 50;
+	};
+	class Slot_Truck_01_WoodenPlanks
+	{
+		name = "Truck_01_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 100;
+	};
+	class Slot_Truck_01_MetalSheets
+	{
+		name = "Truck_01_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 40;
+	};
+	class Slot_Truck_01_Barrel1
+	{
+		name = "Truck_01_Barrel1";
+		displayName = "#STR_CfgBarrel0";
+		ghostIcon = "set:dayz_inventory image:barrel";
+	};
+	class Slot_Truck_01_Barrel2
+	{
+		name = "Truck_01_Barrel2";
+		displayName = "#STR_CfgBarrel0";
+		ghostIcon = "set:dayz_inventory image:barrel";
+	};
+	class Slot_Truck_01_Barrel3
+	{
+		name = "Truck_01_Barrel3";
+		displayName = "#STR_CfgBarrel0";
+		ghostIcon = "set:dayz_inventory image:barrel";
+	};
+	class Slot_Truck_01_Barrel4
+	{
+		name = "Truck_01_Barrel4";
+		displayName = "#STR_CfgBarrel0";
+		ghostIcon = "set:dayz_inventory image:barrel";
+	};
+	class Slot_Truck_01_WoodenCrate1
+	{
+		name = "Truck_01_WoodenCrate1";
+		displayName = "#STR_CfgCrate0";
+		ghostIcon = "set:dayz_inventory image:woodcrate";
+	};
+	class Slot_Truck_01_WoodenCrate2
+	{
+		name = "Truck_01_WoodenCrate2";
+		displayName = "#STR_CfgCrate0";
+		ghostIcon = "set:dayz_inventory image:woodcrate";
+	};
+	class Slot_Truck_01_WoodenCrate3
+	{
+		name = "Truck_01_WoodenCrate3";
+		displayName = "#STR_CfgCrate0";
+		ghostIcon = "set:dayz_inventory image:woodcrate";
+	};
+	class Slot_Truck_01_WoodenCrate4
+	{
+		name = "Truck_01_WoodenCrate4";
+		displayName = "#STR_CfgCrate0";
+		ghostIcon = "set:dayz_inventory image:woodcrate";
+	};
+	class Slot_Truck_02_Wheel_1_1
+	{
+		name = "Truck_02_Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_02_Wheel_1_2
+	{
+		name = "Truck_02_Wheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_02_Wheel_2_1
+	{
+		name = "Truck_02_Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_02_Wheel_2_2
+	{
+		name = "Truck_02_Wheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Truck_02_Door_1_1
+	{
+		name = "Truck_02_Door_1_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Truck_02_Door_2_1
+	{
+		name = "Truck_02_Door_2_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Hatchback_02_Wheel_1_1
+	{
+		name = "Hatchback_02_Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Hatchback_02_Wheel_1_2
+	{
+		name = "Hatchback_02_Wheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Hatchback_02_Wheel_2_1
+	{
+		name = "Hatchback_02_Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Hatchback_02_Wheel_2_2
+	{
+		name = "Hatchback_02_Wheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Hatchback_02_Wheel_Spare_1
+	{
+		name = "Hatchback_02_Wheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Hatchback_02_Door_1_1
+	{
+		name = "Hatchback_02_Door_1_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Hatchback_02_Door_1_2
+	{
+		name = "Hatchback_02_Door_1_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Hatchback_02_Door_2_1
+	{
+		name = "Hatchback_02_Door_2_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Hatchback_02_Door_2_2
+	{
+		name = "Hatchback_02_Door_2_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Hatchback_02_Hood
+	{
+		name = "Hatchback_02_Hood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_Hatchback_02_Trunk
+	{
+		name = "Hatchback_02_Trunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_Sedan_02_Wheel_1_1
+	{
+		name = "Sedan_02_Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Sedan_02_Wheel_1_2
+	{
+		name = "Sedan_02_Wheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Sedan_02_Wheel_2_1
+	{
+		name = "Sedan_02_Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Sedan_02_Wheel_2_2
+	{
+		name = "Sedan_02_Wheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Sedan_02_Wheel_Spare_1
+	{
+		name = "Sedan_02_Wheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Sedan_02_Hood
+	{
+		name = "Sedan_02_Hood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_Sedan_02_Trunk
+	{
+		name = "Sedan_02_Trunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_Sedan_02_Door_1_1
+	{
+		name = "Sedan_02_Door_1_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Sedan_02_Door_2_1
+	{
+		name = "Sedan_02_Door_2_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Sedan_02_Door_1_2
+	{
+		name = "Sedan_02_Door_1_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Sedan_02_Door_2_2
+	{
+		name = "Sedan_02_Door_2_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Offroad_02_Wheel_1_1
+	{
+		name = "Offroad_02_Wheel_1_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Offroad_02_Wheel_1_2
+	{
+		name = "Offroad_02_Wheel_1_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_1_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Offroad_02_Wheel_2_1
+	{
+		name = "Offroad_02_Wheel_2_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Offroad_02_Wheel_2_2
+	{
+		name = "Offroad_02_Wheel_2_2";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_2_2";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Offroad_02_Wheel_Spare_1
+	{
+		name = "Offroad_02_Wheel_Spare_1";
+		displayName = "#STR_CfgWheel0";
+		selection = "wheel_spare_1";
+		ghostIcon = "set:dayz_inventory image:wheel";
+	};
+	class Slot_Offroad_02_Hood
+	{
+		name = "Offroad_02_Hood";
+		displayName = "#STR_CfgHood0";
+		ghostIcon = "set:dayz_inventory image:hood";
+	};
+	class Slot_Offroad_02_Trunk
+	{
+		name = "Offroad_02_Trunk";
+		displayName = "#STR_CfgTrunk0";
+		ghostIcon = "set:dayz_inventory image:trunk";
+	};
+	class Slot_Offroad_02_Door_1_1
+	{
+		name = "Offroad_02_Door_1_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Offroad_02_Door_2_1
+	{
+		name = "Offroad_02_Door_2_1";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorfront";
+	};
+	class Slot_Offroad_02_Door_1_2
+	{
+		name = "Offroad_02_Door_1_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Offroad_02_Door_2_2
+	{
+		name = "Offroad_02_Door_2_2";
+		displayName = "#STR_CfgDoor0";
+		ghostIcon = "set:dayz_inventory image:doorrear";
+	};
+	class Slot_Level_1_Wall_1_Barbedwire_1
+	{
+		name = "Level_1_Wall_1_Barbedwire_1";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "level_1_wall_1_barbedwire_1";
+		ghostIcon = "set:dayz_inventory image:barbedwiredown";
+	};
+	class Slot_Level_1_Wall_1_Barbedwire_2
+	{
+		name = "Level_1_Wall_1_Barbedwire_2";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "level_1_wall_1_barbedwire_2";
+		ghostIcon = "set:dayz_inventory image:barbedwireup";
+	};
+	class Slot_Level_1_Wall_2_Barbedwire_1
+	{
+		name = "Level_1_Wall_2_Barbedwire_1";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "level_1_wall_2_barbedwire_1";
+		ghostIcon = "set:dayz_inventory image:barbedwiredown";
+	};
+	class Slot_Level_1_Wall_2_Barbedwire_2
+	{
+		name = "Level_1_Wall_2_Barbedwire_2";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "level_1_wall_2_barbedwire_2";
+		ghostIcon = "set:dayz_inventory image:barbedwireup";
+	};
+	class Slot_Level_1_Wall_3_Barbedwire_1
+	{
+		name = "Level_1_Wall_3_Barbedwire_1";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "level_1_wall_3_barbedwire_1";
+		ghostIcon = "set:dayz_inventory image:barbedwiredown";
+	};
+	class Slot_Level_1_Wall_3_Barbedwire_2
+	{
+		name = "Level_1_Wall_3_Barbedwire_2";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "level_1_wall_3_barbedwire_2";
+		ghostIcon = "set:dayz_inventory image:barbedwireup";
+	};
+	class Slot_Level_1_Wall_1_Camonet
+	{
+		name = "Level_1_Wall_1_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_1_wall_1_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_1_Wall_2_Camonet
+	{
+		name = "Level_1_Wall_2_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_1_wall_2_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_1_Wall_3_Camonet
+	{
+		name = "Level_1_Wall_3_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_1_wall_3_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_2_Wall_1_Camonet
+	{
+		name = "Level_2_Wall_1_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_2_wall_1_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_2_Wall_2_Camonet
+	{
+		name = "Level_2_Wall_2_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_2_wall_2_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_2_Wall_3_Camonet
+	{
+		name = "Level_2_Wall_3_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_2_wall_3_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_3_Wall_1_Camonet
+	{
+		name = "Level_3_Wall_1_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_3_wall_1_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_3_Wall_2_Camonet
+	{
+		name = "Level_3_Wall_2_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_3_wall_2_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Level_3_Wall_3_Camonet
+	{
+		name = "Level_3_Wall_3_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "level_3_wall_3_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Material_L1_WoodenLogs
+	{
+		name = "Material_L1_WoodenLogs";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_L1_WoodenLogs";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 4;
+	};
+	class Slot_Material_L1_Nails
+	{
+		name = "Material_L1_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l1_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L1W1_Nails
+	{
+		name = "Material_L1W1_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l1w1_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L1W2_Nails
+	{
+		name = "Material_L1W2_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l1w2_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L1W3_Nails
+	{
+		name = "Material_L1W3_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l1w3_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L1_WoodenPlanks
+	{
+		name = "Material_L1_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l1_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L1W1_WoodenPlanks
+	{
+		name = "Material_L1W1_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l1w1_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L1W2_WoodenPlanks
+	{
+		name = "Material_L1W2_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l1w2_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L1W3_WoodenPlanks
+	{
+		name = "Material_L1W3_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l1w3_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L1W1_MetalSheets
+	{
+		name = "Material_L1W1_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "material_l1w1_metalsheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L1W2_MetalSheets
+	{
+		name = "Material_L1W2_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "material_l1w2_metalsheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L1W3_MetalSheets
+	{
+		name = "Material_L1W3_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "material_l1w3_metalsheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L2_WoodenLogs
+	{
+		name = "Material_L2_WoodenLogs";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_L2_WoodenLogs";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 4;
+	};
+	class Slot_Material_L2_Nails
+	{
+		name = "Material_L2_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l2_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L2W1_Nails
+	{
+		name = "Material_L2W1_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l2w1_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L2W2_Nails
+	{
+		name = "Material_L2W2_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l2w2_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L2W3_Nails
+	{
+		name = "Material_L2W3_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "material_l2w3_nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L2_WoodenPlanks
+	{
+		name = "Material_L2_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l2_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L2W1_WoodenPlanks
+	{
+		name = "Material_L2W1_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l2w1_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L2W2_WoodenPlanks
+	{
+		name = "Material_L2W2_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l2w2_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L2W3_WoodenPlanks
+	{
+		name = "Material_L2W3_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "material_l2w3_woodenplanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L2W1_MetalSheets
+	{
+		name = "Material_L2W1_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "material_l2w1_metalsheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L2W2_MetalSheets
+	{
+		name = "Material_L2W2_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "material_l2w2_metalsheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L2W3_MetalSheets
+	{
+		name = "Material_L2W3_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "material_l2w3_metalsheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L3_WoodenLogs
+	{
+		name = "Material_L3_WoodenLogs";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_L3_WoodenLogs";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 4;
+	};
+	class Slot_Material_L3_Nails
+	{
+		name = "Material_L3_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "Material_L3_Nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L3_MetalSheets
+	{
+		name = "Material_L3_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "Material_L3_MetalSheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W1_Nails
+	{
+		name = "Material_L3W1_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "Material_L3W1_Nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L3W2_Nails
+	{
+		name = "Material_L3W2_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "Material_L3W2_Nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L3W3_Nails
+	{
+		name = "Material_L3W3_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "Material_L3W3_Nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_L3_WoodenPlanks
+	{
+		name = "Material_L3_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "Material_L3_WoodenPlanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W1_WoodenPlanks
+	{
+		name = "Material_L3W1_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "Material_L3W1_WoodenPlanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W2_WoodenPlanks
+	{
+		name = "Material_L3W2_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "Material_L3W2_WoodenPlanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W3_WoodenPlanks
+	{
+		name = "Material_L3W3_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "Material_L3W3_WoodenPlanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W1_MetalSheets
+	{
+		name = "Material_L3W1_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "Material_L3W1_MetalSheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W2_MetalSheets
+	{
+		name = "Material_L3W2_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "Material_L3W2_MetalSheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_L3W3_MetalSheets
+	{
+		name = "Material_L3W3_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "Material_L3W3_MetalSheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_Nails
+	{
+		name = "Material_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "Material_Nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 99;
+	};
+	class Slot_Material_WoodenPlanks
+	{
+		name = "Material_WoodenPlanks";
+		displayName = "#STR_CfgPlanks0";
+		selection = "Material_WoodenPlanks";
+		ghostIcon = "set:dayz_inventory image:planks";
+		stackMax = 20;
+	};
+	class Slot_Material_MetalSheets
+	{
+		name = "Material_MetalSheets";
+		displayName = "#STR_CfgMetalPlate0";
+		selection = "Material_MetalSheets";
+		ghostIcon = "set:dayz_inventory image:plates";
+		stackMax = 20;
+	};
+	class Slot_Material_WoodenLogs
+	{
+		name = "Material_WoodenLogs";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_WoodenLogs";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 2;
+	};
+	class Slot_Material_MetalWire
+	{
+		name = "Material_MetalWire";
+		displayName = "#STR_CfgMetalWire0";
+		selection = "Material_MetalWire";
+		ghostIcon = "set:dayz_inventory image:metalwire";
+	};
+	class Slot_Att_CombinationLock
+	{
+		name = "Att_CombinationLock";
+		displayName = "#STR_CombinationLock0";
+		selection = "att_combinationlock";
+		ghostIcon = "set:dayz_inventory image:combolock";
+	};
+	class Slot_Wall_Barbedwire_1
+	{
+		name = "Wall_Barbedwire_1";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "wall_barbedwire_1";
+		ghostIcon = "set:dayz_inventory image:barbedwiredown";
+	};
+	class Slot_Wall_Barbedwire_2
+	{
+		name = "Wall_Barbedwire_2";
+		displayName = "#STR_CfgBarbedWire0";
+		selection = "wall_barbedwire_2";
+		ghostIcon = "set:dayz_inventory image:barbedwireup";
+	};
+	class Slot_Wall_Camonet
+	{
+		name = "Wall_Camonet";
+		displayName = "#STR_CfgCamoNet0";
+		selection = "wall_camonet";
+		ghostIcon = "set:dayz_inventory image:camonet";
+	};
+	class Slot_Material_FPole_WoodenLog
+	{
+		name = "Material_FPole_WoodenLog";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_FPole_WoodenLog";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 1;
+	};
+	class Slot_Material_FPole_Stones
+	{
+		name = "Material_FPole_Stones";
+		displayName = "#STR_CfgStones0";
+		selection = "Material_FPole_Stones";
+		ghostIcon = "set:dayz_inventory image:stones";
+		stackMax = 32;
+	};
+	class Slot_Material_FPole_WoodenLog2
+	{
+		name = "Material_FPole_WoodenLog2";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_FPole_WoodenLog2";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 6;
+	};
+	class Slot_Material_FPole_MetalWire
+	{
+		name = "Material_FPole_MetalWire";
+		displayName = "#STR_CfgMetalWire0";
+		selection = "Material_FPole_MetalWire";
+		ghostIcon = "set:dayz_inventory image:metalwire";
+	};
+	class Slot_Material_FPole_Rope
+	{
+		name = "Material_FPole_Rope";
+		displayName = "#STR_CfgRope0";
+		selection = "Material_FPole_Rope";
+		ghostIcon = "set:dayz_inventory image:rope";
+	};
+	class Slot_Material_FPole_Nails
+	{
+		name = "Material_FPole_Nails";
+		displayName = "#STR_CfgNails0";
+		selection = "Material_FPole_Nails";
+		ghostIcon = "set:dayz_inventory image:nails";
+		stackMax = 60;
+	};
+	class Slot_Material_FPole_MagicStick
+	{
+		name = "Material_FPole_MagicStick";
+		displayName = "#STR_CfgWoodenLogs0";
+		selection = "Material_FPole_MagicStick";
+		ghostIcon = "set:dayz_inventory image:woodenlog";
+		stackMax = 3;
+	};
+	class Slot_Material_FPole_Flag
+	{
+		name = "Material_FPole_Flag";
+		displayName = "#STR_Flag0";
+		selection = "Material_FPole_Flag";
+		ghostIcon = "set:dayz_inventory image:tf_flag";
+	};
+	class Slot_Material_Shelter_FrameSticks
+	{
+		name = "Material_Shelter_FrameSticks";
+		displayName = "#STR_CfgWoodenStick0";
+		selection = "Material_Shelter_FrameSticks";
+		ghostIcon = "set:dayz_inventory image:woodenstick";
+		stackMax = 4;
+	};
+	class Slot_Material_Shelter_Rope
+	{
+		name = "Material_Shelter_Rope";
+		displayName = "#STR_CfgRope0";
+		selection = "Material_Shelter_Rope";
+		ghostIcon = "set:dayz_inventory image:rope";
+	};
+	class Slot_Material_Shelter_Leather
+	{
+		name = "Material_Shelter_Leather";
+		displayName = "#STR_Leather0";
+		selection = "Material_Shelter_Leather";
+		ghostIcon = "set:dayz_inventory image:animal_pelt";
+		stackMax = 8;
+	};
+	class Slot_Material_Shelter_Fabric
+	{
+		name = "Material_Shelter_Fabric";
+		displayName = "#STR_Fabric0";
+		selection = "Material_Shelter_Fabric";
+		ghostIcon = "set:dayz_inventory image:tarp";
+		stackMax = 4;
+	};
+	class Slot_Material_Shelter_Sticks
+	{
+		name = "Material_Shelter_Sticks";
+		displayName = "#STR_CfgWoodenStick0";
+		selection = "Material_Shelter_Sticks";
+		ghostIcon = "set:dayz_inventory image:wooden_sticks";
+		stackMax = 50;
+	};
+	class Slot_LargeBattery
+	{
+		name = "LargeBattery";
+		displayName = "#STR_CfgVehicleBattery0";
+		selection = "battery";
+		ghostIcon = "set:dayz_inventory image:carbattery";
+	};
+	class Slot_Knife_Holster
+	{
+		name = "KnifeHolster";
+		displayName = "";
+		ghostIcon = "set:dayz_inventory image:knifeholster";
+	};
+	class Slot_Chemlight
+	{
+		name = "Chemlight";
+		displayName = "#STR_CfgChemlight0";
+		ghostIcon = "set:dayz_inventory image:chemlight";
+	};
+	class Slot_WalkieTalkie
+	{
+		name = "WalkieTalkie";
+		displayName = "#STR_CfgWalkieTalkie0";
+		ghostIcon = "set:dayz_inventory image:walkietalkie";
+	};
+	class Slot_NVG
+	{
+		name = "NVG";
+		displayName = "#STR_CfgNVG0";
+		ghostIcon = "set:dayz_inventory image:nvggoggles";
+	};
+	class Slot_helmetFlashlight
+	{
+		name = "helmetFlashlight";
+		displayName = "#STR_CfgFlashlight0";
+		ghostIcon = "set:dayz_inventory image:weaponflashlight";
+	};
+	class Slot_Belt_Left
+	{
+		name = "Belt_Left";
+		displayName = "#STR_CfgBelt_Left0";
+		ghostIcon = "set:dayz_inventory image:canteen";
+	};
+	class Slot_Belt_Right
+	{
+		name = "Belt_Right";
+		displayName = "#STR_CfgBelt_Right0";
+		ghostIcon = "set:dayz_inventory image:vestholster";
+	};
+	class Slot_Belt_Back
+	{
+		name = "Belt_Back";
+		displayName = "#STR_CfgBelt_Back0";
+		ghostIcon = "set:dayz_inventory image:knifeholster";
+	};
+	class Slot_VestGrenadeA
+	{
+		name = "VestGrenadeA";
+		displayName = "#STR_CfgVestGrenade0";
+		ghostIcon = "set:dayz_inventory image:grenade";
+	};
+	class Slot_VestGrenadeB
+	{
+		name = "VestGrenadeB";
+		displayName = "#STR_CfgVestGrenade0";
+		ghostIcon = "set:dayz_inventory image:grenade";
+	};
+	class Slot_VestGrenadeC
+	{
+		name = "VestGrenadeC";
+		displayName = "#STR_CfgVestGrenade0";
+		ghostIcon = "set:dayz_inventory image:grenade";
+	};
+	class Slot_VestGrenadeD
+	{
+		name = "VestGrenadeD";
+		displayName = "#STR_CfgVestGrenade0";
+		ghostIcon = "set:dayz_inventory image:grenade";
+	};
+	class Slot_GasMaskFilter
+	{
+		name = "GasMaskFilter";
+		displayName = "#STR_GasMask_Filter0";
+		ghostIcon = "set:dayz_inventory image:gasmaskfilter";
+	};
+	class Slot_Rope
+	{
+		name = "Rope";
+		displayName = "#STR_CfgRope0";
+		ghostIcon = "set:dayz_inventory image:rope";
+	};
+	class Slot_RevolverCylinder
+	{
+		name = "RevolverCylinder";
+		displayName = "";
+		ghostIcon = "";
+		show = "false";
+	};
+	class Slot_RevolverEjector
+	{
+		name = "RevolverEjector";
+		displayName = "";
+		ghostIcon = "";
+		show = "false";
+	};
+	class Slot_Splint_Right
+	{
+		name = "Splint_Right";
+		displayName = "";
+		ghosticon = "";
+		show = "false";
+	};
+	class Slot_Splint_Left
+	{
+		name = "Splint_Left";
+		displayName = "";
+		ghosticon = "";
+		show = "false";
+	};
+	class Slot_Trap_Bait
+	{
+		name = "Trap_Bait";
+		displayName = "#STR_CfgTrapBait0";
+		ghosticon = "set:dayz_inventory image:trapbait";
+		show = "false";
+	};
+	class Slot_TrapPrey_1
+	{
+		name = "TrapPrey_1";
+		displayName = "";
+		ghosticon = "";
+		show = "false";
+	};
+	class Slot_TrapPrey_2
+	{
+		name = "TrapPrey_1";
+		displayName = "";
+		ghosticon = "";
+		show = "false";
+	};
+	class Slot_TrapPrey_3
+	{
+		name = "TrapPrey_1";
+		displayName = "";
+		ghosticon = "";
+		show = "false";
+	};
+	class Slot_TrapPrey_4
+	{
+		name = "TrapPrey_1";
+		displayName = "";
+		ghosticon = "";
+		show = "false";
+	};
+};
diff --git a/scripts/data/DlcInfo.json b/scripts/data/DlcInfo.json
new file mode 100644
index 0000000000000000000000000000000000000000..5176421a6175c1aa4b3954e3146b156f18e418cf
--- /dev/null
+++ b/scripts/data/DlcInfo.json
@@ -0,0 +1,10 @@
+{
+	"DLCs": [
+		{
+			"Name": "Livonia DLC",
+			"HeaderText": "#layout_dlc_header_livonia",
+			"DescriptionText": "#description_dlc_livonia1",
+			"VideoFileName": "DayZ_Livonia_promo_main_menu.mp4"
+		}
+	]
+}
\ No newline at end of file
diff --git a/scripts/data/PageDataTutorials.json b/scripts/data/PageDataTutorials.json
new file mode 100644
index 0000000000000000000000000000000000000000..3b326b2e02aebb4f0b103d9a177ac83fda4f1aae
--- /dev/null
+++ b/scripts/data/PageDataTutorials.json
@@ -0,0 +1,140 @@
+[
+    {
+    "m_TabID": 0,
+        "m_TextWidgetID": 15,
+        "m_ButtonName": "hydration_indicator",
+        "m_InfoText": "#pc_tutorial_status_hydration"
+    },
+    {
+    "m_TabID": 0,
+        "m_TextWidgetID": 16,
+        "m_ButtonName": "food_indicator",
+        "m_InfoText": "#pc_tutorial_status_food"
+    },
+	{
+    "m_TabID": 0,
+        "m_TextWidgetID": 17,
+        "m_ButtonName": "temperature_indicator",
+        "m_InfoText": "#pc_tutorial_status_temparature"
+    },
+	{
+    "m_TabID": 0,
+        "m_TextWidgetID": 18,
+        "m_ButtonName": "blood_indicator",
+        "m_InfoText": "#pc_tutorial_status_blood"
+    },
+	{
+    "m_TabID": 0,
+        "m_TextWidgetID": 19,
+        "m_ButtonName": "health_indicator",
+        "m_InfoText": "#pc_tutorial_status_health"
+    },
+	{
+    "m_TabID": 0,
+        "m_TextWidgetID": 8,
+        "m_ButtonName": "decrease_tendency",
+        "m_InfoText": "#pc_tutorial_status_decrease"
+    },
+	{
+    "m_TabID": 0,
+        "m_TextWidgetID": 9,
+        "m_ButtonName": "strong_decrease_tendency",
+        "m_InfoText": "#pc_tutorial_status_strongDecrease"
+    },
+	{
+ 		"m_TabID": 1,
+        "m_TextWidgetID": 3,
+        "m_ButtonName": "hand",
+        "m_InfoText": "#pc_tutorial_melee3"
+    },
+    {
+    "m_TabID": 1,
+        "m_TextWidgetID": 17,
+        "m_ButtonName": "axe",
+        "m_InfoText": "#pc_tutorial_melee1"
+    },
+    {
+    "m_TabID": 1,
+        "m_TextWidgetID": 21,
+        "m_ButtonName": "hammer",
+        "m_InfoText": "#pc_tutorial_melee2"
+    },
+    {
+    "m_TabID": 2,
+        "m_TextWidgetID": 17,
+        "m_ButtonName": "suppressor",
+        "m_InfoText": "#pc_tutorial_guns1"
+    },
+    {
+    "m_TabID": 2,
+        "m_TextWidgetID": 21,
+        "m_ButtonName": "magazine",
+        "m_InfoText": "#pc_tutorial_guns2"
+    },
+    {
+    "m_TabID": 2,
+        "m_TextWidgetID": 5,
+        "m_ButtonName": "trigger",
+        "m_InfoText": "#pc_tutorial_guns3"
+    },
+    {
+    "m_TabID": 3,
+        "m_TextWidgetID": 5,
+        "m_ButtonName": "infected1",
+        "m_InfoText": "#pc_tutorial_infected1"
+    },
+    {
+    "m_TabID": 3,
+        "m_TextWidgetID": 21,
+        "m_ButtonName": "infected2",
+        "m_InfoText": "#pc_tutorial_infected2"
+    },
+    {
+    "m_TabID": 4,
+        "m_TextWidgetID": 3,
+        "m_ButtonName": "inv1",
+        "m_InfoText": "#pc_tutorial_inventory1"
+    },
+    {
+    "m_TabID": 4,
+        "m_TextWidgetID": 9,
+        "m_ButtonName": "inv2",
+        "m_InfoText": "#pc_tutorial_inventory2"
+    },
+    {
+    "m_TabID": 4,
+        "m_TextWidgetID": 14,
+        "m_ButtonName": "inv3",
+        "m_InfoText": "#pc_tutorial_inventory3"
+    },
+    {
+    "m_TabID": 4,
+        "m_TextWidgetID": 24,
+        "m_ButtonName": "inv4",
+        "m_InfoText": "#pc_tutorial_inventory4"
+    },
+    {
+    "m_TabID": 4,
+        "m_TextWidgetID": 21,
+        "m_ButtonName": "inv5",
+        "m_InfoText": "#pc_tutorial_inventory5"
+    },
+    {
+    "m_TabID": 4,
+        "m_TextWidgetID": 15,
+        "m_ButtonName": "inv6",
+        "m_InfoText": "#pc_tutorial_inventory6"
+    },
+    {
+    "m_TabID": 5,
+        "m_TextWidgetID": 5,
+        "m_ButtonName": "loot1",
+        "m_InfoText": "#pc_tutorial_loot1"
+    },
+    {
+    "m_TabID": 5,
+        "m_TextWidgetID": 17,
+        "m_ButtonName": "loot2",
+        "m_InfoText": "#pc_tutorial_loot2"
+    }
+]
diff --git a/scripts/data/credits.json b/scripts/data/credits.json
new file mode 100644
index 0000000000000000000000000000000000000000..b1b8ab573d8aabdedddbb2ac127da0753419fa0d
--- /dev/null
+++ b/scripts/data/credits.json
@@ -0,0 +1,1192 @@
+{
+    "Departments": [
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#project_lead",
+                    "SectionLines": [
+                        "Tomáš Přibyl",
+                        "David Durčák",
+                        "Eugen Harton"
+                    ]
+                }
+            ]
+        },
+		{
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#executive_producer",
+                    "SectionLines": [
+						"Julien Vida"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#production",
+                    "SectionLines": [
+                        "Dan Olthen",
+                        "Tim Pulsmeier",
+						"Ľuboš Kubiš",
+                        "Roman Múdry"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#creative_directors",
+                    "SectionLines": [
+                        "Adam Franců",
+                        "Brian Hicks",
+                        "Dean Hall"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#lead_designer",
+                    "SectionLines": [
+					    "Tomáš Pulkrábek",
+                        "Peter Nespešný"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#designer",
+                    "SectionLines": [
+                        "Alberto Paparella",
+                        "Arthur Joanin",
+                        "Jan Tomášik",
+                        "Jana Unzeitigová",
+                        "Marek Žilavý",
+                        "Martin Palaugari",
+                        "Martin Strnad",
+                        "Michal Břinda",
+                        "Ondřej Malota",
+                        "Özgür Nergis"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#lead_scripter",
+                    "SectionLines": [
+                        "Radek Řáda",
+                        "Ivan Klčo"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#scripters",
+                    "SectionLines": [
+                        "Boris Vacula",
+                        "Daniel Dička",
+                        "David Soška",
+                        "Kamil Komínek",
+                        "Jakub Palkovič",
+                        "Ľuboš Kováč",
+                        "Martin Strapko",
+                        "Martin Weiser",
+                        "Peter Jánošík",
+                        "Pierre Rencurel",
+                        "Vratislav Jindřich"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#environment_designers",
+                    "SectionLines": [
+                        "Arseniy Smirnov",
+                        "Florian Pelloux",
+                        "Ivan Buchta",
+                        "Mark Gill",
+                        "Martin Hochman",
+                        "Martin Pezlar",
+                        "Petr Sedláček",
+                        "Radim Vitek"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#lead_programmers",
+                    "SectionLines": [
+                        "Miroslav Maněna",
+                        "Lukáš Jagelka",
+                        "Martin Slavkov",
+                        "Mikuláš Florek"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#programmers",
+                    "SectionLines": [
+                        "Adrian Turcanu",
+                        "Aleš Renner",
+                        "Aleš Stupka",
+                        "Eduard Pribula",
+						"Elias Mittet Hernes",
+						"Floris Leysen",
+                        "František Bidlo",
+                        "Jacob Kumar",
+                        "Jakub Horyna",
+                        "Jakub Lukašík",
+                        "Jan Huňka",
+                        "Jaroslav Vinarčík",
+                        "Jozef Vavro",
+                        "Juraj Bleho",
+                        "László Nagy",
+                        "Lukáš Igaz",
+                        "Marek Zeman",
+                        "Matúš Štefánik",
+                        "Mojmír Svoboda",
+                        "Ondrej Ritomský",
+						"Patrik Kalabus",
+                        "Peter Uličiansky",
+						"Peter Ševčík",
+                        "Petr Soviš",
+                        "Rastislav Tisovčík",
+                        "Tomáš Vajda",
+                        "Vlad Mihai Baderca",
+                        "Volodymyr Syvochka",
+                        "Zuzana Péteriová"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#art_directors",
+                    "SectionLines": [
+                        "Ľuboš Lednár",
+                        "Chris Torchia"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#art_lead",
+                    "SectionLines": [
+                        "Michal Ištok"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#artists",
+                    "SectionLines": [
+                        "Art Shiryaev",
+                        "Boris Joanovič",
+                        "Darko Miladinovikj",
+                        "Jakub Mirola",
+                        "Jan Kudrnáč",
+                        "Kristýna Duhárová",
+                        "Marcin Pindara",
+                        "Marián Ferko",
+                        "Mario Kurty",
+                        "Martin Fiffik",
+                        "Martin Škrabák",
+                        "Martin Sušila",
+                        "Michal Horňák",
+                        "Michal Kačík",
+                        "Michal Zajíček",
+                        "Miloš Palguta",
+                        "Ondřej Hanuš",
+                        "Paulína Poláková",
+                        "Peter Blažej",
+                        "Peter Rendoš",
+                        "Peter Švaral",
+                        "Roman Gašperík",
+                        "Sebastian Davies",
+                        "Vadim Spiridonov",
+                        "Vladimír Holík",
+                        "Zdeněk Vespalec"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#animation_leads",
+                    "SectionLines": [
+                        "Petr Janeček",
+                        "Viktor Kostik",
+                        "Jozef Mitaľ"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#animators",
+                    "SectionLines": [
+                        "Adam Oresten",
+                        "Branislav Hollý",
+                        "Jan Germala",
+                        "Jozef Střelec",
+                        "Kakee Lau",
+                        "Marek Syřínek",
+                        "Martin Michalík",
+                        "Michal Panda",
+                        "Miloš Černý",
+                        "Peter Skala",
+                        "Rastislav Hlavatý",
+                        "Roman Straponček",
+                        "Théo Escamez",
+						"Yogesh Batra"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#mocap_lead_engineer",
+                    "SectionLines": [
+                        "Štěpán Kment"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#mocap_operators",
+                    "SectionLines": [
+                        "Jakub Fried",
+                        "Laura Millar"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#audio_lead",
+                    "SectionLines": [
+                        "Jan Dušek",
+						"Tomáš Bayer"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#audio_designers",
+                    "SectionLines": [
+                        "Andrej Novosad",
+                        "Andrej Sinkević",
+                        "Filip Čenžák",
+                        "Kryštof Havel",
+                        "Marek Lacena",
+                        "Miguel Salas",
+                        "Veronika Dubská",
+						"Zuzana Čapandová"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#deployment_engineers",
+                    "SectionLines": [
+                        "David Komínek",
+                        "Martin Vitouš",
+						"Pavel Fitz",
+                        "Petr Vnenk"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#quality_assurance_lead",
+                    "SectionLines": [
+                        "Filip Konupka"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#quality_assurance_specialists",
+                    "SectionLines": [
+                        "Daniel Fialka",
+						"Dominik Novák",
+                        "Erik Vrškový",
+                        "Jan Jirák",
+                        "Ketrin Bitomská",
+                        "Kristina Kirichenko",
+                        "Martin Polma",
+                        "Ondřej Klíma",
+                        "Rastislav Kluka"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#enfusion_project_lead",
+                    "SectionLines": [
+                        "Pavel Šafář"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#enfusion_programmers",
+                    "SectionLines": [
+                        "Andrej Török",
+                        "Daniel Sierra Hernandez",
+                        "Filip Doksanský",
+                        "Jan Zelený",
+                        "Jana Machutová",
+                        "Martin Cmar",
+                        "Martin Krošlák",
+                        "Michal Varnuška",
+						"Michal Žák",
+                        "Miroslav Horváth",
+                        "Peter Čimo",
+                        "Vincent Mahnke"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#additional_art_lead",
+                    "SectionLines": [
+                        "Jiří Jakubec"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#additional_artists",
+                    "SectionLines": [
+                        "Chaisiri Yuenying",
+                        "Chaluemch Khuenkhiew",
+                        "Chanunsit Tanapuriyothin",
+                        "Jaratpong Sukavinya",
+                        "Jutamas Petsri",
+                        "Karan Kumar",
+                        "Keadtisak Khwagosom",
+                        "Khathawut Lasuwan",
+                        "Khomsan Suphom",
+                        "Krit Nawaritloha",
+                        "Nattavut Mantanakul",
+                        "Nawin Sapchinda",
+                        "Pajaree Rodsomboon",
+                        "Pantira Pengwaha",
+                        "Panuwitpong Pariyawathee",
+                        "Pianpat Ronruangrit",
+                        "Pooriwat Waikula",
+                        "Prasittichai Daengma",
+                        "Shinawat Thurdnampetch",
+                        "Sontat Chaisiripant",
+                        "Suppachai Inmuean",
+                        "Tanate Wilawankamon",
+                        "Tatiya Junsong",
+                        "Yosaphon Issarasenanaayudthaya"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#additional_programmers",
+                    "SectionLines": [
+                        "František Novák",
+                        "Martin Stanjek",
+                        "Richard Biely",
+                        "Tomáš Nezval"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#voice_actors",
+                    "SectionLines": [
+                        "Jan Gehr",
+                        "Anne Lantz",
+                        "Daniel Janák",
+                        "Emanuel von Malburg",
+                        "Eva Rýznarová",
+                        "Hal James Rothwell",
+                        "Howard Lotker",
+                        "Irena Tereza Prpic",
+                        "Isabel McCallum Stewart",
+                        "Jeff Koch",
+                        "Julia Dehnisch",
+                        "László Nagy",
+                        "Maelika Eberhard",
+                        "Mark Fitzhenry",
+                        "Míša Krejčíková",
+                        "Rudolf Klenovský",
+                        "Sarah Giercksky",
+                        "Seif Jamoussi",
+                        "Sigurbjörg Lovísa Árnadóttir",
+                        "Sinead Phelps",
+                        "Tomás Verdejo",
+                        "Vansh Luthra",
+                        "Victor Dohlsten",
+                        "Xander Turian"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#motion_capture_actors",
+                    "SectionLines": [
+                        "Aleš Blažej",
+                        "Herbert Heissler",
+                        "Marek Holeček",
+                        "Tadeáš Krofta",
+                        "Tomáš Junas",
+                        "Marek Syřínek",
+                        "Marek Španěl",
+                        "Martin Michalík"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#bohemia_interactive_development_teams",
+                    "SectionLines": [
+                        "Contact Team",
+						"Livonia Terrain Team"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#brand_and_pr_manager",
+                    "SectionLines": [
+                        "Anna Buenafe",
+                        "Martin Baar",
+                        "Matěj Smrček",
+                        "Dustin Hucks",
+                        "Scott Bowen"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#brand_and_pr_management_team",
+                    "SectionLines": [
+                        "Jakub Vamberský",
+                        "Jitka Vysloužilová",
+                        "Karolina Havelkova",
+                        "Lynn Thun Zaw",
+                        "Miguel Raimundo",
+                        "Michael Christensen",
+                        "Zuzana Cinková"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#publishing_director",
+                    "SectionLines": [
+                        "Jan Libich",
+                        "Vojtěch Ješátko"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#publishing_team",
+                    "SectionLines": [
+                        "Alex Sutton",
+                        "Anastasios Ntirlis",
+                        "Antonie Hálková",
+                        "Chelsea Steeb",
+                        "David Foltýn",
+                        "David Korejtko",
+                        "Filip Hauer",
+                        "Franz Corona",
+                        "Giuseppina Nasini",
+                        "Ivo Stružinský",
+                        "Jan Kunt",
+                        "Lauren Dytrych",
+                        "Lukáš Karel",
+                        "Martin Batel'",
+                        "Martin Janoušek",
+                        "Matt Lightfoot",
+                        "Michal Staněk",
+                        "Mikuláš Kozák",
+                        "Nela Wojaczková",
+                        "Ota Vrťátko",
+                        "Paul R. Statham",
+                        "Pavel Mázl",
+                        "Petr Hovanec",
+                        "Tereza Škorpová",
+                        "Vanessa Itriago Ramos"
+                    ]
+                }
+            ]
+        },
+		{
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#technical_publishing_manager",
+                    "SectionLines": [
+                        "David Kolečkář"
+                    ]
+                }
+            ]
+        },
+		{
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#platform_support_lead",
+                    "SectionLines": [
+                        "Filip Rybář",
+                        "Nikolas Rašín"
+                    ]
+                }
+            ]
+        },
+		{
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#platform_support_specialists",
+                    "SectionLines": [
+                        "Kristýna Valíková",
+						"Richard Kužidlo",
+                        "Patrik Šedivý"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "Localization",
+            "Sections": [
+                {
+                    "SectionName": "",
+                    "SectionLines": [
+                    ]
+                }
+            ]
+        },
+                {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#localization_team",
+                    "SectionLines": [
+                    "Hiroya Ishida"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "Localization – Context Heroes",
+            "Sections": [
+                {
+                    "SectionName": "#localization_manager",
+                    "SectionLines": [
+                        "Vojtěch Schubert"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#localization_team",
+                    "SectionLines": [
+                        "Andrea Luciano Damico",
+                        "Andrew Zhu",
+                        "Artemiy Mikheev",
+                        "Aya Pickard",
+                        "Bartosz Klofik",
+						"Carmen Simio",
+                        "Curri Barceló",
+                        "David Livingstone",
+                        "Dmitry Kornyukhov",
+						"Doris Liang",
+						"Eliška Boudová",
+                        "Felix Tappe",
+                        "Fernando Moreiras",
+                        "Goulven Le Goff",
+                        "Igor Savenkov",
+                        "Jiří Petrů",
+						"Joanna Kinga Král",
+                        "Lincoln Hui",
+						"Liu Dasheng",
+                        "Loek van Kooten",
+                        "Mathilde Sperduto",
+                        "Marco Piccinnu",
+                        "Martin Kořenek",
+                        "Paolo Panena",
+                        "Ramón Méndez",
+                        "Rafael Galhardi",
+                        "Raphaël Rouby",
+                        "Rumi Tasaki",
+                        "Sara Cascianelli",
+                        "Scott Liang",
+                        "Thiago Hilger",
+                        "Tobiáš Zíka",
+                        "Vojtěch Schubert"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "Localization – S&H Entertainment",
+            "Sections": [
+                {
+                    "SectionName": "#localization_team",
+                    "SectionLines": [
+                        "Andrew Zhu",
+                        "Sibel Wu",
+                        "William Wang"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#additional_quality_assurance_leads",
+                    "SectionLines": [
+                        "Patrik Mateašák",
+                        "Jan Hauer",
+                        "Rakpon Malarote",
+                        "Tomáš Matoušek"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#additional_quality_assurance_testers",
+                    "SectionLines": [
+                        "Adam Benža",
+                        "Adam David",
+                        "Adam Vondra",
+                        "Adéla Větrovcová",
+                        "Akkharapoom Saranupan",
+                        "Alisa Chomrit",
+                        "Aneta Laudová",
+                        "Aneta Steimarová",
+                        "Anna Švecová",
+                        "Anna Wrnatová",
+                        "Antonín Karoch",
+                        "Antonio Janeček",
+                        "Artchawin Khempila",
+                        "Barbara Krajčovič",
+                        "Bartoloměj Eliáš",
+                        "Benjamin Hanzl",
+                        "Bodin Suksamran",
+                        "Dalibor Feber",
+                        "Daniel Kádner",
+                        "Daniel Otta",
+                        "Danila Konrad",
+                        "David Mařák",
+                        "Dennis Kalužík",
+                        "Dominik Kučera",
+                        "Dominik Skoupil",
+                        "Doubravka Ježková",
+                        "Egor Ploskov",
+                        "Emil Zima",
+                        "Filip Čort",
+                        "Filip Faschingbauer",
+                        "Filip Knotek",
+                        "František Bláha",
+                        "František Pichnarčík",
+                        "Hynek Svoboda",
+                        "Jakub Drahoš",
+                        "Jakub Filko",
+                        "Jakub Lietavec",
+                        "Jakub Šíma",
+                        "Jan Doležal",
+                        "Jan Kaleta",
+                        "Jan Kočur",
+                        "Jan Parma",
+                        "Jan Švihálek",
+                        "Jan Uher",
+                        "Jan Voldřich",
+                        "Jana Michailidu",
+                        "Jana Vorlíčková",
+                        "Jaroslav Hlaváč",
+                        "Jesika Hamadová",
+                        "Jindřich Cink",
+                        "Jindřich Doležal",
+                        "Jindřich Lička",
+                        "Jiří Javornický",
+                        "Jiří Kocura",
+                        "Jiří Papica",
+                        "Jiří Voborský",
+                        "Josef Vozáb",
+                        "Josefína Juhasová",
+                        "Kamil Beer",
+                        "Karolina Komárková",
+                        "Karolína Skalová",
+                        "Kateřina Szerudová",
+						"Kristina Kirichenko",
+                        "Kryštof Verner",
+                        "Lalisa Leakakul",
+                        "Le Do",
+                        "Lucie Svobodová",
+						"Lukáš Jaro",
+						"Marek Hvizdoš",
+                        "Marek Vítek",
+                        "Marie Pazourová",
+                        "Marta Hlinková",
+                        "Martin Bílek",
+                        "Martin Bugel",
+                        "Martin Dettelbacher",
+                        "Martin Juráš",
+                        "Martin Mayer",
+                        "Martin Mokrejš",
+						"Martin Pivon",
+                        "Martin Suriak",
+                        "Matěj Müller",
+						"Matouš Hrdlicka",
+                        "Matyáš Soviš",
+                        "Max Hejtmánek",
+                        "Michal Jandura",
+                        "Michal Kolman",
+                        "Michal Měřinský",
+                        "Michal Rychetník",
+                        "Michal Skramuský",
+						"Miroslav Kovář",
+                        "Nuthapon Pudpaput",
+                        "Oldřich Kalous",
+                        "Ondřej Borz",
+                        "Ondřej Stejskal",
+                        "Ondřej Vanáč",
+                        "Ondřej Vanča",
+                        "Pankaj Singh",
+						"Pavel Fronek",
+                        "Pavel Hamata",
+                        "Pavol Sočuvka",
+                        "Pavel Štaud",
+                        "Pavla Justicová",
+                        "Peter Šoltés",
+                        "Petr Hlaváč",
+                        "Petr Juklíček",
+                        "Petr Madara",
+                        "Petr Schiebel",
+                        "Petr Secký",
+                        "Petr Vlach",
+                        "Petra Kočí",
+                        "Pinatee Panichauttra",
+                        "Pitsanu Jittamart",
+                        "Raffaele Galbani",
+                        "Rakpon Malarote",
+                        "Richard Rondoš",
+                        "Rittikiat Khemphet",
+                        "Robert Kuchárek",
+                        "Robert Michalič",
+                        "Roman Tuzar",
+                        "Sabina Bagarová",
+                        "Samuel Castillo",
+                        "Sittiporn Lapasuwan",
+                        "Soňa Cicoňová",
+                        "Stanislav Zolotuchin",
+                        "Štěpán Riedl",
+						"Štěpán Šach",
+                        "Štěpán Šikýř",
+                        "Tadeáš Varga",
+                        "Teo Kryštůfek",
+                        "Tomáš Herout",
+                        "Tomáš Jelínek",
+                        "Tomáš Jeřábek",
+                        "Tomáš Kulík",
+                        "Tomáš Novák",
+                        "Tomáš Vančo",
+                        "Tomáš Weiser",
+                        "Tossapon Suppisan",
+                        "Trang Huyen Tran",
+                        "Vít Chocholoušek",
+                        "Vít Faragula",
+                        "Vít Jašek",
+                        "Vladimír Krejčík",
+                        "Vladimír Pech",
+                        "Vojtěch Matouš",
+                        "Vojtěch Neoral",
+                        "Vojtěch Ondrůj",
+                        "Wannivat Damrongwet",
+                        "Zdenka Šlosárová",
+                        "Zuzana Hotová"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "Bohemia Interactive",
+            "Sections": [
+                {
+                    "SectionName": "#ceo",
+                    "SectionLines": [
+                        "Marek Španěl"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#operations",
+                    "SectionLines": [
+                        "Adam Procházka",
+                        "Alena Dostálová",
+                        "Anežka Tesárková",
+                        "Anna Krčmářová",
+                        "Barbora Nitrová",
+                        "Barbora Pôbišová",
+                        "Caroline Rook",
+                        "David Beneš",
+                        "Demeter Macik",
+                        "Dominik Jícha",
+                        "Ellina Hybnerová",
+                        "Eliška Křížová",
+                        "Eva Goldová",
+                        "Eva Matějková",
+                        "Eva Seko",
+                        "František Farkaš",
+                        "Gabriela Šeráková",
+                        "Hugo Esteves",
+                        "Ivan Platonov",
+                        "Ivana Musilová",
+                        "Jakub Vlach",
+                        "Jan Geidl",
+                        "Jan Jeník",
+                        "Jan Kněžíček",
+                        "Jan Kotlan",
+                        "Jan Král",
+                        "Jan Kvíčala",
+                        "Jan Vošahlík",
+                        "Jan Vrba",
+                        "Jan Vrzák",
+                        "Jaroslava Syslová",
+                        "Jervant Malakjan",
+                        "Jindřiška Musilová",
+                        "Jiří Alexa",
+                        "Jiří Halama",
+                        "Jiří Kunt",
+                        "Jiří Lemberger",
+                        "Jiří Raška",
+                        "Josef Plachý",
+                        "Juraj Šimon",
+                        "Kateřina Adams",
+                        "Kateřina Martinkovičová",
+                        "Kateřina Skalická",
+                        "Kateřina Štěpánková",
+                        "Katharina Kočí",
+                        "Klára Císařová",
+                        "Kristýna Vyšehradská",
+                        "Lenka Prokešová",
+                        "Libor Hájek",
+                        "Lucie Main",
+                        "Lucie Zitterbartová",
+                        "Lukáš Lada",
+                        "Lukáš Nožička",
+                        "Lukáš Válka",
+                        "Lukáš Zvonek",
+                        "Magdaléna Havelková",
+                        "Marián Severín Weis",
+                        "Markéta Wiesnerová",
+                        "Martin Civáň",
+                        "Martin Horák",
+                        "Martin Juda",
+                        "Martin Liška",
+                        "Martin Procházka",
+                        "Martin Šalling",
+                        "Michael Župka",
+                        "Michal Doleček",
+                        "Michal Lhotský",
+                        "Mikuláš Cséfalvay",
+                        "Miloslav Cinko",
+                        "Miloslav Matějka",
+                        "Mojmír Snopek",
+                        "Monika Růžičková",
+                        "Naděžda Foglarová",
+                        "Nelli Kvan",
+                        "Nikola Bornová",
+                        "Nikola Fialová",
+                        "Ondřej Vořechovský",
+                        "Ondriska Dominik",
+                        "Part Mainual",
+                        "Patrik Ehlen",
+                        "Peter Dučai",
+                        "Petr Benýšek",
+                        "Petr Jirouch",
+                        "Petr Šimůnek",
+                        "Petr Urbánek",
+                        "Petra Švarcová",
+                        "Radek Bolemant",
+                        "Sára Macháčová",
+                        "Šárka Butulová",
+                        "Šárka Vávrová",
+                        "Slavomír Pavlíček",
+                        "Tereza Vejvodová",
+                        "Tomáš Chromý",
+                        "Tomáš Horák",
+                        "Tomáš Madara",
+                        "Tomáš Rokos",
+                        "Tomáš Plašil",
+                        "Tomáš Wittenberger",
+                        "Usman Zia",
+                        "Václav Líkař",
+                        "Veronika Vyškovská",
+                        "Zbyněk Schwarz"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#community_moderators",
+                    "SectionLines": [
+                        "Accolyte",
+                        "AmberHelios",
+                        "Ander",
+                        "boneboys",
+                        "Cortez",
+                        "Dancing.Russian.Man",
+                        "DemonGroover",
+                        "Derpy_Hooves",
+                        "ferstaberinde",
+                        "Fireball",
+                        "-FM-",
+                        "Fraggle",
+                        "Inception.",
+                        "kichilron",
+                        "Max Planck",
+                        "Mos1ey",
+                        "OrLoK",
+                        "Pacifist",
+                        "purepassion",
+                        "r4z0r49",
+                        "smasht",
+                        "Steak and Potatoes",
+                        "Sula"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "",
+            "Sections": [
+                {
+                    "SectionName": "#special_thanks",
+                    "SectionLines": [
+                        "Bořivoj Hlava",
+                        "Dmitry Sorokin",
+                        "Filip Kraucher",
+                        "Harry Ridgeway",
+                        "Jakub Luknár",
+                        "James Crowe",
+                        "Joshua Dampman",
+                        "Karel Taufman",
+                        "Lloyd XXX",
+                        "Lukáš Miláček",
+                        "Patrik Kollár",
+                        "Pavel Guglava",
+                        "Pawel Smolewski",
+                        "Peter Gonda",
+                        "Peter Rjapoš",
+                        "Petr Kolář",
+                        "Petr Rak",
+                        "Quirin Eberle",
+                        "Roman Roba",
+                        "and You"
+                    ]
+                }
+            ]
+        },
+        {
+            "DepartmentName": "#legal_notices",
+            "Sections": [
+                {
+                    "SectionName": "NVIDIA GameWorks",
+                    "SectionLines": [
+                        "© 2007- 2016 NVIDIA Corporation. All rights reserved."
+                    ]
+                },
+                {
+                    "SectionName": "Ogg Vorbis",
+                    "SectionLines": [
+                        "Copyright (c) 2002-2008 Xiph.org Foundation",
+                        "TrueSky",
+                        "Portions of this software utilize True Sky technology",
+                        "(© 2015 Simul Software Ltd, all rights reserved.)"
+                    ]
+                },
+                {
+                    "SectionName": "libcurl",
+                    "SectionLines": [
+                        "Copyright (c) 1996 - 2018, Daniel Stenberg"
+                    ]
+                },
+                {
+                    "SectionName": "OpenSSL",
+                    "SectionLines": [
+                        "Copyright (c) 1998-2018 The OpenSSL Project. All rights reserved.",
+                        "Copyright (c) 1995-1998 Eric Young (eay@cryptsoft.com)"
+                    ]
+                },
+                {
+                    "SectionName": "rapidjson",
+                    "SectionLines": [
+                        "Copyright (c) 2015 THL A29 Limited, a Tencent company, and Milo Yip.",
+                        "All rights reserved.",
+                        "json.org, Copyright (c) 2002 JSON.org, All Rights Reserved.",
+                        "JSON_checker, Copyright (c) 2002 JSON.org, All Rights Reserved."
+                    ]
+                },
+                {
+                    "SectionName": "Speex",
+                    "SectionLines": [
+                        "© 2002-2003, Jean-Marc Valin/Xiph.Org Foundation"
+                    ]
+                },
+                {
+                    "SectionName": "hashlib++",
+                    "SectionLines": [
+                        "Copyright (c) 2007-2011 Benjamin Grüdelbach"
+                    ]
+                },
+                {
+                    "SectionName": "Bullet Physics Library",
+                    "SectionLines": [
+                        ""
+                    ]
+                },
+                {
+                    "SectionName": "zLib",
+                    "SectionLines": [
+                        "Copyright (c) 1995-2017 Jean-loup Gailly and Mark Adler"
+                    ]
+                },
+                {
+                    "SectionName": "Recast & Detour",
+                    "SectionLines": [
+                        "Copyright (c) 2009 Mikko Mononen memon@inside.org"
+                    ]
+                },
+                {
+                    "SectionName": "AGS",
+                    "SectionLines": [
+                        "Copyright (c) 2017 Advanced Micro Devices, Inc. All rights reserved."
+                    ]
+                },
+                {
+                    "SectionName": "Data compression by oberhumer.com",
+                    "SectionLines": [
+                        ""
+                    ]
+                },
+                {
+                    "SectionName": "Images",
+                    "SectionLines": [
+                        "'The Milky Way panorama' by ESO/S.Brunier used under the  CC BY 4.0 license (https://creativecommons.org/licenses/by/4.0/) / Adapted for in-game usage."
+                    ]
+                }
+            ]
+        }
+    ]
+}
\ No newline at end of file
diff --git a/scripts/data/hints.json b/scripts/data/hints.json
new file mode 100644
index 0000000000000000000000000000000000000000..d62c8d0007723792e2435b5910d8eb3c30d96be8
--- /dev/null
+++ b/scripts/data/hints.json
@@ -0,0 +1,177 @@
+[
+	{
+		"m_Headline": "#str_hint_notarunner0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_notarunner1"
+	},
+	{
+		"m_Headline": "#str_hint_goinland0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_goinland1"
+	},	
+	{
+		"m_Headline": "#str_hint_mytrustyknife0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_mytrustyknife1"
+	},
+	{
+		"m_Headline": "#str_hint_patchyourselfup0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_patchyourselfup1"
+	},
+	{
+		"m_Headline": "#str_hint_freshfood0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_freshfood1"
+	},
+	{
+		"m_Headline": "#str_hint_gunjam0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_gunjam1"
+	},	
+	{
+		"m_Headline": "#str_hint_badblood0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_badblood1"
+	},	
+	{
+		"m_Headline": "#str_hint_infectedslayer0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_infectedslayer1"
+	},	
+	{
+		"m_Headline": "#str_hint_hope0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_hope1"
+	},	
+	{
+		"m_Headline": "#str_hint_handyman0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_handyman1"
+	},	
+	{
+		"m_Headline": "#str_hint_navigator0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_navigator1"
+	},	
+	{
+		"m_Headline": "#str_hint_beans0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_beans1"
+	},	
+	{
+		"m_Headline": "#str_hint_weather0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_weather1"
+	},	
+	{
+		"m_Headline": "#str_hint_nutrition0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_nutrition1"
+	},	
+	{
+		"m_Headline": "#str_hint_nighttime0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_nighttime1"
+	},
+	{
+		"m_Headline": "#str_hint_watchyourfeet0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_watchyourfeet1"
+	},
+	{
+		"m_Headline": "#str_hint_ragsoflife0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_ragsoflife1"
+	},
+	{
+		"m_Headline": "#str_hint_maskon0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_maskon1"
+	},
+	{
+		"m_Headline": "#str_hint_taintedsource0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_taintedsource1"
+	},
+	{
+		"m_Headline": "#str_hint_keepitclean0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_keepitclean1"
+	},
+	{
+		"m_Headline": "#str_hint_warmandcozy0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_warmandcozy1"
+	},
+	{
+		"m_Headline": "#str_hint_earlybird0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_earlybird1"
+	},
+	{
+		"m_Headline": "#str_hint_deadlymist0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_deadlymist1"
+	},
+	{
+		"m_Headline": "#str_hint_sharpshooter0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_sharpshooter1"
+	},
+	{
+		"m_Headline": "#str_hint_thoroughcheckup0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_thoroughcheckup1"
+	},
+	{
+		"m_Headline": "#str_hint_stabbedintheback0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_stabbedintheback1"
+	},
+	{
+		"m_Headline": "#str_hint_lightasafeather0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_lightasafeather1"
+	},
+	{
+		"m_Headline": "#str_hint_loadingfirearms0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_loadingfirearms1"
+	},
+	{
+		"m_Headline": "#str_hint_keepitcool0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_keepitcool1"
+	},
+	{
+		"m_Headline": "#str_hint_planningahead0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_planningahead1"
+	},
+	{
+		"m_Headline": "#str_hint_wordsasaweapon0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_wordsasaweapon1"
+	},
+	{
+		"m_Headline": "#str_hint_quickpockets0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_quickpockets1"
+	},
+	{
+		"m_Headline": "#str_hint_heavyduty0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_heavyduty1"
+	},
+	{
+		"m_Headline": "#str_hint_traveller0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_traveller1"
+	},
+	{
+		"m_Headline": "#str_hint_bequietorloud0",
+		"m_ImagePath": "",
+		"m_Description": "#str_hint_bequietorloud1"
+	}	
+]
\ No newline at end of file
diff --git a/scripts/data/internal/script_console_hints.json b/scripts/data/internal/script_console_hints.json
new file mode 100644
index 0000000000000000000000000000000000000000..39b9fcafd5d339aa1a5e6d7dc930c66eac3a8958
--- /dev/null
+++ b/scripts/data/internal/script_console_hints.json
@@ -0,0 +1,169 @@
+{
+    "WidgetHintBindings": {
+        "-1309929726": "",
+        "552892759": "Insert text to search for in currently opened Cfg file.",
+        "1985069064": "Select a preset location to auto-set it for \"TELEPORT\" below.",
+        "885568265": "Set Value for given weather parameter (0 - no clouds/rain/fog, 1 - max). Hold RMB and LMB to adjust values for all at once and automatically apply them.",
+        "462454794": "Toggle which Cfg folders you'd like to display below.",
+        "-545900616": "",
+        "1629523981": "Set in how many seconds the weather change is to be applied when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "-1586623473": "Toggle whether characters of other players are displayed on the map.",
+        "1525433266": "Set radius at which items around character are displayed on the left.",
+        "-931449582": "",
+        "1856235795": "",
+        "1374152726": "Apply set values to current weather.",
+        "435322647": "",
+        "-1656896488": "Set Z coordinate for teleportation.",
+        "-1374196455": "Select a pre-made preset of character gear to spawn with item spawning buttons.",
+        "956118042": "",
+        "474373214": "",
+        "-1687161828": "Copy name of selected sample to clipboard.",
+        "1728033821": "Set in how many seconds the weather change is to be applied when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "-1518723554": "Select which Cfg folder or file you'd like to expand or open.",
+        "1103406623": "Toggle display of sickness agents. Adjust/toggle them with mouse cursor accessed wit LCtrl+9.",
+        "1192267296": "Text Text",
+        "1251441442": "Toggle display of character and environment temperature information.",
+        "-1253779744": "Set current date (day).",
+        "1501371172": "",
+        "-415538395": "",
+        "-2109211354": "Input script commands.",
+        "-140039896": "Spawn multiple of currently selected item in rectangle shape on ground.",
+        "-1202987991": "",
+        "-1272174379": "Toggle whether model of selected item is shown in this window.",
+        "-1870929874": "Set quantity (or amount of contents or internal energy) of item before spawning it. 0 - no quantity, 1 - full quantity.",
+        "957070895": "Toggle to only display items of given group.",
+        "1603231024": "Toggle to display only items of this group.",
+        "-1510880489": "",
+        "-713944167": "Spawn selected item in character's hands if they are free.",
+        "1645635891": "",
+        "-926453058": "Toggle to display only items of this group.",
+        "1946388278": "Change current time by dragging the bar.",
+        "1721471763": "Toggle to display only items of this group.",
+        "-880396485": "Change order of listed items (ASVAL > HandSaw or HandSaw > ASVAL)",
+        "-1676706756": "Set number of selected item to spawn in rectangle shape.",
+        "-1461226780": "Set horizontal distance between items spawned in rectangle.",
+        "1032024897": "Distance (in m) between character location and where the cursor is pointing on the map.",
+        "1978778377": "Set in how many seconds the weather change is to be applied when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "1220773699": "Teleport character to current coordinates. XYZ row takes precedence if all are filled.",
+        "2034500375": "Copy all current values to clipboard.",
+        "-1134570680": "Set current date (month).",
+        "838830156": "Toggle to display only items of this group.",
+        "356423951": "Set current date (year).",
+        "1602614383": "Set Value for given weather parameter (0 - no clouds/rain/fog, 1 - max). Hold RMB and LMB to adjust values for all at once and automatically apply them.",
+        "-846199983": "Set sliders to values saved in clipboard by using \"Copy\" button.",
+        "810620243": "",
+        "-1754572201": "Set X coordinate for teleportation.",
+        "394215512": "Set for how long the newly set weather will last in seconds when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "-1667685287": "",
+        "-1035546020": "",
+        "1127520350": "Remove created marks.",
+        "-1942116257": "Display vertical red lines at positions of selected object.",
+        "1900960787": "",
+        "-532831285": "Toggle whether preset items will overwrite current gear (ON) or not (OFF) when spawned in inventory.",
+        "-1138959773": "Play selected sample.",
+        "1071420364": "Clear currently displayed prints above.",
+        "1568620390": "Toggle which Cfg folders you'd like to display below.",
+        "-204342681": "Set Value for given weather parameter (0 - no clouds/rain/fog, 1 - max). Hold RMB and LMB to adjust values for all at once and automatically apply them.",
+        "74429288": "Toggle to display only items of this group.",
+        "2035503977": "",
+        "-958005142": "Play selected sample in a loop.",
+        "522681359": "",
+        "-154427780": "Set current time (HH:MM).",
+        "-1808856209": "Display all available actions for currently selected item.",
+        "-682218895": "",
+        "-1603829646": "Toggle display of executable and scripts versions.",
+        "1147728663": "",
+        "1845530998": "Set for how long the newly set weather will last in seconds when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "-1676884696": "Click on a sample to select it.",
+        "1560972410": "Set distance (in m) at which the object will spawn from selected spawn point.",
+        "-1991846276": "Toggle display of non-standard items. Avoid using this.",
+        "-530858371": "",
+        "1284982144": "Toggle display of current values of HeatComfort, Tremor, Wet, Energy, Water, Diet, Stamina, Specialty, BlodType, Toxicity, HeatBuffer, (naS)Immunity and (NaS)BrokenLegs.",
+        "719387520": "",
+        "-1909562494": "Insert text to search for selected sound samples.",
+        "483271299": "Set Value for given weather parameter (0 - no clouds/rain/fog, 1 - max). Hold RMB and LMB to adjust values for all at once and automatically apply them.",
+        "2118108033": "Add new preset location to teleport to.",
+        "-43811451": "Toggle to display only items of this group.",
+        "1092731813": "Toggle cursor in free camera (accessed with Home button).",
+        "-1695661183": "Set vertical distance between items spawned in rectangle.",
+        "-2138518253": "Spawn Special will spawn the item with attachments, e.g. complete car or weapon with magazine and optics.",
+        "1648767369": "",
+        "-1998526418": "Toggle to only display items of given group.",
+        "-145473140": "",
+        "818197039": "",
+        "-1690574705": "Create new gear preset. Add items by selecting them on the left side and clicking >> on the right.",
+        "1503709840": "Set current time (HH:MM).",
+        "-1809094665": "Toggle to display only items of this group.",
+        "952377237": "",
+        "-2050600298": "Set X, Y, Z coordinates for teleportation. Doubleclick clears the field.",
+        "99191960": "Click to place Pos marker. Doubleclick to teleport. Zoom with mousewheel. Drag by holding down RMB.",
+        "-1822479463": "Spawn selected item at cursor location.",
+        "1793923379": "Click on item that is part of selected preset to be able to spawn it independently.",
+        "-897245409": "",
+        "1439738784": "Text Text",
+        "-461088863": "",
+        "1163341963": "",
+        "-1280622026": "",
+        "-1506294364": "Click on item to select it and be able to spawn it.",
+        "1337846693": "Set Value for given weather parameter (0 - no clouds/rain/fog, 1 - max). Hold RMB and LMB to adjust values for all at once and automatically apply them.",
+        "1964188584": "Toggle display of current Immunity, Blood, Health, Energy and Water levels.",
+        "179964842": "Set how many columns of given item will be spawned.",
+        "609446542": "",
+        "-187054675": "Spawn selected item on ground at current location.",
+        "-454700913": "",
+        "-1813365845": "Reset \"Target Time\" and \"Duration\" sliders to default.",
+        "415249808": "",
+        "808583227": "Displays items in vicinity and allows you to select one with LMB.",
+        "-1388139290": "",
+        "-297078348": "",
+        "-1639824201": "",
+        "118816952": "Set current time (HH:MM).",
+        "1395927373": "Display details (parameters, states) of selected item on screen. Close the display with LCtrl+NumDel.",
+        "1937597885": "",
+        "1114139070": "Set radius (in m) at which selected item is affected by Mark Them In World.",
+        "-1400834881": "Toggle display of character modifiers (states and diseases). Adjust them with cursor accessed with LCtrl+9.",
+        "-1538327821": "Set Value for given weather parameter (0 - no clouds/rain/fog, 1 - max). Hold RMB and LMB to adjust values for all at once and automatically apply them.",
+        "559110851": "",
+        "-1756742460": "Set how many rows of selected item will be spawned.",
+        "1048985543": "Toggle whether scripts.log is being generated.",
+        "980825486": "Set health of item before spawning it (0 - RUINED, 1 - PRISTINE).",
+        "-1685056104": "Toggle display of stomach contents of current character.",
+        "-553596725": "Spawn selected item in inventory, if space is available.",
+        "583762636": "",
+        "-309955634": "Set currently selected preset as default. Avoid using this as it leads to an assert.",
+        "-1300817713": "Stop playing selected sample.",
+        "-1725969712": "Log currently selected parameter in script.log.",
+        "1062495443": "Set in how many seconds the weather change is to be applied when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "1782793173": "",
+        "1674622165": "Execute current script command.",
+        "-534593577": "Input desired text to filter objects displayed below.",
+        "-2018753208": "Toggle which Cfg folders you'd like to display below.",
+        "-1690853926": "Toggle to display only items of this group.",
+        "-927781": "",
+        "-767715875": "Displays output of ran script commands.",
+        "1308118751": "Set the \"Value\" sliders to reflect current weather.",
+        "-1989414688": "Toggle display of current coordinates and contents of clipboard.",
+        "-546292832": "Toggle to display only items of this group.",
+        "-1480158432": "",
+        "-808212319": "Toggle to display only items of this group.",
+        "186781669": "Coordinates of where the cursor is pointing on the map.",
+        "1434793702": "Click to copy current Pos coordinates to clipboard.",
+        "1612320230": "",
+        "-1078487576": "Set for how long the newly set weather will last in seconds when confirmed with \"APPLY\". Hold RMB and LMB to adjust values for all three at once and automatically apply them.",
+        "-569113440": "",
+        "2025665224": "",
+        "-552641096": "",
+        "-441110290": "Remove previously created preset position.",
+        "2113763824": "Toggle display of scriptExt.log output.",
+        "-1311957517": "",
+        "-1835578635": "",
+        "-587001353": "Clear outputs field.",
+        "1840024830": "",
+        "787439097": "Copy name of currently selected item to clipboard.",
+        "-573218053": "",
+        "-897661700": "",
+        "2115342845": "Current Pos marker coordinates (same as character coordinates when console is opened).",
+        "2050317772": "Insert text to search only for specific Cfg folders and files.",
+        "1240759449": "Spawn selected item in inventory of object currently being aimed at."
+    }
+}
\ No newline at end of file
diff --git a/scripts/data/news_feed.txt b/scripts/data/news_feed.txt
new file mode 100644
index 0000000000000000000000000000000000000000..be76172b672abaf17b31cd1195d61fceca4eb451
--- /dev/null
+++ b/scripts/data/news_feed.txt
@@ -0,0 +1,27 @@
+<h scale="0.8">
+<image set="dayz_gui" name="icon_pin" />  Welcome to the DayZ 0.63 Stress Test Branch! 
+</h>
+<h scale="0.6">
+This branch serves for time-limited development tests that are open to the community. Our goal in each of these tests is to gather performance and stability data from servers under heavy load.
+</h>
+</br>
+<h scale="0.8">
+<image set="dayz_gui" name="icon_pin" />  Stress test Schedule 
+</h>
+<h scale="0.6">
+We'll only run the Stress Tests when our development team needs data and/or specific feedback. Stress Tests will be announced on our Twitter and Forums, and will usually run for a couple of hours.
+</h>
+</br>
+<h scale="0.8">
+<image set="dayz_gui" name="icon_pin" />  Current Stress Test
+</h>
+<h scale="0.6">
+In the first bunch of Stress Tests, we'll mostly focus on watching server performance under heavy PvP gameplay load. For detailed information about an ongoing Stress Test (inlcuding known issues), please visit dayz.com/dev-hub 
+</h>
+</br>
+<h scale="0.8">
+<image set="dayz_gui" name="icon_pin" />  Important Note
+</h>
+<h scale="0.6">
+Stress Tests do not represent a typical DayZ 0.63 gameplay experience. Spawn points, starting gear, loot, and also the available feature set are all modified for the purpose of specific test cases.
+</h>
\ No newline at end of file
diff --git a/scripts/data/notifications.json b/scripts/data/notifications.json
new file mode 100644
index 0000000000000000000000000000000000000000..391352c8200a09fc28dbfbe04546df090341a08c
--- /dev/null
+++ b/scripts/data/notifications.json
@@ -0,0 +1,32 @@
+{
+    "0": {
+        "m_Icon": "set:dayz_gui image:notification_friend",
+        "m_TitleText": "#ps4_invite_friend_connected",
+        "m_DescriptionText": ""
+    },
+    "1": {
+        "m_Icon": "set:dayz_gui image:notification_friend",
+        "m_TitleText": "#ps4_invitation_failed",
+        "m_DescriptionText": ""
+    },
+    "2": {
+        "m_Icon": "",
+        "m_TitleText": "#str_xbox_join_fail_title",
+        "m_DescriptionText": "#str_xbox_join_fail"
+    },
+    "3": {
+        "m_Icon": "",
+        "m_TitleText": "#server_browser_connecting_failed",
+        "m_DescriptionText": "#server_browser_error_unknown"
+    },
+    "4": {
+        "m_Icon": "",
+        "m_TitleText": "#options_game_connectivity_disconnect",
+        "m_DescriptionText": "#STR_MP_SESSION_LOST"
+    },
+    "5": {
+        "m_Icon": "",
+        "m_TitleText": "#server_browser_error_unknown",
+        "m_DescriptionText": ""
+    }
+}
\ No newline at end of file
diff --git a/scripts/editor/Workbench/DayZ/BlameTool.c b/scripts/editor/Workbench/DayZ/BlameTool.c
new file mode 100644
index 0000000000000000000000000000000000000000..b5f1c472dfa6cc7f7304b3dcdbcd041a18fe0318
--- /dev/null
+++ b/scripts/editor/Workbench/DayZ/BlameTool.c
@@ -0,0 +1,33 @@
+[WorkbenchPluginAttribute("SVN Blame", "Just for testing", "ctrl+b", "", {"ScriptEditor"})]
+class SVNBlamePlugin: WorkbenchPlugin
+{
+	[Attribute("TortoiseProc /command:blame /path:$path /startrev:1 /endrev:\"HEAD\" /ignoreeol /ignoreallspaces /line:$line", "editbox")]
+	string CommandLine;
+	
+	override void Run()
+	{
+		ScriptEditor mod = Workbench.GetModule("ScriptEditor");
+		if (mod)
+		{
+			string file;
+			string absPath;
+			if (mod.GetCurrentFile(file) && Workbench.GetAbsolutePath(file, absPath))
+			{
+				int line = mod.GetCurrentLine();
+				string command = CommandLine;
+				command.Replace("$path", absPath);
+				command.Replace("$line", (line + 1).ToString());
+				Workbench.RunCmd(command);
+			}
+		}
+	}
+	
+	override void Configure()
+	{
+		Workbench.ScriptDialog("Configure SVN Blame", "Usage: \n$path - will be replaced with file name\n$line - will be replaced with current line number", this);
+	}
+	
+	[ButtonAttribute("OK")]
+	void OkButton() {}
+}
+
diff --git a/scripts/editor/Workbench/DayZ/CheckLocTool.c b/scripts/editor/Workbench/DayZ/CheckLocTool.c
new file mode 100644
index 0000000000000000000000000000000000000000..a466ead82a000da53dda906226f863d66e784d39
--- /dev/null
+++ b/scripts/editor/Workbench/DayZ/CheckLocTool.c
@@ -0,0 +1,61 @@
+[WorkbenchPluginAttribute("Check localisation in UI", "Find non localised text in UI", "ctrl+l", "", {"ResourceManager"})]
+class CheckLocalisationPlugin: WorkbenchPlugin
+{
+	ref array<string> m_results = new array<string>;
+	WBModuleDef m_module;
+	
+	void FindTexts(WidgetSource src)
+	{
+		if (src)
+		{
+			int idx = src.VarIndex("text");
+			
+			if (idx != -1)
+			{
+				string text;
+				if (src.Get(idx, text) && !text.Contains("#"))
+				{
+					m_results.Insert("Text = \"" + text + "\" in Widget: " + src.GetName());
+				}
+			}
+			
+			FindTexts(src.GetChildren());
+			FindTexts(src.GetSibling());
+		}
+	}
+	
+	void CheckTextIDs(string file)
+	{
+		m_module.SetOpenedResource(file);	
+		WidgetSource cont = m_module.GetContainer();
+		int lastIndex = m_results.Count();
+		FindTexts(cont);
+		if (lastIndex != m_results.Count())
+		{
+			m_results.InsertAt(file + ":", lastIndex);
+			m_results.Insert("");
+		}
+	}
+	
+	override void Run()
+	{
+		m_module = Workbench.GetModule("ResourceManager");
+		Workbench.SearchResources(".layout", CheckTextIDs);
+		
+		if (m_results.Count())
+		{
+			string res;
+			foreach(string file: m_results)
+			{
+				res += file;
+				res += "\n";
+			}
+		}
+		else
+		{
+			res = "All texts are localised.";
+		}
+
+		Workbench.Dialog("Results", res);
+	}
+};
\ No newline at end of file
diff --git a/scripts/editor/Workbench/DayZ/DiffTool.c b/scripts/editor/Workbench/DayZ/DiffTool.c
new file mode 100644
index 0000000000000000000000000000000000000000..638761006dbedb3e9017c1b55bcc86656a09bcae
--- /dev/null
+++ b/scripts/editor/Workbench/DayZ/DiffTool.c
@@ -0,0 +1,33 @@
+[WorkbenchPluginAttribute("SVN Diff", "Just for testing", "ctrl+`", "", {"ScriptEditor"})]
+class SVNDiffPlugin: WorkbenchPlugin
+{
+	[Attribute("TortoiseProc /command:diff /path:$path", "editbox")]
+	string CommandLine;
+	
+	override void Run()
+	{
+		ScriptEditor mod = Workbench.GetModule("ScriptEditor");
+		if (mod)
+		{
+			string file;
+			string absPath;
+			if (mod.GetCurrentFile(file) && Workbench.GetAbsolutePath(file, absPath))
+			{
+				string command = CommandLine;
+				command.Replace("$path", absPath);
+				Workbench.RunCmd(command);
+				Print( command );
+				Print( absPath );
+			}
+		}
+	}
+	
+	override void Configure()
+	{
+		Workbench.ScriptDialog("Configure SVN Diff", "Usage: \n$path - will be replaced with file name", this);
+	}
+	
+	[ButtonAttribute("OK")]
+	void OkButton() {}
+}
+
diff --git a/scripts/editor/Workbench/DayZ/OpenDir.c b/scripts/editor/Workbench/DayZ/OpenDir.c
new file mode 100644
index 0000000000000000000000000000000000000000..969ef249fe8d1bf5cfedd9f58e530e311aae023f
--- /dev/null
+++ b/scripts/editor/Workbench/DayZ/OpenDir.c
@@ -0,0 +1,53 @@
+[WorkbenchPluginAttribute("Open Dir", "Just for testing", "ctrl+-", "", {"ScriptEditor"})]
+class OpenDirPlugin: WorkbenchPlugin
+{
+	override void Run()
+	{
+		ScriptEditor mod = Workbench.GetModule("ScriptEditor");
+		if (mod)
+		{
+			string file;
+			string absPath;
+			if (mod.GetCurrentFile(file) && Workbench.GetAbsolutePath(file, absPath))
+			{
+				if (absPath.Length() < 2) return;
+				
+				absPath.Replace("\\", "/");
+				
+				if (absPath[1] != ":")
+				{
+					string cwd;
+					Workbench.GetCwd(cwd);
+					absPath = cwd + "/" + absPath;
+				}
+				
+				int index = absPath.IndexOf("/");
+				int last_index = index;
+				
+				while(index != -1)
+				{
+					last_index = index;
+					index = absPath.IndexOfFrom(last_index + 1, "/");
+				}
+				
+				if (last_index == -1) return;
+				
+				string path = absPath.Substring(0, last_index);
+				string command;
+				command.Replace("$path", path);
+				//Print(path);
+				//Workbench.RunCmd(command);
+				Workbench.RunCmd("cmd /c \"start " + path +"\"");
+			}
+		}
+	}
+	
+	override void Configure()
+	{
+		Workbench.ScriptDialog("Configure OpenDir", "Usage: \n$path - will be replaced with file name", this);
+	}
+	
+	[ButtonAttribute("OK")]
+	void OkButton() {}
+}
+
diff --git a/scripts/editor/Workbench/DayZ/ResaveTool.c b/scripts/editor/Workbench/DayZ/ResaveTool.c
new file mode 100644
index 0000000000000000000000000000000000000000..c069119e89dcee1b3496e09e5b5aa184a8632690
--- /dev/null
+++ b/scripts/editor/Workbench/DayZ/ResaveTool.c
@@ -0,0 +1,48 @@
+[WorkbenchPluginAttribute("Re-Save Tool", "Saves all files with given extension", "", "", {"ResourceManager"})]
+class ResavePlugin: WorkbenchPlugin
+{
+	[Attribute(".layout", "editbox", "File extension" )]
+	string Extension;
+	WBModuleDef m_module;
+	
+	void Resave(string file)
+	{
+		Print("Resaving: " + file);
+		m_module.SetOpenedResource(file);	
+		m_module.Save();
+	}
+	
+	override void Run()
+	{
+		if (Workbench.ScriptDialog("Resave", "Which files you want to resave?", this))
+		{
+			m_module = Workbench.GetModule("ResourceManager");
+			Workbench.SearchResources(Extension, Resave);
+		}
+	}
+	
+	override void RunCommandline() 
+	{
+		m_module = Workbench.GetModule("ResourceManager");
+		
+		if (m_module.GetCmdLine("-extension", Extension))
+		{
+			Extension.Replace("\"", "");
+		}
+		
+		Workbench.SearchResources(Extension, Resave);
+		Workbench.GetModule("ResourceManager").Close();
+	}
+	
+	[ButtonAttribute("Re-Save")]
+	bool OK()
+	{
+		return true;
+	}
+	
+	[ButtonAttribute("Cancel")]
+	bool Cancel()
+	{
+		return false;
+	}
+};
\ No newline at end of file
diff --git a/scripts/editor/Workbench/DayZ/ShowLog.c b/scripts/editor/Workbench/DayZ/ShowLog.c
new file mode 100644
index 0000000000000000000000000000000000000000..8d5e7321891ff324d303e27b92892704a46210d0
--- /dev/null
+++ b/scripts/editor/Workbench/DayZ/ShowLog.c
@@ -0,0 +1,33 @@
+[WorkbenchPluginAttribute("SVN ShowLog", "Just for testing", "ctrl+=", "", {"ScriptEditor"})]
+class SVNShowLogPlugin: WorkbenchPlugin
+{
+	[Attribute("TortoiseProc /command:log /path:$path", "editbox")]
+	string CommandLine;
+	
+	override void Run()
+	{
+		ScriptEditor mod = Workbench.GetModule("ScriptEditor");
+		if (mod)
+		{
+			string file;
+			string absPath;
+			if (mod.GetCurrentFile(file) && Workbench.GetAbsolutePath(file, absPath))
+			{
+				string command = CommandLine;
+				command.Replace("$path", absPath);
+				Workbench.RunCmd(command);
+				//Print( command );
+				//Print( absPath );
+			}
+		}
+	}
+	
+	override void Configure()
+	{
+		Workbench.ScriptDialog("Configure SVN ShowLog", "Usage: \n$path - will be replaced with file name", this);
+	}
+	
+	[ButtonAttribute("OK")]
+	void OkButton() {}
+}
+
diff --git a/scripts/editor/plugins/DayZ/DayZTools.c b/scripts/editor/plugins/DayZ/DayZTools.c
new file mode 100644
index 0000000000000000000000000000000000000000..b20be1abc052ec37bc51d8a8adf683ee21051918
--- /dev/null
+++ b/scripts/editor/plugins/DayZ/DayZTools.c
@@ -0,0 +1,89 @@
+class DayZTool: WorkbenchPlugin
+{
+	void RunDayZBat(string filepath, bool wait = false)
+	{
+		if (filepath.Length() < 2) return;
+		
+		filepath.Replace("\\", "/");
+		
+		if (filepath[1] != ":")
+		{
+			string cwd;
+			Workbench.GetCwd(cwd);
+			filepath = cwd + "/" + filepath;
+		}
+		
+		int index = filepath.IndexOf("/");
+		int last_index = index;
+		
+		while(index != -1)
+		{
+			last_index = index;
+			index = filepath.IndexOfFrom(last_index + 1, "/");
+		}
+		
+		if (last_index == -1) return;
+		
+		string path = filepath.Substring(0, last_index);
+		string bat = filepath.Substring(last_index + 1, filepath.Length() - last_index - 1);
+		/*Print(filepath);
+		Print(path);
+		Print(bat);*/
+		Workbench.RunCmd("cmd /c \"cd " + path + " & call " + bat + "\"", wait);
+	}
+	
+	override void Configure() 
+	{
+		Workbench.ScriptDialog("Mission directory","", this);
+	}
+	
+	[ButtonAttribute("OK")]
+	void DialogOk()
+	{
+	}
+};
+
+[WorkbenchPluginAttribute("DayZ Restart", "Just for testing", "ctrl+1", "", {"ScriptEditor"})]
+class RestartDayzTool: DayZTool
+{
+	[Attribute("day_z_data_missions/killDayZ.bat", "fileeditbox", "Path to missions dir", "")]
+	string KillBatPath;
+	
+	[Attribute("day_z_data_missions/_default_single/default_SampleMap3_Empty.bat", "fileeditbox", "Path to missions dir", "")]
+	string MissionBatPath;
+	
+	override void Run()
+	{
+		RunDayZBat(KillBatPath, true);
+		RunDayZBat(MissionBatPath);
+	}
+}
+
+[WorkbenchPluginAttribute("DayZ Run", "Just for testing", "ctrl+2", "", {"ScriptEditor"})]
+class RunDayzTool: DayZTool
+{
+	[Attribute("day_z_data_missions/_default_single/default_SampleMap3_Empty.bat", "fileeditbox", "Path to missions dir", "")]
+	string MissionBatPath;
+	
+	override void Run()
+	{
+		RunDayZBat(MissionBatPath);
+	}
+}
+
+[WorkbenchPluginAttribute("DayZ Kill", "Just for testing", "ctrl+3", "", {"ScriptEditor"})]
+class KillDayzTool: DayZTool
+{
+	[Attribute("day_z_data_missions/killDayZ.bat", "fileeditbox", "Path to missions dir", "")]
+	string KillBatPath;
+	
+	override void Run()
+	{
+		RunDayZBat(KillBatPath);
+	}
+}
+
+
+
+
+
diff --git a/scripts/editor/workbench-dark.qss b/scripts/editor/workbench-dark.qss
new file mode 100644
index 0000000000000000000000000000000000000000..fa922e88730f42e74ab78aff2f513d83a59be096
--- /dev/null
+++ b/scripts/editor/workbench-dark.qss
@@ -0,0 +1,1230 @@
+/*
+ * The MIT License (MIT)
+ *
+ * Copyright (c) <2013-2014> <Colin Duquesnoy>
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+QProgressBar:horizontal {
+    border: 1px solid #3A3939;
+    text-align: center;
+    padding: 1px;
+    background: #201F1F;
+}
+QProgressBar::chunk:horizontal {
+    background-color: qlineargradient(spread:reflect, x1:1, y1:0.545, x2:1, y2:0, stop:0 rgba(28, 66, 111, 255), stop:1 rgba(37, 87, 146, 255));
+}
+
+QToolTip
+{
+    border: 1px solid #3A3939;
+    background-color: rgb(90, 102, 117);;
+    color: white;
+    padding: 1px;
+    opacity: 200;
+}
+
+QWidget
+{
+    color: silver;
+    background-color: #302F2F;
+    selection-background-color:#3d8ec9;
+    selection-color: black;
+    background-clip: border;
+    border-image: none;
+    outline: 0;
+}
+
+QWidget:item:hover
+{
+    background-color: #78879b;
+    color: black;
+}
+
+QWidget:item:selected
+{
+    background-color: #3d8ec9;
+}
+
+QCheckBox
+{
+    spacing: 5px;
+    outline: none;
+    color: #bbb;
+    margin-bottom: 2px;
+}
+
+QCheckBox:disabled
+{
+    color: #777777;
+}
+QCheckBox::indicator,
+QGroupBox::indicator
+{
+    width: 18px;
+    height: 18px;
+}
+QGroupBox::indicator
+{
+    margin-left: 2px;
+}
+
+QCheckBox::indicator:unchecked,
+QCheckBox::indicator:unchecked:hover,
+QGroupBox::indicator:unchecked,
+QGroupBox::indicator:unchecked:hover
+{
+    image: url(:/qss_icons/rc/checkbox_unchecked.png);
+}
+
+QCheckBox::indicator:unchecked:focus,
+QCheckBox::indicator:unchecked:pressed,
+QGroupBox::indicator:unchecked:focus,
+QGroupBox::indicator:unchecked:pressed
+{
+  border: none;
+    image: url(:/qss_icons/rc/checkbox_unchecked_focus.png);
+}
+
+QCheckBox::indicator:checked,
+QCheckBox::indicator:checked:hover,
+QGroupBox::indicator:checked,
+QGroupBox::indicator:checked:hover
+{
+    image: url(:/qss_icons/rc/checkbox_checked.png);
+}
+
+QCheckBox::indicator:checked:focus,
+QCheckBox::indicator:checked:pressed,
+QGroupBox::indicator:checked:focus,
+QGroupBox::indicator:checked:pressed
+{
+  border: none;
+    image: url(:/qss_icons/rc/checkbox_checked_focus.png);
+}
+
+QCheckBox::indicator:indeterminate,
+QCheckBox::indicator:indeterminate:hover,
+QCheckBox::indicator:indeterminate:pressed
+QGroupBox::indicator:indeterminate,
+QGroupBox::indicator:indeterminate:hover,
+QGroupBox::indicator:indeterminate:pressed
+{
+    image: url(:/qss_icons/rc/checkbox_indeterminate.png);
+}
+
+QCheckBox::indicator:indeterminate:focus,
+QGroupBox::indicator:indeterminate:focus
+{
+    image: url(:/qss_icons/rc/checkbox_indeterminate_focus.png);
+}
+
+QCheckBox::indicator:checked:disabled,
+QGroupBox::indicator:checked:disabled
+{
+    image: url(:/qss_icons/rc/checkbox_checked_disabled.png);
+}
+
+QCheckBox::indicator:unchecked:disabled,
+QGroupBox::indicator:unchecked:disabled
+{
+    image: url(:/qss_icons/rc/checkbox_unchecked_disabled.png);
+}
+
+QRadioButton
+{
+    spacing: 5px;
+    outline: none;
+    color: #bbb;
+    margin-bottom: 2px;
+}
+
+QRadioButton:disabled
+{
+    color: #777777;
+}
+QRadioButton::indicator
+{
+    width: 21px;
+    height: 21px;
+}
+
+QRadioButton::indicator:unchecked,
+QRadioButton::indicator:unchecked:hover
+{
+    image: url(:/qss_icons/rc/radio_unchecked.png);
+}
+
+QRadioButton::indicator:unchecked:focus,
+QRadioButton::indicator:unchecked:pressed
+{
+  border: none;
+  outline: none;
+    image: url(:/qss_icons/rc/radio_unchecked_focus.png);
+}
+
+QRadioButton::indicator:checked,
+QRadioButton::indicator:checked:hover
+{
+  border: none;
+  outline: none;
+    image: url(:/qss_icons/rc/radio_checked.png);
+}
+
+QRadioButton::indicator:checked:focus,
+QRadioButton::indicato::menu-arrowr:checked:pressed
+{
+  border: none;
+  outline: none;
+    image: url(:/qss_icons/rc/radio_checked_focus.png);
+}
+
+QRadioButton::indicator:indeterminate,
+QRadioButton::indicator:indeterminate:hover,
+QRadioButton::indicator:indeterminate:pressed
+{
+        image: url(:/qss_icons/rc/radio_indeterminate.png);
+}
+
+QRadioButton::indicator:checked:disabled
+{
+  outline: none;
+  image: url(:/qss_icons/rc/radio_checked_disabled.png);
+}
+
+QRadioButton::indicator:unchecked:disabled
+{
+    image: url(:/qss_icons/rc/radio_unchecked_disabled.png);
+}
+
+
+QMenuBar
+{
+    background-color: #302F2F;
+    color: silver;
+}
+
+QMenuBar::item
+{
+    background: transparent;
+}
+
+QMenuBar::item:selected
+{
+    background: transparent;
+    border: 1px solid #3A3939;
+}
+
+QMenuBar::item:pressed
+{
+    border: 1px solid #3A3939;
+    background-color: #3d8ec9;
+    color: black;
+    margin-bottom:-1px;
+    padding-bottom:1px;
+}
+
+QMenu
+{
+    border: 1px solid #3A3939;
+    color: silver;
+    margin: 2px;
+}
+
+QMenu::icon
+{
+    margin: 5px;
+}
+
+QMenu::item
+{
+    padding: 5px 30px 5px 30px;
+    margin-left: 5px;
+    border: 1px solid transparent; /* reserve space for selection border */
+}
+
+QMenu::item:selected
+{
+    color: black;
+}
+
+QMenu::separator {
+    height: 2px;
+    background: lightblue;
+    margin-left: 10px;
+    margin-right: 5px;
+}
+
+QMenu::indicator {
+    width: 18px;
+    height: 18px;
+}
+
+/* non-exclusive indicator = check box style indicator
+   (see QActionGroup::setExclusive) */
+QMenu::indicator:non-exclusive:unchecked {
+    image: url(:/qss_icons/rc/checkbox_unchecked.png);
+}
+
+QMenu::indicator:non-exclusive:unchecked:selected {
+    image: url(:/qss_icons/rc/checkbox_unchecked_disabled.png);
+}
+
+QMenu::indicator:non-exclusive:checked {
+    image: url(:/qss_icons/rc/checkbox_checked.png);
+}
+
+QMenu::indicator:non-exclusive:checked:selected {
+    image: url(:/qss_icons/rc/checkbox_checked_disabled.png);
+}
+
+/* exclusive indicator = radio button style indicator (see QActionGroup::setExclusive) */
+QMenu::indicator:exclusive:unchecked {
+    image: url(:/qss_icons/rc/radio_unchecked.png);
+}
+
+QMenu::indicator:exclusive:unchecked:selected {
+    image: url(:/qss_icons/rc/radio_unchecked_disabled.png);
+}
+
+QMenu::indicator:exclusive:checked {
+    image: url(:/qss_icons/rc/radio_checked.png);
+}
+
+QMenu::indicator:exclusive:checked:selected {
+    image: url(:/qss_icons/rc/radio_checked_disabled.png);
+}
+
+QMenu::right-arrow {
+    margin: 5px;
+    image: url(:/qss_icons/rc/right_arrow.png)
+}
+
+
+QWidget:disabled
+{
+    color: #404040;
+    background-color: #302F2F;
+}
+
+QAbstractItemView
+{
+    alternate-background-color: #3A3939;
+    color: silver;
+    border: 1px solid 3A3939;
+    border-radius: 2px;
+    padding: 1px;
+}
+
+QWidget:focus, QMenuBar:focus
+{
+    border: 1px solid #78879b;
+}
+
+QTabWidget:focus, QCheckBox:focus, QRadioButton:focus, QSlider:focus
+{
+    border: none;
+}
+
+QLineEdit
+{
+    background-color: #201F1F;
+    padding: 2px;
+    border-style: solid;
+    border: 1px solid #3A3939;
+    border-radius: 2px;
+    color: silver;
+}
+
+QGroupBox {
+    border:1px solid #3A3939;
+    border-radius: 2px;
+    margin-top: 20px;
+}
+
+QGroupBox::title {
+    subcontrol-origin: margin;
+    subcontrol-position: top center;
+    padding-left: 10px;
+    padding-right: 10px;
+    padding-top: 10px;
+}
+
+QAbstractScrollArea
+{
+    border-radius: 2px;
+    border: 1px solid #3A3939;
+    background-color: transparent;
+}
+
+QScrollBar:horizontal
+{
+    height: 15px;
+    margin: 3px 15px 3px 15px;
+    border: 1px transparent #2A2929;
+    border-radius: 4px;
+    background-color: #2A2929;
+}
+
+QScrollBar::handle:horizontal
+{
+    background-color: #605F5F;
+    min-width: 5px;
+    border-radius: 4px;
+}
+
+QScrollBar::add-line:horizontal
+{
+    margin: 0px 3px 0px 3px;
+    border-image: url(:/qss_icons/rc/right_arrow_disabled.png);
+    width: 10px;
+    height: 10px;
+    subcontrol-position: right;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:horizontal
+{
+    margin: 0px 3px 0px 3px;
+    border-image: url(:/qss_icons/rc/left_arrow_disabled.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: left;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:horizontal:hover,QScrollBar::add-line:horizontal:on
+{
+    border-image: url(:/qss_icons/rc/right_arrow.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: right;
+    subcontrol-origin: margin;
+}
+
+
+QScrollBar::sub-line:horizontal:hover, QScrollBar::sub-line:horizontal:on
+{
+    border-image: url(:/qss_icons/rc/left_arrow.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: left;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::up-arrow:horizontal, QScrollBar::down-arrow:horizontal
+{
+    background: none;
+}
+
+
+QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal
+{
+    background: none;
+}
+
+QScrollBar:vertical
+{
+    background-color: #2A2929;
+    width: 15px;
+    margin: 15px 3px 15px 3px;
+    border: 1px transparent #2A2929;
+    border-radius: 4px;
+}
+
+QScrollBar::handle:vertical
+{
+    background-color: #605F5F;
+    min-height: 5px;
+    border-radius: 4px;
+}
+
+QScrollBar::sub-line:vertical
+{
+    margin: 3px 0px 3px 0px;
+    border-image: url(:/qss_icons/rc/up_arrow_disabled.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: top;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::add-line:vertical
+{
+    margin: 3px 0px 3px 0px;
+    border-image: url(:/qss_icons/rc/down_arrow_disabled.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: bottom;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::sub-line:vertical:hover,QScrollBar::sub-line:vertical:on
+{
+
+    border-image: url(:/qss_icons/rc/up_arrow.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: top;
+    subcontrol-origin: margin;
+}
+
+
+QScrollBar::add-line:vertical:hover, QScrollBar::add-line:vertical:on
+{
+    border-image: url(:/qss_icons/rc/down_arrow.png);
+    height: 10px;
+    width: 10px;
+    subcontrol-position: bottom;
+    subcontrol-origin: margin;
+}
+
+QScrollBar::up-arrow:vertical, QScrollBar::down-arrow:vertical
+{
+    background: none;
+}
+
+
+QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical
+{
+    background: none;
+}
+
+QTextEdit
+{
+    background-color: #201F1F;
+    color: silver;
+    border: 1px solid #3A3939;
+}
+
+QPlainTextEdit
+{
+    background-color: #201F1F;;
+    color: silver;
+    border-radius: 2px;
+    border: 1px solid #3A3939;
+}
+
+QHeaderView::section
+{
+    background-color: #3A3939;
+    color: silver;
+    padding-left: 4px;
+    border: 1px solid #6c6c6c;
+}
+
+QSizeGrip {
+    image: url(:/qss_icons/rc/sizegrip.png);
+    width: 12px;
+    height: 12px;
+}
+
+
+QMainWindow::separator
+{
+    background-color: #302F2F;
+    color: white;
+    padding-left: 4px;
+    spacing: 2px;
+    border: 1px dashed #3A3939;
+}
+
+QMainWindow::separator:hover
+{
+
+    background-color: #787876;
+    color: white;
+    padding-left: 4px;
+    border: 1px solid #3A3939;
+    spacing: 2px;
+}
+
+
+QMenu::separator
+{
+    height: 1px;
+    background-color: #3A3939;
+    color: white;
+    padding-left: 4px;
+    margin-left: 10px;
+    margin-right: 5px;
+}
+
+
+QFrame
+{
+    border-radius: 2px;
+    border: 1px solid #444;
+}
+
+QFrame[frameShape="0"]
+{
+    border-radius: 2px;
+    border: 1px transparent #444;
+}
+
+QStackedWidget
+{
+    border: 1px transparent black;
+}
+
+QToolBar {
+    border: 1px transparent #393838;
+    background: 1px solid #302F2F;
+    font-weight: bold;
+}
+
+QToolBar::handle:horizontal {
+    image: url(:/qss_icons/rc/Hmovetoolbar.png);
+}
+QToolBar::handle:vertical {
+    image: url(:/qss_icons/rc/Vmovetoolbar.png);
+}
+QToolBar::separator:horizontal {
+    image: url(:/qss_icons/rc/Hsepartoolbar.png);
+}
+QToolBar::separator:vertical {
+    image: url(:/qss_icons/rc/Vsepartoolbars.png);
+}
+
+QPushButton
+{
+    color: silver;
+    background-color: #302F2F;
+    border-width: 1px;
+    border-color: #4A4949;
+    border-style: solid;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 5px;
+    padding-right: 5px;
+    border-radius: 2px;
+    outline: none;
+}
+
+QPushButton:disabled
+{
+    background-color: #302F2F;
+    border-width: 1px;
+    border-color: #3A3939;
+    border-style: solid;
+    padding-top: 5px;
+    padding-bottom: 5px;
+    padding-left: 10px;
+    padding-right: 10px;
+    /*border-radius: 2px;*/
+    color: #454545;
+}
+
+QPushButton:focus {
+    background-color: #3d8ec9;
+    color: white;
+}
+
+QComboBox
+{
+    selection-background-color: #3d8ec9;
+    background-color: #201F1F;
+    border-style: solid;
+    border: 1px solid #3A3939;
+    border-radius: 2px;
+    padding: 2px;
+    min-width: 75px;
+}
+
+QPushButton:checked{
+    background-color: #4A4949;
+    border-color: #6A6969;
+}
+
+QComboBox:hover,QPushButton:hover,QAbstractSpinBox:hover,QLineEdit:hover,QTextEdit:hover,QPlainTextEdit:hover,QAbstractView:hover,QTreeView:hover
+{
+    border: 1px solid #78879b;
+    color: silver;
+}
+
+QComboBox:on
+{
+    background-color: #626873;
+    padding-top: 3px;
+    padding-left: 4px;
+    selection-background-color: #4a4a4a;
+}
+
+QComboBox QAbstractItemView
+{
+    background-color: #201F1F;
+    border-radius: 2px;
+    border: 1px solid #444;
+    selection-background-color: #3d8ec9;
+}
+
+QComboBox::drop-down
+{
+    subcontrol-origin: padding;
+    subcontrol-position: top right;
+    width: 15px;
+
+    border-left-width: 0px;
+    border-left-color: darkgray;
+    border-left-style: solid;
+    border-top-right-radius: 3px;
+    border-bottom-right-radius: 3px;
+}
+
+QComboBox::down-arrow
+{
+    image: url(:/qss_icons/rc/down_arrow_disabled.png);
+}
+
+QComboBox::down-arrow:on, QComboBox::down-arrow:hover,
+QComboBox::down-arrow:focus
+{
+    image: url(:/qss_icons/rc/down_arrow.png);
+}
+
+QPushButton:pressed
+{
+    background-color: #484846;
+}
+
+QAbstractSpinBox {
+    padding-top: 2px;
+    padding-bottom: 2px;
+    border: 1px solid #3A3939;
+    background-color: #201F1F;
+    color: silver;
+    border-radius: 2px;
+    min-width: 75px;
+}
+
+QAbstractSpinBox:up-button
+{
+    background-color: transparent;
+    subcontrol-origin: border;
+    subcontrol-position: center right;
+}
+
+QAbstractSpinBox:down-button
+{
+    background-color: transparent;
+    subcontrol-origin: border;
+    subcontrol-position: center left;
+}
+
+QAbstractSpinBox::up-arrow,QAbstractSpinBox::up-arrow:disabled,QAbstractSpinBox::up-arrow:off {
+    image: url(:/qss_icons/rc/up_arrow_disabled.png);
+    width: 10px;
+    height: 10px;
+}
+QAbstractSpinBox::up-arrow:hover
+{
+    image: url(:/qss_icons/rc/up_arrow.png);
+}
+
+
+QAbstractSpinBox::down-arrow,QAbstractSpinBox::down-arrow:disabled,QAbstractSpinBox::down-arrow:off
+{
+    image: url(:/qss_icons/rc/down_arrow_disabled.png);
+    width: 10px;
+    height: 10px;
+}
+QAbstractSpinBox::down-arrow:hover
+{
+    image: url(:/qss_icons/rc/down_arrow.png);
+}
+
+
+QLabel
+{
+    border: 0px solid black;
+}
+
+QTabWidget{
+    border: 1px transparent black;
+}
+
+QTabWidget::pane {
+    border: 1px solid #444;
+    border-radius: 3px;
+    padding: 3px;
+}
+
+QTabBar
+{
+    qproperty-drawBase: 0;
+    left: 5px; /* move to the right by 5px */
+}
+
+QTabBar:focus
+{
+    border: 0px transparent black;
+}
+
+QTabBar::close-button  {
+    image: url(:/qss_icons/rc/close.png);
+    background: transparent;
+}
+
+QTabBar::close-button:hover
+{
+    image: url(:/qss_icons/rc/close-hover.png);
+    background: transparent;
+}
+
+QTabBar::close-button:pressed {
+    image: url(:/qss_icons/rc/close-pressed.png);
+    background: transparent;
+}
+
+/* TOP TABS */
+QTabBar::tab:top {
+    color: #b1b1b1;
+    border: 1px solid #4A4949;
+    border-bottom: 1px transparent black;
+    background-color: #302F2F;
+    padding: 5px;
+    border-top-left-radius: 2px;
+    border-top-right-radius: 2px;
+}
+
+QTabBar::tab:top:!selected
+{
+    color: #b1b1b1;
+    background-color: #201F1F;
+    border: 1px transparent #4A4949;
+    border-bottom: 1px transparent #4A4949;
+    border-top-left-radius: 0px;
+    border-top-right-radius: 0px;
+}
+
+QTabBar::tab:top:!selected:hover {
+    background-color: #48576b;
+}
+
+/* BOTTOM TABS */
+QTabBar::tab:bottom {
+    color: #b1b1b1;
+    border: 1px solid #4A4949;
+    border-top: 1px transparent black;
+    background-color: #302F2F;
+    padding: 5px;
+    border-bottom-left-radius: 2px;
+    border-bottom-right-radius: 2px;
+}
+
+QTabBar::tab:bottom:!selected
+{
+    color: #b1b1b1;
+    background-color: #201F1F;
+    border: 1px transparent #4A4949;
+    border-top: 1px transparent #4A4949;
+    border-bottom-left-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+QTabBar::tab:bottom:!selected:hover {
+    background-color: #78879b;
+}
+
+/* LEFT TABS */
+QTabBar::tab:left {
+    color: #b1b1b1;
+    border: 1px solid #4A4949;
+    border-left: 1px transparent black;
+    background-color: #302F2F;
+    padding: 5px;
+    border-top-right-radius: 2px;
+    border-bottom-right-radius: 2px;
+}
+
+QTabBar::tab:left:!selected
+{
+    color: #b1b1b1;
+    background-color: #201F1F;
+    border: 1px transparent #4A4949;
+    border-right: 1px transparent #4A4949;
+    border-top-right-radius: 0px;
+    border-bottom-right-radius: 0px;
+}
+
+QTabBar::tab:left:!selected:hover {
+    background-color: #48576b;
+}
+
+
+/* RIGHT TABS */
+QTabBar::tab:right {
+    color: #b1b1b1;
+    border: 1px solid #4A4949;
+    border-right: 1px transparent black;
+    background-color: #302F2F;
+    padding: 5px;
+    border-top-left-radius: 2px;
+    border-bottom-left-radius: 2px;
+}
+
+QTabBar::tab:right:!selected
+{
+    color: #b1b1b1;
+    background-color: #201F1F;
+    border: 1px transparent #4A4949;
+    border-right: 1px transparent #4A4949;
+    border-top-left-radius: 0px;
+    border-bottom-left-radius: 0px;
+}
+
+QTabBar::tab:right:!selected:hover {
+    background-color: #48576b;
+}
+
+QTabBar QToolButton::right-arrow:enabled {
+     image: url(:/qss_icons/rc/right_arrow.png);
+ }
+
+ QTabBar QToolButton::left-arrow:enabled {
+     image: url(:/qss_icons/rc/left_arrow.png);
+ }
+
+QTabBar QToolButton::right-arrow:disabled {
+     image: url(:/qss_icons/rc/right_arrow_disabled.png);
+ }
+
+ QTabBar QToolButton::left-arrow:disabled {
+     image: url(:/qss_icons/rc/left_arrow_disabled.png);
+ }
+
+
+QDockWidget {
+    border: 1px solid #403F3F;
+    titlebar-close-icon: url(:/qss_icons/rc/close.png);
+    titlebar-normal-icon: url(:/qss_icons/rc/undock.png);
+}
+
+QDockWidget::close-button, QDockWidget::float-button {
+    border: 1px solid transparent;
+    border-radius: 2px;
+    background: transparent;
+}
+
+QDockWidget::close-button:hover, QDockWidget::float-button:hover {
+    background: rgba(255, 255, 255, 10);
+}
+
+QDockWidget::close-button:pressed, QDockWidget::float-button:pressed {
+    padding: 1px -1px -1px 1px;
+    background: rgba(255, 255, 255, 10);
+}
+
+QTreeView, QListView
+{
+    border: 1px solid #444;
+    background-color: #201F1F;
+}
+
+QTreeView:branch:selected, QTreeView:branch:hover
+{
+    background: url(:/qss_icons/rc/transparent.png);
+}
+
+QTreeView::branch:has-siblings:!adjoins-item {
+    border-image: url(:/qss_icons/rc/transparent.png);
+}
+
+QTreeView::branch:has-siblings:adjoins-item {
+    border-image: url(:/qss_icons/rc/transparent.png);
+}
+
+QTreeView::branch:!has-children:!has-siblings:adjoins-item {
+    border-image: url(:/qss_icons/rc/transparent.png);
+}
+
+QTreeView::branch:has-children:!has-siblings:closed,
+QTreeView::branch:closed:has-children:has-siblings {
+    image: url(:/qss_icons/rc/branch_closed.png);
+}
+
+QTreeView::branch:open:has-children:!has-siblings,
+QTreeView::branch:open:has-children:has-siblings  {
+    image: url(:/qss_icons/rc/branch_open.png);
+}
+
+QTreeView::branch:has-children:!has-siblings:closed:hover,
+QTreeView::branch:closed:has-children:has-siblings:hover {
+    image: url(:/qss_icons/rc/branch_closed-on.png);
+    }
+
+QTreeView::branch:open:has-children:!has-siblings:hover,
+QTreeView::branch:open:has-children:has-siblings:hover  {
+    image: url(:/qss_icons/rc/branch_open-on.png);
+    }
+
+QListView::item:!selected:hover, QListView::item:!selected:hover, QTreeView::item:!selected:hover  {
+    background: rgba(0, 0, 0, 0);
+    outline: 0;
+    color: #FFFFFF
+}
+
+QListView::item:selected:hover, QListView::item:selected:hover, QTreeView::item:selected:hover  {
+    background: #3d8ec9;
+    color: #FFFFFF;
+}
+
+QSlider::groove:horizontal {
+    border: 1px solid #3A3939;
+    height: 8px;
+    background: #201F1F;
+    margin: 2px 0;
+    border-radius: 2px;
+}
+
+QSlider::handle:horizontal {
+    background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1,
+      stop: 0.0 silver, stop: 0.2 #a8a8a8, stop: 1 #727272);
+    border: 1px solid #3A3939;
+    width: 14px;
+    height: 14px;
+    margin: -4px 0;
+    border-radius: 2px;
+}
+
+QSlider::groove:vertical {
+    border: 1px solid #3A3939;
+    width: 8px;
+    background: #201F1F;
+    margin: 0 0px;
+    border-radius: 2px;
+}
+
+QSlider::handle:vertical {
+    background: QLinearGradient( x1: 0, y1: 0, x2: 0, y2: 1, stop: 0.0 silver,
+      stop: 0.2 #a8a8a8, stop: 1 #727272);
+    border: 1px solid #3A3939;
+    width: 14px;
+    height: 14px;
+    margin: 0 -4px;
+    border-radius: 2px;
+}
+
+QToolButton {
+    background-color: transparent;
+    border: 1px transparent #4A4949;
+    border-radius: 2px;
+    margin: 3px;
+    padding: 3px;
+}
+
+QToolButton[popupMode="1"] { /* only for MenuButtonPopup */
+ padding-right: 20px; /* make way for the popup button */
+ border: 1px transparent #4A4949;
+ border-radius: 5px;
+}
+
+QToolButton[popupMode="2"] { /* only for InstantPopup */
+ padding-right: 10px; /* make way for the popup button */
+ border: 1px transparent #4A4949;
+}
+
+
+QToolButton:hover, QToolButton::menu-button:hover {
+    background-color: transparent;
+    border: 1px solid #78879b;
+}
+
+QToolButton:checked, QToolButton:pressed,
+        QToolButton::menu-button:pressed {
+    background-color: #4A4949;
+    border: 1px solid #78879b;
+}
+
+/* the subcontrol below is used only in the InstantPopup or DelayedPopup mode */
+QToolButton::menu-indicator {
+    image: url(:/qss_icons/rc/down_arrow.png);
+    top: -7px; left: -2px; /* shift it a bit */
+}
+
+/* the subcontrols below are used only in the MenuButtonPopup mode */
+QToolButton::menu-button {
+    border: 1px transparent #4A4949;
+    border-top-right-radius: 6px;
+    border-bottom-right-radius: 6px;
+    /* 16px width + 4px for border = 20px allocated above */
+    width: 16px;
+    outline: none;
+}
+
+QToolButton::menu-arrow {
+    image: url(:/qss_icons/rc/down_arrow.png);
+}
+
+QToolButton::menu-arrow:open {
+    top: 1px; left: 1px; /* shift it a bit */
+    border: 1px solid #3A3939;
+}
+
+QPushButton::menu-indicator  {
+    subcontrol-origin: padding;
+    subcontrol-position: bottom right;
+    left: 8px;
+}
+
+QTableView
+{
+    border: 1px solid #444;
+    gridline-color: #6c6c6c;
+    background-color: #201F1F;
+}
+
+
+QTableView, QHeaderView
+{
+    border-radius: 0px;
+}
+
+QTableView::item:pressed, QListView::item:pressed, QTreeView::item:pressed  {
+    background: #78879b;
+    color: #FFFFFF;
+}
+
+QTableView::item:selected:active, QTreeView::item:selected:active, QListView::item:selected:active  {
+    background: #3d8ec9;
+    color: #FFFFFF;
+}
+
+
+QHeaderView
+{
+    border: 1px transparent;
+    border-radius: 2px;
+    margin: 0px;
+    padding: 0px;
+}
+
+QHeaderView::section  {
+    background-color: #3A3939;
+    color: silver;
+    padding: 4px;
+    border: 1px solid #6c6c6c;
+    border-radius: 0px;
+    text-align: center;
+}
+
+QHeaderView::section::vertical::first, QHeaderView::section::vertical::only-one
+{
+    border-top: 1px solid #6c6c6c;
+}
+
+QHeaderView::section::vertical
+{
+    border-top: transparent;
+}
+
+QHeaderView::section::horizontal::first, QHeaderView::section::horizontal::only-one
+{
+    border-left: 1px solid #6c6c6c;
+}
+
+QHeaderView::section::horizontal
+{
+    border-left: transparent;
+}
+
+
+QHeaderView::section:checked
+ {
+    color: white;
+    background-color: #5A5959;
+ }
+
+ /* style the sort indicator */
+QHeaderView::down-arrow {
+    image: url(:/qss_icons/rc/down_arrow.png);
+}
+
+QHeaderView::up-arrow {
+    image: url(:/qss_icons/rc/up_arrow.png);
+}
+
+
+QTableCornerButton::section {
+    background-color: #3A3939;
+    border: 1px solid #3A3939;
+    border-radius: 2px;
+}
+
+QToolBox  {
+    padding: 3px;
+    border: 1px transparent black;
+}
+
+QToolBox::tab {
+    color: #b1b1b1;
+    background-color: #302F2F;
+    border: 1px solid #4A4949;
+    border-bottom: 1px transparent #302F2F;
+    border-top-left-radius: 5px;
+    border-top-right-radius: 5px;
+}
+
+ QToolBox::tab:selected { /* italicize selected tabs */
+    font: italic;
+    background-color: #302F2F;
+    border-color: #3d8ec9;
+ }
+
+QStatusBar::item {
+    border: 1px solid #3A3939;
+    border-radius: 2px;
+ }
+
+
+QFrame[height="3"], QFrame[width="3"] {
+    background-color: #444;
+}
+
+
+QSplitter::handle {
+    border: 1px dashed #3A3939;
+}
+
+QSplitter::handle:hover {
+    background-color: #787876;
+    border: 1px solid #3A3939;
+}
+
+QSplitter::handle:horizontal {
+    width: 1px;
+}
+
+QSplitter::handle:vertical {
+    height: 1px;
+}
+
+DebugTextEdit {
+	qproperty-colorType: #3987D6;
+	qproperty-colorModificator: #a8a8a8;
+	qproperty-colorPreprocessor: #a8a8a8;
+	qproperty-colorClass: #FFD700;
+	qproperty-colorSingleComment: #57A64A;
+	qproperty-colorMultiComment: #57A64A;
+	qproperty-colorQuatation: #D69D5D;
+	qproperty-colorFunction : #FF8000;
+	color: #B4B484;
+}
\ No newline at end of file
diff --git a/scripts/initBuldozer.sqf b/scripts/initBuldozer.sqf
new file mode 100644
index 0000000000000000000000000000000000000000..06c41be66e54400a8384fdfbd345a6dd72ddb7a7
--- /dev/null
+++ b/scripts/initBuldozer.sqf
@@ -0,0 +1,9 @@
+// Buldozer Tools by Lappihuan
+
+#include "userconfig.sqf"
+
+#include "BuldozerTools\config.sqf"
+
+#include "BuldozerTools\buldozerToolsFunctions.sqf"
+
+#include "BuldozerTools\main.sqf"
\ No newline at end of file
diff --git a/scripts/profile_fixed.cfg b/scripts/profile_fixed.cfg
new file mode 100644
index 0000000000000000000000000000000000000000..57bd83e1ff12e0fc358a76bba5374505fcac11db
--- /dev/null
+++ b/scripts/profile_fixed.cfg
@@ -0,0 +1,23 @@
+console_preset_default=""
+console_presets={"Update_123","Update_122","Update_121","FreshSpawn","Farmer","Hunter","AntiHazard","Military_Sniper","Military_East","Military_USMC","Mechanic","Bob_The_Builder","Medic","Policeman","Underground_Explorer","Knight"}
+FreshSpawn={{cmd="clear_inv"},{name="TShirt_Beige"},{name="CanvasPantsMidi_Grey"},{name="AthleticShoes_Blue"},{name="Chemlight_White"},{name="Apple"},{name="BandageDressing"}}
+Farmer={{cmd="clear_inv"},{name="Sweater_Green"},{name="CargoPants_Green"},{name="WorkingGloves_Brown"},{name="WorkingBoots_Green"},{name="FlatCap_Brown"},{name="Shovel"},{name="Pickaxe"},{name="CourierBag"},{name="GardenLime"},{name="Sickle"},{name="FarmingHoe"},{name="TomatoSeeds"},{name="PepperSeeds"},{name="PumpkinSeeds"},{name="ZucchiniSeeds"},{name="PotatoSeed"},{name="TomatoSeedsPack"},{name="PepperSeedsPack"},{name="PumpkinSeedsPack"},{name="ZucchiniSeedsPack"},{name="WaterBottle"},{name="WaterBottle"},{name="WaterBottle"},{name="WaterBottle"},{name="WaterBottle"},{name="WaterBottle"}}
+Hunter={{cmd="clear_inv"},{name="HuntingBag"},{name="BoonieHat_Dubok"},{name="HuntingJacket_Autumn"},{name="HunterPants_Autumn"},{name="WorkingGloves_Beige"},{name="CombatBoots_Green"},{name="HuntingKnife"},{name="Crossbow"},{name="ACOGOptic"},{name="ACOGOptic_6x"},{name="Rangefinder"},{name="Battery9V"},{name="Ammo_HuntingBolt"},{name="Ammo_ImprovisedBolt_1"},{name="Ammo_ImprovisedBolt_2"},{name="CZ550"},{name="Ammo_308WinTracer"},{name="Ammo_308Win"},{name="Mag_CZ550_10rnd"},{name="HuntingOptic"},{name="HuntingVest"},{name="SawedoffIzh43Shotgun"},{name="Ammo_12gaPellets"},{name="Ammo_12gaSlug"},{name="WaterBottle"},{name="Netting"},{name="MetalWire"},{name="MetalWire"},{name="Hatchet"},{name="RabbitSnareTrap"},{name="SmallFishTrap"},{name="FishNetTrap"},{name="GreenBellPepper"},{name="Worm"},{name="Worm"},{name="BearTrap"}}
+AntiHazard={{cmd="clear_inv"},{name="NBCHoodYellow"},{name="NBCJacketYellow"},{name="NBCPantsYellow"},{name="NBCBootsYellow"},{name="NBCGlovesYellow"},{name="PressVest_Blue"},{name="M18SmokeGrenade_Green"},{name="M18SmokeGrenade_Red"},{name="DryBag_Yellow"},{name="Chemlight_White"},{name="AirborneMask"},{name="FirefighterAxe"},{name="UMP45"},{name="UniversalLight"},{name="Battery9V"},{name="Mag_UMP_25Rnd"},{name="Mag_UMP_25Rnd"},{name="CombatKnife"},{name="WaterBottle"},{name="TacticalBaconCan"},{name="BandageDressing"},{name="HeatPack"},{name="AntiChemInjector"}}
+Military_East={{cmd="clear_inv"},{name="GorkaHelmet"},{name="GorkaHelmetVisor"},{name="TTsKOJacket_Camo"},{name="TTSKOPants"},{name="Balaclava3Holes_Green"},{name="TortillaBag"},{name="WoolGloves_Green"},{name="TTSKOBoots"},{name="HighCapacityVest_Olive"},{name="FlashGrenade"},{name="RGD5Grenade"},{name="MilitaryBelt"},{name="AK_Bayonet"},{name="FNX45"},{name="FNP45_MRDSOptic"},{name="Mag_FNX45_15Rnd"},{name="Mag_FNX45_15Rnd"},{name="TLRLight"},{name="Battery9V"},{name="Battery9V"},{name="TacticalBaconCan"},{name="BandageDressing"},{name="AK101_Black"},{name="AK_Suppressor"},{name="AK_FoldingBttstck_Black"},{name="AK_RailHndgrd_Black"},{name="Mag_AK101_30Rnd_Black"},{name="Mag_AK101_30Rnd_Black"},{name="Mag_AK101_30Rnd_Black"},{name="Chemlight_Green"},{name="Saiga"},{name="Saiga_Bttstck"},{name="Mag_Saiga_8Rnd"},{name="Mag_Saiga_5Rnd"}}
+Military_USMC={{cmd="clear_inv"},{name="Mich2001Helmet"},{name="NVGoggles"},{name="UniversalLight"},{name="Battery9V"},{name="Battery9V"},{name="TacticalGoggles"},{name="BalaclavaMask_Beige"},{name="TacticalGloves_Beige"},{name="USMCJacket_Desert"},{name="USMCPants_Desert"},{name="PlateCarrierVest"},{name="M67Grenade"},{name="M67Grenade"},{name="RDG2SmokeGrenade_White"},{name="RDG2SmokeGrenade_Black"},{name="CoyoteBag_Brown"},{name="Chemlight_Green"},{name="PersonalRadio"},{name="Battery9V"},{name="MilitaryBoots_Beige"},{name="CombatKnife"},{name="M4A1_Black"},{name="M4_RISHndgrd_Black"},{name="M4_CQBBttstck_Black"},{name="M4_T3NRDSOptic"},{name="Battery9V"},{name="M9A1_Bayonet"},{name="Mag_STANAGCoupled_30Rnd"},{name="Mag_STANAGCoupled_30Rnd"},{name="MP5K"},{name="MP5_Compensator"},{name="MP5_PlasticHndgrd"},{name="MP5k_StockBttstck"},{name="Mag_MP5_30Rnd"},{name="Mag_MP5_15Rnd"},{name="TacticalBaconCan"},{name="Binoculars"},{name="Compass"},{name="FieldShovel"},{name="MilitaryBelt"},{name="Canteen"},{name="NylonKnifeSheath"},{name="PlateCarrierHolster"},{name="Colt1911"},{name="Mag_1911_7Rnd"},{name="Mag_1911_7Rnd"}}
+Military_Sniper={{cmd="clear_inv"},{name="TTSKOPants"},{name="TTsKOJacket_Camo"},{name="Balaclava3Holes_Green"},{name="GhillieAtt_Woodland"},{name="GhillieHood_Woodland"},{name="OMNOGloves_Brown"},{name="SmershVest"},{name="TTSKOBoots"},{name="LandMineTrap"},{name="LandMineTrap"},{name="SVD"},{name="Mag_SVD_10Rnd"},{name="Mag_SVD_10Rnd"},{name="AK_Suppressor"},{name="PSO11Optic"},{name="Battery9V"},{name="MilitaryBelt"},{name="CombatKnife"},{name="Magnum"},{name="Ammo_357"},{name="Ammo_357"},{name="TacticalBaconCan"},{name="Compass"},{name="Rangefinder"},{name="Battery9V"},{name="Hatchet"},{name="FieldShovel"},{name="BandageDressing"},{name="M67Grenade"},{name="M18SmokeGrenade_Green"},{name="M18SmokeGrenade_Red"},{name="Roadflare"},{name="Chemlight_Green"},{name="GhillieSuit_Woodland"},{name="SmershBag"}}
+Mechanic={{cmd="clear_inv"},{name="DryBag_Black"},{name="JumpsuitPants_Blue"},{name="JumpsuitJacket_Blue"},{name="WorkingBoots_Beige"},{name="WorkingGloves_Black"},{n	ame="EpoxyPutty"},{name="Screwdriver"},{name="Pliers"},{name="TireRepairKit"},{name="CarRadiator"},{name="CarBattery"},{name="TruckBattery"},{name="SparkPlug"},{name="SparkPlug"},{name="SparkPlug"},{name="SparkPlug"},{name="CanisterGasoline"},{name="Wrench"},{name="LugWrench"},{name="WaterBottle"}}
+Bob_The_Builder={{cmd="clear_inv"},{name="DryBag_Yellow"},{name="ConstructionHelmet_Yellow"},{name="JumpsuitPants_Grey"},{name="JumpsuitJacket_Gray"},{name="WorkingGloves_Brown"},{name="WorkingBoots_Beige"},{name="NioshFaceMask"},{name="Pliers"},{name="Hatchet"},{name="Sledgehammer"},{name="Hammer"},{name="Pickaxe"},{name="NailBox"},{name="NailBox"},{name="NailBox"},{name="NailBox"},{name="MetalWire"},{name="BarbedWire"},{name="Rope"},{name="Flag_Rooster"},{name="Hammer"},{name="WoodenLog"},{name="WoodenPlank"},{name="NailBox"},{name="BarbedWire"},{name="MetalWire"},{name="Rope"},{name="LongWoodenStick"},{name="SharpWoodenStick"},{name="WoodenStick"}}
+Medic={{cmd="clear_inv"},{name="CanvasBag_Medical"},{name="ParamedicJacket_Crimson"},{name="ParamedicPants_Crimson"},{name="JoggingShoes_White"},{name="MedicalScrubsHat_White"},{name="FirstAidKit"},{name="AntiChemInjector"},{name="BandageDressing"},{name="BandageDressing"},{name="BloodbagIV"},{name="BloodTestKit"},{name="CharcoalTablets"},{name="DisinfectantAlcohol"},{name="Epinephrine"},{name="IodineTincture"},{name="PainkillerTablets"},{name="PurificationTablets"},{name="SalineBag"},{name="SalineBagIV"},{name="StartKitIV"},{name="Splint"},{name="Guts"},{name="TetracyclineAntibiotics"},{name="Thermometer"},{name="VitaminBottle"},{name="Hacksaw"},{name="HipPack_Medical"},{name="SurgicalGloves_White"},{name="SurgicalMask"}}
+Policeman={{cmd="clear_inv"},{name="PoliceJacket"},{name="PolicePants"},{name="PoliceVest"},{name="CombatBoots_Black"},{name="Glock19"},{name="Mag_Glock_15Rnd"},{name="Balaclava3Holes_Black"},{name="PP19"},{name="Mag_PP19_64Rnd"},{name="Mag_PP19_64Rnd"},{name="Mag_Glock_15Rnd"},{name="PoliceCap"},{name="Handcuffs"},{name="HandcuffKeys"},{name="MP133Shotgun"},{name="Ammo_12gaPellets"},{name="Ammo_12gaSlug"},{name="Ammo_12gaRubberSlug"}}
+Underground_Explorer={{cmd="clear_inv"},{name="WorkingBoots_Brown"},{name="WorkingGloves_Yellow"},{name="HuntingJacket_Brown"},{name="CargoPants_Black"},{name="Ushanka_Green"},{name="PunchedCard"},{name="MountainBag_Blue"},{name="Magnum"},{name="Mosin9130"},{name="Ammo_357"},{name="Ammo_357"},{name="HuningKnife"},{name="Ammo_762x54"},{name="Headtorch_Grey"},{name="Battery9V"},{name="SewingKit"},{name="VitaminBottle"},{name="Canteen"},{name="PurificationTablets"},{name="SpaghettiCan_Opened"},{name="SpaghettiCan_Opened"},{name="BandageDressing"}}
+Update_121={{cmd="clear_inv"},{name="Mace"},{name="Sword"},{name="Chestplate"},{name="Chainmail"},{name="NorseHelm"},{name="Chainmail_Leggings"},{name="Medievalboots"},{name="Crossbow"},{name="Ammo_HuntingBolt"},{name="Ammo_ImprovisedBolt_1"},{name="Ammo_ImprovisedBolt_2"},{name="ChickenFeather"},{name="Chainmail_Coif"},{name="WoolGloves_Green"},{name="WoolGloves_Black"},{name="WoolGloves_Tan"},{name="WoolGloves_White"},{name="WoolGlovesFingerless_Green"},{name="WoolGlovesFingerless_Black"},{name="WoolGlovesFingerless_Tan"},{name="WoolGlovesFingerless_White"}}
+Update_122={{cmd="clear_inv"},{name="ArmyPouch_Beige"},{name="ArmyPouch_Black"},{name="ArmyPouch_Camo"},{name="ArmyPouch_Green"},{name="SlingBag_Brown"},{name="SlingBag_Gray"},{name="SlingBag_Black"},{name="DuffelBagSmall_Green"},{name="DuffelBagSmall_Camo"},{name="DuffelBagSmall_Medical"},{name="CanvasBag_Olive"},{name="CanvasBag_Medical"},{name="WitchHoodCoif_Black"},{name="WitchHoodCoif_Brown"},{name="WitchHoodCoif_Red"},{name="HipPack_Black"},{name="HipPack_Green"},{name="HipPack_Medical"},{name="HipPack_Party"},{name="DrysackBag_Green"},{name="DrysackBag_Orange"},{name="DrysackBag_Yellow"}}
+Update_123={{cmd="clear_inv"},{name="FieldShovel"},{name="PaddedGloves_Brown"},{name="PaddedGloves_Beige"},{name="PaddedGloves_Threat"},{name="M14"},{name="Mag_M14_10Rnd"},{name="Mag_M14_20Rnd"},{name="WoolGloves_ChristmasBlue"},{name="WoolGloves_ChristmasRed"},{name="WoolGlovesFingerless_ChristmasBlue"},{name="WoolGlovesFingerless_ChristmasRed"},{name="MorozkoHat"},{name="OKZKCap_Beige"},{name="OKZKCap_Green"},{name="WinterCoif_Black"},{name="WinterCoif_Blue"},{name="WinterCoif_Green"},{name="WinterCoif_Skull"},{name="PetushokHat_Black"},{name="PetushokHat_Green"},{name="PetushokHat_Yellow"},{name="TShirt_10thAnniversary"},{name="Candycane_Green"},{name="Candycane_Red"},{name="Candycane_RedGreen"},{name="Candycane_Yellow"},{name="AnniversaryBox"},{name="ChristmasHeadband_Trees"},{name="ChristmasHeadband_Gingerbread"},{name="ChristmasHeadband_Antlers"}}
+Update_124={{cmd="clear_inv"},{name="Vikhr"},{name="Mag_Vikhr_30Rnd"}}
+Knight={{cmd="clear_inv"},{name="Mace"},{name="Sword"},{name="Chestplate"},{name="Chainmail"},{name="NorseHelm"},{name="Chainmail_Leggings"},{name="Medievalboots"}}
+console_positions_chernarusplus={{name="Severograd",pos="8428.0 0.0 12767.1"},{name="Krasnostav",pos="11167.71 0.0 12317.32"},{name="Mogilevka",pos="7583.0 0.0 5159.4"},{name="Stary Sobor",pos="6072.0 0.0 7852.5"},{name="Msta",pos="11207.0 0.0 5380.54"},{name="Vybor",pos="3729.51 0.0 8935.56"},{name="Gorka",pos="9787.1 0.0 8767.19"},{name="Solnicni",pos="13394.99 0.0 6168.15"},{name="Airport Vybor",pos="4828.9 0.0 10219.5"},{name="Airport Balota",pos="4791.53 0.0 2557.47"},{name="Airport Krasnostav",pos="12004.3 0.0 12655.3"},{name="Chernogorsk Center",pos="6537.65 0.0 2482.22"},{name="Chernogorsk West",pos="6528.62 0.0 2319.92"},{name="Chernogorsk East",pos="7105.76	0.0	2699.53"},{name="Elektrozavodsk Center",pos="10453.60 0.0 2316.88"},{name="Elektrozavodsk West",pos="10030.8 0.0 1807.04"},{name="Elektrozavodsk East",pos="10414.5 0.0 2569.42"},{name="Berezino Center",pos="12296.9 0.0 9470.51"},{name="Berezino West",pos="12035.4 0.0 9143.49"},{name="Berezino East",pos="12932.3 0.0 10172.7"},{name="Svetlojarsk Center",pos="13835.3 0.0 13202.3"},{name="Svetlojarsk East",pos="14087.6 0.0 13117.3"},{name="Zelenogorsk Center",pos="2660.99 0.0 5299.28"},{name="Zelenogorsk West",pos="2489.45 0.0 5080.41"}}
+console_positions_enoch={{name="Village1",pos="3161.0 0.0 4946.3"},{name="Village2",pos="11498.3 0.0 3001.61"},{name="Dambog",pos="783.52 0.0 1228.88"},{name="SummerCamp1",pos="1336.0 0.0 4852.0"},{name="SummerCamp2",pos="804.0 0.0 8636.0"},{name="SummerCamp3",pos="11754.0 0.0 5484.0"},{name="FishingCamp",pos="3371.0 0.0 8963.0"},{name="Nadbor",pos="6069.0 0.0 4168.0"},{name="Topolin",pos="1578.0 0.0 7435.0"},{name="Brena",pos="6483.0 0.0 11278.0"},{name="Airfield",pos="4263.0 0.0 10390.0"},{name="Dolnik",pos="11509.0 0.0 436.0"},{name="Gieraltow",pos="11117.0 0.0 4334.0"},{name="Sitnik",pos="11421.0 0.0 9616.0"},{name="Grabin",pos="10840.0 0.0 11090.0"},{name="Tarnow",pos="9368.0 0.0 10686.0"},{name="Gliniska",pos="5027.0 0.0 9962.0"},{name="Lukow",pos="3684.0 0.0 11792.0"},{name="Bielawa",pos="1454.0 0.0 9751.0"},{name="Polana",pos="3350.0 0.0 2060.0"},{name="Adamow",pos="3156.0 0.0 6825.0"},{name="NW Base",pos="2056.0 0.0 11148.0"},{name="Prison",pos="5523.0 0.0 8772.0"},{name="Roztoka",pos="7671.0 0.0 5324.0"},{name="Radunin Base",pos="7650.0 0.0 5988.0"},{name="Radar Base",pos="4950.0 0.0 2155.0"}}
+console_positions_samplemap={{name="RacingCircle",pos="3154.50 0.0 2345.55"},{name="PAS Testing",pos="2754.75 0.0 2526.50"},{name="Straight Forward",pos="3013.51 0.0 2139.66"},{name="Assets",pos="333.34 20.0 1171.91"},{name="BlissAssets",pos="1946.01 0.0 1141.34"},{name="SpawningHouses",pos="3285.14 0.0 3950.55"},{name="Trees",pos="2505.77 0.0 4812.14"},{name="LadderNest",pos="2539.620.0 2914.36"},{name="Surfaces",pos="4475.73 0.0 1252.75"},PenetrationMaterials={name="PenetrationMaterials",pos="2521.29 0.0 2648.87"}}
+console_positions_staroye={}
diff --git a/scripts/staticDefinesDoc.c b/scripts/staticDefinesDoc.c
new file mode 100644
index 0000000000000000000000000000000000000000..361ea2ee2fec59d12cc14818966bbe19ffa8da38
--- /dev/null
+++ b/scripts/staticDefinesDoc.c
@@ -0,0 +1,61 @@
+#ifdef DOXYGEN
+/**
+| %Defines                                                             | Short description                                                                                 | DayZ builds                                                                                                        | %Workbench builds |
+| -------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------ | ----------------- |
+| DEVELOPER                                                            | Internal developer version                                                                        | yes (binarize, debug, release, releaseAsserts, releaseNoOpt)\n no(Profile server, Retail server, Retail client)    | yes               |
+| RELEASE                                                              | Retail build of the game                                                                          | yes (retail client, retail server)                                                                                 | no                |
+| PREVIEW_BUILD                                                        | Preview build. Currently used only in console builds                                              | yes (preview build)                                                                                                | no                |
+| PLATFORM_WINDOWS \|\| PLATFORM_MACOSX \|\| ENF_LINUX                 | Platform specific defines                                                                         | yes                                                                                                                | yes               |
+| PLATFORM_CONSOLE && (PLATFORM_XBOX \|\| PLATFORM_PS4)                | Platform specific defines                                                                         | yes                                                                                                                | no                |
+| X1_TODO_TEMP_GUI                                                     | Temporary XBOX GUI hacks                                                                          | yes (xbox builds)                                                                                                  | no                |
+| BULDOZER                                                             | Game is launched in land editor mode (-buldozer)                                                  | yes (binarize, debug, release, releaseAsserts, releaseNoOpt, retail client)\n no(server, retail server, xbox, ps4) | yes               |
+| SERVER                                                               | Game runs as server                                                                               | yes (all pc builds, client with -server)                                                                           | no                |
+| NO_GUI, NO_GUI_INGAME                                                | Game runs without gui - Server, client simulator                                                  | yes                                                                                                                | no                |
+| WORKBENCH                                                            | Game runs from workbench                                                                          | no                                                                                                                 | yes               |
+| COMPONENT_SYSTEM                                                     | Enfusion entity component system                                                                  | no                                                                                                                 | yes               |
+| GAME_TEMPLATE                                                        | Game template implementation see [link](https://confluence.bistudio.com/display/EN/Game+Template) | no                                                                                                                 | yes               |
+| ENF_DONE                                                             | Looks like commented out wip or dead code                                                         | no                                                                                                                 | no                |
+| DOXYGEN                                                              | Doxygen documentation, never compiled                                                             | no                                                                                                                 | no                |
+| _DAYZ_CREATURE_DEBUG_SHADOW                                          | Game is built with network debug for DayZCreature                                                 | no                                                                                                                 | no                |
+| BOT                                                                  | ? Script player debug bot ?                                                                       | no                                                                                                                 | no                |
+| PS3                                                                  | ? obsolete ?                                                                                      | no                                                                                                                 | no                |
+
+| PC builds                     | %Defines used                                                                                                                                                                                                                                                                                                    |
+| ----------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| release, releaseAsserts       | DEVELOPER, (PLATFORM_WINDOWS \|\| PLATFORM_MACOSX \|\| ENF_LINUX), (-server => SERVER, NO_GUI, NO_GUI_INGAME), (-buldozer => BULDOZER) + any number of static defines using command line parameter -scrDef=... see [link](https://confluence.bistudio.com/display/DAYZ/DayZ+Development+Command-line+Parameters) |
+| retail client                 | RELEASE, (PLATFORM_WINDOWS \|\| PLATFORM_MACOSX \|\| ENF_LINUX), (-buldozer => BULDOZER)                                                                                                                                                                                                                         |
+| retail server, profile server | RELEASE, (PLATFORM_WINDOWS \|\| PLATFORM_MACOSX \|\| ENF_LINUX), SERVER, NO_GUI, NO_GUI_INGAME                                                                                                                                                                                                                   |
+
+| Console builds | %Defines used                                                               |
+| -------------- | --------------------------------------------------------------------------- |
+| preview        | RELEASE, PLATFORM_CONSOLE, (PLATFORM_XBOX \|\| PLATFORM_PS4), PREVIEW_BUILD |
+| retail         | RELEASE, PLATFORM_CONSOLE, (PLATFORM_XBOX \|\| PLATFORM_PS4)                |
+| release        | DEVELOPER, PLATFORM_CONSOLE, (PLATFORM_XBOX \|\| PLATFORM_PS4)              |
+*/
+
+enum StaticDefines
+{
+	DEVELOPER,
+	RELEASE,
+	PREVIEW_BUILD,
+	PLATFORM_WINDOWS,
+	PLATFORM_MACOSX,
+	ENF_LINUX,
+	PLATFORM_CONSOLE,
+	PLATFORM_XBOX,
+	PLATFORM_PS4,
+	X1_TODO_TEMP_GUI,
+	BULDOZER,
+	SERVER,
+	NO_GUI, 
+	NO_GUI_INGAME,
+	WORKBENCH,
+	GAME_TEMPLATE,
+	ENF_DONE,
+	COMPONENT_SYSTEM,
+	DOXYGEN,
+	_DAYZ_CREATURE_DEBUG_SHADOW,
+	BOT,
+	PS3
+};
+#endif
\ No newline at end of file
diff --git a/scripts/userconfig.sqf b/scripts/userconfig.sqf
new file mode 100644
index 0000000000000000000000000000000000000000..c44148acca6fe953199718b341fc9219da335428
--- /dev/null
+++ b/scripts/userconfig.sqf
@@ -0,0 +1,25 @@
+// Buldozer Tools by Lappihuan
+
+// [general settings]
+
+// roadpath: is the path to your roads directory in your project.
+roadpath = "/myTag/myProject/data/roads/";
+// saveNotificationIntervall: intervall in minutes to show the save notification
+saveNotificationIntervall = 30; //min
+// showHelpOnStartup: true or false, set to false if you don't want the help dialog appear after the startup
+showHelpOnStartup = true;
+// dateArray: https://community.bistudio.com/wiki/setDate
+dateArray = [2001, 06, 22, 12, 0];
+// tiMode: https://community.bistudio.com/wiki/setCamUseTi
+tiMode = 1;
+
+// [key settings]
+
+// https://resources.bisimulations.com/wiki/DIK_KeyCodes
+// [DIK,Keyboard Key]
+help = [11,"0"]; // 0 on keyboard
+roadReload = [2,"1"]; // 1 on keybord
+weatherTimeSet = [3,"2"]; // 2 on keyboard
+roadDiag = [4,"3"]; // 3 on keyboard
+debug = [5,"4"]; // 4 on keyboard
+NVG_IR = [6,"5"]; // 5 on keyboard
\ No newline at end of file